From da058dc0950e151abdedf6f0825368d62415d908 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:07:11 -0400 Subject: [PATCH] GetGameStatus75 --- .../dro_01/95B7E0/func_80241FAC_95D1AC.s | 16 ---------------- .../dro_02/9694C0/func_80240E3C_969FFC.s | 16 ---------------- .../hos_03/A1BDB0/func_80242FE0_A1E0E0.s | 16 ---------------- .../jan_02/B2C8A0/func_80242150_B2E5C0.s | 16 ---------------- .../jan_03/B34BD0/func_802426D8_B372A8.s | 16 ---------------- .../kmr_02/8B0070/func_80240ECC_8B0F3C.s | 16 ---------------- .../mac_00/7EB340/func_8024116C_7EBE7C.s | 16 ---------------- .../mac_01/8017D0/func_80242A4C_8032CC.s | 16 ---------------- .../mac_02/823BF0/func_802422FC_8255BC.s | 16 ---------------- .../mac_03/831B20/func_80240FEC_8327EC.s | 16 ---------------- .../mac_04/843030/func_80240F9C_843B6C.s | 16 ---------------- .../mac_05/852170/func_80241E5C_853FCC.s | 16 ---------------- .../nok_01/9C53E0/func_802418A4_9C6C84.s | 16 ---------------- .../nok_02/9D7AA0/func_8024244C_9D946C.s | 16 ---------------- .../sam_01/CF7E80/func_8024123C_CF8DAC.s | 16 ---------------- .../sam_02/D05F60/func_80241668_D06D98.s | 16 ---------------- .../sam_11/D3ADA0/func_8024130C_D3B8DC.s | 16 ---------------- include/common_structs.h | 3 ++- src/world/area_dro/dro_01/95B7E0.c | 2 +- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kmr/kmr_02/8B0070.c | 2 +- src/world/area_mac/mac_00/7EB340.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_02/823BF0.c | 2 +- src/world/area_mac/mac_03/831B20.c | 2 +- src/world/area_mac/mac_04/843030.c | 2 +- src/world/area_mac/mac_05/852170.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_nok/nok_02/9D7AA0.c | 2 +- src/world/area_sam/sam_01/CF7E80.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_11/D3ADA0.c | 2 +- src/world/common/GetGameStatus75.inc.c | 6 ++++++ 36 files changed, 25 insertions(+), 290 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s create mode 100644 src/world/common/GetGameStatus75.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s deleted file mode 100644 index 2c1668a23a..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FAC_95D1AC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FAC_95D1AC -/* 95D1AC 80241FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95D1B0 80241FB0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 95D1B4 80241FB4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 95D1B8 80241FB8 3C05FE36 */ lui $a1, 0xfe36 -/* 95D1BC 80241FBC AFBF0010 */ sw $ra, 0x10($sp) -/* 95D1C0 80241FC0 80460075 */ lb $a2, 0x75($v0) -/* 95D1C4 80241FC4 0C0B2026 */ jal set_variable -/* 95D1C8 80241FC8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95D1CC 80241FCC 8FBF0010 */ lw $ra, 0x10($sp) -/* 95D1D0 80241FD0 24020002 */ addiu $v0, $zero, 2 -/* 95D1D4 80241FD4 03E00008 */ jr $ra -/* 95D1D8 80241FD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s deleted file mode 100644 index 14fe34bfc1..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E3C_969FFC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E3C_969FFC -/* 969FFC 80240E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96A000 80240E40 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 96A004 80240E44 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 96A008 80240E48 3C05FE36 */ lui $a1, 0xfe36 -/* 96A00C 80240E4C AFBF0010 */ sw $ra, 0x10($sp) -/* 96A010 80240E50 80460075 */ lb $a2, 0x75($v0) -/* 96A014 80240E54 0C0B2026 */ jal set_variable -/* 96A018 80240E58 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 96A01C 80240E5C 8FBF0010 */ lw $ra, 0x10($sp) -/* 96A020 80240E60 24020002 */ addiu $v0, $zero, 2 -/* 96A024 80240E64 03E00008 */ jr $ra -/* 96A028 80240E68 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s deleted file mode 100644 index b17c26eeea..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242FE0_A1E0E0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242FE0_A1E0E0 -/* A1E0E0 80242FE0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1E0E4 80242FE4 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* A1E0E8 80242FE8 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* A1E0EC 80242FEC 3C05FE36 */ lui $a1, 0xfe36 -/* A1E0F0 80242FF0 AFBF0010 */ sw $ra, 0x10($sp) -/* A1E0F4 80242FF4 80460075 */ lb $a2, 0x75($v0) -/* A1E0F8 80242FF8 0C0B2026 */ jal set_variable -/* A1E0FC 80242FFC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A1E100 80243000 8FBF0010 */ lw $ra, 0x10($sp) -/* A1E104 80243004 24020002 */ addiu $v0, $zero, 2 -/* A1E108 80243008 03E00008 */ jr $ra -/* A1E10C 8024300C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s deleted file mode 100644 index d52189f12e..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242150_B2E5C0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242150_B2E5C0 -/* B2E5C0 80242150 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2E5C4 80242154 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B2E5C8 80242158 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B2E5CC 8024215C 3C05FE36 */ lui $a1, 0xfe36 -/* B2E5D0 80242160 AFBF0010 */ sw $ra, 0x10($sp) -/* B2E5D4 80242164 80460075 */ lb $a2, 0x75($v0) -/* B2E5D8 80242168 0C0B2026 */ jal set_variable -/* B2E5DC 8024216C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B2E5E0 80242170 8FBF0010 */ lw $ra, 0x10($sp) -/* B2E5E4 80242174 24020002 */ addiu $v0, $zero, 2 -/* B2E5E8 80242178 03E00008 */ jr $ra -/* B2E5EC 8024217C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s deleted file mode 100644 index 764671914f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802426D8_B372A8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426D8_B372A8 -/* B372A8 802426D8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B372AC 802426DC 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* B372B0 802426E0 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* B372B4 802426E4 3C05FE36 */ lui $a1, 0xfe36 -/* B372B8 802426E8 AFBF0010 */ sw $ra, 0x10($sp) -/* B372BC 802426EC 80460075 */ lb $a2, 0x75($v0) -/* B372C0 802426F0 0C0B2026 */ jal set_variable -/* B372C4 802426F4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B372C8 802426F8 8FBF0010 */ lw $ra, 0x10($sp) -/* B372CC 802426FC 24020002 */ addiu $v0, $zero, 2 -/* B372D0 80242700 03E00008 */ jr $ra -/* B372D4 80242704 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s deleted file mode 100644 index c12dac7408..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240ECC_8B0F3C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ECC_8B0F3C -/* 8B0F3C 80240ECC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B0F40 80240ED0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8B0F44 80240ED4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8B0F48 80240ED8 3C05FE36 */ lui $a1, 0xfe36 -/* 8B0F4C 80240EDC AFBF0010 */ sw $ra, 0x10($sp) -/* 8B0F50 80240EE0 80460075 */ lb $a2, 0x75($v0) -/* 8B0F54 80240EE4 0C0B2026 */ jal set_variable -/* 8B0F58 80240EE8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B0F5C 80240EEC 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B0F60 80240EF0 24020002 */ addiu $v0, $zero, 2 -/* 8B0F64 80240EF4 03E00008 */ jr $ra -/* 8B0F68 80240EF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s deleted file mode 100644 index d7ffbd5013..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024116C_7EBE7C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024116C_7EBE7C -/* 7EBE7C 8024116C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EBE80 80241170 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 7EBE84 80241174 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 7EBE88 80241178 3C05FE36 */ lui $a1, 0xfe36 -/* 7EBE8C 8024117C AFBF0010 */ sw $ra, 0x10($sp) -/* 7EBE90 80241180 80460075 */ lb $a2, 0x75($v0) -/* 7EBE94 80241184 0C0B2026 */ jal set_variable -/* 7EBE98 80241188 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EBE9C 8024118C 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EBEA0 80241190 24020002 */ addiu $v0, $zero, 2 -/* 7EBEA4 80241194 03E00008 */ jr $ra -/* 7EBEA8 80241198 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s deleted file mode 100644 index 883819a6bd..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A4C_8032CC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A4C_8032CC -/* 8032CC 80242A4C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8032D0 80242A50 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8032D4 80242A54 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8032D8 80242A58 3C05FE36 */ lui $a1, 0xfe36 -/* 8032DC 80242A5C AFBF0010 */ sw $ra, 0x10($sp) -/* 8032E0 80242A60 80460075 */ lb $a2, 0x75($v0) -/* 8032E4 80242A64 0C0B2026 */ jal set_variable -/* 8032E8 80242A68 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8032EC 80242A6C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8032F0 80242A70 24020002 */ addiu $v0, $zero, 2 -/* 8032F4 80242A74 03E00008 */ jr $ra -/* 8032F8 80242A78 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s deleted file mode 100644 index 5725780ba2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802422FC_8255BC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422FC_8255BC -/* 8255BC 802422FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8255C0 80242300 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8255C4 80242304 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8255C8 80242308 3C05FE36 */ lui $a1, 0xfe36 -/* 8255CC 8024230C AFBF0010 */ sw $ra, 0x10($sp) -/* 8255D0 80242310 80460075 */ lb $a2, 0x75($v0) -/* 8255D4 80242314 0C0B2026 */ jal set_variable -/* 8255D8 80242318 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8255DC 8024231C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8255E0 80242320 24020002 */ addiu $v0, $zero, 2 -/* 8255E4 80242324 03E00008 */ jr $ra -/* 8255E8 80242328 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s deleted file mode 100644 index 4949f1e384..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80240FEC_8327EC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FEC_8327EC -/* 8327EC 80240FEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8327F0 80240FF0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 8327F4 80240FF4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 8327F8 80240FF8 3C05FE36 */ lui $a1, 0xfe36 -/* 8327FC 80240FFC AFBF0010 */ sw $ra, 0x10($sp) -/* 832800 80241000 80460075 */ lb $a2, 0x75($v0) -/* 832804 80241004 0C0B2026 */ jal set_variable -/* 832808 80241008 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 83280C 8024100C 8FBF0010 */ lw $ra, 0x10($sp) -/* 832810 80241010 24020002 */ addiu $v0, $zero, 2 -/* 832814 80241014 03E00008 */ jr $ra -/* 832818 80241018 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s deleted file mode 100644 index c9949efe6f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240F9C_843B6C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F9C_843B6C -/* 843B6C 80240F9C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 843B70 80240FA0 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 843B74 80240FA4 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 843B78 80240FA8 3C05FE36 */ lui $a1, 0xfe36 -/* 843B7C 80240FAC AFBF0010 */ sw $ra, 0x10($sp) -/* 843B80 80240FB0 80460075 */ lb $a2, 0x75($v0) -/* 843B84 80240FB4 0C0B2026 */ jal set_variable -/* 843B88 80240FB8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 843B8C 80240FBC 8FBF0010 */ lw $ra, 0x10($sp) -/* 843B90 80240FC0 24020002 */ addiu $v0, $zero, 2 -/* 843B94 80240FC4 03E00008 */ jr $ra -/* 843B98 80240FC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s deleted file mode 100644 index 2448ab78c2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E5C_853FCC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E5C_853FCC -/* 853FCC 80241E5C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853FD0 80241E60 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 853FD4 80241E64 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 853FD8 80241E68 3C05FE36 */ lui $a1, 0xfe36 -/* 853FDC 80241E6C AFBF0010 */ sw $ra, 0x10($sp) -/* 853FE0 80241E70 80460075 */ lb $a2, 0x75($v0) -/* 853FE4 80241E74 0C0B2026 */ jal set_variable -/* 853FE8 80241E78 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 853FEC 80241E7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 853FF0 80241E80 24020002 */ addiu $v0, $zero, 2 -/* 853FF4 80241E84 03E00008 */ jr $ra -/* 853FF8 80241E88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s deleted file mode 100644 index 77956f0cbe..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418A4_9C6C84.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418A4_9C6C84 -/* 9C6C84 802418A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6C88 802418A8 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9C6C8C 802418AC 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9C6C90 802418B0 3C05FE36 */ lui $a1, 0xfe36 -/* 9C6C94 802418B4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6C98 802418B8 80460075 */ lb $a2, 0x75($v0) -/* 9C6C9C 802418BC 0C0B2026 */ jal set_variable -/* 9C6CA0 802418C0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9C6CA4 802418C4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6CA8 802418C8 24020002 */ addiu $v0, $zero, 2 -/* 9C6CAC 802418CC 03E00008 */ jr $ra -/* 9C6CB0 802418D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s deleted file mode 100644 index 0cbfc43145..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024244C_9D946C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024244C_9D946C -/* 9D946C 8024244C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D9470 80242450 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* 9D9474 80242454 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* 9D9478 80242458 3C05FE36 */ lui $a1, 0xfe36 -/* 9D947C 8024245C AFBF0010 */ sw $ra, 0x10($sp) -/* 9D9480 80242460 80460075 */ lb $a2, 0x75($v0) -/* 9D9484 80242464 0C0B2026 */ jal set_variable -/* 9D9488 80242468 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D948C 8024246C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D9490 80242470 24020002 */ addiu $v0, $zero, 2 -/* 9D9494 80242474 03E00008 */ jr $ra -/* 9D9498 80242478 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s deleted file mode 100644 index ab47e3b9d1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024123C_CF8DAC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024123C_CF8DAC -/* CF8DAC 8024123C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8DB0 80241240 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* CF8DB4 80241244 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* CF8DB8 80241248 3C05FE36 */ lui $a1, 0xfe36 -/* CF8DBC 8024124C AFBF0010 */ sw $ra, 0x10($sp) -/* CF8DC0 80241250 80460075 */ lb $a2, 0x75($v0) -/* CF8DC4 80241254 0C0B2026 */ jal set_variable -/* CF8DC8 80241258 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CF8DCC 8024125C 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8DD0 80241260 24020002 */ addiu $v0, $zero, 2 -/* CF8DD4 80241264 03E00008 */ jr $ra -/* CF8DD8 80241268 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s deleted file mode 100644 index 05d98f2420..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241668_D06D98.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241668_D06D98 -/* D06D98 80241668 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06D9C 8024166C 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D06DA0 80241670 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D06DA4 80241674 3C05FE36 */ lui $a1, 0xfe36 -/* D06DA8 80241678 AFBF0010 */ sw $ra, 0x10($sp) -/* D06DAC 8024167C 80460075 */ lb $a2, 0x75($v0) -/* D06DB0 80241680 0C0B2026 */ jal set_variable -/* D06DB4 80241684 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D06DB8 80241688 8FBF0010 */ lw $ra, 0x10($sp) -/* D06DBC 8024168C 24020002 */ addiu $v0, $zero, 2 -/* D06DC0 80241690 03E00008 */ jr $ra -/* D06DC4 80241694 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s deleted file mode 100644 index 1c74a349fd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024130C_D3B8DC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024130C_D3B8DC -/* D3B8DC 8024130C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B8E0 80241310 3C028007 */ lui $v0, %hi(gGameStatusPtr) -/* D3B8E4 80241314 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) -/* D3B8E8 80241318 3C05FE36 */ lui $a1, 0xfe36 -/* D3B8EC 8024131C AFBF0010 */ sw $ra, 0x10($sp) -/* D3B8F0 80241320 80460075 */ lb $a2, 0x75($v0) -/* D3B8F4 80241324 0C0B2026 */ jal set_variable -/* D3B8F8 80241328 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D3B8FC 8024132C 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B900 80241330 24020002 */ addiu $v0, $zero, 2 -/* D3B904 80241334 03E00008 */ jr $ra -/* D3B908 80241338 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/common_structs.h b/include/common_structs.h index a10f482c20..ddba0e53cd 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -879,7 +879,8 @@ typedef struct GameStatus { /* 0x071 */ s8 demoState; /* (0 = not demo, 1 = map demo, 2 = demo map changing) */ /* 0x072 */ u8 nextDemoScene; /* which part of the demo to play next */ /* 0x073 */ u8 contBitPattern; - /* 0x074 */ char unk_74[2]; + /* 0x074 */ char unk_74; + /* 0x075 */ s8 unk_75; /* 0x076 */ s8 unk_76; /* 0x077 */ char unk_77; /* 0x078 */ s8 disableScripts; diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index e3efb1148d..22ec45c565 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F78_95D178); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FAC_95D1AC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 83149e5e4e..a9474f9dd1 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E08_969FC8); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E3C_969FFC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index df7a2a10f6..38a86a3bdf 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FAC_A1E0AC); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FE0_A1E0E0); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 5b4e06e2c4..3b851deac3 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -68,7 +68,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024211C_B2E58C); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242150_B2E5C0); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index fe533e2b8a..a3c05adbbb 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -110,7 +110,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426A4_B37274); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426D8_B372A8); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 8d220bd67d..4bd0517de5 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240E98_8B0F08); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240ECC_8B0F3C); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index cc917dc914..ff665da249 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241138_7EBE48); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024116C_7EBE7C); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 03af03a6ac..6f9f9137e3 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A18_803298); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A4C_8032CC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 27384dfcc6..bcd3e2f306 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422C8_825588); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422FC_8255BC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 9cfe529fe9..570b5a783d 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FB8_8327B8); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FEC_8327EC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index ead724658c..6b8e166615 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F68_843B38); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F9C_843B6C); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index aec6a9d2da..4d8d5c54b7 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E28_853F98); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E5C_853FCC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index c4e92f65f6..535dc3b510 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -76,7 +76,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241870_9C6C50); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418A4_9C6C84); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 573f2ad2ad..664291827c 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242418_9D9438); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024244C_9D946C); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 0869a20d70..69254b3d83 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241208_CF8D78); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024123C_CF8DAC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 5affe1f3de..3ddca1dd30 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241634_D06D64); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241668_D06D98); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index e355401aea..19820e5db8 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412D8_D3B8A8); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024130C_D3B8DC); +#include "world/common/GetGameStatus75.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C); diff --git a/src/world/common/GetGameStatus75.inc.c b/src/world/common/GetGameStatus75.inc.c new file mode 100644 index 0000000000..952ed80cde --- /dev/null +++ b/src/world/common/GetGameStatus75.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus GetGameStatus75(ScriptInstance* script, s32 isInitialCall) { + set_variable(script, SI_VAR(0), GAME_STATUS->unk_75); + return ApiStatus_DONE2; +}