diff --git a/asm/non_matchings/menu/func_8008AD44.s b/asm/non_matchings/menu/func_8008AD44.s index ce601dfc..a7a872a5 100644 --- a/asm/non_matchings/menu/func_8008AD44.s +++ b/asm/non_matchings/menu/func_8008AD44.s @@ -69,7 +69,7 @@ glabel func_8008AD44 /* 08BA38 8008AE38 1640FFD6 */ bnez $s2, .L8008AD94 /* 08BA3C 8008AE3C 02719821 */ addu $s3, $s3, $s1 .L8008AE40: -/* 08BA40 8008AE40 0C01C450 */ jal func_80071140 +/* 08BA40 8008AE40 0C01C450 */ jal free_from_memory_pool /* 08BA44 8008AE44 02802025 */ move $a0, $s4 /* 08BA48 8008AE48 240A0001 */ li $t2, 1 /* 08BA4C 8008AE4C 3C01800E */ lui $at, %hi(D_800E1E18) # $at, 0x800e diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s index 2c165049..e2b8e834 100644 --- a/asm/non_matchings/unknown_003260/audioNewThread.s +++ b/asm/non_matchings/unknown_003260/audioNewThread.s @@ -96,7 +96,7 @@ glabel audioNewThread /* 0033CC 800027CC 248461D0 */ addiu $a0, %lo(ALGlobals_801161D0) # addiu $a0, $a0, 0x61d0 /* 0033D0 800027D0 0C0321FB */ jal alInit /* 0033D4 800027D4 02602825 */ move $a1, $s3 -/* 0033D8 800027D8 0C01C450 */ jal func_80071140 +/* 0033D8 800027D8 0C01C450 */ jal free_from_memory_pool /* 0033DC 800027DC 02202025 */ move $a0, $s1 /* 0033E0 800027E0 10000005 */ b .L800027F8 /* 0033E4 800027E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_005740/func_80004B40.s b/asm/non_matchings/unknown_005740/func_80004B40.s index 9107328e..2c0c36cc 100644 --- a/asm/non_matchings/unknown_005740/func_80004B40.s +++ b/asm/non_matchings/unknown_005740/func_80004B40.s @@ -364,9 +364,9 @@ glabel func_80004B40 /* 005C8C 8000508C E4520054 */ swc1 $f18, 0x54($v0) .L80005090: /* 005C90 80005090 8FA4003C */ lw $a0, 0x3c($sp) -/* 005C94 80005094 0C01C450 */ jal func_80071140 +/* 005C94 80005094 0C01C450 */ jal free_from_memory_pool /* 005C98 80005098 00000000 */ nop -/* 005C9C 8000509C 0C01C450 */ jal func_80071140 +/* 005C9C 8000509C 0C01C450 */ jal free_from_memory_pool /* 005CA0 800050A0 02A02025 */ move $a0, $s5 /* 005CA4 800050A4 8FBF0034 */ lw $ra, 0x34($sp) /* 005CA8 800050A8 8FA20044 */ lw $v0, 0x44($sp) diff --git a/asm/non_matchings/unknown_005740/func_80006AC8.s b/asm/non_matchings/unknown_005740/func_80006AC8.s index 82c142a5..9501cd62 100644 --- a/asm/non_matchings/unknown_005740/func_80006AC8.s +++ b/asm/non_matchings/unknown_005740/func_80006AC8.s @@ -69,7 +69,7 @@ glabel func_80006AC8 /* 0077BC 80006BBC 24420004 */ addiu $v0, $v0, 4 /* 0077C0 80006BC0 1443FFF9 */ bne $v0, $v1, .L80006BA8 /* 0077C4 80006BC4 00000000 */ nop -/* 0077C8 80006BC8 0C01C450 */ jal func_80071140 +/* 0077C8 80006BC8 0C01C450 */ jal free_from_memory_pool /* 0077CC 80006BCC 00A02025 */ move $a0, $a1 /* 0077D0 80006BD0 8FAD0028 */ lw $t5, 0x28($sp) /* 0077D4 80006BD4 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000B290.s b/asm/non_matchings/unknown_00BC20/func_8000B290.s index 13381ac9..66bec198 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000B290.s +++ b/asm/non_matchings/unknown_00BC20/func_8000B290.s @@ -8,7 +8,7 @@ glabel func_8000B290 /* 00BEA8 8000B2A8 AFB20020 */ sw $s2, 0x20($sp) /* 00BEAC 8000B2AC 10800009 */ beqz $a0, .L8000B2D4 /* 00BEB0 8000B2B0 AFB1001C */ sw $s1, 0x1c($sp) -/* 00BEB4 8000B2B4 0C01C450 */ jal func_80071140 +/* 00BEB4 8000B2B4 0C01C450 */ jal free_from_memory_pool /* 00BEB8 8000B2B8 00000000 */ nop /* 00BEBC 8000B2BC 3C02800E */ lui $v0, %hi(D_800DC74C) # $v0, 0x800e /* 00BEC0 8000B2C0 2442C74C */ addiu $v0, %lo(D_800DC74C) # addiu $v0, $v0, -0x38b4 diff --git a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s index 08e34197..90ff8e56 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000C8F8.s +++ b/asm/non_matchings/unknown_00BC20/func_8000C8F8.s @@ -123,7 +123,7 @@ glabel func_8000C8F8 /* 00D6C0 8000CAC0 0C031886 */ jal func_800C6218 /* 00D6C4 8000CAC4 00000000 */ nop /* 00D6C8 8000CAC8 8FA4003C */ lw $a0, 0x3c($sp) -/* 00D6CC 8000CACC 0C01C450 */ jal func_80071140 +/* 00D6CC 8000CACC 0C01C450 */ jal free_from_memory_pool /* 00D6D0 8000CAD0 00000000 */ nop /* 00D6D4 8000CAD4 8FAF0028 */ lw $t7, 0x28($sp) /* 00D6D8 8000CAD8 8FA80048 */ lw $t0, 0x48($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s index ac414f9b..c62eefcd 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000CC7C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000CC7C.s @@ -1417,11 +1417,11 @@ glabel L8000D98C /* 00EC60 8000E060 0C01AF44 */ jal func_8006BD10 /* 00EC64 8000E064 00000000 */ nop .L8000E068: -/* 00EC68 8000E068 0C01C42C */ jal func_800710B0 +/* 00EC68 8000E068 0C01C42C */ jal set_free_queue_state /* 00EC6C 8000E06C 00002025 */ move $a0, $zero -/* 00EC70 8000E070 0C01C450 */ jal func_80071140 +/* 00EC70 8000E070 0C01C450 */ jal free_from_memory_pool /* 00EC74 8000E074 02C02025 */ move $a0, $s6 -/* 00EC78 8000E078 0C01C42C */ jal func_800710B0 +/* 00EC78 8000E078 0C01C42C */ jal set_free_queue_state /* 00EC7C 8000E07C 24040002 */ li $a0, 2 .L8000E080: /* 00EC80 8000E080 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000EA54.s b/asm/non_matchings/unknown_00BC20/func_8000EA54.s index 7a7fbc0f..e63f77ce 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000EA54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000EA54.s @@ -804,7 +804,7 @@ glabel L8000EDE0 /* 0101C0 8000F5C0 87A4004E */ lh $a0, 0x4e($sp) /* 0101C4 8000F5C4 0C003211 */ jal func_8000C844 /* 0101C8 8000F5C8 00000000 */ nop -/* 0101CC 8000F5CC 0C01C450 */ jal func_80071140 +/* 0101CC 8000F5CC 0C01C450 */ jal free_from_memory_pool /* 0101D0 8000F5D0 02402025 */ move $a0, $s2 /* 0101D4 8000F5D4 12200005 */ beqz $s1, .L8000F5EC /* 0101D8 8000F5D8 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000F99C.s b/asm/non_matchings/unknown_00BC20/func_8000F99C.s index c9123901..4a0a6908 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000F99C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000F99C.s @@ -54,7 +54,7 @@ glabel func_8000F99C /* 01065C 8000FA5C 8604002C */ lh $a0, 0x2c($s0) /* 010660 8000FA60 0C003211 */ jal func_8000C844 /* 010664 8000FA64 00000000 */ nop -/* 010668 8000FA68 0C01C450 */ jal func_80071140 +/* 010668 8000FA68 0C01C450 */ jal free_from_memory_pool /* 01066C 8000FA6C 02002025 */ move $a0, $s0 /* 010670 8000FA70 8E620000 */ lw $v0, ($s3) /* 010674 8000FA74 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_8000FD54.s b/asm/non_matchings/unknown_00BC20/func_8000FD54.s index 37bbbe9b..7b63dc65 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000FD54.s +++ b/asm/non_matchings/unknown_00BC20/func_8000FD54.s @@ -155,7 +155,7 @@ glabel func_8000FD54 /* 010B7C 8000FF7C 8FA40038 */ lw $a0, 0x38($sp) /* 010B80 8000FF80 0C003211 */ jal func_8000C844 /* 010B84 8000FF84 00000000 */ nop -/* 010B88 8000FF88 0C01C450 */ jal func_80071140 +/* 010B88 8000FF88 0C01C450 */ jal free_from_memory_pool /* 010B8C 8000FF8C 02402025 */ move $a0, $s2 /* 010B90 8000FF90 10000001 */ b .L8000FF98 /* 010B94 8000FF94 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/unknown_00BC20/func_800101AC.s b/asm/non_matchings/unknown_00BC20/func_800101AC.s index 11c0f4c4..4b8de525 100644 --- a/asm/non_matchings/unknown_00BC20/func_800101AC.s +++ b/asm/non_matchings/unknown_00BC20/func_800101AC.s @@ -82,7 +82,7 @@ glabel func_800101AC .L800102B8: /* 010EB8 800102B8 0C003211 */ jal func_8000C844 /* 010EBC 800102BC 00000000 */ nop -/* 010EC0 800102C0 0C01C450 */ jal func_80071140 +/* 010EC0 800102C0 0C01C450 */ jal free_from_memory_pool /* 010EC4 800102C4 02202025 */ move $a0, $s1 /* 010EC8 800102C8 8EC30060 */ lw $v1, 0x60($s6) /* 010ECC 800102CC 26B50001 */ addiu $s5, $s5, 1 @@ -295,7 +295,7 @@ glabel L800105A8 /* 0111AC 800105AC 00000000 */ nop /* 0111B0 800105B0 10800005 */ beqz $a0, .L800105C8 /* 0111B4 800105B4 00000000 */ nop -/* 0111B8 800105B8 0C01C450 */ jal func_80071140 +/* 0111B8 800105B8 0C01C450 */ jal free_from_memory_pool /* 0111BC 800105BC 00000000 */ nop /* 0111C0 800105C0 86C50048 */ lh $a1, 0x48($s6) /* 0111C4 800105C4 00000000 */ nop @@ -566,7 +566,7 @@ glabel L80010664 /* 011558 80010958 86C4002C */ lh $a0, 0x2c($s6) /* 01155C 8001095C 0C003211 */ jal func_8000C844 /* 011560 80010960 00000000 */ nop -/* 011564 80010964 0C01C450 */ jal func_80071140 +/* 011564 80010964 0C01C450 */ jal free_from_memory_pool /* 011568 80010968 02C02025 */ move $a0, $s6 .L8001096C: /* 01156C 8001096C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8001B2F0.s b/asm/non_matchings/unknown_00BC20/func_8001B2F0.s index 801dd597..65ddb50f 100644 --- a/asm/non_matchings/unknown_00BC20/func_8001B2F0.s +++ b/asm/non_matchings/unknown_00BC20/func_8001B2F0.s @@ -44,7 +44,7 @@ glabel func_8001B2F0 /* 01BF8C 8001B38C 00402825 */ move $a1, $v0 .L8001B390: /* 01BF90 8001B390 8FA40024 */ lw $a0, 0x24($sp) -/* 01BF94 8001B394 0C01C450 */ jal func_80071140 +/* 01BF94 8001B394 0C01C450 */ jal free_from_memory_pool /* 01BF98 8001B398 AFA5001C */ sw $a1, 0x1c($sp) /* 01BF9C 8001B39C 8FBF0014 */ lw $ra, 0x14($sp) /* 01BFA0 8001B3A0 8FA2001C */ lw $v0, 0x1c($sp) diff --git a/asm/non_matchings/unknown_0255E0/func_8002C0C4.s b/asm/non_matchings/unknown_0255E0/func_8002C0C4.s index 198777d9..236dd4b9 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002C0C4.s +++ b/asm/non_matchings/unknown_0255E0/func_8002C0C4.s @@ -87,7 +87,7 @@ glabel func_8002C0C4 /* 02CDF0 8002C1F0 0C031886 */ jal func_800C6218 /* 02CDF4 8002C1F4 02002025 */ move $a0, $s0 /* 02CDF8 8002C1F8 8E840000 */ lw $a0, ($s4) -/* 02CDFC 8002C1FC 0C01C450 */ jal func_80071140 +/* 02CDFC 8002C1FC 0C01C450 */ jal free_from_memory_pool /* 02CE00 8002C200 00000000 */ nop /* 02CE04 8002C204 8E320000 */ lw $s2, ($s1) /* 02CE08 8002C208 00008025 */ move $s0, $zero @@ -291,11 +291,11 @@ glabel func_8002C0C4 /* 02D108 8002C508 0C032755 */ jal func_800C9D54 /* 02D10C 8002C50C 02602825 */ move $a1, $s3 .L8002C510: -/* 02D110 8002C510 0C01C42C */ jal func_800710B0 +/* 02D110 8002C510 0C01C42C */ jal set_free_queue_state /* 02D114 8002C514 00002025 */ move $a0, $zero /* 02D118 8002C518 3C048012 */ lui $a0, %hi(D_8011D30C) # $a0, 0x8012 /* 02D11C 8002C51C 8C84D30C */ lw $a0, %lo(D_8011D30C)($a0) -/* 02D120 8002C520 0C01C450 */ jal func_80071140 +/* 02D120 8002C520 0C01C450 */ jal free_from_memory_pool /* 02D124 8002C524 00000000 */ nop /* 02D128 8002C528 3C058012 */ lui $a1, %hi(D_8011D30C) # $a1, 0x8012 /* 02D12C 8002C52C 8CA5D30C */ lw $a1, %lo(D_8011D30C)($a1) @@ -303,7 +303,7 @@ glabel func_8002C0C4 /* 02D134 8002C534 34C600FF */ ori $a2, (0xFFFF00FF & 0xFFFF) # ori $a2, $a2, 0xff /* 02D138 8002C538 0C01C3BE */ jal allocate_at_address_in_main_pool /* 02D13C 8002C53C 02602025 */ move $a0, $s3 -/* 02D140 8002C540 0C01C42C */ jal func_800710B0 +/* 02D140 8002C540 0C01C42C */ jal set_free_queue_state /* 02D144 8002C544 24040002 */ li $a0, 2 /* 02D148 8002C548 8E240000 */ lw $a0, ($s1) /* 02D14C 8002C54C 0C02A0ED */ jal func_800A83B4 diff --git a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s index 32ffde75..1b633c69 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002C7D4.s +++ b/asm/non_matchings/unknown_0255E0/func_8002C7D4.s @@ -40,15 +40,15 @@ glabel func_8002C7D4 .L8002C864: /* 02D464 8002C864 3C048012 */ lui $a0, %hi(D_8011D30C) # $a0, 0x8012 /* 02D468 8002C868 8C84D30C */ lw $a0, %lo(D_8011D30C)($a0) -/* 02D46C 8002C86C 0C01C450 */ jal func_80071140 +/* 02D46C 8002C86C 0C01C450 */ jal free_from_memory_pool /* 02D470 8002C870 00000000 */ nop /* 02D474 8002C874 3C048012 */ lui $a0, %hi(D_8011D370) # $a0, 0x8012 /* 02D478 8002C878 8C84D370 */ lw $a0, %lo(D_8011D370)($a0) -/* 02D47C 8002C87C 0C01C450 */ jal func_80071140 +/* 02D47C 8002C87C 0C01C450 */ jal free_from_memory_pool /* 02D480 8002C880 00000000 */ nop /* 02D484 8002C884 3C048012 */ lui $a0, %hi(D_8011D374) # $a0, 0x8012 /* 02D488 8002C888 8C84D374 */ lw $a0, %lo(D_8011D374)($a0) -/* 02D48C 8002C88C 0C01C450 */ jal func_80071140 +/* 02D48C 8002C88C 0C01C450 */ jal free_from_memory_pool /* 02D490 8002C890 00000000 */ nop /* 02D494 8002C894 8E890000 */ lw $t1, ($s4) /* 02D498 8002C898 00000000 */ nop @@ -65,13 +65,13 @@ glabel func_8002C7D4 /* 02D4C4 8002C8C4 2631D350 */ addiu $s1, %lo(D_8011D350) # addiu $s1, $s1, -0x2cb0 .L8002C8C8: /* 02D4C8 8002C8C8 8E240000 */ lw $a0, ($s1) -/* 02D4CC 8002C8CC 0C01C450 */ jal func_80071140 +/* 02D4CC 8002C8CC 0C01C450 */ jal free_from_memory_pool /* 02D4D0 8002C8D0 00000000 */ nop /* 02D4D4 8002C8D4 8E440000 */ lw $a0, ($s2) -/* 02D4D8 8002C8D8 0C01C450 */ jal func_80071140 +/* 02D4D8 8002C8D8 0C01C450 */ jal free_from_memory_pool /* 02D4DC 8002C8DC 00000000 */ nop /* 02D4E0 8002C8E0 8E040000 */ lw $a0, ($s0) -/* 02D4E4 8002C8E4 0C01C450 */ jal func_80071140 +/* 02D4E4 8002C8E4 0C01C450 */ jal free_from_memory_pool /* 02D4E8 8002C8E8 00000000 */ nop /* 02D4EC 8002C8EC 26100004 */ addiu $s0, $s0, 4 /* 02D4F0 8002C8F0 26310004 */ addiu $s1, $s1, 4 diff --git a/asm/non_matchings/unknown_043920/func_80059A68.s b/asm/non_matchings/unknown_043920/func_80059A68.s index 0b299f71..7f2e6f47 100644 --- a/asm/non_matchings/unknown_043920/func_80059A68.s +++ b/asm/non_matchings/unknown_043920/func_80059A68.s @@ -22,7 +22,7 @@ glabel func_80059A68 /* 05A6B8 80059AB8 00000000 */ nop /* 05A6BC 80059ABC 10800004 */ beqz $a0, .L80059AD0 /* 05A6C0 80059AC0 8FA6002C */ lw $a2, 0x2c($sp) -/* 05A6C4 80059AC4 0C01C450 */ jal func_80071140 +/* 05A6C4 80059AC4 0C01C450 */ jal free_from_memory_pool /* 05A6C8 80059AC8 00000000 */ nop /* 05A6CC 80059ACC 8FA6002C */ lw $a2, 0x2c($sp) .L80059AD0: @@ -46,12 +46,12 @@ glabel func_80059A68 /* 05A714 80059B14 8C650008 */ lw $a1, 8($v1) /* 05A718 80059B18 0C032768 */ jal bcopy /* 05A71C 80059B1C 00000000 */ nop -/* 05A720 80059B20 0C01C450 */ jal func_80071140 +/* 05A720 80059B20 0C01C450 */ jal free_from_memory_pool /* 05A724 80059B24 02002025 */ move $a0, $s0 /* 05A728 80059B28 10000004 */ b .L80059B3C /* 05A72C 80059B2C 00001025 */ move $v0, $zero .L80059B30: -/* 05A730 80059B30 0C01C450 */ jal func_80071140 +/* 05A730 80059B30 0C01C450 */ jal free_from_memory_pool /* 05A734 80059B34 02002025 */ move $a0, $s0 .L80059B38: /* 05A738 80059B38 24020001 */ li $v0, 1 diff --git a/asm/non_matchings/unknown_05F690/func_8005FF40.s b/asm/non_matchings/unknown_05F690/func_8005FF40.s index 2e32da98..19f439b7 100644 --- a/asm/non_matchings/unknown_05F690/func_8005FF40.s +++ b/asm/non_matchings/unknown_05F690/func_8005FF40.s @@ -13,7 +13,7 @@ glabel func_8005FF40 /* 060B6C 8005FF6C 00000000 */ nop /* 060B70 8005FF70 1B000005 */ blez $t8, .L8005FF88 /* 060B74 8005FF74 00000000 */ nop -/* 060B78 8005FF78 0C01C450 */ jal func_80071140 +/* 060B78 8005FF78 0C01C450 */ jal free_from_memory_pool /* 060B7C 8005FF7C 00000000 */ nop /* 060B80 8005FF80 10000032 */ b .L8006004C /* 060B84 8005FF84 8FBF0014 */ lw $ra, 0x14($sp) @@ -67,7 +67,7 @@ glabel func_8005FF40 /* 060C34 80060034 8CAD0000 */ lw $t5, ($a1) /* 060C38 80060038 00000000 */ nop /* 060C3C 8006003C 01A96021 */ addu $t4, $t5, $t1 -/* 060C40 80060040 0C01C450 */ jal func_80071140 +/* 060C40 80060040 0C01C450 */ jal free_from_memory_pool /* 060C44 80060044 AD880004 */ sw $t0, 4($t4) .L80060048: /* 060C48 80060048 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_05F690/func_80060058.s b/asm/non_matchings/unknown_05F690/func_80060058.s index 17f8f697..aa2f5826 100644 --- a/asm/non_matchings/unknown_05F690/func_80060058.s +++ b/asm/non_matchings/unknown_05F690/func_80060058.s @@ -31,21 +31,21 @@ glabel func_80060058 /* 060CC0 800600C0 00000000 */ nop /* 060CC4 800600C4 10800003 */ beqz $a0, .L800600D4 /* 060CC8 800600C8 00000000 */ nop -/* 060CCC 800600CC 0C01C450 */ jal func_80071140 +/* 060CCC 800600CC 0C01C450 */ jal free_from_memory_pool /* 060CD0 800600D0 00000000 */ nop .L800600D4: /* 060CD4 800600D4 8E440010 */ lw $a0, 0x10($s2) /* 060CD8 800600D8 00000000 */ nop /* 060CDC 800600DC 10800003 */ beqz $a0, .L800600EC /* 060CE0 800600E0 00000000 */ nop -/* 060CE4 800600E4 0C01C450 */ jal func_80071140 +/* 060CE4 800600E4 0C01C450 */ jal free_from_memory_pool /* 060CE8 800600E8 00000000 */ nop .L800600EC: /* 060CEC 800600EC 8E440040 */ lw $a0, 0x40($s2) /* 060CF0 800600F0 00000000 */ nop /* 060CF4 800600F4 10800003 */ beqz $a0, .L80060104 /* 060CF8 800600F8 00000000 */ nop -/* 060CFC 800600FC 0C01C450 */ jal func_80071140 +/* 060CFC 800600FC 0C01C450 */ jal free_from_memory_pool /* 060D00 80060100 00000000 */ nop .L80060104: /* 060D04 80060104 8E580044 */ lw $t8, 0x44($s2) @@ -61,7 +61,7 @@ glabel func_80060058 /* 060D28 80060128 00000000 */ nop /* 060D2C 8006012C 01114821 */ addu $t1, $t0, $s1 /* 060D30 80060130 8D240000 */ lw $a0, ($t1) -/* 060D34 80060134 0C01C450 */ jal func_80071140 +/* 060D34 80060134 0C01C450 */ jal free_from_memory_pool /* 060D38 80060138 2484FFFC */ addiu $a0, $a0, -4 /* 060D3C 8006013C 864A0048 */ lh $t2, 0x48($s2) /* 060D40 80060140 26100001 */ addiu $s0, $s0, 1 @@ -69,10 +69,10 @@ glabel func_80060058 /* 060D48 80060148 1420FFF6 */ bnez $at, .L80060124 /* 060D4C 8006014C 26310008 */ addiu $s1, $s1, 8 /* 060D50 80060150 8E440044 */ lw $a0, 0x44($s2) -/* 060D54 80060154 0C01C450 */ jal func_80071140 +/* 060D54 80060154 0C01C450 */ jal free_from_memory_pool /* 060D58 80060158 00000000 */ nop .L8006015C: -/* 060D5C 8006015C 0C01C450 */ jal func_80071140 +/* 060D5C 8006015C 0C01C450 */ jal free_from_memory_pool /* 060D60 80060160 02402025 */ move $a0, $s2 /* 060D64 80060164 8FBF0024 */ lw $ra, 0x24($sp) /* 060D68 80060168 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_05F690/func_8006017C.s b/asm/non_matchings/unknown_05F690/func_8006017C.s index ef89a0a2..9e6dc109 100644 --- a/asm/non_matchings/unknown_05F690/func_8006017C.s +++ b/asm/non_matchings/unknown_05F690/func_8006017C.s @@ -60,7 +60,7 @@ glabel func_8006017C /* 060E58 80060258 14400006 */ bnez $v0, .L80060274 /* 060E5C 8006025C AE420010 */ sw $v0, 0x10($s2) /* 060E60 80060260 8E44000C */ lw $a0, 0xc($s2) -/* 060E64 80060264 0C01C450 */ jal func_80071140 +/* 060E64 80060264 0C01C450 */ jal free_from_memory_pool /* 060E68 80060268 00000000 */ nop /* 060E6C 8006026C 10000190 */ b .L800608B0 /* 060E70 80060270 AE40000C */ sw $zero, 0xc($s2) diff --git a/asm/non_matchings/unknown_05F690/func_80060EA8.s b/asm/non_matchings/unknown_05F690/func_80060EA8.s index 13c8c7ce..132bd773 100644 --- a/asm/non_matchings/unknown_05F690/func_80060EA8.s +++ b/asm/non_matchings/unknown_05F690/func_80060EA8.s @@ -82,7 +82,7 @@ glabel func_80060EA8 /* 061BD4 80060FD4 14400006 */ bnez $v0, .L80060FF0 /* 061BD8 80060FD8 AFA200A0 */ sw $v0, 0xa0($sp) /* 061BDC 80060FDC 8FA400AC */ lw $a0, 0xac($sp) -/* 061BE0 80060FE0 0C01C450 */ jal func_80071140 +/* 061BE0 80060FE0 0C01C450 */ jal free_from_memory_pool /* 061BE4 80060FE4 00000000 */ nop /* 061BE8 80060FE8 10000274 */ b .L800619BC /* 061BEC 80060FEC 24020001 */ li $v0, 1 @@ -252,10 +252,10 @@ glabel func_80060EA8 /* 061E60 80061260 14400009 */ bnez $v0, .L80061288 /* 061E64 80061264 0040B825 */ move $s7, $v0 /* 061E68 80061268 8FA400AC */ lw $a0, 0xac($sp) -/* 061E6C 8006126C 0C01C450 */ jal func_80071140 +/* 061E6C 8006126C 0C01C450 */ jal free_from_memory_pool /* 061E70 80061270 00000000 */ nop /* 061E74 80061274 8FA400A0 */ lw $a0, 0xa0($sp) -/* 061E78 80061278 0C01C450 */ jal func_80071140 +/* 061E78 80061278 0C01C450 */ jal free_from_memory_pool /* 061E7C 8006127C 00000000 */ nop /* 061E80 80061280 100001CE */ b .L800619BC /* 061E84 80061284 24020001 */ li $v0, 1 @@ -535,12 +535,12 @@ glabel func_80060EA8 /* 062258 80061658 1440000B */ bnez $v0, .L80061688 /* 06225C 8006165C 00409025 */ move $s2, $v0 /* 062260 80061660 8FA400AC */ lw $a0, 0xac($sp) -/* 062264 80061664 0C01C450 */ jal func_80071140 +/* 062264 80061664 0C01C450 */ jal free_from_memory_pool /* 062268 80061668 00000000 */ nop /* 06226C 8006166C 8FA400A0 */ lw $a0, 0xa0($sp) -/* 062270 80061670 0C01C450 */ jal func_80071140 +/* 062270 80061670 0C01C450 */ jal free_from_memory_pool /* 062274 80061674 00000000 */ nop -/* 062278 80061678 0C01C450 */ jal func_80071140 +/* 062278 80061678 0C01C450 */ jal free_from_memory_pool /* 06227C 8006167C 02E02025 */ move $a0, $s7 /* 062280 80061680 100000CE */ b .L800619BC /* 062284 80061684 24020001 */ li $v0, 1 @@ -757,12 +757,12 @@ glabel func_80060EA8 .L80061994: /* 062594 80061994 8FA900A0 */ lw $t1, 0xa0($sp) /* 062598 80061998 02E02025 */ move $a0, $s7 -/* 06259C 8006199C 0C01C450 */ jal func_80071140 +/* 06259C 8006199C 0C01C450 */ jal free_from_memory_pool /* 0625A0 800619A0 AD490040 */ sw $t1, 0x40($t2) -/* 0625A4 800619A4 0C01C450 */ jal func_80071140 +/* 0625A4 800619A4 0C01C450 */ jal free_from_memory_pool /* 0625A8 800619A8 02402025 */ move $a0, $s2 /* 0625AC 800619AC 8FA400AC */ lw $a0, 0xac($sp) -/* 0625B0 800619B0 0C01C450 */ jal func_80071140 +/* 0625B0 800619B0 0C01C450 */ jal free_from_memory_pool /* 0625B4 800619B4 00000000 */ nop .L800619B8: /* 0625B8 800619B8 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/unknown_05F690/func_80061A00.s b/asm/non_matchings/unknown_05F690/func_80061A00.s index 897ad4a4..d632fa6f 100644 --- a/asm/non_matchings/unknown_05F690/func_80061A00.s +++ b/asm/non_matchings/unknown_05F690/func_80061A00.s @@ -83,7 +83,7 @@ glabel func_80061A00 /* 06272C 80061B2C 00000000 */ nop /* 062730 80061B30 01B17021 */ addu $t6, $t5, $s1 /* 062734 80061B34 8DC40000 */ lw $a0, ($t6) -/* 062738 80061B38 0C01C450 */ jal func_80071140 +/* 062738 80061B38 0C01C450 */ jal free_from_memory_pool /* 06273C 80061B3C 00000000 */ nop /* 062740 80061B40 26100001 */ addiu $s0, $s0, 1 /* 062744 80061B44 161EFFF8 */ bne $s0, $fp, .L80061B28 @@ -91,7 +91,7 @@ glabel func_80061A00 /* 06274C 80061B4C 8EA40044 */ lw $a0, 0x44($s5) /* 062750 80061B50 00000000 */ nop .L80061B54: -/* 062754 80061B54 0C01C450 */ jal func_80071140 +/* 062754 80061B54 0C01C450 */ jal free_from_memory_pool /* 062758 80061B58 00000000 */ nop /* 06275C 80061B5C AEA00044 */ sw $zero, 0x44($s5) /* 062760 80061B60 1000001E */ b .L80061BDC diff --git a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s index 0eccc382..4a78b9f1 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006A6B0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006A6B0.s @@ -206,10 +206,10 @@ glabel func_8006A6B0 /* 06B5B4 8006A9B4 00008825 */ move $s1, $zero .L8006A9B8: /* 06B5B8 8006A9B8 8E640000 */ lw $a0, ($s3) -/* 06B5BC 8006A9BC 0C01C450 */ jal func_80071140 +/* 06B5BC 8006A9BC 0C01C450 */ jal free_from_memory_pool /* 06B5C0 8006A9C0 00000000 */ nop /* 06B5C4 8006A9C4 8FA40044 */ lw $a0, 0x44($sp) -/* 06B5C8 8006A9C8 0C01C450 */ jal func_80071140 +/* 06B5C8 8006A9C8 0C01C450 */ jal free_from_memory_pool /* 06B5CC 8006A9CC 00000000 */ nop /* 06B5D0 8006A9D0 0C01DB16 */ jal load_asset_section_from_rom /* 06B5D4 8006A9D4 24040018 */ li $a0, 24 @@ -309,7 +309,7 @@ glabel func_8006A6B0 /* 06B738 8006AB38 AF0C000C */ sw $t4, 0xc($t8) .L8006AB3C: /* 06B73C 8006AB3C 8E640000 */ lw $a0, ($s3) -/* 06B740 8006AB40 0C01C450 */ jal func_80071140 +/* 06B740 8006AB40 0C01C450 */ jal free_from_memory_pool /* 06B744 8006AB44 00000000 */ nop /* 06B748 8006AB48 3C04800E */ lui $a0, %hi(D_800DD324) # $a0, 0x800e /* 06B74C 8006AB4C 8C84D324 */ lw $a0, %lo(D_800DD324)($a0) diff --git a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s index 50602948..7ec9491d 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006BFC8.s +++ b/asm/non_matchings/unknown_066AA0/func_8006BFC8.s @@ -106,7 +106,7 @@ glabel func_8006BFC8 /* 06CD40 8006C140 00402825 */ move $a1, $v0 /* 06CD44 8006C144 3C048012 */ lui $a0, %hi(D_80121160) # $a0, 0x8012 /* 06CD48 8006C148 8C841160 */ lw $a0, %lo(D_80121160)($a0) -/* 06CD4C 8006C14C 0C01C450 */ jal func_80071140 +/* 06CD4C 8006C14C 0C01C450 */ jal free_from_memory_pool /* 06CD50 8006C150 00000000 */ nop /* 06CD54 8006C154 8FBF001C */ lw $ra, 0x1c($sp) /* 06CD58 8006C158 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s index 8244f16d..990fb43b 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006ECFC.s +++ b/asm/non_matchings/unknown_066AA0/func_8006ECFC.s @@ -10,15 +10,15 @@ glabel func_8006ECFC /* 06F91C 8006ED1C 00802825 */ move $a1, $a0 /* 06F920 8006ED20 AC440000 */ sw $a0, ($v0) /* 06F924 8006ED24 00002025 */ move $a0, $zero -/* 06F928 8006ED28 0C01C42C */ jal func_800710B0 +/* 06F928 8006ED28 0C01C42C */ jal set_free_queue_state /* 06F92C 8006ED2C AFA50048 */ sw $a1, 0x48($sp) /* 06F930 8006ED30 3C118012 */ lui $s1, %hi(D_801211F0) # $s1, 0x8012 /* 06F934 8006ED34 263111F0 */ addiu $s1, %lo(D_801211F0) # addiu $s1, $s1, 0x11f0 /* 06F938 8006ED38 8E240000 */ lw $a0, ($s1) -/* 06F93C 8006ED3C 0C01C450 */ jal func_80071140 +/* 06F93C 8006ED3C 0C01C450 */ jal free_from_memory_pool /* 06F940 8006ED40 00000000 */ nop /* 06F944 8006ED44 8E240004 */ lw $a0, 4($s1) -/* 06F948 8006ED48 0C01C450 */ jal func_80071140 +/* 06F948 8006ED48 0C01C450 */ jal free_from_memory_pool /* 06F94C 8006ED4C 00000000 */ nop /* 06F950 8006ED50 8FA20048 */ lw $v0, 0x48($sp) /* 06F954 8006ED54 3C18800E */ lui $t8, %hi(D_800DD3E0) # $t8, 0x800e @@ -71,7 +71,7 @@ glabel func_8006ECFC .L8006EE10: /* 06FA10 8006EE10 12000004 */ beqz $s0, .L8006EE24 /* 06FA14 8006EE14 00000000 */ nop -/* 06FA18 8006EE18 0C01C450 */ jal func_80071140 +/* 06FA18 8006EE18 0C01C450 */ jal free_from_memory_pool /* 06FA1C 8006EE1C 02002025 */ move $a0, $s0 /* 06FA20 8006EE20 AE200000 */ sw $zero, ($s1) .L8006EE24: @@ -79,7 +79,7 @@ glabel func_8006ECFC /* 06FA28 8006EE28 00000000 */ nop /* 06FA2C 8006EE2C 10A00004 */ beqz $a1, .L8006EE40 /* 06FA30 8006EE30 00000000 */ nop -/* 06FA34 8006EE34 0C01C450 */ jal func_80071140 +/* 06FA34 8006EE34 0C01C450 */ jal free_from_memory_pool /* 06FA38 8006EE38 00A02025 */ move $a0, $a1 /* 06FA3C 8006EE3C AE200004 */ sw $zero, 4($s1) .L8006EE40: @@ -134,7 +134,7 @@ glabel func_8006ECFC /* 06FAFC 8006EEFC 8D8E0000 */ lw $t6, ($t4) /* 06FB00 8006EF00 3C018012 */ lui $at, %hi(D_80123534) # $at, 0x8012 /* 06FB04 8006EF04 24040002 */ li $a0, 2 -/* 06FB08 8006EF08 0C01C42C */ jal func_800710B0 +/* 06FB08 8006EF08 0C01C42C */ jal set_free_queue_state /* 06FB0C 8006EF0C AC2E3534 */ sw $t6, %lo(D_80123534)($at) .L8006EF10: /* 06FB10 8006EF10 3C038012 */ lui $v1, %hi(D_801234E8) # $v1, 0x8012 diff --git a/asm/non_matchings/unknown_066AA0/load_level.s b/asm/non_matchings/unknown_066AA0/load_level.s index aea2bd0d..a24c465e 100644 --- a/asm/non_matchings/unknown_066AA0/load_level.s +++ b/asm/non_matchings/unknown_066AA0/load_level.s @@ -277,7 +277,7 @@ glabel load_level /* 06C240 8006B640 A420D32C */ sh $zero, %lo(D_800DD32C)($at) /* 06C244 8006B644 8E240000 */ lw $a0, ($s1) /* 06C248 8006B648 00187880 */ sll $t7, $t8, 2 -/* 06C24C 8006B64C 0C01C450 */ jal func_80071140 +/* 06C24C 8006B64C 0C01C450 */ jal free_from_memory_pool /* 06C250 8006B650 AFAF0034 */ sw $t7, 0x34($sp) /* 06C254 8006B654 3C0D8012 */ lui $t5, %hi(D_80121160) # $t5, 0x8012 /* 06C258 8006B658 8DAD1160 */ lw $t5, %lo(D_80121160)($t5) @@ -299,7 +299,7 @@ glabel load_level .L8006B698: /* 06C298 8006B698 3C048012 */ lui $a0, %hi(D_80121160) # $a0, 0x8012 /* 06C29C 8006B69C 8C841160 */ lw $a0, %lo(D_80121160)($a0) -/* 06C2A0 8006B6A0 0C01C450 */ jal func_80071140 +/* 06C2A0 8006B6A0 0C01C450 */ jal free_from_memory_pool /* 06C2A4 8006B6A4 00000000 */ nop /* 06C2A8 8006B6A8 8E240000 */ lw $a0, ($s1) /* 06C2AC 8006B6AC 0C01AFF2 */ jal func_8006BFC8 diff --git a/asm/non_matchings/unknown_072E50/func_80073E1C.s b/asm/non_matchings/unknown_072E50/func_80073E1C.s index 4f344e58..0c3ab296 100644 --- a/asm/non_matchings/unknown_072E50/func_80073E1C.s +++ b/asm/non_matchings/unknown_072E50/func_80073E1C.s @@ -66,7 +66,7 @@ glabel func_80073E1C .L80073F14: /* 074B14 80073F14 8FA4002C */ lw $a0, 0x2c($sp) .L80073F18: -/* 074B18 80073F18 0C01C450 */ jal func_80071140 +/* 074B18 80073F18 0C01C450 */ jal free_from_memory_pool /* 074B1C 80073F1C AFA30028 */ sw $v1, 0x28($sp) /* 074B20 80073F20 8FA30028 */ lw $v1, 0x28($sp) /* 074B24 80073F24 00000000 */ nop diff --git a/asm/non_matchings/unknown_072E50/func_80073F5C.s b/asm/non_matchings/unknown_072E50/func_80073F5C.s index 5d1c91dd..774759b8 100644 --- a/asm/non_matchings/unknown_072E50/func_80073F5C.s +++ b/asm/non_matchings/unknown_072E50/func_80073F5C.s @@ -34,7 +34,7 @@ glabel func_80073F5C /* 074BDC 80073FDC 00401825 */ move $v1, $v0 .L80073FE0: /* 074BE0 80073FE0 8FA4002C */ lw $a0, 0x2c($sp) -/* 074BE4 80073FE4 0C01C450 */ jal func_80071140 +/* 074BE4 80073FE4 0C01C450 */ jal free_from_memory_pool /* 074BE8 80073FE8 AFA30028 */ sw $v1, 0x28($sp) /* 074BEC 80073FEC 8FA30028 */ lw $v1, 0x28($sp) /* 074BF0 80073FF0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80074018.s b/asm/non_matchings/unknown_072E50/func_80074018.s index 7d3afc38..62fef754 100644 --- a/asm/non_matchings/unknown_072E50/func_80074018.s +++ b/asm/non_matchings/unknown_072E50/func_80074018.s @@ -62,7 +62,7 @@ glabel func_80074018 .L80074100: /* 074D00 80074100 8FA4002C */ lw $a0, 0x2c($sp) .L80074104: -/* 074D04 80074104 0C01C450 */ jal func_80071140 +/* 074D04 80074104 0C01C450 */ jal free_from_memory_pool /* 074D08 80074108 AFA30028 */ sw $v1, 0x28($sp) /* 074D0C 8007410C 8FA30028 */ lw $v1, 0x28($sp) /* 074D10 80074110 00000000 */ nop diff --git a/asm/non_matchings/unknown_072E50/func_80074148.s b/asm/non_matchings/unknown_072E50/func_80074148.s index 4719917e..39b57d85 100644 --- a/asm/non_matchings/unknown_072E50/func_80074148.s +++ b/asm/non_matchings/unknown_072E50/func_80074148.s @@ -34,7 +34,7 @@ glabel func_80074148 /* 074DC8 800741C8 00401825 */ move $v1, $v0 .L800741CC: /* 074DCC 800741CC 8FA40034 */ lw $a0, 0x34($sp) -/* 074DD0 800741D0 0C01C450 */ jal func_80071140 +/* 074DD0 800741D0 0C01C450 */ jal free_from_memory_pool /* 074DD4 800741D4 AFA30030 */ sw $v1, 0x30($sp) /* 074DD8 800741D8 8FA30030 */ lw $v1, 0x30($sp) /* 074DDC 800741DC 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80074204.s b/asm/non_matchings/unknown_072E50/func_80074204.s index ce5eaef4..7dd1f9be 100644 --- a/asm/non_matchings/unknown_072E50/func_80074204.s +++ b/asm/non_matchings/unknown_072E50/func_80074204.s @@ -52,7 +52,7 @@ glabel func_80074204 /* 074EB8 800742B8 8FA40034 */ lw $a0, 0x34($sp) /* 074EBC 800742BC 0C01CC1B */ jal func_8007306C /* 074EC0 800742C0 02402825 */ move $a1, $s2 -/* 074EC4 800742C4 0C01C450 */ jal func_80071140 +/* 074EC4 800742C4 0C01C450 */ jal free_from_memory_pool /* 074EC8 800742C8 02402025 */ move $a0, $s2 /* 074ECC 800742CC 8FA50034 */ lw $a1, 0x34($sp) /* 074ED0 800742D0 8FA40030 */ lw $a0, 0x30($sp) diff --git a/asm/non_matchings/unknown_072E50/func_8007431C.s b/asm/non_matchings/unknown_072E50/func_8007431C.s index 1b3e2b46..d6c9009e 100644 --- a/asm/non_matchings/unknown_072E50/func_8007431C.s +++ b/asm/non_matchings/unknown_072E50/func_8007431C.s @@ -115,7 +115,7 @@ glabel func_8007431C /* 0750B0 800744B0 1612FFF7 */ bne $s0, $s2, .L80074490 /* 0750B4 800744B4 26310001 */ addiu $s1, $s1, 1 .L800744B8: -/* 0750B8 800744B8 0C01C450 */ jal func_80071140 +/* 0750B8 800744B8 0C01C450 */ jal free_from_memory_pool /* 0750BC 800744BC 02602025 */ move $a0, $s3 .L800744C0: /* 0750C0 800744C0 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_072E50/func_800744DC.s b/asm/non_matchings/unknown_072E50/func_800744DC.s index 9b23fc19..30e6cbd5 100644 --- a/asm/non_matchings/unknown_072E50/func_800744DC.s +++ b/asm/non_matchings/unknown_072E50/func_800744DC.s @@ -56,7 +56,7 @@ glabel func_800744DC /* 0751A0 800745A0 1612FFF7 */ bne $s0, $s2, .L80074580 /* 0751A4 800745A4 26310001 */ addiu $s1, $s1, 1 .L800745A8: -/* 0751A8 800745A8 0C01C450 */ jal func_80071140 +/* 0751A8 800745A8 0C01C450 */ jal free_from_memory_pool /* 0751AC 800745AC 02602025 */ move $a0, $s3 /* 0751B0 800745B0 00001025 */ move $v0, $zero .L800745B4: diff --git a/asm/non_matchings/unknown_072E50/func_800745D0.s b/asm/non_matchings/unknown_072E50/func_800745D0.s index 5f70acf5..303b3400 100644 --- a/asm/non_matchings/unknown_072E50/func_800745D0.s +++ b/asm/non_matchings/unknown_072E50/func_800745D0.s @@ -67,7 +67,7 @@ glabel func_800745D0 /* 0752C4 800746C4 0C01CD62 */ jal func_80073588 /* 0752C8 800746C8 24060002 */ li $a2, 2 .L800746CC: -/* 0752CC 800746CC 0C01C450 */ jal func_80071140 +/* 0752CC 800746CC 0C01C450 */ jal free_from_memory_pool /* 0752D0 800746D0 02402025 */ move $a0, $s2 /* 0752D4 800746D4 00001025 */ move $v0, $zero .L800746D8: diff --git a/asm/non_matchings/unknown_072E50/func_800746F0.s b/asm/non_matchings/unknown_072E50/func_800746F0.s index 752bb245..4aaa3765 100644 --- a/asm/non_matchings/unknown_072E50/func_800746F0.s +++ b/asm/non_matchings/unknown_072E50/func_800746F0.s @@ -66,7 +66,7 @@ glabel func_800746F0 /* 0753E0 800747E0 1611FFF4 */ bne $s0, $s1, .L800747B4 /* 0753E4 800747E4 00000000 */ nop .L800747E8: -/* 0753E8 800747E8 0C01C450 */ jal func_80071140 +/* 0753E8 800747E8 0C01C450 */ jal free_from_memory_pool /* 0753EC 800747EC 02402025 */ move $a0, $s2 /* 0753F0 800747F0 00001025 */ move $v0, $zero .L800747F4: diff --git a/asm/non_matchings/unknown_072E50/func_80074B34.s b/asm/non_matchings/unknown_072E50/func_80074B34.s index 431a7a31..66d52347 100644 --- a/asm/non_matchings/unknown_072E50/func_80074B34.s +++ b/asm/non_matchings/unknown_072E50/func_80074B34.s @@ -138,7 +138,7 @@ glabel func_80074B34 .L80074D24: /* 075924 80074D24 8FA40050 */ lw $a0, 0x50($sp) .L80074D28: -/* 075928 80074D28 0C01C450 */ jal func_80071140 +/* 075928 80074D28 0C01C450 */ jal free_from_memory_pool /* 07592C 80074D2C AFA7004C */ sw $a3, 0x4c($sp) /* 075930 80074D30 8FB90040 */ lw $t9, 0x40($sp) /* 075934 80074D34 8FA7004C */ lw $a3, 0x4c($sp) @@ -195,7 +195,7 @@ glabel func_80074B34 /* 0759FC 80074DFC 24070009 */ li $a3, 9 .L80074E00: /* 075A00 80074E00 8FA40050 */ lw $a0, 0x50($sp) -/* 075A04 80074E04 0C01C450 */ jal func_80071140 +/* 075A04 80074E04 0C01C450 */ jal free_from_memory_pool /* 075A08 80074E08 AFA7004C */ sw $a3, 0x4c($sp) /* 075A0C 80074E0C 8FA7004C */ lw $a3, 0x4c($sp) /* 075A10 80074E10 00000000 */ nop diff --git a/asm/non_matchings/unknown_072E50/func_80074EB8.s b/asm/non_matchings/unknown_072E50/func_80074EB8.s index d9fcc58d..a32f5bb0 100644 --- a/asm/non_matchings/unknown_072E50/func_80074EB8.s +++ b/asm/non_matchings/unknown_072E50/func_80074EB8.s @@ -82,7 +82,7 @@ glabel func_80074EB8 /* 075BDC 80074FDC 0C01D9B5 */ jal func_800766D4 /* 075BE0 80074FE0 AFAD0010 */ sw $t5, 0x10($sp) /* 075BE4 80074FE4 8FA40038 */ lw $a0, 0x38($sp) -/* 075BE8 80074FE8 0C01C450 */ jal func_80071140 +/* 075BE8 80074FE8 0C01C450 */ jal free_from_memory_pool /* 075BEC 80074FEC AFA20028 */ sw $v0, 0x28($sp) /* 075BF0 80074FF0 8FBF001C */ lw $ra, 0x1c($sp) /* 075BF4 80074FF4 8FA20028 */ lw $v0, 0x28($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80075000.s b/asm/non_matchings/unknown_072E50/func_80075000.s index bca530df..17cb6037 100644 --- a/asm/non_matchings/unknown_072E50/func_80075000.s +++ b/asm/non_matchings/unknown_072E50/func_80075000.s @@ -91,7 +91,7 @@ glabel func_80075000 /* 075D28 80075128 00408025 */ move $s0, $v0 /* 075D2C 8007512C 12000005 */ beqz $s0, .L80075144 /* 075D30 80075130 3C014748 */ lui $at, (0x47485353 >> 16) # lui $at, 0x4748 -/* 075D34 80075134 0C01C450 */ jal func_80071140 +/* 075D34 80075134 0C01C450 */ jal free_from_memory_pool /* 075D38 80075138 02402025 */ move $a0, $s2 /* 075D3C 8007513C 100000A0 */ b .L800753C0 /* 075D40 80075140 02001025 */ move $v0, $s0 @@ -260,12 +260,12 @@ glabel func_80075000 /* 075F98 80075398 0C01D9B5 */ jal func_800766D4 /* 075F9C 8007539C AFAD0010 */ sw $t5, 0x10($sp) /* 075FA0 800753A0 8FA40068 */ lw $a0, 0x68($sp) -/* 075FA4 800753A4 0C01C450 */ jal func_80071140 +/* 075FA4 800753A4 0C01C450 */ jal free_from_memory_pool /* 075FA8 800753A8 00408025 */ move $s0, $v0 /* 075FAC 800753AC 10000001 */ b .L800753B4 /* 075FB0 800753B0 00000000 */ nop .L800753B4: -/* 075FB4 800753B4 0C01C450 */ jal func_80071140 +/* 075FB4 800753B4 0C01C450 */ jal free_from_memory_pool /* 075FB8 800753B8 02402025 */ move $a0, $s2 /* 075FBC 800753BC 02001025 */ move $v0, $s0 .L800753C0: diff --git a/asm/non_matchings/unknown_072E50/func_800753D8.s b/asm/non_matchings/unknown_072E50/func_800753D8.s index 80aac262..25762857 100644 --- a/asm/non_matchings/unknown_072E50/func_800753D8.s +++ b/asm/non_matchings/unknown_072E50/func_800753D8.s @@ -190,13 +190,13 @@ glabel func_800753D8 /* 07627C 8007567C 00401825 */ move $v1, $v0 .L80075680: /* 076280 80075680 8FA40044 */ lw $a0, 0x44($sp) -/* 076284 80075684 0C01C450 */ jal func_80071140 +/* 076284 80075684 0C01C450 */ jal free_from_memory_pool /* 076288 80075688 AFA30040 */ sw $v1, 0x40($sp) /* 07628C 8007568C 8FA30040 */ lw $v1, 0x40($sp) /* 076290 80075690 00000000 */ nop .L80075694: /* 076294 80075694 8FA40048 */ lw $a0, 0x48($sp) -/* 076298 80075698 0C01C450 */ jal func_80071140 +/* 076298 80075698 0C01C450 */ jal free_from_memory_pool /* 07629C 8007569C AFA30040 */ sw $v1, 0x40($sp) /* 0762A0 800756A0 8FA30040 */ lw $v1, 0x40($sp) /* 0762A4 800756A4 10000007 */ b .L800756C4 diff --git a/asm/non_matchings/unknown_072E50/func_800756D4.s b/asm/non_matchings/unknown_072E50/func_800756D4.s index ecd413f1..31195ea5 100644 --- a/asm/non_matchings/unknown_072E50/func_800756D4.s +++ b/asm/non_matchings/unknown_072E50/func_800756D4.s @@ -123,7 +123,7 @@ glabel func_800756D4 /* 076488 80075888 1614FFDC */ bne $s0, $s4, .L800757FC /* 07648C 8007588C 26310004 */ addiu $s1, $s1, 4 .L80075890: -/* 076490 80075890 0C01C450 */ jal func_80071140 +/* 076490 80075890 0C01C450 */ jal free_from_memory_pool /* 076494 80075894 02402025 */ move $a0, $s2 .L80075898: /* 076498 80075898 8FA40070 */ lw $a0, 0x70($sp) diff --git a/asm/non_matchings/unknown_072E50/func_80075E60.s b/asm/non_matchings/unknown_072E50/func_80075E60.s index 3244dedf..c6115f3f 100644 --- a/asm/non_matchings/unknown_072E50/func_80075E60.s +++ b/asm/non_matchings/unknown_072E50/func_80075E60.s @@ -71,7 +71,7 @@ glabel func_80075E60 /* 076B60 80075F60 00000000 */ nop /* 076B64 80075F64 10800004 */ beqz $a0, .L80075F78 /* 076B68 80075F68 8FA60068 */ lw $a2, 0x68($sp) -/* 076B6C 80075F6C 0C01C450 */ jal func_80071140 +/* 076B6C 80075F6C 0C01C450 */ jal free_from_memory_pool /* 076B70 80075F70 00000000 */ nop /* 076B74 80075F74 8FA60068 */ lw $a2, 0x68($sp) .L80075F78: diff --git a/asm/non_matchings/unknown_072E50/func_80076388.s b/asm/non_matchings/unknown_072E50/func_80076388.s index 57bb1ce1..c8f57bf2 100644 --- a/asm/non_matchings/unknown_072E50/func_80076388.s +++ b/asm/non_matchings/unknown_072E50/func_80076388.s @@ -52,7 +52,7 @@ glabel func_80076388 /* 077048 80076448 10600008 */ beqz $v1, .L8007646C /* 07704C 8007644C 24060010 */ li $a2, 16 /* 077050 80076450 8FA4002C */ lw $a0, 0x2c($sp) -/* 077054 80076454 0C01C450 */ jal func_80071140 +/* 077054 80076454 0C01C450 */ jal free_from_memory_pool /* 077058 80076458 AFA30030 */ sw $v1, 0x30($sp) /* 07705C 8007645C 8FA30030 */ lw $v1, 0x30($sp) /* 077060 80076460 00104780 */ sll $t0, $s0, 0x1e @@ -83,7 +83,7 @@ glabel func_80076388 /* 0770C0 800764C0 004C1825 */ or $v1, $v0, $t4 .L800764C4: /* 0770C4 800764C4 8FA4002C */ lw $a0, 0x2c($sp) -/* 0770C8 800764C8 0C01C450 */ jal func_80071140 +/* 0770C8 800764C8 0C01C450 */ jal free_from_memory_pool /* 0770CC 800764CC AFA30030 */ sw $v1, 0x30($sp) /* 0770D0 800764D0 8FA20030 */ lw $v0, 0x30($sp) /* 0770D4 800764D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_072E50/load_asset_section_from_rom.s b/asm/non_matchings/unknown_072E50/load_asset_section_from_rom.s index b1711a5f..fed9dfc3 100644 --- a/asm/non_matchings/unknown_072E50/load_asset_section_from_rom.s +++ b/asm/non_matchings/unknown_072E50/load_asset_section_from_rom.s @@ -37,7 +37,7 @@ glabel func_80076CF0 /* 077978 80076D78 8FA9003C */ lw $t1, 0x3c($sp) /* 07797C 80076D7C 8FA40028 */ lw $a0, 0x28($sp) /* 077980 80076D80 00495021 */ addu $t2, $v0, $t1 -/* 077984 80076D84 0C01C450 */ jal func_80071140 +/* 077984 80076D84 0C01C450 */ jal free_from_memory_pool /* 077988 80076D88 AFAA002C */ sw $t2, 0x2c($sp) /* 07798C 80076D8C 8FAB002C */ lw $t3, 0x2c($sp) /* 077990 80076D90 8FAC003C */ lw $t4, 0x3c($sp) diff --git a/asm/non_matchings/unknown_07AF10/func_8007A7E8.s b/asm/non_matchings/unknown_07AF10/func_8007A7E8.s index e164bbac..aa00f8b4 100644 --- a/asm/non_matchings/unknown_07AF10/func_8007A7E8.s +++ b/asm/non_matchings/unknown_07AF10/func_8007A7E8.s @@ -12,7 +12,7 @@ glabel func_8007A7E8 /* 07B410 8007A810 0C01C54E */ jal func_80071538 /* 07B414 8007A814 AFA5002C */ sw $a1, 0x2c($sp) /* 07B418 8007A818 8E040000 */ lw $a0, ($s0) -/* 07B41C 8007A81C 0C01C450 */ jal func_80071140 +/* 07B41C 8007A81C 0C01C450 */ jal free_from_memory_pool /* 07B420 8007A820 00000000 */ nop /* 07B424 8007A824 8FA5002C */ lw $a1, 0x2c($sp) /* 07B428 8007A828 00000000 */ nop diff --git a/asm/non_matchings/unknown_07B870/func_8007B2BC.s b/asm/non_matchings/unknown_07B870/func_8007B2BC.s index 322493da..90388c10 100644 --- a/asm/non_matchings/unknown_07B870/func_8007B2BC.s +++ b/asm/non_matchings/unknown_07B870/func_8007B2BC.s @@ -24,7 +24,7 @@ glabel func_8007B2BC /* 07BF10 8007B310 14C90011 */ bne $a2, $t1, .L8007B358 /* 07BF14 8007B314 24420001 */ addiu $v0, $v0, 1 /* 07BF18 8007B318 00C02025 */ move $a0, $a2 -/* 07BF1C 8007B31C 0C01C450 */ jal func_80071140 +/* 07BF1C 8007B31C 0C01C450 */ jal free_from_memory_pool /* 07BF20 8007B320 AFB90018 */ sw $t9, 0x18($sp) /* 07BF24 8007B324 3C028012 */ lui $v0, %hi(D_80126328) # $v0, 0x8012 /* 07BF28 8007B328 24426328 */ addiu $v0, %lo(D_80126328) # addiu $v0, $v0, 0x6328 diff --git a/asm/non_matchings/unknown_07B870/func_8007C12C.s b/asm/non_matchings/unknown_07B870/func_8007C12C.s index 7318f321..f7ce60f8 100644 --- a/asm/non_matchings/unknown_07B870/func_8007C12C.s +++ b/asm/non_matchings/unknown_07B870/func_8007C12C.s @@ -220,7 +220,7 @@ glabel func_8007C12C /* 07D050 8007C450 25F8FFFF */ addiu $t8, $t7, -1 /* 07D054 8007C454 AC580000 */ sw $t8, ($v0) .L8007C458: -/* 07D058 8007C458 0C01C450 */ jal func_80071140 +/* 07D058 8007C458 0C01C450 */ jal free_from_memory_pool /* 07D05C 8007C45C 02602025 */ move $a0, $s3 /* 07D060 8007C460 10000029 */ b .L8007C508 /* 07D064 8007C464 00001025 */ move $v0, $zero diff --git a/asm/non_matchings/unknown_07B870/func_8007CCB0.s b/asm/non_matchings/unknown_07B870/func_8007CCB0.s index 34f6824c..8410712e 100644 --- a/asm/non_matchings/unknown_07B870/func_8007CCB0.s +++ b/asm/non_matchings/unknown_07B870/func_8007CCB0.s @@ -46,7 +46,7 @@ glabel func_8007CCB0 /* 07D958 8007CD58 1420FFF6 */ bnez $at, .L8007CD34 /* 07D95C 8007CD5C 26310004 */ addiu $s1, $s1, 4 .L8007CD60: -/* 07D960 8007CD60 0C01C450 */ jal func_80071140 +/* 07D960 8007CD60 0C01C450 */ jal free_from_memory_pool /* 07D964 8007CD64 02402025 */ move $a0, $s2 /* 07D968 8007CD68 3C028012 */ lui $v0, %hi(D_8012634C) # $v0, 0x8012 /* 07D96C 8007CD6C 2442634C */ addiu $v0, %lo(D_8012634C) # addiu $v0, $v0, 0x634c diff --git a/asm/non_matchings/unknown_09F8F0/func_800A003C.s b/asm/non_matchings/unknown_09F8F0/func_800A003C.s index c0b3cdc0..22634d1d 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800A003C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800A003C.s @@ -71,15 +71,15 @@ glabel func_800A003C /* 0A0D34 800A0134 3C148012 */ lui $s4, %hi(D_80126CF0) # $s4, 0x8012 /* 0A0D38 800A0138 8C846CE0 */ lw $a0, %lo(D_80126CE0)($a0) /* 0A0D3C 800A013C 26946CF0 */ addiu $s4, %lo(D_80126CF0) # addiu $s4, $s4, 0x6cf0 -/* 0A0D40 800A0140 0C01C450 */ jal func_80071140 +/* 0A0D40 800A0140 0C01C450 */ jal free_from_memory_pool /* 0A0D44 800A0144 26526CF4 */ addiu $s2, %lo(D_80126CF4) # addiu $s2, $s2, 0x6cf4 /* 0A0D48 800A0148 8E840000 */ lw $a0, ($s4) -/* 0A0D4C 800A014C 0C01C450 */ jal func_80071140 +/* 0A0D4C 800A014C 0C01C450 */ jal free_from_memory_pool /* 0A0D50 800A0150 00000000 */ nop /* 0A0D54 800A0154 3C018012 */ lui $at, %hi(D_80126CF8) # $at, 0x8012 /* 0A0D58 800A0158 AC206CF8 */ sw $zero, %lo(D_80126CF8)($at) /* 0A0D5C 800A015C 8E440000 */ lw $a0, ($s2) -/* 0A0D60 800A0160 0C01C450 */ jal func_80071140 +/* 0A0D60 800A0160 0C01C450 */ jal free_from_memory_pool /* 0A0D64 800A0164 00000000 */ nop /* 0A0D68 800A0168 0C004013 */ jal particlePtrList_flush /* 0A0D6C 800A016C 00000000 */ nop diff --git a/asm/non_matchings/unknown_09F8F0/func_800AB35C.s b/asm/non_matchings/unknown_09F8F0/func_800AB35C.s index 7bf293a6..72065244 100644 --- a/asm/non_matchings/unknown_09F8F0/func_800AB35C.s +++ b/asm/non_matchings/unknown_09F8F0/func_800AB35C.s @@ -4,7 +4,7 @@ glabel func_800AB35C /* 0ABF64 800AB364 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0ABF68 800AB368 10800005 */ beqz $a0, .L800AB380 /* 0ABF6C 800AB36C AFBF0014 */ sw $ra, 0x14($sp) -/* 0ABF70 800AB370 0C01C450 */ jal func_80071140 +/* 0ABF70 800AB370 0C01C450 */ jal free_from_memory_pool /* 0ABF74 800AB374 00000000 */ nop /* 0ABF78 800AB378 3C01800E */ lui $at, %hi(D_800E290C) # $at, 0x800e /* 0ABF7C 800AB37C AC20290C */ sw $zero, %lo(D_800E290C)($at) @@ -15,7 +15,7 @@ glabel func_800AB35C /* 0ABF8C 800AB38C 00000000 */ nop /* 0ABF90 800AB390 10800006 */ beqz $a0, .L800AB3AC /* 0ABF94 800AB394 00000000 */ nop -/* 0ABF98 800AB398 0C01C450 */ jal func_80071140 +/* 0ABF98 800AB398 0C01C450 */ jal free_from_memory_pool /* 0ABF9C 800AB39C 00000000 */ nop /* 0ABFA0 800AB3A0 3C02800E */ lui $v0, %hi(D_800E2914) # $v0, 0x800e /* 0ABFA4 800AB3A4 24422914 */ addiu $v0, %lo(D_800E2914) # addiu $v0, $v0, 0x2914 @@ -25,7 +25,7 @@ glabel func_800AB35C /* 0ABFB0 800AB3B0 00000000 */ nop /* 0ABFB4 800AB3B4 10800006 */ beqz $a0, .L800AB3D0 /* 0ABFB8 800AB3B8 00000000 */ nop -/* 0ABFBC 800AB3BC 0C01C450 */ jal func_80071140 +/* 0ABFBC 800AB3BC 0C01C450 */ jal free_from_memory_pool /* 0ABFC0 800AB3C0 00000000 */ nop /* 0ABFC4 800AB3C4 3C02800E */ lui $v0, %hi(D_800E2914) # $v0, 0x800e /* 0ABFC8 800AB3C8 24422914 */ addiu $v0, %lo(D_800E2914) # addiu $v0, $v0, 0x2914 @@ -36,7 +36,7 @@ glabel func_800AB35C /* 0ABFD8 800AB3D8 00000000 */ nop /* 0ABFDC 800AB3DC 10800005 */ beqz $a0, .L800AB3F4 /* 0ABFE0 800AB3E0 00000000 */ nop -/* 0ABFE4 800AB3E4 0C01C450 */ jal func_80071140 +/* 0ABFE4 800AB3E4 0C01C450 */ jal free_from_memory_pool /* 0ABFE8 800AB3E8 00000000 */ nop /* 0ABFEC 800AB3EC 3C01800E */ lui $at, %hi(D_800E28D4) # $at, 0x800e /* 0ABFF0 800AB3F0 AC2028D4 */ sw $zero, %lo(D_800E28D4)($at) @@ -47,7 +47,7 @@ glabel func_800AB35C /* 0AC000 800AB400 00000000 */ nop /* 0AC004 800AB404 10800006 */ beqz $a0, .L800AB420 /* 0AC008 800AB408 00000000 */ nop -/* 0AC00C 800AB40C 0C01C450 */ jal func_80071140 +/* 0AC00C 800AB40C 0C01C450 */ jal free_from_memory_pool /* 0AC010 800AB410 00000000 */ nop /* 0AC014 800AB414 3C02800E */ lui $v0, %hi(D_800E28D8) # $v0, 0x800e /* 0AC018 800AB418 244228D8 */ addiu $v0, %lo(D_800E28D8) # addiu $v0, $v0, 0x28d8 @@ -68,7 +68,7 @@ glabel func_800AB35C /* 0AC04C 800AB44C 00000000 */ nop /* 0AC050 800AB450 10800005 */ beqz $a0, .L800AB468 /* 0AC054 800AB454 00000000 */ nop -/* 0AC058 800AB458 0C01C450 */ jal func_80071140 +/* 0AC058 800AB458 0C01C450 */ jal free_from_memory_pool /* 0AC05C 800AB45C 00000000 */ nop /* 0AC060 800AB460 3C01800E */ lui $at, %hi(D_800E2910) # $at, 0x800e /* 0AC064 800AB464 AC202910 */ sw $zero, %lo(D_800E2910)($at) diff --git a/asm/non_matchings/unknown_0AEE70/func_800AE728.s b/asm/non_matchings/unknown_0AEE70/func_800AE728.s index 08217873..d5c4c1f2 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800AE728.s +++ b/asm/non_matchings/unknown_0AEE70/func_800AE728.s @@ -460,7 +460,7 @@ glabel func_800AE728 /* 0AF9D4 800AEDD4 1420FFEF */ bnez $at, .L800AED94 /* 0AF9D8 800AEDD8 24630004 */ addiu $v1, $v1, 4 .L800AEDDC: -/* 0AF9DC 800AEDDC 0C01C450 */ jal func_80071140 +/* 0AF9DC 800AEDDC 0C01C450 */ jal free_from_memory_pool /* 0AF9E0 800AEDE0 02402025 */ move $a0, $s2 /* 0AF9E4 800AEDE4 8FBF003C */ lw $ra, 0x3c($sp) .L800AEDE8: diff --git a/asm/non_matchings/unknown_0AEE70/func_800B2260.s b/asm/non_matchings/unknown_0AEE70/func_800B2260.s index a2933a4d..0dfcdd7d 100644 --- a/asm/non_matchings/unknown_0AEE70/func_800B2260.s +++ b/asm/non_matchings/unknown_0AEE70/func_800B2260.s @@ -31,7 +31,7 @@ glabel func_800B2260 /* 0B2ED0 800B22D0 8CA4000C */ lw $a0, 0xc($a1) /* 0B2ED4 800B22D4 00000000 */ nop .L800B22D8: -/* 0B2ED8 800B22D8 0C01C450 */ jal func_80071140 +/* 0B2ED8 800B22D8 0C01C450 */ jal free_from_memory_pool /* 0B2EDC 800B22DC AFA50018 */ sw $a1, 0x18($sp) /* 0B2EE0 800B22E0 8FA50018 */ lw $a1, 0x18($sp) /* 0B2EE4 800B22E4 00000000 */ nop diff --git a/asm/non_matchings/unknown_0B8920/func_800BBF78.s b/asm/non_matchings/unknown_0B8920/func_800BBF78.s index 8ef71035..fa103a8a 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BBF78.s +++ b/asm/non_matchings/unknown_0B8920/func_800BBF78.s @@ -177,7 +177,7 @@ glabel func_800BBF78 /* 0BCDF8 800BC1F8 272E0001 */ addiu $t6, $t9, 1 /* 0BCDFC 800BC1FC 10A00005 */ beqz $a1, .L800BC214 /* 0BCE00 800BC200 AE0E0000 */ sw $t6, ($s0) -/* 0BCE04 800BC204 0C01C450 */ jal func_80071140 +/* 0BCE04 800BC204 0C01C450 */ jal free_from_memory_pool /* 0BCE08 800BC208 00A02025 */ move $a0, $a1 /* 0BCE0C 800BC20C 8EE30000 */ lw $v1, ($s7) /* 0BCE10 800BC210 00000000 */ nop @@ -196,7 +196,7 @@ glabel func_800BBF78 /* 0BCE40 800BC240 00000000 */ nop /* 0BCE44 800BC244 10800003 */ beqz $a0, .L800BC254 /* 0BCE48 800BC248 00000000 */ nop -/* 0BCE4C 800BC24C 0C01C450 */ jal func_80071140 +/* 0BCE4C 800BC24C 0C01C450 */ jal free_from_memory_pool /* 0BCE50 800BC250 00000000 */ nop .L800BC254: /* 0BCE54 800BC254 8679001A */ lh $t9, 0x1a($s3) diff --git a/asm/non_matchings/unknown_0B8920/func_800BCC70.s b/asm/non_matchings/unknown_0B8920/func_800BCC70.s index df67d97e..6265dc90 100644 --- a/asm/non_matchings/unknown_0B8920/func_800BCC70.s +++ b/asm/non_matchings/unknown_0B8920/func_800BCC70.s @@ -41,7 +41,7 @@ glabel func_800BCC70 /* 0BD908 800BCD08 00000000 */ nop /* 0BD90C 800BCD0C 10800004 */ beqz $a0, .L800BCD20 /* 0BD910 800BCD10 8FAF0190 */ lw $t7, 0x190($sp) -/* 0BD914 800BCD14 0C01C450 */ jal func_80071140 +/* 0BD914 800BCD14 0C01C450 */ jal free_from_memory_pool /* 0BD918 800BCD18 00000000 */ nop /* 0BD91C 800BCD1C 8FAF0190 */ lw $t7, 0x190($sp) .L800BCD20: @@ -1069,13 +1069,13 @@ glabel func_800BCC70 /* 0BE800 800BDC00 018F6021 */ addu $t4, $t4, $t7 .L800BDC04: /* 0BE804 800BDC04 8FA400A8 */ lw $a0, 0xa8($sp) -/* 0BE808 800BDC08 0C01C450 */ jal func_80071140 +/* 0BE808 800BDC08 0C01C450 */ jal free_from_memory_pool /* 0BE80C 800BDC0C 00000000 */ nop /* 0BE810 800BDC10 8FA400A4 */ lw $a0, 0xa4($sp) -/* 0BE814 800BDC14 0C01C450 */ jal func_80071140 +/* 0BE814 800BDC14 0C01C450 */ jal free_from_memory_pool /* 0BE818 800BDC18 00000000 */ nop /* 0BE81C 800BDC1C 8FA400A0 */ lw $a0, 0xa0($sp) -/* 0BE820 800BDC20 0C01C450 */ jal func_80071140 +/* 0BE820 800BDC20 0C01C450 */ jal free_from_memory_pool /* 0BE824 800BDC24 00000000 */ nop /* 0BE828 800BDC28 8FBF0064 */ lw $ra, 0x64($sp) /* 0BE82C 800BDC2C C7B50018 */ lwc1 $f21, 0x18($sp) diff --git a/asm/non_matchings/unknown_0B8920/func_800C0724.s b/asm/non_matchings/unknown_0B8920/func_800C0724.s index 6ce7286f..6f8a6d86 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C0724.s +++ b/asm/non_matchings/unknown_0B8920/func_800C0724.s @@ -5,7 +5,7 @@ glabel func_800C0724 /* 0C1330 800C0730 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0C1334 800C0734 1080000B */ beqz $a0, .L800C0764 /* 0C1338 800C0738 AFBF0014 */ sw $ra, 0x14($sp) -/* 0C133C 800C073C 0C01C450 */ jal func_80071140 +/* 0C133C 800C073C 0C01C450 */ jal free_from_memory_pool /* 0C1340 800C0740 00000000 */ nop /* 0C1344 800C0744 3C02800E */ lui $v0, %hi(D_800E31C0) # $v0, 0x800e /* 0C1348 800C0748 3C03800E */ lui $v1, %hi(D_800E31C8) # $v1, 0x800e diff --git a/asm/non_matchings/unknown_0B8920/func_800C30CC.s b/asm/non_matchings/unknown_0B8920/func_800C30CC.s index 5895a8c7..55ed43f4 100644 --- a/asm/non_matchings/unknown_0B8920/func_800C30CC.s +++ b/asm/non_matchings/unknown_0B8920/func_800C30CC.s @@ -9,7 +9,7 @@ glabel func_800C30CC /* 0C3CE8 800C30E8 AFB00014 */ sw $s0, 0x14($sp) /* 0C3CEC 800C30EC 3C048013 */ lui $a0, %hi(D_8012A780) # $a0, 0x8013 /* 0C3CF0 800C30F0 8C84A780 */ lw $a0, %lo(D_8012A780)($a0) -/* 0C3CF4 800C30F4 0C01C450 */ jal func_80071140 +/* 0C3CF4 800C30F4 0C01C450 */ jal free_from_memory_pool /* 0C3CF8 800C30F8 00000000 */ nop /* 0C3CFC 800C30FC A2200000 */ sb $zero, ($s1) /* 0C3D00 800C3100 3C018013 */ lui $at, %hi(D_8012A789) # $at, 0x8013 diff --git a/src/audio.c b/src/audio.c index a3769e57..c0ce6845 100644 --- a/src/audio.c +++ b/src/audio.c @@ -202,7 +202,7 @@ void audio_init(u32 arg0){ alSndPNew(&audConfig); audioStartThread(); func_80000968(0); - func_80071140(reg_s2); + free_from_memory_pool(reg_s2); func_8000318C(10); D_800DC648 = 0; D_80115D40 = 0; diff --git a/src/memory.c b/src/memory.c index 265e9ece..89128947 100644 --- a/src/memory.c +++ b/src/memory.c @@ -79,7 +79,7 @@ typedef struct FreeQueueSlot { FreeQueueSlot gFreeQueue[256]; s32 gFreeQueueCount; -s32 D_80123DCC; +s32 gFreeQueueState; s32 D_80123DD0[64]; s32 D_80123ED0[64]; s32 D_80123FD0[8]; @@ -99,14 +99,13 @@ unk800B7D10 *get_stack_pointer(void); MemoryPoolSlot *allocate_from_memory_pool(s32, s32, u32); MemoryPoolSlot *new_memory_pool(MemoryPoolSlot *arg0, s32 size, s32 numSlots); -void func_800710B0(s32); +void set_free_queue_state(s32); void* allocate_from_main_pool_safe(s32, u32); s32 *func_8006F510(void); void func_8006F53C(s32*); - void func_80071440(void *dataAddress); - s32 get_memory_pool_index_containing_address(u8 *address); +void free_memory_pool_slot(s32 poolIndex, s32 slotIndex); /** * Creates the main memory pool. @@ -118,7 +117,7 @@ void init_main_memory_pool(void) { // Create the main memory pool. new_memory_pool(&D_8012D3F0, RAM_END - (s32)(&D_8012D3F0), MAIN_POOL_SLOT_COUNT); } - func_800710B0(2); + set_free_queue_state(2); gFreeQueueCount = 0; } @@ -176,6 +175,10 @@ MemoryPoolSlot *new_memory_pool(MemoryPoolSlot *slots, s32 poolSize, s32 numSlot GLOBAL_ASM("asm/non_matchings/memory/new_memory_pool.s") #endif +/** + * Reserves and returns memory from the main memory pool. Has 2 assert checks. + * Will cause an exception if the size is 0 or if memory cannot be reserved. + */ void *allocate_from_main_pool_safe(s32 size, u32 colorTag) { void *temp_v0; if (size == 0) { @@ -188,6 +191,9 @@ void *allocate_from_main_pool_safe(s32 size, u32 colorTag) { return temp_v0; } +/** + * Reserves and returns memory from the main memory pool. Has no assert checks. + */ MemoryPoolSlot *allocate_from_main_pool(s32 size, u32 colorTag) { return allocate_from_memory_pool(0, size, colorTag); } @@ -288,10 +294,14 @@ GLOBAL_ASM("asm/non_matchings/memory/allocate_at_address_in_main_pool.s") void free_slot_containing_address(u8 *address); -void func_800710B0(s32 arg0) { +/** + * Sets the state of the free queue. State is either 0, 1, or 2. + * The free queue will get flushed if the state is set to 0. + */ +void set_free_queue_state(s32 state) { s32 *sp2C = func_8006F510(); - D_80123DCC = arg0; - if (arg0 == 0) { + gFreeQueueState = state; + if (state == 0) { // flush free queue if state is 0. while (gFreeQueueCount > 0) { free_slot_containing_address(gFreeQueue[--gFreeQueueCount].dataAddress); } @@ -299,10 +309,13 @@ void func_800710B0(s32 arg0) { func_8006F53C(sp2C); } -// This function seems to take in both TextureHeader and LevelHeader. -void func_80071140(void *data) { +/** + * Unallocates data from the pool that contains the data. Will free immediately if the free queue + * state is set to 0, otherwise the data will just be marked for deletion. + */ +void free_from_memory_pool(void *data) { s32 *sp1C = func_8006F510(); - if (D_80123DCC == 0) { + if (gFreeQueueState == 0) { free_slot_containing_address(data); } else { func_80071440(data); @@ -312,8 +325,6 @@ void func_80071140(void *data) { GLOBAL_ASM("asm/non_matchings/memory/func_80071198.s") -void free_memory_pool_slot(s32 poolIndex, s32 slotIndex); - #ifdef NON_MATCHING void free_slot_containing_address(u8 *address) { s32 poolIndex; @@ -368,7 +379,7 @@ GLOBAL_ASM("asm/non_matchings/memory/free_slot_containing_address.s") void func_80071440(void* data) { gFreeQueue[gFreeQueueCount].dataAddress = data; - gFreeQueue[gFreeQueueCount].unk4 = D_80123DCC; + gFreeQueue[gFreeQueueCount].unk4 = gFreeQueueState; gFreeQueueCount++; } @@ -420,6 +431,9 @@ s32 func_80071538(u8 *address) { return 0; } +/** + * Returns the index of the memory pool containing the memory address. + */ s32 get_memory_pool_index_containing_address(u8 *address) { s32 i; MemoryPool *pool; diff --git a/src/menu.c b/src/menu.c index 08570ff7..d78b0fd4 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1529,7 +1529,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_8007F900.s") void func_8007FF88(void) { if (D_800E1DAC[0] != NULL) { - func_80071140(D_800E1DAC[0]); + free_from_memory_pool(D_800E1DAC[0]); D_800E1DAC[0] = NULL; } D_800E1DAC[1] = NULL; @@ -2491,8 +2491,8 @@ void func_80087EB8(void) { func_8007FF88(); func_8009C4A8(D_800DFC78); func_800C5494(7); - func_80071140(D_80126A0C); - func_80071140(D_80126A64); + free_from_memory_pool(D_80126A0C); + free_from_memory_pool(D_80126A64); } GLOBAL_ASM("asm/non_matchings/menu/func_80087F14.s") @@ -2624,7 +2624,7 @@ GLOBAL_ASM("asm/non_matchings/menu/func_800890AC.s") void func_800895A4(void) { func_8009C508(0x3F); - func_80071140(D_80126AA0[0]); + free_from_memory_pool(D_80126AA0[0]); func_800C422C(2); } @@ -2999,9 +2999,9 @@ void func_8008BFE8(s32 arg0, s8 *arg1, s32 arg2, u16 arg3, u16 arg4) { void func_8008C128(void) { func_8009C4A8((s16*)&D_800DFDC8); - func_800710B0(0); + set_free_queue_state(0); func_800C422C(2); - func_800710B0(2); + set_free_queue_state(2); D_800DFFD0 = 0; } @@ -3399,9 +3399,9 @@ void func_8008F534(void) { func_80066894(0, 0); func_8009C4A8(D_800E07C4); - func_800710B0(0); - func_80071140(D_800E0970); - func_800710B0(2); + set_free_queue_state(0); + free_from_memory_pool(D_800E0970); + set_free_queue_state(2); for(i = 0; i < 15; i += 3){ if (D_800E0710[i] != -1) { func_8009C508(D_800E0710[i]); @@ -4316,9 +4316,9 @@ void func_8009C508(s32 arg0) { if (D_80126750[arg0] != 0) { if (D_80126550[arg0] != 0) { if ((((*D_800DF750)[arg0] & 0xC000) == 0xC000) && (D_80126550[arg0] != 0)) { - func_800710B0(0); + set_free_queue_state(0); func_8007B2BC((u32)D_80126550[arg0]); - func_800710B0(2); + set_free_queue_state(2); } else { if ((*D_800DF750)[arg0] & 0x8000) { func_8007CCB0((u32)D_80126550[arg0]); @@ -4338,11 +4338,11 @@ void func_8009C508(s32 arg0) { } if (D_800DF758 == 0) { if (D_800DF75C != NULL) { - func_80071140(D_800DF75C); + free_from_memory_pool(D_800DF75C); D_800DF75C = NULL; } if (*D_800DF750 != NULL) { - func_80071140(*D_800DF750); + free_from_memory_pool(*D_800DF750); *D_800DF750 = NULL; D_800DF754 = (u16)0; } diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 99f85b46..34790106 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -119,7 +119,7 @@ void audioNewThread(ALSynConfig* c, OSPri p, s32 arg2){ c->params = reg_s0; c[1].maxVVoices = 0; alInit(&ALGlobals_801161D0, c); - func_80071140(reg_s0); + free_from_memory_pool(reg_s0); } else{ alInit(&ALGlobals_801161D0, c); diff --git a/src/unknown_00BC20.c b/src/unknown_00BC20.c index d13bbdc8..8b0a58b1 100644 --- a/src/unknown_00BC20.c +++ b/src/unknown_00BC20.c @@ -306,7 +306,7 @@ s32 *func_8001E29C(s32 arg0); void func_8000B290(){ if(D_800DC754){ - func_80071140(); + free_from_memory_pool(); } func_8001E29C(20); /*{ @@ -490,8 +490,8 @@ void func_8000C604(void) { objCount = 0; D_8011AE60 = 0; func_8000C460(); - func_80071140(D_8011AEB0[0]); - func_80071140(D_8011AEB0[1]); + free_from_memory_pool(D_8011AEB0[0]); + free_from_memory_pool(D_8011AEB0[1]); } GLOBAL_ASM("asm/non_matchings/unknown_00BC20/func_8000C718.s") @@ -500,7 +500,7 @@ void func_8000C844(s32 arg0) { if ((*D_8011AE4C)[arg0] != 0) { (*D_8011AE4C)[arg0]--; if ((*D_8011AE4C)[arg0] == 0) { - func_80071140((*D_8011AE48)[arg0]); + free_from_memory_pool((*D_8011AE48)[arg0]); } } } diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index e99cbd08..fbf80e99 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -315,8 +315,8 @@ GLOBAL_ASM("asm/non_matchings/unknown_0255E0/func_80025510.s") void func_800257D0(void) { if (D_800DC924 != 0) { - func_80071140(D_8011D474); - func_80071140(D_800DC924); + free_from_memory_pool(D_8011D474); + free_from_memory_pool(D_800DC924); D_800DC924 = 0; } } diff --git a/src/unknown_032760.c b/src/unknown_032760.c index 28b4033b..2ac610f0 100644 --- a/src/unknown_032760.c +++ b/src/unknown_032760.c @@ -29,7 +29,7 @@ s32 D_8011D4CC; void func_80031B60(void) { if (D_800DC950 != 0) { - func_80071140(D_800DC950); + free_from_memory_pool(D_800DC950); D_800DC950 = 0; D_800DC954 = 0; D_800DC960 = 0; diff --git a/src/unknown_043920.c b/src/unknown_043920.c index dd72ce96..64510221 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -569,7 +569,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_043920/func_80059A68.s") void func_80059B4C(void) { if (D_8011D598 != 0) { - func_80071140(D_8011D598); + free_from_memory_pool(D_8011D598); } D_8011D598 = 0; } diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index a10365ad..fffabbf8 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -391,13 +391,13 @@ void load_level(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { } D_800DD32C = 0; if (sp44 != arg0) { - func_80071140(gCurrentLevelHeader); + free_from_memory_pool(gCurrentLevelHeader); offset = D_80121160[arg0]; size = D_80121160[arg0 + 1] - offset; gCurrentLevelHeader = allocate_from_main_pool_safe(size, COLOR_TAG_YELLOW); load_asset_to_address(ASSET_LEVEL_HEADERS, gCurrentLevelHeader, offset, size); } - func_80071140(D_80121160); + free_from_memory_pool(D_80121160); func_8006BFC8(&gCurrentLevelHeader->unk20); func_8000CBC0(); D_80121164 = arg0; @@ -561,7 +561,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BDDC.s") void func_8006BEFC(void) { func_8006C164(); func_80077B34(0, 0, 0); - func_80071140(gCurrentLevelHeader); + free_from_memory_pool(gCurrentLevelHeader); func_800049D8(); func_80001844(); func_800018E0(); @@ -630,14 +630,14 @@ void func_8006BFC8(s8 *arg0) { temp = D_80121160[phi_s0 + 1] - temp2; D_801211C0[0] = allocate_from_main_pool_safe(temp, COLOR_TAG_YELLOW); load_asset_to_address(ASSET_UNKNOWN_0, D_801211C0[0], temp2, temp); - func_80071140(D_80121160); + free_from_memory_pool(D_80121160); } #else GLOBAL_ASM("asm/non_matchings/unknown_066AA0/func_8006BFC8.s") #endif void func_8006C164(void) { - func_80071140(D_801211C0[0]); + free_from_memory_pool(D_801211C0[0]); } s32 func_8006C18C(void) { @@ -916,7 +916,7 @@ void func_8006CAE4(s32 arg0, s32 arg1, s32 arg2) { */ void load_level_2(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId) { func_8006ECFC(numberOfPlayers); - func_800710B0(0); + set_free_queue_state(0); func_80065EA0(); func_800C3048(); load_level(levelId, numberOfPlayers, entranceId, vehicleId, D_80123508); @@ -924,12 +924,12 @@ void load_level_2(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleI func_800AE728(8, 0x10, 0x96, 0x64, 0x32, 0); func_8001BF20(); osSetTime(0); - func_800710B0(2); + set_free_queue_state(2); func_80072298(1); } void func_8006CC14(void) { - func_800710B0(0); + set_free_queue_state(0); if (D_800DD38C == 0) { if (D_800DD3F0 != 1) { func_80077A54(); @@ -944,7 +944,7 @@ void func_8006CC14(void) { D_801211F8 = D_801211F0[D_801234E8]; fast3d_cmd(D_801211F8++, 0xE9000000, 0x00000000) fast3d_cmd(D_801211F8++, 0xB8000000, 0x00000000) - func_800710B0(2); + set_free_queue_state(2); } // Has a jump table @@ -1046,7 +1046,7 @@ s32 func_8006DB2C(void) { * Needs a better name! */ void load_level_3(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleId, s32 cutsceneId) { - func_800710B0(0); + set_free_queue_state(0); func_80065EA0(); func_800C3048(); load_level(levelId, numberOfPlayers, entranceId, vehicleId, cutsceneId); @@ -1054,19 +1054,19 @@ void load_level_3(s32 levelId, s32 numberOfPlayers, s32 entranceId, s32 vehicleI func_800AE728(4, 4, 0x6E, 0x30, 0x20, 0); func_8001BF20(); osSetTime(0); - func_800710B0(2); + set_free_queue_state(2); } void func_8006DBE4(void) { if (D_80123514 == 0) { D_80123514 = 1; - func_800710B0(0); + set_free_queue_state(0); func_8006BEFC(); func_800C01D8(&D_800DD3F4); func_800AE270(); func_800A003C(); func_800C30CC(); - func_800710B0(2); + set_free_queue_state(2); } D_80123514 = 0; } diff --git a/src/unknown_072E50.c b/src/unknown_072E50.c index 38097260..b97ccc61 100644 --- a/src/unknown_072E50.c +++ b/src/unknown_072E50.c @@ -133,7 +133,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_072E50/func_80075E60.s") void func_80076164(void) { if (D_800DE440 != 0) { - func_80071140(D_800DE440); + free_from_memory_pool(D_800DE440); } D_800DE440 = 0; } @@ -171,6 +171,6 @@ s32 func_80076AF4(s32 arg0, s32 arg1) { break; } } - func_80071140(temp); + free_from_memory_pool(temp); return ret; } diff --git a/src/unknown_0777A0.c b/src/unknown_0777A0.c index b44545e3..893be5c0 100644 --- a/src/unknown_0777A0.c +++ b/src/unknown_0777A0.c @@ -88,7 +88,7 @@ u8 *func_80076CF0(u32 assetIndex, s32 arg1) { dmacopy(temp_a0, temp_v0_2, 8); sp2C = byteswap32(temp_v0_2) + arg1; - func_80071140(temp_v0_2); + free_from_memory_pool(temp_v0_2); temp_v0_3 = (u8*)allocate_from_main_pool_safe(sp2C + arg1, COLOR_TAG_GRAY); if (temp_v0_3 == NULL) { diff --git a/src/unknown_080240.c b/src/unknown_080240.c index 6ce93102..5b7c94bc 100644 --- a/src/unknown_080240.c +++ b/src/unknown_080240.c @@ -36,7 +36,7 @@ u32 func_8007F640(s32 arg0) { count--; if (count == 0) { - func_80071140(lut); + free_from_memory_pool(lut); return 0x80100000; } else { if (arg0 < 0 || arg0 >= count) { @@ -49,7 +49,7 @@ u32 func_8007F640(s32 arg0) { someAddr = allocate_from_main_pool_safe(size, COLOR_TAG_BLUE); load_asset_to_address(ASSET_EMPTY_10, someAddr, start, size); - func_80071140(lut); + free_from_memory_pool(lut); return someAddr; } diff --git a/src/unknown_0AEE70.c b/src/unknown_0AEE70.c index 686eb380..26c578ff 100644 --- a/src/unknown_0AEE70.c +++ b/src/unknown_0AEE70.c @@ -223,60 +223,60 @@ void func_800AE2D8(void) { phi_s1 += 1; } while (phi_s0 < D_800E2E64); } - func_80071140(D_800E2E60); + free_from_memory_pool(D_800E2E60); D_800E2E60 = 0; } } void func_800AE374(void) { if (D_800E2CA8 != NULL) { - func_80071140(D_800E2CA8); + free_from_memory_pool(D_800E2CA8); D_800E2CA8 = NULL; } if (D_800E2CB4 != NULL) { - func_80071140(D_800E2CB4); + free_from_memory_pool(D_800E2CB4); D_800E2CB4 = NULL; } if (D_800E2CC0 != NULL) { - func_80071140(D_800E2CC0); + free_from_memory_pool(D_800E2CC0); D_800E2CC0 = NULL; } if (D_800E2CCC != NULL) { - func_80071140(D_800E2CCC); + free_from_memory_pool(D_800E2CCC); D_800E2CCC = NULL; } if (D_800E2CD8 != NULL) { - func_80071140(D_800E2CD8); + free_from_memory_pool(D_800E2CD8); D_800E2CD8 = NULL; } } void func_800AE438(void) { if (D_800E2CE0 != NULL) { - func_80071140(D_800E2CE0); + free_from_memory_pool(D_800E2CE0); D_800E2CE0 = NULL; } if (D_800E2CE4 != NULL) { - func_80071140(D_800E2CE4); + free_from_memory_pool(D_800E2CE4); D_800E2CE4 = NULL; } } void func_800AE490(void) { if (D_800E2CEC != NULL) { - func_80071140(D_800E2CEC); + free_from_memory_pool(D_800E2CEC); D_800E2CEC = NULL; } if (D_800E2CF0 != NULL) { - func_80071140(D_800E2CF0); + free_from_memory_pool(D_800E2CF0); D_800E2CF0 = NULL; } if (D_800E2CF8 != NULL) { - func_80071140(D_800E2CF8); + free_from_memory_pool(D_800E2CF8); D_800E2CF8 = NULL; } if (D_800E2CFC != NULL) { - func_80071140(D_800E2CFC); + free_from_memory_pool(D_800E2CFC); D_800E2CFC = NULL; } } diff --git a/src/unknown_0B8920.c b/src/unknown_0B8920.c index 0129a87a..1188c05e 100644 --- a/src/unknown_0B8920.c +++ b/src/unknown_0B8920.c @@ -122,34 +122,34 @@ extern s32 D_8012A0DC; /*****************************/ u8* allocate_from_main_pool_safe(s32 arg0, s32 arg1); -void func_80071140(s32* arg0); +void free_from_memory_pool(s32* arg0); void func_8007B2BC(s32* arg0); void func_800C5494(s32 arg0); void func_800C5620(s32 arg0); void func_800B7D20(void) { if (D_800E3040 != NULL) { - func_80071140(D_800E3040); + free_from_memory_pool(D_800E3040); D_800E3040 = NULL; } if (D_800E3044 != NULL) { - func_80071140(D_800E3044); + free_from_memory_pool(D_800E3044); D_800E3044 = NULL; } if (D_800E3048 != NULL) { - func_80071140(D_800E3048); + free_from_memory_pool(D_800E3048); D_800E3048 = NULL; } if (D_800E304C != NULL) { - func_80071140(D_800E304C); + free_from_memory_pool(D_800E304C); D_800E304C = NULL; } if (D_800E3070[0] != NULL) { - func_80071140(D_800E3070[0]); + free_from_memory_pool(D_800E3070[0]); D_800E3070[0] = NULL; } if (D_800E3080[0] != NULL) { - func_80071140(D_800E3080[0]); + free_from_memory_pool(D_800E3080[0]); D_800E3080[0] = NULL; } if (D_800E30D0 != NULL) { @@ -157,15 +157,15 @@ void func_800B7D20(void) { D_800E30D0 = NULL; } if (D_800E30D4 != NULL) { - func_80071140(D_800E30D4); + free_from_memory_pool(D_800E30D4); D_800E30D4 = NULL; } if (D_800E30D8 != NULL) { - func_80071140(D_800E30D8); + free_from_memory_pool(D_800E30D8); D_800E30D8 = NULL; } if (D_800E3178 != NULL) { - func_80071140(D_800E3178); + free_from_memory_pool(D_800E3178); D_800E3178 = NULL; } D_800E3190 = NULL; diff --git a/src/unknown_0C0D70.c b/src/unknown_0C0D70.c index 717f0453..0403cf6f 100644 --- a/src/unknown_0C0D70.c +++ b/src/unknown_0C0D70.c @@ -225,7 +225,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C28E8.s") GLOBAL_ASM("asm/non_matchings/unknown_0B8920/func_800C29F0.s") void func_800C2AB4(void) { - func_80071140(D_8012A7C8); + free_from_memory_pool(D_8012A7C8); D_8012A7B6 = (u16)0; func_800C5620(6); func_800C5494(6);