From e8774ab1632dbe680c82e617b02dea23fd0088a0 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 22 Nov 2020 11:14:56 -0500 Subject: [PATCH] UnkFunc2 --- .../pra_01/D4D060/func_80240020_D4D060.s | 18 ------------------ .../pra_01/D4D060/func_80240128_D4D168.s | 18 +++++++++--------- .../pra_01/D4D060/func_80240EB8_D4DEF8.s | 18 ------------------ .../pra_02/D50010/func_80240020_D50010.s | 18 ------------------ .../pra_02/D50010/func_80240128_D50118.s | 2 +- .../pra_05/D55BD0/func_80240020_D55BD0.s | 18 ------------------ .../pra_05/D55BD0/func_80240128_D55CD8.s | 2 +- .../pra_06/D57430/func_80240050_D57480.s | 18 ------------------ .../pra_06/D57430/func_80240158_D57588.s | 2 +- .../pra_09/D588B0/func_80240020_D588B0.s | 18 ------------------ .../pra_09/D588B0/func_80240128_D589B8.s | 2 +- .../pra_10/D5F2D0/func_80240020_D5F2D0.s | 18 ------------------ .../pra_10/D5F2D0/func_80240128_D5F3D8.s | 2 +- .../pra_11/D61520/func_80240020_D61520.s | 18 ------------------ .../pra_11/D61520/func_80240128_D61628.s | 2 +- .../pra_12/D62D10/func_80240050_D62D60.s | 18 ------------------ .../pra_12/D62D10/func_80240158_D62E68.s | 2 +- .../pra_13/D64600/func_80240020_D64600.s | 18 ------------------ .../pra_13/D64600/func_80240128_D64708.s | 2 +- .../pra_14/D67D20/func_80240020_D67D20.s | 18 ------------------ .../pra_14/D67D20/func_80240128_D67E28.s | 2 +- .../pra_16/D69B40/func_80240020_D69B40.s | 18 ------------------ .../pra_16/D69B40/func_80240128_D69C48.s | 2 +- .../pra_18/D6B640/func_80240020_D6B640.s | 18 ------------------ .../pra_18/D6B640/func_80240128_D6B748.s | 2 +- .../pra_19/D6E9D0/func_80240020_D6E9D0.s | 18 ------------------ .../pra_19/D6E9D0/func_80240128_D6EAD8.s | 2 +- .../pra_20/D763C0/func_80240020_D763C0.s | 18 ------------------ .../pra_20/D763C0/func_80240128_D764C8.s | 2 +- .../pra_27/D799F0/func_80240050_D79A40.s | 18 ------------------ .../pra_27/D799F0/func_80240158_D79B48.s | 2 +- .../pra_28/D7B2A0/func_80240050_D7B2F0.s | 18 ------------------ .../pra_28/D7B2A0/func_80240158_D7B3F8.s | 2 +- .../pra_29/D7CB70/func_80240020_D7CB70.s | 18 ------------------ .../pra_29/D7CB70/func_80240128_D7CC78.s | 2 +- .../pra_33/D89700/func_80240020_D89700.s | 18 ------------------ .../pra_33/D89700/func_80240128_D89808.s | 2 +- .../pra_34/D8B3D0/func_80240020_D8B3D0.s | 18 ------------------ .../pra_34/D8B3D0/func_80240128_D8B4D8.s | 2 +- .../pra_35/D8D270/func_80240020_D8D270.s | 18 ------------------ .../pra_35/D8D270/func_80240128_D8D378.s | 2 +- .../pra_36/D91700/func_80240050_D91750.s | 18 ------------------ .../pra_36/D91700/func_80240158_D91858.s | 2 +- .../pra_37/D92F40/func_80240050_D92F90.s | 18 ------------------ .../pra_37/D92F40/func_80240158_D93098.s | 2 +- .../pra_38/D955F0/func_80240050_D95640.s | 18 ------------------ .../pra_38/D955F0/func_80240158_D95748.s | 2 +- .../pra_39/D97890/func_80240050_D978E0.s | 18 ------------------ .../pra_39/D97890/func_80240158_D979E8.s | 2 +- .../pra_40/D999D0/func_80240020_D999D0.s | 18 ------------------ .../pra_40/D999D0/func_80240128_D99AD8.s | 2 +- src/world/area_pra/pra_01/D4D060.c | 4 ++-- src/world/area_pra/pra_02/D50010.c | 2 +- src/world/area_pra/pra_05/D55BD0.c | 2 +- src/world/area_pra/pra_06/D57430.c | 2 +- src/world/area_pra/pra_09/D588B0.c | 2 +- src/world/area_pra/pra_10/D5F2D0.c | 2 +- src/world/area_pra/pra_11/D61520.c | 2 +- src/world/area_pra/pra_12/D62D10.c | 2 +- src/world/area_pra/pra_13/D64600.c | 2 +- src/world/area_pra/pra_14/D67D20.c | 2 +- src/world/area_pra/pra_16/D69B40.c | 2 +- src/world/area_pra/pra_18/D6B640.c | 2 +- src/world/area_pra/pra_19/D6E9D0.c | 2 +- src/world/area_pra/pra_20/D763C0.c | 2 +- src/world/area_pra/pra_27/D799F0.c | 2 +- src/world/area_pra/pra_28/D7B2A0.c | 2 +- src/world/area_pra/pra_29/D7CB70.c | 2 +- src/world/area_pra/pra_33/D89700.c | 2 +- src/world/area_pra/pra_34/D8B3D0.c | 2 +- src/world/area_pra/pra_35/D8D270.c | 2 +- src/world/area_pra/pra_36/D91700.c | 2 +- src/world/area_pra/pra_37/D92F40.c | 2 +- src/world/area_pra/pra_38/D955F0.c | 2 +- src/world/area_pra/pra_39/D97890.c | 2 +- src/world/area_pra/pra_40/D999D0.c | 2 +- src/world/common/UnkFunc2.inc.c | 13 +++++++++++++ 77 files changed, 72 insertions(+), 527 deletions(-) delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s delete mode 100644 asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s create mode 100644 src/world/common/UnkFunc2.inc.c diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s deleted file mode 100644 index 342a1ce077..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240020_D4D060.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D4D060 -/* D4D060 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D4D064 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D4D068 80240028 00822024 */ and $a0, $a0, $v0 -/* D4D06C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D4D070 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D4D074 80240034 00821821 */ addu $v1, $a0, $v0 -/* D4D078 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D4D07C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D4D080 80240040 30620001 */ andi $v0, $v1, 1 -/* D4D084 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D4D088 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D4D08C 8024004C 03E00008 */ jr $ra -/* D4D090 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s index 9ce76f12ab..ebb2f85cdb 100644 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s +++ b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240128_D4D168.s @@ -16,7 +16,7 @@ glabel func_80240128_D4D168 /* D4D194 80240154 27B20020 */ addiu $s2, $sp, 0x20 /* D4D198 80240158 8E0400CC */ lw $a0, 0xcc($s0) /* D4D19C 8024015C 0C044181 */ jal get_shadow_by_index -/* D4D1A0 80240160 00000000 */ nop +/* D4D1A0 80240160 00000000 */ nop /* D4D1A4 80240164 0C048B77 */ jal func_80122DDC /* D4D1A8 80240168 84440008 */ lh $a0, 8($v0) /* D4D1AC 8024016C 8C430000 */ lw $v1, ($v0) @@ -37,23 +37,23 @@ glabel func_80240128_D4D168 /* D4D1E8 802401A8 0C00B94E */ jal get_screen_coords /* D4D1EC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D4D1F0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D4D1F4 802401B4 0C090008 */ jal func_80240020_D4D060 -/* D4D1F8 802401B8 00000000 */ nop +/* D4D1F4 802401B4 0C090008 */ jal UnkFunc2 +/* D4D1F8 802401B8 00000000 */ nop /* D4D1FC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D4D200 802401C0 3C014307 */ lui $at, 0x4307 /* D4D204 802401C4 44810000 */ mtc1 $at, $f0 -/* D4D208 802401C8 00000000 */ nop +/* D4D208 802401C8 00000000 */ nop /* D4D20C 802401CC 4602003C */ c.lt.s $f0, $f2 -/* D4D210 802401D0 00000000 */ nop +/* D4D210 802401D0 00000000 */ nop /* D4D214 802401D4 4500000B */ bc1f .L80240204 /* D4D218 802401D8 24040002 */ addiu $a0, $zero, 2 /* D4D21C 802401DC 3C014361 */ lui $at, 0x4361 /* D4D220 802401E0 44810000 */ mtc1 $at, $f0 -/* D4D224 802401E4 00000000 */ nop +/* D4D224 802401E4 00000000 */ nop /* D4D228 802401E8 4600103C */ c.lt.s $f2, $f0 -/* D4D22C 802401EC 00000000 */ nop +/* D4D22C 802401EC 00000000 */ nop /* D4D230 802401F0 45000004 */ bc1f .L80240204 -/* D4D234 802401F4 00000000 */ nop +/* D4D234 802401F4 00000000 */ nop /* D4D238 802401F8 0C090015 */ jal func_80240054_D4D094 /* D4D23C 802401FC 0040202D */ daddu $a0, $v0, $zero /* D4D240 80240200 24040002 */ addiu $a0, $zero, 2 @@ -95,7 +95,7 @@ glabel func_80240128_D4D168 /* D4D2C8 80240288 AFA0001C */ sw $zero, 0x1c($sp) .L8024028C: /* D4D2CC 8024028C 0C0B77B9 */ jal func_802DDEE4 -/* D4D2D0 80240290 00000000 */ nop +/* D4D2D0 80240290 00000000 */ nop .L80240294: /* D4D2D4 80240294 9202000E */ lbu $v0, 0xe($s0) /* D4D2D8 80240298 3C01802E */ lui $at, 0x802e diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s b/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s deleted file mode 100644 index d608d9f555..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D060/func_80240EB8_D4DEF8.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EB8_D4DEF8 -/* D4DEF8 80240EB8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D4DEFC 80240EBC AFBF0010 */ sw $ra, 0x10($sp) -/* D4DF00 80240EC0 0C00EAD2 */ jal get_npc_safe -/* D4DF04 80240EC4 2404FFFC */ addiu $a0, $zero, -4 -/* D4DF08 80240EC8 0040202D */ daddu $a0, $v0, $zero -/* D4DF0C 80240ECC 10800004 */ beqz $a0, .L80240EE0 -/* D4DF10 80240ED0 3C030008 */ lui $v1, 8 -/* D4DF14 80240ED4 8C820000 */ lw $v0, ($a0) -/* D4DF18 80240ED8 00431025 */ or $v0, $v0, $v1 -/* D4DF1C 80240EDC AC820000 */ sw $v0, ($a0) -.L80240EE0: -/* D4DF20 80240EE0 8FBF0010 */ lw $ra, 0x10($sp) -/* D4DF24 80240EE4 03E00008 */ jr $ra -/* D4DF28 80240EE8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s deleted file mode 100644 index ac9a1f7dfa..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240020_D50010.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D50010 -/* D50010 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D50014 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D50018 80240028 00822024 */ and $a0, $a0, $v0 -/* D5001C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D50020 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D50024 80240034 00821821 */ addu $v1, $a0, $v0 -/* D50028 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5002C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D50030 80240040 30620001 */ andi $v0, $v1, 1 -/* D50034 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D50038 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5003C 8024004C 03E00008 */ jr $ra -/* D50040 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s index b44857d3df..b167f617da 100644 --- a/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s +++ b/asm/nonmatchings/world/area_pra/pra_02/D50010/func_80240128_D50118.s @@ -37,7 +37,7 @@ glabel func_80240128_D50118 /* D50198 802401A8 0C00B94E */ jal get_screen_coords /* D5019C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D501A0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D501A4 802401B4 0C090008 */ jal func_80240020_D50010 +/* D501A4 802401B4 0C090008 */ jal UnkFunc2 /* D501A8 802401B8 00000000 */ nop /* D501AC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D501B0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s deleted file mode 100644 index e48eeca155..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240020_D55BD0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D55BD0 -/* D55BD0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D55BD4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D55BD8 80240028 00822024 */ and $a0, $a0, $v0 -/* D55BDC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D55BE0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D55BE4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D55BE8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D55BEC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D55BF0 80240040 30620001 */ andi $v0, $v1, 1 -/* D55BF4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D55BF8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D55BFC 8024004C 03E00008 */ jr $ra -/* D55C00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s index fb4cd0c6c5..48d99e7a38 100644 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s +++ b/asm/nonmatchings/world/area_pra/pra_05/D55BD0/func_80240128_D55CD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D55CD8 /* D55D58 802401A8 0C00B94E */ jal get_screen_coords /* D55D5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D55D60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D55D64 802401B4 0C090008 */ jal func_80240020_D55BD0 +/* D55D64 802401B4 0C090008 */ jal UnkFunc2 /* D55D68 802401B8 00000000 */ nop /* D55D6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D55D70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s deleted file mode 100644 index a0539a2faf..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240050_D57480.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D57480 -/* D57480 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D57484 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D57488 80240058 00822024 */ and $a0, $a0, $v0 -/* D5748C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D57490 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D57494 80240064 00821821 */ addu $v1, $a0, $v0 -/* D57498 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5749C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D574A0 80240070 30620001 */ andi $v0, $v1, 1 -/* D574A4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D574A8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D574AC 8024007C 03E00008 */ jr $ra -/* D574B0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s index ae0e05920a..81305f1019 100644 --- a/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s +++ b/asm/nonmatchings/world/area_pra/pra_06/D57430/func_80240158_D57588.s @@ -37,7 +37,7 @@ glabel func_80240158_D57588 /* D57608 802401D8 0C00B94E */ jal get_screen_coords /* D5760C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D57610 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D57614 802401E4 0C090014 */ jal func_80240050_D57480 +/* D57614 802401E4 0C090014 */ jal UnkFunc2 /* D57618 802401E8 00000000 */ nop /* D5761C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D57620 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s deleted file mode 100644 index 03dffc4dcc..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240020_D588B0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D588B0 -/* D588B0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D588B4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D588B8 80240028 00822024 */ and $a0, $a0, $v0 -/* D588BC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D588C0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D588C4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D588C8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D588CC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D588D0 80240040 30620001 */ andi $v0, $v1, 1 -/* D588D4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D588D8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D588DC 8024004C 03E00008 */ jr $ra -/* D588E0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s index 6491b2eeb7..b9258f4dad 100644 --- a/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s +++ b/asm/nonmatchings/world/area_pra/pra_09/D588B0/func_80240128_D589B8.s @@ -37,7 +37,7 @@ glabel func_80240128_D589B8 /* D58A38 802401A8 0C00B94E */ jal get_screen_coords /* D58A3C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D58A40 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D58A44 802401B4 0C090008 */ jal func_80240020_D588B0 +/* D58A44 802401B4 0C090008 */ jal UnkFunc2 /* D58A48 802401B8 00000000 */ nop /* D58A4C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D58A50 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s deleted file mode 100644 index 17a1407d74..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240020_D5F2D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D5F2D0 -/* D5F2D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D5F2D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D5F2D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D5F2DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D5F2E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D5F2E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D5F2E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D5F2EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D5F2F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D5F2F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D5F2F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D5F2FC 8024004C 03E00008 */ jr $ra -/* D5F300 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s index 8309fbbb4f..5a904f6e69 100644 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s +++ b/asm/nonmatchings/world/area_pra/pra_10/D5F2D0/func_80240128_D5F3D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D5F3D8 /* D5F458 802401A8 0C00B94E */ jal get_screen_coords /* D5F45C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D5F460 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D5F464 802401B4 0C090008 */ jal func_80240020_D5F2D0 +/* D5F464 802401B4 0C090008 */ jal UnkFunc2 /* D5F468 802401B8 00000000 */ nop /* D5F46C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D5F470 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s deleted file mode 100644 index d61d61b48e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240020_D61520.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D61520 -/* D61520 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D61524 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D61528 80240028 00822024 */ and $a0, $a0, $v0 -/* D6152C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D61530 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D61534 80240034 00821821 */ addu $v1, $a0, $v0 -/* D61538 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6153C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D61540 80240040 30620001 */ andi $v0, $v1, 1 -/* D61544 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D61548 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6154C 8024004C 03E00008 */ jr $ra -/* D61550 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s index f07d561c4b..993c392e0c 100644 --- a/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s +++ b/asm/nonmatchings/world/area_pra/pra_11/D61520/func_80240128_D61628.s @@ -37,7 +37,7 @@ glabel func_80240128_D61628 /* D616A8 802401A8 0C00B94E */ jal get_screen_coords /* D616AC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D616B0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D616B4 802401B4 0C090008 */ jal func_80240020_D61520 +/* D616B4 802401B4 0C090008 */ jal UnkFunc2 /* D616B8 802401B8 00000000 */ nop /* D616BC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D616C0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s deleted file mode 100644 index 7b8ead6925..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240050_D62D60.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D62D60 -/* D62D60 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D62D64 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D62D68 80240058 00822024 */ and $a0, $a0, $v0 -/* D62D6C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D62D70 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D62D74 80240064 00821821 */ addu $v1, $a0, $v0 -/* D62D78 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D62D7C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D62D80 80240070 30620001 */ andi $v0, $v1, 1 -/* D62D84 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D62D88 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D62D8C 8024007C 03E00008 */ jr $ra -/* D62D90 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s index 17c2dd065d..4230bd6dad 100644 --- a/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s +++ b/asm/nonmatchings/world/area_pra/pra_12/D62D10/func_80240158_D62E68.s @@ -37,7 +37,7 @@ glabel func_80240158_D62E68 /* D62EE8 802401D8 0C00B94E */ jal get_screen_coords /* D62EEC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D62EF0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D62EF4 802401E4 0C090014 */ jal func_80240050_D62D60 +/* D62EF4 802401E4 0C090014 */ jal UnkFunc2 /* D62EF8 802401E8 00000000 */ nop /* D62EFC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D62F00 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s deleted file mode 100644 index 0af9d2cf64..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240020_D64600.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D64600 -/* D64600 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D64604 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D64608 80240028 00822024 */ and $a0, $a0, $v0 -/* D6460C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D64610 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D64614 80240034 00821821 */ addu $v1, $a0, $v0 -/* D64618 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6461C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D64620 80240040 30620001 */ andi $v0, $v1, 1 -/* D64624 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D64628 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6462C 8024004C 03E00008 */ jr $ra -/* D64630 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s index d89cecbc6d..66f0bd6bc8 100644 --- a/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s +++ b/asm/nonmatchings/world/area_pra/pra_13/D64600/func_80240128_D64708.s @@ -37,7 +37,7 @@ glabel func_80240128_D64708 /* D64788 802401A8 0C00B94E */ jal get_screen_coords /* D6478C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D64790 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D64794 802401B4 0C090008 */ jal func_80240020_D64600 +/* D64794 802401B4 0C090008 */ jal UnkFunc2 /* D64798 802401B8 00000000 */ nop /* D6479C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D647A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s deleted file mode 100644 index 5d92775e54..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240020_D67D20.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D67D20 -/* D67D20 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D67D24 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D67D28 80240028 00822024 */ and $a0, $a0, $v0 -/* D67D2C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D67D30 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D67D34 80240034 00821821 */ addu $v1, $a0, $v0 -/* D67D38 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D67D3C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D67D40 80240040 30620001 */ andi $v0, $v1, 1 -/* D67D44 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D67D48 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D67D4C 8024004C 03E00008 */ jr $ra -/* D67D50 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s index 31ef5814f5..d3c9059552 100644 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s +++ b/asm/nonmatchings/world/area_pra/pra_14/D67D20/func_80240128_D67E28.s @@ -37,7 +37,7 @@ glabel func_80240128_D67E28 /* D67EA8 802401A8 0C00B94E */ jal get_screen_coords /* D67EAC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D67EB0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D67EB4 802401B4 0C090008 */ jal func_80240020_D67D20 +/* D67EB4 802401B4 0C090008 */ jal UnkFunc2 /* D67EB8 802401B8 00000000 */ nop /* D67EBC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D67EC0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s deleted file mode 100644 index c3047d05ab..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240020_D69B40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D69B40 -/* D69B40 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D69B44 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D69B48 80240028 00822024 */ and $a0, $a0, $v0 -/* D69B4C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D69B50 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D69B54 80240034 00821821 */ addu $v1, $a0, $v0 -/* D69B58 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D69B5C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D69B60 80240040 30620001 */ andi $v0, $v1, 1 -/* D69B64 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D69B68 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D69B6C 8024004C 03E00008 */ jr $ra -/* D69B70 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s index d2c4425153..19191cd88a 100644 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s +++ b/asm/nonmatchings/world/area_pra/pra_16/D69B40/func_80240128_D69C48.s @@ -37,7 +37,7 @@ glabel func_80240128_D69C48 /* D69CC8 802401A8 0C00B94E */ jal get_screen_coords /* D69CCC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D69CD0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D69CD4 802401B4 0C090008 */ jal func_80240020_D69B40 +/* D69CD4 802401B4 0C090008 */ jal UnkFunc2 /* D69CD8 802401B8 00000000 */ nop /* D69CDC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D69CE0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s deleted file mode 100644 index ae85c8a5fb..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240020_D6B640.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6B640 -/* D6B640 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6B644 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6B648 80240028 00822024 */ and $a0, $a0, $v0 -/* D6B64C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6B650 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6B654 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6B658 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6B65C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6B660 80240040 30620001 */ andi $v0, $v1, 1 -/* D6B664 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6B668 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6B66C 8024004C 03E00008 */ jr $ra -/* D6B670 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s index 342f0eeacd..2fb9e90fc9 100644 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s +++ b/asm/nonmatchings/world/area_pra/pra_18/D6B640/func_80240128_D6B748.s @@ -37,7 +37,7 @@ glabel func_80240128_D6B748 /* D6B7C8 802401A8 0C00B94E */ jal get_screen_coords /* D6B7CC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6B7D0 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6B7D4 802401B4 0C090008 */ jal func_80240020_D6B640 +/* D6B7D4 802401B4 0C090008 */ jal UnkFunc2 /* D6B7D8 802401B8 00000000 */ nop /* D6B7DC 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6B7E0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s deleted file mode 100644 index 7189e20355..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240020_D6E9D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D6E9D0 -/* D6E9D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D6E9D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D6E9D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D6E9DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D6E9E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D6E9E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D6E9E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D6E9EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D6E9F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D6E9F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D6E9F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D6E9FC 8024004C 03E00008 */ jr $ra -/* D6EA00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s index d4e135fa38..77f4180b85 100644 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s +++ b/asm/nonmatchings/world/area_pra/pra_19/D6E9D0/func_80240128_D6EAD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D6EAD8 /* D6EB58 802401A8 0C00B94E */ jal get_screen_coords /* D6EB5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D6EB60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D6EB64 802401B4 0C090008 */ jal func_80240020_D6E9D0 +/* D6EB64 802401B4 0C090008 */ jal UnkFunc2 /* D6EB68 802401B8 00000000 */ nop /* D6EB6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D6EB70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s deleted file mode 100644 index 73aa43b4ee..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240020_D763C0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D763C0 -/* D763C0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D763C4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D763C8 80240028 00822024 */ and $a0, $a0, $v0 -/* D763CC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D763D0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D763D4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D763D8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D763DC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D763E0 80240040 30620001 */ andi $v0, $v1, 1 -/* D763E4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D763E8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D763EC 8024004C 03E00008 */ jr $ra -/* D763F0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s index 0af37f6f41..6a701983a1 100644 --- a/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s +++ b/asm/nonmatchings/world/area_pra/pra_20/D763C0/func_80240128_D764C8.s @@ -37,7 +37,7 @@ glabel func_80240128_D764C8 /* D76548 802401A8 0C00B94E */ jal get_screen_coords /* D7654C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D76550 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D76554 802401B4 0C090008 */ jal func_80240020_D763C0 +/* D76554 802401B4 0C090008 */ jal UnkFunc2 /* D76558 802401B8 00000000 */ nop /* D7655C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D76560 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s deleted file mode 100644 index 8a0f90ef96..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240050_D79A40.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D79A40 -/* D79A40 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D79A44 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D79A48 80240058 00822024 */ and $a0, $a0, $v0 -/* D79A4C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D79A50 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D79A54 80240064 00821821 */ addu $v1, $a0, $v0 -/* D79A58 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D79A5C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D79A60 80240070 30620001 */ andi $v0, $v1, 1 -/* D79A64 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D79A68 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D79A6C 8024007C 03E00008 */ jr $ra -/* D79A70 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s index 48038b0b0d..b7c047c6eb 100644 --- a/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s +++ b/asm/nonmatchings/world/area_pra/pra_27/D799F0/func_80240158_D79B48.s @@ -37,7 +37,7 @@ glabel func_80240158_D79B48 /* D79BC8 802401D8 0C00B94E */ jal get_screen_coords /* D79BCC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D79BD0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D79BD4 802401E4 0C090014 */ jal func_80240050_D79A40 +/* D79BD4 802401E4 0C090014 */ jal UnkFunc2 /* D79BD8 802401E8 00000000 */ nop /* D79BDC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D79BE0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s deleted file mode 100644 index 433e2e7e9b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240050_D7B2F0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D7B2F0 -/* D7B2F0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D7B2F4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D7B2F8 80240058 00822024 */ and $a0, $a0, $v0 -/* D7B2FC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7B300 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7B304 80240064 00821821 */ addu $v1, $a0, $v0 -/* D7B308 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7B30C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D7B310 80240070 30620001 */ andi $v0, $v1, 1 -/* D7B314 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D7B318 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D7B31C 8024007C 03E00008 */ jr $ra -/* D7B320 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s index b67ceb78fa..3f168d0025 100644 --- a/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s +++ b/asm/nonmatchings/world/area_pra/pra_28/D7B2A0/func_80240158_D7B3F8.s @@ -37,7 +37,7 @@ glabel func_80240158_D7B3F8 /* D7B478 802401D8 0C00B94E */ jal get_screen_coords /* D7B47C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D7B480 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7B484 802401E4 0C090014 */ jal func_80240050_D7B2F0 +/* D7B484 802401E4 0C090014 */ jal UnkFunc2 /* D7B488 802401E8 00000000 */ nop /* D7B48C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D7B490 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s deleted file mode 100644 index dee5fe419a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240020_D7CB70.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D7CB70 -/* D7CB70 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D7CB74 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D7CB78 80240028 00822024 */ and $a0, $a0, $v0 -/* D7CB7C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D7CB80 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D7CB84 80240034 00821821 */ addu $v1, $a0, $v0 -/* D7CB88 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D7CB8C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D7CB90 80240040 30620001 */ andi $v0, $v1, 1 -/* D7CB94 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D7CB98 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D7CB9C 8024004C 03E00008 */ jr $ra -/* D7CBA0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s index 0f28f20826..43571232f4 100644 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s +++ b/asm/nonmatchings/world/area_pra/pra_29/D7CB70/func_80240128_D7CC78.s @@ -37,7 +37,7 @@ glabel func_80240128_D7CC78 /* D7CCF8 802401A8 0C00B94E */ jal get_screen_coords /* D7CCFC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D7CD00 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D7CD04 802401B4 0C090008 */ jal func_80240020_D7CB70 +/* D7CD04 802401B4 0C090008 */ jal UnkFunc2 /* D7CD08 802401B8 00000000 */ nop /* D7CD0C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D7CD10 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s deleted file mode 100644 index dbb7093f81..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240020_D89700.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D89700 -/* D89700 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D89704 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D89708 80240028 00822024 */ and $a0, $a0, $v0 -/* D8970C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D89710 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D89714 80240034 00821821 */ addu $v1, $a0, $v0 -/* D89718 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8971C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D89720 80240040 30620001 */ andi $v0, $v1, 1 -/* D89724 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D89728 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8972C 8024004C 03E00008 */ jr $ra -/* D89730 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s index 28067cd1b5..28bcac6d90 100644 --- a/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s +++ b/asm/nonmatchings/world/area_pra/pra_33/D89700/func_80240128_D89808.s @@ -37,7 +37,7 @@ glabel func_80240128_D89808 /* D89888 802401A8 0C00B94E */ jal get_screen_coords /* D8988C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D89890 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D89894 802401B4 0C090008 */ jal func_80240020_D89700 +/* D89894 802401B4 0C090008 */ jal UnkFunc2 /* D89898 802401B8 00000000 */ nop /* D8989C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D898A0 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s deleted file mode 100644 index bd55909e06..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240020_D8B3D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8B3D0 -/* D8B3D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8B3D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8B3D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D8B3DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8B3E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8B3E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8B3E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8B3EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8B3F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D8B3F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8B3F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8B3FC 8024004C 03E00008 */ jr $ra -/* D8B400 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s index f9feb63413..9814c5e0da 100644 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s +++ b/asm/nonmatchings/world/area_pra/pra_34/D8B3D0/func_80240128_D8B4D8.s @@ -37,7 +37,7 @@ glabel func_80240128_D8B4D8 /* D8B558 802401A8 0C00B94E */ jal get_screen_coords /* D8B55C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8B560 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8B564 802401B4 0C090008 */ jal func_80240020_D8B3D0 +/* D8B564 802401B4 0C090008 */ jal UnkFunc2 /* D8B568 802401B8 00000000 */ nop /* D8B56C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8B570 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s deleted file mode 100644 index d8438c0f51..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240020_D8D270.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D8D270 -/* D8D270 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D8D274 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D8D278 80240028 00822024 */ and $a0, $a0, $v0 -/* D8D27C 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D8D280 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D8D284 80240034 00821821 */ addu $v1, $a0, $v0 -/* D8D288 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D8D28C 8024003C 10400003 */ beqz $v0, .L8024004C -/* D8D290 80240040 30620001 */ andi $v0, $v1, 1 -/* D8D294 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D8D298 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D8D29C 8024004C 03E00008 */ jr $ra -/* D8D2A0 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s index b790eb4750..50ab3e55de 100644 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s +++ b/asm/nonmatchings/world/area_pra/pra_35/D8D270/func_80240128_D8D378.s @@ -37,7 +37,7 @@ glabel func_80240128_D8D378 /* D8D3F8 802401A8 0C00B94E */ jal get_screen_coords /* D8D3FC 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D8D400 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D8D404 802401B4 0C090008 */ jal func_80240020_D8D270 +/* D8D404 802401B4 0C090008 */ jal UnkFunc2 /* D8D408 802401B8 00000000 */ nop /* D8D40C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D8D410 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s deleted file mode 100644 index 4b160927a2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240050_D91750.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D91750 -/* D91750 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D91754 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D91758 80240058 00822024 */ and $a0, $a0, $v0 -/* D9175C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D91760 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D91764 80240064 00821821 */ addu $v1, $a0, $v0 -/* D91768 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9176C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D91770 80240070 30620001 */ andi $v0, $v1, 1 -/* D91774 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D91778 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9177C 8024007C 03E00008 */ jr $ra -/* D91780 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s index 0ba2641c7f..e82db74e5b 100644 --- a/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s +++ b/asm/nonmatchings/world/area_pra/pra_36/D91700/func_80240158_D91858.s @@ -37,7 +37,7 @@ glabel func_80240158_D91858 /* D918D8 802401D8 0C00B94E */ jal get_screen_coords /* D918DC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D918E0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D918E4 802401E4 0C090014 */ jal func_80240050_D91750 +/* D918E4 802401E4 0C090014 */ jal UnkFunc2 /* D918E8 802401E8 00000000 */ nop /* D918EC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D918F0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s deleted file mode 100644 index cae6353cb9..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240050_D92F90.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D92F90 -/* D92F90 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D92F94 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D92F98 80240058 00822024 */ and $a0, $a0, $v0 -/* D92F9C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D92FA0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D92FA4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D92FA8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D92FAC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D92FB0 80240070 30620001 */ andi $v0, $v1, 1 -/* D92FB4 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D92FB8 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D92FBC 8024007C 03E00008 */ jr $ra -/* D92FC0 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s index cded2ee6bf..9b6cf66e65 100644 --- a/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s +++ b/asm/nonmatchings/world/area_pra/pra_37/D92F40/func_80240158_D93098.s @@ -37,7 +37,7 @@ glabel func_80240158_D93098 /* D93118 802401D8 0C00B94E */ jal get_screen_coords /* D9311C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D93120 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D93124 802401E4 0C090014 */ jal func_80240050_D92F90 +/* D93124 802401E4 0C090014 */ jal UnkFunc2 /* D93128 802401E8 00000000 */ nop /* D9312C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D93130 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s deleted file mode 100644 index bf7b950d89..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240050_D95640.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D95640 -/* D95640 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D95644 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D95648 80240058 00822024 */ and $a0, $a0, $v0 -/* D9564C 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D95650 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D95654 80240064 00821821 */ addu $v1, $a0, $v0 -/* D95658 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D9565C 8024006C 10400003 */ beqz $v0, .L8024007C -/* D95660 80240070 30620001 */ andi $v0, $v1, 1 -/* D95664 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D95668 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9566C 8024007C 03E00008 */ jr $ra -/* D95670 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s index 7f958d593a..ebe8fe76b4 100644 --- a/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s +++ b/asm/nonmatchings/world/area_pra/pra_38/D955F0/func_80240158_D95748.s @@ -37,7 +37,7 @@ glabel func_80240158_D95748 /* D957C8 802401D8 0C00B94E */ jal get_screen_coords /* D957CC 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D957D0 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D957D4 802401E4 0C090014 */ jal func_80240050_D95640 +/* D957D4 802401E4 0C090014 */ jal UnkFunc2 /* D957D8 802401E8 00000000 */ nop /* D957DC 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D957E0 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s deleted file mode 100644 index eb13d4dc10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240050_D978E0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240050_D978E0 -/* D978E0 80240050 3C02FEFF */ lui $v0, 0xfeff -/* D978E4 80240054 3442FFFF */ ori $v0, $v0, 0xffff -/* D978E8 80240058 00822024 */ and $a0, $a0, $v0 -/* D978EC 8024005C 3C02FFF9 */ lui $v0, 0xfff9 -/* D978F0 80240060 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D978F4 80240064 00821821 */ addu $v1, $a0, $v0 -/* D978F8 80240068 2C620010 */ sltiu $v0, $v1, 0x10 -/* D978FC 8024006C 10400003 */ beqz $v0, .L8024007C -/* D97900 80240070 30620001 */ andi $v0, $v1, 1 -/* D97904 80240074 54400001 */ bnel $v0, $zero, .L8024007C -/* D97908 80240078 2484FFFF */ addiu $a0, $a0, -1 -.L8024007C: -/* D9790C 8024007C 03E00008 */ jr $ra -/* D97910 80240080 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s index cfc769b08e..bd8e2fe0e2 100644 --- a/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s +++ b/asm/nonmatchings/world/area_pra/pra_39/D97890/func_80240158_D979E8.s @@ -37,7 +37,7 @@ glabel func_80240158_D979E8 /* D97A68 802401D8 0C00B94E */ jal get_screen_coords /* D97A6C 802401DC AFA20018 */ sw $v0, 0x18($sp) /* D97A70 802401E0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D97A74 802401E4 0C090014 */ jal func_80240050_D978E0 +/* D97A74 802401E4 0C090014 */ jal UnkFunc2 /* D97A78 802401E8 00000000 */ nop /* D97A7C 802401EC C6020080 */ lwc1 $f2, 0x80($s0) /* D97A80 802401F0 3C014307 */ lui $at, 0x4307 diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s deleted file mode 100644 index dbc6d0a3d0..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240020_D999D0.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_D999D0 -/* D999D0 80240020 3C02FEFF */ lui $v0, 0xfeff -/* D999D4 80240024 3442FFFF */ ori $v0, $v0, 0xffff -/* D999D8 80240028 00822024 */ and $a0, $a0, $v0 -/* D999DC 8024002C 3C02FFF9 */ lui $v0, 0xfff9 -/* D999E0 80240030 3442FFF4 */ ori $v0, $v0, 0xfff4 -/* D999E4 80240034 00821821 */ addu $v1, $a0, $v0 -/* D999E8 80240038 2C620010 */ sltiu $v0, $v1, 0x10 -/* D999EC 8024003C 10400003 */ beqz $v0, .L8024004C -/* D999F0 80240040 30620001 */ andi $v0, $v1, 1 -/* D999F4 80240044 54400001 */ bnel $v0, $zero, .L8024004C -/* D999F8 80240048 2484FFFF */ addiu $a0, $a0, -1 -.L8024004C: -/* D999FC 8024004C 03E00008 */ jr $ra -/* D99A00 80240050 0080102D */ daddu $v0, $a0, $zero diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s index 14f35eaba7..c66e70cd62 100644 --- a/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s +++ b/asm/nonmatchings/world/area_pra/pra_40/D999D0/func_80240128_D99AD8.s @@ -37,7 +37,7 @@ glabel func_80240128_D99AD8 /* D99B58 802401A8 0C00B94E */ jal get_screen_coords /* D99B5C 802401AC AFA20018 */ sw $v0, 0x18($sp) /* D99B60 802401B0 8E0400A4 */ lw $a0, 0xa4($s0) -/* D99B64 802401B4 0C090008 */ jal func_80240020_D999D0 +/* D99B64 802401B4 0C090008 */ jal UnkFunc2 /* D99B68 802401B8 00000000 */ nop /* D99B6C 802401BC C6020080 */ lwc1 $f2, 0x80($s0) /* D99B70 802401C0 3C014307 */ lui $at, 0x4307 diff --git a/src/world/area_pra/pra_01/D4D060.c b/src/world/area_pra/pra_01/D4D060.c index 1347268caf..0176f9ebb5 100644 --- a/src/world/area_pra/pra_01/D4D060.c +++ b/src/world/area_pra/pra_01/D4D060.c @@ -1,6 +1,6 @@ #include "pra_01.h" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240020_D4D060); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240054_D4D094); @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240D3C_D4DD7C); #include "world/common/SetPartnerFlagsA0000.inc.c" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D060", func_80240EB8_D4DEF8); +#include "world/common/SetPartnerFlags80000.inc.c" #include "world/common/SetPartnerFlags20000.inc.c" diff --git a/src/world/area_pra/pra_02/D50010.c b/src/world/area_pra/pra_02/D50010.c index 8026d68869..ddc79491ed 100644 --- a/src/world/area_pra/pra_02/D50010.c +++ b/src/world/area_pra/pra_02/D50010.c @@ -1,6 +1,6 @@ #include "pra_02.h" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240020_D50010); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_02/D50010", func_80240054_D50044); diff --git a/src/world/area_pra/pra_05/D55BD0.c b/src/world/area_pra/pra_05/D55BD0.c index 60d80a42db..e47079fc02 100644 --- a/src/world/area_pra/pra_05/D55BD0.c +++ b/src/world/area_pra/pra_05/D55BD0.c @@ -1,6 +1,6 @@ #include "pra_05.h" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240020_D55BD0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BD0", func_80240054_D55C04); diff --git a/src/world/area_pra/pra_06/D57430.c b/src/world/area_pra/pra_06/D57430.c index eb2d6746b6..827c590aa3 100644 --- a/src/world/area_pra/pra_06/D57430.c +++ b/src/world/area_pra/pra_06/D57430.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240000_D57430); -INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240050_D57480); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_06/D57430", func_80240084_D574B4); diff --git a/src/world/area_pra/pra_09/D588B0.c b/src/world/area_pra/pra_09/D588B0.c index 293e81f764..ea8df7cb40 100644 --- a/src/world/area_pra/pra_09/D588B0.c +++ b/src/world/area_pra/pra_09/D588B0.c @@ -1,6 +1,6 @@ #include "pra_09.h" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240020_D588B0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_09/D588B0", func_80240054_D588E4); diff --git a/src/world/area_pra/pra_10/D5F2D0.c b/src/world/area_pra/pra_10/D5F2D0.c index aaa2478791..a30f21463c 100644 --- a/src/world/area_pra/pra_10/D5F2D0.c +++ b/src/world/area_pra/pra_10/D5F2D0.c @@ -1,6 +1,6 @@ #include "pra_10.h" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240020_D5F2D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2D0", func_80240054_D5F304); diff --git a/src/world/area_pra/pra_11/D61520.c b/src/world/area_pra/pra_11/D61520.c index 48ef19fd5e..992192e487 100644 --- a/src/world/area_pra/pra_11/D61520.c +++ b/src/world/area_pra/pra_11/D61520.c @@ -1,6 +1,6 @@ #include "pra_11.h" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240020_D61520); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_11/D61520", func_80240054_D61554); diff --git a/src/world/area_pra/pra_12/D62D10.c b/src/world/area_pra/pra_12/D62D10.c index 7401c5d5d6..1ea03598ac 100644 --- a/src/world/area_pra/pra_12/D62D10.c +++ b/src/world/area_pra/pra_12/D62D10.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240000_D62D10); -INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240050_D62D60); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_12/D62D10", func_80240084_D62D94); diff --git a/src/world/area_pra/pra_13/D64600.c b/src/world/area_pra/pra_13/D64600.c index 1494d4e8d5..c1c3cc8afe 100644 --- a/src/world/area_pra/pra_13/D64600.c +++ b/src/world/area_pra/pra_13/D64600.c @@ -1,6 +1,6 @@ #include "pra_13.h" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240020_D64600); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_13/D64600", func_80240054_D64634); diff --git a/src/world/area_pra/pra_14/D67D20.c b/src/world/area_pra/pra_14/D67D20.c index d9a9d66fa7..9f5f683ee1 100644 --- a/src/world/area_pra/pra_14/D67D20.c +++ b/src/world/area_pra/pra_14/D67D20.c @@ -1,6 +1,6 @@ #include "pra_14.h" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240020_D67D20); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D20", func_80240054_D67D54); diff --git a/src/world/area_pra/pra_16/D69B40.c b/src/world/area_pra/pra_16/D69B40.c index 95be9b7a7d..ac0a06070f 100644 --- a/src/world/area_pra/pra_16/D69B40.c +++ b/src/world/area_pra/pra_16/D69B40.c @@ -1,6 +1,6 @@ #include "pra_16.h" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240020_D69B40); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B40", func_80240054_D69B74); diff --git a/src/world/area_pra/pra_18/D6B640.c b/src/world/area_pra/pra_18/D6B640.c index 6e4636e030..559304d125 100644 --- a/src/world/area_pra/pra_18/D6B640.c +++ b/src/world/area_pra/pra_18/D6B640.c @@ -1,6 +1,6 @@ #include "pra_18.h" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240020_D6B640); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B640", func_80240054_D6B674); diff --git a/src/world/area_pra/pra_19/D6E9D0.c b/src/world/area_pra/pra_19/D6E9D0.c index 5be0072900..f80edf2d8a 100644 --- a/src/world/area_pra/pra_19/D6E9D0.c +++ b/src/world/area_pra/pra_19/D6E9D0.c @@ -1,6 +1,6 @@ #include "pra_19.h" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240020_D6E9D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9D0", func_80240054_D6EA04); diff --git a/src/world/area_pra/pra_20/D763C0.c b/src/world/area_pra/pra_20/D763C0.c index c70a9535f0..4751288b32 100644 --- a/src/world/area_pra/pra_20/D763C0.c +++ b/src/world/area_pra/pra_20/D763C0.c @@ -1,6 +1,6 @@ #include "pra_20.h" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240020_D763C0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_20/D763C0", func_80240054_D763F4); diff --git a/src/world/area_pra/pra_27/D799F0.c b/src/world/area_pra/pra_27/D799F0.c index 3411de3245..3f32651088 100644 --- a/src/world/area_pra/pra_27/D799F0.c +++ b/src/world/area_pra/pra_27/D799F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240000_D799F0); -INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240050_D79A40); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_27/D799F0", func_80240084_D79A74); diff --git a/src/world/area_pra/pra_28/D7B2A0.c b/src/world/area_pra/pra_28/D7B2A0.c index e1b18143a5..042c289396 100644 --- a/src/world/area_pra/pra_28/D7B2A0.c +++ b/src/world/area_pra/pra_28/D7B2A0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240000_D7B2A0); -INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240050_D7B2F0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_28/D7B2A0", func_80240084_D7B324); diff --git a/src/world/area_pra/pra_29/D7CB70.c b/src/world/area_pra/pra_29/D7CB70.c index 41ba906407..bba36641ef 100644 --- a/src/world/area_pra/pra_29/D7CB70.c +++ b/src/world/area_pra/pra_29/D7CB70.c @@ -1,6 +1,6 @@ #include "pra_29.h" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240020_D7CB70); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB70", func_80240054_D7CBA4); diff --git a/src/world/area_pra/pra_33/D89700.c b/src/world/area_pra/pra_33/D89700.c index 543ca3a92e..9c2da54360 100644 --- a/src/world/area_pra/pra_33/D89700.c +++ b/src/world/area_pra/pra_33/D89700.c @@ -1,6 +1,6 @@ #include "pra_33.h" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240020_D89700); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_33/D89700", func_80240054_D89734); diff --git a/src/world/area_pra/pra_34/D8B3D0.c b/src/world/area_pra/pra_34/D8B3D0.c index 813cb0d124..10a49fbc5d 100644 --- a/src/world/area_pra/pra_34/D8B3D0.c +++ b/src/world/area_pra/pra_34/D8B3D0.c @@ -1,6 +1,6 @@ #include "pra_34.h" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240020_D8B3D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3D0", func_80240054_D8B404); diff --git a/src/world/area_pra/pra_35/D8D270.c b/src/world/area_pra/pra_35/D8D270.c index 9317252b46..e546e052dd 100644 --- a/src/world/area_pra/pra_35/D8D270.c +++ b/src/world/area_pra/pra_35/D8D270.c @@ -1,6 +1,6 @@ #include "pra_35.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240020_D8D270); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D270", func_80240054_D8D2A4); diff --git a/src/world/area_pra/pra_36/D91700.c b/src/world/area_pra/pra_36/D91700.c index 91f31dac16..54a9730126 100644 --- a/src/world/area_pra/pra_36/D91700.c +++ b/src/world/area_pra/pra_36/D91700.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240000_D91700); -INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240050_D91750); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_36/D91700", func_80240084_D91784); diff --git a/src/world/area_pra/pra_37/D92F40.c b/src/world/area_pra/pra_37/D92F40.c index d4a591bbba..e3cda640fe 100644 --- a/src/world/area_pra/pra_37/D92F40.c +++ b/src/world/area_pra/pra_37/D92F40.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240000_D92F40); -INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240050_D92F90); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_37/D92F40", func_80240084_D92FC4); diff --git a/src/world/area_pra/pra_38/D955F0.c b/src/world/area_pra/pra_38/D955F0.c index 0a22c57f68..1f193b6c69 100644 --- a/src/world/area_pra/pra_38/D955F0.c +++ b/src/world/area_pra/pra_38/D955F0.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240000_D955F0); -INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240050_D95640); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_38/D955F0", func_80240084_D95674); diff --git a/src/world/area_pra/pra_39/D97890.c b/src/world/area_pra/pra_39/D97890.c index b2edb281c1..fd399b8a91 100644 --- a/src/world/area_pra/pra_39/D97890.c +++ b/src/world/area_pra/pra_39/D97890.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240000_D97890); -INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240050_D978E0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_39/D97890", func_80240084_D97914); diff --git a/src/world/area_pra/pra_40/D999D0.c b/src/world/area_pra/pra_40/D999D0.c index 098a316fe9..98582cc3de 100644 --- a/src/world/area_pra/pra_40/D999D0.c +++ b/src/world/area_pra/pra_40/D999D0.c @@ -1,6 +1,6 @@ #include "pra_40.h" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240020_D999D0); +#include "world/common/UnkFunc2.inc.c" INCLUDE_ASM(s32, "world/area_pra/pra_40/D999D0", func_80240054_D99A04); diff --git a/src/world/common/UnkFunc2.inc.c b/src/world/common/UnkFunc2.inc.c new file mode 100644 index 0000000000..766123e82c --- /dev/null +++ b/src/world/common/UnkFunc2.inc.c @@ -0,0 +1,13 @@ +#include "common.h" + +static s32 UnkFunc2(s32 arg0) { + u32 val; + + arg0 &= ~0x1000000; + val = arg0 + ~0x6000B; + if (val < 0x10 && val & 1) { + arg0--; + } + + return arg0; +}