diff --git a/asm/non_matchings/audio/external/func_800C2274.s b/asm/non_matchings/audio/external/func_800C2274.s deleted file mode 100644 index 9b7710b87..000000000 --- a/asm/non_matchings/audio/external/func_800C2274.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_800C2274 -/* 0C2E74 800C2274 308700FF */ andi $a3, $a0, 0xff -/* 0C2E78 800C2278 00077080 */ sll $t6, $a3, 2 -/* 0C2E7C 800C227C 01C77021 */ addu $t6, $t6, $a3 -/* 0C2E80 800C2280 000E70C0 */ sll $t6, $t6, 3 -/* 0C2E84 800C2284 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 0C2E88 800C2288 3C05803B */ lui $a1, %hi(gSequencePlayers) # $a1, 0x803b -/* 0C2E8C 800C228C 01C77021 */ addu $t6, $t6, $a3 -/* 0C2E90 800C2290 24A51510 */ addiu $a1, %lo(gSequencePlayers) # addiu $a1, $a1, 0x1510 -/* 0C2E94 800C2294 000E70C0 */ sll $t6, $t6, 3 -/* 0C2E98 800C2298 00AE7821 */ addu $t7, $a1, $t6 -/* 0C2E9C 800C229C 8DF80000 */ lw $t8, ($t7) -/* 0C2EA0 800C22A0 AFBE0038 */ sw $fp, 0x38($sp) -/* 0C2EA4 800C22A4 03A0F025 */ move $fp, $sp -/* 0C2EA8 800C22A8 0018CFC2 */ srl $t9, $t8, 0x1f -/* 0C2EAC 800C22AC AFBF003C */ sw $ra, 0x3c($sp) -/* 0C2EB0 800C22B0 AFB30034 */ sw $s3, 0x34($sp) -/* 0C2EB4 800C22B4 AFB20030 */ sw $s2, 0x30($sp) -/* 0C2EB8 800C22B8 AFB1002C */ sw $s1, 0x2c($sp) -/* 0C2EBC 800C22BC AFB00028 */ sw $s0, 0x28($sp) -/* 0C2EC0 800C22C0 AFA40048 */ sw $a0, 0x48($sp) -/* 0C2EC4 800C22C4 13200062 */ beqz $t9, .L800C2450 -/* 0C2EC8 800C22C8 2406000F */ li $a2, 15 -/* 0C2ECC 800C22CC 3C02800E */ lui $v0, %hi(gScreenModeSelection) # $v0, 0x800e -/* 0C2ED0 800C22D0 8C42C530 */ lw $v0, %lo(gScreenModeSelection)($v0) -/* 0C2ED4 800C22D4 00074880 */ sll $t1, $a3, 2 -/* 0C2ED8 800C22D8 01274821 */ addu $t1, $t1, $a3 -/* 0C2EDC 800C22DC 10400010 */ beqz $v0, .L800C2320 -/* 0C2EE0 800C22E0 000948C0 */ sll $t1, $t1, 3 -/* 0C2EE4 800C22E4 24010001 */ li $at, 1 -/* 0C2EE8 800C22E8 10410005 */ beq $v0, $at, .L800C2300 -/* 0C2EEC 800C22EC 24030003 */ li $v1, 3 -/* 0C2EF0 800C22F0 10430005 */ beq $v0, $v1, .L800C2308 -/* 0C2EF4 800C22F4 3C08800E */ lui $t0, %hi(gPlayerCountSelection1) # $t0, 0x800e -/* 0C2EF8 800C22F8 1000000A */ b .L800C2324 -/* 0C2EFC 800C22FC 01274821 */ addu $t1, $t1, $a3 -.L800C2300: -/* 0C2F00 800C2300 10000007 */ b .L800C2320 -/* 0C2F04 800C2304 2406000E */ li $a2, 14 -.L800C2308: -/* 0C2F08 800C2308 8D08C538 */ lw $t0, %lo(gPlayerCountSelection1)($t0) -/* 0C2F0C 800C230C 2406000C */ li $a2, 12 -/* 0C2F10 800C2310 14680003 */ bne $v1, $t0, .L800C2320 -/* 0C2F14 800C2314 00000000 */ nop -/* 0C2F18 800C2318 10000001 */ b .L800C2320 -/* 0C2F1C 800C231C 2406000D */ li $a2, 13 -.L800C2320: -/* 0C2F20 800C2320 01274821 */ addu $t1, $t1, $a3 -.L800C2324: -/* 0C2F24 800C2324 000948C0 */ sll $t1, $t1, 3 -/* 0C2F28 800C2328 00A95021 */ addu $t2, $a1, $t1 -/* 0C2F2C 800C232C 00065880 */ sll $t3, $a2, 2 -/* 0C2F30 800C2330 014B6021 */ addu $t4, $t2, $t3 -/* 0C2F34 800C2334 8D820030 */ lw $v0, 0x30($t4) -/* 0C2F38 800C2338 241200FF */ li $s2, 255 -/* 0C2F3C 800C233C 30EA00FF */ andi $t2, $a3, 0xff -/* 0C2F40 800C2340 90500058 */ lbu $s0, 0x58($v0) -/* 0C2F44 800C2344 000A5C00 */ sll $t3, $t2, 0x10 -/* 0C2F48 800C2348 2405FFFF */ li $a1, -1 -/* 0C2F4C 800C234C 52500017 */ beql $s2, $s0, .L800C23AC -/* 0C2F50 800C2350 24010001 */ li $at, 1 -/* 0C2F54 800C2354 804D0059 */ lb $t5, 0x59($v0) -/* 0C2F58 800C2358 31AE0003 */ andi $t6, $t5, 3 -/* 0C2F5C 800C235C A7CE0046 */ sh $t6, 0x46($fp) -/* 0C2F60 800C2360 8051005A */ lb $s1, 0x5a($v0) -/* 0C2F64 800C2364 30CD00FF */ andi $t5, $a2, 0xff -/* 0C2F68 800C2368 000D7200 */ sll $t6, $t5, 8 -/* 0C2F6C 800C236C 322F000F */ andi $t7, $s1, 0xf -/* 0C2F70 800C2370 000FC400 */ sll $t8, $t7, 0x10 -/* 0C2F74 800C2374 00188C03 */ sra $s1, $t8, 0x10 -/* 0C2F78 800C2378 2A21000A */ slti $at, $s1, 0xa -/* 0C2F7C 800C237C 54200003 */ bnel $at, $zero, .L800C238C -/* 0C2F80 800C2380 8048005B */ lb $t0, 0x5b($v0) -/* 0C2F84 800C2384 24110009 */ li $s1, 9 -/* 0C2F88 800C2388 8048005B */ lb $t0, 0x5b($v0) -.L800C238C: -/* 0C2F8C 800C238C 3C010600 */ lui $at, 0x600 -/* 0C2F90 800C2390 01616025 */ or $t4, $t3, $at -/* 0C2F94 800C2394 31090007 */ andi $t1, $t0, 7 -/* 0C2F98 800C2398 A7C90042 */ sh $t1, 0x42($fp) -/* 0C2F9C 800C239C 0C032EFA */ jal func_800CBBE8 -/* 0C2FA0 800C23A0 018E2025 */ or $a0, $t4, $t6 -/* 0C2FA4 800C23A4 A7D10044 */ sh $s1, 0x44($fp) -/* 0C2FA8 800C23A8 24010001 */ li $at, 1 -.L800C23AC: -/* 0C2FAC 800C23AC 12010006 */ beq $s0, $at, .L800C23C8 -/* 0C2FB0 800C23B0 87D10044 */ lh $s1, 0x44($fp) -/* 0C2FB4 800C23B4 24010002 */ li $at, 2 -/* 0C2FB8 800C23B8 5201001E */ beql $s0, $at, .L800C2434 -/* 0C2FBC 800C23BC 87CB0046 */ lh $t3, 0x46($fp) -/* 0C2FC0 800C23C0 10000024 */ b .L800C2454 -/* 0C2FC4 800C23C4 8FDF003C */ lw $ra, 0x3c($fp) -.L800C23C8: -/* 0C2FC8 800C23C8 87CF0046 */ lh $t7, 0x46($fp) -/* 0C2FCC 800C23CC 3C138019 */ lui $s3, %hi(D_8018FC10) # $s3, 0x8019 -/* 0C2FD0 800C23D0 2673FC10 */ addiu $s3, %lo(D_8018FC10) # addiu $s3, $s3, -0x3f0 -/* 0C2FD4 800C23D4 000FC080 */ sll $t8, $t7, 2 -/* 0C2FD8 800C23D8 02781021 */ addu $v0, $s3, $t8 -/* 0C2FDC 800C23DC A4510000 */ sh $s1, ($v0) -/* 0C2FE0 800C23E0 87D90042 */ lh $t9, 0x42($fp) -/* 0C2FE4 800C23E4 00008025 */ move $s0, $zero -/* 0C2FE8 800C23E8 A4590002 */ sh $t9, 2($v0) -.L800C23EC: -/* 0C2FEC 800C23EC 00104080 */ sll $t0, $s0, 2 -/* 0C2FF0 800C23F0 02688821 */ addu $s1, $s3, $t0 -/* 0C2FF4 800C23F4 86250000 */ lh $a1, ($s1) -/* 0C2FF8 800C23F8 00102400 */ sll $a0, $s0, 0x10 -/* 0C2FFC 800C23FC 00044C03 */ sra $t1, $a0, 0x10 -/* 0C3000 800C2400 12450004 */ beq $s2, $a1, .L800C2414 -/* 0C3004 800C2404 01202025 */ move $a0, $t1 -/* 0C3008 800C2408 0C006AAB */ jal func_8001AAAC -/* 0C300C 800C240C 86260002 */ lh $a2, 2($s1) -/* 0C3010 800C2410 A6320000 */ sh $s2, ($s1) -.L800C2414: -/* 0C3014 800C2414 26100001 */ addiu $s0, $s0, 1 -/* 0C3018 800C2418 320A00FF */ andi $t2, $s0, 0xff -/* 0C301C 800C241C 29410004 */ slti $at, $t2, 4 -/* 0C3020 800C2420 1420FFF2 */ bnez $at, .L800C23EC -/* 0C3024 800C2424 01408025 */ move $s0, $t2 -/* 0C3028 800C2428 1000000A */ b .L800C2454 -/* 0C302C 800C242C 8FDF003C */ lw $ra, 0x3c($fp) -/* 0C3030 800C2430 87CB0046 */ lh $t3, 0x46($fp) -.L800C2434: -/* 0C3034 800C2434 3C138019 */ lui $s3, %hi(D_8018FC10) # $s3, 0x8019 -/* 0C3038 800C2438 2673FC10 */ addiu $s3, %lo(D_8018FC10) # addiu $s3, $s3, -0x3f0 -/* 0C303C 800C243C 000B6880 */ sll $t5, $t3, 2 -/* 0C3040 800C2440 026D1021 */ addu $v0, $s3, $t5 -/* 0C3044 800C2444 A4510000 */ sh $s1, ($v0) -/* 0C3048 800C2448 87CC0042 */ lh $t4, 0x42($fp) -/* 0C304C 800C244C A44C0002 */ sh $t4, 2($v0) -.L800C2450: -/* 0C3050 800C2450 8FDF003C */ lw $ra, 0x3c($fp) -.L800C2454: -/* 0C3054 800C2454 03C0E825 */ move $sp, $fp -/* 0C3058 800C2458 8FD00028 */ lw $s0, 0x28($fp) -/* 0C305C 800C245C 8FD1002C */ lw $s1, 0x2c($fp) -/* 0C3060 800C2460 8FD20030 */ lw $s2, 0x30($fp) -/* 0C3064 800C2464 8FD30034 */ lw $s3, 0x34($fp) -/* 0C3068 800C2468 8FDE0038 */ lw $fp, 0x38($fp) -/* 0C306C 800C246C 03E00008 */ jr $ra -/* 0C3070 800C2470 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/non_matchings/audio/external/func_800C5278.s b/asm/non_matchings/audio/external/func_800C5278.s deleted file mode 100644 index aa16ec0fe..000000000 --- a/asm/non_matchings/audio/external/func_800C5278.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_800C5278 -/* 0C5E78 800C5278 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 0C5E7C 800C527C AFB70044 */ sw $s7, 0x44($sp) -/* 0C5E80 800C5280 309700FF */ andi $s7, $a0, 0xff -/* 0C5E84 800C5284 00177100 */ sll $t6, $s7, 4 -/* 0C5E88 800C5288 01D77023 */ subu $t6, $t6, $s7 -/* 0C5E8C 800C528C 3C0F8019 */ lui $t7, %hi(sSoundBanks) # $t7, 0x8019 -/* 0C5E90 800C5290 AFB20030 */ sw $s2, 0x30($sp) -/* 0C5E94 800C5294 25EF1420 */ addiu $t7, %lo(sSoundBanks) # addiu $t7, $t7, 0x1420 -/* 0C5E98 800C5298 000E7180 */ sll $t6, $t6, 6 -/* 0C5E9C 800C529C AFB1002C */ sw $s1, 0x2c($sp) -/* 0C5EA0 800C52A0 01CF9021 */ addu $s2, $t6, $t7 -/* 0C5EA4 800C52A4 9251002B */ lbu $s1, 0x2b($s2) -/* 0C5EA8 800C52A8 AFB40038 */ sw $s4, 0x38($sp) -/* 0C5EAC 800C52AC 241400FF */ li $s4, 255 -/* 0C5EB0 800C52B0 AFBE0048 */ sw $fp, 0x48($sp) -/* 0C5EB4 800C52B4 03A0F025 */ move $fp, $sp -/* 0C5EB8 800C52B8 AFBF004C */ sw $ra, 0x4c($sp) -/* 0C5EBC 800C52BC AFB60040 */ sw $s6, 0x40($sp) -/* 0C5EC0 800C52C0 AFB5003C */ sw $s5, 0x3c($sp) -/* 0C5EC4 800C52C4 AFB30034 */ sw $s3, 0x34($sp) -/* 0C5EC8 800C52C8 AFB00028 */ sw $s0, 0x28($sp) -/* 0C5ECC 800C52CC 1291001B */ beq $s4, $s1, .L800C533C -/* 0C5ED0 800C52D0 AFA40098 */ sw $a0, 0x98($sp) -/* 0C5ED4 800C52D4 0017C100 */ sll $t8, $s7, 4 -/* 0C5ED8 800C52D8 0317C023 */ subu $t8, $t8, $s7 -/* 0C5EDC 800C52DC 0018C180 */ sll $t8, $t8, 6 -/* 0C5EE0 800C52E0 030F9821 */ addu $s3, $t8, $t7 -/* 0C5EE4 800C52E4 3C160602 */ lui $s6, 0x602 -/* 0C5EE8 800C52E8 24150030 */ li $s5, 48 -.L800C52EC: -/* 0C5EEC 800C52EC 02350019 */ multu $s1, $s5 -/* 0C5EF0 800C52F0 0000C812 */ mflo $t9 -/* 0C5EF4 800C52F4 02798021 */ addu $s0, $s3, $t9 -/* 0C5EF8 800C52F8 92020028 */ lbu $v0, 0x28($s0) -/* 0C5EFC 800C52FC 28410003 */ slti $at, $v0, 3 -/* 0C5F00 800C5300 14200007 */ bnez $at, .L800C5320 -/* 0C5F04 800C5304 00000000 */ nop -/* 0C5F08 800C5308 9209002C */ lbu $t1, 0x2c($s0) -/* 0C5F0C 800C530C 00002825 */ move $a1, $zero -/* 0C5F10 800C5310 00095200 */ sll $t2, $t1, 8 -/* 0C5F14 800C5314 0C032EFA */ jal func_800CBBE8 -/* 0C5F18 800C5318 01562025 */ or $a0, $t2, $s6 -/* 0C5F1C 800C531C 92020028 */ lbu $v0, 0x28($s0) -.L800C5320: -/* 0C5F20 800C5320 10400003 */ beqz $v0, .L800C5330 -/* 0C5F24 800C5324 32E400FF */ andi $a0, $s7, 0xff -/* 0C5F28 800C5328 0C0311CF */ jal delete_sound_from_bank -/* 0C5F2C 800C532C 322500FF */ andi $a1, $s1, 0xff -.L800C5330: -/* 0C5F30 800C5330 9251002B */ lbu $s1, 0x2b($s2) -/* 0C5F34 800C5334 1691FFED */ bne $s4, $s1, .L800C52EC -/* 0C5F38 800C5338 00000000 */ nop -.L800C533C: -/* 0C5F3C 800C533C 00175F00 */ sll $t3, $s7, 0x1c -/* 0C5F40 800C5340 AFCB0084 */ sw $t3, 0x84($fp) -/* 0C5F44 800C5344 00002025 */ move $a0, $zero -/* 0C5F48 800C5348 0C031073 */ jal func_800C41CC -/* 0C5F4C 800C534C 27C50060 */ addiu $a1, $fp, 0x60 -/* 0C5F50 800C5350 8FDF004C */ lw $ra, 0x4c($fp) -/* 0C5F54 800C5354 03C0E825 */ move $sp, $fp -/* 0C5F58 800C5358 8FD00028 */ lw $s0, 0x28($fp) -/* 0C5F5C 800C535C 8FD1002C */ lw $s1, 0x2c($fp) -/* 0C5F60 800C5360 8FD20030 */ lw $s2, 0x30($fp) -/* 0C5F64 800C5364 8FD30034 */ lw $s3, 0x34($fp) -/* 0C5F68 800C5368 8FD40038 */ lw $s4, 0x38($fp) -/* 0C5F6C 800C536C 8FD5003C */ lw $s5, 0x3c($fp) -/* 0C5F70 800C5370 8FD60040 */ lw $s6, 0x40($fp) -/* 0C5F74 800C5374 8FD70044 */ lw $s7, 0x44($fp) -/* 0C5F78 800C5378 8FDE0048 */ lw $fp, 0x48($fp) -/* 0C5F7C 800C537C 03E00008 */ jr $ra -/* 0C5F80 800C5380 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/non_matchings/audio/external/func_800C5578.s b/asm/non_matchings/audio/external/func_800C5578.s deleted file mode 100644 index db207de0d..000000000 --- a/asm/non_matchings/audio/external/func_800C5578.s +++ /dev/null @@ -1,101 +0,0 @@ -glabel func_800C5578 -/* 0C6178 800C5578 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 0C617C 800C557C 3C01F000 */ lui $at, 0xf000 -/* 0C6180 800C5580 00A17024 */ and $t6, $a1, $at -/* 0C6184 800C5584 000E7F02 */ srl $t7, $t6, 0x1c -/* 0C6188 800C5588 31F800FF */ andi $t8, $t7, 0xff -/* 0C618C 800C558C 0018C900 */ sll $t9, $t8, 4 -/* 0C6190 800C5590 0338C823 */ subu $t9, $t9, $t8 -/* 0C6194 800C5594 3C088019 */ lui $t0, %hi(sSoundBanks) # $t0, 0x8019 -/* 0C6198 800C5598 25081420 */ addiu $t0, %lo(sSoundBanks) # addiu $t0, $t0, 0x1420 -/* 0C619C 800C559C 0019C980 */ sll $t9, $t9, 6 -/* 0C61A0 800C55A0 AFBF004C */ sw $ra, 0x4c($sp) -/* 0C61A4 800C55A4 AFBE0048 */ sw $fp, 0x48($sp) -/* 0C61A8 800C55A8 AFB70044 */ sw $s7, 0x44($sp) -/* 0C61AC 800C55AC AFB60040 */ sw $s6, 0x40($sp) -/* 0C61B0 800C55B0 AFB5003C */ sw $s5, 0x3c($sp) -/* 0C61B4 800C55B4 AFB40038 */ sw $s4, 0x38($sp) -/* 0C61B8 800C55B8 AFB30034 */ sw $s3, 0x34($sp) -/* 0C61BC 800C55BC AFB20030 */ sw $s2, 0x30($sp) -/* 0C61C0 800C55C0 AFB1002C */ sw $s1, 0x2c($sp) -/* 0C61C4 800C55C4 AFB00028 */ sw $s0, 0x28($sp) -/* 0C61C8 800C55C8 AFA40098 */ sw $a0, 0x98($sp) -/* 0C61CC 800C55CC AFA5009C */ sw $a1, 0x9c($sp) -/* 0C61D0 800C55D0 03284821 */ addu $t1, $t9, $t0 -/* 0C61D4 800C55D4 9131002B */ lbu $s1, 0x2b($t1) -/* 0C61D8 800C55D8 241500FF */ li $s5, 255 -/* 0C61DC 800C55DC 03A0F025 */ move $fp, $sp -/* 0C61E0 800C55E0 0300B025 */ move $s6, $t8 -/* 0C61E4 800C55E4 00009825 */ move $s3, $zero -/* 0C61E8 800C55E8 12B1002D */ beq $s5, $s1, .L800C56A0 -/* 0C61EC 800C55EC 02201025 */ move $v0, $s1 -/* 0C61F0 800C55F0 00185100 */ sll $t2, $t8, 4 -/* 0C61F4 800C55F4 01585023 */ subu $t2, $t2, $t8 -/* 0C61F8 800C55F8 000A5180 */ sll $t2, $t2, 6 -/* 0C61FC 800C55FC 0148A021 */ addu $s4, $t2, $t0 -/* 0C6200 800C5600 3C170602 */ lui $s7, 0x602 -/* 0C6204 800C5604 24120030 */ li $s2, 48 -.L800C5608: -/* 0C6208 800C5608 02320019 */ multu $s1, $s2 -/* 0C620C 800C560C 8FCC0098 */ lw $t4, 0x98($fp) -/* 0C6210 800C5610 00005812 */ mflo $t3 -/* 0C6214 800C5614 028B8021 */ addu $s0, $s4, $t3 -/* 0C6218 800C5618 8E0D0000 */ lw $t5, ($s0) -/* 0C621C 800C561C 558D0017 */ bnel $t4, $t5, .L800C567C -/* 0C6220 800C5620 323300FF */ andi $s3, $s1, 0xff -/* 0C6224 800C5624 8FCE009C */ lw $t6, 0x9c($fp) -/* 0C6228 800C5628 8E0F0024 */ lw $t7, 0x24($s0) -/* 0C622C 800C562C 55CF0013 */ bnel $t6, $t7, .L800C567C -/* 0C6230 800C5630 323300FF */ andi $s3, $s1, 0xff -/* 0C6234 800C5634 92020028 */ lbu $v0, 0x28($s0) -/* 0C6238 800C5638 28410003 */ slti $at, $v0, 3 -/* 0C623C 800C563C 14200007 */ bnez $at, .L800C565C -/* 0C6240 800C5640 00000000 */ nop -/* 0C6244 800C5644 9219002C */ lbu $t9, 0x2c($s0) -/* 0C6248 800C5648 00002825 */ move $a1, $zero -/* 0C624C 800C564C 00194A00 */ sll $t1, $t9, 8 -/* 0C6250 800C5650 0C032EFA */ jal func_800CBBE8 -/* 0C6254 800C5654 01372025 */ or $a0, $t1, $s7 -/* 0C6258 800C5658 92020028 */ lbu $v0, 0x28($s0) -.L800C565C: -/* 0C625C 800C565C 10400003 */ beqz $v0, .L800C566C -/* 0C6260 800C5660 32C400FF */ andi $a0, $s6, 0xff -/* 0C6264 800C5664 0C0311CF */ jal delete_sound_from_bank -/* 0C6268 800C5668 322500FF */ andi $a1, $s1, 0xff -.L800C566C: -/* 0C626C 800C566C 241100FF */ li $s1, 255 -/* 0C6270 800C5670 10000002 */ b .L800C567C -/* 0C6274 800C5674 240200FF */ li $v0, 255 -/* 0C6278 800C5678 323300FF */ andi $s3, $s1, 0xff -.L800C567C: -/* 0C627C 800C567C 12A20006 */ beq $s5, $v0, .L800C5698 -/* 0C6280 800C5680 00000000 */ nop -/* 0C6284 800C5684 02720019 */ multu $s3, $s2 -/* 0C6288 800C5688 00005012 */ mflo $t2 -/* 0C628C 800C568C 028A4021 */ addu $t0, $s4, $t2 -/* 0C6290 800C5690 9111002B */ lbu $s1, 0x2b($t0) -/* 0C6294 800C5694 02201025 */ move $v0, $s1 -.L800C5698: -/* 0C6298 800C5698 16A2FFDB */ bne $s5, $v0, .L800C5608 -/* 0C629C 800C569C 00000000 */ nop -.L800C56A0: -/* 0C62A0 800C56A0 8FCB0098 */ lw $t3, 0x98($fp) -/* 0C62A4 800C56A4 8FCC009C */ lw $t4, 0x9c($fp) -/* 0C62A8 800C56A8 24040003 */ li $a0, 3 -/* 0C62AC 800C56AC 27C50060 */ addiu $a1, $fp, 0x60 -/* 0C62B0 800C56B0 AFCB0060 */ sw $t3, 0x60($fp) -/* 0C62B4 800C56B4 0C031073 */ jal func_800C41CC -/* 0C62B8 800C56B8 AFCC0084 */ sw $t4, 0x84($fp) -/* 0C62BC 800C56BC 8FDF004C */ lw $ra, 0x4c($fp) -/* 0C62C0 800C56C0 03C0E825 */ move $sp, $fp -/* 0C62C4 800C56C4 8FD00028 */ lw $s0, 0x28($fp) -/* 0C62C8 800C56C8 8FD1002C */ lw $s1, 0x2c($fp) -/* 0C62CC 800C56CC 8FD20030 */ lw $s2, 0x30($fp) -/* 0C62D0 800C56D0 8FD30034 */ lw $s3, 0x34($fp) -/* 0C62D4 800C56D4 8FD40038 */ lw $s4, 0x38($fp) -/* 0C62D8 800C56D8 8FD5003C */ lw $s5, 0x3c($fp) -/* 0C62DC 800C56DC 8FD60040 */ lw $s6, 0x40($fp) -/* 0C62E0 800C56E0 8FD70044 */ lw $s7, 0x44($fp) -/* 0C62E4 800C56E4 8FDE0048 */ lw $fp, 0x48($fp) -/* 0C62E8 800C56E8 03E00008 */ jr $ra -/* 0C62EC 800C56EC 27BD0098 */ addiu $sp, $sp, 0x98 diff --git a/asm/non_matchings/audio/external/func_800C56F0.s b/asm/non_matchings/audio/external/func_800C56F0.s deleted file mode 100644 index ff97fe8ce..000000000 --- a/asm/non_matchings/audio/external/func_800C56F0.s +++ /dev/null @@ -1,93 +0,0 @@ -glabel func_800C56F0 -/* 0C62F0 800C56F0 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* 0C62F4 800C56F4 3C01F000 */ lui $at, 0xf000 -/* 0C62F8 800C56F8 00817024 */ and $t6, $a0, $at -/* 0C62FC 800C56FC 000E7F02 */ srl $t7, $t6, 0x1c -/* 0C6300 800C5700 31F800FF */ andi $t8, $t7, 0xff -/* 0C6304 800C5704 0018C900 */ sll $t9, $t8, 4 -/* 0C6308 800C5708 0338C823 */ subu $t9, $t9, $t8 -/* 0C630C 800C570C 3C088019 */ lui $t0, %hi(sSoundBanks) # $t0, 0x8019 -/* 0C6310 800C5710 25081420 */ addiu $t0, %lo(sSoundBanks) # addiu $t0, $t0, 0x1420 -/* 0C6314 800C5714 0019C980 */ sll $t9, $t9, 6 -/* 0C6318 800C5718 AFBF004C */ sw $ra, 0x4c($sp) -/* 0C631C 800C571C AFBE0048 */ sw $fp, 0x48($sp) -/* 0C6320 800C5720 AFB70044 */ sw $s7, 0x44($sp) -/* 0C6324 800C5724 AFB60040 */ sw $s6, 0x40($sp) -/* 0C6328 800C5728 AFB5003C */ sw $s5, 0x3c($sp) -/* 0C632C 800C572C AFB40038 */ sw $s4, 0x38($sp) -/* 0C6330 800C5730 AFB30034 */ sw $s3, 0x34($sp) -/* 0C6334 800C5734 AFB20030 */ sw $s2, 0x30($sp) -/* 0C6338 800C5738 AFB1002C */ sw $s1, 0x2c($sp) -/* 0C633C 800C573C AFB00028 */ sw $s0, 0x28($sp) -/* 0C6340 800C5740 AFA400A0 */ sw $a0, 0xa0($sp) -/* 0C6344 800C5744 03284821 */ addu $t1, $t9, $t0 -/* 0C6348 800C5748 9131002B */ lbu $s1, 0x2b($t1) -/* 0C634C 800C574C 241600FF */ li $s6, 255 -/* 0C6350 800C5750 03A0F025 */ move $fp, $sp -/* 0C6354 800C5754 0300A825 */ move $s5, $t8 -/* 0C6358 800C5758 12D10029 */ beq $s6, $s1, .L800C5800 -/* 0C635C 800C575C 00009025 */ move $s2, $zero -/* 0C6360 800C5760 00185100 */ sll $t2, $t8, 4 -/* 0C6364 800C5764 01585023 */ subu $t2, $t2, $t8 -/* 0C6368 800C5768 000A5180 */ sll $t2, $t2, 6 -/* 0C636C 800C576C 01489821 */ addu $s3, $t2, $t0 -/* 0C6370 800C5770 24170030 */ li $s7, 48 -.L800C5774: -/* 0C6374 800C5774 02370019 */ multu $s1, $s7 -/* 0C6378 800C5778 8FCC00A0 */ lw $t4, 0xa0($fp) -/* 0C637C 800C577C 00127080 */ sll $t6, $s2, 2 -/* 0C6380 800C5780 00005812 */ mflo $t3 -/* 0C6384 800C5784 026B8021 */ addu $s0, $s3, $t3 -/* 0C6388 800C5788 8E0D0024 */ lw $t5, 0x24($s0) -/* 0C638C 800C578C 558D0015 */ bnel $t4, $t5, .L800C57E4 -/* 0C6390 800C5790 323200FF */ andi $s2, $s1, 0xff -/* 0C6394 800C5794 92020028 */ lbu $v0, 0x28($s0) -/* 0C6398 800C5798 01D27023 */ subu $t6, $t6, $s2 -/* 0C639C 800C579C 000E7100 */ sll $t6, $t6, 4 -/* 0C63A0 800C57A0 28410003 */ slti $at, $v0, 3 -/* 0C63A4 800C57A4 14200008 */ bnez $at, .L800C57C8 -/* 0C63A8 800C57A8 026EA021 */ addu $s4, $s3, $t6 -/* 0C63AC 800C57AC 920F002C */ lbu $t7, 0x2c($s0) -/* 0C63B0 800C57B0 3C010602 */ lui $at, 0x602 -/* 0C63B4 800C57B4 00002825 */ move $a1, $zero -/* 0C63B8 800C57B8 000FC200 */ sll $t8, $t7, 8 -/* 0C63BC 800C57BC 0C032EFA */ jal func_800CBBE8 -/* 0C63C0 800C57C0 03012025 */ or $a0, $t8, $at -/* 0C63C4 800C57C4 92020028 */ lbu $v0, 0x28($s0) -.L800C57C8: -/* 0C63C8 800C57C8 10400003 */ beqz $v0, .L800C57D8 -/* 0C63CC 800C57CC 32A400FF */ andi $a0, $s5, 0xff -/* 0C63D0 800C57D0 0C0311CF */ jal delete_sound_from_bank -/* 0C63D4 800C57D4 322500FF */ andi $a1, $s1, 0xff -.L800C57D8: -/* 0C63D8 800C57D8 10000007 */ b .L800C57F8 -/* 0C63DC 800C57DC 9291002B */ lbu $s1, 0x2b($s4) -/* 0C63E0 800C57E0 323200FF */ andi $s2, $s1, 0xff -.L800C57E4: -/* 0C63E4 800C57E4 00124880 */ sll $t1, $s2, 2 -/* 0C63E8 800C57E8 01324823 */ subu $t1, $t1, $s2 -/* 0C63EC 800C57EC 00094900 */ sll $t1, $t1, 4 -/* 0C63F0 800C57F0 02695021 */ addu $t2, $s3, $t1 -/* 0C63F4 800C57F4 9151002B */ lbu $s1, 0x2b($t2) -.L800C57F8: -/* 0C63F8 800C57F8 16D1FFDE */ bne $s6, $s1, .L800C5774 -/* 0C63FC 800C57FC 00000000 */ nop -.L800C5800: -/* 0C6400 800C5800 8FC800A0 */ lw $t0, 0xa0($fp) -/* 0C6404 800C5804 24040005 */ li $a0, 5 -/* 0C6408 800C5808 27C50068 */ addiu $a1, $fp, 0x68 -/* 0C640C 800C580C 0C031073 */ jal func_800C41CC -/* 0C6410 800C5810 AFC8008C */ sw $t0, 0x8c($fp) -/* 0C6414 800C5814 8FDF004C */ lw $ra, 0x4c($fp) -/* 0C6418 800C5818 03C0E825 */ move $sp, $fp -/* 0C641C 800C581C 8FD00028 */ lw $s0, 0x28($fp) -/* 0C6420 800C5820 8FD1002C */ lw $s1, 0x2c($fp) -/* 0C6424 800C5824 8FD20030 */ lw $s2, 0x30($fp) -/* 0C6428 800C5828 8FD30034 */ lw $s3, 0x34($fp) -/* 0C642C 800C582C 8FD40038 */ lw $s4, 0x38($fp) -/* 0C6430 800C5830 8FD5003C */ lw $s5, 0x3c($fp) -/* 0C6434 800C5834 8FD60040 */ lw $s6, 0x40($fp) -/* 0C6438 800C5838 8FD70044 */ lw $s7, 0x44($fp) -/* 0C643C 800C583C 8FDE0048 */ lw $fp, 0x48($fp) -/* 0C6440 800C5840 03E00008 */ jr $ra -/* 0C6444 800C5844 27BD00A0 */ addiu $sp, $sp, 0xa0 diff --git a/src/audio/external.c b/src/audio/external.c index a3ae6d612..66295fd0e 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -9,6 +9,7 @@ #include "audio/data.h" #include "audio/port_eu.h" #include "code_800029B0.h" +#include "code_80005FD0.h" #include "code_80091750.h" s8 D_8018EF10; @@ -21,7 +22,7 @@ Camera *gCopyCamera[4]; Vec3f gVelocityCamera[4]; Vec3f gCameraLastPos[4]; u8 D_8018FC08; -u16 D_8018FC10[4][2]; +s16 D_8018FC10[4][2]; struct Sound sSoundRequests[0x100]; struct SoundCharacteristics sSoundBanks[SOUND_BANK_COUNT][20]; u8 sSoundBankUsedListBack[SOUND_BANK_COUNT]; @@ -578,80 +579,59 @@ Vec3f *func_800C21E8(Vec3f pos, u32 soundBits) { return ret; } -#ifdef MIPS_TO_C -//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-18-2023 -void func_800C2274(s32 player) { +void func_800C2274(u8 player) { s16 sp46; - s16 sp44; - s16 sp42; - s16 temp_a1; - s16 temp_t2; - s16 var_s0; s16 var_s1; - s32 temp_a3; - s32 var_a2; - struct SequenceChannel *temp_v0; - u16 *temp_s1; - u16 *temp_v0_2; - u16 *temp_v0_3; + s16 sp42; + u8 var_s0; u8 temp_s0; + u8 why = 0xFF; + s32 var_a2; - temp_a3 = player & 0xFF; var_a2 = 0xF; - if (((u32) gSequencePlayers[temp_a3] >> 0x1F) != 0) { + if (gSequencePlayers[player].enabled != 0) { switch (gScreenModeSelection) { /* irregular */ - case 0: - break; - case 1: - var_a2 = 0xE; - break; - case 3: + case 0: + break; + case 1: + var_a2 = 0xE; + break; + case 3: + if (gPlayerCountSelection1 == 3) { + var_a2 = 0xD; + } else { var_a2 = 0xC; - if (gPlayerCountSelection1 == 3) { - var_a2 = 0xD; - } - break; + } + break; } - temp_v0 = gSequencePlayers[temp_a3].channels[var_a2]; - temp_s0 = (u8) temp_v0->soundScriptIO[0]; - if (temp_s0 != (u8) 0x00FFU) { - sp46 = temp_v0->soundScriptIO[1] & 3; - var_s1 = temp_v0->soundScriptIO[2] & 0xF; + temp_s0 = gSequencePlayers[player].channels[var_a2]->soundScriptIO[0]; + if (temp_s0 != why) { + sp46 = gSequencePlayers[player].channels[var_a2]->soundScriptIO[1] % 4u; + var_s1 = gSequencePlayers[player].channels[var_a2]->soundScriptIO[2] % 16u; if (var_s1 >= 0xA) { var_s1 = 9; } - sp42 = temp_v0->soundScriptIO[3] & 7; - func_800CBBE8(((temp_a3 & 0xFF) << 0x10) | 0x06000000 | ((var_a2 & 0xFF) << 8), -1); - sp44 = var_s1; + sp42 = gSequencePlayers[player].channels[var_a2]->soundScriptIO[3] % 8u; + func_800CBBE8(((player & 0xFF) << 0x10) | 0x06000000 | ((var_a2 & 0xFF) << 8), -1); } switch (temp_s0) { /* switch 1; irregular */ - case 1: /* switch 1 */ - temp_v0_2 = D_8018FC10[sp46]; - temp_v0_2->unk0 = (u16) sp44; - var_s0 = 0; - temp_v0_2->unk2 = sp42; - do { - temp_s1 = D_8018FC10[var_s0]; - temp_a1 = (s16) temp_s1->unk0; - if (temp_a1 != (s16) 0x00FFU) { - func_8001AAAC(var_s0, temp_a1, temp_s1->unk2); - temp_s1->unk0 = 0x00FF; - } - temp_t2 = (var_s0 + 1) & 0xFF; - var_s0 = temp_t2; - } while (temp_t2 < 4); - return; - case 2: /* switch 1 */ - temp_v0_3 = D_8018FC10[sp46]; - temp_v0_3->unk0 = (u16) sp44; - temp_v0_3->unk2 = sp42; - break; + case 1: /* switch 1 */ + D_8018FC10[sp46][0] = var_s1; + D_8018FC10[sp46][1] = sp42; + for (var_s0 = 0; var_s0 < 4; var_s0++) { + if (D_8018FC10[var_s0][0] != why) { + func_8001AAAC(var_s0, D_8018FC10[var_s0][0], D_8018FC10[var_s0][1]); + D_8018FC10[var_s0][0] = why; + } + } + break; + case 2: /* switch 1 */ + D_8018FC10[sp46][0] = var_s1; + D_8018FC10[sp46][1] = sp42; + break; } } } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2274.s") -#endif void func_800C2474(void) { u8 var_v0; @@ -2068,33 +2048,28 @@ void func_800C4FE4(u8 bankId) { GLOBAL_ASM("asm/non_matchings/audio/external/func_800C4FE4.s") #endif -#ifdef MIPS_TO_C -//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-17-2023 +// Seems somewhat similar to certain parts of `select_current_sounds` from SM64 void func_800C5278(u8 bankId) { + s32 stackPadding0; + u8 soundId; struct SoundCharacteristics sp60; - s32 temp_s7; - struct SoundCharacteristics *temp_s0; - struct SoundCharacteristics *temp_s2; - temp_s7 = bankId & 0xFF; - temp_s2 = sSoundBanks[temp_s7]; - if (temp_s2->next != 0xFF) { - do { - temp_s0 = &sSoundBanks[temp_s7][temp_s2->next]; - if ((s32) temp_s0->soundStatus >= 3) { - func_800CBBE8((temp_s0->unk2C << 8) | 0x06020000, 0); - } - if (temp_s0->soundStatus != 0) { - delete_sound_from_bank(temp_s7 & 0xFF, temp_s2->next & 0xFF); - } - } while (temp_s2->next != 0xFF); + soundId = sSoundBanks[bankId][0].next; + while (soundId != 0xFF) { + if (sSoundBanks[bankId][soundId].soundStatus >= 3) { + func_800CBBE8(((sSoundBanks[bankId][soundId].unk2C & 0xff) << 8) | 0x06020000, 0); + } + if (sSoundBanks[bankId][soundId].soundStatus != 0) { + delete_sound_from_bank(bankId, soundId); + } + // This feels wrong, I think it only works because `delete_sound_from_bank` + // modifies `sSoundBanks[bankId][0].next`, which allows us to eventually(?) + // break out of the loop + soundId = sSoundBanks[bankId][0].next; } - sp60.soundBits = temp_s7 << 0x1C; - func_800C41CC(0U, &sp60); + sp60.soundBits = bankId << 0x1C; + func_800C41CC(0, &sp60); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5278.s") -#endif void func_800C5384(u8 arg0, Vec3f *arg1) { u8 curr; @@ -2129,101 +2104,74 @@ void func_800C54B8(u8 arg0, Vec3f *arg1) { } void func_800C550C(Vec3f *arg0) { - UNUSED s32 pad[11]; u8 i; - Vec3f *sp3C; + struct SoundCharacteristics sp3C; for(i = 0; i < 6; i++) { func_800C5384(i, arg0); } - sp3C = arg0; - func_800C41CC(2U, (struct SoundCharacteristics*) &sp3C); + sp3C.unk00 = arg0; + func_800C41CC(2, &sp3C); } -#ifdef MIPS_TO_C -//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-18-2023 -void func_800C5578(Vec3f arg0, u32 soundBits) { - u32 sp84; - f32 *sp60; - s32 temp_t8; - s32 var_s3; - struct SoundCharacteristics *temp_s0; - struct SoundCharacteristics *temp_s4; - u8 var_s1; - u8 var_v0; +void func_800C5578(Vec3f *arg0, u32 soundBits) { + s32 stackPadding0; + u8 bankId; + u8 next; + u8 curr; + struct SoundCharacteristics sp60; - temp_t8 = ((u32) (soundBits & 0xF0000000) >> 0x1C) & 0xFF; - var_s1 = sSoundBanks[temp_t8]->next; - var_s3 = 0; - var_v0 = var_s1; - if (var_s1 != 0xFF) { - temp_s4 = sSoundBanks[temp_t8]; - do { - temp_s0 = &temp_s4[var_s1]; - if ((arg0 == temp_s0->unk00) && (soundBits == temp_s0->soundBits)) { - if ((s32) temp_s0->soundStatus >= 3) { - func_800CBBE8((temp_s0->unk2C << 8) | 0x06020000, 0); - } - if (temp_s0->soundStatus != 0) { - delete_sound_from_bank(temp_t8 & 0xFF, var_s1 & 0xFF); - } - var_s1 = 0xFF; - var_v0 = 0xFF; - } else { - var_s3 = var_s1 & 0xFF; + bankId = (soundBits & 0xF0000000) >> 0x1C; + next = sSoundBanks[bankId][0].next; + curr = 0; + while (next != 0xFF) { + if ((arg0 == sSoundBanks[bankId][next].unk00) && (soundBits == sSoundBanks[bankId][next].soundBits)) { + if (sSoundBanks[bankId][next].soundStatus >= 3) { + func_800CBBE8(((sSoundBanks[bankId][next].unk2C & 0xff) << 8) | 0x06020000, 0); } - if (var_v0 != 0xFF) { - var_s1 = temp_s4[var_s3].next; - var_v0 = var_s1; + if (sSoundBanks[bankId][next].soundStatus != 0) { + delete_sound_from_bank(bankId, next); } - } while (var_v0 != 0xFF); + next = 0xFF; + } else { + curr = next; + } + if (next != 0xFF) { + next = sSoundBanks[bankId][curr].next; + } } - sp60 = arg0; - sp84 = soundBits; - func_800C41CC(3U, (struct SoundCharacteristics *) &sp60); + sp60.unk00 = arg0; + sp60.soundBits = soundBits; + func_800C41CC(3, &sp60); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5578.s") -#endif -#ifdef MIPS_TO_C -//generated by m2c commit beb457dabfc7a01ec6540a5404a6a05097a13602 on Oct-17-2023 void func_800C56F0(u32 soundBits) { + s32 stackPadding0; + u8 bankId; + u8 next; + u8 curr; struct SoundCharacteristics sp68; - s32 temp_t8; - s32 var_s2; - struct SoundCharacteristics *temp_s0; - struct SoundCharacteristics *temp_s3; - u8 var_s1; - temp_t8 = ((u32) (soundBits & 0xF0000000) >> 0x1C) & 0xFF; - var_s1 = sSoundBanks[temp_t8]->next; - var_s2 = 0; - if (var_s1 != 0xFF) { - temp_s3 = sSoundBanks[temp_t8]; - do { - temp_s0 = &temp_s3[var_s1]; - if (soundBits == temp_s0->soundBits) { - if ((s32) temp_s0->soundStatus >= 3) { - func_800CBBE8((temp_s0->unk2C << 8) | 0x06020000, 0); - } - if (temp_s0->soundStatus != 0) { - delete_sound_from_bank(temp_t8 & 0xFF, var_s1 & 0xFF); - } - var_s1 = temp_s3[var_s2].next; - } else { - var_s2 = var_s1 & 0xFF; - var_s1 = temp_s3[var_s2].next; + bankId = (soundBits & 0xF0000000) >> 0x1C; + next = sSoundBanks[bankId][0].next; + curr = 0; + while (next != 0xFF) { + if (soundBits == sSoundBanks[bankId][next].soundBits) { + if (sSoundBanks[bankId][next].soundStatus >= 3) { + func_800CBBE8(((sSoundBanks[bankId][next].unk2C & 0xff) << 8) | 0x06020000, 0); } - } while (var_s1 != 0xFF); + if (sSoundBanks[bankId][next].soundStatus != 0) { + delete_sound_from_bank(bankId, next); + } + } else { + curr = next; + } + next = sSoundBanks[bankId][curr].next; } sp68.soundBits = soundBits; - func_800C41CC(5U, &sp68); + func_800C41CC(5, &sp68); } -#else -GLOBAL_ASM("asm/non_matchings/audio/external/func_800C56F0.s") -#endif // Might be process_all_sound_requests void func_800C5848(void) { diff --git a/src/audio/external.h b/src/audio/external.h index 7762aea1f..caf2455bf 100644 --- a/src/audio/external.h +++ b/src/audio/external.h @@ -235,8 +235,8 @@ void func_800C5278(u8); void func_800C5384(u8, Vec3f*); void func_800C54B8(u8, Vec3f*); void func_800C550C(Vec3f*); -void func_800C5578(Vec3f, u32); -u8 func_800C56F0(u32); +void func_800C5578(Vec3f*, u32); +void func_800C56F0(u32); void func_800C5848(void); void fade_channel_volume_scale(u8, u8, u16); void func_800C5968(u8); @@ -332,7 +332,7 @@ extern Camera *gCopyCamera[4]; extern Vec3f gVelocityCamera[4]; extern Vec3f gCameraLastPos[4]; extern u8 D_8018FC08; -extern u16 D_8018FC10[4][2]; +extern s16 D_8018FC10[4][2]; extern struct SoundCharacteristics sSoundBanks[SOUND_BANK_COUNT][20]; extern u8 sSoundBankUsedListBack[SOUND_BANK_COUNT]; diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c deleted file mode 100644 index fd6c0ec4d..000000000 --- a/src/code_8008C1D0.c +++ /dev/null @@ -1,2107 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include "code_800029B0.h" -#include "math_util.h" -#include "kart_attributes.h" -#include "waypoints.h" -#include "code_80005FD0.h" -#include "render_player.h" -#include "player_controller.h" -#include "hud_renderer.h" -#include "code_80057C60.h" -#include "effects.h" -#include "audio/external.h" -#include "spawn_players.h" -#include "code_80091750.h" - -s32 D_8018D900[8]; -s16 D_8018D920[8]; -s32 D_8018D930[8]; -s32 D_8018D950[8]; -s32 D_8018D970[8]; -s32 D_8018D990[8]; - -UNUSED void func_unnamed(void) { - -} - -s32 func_8008C1D8(UNUSED s32 *arg0) { - -} - -void func_8008C1E0(UNUSED s32 *arg0, UNUSED s32 arg1) { - arg1 = 4; -} - -UNUSED void func_unnamed1(UNUSED s32 arg0) { - -} - -UNUSED void func_unnamed2(UNUSED s32 arg0) { - -} - -UNUSED void func_unnamed3(void) { - -} - -void func_8008C204(void) { - -} - -UNUSED void func_unnamed4(void) { - -} - -UNUSED void func_8008C214(void) { - -} - -UNUSED void func_unnamed5(void) { - -} - -UNUSED void func_unnamed6(void) { - -} - -UNUSED void func_unnamed7(void) { - -} - -UNUSED void func_unnamed8(void) { - -} - -UNUSED void func_8008C23C(void) { - -} - -UNUSED void func_unnamed9(void) { - -} -UNUSED void func_unnamed10(void) { - -} -UNUSED void func_unnamed11(void) { - -} -UNUSED void func_unnamed12(void) { - -} -UNUSED void func_unnamed13(void) { - -} -UNUSED void func_unnamed14(void) { - -} -UNUSED void func_unnamed15(void) { - -} -UNUSED void func_unnamed16(void) { - -} -UNUSED void func_unnamed17(void) { - -} -UNUSED void func_unnamed18(void) { - -} -UNUSED void func_unnamed19(void) { - -} -UNUSED void func_unnamed20(void) { - -} -UNUSED void func_unnamed21(void) { - -} - -UNUSED void func_unnamed22(UNUSED s32 arg0, UNUSED s32 arg1) { - arg1 = 4; -} - -UNUSED void func_unnamed23(void) { - -} - -UNUSED void func_unnamed24(void) { - -} - -UNUSED void func_unnamed25(void) { - -} - -UNUSED void func_unnamed26(void) { - -} - -UNUSED void func_unnamed27(void) { - - -} - -UNUSED void func_unnamed28(void) { - -} - -UNUSED void func_unnamed29(void) { - -} - -UNUSED void func_unnamed30(void) { - -} - -UNUSED void func_unnamed31(void) { - -} - -UNUSED void func_unnamed32(void) { - -} - -UNUSED void func_unnamed33(void) { - -} - - -void func_8008C310(Player *player) { - if ((player->soundEffects & 2) || (player->soundEffects & 4) || ((player->soundEffects << 9) < 0) || (player->soundEffects & HIT_BY_ITEM_SOUND_EFFECT)) { - player->unk_0B6 = ((u16)player->unk_0B6 | 0x1000); - } -} - -UNUSED void func_unnamed34(void) { - -} - -void clean_effect(Player *player, s8 arg1) { - - if ((player->effects & 0x400) == 0x400) { - func_8008C6D0(player, arg1); - } - - if (((player->effects & 0x80) == 0x80) || (player->effects & 0x40) == 0x40) { - func_8008C8C4(player, arg1); - } - if ((player->effects & 0x800) == 0x800) { - func_8008D0E4(player, arg1); - } - if ((player->unk_044 & 0x4000) != 0) { - func_8008D3B0(player, arg1); - } - if ((player->effects & BOOST_EFFECT) == BOOST_EFFECT) { - remove_boost_effect(player); - } - if ((player->effects & 0x80000) == 0x80000) { - func_8008D760(player); - } - if ((player->effects & 0x800000) == 0x800000) { - func_8008D97C(player); - } - if ((player->effects & 0x1000000) == 0x1000000) { - func_8008E884(player, arg1); - } - if ((player->effects & HIT_BY_ITEM_EFFECT) == HIT_BY_ITEM_EFFECT) { - remove_hit_by_item_effect(player, arg1); - } - if ((player->effects & BOOST_RAMP_ASPHALT_EFFECT) == BOOST_RAMP_ASPHALT_EFFECT) { - remove_boost_ramp_asphalt_effect(player); - } - if ((player->effects & BOOST_RAMP_WOOD_EFFECT) == BOOST_RAMP_WOOD_EFFECT) { - remove_boost_ramp_wood_effect(player); - } - if ((player->effects & 0x4000) == 0x4000) { - func_8008F3E0(player); - } - if ((player->effects & 0x10000) == 0x10000) { - func_8008F5A4(player, arg1); - } - if ((player->effects & 0x10000000) == 0x10000000) { - func_8008FEDC(player, arg1); - } - player->unk_044 = (s16) (player->unk_044 & 0xFFFE); - player->effects = (s32) (player->effects & ~0x20); -} - -void func_8008C528(Player *player, s8 arg1) { - UNUSED s32 sp24; - s32 characterId; - clean_effect(player, arg1); - func_8008C310(player); - characterId = player->characterId; - player->unk_0C2 = 0; - player->kartHopJerk = D_800E37B0[characterId]; - player->kartHopAcceleration = 0.0f; - - player->kartHopVelocity = D_800E3790[characterId]; - player->unk_0A8 = 0; - player->effects = player->effects | 0x400; - player->effects = player->effects & ~0x10; - player->unk_0C0 = 0; - player->unk_236 = 2; - player->unk_042 = 0; - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x05)); - func_800C9060(arg1, SOUND_ACTION_EXPLOSION); - } else { - func_800098FC(arg1, player); - } - player->soundEffects = (s32) (player->soundEffects & ~4); -} - -void func_8008C62C(Player *player, s8 arg1) { - - func_80031F48(player, 5.0f); - player->unk_0A8 += (s16)0xA0; - player->unk_042 += (s16)0x71C; - if (player->unk_0A8 >= 0x2000) { - player->unk_0A8 = 0; - player->unk_236 = (s16) (player->unk_236 - 1); - if (player->unk_236 == 0) { - player->unk_0A8 = 0x2000; - func_8008C6D0(player, arg1); - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - } - } -} - -void func_8008C6D0(Player *player, s8 arg1) { - - player->unk_206 = 0; - player->slopeAccel = 0; - player->effects = (s32) (player->effects & ~0x400); - player->unk_0A8 = 0; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_236 = 0; - player->unk_078 = 0; - player->currentSpeed = 0.0f; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; -} - -void func_8008C73C(Player *player, s8 arg1) { - clean_effect(player, arg1); - if (((player->effects & 0x80) != 0x80) && ((player->effects & 0x40) != 0x40)) { - player->effects &= ~0x10; - - if ((player->unk_0C0 / 182) >= 0) { - player->effects |= 0x40; - } else { - player->effects |= 0x80; - } - - player->unk_0B6 |= 0x80; - player->unk_0C0 = 0; player->unk_07C = 0; player->unk_078 = 0; player->unk_0AE = player->rotation[1]; player->unk_0B2 = 2; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - D_80165280[arg1] = player->currentSpeed; - gTimerBoostTripleACombo[arg1] = 0; - gIsPlayerTripleAButtonCombo[arg1] = FALSE; - gCountASwitch[arg1] = 0; - gFrameSinceLastACombo[arg1] = 0; - D_8018D920[arg1] = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x03)); - } else { - func_800098FC(arg1, player); - } - } -} - -void func_8008C8C4(Player* player, s8 playerId) { - player->effects &= ~0x80; - player->effects &= ~0x40; - player->unk_0A8 = 0; - player->rotation[1] = player->unk_0AE; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->effects &= ~0x800; - - D_80165190[0][playerId] = 1; - D_80165190[1][playerId] = 1; - D_80165190[2][playerId] = 1; - D_80165190[3][playerId] = 1; - - player->unk_046 &= 0xFFBF; - - if ((gIsPlayerTripleAButtonCombo[playerId] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - player->currentSpeed = (f32) (player->currentSpeed + 100.0f); - } - if ((gModeSelection == VERSUS) && ((player->type & PLAYER_CPU) == PLAYER_CPU) && (!gDemoMode) && ((player->unk_0CA & 2) == 0) && (gGPCurrentRaceRankByPlayerId[playerId] != 0)) { - player->soundEffects = (s32) (player->soundEffects | REVERSE_SOUND_EFFECT); - } -} - -void func_8008C9EC(Player *player, s8 arg1) { - s16 stackPadding1; - s16 stackPadding2; - s16 sp30[5] = { 1092, 1092, 2184, 1638, 1820 }; - - player->unk_206 = 0; - player->slopeAccel = 0; - if ((player->unk_046 & 0x40) == 0x40) { - func_80031F48(player, 100.0f); - } else { - if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) { - func_80031F48(player, 1.0f); - } else { - func_80031F48(player, 4.0f); - } - if (!(player->type & PLAYER_HUMAN)) { - func_80031F48(player, 30.0f); - } - } - if ((player->effects & 0x80) == 0x80) { - player->rotation[1] -= sp30[player->unk_0B2]; - D_8018D920[arg1] -= sp30[player->unk_0B2]; - stackPadding1 = (u16)D_8018D920[arg1] / (0x10000 / (0x168 / (sp30[player->unk_0B2] / 182))); - if (stackPadding1 == 0) { - player->unk_0B2--; - if (player->unk_0B2 <= 0) { - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - func_8008C8C4(player, arg1); - } - } - } else { - player->rotation[1] += sp30[player->unk_0B2]; - D_8018D920[arg1] -= sp30[player->unk_0B2]; - stackPadding2 = (u16)D_8018D920[arg1] / (0x10000 / (0x168 / (sp30[player->unk_0B2] / 182))); - if (stackPadding2 == 0) { - player->unk_0B2--; - if (player->unk_0B2 <= 0) { - func_8008C8C4(player, arg1); - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - } - } - } - if ((gIsPlayerTripleAButtonCombo[arg1] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - gTimerBoostTripleACombo[arg1] = 120; - if (player->currentSpeed <= 90.0f) { - player->currentSpeed = 90.0f; - } - } -} - -void func_8008CDC0(Player* player, s8 arg1) { - clean_effect(player, arg1); - - player->soundEffects &= ~1; - player->unk_0B4 = 0; - player->unk_0B8 = 3.0f; - player->unk_0AC = 1; - player->effects &= ~0x10; - - if (((player->unk_07C >> 0x10) >= 0x14) || ((player->unk_07C >> 0x10) < -0x13) || (((player->unk_094 / 18.0f) * 216.0f) <= 30.0f) || ((player->effects & 8) != 0) || (((player->type & PLAYER_HUMAN) == 0) && ((player->effects & 0x1000) == 0))) { - func_8008C73C(player, arg1); - } - else { - player->effects |= 0x800; - } -} - -void func_8008CEB0(Player *player, s8 arg1) { - f32 var_f0; - s16 var_v1; - s16 var_a3; - s16 temp_f16; - - var_f0 = player->unk_0B8; - var_v1 = player->unk_0B4; - var_a3 = player->unk_0AC; - var_v1++; - temp_f16 = (var_v1 * var_f0) - (0.2 * (var_v1 * var_v1)); - if ((var_v1 != 0) && (temp_f16 < 0)) { - var_v1 = 0; - var_a3 = -var_a3; - var_f0 *= 0.8; - if ((player->effects & 1) == 1) { - player->effects |= 0x40000; - } - if (var_f0 <= 1.0f) { - player->effects &= ~0x800; - if ((player->effects & 0x40000) != 0x40000) { - func_8008C73C(player, arg1); - var_v1 = 0; - } else { - player->unk_0B6 |= 0x20; - player->effects &= ~0x40000; - if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) - { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x08)); - var_v1 = 0; - } - } - } - } - temp_f16 *= var_a3; - if ((temp_f16 <= 0) && (var_a3 == 1)) { - temp_f16 = 0; - } - if ((temp_f16 >= 0) && (var_a3 == -1)) { - temp_f16 = 0; - } - player->unk_078 += temp_f16 * 0x12; - player->unk_0B8 = var_f0; - player->unk_0B4 = var_v1; - player->unk_0AC = var_a3; - if (player->effects & 8) { - func_8008C73C(player, arg1); - player->effects &= ~0x800; - } -} - -void func_8008D0E4(Player* player, UNUSED s8 arg1) { - player->effects &= ~0x800; -} - -void func_8008D0FC(Player *player, s8 arg1) { - clean_effect(player, arg1); - - player->soundEffects &= ~0x80; - player->unk_0B4 = 0; - player->unk_0B8 = 2.0f; - player->unk_0AC = 1; - player->effects &= ~0x10; - player->unk_044 |= 0x4000; -} - -void func_8008D170(Player *player, s8 arg1) { - f32 var_f0; - s16 var_v1; - s16 var_a3; - s16 temp_f16; - - var_f0 = player->unk_0B8; - var_v1 = player->unk_0B4; - var_a3 = player->unk_0AC; - var_v1++; - temp_f16 = (var_v1 * var_f0) - (0.1 * (var_v1 * var_v1)); - if ((var_v1 != 0) && (temp_f16 < 0)) { - var_v1 = 0; - var_a3 = -var_a3; - var_f0 *= 0.9; - if (((player->effects & 1) == 1) || !(player->unk_044 & 0x20)) { - player->effects |= 0x40000; - } - if (var_f0 <= 1.3) { - player->unk_044 &= ~0x4000; - if ((player->effects & 0x40000) != 0x40000) { - func_8008C73C(player, arg1); - var_v1 = 0; - } else { - player->unk_0B6 |= 0x20; - player->effects &= ~0x40000; - if ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) - { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x08)); - var_v1 = 0; - } - } - } - } - temp_f16 *= var_a3; - if ((temp_f16 <= 0) && (var_a3 == 1)) { - temp_f16 = 0; - } - if ((temp_f16 >= 0) && (var_a3 == -1)) { - temp_f16 = 0; - } - player->unk_078 += temp_f16 * 0x14; - player->unk_0B8 = var_f0; - player->unk_0B4 = var_v1; - player->unk_0AC = var_a3; - if (player->effects & 8) { - func_8008C73C(player, arg1); - player->unk_044 &= ~0x4000; - } -} - -void func_8008D3B0(Player* player, UNUSED s8 arg1) { - player->unk_044 &= 0xBFFF; -} - -void apply_boost_sound_effect(Player* player, s8 arg1) { - - clean_effect(player, arg1); - - player->effects |= BOOST_EFFECT; - player->soundEffects &= ~BOOST_SOUND_EFFECT; - player->unk_DB4.unk0 = 0; - player->unk_DB4.unk8 = 8.0f; - - if (D_8015F890 != 1) { - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C9250(arg1); - func_800C9060(arg1, SOUND_ARG_LOAD(0x19, 0x00, 0xA4, 0x0B)); - } - } else { - if (player == gPlayerOne) { - func_800C9250(arg1); - func_800C9060(arg1, SOUND_ARG_LOAD(0x19, 0x00, 0xA4, 0x0B)); - } - } - - player->boostTimer = 0x50; -} - -void apply_boost_effect(Player* player) { - player->currentSpeed = (f32) player->topSpeed; - if ( player->boostTimer > 0) { - --player->boostTimer; - } - - if (player->boostTimer != 0) { - move_f32_towards(&player->boostPower, 400.0f, 0.5f); - } else { - move_f32_towards(&player->boostPower, 0.0f, 0.1f); - } - - if (player->boostPower <= 1.0f) { - player->effects &= ~BOOST_EFFECT; - } -} - -void remove_boost_effect(Player* player) { - player->effects &= ~BOOST_EFFECT; - player->boostPower = 0.0f; -} - -void func_8008D570(Player *player, s8 arg1) { - clean_effect(player, arg1); - - player->unk_0AE = player->rotation[1]; - player->effects |= 0x80000; - player->effects &= ~0x10; - player->soundEffects &= ~0x1000; - player->kartHopJerk = D_800E3730[player->characterId]; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = (f32) D_800E3710[player->characterId]; - player->unk_0B2 = 1; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_078 = 0; - D_8018D920[arg1] = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C9060(arg1, SOUND_ARG_LOAD(0x19, 0x00, 0x80, 0x02)); - } - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x0C)); - } -} - -void func_8008D698(Player* player, s8 arg1) { - s16 temp; - - if (player->unk_0B2 == 0) { - player->rotation[1] = player->unk_0AE; - temp = 0; - } else { - player->rotation[1] -= 1820; - D_8018D920[arg1] -= 1820; - temp = ((u16) D_8018D920[arg1] / 1820); - } - if (temp == 0) { - --player->unk_0B2; - if (player->unk_0B2 <= 0) { - player->unk_0B2 = 0; - } - if ((player->unk_0B2 == 0) && ((player->effects & 8) != 8)) { - func_8008D760(player); - } - } -} - -void func_8008D760(Player* player) { - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->rotation[1] = player->unk_0AE; - player->effects &= ~0x80000; - player->kartGravity = gKartGravityTable[player->characterId]; - player->type &= 0xFF7F; -} - -void func_8008D7B0(Player* player, s8 arg1) { - clean_effect(player, arg1); - - player->unk_0AE = player->rotation[1]; - player->effects |= 0x800000; - player->effects &= ~0x10; - player->soundEffects &= ~0x20000; - player->kartHopJerk = D_800E3770[player->characterId]; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = D_800E3750[player->characterId]; - D_8018D920[arg1] = 0; - player->unk_0B2 = 4; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_078 = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x03)); - } -} - -void func_8008D8B4(Player* player, s8 arg1) { - s16 temp; - - if (player->unk_0B2 == 0) { - player->rotation[1] = player->unk_0AE; - temp = 0; - } else { - player->rotation[1] -= 1820; - D_8018D920[arg1] -= 1820; - temp = ((u16) (D_8018D920[arg1]) / 1820); - } - if (temp == 0) { - --player->unk_0B2; - if (player->unk_0B2 <= 0) { - player->unk_0B2 = 0; - } - if ((player->unk_0B2 == 0) && ((player->effects & 8) != 8)) { - func_8008D97C(player); - } - } -} - -void func_8008D97C(Player *player) { - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->rotation[1] = player->unk_0AE; - player->effects &= ~0x80000; - player->kartGravity = gKartGravityTable[player->characterId]; -} - -void func_8008D9C0(Player* player) { - player->unk_DA0 += 8.0f; - if (player->unk_DA0 >= 140.0f) { - player->unk_DA0 = 140.0f; - } - - if (player->unk_D98 == 1) { - player->unk_D9C += player->unk_DA0; - if (2002.0f <= player->unk_D9C) { - player->unk_DA0 = 10.0f; - player->unk_D98 *= -1; - } - } - if (player->unk_D98 == -1) { - player->unk_D9C -= player->unk_DA0; - if (player->unk_D9C <= -2002.0f) { - player->unk_DA0 = 10.0f; - player->unk_D98 *= -1; - } - } -} - -void func_8008DABC(Player *player, s8 arg1) { - clean_effect(player, arg1); - - if ((player->effects & 0x4000000) == 0) { - player->unk_DB4.unk2 = 0; - player->unk_238 = 0; - player->unk_DB4.unk10 = 4.5f; - D_8018D990[arg1] = 0; - player->effects &= ~(0x08000000 | 0x10); - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_D98 = 1; - player->unk_D9C = 0.0f; - player->unk_DA0 = 65.0f; - - if ((player->soundEffects & 0x100) != 0) { - player->unk_046 |= 0x80; - } - - if (((player->type & PLAYER_HUMAN) != 0) && ((player->effects & 0x04000000) == 0)) { - func_800C90F4(arg1, (player->characterId * 0x10) + SOUND_ARG_LOAD(0x29, 0x00, 0x80, 0x05)); - } - - player->effects |= 0x04000000; - if (((player->type) & 0x1000) != 0) { - func_800098FC(arg1, player); - } - } -} - -void func_8008DC08(Player* player, s8 arg1) { - player->unk_0C2 = 0; - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->unk_08C = 0.0f; - player->currentSpeed = 0.0f; - if ((player->unk_110.unk3C[2] >= 600.0f) || ((player->effects & 0x1000) != 0)) { D_8018D990[arg1] = 3; } // placed block on same line to match - - switch (D_8018D990[arg1]) { - case 0: - player->unk_DB4.unk10 = 4.5f; - if (player->unk_238 < 0x3D) { - ++player->unk_238; - } - - if ((player->unk_046 & 0x80) != 0) { - if ((player->soundEffects & 0x100) == 0) { - D_8018D990[arg1] = 1; - player->unk_238 = 0; - if ((player->type & PLAYER_HUMAN) != 0) { - func_800C9060(arg1, 0x1901904B); - break; - } - } - } else { - ++player->unk_238; - if (player->unk_238 >= 0x1E) { - D_8018D990[arg1] = 1; - player->unk_238 = 0; - if ((player->type & PLAYER_HUMAN) != 0) { - func_800C9060(arg1, 0x1901904B); - break; - } - } - break; - } - - break; - case 1: - player->unk_DB4.unk10 = 4.5f; - player->pos[1] += 0.13; - ++player->unk_238; - - if ((player->unk_046 & 0x80) != 0) { - if (player->unk_238 >= 0x32) { - D_8018D990[arg1] = 2; - player->unk_238 = 0; - player->unk_046 &= 0xFF7F; - } - } else if (player->unk_238 >= 0x50) { - D_8018D990[arg1] = 2; - player->unk_238 = 0; - } - - player->unk_DA0 += 6.0f; - if (player->unk_DA0 >= 90.0f) { - player->unk_DA0 = 90.0f; - } - - player->unk_D9C += player->unk_DA0; - if (3458.0f <= player->unk_D9C) { - player->unk_DA0 = 0.0f; - break; - } - break; - case 2: - ++player->unk_238; - if (player->unk_238 >= 0x259) { - D_8018D990[arg1] = 3; - player->unk_238 = 0; - } - - if (player->unk_110.unk3C[2] >= 600.0f) { - D_8018D990[arg1] = 3; - } - - player->unk_DB4.unk10 = 4.5f; - player->pos[1] -= 0.085; - - if ((player->effects & 8) != 8) { - D_8018D990[arg1] = 3; - player->unk_238 = 0; - } - - func_8008D9C0(player); - break; - case 3: - player->unk_DB4.unk10 = 3.0f; - player->effects &= ~0x04000000; - player->unk_DB4.unk2 = 0; - player->effects |= 0x08000000; - player->size = 1.0f; - player->boundingBoxSize = gKartBoundingBoxSizeTable[player->characterId]; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - - if ((player->type & PLAYER_HUMAN) != 0) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008008); - } - break; - } -} - -void apply_hit_rotating_sound_effect(Player* player, s8 arg1) { - clean_effect(player, arg1); - - player->soundEffects &= ~HIT_ROTATING_SOUND_EFFECT; - player->effects |= 0x40020000; - player->effects &= ~0x10; - player->unk_08C *= 0.6; - player->unk_0B0 = 0; - player->size = 1.0f; - D_8018D930[arg1] = gCourseTimer; - player->unk_0AE = player->rotation[1]; - player->unk_0B2 = 2; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_078 = 0; - - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - - D_8018D920[arg1] = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008003); - } else { - func_800098FC(arg1, player); - } - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } -} - -void apply_lightning_effect(Player *player, s8 arg1) { - s16 test; - if (((player->effects & 0x8000) == 0x8000) && ((player->effects & 0x04000000) != 0x04000000)) { - player->effects &= ~0x20000; - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->rotation[1] = player->unk_0AE; - remove_lightning_effect(player, arg1); - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - func_8008DABC(player, arg1); - } else if ((player->effects & 0x20000) == 0x20000) { - player->rotation[1] -= 0x5B0; - D_8018D920[arg1] -= 0x5B0; - test = (u16)D_8018D920[arg1] / 1456; - if (test == 0) { - player->unk_0B2--; - if (player->unk_0B2 <= 0) { - player->unk_0A8 = 0; - player->effects &= ~0x20000; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->rotation[1] = player->unk_0AE; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - } - } - func_80031F48(player, 1.0f); - } else { - player->unk_0B0 += 1; - player->unk_08C = (f32) ((f64) player->unk_08C * 0.6); - if ((player->unk_0B0 == 1) && (player->type & PLAYER_HUMAN)) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008005); - } - if ((player->unk_0B0 >= 0) && (player->unk_0B0 < 0x1CC)) { - move_f32_towards(&player->size, 0.7f, 0.1f); - move_f32_towards(&player->boundingBoxSize, (f32) ((f64) gKartBoundingBoxSizeTable[player->characterId] * 0.9), 0.1f); - } else { - remove_lightning_effect(player, arg1); - if (player->type & PLAYER_HUMAN) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008008); - } - } - } -} - -void remove_lightning_effect(Player* player, UNUSED s8 arg1) { - move_f32_towards(&player->size, 1.0f, 0.1f); - move_f32_towards(&player->boundingBoxSize, gKartBoundingBoxSizeTable[player->characterId], 0.1f); - - player->effects &= ~LIGHTNING_EFFECT; - player->size = 1.0f; - player->boundingBoxSize = gKartBoundingBoxSizeTable[player->characterId]; - player->unk_DB4.unk10 = 3.0f; - player->unk_DB4.unk2 = 0; - player->effects |= 0x08000000; - - if ((player->effects & 0x20000) == 0x20000) { - player->rotation[1] = player->unk_0AE; - } - - player->effects &= ~0x20000; -} - -void func_8008E4A4(Player* player, s8 arg1) { - player->unk_206 = 0; - player->slopeAccel = 0; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_0C2 = 0xF; - player->unk_042 += 0xAAA; - player->unk_08C = 0.0f; - player->currentSpeed = 0.0f; - player->velocity[0] = 0.0f; - player->velocity[2] = 0.0f; - player->effects &= ~0xC0; - - if ((player->effects & 8) != 8) { - ++player->unk_0E0; - } - - if (player->unk_0E0 == 3) { - player->effects &= ~0x01000000; - player->unk_0A8 = 0; - player->unk_236 = 0; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; - player->type &= ~0x80; - - if ((gIsPlayerTripleAButtonCombo[arg1] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - player->currentSpeed += 100.0f; - } - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - } else { - player->unk_0A8 += 0x80; - if (player->unk_0A8 >= 0x2000) { - player->unk_0A8 = 0; - --player->unk_236; - if (player->unk_236 == 0) { - player->effects &= ~0x01000000; - player->unk_236 = 0; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; - - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - if ((gIsPlayerTripleAButtonCombo[arg1] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - player->currentSpeed += 100.0f; - } - - player->type &= ~0x80; - } - } - } -} - -void apply_reverse_sound_effect(Player *player, s8 arg1) -{ - clean_effect(player, arg1); - func_8008C310(player); - - player->unk_0A8 = 0; - player->effects |= 0x01000000; - player->effects &= ~0x10; - player->kartHopJerk = 0.0f; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = 0.0f; - player->kartHopJerk = D_800E3730[player->characterId]; - player->kartHopVelocity = D_800E3710[player->characterId]; - player->unk_236 = 4; - player->unk_042 = 0; - player->unk_0E0 = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - if (((gModeSelection == VERSUS) && ((player->type & PLAYER_CPU) != 0)) && (!gDemoMode)) { - func_800CA24C(arg1); - } - - if (1) { - } - - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008005); - if (((gModeSelection == VERSUS) && ((player->type & PLAYER_CPU) != 0)) && (!gDemoMode)) { - func_800CA24C(arg1); - } - func_800C9060(arg1, SOUND_ACTION_EXPLOSION); - } else { - func_800098FC(arg1, player); - } - - player->soundEffects &= ~(REVERSE_SOUND_EFFECT | 0x80000); - player->unk_0B6 |= 0x40; - gTimerBoostTripleACombo[arg1] = 0; - gIsPlayerTripleAButtonCombo[arg1] = FALSE; - gCountASwitch[arg1] = 0; - gFrameSinceLastACombo[arg1] = 0; -} - -void func_8008E884(Player* player, s8 arg1) { - player->effects &= ~0x01000000; - player->unk_0A8 = 0; - player->unk_236 = 0; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; -} - -void apply_hit_by_item_effect(Player *player, s8 arg1) { - player->unk_206 = 0; - player->slopeAccel = 0; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_0C2 = 0xF; - player->unk_042 += 0xAAA; - player->unk_08C /= 2; - player->currentSpeed = 0.0f; - player->effects &= ~0xC0; - - if ((player->effects & 8) != 8) { - ++player->unk_0E0; - } - - if (player->unk_0E0 == 4) { - player->effects &= ~HIT_BY_ITEM_EFFECT; - player->unk_0A8 = 0; - player->unk_236 = 0; - D_80165190[3][arg1] = 1; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - player->unk_042 = 0; - - if ((gIsPlayerTripleAButtonCombo[arg1] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - player->currentSpeed += 100.0f; - } - - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - } else { - player->unk_0A8 = (s16)(player->unk_0A8 + 0x90); - if (((s32)player->unk_0A8) >= 0x2000) { - player->unk_0A8 = 0; - --player->unk_236; - if (player->unk_236 == 0) { - player->effects &= ~HIT_BY_ITEM_EFFECT; - player->unk_236 = 0; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; - if ((gIsPlayerTripleAButtonCombo[arg1] == TRUE) && ((player->type & PLAYER_HUMAN) == PLAYER_HUMAN)) { - player->currentSpeed += 100.0f; - } - - if (gModeSelection == BATTLE) { - func_8006B8B4(player, arg1); - } - } - } - } -} - -void apply_hit_by_item_sound_effect(Player* player, s8 arg1) { - clean_effect(player, arg1); - func_8008C310(player); - - player->unk_0A8 = 0; - player->effects &= ~0x10; - player->kartHopJerk = 0.0f; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = 0.0f; - player->kartHopJerk = D_800E3730[player->characterId]; - player->kartHopVelocity = D_800E3710[player->characterId]; - player->unk_236 = 4; - player->unk_042 = 0; - player->unk_0E0 = 0; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008005); - func_800C9060(arg1, SOUND_ACTION_EXPLOSION); - } else { - func_800098FC(arg1, player); - } - - player->effects |= HIT_BY_ITEM_EFFECT; - player->unk_0B6 |= 0x40; - player->soundEffects &= ~0x01000002; - - gTimerBoostTripleACombo[arg1] = 0; - gIsPlayerTripleAButtonCombo[arg1] = FALSE; - gCountASwitch[arg1] = 0; - gFrameSinceLastACombo[arg1] = 0; -} - -void remove_hit_by_item_effect(Player* player, s8 arg1) { - player->effects &= ~HIT_BY_ITEM_EFFECT; - player->unk_0A8 = 0; - player->unk_236 = 0; - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; -} - -void apply_boost_ramp_asphalt_sound_effect(Player* player, s8 playerId) { - clean_effect(player, playerId); - - player->effects |= BOOST_RAMP_ASPHALT_EFFECT; - player->soundEffects &= ~BOOST_RAMP_ASPHALT_SOUND_EFFECT; - player->unk_DB4.unk0 = 0; - player->unk_DB4.unk8 = 8.0f; - if (D_8015F890 != 1) { - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) == 0)) { - func_800C90F4(playerId, (player->characterId * 0x10) + 0x29008001); - func_800C9060(playerId, 0x1900A40B); - } - } else if (player == gPlayerOne) { - func_800C90F4(playerId, (player->characterId * 0x10) + 0x29008001); - func_800C9060(playerId, 0x1900A40B); - } - player->unk_044 &= ~0x1; - player->effects &= ~0x20; -} - -void apply_boost_ramp_asphalt_effect(Player* player) { - f64 temp_f0; - - player->currentSpeed = player->topSpeed; - if ((u16) player->unk_256 > 0) { - player->currentSpeed = 0.0f; - } - if ((player->surfaceType != BOOST_RAMP_ASPHALT) && ((player->effects & 8) != 8)) { - move_f32_towards(&player->boostPower, 0, 1.0f); - } else { - move_f32_towards(&player->boostPower, 400.0f, 0.01f); - } - if (player->boostPower <= 1.0f) { - player->effects &= ~BOOST_RAMP_ASPHALT_EFFECT; - player->boostPower = 0.0f; - if (player->unk_0C2 >= 0x33) { - temp_f0 = 0.7; - player->currentSpeed = (player->currentSpeed * temp_f0); - player->unk_08C = (player->unk_08C * temp_f0); - } - } -} - -void remove_boost_ramp_asphalt_effect(Player* player) { - player->effects &= ~BOOST_RAMP_ASPHALT_EFFECT; - player->boostPower = 0.0f; -} - -void apply_boost_ramp_wood_sound_effect(Player* player, s8 playerId) { - clean_effect(player, playerId); - - player->effects |= BOOST_RAMP_WOOD_EFFECT; - player->soundEffects &= ~BOOST_RAMP_WOOD_SOUND_EFFECT; - - if (D_8015F890 != 1) { - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) == 0)) { - func_800C90F4(playerId, (player->characterId * 0x10) + 0x29008001); - func_800C9060(playerId, 0x1900A40B); - } - } else if (player == gPlayerOne) { - func_800C90F4(playerId, (player->characterId * 0x10) + 0x29008001); - func_800C9060(playerId, 0x1900A40B); - } - - player->unk_044 &= ~0x1; - player->effects &= ~0x20; -} - -void apply_boost_ramp_wood_effect(Player* player) { - player->currentSpeed = gTopSpeedTable[0][player->characterId]; - - if ((player->surfaceType != BOOST_RAMP_WOOD) && ((player->effects & 8) != 8)) { - move_f32_towards(&player->boostPower, 0, 1.0f); - } else { - move_f32_towards(&player->boostPower, 300.0f, 0.1f); - } - - if (player->boostPower <= 1.0f) { - player->effects &= ~BOOST_RAMP_WOOD_EFFECT; - player->boostPower = 0.0f; - player->currentSpeed /= 2; - player->unk_08C /= 2; - } -} - -void remove_boost_ramp_wood_effect(Player* player) { - player->effects &= ~BOOST_RAMP_WOOD_EFFECT; - player->boostPower = 0.0f; -} - -void func_8008F104(Player* player, s8 arg1) { - clean_effect(player, arg1); - - player->unk_0AE = player->rotation[1]; - player->unk_0B2 = 2; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->effects |= 0x4000; - player->unk_078 = 0; - D_8018D920[arg1] = -0x8000; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008003); - } -} - -void func_8008F1B8(Player* player, s8 arg1) { - s16 temp; - - player->unk_08C = (player->unk_210 * 0.05); - if (player->unk_0B2 < 0) { - if ((player->unk_044 & 0x80) == 0x80) { - player->rotation[1] += 182; - D_8018D920[arg1] += 182; - - temp = ((u16) D_8018D920[arg1] / 182); - if (temp == 180) { - player->effects &= ~0x4000; - player->type &= ~0x80; - player->currentSpeed /= 3.0f; - } - } else { - - player->rotation[1] -= 182; - D_8018D920[arg1] -= 182; - temp = ((u16) D_8018D920[arg1] / 182); - if (temp == 180) { - player->effects &= ~0x4000; - player->type &= ~0x80; - player->currentSpeed /= 3.0f; - } - } - } else { - if ((player->unk_0B2 & 1) != 0) { - player->rotation[1] -= 364; - D_8018D920[arg1] -= 364; - temp = ((u16) D_8018D920[arg1] / 364); - if (temp < 71) { - --player->unk_0B2; - } - player->unk_044 |= 0x80; - player->unk_044 &= ~0x40; - return; - } - player->rotation[1] += 364; - D_8018D920[arg1] += 364; - temp = ((u16) D_8018D920[arg1] / 364); - if (temp >= 110) { - --player->unk_0B2; - } - player->unk_044 |= 0x40; - player->unk_044 &= ~0x80; - } -} - -void func_8008F3E0(Player* player) { - player->effects &= ~0x4000; -} - -void func_8008F3F4(Player* player, UNUSED s8 arg1) { - player->unk_0A8 += 0x80; - player->unk_042 += 0x71C; - player->unk_07C = 0; - player->currentSpeed = 0.0f; - player->unk_08C /= 2; - if (player->unk_0A8 >= 0x2000) { - player->unk_0A8 = 0; - --player->unk_236; - if (player->unk_236 == 0) { - player->effects &= ~0x00010000; - func_80090778(player); - func_80090868(player); - } - } -} - -void func_8008F494(Player* player, s8 arg1) { - if ((((player->effects & 0x80) != 0) || - ((player->effects & 0x40) != 0) || - ((player->effects & 0x01000000)) || - ((player->effects & HIT_BY_ITEM_EFFECT)) || - ((player->effects & 0x400) != 0)) && (gModeSelection == BATTLE)) { - player->unk_044 |= 0x8000; - } - - clean_effect(player, arg1); - func_8008F86C(player, arg1); - - player->unk_0A8 = 0; - player->effects |= 0x10000; - player->effects &= ~0x10; - player->unk_236 = 0x1E; - player->unk_042 = 0; - - if (((player->type & PLAYER_HUMAN) != 0) && - ((player->type & PLAYER_INVISIBLE_OR_BOMB) == 0) && - ((player->unk_0CA & 2) == 0) && - ((player->unk_0DE & 1) == 0) && - ((player->unk_0DE & 2) == 0)) { - func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008004); - } -} - -void func_8008F5A4(Player* player, s8 arg1) { - - if ((player->unk_044 & 0x8000) != 0) { - func_8006B8B4(player, arg1); - player->unk_044 &= ~0x8000; - } - - player->unk_206 = 0; - player->slopeAccel = 0; - player->effects &= ~0x10000; - player->unk_0A8 = 0; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_236 = 0; - player->unk_078 = 0; - player->currentSpeed = 0.0f; - - D_80165190[0][arg1] = 1; - D_80165190[1][arg1] = 1; - D_80165190[2][arg1] = 1; - D_80165190[3][arg1] = 1; - player->unk_042 = 0; -} - -void apply_star_effect(Player* player, s8 arg1) { - if (((s32) gCourseTimer - D_8018D930[arg1]) >= 9) { - D_8018D900[arg1] = 1; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - if (D_8018D900[arg1] == 1) { - func_800CA730(arg1); - D_8018D900[arg1] = 0; - } - } else if (D_8018D900[arg1] == 1) { - func_800CAACC((u8)arg1); - D_8018D900[arg1] = 0; - } - } - - if (((s32) gCourseTimer - D_8018D930[arg1]) >= 0xA) { - player->effects &= ~STAR_EFFECT; - } -} - -// Star item -void apply_star_sound_effect(Player* player, s8 arg1) { - clean_effect(player, arg1); - - player->effects |= STAR_EFFECT; - player->soundEffects &= ~STAR_SOUND_EFFECT; - D_8018D930[arg1] = gCourseTimer; - D_8018D900[arg1] = 1; - - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - if (D_8018D900[arg1] == 1) { - func_800CA59C(arg1); - D_8018D900[arg1] = 2; - } - // This may be in charge of ending the star sound. Still unknown though. - } else if (D_8018D900[arg1] == 1) { - func_800CA984(arg1); - D_8018D900[arg1] = 2; - } -} - -void func_8008F86C(Player* player, s8 arg1) { - player->effects &= ~STAR_EFFECT; - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_INVISIBLE_OR_BOMB) != PLAYER_INVISIBLE_OR_BOMB)) { - func_800CA730(arg1); - return; - } - func_800CAACC(arg1); -} - -void apply_boo_effect(Player* arg0, s8 arg1) { - s32 tmp; - tmp = ((s32) gCourseTimer) - D_8018D950[arg1]; - if (tmp < 7) { - arg0->unk_0C6 -= 2; - - if (arg0->unk_0C6 < 0x61) { - arg0->unk_0C6 = 0x60; - } - D_8018D970[arg1] -= 2; - if (D_8018D970[arg1] <= 0) { - D_8018D970[arg1] = 0; - } - } else { - arg0->unk_0C6 += 4; - if (arg0->unk_0C6 >= 0xF0) { - arg0->unk_0C6 = 0xFF; - D_8018D970[arg1] = 0xFF; - arg0->effects &= ~0x80000000; - if ((arg0->type & 0x4000) != 0) { - func_800CB064(arg1); - } - } - - D_8018D970[arg1] += 8; - if (D_8018D970[arg1] >= 0xF0) { - D_8018D970[arg1] = 0xFF; - arg0->unk_0C6 = 0xFF; - arg0->effects &= ~0x80000000; - if ((arg0->type & 0x4000) != 0) { - func_800CB064(arg1); - } - } - } -} - -void apply_boo_sound_effect(Player* player, s8 arg1) { - s16 temp_v1; - - if ((player->type & PLAYER_HUMAN) != 0) { - player->unk_044 |= 0x200; - - for (temp_v1 = 0; temp_v1 < 10; ++temp_v1) { - player->unk_258[temp_v1].unk_01C = 0; - player->unk_258[temp_v1].unk_01E = 0; - player->unk_258[temp_v1].unk_012 = 0; - } - } - - clean_effect(player, arg1); - - player->effects |= BOO_EFFECT; - player->soundEffects &= ~BOO_SOUND_EFFECT; - D_8018D950[arg1] = gCourseTimer; - D_8018D970[arg1] = 0xFF; - - if ((player->type & PLAYER_HUMAN) != 0) { - func_800CAFC0(arg1); - } -} - -void func_8008FB30(Player* arg0, s8 arg1) { - arg0->unk_0C6 += 8; - if (arg0->unk_0C6 >= 0xF0) { - arg0->unk_0C6 = 0xFF; - D_8018D970[arg1] = 0xFF; - - arg0->effects &= ~0x80000000; - if ((arg0->type & 0x4000) != 0) { - func_800CB064(arg1); - } - } - - D_8018D970[arg1] += 0x10; - if (D_8018D970[arg1] >= 0xE0) { - D_8018D970[arg1] = 0xFF; - arg0->unk_0C6 = 0xFF; - arg0->effects &= ~0x80000000; - if ((arg0->type & 0x4000) != 0) { - func_800CB064(arg1); - } - } -} - -void func_8008FC1C(Player* player) { - s32 playerIndex; - - if ((player->type & PLAYER_UNKNOWN_0x40) != 0) { - playerIndex = get_player_index_for_player(player); - player->type = 0x7000; - func_80056A94(playerIndex); - } -} - -void func_8008FC64(Player* player, s8 arg1) { - player->unk_0C6 -= 4; - if (player->unk_0C6 < 5) { - player->unk_0C6 = 0; - player->soundEffects &= 0xFBFFFFFF; - player->soundEffects |= 0x08000000; - player->type |= PLAYER_UNKNOWN_0x40; - - func_8008FDA8(player, arg1); - func_800569F4(arg1); - } -} - -void func_8008FCDC(Player* player, s8 arg1) { - player->unk_0C6 += 2; - if (player->unk_0C6 >= 0xF0) { - player->unk_0C6 = 0xFF; - player->soundEffects &= ~0x08000000; - } - - func_80056A40(arg1, (u32) player->unk_0C6); -} - -void func_8008FD4C(Player* player, UNUSED s8 arg1) { - s16 temp_v0; - - player->soundEffects |= 0x04000000; - player->unk_044 |= 0x200; - - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_01C = 0; - player->unk_258[temp_v0].unk_01E = 0; - player->unk_258[temp_v0].unk_012 = 0; - } -} - -void func_8008FDA8(Player* player, UNUSED s8 arg1) { - s16 temp_v0; - player->unk_044 |= 0x200; - for (temp_v0 = 0; temp_v0 < 10; ++temp_v0) { - player->unk_258[temp_v0].unk_01C = 0; - player->unk_258[temp_v0].unk_01E = 0; - player->unk_258[temp_v0].unk_012 = 0; - } -} - -void func_8008FDF4(Player* player, UNUSED s8 arg1) { - clean_effect(player, arg1); - - player->effects &= ~0x10; - player->kartHopJerk = D_800E37F0[player->characterId]; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = D_800E37D0[player->characterId]; - player->soundEffects &= ~0x00100000; - player->effects |= 0x10000000; -} - -void func_8008FE84(Player* player, UNUSED s8 arg1) { - player->effects &= ~0x10; - if ((player->effects & 8) != 8) { - player->effects &= ~0x10000000; - player->currentSpeed /= 2; - player->unk_08C /= 2; - } -} - -void func_8008FEDC(Player* player, UNUSED s8 arg1) { - player->effects &= ~0x10000000; - player->kartHopJerk = 0.0f; - player->kartHopVelocity = 0.0f; - player->kartHopAcceleration = 0.0f; -} - -void func_8008FF08(Player *player, s8 playerId) { - s16 waypoint; - switch (gCurrentCourseId) { - case COURSE_BOWSER_CASTLE: - waypoint = gNearestWaypointByPlayerId[playerId]; - if ((waypoint >= 0x235) && (waypoint < 0x247)) { - player->nearestWaypointId = 0x214; - } else if ((waypoint >= 0x267) && (waypoint < 0x277)) { - player->nearestWaypointId = 0x25B; - } else { - player->nearestWaypointId = gNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - } - break; - case COURSE_BANSHEE_BOARDWALK: - waypoint = gNearestWaypointByPlayerId[playerId]; - if ((waypoint >= 0x12C) && (waypoint < 0x13C)) { - player->nearestWaypointId = 0x12CU; - } else { - player->nearestWaypointId = gNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - } - break; - case COURSE_YOSHI_VALLEY: - case COURSE_RAINBOW_ROAD: - player->nearestWaypointId = gCopyNearestWaypointByPlayerId[playerId]; - break; - case COURSE_FRAPPE_SNOWLAND: - waypoint = gNearestWaypointByPlayerId[playerId]; -#ifdef VERSION_EU - if (((waypoint >= 0xF0) && (waypoint < 0x11E)) || - ((gCopyNearestWaypointByPlayerId[playerId] >= 0xF0) && (gCopyNearestWaypointByPlayerId[playerId] < 0x11E))) -#else - if ((waypoint >= 0xF0) && (waypoint < 0x105)) -#endif - { - player->nearestWaypointId = 0xF0U; - } else { - player->nearestWaypointId = gCopyNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - } - break; - case COURSE_ROYAL_RACEWAY: - waypoint = gNearestWaypointByPlayerId[playerId]; - if ((waypoint >= 0x258) && (waypoint < 0x2A4)) { - player->nearestWaypointId = 0x258U; - } else { - player->nearestWaypointId = gCopyNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - } - break; - case COURSE_DK_JUNGLE: - waypoint = gNearestWaypointByPlayerId[playerId]; - if ((waypoint >= 0xB9) && (waypoint < 0x119)) { - player->nearestWaypointId = 0xB9U; - } else { - player->nearestWaypointId = gNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - } - break; - case COURSE_BLOCK_FORT: - case COURSE_SKYSCRAPER: - case COURSE_DOUBLE_DECK: - case COURSE_BIG_DONUT: - player->nearestWaypointId = 0U; - break; - default: - player->nearestWaypointId = gNearestWaypointByPlayerId[playerId]; - if (player->nearestWaypointId < 0) { - player->nearestWaypointId = gWaypointCountByPathIndex[0] + player->nearestWaypointId; - } - break; - } -} - -void func_80090178(Player *player, s8 playerId, Vec3f arg2, Vec3f arg3) { - u16 test; - TrackWaypoint *temp_v1; - f32 spF8[4] = { 0.0f, 0.0f, -700.0f, 700.0f }; - f32 spE8[4] = { 700.0f, -700.0f, 0.0f, 0.0f }; - f32 spD8[4] = { 0.0f, 0.0f, -650.0f, 650.0f }; - f32 spC8[4] = { 650.0f, -650.0f, 0.0f, 0.0f }; - f32 spB8[4] = { 0.0f, 0.0f, -400.0f, 400.0f }; - f32 spA8[4] = { 400.0f, -400.0f, 0.0f, 0.0f }; - f32 sp98[4] = { 0.0f, 0.0f, -350.0f, 350.0f }; - f32 sp88[4] = { 350.0f, -350.0f, 0.0f, 0.0f }; - f32 sp78[4] = { 0.0f, 0.0f, -675.0f, 675.0f }; - f32 sp68[4] = { 675.0f, -675.0f, 0.0f, 0.0f }; - f32 sp58[4] = { 0.0f, 0.0f, -550.0f, 550.0f }; - f32 sp48[4] = { 550.0f, -550.0f, 0.0f, 0.0f }; - f32 sp38[4] = { 0.0f, 0.0f, -575.0f, 575.0f }; - f32 sp28[4] = { 575.0f, -575.0f, 0.0f, 0.0f }; - f32 sp18[4] = { 10.0f, -10.0f, -575.0f, 575.0f }; - f32 sp08[4] = { 575.0f, -575.0f, 10.0f, -10.0f }; - - switch (gCurrentCourseId) { - case COURSE_YOSHI_VALLEY: - test = player->nearestWaypointId; - temp_v1 = &D_80164550[gCopyPathIndexByPlayerId[playerId]][test]; - arg2[0] = temp_v1->posX; - arg2[1] = temp_v1->posY; - arg2[2] = temp_v1->posZ; - temp_v1 = &D_80164550[gCopyPathIndexByPlayerId[playerId]][(player->nearestWaypointId + 5) % (gWaypointCountByPathIndex[gCopyPathIndexByPlayerId[playerId]] + 1)]; - arg3[0] = temp_v1->posX; - arg3[1] = temp_v1->posY; - arg3[2] = temp_v1->posZ; - break; - case COURSE_BLOCK_FORT: - arg2[0] = spF8[playerId]; - arg2[1] = 0.0f; - arg2[2] = spE8[playerId]; - arg3[0] = spD8[playerId]; - arg3[1] = 0.0f; - arg3[2] = spC8[playerId]; - break; - case COURSE_SKYSCRAPER: - arg2[0] = spB8[playerId]; - arg2[1] = 480.0f; - arg2[2] = spA8[playerId]; - arg3[0] = sp98[playerId]; - arg3[1] = 480.0f; - arg3[2] = sp88[playerId]; - break; - case COURSE_DOUBLE_DECK: - arg2[0] = sp78[playerId]; - arg2[1] = 0.0f; - arg2[2] = sp68[playerId]; - arg3[0] = sp58[playerId]; - arg3[1] = 0.0f; - arg3[2] = sp48[playerId]; - break; - case COURSE_BIG_DONUT: - arg2[0] = sp38[playerId]; - arg2[1] = 200.0f; - arg2[2] = sp28[playerId]; - arg3[0] = sp18[playerId]; - arg3[1] = 200.0f; - arg3[2] = sp08[playerId]; - break; - default: - test = player->nearestWaypointId; - temp_v1 = &D_80164550[0][test]; - arg2[0] = temp_v1->posX; - arg2[1] = temp_v1->posY; - arg2[2] = temp_v1->posZ; - temp_v1 = &D_80164550[0][(player->nearestWaypointId + 5) % (gWaypointCountByPathIndex[0] + 1)]; - arg3[0] = temp_v1->posX; - arg3[1] = temp_v1->posY; - arg3[2] = temp_v1->posZ; - break; - } -} - -void func_80090778(Player* player) { - s32 playerIndex = get_player_index_for_player(player); - - player->unk_078 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->unk_0CA |= 8; - player->effects &= ~0x10; - player->unk_222 = 0; - player->unk_08C = 0.0f; - - clean_effect(player, playerIndex); - func_8008F86C(player, playerIndex); - - player->unk_DB4.unk0 = 0; - player->unk_0C2 = 0; - player->unk_DB4.unk8 = 0.0f; - if ((player->effects & LIGHTNING_EFFECT) == LIGHTNING_EFFECT) { - if ((player->effects & 0x20000) == 0x20000) { - player->effects &= ~0x20000; - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->rotation[1] = player->unk_0AE; - } - remove_lightning_effect(player, playerIndex); - } - player->effects &= ~0x20; -} - -void func_80090868(Player* player) { - s32 playerIndex; - - player->unk_078 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->unk_08C = 0.0f; - playerIndex = get_player_index_for_player(player); - - if ((player->unk_0CA & 2) != 2) { - player->unk_D98 = 1; - player->unk_D9C = 0.0f; - player->unk_DA0 = 0.5f; - func_8008FF08(player, playerIndex); - player->unk_222 = 0; - player->unk_0CA |= 2; - player->unk_0C8 = 0; - if ((player->unk_0DE & 1) == 1) { - if ((gCurrentCourseId == COURSE_BOWSER_CASTLE) || (gCurrentCourseId == COURSE_BIG_DONUT)) { - player->unk_0CA |= 0x1000; - } else { - player->unk_0CA |= 0x2000; - } - - if ((gCurrentCourseId == COURSE_SHERBET_LAND) || (gCurrentCourseId == COURSE_SKYSCRAPER) || (gCurrentCourseId == COURSE_RAINBOW_ROAD)) { - player->unk_0CA &= ~0x3000; - } - } - } -} - -void func_80090970(Player *player, s8 playerId, s8 arg2) { - UNUSED s32 stackPadding0; - UNUSED s32 stackPadding1; - Vec3f sp44; - Vec3f sp38; - TrackWaypoint *waypoint; - UNUSED s32 stackPadding2; - UNUSED s32 stackPadding3; - - player->unk_0C2 = 0x000C; - player->unk_078 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->unk_08C = 0.0f; - clean_effect(player, playerId); - switch (player->unk_222) { - case 0: - if ((player->unk_0CA & 1) == 1) { - if ((player->unk_0C8 < 0x3C) || ((player->unk_0CA & 2) != 2)) { - player->unk_0C8++; - if (player->unk_0C8 >= 0x3C) { - player->unk_0C8 = 0x003C; - } - } else { - move_f32_towards(&player->pos[1], D_801652A0[playerId] + 100.0f, 0.012f); - move_s16_towards(&player->unk_0CC[arg2], 0, 0.2f); - if ((D_801652A0[playerId] + 40.0f) <= player->pos[1]) { - player->unk_222 = 1; - player->unk_0CA |= 4; - player->unk_0C6 = 0x00FF; - } - } - } else if ((player->unk_0CA & 2) == 2) { - move_f32_towards(&player->pos[1], player->unk_074 + 100.0f, 0.025f); - move_s16_towards(&player->unk_0CC[arg2], 0, 0.2f); - if ((player->unk_074 + 40.0f) <= player->pos[1]) { - player->unk_222 = 1; - player->unk_0CA |= 4; - player->unk_0C6 = 0x00FF; - } - } - if ((player->effects & BOO_EFFECT) == BOO_EFFECT) { - func_8008FB30(player, playerId); - } - break; - case 1: - if (((player->type & PLAYER_HUMAN) == 0x4000) && ((player->type & PLAYER_CPU) == 0)) { - func_8009E088(playerId, 0xA); - } - if ((player->unk_0CA & 1) == 1) { - move_f32_towards(&player->pos[1], D_801652A0[playerId] + 40.0f, 0.02f); - player->unk_0C6 -= 8; - if (player->unk_0C6 < 9) { - player->unk_0C6 = 0; - player->unk_222 = 2; - player->unk_0CA &= ~0x0001; - } - } else { - move_f32_towards(&player->pos[1], player->copy_rotation_y + 40.0f, 0.02f); - player->unk_0C6 -= 8; - if (player->unk_0C6 < 9) { - player->unk_0C6 = 0; - player->unk_222 = 2; - } - } - player->unk_0CA &= ~0x2000; - break; - case 2: - func_80090178(player, playerId, sp44, sp38); - // Fakematch found by Verti, who knows what's going on here - player->rotation[1] = (u16) -get_angle_between_points(sp44, sp38) & 0xFFFF; - player->pos[0] = sp44[0]; - player->pos[1] = sp44[1] + 40.0f; - player->pos[2] = sp44[2]; - player->unk_222 = 3; - break; - case 3: - D_80165330[playerId] = 0; - if (((player->type & PLAYER_HUMAN) == PLAYER_HUMAN) && ((player->type & PLAYER_CPU) == 0)) { - func_8009E020(playerId, 0x14); - } - func_80090178(player, playerId, sp44, sp38); - player->pos[0] = sp44[0]; - player->pos[1] = sp44[1] + 40.0f; - player->pos[2] = sp44[2]; - player->pos[2] = player->pos[2] + coss((playerId * 0x1C70) - player->rotation[1]) * -5.0f; - player->pos[0] = player->pos[0] + sins((playerId * 0x1C70) - player->rotation[1]) * -5.0f; - player->unk_0C6 += 8; - if (player->unk_0C6 >= 0xF0) { - player->unk_0C6 = 0x00FF; - player->unk_222 = 4; - player->unk_0CA &= ~0x0004; - player->unk_0C8 = 0; - } - break; - case 4: - if ((player->unk_0C8 == 0x0096) || (player->unk_0C8 == 0x00C8) || (player->unk_0C8 == 0x00FA)) { - player->pos[2] = player->pos[2] + coss(-player->rotation[1]) * -10.0f; - player->pos[0] = player->pos[0] + sins(-player->rotation[1]) * -10.0f; - } - if (player->unk_0C8 == 0x00FC) { - waypoint = D_80164550[0]; - player->pos[0] = waypoint->posX; - player->pos[1] = waypoint->posY; - player->pos[2] = waypoint->posZ; - } - move_f32_towards(&player->pos[1], (player->unk_074 + player->boundingBoxSize) - 2.0f, 0.04f); - player->unk_0C8++; - if (((player->effects & 8) != 8) || (player->effects & 0x8000)) { - player->unk_0CA &= ~0x1000; - if (player->unk_0C8 >= 0x5B) { - if (player->type & PLAYER_HUMAN) { - func_800C9018(playerId, SOUND_ARG_LOAD(0x01, 0x00, 0xFA, 0x28)); - } - if (gModeSelection == BATTLE) { - func_8006B8B4(player, playerId); - } - player->unk_0CA &= ~0x0002; - player->unk_0DE &= ~0x0004; - if ((player->unk_0CA & 0x80) != 0x80) { - player->unk_0CA &= ~0x0008; - if ((player->topSpeed * 0.9) <= player->currentSpeed) { - func_8008F104(player, playerId); - } - } - } - } - break; - } - player->unk_DA0 += 8.0f; - if (player->unk_DA0 >= 180.0f) { - player->unk_DA0 = 180.0f; - } - if (player->unk_D98 == 1) { - player->unk_D9C += player->unk_DA0; - if (player->unk_D9C >= 1820.0f) { - player->unk_DA0 = 0.0f; - player->unk_D98 *= -1; - } - } - if (player->unk_D98 == -1) { - player->unk_D9C -= player->unk_DA0; - if (player->unk_D9C <= -1820.0f) { - player->unk_DA0 = 0.0f; - player->unk_D98 *= -1; - } - } -} - -s32 func_800910E4(Player *player) { - s32 phi_v0 = 0; - if ((((((player->unk_0CA & 2) == 2) || ((player->unk_0CA & 8) == 8)) || ((player->type & PLAYER_UNKNOWN_0x40) != 0)) || ((player->type & PLAYER_CINEMATIC_MODE) != 0)) || ((player->type & PLAYER_EXISTS) == 0)) { - return 1; - } - - switch (player->currentItemCopy) { - case ITEM_MUSHROOM: - case ITEM_DOUBLE_MUSHROOM: - case ITEM_TRIPLE_MUSHROOM: - case ITEM_SUPER_MUSHROOM: - if ((player->effects & 8) != 0) { - return 1; - } - phi_v0 = 0x5F934EC4; - goto func_800910E4_label; - case ITEM_STAR: - phi_v0 = 0xDF934EC4; - case ITEM_BOO: - phi_v0 = phi_v0 | 0xDF934EC4; -func_800910E4_label: - default: - if ((player->effects & phi_v0) != 0) { - return 1; - } - return 0; - } -} - -void func_800911B4(Player* player, s8 arg1) { - s32 temp_v0; - - player->unk_0AE = player->rotation[1]; - player->unk_044 |= 0x1800; - player->unk_044 &= ~0x0400; - player->unk_044 |= 0x2000; - player->kartHopJerk = 0.002f; - player->kartHopAcceleration = 0.0f; - player->kartHopVelocity = 2.6f; - player->unk_0B2 = 2; - player->unk_0C0 = 0; - player->unk_07C = 0; - player->unk_078 = 0; - D_8018D920[arg1] = 0; - - player->unk_258[31].unk_012 = 0; - player->unk_258[31].unk_01E = 0; - player->unk_258[31].unk_01C = 0; - player->unk_258[30].unk_012 = 0; - player->unk_258[30].unk_01E = 0; - player->unk_258[30].unk_01C = 0; - - temp_v0 = 2; do { - player->unk_258[31 + temp_v0].unk_01C = 0; - player->unk_258[31 + temp_v0].unk_01E = 0; - player->unk_258[31 + temp_v0].unk_012 = 0; - player->unk_258[32 + temp_v0].unk_01C = 0; - player->unk_258[32 + temp_v0].unk_01E = 0; - player->unk_258[32 + temp_v0].unk_012 = 0; - player->unk_258[33 + temp_v0].unk_01C = 0; - player->unk_258[33 + temp_v0].unk_01E = 0; - player->unk_258[33 + temp_v0].unk_012 = 0; - - temp_v0 += 4; - player->unk_258[26 + temp_v0].unk_01C = 0; - player->unk_258[26 + temp_v0].unk_01E = 0; - player->unk_258[26 + temp_v0].unk_012 = 0; - } while (temp_v0 < 10); -} - -void func_80091298(Player *player, s8 arg1) { - s16 var_v1; - UNUSED s32 stackPadding1; - Vec3f spC = { 27.167f, 25.167f, 23.167f }; - - player->unk_044 |= 0x2000; - if (player->unk_0B2 == 0) { - var_v1 = 0; - } else { - player->rotation[1] -= 0xE38; - D_8018D920[arg1] -= 0xE38; - var_v1 = (u16)D_8018D920[arg1] / 3640; - } - if (((var_v1 == 9) && (player->unk_0B2 == 1)) || ((var_v1 == 0) && (player->unk_0B2 == 2)) || (player->unk_0B2 == 0)) { - player->unk_0B2--; - if (player->unk_0B2 <= 0) { - player->unk_0B2 = 0; - } - if (player->unk_0B2 == 0) { - if ((player->pos[1] - (player->boundingBoxSize + 1.0f)) <= spC[arg1]) { - player->pos[1] = (f32) ((f64) (spC[arg1] + player->boundingBoxSize) + 1.08); - player->unk_DB4.unk18 = 0; - player->unk_0A8 = 0; - player->unk_07C = 0; - player->unk_0C0 = 0; - player->unk_DB4.unkC = 3.0f; - player->unk_044 &= ~0x800; - player->kartGravity = gKartGravityTable[player->characterId]; - player->unk_0D4[0] = 0; - player->type |= PLAYER_START_SEQUENCE; - player->unk_094 = 0.0f; - player->unk_08C = 0.0f; - player->currentSpeed = 0.0f; - if (arg1 == 0) { - D_801658BC = 1; - } - } - } - } -} - -void func_80091440(s8 arg0) { - if ((gPlayers[arg0].unk_044 & 0x800) == 0) { - gPlayers[arg0].unk_044 |= 0x2400; - gPlayers[arg0].type &= ~0x2000; - } -} diff --git a/tools/doxygen_syms.md b/tools/doxygen_syms.md index f340e8eb8..27775c5f7 100644 --- a/tools/doxygen_syms.md +++ b/tools/doxygen_syms.md @@ -2580,10 +2580,10 @@ Variable Name | Memory Address [rspF3DBootStart](@ref rspF3DBootStart) | 0x800D8F70 [rspF3DBootEnd](@ref rspF3DBootEnd) | 0x800D9040 [gspF3DEXTextStart](@ref gspF3DEXTextStart) | 0x800D9040 -[gspF3DLXTextStart](@ref gspF3DLXTextStart) | 0x800DA420 [gspF3DEXTextEnd](@ref gspF3DEXTextEnd) | 0x800DA420 -[rspAspMainStart](@ref rspAspMainStart) | 0x800DB830 +[gspF3DLXTextStart](@ref gspF3DLXTextStart) | 0x800DA420 [gspF3DLXTextEnd](@ref gspF3DLXTextEnd) | 0x800DB830 +[rspAspMainStart](@ref rspAspMainStart) | 0x800DB830 [rspAspMainEnd](@ref rspAspMainEnd) | 0x800DC4A0 [gVblankHandler1](@ref gVblankHandler1) | 0x800DC4A0 [gVblankHandler2](@ref gVblankHandler2) | 0x800DC4A4 @@ -3746,8 +3746,8 @@ Variable Name | Memory Address [gspF3DEXDataStart](@ref gspF3DEXDataStart) | 0x800F3D00 [gspF3DEXDataEnd](@ref gspF3DEXDataEnd) | 0x800F4500 [gspF3DLXDataStart](@ref gspF3DLXDataStart) | 0x800F4500 -[gspF3DLXDataEnd](@ref gspF3DLXDataEnd) | 0x800F4D00 [rspAspMainDataStart](@ref rspAspMainDataStart) | 0x800F4D00 +[gspF3DLXDataEnd](@ref gspF3DLXDataEnd) | 0x800F4D00 [rspAspMainDataEnd](@ref rspAspMainDataEnd) | 0x800F5000 [sSawtoothWaves](@ref sSawtoothWaves) | 0x800F5000 [sTriangleWaves](@ref sTriangleWaves) | 0x800F5200 @@ -18733,66 +18733,66 @@ Variable Name | Memory Address [gCosineTable](@ref gCosineTable) | 0x802BB370 [gArctanTable](@ref gArctanTable) | 0x802BF370 [gTextureMarioFace00](@ref gTextureMarioFace00) | 0x0A000000 -[gTextureMarioFace01](@ref gTextureMarioFace01) | 0x0A000CD4 [gTextureMarioFace00_end](@ref gTextureMarioFace00_end) | 0x0A000CD4 -[gTextureMarioFace02](@ref gTextureMarioFace02) | 0x0A001994 +[gTextureMarioFace01](@ref gTextureMarioFace01) | 0x0A000CD4 [gTextureMarioFace01_end](@ref gTextureMarioFace01_end) | 0x0A001994 -[gTextureMarioFace03](@ref gTextureMarioFace03) | 0x0A002650 +[gTextureMarioFace02](@ref gTextureMarioFace02) | 0x0A001994 [gTextureMarioFace02_end](@ref gTextureMarioFace02_end) | 0x0A002650 -[gTextureMarioFace03_end](@ref gTextureMarioFace03_end) | 0x0A0032BC +[gTextureMarioFace03](@ref gTextureMarioFace03) | 0x0A002650 [gTextureMarioFace04](@ref gTextureMarioFace04) | 0x0A0032BC -[gTextureMarioFace05](@ref gTextureMarioFace05) | 0x0A003F08 +[gTextureMarioFace03_end](@ref gTextureMarioFace03_end) | 0x0A0032BC [gTextureMarioFace04_end](@ref gTextureMarioFace04_end) | 0x0A003F08 -[gTextureMarioFace06](@ref gTextureMarioFace06) | 0x0A004B48 +[gTextureMarioFace05](@ref gTextureMarioFace05) | 0x0A003F08 [gTextureMarioFace05_end](@ref gTextureMarioFace05_end) | 0x0A004B48 +[gTextureMarioFace06](@ref gTextureMarioFace06) | 0x0A004B48 [gTextureMarioFace07](@ref gTextureMarioFace07) | 0x0A00585C [gTextureMarioFace06_end](@ref gTextureMarioFace06_end) | 0x0A00585C [gTextureMarioFace08](@ref gTextureMarioFace08) | 0x0A006568 [gTextureMarioFace07_end](@ref gTextureMarioFace07_end) | 0x0A006568 -[gTextureMarioFace08_end](@ref gTextureMarioFace08_end) | 0x0A00726C [gTextureMarioFace09](@ref gTextureMarioFace09) | 0x0A00726C -[gTextureMarioFace09_end](@ref gTextureMarioFace09_end) | 0x0A007F4C +[gTextureMarioFace08_end](@ref gTextureMarioFace08_end) | 0x0A00726C [gTextureMarioFace10](@ref gTextureMarioFace10) | 0x0A007F4C +[gTextureMarioFace09_end](@ref gTextureMarioFace09_end) | 0x0A007F4C [gTextureMarioFace11](@ref gTextureMarioFace11) | 0x0A008C48 [gTextureMarioFace10_end](@ref gTextureMarioFace10_end) | 0x0A008C48 -[gTextureMarioFace11_end](@ref gTextureMarioFace11_end) | 0x0A009944 [gTextureMarioFace12](@ref gTextureMarioFace12) | 0x0A009944 +[gTextureMarioFace11_end](@ref gTextureMarioFace11_end) | 0x0A009944 [gTextureMarioFace13](@ref gTextureMarioFace13) | 0x0A00A688 [gTextureMarioFace12_end](@ref gTextureMarioFace12_end) | 0x0A00A688 -[gTextureMarioFace14](@ref gTextureMarioFace14) | 0x0A00B3DC [gTextureMarioFace13_end](@ref gTextureMarioFace13_end) | 0x0A00B3DC -[gTextureMarioFace15](@ref gTextureMarioFace15) | 0x0A00C180 +[gTextureMarioFace14](@ref gTextureMarioFace14) | 0x0A00B3DC [gTextureMarioFace14_end](@ref gTextureMarioFace14_end) | 0x0A00C180 -[gTextureMarioFace16](@ref gTextureMarioFace16) | 0x0A00CF20 +[gTextureMarioFace15](@ref gTextureMarioFace15) | 0x0A00C180 [gTextureMarioFace15_end](@ref gTextureMarioFace15_end) | 0x0A00CF20 +[gTextureMarioFace16](@ref gTextureMarioFace16) | 0x0A00CF20 [gTextureLuigiFace00](@ref gTextureLuigiFace00) | 0x0A00DA64 [gTextureMarioFace16_end](@ref gTextureMarioFace16_end) | 0x0A00DA64 -[gTextureLuigiFace00_end](@ref gTextureLuigiFace00_end) | 0x0A00E680 [gTextureLuigiFace01](@ref gTextureLuigiFace01) | 0x0A00E680 +[gTextureLuigiFace00_end](@ref gTextureLuigiFace00_end) | 0x0A00E680 [gTextureLuigiFace01_end](@ref gTextureLuigiFace01_end) | 0x0A00F2A0 [gTextureLuigiFace02](@ref gTextureLuigiFace02) | 0x0A00F2A0 -[gTextureLuigiFace03](@ref gTextureLuigiFace03) | 0x0A00FEC0 [gTextureLuigiFace02_end](@ref gTextureLuigiFace02_end) | 0x0A00FEC0 +[gTextureLuigiFace03](@ref gTextureLuigiFace03) | 0x0A00FEC0 [gTextureLuigiFace03_end](@ref gTextureLuigiFace03_end) | 0x0A010AA8 [gTextureLuigiFace04](@ref gTextureLuigiFace04) | 0x0A010AA8 -[gTextureLuigiFace05](@ref gTextureLuigiFace05) | 0x0A011690 [gTextureLuigiFace04_end](@ref gTextureLuigiFace04_end) | 0x0A011690 +[gTextureLuigiFace05](@ref gTextureLuigiFace05) | 0x0A011690 [gTextureLuigiFace06](@ref gTextureLuigiFace06) | 0x0A01225C [gTextureLuigiFace05_end](@ref gTextureLuigiFace05_end) | 0x0A01225C [gTextureLuigiFace06_end](@ref gTextureLuigiFace06_end) | 0x0A012E84 [gTextureLuigiFace07](@ref gTextureLuigiFace07) | 0x0A012E84 -[gTextureLuigiFace07_end](@ref gTextureLuigiFace07_end) | 0x0A013AB8 [gTextureLuigiFace08](@ref gTextureLuigiFace08) | 0x0A013AB8 -[gTextureLuigiFace08_end](@ref gTextureLuigiFace08_end) | 0x0A014744 +[gTextureLuigiFace07_end](@ref gTextureLuigiFace07_end) | 0x0A013AB8 [gTextureLuigiFace09](@ref gTextureLuigiFace09) | 0x0A014744 -[gTextureLuigiFace09_end](@ref gTextureLuigiFace09_end) | 0x0A0153C4 +[gTextureLuigiFace08_end](@ref gTextureLuigiFace08_end) | 0x0A014744 [gTextureLuigiFace10](@ref gTextureLuigiFace10) | 0x0A0153C4 -[gTextureLuigiFace11](@ref gTextureLuigiFace11) | 0x0A016054 +[gTextureLuigiFace09_end](@ref gTextureLuigiFace09_end) | 0x0A0153C4 [gTextureLuigiFace10_end](@ref gTextureLuigiFace10_end) | 0x0A016054 +[gTextureLuigiFace11](@ref gTextureLuigiFace11) | 0x0A016054 [gTextureLuigiFace11_end](@ref gTextureLuigiFace11_end) | 0x0A016D14 [gTextureLuigiFace12](@ref gTextureLuigiFace12) | 0x0A016D14 -[gTextureLuigiFace13](@ref gTextureLuigiFace13) | 0x0A017A44 [gTextureLuigiFace12_end](@ref gTextureLuigiFace12_end) | 0x0A017A44 +[gTextureLuigiFace13](@ref gTextureLuigiFace13) | 0x0A017A44 [gTextureLuigiFace14](@ref gTextureLuigiFace14) | 0x0A018770 [gTextureLuigiFace13_end](@ref gTextureLuigiFace13_end) | 0x0A018770 [gTextureLuigiFace15](@ref gTextureLuigiFace15) | 0x0A0194B8 @@ -18801,68 +18801,68 @@ Variable Name | Memory Address [gTextureLuigiFace16](@ref gTextureLuigiFace16) | 0x0A01A20C [gTextureLuigiFace16_end](@ref gTextureLuigiFace16_end) | 0x0A01AC44 [gTexturePeachFace00](@ref gTexturePeachFace00) | 0x0A01AC44 -[gTexturePeachFace01](@ref gTexturePeachFace01) | 0x0A01BAFC [gTexturePeachFace00_end](@ref gTexturePeachFace00_end) | 0x0A01BAFC +[gTexturePeachFace01](@ref gTexturePeachFace01) | 0x0A01BAFC [gTexturePeachFace01_end](@ref gTexturePeachFace01_end) | 0x0A01C9A8 [gTexturePeachFace02](@ref gTexturePeachFace02) | 0x0A01C9A8 -[gTexturePeachFace03](@ref gTexturePeachFace03) | 0x0A01D864 [gTexturePeachFace02_end](@ref gTexturePeachFace02_end) | 0x0A01D864 +[gTexturePeachFace03](@ref gTexturePeachFace03) | 0x0A01D864 [gTexturePeachFace04](@ref gTexturePeachFace04) | 0x0A01E71C [gTexturePeachFace03_end](@ref gTexturePeachFace03_end) | 0x0A01E71C -[gTexturePeachFace04_end](@ref gTexturePeachFace04_end) | 0x0A01F5A4 [gTexturePeachFace05](@ref gTexturePeachFace05) | 0x0A01F5A4 -[gTexturePeachFace05_end](@ref gTexturePeachFace05_end) | 0x0A020444 +[gTexturePeachFace04_end](@ref gTexturePeachFace04_end) | 0x0A01F5A4 [gTexturePeachFace06](@ref gTexturePeachFace06) | 0x0A020444 -[gTexturePeachFace06_end](@ref gTexturePeachFace06_end) | 0x0A02130C +[gTexturePeachFace05_end](@ref gTexturePeachFace05_end) | 0x0A020444 [gTexturePeachFace07](@ref gTexturePeachFace07) | 0x0A02130C -[gTexturePeachFace08](@ref gTexturePeachFace08) | 0x0A0221FC +[gTexturePeachFace06_end](@ref gTexturePeachFace06_end) | 0x0A02130C [gTexturePeachFace07_end](@ref gTexturePeachFace07_end) | 0x0A0221FC +[gTexturePeachFace08](@ref gTexturePeachFace08) | 0x0A0221FC [gTexturePeachFace08_end](@ref gTexturePeachFace08_end) | 0x0A02310C [gTexturePeachFace09](@ref gTexturePeachFace09) | 0x0A02310C [gTexturePeachFace09_end](@ref gTexturePeachFace09_end) | 0x0A0240C0 [gTexturePeachFace10](@ref gTexturePeachFace10) | 0x0A0240C0 -[gTexturePeachFace11](@ref gTexturePeachFace11) | 0x0A0250A4 [gTexturePeachFace10_end](@ref gTexturePeachFace10_end) | 0x0A0250A4 +[gTexturePeachFace11](@ref gTexturePeachFace11) | 0x0A0250A4 [gTexturePeachFace11_end](@ref gTexturePeachFace11_end) | 0x0A0260F0 [gTexturePeachFace12](@ref gTexturePeachFace12) | 0x0A0260F0 [gTexturePeachFace13](@ref gTexturePeachFace13) | 0x0A027128 [gTexturePeachFace12_end](@ref gTexturePeachFace12_end) | 0x0A027128 -[gTexturePeachFace13_end](@ref gTexturePeachFace13_end) | 0x0A02810C [gTexturePeachFace14](@ref gTexturePeachFace14) | 0x0A02810C -[gTexturePeachFace14_end](@ref gTexturePeachFace14_end) | 0x0A0290A0 +[gTexturePeachFace13_end](@ref gTexturePeachFace13_end) | 0x0A02810C [gTexturePeachFace15](@ref gTexturePeachFace15) | 0x0A0290A0 -[gTexturePeachFace16](@ref gTexturePeachFace16) | 0x0A02A028 +[gTexturePeachFace14_end](@ref gTexturePeachFace14_end) | 0x0A0290A0 [gTexturePeachFace15_end](@ref gTexturePeachFace15_end) | 0x0A02A028 +[gTexturePeachFace16](@ref gTexturePeachFace16) | 0x0A02A028 [gTexturePeachFace16_end](@ref gTexturePeachFace16_end) | 0x0A02AED0 [gTextureToadFace00](@ref gTextureToadFace00) | 0x0A02AED0 -[gTextureToadFace01](@ref gTextureToadFace01) | 0x0A02B88C [gTextureToadFace00_end](@ref gTextureToadFace00_end) | 0x0A02B88C +[gTextureToadFace01](@ref gTextureToadFace01) | 0x0A02B88C [gTextureToadFace02](@ref gTextureToadFace02) | 0x0A02C240 [gTextureToadFace01_end](@ref gTextureToadFace01_end) | 0x0A02C240 [gTextureToadFace02_end](@ref gTextureToadFace02_end) | 0x0A02CBFC [gTextureToadFace03](@ref gTextureToadFace03) | 0x0A02CBFC -[gTextureToadFace04](@ref gTextureToadFace04) | 0x0A02D5B4 [gTextureToadFace03_end](@ref gTextureToadFace03_end) | 0x0A02D5B4 -[gTextureToadFace04_end](@ref gTextureToadFace04_end) | 0x0A02DF70 +[gTextureToadFace04](@ref gTextureToadFace04) | 0x0A02D5B4 [gTextureToadFace05](@ref gTextureToadFace05) | 0x0A02DF70 +[gTextureToadFace04_end](@ref gTextureToadFace04_end) | 0x0A02DF70 [gTextureToadFace06](@ref gTextureToadFace06) | 0x0A02E910 [gTextureToadFace05_end](@ref gTextureToadFace05_end) | 0x0A02E910 [gTextureToadFace06_end](@ref gTextureToadFace06_end) | 0x0A02F2A8 [gTextureToadFace07](@ref gTextureToadFace07) | 0x0A02F2A8 [gTextureToadFace07_end](@ref gTextureToadFace07_end) | 0x0A02FC74 [gTextureToadFace08](@ref gTextureToadFace08) | 0x0A02FC74 -[gTextureToadFace08_end](@ref gTextureToadFace08_end) | 0x0A030628 [gTextureToadFace09](@ref gTextureToadFace09) | 0x0A030628 -[gTextureToadFace09_end](@ref gTextureToadFace09_end) | 0x0A031010 +[gTextureToadFace08_end](@ref gTextureToadFace08_end) | 0x0A030628 [gTextureToadFace10](@ref gTextureToadFace10) | 0x0A031010 -[gTextureToadFace10_end](@ref gTextureToadFace10_end) | 0x0A031A24 +[gTextureToadFace09_end](@ref gTextureToadFace09_end) | 0x0A031010 [gTextureToadFace11](@ref gTextureToadFace11) | 0x0A031A24 +[gTextureToadFace10_end](@ref gTextureToadFace10_end) | 0x0A031A24 [gTextureToadFace12](@ref gTextureToadFace12) | 0x0A03247C [gTextureToadFace11_end](@ref gTextureToadFace11_end) | 0x0A03247C [gTextureToadFace13](@ref gTextureToadFace13) | 0x0A032EDC [gTextureToadFace12_end](@ref gTextureToadFace12_end) | 0x0A032EDC -[gTextureToadFace13_end](@ref gTextureToadFace13_end) | 0x0A03395C [gTextureToadFace14](@ref gTextureToadFace14) | 0x0A03395C +[gTextureToadFace13_end](@ref gTextureToadFace13_end) | 0x0A03395C [gTextureToadFace15](@ref gTextureToadFace15) | 0x0A0343D0 [gTextureToadFace14_end](@ref gTextureToadFace14_end) | 0x0A0343D0 [gTextureToadFace15_end](@ref gTextureToadFace15_end) | 0x0A034E30 @@ -18871,94 +18871,94 @@ Variable Name | Memory Address [gTextureToadFace16_end](@ref gTextureToadFace16_end) | 0x0A035794 [gTextureYoshiFace00_end](@ref gTextureYoshiFace00_end) | 0x0A036280 [gTextureYoshiFace01](@ref gTextureYoshiFace01) | 0x0A036280 -[gTextureYoshiFace02](@ref gTextureYoshiFace02) | 0x0A036D64 [gTextureYoshiFace01_end](@ref gTextureYoshiFace01_end) | 0x0A036D64 -[gTextureYoshiFace03](@ref gTextureYoshiFace03) | 0x0A037844 +[gTextureYoshiFace02](@ref gTextureYoshiFace02) | 0x0A036D64 [gTextureYoshiFace02_end](@ref gTextureYoshiFace02_end) | 0x0A037844 +[gTextureYoshiFace03](@ref gTextureYoshiFace03) | 0x0A037844 [gTextureYoshiFace04](@ref gTextureYoshiFace04) | 0x0A0382F8 [gTextureYoshiFace03_end](@ref gTextureYoshiFace03_end) | 0x0A0382F8 [gTextureYoshiFace04_end](@ref gTextureYoshiFace04_end) | 0x0A038D68 [gTextureYoshiFace05](@ref gTextureYoshiFace05) | 0x0A038D68 [gTextureYoshiFace05_end](@ref gTextureYoshiFace05_end) | 0x0A0397B0 [gTextureYoshiFace06](@ref gTextureYoshiFace06) | 0x0A0397B0 -[gTextureYoshiFace06_end](@ref gTextureYoshiFace06_end) | 0x0A03A2D4 [gTextureYoshiFace07](@ref gTextureYoshiFace07) | 0x0A03A2D4 -[gTextureYoshiFace07_end](@ref gTextureYoshiFace07_end) | 0x0A03AD00 +[gTextureYoshiFace06_end](@ref gTextureYoshiFace06_end) | 0x0A03A2D4 [gTextureYoshiFace08](@ref gTextureYoshiFace08) | 0x0A03AD00 -[gTextureYoshiFace09](@ref gTextureYoshiFace09) | 0x0A03B6BC +[gTextureYoshiFace07_end](@ref gTextureYoshiFace07_end) | 0x0A03AD00 [gTextureYoshiFace08_end](@ref gTextureYoshiFace08_end) | 0x0A03B6BC -[gTextureYoshiFace10](@ref gTextureYoshiFace10) | 0x0A03C068 +[gTextureYoshiFace09](@ref gTextureYoshiFace09) | 0x0A03B6BC [gTextureYoshiFace09_end](@ref gTextureYoshiFace09_end) | 0x0A03C068 -[gTextureYoshiFace11](@ref gTextureYoshiFace11) | 0x0A03CA28 +[gTextureYoshiFace10](@ref gTextureYoshiFace10) | 0x0A03C068 [gTextureYoshiFace10_end](@ref gTextureYoshiFace10_end) | 0x0A03CA28 -[gTextureYoshiFace11_end](@ref gTextureYoshiFace11_end) | 0x0A03D438 +[gTextureYoshiFace11](@ref gTextureYoshiFace11) | 0x0A03CA28 [gTextureYoshiFace12](@ref gTextureYoshiFace12) | 0x0A03D438 -[gTextureYoshiFace12_end](@ref gTextureYoshiFace12_end) | 0x0A03DE94 +[gTextureYoshiFace11_end](@ref gTextureYoshiFace11_end) | 0x0A03D438 [gTextureYoshiFace13](@ref gTextureYoshiFace13) | 0x0A03DE94 +[gTextureYoshiFace12_end](@ref gTextureYoshiFace12_end) | 0x0A03DE94 [gTextureYoshiFace14](@ref gTextureYoshiFace14) | 0x0A03E974 [gTextureYoshiFace13_end](@ref gTextureYoshiFace13_end) | 0x0A03E974 -[gTextureYoshiFace15](@ref gTextureYoshiFace15) | 0x0A03F47C [gTextureYoshiFace14_end](@ref gTextureYoshiFace14_end) | 0x0A03F47C +[gTextureYoshiFace15](@ref gTextureYoshiFace15) | 0x0A03F47C [gTextureYoshiFace15_end](@ref gTextureYoshiFace15_end) | 0x0A03FF94 [gTextureYoshiFace16](@ref gTextureYoshiFace16) | 0x0A03FF94 [gTextureYoshiFace16_end](@ref gTextureYoshiFace16_end) | 0x0A040ABC [gTextureDkFace00](@ref gTextureDkFace00) | 0x0A040ABC -[gTextureDkFace01](@ref gTextureDkFace01) | 0x0A0418A8 [gTextureDkFace00_end](@ref gTextureDkFace00_end) | 0x0A0418A8 -[gTextureDkFace01_end](@ref gTextureDkFace01_end) | 0x0A0426B0 +[gTextureDkFace01](@ref gTextureDkFace01) | 0x0A0418A8 [gTextureDkFace02](@ref gTextureDkFace02) | 0x0A0426B0 -[gTextureDkFace02_end](@ref gTextureDkFace02_end) | 0x0A043490 +[gTextureDkFace01_end](@ref gTextureDkFace01_end) | 0x0A0426B0 [gTextureDkFace03](@ref gTextureDkFace03) | 0x0A043490 -[gTextureDkFace03_end](@ref gTextureDkFace03_end) | 0x0A044240 +[gTextureDkFace02_end](@ref gTextureDkFace02_end) | 0x0A043490 [gTextureDkFace04](@ref gTextureDkFace04) | 0x0A044240 +[gTextureDkFace03_end](@ref gTextureDkFace03_end) | 0x0A044240 [gTextureDkFace05](@ref gTextureDkFace05) | 0x0A044FE8 [gTextureDkFace04_end](@ref gTextureDkFace04_end) | 0x0A044FE8 -[gTextureDkFace06](@ref gTextureDkFace06) | 0x0A045DCC [gTextureDkFace05_end](@ref gTextureDkFace05_end) | 0x0A045DCC +[gTextureDkFace06](@ref gTextureDkFace06) | 0x0A045DCC [gTextureDkFace06_end](@ref gTextureDkFace06_end) | 0x0A046BF8 [gTextureDkFace07](@ref gTextureDkFace07) | 0x0A046BF8 -[gTextureDkFace08](@ref gTextureDkFace08) | 0x0A047A8C [gTextureDkFace07_end](@ref gTextureDkFace07_end) | 0x0A047A8C -[gTextureDkFace09](@ref gTextureDkFace09) | 0x0A048968 +[gTextureDkFace08](@ref gTextureDkFace08) | 0x0A047A8C [gTextureDkFace08_end](@ref gTextureDkFace08_end) | 0x0A048968 +[gTextureDkFace09](@ref gTextureDkFace09) | 0x0A048968 [gTextureDkFace10](@ref gTextureDkFace10) | 0x0A0498B0 [gTextureDkFace09_end](@ref gTextureDkFace09_end) | 0x0A0498B0 [gTextureDkFace10_end](@ref gTextureDkFace10_end) | 0x0A04A7E8 [gTextureDkFace11](@ref gTextureDkFace11) | 0x0A04A7E8 -[gTextureDkFace12](@ref gTextureDkFace12) | 0x0A04B76C [gTextureDkFace11_end](@ref gTextureDkFace11_end) | 0x0A04B76C +[gTextureDkFace12](@ref gTextureDkFace12) | 0x0A04B76C [gTextureDkFace13](@ref gTextureDkFace13) | 0x0A04C770 [gTextureDkFace12_end](@ref gTextureDkFace12_end) | 0x0A04C770 [gTextureDkFace13_end](@ref gTextureDkFace13_end) | 0x0A04D730 [gTextureDkFace14](@ref gTextureDkFace14) | 0x0A04D730 -[gTextureDkFace15](@ref gTextureDkFace15) | 0x0A04E67C [gTextureDkFace14_end](@ref gTextureDkFace14_end) | 0x0A04E67C -[gTextureDkFace15_end](@ref gTextureDkFace15_end) | 0x0A04F57C +[gTextureDkFace15](@ref gTextureDkFace15) | 0x0A04E67C [gTextureDkFace16](@ref gTextureDkFace16) | 0x0A04F57C -[gTextureWarioFace00](@ref gTextureWarioFace00) | 0x0A0504D0 +[gTextureDkFace15_end](@ref gTextureDkFace15_end) | 0x0A04F57C [gTextureDkFace16_end](@ref gTextureDkFace16_end) | 0x0A0504D0 -[gTextureWarioFace00_end](@ref gTextureWarioFace00_end) | 0x0A051630 +[gTextureWarioFace00](@ref gTextureWarioFace00) | 0x0A0504D0 [gTextureWarioFace01](@ref gTextureWarioFace01) | 0x0A051630 +[gTextureWarioFace00_end](@ref gTextureWarioFace00_end) | 0x0A051630 [gTextureWarioFace01_end](@ref gTextureWarioFace01_end) | 0x0A052774 [gTextureWarioFace02](@ref gTextureWarioFace02) | 0x0A052774 [gTextureWarioFace03](@ref gTextureWarioFace03) | 0x0A0538C8 [gTextureWarioFace02_end](@ref gTextureWarioFace02_end) | 0x0A0538C8 -[gTextureWarioFace03_end](@ref gTextureWarioFace03_end) | 0x0A054A30 [gTextureWarioFace04](@ref gTextureWarioFace04) | 0x0A054A30 +[gTextureWarioFace03_end](@ref gTextureWarioFace03_end) | 0x0A054A30 [gTextureWarioFace05](@ref gTextureWarioFace05) | 0x0A055B84 [gTextureWarioFace04_end](@ref gTextureWarioFace04_end) | 0x0A055B84 [gTextureWarioFace05_end](@ref gTextureWarioFace05_end) | 0x0A056CE0 [gTextureWarioFace06](@ref gTextureWarioFace06) | 0x0A056CE0 -[gTextureWarioFace07](@ref gTextureWarioFace07) | 0x0A057E54 [gTextureWarioFace06_end](@ref gTextureWarioFace06_end) | 0x0A057E54 -[gTextureWarioFace08](@ref gTextureWarioFace08) | 0x0A05902C +[gTextureWarioFace07](@ref gTextureWarioFace07) | 0x0A057E54 [gTextureWarioFace07_end](@ref gTextureWarioFace07_end) | 0x0A05902C +[gTextureWarioFace08](@ref gTextureWarioFace08) | 0x0A05902C [gTextureWarioFace09](@ref gTextureWarioFace09) | 0x0A05A254 [gTextureWarioFace08_end](@ref gTextureWarioFace08_end) | 0x0A05A254 [gTextureWarioFace09_end](@ref gTextureWarioFace09_end) | 0x0A05B4C0 [gTextureWarioFace10](@ref gTextureWarioFace10) | 0x0A05B4C0 -[gTextureWarioFace10_end](@ref gTextureWarioFace10_end) | 0x0A05C7A0 [gTextureWarioFace11](@ref gTextureWarioFace11) | 0x0A05C7A0 +[gTextureWarioFace10_end](@ref gTextureWarioFace10_end) | 0x0A05C7A0 [gTextureWarioFace11_end](@ref gTextureWarioFace11_end) | 0x0A05DAA8 [gTextureWarioFace12](@ref gTextureWarioFace12) | 0x0A05DAA8 [gTextureWarioFace12_end](@ref gTextureWarioFace12_end) | 0x0A05ED8C @@ -18967,34 +18967,34 @@ Variable Name | Memory Address [gTextureWarioFace14](@ref gTextureWarioFace14) | 0x0A0600B0 [gTextureWarioFace14_end](@ref gTextureWarioFace14_end) | 0x0A06139C [gTextureWarioFace15](@ref gTextureWarioFace15) | 0x0A06139C -[gTextureWarioFace15_end](@ref gTextureWarioFace15_end) | 0x0A062668 [gTextureWarioFace16](@ref gTextureWarioFace16) | 0x0A062668 +[gTextureWarioFace15_end](@ref gTextureWarioFace15_end) | 0x0A062668 [gTextureWarioFace16_end](@ref gTextureWarioFace16_end) | 0x0A0637E0 [gTextureBowserFace00](@ref gTextureBowserFace00) | 0x0A0637E0 [gTextureBowserFace00_end](@ref gTextureBowserFace00_end) | 0x0A064AC8 [gTextureBowserFace01](@ref gTextureBowserFace01) | 0x0A064AC8 -[gTextureBowserFace02](@ref gTextureBowserFace02) | 0x0A065D7C [gTextureBowserFace01_end](@ref gTextureBowserFace01_end) | 0x0A065D7C -[gTextureBowserFace03](@ref gTextureBowserFace03) | 0x0A067044 +[gTextureBowserFace02](@ref gTextureBowserFace02) | 0x0A065D7C [gTextureBowserFace02_end](@ref gTextureBowserFace02_end) | 0x0A067044 +[gTextureBowserFace03](@ref gTextureBowserFace03) | 0x0A067044 [gTextureBowserFace03_end](@ref gTextureBowserFace03_end) | 0x0A068310 [gTextureBowserFace04](@ref gTextureBowserFace04) | 0x0A068310 -[gTextureBowserFace04_end](@ref gTextureBowserFace04_end) | 0x0A0695B4 [gTextureBowserFace05](@ref gTextureBowserFace05) | 0x0A0695B4 +[gTextureBowserFace04_end](@ref gTextureBowserFace04_end) | 0x0A0695B4 [gTextureBowserFace06](@ref gTextureBowserFace06) | 0x0A06A840 [gTextureBowserFace05_end](@ref gTextureBowserFace05_end) | 0x0A06A840 -[gTextureBowserFace06_end](@ref gTextureBowserFace06_end) | 0x0A06BB1C [gTextureBowserFace07](@ref gTextureBowserFace07) | 0x0A06BB1C +[gTextureBowserFace06_end](@ref gTextureBowserFace06_end) | 0x0A06BB1C [gTextureBowserFace08](@ref gTextureBowserFace08) | 0x0A06CE04 [gTextureBowserFace07_end](@ref gTextureBowserFace07_end) | 0x0A06CE04 -[gTextureBowserFace09](@ref gTextureBowserFace09) | 0x0A06E0F4 [gTextureBowserFace08_end](@ref gTextureBowserFace08_end) | 0x0A06E0F4 +[gTextureBowserFace09](@ref gTextureBowserFace09) | 0x0A06E0F4 [gTextureBowserFace09_end](@ref gTextureBowserFace09_end) | 0x0A06F410 [gTextureBowserFace10](@ref gTextureBowserFace10) | 0x0A06F410 [gTextureBowserFace10_end](@ref gTextureBowserFace10_end) | 0x0A0706DC [gTextureBowserFace11](@ref gTextureBowserFace11) | 0x0A0706DC -[gTextureBowserFace11_end](@ref gTextureBowserFace11_end) | 0x0A071A18 [gTextureBowserFace12](@ref gTextureBowserFace12) | 0x0A071A18 +[gTextureBowserFace11_end](@ref gTextureBowserFace11_end) | 0x0A071A18 [gTextureBowserFace13](@ref gTextureBowserFace13) | 0x0A072DBC [gTextureBowserFace12_end](@ref gTextureBowserFace12_end) | 0x0A072DBC [gTextureBowserFace14](@ref gTextureBowserFace14) | 0x0A074138 @@ -19029,12 +19029,12 @@ Variable Name | Memory Address [gTextureTrophySilver](@ref gTextureTrophySilver) | 0x0A0AEFEC [gTextureTrophySilver_end](@ref gTextureTrophySilver_end) | 0x0A0AF614 [gTextureTrophyBronze](@ref gTextureTrophyBronze) | 0x0A0AF614 -[gTextureCupGold](@ref gTextureCupGold) | 0x0A0AFC00 [gTextureTrophyBronze_end](@ref gTextureTrophyBronze_end) | 0x0A0AFC00 +[gTextureCupGold](@ref gTextureCupGold) | 0x0A0AFC00 [gTextureCupSilver](@ref gTextureCupSilver) | 0x0A0B058C [gTextureCupGold_end](@ref gTextureCupGold_end) | 0x0A0B058C -[gTextureCupBronze](@ref gTextureCupBronze) | 0x0A0B0F10 [gTextureCupSilver_end](@ref gTextureCupSilver_end) | 0x0A0B0F10 +[gTextureCupBronze](@ref gTextureCupBronze) | 0x0A0B0F10 [gTextureCupBronze_end](@ref gTextureCupBronze_end) | 0x0A0B17B4 [gTexturePushStartButton](@ref gTexturePushStartButton) | 0x0A0B17B4 [gTextureCopyright1996](@ref gTextureCopyright1996) | 0x0A0B2B94 @@ -19046,16 +19046,16 @@ Variable Name | Memory Address [gTexture7E56E4](@ref gTexture7E56E4) | 0x0A0BBCB4 [gTexture7E56E4_end](@ref gTexture7E56E4_end) | 0x0A0BCE1F [gTextureSmallFont0](@ref gTextureSmallFont0) | 0x0A0BCE20 -[gTextureSmallFont1](@ref gTextureSmallFont1) | 0x0A0BCEB0 [gTextureSmallFont0_end](@ref gTextureSmallFont0_end) | 0x0A0BCEB0 +[gTextureSmallFont1](@ref gTextureSmallFont1) | 0x0A0BCEB0 [gTextureSmallFont2](@ref gTextureSmallFont2) | 0x0A0BCF08 [gTextureSmallFont1_end](@ref gTextureSmallFont1_end) | 0x0A0BCF08 -[gTextureSmallFont2_end](@ref gTextureSmallFont2_end) | 0x0A0BCFA0 [gTextureSmallFont3](@ref gTextureSmallFont3) | 0x0A0BCFA0 +[gTextureSmallFont2_end](@ref gTextureSmallFont2_end) | 0x0A0BCFA0 [gTextureSmallFont3_end](@ref gTextureSmallFont3_end) | 0x0A0BD034 [gTextureSmallFont4](@ref gTextureSmallFont4) | 0x0A0BD034 -[gTextureSmallFont5](@ref gTextureSmallFont5) | 0x0A0BD0BC [gTextureSmallFont4_end](@ref gTextureSmallFont4_end) | 0x0A0BD0BC +[gTextureSmallFont5](@ref gTextureSmallFont5) | 0x0A0BD0BC [gTextureSmallFont6](@ref gTextureSmallFont6) | 0x0A0BD154 [gTextureSmallFont5_end](@ref gTextureSmallFont5_end) | 0x0A0BD154 [gTextureSmallFont6_end](@ref gTextureSmallFont6_end) | 0x0A0BD1F0 @@ -19064,52 +19064,52 @@ Variable Name | Memory Address [gTextureSmallFont7_end](@ref gTextureSmallFont7_end) | 0x0A0BD260 [gTextureSmallFont9](@ref gTextureSmallFont9) | 0x0A0BD2F0 [gTextureSmallFont8_end](@ref gTextureSmallFont8_end) | 0x0A0BD2F0 -[gTextureSmallFont9_end](@ref gTextureSmallFont9_end) | 0x0A0BD390 [gTextureN64ControllerPakDataSelect](@ref gTextureN64ControllerPakDataSelect) | 0x0A0BD390 -[gTextureN64ControllerPakDataSelect_end](@ref gTextureN64ControllerPakDataSelect_end) | 0x0A0BE4B8 +[gTextureSmallFont9_end](@ref gTextureSmallFont9_end) | 0x0A0BD390 [gTextureEraseDataRecordConfirmation](@ref gTextureEraseDataRecordConfirmation) | 0x0A0BE4B8 +[gTextureN64ControllerPakDataSelect_end](@ref gTextureN64ControllerPakDataSelect_end) | 0x0A0BE4B8 [gTextureEraseDataRecordConfirmation_end](@ref gTextureEraseDataRecordConfirmation_end) | 0x0A0BF4AC [gTextureRecordNotErased](@ref gTextureRecordNotErased) | 0x0A0BF4AC -[gTextureRecordNotErased_end](@ref gTextureRecordNotErased_end) | 0x0A0BFD7C [gTexturePlaceN64ControllerPakIntoController1](@ref gTexturePlaceN64ControllerPakIntoController1) | 0x0A0BFD7C -[gTexturePlaceN64ControllerPakIntoController1_end](@ref gTexturePlaceN64ControllerPakIntoController1_end) | 0x0A0C09C8 +[gTextureRecordNotErased_end](@ref gTextureRecordNotErased_end) | 0x0A0BFD7C [gTexturePleaseReinsertOriginalN64ControllerPak](@ref gTexturePleaseReinsertOriginalN64ControllerPak) | 0x0A0C09C8 -[gTextureErasingSelectedRecord](@ref gTextureErasingSelectedRecord) | 0x0A0C16A0 +[gTexturePlaceN64ControllerPakIntoController1_end](@ref gTexturePlaceN64ControllerPakIntoController1_end) | 0x0A0C09C8 [gTexturePleaseReinsertOriginalN64ControllerPak_end](@ref gTexturePleaseReinsertOriginalN64ControllerPak_end) | 0x0A0C16A0 +[gTextureErasingSelectedRecord](@ref gTextureErasingSelectedRecord) | 0x0A0C16A0 [gTextureSelectRecord](@ref gTextureSelectRecord) | 0x0A0C22A4 [gTextureErasingSelectedRecord_end](@ref gTextureErasingSelectedRecord_end) | 0x0A0C22A4 [gTextureTextEnd](@ref gTextureTextEnd) | 0x0A0C261C [gTextureSelectRecord_end](@ref gTextureSelectRecord_end) | 0x0A0C261C -[gTextureTableOfContents](@ref gTextureTableOfContents) | 0x0A0C274C [gTextureTextEnd_end](@ref gTextureTextEnd_end) | 0x0A0C274C -[gTextureTextHash](@ref gTextureTextHash) | 0x0A0C2B78 +[gTextureTableOfContents](@ref gTextureTableOfContents) | 0x0A0C274C [gTextureTableOfContents_end](@ref gTextureTableOfContents_end) | 0x0A0C2B78 +[gTextureTextHash](@ref gTextureTextHash) | 0x0A0C2B78 [gTextureTextHash_end](@ref gTextureTextHash_end) | 0x0A0C2BF8 [gTextureTextGameData](@ref gTextureTextGameData) | 0x0A0C2BF8 -[gTextureTextGameData_end](@ref gTextureTextGameData_end) | 0x0A0C2EBC [gTextureTextPages](@ref gTextureTextPages) | 0x0A0C2EBC -[gTextureTextPages_end](@ref gTextureTextPages_end) | 0x0A0C307C +[gTextureTextGameData_end](@ref gTextureTextGameData_end) | 0x0A0C2EBC [gTextureTextPagesFree](@ref gTextureTextPagesFree) | 0x0A0C307C +[gTextureTextPages_end](@ref gTextureTextPages_end) | 0x0A0C307C [gTextureTextPagesFree_end](@ref gTextureTextPagesFree_end) | 0x0A0C3340 [gTextureTextErase](@ref gTextureTextErase) | 0x0A0C3340 -[gTextureTextQuit](@ref gTextureTextQuit) | 0x0A0C34E0 [gTextureTextErase_end](@ref gTextureTextErase_end) | 0x0A0C34E0 +[gTextureTextQuit](@ref gTextureTextQuit) | 0x0A0C34E0 [gTextureTextQuit_end](@ref gTextureTextQuit_end) | 0x0A0C3628 [gTexture7ED058](@ref gTexture7ED058) | 0x0A0C3628 [gTexture7ED290](@ref gTexture7ED290) | 0x0A0C3860 [gTexture7ED058_end](@ref gTexture7ED058_end) | 0x0A0C3860 [gTexture7ED50C](@ref gTexture7ED50C) | 0x0A0C3ADC [gTexture7ED290_end](@ref gTexture7ED290_end) | 0x0A0C3ADC -[gTexture7ED50C_end](@ref gTexture7ED50C_end) | 0x0A0C3C74 [gTexture7ED6A4](@ref gTexture7ED6A4) | 0x0A0C3C74 -[gTexture7ED6A4_end](@ref gTexture7ED6A4_end) | 0x0A0C4004 +[gTexture7ED50C_end](@ref gTexture7ED50C_end) | 0x0A0C3C74 [gTextureTinyFont0](@ref gTextureTinyFont0) | 0x0A0C4004 +[gTexture7ED6A4_end](@ref gTexture7ED6A4_end) | 0x0A0C4004 [gTextureTinyFont0_end](@ref gTextureTinyFont0_end) | 0x0A0C4078 [gTextureTinyFont1](@ref gTextureTinyFont1) | 0x0A0C4078 [gTextureTinyFont1_end](@ref gTextureTinyFont1_end) | 0x0A0C40C0 [gTextureTinyFont2](@ref gTextureTinyFont2) | 0x0A0C40C0 -[gTextureTinyFont2_end](@ref gTextureTinyFont2_end) | 0x0A0C4134 [gTextureTinyFont3](@ref gTextureTinyFont3) | 0x0A0C4134 +[gTextureTinyFont2_end](@ref gTextureTinyFont2_end) | 0x0A0C4134 [gTextureTinyFont3_end](@ref gTextureTinyFont3_end) | 0x0A0C41A4 [gTextureTinyFont4](@ref gTextureTinyFont4) | 0x0A0C41A4 [gTextureTinyFont5](@ref gTextureTinyFont5) | 0x0A0C4200 @@ -19120,70 +19120,70 @@ Variable Name | Memory Address [gTextureTinyFont7](@ref gTextureTinyFont7) | 0x0A0C42E8 [gTextureTinyFont8](@ref gTextureTinyFont8) | 0x0A0C4348 [gTextureTinyFont7_end](@ref gTextureTinyFont7_end) | 0x0A0C4348 -[gTextureTinyFont8_end](@ref gTextureTinyFont8_end) | 0x0A0C43C0 [gTextureTinyFont9](@ref gTextureTinyFont9) | 0x0A0C43C0 -[gTextureTinyFontA](@ref gTextureTinyFontA) | 0x0A0C4434 +[gTextureTinyFont8_end](@ref gTextureTinyFont8_end) | 0x0A0C43C0 [gTextureTinyFont9_end](@ref gTextureTinyFont9_end) | 0x0A0C4434 +[gTextureTinyFontA](@ref gTextureTinyFontA) | 0x0A0C4434 [gTextureTinyFontA_end](@ref gTextureTinyFontA_end) | 0x0A0C44A0 [gTextureTinyFontB](@ref gTextureTinyFontB) | 0x0A0C44A0 [gTextureTinyFontC](@ref gTextureTinyFontC) | 0x0A0C451C [gTextureTinyFontB_end](@ref gTextureTinyFontB_end) | 0x0A0C451C [gTextureTinyFontD](@ref gTextureTinyFontD) | 0x0A0C4590 [gTextureTinyFontC_end](@ref gTextureTinyFontC_end) | 0x0A0C4590 -[gTextureTinyFontD_end](@ref gTextureTinyFontD_end) | 0x0A0C4600 [gTextureTinyFontE](@ref gTextureTinyFontE) | 0x0A0C4600 -[gTextureTinyFontE_end](@ref gTextureTinyFontE_end) | 0x0A0C4674 +[gTextureTinyFontD_end](@ref gTextureTinyFontD_end) | 0x0A0C4600 [gTextureTinyFontF](@ref gTextureTinyFontF) | 0x0A0C4674 -[gTextureTinyFontF_end](@ref gTextureTinyFontF_end) | 0x0A0C46D8 +[gTextureTinyFontE_end](@ref gTextureTinyFontE_end) | 0x0A0C4674 [gTextureTinyFontG](@ref gTextureTinyFontG) | 0x0A0C46D8 -[gTextureTinyFontG_end](@ref gTextureTinyFontG_end) | 0x0A0C474C +[gTextureTinyFontF_end](@ref gTextureTinyFontF_end) | 0x0A0C46D8 [gTextureTinyFontH](@ref gTextureTinyFontH) | 0x0A0C474C -[gTextureTinyFontI](@ref gTextureTinyFontI) | 0x0A0C47C4 +[gTextureTinyFontG_end](@ref gTextureTinyFontG_end) | 0x0A0C474C [gTextureTinyFontH_end](@ref gTextureTinyFontH_end) | 0x0A0C47C4 -[gTextureTinyFontJ](@ref gTextureTinyFontJ) | 0x0A0C480C +[gTextureTinyFontI](@ref gTextureTinyFontI) | 0x0A0C47C4 [gTextureTinyFontI_end](@ref gTextureTinyFontI_end) | 0x0A0C480C +[gTextureTinyFontJ](@ref gTextureTinyFontJ) | 0x0A0C480C [gTextureTinyFontK](@ref gTextureTinyFontK) | 0x0A0C4860 [gTextureTinyFontJ_end](@ref gTextureTinyFontJ_end) | 0x0A0C4860 -[gTextureTinyFontK_end](@ref gTextureTinyFontK_end) | 0x0A0C48D0 [gTextureTinyFontL](@ref gTextureTinyFontL) | 0x0A0C48D0 -[gTextureTinyFontL_end](@ref gTextureTinyFontL_end) | 0x0A0C491C +[gTextureTinyFontK_end](@ref gTextureTinyFontK_end) | 0x0A0C48D0 [gTextureTinyFontM](@ref gTextureTinyFontM) | 0x0A0C491C -[gTextureTinyFontM_end](@ref gTextureTinyFontM_end) | 0x0A0C4998 +[gTextureTinyFontL_end](@ref gTextureTinyFontL_end) | 0x0A0C491C [gTextureTinyFontN](@ref gTextureTinyFontN) | 0x0A0C4998 -[gTextureTinyFontO](@ref gTextureTinyFontO) | 0x0A0C4A14 +[gTextureTinyFontM_end](@ref gTextureTinyFontM_end) | 0x0A0C4998 [gTextureTinyFontN_end](@ref gTextureTinyFontN_end) | 0x0A0C4A14 -[gTextureTinyFontO_end](@ref gTextureTinyFontO_end) | 0x0A0C4A8C +[gTextureTinyFontO](@ref gTextureTinyFontO) | 0x0A0C4A14 [gTextureTinyFontP](@ref gTextureTinyFontP) | 0x0A0C4A8C -[gTextureTinyFontQ](@ref gTextureTinyFontQ) | 0x0A0C4AF8 +[gTextureTinyFontO_end](@ref gTextureTinyFontO_end) | 0x0A0C4A8C [gTextureTinyFontP_end](@ref gTextureTinyFontP_end) | 0x0A0C4AF8 +[gTextureTinyFontQ](@ref gTextureTinyFontQ) | 0x0A0C4AF8 [gTextureTinyFontQ_end](@ref gTextureTinyFontQ_end) | 0x0A0C4B70 [gTextureTinyFontR](@ref gTextureTinyFontR) | 0x0A0C4B70 [gTextureTinyFontR_end](@ref gTextureTinyFontR_end) | 0x0A0C4BE4 [gTextureTinyFontS](@ref gTextureTinyFontS) | 0x0A0C4BE4 -[gTextureTinyFontT](@ref gTextureTinyFontT) | 0x0A0C4C54 [gTextureTinyFontS_end](@ref gTextureTinyFontS_end) | 0x0A0C4C54 +[gTextureTinyFontT](@ref gTextureTinyFontT) | 0x0A0C4C54 [gTextureTinyFontU](@ref gTextureTinyFontU) | 0x0A0C4CA8 [gTextureTinyFontT_end](@ref gTextureTinyFontT_end) | 0x0A0C4CA8 -[gTextureTinyFontU_end](@ref gTextureTinyFontU_end) | 0x0A0C4D0C [gTextureTinyFontV](@ref gTextureTinyFontV) | 0x0A0C4D0C +[gTextureTinyFontU_end](@ref gTextureTinyFontU_end) | 0x0A0C4D0C [gTextureTinyFontW](@ref gTextureTinyFontW) | 0x0A0C4D6C [gTextureTinyFontV_end](@ref gTextureTinyFontV_end) | 0x0A0C4D6C -[gTextureTinyFontW_end](@ref gTextureTinyFontW_end) | 0x0A0C4DE8 [gTextureTinyFontX](@ref gTextureTinyFontX) | 0x0A0C4DE8 +[gTextureTinyFontW_end](@ref gTextureTinyFontW_end) | 0x0A0C4DE8 [gTextureTinyFontX_end](@ref gTextureTinyFontX_end) | 0x0A0C4E54 [gTextureTinyFontY](@ref gTextureTinyFontY) | 0x0A0C4E54 [gTextureTinyFontY_end](@ref gTextureTinyFontY_end) | 0x0A0C4EA4 [gTextureTinyFontZ](@ref gTextureTinyFontZ) | 0x0A0C4EA4 -[gTextureTinyFontZ_end](@ref gTextureTinyFontZ_end) | 0x0A0C4F0C [gTextureTinyFontExclamationMark](@ref gTextureTinyFontExclamationMark) | 0x0A0C4F0C +[gTextureTinyFontZ_end](@ref gTextureTinyFontZ_end) | 0x0A0C4F0C [gTextureTinyFontDoubleQuote](@ref gTextureTinyFontDoubleQuote) | 0x0A0C4F54 [gTextureTinyFontExclamationMark_end](@ref gTextureTinyFontExclamationMark_end) | 0x0A0C4F54 -[gTextureTinyFontHash](@ref gTextureTinyFontHash) | 0x0A0C4F8C [gTextureTinyFontDoubleQuote_end](@ref gTextureTinyFontDoubleQuote_end) | 0x0A0C4F8C +[gTextureTinyFontHash](@ref gTextureTinyFontHash) | 0x0A0C4F8C [gTextureTinyFontHash_end](@ref gTextureTinyFontHash_end) | 0x0A0C4FFC [gTextureTinyFontSingleQuote](@ref gTextureTinyFontSingleQuote) | 0x0A0C4FFC -[gTextureTinyFontSingleQuote_end](@ref gTextureTinyFontSingleQuote_end) | 0x0A0C502C [gTextureTinyFontAsterisk](@ref gTextureTinyFontAsterisk) | 0x0A0C502C +[gTextureTinyFontSingleQuote_end](@ref gTextureTinyFontSingleQuote_end) | 0x0A0C502C [gTextureTinyFontPlus](@ref gTextureTinyFontPlus) | 0x0A0C5098 [gTextureTinyFontAsterisk_end](@ref gTextureTinyFontAsterisk_end) | 0x0A0C5098 [gTextureTinyFontPlus_end](@ref gTextureTinyFontPlus_end) | 0x0A0C50E8 @@ -19194,60 +19194,60 @@ Variable Name | Memory Address [gTextureTinyFontMinus_end](@ref gTextureTinyFontMinus_end) | 0x0A0C514C [gTextureTinyFontForwardSlash](@ref gTextureTinyFontForwardSlash) | 0x0A0C517C [gTextureTinyFontComma_end](@ref gTextureTinyFontComma_end) | 0x0A0C517C -[gTextureTinyFontColon](@ref gTextureTinyFontColon) | 0x0A0C51CC [gTextureTinyFontForwardSlash_end](@ref gTextureTinyFontForwardSlash_end) | 0x0A0C51CC -[gTexture7EEC34](@ref gTexture7EEC34) | 0x0A0C5204 +[gTextureTinyFontColon](@ref gTextureTinyFontColon) | 0x0A0C51CC [gTextureTinyFontColon_end](@ref gTextureTinyFontColon_end) | 0x0A0C5204 -[gTexture7EEC34_end](@ref gTexture7EEC34_end) | 0x0A0C5254 +[gTexture7EEC34](@ref gTexture7EEC34) | 0x0A0C5204 [gTextureTinyFontQuestion](@ref gTextureTinyFontQuestion) | 0x0A0C5254 -[gTextureTinyFontQuestion_end](@ref gTextureTinyFontQuestion_end) | 0x0A0C52B4 +[gTexture7EEC34_end](@ref gTexture7EEC34_end) | 0x0A0C5254 [gTexture7EECE4](@ref gTexture7EECE4) | 0x0A0C52B4 +[gTextureTinyFontQuestion_end](@ref gTextureTinyFontQuestion_end) | 0x0A0C52B4 [gTexture7EECE4_end](@ref gTexture7EECE4_end) | 0x0A0C5344 [gTexture7EED74](@ref gTexture7EED74) | 0x0A0C5344 -[gTexture7EEDB0](@ref gTexture7EEDB0) | 0x0A0C5380 [gTexture7EED74_end](@ref gTexture7EED74_end) | 0x0A0C5380 -[gTexture7EEDE8](@ref gTexture7EEDE8) | 0x0A0C53B8 +[gTexture7EEDB0](@ref gTexture7EEDB0) | 0x0A0C5380 [gTexture7EEDB0_end](@ref gTexture7EEDB0_end) | 0x0A0C53B8 -[gTexture7EEDE8_end](@ref gTexture7EEDE8_end) | 0x0A0C53F0 +[gTexture7EEDE8](@ref gTexture7EEDE8) | 0x0A0C53B8 [gTexture7EEE20](@ref gTexture7EEE20) | 0x0A0C53F0 +[gTexture7EEDE8_end](@ref gTexture7EEDE8_end) | 0x0A0C53F0 [gTexture7EEE7C](@ref gTexture7EEE7C) | 0x0A0C544C [gTexture7EEE20_end](@ref gTexture7EEE20_end) | 0x0A0C544C -[gTexture7EEED0](@ref gTexture7EEED0) | 0x0A0C54A0 [gTexture7EEE7C_end](@ref gTexture7EEE7C_end) | 0x0A0C54A0 -[gTexture7EEF3C](@ref gTexture7EEF3C) | 0x0A0C550C +[gTexture7EEED0](@ref gTexture7EEED0) | 0x0A0C54A0 [gTexture7EEED0_end](@ref gTexture7EEED0_end) | 0x0A0C550C -[gTexture7EEF3C_end](@ref gTexture7EEF3C_end) | 0x0A0C5560 +[gTexture7EEF3C](@ref gTexture7EEF3C) | 0x0A0C550C [gTexture7EEF90](@ref gTexture7EEF90) | 0x0A0C5560 -[gTexture7EEF90_end](@ref gTexture7EEF90_end) | 0x0A0C55C4 +[gTexture7EEF3C_end](@ref gTexture7EEF3C_end) | 0x0A0C5560 [gTexture7EEFF4](@ref gTexture7EEFF4) | 0x0A0C55C4 -[gTexture7EF058](@ref gTexture7EF058) | 0x0A0C5628 +[gTexture7EEF90_end](@ref gTexture7EEF90_end) | 0x0A0C55C4 [gTexture7EEFF4_end](@ref gTexture7EEFF4_end) | 0x0A0C5628 -[gTexture7EF058_end](@ref gTexture7EF058_end) | 0x0A0C5684 +[gTexture7EF058](@ref gTexture7EF058) | 0x0A0C5628 [gTexture7EF0B4](@ref gTexture7EF0B4) | 0x0A0C5684 -[gTexture7EF0B4_end](@ref gTexture7EF0B4_end) | 0x0A0C56E0 +[gTexture7EF058_end](@ref gTexture7EF058_end) | 0x0A0C5684 [gTexture7EF110](@ref gTexture7EF110) | 0x0A0C56E0 +[gTexture7EF0B4_end](@ref gTexture7EF0B4_end) | 0x0A0C56E0 [gTexture7EF17C](@ref gTexture7EF17C) | 0x0A0C574C [gTexture7EF110_end](@ref gTexture7EF110_end) | 0x0A0C574C -[gTexture7EF17C_end](@ref gTexture7EF17C_end) | 0x0A0C57C0 [gTexture7EF1F0](@ref gTexture7EF1F0) | 0x0A0C57C0 -[gTexture7EF1F0_end](@ref gTexture7EF1F0_end) | 0x0A0C5820 +[gTexture7EF17C_end](@ref gTexture7EF17C_end) | 0x0A0C57C0 [gTexture7EF250](@ref gTexture7EF250) | 0x0A0C5820 -[gTexture7EF2B8](@ref gTexture7EF2B8) | 0x0A0C5888 +[gTexture7EF1F0_end](@ref gTexture7EF1F0_end) | 0x0A0C5820 [gTexture7EF250_end](@ref gTexture7EF250_end) | 0x0A0C5888 +[gTexture7EF2B8](@ref gTexture7EF2B8) | 0x0A0C5888 [gTexture7EF314](@ref gTexture7EF314) | 0x0A0C58E4 [gTexture7EF2B8_end](@ref gTexture7EF2B8_end) | 0x0A0C58E4 [gTexture7EF388](@ref gTexture7EF388) | 0x0A0C5958 [gTexture7EF314_end](@ref gTexture7EF314_end) | 0x0A0C5958 [gTexture7EF388_end](@ref gTexture7EF388_end) | 0x0A0C59C8 [gTexture7EF3F8](@ref gTexture7EF3F8) | 0x0A0C59C8 -[gTexture7EF470](@ref gTexture7EF470) | 0x0A0C5A40 [gTexture7EF3F8_end](@ref gTexture7EF3F8_end) | 0x0A0C5A40 -[gTexture7EF470_end](@ref gTexture7EF470_end) | 0x0A0C5AB4 +[gTexture7EF470](@ref gTexture7EF470) | 0x0A0C5A40 [gTexture7EF4E4](@ref gTexture7EF4E4) | 0x0A0C5AB4 +[gTexture7EF470_end](@ref gTexture7EF470_end) | 0x0A0C5AB4 [gTexture7EF554](@ref gTexture7EF554) | 0x0A0C5B24 [gTexture7EF4E4_end](@ref gTexture7EF4E4_end) | 0x0A0C5B24 -[gTexture7EF5C0](@ref gTexture7EF5C0) | 0x0A0C5B90 [gTexture7EF554_end](@ref gTexture7EF554_end) | 0x0A0C5B90 +[gTexture7EF5C0](@ref gTexture7EF5C0) | 0x0A0C5B90 [gTexture7EF620](@ref gTexture7EF620) | 0x0A0C5BF0 [gTexture7EF5C0_end](@ref gTexture7EF5C0_end) | 0x0A0C5BF0 [gTexture7EF620_end](@ref gTexture7EF620_end) | 0x0A0C5C64 @@ -19258,20 +19258,20 @@ Variable Name | Memory Address [gTexture7EF77C](@ref gTexture7EF77C) | 0x0A0C5D4C [gTexture7EF7E8](@ref gTexture7EF7E8) | 0x0A0C5DB8 [gTexture7EF77C_end](@ref gTexture7EF77C_end) | 0x0A0C5DB8 -[gTexture7EF85C](@ref gTexture7EF85C) | 0x0A0C5E2C [gTexture7EF7E8_end](@ref gTexture7EF7E8_end) | 0x0A0C5E2C +[gTexture7EF85C](@ref gTexture7EF85C) | 0x0A0C5E2C [gTexture7EF8C8](@ref gTexture7EF8C8) | 0x0A0C5E98 [gTexture7EF85C_end](@ref gTexture7EF85C_end) | 0x0A0C5E98 [gTexture7EF93C](@ref gTexture7EF93C) | 0x0A0C5F0C [gTexture7EF8C8_end](@ref gTexture7EF8C8_end) | 0x0A0C5F0C -[gTexture7EF9B4](@ref gTexture7EF9B4) | 0x0A0C5F84 [gTexture7EF93C_end](@ref gTexture7EF93C_end) | 0x0A0C5F84 -[gTexture7EFA2C](@ref gTexture7EFA2C) | 0x0A0C5FFC +[gTexture7EF9B4](@ref gTexture7EF9B4) | 0x0A0C5F84 [gTexture7EF9B4_end](@ref gTexture7EF9B4_end) | 0x0A0C5FFC +[gTexture7EFA2C](@ref gTexture7EFA2C) | 0x0A0C5FFC [gTexture7EFA2C_end](@ref gTexture7EFA2C_end) | 0x0A0C6078 [gTexture7EFAA8](@ref gTexture7EFAA8) | 0x0A0C6078 -[gTexture7EFAA8_end](@ref gTexture7EFAA8_end) | 0x0A0C60D0 [gTexture7EFB00](@ref gTexture7EFB00) | 0x0A0C60D0 +[gTexture7EFAA8_end](@ref gTexture7EFAA8_end) | 0x0A0C60D0 [gTexture7EFB00_end](@ref gTexture7EFB00_end) | 0x0A0C6134 [gTexture7EFB64](@ref gTexture7EFB64) | 0x0A0C6134 [gTexture7EFB64_end](@ref gTexture7EFB64_end) | 0x0A0C618C @@ -19282,68 +19282,68 @@ Variable Name | Memory Address [gTexture7EFCAC](@ref gTexture7EFCAC) | 0x0A0C627C [gTexture7EFD00](@ref gTexture7EFD00) | 0x0A0C62D0 [gTexture7EFCAC_end](@ref gTexture7EFCAC_end) | 0x0A0C62D0 -[gTexture7EFD60](@ref gTexture7EFD60) | 0x0A0C6330 [gTexture7EFD00_end](@ref gTexture7EFD00_end) | 0x0A0C6330 +[gTexture7EFD60](@ref gTexture7EFD60) | 0x0A0C6330 [gTexture7EFDD4](@ref gTexture7EFDD4) | 0x0A0C63A4 [gTexture7EFD60_end](@ref gTexture7EFD60_end) | 0x0A0C63A4 [gTexture7EFE48](@ref gTexture7EFE48) | 0x0A0C6418 [gTexture7EFDD4_end](@ref gTexture7EFDD4_end) | 0x0A0C6418 [gTexture7EFE48_end](@ref gTexture7EFE48_end) | 0x0A0C6470 [gTexture7EFEA0](@ref gTexture7EFEA0) | 0x0A0C6470 -[gTexture7EFEA0_end](@ref gTexture7EFEA0_end) | 0x0A0C64FC [gTexture7EFF2C](@ref gTexture7EFF2C) | 0x0A0C64FC -[gTexture7EFF2C_end](@ref gTexture7EFF2C_end) | 0x0A0C6560 +[gTexture7EFEA0_end](@ref gTexture7EFEA0_end) | 0x0A0C64FC [gTexture7EFF90](@ref gTexture7EFF90) | 0x0A0C6560 -[gTexture7EFF90_end](@ref gTexture7EFF90_end) | 0x0A0C65D0 +[gTexture7EFF2C_end](@ref gTexture7EFF2C_end) | 0x0A0C6560 [gTexture7F0000](@ref gTexture7F0000) | 0x0A0C65D0 -[gTexture7F006C](@ref gTexture7F006C) | 0x0A0C663C +[gTexture7EFF90_end](@ref gTexture7EFF90_end) | 0x0A0C65D0 [gTexture7F0000_end](@ref gTexture7F0000_end) | 0x0A0C663C +[gTexture7F006C](@ref gTexture7F006C) | 0x0A0C663C [gTexture7F00D8](@ref gTexture7F00D8) | 0x0A0C66A8 [gTexture7F006C_end](@ref gTexture7F006C_end) | 0x0A0C66A8 [gTexture7F00D8_end](@ref gTexture7F00D8_end) | 0x0A0C6728 [gTexture7F0158](@ref gTexture7F0158) | 0x0A0C6728 [gTexture7F01D0](@ref gTexture7F01D0) | 0x0A0C67A0 [gTexture7F0158_end](@ref gTexture7F0158_end) | 0x0A0C67A0 -[gTexture7F01D0_end](@ref gTexture7F01D0_end) | 0x0A0C680C [gTexture7F023C](@ref gTexture7F023C) | 0x0A0C680C -[gTexture7F023C_end](@ref gTexture7F023C_end) | 0x0A0C6884 +[gTexture7F01D0_end](@ref gTexture7F01D0_end) | 0x0A0C680C [gTexture7F02B4](@ref gTexture7F02B4) | 0x0A0C6884 +[gTexture7F023C_end](@ref gTexture7F023C_end) | 0x0A0C6884 [gTexture7F02B4_end](@ref gTexture7F02B4_end) | 0x0A0C68FC [gTexture7F032C](@ref gTexture7F032C) | 0x0A0C68FC -[gTexture7F032C_end](@ref gTexture7F032C_end) | 0x0A0C6960 [gTexture7F0390](@ref gTexture7F0390) | 0x0A0C6960 +[gTexture7F032C_end](@ref gTexture7F032C_end) | 0x0A0C6960 [gTexture7F0404](@ref gTexture7F0404) | 0x0A0C69D4 [gTexture7F0390_end](@ref gTexture7F0390_end) | 0x0A0C69D4 [gTexture7F0470](@ref gTexture7F0470) | 0x0A0C6A40 [gTexture7F0404_end](@ref gTexture7F0404_end) | 0x0A0C6A40 -[gTexture7F0470_end](@ref gTexture7F0470_end) | 0x0A0C6ABC [gTexture7F04EC](@ref gTexture7F04EC) | 0x0A0C6ABC -[gTexture7F04EC_end](@ref gTexture7F04EC_end) | 0x0A0C6B2C +[gTexture7F0470_end](@ref gTexture7F0470_end) | 0x0A0C6ABC [gTexture7F055C](@ref gTexture7F055C) | 0x0A0C6B2C -[gTexture7F05F0](@ref gTexture7F05F0) | 0x0A0C6BC0 +[gTexture7F04EC_end](@ref gTexture7F04EC_end) | 0x0A0C6B2C [gTexture7F055C_end](@ref gTexture7F055C_end) | 0x0A0C6BC0 +[gTexture7F05F0](@ref gTexture7F05F0) | 0x0A0C6BC0 [gTexture7F0670](@ref gTexture7F0670) | 0x0A0C6C40 [gTexture7F05F0_end](@ref gTexture7F05F0_end) | 0x0A0C6C40 -[gTexture7F06EC](@ref gTexture7F06EC) | 0x0A0C6CBC [gTexture7F0670_end](@ref gTexture7F0670_end) | 0x0A0C6CBC +[gTexture7F06EC](@ref gTexture7F06EC) | 0x0A0C6CBC [gTexture7F06EC_end](@ref gTexture7F06EC_end) | 0x0A0C6D38 [gTexture7F0768](@ref gTexture7F0768) | 0x0A0C6D38 -[gTexture7F07E0](@ref gTexture7F07E0) | 0x0A0C6DB0 [gTexture7F0768_end](@ref gTexture7F0768_end) | 0x0A0C6DB0 +[gTexture7F07E0](@ref gTexture7F07E0) | 0x0A0C6DB0 [gTexture7F07E0_end](@ref gTexture7F07E0_end) | 0x0A0C6E28 [gTexture7F0858](@ref gTexture7F0858) | 0x0A0C6E28 -[gTexture7F08D8](@ref gTexture7F08D8) | 0x0A0C6EA8 [gTexture7F0858_end](@ref gTexture7F0858_end) | 0x0A0C6EA8 +[gTexture7F08D8](@ref gTexture7F08D8) | 0x0A0C6EA8 [gTexture7F0948](@ref gTexture7F0948) | 0x0A0C6F18 [gTexture7F08D8_end](@ref gTexture7F08D8_end) | 0x0A0C6F18 -[gTexture7F0948_end](@ref gTexture7F0948_end) | 0x0A0C6FA0 [gTexture7F09D0](@ref gTexture7F09D0) | 0x0A0C6FA0 +[gTexture7F0948_end](@ref gTexture7F0948_end) | 0x0A0C6FA0 [gTexture7F09D0_end](@ref gTexture7F09D0_end) | 0x0A0C700C [gTexture7F0A3C](@ref gTexture7F0A3C) | 0x0A0C700C [gTexture7F0A3C_end](@ref gTexture7F0A3C_end) | 0x0A0C708C [gTexture7F0ABC](@ref gTexture7F0ABC) | 0x0A0C708C -[gTexture7F0B34](@ref gTexture7F0B34) | 0x0A0C7104 [gTexture7F0ABC_end](@ref gTexture7F0ABC_end) | 0x0A0C7104 +[gTexture7F0B34](@ref gTexture7F0B34) | 0x0A0C7104 [gTexture7F0B34_end](@ref gTexture7F0B34_end) | 0x0A0C7180 [gTexture7F0BB0](@ref gTexture7F0BB0) | 0x0A0C7180 [gTexture7F0BB0_end](@ref gTexture7F0BB0_end) | 0x0A0C71F4 @@ -19352,24 +19352,24 @@ Variable Name | Memory Address [gTexture7F0C24_end](@ref gTexture7F0C24_end) | 0x0A0C7264 [gTexture7F0C94_end](@ref gTexture7F0C94_end) | 0x0A0C72DC [gTexture7F0D0C](@ref gTexture7F0D0C) | 0x0A0C72DC -[gTexture7F0D8C](@ref gTexture7F0D8C) | 0x0A0C735C [gTexture7F0D0C_end](@ref gTexture7F0D0C_end) | 0x0A0C735C -[gTexture7F0D8C_end](@ref gTexture7F0D8C_end) | 0x0A0C73BC +[gTexture7F0D8C](@ref gTexture7F0D8C) | 0x0A0C735C [gTexture7F0DEC](@ref gTexture7F0DEC) | 0x0A0C73BC +[gTexture7F0D8C_end](@ref gTexture7F0D8C_end) | 0x0A0C73BC [gTexture7F0E5C](@ref gTexture7F0E5C) | 0x0A0C742C [gTexture7F0DEC_end](@ref gTexture7F0DEC_end) | 0x0A0C742C -[gTexture7F0EE4](@ref gTexture7F0EE4) | 0x0A0C74B4 [gTexture7F0E5C_end](@ref gTexture7F0E5C_end) | 0x0A0C74B4 -[gTexture7F0EE4_end](@ref gTexture7F0EE4_end) | 0x0A0C752C +[gTexture7F0EE4](@ref gTexture7F0EE4) | 0x0A0C74B4 [gTexture7F0F5C](@ref gTexture7F0F5C) | 0x0A0C752C -[gTexture7F0FD8](@ref gTexture7F0FD8) | 0x0A0C75A8 +[gTexture7F0EE4_end](@ref gTexture7F0EE4_end) | 0x0A0C752C [gTexture7F0F5C_end](@ref gTexture7F0F5C_end) | 0x0A0C75A8 +[gTexture7F0FD8](@ref gTexture7F0FD8) | 0x0A0C75A8 [gTexture7F0FD8_end](@ref gTexture7F0FD8_end) | 0x0A0C7608 [gTexture7F1038](@ref gTexture7F1038) | 0x0A0C7608 -[gTexture7F1038_end](@ref gTexture7F1038_end) | 0x0A0C766C [gTexture7F109C](@ref gTexture7F109C) | 0x0A0C766C -[gTexture7F1124](@ref gTexture7F1124) | 0x0A0C76F4 +[gTexture7F1038_end](@ref gTexture7F1038_end) | 0x0A0C766C [gTexture7F109C_end](@ref gTexture7F109C_end) | 0x0A0C76F4 +[gTexture7F1124](@ref gTexture7F1124) | 0x0A0C76F4 [gTexture7F11F4](@ref gTexture7F11F4) | 0x0A0C77C4 [gTexture7F12C4](@ref gTexture7F12C4) | 0x0A0C7894 [gTexture7F1394](@ref gTexture7F1394) | 0x0A0C7964 @@ -19607,54 +19607,54 @@ Variable Name | Memory Address [gTexturePlayerSelect](@ref gTexturePlayerSelect) | 0x0B000000 [gTexturePlayerSelect_end](@ref gTexturePlayerSelect_end) | 0x0B000C00 [gTextureOption](@ref gTextureOption) | 0x0B000C00 -[gTextureOption_end](@ref gTextureOption_end) | 0x0B001500 [gTextureNameDK](@ref gTextureNameDK) | 0x0B001500 -[gTextureNameToad](@ref gTextureNameToad) | 0x0B001700 +[gTextureOption_end](@ref gTextureOption_end) | 0x0B001500 [gTextureNameDK_end](@ref gTextureNameDK_end) | 0x0B001700 +[gTextureNameToad](@ref gTextureNameToad) | 0x0B001700 [gTextureNameToad_end](@ref gTextureNameToad_end) | 0x0B001900 [gTextureNameBowser](@ref gTextureNameBowser) | 0x0B001900 -[gTextureNameLuigi](@ref gTextureNameLuigi) | 0x0B001B00 [gTextureNameBowser_end](@ref gTextureNameBowser_end) | 0x0B001B00 -[gTextureNameLuigi_end](@ref gTextureNameLuigi_end) | 0x0B001D00 +[gTextureNameLuigi](@ref gTextureNameLuigi) | 0x0B001B00 [gTextureNameMario](@ref gTextureNameMario) | 0x0B001D00 -[gTextureNameMario_end](@ref gTextureNameMario_end) | 0x0B001F00 +[gTextureNameLuigi_end](@ref gTextureNameLuigi_end) | 0x0B001D00 [gTextureNamePeach](@ref gTextureNamePeach) | 0x0B001F00 -[gTextureNamePeach_end](@ref gTextureNamePeach_end) | 0x0B002100 +[gTextureNameMario_end](@ref gTextureNameMario_end) | 0x0B001F00 [gTextureNameWario](@ref gTextureNameWario) | 0x0B002100 +[gTextureNamePeach_end](@ref gTextureNamePeach_end) | 0x0B002100 [gTextureNameYoshi](@ref gTextureNameYoshi) | 0x0B002300 [gTextureNameWario_end](@ref gTextureNameWario_end) | 0x0B002300 -[gTextureTitleMarioRaceway](@ref gTextureTitleMarioRaceway) | 0x0B002500 [gTextureNameYoshi_end](@ref gTextureNameYoshi_end) | 0x0B002500 +[gTextureTitleMarioRaceway](@ref gTextureTitleMarioRaceway) | 0x0B002500 [gTextureTitleChocoMountain](@ref gTextureTitleChocoMountain) | 0x0B002A00 [gTextureTitleMarioRaceway_end](@ref gTextureTitleMarioRaceway_end) | 0x0B002A00 -[gTextureTitleBowsersCastle](@ref gTextureTitleBowsersCastle) | 0x0B002F00 [gTextureTitleChocoMountain_end](@ref gTextureTitleChocoMountain_end) | 0x0B002F00 +[gTextureTitleBowsersCastle](@ref gTextureTitleBowsersCastle) | 0x0B002F00 [gTextureTitleBowsersCastle_end](@ref gTextureTitleBowsersCastle_end) | 0x0B003400 [gTextureTitleBansheeBoardwalk](@ref gTextureTitleBansheeBoardwalk) | 0x0B003400 -[gTextureTitleYoshiValley](@ref gTextureTitleYoshiValley) | 0x0B003A00 [gTextureTitleBansheeBoardwalk_end](@ref gTextureTitleBansheeBoardwalk_end) | 0x0B003A00 +[gTextureTitleYoshiValley](@ref gTextureTitleYoshiValley) | 0x0B003A00 [gTextureTitleYoshiValley_end](@ref gTextureTitleYoshiValley_end) | 0x0B003E00 [gTextureTitleFrappeSnowland](@ref gTextureTitleFrappeSnowland) | 0x0B003E00 -[gTextureTitleFrappeSnowland_end](@ref gTextureTitleFrappeSnowland_end) | 0x0B004300 [gTextureTitleKoopaTroopaBeach](@ref gTextureTitleKoopaTroopaBeach) | 0x0B004300 +[gTextureTitleFrappeSnowland_end](@ref gTextureTitleFrappeSnowland_end) | 0x0B004300 [gTextureTitleKoopaTroopaBeach_end](@ref gTextureTitleKoopaTroopaBeach_end) | 0x0B004800 [gTextureTitleRoyalRaceway](@ref gTextureTitleRoyalRaceway) | 0x0B004800 [gTextureTitleRoyalRaceway_end](@ref gTextureTitleRoyalRaceway_end) | 0x0B004C00 [gTextureTitleLuigiRaceway](@ref gTextureTitleLuigiRaceway) | 0x0B004C00 [gTextureTitleMooMooFarm](@ref gTextureTitleMooMooFarm) | 0x0B005000 [gTextureTitleLuigiRaceway_end](@ref gTextureTitleLuigiRaceway_end) | 0x0B005000 -[gTextureTitleToadsTurnpike](@ref gTextureTitleToadsTurnpike) | 0x0B005400 [gTextureTitleMooMooFarm_end](@ref gTextureTitleMooMooFarm_end) | 0x0B005400 -[gTextureTitleToadsTurnpike_end](@ref gTextureTitleToadsTurnpike_end) | 0x0B005900 +[gTextureTitleToadsTurnpike](@ref gTextureTitleToadsTurnpike) | 0x0B005400 [gTextureTitleKalimariDesert](@ref gTextureTitleKalimariDesert) | 0x0B005900 -[gTextureTitleSherbetLand](@ref gTextureTitleSherbetLand) | 0x0B005D00 +[gTextureTitleToadsTurnpike_end](@ref gTextureTitleToadsTurnpike_end) | 0x0B005900 [gTextureTitleKalimariDesert_end](@ref gTextureTitleKalimariDesert_end) | 0x0B005D00 -[gTextureTitleRainbowRoad](@ref gTextureTitleRainbowRoad) | 0x0B006100 +[gTextureTitleSherbetLand](@ref gTextureTitleSherbetLand) | 0x0B005D00 [gTextureTitleSherbetLand_end](@ref gTextureTitleSherbetLand_end) | 0x0B006100 +[gTextureTitleRainbowRoad](@ref gTextureTitleRainbowRoad) | 0x0B006100 [gTextureTitleWarioStadium](@ref gTextureTitleWarioStadium) | 0x0B006500 [gTextureTitleRainbowRoad_end](@ref gTextureTitleRainbowRoad_end) | 0x0B006500 -[gTextureTitleBlockFort](@ref gTextureTitleBlockFort) | 0x0B006A00 [gTextureTitleWarioStadium_end](@ref gTextureTitleWarioStadium_end) | 0x0B006A00 +[gTextureTitleBlockFort](@ref gTextureTitleBlockFort) | 0x0B006A00 [gTextureTitleBlockFort_end](@ref gTextureTitleBlockFort_end) | 0x0B006D00 [gTextureTitleSkyscraper](@ref gTextureTitleSkyscraper) | 0x0B006D00 [gTextureTitleDoubleDeck](@ref gTextureTitleDoubleDeck) | 0x0B007100 @@ -19669,22 +19669,22 @@ Variable Name | Memory Address [gTextureMapSelect_end](@ref gTextureMapSelect_end) | 0x0B008A00 [gTextureMenuMushroomCup](@ref gTextureMenuMushroomCup) | 0x0B008E00 [gTextureMenuFlowerCup_end](@ref gTextureMenuFlowerCup_end) | 0x0B008E00 -[gTextureMenuStarCup](@ref gTextureMenuStarCup) | 0x0B009200 [gTextureMenuMushroomCup_end](@ref gTextureMenuMushroomCup_end) | 0x0B009200 +[gTextureMenuStarCup](@ref gTextureMenuStarCup) | 0x0B009200 [gTextureMenuSpecialCup](@ref gTextureMenuSpecialCup) | 0x0B009600 [gTextureMenuStarCup_end](@ref gTextureMenuStarCup_end) | 0x0B009600 [gTextureGameSelect](@ref gTextureGameSelect) | 0x0B009A00 [gTextureMenuSpecialCup_end](@ref gTextureMenuSpecialCup_end) | 0x0B009A00 -[gTextureGameSelect_end](@ref gTextureGameSelect_end) | 0x0B00A600 [gTextureMenu1PGame](@ref gTextureMenu1PGame) | 0x0B00A600 -[gTextureMenu2PGame](@ref gTextureMenu2PGame) | 0x0B00AB00 +[gTextureGameSelect_end](@ref gTextureGameSelect_end) | 0x0B00A600 [gTextureMenu1PGame_end](@ref gTextureMenu1PGame_end) | 0x0B00AB00 -[gTextureMenu2PGame_end](@ref gTextureMenu2PGame_end) | 0x0B00B200 +[gTextureMenu2PGame](@ref gTextureMenu2PGame) | 0x0B00AB00 [gTextureMenu3PGame](@ref gTextureMenu3PGame) | 0x0B00B200 -[gTextureMenu3PGame_end](@ref gTextureMenu3PGame_end) | 0x0B00BC00 +[gTextureMenu2PGame_end](@ref gTextureMenu2PGame_end) | 0x0B00B200 [gTextureMenu4PGame](@ref gTextureMenu4PGame) | 0x0B00BC00 -[gTextureMenuModeBattle](@ref gTextureMenuModeBattle) | 0x0B00C700 +[gTextureMenu3PGame_end](@ref gTextureMenu3PGame_end) | 0x0B00BC00 [gTextureMenu4PGame_end](@ref gTextureMenu4PGame_end) | 0x0B00C700 +[gTextureMenuModeBattle](@ref gTextureMenuModeBattle) | 0x0B00C700 [gTextureMenuModeTimeTrials](@ref gTextureMenuModeTimeTrials) | 0x0B00CA00 [gTextureMenuModeBattle_end](@ref gTextureMenuModeBattle_end) | 0x0B00CA00 [gTextureMenuModeMarioGP](@ref gTextureMenuModeMarioGP) | 0x0B00CE00 @@ -19695,36 +19695,36 @@ Variable Name | Memory Address [gTextureMenuModeVS_end](@ref gTextureMenuModeVS_end) | 0x0B00D500 [gTextureMenuLOption_end](@ref gTextureMenuLOption_end) | 0x0B00D800 [gTextureMenuRData](@ref gTextureMenuRData) | 0x0B00D800 -[gTextureMenu50cc](@ref gTextureMenu50cc) | 0x0B00DB00 [gTextureMenuRData_end](@ref gTextureMenuRData_end) | 0x0B00DB00 -[gTextureMenu100cc](@ref gTextureMenu100cc) | 0x0B00DD00 +[gTextureMenu50cc](@ref gTextureMenu50cc) | 0x0B00DB00 [gTextureMenu50cc_end](@ref gTextureMenu50cc_end) | 0x0B00DD00 -[gTextureMenu100cc_end](@ref gTextureMenu100cc_end) | 0x0B00DF00 +[gTextureMenu100cc](@ref gTextureMenu100cc) | 0x0B00DD00 [gTextureMenu150cc](@ref gTextureMenu150cc) | 0x0B00DF00 +[gTextureMenu100cc_end](@ref gTextureMenu100cc_end) | 0x0B00DF00 [gTextureMenuExtra](@ref gTextureMenuExtra) | 0x0B00E100 [gTextureMenu150cc_end](@ref gTextureMenu150cc_end) | 0x0B00E100 [gTextureMenuWithoutItem](@ref gTextureMenuWithoutItem) | 0x0B00E300 [gTextureMenuExtra_end](@ref gTextureMenuExtra_end) | 0x0B00E300 [gTextureMenuWithoutItem_end](@ref gTextureMenuWithoutItem_end) | 0x0B00E600 [gTextureMenuWithItem](@ref gTextureMenuWithItem) | 0x0B00E600 -[gTextureMenuBegin](@ref gTextureMenuBegin) | 0x0B00E900 [gTextureMenuWithItem_end](@ref gTextureMenuWithItem_end) | 0x0B00E900 +[gTextureMenuBegin](@ref gTextureMenuBegin) | 0x0B00E900 [gTextureMenuGhost](@ref gTextureMenuGhost) | 0x0B00EB00 [gTextureMenuBegin_end](@ref gTextureMenuBegin_end) | 0x0B00EB00 [gTextureMenuData](@ref gTextureMenuData) | 0x0B00ED00 [gTextureMenuGhost_end](@ref gTextureMenuGhost_end) | 0x0B00ED00 [gTextureMenuData_end](@ref gTextureMenuData_end) | 0x0B00EF00 [gTextureMenuOK](@ref gTextureMenuOK) | 0x0B00EF00 -[gTextureMenuOK_end](@ref gTextureMenuOK_end) | 0x0B00F100 [gTextureBackgroundBlueSky](@ref gTextureBackgroundBlueSky) | 0x0B00F100 +[gTextureMenuOK_end](@ref gTextureMenuOK_end) | 0x0B00F100 [gTextureBackgroundBlueSky_end](@ref gTextureBackgroundBlueSky_end) | 0x0B01BF00 [gTextureBackgroundSunset](@ref gTextureBackgroundSunset) | 0x0B01BF00 -[gTextureBackgroundSunset_end](@ref gTextureBackgroundSunset_end) | 0x0B025300 [gTextureGreenGoldStripe](@ref gTextureGreenGoldStripe) | 0x0B025300 -[gTextureGreenGoldStripe_end](@ref gTextureGreenGoldStripe_end) | 0x0B025F00 +[gTextureBackgroundSunset_end](@ref gTextureBackgroundSunset_end) | 0x0B025300 [gTextureGoldStripe](@ref gTextureGoldStripe) | 0x0B025F00 -[gTextureGoldStripe_end](@ref gTextureGoldStripe_end) | 0x0B026600 +[gTextureGreenGoldStripe_end](@ref gTextureGreenGoldStripe_end) | 0x0B025F00 [gTextureWhiteStripe](@ref gTextureWhiteStripe) | 0x0B026600 +[gTextureGoldStripe_end](@ref gTextureGoldStripe_end) | 0x0B026600 [gTexturePinkBar](@ref gTexturePinkBar) | 0x0B026700 [gTextureWhiteStripe_end](@ref gTextureWhiteStripe_end) | 0x0B026700 [gTexturePinkBar_end](@ref gTexturePinkBar_end) | 0x0B026C00 @@ -19819,64 +19819,64 @@ Variable Name | Memory Address [d_course_big_donut_packed](@ref d_course_big_donut_packed) | 0x0F001B84 [music_sequence_table_header](@ref music_sequence_table_header) | 0x0025FD00 [music_sequence_table](@ref music_sequence_table) | 0x0025FD04 -[seq_00](@ref seq_00) | 0x0025FE00 [music_sequence_table_end](@ref music_sequence_table_end) | 0x0025FE00 +[seq_00](@ref seq_00) | 0x0025FE00 [seq_01](@ref seq_01) | 0x00262630 [seq_00_end](@ref seq_00_end) | 0x00262630 -[seq_01_end](@ref seq_01_end) | 0x00264160 [seq_02](@ref seq_02) | 0x00264160 +[seq_01_end](@ref seq_01_end) | 0x00264160 [seq_02_end](@ref seq_02_end) | 0x00264EC0 [seq_03](@ref seq_03) | 0x00264EC0 [seq_03_end](@ref seq_03_end) | 0x002668D0 [seq_04](@ref seq_04) | 0x002668D0 -[seq_05](@ref seq_05) | 0x00268570 [seq_04_end](@ref seq_04_end) | 0x00268570 +[seq_05](@ref seq_05) | 0x00268570 [seq_05_end](@ref seq_05_end) | 0x0026A4E0 [seq_06](@ref seq_06) | 0x0026A4E0 -[seq_07](@ref seq_07) | 0x0026C3C0 [seq_06_end](@ref seq_06_end) | 0x0026C3C0 +[seq_07](@ref seq_07) | 0x0026C3C0 [seq_07_end](@ref seq_07_end) | 0x0026DA90 [seq_08](@ref seq_08) | 0x0026DA90 -[seq_09](@ref seq_09) | 0x0026FE60 [seq_08_end](@ref seq_08_end) | 0x0026FE60 +[seq_09](@ref seq_09) | 0x0026FE60 [seq_09_end](@ref seq_09_end) | 0x00271660 [seq_0A](@ref seq_0A) | 0x00271660 [seq_0B](@ref seq_0B) | 0x00273140 [seq_0A_end](@ref seq_0A_end) | 0x00273140 [seq_0C](@ref seq_0C) | 0x00273730 [seq_0B_end](@ref seq_0B_end) | 0x00273730 -[seq_0C_end](@ref seq_0C_end) | 0x00273B00 [seq_0D](@ref seq_0D) | 0x00273B00 -[seq_0E](@ref seq_0E) | 0x00273E60 +[seq_0C_end](@ref seq_0C_end) | 0x00273B00 [seq_0D_end](@ref seq_0D_end) | 0x00273E60 +[seq_0E](@ref seq_0E) | 0x00273E60 [seq_0E_end](@ref seq_0E_end) | 0x00274140 [seq_0F](@ref seq_0F) | 0x00274140 [seq_0F_end](@ref seq_0F_end) | 0x00274600 [seq_10](@ref seq_10) | 0x00274600 [seq_10_end](@ref seq_10_end) | 0x00275A10 [seq_11](@ref seq_11) | 0x00275A10 -[seq_12](@ref seq_12) | 0x002760F0 [seq_11_end](@ref seq_11_end) | 0x002760F0 -[seq_12_end](@ref seq_12_end) | 0x002793E0 +[seq_12](@ref seq_12) | 0x002760F0 [seq_13](@ref seq_13) | 0x002793E0 +[seq_12_end](@ref seq_12_end) | 0x002793E0 [seq_14](@ref seq_14) | 0x00279AA0 [seq_13_end](@ref seq_13_end) | 0x00279AA0 [seq_15](@ref seq_15) | 0x00279F50 [seq_14_end](@ref seq_14_end) | 0x00279F50 -[seq_16](@ref seq_16) | 0x0027B0B0 [seq_15_end](@ref seq_15_end) | 0x0027B0B0 -[seq_16_end](@ref seq_16_end) | 0x0027B3C0 +[seq_16](@ref seq_16) | 0x0027B0B0 [seq_17](@ref seq_17) | 0x0027B3C0 +[seq_16_end](@ref seq_16_end) | 0x0027B3C0 [seq_17_end](@ref seq_17_end) | 0x0027C670 [seq_18](@ref seq_18) | 0x0027C670 [seq_19](@ref seq_19) | 0x0027CC70 [seq_18_end](@ref seq_18_end) | 0x0027CC70 -[seq_19_end](@ref seq_19_end) | 0x0027E350 [seq_1A](@ref seq_1A) | 0x0027E350 -[seq_1B](@ref seq_1B) | 0x0027EE20 +[seq_19_end](@ref seq_19_end) | 0x0027E350 [seq_1A_end](@ref seq_1A_end) | 0x0027EE20 -[seq_1C](@ref seq_1C) | 0x0027FAA0 +[seq_1B](@ref seq_1B) | 0x0027EE20 [seq_1B_end](@ref seq_1B_end) | 0x0027FAA0 +[seq_1C](@ref seq_1C) | 0x0027FAA0 [seq_1D](@ref seq_1D) | 0x002821F0 [seq_1C_end](@ref seq_1C_end) | 0x002821F0 [seq_1D_end](@ref seq_1D_end) | 0x00282E70