From e21fa9c1c0f42f1d7c17ee89c8d21e31ad07fd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 09:50:33 +0100 Subject: [PATCH] merge libnw4r_lyt --- ...t_animation_800fc270.s => lyt_animation.s} | 58 ++++++++++++ asm/libnw4r_lyt/lyt_animation_80441568.s | 16 ---- asm/libnw4r_lyt/lyt_animation_8055f1b0.s | 42 --------- ...r_800fd8b0.s => lyt_arcResourceAccessor.s} | 24 +++++ .../lyt_arcResourceAccessor_804415a8.s | 12 --- .../lyt_arcResourceAccessor_80556a50.s | 12 --- ...lyt_bounding_800f9050.s => lyt_bounding.s} | 46 ++++++++++ asm/libnw4r_lyt/lyt_bounding_80406290.s | 4 - asm/libnw4r_lyt/lyt_bounding_80441470.s | 36 -------- asm/libnw4r_lyt/lyt_bounding_8055cfc8.s | 6 -- .../{lyt_common_800fdd40.s => lyt_common.s} | 24 +++++ asm/libnw4r_lyt/lyt_common_80528500.s | 6 -- asm/libnw4r_lyt/lyt_common_8055cfd0.s | 6 -- asm/libnw4r_lyt/lyt_common_8055f1d0.s | 12 --- ...lyt_drawInfo_800fc1e0.s => lyt_drawInfo.s} | 22 +++++ asm/libnw4r_lyt/lyt_drawInfo_80441558.s | 10 --- asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.s | 12 --- .../{lyt_group_800f3af0.s => lyt_group.s} | 10 +++ asm/libnw4r_lyt/lyt_group_80441258.s | 10 --- .../{lyt_layout_800f3e50.s => lyt_layout.s} | 40 +++++++++ asm/libnw4r_lyt/lyt_layout_80441268.s | 22 ----- asm/libnw4r_lyt/lyt_layout_8055cfa8.s | 6 -- asm/libnw4r_lyt/lyt_layout_8055f138.s | 12 --- ...lyt_material_800f9120.s => lyt_material.s} | 82 +++++++++++++++++ asm/libnw4r_lyt/lyt_material_804414e8.s | 42 --------- asm/libnw4r_lyt/lyt_material_8055f178.s | 34 ------- asm/libnw4r_lyt/lyt_material_805643d0.s | 6 -- .../{lyt_pane_800f2ba0.s => lyt_pane.s} | 86 ++++++++++++++++++ asm/libnw4r_lyt/lyt_pane_80406280.s | 4 - asm/libnw4r_lyt/lyt_pane_804411d8.s | 42 --------- asm/libnw4r_lyt/lyt_pane_8055cfa0.s | 6 -- asm/libnw4r_lyt/lyt_pane_8055f118.s | 34 ------- .../{lyt_picture_800f4db0.s => lyt_picture.s} | 54 +++++++++++ asm/libnw4r_lyt/lyt_picture_80406284.s | 4 - asm/libnw4r_lyt/lyt_picture_804412a8.s | 36 -------- asm/libnw4r_lyt/lyt_picture_8055cfb0.s | 6 -- asm/libnw4r_lyt/lyt_picture_8055f140.s | 8 -- ...ssor_800fd880.s => lyt_resourceAccessor.s} | 12 +++ .../lyt_resourceAccessor_80441590.s | 12 --- .../{lyt_texMap_800fc000.s => lyt_texMap.s} | 14 +++ asm/libnw4r_lyt/lyt_texMap_8055f198.s | 14 --- .../{lyt_textBox_800f5340.s => lyt_textBox.s} | 82 +++++++++++++++++ asm/libnw4r_lyt/lyt_textBox_80406288.s | 4 - asm/libnw4r_lyt/lyt_textBox_80441320.s | 40 --------- asm/libnw4r_lyt/lyt_textBox_80556a48.s | 8 -- asm/libnw4r_lyt/lyt_textBox_8055cfb8.s | 6 -- asm/libnw4r_lyt/lyt_textBox_8055f148.s | 24 ----- .../{lyt_util_800fe8a0.s => lyt_util.s} | 0 .../{lyt_window_800f6ab0.s => lyt_window.s} | 90 +++++++++++++++++++ asm/libnw4r_lyt/lyt_window_8040628c.s | 4 - asm/libnw4r_lyt/lyt_window_804413a8.s | 60 ------------- asm/libnw4r_lyt/lyt_window_8055cfc0.s | 6 -- asm/libnw4r_lyt/lyt_window_8055f160.s | 20 ----- obj_files.mk | 69 ++++---------- 54 files changed, 660 insertions(+), 697 deletions(-) rename asm/libnw4r_lyt/{lyt_animation_800fc270.s => lyt_animation.s} (98%) delete mode 100644 asm/libnw4r_lyt/lyt_animation_80441568.s delete mode 100644 asm/libnw4r_lyt/lyt_animation_8055f1b0.s rename asm/libnw4r_lyt/{lyt_arcResourceAccessor_800fd8b0.s => lyt_arcResourceAccessor.s} (96%) delete mode 100644 asm/libnw4r_lyt/lyt_arcResourceAccessor_804415a8.s delete mode 100644 asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.s rename asm/libnw4r_lyt/{lyt_bounding_800f9050.s => lyt_bounding.s} (64%) delete mode 100644 asm/libnw4r_lyt/lyt_bounding_80406290.s delete mode 100644 asm/libnw4r_lyt/lyt_bounding_80441470.s delete mode 100644 asm/libnw4r_lyt/lyt_bounding_8055cfc8.s rename asm/libnw4r_lyt/{lyt_common_800fdd40.s => lyt_common.s} (98%) delete mode 100644 asm/libnw4r_lyt/lyt_common_80528500.s delete mode 100644 asm/libnw4r_lyt/lyt_common_8055cfd0.s delete mode 100644 asm/libnw4r_lyt/lyt_common_8055f1d0.s rename asm/libnw4r_lyt/{lyt_drawInfo_800fc1e0.s => lyt_drawInfo.s} (84%) delete mode 100644 asm/libnw4r_lyt/lyt_drawInfo_80441558.s delete mode 100644 asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.s rename asm/libnw4r_lyt/{lyt_group_800f3af0.s => lyt_group.s} (98%) delete mode 100644 asm/libnw4r_lyt/lyt_group_80441258.s rename asm/libnw4r_lyt/{lyt_layout_800f3e50.s => lyt_layout.s} (97%) delete mode 100644 asm/libnw4r_lyt/lyt_layout_80441268.s delete mode 100644 asm/libnw4r_lyt/lyt_layout_8055cfa8.s delete mode 100644 asm/libnw4r_lyt/lyt_layout_8055f138.s rename asm/libnw4r_lyt/{lyt_material_800f9120.s => lyt_material.s} (98%) delete mode 100644 asm/libnw4r_lyt/lyt_material_804414e8.s delete mode 100644 asm/libnw4r_lyt/lyt_material_8055f178.s delete mode 100644 asm/libnw4r_lyt/lyt_material_805643d0.s rename asm/libnw4r_lyt/{lyt_pane_800f2ba0.s => lyt_pane.s} (96%) delete mode 100644 asm/libnw4r_lyt/lyt_pane_80406280.s delete mode 100644 asm/libnw4r_lyt/lyt_pane_804411d8.s delete mode 100644 asm/libnw4r_lyt/lyt_pane_8055cfa0.s delete mode 100644 asm/libnw4r_lyt/lyt_pane_8055f118.s rename asm/libnw4r_lyt/{lyt_picture_800f4db0.s => lyt_picture.s} (90%) delete mode 100644 asm/libnw4r_lyt/lyt_picture_80406284.s delete mode 100644 asm/libnw4r_lyt/lyt_picture_804412a8.s delete mode 100644 asm/libnw4r_lyt/lyt_picture_8055cfb0.s delete mode 100644 asm/libnw4r_lyt/lyt_picture_8055f140.s rename asm/libnw4r_lyt/{lyt_resourceAccessor_800fd880.s => lyt_resourceAccessor.s} (77%) delete mode 100644 asm/libnw4r_lyt/lyt_resourceAccessor_80441590.s rename asm/libnw4r_lyt/{lyt_texMap_800fc000.s => lyt_texMap.s} (97%) delete mode 100644 asm/libnw4r_lyt/lyt_texMap_8055f198.s rename asm/libnw4r_lyt/{lyt_textBox_800f5340.s => lyt_textBox.s} (97%) delete mode 100644 asm/libnw4r_lyt/lyt_textBox_80406288.s delete mode 100644 asm/libnw4r_lyt/lyt_textBox_80441320.s delete mode 100644 asm/libnw4r_lyt/lyt_textBox_80556a48.s delete mode 100644 asm/libnw4r_lyt/lyt_textBox_8055cfb8.s delete mode 100644 asm/libnw4r_lyt/lyt_textBox_8055f148.s rename asm/libnw4r_lyt/{lyt_util_800fe8a0.s => lyt_util.s} (100%) rename asm/libnw4r_lyt/{lyt_window_800f6ab0.s => lyt_window.s} (97%) delete mode 100644 asm/libnw4r_lyt/lyt_window_8040628c.s delete mode 100644 asm/libnw4r_lyt/lyt_window_804413a8.s delete mode 100644 asm/libnw4r_lyt/lyt_window_8055cfc0.s delete mode 100644 asm/libnw4r_lyt/lyt_window_8055f160.s diff --git a/asm/libnw4r_lyt/lyt_animation_800fc270.s b/asm/libnw4r_lyt/lyt_animation.s similarity index 98% rename from asm/libnw4r_lyt/lyt_animation_800fc270.s rename to asm/libnw4r_lyt/lyt_animation.s index c13a8775..4390556f 100644 --- a/asm/libnw4r_lyt/lyt_animation_800fc270.s +++ b/asm/libnw4r_lyt/lyt_animation.s @@ -1796,3 +1796,61 @@ lbl_800FD854: /* 800FD874 000F96B4 00 00 00 00 */ .4byte 0x00000000 /* 800FD878 000F96B8 00 00 00 00 */ .4byte 0x00000000 /* 800FD87C 000F96BC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt18AnimTransformBasic +__vt__Q34nw4r3lyt18AnimTransformBasic: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt18AnimTransformBasicFv + .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessor + .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessorUs + .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt4Panebb + .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt8Materialb + .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt4Pane + .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt8Material + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10121" +"@10121": + + .4byte 0xBA83126F + +.global "@10122" +"@10122": + + .4byte 0x3A83126F + +.global "@10146" +"@10146": + + .4byte 0x3F800000 + +.global "@10147" +"@10147": + + .4byte 0x40000000 + +.global "@10148" +"@10148": + + .4byte 0x40400000 + +.global "@10149" +"@10149": + + .4byte 0xC0000000 + +.global "@10154" +"@10154": + + .4byte 0 + +.global "@10434" +"@10434": + + .4byte 0x3F000000 diff --git a/asm/libnw4r_lyt/lyt_animation_80441568.s b/asm/libnw4r_lyt/lyt_animation_80441568.s deleted file mode 100644 index 3abb8d06..00000000 --- a/asm/libnw4r_lyt/lyt_animation_80441568.s +++ /dev/null @@ -1,16 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt18AnimTransformBasic -__vt__Q34nw4r3lyt18AnimTransformBasic: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt18AnimTransformBasicFv - .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessor - .4byte SetResource__Q34nw4r3lyt18AnimTransformBasicFPCQ44nw4r3lyt3res14AnimationBlockPQ34nw4r3lyt16ResourceAccessorUs - .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt4Panebb - .4byte Bind__Q34nw4r3lyt18AnimTransformBasicFPQ34nw4r3lyt8Materialb - .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt4Pane - .4byte Animate__Q34nw4r3lyt18AnimTransformBasicFUlPQ34nw4r3lyt8Material - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_animation_8055f1b0.s b/asm/libnw4r_lyt/lyt_animation_8055f1b0.s deleted file mode 100644 index 097d5a9e..00000000 --- a/asm/libnw4r_lyt/lyt_animation_8055f1b0.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10121" -"@10121": - - .4byte 0xBA83126F - -.global "@10122" -"@10122": - - .4byte 0x3A83126F - -.global "@10146" -"@10146": - - .4byte 0x3F800000 - -.global "@10147" -"@10147": - - .4byte 0x40000000 - -.global "@10148" -"@10148": - - .4byte 0x40400000 - -.global "@10149" -"@10149": - - .4byte 0xC0000000 - -.global "@10154" -"@10154": - - .4byte 0 - -.global "@10434" -"@10434": - - .4byte 0x3F000000 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor_800fd8b0.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s similarity index 96% rename from asm/libnw4r_lyt/lyt_arcResourceAccessor_800fd8b0.s rename to asm/libnw4r_lyt/lyt_arcResourceAccessor.s index 3e95770b..b01b9bca 100644 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor_800fd8b0.s +++ b/asm/libnw4r_lyt/lyt_arcResourceAccessor.s @@ -352,3 +352,27 @@ lbl_800FDD20: /* 800FDD34 000F9B74 38 21 00 10 */ addi r1, r1, 0x10 /* 800FDD38 000F9B78 4E 80 00 20 */ blr /* 800FDD3C 000F9B7C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt19ArcResourceAccessor +__vt__Q34nw4r3lyt19ArcResourceAccessor: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt19ArcResourceAccessorFv + .4byte GetResource__Q34nw4r3lyt19ArcResourceAccessorFUlPCcPUl + .4byte GetFont__Q34nw4r3lyt19ArcResourceAccessorFPCc + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@3486_80556A50" +"@3486_80556A50": + + .4byte 0x2E000000 + +.global "@3487_80556A54" +"@3487_80556A54": + + .4byte 0x2E2E0000 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor_804415a8.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor_804415a8.s deleted file mode 100644 index 69eff445..00000000 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor_804415a8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt19ArcResourceAccessor -__vt__Q34nw4r3lyt19ArcResourceAccessor: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt19ArcResourceAccessorFv - .4byte GetResource__Q34nw4r3lyt19ArcResourceAccessorFUlPCcPUl - .4byte GetFont__Q34nw4r3lyt19ArcResourceAccessorFPCc - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.s b/asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.s deleted file mode 100644 index ca34db1b..00000000 --- a/asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@3486_80556A50" -"@3486_80556A50": - - .4byte 0x2E000000 - -.global "@3487_80556A54" -"@3487_80556A54": - - .4byte 0x2E2E0000 diff --git a/asm/libnw4r_lyt/lyt_bounding_800f9050.s b/asm/libnw4r_lyt/lyt_bounding.s similarity index 64% rename from asm/libnw4r_lyt/lyt_bounding_800f9050.s rename to asm/libnw4r_lyt/lyt_bounding.s index 6179ea07..560b4794 100644 --- a/asm/libnw4r_lyt/lyt_bounding_800f9050.s +++ b/asm/libnw4r_lyt/lyt_bounding.s @@ -69,3 +69,49 @@ GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv: /* 800F9114 000F4F54 90 0D EB A8 */ stw r0, typeInfo__Q34nw4r3lyt8Bounding@sda21(r13) /* 800F9118 000F4F58 4E 80 00 20 */ blr /* 800F911C 000F4F5C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1lyt_bounding_cpp_800F9110" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt8Bounding +__vt__Q34nw4r3lyt8Bounding: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt8BoundingFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r3lyt8Bounding +typeInfo__Q34nw4r3lyt8Bounding: + .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_bounding_80406290.s b/asm/libnw4r_lyt/lyt_bounding_80406290.s deleted file mode 100644 index 045a94b1..00000000 --- a/asm/libnw4r_lyt/lyt_bounding_80406290.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1lyt_bounding_cpp_800F9110" diff --git a/asm/libnw4r_lyt/lyt_bounding_80441470.s b/asm/libnw4r_lyt/lyt_bounding_80441470.s deleted file mode 100644 index ebf96d51..00000000 --- a/asm/libnw4r_lyt/lyt_bounding_80441470.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt8Bounding -__vt__Q34nw4r3lyt8Bounding: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt8BoundingFv - .4byte GetRuntimeTypeInfo__Q34nw4r3lyt8BoundingCFv - .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte DrawSelf__Q34nw4r3lyt8BoundingFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt4PaneFUl - .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl - .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl - .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color - .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl - .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_bounding_8055cfc8.s b/asm/libnw4r_lyt/lyt_bounding_8055cfc8.s deleted file mode 100644 index 16d80da6..00000000 --- a/asm/libnw4r_lyt/lyt_bounding_8055cfc8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r3lyt8Bounding -typeInfo__Q34nw4r3lyt8Bounding: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_common_800fdd40.s b/asm/libnw4r_lyt/lyt_common.s similarity index 98% rename from asm/libnw4r_lyt/lyt_common_800fdd40.s rename to asm/libnw4r_lyt/lyt_common.s index 58112168..e0cf6174 100644 --- a/asm/libnw4r_lyt/lyt_common_800fdd40.s +++ b/asm/libnw4r_lyt/lyt_common.s @@ -857,3 +857,27 @@ lbl_800FE888: /* 800FE894 000FA6D4 7C 08 03 A6 */ mtlr r0 /* 800FE898 000FA6D8 38 21 00 30 */ addi r1, r1, 0x30 /* 800FE89C 000FA6DC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "@LOCAL@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords" +"@LOCAL@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords": + .skip 0x20 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@GUARD@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords" +"@GUARD@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords": + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8721" +"@8721": + + .4byte 0 + +.global "@8722" +"@8722": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_common_80528500.s b/asm/libnw4r_lyt/lyt_common_80528500.s deleted file mode 100644 index acaa449f..00000000 --- a/asm/libnw4r_lyt/lyt_common_80528500.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "@LOCAL@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords" -"@LOCAL@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords": - .skip 0x20 diff --git a/asm/libnw4r_lyt/lyt_common_8055cfd0.s b/asm/libnw4r_lyt/lyt_common_8055cfd0.s deleted file mode 100644 index 014093b0..00000000 --- a/asm/libnw4r_lyt/lyt_common_8055cfd0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@GUARD@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords" -"@GUARD@SetSize__Q44nw4r3lyt6detail11TexCoordAryFUc@texCoords": - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_common_8055f1d0.s b/asm/libnw4r_lyt/lyt_common_8055f1d0.s deleted file mode 100644 index f7ca1a51..00000000 --- a/asm/libnw4r_lyt/lyt_common_8055f1d0.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8721" -"@8721": - - .4byte 0 - -.global "@8722" -"@8722": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_drawInfo_800fc1e0.s b/asm/libnw4r_lyt/lyt_drawInfo.s similarity index 84% rename from asm/libnw4r_lyt/lyt_drawInfo_800fc1e0.s rename to asm/libnw4r_lyt/lyt_drawInfo.s index 76828a55..9311eb90 100644 --- a/asm/libnw4r_lyt/lyt_drawInfo_800fc1e0.s +++ b/asm/libnw4r_lyt/lyt_drawInfo.s @@ -42,3 +42,25 @@ __dt__Q34nw4r3lyt8DrawInfoFv: /* 800FC264 000F80A4 00 00 00 00 */ .4byte 0x00000000 /* 800FC268 000F80A8 00 00 00 00 */ .4byte 0x00000000 /* 800FC26C 000F80AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt8DrawInfo +__vt__Q34nw4r3lyt8DrawInfo: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt8DrawInfoFv + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@5034_8055F1A8" +"@5034_8055F1A8": + + .4byte 0 + +.global "@5035_8055F1AC" +"@5035_8055F1AC": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_drawInfo_80441558.s b/asm/libnw4r_lyt/lyt_drawInfo_80441558.s deleted file mode 100644 index a25feb79..00000000 --- a/asm/libnw4r_lyt/lyt_drawInfo_80441558.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt8DrawInfo -__vt__Q34nw4r3lyt8DrawInfo: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt8DrawInfoFv - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.s b/asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.s deleted file mode 100644 index 8b938e18..00000000 --- a/asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@5034_8055F1A8" -"@5034_8055F1A8": - - .4byte 0 - -.global "@5035_8055F1AC" -"@5035_8055F1AC": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_group_800f3af0.s b/asm/libnw4r_lyt/lyt_group.s similarity index 98% rename from asm/libnw4r_lyt/lyt_group_800f3af0.s rename to asm/libnw4r_lyt/lyt_group.s index 402e0a95..8bd78d39 100644 --- a/asm/libnw4r_lyt/lyt_group_800f3af0.s +++ b/asm/libnw4r_lyt/lyt_group.s @@ -262,3 +262,13 @@ lbl_800F3E2C: /* 800F3E44 000EFC84 38 21 00 20 */ addi r1, r1, 0x20 /* 800F3E48 000EFC88 4E 80 00 20 */ blr /* 800F3E4C 000EFC8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt5Group +__vt__Q34nw4r3lyt5Group: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt5GroupFv + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_group_80441258.s b/asm/libnw4r_lyt/lyt_group_80441258.s deleted file mode 100644 index a2822ae6..00000000 --- a/asm/libnw4r_lyt/lyt_group_80441258.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt5Group -__vt__Q34nw4r3lyt5Group: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt5GroupFv - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_layout_800f3e50.s b/asm/libnw4r_lyt/lyt_layout.s similarity index 97% rename from asm/libnw4r_lyt/lyt_layout_800f3e50.s rename to asm/libnw4r_lyt/lyt_layout.s index 2d8caafb..c8d10576 100644 --- a/asm/libnw4r_lyt/lyt_layout_800f3e50.s +++ b/asm/libnw4r_lyt/lyt_layout.s @@ -1277,3 +1277,43 @@ lbl_800F4D94: /* 800F4DA4 000F0BE4 4E 80 00 20 */ blr /* 800F4DA8 000F0BE8 00 00 00 00 */ .4byte 0x00000000 /* 800F4DAC 000F0BEC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt6Layout +__vt__Q34nw4r3lyt6Layout: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt6LayoutFv + .4byte Build__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFv + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor + .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor + .4byte BindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAllAnimation__Q34nw4r3lyt6LayoutFv + .4byte BindAnimationAuto__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor + .4byte SetAnimationEnable__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransformb + .4byte CalculateMtx__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt6LayoutFUl + .4byte "SetTagProcessor__Q34nw4r3lyt6LayoutFPQ34nw4r2ut19TagProcessorBase" +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global mspAllocator__Q34nw4r3lyt6Layout +mspAllocator__Q34nw4r3lyt6Layout: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10260" +"@10260": + + .4byte 0 + +.global "@10651" +"@10651": + + .4byte 0x3F000000 diff --git a/asm/libnw4r_lyt/lyt_layout_80441268.s b/asm/libnw4r_lyt/lyt_layout_80441268.s deleted file mode 100644 index 352d2967..00000000 --- a/asm/libnw4r_lyt/lyt_layout_80441268.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt6Layout -__vt__Q34nw4r3lyt6Layout: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt6LayoutFv - .4byte Build__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor - .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFv - .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFPCvPQ34nw4r3lyt16ResourceAccessor - .4byte CreateAnimTransform__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor - .4byte BindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform - .4byte UnbindAnimation__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransform - .4byte UnbindAllAnimation__Q34nw4r3lyt6LayoutFv - .4byte BindAnimationAuto__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt12AnimResourcePQ34nw4r3lyt16ResourceAccessor - .4byte SetAnimationEnable__Q34nw4r3lyt6LayoutFPQ34nw4r3lyt13AnimTransformb - .4byte CalculateMtx__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt6LayoutFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt6LayoutFUl - .4byte "SetTagProcessor__Q34nw4r3lyt6LayoutFPQ34nw4r2ut19TagProcessorBase" diff --git a/asm/libnw4r_lyt/lyt_layout_8055cfa8.s b/asm/libnw4r_lyt/lyt_layout_8055cfa8.s deleted file mode 100644 index dc2b6f28..00000000 --- a/asm/libnw4r_lyt/lyt_layout_8055cfa8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global mspAllocator__Q34nw4r3lyt6Layout -mspAllocator__Q34nw4r3lyt6Layout: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_layout_8055f138.s b/asm/libnw4r_lyt/lyt_layout_8055f138.s deleted file mode 100644 index f124cc30..00000000 --- a/asm/libnw4r_lyt/lyt_layout_8055f138.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10260" -"@10260": - - .4byte 0 - -.global "@10651" -"@10651": - - .4byte 0x3F000000 diff --git a/asm/libnw4r_lyt/lyt_material_800f9120.s b/asm/libnw4r_lyt/lyt_material.s similarity index 98% rename from asm/libnw4r_lyt/lyt_material_800f9120.s rename to asm/libnw4r_lyt/lyt_material.s index a1056932..a2a35c18 100644 --- a/asm/libnw4r_lyt/lyt_material_800f9120.s +++ b/asm/libnw4r_lyt/lyt_material.s @@ -3377,3 +3377,85 @@ lbl_800FBFB4: lbl_800FBFF8: /* 800FBFF8 000F7E38 38 21 00 20 */ addi r1, r1, 0x20 /* 800FBFFC 000F7E3C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kColSels" +"@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kColSels": + + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 + +.global "@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kAlpSels@0" +"@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kAlpSels@0": + + .4byte 0x0000001F + .4byte 0x0000001B + .4byte 0x00000017 + .4byte 0x00000013 + .4byte 0x0000001E + .4byte 0x0000001A + .4byte 0x00000016 + .4byte 0x00000012 + +.global __vt__Q34nw4r3lyt8Material +__vt__Q34nw4r3lyt8Material: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt8MaterialFv + .4byte SetupGX__Q34nw4r3lyt8MaterialFbUc + .4byte BindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte UnbindAllAnimation__Q34nw4r3lyt8MaterialFv + .4byte Animate__Q34nw4r3lyt8MaterialFv + .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransformb + .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResourceb +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10055" +"@10055": + + .4byte 0x3F000000 + +.global "@10056" +"@10056": + + .4byte 0x3F360B61 + +.global "@10057" +"@10057": + + .4byte 0 + +.global "@10058" +"@10058": + + .4byte 0x3F800000 + +.global "@10071" +"@10071": + + .4byte 0x40000000 + .4byte 0 + +.global "@12398" +"@12398": + + .4byte 0x43300000 + .4byte 0 +.include "macros.inc" + +.section .sbss2, "", @nobits # 0x805643C0 - 0x805643FC ; 0x0000003C +.global DefaultBlackColor_805643D0 +DefaultBlackColor_805643D0: + .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_material_804414e8.s b/asm/libnw4r_lyt/lyt_material_804414e8.s deleted file mode 100644 index b15185cd..00000000 --- a/asm/libnw4r_lyt/lyt_material_804414e8.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kColSels" -"@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kColSels": - - .4byte 0x0000001F - .4byte 0x0000001B - .4byte 0x00000017 - .4byte 0x00000013 - .4byte 0x0000001E - .4byte 0x0000001A - .4byte 0x00000016 - .4byte 0x00000012 - -.global "@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kAlpSels@0" -"@LOCAL@SetupGX__Q34nw4r3lyt8MaterialFbUc@kAlpSels@0": - - .4byte 0x0000001F - .4byte 0x0000001B - .4byte 0x00000017 - .4byte 0x00000013 - .4byte 0x0000001E - .4byte 0x0000001A - .4byte 0x00000016 - .4byte 0x00000012 - -.global __vt__Q34nw4r3lyt8Material -__vt__Q34nw4r3lyt8Material: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt8MaterialFv - .4byte SetupGX__Q34nw4r3lyt8MaterialFbUc - .4byte BindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .4byte UnbindAnimation__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .4byte UnbindAllAnimation__Q34nw4r3lyt8MaterialFv - .4byte Animate__Q34nw4r3lyt8MaterialFv - .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLink__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFPQ34nw4r3lyt13AnimTransformb - .4byte SetAnimationEnable__Q34nw4r3lyt8MaterialFRCQ34nw4r3lyt12AnimResourceb diff --git a/asm/libnw4r_lyt/lyt_material_8055f178.s b/asm/libnw4r_lyt/lyt_material_8055f178.s deleted file mode 100644 index 5c4d235f..00000000 --- a/asm/libnw4r_lyt/lyt_material_8055f178.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10055" -"@10055": - - .4byte 0x3F000000 - -.global "@10056" -"@10056": - - .4byte 0x3F360B61 - -.global "@10057" -"@10057": - - .4byte 0 - -.global "@10058" -"@10058": - - .4byte 0x3F800000 - -.global "@10071" -"@10071": - - .4byte 0x40000000 - .4byte 0 - -.global "@12398" -"@12398": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_material_805643d0.s b/asm/libnw4r_lyt/lyt_material_805643d0.s deleted file mode 100644 index b6e97cf9..00000000 --- a/asm/libnw4r_lyt/lyt_material_805643d0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss2, "", @nobits # 0x805643C0 - 0x805643FC ; 0x0000003C -.global DefaultBlackColor_805643D0 -DefaultBlackColor_805643D0: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_pane_800f2ba0.s b/asm/libnw4r_lyt/lyt_pane.s similarity index 96% rename from asm/libnw4r_lyt/lyt_pane_800f2ba0.s rename to asm/libnw4r_lyt/lyt_pane.s index c44eb1d2..b79af74d 100644 --- a/asm/libnw4r_lyt/lyt_pane_800f2ba0.s +++ b/asm/libnw4r_lyt/lyt_pane.s @@ -1213,3 +1213,89 @@ GetRuntimeTypeInfo__Q34nw4r3lyt4PaneCFv: /* 800F3AE4 000EF924 90 0D EB 80 */ stw r0, typeInfo__Q34nw4r3lyt4Pane@sda21(r13) /* 800F3AE8 000EF928 4E 80 00 20 */ blr /* 800F3AEC 000EF92C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1lyt_pane_cpp_800F3AE0" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@10224" +"@10224": + + .4byte 0x526F6F74 + .4byte 0x50616E65 + .4byte 0 + +.global __vt__Q34nw4r3lyt4Pane +__vt__Q34nw4r3lyt4Pane: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt4PaneFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt4PaneCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r3lyt4Pane +typeInfo__Q34nw4r3lyt4Pane: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9820" +"@9820": + + .4byte 0 + +.global "@9821" +"@9821": + + .4byte 0x3F800000 + +.global "@10109" +"@10109": + + .4byte 0x3F000000 + +.global "@10419" +"@10419": + + .4byte 0x3C8EFA35 + +.global "@10420" +"@10420": + + .4byte 0x3B808081 + .4byte 0 + +.global "@10424" +"@10424": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_pane_80406280.s b/asm/libnw4r_lyt/lyt_pane_80406280.s deleted file mode 100644 index cb4f7c60..00000000 --- a/asm/libnw4r_lyt/lyt_pane_80406280.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1lyt_pane_cpp_800F3AE0" diff --git a/asm/libnw4r_lyt/lyt_pane_804411d8.s b/asm/libnw4r_lyt/lyt_pane_804411d8.s deleted file mode 100644 index 8187e81b..00000000 --- a/asm/libnw4r_lyt/lyt_pane_804411d8.s +++ /dev/null @@ -1,42 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@10224" -"@10224": - - .4byte 0x526F6F74 - .4byte 0x50616E65 - .4byte 0 - -.global __vt__Q34nw4r3lyt4Pane -__vt__Q34nw4r3lyt4Pane: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt4PaneFv - .4byte GetRuntimeTypeInfo__Q34nw4r3lyt4PaneCFv - .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte DrawSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt4PaneFUl - .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl - .4byte GetVtxColor__Q34nw4r3lyt4PaneCFUl - .4byte SetVtxColor__Q34nw4r3lyt4PaneFUlQ34nw4r2ut5Color - .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte GetVtxColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetVtxColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl - .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo diff --git a/asm/libnw4r_lyt/lyt_pane_8055cfa0.s b/asm/libnw4r_lyt/lyt_pane_8055cfa0.s deleted file mode 100644 index 79ecd3bd..00000000 --- a/asm/libnw4r_lyt/lyt_pane_8055cfa0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r3lyt4Pane -typeInfo__Q34nw4r3lyt4Pane: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_pane_8055f118.s b/asm/libnw4r_lyt/lyt_pane_8055f118.s deleted file mode 100644 index 9639409a..00000000 --- a/asm/libnw4r_lyt/lyt_pane_8055f118.s +++ /dev/null @@ -1,34 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9820" -"@9820": - - .4byte 0 - -.global "@9821" -"@9821": - - .4byte 0x3F800000 - -.global "@10109" -"@10109": - - .4byte 0x3F000000 - -.global "@10419" -"@10419": - - .4byte 0x3C8EFA35 - -.global "@10420" -"@10420": - - .4byte 0x3B808081 - .4byte 0 - -.global "@10424" -"@10424": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_picture_800f4db0.s b/asm/libnw4r_lyt/lyt_picture.s similarity index 90% rename from asm/libnw4r_lyt/lyt_picture_800f4db0.s rename to asm/libnw4r_lyt/lyt_picture.s index 85fcd66b..6b3584c5 100644 --- a/asm/libnw4r_lyt/lyt_picture_800f4db0.s +++ b/asm/libnw4r_lyt/lyt_picture.s @@ -416,3 +416,57 @@ GetRuntimeTypeInfo__Q34nw4r3lyt7PictureCFv: /* 800F5334 000F1174 90 0D EB 90 */ stw r0, typeInfo__Q34nw4r3lyt7Picture@sda21(r13) /* 800F5338 000F1178 4E 80 00 20 */ blr /* 800F533C 000F117C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1lyt_picture_cpp_800F5330" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt7Picture +__vt__Q34nw4r3lyt7Picture: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt7PictureFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7PictureCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt7PictureCFUl + .4byte SetVtxColor__Q34nw4r3lyt7PictureFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt7PictureCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt7PictureFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Append__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt6TexMap +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r3lyt7Picture +typeInfo__Q34nw4r3lyt7Picture: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8804" +"@8804": + + .4byte 0 + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_picture_80406284.s b/asm/libnw4r_lyt/lyt_picture_80406284.s deleted file mode 100644 index a79066fe..00000000 --- a/asm/libnw4r_lyt/lyt_picture_80406284.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1lyt_picture_cpp_800F5330" diff --git a/asm/libnw4r_lyt/lyt_picture_804412a8.s b/asm/libnw4r_lyt/lyt_picture_804412a8.s deleted file mode 100644 index addfa198..00000000 --- a/asm/libnw4r_lyt/lyt_picture_804412a8.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt7Picture -__vt__Q34nw4r3lyt7Picture: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt7PictureFv - .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7PictureCFv - .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte DrawSelf__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt4PaneFUl - .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl - .4byte GetVtxColor__Q34nw4r3lyt7PictureCFUl - .4byte SetVtxColor__Q34nw4r3lyt7PictureFUlQ34nw4r2ut5Color - .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte GetVtxColorElement__Q34nw4r3lyt7PictureCFUl - .4byte SetVtxColorElement__Q34nw4r3lyt7PictureFUlUc - .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl - .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Append__Q34nw4r3lyt7PictureFRCQ34nw4r3lyt6TexMap diff --git a/asm/libnw4r_lyt/lyt_picture_8055cfb0.s b/asm/libnw4r_lyt/lyt_picture_8055cfb0.s deleted file mode 100644 index 312c398c..00000000 --- a/asm/libnw4r_lyt/lyt_picture_8055cfb0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r3lyt7Picture -typeInfo__Q34nw4r3lyt7Picture: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_picture_8055f140.s b/asm/libnw4r_lyt/lyt_picture_8055f140.s deleted file mode 100644 index 7fb202ad..00000000 --- a/asm/libnw4r_lyt/lyt_picture_8055f140.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8804" -"@8804": - - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor_800fd880.s b/asm/libnw4r_lyt/lyt_resourceAccessor.s similarity index 77% rename from asm/libnw4r_lyt/lyt_resourceAccessor_800fd880.s rename to asm/libnw4r_lyt/lyt_resourceAccessor.s index 6ffcd61a..8f1867a8 100644 --- a/asm/libnw4r_lyt/lyt_resourceAccessor_800fd880.s +++ b/asm/libnw4r_lyt/lyt_resourceAccessor.s @@ -20,3 +20,15 @@ GetFont__Q34nw4r3lyt16ResourceAccessorFPCc: /* 800FD8A4 000F96E4 00 00 00 00 */ .4byte 0x00000000 /* 800FD8A8 000F96E8 00 00 00 00 */ .4byte 0x00000000 /* 800FD8AC 000F96EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt16ResourceAccessor +__vt__Q34nw4r3lyt16ResourceAccessor: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt16ResourceAccessorFv + .4byte 0 + .4byte GetFont__Q34nw4r3lyt16ResourceAccessorFPCc + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_resourceAccessor_80441590.s b/asm/libnw4r_lyt/lyt_resourceAccessor_80441590.s deleted file mode 100644 index 637a505c..00000000 --- a/asm/libnw4r_lyt/lyt_resourceAccessor_80441590.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt16ResourceAccessor -__vt__Q34nw4r3lyt16ResourceAccessor: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt16ResourceAccessorFv - .4byte 0 - .4byte GetFont__Q34nw4r3lyt16ResourceAccessorFPCc - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_texMap_800fc000.s b/asm/libnw4r_lyt/lyt_texMap.s similarity index 97% rename from asm/libnw4r_lyt/lyt_texMap_800fc000.s rename to asm/libnw4r_lyt/lyt_texMap.s index 690ab013..71a527ca 100644 --- a/asm/libnw4r_lyt/lyt_texMap_800fc000.s +++ b/asm/libnw4r_lyt/lyt_texMap.s @@ -137,3 +137,17 @@ lbl_800FC1C4: /* 800FC1D4 000F8014 7C 08 03 A6 */ mtlr r0 /* 800FC1D8 000F8018 38 21 00 20 */ addi r1, r1, 0x20 /* 800FC1DC 000F801C 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@7564" +"@7564": + + .4byte 0x3B800000 + .4byte 0 + +.global "@7568" +"@7568": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_texMap_8055f198.s b/asm/libnw4r_lyt/lyt_texMap_8055f198.s deleted file mode 100644 index da99a408..00000000 --- a/asm/libnw4r_lyt/lyt_texMap_8055f198.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@7564" -"@7564": - - .4byte 0x3B800000 - .4byte 0 - -.global "@7568" -"@7568": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox_800f5340.s b/asm/libnw4r_lyt/lyt_textBox.s similarity index 97% rename from asm/libnw4r_lyt/lyt_textBox_800f5340.s rename to asm/libnw4r_lyt/lyt_textBox.s index b574a2d2..e3deea40 100644 --- a/asm/libnw4r_lyt/lyt_textBox_800f5340.s +++ b/asm/libnw4r_lyt/lyt_textBox.s @@ -1787,3 +1787,85 @@ GetRuntimeTypeInfo__Q34nw4r3lyt7TextBoxCFv: /* 800F6AA4 000F28E4 90 0D EB 98 */ stw r0, typeInfo__Q34nw4r3lyt7TextBox@sda21(r13) /* 800F6AA8 000F28E8 4E 80 00 20 */ blr /* 800F6AAC 000F28EC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1lyt_textBox_cpp_800F6AA0" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r3lyt7TextBox +__vt__Q34nw4r3lyt7TextBox: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt7TextBoxFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7TextBoxCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl + .4byte GetVtxColor__Q34nw4r3lyt7TextBoxCFUl + .4byte SetVtxColor__Q34nw4r3lyt7TextBoxFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt7TextBoxCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt7TextBoxFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl + .4byte LoadMtx__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo + .4byte AllocStringBuffer__Q34nw4r3lyt7TextBoxFUs + .4byte FreeStringBuffer__Q34nw4r3lyt7TextBoxFv + .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUs + .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUsUs + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@10917" +"@10917": + + .4byte 0x000A0000 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r3lyt7TextBox +typeInfo__Q34nw4r3lyt7TextBox: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@10401" +"@10401": + + .4byte 0 + .4byte 0 + +.global "@10454" +"@10454": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@10915" +"@10915": + + .4byte 0x3F000000 + +.global "@10916" +"@10916": + + .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_textBox_80406288.s b/asm/libnw4r_lyt/lyt_textBox_80406288.s deleted file mode 100644 index b2974092..00000000 --- a/asm/libnw4r_lyt/lyt_textBox_80406288.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1lyt_textBox_cpp_800F6AA0" diff --git a/asm/libnw4r_lyt/lyt_textBox_80441320.s b/asm/libnw4r_lyt/lyt_textBox_80441320.s deleted file mode 100644 index 4ecf94a7..00000000 --- a/asm/libnw4r_lyt/lyt_textBox_80441320.s +++ /dev/null @@ -1,40 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r3lyt7TextBox -__vt__Q34nw4r3lyt7TextBox: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt7TextBoxFv - .4byte GetRuntimeTypeInfo__Q34nw4r3lyt7TextBoxCFv - .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte DrawSelf__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt4PaneFUl - .4byte AnimateSelf__Q34nw4r3lyt4PaneFUl - .4byte GetVtxColor__Q34nw4r3lyt7TextBoxCFUl - .4byte SetVtxColor__Q34nw4r3lyt7TextBoxFUlQ34nw4r2ut5Color - .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte GetVtxColorElement__Q34nw4r3lyt7TextBoxCFUl - .4byte SetVtxColorElement__Q34nw4r3lyt7TextBoxFUlUc - .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .4byte FindMaterialByName__Q34nw4r3lyt4PaneFPCcb - .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .4byte UnbindAnimationSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .4byte GetMaterialNum__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFUl - .4byte LoadMtx__Q34nw4r3lyt7TextBoxFRCQ34nw4r3lyt8DrawInfo - .4byte AllocStringBuffer__Q34nw4r3lyt7TextBoxFUs - .4byte FreeStringBuffer__Q34nw4r3lyt7TextBoxFv - .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUs - .4byte SetString__Q34nw4r3lyt7TextBoxFPCwUsUs - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox_80556a48.s b/asm/libnw4r_lyt/lyt_textBox_80556a48.s deleted file mode 100644 index 60af0ced..00000000 --- a/asm/libnw4r_lyt/lyt_textBox_80556a48.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@10917" -"@10917": - - .4byte 0x000A0000 - .4byte 0 diff --git a/asm/libnw4r_lyt/lyt_textBox_8055cfb8.s b/asm/libnw4r_lyt/lyt_textBox_8055cfb8.s deleted file mode 100644 index 2c12f6ab..00000000 --- a/asm/libnw4r_lyt/lyt_textBox_8055cfb8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r3lyt7TextBox -typeInfo__Q34nw4r3lyt7TextBox: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_textBox_8055f148.s b/asm/libnw4r_lyt/lyt_textBox_8055f148.s deleted file mode 100644 index 78bc8c31..00000000 --- a/asm/libnw4r_lyt/lyt_textBox_8055f148.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@10401" -"@10401": - - .4byte 0 - .4byte 0 - -.global "@10454" -"@10454": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@10915" -"@10915": - - .4byte 0x3F000000 - -.global "@10916" -"@10916": - - .4byte 0x3F800000 diff --git a/asm/libnw4r_lyt/lyt_util_800fe8a0.s b/asm/libnw4r_lyt/lyt_util.s similarity index 100% rename from asm/libnw4r_lyt/lyt_util_800fe8a0.s rename to asm/libnw4r_lyt/lyt_util.s diff --git a/asm/libnw4r_lyt/lyt_window_800f6ab0.s b/asm/libnw4r_lyt/lyt_window.s similarity index 97% rename from asm/libnw4r_lyt/lyt_window_800f6ab0.s rename to asm/libnw4r_lyt/lyt_window.s index 4e830650..bb68668e 100644 --- a/asm/libnw4r_lyt/lyt_window_800f6ab0.s +++ b/asm/libnw4r_lyt/lyt_window.s @@ -2624,3 +2624,93 @@ GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv: /* 800F9044 000F4E84 90 0D EB A0 */ stw r0, typeInfo__Q34nw4r3lyt6Window@sda21(r13) /* 800F9048 000F4E88 4E 80 00 20 */ blr /* 800F904C 000F4E8C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1lyt_window_cpp_800F9040" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@LOCAL@GetTexutreFlipInfo__Q34nw4r3lyt24@unnamed@lyt_window_cpp@FUc@flipInfos" +"@LOCAL@GetTexutreFlipInfo__Q34nw4r3lyt24@unnamed@lyt_window_cpp@FUc@flipInfos": + + .4byte 0x00000100 + .4byte 0x00010101 + .4byte 0x00010100 + .4byte 0x00000101 + .4byte 0x00010001 + .4byte 0x00010101 + .4byte 0x00000100 + .4byte 0x00010001 + .4byte 0x00000101 + .4byte 0x01000100 + .4byte 0x01010001 + .4byte 0x01000000 + .4byte 0x00010100 + .4byte 0x01010000 + .4byte 0x00010100 + +.global __vt__Q34nw4r3lyt6Window +__vt__Q34nw4r3lyt6Window: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r3lyt6WindowFv + .4byte GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv + .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte DrawSelf__Q34nw4r3lyt6WindowFRCQ34nw4r3lyt8DrawInfo + .4byte Animate__Q34nw4r3lyt4PaneFUl + .4byte AnimateSelf__Q34nw4r3lyt6WindowFUl + .4byte GetVtxColor__Q34nw4r3lyt6WindowCFUl + .4byte SetVtxColor__Q34nw4r3lyt6WindowFUlQ34nw4r2ut5Color + .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl + .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc + .4byte GetVtxColorElement__Q34nw4r3lyt6WindowCFUl + .4byte SetVtxColorElement__Q34nw4r3lyt6WindowFUlUc + .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb + .4byte FindMaterialByName__Q34nw4r3lyt6WindowFPCcb + .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb + .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb + .4byte UnbindAnimationSelf__Q34nw4r3lyt6WindowFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform + .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb + .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb + .4byte GetMaterialNum__Q34nw4r3lyt6WindowCFv + .4byte GetMaterial__Q34nw4r3lyt4PaneCFv + .4byte GetMaterial__Q34nw4r3lyt6WindowCFUl + .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo + .4byte GetContentMaterial__Q34nw4r3lyt6WindowCFv + .4byte GetFrameMaterial__Q34nw4r3lyt6WindowCFUl + .4byte DrawContent__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame4__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc + .4byte DrawFrame8__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r3lyt6Window +typeInfo__Q34nw4r3lyt6Window: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@9836" +"@9836": + + .4byte 0 + .4byte 0 + +.global "@10228" +"@10228": + + .4byte 0x43300000 + .4byte 0 + +.global "@10229" +"@10229": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_lyt/lyt_window_8040628c.s b/asm/libnw4r_lyt/lyt_window_8040628c.s deleted file mode 100644 index 23e55f6f..00000000 --- a/asm/libnw4r_lyt/lyt_window_8040628c.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1lyt_window_cpp_800F9040" diff --git a/asm/libnw4r_lyt/lyt_window_804413a8.s b/asm/libnw4r_lyt/lyt_window_804413a8.s deleted file mode 100644 index 900b8754..00000000 --- a/asm/libnw4r_lyt/lyt_window_804413a8.s +++ /dev/null @@ -1,60 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@LOCAL@GetTexutreFlipInfo__Q34nw4r3lyt24@unnamed@lyt_window_cpp@FUc@flipInfos" -"@LOCAL@GetTexutreFlipInfo__Q34nw4r3lyt24@unnamed@lyt_window_cpp@FUc@flipInfos": - - .4byte 0x00000100 - .4byte 0x00010101 - .4byte 0x00010100 - .4byte 0x00000101 - .4byte 0x00010001 - .4byte 0x00010101 - .4byte 0x00000100 - .4byte 0x00010001 - .4byte 0x00000101 - .4byte 0x01000100 - .4byte 0x01010001 - .4byte 0x01000000 - .4byte 0x00010100 - .4byte 0x01010000 - .4byte 0x00010100 - -.global __vt__Q34nw4r3lyt6Window -__vt__Q34nw4r3lyt6Window: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r3lyt6WindowFv - .4byte GetRuntimeTypeInfo__Q34nw4r3lyt6WindowCFv - .4byte CalculateMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte Draw__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte DrawSelf__Q34nw4r3lyt6WindowFRCQ34nw4r3lyt8DrawInfo - .4byte Animate__Q34nw4r3lyt4PaneFUl - .4byte AnimateSelf__Q34nw4r3lyt6WindowFUl - .4byte GetVtxColor__Q34nw4r3lyt6WindowCFUl - .4byte SetVtxColor__Q34nw4r3lyt6WindowFUlQ34nw4r2ut5Color - .4byte GetColorElement__Q34nw4r3lyt4PaneCFUl - .4byte SetColorElement__Q34nw4r3lyt4PaneFUlUc - .4byte GetVtxColorElement__Q34nw4r3lyt6WindowCFUl - .4byte SetVtxColorElement__Q34nw4r3lyt6WindowFUlUc - .4byte FindPaneByName__Q34nw4r3lyt4PaneFPCcb - .4byte FindMaterialByName__Q34nw4r3lyt6WindowFPCcb - .4byte BindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte UnbindAnimation__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformb - .4byte UnbindAllAnimation__Q34nw4r3lyt4PaneFb - .4byte UnbindAnimationSelf__Q34nw4r3lyt6WindowFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransform - .4byte FindAnimationLinkSelf__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResource - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFPQ34nw4r3lyt13AnimTransformbb - .4byte SetAnimationEnable__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt12AnimResourcebb - .4byte GetMaterialNum__Q34nw4r3lyt6WindowCFv - .4byte GetMaterial__Q34nw4r3lyt4PaneCFv - .4byte GetMaterial__Q34nw4r3lyt6WindowCFUl - .4byte LoadMtx__Q34nw4r3lyt4PaneFRCQ34nw4r3lyt8DrawInfo - .4byte GetContentMaterial__Q34nw4r3lyt6WindowCFv - .4byte GetFrameMaterial__Q34nw4r3lyt6WindowCFUl - .4byte DrawContent__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ34nw4r3lyt15WindowFrameSizeUc - .4byte DrawFrame__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2RCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc - .4byte DrawFrame4__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc - .4byte DrawFrame8__Q34nw4r3lyt6WindowFRCQ34nw4r4math4VEC2PCQ44nw4r3lyt6Window5FrameRCQ34nw4r3lyt15WindowFrameSizeUc diff --git a/asm/libnw4r_lyt/lyt_window_8055cfc0.s b/asm/libnw4r_lyt/lyt_window_8055cfc0.s deleted file mode 100644 index 26714685..00000000 --- a/asm/libnw4r_lyt/lyt_window_8055cfc0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r3lyt6Window -typeInfo__Q34nw4r3lyt6Window: - .skip 0x8 diff --git a/asm/libnw4r_lyt/lyt_window_8055f160.s b/asm/libnw4r_lyt/lyt_window_8055f160.s deleted file mode 100644 index 09747fcc..00000000 --- a/asm/libnw4r_lyt/lyt_window_8055f160.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@9836" -"@9836": - - .4byte 0 - .4byte 0 - -.global "@10228" -"@10228": - - .4byte 0x43300000 - .4byte 0 - -.global "@10229" -"@10229": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/obj_files.mk b/obj_files.mk index 435af51a..fe3052a1 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -427,23 +427,24 @@ $(BUILD_DIR)/asm/libnw4r_g3d/g3d_fog.o \ $(BUILD_DIR)/asm/libnw4r_g3d/g3d_light.o \ $(BUILD_DIR)/asm/libnw4r_g3d/g3d_calcvtx.o \ \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_group.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_bounding.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_material.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_texMap.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_drawInfo.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_animation.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_resourceAccessor.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_common.o \ +$(BUILD_DIR)/asm/libnw4r_lyt/lyt_util.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_pane_800f2ba0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_group_800f3af0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_800f3e50.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_800f4db0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_800f5340.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window_800f6ab0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_bounding_800f9050.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_material_800f9120.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_texMap_800fc000.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_drawInfo_800fc1e0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_animation_800fc270.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_resourceAccessor_800fd880.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor_800fd8b0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_common_800fdd40.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_util_800fe8a0.o \ $(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_800fe910.o \ $(BUILD_DIR)/asm/libnw4r_math/math_triangular_800feaa0.o \ $(BUILD_DIR)/asm/libnw4r_math/math_types_800fedc0.o \ @@ -2914,11 +2915,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_lyt/lyt_pane_80406280.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_80406284.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_80406288.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window_8040628c.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_bounding_80406290.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_80406294.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_BasicSound_80406298.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_SeqSound_8040629c.o \ @@ -3200,18 +3196,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_lyt/lyt_pane_804411d8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_group_80441258.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_80441268.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_804412a8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_80441320.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window_804413a8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_bounding_80441470.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_material_804414e8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_drawInfo_80441558.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_animation_80441568.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_resourceAccessor_80441590.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor_804415a8.o \ $(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_804415c0.o \ $(BUILD_DIR)/asm/libnw4r_math/math_triangular_80441ed0.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_BasicPlayer_80441fd8.o \ @@ -4890,7 +4874,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_lyt/lyt_common_80528500.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_80528520.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxVoiceManager_80528930.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_Channel_80528968.o \ @@ -4982,8 +4965,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_lyt/lyt_textBox_80556a48.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_arcResourceAccessor_80556a50.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_MmlParser_80556a58.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_SoundSystem_80556a68.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_Util_80556a70.o \ @@ -5372,13 +5353,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_lyt/lyt_pane_8055cfa0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_8055cfa8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_8055cfb0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_8055cfb8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window_8055cfc0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_bounding_8055cfc8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_common_8055cfd0.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxManager_8055cfd8.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_AxVoiceManager_8055cff0.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_BasicSound_8055cff8.o \ @@ -5548,16 +5522,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_lyt/lyt_pane_8055f118.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_layout_8055f138.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_picture_8055f140.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_textBox_8055f148.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_window_8055f160.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_material_8055f178.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_texMap_8055f198.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_drawInfo_8055f1a8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_animation_8055f1b0.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_common_8055f1d0.o \ $(BUILD_DIR)/asm/libnw4r_math/math_arithmetic_8055f1d8.o \ $(BUILD_DIR)/asm/libnw4r_math/math_triangular_8055f1f8.o \ $(BUILD_DIR)/asm/libnw4r_math/math_types_8055f218.o \ @@ -6608,7 +6572,6 @@ $(BUILD_DIR)/asm/src/AnimController_80564388.o \ $(BUILD_DIR)/asm/src/CurveUtility_80564390.o \ $(BUILD_DIR)/asm/src/FrameCounter_80564398.o \ $(BUILD_DIR)/asm/src/UIntAABBox_805643a8.o \ -$(BUILD_DIR)/asm/libnw4r_lyt/lyt_material_805643d0.o \ $(BUILD_DIR)/asm/src/RenderSetting_805643d8.o \ $(BUILD_DIR)/asm/src/LandLayer_805643e0.o \ $(BUILD_DIR)/asm/src/MoveGridGroup_805643e8.o \