diff --git a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s index 9389eb08..41aa2573 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B4A40.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B4A40.s @@ -1,3 +1,12 @@ +.late_rodata +glabel jpt_800E8CAC +.word L800B4BA4, L800B4BC8, L800B4BC8, L800B4BBC, L800B4BC8, L800B4BC8, L800B4BC8, L800B4BC8, L800B4BC8, L800B4BC8, L800B4BC8, L800B4BAC, L800B4BC8, L800B4BB4, L800B4BC8, L800B4BC8, L800B4BC4 +glabel jpt_800E8CF0 +.word L800B4DB0, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DB8, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4D90, L800B4DC4, L800B4DC4, L800B4DC4, L800B4D98, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC4, L800B4DC0 +glabel jpt_800E8D88 +.word L800B52C4, L800B5E0C, L800B5794, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B4F84, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5AC4, L800B4E38, L800B52C4, L800B57A4, L800B5794, L800B5E0C, L800B4E38, L800B5E0C, L800B5E0C, L800B5E0C, L800B5E0C, L800B5D78, L800B4F64, L800B5C8C, L800B5E0C, L800B5E0C, L800B5B48, L800B5E0C, L800B4F44, L800B5E0C, L800B5E0C, L800B4FA4 + +.text glabel func_800B4A40 /* 0B5640 800B4A40 27BDFE48 */ addiu $sp, $sp, -0x1b8 /* 0B5644 800B4A44 AFBF004C */ sw $ra, 0x4c($sp) @@ -88,22 +97,28 @@ glabel func_800B4A40 /* 0B5780 800B4B80 10200011 */ beqz $at, .L800B4BC8 /* 0B5784 800B4B84 256B0001 */ addiu $t3, $t3, 1 /* 0B5788 800B4B88 0018C080 */ sll $t8, $t8, 2 -/* 0B578C 800B4B8C 3C01800F */ lui $at, %hi(D_800E8CAC) # $at, 0x800f +/* 0B578C 800B4B8C 3C01800F */ lui $at, %hi(jpt_800E8CAC) # $at, 0x800f /* 0B5790 800B4B90 00380821 */ addu $at, $at, $t8 -/* 0B5794 800B4B94 8C388CAC */ lw $t8, %lo(D_800E8CAC)($at) +/* 0B5794 800B4B94 8C388CAC */ lw $t8, %lo(jpt_800E8CAC)($at) /* 0B5798 800B4B98 00000000 */ nop /* 0B579C 800B4B9C 03000008 */ jr $t8 /* 0B57A0 800B4BA0 00000000 */ nop +glabel L800B4BA4 /* 0B57A4 800B4BA4 10000008 */ b .L800B4BC8 /* 0B57A8 800B4BA8 24160001 */ li $s6, 1 +glabel L800B4BAC /* 0B57AC 800B4BAC 10000006 */ b .L800B4BC8 /* 0B57B0 800B4BB0 24150001 */ li $s5, 1 +glabel L800B4BB4 /* 0B57B4 800B4BB4 10000004 */ b .L800B4BC8 /* 0B57B8 800B4BB8 24170001 */ li $s7, 1 +glabel L800B4BBC /* 0B57BC 800B4BBC 10000002 */ b .L800B4BC8 /* 0B57C0 800B4BC0 241E0001 */ li $fp, 1 +glabel L800B4BC4 /* 0B57C4 800B4BC4 240C0030 */ li $t4, 48 .L800B4BC8: +glabel L800B4BC8 /* 0B57C8 800B4BC8 91630000 */ lbu $v1, ($t3) /* 0B57CC 800B4BCC 24010020 */ li $at, 32 /* 0B57D0 800B4BD0 1061FFE9 */ beq $v1, $at, .L800B4B78 @@ -225,14 +240,16 @@ glabel func_800B4A40 /* 0B596C 800B4D6C 10200015 */ beqz $at, .L800B4DC4 /* 0B5970 800B4D70 256B0001 */ addiu $t3, $t3, 1 /* 0B5974 800B4D74 0019C880 */ sll $t9, $t9, 2 -/* 0B5978 800B4D78 3C01800F */ lui $at, %hi(D_800E8CF0) # $at, 0x800f +/* 0B5978 800B4D78 3C01800F */ lui $at, %hi(jpt_800E8CF0) # $at, 0x800f /* 0B597C 800B4D7C 00390821 */ addu $at, $at, $t9 -/* 0B5980 800B4D80 8C398CF0 */ lw $t9, %lo(D_800E8CF0)($at) +/* 0B5980 800B4D80 8C398CF0 */ lw $t9, %lo(jpt_800E8CF0)($at) /* 0B5984 800B4D84 00000000 */ nop /* 0B5988 800B4D88 03200008 */ jr $t9 /* 0B598C 800B4D8C 00000000 */ nop +glabel L800B4D90 /* 0B5990 800B4D90 1000000C */ b .L800B4DC4 /* 0B5994 800B4D94 24060001 */ li $a2, 1 +glabel L800B4D98 /* 0B5998 800B4D98 10A00003 */ beqz $a1, .L800B4DA8 /* 0B599C 800B4D9C 00000000 */ nop /* 0B59A0 800B4DA0 10000008 */ b .L800B4DC4 @@ -240,12 +257,16 @@ glabel func_800B4A40 .L800B4DA8: /* 0B59A8 800B4DA8 10000006 */ b .L800B4DC4 /* 0B59AC 800B4DAC 24050001 */ li $a1, 1 +glabel L800B4DB0 /* 0B59B0 800B4DB0 10000004 */ b .L800B4DC4 /* 0B59B4 800B4DB4 24040001 */ li $a0, 1 +glabel L800B4DB8 /* 0B59B8 800B4DB8 10000002 */ b .L800B4DC4 /* 0B59BC 800B4DBC 24050001 */ li $a1, 1 +glabel L800B4DC0 /* 0B59C0 800B4DC0 24040001 */ li $a0, 1 .L800B4DC4: +glabel L800B4DC4 /* 0B59C4 800B4DC4 91630000 */ lbu $v1, ($t3) /* 0B59C8 800B4DC8 24010068 */ li $at, 104 /* 0B59CC 800B4DCC 1061FFE5 */ beq $v1, $at, .L800B4D64 @@ -270,12 +291,13 @@ glabel func_800B4A40 /* 0B5A14 800B4E14 102003FD */ beqz $at, .L800B5E0C /* 0B5A18 800B4E18 A3B3019A */ sb $s3, 0x19a($sp) /* 0B5A1C 800B4E1C 000E7080 */ sll $t6, $t6, 2 -/* 0B5A20 800B4E20 3C01800F */ lui $at, %hi(D_800E8D88) # $at, 0x800f +/* 0B5A20 800B4E20 3C01800F */ lui $at, %hi(jpt_800E8D88) # $at, 0x800f /* 0B5A24 800B4E24 002E0821 */ addu $at, $at, $t6 -/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, %lo(D_800E8D88)($at) +/* 0B5A28 800B4E28 8C2E8D88 */ lw $t6, %lo(jpt_800E8D88)($at) /* 0B5A2C 800B4E2C 00000000 */ nop /* 0B5A30 800B4E30 01C00008 */ jr $t6 /* 0B5A34 800B4E34 00000000 */ nop +glabel L800B4E38 /* 0B5A38 800B4E38 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B5A3C 800B4E3C 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5A40 800B4E40 2407000A */ li $a3, 10 @@ -350,6 +372,7 @@ glabel func_800B4A40 /* 0B5B38 800B4F38 AFAE0188 */ sw $t6, 0x188($sp) /* 0B5B3C 800B4F3C 10000046 */ b .L800B5058 /* 0B5B40 800B4F40 AFAF018C */ sw $t7, 0x18c($sp) +glabel L800B4F44 /* 0B5B44 800B4F44 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B5B48 800B4F48 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5B4C 800B4F4C 2407000A */ li $a3, 10 @@ -358,6 +381,7 @@ glabel func_800B4A40 /* 0B5B58 800B4F58 00009025 */ move $s2, $zero /* 0B5B5C 800B4F5C 10000018 */ b .L800B4FC0 /* 0B5B60 800B4F60 27BF017B */ addiu $ra, $sp, 0x17b +glabel L800B4F64 /* 0B5B64 800B4F64 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B5B68 800B4F68 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5B6C 800B4F6C 24070008 */ li $a3, 8 @@ -366,6 +390,7 @@ glabel func_800B4A40 /* 0B5B78 800B4F78 00009025 */ move $s2, $zero /* 0B5B7C 800B4F7C 10000010 */ b .L800B4FC0 /* 0B5B80 800B4F80 27BF017B */ addiu $ra, $sp, 0x17b +glabel L800B4F84 /* 0B5B84 800B4F84 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B5B88 800B4F88 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5B8C 800B4F8C 24070010 */ li $a3, 16 @@ -374,6 +399,7 @@ glabel func_800B4A40 /* 0B5B98 800B4F98 00009025 */ move $s2, $zero /* 0B5B9C 800B4F9C 10000008 */ b .L800B4FC0 /* 0B5BA0 800B4FA0 27BF017B */ addiu $ra, $sp, 0x17b +glabel L800B4FA4 /* 0B5BA4 800B4FA4 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B5BA8 800B4FA8 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5BAC 800B4FAC 24070010 */ li $a3, 16 @@ -601,6 +627,7 @@ glabel func_800B4A40 /* 0B5EB8 800B52B8 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B5EBC 800B52BC 100002D6 */ b .L800B5E18 /* 0B5EC0 800B52C0 00000000 */ nop +glabel L800B52C4 /* 0B5EC4 800B52C4 3C0F800E */ lui $t7, %hi(D_800E2EF0) # $t7, 0x800e /* 0B5EC8 800B52C8 8DEF2EF0 */ lw $t7, %lo(D_800E2EF0)($t7) /* 0B5ECC 800B52CC 00002825 */ move $a1, $zero @@ -951,10 +978,12 @@ glabel func_800B4A40 /* 0B6388 800B5788 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B638C 800B578C 100001A2 */ b .L800B5E18 /* 0B6390 800B5790 00000000 */ nop +glabel L800B5794 /* 0B6394 800B5794 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B6398 800B5798 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B639C 800B579C 1000019E */ b .L800B5E18 /* 0B63A0 800B57A0 00000000 */ nop +glabel L800B57A4 /* 0B63A4 800B57A4 3C19800E */ lui $t9, %hi(D_800E2EF0) # $t9, 0x800e /* 0B63A8 800B57A8 8F392EF0 */ lw $t9, %lo(D_800E2EF0)($t9) /* 0B63AC 800B57AC 4620A306 */ mov.d $f12, $f20 @@ -1190,6 +1219,7 @@ glabel func_800B4A40 /* 0B66B8 800B5AB8 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B66BC 800B5ABC 100000D6 */ b .L800B5E18 /* 0B66C0 800B5AC0 00000000 */ nop +glabel L800B5AC4 /* 0B66C4 800B5AC4 26310003 */ addiu $s1, $s1, 3 /* 0B66C8 800B5AC8 2401FFFC */ li $at, -4 /* 0B66CC 800B5ACC 02217824 */ and $t7, $s1, $at @@ -1228,6 +1258,7 @@ glabel func_800B4A40 /* 0B673C 800B5B3C 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B6740 800B5B40 100000B5 */ b .L800B5E18 /* 0B6744 800B5B44 00000000 */ nop +glabel L800B5B48 /* 0B6748 800B5B48 26310003 */ addiu $s1, $s1, 3 /* 0B674C 800B5B4C 2401FFFC */ li $at, -4 /* 0B6750 800B5B50 0221C824 */ and $t9, $s1, $at @@ -1320,6 +1351,7 @@ glabel func_800B4A40 /* 0B6880 800B5C80 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B6884 800B5C84 10000064 */ b .L800B5E18 /* 0B6888 800B5C88 00000000 */ nop +glabel L800B5C8C /* 0B688C 800B5C8C 26310003 */ addiu $s1, $s1, 3 /* 0B6890 800B5C90 2401FFFC */ li $at, -4 /* 0B6894 800B5C94 02217824 */ and $t7, $s1, $at @@ -1386,6 +1418,7 @@ glabel func_800B4A40 /* 0B696C 800B5D6C 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B6970 800B5D70 10000029 */ b .L800B5E18 /* 0B6974 800B5D74 00000000 */ nop +glabel L800B5D78 /* 0B6978 800B5D78 1080000A */ beqz $a0, .L800B5DA4 /* 0B697C 800B5D7C 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B6980 800B5D80 26310003 */ addiu $s1, $s1, 3 @@ -1428,6 +1461,7 @@ glabel func_800B4A40 /* 0B6A04 800B5E04 10000004 */ b .L800B5E18 /* 0B6A08 800B5E08 00000000 */ nop .L800B5E0C: +glabel L800B5E0C /* 0B6A0C 800B5E0C 3C03800E */ lui $v1, %hi(D_800E2EF0) # $v1, 0x800e /* 0B6A10 800B5E10 8C632EF0 */ lw $v1, %lo(D_800E2EF0)($v1) /* 0B6A14 800B5E14 00000000 */ nop diff --git a/asm/non_matchings/unknown_0AEE70/func_800B653C.s b/asm/non_matchings/unknown_0AEE70/func_800B653C.s index 5e6c866e..1a0e2d90 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B653C.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B653C.s @@ -1,3 +1,8 @@ +.late_rodata +glabel jpt_800E8E58 +.word L800B6658, L800B6740, L800B6614, L800B6634, L800B66CC + +.text glabel func_800B653C /* 0B713C 800B653C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0B7140 800B6540 AFBF0044 */ sw $ra, 0x44($sp) @@ -35,9 +40,9 @@ glabel func_800B653C /* 0B71BC 800B65BC 2DC10005 */ sltiu $at, $t6, 5 /* 0B71C0 800B65C0 102000AE */ beqz $at, .L800B687C /* 0B71C4 800B65C4 000E7080 */ sll $t6, $t6, 2 -/* 0B71C8 800B65C8 3C01800F */ lui $at, %hi(D_800E8E58) # $at, 0x800f +/* 0B71C8 800B65C8 3C01800F */ lui $at, %hi(jpt_800E8E58) # $at, 0x800f /* 0B71CC 800B65CC 002E0821 */ addu $at, $at, $t6 -/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, %lo(D_800E8E58)($at) +/* 0B71D0 800B65D0 8C2E8E58 */ lw $t6, %lo(jpt_800E8E58)($at) /* 0B71D4 800B65D4 00000000 */ nop /* 0B71D8 800B65D8 01C00008 */ jr $t6 /* 0B71DC 800B65DC 00000000 */ nop @@ -56,6 +61,7 @@ glabel func_800B653C /* 0B7208 800B6608 00000000 */ nop /* 0B720C 800B660C 1000009C */ b .L800B6880 /* 0B7210 800B6610 02A02025 */ move $a0, $s5 +glabel L800B6614 /* 0B7214 800B6614 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 /* 0B7218 800B6618 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 /* 0B721C 800B661C 94A57CD0 */ lhu $a1, %lo(D_80127CD0)($a1) @@ -64,6 +70,7 @@ glabel func_800B653C /* 0B7228 800B6628 00001825 */ move $v1, $zero /* 0B722C 800B662C 1000009D */ b .L800B68A4 /* 0B7230 800B6630 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +glabel L800B6634 /* 0B7234 800B6634 240F0001 */ li $t7, 1 /* 0B7238 800B6638 3C018012 */ lui $at, %hi(D_80127CB4) # $at, 0x8012 /* 0B723C 800B663C 3C058012 */ lui $a1, %hi(D_8011FFF0) # $a1, 0x8012 @@ -73,6 +80,7 @@ glabel func_800B653C /* 0B724C 800B664C 24030001 */ li $v1, 1 /* 0B7250 800B6650 10000094 */ b .L800B68A4 /* 0B7254 800B6654 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +glabel L800B6658 /* 0B7258 800B6658 8FD80000 */ lw $t8, ($fp) /* 0B725C 800B665C 92040000 */ lbu $a0, ($s0) /* 0B7260 800B6660 92050001 */ lbu $a1, 1($s0) @@ -103,6 +111,7 @@ glabel func_800B653C /* 0B72C0 800B66C0 96440000 */ lhu $a0, ($s2) /* 0B72C4 800B66C4 10000077 */ b .L800B68A4 /* 0B72C8 800B66C8 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +glabel L800B66CC /* 0B72CC 800B66CC 8FC90000 */ lw $t1, ($fp) /* 0B72D0 800B66D0 92040000 */ lbu $a0, ($s0) /* 0B72D4 800B66D4 92050001 */ lbu $a1, 1($s0) @@ -133,6 +142,7 @@ glabel func_800B653C /* 0B7334 800B6734 96440000 */ lhu $a0, ($s2) /* 0B7338 800B6738 1000005A */ b .L800B68A4 /* 0B733C 800B673C 24A5FFF0 */ addiu $a1, %lo(D_8011FFF0) # addiu $a1, $a1, -0x10 +glabel L800B6740 /* 0B7340 800B6740 8FCC0000 */ lw $t4, ($fp) /* 0B7344 800B6744 02A02025 */ move $a0, $s5 /* 0B7348 800B6748 15800008 */ bnez $t4, .L800B676C diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index e6365b64..45e78427 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -49,62 +49,6 @@ const u32 D_800E8BDC[] = { const FloatLiteral D_800E8BF0 = { 0.1f }; const FloatLiteral D_800E8BF4 = { 0.01f }; -// This is probably another file boundary. -const DoubleLiteral D_800E8BF8 = { 0.0 }; - -const char D_800E8C00[] = "0123456789abcdefghijklmnopqrstuvwxyz"; -const char D_800E8C28[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -const char D_800E8C50[] = ""; -const char D_800E8C54[] = "(null)"; -const char D_800E8C5C[] = "(nil)"; -const char D_800E8C64[] = "*** diPrintf Error *** ---> Out of string space. (Print less text!)\n"; - -// Jump table in func_800B4A40 -const u32 D_800E8CAC[] = { - 0x800B4BA4, 0x800B4BC8, 0x800B4BC8, 0x800B4BBC, - 0x800B4BC8, 0x800B4BC8, 0x800B4BC8, 0x800B4BC8, - 0x800B4BC8, 0x800B4BC8, 0x800B4BC8, 0x800B4BAC, - 0x800B4BC8, 0x800B4BB4, 0x800B4BC8, 0x800B4BC8, - 0x800B4BC4 -}; - -// Jump table in func_800B4A40 -const u32 D_800E8CF0[] = { - 0x800B4DB0, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DB8, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4D90, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4D98, 0x800B4DC4, 0x800B4DC4, 0x800B4DC4, - 0x800B4DC4, 0x800B4DC0 -}; - -// Jump table in func_800B4A40 -const u32 D_800E8D88[] = { - 0x800B52C4, 0x800B5E0C, 0x800B5794, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B4F84, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5E0C, 0x800B5AC4, 0x800B4E38, - 0x800B52C4, 0x800B57A4, 0x800B5794, 0x800B5E0C, - 0x800B4E38, 0x800B5E0C, 0x800B5E0C, 0x800B5E0C, - 0x800B5E0C, 0x800B5D78, 0x800B4F64, 0x800B5C8C, - 0x800B5E0C, 0x800B5E0C, 0x800B5B48, 0x800B5E0C, - 0x800B4F44, 0x800B5E0C, 0x800B5E0C, 0x800B4FA4 -}; - -// Jump table in func_800B653C -const u32 D_800E8E58[] = { - 0x800B6658, 0x800B6740, 0x800B6614, 0x800B6634, - 0x800B66CC -}; - /*********************************/ /************ .data ************/ @@ -231,40 +175,6 @@ s32 D_800E2EC4[10] = { }; s32 D_800E2EEC = 0x100; -s32 D_800E2EF0 = 0; - -u8 D_800E2EF4[196] = { - 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0F, 0x11, 0x15, 0x17, 0x1F, 0x21, 0x27, 0x29, 0x2B, 0x2D, 0x2F, - 0x31, 0x33, 0x35, 0x38, 0x3A, 0x3F, 0x41, 0x43, 0x45, 0x48, 0x4A, 0x4B, 0x4D, 0x50, 0x52, 0x56, - 0x58, 0x5B, 0x5D, 0x62, 0x64, 0x68, 0x6A, 0x6F, 0x71, 0x76, 0x78, 0x7D, 0x7F, 0x84, 0x86, 0x8B, - 0x8D, 0x92, 0x94, 0x96, 0x98, 0x9A, 0x9D, 0xA2, 0xA5, 0xA9, 0xAB, 0xB0, 0xB3, 0xB8, 0x00, 0x01, - 0x00, 0x09, 0x0B, 0x11, 0x13, 0x19, 0x1B, 0x21, 0x23, 0x29, 0x2B, 0x31, 0x33, 0x38, 0x3A, 0x41, - 0x43, 0x49, 0x4B, 0x4C, 0x4E, 0x53, 0x55, 0x5B, 0x5D, 0x62, 0x64, 0x6B, 0x6D, 0x73, 0x75, 0x7B, - 0x7D, 0x83, 0x85, 0x8B, 0x8D, 0x93, 0x95, 0x9B, 0x9D, 0xA3, 0xA5, 0xAA, 0xAC, 0xB2, 0xB4, 0xBC, - 0xBE, 0xC4, 0xC6, 0xCC, 0xCE, 0xD3, 0xD5, 0xD7, 0xD9, 0xDC, 0xDE, 0xE0, 0xE2, 0xE7, 0xE9, 0xEF, - 0x00, 0x01, 0x03, 0x08, 0x09, 0x0F, 0x11, 0x16, 0x18, 0x1D, 0x1F, 0x24, 0x26, 0x28, 0x2A, 0x2F, - 0x31, 0x36, 0x38, 0x39, 0x3B, 0x3D, 0x3F, 0x43, 0x45, 0x46, 0x48, 0x4F, 0x51, 0x56, 0x58, 0x5D, - 0x5F, 0x64, 0x66, 0x6B, 0x6C, 0x70, 0x72, 0x77, 0x79, 0x7C, 0x7E, 0x82, 0x84, 0x89, 0x8B, 0x92, - 0x94, 0x99, 0x9B, 0xA0, 0xA2, 0xA6, 0xA8, 0xAB, 0xAD, 0xAE, 0xB0, 0xB3, 0xB5, 0xB9, 0xB5, 0xB9, - 0x00, 0x00, 0x00, 0x00 -}; - -// Fast3D (F3DDKR) display list -u32 D_800E2FB8[] = { - 0xE7000000, 0x00000000, - 0xBA001402, 0x00000000, - 0xBA001001, 0x00000000, - 0xBA000E02, 0x00000000, - 0xBA001102, 0x00000000, - 0xBA001301, 0x00000000, - 0xBA000C02, 0x00002000, - 0xBA000903, 0x00000C00, - 0xB9000002, 0x00000000, - 0xB900031D, 0x00504240, - 0xFB000000, 0xFFFFFFFF, - 0xFA000000, 0x00000000, - 0xB8000000, 0x00000000 -}; /*******************************/ @@ -388,24 +298,3 @@ GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B263C.s") GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B26E0.s") GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B2FBC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3140.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3240.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3358.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B34B0.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3564.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3740.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3E64.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4668.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B46BC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4940.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4A08.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4A40.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5E88.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5EDC.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5F78.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B62B4.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B635C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B653C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B695C.s") -GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B69FC.s") - diff --git a/src/unknown_0B3D40.c b/src/unknown_0B3D40.c new file mode 100644 index 00000000..8fd5c389 --- /dev/null +++ b/src/unknown_0B3D40.c @@ -0,0 +1,76 @@ +/* The comment below is needed for this file to be picked up by generate_ld */ +/* RAM_POS: 0x800B3140 */ + +#include "types.h" +#include "macros.h" + +/************ .data ************/ + +s32 D_800E2EF0 = 0; + +u8 D_800E2EF4[196] = { + 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0F, 0x11, 0x15, 0x17, 0x1F, 0x21, 0x27, 0x29, 0x2B, 0x2D, 0x2F, + 0x31, 0x33, 0x35, 0x38, 0x3A, 0x3F, 0x41, 0x43, 0x45, 0x48, 0x4A, 0x4B, 0x4D, 0x50, 0x52, 0x56, + 0x58, 0x5B, 0x5D, 0x62, 0x64, 0x68, 0x6A, 0x6F, 0x71, 0x76, 0x78, 0x7D, 0x7F, 0x84, 0x86, 0x8B, + 0x8D, 0x92, 0x94, 0x96, 0x98, 0x9A, 0x9D, 0xA2, 0xA5, 0xA9, 0xAB, 0xB0, 0xB3, 0xB8, 0x00, 0x01, + 0x00, 0x09, 0x0B, 0x11, 0x13, 0x19, 0x1B, 0x21, 0x23, 0x29, 0x2B, 0x31, 0x33, 0x38, 0x3A, 0x41, + 0x43, 0x49, 0x4B, 0x4C, 0x4E, 0x53, 0x55, 0x5B, 0x5D, 0x62, 0x64, 0x6B, 0x6D, 0x73, 0x75, 0x7B, + 0x7D, 0x83, 0x85, 0x8B, 0x8D, 0x93, 0x95, 0x9B, 0x9D, 0xA3, 0xA5, 0xAA, 0xAC, 0xB2, 0xB4, 0xBC, + 0xBE, 0xC4, 0xC6, 0xCC, 0xCE, 0xD3, 0xD5, 0xD7, 0xD9, 0xDC, 0xDE, 0xE0, 0xE2, 0xE7, 0xE9, 0xEF, + 0x00, 0x01, 0x03, 0x08, 0x09, 0x0F, 0x11, 0x16, 0x18, 0x1D, 0x1F, 0x24, 0x26, 0x28, 0x2A, 0x2F, + 0x31, 0x36, 0x38, 0x39, 0x3B, 0x3D, 0x3F, 0x43, 0x45, 0x46, 0x48, 0x4F, 0x51, 0x56, 0x58, 0x5D, + 0x5F, 0x64, 0x66, 0x6B, 0x6C, 0x70, 0x72, 0x77, 0x79, 0x7C, 0x7E, 0x82, 0x84, 0x89, 0x8B, 0x92, + 0x94, 0x99, 0x9B, 0xA0, 0xA2, 0xA6, 0xA8, 0xAB, 0xAD, 0xAE, 0xB0, 0xB3, 0xB5, 0xB9, 0xB5, 0xB9, + 0x00, 0x00, 0x00, 0x00 +}; + +// Fast3D (F3DDKR) display list +u32 D_800E2FB8[] = { + 0xE7000000, 0x00000000, + 0xBA001402, 0x00000000, + 0xBA001001, 0x00000000, + 0xBA000E02, 0x00000000, + 0xBA001102, 0x00000000, + 0xBA001301, 0x00000000, + 0xBA000C02, 0x00002000, + 0xBA000903, 0x00000C00, + 0xB9000002, 0x00000000, + 0xB900031D, 0x00504240, + 0xFB000000, 0xFFFFFFFF, + 0xFA000000, 0x00000000, + 0xB8000000, 0x00000000 +}; + +/*******************************/ + +/************ .rodata ************/ + +const char D_800E8C00[] = "0123456789abcdefghijklmnopqrstuvwxyz"; +const char D_800E8C28[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +const char D_800E8C50[] = ""; +const char D_800E8C54[] = "(null)"; +const char D_800E8C5C[] = "(nil)"; +const char D_800E8C64[] = "*** diPrintf Error *** ---> Out of string space. (Print less text!)\n"; + +/*********************************/ + +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3140.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3240.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3358.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B34B0.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3564.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3740.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B3E64.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4668.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B46BC.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4940.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4A08.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B4A40.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5E88.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5EDC.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B5F78.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B62B4.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B635C.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B653C.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B695C.s") +GLOBAL_ASM("asm/non_matchings/unknown_0AEE70/func_800B69FC.s")