diff --git a/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s b/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s deleted file mode 100644 index 9f615af04d..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_01/D4D040/func_80240000_D4D040.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D4D040 -/* D4D040 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D4D044 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D4D048 80240008 24020001 */ addiu $v0, $zero, 1 -/* D4D04C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D4D050 80240010 03E00008 */ jr $ra -/* D4D054 80240014 0000102D */ daddu $v0, $zero, $zero -/* D4D058 80240018 00000000 */ nop -/* D4D05C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s b/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s deleted file mode 100644 index 548ab69167..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_02/D4FFF0/func_80240000_D4FFF0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D4FFF0 -/* D4FFF0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D4FFF4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D4FFF8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D4FFFC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D50000 80240010 03E00008 */ jr $ra -/* D50004 80240014 0000102D */ daddu $v0, $zero, $zero -/* D50008 80240018 00000000 */ nop -/* D5000C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s b/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s deleted file mode 100644 index f79cef1276..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_03/D53CB0/func_80240000_D53CB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D53CB0 -/* D53CB0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D53CB4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D53CB8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D53CBC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D53CC0 80240010 03E00008 */ jr $ra -/* D53CC4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D53CC8 80240018 00000000 */ nop -/* D53CCC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s b/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s deleted file mode 100644 index 80a8c4fec1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_04/D54690/func_80240000_D54690.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D54690 -/* D54690 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D54694 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D54698 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5469C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D546A0 80240010 03E00008 */ jr $ra -/* D546A4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D546A8 80240018 00000000 */ nop -/* D546AC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s b/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s deleted file mode 100644 index da3ee57f70..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_05/D55BB0/func_80240000_D55BB0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D55BB0 -/* D55BB0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D55BB4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D55BB8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D55BBC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D55BC0 80240010 03E00008 */ jr $ra -/* D55BC4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D55BC8 80240018 00000000 */ nop -/* D55BCC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s b/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s deleted file mode 100644 index beb4e6b172..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_09/D58890/func_80240000_D58890.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D58890 -/* D58890 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D58894 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D58898 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5889C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D588A0 80240010 03E00008 */ jr $ra -/* D588A4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D588A8 80240018 00000000 */ nop -/* D588AC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s b/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s deleted file mode 100644 index e7706aadd3..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_10/D5F2B0/func_80240000_D5F2B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D5F2B0 -/* D5F2B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D5F2B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D5F2B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D5F2BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D5F2C0 80240010 03E00008 */ jr $ra -/* D5F2C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D5F2C8 80240018 00000000 */ nop -/* D5F2CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s b/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s deleted file mode 100644 index 6b6584c69b..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_11/D61500/func_80240000_D61500.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D61500 -/* D61500 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D61504 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D61508 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6150C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D61510 80240010 03E00008 */ jr $ra -/* D61514 80240014 0000102D */ daddu $v0, $zero, $zero -/* D61518 80240018 00000000 */ nop -/* D6151C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s b/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s deleted file mode 100644 index 6207ecc8f1..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_13/D645E0/func_80240000_D645E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D645E0 -/* D645E0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D645E4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D645E8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D645EC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D645F0 80240010 03E00008 */ jr $ra -/* D645F4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D645F8 80240018 00000000 */ nop -/* D645FC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s b/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s deleted file mode 100644 index cc4c51bec7..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_14/D67D00/func_80240000_D67D00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D67D00 -/* D67D00 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D67D04 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D67D08 80240008 24020001 */ addiu $v0, $zero, 1 -/* D67D0C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D67D10 80240010 03E00008 */ jr $ra -/* D67D14 80240014 0000102D */ daddu $v0, $zero, $zero -/* D67D18 80240018 00000000 */ nop -/* D67D1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s b/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s deleted file mode 100644 index 126d748169..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_15/D69810/func_80240000_D69810.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D69810 -/* D69810 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D69814 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D69818 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6981C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D69820 80240010 03E00008 */ jr $ra -/* D69824 80240014 0000102D */ daddu $v0, $zero, $zero -/* D69828 80240018 00000000 */ nop -/* D6982C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s b/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s deleted file mode 100644 index 339d762738..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_16/D69B20/func_80240000_D69B20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D69B20 -/* D69B20 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D69B24 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D69B28 80240008 24020001 */ addiu $v0, $zero, 1 -/* D69B2C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D69B30 80240010 03E00008 */ jr $ra -/* D69B34 80240014 0000102D */ daddu $v0, $zero, $zero -/* D69B38 80240018 00000000 */ nop -/* D69B3C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s b/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s deleted file mode 100644 index 8533ad9038..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_18/D6B620/func_80240000_D6B620.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D6B620 -/* D6B620 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D6B624 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D6B628 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6B62C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D6B630 80240010 03E00008 */ jr $ra -/* D6B634 80240014 0000102D */ daddu $v0, $zero, $zero -/* D6B638 80240018 00000000 */ nop -/* D6B63C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s b/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s deleted file mode 100644 index 305c210009..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_19/D6E9B0/func_80240000_D6E9B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D6E9B0 -/* D6E9B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D6E9B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D6E9B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D6E9BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D6E9C0 80240010 03E00008 */ jr $ra -/* D6E9C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D6E9C8 80240018 00000000 */ nop -/* D6E9CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s b/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s deleted file mode 100644 index d70179964e..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_20/D763A0/func_80240000_D763A0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D763A0 -/* D763A0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D763A4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D763A8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D763AC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D763B0 80240010 03E00008 */ jr $ra -/* D763B4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D763B8 80240018 00000000 */ nop -/* D763BC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s b/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s deleted file mode 100644 index 1262194525..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_21/D77F20/func_80240000_D77F20.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D77F20 -/* D77F20 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D77F24 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D77F28 80240008 24020001 */ addiu $v0, $zero, 1 -/* D77F2C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D77F30 80240010 03E00008 */ jr $ra -/* D77F34 80240014 0000102D */ daddu $v0, $zero, $zero -/* D77F38 80240018 00000000 */ nop -/* D77F3C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s b/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s deleted file mode 100644 index c21f08b034..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_22/D78880/func_80240000_D78880.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D78880 -/* D78880 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D78884 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D78888 80240008 24020001 */ addiu $v0, $zero, 1 -/* D7888C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D78890 80240010 03E00008 */ jr $ra -/* D78894 80240014 0000102D */ daddu $v0, $zero, $zero -/* D78898 80240018 00000000 */ nop -/* D7889C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s b/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s deleted file mode 100644 index e2cda7520a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_29/D7CB50/func_80240000_D7CB50.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D7CB50 -/* D7CB50 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D7CB54 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D7CB58 80240008 24020001 */ addiu $v0, $zero, 1 -/* D7CB5C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D7CB60 80240010 03E00008 */ jr $ra -/* D7CB64 80240014 0000102D */ daddu $v0, $zero, $zero -/* D7CB68 80240018 00000000 */ nop -/* D7CB6C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s b/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s deleted file mode 100644 index 9308c86f10..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_32/D86A00/func_80240000_D86A00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D86A00 -/* D86A00 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D86A04 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D86A08 80240008 24020001 */ addiu $v0, $zero, 1 -/* D86A0C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D86A10 80240010 03E00008 */ jr $ra -/* D86A14 80240014 0000102D */ daddu $v0, $zero, $zero -/* D86A18 80240018 00000000 */ nop -/* D86A1C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s b/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s deleted file mode 100644 index e4fe241ef2..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_33/D896E0/func_80240000_D896E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D896E0 -/* D896E0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D896E4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D896E8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D896EC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D896F0 80240010 03E00008 */ jr $ra -/* D896F4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D896F8 80240018 00000000 */ nop -/* D896FC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s b/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s deleted file mode 100644 index f8de6f4862..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_34/D8B3B0/func_80240000_D8B3B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D8B3B0 -/* D8B3B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D8B3B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D8B3B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D8B3BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D8B3C0 80240010 03E00008 */ jr $ra -/* D8B3C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D8B3C8 80240018 00000000 */ nop -/* D8B3CC 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s b/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s deleted file mode 100644 index d7d2c6983a..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_35/D8D250/func_80240000_D8D250.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D8D250 -/* D8D250 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D8D254 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D8D258 80240008 24020001 */ addiu $v0, $zero, 1 -/* D8D25C 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D8D260 80240010 03E00008 */ jr $ra -/* D8D264 80240014 0000102D */ daddu $v0, $zero, $zero -/* D8D268 80240018 00000000 */ nop -/* D8D26C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s b/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s deleted file mode 100644 index a539761336..0000000000 --- a/asm/nonmatchings/world/area_pra/pra_40/D999B0/func_80240000_D999B0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D999B0 -/* D999B0 80240000 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* D999B4 80240004 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* D999B8 80240008 24020001 */ addiu $v0, $zero, 1 -/* D999BC 8024000C A0620084 */ sb $v0, 0x84($v1) -/* D999C0 80240010 03E00008 */ jr $ra -/* D999C4 80240014 0000102D */ daddu $v0, $zero, $zero -/* D999C8 80240018 00000000 */ nop -/* D999CC 8024001C 00000000 */ nop diff --git a/include/common_structs.h b/include/common_structs.h index 5bf772177e..ffa8fb07da 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -902,7 +902,9 @@ typedef struct GameStatus { /* 0x07D */ s8 unk_7D; /* 0x07E */ u8 peachFlags; /* (1 = isPeach, 2 = isTransformed, 4 = hasUmbrella) */ /* 0x07F */ u8 peachDisguise; /* (1 = koopatrol, 2 = hammer bros, 3 = clubba) */ - /* 0x080 */ char unk_80[6]; + /* 0x080 */ char unk_80[4]; + /* 0x084 */ s8 unk_84; + /* 0x085 */ char unk_85; /* 0x086 */ s16 areaID; /* Created by retype action */ /* 0x088 */ s16 prevArea; /* 0x08A */ s16 changedArea; /* (1 = yes) */ diff --git a/src/world/area_pra/pra_01/D4D040.c b/src/world/area_pra/pra_01/D4D040.c index 9a82e4c942..7fcbb80a84 100644 --- a/src/world/area_pra/pra_01/D4D040.c +++ b/src/world/area_pra/pra_01/D4D040.c @@ -1,3 +1,3 @@ #include "pra_01.h" -INCLUDE_ASM(s32, "world/area_pra/pra_01/D4D040", func_80240000_D4D040); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_02/D4FFF0.c b/src/world/area_pra/pra_02/D4FFF0.c index b60e6e60c0..6f00bc03de 100644 --- a/src/world/area_pra/pra_02/D4FFF0.c +++ b/src/world/area_pra/pra_02/D4FFF0.c @@ -1,3 +1,3 @@ #include "pra_02.h" -INCLUDE_ASM(s32, "world/area_pra/pra_02/D4FFF0", func_80240000_D4FFF0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_03/D53CB0.c b/src/world/area_pra/pra_03/D53CB0.c index 3a2cf7d116..b26425561a 100644 --- a/src/world/area_pra/pra_03/D53CB0.c +++ b/src/world/area_pra/pra_03/D53CB0.c @@ -1,3 +1,3 @@ #include "pra_03.h" -INCLUDE_ASM(s32, "world/area_pra/pra_03/D53CB0", func_80240000_D53CB0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_04/D54690.c b/src/world/area_pra/pra_04/D54690.c index 5a1f102bb0..ea39ab04ba 100644 --- a/src/world/area_pra/pra_04/D54690.c +++ b/src/world/area_pra/pra_04/D54690.c @@ -1,3 +1,3 @@ #include "pra_04.h" -INCLUDE_ASM(s32, "world/area_pra/pra_04/D54690", func_80240000_D54690); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_05/D55BB0.c b/src/world/area_pra/pra_05/D55BB0.c index a76fea35b6..e1a8371bc7 100644 --- a/src/world/area_pra/pra_05/D55BB0.c +++ b/src/world/area_pra/pra_05/D55BB0.c @@ -1,3 +1,3 @@ #include "pra_05.h" -INCLUDE_ASM(s32, "world/area_pra/pra_05/D55BB0", func_80240000_D55BB0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_09/D58890.c b/src/world/area_pra/pra_09/D58890.c index bc8a76e540..1cb5264462 100644 --- a/src/world/area_pra/pra_09/D58890.c +++ b/src/world/area_pra/pra_09/D58890.c @@ -1,3 +1,3 @@ #include "pra_09.h" -INCLUDE_ASM(s32, "world/area_pra/pra_09/D58890", func_80240000_D58890); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_10/D5F2B0.c b/src/world/area_pra/pra_10/D5F2B0.c index 5e9a953841..ba3fead5e3 100644 --- a/src/world/area_pra/pra_10/D5F2B0.c +++ b/src/world/area_pra/pra_10/D5F2B0.c @@ -1,3 +1,3 @@ #include "pra_10.h" -INCLUDE_ASM(s32, "world/area_pra/pra_10/D5F2B0", func_80240000_D5F2B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_11/D61500.c b/src/world/area_pra/pra_11/D61500.c index 373e722a18..1b31d71d22 100644 --- a/src/world/area_pra/pra_11/D61500.c +++ b/src/world/area_pra/pra_11/D61500.c @@ -1,3 +1,3 @@ #include "pra_11.h" -INCLUDE_ASM(s32, "world/area_pra/pra_11/D61500", func_80240000_D61500); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_13/D645E0.c b/src/world/area_pra/pra_13/D645E0.c index 7d8a23ffdf..1b9d5657ec 100644 --- a/src/world/area_pra/pra_13/D645E0.c +++ b/src/world/area_pra/pra_13/D645E0.c @@ -1,3 +1,3 @@ #include "pra_13.h" -INCLUDE_ASM(s32, "world/area_pra/pra_13/D645E0", func_80240000_D645E0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_14/D67D00.c b/src/world/area_pra/pra_14/D67D00.c index 14cbe32076..3a141351d5 100644 --- a/src/world/area_pra/pra_14/D67D00.c +++ b/src/world/area_pra/pra_14/D67D00.c @@ -1,3 +1,3 @@ #include "pra_14.h" -INCLUDE_ASM(s32, "world/area_pra/pra_14/D67D00", func_80240000_D67D00); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_15/D69810.c b/src/world/area_pra/pra_15/D69810.c index 9de07a27be..6a527b7f71 100644 --- a/src/world/area_pra/pra_15/D69810.c +++ b/src/world/area_pra/pra_15/D69810.c @@ -1,3 +1,3 @@ #include "pra_15.h" -INCLUDE_ASM(s32, "world/area_pra/pra_15/D69810", func_80240000_D69810); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_16/D69B20.c b/src/world/area_pra/pra_16/D69B20.c index a0591e89d0..2703d6c503 100644 --- a/src/world/area_pra/pra_16/D69B20.c +++ b/src/world/area_pra/pra_16/D69B20.c @@ -1,3 +1,3 @@ #include "pra_16.h" -INCLUDE_ASM(s32, "world/area_pra/pra_16/D69B20", func_80240000_D69B20); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_18/D6B620.c b/src/world/area_pra/pra_18/D6B620.c index fe48f1afad..7b91e393c9 100644 --- a/src/world/area_pra/pra_18/D6B620.c +++ b/src/world/area_pra/pra_18/D6B620.c @@ -1,3 +1,3 @@ #include "pra_18.h" -INCLUDE_ASM(s32, "world/area_pra/pra_18/D6B620", func_80240000_D6B620); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_19/D6E9B0.c b/src/world/area_pra/pra_19/D6E9B0.c index f01da2c3a4..954288afc8 100644 --- a/src/world/area_pra/pra_19/D6E9B0.c +++ b/src/world/area_pra/pra_19/D6E9B0.c @@ -1,3 +1,3 @@ #include "pra_19.h" -INCLUDE_ASM(s32, "world/area_pra/pra_19/D6E9B0", func_80240000_D6E9B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_20/D763A0.c b/src/world/area_pra/pra_20/D763A0.c index e7b643ff7c..7c9de4d59f 100644 --- a/src/world/area_pra/pra_20/D763A0.c +++ b/src/world/area_pra/pra_20/D763A0.c @@ -1,3 +1,3 @@ #include "pra_20.h" -INCLUDE_ASM(s32, "world/area_pra/pra_20/D763A0", func_80240000_D763A0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_21/D77F20.c b/src/world/area_pra/pra_21/D77F20.c index 04d9211a05..7185bc86ae 100644 --- a/src/world/area_pra/pra_21/D77F20.c +++ b/src/world/area_pra/pra_21/D77F20.c @@ -1,3 +1,3 @@ #include "pra_21.h" -INCLUDE_ASM(s32, "world/area_pra/pra_21/D77F20", func_80240000_D77F20); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_22/D78880.c b/src/world/area_pra/pra_22/D78880.c index 7fa620dcf5..c0ab0178ac 100644 --- a/src/world/area_pra/pra_22/D78880.c +++ b/src/world/area_pra/pra_22/D78880.c @@ -1,3 +1,3 @@ #include "pra_22.h" -INCLUDE_ASM(s32, "world/area_pra/pra_22/D78880", func_80240000_D78880); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_29/D7CB50.c b/src/world/area_pra/pra_29/D7CB50.c index 1151d65219..64b4866e3c 100644 --- a/src/world/area_pra/pra_29/D7CB50.c +++ b/src/world/area_pra/pra_29/D7CB50.c @@ -1,3 +1,3 @@ #include "pra_29.h" -INCLUDE_ASM(s32, "world/area_pra/pra_29/D7CB50", func_80240000_D7CB50); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_32/D86A00.c b/src/world/area_pra/pra_32/D86A00.c index 04be5e972b..ebc64e2d55 100644 --- a/src/world/area_pra/pra_32/D86A00.c +++ b/src/world/area_pra/pra_32/D86A00.c @@ -1,3 +1,3 @@ #include "pra_32.h" -INCLUDE_ASM(s32, "world/area_pra/pra_32/D86A00", func_80240000_D86A00); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_33/D896E0.c b/src/world/area_pra/pra_33/D896E0.c index f9ba2c2222..26e883aeec 100644 --- a/src/world/area_pra/pra_33/D896E0.c +++ b/src/world/area_pra/pra_33/D896E0.c @@ -1,3 +1,3 @@ #include "pra_33.h" -INCLUDE_ASM(s32, "world/area_pra/pra_33/D896E0", func_80240000_D896E0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_34/D8B3B0.c b/src/world/area_pra/pra_34/D8B3B0.c index c04f9203cc..d81c0ff150 100644 --- a/src/world/area_pra/pra_34/D8B3B0.c +++ b/src/world/area_pra/pra_34/D8B3B0.c @@ -1,3 +1,3 @@ #include "pra_34.h" -INCLUDE_ASM(s32, "world/area_pra/pra_34/D8B3B0", func_80240000_D8B3B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_35/D8D250.c b/src/world/area_pra/pra_35/D8D250.c index 778223b3a2..20dff11ba4 100644 --- a/src/world/area_pra/pra_35/D8D250.c +++ b/src/world/area_pra/pra_35/D8D250.c @@ -1,3 +1,3 @@ #include "pra_35.h" -INCLUDE_ASM(s32, "world/area_pra/pra_35/D8D250", func_80240000_D8D250); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/area_pra/pra_40/D999B0.c b/src/world/area_pra/pra_40/D999B0.c index 701becc035..afa78735c4 100644 --- a/src/world/area_pra/pra_40/D999B0.c +++ b/src/world/area_pra/pra_40/D999B0.c @@ -1,3 +1,3 @@ #include "pra_40.h" -INCLUDE_ASM(s32, "world/area_pra/pra_40/D999B0", func_80240000_D999B0); +#include "world/common/SetGameStatusUnk84_1.inc.c" diff --git a/src/world/common/SetGameStatusUnk84_1.inc.c b/src/world/common/SetGameStatusUnk84_1.inc.c new file mode 100644 index 0000000000..8a2857ebdb --- /dev/null +++ b/src/world/common/SetGameStatusUnk84_1.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus SetGameStatusUnk84_1(ScriptInstance* script, s32 isInitialCall) { + GAME_STATUS->unk_84 = 1; + return ApiStatus_BLOCK; +}