diff --git a/asm/libnw4r_ut/ut_CharStrmReader_8011fe90.s b/asm/libnw4r_ut/ut_CharStrmReader.s similarity index 100% rename from asm/libnw4r_ut/ut_CharStrmReader_8011fe90.s rename to asm/libnw4r_ut/ut_CharStrmReader.s diff --git a/asm/libnw4r_ut/ut_CharWriter_80122610.s b/asm/libnw4r_ut/ut_CharWriter.s similarity index 98% rename from asm/libnw4r_ut/ut_CharWriter_80122610.s rename to asm/libnw4r_ut/ut_CharWriter.s index 080ec15b..2f35a5d8 100644 --- a/asm/libnw4r_ut/ut_CharWriter_80122610.s +++ b/asm/libnw4r_ut/ut_CharWriter.s @@ -1561,3 +1561,49 @@ lbl_80123A48: /* 80123CF4 0011FB34 38 21 00 20 */ addi r1, r1, 0x20 /* 80123CF8 0011FB38 4E 80 00 20 */ blr /* 80123CFC 0011FB3C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global mLoadingTexture__Q34nw4r2ut10CharWriter +mLoadingTexture__Q34nw4r2ut10CharWriter: + .skip 0x10 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "@GUARD@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog" +"@GUARD@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog": + .skip 0x4 + +.global "@LOCAL@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog" +"@LOCAL@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog": + .skip 0x4 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@6180" +"@6180": + + .4byte 0 + +.global "@6181" +"@6181": + + .4byte 0x3F800000 + +.global "@6269" +"@6269": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@6299" +"@6299": + + .4byte 0x3F000000 + .4byte 0 + +.global "@6307" +"@6307": + + .4byte 0x43300000 + .4byte 0 diff --git a/asm/libnw4r_ut/ut_CharWriter_80543060.s b/asm/libnw4r_ut/ut_CharWriter_80543060.s deleted file mode 100644 index 4c197c79..00000000 --- a/asm/libnw4r_ut/ut_CharWriter_80543060.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global mLoadingTexture__Q34nw4r2ut10CharWriter -mLoadingTexture__Q34nw4r2ut10CharWriter: - .skip 0x10 diff --git a/asm/libnw4r_ut/ut_CharWriter_8055d098.s b/asm/libnw4r_ut/ut_CharWriter_8055d098.s deleted file mode 100644 index d2708861..00000000 --- a/asm/libnw4r_ut/ut_CharWriter_8055d098.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "@GUARD@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog" -"@GUARD@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog": - .skip 0x4 - -.global "@LOCAL@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog" -"@LOCAL@SetupGXCommon__27@unnamed@ut_CharWriter_cpp@Fv@fog": - .skip 0x4 diff --git a/asm/libnw4r_ut/ut_CharWriter_8055f4e8.s b/asm/libnw4r_ut/ut_CharWriter_8055f4e8.s deleted file mode 100644 index e19a6685..00000000 --- a/asm/libnw4r_ut/ut_CharWriter_8055f4e8.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@6180" -"@6180": - - .4byte 0 - -.global "@6181" -"@6181": - - .4byte 0x3F800000 - -.global "@6269" -"@6269": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@6299" -"@6299": - - .4byte 0x3F000000 - .4byte 0 - -.global "@6307" -"@6307": - - .4byte 0x43300000 - .4byte 0 diff --git a/asm/libnw4r_ut/ut_DvdFileStream_80120770.s b/asm/libnw4r_ut/ut_DvdFileStream.s similarity index 94% rename from asm/libnw4r_ut/ut_DvdFileStream_80120770.s rename to asm/libnw4r_ut/ut_DvdFileStream.s index 8fa4a98b..6bd4b4b2 100644 --- a/asm/libnw4r_ut/ut_DvdFileStream_80120770.s +++ b/asm/libnw4r_ut/ut_DvdFileStream.s @@ -551,3 +551,45 @@ GetRuntimeTypeInfo__Q34nw4r2ut13DvdFileStreamCFv: /* 80120E94 0011CCD4 90 0D EC 58 */ stw r0, typeInfo__Q34nw4r2ut13DvdFileStream@sda21(r13) /* 80120E98 0011CCD8 4E 80 00 20 */ blr /* 80120E9C 0011CCDC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_DvdFileStream_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ut13DvdFileStream +__vt__Q34nw4r2ut13DvdFileStream: + + .4byte 0 + .4byte 0 + .4byte GetRuntimeTypeInfo__Q34nw4r2ut13DvdFileStreamCFv + .4byte __dt__Q34nw4r2ut13DvdFileStreamFv + .4byte Close__Q34nw4r2ut13DvdFileStreamFv + .4byte Read__Q34nw4r2ut13DvdFileStreamFPvUl + .4byte ReadAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte Write__Q34nw4r2ut8IOStreamFPCvUl + .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanAsync__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv + .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl + .4byte Cancel__Q34nw4r2ut13DvdFileStreamFv + .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv + .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv + .4byte Peek__Q34nw4r2ut13DvdFileStreamFPvUl + .4byte PeekAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r2ut13DvdFileStream +typeInfo__Q34nw4r2ut13DvdFileStream: + .skip 0x8 diff --git a/asm/libnw4r_ut/ut_DvdFileStream_804062b4.s b/asm/libnw4r_ut/ut_DvdFileStream_804062b4.s deleted file mode 100644 index f3481104..00000000 --- a/asm/libnw4r_ut/ut_DvdFileStream_804062b4.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_DvdFileStream_cpp" diff --git a/asm/libnw4r_ut/ut_DvdFileStream_80442708.s b/asm/libnw4r_ut/ut_DvdFileStream_80442708.s deleted file mode 100644 index 7eef6809..00000000 --- a/asm/libnw4r_ut/ut_DvdFileStream_80442708.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ut13DvdFileStream -__vt__Q34nw4r2ut13DvdFileStream: - - .4byte 0 - .4byte 0 - .4byte GetRuntimeTypeInfo__Q34nw4r2ut13DvdFileStreamCFv - .4byte __dt__Q34nw4r2ut13DvdFileStreamFv - .4byte Close__Q34nw4r2ut13DvdFileStreamFv - .4byte Read__Q34nw4r2ut13DvdFileStreamFPvUl - .4byte ReadAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte Write__Q34nw4r2ut8IOStreamFPCvUl - .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanAsync__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv - .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl - .4byte Cancel__Q34nw4r2ut13DvdFileStreamFv - .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv - .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv - .4byte Peek__Q34nw4r2ut13DvdFileStreamFPvUl - .4byte PeekAsync__Q34nw4r2ut13DvdFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte 0 diff --git a/asm/libnw4r_ut/ut_DvdFileStream_8055d078.s b/asm/libnw4r_ut/ut_DvdFileStream_8055d078.s deleted file mode 100644 index d5e7a125..00000000 --- a/asm/libnw4r_ut/ut_DvdFileStream_8055d078.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r2ut13DvdFileStream -typeInfo__Q34nw4r2ut13DvdFileStream: - .skip 0x8 diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream_80120ea0.s b/asm/libnw4r_ut/ut_DvdLockedFileStream.s similarity index 87% rename from asm/libnw4r_ut/ut_DvdLockedFileStream_80120ea0.s rename to asm/libnw4r_ut/ut_DvdLockedFileStream.s index 32d01752..bfdd16a8 100644 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream_80120ea0.s +++ b/asm/libnw4r_ut/ut_DvdLockedFileStream.s @@ -301,3 +301,59 @@ Cancel__Q34nw4r2ut19DvdLockedFileStreamFv: /* 80121284 0011D0C4 90 0D EC 60 */ stw r0, typeInfo__Q34nw4r2ut19DvdLockedFileStream@sda21(r13) /* 80121288 0011D0C8 4E 80 00 20 */ blr /* 8012128C 0011D0CC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_DvdLockedFileStream_cpp" +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ut19DvdLockedFileStream +__vt__Q34nw4r2ut19DvdLockedFileStream: + + .4byte 0 + .4byte 0 + .4byte GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte __dt__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte Close__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl + .4byte ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte Write__Q34nw4r2ut8IOStreamFPCvUl + .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv + .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv + .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv + .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl + .4byte Cancel__Q34nw4r2ut19DvdLockedFileStreamFv + .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv + .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv + .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv + .4byte Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl + .4byte PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv + .4byte 0 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global sMutex__Q34nw4r2ut19DvdLockedFileStream +sMutex__Q34nw4r2ut19DvdLockedFileStream: + .skip 0x18 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r2ut19DvdLockedFileStream +typeInfo__Q34nw4r2ut19DvdLockedFileStream: + .skip 0x8 + +.global sThreadQueue__Q34nw4r2ut19DvdLockedFileStream +sThreadQueue__Q34nw4r2ut19DvdLockedFileStream: + .skip 0x8 + +.global sInitialized__Q34nw4r2ut19DvdLockedFileStream +sInitialized__Q34nw4r2ut19DvdLockedFileStream: + .skip 0x8 diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream_804062b8.s b/asm/libnw4r_ut/ut_DvdLockedFileStream_804062b8.s deleted file mode 100644 index c63b07e0..00000000 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream_804062b8.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_DvdLockedFileStream_cpp" diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream_80442770.s b/asm/libnw4r_ut/ut_DvdLockedFileStream_80442770.s deleted file mode 100644 index 78988cfc..00000000 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream_80442770.s +++ /dev/null @@ -1,32 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ut19DvdLockedFileStream -__vt__Q34nw4r2ut19DvdLockedFileStream: - - .4byte 0 - .4byte 0 - .4byte GetRuntimeTypeInfo__Q34nw4r2ut19DvdLockedFileStreamCFv - .4byte __dt__Q34nw4r2ut19DvdLockedFileStreamFv - .4byte Close__Q34nw4r2ut19DvdLockedFileStreamFv - .4byte Read__Q34nw4r2ut19DvdLockedFileStreamFPvUl - .4byte ReadAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte Write__Q34nw4r2ut8IOStreamFPCvUl - .4byte WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte IsBusy__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanAsync__Q34nw4r2ut19DvdLockedFileStreamCFv - .4byte CanRead__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanWrite__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetOffsetAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetSizeAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetBufferAlign__Q34nw4r2ut13DvdFileStreamCFv - .4byte GetSize__Q34nw4r2ut13DvdFileStreamCFv - .4byte Seek__Q34nw4r2ut13DvdFileStreamFlUl - .4byte Cancel__Q34nw4r2ut19DvdLockedFileStreamFv - .4byte CancelAsync__Q34nw4r2ut13DvdFileStreamFPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte CanSeek__Q34nw4r2ut13DvdFileStreamCFv - .4byte CanCancel__Q34nw4r2ut13DvdFileStreamCFv - .4byte Tell__Q34nw4r2ut13DvdFileStreamCFv - .4byte Peek__Q34nw4r2ut19DvdLockedFileStreamFPvUl - .4byte PeekAsync__Q34nw4r2ut19DvdLockedFileStreamFPvUlPFlPQ34nw4r2ut8IOStreamPv_vPv - .4byte 0 diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream_80543028.s b/asm/libnw4r_ut/ut_DvdLockedFileStream_80543028.s deleted file mode 100644 index c5c5cf16..00000000 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream_80543028.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global sMutex__Q34nw4r2ut19DvdLockedFileStream -sMutex__Q34nw4r2ut19DvdLockedFileStream: - .skip 0x18 diff --git a/asm/libnw4r_ut/ut_DvdLockedFileStream_8055d080.s b/asm/libnw4r_ut/ut_DvdLockedFileStream_8055d080.s deleted file mode 100644 index 609264f4..00000000 --- a/asm/libnw4r_ut/ut_DvdLockedFileStream_8055d080.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r2ut19DvdLockedFileStream -typeInfo__Q34nw4r2ut19DvdLockedFileStream: - .skip 0x8 - -.global sThreadQueue__Q34nw4r2ut19DvdLockedFileStream -sThreadQueue__Q34nw4r2ut19DvdLockedFileStream: - .skip 0x8 - -.global sInitialized__Q34nw4r2ut19DvdLockedFileStream -sInitialized__Q34nw4r2ut19DvdLockedFileStream: - .skip 0x8 diff --git a/asm/libnw4r_ut/ut_FileStream_80120660.s b/asm/libnw4r_ut/ut_FileStream.s similarity index 93% rename from asm/libnw4r_ut/ut_FileStream_80120660.s rename to asm/libnw4r_ut/ut_FileStream.s index 44178a4c..56f97eea 100644 --- a/asm/libnw4r_ut/ut_FileStream_80120660.s +++ b/asm/libnw4r_ut/ut_FileStream.s @@ -96,3 +96,13 @@ lbl_80120750: /* 80120764 0011C5A4 90 0D EC 50 */ stw r0, typeInfo__Q34nw4r2ut10FileStream@sda21(r13) /* 80120768 0011C5A8 4E 80 00 20 */ blr /* 8012076C 0011C5AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_FileStream_cpp" +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r2ut10FileStream +typeInfo__Q34nw4r2ut10FileStream: + .skip 0x8 diff --git a/asm/libnw4r_ut/ut_FileStream_804062b0.s b/asm/libnw4r_ut/ut_FileStream_804062b0.s deleted file mode 100644 index cf4bd063..00000000 --- a/asm/libnw4r_ut/ut_FileStream_804062b0.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_FileStream_cpp" diff --git a/asm/libnw4r_ut/ut_FileStream_8055d070.s b/asm/libnw4r_ut/ut_FileStream_8055d070.s deleted file mode 100644 index f3580b6d..00000000 --- a/asm/libnw4r_ut/ut_FileStream_8055d070.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r2ut10FileStream -typeInfo__Q34nw4r2ut10FileStream: - .skip 0x8 diff --git a/asm/libnw4r_ut/ut_Font_80121470.s b/asm/libnw4r_ut/ut_Font.s similarity index 85% rename from asm/libnw4r_ut/ut_Font_80121470.s rename to asm/libnw4r_ut/ut_Font.s index 19d7938a..3abf15bf 100644 --- a/asm/libnw4r_ut/ut_Font_80121470.s +++ b/asm/libnw4r_ut/ut_Font.s @@ -55,3 +55,21 @@ lbl_801214F4: /* 80121514 0011D354 00 00 00 00 */ .4byte 0x00000000 /* 80121518 0011D358 00 00 00 00 */ .4byte 0x00000000 /* 8012151C 0011D35C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@560" +"@560": + + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharUTF16__Q34nw4r2ut14CharStrmReaderFv + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv diff --git a/asm/libnw4r_ut/ut_Font_804427d8.s b/asm/libnw4r_ut/ut_Font_804427d8.s deleted file mode 100644 index 3edc713d..00000000 --- a/asm/libnw4r_ut/ut_Font_804427d8.s +++ /dev/null @@ -1,18 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@560" -"@560": - - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharUTF8__Q34nw4r2ut14CharStrmReaderFv - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharUTF16__Q34nw4r2ut14CharStrmReaderFv - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharSJIS__Q34nw4r2ut14CharStrmReaderFv - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv diff --git a/asm/libnw4r_ut/ut_IOStream_80120630.s b/asm/libnw4r_ut/ut_IOStream.s similarity index 77% rename from asm/libnw4r_ut/ut_IOStream_80120630.s rename to asm/libnw4r_ut/ut_IOStream.s index 0e3e58c7..b07a4eb6 100644 --- a/asm/libnw4r_ut/ut_IOStream_80120630.s +++ b/asm/libnw4r_ut/ut_IOStream.s @@ -21,3 +21,13 @@ WriteAsync__Q34nw4r2ut8IOStreamFPCvUlPFlPQ34nw4r2ut8IOStreamPv_vPv: /* 80120654 0011C494 90 0D EC 48 */ stw r0, typeInfo__Q34nw4r2ut8IOStream@sda21(r13) /* 80120658 0011C498 4E 80 00 20 */ blr /* 8012065C 0011C49C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_IOStream_cpp" +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global typeInfo__Q34nw4r2ut8IOStream +typeInfo__Q34nw4r2ut8IOStream: + .skip 0x8 diff --git a/asm/libnw4r_ut/ut_IOStream_804062ac.s b/asm/libnw4r_ut/ut_IOStream_804062ac.s deleted file mode 100644 index 83ea23e7..00000000 --- a/asm/libnw4r_ut/ut_IOStream_804062ac.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_IOStream_cpp" diff --git a/asm/libnw4r_ut/ut_IOStream_8055d068.s b/asm/libnw4r_ut/ut_IOStream_8055d068.s deleted file mode 100644 index f09831a9..00000000 --- a/asm/libnw4r_ut/ut_IOStream_8055d068.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global typeInfo__Q34nw4r2ut8IOStream -typeInfo__Q34nw4r2ut8IOStream: - .skip 0x8 diff --git a/asm/libnw4r_ut/ut_LinkList_8011fc80.s b/asm/libnw4r_ut/ut_LinkList.s similarity index 100% rename from asm/libnw4r_ut/ut_LinkList_8011fc80.s rename to asm/libnw4r_ut/ut_LinkList.s diff --git a/asm/libnw4r_ut/ut_LockedCache_80121290.s b/asm/libnw4r_ut/ut_LockedCache.s similarity index 95% rename from asm/libnw4r_ut/ut_LockedCache_80121290.s rename to asm/libnw4r_ut/ut_LockedCache.s index baeb32af..d9a75b5d 100644 --- a/asm/libnw4r_ut/ut_LockedCache_80121290.s +++ b/asm/libnw4r_ut/ut_LockedCache.s @@ -158,3 +158,13 @@ StoreData__Q34nw4r2ut2LCFPvPvUl: /* 80121464 0011D2A4 4B F0 16 FC */ b OSInitMutex /* 80121468 0011D2A8 00 00 00 00 */ .4byte 0x00000000 /* 8012146C 0011D2AC 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_LockedCache_cpp" +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "sLCImpl__Q34nw4r2ut28@unnamed@ut_LockedCache_cpp@" +"sLCImpl__Q34nw4r2ut28@unnamed@ut_LockedCache_cpp@": + .skip 0x20 diff --git a/asm/libnw4r_ut/ut_LockedCache_804062bc.s b/asm/libnw4r_ut/ut_LockedCache_804062bc.s deleted file mode 100644 index 63bd5f82..00000000 --- a/asm/libnw4r_ut/ut_LockedCache_804062bc.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_LockedCache_cpp" diff --git a/asm/libnw4r_ut/ut_LockedCache_80543040.s b/asm/libnw4r_ut/ut_LockedCache_80543040.s deleted file mode 100644 index 29256f7f..00000000 --- a/asm/libnw4r_ut/ut_LockedCache_80543040.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "sLCImpl__Q34nw4r2ut28@unnamed@ut_LockedCache_cpp@" -"sLCImpl__Q34nw4r2ut28@unnamed@ut_LockedCache_cpp@": - .skip 0x20 diff --git a/asm/libnw4r_ut/ut_ResFont_80122300.s b/asm/libnw4r_ut/ut_ResFont.s similarity index 89% rename from asm/libnw4r_ut/ut_ResFont_80122300.s rename to asm/libnw4r_ut/ut_ResFont.s index 3ed5ecf6..aceb6632 100644 --- a/asm/libnw4r_ut/ut_ResFont_80122300.s +++ b/asm/libnw4r_ut/ut_ResFont.s @@ -246,3 +246,33 @@ lbl_801225EC: /* 80122604 0011E444 7C C3 33 78 */ mr r3, r6 /* 80122608 0011E448 4E 80 00 20 */ blr /* 8012260C 0011E44C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global __vt__Q34nw4r2ut7ResFont +__vt__Q34nw4r2ut7ResFont: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ut7ResFontFv + .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte 0 diff --git a/asm/libnw4r_ut/ut_ResFontBase_80121b90.s b/asm/libnw4r_ut/ut_ResFontBase.s similarity index 95% rename from asm/libnw4r_ut/ut_ResFontBase_80121b90.s rename to asm/libnw4r_ut/ut_ResFontBase.s index b95421cc..949257f5 100644 --- a/asm/libnw4r_ut/ut_ResFontBase_80121b90.s +++ b/asm/libnw4r_ut/ut_ResFontBase.s @@ -632,3 +632,39 @@ lbl_801222A0: /* 801222F4 0011E134 4E 80 00 20 */ blr /* 801222F8 0011E138 00 00 00 00 */ .4byte 0x00000000 /* 801222FC 0011E13C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@1039_804428D0" +"@1039_804428D0": + + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv + +.global __vt__Q44nw4r2ut6detail11ResFontBase +__vt__Q44nw4r2ut6detail11ResFontBase: + + .4byte 0 + .4byte 0 + .4byte __dt__Q44nw4r2ut6detail11ResFontBaseFv + .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv + .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs + .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi + .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs + .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv diff --git a/asm/libnw4r_ut/ut_ResFontBase_804428d0.s b/asm/libnw4r_ut/ut_ResFontBase_804428d0.s deleted file mode 100644 index af530e4b..00000000 --- a/asm/libnw4r_ut/ut_ResFontBase_804428d0.s +++ /dev/null @@ -1,36 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@1039_804428D0" -"@1039_804428D0": - - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv - -.global __vt__Q44nw4r2ut6detail11ResFontBase -__vt__Q44nw4r2ut6detail11ResFontBase: - - .4byte 0 - .4byte 0 - .4byte __dt__Q44nw4r2ut6detail11ResFontBaseFv - .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths - .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs - .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi - .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs - .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv diff --git a/asm/libnw4r_ut/ut_ResFont_80442938.s b/asm/libnw4r_ut/ut_ResFont_80442938.s deleted file mode 100644 index 9f5947ac..00000000 --- a/asm/libnw4r_ut/ut_ResFont_80442938.s +++ /dev/null @@ -1,30 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global __vt__Q34nw4r2ut7ResFont -__vt__Q34nw4r2ut7ResFont: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ut7ResFontFv - .4byte GetWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetAscent__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetDescent__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetBaselinePos__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetCellHeight__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetCellWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetMaxCharWidth__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetType__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetTextureFormat__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetLineFeed__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte GetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte SetDefaultCharWidths__Q44nw4r2ut6detail11ResFontBaseFRCQ34nw4r2ut10CharWidths - .4byte SetAlternateChar__Q44nw4r2ut6detail11ResFontBaseFUs - .4byte SetLineFeed__Q44nw4r2ut6detail11ResFontBaseFi - .4byte GetCharWidth__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetCharWidths__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetGlyph__Q44nw4r2ut6detail11ResFontBaseCFPQ34nw4r2ut5GlyphUs - .4byte HasGlyph__Q44nw4r2ut6detail11ResFontBaseCFUs - .4byte GetEncoding__Q44nw4r2ut6detail11ResFontBaseCFv - .4byte 0 diff --git a/asm/libnw4r_ut/ut_RomFont_80121520.s b/asm/libnw4r_ut/ut_RomFont.s similarity index 93% rename from asm/libnw4r_ut/ut_RomFont_80121520.s rename to asm/libnw4r_ut/ut_RomFont.s index 9a25a88b..64e2b930 100644 --- a/asm/libnw4r_ut/ut_RomFont_80121520.s +++ b/asm/libnw4r_ut/ut_RomFont.s @@ -544,3 +544,75 @@ lbl_80121B80: lbl_80121B88: /* 80121B88 0011D9C8 38 60 00 03 */ li r3, 0x3 /* 80121B8C 0011D9CC 4E 80 00 20 */ blr +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@943_80442808" +"@943_80442808": + + .4byte 0 + .4byte 0xFFFFFFFF + .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv + +.global __vt__Q34nw4r2ut7RomFont +__vt__Q34nw4r2ut7RomFont: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ut7RomFontFv + .4byte GetWidth__Q34nw4r2ut7RomFontCFv + .4byte GetHeight__Q34nw4r2ut7RomFontCFv + .4byte GetAscent__Q34nw4r2ut7RomFontCFv + .4byte GetDescent__Q34nw4r2ut7RomFontCFv + .4byte GetBaselinePos__Q34nw4r2ut7RomFontCFv + .4byte GetCellHeight__Q34nw4r2ut7RomFontCFv + .4byte GetCellWidth__Q34nw4r2ut7RomFontCFv + .4byte GetMaxCharWidth__Q34nw4r2ut7RomFontCFv + .4byte GetType__Q34nw4r2ut7RomFontCFv + .4byte GetTextureFormat__Q34nw4r2ut7RomFontCFv + .4byte GetLineFeed__Q34nw4r2ut7RomFontCFv + .4byte GetDefaultCharWidths__Q34nw4r2ut7RomFontCFv + .4byte SetDefaultCharWidths__Q34nw4r2ut7RomFontFRCQ34nw4r2ut10CharWidths + .4byte SetAlternateChar__Q34nw4r2ut7RomFontFUs + .4byte SetLineFeed__Q34nw4r2ut7RomFontFi + .4byte GetCharWidth__Q34nw4r2ut7RomFontCFUs + .4byte GetCharWidths__Q34nw4r2ut7RomFontCFUs + .4byte GetGlyph__Q34nw4r2ut7RomFontCFPQ34nw4r2ut5GlyphUs + .4byte HasGlyph__Q34nw4r2ut7RomFontCFUs + .4byte GetEncoding__Q34nw4r2ut7RomFontCFv + +.global __vt__Q34nw4r2ut4Font +__vt__Q34nw4r2ut4Font: + + .4byte 0 + .4byte 0 + .4byte __dt__Q34nw4r2ut4FontFv + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 + .4byte 0 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global mFontEncode__Q34nw4r2ut7RomFont +mFontEncode__Q34nw4r2ut7RomFont: + + .4byte 0xFFFF0000 + .4byte 0 diff --git a/asm/libnw4r_ut/ut_RomFont_80442808.s b/asm/libnw4r_ut/ut_RomFont_80442808.s deleted file mode 100644 index 760e905e..00000000 --- a/asm/libnw4r_ut/ut_RomFont_80442808.s +++ /dev/null @@ -1,64 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@943_80442808" -"@943_80442808": - - .4byte 0 - .4byte 0xFFFFFFFF - .4byte ReadNextCharCP1252__Q34nw4r2ut14CharStrmReaderFv - -.global __vt__Q34nw4r2ut7RomFont -__vt__Q34nw4r2ut7RomFont: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ut7RomFontFv - .4byte GetWidth__Q34nw4r2ut7RomFontCFv - .4byte GetHeight__Q34nw4r2ut7RomFontCFv - .4byte GetAscent__Q34nw4r2ut7RomFontCFv - .4byte GetDescent__Q34nw4r2ut7RomFontCFv - .4byte GetBaselinePos__Q34nw4r2ut7RomFontCFv - .4byte GetCellHeight__Q34nw4r2ut7RomFontCFv - .4byte GetCellWidth__Q34nw4r2ut7RomFontCFv - .4byte GetMaxCharWidth__Q34nw4r2ut7RomFontCFv - .4byte GetType__Q34nw4r2ut7RomFontCFv - .4byte GetTextureFormat__Q34nw4r2ut7RomFontCFv - .4byte GetLineFeed__Q34nw4r2ut7RomFontCFv - .4byte GetDefaultCharWidths__Q34nw4r2ut7RomFontCFv - .4byte SetDefaultCharWidths__Q34nw4r2ut7RomFontFRCQ34nw4r2ut10CharWidths - .4byte SetAlternateChar__Q34nw4r2ut7RomFontFUs - .4byte SetLineFeed__Q34nw4r2ut7RomFontFi - .4byte GetCharWidth__Q34nw4r2ut7RomFontCFUs - .4byte GetCharWidths__Q34nw4r2ut7RomFontCFUs - .4byte GetGlyph__Q34nw4r2ut7RomFontCFPQ34nw4r2ut5GlyphUs - .4byte HasGlyph__Q34nw4r2ut7RomFontCFUs - .4byte GetEncoding__Q34nw4r2ut7RomFontCFv - -.global __vt__Q34nw4r2ut4Font -__vt__Q34nw4r2ut4Font: - - .4byte 0 - .4byte 0 - .4byte __dt__Q34nw4r2ut4FontFv - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 - .4byte 0 diff --git a/asm/libnw4r_ut/ut_RomFont_80556a78.s b/asm/libnw4r_ut/ut_RomFont_80556a78.s deleted file mode 100644 index 4624444f..00000000 --- a/asm/libnw4r_ut/ut_RomFont_80556a78.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global mFontEncode__Q34nw4r2ut7RomFont -mFontEncode__Q34nw4r2ut7RomFont: - - .4byte 0xFFFF0000 - .4byte 0 diff --git a/asm/libnw4r_ut/ut_TagProcessorBase_8011ffb0.s b/asm/libnw4r_ut/ut_TagProcessorBase.s similarity index 96% rename from asm/libnw4r_ut/ut_TagProcessorBase_8011ffb0.s rename to asm/libnw4r_ut/ut_TagProcessorBase.s index 1151d643..1d61ea45 100644 --- a/asm/libnw4r_ut/ut_TagProcessorBase_8011ffb0.s +++ b/asm/libnw4r_ut/ut_TagProcessorBase.s @@ -495,3 +495,31 @@ lbl_801205FC: /* 80120624 0011C464 00 00 00 00 */ .4byte 0x00000000 /* 80120628 0011C468 00 00 00 00 */ .4byte 0x00000000 /* 8012062C 0011C46C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "__vt__Q34nw4r2ut19TagProcessorBase" +"__vt__Q34nw4r2ut19TagProcessorBase": + + .4byte 0 + .4byte 0 + .4byte "__dt__Q34nw4r2ut19TagProcessorBaseFv" + .4byte "Process__Q34nw4r2ut19TagProcessorBaseFUsPQ34nw4r2ut15PrintContext" + .4byte "CalcRect__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext" + +.global "__vt__Q34nw4r2ut19TagProcessorBase" +"__vt__Q34nw4r2ut19TagProcessorBase": + + .4byte 0 + .4byte 0 + .4byte "__dt__Q34nw4r2ut19TagProcessorBaseFv" + .4byte "Process__Q34nw4r2ut19TagProcessorBaseFUsPQ34nw4r2ut15PrintContext" + .4byte "CalcRect__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext" +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@4919" +"@4919": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_ut/ut_TagProcessorBase_804426e0.s b/asm/libnw4r_ut/ut_TagProcessorBase_804426e0.s deleted file mode 100644 index 40b7dd2f..00000000 --- a/asm/libnw4r_ut/ut_TagProcessorBase_804426e0.s +++ /dev/null @@ -1,20 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "__vt__Q34nw4r2ut19TagProcessorBase" -"__vt__Q34nw4r2ut19TagProcessorBase": - - .4byte 0 - .4byte 0 - .4byte "__dt__Q34nw4r2ut19TagProcessorBaseFv" - .4byte "Process__Q34nw4r2ut19TagProcessorBaseFUsPQ34nw4r2ut15PrintContext" - .4byte "CalcRect__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext" - -.global "__vt__Q34nw4r2ut19TagProcessorBase" -"__vt__Q34nw4r2ut19TagProcessorBase": - - .4byte 0 - .4byte 0 - .4byte "__dt__Q34nw4r2ut19TagProcessorBaseFv" - .4byte "Process__Q34nw4r2ut19TagProcessorBaseFUsPQ34nw4r2ut15PrintContext" - .4byte "CalcRect__Q34nw4r2ut19TagProcessorBaseFPQ34nw4r2ut4RectUsPQ34nw4r2ut15PrintContext" diff --git a/asm/libnw4r_ut/ut_TagProcessorBase_8055f4e0.s b/asm/libnw4r_ut/ut_TagProcessorBase_8055f4e0.s deleted file mode 100644 index 7b3f933e..00000000 --- a/asm/libnw4r_ut/ut_TagProcessorBase_8055f4e0.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@4919" -"@4919": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/asm/libnw4r_ut/ut_TextWriterBase_80123d00.s b/asm/libnw4r_ut/ut_TextWriterBase.s similarity index 99% rename from asm/libnw4r_ut/ut_TextWriterBase_80123d00.s rename to asm/libnw4r_ut/ut_TextWriterBase.s index 9ba2bb07..7199e098 100644 --- a/asm/libnw4r_ut/ut_TextWriterBase_80123d00.s +++ b/asm/libnw4r_ut/ut_TextWriterBase.s @@ -3452,3 +3452,71 @@ lbl_80126CC4: /* 80126CD4 00122B14 00 00 00 00 */ .4byte 0x00000000 /* 80126CD8 00122B18 00 00 00 00 */ .4byte 0x00000000 /* 80126CDC 00122B1C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 + .4byte "__sinit_@@1ut_TextWriterBase_cpp_80126C50" +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "@6159" +"@6159": + .skip 0xC + +.global "@6683" +"@6683": + .skip 0xC +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "mFormatBufferSize__Q34nw4r2ut17TextWriterBase" +"mFormatBufferSize__Q34nw4r2ut17TextWriterBase": + + .4byte 0x00000100 + .4byte 0 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global "mFormatBuffer__Q34nw4r2ut17TextWriterBase" +"mFormatBuffer__Q34nw4r2ut17TextWriterBase": + .skip 0x4 + +.global "mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" +"mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": + .skip 0x4 + +.global "mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" +"mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": + .skip 0x4 + +.global "@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" +"@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": + .skip 0x1 + +.global "@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" +"@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": + .skip 0x3 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@8480" +"@8480": + + .4byte 0x7F7FFFFF + +.global "@8481" +"@8481": + + .4byte 0 + +.global "@8501" +"@8501": + + .4byte 0x43300000 + .4byte 0x80000000 + +.global "@9845" +"@9845": + + .4byte 0x3F000000 + .4byte 0 diff --git a/asm/libnw4r_ut/ut_TextWriterBase_804062c0.s b/asm/libnw4r_ut/ut_TextWriterBase_804062c0.s deleted file mode 100644 index e9f9df31..00000000 --- a/asm/libnw4r_ut/ut_TextWriterBase_804062c0.s +++ /dev/null @@ -1,4 +0,0 @@ -.include "macros.inc" - -.section .ctors, "wa" # 0x80406260 - 0x80406540 ; 0x000002E0 - .4byte "__sinit_@@1ut_TextWriterBase_cpp_80126C50" diff --git a/asm/libnw4r_ut/ut_TextWriterBase_80543070.s b/asm/libnw4r_ut/ut_TextWriterBase_80543070.s deleted file mode 100644 index db3864d2..00000000 --- a/asm/libnw4r_ut/ut_TextWriterBase_80543070.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "@6159" -"@6159": - .skip 0xC - -.global "@6683" -"@6683": - .skip 0xC diff --git a/asm/libnw4r_ut/ut_TextWriterBase_80556a80.s b/asm/libnw4r_ut/ut_TextWriterBase_80556a80.s deleted file mode 100644 index a45ab7d3..00000000 --- a/asm/libnw4r_ut/ut_TextWriterBase_80556a80.s +++ /dev/null @@ -1,8 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "mFormatBufferSize__Q34nw4r2ut17TextWriterBase" -"mFormatBufferSize__Q34nw4r2ut17TextWriterBase": - - .4byte 0x00000100 - .4byte 0 diff --git a/asm/libnw4r_ut/ut_TextWriterBase_8055d0a0.s b/asm/libnw4r_ut/ut_TextWriterBase_8055d0a0.s deleted file mode 100644 index c043c33a..00000000 --- a/asm/libnw4r_ut/ut_TextWriterBase_8055d0a0.s +++ /dev/null @@ -1,22 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global "mFormatBuffer__Q34nw4r2ut17TextWriterBase" -"mFormatBuffer__Q34nw4r2ut17TextWriterBase": - .skip 0x4 - -.global "mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" -"mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": - .skip 0x4 - -.global "mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" -"mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": - .skip 0x4 - -.global "@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" -"@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": - .skip 0x1 - -.global "@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase" -"@GUARD@mDefaultTagProcessor__Q34nw4r2ut17TextWriterBase": - .skip 0x3 diff --git a/asm/libnw4r_ut/ut_TextWriterBase_8055f508.s b/asm/libnw4r_ut/ut_TextWriterBase_8055f508.s deleted file mode 100644 index 3b7d1f72..00000000 --- a/asm/libnw4r_ut/ut_TextWriterBase_8055f508.s +++ /dev/null @@ -1,24 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@8480" -"@8480": - - .4byte 0x7F7FFFFF - -.global "@8481" -"@8481": - - .4byte 0 - -.global "@8501" -"@8501": - - .4byte 0x43300000 - .4byte 0x80000000 - -.global "@9845" -"@9845": - - .4byte 0x3F000000 - .4byte 0 diff --git a/asm/libnw4r_ut/ut_binaryFileFormat_8011fe10.s b/asm/libnw4r_ut/ut_binaryFileFormat.s similarity index 100% rename from asm/libnw4r_ut/ut_binaryFileFormat_8011fe10.s rename to asm/libnw4r_ut/ut_binaryFileFormat.s diff --git a/asm/libnw4r_ut/ut_list_8011fb40.s b/asm/libnw4r_ut/ut_list.s similarity index 100% rename from asm/libnw4r_ut/ut_list_8011fb40.s rename to asm/libnw4r_ut/ut_list.s diff --git a/obj_files.mk b/obj_files.mk index 07f1045f..90cc7f96 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -506,24 +506,25 @@ $(BUILD_DIR)/asm/libnw4r_snd/snd_WaveSoundHandle.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_WsdFile.o \ $(BUILD_DIR)/asm/libnw4r_snd/snd_WsdPlayer.o \ \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_list.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_LinkList.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_binaryFileFormat.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_CharStrmReader.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_TagProcessorBase.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_IOStream.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_FileStream.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdFileStream.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdLockedFileStream.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_LockedCache.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_Font.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_RomFont.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFontBase.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFont.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_CharWriter.o \ +$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_list_8011fb40.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_LinkList_8011fc80.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_binaryFileFormat_8011fe10.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_CharStrmReader_8011fe90.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TagProcessorBase_8011ffb0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_IOStream_80120630.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_FileStream_80120660.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdFileStream_80120770.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdLockedFileStream_80120ea0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_LockedCache_80121290.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_Font_80121470.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_RomFont_80121520.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFontBase_80121b90.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFont_80122300.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_CharWriter_80122610.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_80123d00.o \ $(BUILD_DIR)/asm/libnw4r_db/db_directPrint_80126ce0.o \ $(BUILD_DIR)/asm/libnw4r_db/db_console_80127830.o \ $(BUILD_DIR)/asm/libnw4r_db/db_assert_80128350.o \ @@ -2917,12 +2918,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_ut/ut_IOStream_804062ac.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_FileStream_804062b0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdFileStream_804062b4.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdLockedFileStream_804062b8.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_LockedCache_804062bc.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_804062c0.o \ $(BUILD_DIR)/asm/homebuttonLib/lyt_bounding_804062c4.o \ $(BUILD_DIR)/asm/homebuttonLib/lyt_pane_804062c8.o \ $(BUILD_DIR)/asm/homebuttonLib/lyt_picture_804062cc.o \ @@ -3186,13 +3181,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_ut/ut_TagProcessorBase_804426e0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdFileStream_80442708.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdLockedFileStream_80442770.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_Font_804427d8.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_RomFont_80442808.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFontBase_804428d0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_ResFont_80442938.o \ $(BUILD_DIR)/asm/libnw4r_db/db_directPrint_80442998.o \ $(BUILD_DIR)/asm/libnw4r_db/db_assert_804429a8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMFrameController_804429b8.o \ @@ -4839,10 +4827,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_ut/ut_DvdLockedFileStream_80543028.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_LockedCache_80543040.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_CharWriter_80543060.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_80543070.o \ $(BUILD_DIR)/asm/libnw4r_db/db_directPrint_80543088.o \ $(BUILD_DIR)/asm/libnw4r_db/db_console_805430b0.o \ $(BUILD_DIR)/asm/libnw4r_db/db_assert_805434c8.o \ @@ -4918,8 +4902,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_ut/ut_RomFont_80556a78.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_80556a80.o \ $(BUILD_DIR)/asm/libnw4r_db/db_console_80556a88.o \ $(BUILD_DIR)/asm/libnw4r_db/db_assert_80556a90.o \ $(BUILD_DIR)/asm/nrel/ExpHeapMapUser_80556a98.o \ @@ -5303,12 +5285,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_ut/ut_IOStream_8055d068.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_FileStream_8055d070.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdFileStream_8055d078.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_DvdLockedFileStream_8055d080.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_CharWriter_8055d098.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_8055d0a0.o \ $(BUILD_DIR)/asm/libnw4r_db/db_directPrint_8055d0b0.o \ $(BUILD_DIR)/asm/libnw4r_db/db_console_8055d0b8.o \ $(BUILD_DIR)/asm/libnw4r_db/db_assert_8055d0c0.o \ @@ -5456,9 +5432,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_ut/ut_TagProcessorBase_8055f4e0.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_CharWriter_8055f4e8.o \ -$(BUILD_DIR)/asm/libnw4r_ut/ut_TextWriterBase_8055f508.o \ $(BUILD_DIR)/asm/libnw4r_db/db_directPrint_8055f520.o \ $(BUILD_DIR)/asm/nrel/Alert_8055f550.o \ $(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer_8055f558.o \