From 5f092f38ad06e17157ed71ee713a1bf6d9eca4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= Date: Mon, 17 Oct 2022 10:02:14 +0100 Subject: [PATCH] merge nrel --- asm/nrel/{Alert_8014b848.s => Alert.s} | 8 + .../{AlertStyle_8014b914.s => AlertStyle.s} | 0 asm/nrel/Alert_8055f550.s | 8 - asm/nrel/{Block_8014c6d8.s => Block.s} | 24 + asm/nrel/Block_80446fc8.s | 24 - .../{CoreHolder_8014c05c.s => CoreHolder.s} | 0 ...pAccessor_8014c734.s => ExpHeapAccessor.s} | 426 ++++++++++++++++++ asm/nrel/ExpHeapAccessor_80447000.s | 404 ----------------- asm/nrel/ExpHeapAccessor_80556aa8.s | 8 - asm/nrel/ExpHeapAccessor_8055f580.s | 14 - ...eapMapUser_8014b97c.s => ExpHeapMapUser.s} | 108 +++++ asm/nrel/ExpHeapMapUser_80446c58.s | 94 ---- asm/nrel/ExpHeapMapUser_80556a98.s | 14 - ...eapSupport_8014d06c.s => ExpHeapSupport.s} | 26 ++ asm/nrel/ExpHeapSupport_804475e8.s | 26 -- ...ttingFor2D_8014c2fc.s => GXSettingFor2D.s} | 22 + asm/nrel/GXSettingFor2D_8055f568.s | 22 - asm/nrel/{HeapMap_8014bc6c.s => HeapMap.s} | 0 ...Drawer_8014bca8.s => HeapMapBlockDrawer.s} | 92 ++++ asm/nrel/HeapMapBlockDrawer_80446d58.s | 78 ---- asm/nrel/HeapMapBlockDrawer_8055f558.s | 14 - ...etting_8014c440.s => OrthoCameraSetting.s} | 0 asm/nrel/{Render2D_8014c4ac.s => Render2D.s} | 8 + asm/nrel/Render2D_8055f578.s | 8 - .../{StringStyle_8014c098.s => StringStyle.s} | 0 .../{TextWriter_8014c0ec.s => TextWriter.s} | 130 ++++++ asm/nrel/TextWriter_80446e68.s | 130 ------ ...rtSetting_8014c6bc.s => ViewportSetting.s} | 0 obj_files.mk | 44 +- 29 files changed, 860 insertions(+), 872 deletions(-) rename asm/nrel/{Alert_8014b848.s => Alert.s} (95%) rename asm/nrel/{AlertStyle_8014b914.s => AlertStyle.s} (100%) delete mode 100644 asm/nrel/Alert_8055f550.s rename asm/nrel/{Block_8014c6d8.s => Block.s} (77%) delete mode 100644 asm/nrel/Block_80446fc8.s rename asm/nrel/{CoreHolder_8014c05c.s => CoreHolder.s} (100%) rename asm/nrel/{ExpHeapAccessor_8014c734.s => ExpHeapAccessor.s} (81%) delete mode 100644 asm/nrel/ExpHeapAccessor_80447000.s delete mode 100644 asm/nrel/ExpHeapAccessor_80556aa8.s delete mode 100644 asm/nrel/ExpHeapAccessor_8055f580.s rename asm/nrel/{ExpHeapMapUser_8014b97c.s => ExpHeapMapUser.s} (82%) delete mode 100644 asm/nrel/ExpHeapMapUser_80446c58.s delete mode 100644 asm/nrel/ExpHeapMapUser_80556a98.s rename asm/nrel/{ExpHeapSupport_8014d06c.s => ExpHeapSupport.s} (93%) delete mode 100644 asm/nrel/ExpHeapSupport_804475e8.s rename asm/nrel/{GXSettingFor2D_8014c2fc.s => GXSettingFor2D.s} (94%) delete mode 100644 asm/nrel/GXSettingFor2D_8055f568.s rename asm/nrel/{HeapMap_8014bc6c.s => HeapMap.s} (100%) rename asm/nrel/{HeapMapBlockDrawer_8014bca8.s => HeapMapBlockDrawer.s} (89%) delete mode 100644 asm/nrel/HeapMapBlockDrawer_80446d58.s delete mode 100644 asm/nrel/HeapMapBlockDrawer_8055f558.s rename asm/nrel/{OrthoCameraSetting_8014c440.s => OrthoCameraSetting.s} (100%) rename asm/nrel/{Render2D_8014c4ac.s => Render2D.s} (98%) delete mode 100644 asm/nrel/Render2D_8055f578.s rename asm/nrel/{StringStyle_8014c098.s => StringStyle.s} (100%) rename asm/nrel/{TextWriter_8014c0ec.s => TextWriter.s} (73%) delete mode 100644 asm/nrel/TextWriter_80446e68.s rename asm/nrel/{ViewportSetting_8014c6bc.s => ViewportSetting.s} (100%) diff --git a/asm/nrel/Alert_8014b848.s b/asm/nrel/Alert.s similarity index 95% rename from asm/nrel/Alert_8014b848.s rename to asm/nrel/Alert.s index 28a8956a..bd019eb2 100644 --- a/asm/nrel/Alert_8014b848.s +++ b/asm/nrel/Alert.s @@ -62,3 +62,11 @@ __msl_error__3stdFPCc: /* 8014B908 00147748 7C 08 03 A6 */ mtlr r0 /* 8014B90C 0014774C 38 21 00 10 */ addi r1, r1, 0x10 /* 8014B910 00147750 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@21840" +"@21840": + + .4byte 0 + .4byte 0 diff --git a/asm/nrel/AlertStyle_8014b914.s b/asm/nrel/AlertStyle.s similarity index 100% rename from asm/nrel/AlertStyle_8014b914.s rename to asm/nrel/AlertStyle.s diff --git a/asm/nrel/Alert_8055f550.s b/asm/nrel/Alert_8055f550.s deleted file mode 100644 index 7844e72e..00000000 --- a/asm/nrel/Alert_8055f550.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@21840" -"@21840": - - .4byte 0 - .4byte 0 diff --git a/asm/nrel/Block_8014c6d8.s b/asm/nrel/Block.s similarity index 77% rename from asm/nrel/Block_8014c6d8.s rename to asm/nrel/Block.s index a64df74e..2e5804ea 100644 --- a/asm/nrel/Block_8014c6d8.s +++ b/asm/nrel/Block.s @@ -28,3 +28,27 @@ lbl_8014C71C: /* 8014C728 00148568 7C 08 03 A6 */ mtlr r0 /* 8014C72C 0014856C 38 21 00 10 */ addi r1, r1, 0x10 /* 8014C730 00148570 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@515_80446FC8" +"@515_80446FC8": + + .4byte 0x426C6F63 + .4byte 0x6B2E6370 + .4byte 0x70000000 + +.global "@516_80446FD4" +"@516_80446FD4": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206153 + .4byte 0x74617274 + .4byte 0x203C3D20 + .4byte 0x61456E64 + .4byte 0 + .4byte 0 diff --git a/asm/nrel/Block_80446fc8.s b/asm/nrel/Block_80446fc8.s deleted file mode 100644 index dad1eb4d..00000000 --- a/asm/nrel/Block_80446fc8.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@515_80446FC8" -"@515_80446FC8": - - .4byte 0x426C6F63 - .4byte 0x6B2E6370 - .4byte 0x70000000 - -.global "@516_80446FD4" -"@516_80446FD4": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206153 - .4byte 0x74617274 - .4byte 0x203C3D20 - .4byte 0x61456E64 - .4byte 0 - .4byte 0 diff --git a/asm/nrel/CoreHolder_8014c05c.s b/asm/nrel/CoreHolder.s similarity index 100% rename from asm/nrel/CoreHolder_8014c05c.s rename to asm/nrel/CoreHolder.s diff --git a/asm/nrel/ExpHeapAccessor_8014c734.s b/asm/nrel/ExpHeapAccessor.s similarity index 81% rename from asm/nrel/ExpHeapAccessor_8014c734.s rename to asm/nrel/ExpHeapAccessor.s index 389c8b37..32fb5d35 100644 --- a/asm/nrel/ExpHeapAccessor_8014c734.s +++ b/asm/nrel/ExpHeapAccessor.s @@ -693,3 +693,429 @@ headerPtr__Q34nrel3mem5BlockCFv: /* 8014D060 00148EA0 80 03 00 08 */ lwz r0, 0x8(r3) /* 8014D064 00148EA4 7C 64 02 14 */ add r3, r4, r0 /* 8014D068 00148EA8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@882_80447000" +"@882_80447000": + + .4byte 0x45787048 + .4byte 0x65617041 + .4byte 0x63636573 + .4byte 0x736F722E + .4byte 0x63707000 + +.global "@883_80447014" +"@883_80447014": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E204D45 + .4byte 0x4D497345 + .4byte 0x78704865 + .4byte 0x61702820 + .4byte 0x6148616E + .4byte 0x646C6520 + .4byte 0x29203D3D + .4byte 0x20545255 + .4byte 0x45000000 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E204475 + .4byte 0x6D705374 + .4byte 0x796C655F + .4byte 0x42656769 + .4byte 0x6E203C3D + .4byte 0x20615374 + .4byte 0x796C6520 + .4byte 0x26262061 + .4byte 0x5374796C + .4byte 0x65203C20 + .4byte 0x44756D70 + .4byte 0x5374796C + .4byte 0x655F456E + .4byte 0x64000000 + .4byte 0x5B646562 + .4byte 0x75673A3A + .4byte 0x6D656D6F + .4byte 0x72792048 + .4byte 0x65617044 + .4byte 0x756D705D + .4byte 0x0A000000 + .4byte 0x3C416273 + .4byte 0x74726163 + .4byte 0x743E0A00 + .4byte 0x20204865 + .4byte 0x61702052 + .4byte 0x616E6765 + .4byte 0x2020203A + .4byte 0x20253878 + .4byte 0x202D2025 + .4byte 0x38780A00 + .4byte 0x20205573 + .4byte 0x61626C65 + .4byte 0x2052616E + .4byte 0x6765203A + .4byte 0x20253878 + .4byte 0x202D2025 + .4byte 0x38780A00 + .4byte 0x2020546F + .4byte 0x74616C20 + .4byte 0x53697A65 + .4byte 0x2020203A + .4byte 0x20253964 + .4byte 0x20627974 + .4byte 0x65730A00 + .4byte 0x20205573 + .4byte 0x65642053 + .4byte 0x697A6520 + .4byte 0x2020203A + .4byte 0x20253964 + .4byte 0x20627974 + .4byte 0x65732028 + .4byte 0x25662529 + .4byte 0x0A000000 + .4byte 0x20204672 + .4byte 0x65652053 + .4byte 0x697A6520 + .4byte 0x2020203A + .4byte 0x20253964 + .4byte 0x20627974 + .4byte 0x65732028 + .4byte 0x25662529 + .4byte 0x0A000000 + .4byte 0x20205573 + .4byte 0x65642042 + .4byte 0x6C6F636B + .4byte 0x7320203A + .4byte 0x2025640A + .4byte 0 + .4byte 0x20204672 + .4byte 0x65652042 + .4byte 0x6C6F636B + .4byte 0x7320203A + .4byte 0x2025640A + .4byte 0 + .4byte 0x3C557365 + .4byte 0x6420426C + .4byte 0x6F636B73 + .4byte 0x3E0A0000 + .4byte 0x20204265 + .4byte 0x67696E41 + .4byte 0x64647220 + .4byte 0x456E6441 + .4byte 0x64647220 + .4byte 0x20204772 + .4byte 0x6F757020 + .4byte 0x416C6967 + .4byte 0x6E204865 + .4byte 0x61644164 + .4byte 0x64722020 + .4byte 0x44617461 + .4byte 0x41646472 + .4byte 0x20204461 + .4byte 0x74615369 + .4byte 0x7A652020 + .4byte 0x50726576 + .4byte 0x41646472 + .4byte 0x20204E65 + .4byte 0x78744164 + .4byte 0x64720A00 + .4byte 0x42656769 + .4byte 0x6E416464 + .4byte 0x722C456E + .4byte 0x64416464 + .4byte 0x722C4772 + .4byte 0x6F75702C + .4byte 0x416C6967 + .4byte 0x6E2C4865 + .4byte 0x61644164 + .4byte 0x64722C44 + .4byte 0x61746141 + .4byte 0x6464722C + .4byte 0x44617461 + .4byte 0x53697A65 + .4byte 0x2C507265 + .4byte 0x76416464 + .4byte 0x722C4E65 + .4byte 0x78744164 + .4byte 0x64722C0A + .4byte 0 + .4byte 0x20202530 + .4byte 0x38782020 + .4byte 0x25303878 + .4byte 0x20203078 + .4byte 0x25303278 + .4byte 0x20203078 + .4byte 0x25303278 + .4byte 0x20202530 + .4byte 0x38782020 + .4byte 0x25303878 + .4byte 0x20202538 + .4byte 0x64202025 + .4byte 0x30387820 + .4byte 0x20253038 + .4byte 0x780A0000 + .4byte 0x25303878 + .4byte 0x2C253038 + .4byte 0x782C3078 + .4byte 0x25303278 + .4byte 0x2C307825 + .4byte 0x3032782C + .4byte 0x25303878 + .4byte 0x2C253038 + .4byte 0x782C2564 + .4byte 0x2C253038 + .4byte 0x782C2530 + .4byte 0x38782C0A + .4byte 0 + .4byte 0x20204E6F + .4byte 0x7468696E + .4byte 0x670A0000 + .4byte 0x3C467265 + .4byte 0x6520426C + .4byte 0x6F636B73 + .4byte 0x3E0A0000 + .4byte 0x20204265 + .4byte 0x67696E41 + .4byte 0x64647220 + .4byte 0x456E6441 + .4byte 0x64647220 + .4byte 0x20205369 + .4byte 0x7A650A00 + .4byte 0x42656769 + .4byte 0x6E416464 + .4byte 0x722C456E + .4byte 0x64416464 + .4byte 0x722C5369 + .4byte 0x7A652C0A + .4byte 0 + .4byte 0x20202578 + .4byte 0x20202578 + .4byte 0x20202538 + .4byte 0x640A0000 + .4byte 0x25782C25 + .4byte 0x782C2564 + .4byte 0x2C0A0000 + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A68 + .4byte 0x616E646C + .4byte 0x655F283D + .4byte 0x25702920 + .4byte 0x6973206E + .4byte 0x6F742076 + .4byte 0x616C6964 + .4byte 0x20706F69 + .4byte 0x6E746572 + .4byte 0x2E000000 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206865 + .4byte 0x61642D3E + .4byte 0x704D4248 + .4byte 0x65616450 + .4byte 0x72657620 + .4byte 0x3D3D2030 + .4byte 0 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206865 + .4byte 0x61640000 + .4byte 0x496E7661 + .4byte 0x6C696420 + .4byte 0x5369676E + .4byte 0x61747572 + .4byte 0x65204173 + .4byte 0x20557365 + .4byte 0x64204D65 + .4byte 0x6D426C6F + .4byte 0x636B2041 + .4byte 0x74202530 + .4byte 0x38582028 + .4byte 0x2558290A + .4byte 0 + .4byte 0x496E7661 + .4byte 0x6C696420 + .4byte 0x5369676E + .4byte 0x61747572 + .4byte 0x65204173 + .4byte 0x20467265 + .4byte 0x65204D65 + .4byte 0x6D426C6F + .4byte 0x636B2041 + .4byte 0x74202530 + .4byte 0x38582028 + .4byte 0x2558290A + .4byte 0 + .4byte 0 + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A68 + .4byte 0x6561642D + .4byte 0x3E704D42 + .4byte 0x48656164 + .4byte 0x4E657874 + .4byte 0x283D2570 + .4byte 0x29206973 + .4byte 0x206E6F74 + .4byte 0x2076616C + .4byte 0x69642070 + .4byte 0x6F696E74 + .4byte 0x65722E00 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206865 + .4byte 0x61642D3E + .4byte 0x704D4248 + .4byte 0x6561644E + .4byte 0x6578742D + .4byte 0x3E704D42 + .4byte 0x48656164 + .4byte 0x50726576 + .4byte 0x203D3D20 + .4byte 0x68656164 + .4byte 0 + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A68 + .4byte 0x6561642D + .4byte 0x3E704D42 + .4byte 0x48656164 + .4byte 0x50726576 + .4byte 0x283D2570 + .4byte 0x29206973 + .4byte 0x206E6F74 + .4byte 0x2076616C + .4byte 0x69642070 + .4byte 0x6F696E74 + .4byte 0x65722E00 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206865 + .4byte 0x61642D3E + .4byte 0x704D4248 + .4byte 0x65616450 + .4byte 0x7265762D + .4byte 0x3E704D42 + .4byte 0x48656164 + .4byte 0x4E657874 + .4byte 0x203D3D20 + .4byte 0x68656164 + .4byte 0 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206861 + .4byte 0x734E6578 + .4byte 0x74282900 + .4byte 0x45787048 + .4byte 0x65617042 + .4byte 0x6C6F636B + .4byte 0x49746572 + .4byte 0x61746F72 + .4byte 0x2E687070 + .4byte 0 + +.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@2" +"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@2": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E207074 + .4byte 0x722D3E70 + .4byte 0x4D424865 + .4byte 0x61645072 + .4byte 0x6576203D + .4byte 0x3D203000 + +.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@1" +"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@1": + + .4byte 0x45787048 + .4byte 0x65617042 + .4byte 0x6C6F636B + .4byte 0x49746572 + .4byte 0x61746F72 + .4byte 0x2E687070 + .4byte 0 + +.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@0" +"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@0": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A70 + .4byte 0x7472283D + .4byte 0x25702920 + .4byte 0x6973206E + .4byte 0x6F742076 + .4byte 0x616C6964 + .4byte 0x20706F69 + .4byte 0x6E746572 + .4byte 0x2E000000 + +.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead" +"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead": + + .4byte 0x45787048 + .4byte 0x65617042 + .4byte 0x6C6F636B + .4byte 0x49746572 + .4byte 0x61746F72 + .4byte 0x2E687070 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@1059" +"@1059": + + .4byte 0x0A000000 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@1044" +"@1044": + + .4byte 0x42C80000 + .4byte 0 + +.global "@1063" +"@1063": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/nrel/ExpHeapAccessor_80447000.s b/asm/nrel/ExpHeapAccessor_80447000.s deleted file mode 100644 index fb08d18a..00000000 --- a/asm/nrel/ExpHeapAccessor_80447000.s +++ /dev/null @@ -1,404 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@882_80447000" -"@882_80447000": - - .4byte 0x45787048 - .4byte 0x65617041 - .4byte 0x63636573 - .4byte 0x736F722E - .4byte 0x63707000 - -.global "@883_80447014" -"@883_80447014": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E204D45 - .4byte 0x4D497345 - .4byte 0x78704865 - .4byte 0x61702820 - .4byte 0x6148616E - .4byte 0x646C6520 - .4byte 0x29203D3D - .4byte 0x20545255 - .4byte 0x45000000 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E204475 - .4byte 0x6D705374 - .4byte 0x796C655F - .4byte 0x42656769 - .4byte 0x6E203C3D - .4byte 0x20615374 - .4byte 0x796C6520 - .4byte 0x26262061 - .4byte 0x5374796C - .4byte 0x65203C20 - .4byte 0x44756D70 - .4byte 0x5374796C - .4byte 0x655F456E - .4byte 0x64000000 - .4byte 0x5B646562 - .4byte 0x75673A3A - .4byte 0x6D656D6F - .4byte 0x72792048 - .4byte 0x65617044 - .4byte 0x756D705D - .4byte 0x0A000000 - .4byte 0x3C416273 - .4byte 0x74726163 - .4byte 0x743E0A00 - .4byte 0x20204865 - .4byte 0x61702052 - .4byte 0x616E6765 - .4byte 0x2020203A - .4byte 0x20253878 - .4byte 0x202D2025 - .4byte 0x38780A00 - .4byte 0x20205573 - .4byte 0x61626C65 - .4byte 0x2052616E - .4byte 0x6765203A - .4byte 0x20253878 - .4byte 0x202D2025 - .4byte 0x38780A00 - .4byte 0x2020546F - .4byte 0x74616C20 - .4byte 0x53697A65 - .4byte 0x2020203A - .4byte 0x20253964 - .4byte 0x20627974 - .4byte 0x65730A00 - .4byte 0x20205573 - .4byte 0x65642053 - .4byte 0x697A6520 - .4byte 0x2020203A - .4byte 0x20253964 - .4byte 0x20627974 - .4byte 0x65732028 - .4byte 0x25662529 - .4byte 0x0A000000 - .4byte 0x20204672 - .4byte 0x65652053 - .4byte 0x697A6520 - .4byte 0x2020203A - .4byte 0x20253964 - .4byte 0x20627974 - .4byte 0x65732028 - .4byte 0x25662529 - .4byte 0x0A000000 - .4byte 0x20205573 - .4byte 0x65642042 - .4byte 0x6C6F636B - .4byte 0x7320203A - .4byte 0x2025640A - .4byte 0 - .4byte 0x20204672 - .4byte 0x65652042 - .4byte 0x6C6F636B - .4byte 0x7320203A - .4byte 0x2025640A - .4byte 0 - .4byte 0x3C557365 - .4byte 0x6420426C - .4byte 0x6F636B73 - .4byte 0x3E0A0000 - .4byte 0x20204265 - .4byte 0x67696E41 - .4byte 0x64647220 - .4byte 0x456E6441 - .4byte 0x64647220 - .4byte 0x20204772 - .4byte 0x6F757020 - .4byte 0x416C6967 - .4byte 0x6E204865 - .4byte 0x61644164 - .4byte 0x64722020 - .4byte 0x44617461 - .4byte 0x41646472 - .4byte 0x20204461 - .4byte 0x74615369 - .4byte 0x7A652020 - .4byte 0x50726576 - .4byte 0x41646472 - .4byte 0x20204E65 - .4byte 0x78744164 - .4byte 0x64720A00 - .4byte 0x42656769 - .4byte 0x6E416464 - .4byte 0x722C456E - .4byte 0x64416464 - .4byte 0x722C4772 - .4byte 0x6F75702C - .4byte 0x416C6967 - .4byte 0x6E2C4865 - .4byte 0x61644164 - .4byte 0x64722C44 - .4byte 0x61746141 - .4byte 0x6464722C - .4byte 0x44617461 - .4byte 0x53697A65 - .4byte 0x2C507265 - .4byte 0x76416464 - .4byte 0x722C4E65 - .4byte 0x78744164 - .4byte 0x64722C0A - .4byte 0 - .4byte 0x20202530 - .4byte 0x38782020 - .4byte 0x25303878 - .4byte 0x20203078 - .4byte 0x25303278 - .4byte 0x20203078 - .4byte 0x25303278 - .4byte 0x20202530 - .4byte 0x38782020 - .4byte 0x25303878 - .4byte 0x20202538 - .4byte 0x64202025 - .4byte 0x30387820 - .4byte 0x20253038 - .4byte 0x780A0000 - .4byte 0x25303878 - .4byte 0x2C253038 - .4byte 0x782C3078 - .4byte 0x25303278 - .4byte 0x2C307825 - .4byte 0x3032782C - .4byte 0x25303878 - .4byte 0x2C253038 - .4byte 0x782C2564 - .4byte 0x2C253038 - .4byte 0x782C2530 - .4byte 0x38782C0A - .4byte 0 - .4byte 0x20204E6F - .4byte 0x7468696E - .4byte 0x670A0000 - .4byte 0x3C467265 - .4byte 0x6520426C - .4byte 0x6F636B73 - .4byte 0x3E0A0000 - .4byte 0x20204265 - .4byte 0x67696E41 - .4byte 0x64647220 - .4byte 0x456E6441 - .4byte 0x64647220 - .4byte 0x20205369 - .4byte 0x7A650A00 - .4byte 0x42656769 - .4byte 0x6E416464 - .4byte 0x722C456E - .4byte 0x64416464 - .4byte 0x722C5369 - .4byte 0x7A652C0A - .4byte 0 - .4byte 0x20202578 - .4byte 0x20202578 - .4byte 0x20202538 - .4byte 0x640A0000 - .4byte 0x25782C25 - .4byte 0x782C2564 - .4byte 0x2C0A0000 - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A68 - .4byte 0x616E646C - .4byte 0x655F283D - .4byte 0x25702920 - .4byte 0x6973206E - .4byte 0x6F742076 - .4byte 0x616C6964 - .4byte 0x20706F69 - .4byte 0x6E746572 - .4byte 0x2E000000 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206865 - .4byte 0x61642D3E - .4byte 0x704D4248 - .4byte 0x65616450 - .4byte 0x72657620 - .4byte 0x3D3D2030 - .4byte 0 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206865 - .4byte 0x61640000 - .4byte 0x496E7661 - .4byte 0x6C696420 - .4byte 0x5369676E - .4byte 0x61747572 - .4byte 0x65204173 - .4byte 0x20557365 - .4byte 0x64204D65 - .4byte 0x6D426C6F - .4byte 0x636B2041 - .4byte 0x74202530 - .4byte 0x38582028 - .4byte 0x2558290A - .4byte 0 - .4byte 0x496E7661 - .4byte 0x6C696420 - .4byte 0x5369676E - .4byte 0x61747572 - .4byte 0x65204173 - .4byte 0x20467265 - .4byte 0x65204D65 - .4byte 0x6D426C6F - .4byte 0x636B2041 - .4byte 0x74202530 - .4byte 0x38582028 - .4byte 0x2558290A - .4byte 0 - .4byte 0 - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A68 - .4byte 0x6561642D - .4byte 0x3E704D42 - .4byte 0x48656164 - .4byte 0x4E657874 - .4byte 0x283D2570 - .4byte 0x29206973 - .4byte 0x206E6F74 - .4byte 0x2076616C - .4byte 0x69642070 - .4byte 0x6F696E74 - .4byte 0x65722E00 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206865 - .4byte 0x61642D3E - .4byte 0x704D4248 - .4byte 0x6561644E - .4byte 0x6578742D - .4byte 0x3E704D42 - .4byte 0x48656164 - .4byte 0x50726576 - .4byte 0x203D3D20 - .4byte 0x68656164 - .4byte 0 - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A68 - .4byte 0x6561642D - .4byte 0x3E704D42 - .4byte 0x48656164 - .4byte 0x50726576 - .4byte 0x283D2570 - .4byte 0x29206973 - .4byte 0x206E6F74 - .4byte 0x2076616C - .4byte 0x69642070 - .4byte 0x6F696E74 - .4byte 0x65722E00 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206865 - .4byte 0x61642D3E - .4byte 0x704D4248 - .4byte 0x65616450 - .4byte 0x7265762D - .4byte 0x3E704D42 - .4byte 0x48656164 - .4byte 0x4E657874 - .4byte 0x203D3D20 - .4byte 0x68656164 - .4byte 0 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206861 - .4byte 0x734E6578 - .4byte 0x74282900 - .4byte 0x45787048 - .4byte 0x65617042 - .4byte 0x6C6F636B - .4byte 0x49746572 - .4byte 0x61746F72 - .4byte 0x2E687070 - .4byte 0 - -.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@2" -"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@2": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E207074 - .4byte 0x722D3E70 - .4byte 0x4D424865 - .4byte 0x61645072 - .4byte 0x6576203D - .4byte 0x3D203000 - -.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@1" -"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@1": - - .4byte 0x45787048 - .4byte 0x65617042 - .4byte 0x6C6F636B - .4byte 0x49746572 - .4byte 0x61746F72 - .4byte 0x2E687070 - .4byte 0 - -.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@0" -"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead@0": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A70 - .4byte 0x7472283D - .4byte 0x25702920 - .4byte 0x6973206E - .4byte 0x6F742076 - .4byte 0x616C6964 - .4byte 0x20706F69 - .4byte 0x6E746572 - .4byte 0x2E000000 - -.global "@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead" -"@STRING@__ct__Q34nrel3mem20ExpHeapBlockIteratorFPC21MEMiExpHeapMBlockHead": - - .4byte 0x45787048 - .4byte 0x65617042 - .4byte 0x6C6F636B - .4byte 0x49746572 - .4byte 0x61746F72 - .4byte 0x2E687070 - .4byte 0 - .4byte 0 diff --git a/asm/nrel/ExpHeapAccessor_80556aa8.s b/asm/nrel/ExpHeapAccessor_80556aa8.s deleted file mode 100644 index 1f5570a9..00000000 --- a/asm/nrel/ExpHeapAccessor_80556aa8.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@1059" -"@1059": - - .4byte 0x0A000000 - .4byte 0 diff --git a/asm/nrel/ExpHeapAccessor_8055f580.s b/asm/nrel/ExpHeapAccessor_8055f580.s deleted file mode 100644 index a4ded6b5..00000000 --- a/asm/nrel/ExpHeapAccessor_8055f580.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@1044" -"@1044": - - .4byte 0x42C80000 - .4byte 0 - -.global "@1063" -"@1063": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/nrel/ExpHeapMapUser_8014b97c.s b/asm/nrel/ExpHeapMapUser.s similarity index 82% rename from asm/nrel/ExpHeapMapUser_8014b97c.s rename to asm/nrel/ExpHeapMapUser.s index ca6477b4..5260a721 100644 --- a/asm/nrel/ExpHeapMapUser_8014b97c.s +++ b/asm/nrel/ExpHeapMapUser.s @@ -243,3 +243,111 @@ lbl_8014BC50: /* 8014BC60 00147AA0 7C 08 03 A6 */ mtlr r0 /* 8014BC64 00147AA4 38 21 00 10 */ addi r1, r1, 0x10 /* 8014BC68 00147AA8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser +__vt__Q44nrel6devkit7heapmap14ExpHeapMapUser: + + .4byte __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser + .4byte 0 + .4byte __dt__Q44nrel6devkit7heapmap14ExpHeapMapUserFv + .4byte heapName__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte fragmentBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte totalHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte usedHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte startAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte endAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap + .4byte drawUsedBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + .4byte drawFragmentBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer + +.global "@2500" +"@2500": + + .4byte 0x6E72656C + .4byte 0x3A3A6465 + .4byte 0x766B6974 + .4byte 0x3A3A6865 + .4byte 0x61706D61 + .4byte 0x703A3A45 + .4byte 0x78704865 + .4byte 0x61704D61 + .4byte 0x70557365 + .4byte 0x72000000 + +.global "@2501" +"@2501": + + .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser + .4byte 0 + .4byte 0 + .4byte 0 + +.global __vt__Q44nrel6devkit7heapmap12IHeapMapUser +__vt__Q44nrel6devkit7heapmap12IHeapMapUser: + + .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + +.global "@2502" +"@2502": + + .4byte 0x6E72656C + .4byte 0x3A3A6465 + .4byte 0x766B6974 + .4byte 0x3A3A6865 + .4byte 0x61706D61 + .4byte 0x703A3A49 + .4byte 0x48656170 + .4byte 0x4D617055 + .4byte 0x73657200 + .4byte 0 + +.global "@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv@0" +"@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv@0": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206861 + .4byte 0x734E6578 + .4byte 0x74282900 + +.global "@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv" +"@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv": + + .4byte 0x45787048 + .4byte 0x65617042 + .4byte 0x6C6F636B + .4byte 0x49746572 + .4byte 0x61746F72 + .4byte 0x2E687070 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser +__RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser: + + .4byte "@2500" + .4byte "@2501" + +.global __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser +__RTTI__Q44nrel6devkit7heapmap12IHeapMapUser: + + .4byte "@2502" + .4byte 0 diff --git a/asm/nrel/ExpHeapMapUser_80446c58.s b/asm/nrel/ExpHeapMapUser_80446c58.s deleted file mode 100644 index c9fb3867..00000000 --- a/asm/nrel/ExpHeapMapUser_80446c58.s +++ /dev/null @@ -1,94 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q44nrel6devkit7heapmap14ExpHeapMapUser -__vt__Q44nrel6devkit7heapmap14ExpHeapMapUser: - - .4byte __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser - .4byte 0 - .4byte __dt__Q44nrel6devkit7heapmap14ExpHeapMapUserFv - .4byte heapName__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte fragmentBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte usedBlockCount__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte totalHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte usedHeapSize__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte startAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte endAddress__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMap - .4byte drawUsedBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer - .4byte drawFragmentBlocks__Q44nrel6devkit7heapmap14ExpHeapMapUserCFRCQ44nrel6devkit7heapmap7HeapMapRQ44nrel6devkit7heapmap18HeapMapBlockDrawer - -.global "@2500" -"@2500": - - .4byte 0x6E72656C - .4byte 0x3A3A6465 - .4byte 0x766B6974 - .4byte 0x3A3A6865 - .4byte 0x61706D61 - .4byte 0x703A3A45 - .4byte 0x78704865 - .4byte 0x61704D61 - .4byte 0x70557365 - .4byte 0x72000000 - -.global "@2501" -"@2501": - - .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser - .4byte 0 - .4byte 0 - .4byte 0 - -.global __vt__Q44nrel6devkit7heapmap12IHeapMapUser -__vt__Q44nrel6devkit7heapmap12IHeapMapUser: - - .4byte __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - -.global "@2502" -"@2502": - - .4byte 0x6E72656C - .4byte 0x3A3A6465 - .4byte 0x766B6974 - .4byte 0x3A3A6865 - .4byte 0x61706D61 - .4byte 0x703A3A49 - .4byte 0x48656170 - .4byte 0x4D617055 - .4byte 0x73657200 - .4byte 0 - -.global "@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv@0" -"@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv@0": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206861 - .4byte 0x734E6578 - .4byte 0x74282900 - -.global "@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv" -"@STRING@next__Q34nrel3mem20ExpHeapBlockIteratorCFv": - - .4byte 0x45787048 - .4byte 0x65617042 - .4byte 0x6C6F636B - .4byte 0x49746572 - .4byte 0x61746F72 - .4byte 0x2E687070 - .4byte 0 - .4byte 0 diff --git a/asm/nrel/ExpHeapMapUser_80556a98.s b/asm/nrel/ExpHeapMapUser_80556a98.s deleted file mode 100644 index 61a79768..00000000 --- a/asm/nrel/ExpHeapMapUser_80556a98.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global __RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser -__RTTI__Q44nrel6devkit7heapmap14ExpHeapMapUser: - - .4byte "@2500" - .4byte "@2501" - -.global __RTTI__Q44nrel6devkit7heapmap12IHeapMapUser -__RTTI__Q44nrel6devkit7heapmap12IHeapMapUser: - - .4byte "@2502" - .4byte 0 diff --git a/asm/nrel/ExpHeapSupport_8014d06c.s b/asm/nrel/ExpHeapSupport.s similarity index 93% rename from asm/nrel/ExpHeapSupport_8014d06c.s rename to asm/nrel/ExpHeapSupport.s index f6274d82..279083e9 100644 --- a/asm/nrel/ExpHeapSupport_8014d06c.s +++ b/asm/nrel/ExpHeapSupport.s @@ -122,3 +122,29 @@ lbl_8014D1E4: /* 8014D1F4 00149034 4E 80 00 20 */ blr /* 8014D1F8 00149038 00 00 00 00 */ .4byte 0x00000000 /* 8014D1FC 0014903C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@789" +"@789": + + .4byte 0x45787048 + .4byte 0x65617053 + .4byte 0x7570706F + .4byte 0x72742E63 + .4byte 0x70700000 + +.global "@790" +"@790": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206861 + .4byte 0x734D7574 + .4byte 0x65782820 + .4byte 0x6148616E + .4byte 0x646C6520 + .4byte 0x29000000 diff --git a/asm/nrel/ExpHeapSupport_804475e8.s b/asm/nrel/ExpHeapSupport_804475e8.s deleted file mode 100644 index 24aa6537..00000000 --- a/asm/nrel/ExpHeapSupport_804475e8.s +++ /dev/null @@ -1,26 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@789" -"@789": - - .4byte 0x45787048 - .4byte 0x65617053 - .4byte 0x7570706F - .4byte 0x72742E63 - .4byte 0x70700000 - -.global "@790" -"@790": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206861 - .4byte 0x734D7574 - .4byte 0x65782820 - .4byte 0x6148616E - .4byte 0x646C6520 - .4byte 0x29000000 diff --git a/asm/nrel/GXSettingFor2D_8014c2fc.s b/asm/nrel/GXSettingFor2D.s similarity index 94% rename from asm/nrel/GXSettingFor2D_8014c2fc.s rename to asm/nrel/GXSettingFor2D.s index bdea980e..020b6cf1 100644 --- a/asm/nrel/GXSettingFor2D_8014c2fc.s +++ b/asm/nrel/GXSettingFor2D.s @@ -102,3 +102,25 @@ lbl_8014C420: setViewportSetting__Q34nrel8ezrender14GXSettingFor2DFRCQ34nrel8ezrender15ViewportSetting: /* 8014C438 00148278 38 63 00 18 */ addi r3, r3, 0x18 /* 8014C43C 0014827C 4B FF FF A0 */ b __as__Q34nrel8ezrender18OrthoCameraSettingFRCQ34nrel8ezrender18OrthoCameraSetting +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@795_8055F568" +"@795_8055F568": + + .4byte 0 + +.global "@796_8055F56C" +"@796_8055F56C": + + .4byte 0x44200000 + +.global "@797_8055F570" +"@797_8055F570": + + .4byte 0x43F00000 + +.global "@798_8055F574" +"@798_8055F574": + + .4byte 0x3F800000 diff --git a/asm/nrel/GXSettingFor2D_8055f568.s b/asm/nrel/GXSettingFor2D_8055f568.s deleted file mode 100644 index d04517b2..00000000 --- a/asm/nrel/GXSettingFor2D_8055f568.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@795_8055F568" -"@795_8055F568": - - .4byte 0 - -.global "@796_8055F56C" -"@796_8055F56C": - - .4byte 0x44200000 - -.global "@797_8055F570" -"@797_8055F570": - - .4byte 0x43F00000 - -.global "@798_8055F574" -"@798_8055F574": - - .4byte 0x3F800000 diff --git a/asm/nrel/HeapMap_8014bc6c.s b/asm/nrel/HeapMap.s similarity index 100% rename from asm/nrel/HeapMap_8014bc6c.s rename to asm/nrel/HeapMap.s diff --git a/asm/nrel/HeapMapBlockDrawer_8014bca8.s b/asm/nrel/HeapMapBlockDrawer.s similarity index 89% rename from asm/nrel/HeapMapBlockDrawer_8014bca8.s rename to asm/nrel/HeapMapBlockDrawer.s index da4e9ee3..cfc99a9a 100644 --- a/asm/nrel/HeapMapBlockDrawer_8014bca8.s +++ b/asm/nrel/HeapMapBlockDrawer.s @@ -276,3 +276,95 @@ lbl_8014C038: /* 8014C050 00147E90 7C 08 03 A6 */ mtlr r0 /* 8014C054 00147E94 38 21 00 40 */ addi r1, r1, 0x40 /* 8014C058 00147E98 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@14354" +"@14354": + + .4byte 0x48656170 + .4byte 0x4D617042 + .4byte 0x6C6F636B + .4byte 0x44726177 + .4byte 0x65722E63 + .4byte 0x70700000 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206153 + .4byte 0x74617274 + .4byte 0x41646472 + .4byte 0x203C2061 + .4byte 0x456E6441 + .4byte 0x64647200 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206154 + .4byte 0x61726765 + .4byte 0x74416464 + .4byte 0x72203E3D + .4byte 0x20615374 + .4byte 0x61727441 + .4byte 0x64647220 + .4byte 0x26262061 + .4byte 0x54617267 + .4byte 0x65744164 + .4byte 0x6472203C + .4byte 0x3D206145 + .4byte 0x6E644164 + .4byte 0x64720000 + +.global "@14463" +"@14463": + + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E207265 + .4byte 0x63742E74 + .4byte 0x6F70203C + .4byte 0x3D207265 + .4byte 0x63742E62 + .4byte 0x6F74746F + .4byte 0x6D000000 + .4byte 0x4E573452 + .4byte 0x3A466169 + .4byte 0x6C656420 + .4byte 0x61737365 + .4byte 0x7274696F + .4byte 0x6E206143 + .4byte 0x75727265 + .4byte 0x6E744164 + .4byte 0x6472203E + .4byte 0x3D206153 + .4byte 0x74617274 + .4byte 0x41646472 + .4byte 0x20262620 + .4byte 0x61437572 + .4byte 0x72656E74 + .4byte 0x41646472 + .4byte 0x203C3D20 + .4byte 0x61456E64 + .4byte 0x41646472 + .4byte 0 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@14358" +"@14358": + + .4byte 0x43300000 + .4byte 0 + +.global "@14464" +"@14464": + + .4byte 0x3F800000 + .4byte 0 diff --git a/asm/nrel/HeapMapBlockDrawer_80446d58.s b/asm/nrel/HeapMapBlockDrawer_80446d58.s deleted file mode 100644 index d46cacb3..00000000 --- a/asm/nrel/HeapMapBlockDrawer_80446d58.s +++ /dev/null @@ -1,78 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@14354" -"@14354": - - .4byte 0x48656170 - .4byte 0x4D617042 - .4byte 0x6C6F636B - .4byte 0x44726177 - .4byte 0x65722E63 - .4byte 0x70700000 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206153 - .4byte 0x74617274 - .4byte 0x41646472 - .4byte 0x203C2061 - .4byte 0x456E6441 - .4byte 0x64647200 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206154 - .4byte 0x61726765 - .4byte 0x74416464 - .4byte 0x72203E3D - .4byte 0x20615374 - .4byte 0x61727441 - .4byte 0x64647220 - .4byte 0x26262061 - .4byte 0x54617267 - .4byte 0x65744164 - .4byte 0x6472203C - .4byte 0x3D206145 - .4byte 0x6E644164 - .4byte 0x64720000 - -.global "@14463" -"@14463": - - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E207265 - .4byte 0x63742E74 - .4byte 0x6F70203C - .4byte 0x3D207265 - .4byte 0x63742E62 - .4byte 0x6F74746F - .4byte 0x6D000000 - .4byte 0x4E573452 - .4byte 0x3A466169 - .4byte 0x6C656420 - .4byte 0x61737365 - .4byte 0x7274696F - .4byte 0x6E206143 - .4byte 0x75727265 - .4byte 0x6E744164 - .4byte 0x6472203E - .4byte 0x3D206153 - .4byte 0x74617274 - .4byte 0x41646472 - .4byte 0x20262620 - .4byte 0x61437572 - .4byte 0x72656E74 - .4byte 0x41646472 - .4byte 0x203C3D20 - .4byte 0x61456E64 - .4byte 0x41646472 - .4byte 0 diff --git a/asm/nrel/HeapMapBlockDrawer_8055f558.s b/asm/nrel/HeapMapBlockDrawer_8055f558.s deleted file mode 100644 index 0a89a0d7..00000000 --- a/asm/nrel/HeapMapBlockDrawer_8055f558.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@14358" -"@14358": - - .4byte 0x43300000 - .4byte 0 - -.global "@14464" -"@14464": - - .4byte 0x3F800000 - .4byte 0 diff --git a/asm/nrel/OrthoCameraSetting_8014c440.s b/asm/nrel/OrthoCameraSetting.s similarity index 100% rename from asm/nrel/OrthoCameraSetting_8014c440.s rename to asm/nrel/OrthoCameraSetting.s diff --git a/asm/nrel/Render2D_8014c4ac.s b/asm/nrel/Render2D.s similarity index 98% rename from asm/nrel/Render2D_8014c4ac.s rename to asm/nrel/Render2D.s index a55dd038..a1e91e7c 100644 --- a/asm/nrel/Render2D_8014c4ac.s +++ b/asm/nrel/Render2D.s @@ -141,3 +141,11 @@ renderRect__Q34nrel8ezrender8Render2DFRCQ34nw4r2ut4RectRC8_GXColor: /* 8014C6B0 001484F0 7C 08 03 A6 */ mtlr r0 /* 8014C6B4 001484F4 38 21 00 20 */ addi r1, r1, 0x20 /* 8014C6B8 001484F8 4E 80 00 20 */ blr +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@4710" +"@4710": + + .4byte 0x808080FF + .4byte 0 diff --git a/asm/nrel/Render2D_8055f578.s b/asm/nrel/Render2D_8055f578.s deleted file mode 100644 index 2da6a332..00000000 --- a/asm/nrel/Render2D_8055f578.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@4710" -"@4710": - - .4byte 0x808080FF - .4byte 0 diff --git a/asm/nrel/StringStyle_8014c098.s b/asm/nrel/StringStyle.s similarity index 100% rename from asm/nrel/StringStyle_8014c098.s rename to asm/nrel/StringStyle.s diff --git a/asm/nrel/TextWriter_8014c0ec.s b/asm/nrel/TextWriter.s similarity index 73% rename from asm/nrel/TextWriter_8014c0ec.s rename to asm/nrel/TextWriter.s index 866b46b6..34ad48ae 100644 --- a/asm/nrel/TextWriter_8014c0ec.s +++ b/asm/nrel/TextWriter.s @@ -163,3 +163,133 @@ lbl_8014C2E0: /* 8014C2F0 00148130 7C 08 03 A6 */ mtlr r0 /* 8014C2F4 00148134 38 21 00 10 */ addi r1, r1, 0x10 /* 8014C2F8 00148138 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@2" +"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@2": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A73 + .4byte 0x7472283D + .4byte 0x25702920 + .4byte 0x6973206E + .4byte 0x6F742076 + .4byte 0x616C6964 + .4byte 0x20706F69 + .4byte 0x6E746572 + .4byte 0x2E000000 + +.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@1" +"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@1": + + .4byte 0x54657874 + .4byte 0x57726974 + .4byte 0x65724261 + .4byte 0x73652E68 + .4byte 0 + +.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@0" +"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@0": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A74 + .4byte 0x68697328 + .4byte 0x3D257029 + .4byte 0x20697320 + .4byte 0x6E6F7420 + .4byte 0x76616C69 + .4byte 0x6420706F + .4byte 0x696E7465 + .4byte 0x722E0000 + +.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc" +"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc": + + .4byte 0x54657874 + .4byte 0x57726974 + .4byte 0x65724261 + .4byte 0x73652E68 + .4byte 0 + +.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@2" +"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@2": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A26 + .4byte 0x20666F6E + .4byte 0x74283D25 + .4byte 0x70292069 + .4byte 0x73206E6F + .4byte 0x74207661 + .4byte 0x6C696420 + .4byte 0x706F696E + .4byte 0x7465722E + .4byte 0 + +.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@1" +"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@1": + + .4byte 0x43686172 + .4byte 0x57726974 + .4byte 0x65722E68 + .4byte 0 + +.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@0" +"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@0": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A74 + .4byte 0x68697328 + .4byte 0x3D257029 + .4byte 0x20697320 + .4byte 0x6E6F7420 + .4byte 0x76616C69 + .4byte 0x6420706F + .4byte 0x696E7465 + .4byte 0x722E0000 + +.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font" +"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font": + + .4byte 0x43686172 + .4byte 0x57726974 + .4byte 0x65722E68 + .4byte 0 + +.global "@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color@0" +"@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color@0": + + .4byte 0x4E573452 + .4byte 0x3A506F69 + .4byte 0x6E746572 + .4byte 0x20457272 + .4byte 0x6F720A74 + .4byte 0x68697328 + .4byte 0x3D257029 + .4byte 0x20697320 + .4byte 0x6E6F7420 + .4byte 0x76616C69 + .4byte 0x6420706F + .4byte 0x696E7465 + .4byte 0x722E0000 + +.global "@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color" +"@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color": + + .4byte 0x43686172 + .4byte 0x57726974 + .4byte 0x65722E68 + .4byte 0 diff --git a/asm/nrel/TextWriter_80446e68.s b/asm/nrel/TextWriter_80446e68.s deleted file mode 100644 index d66968c2..00000000 --- a/asm/nrel/TextWriter_80446e68.s +++ /dev/null @@ -1,130 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@2" -"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@2": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A73 - .4byte 0x7472283D - .4byte 0x25702920 - .4byte 0x6973206E - .4byte 0x6F742076 - .4byte 0x616C6964 - .4byte 0x20706F69 - .4byte 0x6E746572 - .4byte 0x2E000000 - -.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@1" -"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@1": - - .4byte 0x54657874 - .4byte 0x57726974 - .4byte 0x65724261 - .4byte 0x73652E68 - .4byte 0 - -.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@0" -"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc@0": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A74 - .4byte 0x68697328 - .4byte 0x3D257029 - .4byte 0x20697320 - .4byte 0x6E6F7420 - .4byte 0x76616C69 - .4byte 0x6420706F - .4byte 0x696E7465 - .4byte 0x722E0000 - -.global "@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc" -"@STRING@Print__Q34nw4r2ut17TextWriterBaseFPCc": - - .4byte 0x54657874 - .4byte 0x57726974 - .4byte 0x65724261 - .4byte 0x73652E68 - .4byte 0 - -.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@2" -"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@2": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A26 - .4byte 0x20666F6E - .4byte 0x74283D25 - .4byte 0x70292069 - .4byte 0x73206E6F - .4byte 0x74207661 - .4byte 0x6C696420 - .4byte 0x706F696E - .4byte 0x7465722E - .4byte 0 - -.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@1" -"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@1": - - .4byte 0x43686172 - .4byte 0x57726974 - .4byte 0x65722E68 - .4byte 0 - -.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@0" -"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font@0": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A74 - .4byte 0x68697328 - .4byte 0x3D257029 - .4byte 0x20697320 - .4byte 0x6E6F7420 - .4byte 0x76616C69 - .4byte 0x6420706F - .4byte 0x696E7465 - .4byte 0x722E0000 - -.global "@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font" -"@STRING@SetFont__Q34nw4r2ut10CharWriterFRCQ34nw4r2ut4Font": - - .4byte 0x43686172 - .4byte 0x57726974 - .4byte 0x65722E68 - .4byte 0 - -.global "@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color@0" -"@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color@0": - - .4byte 0x4E573452 - .4byte 0x3A506F69 - .4byte 0x6E746572 - .4byte 0x20457272 - .4byte 0x6F720A74 - .4byte 0x68697328 - .4byte 0x3D257029 - .4byte 0x20697320 - .4byte 0x6E6F7420 - .4byte 0x76616C69 - .4byte 0x6420706F - .4byte 0x696E7465 - .4byte 0x722E0000 - -.global "@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color" -"@STRING@SetTextColor__Q34nw4r2ut10CharWriterFQ34nw4r2ut5Color": - - .4byte 0x43686172 - .4byte 0x57726974 - .4byte 0x65722E68 - .4byte 0 diff --git a/asm/nrel/ViewportSetting_8014c6bc.s b/asm/nrel/ViewportSetting.s similarity index 100% rename from asm/nrel/ViewportSetting_8014c6bc.s rename to asm/nrel/ViewportSetting.s diff --git a/obj_files.mk b/obj_files.mk index 09f8e603..94c11e02 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -567,23 +567,24 @@ $(BUILD_DIR)/asm/homebuttonLib/synsample.o \ $(BUILD_DIR)/asm/homebuttonLib/synvoice.o \ $(BUILD_DIR)/asm/homebuttonLib/seq.o \ \ +$(BUILD_DIR)/asm/nrel/Alert.o \ +$(BUILD_DIR)/asm/nrel/AlertStyle.o \ +$(BUILD_DIR)/asm/nrel/ExpHeapMapUser.o \ +$(BUILD_DIR)/asm/nrel/HeapMap.o \ +$(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer.o \ +$(BUILD_DIR)/asm/nrel/CoreHolder.o \ +$(BUILD_DIR)/asm/nrel/StringStyle.o \ +$(BUILD_DIR)/asm/nrel/TextWriter.o \ +$(BUILD_DIR)/asm/nrel/GXSettingFor2D.o \ +$(BUILD_DIR)/asm/nrel/OrthoCameraSetting.o \ +$(BUILD_DIR)/asm/nrel/Render2D.o \ +$(BUILD_DIR)/asm/nrel/ViewportSetting.o \ +$(BUILD_DIR)/asm/nrel/Block.o \ +$(BUILD_DIR)/asm/nrel/ExpHeapAccessor.o \ +$(BUILD_DIR)/asm/nrel/ExpHeapSupport.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/nrel/Alert_8014b848.o \ -$(BUILD_DIR)/asm/nrel/AlertStyle_8014b914.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapMapUser_8014b97c.o \ -$(BUILD_DIR)/asm/nrel/HeapMap_8014bc6c.o \ -$(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer_8014bca8.o \ -$(BUILD_DIR)/asm/nrel/CoreHolder_8014c05c.o \ -$(BUILD_DIR)/asm/nrel/StringStyle_8014c098.o \ -$(BUILD_DIR)/asm/nrel/TextWriter_8014c0ec.o \ -$(BUILD_DIR)/asm/nrel/GXSettingFor2D_8014c2fc.o \ -$(BUILD_DIR)/asm/nrel/OrthoCameraSetting_8014c440.o \ -$(BUILD_DIR)/asm/nrel/Render2D_8014c4ac.o \ -$(BUILD_DIR)/asm/nrel/ViewportSetting_8014c6bc.o \ -$(BUILD_DIR)/asm/nrel/Block_8014c6d8.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapAccessor_8014c734.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapSupport_8014d06c.o \ $(BUILD_DIR)/asm/libMobiclip/Bignum_8014d200.o \ $(BUILD_DIR)/asm/libMobiclip/CodecFast_8014e090.o \ $(BUILD_DIR)/asm/libMobiclip/Digits_8014e860.o \ @@ -3155,12 +3156,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/nrel/ExpHeapMapUser_80446c58.o \ -$(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer_80446d58.o \ -$(BUILD_DIR)/asm/nrel/TextWriter_80446e68.o \ -$(BUILD_DIR)/asm/nrel/Block_80446fc8.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapAccessor_80447000.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapSupport_804475e8.o \ $(BUILD_DIR)/asm/libMobiclip/CodecFast_80447628.o \ $(BUILD_DIR)/asm/libMobiclip/MoApi_80447b88.o \ $(BUILD_DIR)/asm/libMobiclip/MoSdk_80447ec8.o \ @@ -4823,8 +4818,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/nrel/ExpHeapMapUser_80556a98.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapAccessor_80556aa8.o \ $(BUILD_DIR)/asm/libMobiclip/MoApi_80556ab0.o \ $(BUILD_DIR)/asm/libMobiclip/MoDeblockWii_80556ab8.o \ $(BUILD_DIR)/asm/libMobiclip/MoSdk_80556ac0.o \ @@ -5348,11 +5341,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/nrel/Alert_8055f550.o \ -$(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer_8055f558.o \ -$(BUILD_DIR)/asm/nrel/GXSettingFor2D_8055f568.o \ -$(BUILD_DIR)/asm/nrel/Render2D_8055f578.o \ -$(BUILD_DIR)/asm/nrel/ExpHeapAccessor_8055f580.o \ $(BUILD_DIR)/asm/libMobiclip/MoSdkHeaders_8055f590.o \ $(BUILD_DIR)/asm/src/Constant_8055f5a0.o \ $(BUILD_DIR)/asm/src/DvdWatch_8055f5a8.o \