diff --git a/Makefile b/Makefile index 6e17ae9a0..b0a04f185 100644 --- a/Makefile +++ b/Makefile @@ -160,7 +160,7 @@ CC_CFLAGS := -fno-builtin INCLUDE_CFLAGS := -I include -I $(BUILD_DIR) -I $(BUILD_DIR)/include -I src -I . # TODO: Seperate F3D declares into version flags if needed. -GRUCODE_CFLAGS = -DF3DEX_GBI -D_LANGUAGE_C +GRUCODE_CFLAGS = -DF3DEX_GBI -DF3D_OLD -D_LANGUAGE_C # Check code syntax with host compiler CC_CHECK := gcc -fsyntax-only -fsigned-char $(CC_CFLAGS) $(TARGET_CFLAGS) $(INCLUDE_CFLAGS) -std=gnu90 -Wall -Wempty-body -Wextra -Wno-format-security -Wno-main -DNON_MATCHING -DAVOID_UB $(VERSION_CFLAGS) $(GRUCODE_CFLAGS) diff --git a/asm/non_matchings/code_800431B0/debug_print_string.s b/asm/non_matchings/code_800431B0/debug_print_string.s deleted file mode 100644 index 5ba6efe2a..000000000 --- a/asm/non_matchings/code_800431B0/debug_print_string.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel debug_print_string -/* 058084 80057484 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 058088 80057488 AFBF0024 */ sw $ra, 0x24($sp) -/* 05808C 8005748C AFB30020 */ sw $s3, 0x20($sp) -/* 058090 80057490 AFB2001C */ sw $s2, 0x1c($sp) -/* 058094 80057494 AFB10018 */ sw $s1, 0x18($sp) -/* 058098 80057498 AFB00014 */ sw $s0, 0x14($sp) -/* 05809C 8005749C 8C8E0000 */ lw $t6, ($a0) -/* 0580A0 800574A0 3C13800E */ lui $s3, %hi(D_800E5628) # $s3, 0x800e -/* 0580A4 800574A4 00C08025 */ move $s0, $a2 -/* 0580A8 800574A8 25CF0014 */ addiu $t7, $t6, 0x14 -/* 0580AC 800574AC AC8F0000 */ sw $t7, ($a0) -/* 0580B0 800574B0 8CB80000 */ lw $t8, ($a1) -/* 0580B4 800574B4 00808825 */ move $s1, $a0 -/* 0580B8 800574B8 00A09025 */ move $s2, $a1 -/* 0580BC 800574BC 27190014 */ addiu $t9, $t8, 0x14 -/* 0580C0 800574C0 ACB90000 */ sw $t9, ($a1) -/* 0580C4 800574C4 80C20000 */ lb $v0, ($a2) -/* 0580C8 800574C8 26735628 */ addiu $s3, %lo(D_800E5628) # addiu $s3, $s3, 0x5628 -/* 0580CC 800574CC 1040000E */ beqz $v0, .L80057508 -/* 0580D0 800574D0 02624021 */ addu $t0, $s3, $v0 -.L800574D4: -/* 0580D4 800574D4 81060000 */ lb $a2, ($t0) -/* 0580D8 800574D8 04C20005 */ bltzl $a2, .L800574F0 -/* 0580DC 800574DC 02202025 */ move $a0, $s1 -/* 0580E0 800574E0 8E240000 */ lw $a0, ($s1) -/* 0580E4 800574E4 0C015CF9 */ jal func_800573E4 -/* 0580E8 800574E8 8E450000 */ lw $a1, ($s2) -/* 0580EC 800574EC 02202025 */ move $a0, $s1 -.L800574F0: -/* 0580F0 800574F0 0C015D15 */ jal func_80057454 -/* 0580F4 800574F4 02402825 */ move $a1, $s2 -/* 0580F8 800574F8 82020001 */ lb $v0, 1($s0) -/* 0580FC 800574FC 26100001 */ addiu $s0, $s0, 1 -/* 058100 80057500 5440FFF4 */ bnel $v0, $zero, .L800574D4 -/* 058104 80057504 02624021 */ addu $t0, $s3, $v0 -.L80057508: -/* 058108 80057508 8FBF0024 */ lw $ra, 0x24($sp) -/* 05810C 8005750C 8FB00014 */ lw $s0, 0x14($sp) -/* 058110 80057510 8FB10018 */ lw $s1, 0x18($sp) -/* 058114 80057514 8FB2001C */ lw $s2, 0x1c($sp) -/* 058118 80057518 8FB30020 */ lw $s3, 0x20($sp) -/* 05811C 8005751C 03E00008 */ jr $ra -/* 058120 80057520 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/non_matchings/code_800431B0/func_80046030.s b/asm/non_matchings/code_800431B0/func_80046030.s deleted file mode 100644 index 871353e93..000000000 --- a/asm/non_matchings/code_800431B0/func_80046030.s +++ /dev/null @@ -1,98 +0,0 @@ -glabel func_80046030 -/* 046C30 80046030 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 046C34 80046034 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 046C38 80046038 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 046C3C 8004603C 8D020000 */ lw $v0, ($t0) -/* 046C40 80046040 AFB60030 */ sw $s6, 0x30($sp) -/* 046C44 80046044 8FB60054 */ lw $s6, 0x54($sp) -/* 046C48 80046048 244E0008 */ addiu $t6, $v0, 8 -/* 046C4C 8004604C AFBF003C */ sw $ra, 0x3c($sp) -/* 046C50 80046050 AFBE0038 */ sw $fp, 0x38($sp) -/* 046C54 80046054 AFB70034 */ sw $s7, 0x34($sp) -/* 046C58 80046058 AFB5002C */ sw $s5, 0x2c($sp) -/* 046C5C 8004605C AFB40028 */ sw $s4, 0x28($sp) -/* 046C60 80046060 AFB30024 */ sw $s3, 0x24($sp) -/* 046C64 80046064 AFB20020 */ sw $s2, 0x20($sp) -/* 046C68 80046068 AFB1001C */ sw $s1, 0x1c($sp) -/* 046C6C 8004606C AFB00018 */ sw $s0, 0x18($sp) -/* 046C70 80046070 AFA60048 */ sw $a2, 0x48($sp) -/* 046C74 80046074 AD0E0000 */ sw $t6, ($t0) -/* 046C78 80046078 3C180D01 */ lui $t8, %hi(D_0D008138) # $t8, 0xd01 -/* 046C7C 8004607C 27188138 */ addiu $t8, %lo(D_0D008138) # addiu $t8, $t8, -0x7ec8 -/* 046C80 80046080 3C0F0600 */ lui $t7, 0x600 -/* 046C84 80046084 AC4F0000 */ sw $t7, ($v0) -/* 046C88 80046088 AC580004 */ sw $t8, 4($v0) -/* 046C8C 8004608C 8FB90050 */ lw $t9, 0x50($sp) -/* 046C90 80046090 00E0B825 */ move $s7, $a3 -/* 046C94 80046094 00008025 */ move $s0, $zero -/* 046C98 80046098 0336001A */ div $zero, $t9, $s6 -/* 046C9C 8004609C 0000A012 */ mflo $s4 -/* 046CA0 800460A0 00808825 */ move $s1, $a0 -/* 046CA4 800460A4 00A09025 */ move $s2, $a1 -/* 046CA8 800460A8 00009825 */ move $s3, $zero -/* 046CAC 800460AC 00401825 */ move $v1, $v0 -/* 046CB0 800460B0 16C00002 */ bnez $s6, .L800460BC -/* 046CB4 800460B4 00000000 */ nop -/* 046CB8 800460B8 0007000D */ break 7 -.L800460BC: -/* 046CBC 800460BC 2401FFFF */ li $at, -1 -/* 046CC0 800460C0 16C10004 */ bne $s6, $at, .L800460D4 -/* 046CC4 800460C4 3C018000 */ lui $at, 0x8000 -/* 046CC8 800460C8 17210002 */ bne $t9, $at, .L800460D4 -/* 046CCC 800460CC 00000000 */ nop -/* 046CD0 800460D0 0006000D */ break 6 -.L800460D4: -/* 046CD4 800460D4 26C9FFFF */ addiu $t1, $s6, -1 -/* 046CD8 800460D8 1A800013 */ blez $s4, .L80046128 -/* 046CDC 800460DC 00000000 */ nop -/* 046CE0 800460E0 02E90019 */ multu $s7, $t1 -/* 046CE4 800460E4 0000A812 */ mflo $s5 -/* 046CE8 800460E8 0015F040 */ sll $fp, $s5, 1 -/* 046CEC 800460EC 00000000 */ nop -.L800460F0: -/* 046CF0 800460F0 02202025 */ move $a0, $s1 -/* 046CF4 800460F4 02402825 */ move $a1, $s2 -/* 046CF8 800460F8 02E03025 */ move $a2, $s7 -/* 046CFC 800460FC 0C0115CE */ jal func_80045738 -/* 046D00 80046100 02C03825 */ move $a3, $s6 -/* 046D04 80046104 8FAB0048 */ lw $t3, 0x48($sp) -/* 046D08 80046108 00105100 */ sll $t2, $s0, 4 -/* 046D0C 8004610C 0C0116CB */ jal func_80045B2C -/* 046D10 80046110 014B2021 */ addu $a0, $t2, $t3 -/* 046D14 80046114 26730001 */ addiu $s3, $s3, 1 -/* 046D18 80046118 023E8821 */ addu $s1, $s1, $fp -/* 046D1C 8004611C 02559021 */ addu $s2, $s2, $s5 -/* 046D20 80046120 1674FFF3 */ bne $s3, $s4, .L800460F0 -/* 046D24 80046124 26100004 */ addiu $s0, $s0, 4 -.L80046128: -/* 046D28 80046128 3C028015 */ lui $v0, %hi(gDisplayListHead) # $v0, 0x8015 -/* 046D2C 8004612C 8C420298 */ lw $v0, %lo(gDisplayListHead)($v0) -/* 046D30 80046130 3C018015 */ lui $at, %hi(gDisplayListHead) # $at, 0x8015 -/* 046D34 80046134 3C0E0001 */ lui $t6, (0x00010001 >> 16) # lui $t6, 1 -/* 046D38 80046138 244C0008 */ addiu $t4, $v0, 8 -/* 046D3C 8004613C AC2C0298 */ sw $t4, %lo(gDisplayListHead)($at) -/* 046D40 80046140 35CE0001 */ ori $t6, (0x00010001 & 0xFFFF) # ori $t6, $t6, 1 -/* 046D44 80046144 3C0DBB00 */ lui $t5, 0xbb00 -/* 046D48 80046148 AC4D0000 */ sw $t5, ($v0) -/* 046D4C 8004614C AC4E0004 */ sw $t6, 4($v0) -/* 046D50 80046150 3C028015 */ lui $v0, %hi(gDisplayListHead) # $v0, 0x8015 -/* 046D54 80046154 8C420298 */ lw $v0, %lo(gDisplayListHead)($v0) -/* 046D58 80046158 3C190D01 */ lui $t9, %hi(D_0D008120) # $t9, 0xd01 -/* 046D5C 8004615C 27398120 */ addiu $t9, %lo(D_0D008120) # addiu $t9, $t9, -0x7ee0 -/* 046D60 80046160 244F0008 */ addiu $t7, $v0, 8 -/* 046D64 80046164 AC2F0298 */ sw $t7, %lo(gDisplayListHead)($at) -/* 046D68 80046168 3C180600 */ lui $t8, 0x600 -/* 046D6C 8004616C AC580000 */ sw $t8, ($v0) -/* 046D70 80046170 AC590004 */ sw $t9, 4($v0) -/* 046D74 80046174 8FBF003C */ lw $ra, 0x3c($sp) -/* 046D78 80046178 8FBE0038 */ lw $fp, 0x38($sp) -/* 046D7C 8004617C 8FB70034 */ lw $s7, 0x34($sp) -/* 046D80 80046180 8FB60030 */ lw $s6, 0x30($sp) -/* 046D84 80046184 8FB5002C */ lw $s5, 0x2c($sp) -/* 046D88 80046188 8FB40028 */ lw $s4, 0x28($sp) -/* 046D8C 8004618C 8FB30024 */ lw $s3, 0x24($sp) -/* 046D90 80046190 8FB20020 */ lw $s2, 0x20($sp) -/* 046D94 80046194 8FB1001C */ lw $s1, 0x1c($sp) -/* 046D98 80046198 8FB00018 */ lw $s0, 0x18($sp) -/* 046D9C 8004619C 03E00008 */ jr $ra -/* 046DA0 800461A0 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004961C.s b/asm/non_matchings/code_800431B0/func_8004961C.s deleted file mode 100644 index afb816e57..000000000 --- a/asm/non_matchings/code_800431B0/func_8004961C.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_8004961C -/* 04A21C 8004961C 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 04A220 80049620 AFB70034 */ sw $s7, 0x34($sp) -/* 04A224 80049624 8FB70074 */ lw $s7, 0x74($sp) -/* 04A228 80049628 AFB30024 */ sw $s3, 0x24($sp) -/* 04A22C 8004962C AFB20020 */ sw $s2, 0x20($sp) -/* 04A230 80049630 00F7001A */ div $zero, $a3, $s7 -/* 04A234 80049634 00007012 */ mflo $t6 -/* 04A238 80049638 AFBF003C */ sw $ra, 0x3c($sp) -/* 04A23C 8004963C AFBE0038 */ sw $fp, 0x38($sp) -/* 04A240 80049640 AFB60030 */ sw $s6, 0x30($sp) -/* 04A244 80049644 AFB5002C */ sw $s5, 0x2c($sp) -/* 04A248 80049648 AFB40028 */ sw $s4, 0x28($sp) -/* 04A24C 8004964C AFB1001C */ sw $s1, 0x1c($sp) -/* 04A250 80049650 AFB00018 */ sw $s0, 0x18($sp) -/* 04A254 80049654 AFA50064 */ sw $a1, 0x64($sp) -/* 04A258 80049658 00009025 */ move $s2, $zero -/* 04A25C 8004965C 00809825 */ move $s3, $a0 -/* 04A260 80049660 AFAE0040 */ sw $t6, 0x40($sp) -/* 04A264 80049664 01C07825 */ move $t7, $t6 -/* 04A268 80049668 00001025 */ move $v0, $zero -/* 04A26C 8004966C 16E00002 */ bnez $s7, .L80049678 -/* 04A270 80049670 00000000 */ nop -/* 04A274 80049674 0007000D */ break 7 -.L80049678: -/* 04A278 80049678 2401FFFF */ li $at, -1 -/* 04A27C 8004967C 16E10004 */ bne $s7, $at, .L80049690 -/* 04A280 80049680 3C018000 */ lui $at, 0x8000 -/* 04A284 80049684 14E10002 */ bne $a3, $at, .L80049690 -/* 04A288 80049688 00000000 */ nop -/* 04A28C 8004968C 0006000D */ break 6 -.L80049690: -/* 04A290 80049690 19C00038 */ blez $t6, .L80049774 -/* 04A294 80049694 00000000 */ nop -/* 04A298 80049698 8FBE0070 */ lw $fp, 0x70($sp) -/* 04A29C 8004969C 3C118015 */ lui $s1, %hi(gDisplayListHead) # $s1, 0x8015 -/* 04A2A0 800496A0 26310298 */ addiu $s1, %lo(gDisplayListHead) # addiu $s1, $s1, 0x298 -/* 04A2A4 800496A4 00DE001A */ div $zero, $a2, $fp -/* 04A2A8 800496A8 0000B012 */ mflo $s6 -/* 04A2AC 800496AC 17C00002 */ bnez $fp, .L800496B8 -/* 04A2B0 800496B0 00000000 */ nop -/* 04A2B4 800496B4 0007000D */ break 7 -.L800496B8: -/* 04A2B8 800496B8 2401FFFF */ li $at, -1 -/* 04A2BC 800496BC 17C10004 */ bne $fp, $at, .L800496D0 -/* 04A2C0 800496C0 3C018000 */ lui $at, 0x8000 -/* 04A2C4 800496C4 14C10002 */ bne $a2, $at, .L800496D0 -/* 04A2C8 800496C8 00000000 */ nop -/* 04A2CC 800496CC 0006000D */ break 6 -.L800496D0: -/* 04A2D0 800496D0 1AC00024 */ blez $s6, .L80049764 -/* 04A2D4 800496D4 00008025 */ move $s0, $zero -/* 04A2D8 800496D8 03D70019 */ multu $fp, $s7 -/* 04A2DC 800496DC 3C140D00 */ lui $s4, %hi(D_0D006940) # $s4, 0xd00 -/* 04A2E0 800496E0 26946940 */ addiu $s4, %lo(D_0D006940) # addiu $s4, $s4, 0x6940 -/* 04A2E4 800496E4 AFA2005C */ sw $v0, 0x5c($sp) -/* 04A2E8 800496E8 0000A812 */ mflo $s5 -/* 04A2EC 800496EC 06A10003 */ bgez $s5, .L800496FC -/* 04A2F0 800496F0 0015C043 */ sra $t8, $s5, 1 -/* 04A2F4 800496F4 26A10001 */ addiu $at, $s5, 1 -/* 04A2F8 800496F8 0001C043 */ sra $t8, $at, 1 -.L800496FC: -/* 04A2FC 800496FC 0300A825 */ move $s5, $t8 -.L80049700: -/* 04A300 80049700 02602025 */ move $a0, $s3 -/* 04A304 80049704 03C02825 */ move $a1, $fp -/* 04A308 80049708 0C011249 */ jal func_80044924 -/* 04A30C 8004970C 02E03025 */ move $a2, $s7 -/* 04A310 80049710 8E220000 */ lw $v0, ($s1) -/* 04A314 80049714 3C080400 */ lui $t0, (0x0400103F >> 16) # lui $t0, 0x400 -/* 04A318 80049718 3508103F */ ori $t0, (0x0400103F & 0xFFFF) # ori $t0, $t0, 0x103f -/* 04A31C 8004971C 24590008 */ addiu $t9, $v0, 8 -/* 04A320 80049720 AE390000 */ sw $t9, ($s1) -/* 04A324 80049724 AC480000 */ sw $t0, ($v0) -/* 04A328 80049728 8FAA0064 */ lw $t2, 0x64($sp) -/* 04A32C 8004972C 00124900 */ sll $t1, $s2, 4 -/* 04A330 80049730 26100001 */ addiu $s0, $s0, 1 -/* 04A334 80049734 012A5821 */ addu $t3, $t1, $t2 -/* 04A338 80049738 AC4B0004 */ sw $t3, 4($v0) -/* 04A33C 8004973C 8E220000 */ lw $v0, ($s1) -/* 04A340 80049740 3C0D0600 */ lui $t5, 0x600 -/* 04A344 80049744 02759821 */ addu $s3, $s3, $s5 -/* 04A348 80049748 244C0008 */ addiu $t4, $v0, 8 -/* 04A34C 8004974C AE2C0000 */ sw $t4, ($s1) -/* 04A350 80049750 26520004 */ addiu $s2, $s2, 4 -/* 04A354 80049754 AC540004 */ sw $s4, 4($v0) -/* 04A358 80049758 1616FFE9 */ bne $s0, $s6, .L80049700 -/* 04A35C 8004975C AC4D0000 */ sw $t5, ($v0) -/* 04A360 80049760 8FA2005C */ lw $v0, 0x5c($sp) -.L80049764: -/* 04A364 80049764 8FAE0040 */ lw $t6, 0x40($sp) -/* 04A368 80049768 24420001 */ addiu $v0, $v0, 1 -/* 04A36C 8004976C 144EFFD8 */ bne $v0, $t6, .L800496D0 -/* 04A370 80049770 00000000 */ nop -.L80049774: -/* 04A374 80049774 3C118015 */ lui $s1, %hi(gDisplayListHead) # $s1, 0x8015 -/* 04A378 80049778 26310298 */ addiu $s1, %lo(gDisplayListHead) # addiu $s1, $s1, 0x298 -/* 04A37C 8004977C 8E220000 */ lw $v0, ($s1) -/* 04A380 80049780 3C190001 */ lui $t9, (0x00010001 >> 16) # lui $t9, 1 -/* 04A384 80049784 37390001 */ ori $t9, (0x00010001 & 0xFFFF) # ori $t9, $t9, 1 -/* 04A388 80049788 244F0008 */ addiu $t7, $v0, 8 -/* 04A38C 8004978C AE2F0000 */ sw $t7, ($s1) -/* 04A390 80049790 3C18BB00 */ lui $t8, 0xbb00 -/* 04A394 80049794 AC580000 */ sw $t8, ($v0) -/* 04A398 80049798 AC590004 */ sw $t9, 4($v0) -/* 04A39C 8004979C 8FBF003C */ lw $ra, 0x3c($sp) -/* 04A3A0 800497A0 8FBE0038 */ lw $fp, 0x38($sp) -/* 04A3A4 800497A4 8FB70034 */ lw $s7, 0x34($sp) -/* 04A3A8 800497A8 8FB60030 */ lw $s6, 0x30($sp) -/* 04A3AC 800497AC 8FB5002C */ lw $s5, 0x2c($sp) -/* 04A3B0 800497B0 8FB40028 */ lw $s4, 0x28($sp) -/* 04A3B4 800497B4 8FB30024 */ lw $s3, 0x24($sp) -/* 04A3B8 800497B8 8FB20020 */ lw $s2, 0x20($sp) -/* 04A3BC 800497BC 8FB1001C */ lw $s1, 0x1c($sp) -/* 04A3C0 800497C0 8FB00018 */ lw $s0, 0x18($sp) -/* 04A3C4 800497C4 03E00008 */ jr $ra -/* 04A3C8 800497C8 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/code_800431B0/func_80049970.s b/asm/non_matchings/code_800431B0/func_80049970.s deleted file mode 100644 index 26a839fe0..000000000 --- a/asm/non_matchings/code_800431B0/func_80049970.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80049970 -/* 04A570 80049970 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 04A574 80049974 AFB70034 */ sw $s7, 0x34($sp) -/* 04A578 80049978 8FB70074 */ lw $s7, 0x74($sp) -/* 04A57C 8004997C AFB30024 */ sw $s3, 0x24($sp) -/* 04A580 80049980 AFB20020 */ sw $s2, 0x20($sp) -/* 04A584 80049984 00F7001A */ div $zero, $a3, $s7 -/* 04A588 80049988 00007012 */ mflo $t6 -/* 04A58C 8004998C AFBF003C */ sw $ra, 0x3c($sp) -/* 04A590 80049990 AFBE0038 */ sw $fp, 0x38($sp) -/* 04A594 80049994 AFB60030 */ sw $s6, 0x30($sp) -/* 04A598 80049998 AFB5002C */ sw $s5, 0x2c($sp) -/* 04A59C 8004999C AFB40028 */ sw $s4, 0x28($sp) -/* 04A5A0 800499A0 AFB1001C */ sw $s1, 0x1c($sp) -/* 04A5A4 800499A4 AFB00018 */ sw $s0, 0x18($sp) -/* 04A5A8 800499A8 AFA50064 */ sw $a1, 0x64($sp) -/* 04A5AC 800499AC 00009025 */ move $s2, $zero -/* 04A5B0 800499B0 00809825 */ move $s3, $a0 -/* 04A5B4 800499B4 AFAE0040 */ sw $t6, 0x40($sp) -/* 04A5B8 800499B8 01C07825 */ move $t7, $t6 -/* 04A5BC 800499BC 00001025 */ move $v0, $zero -/* 04A5C0 800499C0 16E00002 */ bnez $s7, .L800499CC -/* 04A5C4 800499C4 00000000 */ nop -/* 04A5C8 800499C8 0007000D */ break 7 -.L800499CC: -/* 04A5CC 800499CC 2401FFFF */ li $at, -1 -/* 04A5D0 800499D0 16E10004 */ bne $s7, $at, .L800499E4 -/* 04A5D4 800499D4 3C018000 */ lui $at, 0x8000 -/* 04A5D8 800499D8 14E10002 */ bne $a3, $at, .L800499E4 -/* 04A5DC 800499DC 00000000 */ nop -/* 04A5E0 800499E0 0006000D */ break 6 -.L800499E4: -/* 04A5E4 800499E4 19C00038 */ blez $t6, .L80049AC8 -/* 04A5E8 800499E8 00000000 */ nop -/* 04A5EC 800499EC 8FBE0070 */ lw $fp, 0x70($sp) -/* 04A5F0 800499F0 3C118015 */ lui $s1, %hi(gDisplayListHead) # $s1, 0x8015 -/* 04A5F4 800499F4 26310298 */ addiu $s1, %lo(gDisplayListHead) # addiu $s1, $s1, 0x298 -/* 04A5F8 800499F8 00DE001A */ div $zero, $a2, $fp -/* 04A5FC 800499FC 0000B012 */ mflo $s6 -/* 04A600 80049A00 17C00002 */ bnez $fp, .L80049A0C -/* 04A604 80049A04 00000000 */ nop -/* 04A608 80049A08 0007000D */ break 7 -.L80049A0C: -/* 04A60C 80049A0C 2401FFFF */ li $at, -1 -/* 04A610 80049A10 17C10004 */ bne $fp, $at, .L80049A24 -/* 04A614 80049A14 3C018000 */ lui $at, 0x8000 -/* 04A618 80049A18 14C10002 */ bne $a2, $at, .L80049A24 -/* 04A61C 80049A1C 00000000 */ nop -/* 04A620 80049A20 0006000D */ break 6 -.L80049A24: -/* 04A624 80049A24 1AC00024 */ blez $s6, .L80049AB8 -/* 04A628 80049A28 00008025 */ move $s0, $zero -/* 04A62C 80049A2C 03D70019 */ multu $fp, $s7 -/* 04A630 80049A30 3C140D00 */ lui $s4, %hi(D_0D006940) # $s4, 0xd00 -/* 04A634 80049A34 26946940 */ addiu $s4, %lo(D_0D006940) # addiu $s4, $s4, 0x6940 -/* 04A638 80049A38 AFA2005C */ sw $v0, 0x5c($sp) -/* 04A63C 80049A3C 0000A812 */ mflo $s5 -/* 04A640 80049A40 06A10003 */ bgez $s5, .L80049A50 -/* 04A644 80049A44 0015C043 */ sra $t8, $s5, 1 -/* 04A648 80049A48 26A10001 */ addiu $at, $s5, 1 -/* 04A64C 80049A4C 0001C043 */ sra $t8, $at, 1 -.L80049A50: -/* 04A650 80049A50 0300A825 */ move $s5, $t8 -.L80049A54: -/* 04A654 80049A54 02602025 */ move $a0, $s3 -/* 04A658 80049A58 03C02825 */ move $a1, $fp -/* 04A65C 80049A5C 0C011368 */ jal func_80044DA0 -/* 04A660 80049A60 02E03025 */ move $a2, $s7 -/* 04A664 80049A64 8E220000 */ lw $v0, ($s1) -/* 04A668 80049A68 3C080400 */ lui $t0, (0x0400103F >> 16) # lui $t0, 0x400 -/* 04A66C 80049A6C 3508103F */ ori $t0, (0x0400103F & 0xFFFF) # ori $t0, $t0, 0x103f -/* 04A670 80049A70 24590008 */ addiu $t9, $v0, 8 -/* 04A674 80049A74 AE390000 */ sw $t9, ($s1) -/* 04A678 80049A78 AC480000 */ sw $t0, ($v0) -/* 04A67C 80049A7C 8FAA0064 */ lw $t2, 0x64($sp) -/* 04A680 80049A80 00124900 */ sll $t1, $s2, 4 -/* 04A684 80049A84 26100001 */ addiu $s0, $s0, 1 -/* 04A688 80049A88 012A5821 */ addu $t3, $t1, $t2 -/* 04A68C 80049A8C AC4B0004 */ sw $t3, 4($v0) -/* 04A690 80049A90 8E220000 */ lw $v0, ($s1) -/* 04A694 80049A94 3C0D0600 */ lui $t5, 0x600 -/* 04A698 80049A98 02759821 */ addu $s3, $s3, $s5 -/* 04A69C 80049A9C 244C0008 */ addiu $t4, $v0, 8 -/* 04A6A0 80049AA0 AE2C0000 */ sw $t4, ($s1) -/* 04A6A4 80049AA4 26520004 */ addiu $s2, $s2, 4 -/* 04A6A8 80049AA8 AC540004 */ sw $s4, 4($v0) -/* 04A6AC 80049AAC 1616FFE9 */ bne $s0, $s6, .L80049A54 -/* 04A6B0 80049AB0 AC4D0000 */ sw $t5, ($v0) -/* 04A6B4 80049AB4 8FA2005C */ lw $v0, 0x5c($sp) -.L80049AB8: -/* 04A6B8 80049AB8 8FAE0040 */ lw $t6, 0x40($sp) -/* 04A6BC 80049ABC 24420001 */ addiu $v0, $v0, 1 -/* 04A6C0 80049AC0 144EFFD8 */ bne $v0, $t6, .L80049A24 -/* 04A6C4 80049AC4 00000000 */ nop -.L80049AC8: -/* 04A6C8 80049AC8 3C118015 */ lui $s1, %hi(gDisplayListHead) # $s1, 0x8015 -/* 04A6CC 80049ACC 26310298 */ addiu $s1, %lo(gDisplayListHead) # addiu $s1, $s1, 0x298 -/* 04A6D0 80049AD0 8E220000 */ lw $v0, ($s1) -/* 04A6D4 80049AD4 3C190001 */ lui $t9, (0x00010001 >> 16) # lui $t9, 1 -/* 04A6D8 80049AD8 37390001 */ ori $t9, (0x00010001 & 0xFFFF) # ori $t9, $t9, 1 -/* 04A6DC 80049ADC 244F0008 */ addiu $t7, $v0, 8 -/* 04A6E0 80049AE0 AE2F0000 */ sw $t7, ($s1) -/* 04A6E4 80049AE4 3C18BB00 */ lui $t8, 0xbb00 -/* 04A6E8 80049AE8 AC580000 */ sw $t8, ($v0) -/* 04A6EC 80049AEC AC590004 */ sw $t9, 4($v0) -/* 04A6F0 80049AF0 8FBF003C */ lw $ra, 0x3c($sp) -/* 04A6F4 80049AF4 8FBE0038 */ lw $fp, 0x38($sp) -/* 04A6F8 80049AF8 8FB70034 */ lw $s7, 0x34($sp) -/* 04A6FC 80049AFC 8FB60030 */ lw $s6, 0x30($sp) -/* 04A700 80049B00 8FB5002C */ lw $s5, 0x2c($sp) -/* 04A704 80049B04 8FB40028 */ lw $s4, 0x28($sp) -/* 04A708 80049B08 8FB30024 */ lw $s3, 0x24($sp) -/* 04A70C 80049B0C 8FB20020 */ lw $s2, 0x20($sp) -/* 04A710 80049B10 8FB1001C */ lw $s1, 0x1c($sp) -/* 04A714 80049B14 8FB00018 */ lw $s0, 0x18($sp) -/* 04A718 80049B18 03E00008 */ jr $ra -/* 04A71C 80049B1C 27BD0060 */ addiu $sp, $sp, 0x60 diff --git a/asm/non_matchings/code_800431B0/func_8004B7DC.s b/asm/non_matchings/code_800431B0/func_8004B7DC.s deleted file mode 100644 index dbf06a018..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B7DC.s +++ /dev/null @@ -1,96 +0,0 @@ -glabel func_8004B7DC -/* 04C3DC 8004B7DC 8FAE0018 */ lw $t6, 0x18($sp) -/* 04C3E0 8004B7E0 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 04C3E4 8004B7E4 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 04C3E8 8004B7E8 15C0002F */ bnez $t6, .L8004B8A8 -/* 04C3EC 8004B7EC 3C01E400 */ lui $at, 0xe400 -/* 04C3F0 8004B7F0 3C0A8015 */ lui $t2, %hi(gDisplayListHead) # $t2, 0x8015 -/* 04C3F4 8004B7F4 254A0298 */ addiu $t2, %lo(gDisplayListHead) # addiu $t2, $t2, 0x298 -/* 04C3F8 8004B7F8 8D430000 */ lw $v1, ($t2) -/* 04C3FC 8004B7FC 0086C021 */ addu $t8, $a0, $a2 -/* 04C400 8004B800 2719FFFF */ addiu $t9, $t8, -1 -/* 04C404 8004B804 246F0008 */ addiu $t7, $v1, 8 -/* 04C408 8004B808 AD4F0000 */ sw $t7, ($t2) -/* 04C40C 8004B80C 00A77821 */ addu $t7, $a1, $a3 -/* 04C410 8004B810 00195880 */ sll $t3, $t9, 2 -/* 04C414 8004B814 316C0FFF */ andi $t4, $t3, 0xfff -/* 04C418 8004B818 25F8FFFF */ addiu $t8, $t7, -1 -/* 04C41C 8004B81C 0018C880 */ sll $t9, $t8, 2 -/* 04C420 8004B820 000C6B00 */ sll $t5, $t4, 0xc -/* 04C424 8004B824 3C01E400 */ lui $at, 0xe400 -/* 04C428 8004B828 01A17025 */ or $t6, $t5, $at -/* 04C42C 8004B82C 332B0FFF */ andi $t3, $t9, 0xfff -/* 04C430 8004B830 00046880 */ sll $t5, $a0, 2 -/* 04C434 8004B834 31AF0FFF */ andi $t7, $t5, 0xfff -/* 04C438 8004B838 01CB6025 */ or $t4, $t6, $t3 -/* 04C43C 8004B83C 0005C880 */ sll $t9, $a1, 2 -/* 04C440 8004B840 332E0FFF */ andi $t6, $t9, 0xfff -/* 04C444 8004B844 000FC300 */ sll $t8, $t7, 0xc -/* 04C448 8004B848 030E5825 */ or $t3, $t8, $t6 -/* 04C44C 8004B84C AC6B0004 */ sw $t3, 4($v1) -/* 04C450 8004B850 AC6C0000 */ sw $t4, ($v1) -/* 04C454 8004B854 8D430000 */ lw $v1, ($t2) -/* 04C458 8004B858 3C0DB300 */ lui $t5, 0xb300 -/* 04C45C 8004B85C 246C0008 */ addiu $t4, $v1, 8 -/* 04C460 8004B860 AD4C0000 */ sw $t4, ($t2) -/* 04C464 8004B864 AC6D0000 */ sw $t5, ($v1) -/* 04C468 8004B868 8FAB0014 */ lw $t3, 0x14($sp) -/* 04C46C 8004B86C 8FB80010 */ lw $t8, 0x10($sp) -/* 04C470 8004B870 000B6140 */ sll $t4, $t3, 5 -/* 04C474 8004B874 318DFFFF */ andi $t5, $t4, 0xffff -/* 04C478 8004B878 00187540 */ sll $t6, $t8, 0x15 -/* 04C47C 8004B87C 01CD7825 */ or $t7, $t6, $t5 -/* 04C480 8004B880 AC6F0004 */ sw $t7, 4($v1) -/* 04C484 8004B884 8D430000 */ lw $v1, ($t2) -/* 04C488 8004B888 3C0B1000 */ lui $t3, (0x10000400 >> 16) # lui $t3, 0x1000 -/* 04C48C 8004B88C 356B0400 */ ori $t3, (0x10000400 & 0xFFFF) # ori $t3, $t3, 0x400 -/* 04C490 8004B890 24790008 */ addiu $t9, $v1, 8 -/* 04C494 8004B894 AD590000 */ sw $t9, ($t2) -/* 04C498 8004B898 3C18B200 */ lui $t8, 0xb200 -/* 04C49C 8004B89C AC780000 */ sw $t8, ($v1) -/* 04C4A0 8004B8A0 03E00008 */ jr $ra -/* 04C4A4 8004B8A4 AC6B0004 */ sw $t3, 4($v1) - -.L8004B8A8: -/* 04C4A8 8004B8A8 8D430000 */ lw $v1, ($t2) -/* 04C4AC 8004B8AC 00867021 */ addu $t6, $a0, $a2 -/* 04C4B0 8004B8B0 000E6880 */ sll $t5, $t6, 2 -/* 04C4B4 8004B8B4 246C0008 */ addiu $t4, $v1, 8 -/* 04C4B8 8004B8B8 AD4C0000 */ sw $t4, ($t2) -/* 04C4BC 8004B8BC 31AF0FFF */ andi $t7, $t5, 0xfff -/* 04C4C0 8004B8C0 00A75821 */ addu $t3, $a1, $a3 -/* 04C4C4 8004B8C4 000B6080 */ sll $t4, $t3, 2 -/* 04C4C8 8004B8C8 000FCB00 */ sll $t9, $t7, 0xc -/* 04C4CC 8004B8CC 0321C025 */ or $t8, $t9, $at -/* 04C4D0 8004B8D0 318E0FFF */ andi $t6, $t4, 0xfff -/* 04C4D4 8004B8D4 00047880 */ sll $t7, $a0, 2 -/* 04C4D8 8004B8D8 31F90FFF */ andi $t9, $t7, 0xfff -/* 04C4DC 8004B8DC 030E6825 */ or $t5, $t8, $t6 -/* 04C4E0 8004B8E0 00056080 */ sll $t4, $a1, 2 -/* 04C4E4 8004B8E4 31980FFF */ andi $t8, $t4, 0xfff -/* 04C4E8 8004B8E8 00195B00 */ sll $t3, $t9, 0xc -/* 04C4EC 8004B8EC 01787025 */ or $t6, $t3, $t8 -/* 04C4F0 8004B8F0 AC6E0004 */ sw $t6, 4($v1) -/* 04C4F4 8004B8F4 AC6D0000 */ sw $t5, ($v1) -/* 04C4F8 8004B8F8 8D430000 */ lw $v1, ($t2) -/* 04C4FC 8004B8FC 3C0FB300 */ lui $t7, 0xb300 -/* 04C500 8004B900 246D0008 */ addiu $t5, $v1, 8 -/* 04C504 8004B904 AD4D0000 */ sw $t5, ($t2) -/* 04C508 8004B908 AC6F0000 */ sw $t7, ($v1) -/* 04C50C 8004B90C 8FAE0014 */ lw $t6, 0x14($sp) -/* 04C510 8004B910 8FAB0010 */ lw $t3, 0x10($sp) -/* 04C514 8004B914 000E6940 */ sll $t5, $t6, 5 -/* 04C518 8004B918 31AFFFFF */ andi $t7, $t5, 0xffff -/* 04C51C 8004B91C 000BC540 */ sll $t8, $t3, 0x15 -/* 04C520 8004B920 030FC825 */ or $t9, $t8, $t7 -/* 04C524 8004B924 AC790004 */ sw $t9, 4($v1) -/* 04C528 8004B928 8D430000 */ lw $v1, ($t2) -/* 04C52C 8004B92C 3C0E0400 */ lui $t6, (0x04000400 >> 16) # lui $t6, 0x400 -/* 04C530 8004B930 35CE0400 */ ori $t6, (0x04000400 & 0xFFFF) # ori $t6, $t6, 0x400 -/* 04C534 8004B934 246C0008 */ addiu $t4, $v1, 8 -/* 04C538 8004B938 AD4C0000 */ sw $t4, ($t2) -/* 04C53C 8004B93C 3C0BB200 */ lui $t3, 0xb200 -/* 04C540 8004B940 AC6B0000 */ sw $t3, ($v1) -/* 04C544 8004B944 AC6E0004 */ sw $t6, 4($v1) -/* 04C548 8004B948 03E00008 */ jr $ra -/* 04C54C 8004B94C 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004B97C.s b/asm/non_matchings/code_800431B0/func_8004B97C.s deleted file mode 100644 index df022f0cc..000000000 --- a/asm/non_matchings/code_800431B0/func_8004B97C.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_8004B97C -/* 04C57C 8004B97C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 04C580 8004B980 00067823 */ negu $t7, $a2 -/* 04C584 8004B984 01E4082A */ slt $at, $t7, $a0 -/* 04C588 8004B988 AFBF0024 */ sw $ra, 0x24($sp) -/* 04C58C 8004B98C AFA5003C */ sw $a1, 0x3c($sp) -/* 04C590 8004B990 AFA60040 */ sw $a2, 0x40($sp) -/* 04C594 8004B994 10200018 */ beqz $at, .L8004B9F8 -/* 04C598 8004B998 AFA70044 */ sw $a3, 0x44($sp) -/* 04C59C 8004B99C 0007C823 */ negu $t9, $a3 -/* 04C5A0 8004B9A0 0325082A */ slt $at, $t9, $a1 -/* 04C5A4 8004B9A4 10200014 */ beqz $at, .L8004B9F8 -/* 04C5A8 8004B9A8 00001025 */ move $v0, $zero -/* 04C5AC 8004B9AC 00001825 */ move $v1, $zero -/* 04C5B0 8004B9B0 04810003 */ bgez $a0, .L8004B9C0 -/* 04C5B4 8004B9B4 AFA4002C */ sw $a0, 0x2c($sp) -/* 04C5B8 8004B9B8 00041823 */ negu $v1, $a0 -/* 04C5BC 8004B9BC AFA0002C */ sw $zero, 0x2c($sp) -.L8004B9C0: -/* 04C5C0 8004B9C0 8FA9003C */ lw $t1, 0x3c($sp) -/* 04C5C4 8004B9C4 8FAA0040 */ lw $t2, 0x40($sp) -/* 04C5C8 8004B9C8 8FA4002C */ lw $a0, 0x2c($sp) -/* 04C5CC 8004B9CC 05210003 */ bgez $t1, .L8004B9DC -/* 04C5D0 8004B9D0 01433023 */ subu $a2, $t2, $v1 -/* 04C5D4 8004B9D4 00091023 */ negu $v0, $t1 -/* 04C5D8 8004B9D8 00002825 */ move $a1, $zero -.L8004B9DC: -/* 04C5DC 8004B9DC 8FAB0044 */ lw $t3, 0x44($sp) -/* 04C5E0 8004B9E0 8FAC0048 */ lw $t4, 0x48($sp) -/* 04C5E4 8004B9E4 AFA30010 */ sw $v1, 0x10($sp) -/* 04C5E8 8004B9E8 AFA20014 */ sw $v0, 0x14($sp) -/* 04C5EC 8004B9EC 01623823 */ subu $a3, $t3, $v0 -/* 04C5F0 8004B9F0 0C012DF7 */ jal func_8004B7DC -/* 04C5F4 8004B9F4 AFAC0018 */ sw $t4, 0x18($sp) -.L8004B9F8: -/* 04C5F8 8004B9F8 8FBF0024 */ lw $ra, 0x24($sp) -/* 04C5FC 8004B9FC 27BD0038 */ addiu $sp, $sp, 0x38 -/* 04C600 8004BA00 03E00008 */ jr $ra -/* 04C604 8004BA04 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004BA08.s b/asm/non_matchings/code_800431B0/func_8004BA08.s deleted file mode 100644 index 7f67b85fb..000000000 --- a/asm/non_matchings/code_800431B0/func_8004BA08.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_8004BA08 -/* 04C608 8004BA08 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 04C60C 8004BA0C 00067823 */ negu $t7, $a2 -/* 04C610 8004BA10 01E4082A */ slt $at, $t7, $a0 -/* 04C614 8004BA14 AFBF0024 */ sw $ra, 0x24($sp) -/* 04C618 8004BA18 AFA5003C */ sw $a1, 0x3c($sp) -/* 04C61C 8004BA1C AFA60040 */ sw $a2, 0x40($sp) -/* 04C620 8004BA20 10200019 */ beqz $at, .L8004BA88 -/* 04C624 8004BA24 AFA70044 */ sw $a3, 0x44($sp) -/* 04C628 8004BA28 0007C823 */ negu $t9, $a3 -/* 04C62C 8004BA2C 0325082A */ slt $at, $t9, $a1 -/* 04C630 8004BA30 10200015 */ beqz $at, .L8004BA88 -/* 04C634 8004BA34 00001025 */ move $v0, $zero -/* 04C638 8004BA38 00001825 */ move $v1, $zero -/* 04C63C 8004BA3C 04810003 */ bgez $a0, .L8004BA4C -/* 04C640 8004BA40 AFA4002C */ sw $a0, 0x2c($sp) -/* 04C644 8004BA44 00041823 */ negu $v1, $a0 -/* 04C648 8004BA48 AFA0002C */ sw $zero, 0x2c($sp) -.L8004BA4C: -/* 04C64C 8004BA4C 8FA9003C */ lw $t1, 0x3c($sp) -/* 04C650 8004BA50 8FAA0040 */ lw $t2, 0x40($sp) -/* 04C654 8004BA54 8FA4002C */ lw $a0, 0x2c($sp) -/* 04C658 8004BA58 05210003 */ bgez $t1, .L8004BA68 -/* 04C65C 8004BA5C 01433023 */ subu $a2, $t2, $v1 -/* 04C660 8004BA60 00091023 */ negu $v0, $t1 -/* 04C664 8004BA64 00002825 */ move $a1, $zero -.L8004BA68: -/* 04C668 8004BA68 8FAB0044 */ lw $t3, 0x44($sp) -/* 04C66C 8004BA6C 8FAD0048 */ lw $t5, 0x48($sp) -/* 04C670 8004BA70 006A6021 */ addu $t4, $v1, $t2 -/* 04C674 8004BA74 AFAC0010 */ sw $t4, 0x10($sp) -/* 04C678 8004BA78 AFA20014 */ sw $v0, 0x14($sp) -/* 04C67C 8004BA7C 01623823 */ subu $a3, $t3, $v0 -/* 04C680 8004BA80 0C012DF7 */ jal func_8004B7DC -/* 04C684 8004BA84 AFAD0018 */ sw $t5, 0x18($sp) -.L8004BA88: -/* 04C688 8004BA88 8FBF0024 */ lw $ra, 0x24($sp) -/* 04C68C 8004BA8C 27BD0038 */ addiu $sp, $sp, 0x38 -/* 04C690 8004BA90 03E00008 */ jr $ra -/* 04C694 8004BA94 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004BA98.s b/asm/non_matchings/code_800431B0/func_8004BA98.s deleted file mode 100644 index 57bf0d127..000000000 --- a/asm/non_matchings/code_800431B0/func_8004BA98.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_8004BA98 -/* 04C698 8004BA98 00067023 */ negu $t6, $a2 -/* 04C69C 8004BA9C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04C6A0 8004BAA0 01C4082A */ slt $at, $t6, $a0 -/* 04C6A4 8004BAA4 AFBF0024 */ sw $ra, 0x24($sp) -/* 04C6A8 8004BAA8 1020001E */ beqz $at, .L8004BB24 -/* 04C6AC 8004BAAC AFA7004C */ sw $a3, 0x4c($sp) -/* 04C6B0 8004BAB0 0007C023 */ negu $t8, $a3 -/* 04C6B4 8004BAB4 0305082A */ slt $at, $t8, $a1 -/* 04C6B8 8004BAB8 1020001A */ beqz $at, .L8004BB24 -/* 04C6BC 8004BABC 8FA80050 */ lw $t0, 0x50($sp) -/* 04C6C0 8004BAC0 8FA90054 */ lw $t1, 0x54($sp) -/* 04C6C4 8004BAC4 AFA40034 */ sw $a0, 0x34($sp) -/* 04C6C8 8004BAC8 AFA50030 */ sw $a1, 0x30($sp) -/* 04C6CC 8004BACC 01001025 */ move $v0, $t0 -/* 04C6D0 8004BAD0 AFA6002C */ sw $a2, 0x2c($sp) -/* 04C6D4 8004BAD4 04810005 */ bgez $a0, .L8004BAEC -/* 04C6D8 8004BAD8 01201825 */ move $v1, $t1 -/* 04C6DC 8004BADC 00C4C821 */ addu $t9, $a2, $a0 -/* 04C6E0 8004BAE0 01041023 */ subu $v0, $t0, $a0 -/* 04C6E4 8004BAE4 AFA00034 */ sw $zero, 0x34($sp) -/* 04C6E8 8004BAE8 AFB9002C */ sw $t9, 0x2c($sp) -.L8004BAEC: -/* 04C6EC 8004BAEC 04A30006 */ bgezl $a1, .L8004BB08 -/* 04C6F0 8004BAF0 8FAB0058 */ lw $t3, 0x58($sp) -/* 04C6F4 8004BAF4 8FAA004C */ lw $t2, 0x4c($sp) -/* 04C6F8 8004BAF8 01251823 */ subu $v1, $t1, $a1 -/* 04C6FC 8004BAFC AFA00030 */ sw $zero, 0x30($sp) -/* 04C700 8004BB00 01453821 */ addu $a3, $t2, $a1 -/* 04C704 8004BB04 8FAB0058 */ lw $t3, 0x58($sp) -.L8004BB08: -/* 04C708 8004BB08 8FA40034 */ lw $a0, 0x34($sp) -/* 04C70C 8004BB0C 8FA50030 */ lw $a1, 0x30($sp) -/* 04C710 8004BB10 8FA6002C */ lw $a2, 0x2c($sp) -/* 04C714 8004BB14 AFA20010 */ sw $v0, 0x10($sp) -/* 04C718 8004BB18 AFA30014 */ sw $v1, 0x14($sp) -/* 04C71C 8004BB1C 0C012DF7 */ jal func_8004B7DC -/* 04C720 8004BB20 AFAB0018 */ sw $t3, 0x18($sp) -.L8004BB24: -/* 04C724 8004BB24 8FBF0024 */ lw $ra, 0x24($sp) -/* 04C728 8004BB28 27BD0040 */ addiu $sp, $sp, 0x40 -/* 04C72C 8004BB2C 03E00008 */ jr $ra -/* 04C730 8004BB30 00000000 */ nop diff --git a/asm/non_matchings/code_800431B0/func_8004C268.s b/asm/non_matchings/code_800431B0/func_8004C268.s deleted file mode 100644 index 7652a28f2..000000000 --- a/asm/non_matchings/code_800431B0/func_8004C268.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_8004C268 -/* 04CE68 8004C268 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 04CE6C 8004C26C AFB7003C */ sw $s7, 0x3c($sp) -/* 04CE70 8004C270 AFB3002C */ sw $s3, 0x2c($sp) -/* 04CE74 8004C274 8FB3005C */ lw $s3, 0x5c($sp) -/* 04CE78 8004C278 8FB70058 */ lw $s7, 0x58($sp) -/* 04CE7C 8004C27C AFB50034 */ sw $s5, 0x34($sp) -/* 04CE80 8004C280 AFB60038 */ sw $s6, 0x38($sp) -/* 04CE84 8004C284 02F3001B */ divu $zero, $s7, $s3 -/* 04CE88 8004C288 AFB40030 */ sw $s4, 0x30($sp) -/* 04CE8C 8004C28C AFB20028 */ sw $s2, 0x28($sp) -/* 04CE90 8004C290 AFB10024 */ sw $s1, 0x24($sp) -/* 04CE94 8004C294 AFB00020 */ sw $s0, 0x20($sp) -/* 04CE98 8004C298 00077042 */ srl $t6, $a3, 1 -/* 04CE9C 8004C29C 0000A812 */ mflo $s5 -/* 04CEA0 8004C2A0 00177842 */ srl $t7, $s7, 1 -/* 04CEA4 8004C2A4 00E0A025 */ move $s4, $a3 -/* 04CEA8 8004C2A8 AFBF0044 */ sw $ra, 0x44($sp) -/* 04CEAC 8004C2AC AFBE0040 */ sw $fp, 0x40($sp) -/* 04CEB0 8004C2B0 008EB023 */ subu $s6, $a0, $t6 -/* 04CEB4 8004C2B4 00AF8023 */ subu $s0, $a1, $t7 -/* 04CEB8 8004C2B8 00C08825 */ move $s1, $a2 -/* 04CEBC 8004C2BC 00009025 */ move $s2, $zero -/* 04CEC0 8004C2C0 16600002 */ bnez $s3, .L8004C2CC -/* 04CEC4 8004C2C4 00000000 */ nop -/* 04CEC8 8004C2C8 0007000D */ break 7 -.L8004C2CC: -/* 04CECC 8004C2CC 52A00016 */ beql $s5, $zero, .L8004C328 -/* 04CED0 8004C2D0 8FBF0044 */ lw $ra, 0x44($sp) -/* 04CED4 8004C2D4 02930019 */ multu $s4, $s3 -/* 04CED8 8004C2D8 8FBE0060 */ lw $fp, 0x60($sp) -/* 04CEDC 8004C2DC 0000B812 */ mflo $s7 -/* 04CEE0 8004C2E0 0017C040 */ sll $t8, $s7, 1 -/* 04CEE4 8004C2E4 0300B825 */ move $s7, $t8 -.L8004C2E8: -/* 04CEE8 8004C2E8 02202025 */ move $a0, $s1 -/* 04CEEC 8004C2EC 02802825 */ move $a1, $s4 -/* 04CEF0 8004C2F0 0C010F54 */ jal func_80043D50 -/* 04CEF4 8004C2F4 02603025 */ move $a2, $s3 -/* 04CEF8 8004C2F8 02C02025 */ move $a0, $s6 -/* 04CEFC 8004C2FC 02002825 */ move $a1, $s0 -/* 04CF00 8004C300 02803025 */ move $a2, $s4 -/* 04CF04 8004C304 02603825 */ move $a3, $s3 -/* 04CF08 8004C308 0C012E5F */ jal func_8004B97C -/* 04CF0C 8004C30C AFBE0010 */ sw $fp, 0x10($sp) -/* 04CF10 8004C310 26520001 */ addiu $s2, $s2, 1 -/* 04CF14 8004C314 0255082B */ sltu $at, $s2, $s5 -/* 04CF18 8004C318 02378821 */ addu $s1, $s1, $s7 -/* 04CF1C 8004C31C 1420FFF2 */ bnez $at, .L8004C2E8 -/* 04CF20 8004C320 02138021 */ addu $s0, $s0, $s3 -/* 04CF24 8004C324 8FBF0044 */ lw $ra, 0x44($sp) -.L8004C328: -/* 04CF28 8004C328 8FB00020 */ lw $s0, 0x20($sp) -/* 04CF2C 8004C32C 8FB10024 */ lw $s1, 0x24($sp) -/* 04CF30 8004C330 8FB20028 */ lw $s2, 0x28($sp) -/* 04CF34 8004C334 8FB3002C */ lw $s3, 0x2c($sp) -/* 04CF38 8004C338 8FB40030 */ lw $s4, 0x30($sp) -/* 04CF3C 8004C33C 8FB50034 */ lw $s5, 0x34($sp) -/* 04CF40 8004C340 8FB60038 */ lw $s6, 0x38($sp) -/* 04CF44 8004C344 8FB7003C */ lw $s7, 0x3c($sp) -/* 04CF48 8004C348 8FBE0040 */ lw $fp, 0x40($sp) -/* 04CF4C 8004C34C 03E00008 */ jr $ra -/* 04CF50 8004C350 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/code_800431B0/func_8004CD48.s b/asm/non_matchings/code_800431B0/func_8004CD48.s deleted file mode 100644 index 0433a6411..000000000 --- a/asm/non_matchings/code_800431B0/func_8004CD48.s +++ /dev/null @@ -1,88 +0,0 @@ -glabel func_8004CD48 -/* 04D948 8004CD48 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* 04D94C 8004CD4C AFA60058 */ sw $a2, 0x58($sp) -/* 04D950 8004CD50 8FA60060 */ lw $a2, 0x60($sp) -/* 04D954 8004CD54 AFB20024 */ sw $s2, 0x24($sp) -/* 04D958 8004CD58 8FB20064 */ lw $s2, 0x64($sp) -/* 04D95C 8004CD5C 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04D960 8004CD60 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04D964 8004CD64 00D2001A */ div $zero, $a2, $s2 -/* 04D968 8004CD68 8D030000 */ lw $v1, ($t0) -/* 04D96C 8004CD6C AFB50030 */ sw $s5, 0x30($sp) -/* 04D970 8004CD70 AFB30028 */ sw $s3, 0x28($sp) -/* 04D974 8004CD74 AFB10020 */ sw $s1, 0x20($sp) -/* 04D978 8004CD78 AFB0001C */ sw $s0, 0x1c($sp) -/* 04D97C 8004CD7C 3C190D00 */ lui $t9, %hi(D_0D007FE0) # $t9, 0xd00 -/* 04D980 8004CD80 246F0008 */ addiu $t7, $v1, 8 -/* 04D984 8004CD84 AFBF003C */ sw $ra, 0x3c($sp) -/* 04D988 8004CD88 AFB70038 */ sw $s7, 0x38($sp) -/* 04D98C 8004CD8C AFB60034 */ sw $s6, 0x34($sp) -/* 04D990 8004CD90 AFB4002C */ sw $s4, 0x2c($sp) -/* 04D994 8004CD94 AD0F0000 */ sw $t7, ($t0) -/* 04D998 8004CD98 27397FE0 */ addiu $t9, %lo(D_0D007FE0) # addiu $t9, $t9, 0x7fe0 -/* 04D99C 8004CD9C 3C180600 */ lui $t8, 0x600 -/* 04D9A0 8004CDA0 0000A812 */ mflo $s5 -/* 04D9A4 8004CDA4 00E09825 */ move $s3, $a3 -/* 04D9A8 8004CDA8 04C10003 */ bgez $a2, .L8004CDB8 -/* 04D9AC 8004CDAC 00067043 */ sra $t6, $a2, 1 -/* 04D9B0 8004CDB0 24C10001 */ addiu $at, $a2, 1 -/* 04D9B4 8004CDB4 00017043 */ sra $t6, $at, 1 -.L8004CDB8: -/* 04D9B8 8004CDB8 00AE8023 */ subu $s0, $a1, $t6 -/* 04D9BC 8004CDBC 00008825 */ move $s1, $zero -/* 04D9C0 8004CDC0 AC780000 */ sw $t8, ($v1) -/* 04D9C4 8004CDC4 AC790004 */ sw $t9, 4($v1) -/* 04D9C8 8004CDC8 00601025 */ move $v0, $v1 -/* 04D9CC 8004CDCC 16400002 */ bnez $s2, .L8004CDD8 -/* 04D9D0 8004CDD0 00000000 */ nop -/* 04D9D4 8004CDD4 0007000D */ break 7 -.L8004CDD8: -/* 04D9D8 8004CDD8 2401FFFF */ li $at, -1 -/* 04D9DC 8004CDDC 16410004 */ bne $s2, $at, .L8004CDF0 -/* 04D9E0 8004CDE0 3C018000 */ lui $at, 0x8000 -/* 04D9E4 8004CDE4 14C10002 */ bne $a2, $at, .L8004CDF0 -/* 04D9E8 8004CDE8 00000000 */ nop -/* 04D9EC 8004CDEC 0006000D */ break 6 -.L8004CDF0: -/* 04D9F0 8004CDF0 5AA0001C */ blezl $s5, .L8004CE64 -/* 04D9F4 8004CDF4 8FBF003C */ lw $ra, 0x3c($sp) -/* 04D9F8 8004CDF8 02720019 */ multu $s3, $s2 -/* 04D9FC 8004CDFC 8FB40040 */ lw $s4, 0x40($sp) -/* 04DA00 8004CE00 06610003 */ bgez $s3, .L8004CE10 -/* 04DA04 8004CE04 00134843 */ sra $t1, $s3, 1 -/* 04DA08 8004CE08 26610001 */ addiu $at, $s3, 1 -/* 04DA0C 8004CE0C 00014843 */ sra $t1, $at, 1 -.L8004CE10: -/* 04DA10 8004CE10 0089B023 */ subu $s6, $a0, $t1 -/* 04DA14 8004CE14 0000B812 */ mflo $s7 -/* 04DA18 8004CE18 00175040 */ sll $t2, $s7, 1 -/* 04DA1C 8004CE1C 0140B825 */ move $s7, $t2 -.L8004CE20: -/* 04DA20 8004CE20 02802025 */ move $a0, $s4 -/* 04DA24 8004CE24 02602825 */ move $a1, $s3 -/* 04DA28 8004CE28 0C011078 */ jal func_800441E0 -/* 04DA2C 8004CE2C 02403025 */ move $a2, $s2 -/* 04DA30 8004CE30 240B0001 */ li $t3, 1 -/* 04DA34 8004CE34 AFAB0010 */ sw $t3, 0x10($sp) -/* 04DA38 8004CE38 02C02025 */ move $a0, $s6 -/* 04DA3C 8004CE3C 02002825 */ move $a1, $s0 -/* 04DA40 8004CE40 02603025 */ move $a2, $s3 -/* 04DA44 8004CE44 0C012E5F */ jal func_8004B97C -/* 04DA48 8004CE48 02403825 */ move $a3, $s2 -/* 04DA4C 8004CE4C 26310001 */ addiu $s1, $s1, 1 -/* 04DA50 8004CE50 0297A021 */ addu $s4, $s4, $s7 -/* 04DA54 8004CE54 1635FFF2 */ bne $s1, $s5, .L8004CE20 -/* 04DA58 8004CE58 02128021 */ addu $s0, $s0, $s2 -/* 04DA5C 8004CE5C AFB40040 */ sw $s4, 0x40($sp) -/* 04DA60 8004CE60 8FBF003C */ lw $ra, 0x3c($sp) -.L8004CE64: -/* 04DA64 8004CE64 8FB0001C */ lw $s0, 0x1c($sp) -/* 04DA68 8004CE68 8FB10020 */ lw $s1, 0x20($sp) -/* 04DA6C 8004CE6C 8FB20024 */ lw $s2, 0x24($sp) -/* 04DA70 8004CE70 8FB30028 */ lw $s3, 0x28($sp) -/* 04DA74 8004CE74 8FB4002C */ lw $s4, 0x2c($sp) -/* 04DA78 8004CE78 8FB50030 */ lw $s5, 0x30($sp) -/* 04DA7C 8004CE7C 8FB60034 */ lw $s6, 0x34($sp) -/* 04DA80 8004CE80 8FB70038 */ lw $s7, 0x38($sp) -/* 04DA84 8004CE84 03E00008 */ jr $ra -/* 04DA88 8004CE88 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code_800431B0/func_8004CE8C.s b/asm/non_matchings/code_800431B0/func_8004CE8C.s deleted file mode 100644 index 72580590e..000000000 --- a/asm/non_matchings/code_800431B0/func_8004CE8C.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_8004CE8C -/* 04DA8C 8004CE8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04DA90 8004CE90 AFB60034 */ sw $s6, 0x34($sp) -/* 04DA94 8004CE94 8FB60050 */ lw $s6, 0x50($sp) -/* 04DA98 8004CE98 AFB30028 */ sw $s3, 0x28($sp) -/* 04DA9C 8004CE9C 8FB30054 */ lw $s3, 0x54($sp) -/* 04DAA0 8004CEA0 AFB50030 */ sw $s5, 0x30($sp) -/* 04DAA4 8004CEA4 AFB4002C */ sw $s4, 0x2c($sp) -/* 04DAA8 8004CEA8 02D3001A */ div $zero, $s6, $s3 -/* 04DAAC 8004CEAC AFB20024 */ sw $s2, 0x24($sp) -/* 04DAB0 8004CEB0 AFB10020 */ sw $s1, 0x20($sp) -/* 04DAB4 8004CEB4 AFB0001C */ sw $s0, 0x1c($sp) -/* 04DAB8 8004CEB8 0000A812 */ mflo $s5 -/* 04DABC 8004CEBC 00E0A025 */ move $s4, $a3 -/* 04DAC0 8004CEC0 AFBF003C */ sw $ra, 0x3c($sp) -/* 04DAC4 8004CEC4 AFB70038 */ sw $s7, 0x38($sp) -/* 04DAC8 8004CEC8 06C10003 */ bgez $s6, .L8004CED8 -/* 04DACC 8004CECC 00167043 */ sra $t6, $s6, 1 -/* 04DAD0 8004CED0 26C10001 */ addiu $at, $s6, 1 -/* 04DAD4 8004CED4 00017043 */ sra $t6, $at, 1 -.L8004CED8: -/* 04DAD8 8004CED8 00AE8023 */ subu $s0, $a1, $t6 -/* 04DADC 8004CEDC 00C08825 */ move $s1, $a2 -/* 04DAE0 8004CEE0 00009025 */ move $s2, $zero -/* 04DAE4 8004CEE4 16600002 */ bnez $s3, .L8004CEF0 -/* 04DAE8 8004CEE8 00000000 */ nop -/* 04DAEC 8004CEEC 0007000D */ break 7 -.L8004CEF0: -/* 04DAF0 8004CEF0 2401FFFF */ li $at, -1 -/* 04DAF4 8004CEF4 16610004 */ bne $s3, $at, .L8004CF08 -/* 04DAF8 8004CEF8 3C018000 */ lui $at, 0x8000 -/* 04DAFC 8004CEFC 16C10002 */ bne $s6, $at, .L8004CF08 -/* 04DB00 8004CF00 00000000 */ nop -/* 04DB04 8004CF04 0006000D */ break 6 -.L8004CF08: -/* 04DB08 8004CF08 5AA0001A */ blezl $s5, .L8004CF74 -/* 04DB0C 8004CF0C 8FBF003C */ lw $ra, 0x3c($sp) -/* 04DB10 8004CF10 02930019 */ multu $s4, $s3 -/* 04DB14 8004CF14 06810003 */ bgez $s4, .L8004CF24 -/* 04DB18 8004CF18 00147843 */ sra $t7, $s4, 1 -/* 04DB1C 8004CF1C 26810001 */ addiu $at, $s4, 1 -/* 04DB20 8004CF20 00017843 */ sra $t7, $at, 1 -.L8004CF24: -/* 04DB24 8004CF24 008FB023 */ subu $s6, $a0, $t7 -/* 04DB28 8004CF28 0000B812 */ mflo $s7 -/* 04DB2C 8004CF2C 00000000 */ nop -/* 04DB30 8004CF30 00000000 */ nop -.L8004CF34: -/* 04DB34 8004CF34 02202025 */ move $a0, $s1 -/* 04DB38 8004CF38 02802825 */ move $a1, $s4 -/* 04DB3C 8004CF3C 0C01112C */ jal func_800444B0 -/* 04DB40 8004CF40 02603025 */ move $a2, $s3 -/* 04DB44 8004CF44 24180001 */ li $t8, 1 -/* 04DB48 8004CF48 AFB80010 */ sw $t8, 0x10($sp) -/* 04DB4C 8004CF4C 02C02025 */ move $a0, $s6 -/* 04DB50 8004CF50 02002825 */ move $a1, $s0 -/* 04DB54 8004CF54 02803025 */ move $a2, $s4 -/* 04DB58 8004CF58 0C012E5F */ jal func_8004B97C -/* 04DB5C 8004CF5C 02603825 */ move $a3, $s3 -/* 04DB60 8004CF60 26520001 */ addiu $s2, $s2, 1 -/* 04DB64 8004CF64 02378821 */ addu $s1, $s1, $s7 -/* 04DB68 8004CF68 1655FFF2 */ bne $s2, $s5, .L8004CF34 -/* 04DB6C 8004CF6C 02138021 */ addu $s0, $s0, $s3 -/* 04DB70 8004CF70 8FBF003C */ lw $ra, 0x3c($sp) -.L8004CF74: -/* 04DB74 8004CF74 8FB0001C */ lw $s0, 0x1c($sp) -/* 04DB78 8004CF78 8FB10020 */ lw $s1, 0x20($sp) -/* 04DB7C 8004CF7C 8FB20024 */ lw $s2, 0x24($sp) -/* 04DB80 8004CF80 8FB30028 */ lw $s3, 0x28($sp) -/* 04DB84 8004CF84 8FB4002C */ lw $s4, 0x2c($sp) -/* 04DB88 8004CF88 8FB50030 */ lw $s5, 0x30($sp) -/* 04DB8C 8004CF8C 8FB60034 */ lw $s6, 0x34($sp) -/* 04DB90 8004CF90 8FB70038 */ lw $s7, 0x38($sp) -/* 04DB94 8004CF94 03E00008 */ jr $ra -/* 04DB98 8004CF98 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004D0D4.s b/asm/non_matchings/code_800431B0/func_8004D0D4.s deleted file mode 100644 index b50876feb..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D0D4.s +++ /dev/null @@ -1,86 +0,0 @@ -glabel func_8004D0D4 -/* 04DCD4 8004D0D4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04DCD8 8004D0D8 AFB60034 */ sw $s6, 0x34($sp) -/* 04DCDC 8004D0DC 8FB60050 */ lw $s6, 0x50($sp) -/* 04DCE0 8004D0E0 AFB30028 */ sw $s3, 0x28($sp) -/* 04DCE4 8004D0E4 8FB30054 */ lw $s3, 0x54($sp) -/* 04DCE8 8004D0E8 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04DCEC 8004D0EC 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04DCF0 8004D0F0 02D3001A */ div $zero, $s6, $s3 -/* 04DCF4 8004D0F4 8D030000 */ lw $v1, ($t0) -/* 04DCF8 8004D0F8 AFB50030 */ sw $s5, 0x30($sp) -/* 04DCFC 8004D0FC AFB4002C */ sw $s4, 0x2c($sp) -/* 04DD00 8004D100 AFB20024 */ sw $s2, 0x24($sp) -/* 04DD04 8004D104 AFB10020 */ sw $s1, 0x20($sp) -/* 04DD08 8004D108 AFB0001C */ sw $s0, 0x1c($sp) -/* 04DD0C 8004D10C 3C190D00 */ lui $t9, %hi(D_0D007FE0) # $t9, 0xd00 -/* 04DD10 8004D110 246F0008 */ addiu $t7, $v1, 8 -/* 04DD14 8004D114 AFBF003C */ sw $ra, 0x3c($sp) -/* 04DD18 8004D118 AFB70038 */ sw $s7, 0x38($sp) -/* 04DD1C 8004D11C AD0F0000 */ sw $t7, ($t0) -/* 04DD20 8004D120 27397FE0 */ addiu $t9, %lo(D_0D007FE0) # addiu $t9, $t9, 0x7fe0 -/* 04DD24 8004D124 3C180600 */ lui $t8, 0x600 -/* 04DD28 8004D128 0000A812 */ mflo $s5 -/* 04DD2C 8004D12C 00E0A025 */ move $s4, $a3 -/* 04DD30 8004D130 06C10003 */ bgez $s6, .L8004D140 -/* 04DD34 8004D134 00167043 */ sra $t6, $s6, 1 -/* 04DD38 8004D138 26C10001 */ addiu $at, $s6, 1 -/* 04DD3C 8004D13C 00017043 */ sra $t6, $at, 1 -.L8004D140: -/* 04DD40 8004D140 00AE8023 */ subu $s0, $a1, $t6 -/* 04DD44 8004D144 00C08825 */ move $s1, $a2 -/* 04DD48 8004D148 00009025 */ move $s2, $zero -/* 04DD4C 8004D14C AC780000 */ sw $t8, ($v1) -/* 04DD50 8004D150 AC790004 */ sw $t9, 4($v1) -/* 04DD54 8004D154 00601025 */ move $v0, $v1 -/* 04DD58 8004D158 16600002 */ bnez $s3, .L8004D164 -/* 04DD5C 8004D15C 00000000 */ nop -/* 04DD60 8004D160 0007000D */ break 7 -.L8004D164: -/* 04DD64 8004D164 2401FFFF */ li $at, -1 -/* 04DD68 8004D168 16610004 */ bne $s3, $at, .L8004D17C -/* 04DD6C 8004D16C 3C018000 */ lui $at, 0x8000 -/* 04DD70 8004D170 16C10002 */ bne $s6, $at, .L8004D17C -/* 04DD74 8004D174 00000000 */ nop -/* 04DD78 8004D178 0006000D */ break 6 -.L8004D17C: -/* 04DD7C 8004D17C 5AA0001A */ blezl $s5, .L8004D1E8 -/* 04DD80 8004D180 8FBF003C */ lw $ra, 0x3c($sp) -/* 04DD84 8004D184 02930019 */ multu $s4, $s3 -/* 04DD88 8004D188 06810003 */ bgez $s4, .L8004D198 -/* 04DD8C 8004D18C 00144843 */ sra $t1, $s4, 1 -/* 04DD90 8004D190 26810001 */ addiu $at, $s4, 1 -/* 04DD94 8004D194 00014843 */ sra $t1, $at, 1 -.L8004D198: -/* 04DD98 8004D198 0089B023 */ subu $s6, $a0, $t1 -/* 04DD9C 8004D19C 0000B812 */ mflo $s7 -/* 04DDA0 8004D1A0 00000000 */ nop -/* 04DDA4 8004D1A4 00000000 */ nop -.L8004D1A8: -/* 04DDA8 8004D1A8 02202025 */ move $a0, $s1 -/* 04DDAC 8004D1AC 02802825 */ move $a1, $s4 -/* 04DDB0 8004D1B0 0C011249 */ jal func_80044924 -/* 04DDB4 8004D1B4 02603025 */ move $a2, $s3 -/* 04DDB8 8004D1B8 240A0001 */ li $t2, 1 -/* 04DDBC 8004D1BC AFAA0010 */ sw $t2, 0x10($sp) -/* 04DDC0 8004D1C0 02C02025 */ move $a0, $s6 -/* 04DDC4 8004D1C4 02002825 */ move $a1, $s0 -/* 04DDC8 8004D1C8 02803025 */ move $a2, $s4 -/* 04DDCC 8004D1CC 0C012E5F */ jal func_8004B97C -/* 04DDD0 8004D1D0 02603825 */ move $a3, $s3 -/* 04DDD4 8004D1D4 26520001 */ addiu $s2, $s2, 1 -/* 04DDD8 8004D1D8 02378821 */ addu $s1, $s1, $s7 -/* 04DDDC 8004D1DC 1655FFF2 */ bne $s2, $s5, .L8004D1A8 -/* 04DDE0 8004D1E0 02138021 */ addu $s0, $s0, $s3 -/* 04DDE4 8004D1E4 8FBF003C */ lw $ra, 0x3c($sp) -.L8004D1E8: -/* 04DDE8 8004D1E8 8FB0001C */ lw $s0, 0x1c($sp) -/* 04DDEC 8004D1EC 8FB10020 */ lw $s1, 0x20($sp) -/* 04DDF0 8004D1F0 8FB20024 */ lw $s2, 0x24($sp) -/* 04DDF4 8004D1F4 8FB30028 */ lw $s3, 0x28($sp) -/* 04DDF8 8004D1F8 8FB4002C */ lw $s4, 0x2c($sp) -/* 04DDFC 8004D1FC 8FB50030 */ lw $s5, 0x30($sp) -/* 04DE00 8004D200 8FB60034 */ lw $s6, 0x34($sp) -/* 04DE04 8004D204 8FB70038 */ lw $s7, 0x38($sp) -/* 04DE08 8004D208 03E00008 */ jr $ra -/* 04DE0C 8004D20C 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004D210.s b/asm/non_matchings/code_800431B0/func_8004D210.s deleted file mode 100644 index ee816e951..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D210.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_8004D210 -/* 04DE10 8004D210 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04DE14 8004D214 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04DE18 8004D218 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04DE1C 8004D21C AFB60034 */ sw $s6, 0x34($sp) -/* 04DE20 8004D220 8FB60060 */ lw $s6, 0x60($sp) -/* 04DE24 8004D224 8D030000 */ lw $v1, ($t0) -/* 04DE28 8004D228 AFBF003C */ sw $ra, 0x3c($sp) -/* 04DE2C 8004D22C AFB70038 */ sw $s7, 0x38($sp) -/* 04DE30 8004D230 246F0008 */ addiu $t7, $v1, 8 -/* 04DE34 8004D234 AFB50030 */ sw $s5, 0x30($sp) -/* 04DE38 8004D238 AFB4002C */ sw $s4, 0x2c($sp) -/* 04DE3C 8004D23C AFB30028 */ sw $s3, 0x28($sp) -/* 04DE40 8004D240 AFB20024 */ sw $s2, 0x24($sp) -/* 04DE44 8004D244 AFB10020 */ sw $s1, 0x20($sp) -/* 04DE48 8004D248 AFB0001C */ sw $s0, 0x1c($sp) -/* 04DE4C 8004D24C AFA40040 */ sw $a0, 0x40($sp) -/* 04DE50 8004D250 AD0F0000 */ sw $t7, ($t0) -/* 04DE54 8004D254 3C190D00 */ lui $t9, %hi(D_0D007FE0) # $t9, 0xd00 -/* 04DE58 8004D258 27397FE0 */ addiu $t9, %lo(D_0D007FE0) # addiu $t9, $t9, 0x7fe0 -/* 04DE5C 8004D25C 3C180600 */ lui $t8, 0x600 -/* 04DE60 8004D260 AC780000 */ sw $t8, ($v1) -/* 04DE64 8004D264 AC790004 */ sw $t9, 4($v1) -/* 04DE68 8004D268 00A08025 */ move $s0, $a1 -/* 04DE6C 8004D26C 00C08825 */ move $s1, $a2 -/* 04DE70 8004D270 00E09025 */ move $s2, $a3 -/* 04DE74 8004D274 06C10003 */ bgez $s6, .L8004D284 -/* 04DE78 8004D278 00167043 */ sra $t6, $s6, 1 -/* 04DE7C 8004D27C 26C10001 */ addiu $at, $s6, 1 -/* 04DE80 8004D280 00017043 */ sra $t6, $at, 1 -.L8004D284: -/* 04DE84 8004D284 020E9823 */ subu $s3, $s0, $t6 -/* 04DE88 8004D288 0220A025 */ move $s4, $s1 -/* 04DE8C 8004D28C 02402025 */ move $a0, $s2 -/* 04DE90 8004D290 8FA70058 */ lw $a3, 0x58($sp) -/* 04DE94 8004D294 8FA60054 */ lw $a2, 0x54($sp) -/* 04DE98 8004D298 0C012CD7 */ jal func_8004B35C -/* 04DE9C 8004D29C 8FA50050 */ lw $a1, 0x50($sp) -/* 04DEA0 8004D2A0 8FB10068 */ lw $s1, 0x68($sp) -/* 04DEA4 8004D2A4 00008025 */ move $s0, $zero -/* 04DEA8 8004D2A8 8FB2005C */ lw $s2, 0x5c($sp) -/* 04DEAC 8004D2AC 02D1001A */ div $zero, $s6, $s1 -/* 04DEB0 8004D2B0 0000A812 */ mflo $s5 -/* 04DEB4 8004D2B4 16200002 */ bnez $s1, .L8004D2C0 -/* 04DEB8 8004D2B8 00000000 */ nop -/* 04DEBC 8004D2BC 0007000D */ break 7 -.L8004D2C0: -/* 04DEC0 8004D2C0 2401FFFF */ li $at, -1 -/* 04DEC4 8004D2C4 16210004 */ bne $s1, $at, .L8004D2D8 -/* 04DEC8 8004D2C8 3C018000 */ lui $at, 0x8000 -/* 04DECC 8004D2CC 16C10002 */ bne $s6, $at, .L8004D2D8 -/* 04DED0 8004D2D0 00000000 */ nop -/* 04DED4 8004D2D4 0006000D */ break 6 -.L8004D2D8: -/* 04DED8 8004D2D8 5AA0001E */ blezl $s5, .L8004D354 -/* 04DEDC 8004D2DC 8FBF003C */ lw $ra, 0x3c($sp) -/* 04DEE0 8004D2E0 02510019 */ multu $s2, $s1 -/* 04DEE4 8004D2E4 8FA90040 */ lw $t1, 0x40($sp) -/* 04DEE8 8004D2E8 06410003 */ bgez $s2, .L8004D2F8 -/* 04DEEC 8004D2EC 00125043 */ sra $t2, $s2, 1 -/* 04DEF0 8004D2F0 26410001 */ addiu $at, $s2, 1 -/* 04DEF4 8004D2F4 00015043 */ sra $t2, $at, 1 -.L8004D2F8: -/* 04DEF8 8004D2F8 012AB023 */ subu $s6, $t1, $t2 -/* 04DEFC 8004D2FC 0000B812 */ mflo $s7 -/* 04DF00 8004D300 06E10003 */ bgez $s7, .L8004D310 -/* 04DF04 8004D304 00175843 */ sra $t3, $s7, 1 -/* 04DF08 8004D308 26E10001 */ addiu $at, $s7, 1 -/* 04DF0C 8004D30C 00015843 */ sra $t3, $at, 1 -.L8004D310: -/* 04DF10 8004D310 0160B825 */ move $s7, $t3 -.L8004D314: -/* 04DF14 8004D314 02802025 */ move $a0, $s4 -/* 04DF18 8004D318 02402825 */ move $a1, $s2 -/* 04DF1C 8004D31C 0C011249 */ jal func_80044924 -/* 04DF20 8004D320 02203025 */ move $a2, $s1 -/* 04DF24 8004D324 240C0001 */ li $t4, 1 -/* 04DF28 8004D328 AFAC0010 */ sw $t4, 0x10($sp) -/* 04DF2C 8004D32C 02C02025 */ move $a0, $s6 -/* 04DF30 8004D330 02602825 */ move $a1, $s3 -/* 04DF34 8004D334 02403025 */ move $a2, $s2 -/* 04DF38 8004D338 0C012E5F */ jal func_8004B97C -/* 04DF3C 8004D33C 02203825 */ move $a3, $s1 -/* 04DF40 8004D340 26100001 */ addiu $s0, $s0, 1 -/* 04DF44 8004D344 0297A021 */ addu $s4, $s4, $s7 -/* 04DF48 8004D348 1615FFF2 */ bne $s0, $s5, .L8004D314 -/* 04DF4C 8004D34C 02719821 */ addu $s3, $s3, $s1 -/* 04DF50 8004D350 8FBF003C */ lw $ra, 0x3c($sp) -.L8004D354: -/* 04DF54 8004D354 8FB0001C */ lw $s0, 0x1c($sp) -/* 04DF58 8004D358 8FB10020 */ lw $s1, 0x20($sp) -/* 04DF5C 8004D35C 8FB20024 */ lw $s2, 0x24($sp) -/* 04DF60 8004D360 8FB30028 */ lw $s3, 0x28($sp) -/* 04DF64 8004D364 8FB4002C */ lw $s4, 0x2c($sp) -/* 04DF68 8004D368 8FB50030 */ lw $s5, 0x30($sp) -/* 04DF6C 8004D36C 8FB60034 */ lw $s6, 0x34($sp) -/* 04DF70 8004D370 8FB70038 */ lw $s7, 0x38($sp) -/* 04DF74 8004D374 03E00008 */ jr $ra -/* 04DF78 8004D378 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004D37C.s b/asm/non_matchings/code_800431B0/func_8004D37C.s deleted file mode 100644 index 3efdd4f8b..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D37C.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_8004D37C -/* 04DF7C 8004D37C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04DF80 8004D380 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04DF84 8004D384 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04DF88 8004D388 AFB60034 */ sw $s6, 0x34($sp) -/* 04DF8C 8004D38C 8FB60060 */ lw $s6, 0x60($sp) -/* 04DF90 8004D390 8D030000 */ lw $v1, ($t0) -/* 04DF94 8004D394 AFBF003C */ sw $ra, 0x3c($sp) -/* 04DF98 8004D398 AFB70038 */ sw $s7, 0x38($sp) -/* 04DF9C 8004D39C 246F0008 */ addiu $t7, $v1, 8 -/* 04DFA0 8004D3A0 AFB50030 */ sw $s5, 0x30($sp) -/* 04DFA4 8004D3A4 AFB4002C */ sw $s4, 0x2c($sp) -/* 04DFA8 8004D3A8 AFB30028 */ sw $s3, 0x28($sp) -/* 04DFAC 8004D3AC AFB20024 */ sw $s2, 0x24($sp) -/* 04DFB0 8004D3B0 AFB10020 */ sw $s1, 0x20($sp) -/* 04DFB4 8004D3B4 AFB0001C */ sw $s0, 0x1c($sp) -/* 04DFB8 8004D3B8 AFA40040 */ sw $a0, 0x40($sp) -/* 04DFBC 8004D3BC AD0F0000 */ sw $t7, ($t0) -/* 04DFC0 8004D3C0 3C190D00 */ lui $t9, %hi(D_0D007FE0) # $t9, 0xd00 -/* 04DFC4 8004D3C4 27397FE0 */ addiu $t9, %lo(D_0D007FE0) # addiu $t9, $t9, 0x7fe0 -/* 04DFC8 8004D3C8 3C180600 */ lui $t8, 0x600 -/* 04DFCC 8004D3CC AC780000 */ sw $t8, ($v1) -/* 04DFD0 8004D3D0 AC790004 */ sw $t9, 4($v1) -/* 04DFD4 8004D3D4 00A08025 */ move $s0, $a1 -/* 04DFD8 8004D3D8 00C08825 */ move $s1, $a2 -/* 04DFDC 8004D3DC 00E09025 */ move $s2, $a3 -/* 04DFE0 8004D3E0 06C10003 */ bgez $s6, .L8004D3F0 -/* 04DFE4 8004D3E4 00167043 */ sra $t6, $s6, 1 -/* 04DFE8 8004D3E8 26C10001 */ addiu $at, $s6, 1 -/* 04DFEC 8004D3EC 00017043 */ sra $t6, $at, 1 -.L8004D3F0: -/* 04DFF0 8004D3F0 020E9823 */ subu $s3, $s0, $t6 -/* 04DFF4 8004D3F4 0220A025 */ move $s4, $s1 -/* 04DFF8 8004D3F8 02402025 */ move $a0, $s2 -/* 04DFFC 8004D3FC 8FA70058 */ lw $a3, 0x58($sp) -/* 04E000 8004D400 8FA60054 */ lw $a2, 0x54($sp) -/* 04E004 8004D404 0C012D05 */ jal func_8004B414 -/* 04E008 8004D408 8FA50050 */ lw $a1, 0x50($sp) -/* 04E00C 8004D40C 8FB10068 */ lw $s1, 0x68($sp) -/* 04E010 8004D410 00008025 */ move $s0, $zero -/* 04E014 8004D414 8FB2005C */ lw $s2, 0x5c($sp) -/* 04E018 8004D418 02D1001A */ div $zero, $s6, $s1 -/* 04E01C 8004D41C 0000A812 */ mflo $s5 -/* 04E020 8004D420 16200002 */ bnez $s1, .L8004D42C -/* 04E024 8004D424 00000000 */ nop -/* 04E028 8004D428 0007000D */ break 7 -.L8004D42C: -/* 04E02C 8004D42C 2401FFFF */ li $at, -1 -/* 04E030 8004D430 16210004 */ bne $s1, $at, .L8004D444 -/* 04E034 8004D434 3C018000 */ lui $at, 0x8000 -/* 04E038 8004D438 16C10002 */ bne $s6, $at, .L8004D444 -/* 04E03C 8004D43C 00000000 */ nop -/* 04E040 8004D440 0006000D */ break 6 -.L8004D444: -/* 04E044 8004D444 5AA0001E */ blezl $s5, .L8004D4C0 -/* 04E048 8004D448 8FBF003C */ lw $ra, 0x3c($sp) -/* 04E04C 8004D44C 02510019 */ multu $s2, $s1 -/* 04E050 8004D450 8FA90040 */ lw $t1, 0x40($sp) -/* 04E054 8004D454 06410003 */ bgez $s2, .L8004D464 -/* 04E058 8004D458 00125043 */ sra $t2, $s2, 1 -/* 04E05C 8004D45C 26410001 */ addiu $at, $s2, 1 -/* 04E060 8004D460 00015043 */ sra $t2, $at, 1 -.L8004D464: -/* 04E064 8004D464 012AB023 */ subu $s6, $t1, $t2 -/* 04E068 8004D468 0000B812 */ mflo $s7 -/* 04E06C 8004D46C 06E10003 */ bgez $s7, .L8004D47C -/* 04E070 8004D470 00175843 */ sra $t3, $s7, 1 -/* 04E074 8004D474 26E10001 */ addiu $at, $s7, 1 -/* 04E078 8004D478 00015843 */ sra $t3, $at, 1 -.L8004D47C: -/* 04E07C 8004D47C 0160B825 */ move $s7, $t3 -.L8004D480: -/* 04E080 8004D480 02802025 */ move $a0, $s4 -/* 04E084 8004D484 02402825 */ move $a1, $s2 -/* 04E088 8004D488 0C0113CD */ jal func_80044F34 -/* 04E08C 8004D48C 02203025 */ move $a2, $s1 -/* 04E090 8004D490 240C0001 */ li $t4, 1 -/* 04E094 8004D494 AFAC0010 */ sw $t4, 0x10($sp) -/* 04E098 8004D498 02C02025 */ move $a0, $s6 -/* 04E09C 8004D49C 02602825 */ move $a1, $s3 -/* 04E0A0 8004D4A0 02403025 */ move $a2, $s2 -/* 04E0A4 8004D4A4 0C012E5F */ jal func_8004B97C -/* 04E0A8 8004D4A8 02203825 */ move $a3, $s1 -/* 04E0AC 8004D4AC 26100001 */ addiu $s0, $s0, 1 -/* 04E0B0 8004D4B0 0297A021 */ addu $s4, $s4, $s7 -/* 04E0B4 8004D4B4 1615FFF2 */ bne $s0, $s5, .L8004D480 -/* 04E0B8 8004D4B8 02719821 */ addu $s3, $s3, $s1 -/* 04E0BC 8004D4BC 8FBF003C */ lw $ra, 0x3c($sp) -.L8004D4C0: -/* 04E0C0 8004D4C0 8FB0001C */ lw $s0, 0x1c($sp) -/* 04E0C4 8004D4C4 8FB10020 */ lw $s1, 0x20($sp) -/* 04E0C8 8004D4C8 8FB20024 */ lw $s2, 0x24($sp) -/* 04E0CC 8004D4CC 8FB30028 */ lw $s3, 0x28($sp) -/* 04E0D0 8004D4D0 8FB4002C */ lw $s4, 0x2c($sp) -/* 04E0D4 8004D4D4 8FB50030 */ lw $s5, 0x30($sp) -/* 04E0D8 8004D4D8 8FB60034 */ lw $s6, 0x34($sp) -/* 04E0DC 8004D4DC 8FB70038 */ lw $s7, 0x38($sp) -/* 04E0E0 8004D4E0 03E00008 */ jr $ra -/* 04E0E4 8004D4E4 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004D4E8.s b/asm/non_matchings/code_800431B0/func_8004D4E8.s deleted file mode 100644 index 2be45776f..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D4E8.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_8004D4E8 -/* 04E0E8 8004D4E8 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04E0EC 8004D4EC 3C088015 */ lui $t0, %hi(gDisplayListHead) # $t0, 0x8015 -/* 04E0F0 8004D4F0 25080298 */ addiu $t0, %lo(gDisplayListHead) # addiu $t0, $t0, 0x298 -/* 04E0F4 8004D4F4 AFB60034 */ sw $s6, 0x34($sp) -/* 04E0F8 8004D4F8 8FB60060 */ lw $s6, 0x60($sp) -/* 04E0FC 8004D4FC 8D030000 */ lw $v1, ($t0) -/* 04E100 8004D500 AFBF003C */ sw $ra, 0x3c($sp) -/* 04E104 8004D504 AFB70038 */ sw $s7, 0x38($sp) -/* 04E108 8004D508 246F0008 */ addiu $t7, $v1, 8 -/* 04E10C 8004D50C AFB50030 */ sw $s5, 0x30($sp) -/* 04E110 8004D510 AFB4002C */ sw $s4, 0x2c($sp) -/* 04E114 8004D514 AFB30028 */ sw $s3, 0x28($sp) -/* 04E118 8004D518 AFB20024 */ sw $s2, 0x24($sp) -/* 04E11C 8004D51C AFB10020 */ sw $s1, 0x20($sp) -/* 04E120 8004D520 AFB0001C */ sw $s0, 0x1c($sp) -/* 04E124 8004D524 AFA40040 */ sw $a0, 0x40($sp) -/* 04E128 8004D528 AD0F0000 */ sw $t7, ($t0) -/* 04E12C 8004D52C 3C190D00 */ lui $t9, %hi(D_0D007FE0) # $t9, 0xd00 -/* 04E130 8004D530 27397FE0 */ addiu $t9, %lo(D_0D007FE0) # addiu $t9, $t9, 0x7fe0 -/* 04E134 8004D534 3C180600 */ lui $t8, 0x600 -/* 04E138 8004D538 AC780000 */ sw $t8, ($v1) -/* 04E13C 8004D53C AC790004 */ sw $t9, 4($v1) -/* 04E140 8004D540 00A08025 */ move $s0, $a1 -/* 04E144 8004D544 00C08825 */ move $s1, $a2 -/* 04E148 8004D548 00E09025 */ move $s2, $a3 -/* 04E14C 8004D54C 06C10003 */ bgez $s6, .L8004D55C -/* 04E150 8004D550 00167043 */ sra $t6, $s6, 1 -/* 04E154 8004D554 26C10001 */ addiu $at, $s6, 1 -/* 04E158 8004D558 00017043 */ sra $t6, $at, 1 -.L8004D55C: -/* 04E15C 8004D55C 020E9823 */ subu $s3, $s0, $t6 -/* 04E160 8004D560 0220A025 */ move $s4, $s1 -/* 04E164 8004D564 02402025 */ move $a0, $s2 -/* 04E168 8004D568 8FA70058 */ lw $a3, 0x58($sp) -/* 04E16C 8004D56C 8FA60054 */ lw $a2, 0x54($sp) -/* 04E170 8004D570 0C012D05 */ jal func_8004B414 -/* 04E174 8004D574 8FA50050 */ lw $a1, 0x50($sp) -/* 04E178 8004D578 8FB10068 */ lw $s1, 0x68($sp) -/* 04E17C 8004D57C 00008025 */ move $s0, $zero -/* 04E180 8004D580 8FB2005C */ lw $s2, 0x5c($sp) -/* 04E184 8004D584 02D1001A */ div $zero, $s6, $s1 -/* 04E188 8004D588 0000A812 */ mflo $s5 -/* 04E18C 8004D58C 16200002 */ bnez $s1, .L8004D598 -/* 04E190 8004D590 00000000 */ nop -/* 04E194 8004D594 0007000D */ break 7 -.L8004D598: -/* 04E198 8004D598 2401FFFF */ li $at, -1 -/* 04E19C 8004D59C 16210004 */ bne $s1, $at, .L8004D5B0 -/* 04E1A0 8004D5A0 3C018000 */ lui $at, 0x8000 -/* 04E1A4 8004D5A4 16C10002 */ bne $s6, $at, .L8004D5B0 -/* 04E1A8 8004D5A8 00000000 */ nop -/* 04E1AC 8004D5AC 0006000D */ break 6 -.L8004D5B0: -/* 04E1B0 8004D5B0 5AA0001E */ blezl $s5, .L8004D62C -/* 04E1B4 8004D5B4 8FBF003C */ lw $ra, 0x3c($sp) -/* 04E1B8 8004D5B8 02510019 */ multu $s2, $s1 -/* 04E1BC 8004D5BC 8FA90040 */ lw $t1, 0x40($sp) -/* 04E1C0 8004D5C0 06410003 */ bgez $s2, .L8004D5D0 -/* 04E1C4 8004D5C4 00125043 */ sra $t2, $s2, 1 -/* 04E1C8 8004D5C8 26410001 */ addiu $at, $s2, 1 -/* 04E1CC 8004D5CC 00015043 */ sra $t2, $at, 1 -.L8004D5D0: -/* 04E1D0 8004D5D0 012AB023 */ subu $s6, $t1, $t2 -/* 04E1D4 8004D5D4 0000B812 */ mflo $s7 -/* 04E1D8 8004D5D8 06E10003 */ bgez $s7, .L8004D5E8 -/* 04E1DC 8004D5DC 00175843 */ sra $t3, $s7, 1 -/* 04E1E0 8004D5E0 26E10001 */ addiu $at, $s7, 1 -/* 04E1E4 8004D5E4 00015843 */ sra $t3, $at, 1 -.L8004D5E8: -/* 04E1E8 8004D5E8 0160B825 */ move $s7, $t3 -.L8004D5EC: -/* 04E1EC 8004D5EC 02802025 */ move $a0, $s4 -/* 04E1F0 8004D5F0 02402825 */ move $a1, $s2 -/* 04E1F4 8004D5F4 0C011432 */ jal func_800450C8 -/* 04E1F8 8004D5F8 02203025 */ move $a2, $s1 -/* 04E1FC 8004D5FC 240C0001 */ li $t4, 1 -/* 04E200 8004D600 AFAC0010 */ sw $t4, 0x10($sp) -/* 04E204 8004D604 02C02025 */ move $a0, $s6 -/* 04E208 8004D608 02602825 */ move $a1, $s3 -/* 04E20C 8004D60C 02403025 */ move $a2, $s2 -/* 04E210 8004D610 0C012E82 */ jal func_8004BA08 -/* 04E214 8004D614 02203825 */ move $a3, $s1 -/* 04E218 8004D618 26100001 */ addiu $s0, $s0, 1 -/* 04E21C 8004D61C 0297A021 */ addu $s4, $s4, $s7 -/* 04E220 8004D620 1615FFF2 */ bne $s0, $s5, .L8004D5EC -/* 04E224 8004D624 02719821 */ addu $s3, $s3, $s1 -/* 04E228 8004D628 8FBF003C */ lw $ra, 0x3c($sp) -.L8004D62C: -/* 04E22C 8004D62C 8FB0001C */ lw $s0, 0x1c($sp) -/* 04E230 8004D630 8FB10020 */ lw $s1, 0x20($sp) -/* 04E234 8004D634 8FB20024 */ lw $s2, 0x24($sp) -/* 04E238 8004D638 8FB30028 */ lw $s3, 0x28($sp) -/* 04E23C 8004D63C 8FB4002C */ lw $s4, 0x2c($sp) -/* 04E240 8004D640 8FB50030 */ lw $s5, 0x30($sp) -/* 04E244 8004D644 8FB60034 */ lw $s6, 0x34($sp) -/* 04E248 8004D648 8FB70038 */ lw $s7, 0x38($sp) -/* 04E24C 8004D64C 03E00008 */ jr $ra -/* 04E250 8004D650 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004D7B4.s b/asm/non_matchings/code_800431B0/func_8004D7B4.s deleted file mode 100644 index 87b7c67bf..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D7B4.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel func_8004D7B4 -/* 04E3B4 8004D7B4 27BDFF70 */ addiu $sp, $sp, -0x90 -/* 04E3B8 8004D7B8 3C088016 */ lui $t0, %hi(D_801656B0) # $t0, 0x8016 -/* 04E3BC 8004D7BC 250856B0 */ addiu $t0, %lo(D_801656B0) # addiu $t0, $t0, 0x56b0 -/* 04E3C0 8004D7C0 3C0F8016 */ lui $t7, %hi(D_80165710) # $t7, 0x8016 -/* 04E3C4 8004D7C4 85EF5710 */ lh $t7, %lo(D_80165710)($t7) -/* 04E3C8 8004D7C8 950E0000 */ lhu $t6, ($t0) -/* 04E3CC 8004D7CC AFBE0050 */ sw $fp, 0x50($sp) -/* 04E3D0 8004D7D0 8FBE00A0 */ lw $fp, 0xa0($sp) -/* 04E3D4 8004D7D4 01CFC021 */ addu $t8, $t6, $t7 -/* 04E3D8 8004D7D8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 04E3DC 8004D7DC 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04E3E0 8004D7E0 A5180000 */ sh $t8, ($t0) -/* 04E3E4 8004D7E4 3C018019 */ lui $at, %hi(D_8018D00C) # $at, 0x8019 -/* 04E3E8 8004D7E8 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04E3EC 8004D7EC C434D00C */ lwc1 $f20, %lo(D_8018D00C)($at) -/* 04E3F0 8004D7F0 8D230000 */ lw $v1, ($t1) -/* 04E3F4 8004D7F4 AFB7004C */ sw $s7, 0x4c($sp) -/* 04E3F8 8004D7F8 3C178016 */ lui $s7, %hi(D_80165708) # $s7, 0x8016 -/* 04E3FC 8004D7FC AFB60048 */ sw $s6, 0x48($sp) -/* 04E400 8004D800 AFB40040 */ sw $s4, 0x40($sp) -/* 04E404 8004D804 AFB3003C */ sw $s3, 0x3c($sp) -/* 04E408 8004D808 AFB20038 */ sw $s2, 0x38($sp) -/* 04E40C 8004D80C AFB10034 */ sw $s1, 0x34($sp) -/* 04E410 8004D810 86F75708 */ lh $s7, %lo(D_80165708)($s7) -/* 04E414 8004D814 3C0C0D00 */ lui $t4, %hi(D_0D007FE0) # $t4, 0xd00 -/* 04E418 8004D818 246A0008 */ addiu $t2, $v1, 8 -/* 04E41C 8004D81C AFBF0054 */ sw $ra, 0x54($sp) -/* 04E420 8004D820 AFB50044 */ sw $s5, 0x44($sp) -/* 04E424 8004D824 AFB00030 */ sw $s0, 0x30($sp) -/* 04E428 8004D828 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 04E42C 8004D82C 85110000 */ lh $s1, ($t0) -/* 04E430 8004D830 AD2A0000 */ sw $t2, ($t1) -/* 04E434 8004D834 258C7FE0 */ addiu $t4, %lo(D_0D007FE0) # addiu $t4, $t4, 0x7fe0 -/* 04E438 8004D838 3C0B0600 */ lui $t3, 0x600 -/* 04E43C 8004D83C 00E0B025 */ move $s6, $a3 -/* 04E440 8004D840 00C09025 */ move $s2, $a2 -/* 04E444 8004D844 07C10003 */ bgez $fp, .L8004D854 -/* 04E448 8004D848 001EC843 */ sra $t9, $fp, 1 -/* 04E44C 8004D84C 27C10001 */ addiu $at, $fp, 1 -/* 04E450 8004D850 0001C843 */ sra $t9, $at, 1 -.L8004D854: -/* 04E454 8004D854 00B99823 */ subu $s3, $a1, $t9 -/* 04E458 8004D858 0000A025 */ move $s4, $zero -/* 04E45C 8004D85C AC6B0000 */ sw $t3, ($v1) -/* 04E460 8004D860 1BC00028 */ blez $fp, .L8004D904 -/* 04E464 8004D864 AC6C0004 */ sw $t4, 4($v1) -/* 04E468 8004D868 00166840 */ sll $t5, $s6, 1 -/* 04E46C 8004D86C AFAD005C */ sw $t5, 0x5c($sp) -/* 04E470 8004D870 06C10003 */ bgez $s6, .L8004D880 -/* 04E474 8004D874 00167043 */ sra $t6, $s6, 1 -/* 04E478 8004D878 26C10001 */ addiu $at, $s6, 1 -/* 04E47C 8004D87C 00017043 */ sra $t6, $at, 1 -.L8004D880: -/* 04E480 8004D880 008E7823 */ subu $t7, $a0, $t6 -/* 04E484 8004D884 448F2000 */ mtc1 $t7, $f4 -/* 04E488 8004D888 00000000 */ nop -/* 04E48C 8004D88C 468025A0 */ cvt.s.w $f22, $f4 -.L8004D890: -/* 04E490 8004D890 3230FFFF */ andi $s0, $s1, 0xffff -/* 04E494 8004D894 0C0AE006 */ jal sins -/* 04E498 8004D898 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E49C 8004D89C 46140182 */ mul.s $f6, $f0, $f20 -/* 04E4A0 8004D8A0 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E4A4 8004D8A4 46163200 */ add.s $f8, $f6, $f22 -/* 04E4A8 8004D8A8 4600428D */ trunc.w.s $f10, $f8 -/* 04E4AC 8004D8AC 44155000 */ mfc1 $s5, $f10 -/* 04E4B0 8004D8B0 0C0AE006 */ jal sins -/* 04E4B4 8004D8B4 00000000 */ nop -/* 04E4B8 8004D8B8 02402025 */ move $a0, $s2 -/* 04E4BC 8004D8BC 02C02825 */ move $a1, $s6 -/* 04E4C0 8004D8C0 0C011078 */ jal func_800441E0 -/* 04E4C4 8004D8C4 24060001 */ li $a2, 1 -/* 04E4C8 8004D8C8 24190001 */ li $t9, 1 -/* 04E4CC 8004D8CC AFB90010 */ sw $t9, 0x10($sp) -/* 04E4D0 8004D8D0 02A02025 */ move $a0, $s5 -/* 04E4D4 8004D8D4 02602825 */ move $a1, $s3 -/* 04E4D8 8004D8D8 02C03025 */ move $a2, $s6 -/* 04E4DC 8004D8DC 0C012E5F */ jal func_8004B97C -/* 04E4E0 8004D8E0 24070001 */ li $a3, 1 -/* 04E4E4 8004D8E4 8FAC005C */ lw $t4, 0x5c($sp) -/* 04E4E8 8004D8E8 02378821 */ addu $s1, $s1, $s7 -/* 04E4EC 8004D8EC 26940001 */ addiu $s4, $s4, 1 -/* 04E4F0 8004D8F0 00115400 */ sll $t2, $s1, 0x10 -/* 04E4F4 8004D8F4 000A8C03 */ sra $s1, $t2, 0x10 -/* 04E4F8 8004D8F8 26730001 */ addiu $s3, $s3, 1 -/* 04E4FC 8004D8FC 169EFFE4 */ bne $s4, $fp, .L8004D890 -/* 04E500 8004D900 024C9021 */ addu $s2, $s2, $t4 -.L8004D904: -/* 04E504 8004D904 8FBF0054 */ lw $ra, 0x54($sp) -/* 04E508 8004D908 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 04E50C 8004D90C D7B60028 */ ldc1 $f22, 0x28($sp) -/* 04E510 8004D910 8FB00030 */ lw $s0, 0x30($sp) -/* 04E514 8004D914 8FB10034 */ lw $s1, 0x34($sp) -/* 04E518 8004D918 8FB20038 */ lw $s2, 0x38($sp) -/* 04E51C 8004D91C 8FB3003C */ lw $s3, 0x3c($sp) -/* 04E520 8004D920 8FB40040 */ lw $s4, 0x40($sp) -/* 04E524 8004D924 8FB50044 */ lw $s5, 0x44($sp) -/* 04E528 8004D928 8FB60048 */ lw $s6, 0x48($sp) -/* 04E52C 8004D92C 8FB7004C */ lw $s7, 0x4c($sp) -/* 04E530 8004D930 8FBE0050 */ lw $fp, 0x50($sp) -/* 04E534 8004D934 03E00008 */ jr $ra -/* 04E538 8004D938 27BD0090 */ addiu $sp, $sp, 0x90 diff --git a/asm/non_matchings/code_800431B0/func_8004D93C.s b/asm/non_matchings/code_800431B0/func_8004D93C.s deleted file mode 100644 index 50975e3dc..000000000 --- a/asm/non_matchings/code_800431B0/func_8004D93C.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_8004D93C -/* 04E53C 8004D93C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 04E540 8004D940 3C088016 */ lui $t0, %hi(D_801656B0) # $t0, 0x8016 -/* 04E544 8004D944 250856B0 */ addiu $t0, %lo(D_801656B0) # addiu $t0, $t0, 0x56b0 -/* 04E548 8004D948 3C0F8016 */ lui $t7, %hi(D_80165710) # $t7, 0x8016 -/* 04E54C 8004D94C 85EF5710 */ lh $t7, %lo(D_80165710)($t7) -/* 04E550 8004D950 950E0000 */ lhu $t6, ($t0) -/* 04E554 8004D954 AFBE0050 */ sw $fp, 0x50($sp) -/* 04E558 8004D958 8FBE0068 */ lw $fp, 0x68($sp) -/* 04E55C 8004D95C 01CFC021 */ addu $t8, $t6, $t7 -/* 04E560 8004D960 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 04E564 8004D964 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04E568 8004D968 A5180000 */ sh $t8, ($t0) -/* 04E56C 8004D96C 3C018019 */ lui $at, %hi(D_8018D00C) # $at, 0x8019 -/* 04E570 8004D970 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04E574 8004D974 C434D00C */ lwc1 $f20, %lo(D_8018D00C)($at) -/* 04E578 8004D978 8D230000 */ lw $v1, ($t1) -/* 04E57C 8004D97C AFB7004C */ sw $s7, 0x4c($sp) -/* 04E580 8004D980 3C178016 */ lui $s7, %hi(D_80165708) # $s7, 0x8016 -/* 04E584 8004D984 AFB50044 */ sw $s5, 0x44($sp) -/* 04E588 8004D988 AFB40040 */ sw $s4, 0x40($sp) -/* 04E58C 8004D98C AFB3003C */ sw $s3, 0x3c($sp) -/* 04E590 8004D990 AFB20038 */ sw $s2, 0x38($sp) -/* 04E594 8004D994 AFB10034 */ sw $s1, 0x34($sp) -/* 04E598 8004D998 86F75708 */ lh $s7, %lo(D_80165708)($s7) -/* 04E59C 8004D99C 3C0C0D00 */ lui $t4, %hi(D_0D007FE0) # $t4, 0xd00 -/* 04E5A0 8004D9A0 246A0008 */ addiu $t2, $v1, 8 -/* 04E5A4 8004D9A4 AFBF0054 */ sw $ra, 0x54($sp) -/* 04E5A8 8004D9A8 AFB60048 */ sw $s6, 0x48($sp) -/* 04E5AC 8004D9AC AFB00030 */ sw $s0, 0x30($sp) -/* 04E5B0 8004D9B0 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 04E5B4 8004D9B4 85110000 */ lh $s1, ($t0) -/* 04E5B8 8004D9B8 AD2A0000 */ sw $t2, ($t1) -/* 04E5BC 8004D9BC 258C7FE0 */ addiu $t4, %lo(D_0D007FE0) # addiu $t4, $t4, 0x7fe0 -/* 04E5C0 8004D9C0 3C0B0600 */ lui $t3, 0x600 -/* 04E5C4 8004D9C4 00E09825 */ move $s3, $a3 -/* 04E5C8 8004D9C8 00C09025 */ move $s2, $a2 -/* 04E5CC 8004D9CC 07C10003 */ bgez $fp, .L8004D9DC -/* 04E5D0 8004D9D0 001EC843 */ sra $t9, $fp, 1 -/* 04E5D4 8004D9D4 27C10001 */ addiu $at, $fp, 1 -/* 04E5D8 8004D9D8 0001C843 */ sra $t9, $at, 1 -.L8004D9DC: -/* 04E5DC 8004D9DC 00B9A023 */ subu $s4, $a1, $t9 -/* 04E5E0 8004D9E0 0000A825 */ move $s5, $zero -/* 04E5E4 8004D9E4 AC6B0000 */ sw $t3, ($v1) -/* 04E5E8 8004D9E8 1BC00025 */ blez $fp, .L8004DA80 -/* 04E5EC 8004D9EC AC6C0004 */ sw $t4, 4($v1) -/* 04E5F0 8004D9F0 06610003 */ bgez $s3, .L8004DA00 -/* 04E5F4 8004D9F4 00136843 */ sra $t5, $s3, 1 -/* 04E5F8 8004D9F8 26610001 */ addiu $at, $s3, 1 -/* 04E5FC 8004D9FC 00016843 */ sra $t5, $at, 1 -.L8004DA00: -/* 04E600 8004DA00 008D7023 */ subu $t6, $a0, $t5 -/* 04E604 8004DA04 448E2000 */ mtc1 $t6, $f4 -/* 04E608 8004DA08 00000000 */ nop -/* 04E60C 8004DA0C 468025A0 */ cvt.s.w $f22, $f4 -.L8004DA10: -/* 04E610 8004DA10 3230FFFF */ andi $s0, $s1, 0xffff -/* 04E614 8004DA14 0C0AE006 */ jal sins -/* 04E618 8004DA18 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E61C 8004DA1C 46140182 */ mul.s $f6, $f0, $f20 -/* 04E620 8004DA20 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E624 8004DA24 46163200 */ add.s $f8, $f6, $f22 -/* 04E628 8004DA28 4600428D */ trunc.w.s $f10, $f8 -/* 04E62C 8004DA2C 44165000 */ mfc1 $s6, $f10 -/* 04E630 8004DA30 0C0AE006 */ jal sins -/* 04E634 8004DA34 00000000 */ nop -/* 04E638 8004DA38 02402025 */ move $a0, $s2 -/* 04E63C 8004DA3C 02602825 */ move $a1, $s3 -/* 04E640 8004DA40 0C01112C */ jal func_800444B0 -/* 04E644 8004DA44 24060001 */ li $a2, 1 -/* 04E648 8004DA48 24180001 */ li $t8, 1 -/* 04E64C 8004DA4C AFB80010 */ sw $t8, 0x10($sp) -/* 04E650 8004DA50 02C02025 */ move $a0, $s6 -/* 04E654 8004DA54 02802825 */ move $a1, $s4 -/* 04E658 8004DA58 02603025 */ move $a2, $s3 -/* 04E65C 8004DA5C 0C012E5F */ jal func_8004B97C -/* 04E660 8004DA60 24070001 */ li $a3, 1 -/* 04E664 8004DA64 02378821 */ addu $s1, $s1, $s7 -/* 04E668 8004DA68 26B50001 */ addiu $s5, $s5, 1 -/* 04E66C 8004DA6C 0011CC00 */ sll $t9, $s1, 0x10 -/* 04E670 8004DA70 00198C03 */ sra $s1, $t9, 0x10 -/* 04E674 8004DA74 02539021 */ addu $s2, $s2, $s3 -/* 04E678 8004DA78 16BEFFE5 */ bne $s5, $fp, .L8004DA10 -/* 04E67C 8004DA7C 26940001 */ addiu $s4, $s4, 1 -.L8004DA80: -/* 04E680 8004DA80 8FBF0054 */ lw $ra, 0x54($sp) -/* 04E684 8004DA84 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 04E688 8004DA88 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 04E68C 8004DA8C 8FB00030 */ lw $s0, 0x30($sp) -/* 04E690 8004DA90 8FB10034 */ lw $s1, 0x34($sp) -/* 04E694 8004DA94 8FB20038 */ lw $s2, 0x38($sp) -/* 04E698 8004DA98 8FB3003C */ lw $s3, 0x3c($sp) -/* 04E69C 8004DA9C 8FB40040 */ lw $s4, 0x40($sp) -/* 04E6A0 8004DAA0 8FB50044 */ lw $s5, 0x44($sp) -/* 04E6A4 8004DAA4 8FB60048 */ lw $s6, 0x48($sp) -/* 04E6A8 8004DAA8 8FB7004C */ lw $s7, 0x4c($sp) -/* 04E6AC 8004DAAC 8FBE0050 */ lw $fp, 0x50($sp) -/* 04E6B0 8004DAB0 03E00008 */ jr $ra -/* 04E6B4 8004DAB4 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_800431B0/func_8004DAB8.s b/asm/non_matchings/code_800431B0/func_8004DAB8.s deleted file mode 100644 index 111fbb49b..000000000 --- a/asm/non_matchings/code_800431B0/func_8004DAB8.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_8004DAB8 -/* 04E6B8 8004DAB8 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 04E6BC 8004DABC 3C088016 */ lui $t0, %hi(D_801656B0) # $t0, 0x8016 -/* 04E6C0 8004DAC0 250856B0 */ addiu $t0, %lo(D_801656B0) # addiu $t0, $t0, 0x56b0 -/* 04E6C4 8004DAC4 3C0F8016 */ lui $t7, %hi(D_80165710) # $t7, 0x8016 -/* 04E6C8 8004DAC8 85EF5710 */ lh $t7, %lo(D_80165710)($t7) -/* 04E6CC 8004DACC 950E0000 */ lhu $t6, ($t0) -/* 04E6D0 8004DAD0 AFBE0050 */ sw $fp, 0x50($sp) -/* 04E6D4 8004DAD4 8FBE0068 */ lw $fp, 0x68($sp) -/* 04E6D8 8004DAD8 01CFC021 */ addu $t8, $t6, $t7 -/* 04E6DC 8004DADC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 04E6E0 8004DAE0 3C098015 */ lui $t1, %hi(gDisplayListHead) # $t1, 0x8015 -/* 04E6E4 8004DAE4 A5180000 */ sh $t8, ($t0) -/* 04E6E8 8004DAE8 3C018019 */ lui $at, %hi(D_8018D00C) # $at, 0x8019 -/* 04E6EC 8004DAEC 25290298 */ addiu $t1, %lo(gDisplayListHead) # addiu $t1, $t1, 0x298 -/* 04E6F0 8004DAF0 C434D00C */ lwc1 $f20, %lo(D_8018D00C)($at) -/* 04E6F4 8004DAF4 8D230000 */ lw $v1, ($t1) -/* 04E6F8 8004DAF8 AFB7004C */ sw $s7, 0x4c($sp) -/* 04E6FC 8004DAFC 3C178016 */ lui $s7, %hi(D_80165708) # $s7, 0x8016 -/* 04E700 8004DB00 AFB50044 */ sw $s5, 0x44($sp) -/* 04E704 8004DB04 AFB40040 */ sw $s4, 0x40($sp) -/* 04E708 8004DB08 AFB3003C */ sw $s3, 0x3c($sp) -/* 04E70C 8004DB0C AFB20038 */ sw $s2, 0x38($sp) -/* 04E710 8004DB10 AFB10034 */ sw $s1, 0x34($sp) -/* 04E714 8004DB14 86F75708 */ lh $s7, %lo(D_80165708)($s7) -/* 04E718 8004DB18 3C0C0D00 */ lui $t4, %hi(D_0D007FE0) # $t4, 0xd00 -/* 04E71C 8004DB1C 246A0008 */ addiu $t2, $v1, 8 -/* 04E720 8004DB20 AFBF0054 */ sw $ra, 0x54($sp) -/* 04E724 8004DB24 AFB60048 */ sw $s6, 0x48($sp) -/* 04E728 8004DB28 AFB00030 */ sw $s0, 0x30($sp) -/* 04E72C 8004DB2C F7B60028 */ sdc1 $f22, 0x28($sp) -/* 04E730 8004DB30 85110000 */ lh $s1, ($t0) -/* 04E734 8004DB34 AD2A0000 */ sw $t2, ($t1) -/* 04E738 8004DB38 258C7FE0 */ addiu $t4, %lo(D_0D007FE0) # addiu $t4, $t4, 0x7fe0 -/* 04E73C 8004DB3C 3C0B0600 */ lui $t3, 0x600 -/* 04E740 8004DB40 00E09825 */ move $s3, $a3 -/* 04E744 8004DB44 00C09025 */ move $s2, $a2 -/* 04E748 8004DB48 07C10003 */ bgez $fp, .L8004DB58 -/* 04E74C 8004DB4C 001EC843 */ sra $t9, $fp, 1 -/* 04E750 8004DB50 27C10001 */ addiu $at, $fp, 1 -/* 04E754 8004DB54 0001C843 */ sra $t9, $at, 1 -.L8004DB58: -/* 04E758 8004DB58 00B9A023 */ subu $s4, $a1, $t9 -/* 04E75C 8004DB5C 0000A825 */ move $s5, $zero -/* 04E760 8004DB60 AC6B0000 */ sw $t3, ($v1) -/* 04E764 8004DB64 1BC00025 */ blez $fp, .L8004DBFC -/* 04E768 8004DB68 AC6C0004 */ sw $t4, 4($v1) -/* 04E76C 8004DB6C 06610003 */ bgez $s3, .L8004DB7C -/* 04E770 8004DB70 00136843 */ sra $t5, $s3, 1 -/* 04E774 8004DB74 26610001 */ addiu $at, $s3, 1 -/* 04E778 8004DB78 00016843 */ sra $t5, $at, 1 -.L8004DB7C: -/* 04E77C 8004DB7C 008D7023 */ subu $t6, $a0, $t5 -/* 04E780 8004DB80 448E2000 */ mtc1 $t6, $f4 -/* 04E784 8004DB84 00000000 */ nop -/* 04E788 8004DB88 468025A0 */ cvt.s.w $f22, $f4 -.L8004DB8C: -/* 04E78C 8004DB8C 3230FFFF */ andi $s0, $s1, 0xffff -/* 04E790 8004DB90 0C0AE006 */ jal sins -/* 04E794 8004DB94 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E798 8004DB98 46140182 */ mul.s $f6, $f0, $f20 -/* 04E79C 8004DB9C 3204FFFF */ andi $a0, $s0, 0xffff -/* 04E7A0 8004DBA0 46163200 */ add.s $f8, $f6, $f22 -/* 04E7A4 8004DBA4 4600428D */ trunc.w.s $f10, $f8 -/* 04E7A8 8004DBA8 44165000 */ mfc1 $s6, $f10 -/* 04E7AC 8004DBAC 0C0AE006 */ jal sins -/* 04E7B0 8004DBB0 00000000 */ nop -/* 04E7B4 8004DBB4 02402025 */ move $a0, $s2 -/* 04E7B8 8004DBB8 02602825 */ move $a1, $s3 -/* 04E7BC 8004DBBC 0C011249 */ jal func_80044924 -/* 04E7C0 8004DBC0 24060001 */ li $a2, 1 -/* 04E7C4 8004DBC4 24180001 */ li $t8, 1 -/* 04E7C8 8004DBC8 AFB80010 */ sw $t8, 0x10($sp) -/* 04E7CC 8004DBCC 02C02025 */ move $a0, $s6 -/* 04E7D0 8004DBD0 02802825 */ move $a1, $s4 -/* 04E7D4 8004DBD4 02603025 */ move $a2, $s3 -/* 04E7D8 8004DBD8 0C012E5F */ jal func_8004B97C -/* 04E7DC 8004DBDC 24070001 */ li $a3, 1 -/* 04E7E0 8004DBE0 02378821 */ addu $s1, $s1, $s7 -/* 04E7E4 8004DBE4 26B50001 */ addiu $s5, $s5, 1 -/* 04E7E8 8004DBE8 0011CC00 */ sll $t9, $s1, 0x10 -/* 04E7EC 8004DBEC 00198C03 */ sra $s1, $t9, 0x10 -/* 04E7F0 8004DBF0 02539021 */ addu $s2, $s2, $s3 -/* 04E7F4 8004DBF4 16BEFFE5 */ bne $s5, $fp, .L8004DB8C -/* 04E7F8 8004DBF8 26940001 */ addiu $s4, $s4, 1 -.L8004DBFC: -/* 04E7FC 8004DBFC 8FBF0054 */ lw $ra, 0x54($sp) -/* 04E800 8004DC00 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 04E804 8004DC04 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 04E808 8004DC08 8FB00030 */ lw $s0, 0x30($sp) -/* 04E80C 8004DC0C 8FB10034 */ lw $s1, 0x34($sp) -/* 04E810 8004DC10 8FB20038 */ lw $s2, 0x38($sp) -/* 04E814 8004DC14 8FB3003C */ lw $s3, 0x3c($sp) -/* 04E818 8004DC18 8FB40040 */ lw $s4, 0x40($sp) -/* 04E81C 8004DC1C 8FB50044 */ lw $s5, 0x44($sp) -/* 04E820 8004DC20 8FB60048 */ lw $s6, 0x48($sp) -/* 04E824 8004DC24 8FB7004C */ lw $s7, 0x4c($sp) -/* 04E828 8004DC28 8FBE0050 */ lw $fp, 0x50($sp) -/* 04E82C 8004DC2C 03E00008 */ jr $ra -/* 04E830 8004DC30 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_800431B0/func_8004DF5C.s b/asm/non_matchings/code_800431B0/func_8004DF5C.s deleted file mode 100644 index 4f8fa15e8..000000000 --- a/asm/non_matchings/code_800431B0/func_8004DF5C.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_8004DF5C -/* 04EB5C 8004DF5C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 04EB60 8004DF60 AFB60034 */ sw $s6, 0x34($sp) -/* 04EB64 8004DF64 8FB60050 */ lw $s6, 0x50($sp) -/* 04EB68 8004DF68 AFB30028 */ sw $s3, 0x28($sp) -/* 04EB6C 8004DF6C 8FB30054 */ lw $s3, 0x54($sp) -/* 04EB70 8004DF70 AFB50030 */ sw $s5, 0x30($sp) -/* 04EB74 8004DF74 AFB4002C */ sw $s4, 0x2c($sp) -/* 04EB78 8004DF78 02D3001A */ div $zero, $s6, $s3 -/* 04EB7C 8004DF7C AFB20024 */ sw $s2, 0x24($sp) -/* 04EB80 8004DF80 AFB10020 */ sw $s1, 0x20($sp) -/* 04EB84 8004DF84 AFB0001C */ sw $s0, 0x1c($sp) -/* 04EB88 8004DF88 0000A812 */ mflo $s5 -/* 04EB8C 8004DF8C 00E0A025 */ move $s4, $a3 -/* 04EB90 8004DF90 AFBF003C */ sw $ra, 0x3c($sp) -/* 04EB94 8004DF94 AFB70038 */ sw $s7, 0x38($sp) -/* 04EB98 8004DF98 06C10003 */ bgez $s6, .L8004DFA8 -/* 04EB9C 8004DF9C 00167043 */ sra $t6, $s6, 1 -/* 04EBA0 8004DFA0 26C10001 */ addiu $at, $s6, 1 -/* 04EBA4 8004DFA4 00017043 */ sra $t6, $at, 1 -.L8004DFA8: -/* 04EBA8 8004DFA8 00AE8023 */ subu $s0, $a1, $t6 -/* 04EBAC 8004DFAC 00C08825 */ move $s1, $a2 -/* 04EBB0 8004DFB0 00009025 */ move $s2, $zero -/* 04EBB4 8004DFB4 16600002 */ bnez $s3, .L8004DFC0 -/* 04EBB8 8004DFB8 00000000 */ nop -/* 04EBBC 8004DFBC 0007000D */ break 7 -.L8004DFC0: -/* 04EBC0 8004DFC0 2401FFFF */ li $at, -1 -/* 04EBC4 8004DFC4 16610004 */ bne $s3, $at, .L8004DFD8 -/* 04EBC8 8004DFC8 3C018000 */ lui $at, 0x8000 -/* 04EBCC 8004DFCC 16C10002 */ bne $s6, $at, .L8004DFD8 -/* 04EBD0 8004DFD0 00000000 */ nop -/* 04EBD4 8004DFD4 0006000D */ break 6 -.L8004DFD8: -/* 04EBD8 8004DFD8 5AA0001A */ blezl $s5, .L8004E044 -/* 04EBDC 8004DFDC 8FBF003C */ lw $ra, 0x3c($sp) -/* 04EBE0 8004DFE0 02930019 */ multu $s4, $s3 -/* 04EBE4 8004DFE4 06810003 */ bgez $s4, .L8004DFF4 -/* 04EBE8 8004DFE8 00147843 */ sra $t7, $s4, 1 -/* 04EBEC 8004DFEC 26810001 */ addiu $at, $s4, 1 -/* 04EBF0 8004DFF0 00017843 */ sra $t7, $at, 1 -.L8004DFF4: -/* 04EBF4 8004DFF4 008FB023 */ subu $s6, $a0, $t7 -/* 04EBF8 8004DFF8 0000B812 */ mflo $s7 -/* 04EBFC 8004DFFC 00000000 */ nop -/* 04EC00 8004E000 00000000 */ nop -.L8004E004: -/* 04EC04 8004E004 02202025 */ move $a0, $s1 -/* 04EC08 8004E008 02802825 */ move $a1, $s4 -/* 04EC0C 8004E00C 0C0114A9 */ jal func_800452A4 -/* 04EC10 8004E010 02603025 */ move $a2, $s3 -/* 04EC14 8004E014 24180001 */ li $t8, 1 -/* 04EC18 8004E018 AFB80010 */ sw $t8, 0x10($sp) -/* 04EC1C 8004E01C 02C02025 */ move $a0, $s6 -/* 04EC20 8004E020 02002825 */ move $a1, $s0 -/* 04EC24 8004E024 02803025 */ move $a2, $s4 -/* 04EC28 8004E028 0C012E5F */ jal func_8004B97C -/* 04EC2C 8004E02C 02603825 */ move $a3, $s3 -/* 04EC30 8004E030 26520001 */ addiu $s2, $s2, 1 -/* 04EC34 8004E034 02378821 */ addu $s1, $s1, $s7 -/* 04EC38 8004E038 1655FFF2 */ bne $s2, $s5, .L8004E004 -/* 04EC3C 8004E03C 02138021 */ addu $s0, $s0, $s3 -/* 04EC40 8004E040 8FBF003C */ lw $ra, 0x3c($sp) -.L8004E044: -/* 04EC44 8004E044 8FB0001C */ lw $s0, 0x1c($sp) -/* 04EC48 8004E048 8FB10020 */ lw $s1, 0x20($sp) -/* 04EC4C 8004E04C 8FB20024 */ lw $s2, 0x24($sp) -/* 04EC50 8004E050 8FB30028 */ lw $s3, 0x28($sp) -/* 04EC54 8004E054 8FB4002C */ lw $s4, 0x2c($sp) -/* 04EC58 8004E058 8FB50030 */ lw $s5, 0x30($sp) -/* 04EC5C 8004E05C 8FB60034 */ lw $s6, 0x34($sp) -/* 04EC60 8004E060 8FB70038 */ lw $s7, 0x38($sp) -/* 04EC64 8004E064 03E00008 */ jr $ra -/* 04EC68 8004E068 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code_800431B0/func_8004E06C.s b/asm/non_matchings/code_800431B0/func_8004E06C.s deleted file mode 100644 index acdfb2de2..000000000 --- a/asm/non_matchings/code_800431B0/func_8004E06C.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_8004E06C -/* 04EC6C 8004E06C 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* 04EC70 8004E070 3C028016 */ lui $v0, %hi(D_801656B0) # $v0, 0x8016 -/* 04EC74 8004E074 244256B0 */ addiu $v0, %lo(D_801656B0) # addiu $v0, $v0, 0x56b0 -/* 04EC78 8004E078 3C0F8016 */ lui $t7, %hi(D_80165710) # $t7, 0x8016 -/* 04EC7C 8004E07C 85EF5710 */ lh $t7, %lo(D_80165710)($t7) -/* 04EC80 8004E080 944E0000 */ lhu $t6, ($v0) -/* 04EC84 8004E084 AFBE0050 */ sw $fp, 0x50($sp) -/* 04EC88 8004E088 8FBE0068 */ lw $fp, 0x68($sp) -/* 04EC8C 8004E08C 01CFC021 */ addu $t8, $t6, $t7 -/* 04EC90 8004E090 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 04EC94 8004E094 A4580000 */ sh $t8, ($v0) -/* 04EC98 8004E098 3C018019 */ lui $at, %hi(D_8018D00C) # $at, 0x8019 -/* 04EC9C 8004E09C C434D00C */ lwc1 $f20, %lo(D_8018D00C)($at) -/* 04ECA0 8004E0A0 AFB7004C */ sw $s7, 0x4c($sp) -/* 04ECA4 8004E0A4 AFB50044 */ sw $s5, 0x44($sp) -/* 04ECA8 8004E0A8 AFB40040 */ sw $s4, 0x40($sp) -/* 04ECAC 8004E0AC AFB3003C */ sw $s3, 0x3c($sp) -/* 04ECB0 8004E0B0 AFB20038 */ sw $s2, 0x38($sp) -/* 04ECB4 8004E0B4 AFB10034 */ sw $s1, 0x34($sp) -/* 04ECB8 8004E0B8 3C178016 */ lui $s7, %hi(D_80165708) # $s7, 0x8016 -/* 04ECBC 8004E0BC 00E09825 */ move $s3, $a3 -/* 04ECC0 8004E0C0 AFBF0054 */ sw $ra, 0x54($sp) -/* 04ECC4 8004E0C4 AFB60048 */ sw $s6, 0x48($sp) -/* 04ECC8 8004E0C8 AFB00030 */ sw $s0, 0x30($sp) -/* 04ECCC 8004E0CC F7B60028 */ sdc1 $f22, 0x28($sp) -/* 04ECD0 8004E0D0 84510000 */ lh $s1, ($v0) -/* 04ECD4 8004E0D4 86F75708 */ lh $s7, %lo(D_80165708)($s7) -/* 04ECD8 8004E0D8 00C09025 */ move $s2, $a2 -/* 04ECDC 8004E0DC 07C10003 */ bgez $fp, .L8004E0EC -/* 04ECE0 8004E0E0 001EC843 */ sra $t9, $fp, 1 -/* 04ECE4 8004E0E4 27C10001 */ addiu $at, $fp, 1 -/* 04ECE8 8004E0E8 0001C843 */ sra $t9, $at, 1 -.L8004E0EC: -/* 04ECEC 8004E0EC 00B9A023 */ subu $s4, $a1, $t9 -/* 04ECF0 8004E0F0 1BC00043 */ blez $fp, .L8004E200 -/* 04ECF4 8004E0F4 0000A825 */ move $s5, $zero -/* 04ECF8 8004E0F8 06610003 */ bgez $s3, .L8004E108 -/* 04ECFC 8004E0FC 00134043 */ sra $t0, $s3, 1 -/* 04ED00 8004E100 26610001 */ addiu $at, $s3, 1 -/* 04ED04 8004E104 00014043 */ sra $t0, $at, 1 -.L8004E108: -/* 04ED08 8004E108 00884823 */ subu $t1, $a0, $t0 -/* 04ED0C 8004E10C 44892000 */ mtc1 $t1, $f4 -/* 04ED10 8004E110 00000000 */ nop -/* 04ED14 8004E114 468025A0 */ cvt.s.w $f22, $f4 -.L8004E118: -/* 04ED18 8004E118 3230FFFF */ andi $s0, $s1, 0xffff -/* 04ED1C 8004E11C 0C0AE006 */ jal sins -/* 04ED20 8004E120 3204FFFF */ andi $a0, $s0, 0xffff -/* 04ED24 8004E124 46140182 */ mul.s $f6, $f0, $f20 -/* 04ED28 8004E128 24160001 */ li $s6, 1 -/* 04ED2C 8004E12C 3C014F00 */ li $at, 0x4F000000 # 2147483648.000000 -/* 04ED30 8004E130 46163200 */ add.s $f8, $f6, $f22 -/* 04ED34 8004E134 444AF800 */ cfc1 $t2, $31 -/* 04ED38 8004E138 44D6F800 */ ctc1 $s6, $31 -/* 04ED3C 8004E13C 00000000 */ nop -/* 04ED40 8004E140 460042A4 */ cvt.w.s $f10, $f8 -/* 04ED44 8004E144 4456F800 */ cfc1 $s6, $31 -/* 04ED48 8004E148 00000000 */ nop -/* 04ED4C 8004E14C 32D60078 */ andi $s6, $s6, 0x78 -/* 04ED50 8004E150 52C00013 */ beql $s6, $zero, .L8004E1A0 -/* 04ED54 8004E154 44165000 */ mfc1 $s6, $f10 -/* 04ED58 8004E158 44815000 */ mtc1 $at, $f10 -/* 04ED5C 8004E15C 24160001 */ li $s6, 1 -/* 04ED60 8004E160 460A4281 */ sub.s $f10, $f8, $f10 -/* 04ED64 8004E164 44D6F800 */ ctc1 $s6, $31 -/* 04ED68 8004E168 00000000 */ nop -/* 04ED6C 8004E16C 460052A4 */ cvt.w.s $f10, $f10 -/* 04ED70 8004E170 4456F800 */ cfc1 $s6, $31 -/* 04ED74 8004E174 00000000 */ nop -/* 04ED78 8004E178 32D60078 */ andi $s6, $s6, 0x78 -/* 04ED7C 8004E17C 16C00005 */ bnez $s6, .L8004E194 -/* 04ED80 8004E180 00000000 */ nop -/* 04ED84 8004E184 44165000 */ mfc1 $s6, $f10 -/* 04ED88 8004E188 3C018000 */ lui $at, 0x8000 -/* 04ED8C 8004E18C 10000007 */ b .L8004E1AC -/* 04ED90 8004E190 02C1B025 */ or $s6, $s6, $at -.L8004E194: -/* 04ED94 8004E194 10000005 */ b .L8004E1AC -/* 04ED98 8004E198 2416FFFF */ li $s6, -1 -/* 04ED9C 8004E19C 44165000 */ mfc1 $s6, $f10 -.L8004E1A0: -/* 04EDA0 8004E1A0 00000000 */ nop -/* 04EDA4 8004E1A4 06C0FFFB */ bltz $s6, .L8004E194 -/* 04EDA8 8004E1A8 00000000 */ nop -.L8004E1AC: -/* 04EDAC 8004E1AC 44CAF800 */ ctc1 $t2, $31 -/* 04EDB0 8004E1B0 0C0AE006 */ jal sins -/* 04EDB4 8004E1B4 3204FFFF */ andi $a0, $s0, 0xffff -/* 04EDB8 8004E1B8 02402025 */ move $a0, $s2 -/* 04EDBC 8004E1BC 02602825 */ move $a1, $s3 -/* 04EDC0 8004E1C0 0C0114A9 */ jal func_800452A4 -/* 04EDC4 8004E1C4 24060001 */ li $a2, 1 -/* 04EDC8 8004E1C8 240B0001 */ li $t3, 1 -/* 04EDCC 8004E1CC AFAB0010 */ sw $t3, 0x10($sp) -/* 04EDD0 8004E1D0 02C02025 */ move $a0, $s6 -/* 04EDD4 8004E1D4 02802825 */ move $a1, $s4 -/* 04EDD8 8004E1D8 02603025 */ move $a2, $s3 -/* 04EDDC 8004E1DC 0C012E5F */ jal func_8004B97C -/* 04EDE0 8004E1E0 24070001 */ li $a3, 1 -/* 04EDE4 8004E1E4 02378821 */ addu $s1, $s1, $s7 -/* 04EDE8 8004E1E8 26B50001 */ addiu $s5, $s5, 1 -/* 04EDEC 8004E1EC 00116400 */ sll $t4, $s1, 0x10 -/* 04EDF0 8004E1F0 000C8C03 */ sra $s1, $t4, 0x10 -/* 04EDF4 8004E1F4 02539021 */ addu $s2, $s2, $s3 -/* 04EDF8 8004E1F8 16BEFFC7 */ bne $s5, $fp, .L8004E118 -/* 04EDFC 8004E1FC 26940001 */ addiu $s4, $s4, 1 -.L8004E200: -/* 04EE00 8004E200 8FBF0054 */ lw $ra, 0x54($sp) -/* 04EE04 8004E204 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 04EE08 8004E208 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 04EE0C 8004E20C 8FB00030 */ lw $s0, 0x30($sp) -/* 04EE10 8004E210 8FB10034 */ lw $s1, 0x34($sp) -/* 04EE14 8004E214 8FB20038 */ lw $s2, 0x38($sp) -/* 04EE18 8004E218 8FB3003C */ lw $s3, 0x3c($sp) -/* 04EE1C 8004E21C 8FB40040 */ lw $s4, 0x40($sp) -/* 04EE20 8004E220 8FB50044 */ lw $s5, 0x44($sp) -/* 04EE24 8004E224 8FB60048 */ lw $s6, 0x48($sp) -/* 04EE28 8004E228 8FB7004C */ lw $s7, 0x4c($sp) -/* 04EE2C 8004E22C 8FBE0050 */ lw $fp, 0x50($sp) -/* 04EE30 8004E230 03E00008 */ jr $ra -/* 04EE34 8004E234 27BD0058 */ addiu $sp, $sp, 0x58 diff --git a/asm/non_matchings/code_800431B0/func_8004F774.s b/asm/non_matchings/code_800431B0/func_8004F774.s deleted file mode 100644 index d19a22696..000000000 --- a/asm/non_matchings/code_800431B0/func_8004F774.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8004F774 -/* 050374 8004F774 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 050378 8004F778 AFB30030 */ sw $s3, 0x30($sp) -/* 05037C 8004F77C AFB00024 */ sw $s0, 0x24($sp) -/* 050380 8004F780 AFB2002C */ sw $s2, 0x2c($sp) -/* 050384 8004F784 AFB10028 */ sw $s1, 0x28($sp) -/* 050388 8004F788 3C108016 */ lui $s0, %hi(D_801657D0) # $s0, 0x8016 -/* 05038C 8004F78C 3C138016 */ lui $s3, %hi(D_801657D8) # $s3, 0x8016 -/* 050390 8004F790 00A09025 */ move $s2, $a1 -/* 050394 8004F794 AFBF0034 */ sw $ra, 0x34($sp) -/* 050398 8004F798 00808825 */ move $s1, $a0 -/* 05039C 8004F79C 267357D8 */ addiu $s3, %lo(D_801657D8) # addiu $s3, $s3, 0x57d8 -/* 0503A0 8004F7A0 261057D0 */ addiu $s0, %lo(D_801657D0) # addiu $s0, $s0, 0x57d0 -.L8004F7A4: -/* 0503A4 8004F7A4 820E0000 */ lb $t6, ($s0) -/* 0503A8 8004F7A8 02202025 */ move $a0, $s1 -/* 0503AC 8004F7AC 02402825 */ move $a1, $s2 -/* 0503B0 8004F7B0 000E78C0 */ sll $t7, $t6, 3 -/* 0503B4 8004F7B4 AFAF0010 */ sw $t7, 0x10($sp) -/* 0503B8 8004F7B8 24060008 */ li $a2, 8 -/* 0503BC 8004F7BC 24070010 */ li $a3, 16 -/* 0503C0 8004F7C0 AFA00014 */ sw $zero, 0x14($sp) -/* 0503C4 8004F7C4 0C012EA6 */ jal func_8004BA98 -/* 0503C8 8004F7C8 AFA00018 */ sw $zero, 0x18($sp) -/* 0503CC 8004F7CC 26100001 */ addiu $s0, $s0, 1 -/* 0503D0 8004F7D0 1613FFF4 */ bne $s0, $s3, .L8004F7A4 -/* 0503D4 8004F7D4 26310008 */ addiu $s1, $s1, 8 -/* 0503D8 8004F7D8 8FBF0034 */ lw $ra, 0x34($sp) -/* 0503DC 8004F7DC 8FB00024 */ lw $s0, 0x24($sp) -/* 0503E0 8004F7E0 8FB10028 */ lw $s1, 0x28($sp) -/* 0503E4 8004F7E4 8FB2002C */ lw $s2, 0x2c($sp) -/* 0503E8 8004F7E8 8FB30030 */ lw $s3, 0x30($sp) -/* 0503EC 8004F7EC 03E00008 */ jr $ra -/* 0503F0 8004F7F0 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_800431B0/func_8004F8CC.s b/asm/non_matchings/code_800431B0/func_8004F8CC.s deleted file mode 100644 index 4bbc3595d..000000000 --- a/asm/non_matchings/code_800431B0/func_8004F8CC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8004F8CC -/* 0504CC 8004F8CC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 0504D0 8004F8D0 AFB30030 */ sw $s3, 0x30($sp) -/* 0504D4 8004F8D4 AFB00024 */ sw $s0, 0x24($sp) -/* 0504D8 8004F8D8 AFB2002C */ sw $s2, 0x2c($sp) -/* 0504DC 8004F8DC AFB10028 */ sw $s1, 0x28($sp) -/* 0504E0 8004F8E0 3C108016 */ lui $s0, %hi(D_801657D0) # $s0, 0x8016 -/* 0504E4 8004F8E4 3C138016 */ lui $s3, %hi(D_801657D8) # $s3, 0x8016 -/* 0504E8 8004F8E8 00A09025 */ move $s2, $a1 -/* 0504EC 8004F8EC AFBF0034 */ sw $ra, 0x34($sp) -/* 0504F0 8004F8F0 00808825 */ move $s1, $a0 -/* 0504F4 8004F8F4 267357D8 */ addiu $s3, %lo(D_801657D8) # addiu $s3, $s3, 0x57d8 -/* 0504F8 8004F8F8 261057D0 */ addiu $s0, %lo(D_801657D0) # addiu $s0, $s0, 0x57d0 -.L8004F8FC: -/* 0504FC 8004F8FC 820E0000 */ lb $t6, ($s0) -/* 050500 8004F900 24180001 */ li $t8, 1 -/* 050504 8004F904 AFB80018 */ sw $t8, 0x18($sp) -/* 050508 8004F908 000E78C0 */ sll $t7, $t6, 3 -/* 05050C 8004F90C AFAF0010 */ sw $t7, 0x10($sp) -/* 050510 8004F910 02202025 */ move $a0, $s1 -/* 050514 8004F914 02402825 */ move $a1, $s2 -/* 050518 8004F918 24060008 */ li $a2, 8 -/* 05051C 8004F91C 24070010 */ li $a3, 16 -/* 050520 8004F920 0C012EA6 */ jal func_8004BA98 -/* 050524 8004F924 AFA00014 */ sw $zero, 0x14($sp) -/* 050528 8004F928 26100001 */ addiu $s0, $s0, 1 -/* 05052C 8004F92C 1613FFF3 */ bne $s0, $s3, .L8004F8FC -/* 050530 8004F930 26310008 */ addiu $s1, $s1, 8 -/* 050534 8004F934 8FBF0034 */ lw $ra, 0x34($sp) -/* 050538 8004F938 8FB00024 */ lw $s0, 0x24($sp) -/* 05053C 8004F93C 8FB10028 */ lw $s1, 0x28($sp) -/* 050540 8004F940 8FB2002C */ lw $s2, 0x2c($sp) -/* 050544 8004F944 8FB30030 */ lw $s3, 0x30($sp) -/* 050548 8004F948 03E00008 */ jr $ra -/* 05054C 8004F94C 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_800431B0/func_80055380.s b/asm/non_matchings/code_800431B0/func_80055380.s deleted file mode 100644 index c1fa9468d..000000000 --- a/asm/non_matchings/code_800431B0/func_80055380.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80055380 -/* 055F80 80055380 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 055F84 80055384 AFB6002C */ sw $s6, 0x2c($sp) -/* 055F88 80055388 AFB30020 */ sw $s3, 0x20($sp) -/* 055F8C 8005538C AFB2001C */ sw $s2, 0x1c($sp) -/* 055F90 80055390 AFB10018 */ sw $s1, 0x18($sp) -/* 055F94 80055394 AFB70030 */ sw $s7, 0x30($sp) -/* 055F98 80055398 AFB50028 */ sw $s5, 0x28($sp) -/* 055F9C 8005539C AFB40024 */ sw $s4, 0x24($sp) -/* 055FA0 800553A0 3C118018 */ lui $s1, %hi(D_80183F28) # $s1, 0x8018 -/* 055FA4 800553A4 3C120009 */ lui $s2, (0x0009C401 >> 16) # lui $s2, 9 -/* 055FA8 800553A8 3C138016 */ lui $s3, %hi(D_80165908) # $s3, 0x8016 -/* 055FAC 800553AC 3C168018 */ lui $s6, %hi(D_80183F50) # $s6, 0x8018 -/* 055FB0 800553B0 0080B825 */ move $s7, $a0 -/* 055FB4 800553B4 AFBF0034 */ sw $ra, 0x34($sp) -/* 055FB8 800553B8 AFB00014 */ sw $s0, 0x14($sp) -/* 055FBC 800553BC 26D63F50 */ addiu $s6, %lo(D_80183F50) # addiu $s6, $s6, 0x3f50 -/* 055FC0 800553C0 26735908 */ addiu $s3, %lo(D_80165908) # addiu $s3, $s3, 0x5908 -/* 055FC4 800553C4 3652C401 */ ori $s2, (0x0009C401 & 0xFFFF) # ori $s2, $s2, 0xc401 -/* 055FC8 800553C8 26313F28 */ addiu $s1, %lo(D_80183F28) # addiu $s1, $s1, 0x3f28 -/* 055FCC 800553CC 24140001 */ li $s4, 1 -/* 055FD0 800553D0 3C150004 */ lui $s5, 4 -/* 055FD4 800553D4 8E300000 */ lw $s0, ($s1) -.L800553D8: -/* 055FD8 800553D8 02E02825 */ move $a1, $s7 -/* 055FDC 800553DC 24065555 */ li $a2, 21845 -/* 055FE0 800553E0 240705DC */ li $a3, 1500 -/* 055FE4 800553E4 0C0228D9 */ jal func_8008A364 -/* 055FE8 800553E8 02002025 */ move $a0, $s0 -/* 055FEC 800553EC 0052082A */ slt $at, $v0, $s2 -/* 055FF0 800553F0 10200004 */ beqz $at, .L80055404 -/* 055FF4 800553F4 02002025 */ move $a0, $s0 -/* 055FF8 800553F8 A2740000 */ sb $s4, ($s3) -/* 055FFC 800553FC 0C01C8A9 */ jal func_800722A4 -/* 056000 80055400 24050002 */ li $a1, 2 -.L80055404: -/* 056004 80055404 02002025 */ move $a0, $s0 -/* 056008 80055408 0C01C88F */ jal func_8007223C -/* 05600C 8005540C 02A02825 */ move $a1, $s5 -/* 056010 80055410 50400004 */ beql $v0, $zero, .L80055424 -/* 056014 80055414 26310004 */ addiu $s1, $s1, 4 -/* 056018 80055418 0C0154AF */ jal func_800552BC -/* 05601C 8005541C 02002025 */ move $a0, $s0 -/* 056020 80055420 26310004 */ addiu $s1, $s1, 4 -.L80055424: -/* 056024 80055424 5636FFEC */ bnel $s1, $s6, .L800553D8 -/* 056028 80055428 8E300000 */ lw $s0, ($s1) -/* 05602C 8005542C 8FBF0034 */ lw $ra, 0x34($sp) -/* 056030 80055430 8FB00014 */ lw $s0, 0x14($sp) -/* 056034 80055434 8FB10018 */ lw $s1, 0x18($sp) -/* 056038 80055438 8FB2001C */ lw $s2, 0x1c($sp) -/* 05603C 8005543C 8FB30020 */ lw $s3, 0x20($sp) -/* 056040 80055440 8FB40024 */ lw $s4, 0x24($sp) -/* 056044 80055444 8FB50028 */ lw $s5, 0x28($sp) -/* 056048 80055448 8FB6002C */ lw $s6, 0x2c($sp) -/* 05604C 8005544C 8FB70030 */ lw $s7, 0x30($sp) -/* 056050 80055450 03E00008 */ jr $ra -/* 056054 80055454 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code_80057C60/func_8005D290.s b/asm/non_matchings/code_80057C60/func_8005D290.s deleted file mode 100644 index d62065ba9..000000000 --- a/asm/non_matchings/code_80057C60/func_8005D290.s +++ /dev/null @@ -1,269 +0,0 @@ -glabel func_8005D290 -/* 05DE90 8005D290 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 05DE94 8005D294 AFBF0014 */ sw $ra, 0x14($sp) -/* 05DE98 8005D298 3C040F06 */ lui $a0, %hi(gTexture69C80C) # $a0, 0xf06 -/* 05DE9C 8005D29C 2484A89C */ addiu $a0, %lo(gTexture69C80C) # addiu $a0, $a0, -0x5764 -/* 05DEA0 8005D2A0 24050400 */ li $a1, 1024 -/* 05DEA4 8005D2A4 0C0AA13D */ jal dma_textures -/* 05DEA8 8005D2A8 24060400 */ li $a2, 1024 -/* 05DEAC 8005D2AC 3C018019 */ lui $at, %hi(D_8018D488) # $at, 0x8019 -/* 05DEB0 8005D2B0 3C040F06 */ lui $a0, %hi(gTextureKartShadow) # $a0, 0xf06 -/* 05DEB4 8005D2B4 AC22D488 */ sw $v0, %lo(D_8018D488)($at) -/* 05DEB8 8005D2B8 248488C0 */ addiu $a0, %lo(gTextureKartShadow) # addiu $a0, $a0, -0x7740 -/* 05DEBC 8005D2BC 24051000 */ li $a1, 4096 -/* 05DEC0 8005D2C0 0C0AA13D */ jal dma_textures -/* 05DEC4 8005D2C4 24061000 */ li $a2, 4096 -/* 05DEC8 8005D2C8 3C018019 */ lui $at, %hi(D_8018D474) # $at, 0x8019 -/* 05DECC 8005D2CC 3C040F06 */ lui $a0, %hi(gTexture69B03C) # $a0, 0xf06 -/* 05DED0 8005D2D0 AC22D474 */ sw $v0, %lo(D_8018D474)($at) -/* 05DED4 8005D2D4 248490CC */ addiu $a0, %lo(gTexture69B03C) # addiu $a0, $a0, -0x6f34 -/* 05DED8 8005D2D8 24050100 */ li $a1, 256 -/* 05DEDC 8005D2DC 0C0AA13D */ jal dma_textures -/* 05DEE0 8005D2E0 24060100 */ li $a2, 256 -/* 05DEE4 8005D2E4 3C018019 */ lui $at, %hi(D_8018D420) # $at, 0x8019 -/* 05DEE8 8005D2E8 3C040F06 */ lui $a0, %hi(gTexture69B140) # $a0, 0xf06 -/* 05DEEC 8005D2EC AC22D420 */ sw $v0, %lo(D_8018D420)($at) -/* 05DEF0 8005D2F0 248491D0 */ addiu $a0, %lo(gTexture69B140) # addiu $a0, $a0, -0x6e30 -/* 05DEF4 8005D2F4 24050400 */ li $a1, 1024 -/* 05DEF8 8005D2F8 0C0AA13D */ jal dma_textures -/* 05DEFC 8005D2FC 24060400 */ li $a2, 1024 -/* 05DF00 8005D300 3C018019 */ lui $at, %hi(D_8018D424) # $at, 0x8019 -/* 05DF04 8005D304 3C040F06 */ lui $a0, %hi(gTexture69C1E8) # $a0, 0xf06 -/* 05DF08 8005D308 AC22D424 */ sw $v0, %lo(D_8018D424)($at) -/* 05DF0C 8005D30C 2484A278 */ addiu $a0, %lo(gTexture69C1E8) # addiu $a0, $a0, -0x5d88 -/* 05DF10 8005D310 24050200 */ li $a1, 512 -/* 05DF14 8005D314 0C0AA13D */ jal dma_textures -/* 05DF18 8005D318 24060200 */ li $a2, 512 -/* 05DF1C 8005D31C 3C018019 */ lui $at, %hi(D_8018D478) # $at, 0x8019 -/* 05DF20 8005D320 3C040F06 */ lui $a0, %hi(gTexture69BA28) # $a0, 0xf06 -/* 05DF24 8005D324 AC22D478 */ sw $v0, %lo(D_8018D478)($at) -/* 05DF28 8005D328 24849AB8 */ addiu $a0, %lo(gTexture69BA28) # addiu $a0, $a0, -0x6548 -/* 05DF2C 8005D32C 24050400 */ li $a1, 1024 -/* 05DF30 8005D330 0C0AA13D */ jal dma_textures -/* 05DF34 8005D334 24060400 */ li $a2, 1024 -/* 05DF38 8005D338 3C018019 */ lui $at, %hi(D_8018D480) # $at, 0x8019 -/* 05DF3C 8005D33C 3C040F06 */ lui $a0, %hi(gTexture69B960) # $a0, 0xf06 -/* 05DF40 8005D340 AC22D480 */ sw $v0, %lo(D_8018D480)($at) -/* 05DF44 8005D344 248499F0 */ addiu $a0, %lo(gTexture69B960) # addiu $a0, $a0, -0x6610 -/* 05DF48 8005D348 24050400 */ li $a1, 1024 -/* 05DF4C 8005D34C 0C0AA13D */ jal dma_textures -/* 05DF50 8005D350 24060400 */ li $a2, 1024 -/* 05DF54 8005D354 3C018019 */ lui $at, %hi(D_8018D484) # $at, 0x8019 -/* 05DF58 8005D358 3C040F06 */ lui $a0, %hi(gTexture69C354) # $a0, 0xf06 -/* 05DF5C 8005D35C AC22D484 */ sw $v0, %lo(D_8018D484)($at) -/* 05DF60 8005D360 2484A3E4 */ addiu $a0, %lo(gTexture69C354) # addiu $a0, $a0, -0x5c1c -/* 05DF64 8005D364 24050400 */ li $a1, 1024 -/* 05DF68 8005D368 0C0AA13D */ jal dma_textures -/* 05DF6C 8005D36C 24060400 */ li $a2, 1024 -/* 05DF70 8005D370 3C018019 */ lui $at, %hi(D_8018D48C) # $at, 0x8019 -/* 05DF74 8005D374 3C040F06 */ lui $a0, %hi(gTexture69C4E4) # $a0, 0xf06 -/* 05DF78 8005D378 AC22D48C */ sw $v0, %lo(D_8018D48C)($at) -/* 05DF7C 8005D37C 2484A574 */ addiu $a0, %lo(gTexture69C4E4) # addiu $a0, $a0, -0x5a8c -/* 05DF80 8005D380 24050400 */ li $a1, 1024 -/* 05DF84 8005D384 0C0AA13D */ jal dma_textures -/* 05DF88 8005D388 24060400 */ li $a2, 1024 -/* 05DF8C 8005D38C 3C018019 */ lui $at, %hi(D_8018D494) # $at, 0x8019 -/* 05DF90 8005D390 3C0E8019 */ lui $t6, %hi(D_8018D48C) # $t6, 0x8019 -/* 05DF94 8005D394 8DCED48C */ lw $t6, %lo(D_8018D48C)($t6) -/* 05DF98 8005D398 AC22D494 */ sw $v0, %lo(D_8018D494)($at) -/* 05DF9C 8005D39C 3C018019 */ lui $at, %hi(D_8018D490) # $at, 0x8019 -/* 05DFA0 8005D3A0 3C040F06 */ lui $a0, %hi(gTexture69B378) # $a0, 0xf06 -/* 05DFA4 8005D3A4 24849408 */ addiu $a0, %lo(gTexture69B378) # addiu $a0, $a0, -0x6bf8 -/* 05DFA8 8005D3A8 24051000 */ li $a1, 4096 -/* 05DFAC 8005D3AC 24061000 */ li $a2, 4096 -/* 05DFB0 8005D3B0 0C0AA13D */ jal dma_textures -/* 05DFB4 8005D3B4 AC2ED490 */ sw $t6, %lo(D_8018D490)($at) -/* 05DFB8 8005D3B8 3C018019 */ lui $at, %hi(D_8018D498) # $at, 0x8019 -/* 05DFBC 8005D3BC 3C040F06 */ lui $a0, %hi(D_0F05E19C) # $a0, 0xf06 -/* 05DFC0 8005D3C0 AC22D498 */ sw $v0, %lo(D_8018D498)($at) -/* 05DFC4 8005D3C4 2484E19C */ addiu $a0, %lo(D_0F05E19C) # addiu $a0, $a0, -0x1e64 -/* 05DFC8 8005D3C8 24050800 */ li $a1, 2048 -/* 05DFCC 8005D3CC 0C0AA13D */ jal dma_textures -/* 05DFD0 8005D3D0 24060800 */ li $a2, 2048 -/* 05DFD4 8005D3D4 3C018019 */ lui $at, %hi(D_8018D4BC) # $at, 0x8019 -/* 05DFD8 8005D3D8 3C040F06 */ lui $a0, %hi(D_0F05E3E0) # $a0, 0xf06 -/* 05DFDC 8005D3DC AC22D4BC */ sw $v0, %lo(D_8018D4BC)($at) -/* 05DFE0 8005D3E0 2484E3E0 */ addiu $a0, %lo(D_0F05E3E0) # addiu $a0, $a0, -0x1c20 -/* 05DFE4 8005D3E4 24050800 */ li $a1, 2048 -/* 05DFE8 8005D3E8 0C0AA13D */ jal dma_textures -/* 05DFEC 8005D3EC 24060800 */ li $a2, 2048 -/* 05DFF0 8005D3F0 3C018019 */ lui $at, %hi(D_8018D4C0) # $at, 0x8019 -/* 05DFF4 8005D3F4 3C040F06 */ lui $a0, %hi(gTexture69C9C4) # $a0, 0xf06 -/* 05DFF8 8005D3F8 AC22D4C0 */ sw $v0, %lo(D_8018D4C0)($at) -/* 05DFFC 8005D3FC 2484AA54 */ addiu $a0, %lo(gTexture69C9C4) # addiu $a0, $a0, -0x55ac -/* 05E000 8005D400 24050200 */ li $a1, 512 -/* 05E004 8005D404 0C0AA13D */ jal dma_textures -/* 05E008 8005D408 24060200 */ li $a2, 512 -/* 05E00C 8005D40C 3C018019 */ lui $at, %hi(D_8018D49C) # $at, 0x8019 -/* 05E010 8005D410 3C040F06 */ lui $a0, %hi(gTextureBoingExclamation) # $a0, 0xf06 -/* 05E014 8005D414 AC22D49C */ sw $v0, %lo(D_8018D49C)($at) -/* 05E018 8005D418 24849BA8 */ addiu $a0, %lo(gTextureBoingExclamation) # addiu $a0, $a0, -0x6458 -/* 05E01C 8005D41C 24050800 */ li $a1, 2048 -/* 05E020 8005D420 0C0AA13D */ jal dma_textures -/* 05E024 8005D424 24060800 */ li $a2, 2048 -/* 05E028 8005D428 3C018019 */ lui $at, %hi(D_8018D4A0) # $at, 0x8019 -/* 05E02C 8005D42C 3C040F06 */ lui $a0, %hi(D_0F05DDFC) # $a0, 0xf06 -/* 05E030 8005D430 AC22D4A0 */ sw $v0, %lo(D_8018D4A0)($at) -/* 05E034 8005D434 2484DDFC */ addiu $a0, %lo(D_0F05DDFC) # addiu $a0, $a0, -0x2204 -/* 05E038 8005D438 24050800 */ li $a1, 2048 -/* 05E03C 8005D43C 0C0AA13D */ jal dma_textures -/* 05E040 8005D440 24060800 */ li $a2, 2048 -/* 05E044 8005D444 3C018019 */ lui $at, %hi(D_8018D4A4) # $at, 0x8019 -/* 05E048 8005D448 3C040F06 */ lui $a0, %hi(D_0F05DFC0) # $a0, 0xf06 -/* 05E04C 8005D44C AC22D4A4 */ sw $v0, %lo(D_8018D4A4)($at) -/* 05E050 8005D450 2484DFC0 */ addiu $a0, %lo(D_0F05DFC0) # addiu $a0, $a0, -0x2040 -/* 05E054 8005D454 24050800 */ li $a1, 2048 -/* 05E058 8005D458 0C0AA13D */ jal dma_textures -/* 05E05C 8005D45C 24060800 */ li $a2, 2048 -/* 05E060 8005D460 3C018019 */ lui $at, %hi(D_8018D4A8) # $at, 0x8019 -/* 05E064 8005D464 3C040F06 */ lui $a0, %hi(D_0F05D674) # $a0, 0xf06 -/* 05E068 8005D468 AC22D4A8 */ sw $v0, %lo(D_8018D4A8)($at) -/* 05E06C 8005D46C 2484D674 */ addiu $a0, %lo(D_0F05D674) # addiu $a0, $a0, -0x298c -/* 05E070 8005D470 24050800 */ li $a1, 2048 -/* 05E074 8005D474 0C0AA13D */ jal dma_textures -/* 05E078 8005D478 24060800 */ li $a2, 2048 -/* 05E07C 8005D47C 3C018019 */ lui $at, %hi(D_8018D4AC) # $at, 0x8019 -/* 05E080 8005D480 3C040F06 */ lui $a0, %hi(D_0F05DA50) # $a0, 0xf06 -/* 05E084 8005D484 AC22D4AC */ sw $v0, %lo(D_8018D4AC)($at) -/* 05E088 8005D488 2484DA50 */ addiu $a0, %lo(D_0F05DA50) # addiu $a0, $a0, -0x25b0 -/* 05E08C 8005D48C 24050800 */ li $a1, 2048 -/* 05E090 8005D490 0C0AA13D */ jal dma_textures -/* 05E094 8005D494 24060800 */ li $a2, 2048 -/* 05E098 8005D498 3C018019 */ lui $at, %hi(D_8018D4B0) # $at, 0x8019 -/* 05E09C 8005D49C 3C040F06 */ lui $a0, %hi(D_0F05D1E8) # $a0, 0xf06 -/* 05E0A0 8005D4A0 AC22D4B0 */ sw $v0, %lo(D_8018D4B0)($at) -/* 05E0A4 8005D4A4 2484D1E8 */ addiu $a0, %lo(D_0F05D1E8) # addiu $a0, $a0, -0x2e18 -/* 05E0A8 8005D4A8 24050800 */ li $a1, 2048 -/* 05E0AC 8005D4AC 0C0AA13D */ jal dma_textures -/* 05E0B0 8005D4B0 24060800 */ li $a2, 2048 -/* 05E0B4 8005D4B4 3C018019 */ lui $at, %hi(D_8018D4B4) # $at, 0x8019 -/* 05E0B8 8005D4B8 3C040F06 */ lui $a0, %hi(D_0F05D420) # $a0, 0xf06 -/* 05E0BC 8005D4BC AC22D4B4 */ sw $v0, %lo(D_8018D4B4)($at) -/* 05E0C0 8005D4C0 2484D420 */ addiu $a0, %lo(D_0F05D420) # addiu $a0, $a0, -0x2be0 -/* 05E0C4 8005D4C4 24050800 */ li $a1, 2048 -/* 05E0C8 8005D4C8 0C0AA13D */ jal dma_textures -/* 05E0CC 8005D4CC 24060800 */ li $a2, 2048 -/* 05E0D0 8005D4D0 3C018019 */ lui $at, %hi(D_8018D4B8) # $at, 0x8019 -/* 05E0D4 8005D4D4 3C040F06 */ lui $a0, %hi(gTexture69CB84) # $a0, 0xf06 -/* 05E0D8 8005D4D8 AC22D4B8 */ sw $v0, %lo(D_8018D4B8)($at) -/* 05E0DC 8005D4DC 2484AC14 */ addiu $a0, %lo(gTexture69CB84) # addiu $a0, $a0, -0x53ec -/* 05E0E0 8005D4E0 24050800 */ li $a1, 2048 -/* 05E0E4 8005D4E4 0C0AA13D */ jal dma_textures -/* 05E0E8 8005D4E8 24060800 */ li $a2, 2048 -/* 05E0EC 8005D4EC 3C018019 */ lui $at, %hi(D_8018D438) # $at, 0x8019 -/* 05E0F0 8005D4F0 3C040F06 */ lui $a0, %hi(gTexture69CCEC) # $a0, 0xf06 -/* 05E0F4 8005D4F4 AC22D438 */ sw $v0, %lo(D_8018D438)($at) -/* 05E0F8 8005D4F8 2484AD7C */ addiu $a0, %lo(gTexture69CCEC) # addiu $a0, $a0, -0x5284 -/* 05E0FC 8005D4FC 24050800 */ li $a1, 2048 -/* 05E100 8005D500 0C0AA13D */ jal dma_textures -/* 05E104 8005D504 24060800 */ li $a2, 2048 -/* 05E108 8005D508 3C018019 */ lui $at, %hi(D_8018D43C) # $at, 0x8019 -/* 05E10C 8005D50C 3C040F06 */ lui $a0, %hi(gTexture69CEB8) # $a0, 0xf06 -/* 05E110 8005D510 AC22D43C */ sw $v0, %lo(D_8018D43C)($at) -/* 05E114 8005D514 2484AF48 */ addiu $a0, %lo(gTexture69CEB8) # addiu $a0, $a0, -0x50b8 -/* 05E118 8005D518 24050800 */ li $a1, 2048 -/* 05E11C 8005D51C 0C0AA13D */ jal dma_textures -/* 05E120 8005D520 24060800 */ li $a2, 2048 -/* 05E124 8005D524 3C018019 */ lui $at, %hi(D_8018D440) # $at, 0x8019 -/* 05E128 8005D528 3C040F06 */ lui $a0, %hi(gTexture69D148) # $a0, 0xf06 -/* 05E12C 8005D52C AC22D440 */ sw $v0, %lo(D_8018D440)($at) -/* 05E130 8005D530 2484B1D8 */ addiu $a0, %lo(gTexture69D148) # addiu $a0, $a0, -0x4e28 -/* 05E134 8005D534 24050800 */ li $a1, 2048 -/* 05E138 8005D538 0C0AA13D */ jal dma_textures -/* 05E13C 8005D53C 24060800 */ li $a2, 2048 -/* 05E140 8005D540 3C018019 */ lui $at, %hi(D_8018D444) # $at, 0x8019 -/* 05E144 8005D544 3C040F06 */ lui $a0, %hi(gTexture69D4E0) # $a0, 0xf06 -/* 05E148 8005D548 AC22D444 */ sw $v0, %lo(D_8018D444)($at) -/* 05E14C 8005D54C 2484B570 */ addiu $a0, %lo(gTexture69D4E0) # addiu $a0, $a0, -0x4a90 -/* 05E150 8005D550 24050800 */ li $a1, 2048 -/* 05E154 8005D554 0C0AA13D */ jal dma_textures -/* 05E158 8005D558 24060800 */ li $a2, 2048 -/* 05E15C 8005D55C 3C018019 */ lui $at, %hi(D_8018D448) # $at, 0x8019 -/* 05E160 8005D560 3C040F06 */ lui $a0, %hi(gTexture69D8FC) # $a0, 0xf06 -/* 05E164 8005D564 AC22D448 */ sw $v0, %lo(D_8018D448)($at) -/* 05E168 8005D568 2484B98C */ addiu $a0, %lo(gTexture69D8FC) # addiu $a0, $a0, -0x4674 -/* 05E16C 8005D56C 24050800 */ li $a1, 2048 -/* 05E170 8005D570 0C0AA13D */ jal dma_textures -/* 05E174 8005D574 24060800 */ li $a2, 2048 -/* 05E178 8005D578 3C018019 */ lui $at, %hi(D_8018D44C) # $at, 0x8019 -/* 05E17C 8005D57C 3C040F06 */ lui $a0, %hi(gTexture69DCB4) # $a0, 0xf06 -/* 05E180 8005D580 AC22D44C */ sw $v0, %lo(D_8018D44C)($at) -/* 05E184 8005D584 2484BD44 */ addiu $a0, %lo(gTexture69DCB4) # addiu $a0, $a0, -0x42bc -/* 05E188 8005D588 24050800 */ li $a1, 2048 -/* 05E18C 8005D58C 0C0AA13D */ jal dma_textures -/* 05E190 8005D590 24060800 */ li $a2, 2048 -/* 05E194 8005D594 3C018019 */ lui $at, %hi(D_8018D450) # $at, 0x8019 -/* 05E198 8005D598 3C040F06 */ lui $a0, %hi(gTexture69DFA0) # $a0, 0xf06 -/* 05E19C 8005D59C AC22D450 */ sw $v0, %lo(D_8018D450)($at) -/* 05E1A0 8005D5A0 2484C030 */ addiu $a0, %lo(gTexture69DFA0) # addiu $a0, $a0, -0x3fd0 -/* 05E1A4 8005D5A4 24050800 */ li $a1, 2048 -/* 05E1A8 8005D5A8 0C0AA13D */ jal dma_textures -/* 05E1AC 8005D5AC 24060800 */ li $a2, 2048 -/* 05E1B0 8005D5B0 3C018019 */ lui $at, %hi(D_8018D454) # $at, 0x8019 -/* 05E1B4 8005D5B4 3C040F06 */ lui $a0, %hi(gTexture69E25C) # $a0, 0xf06 -/* 05E1B8 8005D5B8 AC22D454 */ sw $v0, %lo(D_8018D454)($at) -/* 05E1BC 8005D5BC 2484C2EC */ addiu $a0, %lo(gTexture69E25C) # addiu $a0, $a0, -0x3d14 -/* 05E1C0 8005D5C0 24050800 */ li $a1, 2048 -/* 05E1C4 8005D5C4 0C0AA13D */ jal dma_textures -/* 05E1C8 8005D5C8 24060800 */ li $a2, 2048 -/* 05E1CC 8005D5CC 3C018019 */ lui $at, %hi(D_8018D458) # $at, 0x8019 -/* 05E1D0 8005D5D0 3C040F06 */ lui $a0, %hi(gTexture69E518) # $a0, 0xf06 -/* 05E1D4 8005D5D4 AC22D458 */ sw $v0, %lo(D_8018D458)($at) -/* 05E1D8 8005D5D8 2484C5A8 */ addiu $a0, %lo(gTexture69E518) # addiu $a0, $a0, -0x3a58 -/* 05E1DC 8005D5DC 24050800 */ li $a1, 2048 -/* 05E1E0 8005D5E0 0C0AA13D */ jal dma_textures -/* 05E1E4 8005D5E4 24060800 */ li $a2, 2048 -/* 05E1E8 8005D5E8 3C018019 */ lui $at, %hi(D_8018D45C) # $at, 0x8019 -/* 05E1EC 8005D5EC 3C040F06 */ lui $a0, %hi(gTexture69E7A8) # $a0, 0xf06 -/* 05E1F0 8005D5F0 AC22D45C */ sw $v0, %lo(D_8018D45C)($at) -/* 05E1F4 8005D5F4 2484C838 */ addiu $a0, %lo(gTexture69E7A8) # addiu $a0, $a0, -0x37c8 -/* 05E1F8 8005D5F8 24050800 */ li $a1, 2048 -/* 05E1FC 8005D5FC 0C0AA13D */ jal dma_textures -/* 05E200 8005D600 24060800 */ li $a2, 2048 -/* 05E204 8005D604 3C018019 */ lui $at, %hi(D_8018D460) # $at, 0x8019 -/* 05E208 8005D608 3C040F06 */ lui $a0, %hi(gTexture69EA18) # $a0, 0xf06 -/* 05E20C 8005D60C AC22D460 */ sw $v0, %lo(D_8018D460)($at) -/* 05E210 8005D610 2484CAA8 */ addiu $a0, %lo(gTexture69EA18) # addiu $a0, $a0, -0x3558 -/* 05E214 8005D614 24050800 */ li $a1, 2048 -/* 05E218 8005D618 0C0AA13D */ jal dma_textures -/* 05E21C 8005D61C 24060800 */ li $a2, 2048 -/* 05E220 8005D620 3C018019 */ lui $at, %hi(D_8018D464) # $at, 0x8019 -/* 05E224 8005D624 3C040F06 */ lui $a0, %hi(gTexture69EC54) # $a0, 0xf06 -/* 05E228 8005D628 AC22D464 */ sw $v0, %lo(D_8018D464)($at) -/* 05E22C 8005D62C 2484CCE4 */ addiu $a0, %lo(gTexture69EC54) # addiu $a0, $a0, -0x331c -/* 05E230 8005D630 24050800 */ li $a1, 2048 -/* 05E234 8005D634 0C0AA13D */ jal dma_textures -/* 05E238 8005D638 24060800 */ li $a2, 2048 -/* 05E23C 8005D63C 3C018019 */ lui $at, %hi(D_8018D468) # $at, 0x8019 -/* 05E240 8005D640 3C040F06 */ lui $a0, %hi(gTexture69EE38) # $a0, 0xf06 -/* 05E244 8005D644 AC22D468 */ sw $v0, %lo(D_8018D468)($at) -/* 05E248 8005D648 2484CEC8 */ addiu $a0, %lo(gTexture69EE38) # addiu $a0, $a0, -0x3138 -/* 05E24C 8005D64C 24050800 */ li $a1, 2048 -/* 05E250 8005D650 0C0AA13D */ jal dma_textures -/* 05E254 8005D654 24060800 */ li $a2, 2048 -/* 05E258 8005D658 3C018019 */ lui $at, %hi(D_8018D46C) # $at, 0x8019 -/* 05E25C 8005D65C 3C040F06 */ lui $a0, %hi(gTexture69EFE0) # $a0, 0xf06 -/* 05E260 8005D660 AC22D46C */ sw $v0, %lo(D_8018D46C)($at) -/* 05E264 8005D664 2484D070 */ addiu $a0, %lo(gTexture69EFE0) # addiu $a0, $a0, -0x2f90 -/* 05E268 8005D668 24050800 */ li $a1, 2048 -/* 05E26C 8005D66C 0C0AA13D */ jal dma_textures -/* 05E270 8005D670 24060800 */ li $a2, 2048 -/* 05E274 8005D674 3C018019 */ lui $at, %hi(D_8018D470) # $at, 0x8019 -/* 05E278 8005D678 3C040F06 */ lui $a0, %hi(gTextureLightningBolt0) # $a0, 0xf06 -/* 05E27C 8005D67C AC22D470 */ sw $v0, %lo(D_8018D470)($at) -/* 05E280 8005D680 2484E574 */ addiu $a0, %lo(gTextureLightningBolt0) # addiu $a0, $a0, -0x1a8c -/* 05E284 8005D684 24050800 */ li $a1, 2048 -/* 05E288 8005D688 0C0AA13D */ jal dma_textures -/* 05E28C 8005D68C 24060800 */ li $a2, 2048 -/* 05E290 8005D690 3C018019 */ lui $at, %hi(D_8018D4C4) # $at, 0x8019 -/* 05E294 8005D694 3C040F06 */ lui $a0, %hi(gTextureLightningBolt1) # $a0, 0xf06 -/* 05E298 8005D698 AC22D4C4 */ sw $v0, %lo(D_8018D4C4)($at) -/* 05E29C 8005D69C 2484E828 */ addiu $a0, %lo(gTextureLightningBolt1) # addiu $a0, $a0, -0x17d8 -/* 05E2A0 8005D6A0 24050800 */ li $a1, 2048 -/* 05E2A4 8005D6A4 0C0AA13D */ jal dma_textures -/* 05E2A8 8005D6A8 24060800 */ li $a2, 2048 -/* 05E2AC 8005D6AC 8FBF0014 */ lw $ra, 0x14($sp) -/* 05E2B0 8005D6B0 3C018019 */ lui $at, %hi(D_8018D4C8) # $at, 0x8019 -/* 05E2B4 8005D6B4 AC22D4C8 */ sw $v0, %lo(D_8018D4C8)($at) -/* 05E2B8 8005D6B8 03E00008 */ jr $ra -/* 05E2BC 8005D6BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code_800431B0/debug_print_number.s b/asm/non_matchings/hud_renderer/debug_print_number.s similarity index 95% rename from asm/non_matchings/code_800431B0/debug_print_number.s rename to asm/non_matchings/hud_renderer/debug_print_number.s index 43a7eaf9a..d794b25c0 100644 --- a/asm/non_matchings/code_800431B0/debug_print_number.s +++ b/asm/non_matchings/hud_renderer/debug_print_number.s @@ -8,7 +8,7 @@ glabel debug_print_number /* 05813C 8005753C 00808825 */ move $s1, $a0 /* 058140 80057540 00A09025 */ move $s2, $a1 /* 058144 80057544 AFB30020 */ sw $s3, 0x20($sp) -/* 058148 80057548 0C015D15 */ jal func_80057454 +/* 058148 80057548 0C015D15 */ jal debug_wrap_text /* 05814C 8005754C AFA70034 */ sw $a3, 0x34($sp) /* 058150 80057550 8FA70034 */ lw $a3, 0x34($sp) /* 058154 80057554 0601000C */ bgez $s0, .L80057588 @@ -20,7 +20,7 @@ glabel debug_print_number /* 05816C 8005756C 0C015CF9 */ jal func_800573E4 /* 058170 80057570 AFA70034 */ sw $a3, 0x34($sp) /* 058174 80057574 02202025 */ move $a0, $s1 -/* 058178 80057578 0C015D15 */ jal func_80057454 +/* 058178 80057578 0C015D15 */ jal debug_wrap_text /* 05817C 8005757C 02402825 */ move $a1, $s2 /* 058180 80057580 8FA70034 */ lw $a3, 0x34($sp) /* 058184 80057584 00101023 */ negu $v0, $s0 @@ -59,7 +59,7 @@ glabel debug_print_number /* 0581F0 800575F0 0C015CF9 */ jal func_800573E4 /* 0581F4 800575F4 2610FFFF */ addiu $s0, $s0, -1 /* 0581F8 800575F8 02202025 */ move $a0, $s1 -/* 0581FC 800575FC 0C015D15 */ jal func_80057454 +/* 0581FC 800575FC 0C015D15 */ jal debug_wrap_text /* 058200 80057600 02402825 */ move $a1, $s2 /* 058204 80057604 82060000 */ lb $a2, ($s0) /* 058208 80057608 5666FFF8 */ bnel $s3, $a2, .L800575EC diff --git a/asm/non_matchings/code_800431B0/func_80044924.s b/asm/non_matchings/hud_renderer/func_80044924.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80044924.s rename to asm/non_matchings/hud_renderer/func_80044924.s diff --git a/asm/non_matchings/code_800431B0/func_80044DA0.s b/asm/non_matchings/hud_renderer/func_80044DA0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80044DA0.s rename to asm/non_matchings/hud_renderer/func_80044DA0.s diff --git a/asm/non_matchings/code_800431B0/func_80044F34.s b/asm/non_matchings/hud_renderer/func_80044F34.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80044F34.s rename to asm/non_matchings/hud_renderer/func_80044F34.s diff --git a/asm/non_matchings/code_800431B0/func_800450C8.s b/asm/non_matchings/hud_renderer/func_800450C8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800450C8.s rename to asm/non_matchings/hud_renderer/func_800450C8.s diff --git a/asm/non_matchings/code_800431B0/func_80045738.s b/asm/non_matchings/hud_renderer/func_80045738.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80045738.s rename to asm/non_matchings/hud_renderer/func_80045738.s diff --git a/asm/non_matchings/code_800431B0/func_8004B310.s b/asm/non_matchings/hud_renderer/func_8004B310.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004B310.s rename to asm/non_matchings/hud_renderer/func_8004B310.s diff --git a/asm/non_matchings/code_800431B0/func_8004BB3C.s b/asm/non_matchings/hud_renderer/func_8004BB3C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004BB3C.s rename to asm/non_matchings/hud_renderer/func_8004BB3C.s diff --git a/asm/non_matchings/code_800431B0/func_8004C6FC.s b/asm/non_matchings/hud_renderer/func_8004C6FC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004C6FC.s rename to asm/non_matchings/hud_renderer/func_8004C6FC.s diff --git a/asm/non_matchings/code_800431B0/func_8004D654.s b/asm/non_matchings/hud_renderer/func_8004D654.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004D654.s rename to asm/non_matchings/hud_renderer/func_8004D654.s diff --git a/asm/non_matchings/code_800431B0/func_8004E6C4.s b/asm/non_matchings/hud_renderer/func_8004E6C4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004E6C4.s rename to asm/non_matchings/hud_renderer/func_8004E6C4.s diff --git a/asm/non_matchings/code_800431B0/func_8004E78C.s b/asm/non_matchings/hud_renderer/func_8004E78C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004E78C.s rename to asm/non_matchings/hud_renderer/func_8004E78C.s diff --git a/asm/non_matchings/code_800431B0/func_8004E800.s b/asm/non_matchings/hud_renderer/func_8004E800.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004E800.s rename to asm/non_matchings/hud_renderer/func_8004E800.s diff --git a/asm/non_matchings/code_800431B0/func_8004E998.s b/asm/non_matchings/hud_renderer/func_8004E998.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004E998.s rename to asm/non_matchings/hud_renderer/func_8004E998.s diff --git a/asm/non_matchings/code_800431B0/func_8004EB38.s b/asm/non_matchings/hud_renderer/func_8004EB38.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004EB38.s rename to asm/non_matchings/hud_renderer/func_8004EB38.s diff --git a/asm/non_matchings/code_800431B0/func_8004ED40.s b/asm/non_matchings/hud_renderer/func_8004ED40.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004ED40.s rename to asm/non_matchings/hud_renderer/func_8004ED40.s diff --git a/asm/non_matchings/code_800431B0/func_8004EE54.s b/asm/non_matchings/hud_renderer/func_8004EE54.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004EE54.s rename to asm/non_matchings/hud_renderer/func_8004EE54.s diff --git a/asm/non_matchings/code_800431B0/func_8004EF9C.s b/asm/non_matchings/hud_renderer/func_8004EF9C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004EF9C.s rename to asm/non_matchings/hud_renderer/func_8004EF9C.s diff --git a/asm/non_matchings/code_800431B0/func_8004F020.s b/asm/non_matchings/hud_renderer/func_8004F020.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004F020.s rename to asm/non_matchings/hud_renderer/func_8004F020.s diff --git a/asm/non_matchings/code_800431B0/func_8004F168.s b/asm/non_matchings/hud_renderer/func_8004F168.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004F168.s rename to asm/non_matchings/hud_renderer/func_8004F168.s diff --git a/asm/non_matchings/code_800431B0/func_8004F3E4.s b/asm/non_matchings/hud_renderer/func_8004F3E4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004F3E4.s rename to asm/non_matchings/hud_renderer/func_8004F3E4.s diff --git a/asm/non_matchings/code_800431B0/func_8004F6D0.s b/asm/non_matchings/hud_renderer/func_8004F6D0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004F6D0.s rename to asm/non_matchings/hud_renderer/func_8004F6D0.s diff --git a/asm/non_matchings/code_800431B0/func_8004FA78.s b/asm/non_matchings/hud_renderer/func_8004FA78.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004FA78.s rename to asm/non_matchings/hud_renderer/func_8004FA78.s diff --git a/asm/non_matchings/code_800431B0/func_8004FDB4.s b/asm/non_matchings/hud_renderer/func_8004FDB4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8004FDB4.s rename to asm/non_matchings/hud_renderer/func_8004FDB4.s diff --git a/asm/non_matchings/code_800431B0/func_80050320.s b/asm/non_matchings/hud_renderer/func_80050320.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80050320.s rename to asm/non_matchings/hud_renderer/func_80050320.s diff --git a/asm/non_matchings/code_800431B0/func_800507D8.s b/asm/non_matchings/hud_renderer/func_800507D8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800507D8.s rename to asm/non_matchings/hud_renderer/func_800507D8.s diff --git a/asm/non_matchings/code_800431B0/func_800508C0.s b/asm/non_matchings/hud_renderer/func_800508C0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800508C0.s rename to asm/non_matchings/hud_renderer/func_800508C0.s diff --git a/asm/non_matchings/code_800431B0/func_80050C68.s b/asm/non_matchings/hud_renderer/func_80050C68.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80050C68.s rename to asm/non_matchings/hud_renderer/func_80050C68.s diff --git a/asm/non_matchings/code_800431B0/func_80050E34.s b/asm/non_matchings/hud_renderer/func_80050E34.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80050E34.s rename to asm/non_matchings/hud_renderer/func_80050E34.s diff --git a/asm/non_matchings/code_800431B0/func_800514BC.s b/asm/non_matchings/hud_renderer/func_800514BC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800514BC.s rename to asm/non_matchings/hud_renderer/func_800514BC.s diff --git a/asm/non_matchings/code_800431B0/func_800518F8.s b/asm/non_matchings/hud_renderer/func_800518F8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800518F8.s rename to asm/non_matchings/hud_renderer/func_800518F8.s diff --git a/asm/non_matchings/code_800431B0/func_800519D4.s b/asm/non_matchings/hud_renderer/func_800519D4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800519D4.s rename to asm/non_matchings/hud_renderer/func_800519D4.s diff --git a/asm/non_matchings/code_800431B0/func_80051ABC.s b/asm/non_matchings/hud_renderer/func_80051ABC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80051ABC.s rename to asm/non_matchings/hud_renderer/func_80051ABC.s diff --git a/asm/non_matchings/code_800431B0/func_80051C60.s b/asm/non_matchings/hud_renderer/func_80051C60.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80051C60.s rename to asm/non_matchings/hud_renderer/func_80051C60.s diff --git a/asm/non_matchings/code_800431B0/func_800520C0.s b/asm/non_matchings/hud_renderer/func_800520C0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800520C0.s rename to asm/non_matchings/hud_renderer/func_800520C0.s diff --git a/asm/non_matchings/code_800431B0/func_8005217C.s b/asm/non_matchings/hud_renderer/func_8005217C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8005217C.s rename to asm/non_matchings/hud_renderer/func_8005217C.s diff --git a/asm/non_matchings/code_800431B0/func_80052590.s b/asm/non_matchings/hud_renderer/func_80052590.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80052590.s rename to asm/non_matchings/hud_renderer/func_80052590.s diff --git a/asm/non_matchings/code_800431B0/func_800527D8.s b/asm/non_matchings/hud_renderer/func_800527D8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800527D8.s rename to asm/non_matchings/hud_renderer/func_800527D8.s diff --git a/asm/non_matchings/code_800431B0/func_800528EC.s b/asm/non_matchings/hud_renderer/func_800528EC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800528EC.s rename to asm/non_matchings/hud_renderer/func_800528EC.s diff --git a/asm/non_matchings/code_800431B0/func_80052C60.s b/asm/non_matchings/hud_renderer/func_80052C60.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80052C60.s rename to asm/non_matchings/hud_renderer/func_80052C60.s diff --git a/asm/non_matchings/code_800431B0/func_80052E30.s b/asm/non_matchings/hud_renderer/func_80052E30.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80052E30.s rename to asm/non_matchings/hud_renderer/func_80052E30.s diff --git a/asm/non_matchings/code_800431B0/func_80052F20.s b/asm/non_matchings/hud_renderer/func_80052F20.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80052F20.s rename to asm/non_matchings/hud_renderer/func_80052F20.s diff --git a/asm/non_matchings/code_800431B0/func_800532A4.s b/asm/non_matchings/hud_renderer/func_800532A4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800532A4.s rename to asm/non_matchings/hud_renderer/func_800532A4.s diff --git a/asm/non_matchings/code_800431B0/func_800534A4.s b/asm/non_matchings/hud_renderer/func_800534A4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800534A4.s rename to asm/non_matchings/hud_renderer/func_800534A4.s diff --git a/asm/non_matchings/code_800431B0/func_800534E8.s b/asm/non_matchings/hud_renderer/func_800534E8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800534E8.s rename to asm/non_matchings/hud_renderer/func_800534E8.s diff --git a/asm/non_matchings/code_800431B0/func_80053870.s b/asm/non_matchings/hud_renderer/func_80053870.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80053870.s rename to asm/non_matchings/hud_renderer/func_80053870.s diff --git a/asm/non_matchings/code_800431B0/func_80053E6C.s b/asm/non_matchings/hud_renderer/func_80053E6C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80053E6C.s rename to asm/non_matchings/hud_renderer/func_80053E6C.s diff --git a/asm/non_matchings/code_800431B0/func_800541BC.s b/asm/non_matchings/hud_renderer/func_800541BC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800541BC.s rename to asm/non_matchings/hud_renderer/func_800541BC.s diff --git a/asm/non_matchings/code_800431B0/func_80054414.s b/asm/non_matchings/hud_renderer/func_80054414.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80054414.s rename to asm/non_matchings/hud_renderer/func_80054414.s diff --git a/asm/non_matchings/code_800431B0/func_80054664.s b/asm/non_matchings/hud_renderer/func_80054664.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80054664.s rename to asm/non_matchings/hud_renderer/func_80054664.s diff --git a/asm/non_matchings/code_800431B0/func_80054938.s b/asm/non_matchings/hud_renderer/func_80054938.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80054938.s rename to asm/non_matchings/hud_renderer/func_80054938.s diff --git a/asm/non_matchings/code_800431B0/func_80054BE8.s b/asm/non_matchings/hud_renderer/func_80054BE8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80054BE8.s rename to asm/non_matchings/hud_renderer/func_80054BE8.s diff --git a/asm/non_matchings/code_800431B0/func_80055164.s b/asm/non_matchings/hud_renderer/func_80055164.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80055164.s rename to asm/non_matchings/hud_renderer/func_80055164.s diff --git a/asm/non_matchings/code_800431B0/func_80055228.s b/asm/non_matchings/hud_renderer/func_80055228.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80055228.s rename to asm/non_matchings/hud_renderer/func_80055228.s diff --git a/asm/non_matchings/code_800431B0/func_800552BC.s b/asm/non_matchings/hud_renderer/func_800552BC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800552BC.s rename to asm/non_matchings/hud_renderer/func_800552BC.s diff --git a/asm/non_matchings/code_800431B0/func_800557B4.s b/asm/non_matchings/hud_renderer/func_800557B4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800557B4.s rename to asm/non_matchings/hud_renderer/func_800557B4.s diff --git a/asm/non_matchings/code_800431B0/func_8005592C.s b/asm/non_matchings/hud_renderer/func_8005592C.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_8005592C.s rename to asm/non_matchings/hud_renderer/func_8005592C.s diff --git a/asm/non_matchings/code_800431B0/func_80055AB8.s b/asm/non_matchings/hud_renderer/func_80055AB8.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80055AB8.s rename to asm/non_matchings/hud_renderer/func_80055AB8.s diff --git a/asm/non_matchings/code_800431B0/func_80055C38.s b/asm/non_matchings/hud_renderer/func_80055C38.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80055C38.s rename to asm/non_matchings/hud_renderer/func_80055C38.s diff --git a/asm/non_matchings/code_800431B0/func_800562E4.s b/asm/non_matchings/hud_renderer/func_800562E4.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800562E4.s rename to asm/non_matchings/hud_renderer/func_800562E4.s diff --git a/asm/non_matchings/code_800431B0/func_800563DC.s b/asm/non_matchings/hud_renderer/func_800563DC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_800563DC.s rename to asm/non_matchings/hud_renderer/func_800563DC.s diff --git a/asm/non_matchings/code_800431B0/func_80056AC0.s b/asm/non_matchings/hud_renderer/func_80056AC0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80056AC0.s rename to asm/non_matchings/hud_renderer/func_80056AC0.s diff --git a/asm/non_matchings/code_800431B0/func_80056BF0.s b/asm/non_matchings/hud_renderer/func_80056BF0.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80056BF0.s rename to asm/non_matchings/hud_renderer/func_80056BF0.s diff --git a/asm/non_matchings/code_800431B0/func_80056E24.s b/asm/non_matchings/hud_renderer/func_80056E24.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80056E24.s rename to asm/non_matchings/hud_renderer/func_80056E24.s diff --git a/asm/non_matchings/code_800431B0/func_80056FCC.s b/asm/non_matchings/hud_renderer/func_80056FCC.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80056FCC.s rename to asm/non_matchings/hud_renderer/func_80056FCC.s diff --git a/asm/non_matchings/code_800431B0/func_80057114.s b/asm/non_matchings/hud_renderer/func_80057114.s similarity index 100% rename from asm/non_matchings/code_800431B0/func_80057114.s rename to asm/non_matchings/hud_renderer/func_80057114.s diff --git a/asm/non_matchings/code_800431B0/func_8005762C.s b/asm/non_matchings/hud_renderer/func_8005762C.s similarity index 96% rename from asm/non_matchings/code_800431B0/func_8005762C.s rename to asm/non_matchings/hud_renderer/func_8005762C.s index e3d72fb20..711a2302a 100644 --- a/asm/non_matchings/code_800431B0/func_8005762C.s +++ b/asm/non_matchings/hud_renderer/func_8005762C.s @@ -8,7 +8,7 @@ glabel func_8005762C /* 058244 80057644 AFB30020 */ sw $s3, 0x20($sp) /* 058248 80057648 AFB00014 */ sw $s0, 0x14($sp) /* 05824C 8005764C AFA60030 */ sw $a2, 0x30($sp) -/* 058250 80057650 0C015D15 */ jal func_80057454 +/* 058250 80057650 0C015D15 */ jal debug_wrap_text /* 058254 80057654 AFA70034 */ sw $a3, 0x34($sp) /* 058258 80057658 8FA60030 */ lw $a2, 0x30($sp) /* 05825C 8005765C 3C038016 */ lui $v1, %hi(D_801657B8) # $v1, 0x8016 @@ -47,7 +47,7 @@ glabel func_8005762C /* 0582CC 800576CC 0C015CF9 */ jal func_800573E4 /* 0582D0 800576D0 2610FFFF */ addiu $s0, $s0, -1 /* 0582D4 800576D4 02202025 */ move $a0, $s1 -/* 0582D8 800576D8 0C015D15 */ jal func_80057454 +/* 0582D8 800576D8 0C015D15 */ jal debug_wrap_text /* 0582DC 800576DC 02402825 */ move $a1, $s2 /* 0582E0 800576E0 82060000 */ lb $a2, ($s0) /* 0582E4 800576E4 5666FFF8 */ bnel $s3, $a2, .L800576C8 diff --git a/asm/non_matchings/code_800431B0/load_debug_font.s b/asm/non_matchings/hud_renderer/load_debug_font.s similarity index 100% rename from asm/non_matchings/code_800431B0/load_debug_font.s rename to asm/non_matchings/hud_renderer/load_debug_font.s diff --git a/ctx_includes.c b/ctx_includes.c index 74d371b74..91f2a760e 100644 --- a/ctx_includes.c +++ b/ctx_includes.c @@ -100,7 +100,7 @@ #include "src/code_8001F980.h" #include "src/code_80027D00.h" #include "src/code_8003DC40.h" -#include "src/code_800431B0.h" +#include "src/hud_renderer.h" #include "src/code_80057C60.h" #include "src/code_8006E9C0.h" #include "src/code_80071F00.h" diff --git a/include/PR/gbi.h b/include/PR/gbi.h index 82ed17b5d..1141a2256 100644 --- a/include/PR/gbi.h +++ b/include/PR/gbi.h @@ -154,8 +154,7 @@ # define G_BRANCH_Z (G_IMMFIRST-15) # define G_LOAD_UCODE (G_IMMFIRST-16) # define G_QUAD (G_IMMFIRST-10) -#else -# define G_RDPHALF_CONT (G_IMMFIRST-13) +# define G_RDPHALF_CONT (G_IMMFIRST-13) // From F3D_OLD used to render lap & timer UI. #endif /* We are overloading 2 of the immediate commands diff --git a/include/defines.h b/include/defines.h index 15726a6ed..5dc71a5f5 100644 --- a/include/defines.h +++ b/include/defines.h @@ -31,7 +31,8 @@ * D-pad DOWN = MARIO * */ -#define DEBUG_MODE FALSE +#define DEBUG_MODE 0 +#define DEBUG_MENU 1 #define HOLD_ALL_DPAD_AND_C_BUTTONS (U_JPAD | L_JPAD | R_JPAD | D_JPAD | U_CBUTTONS | L_CBUTTONS | R_CBUTTONS | D_CBUTTONS) /** @@ -63,7 +64,7 @@ #define PLAYER_INACTIVE 0 // 0x0000 #define PLAYER_EXISTS (1 << 15) // 0x8000 -#define PLAYER_CINEMATIC_MODE (1 << 11) // 0x0800 +#define PLAYER_CINEMATIC_MODE (1 << 11) // 0x0800 // Also used to track eliminations in Battle mode. #define PLAYER_STAGING (1 << 9) // 0x0200 #define PLAYER_START_SEQUENCE (1 << 13) // 0x2000 #define PLAYER_CPU (1 << 12) // 0x1000 diff --git a/mk64.ld b/mk64.ld index b619b5d6e..8e1562c72 100644 --- a/mk64.ld +++ b/mk64.ld @@ -24,7 +24,7 @@ OUTPUT_ARCH (mips) END_SEG(name##_mio0) #define COURSE_DATA_SEG(dir, name) \ - BEGIN_SEG(name##_mio0, 0x0) \ + BEGIN_SEG(name##_mio0, 0x06000000) \ { \ BUILD_DIR/courses/dir/course_data.inc.mio0.o(.data); \ . = ALIGN(0x10); \ @@ -96,7 +96,7 @@ SECTIONS BUILD_DIR/asm/tkmk00_decode.o(.text); BUILD_DIR/src/gbiMacro.o(.text); BUILD_DIR/src/math_util_2.o(.text); - BUILD_DIR/src/code_800431B0.o(.text); + BUILD_DIR/src/hud_renderer.o(.text); BUILD_DIR/src/code_80057C60.o(.text); BUILD_DIR/src/code_8006E9C0.o(.text); BUILD_DIR/src/code_80071F00.o(.text); @@ -282,7 +282,7 @@ SECTIONS BUILD_DIR/src/code_80027D00.o(.rodata); BUILD_DIR/src/spawn_players.o(.rodata); BUILD_DIR/src/code_8003DC40.o(.rodata); - BUILD_DIR/src/code_800431B0.o(.rodata); + BUILD_DIR/src/hud_renderer.o(.rodata); BUILD_DIR/src/code_80057C60.o(.rodata); BUILD_DIR/src/code_8006E9C0.o(.rodata); BUILD_DIR/src/code_80071F00.o(.rodata); diff --git a/progress.py b/progress.py index 3b55bd5e5..777d753e7 100644 --- a/progress.py +++ b/progress.py @@ -77,7 +77,7 @@ mainSegFiles2 = [ "asm/non_matchings/code_80005FD0", "asm/non_matchings/code_8001F980", "asm/non_matchings/code_80027D00", - "asm/non_matchings/code_800431B0", + "asm/non_matchings/hud_renderer", "asm/non_matchings/code_80057C60", "asm/non_matchings/code_8006E9C0", "asm/non_matchings/code_80071F00", @@ -168,7 +168,7 @@ mainSegFiles = [ "build/us/src/camera", "build/us/src/code_8001F980", "build/us/src/code_80027D00", - "build/us/src/code_800431B0", + "build/us/src/hud_renderer", "build/us/src/code_80057C60", "build/us/src/code_8006E9C0", "build/us/src/code_80071F00", diff --git a/src/actors_extended.c b/src/actors_extended.c index 16a913ecf..0c94d4716 100644 --- a/src/actors_extended.c +++ b/src/actors_extended.c @@ -712,8 +712,8 @@ void update_obj_banana(struct BananaActor *banana) { } else { controller = &gControllers[banana->rot[0]]; } - if ((controller->buttonDepressed & 0x2000) != 0) { - controller->buttonDepressed &= ~0x2000; + if ((controller->buttonDepressed & Z_TRIG) != 0) { + controller->buttonDepressed &= ~Z_TRIG; banana->state = 1; banana->unk_04 = 0x00B4; player->statusEffects &= ~0x40000; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 836ca50d0..734398596 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -9,7 +9,7 @@ #include "math_util_2.h" #include "code_80005FD0.h" #include "code_8001F980.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_80057C60.h" #include "code_80071F00.h" #include "code_80086E70.h" @@ -2837,17 +2837,14 @@ loop_2: GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005D1F4.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -s32 dma_textures(? *, ?, ?); // extern -extern ? D_0F05D1E8; -extern ? D_0F05D420; -extern ? D_0F05D674; -extern ? D_0F05DA50; -extern ? D_0F05DDFC; -extern ? D_0F05DFC0; -extern ? D_0F05E19C; -extern ? D_0F05E3E0; +extern Gfx D_0F05D1E8[]; +extern Gfx D_0F05D420[]; +extern Gfx D_0F05D674[]; +extern Gfx D_0F05DA50[]; +extern Gfx D_0F05DDFC[]; +extern Gfx D_0F05DFC0[]; +extern Gfx D_0F05E19C[]; +extern Gfx D_0F05E3E0[]; extern s32 D_8018D420; extern s32 D_8018D424; extern s32 D_8018D438; @@ -2865,13 +2862,10 @@ extern s32 D_8018D464; extern s32 D_8018D468; extern s32 D_8018D46C; extern s32 D_8018D470; -extern s32 D_8018D474; extern s32 D_8018D478; extern s32 D_8018D480; extern s32 D_8018D484; extern s32 D_8018D488; -extern s32 D_8018D48C; -extern s32 D_8018D490; extern s32 D_8018D494; extern s32 D_8018D498; extern s32 D_8018D49C; @@ -2886,35 +2880,35 @@ extern s32 D_8018D4BC; extern s32 D_8018D4C0; extern s32 D_8018D4C4; extern s32 D_8018D4C8; -extern ? gTexture69B03C; -extern ? gTexture69B140; -extern ? gTexture69B378; -extern ? gTexture69B960; -extern ? gTexture69BA28; -extern ? gTexture69C1E8; -extern ? gTexture69C354; -extern ? gTexture69C4E4; -extern ? gTexture69C80C; -extern ? gTexture69C9C4; -extern ? gTexture69CB84; -extern ? gTexture69CCEC; -extern ? gTexture69CEB8; -extern ? gTexture69D148; -extern ? gTexture69D4E0; -extern ? gTexture69D8FC; -extern ? gTexture69DCB4; -extern ? gTexture69DFA0; -extern ? gTexture69E25C; -extern ? gTexture69E518; -extern ? gTexture69E7A8; -extern ? gTexture69EA18; -extern ? gTexture69EC54; -extern ? gTexture69EE38; -extern ? gTexture69EFE0; -extern ? gTextureBoingExclamation; -extern ? gTextureKartShadow; -extern ? gTextureLightningBolt0; -extern ? gTextureLightningBolt1; +extern u8 gTexture69B03C[]; +extern u8 gTexture69B140[]; +extern u8 gTexture69B378[]; +extern u8 gTexture69B960[]; +extern u8 gTexture69BA28[]; +extern u8 gTexture69C1E8[]; +extern u8 gTexture69C354[]; +extern u8 gTexture69C4E4[]; +extern u8 gTexture69C80C[]; +extern u8 gTexture69C9C4[]; +extern u8 gTexture69CB84[]; +extern u8 gTexture69CCEC[]; +extern u8 gTexture69CEB8[]; +extern u8 gTexture69D148[]; +extern u8 gTexture69D4E0[]; +extern u8 gTexture69D8FC[]; +extern u8 gTexture69DCB4[]; +extern u8 gTexture69DFA0[]; +extern u8 gTexture69E25C[]; +extern u8 gTexture69E518[]; +extern u8 gTexture69E7A8[]; +extern u8 gTexture69EA18[]; +extern u8 gTexture69EC54[]; +extern u8 gTexture69EE38[]; +extern u8 gTexture69EFE0[]; +extern u8 gTextureBoingExclamation[]; +extern u8 gTextureKartShadow[]; +extern u8 gTextureLightningBolt0[]; +extern u8 gTextureLightningBolt1[]; void func_8005D290(void) { D_8018D488 = dma_textures(&gTexture69C80C, 0x400, 0x400); @@ -2956,9 +2950,6 @@ void func_8005D290(void) { D_8018D4C4 = dma_textures(&gTextureLightningBolt0, 0x800, 0x800); D_8018D4C8 = dma_textures(&gTextureLightningBolt1, 0x800, 0x800); } -#else -GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005D290.s") -#endif void func_8005D6C0(Player* player) { s32 temp_v0; @@ -8909,126 +8900,23 @@ void func_8006AFD0(Player *player, s16 arg1, s8 arg2, s8 arg3) { func_80021E10((f32 (*)[4]) &sp140[0], &sp134, &sp12C); func_80021F84((f32 (*)[4]) &sp140[0], var_f20); func_80022180(&gGfxPool->mtxPool[D_80164AF0] + 0xFAC0, (f32 (*)[4]) &sp140[0]); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x01020040; - temp_v0_3->words.w1 = (s32) (&gGfxPool->mtxPool[D_80164AF0] + 0xFAC0) & 0x1FFFFFFF; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = (u32) D_0D008DB8; - temp_v0_4->words.w0 = 0x06000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w0 = 0xFD100000; - temp_v0_5->words.w1 = (u32) &D_800E52D0; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w0 = 0xE8000000; - temp_v0_6->words.w1 = 0; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w0 = 0xF5000100; - temp_v0_7->words.w1 = 0x07000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w0 = 0xE6000000; - temp_v0_8->words.w1 = 0; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w0 = 0xF0000000; - temp_v0_9->words.w1 = 0x073FC000; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - spB0 = temp_v0_10; - temp_v0_10->words.w0 = 0xE7000000; - temp_v0_10->words.w1 = 0; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - spAC = temp_v0_11; - temp_v0_11->words.w0 = 0xBA000E02; - spAC->words.w1 = 0x00008000; + + gSPMatrix(gDisplayListHead++, PHYSICAL_TO_VIRTUAL(&gGfxPool->mtxPool[D_80164AF0] + 0xFAC0), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gDisplayListHead++, D_0D008DB8); + gDPLoadTLUT_pal256(gDisplayListHead++, 0x800E52D0); + gDPSetTextureLUT(gDisplayListHead++, G_TT_RGBA16); + func_8004B614((s32) sp128, (s32) sp126, (s32) sp124, (s32) sp122, (s32) sp120, (s32) sp11E, 0x000000D8); - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->words.w0 = 0xB900031D; - temp_v0_12->words.w1 = 0x00505978; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w0 = 0xFD500000; - temp_v0_13->words.w1 = D_8018D4BC; - temp_v0_14 = gDisplayListHead; - gDisplayListHead = temp_v0_14 + 8; - temp_v0_14->words.w1 = 0x07080200; - temp_v0_14->words.w0 = 0xF5500000; - temp_v0_15 = gDisplayListHead; - gDisplayListHead = temp_v0_15 + 8; - temp_v0_15->words.w1 = 0; - temp_v0_15->words.w0 = 0xE6000000; - temp_v0_16 = gDisplayListHead; - gDisplayListHead = temp_v0_16 + 8; - temp_v0_16->words.w1 = 0x073FF100; - temp_v0_16->words.w0 = 0xF3000000; - temp_v0_17 = gDisplayListHead; - gDisplayListHead = temp_v0_17 + 8; - temp_v0_17->words.w1 = 0; - temp_v0_17->words.w0 = 0xE7000000; - temp_v0_18 = gDisplayListHead; - gDisplayListHead = temp_v0_18 + 8; - temp_v0_18->words.w0 = 0xF5481000; - temp_v0_18->words.w1 = 0x00080200; - temp_v0_19 = gDisplayListHead; - gDisplayListHead = temp_v0_19 + 8; - temp_v0_19->words.w0 = 0xF2000000; - temp_v0_19->words.w1 = 0x000FC07C; - temp_v0_20 = gDisplayListHead; - gDisplayListHead = temp_v0_20 + 8; - temp_v0_20->words.w1 = (u32) &D_800E5250; - temp_v0_20->words.w0 = 0x0400103F; - temp_v0_21 = gDisplayListHead; - gDisplayListHead = temp_v0_21 + 8; - temp_v0_21->words.w1 = (u32) D_0D008C78; - temp_v0_21->words.w0 = 0x06000000; - temp_v0_22 = gDisplayListHead; - gDisplayListHead = temp_v0_22 + 8; - temp_v0_22->words.w0 = 0xFD500000; - temp_v0_22->words.w1 = D_8018D4C0 - 0x40; - temp_v0_23 = gDisplayListHead; - gDisplayListHead = temp_v0_23 + 8; - temp_v0_23->words.w1 = 0x07080200; - temp_v0_23->words.w0 = 0xF5500000; - temp_v0_24 = gDisplayListHead; - gDisplayListHead = temp_v0_24 + 8; - temp_v0_24->words.w1 = 0; - temp_v0_24->words.w0 = 0xE6000000; - temp_v0_25 = gDisplayListHead; - gDisplayListHead = temp_v0_25 + 8; - temp_v0_25->words.w1 = 0x073FF100; - temp_v0_25->words.w0 = 0xF3000000; - temp_v0_26 = gDisplayListHead; - gDisplayListHead = temp_v0_26 + 8; - temp_v0_26->words.w1 = 0; - temp_v0_26->words.w0 = 0xE7000000; - temp_v0_27 = gDisplayListHead; - gDisplayListHead = temp_v0_27 + 8; - temp_v0_27->words.w0 = 0xF5481000; - temp_v0_27->words.w1 = 0x00080200; - temp_v0_28 = gDisplayListHead; - gDisplayListHead = temp_v0_28 + 8; - temp_v0_28->words.w0 = 0xF2000000; - temp_v0_28->words.w1 = 0x000FC07C; - temp_v0_29 = gDisplayListHead; - gDisplayListHead = temp_v0_29 + 8; - temp_v0_29->words.w1 = (u32) &D_800E5290; - temp_v0_29->words.w0 = 0x0400103F; - temp_v0_30 = gDisplayListHead; - gDisplayListHead = temp_v0_30 + 8; - temp_v0_30->words.w1 = (u32) D_0D008C78; - temp_v0_30->words.w0 = 0x06000000; - temp_v0_31 = gDisplayListHead; - gDisplayListHead = temp_v0_31 + 8; - temp_v0_31->words.w1 = 0x00010001; - temp_v0_31->words.w0 = 0xBB000000; - D_80164AF0 += 1; + + gDPSetRenderMode(gDisplayListHead++, AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_WRAP | ZMODE_XLU | CVG_X_ALPHA | FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA), AA_EN | Z_CMP | Z_UPD | IM_RD | CVG_DST_WRAP | ZMODE_XLU | CVG_X_ALPHA | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPLoadTextureBlock(gDisplayListHead++, D_8018D4BC, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gSPVertex(gDisplayListHead++, D_800E5250, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D008C78); + gDPLoadTextureBlock(gDisplayListHead++, D_8018D4C0 - 0x40, G_IM_FMT_CI, G_IM_SIZ_8b, 64, 32, 0, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); + gSPVertex(gDisplayListHead++, D_800E5290, 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D008C78); + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); + D_80164AF0++; } #else GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006AFD0.s") diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 611f2d522..99cb080e7 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -1274,7 +1274,7 @@ UNUSED void func_8008A2CC(s32 objectIndex, s32 cameraId, u16 arg2) { } } -u32 func_8008A364(s32 objectIndex, s32 cameraId, u16 arg2, s32 arg3) { +s32 func_8008A364(s32 objectIndex, s32 cameraId, u16 arg2, s32 arg3) { Camera *camera; u32 var_v1; u16 var_a2; diff --git a/src/code_80086E70.h b/src/code_80086E70.h index 4c65f0380..203960227 100644 --- a/src/code_80086E70.h +++ b/src/code_80086E70.h @@ -77,7 +77,7 @@ s32 func_8008A0B4(s32, Player*, Camera*, u16); s32 func_8008A140(s32, Camera*, u16); void func_8008A1D0(s32, s32, s32, s32); void func_8008A2CC(s32, s32, u16); -u32 func_8008A364(s32, s32, u16, s32); +s32 func_8008A364(s32, s32, u16, s32); void func_8008A454(s32, s32, s32); void func_8008A4CC(s32); void func_8008A610(s32); diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index 61ae4cbbf..baa2f4525 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -8,7 +8,7 @@ #include "code_80005FD0.h" #include "code_8001F980.h" #include "code_80027D00.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_80057C60.h" #include "code_8008C1D0.h" #include "audio/external.h" diff --git a/src/code_80091750.c b/src/code_80091750.c index 2b9c09c68..664913447 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -325,6 +325,7 @@ void func_80092258(void); // todo remove this line void func_80091FA4(void) { s32 i; + // todo: These sizes need to be sizeof() for shiftability if possible D_8018D9B4 = get_next_available_memory_addr(0x00002800); D_8018D9B0 = get_next_available_memory_addr(0x000124F8); D_8018D9B8 = get_next_available_memory_addr(0x00001000); @@ -11262,7 +11263,6 @@ void func_800A7790(struct_8018D9E0_entry *arg0) { s32 creditIndex; s8 slideDirection; UNUSED s32 pad; - creditIndex = arg0->type - 0x190; set_text_color(D_802850C0[creditIndex].textColor); slideDirection = D_802850C0[creditIndex].slideDirection; @@ -11292,8 +11292,7 @@ void convert_number_to_ascii(s32 number, char *buffer) { void write_dashes(char *buffer) { buffer[0] = 0x2D; buffer[1] = 0x2D; - // Terminator - buffer[2] = 0; + buffer[2] = '\0'; } // Originally func_800A78F4 diff --git a/src/code_80280650.c b/src/code_80280650.c index 2c9c789b8..200fb2f1d 100644 --- a/src/code_80280650.c +++ b/src/code_80280650.c @@ -6,7 +6,7 @@ #include "variables.h" #include "common_textures.h" #include "code_8001F980.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_80280650.h" void func_80280650(void) { diff --git a/src/code_80281C40.c b/src/code_80281C40.c index 121bdd2d2..2f751c3c5 100644 --- a/src/code_80281C40.c +++ b/src/code_80281C40.c @@ -4,7 +4,7 @@ #include "main.h" #include "math_util.h" #include "skybox_and_splitscreen.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_80057C60.h" #include "code_80091750.h" #include "code_80280650.h" diff --git a/src/crash_screen.c b/src/crash_screen.c index fa7b6cace..a612f48fd 100644 --- a/src/crash_screen.c +++ b/src/crash_screen.c @@ -220,7 +220,8 @@ void thread9_crash_screen(UNUSED void *arg0) // Run only on the first iteration. if (sCounter == 0) { crash_screen_draw_square((u16 *)pFramebuffer); - + //#define SKIP_DRAW_SQUARE + #ifndef SKIP_DRAW_SQUARE while(1) { read_controllers(); @@ -238,6 +239,7 @@ void thread9_crash_screen(UNUSED void *arg0) break; } } + #endif crash_screen_draw_info((u16 *) pFramebuffer, thread); } diff --git a/src/gbiMacro.c b/src/gbiMacro.c index 0741209c0..37baa4b66 100644 --- a/src/gbiMacro.c +++ b/src/gbiMacro.c @@ -17,6 +17,6 @@ UNUSED void gfx_func_80040D00(void) { gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING); guOrtho(&gGfxPool->mtxPool[0], 0.0f, 320.0f, 0.0f, 240.0f, -1.0f, 1.0f, 1.0f); gDPHalf1(gDisplayListHead++, 0x0000FFFF); - gSPMatrix(gDisplayListHead++, (u32) gGfxPool & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - gSPMatrix(gDisplayListHead++, (u32) &D_0D008E98 & 0x1FFFFFFF, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); -} + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(gGfxPool), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&D_0D008E98), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); +} \ No newline at end of file diff --git a/src/code_800431B0.c b/src/hud_renderer.c similarity index 87% rename from src/code_800431B0.c rename to src/hud_renderer.c index 2641eb03f..64b6e381b 100644 --- a/src/code_800431B0.c +++ b/src/hud_renderer.c @@ -1,16 +1,18 @@ #include +#include #include #include #include #include #include #include "memory.h" +#include "math_util.h" #include "math_util_2.h" #include "objects.h" #include "variables.h" #include "common_textures.h" #include "code_8001F980.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_80071F00.h" #include "code_80091750.h" #include "code_802AAA70.h" @@ -253,7 +255,7 @@ void func_80044924(s8 *image, s32 width, s32 height) { temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044924.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044924.s") #endif UNUSED void func_80044AB8(s8 *image, s32 width, s32 height) { @@ -322,7 +324,7 @@ void func_80044DA0(s8 *image, s32 width, s32 height) { temp_v0_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044DA0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044DA0.s") #endif #ifdef MIPS_TO_C @@ -378,7 +380,7 @@ void func_80044F34(s32 arg0, s32 arg1, s32 arg2) { temp_v0_7->unk4 = ((((arg1 - 1) * 4) & 0xFFF) << 0xC) | (((arg2 - 1) * 4) & 0xFFF); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80044F34.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80044F34.s") #endif #ifdef MIPS_TO_C @@ -436,7 +438,7 @@ void func_800450C8(s8 *image, s32 width, s32 height) { temp_v1_7->words.w1 = ((((width - 1) * 4) & 0xFFF) << 0xC) | (((height - 1) * 4) & 0xFFF); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800450C8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800450C8.s") #endif void func_800452A4(s8 *image, s32 width, s32 height) { @@ -610,7 +612,7 @@ void func_80045738(s8 *image1, s8 *image2, s32 width, s32 height) { sp1C->words.w1 = sp4 | 0x01000000 | sp0; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045738.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80045738.s") #endif void func_80045B2C(Vtx *arg0) { @@ -687,53 +689,32 @@ void func_80045F18(s8 *arg0, Vtx *arg1, s32 width, s32 arg3, s32 height, s32 som gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80045738(s8 *, s32, s32, s32); /* extern */ - void func_80046030(s8 *arg0, s32 arg1, Vtx *arg2, s32 width, s32 arg4, s32 height) { - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - s32 temp_lo; s32 temp_lo_2; s32 var_s0; s32 var_s2; - s32 var_s3; s8 *var_s1; + s32 i; + s32 var; + + gSPDisplayList(gDisplayListHead++, D_0D008138); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0x06000000; - temp_v0->words.w1 = (u32) D_0D008138; var_s0 = 0; - temp_lo = arg4 / height; var_s1 = arg0; var_s2 = arg1; - var_s3 = 0; - if (temp_lo > 0) { - temp_lo_2 = width * (height - 1); - do { - func_80045738(var_s1, var_s2, width, height); - func_80045B2C(&arg2[var_s0]); - var_s3 += 1; - var_s1 += temp_lo_2 * 2; - var_s2 += temp_lo_2; - var_s0 += 4; - } while (var_s3 != temp_lo); + + for (i = 0; i < arg4 / height; i++) { + func_80045738(var_s1, var_s2, width, height); + func_80045B2C(&arg2[var_s0]); + var = height - 1; + temp_lo_2 = (width * var); + var_s1 += temp_lo_2 * 2; + var_s2 += temp_lo_2; + var_s0 += 4; } - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0xBB000000; - temp_v0_2->words.w1 = 0x00010001; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) D_0D008120; + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); + gSPDisplayList(gDisplayListHead++, D_0D008120); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046030.s") -#endif void func_800461A4(s8 *arg0, Vtx *arg1, s32 width, s32 arg3, s32 height) { s32 vertexIndex; @@ -747,7 +728,7 @@ void func_800461A4(s8 *arg0, Vtx *arg1, s32 width, s32 arg3, s32 height) { func_80045B2C(&arg1[vertexIndex]); var_s1 += width * height * 4; vertexIndex += 4; - } + } gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } @@ -763,7 +744,7 @@ void func_800462A8(s8 *arg0, Vtx *arg1, s32 width, s32 arg3, s32 height) { func_80045B2C(&arg1[vertexIndex]); var_s1 += width * (height - 1) * 4; vertexIndex += 4; - } + } gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } @@ -1340,64 +1321,27 @@ void func_80049478(s8 *arg0, Vtx *arg1, s32 arg2, s32 arg3, s32 width, s32 heigh gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044924(s8 *, s32, s32); /* extern */ - void func_8004961C(s8 *arg0, Vtx *arg1, s32 arg2, s32 arg3, s32 width, s32 height) { - s32 sp5C; - s32 sp40; - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - s32 temp_lo; - s32 temp_lo_2; - s32 var_s0; + s32 i; + s32 j; s32 var_s2; - s32 var_v0; s8 *var_s3; - - temp_lo = arg3 / height; var_s2 = 0; var_s3 = arg0; - sp40 = temp_lo; - var_v0 = 0; - if (temp_lo > 0) { - temp_lo_2 = arg2 / width; - do { - var_s0 = 0; - if (temp_lo_2 > 0) { - sp5C = var_v0; - do { - // gSPVertex(gDisplayListHead++, &arg2[var_s1], 4, 0); - // gSPDisplayList(gDisplayListHead++, D_0D006940); - func_80044924(var_s3, width, height); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0x0400103F; - var_s0 += 1; - temp_v0->words.w1 = (u32) &arg1[var_s2]; - temp_v0_2 = gDisplayListHead; - var_s3 = &var_s3[(s32) (width * height) / 2]; - gDisplayListHead = temp_v0_2 + 8; - var_s2 += 4; - temp_v0_2->words.w1 = (u32) D_0D006940; - temp_v0_2->words.w0 = 0x06000000; - } while (var_s0 != temp_lo_2); - var_v0 = sp5C; - } - var_v0 += 1; - } while (var_v0 != sp40); + + for (i = 0; i < arg3 / height; i++) { + for (j = 0; j < arg2 / width; j++) { + + func_80044924(var_s3, width, height); + gSPVertex(gDisplayListHead++, &arg1[var_s2], 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); + var_s3 += (width * height) / 2; + var_s2 += 4; + } } - // gSPTexture(gDisplayListHead++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0xBB000000; - temp_v0_3->words.w1 = 0x00010001; + + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004961C.s") -#endif void func_800497CC(s8 *arg0, Vtx *arg1, s32 arg2, s32 arg3, s32 width, s32 height) { s32 heightIndex; @@ -1419,64 +1363,25 @@ void func_800497CC(s8 *arg0, Vtx *arg1, s32 arg2, s32 arg3, s32 width, s32 heigh gSPTexture(gDisplayListHead++, 1, 1, 0, G_TX_RENDERTILE, G_OFF); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044DA0(s8 *, s32, s32); /* extern */ - void func_80049970(s8 *arg0, Vtx *arg1, s32 arg2, s32 arg3, s32 width, s32 height) { - s32 sp5C; - s32 sp40; - Gfx *temp_v0; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - s32 temp_lo; - s32 temp_lo_2; - s32 var_s0; + s32 i; + s32 j; s32 var_s2; - s32 var_v0; s8 *var_s3; - - temp_lo = arg3 / height; var_s2 = 0; var_s3 = arg0; - sp40 = temp_lo; - var_v0 = 0; - if (temp_lo > 0) { - temp_lo_2 = arg2 / width; - do { - var_s0 = 0; - if (temp_lo_2 > 0) { - sp5C = var_v0; - do { - func_80044DA0(var_s3, width, height); - // gSPVertex(gDisplayListHead++, &arg2[var_s1], 4, 0); - // gSPDisplayList(gDisplayListHead++, D_0D006940); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w0 = 0x0400103F; - var_s0 += 1; - temp_v0->words.w1 = (u32) &arg1[var_s2]; - temp_v0_2 = gDisplayListHead; - var_s3 = &var_s3[(s32) (width * height) / 2]; - gDisplayListHead = temp_v0_2 + 8; - var_s2 += 4; - temp_v0_2->words.w1 = (u32) D_0D006940; - temp_v0_2->words.w0 = 0x06000000; - } while (var_s0 != temp_lo_2); - var_v0 = sp5C; - } - var_v0 += 1; - } while (var_v0 != sp40); + + for (i = 0; i < arg3 / height; i++) { + for (j = 0; j < arg2 / width; j++) { + func_80044DA0(var_s3, width, height); + gSPVertex(gDisplayListHead++, &arg1[var_s2], 4, 0); + gSPDisplayList(gDisplayListHead++, D_0D006940); + var_s3 += (width * height) / 2; + var_s2 += 4; + } } - // gSPTexture(gDisplayListHead++, 0, 0, 0, G_TX_RENDERTILE, G_OFF); - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0xBB000000; - temp_v0_3->words.w1 = 0x00010001; + gSPTexture(gDisplayListHead++, 0x0001, 0x0001, 0, G_TX_RENDERTILE, G_OFF); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049970.s") -#endif void func_80049B20(s32 arg0, s32 arg1, u16 arg2, f32 arg3, s32 arg4, Vtx *arg5, s32 arg6, s32 arg7, s32 arg8, s32 arg9) { func_80042330(arg0, arg1, arg2, arg3); @@ -1833,125 +1738,82 @@ void func_8004B72C(s32 primRed, s32 primGreen, s32 primBlue, s32 envRed, s32 env gDPSetCombineLERP(gDisplayListHead++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); } -#ifdef MIPS_TO_C -//generated by m2c commit 6b6e1390bf30013247343623194964ff13d0c45b -void func_8004B7DC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { - Gfx *temp_v1; - Gfx *temp_v1_2; - Gfx *temp_v1_3; - Gfx *temp_v1_4; - Gfx *temp_v1_5; - Gfx *temp_v1_6; +void func_8004B7DC(s32 arg0, s32 arg1, s32 width, s32 height, s32 arg4, s32 arg5, s32 arg6) { - // These look like they should be gSPTextureRectangle, but that's not quite right... + s32 xh = (((arg0 + width) - 1) << 2); + s32 yh = (((arg1 + height) - 1) << 2); + s32 xl = ((arg0 * 4)); + s32 yl = arg1 * 4; + + s32 xh2 = (((arg0 + width)) << 2); + s32 yh2 = ((arg1 + height) << 2); if (arg6 == 0) { - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = (((((arg0 + arg2) - 1) * 4) & 0xFFF) << 0xC) | 0xE4000000 | ((((arg1 + arg3) - 1) * 4) & 0xFFF); - temp_v1->words.w1 = (((arg0 * 4) & 0xFFF) << 0xC) | ((arg1 * 4) & 0xFFF); - temp_v1_2 = gDisplayListHead; - gDisplayListHead = temp_v1_2 + 8; - temp_v1_2->words.w0 = 0xB3000000; - temp_v1_2->words.w1 = (arg4 << 0x15) | ((arg5 << 5) & 0xFFFF); - temp_v1_3 = gDisplayListHead; - gDisplayListHead = temp_v1_3 + 8; - temp_v1_3->words.w0 = 0xB2000000; - temp_v1_3->words.w1 = 0x10000400; + // todo: Update to F3DEX. Uses OLD definition for gspTextureRectangle. + gSPTextureRectangle(gDisplayListHead++, xl, yl, xh, yh, G_TX_RENDERTILE, arg4 << 5, (arg5 << 5), 4 << 10, 1 << 10); return; } - temp_v1_4 = gDisplayListHead; - gDisplayListHead = temp_v1_4 + 8; - temp_v1_4->words.w1 = (((arg0 * 4) & 0xFFF) << 0xC) | ((arg1 * 4) & 0xFFF); - temp_v1_4->words.w0 = ((((arg0 + arg2) * 4) & 0xFFF) << 0xC) | 0xE4000000 | (((arg1 + arg3) * 4) & 0xFFF); - temp_v1_5 = gDisplayListHead; - gDisplayListHead = temp_v1_5 + 8; - temp_v1_5->words.w0 = 0xB3000000; - temp_v1_5->words.w1 = (arg4 << 0x15) | ((arg5 << 5) & 0xFFFF); - temp_v1_6 = gDisplayListHead; - gDisplayListHead = temp_v1_6 + 8; - temp_v1_6->words.w0 = 0xB2000000; - temp_v1_6->words.w1 = 0x04000400; + gSPTextureRectangle(gDisplayListHead++, xl, yl, xh2, yh2, G_TX_RENDERTILE, arg4 << 5, (arg5 << 5), 1 << 10, 1 << 10); } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B7DC.s") -#endif void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); -void func_8004B950(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { - func_8004B7DC(arg0, arg1, arg2, arg3, 0, 0, arg4); +void func_8004B950(s32 arg0, s32 arg1, s32 width, s32 height, s32 arg4) { + func_8004B7DC(arg0, arg1, width, height, 0, 0, arg4); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern - void func_8004B97C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + s32 pad[2]; s32 sp2C; - s32 phi_a1; - s32 phi_v1; - s32 phi_v0; + s32 var_a1; + s32 var_v0; + s32 var_v1; - phi_a1 = arg1; - if (-arg2 < arg0) { - phi_v0 = 0; - if (-arg3 < arg1) { - //sp2C = arg0; - phi_v1 = 0; - if (arg0 < 0) { - arg0 = 0; - phi_v1 = -arg0; - } - if (arg1 < 0) { - phi_a1 = 0; - phi_v0 = -arg1; - } - func_8004B7DC(arg0, phi_a1, arg2 - phi_v1, arg3 - phi_v0, phi_v1, phi_v0, arg4); + if ((-arg2 < arg0) && (-arg3 < arg1)) { + var_v0 = 0; + var_v1 = 0; + sp2C = arg0; + var_a1 = arg1; + if (arg0 < 0) { + var_v1 = -arg0; + sp2C = 0; } + if (arg1 < 0) { + var_v0 = -arg1; + var_a1 = 0; + } + func_8004B7DC(sp2C, var_a1, arg2 - var_v1, arg3 - var_v0, var_v1, var_v0, arg4); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B97C.s") -#endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern void func_8004BA08(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { + s32 pad[2]; s32 sp2C; s32 phi_a1; s32 phi_v1; s32 phi_v0; - phi_a1 = arg1; - if (-arg2 < arg0) { + if ((-arg2 < arg0) && (-arg3 < arg1)) { phi_v0 = 0; - if (-arg3 < arg1) { - sp2C = arg0; - phi_v1 = 0; - if (arg0 < 0) { - sp2C = 0; - phi_v1 = -arg0; - } - if (arg1 < 0) { - phi_a1 = 0; - phi_v0 = -arg1; - } - func_8004B7DC(sp2C, phi_a1, arg2 - phi_v1, arg3 - phi_v0, phi_v1 + arg2, phi_v0, arg4); + phi_v1 = 0; + sp2C = arg0; + phi_a1 = arg1; + if (arg0 < 0) { + phi_v1 = -arg0; + sp2C = 0; } + if (arg1 < 0) { + phi_v0 = -arg1; + phi_a1 = 0; + } + func_8004B7DC(sp2C, phi_a1, arg2 - phi_v1, arg3 - phi_v0, phi_v1 + arg2, phi_v0, arg4); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BA08.s") -#endif - -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern void func_8004BA98(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { + s32 pad[2]; s32 sp34; s32 sp30; s32 sp2C; @@ -1959,29 +1821,26 @@ void func_8004BA98(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s s32 phi_v0; s32 phi_v1; - phi_a3 = arg3; if ((-arg2 < arg0) && (-arg3 < arg1)) { sp34 = arg0; sp30 = arg1; - sp2C = arg2; phi_v0 = arg4; + sp2C = arg2; + phi_a3 = arg3; phi_v1 = arg5; if (arg0 < 0) { + phi_v0 = arg4 - arg0; sp34 = 0; sp2C = arg2 + arg0; - phi_v0 = arg4 - arg0; } if (arg1 < 0) { + phi_v1 = arg5 - arg1; sp30 = 0; phi_a3 = arg3 + arg1; - phi_v1 = arg5 - arg1; } func_8004B7DC(sp34, sp30, sp2C, phi_a3, phi_v0, phi_v1, arg6); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BA98.s") -#endif UNUSED void func_8004BB34(void) { @@ -2044,7 +1903,7 @@ void func_8004BB3C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, f32 arg4) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BB3C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004BB3C.s") #endif void func_8004BD14(s32 arg0, s32 arg1, u32 width, u32 height, s32 alpha, s8 *arg5, s8 *arg6) { @@ -2077,36 +1936,27 @@ void func_8004C148(s16 arg0, s16 arg1, s16 arg2, u16 red, u16 green, u16 blue, u func_8004B97C(arg0, arg1, 1, arg2, 1); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_80043D50(s32, u32, u32); // extern -void func_8004B97C(s32, s32, u32, u32, s32); // extern +void func_8004C268(u32 arg0, u32 arg1, s8 *img, u32 width, u32 arg4, u32 height, s32 arg6) +{ + s32 i; + s8 *img2; -void func_8004C268(s32 arg0, s32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, s32 arg6) { - u32 temp_lo; - u32 temp_s2; - s32 phi_s1; - s32 phi_s0; - u32 phi_s2; + arg0 -= (width / 2); + arg1 -= (arg4 / 2); + img2 = img; - temp_lo = arg4 / arg5; - phi_s1 = arg2; - phi_s0 = arg1 - (arg4 >> 1); - phi_s2 = 0; - if (temp_lo != 0) { - do { - func_80043D50(phi_s1, arg3, arg5); - func_8004B97C(arg0 - (arg3 >> 1), phi_s0, arg3, arg5, arg6); - temp_s2 = phi_s2 + 1; - phi_s1 += arg3 * arg5 * 2; - phi_s0 += arg5; - phi_s2 = temp_s2; - } while (temp_s2 < temp_lo); + for (i = 0; i < arg4 / height; i++) { + func_80043D50(img2, width, height); + func_8004B97C(arg0, arg1, width, height, arg6); + // fakematch? + #ifdef AVOID_UB + img2 += (width * height) * 2; + #else + img2 += (width * height) * 2 ^ ((arg4 / height) * 0); + #endif + arg1 += height; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C268.s") -#endif UNUSED void func_8004C354() { } @@ -2209,14 +2059,14 @@ void func_8004C6FC(s16 arg0, s16 arg1, s8 *arg2, u32 arg3, u32 arg4) { temp_v0_4->words.w1 = (u32) D_0D007EB8; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004C6FC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004C6FC.s") #endif void func_8004C8D4(s16 arg0, s16 arg1) { func_8004C6FC(arg0, arg1, D_8018D1E0, 0x100, 0x80); } -void func_8004C91C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { +UNUSED void func_8004C91C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { gSPDisplayList(gDisplayListHead++, D_0D008108); gSPDisplayList(gDisplayListHead++, D_0D007EF8); gDPSetAlphaCompare(gDisplayListHead++, G_AC_THRESHOLD); @@ -2288,73 +2138,40 @@ UNUSED void func_8004CD18(s32 arg0, s32 arg1, s32 arg2) { func_8004C91C(arg0, arg1, arg2, 64, 64, 32); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -Gfx *func_8004B97C(s32, s32, s32, s32, s32); /* extern */ - -Gfx *func_8004CD48(s32 arg0, s32 arg1, s32 arg2, s32 width, s32 arg4, s32 height) { - s8 *sp40; - Gfx *temp_v1; - Gfx *var_v0; - s32 temp_lo; +UNUSED void func_8004CD48(s32 arg0, s32 arg1, s8 *arg2, s32 width, s32 arg4, s32 height) { + s32 pad; s32 var_s0; - s32 var_s1; + s32 i; s8 *var_s4; - temp_lo = arg4 / height; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; var_s0 = arg1 - (arg4 / 2); - var_s1 = 0; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; - var_v0 = temp_v1; - if (temp_lo > 0) { - var_s4 = sp40; - do { - func_800441E0(var_s4, width, height); - var_v0 = func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); - var_s1 += 1; - var_s4 += width * height * 2; - var_s0 += height; - } while (var_s1 != temp_lo); - sp40 = var_s4; + gSPDisplayList(gDisplayListHead++, D_0D007FE0); + + for (i = 0; i < arg4 / height; i++) { + func_800441E0(var_s4, width, height); + func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); + var_s4 += width * height * 2; + var_s0 += height; } - return var_v0; } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CD48.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004B97C(s32, s32, s32, s32, s32); /* extern */ - -void func_8004CE8C(s32 arg0, s32 arg1, s8 *arg2, s32 width, s32 arg4, s32 height) { - s32 temp_lo; +UNUSED void func_8004CE8C(s32 arg0, s32 arg1, s8 *arg2, s32 width, s32 arg4, s32 height) { s32 var_s0; - s32 var_s2; + s32 i; s8 *var_s1; - temp_lo = arg4 / height; var_s0 = arg1 - (arg4 / 2); var_s1 = arg2; - var_s2 = 0; - if (temp_lo > 0) { - do { - func_800444B0(var_s1, width, height); - func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); - var_s2 += 1; - var_s1 = &var_s1[width * height]; - var_s0 += height; - } while (var_s2 != temp_lo); + + for (i = 0; i < arg4 / height; i++) { + func_800444B0(var_s1, width, height); + func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); + var_s1 += width * height; + var_s0 += height; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CE8C.s") -#endif -void func_8004CF9C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { +UNUSED void func_8004CF9C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { gSPDisplayList(gDisplayListHead++, D_0D007FE0); func_8004CE8C(arg0, arg1, arg2, arg3, arg4, arg6); } @@ -2374,182 +2191,105 @@ UNUSED void func_8004D0CC(void) { } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044924(s8 *, s32, s32); /* extern */ -Gfx *func_8004B97C(s32, s32, s32, s32, s32); /* extern */ - Gfx *func_8004D0D4(s32 arg0, s32 arg1, s8 *arg2, s32 width, s32 arg4, s32 height) { - Gfx *temp_v1; Gfx *var_v0; - s32 temp_lo; s32 var_s0; - s32 var_s2; s8 *var_s1; + s32 i; - temp_lo = arg4 / height; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; var_s0 = arg1 - (arg4 / 2); var_s1 = arg2; - var_s2 = 0; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; - var_v0 = temp_v1; - if (temp_lo > 0) { - do { - func_80044924(var_s1, width, height); - var_v0 = func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); - var_s2 += 1; - var_s1 = &var_s1[width * height]; - var_s0 += height; - } while (var_s2 != temp_lo); - } - return var_v0; -} -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D0D4.s") -#endif + gSPDisplayList(gDisplayListHead++, D_0D007FE0); -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044924(s8 *, s32, s32); /* extern */ -? func_8004B97C(s32, s32, s32, s32, s32); /* extern */ + for (i = 0; i < arg4 / height; i++) { + func_80044924(var_s1, width, height); + func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); + var_s1 += width * height; + var_s0 += height; + } +} void func_8004D210(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 width, s32 arg8, s32 arg9, s32 height) { - Gfx *temp_v1; - s32 temp_lo; - s32 var_s0; s32 var_s3; s8 *var_s4; + s32 i; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; var_s3 = arg1 - (arg8 / 2); var_s4 = arg2; + gSPDisplayList(gDisplayListHead++, D_0D007FE0); func_8004B35C(arg3, arg4, arg5, arg6); - var_s0 = 0; - temp_lo = arg8 / height; - if (temp_lo > 0) { - do { - func_80044924(var_s4, width, height); - func_8004B97C(arg0 - (width / 2), var_s3, width, height, 1); - var_s0 += 1; - var_s4 = &var_s4[(s32) (width * height) / 2]; - var_s3 += height; - } while (var_s0 != temp_lo); - } -} -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D210.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044F34(s8 *, s32, s32); /* extern */ -? func_8004B97C(s32, s32, s32, s32, s32); /* extern */ + for (i = 0; i < arg8 / height; i++) { + func_80044924(var_s4, width, height); + func_8004B97C(arg0 - (width / 2), var_s3, width, height, 1); + var_s4 += (width * height) / 2; + var_s3 += height; + } + +} void func_8004D37C(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 width, s32 arg8, s32 arg9, s32 height) { - Gfx *temp_v1; - s32 temp_lo; - s32 var_s0; s32 var_s3; s8 *var_s4; + s32 i; + - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; var_s3 = arg1 - (arg8 / 2); var_s4 = arg2; + gSPDisplayList(gDisplayListHead++, D_0D007FE0); func_8004B414(arg3, arg4, arg5, arg6); - var_s0 = 0; - temp_lo = arg8 / height; - if (temp_lo > 0) { - do { - func_80044F34(var_s4, width, height); - func_8004B97C(arg0 - (width / 2), var_s3, width, height, 1); - var_s0 += 1; - var_s4 = &var_s4[(s32) (width * height) / 2]; - var_s3 += height; - } while (var_s0 != temp_lo); + + for (i = 0; i < arg8 / height; i++) { + func_80044F34(var_s4, width, height); + func_8004B97C(arg0 - (width / 2), var_s3, width, height, 1); + var_s4 += (width * height) / 2; + var_s3 += height; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D37C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800450C8(s8 *, s32, s32); /* extern */ -? func_8004BA08(s32, s32, s32, s32, s32); /* extern */ void func_8004D4E8(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 width, s32 arg8, s32 arg9, s32 height) { - Gfx *temp_v1; - s32 temp_lo; - s32 var_s0; s32 var_s3; s8 *var_s4; + s32 i; - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; var_s3 = arg1 - (arg8 / 2); var_s4 = arg2; + gSPDisplayList(gDisplayListHead++, D_0D007FE0); func_8004B414(arg3, arg4, arg5, arg6); - var_s0 = 0; - temp_lo = arg8 / height; - if (temp_lo > 0) { - do { - func_800450C8(var_s4, width, height); - func_8004BA08(arg0 - (width / 2), var_s3, width, height, 1); - var_s0 += 1; - var_s4 = &var_s4[(s32) (width * height) / 2]; - var_s3 += height; - } while (var_s0 != temp_lo); + + for (i = 0; i < arg8 / height; i++) { + func_800450C8(var_s4, width, height); + func_8004BA08(arg0 - (width / 2), var_s3, width, height, 1); + var_s4 += (width * height) / 2; + var_s3 += height; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D4E8.s") -#endif -#ifdef MIPS_TO_C +#ifdef NON_MATCHING //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044F34(s8 *, s32, s32); /* extern */ +//? func_80044F34(s8 *, s32, s32); /* extern */ -void func_8004D654(s32 arg0, s32 arg1, s8 *arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 width, s32 arg9, s32 argA, s32 height) { - Gfx *temp_v1; - s32 temp_lo; - s32 var_s0; +UNUSED void func_8004D654(s32 arg0, s32 arg1, s8 *arg2, f32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 width, s32 arg9, s32 argA, s32 height) { s8 *var_s2; - - temp_v1 = gDisplayListHead; - gDisplayListHead = temp_v1 + 8; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D008000; + s32 var_s3; + s32 i; + // Something weird with (width / 2). + var_s3 = arg1 - (width / 2); var_s2 = arg2; + gSPDisplayList(gDisplayListHead++, D_0D008000); func_8004B480(arg4, arg5, arg6); - var_s0 = 0; - temp_lo = arg9 / height; - if (temp_lo > 0) { - do { - func_80044F34(var_s2, width, height); - func_8004BB3C(arg0, arg1, width, arg9, arg3); - var_s0 += 1; - var_s2 = &var_s2[(s32) (width * height) / 2]; - } while (var_s0 != temp_lo); + + for (i = 0; i < arg9 / height; i++) { + func_80044F34(var_s2, width, height); + func_8004BB3C(arg0, var_s3, width, arg9, arg3); + var_s2 += (width * height) / 2; + var_s3 += height; } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D654.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004D654.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004B97C(s32, s32, s32, ?, s32); /* extern */ extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; @@ -2557,142 +2297,103 @@ extern f32 D_8018D00C; void func_8004D7B4(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4) { s32 sp5C; - Gfx *temp_v1; f32 temp_f20; s16 temp_s7; s16 var_s1; - s32 temp_s0; + u16 temp_s0; s32 temp_s5; s32 var_s3; - s32 var_s4; s8 *var_s2; + s32 test[3]; + s32 i; D_801656B0 += D_80165710; temp_f20 = D_8018D00C; - temp_v1 = gDisplayListHead; temp_s7 = D_80165708; - var_s1 = (s16) D_801656B0; - gDisplayListHead = temp_v1 + 8; + var_s1 = D_801656B0; var_s2 = arg2; var_s3 = arg1 - (arg4 / 2); - var_s4 = 0; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; - if (arg4 > 0) { - sp5C = arg3 * 2; - do { - temp_s0 = var_s1 & 0xFFFF; - temp_s5 = (s32) ((sins(temp_s0 & 0xFFFF) * temp_f20) + (f32) (arg0 - (arg3 / 2))); - sins(temp_s0 & 0xFFFF); - func_800441E0(var_s2, arg3, 1); - func_8004B97C(temp_s5, var_s3, arg3, 1, 1); - var_s4 += 1; - var_s1 += temp_s7; - var_s3 += 1; - var_s2 = &var_s2[sp5C]; - } while (var_s4 != arg4); + gSPDisplayList(gDisplayListHead++, D_0D007FE0); + + sp5C = arg3 * 2; + for (i = 0; i < arg4; i++) { + temp_s0 = var_s1; + temp_s5 = (s32) ((sins(temp_s0) * temp_f20) + (f32) (arg0 - (arg3 / 2))); + sins(temp_s0); + func_800441E0(var_s2, arg3, 1); + func_8004B97C(temp_s5, var_s3, arg3, 1, 1); + + var_s1 += temp_s7; + var_s3 += 1; + var_s2 += sp5C; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D7B4.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004B97C(s32, s32, s32, ?, s32); /* extern */ -extern u16 D_801656B0; -extern s16 D_80165708; -extern s16 D_80165710; -extern f32 D_8018D00C; void func_8004D93C(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4) { - Gfx *temp_v1; f32 temp_f20; s16 temp_s7; s16 var_s1; - s32 temp_s0; + u16 temp_s0; s32 temp_s6; s32 var_s4; - s32 var_s5; s8 *var_s2; + s32 i; + s32 var; D_801656B0 += D_80165710; temp_f20 = D_8018D00C; - temp_v1 = gDisplayListHead; temp_s7 = D_80165708; - var_s1 = (s16) D_801656B0; - gDisplayListHead = temp_v1 + 8; + var_s1 = D_801656B0; var_s2 = arg2; + var = arg3 / 2; var_s4 = arg1 - (arg4 / 2); - var_s5 = 0; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; - if (arg4 > 0) { - do { - temp_s0 = var_s1 & 0xFFFF; - temp_s6 = (s32) ((sins(temp_s0 & 0xFFFF) * temp_f20) + (f32) (arg0 - (arg3 / 2))); - sins(temp_s0 & 0xFFFF); - func_800444B0(var_s2, arg3, 1); - func_8004B97C(temp_s6, var_s4, arg3, 1, 1); - var_s5 += 1; - var_s1 += temp_s7; - var_s2 = &var_s2[arg3]; - var_s4 += 1; - } while (var_s5 != arg4); + + + gSPDisplayList(gDisplayListHead++, D_0D007FE0); + + for (i = 0; i < arg4; i++) { + temp_s0 = var_s1; + temp_s6 = (s32) ((sins(temp_s0) * temp_f20) + (f32) (arg0 - (var))); + sins(temp_s0); + func_800444B0(var_s2, arg3, 1); + func_8004B97C(temp_s6, var_s4, arg3, 1, 1); + var_s1 += temp_s7; + var_s2 = &var_s2[arg3]; + var_s4 += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D93C.s") -#endif - -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_80044924(s32, s32, ?); /* extern */ -? func_8004B97C(s32, s32, s32, ?, s32); /* extern */ -extern u16 D_801656B0; -extern s16 D_80165708; -extern s16 D_80165710; -extern f32 D_8018D00C; void func_8004DAB8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { - Gfx *temp_v1; f32 temp_f20; s16 temp_s7; s16 var_s1; - s32 temp_s0; + u16 temp_s0; s32 temp_s6; s32 var_s2; s32 var_s4; - s32 var_s5; + s32 var; + s32 i; D_801656B0 += D_80165710; temp_f20 = D_8018D00C; - temp_v1 = gDisplayListHead; temp_s7 = D_80165708; var_s1 = (s16) D_801656B0; - gDisplayListHead = temp_v1 + 8; var_s2 = arg2; + var = arg3 / 2; var_s4 = arg1 - (arg4 / 2); - var_s5 = 0; - temp_v1->words.w0 = 0x06000000; - temp_v1->words.w1 = (u32) D_0D007FE0; - if (arg4 > 0) { - do { - temp_s0 = var_s1 & 0xFFFF; - temp_s6 = (s32) ((sins(temp_s0 & 0xFFFF) * temp_f20) + (f32) (arg0 - (arg3 / 2))); - sins(temp_s0 & 0xFFFF); - func_80044924(var_s2, arg3, 1); - func_8004B97C(temp_s6, var_s4, arg3, 1, 1); - var_s5 += 1; - var_s1 += temp_s7; - var_s2 += arg3; - var_s4 += 1; - } while (var_s5 != arg4); + + gSPDisplayList(gDisplayListHead++, D_0D007FE0); + for (i = 0; i < arg4; i++) { + temp_s0 = var_s1; + temp_s6 = (s32) ((sins(temp_s0) * temp_f20) + (f32) (arg0 - (var))); + sins(temp_s0); + func_80044924(var_s2, arg3, 1); + func_8004B97C(temp_s6, var_s4, arg3, 1, 1); + var_s1 += temp_s7; + var_s2 += arg3; + var_s4 += 1; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004DAB8.s") -#endif UNUSED void func_8004DC34(s32 arg0, s32 arg1, s32 arg2) { func_8004CF9C(arg0, arg1, arg2, 8, 160, 8, 160); @@ -2758,37 +2459,22 @@ UNUSED void func_8004DF24(s32 arg0, s32 arg1, s32 arg2) { func_8004CF9C(arg0, arg1, arg2, 128, 32, 128, 32); } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004B97C(s32, s32, s32, s32, s32); /* extern */ - void func_8004DF5C(s32 arg0, s32 arg1, s8 *arg2, s32 width, s32 arg4, s32 height) { - s32 temp_lo; s32 var_s0; - s32 var_s2; s8 *var_s1; + s32 i; - temp_lo = arg4 / height; var_s0 = arg1 - (arg4 / 2); var_s1 = arg2; - var_s2 = 0; - if (temp_lo > 0) { - do { + + for (i = 0; i < arg4 / height; i++) { func_800452A4(var_s1, width, height); func_8004B97C(arg0 - (width / 2), var_s0, width, height, 1); - var_s2 += 1; - var_s1 = &var_s1[width * height]; + var_s1 += width * height; var_s0 += height; - } while (var_s2 != temp_lo); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004DF5C.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_8004B97C(u32, s32, s32, ?, s32); /* extern */ extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; @@ -2798,36 +2484,33 @@ void func_8004E06C(s32 arg0, s32 arg1, s8 *arg2, s32 arg3, s32 arg4) { f32 temp_f20; s16 temp_s7; s16 var_s1; - s32 temp_s0; + u16 temp_s0; s32 var_s4; - s32 var_s5; s8 *var_s2; u32 temp_s6; + s32 i; + s32 var; + D_801656B0 += D_80165710; temp_f20 = D_8018D00C; var_s1 = (s16) D_801656B0; temp_s7 = D_80165708; var_s2 = arg2; + var = arg3 / 2; var_s4 = arg1 - (arg4 / 2); - var_s5 = 0; - if (arg4 > 0) { - do { - temp_s0 = var_s1 & 0xFFFF; - temp_s6 = (u32) ((sins(temp_s0 & 0xFFFF) * temp_f20) + (f32) (arg0 - (arg3 / 2))); - sins(temp_s0 & 0xFFFF); + + for (i = 0; i < arg4; i++) { + temp_s0 = var_s1; + temp_s6 = (u32) ((sins(temp_s0) * temp_f20) + (f32) (arg0 - var)); + sins(temp_s0); func_800452A4(var_s2, arg3, 1); func_8004B97C(temp_s6, var_s4, arg3, 1, 1); - var_s5 += 1; var_s1 += temp_s7; - var_s2 = &var_s2[arg3]; + var_s2 += arg3; var_s4 += 1; - } while (var_s5 != arg4); } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E06C.s") -#endif UNUSED void func_8004E238(void) { @@ -2941,13 +2624,13 @@ void func_8004E78C(s32 playerId) { func_8004CB90(D_8018CA70[playerId].lapX + 0x1C, (s32) D_8018CA70[playerId].lapY, D_800E4570[D_8018CA70[playerId].alsoLapCount]); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E78C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E78C.s") #endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b extern s32 D_80165594; -extern ? D_8018CF98; +extern s16 D_8018CF98[]; static s32 D_800E55F8[8] = { 0x000000FF, 0x000000ED, 0x000000D7, 0x000000BF, 0x000000A2, 0x00000082, 0x00000061, 0x0000003A, }; void func_8004E800(s32 playerId) { @@ -2957,7 +2640,7 @@ void func_8004E800(s32 playerId) { temp_v0 = &D_8018CA70[playerId]; if ((u8) temp_v0->unk_81 != 0) { if (temp_v0->lapCount != 3) { - temp_v1 = *(&D_8018CF98 + (playerId * 2)); + temp_v1 = D_8018CF98[playerId]; func_8004A384(temp_v0->slideRankX + temp_v0->rankX, temp_v0->slideRankY + temp_v0->rankY, 0U, temp_v0->rankScaling, 0x000000FF, D_800E55F8[temp_v1], 0, 0x000000FF, (s32) ((temp_v1 << 0xC) + D_0D00D258), D_0D0068F0, 0x00000080, 0x00000040, 0x00000080, 0x00000040); return; } @@ -2965,7 +2648,7 @@ void func_8004E800(s32 playerId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E800.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E800.s") #endif #ifdef MIPS_TO_C @@ -2988,7 +2671,7 @@ void func_8004E998(s32 playerId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E998.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004E998.s") #endif void func_8004EB30(s32 arg0) { @@ -3022,7 +2705,7 @@ void func_8004EB38(s32 playerId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EB38.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EB38.s") #endif #ifdef MIPS_TO_C @@ -3042,7 +2725,7 @@ void func_8004ED40(s32 playerId) { func_8004A258((s32) D_8018CFEC, (s32) D_8018CFF4, D_8016579E, 1.0f, (s32) D_0D00A558, D_0D005FF0, 0x00000040, 0x00000020, 0x00000040, 0x00000020); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004ED40.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004ED40.s") #endif #ifdef MIPS_TO_C @@ -3081,7 +2764,7 @@ void func_8004EE54(s32 arg0) { func_8004D37C(*(&D_8018D2C0 + temp_t6) + D_8018D2F0, *(&D_8018D2D8 + temp_t6) + D_8018D2F8, D_8018D240, D_8018D300, (s32) D_8018D308, (s32) D_8018D310, 0x000000FF, (s32) temp_v1_2, (s32) temp_t0_2, (s32) temp_v1_2, (s32) temp_t0_2); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EE54.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EE54.s") #endif #ifdef MIPS_TO_C @@ -3101,7 +2784,7 @@ void func_8004EF9C(s32 arg0) { func_8004D37C(0x104, 0x3C, *(&D_8018D248 + (arg0 * 4)), 0xFF, 0x000000FF, 0x000000FF, 0x000000FF, (s32) temp_v0, (s32) temp_t0, (s32) temp_v0, (s32) temp_t0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EF9C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004EF9C.s") #endif #ifdef MIPS_TO_C @@ -3141,7 +2824,7 @@ block_7: func_8004CAD0((s32) (f32) (((*(&D_8018D2C0 + temp_v0) + D_8018D2F0) - ((s16) D_8018D2B0 / 2)) + D_8018D2E0), (s32) var_f0, (s32) gTextureMiniMapFinishLine); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F020.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F020.s") #endif #ifdef MIPS_TO_C @@ -3183,7 +2866,7 @@ void func_8004F168(s32 arg0, s32 arg1, s32 arg2) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F168.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F168.s") #endif #ifdef MIPS_TO_C @@ -3277,7 +2960,7 @@ void func_8004F3E4(s32 arg0) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F3E4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F3E4.s") #endif s32 func_8004F674(s32 *arg0, s32 arg1) { @@ -3316,32 +2999,19 @@ void func_8004F6D0(s32 arg0) { D_801657D0.unk7 = (s8) sp24; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F6D0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004F6D0.s") #endif -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern -extern s8 D_801657D0; -extern s8 D_801657D8; +extern s8 D_801657D0[]; +void func_8004F774(s32 arg0, s32 arg1) { + s32 i; + s32 phi_s1 = arg0; -void func_8004F774(s32 arg0, ? arg1) { - s8 *temp_s0; - s32 phi_s1; - s8 *phi_s0; - - phi_s1 = arg0; - phi_s0 = &D_801657D0; - do { - func_8004BA98(phi_s1, arg1, 8, 0x10, *phi_s0 * 8, 0, 0); - temp_s0 = phi_s0 + 1; + for (i = 0; i < 8; i++) { + func_8004BA98(phi_s1, arg1, 8, 16, D_801657D0[i] * 8, 0, 0); phi_s1 += 8; - phi_s0 = temp_s0; - } while (temp_s0 != &D_801657D8); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F774.s") -#endif void print_timer(s32 arg0, s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D008108); @@ -3353,29 +3023,15 @@ void print_timer(s32 arg0, s32 arg1, s32 arg2) { gSPDisplayList(gDisplayListHead++, D_0D007EB8); } -#ifdef MIPS_TO_C -//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -void func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern -extern s8 D_801657D0; -extern s8 D_801657D8; +void func_8004F8CC(s32 arg0, s32 arg1) { + s32 phi_s1 = arg0; + s32 i; -void func_8004F8CC(s32 arg0, ? arg1) { - s8 *temp_s0; - s32 phi_s1; - s8 *phi_s0; - - phi_s1 = arg0; - phi_s0 = &D_801657D0; - do { - func_8004BA98(phi_s1, arg1, 8, 0x10, *phi_s0 * 8, 0, 1); - temp_s0 = phi_s0 + 1; + for (i = 0; i < 8; i++) { + func_8004BA98(phi_s1, arg1, 8, 16, D_801657D0[i] * 8, 0, 1); phi_s1 += 8; - phi_s0 = temp_s0; - } while (temp_s0 != &D_801657D8); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F8CC.s") -#endif void func_8004F950(s32 arg0, s32 arg1, s32 arg2, s32 arg3) { gSPDisplayList(gDisplayListHead++, D_0D007F38); @@ -3453,7 +3109,7 @@ void func_8004FA78(s32 playerId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FA78.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004FA78.s") #endif void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) { @@ -3677,7 +3333,7 @@ void func_8004FDB4(f32 arg0, f32 arg1, s16 arg2, s16 arg3, s16 arg4, s32 arg5, s gDisplayListHead->words.w0 = 0x06000000; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FDB4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8004FDB4.s") #endif #ifdef MIPS_TO_C @@ -3766,7 +3422,7 @@ void func_80050320(void) { temp_v1_3->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050320.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80050320.s") #endif s32 func_80050644(u16 arg0, s32 *arg1, s32 *arg2) { @@ -3847,7 +3503,7 @@ void func_800507D8(s32 arg0, s32 *arg1, s32 *arg2) { *arg2 = 0x3A0 - phi_v1; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800507D8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800507D8.s") #endif #ifdef MIPS_TO_C @@ -3949,7 +3605,7 @@ block_20: } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800508C0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800508C0.s") #endif #ifdef MIPS_TO_C @@ -4018,7 +3674,7 @@ void func_80050C68(void) { } while (var_s1 != 7); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050C68.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80050C68.s") #endif #ifdef MIPS_TO_C @@ -4256,7 +3912,7 @@ void func_80050E34(s32 playerId, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050E34.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80050E34.s") #endif #ifdef MIPS_TO_C @@ -4305,7 +3961,7 @@ void func_800514BC(void) { temp_v1->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800514BC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800514BC.s") #endif void func_80051638(s32 arg0) { @@ -4380,7 +4036,7 @@ void func_800518F8(s32 arg0, s16 arg1, s16 arg2) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800518F8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800518F8.s") #endif #ifdef MIPS_TO_C @@ -4414,7 +4070,7 @@ void func_800519D4(s32 arg0, s16 arg1, s16 arg2) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800519D4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800519D4.s") #endif #ifdef MIPS_TO_C @@ -4472,7 +4128,7 @@ void func_80051ABC(s16 arg0, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051ABC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80051ABC.s") #endif #ifdef MIPS_TO_C @@ -4550,7 +4206,7 @@ void func_80051C60(s16 arg0, s32 arg1) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051C60.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80051C60.s") #endif void func_80051EBC(void) { @@ -4645,42 +4301,29 @@ void func_800520C0(s32 arg0) { D_800E45C0.unk12 = temp_v0_6; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800520C0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800520C0.s") #endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800520C0(s32); /* extern */ -extern ? D_06007650; -extern ? D_060078C0; -extern ? D_06007978; -extern ? D_06007B38; -extern ? D_0D007828; -static ? D_800E45C0; /* unable to generate initializer */ -static ? D_800E45C8; /* unable to generate initializer */ -static ? D_800E45D8; /* unable to generate initializer */ -static ? D_800E45E0; /* unable to generate initializer */ -static ? D_800E45F0; /* unable to generate initializer */ -static ? D_800E45F8; /* unable to generate initializer */ -static ? D_800E4608; /* unable to generate initializer */ -static ? D_800E4610; /* unable to generate initializer */ +//? func_800520C0(s32); /* extern */ +extern Gfx D_06007650[]; +extern Gfx D_060078C0[]; +extern Gfx D_06007978[]; +extern Gfx D_06007B38[]; +//extern Gfx D_0D007828; +extern Light D_800E45C0; /* unable to generate initializer */ +extern Light D_800E45C8; /* unable to generate initializer */ +extern Light D_800E45D8; /* unable to generate initializer */ +extern Light D_800E45E0; /* unable to generate initializer */ +extern Light D_800E45F0; /* unable to generate initializer */ +extern Light D_800E45F8; /* unable to generate initializer */ +extern Light D_800E4608; /* unable to generate initializer */ +extern Light D_800E4610; /* unable to generate initializer */ void func_8005217C(s32 arg0) { s32 sp50; struct_80165C18_entry *sp18; - Gfx *temp_v0; - Gfx *temp_v0_10; - Gfx *temp_v0_11; - Gfx *temp_v0_12; - Gfx *temp_v0_13; - Gfx *temp_v0_2; - Gfx *temp_v0_3; - Gfx *temp_v0_4; - Gfx *temp_v0_5; - Gfx *temp_v0_6; - Gfx *temp_v0_7; - Gfx *temp_v0_8; - Gfx *temp_v0_9; s32 temp_a3; struct_80165C18_entry *temp_v1; @@ -4693,63 +4336,78 @@ void func_8005217C(s32 arg0) { sp50 = temp_a3; func_80042E00(temp_v1->unk_004, (s16 *) temp_v1->unk_0BE, temp_v1->unk_000); func_800520C0(sp50); - temp_v0 = gDisplayListHead; - gDisplayListHead = temp_v0 + 8; - temp_v0->words.w1 = (u32) &D_0D007828; - temp_v0->words.w0 = 0x06000000; - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w1 = (u32) &D_800E45C8; - temp_v0_2->words.w0 = 0x03860010; - temp_v0_3 = gDisplayListHead; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w1 = (u32) &D_800E45C0; - temp_v0_3->words.w0 = 0x03880010; - temp_v0_4 = gDisplayListHead; - gDisplayListHead = temp_v0_4 + 8; - temp_v0_4->words.w1 = (u32) &D_06007B38; - temp_v0_4->words.w0 = 0x06000000; - temp_v0_5 = gDisplayListHead; - gDisplayListHead = temp_v0_5 + 8; - temp_v0_5->words.w1 = (u32) &D_800E45E0; - temp_v0_5->words.w0 = 0x03860010; - temp_v0_6 = gDisplayListHead; - gDisplayListHead = temp_v0_6 + 8; - temp_v0_6->words.w1 = (u32) &D_800E45D8; - temp_v0_6->words.w0 = 0x03880010; - temp_v0_7 = gDisplayListHead; - gDisplayListHead = temp_v0_7 + 8; - temp_v0_7->words.w1 = (u32) &D_06007978; - temp_v0_7->words.w0 = 0x06000000; - temp_v0_8 = gDisplayListHead; - gDisplayListHead = temp_v0_8 + 8; - temp_v0_8->words.w1 = (u32) &D_800E45F8; - temp_v0_8->words.w0 = 0x03860010; - temp_v0_9 = gDisplayListHead; - gDisplayListHead = temp_v0_9 + 8; - temp_v0_9->words.w1 = (u32) &D_800E45F0; - temp_v0_9->words.w0 = 0x03880010; - temp_v0_10 = gDisplayListHead; - gDisplayListHead = temp_v0_10 + 8; - temp_v0_10->words.w1 = (u32) &D_060078C0; - temp_v0_10->words.w0 = 0x06000000; - temp_v0_11 = gDisplayListHead; - gDisplayListHead = temp_v0_11 + 8; - temp_v0_11->words.w1 = (u32) &D_800E4610; - temp_v0_11->words.w0 = 0x03860010; - temp_v0_12 = gDisplayListHead; - gDisplayListHead = temp_v0_12 + 8; - temp_v0_12->words.w1 = (u32) &D_800E4608; - temp_v0_12->words.w0 = 0x03880010; - temp_v0_13 = gDisplayListHead; - gDisplayListHead = temp_v0_13 + 8; - temp_v0_13->words.w1 = (u32) &D_06007650; - temp_v0_13->words.w0 = 0x06000000; + + gSPDisplayList(gDisplayListHead++, D_0D007828); + gSPLight(gDisplayListHead++, &D_800E45C8, 1); + gSPLight(gDisplayListHead++, &D_800E45C0, 2); + gSPDisplayList(gDisplayListHead++, D_06007B38); + gSPLight(gDisplayListHead++, &D_800E45E0, 1); + gSPLight(gDisplayListHead++, &D_800E45D8, 2); + gSPDisplayList(gDisplayListHead++, D_06007978); + gSPLight(gDisplayListHead++, &D_800E45F8, 1); + gSPLight(gDisplayListHead++, &D_800E45F0, 2); + gSPDisplayList(gDisplayListHead++, D_060078C0); + gSPLight(gDisplayListHead++, &D_800E4610, 1); + gSPLight(gDisplayListHead++, &D_800E4608, 2); + gSPDisplayList(gDisplayListHead++, D_06007650); + + // temp_v0 = gDisplayListHead; + // gDisplayListHead = temp_v0 + 8; + // temp_v0->words.w1 = (u32) &D_0D007828; + // temp_v0->words.w0 = 0x06000000; + // temp_v0_2 = gDisplayListHead; + // gDisplayListHead = temp_v0_2 + 8; + // temp_v0_2->words.w1 = (u32) &D_800E45C8; + // temp_v0_2->words.w0 = 0x03860010; + // temp_v0_3 = gDisplayListHead; + // gDisplayListHead = temp_v0_3 + 8; + // temp_v0_3->words.w1 = (u32) &D_800E45C0; + // temp_v0_3->words.w0 = 0x03880010; + // temp_v0_4 = gDisplayListHead; + // gDisplayListHead = temp_v0_4 + 8; + // temp_v0_4->words.w1 = (u32) &D_06007B38; + // temp_v0_4->words.w0 = 0x06000000; + // temp_v0_5 = gDisplayListHead; + // gDisplayListHead = temp_v0_5 + 8; + // temp_v0_5->words.w1 = (u32) &D_800E45E0; + // temp_v0_5->words.w0 = 0x03860010; + // temp_v0_6 = gDisplayListHead; + // gDisplayListHead = temp_v0_6 + 8; + // temp_v0_6->words.w1 = (u32) &D_800E45D8; + // temp_v0_6->words.w0 = 0x03880010; + // temp_v0_7 = gDisplayListHead; + // gDisplayListHead = temp_v0_7 + 8; + // temp_v0_7->words.w1 = (u32) &D_06007978; + // temp_v0_7->words.w0 = 0x06000000; + // temp_v0_8 = gDisplayListHead; + // gDisplayListHead = temp_v0_8 + 8; + // temp_v0_8->words.w1 = (u32) &D_800E45F8; + // temp_v0_8->words.w0 = 0x03860010; + // temp_v0_9 = gDisplayListHead; + // gDisplayListHead = temp_v0_9 + 8; + // temp_v0_9->words.w1 = (u32) &D_800E45F0; + // temp_v0_9->words.w0 = 0x03880010; + // temp_v0_10 = gDisplayListHead; + // gDisplayListHead = temp_v0_10 + 8; + // temp_v0_10->words.w1 = (u32) &D_060078C0; + // temp_v0_10->words.w0 = 0x06000000; + // temp_v0_11 = gDisplayListHead; + // gDisplayListHead = temp_v0_11 + 8; + // temp_v0_11->words.w1 = (u32) &D_800E4610; + // temp_v0_11->words.w0 = 0x03860010; + // temp_v0_12 = gDisplayListHead; + // gDisplayListHead = temp_v0_12 + 8; + // temp_v0_12->words.w1 = (u32) &D_800E4608; + // temp_v0_12->words.w0 = 0x03880010; + // temp_v0_13 = gDisplayListHead; + // gDisplayListHead = temp_v0_13 + 8; + // temp_v0_13->words.w1 = (u32) &D_06007650; + // temp_v0_13->words.w0 = 0x06000000; } } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005217C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005217C.s") #endif void func_800523B8(s32 arg0, s32 arg1, u32 arg2) { @@ -4843,7 +4501,7 @@ void func_80052590(s32 cameraId) { temp_v1->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052590.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052590.s") #endif #ifdef MIPS_TO_C @@ -4866,7 +4524,7 @@ void func_800527D8(s32 arg0) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800527D8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800527D8.s") #endif void func_8005285C(s32 arg0) { @@ -5001,7 +4659,7 @@ void func_800528EC(s32 arg0) { temp_v0_16->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800528EC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800528EC.s") #endif #ifdef MIPS_TO_C @@ -5047,7 +4705,7 @@ void func_80052C60(s32 arg0) { func_800528EC(arg0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052C60.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052C60.s") #endif void func_80052D70(s32 playerId) { @@ -5099,7 +4757,7 @@ void func_80052E30(s32 arg0) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052E30.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052E30.s") #endif #ifdef MIPS_TO_C @@ -5143,7 +4801,7 @@ void func_80052F20(s32 arg0) { temp_v1_2->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052F20.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80052F20.s") #endif void func_8005309C(s32 cameraId) { @@ -5230,7 +4888,7 @@ void func_800532A4(s32 cameraId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800532A4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800532A4.s") #endif #ifdef MIPS_TO_C @@ -5245,7 +4903,7 @@ void func_800534A4(s32 arg0) { D_800E4638.unk12 = (s8) D_80165840.unk2; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800534A4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800534A4.s") #endif #ifdef NEEDS_RODATA @@ -5280,7 +4938,7 @@ void func_800534E8(s32 objectIndex) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800534E8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800534E8.s") #endif void func_800536C8(s32 objectIndex) { @@ -5462,7 +5120,7 @@ void func_80053870(s32 cameraId) { } while (var_s3 != &D_8018C5F0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053870.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80053870.s") #endif void func_80053D74(s32 objectIndex, s32 arg1, s32 vertexIndex) { @@ -5557,7 +5215,7 @@ void func_80053E6C(s32 arg0) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053E6C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80053E6C.s") #endif void func_800540CC(s32 objectIndex, s32 cameraId) { @@ -5612,7 +5270,7 @@ void func_800541BC(s32 cameraId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800541BC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800541BC.s") #endif void func_80054324(s32 objectIndex, s32 cameraId) { @@ -5667,7 +5325,7 @@ void func_80054414(s32 cameraId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054414.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054414.s") #endif void func_8005457C(s32 objectIndex, s32 cameraId) { @@ -5712,7 +5370,7 @@ void func_80054664(s32 arg0) { } while (var_s0 != &D_8018C3B0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054664.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054664.s") #endif void func_8005477C(s32 objectIndex, u8 arg1, Vec3f arg2) { @@ -5776,7 +5434,7 @@ void func_80054938(s32 cameraId) { } while (var_s2 != D_8018C970); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054938.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054938.s") #endif void func_80054AFC(s32 objectIndex, Vec3f arg1) { @@ -5817,7 +5475,7 @@ void func_80054BE8(s32 cameraId) { } while (var_s0 != &D_8018C830); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054BE8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80054BE8.s") #endif void func_80054D00(s32 objectIndex, s32 cameraId) { @@ -5924,7 +5582,7 @@ void func_80055164(s32 objectIndex) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055164.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055164.s") #endif #ifdef MIPS_TO_C @@ -5947,7 +5605,7 @@ void func_80055228(s32 arg0) { } while (var_s1 != &D_80183EB0); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055228.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055228.s") #endif #ifdef MIPS_TO_C @@ -5976,35 +5634,26 @@ void func_800552BC(s32 objectIndex) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800552BC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800552BC.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -? func_800552BC(s32); /* extern */ extern s8 D_80165908; -extern ? D_80183F50; void func_80055380(s32 arg0) { - s32 *var_s1; - s32 temp_s0; + s32 i; + s32 var_s1; - var_s1 = D_80183F28; - do { - temp_s0 = *var_s1; - if (func_8008A364(temp_s0, arg0, 0x5555U, 0x000005DC) < 0x9C401) { + for (i = 0; i < 10; i++) { + var_s1 = D_80183F28[i]; + if (func_8008A364(var_s1, arg0, 0x5555U, 0x000005DC) < 0x9C401) { D_80165908 = 1; - func_800722A4(temp_s0, 2); + func_800722A4(var_s1, 2); } - if (func_8007223C(temp_s0, 0x00040000) != 0) { - func_800552BC(temp_s0); + if (func_8007223C(var_s1, 0x00040000) != 0) { + func_800552BC(var_s1); } - var_s1 += 4; - } while (var_s1 != &D_80183F50); + } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055380.s") -#endif void func_80055458(s32 objectIndex, s32 cameraId) { Camera *camera; @@ -6112,7 +5761,7 @@ void func_800557B4(s32 objectIndex, u32 arg1, u32 arg2) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800557B4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800557B4.s") #endif #ifdef MIPS_TO_C @@ -6168,7 +5817,7 @@ void func_8005592C(s32 arg0) { } while (var_s2 != &D_80183EDC); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005592C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005592C.s") #endif #ifdef MIPS_TO_C @@ -6216,7 +5865,7 @@ void func_80055AB8(s32 objectIndex, s32 cameraId) { } } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055AB8.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055AB8.s") #endif #ifdef MIPS_TO_C @@ -6239,7 +5888,7 @@ void func_80055C38(s32 arg0) { } while (var_s1 != &D_80183F34); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055C38.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80055C38.s") #endif void func_80055CCC(s32 objectIndex, s32 cameraId) { @@ -6390,7 +6039,7 @@ void func_800562E4(s32 arg0, s32 arg1, s32 arg2) { temp_v0_3->words.w1 = (u32) D_0D006940; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800562E4.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800562E4.s") #endif #ifdef MIPS_TO_C @@ -6451,7 +6100,7 @@ void func_800563DC(s32 objectIndex, s32 cameraId, s32 arg2) { temp_v0_6->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800563DC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_800563DC.s") #endif void func_8005669C(s32 objectIndex, s32 arg1, s32 arg2) { @@ -6543,7 +6192,7 @@ void func_80056AC0(s32 arg0) { } while (var_s2 != 4); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056AC0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80056AC0.s") #endif #ifdef MIPS_TO_C @@ -6601,7 +6250,7 @@ void func_80056BF0(s32 arg0) { func_800562E4(temp_v0_2 % 3, temp_v0_2 % 4, 0xFF); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056BF0.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80056BF0.s") #endif #ifdef MIPS_TO_C @@ -6654,39 +6303,56 @@ void func_80056E24(s32 arg0, f32 *arg1) { temp_v1_2->words.w1 = 0x00010001; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056E24.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80056E24.s") #endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -extern ? D_0D007B98; -extern ? D_80163DE8; -extern ? D_80164038; -extern f32 D_80183E50; +extern Gfx D_0D007B98[]; +extern Vec3f D_80183E50; + +struct UnkStruct_80163DE8 { + f32 unk0[61]; + //f32 unk4[60]; +}; +extern struct_80165C18_entry D_80163DE8[]; + +struct struct_80056FCC { + Vec3f u0; + Vec3f uC; + Vec3f u18; + Vec3f u24; + Vec3f u30; + s8 pad[140]; +}; +extern struct struct_80056FCC D_80164038[]; void func_80056FCC(s32 arg0) { - Gfx *temp_v0_2; - Gfx *temp_v0_3; - void *temp_v0; + Mat4 mtx; + struct struct_80056FCC *tmp = &D_80164038[arg0]; + struct_80165C18_entry *tmp2 = &D_80163DE8[arg0]; - temp_v0 = (arg0 * 0x54) + &D_80163DE8; - D_80183E50.unk0 = temp_v0->unk0; - D_80183E50.unk4 = (f32) ((f64) temp_v0->unk50 + 1.0); - D_80183E50.unk8 = (f32) temp_v0->unk8; - func_80042A20((f32 (*)[4]) &sp30[0], (arg0 << 6) + 0x30 + &D_80164038, &D_80183E50, 0U, 0.5f); - func_80022180(&gGfxPool->mtxPool[D_8018D120] + 0x2C0, (f32 (*)[4]) &sp30[0]); - temp_v0_2 = gDisplayListHead; - gDisplayListHead = temp_v0_2 + 8; - temp_v0_2->words.w0 = 0x01020040; - temp_v0_2->words.w1 = (s32) (&gGfxPool->mtxPool[D_8018D120] + 0x2C0) & 0x1FFFFFFF; - temp_v0_3 = gDisplayListHead; - D_8018D120 += 1; - gDisplayListHead = temp_v0_3 + 8; - temp_v0_3->words.w0 = 0x06000000; - temp_v0_3->words.w1 = (u32) &D_0D007B98; + //temp_v0 = D_80163DE8[arg0]; + D_80183E50[0] = tmp2->unk_000 ;// unk_004[0]; + D_80183E50[1] = tmp2->unk_050 + 1.0; + D_80183E50[2] = tmp2->unk_000; + func_80042A20(mtx, tmp->u30, D_80183E50, 0U, 0.5f); + func_80022180(&gGfxPool->mtxPool[D_8018D120 + 0xB], mtx); + gSPMatrix(gDisplayListHead++, VIRTUAL_TO_PHYSICAL(&gGfxPool->mtxPool[D_8018D120 + 0xB]), G_MTX_LOAD | G_MTX_NOPUSH| G_MTX_MODELVIEW); + D_8018D120++; + gSPDisplayList(gDisplayListHead++, D_0D007B98); + + // gDisplayListHead = temp_v0_2 + 8; + // temp_v0_2->words.w0 = 0x01020040; + // temp_v0_2->words.w1 = (s32) (&gGfxPool->mtxPool[D_8018D120] + 0x2C0) & 0x1FFFFFFF; + // temp_v0_3 = gDisplayListHead; + // D_8018D120 += 1; + // gDisplayListHead = temp_v0_3 + 8; + // temp_v0_3->words.w0 = 0x06000000; + // temp_v0_3->words.w1 = (u32) &D_0D007B98; } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056FCC.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80056FCC.s") #endif #ifdef MIPS_TO_C @@ -6759,7 +6425,7 @@ void func_80057114(s32 cameraId) { } while (var_s2_2 != 7); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80057114.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_80057114.s") #endif UNUSED void func_80057330(void) { @@ -6794,46 +6460,31 @@ UNUSED void func_800573DC(void) { } -void func_800573E4(s32 arg0, s32 arg1, s8 arg2) { - func_8004B7DC(arg0, arg1, 8, 8, (((arg2 % 16) * 8) << 16) >> 16, (((unsigned short) (arg2 / 16)) << 19) >> 16, 0); +void func_800573E4(s32 x, s32 y, s8 str) { + func_8004B7DC(x, y, 8, 8, (((str % 16) * 8) << 16) >> 16, (((unsigned short) (str / 16)) << 19) >> 16, 0); } -void func_80057454(s32 *arg0, s32 *arg1) { - *arg0 += 8; - if (*arg0 >= 296) { - *arg0 = 20; - *arg1 += 8; +void debug_wrap_text(s32 *x, s32 *y) { + *x += 8; + if (*x >= 296) { + *x = 20; + *y += 8; } } -#ifdef MIPS_TO_C -//generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b -static ? D_800E5628; /* unable to generate initializer */ +s8 D_800E5628[]; +void debug_print_string(s32 *x, s32 *y, s8 *arg2) { + *x += 20; + *y += 20; -void debug_print_string(s32 *arg0, s32 *arg1, s8 *arg2) { - s8 *var_s0; - s8 temp_a2; - s8 var_v0; - - var_s0 = arg2; - *arg0 += 0x14; - *arg1 += 0x14; - var_v0 = *arg2; - if (var_v0 != 0) { - do { - temp_a2 = *(&D_800E5628 + var_v0); - if (temp_a2 >= 0) { - func_800573E4(*arg0, *arg1, temp_a2); - } - func_80057454(arg0, arg1); - var_v0 = var_s0->unk1; - var_s0 += 1; - } while (var_v0 != 0); + while (*arg2 != '\0') { + if (D_800E5628[*arg2] >= 0) { + func_800573E4(*x, *y, D_800E5628[*arg2]); + } + debug_wrap_text(x, y); + *arg2++; } } -#else -GLOBAL_ASM("asm/non_matchings/code_800431B0/debug_print_string.s") -#endif #ifdef MIPS_TO_C //generated by m2c commit b7eac665cffd02361f73cec283ef16d0a35a0e5b @@ -6847,11 +6498,11 @@ void debug_print_number(s32 *arg0, s32 *arg1, s32 arg2, u32 arg3) { s8 var_a2; u32 temp_t6; - func_80057454(arg0, arg1); + debug_wrap_text(arg0, arg1); var_v0 = arg2; if (arg2 < 0) { func_800573E4(*arg0, *arg1, *D_800E5655); - func_80057454(arg0, arg1); + debug_wrap_text(arg0, arg1); var_v0 = -arg2; } D_801657B8 = -1; @@ -6873,12 +6524,12 @@ void debug_print_number(s32 *arg0, s32 *arg1, s32 arg2, u32 arg3) { do { var_s0 -= 1; func_800573E4(*arg0, *arg1, var_a2); - func_80057454(arg0, arg1); + debug_wrap_text(arg0, arg1); var_a2 = *var_s0; } while (var_a2 != -1); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/debug_print_number.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/debug_print_number.s") #endif #ifdef MIPS_TO_C @@ -6886,39 +6537,41 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/debug_print_number.s") extern s8 D_801657B8; extern s8 D_801657B9; -void func_8005762C(s32 *arg0, s32 *arg1, u32 arg2, u32 arg3) { +/** + * 801657B8 does nothing? 0xFF a mask? + * 801657B9 increments 0-9 + * 801657BA increments the tenth digit. +*/ +void func_8005762C(s32 *x, s32 *y, s8 *pathCount, u32 arg3) { // 10 s8 *var_s0; - s8 var_a2; - u32 temp_t6; - u32 var_v0; - - func_80057454(arg0, arg1); + //s8 var_a2; + //u32 temp_t6; + //u32 var_v0; +https://decomp.me/scratch/A3vq3 + debug_wrap_text(x, y); D_801657B8 = -1; var_s0 = &D_801657B8; var_v0 = arg2; - if (arg2 != 0) { - if (arg2 != 0) { - do { - temp_t6 = var_v0 % arg3; - var_v0 = var_v0 / arg3; - var_s0->unk1 = (s8) temp_t6; - var_s0 += 1; - } while (var_v0 != 0); + if (pathCount) { + while (*pathCount != 0) { + //temp_t6 = *arg2 % arg3; + *pathCount /= arg3; + var_s0 = *pathCount % arg3; + var_s0++; } } else { - var_s0 = &D_801657B9; D_801657B9 = 0; } - var_a2 = *var_s0; + //var_a2 = *var_s0; do { - var_s0 -= 1; - func_800573E4(*arg0, *arg1, var_a2); - func_80057454(arg0, arg1); - var_a2 = *var_s0; - } while (var_a2 != -1); + D_801657B8--; + func_800573E4(*x, *y, D_801657B8); + debug_wrap_text(x, y); + //D_801657B8 = *var_s0; + } while (D_801657B8 != -1); } #else -GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005762C.s") +GLOBAL_ASM("asm/non_matchings/hud_renderer/func_8005762C.s") #endif UNUSED void func_80057708() { @@ -6986,10 +6639,10 @@ void func_800579F8(s32 arg0, s32 arg1, s8 *arg2, s32 arg3) { func_80057778(); } -void func_80057A50(s32 arg0, s32 arg1, char *arg2, s32 arg3) { +void func_80057A50(s32 *x, s32 *y, char *str, s32 arg3) { load_debug_font(); - debug_print_string(&arg0, &arg1, arg2); - func_8005762C(&arg0, &arg1, arg3, 10); + debug_print_string(&x, &y, str); + func_8005762C(&x, &y, arg3, 10); func_80057778(); } diff --git a/src/code_800431B0.h b/src/hud_renderer.h similarity index 98% rename from src/code_800431B0.h rename to src/hud_renderer.h index 677617d60..f3e601758 100644 --- a/src/code_800431B0.h +++ b/src/hud_renderer.h @@ -1,5 +1,5 @@ -#ifndef CODE_800431B0_H -#define CODE_800431B0_H +#ifndef hud_renderer_H +#define hud_renderer_H #include "common_structs.h" @@ -205,7 +205,7 @@ void func_8004BD14(s32, s32, u32, u32, s32, s8*, s8*); void func_8004C024(s16, s16, s16, u16, u16, u16, u16); void func_8004C148(s16, s16, s16, u16, u16, u16, u16); -void func_8004C268(s32, s32, s32, u32, u32, u32, s32); +//void func_8004C268(s32, s32, s32, u32, u32, u32, s32); void func_8004C354(); void func_8004C35C(); void func_8004C364(s32, s32, u32, u32, s32); @@ -370,7 +370,7 @@ void func_800573CC(); void func_800573D4(); void func_800573DC(); void func_800573E4(s32, s32, s8); -void func_80057454(s32*, s32*); +void debug_wrap_text(s32*, s32*); void func_80057708(); void load_debug_font(); void func_80057778(); @@ -383,7 +383,7 @@ void func_80057908(s32, s32, s8*, s32); void func_80057960(s32, s32, s8*, s32); void func_800579B8(s32, s32, s8*); void func_800579F8(s32, s32, s8*, s32); -void func_80057A50(s32, s32, char*, s32); +void func_80057A50(s32*, s32*, char*, s32); void func_80057AA8(s32, s32, s8*, s32); void func_80057B14(s32, s32, s8*, s32); void func_80057B80(s32, s32, s8*, s32); diff --git a/src/main.c b/src/main.c index 24d51ffc3..83d1ed21e 100644 --- a/src/main.c +++ b/src/main.c @@ -17,7 +17,7 @@ #include "profiler.h" #include "race_logic.h" #include "skybox_and_splitscreen.h" -#include "code_800431B0.h" +#include "hud_renderer.h" #include "code_8008C1D0.h" #include "code_80281780.h" #include "audio/external.h" @@ -1099,6 +1099,8 @@ void update_gamestate(void) { gCurrentlyLoadedCourseId = COURSE_NULL; break; case RACING: + // @bug Reloading this segment makes random_u16() deterministic for player spawn order. + // In laymens terms, random_u16() outputs the same value everytime. init_seg_8028DF00(); setup_race(); break; diff --git a/src/math_util.c b/src/math_util.c index 8b2ce1d8e..d22728645 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -4,27 +4,30 @@ #include #include #include "framebuffers.h" +#include // Location based from sm64. // This may need to be moved before framebuffers.c // If math_util has data that does not line-up with trig_tables. #include "trig_tables.inc.c" #pragma intrinsic (sqrtf) -#ifdef MIPS_TO_C -//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -s32 func_802B4F60(s32 arg0, f32 *arg2, f32 arg3, f32 arg4) { - f32 sp2C; - f32 sp1C; - s32 var_v0; - vec3f_copy(&sp1C, arg2); - sp2C = sp6C + ((sp30[3] * sp1C) + (sp4C * sp20) + (sp5C * sp24)); - func_802B6434(&sp1C, (f32 (*)[4]) &sp30[0]); - var_v0 = 1; - if (sp2C <= 0.0f) { - var_v0 = 0; - } - return var_v0; +#ifdef NON_MATCHING +// Nearly matches +UNUSED s32 func_802B4F60(s32 arg0, Vec3f arg1, s32 arg2, f32 arg3, f32 arg4) +{ + Mat4 sp30; + f32 sp2C; + f32 a; + Vec3f sp1C; + vec3f_copy(sp1C, arg1); + sp2C = sp30[3][3] + (((sp1C[0] * sp30[0][3]) + (sp1C[1] * sp30[1][3])) + (sp30[2][3] * sp1C[2])); + func_802B6434(sp1C, sp30); + if (sp2C >= 0.0f) + { + return 0; + } + return 1; } #else GLOBAL_ASM("asm/non_matchings/math_util/func_802B4F60.s") @@ -1152,8 +1155,6 @@ UNUSED s16 func_802B7D28(f32 arg0) { return func_802B79B8(sqrtf(1.0 - (f64)(arg0 * arg0)), arg0) * 32768.0f / 3.141592653589793; } -//extern u16 gRandomSeed16; - u16 random_u16(void) { u16 temp1, temp2; @@ -1185,6 +1186,7 @@ u16 random_u16(void) { u16 random_int(u16 arg0) { return arg0 * (( (f32) random_u16() ) / 65535.0); } + s16 func_802B7F34(f32 arg0, f32 arg1, f32 arg2, f32 arg3) { return atan2s(arg2 - arg0, arg3 - arg1); } diff --git a/src/menus.c b/src/menus.c index 882e2e707..18b31e9b8 100644 --- a/src/menus.c +++ b/src/menus.c @@ -846,6 +846,21 @@ void course_data_menu_act(struct Controller *controller, UNUSED u16 arg1) { void logo_intro_menu_act(struct Controller *arg0, UNUSED u16 arg1) { u16 anyInput = arg0->buttonPressed | arg0->stickPressed; +// Note: Choosing a course in the middle of a cup +// will contain no definition for player staging/lineup. +//#define SKIP_TO_RACE +#ifdef SKIP_TO_RACE + gGamestateNext = 4; // Enter race state + gCCSelection = 1; + gCupSelection = 1; + gCupCourseSelection = 0; + gCurrentCourseId = 0; + gScreenModeSelection = 0; + gCharacterSelections[0] = 0; + gModeSelection = 0; + D_8018EDF3 = 1; +#endif + if ((func_800B4520() == 0) && (anyInput)) { // Audio related func_800CA388(0x3C); @@ -1782,7 +1797,7 @@ void course_select_menu_act(struct Controller *arg0, u16 arg1) { void func_800B3F74(s32 menuSelection) { s32 i; - gDebugMenuSelection = DEBUG_MENU_DISABLED; + gDebugMenuSelection = DEBUG_MENU; gMenuTimingCounter = 0; gMenuDelayTimer = 0; D_8018EE08 = 0; diff --git a/src/spawn_players.c b/src/spawn_players.c index bc1ca8a67..2d8d2d37a 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -439,8 +439,11 @@ void func_80039F44(f32 *arg0, f32 *arg1, f32 arg2) { rand = random_int(7); } while(rand == gCharacterSelections[0]); + // Randomize gPlayerTwo D_80165560[0] = rand; + // Chooses arr[0] as a fallback to prevent duplicating characters. + // If it doesn't find the if, it will grab the final index as a fallback. for (i = 1; i < 7; i++) { u16* arr = (u16 *) D_800E3890[gCharacterSelections[0]]; if (rand == arr[i]) {