diff --git a/asm/libnw4r_db/db_assert_80128350.s b/asm/libnw4r_db/db_assert.s similarity index 90% rename from asm/libnw4r_db/db_assert_80128350.s rename to asm/libnw4r_db/db_assert.s index ce667f1d..0178f127 100644 --- a/asm/libnw4r_db/db_assert_80128350.s +++ b/asm/libnw4r_db/db_assert.s @@ -181,3 +181,45 @@ WarningAlarmFunc___Q24nw4r2dbFP7OSAlarmP9OSContext: /* 801285C4 00124404 4E 80 00 20 */ blr /* 801285C8 00124408 00 00 00 00 */ .4byte 0x00000000 /* 801285CC 0012440C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@6682" +"@6682": + + .4byte 0x25733A25 + .4byte 0x64205761 + .4byte 0x726E696E + .4byte 0x673A0000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global "@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sWarningAlarm@0" +"@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sWarningAlarm@0": + .skip 0x30 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global sDispWarningAuto__Q24nw4r2db +sDispWarningAuto__Q24nw4r2db: + + .4byte 0x01000000 + +.global "@6647" +"@6647": + + .4byte 0x0A000000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global sWarningTime__Q24nw4r2db +sWarningTime__Q24nw4r2db: + .skip 0x4 + +.global sAssertionConsole__Q24nw4r2db +sAssertionConsole__Q24nw4r2db: + .skip 0x4 + +.global "@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sInitializedAlarm" +"@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sInitializedAlarm": + .skip 0x8 diff --git a/asm/libnw4r_db/db_assert_804429a8.s b/asm/libnw4r_db/db_assert_804429a8.s deleted file mode 100644 index 4faad75c..00000000 --- a/asm/libnw4r_db/db_assert_804429a8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@6682" -"@6682": - - .4byte 0x25733A25 - .4byte 0x64205761 - .4byte 0x726E696E - .4byte 0x673A0000 diff --git a/asm/libnw4r_db/db_assert_805434c8.s b/asm/libnw4r_db/db_assert_805434c8.s deleted file mode 100644 index 75bb96de..00000000 --- a/asm/libnw4r_db/db_assert_805434c8.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global "@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sWarningAlarm@0" -"@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sWarningAlarm@0": - .skip 0x30 diff --git a/asm/libnw4r_db/db_assert_80556a90.s b/asm/libnw4r_db/db_assert_80556a90.s deleted file mode 100644 index 28af3587..00000000 --- a/asm/libnw4r_db/db_assert_80556a90.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global sDispWarningAuto__Q24nw4r2db -sDispWarningAuto__Q24nw4r2db: - - .4byte 0x01000000 - -.global "@6647" -"@6647": - - .4byte 0x0A000000 diff --git a/asm/libnw4r_db/db_assert_8055d0c0.s b/asm/libnw4r_db/db_assert_8055d0c0.s deleted file mode 100644 index 78ea4e2f..00000000 --- a/asm/libnw4r_db/db_assert_8055d0c0.s +++ /dev/null @@ -1,14 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global sWarningTime__Q24nw4r2db -sWarningTime__Q24nw4r2db: - .skip 0x4 - -.global sAssertionConsole__Q24nw4r2db -sAssertionConsole__Q24nw4r2db: - .skip 0x4 - -.global "@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sInitializedAlarm" -"@LOCAL@GetWarningAlarm___Q24nw4r2dbFv@sInitializedAlarm": - .skip 0x8 diff --git a/asm/libnw4r_db/db_console_80127830.s b/asm/libnw4r_db/db_console.s similarity index 98% rename from asm/libnw4r_db/db_console_80127830.s rename to asm/libnw4r_db/db_console.s index cf102274..7e1539aa 100644 --- a/asm/libnw4r_db/db_console_80127830.s +++ b/asm/libnw4r_db/db_console.s @@ -859,3 +859,35 @@ lbl_80128328: /* 80128344 00124184 38 21 00 10 */ addi r1, r1, 0x10 /* 80128348 00124188 4E 80 00 20 */ blr /* 8012834C 0012418C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global sMutex__Q24nw4r2db +sMutex__Q24nw4r2db: + .skip 0x18 + +.global "@LOCAL@Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct@sStrBuf@0" +"@LOCAL@Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct@sStrBuf@0": + .skip 0x400 +.include "macros.inc" + +.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 +.global "@8595" +"@8595": + + .4byte 0x25730A00 + +.global "@8712_80556A8C" +"@8712_80556A8C": + + .4byte 0x25730000 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global sConsoleList__Q24nw4r2db +sConsoleList__Q24nw4r2db: + .skip 0x4 + +.global sInitialized__Q24nw4r2db_8055D0BC +sInitialized__Q24nw4r2db_8055D0BC: + .skip 0x4 diff --git a/asm/libnw4r_db/db_console_805430b0.s b/asm/libnw4r_db/db_console_805430b0.s deleted file mode 100644 index 1f0f112c..00000000 --- a/asm/libnw4r_db/db_console_805430b0.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global sMutex__Q24nw4r2db -sMutex__Q24nw4r2db: - .skip 0x18 - -.global "@LOCAL@Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct@sStrBuf@0" -"@LOCAL@Console_VFPrintf__Q24nw4r2dbFQ34nw4r2db17ConsoleOutputTypePQ44nw4r2db6detail11ConsoleHeadPCcP16__va_list_struct@sStrBuf@0": - .skip 0x400 diff --git a/asm/libnw4r_db/db_console_80556a88.s b/asm/libnw4r_db/db_console_80556a88.s deleted file mode 100644 index f12e5fb8..00000000 --- a/asm/libnw4r_db/db_console_80556a88.s +++ /dev/null @@ -1,12 +0,0 @@ -.include "macros.inc" - -.section .sdata, "wa" # 0x80556420 - 0x8055C6E0 ; 0x000062C0 -.global "@8595" -"@8595": - - .4byte 0x25730A00 - -.global "@8712_80556A8C" -"@8712_80556A8C": - - .4byte 0x25730000 diff --git a/asm/libnw4r_db/db_console_8055d0b8.s b/asm/libnw4r_db/db_console_8055d0b8.s deleted file mode 100644 index d02f76c6..00000000 --- a/asm/libnw4r_db/db_console_8055d0b8.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global sConsoleList__Q24nw4r2db -sConsoleList__Q24nw4r2db: - .skip 0x4 - -.global sInitialized__Q24nw4r2db_8055D0BC -sInitialized__Q24nw4r2db_8055D0BC: - .skip 0x4 diff --git a/asm/libnw4r_db/db_directPrint_80126ce0.s b/asm/libnw4r_db/db_directPrint.s similarity index 89% rename from asm/libnw4r_db/db_directPrint_80126ce0.s rename to asm/libnw4r_db/db_directPrint.s index a1d3353f..d1fe2744 100644 --- a/asm/libnw4r_db/db_directPrint_80126ce0.s +++ b/asm/libnw4r_db/db_directPrint.s @@ -883,3 +883,275 @@ lbl_80127808: /* 80127824 00123664 38 21 00 20 */ addi r1, r1, 0x20 /* 80127828 00123668 4E 80 00 20 */ blr /* 8012782C 0012366C 00 00 00 00 */ .4byte 0x00000000 +.include "macros.inc" + +.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 +.global sAsciiTable__Q24nw4r2db +sAsciiTable__Q24nw4r2db: + + .4byte 0x7A7A7A7A + .4byte 0x7A7A7A7A + .4byte 0x7AFDFE7A + .4byte 0x7A7A7A7A + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFFFFFFFF + .4byte 0xFF296465 + .4byte 0x662B6768 + .4byte 0x2526692A + .4byte 0x6A272C6B + .4byte 0x00010203 + .4byte 0x04050607 + .4byte 0x0809246C + .4byte 0x6D6E6F28 + .4byte 0x700A0B0C + .4byte 0x0D0E0F10 + .4byte 0x11121314 + .4byte 0x15161718 + .4byte 0x191A1B1C + .4byte 0x1D1E1F20 + .4byte 0x21222371 + .4byte 0x72737475 + .4byte 0xFF7D7E7F + .4byte 0x80818283 + .4byte 0x84858687 + .4byte 0x88898A8B + .4byte 0x8C8D8E8F + .4byte 0x90919293 + .4byte 0x94959676 + .4byte 0x7778797A + +.global sFontData__Q24nw4r2db +sFontData__Q24nw4r2db: + + .4byte 0x70871C30 + .4byte 0x8988A250 + .4byte 0x88808290 + .4byte 0x88830C90 + .4byte 0x888402F8 + .4byte 0x88882210 + .4byte 0x71CF9C10 + .4byte 0xF9CF9C70 + .4byte 0x8208A288 + .4byte 0xF200A288 + .4byte 0x0BC11C78 + .4byte 0x0A222208 + .4byte 0x8A222208 + .4byte 0x71C21C70 + .4byte 0x23C738F8 + .4byte 0x5228A480 + .4byte 0x8A282280 + .4byte 0x8BC822F0 + .4byte 0xFA282280 + .4byte 0x8A28A480 + .4byte 0x8BC738F8 + .4byte 0xF9C89C08 + .4byte 0x82288808 + .4byte 0x82088808 + .4byte 0xF2EF8808 + .4byte 0x82288888 + .4byte 0x82288888 + .4byte 0x81C89C70 + .4byte 0x8A08A270 + .4byte 0x920DA288 + .4byte 0xA20AB288 + .4byte 0xC20AAA88 + .4byte 0xA208A688 + .4byte 0x9208A288 + .4byte 0x8BE8A270 + .4byte 0xF1CF1CF8 + .4byte 0x8A28A220 + .4byte 0x8A28A020 + .4byte 0xF22F1C20 + .4byte 0x82AA0220 + .4byte 0x82492220 + .4byte 0x81A89C20 + .4byte 0x8A28A288 + .4byte 0x8A28A288 + .4byte 0x8A289488 + .4byte 0x8A2A8850 + .4byte 0x894A9420 + .4byte 0x894AA220 + .4byte 0x70852220 + .4byte 0xF8011000 + .4byte 0x08020800 + .4byte 0x10840400 + .4byte 0x20040470 + .4byte 0x40840400 + .4byte lbl_80020800 + .4byte 0xF8011000 + .4byte 0x70800000 + .4byte 0x88822200 + .4byte 0x08820400 + .4byte 0x108F8800 + .4byte 0x20821000 + .4byte 0x00022200 + .4byte 0x20800020 + .4byte 0 + +.global sFontData2__Q24nw4r2db +sFontData2__Q24nw4r2db: + + .4byte 0x51421820 + .4byte 0x53E7A420 + .4byte 0x014A2C40 + .4byte 0x01471000 + .4byte 0x0142AA00 + .4byte 0x03EAA400 + .4byte 0x01471A78 + .4byte 0 + .4byte 0x50008010 + .4byte 0x20010820 + .4byte 0xF8020040 + .4byte 0x20420820 + .4byte 0x50441010 + .4byte 0x00880000 + .4byte 0x00070E00 + .4byte 0x01088840 + .4byte 0x78898820 + .4byte 0x004A8810 + .4byte 0x788A8810 + .4byte 0x01098808 + .4byte 0x00040E04 + .4byte 0x70800620 + .4byte 0x11400820 + .4byte 0x12200820 + .4byte 0x10001020 + .4byte 0x10000820 + .4byte 0x100F8820 + .4byte 0x70000620 + .4byte 0x60070000 + .4byte 0x110F82A0 + .4byte 0x12AA8AE0 + .4byte 0x084F92A0 + .4byte 0x100FBE1C + .4byte 0x10089008 + .4byte 0x60070808 + .4byte 0 + .4byte 0x02000200 + .4byte 0x7A078270 + .4byte 0x8BC81E88 + .4byte 0x8A2822F8 + .4byte 0x9A282280 + .4byte 0x6BC79E78 + .4byte 0x30000000 + .4byte 0x48080810 + .4byte 0x41E80000 + .4byte 0x422F1830 + .4byte 0xFBE88810 + .4byte 0x40288890 + .4byte 0x43C89C60 + .4byte 0x81000000 + .4byte 0x81000000 + .4byte 0x990F3C70 + .4byte 0xA10AA288 + .4byte 0xE10AA288 + .4byte 0xA10AA288 + .4byte 0x98CAA270 + .4byte 0 + .4byte 0x00000020 + .4byte 0xF1EF1E20 + .4byte 0x8A28A0F8 + .4byte 0x8A281C20 + .4byte 0xF1E80220 + .4byte lbl_80283C38 + .4byte 0 + .4byte 0 + .4byte 0x8A28B688 + .4byte 0x8A2A8888 + .4byte 0x8A2A8878 + .4byte 0x894A8808 + .4byte 0x788536F0 + .4byte 0 + .4byte 0 + .4byte 0xF8000000 + .4byte 0x10000000 + .4byte 0x20000000 + .4byte 0x40000000 + .4byte 0xF8000000 + .4byte 0 +.include "macros.inc" + +.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 +.global "@LOCAL@DrawCharToXfb___Q24nw4r2dbFiii@twiceBit" +"@LOCAL@DrawCharToXfb___Q24nw4r2dbFiii@twiceBit": + + .4byte 0 + .4byte 0x00000003 + .4byte 0x0000000C + .4byte 0x0000000F +.include "macros.inc" + +.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 +.global sFrameBufferInfo__Q24nw4r2db +sFrameBufferInfo__Q24nw4r2db: + .skip 0x10 + +.global sFrameBufferColor__Q24nw4r2db +sFrameBufferColor__Q24nw4r2db: + .skip 0x18 +.include "macros.inc" + +.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 +.global sInitialized__Q24nw4r2db_8055D0B0 +sInitialized__Q24nw4r2db_8055D0B0: + .skip 0x8 +.include "macros.inc" + +.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 +.global "@2741" +"@2741": + + .4byte 0x41800000 + +.global "@2742" +"@2742": + + .4byte 0x3DC8B439 + +.global "@2743" +"@2743": + + .4byte 0x3E839581 + +.global "@2744" +"@2744": + + .4byte 0x3F010625 + +.global "@2745" +"@2745": + + .4byte 0x43000000 + +.global "@2746_8055F534" +"@2746_8055F534": + + .4byte 0x3EE0C49C + +.global "@2747_8055F538" +"@2747_8055F538": + + .4byte 0xBE178D50 + +.global "@2748" +"@2748": + + .4byte 0x3E94FDF4 + +.global "@2749" +"@2749": + + .4byte 0x3EBC6A7F + +.global "@2750_8055F544" +"@2750_8055F544": + + .4byte 0x3D916873 + +.global "@2754_8055F548" +"@2754_8055F548": + + .4byte 0x43300000 + .4byte 0x80000000 diff --git a/asm/libnw4r_db/db_directPrint_8040db28.s b/asm/libnw4r_db/db_directPrint_8040db28.s deleted file mode 100644 index b179e3ab..00000000 --- a/asm/libnw4r_db/db_directPrint_8040db28.s +++ /dev/null @@ -1,188 +0,0 @@ -.include "macros.inc" - -.section .rodata, "wa" # 0x80406560 - 0x80421040 ; 0x0001AAE0 -.global sAsciiTable__Q24nw4r2db -sAsciiTable__Q24nw4r2db: - - .4byte 0x7A7A7A7A - .4byte 0x7A7A7A7A - .4byte 0x7AFDFE7A - .4byte 0x7A7A7A7A - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFFFFFFFF - .4byte 0xFF296465 - .4byte 0x662B6768 - .4byte 0x2526692A - .4byte 0x6A272C6B - .4byte 0x00010203 - .4byte 0x04050607 - .4byte 0x0809246C - .4byte 0x6D6E6F28 - .4byte 0x700A0B0C - .4byte 0x0D0E0F10 - .4byte 0x11121314 - .4byte 0x15161718 - .4byte 0x191A1B1C - .4byte 0x1D1E1F20 - .4byte 0x21222371 - .4byte 0x72737475 - .4byte 0xFF7D7E7F - .4byte 0x80818283 - .4byte 0x84858687 - .4byte 0x88898A8B - .4byte 0x8C8D8E8F - .4byte 0x90919293 - .4byte 0x94959676 - .4byte 0x7778797A - -.global sFontData__Q24nw4r2db -sFontData__Q24nw4r2db: - - .4byte 0x70871C30 - .4byte 0x8988A250 - .4byte 0x88808290 - .4byte 0x88830C90 - .4byte 0x888402F8 - .4byte 0x88882210 - .4byte 0x71CF9C10 - .4byte 0xF9CF9C70 - .4byte 0x8208A288 - .4byte 0xF200A288 - .4byte 0x0BC11C78 - .4byte 0x0A222208 - .4byte 0x8A222208 - .4byte 0x71C21C70 - .4byte 0x23C738F8 - .4byte 0x5228A480 - .4byte 0x8A282280 - .4byte 0x8BC822F0 - .4byte 0xFA282280 - .4byte 0x8A28A480 - .4byte 0x8BC738F8 - .4byte 0xF9C89C08 - .4byte 0x82288808 - .4byte 0x82088808 - .4byte 0xF2EF8808 - .4byte 0x82288888 - .4byte 0x82288888 - .4byte 0x81C89C70 - .4byte 0x8A08A270 - .4byte 0x920DA288 - .4byte 0xA20AB288 - .4byte 0xC20AAA88 - .4byte 0xA208A688 - .4byte 0x9208A288 - .4byte 0x8BE8A270 - .4byte 0xF1CF1CF8 - .4byte 0x8A28A220 - .4byte 0x8A28A020 - .4byte 0xF22F1C20 - .4byte 0x82AA0220 - .4byte 0x82492220 - .4byte 0x81A89C20 - .4byte 0x8A28A288 - .4byte 0x8A28A288 - .4byte 0x8A289488 - .4byte 0x8A2A8850 - .4byte 0x894A9420 - .4byte 0x894AA220 - .4byte 0x70852220 - .4byte 0xF8011000 - .4byte 0x08020800 - .4byte 0x10840400 - .4byte 0x20040470 - .4byte 0x40840400 - .4byte lbl_80020800 - .4byte 0xF8011000 - .4byte 0x70800000 - .4byte 0x88822200 - .4byte 0x08820400 - .4byte 0x108F8800 - .4byte 0x20821000 - .4byte 0x00022200 - .4byte 0x20800020 - .4byte 0 - -.global sFontData2__Q24nw4r2db -sFontData2__Q24nw4r2db: - - .4byte 0x51421820 - .4byte 0x53E7A420 - .4byte 0x014A2C40 - .4byte 0x01471000 - .4byte 0x0142AA00 - .4byte 0x03EAA400 - .4byte 0x01471A78 - .4byte 0 - .4byte 0x50008010 - .4byte 0x20010820 - .4byte 0xF8020040 - .4byte 0x20420820 - .4byte 0x50441010 - .4byte 0x00880000 - .4byte 0x00070E00 - .4byte 0x01088840 - .4byte 0x78898820 - .4byte 0x004A8810 - .4byte 0x788A8810 - .4byte 0x01098808 - .4byte 0x00040E04 - .4byte 0x70800620 - .4byte 0x11400820 - .4byte 0x12200820 - .4byte 0x10001020 - .4byte 0x10000820 - .4byte 0x100F8820 - .4byte 0x70000620 - .4byte 0x60070000 - .4byte 0x110F82A0 - .4byte 0x12AA8AE0 - .4byte 0x084F92A0 - .4byte 0x100FBE1C - .4byte 0x10089008 - .4byte 0x60070808 - .4byte 0 - .4byte 0x02000200 - .4byte 0x7A078270 - .4byte 0x8BC81E88 - .4byte 0x8A2822F8 - .4byte 0x9A282280 - .4byte 0x6BC79E78 - .4byte 0x30000000 - .4byte 0x48080810 - .4byte 0x41E80000 - .4byte 0x422F1830 - .4byte 0xFBE88810 - .4byte 0x40288890 - .4byte 0x43C89C60 - .4byte 0x81000000 - .4byte 0x81000000 - .4byte 0x990F3C70 - .4byte 0xA10AA288 - .4byte 0xE10AA288 - .4byte 0xA10AA288 - .4byte 0x98CAA270 - .4byte 0 - .4byte 0x00000020 - .4byte 0xF1EF1E20 - .4byte 0x8A28A0F8 - .4byte 0x8A281C20 - .4byte 0xF1E80220 - .4byte lbl_80283C38 - .4byte 0 - .4byte 0 - .4byte 0x8A28B688 - .4byte 0x8A2A8888 - .4byte 0x8A2A8878 - .4byte 0x894A8808 - .4byte 0x788536F0 - .4byte 0 - .4byte 0 - .4byte 0xF8000000 - .4byte 0x10000000 - .4byte 0x20000000 - .4byte 0x40000000 - .4byte 0xF8000000 - .4byte 0 diff --git a/asm/libnw4r_db/db_directPrint_80442998.s b/asm/libnw4r_db/db_directPrint_80442998.s deleted file mode 100644 index f23be828..00000000 --- a/asm/libnw4r_db/db_directPrint_80442998.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .data, "wa" # 0x80421040 - 0x80496700 ; 0x000756C0 -.global "@LOCAL@DrawCharToXfb___Q24nw4r2dbFiii@twiceBit" -"@LOCAL@DrawCharToXfb___Q24nw4r2dbFiii@twiceBit": - - .4byte 0 - .4byte 0x00000003 - .4byte 0x0000000C - .4byte 0x0000000F diff --git a/asm/libnw4r_db/db_directPrint_80543088.s b/asm/libnw4r_db/db_directPrint_80543088.s deleted file mode 100644 index dd27c891..00000000 --- a/asm/libnw4r_db/db_directPrint_80543088.s +++ /dev/null @@ -1,10 +0,0 @@ -.include "macros.inc" - -.section .bss, "", @nobits # 0x80496700 - 0x80556420 ; 0x000BFD20 -.global sFrameBufferInfo__Q24nw4r2db -sFrameBufferInfo__Q24nw4r2db: - .skip 0x10 - -.global sFrameBufferColor__Q24nw4r2db -sFrameBufferColor__Q24nw4r2db: - .skip 0x18 diff --git a/asm/libnw4r_db/db_directPrint_8055d0b0.s b/asm/libnw4r_db/db_directPrint_8055d0b0.s deleted file mode 100644 index 601f0c51..00000000 --- a/asm/libnw4r_db/db_directPrint_8055d0b0.s +++ /dev/null @@ -1,6 +0,0 @@ -.include "macros.inc" - -.section .sbss, "", @nobits # 0x8055C6E0 - 0x8055DF80 ; 0x000018A0 -.global sInitialized__Q24nw4r2db_8055D0B0 -sInitialized__Q24nw4r2db_8055D0B0: - .skip 0x8 diff --git a/asm/libnw4r_db/db_directPrint_8055f520.s b/asm/libnw4r_db/db_directPrint_8055f520.s deleted file mode 100644 index 965f4e33..00000000 --- a/asm/libnw4r_db/db_directPrint_8055f520.s +++ /dev/null @@ -1,58 +0,0 @@ -.include "macros.inc" - -.section .sdata2, "wa" # 0x8055DF80 - 0x805643C0 ; 0x00006440 -.global "@2741" -"@2741": - - .4byte 0x41800000 - -.global "@2742" -"@2742": - - .4byte 0x3DC8B439 - -.global "@2743" -"@2743": - - .4byte 0x3E839581 - -.global "@2744" -"@2744": - - .4byte 0x3F010625 - -.global "@2745" -"@2745": - - .4byte 0x43000000 - -.global "@2746_8055F534" -"@2746_8055F534": - - .4byte 0x3EE0C49C - -.global "@2747_8055F538" -"@2747_8055F538": - - .4byte 0xBE178D50 - -.global "@2748" -"@2748": - - .4byte 0x3E94FDF4 - -.global "@2749" -"@2749": - - .4byte 0x3EBC6A7F - -.global "@2750_8055F544" -"@2750_8055F544": - - .4byte 0x3D916873 - -.global "@2754_8055F548" -"@2754_8055F548": - - .4byte 0x43300000 - .4byte 0x80000000 diff --git a/obj_files.mk b/obj_files.mk index 90cc7f96..5ae29903 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -523,11 +523,12 @@ $(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/libnw4r_db/db_directPrint.o \ +$(BUILD_DIR)/asm/libnw4r_db/db_console.o \ +$(BUILD_DIR)/asm/libnw4r_db/db_assert.o \ +\ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80006684.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_800069c4.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 \ $(BUILD_DIR)/asm/homebuttonLib/HBMFrameController_801285d0.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMAnmController_80128780.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMGUIManager_80128860.o \ @@ -3001,7 +3002,6 @@ $(BUILD_DIR)/asm/src/MintSERequestor_80406524.o \ $(BUILD_DIR)/asm/src/Alarm_80406528.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_8040652c.o \ $(BUILD_DIR)/asm/Linker/Generated/Symbol/File_80406548.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_directPrint_8040db28.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMFrameController_8040dde0.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMGUIManager_8040dde8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMController_8040ddf8.o \ @@ -3181,8 +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_db/db_directPrint_80442998.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_assert_804429a8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMFrameController_804429b8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMAnmController_804429e0.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMGUIManager_80442a28.o \ @@ -4827,9 +4825,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_db/db_directPrint_80543088.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_console_805430b0.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_assert_805434c8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMGUIManager_805434f8.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMController_80543500.o \ $(BUILD_DIR)/asm/homebuttonLib/HBMRemoteSpk_805436a0.o \ @@ -4902,8 +4897,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_db/db_console_80556a88.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_assert_80556a90.o \ $(BUILD_DIR)/asm/nrel/ExpHeapMapUser_80556a98.o \ $(BUILD_DIR)/asm/nrel/ExpHeapAccessor_80556aa8.o \ $(BUILD_DIR)/asm/libMobiclip/MoApi_80556ab0.o \ @@ -5285,9 +5278,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_db/db_directPrint_8055d0b0.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_console_8055d0b8.o \ -$(BUILD_DIR)/asm/libnw4r_db/db_assert_8055d0c0.o \ $(BUILD_DIR)/asm/libMobiclip/MoApi_8055d0d0.o \ $(BUILD_DIR)/asm/libMobiclip/MoSdkMem_8055d0d8.o \ $(BUILD_DIR)/asm/libms/libms_8055d0e8.o \ @@ -5432,7 +5422,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_db/db_directPrint_8055f520.o \ $(BUILD_DIR)/asm/nrel/Alert_8055f550.o \ $(BUILD_DIR)/asm/nrel/HeapMapBlockDrawer_8055f558.o \ $(BUILD_DIR)/asm/nrel/GXSettingFor2D_8055f568.o \