From f94c542a9df21329a66da13f0310ee9bd07d681a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 22:15:51 -0400 Subject: [PATCH 01/45] Set80151310_0 --- .../dro_01/95B7E0/func_8024159C_95C79C.s | 8 ---- .../dro_02/9694C0/func_8024042C_9695EC.s | 8 ---- .../hos_03/A1BDB0/func_802425D0_A1D6D0.s | 8 ---- .../jan_02/B2C8A0/func_80241740_B2DBB0.s | 8 ---- .../jan_03/B34BD0/func_80241CC8_B36898.s | 8 ---- .../kmr_02/8B0070/func_802404BC_8B052C.s | 8 ---- .../mac_00/7EB340/func_8024075C_7EB46C.s | 8 ---- .../mac_01/800880/func_80240000_800880.s | 21 ----------- .../mac_01/800880/func_80240044_8008C4.s | 37 ------------------- .../mac_01/8017D0/func_8024203C_8028BC.s | 8 ---- .../mac_01/8017D0/func_80243AA0_804320.s | 6 --- .../mac_02/823BF0/func_802418EC_824BAC.s | 8 ---- .../mac_03/831B20/func_802405DC_831DDC.s | 8 ---- .../mac_04/843030/func_8024058C_84315C.s | 8 ---- .../mac_05/852170/func_8024144C_8535BC.s | 8 ---- .../nok_01/9C53E0/func_80240E94_9C6274.s | 8 ---- .../nok_02/9D7AA0/func_80241A3C_9D8A5C.s | 8 ---- .../sam_01/CF7E80/func_8024082C_CF839C.s | 8 ---- .../sam_02/D05F60/func_80240C58_D06388.s | 8 ---- .../sam_11/D3A930/func_80240554_D3AB24.s | 8 ---- .../sam_11/D3ADA0/func_802408FC_D3AECC.s | 8 ---- include/common_structs.h | 2 +- include/functions.h | 2 +- src/code_7E2AA0.c | 1 + src/code_b72b0_len_15ed0.c | 2 +- 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/800880.c | 16 +++++++- src/world/area_mac/mac_01/8017D0.c | 6 ++- 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/D3A930.c | 2 +- src/world/area_sam/sam_11/D3ADA0.c | 2 +- src/world/common/Set80151310_0.inc.c | 6 +++ 45 files changed, 45 insertions(+), 232 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s create mode 100644 src/world/common/Set80151310_0.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s deleted file mode 100644 index a09e694f23..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024159C_95C79C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024159C_95C79C -/* 95C79C 8024159C 3C018015 */ lui $at, %hi(D_80151310) -/* 95C7A0 802415A0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 95C7A4 802415A4 03E00008 */ jr $ra -/* 95C7A8 802415A8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s deleted file mode 100644 index 67a3458f14..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024042C_9695EC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024042C_9695EC -/* 9695EC 8024042C 3C018015 */ lui $at, %hi(D_80151310) -/* 9695F0 80240430 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9695F4 80240434 03E00008 */ jr $ra -/* 9695F8 80240438 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s deleted file mode 100644 index 67421acd62..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425D0_A1D6D0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425D0_A1D6D0 -/* A1D6D0 802425D0 3C018015 */ lui $at, %hi(D_80151310) -/* A1D6D4 802425D4 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* A1D6D8 802425D8 03E00008 */ jr $ra -/* A1D6DC 802425DC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s deleted file mode 100644 index 25e083dfc7..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80241740_B2DBB0.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241740_B2DBB0 -/* B2DBB0 80241740 3C018015 */ lui $at, %hi(D_80151310) -/* B2DBB4 80241744 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* B2DBB8 80241748 03E00008 */ jr $ra -/* B2DBBC 8024174C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s deleted file mode 100644 index 4d608bced3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CC8_B36898.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CC8_B36898 -/* B36898 80241CC8 3C018015 */ lui $at, %hi(D_80151310) -/* B3689C 80241CCC AC201310 */ sw $zero, %lo(D_80151310)($at) -/* B368A0 80241CD0 03E00008 */ jr $ra -/* B368A4 80241CD4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s deleted file mode 100644 index 1d8f1385f5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404BC_8B052C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404BC_8B052C -/* 8B052C 802404BC 3C018015 */ lui $at, %hi(D_80151310) -/* 8B0530 802404C0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8B0534 802404C4 03E00008 */ jr $ra -/* 8B0538 802404C8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s deleted file mode 100644 index ab1858da37..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024075C_7EB46C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024075C_7EB46C -/* 7EB46C 8024075C 3C018015 */ lui $at, %hi(D_80151310) -/* 7EB470 80240760 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 7EB474 80240764 03E00008 */ jr $ra -/* 7EB478 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s deleted file mode 100644 index 00ed9945be..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240000_800880.s +++ /dev/null @@ -1,21 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_800880 -/* 800880 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 800884 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 800888 80240008 8C82000C */ lw $v0, 0xc($a0) -/* 80088C 8024000C 0C0B1EAF */ jal get_variable -/* 800890 80240010 8C450000 */ lw $a1, ($v0) -/* 800894 80240014 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 800898 80240018 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 80089C 8024001C 8C630140 */ lw $v1, 0x140($v1) -/* 8008A0 80240020 00021100 */ sll $v0, $v0, 4 -/* 8008A4 80240024 00431021 */ addu $v0, $v0, $v1 -/* 8008A8 80240028 8C440000 */ lw $a0, ($v0) -/* 8008AC 8024002C 0C04D052 */ jal set_item_entity_flags -/* 8008B0 80240030 24050040 */ addiu $a1, $zero, 0x40 -/* 8008B4 80240034 8FBF0010 */ lw $ra, 0x10($sp) -/* 8008B8 80240038 24020002 */ addiu $v0, $zero, 2 -/* 8008BC 8024003C 03E00008 */ jr $ra -/* 8008C0 80240040 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s b/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s deleted file mode 100644 index feadb69b5c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/800880/func_80240044_8008C4.s +++ /dev/null @@ -1,37 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240044_8008C4 -/* 8008C4 80240044 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8008C8 80240048 AFBF0018 */ sw $ra, 0x18($sp) -/* 8008CC 8024004C AFB10014 */ sw $s1, 0x14($sp) -/* 8008D0 80240050 AFB00010 */ sw $s0, 0x10($sp) -/* 8008D4 80240054 8C82000C */ lw $v0, 0xc($a0) -/* 8008D8 80240058 0C0B1EAF */ jal get_variable -/* 8008DC 8024005C 8C450000 */ lw $a1, ($v0) -/* 8008E0 80240060 0000202D */ daddu $a0, $zero, $zero -/* 8008E4 80240064 3C05FD05 */ lui $a1, 0xfd05 -/* 8008E8 80240068 34A50F82 */ ori $a1, $a1, 0xf82 -/* 8008EC 8024006C 0C0B1EAF */ jal get_variable -/* 8008F0 80240070 0040802D */ daddu $s0, $v0, $zero -/* 8008F4 80240074 3C038007 */ lui $v1, %hi(gGameStatusPtr) -/* 8008F8 80240078 8C63419C */ lw $v1, %lo(gGameStatusPtr)($v1) -/* 8008FC 8024007C 24050040 */ addiu $a1, $zero, 0x40 -/* 800900 80240080 8C640140 */ lw $a0, 0x140($v1) -/* 800904 80240084 00101900 */ sll $v1, $s0, 4 -/* 800908 80240088 00641821 */ addu $v1, $v1, $a0 -/* 80090C 8024008C 8C640000 */ lw $a0, ($v1) -/* 800910 80240090 0C04D052 */ jal set_item_entity_flags -/* 800914 80240094 0040882D */ daddu $s1, $v0, $zero -/* 800918 80240098 0000202D */ daddu $a0, $zero, $zero -/* 80091C 8024009C 00108080 */ sll $s0, $s0, 2 -/* 800920 802400A0 02118021 */ addu $s0, $s0, $s1 -/* 800924 802400A4 8E050000 */ lw $a1, ($s0) -/* 800928 802400A8 0C0B2026 */ jal set_variable -/* 80092C 802400AC 24060001 */ addiu $a2, $zero, 1 -/* 800930 802400B0 8FBF0018 */ lw $ra, 0x18($sp) -/* 800934 802400B4 8FB10014 */ lw $s1, 0x14($sp) -/* 800938 802400B8 8FB00010 */ lw $s0, 0x10($sp) -/* 80093C 802400BC 24020002 */ addiu $v0, $zero, 2 -/* 800940 802400C0 03E00008 */ jr $ra -/* 800944 802400C4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s deleted file mode 100644 index d88bf7c134..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024203C_8028BC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024203C_8028BC -/* 8028BC 8024203C 3C018015 */ lui $at, %hi(D_80151310) -/* 8028C0 80242040 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8028C4 80242044 03E00008 */ jr $ra -/* 8028C8 80242048 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s deleted file mode 100644 index 6db024c51e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243AA0_804320.s +++ /dev/null @@ -1,6 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243AA0_804320 -/* 804320 80243AA0 03E00008 */ jr $ra -/* 804324 80243AA4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s deleted file mode 100644 index f5aeb9f695..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418EC_824BAC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418EC_824BAC -/* 824BAC 802418EC 3C018015 */ lui $at, %hi(D_80151310) -/* 824BB0 802418F0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 824BB4 802418F4 03E00008 */ jr $ra -/* 824BB8 802418F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s deleted file mode 100644 index e57f03e92f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405DC_831DDC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405DC_831DDC -/* 831DDC 802405DC 3C018015 */ lui $at, %hi(D_80151310) -/* 831DE0 802405E0 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 831DE4 802405E4 03E00008 */ jr $ra -/* 831DE8 802405E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s deleted file mode 100644 index 4a79b1c634..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024058C_84315C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024058C_84315C -/* 84315C 8024058C 3C018015 */ lui $at, %hi(D_80151310) -/* 843160 80240590 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 843164 80240594 03E00008 */ jr $ra -/* 843168 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s deleted file mode 100644 index fb3ec316b1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024144C_8535BC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024144C_8535BC -/* 8535BC 8024144C 3C018015 */ lui $at, %hi(D_80151310) -/* 8535C0 80241450 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 8535C4 80241454 03E00008 */ jr $ra -/* 8535C8 80241458 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s deleted file mode 100644 index 1c38b3a255..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E94_9C6274.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E94_9C6274 -/* 9C6274 80240E94 3C018015 */ lui $at, %hi(D_80151310) -/* 9C6278 80240E98 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9C627C 80240E9C 03E00008 */ jr $ra -/* 9C6280 80240EA0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s deleted file mode 100644 index 37af635b84..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A3C_9D8A5C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A3C_9D8A5C -/* 9D8A5C 80241A3C 3C018015 */ lui $at, %hi(D_80151310) -/* 9D8A60 80241A40 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* 9D8A64 80241A44 03E00008 */ jr $ra -/* 9D8A68 80241A48 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s deleted file mode 100644 index 3aa0d280ba..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024082C_CF839C.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024082C_CF839C -/* CF839C 8024082C 3C018015 */ lui $at, %hi(D_80151310) -/* CF83A0 80240830 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* CF83A4 80240834 03E00008 */ jr $ra -/* CF83A8 80240838 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s deleted file mode 100644 index 478c4497ba..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C58_D06388.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C58_D06388 -/* D06388 80240C58 3C018015 */ lui $at, %hi(D_80151310) -/* D0638C 80240C5C AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D06390 80240C60 03E00008 */ jr $ra -/* D06394 80240C64 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s deleted file mode 100644 index 8fb3711d85..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240554_D3AB24.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240554_D3AB24 -/* D3AB24 80240554 3C018015 */ lui $at, %hi(D_80151310) -/* D3AB28 80240558 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D3AB2C 8024055C 03E00008 */ jr $ra -/* D3AB30 80240560 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s deleted file mode 100644 index 602720afe0..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408FC_D3AECC.s +++ /dev/null @@ -1,8 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408FC_D3AECC -/* D3AECC 802408FC 3C018015 */ lui $at, %hi(D_80151310) -/* D3AED0 80240900 AC201310 */ sw $zero, %lo(D_80151310)($at) -/* D3AED4 80240904 03E00008 */ jr $ra -/* D3AED8 80240908 24020002 */ addiu $v0, $zero, 2 diff --git a/include/common_structs.h b/include/common_structs.h index c2c2be9b11..a10f482c20 100644 --- a/include/common_structs.h +++ b/include/common_structs.h @@ -916,7 +916,7 @@ typedef struct GameStatus { /* 0x136 */ char unk_136[2]; /* 0x138 */ s32 nextRNG; /* 0x13C */ char unk_13C[4]; - /* 0x140 */ UNK_PTR shopItemData; + /* 0x140 */ s32* shopItemData; /* 0x144 */ struct Shop* mapShop; /* 0x148 */ s16 enableBackground; /* (bit 2 is also used for something) */ /* 0x14A */ s16 backgroundMinW; diff --git a/include/functions.h b/include/functions.h index c4333481bb..0b63c6b884 100644 --- a/include/functions.h +++ b/include/functions.h @@ -97,7 +97,7 @@ void make_item_entity_delayed(s32 itemID, f32 x, f32 y, f32 z, s32 unk1, s32 unk void set_item_entity_position(s32 itemEntityIndex, f32 x, f32 y, f32 z); ItemEntity* get_item_entity(s32 itemEntityIndex); s32 make_item_entity_nodelay(s32 itemID, f32 x, f32 y, f32 z, ItemSpawnMode itemSpawnMode, s32 pickupVar); - +void set_item_entity_flags(s32 itemEntityIndex, s32 flag); void set_cam_viewport(s16 id, s16 x, s16 y, s16 width, s16 height); diff --git a/src/code_7E2AA0.c b/src/code_7E2AA0.c index 7b711c0be3..339305f3b6 100644 --- a/src/code_7E2AA0.c +++ b/src/code_7E2AA0.c @@ -96,6 +96,7 @@ ApiStatus func_80282610(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } +// common probably ApiStatus func_80282624(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 0; return ApiStatus_DONE2; diff --git a/src/code_b72b0_len_15ed0.c b/src/code_b72b0_len_15ed0.c index 035599feaf..32148743d3 100644 --- a/src/code_b72b0_len_15ed0.c +++ b/src/code_b72b0_len_15ed0.c @@ -232,7 +232,7 @@ INCLUDE_ASM(s32, "code_b72b0_len_15ed0", test_item_player_collision); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", func_80133FC8); -INCLUDE_ASM(s32, "code_b72b0_len_15ed0", set_item_entity_flags); +INCLUDE_ASM(void, "code_b72b0_len_15ed0", set_item_entity_flags, s32 itemEntityIndex, s32 flag); INCLUDE_ASM(s32, "code_b72b0_len_15ed0", clear_item_entity_flags); diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 5a3ae9fb82..07cc068199 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024159C_95C79C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 29d999086e..f1b83904dc 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024042C_9695EC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 3b7df30ad8..7cb60e96ea 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425D0_A1D6D0); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 6463b1417d..5e4e1bdb84 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241740_B2DBB0); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 57041180db..24c7350a8c 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -84,7 +84,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CC8_B36898); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 9d942f4147..5a9849bd69 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404BC_8B052C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 8417e2cb9a..658037b61e 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024075C_7EB46C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); diff --git a/src/world/area_mac/mac_01/800880.c b/src/world/area_mac/mac_01/800880.c index 775a7760db..308033f505 100644 --- a/src/world/area_mac/mac_01/800880.c +++ b/src/world/area_mac/mac_01/800880.c @@ -1,7 +1,19 @@ #include "mac_01.h" -INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240000_800880); +ApiStatus func_80240000_800880(ScriptInstance* script, s32 isInitialCall) { + s32 itemIndex = get_variable(script, *script->ptrReadPos); -INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_80240044_8008C4); + set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40); + return ApiStatus_DONE2; +} + +ApiStatus func_80240044_8008C4(ScriptInstance* script, s32 isInitialCall) { + s32 itemIndex = get_variable(script, *script->ptrReadPos); + s32* var1 = get_variable(NULL, SI_MAP_VAR(2)); + + set_item_entity_flags(GAME_STATUS->shopItemData[itemIndex * 4], 0x40); + set_variable(NULL, var1[itemIndex], 1); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_01/800880", func_802400C8_800948); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 5505145b5f..0e381f6894 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024203C_8028BC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); @@ -116,7 +116,9 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243AA0_804320); +ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) { + return ApiStatus_DONE2; +} #include "world/common/GetNpcCollisionHeight.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 21d7a537f0..ff42fb2076 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418EC_824BAC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 9091489de7..7f58c90beb 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405DC_831DDC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index a2a0da5d38..bedafef124 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024058C_84315C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index f6ae4a2a04..e9436ae700 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024144C_8535BC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 3b6c77494e..da63e5ea1b 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E94_9C6274); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index ca0701e2b8..dd4613d90e 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A3C_9D8A5C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 7f842bc9bd..78f0cd4ac7 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024082C_CF839C); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 929ed9196e..8ddd53f427 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C58_D06388); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index 2f47758e38..9496af1550 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240554_D3AB24); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 93d62f51de..2367a47ff8 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -6,7 +6,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408FC_D3AECC); +#include "world/common/Set80151310_0.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310_0.inc.c new file mode 100644 index 0000000000..953e1f4232 --- /dev/null +++ b/src/world/common/Set80151310_0.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { + D_80151310 = 0; + return ApiStatus_DONE2; +} From ba35048ab208a65a6504d17de0e0b7c658553323 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 22:20:45 -0400 Subject: [PATCH 02/45] GetPlayerCoins --- .../world/area_mac/mac_01/8017D0/func_802440E8_804968.s | 9 --------- .../world/area_mac/mac_03/833740/func_80241F6C_83376C.s | 9 --------- .../world/area_mac/mac_04/843030/func_802419D0_8445A0.s | 9 --------- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_03/833740.c | 2 +- src/world/area_mac/mac_04/843030.c | 2 +- src/world/common/GetPlayerCoins.inc.c | 6 ++++++ 7 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s create mode 100644 src/world/common/GetPlayerCoins.inc.c diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s deleted file mode 100644 index 198bddddb5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802440E8_804968.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802440E8_804968 -/* 804968 802440E8 3C028011 */ lui $v0, 0x8011 -/* 80496C 802440EC 8442F29C */ lh $v0, -0xd64($v0) -/* 804970 802440F0 AC820084 */ sw $v0, 0x84($a0) -/* 804974 802440F4 03E00008 */ jr $ra -/* 804978 802440F8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s b/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s deleted file mode 100644 index f8b4208bfe..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/833740/func_80241F6C_83376C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F6C_83376C -/* 83376C 80241F6C 3C028011 */ lui $v0, 0x8011 -/* 833770 80241F70 8442F29C */ lh $v0, -0xd64($v0) -/* 833774 80241F74 AC820084 */ sw $v0, 0x84($a0) -/* 833778 80241F78 03E00008 */ jr $ra -/* 83377C 80241F7C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s deleted file mode 100644 index d61c2be71c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802419D0_8445A0.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419D0_8445A0 -/* 8445A0 802419D0 3C028011 */ lui $v0, 0x8011 -/* 8445A4 802419D4 8442F29C */ lh $v0, -0xd64($v0) -/* 8445A8 802419D8 AC820084 */ sw $v0, 0x84($a0) -/* 8445AC 802419DC 03E00008 */ jr $ra -/* 8445B0 802419E0 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 0e381f6894..cd2278afa4 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -138,7 +138,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80244078_8048F8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440BC_80493C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440E8_804968); +#include "world/common/GetPlayerCoins.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802440FC_80497C); diff --git a/src/world/area_mac/mac_03/833740.c b/src/world/area_mac/mac_03/833740.c index 57156e2697..c2d5f59a26 100644 --- a/src/world/area_mac/mac_03/833740.c +++ b/src/world/area_mac/mac_03/833740.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F40_833740); -INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F6C_83376C); +#include "world/common/GetPlayerCoins.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/833740", func_80241F80_833780); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index bedafef124..f0c1cf813b 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -82,7 +82,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241980_844550); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419AC_84457C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419D0_8445A0); +#include "world/common/GetPlayerCoins.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802419E4_8445B4); diff --git a/src/world/common/GetPlayerCoins.inc.c b/src/world/common/GetPlayerCoins.inc.c new file mode 100644 index 0000000000..68b3ffec3b --- /dev/null +++ b/src/world/common/GetPlayerCoins.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus GetPlayerCoins(ScriptInstance* script, s32 isInitialCall) { + script->varTable[0] = gPlayerData.coins; + return ApiStatus_DONE2; +} From 4a1f26c6eaf624176fd026151215611a906509f0 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 22:33:01 -0400 Subject: [PATCH 03/45] Set80151310 --- .../area_dro/dro_01/95B7E0/func_80241588_95C788.s | 9 --------- .../area_dro/dro_02/9694C0/func_80240418_9695D8.s | 9 --------- .../area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s | 9 --------- .../area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s | 9 --------- .../area_jan/jan_03/B34BD0/func_80241CB4_B36884.s | 9 --------- .../area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s | 9 --------- .../area_mac/mac_00/7EB340/func_80240748_7EB458.s | 9 --------- .../area_mac/mac_01/8017D0/func_80242028_8028A8.s | 9 --------- .../area_mac/mac_02/823BF0/func_802418D8_824B98.s | 9 --------- .../area_mac/mac_03/831B20/func_802405C8_831DC8.s | 9 --------- .../area_mac/mac_04/843030/func_80240578_843148.s | 9 --------- .../area_mac/mac_05/852170/func_80241438_8535A8.s | 9 --------- .../area_nok/nok_01/9C53E0/func_80240E80_9C6260.s | 9 --------- .../area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s | 9 --------- .../area_sam/sam_01/CF7E80/func_80240818_CF8388.s | 9 --------- .../area_sam/sam_02/D05F60/func_80240C44_D06374.s | 9 --------- .../area_sam/sam_11/D3A930/func_80240540_D3AB10.s | 9 --------- .../area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s | 9 --------- src/world/area_dro/dro_01/95B7E0.c | 4 +--- src/world/area_dro/dro_02/9694C0.c | 4 +--- src/world/area_hos/hos_03/A1BDB0.c | 4 +--- src/world/area_jan/jan_02/B2C8A0.c | 4 +--- src/world/area_jan/jan_03/B34BD0.c | 4 +--- src/world/area_kmr/kmr_02/8B0070.c | 4 +--- src/world/area_mac/mac_00/7EB340.c | 4 +--- src/world/area_mac/mac_01/8017D0.c | 4 +--- src/world/area_mac/mac_02/823BF0.c | 4 +--- src/world/area_mac/mac_03/831B20.c | 4 +--- src/world/area_mac/mac_04/843030.c | 4 +--- src/world/area_mac/mac_05/852170.c | 4 +--- src/world/area_nok/nok_01/9C53E0.c | 4 +--- src/world/area_nok/nok_02/9D7AA0.c | 4 +--- src/world/area_sam/sam_01/CF7E80.c | 4 +--- src/world/area_sam/sam_02/D05F60.c | 4 +--- src/world/area_sam/sam_11/D3A930.c | 11 +++++++++-- src/world/area_sam/sam_11/D3ADA0.c | 4 +--- .../common/{Set80151310_0.inc.c => Set80151310.inc.c} | 5 +++++ 37 files changed, 31 insertions(+), 215 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s rename src/world/common/{Set80151310_0.inc.c => Set80151310.inc.c} (53%) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s deleted file mode 100644 index b1c7c9d842..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241588_95C788.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241588_95C788 -/* 95C788 80241588 24020001 */ addiu $v0, $zero, 1 -/* 95C78C 8024158C 3C018015 */ lui $at, %hi(D_80151310) -/* 95C790 80241590 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 95C794 80241594 03E00008 */ jr $ra -/* 95C798 80241598 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s deleted file mode 100644 index a2c503ecc0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240418_9695D8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240418_9695D8 -/* 9695D8 80240418 24020001 */ addiu $v0, $zero, 1 -/* 9695DC 8024041C 3C018015 */ lui $at, %hi(D_80151310) -/* 9695E0 80240420 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9695E4 80240424 03E00008 */ jr $ra -/* 9695E8 80240428 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s deleted file mode 100644 index 17f8a0fa7b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802425BC_A1D6BC.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425BC_A1D6BC -/* A1D6BC 802425BC 24020001 */ addiu $v0, $zero, 1 -/* A1D6C0 802425C0 3C018015 */ lui $at, %hi(D_80151310) -/* A1D6C4 802425C4 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* A1D6C8 802425C8 03E00008 */ jr $ra -/* A1D6CC 802425CC 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s deleted file mode 100644 index 85143edf50..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_8024172C_B2DB9C.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024172C_B2DB9C -/* B2DB9C 8024172C 24020001 */ addiu $v0, $zero, 1 -/* B2DBA0 80241730 3C018015 */ lui $at, %hi(D_80151310) -/* B2DBA4 80241734 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* B2DBA8 80241738 03E00008 */ jr $ra -/* B2DBAC 8024173C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s deleted file mode 100644 index 09ed36b550..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241CB4_B36884.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CB4_B36884 -/* B36884 80241CB4 24020001 */ addiu $v0, $zero, 1 -/* B36888 80241CB8 3C018015 */ lui $at, %hi(D_80151310) -/* B3688C 80241CBC AC221310 */ sw $v0, %lo(D_80151310)($at) -/* B36890 80241CC0 03E00008 */ jr $ra -/* B36894 80241CC4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s deleted file mode 100644 index 9b149d8e42..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802404A8_8B0518.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802404A8_8B0518 -/* 8B0518 802404A8 24020001 */ addiu $v0, $zero, 1 -/* 8B051C 802404AC 3C018015 */ lui $at, %hi(D_80151310) -/* 8B0520 802404B0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8B0524 802404B4 03E00008 */ jr $ra -/* 8B0528 802404B8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s deleted file mode 100644 index ad4d76513b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80240748_7EB458.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240748_7EB458 -/* 7EB458 80240748 24020001 */ addiu $v0, $zero, 1 -/* 7EB45C 8024074C 3C018015 */ lui $at, %hi(D_80151310) -/* 7EB460 80240750 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 7EB464 80240754 03E00008 */ jr $ra -/* 7EB468 80240758 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s deleted file mode 100644 index dee90ec51a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242028_8028A8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242028_8028A8 -/* 8028A8 80242028 24020001 */ addiu $v0, $zero, 1 -/* 8028AC 8024202C 3C018015 */ lui $at, %hi(D_80151310) -/* 8028B0 80242030 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8028B4 80242034 03E00008 */ jr $ra -/* 8028B8 80242038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s deleted file mode 100644 index 1564a3e7d0..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802418D8_824B98.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D8_824B98 -/* 824B98 802418D8 24020001 */ addiu $v0, $zero, 1 -/* 824B9C 802418DC 3C018015 */ lui $at, %hi(D_80151310) -/* 824BA0 802418E0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 824BA4 802418E4 03E00008 */ jr $ra -/* 824BA8 802418E8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s deleted file mode 100644 index 0d0b173707..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802405C8_831DC8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405C8_831DC8 -/* 831DC8 802405C8 24020001 */ addiu $v0, $zero, 1 -/* 831DCC 802405CC 3C018015 */ lui $at, %hi(D_80151310) -/* 831DD0 802405D0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 831DD4 802405D4 03E00008 */ jr $ra -/* 831DD8 802405D8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s deleted file mode 100644 index a1fe2bd8db..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240578_843148.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240578_843148 -/* 843148 80240578 24020001 */ addiu $v0, $zero, 1 -/* 84314C 8024057C 3C018015 */ lui $at, %hi(D_80151310) -/* 843150 80240580 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 843154 80240584 03E00008 */ jr $ra -/* 843158 80240588 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s deleted file mode 100644 index 7bfa348ac9..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241438_8535A8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241438_8535A8 -/* 8535A8 80241438 24020001 */ addiu $v0, $zero, 1 -/* 8535AC 8024143C 3C018015 */ lui $at, %hi(D_80151310) -/* 8535B0 80241440 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 8535B4 80241444 03E00008 */ jr $ra -/* 8535B8 80241448 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s deleted file mode 100644 index cf6b163608..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240E80_9C6260.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E80_9C6260 -/* 9C6260 80240E80 24020001 */ addiu $v0, $zero, 1 -/* 9C6264 80240E84 3C018015 */ lui $at, %hi(D_80151310) -/* 9C6268 80240E88 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9C626C 80240E8C 03E00008 */ jr $ra -/* 9C6270 80240E90 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s deleted file mode 100644 index 561e80d2a0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241A28_9D8A48.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A28_9D8A48 -/* 9D8A48 80241A28 24020001 */ addiu $v0, $zero, 1 -/* 9D8A4C 80241A2C 3C018015 */ lui $at, %hi(D_80151310) -/* 9D8A50 80241A30 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* 9D8A54 80241A34 03E00008 */ jr $ra -/* 9D8A58 80241A38 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s deleted file mode 100644 index dadba2d8a8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240818_CF8388.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240818_CF8388 -/* CF8388 80240818 24020001 */ addiu $v0, $zero, 1 -/* CF838C 8024081C 3C018015 */ lui $at, %hi(D_80151310) -/* CF8390 80240820 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* CF8394 80240824 03E00008 */ jr $ra -/* CF8398 80240828 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s deleted file mode 100644 index e90f8d35f5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240C44_D06374.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C44_D06374 -/* D06374 80240C44 24020001 */ addiu $v0, $zero, 1 -/* D06378 80240C48 3C018015 */ lui $at, %hi(D_80151310) -/* D0637C 80240C4C AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D06380 80240C50 03E00008 */ jr $ra -/* D06384 80240C54 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s deleted file mode 100644 index ffe44ebffd..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240540_D3AB10.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240540_D3AB10 -/* D3AB10 80240540 24020002 */ addiu $v0, $zero, 2 -/* D3AB14 80240544 3C018015 */ lui $at, %hi(D_80151310) -/* D3AB18 80240548 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D3AB1C 8024054C 03E00008 */ jr $ra -/* D3AB20 80240550 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s deleted file mode 100644 index 8b351f5459..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802408E8_D3AEB8.s +++ /dev/null @@ -1,9 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802408E8_D3AEB8 -/* D3AEB8 802408E8 24020001 */ addiu $v0, $zero, 1 -/* D3AEBC 802408EC 3C018015 */ lui $at, %hi(D_80151310) -/* D3AEC0 802408F0 AC221310 */ sw $v0, %lo(D_80151310)($at) -/* D3AEC4 802408F4 03E00008 */ jr $ra -/* D3AEC8 802408F8 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 07cc068199..567019d605 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241470_95C670); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241588_95C788); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index f1b83904dc..b09cc58c04 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240300_9694C0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240418_9695D8); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 7cb60e96ea..5acb918d18 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -50,9 +50,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802424A4_A1D5A4); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425BC_A1D6BC); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 5e4e1bdb84..4c0ff535b8 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -38,9 +38,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241614_B2DA84); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024172C_B2DB9C); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 24c7350a8c..8c4248f91c 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -82,9 +82,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241B9C_B3676C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CB4_B36884); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 5a9849bd69..a4c1bb554c 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -20,9 +20,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240390_8B0400); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404A8_8B0518); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 658037b61e..3e66a781e0 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240630_7EB340); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240748_7EB458); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index cd2278afa4..ac8052fe96 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80241F10_802790); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242028_8028A8); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index ff42fb2076..f5f17d7151 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802417C0_824A80); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418D8_824B98); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 7f58c90beb..1d11fd62e9 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -6,9 +6,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802404B0_831CB0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405C8_831DC8); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index f0c1cf813b..c1411631b0 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240460_843030); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240578_843148); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index e9436ae700..44b24bb640 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -36,9 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241320_853490); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241438_8535A8); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index da63e5ea1b..747ceb53e7 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -48,9 +48,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", delete_player_actor_9C6148); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240E80_9C6260); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index dd4613d90e..efaed89d54 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241910_9D8930); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A28_9D8A48); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 78f0cd4ac7..446e390df9 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240700_CF8270); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240818_CF8388); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 8ddd53f427..9f4b58cb6b 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -28,9 +28,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B2C_D0625C); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C44_D06374); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index 9496af1550..33450ec0ed 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -4,9 +4,16 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240540_D3AB10); +// Almost the same as Set80151310, but we're setting it to 2 in the first func instead of 1 +static ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) { + D_80151310 = 2; + return ApiStatus_DONE2; +} -#include "world/common/Set80151310_0.inc.c" +static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { + D_80151310 = 0; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 2367a47ff8..b014d1b7b8 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -4,9 +4,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802407D0_D3ADA0); #include "world/common/GetItemName.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802408E8_D3AEB8); - -#include "world/common/Set80151310_0.inc.c" +#include "world/common/Set80151310.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310.inc.c similarity index 53% rename from src/world/common/Set80151310_0.inc.c rename to src/world/common/Set80151310.inc.c index 953e1f4232..2223ab43f6 100644 --- a/src/world/common/Set80151310_0.inc.c +++ b/src/world/common/Set80151310.inc.c @@ -1,5 +1,10 @@ #include "common.h" +static ApiStatus Set80151310_1(ScriptInstance* script, s32 isInitialCall) { + D_80151310 = 1; + return ApiStatus_DONE2; +} + static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 0; return ApiStatus_DONE2; From bef10dd44e7f7399fa172cc4555a297b8c334974 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 22:40:04 -0400 Subject: [PATCH 04/45] Call800E9894 --- .../area_dro/dro_02/9694C0/func_80243484_96C644.s | 12 ------------ .../area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s | 12 ------------ .../area_jan/jan_03/B34BD0/func_802414B0_B36080.s | 12 ------------ .../area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s | 12 ------------ .../area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s | 12 ------------ .../area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s | 12 ------------ .../area_kpa/kpa_91/A86A50/func_80241528_A87F78.s | 12 ------------ .../area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s | 12 ------------ .../area_mac/mac_01/8017D0/func_802437AC_80402C.s | 12 ------------ .../area_mac/mac_04/843030/func_80241C20_8447F0.s | 12 ------------ .../area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s | 12 ------------ .../area_sam/sam_02/D05F60/func_80240830_D05F60.s | 12 ------------ .../area_sam/sam_06/D203E0/func_80241F50_D21DE0.s | 12 ------------ src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_mac/mac_04/843030.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/common/Call800E9894.inc.c | 6 ++++++ 27 files changed, 19 insertions(+), 169 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s create mode 100644 src/world/common/Call800E9894.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s deleted file mode 100644 index 80d6c097f8..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243484_96C644.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243484_96C644 -/* 96C644 80243484 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C648 80243488 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C64C 8024348C 0C03A625 */ jal func_800E9894 -/* 96C650 80243490 00000000 */ nop -/* 96C654 80243494 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C658 80243498 24020002 */ addiu $v0, $zero, 2 -/* 96C65C 8024349C 03E00008 */ jr $ra -/* 96C660 802434A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s deleted file mode 100644 index 347f95c415..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421A8_A1D2A8.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421A8_A1D2A8 -/* A1D2A8 802421A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D2AC 802421AC AFBF0010 */ sw $ra, 0x10($sp) -/* A1D2B0 802421B0 0C03A625 */ jal func_800E9894 -/* A1D2B4 802421B4 00000000 */ nop -/* A1D2B8 802421B8 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D2BC 802421BC 24020002 */ addiu $v0, $zero, 2 -/* A1D2C0 802421C0 03E00008 */ jr $ra -/* A1D2C4 802421C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s deleted file mode 100644 index 5c822db0c3..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414B0_B36080.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B0_B36080 -/* B36080 802414B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36084 802414B4 AFBF0010 */ sw $ra, 0x10($sp) -/* B36088 802414B8 0C03A625 */ jal func_800E9894 -/* B3608C 802414BC 00000000 */ nop -/* B36090 802414C0 8FBF0010 */ lw $ra, 0x10($sp) -/* B36094 802414C4 24020002 */ addiu $v0, $zero, 2 -/* B36098 802414C8 03E00008 */ jr $ra -/* B3609C 802414CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s deleted file mode 100644 index edab8c1754..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402C0_AFDE00.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402C0_AFDE00 -/* AFDE00 802402C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDE04 802402C4 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDE08 802402C8 0C03A625 */ jal func_800E9894 -/* AFDE0C 802402CC 00000000 */ nop -/* AFDE10 802402D0 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDE14 802402D4 24020002 */ addiu $v0, $zero, 2 -/* AFDE18 802402D8 03E00008 */ jr $ra -/* AFDE1C 802402DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s deleted file mode 100644 index 0618959d77..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243070_8B30E0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243070_8B30E0 -/* 8B30E0 80243070 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B30E4 80243074 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B30E8 80243078 0C03A625 */ jal func_800E9894 -/* 8B30EC 8024307C 00000000 */ nop -/* 8B30F0 80243080 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B30F4 80243084 24020002 */ addiu $v0, $zero, 2 -/* 8B30F8 80243088 03E00008 */ jr $ra -/* 8B30FC 8024308C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s deleted file mode 100644 index 59c2adb5fb..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412A0_8ED0C0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A0_8ED0C0 -/* 8ED0C0 802412A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED0C4 802412A4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED0C8 802412A8 0C03A625 */ jal func_800E9894 -/* 8ED0CC 802412AC 00000000 */ nop -/* 8ED0D0 802412B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED0D4 802412B4 24020002 */ addiu $v0, $zero, 2 -/* 8ED0D8 802412B8 03E00008 */ jr $ra -/* 8ED0DC 802412BC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s deleted file mode 100644 index 6bb6d6c785..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241528_A87F78.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241528_A87F78 -/* A87F78 80241528 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A87F7C 8024152C AFBF0010 */ sw $ra, 0x10($sp) -/* A87F80 80241530 0C03A625 */ jal func_800E9894 -/* A87F84 80241534 00000000 */ nop -/* A87F88 80241538 8FBF0010 */ lw $ra, 0x10($sp) -/* A87F8C 8024153C 24020002 */ addiu $v0, $zero, 2 -/* A87F90 80241540 03E00008 */ jr $ra -/* A87F94 80241544 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s deleted file mode 100644 index 47400bd37f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241608_A8E088.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241608_A8E088 -/* A8E088 80241608 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E08C 8024160C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E090 80241610 0C03A625 */ jal func_800E9894 -/* A8E094 80241614 00000000 */ nop -/* A8E098 80241618 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E09C 8024161C 24020002 */ addiu $v0, $zero, 2 -/* A8E0A0 80241620 03E00008 */ jr $ra -/* A8E0A4 80241624 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s deleted file mode 100644 index 6f7e6b9fce..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437AC_80402C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437AC_80402C -/* 80402C 802437AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804030 802437B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804034 802437B4 0C03A625 */ jal func_800E9894 -/* 804038 802437B8 00000000 */ nop -/* 80403C 802437BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 804040 802437C0 24020002 */ addiu $v0, $zero, 2 -/* 804044 802437C4 03E00008 */ jr $ra -/* 804048 802437C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s deleted file mode 100644 index d7340f5175..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241C20_8447F0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C20_8447F0 -/* 8447F0 80241C20 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8447F4 80241C24 AFBF0010 */ sw $ra, 0x10($sp) -/* 8447F8 80241C28 0C03A625 */ jal func_800E9894 -/* 8447FC 80241C2C 00000000 */ nop -/* 844800 80241C30 8FBF0010 */ lw $ra, 0x10($sp) -/* 844804 80241C34 24020002 */ addiu $v0, $zero, 2 -/* 844808 80241C38 03E00008 */ jr $ra -/* 84480C 80241C3C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s deleted file mode 100644 index f088194dcb..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A6C_9C5E4C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A6C_9C5E4C -/* 9C5E4C 80240A6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5E50 80240A70 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5E54 80240A74 0C03A625 */ jal func_800E9894 -/* 9C5E58 80240A78 00000000 */ nop -/* 9C5E5C 80240A7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5E60 80240A80 24020002 */ addiu $v0, $zero, 2 -/* 9C5E64 80240A84 03E00008 */ jr $ra -/* 9C5E68 80240A88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s deleted file mode 100644 index 28763cfcd6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240830_D05F60.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240830_D05F60 -/* D05F60 80240830 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05F64 80240834 AFBF0010 */ sw $ra, 0x10($sp) -/* D05F68 80240838 0C03A625 */ jal func_800E9894 -/* D05F6C 8024083C 00000000 */ nop -/* D05F70 80240840 8FBF0010 */ lw $ra, 0x10($sp) -/* D05F74 80240844 24020002 */ addiu $v0, $zero, 2 -/* D05F78 80240848 03E00008 */ jr $ra -/* D05F7C 8024084C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s deleted file mode 100644 index 4d2f754750..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F50_D21DE0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F50_D21DE0 -/* D21DE0 80241F50 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21DE4 80241F54 AFBF0010 */ sw $ra, 0x10($sp) -/* D21DE8 80241F58 0C03A625 */ jal func_800E9894 -/* D21DEC 80241F5C 00000000 */ nop -/* D21DF0 80241F60 8FBF0010 */ lw $ra, 0x10($sp) -/* D21DF4 80241F64 24020002 */ addiu $v0, $zero, 2 -/* D21DF8 80241F68 03E00008 */ jr $ra -/* D21DFC 80241F6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index b09cc58c04..4eb91270f0 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024334C_96C50C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243484_96C644); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 5acb918d18..048fd17804 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241E98_A1CF98); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421A8_A1D2A8); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 8c4248f91c..a6a26446b5 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802410F4_B35CC4); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414B0_B36080); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index c3556b54d0..f7b897aa31 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -1,6 +1,6 @@ #include "kkj_20.h" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402C0_AFDE00); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402E0_AFDE20); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index d58867fb6b..9ffcee5159 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -1,6 +1,6 @@ #include "kmr_02.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243070_8B30E0); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index eefa891c4f..86177005f7 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -1,6 +1,6 @@ #include "kmr_20.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412A0_8ED0C0); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index afa9bdfee4..c84dd51ff4 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802411A4_A87BF4); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241528_A87F78); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 335f400bc3..63d71a56a1 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241284_A8DD04); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241608_A8E088); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index ac8052fe96..91ae25bf5d 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -92,7 +92,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243680_803F00); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437AC_80402C); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index c1411631b0..59073d8f5e 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -90,7 +90,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241B90_844760); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241BB8_844788); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C20_8447F0); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241C40_844810); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 747ceb53e7..36d95b9d93 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -20,7 +20,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802405EC_9C59CC); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A6C_9C5E4C); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 9f4b58cb6b..d1ae4a06a1 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -1,6 +1,6 @@ #include "sam_02.h" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240830_D05F60); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index d1635388ee..2e87ca9e37 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241E18_D21CA8); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F50_D21DE0); +#include "world/common/Call800E9894.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00); diff --git a/src/world/common/Call800E9894.inc.c b/src/world/common/Call800E9894.inc.c new file mode 100644 index 0000000000..9962016b2d --- /dev/null +++ b/src/world/common/Call800E9894.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus Call800E9894(ScriptInstance* script, s32 isInitialCall) { + func_800E9894(); + return ApiStatus_DONE2; +} From 19a34fe4bf105acc8e0d12a0c4106118c32e8d35 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 22:49:54 -0400 Subject: [PATCH 05/45] GetNpcUnsafeOwner2 --- .../area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s | 12 ------------ .../area_dro/dro_02/9694C0/func_802406AC_96986C.s | 12 ------------ .../area_hos/hos_03/A1BDB0/func_80242850_A1D950.s | 12 ------------ .../area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s | 12 ------------ .../area_jan/jan_03/B34BD0/func_80241F48_B36B18.s | 12 ------------ .../area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s | 12 ------------ .../area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s | 12 ------------ .../area_mac/mac_01/8017D0/func_802422BC_802B3C.s | 12 ------------ .../area_mac/mac_01/8017D0/func_8024394C_8041CC.s | 12 ------------ .../area_mac/mac_02/823BF0/func_80241B6C_824E2C.s | 12 ------------ .../area_mac/mac_03/831B20/func_8024085C_83205C.s | 12 ------------ .../area_mac/mac_04/843030/func_8024080C_8433DC.s | 12 ------------ .../area_mac/mac_05/852170/func_802416CC_85383C.s | 12 ------------ .../area_nok/nok_01/9C53E0/func_80241114_9C64F4.s | 12 ------------ .../area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s | 12 ------------ .../area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s | 12 ------------ .../area_sam/sam_02/D05F60/func_80240ED8_D06608.s | 12 ------------ .../area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s | 12 ------------ 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 | 7 +++++-- 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/GetNpcUnsafeOwner2.inc.c | 6 ++++++ 36 files changed, 27 insertions(+), 234 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s create mode 100644 src/world/common/GetNpcUnsafeOwner2.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s deleted file mode 100644 index 3e7e7a1a70..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024181C_95CA1C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024181C_95CA1C -/* 95CA1C 8024181C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 95CA20 80241820 AFBF0010 */ sw $ra, 0x10($sp) -/* 95CA24 80241824 0C00EABB */ jal get_npc_unsafe -/* 95CA28 80241828 8C84014C */ lw $a0, 0x14c($a0) -/* 95CA2C 8024182C 8FBF0010 */ lw $ra, 0x10($sp) -/* 95CA30 80241830 0000102D */ daddu $v0, $zero, $zero -/* 95CA34 80241834 03E00008 */ jr $ra -/* 95CA38 80241838 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s deleted file mode 100644 index 5726597c6e..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802406AC_96986C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802406AC_96986C -/* 96986C 802406AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 969870 802406B0 AFBF0010 */ sw $ra, 0x10($sp) -/* 969874 802406B4 0C00EABB */ jal get_npc_unsafe -/* 969878 802406B8 8C84014C */ lw $a0, 0x14c($a0) -/* 96987C 802406BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 969880 802406C0 0000102D */ daddu $v0, $zero, $zero -/* 969884 802406C4 03E00008 */ jr $ra -/* 969888 802406C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s deleted file mode 100644 index ae0d9174b2..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242850_A1D950.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242850_A1D950 -/* A1D950 80242850 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D954 80242854 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D958 80242858 0C00EABB */ jal get_npc_unsafe -/* A1D95C 8024285C 8C84014C */ lw $a0, 0x14c($a0) -/* A1D960 80242860 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D964 80242864 0000102D */ daddu $v0, $zero, $zero -/* A1D968 80242868 03E00008 */ jr $ra -/* A1D96C 8024286C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s deleted file mode 100644 index 216750a4e5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802419C0_B2DE30.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419C0_B2DE30 -/* B2DE30 802419C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B2DE34 802419C4 AFBF0010 */ sw $ra, 0x10($sp) -/* B2DE38 802419C8 0C00EABB */ jal get_npc_unsafe -/* B2DE3C 802419CC 8C84014C */ lw $a0, 0x14c($a0) -/* B2DE40 802419D0 8FBF0010 */ lw $ra, 0x10($sp) -/* B2DE44 802419D4 0000102D */ daddu $v0, $zero, $zero -/* B2DE48 802419D8 03E00008 */ jr $ra -/* B2DE4C 802419DC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s deleted file mode 100644 index 8be9f67b52..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241F48_B36B18.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F48_B36B18 -/* B36B18 80241F48 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36B1C 80241F4C AFBF0010 */ sw $ra, 0x10($sp) -/* B36B20 80241F50 0C00EABB */ jal get_npc_unsafe -/* B36B24 80241F54 8C84014C */ lw $a0, 0x14c($a0) -/* B36B28 80241F58 8FBF0010 */ lw $ra, 0x10($sp) -/* B36B2C 80241F5C 0000102D */ daddu $v0, $zero, $zero -/* B36B30 80241F60 03E00008 */ jr $ra -/* B36B34 80241F64 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s deleted file mode 100644 index 1dad685eca..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_8024073C_8B07AC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024073C_8B07AC -/* 8B07AC 8024073C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B07B0 80240740 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B07B4 80240744 0C00EABB */ jal get_npc_unsafe -/* 8B07B8 80240748 8C84014C */ lw $a0, 0x14c($a0) -/* 8B07BC 8024074C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B07C0 80240750 0000102D */ daddu $v0, $zero, $zero -/* 8B07C4 80240754 03E00008 */ jr $ra -/* 8B07C8 80240758 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s deleted file mode 100644 index fbb4a7a24c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802409DC_7EB6EC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409DC_7EB6EC -/* 7EB6EC 802409DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 7EB6F0 802409E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 7EB6F4 802409E4 0C00EABB */ jal get_npc_unsafe -/* 7EB6F8 802409E8 8C84014C */ lw $a0, 0x14c($a0) -/* 7EB6FC 802409EC 8FBF0010 */ lw $ra, 0x10($sp) -/* 7EB700 802409F0 0000102D */ daddu $v0, $zero, $zero -/* 7EB704 802409F4 03E00008 */ jr $ra -/* 7EB708 802409F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s deleted file mode 100644 index 807a032753..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802422BC_802B3C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422BC_802B3C -/* 802B3C 802422BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 802B40 802422C0 AFBF0010 */ sw $ra, 0x10($sp) -/* 802B44 802422C4 0C00EABB */ jal get_npc_unsafe -/* 802B48 802422C8 8C84014C */ lw $a0, 0x14c($a0) -/* 802B4C 802422CC 8FBF0010 */ lw $ra, 0x10($sp) -/* 802B50 802422D0 0000102D */ daddu $v0, $zero, $zero -/* 802B54 802422D4 03E00008 */ jr $ra -/* 802B58 802422D8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s deleted file mode 100644 index d35da2544a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024394C_8041CC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024394C_8041CC -/* 8041CC 8024394C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8041D0 80243950 AFBF0010 */ sw $ra, 0x10($sp) -/* 8041D4 80243954 0C03AE18 */ jal partner_resume_ability_script -/* 8041D8 80243958 00000000 */ nop -/* 8041DC 8024395C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8041E0 80243960 24020002 */ addiu $v0, $zero, 2 -/* 8041E4 80243964 03E00008 */ jr $ra -/* 8041E8 80243968 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s deleted file mode 100644 index baac1be28c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80241B6C_824E2C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B6C_824E2C -/* 824E2C 80241B6C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 824E30 80241B70 AFBF0010 */ sw $ra, 0x10($sp) -/* 824E34 80241B74 0C00EABB */ jal get_npc_unsafe -/* 824E38 80241B78 8C84014C */ lw $a0, 0x14c($a0) -/* 824E3C 80241B7C 8FBF0010 */ lw $ra, 0x10($sp) -/* 824E40 80241B80 0000102D */ daddu $v0, $zero, $zero -/* 824E44 80241B84 03E00008 */ jr $ra -/* 824E48 80241B88 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s deleted file mode 100644 index db0206c019..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024085C_83205C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024085C_83205C -/* 83205C 8024085C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 832060 80240860 AFBF0010 */ sw $ra, 0x10($sp) -/* 832064 80240864 0C00EABB */ jal get_npc_unsafe -/* 832068 80240868 8C84014C */ lw $a0, 0x14c($a0) -/* 83206C 8024086C 8FBF0010 */ lw $ra, 0x10($sp) -/* 832070 80240870 0000102D */ daddu $v0, $zero, $zero -/* 832074 80240874 03E00008 */ jr $ra -/* 832078 80240878 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s deleted file mode 100644 index c28c31c70b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024080C_8433DC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024080C_8433DC -/* 8433DC 8024080C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8433E0 80240810 AFBF0010 */ sw $ra, 0x10($sp) -/* 8433E4 80240814 0C00EABB */ jal get_npc_unsafe -/* 8433E8 80240818 8C84014C */ lw $a0, 0x14c($a0) -/* 8433EC 8024081C 8FBF0010 */ lw $ra, 0x10($sp) -/* 8433F0 80240820 0000102D */ daddu $v0, $zero, $zero -/* 8433F4 80240824 03E00008 */ jr $ra -/* 8433F8 80240828 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s deleted file mode 100644 index 2b150ccfd3..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802416CC_85383C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416CC_85383C -/* 85383C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 853840 802416D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 853844 802416D4 0C00EABB */ jal get_npc_unsafe -/* 853848 802416D8 8C84014C */ lw $a0, 0x14c($a0) -/* 85384C 802416DC 8FBF0010 */ lw $ra, 0x10($sp) -/* 853850 802416E0 0000102D */ daddu $v0, $zero, $zero -/* 853854 802416E4 03E00008 */ jr $ra -/* 853858 802416E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s deleted file mode 100644 index c442e04124..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241114_9C64F4.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241114_9C64F4 -/* 9C64F4 80241114 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C64F8 80241118 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C64FC 8024111C 0C00EABB */ jal get_npc_unsafe -/* 9C6500 80241120 8C84014C */ lw $a0, 0x14c($a0) -/* 9C6504 80241124 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6508 80241128 0000102D */ daddu $v0, $zero, $zero -/* 9C650C 8024112C 03E00008 */ jr $ra -/* 9C6510 80241130 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s deleted file mode 100644 index 7a943321ac..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80241CBC_9D8CDC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241CBC_9D8CDC -/* 9D8CDC 80241CBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9D8CE0 80241CC0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9D8CE4 80241CC4 0C00EABB */ jal get_npc_unsafe -/* 9D8CE8 80241CC8 8C84014C */ lw $a0, 0x14c($a0) -/* 9D8CEC 80241CCC 8FBF0010 */ lw $ra, 0x10($sp) -/* 9D8CF0 80241CD0 0000102D */ daddu $v0, $zero, $zero -/* 9D8CF4 80241CD4 03E00008 */ jr $ra -/* 9D8CF8 80241CD8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s deleted file mode 100644 index da8920679c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80240AAC_CF861C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AAC_CF861C -/* CF861C 80240AAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CF8620 80240AB0 AFBF0010 */ sw $ra, 0x10($sp) -/* CF8624 80240AB4 0C00EABB */ jal get_npc_unsafe -/* CF8628 80240AB8 8C84014C */ lw $a0, 0x14c($a0) -/* CF862C 80240ABC 8FBF0010 */ lw $ra, 0x10($sp) -/* CF8630 80240AC0 0000102D */ daddu $v0, $zero, $zero -/* CF8634 80240AC4 03E00008 */ jr $ra -/* CF8638 80240AC8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s deleted file mode 100644 index 3850de84f6..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240ED8_D06608.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240ED8_D06608 -/* D06608 80240ED8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D0660C 80240EDC AFBF0010 */ sw $ra, 0x10($sp) -/* D06610 80240EE0 0C00EABB */ jal get_npc_unsafe -/* D06614 80240EE4 8C84014C */ lw $a0, 0x14c($a0) -/* D06618 80240EE8 8FBF0010 */ lw $ra, 0x10($sp) -/* D0661C 80240EEC 0000102D */ daddu $v0, $zero, $zero -/* D06620 80240EF0 03E00008 */ jr $ra -/* D06624 80240EF4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s deleted file mode 100644 index d9ad763d88..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80240B7C_D3B14C.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240B7C_D3B14C -/* D3B14C 80240B7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D3B150 80240B80 AFBF0010 */ sw $ra, 0x10($sp) -/* D3B154 80240B84 0C00EABB */ jal get_npc_unsafe -/* D3B158 80240B88 8C84014C */ lw $a0, 0x14c($a0) -/* D3B15C 80240B8C 8FBF0010 */ lw $ra, 0x10($sp) -/* D3B160 80240B90 0000102D */ daddu $v0, $zero, $zero -/* D3B164 80240B94 03E00008 */ jr $ra -/* D3B168 80240B98 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 567019d605..e3efb1148d 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802415AC_95C7AC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802417D0_95C9D0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024181C_95CA1C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024183C_95CA3C); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 4eb91270f0..b83f6531db 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024043C_9695FC); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240660_969820); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406AC_96986C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802406CC_96988C); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 048fd17804..e114a963e1 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802425E0_A1D6E0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242804_A1D904); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242850_A1D950); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242870_A1D970); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 4c0ff535b8..5b4e06e2c4 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241750_B2DBC0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80241974_B2DDE4); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419C0_B2DE30); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802419E0_B2DE50); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a6a26446b5..68be87c175 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241CD8_B368A8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241EFC_B36ACC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F48_B36B18); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241F68_B36B38); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index a4c1bb554c..8d220bd67d 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -26,7 +26,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802404CC_8B053C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802406F0_8B0760); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024073C_8B07AC); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_8024075C_8B07CC); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 3e66a781e0..cc917dc914 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024076C_7EB47C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80240990_7EB6A0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409DC_7EB6EC); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802409FC_7EB70C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 91ae25bf5d..342f3881ba 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024204C_8028CC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242270_802AF0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422BC_802B3C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802422DC_802B5C); @@ -104,7 +104,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920_8041A0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024394C_8041CC); +ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) { + partner_resume_ability_script(); + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index f5f17d7151..27384dfcc6 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802418FC_824BBC); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B20_824DE0); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B6C_824E2C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80241B8C_824E4C); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 1d11fd62e9..9cfe529fe9 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -12,7 +12,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802405EC_831DEC); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240810_832010); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024085C_83205C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024087C_83207C); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 59073d8f5e..ead724658c 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024059C_84316C); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802407C0_843390); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024080C_8433DC); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024082C_8433FC); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 44b24bb640..aec6a9d2da 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024145C_8535CC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241680_8537F0); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416CC_85383C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802416EC_85385C); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 36d95b9d93..f3d8467455 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -54,7 +54,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240EA4_9C6284); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802410C8_9C64A8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241114_9C64F4); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241134_9C6514); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index efaed89d54..573f2ad2ad 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241A4C_9D8A6C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241C70_9D8C90); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CBC_9D8CDC); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80241CDC_9D8CFC); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 446e390df9..0869a20d70 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024083C_CF83AC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240A60_CF85D0); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240AAC_CF861C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80240ACC_CF863C); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index d1ae4a06a1..670a7c10e5 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -34,7 +34,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240C68_D06398); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240E8C_D065BC); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240ED8_D06608); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240EF8_D06628); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index b014d1b7b8..e355401aea 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -10,7 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024090C_D3AEDC); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B30_D3B100); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B7C_D3B14C); +#include "world/common/GetNpcUnsafeOwner2.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80240B9C_D3B16C); diff --git a/src/world/common/GetNpcUnsafeOwner2.inc.c b/src/world/common/GetNpcUnsafeOwner2.inc.c new file mode 100644 index 0000000000..d6e8b0f867 --- /dev/null +++ b/src/world/common/GetNpcUnsafeOwner2.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus GetNpcUnsafeOwner2(ScriptInstance* script, s32 isInitialCall) { + get_npc_unsafe(script->owner2.npc); + return ApiStatus_BLOCK; +} From 3a53233b1d1cd666ecd70dad121f5b6681ae9dbe Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 23:37:25 -0400 Subject: [PATCH 06/45] Unk800E98C4SyncStatusMenu --- .../area_dro/dro_02/9694C0/func_802434A4_96C664.s | 14 -------------- .../area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s | 14 -------------- .../area_jan/jan_03/B34BD0/func_802414D0_B360A0.s | 14 -------------- .../area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s | 14 -------------- .../area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s | 14 -------------- .../area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s | 14 -------------- .../area_kpa/kpa_91/A86A50/func_80241548_A87F98.s | 14 -------------- .../area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s | 14 -------------- .../area_mac/mac_01/8017D0/func_802437CC_80404C.s | 14 -------------- .../area_mac/mac_01/8017D0/func_8024552C_805DAC.s | 13 ------------- .../area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s | 14 -------------- .../area_sam/sam_02/D05F60/func_80240850_D05F80.s | 14 -------------- .../area_sam/sam_06/D203E0/func_80241F70_D21E00.s | 14 -------------- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 7 +++++-- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/common/Unk800E98C4SyncStatusMenu.inc.c | 7 +++++++ 26 files changed, 23 insertions(+), 194 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s create mode 100644 src/world/common/Unk800E98C4SyncStatusMenu.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s deleted file mode 100644 index 8c4bc6cba2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802434A4_96C664.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802434A4_96C664 -/* 96C664 802434A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C668 802434A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C66C 802434AC 0C03A631 */ jal func_800E98C4 -/* 96C670 802434B0 00000000 */ nop -/* 96C674 802434B4 0C03A6DB */ jal sync_status_menu -/* 96C678 802434B8 00000000 */ nop -/* 96C67C 802434BC 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C680 802434C0 24020002 */ addiu $v0, $zero, 2 -/* 96C684 802434C4 03E00008 */ jr $ra -/* 96C688 802434C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s deleted file mode 100644 index 3db6a153dc..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802421C8_A1D2C8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421C8_A1D2C8 -/* A1D2C8 802421C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D2CC 802421CC AFBF0010 */ sw $ra, 0x10($sp) -/* A1D2D0 802421D0 0C03A631 */ jal func_800E98C4 -/* A1D2D4 802421D4 00000000 */ nop -/* A1D2D8 802421D8 0C03A6DB */ jal sync_status_menu -/* A1D2DC 802421DC 00000000 */ nop -/* A1D2E0 802421E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D2E4 802421E4 24020002 */ addiu $v0, $zero, 2 -/* A1D2E8 802421E8 03E00008 */ jr $ra -/* A1D2EC 802421EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s deleted file mode 100644 index bc22b1c1ed..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802414D0_B360A0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414D0_B360A0 -/* B360A0 802414D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B360A4 802414D4 AFBF0010 */ sw $ra, 0x10($sp) -/* B360A8 802414D8 0C03A631 */ jal func_800E98C4 -/* B360AC 802414DC 00000000 */ nop -/* B360B0 802414E0 0C03A6DB */ jal sync_status_menu -/* B360B4 802414E4 00000000 */ nop -/* B360B8 802414E8 8FBF0010 */ lw $ra, 0x10($sp) -/* B360BC 802414EC 24020002 */ addiu $v0, $zero, 2 -/* B360C0 802414F0 03E00008 */ jr $ra -/* B360C4 802414F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s deleted file mode 100644 index d12c22dc00..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802402E0_AFDE20.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402E0_AFDE20 -/* AFDE20 802402E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDE24 802402E4 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDE28 802402E8 0C03A631 */ jal func_800E98C4 -/* AFDE2C 802402EC 00000000 */ nop -/* AFDE30 802402F0 0C03A6DB */ jal sync_status_menu -/* AFDE34 802402F4 00000000 */ nop -/* AFDE38 802402F8 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDE3C 802402FC 24020002 */ addiu $v0, $zero, 2 -/* AFDE40 80240300 03E00008 */ jr $ra -/* AFDE44 80240304 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s deleted file mode 100644 index 148f155323..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243090_8B3100.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243090_8B3100 -/* 8B3100 80243090 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3104 80243094 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3108 80243098 0C03A631 */ jal func_800E98C4 -/* 8B310C 8024309C 00000000 */ nop -/* 8B3110 802430A0 0C03A6DB */ jal sync_status_menu -/* 8B3114 802430A4 00000000 */ nop -/* 8B3118 802430A8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B311C 802430AC 24020002 */ addiu $v0, $zero, 2 -/* 8B3120 802430B0 03E00008 */ jr $ra -/* 8B3124 802430B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s deleted file mode 100644 index f55916e467..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802412C0_8ED0E0.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412C0_8ED0E0 -/* 8ED0E0 802412C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED0E4 802412C4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED0E8 802412C8 0C03A631 */ jal func_800E98C4 -/* 8ED0EC 802412CC 00000000 */ nop -/* 8ED0F0 802412D0 0C03A6DB */ jal sync_status_menu -/* 8ED0F4 802412D4 00000000 */ nop -/* 8ED0F8 802412D8 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED0FC 802412DC 24020002 */ addiu $v0, $zero, 2 -/* 8ED100 802412E0 03E00008 */ jr $ra -/* 8ED104 802412E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s deleted file mode 100644 index a19bca4574..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_80241548_A87F98.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241548_A87F98 -/* A87F98 80241548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A87F9C 8024154C AFBF0010 */ sw $ra, 0x10($sp) -/* A87FA0 80241550 0C03A631 */ jal func_800E98C4 -/* A87FA4 80241554 00000000 */ nop -/* A87FA8 80241558 0C03A6DB */ jal sync_status_menu -/* A87FAC 8024155C 00000000 */ nop -/* A87FB0 80241560 8FBF0010 */ lw $ra, 0x10($sp) -/* A87FB4 80241564 24020002 */ addiu $v0, $zero, 2 -/* A87FB8 80241568 03E00008 */ jr $ra -/* A87FBC 8024156C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s deleted file mode 100644 index 4076386945..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241628_A8E0A8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241628_A8E0A8 -/* A8E0A8 80241628 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E0AC 8024162C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E0B0 80241630 0C03A631 */ jal func_800E98C4 -/* A8E0B4 80241634 00000000 */ nop -/* A8E0B8 80241638 0C03A6DB */ jal sync_status_menu -/* A8E0BC 8024163C 00000000 */ nop -/* A8E0C0 80241640 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E0C4 80241644 24020002 */ addiu $v0, $zero, 2 -/* A8E0C8 80241648 03E00008 */ jr $ra -/* A8E0CC 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s deleted file mode 100644 index f08b379a6a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802437CC_80404C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802437CC_80404C -/* 80404C 802437CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804050 802437D0 AFBF0010 */ sw $ra, 0x10($sp) -/* 804054 802437D4 0C03A631 */ jal func_800E98C4 -/* 804058 802437D8 00000000 */ nop -/* 80405C 802437DC 0C03A6DB */ jal sync_status_menu -/* 804060 802437E0 00000000 */ nop -/* 804064 802437E4 8FBF0010 */ lw $ra, 0x10($sp) -/* 804068 802437E8 24020002 */ addiu $v0, $zero, 2 -/* 80406C 802437EC 03E00008 */ jr $ra -/* 804070 802437F0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s deleted file mode 100644 index 0bc23d492d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_8024552C_805DAC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024552C_805DAC -/* 805DAC 8024552C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805DB0 80245530 AFBF0010 */ sw $ra, 0x10($sp) -/* 805DB4 80245534 0C03BCE9 */ jal func_800EF3A4 -/* 805DB8 80245538 00000000 */ nop -/* 805DBC 8024553C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805DC0 80245540 24020002 */ addiu $v0, $zero, 2 -/* 805DC4 80245544 03E00008 */ jr $ra -/* 805DC8 80245548 27BD0018 */ addiu $sp, $sp, 0x18 -/* 805DCC 8024554C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s deleted file mode 100644 index 98cc382f6f..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240A8C_9C5E6C.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240A8C_9C5E6C -/* 9C5E6C 80240A8C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5E70 80240A90 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5E74 80240A94 0C03A631 */ jal func_800E98C4 -/* 9C5E78 80240A98 00000000 */ nop -/* 9C5E7C 80240A9C 0C03A6DB */ jal sync_status_menu -/* 9C5E80 80240AA0 00000000 */ nop -/* 9C5E84 80240AA4 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5E88 80240AA8 24020002 */ addiu $v0, $zero, 2 -/* 9C5E8C 80240AAC 03E00008 */ jr $ra -/* 9C5E90 80240AB0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s deleted file mode 100644 index 79f4dca6c4..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240850_D05F80.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240850_D05F80 -/* D05F80 80240850 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D05F84 80240854 AFBF0010 */ sw $ra, 0x10($sp) -/* D05F88 80240858 0C03A631 */ jal func_800E98C4 -/* D05F8C 8024085C 00000000 */ nop -/* D05F90 80240860 0C03A6DB */ jal sync_status_menu -/* D05F94 80240864 00000000 */ nop -/* D05F98 80240868 8FBF0010 */ lw $ra, 0x10($sp) -/* D05F9C 8024086C 24020002 */ addiu $v0, $zero, 2 -/* D05FA0 80240870 03E00008 */ jr $ra -/* D05FA4 80240874 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s deleted file mode 100644 index ab125b4731..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80241F70_D21E00.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F70_D21E00 -/* D21E00 80241F70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21E04 80241F74 AFBF0010 */ sw $ra, 0x10($sp) -/* D21E08 80241F78 0C03A631 */ jal func_800E98C4 -/* D21E0C 80241F7C 00000000 */ nop -/* D21E10 80241F80 0C03A6DB */ jal sync_status_menu -/* D21E14 80241F84 00000000 */ nop -/* D21E18 80241F88 8FBF0010 */ lw $ra, 0x10($sp) -/* D21E1C 80241F8C 24020002 */ addiu $v0, $zero, 2 -/* D21E20 80241F90 03E00008 */ jr $ra -/* D21E24 80241F94 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index b83f6531db..80a476decc 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434A4_96C664); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index e114a963e1..deae16f636 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421C8_A1D2C8); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 68be87c175..a6dba2e1a9 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414D0_B360A0); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index f7b897aa31..65a0137d53 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802402E0_AFDE20); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 9ffcee5159..90ab04e118 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243090_8B3100); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 86177005f7..591ef2d39c 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412C0_8ED0E0); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index c84dd51ff4..db6b873542 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241548_A87F98); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 63d71a56a1..a94ad62287 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241628_A8E0A8); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 342f3881ba..a2816f87f5 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802437CC_80404C); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074); @@ -189,4 +189,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024552C_805DAC); +ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) { + func_800EF3A4(); + return ApiStatus_DONE2; +} diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index f3d8467455..bdc56984a6 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240A8C_9C5E6C); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 670a7c10e5..f611159bfe 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240850_D05F80); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 2e87ca9e37..8e573c3ed6 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); #include "world/common/Call800E9894.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F70_D21E00); +#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); diff --git a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c new file mode 100644 index 0000000000..90e4efc6a3 --- /dev/null +++ b/src/world/common/Unk800E98C4SyncStatusMenu.inc.c @@ -0,0 +1,7 @@ +#include "common.h" + +static ApiStatus Unk800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { + func_800E98C4(); + sync_status_menu(); + return ApiStatus_DONE2; +} From 8dc783bf5bd8e8e10480a935ab770d8e1a56d9d5 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 23:47:20 -0400 Subject: [PATCH 07/45] PartnerToggleAbilityScript --- .../dro_02/9694C0/func_802435F8_96C7B8.s | 16 ---------------- .../dro_02/9694C0/func_80243624_96C7E4.s | 12 ------------ .../hos_03/A1BDB0/func_8024231C_A1D41C.s | 16 ---------------- .../hos_03/A1BDB0/func_80242348_A1D448.s | 12 ------------ .../jan_03/B34BD0/func_80241624_B361F4.s | 16 ---------------- .../jan_03/B34BD0/func_80241650_B36220.s | 12 ------------ .../kkj_20/AFDE00/func_80240434_AFDF74.s | 16 ---------------- .../kkj_20/AFDE00/func_80240460_AFDFA0.s | 12 ------------ .../kmr_02/8B30E0/func_802431E4_8B3254.s | 16 ---------------- .../kmr_02/8B30E0/func_80243210_8B3280.s | 12 ------------ .../kmr_20/8ED0C0/func_80241414_8ED234.s | 16 ---------------- .../kmr_20/8ED0C0/func_80241440_8ED260.s | 12 ------------ .../kpa_91/A86A50/func_8024169C_A880EC.s | 16 ---------------- .../kpa_91/A86A50/func_802416C8_A88118.s | 12 ------------ .../kpa_95/A8CB60/func_8024177C_A8E1FC.s | 16 ---------------- .../kpa_95/A8CB60/func_802417A8_A8E228.s | 12 ------------ .../mac_01/8017D0/func_80243920_8041A0.s | 16 ---------------- .../mac_01/8017D0/func_80245504_805D84.s | 14 -------------- .../nok_01/9C53E0/func_80240BE0_9C5FC0.s | 16 ---------------- .../nok_01/9C53E0/func_80240C0C_9C5FEC.s | 12 ------------ .../sam_02/D05F60/func_802409A4_D060D4.s | 16 ---------------- .../sam_02/D05F60/func_802409D0_D06100.s | 12 ------------ .../sam_06/D203E0/func_802420C4_D21F54.s | 16 ---------------- .../sam_06/D203E0/func_802420F0_D21F80.s | 12 ------------ src/world/area_dro/dro_02/9694C0.c | 4 +--- src/world/area_hos/hos_03/A1BDB0.c | 4 +--- src/world/area_jan/jan_03/B34BD0.c | 4 +--- src/world/area_kkj/kkj_20/AFDE00.c | 4 +--- src/world/area_kmr/kmr_02/8B30E0.c | 4 +--- src/world/area_kmr/kmr_20/8ED0C0.c | 4 +--- src/world/area_kpa/kpa_91/A86A50.c | 4 +--- src/world/area_kpa/kpa_95/A8CB60.c | 4 +--- src/world/area_mac/mac_01/8017D0.c | 12 +++++------- src/world/area_nok/nok_01/9C53E0.c | 4 +--- src/world/area_sam/sam_02/D05F60.c | 4 +--- src/world/area_sam/sam_06/D203E0.c | 4 +--- .../common/PartnerToggleAbilityScript.inc.c | 14 ++++++++++++++ 37 files changed, 30 insertions(+), 378 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s create mode 100644 src/world/common/PartnerToggleAbilityScript.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s deleted file mode 100644 index cf62591195..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435F8_96C7B8.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435F8_96C7B8 -/* 96C7B8 802435F8 3C028011 */ lui $v0, 0x8011 -/* 96C7BC 802435FC 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 96C7C0 80243600 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C7C4 80243604 10400003 */ beqz $v0, .L80243614 -/* 96C7C8 80243608 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C7CC 8024360C 0C03AE06 */ jal partner_suspend_ability_script -/* 96C7D0 80243610 00000000 */ nop -.L80243614: -/* 96C7D4 80243614 24020002 */ addiu $v0, $zero, 2 -/* 96C7D8 80243618 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7DC 8024361C 03E00008 */ jr $ra -/* 96C7E0 80243620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s deleted file mode 100644 index c19416d262..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243624_96C7E4.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243624_96C7E4 -/* 96C7E4 80243624 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C7E8 80243628 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C7EC 8024362C 0C03AE18 */ jal partner_resume_ability_script -/* 96C7F0 80243630 00000000 */ nop -/* 96C7F4 80243634 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7F8 80243638 24020002 */ addiu $v0, $zero, 2 -/* 96C7FC 8024363C 03E00008 */ jr $ra -/* 96C800 80243640 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s deleted file mode 100644 index 0fef1c1081..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024231C_A1D41C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024231C_A1D41C -/* A1D41C 8024231C 3C028011 */ lui $v0, 0x8011 -/* A1D420 80242320 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A1D424 80242324 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D428 80242328 10400003 */ beqz $v0, .L80242338 -/* A1D42C 8024232C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D430 80242330 0C03AE06 */ jal partner_suspend_ability_script -/* A1D434 80242334 00000000 */ nop -.L80242338: -/* A1D438 80242338 24020002 */ addiu $v0, $zero, 2 -/* A1D43C 8024233C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D440 80242340 03E00008 */ jr $ra -/* A1D444 80242344 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s deleted file mode 100644 index d5befc3f78..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242348_A1D448.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242348_A1D448 -/* A1D448 80242348 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D44C 8024234C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D450 80242350 0C03AE18 */ jal partner_resume_ability_script -/* A1D454 80242354 00000000 */ nop -/* A1D458 80242358 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D45C 8024235C 24020002 */ addiu $v0, $zero, 2 -/* A1D460 80242360 03E00008 */ jr $ra -/* A1D464 80242364 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s deleted file mode 100644 index 26f5f5a757..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241624_B361F4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241624_B361F4 -/* B361F4 80241624 3C028011 */ lui $v0, 0x8011 -/* B361F8 80241628 8042F2A2 */ lb $v0, -0xd5e($v0) -/* B361FC 8024162C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36200 80241630 10400003 */ beqz $v0, .L80241640 -/* B36204 80241634 AFBF0010 */ sw $ra, 0x10($sp) -/* B36208 80241638 0C03AE06 */ jal partner_suspend_ability_script -/* B3620C 8024163C 00000000 */ nop -.L80241640: -/* B36210 80241640 24020002 */ addiu $v0, $zero, 2 -/* B36214 80241644 8FBF0010 */ lw $ra, 0x10($sp) -/* B36218 80241648 03E00008 */ jr $ra -/* B3621C 8024164C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s deleted file mode 100644 index af5b8f82cd..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241650_B36220.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_B36220 -/* B36220 80241650 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36224 80241654 AFBF0010 */ sw $ra, 0x10($sp) -/* B36228 80241658 0C03AE18 */ jal partner_resume_ability_script -/* B3622C 8024165C 00000000 */ nop -/* B36230 80241660 8FBF0010 */ lw $ra, 0x10($sp) -/* B36234 80241664 24020002 */ addiu $v0, $zero, 2 -/* B36238 80241668 03E00008 */ jr $ra -/* B3623C 8024166C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s deleted file mode 100644 index b4625fd8d0..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240434_AFDF74.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240434_AFDF74 -/* AFDF74 80240434 3C028011 */ lui $v0, 0x8011 -/* AFDF78 80240438 8042F2A2 */ lb $v0, -0xd5e($v0) -/* AFDF7C 8024043C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDF80 80240440 10400003 */ beqz $v0, .L80240450 -/* AFDF84 80240444 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDF88 80240448 0C03AE06 */ jal partner_suspend_ability_script -/* AFDF8C 8024044C 00000000 */ nop -.L80240450: -/* AFDF90 80240450 24020002 */ addiu $v0, $zero, 2 -/* AFDF94 80240454 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDF98 80240458 03E00008 */ jr $ra -/* AFDF9C 8024045C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s deleted file mode 100644 index c95e2d2802..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240460_AFDFA0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240460_AFDFA0 -/* AFDFA0 80240460 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDFA4 80240464 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDFA8 80240468 0C03AE18 */ jal partner_resume_ability_script -/* AFDFAC 8024046C 00000000 */ nop -/* AFDFB0 80240470 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDFB4 80240474 24020002 */ addiu $v0, $zero, 2 -/* AFDFB8 80240478 03E00008 */ jr $ra -/* AFDFBC 8024047C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s deleted file mode 100644 index a1ad5c51b5..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431E4_8B3254.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431E4_8B3254 -/* 8B3254 802431E4 3C028011 */ lui $v0, 0x8011 -/* 8B3258 802431E8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8B325C 802431EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3260 802431F0 10400003 */ beqz $v0, .L80243200 -/* 8B3264 802431F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3268 802431F8 0C03AE06 */ jal partner_suspend_ability_script -/* 8B326C 802431FC 00000000 */ nop -.L80243200: -/* 8B3270 80243200 24020002 */ addiu $v0, $zero, 2 -/* 8B3274 80243204 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3278 80243208 03E00008 */ jr $ra -/* 8B327C 8024320C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s deleted file mode 100644 index 31b714dbf7..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243210_8B3280.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243210_8B3280 -/* 8B3280 80243210 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3284 80243214 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3288 80243218 0C03AE18 */ jal partner_resume_ability_script -/* 8B328C 8024321C 00000000 */ nop -/* 8B3290 80243220 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3294 80243224 24020002 */ addiu $v0, $zero, 2 -/* 8B3298 80243228 03E00008 */ jr $ra -/* 8B329C 8024322C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s deleted file mode 100644 index 633f211abf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241414_8ED234.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241414_8ED234 -/* 8ED234 80241414 3C028011 */ lui $v0, 0x8011 -/* 8ED238 80241418 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8ED23C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED240 80241420 10400003 */ beqz $v0, .L80241430 -/* 8ED244 80241424 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED248 80241428 0C03AE06 */ jal partner_suspend_ability_script -/* 8ED24C 8024142C 00000000 */ nop -.L80241430: -/* 8ED250 80241430 24020002 */ addiu $v0, $zero, 2 -/* 8ED254 80241434 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED258 80241438 03E00008 */ jr $ra -/* 8ED25C 8024143C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s deleted file mode 100644 index 1b754b3e3b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241440_8ED260.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241440_8ED260 -/* 8ED260 80241440 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED264 80241444 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED268 80241448 0C03AE18 */ jal partner_resume_ability_script -/* 8ED26C 8024144C 00000000 */ nop -/* 8ED270 80241450 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED274 80241454 24020002 */ addiu $v0, $zero, 2 -/* 8ED278 80241458 03E00008 */ jr $ra -/* 8ED27C 8024145C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s deleted file mode 100644 index 5733b7c686..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024169C_A880EC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024169C_A880EC -/* A880EC 8024169C 3C028011 */ lui $v0, 0x8011 -/* A880F0 802416A0 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A880F4 802416A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A880F8 802416A8 10400003 */ beqz $v0, .L802416B8 -/* A880FC 802416AC AFBF0010 */ sw $ra, 0x10($sp) -/* A88100 802416B0 0C03AE06 */ jal partner_suspend_ability_script -/* A88104 802416B4 00000000 */ nop -.L802416B8: -/* A88108 802416B8 24020002 */ addiu $v0, $zero, 2 -/* A8810C 802416BC 8FBF0010 */ lw $ra, 0x10($sp) -/* A88110 802416C0 03E00008 */ jr $ra -/* A88114 802416C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s deleted file mode 100644 index 50df82f11a..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802416C8_A88118.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416C8_A88118 -/* A88118 802416C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8811C 802416CC AFBF0010 */ sw $ra, 0x10($sp) -/* A88120 802416D0 0C03AE18 */ jal partner_resume_ability_script -/* A88124 802416D4 00000000 */ nop -/* A88128 802416D8 8FBF0010 */ lw $ra, 0x10($sp) -/* A8812C 802416DC 24020002 */ addiu $v0, $zero, 2 -/* A88130 802416E0 03E00008 */ jr $ra -/* A88134 802416E4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s deleted file mode 100644 index 6bf87bbc8f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024177C_A8E1FC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024177C_A8E1FC -/* A8E1FC 8024177C 3C028011 */ lui $v0, 0x8011 -/* A8E200 80241780 8042F2A2 */ lb $v0, -0xd5e($v0) -/* A8E204 80241784 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E208 80241788 10400003 */ beqz $v0, .L80241798 -/* A8E20C 8024178C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E210 80241790 0C03AE06 */ jal partner_suspend_ability_script -/* A8E214 80241794 00000000 */ nop -.L80241798: -/* A8E218 80241798 24020002 */ addiu $v0, $zero, 2 -/* A8E21C 8024179C 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E220 802417A0 03E00008 */ jr $ra -/* A8E224 802417A4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s deleted file mode 100644 index e249e3c001..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802417A8_A8E228.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417A8_A8E228 -/* A8E228 802417A8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E22C 802417AC AFBF0010 */ sw $ra, 0x10($sp) -/* A8E230 802417B0 0C03AE18 */ jal partner_resume_ability_script -/* A8E234 802417B4 00000000 */ nop -/* A8E238 802417B8 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E23C 802417BC 24020002 */ addiu $v0, $zero, 2 -/* A8E240 802417C0 03E00008 */ jr $ra -/* A8E244 802417C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s deleted file mode 100644 index a8c07f81d2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243920_8041A0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243920_8041A0 -/* 8041A0 80243920 3C028011 */ lui $v0, 0x8011 -/* 8041A4 80243924 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 8041A8 80243928 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8041AC 8024392C 10400003 */ beqz $v0, .L8024393C -/* 8041B0 80243930 AFBF0010 */ sw $ra, 0x10($sp) -/* 8041B4 80243934 0C03AE06 */ jal partner_suspend_ability_script -/* 8041B8 80243938 00000000 */ nop -.L8024393C: -/* 8041BC 8024393C 24020002 */ addiu $v0, $zero, 2 -/* 8041C0 80243940 8FBF0010 */ lw $ra, 0x10($sp) -/* 8041C4 80243944 03E00008 */ jr $ra -/* 8041C8 80243948 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s deleted file mode 100644 index 3ff47e1923..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245504_805D84.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245504_805D84 -/* 805D84 80245504 3C0141A0 */ lui $at, 0x41a0 -/* 805D88 80245508 44816000 */ mtc1 $at, $f12 -/* 805D8C 8024550C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805D90 80245510 AFBF0010 */ sw $ra, 0x10($sp) -/* 805D94 80245514 0C03BCE5 */ jal func_800EF394 -/* 805D98 80245518 00000000 */ nop -/* 805D9C 8024551C 8FBF0010 */ lw $ra, 0x10($sp) -/* 805DA0 80245520 24020002 */ addiu $v0, $zero, 2 -/* 805DA4 80245524 03E00008 */ jr $ra -/* 805DA8 80245528 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s deleted file mode 100644 index 16b30d3430..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BE0_9C5FC0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BE0_9C5FC0 -/* 9C5FC0 80240BE0 3C028011 */ lui $v0, 0x8011 -/* 9C5FC4 80240BE4 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 9C5FC8 80240BE8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5FCC 80240BEC 10400003 */ beqz $v0, .L80240BFC -/* 9C5FD0 80240BF0 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5FD4 80240BF4 0C03AE06 */ jal partner_suspend_ability_script -/* 9C5FD8 80240BF8 00000000 */ nop -.L80240BFC: -/* 9C5FDC 80240BFC 24020002 */ addiu $v0, $zero, 2 -/* 9C5FE0 80240C00 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5FE4 80240C04 03E00008 */ jr $ra -/* 9C5FE8 80240C08 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s deleted file mode 100644 index 40d7fa4df1..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240C0C_9C5FEC.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240C0C_9C5FEC -/* 9C5FEC 80240C0C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5FF0 80240C10 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5FF4 80240C14 0C03AE18 */ jal partner_resume_ability_script -/* 9C5FF8 80240C18 00000000 */ nop -/* 9C5FFC 80240C1C 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6000 80240C20 24020002 */ addiu $v0, $zero, 2 -/* 9C6004 80240C24 03E00008 */ jr $ra -/* 9C6008 80240C28 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s deleted file mode 100644 index 5e228d9dc5..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409A4_D060D4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409A4_D060D4 -/* D060D4 802409A4 3C028011 */ lui $v0, 0x8011 -/* D060D8 802409A8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* D060DC 802409AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D060E0 802409B0 10400003 */ beqz $v0, .L802409C0 -/* D060E4 802409B4 AFBF0010 */ sw $ra, 0x10($sp) -/* D060E8 802409B8 0C03AE06 */ jal partner_suspend_ability_script -/* D060EC 802409BC 00000000 */ nop -.L802409C0: -/* D060F0 802409C0 24020002 */ addiu $v0, $zero, 2 -/* D060F4 802409C4 8FBF0010 */ lw $ra, 0x10($sp) -/* D060F8 802409C8 03E00008 */ jr $ra -/* D060FC 802409CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s deleted file mode 100644 index 6f9347d460..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802409D0_D06100.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802409D0_D06100 -/* D06100 802409D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06104 802409D4 AFBF0010 */ sw $ra, 0x10($sp) -/* D06108 802409D8 0C03AE18 */ jal partner_resume_ability_script -/* D0610C 802409DC 00000000 */ nop -/* D06110 802409E0 8FBF0010 */ lw $ra, 0x10($sp) -/* D06114 802409E4 24020002 */ addiu $v0, $zero, 2 -/* D06118 802409E8 03E00008 */ jr $ra -/* D0611C 802409EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s deleted file mode 100644 index 09a4660d84..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420C4_D21F54.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420C4_D21F54 -/* D21F54 802420C4 3C028011 */ lui $v0, 0x8011 -/* D21F58 802420C8 8042F2A2 */ lb $v0, -0xd5e($v0) -/* D21F5C 802420CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F60 802420D0 10400003 */ beqz $v0, .L802420E0 -/* D21F64 802420D4 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F68 802420D8 0C03AE06 */ jal partner_suspend_ability_script -/* D21F6C 802420DC 00000000 */ nop -.L802420E0: -/* D21F70 802420E0 24020002 */ addiu $v0, $zero, 2 -/* D21F74 802420E4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F78 802420E8 03E00008 */ jr $ra -/* D21F7C 802420EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s deleted file mode 100644 index 0ae571f005..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802420F0_D21F80.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420F0_D21F80 -/* D21F80 802420F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F84 802420F4 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F88 802420F8 0C03AE18 */ jal partner_resume_ability_script -/* D21F8C 802420FC 00000000 */ nop -/* D21F90 80242100 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F94 80242104 24020002 */ addiu $v0, $zero, 2 -/* D21F98 80242108 03E00008 */ jr $ra -/* D21F9C 8024210C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 80a476decc..00d0e04206 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -96,9 +96,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8_96C788); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435F8_96C7B8); - -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243624_96C7E4); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index deae16f636..0615515cb2 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -32,9 +32,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802422EC_A1D3EC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024231C_A1D41C); - -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242348_A1D448); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a6dba2e1a9..b693e85636 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -52,9 +52,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4_B361C4); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241624_B361F4); - -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241650_B36220); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 65a0137d53..2eef9988ec 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240404_AFDF44); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240434_AFDF74); - -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240460_AFDFA0); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240480_AFDFC0); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 90ab04e118..a9f3c35823 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4_8B3224); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431E4_8B3254); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243210_8B3280); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 591ef2d39c..e4fbb0c751 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4_8ED204); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241414_8ED234); - -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241440_8ED260); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index db6b873542..273018611d 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C_A880BC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024169C_A880EC); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416C8_A88118); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index a94ad62287..c2b28adcd5 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024174C_A8E1CC); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024177C_A8E1FC); - -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417A8_A8E228); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417C8_A8E248); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index a2816f87f5..8652153fbb 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -102,12 +102,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243920_8041A0); - -ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) { - partner_resume_ability_script(); - return ApiStatus_DONE2; -} +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC); @@ -187,7 +182,10 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488_805D08); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802454B4_805D34); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245504_805D84); +ApiStatus func_80245504_805D84(ScriptInstance* script, s32 isInitialCall) { + func_800EF394(20.0f); + return ApiStatus_DONE2; +} ApiStatus func_8024552C_805DAC(ScriptInstance* script, s32 isInitialCall) { func_800EF3A4(); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index bdc56984a6..9aabd27060 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -30,9 +30,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0_9C5F90); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BE0_9C5FC0); - -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C0C_9C5FEC); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index f611159bfe..1f64709ca6 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -10,9 +10,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240974_D060A4); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409A4_D060D4); - -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409D0_D06100); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 8e573c3ed6..58d61fa64e 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -48,9 +48,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094_D21F24); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420C4_D21F54); - -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802420F0_D21F80); +#include "world/common/PartnerToggleAbilityScript.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0); diff --git a/src/world/common/PartnerToggleAbilityScript.inc.c b/src/world/common/PartnerToggleAbilityScript.inc.c new file mode 100644 index 0000000000..a20b7f45de --- /dev/null +++ b/src/world/common/PartnerToggleAbilityScript.inc.c @@ -0,0 +1,14 @@ +#include "common.h" + +static ApiStatus PartnerSuspendAbilityScript(ScriptInstance* script, s32 isInitialCall) { + if (gPlayerData.currentPartner == PartnerId_NONE) { + return ApiStatus_DONE2; + } + partner_suspend_ability_script(); + return ApiStatus_DONE2; +} + +static ApiStatus PartnerResumeAbilityScript(ScriptInstance* script, s32 isInitialCall) { + partner_resume_ability_script(); + return ApiStatus_DONE2; +} From 7717a96628be9c767509d6d149f88cfcd8794a2f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Thu, 29 Oct 2020 23:56:54 -0400 Subject: [PATCH 08/45] Call800EB168 --- .../dro_02/9694C0/func_80243748_96C908.s | 16 ---------------- .../hos_03/A1BDB0/func_8024246C_A1D56C.s | 16 ---------------- .../jan_03/B34BD0/func_80241774_B36344.s | 16 ---------------- .../kkj_20/AFDE00/func_80240584_AFE0C4.s | 16 ---------------- .../kmr_02/8B30E0/func_80243334_8B33A4.s | 16 ---------------- .../kmr_20/8ED0C0/func_80241564_8ED384.s | 16 ---------------- .../kpa_91/A86A50/func_802417EC_A8823C.s | 16 ---------------- .../kpa_95/A8CB60/func_802418CC_A8E34C.s | 16 ---------------- .../mac_01/8017D0/func_80243A70_8042F0.s | 16 ---------------- .../nok_01/9C53E0/func_80240D30_9C6110.s | 16 ---------------- .../sam_02/D05F60/func_80240AF4_D06224.s | 16 ---------------- .../sam_06/D203E0/func_80242214_D220A4.s | 16 ---------------- include/functions.h | 2 ++ src/code_838b0_len_5900.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_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/common/Call800EB168.inc.c | 6 ++++++ 27 files changed, 21 insertions(+), 205 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s create mode 100644 src/world/common/Call800EB168.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s deleted file mode 100644 index f39a0a6e35..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243748_96C908 -/* 96C908 80243748 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C90C 8024374C AFBF0010 */ sw $ra, 0x10($sp) -/* 96C910 80243750 8C82000C */ lw $v0, 0xc($a0) -/* 96C914 80243754 0C0B1EAF */ jal get_variable -/* 96C918 80243758 8C450000 */ lw $a1, ($v0) -/* 96C91C 8024375C 00021600 */ sll $v0, $v0, 0x18 -/* 96C920 80243760 0C03AC5A */ jal func_800EB168 -/* 96C924 80243764 00022603 */ sra $a0, $v0, 0x18 -/* 96C928 80243768 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C92C 8024376C 24020002 */ addiu $v0, $zero, 2 -/* 96C930 80243770 03E00008 */ jr $ra -/* 96C934 80243774 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s deleted file mode 100644 index 940aeaa07f..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024246C_A1D56C -/* A1D56C 8024246C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D570 80242470 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D574 80242474 8C82000C */ lw $v0, 0xc($a0) -/* A1D578 80242478 0C0B1EAF */ jal get_variable -/* A1D57C 8024247C 8C450000 */ lw $a1, ($v0) -/* A1D580 80242480 00021600 */ sll $v0, $v0, 0x18 -/* A1D584 80242484 0C03AC5A */ jal func_800EB168 -/* A1D588 80242488 00022603 */ sra $a0, $v0, 0x18 -/* A1D58C 8024248C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D590 80242490 24020002 */ addiu $v0, $zero, 2 -/* A1D594 80242494 03E00008 */ jr $ra -/* A1D598 80242498 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s deleted file mode 100644 index cf4e2e0fa6..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241774_B36344 -/* B36344 80241774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36348 80241778 AFBF0010 */ sw $ra, 0x10($sp) -/* B3634C 8024177C 8C82000C */ lw $v0, 0xc($a0) -/* B36350 80241780 0C0B1EAF */ jal get_variable -/* B36354 80241784 8C450000 */ lw $a1, ($v0) -/* B36358 80241788 00021600 */ sll $v0, $v0, 0x18 -/* B3635C 8024178C 0C03AC5A */ jal func_800EB168 -/* B36360 80241790 00022603 */ sra $a0, $v0, 0x18 -/* B36364 80241794 8FBF0010 */ lw $ra, 0x10($sp) -/* B36368 80241798 24020002 */ addiu $v0, $zero, 2 -/* B3636C 8024179C 03E00008 */ jr $ra -/* B36370 802417A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s deleted file mode 100644 index 92fdbef2d6..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240584_AFE0C4 -/* AFE0C4 80240584 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFE0C8 80240588 AFBF0010 */ sw $ra, 0x10($sp) -/* AFE0CC 8024058C 8C82000C */ lw $v0, 0xc($a0) -/* AFE0D0 80240590 0C0B1EAF */ jal get_variable -/* AFE0D4 80240594 8C450000 */ lw $a1, ($v0) -/* AFE0D8 80240598 00021600 */ sll $v0, $v0, 0x18 -/* AFE0DC 8024059C 0C03AC5A */ jal func_800EB168 -/* AFE0E0 802405A0 00022603 */ sra $a0, $v0, 0x18 -/* AFE0E4 802405A4 8FBF0010 */ lw $ra, 0x10($sp) -/* AFE0E8 802405A8 24020002 */ addiu $v0, $zero, 2 -/* AFE0EC 802405AC 03E00008 */ jr $ra -/* AFE0F0 802405B0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s deleted file mode 100644 index 6bd5963e90..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243334_8B33A4 -/* 8B33A4 80243334 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B33A8 80243338 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B33AC 8024333C 8C82000C */ lw $v0, 0xc($a0) -/* 8B33B0 80243340 0C0B1EAF */ jal get_variable -/* 8B33B4 80243344 8C450000 */ lw $a1, ($v0) -/* 8B33B8 80243348 00021600 */ sll $v0, $v0, 0x18 -/* 8B33BC 8024334C 0C03AC5A */ jal func_800EB168 -/* 8B33C0 80243350 00022603 */ sra $a0, $v0, 0x18 -/* 8B33C4 80243354 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B33C8 80243358 24020002 */ addiu $v0, $zero, 2 -/* 8B33CC 8024335C 03E00008 */ jr $ra -/* 8B33D0 80243360 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s deleted file mode 100644 index 3f8a50f883..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241564_8ED384 -/* 8ED384 80241564 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED388 80241568 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED38C 8024156C 8C82000C */ lw $v0, 0xc($a0) -/* 8ED390 80241570 0C0B1EAF */ jal get_variable -/* 8ED394 80241574 8C450000 */ lw $a1, ($v0) -/* 8ED398 80241578 00021600 */ sll $v0, $v0, 0x18 -/* 8ED39C 8024157C 0C03AC5A */ jal func_800EB168 -/* 8ED3A0 80241580 00022603 */ sra $a0, $v0, 0x18 -/* 8ED3A4 80241584 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED3A8 80241588 24020002 */ addiu $v0, $zero, 2 -/* 8ED3AC 8024158C 03E00008 */ jr $ra -/* 8ED3B0 80241590 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s deleted file mode 100644 index fc06affc8f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417EC_A8823C -/* A8823C 802417EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A88240 802417F0 AFBF0010 */ sw $ra, 0x10($sp) -/* A88244 802417F4 8C82000C */ lw $v0, 0xc($a0) -/* A88248 802417F8 0C0B1EAF */ jal get_variable -/* A8824C 802417FC 8C450000 */ lw $a1, ($v0) -/* A88250 80241800 00021600 */ sll $v0, $v0, 0x18 -/* A88254 80241804 0C03AC5A */ jal func_800EB168 -/* A88258 80241808 00022603 */ sra $a0, $v0, 0x18 -/* A8825C 8024180C 8FBF0010 */ lw $ra, 0x10($sp) -/* A88260 80241810 24020002 */ addiu $v0, $zero, 2 -/* A88264 80241814 03E00008 */ jr $ra -/* A88268 80241818 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s deleted file mode 100644 index 353115d95f..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418CC_A8E34C -/* A8E34C 802418CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E350 802418D0 AFBF0010 */ sw $ra, 0x10($sp) -/* A8E354 802418D4 8C82000C */ lw $v0, 0xc($a0) -/* A8E358 802418D8 0C0B1EAF */ jal get_variable -/* A8E35C 802418DC 8C450000 */ lw $a1, ($v0) -/* A8E360 802418E0 00021600 */ sll $v0, $v0, 0x18 -/* A8E364 802418E4 0C03AC5A */ jal func_800EB168 -/* A8E368 802418E8 00022603 */ sra $a0, $v0, 0x18 -/* A8E36C 802418EC 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E370 802418F0 24020002 */ addiu $v0, $zero, 2 -/* A8E374 802418F4 03E00008 */ jr $ra -/* A8E378 802418F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s deleted file mode 100644 index 1defd7a02d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A70_8042F0 -/* 8042F0 80243A70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8042F4 80243A74 AFBF0010 */ sw $ra, 0x10($sp) -/* 8042F8 80243A78 8C82000C */ lw $v0, 0xc($a0) -/* 8042FC 80243A7C 0C0B1EAF */ jal get_variable -/* 804300 80243A80 8C450000 */ lw $a1, ($v0) -/* 804304 80243A84 00021600 */ sll $v0, $v0, 0x18 -/* 804308 80243A88 0C03AC5A */ jal func_800EB168 -/* 80430C 80243A8C 00022603 */ sra $a0, $v0, 0x18 -/* 804310 80243A90 8FBF0010 */ lw $ra, 0x10($sp) -/* 804314 80243A94 24020002 */ addiu $v0, $zero, 2 -/* 804318 80243A98 03E00008 */ jr $ra -/* 80431C 80243A9C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s deleted file mode 100644 index 393eda7a34..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240D30_9C6110 -/* 9C6110 80240D30 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C6114 80240D34 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C6118 80240D38 8C82000C */ lw $v0, 0xc($a0) -/* 9C611C 80240D3C 0C0B1EAF */ jal get_variable -/* 9C6120 80240D40 8C450000 */ lw $a1, ($v0) -/* 9C6124 80240D44 00021600 */ sll $v0, $v0, 0x18 -/* 9C6128 80240D48 0C03AC5A */ jal func_800EB168 -/* 9C612C 80240D4C 00022603 */ sra $a0, $v0, 0x18 -/* 9C6130 80240D50 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6134 80240D54 24020002 */ addiu $v0, $zero, 2 -/* 9C6138 80240D58 03E00008 */ jr $ra -/* 9C613C 80240D5C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s deleted file mode 100644 index 77d1ce5032..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AF4_D06224 -/* D06224 80240AF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D06228 80240AF8 AFBF0010 */ sw $ra, 0x10($sp) -/* D0622C 80240AFC 8C82000C */ lw $v0, 0xc($a0) -/* D06230 80240B00 0C0B1EAF */ jal get_variable -/* D06234 80240B04 8C450000 */ lw $a1, ($v0) -/* D06238 80240B08 00021600 */ sll $v0, $v0, 0x18 -/* D0623C 80240B0C 0C03AC5A */ jal func_800EB168 -/* D06240 80240B10 00022603 */ sra $a0, $v0, 0x18 -/* D06244 80240B14 8FBF0010 */ lw $ra, 0x10($sp) -/* D06248 80240B18 24020002 */ addiu $v0, $zero, 2 -/* D0624C 80240B1C 03E00008 */ jr $ra -/* D06250 80240B20 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s deleted file mode 100644 index 75756157e8..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242214_D220A4 -/* D220A4 80242214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D220A8 80242218 AFBF0010 */ sw $ra, 0x10($sp) -/* D220AC 8024221C 8C82000C */ lw $v0, 0xc($a0) -/* D220B0 80242220 0C0B1EAF */ jal get_variable -/* D220B4 80242224 8C450000 */ lw $a1, ($v0) -/* D220B8 80242228 00021600 */ sll $v0, $v0, 0x18 -/* D220BC 8024222C 0C03AC5A */ jal func_800EB168 -/* D220C0 80242230 00022603 */ sra $a0, $v0, 0x18 -/* D220C4 80242234 8FBF0010 */ lw $ra, 0x10($sp) -/* D220C8 80242238 24020002 */ addiu $v0, $zero, 2 -/* D220CC 8024223C 03E00008 */ jr $ra -/* D220D0 80242240 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/functions.h b/include/functions.h index 0b63c6b884..abc8ebebd0 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,6 +70,8 @@ void set_curtain_fade(f32 scale); void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); +s32 func_800EB168(s8); + // Partner void func_800EBA3C(Npc* partner); void func_800EBB40(Npc* partner); diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index 81ce3b95d3..a5c09f35ed 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s8 arg0); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 00d0e04206..3aa40148ca 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -104,7 +104,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714_96C8D4); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243748_96C908); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 0615515cb2..eedf563a06 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438_A1D538); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024246C_A1D56C); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index b693e85636..009935db8d 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241740_B36310); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241774_B36344); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 2eef9988ec..e7148b9e94 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802404D4_AFE014); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240550_AFE090); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240584_AFE0C4); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index a9f3c35823..084612b528 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300_8B3370); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243334_8B33A4); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index e4fbb0c751..e5f3122e66 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530_8ED350); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241564_8ED384); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 273018611d..8b0d639bbe 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8_A88208); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417EC_A8823C); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024181C_A8826C); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index c2b28adcd5..a2adfc8a57 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -52,6 +52,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241898_A8E318); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418CC_A8E34C); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 8652153fbb..eb8f845ec4 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -110,7 +110,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A70_8042F0); +#include "world/common/Call800EB168.inc.c" ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 9aabd27060..f7b71c1b6b 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC_9C60DC); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D30_9C6110); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 1f64709ca6..4b718caf18 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0_D061F0); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AF4_D06224); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 58d61fa64e..e16fd8d903 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802421E0_D22070); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242214_D220A4); +#include "world/common/Call800EB168.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4); diff --git a/src/world/common/Call800EB168.inc.c b/src/world/common/Call800EB168.inc.c new file mode 100644 index 0000000000..0d80634214 --- /dev/null +++ b/src/world/common/Call800EB168.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) { + func_800EB168(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} From 3848319469fbd7e0862fcb07e143c003bf58d7c4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:01:25 -0400 Subject: [PATCH 09/45] NotDoesScriptExist --- .../dro_02/9694C0/func_802435C8_96C788.s | 16 ---------------- .../hos_03/A1BDB0/func_802422EC_A1D3EC.s | 16 ---------------- .../jan_03/B34BD0/func_802415F4_B361C4.s | 16 ---------------- .../kkj_20/AFDE00/func_80240404_AFDF44.s | 16 ---------------- .../kmr_02/8B30E0/func_802431B4_8B3224.s | 16 ---------------- .../kmr_20/8ED0C0/func_802413E4_8ED204.s | 16 ---------------- .../kpa_91/A86A50/func_8024166C_A880BC.s | 16 ---------------- .../kpa_95/A8CB60/func_8024174C_A8E1CC.s | 16 ---------------- .../mac_01/8017D0/func_802438F0_804170.s | 16 ---------------- .../nok_01/9C53E0/func_80240BB0_9C5F90.s | 16 ---------------- .../sam_02/D05F60/func_80240974_D060A4.s | 16 ---------------- .../sam_06/D203E0/func_80242094_D21F24.s | 16 ---------------- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- src/world/common/NotDoesScriptExist.inc.c | 5 +++++ 25 files changed, 17 insertions(+), 204 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s create mode 100644 src/world/common/NotDoesScriptExist.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s deleted file mode 100644 index ea148d4bf8..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_802435C8_96C788.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802435C8_96C788 -/* 96C788 802435C8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C78C 802435CC AFBF0010 */ sw $ra, 0x10($sp) -/* 96C790 802435D0 8C82000C */ lw $v0, 0xc($a0) -/* 96C794 802435D4 0C0B1EAF */ jal get_variable -/* 96C798 802435D8 8C450000 */ lw $a1, ($v0) -/* 96C79C 802435DC 0C0B1059 */ jal does_script_exist -/* 96C7A0 802435E0 0040202D */ daddu $a0, $v0, $zero -/* 96C7A4 802435E4 2C420001 */ sltiu $v0, $v0, 1 -/* 96C7A8 802435E8 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C7AC 802435EC 00021040 */ sll $v0, $v0, 1 -/* 96C7B0 802435F0 03E00008 */ jr $ra -/* 96C7B4 802435F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s deleted file mode 100644 index c9f8d55b7c..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802422EC_A1D3EC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422EC_A1D3EC -/* A1D3EC 802422EC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D3F0 802422F0 AFBF0010 */ sw $ra, 0x10($sp) -/* A1D3F4 802422F4 8C82000C */ lw $v0, 0xc($a0) -/* A1D3F8 802422F8 0C0B1EAF */ jal get_variable -/* A1D3FC 802422FC 8C450000 */ lw $a1, ($v0) -/* A1D400 80242300 0C0B1059 */ jal does_script_exist -/* A1D404 80242304 0040202D */ daddu $a0, $v0, $zero -/* A1D408 80242308 2C420001 */ sltiu $v0, $v0, 1 -/* A1D40C 8024230C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D410 80242310 00021040 */ sll $v0, $v0, 1 -/* A1D414 80242314 03E00008 */ jr $ra -/* A1D418 80242318 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s deleted file mode 100644 index c25aeba348..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802415F4_B361C4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415F4_B361C4 -/* B361C4 802415F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B361C8 802415F8 AFBF0010 */ sw $ra, 0x10($sp) -/* B361CC 802415FC 8C82000C */ lw $v0, 0xc($a0) -/* B361D0 80241600 0C0B1EAF */ jal get_variable -/* B361D4 80241604 8C450000 */ lw $a1, ($v0) -/* B361D8 80241608 0C0B1059 */ jal does_script_exist -/* B361DC 8024160C 0040202D */ daddu $a0, $v0, $zero -/* B361E0 80241610 2C420001 */ sltiu $v0, $v0, 1 -/* B361E4 80241614 8FBF0010 */ lw $ra, 0x10($sp) -/* B361E8 80241618 00021040 */ sll $v0, $v0, 1 -/* B361EC 8024161C 03E00008 */ jr $ra -/* B361F0 80241620 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s deleted file mode 100644 index e35648e20f..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240404_AFDF44.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240404_AFDF44 -/* AFDF44 80240404 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFDF48 80240408 AFBF0010 */ sw $ra, 0x10($sp) -/* AFDF4C 8024040C 8C82000C */ lw $v0, 0xc($a0) -/* AFDF50 80240410 0C0B1EAF */ jal get_variable -/* AFDF54 80240414 8C450000 */ lw $a1, ($v0) -/* AFDF58 80240418 0C0B1059 */ jal does_script_exist -/* AFDF5C 8024041C 0040202D */ daddu $a0, $v0, $zero -/* AFDF60 80240420 2C420001 */ sltiu $v0, $v0, 1 -/* AFDF64 80240424 8FBF0010 */ lw $ra, 0x10($sp) -/* AFDF68 80240428 00021040 */ sll $v0, $v0, 1 -/* AFDF6C 8024042C 03E00008 */ jr $ra -/* AFDF70 80240430 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s deleted file mode 100644 index d21815dd5f..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_802431B4_8B3224.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431B4_8B3224 -/* 8B3224 802431B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3228 802431B8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B322C 802431BC 8C82000C */ lw $v0, 0xc($a0) -/* 8B3230 802431C0 0C0B1EAF */ jal get_variable -/* 8B3234 802431C4 8C450000 */ lw $a1, ($v0) -/* 8B3238 802431C8 0C0B1059 */ jal does_script_exist -/* 8B323C 802431CC 0040202D */ daddu $a0, $v0, $zero -/* 8B3240 802431D0 2C420001 */ sltiu $v0, $v0, 1 -/* 8B3244 802431D4 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3248 802431D8 00021040 */ sll $v0, $v0, 1 -/* 8B324C 802431DC 03E00008 */ jr $ra -/* 8B3250 802431E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s deleted file mode 100644 index 67794efeef..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_802413E4_8ED204.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413E4_8ED204 -/* 8ED204 802413E4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED208 802413E8 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED20C 802413EC 8C82000C */ lw $v0, 0xc($a0) -/* 8ED210 802413F0 0C0B1EAF */ jal get_variable -/* 8ED214 802413F4 8C450000 */ lw $a1, ($v0) -/* 8ED218 802413F8 0C0B1059 */ jal does_script_exist -/* 8ED21C 802413FC 0040202D */ daddu $a0, $v0, $zero -/* 8ED220 80241400 2C420001 */ sltiu $v0, $v0, 1 -/* 8ED224 80241404 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED228 80241408 00021040 */ sll $v0, $v0, 1 -/* 8ED22C 8024140C 03E00008 */ jr $ra -/* 8ED230 80241410 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s deleted file mode 100644 index 1333a5a1b3..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_8024166C_A880BC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024166C_A880BC -/* A880BC 8024166C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A880C0 80241670 AFBF0010 */ sw $ra, 0x10($sp) -/* A880C4 80241674 8C82000C */ lw $v0, 0xc($a0) -/* A880C8 80241678 0C0B1EAF */ jal get_variable -/* A880CC 8024167C 8C450000 */ lw $a1, ($v0) -/* A880D0 80241680 0C0B1059 */ jal does_script_exist -/* A880D4 80241684 0040202D */ daddu $a0, $v0, $zero -/* A880D8 80241688 2C420001 */ sltiu $v0, $v0, 1 -/* A880DC 8024168C 8FBF0010 */ lw $ra, 0x10($sp) -/* A880E0 80241690 00021040 */ sll $v0, $v0, 1 -/* A880E4 80241694 03E00008 */ jr $ra -/* A880E8 80241698 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s deleted file mode 100644 index 2998e1e7aa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_8024174C_A8E1CC.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024174C_A8E1CC -/* A8E1CC 8024174C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E1D0 80241750 AFBF0010 */ sw $ra, 0x10($sp) -/* A8E1D4 80241754 8C82000C */ lw $v0, 0xc($a0) -/* A8E1D8 80241758 0C0B1EAF */ jal get_variable -/* A8E1DC 8024175C 8C450000 */ lw $a1, ($v0) -/* A8E1E0 80241760 0C0B1059 */ jal does_script_exist -/* A8E1E4 80241764 0040202D */ daddu $a0, $v0, $zero -/* A8E1E8 80241768 2C420001 */ sltiu $v0, $v0, 1 -/* A8E1EC 8024176C 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E1F0 80241770 00021040 */ sll $v0, $v0, 1 -/* A8E1F4 80241774 03E00008 */ jr $ra -/* A8E1F8 80241778 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s deleted file mode 100644 index 6e3b37c95c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802438F0_804170.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802438F0_804170 -/* 804170 802438F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 804174 802438F4 AFBF0010 */ sw $ra, 0x10($sp) -/* 804178 802438F8 8C82000C */ lw $v0, 0xc($a0) -/* 80417C 802438FC 0C0B1EAF */ jal get_variable -/* 804180 80243900 8C450000 */ lw $a1, ($v0) -/* 804184 80243904 0C0B1059 */ jal does_script_exist -/* 804188 80243908 0040202D */ daddu $a0, $v0, $zero -/* 80418C 8024390C 2C420001 */ sltiu $v0, $v0, 1 -/* 804190 80243910 8FBF0010 */ lw $ra, 0x10($sp) -/* 804194 80243914 00021040 */ sll $v0, $v0, 1 -/* 804198 80243918 03E00008 */ jr $ra -/* 80419C 8024391C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s deleted file mode 100644 index 6350b38660..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240BB0_9C5F90.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240BB0_9C5F90 -/* 9C5F90 80240BB0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C5F94 80240BB4 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C5F98 80240BB8 8C82000C */ lw $v0, 0xc($a0) -/* 9C5F9C 80240BBC 0C0B1EAF */ jal get_variable -/* 9C5FA0 80240BC0 8C450000 */ lw $a1, ($v0) -/* 9C5FA4 80240BC4 0C0B1059 */ jal does_script_exist -/* 9C5FA8 80240BC8 0040202D */ daddu $a0, $v0, $zero -/* 9C5FAC 80240BCC 2C420001 */ sltiu $v0, $v0, 1 -/* 9C5FB0 80240BD0 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C5FB4 80240BD4 00021040 */ sll $v0, $v0, 1 -/* 9C5FB8 80240BD8 03E00008 */ jr $ra -/* 9C5FBC 80240BDC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s deleted file mode 100644 index 2eaaf35507..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240974_D060A4.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240974_D060A4 -/* D060A4 80240974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D060A8 80240978 AFBF0010 */ sw $ra, 0x10($sp) -/* D060AC 8024097C 8C82000C */ lw $v0, 0xc($a0) -/* D060B0 80240980 0C0B1EAF */ jal get_variable -/* D060B4 80240984 8C450000 */ lw $a1, ($v0) -/* D060B8 80240988 0C0B1059 */ jal does_script_exist -/* D060BC 8024098C 0040202D */ daddu $a0, $v0, $zero -/* D060C0 80240990 2C420001 */ sltiu $v0, $v0, 1 -/* D060C4 80240994 8FBF0010 */ lw $ra, 0x10($sp) -/* D060C8 80240998 00021040 */ sll $v0, $v0, 1 -/* D060CC 8024099C 03E00008 */ jr $ra -/* D060D0 802409A0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s deleted file mode 100644 index cdb5372ebc..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242094_D21F24.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242094_D21F24 -/* D21F24 80242094 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D21F28 80242098 AFBF0010 */ sw $ra, 0x10($sp) -/* D21F2C 8024209C 8C82000C */ lw $v0, 0xc($a0) -/* D21F30 802420A0 0C0B1EAF */ jal get_variable -/* D21F34 802420A4 8C450000 */ lw $a1, ($v0) -/* D21F38 802420A8 0C0B1059 */ jal does_script_exist -/* D21F3C 802420AC 0040202D */ daddu $a0, $v0, $zero -/* D21F40 802420B0 2C420001 */ sltiu $v0, $v0, 1 -/* D21F44 802420B4 8FBF0010 */ lw $ra, 0x10($sp) -/* D21F48 802420B8 00021040 */ sll $v0, $v0, 1 -/* D21F4C 802420BC 03E00008 */ jr $ra -/* D21F50 802420C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 3aa40148ca..83149e5e4e 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802435C8_96C788); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index eedf563a06..df7a2a10f6 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802422EC_A1D3EC); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 009935db8d..fe533e2b8a 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802415F4_B361C4); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index e7148b9e94..9e5f6305d4 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240404_AFDF44); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 084612b528..c5f6ac31b4 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802431B4_8B3224); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index e5f3122e66..e978d116de 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802413E4_8ED204); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 8b0d639bbe..9cbdbda024 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024166C_A880BC); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index a2adfc8a57..07812c57d7 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024174C_A8E1CC); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index eb8f845ec4..03af03a6ac 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -100,7 +100,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_80 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802438F0_804170); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index f7b71c1b6b..c4e92f65f6 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240BB0_9C5F90); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 4b718caf18..5affe1f3de 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240974_D060A4); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index e16fd8d903..0a460e3c95 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242094_D21F24); +#include "world/common/NotDoesScriptExist.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/common/NotDoesScriptExist.inc.c b/src/world/common/NotDoesScriptExist.inc.c new file mode 100644 index 0000000000..cdd6ce8750 --- /dev/null +++ b/src/world/common/NotDoesScriptExist.inc.c @@ -0,0 +1,5 @@ +#include "common.h" + +static ApiStatus NotDoesScriptExist(ScriptInstance* script, s32 isInitialCall) { + return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2; +} From da058dc0950e151abdedf6f0825368d62415d908 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:07:11 -0400 Subject: [PATCH 10/45] 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; +} From 83a5d82fbd380458762bfb7666c65a963486e5e0 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:15:44 -0400 Subject: [PATCH 11/45] GetPartnerCall800EB168 --- .../dro_02/9694C0/func_80243714_96C8D4.s | 17 ----------------- .../hos_03/A1BDB0/func_80242438_A1D538.s | 17 ----------------- .../jan_03/B34BD0/func_80241740_B36310.s | 17 ----------------- .../kkj_20/AFDE00/func_80240550_AFE090.s | 17 ----------------- .../kmr_02/8B30E0/func_80243300_8B3370.s | 17 ----------------- .../kmr_20/8ED0C0/func_80241530_8ED350.s | 17 ----------------- .../kpa_91/A86A50/func_802417B8_A88208.s | 17 ----------------- .../kpa_95/A8CB60/func_80241898_A8E318.s | 17 ----------------- .../mac_01/8017D0/func_80243A3C_8042BC.s | 17 ----------------- .../nok_01/9C53E0/func_80240CFC_9C60DC.s | 17 ----------------- .../sam_02/D05F60/func_80240AC0_D061F0.s | 17 ----------------- .../sam_06/D203E0/func_802421E0_D22070.s | 17 ----------------- src/world/area_dro/dro_02/9694C0.c | 4 +--- src/world/area_hos/hos_03/A1BDB0.c | 4 +--- src/world/area_jan/jan_03/B34BD0.c | 4 +--- src/world/area_kkj/kkj_20/AFDE00.c | 4 +--- src/world/area_kmr/kmr_02/8B30E0.c | 4 +--- src/world/area_kmr/kmr_20/8ED0C0.c | 4 +--- src/world/area_kpa/kpa_91/A86A50.c | 4 +--- src/world/area_kpa/kpa_95/A8CB60.c | 4 +--- src/world/area_mac/mac_01/8017D0.c | 4 +--- src/world/area_nok/nok_01/9C53E0.c | 4 +--- src/world/area_sam/sam_02/D05F60.c | 4 +--- src/world/area_sam/sam_06/D203E0.c | 4 +--- src/world/common/Call800EB168.inc.c | 6 ------ src/world/common/GetPartnerCall800EB168.inc.c | 12 ++++++++++++ 26 files changed, 24 insertions(+), 246 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s delete mode 100644 asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s delete mode 100644 src/world/common/Call800EB168.inc.c create mode 100644 src/world/common/GetPartnerCall800EB168.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s deleted file mode 100644 index 1176828dd0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243714_96C8D4.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243714_96C8D4 -/* 96C8D4 80243714 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 96C8D8 80243718 AFBF0010 */ sw $ra, 0x10($sp) -/* 96C8DC 8024371C 8C82000C */ lw $v0, 0xc($a0) -/* 96C8E0 80243720 3C068011 */ lui $a2, 0x8011 -/* 96C8E4 80243724 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 96C8E8 80243728 0C0B2026 */ jal set_variable -/* 96C8EC 8024372C 8C450000 */ lw $a1, ($v0) -/* 96C8F0 80243730 0C03AC5A */ jal func_800EB168 -/* 96C8F4 80243734 0000202D */ daddu $a0, $zero, $zero -/* 96C8F8 80243738 8FBF0010 */ lw $ra, 0x10($sp) -/* 96C8FC 8024373C 24020002 */ addiu $v0, $zero, 2 -/* 96C900 80243740 03E00008 */ jr $ra -/* 96C904 80243744 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s deleted file mode 100644 index 35bd20a86d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80242438_A1D538.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242438_A1D538 -/* A1D538 80242438 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A1D53C 8024243C AFBF0010 */ sw $ra, 0x10($sp) -/* A1D540 80242440 8C82000C */ lw $v0, 0xc($a0) -/* A1D544 80242444 3C068011 */ lui $a2, 0x8011 -/* A1D548 80242448 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A1D54C 8024244C 0C0B2026 */ jal set_variable -/* A1D550 80242450 8C450000 */ lw $a1, ($v0) -/* A1D554 80242454 0C03AC5A */ jal func_800EB168 -/* A1D558 80242458 0000202D */ daddu $a0, $zero, $zero -/* A1D55C 8024245C 8FBF0010 */ lw $ra, 0x10($sp) -/* A1D560 80242460 24020002 */ addiu $v0, $zero, 2 -/* A1D564 80242464 03E00008 */ jr $ra -/* A1D568 80242468 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s deleted file mode 100644 index e6fbcb7c61..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241740_B36310.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241740_B36310 -/* B36310 80241740 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B36314 80241744 AFBF0010 */ sw $ra, 0x10($sp) -/* B36318 80241748 8C82000C */ lw $v0, 0xc($a0) -/* B3631C 8024174C 3C068011 */ lui $a2, 0x8011 -/* B36320 80241750 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* B36324 80241754 0C0B2026 */ jal set_variable -/* B36328 80241758 8C450000 */ lw $a1, ($v0) -/* B3632C 8024175C 0C03AC5A */ jal func_800EB168 -/* B36330 80241760 0000202D */ daddu $a0, $zero, $zero -/* B36334 80241764 8FBF0010 */ lw $ra, 0x10($sp) -/* B36338 80241768 24020002 */ addiu $v0, $zero, 2 -/* B3633C 8024176C 03E00008 */ jr $ra -/* B36340 80241770 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s deleted file mode 100644 index 7560858316..0000000000 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240550_AFE090.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240550_AFE090 -/* AFE090 80240550 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AFE094 80240554 AFBF0010 */ sw $ra, 0x10($sp) -/* AFE098 80240558 8C82000C */ lw $v0, 0xc($a0) -/* AFE09C 8024055C 3C068011 */ lui $a2, 0x8011 -/* AFE0A0 80240560 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* AFE0A4 80240564 0C0B2026 */ jal set_variable -/* AFE0A8 80240568 8C450000 */ lw $a1, ($v0) -/* AFE0AC 8024056C 0C03AC5A */ jal func_800EB168 -/* AFE0B0 80240570 0000202D */ daddu $a0, $zero, $zero -/* AFE0B4 80240574 8FBF0010 */ lw $ra, 0x10($sp) -/* AFE0B8 80240578 24020002 */ addiu $v0, $zero, 2 -/* AFE0BC 8024057C 03E00008 */ jr $ra -/* AFE0C0 80240580 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s deleted file mode 100644 index ccad403851..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243300_8B3370.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243300_8B3370 -/* 8B3370 80243300 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B3374 80243304 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B3378 80243308 8C82000C */ lw $v0, 0xc($a0) -/* 8B337C 8024330C 3C068011 */ lui $a2, 0x8011 -/* 8B3380 80243310 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8B3384 80243314 0C0B2026 */ jal set_variable -/* 8B3388 80243318 8C450000 */ lw $a1, ($v0) -/* 8B338C 8024331C 0C03AC5A */ jal func_800EB168 -/* 8B3390 80243320 0000202D */ daddu $a0, $zero, $zero -/* 8B3394 80243324 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B3398 80243328 24020002 */ addiu $v0, $zero, 2 -/* 8B339C 8024332C 03E00008 */ jr $ra -/* 8B33A0 80243330 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s b/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s deleted file mode 100644 index 19cf43f203..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241530_8ED350.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241530_8ED350 -/* 8ED350 80241530 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8ED354 80241534 AFBF0010 */ sw $ra, 0x10($sp) -/* 8ED358 80241538 8C82000C */ lw $v0, 0xc($a0) -/* 8ED35C 8024153C 3C068011 */ lui $a2, 0x8011 -/* 8ED360 80241540 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8ED364 80241544 0C0B2026 */ jal set_variable -/* 8ED368 80241548 8C450000 */ lw $a1, ($v0) -/* 8ED36C 8024154C 0C03AC5A */ jal func_800EB168 -/* 8ED370 80241550 0000202D */ daddu $a0, $zero, $zero -/* 8ED374 80241554 8FBF0010 */ lw $ra, 0x10($sp) -/* 8ED378 80241558 24020002 */ addiu $v0, $zero, 2 -/* 8ED37C 8024155C 03E00008 */ jr $ra -/* 8ED380 80241560 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s b/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s deleted file mode 100644 index d967f519bb..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417B8_A88208.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417B8_A88208 -/* A88208 802417B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8820C 802417BC AFBF0010 */ sw $ra, 0x10($sp) -/* A88210 802417C0 8C82000C */ lw $v0, 0xc($a0) -/* A88214 802417C4 3C068011 */ lui $a2, 0x8011 -/* A88218 802417C8 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A8821C 802417CC 0C0B2026 */ jal set_variable -/* A88220 802417D0 8C450000 */ lw $a1, ($v0) -/* A88224 802417D4 0C03AC5A */ jal func_800EB168 -/* A88228 802417D8 0000202D */ daddu $a0, $zero, $zero -/* A8822C 802417DC 8FBF0010 */ lw $ra, 0x10($sp) -/* A88230 802417E0 24020002 */ addiu $v0, $zero, 2 -/* A88234 802417E4 03E00008 */ jr $ra -/* A88238 802417E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s b/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s deleted file mode 100644 index 5a7bda3260..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_80241898_A8E318.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241898_A8E318 -/* A8E318 80241898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A8E31C 8024189C AFBF0010 */ sw $ra, 0x10($sp) -/* A8E320 802418A0 8C82000C */ lw $v0, 0xc($a0) -/* A8E324 802418A4 3C068011 */ lui $a2, 0x8011 -/* A8E328 802418A8 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* A8E32C 802418AC 0C0B2026 */ jal set_variable -/* A8E330 802418B0 8C450000 */ lw $a1, ($v0) -/* A8E334 802418B4 0C03AC5A */ jal func_800EB168 -/* A8E338 802418B8 0000202D */ daddu $a0, $zero, $zero -/* A8E33C 802418BC 8FBF0010 */ lw $ra, 0x10($sp) -/* A8E340 802418C0 24020002 */ addiu $v0, $zero, 2 -/* A8E344 802418C4 03E00008 */ jr $ra -/* A8E348 802418C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s deleted file mode 100644 index da4540da2d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A3C_8042BC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243A3C_8042BC -/* 8042BC 80243A3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8042C0 80243A40 AFBF0010 */ sw $ra, 0x10($sp) -/* 8042C4 80243A44 8C82000C */ lw $v0, 0xc($a0) -/* 8042C8 80243A48 3C068011 */ lui $a2, 0x8011 -/* 8042CC 80243A4C 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 8042D0 80243A50 0C0B2026 */ jal set_variable -/* 8042D4 80243A54 8C450000 */ lw $a1, ($v0) -/* 8042D8 80243A58 0C03AC5A */ jal func_800EB168 -/* 8042DC 80243A5C 0000202D */ daddu $a0, $zero, $zero -/* 8042E0 80243A60 8FBF0010 */ lw $ra, 0x10($sp) -/* 8042E4 80243A64 24020002 */ addiu $v0, $zero, 2 -/* 8042E8 80243A68 03E00008 */ jr $ra -/* 8042EC 80243A6C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s deleted file mode 100644 index fff7263a9d..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240CFC_9C60DC.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CFC_9C60DC -/* 9C60DC 80240CFC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 9C60E0 80240D00 AFBF0010 */ sw $ra, 0x10($sp) -/* 9C60E4 80240D04 8C82000C */ lw $v0, 0xc($a0) -/* 9C60E8 80240D08 3C068011 */ lui $a2, 0x8011 -/* 9C60EC 80240D0C 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* 9C60F0 80240D10 0C0B2026 */ jal set_variable -/* 9C60F4 80240D14 8C450000 */ lw $a1, ($v0) -/* 9C60F8 80240D18 0C03AC5A */ jal func_800EB168 -/* 9C60FC 80240D1C 0000202D */ daddu $a0, $zero, $zero -/* 9C6100 80240D20 8FBF0010 */ lw $ra, 0x10($sp) -/* 9C6104 80240D24 24020002 */ addiu $v0, $zero, 2 -/* 9C6108 80240D28 03E00008 */ jr $ra -/* 9C610C 80240D2C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s deleted file mode 100644 index fa91a1cdfa..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AC0_D061F0.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240AC0_D061F0 -/* D061F0 80240AC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D061F4 80240AC4 AFBF0010 */ sw $ra, 0x10($sp) -/* D061F8 80240AC8 8C82000C */ lw $v0, 0xc($a0) -/* D061FC 80240ACC 3C068011 */ lui $a2, 0x8011 -/* D06200 80240AD0 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* D06204 80240AD4 0C0B2026 */ jal set_variable -/* D06208 80240AD8 8C450000 */ lw $a1, ($v0) -/* D0620C 80240ADC 0C03AC5A */ jal func_800EB168 -/* D06210 80240AE0 0000202D */ daddu $a0, $zero, $zero -/* D06214 80240AE4 8FBF0010 */ lw $ra, 0x10($sp) -/* D06218 80240AE8 24020002 */ addiu $v0, $zero, 2 -/* D0621C 80240AEC 03E00008 */ jr $ra -/* D06220 80240AF0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s b/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s deleted file mode 100644 index f3a6d4f68c..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_06/D203E0/func_802421E0_D22070.s +++ /dev/null @@ -1,17 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421E0_D22070 -/* D22070 802421E0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* D22074 802421E4 AFBF0010 */ sw $ra, 0x10($sp) -/* D22078 802421E8 8C82000C */ lw $v0, 0xc($a0) -/* D2207C 802421EC 3C068011 */ lui $a2, 0x8011 -/* D22080 802421F0 80C6F2A2 */ lb $a2, -0xd5e($a2) -/* D22084 802421F4 0C0B2026 */ jal set_variable -/* D22088 802421F8 8C450000 */ lw $a1, ($v0) -/* D2208C 802421FC 0C03AC5A */ jal func_800EB168 -/* D22090 80242200 0000202D */ daddu $a0, $zero, $zero -/* D22094 80242204 8FBF0010 */ lw $ra, 0x10($sp) -/* D22098 80242208 24020002 */ addiu $v0, $zero, 2 -/* D2209C 8024220C 03E00008 */ jr $ra -/* D220A0 80242210 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index a9474f9dd1..4c8bdffcad 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -102,9 +102,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243644_96C804); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243698_96C858); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243714_96C8D4); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243778_96C938); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 38a86a3bdf..986867485f 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -38,9 +38,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242368_A1D468); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802423BC_A1D4BC); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242438_A1D538); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024249C_A1D59C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index a3c05adbbb..dfac9edc8f 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -58,9 +58,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241670_B36240); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802416C4_B36294); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241740_B36310); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802417A4_B36374); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 9e5f6305d4..3d57f7cb62 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240480_AFDFC0); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802404D4_AFE014); -INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240550_AFE090); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_802405B4_AFE0F4); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index c5f6ac31b4..de4ed0600c 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243230_8B32A0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243284_8B32F4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243300_8B3370); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243364_8B33D4); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index e978d116de..49d7b27bdf 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241460_8ED280); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802414B4_8ED2D4); -INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241530_8ED350); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241594_8ED3B4); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index 9cbdbda024..c764b65e4a 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -50,8 +50,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802416E8_A88138); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024173C_A8818C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802417B8_A88208); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_8024181C_A8826C); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 07812c57d7..a21a3de683 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -50,8 +50,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802417C8_A8E248); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_8024181C_A8E29C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241898_A8E318); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802418FC_A8E37C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 6f9f9137e3..9a9b09cab2 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -108,9 +108,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024396C_8041EC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802439C0_804240); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243A3C_8042BC); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" ApiStatus func_80243AA0_804320(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 535dc3b510..47b559c19d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -36,9 +36,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C2C_9C600C); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240C80_9C6060); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240CFC_9C60DC); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240D60_9C6140); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 3ddca1dd30..ab35caf081 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -16,9 +16,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802409F0_D06120); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240A44_D06174); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240AC0_D061F0); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240B24_D06254); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 0a460e3c95..f1467f9a0a 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -54,9 +54,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242110_D21FA0); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242164_D21FF4); -INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_802421E0_D22070); - -#include "world/common/Call800EB168.inc.c" +#include "world/common/GetPartnerCall800EB168.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242244_D220D4); diff --git a/src/world/common/Call800EB168.inc.c b/src/world/common/Call800EB168.inc.c deleted file mode 100644 index 0d80634214..0000000000 --- a/src/world/common/Call800EB168.inc.c +++ /dev/null @@ -1,6 +0,0 @@ -#include "common.h" - -static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) { - func_800EB168(get_variable(script, *script->ptrReadPos)); - return ApiStatus_DONE2; -} diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c new file mode 100644 index 0000000000..c7b85eb2c6 --- /dev/null +++ b/src/world/common/GetPartnerCall800EB168.inc.c @@ -0,0 +1,12 @@ +#include "common.h" + +static ApiStatus GetPartnerCall800EB168(ScriptInstance* script, s32 isInitialCall) { + set_variable(script, *script->ptrReadPos, PLAYER_DATA->currentPartner); + func_800EB168(0); + return ApiStatus_DONE2; +} + +static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) { + func_800EB168(get_variable(script, *script->ptrReadPos)); + return ApiStatus_DONE2; +} From 0b04520f257311fcf8019bfa8d78de37419aa06c Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:32:25 -0400 Subject: [PATCH 12/45] 1 more --- .../mac_01/8017D0/func_80245440_805CC0.s | 23 ------------------- include/functions.h | 2 +- src/code_838b0_len_5900.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 11 ++++++++- src/world/common/GetPartnerCall800EB168.inc.c | 2 +- 5 files changed, 13 insertions(+), 27 deletions(-) delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s deleted file mode 100644 index fd0bbefcb5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80245440_805CC0.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80245440_805CC0 -/* 805CC0 80245440 3C028011 */ lui $v0, 0x8011 -/* 805CC4 80245444 8042F2A2 */ lb $v0, -0xd5e($v0) -/* 805CC8 80245448 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 805CCC 8024544C AFB00010 */ sw $s0, 0x10($sp) -/* 805CD0 80245450 0080802D */ daddu $s0, $a0, $zero -/* 805CD4 80245454 AFBF0014 */ sw $ra, 0x14($sp) -/* 805CD8 80245458 8E0400AC */ lw $a0, 0xac($s0) -/* 805CDC 8024545C 50440005 */ beql $v0, $a0, .L80245474 -/* 805CE0 80245460 AE000088 */ sw $zero, 0x88($s0) -/* 805CE4 80245464 0C03AC5A */ jal func_800EB168 -/* 805CE8 80245468 00000000 */ nop -/* 805CEC 8024546C 24020001 */ addiu $v0, $zero, 1 -/* 805CF0 80245470 AE020088 */ sw $v0, 0x88($s0) -.L80245474: -/* 805CF4 80245474 24020002 */ addiu $v0, $zero, 2 -/* 805CF8 80245478 8FBF0014 */ lw $ra, 0x14($sp) -/* 805CFC 8024547C 8FB00010 */ lw $s0, 0x10($sp) -/* 805D00 80245480 03E00008 */ jr $ra -/* 805D04 80245484 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/include/functions.h b/include/functions.h index abc8ebebd0..7a6b9ed69c 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,7 +70,7 @@ void set_curtain_fade(f32 scale); void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); -s32 func_800EB168(s8); +s32 func_800EB168(s32); // Partner void func_800EBA3C(Npc* partner); diff --git a/src/code_838b0_len_5900.c b/src/code_838b0_len_5900.c index a5c09f35ed..e55f7cbc49 100644 --- a/src/code_838b0_len_5900.c +++ b/src/code_838b0_len_5900.c @@ -27,7 +27,7 @@ INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6A8); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EA6CC); -INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s8 arg0); +INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB168, s32 arg0); INCLUDE_ASM(s32, "code_838b0_len_5900", func_800EB200); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 9a9b09cab2..2e61f7ff5b 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -174,7 +174,16 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245028_8058A8); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_8024522C_805AAC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245440_805CC0); +ApiStatus func_80245440_805CC0(ScriptInstance* script, s32 isInitialCall) { + if (PLAYER_DATA->currentPartner == script->varTable[10]) { + script->varTable[1] = 0; + return ApiStatus_DONE2; + } + + func_800EB168(script->varTable[10]); + script->varTable[1] = 1; + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80245488_805D08); diff --git a/src/world/common/GetPartnerCall800EB168.inc.c b/src/world/common/GetPartnerCall800EB168.inc.c index c7b85eb2c6..97c821c33a 100644 --- a/src/world/common/GetPartnerCall800EB168.inc.c +++ b/src/world/common/GetPartnerCall800EB168.inc.c @@ -7,6 +7,6 @@ static ApiStatus GetPartnerCall800EB168(ScriptInstance* script, s32 isInitialCal } static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) { - func_800EB168(get_variable(script, *script->ptrReadPos)); + func_800EB168((s8)get_variable(script, *script->ptrReadPos)); return ApiStatus_DONE2; } From a61be9ab779b987d1c31edbd1abce30f6817657b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 00:43:23 -0400 Subject: [PATCH 13/45] rename --- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- ...8C4SyncStatusMenu.inc.c => Call800E98C4SyncStatusMenu.inc.c} | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename src/world/common/{Unk800E98C4SyncStatusMenu.inc.c => Call800E98C4SyncStatusMenu.inc.c} (51%) diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 4c8bdffcad..7faca769c7 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802433E8_96C5A8); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 986867485f..7ace53be75 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -24,7 +24,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80241FBC_A1D0BC); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index dfac9edc8f..dc4d3968e3 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -44,7 +44,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802411B4_B35D84); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 3d57f7cb62..5ec4549dae 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48); diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index de4ed0600c..894052300a 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index 49d7b27bdf..a273cad41b 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index c764b65e4a..f7bdac79c3 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241224_A87C74); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index a21a3de683..44daaa48f2 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -36,7 +36,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241304_A8DD84); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 2e61f7ff5b..b6d4d62a6e 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -94,7 +94,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243740_803FC0); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_804074); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 47b559c19d..af5f8a1f64 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -22,7 +22,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802407F4_9C5BD4); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index ab35caf081..add231fef5 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -2,7 +2,7 @@ #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index f1467f9a0a..699d01bcfe 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241EB4_D21D44); #include "world/common/Call800E9894.inc.c" -#include "world/common/Unk800E98C4SyncStatusMenu.inc.c" +#include "world/common/Call800E98C4SyncStatusMenu.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); diff --git a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c b/src/world/common/Call800E98C4SyncStatusMenu.inc.c similarity index 51% rename from src/world/common/Unk800E98C4SyncStatusMenu.inc.c rename to src/world/common/Call800E98C4SyncStatusMenu.inc.c index 90e4efc6a3..9609cf7f35 100644 --- a/src/world/common/Unk800E98C4SyncStatusMenu.inc.c +++ b/src/world/common/Call800E98C4SyncStatusMenu.inc.c @@ -1,6 +1,6 @@ #include "common.h" -static ApiStatus Unk800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { +static ApiStatus Call800E98C4SyncStatusMenu(ScriptInstance* script, s32 isInitialCall) { func_800E98C4(); sync_status_menu(); return ApiStatus_DONE2; From 97121d2c50703e04242d2f321f4019e613b75340 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 13:43:45 -0400 Subject: [PATCH 14/45] UnkCameraFunc --- .../dro_01/95B7E0/func_802420F0_95D2F0.s | 107 ------------------ .../dro_02/9694C0/func_80240F80_96A140.s | 107 ------------------ .../hos_03/A1BDB0/func_80243124_A1E224.s | 107 ------------------ .../jan_02/B2C8A0/func_80242294_B2E704.s | 107 ------------------ .../jan_03/B34BD0/func_8024281C_B373EC.s | 107 ------------------ .../kmr_02/8B0070/func_80241010_8B1080.s | 107 ------------------ .../mac_00/7EB340/func_802412B0_7EBFC0.s | 107 ------------------ .../mac_01/8017D0/func_80242B90_803410.s | 107 ------------------ .../mac_02/823BF0/func_80242440_825700.s | 107 ------------------ .../mac_03/831B20/func_80241130_832930.s | 107 ------------------ .../mac_04/843030/func_802410E0_843CB0.s | 107 ------------------ .../mac_05/852170/func_80241FA0_854110.s | 107 ------------------ .../nok_01/9C53E0/func_802419E8_9C6DC8.s | 107 ------------------ .../nok_02/9D7AA0/func_80242590_9D95B0.s | 107 ------------------ .../sam_01/CF7E80/func_80241380_CF8EF0.s | 107 ------------------ .../sam_02/D05F60/func_802417AC_D06EDC.s | 107 ------------------ .../sam_11/D3ADA0/func_80241450_D3BA20.s | 107 ------------------ 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/UnkCameraFunc.inc.c | 21 ++++ 35 files changed, 38 insertions(+), 1836 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s create mode 100644 src/world/common/UnkCameraFunc.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s deleted file mode 100644 index 5537574bea..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802420F0_95D2F0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802420F0_95D2F0 -/* 95D2F0 802420F0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 95D2F4 802420F4 AFB20018 */ sw $s2, 0x18($sp) -/* 95D2F8 802420F8 0080902D */ daddu $s2, $a0, $zero -/* 95D2FC 802420FC AFBF0030 */ sw $ra, 0x30($sp) -/* 95D300 80242100 AFB7002C */ sw $s7, 0x2c($sp) -/* 95D304 80242104 AFB60028 */ sw $s6, 0x28($sp) -/* 95D308 80242108 AFB50024 */ sw $s5, 0x24($sp) -/* 95D30C 8024210C AFB40020 */ sw $s4, 0x20($sp) -/* 95D310 80242110 AFB3001C */ sw $s3, 0x1c($sp) -/* 95D314 80242114 AFB10014 */ sw $s1, 0x14($sp) -/* 95D318 80242118 AFB00010 */ sw $s0, 0x10($sp) -/* 95D31C 8024211C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 95D320 80242120 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 95D324 80242124 8E50000C */ lw $s0, 0xc($s2) -/* 95D328 80242128 8E050000 */ lw $a1, ($s0) -/* 95D32C 8024212C 0C0B1EAF */ jal get_variable -/* 95D330 80242130 26100004 */ addiu $s0, $s0, 4 -/* 95D334 80242134 8E050000 */ lw $a1, ($s0) -/* 95D338 80242138 26100004 */ addiu $s0, $s0, 4 -/* 95D33C 8024213C 0240202D */ daddu $a0, $s2, $zero -/* 95D340 80242140 0C0B1EAF */ jal get_variable -/* 95D344 80242144 0040B82D */ daddu $s7, $v0, $zero -/* 95D348 80242148 8E050000 */ lw $a1, ($s0) -/* 95D34C 8024214C 26100004 */ addiu $s0, $s0, 4 -/* 95D350 80242150 0240202D */ daddu $a0, $s2, $zero -/* 95D354 80242154 0C0B1EAF */ jal get_variable -/* 95D358 80242158 0040B02D */ daddu $s6, $v0, $zero -/* 95D35C 8024215C 0240202D */ daddu $a0, $s2, $zero -/* 95D360 80242160 3C05F4AC */ lui $a1, 0xf4ac -/* 95D364 80242164 34A5D481 */ ori $a1, $a1, 0xd481 -/* 95D368 80242168 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 95D36C 8024216C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 95D370 80242170 8E140000 */ lw $s4, ($s0) -/* 95D374 80242174 00061880 */ sll $v1, $a2, 2 -/* 95D378 80242178 00661821 */ addu $v1, $v1, $a2 -/* 95D37C 8024217C 00031880 */ sll $v1, $v1, 2 -/* 95D380 80242180 00661823 */ subu $v1, $v1, $a2 -/* 95D384 80242184 000330C0 */ sll $a2, $v1, 3 -/* 95D388 80242188 00661821 */ addu $v1, $v1, $a2 -/* 95D38C 8024218C 000318C0 */ sll $v1, $v1, 3 -/* 95D390 80242190 3C01800B */ lui $at, 0x800b -/* 95D394 80242194 00230821 */ addu $at, $at, $v1 -/* 95D398 80242198 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 95D39C 8024219C 8E150004 */ lw $s5, 4($s0) -/* 95D3A0 802421A0 4600010D */ trunc.w.s $f4, $f0 -/* 95D3A4 802421A4 44112000 */ mfc1 $s1, $f4 -/* 95D3A8 802421A8 0C0B1EAF */ jal get_variable -/* 95D3AC 802421AC 0040982D */ daddu $s3, $v0, $zero -/* 95D3B0 802421B0 4491B000 */ mtc1 $s1, $f22 -/* 95D3B4 802421B4 00000000 */ nop -/* 95D3B8 802421B8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 95D3BC 802421BC 4600B306 */ mov.s $f12, $f22 -/* 95D3C0 802421C0 0C00A8D4 */ jal cos_deg -/* 95D3C4 802421C4 0040802D */ daddu $s0, $v0, $zero -/* 95D3C8 802421C8 4493A000 */ mtc1 $s3, $f20 -/* 95D3CC 802421CC 00000000 */ nop -/* 95D3D0 802421D0 4680A520 */ cvt.s.w $f20, $f20 -/* 95D3D4 802421D4 4600A002 */ mul.s $f0, $f20, $f0 -/* 95D3D8 802421D8 00000000 */ nop -/* 95D3DC 802421DC 0240202D */ daddu $a0, $s2, $zero -/* 95D3E0 802421E0 44901000 */ mtc1 $s0, $f2 -/* 95D3E4 802421E4 00000000 */ nop -/* 95D3E8 802421E8 468010A0 */ cvt.s.w $f2, $f2 -/* 95D3EC 802421EC 46001081 */ sub.s $f2, $f2, $f0 -/* 95D3F0 802421F0 3C05F4AC */ lui $a1, 0xf4ac -/* 95D3F4 802421F4 4600110D */ trunc.w.s $f4, $f2 -/* 95D3F8 802421F8 44102000 */ mfc1 $s0, $f4 -/* 95D3FC 802421FC 0C0B1EAF */ jal get_variable -/* 95D400 80242200 34A5D483 */ ori $a1, $a1, 0xd483 -/* 95D404 80242204 4600B306 */ mov.s $f12, $f22 -/* 95D408 80242208 0C00A8BB */ jal sin_deg -/* 95D40C 8024220C 0040882D */ daddu $s1, $v0, $zero -/* 95D410 80242210 4600A502 */ mul.s $f20, $f20, $f0 -/* 95D414 80242214 00000000 */ nop -/* 95D418 80242218 0240202D */ daddu $a0, $s2, $zero -/* 95D41C 8024221C 44910000 */ mtc1 $s1, $f0 -/* 95D420 80242220 00000000 */ nop -/* 95D424 80242224 46800020 */ cvt.s.w $f0, $f0 -/* 95D428 80242228 46140001 */ sub.s $f0, $f0, $f20 -/* 95D42C 8024222C 0280282D */ daddu $a1, $s4, $zero -/* 95D430 80242230 02173023 */ subu $a2, $s0, $s7 -/* 95D434 80242234 4600010D */ trunc.w.s $f4, $f0 -/* 95D438 80242238 44102000 */ mfc1 $s0, $f4 -/* 95D43C 8024223C 0C0B2026 */ jal set_variable -/* 95D440 80242240 02168023 */ subu $s0, $s0, $s6 -/* 95D444 80242244 0240202D */ daddu $a0, $s2, $zero -/* 95D448 80242248 02A0282D */ daddu $a1, $s5, $zero -/* 95D44C 8024224C 0C0B2026 */ jal set_variable -/* 95D450 80242250 0200302D */ daddu $a2, $s0, $zero -/* 95D454 80242254 8FBF0030 */ lw $ra, 0x30($sp) -/* 95D458 80242258 8FB7002C */ lw $s7, 0x2c($sp) -/* 95D45C 8024225C 8FB60028 */ lw $s6, 0x28($sp) -/* 95D460 80242260 8FB50024 */ lw $s5, 0x24($sp) -/* 95D464 80242264 8FB40020 */ lw $s4, 0x20($sp) -/* 95D468 80242268 8FB3001C */ lw $s3, 0x1c($sp) -/* 95D46C 8024226C 8FB20018 */ lw $s2, 0x18($sp) -/* 95D470 80242270 8FB10014 */ lw $s1, 0x14($sp) -/* 95D474 80242274 8FB00010 */ lw $s0, 0x10($sp) -/* 95D478 80242278 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 95D47C 8024227C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 95D480 80242280 24020002 */ addiu $v0, $zero, 2 -/* 95D484 80242284 03E00008 */ jr $ra -/* 95D488 80242288 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s deleted file mode 100644 index ad96c5c26f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240F80_96A140.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F80_96A140 -/* 96A140 80240F80 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 96A144 80240F84 AFB20018 */ sw $s2, 0x18($sp) -/* 96A148 80240F88 0080902D */ daddu $s2, $a0, $zero -/* 96A14C 80240F8C AFBF0030 */ sw $ra, 0x30($sp) -/* 96A150 80240F90 AFB7002C */ sw $s7, 0x2c($sp) -/* 96A154 80240F94 AFB60028 */ sw $s6, 0x28($sp) -/* 96A158 80240F98 AFB50024 */ sw $s5, 0x24($sp) -/* 96A15C 80240F9C AFB40020 */ sw $s4, 0x20($sp) -/* 96A160 80240FA0 AFB3001C */ sw $s3, 0x1c($sp) -/* 96A164 80240FA4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A168 80240FA8 AFB00010 */ sw $s0, 0x10($sp) -/* 96A16C 80240FAC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 96A170 80240FB0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 96A174 80240FB4 8E50000C */ lw $s0, 0xc($s2) -/* 96A178 80240FB8 8E050000 */ lw $a1, ($s0) -/* 96A17C 80240FBC 0C0B1EAF */ jal get_variable -/* 96A180 80240FC0 26100004 */ addiu $s0, $s0, 4 -/* 96A184 80240FC4 8E050000 */ lw $a1, ($s0) -/* 96A188 80240FC8 26100004 */ addiu $s0, $s0, 4 -/* 96A18C 80240FCC 0240202D */ daddu $a0, $s2, $zero -/* 96A190 80240FD0 0C0B1EAF */ jal get_variable -/* 96A194 80240FD4 0040B82D */ daddu $s7, $v0, $zero -/* 96A198 80240FD8 8E050000 */ lw $a1, ($s0) -/* 96A19C 80240FDC 26100004 */ addiu $s0, $s0, 4 -/* 96A1A0 80240FE0 0240202D */ daddu $a0, $s2, $zero -/* 96A1A4 80240FE4 0C0B1EAF */ jal get_variable -/* 96A1A8 80240FE8 0040B02D */ daddu $s6, $v0, $zero -/* 96A1AC 80240FEC 0240202D */ daddu $a0, $s2, $zero -/* 96A1B0 80240FF0 3C05F4AC */ lui $a1, 0xf4ac -/* 96A1B4 80240FF4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 96A1B8 80240FF8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 96A1BC 80240FFC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 96A1C0 80241000 8E140000 */ lw $s4, ($s0) -/* 96A1C4 80241004 00061880 */ sll $v1, $a2, 2 -/* 96A1C8 80241008 00661821 */ addu $v1, $v1, $a2 -/* 96A1CC 8024100C 00031880 */ sll $v1, $v1, 2 -/* 96A1D0 80241010 00661823 */ subu $v1, $v1, $a2 -/* 96A1D4 80241014 000330C0 */ sll $a2, $v1, 3 -/* 96A1D8 80241018 00661821 */ addu $v1, $v1, $a2 -/* 96A1DC 8024101C 000318C0 */ sll $v1, $v1, 3 -/* 96A1E0 80241020 3C01800B */ lui $at, 0x800b -/* 96A1E4 80241024 00230821 */ addu $at, $at, $v1 -/* 96A1E8 80241028 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 96A1EC 8024102C 8E150004 */ lw $s5, 4($s0) -/* 96A1F0 80241030 4600010D */ trunc.w.s $f4, $f0 -/* 96A1F4 80241034 44112000 */ mfc1 $s1, $f4 -/* 96A1F8 80241038 0C0B1EAF */ jal get_variable -/* 96A1FC 8024103C 0040982D */ daddu $s3, $v0, $zero -/* 96A200 80241040 4491B000 */ mtc1 $s1, $f22 -/* 96A204 80241044 00000000 */ nop -/* 96A208 80241048 4680B5A0 */ cvt.s.w $f22, $f22 -/* 96A20C 8024104C 4600B306 */ mov.s $f12, $f22 -/* 96A210 80241050 0C00A8D4 */ jal cos_deg -/* 96A214 80241054 0040802D */ daddu $s0, $v0, $zero -/* 96A218 80241058 4493A000 */ mtc1 $s3, $f20 -/* 96A21C 8024105C 00000000 */ nop -/* 96A220 80241060 4680A520 */ cvt.s.w $f20, $f20 -/* 96A224 80241064 4600A002 */ mul.s $f0, $f20, $f0 -/* 96A228 80241068 00000000 */ nop -/* 96A22C 8024106C 0240202D */ daddu $a0, $s2, $zero -/* 96A230 80241070 44901000 */ mtc1 $s0, $f2 -/* 96A234 80241074 00000000 */ nop -/* 96A238 80241078 468010A0 */ cvt.s.w $f2, $f2 -/* 96A23C 8024107C 46001081 */ sub.s $f2, $f2, $f0 -/* 96A240 80241080 3C05F4AC */ lui $a1, 0xf4ac -/* 96A244 80241084 4600110D */ trunc.w.s $f4, $f2 -/* 96A248 80241088 44102000 */ mfc1 $s0, $f4 -/* 96A24C 8024108C 0C0B1EAF */ jal get_variable -/* 96A250 80241090 34A5D483 */ ori $a1, $a1, 0xd483 -/* 96A254 80241094 4600B306 */ mov.s $f12, $f22 -/* 96A258 80241098 0C00A8BB */ jal sin_deg -/* 96A25C 8024109C 0040882D */ daddu $s1, $v0, $zero -/* 96A260 802410A0 4600A502 */ mul.s $f20, $f20, $f0 -/* 96A264 802410A4 00000000 */ nop -/* 96A268 802410A8 0240202D */ daddu $a0, $s2, $zero -/* 96A26C 802410AC 44910000 */ mtc1 $s1, $f0 -/* 96A270 802410B0 00000000 */ nop -/* 96A274 802410B4 46800020 */ cvt.s.w $f0, $f0 -/* 96A278 802410B8 46140001 */ sub.s $f0, $f0, $f20 -/* 96A27C 802410BC 0280282D */ daddu $a1, $s4, $zero -/* 96A280 802410C0 02173023 */ subu $a2, $s0, $s7 -/* 96A284 802410C4 4600010D */ trunc.w.s $f4, $f0 -/* 96A288 802410C8 44102000 */ mfc1 $s0, $f4 -/* 96A28C 802410CC 0C0B2026 */ jal set_variable -/* 96A290 802410D0 02168023 */ subu $s0, $s0, $s6 -/* 96A294 802410D4 0240202D */ daddu $a0, $s2, $zero -/* 96A298 802410D8 02A0282D */ daddu $a1, $s5, $zero -/* 96A29C 802410DC 0C0B2026 */ jal set_variable -/* 96A2A0 802410E0 0200302D */ daddu $a2, $s0, $zero -/* 96A2A4 802410E4 8FBF0030 */ lw $ra, 0x30($sp) -/* 96A2A8 802410E8 8FB7002C */ lw $s7, 0x2c($sp) -/* 96A2AC 802410EC 8FB60028 */ lw $s6, 0x28($sp) -/* 96A2B0 802410F0 8FB50024 */ lw $s5, 0x24($sp) -/* 96A2B4 802410F4 8FB40020 */ lw $s4, 0x20($sp) -/* 96A2B8 802410F8 8FB3001C */ lw $s3, 0x1c($sp) -/* 96A2BC 802410FC 8FB20018 */ lw $s2, 0x18($sp) -/* 96A2C0 80241100 8FB10014 */ lw $s1, 0x14($sp) -/* 96A2C4 80241104 8FB00010 */ lw $s0, 0x10($sp) -/* 96A2C8 80241108 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 96A2CC 8024110C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 96A2D0 80241110 24020002 */ addiu $v0, $zero, 2 -/* 96A2D4 80241114 03E00008 */ jr $ra -/* 96A2D8 80241118 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s deleted file mode 100644 index a559277c47..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243124_A1E224.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243124_A1E224 -/* A1E224 80243124 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* A1E228 80243128 AFB20018 */ sw $s2, 0x18($sp) -/* A1E22C 8024312C 0080902D */ daddu $s2, $a0, $zero -/* A1E230 80243130 AFBF0030 */ sw $ra, 0x30($sp) -/* A1E234 80243134 AFB7002C */ sw $s7, 0x2c($sp) -/* A1E238 80243138 AFB60028 */ sw $s6, 0x28($sp) -/* A1E23C 8024313C AFB50024 */ sw $s5, 0x24($sp) -/* A1E240 80243140 AFB40020 */ sw $s4, 0x20($sp) -/* A1E244 80243144 AFB3001C */ sw $s3, 0x1c($sp) -/* A1E248 80243148 AFB10014 */ sw $s1, 0x14($sp) -/* A1E24C 8024314C AFB00010 */ sw $s0, 0x10($sp) -/* A1E250 80243150 F7B60040 */ sdc1 $f22, 0x40($sp) -/* A1E254 80243154 F7B40038 */ sdc1 $f20, 0x38($sp) -/* A1E258 80243158 8E50000C */ lw $s0, 0xc($s2) -/* A1E25C 8024315C 8E050000 */ lw $a1, ($s0) -/* A1E260 80243160 0C0B1EAF */ jal get_variable -/* A1E264 80243164 26100004 */ addiu $s0, $s0, 4 -/* A1E268 80243168 8E050000 */ lw $a1, ($s0) -/* A1E26C 8024316C 26100004 */ addiu $s0, $s0, 4 -/* A1E270 80243170 0240202D */ daddu $a0, $s2, $zero -/* A1E274 80243174 0C0B1EAF */ jal get_variable -/* A1E278 80243178 0040B82D */ daddu $s7, $v0, $zero -/* A1E27C 8024317C 8E050000 */ lw $a1, ($s0) -/* A1E280 80243180 26100004 */ addiu $s0, $s0, 4 -/* A1E284 80243184 0240202D */ daddu $a0, $s2, $zero -/* A1E288 80243188 0C0B1EAF */ jal get_variable -/* A1E28C 8024318C 0040B02D */ daddu $s6, $v0, $zero -/* A1E290 80243190 0240202D */ daddu $a0, $s2, $zero -/* A1E294 80243194 3C05F4AC */ lui $a1, 0xf4ac -/* A1E298 80243198 34A5D481 */ ori $a1, $a1, 0xd481 -/* A1E29C 8024319C 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* A1E2A0 802431A0 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* A1E2A4 802431A4 8E140000 */ lw $s4, ($s0) -/* A1E2A8 802431A8 00061880 */ sll $v1, $a2, 2 -/* A1E2AC 802431AC 00661821 */ addu $v1, $v1, $a2 -/* A1E2B0 802431B0 00031880 */ sll $v1, $v1, 2 -/* A1E2B4 802431B4 00661823 */ subu $v1, $v1, $a2 -/* A1E2B8 802431B8 000330C0 */ sll $a2, $v1, 3 -/* A1E2BC 802431BC 00661821 */ addu $v1, $v1, $a2 -/* A1E2C0 802431C0 000318C0 */ sll $v1, $v1, 3 -/* A1E2C4 802431C4 3C01800B */ lui $at, 0x800b -/* A1E2C8 802431C8 00230821 */ addu $at, $at, $v1 -/* A1E2CC 802431CC C4201DEC */ lwc1 $f0, 0x1dec($at) -/* A1E2D0 802431D0 8E150004 */ lw $s5, 4($s0) -/* A1E2D4 802431D4 4600010D */ trunc.w.s $f4, $f0 -/* A1E2D8 802431D8 44112000 */ mfc1 $s1, $f4 -/* A1E2DC 802431DC 0C0B1EAF */ jal get_variable -/* A1E2E0 802431E0 0040982D */ daddu $s3, $v0, $zero -/* A1E2E4 802431E4 4491B000 */ mtc1 $s1, $f22 -/* A1E2E8 802431E8 00000000 */ nop -/* A1E2EC 802431EC 4680B5A0 */ cvt.s.w $f22, $f22 -/* A1E2F0 802431F0 4600B306 */ mov.s $f12, $f22 -/* A1E2F4 802431F4 0C00A8D4 */ jal cos_deg -/* A1E2F8 802431F8 0040802D */ daddu $s0, $v0, $zero -/* A1E2FC 802431FC 4493A000 */ mtc1 $s3, $f20 -/* A1E300 80243200 00000000 */ nop -/* A1E304 80243204 4680A520 */ cvt.s.w $f20, $f20 -/* A1E308 80243208 4600A002 */ mul.s $f0, $f20, $f0 -/* A1E30C 8024320C 00000000 */ nop -/* A1E310 80243210 0240202D */ daddu $a0, $s2, $zero -/* A1E314 80243214 44901000 */ mtc1 $s0, $f2 -/* A1E318 80243218 00000000 */ nop -/* A1E31C 8024321C 468010A0 */ cvt.s.w $f2, $f2 -/* A1E320 80243220 46001081 */ sub.s $f2, $f2, $f0 -/* A1E324 80243224 3C05F4AC */ lui $a1, 0xf4ac -/* A1E328 80243228 4600110D */ trunc.w.s $f4, $f2 -/* A1E32C 8024322C 44102000 */ mfc1 $s0, $f4 -/* A1E330 80243230 0C0B1EAF */ jal get_variable -/* A1E334 80243234 34A5D483 */ ori $a1, $a1, 0xd483 -/* A1E338 80243238 4600B306 */ mov.s $f12, $f22 -/* A1E33C 8024323C 0C00A8BB */ jal sin_deg -/* A1E340 80243240 0040882D */ daddu $s1, $v0, $zero -/* A1E344 80243244 4600A502 */ mul.s $f20, $f20, $f0 -/* A1E348 80243248 00000000 */ nop -/* A1E34C 8024324C 0240202D */ daddu $a0, $s2, $zero -/* A1E350 80243250 44910000 */ mtc1 $s1, $f0 -/* A1E354 80243254 00000000 */ nop -/* A1E358 80243258 46800020 */ cvt.s.w $f0, $f0 -/* A1E35C 8024325C 46140001 */ sub.s $f0, $f0, $f20 -/* A1E360 80243260 0280282D */ daddu $a1, $s4, $zero -/* A1E364 80243264 02173023 */ subu $a2, $s0, $s7 -/* A1E368 80243268 4600010D */ trunc.w.s $f4, $f0 -/* A1E36C 8024326C 44102000 */ mfc1 $s0, $f4 -/* A1E370 80243270 0C0B2026 */ jal set_variable -/* A1E374 80243274 02168023 */ subu $s0, $s0, $s6 -/* A1E378 80243278 0240202D */ daddu $a0, $s2, $zero -/* A1E37C 8024327C 02A0282D */ daddu $a1, $s5, $zero -/* A1E380 80243280 0C0B2026 */ jal set_variable -/* A1E384 80243284 0200302D */ daddu $a2, $s0, $zero -/* A1E388 80243288 8FBF0030 */ lw $ra, 0x30($sp) -/* A1E38C 8024328C 8FB7002C */ lw $s7, 0x2c($sp) -/* A1E390 80243290 8FB60028 */ lw $s6, 0x28($sp) -/* A1E394 80243294 8FB50024 */ lw $s5, 0x24($sp) -/* A1E398 80243298 8FB40020 */ lw $s4, 0x20($sp) -/* A1E39C 8024329C 8FB3001C */ lw $s3, 0x1c($sp) -/* A1E3A0 802432A0 8FB20018 */ lw $s2, 0x18($sp) -/* A1E3A4 802432A4 8FB10014 */ lw $s1, 0x14($sp) -/* A1E3A8 802432A8 8FB00010 */ lw $s0, 0x10($sp) -/* A1E3AC 802432AC D7B60040 */ ldc1 $f22, 0x40($sp) -/* A1E3B0 802432B0 D7B40038 */ ldc1 $f20, 0x38($sp) -/* A1E3B4 802432B4 24020002 */ addiu $v0, $zero, 2 -/* A1E3B8 802432B8 03E00008 */ jr $ra -/* A1E3BC 802432BC 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s deleted file mode 100644 index 9bbecdde90..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242294_B2E704.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242294_B2E704 -/* B2E704 80242294 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B2E708 80242298 AFB20018 */ sw $s2, 0x18($sp) -/* B2E70C 8024229C 0080902D */ daddu $s2, $a0, $zero -/* B2E710 802422A0 AFBF0030 */ sw $ra, 0x30($sp) -/* B2E714 802422A4 AFB7002C */ sw $s7, 0x2c($sp) -/* B2E718 802422A8 AFB60028 */ sw $s6, 0x28($sp) -/* B2E71C 802422AC AFB50024 */ sw $s5, 0x24($sp) -/* B2E720 802422B0 AFB40020 */ sw $s4, 0x20($sp) -/* B2E724 802422B4 AFB3001C */ sw $s3, 0x1c($sp) -/* B2E728 802422B8 AFB10014 */ sw $s1, 0x14($sp) -/* B2E72C 802422BC AFB00010 */ sw $s0, 0x10($sp) -/* B2E730 802422C0 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B2E734 802422C4 F7B40038 */ sdc1 $f20, 0x38($sp) -/* B2E738 802422C8 8E50000C */ lw $s0, 0xc($s2) -/* B2E73C 802422CC 8E050000 */ lw $a1, ($s0) -/* B2E740 802422D0 0C0B1EAF */ jal get_variable -/* B2E744 802422D4 26100004 */ addiu $s0, $s0, 4 -/* B2E748 802422D8 8E050000 */ lw $a1, ($s0) -/* B2E74C 802422DC 26100004 */ addiu $s0, $s0, 4 -/* B2E750 802422E0 0240202D */ daddu $a0, $s2, $zero -/* B2E754 802422E4 0C0B1EAF */ jal get_variable -/* B2E758 802422E8 0040B82D */ daddu $s7, $v0, $zero -/* B2E75C 802422EC 8E050000 */ lw $a1, ($s0) -/* B2E760 802422F0 26100004 */ addiu $s0, $s0, 4 -/* B2E764 802422F4 0240202D */ daddu $a0, $s2, $zero -/* B2E768 802422F8 0C0B1EAF */ jal get_variable -/* B2E76C 802422FC 0040B02D */ daddu $s6, $v0, $zero -/* B2E770 80242300 0240202D */ daddu $a0, $s2, $zero -/* B2E774 80242304 3C05F4AC */ lui $a1, 0xf4ac -/* B2E778 80242308 34A5D481 */ ori $a1, $a1, 0xd481 -/* B2E77C 8024230C 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* B2E780 80242310 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* B2E784 80242314 8E140000 */ lw $s4, ($s0) -/* B2E788 80242318 00061880 */ sll $v1, $a2, 2 -/* B2E78C 8024231C 00661821 */ addu $v1, $v1, $a2 -/* B2E790 80242320 00031880 */ sll $v1, $v1, 2 -/* B2E794 80242324 00661823 */ subu $v1, $v1, $a2 -/* B2E798 80242328 000330C0 */ sll $a2, $v1, 3 -/* B2E79C 8024232C 00661821 */ addu $v1, $v1, $a2 -/* B2E7A0 80242330 000318C0 */ sll $v1, $v1, 3 -/* B2E7A4 80242334 3C01800B */ lui $at, 0x800b -/* B2E7A8 80242338 00230821 */ addu $at, $at, $v1 -/* B2E7AC 8024233C C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B2E7B0 80242340 8E150004 */ lw $s5, 4($s0) -/* B2E7B4 80242344 4600010D */ trunc.w.s $f4, $f0 -/* B2E7B8 80242348 44112000 */ mfc1 $s1, $f4 -/* B2E7BC 8024234C 0C0B1EAF */ jal get_variable -/* B2E7C0 80242350 0040982D */ daddu $s3, $v0, $zero -/* B2E7C4 80242354 4491B000 */ mtc1 $s1, $f22 -/* B2E7C8 80242358 00000000 */ nop -/* B2E7CC 8024235C 4680B5A0 */ cvt.s.w $f22, $f22 -/* B2E7D0 80242360 4600B306 */ mov.s $f12, $f22 -/* B2E7D4 80242364 0C00A8D4 */ jal cos_deg -/* B2E7D8 80242368 0040802D */ daddu $s0, $v0, $zero -/* B2E7DC 8024236C 4493A000 */ mtc1 $s3, $f20 -/* B2E7E0 80242370 00000000 */ nop -/* B2E7E4 80242374 4680A520 */ cvt.s.w $f20, $f20 -/* B2E7E8 80242378 4600A002 */ mul.s $f0, $f20, $f0 -/* B2E7EC 8024237C 00000000 */ nop -/* B2E7F0 80242380 0240202D */ daddu $a0, $s2, $zero -/* B2E7F4 80242384 44901000 */ mtc1 $s0, $f2 -/* B2E7F8 80242388 00000000 */ nop -/* B2E7FC 8024238C 468010A0 */ cvt.s.w $f2, $f2 -/* B2E800 80242390 46001081 */ sub.s $f2, $f2, $f0 -/* B2E804 80242394 3C05F4AC */ lui $a1, 0xf4ac -/* B2E808 80242398 4600110D */ trunc.w.s $f4, $f2 -/* B2E80C 8024239C 44102000 */ mfc1 $s0, $f4 -/* B2E810 802423A0 0C0B1EAF */ jal get_variable -/* B2E814 802423A4 34A5D483 */ ori $a1, $a1, 0xd483 -/* B2E818 802423A8 4600B306 */ mov.s $f12, $f22 -/* B2E81C 802423AC 0C00A8BB */ jal sin_deg -/* B2E820 802423B0 0040882D */ daddu $s1, $v0, $zero -/* B2E824 802423B4 4600A502 */ mul.s $f20, $f20, $f0 -/* B2E828 802423B8 00000000 */ nop -/* B2E82C 802423BC 0240202D */ daddu $a0, $s2, $zero -/* B2E830 802423C0 44910000 */ mtc1 $s1, $f0 -/* B2E834 802423C4 00000000 */ nop -/* B2E838 802423C8 46800020 */ cvt.s.w $f0, $f0 -/* B2E83C 802423CC 46140001 */ sub.s $f0, $f0, $f20 -/* B2E840 802423D0 0280282D */ daddu $a1, $s4, $zero -/* B2E844 802423D4 02173023 */ subu $a2, $s0, $s7 -/* B2E848 802423D8 4600010D */ trunc.w.s $f4, $f0 -/* B2E84C 802423DC 44102000 */ mfc1 $s0, $f4 -/* B2E850 802423E0 0C0B2026 */ jal set_variable -/* B2E854 802423E4 02168023 */ subu $s0, $s0, $s6 -/* B2E858 802423E8 0240202D */ daddu $a0, $s2, $zero -/* B2E85C 802423EC 02A0282D */ daddu $a1, $s5, $zero -/* B2E860 802423F0 0C0B2026 */ jal set_variable -/* B2E864 802423F4 0200302D */ daddu $a2, $s0, $zero -/* B2E868 802423F8 8FBF0030 */ lw $ra, 0x30($sp) -/* B2E86C 802423FC 8FB7002C */ lw $s7, 0x2c($sp) -/* B2E870 80242400 8FB60028 */ lw $s6, 0x28($sp) -/* B2E874 80242404 8FB50024 */ lw $s5, 0x24($sp) -/* B2E878 80242408 8FB40020 */ lw $s4, 0x20($sp) -/* B2E87C 8024240C 8FB3001C */ lw $s3, 0x1c($sp) -/* B2E880 80242410 8FB20018 */ lw $s2, 0x18($sp) -/* B2E884 80242414 8FB10014 */ lw $s1, 0x14($sp) -/* B2E888 80242418 8FB00010 */ lw $s0, 0x10($sp) -/* B2E88C 8024241C D7B60040 */ ldc1 $f22, 0x40($sp) -/* B2E890 80242420 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B2E894 80242424 24020002 */ addiu $v0, $zero, 2 -/* B2E898 80242428 03E00008 */ jr $ra -/* B2E89C 8024242C 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s deleted file mode 100644 index 02b7b41c13..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024281C_B373EC.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024281C_B373EC -/* B373EC 8024281C 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B373F0 80242820 AFB20018 */ sw $s2, 0x18($sp) -/* B373F4 80242824 0080902D */ daddu $s2, $a0, $zero -/* B373F8 80242828 AFBF0030 */ sw $ra, 0x30($sp) -/* B373FC 8024282C AFB7002C */ sw $s7, 0x2c($sp) -/* B37400 80242830 AFB60028 */ sw $s6, 0x28($sp) -/* B37404 80242834 AFB50024 */ sw $s5, 0x24($sp) -/* B37408 80242838 AFB40020 */ sw $s4, 0x20($sp) -/* B3740C 8024283C AFB3001C */ sw $s3, 0x1c($sp) -/* B37410 80242840 AFB10014 */ sw $s1, 0x14($sp) -/* B37414 80242844 AFB00010 */ sw $s0, 0x10($sp) -/* B37418 80242848 F7B60040 */ sdc1 $f22, 0x40($sp) -/* B3741C 8024284C F7B40038 */ sdc1 $f20, 0x38($sp) -/* B37420 80242850 8E50000C */ lw $s0, 0xc($s2) -/* B37424 80242854 8E050000 */ lw $a1, ($s0) -/* B37428 80242858 0C0B1EAF */ jal get_variable -/* B3742C 8024285C 26100004 */ addiu $s0, $s0, 4 -/* B37430 80242860 8E050000 */ lw $a1, ($s0) -/* B37434 80242864 26100004 */ addiu $s0, $s0, 4 -/* B37438 80242868 0240202D */ daddu $a0, $s2, $zero -/* B3743C 8024286C 0C0B1EAF */ jal get_variable -/* B37440 80242870 0040B82D */ daddu $s7, $v0, $zero -/* B37444 80242874 8E050000 */ lw $a1, ($s0) -/* B37448 80242878 26100004 */ addiu $s0, $s0, 4 -/* B3744C 8024287C 0240202D */ daddu $a0, $s2, $zero -/* B37450 80242880 0C0B1EAF */ jal get_variable -/* B37454 80242884 0040B02D */ daddu $s6, $v0, $zero -/* B37458 80242888 0240202D */ daddu $a0, $s2, $zero -/* B3745C 8024288C 3C05F4AC */ lui $a1, 0xf4ac -/* B37460 80242890 34A5D481 */ ori $a1, $a1, 0xd481 -/* B37464 80242894 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* B37468 80242898 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* B3746C 8024289C 8E140000 */ lw $s4, ($s0) -/* B37470 802428A0 00061880 */ sll $v1, $a2, 2 -/* B37474 802428A4 00661821 */ addu $v1, $v1, $a2 -/* B37478 802428A8 00031880 */ sll $v1, $v1, 2 -/* B3747C 802428AC 00661823 */ subu $v1, $v1, $a2 -/* B37480 802428B0 000330C0 */ sll $a2, $v1, 3 -/* B37484 802428B4 00661821 */ addu $v1, $v1, $a2 -/* B37488 802428B8 000318C0 */ sll $v1, $v1, 3 -/* B3748C 802428BC 3C01800B */ lui $at, 0x800b -/* B37490 802428C0 00230821 */ addu $at, $at, $v1 -/* B37494 802428C4 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* B37498 802428C8 8E150004 */ lw $s5, 4($s0) -/* B3749C 802428CC 4600010D */ trunc.w.s $f4, $f0 -/* B374A0 802428D0 44112000 */ mfc1 $s1, $f4 -/* B374A4 802428D4 0C0B1EAF */ jal get_variable -/* B374A8 802428D8 0040982D */ daddu $s3, $v0, $zero -/* B374AC 802428DC 4491B000 */ mtc1 $s1, $f22 -/* B374B0 802428E0 00000000 */ nop -/* B374B4 802428E4 4680B5A0 */ cvt.s.w $f22, $f22 -/* B374B8 802428E8 4600B306 */ mov.s $f12, $f22 -/* B374BC 802428EC 0C00A8D4 */ jal cos_deg -/* B374C0 802428F0 0040802D */ daddu $s0, $v0, $zero -/* B374C4 802428F4 4493A000 */ mtc1 $s3, $f20 -/* B374C8 802428F8 00000000 */ nop -/* B374CC 802428FC 4680A520 */ cvt.s.w $f20, $f20 -/* B374D0 80242900 4600A002 */ mul.s $f0, $f20, $f0 -/* B374D4 80242904 00000000 */ nop -/* B374D8 80242908 0240202D */ daddu $a0, $s2, $zero -/* B374DC 8024290C 44901000 */ mtc1 $s0, $f2 -/* B374E0 80242910 00000000 */ nop -/* B374E4 80242914 468010A0 */ cvt.s.w $f2, $f2 -/* B374E8 80242918 46001081 */ sub.s $f2, $f2, $f0 -/* B374EC 8024291C 3C05F4AC */ lui $a1, 0xf4ac -/* B374F0 80242920 4600110D */ trunc.w.s $f4, $f2 -/* B374F4 80242924 44102000 */ mfc1 $s0, $f4 -/* B374F8 80242928 0C0B1EAF */ jal get_variable -/* B374FC 8024292C 34A5D483 */ ori $a1, $a1, 0xd483 -/* B37500 80242930 4600B306 */ mov.s $f12, $f22 -/* B37504 80242934 0C00A8BB */ jal sin_deg -/* B37508 80242938 0040882D */ daddu $s1, $v0, $zero -/* B3750C 8024293C 4600A502 */ mul.s $f20, $f20, $f0 -/* B37510 80242940 00000000 */ nop -/* B37514 80242944 0240202D */ daddu $a0, $s2, $zero -/* B37518 80242948 44910000 */ mtc1 $s1, $f0 -/* B3751C 8024294C 00000000 */ nop -/* B37520 80242950 46800020 */ cvt.s.w $f0, $f0 -/* B37524 80242954 46140001 */ sub.s $f0, $f0, $f20 -/* B37528 80242958 0280282D */ daddu $a1, $s4, $zero -/* B3752C 8024295C 02173023 */ subu $a2, $s0, $s7 -/* B37530 80242960 4600010D */ trunc.w.s $f4, $f0 -/* B37534 80242964 44102000 */ mfc1 $s0, $f4 -/* B37538 80242968 0C0B2026 */ jal set_variable -/* B3753C 8024296C 02168023 */ subu $s0, $s0, $s6 -/* B37540 80242970 0240202D */ daddu $a0, $s2, $zero -/* B37544 80242974 02A0282D */ daddu $a1, $s5, $zero -/* B37548 80242978 0C0B2026 */ jal set_variable -/* B3754C 8024297C 0200302D */ daddu $a2, $s0, $zero -/* B37550 80242980 8FBF0030 */ lw $ra, 0x30($sp) -/* B37554 80242984 8FB7002C */ lw $s7, 0x2c($sp) -/* B37558 80242988 8FB60028 */ lw $s6, 0x28($sp) -/* B3755C 8024298C 8FB50024 */ lw $s5, 0x24($sp) -/* B37560 80242990 8FB40020 */ lw $s4, 0x20($sp) -/* B37564 80242994 8FB3001C */ lw $s3, 0x1c($sp) -/* B37568 80242998 8FB20018 */ lw $s2, 0x18($sp) -/* B3756C 8024299C 8FB10014 */ lw $s1, 0x14($sp) -/* B37570 802429A0 8FB00010 */ lw $s0, 0x10($sp) -/* B37574 802429A4 D7B60040 */ ldc1 $f22, 0x40($sp) -/* B37578 802429A8 D7B40038 */ ldc1 $f20, 0x38($sp) -/* B3757C 802429AC 24020002 */ addiu $v0, $zero, 2 -/* B37580 802429B0 03E00008 */ jr $ra -/* B37584 802429B4 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s deleted file mode 100644 index 92e2eb8a40..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241010_8B1080.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241010_8B1080 -/* 8B1080 80241010 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 8B1084 80241014 AFB20018 */ sw $s2, 0x18($sp) -/* 8B1088 80241018 0080902D */ daddu $s2, $a0, $zero -/* 8B108C 8024101C AFBF0030 */ sw $ra, 0x30($sp) -/* 8B1090 80241020 AFB7002C */ sw $s7, 0x2c($sp) -/* 8B1094 80241024 AFB60028 */ sw $s6, 0x28($sp) -/* 8B1098 80241028 AFB50024 */ sw $s5, 0x24($sp) -/* 8B109C 8024102C AFB40020 */ sw $s4, 0x20($sp) -/* 8B10A0 80241030 AFB3001C */ sw $s3, 0x1c($sp) -/* 8B10A4 80241034 AFB10014 */ sw $s1, 0x14($sp) -/* 8B10A8 80241038 AFB00010 */ sw $s0, 0x10($sp) -/* 8B10AC 8024103C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 8B10B0 80241040 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 8B10B4 80241044 8E50000C */ lw $s0, 0xc($s2) -/* 8B10B8 80241048 8E050000 */ lw $a1, ($s0) -/* 8B10BC 8024104C 0C0B1EAF */ jal get_variable -/* 8B10C0 80241050 26100004 */ addiu $s0, $s0, 4 -/* 8B10C4 80241054 8E050000 */ lw $a1, ($s0) -/* 8B10C8 80241058 26100004 */ addiu $s0, $s0, 4 -/* 8B10CC 8024105C 0240202D */ daddu $a0, $s2, $zero -/* 8B10D0 80241060 0C0B1EAF */ jal get_variable -/* 8B10D4 80241064 0040B82D */ daddu $s7, $v0, $zero -/* 8B10D8 80241068 8E050000 */ lw $a1, ($s0) -/* 8B10DC 8024106C 26100004 */ addiu $s0, $s0, 4 -/* 8B10E0 80241070 0240202D */ daddu $a0, $s2, $zero -/* 8B10E4 80241074 0C0B1EAF */ jal get_variable -/* 8B10E8 80241078 0040B02D */ daddu $s6, $v0, $zero -/* 8B10EC 8024107C 0240202D */ daddu $a0, $s2, $zero -/* 8B10F0 80241080 3C05F4AC */ lui $a1, 0xf4ac -/* 8B10F4 80241084 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8B10F8 80241088 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 8B10FC 8024108C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 8B1100 80241090 8E140000 */ lw $s4, ($s0) -/* 8B1104 80241094 00061880 */ sll $v1, $a2, 2 -/* 8B1108 80241098 00661821 */ addu $v1, $v1, $a2 -/* 8B110C 8024109C 00031880 */ sll $v1, $v1, 2 -/* 8B1110 802410A0 00661823 */ subu $v1, $v1, $a2 -/* 8B1114 802410A4 000330C0 */ sll $a2, $v1, 3 -/* 8B1118 802410A8 00661821 */ addu $v1, $v1, $a2 -/* 8B111C 802410AC 000318C0 */ sll $v1, $v1, 3 -/* 8B1120 802410B0 3C01800B */ lui $at, 0x800b -/* 8B1124 802410B4 00230821 */ addu $at, $at, $v1 -/* 8B1128 802410B8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8B112C 802410BC 8E150004 */ lw $s5, 4($s0) -/* 8B1130 802410C0 4600010D */ trunc.w.s $f4, $f0 -/* 8B1134 802410C4 44112000 */ mfc1 $s1, $f4 -/* 8B1138 802410C8 0C0B1EAF */ jal get_variable -/* 8B113C 802410CC 0040982D */ daddu $s3, $v0, $zero -/* 8B1140 802410D0 4491B000 */ mtc1 $s1, $f22 -/* 8B1144 802410D4 00000000 */ nop -/* 8B1148 802410D8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8B114C 802410DC 4600B306 */ mov.s $f12, $f22 -/* 8B1150 802410E0 0C00A8D4 */ jal cos_deg -/* 8B1154 802410E4 0040802D */ daddu $s0, $v0, $zero -/* 8B1158 802410E8 4493A000 */ mtc1 $s3, $f20 -/* 8B115C 802410EC 00000000 */ nop -/* 8B1160 802410F0 4680A520 */ cvt.s.w $f20, $f20 -/* 8B1164 802410F4 4600A002 */ mul.s $f0, $f20, $f0 -/* 8B1168 802410F8 00000000 */ nop -/* 8B116C 802410FC 0240202D */ daddu $a0, $s2, $zero -/* 8B1170 80241100 44901000 */ mtc1 $s0, $f2 -/* 8B1174 80241104 00000000 */ nop -/* 8B1178 80241108 468010A0 */ cvt.s.w $f2, $f2 -/* 8B117C 8024110C 46001081 */ sub.s $f2, $f2, $f0 -/* 8B1180 80241110 3C05F4AC */ lui $a1, 0xf4ac -/* 8B1184 80241114 4600110D */ trunc.w.s $f4, $f2 -/* 8B1188 80241118 44102000 */ mfc1 $s0, $f4 -/* 8B118C 8024111C 0C0B1EAF */ jal get_variable -/* 8B1190 80241120 34A5D483 */ ori $a1, $a1, 0xd483 -/* 8B1194 80241124 4600B306 */ mov.s $f12, $f22 -/* 8B1198 80241128 0C00A8BB */ jal sin_deg -/* 8B119C 8024112C 0040882D */ daddu $s1, $v0, $zero -/* 8B11A0 80241130 4600A502 */ mul.s $f20, $f20, $f0 -/* 8B11A4 80241134 00000000 */ nop -/* 8B11A8 80241138 0240202D */ daddu $a0, $s2, $zero -/* 8B11AC 8024113C 44910000 */ mtc1 $s1, $f0 -/* 8B11B0 80241140 00000000 */ nop -/* 8B11B4 80241144 46800020 */ cvt.s.w $f0, $f0 -/* 8B11B8 80241148 46140001 */ sub.s $f0, $f0, $f20 -/* 8B11BC 8024114C 0280282D */ daddu $a1, $s4, $zero -/* 8B11C0 80241150 02173023 */ subu $a2, $s0, $s7 -/* 8B11C4 80241154 4600010D */ trunc.w.s $f4, $f0 -/* 8B11C8 80241158 44102000 */ mfc1 $s0, $f4 -/* 8B11CC 8024115C 0C0B2026 */ jal set_variable -/* 8B11D0 80241160 02168023 */ subu $s0, $s0, $s6 -/* 8B11D4 80241164 0240202D */ daddu $a0, $s2, $zero -/* 8B11D8 80241168 02A0282D */ daddu $a1, $s5, $zero -/* 8B11DC 8024116C 0C0B2026 */ jal set_variable -/* 8B11E0 80241170 0200302D */ daddu $a2, $s0, $zero -/* 8B11E4 80241174 8FBF0030 */ lw $ra, 0x30($sp) -/* 8B11E8 80241178 8FB7002C */ lw $s7, 0x2c($sp) -/* 8B11EC 8024117C 8FB60028 */ lw $s6, 0x28($sp) -/* 8B11F0 80241180 8FB50024 */ lw $s5, 0x24($sp) -/* 8B11F4 80241184 8FB40020 */ lw $s4, 0x20($sp) -/* 8B11F8 80241188 8FB3001C */ lw $s3, 0x1c($sp) -/* 8B11FC 8024118C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B1200 80241190 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1204 80241194 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1208 80241198 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 8B120C 8024119C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8B1210 802411A0 24020002 */ addiu $v0, $zero, 2 -/* 8B1214 802411A4 03E00008 */ jr $ra -/* 8B1218 802411A8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s deleted file mode 100644 index 1eced077b2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802412B0_7EBFC0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B0_7EBFC0 -/* 7EBFC0 802412B0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 7EBFC4 802412B4 AFB20018 */ sw $s2, 0x18($sp) -/* 7EBFC8 802412B8 0080902D */ daddu $s2, $a0, $zero -/* 7EBFCC 802412BC AFBF0030 */ sw $ra, 0x30($sp) -/* 7EBFD0 802412C0 AFB7002C */ sw $s7, 0x2c($sp) -/* 7EBFD4 802412C4 AFB60028 */ sw $s6, 0x28($sp) -/* 7EBFD8 802412C8 AFB50024 */ sw $s5, 0x24($sp) -/* 7EBFDC 802412CC AFB40020 */ sw $s4, 0x20($sp) -/* 7EBFE0 802412D0 AFB3001C */ sw $s3, 0x1c($sp) -/* 7EBFE4 802412D4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBFE8 802412D8 AFB00010 */ sw $s0, 0x10($sp) -/* 7EBFEC 802412DC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 7EBFF0 802412E0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 7EBFF4 802412E4 8E50000C */ lw $s0, 0xc($s2) -/* 7EBFF8 802412E8 8E050000 */ lw $a1, ($s0) -/* 7EBFFC 802412EC 0C0B1EAF */ jal get_variable -/* 7EC000 802412F0 26100004 */ addiu $s0, $s0, 4 -/* 7EC004 802412F4 8E050000 */ lw $a1, ($s0) -/* 7EC008 802412F8 26100004 */ addiu $s0, $s0, 4 -/* 7EC00C 802412FC 0240202D */ daddu $a0, $s2, $zero -/* 7EC010 80241300 0C0B1EAF */ jal get_variable -/* 7EC014 80241304 0040B82D */ daddu $s7, $v0, $zero -/* 7EC018 80241308 8E050000 */ lw $a1, ($s0) -/* 7EC01C 8024130C 26100004 */ addiu $s0, $s0, 4 -/* 7EC020 80241310 0240202D */ daddu $a0, $s2, $zero -/* 7EC024 80241314 0C0B1EAF */ jal get_variable -/* 7EC028 80241318 0040B02D */ daddu $s6, $v0, $zero -/* 7EC02C 8024131C 0240202D */ daddu $a0, $s2, $zero -/* 7EC030 80241320 3C05F4AC */ lui $a1, 0xf4ac -/* 7EC034 80241324 34A5D481 */ ori $a1, $a1, 0xd481 -/* 7EC038 80241328 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 7EC03C 8024132C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 7EC040 80241330 8E140000 */ lw $s4, ($s0) -/* 7EC044 80241334 00061880 */ sll $v1, $a2, 2 -/* 7EC048 80241338 00661821 */ addu $v1, $v1, $a2 -/* 7EC04C 8024133C 00031880 */ sll $v1, $v1, 2 -/* 7EC050 80241340 00661823 */ subu $v1, $v1, $a2 -/* 7EC054 80241344 000330C0 */ sll $a2, $v1, 3 -/* 7EC058 80241348 00661821 */ addu $v1, $v1, $a2 -/* 7EC05C 8024134C 000318C0 */ sll $v1, $v1, 3 -/* 7EC060 80241350 3C01800B */ lui $at, 0x800b -/* 7EC064 80241354 00230821 */ addu $at, $at, $v1 -/* 7EC068 80241358 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 7EC06C 8024135C 8E150004 */ lw $s5, 4($s0) -/* 7EC070 80241360 4600010D */ trunc.w.s $f4, $f0 -/* 7EC074 80241364 44112000 */ mfc1 $s1, $f4 -/* 7EC078 80241368 0C0B1EAF */ jal get_variable -/* 7EC07C 8024136C 0040982D */ daddu $s3, $v0, $zero -/* 7EC080 80241370 4491B000 */ mtc1 $s1, $f22 -/* 7EC084 80241374 00000000 */ nop -/* 7EC088 80241378 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7EC08C 8024137C 4600B306 */ mov.s $f12, $f22 -/* 7EC090 80241380 0C00A8D4 */ jal cos_deg -/* 7EC094 80241384 0040802D */ daddu $s0, $v0, $zero -/* 7EC098 80241388 4493A000 */ mtc1 $s3, $f20 -/* 7EC09C 8024138C 00000000 */ nop -/* 7EC0A0 80241390 4680A520 */ cvt.s.w $f20, $f20 -/* 7EC0A4 80241394 4600A002 */ mul.s $f0, $f20, $f0 -/* 7EC0A8 80241398 00000000 */ nop -/* 7EC0AC 8024139C 0240202D */ daddu $a0, $s2, $zero -/* 7EC0B0 802413A0 44901000 */ mtc1 $s0, $f2 -/* 7EC0B4 802413A4 00000000 */ nop -/* 7EC0B8 802413A8 468010A0 */ cvt.s.w $f2, $f2 -/* 7EC0BC 802413AC 46001081 */ sub.s $f2, $f2, $f0 -/* 7EC0C0 802413B0 3C05F4AC */ lui $a1, 0xf4ac -/* 7EC0C4 802413B4 4600110D */ trunc.w.s $f4, $f2 -/* 7EC0C8 802413B8 44102000 */ mfc1 $s0, $f4 -/* 7EC0CC 802413BC 0C0B1EAF */ jal get_variable -/* 7EC0D0 802413C0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 7EC0D4 802413C4 4600B306 */ mov.s $f12, $f22 -/* 7EC0D8 802413C8 0C00A8BB */ jal sin_deg -/* 7EC0DC 802413CC 0040882D */ daddu $s1, $v0, $zero -/* 7EC0E0 802413D0 4600A502 */ mul.s $f20, $f20, $f0 -/* 7EC0E4 802413D4 00000000 */ nop -/* 7EC0E8 802413D8 0240202D */ daddu $a0, $s2, $zero -/* 7EC0EC 802413DC 44910000 */ mtc1 $s1, $f0 -/* 7EC0F0 802413E0 00000000 */ nop -/* 7EC0F4 802413E4 46800020 */ cvt.s.w $f0, $f0 -/* 7EC0F8 802413E8 46140001 */ sub.s $f0, $f0, $f20 -/* 7EC0FC 802413EC 0280282D */ daddu $a1, $s4, $zero -/* 7EC100 802413F0 02173023 */ subu $a2, $s0, $s7 -/* 7EC104 802413F4 4600010D */ trunc.w.s $f4, $f0 -/* 7EC108 802413F8 44102000 */ mfc1 $s0, $f4 -/* 7EC10C 802413FC 0C0B2026 */ jal set_variable -/* 7EC110 80241400 02168023 */ subu $s0, $s0, $s6 -/* 7EC114 80241404 0240202D */ daddu $a0, $s2, $zero -/* 7EC118 80241408 02A0282D */ daddu $a1, $s5, $zero -/* 7EC11C 8024140C 0C0B2026 */ jal set_variable -/* 7EC120 80241410 0200302D */ daddu $a2, $s0, $zero -/* 7EC124 80241414 8FBF0030 */ lw $ra, 0x30($sp) -/* 7EC128 80241418 8FB7002C */ lw $s7, 0x2c($sp) -/* 7EC12C 8024141C 8FB60028 */ lw $s6, 0x28($sp) -/* 7EC130 80241420 8FB50024 */ lw $s5, 0x24($sp) -/* 7EC134 80241424 8FB40020 */ lw $s4, 0x20($sp) -/* 7EC138 80241428 8FB3001C */ lw $s3, 0x1c($sp) -/* 7EC13C 8024142C 8FB20018 */ lw $s2, 0x18($sp) -/* 7EC140 80241430 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC144 80241434 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC148 80241438 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 7EC14C 8024143C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 7EC150 80241440 24020002 */ addiu $v0, $zero, 2 -/* 7EC154 80241444 03E00008 */ jr $ra -/* 7EC158 80241448 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s deleted file mode 100644 index 536996d9dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242B90_803410.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B90_803410 -/* 803410 80242B90 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 803414 80242B94 AFB20018 */ sw $s2, 0x18($sp) -/* 803418 80242B98 0080902D */ daddu $s2, $a0, $zero -/* 80341C 80242B9C AFBF0030 */ sw $ra, 0x30($sp) -/* 803420 80242BA0 AFB7002C */ sw $s7, 0x2c($sp) -/* 803424 80242BA4 AFB60028 */ sw $s6, 0x28($sp) -/* 803428 80242BA8 AFB50024 */ sw $s5, 0x24($sp) -/* 80342C 80242BAC AFB40020 */ sw $s4, 0x20($sp) -/* 803430 80242BB0 AFB3001C */ sw $s3, 0x1c($sp) -/* 803434 80242BB4 AFB10014 */ sw $s1, 0x14($sp) -/* 803438 80242BB8 AFB00010 */ sw $s0, 0x10($sp) -/* 80343C 80242BBC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 803440 80242BC0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 803444 80242BC4 8E50000C */ lw $s0, 0xc($s2) -/* 803448 80242BC8 8E050000 */ lw $a1, ($s0) -/* 80344C 80242BCC 0C0B1EAF */ jal get_variable -/* 803450 80242BD0 26100004 */ addiu $s0, $s0, 4 -/* 803454 80242BD4 8E050000 */ lw $a1, ($s0) -/* 803458 80242BD8 26100004 */ addiu $s0, $s0, 4 -/* 80345C 80242BDC 0240202D */ daddu $a0, $s2, $zero -/* 803460 80242BE0 0C0B1EAF */ jal get_variable -/* 803464 80242BE4 0040B82D */ daddu $s7, $v0, $zero -/* 803468 80242BE8 8E050000 */ lw $a1, ($s0) -/* 80346C 80242BEC 26100004 */ addiu $s0, $s0, 4 -/* 803470 80242BF0 0240202D */ daddu $a0, $s2, $zero -/* 803474 80242BF4 0C0B1EAF */ jal get_variable -/* 803478 80242BF8 0040B02D */ daddu $s6, $v0, $zero -/* 80347C 80242BFC 0240202D */ daddu $a0, $s2, $zero -/* 803480 80242C00 3C05F4AC */ lui $a1, 0xf4ac -/* 803484 80242C04 34A5D481 */ ori $a1, $a1, 0xd481 -/* 803488 80242C08 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 80348C 80242C0C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 803490 80242C10 8E140000 */ lw $s4, ($s0) -/* 803494 80242C14 00061880 */ sll $v1, $a2, 2 -/* 803498 80242C18 00661821 */ addu $v1, $v1, $a2 -/* 80349C 80242C1C 00031880 */ sll $v1, $v1, 2 -/* 8034A0 80242C20 00661823 */ subu $v1, $v1, $a2 -/* 8034A4 80242C24 000330C0 */ sll $a2, $v1, 3 -/* 8034A8 80242C28 00661821 */ addu $v1, $v1, $a2 -/* 8034AC 80242C2C 000318C0 */ sll $v1, $v1, 3 -/* 8034B0 80242C30 3C01800B */ lui $at, 0x800b -/* 8034B4 80242C34 00230821 */ addu $at, $at, $v1 -/* 8034B8 80242C38 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8034BC 80242C3C 8E150004 */ lw $s5, 4($s0) -/* 8034C0 80242C40 4600010D */ trunc.w.s $f4, $f0 -/* 8034C4 80242C44 44112000 */ mfc1 $s1, $f4 -/* 8034C8 80242C48 0C0B1EAF */ jal get_variable -/* 8034CC 80242C4C 0040982D */ daddu $s3, $v0, $zero -/* 8034D0 80242C50 4491B000 */ mtc1 $s1, $f22 -/* 8034D4 80242C54 00000000 */ nop -/* 8034D8 80242C58 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8034DC 80242C5C 4600B306 */ mov.s $f12, $f22 -/* 8034E0 80242C60 0C00A8D4 */ jal cos_deg -/* 8034E4 80242C64 0040802D */ daddu $s0, $v0, $zero -/* 8034E8 80242C68 4493A000 */ mtc1 $s3, $f20 -/* 8034EC 80242C6C 00000000 */ nop -/* 8034F0 80242C70 4680A520 */ cvt.s.w $f20, $f20 -/* 8034F4 80242C74 4600A002 */ mul.s $f0, $f20, $f0 -/* 8034F8 80242C78 00000000 */ nop -/* 8034FC 80242C7C 0240202D */ daddu $a0, $s2, $zero -/* 803500 80242C80 44901000 */ mtc1 $s0, $f2 -/* 803504 80242C84 00000000 */ nop -/* 803508 80242C88 468010A0 */ cvt.s.w $f2, $f2 -/* 80350C 80242C8C 46001081 */ sub.s $f2, $f2, $f0 -/* 803510 80242C90 3C05F4AC */ lui $a1, 0xf4ac -/* 803514 80242C94 4600110D */ trunc.w.s $f4, $f2 -/* 803518 80242C98 44102000 */ mfc1 $s0, $f4 -/* 80351C 80242C9C 0C0B1EAF */ jal get_variable -/* 803520 80242CA0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 803524 80242CA4 4600B306 */ mov.s $f12, $f22 -/* 803528 80242CA8 0C00A8BB */ jal sin_deg -/* 80352C 80242CAC 0040882D */ daddu $s1, $v0, $zero -/* 803530 80242CB0 4600A502 */ mul.s $f20, $f20, $f0 -/* 803534 80242CB4 00000000 */ nop -/* 803538 80242CB8 0240202D */ daddu $a0, $s2, $zero -/* 80353C 80242CBC 44910000 */ mtc1 $s1, $f0 -/* 803540 80242CC0 00000000 */ nop -/* 803544 80242CC4 46800020 */ cvt.s.w $f0, $f0 -/* 803548 80242CC8 46140001 */ sub.s $f0, $f0, $f20 -/* 80354C 80242CCC 0280282D */ daddu $a1, $s4, $zero -/* 803550 80242CD0 02173023 */ subu $a2, $s0, $s7 -/* 803554 80242CD4 4600010D */ trunc.w.s $f4, $f0 -/* 803558 80242CD8 44102000 */ mfc1 $s0, $f4 -/* 80355C 80242CDC 0C0B2026 */ jal set_variable -/* 803560 80242CE0 02168023 */ subu $s0, $s0, $s6 -/* 803564 80242CE4 0240202D */ daddu $a0, $s2, $zero -/* 803568 80242CE8 02A0282D */ daddu $a1, $s5, $zero -/* 80356C 80242CEC 0C0B2026 */ jal set_variable -/* 803570 80242CF0 0200302D */ daddu $a2, $s0, $zero -/* 803574 80242CF4 8FBF0030 */ lw $ra, 0x30($sp) -/* 803578 80242CF8 8FB7002C */ lw $s7, 0x2c($sp) -/* 80357C 80242CFC 8FB60028 */ lw $s6, 0x28($sp) -/* 803580 80242D00 8FB50024 */ lw $s5, 0x24($sp) -/* 803584 80242D04 8FB40020 */ lw $s4, 0x20($sp) -/* 803588 80242D08 8FB3001C */ lw $s3, 0x1c($sp) -/* 80358C 80242D0C 8FB20018 */ lw $s2, 0x18($sp) -/* 803590 80242D10 8FB10014 */ lw $s1, 0x14($sp) -/* 803594 80242D14 8FB00010 */ lw $s0, 0x10($sp) -/* 803598 80242D18 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 80359C 80242D1C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8035A0 80242D20 24020002 */ addiu $v0, $zero, 2 -/* 8035A4 80242D24 03E00008 */ jr $ra -/* 8035A8 80242D28 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s deleted file mode 100644 index dcba1d6f43..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242440_825700.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242440_825700 -/* 825700 80242440 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 825704 80242444 AFB20018 */ sw $s2, 0x18($sp) -/* 825708 80242448 0080902D */ daddu $s2, $a0, $zero -/* 82570C 8024244C AFBF0030 */ sw $ra, 0x30($sp) -/* 825710 80242450 AFB7002C */ sw $s7, 0x2c($sp) -/* 825714 80242454 AFB60028 */ sw $s6, 0x28($sp) -/* 825718 80242458 AFB50024 */ sw $s5, 0x24($sp) -/* 82571C 8024245C AFB40020 */ sw $s4, 0x20($sp) -/* 825720 80242460 AFB3001C */ sw $s3, 0x1c($sp) -/* 825724 80242464 AFB10014 */ sw $s1, 0x14($sp) -/* 825728 80242468 AFB00010 */ sw $s0, 0x10($sp) -/* 82572C 8024246C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 825730 80242470 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 825734 80242474 8E50000C */ lw $s0, 0xc($s2) -/* 825738 80242478 8E050000 */ lw $a1, ($s0) -/* 82573C 8024247C 0C0B1EAF */ jal get_variable -/* 825740 80242480 26100004 */ addiu $s0, $s0, 4 -/* 825744 80242484 8E050000 */ lw $a1, ($s0) -/* 825748 80242488 26100004 */ addiu $s0, $s0, 4 -/* 82574C 8024248C 0240202D */ daddu $a0, $s2, $zero -/* 825750 80242490 0C0B1EAF */ jal get_variable -/* 825754 80242494 0040B82D */ daddu $s7, $v0, $zero -/* 825758 80242498 8E050000 */ lw $a1, ($s0) -/* 82575C 8024249C 26100004 */ addiu $s0, $s0, 4 -/* 825760 802424A0 0240202D */ daddu $a0, $s2, $zero -/* 825764 802424A4 0C0B1EAF */ jal get_variable -/* 825768 802424A8 0040B02D */ daddu $s6, $v0, $zero -/* 82576C 802424AC 0240202D */ daddu $a0, $s2, $zero -/* 825770 802424B0 3C05F4AC */ lui $a1, 0xf4ac -/* 825774 802424B4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 825778 802424B8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 82577C 802424BC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 825780 802424C0 8E140000 */ lw $s4, ($s0) -/* 825784 802424C4 00061880 */ sll $v1, $a2, 2 -/* 825788 802424C8 00661821 */ addu $v1, $v1, $a2 -/* 82578C 802424CC 00031880 */ sll $v1, $v1, 2 -/* 825790 802424D0 00661823 */ subu $v1, $v1, $a2 -/* 825794 802424D4 000330C0 */ sll $a2, $v1, 3 -/* 825798 802424D8 00661821 */ addu $v1, $v1, $a2 -/* 82579C 802424DC 000318C0 */ sll $v1, $v1, 3 -/* 8257A0 802424E0 3C01800B */ lui $at, 0x800b -/* 8257A4 802424E4 00230821 */ addu $at, $at, $v1 -/* 8257A8 802424E8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8257AC 802424EC 8E150004 */ lw $s5, 4($s0) -/* 8257B0 802424F0 4600010D */ trunc.w.s $f4, $f0 -/* 8257B4 802424F4 44112000 */ mfc1 $s1, $f4 -/* 8257B8 802424F8 0C0B1EAF */ jal get_variable -/* 8257BC 802424FC 0040982D */ daddu $s3, $v0, $zero -/* 8257C0 80242500 4491B000 */ mtc1 $s1, $f22 -/* 8257C4 80242504 00000000 */ nop -/* 8257C8 80242508 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8257CC 8024250C 4600B306 */ mov.s $f12, $f22 -/* 8257D0 80242510 0C00A8D4 */ jal cos_deg -/* 8257D4 80242514 0040802D */ daddu $s0, $v0, $zero -/* 8257D8 80242518 4493A000 */ mtc1 $s3, $f20 -/* 8257DC 8024251C 00000000 */ nop -/* 8257E0 80242520 4680A520 */ cvt.s.w $f20, $f20 -/* 8257E4 80242524 4600A002 */ mul.s $f0, $f20, $f0 -/* 8257E8 80242528 00000000 */ nop -/* 8257EC 8024252C 0240202D */ daddu $a0, $s2, $zero -/* 8257F0 80242530 44901000 */ mtc1 $s0, $f2 -/* 8257F4 80242534 00000000 */ nop -/* 8257F8 80242538 468010A0 */ cvt.s.w $f2, $f2 -/* 8257FC 8024253C 46001081 */ sub.s $f2, $f2, $f0 -/* 825800 80242540 3C05F4AC */ lui $a1, 0xf4ac -/* 825804 80242544 4600110D */ trunc.w.s $f4, $f2 -/* 825808 80242548 44102000 */ mfc1 $s0, $f4 -/* 82580C 8024254C 0C0B1EAF */ jal get_variable -/* 825810 80242550 34A5D483 */ ori $a1, $a1, 0xd483 -/* 825814 80242554 4600B306 */ mov.s $f12, $f22 -/* 825818 80242558 0C00A8BB */ jal sin_deg -/* 82581C 8024255C 0040882D */ daddu $s1, $v0, $zero -/* 825820 80242560 4600A502 */ mul.s $f20, $f20, $f0 -/* 825824 80242564 00000000 */ nop -/* 825828 80242568 0240202D */ daddu $a0, $s2, $zero -/* 82582C 8024256C 44910000 */ mtc1 $s1, $f0 -/* 825830 80242570 00000000 */ nop -/* 825834 80242574 46800020 */ cvt.s.w $f0, $f0 -/* 825838 80242578 46140001 */ sub.s $f0, $f0, $f20 -/* 82583C 8024257C 0280282D */ daddu $a1, $s4, $zero -/* 825840 80242580 02173023 */ subu $a2, $s0, $s7 -/* 825844 80242584 4600010D */ trunc.w.s $f4, $f0 -/* 825848 80242588 44102000 */ mfc1 $s0, $f4 -/* 82584C 8024258C 0C0B2026 */ jal set_variable -/* 825850 80242590 02168023 */ subu $s0, $s0, $s6 -/* 825854 80242594 0240202D */ daddu $a0, $s2, $zero -/* 825858 80242598 02A0282D */ daddu $a1, $s5, $zero -/* 82585C 8024259C 0C0B2026 */ jal set_variable -/* 825860 802425A0 0200302D */ daddu $a2, $s0, $zero -/* 825864 802425A4 8FBF0030 */ lw $ra, 0x30($sp) -/* 825868 802425A8 8FB7002C */ lw $s7, 0x2c($sp) -/* 82586C 802425AC 8FB60028 */ lw $s6, 0x28($sp) -/* 825870 802425B0 8FB50024 */ lw $s5, 0x24($sp) -/* 825874 802425B4 8FB40020 */ lw $s4, 0x20($sp) -/* 825878 802425B8 8FB3001C */ lw $s3, 0x1c($sp) -/* 82587C 802425BC 8FB20018 */ lw $s2, 0x18($sp) -/* 825880 802425C0 8FB10014 */ lw $s1, 0x14($sp) -/* 825884 802425C4 8FB00010 */ lw $s0, 0x10($sp) -/* 825888 802425C8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 82588C 802425CC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 825890 802425D0 24020002 */ addiu $v0, $zero, 2 -/* 825894 802425D4 03E00008 */ jr $ra -/* 825898 802425D8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s deleted file mode 100644 index 4806014e37..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241130_832930.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241130_832930 -/* 832930 80241130 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 832934 80241134 AFB20018 */ sw $s2, 0x18($sp) -/* 832938 80241138 0080902D */ daddu $s2, $a0, $zero -/* 83293C 8024113C AFBF0030 */ sw $ra, 0x30($sp) -/* 832940 80241140 AFB7002C */ sw $s7, 0x2c($sp) -/* 832944 80241144 AFB60028 */ sw $s6, 0x28($sp) -/* 832948 80241148 AFB50024 */ sw $s5, 0x24($sp) -/* 83294C 8024114C AFB40020 */ sw $s4, 0x20($sp) -/* 832950 80241150 AFB3001C */ sw $s3, 0x1c($sp) -/* 832954 80241154 AFB10014 */ sw $s1, 0x14($sp) -/* 832958 80241158 AFB00010 */ sw $s0, 0x10($sp) -/* 83295C 8024115C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 832960 80241160 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 832964 80241164 8E50000C */ lw $s0, 0xc($s2) -/* 832968 80241168 8E050000 */ lw $a1, ($s0) -/* 83296C 8024116C 0C0B1EAF */ jal get_variable -/* 832970 80241170 26100004 */ addiu $s0, $s0, 4 -/* 832974 80241174 8E050000 */ lw $a1, ($s0) -/* 832978 80241178 26100004 */ addiu $s0, $s0, 4 -/* 83297C 8024117C 0240202D */ daddu $a0, $s2, $zero -/* 832980 80241180 0C0B1EAF */ jal get_variable -/* 832984 80241184 0040B82D */ daddu $s7, $v0, $zero -/* 832988 80241188 8E050000 */ lw $a1, ($s0) -/* 83298C 8024118C 26100004 */ addiu $s0, $s0, 4 -/* 832990 80241190 0240202D */ daddu $a0, $s2, $zero -/* 832994 80241194 0C0B1EAF */ jal get_variable -/* 832998 80241198 0040B02D */ daddu $s6, $v0, $zero -/* 83299C 8024119C 0240202D */ daddu $a0, $s2, $zero -/* 8329A0 802411A0 3C05F4AC */ lui $a1, 0xf4ac -/* 8329A4 802411A4 34A5D481 */ ori $a1, $a1, 0xd481 -/* 8329A8 802411A8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 8329AC 802411AC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 8329B0 802411B0 8E140000 */ lw $s4, ($s0) -/* 8329B4 802411B4 00061880 */ sll $v1, $a2, 2 -/* 8329B8 802411B8 00661821 */ addu $v1, $v1, $a2 -/* 8329BC 802411BC 00031880 */ sll $v1, $v1, 2 -/* 8329C0 802411C0 00661823 */ subu $v1, $v1, $a2 -/* 8329C4 802411C4 000330C0 */ sll $a2, $v1, 3 -/* 8329C8 802411C8 00661821 */ addu $v1, $v1, $a2 -/* 8329CC 802411CC 000318C0 */ sll $v1, $v1, 3 -/* 8329D0 802411D0 3C01800B */ lui $at, 0x800b -/* 8329D4 802411D4 00230821 */ addu $at, $at, $v1 -/* 8329D8 802411D8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8329DC 802411DC 8E150004 */ lw $s5, 4($s0) -/* 8329E0 802411E0 4600010D */ trunc.w.s $f4, $f0 -/* 8329E4 802411E4 44112000 */ mfc1 $s1, $f4 -/* 8329E8 802411E8 0C0B1EAF */ jal get_variable -/* 8329EC 802411EC 0040982D */ daddu $s3, $v0, $zero -/* 8329F0 802411F0 4491B000 */ mtc1 $s1, $f22 -/* 8329F4 802411F4 00000000 */ nop -/* 8329F8 802411F8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8329FC 802411FC 4600B306 */ mov.s $f12, $f22 -/* 832A00 80241200 0C00A8D4 */ jal cos_deg -/* 832A04 80241204 0040802D */ daddu $s0, $v0, $zero -/* 832A08 80241208 4493A000 */ mtc1 $s3, $f20 -/* 832A0C 8024120C 00000000 */ nop -/* 832A10 80241210 4680A520 */ cvt.s.w $f20, $f20 -/* 832A14 80241214 4600A002 */ mul.s $f0, $f20, $f0 -/* 832A18 80241218 00000000 */ nop -/* 832A1C 8024121C 0240202D */ daddu $a0, $s2, $zero -/* 832A20 80241220 44901000 */ mtc1 $s0, $f2 -/* 832A24 80241224 00000000 */ nop -/* 832A28 80241228 468010A0 */ cvt.s.w $f2, $f2 -/* 832A2C 8024122C 46001081 */ sub.s $f2, $f2, $f0 -/* 832A30 80241230 3C05F4AC */ lui $a1, 0xf4ac -/* 832A34 80241234 4600110D */ trunc.w.s $f4, $f2 -/* 832A38 80241238 44102000 */ mfc1 $s0, $f4 -/* 832A3C 8024123C 0C0B1EAF */ jal get_variable -/* 832A40 80241240 34A5D483 */ ori $a1, $a1, 0xd483 -/* 832A44 80241244 4600B306 */ mov.s $f12, $f22 -/* 832A48 80241248 0C00A8BB */ jal sin_deg -/* 832A4C 8024124C 0040882D */ daddu $s1, $v0, $zero -/* 832A50 80241250 4600A502 */ mul.s $f20, $f20, $f0 -/* 832A54 80241254 00000000 */ nop -/* 832A58 80241258 0240202D */ daddu $a0, $s2, $zero -/* 832A5C 8024125C 44910000 */ mtc1 $s1, $f0 -/* 832A60 80241260 00000000 */ nop -/* 832A64 80241264 46800020 */ cvt.s.w $f0, $f0 -/* 832A68 80241268 46140001 */ sub.s $f0, $f0, $f20 -/* 832A6C 8024126C 0280282D */ daddu $a1, $s4, $zero -/* 832A70 80241270 02173023 */ subu $a2, $s0, $s7 -/* 832A74 80241274 4600010D */ trunc.w.s $f4, $f0 -/* 832A78 80241278 44102000 */ mfc1 $s0, $f4 -/* 832A7C 8024127C 0C0B2026 */ jal set_variable -/* 832A80 80241280 02168023 */ subu $s0, $s0, $s6 -/* 832A84 80241284 0240202D */ daddu $a0, $s2, $zero -/* 832A88 80241288 02A0282D */ daddu $a1, $s5, $zero -/* 832A8C 8024128C 0C0B2026 */ jal set_variable -/* 832A90 80241290 0200302D */ daddu $a2, $s0, $zero -/* 832A94 80241294 8FBF0030 */ lw $ra, 0x30($sp) -/* 832A98 80241298 8FB7002C */ lw $s7, 0x2c($sp) -/* 832A9C 8024129C 8FB60028 */ lw $s6, 0x28($sp) -/* 832AA0 802412A0 8FB50024 */ lw $s5, 0x24($sp) -/* 832AA4 802412A4 8FB40020 */ lw $s4, 0x20($sp) -/* 832AA8 802412A8 8FB3001C */ lw $s3, 0x1c($sp) -/* 832AAC 802412AC 8FB20018 */ lw $s2, 0x18($sp) -/* 832AB0 802412B0 8FB10014 */ lw $s1, 0x14($sp) -/* 832AB4 802412B4 8FB00010 */ lw $s0, 0x10($sp) -/* 832AB8 802412B8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 832ABC 802412BC D7B40038 */ ldc1 $f20, 0x38($sp) -/* 832AC0 802412C0 24020002 */ addiu $v0, $zero, 2 -/* 832AC4 802412C4 03E00008 */ jr $ra -/* 832AC8 802412C8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s deleted file mode 100644 index 4e17291946..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802410E0_843CB0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802410E0_843CB0 -/* 843CB0 802410E0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 843CB4 802410E4 AFB20018 */ sw $s2, 0x18($sp) -/* 843CB8 802410E8 0080902D */ daddu $s2, $a0, $zero -/* 843CBC 802410EC AFBF0030 */ sw $ra, 0x30($sp) -/* 843CC0 802410F0 AFB7002C */ sw $s7, 0x2c($sp) -/* 843CC4 802410F4 AFB60028 */ sw $s6, 0x28($sp) -/* 843CC8 802410F8 AFB50024 */ sw $s5, 0x24($sp) -/* 843CCC 802410FC AFB40020 */ sw $s4, 0x20($sp) -/* 843CD0 80241100 AFB3001C */ sw $s3, 0x1c($sp) -/* 843CD4 80241104 AFB10014 */ sw $s1, 0x14($sp) -/* 843CD8 80241108 AFB00010 */ sw $s0, 0x10($sp) -/* 843CDC 8024110C F7B60040 */ sdc1 $f22, 0x40($sp) -/* 843CE0 80241110 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 843CE4 80241114 8E50000C */ lw $s0, 0xc($s2) -/* 843CE8 80241118 8E050000 */ lw $a1, ($s0) -/* 843CEC 8024111C 0C0B1EAF */ jal get_variable -/* 843CF0 80241120 26100004 */ addiu $s0, $s0, 4 -/* 843CF4 80241124 8E050000 */ lw $a1, ($s0) -/* 843CF8 80241128 26100004 */ addiu $s0, $s0, 4 -/* 843CFC 8024112C 0240202D */ daddu $a0, $s2, $zero -/* 843D00 80241130 0C0B1EAF */ jal get_variable -/* 843D04 80241134 0040B82D */ daddu $s7, $v0, $zero -/* 843D08 80241138 8E050000 */ lw $a1, ($s0) -/* 843D0C 8024113C 26100004 */ addiu $s0, $s0, 4 -/* 843D10 80241140 0240202D */ daddu $a0, $s2, $zero -/* 843D14 80241144 0C0B1EAF */ jal get_variable -/* 843D18 80241148 0040B02D */ daddu $s6, $v0, $zero -/* 843D1C 8024114C 0240202D */ daddu $a0, $s2, $zero -/* 843D20 80241150 3C05F4AC */ lui $a1, 0xf4ac -/* 843D24 80241154 34A5D481 */ ori $a1, $a1, 0xd481 -/* 843D28 80241158 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 843D2C 8024115C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 843D30 80241160 8E140000 */ lw $s4, ($s0) -/* 843D34 80241164 00061880 */ sll $v1, $a2, 2 -/* 843D38 80241168 00661821 */ addu $v1, $v1, $a2 -/* 843D3C 8024116C 00031880 */ sll $v1, $v1, 2 -/* 843D40 80241170 00661823 */ subu $v1, $v1, $a2 -/* 843D44 80241174 000330C0 */ sll $a2, $v1, 3 -/* 843D48 80241178 00661821 */ addu $v1, $v1, $a2 -/* 843D4C 8024117C 000318C0 */ sll $v1, $v1, 3 -/* 843D50 80241180 3C01800B */ lui $at, 0x800b -/* 843D54 80241184 00230821 */ addu $at, $at, $v1 -/* 843D58 80241188 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 843D5C 8024118C 8E150004 */ lw $s5, 4($s0) -/* 843D60 80241190 4600010D */ trunc.w.s $f4, $f0 -/* 843D64 80241194 44112000 */ mfc1 $s1, $f4 -/* 843D68 80241198 0C0B1EAF */ jal get_variable -/* 843D6C 8024119C 0040982D */ daddu $s3, $v0, $zero -/* 843D70 802411A0 4491B000 */ mtc1 $s1, $f22 -/* 843D74 802411A4 00000000 */ nop -/* 843D78 802411A8 4680B5A0 */ cvt.s.w $f22, $f22 -/* 843D7C 802411AC 4600B306 */ mov.s $f12, $f22 -/* 843D80 802411B0 0C00A8D4 */ jal cos_deg -/* 843D84 802411B4 0040802D */ daddu $s0, $v0, $zero -/* 843D88 802411B8 4493A000 */ mtc1 $s3, $f20 -/* 843D8C 802411BC 00000000 */ nop -/* 843D90 802411C0 4680A520 */ cvt.s.w $f20, $f20 -/* 843D94 802411C4 4600A002 */ mul.s $f0, $f20, $f0 -/* 843D98 802411C8 00000000 */ nop -/* 843D9C 802411CC 0240202D */ daddu $a0, $s2, $zero -/* 843DA0 802411D0 44901000 */ mtc1 $s0, $f2 -/* 843DA4 802411D4 00000000 */ nop -/* 843DA8 802411D8 468010A0 */ cvt.s.w $f2, $f2 -/* 843DAC 802411DC 46001081 */ sub.s $f2, $f2, $f0 -/* 843DB0 802411E0 3C05F4AC */ lui $a1, 0xf4ac -/* 843DB4 802411E4 4600110D */ trunc.w.s $f4, $f2 -/* 843DB8 802411E8 44102000 */ mfc1 $s0, $f4 -/* 843DBC 802411EC 0C0B1EAF */ jal get_variable -/* 843DC0 802411F0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 843DC4 802411F4 4600B306 */ mov.s $f12, $f22 -/* 843DC8 802411F8 0C00A8BB */ jal sin_deg -/* 843DCC 802411FC 0040882D */ daddu $s1, $v0, $zero -/* 843DD0 80241200 4600A502 */ mul.s $f20, $f20, $f0 -/* 843DD4 80241204 00000000 */ nop -/* 843DD8 80241208 0240202D */ daddu $a0, $s2, $zero -/* 843DDC 8024120C 44910000 */ mtc1 $s1, $f0 -/* 843DE0 80241210 00000000 */ nop -/* 843DE4 80241214 46800020 */ cvt.s.w $f0, $f0 -/* 843DE8 80241218 46140001 */ sub.s $f0, $f0, $f20 -/* 843DEC 8024121C 0280282D */ daddu $a1, $s4, $zero -/* 843DF0 80241220 02173023 */ subu $a2, $s0, $s7 -/* 843DF4 80241224 4600010D */ trunc.w.s $f4, $f0 -/* 843DF8 80241228 44102000 */ mfc1 $s0, $f4 -/* 843DFC 8024122C 0C0B2026 */ jal set_variable -/* 843E00 80241230 02168023 */ subu $s0, $s0, $s6 -/* 843E04 80241234 0240202D */ daddu $a0, $s2, $zero -/* 843E08 80241238 02A0282D */ daddu $a1, $s5, $zero -/* 843E0C 8024123C 0C0B2026 */ jal set_variable -/* 843E10 80241240 0200302D */ daddu $a2, $s0, $zero -/* 843E14 80241244 8FBF0030 */ lw $ra, 0x30($sp) -/* 843E18 80241248 8FB7002C */ lw $s7, 0x2c($sp) -/* 843E1C 8024124C 8FB60028 */ lw $s6, 0x28($sp) -/* 843E20 80241250 8FB50024 */ lw $s5, 0x24($sp) -/* 843E24 80241254 8FB40020 */ lw $s4, 0x20($sp) -/* 843E28 80241258 8FB3001C */ lw $s3, 0x1c($sp) -/* 843E2C 8024125C 8FB20018 */ lw $s2, 0x18($sp) -/* 843E30 80241260 8FB10014 */ lw $s1, 0x14($sp) -/* 843E34 80241264 8FB00010 */ lw $s0, 0x10($sp) -/* 843E38 80241268 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 843E3C 8024126C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 843E40 80241270 24020002 */ addiu $v0, $zero, 2 -/* 843E44 80241274 03E00008 */ jr $ra -/* 843E48 80241278 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s deleted file mode 100644 index 07ecacde2e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241FA0_854110.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FA0_854110 -/* 854110 80241FA0 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 854114 80241FA4 AFB20018 */ sw $s2, 0x18($sp) -/* 854118 80241FA8 0080902D */ daddu $s2, $a0, $zero -/* 85411C 80241FAC AFBF0030 */ sw $ra, 0x30($sp) -/* 854120 80241FB0 AFB7002C */ sw $s7, 0x2c($sp) -/* 854124 80241FB4 AFB60028 */ sw $s6, 0x28($sp) -/* 854128 80241FB8 AFB50024 */ sw $s5, 0x24($sp) -/* 85412C 80241FBC AFB40020 */ sw $s4, 0x20($sp) -/* 854130 80241FC0 AFB3001C */ sw $s3, 0x1c($sp) -/* 854134 80241FC4 AFB10014 */ sw $s1, 0x14($sp) -/* 854138 80241FC8 AFB00010 */ sw $s0, 0x10($sp) -/* 85413C 80241FCC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 854140 80241FD0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 854144 80241FD4 8E50000C */ lw $s0, 0xc($s2) -/* 854148 80241FD8 8E050000 */ lw $a1, ($s0) -/* 85414C 80241FDC 0C0B1EAF */ jal get_variable -/* 854150 80241FE0 26100004 */ addiu $s0, $s0, 4 -/* 854154 80241FE4 8E050000 */ lw $a1, ($s0) -/* 854158 80241FE8 26100004 */ addiu $s0, $s0, 4 -/* 85415C 80241FEC 0240202D */ daddu $a0, $s2, $zero -/* 854160 80241FF0 0C0B1EAF */ jal get_variable -/* 854164 80241FF4 0040B82D */ daddu $s7, $v0, $zero -/* 854168 80241FF8 8E050000 */ lw $a1, ($s0) -/* 85416C 80241FFC 26100004 */ addiu $s0, $s0, 4 -/* 854170 80242000 0240202D */ daddu $a0, $s2, $zero -/* 854174 80242004 0C0B1EAF */ jal get_variable -/* 854178 80242008 0040B02D */ daddu $s6, $v0, $zero -/* 85417C 8024200C 0240202D */ daddu $a0, $s2, $zero -/* 854180 80242010 3C05F4AC */ lui $a1, 0xf4ac -/* 854184 80242014 34A5D481 */ ori $a1, $a1, 0xd481 -/* 854188 80242018 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 85418C 8024201C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 854190 80242020 8E140000 */ lw $s4, ($s0) -/* 854194 80242024 00061880 */ sll $v1, $a2, 2 -/* 854198 80242028 00661821 */ addu $v1, $v1, $a2 -/* 85419C 8024202C 00031880 */ sll $v1, $v1, 2 -/* 8541A0 80242030 00661823 */ subu $v1, $v1, $a2 -/* 8541A4 80242034 000330C0 */ sll $a2, $v1, 3 -/* 8541A8 80242038 00661821 */ addu $v1, $v1, $a2 -/* 8541AC 8024203C 000318C0 */ sll $v1, $v1, 3 -/* 8541B0 80242040 3C01800B */ lui $at, 0x800b -/* 8541B4 80242044 00230821 */ addu $at, $at, $v1 -/* 8541B8 80242048 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 8541BC 8024204C 8E150004 */ lw $s5, 4($s0) -/* 8541C0 80242050 4600010D */ trunc.w.s $f4, $f0 -/* 8541C4 80242054 44112000 */ mfc1 $s1, $f4 -/* 8541C8 80242058 0C0B1EAF */ jal get_variable -/* 8541CC 8024205C 0040982D */ daddu $s3, $v0, $zero -/* 8541D0 80242060 4491B000 */ mtc1 $s1, $f22 -/* 8541D4 80242064 00000000 */ nop -/* 8541D8 80242068 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8541DC 8024206C 4600B306 */ mov.s $f12, $f22 -/* 8541E0 80242070 0C00A8D4 */ jal cos_deg -/* 8541E4 80242074 0040802D */ daddu $s0, $v0, $zero -/* 8541E8 80242078 4493A000 */ mtc1 $s3, $f20 -/* 8541EC 8024207C 00000000 */ nop -/* 8541F0 80242080 4680A520 */ cvt.s.w $f20, $f20 -/* 8541F4 80242084 4600A002 */ mul.s $f0, $f20, $f0 -/* 8541F8 80242088 00000000 */ nop -/* 8541FC 8024208C 0240202D */ daddu $a0, $s2, $zero -/* 854200 80242090 44901000 */ mtc1 $s0, $f2 -/* 854204 80242094 00000000 */ nop -/* 854208 80242098 468010A0 */ cvt.s.w $f2, $f2 -/* 85420C 8024209C 46001081 */ sub.s $f2, $f2, $f0 -/* 854210 802420A0 3C05F4AC */ lui $a1, 0xf4ac -/* 854214 802420A4 4600110D */ trunc.w.s $f4, $f2 -/* 854218 802420A8 44102000 */ mfc1 $s0, $f4 -/* 85421C 802420AC 0C0B1EAF */ jal get_variable -/* 854220 802420B0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 854224 802420B4 4600B306 */ mov.s $f12, $f22 -/* 854228 802420B8 0C00A8BB */ jal sin_deg -/* 85422C 802420BC 0040882D */ daddu $s1, $v0, $zero -/* 854230 802420C0 4600A502 */ mul.s $f20, $f20, $f0 -/* 854234 802420C4 00000000 */ nop -/* 854238 802420C8 0240202D */ daddu $a0, $s2, $zero -/* 85423C 802420CC 44910000 */ mtc1 $s1, $f0 -/* 854240 802420D0 00000000 */ nop -/* 854244 802420D4 46800020 */ cvt.s.w $f0, $f0 -/* 854248 802420D8 46140001 */ sub.s $f0, $f0, $f20 -/* 85424C 802420DC 0280282D */ daddu $a1, $s4, $zero -/* 854250 802420E0 02173023 */ subu $a2, $s0, $s7 -/* 854254 802420E4 4600010D */ trunc.w.s $f4, $f0 -/* 854258 802420E8 44102000 */ mfc1 $s0, $f4 -/* 85425C 802420EC 0C0B2026 */ jal set_variable -/* 854260 802420F0 02168023 */ subu $s0, $s0, $s6 -/* 854264 802420F4 0240202D */ daddu $a0, $s2, $zero -/* 854268 802420F8 02A0282D */ daddu $a1, $s5, $zero -/* 85426C 802420FC 0C0B2026 */ jal set_variable -/* 854270 80242100 0200302D */ daddu $a2, $s0, $zero -/* 854274 80242104 8FBF0030 */ lw $ra, 0x30($sp) -/* 854278 80242108 8FB7002C */ lw $s7, 0x2c($sp) -/* 85427C 8024210C 8FB60028 */ lw $s6, 0x28($sp) -/* 854280 80242110 8FB50024 */ lw $s5, 0x24($sp) -/* 854284 80242114 8FB40020 */ lw $s4, 0x20($sp) -/* 854288 80242118 8FB3001C */ lw $s3, 0x1c($sp) -/* 85428C 8024211C 8FB20018 */ lw $s2, 0x18($sp) -/* 854290 80242120 8FB10014 */ lw $s1, 0x14($sp) -/* 854294 80242124 8FB00010 */ lw $s0, 0x10($sp) -/* 854298 80242128 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 85429C 8024212C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 8542A0 80242130 24020002 */ addiu $v0, $zero, 2 -/* 8542A4 80242134 03E00008 */ jr $ra -/* 8542A8 80242138 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s deleted file mode 100644 index abdcd550d0..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802419E8_9C6DC8.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419E8_9C6DC8 -/* 9C6DC8 802419E8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9C6DCC 802419EC AFB20018 */ sw $s2, 0x18($sp) -/* 9C6DD0 802419F0 0080902D */ daddu $s2, $a0, $zero -/* 9C6DD4 802419F4 AFBF0030 */ sw $ra, 0x30($sp) -/* 9C6DD8 802419F8 AFB7002C */ sw $s7, 0x2c($sp) -/* 9C6DDC 802419FC AFB60028 */ sw $s6, 0x28($sp) -/* 9C6DE0 80241A00 AFB50024 */ sw $s5, 0x24($sp) -/* 9C6DE4 80241A04 AFB40020 */ sw $s4, 0x20($sp) -/* 9C6DE8 80241A08 AFB3001C */ sw $s3, 0x1c($sp) -/* 9C6DEC 80241A0C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6DF0 80241A10 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6DF4 80241A14 F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9C6DF8 80241A18 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9C6DFC 80241A1C 8E50000C */ lw $s0, 0xc($s2) -/* 9C6E00 80241A20 8E050000 */ lw $a1, ($s0) -/* 9C6E04 80241A24 0C0B1EAF */ jal get_variable -/* 9C6E08 80241A28 26100004 */ addiu $s0, $s0, 4 -/* 9C6E0C 80241A2C 8E050000 */ lw $a1, ($s0) -/* 9C6E10 80241A30 26100004 */ addiu $s0, $s0, 4 -/* 9C6E14 80241A34 0240202D */ daddu $a0, $s2, $zero -/* 9C6E18 80241A38 0C0B1EAF */ jal get_variable -/* 9C6E1C 80241A3C 0040B82D */ daddu $s7, $v0, $zero -/* 9C6E20 80241A40 8E050000 */ lw $a1, ($s0) -/* 9C6E24 80241A44 26100004 */ addiu $s0, $s0, 4 -/* 9C6E28 80241A48 0240202D */ daddu $a0, $s2, $zero -/* 9C6E2C 80241A4C 0C0B1EAF */ jal get_variable -/* 9C6E30 80241A50 0040B02D */ daddu $s6, $v0, $zero -/* 9C6E34 80241A54 0240202D */ daddu $a0, $s2, $zero -/* 9C6E38 80241A58 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6E3C 80241A5C 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9C6E40 80241A60 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 9C6E44 80241A64 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 9C6E48 80241A68 8E140000 */ lw $s4, ($s0) -/* 9C6E4C 80241A6C 00061880 */ sll $v1, $a2, 2 -/* 9C6E50 80241A70 00661821 */ addu $v1, $v1, $a2 -/* 9C6E54 80241A74 00031880 */ sll $v1, $v1, 2 -/* 9C6E58 80241A78 00661823 */ subu $v1, $v1, $a2 -/* 9C6E5C 80241A7C 000330C0 */ sll $a2, $v1, 3 -/* 9C6E60 80241A80 00661821 */ addu $v1, $v1, $a2 -/* 9C6E64 80241A84 000318C0 */ sll $v1, $v1, 3 -/* 9C6E68 80241A88 3C01800B */ lui $at, 0x800b -/* 9C6E6C 80241A8C 00230821 */ addu $at, $at, $v1 -/* 9C6E70 80241A90 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9C6E74 80241A94 8E150004 */ lw $s5, 4($s0) -/* 9C6E78 80241A98 4600010D */ trunc.w.s $f4, $f0 -/* 9C6E7C 80241A9C 44112000 */ mfc1 $s1, $f4 -/* 9C6E80 80241AA0 0C0B1EAF */ jal get_variable -/* 9C6E84 80241AA4 0040982D */ daddu $s3, $v0, $zero -/* 9C6E88 80241AA8 4491B000 */ mtc1 $s1, $f22 -/* 9C6E8C 80241AAC 00000000 */ nop -/* 9C6E90 80241AB0 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9C6E94 80241AB4 4600B306 */ mov.s $f12, $f22 -/* 9C6E98 80241AB8 0C00A8D4 */ jal cos_deg -/* 9C6E9C 80241ABC 0040802D */ daddu $s0, $v0, $zero -/* 9C6EA0 80241AC0 4493A000 */ mtc1 $s3, $f20 -/* 9C6EA4 80241AC4 00000000 */ nop -/* 9C6EA8 80241AC8 4680A520 */ cvt.s.w $f20, $f20 -/* 9C6EAC 80241ACC 4600A002 */ mul.s $f0, $f20, $f0 -/* 9C6EB0 80241AD0 00000000 */ nop -/* 9C6EB4 80241AD4 0240202D */ daddu $a0, $s2, $zero -/* 9C6EB8 80241AD8 44901000 */ mtc1 $s0, $f2 -/* 9C6EBC 80241ADC 00000000 */ nop -/* 9C6EC0 80241AE0 468010A0 */ cvt.s.w $f2, $f2 -/* 9C6EC4 80241AE4 46001081 */ sub.s $f2, $f2, $f0 -/* 9C6EC8 80241AE8 3C05F4AC */ lui $a1, 0xf4ac -/* 9C6ECC 80241AEC 4600110D */ trunc.w.s $f4, $f2 -/* 9C6ED0 80241AF0 44102000 */ mfc1 $s0, $f4 -/* 9C6ED4 80241AF4 0C0B1EAF */ jal get_variable -/* 9C6ED8 80241AF8 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9C6EDC 80241AFC 4600B306 */ mov.s $f12, $f22 -/* 9C6EE0 80241B00 0C00A8BB */ jal sin_deg -/* 9C6EE4 80241B04 0040882D */ daddu $s1, $v0, $zero -/* 9C6EE8 80241B08 4600A502 */ mul.s $f20, $f20, $f0 -/* 9C6EEC 80241B0C 00000000 */ nop -/* 9C6EF0 80241B10 0240202D */ daddu $a0, $s2, $zero -/* 9C6EF4 80241B14 44910000 */ mtc1 $s1, $f0 -/* 9C6EF8 80241B18 00000000 */ nop -/* 9C6EFC 80241B1C 46800020 */ cvt.s.w $f0, $f0 -/* 9C6F00 80241B20 46140001 */ sub.s $f0, $f0, $f20 -/* 9C6F04 80241B24 0280282D */ daddu $a1, $s4, $zero -/* 9C6F08 80241B28 02173023 */ subu $a2, $s0, $s7 -/* 9C6F0C 80241B2C 4600010D */ trunc.w.s $f4, $f0 -/* 9C6F10 80241B30 44102000 */ mfc1 $s0, $f4 -/* 9C6F14 80241B34 0C0B2026 */ jal set_variable -/* 9C6F18 80241B38 02168023 */ subu $s0, $s0, $s6 -/* 9C6F1C 80241B3C 0240202D */ daddu $a0, $s2, $zero -/* 9C6F20 80241B40 02A0282D */ daddu $a1, $s5, $zero -/* 9C6F24 80241B44 0C0B2026 */ jal set_variable -/* 9C6F28 80241B48 0200302D */ daddu $a2, $s0, $zero -/* 9C6F2C 80241B4C 8FBF0030 */ lw $ra, 0x30($sp) -/* 9C6F30 80241B50 8FB7002C */ lw $s7, 0x2c($sp) -/* 9C6F34 80241B54 8FB60028 */ lw $s6, 0x28($sp) -/* 9C6F38 80241B58 8FB50024 */ lw $s5, 0x24($sp) -/* 9C6F3C 80241B5C 8FB40020 */ lw $s4, 0x20($sp) -/* 9C6F40 80241B60 8FB3001C */ lw $s3, 0x1c($sp) -/* 9C6F44 80241B64 8FB20018 */ lw $s2, 0x18($sp) -/* 9C6F48 80241B68 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6F4C 80241B6C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6F50 80241B70 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9C6F54 80241B74 D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9C6F58 80241B78 24020002 */ addiu $v0, $zero, 2 -/* 9C6F5C 80241B7C 03E00008 */ jr $ra -/* 9C6F60 80241B80 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s deleted file mode 100644 index 9de74ff0f4..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242590_9D95B0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242590_9D95B0 -/* 9D95B0 80242590 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* 9D95B4 80242594 AFB20018 */ sw $s2, 0x18($sp) -/* 9D95B8 80242598 0080902D */ daddu $s2, $a0, $zero -/* 9D95BC 8024259C AFBF0030 */ sw $ra, 0x30($sp) -/* 9D95C0 802425A0 AFB7002C */ sw $s7, 0x2c($sp) -/* 9D95C4 802425A4 AFB60028 */ sw $s6, 0x28($sp) -/* 9D95C8 802425A8 AFB50024 */ sw $s5, 0x24($sp) -/* 9D95CC 802425AC AFB40020 */ sw $s4, 0x20($sp) -/* 9D95D0 802425B0 AFB3001C */ sw $s3, 0x1c($sp) -/* 9D95D4 802425B4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D95D8 802425B8 AFB00010 */ sw $s0, 0x10($sp) -/* 9D95DC 802425BC F7B60040 */ sdc1 $f22, 0x40($sp) -/* 9D95E0 802425C0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* 9D95E4 802425C4 8E50000C */ lw $s0, 0xc($s2) -/* 9D95E8 802425C8 8E050000 */ lw $a1, ($s0) -/* 9D95EC 802425CC 0C0B1EAF */ jal get_variable -/* 9D95F0 802425D0 26100004 */ addiu $s0, $s0, 4 -/* 9D95F4 802425D4 8E050000 */ lw $a1, ($s0) -/* 9D95F8 802425D8 26100004 */ addiu $s0, $s0, 4 -/* 9D95FC 802425DC 0240202D */ daddu $a0, $s2, $zero -/* 9D9600 802425E0 0C0B1EAF */ jal get_variable -/* 9D9604 802425E4 0040B82D */ daddu $s7, $v0, $zero -/* 9D9608 802425E8 8E050000 */ lw $a1, ($s0) -/* 9D960C 802425EC 26100004 */ addiu $s0, $s0, 4 -/* 9D9610 802425F0 0240202D */ daddu $a0, $s2, $zero -/* 9D9614 802425F4 0C0B1EAF */ jal get_variable -/* 9D9618 802425F8 0040B02D */ daddu $s6, $v0, $zero -/* 9D961C 802425FC 0240202D */ daddu $a0, $s2, $zero -/* 9D9620 80242600 3C05F4AC */ lui $a1, 0xf4ac -/* 9D9624 80242604 34A5D481 */ ori $a1, $a1, 0xd481 -/* 9D9628 80242608 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* 9D962C 8024260C 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* 9D9630 80242610 8E140000 */ lw $s4, ($s0) -/* 9D9634 80242614 00061880 */ sll $v1, $a2, 2 -/* 9D9638 80242618 00661821 */ addu $v1, $v1, $a2 -/* 9D963C 8024261C 00031880 */ sll $v1, $v1, 2 -/* 9D9640 80242620 00661823 */ subu $v1, $v1, $a2 -/* 9D9644 80242624 000330C0 */ sll $a2, $v1, 3 -/* 9D9648 80242628 00661821 */ addu $v1, $v1, $a2 -/* 9D964C 8024262C 000318C0 */ sll $v1, $v1, 3 -/* 9D9650 80242630 3C01800B */ lui $at, 0x800b -/* 9D9654 80242634 00230821 */ addu $at, $at, $v1 -/* 9D9658 80242638 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* 9D965C 8024263C 8E150004 */ lw $s5, 4($s0) -/* 9D9660 80242640 4600010D */ trunc.w.s $f4, $f0 -/* 9D9664 80242644 44112000 */ mfc1 $s1, $f4 -/* 9D9668 80242648 0C0B1EAF */ jal get_variable -/* 9D966C 8024264C 0040982D */ daddu $s3, $v0, $zero -/* 9D9670 80242650 4491B000 */ mtc1 $s1, $f22 -/* 9D9674 80242654 00000000 */ nop -/* 9D9678 80242658 4680B5A0 */ cvt.s.w $f22, $f22 -/* 9D967C 8024265C 4600B306 */ mov.s $f12, $f22 -/* 9D9680 80242660 0C00A8D4 */ jal cos_deg -/* 9D9684 80242664 0040802D */ daddu $s0, $v0, $zero -/* 9D9688 80242668 4493A000 */ mtc1 $s3, $f20 -/* 9D968C 8024266C 00000000 */ nop -/* 9D9690 80242670 4680A520 */ cvt.s.w $f20, $f20 -/* 9D9694 80242674 4600A002 */ mul.s $f0, $f20, $f0 -/* 9D9698 80242678 00000000 */ nop -/* 9D969C 8024267C 0240202D */ daddu $a0, $s2, $zero -/* 9D96A0 80242680 44901000 */ mtc1 $s0, $f2 -/* 9D96A4 80242684 00000000 */ nop -/* 9D96A8 80242688 468010A0 */ cvt.s.w $f2, $f2 -/* 9D96AC 8024268C 46001081 */ sub.s $f2, $f2, $f0 -/* 9D96B0 80242690 3C05F4AC */ lui $a1, 0xf4ac -/* 9D96B4 80242694 4600110D */ trunc.w.s $f4, $f2 -/* 9D96B8 80242698 44102000 */ mfc1 $s0, $f4 -/* 9D96BC 8024269C 0C0B1EAF */ jal get_variable -/* 9D96C0 802426A0 34A5D483 */ ori $a1, $a1, 0xd483 -/* 9D96C4 802426A4 4600B306 */ mov.s $f12, $f22 -/* 9D96C8 802426A8 0C00A8BB */ jal sin_deg -/* 9D96CC 802426AC 0040882D */ daddu $s1, $v0, $zero -/* 9D96D0 802426B0 4600A502 */ mul.s $f20, $f20, $f0 -/* 9D96D4 802426B4 00000000 */ nop -/* 9D96D8 802426B8 0240202D */ daddu $a0, $s2, $zero -/* 9D96DC 802426BC 44910000 */ mtc1 $s1, $f0 -/* 9D96E0 802426C0 00000000 */ nop -/* 9D96E4 802426C4 46800020 */ cvt.s.w $f0, $f0 -/* 9D96E8 802426C8 46140001 */ sub.s $f0, $f0, $f20 -/* 9D96EC 802426CC 0280282D */ daddu $a1, $s4, $zero -/* 9D96F0 802426D0 02173023 */ subu $a2, $s0, $s7 -/* 9D96F4 802426D4 4600010D */ trunc.w.s $f4, $f0 -/* 9D96F8 802426D8 44102000 */ mfc1 $s0, $f4 -/* 9D96FC 802426DC 0C0B2026 */ jal set_variable -/* 9D9700 802426E0 02168023 */ subu $s0, $s0, $s6 -/* 9D9704 802426E4 0240202D */ daddu $a0, $s2, $zero -/* 9D9708 802426E8 02A0282D */ daddu $a1, $s5, $zero -/* 9D970C 802426EC 0C0B2026 */ jal set_variable -/* 9D9710 802426F0 0200302D */ daddu $a2, $s0, $zero -/* 9D9714 802426F4 8FBF0030 */ lw $ra, 0x30($sp) -/* 9D9718 802426F8 8FB7002C */ lw $s7, 0x2c($sp) -/* 9D971C 802426FC 8FB60028 */ lw $s6, 0x28($sp) -/* 9D9720 80242700 8FB50024 */ lw $s5, 0x24($sp) -/* 9D9724 80242704 8FB40020 */ lw $s4, 0x20($sp) -/* 9D9728 80242708 8FB3001C */ lw $s3, 0x1c($sp) -/* 9D972C 8024270C 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9730 80242710 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9734 80242714 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9738 80242718 D7B60040 */ ldc1 $f22, 0x40($sp) -/* 9D973C 8024271C D7B40038 */ ldc1 $f20, 0x38($sp) -/* 9D9740 80242720 24020002 */ addiu $v0, $zero, 2 -/* 9D9744 80242724 03E00008 */ jr $ra -/* 9D9748 80242728 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s deleted file mode 100644 index 366f4cab7e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241380_CF8EF0.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241380_CF8EF0 -/* CF8EF0 80241380 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* CF8EF4 80241384 AFB20018 */ sw $s2, 0x18($sp) -/* CF8EF8 80241388 0080902D */ daddu $s2, $a0, $zero -/* CF8EFC 8024138C AFBF0030 */ sw $ra, 0x30($sp) -/* CF8F00 80241390 AFB7002C */ sw $s7, 0x2c($sp) -/* CF8F04 80241394 AFB60028 */ sw $s6, 0x28($sp) -/* CF8F08 80241398 AFB50024 */ sw $s5, 0x24($sp) -/* CF8F0C 8024139C AFB40020 */ sw $s4, 0x20($sp) -/* CF8F10 802413A0 AFB3001C */ sw $s3, 0x1c($sp) -/* CF8F14 802413A4 AFB10014 */ sw $s1, 0x14($sp) -/* CF8F18 802413A8 AFB00010 */ sw $s0, 0x10($sp) -/* CF8F1C 802413AC F7B60040 */ sdc1 $f22, 0x40($sp) -/* CF8F20 802413B0 F7B40038 */ sdc1 $f20, 0x38($sp) -/* CF8F24 802413B4 8E50000C */ lw $s0, 0xc($s2) -/* CF8F28 802413B8 8E050000 */ lw $a1, ($s0) -/* CF8F2C 802413BC 0C0B1EAF */ jal get_variable -/* CF8F30 802413C0 26100004 */ addiu $s0, $s0, 4 -/* CF8F34 802413C4 8E050000 */ lw $a1, ($s0) -/* CF8F38 802413C8 26100004 */ addiu $s0, $s0, 4 -/* CF8F3C 802413CC 0240202D */ daddu $a0, $s2, $zero -/* CF8F40 802413D0 0C0B1EAF */ jal get_variable -/* CF8F44 802413D4 0040B82D */ daddu $s7, $v0, $zero -/* CF8F48 802413D8 8E050000 */ lw $a1, ($s0) -/* CF8F4C 802413DC 26100004 */ addiu $s0, $s0, 4 -/* CF8F50 802413E0 0240202D */ daddu $a0, $s2, $zero -/* CF8F54 802413E4 0C0B1EAF */ jal get_variable -/* CF8F58 802413E8 0040B02D */ daddu $s6, $v0, $zero -/* CF8F5C 802413EC 0240202D */ daddu $a0, $s2, $zero -/* CF8F60 802413F0 3C05F4AC */ lui $a1, 0xf4ac -/* CF8F64 802413F4 34A5D481 */ ori $a1, $a1, 0xd481 -/* CF8F68 802413F8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* CF8F6C 802413FC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* CF8F70 80241400 8E140000 */ lw $s4, ($s0) -/* CF8F74 80241404 00061880 */ sll $v1, $a2, 2 -/* CF8F78 80241408 00661821 */ addu $v1, $v1, $a2 -/* CF8F7C 8024140C 00031880 */ sll $v1, $v1, 2 -/* CF8F80 80241410 00661823 */ subu $v1, $v1, $a2 -/* CF8F84 80241414 000330C0 */ sll $a2, $v1, 3 -/* CF8F88 80241418 00661821 */ addu $v1, $v1, $a2 -/* CF8F8C 8024141C 000318C0 */ sll $v1, $v1, 3 -/* CF8F90 80241420 3C01800B */ lui $at, 0x800b -/* CF8F94 80241424 00230821 */ addu $at, $at, $v1 -/* CF8F98 80241428 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* CF8F9C 8024142C 8E150004 */ lw $s5, 4($s0) -/* CF8FA0 80241430 4600010D */ trunc.w.s $f4, $f0 -/* CF8FA4 80241434 44112000 */ mfc1 $s1, $f4 -/* CF8FA8 80241438 0C0B1EAF */ jal get_variable -/* CF8FAC 8024143C 0040982D */ daddu $s3, $v0, $zero -/* CF8FB0 80241440 4491B000 */ mtc1 $s1, $f22 -/* CF8FB4 80241444 00000000 */ nop -/* CF8FB8 80241448 4680B5A0 */ cvt.s.w $f22, $f22 -/* CF8FBC 8024144C 4600B306 */ mov.s $f12, $f22 -/* CF8FC0 80241450 0C00A8D4 */ jal cos_deg -/* CF8FC4 80241454 0040802D */ daddu $s0, $v0, $zero -/* CF8FC8 80241458 4493A000 */ mtc1 $s3, $f20 -/* CF8FCC 8024145C 00000000 */ nop -/* CF8FD0 80241460 4680A520 */ cvt.s.w $f20, $f20 -/* CF8FD4 80241464 4600A002 */ mul.s $f0, $f20, $f0 -/* CF8FD8 80241468 00000000 */ nop -/* CF8FDC 8024146C 0240202D */ daddu $a0, $s2, $zero -/* CF8FE0 80241470 44901000 */ mtc1 $s0, $f2 -/* CF8FE4 80241474 00000000 */ nop -/* CF8FE8 80241478 468010A0 */ cvt.s.w $f2, $f2 -/* CF8FEC 8024147C 46001081 */ sub.s $f2, $f2, $f0 -/* CF8FF0 80241480 3C05F4AC */ lui $a1, 0xf4ac -/* CF8FF4 80241484 4600110D */ trunc.w.s $f4, $f2 -/* CF8FF8 80241488 44102000 */ mfc1 $s0, $f4 -/* CF8FFC 8024148C 0C0B1EAF */ jal get_variable -/* CF9000 80241490 34A5D483 */ ori $a1, $a1, 0xd483 -/* CF9004 80241494 4600B306 */ mov.s $f12, $f22 -/* CF9008 80241498 0C00A8BB */ jal sin_deg -/* CF900C 8024149C 0040882D */ daddu $s1, $v0, $zero -/* CF9010 802414A0 4600A502 */ mul.s $f20, $f20, $f0 -/* CF9014 802414A4 00000000 */ nop -/* CF9018 802414A8 0240202D */ daddu $a0, $s2, $zero -/* CF901C 802414AC 44910000 */ mtc1 $s1, $f0 -/* CF9020 802414B0 00000000 */ nop -/* CF9024 802414B4 46800020 */ cvt.s.w $f0, $f0 -/* CF9028 802414B8 46140001 */ sub.s $f0, $f0, $f20 -/* CF902C 802414BC 0280282D */ daddu $a1, $s4, $zero -/* CF9030 802414C0 02173023 */ subu $a2, $s0, $s7 -/* CF9034 802414C4 4600010D */ trunc.w.s $f4, $f0 -/* CF9038 802414C8 44102000 */ mfc1 $s0, $f4 -/* CF903C 802414CC 0C0B2026 */ jal set_variable -/* CF9040 802414D0 02168023 */ subu $s0, $s0, $s6 -/* CF9044 802414D4 0240202D */ daddu $a0, $s2, $zero -/* CF9048 802414D8 02A0282D */ daddu $a1, $s5, $zero -/* CF904C 802414DC 0C0B2026 */ jal set_variable -/* CF9050 802414E0 0200302D */ daddu $a2, $s0, $zero -/* CF9054 802414E4 8FBF0030 */ lw $ra, 0x30($sp) -/* CF9058 802414E8 8FB7002C */ lw $s7, 0x2c($sp) -/* CF905C 802414EC 8FB60028 */ lw $s6, 0x28($sp) -/* CF9060 802414F0 8FB50024 */ lw $s5, 0x24($sp) -/* CF9064 802414F4 8FB40020 */ lw $s4, 0x20($sp) -/* CF9068 802414F8 8FB3001C */ lw $s3, 0x1c($sp) -/* CF906C 802414FC 8FB20018 */ lw $s2, 0x18($sp) -/* CF9070 80241500 8FB10014 */ lw $s1, 0x14($sp) -/* CF9074 80241504 8FB00010 */ lw $s0, 0x10($sp) -/* CF9078 80241508 D7B60040 */ ldc1 $f22, 0x40($sp) -/* CF907C 8024150C D7B40038 */ ldc1 $f20, 0x38($sp) -/* CF9080 80241510 24020002 */ addiu $v0, $zero, 2 -/* CF9084 80241514 03E00008 */ jr $ra -/* CF9088 80241518 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s deleted file mode 100644 index 26ee6de3ae..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802417AC_D06EDC.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802417AC_D06EDC -/* D06EDC 802417AC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D06EE0 802417B0 AFB20018 */ sw $s2, 0x18($sp) -/* D06EE4 802417B4 0080902D */ daddu $s2, $a0, $zero -/* D06EE8 802417B8 AFBF0030 */ sw $ra, 0x30($sp) -/* D06EEC 802417BC AFB7002C */ sw $s7, 0x2c($sp) -/* D06EF0 802417C0 AFB60028 */ sw $s6, 0x28($sp) -/* D06EF4 802417C4 AFB50024 */ sw $s5, 0x24($sp) -/* D06EF8 802417C8 AFB40020 */ sw $s4, 0x20($sp) -/* D06EFC 802417CC AFB3001C */ sw $s3, 0x1c($sp) -/* D06F00 802417D0 AFB10014 */ sw $s1, 0x14($sp) -/* D06F04 802417D4 AFB00010 */ sw $s0, 0x10($sp) -/* D06F08 802417D8 F7B60040 */ sdc1 $f22, 0x40($sp) -/* D06F0C 802417DC F7B40038 */ sdc1 $f20, 0x38($sp) -/* D06F10 802417E0 8E50000C */ lw $s0, 0xc($s2) -/* D06F14 802417E4 8E050000 */ lw $a1, ($s0) -/* D06F18 802417E8 0C0B1EAF */ jal get_variable -/* D06F1C 802417EC 26100004 */ addiu $s0, $s0, 4 -/* D06F20 802417F0 8E050000 */ lw $a1, ($s0) -/* D06F24 802417F4 26100004 */ addiu $s0, $s0, 4 -/* D06F28 802417F8 0240202D */ daddu $a0, $s2, $zero -/* D06F2C 802417FC 0C0B1EAF */ jal get_variable -/* D06F30 80241800 0040B82D */ daddu $s7, $v0, $zero -/* D06F34 80241804 8E050000 */ lw $a1, ($s0) -/* D06F38 80241808 26100004 */ addiu $s0, $s0, 4 -/* D06F3C 8024180C 0240202D */ daddu $a0, $s2, $zero -/* D06F40 80241810 0C0B1EAF */ jal get_variable -/* D06F44 80241814 0040B02D */ daddu $s6, $v0, $zero -/* D06F48 80241818 0240202D */ daddu $a0, $s2, $zero -/* D06F4C 8024181C 3C05F4AC */ lui $a1, 0xf4ac -/* D06F50 80241820 34A5D481 */ ori $a1, $a1, 0xd481 -/* D06F54 80241824 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* D06F58 80241828 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* D06F5C 8024182C 8E140000 */ lw $s4, ($s0) -/* D06F60 80241830 00061880 */ sll $v1, $a2, 2 -/* D06F64 80241834 00661821 */ addu $v1, $v1, $a2 -/* D06F68 80241838 00031880 */ sll $v1, $v1, 2 -/* D06F6C 8024183C 00661823 */ subu $v1, $v1, $a2 -/* D06F70 80241840 000330C0 */ sll $a2, $v1, 3 -/* D06F74 80241844 00661821 */ addu $v1, $v1, $a2 -/* D06F78 80241848 000318C0 */ sll $v1, $v1, 3 -/* D06F7C 8024184C 3C01800B */ lui $at, 0x800b -/* D06F80 80241850 00230821 */ addu $at, $at, $v1 -/* D06F84 80241854 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D06F88 80241858 8E150004 */ lw $s5, 4($s0) -/* D06F8C 8024185C 4600010D */ trunc.w.s $f4, $f0 -/* D06F90 80241860 44112000 */ mfc1 $s1, $f4 -/* D06F94 80241864 0C0B1EAF */ jal get_variable -/* D06F98 80241868 0040982D */ daddu $s3, $v0, $zero -/* D06F9C 8024186C 4491B000 */ mtc1 $s1, $f22 -/* D06FA0 80241870 00000000 */ nop -/* D06FA4 80241874 4680B5A0 */ cvt.s.w $f22, $f22 -/* D06FA8 80241878 4600B306 */ mov.s $f12, $f22 -/* D06FAC 8024187C 0C00A8D4 */ jal cos_deg -/* D06FB0 80241880 0040802D */ daddu $s0, $v0, $zero -/* D06FB4 80241884 4493A000 */ mtc1 $s3, $f20 -/* D06FB8 80241888 00000000 */ nop -/* D06FBC 8024188C 4680A520 */ cvt.s.w $f20, $f20 -/* D06FC0 80241890 4600A002 */ mul.s $f0, $f20, $f0 -/* D06FC4 80241894 00000000 */ nop -/* D06FC8 80241898 0240202D */ daddu $a0, $s2, $zero -/* D06FCC 8024189C 44901000 */ mtc1 $s0, $f2 -/* D06FD0 802418A0 00000000 */ nop -/* D06FD4 802418A4 468010A0 */ cvt.s.w $f2, $f2 -/* D06FD8 802418A8 46001081 */ sub.s $f2, $f2, $f0 -/* D06FDC 802418AC 3C05F4AC */ lui $a1, 0xf4ac -/* D06FE0 802418B0 4600110D */ trunc.w.s $f4, $f2 -/* D06FE4 802418B4 44102000 */ mfc1 $s0, $f4 -/* D06FE8 802418B8 0C0B1EAF */ jal get_variable -/* D06FEC 802418BC 34A5D483 */ ori $a1, $a1, 0xd483 -/* D06FF0 802418C0 4600B306 */ mov.s $f12, $f22 -/* D06FF4 802418C4 0C00A8BB */ jal sin_deg -/* D06FF8 802418C8 0040882D */ daddu $s1, $v0, $zero -/* D06FFC 802418CC 4600A502 */ mul.s $f20, $f20, $f0 -/* D07000 802418D0 00000000 */ nop -/* D07004 802418D4 0240202D */ daddu $a0, $s2, $zero -/* D07008 802418D8 44910000 */ mtc1 $s1, $f0 -/* D0700C 802418DC 00000000 */ nop -/* D07010 802418E0 46800020 */ cvt.s.w $f0, $f0 -/* D07014 802418E4 46140001 */ sub.s $f0, $f0, $f20 -/* D07018 802418E8 0280282D */ daddu $a1, $s4, $zero -/* D0701C 802418EC 02173023 */ subu $a2, $s0, $s7 -/* D07020 802418F0 4600010D */ trunc.w.s $f4, $f0 -/* D07024 802418F4 44102000 */ mfc1 $s0, $f4 -/* D07028 802418F8 0C0B2026 */ jal set_variable -/* D0702C 802418FC 02168023 */ subu $s0, $s0, $s6 -/* D07030 80241900 0240202D */ daddu $a0, $s2, $zero -/* D07034 80241904 02A0282D */ daddu $a1, $s5, $zero -/* D07038 80241908 0C0B2026 */ jal set_variable -/* D0703C 8024190C 0200302D */ daddu $a2, $s0, $zero -/* D07040 80241910 8FBF0030 */ lw $ra, 0x30($sp) -/* D07044 80241914 8FB7002C */ lw $s7, 0x2c($sp) -/* D07048 80241918 8FB60028 */ lw $s6, 0x28($sp) -/* D0704C 8024191C 8FB50024 */ lw $s5, 0x24($sp) -/* D07050 80241920 8FB40020 */ lw $s4, 0x20($sp) -/* D07054 80241924 8FB3001C */ lw $s3, 0x1c($sp) -/* D07058 80241928 8FB20018 */ lw $s2, 0x18($sp) -/* D0705C 8024192C 8FB10014 */ lw $s1, 0x14($sp) -/* D07060 80241930 8FB00010 */ lw $s0, 0x10($sp) -/* D07064 80241934 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D07068 80241938 D7B40038 */ ldc1 $f20, 0x38($sp) -/* D0706C 8024193C 24020002 */ addiu $v0, $zero, 2 -/* D07070 80241940 03E00008 */ jr $ra -/* D07074 80241944 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s deleted file mode 100644 index 546c2ed5db..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241450_D3BA20.s +++ /dev/null @@ -1,107 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241450_D3BA20 -/* D3BA20 80241450 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* D3BA24 80241454 AFB20018 */ sw $s2, 0x18($sp) -/* D3BA28 80241458 0080902D */ daddu $s2, $a0, $zero -/* D3BA2C 8024145C AFBF0030 */ sw $ra, 0x30($sp) -/* D3BA30 80241460 AFB7002C */ sw $s7, 0x2c($sp) -/* D3BA34 80241464 AFB60028 */ sw $s6, 0x28($sp) -/* D3BA38 80241468 AFB50024 */ sw $s5, 0x24($sp) -/* D3BA3C 8024146C AFB40020 */ sw $s4, 0x20($sp) -/* D3BA40 80241470 AFB3001C */ sw $s3, 0x1c($sp) -/* D3BA44 80241474 AFB10014 */ sw $s1, 0x14($sp) -/* D3BA48 80241478 AFB00010 */ sw $s0, 0x10($sp) -/* D3BA4C 8024147C F7B60040 */ sdc1 $f22, 0x40($sp) -/* D3BA50 80241480 F7B40038 */ sdc1 $f20, 0x38($sp) -/* D3BA54 80241484 8E50000C */ lw $s0, 0xc($s2) -/* D3BA58 80241488 8E050000 */ lw $a1, ($s0) -/* D3BA5C 8024148C 0C0B1EAF */ jal get_variable -/* D3BA60 80241490 26100004 */ addiu $s0, $s0, 4 -/* D3BA64 80241494 8E050000 */ lw $a1, ($s0) -/* D3BA68 80241498 26100004 */ addiu $s0, $s0, 4 -/* D3BA6C 8024149C 0240202D */ daddu $a0, $s2, $zero -/* D3BA70 802414A0 0C0B1EAF */ jal get_variable -/* D3BA74 802414A4 0040B82D */ daddu $s7, $v0, $zero -/* D3BA78 802414A8 8E050000 */ lw $a1, ($s0) -/* D3BA7C 802414AC 26100004 */ addiu $s0, $s0, 4 -/* D3BA80 802414B0 0240202D */ daddu $a0, $s2, $zero -/* D3BA84 802414B4 0C0B1EAF */ jal get_variable -/* D3BA88 802414B8 0040B02D */ daddu $s6, $v0, $zero -/* D3BA8C 802414BC 0240202D */ daddu $a0, $s2, $zero -/* D3BA90 802414C0 3C05F4AC */ lui $a1, 0xf4ac -/* D3BA94 802414C4 34A5D481 */ ori $a1, $a1, 0xd481 -/* D3BA98 802414C8 3C068007 */ lui $a2, %hi(gCurrentCameraID) -/* D3BA9C 802414CC 8CC67410 */ lw $a2, %lo(gCurrentCameraID)($a2) -/* D3BAA0 802414D0 8E140000 */ lw $s4, ($s0) -/* D3BAA4 802414D4 00061880 */ sll $v1, $a2, 2 -/* D3BAA8 802414D8 00661821 */ addu $v1, $v1, $a2 -/* D3BAAC 802414DC 00031880 */ sll $v1, $v1, 2 -/* D3BAB0 802414E0 00661823 */ subu $v1, $v1, $a2 -/* D3BAB4 802414E4 000330C0 */ sll $a2, $v1, 3 -/* D3BAB8 802414E8 00661821 */ addu $v1, $v1, $a2 -/* D3BABC 802414EC 000318C0 */ sll $v1, $v1, 3 -/* D3BAC0 802414F0 3C01800B */ lui $at, 0x800b -/* D3BAC4 802414F4 00230821 */ addu $at, $at, $v1 -/* D3BAC8 802414F8 C4201DEC */ lwc1 $f0, 0x1dec($at) -/* D3BACC 802414FC 8E150004 */ lw $s5, 4($s0) -/* D3BAD0 80241500 4600010D */ trunc.w.s $f4, $f0 -/* D3BAD4 80241504 44112000 */ mfc1 $s1, $f4 -/* D3BAD8 80241508 0C0B1EAF */ jal get_variable -/* D3BADC 8024150C 0040982D */ daddu $s3, $v0, $zero -/* D3BAE0 80241510 4491B000 */ mtc1 $s1, $f22 -/* D3BAE4 80241514 00000000 */ nop -/* D3BAE8 80241518 4680B5A0 */ cvt.s.w $f22, $f22 -/* D3BAEC 8024151C 4600B306 */ mov.s $f12, $f22 -/* D3BAF0 80241520 0C00A8D4 */ jal cos_deg -/* D3BAF4 80241524 0040802D */ daddu $s0, $v0, $zero -/* D3BAF8 80241528 4493A000 */ mtc1 $s3, $f20 -/* D3BAFC 8024152C 00000000 */ nop -/* D3BB00 80241530 4680A520 */ cvt.s.w $f20, $f20 -/* D3BB04 80241534 4600A002 */ mul.s $f0, $f20, $f0 -/* D3BB08 80241538 00000000 */ nop -/* D3BB0C 8024153C 0240202D */ daddu $a0, $s2, $zero -/* D3BB10 80241540 44901000 */ mtc1 $s0, $f2 -/* D3BB14 80241544 00000000 */ nop -/* D3BB18 80241548 468010A0 */ cvt.s.w $f2, $f2 -/* D3BB1C 8024154C 46001081 */ sub.s $f2, $f2, $f0 -/* D3BB20 80241550 3C05F4AC */ lui $a1, 0xf4ac -/* D3BB24 80241554 4600110D */ trunc.w.s $f4, $f2 -/* D3BB28 80241558 44102000 */ mfc1 $s0, $f4 -/* D3BB2C 8024155C 0C0B1EAF */ jal get_variable -/* D3BB30 80241560 34A5D483 */ ori $a1, $a1, 0xd483 -/* D3BB34 80241564 4600B306 */ mov.s $f12, $f22 -/* D3BB38 80241568 0C00A8BB */ jal sin_deg -/* D3BB3C 8024156C 0040882D */ daddu $s1, $v0, $zero -/* D3BB40 80241570 4600A502 */ mul.s $f20, $f20, $f0 -/* D3BB44 80241574 00000000 */ nop -/* D3BB48 80241578 0240202D */ daddu $a0, $s2, $zero -/* D3BB4C 8024157C 44910000 */ mtc1 $s1, $f0 -/* D3BB50 80241580 00000000 */ nop -/* D3BB54 80241584 46800020 */ cvt.s.w $f0, $f0 -/* D3BB58 80241588 46140001 */ sub.s $f0, $f0, $f20 -/* D3BB5C 8024158C 0280282D */ daddu $a1, $s4, $zero -/* D3BB60 80241590 02173023 */ subu $a2, $s0, $s7 -/* D3BB64 80241594 4600010D */ trunc.w.s $f4, $f0 -/* D3BB68 80241598 44102000 */ mfc1 $s0, $f4 -/* D3BB6C 8024159C 0C0B2026 */ jal set_variable -/* D3BB70 802415A0 02168023 */ subu $s0, $s0, $s6 -/* D3BB74 802415A4 0240202D */ daddu $a0, $s2, $zero -/* D3BB78 802415A8 02A0282D */ daddu $a1, $s5, $zero -/* D3BB7C 802415AC 0C0B2026 */ jal set_variable -/* D3BB80 802415B0 0200302D */ daddu $a2, $s0, $zero -/* D3BB84 802415B4 8FBF0030 */ lw $ra, 0x30($sp) -/* D3BB88 802415B8 8FB7002C */ lw $s7, 0x2c($sp) -/* D3BB8C 802415BC 8FB60028 */ lw $s6, 0x28($sp) -/* D3BB90 802415C0 8FB50024 */ lw $s5, 0x24($sp) -/* D3BB94 802415C4 8FB40020 */ lw $s4, 0x20($sp) -/* D3BB98 802415C8 8FB3001C */ lw $s3, 0x1c($sp) -/* D3BB9C 802415CC 8FB20018 */ lw $s2, 0x18($sp) -/* D3BBA0 802415D0 8FB10014 */ lw $s1, 0x14($sp) -/* D3BBA4 802415D4 8FB00010 */ lw $s0, 0x10($sp) -/* D3BBA8 802415D8 D7B60040 */ ldc1 $f22, 0x40($sp) -/* D3BBAC 802415DC D7B40038 */ ldc1 $f20, 0x38($sp) -/* D3BBB0 802415E0 24020002 */ addiu $v0, $zero, 2 -/* D3BBB4 802415E4 03E00008 */ jr $ra -/* D3BBB8 802415E8 27BD0048 */ addiu $sp, $sp, 0x48 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 22ec45c565..6c830f1a9b 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802420F0_95D2F0); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 7faca769c7..79119f7cc0 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240F80_96A140); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 7ace53be75..39e7b1af09 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -82,7 +82,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243124_A1E224); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 3b851deac3..ffbcd5fa49 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -74,7 +74,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242294_B2E704); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index dc4d3968e3..42110a0238 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -114,7 +114,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024281C_B373EC); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 4bd0517de5..dabb7538d5 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -56,7 +56,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241010_8B1080); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index ff665da249..fab9255b53 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802412B0_7EBFC0); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index b6d4d62a6e..a58a831e4e 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242B90_803410); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index bcd3e2f306..743a8f3e88 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242440_825700); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 570b5a783d..d9ecc7e362 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241130_832930); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 6b8e166615..720e4bb115 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802410E0_843CB0); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 4d8d5c54b7..988afe6e52 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241FA0_854110); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index af5f8a1f64..7d13ba69b1 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802419E8_9C6DC8); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 664291827c..5a0850fdad 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242590_9D95B0); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 69254b3d83..b71f92c9ac 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -52,7 +52,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241380_CF8EF0); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index add231fef5..76ec88b1d9 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -60,7 +60,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802417AC_D06EDC); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 19820e5db8..841f1b7b7f 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -40,7 +40,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241450_D3BA20); +#include "world/common/UnkCameraFunc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC); diff --git a/src/world/common/UnkCameraFunc.inc.c b/src/world/common/UnkCameraFunc.inc.c new file mode 100644 index 0000000000..e20d04f1cd --- /dev/null +++ b/src/world/common/UnkCameraFunc.inc.c @@ -0,0 +1,21 @@ +#include "common.h" + +static ApiStatus UnkCameraFunc(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 var0 = get_variable(script, *args++); + s32 var1 = get_variable(script, *args++); + s32 var2 = get_variable(script, *args++); + Bytecode out1 = *args++; + Bytecode out2 = *args++; + s32 cameraYaw = gCameras[gCurrentCameraID].currentYaw; + s32 outVal1 = get_variable(script, SI_ARRAY(1)) - (var2 * cos_deg(cameraYaw)); + s32 outVal2 = get_variable(script, SI_ARRAY(3)) - (var2 * sin_deg(cameraYaw)); + + outVal1 -= var0; + outVal2 -= var1; + + set_variable(script, out1, outVal1); + set_variable(script, out2, outVal2); + + return ApiStatus_DONE2; +} From 8ee2bf4522ae51b870845320232befa7929584af Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 16:23:23 -0400 Subject: [PATCH 15/45] UnkMoveNpc --- .../dro_01/95B7E0/func_80242380_95D580.s | 63 ----------------- .../dro_02/9694C0/func_80241210_96A3D0.s | 63 ----------------- .../hos_03/A1BDB0/func_802433B4_A1E4B4.s | 63 ----------------- .../jan_02/B2C8A0/func_80242524_B2E994.s | 63 ----------------- .../jan_03/B34BD0/func_80242AAC_B3767C.s | 63 ----------------- .../kmr_02/8B0070/func_802412A0_8B1310.s | 63 ----------------- .../mac_00/7EB340/func_80241540_7EC250.s | 63 ----------------- .../mac_00/7EB340/func_80242078_7ECD88.s | 70 ------------------- .../mac_01/8017D0/func_80242E20_8036A0.s | 63 ----------------- .../mac_02/823BF0/func_802426D0_825990.s | 63 ----------------- .../mac_03/831B20/func_802413C0_832BC0.s | 63 ----------------- .../mac_04/843030/func_80241370_843F40.s | 63 ----------------- .../mac_05/852170/func_80242230_8543A0.s | 63 ----------------- .../nok_01/9C53E0/func_80241C78_9C7058.s | 63 ----------------- .../nok_02/9D7AA0/func_80242820_9D9840.s | 63 ----------------- .../sam_01/CF7E80/func_80241610_CF9180.s | 63 ----------------- .../sam_02/D05F60/func_80241A3C_D0716C.s | 63 ----------------- .../sam_11/D3ADA0/func_802416E0_D3BCB0.s | 63 ----------------- 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 | 24 ++++++- 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/UnkMoveNpc.inc.c | 19 +++++ tools/m2ctx.py | 4 +- 37 files changed, 58 insertions(+), 1162 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s create mode 100644 src/world/common/UnkMoveNpc.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s deleted file mode 100644 index 89d307f487..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242380_95D580.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242380_95D580 -/* 95D580 80242380 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 95D584 80242384 AFB10014 */ sw $s1, 0x14($sp) -/* 95D588 80242388 0080882D */ daddu $s1, $a0, $zero -/* 95D58C 8024238C AFB00010 */ sw $s0, 0x10($sp) -/* 95D590 80242390 00A0802D */ daddu $s0, $a1, $zero -/* 95D594 80242394 AFBF001C */ sw $ra, 0x1c($sp) -/* 95D598 80242398 AFB20018 */ sw $s2, 0x18($sp) -/* 95D59C 8024239C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 95D5A0 802423A0 0C00EABB */ jal get_npc_unsafe -/* 95D5A4 802423A4 2404FFFC */ addiu $a0, $zero, -4 -/* 95D5A8 802423A8 12000017 */ beqz $s0, .L80242408 -/* 95D5AC 802423AC 0040902D */ daddu $s2, $v0, $zero -/* 95D5B0 802423B0 0220202D */ daddu $a0, $s1, $zero -/* 95D5B4 802423B4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5B8 802423B8 0C0B210B */ jal get_float_variable -/* 95D5BC 802423BC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 95D5C0 802423C0 0220202D */ daddu $a0, $s1, $zero -/* 95D5C4 802423C4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5C8 802423C8 3C014270 */ lui $at, 0x4270 -/* 95D5CC 802423CC 4481A000 */ mtc1 $at, $f20 -/* 95D5D0 802423D0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 95D5D4 802423D4 46140003 */ div.s $f0, $f0, $f20 -/* 95D5D8 802423D8 0C0B210B */ jal get_float_variable -/* 95D5DC 802423DC E6200074 */ swc1 $f0, 0x74($s1) -/* 95D5E0 802423E0 0220202D */ daddu $a0, $s1, $zero -/* 95D5E4 802423E4 3C05FE36 */ lui $a1, 0xfe36 -/* 95D5E8 802423E8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 95D5EC 802423EC 46140003 */ div.s $f0, $f0, $f20 -/* 95D5F0 802423F0 0C0B210B */ jal get_float_variable -/* 95D5F4 802423F4 E6200078 */ swc1 $f0, 0x78($s1) -/* 95D5F8 802423F8 46140003 */ div.s $f0, $f0, $f20 -/* 95D5FC 802423FC 2402003C */ addiu $v0, $zero, 0x3c -/* 95D600 80242400 E620007C */ swc1 $f0, 0x7c($s1) -/* 95D604 80242404 AE220070 */ sw $v0, 0x70($s1) -.L80242408: -/* 95D608 80242408 C6400038 */ lwc1 $f0, 0x38($s2) -/* 95D60C 8024240C C6220074 */ lwc1 $f2, 0x74($s1) -/* 95D610 80242410 46020000 */ add.s $f0, $f0, $f2 -/* 95D614 80242414 E6400038 */ swc1 $f0, 0x38($s2) -/* 95D618 80242418 C640003C */ lwc1 $f0, 0x3c($s2) -/* 95D61C 8024241C C6220078 */ lwc1 $f2, 0x78($s1) -/* 95D620 80242420 46020000 */ add.s $f0, $f0, $f2 -/* 95D624 80242424 E640003C */ swc1 $f0, 0x3c($s2) -/* 95D628 80242428 C6400040 */ lwc1 $f0, 0x40($s2) -/* 95D62C 8024242C C622007C */ lwc1 $f2, 0x7c($s1) -/* 95D630 80242430 46020000 */ add.s $f0, $f0, $f2 -/* 95D634 80242434 E6400040 */ swc1 $f0, 0x40($s2) -/* 95D638 80242438 8E230070 */ lw $v1, 0x70($s1) -/* 95D63C 8024243C 2463FFFF */ addiu $v1, $v1, -1 -/* 95D640 80242440 2C620001 */ sltiu $v0, $v1, 1 -/* 95D644 80242444 AE230070 */ sw $v1, 0x70($s1) -/* 95D648 80242448 8FBF001C */ lw $ra, 0x1c($sp) -/* 95D64C 8024244C 8FB20018 */ lw $s2, 0x18($sp) -/* 95D650 80242450 8FB10014 */ lw $s1, 0x14($sp) -/* 95D654 80242454 8FB00010 */ lw $s0, 0x10($sp) -/* 95D658 80242458 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 95D65C 8024245C 00021040 */ sll $v0, $v0, 1 -/* 95D660 80242460 03E00008 */ jr $ra -/* 95D664 80242464 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s deleted file mode 100644 index 1311c901c0..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241210_96A3D0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_96A3D0 -/* 96A3D0 80241210 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 96A3D4 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 96A3D8 80241218 0080882D */ daddu $s1, $a0, $zero -/* 96A3DC 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* 96A3E0 80241220 00A0802D */ daddu $s0, $a1, $zero -/* 96A3E4 80241224 AFBF001C */ sw $ra, 0x1c($sp) -/* 96A3E8 80241228 AFB20018 */ sw $s2, 0x18($sp) -/* 96A3EC 8024122C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 96A3F0 80241230 0C00EABB */ jal get_npc_unsafe -/* 96A3F4 80241234 2404FFFC */ addiu $a0, $zero, -4 -/* 96A3F8 80241238 12000017 */ beqz $s0, .L80241298 -/* 96A3FC 8024123C 0040902D */ daddu $s2, $v0, $zero -/* 96A400 80241240 0220202D */ daddu $a0, $s1, $zero -/* 96A404 80241244 3C05FE36 */ lui $a1, 0xfe36 -/* 96A408 80241248 0C0B210B */ jal get_float_variable -/* 96A40C 8024124C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 96A410 80241250 0220202D */ daddu $a0, $s1, $zero -/* 96A414 80241254 3C05FE36 */ lui $a1, 0xfe36 -/* 96A418 80241258 3C014270 */ lui $at, 0x4270 -/* 96A41C 8024125C 4481A000 */ mtc1 $at, $f20 -/* 96A420 80241260 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 96A424 80241264 46140003 */ div.s $f0, $f0, $f20 -/* 96A428 80241268 0C0B210B */ jal get_float_variable -/* 96A42C 8024126C E6200074 */ swc1 $f0, 0x74($s1) -/* 96A430 80241270 0220202D */ daddu $a0, $s1, $zero -/* 96A434 80241274 3C05FE36 */ lui $a1, 0xfe36 -/* 96A438 80241278 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 96A43C 8024127C 46140003 */ div.s $f0, $f0, $f20 -/* 96A440 80241280 0C0B210B */ jal get_float_variable -/* 96A444 80241284 E6200078 */ swc1 $f0, 0x78($s1) -/* 96A448 80241288 46140003 */ div.s $f0, $f0, $f20 -/* 96A44C 8024128C 2402003C */ addiu $v0, $zero, 0x3c -/* 96A450 80241290 E620007C */ swc1 $f0, 0x7c($s1) -/* 96A454 80241294 AE220070 */ sw $v0, 0x70($s1) -.L80241298: -/* 96A458 80241298 C6400038 */ lwc1 $f0, 0x38($s2) -/* 96A45C 8024129C C6220074 */ lwc1 $f2, 0x74($s1) -/* 96A460 802412A0 46020000 */ add.s $f0, $f0, $f2 -/* 96A464 802412A4 E6400038 */ swc1 $f0, 0x38($s2) -/* 96A468 802412A8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 96A46C 802412AC C6220078 */ lwc1 $f2, 0x78($s1) -/* 96A470 802412B0 46020000 */ add.s $f0, $f0, $f2 -/* 96A474 802412B4 E640003C */ swc1 $f0, 0x3c($s2) -/* 96A478 802412B8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 96A47C 802412BC C622007C */ lwc1 $f2, 0x7c($s1) -/* 96A480 802412C0 46020000 */ add.s $f0, $f0, $f2 -/* 96A484 802412C4 E6400040 */ swc1 $f0, 0x40($s2) -/* 96A488 802412C8 8E230070 */ lw $v1, 0x70($s1) -/* 96A48C 802412CC 2463FFFF */ addiu $v1, $v1, -1 -/* 96A490 802412D0 2C620001 */ sltiu $v0, $v1, 1 -/* 96A494 802412D4 AE230070 */ sw $v1, 0x70($s1) -/* 96A498 802412D8 8FBF001C */ lw $ra, 0x1c($sp) -/* 96A49C 802412DC 8FB20018 */ lw $s2, 0x18($sp) -/* 96A4A0 802412E0 8FB10014 */ lw $s1, 0x14($sp) -/* 96A4A4 802412E4 8FB00010 */ lw $s0, 0x10($sp) -/* 96A4A8 802412E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 96A4AC 802412EC 00021040 */ sll $v0, $v0, 1 -/* 96A4B0 802412F0 03E00008 */ jr $ra -/* 96A4B4 802412F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s deleted file mode 100644 index bad058ad7d..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802433B4_A1E4B4.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802433B4_A1E4B4 -/* A1E4B4 802433B4 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* A1E4B8 802433B8 AFB10014 */ sw $s1, 0x14($sp) -/* A1E4BC 802433BC 0080882D */ daddu $s1, $a0, $zero -/* A1E4C0 802433C0 AFB00010 */ sw $s0, 0x10($sp) -/* A1E4C4 802433C4 00A0802D */ daddu $s0, $a1, $zero -/* A1E4C8 802433C8 AFBF001C */ sw $ra, 0x1c($sp) -/* A1E4CC 802433CC AFB20018 */ sw $s2, 0x18($sp) -/* A1E4D0 802433D0 F7B40020 */ sdc1 $f20, 0x20($sp) -/* A1E4D4 802433D4 0C00EABB */ jal get_npc_unsafe -/* A1E4D8 802433D8 2404FFFC */ addiu $a0, $zero, -4 -/* A1E4DC 802433DC 12000017 */ beqz $s0, .L8024343C -/* A1E4E0 802433E0 0040902D */ daddu $s2, $v0, $zero -/* A1E4E4 802433E4 0220202D */ daddu $a0, $s1, $zero -/* A1E4E8 802433E8 3C05FE36 */ lui $a1, 0xfe36 -/* A1E4EC 802433EC 0C0B210B */ jal get_float_variable -/* A1E4F0 802433F0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A1E4F4 802433F4 0220202D */ daddu $a0, $s1, $zero -/* A1E4F8 802433F8 3C05FE36 */ lui $a1, 0xfe36 -/* A1E4FC 802433FC 3C014270 */ lui $at, 0x4270 -/* A1E500 80243400 4481A000 */ mtc1 $at, $f20 -/* A1E504 80243404 34A53C85 */ ori $a1, $a1, 0x3c85 -/* A1E508 80243408 46140003 */ div.s $f0, $f0, $f20 -/* A1E50C 8024340C 0C0B210B */ jal get_float_variable -/* A1E510 80243410 E6200074 */ swc1 $f0, 0x74($s1) -/* A1E514 80243414 0220202D */ daddu $a0, $s1, $zero -/* A1E518 80243418 3C05FE36 */ lui $a1, 0xfe36 -/* A1E51C 8024341C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* A1E520 80243420 46140003 */ div.s $f0, $f0, $f20 -/* A1E524 80243424 0C0B210B */ jal get_float_variable -/* A1E528 80243428 E6200078 */ swc1 $f0, 0x78($s1) -/* A1E52C 8024342C 46140003 */ div.s $f0, $f0, $f20 -/* A1E530 80243430 2402003C */ addiu $v0, $zero, 0x3c -/* A1E534 80243434 E620007C */ swc1 $f0, 0x7c($s1) -/* A1E538 80243438 AE220070 */ sw $v0, 0x70($s1) -.L8024343C: -/* A1E53C 8024343C C6400038 */ lwc1 $f0, 0x38($s2) -/* A1E540 80243440 C6220074 */ lwc1 $f2, 0x74($s1) -/* A1E544 80243444 46020000 */ add.s $f0, $f0, $f2 -/* A1E548 80243448 E6400038 */ swc1 $f0, 0x38($s2) -/* A1E54C 8024344C C640003C */ lwc1 $f0, 0x3c($s2) -/* A1E550 80243450 C6220078 */ lwc1 $f2, 0x78($s1) -/* A1E554 80243454 46020000 */ add.s $f0, $f0, $f2 -/* A1E558 80243458 E640003C */ swc1 $f0, 0x3c($s2) -/* A1E55C 8024345C C6400040 */ lwc1 $f0, 0x40($s2) -/* A1E560 80243460 C622007C */ lwc1 $f2, 0x7c($s1) -/* A1E564 80243464 46020000 */ add.s $f0, $f0, $f2 -/* A1E568 80243468 E6400040 */ swc1 $f0, 0x40($s2) -/* A1E56C 8024346C 8E230070 */ lw $v1, 0x70($s1) -/* A1E570 80243470 2463FFFF */ addiu $v1, $v1, -1 -/* A1E574 80243474 2C620001 */ sltiu $v0, $v1, 1 -/* A1E578 80243478 AE230070 */ sw $v1, 0x70($s1) -/* A1E57C 8024347C 8FBF001C */ lw $ra, 0x1c($sp) -/* A1E580 80243480 8FB20018 */ lw $s2, 0x18($sp) -/* A1E584 80243484 8FB10014 */ lw $s1, 0x14($sp) -/* A1E588 80243488 8FB00010 */ lw $s0, 0x10($sp) -/* A1E58C 8024348C D7B40020 */ ldc1 $f20, 0x20($sp) -/* A1E590 80243490 00021040 */ sll $v0, $v0, 1 -/* A1E594 80243494 03E00008 */ jr $ra -/* A1E598 80243498 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s deleted file mode 100644 index 2da5e2cd12..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242524_B2E994.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242524_B2E994 -/* B2E994 80242524 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B2E998 80242528 AFB10014 */ sw $s1, 0x14($sp) -/* B2E99C 8024252C 0080882D */ daddu $s1, $a0, $zero -/* B2E9A0 80242530 AFB00010 */ sw $s0, 0x10($sp) -/* B2E9A4 80242534 00A0802D */ daddu $s0, $a1, $zero -/* B2E9A8 80242538 AFBF001C */ sw $ra, 0x1c($sp) -/* B2E9AC 8024253C AFB20018 */ sw $s2, 0x18($sp) -/* B2E9B0 80242540 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B2E9B4 80242544 0C00EABB */ jal get_npc_unsafe -/* B2E9B8 80242548 2404FFFC */ addiu $a0, $zero, -4 -/* B2E9BC 8024254C 12000017 */ beqz $s0, .L802425AC -/* B2E9C0 80242550 0040902D */ daddu $s2, $v0, $zero -/* B2E9C4 80242554 0220202D */ daddu $a0, $s1, $zero -/* B2E9C8 80242558 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9CC 8024255C 0C0B210B */ jal get_float_variable -/* B2E9D0 80242560 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B2E9D4 80242564 0220202D */ daddu $a0, $s1, $zero -/* B2E9D8 80242568 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9DC 8024256C 3C014270 */ lui $at, 0x4270 -/* B2E9E0 80242570 4481A000 */ mtc1 $at, $f20 -/* B2E9E4 80242574 34A53C85 */ ori $a1, $a1, 0x3c85 -/* B2E9E8 80242578 46140003 */ div.s $f0, $f0, $f20 -/* B2E9EC 8024257C 0C0B210B */ jal get_float_variable -/* B2E9F0 80242580 E6200074 */ swc1 $f0, 0x74($s1) -/* B2E9F4 80242584 0220202D */ daddu $a0, $s1, $zero -/* B2E9F8 80242588 3C05FE36 */ lui $a1, 0xfe36 -/* B2E9FC 8024258C 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B2EA00 80242590 46140003 */ div.s $f0, $f0, $f20 -/* B2EA04 80242594 0C0B210B */ jal get_float_variable -/* B2EA08 80242598 E6200078 */ swc1 $f0, 0x78($s1) -/* B2EA0C 8024259C 46140003 */ div.s $f0, $f0, $f20 -/* B2EA10 802425A0 2402003C */ addiu $v0, $zero, 0x3c -/* B2EA14 802425A4 E620007C */ swc1 $f0, 0x7c($s1) -/* B2EA18 802425A8 AE220070 */ sw $v0, 0x70($s1) -.L802425AC: -/* B2EA1C 802425AC C6400038 */ lwc1 $f0, 0x38($s2) -/* B2EA20 802425B0 C6220074 */ lwc1 $f2, 0x74($s1) -/* B2EA24 802425B4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA28 802425B8 E6400038 */ swc1 $f0, 0x38($s2) -/* B2EA2C 802425BC C640003C */ lwc1 $f0, 0x3c($s2) -/* B2EA30 802425C0 C6220078 */ lwc1 $f2, 0x78($s1) -/* B2EA34 802425C4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA38 802425C8 E640003C */ swc1 $f0, 0x3c($s2) -/* B2EA3C 802425CC C6400040 */ lwc1 $f0, 0x40($s2) -/* B2EA40 802425D0 C622007C */ lwc1 $f2, 0x7c($s1) -/* B2EA44 802425D4 46020000 */ add.s $f0, $f0, $f2 -/* B2EA48 802425D8 E6400040 */ swc1 $f0, 0x40($s2) -/* B2EA4C 802425DC 8E230070 */ lw $v1, 0x70($s1) -/* B2EA50 802425E0 2463FFFF */ addiu $v1, $v1, -1 -/* B2EA54 802425E4 2C620001 */ sltiu $v0, $v1, 1 -/* B2EA58 802425E8 AE230070 */ sw $v1, 0x70($s1) -/* B2EA5C 802425EC 8FBF001C */ lw $ra, 0x1c($sp) -/* B2EA60 802425F0 8FB20018 */ lw $s2, 0x18($sp) -/* B2EA64 802425F4 8FB10014 */ lw $s1, 0x14($sp) -/* B2EA68 802425F8 8FB00010 */ lw $s0, 0x10($sp) -/* B2EA6C 802425FC D7B40020 */ ldc1 $f20, 0x20($sp) -/* B2EA70 80242600 00021040 */ sll $v0, $v0, 1 -/* B2EA74 80242604 03E00008 */ jr $ra -/* B2EA78 80242608 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s deleted file mode 100644 index 2378ae9c8f..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242AAC_B3767C.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AAC_B3767C -/* B3767C 80242AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B37680 80242AB0 AFB10014 */ sw $s1, 0x14($sp) -/* B37684 80242AB4 0080882D */ daddu $s1, $a0, $zero -/* B37688 80242AB8 AFB00010 */ sw $s0, 0x10($sp) -/* B3768C 80242ABC 00A0802D */ daddu $s0, $a1, $zero -/* B37690 80242AC0 AFBF001C */ sw $ra, 0x1c($sp) -/* B37694 80242AC4 AFB20018 */ sw $s2, 0x18($sp) -/* B37698 80242AC8 F7B40020 */ sdc1 $f20, 0x20($sp) -/* B3769C 80242ACC 0C00EABB */ jal get_npc_unsafe -/* B376A0 80242AD0 2404FFFC */ addiu $a0, $zero, -4 -/* B376A4 80242AD4 12000017 */ beqz $s0, .L80242B34 -/* B376A8 80242AD8 0040902D */ daddu $s2, $v0, $zero -/* B376AC 80242ADC 0220202D */ daddu $a0, $s1, $zero -/* B376B0 80242AE0 3C05FE36 */ lui $a1, 0xfe36 -/* B376B4 80242AE4 0C0B210B */ jal get_float_variable -/* B376B8 80242AE8 34A53C80 */ ori $a1, $a1, 0x3c80 -/* B376BC 80242AEC 0220202D */ daddu $a0, $s1, $zero -/* B376C0 80242AF0 3C05FE36 */ lui $a1, 0xfe36 -/* B376C4 80242AF4 3C014270 */ lui $at, 0x4270 -/* B376C8 80242AF8 4481A000 */ mtc1 $at, $f20 -/* B376CC 80242AFC 34A53C85 */ ori $a1, $a1, 0x3c85 -/* B376D0 80242B00 46140003 */ div.s $f0, $f0, $f20 -/* B376D4 80242B04 0C0B210B */ jal get_float_variable -/* B376D8 80242B08 E6200074 */ swc1 $f0, 0x74($s1) -/* B376DC 80242B0C 0220202D */ daddu $a0, $s1, $zero -/* B376E0 80242B10 3C05FE36 */ lui $a1, 0xfe36 -/* B376E4 80242B14 34A53C81 */ ori $a1, $a1, 0x3c81 -/* B376E8 80242B18 46140003 */ div.s $f0, $f0, $f20 -/* B376EC 80242B1C 0C0B210B */ jal get_float_variable -/* B376F0 80242B20 E6200078 */ swc1 $f0, 0x78($s1) -/* B376F4 80242B24 46140003 */ div.s $f0, $f0, $f20 -/* B376F8 80242B28 2402003C */ addiu $v0, $zero, 0x3c -/* B376FC 80242B2C E620007C */ swc1 $f0, 0x7c($s1) -/* B37700 80242B30 AE220070 */ sw $v0, 0x70($s1) -.L80242B34: -/* B37704 80242B34 C6400038 */ lwc1 $f0, 0x38($s2) -/* B37708 80242B38 C6220074 */ lwc1 $f2, 0x74($s1) -/* B3770C 80242B3C 46020000 */ add.s $f0, $f0, $f2 -/* B37710 80242B40 E6400038 */ swc1 $f0, 0x38($s2) -/* B37714 80242B44 C640003C */ lwc1 $f0, 0x3c($s2) -/* B37718 80242B48 C6220078 */ lwc1 $f2, 0x78($s1) -/* B3771C 80242B4C 46020000 */ add.s $f0, $f0, $f2 -/* B37720 80242B50 E640003C */ swc1 $f0, 0x3c($s2) -/* B37724 80242B54 C6400040 */ lwc1 $f0, 0x40($s2) -/* B37728 80242B58 C622007C */ lwc1 $f2, 0x7c($s1) -/* B3772C 80242B5C 46020000 */ add.s $f0, $f0, $f2 -/* B37730 80242B60 E6400040 */ swc1 $f0, 0x40($s2) -/* B37734 80242B64 8E230070 */ lw $v1, 0x70($s1) -/* B37738 80242B68 2463FFFF */ addiu $v1, $v1, -1 -/* B3773C 80242B6C 2C620001 */ sltiu $v0, $v1, 1 -/* B37740 80242B70 AE230070 */ sw $v1, 0x70($s1) -/* B37744 80242B74 8FBF001C */ lw $ra, 0x1c($sp) -/* B37748 80242B78 8FB20018 */ lw $s2, 0x18($sp) -/* B3774C 80242B7C 8FB10014 */ lw $s1, 0x14($sp) -/* B37750 80242B80 8FB00010 */ lw $s0, 0x10($sp) -/* B37754 80242B84 D7B40020 */ ldc1 $f20, 0x20($sp) -/* B37758 80242B88 00021040 */ sll $v0, $v0, 1 -/* B3775C 80242B8C 03E00008 */ jr $ra -/* B37760 80242B90 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s deleted file mode 100644 index a5efd31cb6..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802412A0_8B1310.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412A0_8B1310 -/* 8B1310 802412A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8B1314 802412A4 AFB10014 */ sw $s1, 0x14($sp) -/* 8B1318 802412A8 0080882D */ daddu $s1, $a0, $zero -/* 8B131C 802412AC AFB00010 */ sw $s0, 0x10($sp) -/* 8B1320 802412B0 00A0802D */ daddu $s0, $a1, $zero -/* 8B1324 802412B4 AFBF001C */ sw $ra, 0x1c($sp) -/* 8B1328 802412B8 AFB20018 */ sw $s2, 0x18($sp) -/* 8B132C 802412BC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8B1330 802412C0 0C00EABB */ jal get_npc_unsafe -/* 8B1334 802412C4 2404FFFC */ addiu $a0, $zero, -4 -/* 8B1338 802412C8 12000017 */ beqz $s0, .L80241328 -/* 8B133C 802412CC 0040902D */ daddu $s2, $v0, $zero -/* 8B1340 802412D0 0220202D */ daddu $a0, $s1, $zero -/* 8B1344 802412D4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1348 802412D8 0C0B210B */ jal get_float_variable -/* 8B134C 802412DC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8B1350 802412E0 0220202D */ daddu $a0, $s1, $zero -/* 8B1354 802412E4 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1358 802412E8 3C014270 */ lui $at, 0x4270 -/* 8B135C 802412EC 4481A000 */ mtc1 $at, $f20 -/* 8B1360 802412F0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8B1364 802412F4 46140003 */ div.s $f0, $f0, $f20 -/* 8B1368 802412F8 0C0B210B */ jal get_float_variable -/* 8B136C 802412FC E6200074 */ swc1 $f0, 0x74($s1) -/* 8B1370 80241300 0220202D */ daddu $a0, $s1, $zero -/* 8B1374 80241304 3C05FE36 */ lui $a1, 0xfe36 -/* 8B1378 80241308 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8B137C 8024130C 46140003 */ div.s $f0, $f0, $f20 -/* 8B1380 80241310 0C0B210B */ jal get_float_variable -/* 8B1384 80241314 E6200078 */ swc1 $f0, 0x78($s1) -/* 8B1388 80241318 46140003 */ div.s $f0, $f0, $f20 -/* 8B138C 8024131C 2402003C */ addiu $v0, $zero, 0x3c -/* 8B1390 80241320 E620007C */ swc1 $f0, 0x7c($s1) -/* 8B1394 80241324 AE220070 */ sw $v0, 0x70($s1) -.L80241328: -/* 8B1398 80241328 C6400038 */ lwc1 $f0, 0x38($s2) -/* 8B139C 8024132C C6220074 */ lwc1 $f2, 0x74($s1) -/* 8B13A0 80241330 46020000 */ add.s $f0, $f0, $f2 -/* 8B13A4 80241334 E6400038 */ swc1 $f0, 0x38($s2) -/* 8B13A8 80241338 C640003C */ lwc1 $f0, 0x3c($s2) -/* 8B13AC 8024133C C6220078 */ lwc1 $f2, 0x78($s1) -/* 8B13B0 80241340 46020000 */ add.s $f0, $f0, $f2 -/* 8B13B4 80241344 E640003C */ swc1 $f0, 0x3c($s2) -/* 8B13B8 80241348 C6400040 */ lwc1 $f0, 0x40($s2) -/* 8B13BC 8024134C C622007C */ lwc1 $f2, 0x7c($s1) -/* 8B13C0 80241350 46020000 */ add.s $f0, $f0, $f2 -/* 8B13C4 80241354 E6400040 */ swc1 $f0, 0x40($s2) -/* 8B13C8 80241358 8E230070 */ lw $v1, 0x70($s1) -/* 8B13CC 8024135C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B13D0 80241360 2C620001 */ sltiu $v0, $v1, 1 -/* 8B13D4 80241364 AE230070 */ sw $v1, 0x70($s1) -/* 8B13D8 80241368 8FBF001C */ lw $ra, 0x1c($sp) -/* 8B13DC 8024136C 8FB20018 */ lw $s2, 0x18($sp) -/* 8B13E0 80241370 8FB10014 */ lw $s1, 0x14($sp) -/* 8B13E4 80241374 8FB00010 */ lw $s0, 0x10($sp) -/* 8B13E8 80241378 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8B13EC 8024137C 00021040 */ sll $v0, $v0, 1 -/* 8B13F0 80241380 03E00008 */ jr $ra -/* 8B13F4 80241384 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s deleted file mode 100644 index 6bf81c6c08..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241540_7EC250.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241540_7EC250 -/* 7EC250 80241540 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 7EC254 80241544 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC258 80241548 0080882D */ daddu $s1, $a0, $zero -/* 7EC25C 8024154C AFB00010 */ sw $s0, 0x10($sp) -/* 7EC260 80241550 00A0802D */ daddu $s0, $a1, $zero -/* 7EC264 80241554 AFBF001C */ sw $ra, 0x1c($sp) -/* 7EC268 80241558 AFB20018 */ sw $s2, 0x18($sp) -/* 7EC26C 8024155C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7EC270 80241560 0C00EABB */ jal get_npc_unsafe -/* 7EC274 80241564 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC278 80241568 12000017 */ beqz $s0, .L802415C8 -/* 7EC27C 8024156C 0040902D */ daddu $s2, $v0, $zero -/* 7EC280 80241570 0220202D */ daddu $a0, $s1, $zero -/* 7EC284 80241574 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC288 80241578 0C0B210B */ jal get_float_variable -/* 7EC28C 8024157C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 7EC290 80241580 0220202D */ daddu $a0, $s1, $zero -/* 7EC294 80241584 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC298 80241588 3C014270 */ lui $at, 0x4270 -/* 7EC29C 8024158C 4481A000 */ mtc1 $at, $f20 -/* 7EC2A0 80241590 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 7EC2A4 80241594 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2A8 80241598 0C0B210B */ jal get_float_variable -/* 7EC2AC 8024159C E6200074 */ swc1 $f0, 0x74($s1) -/* 7EC2B0 802415A0 0220202D */ daddu $a0, $s1, $zero -/* 7EC2B4 802415A4 3C05FE36 */ lui $a1, 0xfe36 -/* 7EC2B8 802415A8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 7EC2BC 802415AC 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2C0 802415B0 0C0B210B */ jal get_float_variable -/* 7EC2C4 802415B4 E6200078 */ swc1 $f0, 0x78($s1) -/* 7EC2C8 802415B8 46140003 */ div.s $f0, $f0, $f20 -/* 7EC2CC 802415BC 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC2D0 802415C0 E620007C */ swc1 $f0, 0x7c($s1) -/* 7EC2D4 802415C4 AE220070 */ sw $v0, 0x70($s1) -.L802415C8: -/* 7EC2D8 802415C8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 7EC2DC 802415CC C6220074 */ lwc1 $f2, 0x74($s1) -/* 7EC2E0 802415D0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC2E4 802415D4 E6400038 */ swc1 $f0, 0x38($s2) -/* 7EC2E8 802415D8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 7EC2EC 802415DC C6220078 */ lwc1 $f2, 0x78($s1) -/* 7EC2F0 802415E0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC2F4 802415E4 E640003C */ swc1 $f0, 0x3c($s2) -/* 7EC2F8 802415E8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 7EC2FC 802415EC C622007C */ lwc1 $f2, 0x7c($s1) -/* 7EC300 802415F0 46020000 */ add.s $f0, $f0, $f2 -/* 7EC304 802415F4 E6400040 */ swc1 $f0, 0x40($s2) -/* 7EC308 802415F8 8E230070 */ lw $v1, 0x70($s1) -/* 7EC30C 802415FC 2463FFFF */ addiu $v1, $v1, -1 -/* 7EC310 80241600 2C620001 */ sltiu $v0, $v1, 1 -/* 7EC314 80241604 AE230070 */ sw $v1, 0x70($s1) -/* 7EC318 80241608 8FBF001C */ lw $ra, 0x1c($sp) -/* 7EC31C 8024160C 8FB20018 */ lw $s2, 0x18($sp) -/* 7EC320 80241610 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC324 80241614 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC328 80241618 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7EC32C 8024161C 00021040 */ sll $v0, $v0, 1 -/* 7EC330 80241620 03E00008 */ jr $ra -/* 7EC334 80241624 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s deleted file mode 100644 index 5592ea8fd1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242078_7ECD88.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242078_7ECD88 -/* 7ECD88 80242078 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 7ECD8C 8024207C AFB10014 */ sw $s1, 0x14($sp) -/* 7ECD90 80242080 0080882D */ daddu $s1, $a0, $zero -/* 7ECD94 80242084 AFBF0018 */ sw $ra, 0x18($sp) -/* 7ECD98 80242088 AFB00010 */ sw $s0, 0x10($sp) -/* 7ECD9C 8024208C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 7ECDA0 80242090 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 7ECDA4 80242094 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 7ECDA8 80242098 8E30000C */ lw $s0, 0xc($s1) -/* 7ECDAC 8024209C 8E050000 */ lw $a1, ($s0) -/* 7ECDB0 802420A0 0C0B1EAF */ jal get_variable -/* 7ECDB4 802420A4 26100004 */ addiu $s0, $s0, 4 -/* 7ECDB8 802420A8 8E050000 */ lw $a1, ($s0) -/* 7ECDBC 802420AC 26100004 */ addiu $s0, $s0, 4 -/* 7ECDC0 802420B0 4482C000 */ mtc1 $v0, $f24 -/* 7ECDC4 802420B4 00000000 */ nop -/* 7ECDC8 802420B8 4680C620 */ cvt.s.w $f24, $f24 -/* 7ECDCC 802420BC 0C0B1EAF */ jal get_variable -/* 7ECDD0 802420C0 0220202D */ daddu $a0, $s1, $zero -/* 7ECDD4 802420C4 8E050000 */ lw $a1, ($s0) -/* 7ECDD8 802420C8 26100004 */ addiu $s0, $s0, 4 -/* 7ECDDC 802420CC 4482B000 */ mtc1 $v0, $f22 -/* 7ECDE0 802420D0 00000000 */ nop -/* 7ECDE4 802420D4 4680B5A0 */ cvt.s.w $f22, $f22 -/* 7ECDE8 802420D8 0C0B1EAF */ jal get_variable -/* 7ECDEC 802420DC 0220202D */ daddu $a0, $s1, $zero -/* 7ECDF0 802420E0 8E050000 */ lw $a1, ($s0) -/* 7ECDF4 802420E4 4482A000 */ mtc1 $v0, $f20 -/* 7ECDF8 802420E8 00000000 */ nop -/* 7ECDFC 802420EC 4680A520 */ cvt.s.w $f20, $f20 -/* 7ECE00 802420F0 0C0B1EAF */ jal get_variable -/* 7ECE04 802420F4 0220202D */ daddu $a0, $s1, $zero -/* 7ECE08 802420F8 44820000 */ mtc1 $v0, $f0 -/* 7ECE0C 802420FC 00000000 */ nop -/* 7ECE10 80242100 46800020 */ cvt.s.w $f0, $f0 -/* 7ECE14 80242104 46160001 */ sub.s $f0, $f0, $f22 -/* 7ECE18 80242108 4618A501 */ sub.s $f20, $f20, $f24 -/* 7ECE1C 8024210C 46140003 */ div.s $f0, $f0, $f20 -/* 7ECE20 80242110 46180602 */ mul.s $f24, $f0, $f24 -/* 7ECE24 80242114 00000000 */ nop -/* 7ECE28 80242118 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 7ECE2C 8024211C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 7ECE30 80242120 C4420028 */ lwc1 $f2, 0x28($v0) -/* 7ECE34 80242124 46020002 */ mul.s $f0, $f0, $f2 -/* 7ECE38 80242128 00000000 */ nop -/* 7ECE3C 8024212C 4618B581 */ sub.s $f22, $f22, $f24 -/* 7ECE40 80242130 46160000 */ add.s $f0, $f0, $f22 -/* 7ECE44 80242134 C4420030 */ lwc1 $f2, 0x30($v0) -/* 7ECE48 80242138 4600103C */ c.lt.s $f2, $f0 -/* 7ECE4C 8024213C 00000000 */ nop -/* 7ECE50 80242140 45000003 */ bc1f .L80242150 -/* 7ECE54 80242144 24020001 */ addiu $v0, $zero, 1 -/* 7ECE58 80242148 08090855 */ j .L80242154 -/* 7ECE5C 8024214C AE200084 */ sw $zero, 0x84($s1) -.L80242150: -/* 7ECE60 80242150 AE220084 */ sw $v0, 0x84($s1) -.L80242154: -/* 7ECE64 80242154 8FBF0018 */ lw $ra, 0x18($sp) -/* 7ECE68 80242158 8FB10014 */ lw $s1, 0x14($sp) -/* 7ECE6C 8024215C 8FB00010 */ lw $s0, 0x10($sp) -/* 7ECE70 80242160 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 7ECE74 80242164 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 7ECE78 80242168 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 7ECE7C 8024216C 24020002 */ addiu $v0, $zero, 2 -/* 7ECE80 80242170 03E00008 */ jr $ra -/* 7ECE84 80242174 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s deleted file mode 100644 index 7dedd216dc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242E20_8036A0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242E20_8036A0 -/* 8036A0 80242E20 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8036A4 80242E24 AFB10014 */ sw $s1, 0x14($sp) -/* 8036A8 80242E28 0080882D */ daddu $s1, $a0, $zero -/* 8036AC 80242E2C AFB00010 */ sw $s0, 0x10($sp) -/* 8036B0 80242E30 00A0802D */ daddu $s0, $a1, $zero -/* 8036B4 80242E34 AFBF001C */ sw $ra, 0x1c($sp) -/* 8036B8 80242E38 AFB20018 */ sw $s2, 0x18($sp) -/* 8036BC 80242E3C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8036C0 80242E40 0C00EABB */ jal get_npc_unsafe -/* 8036C4 80242E44 2404FFFC */ addiu $a0, $zero, -4 -/* 8036C8 80242E48 12000017 */ beqz $s0, .L80242EA8 -/* 8036CC 80242E4C 0040902D */ daddu $s2, $v0, $zero -/* 8036D0 80242E50 0220202D */ daddu $a0, $s1, $zero -/* 8036D4 80242E54 3C05FE36 */ lui $a1, 0xfe36 -/* 8036D8 80242E58 0C0B210B */ jal get_float_variable -/* 8036DC 80242E5C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8036E0 80242E60 0220202D */ daddu $a0, $s1, $zero -/* 8036E4 80242E64 3C05FE36 */ lui $a1, 0xfe36 -/* 8036E8 80242E68 3C014270 */ lui $at, 0x4270 -/* 8036EC 80242E6C 4481A000 */ mtc1 $at, $f20 -/* 8036F0 80242E70 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8036F4 80242E74 46140003 */ div.s $f0, $f0, $f20 -/* 8036F8 80242E78 0C0B210B */ jal get_float_variable -/* 8036FC 80242E7C E6200074 */ swc1 $f0, 0x74($s1) -/* 803700 80242E80 0220202D */ daddu $a0, $s1, $zero -/* 803704 80242E84 3C05FE36 */ lui $a1, 0xfe36 -/* 803708 80242E88 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 80370C 80242E8C 46140003 */ div.s $f0, $f0, $f20 -/* 803710 80242E90 0C0B210B */ jal get_float_variable -/* 803714 80242E94 E6200078 */ swc1 $f0, 0x78($s1) -/* 803718 80242E98 46140003 */ div.s $f0, $f0, $f20 -/* 80371C 80242E9C 2402003C */ addiu $v0, $zero, 0x3c -/* 803720 80242EA0 E620007C */ swc1 $f0, 0x7c($s1) -/* 803724 80242EA4 AE220070 */ sw $v0, 0x70($s1) -.L80242EA8: -/* 803728 80242EA8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 80372C 80242EAC C6220074 */ lwc1 $f2, 0x74($s1) -/* 803730 80242EB0 46020000 */ add.s $f0, $f0, $f2 -/* 803734 80242EB4 E6400038 */ swc1 $f0, 0x38($s2) -/* 803738 80242EB8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 80373C 80242EBC C6220078 */ lwc1 $f2, 0x78($s1) -/* 803740 80242EC0 46020000 */ add.s $f0, $f0, $f2 -/* 803744 80242EC4 E640003C */ swc1 $f0, 0x3c($s2) -/* 803748 80242EC8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 80374C 80242ECC C622007C */ lwc1 $f2, 0x7c($s1) -/* 803750 80242ED0 46020000 */ add.s $f0, $f0, $f2 -/* 803754 80242ED4 E6400040 */ swc1 $f0, 0x40($s2) -/* 803758 80242ED8 8E230070 */ lw $v1, 0x70($s1) -/* 80375C 80242EDC 2463FFFF */ addiu $v1, $v1, -1 -/* 803760 80242EE0 2C620001 */ sltiu $v0, $v1, 1 -/* 803764 80242EE4 AE230070 */ sw $v1, 0x70($s1) -/* 803768 80242EE8 8FBF001C */ lw $ra, 0x1c($sp) -/* 80376C 80242EEC 8FB20018 */ lw $s2, 0x18($sp) -/* 803770 80242EF0 8FB10014 */ lw $s1, 0x14($sp) -/* 803774 80242EF4 8FB00010 */ lw $s0, 0x10($sp) -/* 803778 80242EF8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 80377C 80242EFC 00021040 */ sll $v0, $v0, 1 -/* 803780 80242F00 03E00008 */ jr $ra -/* 803784 80242F04 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s deleted file mode 100644 index f7c22a373e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802426D0_825990.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802426D0_825990 -/* 825990 802426D0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 825994 802426D4 AFB10014 */ sw $s1, 0x14($sp) -/* 825998 802426D8 0080882D */ daddu $s1, $a0, $zero -/* 82599C 802426DC AFB00010 */ sw $s0, 0x10($sp) -/* 8259A0 802426E0 00A0802D */ daddu $s0, $a1, $zero -/* 8259A4 802426E4 AFBF001C */ sw $ra, 0x1c($sp) -/* 8259A8 802426E8 AFB20018 */ sw $s2, 0x18($sp) -/* 8259AC 802426EC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8259B0 802426F0 0C00EABB */ jal get_npc_unsafe -/* 8259B4 802426F4 2404FFFC */ addiu $a0, $zero, -4 -/* 8259B8 802426F8 12000017 */ beqz $s0, .L80242758 -/* 8259BC 802426FC 0040902D */ daddu $s2, $v0, $zero -/* 8259C0 80242700 0220202D */ daddu $a0, $s1, $zero -/* 8259C4 80242704 3C05FE36 */ lui $a1, 0xfe36 -/* 8259C8 80242708 0C0B210B */ jal get_float_variable -/* 8259CC 8024270C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8259D0 80242710 0220202D */ daddu $a0, $s1, $zero -/* 8259D4 80242714 3C05FE36 */ lui $a1, 0xfe36 -/* 8259D8 80242718 3C014270 */ lui $at, 0x4270 -/* 8259DC 8024271C 4481A000 */ mtc1 $at, $f20 -/* 8259E0 80242720 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8259E4 80242724 46140003 */ div.s $f0, $f0, $f20 -/* 8259E8 80242728 0C0B210B */ jal get_float_variable -/* 8259EC 8024272C E6200074 */ swc1 $f0, 0x74($s1) -/* 8259F0 80242730 0220202D */ daddu $a0, $s1, $zero -/* 8259F4 80242734 3C05FE36 */ lui $a1, 0xfe36 -/* 8259F8 80242738 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 8259FC 8024273C 46140003 */ div.s $f0, $f0, $f20 -/* 825A00 80242740 0C0B210B */ jal get_float_variable -/* 825A04 80242744 E6200078 */ swc1 $f0, 0x78($s1) -/* 825A08 80242748 46140003 */ div.s $f0, $f0, $f20 -/* 825A0C 8024274C 2402003C */ addiu $v0, $zero, 0x3c -/* 825A10 80242750 E620007C */ swc1 $f0, 0x7c($s1) -/* 825A14 80242754 AE220070 */ sw $v0, 0x70($s1) -.L80242758: -/* 825A18 80242758 C6400038 */ lwc1 $f0, 0x38($s2) -/* 825A1C 8024275C C6220074 */ lwc1 $f2, 0x74($s1) -/* 825A20 80242760 46020000 */ add.s $f0, $f0, $f2 -/* 825A24 80242764 E6400038 */ swc1 $f0, 0x38($s2) -/* 825A28 80242768 C640003C */ lwc1 $f0, 0x3c($s2) -/* 825A2C 8024276C C6220078 */ lwc1 $f2, 0x78($s1) -/* 825A30 80242770 46020000 */ add.s $f0, $f0, $f2 -/* 825A34 80242774 E640003C */ swc1 $f0, 0x3c($s2) -/* 825A38 80242778 C6400040 */ lwc1 $f0, 0x40($s2) -/* 825A3C 8024277C C622007C */ lwc1 $f2, 0x7c($s1) -/* 825A40 80242780 46020000 */ add.s $f0, $f0, $f2 -/* 825A44 80242784 E6400040 */ swc1 $f0, 0x40($s2) -/* 825A48 80242788 8E230070 */ lw $v1, 0x70($s1) -/* 825A4C 8024278C 2463FFFF */ addiu $v1, $v1, -1 -/* 825A50 80242790 2C620001 */ sltiu $v0, $v1, 1 -/* 825A54 80242794 AE230070 */ sw $v1, 0x70($s1) -/* 825A58 80242798 8FBF001C */ lw $ra, 0x1c($sp) -/* 825A5C 8024279C 8FB20018 */ lw $s2, 0x18($sp) -/* 825A60 802427A0 8FB10014 */ lw $s1, 0x14($sp) -/* 825A64 802427A4 8FB00010 */ lw $s0, 0x10($sp) -/* 825A68 802427A8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 825A6C 802427AC 00021040 */ sll $v0, $v0, 1 -/* 825A70 802427B0 03E00008 */ jr $ra -/* 825A74 802427B4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s deleted file mode 100644 index 63ba3c5753..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802413C0_832BC0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413C0_832BC0 -/* 832BC0 802413C0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 832BC4 802413C4 AFB10014 */ sw $s1, 0x14($sp) -/* 832BC8 802413C8 0080882D */ daddu $s1, $a0, $zero -/* 832BCC 802413CC AFB00010 */ sw $s0, 0x10($sp) -/* 832BD0 802413D0 00A0802D */ daddu $s0, $a1, $zero -/* 832BD4 802413D4 AFBF001C */ sw $ra, 0x1c($sp) -/* 832BD8 802413D8 AFB20018 */ sw $s2, 0x18($sp) -/* 832BDC 802413DC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 832BE0 802413E0 0C00EABB */ jal get_npc_unsafe -/* 832BE4 802413E4 2404FFFC */ addiu $a0, $zero, -4 -/* 832BE8 802413E8 12000017 */ beqz $s0, .L80241448 -/* 832BEC 802413EC 0040902D */ daddu $s2, $v0, $zero -/* 832BF0 802413F0 0220202D */ daddu $a0, $s1, $zero -/* 832BF4 802413F4 3C05FE36 */ lui $a1, 0xfe36 -/* 832BF8 802413F8 0C0B210B */ jal get_float_variable -/* 832BFC 802413FC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 832C00 80241400 0220202D */ daddu $a0, $s1, $zero -/* 832C04 80241404 3C05FE36 */ lui $a1, 0xfe36 -/* 832C08 80241408 3C014270 */ lui $at, 0x4270 -/* 832C0C 8024140C 4481A000 */ mtc1 $at, $f20 -/* 832C10 80241410 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 832C14 80241414 46140003 */ div.s $f0, $f0, $f20 -/* 832C18 80241418 0C0B210B */ jal get_float_variable -/* 832C1C 8024141C E6200074 */ swc1 $f0, 0x74($s1) -/* 832C20 80241420 0220202D */ daddu $a0, $s1, $zero -/* 832C24 80241424 3C05FE36 */ lui $a1, 0xfe36 -/* 832C28 80241428 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 832C2C 8024142C 46140003 */ div.s $f0, $f0, $f20 -/* 832C30 80241430 0C0B210B */ jal get_float_variable -/* 832C34 80241434 E6200078 */ swc1 $f0, 0x78($s1) -/* 832C38 80241438 46140003 */ div.s $f0, $f0, $f20 -/* 832C3C 8024143C 2402003C */ addiu $v0, $zero, 0x3c -/* 832C40 80241440 E620007C */ swc1 $f0, 0x7c($s1) -/* 832C44 80241444 AE220070 */ sw $v0, 0x70($s1) -.L80241448: -/* 832C48 80241448 C6400038 */ lwc1 $f0, 0x38($s2) -/* 832C4C 8024144C C6220074 */ lwc1 $f2, 0x74($s1) -/* 832C50 80241450 46020000 */ add.s $f0, $f0, $f2 -/* 832C54 80241454 E6400038 */ swc1 $f0, 0x38($s2) -/* 832C58 80241458 C640003C */ lwc1 $f0, 0x3c($s2) -/* 832C5C 8024145C C6220078 */ lwc1 $f2, 0x78($s1) -/* 832C60 80241460 46020000 */ add.s $f0, $f0, $f2 -/* 832C64 80241464 E640003C */ swc1 $f0, 0x3c($s2) -/* 832C68 80241468 C6400040 */ lwc1 $f0, 0x40($s2) -/* 832C6C 8024146C C622007C */ lwc1 $f2, 0x7c($s1) -/* 832C70 80241470 46020000 */ add.s $f0, $f0, $f2 -/* 832C74 80241474 E6400040 */ swc1 $f0, 0x40($s2) -/* 832C78 80241478 8E230070 */ lw $v1, 0x70($s1) -/* 832C7C 8024147C 2463FFFF */ addiu $v1, $v1, -1 -/* 832C80 80241480 2C620001 */ sltiu $v0, $v1, 1 -/* 832C84 80241484 AE230070 */ sw $v1, 0x70($s1) -/* 832C88 80241488 8FBF001C */ lw $ra, 0x1c($sp) -/* 832C8C 8024148C 8FB20018 */ lw $s2, 0x18($sp) -/* 832C90 80241490 8FB10014 */ lw $s1, 0x14($sp) -/* 832C94 80241494 8FB00010 */ lw $s0, 0x10($sp) -/* 832C98 80241498 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 832C9C 8024149C 00021040 */ sll $v0, $v0, 1 -/* 832CA0 802414A0 03E00008 */ jr $ra -/* 832CA4 802414A4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s deleted file mode 100644 index 43bf452bf7..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241370_843F40.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241370_843F40 -/* 843F40 80241370 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 843F44 80241374 AFB10014 */ sw $s1, 0x14($sp) -/* 843F48 80241378 0080882D */ daddu $s1, $a0, $zero -/* 843F4C 8024137C AFB00010 */ sw $s0, 0x10($sp) -/* 843F50 80241380 00A0802D */ daddu $s0, $a1, $zero -/* 843F54 80241384 AFBF001C */ sw $ra, 0x1c($sp) -/* 843F58 80241388 AFB20018 */ sw $s2, 0x18($sp) -/* 843F5C 8024138C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 843F60 80241390 0C00EABB */ jal get_npc_unsafe -/* 843F64 80241394 2404FFFC */ addiu $a0, $zero, -4 -/* 843F68 80241398 12000017 */ beqz $s0, .L802413F8 -/* 843F6C 8024139C 0040902D */ daddu $s2, $v0, $zero -/* 843F70 802413A0 0220202D */ daddu $a0, $s1, $zero -/* 843F74 802413A4 3C05FE36 */ lui $a1, 0xfe36 -/* 843F78 802413A8 0C0B210B */ jal get_float_variable -/* 843F7C 802413AC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 843F80 802413B0 0220202D */ daddu $a0, $s1, $zero -/* 843F84 802413B4 3C05FE36 */ lui $a1, 0xfe36 -/* 843F88 802413B8 3C014270 */ lui $at, 0x4270 -/* 843F8C 802413BC 4481A000 */ mtc1 $at, $f20 -/* 843F90 802413C0 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 843F94 802413C4 46140003 */ div.s $f0, $f0, $f20 -/* 843F98 802413C8 0C0B210B */ jal get_float_variable -/* 843F9C 802413CC E6200074 */ swc1 $f0, 0x74($s1) -/* 843FA0 802413D0 0220202D */ daddu $a0, $s1, $zero -/* 843FA4 802413D4 3C05FE36 */ lui $a1, 0xfe36 -/* 843FA8 802413D8 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 843FAC 802413DC 46140003 */ div.s $f0, $f0, $f20 -/* 843FB0 802413E0 0C0B210B */ jal get_float_variable -/* 843FB4 802413E4 E6200078 */ swc1 $f0, 0x78($s1) -/* 843FB8 802413E8 46140003 */ div.s $f0, $f0, $f20 -/* 843FBC 802413EC 2402003C */ addiu $v0, $zero, 0x3c -/* 843FC0 802413F0 E620007C */ swc1 $f0, 0x7c($s1) -/* 843FC4 802413F4 AE220070 */ sw $v0, 0x70($s1) -.L802413F8: -/* 843FC8 802413F8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 843FCC 802413FC C6220074 */ lwc1 $f2, 0x74($s1) -/* 843FD0 80241400 46020000 */ add.s $f0, $f0, $f2 -/* 843FD4 80241404 E6400038 */ swc1 $f0, 0x38($s2) -/* 843FD8 80241408 C640003C */ lwc1 $f0, 0x3c($s2) -/* 843FDC 8024140C C6220078 */ lwc1 $f2, 0x78($s1) -/* 843FE0 80241410 46020000 */ add.s $f0, $f0, $f2 -/* 843FE4 80241414 E640003C */ swc1 $f0, 0x3c($s2) -/* 843FE8 80241418 C6400040 */ lwc1 $f0, 0x40($s2) -/* 843FEC 8024141C C622007C */ lwc1 $f2, 0x7c($s1) -/* 843FF0 80241420 46020000 */ add.s $f0, $f0, $f2 -/* 843FF4 80241424 E6400040 */ swc1 $f0, 0x40($s2) -/* 843FF8 80241428 8E230070 */ lw $v1, 0x70($s1) -/* 843FFC 8024142C 2463FFFF */ addiu $v1, $v1, -1 -/* 844000 80241430 2C620001 */ sltiu $v0, $v1, 1 -/* 844004 80241434 AE230070 */ sw $v1, 0x70($s1) -/* 844008 80241438 8FBF001C */ lw $ra, 0x1c($sp) -/* 84400C 8024143C 8FB20018 */ lw $s2, 0x18($sp) -/* 844010 80241440 8FB10014 */ lw $s1, 0x14($sp) -/* 844014 80241444 8FB00010 */ lw $s0, 0x10($sp) -/* 844018 80241448 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 84401C 8024144C 00021040 */ sll $v0, $v0, 1 -/* 844020 80241450 03E00008 */ jr $ra -/* 844024 80241454 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s deleted file mode 100644 index 0cb1bb647a..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80242230_8543A0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242230_8543A0 -/* 8543A0 80242230 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8543A4 80242234 AFB10014 */ sw $s1, 0x14($sp) -/* 8543A8 80242238 0080882D */ daddu $s1, $a0, $zero -/* 8543AC 8024223C AFB00010 */ sw $s0, 0x10($sp) -/* 8543B0 80242240 00A0802D */ daddu $s0, $a1, $zero -/* 8543B4 80242244 AFBF001C */ sw $ra, 0x1c($sp) -/* 8543B8 80242248 AFB20018 */ sw $s2, 0x18($sp) -/* 8543BC 8024224C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8543C0 80242250 0C00EABB */ jal get_npc_unsafe -/* 8543C4 80242254 2404FFFC */ addiu $a0, $zero, -4 -/* 8543C8 80242258 12000017 */ beqz $s0, .L802422B8 -/* 8543CC 8024225C 0040902D */ daddu $s2, $v0, $zero -/* 8543D0 80242260 0220202D */ daddu $a0, $s1, $zero -/* 8543D4 80242264 3C05FE36 */ lui $a1, 0xfe36 -/* 8543D8 80242268 0C0B210B */ jal get_float_variable -/* 8543DC 8024226C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 8543E0 80242270 0220202D */ daddu $a0, $s1, $zero -/* 8543E4 80242274 3C05FE36 */ lui $a1, 0xfe36 -/* 8543E8 80242278 3C014270 */ lui $at, 0x4270 -/* 8543EC 8024227C 4481A000 */ mtc1 $at, $f20 -/* 8543F0 80242280 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 8543F4 80242284 46140003 */ div.s $f0, $f0, $f20 -/* 8543F8 80242288 0C0B210B */ jal get_float_variable -/* 8543FC 8024228C E6200074 */ swc1 $f0, 0x74($s1) -/* 854400 80242290 0220202D */ daddu $a0, $s1, $zero -/* 854404 80242294 3C05FE36 */ lui $a1, 0xfe36 -/* 854408 80242298 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 85440C 8024229C 46140003 */ div.s $f0, $f0, $f20 -/* 854410 802422A0 0C0B210B */ jal get_float_variable -/* 854414 802422A4 E6200078 */ swc1 $f0, 0x78($s1) -/* 854418 802422A8 46140003 */ div.s $f0, $f0, $f20 -/* 85441C 802422AC 2402003C */ addiu $v0, $zero, 0x3c -/* 854420 802422B0 E620007C */ swc1 $f0, 0x7c($s1) -/* 854424 802422B4 AE220070 */ sw $v0, 0x70($s1) -.L802422B8: -/* 854428 802422B8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 85442C 802422BC C6220074 */ lwc1 $f2, 0x74($s1) -/* 854430 802422C0 46020000 */ add.s $f0, $f0, $f2 -/* 854434 802422C4 E6400038 */ swc1 $f0, 0x38($s2) -/* 854438 802422C8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 85443C 802422CC C6220078 */ lwc1 $f2, 0x78($s1) -/* 854440 802422D0 46020000 */ add.s $f0, $f0, $f2 -/* 854444 802422D4 E640003C */ swc1 $f0, 0x3c($s2) -/* 854448 802422D8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 85444C 802422DC C622007C */ lwc1 $f2, 0x7c($s1) -/* 854450 802422E0 46020000 */ add.s $f0, $f0, $f2 -/* 854454 802422E4 E6400040 */ swc1 $f0, 0x40($s2) -/* 854458 802422E8 8E230070 */ lw $v1, 0x70($s1) -/* 85445C 802422EC 2463FFFF */ addiu $v1, $v1, -1 -/* 854460 802422F0 2C620001 */ sltiu $v0, $v1, 1 -/* 854464 802422F4 AE230070 */ sw $v1, 0x70($s1) -/* 854468 802422F8 8FBF001C */ lw $ra, 0x1c($sp) -/* 85446C 802422FC 8FB20018 */ lw $s2, 0x18($sp) -/* 854470 80242300 8FB10014 */ lw $s1, 0x14($sp) -/* 854474 80242304 8FB00010 */ lw $s0, 0x10($sp) -/* 854478 80242308 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 85447C 8024230C 00021040 */ sll $v0, $v0, 1 -/* 854480 80242310 03E00008 */ jr $ra -/* 854484 80242314 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s deleted file mode 100644 index 1d6636bac3..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241C78_9C7058.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241C78_9C7058 -/* 9C7058 80241C78 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9C705C 80241C7C AFB10014 */ sw $s1, 0x14($sp) -/* 9C7060 80241C80 0080882D */ daddu $s1, $a0, $zero -/* 9C7064 80241C84 AFB00010 */ sw $s0, 0x10($sp) -/* 9C7068 80241C88 00A0802D */ daddu $s0, $a1, $zero -/* 9C706C 80241C8C AFBF001C */ sw $ra, 0x1c($sp) -/* 9C7070 80241C90 AFB20018 */ sw $s2, 0x18($sp) -/* 9C7074 80241C94 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9C7078 80241C98 0C00EABB */ jal get_npc_unsafe -/* 9C707C 80241C9C 2404FFFC */ addiu $a0, $zero, -4 -/* 9C7080 80241CA0 12000017 */ beqz $s0, .L80241D00 -/* 9C7084 80241CA4 0040902D */ daddu $s2, $v0, $zero -/* 9C7088 80241CA8 0220202D */ daddu $a0, $s1, $zero -/* 9C708C 80241CAC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C7090 80241CB0 0C0B210B */ jal get_float_variable -/* 9C7094 80241CB4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9C7098 80241CB8 0220202D */ daddu $a0, $s1, $zero -/* 9C709C 80241CBC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C70A0 80241CC0 3C014270 */ lui $at, 0x4270 -/* 9C70A4 80241CC4 4481A000 */ mtc1 $at, $f20 -/* 9C70A8 80241CC8 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 9C70AC 80241CCC 46140003 */ div.s $f0, $f0, $f20 -/* 9C70B0 80241CD0 0C0B210B */ jal get_float_variable -/* 9C70B4 80241CD4 E6200074 */ swc1 $f0, 0x74($s1) -/* 9C70B8 80241CD8 0220202D */ daddu $a0, $s1, $zero -/* 9C70BC 80241CDC 3C05FE36 */ lui $a1, 0xfe36 -/* 9C70C0 80241CE0 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9C70C4 80241CE4 46140003 */ div.s $f0, $f0, $f20 -/* 9C70C8 80241CE8 0C0B210B */ jal get_float_variable -/* 9C70CC 80241CEC E6200078 */ swc1 $f0, 0x78($s1) -/* 9C70D0 80241CF0 46140003 */ div.s $f0, $f0, $f20 -/* 9C70D4 80241CF4 2402003C */ addiu $v0, $zero, 0x3c -/* 9C70D8 80241CF8 E620007C */ swc1 $f0, 0x7c($s1) -/* 9C70DC 80241CFC AE220070 */ sw $v0, 0x70($s1) -.L80241D00: -/* 9C70E0 80241D00 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9C70E4 80241D04 C6220074 */ lwc1 $f2, 0x74($s1) -/* 9C70E8 80241D08 46020000 */ add.s $f0, $f0, $f2 -/* 9C70EC 80241D0C E6400038 */ swc1 $f0, 0x38($s2) -/* 9C70F0 80241D10 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9C70F4 80241D14 C6220078 */ lwc1 $f2, 0x78($s1) -/* 9C70F8 80241D18 46020000 */ add.s $f0, $f0, $f2 -/* 9C70FC 80241D1C E640003C */ swc1 $f0, 0x3c($s2) -/* 9C7100 80241D20 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9C7104 80241D24 C622007C */ lwc1 $f2, 0x7c($s1) -/* 9C7108 80241D28 46020000 */ add.s $f0, $f0, $f2 -/* 9C710C 80241D2C E6400040 */ swc1 $f0, 0x40($s2) -/* 9C7110 80241D30 8E230070 */ lw $v1, 0x70($s1) -/* 9C7114 80241D34 2463FFFF */ addiu $v1, $v1, -1 -/* 9C7118 80241D38 2C620001 */ sltiu $v0, $v1, 1 -/* 9C711C 80241D3C AE230070 */ sw $v1, 0x70($s1) -/* 9C7120 80241D40 8FBF001C */ lw $ra, 0x1c($sp) -/* 9C7124 80241D44 8FB20018 */ lw $s2, 0x18($sp) -/* 9C7128 80241D48 8FB10014 */ lw $s1, 0x14($sp) -/* 9C712C 80241D4C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C7130 80241D50 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9C7134 80241D54 00021040 */ sll $v0, $v0, 1 -/* 9C7138 80241D58 03E00008 */ jr $ra -/* 9C713C 80241D5C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s deleted file mode 100644 index f1ec2096ef..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242820_9D9840.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242820_9D9840 -/* 9D9840 80242820 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 9D9844 80242824 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9848 80242828 0080882D */ daddu $s1, $a0, $zero -/* 9D984C 8024282C AFB00010 */ sw $s0, 0x10($sp) -/* 9D9850 80242830 00A0802D */ daddu $s0, $a1, $zero -/* 9D9854 80242834 AFBF001C */ sw $ra, 0x1c($sp) -/* 9D9858 80242838 AFB20018 */ sw $s2, 0x18($sp) -/* 9D985C 8024283C F7B40020 */ sdc1 $f20, 0x20($sp) -/* 9D9860 80242840 0C00EABB */ jal get_npc_unsafe -/* 9D9864 80242844 2404FFFC */ addiu $a0, $zero, -4 -/* 9D9868 80242848 12000017 */ beqz $s0, .L802428A8 -/* 9D986C 8024284C 0040902D */ daddu $s2, $v0, $zero -/* 9D9870 80242850 0220202D */ daddu $a0, $s1, $zero -/* 9D9874 80242854 3C05FE36 */ lui $a1, 0xfe36 -/* 9D9878 80242858 0C0B210B */ jal get_float_variable -/* 9D987C 8024285C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 9D9880 80242860 0220202D */ daddu $a0, $s1, $zero -/* 9D9884 80242864 3C05FE36 */ lui $a1, 0xfe36 -/* 9D9888 80242868 3C014270 */ lui $at, 0x4270 -/* 9D988C 8024286C 4481A000 */ mtc1 $at, $f20 -/* 9D9890 80242870 34A53C85 */ ori $a1, $a1, 0x3c85 -/* 9D9894 80242874 46140003 */ div.s $f0, $f0, $f20 -/* 9D9898 80242878 0C0B210B */ jal get_float_variable -/* 9D989C 8024287C E6200074 */ swc1 $f0, 0x74($s1) -/* 9D98A0 80242880 0220202D */ daddu $a0, $s1, $zero -/* 9D98A4 80242884 3C05FE36 */ lui $a1, 0xfe36 -/* 9D98A8 80242888 34A53C81 */ ori $a1, $a1, 0x3c81 -/* 9D98AC 8024288C 46140003 */ div.s $f0, $f0, $f20 -/* 9D98B0 80242890 0C0B210B */ jal get_float_variable -/* 9D98B4 80242894 E6200078 */ swc1 $f0, 0x78($s1) -/* 9D98B8 80242898 46140003 */ div.s $f0, $f0, $f20 -/* 9D98BC 8024289C 2402003C */ addiu $v0, $zero, 0x3c -/* 9D98C0 802428A0 E620007C */ swc1 $f0, 0x7c($s1) -/* 9D98C4 802428A4 AE220070 */ sw $v0, 0x70($s1) -.L802428A8: -/* 9D98C8 802428A8 C6400038 */ lwc1 $f0, 0x38($s2) -/* 9D98CC 802428AC C6220074 */ lwc1 $f2, 0x74($s1) -/* 9D98D0 802428B0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98D4 802428B4 E6400038 */ swc1 $f0, 0x38($s2) -/* 9D98D8 802428B8 C640003C */ lwc1 $f0, 0x3c($s2) -/* 9D98DC 802428BC C6220078 */ lwc1 $f2, 0x78($s1) -/* 9D98E0 802428C0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98E4 802428C4 E640003C */ swc1 $f0, 0x3c($s2) -/* 9D98E8 802428C8 C6400040 */ lwc1 $f0, 0x40($s2) -/* 9D98EC 802428CC C622007C */ lwc1 $f2, 0x7c($s1) -/* 9D98F0 802428D0 46020000 */ add.s $f0, $f0, $f2 -/* 9D98F4 802428D4 E6400040 */ swc1 $f0, 0x40($s2) -/* 9D98F8 802428D8 8E230070 */ lw $v1, 0x70($s1) -/* 9D98FC 802428DC 2463FFFF */ addiu $v1, $v1, -1 -/* 9D9900 802428E0 2C620001 */ sltiu $v0, $v1, 1 -/* 9D9904 802428E4 AE230070 */ sw $v1, 0x70($s1) -/* 9D9908 802428E8 8FBF001C */ lw $ra, 0x1c($sp) -/* 9D990C 802428EC 8FB20018 */ lw $s2, 0x18($sp) -/* 9D9910 802428F0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9914 802428F4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9918 802428F8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 9D991C 802428FC 00021040 */ sll $v0, $v0, 1 -/* 9D9920 80242900 03E00008 */ jr $ra -/* 9D9924 80242904 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s deleted file mode 100644 index ada9d7a6c1..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241610_CF9180.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241610_CF9180 -/* CF9180 80241610 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* CF9184 80241614 AFB10014 */ sw $s1, 0x14($sp) -/* CF9188 80241618 0080882D */ daddu $s1, $a0, $zero -/* CF918C 8024161C AFB00010 */ sw $s0, 0x10($sp) -/* CF9190 80241620 00A0802D */ daddu $s0, $a1, $zero -/* CF9194 80241624 AFBF001C */ sw $ra, 0x1c($sp) -/* CF9198 80241628 AFB20018 */ sw $s2, 0x18($sp) -/* CF919C 8024162C F7B40020 */ sdc1 $f20, 0x20($sp) -/* CF91A0 80241630 0C00EABB */ jal get_npc_unsafe -/* CF91A4 80241634 2404FFFC */ addiu $a0, $zero, -4 -/* CF91A8 80241638 12000017 */ beqz $s0, .L80241698 -/* CF91AC 8024163C 0040902D */ daddu $s2, $v0, $zero -/* CF91B0 80241640 0220202D */ daddu $a0, $s1, $zero -/* CF91B4 80241644 3C05FE36 */ lui $a1, 0xfe36 -/* CF91B8 80241648 0C0B210B */ jal get_float_variable -/* CF91BC 8024164C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* CF91C0 80241650 0220202D */ daddu $a0, $s1, $zero -/* CF91C4 80241654 3C05FE36 */ lui $a1, 0xfe36 -/* CF91C8 80241658 3C014270 */ lui $at, 0x4270 -/* CF91CC 8024165C 4481A000 */ mtc1 $at, $f20 -/* CF91D0 80241660 34A53C85 */ ori $a1, $a1, 0x3c85 -/* CF91D4 80241664 46140003 */ div.s $f0, $f0, $f20 -/* CF91D8 80241668 0C0B210B */ jal get_float_variable -/* CF91DC 8024166C E6200074 */ swc1 $f0, 0x74($s1) -/* CF91E0 80241670 0220202D */ daddu $a0, $s1, $zero -/* CF91E4 80241674 3C05FE36 */ lui $a1, 0xfe36 -/* CF91E8 80241678 34A53C81 */ ori $a1, $a1, 0x3c81 -/* CF91EC 8024167C 46140003 */ div.s $f0, $f0, $f20 -/* CF91F0 80241680 0C0B210B */ jal get_float_variable -/* CF91F4 80241684 E6200078 */ swc1 $f0, 0x78($s1) -/* CF91F8 80241688 46140003 */ div.s $f0, $f0, $f20 -/* CF91FC 8024168C 2402003C */ addiu $v0, $zero, 0x3c -/* CF9200 80241690 E620007C */ swc1 $f0, 0x7c($s1) -/* CF9204 80241694 AE220070 */ sw $v0, 0x70($s1) -.L80241698: -/* CF9208 80241698 C6400038 */ lwc1 $f0, 0x38($s2) -/* CF920C 8024169C C6220074 */ lwc1 $f2, 0x74($s1) -/* CF9210 802416A0 46020000 */ add.s $f0, $f0, $f2 -/* CF9214 802416A4 E6400038 */ swc1 $f0, 0x38($s2) -/* CF9218 802416A8 C640003C */ lwc1 $f0, 0x3c($s2) -/* CF921C 802416AC C6220078 */ lwc1 $f2, 0x78($s1) -/* CF9220 802416B0 46020000 */ add.s $f0, $f0, $f2 -/* CF9224 802416B4 E640003C */ swc1 $f0, 0x3c($s2) -/* CF9228 802416B8 C6400040 */ lwc1 $f0, 0x40($s2) -/* CF922C 802416BC C622007C */ lwc1 $f2, 0x7c($s1) -/* CF9230 802416C0 46020000 */ add.s $f0, $f0, $f2 -/* CF9234 802416C4 E6400040 */ swc1 $f0, 0x40($s2) -/* CF9238 802416C8 8E230070 */ lw $v1, 0x70($s1) -/* CF923C 802416CC 2463FFFF */ addiu $v1, $v1, -1 -/* CF9240 802416D0 2C620001 */ sltiu $v0, $v1, 1 -/* CF9244 802416D4 AE230070 */ sw $v1, 0x70($s1) -/* CF9248 802416D8 8FBF001C */ lw $ra, 0x1c($sp) -/* CF924C 802416DC 8FB20018 */ lw $s2, 0x18($sp) -/* CF9250 802416E0 8FB10014 */ lw $s1, 0x14($sp) -/* CF9254 802416E4 8FB00010 */ lw $s0, 0x10($sp) -/* CF9258 802416E8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* CF925C 802416EC 00021040 */ sll $v0, $v0, 1 -/* CF9260 802416F0 03E00008 */ jr $ra -/* CF9264 802416F4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s deleted file mode 100644 index 60094ee900..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241A3C_D0716C.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241A3C_D0716C -/* D0716C 80241A3C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D07170 80241A40 AFB10014 */ sw $s1, 0x14($sp) -/* D07174 80241A44 0080882D */ daddu $s1, $a0, $zero -/* D07178 80241A48 AFB00010 */ sw $s0, 0x10($sp) -/* D0717C 80241A4C 00A0802D */ daddu $s0, $a1, $zero -/* D07180 80241A50 AFBF001C */ sw $ra, 0x1c($sp) -/* D07184 80241A54 AFB20018 */ sw $s2, 0x18($sp) -/* D07188 80241A58 F7B40020 */ sdc1 $f20, 0x20($sp) -/* D0718C 80241A5C 0C00EABB */ jal get_npc_unsafe -/* D07190 80241A60 2404FFFC */ addiu $a0, $zero, -4 -/* D07194 80241A64 12000017 */ beqz $s0, .L80241AC4 -/* D07198 80241A68 0040902D */ daddu $s2, $v0, $zero -/* D0719C 80241A6C 0220202D */ daddu $a0, $s1, $zero -/* D071A0 80241A70 3C05FE36 */ lui $a1, 0xfe36 -/* D071A4 80241A74 0C0B210B */ jal get_float_variable -/* D071A8 80241A78 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D071AC 80241A7C 0220202D */ daddu $a0, $s1, $zero -/* D071B0 80241A80 3C05FE36 */ lui $a1, 0xfe36 -/* D071B4 80241A84 3C014270 */ lui $at, 0x4270 -/* D071B8 80241A88 4481A000 */ mtc1 $at, $f20 -/* D071BC 80241A8C 34A53C85 */ ori $a1, $a1, 0x3c85 -/* D071C0 80241A90 46140003 */ div.s $f0, $f0, $f20 -/* D071C4 80241A94 0C0B210B */ jal get_float_variable -/* D071C8 80241A98 E6200074 */ swc1 $f0, 0x74($s1) -/* D071CC 80241A9C 0220202D */ daddu $a0, $s1, $zero -/* D071D0 80241AA0 3C05FE36 */ lui $a1, 0xfe36 -/* D071D4 80241AA4 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D071D8 80241AA8 46140003 */ div.s $f0, $f0, $f20 -/* D071DC 80241AAC 0C0B210B */ jal get_float_variable -/* D071E0 80241AB0 E6200078 */ swc1 $f0, 0x78($s1) -/* D071E4 80241AB4 46140003 */ div.s $f0, $f0, $f20 -/* D071E8 80241AB8 2402003C */ addiu $v0, $zero, 0x3c -/* D071EC 80241ABC E620007C */ swc1 $f0, 0x7c($s1) -/* D071F0 80241AC0 AE220070 */ sw $v0, 0x70($s1) -.L80241AC4: -/* D071F4 80241AC4 C6400038 */ lwc1 $f0, 0x38($s2) -/* D071F8 80241AC8 C6220074 */ lwc1 $f2, 0x74($s1) -/* D071FC 80241ACC 46020000 */ add.s $f0, $f0, $f2 -/* D07200 80241AD0 E6400038 */ swc1 $f0, 0x38($s2) -/* D07204 80241AD4 C640003C */ lwc1 $f0, 0x3c($s2) -/* D07208 80241AD8 C6220078 */ lwc1 $f2, 0x78($s1) -/* D0720C 80241ADC 46020000 */ add.s $f0, $f0, $f2 -/* D07210 80241AE0 E640003C */ swc1 $f0, 0x3c($s2) -/* D07214 80241AE4 C6400040 */ lwc1 $f0, 0x40($s2) -/* D07218 80241AE8 C622007C */ lwc1 $f2, 0x7c($s1) -/* D0721C 80241AEC 46020000 */ add.s $f0, $f0, $f2 -/* D07220 80241AF0 E6400040 */ swc1 $f0, 0x40($s2) -/* D07224 80241AF4 8E230070 */ lw $v1, 0x70($s1) -/* D07228 80241AF8 2463FFFF */ addiu $v1, $v1, -1 -/* D0722C 80241AFC 2C620001 */ sltiu $v0, $v1, 1 -/* D07230 80241B00 AE230070 */ sw $v1, 0x70($s1) -/* D07234 80241B04 8FBF001C */ lw $ra, 0x1c($sp) -/* D07238 80241B08 8FB20018 */ lw $s2, 0x18($sp) -/* D0723C 80241B0C 8FB10014 */ lw $s1, 0x14($sp) -/* D07240 80241B10 8FB00010 */ lw $s0, 0x10($sp) -/* D07244 80241B14 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D07248 80241B18 00021040 */ sll $v0, $v0, 1 -/* D0724C 80241B1C 03E00008 */ jr $ra -/* D07250 80241B20 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s deleted file mode 100644 index 9fc9db0881..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802416E0_D3BCB0.s +++ /dev/null @@ -1,63 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802416E0_D3BCB0 -/* D3BCB0 802416E0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* D3BCB4 802416E4 AFB10014 */ sw $s1, 0x14($sp) -/* D3BCB8 802416E8 0080882D */ daddu $s1, $a0, $zero -/* D3BCBC 802416EC AFB00010 */ sw $s0, 0x10($sp) -/* D3BCC0 802416F0 00A0802D */ daddu $s0, $a1, $zero -/* D3BCC4 802416F4 AFBF001C */ sw $ra, 0x1c($sp) -/* D3BCC8 802416F8 AFB20018 */ sw $s2, 0x18($sp) -/* D3BCCC 802416FC F7B40020 */ sdc1 $f20, 0x20($sp) -/* D3BCD0 80241700 0C00EABB */ jal get_npc_unsafe -/* D3BCD4 80241704 2404FFFC */ addiu $a0, $zero, -4 -/* D3BCD8 80241708 12000017 */ beqz $s0, .L80241768 -/* D3BCDC 8024170C 0040902D */ daddu $s2, $v0, $zero -/* D3BCE0 80241710 0220202D */ daddu $a0, $s1, $zero -/* D3BCE4 80241714 3C05FE36 */ lui $a1, 0xfe36 -/* D3BCE8 80241718 0C0B210B */ jal get_float_variable -/* D3BCEC 8024171C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* D3BCF0 80241720 0220202D */ daddu $a0, $s1, $zero -/* D3BCF4 80241724 3C05FE36 */ lui $a1, 0xfe36 -/* D3BCF8 80241728 3C014270 */ lui $at, 0x4270 -/* D3BCFC 8024172C 4481A000 */ mtc1 $at, $f20 -/* D3BD00 80241730 34A53C85 */ ori $a1, $a1, 0x3c85 -/* D3BD04 80241734 46140003 */ div.s $f0, $f0, $f20 -/* D3BD08 80241738 0C0B210B */ jal get_float_variable -/* D3BD0C 8024173C E6200074 */ swc1 $f0, 0x74($s1) -/* D3BD10 80241740 0220202D */ daddu $a0, $s1, $zero -/* D3BD14 80241744 3C05FE36 */ lui $a1, 0xfe36 -/* D3BD18 80241748 34A53C81 */ ori $a1, $a1, 0x3c81 -/* D3BD1C 8024174C 46140003 */ div.s $f0, $f0, $f20 -/* D3BD20 80241750 0C0B210B */ jal get_float_variable -/* D3BD24 80241754 E6200078 */ swc1 $f0, 0x78($s1) -/* D3BD28 80241758 46140003 */ div.s $f0, $f0, $f20 -/* D3BD2C 8024175C 2402003C */ addiu $v0, $zero, 0x3c -/* D3BD30 80241760 E620007C */ swc1 $f0, 0x7c($s1) -/* D3BD34 80241764 AE220070 */ sw $v0, 0x70($s1) -.L80241768: -/* D3BD38 80241768 C6400038 */ lwc1 $f0, 0x38($s2) -/* D3BD3C 8024176C C6220074 */ lwc1 $f2, 0x74($s1) -/* D3BD40 80241770 46020000 */ add.s $f0, $f0, $f2 -/* D3BD44 80241774 E6400038 */ swc1 $f0, 0x38($s2) -/* D3BD48 80241778 C640003C */ lwc1 $f0, 0x3c($s2) -/* D3BD4C 8024177C C6220078 */ lwc1 $f2, 0x78($s1) -/* D3BD50 80241780 46020000 */ add.s $f0, $f0, $f2 -/* D3BD54 80241784 E640003C */ swc1 $f0, 0x3c($s2) -/* D3BD58 80241788 C6400040 */ lwc1 $f0, 0x40($s2) -/* D3BD5C 8024178C C622007C */ lwc1 $f2, 0x7c($s1) -/* D3BD60 80241790 46020000 */ add.s $f0, $f0, $f2 -/* D3BD64 80241794 E6400040 */ swc1 $f0, 0x40($s2) -/* D3BD68 80241798 8E230070 */ lw $v1, 0x70($s1) -/* D3BD6C 8024179C 2463FFFF */ addiu $v1, $v1, -1 -/* D3BD70 802417A0 2C620001 */ sltiu $v0, $v1, 1 -/* D3BD74 802417A4 AE230070 */ sw $v1, 0x70($s1) -/* D3BD78 802417A8 8FBF001C */ lw $ra, 0x1c($sp) -/* D3BD7C 802417AC 8FB20018 */ lw $s2, 0x18($sp) -/* D3BD80 802417B0 8FB10014 */ lw $s1, 0x14($sp) -/* D3BD84 802417B4 8FB00010 */ lw $s0, 0x10($sp) -/* D3BD88 802417B8 D7B40020 */ ldc1 $f20, 0x20($sp) -/* D3BD8C 802417BC 00021040 */ sll $v0, $v0, 1 -/* D3BD90 802417C0 03E00008 */ jr $ra -/* D3BD94 802417C4 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index 6c830f1a9b..c6c01e1fc7 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242380_95D580); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 79119f7cc0..5dc8d5f6cd 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241210_96A3D0); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 39e7b1af09..09ebdc0fa9 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -88,7 +88,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802433B4_A1E4B4); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index ffbcd5fa49..3f6a1212bc 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -80,7 +80,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242524_B2E994); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 42110a0238..fb4a6ad2a2 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -120,7 +120,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242AAC_B3767C); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index dabb7538d5..126fc7b1eb 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -62,7 +62,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802412A0_8B1310); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index fab9255b53..947070a15b 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241540_7EC250); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338); @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241A18_7EC728); #include "world/common/SetManyVars.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4); +INCLUDE_ASM(ApiStatus, "world/area_mac/mac_00/7EB340", func_80241BA4_7EC8B4, ScriptInstance* script, s32 isInitialCall); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241D30_7ECA40); @@ -80,7 +80,25 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242078_7ECD88); +ApiStatus func_80242078_7ECD88(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + PlayerStatus* playerStatus = PLAYER_STATUS; + f32 var0 = get_variable(script, *args++); + f32 var1 = get_variable(script, *args++); + f32 var2 = get_variable(script, *args++); + f32 var3 = get_variable(script, *args++); + f32 temp; + + temp = (var3 - var1) / (var2 - var0); + + if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) { + script->varTable[0] = 0; + } else { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index a58a831e4e..1c6e82fb0c 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -72,7 +72,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242E20_8036A0); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 743a8f3e88..2f9dab34c7 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802426D0_825990); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index d9ecc7e362..cd479148d1 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -48,7 +48,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802413C0_832BC0); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 720e4bb115..db3265f824 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241370_843F40); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index 988afe6e52..e9195bf47e 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -78,7 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242230_8543A0); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 7d13ba69b1..cc74b3b3b1 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -86,7 +86,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241C78_9C7058); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index 5a0850fdad..ad4f99f871 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -70,7 +70,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242820_9D9840); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index b71f92c9ac..07aef28454 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -58,7 +58,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241580_CF90F0); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241610_CF9180); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 76ec88b1d9..1cad9e8f54 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -66,7 +66,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241A3C_D0716C); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 841f1b7b7f..184b1b44f0 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241650_D3BC20); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802416E0_D3BCB0); +#include "world/common/UnkMoveNpc.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98); diff --git a/src/world/common/UnkMoveNpc.inc.c b/src/world/common/UnkMoveNpc.inc.c new file mode 100644 index 0000000000..e77ac52f90 --- /dev/null +++ b/src/world/common/UnkMoveNpc.inc.c @@ -0,0 +1,19 @@ +#include "common.h" + +static ApiStatus UnkMoveNpc(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(NpcId_PARTNER); + + if (isInitialCall) { + script->functionTemp[1].f = get_float_variable(script, SI_VAR(0)) / 60.0f; + script->functionTemp[2].f = get_float_variable(script, SI_VAR(5)) / 60.0f; + script->functionTemp[3].f = get_float_variable(script, SI_VAR(1)) / 60.0f; + script->functionTemp[0].s = 60; + } + + npc->pos.x += script->functionTemp[1].f; + npc->pos.y += script->functionTemp[2].f; + npc->pos.z += script->functionTemp[3].f; + script->functionTemp[0].s--; + + return (script->functionTemp[0].s == 0) * ApiStatus_DONE2; +} diff --git a/tools/m2ctx.py b/tools/m2ctx.py index f6c477f0eb..59821b9c5c 100755 --- a/tools/m2ctx.py +++ b/tools/m2ctx.py @@ -26,7 +26,7 @@ def get_c_file(directory): def import_c_file(in_file): in_file = os.path.relpath(in_file, root_dir) - cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file] + cpp_command = ["gcc", "-E", "-P", "-Iinclude", "-Isrc", "-D_LANGUAGE_C", "-ffreestanding", "-DF3DEX_GBI_2", in_file] try: return subprocess.check_output(cpp_command, cwd=root_dir, encoding="utf-8") except subprocess.CalledProcessError: @@ -53,7 +53,7 @@ def main(): sys.exit("Cannot find appropriate c file dir. In argumentless mode, run this script from the c file's corresponding asm dir.") c_file = get_c_file(c_dir_path) c_file_path = os.path.join(c_dir_path, c_file) - + processed = import_c_file(c_file_path) processed_lines = processed.split("\n") output = [] From 31fc3ab212820db6ba30996001c738c8b57a0932 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 17:50:48 -0400 Subject: [PATCH 16/45] UnkPartnerFuncs --- .../dro_01/95B7E0/func_802422F0_95D4F0.s | 42 ------------------- .../dro_02/9694C0/func_80241180_96A340.s | 42 ------------------- .../hos_03/A1BDB0/func_80243324_A1E424.s | 42 ------------------- .../jan_02/B2C8A0/func_80242494_B2E904.s | 42 ------------------- .../jan_03/B34BD0/func_80242A1C_B375EC.s | 42 ------------------- .../kmr_02/8B0070/func_80241210_8B1280.s | 42 ------------------- .../mac_00/7EB340/func_802414B0_7EC1C0.s | 42 ------------------- .../mac_01/8017D0/func_80242D90_803610.s | 42 ------------------- .../mac_02/823BF0/func_80242640_825900.s | 42 ------------------- .../mac_03/831B20/func_80241330_832B30.s | 42 ------------------- .../mac_04/843030/func_802412E0_843EB0.s | 42 ------------------- .../mac_05/852170/func_802421A0_854310.s | 42 ------------------- .../nok_01/9C53E0/func_80241BE8_9C6FC8.s | 42 ------------------- .../nok_02/9D7AA0/func_80242790_9D97B0.s | 42 ------------------- .../sam_01/CF7E80/func_80241580_CF90F0.s | 42 ------------------- .../sam_02/D05F60/func_802419AC_D070DC.s | 42 ------------------- .../sam_11/D3ADA0/func_80241650_D3BC20.s | 42 ------------------- src/world/area_dro/dro_01/95B7E0.c | 4 +- src/world/area_dro/dro_02/9694C0.c | 4 +- src/world/area_hos/hos_03/A1BDB0.c | 4 +- src/world/area_jan/jan_02/B2C8A0.c | 4 +- src/world/area_jan/jan_03/B34BD0.c | 4 +- src/world/area_kmr/kmr_02/8B0070.c | 4 +- src/world/area_mac/mac_00/7EB340.c | 4 +- src/world/area_mac/mac_01/8017D0.c | 4 +- src/world/area_mac/mac_02/823BF0.c | 4 +- src/world/area_mac/mac_03/831B20.c | 4 +- src/world/area_mac/mac_04/843030.c | 4 +- src/world/area_mac/mac_05/852170.c | 4 +- src/world/area_nok/nok_01/9C53E0.c | 4 +- src/world/area_nok/nok_02/9D7AA0.c | 4 +- src/world/area_sam/sam_01/CF7E80.c | 4 +- src/world/area_sam/sam_02/D05F60.c | 4 +- src/world/area_sam/sam_11/D3ADA0.c | 4 +- ...UnkMoveNpc.inc.c => UnkPartnerFuncs.inc.c} | 20 ++++++++- 35 files changed, 36 insertions(+), 766 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s rename src/world/common/{UnkMoveNpc.inc.c => UnkPartnerFuncs.inc.c} (56%) diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s deleted file mode 100644 index d8dccf460e..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_802422F0_95D4F0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422F0_95D4F0 -/* 95D4F0 802422F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D4F4 802422F4 AFB10014 */ sw $s1, 0x14($sp) -/* 95D4F8 802422F8 0080882D */ daddu $s1, $a0, $zero -/* 95D4FC 802422FC AFB00010 */ sw $s0, 0x10($sp) -/* 95D500 80242300 00A0802D */ daddu $s0, $a1, $zero -/* 95D504 80242304 AFBF0018 */ sw $ra, 0x18($sp) -/* 95D508 80242308 0C00EABB */ jal get_npc_unsafe -/* 95D50C 8024230C 2404FFFC */ addiu $a0, $zero, -4 -/* 95D510 80242310 12000003 */ beqz $s0, .L80242320 -/* 95D514 80242314 0040182D */ daddu $v1, $v0, $zero -/* 95D518 80242318 2402003C */ addiu $v0, $zero, 0x3c -/* 95D51C 8024231C AE220070 */ sw $v0, 0x70($s1) -.L80242320: -/* 95D520 80242320 C462000C */ lwc1 $f2, 0xc($v1) -/* 95D524 80242324 3C0141F0 */ lui $at, 0x41f0 -/* 95D528 80242328 44810000 */ mtc1 $at, $f0 -/* 95D52C 8024232C 00000000 */ nop -/* 95D530 80242330 46001000 */ add.s $f0, $f2, $f0 -/* 95D534 80242334 3C0143B4 */ lui $at, 0x43b4 -/* 95D538 80242338 44811000 */ mtc1 $at, $f2 -/* 95D53C 8024233C 00000000 */ nop -/* 95D540 80242340 4600103E */ c.le.s $f2, $f0 -/* 95D544 80242344 00000000 */ nop -/* 95D548 80242348 45000003 */ bc1f .L80242358 -/* 95D54C 8024234C E460000C */ swc1 $f0, 0xc($v1) -/* 95D550 80242350 46020001 */ sub.s $f0, $f0, $f2 -/* 95D554 80242354 E460000C */ swc1 $f0, 0xc($v1) -.L80242358: -/* 95D558 80242358 8E230070 */ lw $v1, 0x70($s1) -/* 95D55C 8024235C 2463FFFF */ addiu $v1, $v1, -1 -/* 95D560 80242360 000317C3 */ sra $v0, $v1, 0x1f -/* 95D564 80242364 AE230070 */ sw $v1, 0x70($s1) -/* 95D568 80242368 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D56C 8024236C 8FB10014 */ lw $s1, 0x14($sp) -/* 95D570 80242370 8FB00010 */ lw $s0, 0x10($sp) -/* 95D574 80242374 30420002 */ andi $v0, $v0, 2 -/* 95D578 80242378 03E00008 */ jr $ra -/* 95D57C 8024237C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s deleted file mode 100644 index 52ec3dd2d2..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80241180_96A340.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241180_96A340 -/* 96A340 80241180 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A344 80241184 AFB10014 */ sw $s1, 0x14($sp) -/* 96A348 80241188 0080882D */ daddu $s1, $a0, $zero -/* 96A34C 8024118C AFB00010 */ sw $s0, 0x10($sp) -/* 96A350 80241190 00A0802D */ daddu $s0, $a1, $zero -/* 96A354 80241194 AFBF0018 */ sw $ra, 0x18($sp) -/* 96A358 80241198 0C00EABB */ jal get_npc_unsafe -/* 96A35C 8024119C 2404FFFC */ addiu $a0, $zero, -4 -/* 96A360 802411A0 12000003 */ beqz $s0, .L802411B0 -/* 96A364 802411A4 0040182D */ daddu $v1, $v0, $zero -/* 96A368 802411A8 2402003C */ addiu $v0, $zero, 0x3c -/* 96A36C 802411AC AE220070 */ sw $v0, 0x70($s1) -.L802411B0: -/* 96A370 802411B0 C462000C */ lwc1 $f2, 0xc($v1) -/* 96A374 802411B4 3C0141F0 */ lui $at, 0x41f0 -/* 96A378 802411B8 44810000 */ mtc1 $at, $f0 -/* 96A37C 802411BC 00000000 */ nop -/* 96A380 802411C0 46001000 */ add.s $f0, $f2, $f0 -/* 96A384 802411C4 3C0143B4 */ lui $at, 0x43b4 -/* 96A388 802411C8 44811000 */ mtc1 $at, $f2 -/* 96A38C 802411CC 00000000 */ nop -/* 96A390 802411D0 4600103E */ c.le.s $f2, $f0 -/* 96A394 802411D4 00000000 */ nop -/* 96A398 802411D8 45000003 */ bc1f .L802411E8 -/* 96A39C 802411DC E460000C */ swc1 $f0, 0xc($v1) -/* 96A3A0 802411E0 46020001 */ sub.s $f0, $f0, $f2 -/* 96A3A4 802411E4 E460000C */ swc1 $f0, 0xc($v1) -.L802411E8: -/* 96A3A8 802411E8 8E230070 */ lw $v1, 0x70($s1) -/* 96A3AC 802411EC 2463FFFF */ addiu $v1, $v1, -1 -/* 96A3B0 802411F0 000317C3 */ sra $v0, $v1, 0x1f -/* 96A3B4 802411F4 AE230070 */ sw $v1, 0x70($s1) -/* 96A3B8 802411F8 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A3BC 802411FC 8FB10014 */ lw $s1, 0x14($sp) -/* 96A3C0 80241200 8FB00010 */ lw $s0, 0x10($sp) -/* 96A3C4 80241204 30420002 */ andi $v0, $v0, 2 -/* 96A3C8 80241208 03E00008 */ jr $ra -/* 96A3CC 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s deleted file mode 100644 index 142902f789..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243324_A1E424.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243324_A1E424 -/* A1E424 80243324 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E428 80243328 AFB10014 */ sw $s1, 0x14($sp) -/* A1E42C 8024332C 0080882D */ daddu $s1, $a0, $zero -/* A1E430 80243330 AFB00010 */ sw $s0, 0x10($sp) -/* A1E434 80243334 00A0802D */ daddu $s0, $a1, $zero -/* A1E438 80243338 AFBF0018 */ sw $ra, 0x18($sp) -/* A1E43C 8024333C 0C00EABB */ jal get_npc_unsafe -/* A1E440 80243340 2404FFFC */ addiu $a0, $zero, -4 -/* A1E444 80243344 12000003 */ beqz $s0, .L80243354 -/* A1E448 80243348 0040182D */ daddu $v1, $v0, $zero -/* A1E44C 8024334C 2402003C */ addiu $v0, $zero, 0x3c -/* A1E450 80243350 AE220070 */ sw $v0, 0x70($s1) -.L80243354: -/* A1E454 80243354 C462000C */ lwc1 $f2, 0xc($v1) -/* A1E458 80243358 3C0141F0 */ lui $at, 0x41f0 -/* A1E45C 8024335C 44810000 */ mtc1 $at, $f0 -/* A1E460 80243360 00000000 */ nop -/* A1E464 80243364 46001000 */ add.s $f0, $f2, $f0 -/* A1E468 80243368 3C0143B4 */ lui $at, 0x43b4 -/* A1E46C 8024336C 44811000 */ mtc1 $at, $f2 -/* A1E470 80243370 00000000 */ nop -/* A1E474 80243374 4600103E */ c.le.s $f2, $f0 -/* A1E478 80243378 00000000 */ nop -/* A1E47C 8024337C 45000003 */ bc1f .L8024338C -/* A1E480 80243380 E460000C */ swc1 $f0, 0xc($v1) -/* A1E484 80243384 46020001 */ sub.s $f0, $f0, $f2 -/* A1E488 80243388 E460000C */ swc1 $f0, 0xc($v1) -.L8024338C: -/* A1E48C 8024338C 8E230070 */ lw $v1, 0x70($s1) -/* A1E490 80243390 2463FFFF */ addiu $v1, $v1, -1 -/* A1E494 80243394 000317C3 */ sra $v0, $v1, 0x1f -/* A1E498 80243398 AE230070 */ sw $v1, 0x70($s1) -/* A1E49C 8024339C 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E4A0 802433A0 8FB10014 */ lw $s1, 0x14($sp) -/* A1E4A4 802433A4 8FB00010 */ lw $s0, 0x10($sp) -/* A1E4A8 802433A8 30420002 */ andi $v0, $v0, 2 -/* A1E4AC 802433AC 03E00008 */ jr $ra -/* A1E4B0 802433B0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s deleted file mode 100644 index da066920cb..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242494_B2E904.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242494_B2E904 -/* B2E904 80242494 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E908 80242498 AFB10014 */ sw $s1, 0x14($sp) -/* B2E90C 8024249C 0080882D */ daddu $s1, $a0, $zero -/* B2E910 802424A0 AFB00010 */ sw $s0, 0x10($sp) -/* B2E914 802424A4 00A0802D */ daddu $s0, $a1, $zero -/* B2E918 802424A8 AFBF0018 */ sw $ra, 0x18($sp) -/* B2E91C 802424AC 0C00EABB */ jal get_npc_unsafe -/* B2E920 802424B0 2404FFFC */ addiu $a0, $zero, -4 -/* B2E924 802424B4 12000003 */ beqz $s0, .L802424C4 -/* B2E928 802424B8 0040182D */ daddu $v1, $v0, $zero -/* B2E92C 802424BC 2402003C */ addiu $v0, $zero, 0x3c -/* B2E930 802424C0 AE220070 */ sw $v0, 0x70($s1) -.L802424C4: -/* B2E934 802424C4 C462000C */ lwc1 $f2, 0xc($v1) -/* B2E938 802424C8 3C0141F0 */ lui $at, 0x41f0 -/* B2E93C 802424CC 44810000 */ mtc1 $at, $f0 -/* B2E940 802424D0 00000000 */ nop -/* B2E944 802424D4 46001000 */ add.s $f0, $f2, $f0 -/* B2E948 802424D8 3C0143B4 */ lui $at, 0x43b4 -/* B2E94C 802424DC 44811000 */ mtc1 $at, $f2 -/* B2E950 802424E0 00000000 */ nop -/* B2E954 802424E4 4600103E */ c.le.s $f2, $f0 -/* B2E958 802424E8 00000000 */ nop -/* B2E95C 802424EC 45000003 */ bc1f .L802424FC -/* B2E960 802424F0 E460000C */ swc1 $f0, 0xc($v1) -/* B2E964 802424F4 46020001 */ sub.s $f0, $f0, $f2 -/* B2E968 802424F8 E460000C */ swc1 $f0, 0xc($v1) -.L802424FC: -/* B2E96C 802424FC 8E230070 */ lw $v1, 0x70($s1) -/* B2E970 80242500 2463FFFF */ addiu $v1, $v1, -1 -/* B2E974 80242504 000317C3 */ sra $v0, $v1, 0x1f -/* B2E978 80242508 AE230070 */ sw $v1, 0x70($s1) -/* B2E97C 8024250C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E980 80242510 8FB10014 */ lw $s1, 0x14($sp) -/* B2E984 80242514 8FB00010 */ lw $s0, 0x10($sp) -/* B2E988 80242518 30420002 */ andi $v0, $v0, 2 -/* B2E98C 8024251C 03E00008 */ jr $ra -/* B2E990 80242520 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s deleted file mode 100644 index e7d25b3e55..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242A1C_B375EC.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A1C_B375EC -/* B375EC 80242A1C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B375F0 80242A20 AFB10014 */ sw $s1, 0x14($sp) -/* B375F4 80242A24 0080882D */ daddu $s1, $a0, $zero -/* B375F8 80242A28 AFB00010 */ sw $s0, 0x10($sp) -/* B375FC 80242A2C 00A0802D */ daddu $s0, $a1, $zero -/* B37600 80242A30 AFBF0018 */ sw $ra, 0x18($sp) -/* B37604 80242A34 0C00EABB */ jal get_npc_unsafe -/* B37608 80242A38 2404FFFC */ addiu $a0, $zero, -4 -/* B3760C 80242A3C 12000003 */ beqz $s0, .L80242A4C -/* B37610 80242A40 0040182D */ daddu $v1, $v0, $zero -/* B37614 80242A44 2402003C */ addiu $v0, $zero, 0x3c -/* B37618 80242A48 AE220070 */ sw $v0, 0x70($s1) -.L80242A4C: -/* B3761C 80242A4C C462000C */ lwc1 $f2, 0xc($v1) -/* B37620 80242A50 3C0141F0 */ lui $at, 0x41f0 -/* B37624 80242A54 44810000 */ mtc1 $at, $f0 -/* B37628 80242A58 00000000 */ nop -/* B3762C 80242A5C 46001000 */ add.s $f0, $f2, $f0 -/* B37630 80242A60 3C0143B4 */ lui $at, 0x43b4 -/* B37634 80242A64 44811000 */ mtc1 $at, $f2 -/* B37638 80242A68 00000000 */ nop -/* B3763C 80242A6C 4600103E */ c.le.s $f2, $f0 -/* B37640 80242A70 00000000 */ nop -/* B37644 80242A74 45000003 */ bc1f .L80242A84 -/* B37648 80242A78 E460000C */ swc1 $f0, 0xc($v1) -/* B3764C 80242A7C 46020001 */ sub.s $f0, $f0, $f2 -/* B37650 80242A80 E460000C */ swc1 $f0, 0xc($v1) -.L80242A84: -/* B37654 80242A84 8E230070 */ lw $v1, 0x70($s1) -/* B37658 80242A88 2463FFFF */ addiu $v1, $v1, -1 -/* B3765C 80242A8C 000317C3 */ sra $v0, $v1, 0x1f -/* B37660 80242A90 AE230070 */ sw $v1, 0x70($s1) -/* B37664 80242A94 8FBF0018 */ lw $ra, 0x18($sp) -/* B37668 80242A98 8FB10014 */ lw $s1, 0x14($sp) -/* B3766C 80242A9C 8FB00010 */ lw $s0, 0x10($sp) -/* B37670 80242AA0 30420002 */ andi $v0, $v0, 2 -/* B37674 80242AA4 03E00008 */ jr $ra -/* B37678 80242AA8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s deleted file mode 100644 index d18cd9c7cf..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80241210_8B1280.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_8B1280 -/* 8B1280 80241210 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B1284 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 8B1288 80241218 0080882D */ daddu $s1, $a0, $zero -/* 8B128C 8024121C AFB00010 */ sw $s0, 0x10($sp) -/* 8B1290 80241220 00A0802D */ daddu $s0, $a1, $zero -/* 8B1294 80241224 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B1298 80241228 0C00EABB */ jal get_npc_unsafe -/* 8B129C 8024122C 2404FFFC */ addiu $a0, $zero, -4 -/* 8B12A0 80241230 12000003 */ beqz $s0, .L80241240 -/* 8B12A4 80241234 0040182D */ daddu $v1, $v0, $zero -/* 8B12A8 80241238 2402003C */ addiu $v0, $zero, 0x3c -/* 8B12AC 8024123C AE220070 */ sw $v0, 0x70($s1) -.L80241240: -/* 8B12B0 80241240 C462000C */ lwc1 $f2, 0xc($v1) -/* 8B12B4 80241244 3C0141F0 */ lui $at, 0x41f0 -/* 8B12B8 80241248 44810000 */ mtc1 $at, $f0 -/* 8B12BC 8024124C 00000000 */ nop -/* 8B12C0 80241250 46001000 */ add.s $f0, $f2, $f0 -/* 8B12C4 80241254 3C0143B4 */ lui $at, 0x43b4 -/* 8B12C8 80241258 44811000 */ mtc1 $at, $f2 -/* 8B12CC 8024125C 00000000 */ nop -/* 8B12D0 80241260 4600103E */ c.le.s $f2, $f0 -/* 8B12D4 80241264 00000000 */ nop -/* 8B12D8 80241268 45000003 */ bc1f .L80241278 -/* 8B12DC 8024126C E460000C */ swc1 $f0, 0xc($v1) -/* 8B12E0 80241270 46020001 */ sub.s $f0, $f0, $f2 -/* 8B12E4 80241274 E460000C */ swc1 $f0, 0xc($v1) -.L80241278: -/* 8B12E8 80241278 8E230070 */ lw $v1, 0x70($s1) -/* 8B12EC 8024127C 2463FFFF */ addiu $v1, $v1, -1 -/* 8B12F0 80241280 000317C3 */ sra $v0, $v1, 0x1f -/* 8B12F4 80241284 AE230070 */ sw $v1, 0x70($s1) -/* 8B12F8 80241288 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B12FC 8024128C 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1300 80241290 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1304 80241294 30420002 */ andi $v0, $v0, 2 -/* 8B1308 80241298 03E00008 */ jr $ra -/* 8B130C 8024129C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s deleted file mode 100644 index 7cf24cd05d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_802414B0_7EC1C0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802414B0_7EC1C0 -/* 7EC1C0 802414B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EC1C4 802414B4 AFB10014 */ sw $s1, 0x14($sp) -/* 7EC1C8 802414B8 0080882D */ daddu $s1, $a0, $zero -/* 7EC1CC 802414BC AFB00010 */ sw $s0, 0x10($sp) -/* 7EC1D0 802414C0 00A0802D */ daddu $s0, $a1, $zero -/* 7EC1D4 802414C4 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EC1D8 802414C8 0C00EABB */ jal get_npc_unsafe -/* 7EC1DC 802414CC 2404FFFC */ addiu $a0, $zero, -4 -/* 7EC1E0 802414D0 12000003 */ beqz $s0, .L802414E0 -/* 7EC1E4 802414D4 0040182D */ daddu $v1, $v0, $zero -/* 7EC1E8 802414D8 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC1EC 802414DC AE220070 */ sw $v0, 0x70($s1) -.L802414E0: -/* 7EC1F0 802414E0 C462000C */ lwc1 $f2, 0xc($v1) -/* 7EC1F4 802414E4 3C0141F0 */ lui $at, 0x41f0 -/* 7EC1F8 802414E8 44810000 */ mtc1 $at, $f0 -/* 7EC1FC 802414EC 00000000 */ nop -/* 7EC200 802414F0 46001000 */ add.s $f0, $f2, $f0 -/* 7EC204 802414F4 3C0143B4 */ lui $at, 0x43b4 -/* 7EC208 802414F8 44811000 */ mtc1 $at, $f2 -/* 7EC20C 802414FC 00000000 */ nop -/* 7EC210 80241500 4600103E */ c.le.s $f2, $f0 -/* 7EC214 80241504 00000000 */ nop -/* 7EC218 80241508 45000003 */ bc1f .L80241518 -/* 7EC21C 8024150C E460000C */ swc1 $f0, 0xc($v1) -/* 7EC220 80241510 46020001 */ sub.s $f0, $f0, $f2 -/* 7EC224 80241514 E460000C */ swc1 $f0, 0xc($v1) -.L80241518: -/* 7EC228 80241518 8E230070 */ lw $v1, 0x70($s1) -/* 7EC22C 8024151C 2463FFFF */ addiu $v1, $v1, -1 -/* 7EC230 80241520 000317C3 */ sra $v0, $v1, 0x1f -/* 7EC234 80241524 AE230070 */ sw $v1, 0x70($s1) -/* 7EC238 80241528 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EC23C 8024152C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EC240 80241530 8FB00010 */ lw $s0, 0x10($sp) -/* 7EC244 80241534 30420002 */ andi $v0, $v0, 2 -/* 7EC248 80241538 03E00008 */ jr $ra -/* 7EC24C 8024153C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s deleted file mode 100644 index 9d627a7f31..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D90_803610.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D90_803610 -/* 803610 80242D90 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803614 80242D94 AFB10014 */ sw $s1, 0x14($sp) -/* 803618 80242D98 0080882D */ daddu $s1, $a0, $zero -/* 80361C 80242D9C AFB00010 */ sw $s0, 0x10($sp) -/* 803620 80242DA0 00A0802D */ daddu $s0, $a1, $zero -/* 803624 80242DA4 AFBF0018 */ sw $ra, 0x18($sp) -/* 803628 80242DA8 0C00EABB */ jal get_npc_unsafe -/* 80362C 80242DAC 2404FFFC */ addiu $a0, $zero, -4 -/* 803630 80242DB0 12000003 */ beqz $s0, .L80242DC0 -/* 803634 80242DB4 0040182D */ daddu $v1, $v0, $zero -/* 803638 80242DB8 2402003C */ addiu $v0, $zero, 0x3c -/* 80363C 80242DBC AE220070 */ sw $v0, 0x70($s1) -.L80242DC0: -/* 803640 80242DC0 C462000C */ lwc1 $f2, 0xc($v1) -/* 803644 80242DC4 3C0141F0 */ lui $at, 0x41f0 -/* 803648 80242DC8 44810000 */ mtc1 $at, $f0 -/* 80364C 80242DCC 00000000 */ nop -/* 803650 80242DD0 46001000 */ add.s $f0, $f2, $f0 -/* 803654 80242DD4 3C0143B4 */ lui $at, 0x43b4 -/* 803658 80242DD8 44811000 */ mtc1 $at, $f2 -/* 80365C 80242DDC 00000000 */ nop -/* 803660 80242DE0 4600103E */ c.le.s $f2, $f0 -/* 803664 80242DE4 00000000 */ nop -/* 803668 80242DE8 45000003 */ bc1f .L80242DF8 -/* 80366C 80242DEC E460000C */ swc1 $f0, 0xc($v1) -/* 803670 80242DF0 46020001 */ sub.s $f0, $f0, $f2 -/* 803674 80242DF4 E460000C */ swc1 $f0, 0xc($v1) -.L80242DF8: -/* 803678 80242DF8 8E230070 */ lw $v1, 0x70($s1) -/* 80367C 80242DFC 2463FFFF */ addiu $v1, $v1, -1 -/* 803680 80242E00 000317C3 */ sra $v0, $v1, 0x1f -/* 803684 80242E04 AE230070 */ sw $v1, 0x70($s1) -/* 803688 80242E08 8FBF0018 */ lw $ra, 0x18($sp) -/* 80368C 80242E0C 8FB10014 */ lw $s1, 0x14($sp) -/* 803690 80242E10 8FB00010 */ lw $s0, 0x10($sp) -/* 803694 80242E14 30420002 */ andi $v0, $v0, 2 -/* 803698 80242E18 03E00008 */ jr $ra -/* 80369C 80242E1C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s deleted file mode 100644 index e150f1fbd5..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_80242640_825900.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242640_825900 -/* 825900 80242640 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825904 80242644 AFB10014 */ sw $s1, 0x14($sp) -/* 825908 80242648 0080882D */ daddu $s1, $a0, $zero -/* 82590C 8024264C AFB00010 */ sw $s0, 0x10($sp) -/* 825910 80242650 00A0802D */ daddu $s0, $a1, $zero -/* 825914 80242654 AFBF0018 */ sw $ra, 0x18($sp) -/* 825918 80242658 0C00EABB */ jal get_npc_unsafe -/* 82591C 8024265C 2404FFFC */ addiu $a0, $zero, -4 -/* 825920 80242660 12000003 */ beqz $s0, .L80242670 -/* 825924 80242664 0040182D */ daddu $v1, $v0, $zero -/* 825928 80242668 2402003C */ addiu $v0, $zero, 0x3c -/* 82592C 8024266C AE220070 */ sw $v0, 0x70($s1) -.L80242670: -/* 825930 80242670 C462000C */ lwc1 $f2, 0xc($v1) -/* 825934 80242674 3C0141F0 */ lui $at, 0x41f0 -/* 825938 80242678 44810000 */ mtc1 $at, $f0 -/* 82593C 8024267C 00000000 */ nop -/* 825940 80242680 46001000 */ add.s $f0, $f2, $f0 -/* 825944 80242684 3C0143B4 */ lui $at, 0x43b4 -/* 825948 80242688 44811000 */ mtc1 $at, $f2 -/* 82594C 8024268C 00000000 */ nop -/* 825950 80242690 4600103E */ c.le.s $f2, $f0 -/* 825954 80242694 00000000 */ nop -/* 825958 80242698 45000003 */ bc1f .L802426A8 -/* 82595C 8024269C E460000C */ swc1 $f0, 0xc($v1) -/* 825960 802426A0 46020001 */ sub.s $f0, $f0, $f2 -/* 825964 802426A4 E460000C */ swc1 $f0, 0xc($v1) -.L802426A8: -/* 825968 802426A8 8E230070 */ lw $v1, 0x70($s1) -/* 82596C 802426AC 2463FFFF */ addiu $v1, $v1, -1 -/* 825970 802426B0 000317C3 */ sra $v0, $v1, 0x1f -/* 825974 802426B4 AE230070 */ sw $v1, 0x70($s1) -/* 825978 802426B8 8FBF0018 */ lw $ra, 0x18($sp) -/* 82597C 802426BC 8FB10014 */ lw $s1, 0x14($sp) -/* 825980 802426C0 8FB00010 */ lw $s0, 0x10($sp) -/* 825984 802426C4 30420002 */ andi $v0, $v0, 2 -/* 825988 802426C8 03E00008 */ jr $ra -/* 82598C 802426CC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s deleted file mode 100644 index 4f4864ebad..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241330_832B30.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241330_832B30 -/* 832B30 80241330 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832B34 80241334 AFB10014 */ sw $s1, 0x14($sp) -/* 832B38 80241338 0080882D */ daddu $s1, $a0, $zero -/* 832B3C 8024133C AFB00010 */ sw $s0, 0x10($sp) -/* 832B40 80241340 00A0802D */ daddu $s0, $a1, $zero -/* 832B44 80241344 AFBF0018 */ sw $ra, 0x18($sp) -/* 832B48 80241348 0C00EABB */ jal get_npc_unsafe -/* 832B4C 8024134C 2404FFFC */ addiu $a0, $zero, -4 -/* 832B50 80241350 12000003 */ beqz $s0, .L80241360 -/* 832B54 80241354 0040182D */ daddu $v1, $v0, $zero -/* 832B58 80241358 2402003C */ addiu $v0, $zero, 0x3c -/* 832B5C 8024135C AE220070 */ sw $v0, 0x70($s1) -.L80241360: -/* 832B60 80241360 C462000C */ lwc1 $f2, 0xc($v1) -/* 832B64 80241364 3C0141F0 */ lui $at, 0x41f0 -/* 832B68 80241368 44810000 */ mtc1 $at, $f0 -/* 832B6C 8024136C 00000000 */ nop -/* 832B70 80241370 46001000 */ add.s $f0, $f2, $f0 -/* 832B74 80241374 3C0143B4 */ lui $at, 0x43b4 -/* 832B78 80241378 44811000 */ mtc1 $at, $f2 -/* 832B7C 8024137C 00000000 */ nop -/* 832B80 80241380 4600103E */ c.le.s $f2, $f0 -/* 832B84 80241384 00000000 */ nop -/* 832B88 80241388 45000003 */ bc1f .L80241398 -/* 832B8C 8024138C E460000C */ swc1 $f0, 0xc($v1) -/* 832B90 80241390 46020001 */ sub.s $f0, $f0, $f2 -/* 832B94 80241394 E460000C */ swc1 $f0, 0xc($v1) -.L80241398: -/* 832B98 80241398 8E230070 */ lw $v1, 0x70($s1) -/* 832B9C 8024139C 2463FFFF */ addiu $v1, $v1, -1 -/* 832BA0 802413A0 000317C3 */ sra $v0, $v1, 0x1f -/* 832BA4 802413A4 AE230070 */ sw $v1, 0x70($s1) -/* 832BA8 802413A8 8FBF0018 */ lw $ra, 0x18($sp) -/* 832BAC 802413AC 8FB10014 */ lw $s1, 0x14($sp) -/* 832BB0 802413B0 8FB00010 */ lw $s0, 0x10($sp) -/* 832BB4 802413B4 30420002 */ andi $v0, $v0, 2 -/* 832BB8 802413B8 03E00008 */ jr $ra -/* 832BBC 802413BC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s deleted file mode 100644 index 162d8949bb..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_802412E0_843EB0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_843EB0 -/* 843EB0 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843EB4 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* 843EB8 802412E8 0080882D */ daddu $s1, $a0, $zero -/* 843EBC 802412EC AFB00010 */ sw $s0, 0x10($sp) -/* 843EC0 802412F0 00A0802D */ daddu $s0, $a1, $zero -/* 843EC4 802412F4 AFBF0018 */ sw $ra, 0x18($sp) -/* 843EC8 802412F8 0C00EABB */ jal get_npc_unsafe -/* 843ECC 802412FC 2404FFFC */ addiu $a0, $zero, -4 -/* 843ED0 80241300 12000003 */ beqz $s0, .L80241310 -/* 843ED4 80241304 0040182D */ daddu $v1, $v0, $zero -/* 843ED8 80241308 2402003C */ addiu $v0, $zero, 0x3c -/* 843EDC 8024130C AE220070 */ sw $v0, 0x70($s1) -.L80241310: -/* 843EE0 80241310 C462000C */ lwc1 $f2, 0xc($v1) -/* 843EE4 80241314 3C0141F0 */ lui $at, 0x41f0 -/* 843EE8 80241318 44810000 */ mtc1 $at, $f0 -/* 843EEC 8024131C 00000000 */ nop -/* 843EF0 80241320 46001000 */ add.s $f0, $f2, $f0 -/* 843EF4 80241324 3C0143B4 */ lui $at, 0x43b4 -/* 843EF8 80241328 44811000 */ mtc1 $at, $f2 -/* 843EFC 8024132C 00000000 */ nop -/* 843F00 80241330 4600103E */ c.le.s $f2, $f0 -/* 843F04 80241334 00000000 */ nop -/* 843F08 80241338 45000003 */ bc1f .L80241348 -/* 843F0C 8024133C E460000C */ swc1 $f0, 0xc($v1) -/* 843F10 80241340 46020001 */ sub.s $f0, $f0, $f2 -/* 843F14 80241344 E460000C */ swc1 $f0, 0xc($v1) -.L80241348: -/* 843F18 80241348 8E230070 */ lw $v1, 0x70($s1) -/* 843F1C 8024134C 2463FFFF */ addiu $v1, $v1, -1 -/* 843F20 80241350 000317C3 */ sra $v0, $v1, 0x1f -/* 843F24 80241354 AE230070 */ sw $v1, 0x70($s1) -/* 843F28 80241358 8FBF0018 */ lw $ra, 0x18($sp) -/* 843F2C 8024135C 8FB10014 */ lw $s1, 0x14($sp) -/* 843F30 80241360 8FB00010 */ lw $s0, 0x10($sp) -/* 843F34 80241364 30420002 */ andi $v0, $v0, 2 -/* 843F38 80241368 03E00008 */ jr $ra -/* 843F3C 8024136C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s deleted file mode 100644 index 5b145b0814..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_802421A0_854310.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421A0_854310 -/* 854310 802421A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854314 802421A4 AFB10014 */ sw $s1, 0x14($sp) -/* 854318 802421A8 0080882D */ daddu $s1, $a0, $zero -/* 85431C 802421AC AFB00010 */ sw $s0, 0x10($sp) -/* 854320 802421B0 00A0802D */ daddu $s0, $a1, $zero -/* 854324 802421B4 AFBF0018 */ sw $ra, 0x18($sp) -/* 854328 802421B8 0C00EABB */ jal get_npc_unsafe -/* 85432C 802421BC 2404FFFC */ addiu $a0, $zero, -4 -/* 854330 802421C0 12000003 */ beqz $s0, .L802421D0 -/* 854334 802421C4 0040182D */ daddu $v1, $v0, $zero -/* 854338 802421C8 2402003C */ addiu $v0, $zero, 0x3c -/* 85433C 802421CC AE220070 */ sw $v0, 0x70($s1) -.L802421D0: -/* 854340 802421D0 C462000C */ lwc1 $f2, 0xc($v1) -/* 854344 802421D4 3C0141F0 */ lui $at, 0x41f0 -/* 854348 802421D8 44810000 */ mtc1 $at, $f0 -/* 85434C 802421DC 00000000 */ nop -/* 854350 802421E0 46001000 */ add.s $f0, $f2, $f0 -/* 854354 802421E4 3C0143B4 */ lui $at, 0x43b4 -/* 854358 802421E8 44811000 */ mtc1 $at, $f2 -/* 85435C 802421EC 00000000 */ nop -/* 854360 802421F0 4600103E */ c.le.s $f2, $f0 -/* 854364 802421F4 00000000 */ nop -/* 854368 802421F8 45000003 */ bc1f .L80242208 -/* 85436C 802421FC E460000C */ swc1 $f0, 0xc($v1) -/* 854370 80242200 46020001 */ sub.s $f0, $f0, $f2 -/* 854374 80242204 E460000C */ swc1 $f0, 0xc($v1) -.L80242208: -/* 854378 80242208 8E230070 */ lw $v1, 0x70($s1) -/* 85437C 8024220C 2463FFFF */ addiu $v1, $v1, -1 -/* 854380 80242210 000317C3 */ sra $v0, $v1, 0x1f -/* 854384 80242214 AE230070 */ sw $v1, 0x70($s1) -/* 854388 80242218 8FBF0018 */ lw $ra, 0x18($sp) -/* 85438C 8024221C 8FB10014 */ lw $s1, 0x14($sp) -/* 854390 80242220 8FB00010 */ lw $s0, 0x10($sp) -/* 854394 80242224 30420002 */ andi $v0, $v0, 2 -/* 854398 80242228 03E00008 */ jr $ra -/* 85439C 8024222C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s deleted file mode 100644 index 26e45f88ed..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241BE8_9C6FC8.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241BE8_9C6FC8 -/* 9C6FC8 80241BE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6FCC 80241BEC AFB10014 */ sw $s1, 0x14($sp) -/* 9C6FD0 80241BF0 0080882D */ daddu $s1, $a0, $zero -/* 9C6FD4 80241BF4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6FD8 80241BF8 00A0802D */ daddu $s0, $a1, $zero -/* 9C6FDC 80241BFC AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6FE0 80241C00 0C00EABB */ jal get_npc_unsafe -/* 9C6FE4 80241C04 2404FFFC */ addiu $a0, $zero, -4 -/* 9C6FE8 80241C08 12000003 */ beqz $s0, .L80241C18 -/* 9C6FEC 80241C0C 0040182D */ daddu $v1, $v0, $zero -/* 9C6FF0 80241C10 2402003C */ addiu $v0, $zero, 0x3c -/* 9C6FF4 80241C14 AE220070 */ sw $v0, 0x70($s1) -.L80241C18: -/* 9C6FF8 80241C18 C462000C */ lwc1 $f2, 0xc($v1) -/* 9C6FFC 80241C1C 3C0141F0 */ lui $at, 0x41f0 -/* 9C7000 80241C20 44810000 */ mtc1 $at, $f0 -/* 9C7004 80241C24 00000000 */ nop -/* 9C7008 80241C28 46001000 */ add.s $f0, $f2, $f0 -/* 9C700C 80241C2C 3C0143B4 */ lui $at, 0x43b4 -/* 9C7010 80241C30 44811000 */ mtc1 $at, $f2 -/* 9C7014 80241C34 00000000 */ nop -/* 9C7018 80241C38 4600103E */ c.le.s $f2, $f0 -/* 9C701C 80241C3C 00000000 */ nop -/* 9C7020 80241C40 45000003 */ bc1f .L80241C50 -/* 9C7024 80241C44 E460000C */ swc1 $f0, 0xc($v1) -/* 9C7028 80241C48 46020001 */ sub.s $f0, $f0, $f2 -/* 9C702C 80241C4C E460000C */ swc1 $f0, 0xc($v1) -.L80241C50: -/* 9C7030 80241C50 8E230070 */ lw $v1, 0x70($s1) -/* 9C7034 80241C54 2463FFFF */ addiu $v1, $v1, -1 -/* 9C7038 80241C58 000317C3 */ sra $v0, $v1, 0x1f -/* 9C703C 80241C5C AE230070 */ sw $v1, 0x70($s1) -/* 9C7040 80241C60 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C7044 80241C64 8FB10014 */ lw $s1, 0x14($sp) -/* 9C7048 80241C68 8FB00010 */ lw $s0, 0x10($sp) -/* 9C704C 80241C6C 30420002 */ andi $v0, $v0, 2 -/* 9C7050 80241C70 03E00008 */ jr $ra -/* 9C7054 80241C74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s deleted file mode 100644 index 0b09a0ed76..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_80242790_9D97B0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242790_9D97B0 -/* 9D97B0 80242790 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D97B4 80242794 AFB10014 */ sw $s1, 0x14($sp) -/* 9D97B8 80242798 0080882D */ daddu $s1, $a0, $zero -/* 9D97BC 8024279C AFB00010 */ sw $s0, 0x10($sp) -/* 9D97C0 802427A0 00A0802D */ daddu $s0, $a1, $zero -/* 9D97C4 802427A4 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D97C8 802427A8 0C00EABB */ jal get_npc_unsafe -/* 9D97CC 802427AC 2404FFFC */ addiu $a0, $zero, -4 -/* 9D97D0 802427B0 12000003 */ beqz $s0, .L802427C0 -/* 9D97D4 802427B4 0040182D */ daddu $v1, $v0, $zero -/* 9D97D8 802427B8 2402003C */ addiu $v0, $zero, 0x3c -/* 9D97DC 802427BC AE220070 */ sw $v0, 0x70($s1) -.L802427C0: -/* 9D97E0 802427C0 C462000C */ lwc1 $f2, 0xc($v1) -/* 9D97E4 802427C4 3C0141F0 */ lui $at, 0x41f0 -/* 9D97E8 802427C8 44810000 */ mtc1 $at, $f0 -/* 9D97EC 802427CC 00000000 */ nop -/* 9D97F0 802427D0 46001000 */ add.s $f0, $f2, $f0 -/* 9D97F4 802427D4 3C0143B4 */ lui $at, 0x43b4 -/* 9D97F8 802427D8 44811000 */ mtc1 $at, $f2 -/* 9D97FC 802427DC 00000000 */ nop -/* 9D9800 802427E0 4600103E */ c.le.s $f2, $f0 -/* 9D9804 802427E4 00000000 */ nop -/* 9D9808 802427E8 45000003 */ bc1f .L802427F8 -/* 9D980C 802427EC E460000C */ swc1 $f0, 0xc($v1) -/* 9D9810 802427F0 46020001 */ sub.s $f0, $f0, $f2 -/* 9D9814 802427F4 E460000C */ swc1 $f0, 0xc($v1) -.L802427F8: -/* 9D9818 802427F8 8E230070 */ lw $v1, 0x70($s1) -/* 9D981C 802427FC 2463FFFF */ addiu $v1, $v1, -1 -/* 9D9820 80242800 000317C3 */ sra $v0, $v1, 0x1f -/* 9D9824 80242804 AE230070 */ sw $v1, 0x70($s1) -/* 9D9828 80242808 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D982C 8024280C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9830 80242810 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9834 80242814 30420002 */ andi $v0, $v0, 2 -/* 9D9838 80242818 03E00008 */ jr $ra -/* 9D983C 8024281C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s deleted file mode 100644 index d9ad39c33f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_80241580_CF90F0.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241580_CF90F0 -/* CF90F0 80241580 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF90F4 80241584 AFB10014 */ sw $s1, 0x14($sp) -/* CF90F8 80241588 0080882D */ daddu $s1, $a0, $zero -/* CF90FC 8024158C AFB00010 */ sw $s0, 0x10($sp) -/* CF9100 80241590 00A0802D */ daddu $s0, $a1, $zero -/* CF9104 80241594 AFBF0018 */ sw $ra, 0x18($sp) -/* CF9108 80241598 0C00EABB */ jal get_npc_unsafe -/* CF910C 8024159C 2404FFFC */ addiu $a0, $zero, -4 -/* CF9110 802415A0 12000003 */ beqz $s0, .L802415B0 -/* CF9114 802415A4 0040182D */ daddu $v1, $v0, $zero -/* CF9118 802415A8 2402003C */ addiu $v0, $zero, 0x3c -/* CF911C 802415AC AE220070 */ sw $v0, 0x70($s1) -.L802415B0: -/* CF9120 802415B0 C462000C */ lwc1 $f2, 0xc($v1) -/* CF9124 802415B4 3C0141F0 */ lui $at, 0x41f0 -/* CF9128 802415B8 44810000 */ mtc1 $at, $f0 -/* CF912C 802415BC 00000000 */ nop -/* CF9130 802415C0 46001000 */ add.s $f0, $f2, $f0 -/* CF9134 802415C4 3C0143B4 */ lui $at, 0x43b4 -/* CF9138 802415C8 44811000 */ mtc1 $at, $f2 -/* CF913C 802415CC 00000000 */ nop -/* CF9140 802415D0 4600103E */ c.le.s $f2, $f0 -/* CF9144 802415D4 00000000 */ nop -/* CF9148 802415D8 45000003 */ bc1f .L802415E8 -/* CF914C 802415DC E460000C */ swc1 $f0, 0xc($v1) -/* CF9150 802415E0 46020001 */ sub.s $f0, $f0, $f2 -/* CF9154 802415E4 E460000C */ swc1 $f0, 0xc($v1) -.L802415E8: -/* CF9158 802415E8 8E230070 */ lw $v1, 0x70($s1) -/* CF915C 802415EC 2463FFFF */ addiu $v1, $v1, -1 -/* CF9160 802415F0 000317C3 */ sra $v0, $v1, 0x1f -/* CF9164 802415F4 AE230070 */ sw $v1, 0x70($s1) -/* CF9168 802415F8 8FBF0018 */ lw $ra, 0x18($sp) -/* CF916C 802415FC 8FB10014 */ lw $s1, 0x14($sp) -/* CF9170 80241600 8FB00010 */ lw $s0, 0x10($sp) -/* CF9174 80241604 30420002 */ andi $v0, $v0, 2 -/* CF9178 80241608 03E00008 */ jr $ra -/* CF917C 8024160C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s deleted file mode 100644 index d6e0afad60..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_802419AC_D070DC.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802419AC_D070DC -/* D070DC 802419AC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D070E0 802419B0 AFB10014 */ sw $s1, 0x14($sp) -/* D070E4 802419B4 0080882D */ daddu $s1, $a0, $zero -/* D070E8 802419B8 AFB00010 */ sw $s0, 0x10($sp) -/* D070EC 802419BC 00A0802D */ daddu $s0, $a1, $zero -/* D070F0 802419C0 AFBF0018 */ sw $ra, 0x18($sp) -/* D070F4 802419C4 0C00EABB */ jal get_npc_unsafe -/* D070F8 802419C8 2404FFFC */ addiu $a0, $zero, -4 -/* D070FC 802419CC 12000003 */ beqz $s0, .L802419DC -/* D07100 802419D0 0040182D */ daddu $v1, $v0, $zero -/* D07104 802419D4 2402003C */ addiu $v0, $zero, 0x3c -/* D07108 802419D8 AE220070 */ sw $v0, 0x70($s1) -.L802419DC: -/* D0710C 802419DC C462000C */ lwc1 $f2, 0xc($v1) -/* D07110 802419E0 3C0141F0 */ lui $at, 0x41f0 -/* D07114 802419E4 44810000 */ mtc1 $at, $f0 -/* D07118 802419E8 00000000 */ nop -/* D0711C 802419EC 46001000 */ add.s $f0, $f2, $f0 -/* D07120 802419F0 3C0143B4 */ lui $at, 0x43b4 -/* D07124 802419F4 44811000 */ mtc1 $at, $f2 -/* D07128 802419F8 00000000 */ nop -/* D0712C 802419FC 4600103E */ c.le.s $f2, $f0 -/* D07130 80241A00 00000000 */ nop -/* D07134 80241A04 45000003 */ bc1f .L80241A14 -/* D07138 80241A08 E460000C */ swc1 $f0, 0xc($v1) -/* D0713C 80241A0C 46020001 */ sub.s $f0, $f0, $f2 -/* D07140 80241A10 E460000C */ swc1 $f0, 0xc($v1) -.L80241A14: -/* D07144 80241A14 8E230070 */ lw $v1, 0x70($s1) -/* D07148 80241A18 2463FFFF */ addiu $v1, $v1, -1 -/* D0714C 80241A1C 000317C3 */ sra $v0, $v1, 0x1f -/* D07150 80241A20 AE230070 */ sw $v1, 0x70($s1) -/* D07154 80241A24 8FBF0018 */ lw $ra, 0x18($sp) -/* D07158 80241A28 8FB10014 */ lw $s1, 0x14($sp) -/* D0715C 80241A2C 8FB00010 */ lw $s0, 0x10($sp) -/* D07160 80241A30 30420002 */ andi $v0, $v0, 2 -/* D07164 80241A34 03E00008 */ jr $ra -/* D07168 80241A38 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s deleted file mode 100644 index 1c705acb9e..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_80241650_D3BC20.s +++ /dev/null @@ -1,42 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241650_D3BC20 -/* D3BC20 80241650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3BC24 80241654 AFB10014 */ sw $s1, 0x14($sp) -/* D3BC28 80241658 0080882D */ daddu $s1, $a0, $zero -/* D3BC2C 8024165C AFB00010 */ sw $s0, 0x10($sp) -/* D3BC30 80241660 00A0802D */ daddu $s0, $a1, $zero -/* D3BC34 80241664 AFBF0018 */ sw $ra, 0x18($sp) -/* D3BC38 80241668 0C00EABB */ jal get_npc_unsafe -/* D3BC3C 8024166C 2404FFFC */ addiu $a0, $zero, -4 -/* D3BC40 80241670 12000003 */ beqz $s0, .L80241680 -/* D3BC44 80241674 0040182D */ daddu $v1, $v0, $zero -/* D3BC48 80241678 2402003C */ addiu $v0, $zero, 0x3c -/* D3BC4C 8024167C AE220070 */ sw $v0, 0x70($s1) -.L80241680: -/* D3BC50 80241680 C462000C */ lwc1 $f2, 0xc($v1) -/* D3BC54 80241684 3C0141F0 */ lui $at, 0x41f0 -/* D3BC58 80241688 44810000 */ mtc1 $at, $f0 -/* D3BC5C 8024168C 00000000 */ nop -/* D3BC60 80241690 46001000 */ add.s $f0, $f2, $f0 -/* D3BC64 80241694 3C0143B4 */ lui $at, 0x43b4 -/* D3BC68 80241698 44811000 */ mtc1 $at, $f2 -/* D3BC6C 8024169C 00000000 */ nop -/* D3BC70 802416A0 4600103E */ c.le.s $f2, $f0 -/* D3BC74 802416A4 00000000 */ nop -/* D3BC78 802416A8 45000003 */ bc1f .L802416B8 -/* D3BC7C 802416AC E460000C */ swc1 $f0, 0xc($v1) -/* D3BC80 802416B0 46020001 */ sub.s $f0, $f0, $f2 -/* D3BC84 802416B4 E460000C */ swc1 $f0, 0xc($v1) -.L802416B8: -/* D3BC88 802416B8 8E230070 */ lw $v1, 0x70($s1) -/* D3BC8C 802416BC 2463FFFF */ addiu $v1, $v1, -1 -/* D3BC90 802416C0 000317C3 */ sra $v0, $v1, 0x1f -/* D3BC94 802416C4 AE230070 */ sw $v1, 0x70($s1) -/* D3BC98 802416C8 8FBF0018 */ lw $ra, 0x18($sp) -/* D3BC9C 802416CC 8FB10014 */ lw $s1, 0x14($sp) -/* D3BCA0 802416D0 8FB00010 */ lw $s0, 0x10($sp) -/* D3BCA4 802416D4 30420002 */ andi $v0, $v0, 2 -/* D3BCA8 802416D8 03E00008 */ jr $ra -/* D3BCAC 802416DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index c6c01e1fc7..fd258c68ec 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250); INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C); -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_802422F0_95D4F0); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242468_95D668); diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 5dc8d5f6cd..95df3d4b0f 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC); -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80241180_96A340); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802412F8_96A4B8); diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 09ebdc0fa9..e6cb55f900 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -86,9 +86,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0); -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243324_A1E424); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024349C_A1E59C); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index 3f6a1212bc..df6da359fe 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -78,9 +78,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664); INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0); -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242494_B2E904); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_8024260C_B2EA7C); diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index fb4a6ad2a2..184667f85b 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -118,9 +118,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588); -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242A1C_B375EC); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242B94_B37764); diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index 126fc7b1eb..c2a864f722 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -60,9 +60,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C); -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241210_8B1280); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80241388_8B13F8); diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 947070a15b..a50c4fba79 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C); -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_802414B0_7EC1C0); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241628_7EC338); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 1c6e82fb0c..4f871cc5a3 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -70,9 +70,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D90_803610); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242F08_803788); diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index 2f9dab34c7..bbd39460fc 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660); INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C); -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_80242640_825900); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802427B8_825A78); diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index cd479148d1..935c165abb 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -46,9 +46,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890); INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC); -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241330_832B30); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802414A8_832CA8); diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index db3265f824..33868e1f5c 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10); INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C); -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_802412E0_843EB0); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241458_844028); diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index e9195bf47e..ac73e21084 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -76,9 +76,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070); INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC); -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_802421A0_854310); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80242318_854488); diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index cc74b3b3b1..04af4c9b9b 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -84,9 +84,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64); -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241BE8_9C6FC8); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241D60_9C7140); diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index ad4f99f871..ff2304cfef 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -68,9 +68,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510); INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C); -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242790_9D97B0); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242908_9D9928); diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index 07aef28454..f9daf86071 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -56,9 +56,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50); INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C); -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241580_CF90F0); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802416F8_CF9268); diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 1cad9e8f54..775fd06542 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -64,9 +64,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078); -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802419AC_D070DC); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241B24_D07254); diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index 184b1b44f0..df17fb25c7 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -44,9 +44,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC); -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_80241650_D3BC20); - -#include "world/common/UnkMoveNpc.inc.c" +#include "world/common/UnkPartnerFuncs.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802417C8_D3BD98); diff --git a/src/world/common/UnkMoveNpc.inc.c b/src/world/common/UnkPartnerFuncs.inc.c similarity index 56% rename from src/world/common/UnkMoveNpc.inc.c rename to src/world/common/UnkPartnerFuncs.inc.c index e77ac52f90..b7f2e7584d 100644 --- a/src/world/common/UnkMoveNpc.inc.c +++ b/src/world/common/UnkPartnerFuncs.inc.c @@ -1,6 +1,24 @@ #include "common.h" -static ApiStatus UnkMoveNpc(ScriptInstance* script, s32 isInitialCall) { +static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) { + Npc* partner = get_npc_unsafe(NpcId_PARTNER); + + if (isInitialCall) { + script->functionTemp[0].s = 60; + } + + partner->yaw += 30.0f; + if (partner->yaw >= 360.0f) { + partner->yaw -= 360.0f; + } + + script->functionTemp[0].s--; + + return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2; +} + + +static ApiStatus UnkMovePartner(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(NpcId_PARTNER); if (isInitialCall) { From b0d5e8ee62cb2f1fb6dc5cb77dacad7b30fa7a9d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 18:41:04 -0400 Subject: [PATCH 17/45] 3 more --- .../dro_01/95B7E0/func_80241FDC_95D1DC.s | 33 -------------- .../dro_01/95B7E0/func_80242050_95D250.s | 44 ------------------- .../dro_01/95B7E0/func_8024228C_95D48C.s | 31 ------------- .../dro_02/9694C0/func_80240E6C_96A02C.s | 33 -------------- .../dro_02/9694C0/func_80240EE0_96A0A0.s | 44 ------------------- .../dro_02/9694C0/func_8024111C_96A2DC.s | 31 ------------- .../hos_03/A1BDB0/func_80243010_A1E110.s | 33 -------------- .../hos_03/A1BDB0/func_80243084_A1E184.s | 44 ------------------- .../hos_03/A1BDB0/func_802432C0_A1E3C0.s | 31 ------------- .../hos_04/A274B0/func_802405E0_A274B0.s | 33 -------------- .../jan_02/B2C8A0/func_80242180_B2E5F0.s | 33 -------------- .../jan_02/B2C8A0/func_802421F4_B2E664.s | 44 ------------------- .../jan_02/B2C8A0/func_80242430_B2E8A0.s | 31 ------------- .../jan_03/B34BD0/func_80242708_B372D8.s | 33 -------------- .../jan_03/B34BD0/func_8024277C_B3734C.s | 44 ------------------- .../jan_03/B34BD0/func_802429B8_B37588.s | 31 ------------- .../kmr_02/8B0070/func_80240EFC_8B0F6C.s | 33 -------------- .../kmr_02/8B0070/func_80240F70_8B0FE0.s | 44 ------------------- .../kmr_02/8B0070/func_802411AC_8B121C.s | 31 ------------- .../mac_00/7EB340/func_8024119C_7EBEAC.s | 33 -------------- .../mac_00/7EB340/func_80241210_7EBF20.s | 44 ------------------- .../mac_00/7EB340/func_8024144C_7EC15C.s | 31 ------------- .../mac_01/8017D0/func_80242A7C_8032FC.s | 33 -------------- .../mac_01/8017D0/func_80242AF0_803370.s | 44 ------------------- .../mac_01/8017D0/func_80242D2C_8035AC.s | 31 ------------- .../mac_02/823BF0/func_8024232C_8255EC.s | 33 -------------- .../mac_02/823BF0/func_802423A0_825660.s | 44 ------------------- .../mac_02/823BF0/func_802425DC_82589C.s | 31 ------------- .../mac_03/831B20/func_8024101C_83281C.s | 33 -------------- .../mac_03/831B20/func_80241090_832890.s | 44 ------------------- .../mac_03/831B20/func_802412CC_832ACC.s | 31 ------------- .../mac_04/843030/func_80240FCC_843B9C.s | 33 -------------- .../mac_04/843030/func_80241040_843C10.s | 44 ------------------- .../mac_04/843030/func_8024127C_843E4C.s | 31 ------------- .../mac_05/852170/func_80241E8C_853FFC.s | 33 -------------- .../mac_05/852170/func_80241F00_854070.s | 44 ------------------- .../mac_05/852170/func_8024213C_8542AC.s | 31 ------------- .../nok_01/9C53E0/func_802418D4_9C6CB4.s | 33 -------------- .../nok_01/9C53E0/func_80241948_9C6D28.s | 44 ------------------- .../nok_01/9C53E0/func_80241B84_9C6F64.s | 31 ------------- .../nok_02/9D7AA0/func_8024247C_9D949C.s | 33 -------------- .../nok_02/9D7AA0/func_802424F0_9D9510.s | 44 ------------------- .../nok_02/9D7AA0/func_8024272C_9D974C.s | 31 ------------- .../sam_01/CF7E80/func_8024126C_CF8DDC.s | 33 -------------- .../sam_01/CF7E80/func_802412E0_CF8E50.s | 44 ------------------- .../sam_01/CF7E80/func_8024151C_CF908C.s | 31 ------------- .../sam_02/D05F60/func_80241698_D06DC8.s | 33 -------------- .../sam_02/D05F60/func_8024170C_D06E3C.s | 44 ------------------- .../sam_02/D05F60/func_80241948_D07078.s | 31 ------------- .../sam_11/D3ADA0/func_8024133C_D3B90C.s | 33 -------------- .../sam_11/D3ADA0/func_802413B0_D3B980.s | 44 ------------------- .../sam_11/D3ADA0/func_802415EC_D3BBBC.s | 31 ------------- include/si.h | 2 +- src/world/area_dro/dro_01/95B7E0.c | 6 +-- src/world/area_dro/dro_02/9694C0.c | 6 +-- src/world/area_hos/hos_03/A1BDB0.c | 6 +-- src/world/area_hos/hos_04/A274B0.c | 2 +- src/world/area_jan/jan_02/B2C8A0.c | 6 +-- src/world/area_jan/jan_03/B34BD0.c | 6 +-- src/world/area_kmr/kmr_02/8B0070.c | 6 +-- src/world/area_mac/mac_00/7EB340.c | 6 +-- src/world/area_mac/mac_01/8017D0.c | 6 +-- src/world/area_mac/mac_02/823BF0.c | 6 +-- src/world/area_mac/mac_03/831B20.c | 6 +-- src/world/area_mac/mac_04/843030.c | 6 +-- src/world/area_mac/mac_05/852170.c | 6 +-- src/world/area_nok/nok_01/9C53E0.c | 6 +-- src/world/area_nok/nok_02/9D7AA0.c | 6 +-- src/world/area_sam/sam_01/CF7E80.c | 6 +-- src/world/area_sam/sam_02/D05F60.c | 6 +-- src/world/area_sam/sam_11/D3ADA0.c | 6 +-- src/world/common/GetCamVfov.inc.c | 10 +++++ src/world/common/SetCamVfov.inc.c | 10 +++++ src/world/common/UnkPartnerFuncs.inc.c | 1 - src/world/common/UnkRotatePlayer.inc.c | 18 ++++++++ 75 files changed, 91 insertions(+), 1923 deletions(-) delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s delete mode 100644 asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s delete mode 100644 asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s delete mode 100644 asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s create mode 100644 src/world/common/GetCamVfov.inc.c create mode 100644 src/world/common/SetCamVfov.inc.c create mode 100644 src/world/common/UnkRotatePlayer.inc.c diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s deleted file mode 100644 index 09c67d9c69..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80241FDC_95D1DC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241FDC_95D1DC -/* 95D1DC 80241FDC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D1E0 80241FE0 AFB10014 */ sw $s1, 0x14($sp) -/* 95D1E4 80241FE4 0080882D */ daddu $s1, $a0, $zero -/* 95D1E8 80241FE8 AFBF0018 */ sw $ra, 0x18($sp) -/* 95D1EC 80241FEC AFB00010 */ sw $s0, 0x10($sp) -/* 95D1F0 80241FF0 8E30000C */ lw $s0, 0xc($s1) -/* 95D1F4 80241FF4 8E050000 */ lw $a1, ($s0) -/* 95D1F8 80241FF8 0C0B1EAF */ jal get_variable -/* 95D1FC 80241FFC 26100004 */ addiu $s0, $s0, 4 -/* 95D200 80242000 0220202D */ daddu $a0, $s1, $zero -/* 95D204 80242004 8E050000 */ lw $a1, ($s0) -/* 95D208 80242008 0C0B210B */ jal get_float_variable -/* 95D20C 8024200C 0040802D */ daddu $s0, $v0, $zero -/* 95D210 80242010 24020002 */ addiu $v0, $zero, 2 -/* 95D214 80242014 00501804 */ sllv $v1, $s0, $v0 -/* 95D218 80242018 00701821 */ addu $v1, $v1, $s0 -/* 95D21C 8024201C 00431804 */ sllv $v1, $v1, $v0 -/* 95D220 80242020 00701823 */ subu $v1, $v1, $s0 -/* 95D224 80242024 000320C0 */ sll $a0, $v1, 3 -/* 95D228 80242028 00641821 */ addu $v1, $v1, $a0 -/* 95D22C 8024202C 000318C0 */ sll $v1, $v1, 3 -/* 95D230 80242030 3C01800B */ lui $at, 0x800b -/* 95D234 80242034 00230821 */ addu $at, $at, $v1 -/* 95D238 80242038 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 95D23C 8024203C 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D240 80242040 8FB10014 */ lw $s1, 0x14($sp) -/* 95D244 80242044 8FB00010 */ lw $s0, 0x10($sp) -/* 95D248 80242048 03E00008 */ jr $ra -/* 95D24C 8024204C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s deleted file mode 100644 index 173827e43f..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_80242050_95D250.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242050_95D250 -/* 95D250 80242050 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 95D254 80242054 AFB10014 */ sw $s1, 0x14($sp) -/* 95D258 80242058 0080882D */ daddu $s1, $a0, $zero -/* 95D25C 8024205C AFBF0018 */ sw $ra, 0x18($sp) -/* 95D260 80242060 AFB00010 */ sw $s0, 0x10($sp) -/* 95D264 80242064 8E30000C */ lw $s0, 0xc($s1) -/* 95D268 80242068 8E050000 */ lw $a1, ($s0) -/* 95D26C 8024206C 0C0B1EAF */ jal get_variable -/* 95D270 80242070 26100004 */ addiu $s0, $s0, 4 -/* 95D274 80242074 00021880 */ sll $v1, $v0, 2 -/* 95D278 80242078 00621821 */ addu $v1, $v1, $v0 -/* 95D27C 8024207C 00031880 */ sll $v1, $v1, 2 -/* 95D280 80242080 00621823 */ subu $v1, $v1, $v0 -/* 95D284 80242084 000310C0 */ sll $v0, $v1, 3 -/* 95D288 80242088 00621821 */ addu $v1, $v1, $v0 -/* 95D28C 8024208C 000318C0 */ sll $v1, $v1, 3 -/* 95D290 80242090 3C01800B */ lui $at, 0x800b -/* 95D294 80242094 00230821 */ addu $at, $at, $v1 -/* 95D298 80242098 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 95D29C 8024209C 3C014480 */ lui $at, 0x4480 -/* 95D2A0 802420A0 44810000 */ mtc1 $at, $f0 -/* 95D2A4 802420A4 00000000 */ nop -/* 95D2A8 802420A8 46001082 */ mul.s $f2, $f2, $f0 -/* 95D2AC 802420AC 00000000 */ nop -/* 95D2B0 802420B0 3C01CD5B */ lui $at, 0xcd5b -/* 95D2B4 802420B4 34215858 */ ori $at, $at, 0x5858 -/* 95D2B8 802420B8 44810000 */ mtc1 $at, $f0 -/* 95D2BC 802420BC 00000000 */ nop -/* 95D2C0 802420C0 46001080 */ add.s $f2, $f2, $f0 -/* 95D2C4 802420C4 8E050000 */ lw $a1, ($s0) -/* 95D2C8 802420C8 4600110D */ trunc.w.s $f4, $f2 -/* 95D2CC 802420CC 44062000 */ mfc1 $a2, $f4 -/* 95D2D0 802420D0 0C0B2026 */ jal set_variable -/* 95D2D4 802420D4 0220202D */ daddu $a0, $s1, $zero -/* 95D2D8 802420D8 8FBF0018 */ lw $ra, 0x18($sp) -/* 95D2DC 802420DC 8FB10014 */ lw $s1, 0x14($sp) -/* 95D2E0 802420E0 8FB00010 */ lw $s0, 0x10($sp) -/* 95D2E4 802420E4 24020002 */ addiu $v0, $zero, 2 -/* 95D2E8 802420E8 03E00008 */ jr $ra -/* 95D2EC 802420EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s b/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s deleted file mode 100644 index 7cffdb15ba..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_01/95B7E0/func_8024228C_95D48C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_95D48C -/* 95D48C 8024228C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 95D490 80242290 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 95D494 80242294 10A00002 */ beqz $a1, .L802422A0 -/* 95D498 80242298 2402003C */ addiu $v0, $zero, 0x3c -/* 95D49C 8024229C AC820070 */ sw $v0, 0x70($a0) -.L802422A0: -/* 95D4A0 802422A0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 95D4A4 802422A4 3C0141F0 */ lui $at, 0x41f0 -/* 95D4A8 802422A8 44810000 */ mtc1 $at, $f0 -/* 95D4AC 802422AC 00000000 */ nop -/* 95D4B0 802422B0 46001000 */ add.s $f0, $f2, $f0 -/* 95D4B4 802422B4 3C0143B4 */ lui $at, 0x43b4 -/* 95D4B8 802422B8 44811000 */ mtc1 $at, $f2 -/* 95D4BC 802422BC 00000000 */ nop -/* 95D4C0 802422C0 4600103E */ c.le.s $f2, $f0 -/* 95D4C4 802422C4 00000000 */ nop -/* 95D4C8 802422C8 45000003 */ bc1f .L802422D8 -/* 95D4CC 802422CC E4600080 */ swc1 $f0, 0x80($v1) -/* 95D4D0 802422D0 46020001 */ sub.s $f0, $f0, $f2 -/* 95D4D4 802422D4 E4600080 */ swc1 $f0, 0x80($v1) -.L802422D8: -/* 95D4D8 802422D8 8C820070 */ lw $v0, 0x70($a0) -/* 95D4DC 802422DC 2442FFFF */ addiu $v0, $v0, -1 -/* 95D4E0 802422E0 AC820070 */ sw $v0, 0x70($a0) -/* 95D4E4 802422E4 000217C3 */ sra $v0, $v0, 0x1f -/* 95D4E8 802422E8 03E00008 */ jr $ra -/* 95D4EC 802422EC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s deleted file mode 100644 index 00eb172992..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240E6C_96A02C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240E6C_96A02C -/* 96A02C 80240E6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A030 80240E70 AFB10014 */ sw $s1, 0x14($sp) -/* 96A034 80240E74 0080882D */ daddu $s1, $a0, $zero -/* 96A038 80240E78 AFBF0018 */ sw $ra, 0x18($sp) -/* 96A03C 80240E7C AFB00010 */ sw $s0, 0x10($sp) -/* 96A040 80240E80 8E30000C */ lw $s0, 0xc($s1) -/* 96A044 80240E84 8E050000 */ lw $a1, ($s0) -/* 96A048 80240E88 0C0B1EAF */ jal get_variable -/* 96A04C 80240E8C 26100004 */ addiu $s0, $s0, 4 -/* 96A050 80240E90 0220202D */ daddu $a0, $s1, $zero -/* 96A054 80240E94 8E050000 */ lw $a1, ($s0) -/* 96A058 80240E98 0C0B210B */ jal get_float_variable -/* 96A05C 80240E9C 0040802D */ daddu $s0, $v0, $zero -/* 96A060 80240EA0 24020002 */ addiu $v0, $zero, 2 -/* 96A064 80240EA4 00501804 */ sllv $v1, $s0, $v0 -/* 96A068 80240EA8 00701821 */ addu $v1, $v1, $s0 -/* 96A06C 80240EAC 00431804 */ sllv $v1, $v1, $v0 -/* 96A070 80240EB0 00701823 */ subu $v1, $v1, $s0 -/* 96A074 80240EB4 000320C0 */ sll $a0, $v1, 3 -/* 96A078 80240EB8 00641821 */ addu $v1, $v1, $a0 -/* 96A07C 80240EBC 000318C0 */ sll $v1, $v1, 3 -/* 96A080 80240EC0 3C01800B */ lui $at, 0x800b -/* 96A084 80240EC4 00230821 */ addu $at, $at, $v1 -/* 96A088 80240EC8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 96A08C 80240ECC 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A090 80240ED0 8FB10014 */ lw $s1, 0x14($sp) -/* 96A094 80240ED4 8FB00010 */ lw $s0, 0x10($sp) -/* 96A098 80240ED8 03E00008 */ jr $ra -/* 96A09C 80240EDC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s deleted file mode 100644 index 59a220d8ac..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80240EE0_96A0A0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EE0_96A0A0 -/* 96A0A0 80240EE0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 96A0A4 80240EE4 AFB10014 */ sw $s1, 0x14($sp) -/* 96A0A8 80240EE8 0080882D */ daddu $s1, $a0, $zero -/* 96A0AC 80240EEC AFBF0018 */ sw $ra, 0x18($sp) -/* 96A0B0 80240EF0 AFB00010 */ sw $s0, 0x10($sp) -/* 96A0B4 80240EF4 8E30000C */ lw $s0, 0xc($s1) -/* 96A0B8 80240EF8 8E050000 */ lw $a1, ($s0) -/* 96A0BC 80240EFC 0C0B1EAF */ jal get_variable -/* 96A0C0 80240F00 26100004 */ addiu $s0, $s0, 4 -/* 96A0C4 80240F04 00021880 */ sll $v1, $v0, 2 -/* 96A0C8 80240F08 00621821 */ addu $v1, $v1, $v0 -/* 96A0CC 80240F0C 00031880 */ sll $v1, $v1, 2 -/* 96A0D0 80240F10 00621823 */ subu $v1, $v1, $v0 -/* 96A0D4 80240F14 000310C0 */ sll $v0, $v1, 3 -/* 96A0D8 80240F18 00621821 */ addu $v1, $v1, $v0 -/* 96A0DC 80240F1C 000318C0 */ sll $v1, $v1, 3 -/* 96A0E0 80240F20 3C01800B */ lui $at, 0x800b -/* 96A0E4 80240F24 00230821 */ addu $at, $at, $v1 -/* 96A0E8 80240F28 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 96A0EC 80240F2C 3C014480 */ lui $at, 0x4480 -/* 96A0F0 80240F30 44810000 */ mtc1 $at, $f0 -/* 96A0F4 80240F34 00000000 */ nop -/* 96A0F8 80240F38 46001082 */ mul.s $f2, $f2, $f0 -/* 96A0FC 80240F3C 00000000 */ nop -/* 96A100 80240F40 3C01CD5B */ lui $at, 0xcd5b -/* 96A104 80240F44 34215858 */ ori $at, $at, 0x5858 -/* 96A108 80240F48 44810000 */ mtc1 $at, $f0 -/* 96A10C 80240F4C 00000000 */ nop -/* 96A110 80240F50 46001080 */ add.s $f2, $f2, $f0 -/* 96A114 80240F54 8E050000 */ lw $a1, ($s0) -/* 96A118 80240F58 4600110D */ trunc.w.s $f4, $f2 -/* 96A11C 80240F5C 44062000 */ mfc1 $a2, $f4 -/* 96A120 80240F60 0C0B2026 */ jal set_variable -/* 96A124 80240F64 0220202D */ daddu $a0, $s1, $zero -/* 96A128 80240F68 8FBF0018 */ lw $ra, 0x18($sp) -/* 96A12C 80240F6C 8FB10014 */ lw $s1, 0x14($sp) -/* 96A130 80240F70 8FB00010 */ lw $s0, 0x10($sp) -/* 96A134 80240F74 24020002 */ addiu $v0, $zero, 2 -/* 96A138 80240F78 03E00008 */ jr $ra -/* 96A13C 80240F7C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s b/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s deleted file mode 100644 index 5e2e262fae..0000000000 --- a/asm/nonmatchings/world/area_dro/dro_02/9694C0/func_8024111C_96A2DC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024111C_96A2DC -/* 96A2DC 8024111C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 96A2E0 80241120 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 96A2E4 80241124 10A00002 */ beqz $a1, .L80241130 -/* 96A2E8 80241128 2402003C */ addiu $v0, $zero, 0x3c -/* 96A2EC 8024112C AC820070 */ sw $v0, 0x70($a0) -.L80241130: -/* 96A2F0 80241130 C4620080 */ lwc1 $f2, 0x80($v1) -/* 96A2F4 80241134 3C0141F0 */ lui $at, 0x41f0 -/* 96A2F8 80241138 44810000 */ mtc1 $at, $f0 -/* 96A2FC 8024113C 00000000 */ nop -/* 96A300 80241140 46001000 */ add.s $f0, $f2, $f0 -/* 96A304 80241144 3C0143B4 */ lui $at, 0x43b4 -/* 96A308 80241148 44811000 */ mtc1 $at, $f2 -/* 96A30C 8024114C 00000000 */ nop -/* 96A310 80241150 4600103E */ c.le.s $f2, $f0 -/* 96A314 80241154 00000000 */ nop -/* 96A318 80241158 45000003 */ bc1f .L80241168 -/* 96A31C 8024115C E4600080 */ swc1 $f0, 0x80($v1) -/* 96A320 80241160 46020001 */ sub.s $f0, $f0, $f2 -/* 96A324 80241164 E4600080 */ swc1 $f0, 0x80($v1) -.L80241168: -/* 96A328 80241168 8C820070 */ lw $v0, 0x70($a0) -/* 96A32C 8024116C 2442FFFF */ addiu $v0, $v0, -1 -/* 96A330 80241170 AC820070 */ sw $v0, 0x70($a0) -/* 96A334 80241174 000217C3 */ sra $v0, $v0, 0x1f -/* 96A338 80241178 03E00008 */ jr $ra -/* 96A33C 8024117C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s deleted file mode 100644 index f5f24adf59..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243010_A1E110.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243010_A1E110 -/* A1E110 80243010 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E114 80243014 AFB10014 */ sw $s1, 0x14($sp) -/* A1E118 80243018 0080882D */ daddu $s1, $a0, $zero -/* A1E11C 8024301C AFBF0018 */ sw $ra, 0x18($sp) -/* A1E120 80243020 AFB00010 */ sw $s0, 0x10($sp) -/* A1E124 80243024 8E30000C */ lw $s0, 0xc($s1) -/* A1E128 80243028 8E050000 */ lw $a1, ($s0) -/* A1E12C 8024302C 0C0B1EAF */ jal get_variable -/* A1E130 80243030 26100004 */ addiu $s0, $s0, 4 -/* A1E134 80243034 0220202D */ daddu $a0, $s1, $zero -/* A1E138 80243038 8E050000 */ lw $a1, ($s0) -/* A1E13C 8024303C 0C0B210B */ jal get_float_variable -/* A1E140 80243040 0040802D */ daddu $s0, $v0, $zero -/* A1E144 80243044 24020002 */ addiu $v0, $zero, 2 -/* A1E148 80243048 00501804 */ sllv $v1, $s0, $v0 -/* A1E14C 8024304C 00701821 */ addu $v1, $v1, $s0 -/* A1E150 80243050 00431804 */ sllv $v1, $v1, $v0 -/* A1E154 80243054 00701823 */ subu $v1, $v1, $s0 -/* A1E158 80243058 000320C0 */ sll $a0, $v1, 3 -/* A1E15C 8024305C 00641821 */ addu $v1, $v1, $a0 -/* A1E160 80243060 000318C0 */ sll $v1, $v1, 3 -/* A1E164 80243064 3C01800B */ lui $at, 0x800b -/* A1E168 80243068 00230821 */ addu $at, $at, $v1 -/* A1E16C 8024306C E4201D98 */ swc1 $f0, 0x1d98($at) -/* A1E170 80243070 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E174 80243074 8FB10014 */ lw $s1, 0x14($sp) -/* A1E178 80243078 8FB00010 */ lw $s0, 0x10($sp) -/* A1E17C 8024307C 03E00008 */ jr $ra -/* A1E180 80243080 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s deleted file mode 100644 index 67116b2bc8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_80243084_A1E184.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243084_A1E184 -/* A1E184 80243084 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A1E188 80243088 AFB10014 */ sw $s1, 0x14($sp) -/* A1E18C 8024308C 0080882D */ daddu $s1, $a0, $zero -/* A1E190 80243090 AFBF0018 */ sw $ra, 0x18($sp) -/* A1E194 80243094 AFB00010 */ sw $s0, 0x10($sp) -/* A1E198 80243098 8E30000C */ lw $s0, 0xc($s1) -/* A1E19C 8024309C 8E050000 */ lw $a1, ($s0) -/* A1E1A0 802430A0 0C0B1EAF */ jal get_variable -/* A1E1A4 802430A4 26100004 */ addiu $s0, $s0, 4 -/* A1E1A8 802430A8 00021880 */ sll $v1, $v0, 2 -/* A1E1AC 802430AC 00621821 */ addu $v1, $v1, $v0 -/* A1E1B0 802430B0 00031880 */ sll $v1, $v1, 2 -/* A1E1B4 802430B4 00621823 */ subu $v1, $v1, $v0 -/* A1E1B8 802430B8 000310C0 */ sll $v0, $v1, 3 -/* A1E1BC 802430BC 00621821 */ addu $v1, $v1, $v0 -/* A1E1C0 802430C0 000318C0 */ sll $v1, $v1, 3 -/* A1E1C4 802430C4 3C01800B */ lui $at, 0x800b -/* A1E1C8 802430C8 00230821 */ addu $at, $at, $v1 -/* A1E1CC 802430CC C4221D98 */ lwc1 $f2, 0x1d98($at) -/* A1E1D0 802430D0 3C014480 */ lui $at, 0x4480 -/* A1E1D4 802430D4 44810000 */ mtc1 $at, $f0 -/* A1E1D8 802430D8 00000000 */ nop -/* A1E1DC 802430DC 46001082 */ mul.s $f2, $f2, $f0 -/* A1E1E0 802430E0 00000000 */ nop -/* A1E1E4 802430E4 3C01CD5B */ lui $at, 0xcd5b -/* A1E1E8 802430E8 34215858 */ ori $at, $at, 0x5858 -/* A1E1EC 802430EC 44810000 */ mtc1 $at, $f0 -/* A1E1F0 802430F0 00000000 */ nop -/* A1E1F4 802430F4 46001080 */ add.s $f2, $f2, $f0 -/* A1E1F8 802430F8 8E050000 */ lw $a1, ($s0) -/* A1E1FC 802430FC 4600110D */ trunc.w.s $f4, $f2 -/* A1E200 80243100 44062000 */ mfc1 $a2, $f4 -/* A1E204 80243104 0C0B2026 */ jal set_variable -/* A1E208 80243108 0220202D */ daddu $a0, $s1, $zero -/* A1E20C 8024310C 8FBF0018 */ lw $ra, 0x18($sp) -/* A1E210 80243110 8FB10014 */ lw $s1, 0x14($sp) -/* A1E214 80243114 8FB00010 */ lw $s0, 0x10($sp) -/* A1E218 80243118 24020002 */ addiu $v0, $zero, 2 -/* A1E21C 8024311C 03E00008 */ jr $ra -/* A1E220 80243120 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s b/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s deleted file mode 100644 index ee127bf8d8..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_802432C0_A1E3C0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802432C0_A1E3C0 -/* A1E3C0 802432C0 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* A1E3C4 802432C4 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* A1E3C8 802432C8 10A00002 */ beqz $a1, .L802432D4 -/* A1E3CC 802432CC 2402003C */ addiu $v0, $zero, 0x3c -/* A1E3D0 802432D0 AC820070 */ sw $v0, 0x70($a0) -.L802432D4: -/* A1E3D4 802432D4 C4620080 */ lwc1 $f2, 0x80($v1) -/* A1E3D8 802432D8 3C0141F0 */ lui $at, 0x41f0 -/* A1E3DC 802432DC 44810000 */ mtc1 $at, $f0 -/* A1E3E0 802432E0 00000000 */ nop -/* A1E3E4 802432E4 46001000 */ add.s $f0, $f2, $f0 -/* A1E3E8 802432E8 3C0143B4 */ lui $at, 0x43b4 -/* A1E3EC 802432EC 44811000 */ mtc1 $at, $f2 -/* A1E3F0 802432F0 00000000 */ nop -/* A1E3F4 802432F4 4600103E */ c.le.s $f2, $f0 -/* A1E3F8 802432F8 00000000 */ nop -/* A1E3FC 802432FC 45000003 */ bc1f .L8024330C -/* A1E400 80243300 E4600080 */ swc1 $f0, 0x80($v1) -/* A1E404 80243304 46020001 */ sub.s $f0, $f0, $f2 -/* A1E408 80243308 E4600080 */ swc1 $f0, 0x80($v1) -.L8024330C: -/* A1E40C 8024330C 8C820070 */ lw $v0, 0x70($a0) -/* A1E410 80243310 2442FFFF */ addiu $v0, $v0, -1 -/* A1E414 80243314 AC820070 */ sw $v0, 0x70($a0) -/* A1E418 80243318 000217C3 */ sra $v0, $v0, 0x1f -/* A1E41C 8024331C 03E00008 */ jr $ra -/* A1E420 80243320 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s b/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s deleted file mode 100644 index ac1e88224b..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_04/A274B0/func_802405E0_A274B0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802405E0_A274B0 -/* A274B0 802405E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* A274B4 802405E4 AFB10014 */ sw $s1, 0x14($sp) -/* A274B8 802405E8 0080882D */ daddu $s1, $a0, $zero -/* A274BC 802405EC AFBF0018 */ sw $ra, 0x18($sp) -/* A274C0 802405F0 AFB00010 */ sw $s0, 0x10($sp) -/* A274C4 802405F4 8E30000C */ lw $s0, 0xc($s1) -/* A274C8 802405F8 8E050000 */ lw $a1, ($s0) -/* A274CC 802405FC 0C0B1EAF */ jal get_variable -/* A274D0 80240600 26100004 */ addiu $s0, $s0, 4 -/* A274D4 80240604 0220202D */ daddu $a0, $s1, $zero -/* A274D8 80240608 8E050000 */ lw $a1, ($s0) -/* A274DC 8024060C 0C0B210B */ jal get_float_variable -/* A274E0 80240610 0040802D */ daddu $s0, $v0, $zero -/* A274E4 80240614 24020002 */ addiu $v0, $zero, 2 -/* A274E8 80240618 00501804 */ sllv $v1, $s0, $v0 -/* A274EC 8024061C 00701821 */ addu $v1, $v1, $s0 -/* A274F0 80240620 00431804 */ sllv $v1, $v1, $v0 -/* A274F4 80240624 00701823 */ subu $v1, $v1, $s0 -/* A274F8 80240628 000320C0 */ sll $a0, $v1, 3 -/* A274FC 8024062C 00641821 */ addu $v1, $v1, $a0 -/* A27500 80240630 000318C0 */ sll $v1, $v1, 3 -/* A27504 80240634 3C01800B */ lui $at, 0x800b -/* A27508 80240638 00230821 */ addu $at, $at, $v1 -/* A2750C 8024063C E4201D98 */ swc1 $f0, 0x1d98($at) -/* A27510 80240640 8FBF0018 */ lw $ra, 0x18($sp) -/* A27514 80240644 8FB10014 */ lw $s1, 0x14($sp) -/* A27518 80240648 8FB00010 */ lw $s0, 0x10($sp) -/* A2751C 8024064C 03E00008 */ jr $ra -/* A27520 80240650 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s deleted file mode 100644 index c74d8c0277..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242180_B2E5F0.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242180_B2E5F0 -/* B2E5F0 80242180 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E5F4 80242184 AFB10014 */ sw $s1, 0x14($sp) -/* B2E5F8 80242188 0080882D */ daddu $s1, $a0, $zero -/* B2E5FC 8024218C AFBF0018 */ sw $ra, 0x18($sp) -/* B2E600 80242190 AFB00010 */ sw $s0, 0x10($sp) -/* B2E604 80242194 8E30000C */ lw $s0, 0xc($s1) -/* B2E608 80242198 8E050000 */ lw $a1, ($s0) -/* B2E60C 8024219C 0C0B1EAF */ jal get_variable -/* B2E610 802421A0 26100004 */ addiu $s0, $s0, 4 -/* B2E614 802421A4 0220202D */ daddu $a0, $s1, $zero -/* B2E618 802421A8 8E050000 */ lw $a1, ($s0) -/* B2E61C 802421AC 0C0B210B */ jal get_float_variable -/* B2E620 802421B0 0040802D */ daddu $s0, $v0, $zero -/* B2E624 802421B4 24020002 */ addiu $v0, $zero, 2 -/* B2E628 802421B8 00501804 */ sllv $v1, $s0, $v0 -/* B2E62C 802421BC 00701821 */ addu $v1, $v1, $s0 -/* B2E630 802421C0 00431804 */ sllv $v1, $v1, $v0 -/* B2E634 802421C4 00701823 */ subu $v1, $v1, $s0 -/* B2E638 802421C8 000320C0 */ sll $a0, $v1, 3 -/* B2E63C 802421CC 00641821 */ addu $v1, $v1, $a0 -/* B2E640 802421D0 000318C0 */ sll $v1, $v1, 3 -/* B2E644 802421D4 3C01800B */ lui $at, 0x800b -/* B2E648 802421D8 00230821 */ addu $at, $at, $v1 -/* B2E64C 802421DC E4201D98 */ swc1 $f0, 0x1d98($at) -/* B2E650 802421E0 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E654 802421E4 8FB10014 */ lw $s1, 0x14($sp) -/* B2E658 802421E8 8FB00010 */ lw $s0, 0x10($sp) -/* B2E65C 802421EC 03E00008 */ jr $ra -/* B2E660 802421F0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s deleted file mode 100644 index cd84825001..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_802421F4_B2E664.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802421F4_B2E664 -/* B2E664 802421F4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B2E668 802421F8 AFB10014 */ sw $s1, 0x14($sp) -/* B2E66C 802421FC 0080882D */ daddu $s1, $a0, $zero -/* B2E670 80242200 AFBF0018 */ sw $ra, 0x18($sp) -/* B2E674 80242204 AFB00010 */ sw $s0, 0x10($sp) -/* B2E678 80242208 8E30000C */ lw $s0, 0xc($s1) -/* B2E67C 8024220C 8E050000 */ lw $a1, ($s0) -/* B2E680 80242210 0C0B1EAF */ jal get_variable -/* B2E684 80242214 26100004 */ addiu $s0, $s0, 4 -/* B2E688 80242218 00021880 */ sll $v1, $v0, 2 -/* B2E68C 8024221C 00621821 */ addu $v1, $v1, $v0 -/* B2E690 80242220 00031880 */ sll $v1, $v1, 2 -/* B2E694 80242224 00621823 */ subu $v1, $v1, $v0 -/* B2E698 80242228 000310C0 */ sll $v0, $v1, 3 -/* B2E69C 8024222C 00621821 */ addu $v1, $v1, $v0 -/* B2E6A0 80242230 000318C0 */ sll $v1, $v1, 3 -/* B2E6A4 80242234 3C01800B */ lui $at, 0x800b -/* B2E6A8 80242238 00230821 */ addu $at, $at, $v1 -/* B2E6AC 8024223C C4221D98 */ lwc1 $f2, 0x1d98($at) -/* B2E6B0 80242240 3C014480 */ lui $at, 0x4480 -/* B2E6B4 80242244 44810000 */ mtc1 $at, $f0 -/* B2E6B8 80242248 00000000 */ nop -/* B2E6BC 8024224C 46001082 */ mul.s $f2, $f2, $f0 -/* B2E6C0 80242250 00000000 */ nop -/* B2E6C4 80242254 3C01CD5B */ lui $at, 0xcd5b -/* B2E6C8 80242258 34215858 */ ori $at, $at, 0x5858 -/* B2E6CC 8024225C 44810000 */ mtc1 $at, $f0 -/* B2E6D0 80242260 00000000 */ nop -/* B2E6D4 80242264 46001080 */ add.s $f2, $f2, $f0 -/* B2E6D8 80242268 8E050000 */ lw $a1, ($s0) -/* B2E6DC 8024226C 4600110D */ trunc.w.s $f4, $f2 -/* B2E6E0 80242270 44062000 */ mfc1 $a2, $f4 -/* B2E6E4 80242274 0C0B2026 */ jal set_variable -/* B2E6E8 80242278 0220202D */ daddu $a0, $s1, $zero -/* B2E6EC 8024227C 8FBF0018 */ lw $ra, 0x18($sp) -/* B2E6F0 80242280 8FB10014 */ lw $s1, 0x14($sp) -/* B2E6F4 80242284 8FB00010 */ lw $s0, 0x10($sp) -/* B2E6F8 80242288 24020002 */ addiu $v0, $zero, 2 -/* B2E6FC 8024228C 03E00008 */ jr $ra -/* B2E700 80242290 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s b/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s deleted file mode 100644 index 815c0eddc5..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_02/B2C8A0/func_80242430_B2E8A0.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242430_B2E8A0 -/* B2E8A0 80242430 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B2E8A4 80242434 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B2E8A8 80242438 10A00002 */ beqz $a1, .L80242444 -/* B2E8AC 8024243C 2402003C */ addiu $v0, $zero, 0x3c -/* B2E8B0 80242440 AC820070 */ sw $v0, 0x70($a0) -.L80242444: -/* B2E8B4 80242444 C4620080 */ lwc1 $f2, 0x80($v1) -/* B2E8B8 80242448 3C0141F0 */ lui $at, 0x41f0 -/* B2E8BC 8024244C 44810000 */ mtc1 $at, $f0 -/* B2E8C0 80242450 00000000 */ nop -/* B2E8C4 80242454 46001000 */ add.s $f0, $f2, $f0 -/* B2E8C8 80242458 3C0143B4 */ lui $at, 0x43b4 -/* B2E8CC 8024245C 44811000 */ mtc1 $at, $f2 -/* B2E8D0 80242460 00000000 */ nop -/* B2E8D4 80242464 4600103E */ c.le.s $f2, $f0 -/* B2E8D8 80242468 00000000 */ nop -/* B2E8DC 8024246C 45000003 */ bc1f .L8024247C -/* B2E8E0 80242470 E4600080 */ swc1 $f0, 0x80($v1) -/* B2E8E4 80242474 46020001 */ sub.s $f0, $f0, $f2 -/* B2E8E8 80242478 E4600080 */ swc1 $f0, 0x80($v1) -.L8024247C: -/* B2E8EC 8024247C 8C820070 */ lw $v0, 0x70($a0) -/* B2E8F0 80242480 2442FFFF */ addiu $v0, $v0, -1 -/* B2E8F4 80242484 AC820070 */ sw $v0, 0x70($a0) -/* B2E8F8 80242488 000217C3 */ sra $v0, $v0, 0x1f -/* B2E8FC 8024248C 03E00008 */ jr $ra -/* B2E900 80242490 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s deleted file mode 100644 index a050d494b2..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80242708_B372D8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242708_B372D8 -/* B372D8 80242708 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B372DC 8024270C AFB10014 */ sw $s1, 0x14($sp) -/* B372E0 80242710 0080882D */ daddu $s1, $a0, $zero -/* B372E4 80242714 AFBF0018 */ sw $ra, 0x18($sp) -/* B372E8 80242718 AFB00010 */ sw $s0, 0x10($sp) -/* B372EC 8024271C 8E30000C */ lw $s0, 0xc($s1) -/* B372F0 80242720 8E050000 */ lw $a1, ($s0) -/* B372F4 80242724 0C0B1EAF */ jal get_variable -/* B372F8 80242728 26100004 */ addiu $s0, $s0, 4 -/* B372FC 8024272C 0220202D */ daddu $a0, $s1, $zero -/* B37300 80242730 8E050000 */ lw $a1, ($s0) -/* B37304 80242734 0C0B210B */ jal get_float_variable -/* B37308 80242738 0040802D */ daddu $s0, $v0, $zero -/* B3730C 8024273C 24020002 */ addiu $v0, $zero, 2 -/* B37310 80242740 00501804 */ sllv $v1, $s0, $v0 -/* B37314 80242744 00701821 */ addu $v1, $v1, $s0 -/* B37318 80242748 00431804 */ sllv $v1, $v1, $v0 -/* B3731C 8024274C 00701823 */ subu $v1, $v1, $s0 -/* B37320 80242750 000320C0 */ sll $a0, $v1, 3 -/* B37324 80242754 00641821 */ addu $v1, $v1, $a0 -/* B37328 80242758 000318C0 */ sll $v1, $v1, 3 -/* B3732C 8024275C 3C01800B */ lui $at, 0x800b -/* B37330 80242760 00230821 */ addu $at, $at, $v1 -/* B37334 80242764 E4201D98 */ swc1 $f0, 0x1d98($at) -/* B37338 80242768 8FBF0018 */ lw $ra, 0x18($sp) -/* B3733C 8024276C 8FB10014 */ lw $s1, 0x14($sp) -/* B37340 80242770 8FB00010 */ lw $s0, 0x10($sp) -/* B37344 80242774 03E00008 */ jr $ra -/* B37348 80242778 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s deleted file mode 100644 index 2e575aa820..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_8024277C_B3734C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024277C_B3734C -/* B3734C 8024277C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B37350 80242780 AFB10014 */ sw $s1, 0x14($sp) -/* B37354 80242784 0080882D */ daddu $s1, $a0, $zero -/* B37358 80242788 AFBF0018 */ sw $ra, 0x18($sp) -/* B3735C 8024278C AFB00010 */ sw $s0, 0x10($sp) -/* B37360 80242790 8E30000C */ lw $s0, 0xc($s1) -/* B37364 80242794 8E050000 */ lw $a1, ($s0) -/* B37368 80242798 0C0B1EAF */ jal get_variable -/* B3736C 8024279C 26100004 */ addiu $s0, $s0, 4 -/* B37370 802427A0 00021880 */ sll $v1, $v0, 2 -/* B37374 802427A4 00621821 */ addu $v1, $v1, $v0 -/* B37378 802427A8 00031880 */ sll $v1, $v1, 2 -/* B3737C 802427AC 00621823 */ subu $v1, $v1, $v0 -/* B37380 802427B0 000310C0 */ sll $v0, $v1, 3 -/* B37384 802427B4 00621821 */ addu $v1, $v1, $v0 -/* B37388 802427B8 000318C0 */ sll $v1, $v1, 3 -/* B3738C 802427BC 3C01800B */ lui $at, 0x800b -/* B37390 802427C0 00230821 */ addu $at, $at, $v1 -/* B37394 802427C4 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* B37398 802427C8 3C014480 */ lui $at, 0x4480 -/* B3739C 802427CC 44810000 */ mtc1 $at, $f0 -/* B373A0 802427D0 00000000 */ nop -/* B373A4 802427D4 46001082 */ mul.s $f2, $f2, $f0 -/* B373A8 802427D8 00000000 */ nop -/* B373AC 802427DC 3C01CD5B */ lui $at, 0xcd5b -/* B373B0 802427E0 34215858 */ ori $at, $at, 0x5858 -/* B373B4 802427E4 44810000 */ mtc1 $at, $f0 -/* B373B8 802427E8 00000000 */ nop -/* B373BC 802427EC 46001080 */ add.s $f2, $f2, $f0 -/* B373C0 802427F0 8E050000 */ lw $a1, ($s0) -/* B373C4 802427F4 4600110D */ trunc.w.s $f4, $f2 -/* B373C8 802427F8 44062000 */ mfc1 $a2, $f4 -/* B373CC 802427FC 0C0B2026 */ jal set_variable -/* B373D0 80242800 0220202D */ daddu $a0, $s1, $zero -/* B373D4 80242804 8FBF0018 */ lw $ra, 0x18($sp) -/* B373D8 80242808 8FB10014 */ lw $s1, 0x14($sp) -/* B373DC 8024280C 8FB00010 */ lw $s0, 0x10($sp) -/* B373E0 80242810 24020002 */ addiu $v0, $zero, 2 -/* B373E4 80242814 03E00008 */ jr $ra -/* B373E8 80242818 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s b/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s deleted file mode 100644 index b6a329e9bc..0000000000 --- a/asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_802429B8_B37588.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802429B8_B37588 -/* B37588 802429B8 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* B3758C 802429BC 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* B37590 802429C0 10A00002 */ beqz $a1, .L802429CC -/* B37594 802429C4 2402003C */ addiu $v0, $zero, 0x3c -/* B37598 802429C8 AC820070 */ sw $v0, 0x70($a0) -.L802429CC: -/* B3759C 802429CC C4620080 */ lwc1 $f2, 0x80($v1) -/* B375A0 802429D0 3C0141F0 */ lui $at, 0x41f0 -/* B375A4 802429D4 44810000 */ mtc1 $at, $f0 -/* B375A8 802429D8 00000000 */ nop -/* B375AC 802429DC 46001000 */ add.s $f0, $f2, $f0 -/* B375B0 802429E0 3C0143B4 */ lui $at, 0x43b4 -/* B375B4 802429E4 44811000 */ mtc1 $at, $f2 -/* B375B8 802429E8 00000000 */ nop -/* B375BC 802429EC 4600103E */ c.le.s $f2, $f0 -/* B375C0 802429F0 00000000 */ nop -/* B375C4 802429F4 45000003 */ bc1f .L80242A04 -/* B375C8 802429F8 E4600080 */ swc1 $f0, 0x80($v1) -/* B375CC 802429FC 46020001 */ sub.s $f0, $f0, $f2 -/* B375D0 80242A00 E4600080 */ swc1 $f0, 0x80($v1) -.L80242A04: -/* B375D4 80242A04 8C820070 */ lw $v0, 0x70($a0) -/* B375D8 80242A08 2442FFFF */ addiu $v0, $v0, -1 -/* B375DC 80242A0C AC820070 */ sw $v0, 0x70($a0) -/* B375E0 80242A10 000217C3 */ sra $v0, $v0, 0x1f -/* B375E4 80242A14 03E00008 */ jr $ra -/* B375E8 80242A18 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s deleted file mode 100644 index 136a29d051..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240EFC_8B0F6C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240EFC_8B0F6C -/* 8B0F6C 80240EFC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0F70 80240F00 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0F74 80240F04 0080882D */ daddu $s1, $a0, $zero -/* 8B0F78 80240F08 AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0F7C 80240F0C AFB00010 */ sw $s0, 0x10($sp) -/* 8B0F80 80240F10 8E30000C */ lw $s0, 0xc($s1) -/* 8B0F84 80240F14 8E050000 */ lw $a1, ($s0) -/* 8B0F88 80240F18 0C0B1EAF */ jal get_variable -/* 8B0F8C 80240F1C 26100004 */ addiu $s0, $s0, 4 -/* 8B0F90 80240F20 0220202D */ daddu $a0, $s1, $zero -/* 8B0F94 80240F24 8E050000 */ lw $a1, ($s0) -/* 8B0F98 80240F28 0C0B210B */ jal get_float_variable -/* 8B0F9C 80240F2C 0040802D */ daddu $s0, $v0, $zero -/* 8B0FA0 80240F30 24020002 */ addiu $v0, $zero, 2 -/* 8B0FA4 80240F34 00501804 */ sllv $v1, $s0, $v0 -/* 8B0FA8 80240F38 00701821 */ addu $v1, $v1, $s0 -/* 8B0FAC 80240F3C 00431804 */ sllv $v1, $v1, $v0 -/* 8B0FB0 80240F40 00701823 */ subu $v1, $v1, $s0 -/* 8B0FB4 80240F44 000320C0 */ sll $a0, $v1, 3 -/* 8B0FB8 80240F48 00641821 */ addu $v1, $v1, $a0 -/* 8B0FBC 80240F4C 000318C0 */ sll $v1, $v1, 3 -/* 8B0FC0 80240F50 3C01800B */ lui $at, 0x800b -/* 8B0FC4 80240F54 00230821 */ addu $at, $at, $v1 -/* 8B0FC8 80240F58 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 8B0FCC 80240F5C 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B0FD0 80240F60 8FB10014 */ lw $s1, 0x14($sp) -/* 8B0FD4 80240F64 8FB00010 */ lw $s0, 0x10($sp) -/* 8B0FD8 80240F68 03E00008 */ jr $ra -/* 8B0FDC 80240F6C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s deleted file mode 100644 index c991f90716..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80240F70_8B0FE0.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240F70_8B0FE0 -/* 8B0FE0 80240F70 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8B0FE4 80240F74 AFB10014 */ sw $s1, 0x14($sp) -/* 8B0FE8 80240F78 0080882D */ daddu $s1, $a0, $zero -/* 8B0FEC 80240F7C AFBF0018 */ sw $ra, 0x18($sp) -/* 8B0FF0 80240F80 AFB00010 */ sw $s0, 0x10($sp) -/* 8B0FF4 80240F84 8E30000C */ lw $s0, 0xc($s1) -/* 8B0FF8 80240F88 8E050000 */ lw $a1, ($s0) -/* 8B0FFC 80240F8C 0C0B1EAF */ jal get_variable -/* 8B1000 80240F90 26100004 */ addiu $s0, $s0, 4 -/* 8B1004 80240F94 00021880 */ sll $v1, $v0, 2 -/* 8B1008 80240F98 00621821 */ addu $v1, $v1, $v0 -/* 8B100C 80240F9C 00031880 */ sll $v1, $v1, 2 -/* 8B1010 80240FA0 00621823 */ subu $v1, $v1, $v0 -/* 8B1014 80240FA4 000310C0 */ sll $v0, $v1, 3 -/* 8B1018 80240FA8 00621821 */ addu $v1, $v1, $v0 -/* 8B101C 80240FAC 000318C0 */ sll $v1, $v1, 3 -/* 8B1020 80240FB0 3C01800B */ lui $at, 0x800b -/* 8B1024 80240FB4 00230821 */ addu $at, $at, $v1 -/* 8B1028 80240FB8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8B102C 80240FBC 3C014480 */ lui $at, 0x4480 -/* 8B1030 80240FC0 44810000 */ mtc1 $at, $f0 -/* 8B1034 80240FC4 00000000 */ nop -/* 8B1038 80240FC8 46001082 */ mul.s $f2, $f2, $f0 -/* 8B103C 80240FCC 00000000 */ nop -/* 8B1040 80240FD0 3C01CD5B */ lui $at, 0xcd5b -/* 8B1044 80240FD4 34215858 */ ori $at, $at, 0x5858 -/* 8B1048 80240FD8 44810000 */ mtc1 $at, $f0 -/* 8B104C 80240FDC 00000000 */ nop -/* 8B1050 80240FE0 46001080 */ add.s $f2, $f2, $f0 -/* 8B1054 80240FE4 8E050000 */ lw $a1, ($s0) -/* 8B1058 80240FE8 4600110D */ trunc.w.s $f4, $f2 -/* 8B105C 80240FEC 44062000 */ mfc1 $a2, $f4 -/* 8B1060 80240FF0 0C0B2026 */ jal set_variable -/* 8B1064 80240FF4 0220202D */ daddu $a0, $s1, $zero -/* 8B1068 80240FF8 8FBF0018 */ lw $ra, 0x18($sp) -/* 8B106C 80240FFC 8FB10014 */ lw $s1, 0x14($sp) -/* 8B1070 80241000 8FB00010 */ lw $s0, 0x10($sp) -/* 8B1074 80241004 24020002 */ addiu $v0, $zero, 2 -/* 8B1078 80241008 03E00008 */ jr $ra -/* 8B107C 8024100C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s deleted file mode 100644 index 19895d4bc0..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_802411AC_8B121C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802411AC_8B121C -/* 8B121C 802411AC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8B1220 802411B0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8B1224 802411B4 10A00002 */ beqz $a1, .L802411C0 -/* 8B1228 802411B8 2402003C */ addiu $v0, $zero, 0x3c -/* 8B122C 802411BC AC820070 */ sw $v0, 0x70($a0) -.L802411C0: -/* 8B1230 802411C0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8B1234 802411C4 3C0141F0 */ lui $at, 0x41f0 -/* 8B1238 802411C8 44810000 */ mtc1 $at, $f0 -/* 8B123C 802411CC 00000000 */ nop -/* 8B1240 802411D0 46001000 */ add.s $f0, $f2, $f0 -/* 8B1244 802411D4 3C0143B4 */ lui $at, 0x43b4 -/* 8B1248 802411D8 44811000 */ mtc1 $at, $f2 -/* 8B124C 802411DC 00000000 */ nop -/* 8B1250 802411E0 4600103E */ c.le.s $f2, $f0 -/* 8B1254 802411E4 00000000 */ nop -/* 8B1258 802411E8 45000003 */ bc1f .L802411F8 -/* 8B125C 802411EC E4600080 */ swc1 $f0, 0x80($v1) -/* 8B1260 802411F0 46020001 */ sub.s $f0, $f0, $f2 -/* 8B1264 802411F4 E4600080 */ swc1 $f0, 0x80($v1) -.L802411F8: -/* 8B1268 802411F8 8C820070 */ lw $v0, 0x70($a0) -/* 8B126C 802411FC 2442FFFF */ addiu $v0, $v0, -1 -/* 8B1270 80241200 AC820070 */ sw $v0, 0x70($a0) -/* 8B1274 80241204 000217C3 */ sra $v0, $v0, 0x1f -/* 8B1278 80241208 03E00008 */ jr $ra -/* 8B127C 8024120C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s deleted file mode 100644 index eb859083fc..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024119C_7EBEAC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024119C_7EBEAC -/* 7EBEAC 8024119C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EBEB0 802411A0 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBEB4 802411A4 0080882D */ daddu $s1, $a0, $zero -/* 7EBEB8 802411A8 AFBF0018 */ sw $ra, 0x18($sp) -/* 7EBEBC 802411AC AFB00010 */ sw $s0, 0x10($sp) -/* 7EBEC0 802411B0 8E30000C */ lw $s0, 0xc($s1) -/* 7EBEC4 802411B4 8E050000 */ lw $a1, ($s0) -/* 7EBEC8 802411B8 0C0B1EAF */ jal get_variable -/* 7EBECC 802411BC 26100004 */ addiu $s0, $s0, 4 -/* 7EBED0 802411C0 0220202D */ daddu $a0, $s1, $zero -/* 7EBED4 802411C4 8E050000 */ lw $a1, ($s0) -/* 7EBED8 802411C8 0C0B210B */ jal get_float_variable -/* 7EBEDC 802411CC 0040802D */ daddu $s0, $v0, $zero -/* 7EBEE0 802411D0 24020002 */ addiu $v0, $zero, 2 -/* 7EBEE4 802411D4 00501804 */ sllv $v1, $s0, $v0 -/* 7EBEE8 802411D8 00701821 */ addu $v1, $v1, $s0 -/* 7EBEEC 802411DC 00431804 */ sllv $v1, $v1, $v0 -/* 7EBEF0 802411E0 00701823 */ subu $v1, $v1, $s0 -/* 7EBEF4 802411E4 000320C0 */ sll $a0, $v1, 3 -/* 7EBEF8 802411E8 00641821 */ addu $v1, $v1, $a0 -/* 7EBEFC 802411EC 000318C0 */ sll $v1, $v1, 3 -/* 7EBF00 802411F0 3C01800B */ lui $at, 0x800b -/* 7EBF04 802411F4 00230821 */ addu $at, $at, $v1 -/* 7EBF08 802411F8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 7EBF0C 802411FC 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EBF10 80241200 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBF14 80241204 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBF18 80241208 03E00008 */ jr $ra -/* 7EBF1C 8024120C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s deleted file mode 100644 index 7548e188d1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80241210_7EBF20.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241210_7EBF20 -/* 7EBF20 80241210 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 7EBF24 80241214 AFB10014 */ sw $s1, 0x14($sp) -/* 7EBF28 80241218 0080882D */ daddu $s1, $a0, $zero -/* 7EBF2C 8024121C AFBF0018 */ sw $ra, 0x18($sp) -/* 7EBF30 80241220 AFB00010 */ sw $s0, 0x10($sp) -/* 7EBF34 80241224 8E30000C */ lw $s0, 0xc($s1) -/* 7EBF38 80241228 8E050000 */ lw $a1, ($s0) -/* 7EBF3C 8024122C 0C0B1EAF */ jal get_variable -/* 7EBF40 80241230 26100004 */ addiu $s0, $s0, 4 -/* 7EBF44 80241234 00021880 */ sll $v1, $v0, 2 -/* 7EBF48 80241238 00621821 */ addu $v1, $v1, $v0 -/* 7EBF4C 8024123C 00031880 */ sll $v1, $v1, 2 -/* 7EBF50 80241240 00621823 */ subu $v1, $v1, $v0 -/* 7EBF54 80241244 000310C0 */ sll $v0, $v1, 3 -/* 7EBF58 80241248 00621821 */ addu $v1, $v1, $v0 -/* 7EBF5C 8024124C 000318C0 */ sll $v1, $v1, 3 -/* 7EBF60 80241250 3C01800B */ lui $at, 0x800b -/* 7EBF64 80241254 00230821 */ addu $at, $at, $v1 -/* 7EBF68 80241258 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 7EBF6C 8024125C 3C014480 */ lui $at, 0x4480 -/* 7EBF70 80241260 44810000 */ mtc1 $at, $f0 -/* 7EBF74 80241264 00000000 */ nop -/* 7EBF78 80241268 46001082 */ mul.s $f2, $f2, $f0 -/* 7EBF7C 8024126C 00000000 */ nop -/* 7EBF80 80241270 3C01CD5B */ lui $at, 0xcd5b -/* 7EBF84 80241274 34215858 */ ori $at, $at, 0x5858 -/* 7EBF88 80241278 44810000 */ mtc1 $at, $f0 -/* 7EBF8C 8024127C 00000000 */ nop -/* 7EBF90 80241280 46001080 */ add.s $f2, $f2, $f0 -/* 7EBF94 80241284 8E050000 */ lw $a1, ($s0) -/* 7EBF98 80241288 4600110D */ trunc.w.s $f4, $f2 -/* 7EBF9C 8024128C 44062000 */ mfc1 $a2, $f4 -/* 7EBFA0 80241290 0C0B2026 */ jal set_variable -/* 7EBFA4 80241294 0220202D */ daddu $a0, $s1, $zero -/* 7EBFA8 80241298 8FBF0018 */ lw $ra, 0x18($sp) -/* 7EBFAC 8024129C 8FB10014 */ lw $s1, 0x14($sp) -/* 7EBFB0 802412A0 8FB00010 */ lw $s0, 0x10($sp) -/* 7EBFB4 802412A4 24020002 */ addiu $v0, $zero, 2 -/* 7EBFB8 802412A8 03E00008 */ jr $ra -/* 7EBFBC 802412AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s deleted file mode 100644 index 7d0fd6b7af..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_8024144C_7EC15C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024144C_7EC15C -/* 7EC15C 8024144C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 7EC160 80241450 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 7EC164 80241454 10A00002 */ beqz $a1, .L80241460 -/* 7EC168 80241458 2402003C */ addiu $v0, $zero, 0x3c -/* 7EC16C 8024145C AC820070 */ sw $v0, 0x70($a0) -.L80241460: -/* 7EC170 80241460 C4620080 */ lwc1 $f2, 0x80($v1) -/* 7EC174 80241464 3C0141F0 */ lui $at, 0x41f0 -/* 7EC178 80241468 44810000 */ mtc1 $at, $f0 -/* 7EC17C 8024146C 00000000 */ nop -/* 7EC180 80241470 46001000 */ add.s $f0, $f2, $f0 -/* 7EC184 80241474 3C0143B4 */ lui $at, 0x43b4 -/* 7EC188 80241478 44811000 */ mtc1 $at, $f2 -/* 7EC18C 8024147C 00000000 */ nop -/* 7EC190 80241480 4600103E */ c.le.s $f2, $f0 -/* 7EC194 80241484 00000000 */ nop -/* 7EC198 80241488 45000003 */ bc1f .L80241498 -/* 7EC19C 8024148C E4600080 */ swc1 $f0, 0x80($v1) -/* 7EC1A0 80241490 46020001 */ sub.s $f0, $f0, $f2 -/* 7EC1A4 80241494 E4600080 */ swc1 $f0, 0x80($v1) -.L80241498: -/* 7EC1A8 80241498 8C820070 */ lw $v0, 0x70($a0) -/* 7EC1AC 8024149C 2442FFFF */ addiu $v0, $v0, -1 -/* 7EC1B0 802414A0 AC820070 */ sw $v0, 0x70($a0) -/* 7EC1B4 802414A4 000217C3 */ sra $v0, $v0, 0x1f -/* 7EC1B8 802414A8 03E00008 */ jr $ra -/* 7EC1BC 802414AC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s deleted file mode 100644 index ce062d8b5f..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242A7C_8032FC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242A7C_8032FC -/* 8032FC 80242A7C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803300 80242A80 AFB10014 */ sw $s1, 0x14($sp) -/* 803304 80242A84 0080882D */ daddu $s1, $a0, $zero -/* 803308 80242A88 AFBF0018 */ sw $ra, 0x18($sp) -/* 80330C 80242A8C AFB00010 */ sw $s0, 0x10($sp) -/* 803310 80242A90 8E30000C */ lw $s0, 0xc($s1) -/* 803314 80242A94 8E050000 */ lw $a1, ($s0) -/* 803318 80242A98 0C0B1EAF */ jal get_variable -/* 80331C 80242A9C 26100004 */ addiu $s0, $s0, 4 -/* 803320 80242AA0 0220202D */ daddu $a0, $s1, $zero -/* 803324 80242AA4 8E050000 */ lw $a1, ($s0) -/* 803328 80242AA8 0C0B210B */ jal get_float_variable -/* 80332C 80242AAC 0040802D */ daddu $s0, $v0, $zero -/* 803330 80242AB0 24020002 */ addiu $v0, $zero, 2 -/* 803334 80242AB4 00501804 */ sllv $v1, $s0, $v0 -/* 803338 80242AB8 00701821 */ addu $v1, $v1, $s0 -/* 80333C 80242ABC 00431804 */ sllv $v1, $v1, $v0 -/* 803340 80242AC0 00701823 */ subu $v1, $v1, $s0 -/* 803344 80242AC4 000320C0 */ sll $a0, $v1, 3 -/* 803348 80242AC8 00641821 */ addu $v1, $v1, $a0 -/* 80334C 80242ACC 000318C0 */ sll $v1, $v1, 3 -/* 803350 80242AD0 3C01800B */ lui $at, 0x800b -/* 803354 80242AD4 00230821 */ addu $at, $at, $v1 -/* 803358 80242AD8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 80335C 80242ADC 8FBF0018 */ lw $ra, 0x18($sp) -/* 803360 80242AE0 8FB10014 */ lw $s1, 0x14($sp) -/* 803364 80242AE4 8FB00010 */ lw $s0, 0x10($sp) -/* 803368 80242AE8 03E00008 */ jr $ra -/* 80336C 80242AEC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s deleted file mode 100644 index fc08cf671d..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242AF0_803370.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242AF0_803370 -/* 803370 80242AF0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 803374 80242AF4 AFB10014 */ sw $s1, 0x14($sp) -/* 803378 80242AF8 0080882D */ daddu $s1, $a0, $zero -/* 80337C 80242AFC AFBF0018 */ sw $ra, 0x18($sp) -/* 803380 80242B00 AFB00010 */ sw $s0, 0x10($sp) -/* 803384 80242B04 8E30000C */ lw $s0, 0xc($s1) -/* 803388 80242B08 8E050000 */ lw $a1, ($s0) -/* 80338C 80242B0C 0C0B1EAF */ jal get_variable -/* 803390 80242B10 26100004 */ addiu $s0, $s0, 4 -/* 803394 80242B14 00021880 */ sll $v1, $v0, 2 -/* 803398 80242B18 00621821 */ addu $v1, $v1, $v0 -/* 80339C 80242B1C 00031880 */ sll $v1, $v1, 2 -/* 8033A0 80242B20 00621823 */ subu $v1, $v1, $v0 -/* 8033A4 80242B24 000310C0 */ sll $v0, $v1, 3 -/* 8033A8 80242B28 00621821 */ addu $v1, $v1, $v0 -/* 8033AC 80242B2C 000318C0 */ sll $v1, $v1, 3 -/* 8033B0 80242B30 3C01800B */ lui $at, 0x800b -/* 8033B4 80242B34 00230821 */ addu $at, $at, $v1 -/* 8033B8 80242B38 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8033BC 80242B3C 3C014480 */ lui $at, 0x4480 -/* 8033C0 80242B40 44810000 */ mtc1 $at, $f0 -/* 8033C4 80242B44 00000000 */ nop -/* 8033C8 80242B48 46001082 */ mul.s $f2, $f2, $f0 -/* 8033CC 80242B4C 00000000 */ nop -/* 8033D0 80242B50 3C01CD5B */ lui $at, 0xcd5b -/* 8033D4 80242B54 34215858 */ ori $at, $at, 0x5858 -/* 8033D8 80242B58 44810000 */ mtc1 $at, $f0 -/* 8033DC 80242B5C 00000000 */ nop -/* 8033E0 80242B60 46001080 */ add.s $f2, $f2, $f0 -/* 8033E4 80242B64 8E050000 */ lw $a1, ($s0) -/* 8033E8 80242B68 4600110D */ trunc.w.s $f4, $f2 -/* 8033EC 80242B6C 44062000 */ mfc1 $a2, $f4 -/* 8033F0 80242B70 0C0B2026 */ jal set_variable -/* 8033F4 80242B74 0220202D */ daddu $a0, $s1, $zero -/* 8033F8 80242B78 8FBF0018 */ lw $ra, 0x18($sp) -/* 8033FC 80242B7C 8FB10014 */ lw $s1, 0x14($sp) -/* 803400 80242B80 8FB00010 */ lw $s0, 0x10($sp) -/* 803404 80242B84 24020002 */ addiu $v0, $zero, 2 -/* 803408 80242B88 03E00008 */ jr $ra -/* 80340C 80242B8C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s deleted file mode 100644 index bde9819489..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80242D2C_8035AC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D2C_8035AC -/* 8035AC 80242D2C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8035B0 80242D30 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8035B4 80242D34 10A00002 */ beqz $a1, .L80242D40 -/* 8035B8 80242D38 2402003C */ addiu $v0, $zero, 0x3c -/* 8035BC 80242D3C AC820070 */ sw $v0, 0x70($a0) -.L80242D40: -/* 8035C0 80242D40 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8035C4 80242D44 3C0141F0 */ lui $at, 0x41f0 -/* 8035C8 80242D48 44810000 */ mtc1 $at, $f0 -/* 8035CC 80242D4C 00000000 */ nop -/* 8035D0 80242D50 46001000 */ add.s $f0, $f2, $f0 -/* 8035D4 80242D54 3C0143B4 */ lui $at, 0x43b4 -/* 8035D8 80242D58 44811000 */ mtc1 $at, $f2 -/* 8035DC 80242D5C 00000000 */ nop -/* 8035E0 80242D60 4600103E */ c.le.s $f2, $f0 -/* 8035E4 80242D64 00000000 */ nop -/* 8035E8 80242D68 45000003 */ bc1f .L80242D78 -/* 8035EC 80242D6C E4600080 */ swc1 $f0, 0x80($v1) -/* 8035F0 80242D70 46020001 */ sub.s $f0, $f0, $f2 -/* 8035F4 80242D74 E4600080 */ swc1 $f0, 0x80($v1) -.L80242D78: -/* 8035F8 80242D78 8C820070 */ lw $v0, 0x70($a0) -/* 8035FC 80242D7C 2442FFFF */ addiu $v0, $v0, -1 -/* 803600 80242D80 AC820070 */ sw $v0, 0x70($a0) -/* 803604 80242D84 000217C3 */ sra $v0, $v0, 0x1f -/* 803608 80242D88 03E00008 */ jr $ra -/* 80360C 80242D8C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s deleted file mode 100644 index 55cf81c536..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_8024232C_8255EC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024232C_8255EC -/* 8255EC 8024232C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8255F0 80242330 AFB10014 */ sw $s1, 0x14($sp) -/* 8255F4 80242334 0080882D */ daddu $s1, $a0, $zero -/* 8255F8 80242338 AFBF0018 */ sw $ra, 0x18($sp) -/* 8255FC 8024233C AFB00010 */ sw $s0, 0x10($sp) -/* 825600 80242340 8E30000C */ lw $s0, 0xc($s1) -/* 825604 80242344 8E050000 */ lw $a1, ($s0) -/* 825608 80242348 0C0B1EAF */ jal get_variable -/* 82560C 8024234C 26100004 */ addiu $s0, $s0, 4 -/* 825610 80242350 0220202D */ daddu $a0, $s1, $zero -/* 825614 80242354 8E050000 */ lw $a1, ($s0) -/* 825618 80242358 0C0B210B */ jal get_float_variable -/* 82561C 8024235C 0040802D */ daddu $s0, $v0, $zero -/* 825620 80242360 24020002 */ addiu $v0, $zero, 2 -/* 825624 80242364 00501804 */ sllv $v1, $s0, $v0 -/* 825628 80242368 00701821 */ addu $v1, $v1, $s0 -/* 82562C 8024236C 00431804 */ sllv $v1, $v1, $v0 -/* 825630 80242370 00701823 */ subu $v1, $v1, $s0 -/* 825634 80242374 000320C0 */ sll $a0, $v1, 3 -/* 825638 80242378 00641821 */ addu $v1, $v1, $a0 -/* 82563C 8024237C 000318C0 */ sll $v1, $v1, 3 -/* 825640 80242380 3C01800B */ lui $at, 0x800b -/* 825644 80242384 00230821 */ addu $at, $at, $v1 -/* 825648 80242388 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 82564C 8024238C 8FBF0018 */ lw $ra, 0x18($sp) -/* 825650 80242390 8FB10014 */ lw $s1, 0x14($sp) -/* 825654 80242394 8FB00010 */ lw $s0, 0x10($sp) -/* 825658 80242398 03E00008 */ jr $ra -/* 82565C 8024239C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s deleted file mode 100644 index 2c32392843..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802423A0_825660.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802423A0_825660 -/* 825660 802423A0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 825664 802423A4 AFB10014 */ sw $s1, 0x14($sp) -/* 825668 802423A8 0080882D */ daddu $s1, $a0, $zero -/* 82566C 802423AC AFBF0018 */ sw $ra, 0x18($sp) -/* 825670 802423B0 AFB00010 */ sw $s0, 0x10($sp) -/* 825674 802423B4 8E30000C */ lw $s0, 0xc($s1) -/* 825678 802423B8 8E050000 */ lw $a1, ($s0) -/* 82567C 802423BC 0C0B1EAF */ jal get_variable -/* 825680 802423C0 26100004 */ addiu $s0, $s0, 4 -/* 825684 802423C4 00021880 */ sll $v1, $v0, 2 -/* 825688 802423C8 00621821 */ addu $v1, $v1, $v0 -/* 82568C 802423CC 00031880 */ sll $v1, $v1, 2 -/* 825690 802423D0 00621823 */ subu $v1, $v1, $v0 -/* 825694 802423D4 000310C0 */ sll $v0, $v1, 3 -/* 825698 802423D8 00621821 */ addu $v1, $v1, $v0 -/* 82569C 802423DC 000318C0 */ sll $v1, $v1, 3 -/* 8256A0 802423E0 3C01800B */ lui $at, 0x800b -/* 8256A4 802423E4 00230821 */ addu $at, $at, $v1 -/* 8256A8 802423E8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8256AC 802423EC 3C014480 */ lui $at, 0x4480 -/* 8256B0 802423F0 44810000 */ mtc1 $at, $f0 -/* 8256B4 802423F4 00000000 */ nop -/* 8256B8 802423F8 46001082 */ mul.s $f2, $f2, $f0 -/* 8256BC 802423FC 00000000 */ nop -/* 8256C0 80242400 3C01CD5B */ lui $at, 0xcd5b -/* 8256C4 80242404 34215858 */ ori $at, $at, 0x5858 -/* 8256C8 80242408 44810000 */ mtc1 $at, $f0 -/* 8256CC 8024240C 00000000 */ nop -/* 8256D0 80242410 46001080 */ add.s $f2, $f2, $f0 -/* 8256D4 80242414 8E050000 */ lw $a1, ($s0) -/* 8256D8 80242418 4600110D */ trunc.w.s $f4, $f2 -/* 8256DC 8024241C 44062000 */ mfc1 $a2, $f4 -/* 8256E0 80242420 0C0B2026 */ jal set_variable -/* 8256E4 80242424 0220202D */ daddu $a0, $s1, $zero -/* 8256E8 80242428 8FBF0018 */ lw $ra, 0x18($sp) -/* 8256EC 8024242C 8FB10014 */ lw $s1, 0x14($sp) -/* 8256F0 80242430 8FB00010 */ lw $s0, 0x10($sp) -/* 8256F4 80242434 24020002 */ addiu $v0, $zero, 2 -/* 8256F8 80242438 03E00008 */ jr $ra -/* 8256FC 8024243C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s b/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s deleted file mode 100644 index 3f8c3cae87..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_02/823BF0/func_802425DC_82589C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802425DC_82589C -/* 82589C 802425DC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8258A0 802425E0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8258A4 802425E4 10A00002 */ beqz $a1, .L802425F0 -/* 8258A8 802425E8 2402003C */ addiu $v0, $zero, 0x3c -/* 8258AC 802425EC AC820070 */ sw $v0, 0x70($a0) -.L802425F0: -/* 8258B0 802425F0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8258B4 802425F4 3C0141F0 */ lui $at, 0x41f0 -/* 8258B8 802425F8 44810000 */ mtc1 $at, $f0 -/* 8258BC 802425FC 00000000 */ nop -/* 8258C0 80242600 46001000 */ add.s $f0, $f2, $f0 -/* 8258C4 80242604 3C0143B4 */ lui $at, 0x43b4 -/* 8258C8 80242608 44811000 */ mtc1 $at, $f2 -/* 8258CC 8024260C 00000000 */ nop -/* 8258D0 80242610 4600103E */ c.le.s $f2, $f0 -/* 8258D4 80242614 00000000 */ nop -/* 8258D8 80242618 45000003 */ bc1f .L80242628 -/* 8258DC 8024261C E4600080 */ swc1 $f0, 0x80($v1) -/* 8258E0 80242620 46020001 */ sub.s $f0, $f0, $f2 -/* 8258E4 80242624 E4600080 */ swc1 $f0, 0x80($v1) -.L80242628: -/* 8258E8 80242628 8C820070 */ lw $v0, 0x70($a0) -/* 8258EC 8024262C 2442FFFF */ addiu $v0, $v0, -1 -/* 8258F0 80242630 AC820070 */ sw $v0, 0x70($a0) -/* 8258F4 80242634 000217C3 */ sra $v0, $v0, 0x1f -/* 8258F8 80242638 03E00008 */ jr $ra -/* 8258FC 8024263C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s deleted file mode 100644 index 3a04e9fd08..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_8024101C_83281C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024101C_83281C -/* 83281C 8024101C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832820 80241020 AFB10014 */ sw $s1, 0x14($sp) -/* 832824 80241024 0080882D */ daddu $s1, $a0, $zero -/* 832828 80241028 AFBF0018 */ sw $ra, 0x18($sp) -/* 83282C 8024102C AFB00010 */ sw $s0, 0x10($sp) -/* 832830 80241030 8E30000C */ lw $s0, 0xc($s1) -/* 832834 80241034 8E050000 */ lw $a1, ($s0) -/* 832838 80241038 0C0B1EAF */ jal get_variable -/* 83283C 8024103C 26100004 */ addiu $s0, $s0, 4 -/* 832840 80241040 0220202D */ daddu $a0, $s1, $zero -/* 832844 80241044 8E050000 */ lw $a1, ($s0) -/* 832848 80241048 0C0B210B */ jal get_float_variable -/* 83284C 8024104C 0040802D */ daddu $s0, $v0, $zero -/* 832850 80241050 24020002 */ addiu $v0, $zero, 2 -/* 832854 80241054 00501804 */ sllv $v1, $s0, $v0 -/* 832858 80241058 00701821 */ addu $v1, $v1, $s0 -/* 83285C 8024105C 00431804 */ sllv $v1, $v1, $v0 -/* 832860 80241060 00701823 */ subu $v1, $v1, $s0 -/* 832864 80241064 000320C0 */ sll $a0, $v1, 3 -/* 832868 80241068 00641821 */ addu $v1, $v1, $a0 -/* 83286C 8024106C 000318C0 */ sll $v1, $v1, 3 -/* 832870 80241070 3C01800B */ lui $at, 0x800b -/* 832874 80241074 00230821 */ addu $at, $at, $v1 -/* 832878 80241078 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 83287C 8024107C 8FBF0018 */ lw $ra, 0x18($sp) -/* 832880 80241080 8FB10014 */ lw $s1, 0x14($sp) -/* 832884 80241084 8FB00010 */ lw $s0, 0x10($sp) -/* 832888 80241088 03E00008 */ jr $ra -/* 83288C 8024108C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s deleted file mode 100644 index 80edc7ca7c..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_80241090_832890.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241090_832890 -/* 832890 80241090 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 832894 80241094 AFB10014 */ sw $s1, 0x14($sp) -/* 832898 80241098 0080882D */ daddu $s1, $a0, $zero -/* 83289C 8024109C AFBF0018 */ sw $ra, 0x18($sp) -/* 8328A0 802410A0 AFB00010 */ sw $s0, 0x10($sp) -/* 8328A4 802410A4 8E30000C */ lw $s0, 0xc($s1) -/* 8328A8 802410A8 8E050000 */ lw $a1, ($s0) -/* 8328AC 802410AC 0C0B1EAF */ jal get_variable -/* 8328B0 802410B0 26100004 */ addiu $s0, $s0, 4 -/* 8328B4 802410B4 00021880 */ sll $v1, $v0, 2 -/* 8328B8 802410B8 00621821 */ addu $v1, $v1, $v0 -/* 8328BC 802410BC 00031880 */ sll $v1, $v1, 2 -/* 8328C0 802410C0 00621823 */ subu $v1, $v1, $v0 -/* 8328C4 802410C4 000310C0 */ sll $v0, $v1, 3 -/* 8328C8 802410C8 00621821 */ addu $v1, $v1, $v0 -/* 8328CC 802410CC 000318C0 */ sll $v1, $v1, 3 -/* 8328D0 802410D0 3C01800B */ lui $at, 0x800b -/* 8328D4 802410D4 00230821 */ addu $at, $at, $v1 -/* 8328D8 802410D8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8328DC 802410DC 3C014480 */ lui $at, 0x4480 -/* 8328E0 802410E0 44810000 */ mtc1 $at, $f0 -/* 8328E4 802410E4 00000000 */ nop -/* 8328E8 802410E8 46001082 */ mul.s $f2, $f2, $f0 -/* 8328EC 802410EC 00000000 */ nop -/* 8328F0 802410F0 3C01CD5B */ lui $at, 0xcd5b -/* 8328F4 802410F4 34215858 */ ori $at, $at, 0x5858 -/* 8328F8 802410F8 44810000 */ mtc1 $at, $f0 -/* 8328FC 802410FC 00000000 */ nop -/* 832900 80241100 46001080 */ add.s $f2, $f2, $f0 -/* 832904 80241104 8E050000 */ lw $a1, ($s0) -/* 832908 80241108 4600110D */ trunc.w.s $f4, $f2 -/* 83290C 8024110C 44062000 */ mfc1 $a2, $f4 -/* 832910 80241110 0C0B2026 */ jal set_variable -/* 832914 80241114 0220202D */ daddu $a0, $s1, $zero -/* 832918 80241118 8FBF0018 */ lw $ra, 0x18($sp) -/* 83291C 8024111C 8FB10014 */ lw $s1, 0x14($sp) -/* 832920 80241120 8FB00010 */ lw $s0, 0x10($sp) -/* 832924 80241124 24020002 */ addiu $v0, $zero, 2 -/* 832928 80241128 03E00008 */ jr $ra -/* 83292C 8024112C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s b/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s deleted file mode 100644 index 57be333cb8..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_03/831B20/func_802412CC_832ACC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412CC_832ACC -/* 832ACC 802412CC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 832AD0 802412D0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 832AD4 802412D4 10A00002 */ beqz $a1, .L802412E0 -/* 832AD8 802412D8 2402003C */ addiu $v0, $zero, 0x3c -/* 832ADC 802412DC AC820070 */ sw $v0, 0x70($a0) -.L802412E0: -/* 832AE0 802412E0 C4620080 */ lwc1 $f2, 0x80($v1) -/* 832AE4 802412E4 3C0141F0 */ lui $at, 0x41f0 -/* 832AE8 802412E8 44810000 */ mtc1 $at, $f0 -/* 832AEC 802412EC 00000000 */ nop -/* 832AF0 802412F0 46001000 */ add.s $f0, $f2, $f0 -/* 832AF4 802412F4 3C0143B4 */ lui $at, 0x43b4 -/* 832AF8 802412F8 44811000 */ mtc1 $at, $f2 -/* 832AFC 802412FC 00000000 */ nop -/* 832B00 80241300 4600103E */ c.le.s $f2, $f0 -/* 832B04 80241304 00000000 */ nop -/* 832B08 80241308 45000003 */ bc1f .L80241318 -/* 832B0C 8024130C E4600080 */ swc1 $f0, 0x80($v1) -/* 832B10 80241310 46020001 */ sub.s $f0, $f0, $f2 -/* 832B14 80241314 E4600080 */ swc1 $f0, 0x80($v1) -.L80241318: -/* 832B18 80241318 8C820070 */ lw $v0, 0x70($a0) -/* 832B1C 8024131C 2442FFFF */ addiu $v0, $v0, -1 -/* 832B20 80241320 AC820070 */ sw $v0, 0x70($a0) -/* 832B24 80241324 000217C3 */ sra $v0, $v0, 0x1f -/* 832B28 80241328 03E00008 */ jr $ra -/* 832B2C 8024132C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s deleted file mode 100644 index c6b64fd369..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80240FCC_843B9C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240FCC_843B9C -/* 843B9C 80240FCC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843BA0 80240FD0 AFB10014 */ sw $s1, 0x14($sp) -/* 843BA4 80240FD4 0080882D */ daddu $s1, $a0, $zero -/* 843BA8 80240FD8 AFBF0018 */ sw $ra, 0x18($sp) -/* 843BAC 80240FDC AFB00010 */ sw $s0, 0x10($sp) -/* 843BB0 80240FE0 8E30000C */ lw $s0, 0xc($s1) -/* 843BB4 80240FE4 8E050000 */ lw $a1, ($s0) -/* 843BB8 80240FE8 0C0B1EAF */ jal get_variable -/* 843BBC 80240FEC 26100004 */ addiu $s0, $s0, 4 -/* 843BC0 80240FF0 0220202D */ daddu $a0, $s1, $zero -/* 843BC4 80240FF4 8E050000 */ lw $a1, ($s0) -/* 843BC8 80240FF8 0C0B210B */ jal get_float_variable -/* 843BCC 80240FFC 0040802D */ daddu $s0, $v0, $zero -/* 843BD0 80241000 24020002 */ addiu $v0, $zero, 2 -/* 843BD4 80241004 00501804 */ sllv $v1, $s0, $v0 -/* 843BD8 80241008 00701821 */ addu $v1, $v1, $s0 -/* 843BDC 8024100C 00431804 */ sllv $v1, $v1, $v0 -/* 843BE0 80241010 00701823 */ subu $v1, $v1, $s0 -/* 843BE4 80241014 000320C0 */ sll $a0, $v1, 3 -/* 843BE8 80241018 00641821 */ addu $v1, $v1, $a0 -/* 843BEC 8024101C 000318C0 */ sll $v1, $v1, 3 -/* 843BF0 80241020 3C01800B */ lui $at, 0x800b -/* 843BF4 80241024 00230821 */ addu $at, $at, $v1 -/* 843BF8 80241028 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 843BFC 8024102C 8FBF0018 */ lw $ra, 0x18($sp) -/* 843C00 80241030 8FB10014 */ lw $s1, 0x14($sp) -/* 843C04 80241034 8FB00010 */ lw $s0, 0x10($sp) -/* 843C08 80241038 03E00008 */ jr $ra -/* 843C0C 8024103C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s deleted file mode 100644 index be23cbb05e..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_80241040_843C10.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241040_843C10 -/* 843C10 80241040 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 843C14 80241044 AFB10014 */ sw $s1, 0x14($sp) -/* 843C18 80241048 0080882D */ daddu $s1, $a0, $zero -/* 843C1C 8024104C AFBF0018 */ sw $ra, 0x18($sp) -/* 843C20 80241050 AFB00010 */ sw $s0, 0x10($sp) -/* 843C24 80241054 8E30000C */ lw $s0, 0xc($s1) -/* 843C28 80241058 8E050000 */ lw $a1, ($s0) -/* 843C2C 8024105C 0C0B1EAF */ jal get_variable -/* 843C30 80241060 26100004 */ addiu $s0, $s0, 4 -/* 843C34 80241064 00021880 */ sll $v1, $v0, 2 -/* 843C38 80241068 00621821 */ addu $v1, $v1, $v0 -/* 843C3C 8024106C 00031880 */ sll $v1, $v1, 2 -/* 843C40 80241070 00621823 */ subu $v1, $v1, $v0 -/* 843C44 80241074 000310C0 */ sll $v0, $v1, 3 -/* 843C48 80241078 00621821 */ addu $v1, $v1, $v0 -/* 843C4C 8024107C 000318C0 */ sll $v1, $v1, 3 -/* 843C50 80241080 3C01800B */ lui $at, 0x800b -/* 843C54 80241084 00230821 */ addu $at, $at, $v1 -/* 843C58 80241088 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 843C5C 8024108C 3C014480 */ lui $at, 0x4480 -/* 843C60 80241090 44810000 */ mtc1 $at, $f0 -/* 843C64 80241094 00000000 */ nop -/* 843C68 80241098 46001082 */ mul.s $f2, $f2, $f0 -/* 843C6C 8024109C 00000000 */ nop -/* 843C70 802410A0 3C01CD5B */ lui $at, 0xcd5b -/* 843C74 802410A4 34215858 */ ori $at, $at, 0x5858 -/* 843C78 802410A8 44810000 */ mtc1 $at, $f0 -/* 843C7C 802410AC 00000000 */ nop -/* 843C80 802410B0 46001080 */ add.s $f2, $f2, $f0 -/* 843C84 802410B4 8E050000 */ lw $a1, ($s0) -/* 843C88 802410B8 4600110D */ trunc.w.s $f4, $f2 -/* 843C8C 802410BC 44062000 */ mfc1 $a2, $f4 -/* 843C90 802410C0 0C0B2026 */ jal set_variable -/* 843C94 802410C4 0220202D */ daddu $a0, $s1, $zero -/* 843C98 802410C8 8FBF0018 */ lw $ra, 0x18($sp) -/* 843C9C 802410CC 8FB10014 */ lw $s1, 0x14($sp) -/* 843CA0 802410D0 8FB00010 */ lw $s0, 0x10($sp) -/* 843CA4 802410D4 24020002 */ addiu $v0, $zero, 2 -/* 843CA8 802410D8 03E00008 */ jr $ra -/* 843CAC 802410DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s b/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s deleted file mode 100644 index 8d546c52ff..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_04/843030/func_8024127C_843E4C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024127C_843E4C -/* 843E4C 8024127C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 843E50 80241280 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 843E54 80241284 10A00002 */ beqz $a1, .L80241290 -/* 843E58 80241288 2402003C */ addiu $v0, $zero, 0x3c -/* 843E5C 8024128C AC820070 */ sw $v0, 0x70($a0) -.L80241290: -/* 843E60 80241290 C4620080 */ lwc1 $f2, 0x80($v1) -/* 843E64 80241294 3C0141F0 */ lui $at, 0x41f0 -/* 843E68 80241298 44810000 */ mtc1 $at, $f0 -/* 843E6C 8024129C 00000000 */ nop -/* 843E70 802412A0 46001000 */ add.s $f0, $f2, $f0 -/* 843E74 802412A4 3C0143B4 */ lui $at, 0x43b4 -/* 843E78 802412A8 44811000 */ mtc1 $at, $f2 -/* 843E7C 802412AC 00000000 */ nop -/* 843E80 802412B0 4600103E */ c.le.s $f2, $f0 -/* 843E84 802412B4 00000000 */ nop -/* 843E88 802412B8 45000003 */ bc1f .L802412C8 -/* 843E8C 802412BC E4600080 */ swc1 $f0, 0x80($v1) -/* 843E90 802412C0 46020001 */ sub.s $f0, $f0, $f2 -/* 843E94 802412C4 E4600080 */ swc1 $f0, 0x80($v1) -.L802412C8: -/* 843E98 802412C8 8C820070 */ lw $v0, 0x70($a0) -/* 843E9C 802412CC 2442FFFF */ addiu $v0, $v0, -1 -/* 843EA0 802412D0 AC820070 */ sw $v0, 0x70($a0) -/* 843EA4 802412D4 000217C3 */ sra $v0, $v0, 0x1f -/* 843EA8 802412D8 03E00008 */ jr $ra -/* 843EAC 802412DC 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s deleted file mode 100644 index 20106558e2..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241E8C_853FFC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241E8C_853FFC -/* 853FFC 80241E8C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854000 80241E90 AFB10014 */ sw $s1, 0x14($sp) -/* 854004 80241E94 0080882D */ daddu $s1, $a0, $zero -/* 854008 80241E98 AFBF0018 */ sw $ra, 0x18($sp) -/* 85400C 80241E9C AFB00010 */ sw $s0, 0x10($sp) -/* 854010 80241EA0 8E30000C */ lw $s0, 0xc($s1) -/* 854014 80241EA4 8E050000 */ lw $a1, ($s0) -/* 854018 80241EA8 0C0B1EAF */ jal get_variable -/* 85401C 80241EAC 26100004 */ addiu $s0, $s0, 4 -/* 854020 80241EB0 0220202D */ daddu $a0, $s1, $zero -/* 854024 80241EB4 8E050000 */ lw $a1, ($s0) -/* 854028 80241EB8 0C0B210B */ jal get_float_variable -/* 85402C 80241EBC 0040802D */ daddu $s0, $v0, $zero -/* 854030 80241EC0 24020002 */ addiu $v0, $zero, 2 -/* 854034 80241EC4 00501804 */ sllv $v1, $s0, $v0 -/* 854038 80241EC8 00701821 */ addu $v1, $v1, $s0 -/* 85403C 80241ECC 00431804 */ sllv $v1, $v1, $v0 -/* 854040 80241ED0 00701823 */ subu $v1, $v1, $s0 -/* 854044 80241ED4 000320C0 */ sll $a0, $v1, 3 -/* 854048 80241ED8 00641821 */ addu $v1, $v1, $a0 -/* 85404C 80241EDC 000318C0 */ sll $v1, $v1, 3 -/* 854050 80241EE0 3C01800B */ lui $at, 0x800b -/* 854054 80241EE4 00230821 */ addu $at, $at, $v1 -/* 854058 80241EE8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 85405C 80241EEC 8FBF0018 */ lw $ra, 0x18($sp) -/* 854060 80241EF0 8FB10014 */ lw $s1, 0x14($sp) -/* 854064 80241EF4 8FB00010 */ lw $s0, 0x10($sp) -/* 854068 80241EF8 03E00008 */ jr $ra -/* 85406C 80241EFC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s deleted file mode 100644 index d757ecc223..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_80241F00_854070.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241F00_854070 -/* 854070 80241F00 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 854074 80241F04 AFB10014 */ sw $s1, 0x14($sp) -/* 854078 80241F08 0080882D */ daddu $s1, $a0, $zero -/* 85407C 80241F0C AFBF0018 */ sw $ra, 0x18($sp) -/* 854080 80241F10 AFB00010 */ sw $s0, 0x10($sp) -/* 854084 80241F14 8E30000C */ lw $s0, 0xc($s1) -/* 854088 80241F18 8E050000 */ lw $a1, ($s0) -/* 85408C 80241F1C 0C0B1EAF */ jal get_variable -/* 854090 80241F20 26100004 */ addiu $s0, $s0, 4 -/* 854094 80241F24 00021880 */ sll $v1, $v0, 2 -/* 854098 80241F28 00621821 */ addu $v1, $v1, $v0 -/* 85409C 80241F2C 00031880 */ sll $v1, $v1, 2 -/* 8540A0 80241F30 00621823 */ subu $v1, $v1, $v0 -/* 8540A4 80241F34 000310C0 */ sll $v0, $v1, 3 -/* 8540A8 80241F38 00621821 */ addu $v1, $v1, $v0 -/* 8540AC 80241F3C 000318C0 */ sll $v1, $v1, 3 -/* 8540B0 80241F40 3C01800B */ lui $at, 0x800b -/* 8540B4 80241F44 00230821 */ addu $at, $at, $v1 -/* 8540B8 80241F48 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 8540BC 80241F4C 3C014480 */ lui $at, 0x4480 -/* 8540C0 80241F50 44810000 */ mtc1 $at, $f0 -/* 8540C4 80241F54 00000000 */ nop -/* 8540C8 80241F58 46001082 */ mul.s $f2, $f2, $f0 -/* 8540CC 80241F5C 00000000 */ nop -/* 8540D0 80241F60 3C01CD5B */ lui $at, 0xcd5b -/* 8540D4 80241F64 34215858 */ ori $at, $at, 0x5858 -/* 8540D8 80241F68 44810000 */ mtc1 $at, $f0 -/* 8540DC 80241F6C 00000000 */ nop -/* 8540E0 80241F70 46001080 */ add.s $f2, $f2, $f0 -/* 8540E4 80241F74 8E050000 */ lw $a1, ($s0) -/* 8540E8 80241F78 4600110D */ trunc.w.s $f4, $f2 -/* 8540EC 80241F7C 44062000 */ mfc1 $a2, $f4 -/* 8540F0 80241F80 0C0B2026 */ jal set_variable -/* 8540F4 80241F84 0220202D */ daddu $a0, $s1, $zero -/* 8540F8 80241F88 8FBF0018 */ lw $ra, 0x18($sp) -/* 8540FC 80241F8C 8FB10014 */ lw $s1, 0x14($sp) -/* 854100 80241F90 8FB00010 */ lw $s0, 0x10($sp) -/* 854104 80241F94 24020002 */ addiu $v0, $zero, 2 -/* 854108 80241F98 03E00008 */ jr $ra -/* 85410C 80241F9C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s b/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s deleted file mode 100644 index bca1515ff1..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_05/852170/func_8024213C_8542AC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024213C_8542AC -/* 8542AC 8024213C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 8542B0 80242140 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 8542B4 80242144 10A00002 */ beqz $a1, .L80242150 -/* 8542B8 80242148 2402003C */ addiu $v0, $zero, 0x3c -/* 8542BC 8024214C AC820070 */ sw $v0, 0x70($a0) -.L80242150: -/* 8542C0 80242150 C4620080 */ lwc1 $f2, 0x80($v1) -/* 8542C4 80242154 3C0141F0 */ lui $at, 0x41f0 -/* 8542C8 80242158 44810000 */ mtc1 $at, $f0 -/* 8542CC 8024215C 00000000 */ nop -/* 8542D0 80242160 46001000 */ add.s $f0, $f2, $f0 -/* 8542D4 80242164 3C0143B4 */ lui $at, 0x43b4 -/* 8542D8 80242168 44811000 */ mtc1 $at, $f2 -/* 8542DC 8024216C 00000000 */ nop -/* 8542E0 80242170 4600103E */ c.le.s $f2, $f0 -/* 8542E4 80242174 00000000 */ nop -/* 8542E8 80242178 45000003 */ bc1f .L80242188 -/* 8542EC 8024217C E4600080 */ swc1 $f0, 0x80($v1) -/* 8542F0 80242180 46020001 */ sub.s $f0, $f0, $f2 -/* 8542F4 80242184 E4600080 */ swc1 $f0, 0x80($v1) -.L80242188: -/* 8542F8 80242188 8C820070 */ lw $v0, 0x70($a0) -/* 8542FC 8024218C 2442FFFF */ addiu $v0, $v0, -1 -/* 854300 80242190 AC820070 */ sw $v0, 0x70($a0) -/* 854304 80242194 000217C3 */ sra $v0, $v0, 0x1f -/* 854308 80242198 03E00008 */ jr $ra -/* 85430C 8024219C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s deleted file mode 100644 index 295e73c133..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_802418D4_9C6CB4.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802418D4_9C6CB4 -/* 9C6CB4 802418D4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6CB8 802418D8 AFB10014 */ sw $s1, 0x14($sp) -/* 9C6CBC 802418DC 0080882D */ daddu $s1, $a0, $zero -/* 9C6CC0 802418E0 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6CC4 802418E4 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6CC8 802418E8 8E30000C */ lw $s0, 0xc($s1) -/* 9C6CCC 802418EC 8E050000 */ lw $a1, ($s0) -/* 9C6CD0 802418F0 0C0B1EAF */ jal get_variable -/* 9C6CD4 802418F4 26100004 */ addiu $s0, $s0, 4 -/* 9C6CD8 802418F8 0220202D */ daddu $a0, $s1, $zero -/* 9C6CDC 802418FC 8E050000 */ lw $a1, ($s0) -/* 9C6CE0 80241900 0C0B210B */ jal get_float_variable -/* 9C6CE4 80241904 0040802D */ daddu $s0, $v0, $zero -/* 9C6CE8 80241908 24020002 */ addiu $v0, $zero, 2 -/* 9C6CEC 8024190C 00501804 */ sllv $v1, $s0, $v0 -/* 9C6CF0 80241910 00701821 */ addu $v1, $v1, $s0 -/* 9C6CF4 80241914 00431804 */ sllv $v1, $v1, $v0 -/* 9C6CF8 80241918 00701823 */ subu $v1, $v1, $s0 -/* 9C6CFC 8024191C 000320C0 */ sll $a0, $v1, 3 -/* 9C6D00 80241920 00641821 */ addu $v1, $v1, $a0 -/* 9C6D04 80241924 000318C0 */ sll $v1, $v1, 3 -/* 9C6D08 80241928 3C01800B */ lui $at, 0x800b -/* 9C6D0C 8024192C 00230821 */ addu $at, $at, $v1 -/* 9C6D10 80241930 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 9C6D14 80241934 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C6D18 80241938 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6D1C 8024193C 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6D20 80241940 03E00008 */ jr $ra -/* 9C6D24 80241944 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s deleted file mode 100644 index e693a7580c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241948_9C6D28.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241948_9C6D28 -/* 9C6D28 80241948 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9C6D2C 8024194C AFB10014 */ sw $s1, 0x14($sp) -/* 9C6D30 80241950 0080882D */ daddu $s1, $a0, $zero -/* 9C6D34 80241954 AFBF0018 */ sw $ra, 0x18($sp) -/* 9C6D38 80241958 AFB00010 */ sw $s0, 0x10($sp) -/* 9C6D3C 8024195C 8E30000C */ lw $s0, 0xc($s1) -/* 9C6D40 80241960 8E050000 */ lw $a1, ($s0) -/* 9C6D44 80241964 0C0B1EAF */ jal get_variable -/* 9C6D48 80241968 26100004 */ addiu $s0, $s0, 4 -/* 9C6D4C 8024196C 00021880 */ sll $v1, $v0, 2 -/* 9C6D50 80241970 00621821 */ addu $v1, $v1, $v0 -/* 9C6D54 80241974 00031880 */ sll $v1, $v1, 2 -/* 9C6D58 80241978 00621823 */ subu $v1, $v1, $v0 -/* 9C6D5C 8024197C 000310C0 */ sll $v0, $v1, 3 -/* 9C6D60 80241980 00621821 */ addu $v1, $v1, $v0 -/* 9C6D64 80241984 000318C0 */ sll $v1, $v1, 3 -/* 9C6D68 80241988 3C01800B */ lui $at, 0x800b -/* 9C6D6C 8024198C 00230821 */ addu $at, $at, $v1 -/* 9C6D70 80241990 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 9C6D74 80241994 3C014480 */ lui $at, 0x4480 -/* 9C6D78 80241998 44810000 */ mtc1 $at, $f0 -/* 9C6D7C 8024199C 00000000 */ nop -/* 9C6D80 802419A0 46001082 */ mul.s $f2, $f2, $f0 -/* 9C6D84 802419A4 00000000 */ nop -/* 9C6D88 802419A8 3C01CD5B */ lui $at, 0xcd5b -/* 9C6D8C 802419AC 34215858 */ ori $at, $at, 0x5858 -/* 9C6D90 802419B0 44810000 */ mtc1 $at, $f0 -/* 9C6D94 802419B4 00000000 */ nop -/* 9C6D98 802419B8 46001080 */ add.s $f2, $f2, $f0 -/* 9C6D9C 802419BC 8E050000 */ lw $a1, ($s0) -/* 9C6DA0 802419C0 4600110D */ trunc.w.s $f4, $f2 -/* 9C6DA4 802419C4 44062000 */ mfc1 $a2, $f4 -/* 9C6DA8 802419C8 0C0B2026 */ jal set_variable -/* 9C6DAC 802419CC 0220202D */ daddu $a0, $s1, $zero -/* 9C6DB0 802419D0 8FBF0018 */ lw $ra, 0x18($sp) -/* 9C6DB4 802419D4 8FB10014 */ lw $s1, 0x14($sp) -/* 9C6DB8 802419D8 8FB00010 */ lw $s0, 0x10($sp) -/* 9C6DBC 802419DC 24020002 */ addiu $v0, $zero, 2 -/* 9C6DC0 802419E0 03E00008 */ jr $ra -/* 9C6DC4 802419E4 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s b/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s deleted file mode 100644 index e2b0f233ea..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80241B84_9C6F64.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241B84_9C6F64 -/* 9C6F64 80241B84 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9C6F68 80241B88 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9C6F6C 80241B8C 10A00002 */ beqz $a1, .L80241B98 -/* 9C6F70 80241B90 2402003C */ addiu $v0, $zero, 0x3c -/* 9C6F74 80241B94 AC820070 */ sw $v0, 0x70($a0) -.L80241B98: -/* 9C6F78 80241B98 C4620080 */ lwc1 $f2, 0x80($v1) -/* 9C6F7C 80241B9C 3C0141F0 */ lui $at, 0x41f0 -/* 9C6F80 80241BA0 44810000 */ mtc1 $at, $f0 -/* 9C6F84 80241BA4 00000000 */ nop -/* 9C6F88 80241BA8 46001000 */ add.s $f0, $f2, $f0 -/* 9C6F8C 80241BAC 3C0143B4 */ lui $at, 0x43b4 -/* 9C6F90 80241BB0 44811000 */ mtc1 $at, $f2 -/* 9C6F94 80241BB4 00000000 */ nop -/* 9C6F98 80241BB8 4600103E */ c.le.s $f2, $f0 -/* 9C6F9C 80241BBC 00000000 */ nop -/* 9C6FA0 80241BC0 45000003 */ bc1f .L80241BD0 -/* 9C6FA4 80241BC4 E4600080 */ swc1 $f0, 0x80($v1) -/* 9C6FA8 80241BC8 46020001 */ sub.s $f0, $f0, $f2 -/* 9C6FAC 80241BCC E4600080 */ swc1 $f0, 0x80($v1) -.L80241BD0: -/* 9C6FB0 80241BD0 8C820070 */ lw $v0, 0x70($a0) -/* 9C6FB4 80241BD4 2442FFFF */ addiu $v0, $v0, -1 -/* 9C6FB8 80241BD8 AC820070 */ sw $v0, 0x70($a0) -/* 9C6FBC 80241BDC 000217C3 */ sra $v0, $v0, 0x1f -/* 9C6FC0 80241BE0 03E00008 */ jr $ra -/* 9C6FC4 80241BE4 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s deleted file mode 100644 index ca72344204..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024247C_9D949C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024247C_9D949C -/* 9D949C 8024247C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D94A0 80242480 AFB10014 */ sw $s1, 0x14($sp) -/* 9D94A4 80242484 0080882D */ daddu $s1, $a0, $zero -/* 9D94A8 80242488 AFBF0018 */ sw $ra, 0x18($sp) -/* 9D94AC 8024248C AFB00010 */ sw $s0, 0x10($sp) -/* 9D94B0 80242490 8E30000C */ lw $s0, 0xc($s1) -/* 9D94B4 80242494 8E050000 */ lw $a1, ($s0) -/* 9D94B8 80242498 0C0B1EAF */ jal get_variable -/* 9D94BC 8024249C 26100004 */ addiu $s0, $s0, 4 -/* 9D94C0 802424A0 0220202D */ daddu $a0, $s1, $zero -/* 9D94C4 802424A4 8E050000 */ lw $a1, ($s0) -/* 9D94C8 802424A8 0C0B210B */ jal get_float_variable -/* 9D94CC 802424AC 0040802D */ daddu $s0, $v0, $zero -/* 9D94D0 802424B0 24020002 */ addiu $v0, $zero, 2 -/* 9D94D4 802424B4 00501804 */ sllv $v1, $s0, $v0 -/* 9D94D8 802424B8 00701821 */ addu $v1, $v1, $s0 -/* 9D94DC 802424BC 00431804 */ sllv $v1, $v1, $v0 -/* 9D94E0 802424C0 00701823 */ subu $v1, $v1, $s0 -/* 9D94E4 802424C4 000320C0 */ sll $a0, $v1, 3 -/* 9D94E8 802424C8 00641821 */ addu $v1, $v1, $a0 -/* 9D94EC 802424CC 000318C0 */ sll $v1, $v1, 3 -/* 9D94F0 802424D0 3C01800B */ lui $at, 0x800b -/* 9D94F4 802424D4 00230821 */ addu $at, $at, $v1 -/* 9D94F8 802424D8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* 9D94FC 802424DC 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D9500 802424E0 8FB10014 */ lw $s1, 0x14($sp) -/* 9D9504 802424E4 8FB00010 */ lw $s0, 0x10($sp) -/* 9D9508 802424E8 03E00008 */ jr $ra -/* 9D950C 802424EC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s deleted file mode 100644 index 8de678506b..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_802424F0_9D9510.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802424F0_9D9510 -/* 9D9510 802424F0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 9D9514 802424F4 AFB10014 */ sw $s1, 0x14($sp) -/* 9D9518 802424F8 0080882D */ daddu $s1, $a0, $zero -/* 9D951C 802424FC AFBF0018 */ sw $ra, 0x18($sp) -/* 9D9520 80242500 AFB00010 */ sw $s0, 0x10($sp) -/* 9D9524 80242504 8E30000C */ lw $s0, 0xc($s1) -/* 9D9528 80242508 8E050000 */ lw $a1, ($s0) -/* 9D952C 8024250C 0C0B1EAF */ jal get_variable -/* 9D9530 80242510 26100004 */ addiu $s0, $s0, 4 -/* 9D9534 80242514 00021880 */ sll $v1, $v0, 2 -/* 9D9538 80242518 00621821 */ addu $v1, $v1, $v0 -/* 9D953C 8024251C 00031880 */ sll $v1, $v1, 2 -/* 9D9540 80242520 00621823 */ subu $v1, $v1, $v0 -/* 9D9544 80242524 000310C0 */ sll $v0, $v1, 3 -/* 9D9548 80242528 00621821 */ addu $v1, $v1, $v0 -/* 9D954C 8024252C 000318C0 */ sll $v1, $v1, 3 -/* 9D9550 80242530 3C01800B */ lui $at, 0x800b -/* 9D9554 80242534 00230821 */ addu $at, $at, $v1 -/* 9D9558 80242538 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* 9D955C 8024253C 3C014480 */ lui $at, 0x4480 -/* 9D9560 80242540 44810000 */ mtc1 $at, $f0 -/* 9D9564 80242544 00000000 */ nop -/* 9D9568 80242548 46001082 */ mul.s $f2, $f2, $f0 -/* 9D956C 8024254C 00000000 */ nop -/* 9D9570 80242550 3C01CD5B */ lui $at, 0xcd5b -/* 9D9574 80242554 34215858 */ ori $at, $at, 0x5858 -/* 9D9578 80242558 44810000 */ mtc1 $at, $f0 -/* 9D957C 8024255C 00000000 */ nop -/* 9D9580 80242560 46001080 */ add.s $f2, $f2, $f0 -/* 9D9584 80242564 8E050000 */ lw $a1, ($s0) -/* 9D9588 80242568 4600110D */ trunc.w.s $f4, $f2 -/* 9D958C 8024256C 44062000 */ mfc1 $a2, $f4 -/* 9D9590 80242570 0C0B2026 */ jal set_variable -/* 9D9594 80242574 0220202D */ daddu $a0, $s1, $zero -/* 9D9598 80242578 8FBF0018 */ lw $ra, 0x18($sp) -/* 9D959C 8024257C 8FB10014 */ lw $s1, 0x14($sp) -/* 9D95A0 80242580 8FB00010 */ lw $s0, 0x10($sp) -/* 9D95A4 80242584 24020002 */ addiu $v0, $zero, 2 -/* 9D95A8 80242588 03E00008 */ jr $ra -/* 9D95AC 8024258C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s b/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s deleted file mode 100644 index d25b5fb38c..0000000000 --- a/asm/nonmatchings/world/area_nok/nok_02/9D7AA0/func_8024272C_9D974C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024272C_9D974C -/* 9D974C 8024272C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* 9D9750 80242730 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* 9D9754 80242734 10A00002 */ beqz $a1, .L80242740 -/* 9D9758 80242738 2402003C */ addiu $v0, $zero, 0x3c -/* 9D975C 8024273C AC820070 */ sw $v0, 0x70($a0) -.L80242740: -/* 9D9760 80242740 C4620080 */ lwc1 $f2, 0x80($v1) -/* 9D9764 80242744 3C0141F0 */ lui $at, 0x41f0 -/* 9D9768 80242748 44810000 */ mtc1 $at, $f0 -/* 9D976C 8024274C 00000000 */ nop -/* 9D9770 80242750 46001000 */ add.s $f0, $f2, $f0 -/* 9D9774 80242754 3C0143B4 */ lui $at, 0x43b4 -/* 9D9778 80242758 44811000 */ mtc1 $at, $f2 -/* 9D977C 8024275C 00000000 */ nop -/* 9D9780 80242760 4600103E */ c.le.s $f2, $f0 -/* 9D9784 80242764 00000000 */ nop -/* 9D9788 80242768 45000003 */ bc1f .L80242778 -/* 9D978C 8024276C E4600080 */ swc1 $f0, 0x80($v1) -/* 9D9790 80242770 46020001 */ sub.s $f0, $f0, $f2 -/* 9D9794 80242774 E4600080 */ swc1 $f0, 0x80($v1) -.L80242778: -/* 9D9798 80242778 8C820070 */ lw $v0, 0x70($a0) -/* 9D979C 8024277C 2442FFFF */ addiu $v0, $v0, -1 -/* 9D97A0 80242780 AC820070 */ sw $v0, 0x70($a0) -/* 9D97A4 80242784 000217C3 */ sra $v0, $v0, 0x1f -/* 9D97A8 80242788 03E00008 */ jr $ra -/* 9D97AC 8024278C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s deleted file mode 100644 index 5c5430a400..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024126C_CF8DDC.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024126C_CF8DDC -/* CF8DDC 8024126C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8DE0 80241270 AFB10014 */ sw $s1, 0x14($sp) -/* CF8DE4 80241274 0080882D */ daddu $s1, $a0, $zero -/* CF8DE8 80241278 AFBF0018 */ sw $ra, 0x18($sp) -/* CF8DEC 8024127C AFB00010 */ sw $s0, 0x10($sp) -/* CF8DF0 80241280 8E30000C */ lw $s0, 0xc($s1) -/* CF8DF4 80241284 8E050000 */ lw $a1, ($s0) -/* CF8DF8 80241288 0C0B1EAF */ jal get_variable -/* CF8DFC 8024128C 26100004 */ addiu $s0, $s0, 4 -/* CF8E00 80241290 0220202D */ daddu $a0, $s1, $zero -/* CF8E04 80241294 8E050000 */ lw $a1, ($s0) -/* CF8E08 80241298 0C0B210B */ jal get_float_variable -/* CF8E0C 8024129C 0040802D */ daddu $s0, $v0, $zero -/* CF8E10 802412A0 24020002 */ addiu $v0, $zero, 2 -/* CF8E14 802412A4 00501804 */ sllv $v1, $s0, $v0 -/* CF8E18 802412A8 00701821 */ addu $v1, $v1, $s0 -/* CF8E1C 802412AC 00431804 */ sllv $v1, $v1, $v0 -/* CF8E20 802412B0 00701823 */ subu $v1, $v1, $s0 -/* CF8E24 802412B4 000320C0 */ sll $a0, $v1, 3 -/* CF8E28 802412B8 00641821 */ addu $v1, $v1, $a0 -/* CF8E2C 802412BC 000318C0 */ sll $v1, $v1, 3 -/* CF8E30 802412C0 3C01800B */ lui $at, 0x800b -/* CF8E34 802412C4 00230821 */ addu $at, $at, $v1 -/* CF8E38 802412C8 E4201D98 */ swc1 $f0, 0x1d98($at) -/* CF8E3C 802412CC 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8E40 802412D0 8FB10014 */ lw $s1, 0x14($sp) -/* CF8E44 802412D4 8FB00010 */ lw $s0, 0x10($sp) -/* CF8E48 802412D8 03E00008 */ jr $ra -/* CF8E4C 802412DC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s deleted file mode 100644 index 06fac4e40f..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_802412E0_CF8E50.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412E0_CF8E50 -/* CF8E50 802412E0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* CF8E54 802412E4 AFB10014 */ sw $s1, 0x14($sp) -/* CF8E58 802412E8 0080882D */ daddu $s1, $a0, $zero -/* CF8E5C 802412EC AFBF0018 */ sw $ra, 0x18($sp) -/* CF8E60 802412F0 AFB00010 */ sw $s0, 0x10($sp) -/* CF8E64 802412F4 8E30000C */ lw $s0, 0xc($s1) -/* CF8E68 802412F8 8E050000 */ lw $a1, ($s0) -/* CF8E6C 802412FC 0C0B1EAF */ jal get_variable -/* CF8E70 80241300 26100004 */ addiu $s0, $s0, 4 -/* CF8E74 80241304 00021880 */ sll $v1, $v0, 2 -/* CF8E78 80241308 00621821 */ addu $v1, $v1, $v0 -/* CF8E7C 8024130C 00031880 */ sll $v1, $v1, 2 -/* CF8E80 80241310 00621823 */ subu $v1, $v1, $v0 -/* CF8E84 80241314 000310C0 */ sll $v0, $v1, 3 -/* CF8E88 80241318 00621821 */ addu $v1, $v1, $v0 -/* CF8E8C 8024131C 000318C0 */ sll $v1, $v1, 3 -/* CF8E90 80241320 3C01800B */ lui $at, 0x800b -/* CF8E94 80241324 00230821 */ addu $at, $at, $v1 -/* CF8E98 80241328 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* CF8E9C 8024132C 3C014480 */ lui $at, 0x4480 -/* CF8EA0 80241330 44810000 */ mtc1 $at, $f0 -/* CF8EA4 80241334 00000000 */ nop -/* CF8EA8 80241338 46001082 */ mul.s $f2, $f2, $f0 -/* CF8EAC 8024133C 00000000 */ nop -/* CF8EB0 80241340 3C01CD5B */ lui $at, 0xcd5b -/* CF8EB4 80241344 34215858 */ ori $at, $at, 0x5858 -/* CF8EB8 80241348 44810000 */ mtc1 $at, $f0 -/* CF8EBC 8024134C 00000000 */ nop -/* CF8EC0 80241350 46001080 */ add.s $f2, $f2, $f0 -/* CF8EC4 80241354 8E050000 */ lw $a1, ($s0) -/* CF8EC8 80241358 4600110D */ trunc.w.s $f4, $f2 -/* CF8ECC 8024135C 44062000 */ mfc1 $a2, $f4 -/* CF8ED0 80241360 0C0B2026 */ jal set_variable -/* CF8ED4 80241364 0220202D */ daddu $a0, $s1, $zero -/* CF8ED8 80241368 8FBF0018 */ lw $ra, 0x18($sp) -/* CF8EDC 8024136C 8FB10014 */ lw $s1, 0x14($sp) -/* CF8EE0 80241370 8FB00010 */ lw $s0, 0x10($sp) -/* CF8EE4 80241374 24020002 */ addiu $v0, $zero, 2 -/* CF8EE8 80241378 03E00008 */ jr $ra -/* CF8EEC 8024137C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s b/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s deleted file mode 100644 index 50b2d10126..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_01/CF7E80/func_8024151C_CF908C.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024151C_CF908C -/* CF908C 8024151C 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* CF9090 80241520 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* CF9094 80241524 10A00002 */ beqz $a1, .L80241530 -/* CF9098 80241528 2402003C */ addiu $v0, $zero, 0x3c -/* CF909C 8024152C AC820070 */ sw $v0, 0x70($a0) -.L80241530: -/* CF90A0 80241530 C4620080 */ lwc1 $f2, 0x80($v1) -/* CF90A4 80241534 3C0141F0 */ lui $at, 0x41f0 -/* CF90A8 80241538 44810000 */ mtc1 $at, $f0 -/* CF90AC 8024153C 00000000 */ nop -/* CF90B0 80241540 46001000 */ add.s $f0, $f2, $f0 -/* CF90B4 80241544 3C0143B4 */ lui $at, 0x43b4 -/* CF90B8 80241548 44811000 */ mtc1 $at, $f2 -/* CF90BC 8024154C 00000000 */ nop -/* CF90C0 80241550 4600103E */ c.le.s $f2, $f0 -/* CF90C4 80241554 00000000 */ nop -/* CF90C8 80241558 45000003 */ bc1f .L80241568 -/* CF90CC 8024155C E4600080 */ swc1 $f0, 0x80($v1) -/* CF90D0 80241560 46020001 */ sub.s $f0, $f0, $f2 -/* CF90D4 80241564 E4600080 */ swc1 $f0, 0x80($v1) -.L80241568: -/* CF90D8 80241568 8C820070 */ lw $v0, 0x70($a0) -/* CF90DC 8024156C 2442FFFF */ addiu $v0, $v0, -1 -/* CF90E0 80241570 AC820070 */ sw $v0, 0x70($a0) -/* CF90E4 80241574 000217C3 */ sra $v0, $v0, 0x1f -/* CF90E8 80241578 03E00008 */ jr $ra -/* CF90EC 8024157C 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s deleted file mode 100644 index 7db5c1eb2d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241698_D06DC8.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241698_D06DC8 -/* D06DC8 80241698 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06DCC 8024169C AFB10014 */ sw $s1, 0x14($sp) -/* D06DD0 802416A0 0080882D */ daddu $s1, $a0, $zero -/* D06DD4 802416A4 AFBF0018 */ sw $ra, 0x18($sp) -/* D06DD8 802416A8 AFB00010 */ sw $s0, 0x10($sp) -/* D06DDC 802416AC 8E30000C */ lw $s0, 0xc($s1) -/* D06DE0 802416B0 8E050000 */ lw $a1, ($s0) -/* D06DE4 802416B4 0C0B1EAF */ jal get_variable -/* D06DE8 802416B8 26100004 */ addiu $s0, $s0, 4 -/* D06DEC 802416BC 0220202D */ daddu $a0, $s1, $zero -/* D06DF0 802416C0 8E050000 */ lw $a1, ($s0) -/* D06DF4 802416C4 0C0B210B */ jal get_float_variable -/* D06DF8 802416C8 0040802D */ daddu $s0, $v0, $zero -/* D06DFC 802416CC 24020002 */ addiu $v0, $zero, 2 -/* D06E00 802416D0 00501804 */ sllv $v1, $s0, $v0 -/* D06E04 802416D4 00701821 */ addu $v1, $v1, $s0 -/* D06E08 802416D8 00431804 */ sllv $v1, $v1, $v0 -/* D06E0C 802416DC 00701823 */ subu $v1, $v1, $s0 -/* D06E10 802416E0 000320C0 */ sll $a0, $v1, 3 -/* D06E14 802416E4 00641821 */ addu $v1, $v1, $a0 -/* D06E18 802416E8 000318C0 */ sll $v1, $v1, 3 -/* D06E1C 802416EC 3C01800B */ lui $at, 0x800b -/* D06E20 802416F0 00230821 */ addu $at, $at, $v1 -/* D06E24 802416F4 E4201D98 */ swc1 $f0, 0x1d98($at) -/* D06E28 802416F8 8FBF0018 */ lw $ra, 0x18($sp) -/* D06E2C 802416FC 8FB10014 */ lw $s1, 0x14($sp) -/* D06E30 80241700 8FB00010 */ lw $s0, 0x10($sp) -/* D06E34 80241704 03E00008 */ jr $ra -/* D06E38 80241708 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s deleted file mode 100644 index ec1da9607d..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_8024170C_D06E3C.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024170C_D06E3C -/* D06E3C 8024170C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D06E40 80241710 AFB10014 */ sw $s1, 0x14($sp) -/* D06E44 80241714 0080882D */ daddu $s1, $a0, $zero -/* D06E48 80241718 AFBF0018 */ sw $ra, 0x18($sp) -/* D06E4C 8024171C AFB00010 */ sw $s0, 0x10($sp) -/* D06E50 80241720 8E30000C */ lw $s0, 0xc($s1) -/* D06E54 80241724 8E050000 */ lw $a1, ($s0) -/* D06E58 80241728 0C0B1EAF */ jal get_variable -/* D06E5C 8024172C 26100004 */ addiu $s0, $s0, 4 -/* D06E60 80241730 00021880 */ sll $v1, $v0, 2 -/* D06E64 80241734 00621821 */ addu $v1, $v1, $v0 -/* D06E68 80241738 00031880 */ sll $v1, $v1, 2 -/* D06E6C 8024173C 00621823 */ subu $v1, $v1, $v0 -/* D06E70 80241740 000310C0 */ sll $v0, $v1, 3 -/* D06E74 80241744 00621821 */ addu $v1, $v1, $v0 -/* D06E78 80241748 000318C0 */ sll $v1, $v1, 3 -/* D06E7C 8024174C 3C01800B */ lui $at, 0x800b -/* D06E80 80241750 00230821 */ addu $at, $at, $v1 -/* D06E84 80241754 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* D06E88 80241758 3C014480 */ lui $at, 0x4480 -/* D06E8C 8024175C 44810000 */ mtc1 $at, $f0 -/* D06E90 80241760 00000000 */ nop -/* D06E94 80241764 46001082 */ mul.s $f2, $f2, $f0 -/* D06E98 80241768 00000000 */ nop -/* D06E9C 8024176C 3C01CD5B */ lui $at, 0xcd5b -/* D06EA0 80241770 34215858 */ ori $at, $at, 0x5858 -/* D06EA4 80241774 44810000 */ mtc1 $at, $f0 -/* D06EA8 80241778 00000000 */ nop -/* D06EAC 8024177C 46001080 */ add.s $f2, $f2, $f0 -/* D06EB0 80241780 8E050000 */ lw $a1, ($s0) -/* D06EB4 80241784 4600110D */ trunc.w.s $f4, $f2 -/* D06EB8 80241788 44062000 */ mfc1 $a2, $f4 -/* D06EBC 8024178C 0C0B2026 */ jal set_variable -/* D06EC0 80241790 0220202D */ daddu $a0, $s1, $zero -/* D06EC4 80241794 8FBF0018 */ lw $ra, 0x18($sp) -/* D06EC8 80241798 8FB10014 */ lw $s1, 0x14($sp) -/* D06ECC 8024179C 8FB00010 */ lw $s0, 0x10($sp) -/* D06ED0 802417A0 24020002 */ addiu $v0, $zero, 2 -/* D06ED4 802417A4 03E00008 */ jr $ra -/* D06ED8 802417A8 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s b/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s deleted file mode 100644 index 82bc1f8e14..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80241948_D07078.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241948_D07078 -/* D07078 80241948 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D0707C 8024194C 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D07080 80241950 10A00002 */ beqz $a1, .L8024195C -/* D07084 80241954 2402003C */ addiu $v0, $zero, 0x3c -/* D07088 80241958 AC820070 */ sw $v0, 0x70($a0) -.L8024195C: -/* D0708C 8024195C C4620080 */ lwc1 $f2, 0x80($v1) -/* D07090 80241960 3C0141F0 */ lui $at, 0x41f0 -/* D07094 80241964 44810000 */ mtc1 $at, $f0 -/* D07098 80241968 00000000 */ nop -/* D0709C 8024196C 46001000 */ add.s $f0, $f2, $f0 -/* D070A0 80241970 3C0143B4 */ lui $at, 0x43b4 -/* D070A4 80241974 44811000 */ mtc1 $at, $f2 -/* D070A8 80241978 00000000 */ nop -/* D070AC 8024197C 4600103E */ c.le.s $f2, $f0 -/* D070B0 80241980 00000000 */ nop -/* D070B4 80241984 45000003 */ bc1f .L80241994 -/* D070B8 80241988 E4600080 */ swc1 $f0, 0x80($v1) -/* D070BC 8024198C 46020001 */ sub.s $f0, $f0, $f2 -/* D070C0 80241990 E4600080 */ swc1 $f0, 0x80($v1) -.L80241994: -/* D070C4 80241994 8C820070 */ lw $v0, 0x70($a0) -/* D070C8 80241998 2442FFFF */ addiu $v0, $v0, -1 -/* D070CC 8024199C AC820070 */ sw $v0, 0x70($a0) -/* D070D0 802419A0 000217C3 */ sra $v0, $v0, 0x1f -/* D070D4 802419A4 03E00008 */ jr $ra -/* D070D8 802419A8 30420002 */ andi $v0, $v0, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s deleted file mode 100644 index 5f6c8e24cb..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_8024133C_D3B90C.s +++ /dev/null @@ -1,33 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024133C_D3B90C -/* D3B90C 8024133C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3B910 80241340 AFB10014 */ sw $s1, 0x14($sp) -/* D3B914 80241344 0080882D */ daddu $s1, $a0, $zero -/* D3B918 80241348 AFBF0018 */ sw $ra, 0x18($sp) -/* D3B91C 8024134C AFB00010 */ sw $s0, 0x10($sp) -/* D3B920 80241350 8E30000C */ lw $s0, 0xc($s1) -/* D3B924 80241354 8E050000 */ lw $a1, ($s0) -/* D3B928 80241358 0C0B1EAF */ jal get_variable -/* D3B92C 8024135C 26100004 */ addiu $s0, $s0, 4 -/* D3B930 80241360 0220202D */ daddu $a0, $s1, $zero -/* D3B934 80241364 8E050000 */ lw $a1, ($s0) -/* D3B938 80241368 0C0B210B */ jal get_float_variable -/* D3B93C 8024136C 0040802D */ daddu $s0, $v0, $zero -/* D3B940 80241370 24020002 */ addiu $v0, $zero, 2 -/* D3B944 80241374 00501804 */ sllv $v1, $s0, $v0 -/* D3B948 80241378 00701821 */ addu $v1, $v1, $s0 -/* D3B94C 8024137C 00431804 */ sllv $v1, $v1, $v0 -/* D3B950 80241380 00701823 */ subu $v1, $v1, $s0 -/* D3B954 80241384 000320C0 */ sll $a0, $v1, 3 -/* D3B958 80241388 00641821 */ addu $v1, $v1, $a0 -/* D3B95C 8024138C 000318C0 */ sll $v1, $v1, 3 -/* D3B960 80241390 3C01800B */ lui $at, 0x800b -/* D3B964 80241394 00230821 */ addu $at, $at, $v1 -/* D3B968 80241398 E4201D98 */ swc1 $f0, 0x1d98($at) -/* D3B96C 8024139C 8FBF0018 */ lw $ra, 0x18($sp) -/* D3B970 802413A0 8FB10014 */ lw $s1, 0x14($sp) -/* D3B974 802413A4 8FB00010 */ lw $s0, 0x10($sp) -/* D3B978 802413A8 03E00008 */ jr $ra -/* D3B97C 802413AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s deleted file mode 100644 index 8f479509d9..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802413B0_D3B980.s +++ /dev/null @@ -1,44 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413B0_D3B980 -/* D3B980 802413B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* D3B984 802413B4 AFB10014 */ sw $s1, 0x14($sp) -/* D3B988 802413B8 0080882D */ daddu $s1, $a0, $zero -/* D3B98C 802413BC AFBF0018 */ sw $ra, 0x18($sp) -/* D3B990 802413C0 AFB00010 */ sw $s0, 0x10($sp) -/* D3B994 802413C4 8E30000C */ lw $s0, 0xc($s1) -/* D3B998 802413C8 8E050000 */ lw $a1, ($s0) -/* D3B99C 802413CC 0C0B1EAF */ jal get_variable -/* D3B9A0 802413D0 26100004 */ addiu $s0, $s0, 4 -/* D3B9A4 802413D4 00021880 */ sll $v1, $v0, 2 -/* D3B9A8 802413D8 00621821 */ addu $v1, $v1, $v0 -/* D3B9AC 802413DC 00031880 */ sll $v1, $v1, 2 -/* D3B9B0 802413E0 00621823 */ subu $v1, $v1, $v0 -/* D3B9B4 802413E4 000310C0 */ sll $v0, $v1, 3 -/* D3B9B8 802413E8 00621821 */ addu $v1, $v1, $v0 -/* D3B9BC 802413EC 000318C0 */ sll $v1, $v1, 3 -/* D3B9C0 802413F0 3C01800B */ lui $at, 0x800b -/* D3B9C4 802413F4 00230821 */ addu $at, $at, $v1 -/* D3B9C8 802413F8 C4221D98 */ lwc1 $f2, 0x1d98($at) -/* D3B9CC 802413FC 3C014480 */ lui $at, 0x4480 -/* D3B9D0 80241400 44810000 */ mtc1 $at, $f0 -/* D3B9D4 80241404 00000000 */ nop -/* D3B9D8 80241408 46001082 */ mul.s $f2, $f2, $f0 -/* D3B9DC 8024140C 00000000 */ nop -/* D3B9E0 80241410 3C01CD5B */ lui $at, 0xcd5b -/* D3B9E4 80241414 34215858 */ ori $at, $at, 0x5858 -/* D3B9E8 80241418 44810000 */ mtc1 $at, $f0 -/* D3B9EC 8024141C 00000000 */ nop -/* D3B9F0 80241420 46001080 */ add.s $f2, $f2, $f0 -/* D3B9F4 80241424 8E050000 */ lw $a1, ($s0) -/* D3B9F8 80241428 4600110D */ trunc.w.s $f4, $f2 -/* D3B9FC 8024142C 44062000 */ mfc1 $a2, $f4 -/* D3BA00 80241430 0C0B2026 */ jal set_variable -/* D3BA04 80241434 0220202D */ daddu $a0, $s1, $zero -/* D3BA08 80241438 8FBF0018 */ lw $ra, 0x18($sp) -/* D3BA0C 8024143C 8FB10014 */ lw $s1, 0x14($sp) -/* D3BA10 80241440 8FB00010 */ lw $s0, 0x10($sp) -/* D3BA14 80241444 24020002 */ addiu $v0, $zero, 2 -/* D3BA18 80241448 03E00008 */ jr $ra -/* D3BA1C 8024144C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s b/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s deleted file mode 100644 index 158301533b..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3ADA0/func_802415EC_D3BBBC.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802415EC_D3BBBC -/* D3BBBC 802415EC 3C038011 */ lui $v1, %hi(gPlayerStatus) -/* D3BBC0 802415F0 2463EFC8 */ addiu $v1, $v1, %lo(gPlayerStatus) -/* D3BBC4 802415F4 10A00002 */ beqz $a1, .L80241600 -/* D3BBC8 802415F8 2402003C */ addiu $v0, $zero, 0x3c -/* D3BBCC 802415FC AC820070 */ sw $v0, 0x70($a0) -.L80241600: -/* D3BBD0 80241600 C4620080 */ lwc1 $f2, 0x80($v1) -/* D3BBD4 80241604 3C0141F0 */ lui $at, 0x41f0 -/* D3BBD8 80241608 44810000 */ mtc1 $at, $f0 -/* D3BBDC 8024160C 00000000 */ nop -/* D3BBE0 80241610 46001000 */ add.s $f0, $f2, $f0 -/* D3BBE4 80241614 3C0143B4 */ lui $at, 0x43b4 -/* D3BBE8 80241618 44811000 */ mtc1 $at, $f2 -/* D3BBEC 8024161C 00000000 */ nop -/* D3BBF0 80241620 4600103E */ c.le.s $f2, $f0 -/* D3BBF4 80241624 00000000 */ nop -/* D3BBF8 80241628 45000003 */ bc1f .L80241638 -/* D3BBFC 8024162C E4600080 */ swc1 $f0, 0x80($v1) -/* D3BC00 80241630 46020001 */ sub.s $f0, $f0, $f2 -/* D3BC04 80241634 E4600080 */ swc1 $f0, 0x80($v1) -.L80241638: -/* D3BC08 80241638 8C820070 */ lw $v0, 0x70($a0) -/* D3BC0C 8024163C 2442FFFF */ addiu $v0, $v0, -1 -/* D3BC10 80241640 AC820070 */ sw $v0, 0x70($a0) -/* D3BC14 80241644 000217C3 */ sra $v0, $v0, 0x1f -/* D3BC18 80241648 03E00008 */ jr $ra -/* D3BC1C 8024164C 30420002 */ andi $v0, $v0, 2 diff --git a/include/si.h b/include/si.h index 6f34ed928b..9fab7e9dae 100644 --- a/include/si.h +++ b/include/si.h @@ -16,7 +16,7 @@ typedef s32 ScriptID; #define SI_SAVE_VAR(v) (v - 170000000) #define SI_ARRAY(v) (v - 190000000) #define SI_ARRAY_FLAG(v) (v - 210000000) -#define SI_FIXED(v) ((s32)(v * 1024.0f) - 230000000) // See float_to_fixed_var +#define SI_FIXED(v) ((v * 1024.0f) + -230000000) // See float_to_fixed_var /* Return type of si_execute_next_command */ #define SI_CONTINUE 0 /* Continue to next command */ diff --git a/src/world/area_dro/dro_01/95B7E0.c b/src/world/area_dro/dro_01/95B7E0.c index fd258c68ec..e932d8d5aa 100644 --- a/src/world/area_dro/dro_01/95B7E0.c +++ b/src/world/area_dro/dro_01/95B7E0.c @@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241F94_95D194); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80241FDC_95D1DC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_80242050_95D250); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_01/95B7E0", func_8024228C_95D48C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index 95df3d4b0f..cb9c9474cb 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E24_969FE4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240E6C_96A02C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80240EE0_96A0A0); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_8024111C_96A2DC); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index e6cb55f900..5480bb6c0b 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -78,13 +78,13 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80242FC8_A1E0C8); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243010_A1E110); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_80243084_A1E184); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802432C0_A1E3C0); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_hos/hos_04/A274B0.c b/src/world/area_hos/hos_04/A274B0.c index 9b8e226f14..0811b81fc3 100644 --- a/src/world/area_hos/hos_04/A274B0.c +++ b/src/world/area_hos/hos_04/A274B0.c @@ -1,6 +1,6 @@ #include "hos_04.h" -INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_802405E0_A274B0); +#include "world/common/SetCamVfov.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_04/A274B0", func_80240654_A27524); diff --git a/src/world/area_jan/jan_02/B2C8A0.c b/src/world/area_jan/jan_02/B2C8A0.c index df6da359fe..1454a92b7a 100644 --- a/src/world/area_jan/jan_02/B2C8A0.c +++ b/src/world/area_jan/jan_02/B2C8A0.c @@ -70,13 +70,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242138_B2E5A8); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242180_B2E5F0); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_802421F4_B2E664); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_02/B2C8A0", func_80242430_B2E8A0); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 184667f85b..2a9c7477b3 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -110,13 +110,13 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802426C0_B37290); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80242708_B372D8); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_8024277C_B3734C); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802429B8_B37588); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B0070.c b/src/world/area_kmr/kmr_02/8B0070.c index c2a864f722..36c5e9da8e 100644 --- a/src/world/area_kmr/kmr_02/8B0070.c +++ b/src/world/area_kmr/kmr_02/8B0070.c @@ -52,13 +52,13 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EB4_8B0F24); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240EFC_8B0F6C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_80240F70_8B0FE0); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B0070", func_802411AC_8B121C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index a50c4fba79..20fbbc1490 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241154_7EBE64); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024119C_7EBEAC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241210_7EBF20); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_8024144C_7EC15C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 4f871cc5a3..843baa05ff 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -62,13 +62,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A34_8032B4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242A7C_8032FC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242AF0_803370); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80242D2C_8035AC); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_02/823BF0.c b/src/world/area_mac/mac_02/823BF0.c index bbd39460fc..20595c6eb7 100644 --- a/src/world/area_mac/mac_02/823BF0.c +++ b/src/world/area_mac/mac_02/823BF0.c @@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802422E4_8255A4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_8024232C_8255EC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802423A0_825660); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_02/823BF0", func_802425DC_82589C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_03/831B20.c b/src/world/area_mac/mac_03/831B20.c index 935c165abb..badb04a0ac 100644 --- a/src/world/area_mac/mac_03/831B20.c +++ b/src/world/area_mac/mac_03/831B20.c @@ -38,13 +38,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80240FD4_8327D4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_8024101C_83281C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_80241090_832890); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_03/831B20", func_802412CC_832ACC); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_04/843030.c b/src/world/area_mac/mac_04/843030.c index 33868e1f5c..bea6733f73 100644 --- a/src/world/area_mac/mac_04/843030.c +++ b/src/world/area_mac/mac_04/843030.c @@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240F84_843B54); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80240FCC_843B9C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_80241040_843C10); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_04/843030", func_8024127C_843E4C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_mac/mac_05/852170.c b/src/world/area_mac/mac_05/852170.c index ac73e21084..839bf91196 100644 --- a/src/world/area_mac/mac_05/852170.c +++ b/src/world/area_mac/mac_05/852170.c @@ -68,13 +68,13 @@ INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E44_853FB4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241E8C_853FFC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_80241F00_854070); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_mac/mac_05/852170", func_8024213C_8542AC); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 04af4c9b9b..36a46e2554 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -76,13 +76,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_8024188C_9C6C6C); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_802418D4_9C6CB4); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241948_9C6D28); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80241B84_9C6F64); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_nok/nok_02/9D7AA0.c b/src/world/area_nok/nok_02/9D7AA0.c index ff2304cfef..9dc71cf4d2 100644 --- a/src/world/area_nok/nok_02/9D7AA0.c +++ b/src/world/area_nok/nok_02/9D7AA0.c @@ -60,13 +60,13 @@ INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_80242434_9D9454); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024247C_9D949C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_802424F0_9D9510); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_nok/nok_02/9D7AA0", func_8024272C_9D974C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_sam/sam_01/CF7E80.c b/src/world/area_sam/sam_01/CF7E80.c index f9daf86071..3da3677484 100644 --- a/src/world/area_sam/sam_01/CF7E80.c +++ b/src/world/area_sam/sam_01/CF7E80.c @@ -48,13 +48,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_80241224_CF8D94); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024126C_CF8DDC); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_802412E0_CF8E50); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_01/CF7E80", func_8024151C_CF908C); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 775fd06542..0521858a9d 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -56,13 +56,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241650_D06D80); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241698_D06DC8); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_8024170C_D06E3C); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80241948_D07078); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/area_sam/sam_11/D3ADA0.c b/src/world/area_sam/sam_11/D3ADA0.c index df17fb25c7..4a11b87a56 100644 --- a/src/world/area_sam/sam_11/D3ADA0.c +++ b/src/world/area_sam/sam_11/D3ADA0.c @@ -36,13 +36,13 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802412F4_D3B8C4); #include "world/common/GetGameStatus75.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_8024133C_D3B90C); +#include "world/common/SetCamVfov.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802413B0_D3B980); +#include "world/common/GetCamVfov.inc.c" #include "world/common/UnkCameraFunc.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3ADA0", func_802415EC_D3BBBC); +#include "world/common/UnkRotatePlayer.inc.c" #include "world/common/UnkPartnerFuncs.inc.c" diff --git a/src/world/common/GetCamVfov.inc.c b/src/world/common/GetCamVfov.inc.c new file mode 100644 index 0000000000..38c40d234d --- /dev/null +++ b/src/world/common/GetCamVfov.inc.c @@ -0,0 +1,10 @@ +#include "common.h" +#include "map.h" + +static ApiStatus GetCamVfov(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 cameraID = get_variable(script, *args++); + + set_variable(script, *args++, SI_FIXED(gCameras[cameraID].vfov)); + return ApiStatus_DONE2; +} diff --git a/src/world/common/SetCamVfov.inc.c b/src/world/common/SetCamVfov.inc.c new file mode 100644 index 0000000000..c05aec5e1a --- /dev/null +++ b/src/world/common/SetCamVfov.inc.c @@ -0,0 +1,10 @@ +#include "common.h" +#include "map.h" + +static ApiStatus SetCamVfov(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + s32 cameraID = get_variable(script, *args++); + + gCameras[cameraID].vfov = get_float_variable(script, *args++); + return ApiStatus_DONE2; +} diff --git a/src/world/common/UnkPartnerFuncs.inc.c b/src/world/common/UnkPartnerFuncs.inc.c index b7f2e7584d..ed90f5612d 100644 --- a/src/world/common/UnkPartnerFuncs.inc.c +++ b/src/world/common/UnkPartnerFuncs.inc.c @@ -17,7 +17,6 @@ static ApiStatus UnkRotatePartner(ScriptInstance* script, s32 isInitialCall) { return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2; } - static ApiStatus UnkMovePartner(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(NpcId_PARTNER); diff --git a/src/world/common/UnkRotatePlayer.inc.c b/src/world/common/UnkRotatePlayer.inc.c new file mode 100644 index 0000000000..898906f1ce --- /dev/null +++ b/src/world/common/UnkRotatePlayer.inc.c @@ -0,0 +1,18 @@ +#include "common.h" + +static ApiStatus UnkRotatePlayer(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + if (isInitialCall) { + script->functionTemp[0].s = 60; + } + + playerStatus->targetYaw += 30.0f; + if (playerStatus->targetYaw >= 360.0f) { + playerStatus->targetYaw -= 360.0f; + } + + script->functionTemp[0].s--; + + return (script->functionTemp[0].s >> 0x1F) & ApiStatus_DONE2; +} From 51b1c9acfbfc7bfbff28e1906ad25e8a5996836a Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 19:03:29 -0400 Subject: [PATCH 18/45] CheckPartnerFlags1000 --- .../area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s | 15 --------------- .../area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s | 15 --------------- .../area_kmr/kmr_04/8CA900/func_80240000_8CA900.s | 15 --------------- .../area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s | 15 --------------- src/world/area_kmr/kmr_02/8B36B0.c | 2 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_04/8CA900.c | 2 +- src/world/area_kmr/kmr_04/8CA960.c | 3 +-- src/world/common/CheckPartnerFlags1000.inc.c | 5 +++++ 9 files changed, 9 insertions(+), 65 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s create mode 100644 src/world/common/CheckPartnerFlags1000.inc.c diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s deleted file mode 100644 index 53d1d0587e..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243640_8B36B0 -/* 8B36B0 80243640 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8B36B4 80243644 AFBF0010 */ sw $ra, 0x10($sp) -/* 8B36B8 80243648 0C00EABB */ jal get_npc_unsafe -/* 8B36BC 8024364C 2404FFFC */ addiu $a0, $zero, -4 -/* 8B36C0 80243650 8C420000 */ lw $v0, ($v0) -/* 8B36C4 80243654 8FBF0010 */ lw $ra, 0x10($sp) -/* 8B36C8 80243658 30421000 */ andi $v0, $v0, 0x1000 -/* 8B36CC 8024365C 0002102B */ sltu $v0, $zero, $v0 -/* 8B36D0 80243660 00021040 */ sll $v0, $v0, 1 -/* 8B36D4 80243664 03E00008 */ jr $ra -/* 8B36D8 80243668 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s deleted file mode 100644 index 5b71f3006b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240184_8C8114 -/* 8C8114 80240184 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8C8118 80240188 AFBF0010 */ sw $ra, 0x10($sp) -/* 8C811C 8024018C 0C00EABB */ jal get_npc_unsafe -/* 8C8120 80240190 2404FFFC */ addiu $a0, $zero, -4 -/* 8C8124 80240194 8C420000 */ lw $v0, ($v0) -/* 8C8128 80240198 8FBF0010 */ lw $ra, 0x10($sp) -/* 8C812C 8024019C 30421000 */ andi $v0, $v0, 0x1000 -/* 8C8130 802401A0 0002102B */ sltu $v0, $zero, $v0 -/* 8C8134 802401A4 00021040 */ sll $v0, $v0, 1 -/* 8C8138 802401A8 03E00008 */ jr $ra -/* 8C813C 802401AC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s deleted file mode 100644 index 231ffcd1af..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8CA900 -/* 8CA900 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CA904 80240004 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CA908 80240008 0C00EABB */ jal get_npc_unsafe -/* 8CA90C 8024000C 2404FFFC */ addiu $a0, $zero, -4 -/* 8CA910 80240010 8C420000 */ lw $v0, ($v0) -/* 8CA914 80240014 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CA918 80240018 30421000 */ andi $v0, $v0, 0x1000 -/* 8CA91C 8024001C 0002102B */ sltu $v0, $zero, $v0 -/* 8CA920 80240020 00021040 */ sll $v0, $v0, 1 -/* 8CA924 80240024 03E00008 */ jr $ra -/* 8CA928 80240028 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s deleted file mode 100644 index c594351fac..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024029C_8CAB9C -/* 8CAB9C 8024029C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 8CABA0 802402A0 AFBF0010 */ sw $ra, 0x10($sp) -/* 8CABA4 802402A4 0C00EABB */ jal get_npc_unsafe -/* 8CABA8 802402A8 2404FFFC */ addiu $a0, $zero, -4 -/* 8CABAC 802402AC 8C420000 */ lw $v0, ($v0) -/* 8CABB0 802402B0 8FBF0010 */ lw $ra, 0x10($sp) -/* 8CABB4 802402B4 30421000 */ andi $v0, $v0, 0x1000 -/* 8CABB8 802402B8 0002102B */ sltu $v0, $zero, $v0 -/* 8CABBC 802402BC 00021040 */ sll $v0, $v0, 1 -/* 8CABC0 802402C0 03E00008 */ jr $ra -/* 8CABC4 802402C4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/src/world/area_kmr/kmr_02/8B36B0.c b/src/world/area_kmr/kmr_02/8B36B0.c index dc6524e5e0..3032631199 100644 --- a/src/world/area_kmr/kmr_02/8B36B0.c +++ b/src/world/area_kmr/kmr_02/8B36B0.c @@ -1,6 +1,6 @@ #include "kmr_02.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_80243640_8B36B0); +#include "world/common/CheckPartnerFlags1000.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 6f289df621..ce0c09531c 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -2,7 +2,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240184_8C8114); +#include "world/common/CheckPartnerFlags1000.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140); diff --git a/src/world/area_kmr/kmr_04/8CA900.c b/src/world/area_kmr/kmr_04/8CA900.c index 3920cad638..3326b00c98 100644 --- a/src/world/area_kmr/kmr_04/8CA900.c +++ b/src/world/area_kmr/kmr_04/8CA900.c @@ -1,5 +1,5 @@ #include "kmr_04.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_80240000_8CA900); +#include "world/common/CheckPartnerFlags1000.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C); diff --git a/src/world/area_kmr/kmr_04/8CA960.c b/src/world/area_kmr/kmr_04/8CA960.c index 6843ad0c92..fa5c2991fd 100644 --- a/src/world/area_kmr/kmr_04/8CA960.c +++ b/src/world/area_kmr/kmr_04/8CA960.c @@ -2,8 +2,7 @@ #include "world/common/SomeMatrixOperations.inc.c" - -INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C_8CAB9C); +#include "world/common/CheckPartnerFlags1000.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); diff --git a/src/world/common/CheckPartnerFlags1000.inc.c b/src/world/common/CheckPartnerFlags1000.inc.c new file mode 100644 index 0000000000..f34f84ba9c --- /dev/null +++ b/src/world/common/CheckPartnerFlags1000.inc.c @@ -0,0 +1,5 @@ +#include "common.h" + +static ApiStatus CheckPartnerFlags1000(ScriptInstance* script, s32 isInitialCall) { + return ((get_npc_unsafe(NpcId_PARTNER)->flags & 0x1000) != 0) * ApiStatus_DONE2; +} From cff33e37f4218983740b91eff3684b232b29c28b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 19:11:46 -0400 Subject: [PATCH 19/45] UnkPositionFunc --- .../kmr_03/8C7F90/func_802401B0_8C8140.s | 30 -------- .../kmr_03/8C7F90/func_80240218_8C81A8.s | 72 ------------------- .../mac_01/8017D0/func_802446E0_804F60.s | 70 ------------------ include/functions.h | 1 + src/code_759b0_len_61b0.c | 2 +- src/world/area_kmr/kmr_03/8C7F90.c | 9 ++- src/world/area_mac/mac_00/7EB340.c | 20 +----- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/common/UnkPositionFunc.inc.c | 21 ++++++ 9 files changed, 32 insertions(+), 195 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s delete mode 100644 asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s create mode 100644 src/world/common/UnkPositionFunc.inc.c diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s deleted file mode 100644 index be90193e13..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_802401B0_8C8140.s +++ /dev/null @@ -1,30 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802401B0_8C8140 -/* 8C8140 802401B0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 8C8144 802401B4 AFB10014 */ sw $s1, 0x14($sp) -/* 8C8148 802401B8 0080882D */ daddu $s1, $a0, $zero -/* 8C814C 802401BC 0000202D */ daddu $a0, $zero, $zero -/* 8C8150 802401C0 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C8154 802401C4 0C00EABB */ jal get_npc_unsafe -/* 8C8158 802401C8 AFB00010 */ sw $s0, 0x10($sp) -/* 8C815C 802401CC 0040802D */ daddu $s0, $v0, $zero -/* 8C8160 802401D0 C60C0038 */ lwc1 $f12, 0x38($s0) -/* 8C8164 802401D4 0C038022 */ jal func_800E0088 -/* 8C8168 802401D8 C60E0040 */ lwc1 $f14, 0x40($s0) -/* 8C816C 802401DC C6020018 */ lwc1 $f2, 0x18($s0) -/* 8C8170 802401E0 3C013F4C */ lui $at, 0x3f4c -/* 8C8174 802401E4 3421CCCD */ ori $at, $at, 0xcccd -/* 8C8178 802401E8 44812000 */ mtc1 $at, $f4 -/* 8C817C 802401EC 46020003 */ div.s $f0, $f0, $f2 -/* 8C8180 802401F0 46040002 */ mul.s $f0, $f0, $f4 -/* 8C8184 802401F4 00000000 */ nop -/* 8C8188 802401F8 4600018D */ trunc.w.s $f6, $f0 -/* 8C818C 802401FC E6260088 */ swc1 $f6, 0x88($s1) -/* 8C8190 80240200 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8194 80240204 8FB10014 */ lw $s1, 0x14($sp) -/* 8C8198 80240208 8FB00010 */ lw $s0, 0x10($sp) -/* 8C819C 8024020C 24020002 */ addiu $v0, $zero, 2 -/* 8C81A0 80240210 03E00008 */ jr $ra -/* 8C81A4 80240214 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s deleted file mode 100644 index 9f3aeef417..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240218_8C81A8.s +++ /dev/null @@ -1,72 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240218_8C81A8 -/* 8C81A8 80240218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 8C81AC 8024021C AFB10014 */ sw $s1, 0x14($sp) -/* 8C81B0 80240220 0080882D */ daddu $s1, $a0, $zero -/* 8C81B4 80240224 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C81B8 80240228 AFB00010 */ sw $s0, 0x10($sp) -/* 8C81BC 8024022C F7B80030 */ sdc1 $f24, 0x30($sp) -/* 8C81C0 80240230 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8C81C4 80240234 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8C81C8 80240238 8E30000C */ lw $s0, 0xc($s1) -/* 8C81CC 8024023C 8E050000 */ lw $a1, ($s0) -/* 8C81D0 80240240 0C0B1EAF */ jal get_variable -/* 8C81D4 80240244 26100004 */ addiu $s0, $s0, 4 -/* 8C81D8 80240248 8E050000 */ lw $a1, ($s0) -/* 8C81DC 8024024C 26100004 */ addiu $s0, $s0, 4 -/* 8C81E0 80240250 4482C000 */ mtc1 $v0, $f24 -/* 8C81E4 80240254 00000000 */ nop -/* 8C81E8 80240258 4680C620 */ cvt.s.w $f24, $f24 -/* 8C81EC 8024025C 0C0B1EAF */ jal get_variable -/* 8C81F0 80240260 0220202D */ daddu $a0, $s1, $zero -/* 8C81F4 80240264 8E050000 */ lw $a1, ($s0) -/* 8C81F8 80240268 26100004 */ addiu $s0, $s0, 4 -/* 8C81FC 8024026C 4482B000 */ mtc1 $v0, $f22 -/* 8C8200 80240270 00000000 */ nop -/* 8C8204 80240274 4680B5A0 */ cvt.s.w $f22, $f22 -/* 8C8208 80240278 0C0B1EAF */ jal get_variable -/* 8C820C 8024027C 0220202D */ daddu $a0, $s1, $zero -/* 8C8210 80240280 8E050000 */ lw $a1, ($s0) -/* 8C8214 80240284 4482A000 */ mtc1 $v0, $f20 -/* 8C8218 80240288 00000000 */ nop -/* 8C821C 8024028C 4680A520 */ cvt.s.w $f20, $f20 -/* 8C8220 80240290 0C0B1EAF */ jal get_variable -/* 8C8224 80240294 0220202D */ daddu $a0, $s1, $zero -/* 8C8228 80240298 44820000 */ mtc1 $v0, $f0 -/* 8C822C 8024029C 00000000 */ nop -/* 8C8230 802402A0 46800020 */ cvt.s.w $f0, $f0 -/* 8C8234 802402A4 46160001 */ sub.s $f0, $f0, $f22 -/* 8C8238 802402A8 4618A501 */ sub.s $f20, $f20, $f24 -/* 8C823C 802402AC 46140003 */ div.s $f0, $f0, $f20 -/* 8C8240 802402B0 46180602 */ mul.s $f24, $f0, $f24 -/* 8C8244 802402B4 00000000 */ nop -/* 8C8248 802402B8 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 8C824C 802402BC 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 8C8250 802402C0 C4420028 */ lwc1 $f2, 0x28($v0) -/* 8C8254 802402C4 46020002 */ mul.s $f0, $f0, $f2 -/* 8C8258 802402C8 00000000 */ nop -/* 8C825C 802402CC 4618B581 */ sub.s $f22, $f22, $f24 -/* 8C8260 802402D0 46160000 */ add.s $f0, $f0, $f22 -/* 8C8264 802402D4 C4420030 */ lwc1 $f2, 0x30($v0) -/* 8C8268 802402D8 4600103C */ c.lt.s $f2, $f0 -/* 8C826C 802402DC 00000000 */ nop -/* 8C8270 802402E0 45000003 */ bc1f .L802402F0 -/* 8C8274 802402E4 24020001 */ addiu $v0, $zero, 1 -/* 8C8278 802402E8 080900BD */ j .L802402F4 -/* 8C827C 802402EC AE200084 */ sw $zero, 0x84($s1) -.L802402F0: -/* 8C8280 802402F0 AE220084 */ sw $v0, 0x84($s1) -.L802402F4: -/* 8C8284 802402F4 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8288 802402F8 8FB10014 */ lw $s1, 0x14($sp) -/* 8C828C 802402FC 8FB00010 */ lw $s0, 0x10($sp) -/* 8C8290 80240300 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 8C8294 80240304 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8C8298 80240308 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8C829C 8024030C 24020002 */ addiu $v0, $zero, 2 -/* 8C82A0 80240310 03E00008 */ jr $ra -/* 8C82A4 80240314 27BD0038 */ addiu $sp, $sp, 0x38 -/* 8C82A8 80240318 00000000 */ nop -/* 8C82AC 8024031C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s b/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s deleted file mode 100644 index 5daf4f046b..0000000000 --- a/asm/nonmatchings/world/area_mac/mac_01/8017D0/func_802446E0_804F60.s +++ /dev/null @@ -1,70 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802446E0_804F60 -/* 804F60 802446E0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 804F64 802446E4 AFB10014 */ sw $s1, 0x14($sp) -/* 804F68 802446E8 0080882D */ daddu $s1, $a0, $zero -/* 804F6C 802446EC AFBF0018 */ sw $ra, 0x18($sp) -/* 804F70 802446F0 AFB00010 */ sw $s0, 0x10($sp) -/* 804F74 802446F4 F7B80030 */ sdc1 $f24, 0x30($sp) -/* 804F78 802446F8 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 804F7C 802446FC F7B40020 */ sdc1 $f20, 0x20($sp) -/* 804F80 80244700 8E30000C */ lw $s0, 0xc($s1) -/* 804F84 80244704 8E050000 */ lw $a1, ($s0) -/* 804F88 80244708 0C0B1EAF */ jal get_variable -/* 804F8C 8024470C 26100004 */ addiu $s0, $s0, 4 -/* 804F90 80244710 8E050000 */ lw $a1, ($s0) -/* 804F94 80244714 26100004 */ addiu $s0, $s0, 4 -/* 804F98 80244718 4482C000 */ mtc1 $v0, $f24 -/* 804F9C 8024471C 00000000 */ nop -/* 804FA0 80244720 4680C620 */ cvt.s.w $f24, $f24 -/* 804FA4 80244724 0C0B1EAF */ jal get_variable -/* 804FA8 80244728 0220202D */ daddu $a0, $s1, $zero -/* 804FAC 8024472C 8E050000 */ lw $a1, ($s0) -/* 804FB0 80244730 26100004 */ addiu $s0, $s0, 4 -/* 804FB4 80244734 4482B000 */ mtc1 $v0, $f22 -/* 804FB8 80244738 00000000 */ nop -/* 804FBC 8024473C 4680B5A0 */ cvt.s.w $f22, $f22 -/* 804FC0 80244740 0C0B1EAF */ jal get_variable -/* 804FC4 80244744 0220202D */ daddu $a0, $s1, $zero -/* 804FC8 80244748 8E050000 */ lw $a1, ($s0) -/* 804FCC 8024474C 4482A000 */ mtc1 $v0, $f20 -/* 804FD0 80244750 00000000 */ nop -/* 804FD4 80244754 4680A520 */ cvt.s.w $f20, $f20 -/* 804FD8 80244758 0C0B1EAF */ jal get_variable -/* 804FDC 8024475C 0220202D */ daddu $a0, $s1, $zero -/* 804FE0 80244760 44820000 */ mtc1 $v0, $f0 -/* 804FE4 80244764 00000000 */ nop -/* 804FE8 80244768 46800020 */ cvt.s.w $f0, $f0 -/* 804FEC 8024476C 46160001 */ sub.s $f0, $f0, $f22 -/* 804FF0 80244770 4618A501 */ sub.s $f20, $f20, $f24 -/* 804FF4 80244774 46140003 */ div.s $f0, $f0, $f20 -/* 804FF8 80244778 46180602 */ mul.s $f24, $f0, $f24 -/* 804FFC 8024477C 00000000 */ nop -/* 805000 80244780 3C028011 */ lui $v0, %hi(gPlayerStatus) -/* 805004 80244784 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) -/* 805008 80244788 C4420028 */ lwc1 $f2, 0x28($v0) -/* 80500C 8024478C 46020002 */ mul.s $f0, $f0, $f2 -/* 805010 80244790 00000000 */ nop -/* 805014 80244794 4618B581 */ sub.s $f22, $f22, $f24 -/* 805018 80244798 46160000 */ add.s $f0, $f0, $f22 -/* 80501C 8024479C C4420030 */ lwc1 $f2, 0x30($v0) -/* 805020 802447A0 4600103C */ c.lt.s $f2, $f0 -/* 805024 802447A4 00000000 */ nop -/* 805028 802447A8 45000003 */ bc1f .L802447B8 -/* 80502C 802447AC 24020001 */ addiu $v0, $zero, 1 -/* 805030 802447B0 080911EF */ j .L802447BC -/* 805034 802447B4 AE200084 */ sw $zero, 0x84($s1) -.L802447B8: -/* 805038 802447B8 AE220084 */ sw $v0, 0x84($s1) -.L802447BC: -/* 80503C 802447BC 8FBF0018 */ lw $ra, 0x18($sp) -/* 805040 802447C0 8FB10014 */ lw $s1, 0x14($sp) -/* 805044 802447C4 8FB00010 */ lw $s0, 0x10($sp) -/* 805048 802447C8 D7B80030 */ ldc1 $f24, 0x30($sp) -/* 80504C 802447CC D7B60028 */ ldc1 $f22, 0x28($sp) -/* 805050 802447D0 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 805054 802447D4 24020002 */ addiu $v0, $zero, 2 -/* 805058 802447D8 03E00008 */ jr $ra -/* 80505C 802447DC 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/include/functions.h b/include/functions.h index 7a6b9ed69c..1f3d72256e 100644 --- a/include/functions.h +++ b/include/functions.h @@ -70,6 +70,7 @@ void set_curtain_fade(f32 scale); void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5); +f32 func_800E0088(f32, f32); s32 func_800EB168(s32); // Partner diff --git a/src/code_759b0_len_61b0.c b/src/code_759b0_len_61b0.c index 159fdaedc7..2f827e8efb 100644 --- a/src/code_759b0_len_61b0.c +++ b/src/code_759b0_len_61b0.c @@ -74,7 +74,7 @@ INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFF78); INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800DFFCC); -INCLUDE_ASM(s32, "code_759b0_len_61b0", func_800E0088); +INCLUDE_ASM(f32, "code_759b0_len_61b0", func_800E0088, f32 arg0, f32 arg1); void enable_player_shadow(void) { get_shadow_by_index(D_8010F094)->flags &= ~1; diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index ce0c09531c..99a6c04939 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -4,6 +4,11 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90); #include "world/common/CheckPartnerFlags1000.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140); +ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(0); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240218_8C81A8); + script->varTable[1] = (func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed) * 0.8f; + return ApiStatus_DONE2; +} + +#include "world/common/UnkPositionFunc.inc.c" diff --git a/src/world/area_mac/mac_00/7EB340.c b/src/world/area_mac/mac_00/7EB340.c index 20fbbc1490..2678144c2e 100644 --- a/src/world/area_mac/mac_00/7EB340.c +++ b/src/world/area_mac/mac_00/7EB340.c @@ -78,25 +78,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241E80_7ECB90); INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80241FF0_7ECD00); -ApiStatus func_80242078_7ECD88(ScriptInstance* script, s32 isInitialCall) { - Bytecode* args = script->ptrReadPos; - PlayerStatus* playerStatus = PLAYER_STATUS; - f32 var0 = get_variable(script, *args++); - f32 var1 = get_variable(script, *args++); - f32 var2 = get_variable(script, *args++); - f32 var3 = get_variable(script, *args++); - f32 temp; - - temp = (var3 - var1) / (var2 - var0); - - if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) { - script->varTable[0] = 0; - } else { - script->varTable[0] = 1; - } - - return ApiStatus_DONE2; -} +#include "world/common/UnkPositionFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_00/7EB340", func_80242178_7ECE88); diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 843baa05ff..464f97b3ee 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -142,7 +142,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802443E0_804C60); INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446AC_804F2C); -INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802446E0_804F60); +#include "world/common/UnkPositionFunc.inc.c" INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_802447E0_805060); diff --git a/src/world/common/UnkPositionFunc.inc.c b/src/world/common/UnkPositionFunc.inc.c new file mode 100644 index 0000000000..e55d810e98 --- /dev/null +++ b/src/world/common/UnkPositionFunc.inc.c @@ -0,0 +1,21 @@ +#include "common.h" + +static ApiStatus UnkPositionFunc(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + PlayerStatus* playerStatus = PLAYER_STATUS; + f32 var0 = get_variable(script, *args++); + f32 var1 = get_variable(script, *args++); + f32 var2 = get_variable(script, *args++); + f32 var3 = get_variable(script, *args++); + f32 temp; + + temp = (var3 - var1) / (var2 - var0); + + if (playerStatus->position.z < ((temp * playerStatus->position.x) + (var1 - (temp * var0)))) { + script->varTable[0] = 0; + } else { + script->varTable[0] = 1; + } + + return ApiStatus_DONE2; +} From a840d81a29279f62346766da84ed293d8e8eb504 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 19:21:00 -0400 Subject: [PATCH 20/45] SetCamera0MoveFlagNeg1 --- .../flo_21/CE7240/func_80240CD0_CE73D0.s | 12 ----- .../hos_01/A11650/func_80240DD0_A11650.s | 11 ---- .../kmr_03/8C82B0/func_80240320_8C82B0.s | 11 ---- .../kmr_03/8C82B0/func_80240358_8C82E8.s | 50 ------------------- .../kpa_08/A4CA20/func_80240000_A4CA20.s | 11 ---- .../kpa_09/A4F000/func_80240000_A4F000.s | 11 ---- .../kzn_03/C63A10/func_80242D00_C63A10.s | 11 ---- .../kzn_23/C9C610/func_80240504_C9C804.s | 11 ---- .../obk_01/BBD1A0/func_80240000_BBD1A0.s | 11 ---- .../obk_05/BCD060/func_80240000_BCD060.s | 11 ---- .../omo_02/D9D4D0/func_80240000_D9D4D0.s | 11 ---- .../omo_03/DA5240/func_80240000_DA5240.s | 12 ----- .../omo_03/DA5260/func_80240020_DA5260.s | 11 ---- .../omo_04/DAD400/func_802402BC_DAD6BC.s | 11 ---- .../omo_06/DB7910/func_80240000_DB7910.s | 11 ---- .../omo_07/DC01D0/func_802431DC_DC048C.s | 11 ---- .../omo_08/DC43D0/func_80240000_DC43D0.s | 11 ---- .../omo_10/DD79B0/func_80240000_DD79B0.s | 11 ---- .../omo_16/DEBED0/func_80240000_DEBED0.s | 11 ---- .../omo_17/DEEEA0/func_80240000_DEEEA0.s | 11 ---- .../sam_07/D2BD30/func_80240634_D2C364.s | 11 ---- .../sam_11/D3A930/func_80240564_D3AB34.s | 11 ---- src/world/area_flo/flo_21/CE7240.c | 2 +- src/world/area_hos/hos_01/A11650.c | 2 +- src/world/area_kmr/kmr_03/8C7F90.c | 2 +- src/world/area_kmr/kmr_03/8C82B0.c | 14 +++++- src/world/area_kpa/kpa_08/A4CA20.c | 2 +- src/world/area_kpa/kpa_09/A4F000.c | 2 +- src/world/area_kzn/kzn_03/C63A10.c | 2 +- src/world/area_kzn/kzn_23/C9C610.c | 2 +- src/world/area_obk/obk_01/BBD1A0.c | 2 +- src/world/area_obk/obk_05/BCD060.c | 2 +- src/world/area_omo/omo_02/D9D4D0.c | 2 +- src/world/area_omo/omo_03/DA5240.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 2 +- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_07/DC01D0.c | 2 +- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_omo/omo_16/DEBED0.c | 2 +- src/world/area_omo/omo_17/DEEEA0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_11/D3A930.c | 2 +- src/world/common/SetCamera0MoveFlagNeg1.inc.c | 8 +++ 45 files changed, 41 insertions(+), 306 deletions(-) delete mode 100644 asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s delete mode 100644 asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s create mode 100644 src/world/common/SetCamera0MoveFlagNeg1.inc.c diff --git a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s b/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s deleted file mode 100644 index b1f5761016..0000000000 --- a/asm/nonmatchings/world/area_flo/flo_21/CE7240/func_80240CD0_CE73D0.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240CD0_CE73D0 -/* CE73D0 80240CD0 3C03800B */ lui $v1, %hi(gCameras) -/* CE73D4 80240CD4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* CE73D8 80240CD8 94620002 */ lhu $v0, 2($v1) -/* CE73DC 80240CDC 3042FFFE */ andi $v0, $v0, 0xfffe -/* CE73E0 80240CE0 A4620002 */ sh $v0, 2($v1) -/* CE73E4 80240CE4 03E00008 */ jr $ra -/* CE73E8 80240CE8 24020002 */ addiu $v0, $zero, 2 -/* CE73EC 80240CEC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s b/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s deleted file mode 100644 index 73e5a9b404..0000000000 --- a/asm/nonmatchings/world/area_hos/hos_01/A11650/func_80240DD0_A11650.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240DD0_A11650 -/* A11650 80240DD0 3C03800B */ lui $v1, %hi(gCameras) -/* A11654 80240DD4 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A11658 80240DD8 94620002 */ lhu $v0, 2($v1) -/* A1165C 80240DDC 3042FFFE */ andi $v0, $v0, 0xfffe -/* A11660 80240DE0 A4620002 */ sh $v0, 2($v1) -/* A11664 80240DE4 03E00008 */ jr $ra -/* A11668 80240DE8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s deleted file mode 100644 index 17e67f0c2b..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240320_8C82B0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240320_8C82B0 -/* 8C82B0 80240320 3C03800B */ lui $v1, %hi(gCameras) -/* 8C82B4 80240324 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 8C82B8 80240328 94620002 */ lhu $v0, 2($v1) -/* 8C82BC 8024032C 3042FFFE */ andi $v0, $v0, 0xfffe -/* 8C82C0 80240330 A4620002 */ sh $v0, 2($v1) -/* 8C82C4 80240334 03E00008 */ jr $ra -/* 8C82C8 80240338 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s deleted file mode 100644 index effece0d26..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_80240358_8C82E8.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240358_8C82E8 -/* 8C82E8 80240358 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 8C82EC 8024035C AFB00010 */ sw $s0, 0x10($sp) -/* 8C82F0 80240360 3C108011 */ lui $s0, %hi(gPlayerStatus) -/* 8C82F4 80240364 2610EFC8 */ addiu $s0, $s0, %lo(gPlayerStatus) -/* 8C82F8 80240368 AFBF0018 */ sw $ra, 0x18($sp) -/* 8C82FC 8024036C AFB10014 */ sw $s1, 0x14($sp) -/* 8C8300 80240370 F7B60028 */ sdc1 $f22, 0x28($sp) -/* 8C8304 80240374 F7B40020 */ sdc1 $f20, 0x20($sp) -/* 8C8308 80240378 C60C0080 */ lwc1 $f12, 0x80($s0) -/* 8C830C 8024037C 0C00A8BB */ jal sin_deg -/* 8C8310 80240380 0080882D */ daddu $s1, $a0, $zero -/* 8C8314 80240384 C6140054 */ lwc1 $f20, 0x54($s0) -/* 8C8318 80240388 3C0140A0 */ lui $at, 0x40a0 -/* 8C831C 8024038C 4481B000 */ mtc1 $at, $f22 -/* 8C8320 80240390 00000000 */ nop -/* 8C8324 80240394 4616A502 */ mul.s $f20, $f20, $f22 -/* 8C8328 80240398 00000000 */ nop -/* 8C832C 8024039C C60C0080 */ lwc1 $f12, 0x80($s0) -/* 8C8330 802403A0 4600A502 */ mul.s $f20, $f20, $f0 -/* 8C8334 802403A4 0C00A8D4 */ jal cos_deg -/* 8C8338 802403A8 00000000 */ nop -/* 8C833C 802403AC C6040054 */ lwc1 $f4, 0x54($s0) -/* 8C8340 802403B0 46162102 */ mul.s $f4, $f4, $f22 -/* 8C8344 802403B4 00000000 */ nop -/* 8C8348 802403B8 C6020028 */ lwc1 $f2, 0x28($s0) -/* 8C834C 802403BC 46141080 */ add.s $f2, $f2, $f20 -/* 8C8350 802403C0 46000007 */ neg.s $f0, $f0 -/* 8C8354 802403C4 46002102 */ mul.s $f4, $f4, $f0 -/* 8C8358 802403C8 00000000 */ nop -/* 8C835C 802403CC 4600118D */ trunc.w.s $f6, $f2 -/* 8C8360 802403D0 E6260084 */ swc1 $f6, 0x84($s1) -/* 8C8364 802403D4 C6000030 */ lwc1 $f0, 0x30($s0) -/* 8C8368 802403D8 46040000 */ add.s $f0, $f0, $f4 -/* 8C836C 802403DC 4600018D */ trunc.w.s $f6, $f0 -/* 8C8370 802403E0 E6260088 */ swc1 $f6, 0x88($s1) -/* 8C8374 802403E4 8FBF0018 */ lw $ra, 0x18($sp) -/* 8C8378 802403E8 8FB10014 */ lw $s1, 0x14($sp) -/* 8C837C 802403EC 8FB00010 */ lw $s0, 0x10($sp) -/* 8C8380 802403F0 D7B60028 */ ldc1 $f22, 0x28($sp) -/* 8C8384 802403F4 D7B40020 */ ldc1 $f20, 0x20($sp) -/* 8C8388 802403F8 24020002 */ addiu $v0, $zero, 2 -/* 8C838C 802403FC 03E00008 */ jr $ra -/* 8C8390 80240400 27BD0030 */ addiu $sp, $sp, 0x30 -/* 8C8394 80240404 00000000 */ nop -/* 8C8398 80240408 00000000 */ nop -/* 8C839C 8024040C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s deleted file mode 100644 index 72e9e5f6cf..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CA20/func_80240000_A4CA20.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A4CA20 -/* A4CA20 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* A4CA24 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A4CA28 80240008 94620002 */ lhu $v0, 2($v1) -/* A4CA2C 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* A4CA30 80240010 A4620002 */ sh $v0, 2($v1) -/* A4CA34 80240014 03E00008 */ jr $ra -/* A4CA38 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s deleted file mode 100644 index da980b58b2..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F000/func_80240000_A4F000.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_A4F000 -/* A4F000 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* A4F004 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* A4F008 80240008 94620002 */ lhu $v0, 2($v1) -/* A4F00C 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* A4F010 80240010 A4620002 */ sh $v0, 2($v1) -/* A4F014 80240014 03E00008 */ jr $ra -/* A4F018 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s deleted file mode 100644 index bd9af1c337..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D00_C63A10.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D00_C63A10 -/* C63A10 80242D00 3C03800B */ lui $v1, %hi(gCameras) -/* C63A14 80242D04 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C63A18 80242D08 94620002 */ lhu $v0, 2($v1) -/* C63A1C 80242D0C 3042FFFE */ andi $v0, $v0, 0xfffe -/* C63A20 80242D10 A4620002 */ sh $v0, 2($v1) -/* C63A24 80242D14 03E00008 */ jr $ra -/* C63A28 80242D18 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s b/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s deleted file mode 100644 index c63af71641..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_23/C9C610/func_80240504_C9C804.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240504_C9C804 -/* C9C804 80240504 3C03800B */ lui $v1, %hi(gCameras) -/* C9C808 80240508 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C9C80C 8024050C 94620002 */ lhu $v0, 2($v1) -/* C9C810 80240510 3042FFFE */ andi $v0, $v0, 0xfffe -/* C9C814 80240514 A4620002 */ sh $v0, 2($v1) -/* C9C818 80240518 03E00008 */ jr $ra -/* C9C81C 8024051C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s deleted file mode 100644 index 55cf04adcc..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_80240000_BBD1A0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BBD1A0 -/* BBD1A0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* BBD1A4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BBD1A8 80240008 94620002 */ lhu $v0, 2($v1) -/* BBD1AC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* BBD1B0 80240010 A4620002 */ sh $v0, 2($v1) -/* BBD1B4 80240014 03E00008 */ jr $ra -/* BBD1B8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s deleted file mode 100644 index 26bb939d74..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_80240000_BCD060.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_BCD060 -/* BCD060 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* BCD064 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BCD068 80240008 94620002 */ lhu $v0, 2($v1) -/* BCD06C 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* BCD070 80240010 A4620002 */ sh $v0, 2($v1) -/* BCD074 80240014 03E00008 */ jr $ra -/* BCD078 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s b/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s deleted file mode 100644 index 6ee826468d..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_80240000_D9D4D0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_D9D4D0 -/* D9D4D0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* D9D4D4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D9D4D8 80240008 94620002 */ lhu $v0, 2($v1) -/* D9D4DC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* D9D4E0 80240010 A4620002 */ sh $v0, 2($v1) -/* D9D4E4 80240014 03E00008 */ jr $ra -/* D9D4E8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s b/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.s deleted file mode 100644 index 43fb01848c..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5240/func_80240000_DA5240.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_DA5240 -/* DA5240 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DA5244 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DA5248 80240008 94620002 */ lhu $v0, 2($v1) -/* DA524C 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DA5250 80240010 A4620002 */ sh $v0, 2($v1) -/* DA5254 80240014 03E00008 */ jr $ra -/* DA5258 80240018 24020002 */ addiu $v0, $zero, 2 -/* DA525C 8024001C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s b/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s deleted file mode 100644 index 54c04b44c0..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_03/DA5260/func_80240020_DA5260.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240020_DA5260 -/* DA5260 80240020 3C03800B */ lui $v1, %hi(gCameras) -/* DA5264 80240024 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DA5268 80240028 94620002 */ lhu $v0, 2($v1) -/* DA526C 8024002C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DA5270 80240030 A4620002 */ sh $v0, 2($v1) -/* DA5274 80240034 03E00008 */ jr $ra -/* DA5278 80240038 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s deleted file mode 100644 index ac128cb628..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402BC_DAD6BC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402BC_DAD6BC -/* DAD6BC 802402BC 3C03800B */ lui $v1, %hi(gCameras) -/* DAD6C0 802402C0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAD6C4 802402C4 94620002 */ lhu $v0, 2($v1) -/* DAD6C8 802402C8 3042FFFE */ andi $v0, $v0, 0xfffe -/* DAD6CC 802402CC A4620002 */ sh $v0, 2($v1) -/* DAD6D0 802402D0 03E00008 */ jr $ra -/* DAD6D4 802402D4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s b/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s deleted file mode 100644 index 8bc16f1e64..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_06/DB7910/func_80240000_DB7910.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DB7910 -/* DB7910 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DB7914 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DB7918 80240008 94620002 */ lhu $v0, 2($v1) -/* DB791C 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DB7920 80240010 A4620002 */ sh $v0, 2($v1) -/* DB7924 80240014 03E00008 */ jr $ra -/* DB7928 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s deleted file mode 100644 index 1d9f7dab27..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431DC_DC048C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431DC_DC048C -/* DC048C 802431DC 3C03800B */ lui $v1, %hi(gCameras) -/* DC0490 802431E0 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC0494 802431E4 94620002 */ lhu $v0, 2($v1) -/* DC0498 802431E8 3042FFFE */ andi $v0, $v0, 0xfffe -/* DC049C 802431EC A4620002 */ sh $v0, 2($v1) -/* DC04A0 802431F0 03E00008 */ jr $ra -/* DC04A4 802431F4 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s b/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s deleted file mode 100644 index c885b959f2..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_08/DC43D0/func_80240000_DC43D0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DC43D0 -/* DC43D0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DC43D4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC43D8 80240008 94620002 */ lhu $v0, 2($v1) -/* DC43DC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DC43E0 80240010 A4620002 */ sh $v0, 2($v1) -/* DC43E4 80240014 03E00008 */ jr $ra -/* DC43E8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s b/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s deleted file mode 100644 index 3a5f09e35f..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_10/DD79B0/func_80240000_DD79B0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DD79B0 -/* DD79B0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DD79B4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DD79B8 80240008 94620002 */ lhu $v0, 2($v1) -/* DD79BC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DD79C0 80240010 A4620002 */ sh $v0, 2($v1) -/* DD79C4 80240014 03E00008 */ jr $ra -/* DD79C8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s b/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s deleted file mode 100644 index 9620b34659..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_16/DEBED0/func_80240000_DEBED0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DEBED0 -/* DEBED0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DEBED4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DEBED8 80240008 94620002 */ lhu $v0, 2($v1) -/* DEBEDC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DEBEE0 80240010 A4620002 */ sh $v0, 2($v1) -/* DEBEE4 80240014 03E00008 */ jr $ra -/* DEBEE8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s b/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s deleted file mode 100644 index 240afc7ea8..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEEEA0/func_80240000_DEEEA0.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_DEEEA0 -/* DEEEA0 80240000 3C03800B */ lui $v1, %hi(gCameras) -/* DEEEA4 80240004 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DEEEA8 80240008 94620002 */ lhu $v0, 2($v1) -/* DEEEAC 8024000C 3042FFFE */ andi $v0, $v0, 0xfffe -/* DEEEB0 80240010 A4620002 */ sh $v0, 2($v1) -/* DEEEB4 80240014 03E00008 */ jr $ra -/* DEEEB8 80240018 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s b/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s deleted file mode 100644 index 9a25be2d33..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_07/D2BD30/func_80240634_D2C364.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240634_D2C364 -/* D2C364 80240634 3C03800B */ lui $v1, %hi(gCameras) -/* D2C368 80240638 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D2C36C 8024063C 94620002 */ lhu $v0, 2($v1) -/* D2C370 80240640 3042FFFE */ andi $v0, $v0, 0xfffe -/* D2C374 80240644 A4620002 */ sh $v0, 2($v1) -/* D2C378 80240648 03E00008 */ jr $ra -/* D2C37C 8024064C 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s deleted file mode 100644 index cf8cb93fce..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240564_D3AB34.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240564_D3AB34 -/* D3AB34 80240564 3C03800B */ lui $v1, %hi(gCameras) -/* D3AB38 80240568 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D3AB3C 8024056C 94620002 */ lhu $v0, 2($v1) -/* D3AB40 80240570 3042FFFE */ andi $v0, $v0, 0xfffe -/* D3AB44 80240574 A4620002 */ sh $v0, 2($v1) -/* D3AB48 80240578 03E00008 */ jr $ra -/* D3AB4C 8024057C 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c index eb91a1e40f..5ad3269b51 100644 --- a/src/world/area_flo/flo_21/CE7240.c +++ b/src/world/area_flo/flo_21/CE7240.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240); -INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240CD0_CE73D0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c index d7dd3543b5..3c4ac75a90 100644 --- a/src/world/area_hos/hos_01/A11650.c +++ b/src/world/area_hos/hos_01/A11650.c @@ -1,5 +1,5 @@ #include "hos_01.h" -INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DD0_A11650); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C); diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 99a6c04939..1df8fe4a77 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -7,7 +7,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90); ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) { Npc* npc = get_npc_unsafe(0); - script->varTable[1] = (func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed) * 0.8f; + script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f; return ApiStatus_DONE2; } diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c index 9439c357df..f20c700cd1 100644 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ b/src/world/area_kmr/kmr_03/8C82B0.c @@ -1,7 +1,17 @@ #include "kmr_03.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240320_8C82B0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC); -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_80240358_8C82E8); +ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) { + PlayerStatus* playerStatus = PLAYER_STATUS; + + f32 xDelta = playerStatus->currentSpeed * 5.0f * sin_deg(playerStatus->targetYaw); + f32 zDelta = playerStatus->currentSpeed * 5.0f * -cos_deg(playerStatus->targetYaw); + + script->varTable[0] = playerStatus->position.x + xDelta; + script->varTable[1] = playerStatus->position.z + zDelta; + + return ApiStatus_DONE2; +} diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c index 6b5ee573d8..fcf9e782ba 100644 --- a/src/world/area_kpa/kpa_08/A4CA20.c +++ b/src/world/area_kpa/kpa_08/A4CA20.c @@ -1,5 +1,5 @@ #include "kpa_08.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_80240000_A4CA20); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C); diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c index 3adb5a4a96..1288757674 100644 --- a/src/world/area_kpa/kpa_09/A4F000.c +++ b/src/world/area_kpa/kpa_09/A4F000.c @@ -1,5 +1,5 @@ #include "kpa_09.h" -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_80240000_A4F000); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C); diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c index 2860ab05a8..0b94192ece 100644 --- a/src/world/area_kzn/kzn_03/C63A10.c +++ b/src/world/area_kzn/kzn_03/C63A10.c @@ -1,6 +1,6 @@ #include "kzn_03.h" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D00_C63A10); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C); diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c index c021165caf..ab601cd877 100644 --- a/src/world/area_kzn/kzn_23/C9C610.c +++ b/src/world/area_kzn/kzn_23/C9C610.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610); INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778); -INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240504_C9C804); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820); diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c index f5ce2f9247..52d905b650 100644 --- a/src/world/area_obk/obk_01/BBD1A0.c +++ b/src/world/area_obk/obk_01/BBD1A0.c @@ -1,6 +1,6 @@ #include "obk_01.h" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240000_BBD1A0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC); diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c index 4b79d59b6a..72a1fba13b 100644 --- a/src/world/area_obk/obk_05/BCD060.c +++ b/src/world/area_obk/obk_05/BCD060.c @@ -1,6 +1,6 @@ #include "obk_05.h" -INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240000_BCD060); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C); diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c index 00d44b5d14..197dc117a8 100644 --- a/src/world/area_omo/omo_02/D9D4D0.c +++ b/src/world/area_omo/omo_02/D9D4D0.c @@ -1,5 +1,5 @@ #include "omo_02.h" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_80240000_D9D4D0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC); diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c index ad3c064d3b..d99f607597 100644 --- a/src/world/area_omo/omo_03/DA5240.c +++ b/src/world/area_omo/omo_03/DA5240.c @@ -1,3 +1,3 @@ #include "omo_03.h" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5240", func_80240000_DA5240); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index 021fb470e8..e8c05a16e4 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -1,6 +1,6 @@ #include "omo_03.h" -INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_80240020_DA5260); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 1f1b8f5d20..321a498bc0 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668); -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402BC_DAD6BC); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index 1a028b8506..add620ef94 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -1,6 +1,6 @@ #include "omo_06.h" -INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_80240000_DB7910); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index fd8cdb1857..a80b126f1a 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431DC_DC048C); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8); diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index 7a5f2089f3..2c60cef685 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -1,6 +1,6 @@ #include "omo_08.h" -INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_80240000_DC43D0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC); diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 0c29b20e6b..2ebfd8a10d 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -1,6 +1,6 @@ #include "omo_10.h" -INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_80240000_DD79B0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC); diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c index ae24b76952..f154aae5c8 100644 --- a/src/world/area_omo/omo_16/DEBED0.c +++ b/src/world/area_omo/omo_16/DEBED0.c @@ -1,6 +1,6 @@ #include "omo_16.h" -INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_80240000_DEBED0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC); diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c index 5631685897..a9cd5069d4 100644 --- a/src/world/area_omo/omo_17/DEEEA0.c +++ b/src/world/area_omo/omo_17/DEEEA0.c @@ -1,6 +1,6 @@ #include "omo_17.h" -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_80240000_DEEEA0); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 9af80c6844..7b334b26a9 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); -INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240634_D2C364); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index 33450ec0ed..ed38a0c603 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -15,7 +15,7 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240564_D3AB34); +#include "world/common/SetCamera0MoveFlagNeg1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50); diff --git a/src/world/common/SetCamera0MoveFlagNeg1.inc.c b/src/world/common/SetCamera0MoveFlagNeg1.inc.c new file mode 100644 index 0000000000..f8e815371a --- /dev/null +++ b/src/world/common/SetCamera0MoveFlagNeg1.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) { + Camera* camera = &gCameras[0]; + + camera->moveFlags &= ~1; + return ApiStatus_DONE2; +} From fc5dcf43ead9159a06b0ddf4eb52c57c0378e952 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 19:25:07 -0400 Subject: [PATCH 21/45] Camera0MoveFlag1 --- .../area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s | 11 ----------- .../area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s | 11 ----------- .../area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s | 11 ----------- .../area_obk/obk_05/BCD060/func_8024001C_BCD07C.s | 11 ----------- .../area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s | 13 ------------- .../area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s | 11 ----------- .../area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s | 14 -------------- .../area_sam/sam_11/D3A930/func_80240580_D3AB50.s | 11 ----------- src/world/area_flo/flo_21/CE7240.c | 2 +- src/world/area_hos/hos_01/A11650.c | 2 +- src/world/area_kmr/kmr_03/8C82B0.c | 4 ++-- src/world/area_kpa/kpa_08/A4CA20.c | 2 +- src/world/area_kpa/kpa_09/A4F000.c | 2 +- src/world/area_kzn/kzn_03/C63A10.c | 4 ++-- src/world/area_kzn/kzn_23/C9C610.c | 2 +- src/world/area_obk/obk_01/BBD1A0.c | 4 ++-- src/world/area_obk/obk_05/BCD060.c | 4 ++-- src/world/area_omo/omo_02/D9D4D0.c | 4 ++-- src/world/area_omo/omo_03/DA5240.c | 2 +- src/world/area_omo/omo_03/DA5260.c | 2 +- src/world/area_omo/omo_04/DAD400.c | 4 ++-- src/world/area_omo/omo_06/DB7910.c | 2 +- src/world/area_omo/omo_07/DC01D0.c | 4 ++-- src/world/area_omo/omo_08/DC43D0.c | 2 +- src/world/area_omo/omo_10/DD79B0.c | 2 +- src/world/area_omo/omo_16/DEBED0.c | 2 +- src/world/area_omo/omo_17/DEEEA0.c | 2 +- src/world/area_sam/sam_07/D2BD30.c | 2 +- src/world/area_sam/sam_11/D3A930.c | 4 ++-- src/world/common/SetCamera0MoveFlag1.inc.c | 8 ++++++++ ...eFlagNeg1.inc.c => UnsetCamera0MoveFlag1.inc.c} | 2 +- 31 files changed, 38 insertions(+), 123 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s delete mode 100644 asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s delete mode 100644 asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s delete mode 100644 asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s create mode 100644 src/world/common/SetCamera0MoveFlag1.inc.c rename src/world/common/{SetCamera0MoveFlagNeg1.inc.c => UnsetCamera0MoveFlag1.inc.c} (57%) diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s deleted file mode 100644 index 591712fcff..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C82B0/func_8024033C_8C82CC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024033C_8C82CC -/* 8C82CC 8024033C 3C03800B */ lui $v1, %hi(gCameras) -/* 8C82D0 80240340 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* 8C82D4 80240344 94620002 */ lhu $v0, 2($v1) -/* 8C82D8 80240348 34420001 */ ori $v0, $v0, 1 -/* 8C82DC 8024034C A4620002 */ sh $v0, 2($v1) -/* 8C82E0 80240350 03E00008 */ jr $ra -/* 8C82E4 80240354 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s deleted file mode 100644 index 02d3b3b4da..0000000000 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D1C_C63A2C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242D1C_C63A2C -/* C63A2C 80242D1C 3C03800B */ lui $v1, %hi(gCameras) -/* C63A30 80242D20 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* C63A34 80242D24 94620002 */ lhu $v0, 2($v1) -/* C63A38 80242D28 34420001 */ ori $v0, $v0, 1 -/* C63A3C 80242D2C A4620002 */ sh $v0, 2($v1) -/* C63A40 80242D30 03E00008 */ jr $ra -/* C63A44 80242D34 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s b/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s deleted file mode 100644 index a172df636a..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_01/BBD1A0/func_8024001C_BBD1BC.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_BBD1BC -/* BBD1BC 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* BBD1C0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BBD1C4 80240024 94620002 */ lhu $v0, 2($v1) -/* BBD1C8 80240028 34420001 */ ori $v0, $v0, 1 -/* BBD1CC 8024002C A4620002 */ sh $v0, 2($v1) -/* BBD1D0 80240030 03E00008 */ jr $ra -/* BBD1D4 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s b/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s deleted file mode 100644 index 49fe2f9e41..0000000000 --- a/asm/nonmatchings/world/area_obk/obk_05/BCD060/func_8024001C_BCD07C.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_BCD07C -/* BCD07C 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* BCD080 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* BCD084 80240024 94620002 */ lhu $v0, 2($v1) -/* BCD088 80240028 34420001 */ ori $v0, $v0, 1 -/* BCD08C 8024002C A4620002 */ sh $v0, 2($v1) -/* BCD090 80240030 03E00008 */ jr $ra -/* BCD094 80240034 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s b/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s deleted file mode 100644 index 0b30e39460..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D4D0/func_8024001C_D9D4EC.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024001C_D9D4EC -/* D9D4EC 8024001C 3C03800B */ lui $v1, %hi(gCameras) -/* D9D4F0 80240020 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D9D4F4 80240024 94620002 */ lhu $v0, 2($v1) -/* D9D4F8 80240028 34420001 */ ori $v0, $v0, 1 -/* D9D4FC 8024002C A4620002 */ sh $v0, 2($v1) -/* D9D500 80240030 03E00008 */ jr $ra -/* D9D504 80240034 24020002 */ addiu $v0, $zero, 2 -/* D9D508 80240038 00000000 */ nop -/* D9D50C 8024003C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s b/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s deleted file mode 100644 index 097155a3cd..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_04/DAD400/func_802402D8_DAD6D8.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802402D8_DAD6D8 -/* DAD6D8 802402D8 3C03800B */ lui $v1, %hi(gCameras) -/* DAD6DC 802402DC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DAD6E0 802402E0 94620002 */ lhu $v0, 2($v1) -/* DAD6E4 802402E4 34420001 */ ori $v0, $v0, 1 -/* DAD6E8 802402E8 A4620002 */ sh $v0, 2($v1) -/* DAD6EC 802402EC 03E00008 */ jr $ra -/* DAD6F0 802402F0 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s b/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s deleted file mode 100644 index fabc1ad94e..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_07/DC01D0/func_802431F8_DC04A8.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802431F8_DC04A8 -/* DC04A8 802431F8 3C03800B */ lui $v1, %hi(gCameras) -/* DC04AC 802431FC 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* DC04B0 80243200 94620002 */ lhu $v0, 2($v1) -/* DC04B4 80243204 34420001 */ ori $v0, $v0, 1 -/* DC04B8 80243208 A4620002 */ sh $v0, 2($v1) -/* DC04BC 8024320C 03E00008 */ jr $ra -/* DC04C0 80243210 24020002 */ addiu $v0, $zero, 2 -/* DC04C4 80243214 00000000 */ nop -/* DC04C8 80243218 00000000 */ nop -/* DC04CC 8024321C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s b/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s deleted file mode 100644 index 96c12a0374..0000000000 --- a/asm/nonmatchings/world/area_sam/sam_11/D3A930/func_80240580_D3AB50.s +++ /dev/null @@ -1,11 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240580_D3AB50 -/* D3AB50 80240580 3C03800B */ lui $v1, %hi(gCameras) -/* D3AB54 80240584 24631D80 */ addiu $v1, $v1, %lo(gCameras) -/* D3AB58 80240588 94620002 */ lhu $v0, 2($v1) -/* D3AB5C 8024058C 34420001 */ ori $v0, $v0, 1 -/* D3AB60 80240590 A4620002 */ sh $v0, 2($v1) -/* D3AB64 80240594 03E00008 */ jr $ra -/* D3AB68 80240598 24020002 */ addiu $v0, $zero, 2 diff --git a/src/world/area_flo/flo_21/CE7240.c b/src/world/area_flo/flo_21/CE7240.c index 5ad3269b51..404d858ed5 100644 --- a/src/world/area_flo/flo_21/CE7240.c +++ b/src/world/area_flo/flo_21/CE7240.c @@ -2,4 +2,4 @@ INCLUDE_ASM(s32, "world/area_flo/flo_21/CE7240", func_80240B40_CE7240); -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_hos/hos_01/A11650.c b/src/world/area_hos/hos_01/A11650.c index 3c4ac75a90..eca5180865 100644 --- a/src/world/area_hos/hos_01/A11650.c +++ b/src/world/area_hos/hos_01/A11650.c @@ -1,5 +1,5 @@ #include "hos_01.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_hos/hos_01/A11650", func_80240DEC_A1166C); diff --git a/src/world/area_kmr/kmr_03/8C82B0.c b/src/world/area_kmr/kmr_03/8C82B0.c index f20c700cd1..37ca47412b 100644 --- a/src/world/area_kmr/kmr_03/8C82B0.c +++ b/src/world/area_kmr/kmr_03/8C82B0.c @@ -1,8 +1,8 @@ #include "kmr_03.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C82B0", func_8024033C_8C82CC); +#include "world/common/SetCamera0MoveFlag1.inc.c" ApiStatus func_80240358_8C82E8(ScriptInstance* script, s32 isInitialCall) { PlayerStatus* playerStatus = PLAYER_STATUS; diff --git a/src/world/area_kpa/kpa_08/A4CA20.c b/src/world/area_kpa/kpa_08/A4CA20.c index fcf9e782ba..1ad1f9cf82 100644 --- a/src/world/area_kpa/kpa_08/A4CA20.c +++ b/src/world/area_kpa/kpa_08/A4CA20.c @@ -1,5 +1,5 @@ #include "kpa_08.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CA20", func_8024001C_A4CA3C); diff --git a/src/world/area_kpa/kpa_09/A4F000.c b/src/world/area_kpa/kpa_09/A4F000.c index 1288757674..fb3c753774 100644 --- a/src/world/area_kpa/kpa_09/A4F000.c +++ b/src/world/area_kpa/kpa_09/A4F000.c @@ -1,5 +1,5 @@ #include "kpa_09.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F000", func_8024001C_A4F01C); diff --git a/src/world/area_kzn/kzn_03/C63A10.c b/src/world/area_kzn/kzn_03/C63A10.c index 0b94192ece..09e3cb7a5c 100644 --- a/src/world/area_kzn/kzn_03/C63A10.c +++ b/src/world/area_kzn/kzn_03/C63A10.c @@ -1,8 +1,8 @@ #include "kzn_03.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D1C_C63A2C); +#include "world/common/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_03/C63A10", func_80242D38_C63A48); diff --git a/src/world/area_kzn/kzn_23/C9C610.c b/src/world/area_kzn/kzn_23/C9C610.c index ab601cd877..33260463f5 100644 --- a/src/world/area_kzn/kzn_23/C9C610.c +++ b/src/world/area_kzn/kzn_23/C9C610.c @@ -6,6 +6,6 @@ INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240310_C9C610); INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240478_C9C778); -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_kzn/kzn_23/C9C610", func_80240520_C9C820); diff --git a/src/world/area_obk/obk_01/BBD1A0.c b/src/world/area_obk/obk_01/BBD1A0.c index 52d905b650..0a42262049 100644 --- a/src/world/area_obk/obk_01/BBD1A0.c +++ b/src/world/area_obk/obk_01/BBD1A0.c @@ -1,8 +1,8 @@ #include "obk_01.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_8024001C_BBD1BC); +#include "world/common/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_01/BBD1A0", func_80240038_BBD1D8); diff --git a/src/world/area_obk/obk_05/BCD060.c b/src/world/area_obk/obk_05/BCD060.c index 72a1fba13b..591aaeda32 100644 --- a/src/world/area_obk/obk_05/BCD060.c +++ b/src/world/area_obk/obk_05/BCD060.c @@ -1,8 +1,8 @@ #include "obk_05.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_8024001C_BCD07C); +#include "world/common/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_obk/obk_05/BCD060", func_80240038_BCD098); diff --git a/src/world/area_omo/omo_02/D9D4D0.c b/src/world/area_omo/omo_02/D9D4D0.c index 197dc117a8..def33b6ba7 100644 --- a/src/world/area_omo/omo_02/D9D4D0.c +++ b/src/world/area_omo/omo_02/D9D4D0.c @@ -1,5 +1,5 @@ #include "omo_02.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D4D0", func_8024001C_D9D4EC); +#include "world/common/SetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_03/DA5240.c b/src/world/area_omo/omo_03/DA5240.c index d99f607597..37ce7fa294 100644 --- a/src/world/area_omo/omo_03/DA5240.c +++ b/src/world/area_omo/omo_03/DA5240.c @@ -1,3 +1,3 @@ #include "omo_03.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_03/DA5260.c b/src/world/area_omo/omo_03/DA5260.c index e8c05a16e4..d0dd112fba 100644 --- a/src/world/area_omo/omo_03/DA5260.c +++ b/src/world/area_omo/omo_03/DA5260.c @@ -1,6 +1,6 @@ #include "omo_03.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_03/DA5260", func_8024003C_DA527C); diff --git a/src/world/area_omo/omo_04/DAD400.c b/src/world/area_omo/omo_04/DAD400.c index 321a498bc0..07f629662a 100644 --- a/src/world/area_omo/omo_04/DAD400.c +++ b/src/world/area_omo/omo_04/DAD400.c @@ -8,9 +8,9 @@ INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240000_DAD400); INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_80240268_DAD668); -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402D8_DAD6D8); +#include "world/common/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_04/DAD400", func_802402F4_DAD6F4); diff --git a/src/world/area_omo/omo_06/DB7910.c b/src/world/area_omo/omo_06/DB7910.c index add620ef94..7450d9241d 100644 --- a/src/world/area_omo/omo_06/DB7910.c +++ b/src/world/area_omo/omo_06/DB7910.c @@ -1,6 +1,6 @@ #include "omo_06.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_06/DB7910", func_8024001C_DB792C); diff --git a/src/world/area_omo/omo_07/DC01D0.c b/src/world/area_omo/omo_07/DC01D0.c index a80b126f1a..81540d7fc0 100644 --- a/src/world/area_omo/omo_07/DC01D0.c +++ b/src/world/area_omo/omo_07/DC01D0.c @@ -8,6 +8,6 @@ INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80242F20_DC01D0); INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_80243188_DC0438); -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_omo/omo_07/DC01D0", func_802431F8_DC04A8); +#include "world/common/SetCamera0MoveFlag1.inc.c" diff --git a/src/world/area_omo/omo_08/DC43D0.c b/src/world/area_omo/omo_08/DC43D0.c index 2c60cef685..e0a48b9c0f 100644 --- a/src/world/area_omo/omo_08/DC43D0.c +++ b/src/world/area_omo/omo_08/DC43D0.c @@ -1,6 +1,6 @@ #include "omo_08.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_08/DC43D0", func_8024001C_DC43EC); diff --git a/src/world/area_omo/omo_10/DD79B0.c b/src/world/area_omo/omo_10/DD79B0.c index 2ebfd8a10d..1e90c216c8 100644 --- a/src/world/area_omo/omo_10/DD79B0.c +++ b/src/world/area_omo/omo_10/DD79B0.c @@ -1,6 +1,6 @@ #include "omo_10.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_10/DD79B0", func_8024001C_DD79CC); diff --git a/src/world/area_omo/omo_16/DEBED0.c b/src/world/area_omo/omo_16/DEBED0.c index f154aae5c8..fbf0379bef 100644 --- a/src/world/area_omo/omo_16/DEBED0.c +++ b/src/world/area_omo/omo_16/DEBED0.c @@ -1,6 +1,6 @@ #include "omo_16.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_16/DEBED0", func_8024001C_DEBEEC); diff --git a/src/world/area_omo/omo_17/DEEEA0.c b/src/world/area_omo/omo_17/DEEEA0.c index a9cd5069d4..029d1fc88f 100644 --- a/src/world/area_omo/omo_17/DEEEA0.c +++ b/src/world/area_omo/omo_17/DEEEA0.c @@ -1,6 +1,6 @@ #include "omo_17.h" -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_17/DEEEA0", func_8024001C_DEEEBC); diff --git a/src/world/area_sam/sam_07/D2BD30.c b/src/world/area_sam/sam_07/D2BD30.c index 7b334b26a9..4a0ca9b280 100644 --- a/src/world/area_sam/sam_07/D2BD30.c +++ b/src/world/area_sam/sam_07/D2BD30.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240448_D2C178); INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_802405B0_D2C2E0); -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_07/D2BD30", func_80240650_D2C380); diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index ed38a0c603..a37071aeaf 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -15,9 +15,9 @@ static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -#include "world/common/SetCamera0MoveFlagNeg1.inc.c" +#include "world/common/UnsetCamera0MoveFlag1.inc.c" -INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240580_D3AB50); +#include "world/common/SetCamera0MoveFlag1.inc.c" INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024059C_D3AB6C); diff --git a/src/world/common/SetCamera0MoveFlag1.inc.c b/src/world/common/SetCamera0MoveFlag1.inc.c new file mode 100644 index 0000000000..2f4cb9fd5e --- /dev/null +++ b/src/world/common/SetCamera0MoveFlag1.inc.c @@ -0,0 +1,8 @@ +#include "common.h" + +static ApiStatus SetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) { + Camera* camera = &gCameras[0]; + + camera->moveFlags |= 1; + return ApiStatus_DONE2; +} diff --git a/src/world/common/SetCamera0MoveFlagNeg1.inc.c b/src/world/common/UnsetCamera0MoveFlag1.inc.c similarity index 57% rename from src/world/common/SetCamera0MoveFlagNeg1.inc.c rename to src/world/common/UnsetCamera0MoveFlag1.inc.c index f8e815371a..e5ae2007c7 100644 --- a/src/world/common/SetCamera0MoveFlagNeg1.inc.c +++ b/src/world/common/UnsetCamera0MoveFlag1.inc.c @@ -1,6 +1,6 @@ #include "common.h" -static ApiStatus SetCamera0MoveFlagNeg1(ScriptInstance* script, s32 isInitialCall) { +static ApiStatus UnsetCamera0MoveFlag1(ScriptInstance* script, s32 isInitialCall) { Camera* camera = &gCameras[0]; camera->moveFlags &= ~1; From 90641b1b064ecd0e853827e01d5e3420cd08534e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 30 Oct 2020 19:42:25 -0400 Subject: [PATCH 22/45] kmr_03 --- .../kmr_03/8C7F90/func_80240000_8C7F90.s | 109 ------------------ src/world/area_kmr/kmr_03/8C7F90.c | 45 +++++++- 2 files changed, 44 insertions(+), 110 deletions(-) delete mode 100644 asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s diff --git a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s b/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s deleted file mode 100644 index 28b50c38c4..0000000000 --- a/asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240000_8C7F90.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80240000_8C7F90 -/* 8C7F90 80240000 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 8C7F94 80240004 AFB20018 */ sw $s2, 0x18($sp) -/* 8C7F98 80240008 0080902D */ daddu $s2, $a0, $zero -/* 8C7F9C 8024000C AFB10014 */ sw $s1, 0x14($sp) -/* 8C7FA0 80240010 00A0882D */ daddu $s1, $a1, $zero -/* 8C7FA4 80240014 AFBF0024 */ sw $ra, 0x24($sp) -/* 8C7FA8 80240018 AFB40020 */ sw $s4, 0x20($sp) -/* 8C7FAC 8024001C AFB3001C */ sw $s3, 0x1c($sp) -/* 8C7FB0 80240020 AFB00010 */ sw $s0, 0x10($sp) -/* 8C7FB4 80240024 8E50000C */ lw $s0, 0xc($s2) -/* 8C7FB8 80240028 8E050000 */ lw $a1, ($s0) -/* 8C7FBC 8024002C 0C0B1EAF */ jal get_variable -/* 8C7FC0 80240030 26100004 */ addiu $s0, $s0, 4 -/* 8C7FC4 80240034 0240202D */ daddu $a0, $s2, $zero -/* 8C7FC8 80240038 8E050000 */ lw $a1, ($s0) -/* 8C7FCC 8024003C 0C0B1EAF */ jal get_variable -/* 8C7FD0 80240040 0040802D */ daddu $s0, $v0, $zero -/* 8C7FD4 80240044 0200202D */ daddu $a0, $s0, $zero -/* 8C7FD8 80240048 0C00EAD2 */ jal get_npc_safe -/* 8C7FDC 8024004C 0040A02D */ daddu $s4, $v0, $zero -/* 8C7FE0 80240050 3C138011 */ lui $s3, %hi(gPlayerData) -/* 8C7FE4 80240054 2673F290 */ addiu $s3, $s3, %lo(gPlayerData) -/* 8C7FE8 80240058 12200006 */ beqz $s1, .L80240074 -/* 8C7FEC 8024005C 0040802D */ daddu $s0, $v0, $zero -/* 8C7FF0 80240060 82620012 */ lb $v0, 0x12($s3) -/* 8C7FF4 80240064 54400003 */ bnel $v0, $zero, .L80240074 -/* 8C7FF8 80240068 AE400070 */ sw $zero, 0x70($s2) -/* 8C7FFC 8024006C 24020002 */ addiu $v0, $zero, 2 -/* 8C8000 80240070 AE420070 */ sw $v0, 0x70($s2) -.L80240074: -/* 8C8004 80240074 8E430070 */ lw $v1, 0x70($s2) -/* 8C8008 80240078 24110001 */ addiu $s1, $zero, 1 -/* 8C800C 8024007C 10710013 */ beq $v1, $s1, .L802400CC -/* 8C8010 80240080 28620002 */ slti $v0, $v1, 2 -/* 8C8014 80240084 10400005 */ beqz $v0, .L8024009C -/* 8C8018 80240088 24020002 */ addiu $v0, $zero, 2 -/* 8C801C 8024008C 10600009 */ beqz $v1, .L802400B4 -/* 8C8020 80240090 0000102D */ daddu $v0, $zero, $zero -/* 8C8024 80240094 08090059 */ j .L80240164 -/* 8C8028 80240098 00000000 */ nop -.L8024009C: -/* 8C802C 8024009C 10620013 */ beq $v1, $v0, .L802400EC -/* 8C8030 802400A0 24020003 */ addiu $v0, $zero, 3 -/* 8C8034 802400A4 1062001E */ beq $v1, $v0, .L80240120 -/* 8C8038 802400A8 0000102D */ daddu $v0, $zero, $zero -/* 8C803C 802400AC 08090059 */ j .L80240164 -/* 8C8040 802400B0 00000000 */ nop -.L802400B4: -/* 8C8044 802400B4 0C03AC5A */ jal func_800EB168 -/* 8C8048 802400B8 0000202D */ daddu $a0, $zero, $zero -/* 8C804C 802400BC 2402001E */ addiu $v0, $zero, 0x1e -/* 8C8050 802400C0 AE420074 */ sw $v0, 0x74($s2) -/* 8C8054 802400C4 08090058 */ j .L80240160 -/* 8C8058 802400C8 AE510070 */ sw $s1, 0x70($s2) -.L802400CC: -/* 8C805C 802400CC 8E420074 */ lw $v0, 0x74($s2) -/* 8C8060 802400D0 2403FFFF */ addiu $v1, $zero, -1 -/* 8C8064 802400D4 2442FFFF */ addiu $v0, $v0, -1 -/* 8C8068 802400D8 14430021 */ bne $v0, $v1, .L80240160 -/* 8C806C 802400DC AE420074 */ sw $v0, 0x74($s2) -/* 8C8070 802400E0 24020002 */ addiu $v0, $zero, 2 -/* 8C8074 802400E4 08090058 */ j .L80240160 -/* 8C8078 802400E8 AE420070 */ sw $v0, 0x70($s2) -.L802400EC: -/* 8C807C 802400EC 0200202D */ daddu $a0, $s0, $zero -/* 8C8080 802400F0 00141600 */ sll $v0, $s4, 0x18 -/* 8C8084 802400F4 00021543 */ sra $v0, $v0, 0x15 -/* 8C8088 802400F8 02621021 */ addu $v0, $s3, $v0 -/* 8C808C 802400FC A2740012 */ sb $s4, 0x12($s3) -/* 8C8090 80240100 0C03BD17 */ jal clear_partner_move_history -/* 8C8094 80240104 A0510014 */ sb $s1, 0x14($v0) -/* 8C8098 80240108 82640012 */ lb $a0, 0x12($s3) -/* 8C809C 8024010C 0C03ACA9 */ jal func_800EB2A4 -/* 8C80A0 80240110 00000000 */ nop -/* 8C80A4 80240114 24020003 */ addiu $v0, $zero, 3 -/* 8C80A8 80240118 08090058 */ j .L80240160 -/* 8C80AC 8024011C AE420070 */ sw $v0, 0x70($s2) -.L80240120: -/* 8C80B0 80240120 0C00EAD2 */ jal get_npc_safe -/* 8C80B4 80240124 2404FFFC */ addiu $a0, $zero, -4 -/* 8C80B8 80240128 8E05000C */ lw $a1, 0xc($s0) -/* 8C80BC 8024012C 0C00ECD0 */ jal set_npc_yaw -/* 8C80C0 80240130 0040202D */ daddu $a0, $v0, $zero -/* 8C80C4 80240134 0200202D */ daddu $a0, $s0, $zero -/* 8C80C8 80240138 8E020000 */ lw $v0, ($s0) -/* 8C80CC 8024013C 2403FFFB */ addiu $v1, $zero, -5 -/* 8C80D0 80240140 00431024 */ and $v0, $v0, $v1 -/* 8C80D4 80240144 0C00EAFF */ jal disable_npc_shadow -/* 8C80D8 80240148 AE020000 */ sw $v0, ($s0) -/* 8C80DC 8024014C 3C01C47A */ lui $at, 0xc47a -/* 8C80E0 80240150 44810000 */ mtc1 $at, $f0 -/* 8C80E4 80240154 24020002 */ addiu $v0, $zero, 2 -/* 8C80E8 80240158 08090059 */ j .L80240164 -/* 8C80EC 8024015C E600003C */ swc1 $f0, 0x3c($s0) -.L80240160: -/* 8C80F0 80240160 0000102D */ daddu $v0, $zero, $zero -.L80240164: -/* 8C80F4 80240164 8FBF0024 */ lw $ra, 0x24($sp) -/* 8C80F8 80240168 8FB40020 */ lw $s4, 0x20($sp) -/* 8C80FC 8024016C 8FB3001C */ lw $s3, 0x1c($sp) -/* 8C8100 80240170 8FB20018 */ lw $s2, 0x18($sp) -/* 8C8104 80240174 8FB10014 */ lw $s1, 0x14($sp) -/* 8C8108 80240178 8FB00010 */ lw $s0, 0x10($sp) -/* 8C810C 8024017C 03E00008 */ jr $ra -/* 8C8110 80240180 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index 1df8fe4a77..dd8ae718af 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -1,6 +1,49 @@ #include "kmr_03.h" -INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_80240000_8C7F90); +ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { + Bytecode* args = script->ptrReadPos; + PlayerData* playerData = PLAYER_DATA; + NpcId npcID = get_variable(script, *args++); + PartnerId partnerID = get_variable(script, *args++); + Npc* npc = get_npc_safe(npcID); + + if (isInitialCall) { + if (gPlayerData.currentPartner == PartnerId_NONE) { + script->functionTemp[0].s = 2; + } else { + script->functionTemp[0].s = 0; + } + } + + switch (script->functionTemp[0].s) { + case 0: + func_800EB168(0); + script->functionTemp[1].s = 30; + script->functionTemp[0].s = 1; + break; + case 1: + script->functionTemp[1].s--; + if (script->functionTemp[1].s == -1) { + script->functionTemp[0].s = 2; + } + break; + case 2: + playerData->currentPartner = partnerID; + playerData->partners[partnerID].enabled = TRUE; + clear_partner_move_history(npc); + func_800EB2A4(playerData->currentPartner); + script->functionTemp[0].s = 3; + break; + case 3: + set_npc_yaw(get_npc_safe(NpcId_PARTNER), npc->yaw); + npc->flags &= ~4; + disable_npc_shadow(npc); + npc->pos.y = -1000.0f; + return ApiStatus_DONE2; + } + + return ApiStatus_BLOCK; +} #include "world/common/CheckPartnerFlags1000.inc.c" From d86cb5cb2773c193c464aec3a5df8d6ea4ebfe56 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 00:14:49 +0000 Subject: [PATCH 23/45] improve disasm_map.py output --- tools/disasm_map.py | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/tools/disasm_map.py b/tools/disasm_map.py index 842912d30b..970d462d96 100755 --- a/tools/disasm_map.py +++ b/tools/disasm_map.py @@ -43,14 +43,17 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): bytes.read(0x10) main,entry_list,entry_count = unpack(">IIi", bytes.read(4 * 3)) - out += f" .main = M(Main)\n" - out += f" .entryList = M(entryList)\n" - out += f" .entryCount = {entry_count}, // prefer ENTRY_COUNT(M(entryList)) if it matches\n" + out += f" .main = M(Main),\n" + out += f" .entryList = M(entryList),\n" + out += f" .entryCount = ENTRY_COUNT(M(entryList)),\n" bytes.read(0x1C) bg,tattle = unpack(">II", bytes.read(4 * 2)) - out += f" .background = {'&gBackgroundImage' if bg == 0x80200000 else 'NULL'},\n" + if bg == 0x80200000: + out += f" .background = &gBackgroundImage,\n" + elif bg != 0: + raise Exception(f"unknown MapConfig background {bg:X}") out += f" .tattle = {tattle:X},\n" out += f"}};\n" @@ -63,7 +66,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): word = int.from_bytes(bytes.read(4), byteorder="big") if word in symbol_map: - out += f" M({symbol_map[word]})," + out += f" {symbol_map[word]}," else: out += f" 0x{word:08X}," @@ -94,6 +97,7 @@ def parse_midx(file, prefix = ""): if len(s) == 5: if s[0] == "$Start": continue if s[0] == "$End": continue + structs.append({ "name": prefix + name_struct(s[0]), "type": s[1], @@ -134,8 +138,23 @@ def name_struct(s): s = s[1:].replace("???", "unk") # use ThisCase for scripts - if s.startswith("$Script"): - return s[0].upper() + s[1:] + if s.startswith("Script_"): + s = s[7].upper() + s[8:] + + # if `s` is hex, prefix it with Script_ again + try: + int(s, 16) + return "Script_" + s + except Exception: + pass + + if s.startswith("Main"): + return "Main" + + return s + + if s.startswith("ASCII"): + return s return s[0].lower() + s[1:] @@ -155,7 +174,7 @@ if __name__ == "__main__": symbol_map = {} for struct in midx: - symbol_map[struct["vaddr"]] = struct["name"] + symbol_map[struct["vaddr"]] = "M(" + struct["name"] + ")" bin_dir = f"bin/world/{area_name}/{map_name}" src_dir = f"src/world/{area_name}/{map_name}" @@ -184,5 +203,8 @@ if __name__ == "__main__": if filetype == "bin": with open(f"{bin_dir}/{rom_addr:X}.bin", "rb") as bytes: - print(f"// {rom_addr:X}") - print(disassemble(bytes, rom_addr - rom_start, midx, symbol_map, map_name)) + disasm = disassemble(bytes, rom_addr - rom_start, midx, symbol_map, map_name) + + if len(disasm.strip()) > 0: + with open(f"{src_dir}/{rom_addr:X}.bin.c", "w") as f: + f.write(disasm) From 91f3517b8652c6fb3086a69a355ac8aa0e1bb482 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 00:28:23 +0000 Subject: [PATCH 24/45] parse ASCII structs --- tools/disasm_map.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/disasm_map.py b/tools/disasm_map.py index 970d462d96..6e68c556b4 100755 --- a/tools/disasm_map.py +++ b/tools/disasm_map.py @@ -3,7 +3,9 @@ import sys import os import yaml +import json from struct import unpack + from disasm_script import disassemble as disassemble_script def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): @@ -57,6 +59,15 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): out += f" .tattle = {tattle:X},\n" out += f"}};\n" + elif struct["type"] == "ASCII": + string_data = bytes.read(struct["length"]).decode("ascii") + + # strip null terminator(s) + while string_data[-1] == "\0": + string_data = string_data[:-1] + + string_literal = json.dumps(string_data) + out += f"const char M({struct['name']})[] = {string_literal};" else: # unknown type of struct out += f"s32 M({name})[] = {{" for i in range(0, struct["length"], 4): From 21ab7fed6ca137b576c5e28c974b71b96d8fb31a Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 02:28:18 +0000 Subject: [PATCH 25/45] new dsl syntax --- Makefile | 4 +- tools/compile_dsl_macros.py | 97 +++++- tools/disasm_map.py | 17 +- tools/disasm_script.py | 598 ++++++++++++++++++++++++------------ 4 files changed, 513 insertions(+), 203 deletions(-) diff --git a/Makefile b/Makefile index ece296eab5..06a8a51d95 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ $(BUILD_DIR)/%.c.o: %.c $(MDEPS) $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - # Compile C files (with DSL macros) -$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) +$(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) tools/compile_dsl_macros.py @mkdir -p $(shell dirname $@) $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - @@ -151,7 +151,7 @@ $(BUILD_DIR)/bin/assets/%: bin/assets/%.bin @mkdir -p $(shell dirname $@) @cp $< $@ -$(ASSETS_BIN): $(ASSET_FILES) $(YAY0_ASSET_FILES) +$(ASSETS_BIN): $(ASSET_FILES) $(YAY0_ASSET_FILES) sources.mk @mkdir -p $(shell dirname $@) @echo "building $@" @$(PYTHON) tools/build_assets_bin.py $@ $(ASSET_FILES) diff --git a/tools/compile_dsl_macros.py b/tools/compile_dsl_macros.py index d62cab7d29..fa759bd752 100755 --- a/tools/compile_dsl_macros.py +++ b/tools/compile_dsl_macros.py @@ -29,17 +29,18 @@ script_parser = Lark(r""" block: "{" NEWLINE* (stmt STMT_SEP)* NEWLINE* "}" ?stmt: call - | label ":" -> label_decl + | label ":" [stmt] -> label_decl | "goto" label -> label_goto | if_stmt | "return" -> return_stmt | "break" -> break_stmt | "sleep" expr -> sleep_stmt + | "sleep" expr "secs" -> sleep_secs_stmt | "spawn" expr -> spawn_stmt | "await" expr -> await_stmt | lhs "=" "spawn" expr -> spawn_set_stmt | lhs set_op expr -> set_stmt - | lhs ":=" expr -> set_const_stmt + | "const" lhs set_op expr -> set_const_stmt | bind_stmt | bind_set_stmt | "unbind" -> unbind_stmt @@ -49,12 +50,19 @@ script_parser = Lark(r""" | kill_stmt | loop_stmt | loop_until_stmt + | ["await"] block -> block_stmt + | "spawn" block -> spawn_block_stmt + | "parallel" block -> parallel_block_stmt call: CNAME "(" [expr ("," expr)* [","]] ")" if_stmt: "if" expr if_op expr block ["else" block] ?if_op: "==" -> if_op_eq | "!=" -> if_op_ne + | ">" -> if_op_gt + | "<" -> if_op_lt + | ">=" -> if_op_ge + | "<=" -> if_op_le suspend_stmt: "suspend" control_type expr ("," control_type expr)* [","] resume_stmt: "resume" control_type expr ("," control_type expr)* [","] @@ -84,6 +92,11 @@ script_parser = Lark(r""" | "*=" -> set_op_mul | "/=" -> set_op_div | "%=" -> set_op_mod + | "&=" -> set_op_and + | "|=" -> set_op_or + | ":=" -> set_op_eq_const + | ":&=" -> set_op_and_const + | ":|=" -> set_op_or_const c_const_expr: c_const_expr_internal c_const_expr_internal: "(" (c_const_expr_internal | NOT_PARENS)+ ")" @@ -175,6 +188,22 @@ class LoopUntilCtx(CmdCtx): def break_opcode(self, meta): raise CompileError("breaking out of a loop..until is not supported (hint: use a label)", meta) +class LabelCtx(CmdCtx): + def __init__(self, label): + super().__init__() + self.label = label + + # TODO: implement break_opcode so you can do lbl: loop { break lbl } + +class BlockCtx(CmdCtx): + pass + +class SpawnCtx(CmdCtx): + pass + +class ParallelCtx(CmdCtx): + pass + class CompileError(Exception): def __init__(self, message, meta): super().__init__(message) @@ -255,6 +284,10 @@ class Compile(Transformer): return [ Cmd(op, a, b, meta=tree.meta), *block, Cmd(0x13) ] def if_op_eq(self, tree): return 0x0A def if_op_ne(self, tree): return 0x0B + def if_op_lt(self, tree): return 0x0C + def if_op_gt(self, tree): return 0x0D + def if_op_le(self, tree): return 0x0E + def if_op_ge(self, tree): return 0x0F def loop_stmt(self, tree): expr = tree.children.pop(0) if len(tree.children) > 1 else 0 @@ -336,6 +369,8 @@ class Compile(Transformer): def sleep_stmt(self, tree): return Cmd(0x08, tree.children[0], meta=tree.meta) + def sleep_secs_stmt(self, tree): + return Cmd(0x09, tree.children[0], meta=tree.meta) def bind_stmt(self, tree): script, trigger, target = tree.children @@ -366,12 +401,16 @@ class Compile(Transformer): raise CompileError(f"operation `{opcodes['__op__']}' not supported for ints", tree.meta) return Cmd(opcode, lhs, rhs) def set_const_stmt(self, tree): - lhs, rhs = tree.children - return Cmd(0x25, lhs, rhs) + lhs, opcodes, rhs = tree.children + opcode = opcodes.get("const", None) + if not opcode: + raise CompileError(f"operation `{opcodes['__op__']}' not supported for consts", tree.meta) + return Cmd(opcode, lhs, rhs) def set_op_eq(self, tree): return { "__op__": "=", "int": 0x24, + "const": 0x25, "float": 0x26, } def set_op_add(self, tree): @@ -403,10 +442,37 @@ class Compile(Transformer): "__op__": "%", "int": 0x2B, } + def set_op_and(self, tree): + return { + "__op__": "&", + "int": 0x3F, + "const": 0x41, + } + def set_op_or(self, tree): + return { + "__op__": "|", + "int": 0x40, + "const": 0x42, + } def label_decl(self, tree): - label = tree.children[0] - return Cmd(0x03, label, meta=tree.meta) + if len(tree.children) == 0: + label = tree.children[0] + return Cmd(0x03, label, meta=tree.meta) + else: + label, cmd_or_block = tree.children + + if type(cmd_or_block) is not list: + cmd_or_block = [cmd_or_block] + + for cmd in cmd_or_block: + if isinstance(cmd, BaseCmd): + cmd.add_context(LabelCtx(label)) + + return [ + Cmd(0x03, label, meta=tree.meta), + *cmd_or_block + ] def label_goto(self, tree): label = tree.children[0] return Cmd(0x04, label, meta=tree.meta) @@ -416,6 +482,25 @@ class Compile(Transformer): return self.alloc.labels.index(name) raise CompileError(f"label `{name}' is undeclared", tree.meta) + def block_stmt(self, tree): + block, = tree.children + for cmd in block: + if isinstance(cmd, BaseCmd): + cmd.add_context(BlockCtx()) + return block + def spawn_block_stmt(self, tree): + block, = tree.children + for cmd in block: + if isinstance(cmd, BaseCmd): + cmd.add_context(SpawnCtx()) + return [ Cmd(0x56, meta=tree.meta), *block, Cmd(0x57) ] + def parallel_block_stmt(self, tree): + block, = tree.children + for cmd in block: + if isinstance(cmd, BaseCmd): + cmd.add_context(ParallelCtx()) + return [ Cmd(0x58, meta=tree.meta), *block, Cmd(0x59) ] + def compile_script(s): tree = script_parser.parse(s) diff --git a/tools/disasm_map.py b/tools/disasm_map.py index 6e68c556b4..3c3bbb993a 100755 --- a/tools/disasm_map.py +++ b/tools/disasm_map.py @@ -6,7 +6,7 @@ import yaml import json from struct import unpack -from disasm_script import disassemble as disassemble_script +import disasm_script def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): out = "" @@ -15,6 +15,9 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): while len(midx) > 0: struct = midx.pop(0) name = struct["name"] + + print(name) + if name == "Script_Main": name = f"M(Main)" #print(f"{offset:X} ({name}, start = {struct['start']:X}, len = {struct['length']:X})") @@ -28,7 +31,12 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): # format struct if struct["type"].startswith("Script"): - out += disassemble_script(bytes, f"M({name})", symbol_map) + pos = bytes.tell() + try: + out += disasm_script.ScriptDSLDisassembler(bytes, f"M({name})", symbol_map).disassemble() + except disasm_script.UnsupportedScript as e: + bytes.seek(pos) + out += disasm_script.ScriptDisassembler(bytes, f"M({name})", symbol_map).disassemble() elif struct["type"] == "Padding": # nops at end of file bytes.seek(offset % 4, 1) @@ -56,7 +64,7 @@ def disassemble(bytes, offset, midx, symbol_map = {}, map_name = "map"): out += f" .background = &gBackgroundImage,\n" elif bg != 0: raise Exception(f"unknown MapConfig background {bg:X}") - out += f" .tattle = {tattle:X},\n" + out += f" .tattle = 0x{tattle:X},\n" out += f"}};\n" elif struct["type"] == "ASCII": @@ -218,4 +226,5 @@ if __name__ == "__main__": if len(disasm.strip()) > 0: with open(f"{src_dir}/{rom_addr:X}.bin.c", "w") as f: - f.write(disasm) + f.write(f'#include "{map_name}.h"\n\n') + f.write(disasm.rstrip() + "\n") diff --git a/tools/disasm_script.py b/tools/disasm_script.py index 33c834df2a..0c5ffc9ac4 100755 --- a/tools/disasm_script.py +++ b/tools/disasm_script.py @@ -2,17 +2,19 @@ import sys -_star_rod_lib = None -def star_rod_lib(): - global _star_rod_lib +_script_lib = None +def script_lib(): + global _script_lib - if not _star_rod_lib: - _star_rod_lib = {} + if not _script_lib: + _script_lib = {} from pathlib import Path from os import path import re + # star rod database + """ LIB_LINE_RE = re.compile(r"\s+:\s+") NAME_RE = re.compile(r"({[^}]*})?\s*([a-zA-Z0-9_]+)") @@ -28,46 +30,71 @@ def star_rod_lib(): if name := NAME_RE.match(parts[2]): name = name.group(2) - _star_rod_lib[vaddr] = name - - """ - if "map" in str(filename): - if kind == "api": - print(f"ApiStatus {name}(ScriptInstance* script, s32 isInitialCall);") - elif kind == "scr": - print(f"extern Script {name};") - """ + _script_lib[vaddr] = name except: pass + """ - return _star_rod_lib + # symbol_addrs.txt + with open(Path(path.dirname(__file__), "symbol_addrs.txt"), "r") as file: + for line in file.readlines(): + s = line.split(";") + name = s[0] + addr = s[1] + _script_lib[int(addr, 16)] = name -def disassemble(bytes, script_name = "script", symbol_map = {}): - out = "" - prefix = "" + return _script_lib - indent = 1 - indent_used = False +class ScriptDisassembler: + def __init__(self, bytes, script_name = "script", symbol_map = {}): + self.bytes = bytes + self.script_name = script_name + self.symbol_map = symbol_map - def write_line(line): - nonlocal out, indent, indent_used - if indent < 0: indent = 0 - if indent > 1: indent_used = True - out += " " * indent - out += line - out += "\n" - def prefix_line(line): - nonlocal prefix - prefix += line - prefix += "\n" + self.out = "" + self.prefix = "" - def var(arg): - if arg in symbol_map: - return symbol_map[arg] + self.indent = 1 + self.indent_used = False + + self.done = False + + def disassemble(self): + while True: + opcode = self.read_word() + argc = self.read_word() + + if opcode > 0xFF or argc > 0xFF: + raise Exception(f"script '{script_name}' is malformed") + + argv = [] + for i in range(0, argc): + argv.append(self.read_word()) + + self.disassemble_command(opcode, argc, argv) + + if self.done: + return self.prefix + self.out + + def write_line(self, line): + if self.indent < 0: self.indent = 0 + if self.indent > 1: self.indent_used = True + + self.out += " " * self.indent + self.out += line + self.out += "\n" + + def prefix_line(self, line): + self.prefix += line + self.prefix += "\n" + + def var(self, arg): + if arg in self.symbol_map: + return self.symbol_map[arg] v = arg - 2**32 # convert to s32 if v > -250000000: - if v <= -220000000: return f"SI_FIXED({(v + 230000000) / 1024}f)" + if v <= -220000000: return f"SI_FIXED({(v + 230000000) / 1024})" elif v <= -200000000: return f"SI_ARRAY_FLAG({v + 210000000})" elif v <= -180000000: return f"SI_ARRAY({v + 190000000})" elif v <= -160000000: return f"SI_SAVE_VAR({v + 170000000})" @@ -86,12 +113,12 @@ def disassemble(bytes, script_name = "script", symbol_map = {}): else: return f"{arg}" - def addr_ref(addr): - if addr in symbol_map: - return symbol_map[addr] - return star_rod_lib().get(addr, f"0x{addr:08X}") + def addr_ref(self, addr): + if addr in self.symbol_map: + return self.symbol_map[addr] + return script_lib().get(addr, f"0x{addr:08X}") - def trigger(trigger): + def trigger(self, trigger): if trigger == 0x00000080: trigger = "TriggerFlag_FLOOR_TOUCH" if trigger == 0x00800000: trigger = "TriggerFlag_FLOOR_ABOVE" if trigger == 0x00000800: trigger = "TriggerFlag_FLOOR_INTERACT" @@ -106,206 +133,391 @@ def disassemble(bytes, script_name = "script", symbol_map = {}): if trigger == 0x00100000: trigger = "TriggerFlag_BOMB" return trigger - def read_word(): - return int.from_bytes(bytes.read(4), byteorder="big") - - while True: - opcode = read_word() - argc = read_word() - - if opcode > 0xFF or argc > 0xFF: - return f"/* malformed script: {script_name} */\n" - - argv = [] - for i in range(0, argc): - argv.append(read_word()) + def read_word(self): + return int.from_bytes(self.bytes.read(4), byteorder="big") + def disassemble_command(self, opcode, argc, argv): if opcode == 0x01: - write_line("SI_END(),") - indent -= 1 + self.write_line("SI_END(),") + self.indent -= 1 - if indent_used: - prefix_line("// *INDENT-OFF*") - prefix_line(f"Script {script_name} = {{") - write_line("};") - write_line("// *INDENT-ON*") + if self.indent_used: + self.prefix_line("// *INDENT-OFF*") + self.prefix_line(f"Script {self.script_name} = {{") + self.write_line("};") + self.write_line("// *INDENT-ON*") else: - prefix_line(f"Script {script_name} = {{") - write_line("};") + self.prefix_line(f"Script {self.script_name} = {{") + self.write_line("};") - return prefix + out - elif opcode == 0x02: write_line(f"SI_RETURN(),") - elif opcode == 0x03: write_line(f"SI_LABEL({var(argv[0])}),") - elif opcode == 0x04: write_line(f"SI_GOTO({var(argv[0])}),") + self.done = True + elif opcode == 0x02: self.write_line(f"SI_RETURN(),") + elif opcode == 0x03: self.write_line(f"SI_LABEL({self.var(argv[0])}),") + elif opcode == 0x04: self.write_line(f"SI_GOTO({self.var(argv[0])}),") elif opcode == 0x05: - write_line(f"SI_LOOP({var(argv[0])}),") - indent += 1 + self.write_line(f"SI_LOOP({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x06: - indent -= 1 - write_line("SI_END_LOOP(),") - elif opcode == 0x07: write_line(f"SI_BREAK_LOOP(),") - elif opcode == 0x08: write_line(f"SI_WAIT_FRAMES({var(argv[0])}),") - elif opcode == 0x09: write_line(f"SI_WAIT_SECS({var(argv[0])}),") + self.indent -= 1 + self.write_line("SI_END_LOOP(),") + elif opcode == 0x07: self.write_line(f"SI_BREAK_LOOP(),") + elif opcode == 0x08: self.write_line(f"SI_WAIT_FRAMES({self.var(argv[0])}),") + elif opcode == 0x09: self.write_line(f"SI_WAIT_SECS({self.var(argv[0])}),") elif opcode == 0x0A: - write_line(f"SI_IF_EQ({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_EQ({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x0B: - write_line(f"SI_IF_NE({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_NE({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x0C: - write_line(f"SI_IF_LT({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_LT({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x0D: - write_line(f"SI_IF_GT({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_GT({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x0E: - write_line(f"SI_IF_LE({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_LE({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x0F: - write_line(f"SI_IF_GE({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_GE({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x10: - write_line(f"SI_IF_BITS_ON({var(argv[0])}, {var(argv[1])}),") - indent += 1 + self.write_line(f"SI_IF_BITS_ON({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 elif opcode == 0x11: - write_line(f"SI_IF_BITS_OFF({var(argv[0])}, {var(argv[1])}),") - indent += 1 - elif opcode == 0x12: write_line(f"SI_ELSE(),") + self.write_line(f"SI_IF_BITS_OFF({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 + elif opcode == 0x12: + self.indent -= 1 + self.write_line(f"SI_ELSE(),") + self.indent += 1 elif opcode == 0x13: - indent -= 1 - write_line(f"SI_END_IF(),") + self.indent -= 1 + self.write_line(f"SI_END_IF(),") elif opcode == 0x14: - write_line(f"SI_SWITCH({var(argv[0])}),") - indent += 2 + self.write_line(f"SI_SWITCH({self.var(argv[0])}),") + self.indent += 2 elif opcode == 0x15: - write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),") - indent += 2 + self.write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),") + self.indent += 2 elif opcode == 0x16: - indent -= 1 - write_line(f"SI_CASE_EQ({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_EQ({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x17: - indent -= 1 - write_line(f"SI_CASE_NE({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_NE({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x18: - indent -= 1 - write_line(f"SI_CASE_LT({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_LT({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x19: - indent -= 1 - write_line(f"SI_CASE_GT({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_GT({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x1A: - indent -= 1 - write_line(f"SI_CASE_LE({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_LE({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x1B: - indent -= 1 - write_line(f"SI_CASE_GE({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_GE({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x1C: - indent -= 1 - write_line(f"SI_CASE_DEFAULT(),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_DEFAULT(),") + self.indent += 1 elif opcode == 0x1D: - indent -= 1 - write_line(f"SI_CASE_OR_EQ({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_OR_EQ({self.var(argv[0])}),") + self.indent += 1 # opcode 0x1E? elif opcode == 0x1F: - indent -= 1 - write_line(f"SI_CASE_BITS_ON({var(argv[0])}),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_CASE_BITS_ON({self.var(argv[0])}),") + self.indent += 1 elif opcode == 0x20: - indent -= 1 - write_line(f"SI_END_MULTI_CASE(),") - indent += 1 + self.indent -= 1 + self.write_line(f"SI_END_MULTI_CASE(),") + self.indent += 1 elif opcode == 0x21: - indent -= 1 - write_line(f"SI_CASE_RANGE({var(argv[0])}, {var(argv[1])}),") - indent += 1 - elif opcode == 0x22: write_line(f"SI_BREAK_CASE(),") + self.indent -= 1 + self.write_line(f"SI_CASE_RANGE({self.var(argv[0])}, {self.var(argv[1])}),") + self.indent += 1 + elif opcode == 0x22: self.write_line(f"SI_BREAK_CASE(),") elif opcode == 0x23: - indent -= 2 - write_line(f"SI_END_SWITCH(),") - elif opcode == 0x24: write_line(f"SI_SET({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x25: write_line(f"SI_SET_CONST({var(argv[0])}, 0x{argv[1]:X}),") - elif opcode == 0x26: write_line(f"SI_SET_F({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x27: write_line(f"SI_ADD({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x28: write_line(f"SI_SUB({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x29: write_line(f"SI_MUL({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2A: write_line(f"SI_DIV({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2B: write_line(f"SI_MOD({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2C: write_line(f"SI_ADD_F({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2D: write_line(f"SI_SUB_F({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2E: write_line(f"SI_MUL_F({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x2F: write_line(f"SI_DIV_F({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x30: write_line(f"SI_USE_BUFFER({var(argv[0])}),") + self.indent -= 2 + self.write_line(f"SI_END_SWITCH(),") + elif opcode == 0x24: self.write_line(f"SI_SET({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x25: self.write_line(f"SI_SET_CONST({self.var(argv[0])}, 0x{argv[1]:X}),") + elif opcode == 0x26: self.write_line(f"SI_SET_F({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x27: self.write_line(f"SI_ADD({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x28: self.write_line(f"SI_SUB({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x29: self.write_line(f"SI_MUL({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2A: self.write_line(f"SI_DIV({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2B: self.write_line(f"SI_MOD({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2C: self.write_line(f"SI_ADD_F({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2D: self.write_line(f"SI_SUB_F({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2E: self.write_line(f"SI_MUL_F({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x2F: self.write_line(f"SI_DIV_F({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x30: self.write_line(f"SI_USE_BUFFER({self.var(argv[0])}),") # TODO: SI_BUF commands - elif opcode == 0x3C: write_line(f"SI_USE_ARRAY({var(argv[0])}),") - elif opcode == 0x3D: write_line(f"SI_NEW_ARRAY({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x3E: write_line(f"SI_USE_FLAGS({var(argv[0])}),") - elif opcode == 0x3F: write_line(f"SI_AND({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x40: write_line(f"SI_OR({var(argv[0])}, {var(argv[1])}),") - elif opcode == 0x41: write_line(f"SI_AND_CONST({var(argv[0])}, 0x{argv[1]:X})") - elif opcode == 0x42: write_line(f"SI_OR_CONST({var(argv[0])}, 0x{argv[1]:X})") + elif opcode == 0x3C: self.write_line(f"SI_USE_ARRAY({self.var(argv[0])}),") + elif opcode == 0x3D: self.write_line(f"SI_NEW_ARRAY({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x3E: self.write_line(f"SI_USE_FLAGS({self.var(argv[0])}),") + elif opcode == 0x3F: self.write_line(f"SI_AND({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x40: self.write_line(f"SI_OR({self.var(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x41: self.write_line(f"SI_AND_CONST({self.var(argv[0])}, 0x{argv[1]:X})") + elif opcode == 0x42: self.write_line(f"SI_OR_CONST({self.var(argv[0])}, 0x{argv[1]:X})") elif opcode == 0x43: argv_str = "" for arg in argv[1:]: argv_str += ", " - argv_str += var(arg) + argv_str += self.var(arg) - write_line(f"SI_CALL({addr_ref(argv[0])}{argv_str}),") - elif opcode == 0x44: write_line(f"SI_EXEC({addr_ref(argv[0])}),") - elif opcode == 0x45: write_line(f"SI_EXEC_GET_ID({addr_ref(argv[0])}, {var(argv[1])}),") - elif opcode == 0x46: write_line(f"SI_EXEC_WAIT({addr_ref(argv[0])}),") + self.write_line(f"SI_CALL({self.addr_ref(argv[0])}{argv_str}),") + elif opcode == 0x44: self.write_line(f"SI_EXEC({self.addr_ref(argv[0])}),") + elif opcode == 0x45: self.write_line(f"SI_EXEC_GET_ID({self.addr_ref(argv[0])}, {self.var(argv[1])}),") + elif opcode == 0x46: self.write_line(f"SI_EXEC_WAIT({self.addr_ref(argv[0])}),") elif opcode == 0x47: - if argv[3] != 1: - raise "BIND argv[3] != 1" - - write_line(f"SI_BIND({addr_ref(argv[0])}, {trigger(argv[1])}, {var(argv[2])}, {'NULL' if argv[4] == 0 else var(argv[4])}),") - elif opcode == 0x48: write_line(f"SI_UNBIND_ME(),") - elif opcode == 0x49: write_line(f"SI_KILL({var(argv[0])}),") - elif opcode == 0x4A: write_line(f"SI_JUMP({var(argv[0])}),") - elif opcode == 0x4B: write_line(f"SI_PRIORITY({var(argv[0])}),") - elif opcode == 0x4C: write_line(f"SI_TIMESCALE({var(argv[0])}),") - elif opcode == 0x4D: write_line(f"SI_GROUP({var(argv[0])}),") + assert argv[3] == 1 + self.write_line(f"SI_BIND({self.addr_ref(argv[0])}, {self.trigger(argv[1])}, {self.var(argv[2])}, {'NULL' if argv[4] == 0 else self.var(argv[4])}),") + elif opcode == 0x48: self.write_line(f"SI_UNBIND_ME(),") + elif opcode == 0x49: self.write_line(f"SI_KILL({self.var(argv[0])}),") + elif opcode == 0x4A: self.write_line(f"SI_JUMP({self.var(argv[0])}),") + elif opcode == 0x4B: self.write_line(f"SI_PRIORITY({self.var(argv[0])}),") + elif opcode == 0x4C: self.write_line(f"SI_TIMESCALE({self.var(argv[0])}),") + elif opcode == 0x4D: self.write_line(f"SI_GROUP({self.var(argv[0])}),") elif opcode == 0x4E: - if argv[4] != 0: - raise "BIND_PADLOCK argv[4] != NULL" - if argv[5] != 1: - raise "BIND_PADLOCK argv[5] != 1" - - write_line(f"SI_BIND_PADLOCK({addr_ref(argv[0])}, {trigger(argv[1])}, {var(argv[2])}, {var(argv[3])}),") - elif opcode == 0x4F: write_line(f"SI_SUSPEND_GROUP({var(argv[0])}),") - elif opcode == 0x50: write_line(f"SI_RESUME_GROUP({var(argv[0])}),") - elif opcode == 0x51: write_line(f"SI_SUSPEND_GROUP_NOT_ME({var(argv[0])}),") - elif opcode == 0x52: write_line(f"SI_RESUME_GROUP_NOT_ME({var(argv[0])}),") - elif opcode == 0x53: write_line(f"SI_SUSPEND({var(argv[0])}),") - elif opcode == 0x54: write_line(f"SI_RESUME({var(argv[0])}),") - elif opcode == 0x55: write_line(f"SI_EXISTS({var(argv[0])}),") + assert argv[4] == 0 + assert argv[5] == 1 + self.write_line(f"SI_BIND_PADLOCK({self.addr_ref(argv[0])}, {self.trigger(argv[1])}, {self.var(argv[2])}, {self.var(argv[3])}),") + elif opcode == 0x4F: self.write_line(f"SI_SUSPEND_GROUP({self.var(argv[0])}),") + elif opcode == 0x50: self.write_line(f"SI_RESUME_GROUP({self.var(argv[0])}),") + elif opcode == 0x51: self.write_line(f"SI_SUSPEND_GROUP_NOT_ME({self.var(argv[0])}),") + elif opcode == 0x52: self.write_line(f"SI_RESUME_GROUP_NOT_ME({self.var(argv[0])}),") + elif opcode == 0x53: self.write_line(f"SI_SUSPEND({self.var(argv[0])}),") + elif opcode == 0x54: self.write_line(f"SI_RESUME({self.var(argv[0])}),") + elif opcode == 0x55: self.write_line(f"SI_EXISTS({self.var(argv[0])}),") elif opcode == 0x56: - write_line("SI_THREAD(),") - indent += 1 + self.write_line("SI_THREAD(),") + self.indent += 1 elif opcode == 0x57: - indent -= 1 - write_line("SI_END_THREAD(),") + self.indent -= 1 + self.write_line("SI_END_THREAD(),") elif opcode == 0x58: - write_line("SI_CHILD_THREAD(),") - indent += 1 + self.write_line("SI_CHILD_THREAD(),") + self.indent += 1 elif opcode == 0x59: - indent -= 1 - write_line("SI_END_CHILD_THREAD(),") + self.indent -= 1 + self.write_line("SI_END_CHILD_THREAD(),") else: # unknown opcode argv_str = "" for arg in argv: argv_str += ", " argv_str += f"0x{arg:X}" - write_line(f"SI_CMD(0x{opcode:02X}{argv_str}),") + self.write_line(f"SI_CMD(0x{opcode:02X}{argv_str}),") - raise "Reached end of data before END command" +class UnsupportedScript(Exception): + pass + +class ScriptDSLDisassembler(ScriptDisassembler): + def var(self, arg): + if arg in self.symbol_map: + return self.symbol_map[arg] + + v = arg - 2**32 # convert to s32 + if v > -250000000: + if v <= -220000000: return str((v + 230000000) / 1024) + elif v <= -200000000: return f"SI_ARRAY_FLAG({v + 210000000})" + elif v <= -180000000: return f"SI_ARRAY({v + 190000000})" + elif v <= -160000000: return f"SI_SAVE_VAR({v + 170000000})" + elif v <= -140000000: return f"SI_AREA_VAR({v + 150000000})" + elif v <= -120000000: return f"SI_SAVE_FLAG({v + 130000000})" + elif v <= -100000000: return f"SI_AREA_FLAG({v + 110000000})" + elif v <= -80000000: return f"SI_MAP_FLAG({v + 90000000})" + elif v <= -60000000: return f"SI_FLAG({v + 70000000})" + elif v <= -40000000: return f"SI_MAP_VAR({v + 50000000})" + elif v <= -20000000: return f"SI_VAR({v + 30000000})" + + if arg == 0xFFFFFFFF: + return "-1" + elif ((arg & 0xFF000000) == 0x80000000) or arg > 10000: + return f"0x{arg:X}" + else: + return f"{arg}" + + def verify_float(self, var): + try: + float(var) + except Exception: + # not a float! + raise UnsupportedScript("non-float used in float command") + + return var + + def disassemble_command(self, opcode, argc, argv): + if opcode == 0x01: + if self.out.endswith("return\n"): + # implicit return; break + self.out = self.out[:-7].rstrip() + "\n" + else: + self.write_line("break") + + self.indent -= 1 + + self.prefix_line(f"Script {self.script_name} = SCRIPT({{") + self.write_line("});") + + self.done = True + elif opcode == 0x02: self.write_line(f"return") + elif opcode == 0x03: self.write_line(f"lbl{self.var(argv[0])}:") + elif opcode == 0x04: self.write_line(f"goto lbl{self.var(argv[0])}") + elif opcode == 0x05: + if argv[0] == 0: + self.write_line("loop {") + else: + self.write_line(f"loop {self.var(argv[0])} {{") + self.indent += 1 + elif opcode == 0x06: + self.indent -= 1 + self.write_line("}") + elif opcode == 0x07: self.write_line(f"break") + elif opcode == 0x08: self.write_line(f"sleep {self.var(argv[0])}") + elif opcode == 0x09: self.write_line(f"sleep {self.var(argv[0])} secs") + elif opcode == 0x0A: + self.write_line(f"if {self.var(argv[0])} == {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x0B: + self.write_line(f"if {self.var(argv[0])} != {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x0C: + self.write_line(f"if {self.var(argv[0])} < {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x0D: + self.write_line(f"if {self.var(argv[0])} > {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x0E: + self.write_line(f"if {self.var(argv[0])} <= {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x0F: + self.write_line(f"if {self.var(argv[0])} >= {self.var(argv[1])} {{") + self.indent += 1 + elif opcode == 0x12: + self.indent -= 1 + self.write_line("} else {") + self.indent += 1 + elif opcode == 0x13: + self.indent -= 1 + self.write_line("}") + # elif opcode == 0x14: + # self.write_line(f"SI_SWITCH({self.var(argv[0])}),") + # self.indent += 2 + # elif opcode == 0x15: + # self.write_line(f"SI_SWITCH_CONST(0x{argv[0]:X}),") + # self.indent += 2 + # elif opcode == 0x16: + # self.indent -= 1 + # self.write_line(f"SI_CASE_EQ({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x17: + # self.indent -= 1 + # self.write_line(f"SI_CASE_NE({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x18: + # self.indent -= 1 + # self.write_line(f"SI_CASE_LT({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x19: + # self.indent -= 1 + # self.write_line(f"SI_CASE_GT({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x1A: + # self.indent -= 1 + # self.write_line(f"SI_CASE_LE({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x1B: + # self.indent -= 1 + # self.write_line(f"SI_CASE_GE({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x1C: + # self.indent -= 1 + # self.write_line(f"SI_CASE_DEFAULT(),") + # self.indent += 1 + # elif opcode == 0x1D: + # self.indent -= 1 + # self.write_line(f"SI_CASE_OR_EQ({self.var(argv[0])}),") + # self.indent += 1 + # # opcode 0x1E? + # elif opcode == 0x1F: + # self.indent -= 1 + # self.write_line(f"SI_CASE_BITS_ON({self.var(argv[0])}),") + # self.indent += 1 + # elif opcode == 0x20: + # self.indent -= 1 + # self.write_line(f"SI_END_MULTI_CASE(),") + # self.indent += 1 + # elif opcode == 0x21: + # self.indent -= 1 + # self.write_line(f"case {self.var(argv[0])}..{self.var(argv[1])}:") + # self.indent += 1 + # elif opcode == 0x22: self.write_line("break") + # elif opcode == 0x23: + # self.indent -= 2 + # self.write_line("}") + elif opcode == 0x24: self.write_line(f"{self.var(argv[0])} = {self.var(argv[1])}") + elif opcode == 0x25: self.write_line(f"const {self.var(argv[0])} = 0x{argv[1]:X}") + elif opcode == 0x26: self.write_line(f"{self.var(argv[0])} = {self.verify_float(self.var(argv[1]))}") + elif opcode == 0x27: self.write_line(f"{self.var(argv[0])} += {self.var(argv[1])}") + elif opcode == 0x28: self.write_line(f"{self.var(argv[0])} -= {self.var(argv[1])}") + elif opcode == 0x29: self.write_line(f"{self.var(argv[0])} *= {self.var(argv[1])}") + elif opcode == 0x2A: self.write_line(f"{self.var(argv[0])} /= {self.var(argv[1])}") + elif opcode == 0x2B: self.write_line(f"{self.var(argv[0])} %= {self.var(argv[1])}") + elif opcode == 0x2C: self.write_line(f"{self.var(argv[0])} += {self.verify_float(self.var(argv[1]))}") + elif opcode == 0x2D: self.write_line(f"{self.var(argv[0])} -= {self.verify_float(self.var(argv[1]))}") + elif opcode == 0x2E: self.write_line(f"{self.var(argv[0])} *= {self.verify_float(self.var(argv[1]))}") + elif opcode == 0x2F: self.write_line(f"{self.var(argv[0])} /= {self.verify_float(self.var(argv[1]))}") + elif opcode == 0x3F: self.write_line(f"{self.var(argv[0])} &= {self.var(argv[1])}") + elif opcode == 0x40: self.write_line(f"{self.var(argv[0])} |= {self.var(argv[1])}") + elif opcode == 0x41: self.write_line(f"const {self.var(argv[0])} &= {argv[1]:X})") + elif opcode == 0x42: self.write_line(f"const {self.var(argv[0])} |= {argv[1]:X})") + elif opcode == 0x43: + argv_str = ", ".join(self.var(arg) for arg in argv[1:]) + self.write_line(f"{self.addr_ref(argv[0])}({argv_str})") + elif opcode == 0x44: self.write_line(f"spawn {self.addr_ref(argv[0])}") + elif opcode == 0x45: self.write_line(f"{self.var(argv[1])} = spawn ({self.addr_ref(argv[0])}") + elif opcode == 0x46: self.write_line(f"await {self.addr_ref(argv[0])}") + elif opcode == 0x47: + assert argv[3] == 1 + if argv[4] != 0: + self.write_line(f"{self.var(argv[4])} = bind {self.addr_ref(argv[0])} to {self.trigger(argv[1])} {self.var(argv[2])}") + else: + self.write_line(f"bind {self.addr_ref(argv[0])} to {self.trigger(argv[1])} {self.var(argv[2])}") + elif opcode == 0x48: self.write_line(f"unbind") + elif opcode == 0x49: self.write_line(f"kill {self.var(argv[0])}") + elif opcode == 0x4D: self.write_line(f"group {self.var(argv[0])}") + elif opcode == 0x4F: self.write_line(f"suspend group {self.var(argv[0])}") + elif opcode == 0x50: self.write_line(f"resume group {self.var(argv[0])}") + elif opcode == 0x51: self.write_line(f"suspend others {self.var(argv[0])}") + elif opcode == 0x52: self.write_line(f"resume others {self.var(argv[0])}") + elif opcode == 0x53: self.write_line(f"suspend {self.var(argv[0])}") + elif opcode == 0x54: self.write_line(f"resume {self.var(argv[0])}") + elif opcode == 0x56: + self.write_line("spawn {") + self.indent += 1 + elif opcode == 0x57: + self.indent -= 1 + self.write_line("}") + elif opcode == 0x58: + self.write_line("parallel {") + self.indent += 1 + elif opcode == 0x59: + self.indent -= 1 + self.write_line("}") + else: + raise UnsupportedScript(f"DSL does not support script opcode {opcode:X}") if __name__ == "__main__": if len(sys.argv) <= 1: @@ -317,4 +529,8 @@ if __name__ == "__main__": with open(file, "rb") as f: f.seek(offset) - print(disassemble(f), end="") + + try: + print(ScriptDSLDisassembler(f).disassemble(), end="") + except UnsupportedScript: + print(ScriptDisassembler(f).disassemble(), end="") From 0e383a411b2d3b7564c2753e161b117e89c9051e Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 31 Oct 2020 11:44:24 -0400 Subject: [PATCH 26/45] kmr_03 data OK but messy --- include/messages.h | 1 + src/world/area_kmr/kmr_03/8C7F90.c | 26 ++- src/world/area_kmr/kmr_03/8C8140.c | 312 +++++++++++++++++++++++++++ src/world/area_kmr/kmr_03/8C83A0.c | 333 +++++++++++++++++++++++++++++ src/world/area_kmr/kmr_03/kmr_03.h | 4 + tools/splat.yaml | 15 +- 6 files changed, 678 insertions(+), 13 deletions(-) create mode 100644 src/world/area_kmr/kmr_03/8C8140.c diff --git a/include/messages.h b/include/messages.h index d119c08963..a7fea9666f 100644 --- a/include/messages.h +++ b/include/messages.h @@ -34,6 +34,7 @@ typedef s32 MessageID; // 18 Gossip Bulletin // 19 Map Tattles +#define MessageID_TATTLE_KMR_03 MESSAGE_ID(0x19, 0x3B) #define MessageID_TATTLE_KMR_12 MESSAGE_ID(0x19, 0x40) // 1A NPC Tattles diff --git a/src/world/area_kmr/kmr_03/8C7F90.c b/src/world/area_kmr/kmr_03/8C7F90.c index dd8ae718af..2a88dc5cc8 100644 --- a/src/world/area_kmr/kmr_03/8C7F90.c +++ b/src/world/area_kmr/kmr_03/8C7F90.c @@ -1,5 +1,7 @@ #include "kmr_03.h" +Script M(Main); + ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { Bytecode* args = script->ptrReadPos; PlayerData* playerData = PLAYER_DATA; @@ -47,11 +49,23 @@ ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall) { #include "world/common/CheckPartnerFlags1000.inc.c" -ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) { - Npc* npc = get_npc_unsafe(0); +// 8C85E0 +EntryList M(entryList) = { + { -340.0f, 0.0f, 348.0f, 48.0f }, + { 480.0f, 0.0f, 0.0f, 270.0f }, + { -310.0f, 20.0f, -80.0f, 135.0f }, +}; - script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f; - return ApiStatus_DONE2; -} +MapConfig M(config) = { + .main = M(Main), + .entryList = M(entryList), + .entryCount = ENTRY_COUNT(M(entryList)), + .background = &gBackgroundImage, + .tattle = MessageID_TATTLE_KMR_03, +}; -#include "world/common/UnkPositionFunc.inc.c" +Script M(script_802406C0) = { + SI_CALL(SetMusicTrack, 0, 17, 0, 8), + SI_RETURN(), + SI_END(), +}; diff --git a/src/world/area_kmr/kmr_03/8C8140.c b/src/world/area_kmr/kmr_03/8C8140.c new file mode 100644 index 0000000000..331f63b956 --- /dev/null +++ b/src/world/area_kmr/kmr_03/8C8140.c @@ -0,0 +1,312 @@ +#include "kmr_03.h" + +s32 M(npcGroupList_80241450)[]; +Script M(script_MakeEntities); +Script M(script_802422B8); +Script M(script_80242340); + +ApiStatus func_802401B0_8C8140(ScriptInstance* script, s32 isInitialCall) { + Npc* npc = get_npc_unsafe(0); + + script->varTable[1] = func_800E0088(npc->pos.x, npc->pos.z) / npc->moveSpeed * 0.8f; + return ApiStatus_DONE2; +} + +#include "world/common/UnkPositionFunc.inc.c" + +// 8C8680 +Script M(script_ExitWalk_802406F0) = { + SI_GROUP(27), + SI_CALL(0x802D216C, 60, 0), + SI_EXEC(0x80285CF4), + SI_CALL(0x802CA400, "kmr_04", 0), + SI_WAIT_FRAMES(100), + SI_RETURN(), + SI_END(), +}; + +Script M(script_ExitWalk_8024074C) = { + SI_GROUP(27), + SI_CALL(0x802D216C, 60, 1), + SI_EXEC(0x80285CF4), + SI_CALL(0x802CA400, "kmr_05", 0), + SI_WAIT_FRAMES(100), + SI_RETURN(), + SI_END(), +}; + +Script M(script_802407A8) = { + SI_BIND(M(script_ExitWalk_802406F0), 524288, 3, NULL), + SI_BIND(M(script_ExitWalk_8024074C), 524288, 5, NULL), + SI_RETURN(), + SI_END(), +}; + +// *INDENT-OFF* +Script M(Main) = { + SI_SET(SI_SAVE_VAR(425), 30), + SI_CALL(0x802D9700, -1), + SI_CALL(0x802CA828, 0, 3, 25, 16, 4096), + SI_CALL(0x802CAD98, 0, 0, 0, 0), + SI_CALL(0x802CA6C0, 0, 1), + SI_CALL(0x802CB680, 0, 0), + SI_SET(SI_AREA_FLAG(8), 0), + SI_CALL(0x80044298, 0, M(npcGroupList_80241450)), + SI_CALL(0x80045640), + SI_EXEC_WAIT(M(script_MakeEntities)), + SI_EXEC_WAIT(M(script_802422B8)), + SI_EXEC(M(script_802406C0)), + SI_CALL(0x802CA460, SI_VAR(0)), + SI_IF_NE(SI_VAR(0), 2), + SI_SET(SI_VAR(0), M(script_802407A8)), + SI_EXEC(0x80285960), + SI_ELSE(), + SI_EXEC(M(script_802407A8)), + SI_EXEC(M(script_80242340)), + SI_END_IF(), + SI_WAIT_FRAMES(1), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +s32 padding[] = {0, 0}; + +// 8C88E0 +s32 M(npcSettings_80240950)[] = { + 0x00000000, 0x00160018, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00630010, +}; + +// *INDENT-OFF* +Script M(script_8024097C) = { + SI_LABEL(1), + SI_IF_EQ(SI_AREA_FLAG(8), 1), + SI_LABEL(100), + SI_CALL(0x802D4A5C, 294, 123, 170), + SI_CALL(0x80044CF0, 0, 0), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x802CE01C, 0, SI_FIXED(4.0f)), + SI_CALL(0x802CE0F4, 0, 0x9D0003), + SI_CALL(func_802401B0_8C8140), + SI_CALL(0x802D4830, 0, SI_VAR(2)), + SI_LOOP(SI_VAR(1)), + SI_CALL(0x802CF0F4, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)), + SI_CALL(0x802D4B14, SI_VAR(7), SI_VAR(9), SI_FIXED(4.0f), SI_VAR(2)), + SI_CALL(0x802CDCB0, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)), + SI_WAIT_FRAMES(1), + SI_END_LOOP(), + SI_CALL(0x802D1B04, 0, 3), + SI_CALL(0x802D1024, SI_FIXED(3.0f)), + SI_CALL(0x802D1134, 243, 243, 0), + SI_CALL(0x80045320, 0, 0, 1), + SI_CALL(0x80044CF0, 0, 1), + SI_CALL(0x802D0E28, 0), + SI_GOTO(100), + SI_END_IF(), + SI_WAIT_FRAMES(1), + SI_GOTO(1), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script M(script_NpcAI_80240B50) = { + SI_LABEL(1), + SI_SWITCH(SI_SAVE_VAR(0)), + SI_CASE_EQ(0xFFFFFF86), + SI_LABEL(89), + SI_CALL(UnkPositionFunc, 0xFFFFFF8A, 86, 0xFFFFFFBA, 0xFFFFFFF1), + SI_WAIT_FRAMES(1), + SI_IF_EQ(SI_VAR(0), 0), + SI_GOTO(89), + SI_END_IF(), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x80044DA4, 0, 0), + SI_CALL(0x802D01AC, 0, 610, 0), + SI_CALL(0x802D78A0, 0, 0, 45, 15, 1, 0, 0, 0, 0), + SI_WAIT_FRAMES(15), + SI_CALL(0x802CECC8, -1, 5), + SI_WAIT_FRAMES(10), + SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A6), + SI_CALL(0x802CB860, 0, 0xFFFFFF24, 20, 0xFFFFFFB8), + SI_CALL(0x802CBE2C, 0, 0xFFFFFFEC, 0, 68), + SI_CALL(0x802CBB48, 0, SI_FIXED(15.0f), SI_FIXED(-8.5f)), + SI_CALL(0x802CBBE4, 0, 275), + SI_CALL(0x802CBEF0, 0, SI_FIXED(1.5f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_THREAD(), + SI_WAIT_FRAMES(20), + SI_CALL(0x802D1024, SI_FIXED(2.0f)), + SI_CALL(0x802D1134, 0xFFFFFFDA, 68, 0), + SI_END_THREAD(), + SI_CALL(0x802CF0F4, 0, SI_VAR(7), SI_VAR(8), SI_VAR(9)), + SI_CALL(0x802CE01C, 0, SI_FIXED(4.0f)), + SI_CALL(0x802CE0F4, 0, 0x9D0003), + SI_CALL(0x802CE22C, 0, 0, 70, 0), + SI_CALL(0x802CE0F4, 0, 0x9D0001), + SI_CALL(0x802CEB04, 0, 276, 20), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A7), + SI_WAIT_FRAMES(5), + SI_CALL(0x802D1084, 0x80007), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D02B0, 0, 0x9D0008, 0x9D0001, 0, 0xB00A8), + SI_CALL(func_80240000_8C7F90, 0, 5), + SI_SET(SI_SAVE_VAR(0), 0xFFFFFF87), + SI_CALL(0x802CB860, 0, 0xFFFFFF24, 20, 0xFFFFFFB8), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 0), + SI_CALL(0x802CF52C), + SI_CALL(0x802D0E28, 0), + SI_WAIT_FRAMES(1), + SI_END_SWITCH(), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script M(script_Hit_80240F64) = { + SI_CALL(0x802CE0F4, -1, 0x9D0007), + SI_WAIT_FRAMES(10), + SI_CALL(0x802CE0F4, -1, 0x9D0001), + SI_ADD(SI_MAP_VAR(0), 1), + SI_IF_LT(SI_MAP_VAR(0), 3), + SI_CALL(0x80044600, SI_VAR(0)), + SI_SWITCH(SI_VAR(0)), + SI_CASE_EQ(2), + SI_CALL(0x80045320, 0, 0, 1), + SI_IF_EQ(SI_AREA_FLAG(6), 1), + SI_ELSE(), + SI_SET(SI_AREA_FLAG(6), 1), + SI_SET(SI_AREA_FLAG(7), 0), + SI_END_IF(), + SI_CASE_EQ(4), + SI_CALL(0x80045320, 0, 0, 1), + SI_IF_EQ(SI_AREA_FLAG(7), 1), + SI_ELSE(), + SI_SET(SI_AREA_FLAG(6), 0), + SI_SET(SI_AREA_FLAG(7), 1), + SI_END_IF(), + SI_END_SWITCH(), + SI_WAIT_FRAMES(10), + SI_CALL(0x802CE0F4, -1, 0x9D0003), + SI_ELSE(), + SI_WAIT_FRAMES(10), + SI_CALL(0x802CF0F4, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CDCB0, 0xFFFFFFFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CF060, 0xFFFFFFFC, 512, 1), + SI_CALL(0x802CDCB0, 0, 0, 0xFFFFFC18, 0), + SI_CALL(0x802CF060, 0, 256, 0), + SI_CALL(0x802CF52C), + SI_CALL(0x80044DA4, -1, M(script_8024097C)), + SI_CALL(0x80044A78, -1, M(script_NpcAI_80240B50)), + SI_END_IF(), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script M(script_Init_802411A8) = { + SI_CALL(0x80044BAC, -1, M(script_NpcAI_80240B50)), + SI_CALL(0x80044EB8, -1, M(script_8024097C)), + SI_CALL(0x80045140, -1, M(script_Hit_80240F64)), + SI_SWITCH(SI_SAVE_VAR(0)), + SI_CASE_GE(0xFFFFFF87), + SI_CALL(0x802CF060, -1, 512, 0), + SI_CALL(0x802CF060, -1, 8, 1), + SI_CALL(0x802CDCB0, -1, 0, 0xFFFFFC18, 0), + SI_END_SWITCH(), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +s32 M(npcGroup_80241260)[] = { + 0x00000000, M(npcSettings_80240950), 0xC2480000, 0x00000000, 0x42A00000, 0x00400105, M(script_Init_802411A8), 0x00000000, + 0x00000000, 0x0000002D, 0x80000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00007FFF, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x009D0001, 0x009D0002, 0x009D0003, 0x009D0003, 0x009D0001, 0x009D0001, 0x009D0000, 0x009D0000, + 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, 0x009D0003, + 0x00000000, 0x00000000, 0x00000000, 0x001A0063, +}; + +s32 M(npcGroupList_80241450)[] = { + 0x00000001, M(npcGroup_80241260), 0x00020000, 0x00000000, 0x00000000, 0x00000000, +}; + +s32 padding2[] = {0, 0}; + +// 8C9400 +Script M(script_80241470) = { + SI_CALL(0x802C9DCC, 0, 9, 0x7FFFFE00), + SI_SET(SI_SAVE_VAR(0), 0xFFFFFF8B), + SI_RETURN(), + SI_END(), +}; + +Script M(script_802414A8) = { + SI_SET(SI_SAVE_FLAG(54), 1), + SI_RETURN(), + SI_END(), +}; + +Script M(script_802414C8) = { + SI_LABEL(0), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CAF2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_WAIT_FRAMES(1), + SI_GOTO(0), + SI_RETURN(), + SI_END(), +}; + +// *INDENT-OFF* +Script M(script_MakeEntities) = { + SI_IF_LT(SI_SAVE_VAR(0), 0xFFFFFF8B), + SI_CALL(0x80111D38, 0x802EA10C, 45, 0, 70, 15, 0x80000000), + SI_CALL(0x80111FB0, M(script_80241470)), + SI_ELSE(), + SI_CALL(0x802C9DCC, 0, 9, 0x7FFFFE00), + SI_END_IF(), + SI_IF_EQ(SI_SAVE_FLAG(54), 0), + SI_CALL(0x80111D38, 0x802EA19C, 230, 0, 310, 15, 0x80000000), + SI_CALL(0x80111FB0, M(script_802414A8)), + SI_END_IF(), + SI_CALL(0x80111D38, 0x802EA588, 230, 60, 310, 15, 151, 0x80000000), + SI_CALL(0x8011206C, SI_SAVE_FLAG(52)), + SI_CALL(0x80111D38, 0x802EA0C4, 230, 50, 0xFFFFFF60, 15, 0x80000000), + SI_CALL(0x80111D38, 0x802EA0C4, 165, 0, 380, 20, 0x80000000), + SI_CALL(0x80111D38, 0x802EA564, 0xFFFFFF56, 0, 370, 43, 343, 0x80000000), + SI_CALL(0x8011206C, SI_SAVE_FLAG(50)), + SI_CALL(0x80111D38, 0x802EAA54, 345, 75, 0xFFFFFF06, 0, 100, 0x80000000), + SI_CALL(0x802D6CC0, 343, 345, 205, 0xFFFFFF06, 17, SI_SAVE_FLAG(56)), + SI_CALL(0x802D6CC0, 343, 345, 230, 0xFFFFFF06, 17, SI_SAVE_FLAG(57)), + SI_CALL(0x802D6CC0, 343, 345, 255, 0xFFFFFF06, 17, SI_SAVE_FLAG(58)), + SI_CALL(0x802D6CC0, 343, 345, 280, 0xFFFFFF06, 17, SI_SAVE_FLAG(59)), + SI_CALL(0x802D6CC0, 128, 229, 250, 0xFFFFFF64, 17, SI_SAVE_FLAG(49)), + SI_CALL(0x80111D38, 0x802EAB04, 300, 0, 150, 0, 18, 0x80000000), + SI_CALL(0x80112114, SI_SAVE_FLAG(88)), + SI_CALL(0x80111D38, 0x802EA7E0, 130, 60, 0, 0, 0x80000000), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index 2b085c7e07..157a7769f1 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -2,3 +2,336 @@ #include "world/common/SomeMatrixOperations.inc.c" +// 8C9780 +// *INDENT-OFF* +Script M(script_SearchBush_802417F0) = { + SI_USE_BUFFER(SI_VAR(0)), + SI_CMD(0x34, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84), + SI_CALL(0x802D1DFC, SI_VAR(5), SI_VAR(15), SI_VAR(7)), + SI_THREAD(), + SI_SET(SI_FLAG(0), 0), + SI_IF_NE(SI_VAR(1), 0), + SI_LOOP(5), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), 1, SI_VAR(15), 0), + SI_IF_EQ(SI_FLAG(0), 0), + SI_SET(SI_FLAG(0), 1), + SI_CALL(0x802CA558, SI_VAR(3), 339, 0), + SI_END_IF(), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), -1, SI_VAR(15), 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_LOOP(), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(0x802C8B60, SI_VAR(3), 0, 0, 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_IF(), + SI_END_THREAD(), + SI_THREAD(), + SI_IF_NE(SI_VAR(2), 0), + SI_USE_BUFFER(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_LOOP(SI_VAR(3)), + SI_CMD(0x31, 0xFE363C84), + SI_CMD(0x33, 0xFE363C85, 0xFE363C86, 0xFE363C87), + SI_CMD(0x33, 0xFE363C88, 0xFE363C89, 0xFE363C8A), + SI_IF_EQ(SI_VAR(10), 0), + SI_CALL(0x802D6DC0, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)), + SI_ELSE(), + SI_CALL(0x802D593C, SI_VAR(10), SI_VAR(11)), + SI_IF_EQ(SI_VAR(11), 0), + SI_CALL(0x802D58E0, SI_VAR(10), 1), + SI_CALL(0x802D6DC0, SI_VAR(4), SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9)), + SI_END_IF(), + SI_END_IF(), + SI_END_LOOP(), + SI_END_IF(), + SI_END_THREAD(), + SI_WAIT_FRAMES(15), + SI_IF_NE(SI_VAR(4), 0), + SI_EXEC_WAIT(0xFE363C84), + SI_END_IF(), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +// *INDENT-OFF* +Script M(script_ShakeTree_80241B50) = { + SI_TIMESCALE(SI_FIXED(2.0f)), + SI_USE_BUFFER(SI_VAR(0)), + SI_CMD(0x34, 0xFE363C81, 0xFE363C82, 0xFE363C83, 0xFE363C84), + SI_CMD(0x31, 0xFE363C85), + SI_CALL(0x802D1DFC, SI_VAR(6), SI_VAR(15), SI_VAR(8)), + SI_CALL(0x802D6150, 357), + SI_CALL(0x802D6150, 358), + SI_THREAD(), + SI_SET(SI_FLAG(0), 0), + SI_IF_NE(SI_VAR(1), 0), + SI_WAIT_FRAMES(1), + SI_LOOP(5), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), SI_FIXED(0.2), SI_VAR(15), 0), + SI_IF_EQ(SI_FLAG(0), 0), + SI_SET(SI_FLAG(0), 1), + SI_CALL(0x802CA558, SI_VAR(3), 358, 0), + SI_END_IF(), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(SomeMatrixOperation2, SI_VAR(3), SI_FIXED(0.1), SI_FIXED(-0.2), SI_VAR(15), 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_LOOP(), + SI_USE_BUFFER(SI_VAR(1)), + SI_CMD(0x31, 0xFE363C82), + SI_LOOP(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_CALL(0x802C8B60, SI_VAR(3), 0, 0, 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_IF(), + SI_END_THREAD(), + SI_THREAD(), + SI_SET(SI_FLAG(0), 0), + SI_IF_NE(SI_VAR(2), 0), + SI_LOOP(5), + SI_USE_BUFFER(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_LOOP(SI_VAR(3)), + SI_CMD(0x31, 0xFE363C84), + SI_CALL(SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1), SI_FIXED(0.2), SI_VAR(15), 0), + SI_IF_EQ(SI_FLAG(0), 0), + SI_SET(SI_FLAG(0), 1), + SI_CALL(0x802CA558, SI_VAR(4), 357, 0), + SI_END_IF(), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_USE_BUFFER(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_LOOP(SI_VAR(3)), + SI_CMD(0x31, 0xFE363C84), + SI_CALL(SomeMatrixOperation2, SI_VAR(4), SI_FIXED(0.1), SI_FIXED(-0.2), SI_VAR(15), 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_LOOP(), + SI_USE_BUFFER(SI_VAR(2)), + SI_CMD(0x31, 0xFE363C83), + SI_LOOP(SI_VAR(3)), + SI_CMD(0x31, 0xFE363C84), + SI_CALL(0x802C8B60, SI_VAR(4), 0, 0, 0), + SI_END_LOOP(), + SI_WAIT_FRAMES(1), + SI_END_IF(), + SI_END_THREAD(), + SI_THREAD(), + SI_IF_NE(SI_VAR(3), 0), + SI_USE_BUFFER(SI_VAR(3)), + SI_CMD(0x31, 0xFE363C84), + SI_LOOP(SI_VAR(4)), + SI_CMD(0x31, 0xFE363C85), + SI_CMD(0x33, 0xFE363C86, 0xFE363C87, 0xFE363C88), + SI_CMD(0x33, 0xFE363C89, 0xFE363C8A, 0xFE363C8B), + SI_IF_EQ(SI_VAR(11), 0), + SI_CALL(0x802D6DC0, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)), + SI_ELSE(), + SI_CALL(0x802D593C, SI_VAR(11), SI_VAR(12)), + SI_IF_EQ(SI_VAR(12), 0), + SI_CALL(0x802D58E0, SI_VAR(11), 1), + SI_CALL(0x802D6DC0, SI_VAR(5), SI_VAR(6), SI_VAR(7), SI_VAR(8), SI_VAR(9), SI_VAR(10)), + SI_END_IF(), + SI_END_IF(), + SI_END_LOOP(), + SI_END_IF(), + SI_END_THREAD(), + SI_THREAD(), + SI_IF_NE(SI_VAR(4), 0), + SI_USE_BUFFER(SI_VAR(4)), + SI_CMD(0x31, 0xFE363C85), + SI_LOOP(SI_VAR(5)), + SI_CMD(0x33, 0xFE363C86, 0xFE363C87, 0xFE363C88), + SI_CALL(0x802D829C, 20, 0, SI_VAR(6), SI_VAR(7), SI_VAR(8), 100, 0, 0, 0, 0, 0, 0, 0, 0), + SI_END_LOOP(), + SI_END_IF(), + SI_END_THREAD(), + SI_IF_NE(SI_VAR(5), 0), + SI_EXEC_WAIT(0xFE363C85), + SI_END_IF(), + SI_WAIT_FRAMES(15), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +s32 M(treeModelList_Bush1_Bush)[] = { + 0x00000001, 0x00000040, +}; + +s32 M(treeEffectVectors_Bush1)[] = { + 0x00000001, 0x0000008F, 0x00000010, 0x000001CE, +}; + +s32 M(searchBushEvent_Bush1)[] = { + M(treeModelList_Bush1_Bush), 0x00000000, M(treeEffectVectors_Bush1), 0x00000000, +}; + +s32 M(treeModelList_Tree1_Leaves)[] = { + 0x00000001, 0x0000003E, +}; + +s32 M(treeModelList_Tree1_Trunk)[] = { + 0x00000001, 0x0000003D, +}; + +s32 M(treeEffectVectors_Tree1)[] = { + 0x00000002, 0xFFFFFFB0, 0x00000082, 0x00000012, 0x0000001C, 0x00000082, 0x00000027, +}; + +// *INDENT-OFF* +Script M(script_Tree1_Callback) = { + SI_IF_EQ(SI_SAVE_FLAG(53), 1), + SI_RETURN(), + SI_END_IF(), + SI_IF_EQ(SI_MAP_FLAG(10), 1), + SI_RETURN(), + SI_END_IF(), + SI_WAIT_FRAMES(10), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_IF_LT(SI_VAR(0), 0xFFFFFFE2), + SI_CALL(0x802D6CC0, 138, 0xFFFFFFE9, 100, 35, 13, SI_SAVE_FLAG(53)), + SI_ELSE(), + SI_CALL(0x802D6CC0, 138, 0xFFFFFFAB, 100, 16, 13, SI_SAVE_FLAG(53)), + SI_END_IF(), + SI_SET(SI_MAP_FLAG(10), 1), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* + +s32 M(shakeTreeEvent_Tree1)[] = { + M(treeModelList_Tree1_Leaves), M(treeModelList_Tree1_Trunk), 0x00000000, M(treeEffectVectors_Tree1), M(script_Tree1_Callback), +}; + +s32 M(triggerCoord_802422A8)[] = { + 0xC2280000, 0x00000000, 0xC1500000, 0x00000000, +}; + +Script M(script_802422B8) = { + SI_SET(SI_VAR(0), M(searchBushEvent_Bush1)), + SI_BIND(M(script_SearchBush_802417F0), TriggerFlag_WALL_INTERACT, 53, NULL), + SI_SET(SI_VAR(0), M(shakeTreeEvent_Tree1)), + SI_BIND(M(script_ShakeTree_80241B50), TriggerFlag_WALL_HAMMER, 52, NULL), + SI_BIND(M(script_ShakeTree_80241B50), TriggerFlag_BOMB, M(triggerCoord_802422A8), NULL), + SI_RETURN(), + SI_END(), +}; + +s32 padding3[] = {0}; + +// 8CA2D0 +// *INDENT-OFF* +Script M(script_80242340) = { + SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), + SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), + SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)), + SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89), + SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0), + SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0), + SI_WAIT_FRAMES(20), + SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 0), + SI_CALL(0x802D0E28, 0), + SI_RETURN(), + SI_END_IF(), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x802D0DE4, 1), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)), + SI_WAIT_FRAMES(30), + SI_CALL(0x802CBBE4, 0, 220), + SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_THREAD(), + SI_WAIT_FRAMES(18), + SI_CALL(0x802D2CD8, 373, 0), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D2CD8, 374, 0), + SI_WAIT_FRAMES(28), + SI_CALL(0x802D2CD8, 373, 0), + SI_END_THREAD(), + SI_CALL(0x802D0DA0, 1), + SI_CALL(0x802D1084, 0x10002), + SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0), + SI_CALL(0x802D193C, 90, 0), + SI_LABEL(0), + SI_WAIT_FRAMES(1), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_ADD(SI_VAR(1), 0xFFFFFFFE), + SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_IF_GT(SI_VAR(1), 86), + SI_GOTO(0), + SI_END_IF(), + SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0), + SI_THREAD(), + SI_WAIT_FRAMES(20), + SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0), + SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_END_THREAD(), + SI_CALL(0x802D286C, 0x2800), + SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0), + SI_WAIT_FRAMES(100), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0), + SI_CALL(0x802D0DA0, 0), + SI_CALL(0x802D1084, 0x10006), + SI_WAIT_FRAMES(10), + SI_CALL(0x802D1084, 0x10007), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802D1054, SI_FIXED(1.0f)), + SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10), + SI_CALL(0x802D1084, 0x10002), + SI_THREAD(), + SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 0), + SI_END_THREAD(), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D0DE4, 0), + SI_CALL(0x802D0E28, 0), + SI_RETURN(), + SI_END(), +}; diff --git a/src/world/area_kmr/kmr_03/kmr_03.h b/src/world/area_kmr/kmr_03/kmr_03.h index b813b64200..2e655ab085 100644 --- a/src/world/area_kmr/kmr_03/kmr_03.h +++ b/src/world/area_kmr/kmr_03/kmr_03.h @@ -2,3 +2,7 @@ #include "map.h" #define MAP_NAME kmr_03 + +ApiStatus func_80240000_8C7F90(ScriptInstance* script, s32 isInitialCall); +Script M(Main); +Script M(script_802406C0); diff --git a/tools/splat.yaml b/tools/splat.yaml index 68395935ff..6bdebe26ff 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -1359,15 +1359,16 @@ segments: vram: 0x80240000 files: - [0x8C7F90, "c"] + - [0x8C8140, "c"] - [0x8C82B0, "c"] - [0x8C83A0, "c"] - - [0x8C85E0, "bin"] - - [0x8C8680, "bin"] - - [0x8C88E0, "bin"] - - [0x8C9400, "bin"] - - [0x8C9780, "bin"] - - [0x8CA2D0, "bin"] - - [0x8CA8F0, "bin"] # rodata + - [0x8C85E0, ".data", "world/area_kmr/kmr_03/8C7F90"] + - [0x8C8680, ".data", "world/area_kmr/kmr_03/8C8140"] + - [0x8C88E0, ".data", "world/area_kmr/kmr_03/8C82B0"] + # - [0x8C9400, "bin"] + - [0x8C9780, ".data", "world/area_kmr/kmr_03/8C83A0"] + # - [0x8CA2D0, "bin"] + - [0x8CA8F0, ".rodata", "world/area_kmr/kmr_03/8C8140"] - name: world/area_kmr/kmr_04/ type: code overlay: True From 44fd38f4f80fbb70f2b8c0735839be8101d6923f Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 18:30:16 +0000 Subject: [PATCH 27/45] add image splits --- .gitignore | 1 + .vscode/settings.json | 1 - Makefile | 50 +++++++++-- requirements.txt | 1 + sources.mk | 3 + tools/convert_image.py | 193 +++++++++++++++++++++++++++++++++++++++++ tools/n64splat | 2 +- tools/splat.yaml | 69 ++++++++++++++- 8 files changed, 309 insertions(+), 11 deletions(-) create mode 100755 tools/convert_image.py diff --git a/.gitignore b/.gitignore index e08969475e..3600fdfb40 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ settings.mk *.i *.Yay0 bin/ +img/ build/ docs/doxygen/ include/ld_addrs.h diff --git a/.vscode/settings.json b/.vscode/settings.json index b9a9ded7bd..c2b3c50402 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,6 @@ "-D_LANGUAGE_C", "-DSCRIPT(...)={}", ], - "python.pythonPath": "/usr/bin/python3", "git.ignoreLimitWarning": true, "search.exclude": { "build": true, diff --git a/Makefile b/Makefile index ece296eab5..fcdcdbf959 100644 --- a/Makefile +++ b/Makefile @@ -98,14 +98,14 @@ submodules: git submodule update --init --recursive split: - rm -rf bin - $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS + rm -rf bin img + $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8 -split-bin: - $(SPLAT) --modes ld bin +split-%: + $(SPLAT) --modes ld $* split-all: - rm -rf bin + rm -rf bin img $(SPLAT) --modes all test: $(ROM) @@ -137,13 +137,51 @@ $(BUILD_DIR)/%.c.o: %.c $(MDEPS) # Compile C files (with DSL macros) $(foreach cfile, $(DSL_C_FILES), $(BUILD_DIR)/$(cfile).o): $(BUILD_DIR)/%.c.o: %.c $(MDEPS) @mkdir -p $(shell dirname $@) - $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - + $(CPP) $(CPPFLAGS) -o - $< $(CPPMFLAGS) | $(PYTHON) tools/compile_dsl_macros.py | $(CC) $(CFLAGS) -o - | $(OLD_AS) $(OLDASFLAGS) -o $@ - # Assemble handwritten ASM $(BUILD_DIR)/%.s.o: %.s @mkdir -p $(shell dirname $@) $(AS) $(ASFLAGS) -o $@ $< +# Images +$(BUILD_DIR)/%.png.o: $(BUILD_DIR)/%.png + $(LD) -r -b binary -o $@ $< +$(BUILD_DIR)/%.rgba16.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py rgba16 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.rgba32.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py rgba32 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ci8.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ci8palette.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ci4.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ci4palette.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ia4.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ia8.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ia8 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.ia16.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py ia16 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.i4.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py i4 $< $@ $(IMG_FLAGS) +$(BUILD_DIR)/%.i8.png: %.png + @mkdir -p $(shell dirname $@) + $(PYTHON) tools/convert_image.py i8 $< $@ $(IMG_FLAGS) + + ASSET_FILES := $(foreach asset, $(ASSETS), $(BUILD_DIR)/bin/assets/$(asset)) YAY0_ASSET_FILES := $(foreach asset, $(filter-out %_tex, $(ASSET_FILES)), $(asset).Yay0) diff --git a/requirements.txt b/requirements.txt index 361a2122c4..450238e89e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ capstone PyYAML lark-parser +pypng diff --git a/sources.mk b/sources.mk index 47d7169a4c..f2c0e86888 100644 --- a/sources.mk +++ b/sources.mk @@ -55,3 +55,6 @@ ASSETS := \ kmr_bg nok_bg sbk_bg sbk3_bg iwa_bg hos_bg arn_bg obk_bg omo_bg yos_bg jan_bg fla_bg flb_bg sra_bg yki_bg sam_bg kpa_bg title_bg \ title_data \ party_kurio party_kameki party_pinki party_pareta party_resa party_akari party_opuku party_pokopi + +# Image settings +$(BUILD_DIR)/img/battle/text_action_command_ratings.ia4.png: IMG_FLAGS = --flip-y diff --git a/tools/convert_image.py b/tools/convert_image.py new file mode 100755 index 0000000000..afc92d94bc --- /dev/null +++ b/tools/convert_image.py @@ -0,0 +1,193 @@ +#! /usr/bin/python3 + +from sys import argv, stderr +from math import floor, ceil +from itertools import zip_longest +import png + +def unpack_color(s): + r = (s >> 11) & 0x1F + g = (s >> 6) & 0x1F + b = (s >> 1) & 0x1F + a = (s & 1) * 0xFF + + r = ceil(0xFF * (r / 31)) + g = ceil(0xFF * (g / 31)) + b = ceil(0xFF * (b / 31)) + + return r, g, b, a + +def pack_color(r, g, b, a): + r = floor(31 * (r / 255)) + g = floor(31 * (g / 255)) + b = floor(31 * (b / 255)) + + s = round(a / 0xFF) + s |= (r & 0x1F) << 11 + s |= (g & 0x1F) << 6 + s |= (b & 0x1F) << 1 + + return s + +def rgb_to_intensity(r, g, b): + return round(r * 0.2126 + g * 0.7152 + 0.0722 * b) + +def iter_in_groups(iterable, n, fillvalue=None): + args = [iter(iterable)] * n + return zip_longest(*args, fillvalue=fillvalue) + + + +def reversed_if(iterator, cond): + if cond: + return reversed(list(iterator)) + else: + return iterator + +class Converter(): + def __init__(self, mode, infile, outfile, *argv): + self.mode = mode + self.infile = infile + self.outfile = outfile + self.flip_y = "--flip-y" in argv + + self.warned = False + + def warn(self, msg): + if not self.warned: + self.warned = True + print(self.infile + ": warning: " + msg, file=stderr) + + def convert(self): + img = png.Reader(self.infile) + + if self.mode == "rgba32": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + f.write(row) + elif self.mode == "rgba16": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for rgba in iter_in_groups(row, 4): + if rgba[3] not in (0, 0xFF): + self.warn("alpha mask mode but translucent pixels used") + + color = pack_color(*rgba) + f.write(color.to_bytes(2, byteorder="big")) + elif self.mode == "ci8": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.read()[2], self.flip_y): + f.write(row) + elif self.mode == "ci4": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.read()[2], self.flip_y): + for a, b in iter_in_groups(row, 2): + byte = (a << 4) | b + f.write(byte.to_bytes(1, byteorder="big")) + elif self.mode == "ci8palette" or self.mode == "ci4palette": + img.preamble(True) + palette = img.palette(alpha="force") + + with open(self.outfile, "wb") as f: + for rgba in palette: + if rgba[3] not in (0, 0xFF): + self.warn("alpha mask mode but translucent pixels used") + + color = pack_color(*rgba) + f.write(color.to_bytes(2, byteorder="big")) + elif self.mode == "ia4": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for c1, c2 in iter_in_groups(iter_in_groups(row, 4), 2): + i1 = rgb_to_intensity(*c1[:3]) + a1 = c1[3] + + i2 = rgb_to_intensity(*c2[:3]) + a2 = c2[3] + + i1 = floor(7 * (i1 / 0xFF)) + i2 = floor(7 * (i2 / 0xFF)) + + if a1 not in (0, 0xFF) or a2 not in (0, 0xFF): + self.warn("alpha mask mode but translucent pixels used") + if c1[0] != c1[1] != c1[2]: + self.warn("grayscale mode but image is not") + if c2[0] != c2[1] != c2[2]: + self.warn("grayscale mode but image is not") + + a1 = 1 if a1 > 128 else 0 + a2 = 1 if a2 > 128 else 0 + + h = (i1 << 1) | a1 + l = (i2 << 1) | a2 + + byte = (h << 4) | l + f.write(byte.to_bytes(1, byteorder="big")) + elif self.mode == "ia8": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for rgba in iter_in_groups(row, 4): + i = rgb_to_intensity(*rgba[:3]) + a = rgba[3] + + i = floor(15 * (i / 0xFF)) + a = floor(15 * (a / 0xFF)) + + if rgba[0] != rgba[1] != rgba[2]: + self.warn("grayscale mode but image is not") + + byte = (i << 4) | a + f.write(byte.to_bytes(1, byteorder="big")) + elif self.mode == "ia16": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for rgba in iter_in_groups(row, 4): + i = rgb_to_intensity(*rgba[:3]) + a = rgba[3] + + if rgba[0] != rgba[1] != rgba[2]: + self.warn("grayscale mode but image is not") + + f.write(bytes((i, a))) + elif self.mode == "i4": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for c1, c2 in iter_in_groups(iter_in_groups(row, 4), 2): + if c1[3] != 0xFF or c2[3] != 0xFF: + self.warn("discarding alpha channel") + + i1 = rgb_to_intensity(*c1[:3]) + i2 = rgb_to_intensity(*c2[:3]) + + i1 = floor(15 * (i1 / 0xFF)) + i2 = floor(15 * (i2 / 0xFF)) + + if c1[0] != c1[1] != c1[2]: + self.warn("grayscale mode but image is not") + if c2[0] != c2[1] != c2[2]: + self.warn("grayscale mode but image is not") + + byte = (i1 << 4) | i2 + f.write(byte.to_bytes(1, byteorder="big")) + elif self.mode == "i8": + with open(self.outfile, "wb") as f: + for row in reversed_if(img.asRGBA()[2], self.flip_y): + for rgba in iter_in_groups(row, 4): + if rgba[3] != 0xFF or rgba[3] != 0xFF: + self.warn("discarding alpha channel") + if rgba[0] != rgba[1] != rgba[2]: + self.warn("grayscale mode but image is not") + + i = rgb_to_intensity(*rgba[:3]) + f.write(i.to_bytes(1, byteorder="big")) + else: + print("unsupported mode", file=stderr) + exit(1) + + +if __name__ == "__main__": + if len(argv) < 4: + print("usage: convert_image.py MODE INFILE OUTFILE [--flip-y]") + exit(1) + + Converter(*argv[1:]).convert() diff --git a/tools/n64splat b/tools/n64splat index 037d80e00c..6443fba42f 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 037d80e00cb3aeae37bdad77bfac871036982456 +Subproject commit 6443fba42f530ef99187a79cd93b9e5d95161ef7 diff --git a/tools/splat.yaml b/tools/splat.yaml index 68395935ff..61fc4ee65e 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -212,6 +212,14 @@ segments: - [0x8a860, "c", "code_8a860_len_3f30"] - [0x8e790, "c", "code_8e790_len_2850"] - [0x90fe0, "bin"] + - [0x93CD0, ci4, ui/hammer, 32, 32] + - [0x93ED0, ci4palette, ui/hammer] + - [0x93EF0, ci4palette, ui/hammer.disabled] + - [0x93FF0, bin] + - [0x9D658, rgba32, ui/stat_heart, 16, 16] + - [0x9DA58, bin] + - [0x9DA60, rgba32, ui/stat_flower, 16, 16] + - [0x9DE60, bin] - type: code start: 0xA5DD0 vram: 0x8010F6D0 @@ -268,8 +276,17 @@ segments: - [0x1086a0, "c", "code_1086a0_len_fc0"] - [0x109660, "c", "code_109660_len_1270"] - [0x10A8D0, "c", "code_10A8D0"] - - [0x10A9F0, "bin"] # todo split this further - - [0x131340, "bin"] # 0x8023E000 + - [0x10A9F0, i4, shadow/square, 16, 16] + - [0x10AA70, i4, shadow/circle, 16, 16] + - [0x10AAF0, bin] + - [0x10AB70, i4, shadow/10AB70, 32, 32] + - [0x10AD70, i4, shadow/10AD70, 32, 32] + - [0x10AF70, bin] # TODO + - [0x1164B8, ci8, peach_letter, 150, 105] + - [0x11A23E, bin] + - [0x11A240, ci8palette, peach_letter] + - [0x11A440, bin] + - [0x131340, bin] - type: code start: 0x135EE0 vram: 0x80242BA0 @@ -280,6 +297,28 @@ segments: - [0x140C70, "c"] - [0x1421C0, "c"] - [0x1422A0, "bin"] + - [0x1443F0, ci8, pause/world_map, 320, 320] + - [0x15D3F0, ci8palette, pause/world_map] + - [0x15D5F0, ci4, pause/spirits_bg, 128, 110] + - [0x15F170, ci4palette, pause/spirits_bg] + - [0x15F270, bin] + - [0x15F970, ci4, pause/banner_hp, 64, 16] + - [0x15FB70, ci4palette, pause/banner_hp] + - [0x15FD70, ci4, pause/banner_fp, 64, 16] + - [0x15FF70, ci4palette, pause/banner_fp] + - [0x160170, ci4, pause/banner_bp, 64, 16] + - [0x160370, ci4palette, pause/banner_bp] + - [0x160570, ci4, pause/banner_boots, 48, 16] + - [0x1606F0, ci4palette, pause/banner_boots] + - [0x1608F0, ci4, pause/banner_hammer, 48, 16] + - [0x160A70, ci4palette, pause/banner_hammer] + - [0x160C70, ci4, pause/banner_star_energy, 48, 16] + - [0x160DF0, ci4palette, pause/banner_star_energy] + - [0x160FF0, ci4, pause/available, 64, 16] + - [0x1611F0, ci4palette, pause/available] + - [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16] + - [0x1617F0, ci4palette, pause/prompt_check_abilities] + - [0x1619F0, bin] - type: code start: 0x163400 vram: 0x80242BA0 @@ -313,6 +352,21 @@ segments: - [0x1AF230, "c"] - [0x1AF2D0, "bin"] - [0x1CC310, "bin"] # icon images and palettes, vram unknown + - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] + - [0x2051B0, rgba16, title/logo_is, 256, 122] + - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] + - [0x2191B0, ci8, title/bg_1, 264, 162] + - [0x2238C0, ci8palette, title/bg_1] + - [0x223AC0, ci8, title/bg_2, 264, 162] + - [0x22E1D0, ci8palette, title/bg_2] + - [0x22E3D0, ci8, title/bg_3, 264, 162] + - [0x238AE0, ci8palette, title/bg_3] + - [0x238CE0, ci8, title/bg_4, 264, 162] + - [0x2433F0, ci8palette, title/bg_4] + - [0x2435F0, ia8, title/tape, 128, 128] + - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] + - [0x24B5F0, ci8palette, title/bowser_silhouette] + - [0x24B7F0, bin] - type: code start: 0x3169F0 vram: 0x80200000 @@ -482,13 +536,13 @@ segments: files: - [0x33CDF0, "c"] - [0x33d5d0, "bin"] + - [0x33D610, "bin"] - type: code start: 0x33E8C0 vram: 0xE002A000 files: - [0x33E8C0, "c"] - [0x33efe0, "bin"] - - [0x33D610, "bin"] - type: code start: 0x33FE80 vram: 0xE002C000 @@ -731,6 +785,13 @@ segments: - [0x38F900, "c"] - [0x390340, "bin"] - [0x3903D0, "bin"] + - start: 0x390810 + type: ia4 + name: battle/text_action_command_ratings + width: 64 + height: 125 + flip: vertical + - [0x3917B0, bin] - type: code start: 0x391D30 vram: 0xE0092000 @@ -814,6 +875,8 @@ segments: - [0x3BA030, "c"] - [0x3BAC60, "bin"] - [0x3BAEA0, "bin"] # todo split this further ADD STUFF AFTER HERE + - [0x3ED4E0, "ia8", "world/text_chapter", 128, 38] + - [0x3EE7E0, "bin"] - type: code start: 0x415D90 vram: 0x802A1000 From ca4c4b0507b5163449eee55726664886de3626e4 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 18:50:00 +0000 Subject: [PATCH 28/45] bump splat --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 6443fba42f..c8b324cdc0 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 6443fba42f530ef99187a79cd93b9e5d95161ef7 +Subproject commit c8b324cdc0072724ed78b90d2008f36c238b1a76 From bfbae5e26a7d1524947375ecf872a83cf0d7cea4 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 31 Oct 2020 15:04:45 -0400 Subject: [PATCH 29/45] remove padding3 --- src/world/area_kmr/kmr_03/8C83A0.c | 92 ------------------------------ src/world/area_kmr/kmr_03/8C85E0.c | 90 +++++++++++++++++++++++++++++ tools/splat.yaml | 3 +- 3 files changed, 92 insertions(+), 93 deletions(-) create mode 100644 src/world/area_kmr/kmr_03/8C85E0.c diff --git a/src/world/area_kmr/kmr_03/8C83A0.c b/src/world/area_kmr/kmr_03/8C83A0.c index 157a7769f1..de44b33c5e 100644 --- a/src/world/area_kmr/kmr_03/8C83A0.c +++ b/src/world/area_kmr/kmr_03/8C83A0.c @@ -2,7 +2,6 @@ #include "world/common/SomeMatrixOperations.inc.c" -// 8C9780 // *INDENT-OFF* Script M(script_SearchBush_802417F0) = { SI_USE_BUFFER(SI_VAR(0)), @@ -244,94 +243,3 @@ Script M(script_802422B8) = { SI_RETURN(), SI_END(), }; - -s32 padding3[] = {0}; - -// 8CA2D0 -// *INDENT-OFF* -Script M(script_80242340) = { - SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), - SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), - SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)), - SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)), - SI_CALL(0x802CB79C, 0, 0, 1), - SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89), - SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0), - SI_CALL(0x802D0E28, 1), - SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0), - SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0), - SI_WAIT_FRAMES(20), - SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), - SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CB79C, 0, 0, 1), - SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), - SI_CALL(0x802CB79C, 0, 0, 0), - SI_CALL(0x802D0E28, 0), - SI_RETURN(), - SI_END_IF(), - SI_CALL(0x802D0E28, 1), - SI_CALL(0x802D0DE4, 1), - SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)), - SI_WAIT_FRAMES(30), - SI_CALL(0x802CBBE4, 0, 220), - SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)), - SI_CALL(0x802CB79C, 0, 0, 1), - SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), - SI_THREAD(), - SI_WAIT_FRAMES(18), - SI_CALL(0x802D2CD8, 373, 0), - SI_WAIT_FRAMES(30), - SI_CALL(0x802D2CD8, 374, 0), - SI_WAIT_FRAMES(28), - SI_CALL(0x802D2CD8, 373, 0), - SI_END_THREAD(), - SI_CALL(0x802D0DA0, 1), - SI_CALL(0x802D1084, 0x10002), - SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0), - SI_CALL(0x802D193C, 90, 0), - SI_LABEL(0), - SI_WAIT_FRAMES(1), - SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_ADD(SI_VAR(1), 0xFFFFFFFE), - SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_IF_GT(SI_VAR(1), 86), - SI_GOTO(0), - SI_END_IF(), - SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0), - SI_THREAD(), - SI_WAIT_FRAMES(20), - SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0), - SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)), - SI_CALL(0x802CB79C, 0, 0, 1), - SI_END_THREAD(), - SI_CALL(0x802D286C, 0x2800), - SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0), - SI_WAIT_FRAMES(100), - SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), - SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0), - SI_CALL(0x802D0DA0, 0), - SI_CALL(0x802D1084, 0x10006), - SI_WAIT_FRAMES(10), - SI_CALL(0x802D1084, 0x10007), - SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802D1054, SI_FIXED(1.0f)), - SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10), - SI_CALL(0x802D1084, 0x10002), - SI_THREAD(), - SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), - SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), - SI_CALL(0x802CB79C, 0, 0, 1), - SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), - SI_CALL(0x802CB79C, 0, 0, 0), - SI_END_THREAD(), - SI_WAIT_FRAMES(30), - SI_CALL(0x802D0DE4, 0), - SI_CALL(0x802D0E28, 0), - SI_RETURN(), - SI_END(), -}; diff --git a/src/world/area_kmr/kmr_03/8C85E0.c b/src/world/area_kmr/kmr_03/8C85E0.c new file mode 100644 index 0000000000..b2a4a3b6b1 --- /dev/null +++ b/src/world/area_kmr/kmr_03/8C85E0.c @@ -0,0 +1,90 @@ +#include "kmr_03.h" + +// *INDENT-OFF* +Script M(script_80242340) = { + SI_CALL(0x802CB860, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), + SI_CALL(0x802CBE2C, 0, 0xFFFFFEF2, 20, 0xFFFFFFB0), + SI_CALL(0x802CBBE4, 0, SI_FIXED(700.0f)), + SI_CALL(0x802CBEF0, 0, SI_FIXED(90.0f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_IF_GE(SI_SAVE_VAR(0), 0xFFFFFF89), + SI_CALL(0x802D0EF0, 0, 0xFFFFFC18, 0), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x802D0EF0, 0xFFFFFF20, 20, 0xFFFFFFB0), + SI_CALL(0x802CDCB0, 0xFFFFFFFC, 0xFFFFFF20, 20, 0xFFFFFFB0), + SI_WAIT_FRAMES(20), + SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 0), + SI_CALL(0x802D0E28, 0), + SI_RETURN(), + SI_END_IF(), + SI_CALL(0x802D0E28, 1), + SI_CALL(0x802D0DE4, 1), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802D0EF0, SI_VAR(0), 0xFFFFFC18, SI_VAR(2)), + SI_WAIT_FRAMES(30), + SI_CALL(0x802CBBE4, 0, 220), + SI_CALL(0x802CBEF0, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_THREAD(), + SI_WAIT_FRAMES(18), + SI_CALL(0x802D2CD8, 373, 0), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D2CD8, 374, 0), + SI_WAIT_FRAMES(28), + SI_CALL(0x802D2CD8, 373, 0), + SI_END_THREAD(), + SI_CALL(0x802D0DA0, 1), + SI_CALL(0x802D1084, 0x10002), + SI_CALL(0x802D0EF0, 0xFFFFFF20, 120, 0xFFFFFFB0), + SI_CALL(0x802D193C, 90, 0), + SI_LABEL(0), + SI_WAIT_FRAMES(1), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_ADD(SI_VAR(1), 0xFFFFFFFE), + SI_CALL(0x802D0EF0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_IF_GT(SI_VAR(1), 86), + SI_GOTO(0), + SI_END_IF(), + SI_CALL(0x802D0EF0, 0xFFFFFECA, 20, 0xFFFFFFB0), + SI_THREAD(), + SI_WAIT_FRAMES(20), + SI_CALL(0x802CBE2C, 0, 0xFFFFFECA, 20, 0xFFFFFFB0), + SI_CALL(0x802CBEF0, 0, SI_FIXED(0.2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_END_THREAD(), + SI_CALL(0x802D286C, 0x2800), + SI_CALL(0x802D2520, 0x10002, 5, 5, 1, 1, 0), + SI_WAIT_FRAMES(100), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802D2520, 0x10002, 0, 0, 0, 0, 0), + SI_CALL(0x802D0DA0, 0), + SI_CALL(0x802D1084, 0x10006), + SI_WAIT_FRAMES(10), + SI_CALL(0x802D1084, 0x10007), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802D1054, SI_FIXED(1.0f)), + SI_CALL(0x802D18E8, SI_VAR(0), SI_VAR(1), SI_VAR(2), 10), + SI_CALL(0x802D1084, 0x10002), + SI_THREAD(), + SI_CALL(0x802CBEF0, 0, SI_FIXED(3.0f)), + SI_CALL(0x802D1DFC, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB860, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CBE2C, 0, SI_VAR(0), SI_VAR(1), SI_VAR(2)), + SI_CALL(0x802CB79C, 0, 0, 1), + SI_CALL(0x802CC354, 0, SI_FIXED(1.0f)), + SI_CALL(0x802CB79C, 0, 0, 0), + SI_END_THREAD(), + SI_WAIT_FRAMES(30), + SI_CALL(0x802D0DE4, 0), + SI_CALL(0x802D0E28, 0), + SI_RETURN(), + SI_END(), +}; +// *INDENT-ON* diff --git a/tools/splat.yaml b/tools/splat.yaml index 6bdebe26ff..12d0deebb3 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -1362,12 +1362,13 @@ segments: - [0x8C8140, "c"] - [0x8C82B0, "c"] - [0x8C83A0, "c"] + - [0x8C85E0, "c"] - [0x8C85E0, ".data", "world/area_kmr/kmr_03/8C7F90"] - [0x8C8680, ".data", "world/area_kmr/kmr_03/8C8140"] - [0x8C88E0, ".data", "world/area_kmr/kmr_03/8C82B0"] # - [0x8C9400, "bin"] - [0x8C9780, ".data", "world/area_kmr/kmr_03/8C83A0"] - # - [0x8CA2D0, "bin"] + - [0x8CA2D0, ".data", "world/area_kmr/kmr_03/8C85E0"] - [0x8CA8F0, ".rodata", "world/area_kmr/kmr_03/8C8140"] - name: world/area_kmr/kmr_04/ type: code From 0f3d65f7c9d283ecf1bca0a7409ca6a26f0d287d Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 31 Oct 2020 15:34:10 -0400 Subject: [PATCH 30/45] cleanup --- src/world/area_sam/sam_11/D3A930.c | 6 +----- src/world/common/Set80151310.inc.c | 5 +---- src/world/common/Set80151310_0.inc.c | 6 ++++++ 3 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/world/common/Set80151310_0.inc.c diff --git a/src/world/area_sam/sam_11/D3A930.c b/src/world/area_sam/sam_11/D3A930.c index a37071aeaf..cd04c7a33d 100644 --- a/src/world/area_sam/sam_11/D3A930.c +++ b/src/world/area_sam/sam_11/D3A930.c @@ -4,16 +4,12 @@ INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_80240360_D3A930); INCLUDE_ASM(s32, "world/area_sam/sam_11/D3A930", func_8024052C_D3AAFC); -// Almost the same as Set80151310, but we're setting it to 2 in the first func instead of 1 static ApiStatus Set80151310_2(ScriptInstance* script, s32 isInitialCall) { D_80151310 = 2; return ApiStatus_DONE2; } -static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { - D_80151310 = 0; - return ApiStatus_DONE2; -} +#include "world/common/Set80151310_0.inc.c" #include "world/common/UnsetCamera0MoveFlag1.inc.c" diff --git a/src/world/common/Set80151310.inc.c b/src/world/common/Set80151310.inc.c index 2223ab43f6..0f8f7d53a3 100644 --- a/src/world/common/Set80151310.inc.c +++ b/src/world/common/Set80151310.inc.c @@ -5,7 +5,4 @@ static ApiStatus Set80151310_1(ScriptInstance* script, s32 isInitialCall) { return ApiStatus_DONE2; } -static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { - D_80151310 = 0; - return ApiStatus_DONE2; -} +#include "world/common/Set80151310_0.inc.c" diff --git a/src/world/common/Set80151310_0.inc.c b/src/world/common/Set80151310_0.inc.c new file mode 100644 index 0000000000..953e1f4232 --- /dev/null +++ b/src/world/common/Set80151310_0.inc.c @@ -0,0 +1,6 @@ +#include "common.h" + +static ApiStatus Set80151310_0(ScriptInstance* script, s32 isInitialCall) { + D_80151310 = 0; + return ApiStatus_DONE2; +} From 9151bf2fe420a0d1a1b1f894c25a8d7070986c46 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sat, 31 Oct 2020 15:35:43 -0400 Subject: [PATCH 31/45] NotDoesScriptExist -> AwaitScriptComplete --- src/world/area_dro/dro_02/9694C0.c | 2 +- src/world/area_hos/hos_03/A1BDB0.c | 2 +- src/world/area_jan/jan_03/B34BD0.c | 2 +- src/world/area_kkj/kkj_20/AFDE00.c | 2 +- src/world/area_kmr/kmr_02/8B30E0.c | 2 +- src/world/area_kmr/kmr_20/8ED0C0.c | 2 +- src/world/area_kpa/kpa_91/A86A50.c | 2 +- src/world/area_kpa/kpa_95/A8CB60.c | 2 +- src/world/area_mac/mac_01/8017D0.c | 2 +- src/world/area_nok/nok_01/9C53E0.c | 2 +- src/world/area_sam/sam_02/D05F60.c | 2 +- src/world/area_sam/sam_06/D203E0.c | 2 +- .../{NotDoesScriptExist.inc.c => AwaitScriptComplete.inc.c} | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) rename src/world/common/{NotDoesScriptExist.inc.c => AwaitScriptComplete.inc.c} (58%) diff --git a/src/world/area_dro/dro_02/9694C0.c b/src/world/area_dro/dro_02/9694C0.c index cb9c9474cb..3dbe234741 100644 --- a/src/world/area_dro/dro_02/9694C0.c +++ b/src/world/area_dro/dro_02/9694C0.c @@ -92,7 +92,7 @@ INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_802434CC_96C68C); INCLUDE_ASM(s32, "world/area_dro/dro_02/9694C0", func_80243548_96C708); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_hos/hos_03/A1BDB0.c b/src/world/area_hos/hos_03/A1BDB0.c index 5480bb6c0b..3149046f86 100644 --- a/src/world/area_hos/hos_03/A1BDB0.c +++ b/src/world/area_hos/hos_03/A1BDB0.c @@ -30,7 +30,7 @@ INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_802421F0_A1D2F0); INCLUDE_ASM(s32, "world/area_hos/hos_03/A1BDB0", func_8024226C_A1D36C); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_jan/jan_03/B34BD0.c b/src/world/area_jan/jan_03/B34BD0.c index 2a9c7477b3..716aa12127 100644 --- a/src/world/area_jan/jan_03/B34BD0.c +++ b/src/world/area_jan/jan_03/B34BD0.c @@ -50,7 +50,7 @@ INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_802414F8_B360C8); INCLUDE_ASM(s32, "world/area_jan/jan_03/B34BD0", func_80241574_B36144); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kkj/kkj_20/AFDE00.c b/src/world/area_kkj/kkj_20/AFDE00.c index 5ec4549dae..04b34342c3 100644 --- a/src/world/area_kkj/kkj_20/AFDE00.c +++ b/src/world/area_kkj/kkj_20/AFDE00.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240308_AFDE48); INCLUDE_ASM(s32, "world/area_kkj/kkj_20/AFDE00", func_80240384_AFDEC4); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kmr/kmr_02/8B30E0.c b/src/world/area_kmr/kmr_02/8B30E0.c index 894052300a..7c2ab8a71e 100644 --- a/src/world/area_kmr/kmr_02/8B30E0.c +++ b/src/world/area_kmr/kmr_02/8B30E0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_802430B8_8B3128); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B30E0", func_80243134_8B31A4); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kmr/kmr_20/8ED0C0.c b/src/world/area_kmr/kmr_20/8ED0C0.c index a273cad41b..69399becad 100644 --- a/src/world/area_kmr/kmr_20/8ED0C0.c +++ b/src/world/area_kmr/kmr_20/8ED0C0.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_802412E8_8ED108); INCLUDE_ASM(s32, "world/area_kmr/kmr_20/8ED0C0", func_80241364_8ED184); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kpa/kpa_91/A86A50.c b/src/world/area_kpa/kpa_91/A86A50.c index f7bdac79c3..65cb2e7b8f 100644 --- a/src/world/area_kpa/kpa_91/A86A50.c +++ b/src/world/area_kpa/kpa_91/A86A50.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_80241570_A87FC0); INCLUDE_ASM(s32, "world/area_kpa/kpa_91/A86A50", func_802415EC_A8803C); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_kpa/kpa_95/A8CB60.c b/src/world/area_kpa/kpa_95/A8CB60.c index 44daaa48f2..7e68509226 100644 --- a/src/world/area_kpa/kpa_95/A8CB60.c +++ b/src/world/area_kpa/kpa_95/A8CB60.c @@ -42,7 +42,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_80241650_A8E0D0); INCLUDE_ASM(s32, "world/area_kpa/kpa_95/A8CB60", func_802416CC_A8E14C); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_mac/mac_01/8017D0.c b/src/world/area_mac/mac_01/8017D0.c index 464f97b3ee..c3ad2a45a0 100644 --- a/src/world/area_mac/mac_01/8017D0.c +++ b/src/world/area_mac/mac_01/8017D0.c @@ -98,7 +98,7 @@ INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", pause_tutorial_draw_contents_80 INCLUDE_ASM(s32, "world/area_mac/mac_01/8017D0", func_80243870_8040F0); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_nok/nok_01/9C53E0.c b/src/world/area_nok/nok_01/9C53E0.c index 36a46e2554..8747b47e2d 100644 --- a/src/world/area_nok/nok_01/9C53E0.c +++ b/src/world/area_nok/nok_01/9C53E0.c @@ -28,7 +28,7 @@ INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240AB4_9C5E94); INCLUDE_ASM(s32, "world/area_nok/nok_01/9C53E0", func_80240B30_9C5F10); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_sam/sam_02/D05F60.c b/src/world/area_sam/sam_02/D05F60.c index 0521858a9d..630152cf2d 100644 --- a/src/world/area_sam/sam_02/D05F60.c +++ b/src/world/area_sam/sam_02/D05F60.c @@ -8,7 +8,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_80240878_D05FA8); INCLUDE_ASM(s32, "world/area_sam/sam_02/D05F60", func_802408F4_D06024); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/area_sam/sam_06/D203E0.c b/src/world/area_sam/sam_06/D203E0.c index 699d01bcfe..6f1be57830 100644 --- a/src/world/area_sam/sam_06/D203E0.c +++ b/src/world/area_sam/sam_06/D203E0.c @@ -46,7 +46,7 @@ INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80241F98_D21E28); INCLUDE_ASM(s32, "world/area_sam/sam_06/D203E0", func_80242014_D21EA4); -#include "world/common/NotDoesScriptExist.inc.c" +#include "world/common/AwaitScriptComplete.inc.c" #include "world/common/PartnerToggleAbilityScript.inc.c" diff --git a/src/world/common/NotDoesScriptExist.inc.c b/src/world/common/AwaitScriptComplete.inc.c similarity index 58% rename from src/world/common/NotDoesScriptExist.inc.c rename to src/world/common/AwaitScriptComplete.inc.c index cdd6ce8750..7716e501f0 100644 --- a/src/world/common/NotDoesScriptExist.inc.c +++ b/src/world/common/AwaitScriptComplete.inc.c @@ -1,5 +1,5 @@ #include "common.h" -static ApiStatus NotDoesScriptExist(ScriptInstance* script, s32 isInitialCall) { +static ApiStatus AwaitScriptComplete(ScriptInstance* script, s32 isInitialCall) { return (!does_script_exist(get_variable(script, *script->ptrReadPos))) * ApiStatus_DONE2; } From 82a5b59d274c835153b836d47885e8a29376a609 Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Sat, 31 Oct 2020 19:57:37 +0000 Subject: [PATCH 32/45] bump splat --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index c8b324cdc0..e7a811adf8 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit c8b324cdc0072724ed78b90d2008f36c238b1a76 +Subproject commit e7a811adf8e9cc5505c0992d0e73e9589c6ccd2e From b6bc2fb604aa3c215e088e2dfc5b83cb8a36a86f Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 17:36:59 -0500 Subject: [PATCH 33/45] asm refresh + new splat / symbol_addrs format --- asm/boot.s | 100 +- .../code_2e230_len_2190/func_800533D0.s | 4 +- .../code_303c0_len_3e10/func_80055068.s | 4 +- .../code_303c0_len_3e10/func_8005591C.s | 4 +- .../code_303c0_len_3e10/func_80055970.s | 4 +- .../code_303c0_len_3e10/func_80055A18.s | 4 +- .../code_303c0_len_3e10/func_80055A6C.s | 4 +- .../code_303c0_len_3e10/func_80055B28.s | 4 +- .../code_341d0_len_20d0/get_map_IDs_by_name.s | 12 +- .../code_e0b30_len_b80/func_8014A548.s | 34 +- .../code_e0b30_len_b80/func_8014AC94.s | 10 +- .../code_e0b30_len_b80/func_8014AD40.s | 4 +- .../code_e0b30_len_b80/func_8014ADA4.s | 4 +- .../code_e0b30_len_b80/func_8014ADF8.s | 4 +- .../code_e0b30_len_b80/func_8014AE6C.s | 4 +- .../code_e0b30_len_b80/func_8014AEF8.s | 4 +- .../code_fa4c0_len_3bf0/func_802D5EE0.s | 4 +- .../end_01/E07C20/func_802428C0_E07C20.s | 20 + .../end_01/E07C20/func_80242900_E07C60.s | 37 + .../end_01/E07C20/func_80242978_E07CD8.s | 67 + .../end_01/E07C20/func_80242A68_E07DC8.s | 69 + .../end_01/E07C20/func_80242B68_E07EC8.s | 69 + .../end_01/E07C20/func_80242C68_E07FC8.s | 15 + .../end_01/E07C20/func_80242C94_E07FF4.s | 27 + src/world/area_end/end_01/E05390.c | 14 - src/world/area_end/end_01/E07C20.c | 15 + tools/sort_symbol_addrs.py | 26 + tools/splat.yaml | 3 +- tools/symbol_addrs.txt | 3816 ++++++++--------- 29 files changed, 2358 insertions(+), 2028 deletions(-) create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s create mode 100644 asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s create mode 100644 src/world/area_end/end_01/E07C20.c create mode 100644 tools/sort_symbol_addrs.py diff --git a/asm/boot.s b/asm/boot.s index e78799c793..ec8fe6588d 100644 --- a/asm/boot.s +++ b/asm/boot.s @@ -15,7 +15,7 @@ glabel func_A4000040 /* 50 A4000050 25080000 */ addiu $t0, $t0, 0 /* 54 A4000054 8D09000C */ lw $t1, 0xc($t0) /* 58 A4000058 152000ED */ bnez $t1, .LA4000410 -/* 5C A400005C 00000000 */ nop +/* 5C A400005C 00000000 */ nop /* 60 A4000060 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 64 A4000064 AFB30000 */ sw $s3, ($sp) /* 68 A4000068 AFB40004 */ sw $s4, 4($sp) @@ -32,20 +32,20 @@ glabel func_A4000040 /* 94 A4000094 AD090004 */ sw $t1, 4($t0) /* 98 A4000098 24112260 */ addiu $s1, $zero, 0x2260 .LA400009C: -/* 9C A400009C 00000000 */ nop +/* 9C A400009C 00000000 */ nop /* A0 A40000A0 2231FFFF */ addi $s1, $s1, -1 /* A4 A40000A4 1620FFFD */ bnez $s1, .LA400009C -/* A8 A40000A8 00000000 */ nop +/* A8 A40000A8 00000000 */ nop /* AC A40000AC AD000008 */ sw $zero, 8($t0) /* B0 A40000B0 34090014 */ ori $t1, $zero, 0x14 /* B4 A40000B4 AD09000C */ sw $t1, 0xc($t0) /* B8 A40000B8 AD000000 */ sw $zero, ($t0) /* BC A40000BC 24110004 */ addiu $s1, $zero, 4 .LA40000C0: -/* C0 A40000C0 00000000 */ nop +/* C0 A40000C0 00000000 */ nop /* C4 A40000C4 2231FFFF */ addi $s1, $s1, -1 /* C8 A40000C8 1620FFFD */ bnez $s1, .LA40000C0 -/* CC A40000CC 00000000 */ nop +/* CC A40000CC 00000000 */ nop /* D0 A40000D0 3409000E */ ori $t1, $zero, 0xe /* D4 A40000D4 AD090000 */ sw $t1, ($t0) /* D8 A40000D8 24110020 */ addiu $s1, $zero, 0x20 @@ -78,11 +78,11 @@ glabel func_A4000040 /* 140 A4000140 3C110101 */ lui $s1, 0x101 /* 144 A4000144 26310101 */ addiu $s1, $s1, 0x101 /* 148 A4000148 16110005 */ bne $s0, $s1, .LA4000160 -/* 14C A400014C 00000000 */ nop +/* 14C A400014C 00000000 */ nop /* 150 A4000150 24100200 */ addiu $s0, $zero, 0x200 /* 154 A4000154 35714000 */ ori $s1, $t3, 0x4000 /* 158 A4000158 10000003 */ b .LA4000168 -/* 15C A400015C 00000000 */ nop +/* 15C A400015C 00000000 */ nop .LA4000160: /* 160 A4000160 24100400 */ addiu $s0, $zero, 0x400 /* 164 A4000164 35718000 */ ori $s1, $t3, 0x8000 @@ -90,9 +90,9 @@ glabel func_A4000040 /* 168 A4000168 AE2E0004 */ sw $t6, 4($s1) /* 16C A400016C 25F5000C */ addiu $s5, $t7, 0xc /* 170 A4000170 0D0001DB */ jal func_A400076C -/* 174 A4000174 00000000 */ nop +/* 174 A4000174 00000000 */ nop /* 178 A4000178 10400038 */ beqz $v0, .LA400025C -/* 17C A400017C 00000000 */ nop +/* 17C A400017C 00000000 */ nop /* 180 A4000180 AFA20000 */ sw $v0, ($sp) /* 184 A4000184 24092000 */ addiu $t1, $zero, 0x2000 /* 188 A4000188 AD890000 */ sw $t1, ($t4) @@ -105,7 +105,7 @@ glabel func_A4000040 /* 1A4 A40001A4 AD890000 */ sw $t1, ($t4) /* 1A8 A40001A8 3C08B019 */ lui $t0, 0xb019 /* 1AC A40001AC 1568000C */ bne $t3, $t0, .LA40001E0 -/* 1B0 A40001B0 00000000 */ nop +/* 1B0 A40001B0 00000000 */ nop /* 1B4 A40001B4 3C080800 */ lui $t0, 0x800 /* 1B8 A40001B8 0308C020 */ add $t8, $t8, $t0 /* 1BC A40001BC 0330C820 */ add $t9, $t9, $s0 @@ -116,7 +116,7 @@ glabel func_A4000040 /* 1D0 A40001D0 00129040 */ sll $s2, $s2, 1 /* 1D4 A40001D4 22520001 */ addi $s2, $s2, 1 /* 1D8 A40001D8 10000003 */ b .LA40001E8 -/* 1DC A40001DC 00000000 */ nop +/* 1DC A40001DC 00000000 */ nop .LA40001E0: /* 1E0 A40001E0 3C080010 */ lui $t0, 0x10 /* 1E4 A40001E4 0288A020 */ add $s4, $s4, $t0 @@ -130,11 +130,11 @@ glabel func_A4000040 /* 200 A4000200 3129FFFF */ andi $t1, $t1, 0xffff /* 204 A4000204 24080500 */ addiu $t0, $zero, 0x500 /* 208 A4000208 15280009 */ bne $t1, $t0, .LA4000230 -/* 20C A400020C 00000000 */ nop +/* 20C A400020C 00000000 */ nop /* 210 A4000210 3C1B0100 */ lui $k1, 0x100 /* 214 A4000214 035BD024 */ and $k0, $k0, $k1 /* 218 A4000218 17400005 */ bnez $k0, .LA4000230 -/* 21C A400021C 00000000 */ nop +/* 21C A400021C 00000000 */ nop /* 220 A4000220 3C08101C */ lui $t0, 0x101c /* 224 A4000224 35080A04 */ ori $t0, $t0, 0xa04 /* 228 A4000228 ADE80018 */ sw $t0, 0x18($t7) @@ -151,7 +151,7 @@ glabel func_A4000040 /* 24C A400024C 25AD0001 */ addiu $t5, $t5, 1 /* 250 A4000250 2DA80008 */ sltiu $t0, $t5, 8 /* 254 A4000254 1500FFC4 */ bnez $t0, .LA4000168 -/* 258 A4000258 00000000 */ nop +/* 258 A4000258 00000000 */ nop .LA400025C: /* 25C A400025C 3C08C400 */ lui $t0, 0xc400 /* 260 A4000260 AD48000C */ sw $t0, 0xc($t2) @@ -163,14 +163,14 @@ glabel func_A4000040 /* 274 A4000274 8FA90004 */ lw $t1, 4($sp) /* 278 A4000278 3C08B009 */ lui $t0, 0xb009 /* 27C A400027C 15280016 */ bne $t1, $t0, .LA40002D8 -/* 280 A4000280 00000000 */ nop +/* 280 A4000280 00000000 */ nop /* 284 A4000284 AE380004 */ sw $t8, 4($s1) /* 288 A4000288 2735000C */ addiu $s5, $t9, 0xc /* 28C A400028C 8FA40000 */ lw $a0, ($sp) /* 290 A4000290 23BD0008 */ addi $sp, $sp, 8 /* 294 A4000294 24050001 */ addiu $a1, $zero, 1 /* 298 A4000298 0D00028D */ jal func_A4000A34 -/* 29C A400029C 00000000 */ nop +/* 29C A400029C 00000000 */ nop /* 2A0 A40002A0 8EC80000 */ lw $t0, ($s6) /* 2A4 A40002A4 3C080008 */ lui $t0, 8 /* 2A8 A40002A8 01164020 */ add $t0, $t0, $s6 @@ -192,7 +192,7 @@ glabel func_A4000040 /* 2E4 A40002E4 23BD0008 */ addi $sp, $sp, 8 /* 2E8 A40002E8 24050001 */ addiu $a1, $zero, 1 /* 2EC A40002EC 0D00028D */ jal func_A4000A34 -/* 2F0 A40002F0 00000000 */ nop +/* 2F0 A40002F0 00000000 */ nop /* 2F4 A40002F4 8CE80000 */ lw $t0, ($a3) /* 2F8 A40002F8 3C080008 */ lui $t0, 8 /* 2FC A40002FC 01074020 */ add $t0, $t0, $a3 @@ -223,7 +223,7 @@ glabel func_A4000040 /* 35C A400035C 24630001 */ addiu $v1, $v1, 1 /* 360 A4000360 006D402A */ slt $t0, $v1, $t5 /* 364 A4000364 1500FFC3 */ bnez $t0, .LA4000274 -/* 368 A4000368 00000000 */ nop +/* 368 A4000368 00000000 */ nop /* 36C A400036C 3C0AA470 */ lui $t2, 0xa470 /* 370 A4000370 001294C0 */ sll $s2, $s2, 0x13 /* 374 A4000374 3C090006 */ lui $t1, 6 @@ -266,7 +266,7 @@ glabel func_A4000040 /* 400 A4000400 1420FFFD */ bnez $at, .LA40003F8 /* 404 A4000404 25080010 */ addiu $t0, $t0, 0x10 /* 408 A4000408 10000013 */ b .LA4000458 -/* 40C A400040C 00000000 */ nop +/* 40C A400040C 00000000 */ nop .LA4000410: /* 410 A4000410 3C088000 */ lui $t0, 0x8000 /* 414 A4000414 25080000 */ addiu $t0, $t0, 0 @@ -315,7 +315,7 @@ glabel func_A4000040 /* 4B0 A40004B0 3C0C8000 */ lui $t4, 0x8000 /* 4B4 A40004B4 258C0000 */ addiu $t4, $t4, 0 /* 4B8 A40004B8 01800008 */ jr $t4 -/* 4BC A40004BC 00000000 */ nop +/* 4BC A40004BC 00000000 */ nop glabel func_A40004C0 /* 4C0 A40004C0 3C0BB000 */ lui $t3, 0xb000 @@ -343,23 +343,23 @@ glabel func_A40004C0 /* 514 A4000514 3C01A460 */ lui $at, 0xa460 /* 518 A4000518 AC2A000C */ sw $t2, 0xc($at) .LA400051C: -/* 51C A400051C 00000000 */ nop -/* 520 A4000520 00000000 */ nop -/* 524 A4000524 00000000 */ nop -/* 528 A4000528 00000000 */ nop -/* 52C A400052C 00000000 */ nop -/* 530 A4000530 00000000 */ nop -/* 534 A4000534 00000000 */ nop -/* 538 A4000538 00000000 */ nop -/* 53C A400053C 00000000 */ nop -/* 540 A4000540 00000000 */ nop -/* 544 A4000544 00000000 */ nop -/* 548 A4000548 00000000 */ nop +/* 51C A400051C 00000000 */ nop +/* 520 A4000520 00000000 */ nop +/* 524 A4000524 00000000 */ nop +/* 528 A4000528 00000000 */ nop +/* 52C A400052C 00000000 */ nop +/* 530 A4000530 00000000 */ nop +/* 534 A4000534 00000000 */ nop +/* 538 A4000538 00000000 */ nop +/* 53C A400053C 00000000 */ nop +/* 540 A4000540 00000000 */ nop +/* 544 A4000544 00000000 */ nop +/* 548 A4000548 00000000 */ nop /* 54C A400054C 3C0BA460 */ lui $t3, 0xa460 /* 550 A4000550 8D6B0010 */ lw $t3, 0x10($t3) /* 554 A4000554 316B0001 */ andi $t3, $t3, 1 /* 558 A4000558 1560FFF0 */ bnez $t3, .LA400051C -/* 55C A400055C 00000000 */ nop +/* 55C A400055C 00000000 */ nop /* 560 A4000560 3C0BB000 */ lui $t3, 0xb000 /* 564 A4000564 8D640008 */ lw $a0, 8($t3) /* 568 A4000568 3C010010 */ lui $at, 0x10 @@ -420,15 +420,15 @@ glabel func_A40004C0 /* 634 A4000634 3C0BB000 */ lui $t3, 0xb000 /* 638 A4000638 8D680010 */ lw $t0, 0x10($t3) /* 63C A400063C 14E80006 */ bne $a3, $t0, .LA4000658 -/* 640 A4000640 00000000 */ nop +/* 640 A4000640 00000000 */ nop /* 644 A4000644 8D680014 */ lw $t0, 0x14($t3) /* 648 A4000648 16080003 */ bne $s0, $t0, .LA4000658 -/* 64C A400064C 00000000 */ nop +/* 64C A400064C 00000000 */ nop /* 650 A4000650 04110003 */ bal .LA4000660 -/* 654 A4000654 00000000 */ nop +/* 654 A4000654 00000000 */ nop .LA4000658: /* 658 A4000658 0411FFFF */ bal .LA4000658 -/* 65C A400065C 00000000 */ nop +/* 65C A400065C 00000000 */ nop .LA4000660: /* 660 A4000660 3C09A408 */ lui $t1, 0xa408 /* 664 A4000664 8D290000 */ lw $t1, ($t1) @@ -500,8 +500,8 @@ glabel func_A40004C0 /* 758 A4000758 3C010010 */ lui $at, 0x10 /* 75C A400075C 01214823 */ subu $t1, $t1, $at /* 760 A4000760 01200008 */ jr $t1 -/* 764 A4000764 00000000 */ nop -/* 768 A4000768 00000000 */ nop +/* 764 A4000764 00000000 */ nop +/* 768 A4000768 00000000 */ nop glabel func_A400076C /* 76C A400076C 27BDFF60 */ addiu $sp, $sp, -0xa0 @@ -535,7 +535,7 @@ glabel func_A400076C /* 7DC A40007DC AFBF0064 */ sw $ra, 0x64($sp) .LA40007E0: /* 7E0 A40007E0 0D00021D */ jal func_A4000874 -/* 7E4 A40007E4 00000000 */ nop +/* 7E4 A40007E4 00000000 */ nop /* 7E8 A40007E8 26100001 */ addiu $s0, $s0, 1 /* 7EC A40007EC 2A090004 */ slti $t1, $s0, 4 /* 7F0 A40007F0 1520FFFB */ bnez $t1, .LA40007E0 @@ -591,7 +591,7 @@ glabel func_A4000874 /* 8AC A40008AC 00404825 */ or $t1, $v0, $zero /* 8B0 A40008B0 0000D012 */ mflo $k0 /* 8B4 A40008B4 017A5821 */ addu $t3, $t3, $k0 -/* 8B8 A40008B8 00000000 */ nop +/* 8B8 A40008B8 00000000 */ nop /* 8BC A40008BC 293A0050 */ slti $k0, $t1, 0x50 .LA40008C0: /* 8C0 A40008C0 1740FFF1 */ bnez $k0, .LA4000888 @@ -611,7 +611,7 @@ glabel func_A4000874 .LA40008F4: /* 8F4 A40008F4 27BD0020 */ addiu $sp, $sp, 0x20 /* 8F8 A40008F8 03E00008 */ jr $ra -/* 8FC A40008FC 00000000 */ nop +/* 8FC A40008FC 00000000 */ nop glabel func_A4000900 /* 900 A4000900 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -645,7 +645,7 @@ glabel func_A4000900 /* 964 A4000964 8FBF001C */ lw $ra, 0x1c($sp) /* 968 A4000968 27BD0028 */ addiu $sp, $sp, 0x28 /* 96C A400096C 03E00008 */ jr $ra -/* 970 A4000970 00000000 */ nop +/* 970 A4000970 00000000 */ nop glabel func_A4000974 /* 974 A4000974 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -701,7 +701,7 @@ glabel func_A4000974 /* A24 A4000A24 8FBF001C */ lw $ra, 0x1c($sp) /* A28 A4000A28 27BD0028 */ addiu $sp, $sp, 0x28 /* A2C A4000A2C 03E00008 */ jr $ra -/* A30 A4000A30 00000000 */ nop +/* A30 A4000A30 00000000 */ nop glabel func_A4000A34 /* A34 A4000A34 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -741,7 +741,7 @@ glabel func_A4000A34 /* AB4 A4000AB4 8FBF001C */ lw $ra, 0x1c($sp) /* AB8 A4000AB8 27BD0028 */ addiu $sp, $sp, 0x28 /* ABC A4000ABC 03E00008 */ jr $ra -/* AC0 A4000AC0 00000000 */ nop +/* AC0 A4000AC0 00000000 */ nop glabel func_A4000AC4 /* AC4 A4000AC4 27BDFFD8 */ addiu $sp, $sp, -0x28 @@ -782,8 +782,8 @@ glabel func_A4000AC4 /* B50 A4000B50 8FBF001C */ lw $ra, 0x1c($sp) /* B54 A4000B54 27BD0028 */ addiu $sp, $sp, 0x28 /* B58 A4000B58 03E00008 */ jr $ra -/* B5C A4000B5C 00000000 */ nop -/* B60 A4000B60 00000000 */ nop -/* B64 A4000B64 00000000 */ nop -/* B68 A4000B68 00000000 */ nop -/* B6C A4000B6C 00000000 */ nop +/* B5C A4000B5C 00000000 */ nop +/* B60 A4000B60 00000000 */ nop +/* B64 A4000B64 00000000 */ nop +/* B68 A4000B68 00000000 */ nop +/* B6C A4000B6C 00000000 */ nop diff --git a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s index dfdcd1d7c9..5182d4911d 100644 --- a/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s +++ b/asm/nonmatchings/code_2e230_len_2190/func_800533D0.s @@ -48,8 +48,8 @@ glabel func_800533D0 /* 2E874 80053474 AE22003C */ sw $v0, 0x3c($s1) /* 2E878 80053478 A62200BA */ sh $v0, 0xba($s1) .L8005347C: -/* 2E87C 8005347C 3C118008 */ lui $s1, 0x8008 -/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, -0x7250 +/* 2E87C 8005347C 3C118008 */ lui $s1, %hi(D_80078DB0) +/* 2E880 80053480 26318DB0 */ addiu $s1, $s1, %lo(D_80078DB0) /* 2E884 80053484 8E220000 */ lw $v0, ($s1) /* 2E888 80053488 14400045 */ bnez $v0, .L800535A0 /* 2E88C 8005348C 00000000 */ nop diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s index 8c619d4066..ae25ec354e 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055068.s @@ -6,8 +6,8 @@ glabel func_80055068 /* 3046C 8005506C AFB00010 */ sw $s0, 0x10($sp) /* 30470 80055070 0080802D */ daddu $s0, $a0, $zero /* 30474 80055074 3203000F */ andi $v1, $s0, 0xf -/* 30478 80055078 3C048008 */ lui $a0, 0x8008 -/* 3047C 8005507C 94848DB4 */ lhu $a0, -0x724c($a0) +/* 30478 80055078 3C048008 */ lui $a0, %hi(D_80078DB4) +/* 3047C 8005507C 94848DB4 */ lhu $a0, %lo(D_80078DB4)($a0) /* 30480 80055080 24020001 */ addiu $v0, $zero, 1 /* 30484 80055084 1482001E */ bne $a0, $v0, .L80055100 /* 30488 80055088 AFBF0014 */ sw $ra, 0x14($sp) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s index 92b5a6d646..b3a1ba0c2b 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_8005591C.s @@ -4,8 +4,8 @@ glabel func_8005591C /* 30D1C 8005591C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30D20 80055920 AFB00030 */ sw $s0, 0x30($sp) -/* 30D24 80055924 3C108008 */ lui $s0, 0x8008 -/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30D24 80055924 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30D28 80055928 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30D2C 8005592C 24020001 */ addiu $v0, $zero, 1 /* 30D30 80055930 AFBF0034 */ sw $ra, 0x34($sp) /* 30D34 80055934 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s index 66ef33b09c..c30632e25b 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055970.s @@ -4,8 +4,8 @@ glabel func_80055970 /* 30D70 80055970 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30D74 80055974 AFB00030 */ sw $s0, 0x30($sp) -/* 30D78 80055978 3C108008 */ lui $s0, 0x8008 -/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30D78 80055978 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30D7C 8005597C 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30D80 80055980 24020001 */ addiu $v0, $zero, 1 /* 30D84 80055984 AFBF0034 */ sw $ra, 0x34($sp) /* 30D88 80055988 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s index c80517b7e1..b5c7716d90 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A18.s @@ -4,8 +4,8 @@ glabel func_80055A18 /* 30E18 80055A18 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30E1C 80055A1C AFB00030 */ sw $s0, 0x30($sp) -/* 30E20 80055A20 3C108008 */ lui $s0, 0x8008 -/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30E20 80055A20 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30E24 80055A24 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30E28 80055A28 8FA30048 */ lw $v1, 0x48($sp) /* 30E2C 80055A2C 24020001 */ addiu $v0, $zero, 1 /* 30E30 80055A30 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s index b9c26e6092..33f13df2da 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055A6C.s @@ -4,8 +4,8 @@ glabel func_80055A6C /* 30E6C 80055A6C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30E70 80055A70 AFB00030 */ sw $s0, 0x30($sp) -/* 30E74 80055A74 3C108008 */ lui $s0, 0x8008 -/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30E74 80055A74 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30E78 80055A78 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30E7C 80055A7C 24020001 */ addiu $v0, $zero, 1 /* 30E80 80055A80 AFBF0034 */ sw $ra, 0x34($sp) /* 30E84 80055A84 AE020000 */ sw $v0, ($s0) diff --git a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s index ba578d490a..1489541c05 100644 --- a/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s +++ b/asm/nonmatchings/code_303c0_len_3e10/func_80055B28.s @@ -4,8 +4,8 @@ glabel func_80055B28 /* 30F28 80055B28 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 30F2C 80055B2C AFB00030 */ sw $s0, 0x30($sp) -/* 30F30 80055B30 3C108008 */ lui $s0, 0x8008 -/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, -0x7250 +/* 30F30 80055B30 3C108008 */ lui $s0, %hi(D_80078DB0) +/* 30F34 80055B34 26108DB0 */ addiu $s0, $s0, %lo(D_80078DB0) /* 30F38 80055B38 24030001 */ addiu $v1, $zero, 1 /* 30F3C 80055B3C 240207D0 */ addiu $v0, $zero, 0x7d0 /* 30F40 80055B40 AFBF0034 */ sw $ra, 0x34($sp) diff --git a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s index 06dcf05b20..72e6bb7711 100644 --- a/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s +++ b/asm/nonmatchings/code_341d0_len_20d0/get_map_IDs_by_name.s @@ -9,8 +9,8 @@ glabel get_map_IDs_by_name /* 36008 8005AC08 00A0B02D */ daddu $s6, $a1, $zero /* 3600C 8005AC0C AFB7002C */ sw $s7, 0x2c($sp) /* 36010 8005AC10 00C0B82D */ daddu $s7, $a2, $zero -/* 36014 8005AC14 3C028009 */ lui $v0, 0x8009 -/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 36014 8005AC14 3C028009 */ lui $v0, %hi(gAreas) +/* 36018 8005AC18 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 3601C 8005AC1C AFBF0030 */ sw $ra, 0x30($sp) /* 36020 8005AC20 AFB40020 */ sw $s4, 0x20($sp) /* 36024 8005AC24 AFB3001C */ sw $s3, 0x1c($sp) @@ -26,8 +26,8 @@ glabel get_map_IDs_by_name /* 36048 8005AC48 8C420000 */ lw $v0, ($v0) /* 3604C 8005AC4C 18400012 */ blez $v0, .L8005AC98 /* 36050 8005AC50 0000802D */ daddu $s0, $zero, $zero -/* 36054 8005AC54 3C028009 */ lui $v0, 0x8009 -/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 36054 8005AC54 3C028009 */ lui $v0, %hi(gAreas) +/* 36058 8005AC58 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 3605C 8005AC5C 02429821 */ addu $s3, $s2, $v0 /* 36060 8005AC60 0080882D */ daddu $s1, $a0, $zero .L8005AC64: @@ -50,8 +50,8 @@ glabel get_map_IDs_by_name /* 3609C 8005AC9C 3C048009 */ lui $a0, 0x8009 /* 360A0 8005ACA0 00922021 */ addu $a0, $a0, $s2 /* 360A4 8005ACA4 8C8434F4 */ lw $a0, 0x34f4($a0) -/* 360A8 8005ACA8 3C028009 */ lui $v0, 0x8009 -/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, 0x34f0 +/* 360A8 8005ACA8 3C028009 */ lui $v0, %hi(gAreas) +/* 360AC 8005ACAC 244234F0 */ addiu $v0, $v0, %lo(gAreas) /* 360B0 8005ACB0 1480FFE4 */ bnez $a0, .L8005AC44 /* 360B4 8005ACB4 26940001 */ addiu $s4, $s4, 1 .L8005ACB8: diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s index c9dbd5c772..644c582471 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014A548.s @@ -4,8 +4,8 @@ glabel func_8014A548 /* E0C48 8014A548 27BDFFC8 */ addiu $sp, $sp, -0x38 /* E0C4C 8014A54C AFB1001C */ sw $s1, 0x1c($sp) -/* E0C50 8014A550 3C118016 */ lui $s1, 0x8016 -/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, -0x6510 +/* E0C50 8014A550 3C118016 */ lui $s1, %hi(gMusicPlayers) +/* E0C54 8014A554 26319AF0 */ addiu $s1, $s1, %lo(gMusicPlayers) /* E0C58 8014A558 AFB20020 */ sw $s2, 0x20($sp) /* E0C5C 8014A55C 0000902D */ daddu $s2, $zero, $zero /* E0C60 8014A560 AFB30024 */ sw $s3, 0x24($sp) @@ -27,7 +27,7 @@ glabel func_8014A548 /* E0C9C 8014A59C 00220821 */ addu $at, $at, $v0 /* E0CA0 8014A5A0 8C221290 */ lw $v0, 0x1290($at) /* E0CA4 8014A5A4 00400008 */ jr $v0 -/* E0CA8 8014A5A8 00000000 */ nop +/* E0CA8 8014A5A8 00000000 */ nop /* E0CAC 8014A5AC 96230000 */ lhu $v1, ($s1) /* E0CB0 8014A5B0 30620001 */ andi $v0, $v1, 1 /* E0CB4 8014A5B4 1040001D */ beqz $v0, .L8014A62C @@ -37,24 +37,24 @@ glabel func_8014A548 /* E0CC4 8014A5C4 1040000B */ beqz $v0, .L8014A5F4 /* E0CC8 8014A5C8 30620004 */ andi $v0, $v1, 4 /* E0CCC 8014A5CC 14400005 */ bnez $v0, .L8014A5E4 -/* E0CD0 8014A5D0 00000000 */ nop +/* E0CD0 8014A5D0 00000000 */ nop /* E0CD4 8014A5D4 0C015671 */ jal func_800559C4 /* E0CD8 8014A5D8 8E040016 */ lw $a0, 0x16($s0) /* E0CDC 8014A5DC 08052987 */ j .L8014A61C -/* E0CE0 8014A5E0 00000000 */ nop +/* E0CE0 8014A5E0 00000000 */ nop .L8014A5E4: /* E0CE4 8014A5E4 0C0156BC */ jal func_80055AF0 /* E0CE8 8014A5E8 8E040016 */ lw $a0, 0x16($s0) /* E0CEC 8014A5EC 08052987 */ j .L8014A61C -/* E0CF0 8014A5F0 00000000 */ nop +/* E0CF0 8014A5F0 00000000 */ nop .L8014A5F4: /* E0CF4 8014A5F4 14400006 */ bnez $v0, .L8014A610 -/* E0CF8 8014A5F8 00000000 */ nop +/* E0CF8 8014A5F8 00000000 */ nop /* E0CFC 8014A5FC 8E040016 */ lw $a0, 0x16($s0) /* E0D00 8014A600 0C0156AF */ jal func_80055ABC /* E0D04 8014A604 0000302D */ daddu $a2, $zero, $zero /* E0D08 8014A608 08052987 */ j .L8014A61C -/* E0D0C 8014A60C 00000000 */ nop +/* E0D0C 8014A60C 00000000 */ nop .L8014A610: /* E0D10 8014A610 8E040016 */ lw $a0, 0x16($s0) /* E0D14 8014A614 0C0156EE */ jal func_80055BB8 @@ -82,7 +82,7 @@ glabel func_8014A548 /* E0D5C 8014A65C A6220000 */ sh $v0, ($s1) /* E0D60 8014A660 8E040016 */ lw $a0, 0x16($s0) /* E0D64 8014A664 0C01567F */ jal func_800559FC -/* E0D68 8014A668 00000000 */ nop +/* E0D68 8014A668 00000000 */ nop /* E0D6C 8014A66C 5440004D */ bnel $v0, $zero, .L8014A7A4 /* E0D70 8014A670 26520001 */ addiu $s2, $s2, 1 /* E0D74 8014A674 96220000 */ lhu $v0, ($s1) @@ -100,7 +100,7 @@ glabel func_8014A548 /* E0DA4 8014A6A4 30620010 */ andi $v0, $v1, 0x10 /* E0DA8 8014A6A8 8E04000E */ lw $a0, 0xe($s0) /* E0DAC 8014A6AC 04810003 */ bgez $a0, .L8014A6BC -/* E0DB0 8014A6B0 00000000 */ nop +/* E0DB0 8014A6B0 00000000 */ nop /* E0DB4 8014A6B4 080529E8 */ j .L8014A7A0 /* E0DB8 8014A6B8 A6000000 */ sh $zero, ($s0) .L8014A6BC: @@ -113,7 +113,7 @@ glabel func_8014A548 /* E0DD4 8014A6D4 96220000 */ lhu $v0, ($s1) /* E0DD8 8014A6D8 30420020 */ andi $v0, $v0, 0x20 /* E0DDC 8014A6DC 1040000C */ beqz $v0, .L8014A710 -/* E0DE0 8014A6E0 00000000 */ nop +/* E0DE0 8014A6E0 00000000 */ nop /* E0DE4 8014A6E4 8602000C */ lh $v0, 0xc($s0) /* E0DE8 8014A6E8 8607000A */ lh $a3, 0xa($s0) /* E0DEC 8014A6EC AFA20010 */ sw $v0, 0x10($sp) @@ -126,10 +126,10 @@ glabel func_8014A548 /* E0E08 8014A708 080529C8 */ j .L8014A720 /* E0E0C 8014A70C A6220000 */ sh $v0, ($s1) .L8014A710: -/* E0E10 8014A710 3C048016 */ lui $a0, 0x8016 -/* E0E14 8014A714 84849AE0 */ lh $a0, -0x6520($a0) +/* E0E10 8014A710 3C048016 */ lui $a0, %hi(gMusicUnkVolume) +/* E0E14 8014A714 84849AE0 */ lh $a0, %lo(gMusicUnkVolume)($a0) /* E0E18 8014A718 0C052B21 */ jal transition_music_volume_to -/* E0E1C 8014A71C 00000000 */ nop +/* E0E1C 8014A71C 00000000 */ nop .L8014A720: /* E0E20 8014A720 8E040016 */ lw $a0, 0x16($s0) /* E0E24 8014A724 0C01565C */ jal func_80055970 @@ -143,7 +143,7 @@ glabel func_8014A548 /* E0E44 8014A744 A6000000 */ sh $zero, ($s0) .L8014A748: /* E0E48 8014A748 10400005 */ beqz $v0, .L8014A760 -/* E0E4C 8014A74C 00000000 */ nop +/* E0E4C 8014A74C 00000000 */ nop /* E0E50 8014A750 A6000000 */ sh $zero, ($s0) /* E0E54 8014A754 96220000 */ lhu $v0, ($s1) /* E0E58 8014A758 080529E7 */ j .L8014A79C @@ -151,7 +151,7 @@ glabel func_8014A548 .L8014A760: /* E0E60 8014A760 8E04002A */ lw $a0, 0x2a($s0) /* E0E64 8014A764 0C0156CA */ jal func_80055B28 -/* E0E68 8014A768 00000000 */ nop +/* E0E68 8014A768 00000000 */ nop /* E0E6C 8014A76C 5440000D */ bnel $v0, $zero, .L8014A7A4 /* E0E70 8014A770 26520001 */ addiu $s2, $s2, 1 /* E0E74 8014A774 8E020022 */ lw $v0, 0x22($s0) @@ -174,7 +174,7 @@ glabel func_8014A548 /* E0EAC 8014A7AC 1440FF75 */ bnez $v0, .L8014A584 /* E0EB0 8014A7B0 26310030 */ addiu $s1, $s1, 0x30 /* E0EB4 8014A7B4 0C052B25 */ jal func_8014AC94 -/* E0EB8 8014A7B8 00000000 */ nop +/* E0EB8 8014A7B8 00000000 */ nop /* E0EBC 8014A7BC 8FBF0030 */ lw $ra, 0x30($sp) /* E0EC0 8014A7C0 8FB5002C */ lw $s5, 0x2c($sp) /* E0EC4 8014A7C4 8FB40028 */ lw $s4, 0x28($sp) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s index f1b97ef67a..1ce886b843 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AC94.s @@ -25,8 +25,8 @@ glabel func_8014AC94 /* E13E0 8014ACE0 54400001 */ bnel $v0, $zero, .L8014ACE8 /* E13E4 8014ACE4 0060202D */ daddu $a0, $v1, $zero .L8014ACE8: -/* E13E8 8014ACE8 3C058016 */ lui $a1, 0x8016 -/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, -0x651a +/* E13E8 8014ACE8 3C058016 */ lui $a1, %hi(gMusicCurrentVolume) +/* E13EC 8014ACEC 24A59AE6 */ addiu $a1, $a1, %lo(gMusicCurrentVolume) /* E13F0 8014ACF0 00041400 */ sll $v0, $a0, 0x10 /* E13F4 8014ACF4 00022403 */ sra $a0, $v0, 0x10 /* E13F8 8014ACF8 84A20000 */ lh $v0, ($a1) @@ -38,10 +38,10 @@ glabel func_8014AC94 /* E1410 8014AD10 2462FFFF */ addiu $v0, $v1, -1 .L8014AD14: /* E1414 8014AD14 A4A20000 */ sh $v0, ($a1) -/* E1418 8014AD18 3C048016 */ lui $a0, 0x8016 -/* E141C 8014AD1C 84849AE6 */ lh $a0, -0x651a($a0) +/* E1418 8014AD18 3C048016 */ lui $a0, %hi(gMusicCurrentVolume) +/* E141C 8014AD1C 84849AE6 */ lh $a0, %lo(gMusicCurrentVolume)($a0) /* E1420 8014AD20 0C015869 */ jal func_800561A4 -/* E1424 8014AD24 00000000 */ nop +/* E1424 8014AD24 00000000 */ nop /* E1428 8014AD28 24020003 */ addiu $v0, $zero, 3 /* E142C 8014AD2C 3C018015 */ lui $at, 0x8015 /* E1430 8014AD30 A422F738 */ sh $v0, -0x8c8($at) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s index 065caa040d..843f7eb11e 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AD40.s @@ -4,8 +4,8 @@ glabel func_8014AD40 /* E1440 8014AD40 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E1444 8014AD44 AFB00010 */ sw $s0, 0x10($sp) -/* E1448 8014AD48 3C108016 */ lui $s0, 0x8016 -/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, -0x6510 +/* E1448 8014AD48 3C108016 */ lui $s0, %hi(gMusicPlayers) +/* E144C 8014AD4C 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers) /* E1450 8014AD50 AFB10014 */ sw $s1, 0x14($sp) /* E1454 8014AD54 0000882D */ daddu $s1, $zero, $zero /* E1458 8014AD58 AFBF0018 */ sw $ra, 0x18($sp) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s index 138ee65425..3b03167cb0 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADA4.s @@ -7,8 +7,8 @@ glabel func_8014ADA4 /* E14AC 8014ADAC 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E14B0 8014ADB0 AFBF0018 */ sw $ra, 0x18($sp) /* E14B4 8014ADB4 80420071 */ lb $v0, 0x71($v0) -/* E14B8 8014ADB8 3C068016 */ lui $a2, 0x8016 -/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, -0x6510 +/* E14B8 8014ADB8 3C068016 */ lui $a2, %hi(gMusicPlayers) +/* E14BC 8014ADBC 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers) /* E14C0 8014ADC0 1440000A */ bnez $v0, .L8014ADEC /* E14C4 8014ADC4 24030008 */ addiu $v1, $zero, 8 /* E14C8 8014ADC8 94C20000 */ lhu $v0, ($a2) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s index 7b9f6bc0ed..80ead6d3be 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014ADF8.s @@ -8,8 +8,8 @@ glabel func_8014ADF8 /* E1504 8014AE04 8C42419C */ lw $v0, %lo(gGameStatusPtr)($v0) /* E1508 8014AE08 AFBF0018 */ sw $ra, 0x18($sp) /* E150C 8014AE0C 80420071 */ lb $v0, 0x71($v0) -/* E1510 8014AE10 3C078016 */ lui $a3, 0x8016 -/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, -0x6510 +/* E1510 8014AE10 3C078016 */ lui $a3, %hi(gMusicPlayers) +/* E1514 8014AE14 24E79AF0 */ addiu $a3, $a3, %lo(gMusicPlayers) /* E1518 8014AE18 14400011 */ bnez $v0, .L8014AE60 /* E151C 8014AE1C 00A0482D */ daddu $t1, $a1, $zero /* E1520 8014AE20 8CE40010 */ lw $a0, 0x10($a3) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s index 9030224ef6..d0cb92e4bb 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AE6C.s @@ -7,8 +7,8 @@ glabel func_8014AE6C /* E1574 8014AE74 27BDFFE0 */ addiu $sp, $sp, -0x20 /* E1578 8014AE78 AFBF0018 */ sw $ra, 0x18($sp) /* E157C 8014AE7C 80420071 */ lb $v0, 0x71($v0) -/* E1580 8014AE80 3C068016 */ lui $a2, 0x8016 -/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, -0x6510 +/* E1580 8014AE80 3C068016 */ lui $a2, %hi(gMusicPlayers) +/* E1584 8014AE84 24C69AF0 */ addiu $a2, $a2, %lo(gMusicPlayers) /* E1588 8014AE88 14400018 */ bnez $v0, .L8014AEEC /* E158C 8014AE8C 3C020002 */ lui $v0, 2 /* E1590 8014AE90 3C04800A */ lui $a0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s index ed3cbbc650..066759add0 100644 --- a/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s +++ b/asm/nonmatchings/code_e0b30_len_b80/func_8014AEF8.s @@ -8,8 +8,8 @@ glabel func_8014AEF8 /* E1604 8014AF04 AFBF001C */ sw $ra, 0x1c($sp) /* E1608 8014AF08 AFB00018 */ sw $s0, 0x18($sp) /* E160C 8014AF0C 80420071 */ lb $v0, 0x71($v0) -/* E1610 8014AF10 3C108016 */ lui $s0, 0x8016 -/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, -0x6510 +/* E1610 8014AF10 3C108016 */ lui $s0, %hi(gMusicPlayers) +/* E1614 8014AF14 26109AF0 */ addiu $s0, $s0, %lo(gMusicPlayers) /* E1618 8014AF18 14400018 */ bnez $v0, .L8014AF7C /* E161C 8014AF1C 3C030002 */ lui $v1, 2 /* E1620 8014AF20 3C02800A */ lui $v0, %hi(D_8009A650) diff --git a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s index e4ce3a143a..552becea95 100644 --- a/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s +++ b/asm/nonmatchings/code_fa4c0_len_3bf0/func_802D5EE0.s @@ -7,8 +7,8 @@ glabel func_802D5EE0 /* FA898 802D5EE8 8C82000C */ lw $v0, 0xc($a0) /* FA89C 802D5EEC 0C0B1EAF */ jal get_variable /* FA8A0 802D5EF0 8C450000 */ lw $a1, ($v0) -/* FA8A4 802D5EF4 3C048016 */ lui $a0, 0x8016 -/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, -0x6510 +/* FA8A4 802D5EF4 3C048016 */ lui $a0, %hi(gMusicPlayers) +/* FA8A8 802D5EF8 24849AF0 */ addiu $a0, $a0, %lo(gMusicPlayers) /* FA8AC 802D5EFC 00021840 */ sll $v1, $v0, 1 /* FA8B0 802D5F00 00621821 */ addu $v1, $v1, $v0 /* FA8B4 802D5F04 00031900 */ sll $v1, $v1, 4 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s new file mode 100644 index 0000000000..954b3db869 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_802428C0_E07C20.s @@ -0,0 +1,20 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_802428C0_E07C20 +/* E07C20 802428C0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07C24 802428C4 2404005B */ addiu $a0, $zero, 0x5b +/* E07C28 802428C8 2405FFFF */ addiu $a1, $zero, -1 +/* E07C2C 802428CC 24060001 */ addiu $a2, $zero, 1 +/* E07C30 802428D0 AFBF0010 */ sw $ra, 0x10($sp) +/* E07C34 802428D4 0C046E54 */ jal func_8011B950 +/* E07C38 802428D8 0000382D */ daddu $a3, $zero, $zero +/* E07C3C 802428DC 0000202D */ daddu $a0, $zero, $zero +/* E07C40 802428E0 0080282D */ daddu $a1, $a0, $zero +/* E07C44 802428E4 0080302D */ daddu $a2, $a0, $zero +/* E07C48 802428E8 0C046F97 */ jal set_background_color_blend +/* E07C4C 802428EC 240700FF */ addiu $a3, $zero, 0xff +/* E07C50 802428F0 8FBF0010 */ lw $ra, 0x10($sp) +/* E07C54 802428F4 24020002 */ addiu $v0, $zero, 2 +/* E07C58 802428F8 03E00008 */ jr $ra +/* E07C5C 802428FC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s new file mode 100644 index 0000000000..f658cae9bb --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242900_E07C60.s @@ -0,0 +1,37 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242900_E07C60 +/* E07C60 80242900 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07C64 80242904 AFB00010 */ sw $s0, 0x10($sp) +/* E07C68 80242908 0080802D */ daddu $s0, $a0, $zero +/* E07C6C 8024290C 10A00003 */ beqz $a1, .L8024291C +/* E07C70 80242910 AFBF0014 */ sw $ra, 0x14($sp) +/* E07C74 80242914 240200FF */ addiu $v0, $zero, 0xff +/* E07C78 80242918 AE020074 */ sw $v0, 0x74($s0) +.L8024291C: +/* E07C7C 8024291C 8E020074 */ lw $v0, 0x74($s0) +/* E07C80 80242920 2442FFF6 */ addiu $v0, $v0, -0xa +/* E07C84 80242924 04410002 */ bgez $v0, .L80242930 +/* E07C88 80242928 AE020074 */ sw $v0, 0x74($s0) +/* E07C8C 8024292C AE000074 */ sw $zero, 0x74($s0) +.L80242930: +/* E07C90 80242930 0000202D */ daddu $a0, $zero, $zero +/* E07C94 80242934 0080282D */ daddu $a1, $a0, $zero +/* E07C98 80242938 92070077 */ lbu $a3, 0x77($s0) +/* E07C9C 8024293C 0C046F97 */ jal set_background_color_blend +/* E07CA0 80242940 0080302D */ daddu $a2, $a0, $zero +/* E07CA4 80242944 8E020074 */ lw $v0, 0x74($s0) +/* E07CA8 80242948 14400007 */ bnez $v0, .L80242968 +/* E07CAC 8024294C 0000102D */ daddu $v0, $zero, $zero +/* E07CB0 80242950 2404005B */ addiu $a0, $zero, 0x5b +/* E07CB4 80242954 2405FFFF */ addiu $a1, $zero, -1 +/* E07CB8 80242958 0000302D */ daddu $a2, $zero, $zero +/* E07CBC 8024295C 0C046E54 */ jal func_8011B950 +/* E07CC0 80242960 00C0382D */ daddu $a3, $a2, $zero +/* E07CC4 80242964 24020002 */ addiu $v0, $zero, 2 +.L80242968: +/* E07CC8 80242968 8FBF0014 */ lw $ra, 0x14($sp) +/* E07CCC 8024296C 8FB00010 */ lw $s0, 0x10($sp) +/* E07CD0 80242970 03E00008 */ jr $ra +/* E07CD4 80242974 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s new file mode 100644 index 0000000000..125c322ce3 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242978_E07CD8.s @@ -0,0 +1,67 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242978_E07CD8 +/* E07CD8 80242978 27BDFFD0 */ addiu $sp, $sp, -0x30 +/* E07CDC 8024297C AFB20020 */ sw $s2, 0x20($sp) +/* E07CE0 80242980 AFBF0024 */ sw $ra, 0x24($sp) +/* E07CE4 80242984 AFB1001C */ sw $s1, 0x1c($sp) +/* E07CE8 80242988 AFB00018 */ sw $s0, 0x18($sp) +/* E07CEC 8024298C F7B40028 */ sdc1 $f20, 0x28($sp) +/* E07CF0 80242990 10A00006 */ beqz $a1, .L802429AC +/* E07CF4 80242994 0080902D */ daddu $s2, $a0, $zero +/* E07CF8 80242998 8E4400AC */ lw $a0, 0xac($s2) +/* E07CFC 8024299C 0C00EAD2 */ jal get_npc_safe +/* E07D00 802429A0 00000000 */ nop +/* E07D04 802429A4 AE420078 */ sw $v0, 0x78($s2) +/* E07D08 802429A8 AE400070 */ sw $zero, 0x70($s2) +.L802429AC: +/* E07D0C 802429AC 3C05444A */ lui $a1, 0x444a +/* E07D10 802429B0 34A58000 */ ori $a1, $a1, 0x8000 +/* E07D14 802429B4 8E510078 */ lw $s1, 0x78($s2) +/* E07D18 802429B8 4480A000 */ mtc1 $zero, $f20 +/* E07D1C 802429BC 2410002D */ addiu $s0, $zero, 0x2d +/* E07D20 802429C0 AFB00010 */ sw $s0, 0x10($sp) +/* E07D24 802429C4 8E470070 */ lw $a3, 0x70($s2) +/* E07D28 802429C8 4406A000 */ mfc1 $a2, $f20 +/* E07D2C 802429CC 0C00A8ED */ jal update_lerp +/* E07D30 802429D0 24040004 */ addiu $a0, $zero, 4 +/* E07D34 802429D4 4405A000 */ mfc1 $a1, $f20 +/* E07D38 802429D8 3C06437F */ lui $a2, 0x437f +/* E07D3C 802429DC E6200048 */ swc1 $f0, 0x48($s1) +/* E07D40 802429E0 AFB00010 */ sw $s0, 0x10($sp) +/* E07D44 802429E4 8E470070 */ lw $a3, 0x70($s2) +/* E07D48 802429E8 0C00A8ED */ jal update_lerp +/* E07D4C 802429EC 24040004 */ addiu $a0, $zero, 4 +/* E07D50 802429F0 3C014F00 */ lui $at, 0x4f00 +/* E07D54 802429F4 44811000 */ mtc1 $at, $f2 +/* E07D58 802429F8 00000000 */ nop +/* E07D5C 802429FC 4600103E */ c.le.s $f2, $f0 +/* E07D60 80242A00 00000000 */ nop +/* E07D64 80242A04 45010005 */ bc1t .L80242A1C +/* E07D68 80242A08 263100AC */ addiu $s1, $s1, 0xac +/* E07D6C 80242A0C 4600010D */ trunc.w.s $f4, $f0 +/* E07D70 80242A10 44032000 */ mfc1 $v1, $f4 +/* E07D74 80242A14 08090A8E */ j .L80242A38 +/* E07D78 80242A18 A2230000 */ sb $v1, ($s1) +.L80242A1C: +/* E07D7C 80242A1C 46020001 */ sub.s $f0, $f0, $f2 +/* E07D80 80242A20 3C028000 */ lui $v0, 0x8000 +/* E07D84 80242A24 4600010D */ trunc.w.s $f4, $f0 +/* E07D88 80242A28 44032000 */ mfc1 $v1, $f4 +/* E07D8C 80242A2C 00000000 */ nop +/* E07D90 80242A30 00621825 */ or $v1, $v1, $v0 +/* E07D94 80242A34 A2230000 */ sb $v1, ($s1) +.L80242A38: +/* E07D98 80242A38 8E430070 */ lw $v1, 0x70($s2) +/* E07D9C 80242A3C 24630001 */ addiu $v1, $v1, 1 +/* E07DA0 80242A40 2862002E */ slti $v0, $v1, 0x2e +/* E07DA4 80242A44 AE430070 */ sw $v1, 0x70($s2) +/* E07DA8 80242A48 8FBF0024 */ lw $ra, 0x24($sp) +/* E07DAC 80242A4C 8FB20020 */ lw $s2, 0x20($sp) +/* E07DB0 80242A50 8FB1001C */ lw $s1, 0x1c($sp) +/* E07DB4 80242A54 8FB00018 */ lw $s0, 0x18($sp) +/* E07DB8 80242A58 D7B40028 */ ldc1 $f20, 0x28($sp) +/* E07DBC 80242A5C 38420001 */ xori $v0, $v0, 1 +/* E07DC0 80242A60 03E00008 */ jr $ra +/* E07DC4 80242A64 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s new file mode 100644 index 0000000000..63b94e3d1c --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242A68_E07DC8.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242A68_E07DC8 +/* E07DC8 80242A68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E07DCC 80242A6C AFB10014 */ sw $s1, 0x14($sp) +/* E07DD0 80242A70 0080882D */ daddu $s1, $a0, $zero +/* E07DD4 80242A74 AFBF0018 */ sw $ra, 0x18($sp) +/* E07DD8 80242A78 AFB00010 */ sw $s0, 0x10($sp) +/* E07DDC 80242A7C 8E22000C */ lw $v0, 0xc($s1) +/* E07DE0 80242A80 00A0802D */ daddu $s0, $a1, $zero +/* E07DE4 80242A84 0C0B1EAF */ jal get_variable +/* E07DE8 80242A88 8C450000 */ lw $a1, ($v0) +/* E07DEC 80242A8C 1200000C */ beqz $s0, .L80242AC0 +/* E07DF0 80242A90 0220202D */ daddu $a0, $s1, $zero +/* E07DF4 80242A94 0C0B36B0 */ jal resolve_npc +/* E07DF8 80242A98 0040282D */ daddu $a1, $v0, $zero +/* E07DFC 80242A9C AE220074 */ sw $v0, 0x74($s1) +/* E07E00 80242AA0 C4420038 */ lwc1 $f2, 0x38($v0) +/* E07E04 80242AA4 3C014334 */ lui $at, 0x4334 +/* E07E08 80242AA8 44810000 */ mtc1 $at, $f0 +/* E07E0C 80242AAC 24020048 */ addiu $v0, $zero, 0x48 +/* E07E10 80242AB0 AE220070 */ sw $v0, 0x70($s1) +/* E07E14 80242AB4 4600110D */ trunc.w.s $f4, $f2 +/* E07E18 80242AB8 E6240078 */ swc1 $f4, 0x78($s1) +/* E07E1C 80242ABC E620007C */ swc1 $f0, 0x7c($s1) +.L80242AC0: +/* E07E20 80242AC0 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07E24 80242AC4 3C0140A0 */ lui $at, 0x40a0 +/* E07E28 80242AC8 44816000 */ mtc1 $at, $f12 +/* E07E2C 80242ACC 8E300074 */ lw $s0, 0x74($s1) +/* E07E30 80242AD0 0C00A6C9 */ jal clamp_angle +/* E07E34 80242AD4 460C0301 */ sub.s $f12, $f0, $f12 +/* E07E38 80242AD8 46000306 */ mov.s $f12, $f0 +/* E07E3C 80242ADC 0C00A8D4 */ jal cos_deg +/* E07E40 80242AE0 E62C007C */ swc1 $f12, 0x7c($s1) +/* E07E44 80242AE4 3C0140C0 */ lui $at, 0x40c0 +/* E07E48 80242AE8 44811000 */ mtc1 $at, $f2 +/* E07E4C 80242AEC 00000000 */ nop +/* E07E50 80242AF0 46020002 */ mul.s $f0, $f0, $f2 +/* E07E54 80242AF4 00000000 */ nop +/* E07E58 80242AF8 C6020038 */ lwc1 $f2, 0x38($s0) +/* E07E5C 80242AFC 46001080 */ add.s $f2, $f2, $f0 +/* E07E60 80242B00 E6020038 */ swc1 $f2, 0x38($s0) +/* E07E64 80242B04 0C00A8BB */ jal sin_deg +/* E07E68 80242B08 C62C007C */ lwc1 $f12, 0x7c($s1) +/* E07E6C 80242B0C 3C014020 */ lui $at, 0x4020 +/* E07E70 80242B10 44811000 */ mtc1 $at, $f2 +/* E07E74 80242B14 00000000 */ nop +/* E07E78 80242B18 46020002 */ mul.s $f0, $f0, $f2 +/* E07E7C 80242B1C 00000000 */ nop +/* E07E80 80242B20 C6020040 */ lwc1 $f2, 0x40($s0) +/* E07E84 80242B24 46001080 */ add.s $f2, $f2, $f0 +/* E07E88 80242B28 3C014334 */ lui $at, 0x4334 +/* E07E8C 80242B2C 44816000 */ mtc1 $at, $f12 +/* E07E90 80242B30 E6020040 */ swc1 $f2, 0x40($s0) +/* E07E94 80242B34 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07E98 80242B38 0C00A6C9 */ jal clamp_angle +/* E07E9C 80242B3C 46006301 */ sub.s $f12, $f12, $f0 +/* E07EA0 80242B40 E6000034 */ swc1 $f0, 0x34($s0) +/* E07EA4 80242B44 8E230070 */ lw $v1, 0x70($s1) +/* E07EA8 80242B48 2463FFFF */ addiu $v1, $v1, -1 +/* E07EAC 80242B4C AE230070 */ sw $v1, 0x70($s1) +/* E07EB0 80242B50 8FBF0018 */ lw $ra, 0x18($sp) +/* E07EB4 80242B54 8FB10014 */ lw $s1, 0x14($sp) +/* E07EB8 80242B58 8FB00010 */ lw $s0, 0x10($sp) +/* E07EBC 80242B5C 2C620001 */ sltiu $v0, $v1, 1 +/* E07EC0 80242B60 03E00008 */ jr $ra +/* E07EC4 80242B64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s new file mode 100644 index 0000000000..b6d654c039 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242B68_E07EC8.s @@ -0,0 +1,69 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242B68_E07EC8 +/* E07EC8 80242B68 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* E07ECC 80242B6C AFB10014 */ sw $s1, 0x14($sp) +/* E07ED0 80242B70 0080882D */ daddu $s1, $a0, $zero +/* E07ED4 80242B74 AFBF0018 */ sw $ra, 0x18($sp) +/* E07ED8 80242B78 AFB00010 */ sw $s0, 0x10($sp) +/* E07EDC 80242B7C 8E22000C */ lw $v0, 0xc($s1) +/* E07EE0 80242B80 00A0802D */ daddu $s0, $a1, $zero +/* E07EE4 80242B84 0C0B1EAF */ jal get_variable +/* E07EE8 80242B88 8C450000 */ lw $a1, ($v0) +/* E07EEC 80242B8C 1200000C */ beqz $s0, .L80242BC0 +/* E07EF0 80242B90 0220202D */ daddu $a0, $s1, $zero +/* E07EF4 80242B94 0C0B36B0 */ jal resolve_npc +/* E07EF8 80242B98 0040282D */ daddu $a1, $v0, $zero +/* E07EFC 80242B9C AE220074 */ sw $v0, 0x74($s1) +/* E07F00 80242BA0 C4420038 */ lwc1 $f2, 0x38($v0) +/* E07F04 80242BA4 3C014334 */ lui $at, 0x4334 +/* E07F08 80242BA8 44810000 */ mtc1 $at, $f0 +/* E07F0C 80242BAC 24020048 */ addiu $v0, $zero, 0x48 +/* E07F10 80242BB0 AE220070 */ sw $v0, 0x70($s1) +/* E07F14 80242BB4 4600110D */ trunc.w.s $f4, $f2 +/* E07F18 80242BB8 E6240078 */ swc1 $f4, 0x78($s1) +/* E07F1C 80242BBC E620007C */ swc1 $f0, 0x7c($s1) +.L80242BC0: +/* E07F20 80242BC0 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F24 80242BC4 3C0140A0 */ lui $at, 0x40a0 +/* E07F28 80242BC8 44816000 */ mtc1 $at, $f12 +/* E07F2C 80242BCC 8E300074 */ lw $s0, 0x74($s1) +/* E07F30 80242BD0 0C00A6C9 */ jal clamp_angle +/* E07F34 80242BD4 460C0300 */ add.s $f12, $f0, $f12 +/* E07F38 80242BD8 46000306 */ mov.s $f12, $f0 +/* E07F3C 80242BDC 0C00A8D4 */ jal cos_deg +/* E07F40 80242BE0 E62C007C */ swc1 $f12, 0x7c($s1) +/* E07F44 80242BE4 3C0140C0 */ lui $at, 0x40c0 +/* E07F48 80242BE8 44811000 */ mtc1 $at, $f2 +/* E07F4C 80242BEC 00000000 */ nop +/* E07F50 80242BF0 46020002 */ mul.s $f0, $f0, $f2 +/* E07F54 80242BF4 00000000 */ nop +/* E07F58 80242BF8 C6020038 */ lwc1 $f2, 0x38($s0) +/* E07F5C 80242BFC 46001080 */ add.s $f2, $f2, $f0 +/* E07F60 80242C00 E6020038 */ swc1 $f2, 0x38($s0) +/* E07F64 80242C04 0C00A8BB */ jal sin_deg +/* E07F68 80242C08 C62C007C */ lwc1 $f12, 0x7c($s1) +/* E07F6C 80242C0C 3C014020 */ lui $at, 0x4020 +/* E07F70 80242C10 44811000 */ mtc1 $at, $f2 +/* E07F74 80242C14 00000000 */ nop +/* E07F78 80242C18 46020002 */ mul.s $f0, $f0, $f2 +/* E07F7C 80242C1C 00000000 */ nop +/* E07F80 80242C20 C6020040 */ lwc1 $f2, 0x40($s0) +/* E07F84 80242C24 46001080 */ add.s $f2, $f2, $f0 +/* E07F88 80242C28 3C014334 */ lui $at, 0x4334 +/* E07F8C 80242C2C 44816000 */ mtc1 $at, $f12 +/* E07F90 80242C30 E6020040 */ swc1 $f2, 0x40($s0) +/* E07F94 80242C34 C620007C */ lwc1 $f0, 0x7c($s1) +/* E07F98 80242C38 0C00A6C9 */ jal clamp_angle +/* E07F9C 80242C3C 46006301 */ sub.s $f12, $f12, $f0 +/* E07FA0 80242C40 E6000034 */ swc1 $f0, 0x34($s0) +/* E07FA4 80242C44 8E230070 */ lw $v1, 0x70($s1) +/* E07FA8 80242C48 2463FFFF */ addiu $v1, $v1, -1 +/* E07FAC 80242C4C AE230070 */ sw $v1, 0x70($s1) +/* E07FB0 80242C50 8FBF0018 */ lw $ra, 0x18($sp) +/* E07FB4 80242C54 8FB10014 */ lw $s1, 0x14($sp) +/* E07FB8 80242C58 8FB00010 */ lw $s0, 0x10($sp) +/* E07FBC 80242C5C 2C620001 */ sltiu $v0, $v1, 1 +/* E07FC0 80242C60 03E00008 */ jr $ra +/* E07FC4 80242C64 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s new file mode 100644 index 0000000000..cc8a7a58d1 --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C68_E07FC8.s @@ -0,0 +1,15 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C68_E07FC8 +/* E07FC8 80242C68 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* E07FCC 80242C6C AFBF0010 */ sw $ra, 0x10($sp) +/* E07FD0 80242C70 8C82000C */ lw $v0, 0xc($a0) +/* E07FD4 80242C74 0C0B1EAF */ jal get_variable +/* E07FD8 80242C78 8C450000 */ lw $a1, ($v0) +/* E07FDC 80242C7C 8FBF0010 */ lw $ra, 0x10($sp) +/* E07FE0 80242C80 3C018024 */ lui $at, 0x8024 +/* E07FE4 80242C84 AC225D34 */ sw $v0, 0x5d34($at) +/* E07FE8 80242C88 24020002 */ addiu $v0, $zero, 2 +/* E07FEC 80242C8C 03E00008 */ jr $ra +/* E07FF0 80242C90 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s new file mode 100644 index 0000000000..b21718ceab --- /dev/null +++ b/asm/nonmatchings/world/area_end/end_01/E07C20/func_80242C94_E07FF4.s @@ -0,0 +1,27 @@ +.set noat # allow manual use of $at +.set noreorder # don't insert nops after branches + +glabel func_80242C94_E07FF4 +/* E07FF4 80242C94 3C06FC12 */ lui $a2, 0xfc12 +/* E07FF8 80242C98 34C64624 */ ori $a2, $a2, 0x4624 +/* E07FFC 80242C9C 3C05FF8F */ lui $a1, 0xff8f +/* E08000 80242CA0 3C04800A */ lui $a0, 0x800a +/* E08004 80242CA4 2484A66C */ addiu $a0, $a0, -0x5994 +/* E08008 80242CA8 8C820000 */ lw $v0, ($a0) +/* E0800C 80242CAC 34A5FFFF */ ori $a1, $a1, 0xffff +/* E08010 80242CB0 0040182D */ daddu $v1, $v0, $zero +/* E08014 80242CB4 24420008 */ addiu $v0, $v0, 8 +/* E08018 80242CB8 AC820000 */ sw $v0, ($a0) +/* E0801C 80242CBC AC660000 */ sw $a2, ($v1) +/* E08020 80242CC0 AC650004 */ sw $a1, 4($v1) +/* E08024 80242CC4 24430008 */ addiu $v1, $v0, 8 +/* E08028 80242CC8 AC830000 */ sw $v1, ($a0) +/* E0802C 80242CCC 3C048024 */ lui $a0, 0x8024 +/* E08030 80242CD0 90845D37 */ lbu $a0, 0x5d37($a0) +/* E08034 80242CD4 3C03FA00 */ lui $v1, 0xfa00 +/* E08038 80242CD8 AC430000 */ sw $v1, ($v0) +/* E0803C 80242CDC 03E00008 */ jr $ra +/* E08040 80242CE0 AC440004 */ sw $a0, 4($v0) +/* E08044 80242CE4 00000000 */ nop +/* E08048 80242CE8 00000000 */ nop +/* E0804C 80242CEC 00000000 */ nop diff --git a/src/world/area_end/end_01/E05390.c b/src/world/area_end/end_01/E05390.c index 94107c3521..a2979d96c7 100644 --- a/src/world/area_end/end_01/E05390.c +++ b/src/world/area_end/end_01/E05390.c @@ -47,17 +47,3 @@ INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802427E8_E07B48); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242840_E07BA0); INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_8024289C_E07BFC); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_802428C0_E07C20); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242900_E07C60); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242978_E07CD8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242A68_E07DC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242B68_E07EC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C68_E07FC8); - -INCLUDE_ASM(s32, "world/area_end/end_01/E05390", func_80242C94_E07FF4); diff --git a/src/world/area_end/end_01/E07C20.c b/src/world/area_end/end_01/E07C20.c new file mode 100644 index 0000000000..8b2f6350ad --- /dev/null +++ b/src/world/area_end/end_01/E07C20.c @@ -0,0 +1,15 @@ +#include "end_01.h" + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_802428C0_E07C20); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242900_E07C60); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242978_E07CD8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242A68_E07DC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242B68_E07EC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C68_E07FC8); + +INCLUDE_ASM(s32, "world/area_end/end_01/E07C20", func_80242C94_E07FF4); diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py new file mode 100644 index 0000000000..071c20706a --- /dev/null +++ b/tools/sort_symbol_addrs.py @@ -0,0 +1,26 @@ +#!/usr/bin/python3 + +from collections import OrderedDict +import os +import sys + +script_dir = os.path.dirname(os.path.realpath(__file__)) + +syms = {} + +file_path = os.path.join(script_dir, "symbol_addrs.txt") + +with open(file_path) as f: + symbol_lines = f.readlines() + +for line in symbol_lines: + addr_text = line.split(" = ")[1][:10] + addr = int(addr_text, 0) + if addr in syms: + print("Duplicate address: " + addr_text) + sys.exit(55) + syms[addr] = line + +with open("test.txt", newline="\n", mode="w") as f: + for addr in sorted(syms): + f.write(syms[addr]) diff --git a/tools/splat.yaml b/tools/splat.yaml index 12d0deebb3..ea63745321 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -488,7 +488,7 @@ segments: files: - [0x33E8C0, "c"] - [0x33efe0, "bin"] - - [0x33D610, "bin"] + - [0x33F210, "bin"] - type: code start: 0x33FE80 vram: 0xE002C000 @@ -6436,6 +6436,7 @@ segments: - [0xE05360, "c"] - [0xE05370, "c"] - [0xE05390, "c"] + - [0xE07C20, "c"] - [0xE08050, "c"] - [0xE08350, "bin"] - [0xE08470, "bin"] diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 3db8a5f395..dddb3344c8 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -1,1909 +1,1907 @@ -ActorExists;0x8026DE5C -ActorSpeak;0x80252F30 -AddActorDecoration;0x8026EE88 -AddActorPos;0x8026B92C -AddActorVar;0x8026C0D4 -AddBadge;0x802D6FF8 -AddBattleCamOffsetZ;0x8024EA98 -AddBattleCamZoom;0x8024ECAC -AddCoin;0x802D7278 -AddGoalPos;0x8026A748 -AddItem;0x802D6A98 -AddKeyItem;0x802D68C8 -AddPartDispOffset;0x8026BD88 -AddPartMovementVar;0x8026C2E8 -AddStarPieces;0x802D72F0 -AddStarPoints;0x802D72B4 -AddVectorPolar;0x802D4B14 -AdjustCam;0x802CC660 -AfflictActor;0x8027D67C -ApplyShrinkFromOwner;0x80254198 -AssignAreaFlag;0x80111FF8 -AssignBlockFlag;0x8011206C -AssignCrateFlag;0x80112170 -AssignFlag;0x801120B8 -AssignPanelFlag;0x80112114 -AssignScript;0x80111FB0 -AwaitPlayerApproach;0x802D48AC -AwaitPlayerLeave;0x802D4A5C -BattleCamTargetActor;0x8024EB24 -BindHandleEvent;0x80278C20 -BindIdle;0x80278A94 -BindNextTurn;0x80278C94 -BindNpcAI;0x80044A78 -BindNpcAux;0x80044EB8 -BindNpcDefeat;0x800451DC -BindNpcHit;0x80045140 -BindNpcIdle;0x80044BAC -BindNpcInteract;0x800450A4 -BindTakeTurn;0x80278930 -BoostAttack;0x8026FCD4 -BoostDefense;0x80270174 -BringPartnerOut;0x802CF5B8 -BtlBringPartnerOut;0x80280B6C -BtlPutPartnerAway;0x80280A34 -CancelMessage;0x802D0C20 -CancelMessageAndBlock;0x802D0C48 -CancelablePlayerRunToGoal;0x80273EFC -ChangeModelAnimation;0x802CCF6C -CheckActionState;0x802831DC -CheckButtonDown;0x8026E108 -CheckButtonHeld;0x8026E0D0 -CheckButtonPress;0x8026E098 -ChooseNextTarget;0x8026E414 -ClampAngleFloat;0x802D5AB4 -ClampAngleInt;0x802D5A58 -ClearAmbientSounds;0x802D60E8 -ClearDefeatedEnemies;0x80045640 -ClearPartnerMoveHistory;0x802CF370 -ClearStatusEffects;0x8027DDA0 -CloneModel;0x802C8F28 -CloseActionCommandInfo;0x80269410 -CloseChoice;0x802D0BF8 -CloseMessage;0x802D0A98 -ContinueSpeech;0x802D02E8 -CopyBuffs;0x80271160 -CopyStatusEffects;0x8027DCBC -CountFortressKeys;0x802D6C4C -CountPlayerTargets;0x8026A14C -CreateNpc;0x802CDBA4 -CreatePartShadow;0x8026F52C -CreatePushBlockGrid;0x802832E0 -DeleteNpc;0x802CDC1C -DeletePartner;0x802807A8 -DeleteTrigger;0x802C6824 -DemoJoystickRadial;0x802D9B64 -DemoJoystickXY;0x802D9C10 -DemoPressButton;0x802D9AC0 -DemoReleaseButton;0x802D9AF8 -DemoSetButtons;0x802D9B34 -DidActionSucceed;0x80276EB4 -Disable8bitMario;0x802D2B88 -DisablePartner;0x802D1F38 -DisablePartnerAI;0x802CF4E8 -DisablePartnerBlur;0x802456D8 -DisablePlayerInput;0x802D0E28 -DisablePlayerPhysics;0x802D0DE4 -DisablePulseStone;0x802D2AA8 -DispatchDamageEvent;0x8027D1BC -DispatchDamagePlayerEvent;0x8027491C -DispatchEvent;0x8027D264 -DoAirLift;0x8029C37C -DoBasicAI;0x8004A47C -DoBlowAway;0x8029C4A8 -DoBurnHit;0x8029A0D0 -DoDeath;0x8029AEC0 -DoDizzyAttack;0x8028907C -DoDizzyHit;0x802945FC -DoFreezeHit;0x8029466C -DoImmune;0x8029AC70 -DoJumpBack;0x8029BD70 -DoNormalHit;0x80299044 -DoNpcDefeat;0x8004462C -DoParalyzeHit;0x80294618 -DoPoisonHit;0x80294634 -DoRecover;0x8029BFA0 -DoReturnHome;0x8029BEB8 -DoScareAway;0x8029B22C -DoShinkHit;0x802946B8 -DoShockHit;0x8029A6FC -DoSleepHit;0x802945E0 -DoSpinSmashHit;0x8029B998 -DoStopHit;0x80294650 -DropItemEntity;0x802D6DC0 -DropItemEntityB;0x802D6EC0 -DropStarPoints;0x8027C8A4 -ElectrifyActor;0x8027095C -EnableActorBlur;0x8027D57C -EnableActorGlow;0x8027DBA4 -EnableGroup;0x802C9B98 -EnableIdleScript;0x80278B4C -EnableModel;0x802C9288 -EnableNpcAI;0x80044CF0 -EnableNpcAux;0x80044FF0 -EnableNpcBlur;0x802CF2EC -EnableNpcShadow;0x802CF268 -EnablePartner;0x802D1EFC -EnablePartnerAI;0x802CF52C -EnablePartnerBlur;0x802456B8 -EnablePlayerBlur;0x80274978 -EnableSpriteShading;0x802D9A3C -EnableStatusMenu;0x802D5998 -EnableTexPanning;0x802C9208 -EndActorSpeech;0x802532D0 -EndSpeech;0x802D02CC -EnemyCreateTargetList;0x8026E310 -EnemyDamageTarget;0x8027CCB4 -EnemyFollowupAfflictTarget;0x8027CED4 -EnemyTestTarget;0x8027CFB8 -EnterDoubleDoor;0x80285E74 -EnterSavePoint;0x80285CB0 -EnterSingleDoor;0x80285DD4 -EnterWalk;0x80285960 -EnterWalkShort;0x80285A60 -ExitDoubleDoor;0x80285E4C -ExitSingleDoor;0x80285DAC -ExitWalk;0x80285CF4 -FXRecoverFP;0x80261C68 -FXRecoverHP;0x80261BA8 -FadeBackgroundToBlack;0x8003EF00 -FadeInMusic;0x802D5DF4 -FadeOutMusic;0x802D5CE0 -FallPartTo;0x8027A854 -FallToGoal;0x80279BEC -FindItem;0x802D6B18 -FindKeyItem;0x802D6A14 -FlyPartTo;0x8027BF38 -FlyToGoal;0x8027B624 -ForceCloseMessageBox;0x802513F0 -ForceHomePos;0x8026A1EC -ForceNextTarget;0x80298BF0 -FreezeBattleCam;0x8024ED78 -FullyRestoreHPandFP;0x802D1EC0 -FullyRestoreSP;0x802D1EE0 -GetActionSuccess;0x80269294 -GetActionSuccessCopy;0x802694F8 -GetActorAttackBoost;0x8026FC04 -GetActorDefenseBoost;0x8026FC6C -GetActorFlags;0x8026CF20 -GetActorHP;0x8027C6A0 -GetActorLevel;0x8027FD48 -GetActorPos;0x8026AAA8 -GetActorRotation;0x8026C56C -GetActorScale;0x8026CA84 -GetActorSize;0x8027D8E0 -GetActorVar;0x8026BFB4 -GetActorYaw;0x8026B3C8 -GetAngleBetweenNPCs;0x802D4708 -GetAngleToNPC;0x802D47B4 -GetAngleToPlayer;0x802D4830 -GetAnimation;0x8026B238 -GetBattleFlags;0x8026CD10 -GetBattleFlags2;0x8026CDA0 -GetBattleOutcome;0x8004457C -GetBattlePhase;0x80269E28 -GetBattleState;0x8026E140 -GetBattleVar;0x8026F694 -GetBlockResult;0x8026957C -GetCamDistance;0x802CC084 -GetCamLookAtObjVector;0x8003F398 -GetCamPitch;0x802CBFF4 -GetCamPosA;0x802CC0F4 -GetCamPosB;0x802CC184 -GetCamPosC;0x802CC214 -GetCamPosition;0x802CC2A4 -GetCamType;0x802CBF64 -GetColliderCenter;0x802CA0AC -GetCurrentActorType;0x8027DAD4 -GetCurrentPartner;0x802D2B0C -GetCurrentPartnerID;0x802CFC74 -GetDamageIntensity;0x80280840 -GetDemoState;0x802D9A90 -GetDist2D;0x802D5770 -GetDistanceToGoal;0x8026E9FC -GetEncounterState;0x8027D7C4 -GetEnemyMaxHP;0x8027C748 -GetEntryID;0x802CA460 -GetGoalPos;0x8026A820 -GetGridIndexFromPos;0x802836B8 -GetHomePos;0x8026AD74 -GetIdleGoal;0x8026A8EC -GetIndexFromHome;0x8026A0D4 -GetIndexFromPos;0x8026A05C -GetItemPower;0x802D732C -GetLastDamage;0x8027DB3C -GetLastElement;0x80269E54 -GetLastEvent;0x8027C4E0 -GetLoadType;0x802CA4C0 -GetMapID;0x802CA490 -GetMenuSelection;0x802733C4 -GetModelCenter;0x802C8F80 -GetModelIndex;0x802C8E8C -GetNextPathPos;0x802D5524 -GetNpcAnimation;0x802CE160 -GetNpcPointer;0x802CDC58 -GetNpcPos;0x802CF0F4 -GetNpcVar;0x800453BC -GetNpcYaw;0x802CEA10 -GetOriginalActorType;0x8027DA68 -GetOwnerEncounterTrigger;0x80044600 -GetOwnerID;0x8026DE00 -GetOwnerTarget;0x8026E8AC -GetPartDispOffset;0x8026BAE8 -GetPartEventFlags;0x8026D488 -GetPartFlags;0x8026D218 -GetPartMovementVar;0x8026C170 -GetPartOffset;0x8026AB74 -GetPartPos;0x8026AC88 -GetPartRotation;0x8026C828 -GetPartScale;0x8026CC34 -GetPartTarget;0x8026A9B8 -GetPartTargetFlags;0x8026D2AC -GetPartYaw;0x8026B4C0 -GetPartnerPos;0x802CF438 -GetPlayerActionState;0x802D1DD0 -GetAttackerActorID;0x8026E974 -GetPlayerAnimation;0x802D1E94 -GetPlayerHP;0x80274234 -GetPlayerPos;0x802D1DFC -GetPlayerTargetYaw;0x802D1D28 -GetPushBlock;0x802835C0 -GetSelfAnimationFromTable;0x80045734 -GetSelfNpcID;0x80045614 -GetSelfVar;0x800452C0 -GetStatusFlags;0x8026F230 -GetTargetListLength;0x8026E864 -GetValueByRef;0x802D593C -GotoMap;0x802CA400 -GotoMapByID;0x802CA440 -GotoMapSpecial;0x802CA420 -HPBarToCurrent;0x8026D7A8 -HPBarToHome;0x8026D664 -HasKeyItem;0x802D699C -HasMerleeCasts;0x8003F3F4 -HasMerleeCastsLeft;0x802619C8 -HealActor;0x80270CA4 -HidePlayerShadow;0x802D0DA0 -IdleFlyToGoal;0x8027BBB8 -IdleJumpToGoal;0x8027910C -IdleRunToGoal;0x8027A264 -IncrementPlayerFP;0x80261D60 -IncrementPlayerHP;0x80261D28 -InitTargetIterator;0x8026E354 -InterpNpcYaw;0x802CEB04 -InterpPlayerYaw;0x802D193C -IsMessageBoxDisplayed;0x80251384 -IsPlayerWithin;0x802D4964 -ItemAfflictEnemy;0x80252924 -ItemCheckHit;0x80252D40 -ItemDamageEnemy;0x80252728 -JumpPartTo;0x8027A4E4 -JumpToGoal;0x80278D08 -JumpWithBounce;0x80279728 -LandJump;0x80279AD4 -LoadActionCommand;0x802681C0 -LoadBattleDmaData;0x80253624 -LoadBattleSection;0x80269DE4 -LoadDemoBattle;0x80044264 -LoadFreeItemScript;0x8026801C -LoadItemScript;0x80267ED0 -LoadModelAnimation;0x802CCCEC -LoadMoveScript;0x80268130 -LoadPath;0x802D5430 -LoadSettings;0x802CB9F8 -LoadStarPowerScript;0x80280950 -MakeDoorAdvanced;0x80281CAC -MakeEntity;0x80111D38 -MakeItemEntity;0x802D6CC0 -MakeLerp;0x802D45B0 -MakeNpcs;0x80044298 -MakeOwnerTargetIndex;0x8027FBB8 -MakeShop;0x80281860 -MakeShopOwner;0x80281BD8 -MakeStatusField;0x80253B94 -MarioEnterStage;0x80284A40 -MerleeAttackBonus;0x80288400 -MerleeDefenseBonus;0x8028870C -MerleeExpBonus;0x80288A58 -MerleeRunOut;0x80288398 -ModifyActorDecoration;0x8026EFF0 -ModifyColliderFlags;0x802C9DCC -MoveBattleCamOver;0x8024EC08 -MultiplyByActorScale;0x80253FDC -MultiplyVec2ByActorScale;0x80254048 -MultiplyVec3ByActorScale;0x802540DC -NOP_npc_callback;0x80038470 -NOP_state;0x80112B90 -NpcFaceNpc;0x802CEE80 -NpcFacePlayer;0x802CECC8 -NpcFlyTo;0x802CE6FC -NpcJump0;0x802CE6C4 -NpcJump1;0x802CE6E0 -NpcMoveTo;0x802CE22C -OnDefeatEnemy;0x8003F580 -OnFleeBattleDrops;0x8003F6E8 -OverrideBattleDmaDest;0x802535F8 -PanToTarget;0x802CB79C -ParentColliderToModel;0x802CA114 -PartnerAfflictEnemy;0x80280004 -PartnerCanUseAbility;0x802CFCA0 -PartnerDamageEnemy;0x8027FDB4 -PartnerIsFlying;0x802CFCE8 -PartnerPowerBounceEnemy;0x80280270 -PartnerTestEnemy;0x802804D0 -PauseTakeTurn;0x802789A4 -PeachEnterStage;0x80284D04 -PlayAmbientSounds;0x802D611C -PlayDrinkFX;0x80287948 -PlayEatFX;0x802878D0 -PlayEffect;0x802D829C -PlayLoopingSoundAtActor;0x80253974 -PlayModelAnimation;0x802CCE6C -PlaySound;0x802D6150 -PlaySoundAt;0x802D61DC -PlaySoundAtActor;0x8025385C -PlaySoundAtCollider;0x802CA614 -PlaySoundAtF;0x802D636C -PlaySoundAtModel;0x802CA558 -PlaySoundAtNpc;0x802D01AC -PlaySoundAtPart;0x802538D0 -PlaySoundAtPlayer;0x802D2CD8 -PlayerCreateTargetList;0x8026E2CC -PlayerDamageEnemy;0x80274260 -PlayerFaceNpc;0x802D1B04 -PlayerFallToGoal;0x80273894 -PlayerFirstStrike;0x802851FC -PlayerHappy;0x80288D64 -PlayerJump;0x802D18E8 -PlayerJump1;0x802D1904 -PlayerJump2;0x802D1920 -PlayerLandJump;0x80273B04 -PlayerMoveTo;0x802D1134 -PlayerPowerBounceEnemy;0x802744A0 -PlayerRunToGoal;0x80273C64 -PlayerTestEnemy;0x802746F0 -PutPartnerAway;0x802CF988 -RandInt;0x802D46B0 -RegainAbility;0x80289110 -RemoveActor;0x8027C7B0 -RemoveActorDecoration;0x8026EF4C -RemoveBadge;0x802D7050 -RemoveEffect;0x802D7AE4 -RemoveEncounter;0x80044478 -RemoveFortressKeys;0x802D6C94 -RemoveItem;0x802D6B9C -RemoveItemAt;0x802D688C -RemoveItemEntity;0x802D6FCC -RemoveKeyItemAt;0x802D6858 -RemoveNpc;0x80044340 -RemovePartShadow;0x8026F59C -RemovePlayerBuffs;0x8026F44C -ResetActorSounds;0x8026F838 -ResetAllActorSounds;0x8026F6EC -ResetCam;0x802CC8C8 -ResetFromLava;0x802C9ED8 -RestartNpcAI;0x80044C2C -RestartNpcAux;0x80044F38 -ResumeTakeTurn;0x80278A1C -RotateGroup;0x802C98D8 -RotateModel;0x802C8C64 -RunAwayFail;0x80287078 -RunAwayReset;0x80287128 -RunAwayStart;0x802868BC -RunPartTo;0x8027ACAC -RunToGoal;0x80279E64 -ScaleGroup;0x802C9A1C -ScaleModel;0x802C8D88 -SetActionSuccess;0x802692C0 -SetActorDispOffset;0x8026BA04 -SetActorFlagBits;0x8026CE8C -SetActorFlags;0x8026CE30 -SetActorIdleJumpGravity;0x8026B5D8 -SetActorIdleSpeed;0x8026B6D0 -SetActorJumpGravity;0x8026B55C -SetActorPos;0x8026AE40 -SetActorRotation;0x8026C3AC -SetActorRotationOffset;0x8026C4AC -SetActorScale;0x8026C904 -SetActorScaleModifier;0x8026C9C4 -SetActorSize;0x8027D810 -SetActorSounds;0x8026F740 -SetActorSpeed;0x8026B654 -SetActorType;0x8026FB20 -SetActorVar;0x8026C044 -SetActorYaw;0x8026B358 -SetAnimation;0x8026B1B0 -SetAnimationRate;0x8026B2D0 -SetBattleCamOffsetZ;0x8024EA58 -SetBattleCamTarget;0x8024E90C -SetBattleCamYaw;0x8024EAE4 -SetBattleCamZoom;0x8024EC6C -SetBattleFlagBits;0x8026CD3C -SetBattleFlagBits2;0x8026CDCC -SetBattleInputButtons;0x8026E068 -SetBattleInputMask;0x8026E050 -SetBattleMusic;0x80044A38 -SetBattleVar;0x8026F638 -SetCamBGColor;0x802CAD98 -SetCamDistance;0x802CBBE4 -SetCamEnabled;0x802CA6C0 -SetCamFlag80;0x802CA774 -SetCamLeadPlayer;0x802CB680 -SetCamPerspective;0x802CA828 -SetCamPitch;0x802CBB48 -SetCamPosA;0x802CBC58 -SetCamPosB;0x802CBCF4 -SetCamPosC;0x802CBD90 -SetCamProperties;0x802CC3EC -SetCamSpeed;0x802CBEF0 -SetCamTarget;0x802CAF2C -SetCamType;0x802CBAB4 -SetCamViewport;0x802CAB18 -SetDefenseTable;0x8027CA74 -SetEncounterStatusFlags;0x80044180 -SetEnemyFlagBits;0x80045688 -SetEnemyHP;0x8027C5C8 -SetEnemyTargetOffset;0x8026B0A0 -SetForegroundModelsVisible;0x80253AEC -SetGameMode;0x802D5A28 -SetGoalPos;0x8026A510 -SetGoalToFirstTarget;0x8026A49C -SetGoalToHome;0x80269EC4 -SetGoalToIndex;0x80269F94 -SetGoalToTarget;0x8026A3A8 -SetGroupEnabled;0x802C9308 -SetHomePos;0x8026A2D0 -SetIdleAnimations;0x8027CB7C -SetIdleGoal;0x8026A62C -SetIdleGoalToHome;0x80269F2C -SetItemFlags;0x802D7194 -SetItemPos;0x802D70D0 -SetJumpAnimations;0x8026B88C -SetMessageBoxDuration;0x80251408 -SetMessageImages;0x802D0C70 -SetMessageString;0x802D0CEC -SetMessageValue;0x802D0D44 -SetModelFlag10;0x802C907C -SetModelFlags;0x802C9518 -SetMusicTrack;0x802D5D4C -SetNpcAnimation;0x802CE0F4 -SetNpcAnimationSpeed;0x802CE1C0 -SetNpcAux;0x80044DA4 -SetNpcCollisionSize;0x802CDF8C -SetNpcEffect;0x802D0118 -SetNpcFlagBits;0x802CF060 -SetNpcJumpscale;0x802CE088 -SetNpcPos;0x802CDCB0 -SetNpcRotation;0x802CDDB0 -SetNpcScale;0x802CDED4 -SetNpcSpeed;0x802CE01C -SetNpcVar;0x80045320 -SetNpcYaw;0x802CEA84 -SetOwnerID;0x8026DE28 -SetOwnerTarget;0x8026E3A8 -SetPanTarget;0x802CBE2C -SetPartAlpha;0x8026F470 -SetPartDispOffset;0x8026BC38 -SetPartEventBits;0x8026D3C8 -SetPartEventFlags;0x8026D340 -SetPartFlagBits;0x8026D010 -SetPartFlags;0x8026CF88 -SetPartGoalToTarget;0x8026A404 -SetPartJumpGravity;0x8026B74C -SetPartMoveSpeed;0x8026B7EC -SetPartMovementVar;0x8026C22C -SetPartPos;0x8026AF18 -SetPartRotation;0x8026C634 -SetPartRotationOffset;0x8026C740 -SetPartScale;0x8026CB4C -SetPartSize;0x8027D970 -SetPartSounds;0x8026FA00 -SetPartTargetFlagBits;0x8026D158 -SetPartTargetFlags;0x8026D0D0 -SetPartYaw;0x8026B438 -SetPlayerActionState;0x802D10D8 -SetPlayerAnimation;0x802D1084 -SetPlayerAnimationSpeed;0x802D1104 -SetPlayerCollisionSize;0x802D0FB0 -SetPlayerFlagBits;0x802D1D60 -SetPlayerJumpscale;0x802D1054 -SetPlayerPos;0x802D0EF0 -SetPlayerSpeed;0x802D1024 -SetPushBlock;0x8028347C -SetPushBlockFallEffect;0x802837AC -SetRenderMode;0x802CA4F4 -SetSelfEnemyFlagBits;0x80045524 -SetSelfEnemyFlags;0x8004550C -SetSelfRotation;0x8004545C -SetSelfVar;0x8004525C -SetSpriteShading;0x802D9700 -SetStatusTable;0x8027CB08 -SetTargetActor;0x8027C548 -SetTargetOffset;0x8027D380 -SetTexPanOffset;0x802C9364 -SetTexPanner;0x802C9000 -SetValueByRef;0x802D58E0 -SetZoneEnabled;0x802CA254 -ShakeCam;0x802CB2A8 -ShakeCam1;0x802D9CB0 -ShakeCamX;0x802D9CE8 -ShowBattleChoice;0x80253538 -ShowChoice;0x802D0B6C -ShowCoinCounter;0x800E96F8 -ShowEmote;0x802D78A0 -ShowGotItem;0x802D73A4 -ShowMessageAtScreenPos;0x802D0894 -ShowMessageAtWorldPos;0x802D095C -ShowMessageBox;0x802512B4 -ShowShockEffect;0x8026FBB0 -ShowSleepBubble;0x802D8028 -ShowStatusMenu;0x802D59DC -ShowVariableMessageBox;0x8025130C -SpeakToNpc;0x802D0304 -SpeakToPlayer;0x802D02B0 -StartBattle;0x80044840 -StartBattleWith;0x80044860 -StartBossBattle;0x8004489C -StartDefend;0x802852B8 -StartRumble;0x80254218 -StartRumbleWithParams;0x80267D9C -StopLoopingSoundAtActor;0x80253A18 -StopSound;0x802D62B8 -SummonEnemy;0x8026DB64 -SwitchMessage;0x802D0AFC -TeleportPartnerToPlayer;0x8028387C -TranslateGroup;0x802C97B4 -TranslateModel;0x802C8B60 -UnfadeBackgroundFromBlack;0x8003EF98 -UpdateColliderTransform;0x802CA188 -UpdateLerp;0x802D462C -UseCamPreset;0x8024E61C -UseDoorSounds;0x802D6314 -UseEntryHeading;0x802D1F70 -UseExitHeading;0x802D216C -UseIdleAnimation;0x8026F0EC -UseLifeShroom;0x802879C0 -UseMystery;0x80293E40 -UseSettingsFrom;0x802CB860 -VanishActor;0x80270614 -WaitForBuffDone;0x8027114C -WaitForCam;0x802CC354 -WaitForMessageBoxDone;0x802513CC -WasStatusInflicted;0x8027DC68 -YieldTurn;0x8027D7F0 -_Genld;0x8006C0B4 -_Ldtob;0x8006BBD0 -_Ldunscale;0x8006C01C -_Litob;0x8006B980 -_Printf;0x80064AA0 -_Putfld;0x80065020 -_add_hit_vert_to_buffer;0x8005B9A0 -_bound_script_trigger_handler;0x802C667C -_create_npc;0x80038598 -_draw_message_box;0x8012CC08 -_get_hit_vert_index_from_buffer;0x8005B9F4 -_heap_create;0x80029030 -_heap_free;0x8002921C -_heap_malloc;0x8002906C -_heap_malloc_tail;0x80029164 -_heap_realloc;0x800292C4 -_load_model_textures;0x80115B44 -_load_string;0x8012591C -_npc_jump_to;0x802CE434 -_play_sound;0x80149AB8 -_remove_part_decoration;0x8025D03C -_set_game_mode;0x80112CA8 -_set_music_track;0x8014A7E0 -_show_message;0x802D0320 -_spr_sign_extend_12bit;0x802DD0DC -_spr_sign_extend_16bit;0x802DD0FC -_update_message;0x80123898 -_wrap_trig_lookup_value;0x8002A034 -activate_defend_command;0x80260B04 -add_SP;0x800EA1F4 -add_actor_decoration;0x80267190 -add_badge;0x800E773C -add_cam_zoom;0x8024E5B4 -add_coins;0x800EA0C0 -add_fortress_keys;0x800EA398 -add_item;0x800E7574 -add_part_decoration;0x80267114 -add_star_pieces;0x800EA170 -add_star_points;0x800EA128 -add_vec2D_polar;0x80029F9C -add_xz_vec3f;0x80264128 -add_xz_vec3f_copy1;0x802641C0 -add_xz_vec3f_copy2;0x80264258 -ai;0x8006AD64 -alAudioFrame;0x800565C0 -alHeapAlloc;0x80057F90 -alLink;0x8004B3EC -alUnlink;0x8004B40C -al_CopyFileTableEntry;0x8005447C -al_CopyWords;0x80054F74 -al_DmaCopy;0x80054E00 -al_LoadBKHeaders;0x80054FC0 -al_LoadBank;0x800547C8 -al_LoadINIT;0x800542BC -al_LoadPER;0x800544F8 -al_LoadPRG;0x800545B4 -allocate_hit_tables;0x8005AEA0 -appedGfx_npc_blur;0x8003AE38 -appendGfx_item_entity;0x801321A4 -appendGfx_model;0x80113090 -appendGfx_model_group;0x80117C94 -appendGfx_npc;0x80039FD0 -appendGfx_player;0x800E12F4 -appendGfx_player_spin;0x800E1704 -atan2;0x80029C80 -battle_heap_create;0x8002ACA0 -bcmp;0x8006B870 -bcopy;0x80064650 -begin_battle;0x80241218 -begin_state_battle;0x800338D0 -begin_state_init;0x80033540 -begin_state_intro;0x80036650 -begin_state_logos;0x80033E70 -begin_state_pause_menu;0x80034940 -begin_state_title_screen;0x80036DF0 -begin_state_world;0x80035D30 -bind_dynamic_entity_3;0x80123158 -bind_dynamic_entity_7;0x8012323C -bind_dynamic_entity_B;0x80123320 -bind_enemy_ai;0x8003E94C -bind_enemy_aux;0x8003E9B4 -bind_enemy_interact;0x8003EA1C -bind_npc_ai;0x8003EA84 -bind_npc_aux;0x8003EB50 -bind_npc_interact;0x8003EC1C -boot_idle;0x8005E90C -boot_main;0x80025F70 -!bzero;0x80064970 -calc_enemy_damage_target;0x8027742C -calc_enemy_test_target;0x802771F8 -calc_item_check_hit;0x802515D0 -calc_item_damage_enemy;0x802516E8 -calc_partner_damage_enemy;0x8027E328 -calc_partner_test_enemy;0x8027DF7C -calc_player_damage_enemy;0x80271944 -calc_player_test_enemy;0x80271754 -calculate_model_sizes;0x8011612C -cam_target_actor;0x8024E43C -can_pause;0x800E69DC -can_switch_to_player;0x802A5818 -cancel_message;0x80125B08 -check_block_input;0x80268ECC -check_input_hammer;0x800E60E0 -check_input_jump;0x800E6160 -check_input_midair_jump;0x800E4FCC -check_input_open_menus;0x800E6CE4 -check_input_spin;0x800E6268 -check_input_status_menu;0x800E728C -check_input_use_partner;0x800DFA00 -clamp_angle;0x80029B24 -clamp_printer_coords;0x80125AB8 -clear_area_flag;0x8014554C -clear_area_flags;0x80145390 -clear_character_set;0x80123660 -clear_dynamic_entity_list;0x801230B8 -clear_encounter_status;0x8003E400 -clear_entity_data;0x80110CB8 -clear_global_flag;0x801453E0 -clear_icon_flags;0x80144A2C -clear_item_entity_data;0x80130FF0 -clear_item_entity_flags;0x80134188 -clear_model_data;0x80115D44 -clear_npcs;0x800384BC -clear_partner_move_history;0x800EF45C -clear_player_data;0x800E73A0 -clear_player_status;0x800DFC50 -clear_printers;0x80123674 -clear_saved_variables;0x80145320 -clear_script_flags;0x802C4880 -clear_script_list;0x802C31DC -clear_trigger_data;0x80145680 -clear_virtual_models;0x80120BB0 -clone_model;0x8011B6F0 -close_action_command_instruction_popup;0x8024FB0C -close_message;0x80125C70 -coin_counter_draw_content;0x800E92D8 -collision_check_above;0x800DE7E4 -collision_check_player_intersecting_world;0x800E4308 -collision_heap_create;0x8002AD74 -collision_heap_free;0x8002ADF4 -collision_heap_malloc;0x8002ADB0 -collision_main_above;0x800E27E0 -collision_main_lateral;0x800E363C -contPakFileDelete;0x8005F864 -contPakFileNum;0x8005F8D0 -contPakFileOpen;0x8005F7B0 -contPakFileReadWrite;0x8005F770 -contPakFileState;0x8005F8A4 -contPakFree;0x8005F748 -contPakOpen;0x8005F6F8 -contPakRepairId;0x8005F8FC -contQuery;0x80060870 -contReadData;0x80060738 -contReadNW;0x800607B4 -contRetrace;0x8006065C -contRmbCheckMesg;0x8005FD10 -contRmbForceStopEndMesg;0x8005FE54 -contRmbForceStopMesg;0x8005FE0C -contRmbStartMesg;0x8005FD58 -contRmbStopMesg;0x8005FDE4 -copy_matrix;0x80029720 -corrupted;0x8006D1D8 -corrupted_init;0x8006D080 -cos_deg;0x8002A350 -cos_rad;0x8002A1D0 -cosine;0x800293D4 -coss;0x80061F00 -count_power_plus;0x80263B10 -count_targets;0x80269660 -crash_create_monitor;0x8002C8B0 -crash_delay_msec;0x8002BF40 -crash_monitor_thread;0x8002C81C -crash_print_fpr;0x8002C2B8 -crash_printf_string;0x8002C208 -crash_show_handler;0x8002C3B0 -create_actor;0x802653A4 -create_basic_npc;0x80038844 -create_cameras_a;0x8002DEF4 -create_cameras_b;0x8002E038 -create_entity;0x801118C4 -create_entity_shadow;0x801121CC -create_icon;0x801414A4 -create_npcs;0x800436B0 -create_part_shadow;0x8026731C -create_partner_npc;0x80038880 -create_popup;0x8024EF68 -create_shadow_callback;0x802E0D90 -create_shadow_from_data;0x80111BD8 -create_shadow_type;0x80112260 -create_standard_npc;0x80038864 -create_target_list;0x80262240 -create_trigger;0x8014576C -decode_yay0;0x8006EDF0 -decrement_status_menu_disabled;0x800E9B30 -deduct_current_move_fp;0x80263BC8 -default_trigger_function_handler;0x80145670 -delete_actor;0x80240BBC -delete_entity;0x801106D0 -delete_entity_and_unload_data;0x80110790 -delete_player_actor;0x80240D68 -delete_trigger;0x80145BF4 -disable_actor_blur;0x8025455C -disable_entity_fog;0x80123000 -disable_npc_blur;0x8003ADAC -disable_npc_shadow;0x8003ABFC -disable_partner_blur;0x80254668 -disable_player_blur;0x80254914 -disable_player_input;0x800E0178 -disable_player_shadow;0x800E00E4 -disable_player_static_collisions;0x800E0114 -disable_world_fog;0x8011BB64 -dispatch_damage_event_actor;0x802786D4 -dispatch_damage_event_actor_0;0x802788F8 -dispatch_damage_event_actor_1;0x80278914 -dispatch_damage_event_partner;0x8027F9CC -dispatch_damage_event_partner_0;0x8027FB80 -dispatch_damage_event_partner_1;0x8027FB9C -dispatch_damage_event_player;0x802731BC -dispatch_damage_event_player_0;0x8027337C -dispatch_damage_event_player_1;0x802733A8 -dispatch_event_actor;0x80277160 -dispatch_event_general;0x80276F8C -dispatch_event_partner;0x8027DE80 -dispatch_event_partner_continue_turn;0x8027DF0C -dispatch_event_player;0x80271658 -dispatch_event_player_continue_turn;0x802716E4 -dist2D;0x80029ED4 -dist3D;0x80029F2C -dma_copy;0x8002973C -dma_load_string;0x80125804 -do_camera_type_0;0x8002F850 -do_camera_type_1;0x8002F290 -do_camera_type_2;0x8002ECF8 -do_camera_type_3;0x80031494 -do_camera_type_4;0x8002E910 -do_camera_type_5;0x80030000 -do_camera_type_6;0x8002F990 -do_camera_type_unused;0x8002FCE0 -do_lateral_collision;0x800DEC04 -does_script_exist;0x802C4164 -does_script_exist_by_ref;0x802C41A4 -dp;0x8006AE0C -draw_battle_wheel;0x802A1C54 -draw_box;0x800F52E0 -draw_coin_sparkles;0x80130B0C -draw_digit;0x801274C0 -draw_enemy_health_bars;0x8023FFA0 -draw_icon_0;0x801447A8 -draw_icon_1;0x801447C4 -draw_icon_2;0x801447E0 -draw_item_entities;0x80132C80 -draw_main_battle_ui;0x8023EA7C -draw_number;0x8012769C -draw_shop_items;0x80281524 -draw_status_ui;0x800E973C -draw_string;0x801264EC -enable_actor_blur;0x802542CC -enable_entity_fog;0x80122FEC -enable_npc_blur;0x8003AD24 -enable_npc_shadow;0x8003ABA0 -enable_partner_ai;0x800EF328 -enable_partner_blur;0x80254644 -enable_partner_flying;0x800ED310 -enable_partner_walking;0x800EB8A8 -enable_player_blur;0x802546D4 -enable_player_input;0x800E01A4 -enable_player_shadow;0x800E00B0 -enable_player_static_collisions;0x800E0140 -enable_world_fog;0x8011BB50 -end_battle;0x80244A50 -enemy_create_target_list;0x80263048 -enforce_hpfp_limits;0x800E786C -entity_get_collision_flags;0x801108B8 -entity_init_BlueSwitch;0x802E2380 -entity_init_Chest;0x802E7D84 -entity_init_Hammer1Block_normal;0x802E3E00 -entity_init_Hammer23Block_normal;0x802E36E4 -entity_init_HammerBlock_small;0x802E3E30 -entity_init_HugeBlueSwitch;0x802E2408 -entry_point;0x80025C00 -exec_ShakeCam1;0x802CB56C -exec_ShakeCamX;0x802CB5C8 -find_item;0x800E7644 -find_script_labels;0x802C3148 -fio_calc_file_checksum;0x8002B0D0 -fio_calc_header_checksum;0x8002AF40 -fio_deserialize_state;0x8002B490 -fio_erase_flash;0x8002BA1C -fio_erase_game;0x8002B42C -fio_fetch_saved_file_info;0x8002B154 -fio_init_flash;0x8002B84C -fio_load_game;0x8002B2D0 -fio_read_flash;0x8002B868 -fio_save_game;0x8002B374 -fio_serialize_state;0x8002B630 -fio_validate_file_checksum;0x8002B0F8 -fio_validate_header_checksums;0x8002AF70 -fio_write_flash;0x8002B948 -fixed_var_to_float;0x802C4920 -float_to_fixed_var;0x802C496C -free_icon;0x801448F4 -free_npc;0x800389CC -free_npc_by_index;0x800388A0 -fx_emote;0x8006FE90 -fx_sleep_bubble;0x800707F0 -fx_sweat;0x80070790 -fx_walk_large;0x8006FAD0 -fx_walk_normal;0x8006FB30 -general_heap_create;0x8002AC00 -general_heap_free;0x8002AC78 -general_heap_malloc;0x8002AC28 -general_heap_malloc_tail;0x8002AC50 -get_actor;0x80269D6C -get_actor_part;0x8026445C -get_area_byte;0x80145650 -get_area_flag;0x801455F0 -get_asset_offset;0x8005ADD0 -get_background_color_blend;0x8011BE80 -get_cam_viewport;0x8002E4E8 -get_char_width;0x80125DF4 -get_clamped_angle_diff;0x80029C28 -get_coin_drop_amount;0x80048D50 -get_collider_center;0x8005BE10 -get_collider_type_by_id;0x8005BDA8 -get_current_map_config;0x8005ABD8 -get_current_map_header;0x8005ABE8 -get_current_partner_id;0x800E5088 -get_default_variation_for_song;0x8014A430 -get_defeated;0x8003EDF0 -get_defense;0x802662BC -get_dpad_input_radial;0x8023E000 -get_dynamic_entity;0x8012363C -get_enemy;0x8003ECE8 -get_enemy_safe;0x8003ED68 -get_entity_by_index;0x801105E8 -get_entity_fog_color;0x8012307C -get_entity_fog_distance;0x80123060 -get_entity_list;0x80110620 -get_entity_type;0x801106A4 -get_float_variable;0x802C842C -get_fortress_key_count;0x800EA3E4 -get_game_mode;0x80033528 -get_global_byte;0x80145538 -get_global_flag;0x801454BC -get_global_timespace;0x802C420C -get_icon_render_pos;0x801449AC -get_item_count;0x800E75EC -get_item_empty_count;0x800E7620 -get_item_entity;0x80130F58 -get_map_IDs_by_name;0x8005ABF8 -get_menu_icon;0x801448D4 -get_menu_icon_script;0x801448B0 -get_model_center_and_size;0x8011B0EC -get_model_from_list_index;0x8011AD30 -get_model_list_index_from_tree_index;0x8011B010 -get_model_property;0x80115B0C -get_nearest_home_index;0x80269698 -get_npc_by_index;0x80038ADC -get_npc_pos;0x8005DE10 -get_npc_safe;0x8003AB48 -get_npc_unsafe;0x8003AAEC -get_player_data;0x800E7564 -get_player_normal_pitch;0x80029E50 -get_player_normal_yaw;0x80029E20 -get_screen_coords;0x8002E538 -get_script_by_id;0x802C47A8 -get_script_by_index;0x802C4790 -get_shadow_by_index;0x80110604 -get_shadow_list;0x8011064C -get_spirits_rescued;0x8002AE40 -get_stored_count;0x800E7814 -get_stored_empty_count;0x800E7848 -get_string_properties;0x80125F68 -get_string_width;0x80126474 -get_trigger_by_id;0x80145CD0 -get_variable;0x802C7ABC -get_variable_index;0x802C7DA8 -get_variable_index_alt;0x802C7F20 -get_world_fog_color;0x8011BBD8 -get_world_fog_distance;0x8011BBB4 -gfxPreNMI_Callback;0x8002670C -!gfxRetrace_Callback;0x8002605C -gfx_draw_frame;0x80026B08 -goto_map;0x802CA304 -gravity_use_fall_parms;0x800E306C -gravity_use_jump_parms;0x800E2FD0 -guFrustum;0x80062060 -guFrustumF;0x80061F30 -guLookAt;0x80062530 -guLookAtF;0x800621B0 -guLookAtHilite;0x80063244 -guLookAtHiliteF;0x800628C0 -guLookAtReflect;0x80063898 -guLookAtReflectF;0x80063320 -guMtxCat;0x80067960 -guMtxCatF;0x80067600 -guMtxF2L;0x80067500 -guMtxIdent;0x80067440 -guMtxIdentF;0x800674A0 -guMtxL2F;0x80067580 -guMtxXFMF;0x80067A70 -guMtxXFML;0x800679E0 -guNormalize;0x8006CBC0 -guOrtho;0x80063A40 -guOrthoF;0x80063910 -guPerspective;0x80063D40 -guPerspectiveF;0x80063B90 -guPosition;0x800640E8 -guPositionF;0x80063F10 -guRotate;0x80067C80 -guRotateAngles;0x80064458 -guRotateAnglesF;0x800642D0 -guRotateF;0x80067B20 -guScale;0x80067700 -guScaleF;0x800677C0 -guTranslate;0x80067820 -guTranslateF;0x80067900 -has_full_fp;0x800EA37C -has_full_hp;0x800EA360 -heap_free;0x8002AD2C -heap_malloc;0x8002ACE4 -heroes_is_ability_active;0x802672AC -hide_coin_counter;0x800E9698 -hide_foreground_models;0x80267CB4 -hide_foreground_models_unsafe;0x80267BDC -icon_set_opacity;0x80144EB0 -icon_set_tint;0x80144EFC -increment_max_SP;0x800EA1B4 -increment_status_menu_disabled;0x800E9B54 -inflict_partner_ko;0x80266254 -inflict_status;0x80265F40 -inflict_status_set_duration;0x80266CF0 -init_demo_data;0x80038080 -init_dynamic_entity_list;0x80123114 -init_got_item;0x80131B00 -init_item_entity_list;0x801310CC -init_menu_icon_list;0x80141300 -init_model_data;0x80115FE8 -init_npc_list;0x8003852C -init_script_list;0x802C32EC -init_trigger_list;0x80145728 -init_virtual_models;0x80120C58 -initialize_battle;0x8023E130 -initialize_collision;0x8005AF94 -initialize_curtains;0x8002BA40 -initialize_next_camera;0x8002E16C -initialize_printer;0x801256A4 -initialize_status_menu;0x800E7934 -input_to_move_vector;0x800E2304 -int_to_string;0x800294C4 -integrate_gravity;0x800E3448 -intro_logos_fade_in;0x800337F8 -intro_logos_fade_out;0x80033830 -intro_logos_set_fade_alpha;0x800337D0 -intro_logos_set_fade_color;0x800337E0 -intro_logos_update_fade;0x80033874 -is_ability_active;0x800E9D48 -is_actor_hp_bar_visible;0x80253C20 -is_actortype_hpbar_visible;0x80253C9C -is_current_partner_flying;0x800EA5A4 -!is_entity_data_loaded;0x8011115C -is_entity_fog_enabled;0x80123050 -is_partner_ability_active;0x800EA0B8 -is_player_action_state;0x80110BB0 -is_point_within_region;0x80048FD4 -is_popup_displayed;0x8024FAB4 -is_status_menu_visible;0x800E9910 -is_trigger_bound;0x80145C6C -is_world_fog_enabled;0x8011BBA4 -kill_all_scripts;0x802C4114 -kill_encounter;0x8003E730 -kill_enemy;0x8003E7AC -kill_script;0x802C3F3C -kill_script_by_ID;0x802C40AC -ldiv;0x8006D620 -length2D;0x80028FF0 -lldiv;0x8006D6A4 -load_area_specific_entity_data;0x80110C14 -load_asset_by_name;0x8005ACE8 -load_battle;0x80072C90 -load_collision;0x8005B058 -load_data_for_models;0x8011AD48 -load_demo_battle;0x80072E14 -load_engine_data;0x80026DDC -load_font;0x80123734 -load_font_data;0x80123708 -load_hit_asset;0x8005AFC0 -load_hit_data;0x8005B23C -load_map_bg;0x80145D70 -load_map_by_IDs;0x8005A6F4 -load_map_script_lib;0x8005A6C0 -load_message_to_buffer;0x8012588C -load_message_to_printer;0x80125A68 -load_model_textures;0x80115C24 -load_model_transforms;0x8011ADC8 -load_partner_actor;0x80264B74 -load_player_actor;0x802644A4 -load_simple_entity_data;0x801112A4 -load_split_entity_data;0x80111408 -load_sprite;0x802DEB0C -load_stage_collision;0x8005B1A0 -load_string;0x80125900 -load_tattle_flags;0x80253E78 -load_tile_header;0x80114D6C -load_virtual_model;0x80120CE0 -lookup_defense;0x80265E44 -lookup_status_chance;0x80265E98 -lookup_status_duration_mod;0x80265EEC -make_disguise_npc;0x800E657C -make_item_entity;0x801313F4 -make_item_entity_delayed;0x80131AC8 -make_item_entity_nodelay;0x80131A94 -make_npcs;0x8003E678 -mem_clear;0x80029600 -memcpy;0x80064A74 -memset;0x8006EDB0 -modify_collider_family_flags;0x802C9CE8 -move_cam_over;0x8024E4D8 -move_player;0x800E2778 -mtx_ident_mirror_y;0x80038478 -mtx_mirror_y;0x80254288 -next_demo_scene;0x800380F4 -npc_do_other_npc_collision;0x8003900C -npc_do_player_collision;0x800392D8 -npc_do_world_collision;0x80038AFC -npc_move_heading;0x8003AA54 -nuAuCleanDMABuffers;0x8004B268 -!nuAuDmaCallBack;0x8004B074 -nuAuDmaNew;0x8004B224 -nuBoot;0x8005E8B0 -nuContDataClose;0x8006060C -nuContDataGet;0x8005F650 -nuContDataLock;0x800608C0 -nuContDataOpen;0x80060634 -nuContDataUnLock;0x800608F0 -nuContInit;0x8005F610 -nuContMgrInit;0x80060510 -nuContMgrRemove;0x800605E8 -nuContPakMgrInit;0x8005F6B0 -nuContPakMgrRemove;0x8005F6D4 -nuContQueryRead;0x80060920 -nuContRmbCheck;0x8005FEF0 -nuContRmbForceStop;0x800600A0 -nuContRmbForceStopEnd;0x800600C0 -nuContRmbMgrInit;0x8005FC8C -nuContRmbMgrRemove;0x8005FCEC -nuContRmbModeSet;0x8005FF90 -nuContRmbStart;0x8005FE90 -nuGfxDisplayOff;0x8005F400 -nuGfxDisplayOn;0x8005F430 -nuGfxFuncSet;0x8005F250 -nuGfxInitEX2;0x8005F560 -nuGfxPreNMIFuncSet;0x8005F290 -nuGfxRetraceWait;0x80060370 -nuGfxSetCfb;0x8005F2F0 -nuGfxSwapCfb;0x80060350 -nuGfxSwapCfbFuncSet;0x80060310 -nuGfxTaskAllEndWait;0x8005F2D0 -nuGfxTaskMgr;0x8002CA40 -!nuGfxTaskMgrInit;0x8002CB38 -nuGfxTaskStart;0x8002CCC4 -nuGfxThread;0x80060248 -nuGfxThreadStart;0x800601F0 -nuPiInit;0x8005F450 -nuPiReadRom;0x8005F490 -nuPiReadRomOverlay;0x800600E0 -!nuScAddClient;0x8005EE30 -nuScCreateScheduler;0x8005E9B0 -!nuScEventBroadcast;0x8005F0C0 -nuScEventHandler;0x8005EFA8 -nuScExecuteAudio;0x8005EBE0 -!nuScExecuteGraphics;0x8005ED14 -nuScGetAudioMQ;0x8005EF84 -nuScGetFrameRate;0x8005EF9C -nuScGetGfxMQ;0x8005EF78 -nuScRemoveClient;0x8005EEBC -nuScResetClientMesgType;0x8005EF38 -nuScSetFrameBufferNum;0x8005EF90 -nuScWaitTaskReady;0x8005F120 -nuSiCallBackAdd;0x800603F0 -nuSiCallBackRemove;0x80060490 -nuSiMgrInit;0x8002CE30 -nuSiMgrRestart;0x8002CFAC -nuSiMgrStop;0x8002CF8C -nuSiMgrThread;0x8002CFD0 -nuSiSendMesg;0x8002CF28 -open_status_menu_long;0x800E9760 -open_status_menu_short;0x800E978C -osAfterPreNMI;0x8006A630 -osAiDeviceBusy;0x8006B850 -osAiGetLength;0x80061540 -osAiGetStatus;0x80061550 -osAiSetFrequency;0x80061560 -osAiSetNextBuffer;0x80061680 -osCartRomInit;0x80060F10 -osCheckId;0x80069DD4 -osCheckPackId;0x80069AA4 -osContAddressCrc;0x8006C860 -osContDataCrc;0x8006C8CC -osContGetInitData;0x80061D1C -osContGetQuery;0x80061980 -osContGetReadData;0x80061A28 -osContInit;0x80061B80 -osContRamRead;0x8006A1D0 -osContRamWrite;0x8006A3C0 -osContStartQuery;0x80061900 -osContStartReadData;0x800619A0 -osCreateMesgQueue;0x80065580 -osCreatePiManager;0x800609E0 -osCreateThread;0x80065E60 -osCreateViManager;0x80066A70 -osDequeueThread;0x80066200 -osDestroyThread;0x8006C950 -osDevMgrMain;0x80061090 -__osDisableInt;0x8006B360 -osDispatchThreadSave;0x8006B1F4 -osEPiLinkHandle;0x80060EC0 -osEPiRawReadIo;0x8006B570 -osEPiRawStartDma;0x80060B70 -osEPiRawWriteIo;0x8006B6E0 -osEPiReadIo;0x80060DC0 -osEPiStartDma;0x80060E20 -osEPiWriteIo;0x80060D60 -osExceptionPreamble;0x8006AA00 -osFlashAllErase;0x8006F308 -osFlashClearStatus;0x8006F29C -osFlashInit;0x8006EF68 -osFlashReadArray;0x8006F75C -osFlashReadId;0x8006F184 -osFlashReadStatus;0x8006F0B8 -osFlashSectorErase;0x8006F424 -osFlashWriteArray;0x8006F61C -osFlashWriteBuffer;0x8006F550 -osGetActiveQueue;0x80066290 -osGetCause;0x8006C660 -osGetCount;0x80065A00 -osGetId;0x80069C08 -osGetSR;0x8006C670 -osGetThreadPri;0x80065F30 -osGetTime;0x800662A0 -osIdCheckSum;0x80069774 -osInitialize;0x8006A708 -osInsertTimer;0x80066690 -osInvalDCache;0x80061720 -osInvalICache;0x800617D0 -osJamMesg;0x800655B0 -osMapTLB;0x800667A0 -osMapTLBRdb;0x8006CA30 -__osMotorAccess;0x80067E00 -osMotorInit;0x80067F44 -contRmbControl;0x8005F920 -osPackReadData;0x80061AC4 -osPackRequestData;0x80061DD0 -osPfsAllocateFile;0x80068190 -osPfsCheckRamArea;0x80069388 -osPfsChecker;0x8006CC20 -osPfsDeclearPage;0x8006849C -osPfsDeleteFile;0x800685C0 -osPfsFileState;0x80068C20 -osPfsFindFile;0x80068DC0 -osPfsFreeBlocks;0x80068F80 -osPfsGetInitData;0x8006D560 -osPfsGetOneChannelData;0x80069644 -osPfsGetStatus;0x800694C0 -osPfsInitPak;0x80069190 -osPfsIsPlug;0x8006D340 -osPfsNumFiles;0x80069090 -osPfsRWInode;0x80069E8C -osPfsReadWriteFile;0x800687E0 -osPfsReleasePages;0x8006876C -osPfsRepairId;0x80069460 -osPfsRequestData;0x8006D4BC -osPfsRequestOneChannel;0x800695B0 -osPfsSelectBank;0x800696D0 -osPiCreateAccessQueue;0x80061450 -osPiGetAccess;0x800614A4 -osPiGetCmdQueue;0x8006B550 -osPiRawStartDma;0x8006B480 -osPiRelAccess;0x80061510 -osProbeTLB;0x80066860 -osRecvMesg;0x800656F0 -osRepairPackId;0x800697B8 -osResetGlobalIntMask;0x8006B430 -__osRestoreInt;0x8006B3D0 -osSendMesg;0x80065820 -osSetCompare;0x8006C680 -osSetEventMesg;0x80065950 -osSetFpcCsr;0x8006C690 -osSetGlobalIntMask;0x8006B3F0 -osSetIntMask;0x80060940 -osSetSR;0x8006C6A0 -osSetThreadPri;0x80065F50 -osSetTime;0x80066330 -osSetTimer;0x80066350 -osSetTimerIntr;0x80066610 -osSetWatchLo;0x8006C6B0 -osSiCreateAccessQueue;0x80065D70 -osSiDeviceBusy;0x8006D7E0 -osSiGetAccess;0x80065DC4 -osSiRawReadIo;0x8006C7C0 -osSiRawStartDma;0x80065CC0 -osSiRawWriteIo;0x8006C810 -osSiRelAccess;0x80065E30 -osSpDeviceBusy;0x8006C6C0 -osSpGetStatus;0x8006C6E0 -osSpRawStartDma;0x8006C730 -osSpSetPc;0x8006C700 -osSpSetStatus;0x8006C6F0 -osSpTaskLoad;0x80065A10 -osSpTaskStartGo;0x80065C1C -osSpTaskYield;0x80065C50 -osSpTaskYielded;0x80065C70 -osStartThread;0x80066020 -osStopThread;0x80066140 -osSumcalc;0x80069740 -osTimerInterrupt;0x800664D4 -osTimerServicesInit;0x80066480 -osUnmapTLB;0x80066920 -osUnmapTLBAll;0x80066960 -osViBlack;0x80067380 -osViGetCurrentContext;0x8006CBA0 -osViGetCurrentFramebuffer;0x800669B0 -osViGetCurrentMode;0x80066A30 -osViGetNextFramebuffer;0x800669F0 -osViInit;0x8006CA90 -osViRepeatLine;0x800673E0 -osViSetEvent;0x80066DB0 -osViSetMode;0x80066E10 -osViSetSpecialFeatures;0x80066E60 -osViSetYScale;0x80066FD0 -osViSwapBuffer;0x80067020 -osViSwapContext;0x80067070 -osVirtualToPhysical;0x80061E90 -osWritebackDCache;0x80061850 -osWritebackDCacheAll;0x800618D0 -osYieldThread;0x80066240 -parent_collider_to_model;0x8005B780 -partner_can_use_ability;0x800EB42C -partner_get_ride_script;0x800EB638 -partner_handle_after_battle;0x800EB6C4 -partner_handle_before_battle;0x800EB658 -partner_initialize_data;0x800EB580 -partner_kill_ability_script;0x800EB7CC -partner_player_can_pause;0x800EB3E0 -partner_reset_data;0x800EB474 -partner_resume_ability_script;0x800EB860 -partner_suspend_ability_script;0x800EB818 -partner_test_enemy_collision;0x800EB5E4 -partner_use_ability;0x800EB314 -pause_badges_cleanup;0x80249758 -pause_badges_comparator;0x80246FE0 -pause_badges_count_all;0x80247054 -pause_badges_count_equipped;0x802470B0 -pause_badges_draw_bp_orbs;0x80247458 -pause_badges_draw_contents;0x80247508 -pause_badges_get_column;0x802471D8 -pause_badges_get_pos_x;0x8024710C -pause_badges_get_pos_y;0x80247168 -pause_badges_get_row;0x80247220 -pause_badges_handle_input;0x802490A8 -pause_badges_init;0x80248FC0 -pause_badges_is_visible;0x80247270 -pause_badges_load_badges;0x80248D8C -pause_badges_scroll_offset_x;0x802472A8 -pause_badges_scroll_offset_y;0x80247298 -pause_badges_try_equip;0x80247338 -pause_badges_try_remove;0x802472B0 -pause_badges_update;0x8024961C -pause_cleanup;0x80244708;0x135EE0 -pause_draw_menu_label;0x8024EE94 -pause_draw_rect;0x80244858 -pause_get_menu_string;0x8024EE80 -pause_get_total_equipped_bp_cost;0x802447F4 -pause_handle_input;0x80244424 -pause_init;0x80244060 -pause_interp_cursor;0x80242E6C -pause_interp_text_scroll;0x80243418 -pause_interp_vertical_scroll;0x8024346C -pause_items_cleanup;0x8024AD90 -pause_items_comparator;0x802497B0 -pause_items_draw_contents;0x80249970 -pause_items_get_column;0x80249898 -pause_items_get_pos_x;0x802497D0 -pause_items_get_pos_y;0x80249828 -pause_items_get_row;0x802498E0 -pause_items_handle_input;0x8024A7D8 -pause_items_init;0x8024A714 -pause_items_is_visible;0x80249930 -pause_items_load_items;0x8024A4DC -pause_items_scroll_offset_x;0x80249968 -pause_items_scroll_offset_y;0x80249958 -pause_items_update;0x8024AC54 -pause_map_cleanup;0x8024EE2C -pause_map_draw_border_arrows;0x8024DA28 -pause_map_draw_contents;0x8024DB1C -pause_map_draw_title;0x8024E54C -pause_map_handle_input;0x8024E878 -pause_map_init;0x8024E604 -pause_map_update;0x8024ECB0 -pause_partners_cleanup;0x8024C984 -pause_partners_draw_contents;0x8024AEF8 -pause_partners_draw_movelist;0x8024BD38 -pause_partners_draw_movelist_flower;0x8024C0A0 -pause_partners_draw_movelist_title;0x8024C048 -pause_partners_draw_title;0x8024BBAC -pause_partners_handle_input;0x8024C338 -pause_partners_init;0x8024C0E0 -pause_partners_load_portrait;0x8024ADE0 -pause_partners_update;0x8024C7A4 -pause_set_cursor_opacity;0x80242BA0;0x135EE0 -pause_sort_item_list;0x80244A4C -pause_spirits_cleanup;0x8024D8D8 -pause_spirits_draw_contents;0x8024CA00 -pause_spirits_draw_title;0x8024D294 -pause_spirits_handle_input;0x8024D44C -pause_spirits_init;0x8024D360 -pause_spirits_update;0x8024D800 -pause_stats_cleanup;0x80246F94 -pause_stats_draw_contents;0x80245980 -pause_stats_handle_input;0x80246B74 -pause_stats_init;0x80246AC8 -pause_tabs_cleanup;0x80245930 -pause_tabs_draw_badges;0x80244CC0 -pause_tabs_draw_invis;0x80244B90 -pause_tabs_draw_items;0x80244DE8 -pause_tabs_draw_map;0x80245160 -pause_tabs_draw_party;0x80244F10 -pause_tabs_draw_spirits;0x80245038 -pause_tabs_draw_stats;0x80244B98 -pause_tabs_handle_input;0x80245354 -pause_tabs_init;0x80245288 -pause_tabs_update;0x802455BC -pause_textbox_draw_contents;0x80243570 -pause_tutorial_draw_contents;0x802437F4 -pause_tutorial_input;0x802442A0 -pause_update_cursor;0x802434DC;0x135EE0 -phys_player_land;0x800E3278 -play_ambient_sounds;0x80147368 -play_effect;0x8005A564 -play_hit_sound;0x80277004 -play_model_animation;0x80120148 -play_movement_dust_effects;0x802642F0 -play_sound;0x80149CB4 -play_sound_at_npc;0x80149D08 -play_sound_at_player;0x80149CD8 -play_sound_at_position;0x80149D5C -player_create_target_list;0x8026302C -player_enter_blue_pipe;0x802E8CCC -player_jump;0x802D14E0 -poll_rumble;0x80028EE0 -proutSprintf;0x80065548 -push_entity_matrix;0x802E8E4C -queue_render_task;0x8011D910 -rand_int;0x800299FC -read_background_size;0x80145E28 -recover_fp;0x800EA264 -recover_hp;0x800EA2CC -remove_actor_decoration;0x80267234 -remove_all_effects;0x8005A4E0 -remove_consumable;0x800EA47C -remove_effect;0x8005A450 -remove_item_entity_by_index;0x801339FC -remove_item_entity_by_reference;0x80133930 -remove_part_decoration;0x80267218 -remove_part_shadow;0x802673A0 -create_part_shadow_by_ref;0x802673E4 -remove_player_buffs;0x80267454 -render_curtains;0x8002BA80 -render_dynamic_entities;0x80123470 -render_effects;0x80059EF4 -render_entities;0x8010FEB4 -render_frame;0x8002D73C -render_item_entities;0x80132E54 -render_menu_icon;0x80142BFC -render_menu_icons;0x801436B4 -render_messages;0x80124204 -render_models;0x80116B90 -render_npcs;0x8003A7F0 -render_player;0x800E1138 -render_player_model;0x800E1168 -render_shadows;0x801100CC -render_sprite;0x802DDC40 -render_ui;0x80112F58 -reset_actor_blur;0x802545AC -reset_all_actor_sounds;0x80267A9C -reset_partner_blur;0x8025468C -reset_status_menu;0x800E9BB0 -resolve_npc;0x802CDAC0 -restart_script;0x802C3D04 -resume_all_group;0x802C4648 -resume_all_script;0x802C448C -resume_group_others;0x802C471C -resume_group_script;0x802C437C -resume_group_script_index;0x802C4570 -round;0x80029AC4 -save_game_at_player_position;0x802E11A0 -save_ground_pos;0x800E54E0 -save_tattle_flags;0x80253D10 -set_action_state;0x800E5DA4 -set_actor_current_position;0x80269C24 -set_actor_home_position;0x80269D20 -set_actor_yaw;0x80263F68 -set_anim_timescale;0x802DD88C -set_animation;0x80263CFC -set_animation_rate;0x80263EB8 -set_area_byte;0x80145638 -set_area_flag;0x801455A0 -set_aux_pan_u;0x8011BC4C -set_aux_pan_v;0x8011BC64 -set_background_color_blend;0x8011BE5C -set_background_size;0x80145E70 -set_cam_target_pos;0x8024E520 -set_cam_viewport;0x8002E314 -set_cam_zoffset;0x8024E5E0 -set_cam_zoom;0x8024E594 -set_curtain_draw_callback;0x8002BF04 -set_curtain_fade;0x8002BF24 -set_curtain_fade_goal;0x8002BF14 -set_curtain_scale;0x8002BEEC -set_curtain_scale_goal;0x8002BEDC -set_defeated;0x8003EE40 -set_entity_fog_color;0x80123028 -set_entity_fog_dist;0x80123010 -set_float_variable;0x802C8640 -set_game_mode;0x800334F0 -set_global_byte;0x80145520 -set_global_flag;0x80145450 -set_global_timespace;0x802C4200 -set_goal_pos_to_part;0x80269754 -set_icon_flags;0x80144A00 -set_icon_render_pos;0x80144984 -set_item_entity_flags;0x80134148 -set_item_entity_position;0x8013420C -set_main_pan_u;0x8011BC1C -set_main_pan_v;0x8011BC34 -set_map_transition_effect;0x801382A0 -set_max_SP;0x800EA1D8 -set_menu_icon_script;0x801447FC -set_message_images;0x80125B2C -set_message_string;0x80125B3C -set_message_value;0x80125BE8 -set_music_track;0x8014A918 -set_npc_animation;0x802CDB0C -set_npc_shadow_scale;0x80112900 -set_npc_yaw;0x8003B340 -set_part_absolute_position;0x80269C70 -set_part_goal_to_actor_part;0x802699D8 -set_part_yaw;0x80263F9C -set_peach_shadow_scale;0x801129D4 -set_popup_duration;0x8024FAC4 -set_script_flags;0x802C47E8 -set_script_group;0x802C4218 -set_script_priority;0x802C41D8 -set_script_timescale;0x802C41E0 -set_standard_shadow_scale;0x8011285C -set_tex_panner;0x8011BC14 -set_ui_panel_properties;0x80147CC8 -set_variable;0x802C8098 -set_world_fog_color;0x8011BB88 -set_world_fog_dist;0x8011BB74 -set_zone_enabled;0x802CA1B8 -setup_demo_player;0x80072D2C -setup_item_popup;0x800E6C44 -setup_partner_popup;0x800E6B78 -setup_path_data;0x802D4DAC -show_battle_message;0x8024F960 -show_coin_counter;0x800E9518 -show_damage_popup;0x802665AC -show_first_strike_message;0x80041C5C -show_foreground_models;0x80267D28 -show_foreground_models_unsafe;0x80267C48 -show_message_popup;0x80250EA4 -show_variable_battle_message;0x8024FA04 -si;0x8006AD90 -si_execute_next_command;0x802C7404 -si_find_label;0x802C8890 -!si_goto_end_case;0x802C89E4 -si_goto_end_loop;0x802C8AE4 -si_goto_next_case;0x802C8A60 -si_handle_AND;0x802C6270 -si_handle_AND_const;0x802C62D4 -si_handle_OR;0x802C632C -si_handle_OR_const;0x802C6390 -si_handle_add;0x802C5804 -si_handle_addF;0x802C5A84 -si_handle_allocate_array;0x802C6214 -si_handle_bind;0x802C6714 -si_handle_bind_lock;0x802C6B54 -si_handle_break_case;0x802C56D4 -si_handle_break_loop;0x802C4B0C -si_handle_call;0x802C63E8 -si_handle_case_AND;0x802C549C -si_handle_case_default;0x802C5444 -si_handle_case_equal;0x802C5030 -si_handle_case_equal_AND;0x802C55B8 -si_handle_case_equal_OR;0x802C5518 -si_handle_case_greater;0x802C5268 -si_handle_case_greater_equal;0x802C52F8 -si_handle_case_less;0x802C5148 -si_handle_case_less_equal;0x802C51D8 -si_handle_case_not_equal;0x802C50BC -si_handle_case_range;0x802C5388 -si_handle_child_thread;0x802C6D6C -si_handle_divide;0x802C5934 -si_handle_divideF;0x802C5BC0 -si_handle_does_script_exist;0x802C6A78 -si_handle_else;0x802C4F40 -si_handle_end_case_group;0x802C565C -si_handle_end_child_thread;0x802C6DF4 -si_handle_end_if;0x802C4F6C -si_handle_end_loop;0x802C4A48 -si_handle_end_switch;0x802C5718 -si_handle_end_thread;0x802C6D4C -si_handle_exec1;0x802C646C -si_handle_exec2;0x802C6524 -si_handle_exec_wait;0x802C65FC -si_handle_get_1_float;0x802C5EB4 -si_handle_get_1_word;0x802C5C90 -si_handle_get_2_float;0x802C5F0C -si_handle_get_2_word;0x802C5CC4 -si_handle_get_3_float;0x802C5F9C -si_handle_get_3_word;0x802C5D2C -si_handle_get_4_float;0x802C605C -si_handle_get_4_word;0x802C5DB4 -si_handle_get_Nth_float;0x802C614C -si_handle_get_Nth_word;0x802C5E5C -si_handle_goto;0x802C49C0 -si_handle_if_AND;0x802C4E90 -si_handle_if_equal;0x802C4C40 -si_handle_if_greater;0x802C4D64 -si_handle_if_greater_equal;0x802C4E2C -si_handle_if_less;0x802C4D00 -si_handle_if_less_equal;0x802C4DC8 -si_handle_if_not_AND;0x802C4EE8 -si_handle_if_not_equal;0x802C4CA0 -si_handle_jump;0x802C6640 -si_handle_kill;0x802C6870 -si_handle_label;0x802C49B8 -si_handle_loop;0x802C4A00 -si_handle_mod;0x802C59BC -si_handle_multiply;0x802C58CC -si_handle_multiplyF;0x802C5B54 -si_handle_print_debug_var;0x802C6E1C -si_handle_resume;0x802C6A4C -si_handle_resume_all;0x802C697C -si_handle_resume_others;0x802C69E4 -si_handle_return;0x802C4998 -si_handle_set_array;0x802C61AC -si_handle_set_const;0x802C5790 -si_handle_set_flag_array;0x802C61E0 -si_handle_set_float;0x802C57B8 -si_handle_set_float_buffer_ptr;0x802C5C5C -si_handle_set_group;0x802C6914 -si_handle_set_int_buffer_ptr;0x802C5C28 -si_handle_set_priority;0x802C689C -si_handle_set_timescale;0x802C68D8 -si_handle_set_var;0x802C5744 -si_handle_subtract;0x802C5868 -si_handle_subtractF;0x802C5AEC -si_handle_suspend;0x802C6A20 -si_handle_suspend_all;0x802C6950 -si_handle_suspend_others;0x802C69A8 -si_handle_switch;0x802C4F74 -si_handle_switch_const;0x802C4FE4 -si_handle_thread;0x802C6C78 -si_handle_unbind;0x802C6850 -si_handle_wait;0x802C4B5C -si_handle_wait_seconds;0x802C4BB8 -si_skip_else;0x802C8978 -si_skip_if;0x802C88FC -si_standard_trigger_executor;0x802C6AD0 -sign;0x800294B0 -signF;0x80029A7C -sin_cos_deg;0x8002A234 -sin_cos_rad;0x8002A0B4 -sin_deg;0x8002A2EC -sin_rad;0x8002A16C -sins;0x800645F0 -sort_items;0x800E76CC -sort_scripts;0x802C3000 -spawn_drops;0x80048280 -spr_appendMDL_component;0x802DC8F4 -spr_draw_component;0x802DCEDC -spr_transform_point;0x802DCD00 -sprintf;0x800654F0 -sqrtf;0x80061EF0 -start_battle;0x800446B4 -start_bounce_a;0x800E6034 -start_bounce_b;0x800E608C -start_child_script;0x802C37C8 -start_falling;0x800E5FD0 -start_rumble;0x80028F08 -start_rumble_type;0x80267DF4 -start_script;0x802C33E0 -start_script_in_group;0x802C35D0 -status_menu_draw_number;0x800E7CA4 -status_menu_draw_stat;0x800E7E34 -status_menu_start_blinking_coins;0x800E99F4 -status_menu_start_blinking_fp;0x800E998C -status_menu_start_blinking_hp;0x800E9920 -status_menu_start_blinking_sp;0x800E9A60 -status_menu_start_blinking_sp_bars;0x800E9AB8 -status_menu_start_blinking_starpoints;0x800E9AE4 -status_menu_stop_blinking_coins;0x800E9A38 -status_menu_stop_blinking_fp;0x800E99D0 -status_menu_stop_blinking_hp;0x800E9964 -status_menu_stop_blinking_sp;0x800E9A94 -status_menu_stop_blinking_starpoints;0x800E9B0C -step_battle;0x800338E4 -step_current_game_mode;0x80112E78 -step_game_loop;0x80026740 -step_init_state;0x80033568 -step_intro;0x80036854 -step_logos;0x800340A4 -step_pause_menu;0x8003497C -step_title_screen;0x800370B4 -step_world;0x80035D54 -stop_sound;0x80149C6C -store_item;0x800E77C4 -strchr;0x80064A10 -strcmp;0x8006ED70 -strcpy;0x8006ED40 -strlen;0x80064A50 -stub_dynamic_entity_delegate;0x801230B0 -subtract_fortress_keys;0x800EA3B8 -subtract_hp;0x800EA334 -suspend_all_group;0x802C45E8 -suspend_all_script;0x802C4420 -suspend_group_others;0x802C46A8 -suspend_group_script;0x802C42D8 -suspend_group_script_index;0x802C44F8 -switch_order;0x80243918 -switch_to_partner;0x80242F00 -switch_to_player;0x80242AC8 -sync_status_menu;0x800E9B6C -test_below_player;0x800DDFD0 -test_down_ray_triangle;0x8005C49C -test_item_player_collision;0x80133B0C -test_player_entity_aabb;0x80110AAC -test_player_lateral;0x800DF460 -test_ray_colliders;0x8005CCD0 -test_ray_entities;0x8005D448 -test_ray_triangle_general;0x8005BE84 -test_ray_zone_aabb;0x80030458 -test_ray_zones;0x8005D124 -test_up_ray_collider;0x8005D2DC -test_up_ray_triangle;0x8005C7A4 -trace_above_player;0x800DEA08 -trace_below_player;0x800DE54C -transform_point;0x80029620 -try_inflict_status;0x80266B78 -unfreeze_cam;0x8024E600 -update_actor_shadow;0x802559BC -update_actor_shadows;0x8023E404 -update_battle_state;0x8023E438 -update_cameras;0x8002D400 -update_coin_counter;0x800E93DC -update_collider_transform;0x8005BA24 -update_component;0x802DD11C -update_curtains;0x8002BA78 -update_dynamic_entities;0x80123404 -update_end_player_turn;0x80242BB0 -update_enemy_action;0x80247570 -update_enemy_change_turn;0x802472AC -update_enemy_shadows;0x80255F5C -update_entities;0x8010F6D0 -update_entity_inverse_rotation_matrix;0x801104A4 -update_entity_transform_matrix;0x8011022C -update_fall_state;0x800E2D18 -update_hero_shadows;0x80255FAC -update_heroes_start_turn;0x80242024 -update_input;0x80028874 -update_item_entities;0x80131EEC -update_item_entity_collectable;0x80134250 -update_item_entity_static;0x80135658 -update_item_entity_temp;0x801356DC -update_lerp;0x8002A3B4 -update_lerp_battle;0x8027B0DC -update_locomotion_state;0x800E5F68 -update_menu_icons;0x80141610 -update_messages;0x801237D8 -update_npc_blur;0x8003ADF8 -update_npcs;0x80039930 -update_partner_action;0x80246B34 -update_partner_menu;0x802A81C8 -update_player;0x800DF740 -update_player_action;0x80245AD0 -update_player_actor_shadow;0x80257BAC -update_player_change_turn;0x80246450 -update_player_input;0x800E1F90 -update_player_menu;0x802A5988 -update_player_move_history;0x800ED4B8 -update_player_shadow;0x800E1BC4 -update_run_away;0x80244F00 -update_scripts;0x802C3D74 -update_shadow_transform_matrix;0x80110374 -update_shadows;0x8010FA98 -update_starpoints_display;0x802403BC -update_status_menu;0x800E80B4 -update_swap_partner;0x802456F8 -update_targeting_enemies;0x802AA688 -update_triggers;0x80145860 -use_cam_preset;0x8024CF34 -use_consumable;0x800EA400 -viMgrMain;0x80066C10 -ActorAddMovePos;0x80280880 -PlayerScriptDispatcher;0x80284EBC -PeachScriptDispatcher;0x80285010 -ExecutePlayerAction;0x8028505C -ExecutePeachAction;0x80285174 -HandleEvent_Player;0x802852D4 -SetForegroundModelsVisibleUnsafe;0x80253AA8 -JumpToGoalSimple2;0x80279420 -LandJumpPart;0x8027AB5C -_advance_rng;0x80029900 -fio_has_valid_backup;0x8002AFD8 -fio_flush_backups;0x8002B04C -COPY_set_defeated;0x8003E2E0 -GetCamLookAtObjVector;0x8003F398 -draw_submenu_title;0x800F4648 -AssignScript;0x80111FB0 -draw_menu_icon;0x80144298 -bind_trigger;0x802C4220 -bind_trigger_1;0x802C42A8 -draw_anim_models;0x802CCB18 -SetAnimModelPosition;0x802CCFE4 -GetAnimModelPosition;0x802CD090 -AddAnimModelPosition;0x802CD12C -SetAnimModelRotation;0x802CD1F0 -SetAnimModelScale;0x802CD29C -NpcSetHomePosToCurrent;0x802CF3BC -!func_8002D160;0x8002D160 -!func_8002C890;0x8002C890 -func_802A91F8;0x802A91F8 -func_802A9208;0x802A9208 -func_802A9228;0x802A9228 -func_802A9234;0x802A9234 -func_802A9254;0x802A9254 -func_802A9278;0x802A9278 -func_802A928C;0x802A928C -func_802A9294;0x802A9294 -func_802A9298;0x802A9298 -func_802A92A0;0x802A92A0 -func_802A92D4;0x802A92D4 -func_802A92DC;0x802A92DC -func_802A92F0;0x802A92F0 -func_802A9310;0x802A9310 -func_802A936C;0x802A936C -func_802A9378;0x802A9378 -func_802A948C;0x802A948C -func_802A94A4;0x802A94A4 -func_802A94D8;0x802A94D8 -func_802A9544;0x802A9544 -func_802A955C;0x802A955C -func_802A9590;0x802A9590 -func_802A959C;0x802A959C -func_802A9634;0x802A9634 -func_802A963C;0x802A963C -func_802A9664;0x802A9664 -func_802A96B8;0x802A96B8 -func_802A96DC;0x802A96DC -func_802A96EC;0x802A96EC -func_802A96F4;0x802A96F4 -func_802A9708;0x802A9708 -func_802A9718;0x802A9718 -func_802A9720;0x802A9720 -func_802A973C;0x802A973C -func_802A9744;0x802A9744 -func_802A9764;0x802A9764 -func_802A97AC;0x802A97AC -func_802A97BC;0x802A97BC -func_802A97CC;0x802A97CC -func_802A97F8;0x802A97F8 -func_802A97FC;0x802A97FC -func_802A9810;0x802A9810 -func_802A981C;0x802A981C -func_802A9834;0x802A9834 -func_802A984C;0x802A984C -func_802A9894;0x802A9894 -func_802A9898;0x802A9898 -func_802A98B0;0x802A98B0 -func_802A98D0;0x802A98D0 -func_802A98DC;0x802A98DC -func_802A98E0;0x802A98E0 -func_802A9914;0x802A9914 -func_802A992C;0x802A992C -func_802A9990;0x802A9990 -func_802A99D4;0x802A99D4 -func_802A9A30;0x802A9A30 -func_802A9A54;0x802A9A54 -func_802AA014;0x802AA014 -func_802AA0D8;0x802AA0D8 -func_802AB330;0x802AB330 -func_802AB338;0x802AB338 -func_802B71D4;0x802B71D4 -func_802B71E8;0x802B71E8 -func_802BD7DC;0x802BD7DC -func_802BE070;0x802BE070 -!func_8006AA34;0x8006AA34 -SetTattleString;0x80045A58 -!osEnqueueAndYield;0x8006B06C -!osPopThread;0x8006B1BC -!osDispatchThread;0x8006B1D4 -!osEnqueueThread;0x8006B174 -!send_mesg;0x8006AF7C -!handle_CPU;0x8006B038 -gPauseMenuStrings;0x8026F778 -gEffectTable;0x8007F214 -gMoveScriptTable;0x80293E80 -gStaticScriptCounter;0x802D9CA0 -D_80156954;0x80156954 -D_802D9CA4;0x802D9CA4 -gCollisionStatus;0x8015A550 -gGlobalTimeSpace;0x802D9CA8 -gBattleState;0x800DC068 -gBattleDmaDest;0x80284000 -gDialogueState;0x8029FA60 -gSpeakingActorPrintCtx;0x8029FA60 -gSpeakingActorPrintIsDone;0x8029FA68 -gSpeakingActorTalkAnim;0x8029FA6C -gSpeakingActorIdleAnim;0x8029FA70 -gSpeakingActor;0x8029FA74 -gSpeakingActorPart;0x8029FA78 -EnterWalk;0x80285960 -EnemyNpcHit;0x80077F70 -EnemyNpcDefeat;0x8007809C -D_80078DB0;0x80078DB0 -D_80078DB4;0x80078DB4 -gMusicPlayers;0x80159AF0 -gMusicUnkVolume;0x80159AE0 -gMusicUnkVolume2;0x80159AE4 -gMusicTargetVolume;0x80159AE2 -gMusicCurrentVolume;0x80159AE6 -gAreas;0x800934F0 -gSongArray;0x8014F720 -D_802D9D50;0x802D9D50 +entry_point = 0x80025C00; +boot_main = 0x80025F70; +gfxRetrace_Callback = 0x8002605C; // ! +gfxPreNMI_Callback = 0x8002670C; +step_game_loop = 0x80026740; +gfx_draw_frame = 0x80026B08; +load_engine_data = 0x80026DDC; +update_input = 0x80028874; +poll_rumble = 0x80028EE0; +start_rumble = 0x80028F08; +length2D = 0x80028FF0; +_heap_create = 0x80029030; +_heap_malloc = 0x8002906C; +_heap_malloc_tail = 0x80029164; +_heap_free = 0x8002921C; +_heap_realloc = 0x800292C4; +cosine = 0x800293D4; +sign = 0x800294B0; +int_to_string = 0x800294C4; +mem_clear = 0x80029600; +transform_point = 0x80029620; +copy_matrix = 0x80029720; +dma_copy = 0x8002973C; +_advance_rng = 0x80029900; +rand_int = 0x800299FC; +signF = 0x80029A7C; +round = 0x80029AC4; +clamp_angle = 0x80029B24; +get_clamped_angle_diff = 0x80029C28; +atan2 = 0x80029C80; +get_player_normal_yaw = 0x80029E20; +get_player_normal_pitch = 0x80029E50; +dist2D = 0x80029ED4; +dist3D = 0x80029F2C; +add_vec2D_polar = 0x80029F9C; +_wrap_trig_lookup_value = 0x8002A034; +sin_cos_rad = 0x8002A0B4; +sin_rad = 0x8002A16C; +cos_rad = 0x8002A1D0; +sin_cos_deg = 0x8002A234; +sin_deg = 0x8002A2EC; +cos_deg = 0x8002A350; +update_lerp = 0x8002A3B4; +general_heap_create = 0x8002AC00; +general_heap_malloc = 0x8002AC28; +general_heap_malloc_tail = 0x8002AC50; +general_heap_free = 0x8002AC78; +battle_heap_create = 0x8002ACA0; +heap_malloc = 0x8002ACE4; +heap_free = 0x8002AD2C; +collision_heap_create = 0x8002AD74; +collision_heap_malloc = 0x8002ADB0; +collision_heap_free = 0x8002ADF4; +get_spirits_rescued = 0x8002AE40; +fio_calc_header_checksum = 0x8002AF40; +fio_validate_header_checksums = 0x8002AF70; +fio_has_valid_backup = 0x8002AFD8; +fio_flush_backups = 0x8002B04C; +fio_calc_file_checksum = 0x8002B0D0; +fio_validate_file_checksum = 0x8002B0F8; +fio_fetch_saved_file_info = 0x8002B154; +fio_load_game = 0x8002B2D0; +fio_save_game = 0x8002B374; +fio_erase_game = 0x8002B42C; +fio_deserialize_state = 0x8002B490; +fio_serialize_state = 0x8002B630; +fio_init_flash = 0x8002B84C; +fio_read_flash = 0x8002B868; +fio_write_flash = 0x8002B948; +fio_erase_flash = 0x8002BA1C; +initialize_curtains = 0x8002BA40; +update_curtains = 0x8002BA78; +render_curtains = 0x8002BA80; +set_curtain_scale_goal = 0x8002BEDC; +set_curtain_scale = 0x8002BEEC; +set_curtain_draw_callback = 0x8002BF04; +set_curtain_fade_goal = 0x8002BF14; +set_curtain_fade = 0x8002BF24; +crash_delay_msec = 0x8002BF40; +crash_printf_string = 0x8002C208; +crash_print_fpr = 0x8002C2B8; +crash_show_handler = 0x8002C3B0; +crash_monitor_thread = 0x8002C81C; +func_8002C890 = 0x8002C890; // ! +crash_create_monitor = 0x8002C8B0; +nuGfxTaskMgr = 0x8002CA40; +nuGfxTaskMgrInit = 0x8002CB38; // ! +nuGfxTaskStart = 0x8002CCC4; +nuSiMgrInit = 0x8002CE30; +nuSiSendMesg = 0x8002CF28; +nuSiMgrStop = 0x8002CF8C; +nuSiMgrRestart = 0x8002CFAC; +nuSiMgrThread = 0x8002CFD0; +func_8002D160 = 0x8002D160; // ! +update_cameras = 0x8002D400; +render_frame = 0x8002D73C; +create_cameras_a = 0x8002DEF4; +create_cameras_b = 0x8002E038; +initialize_next_camera = 0x8002E16C; +set_cam_viewport = 0x8002E314; +get_cam_viewport = 0x8002E4E8; +get_screen_coords = 0x8002E538; +do_camera_type_4 = 0x8002E910; +do_camera_type_2 = 0x8002ECF8; +do_camera_type_1 = 0x8002F290; +do_camera_type_0 = 0x8002F850; +do_camera_type_6 = 0x8002F990; +do_camera_type_unused = 0x8002FCE0; +do_camera_type_5 = 0x80030000; +test_ray_zone_aabb = 0x80030458; +do_camera_type_3 = 0x80031494; +set_game_mode = 0x800334F0; +get_game_mode = 0x80033528; +begin_state_init = 0x80033540; +step_init_state = 0x80033568; +intro_logos_set_fade_alpha = 0x800337D0; +intro_logos_set_fade_color = 0x800337E0; +intro_logos_fade_in = 0x800337F8; +intro_logos_fade_out = 0x80033830; +intro_logos_update_fade = 0x80033874; +begin_state_battle = 0x800338D0; +step_battle = 0x800338E4; +begin_state_logos = 0x80033E70; +step_logos = 0x800340A4; +begin_state_pause_menu = 0x80034940; +step_pause_menu = 0x8003497C; +begin_state_world = 0x80035D30; +step_world = 0x80035D54; +begin_state_intro = 0x80036650; +step_intro = 0x80036854; +begin_state_title_screen = 0x80036DF0; +step_title_screen = 0x800370B4; +init_demo_data = 0x80038080; +next_demo_scene = 0x800380F4; +NOP_npc_callback = 0x80038470; +mtx_ident_mirror_y = 0x80038478; +clear_npcs = 0x800384BC; +init_npc_list = 0x8003852C; +_create_npc = 0x80038598; +create_basic_npc = 0x80038844; +create_standard_npc = 0x80038864; +create_partner_npc = 0x80038880; +free_npc_by_index = 0x800388A0; +free_npc = 0x800389CC; +get_npc_by_index = 0x80038ADC; +npc_do_world_collision = 0x80038AFC; +npc_do_other_npc_collision = 0x8003900C; +npc_do_player_collision = 0x800392D8; +update_npcs = 0x80039930; +appendGfx_npc = 0x80039FD0; +render_npcs = 0x8003A7F0; +npc_move_heading = 0x8003AA54; +get_npc_unsafe = 0x8003AAEC; +get_npc_safe = 0x8003AB48; +enable_npc_shadow = 0x8003ABA0; +disable_npc_shadow = 0x8003ABFC; +enable_npc_blur = 0x8003AD24; +disable_npc_blur = 0x8003ADAC; +update_npc_blur = 0x8003ADF8; +appedGfx_npc_blur = 0x8003AE38; +set_npc_yaw = 0x8003B340; +COPY_set_defeated = 0x8003E2E0; +clear_encounter_status = 0x8003E400; +make_npcs = 0x8003E678; +kill_encounter = 0x8003E730; +kill_enemy = 0x8003E7AC; +bind_enemy_ai = 0x8003E94C; +bind_enemy_aux = 0x8003E9B4; +bind_enemy_interact = 0x8003EA1C; +bind_npc_ai = 0x8003EA84; +bind_npc_aux = 0x8003EB50; +bind_npc_interact = 0x8003EC1C; +get_enemy = 0x8003ECE8; +get_enemy_safe = 0x8003ED68; +get_defeated = 0x8003EDF0; +set_defeated = 0x8003EE40; +FadeBackgroundToBlack = 0x8003EF00; +UnfadeBackgroundFromBlack = 0x8003EF98; +GetCamLookAtObjVector = 0x8003F398; +HasMerleeCasts = 0x8003F3F4; +OnDefeatEnemy = 0x8003F580; +OnFleeBattleDrops = 0x8003F6E8; +show_first_strike_message = 0x80041C5C; +create_npcs = 0x800436B0; +SetEncounterStatusFlags = 0x80044180; +LoadDemoBattle = 0x80044264; +MakeNpcs = 0x80044298; +RemoveNpc = 0x80044340; +RemoveEncounter = 0x80044478; +GetBattleOutcome = 0x8004457C; +GetOwnerEncounterTrigger = 0x80044600; +DoNpcDefeat = 0x8004462C; +start_battle = 0x800446B4; +StartBattle = 0x80044840; +StartBattleWith = 0x80044860; +StartBossBattle = 0x8004489C; +SetBattleMusic = 0x80044A38; +BindNpcAI = 0x80044A78; +BindNpcIdle = 0x80044BAC; +RestartNpcAI = 0x80044C2C; +EnableNpcAI = 0x80044CF0; +SetNpcAux = 0x80044DA4; +BindNpcAux = 0x80044EB8; +RestartNpcAux = 0x80044F38; +EnableNpcAux = 0x80044FF0; +BindNpcInteract = 0x800450A4; +BindNpcHit = 0x80045140; +BindNpcDefeat = 0x800451DC; +SetSelfVar = 0x8004525C; +GetSelfVar = 0x800452C0; +SetNpcVar = 0x80045320; +GetNpcVar = 0x800453BC; +SetSelfRotation = 0x8004545C; +SetSelfEnemyFlags = 0x8004550C; +SetSelfEnemyFlagBits = 0x80045524; +GetSelfNpcID = 0x80045614; +ClearDefeatedEnemies = 0x80045640; +SetEnemyFlagBits = 0x80045688; +GetSelfAnimationFromTable = 0x80045734; +SetTattleString = 0x80045A58; +spawn_drops = 0x80048280; +get_coin_drop_amount = 0x80048D50; +is_point_within_region = 0x80048FD4; +DoBasicAI = 0x8004A47C; +nuAuDmaCallBack = 0x8004B074; // ! +nuAuDmaNew = 0x8004B224; +nuAuCleanDMABuffers = 0x8004B268; +alLink = 0x8004B3EC; +alUnlink = 0x8004B40C; +al_LoadINIT = 0x800542BC; +al_CopyFileTableEntry = 0x8005447C; +al_LoadPER = 0x800544F8; +al_LoadPRG = 0x800545B4; +al_LoadBank = 0x800547C8; +al_DmaCopy = 0x80054E00; +al_CopyWords = 0x80054F74; +al_LoadBKHeaders = 0x80054FC0; +alAudioFrame = 0x800565C0; +alHeapAlloc = 0x80057F90; +render_effects = 0x80059EF4; +remove_effect = 0x8005A450; +remove_all_effects = 0x8005A4E0; +play_effect = 0x8005A564; +load_map_script_lib = 0x8005A6C0; +load_map_by_IDs = 0x8005A6F4; +get_current_map_config = 0x8005ABD8; +get_current_map_header = 0x8005ABE8; +get_map_IDs_by_name = 0x8005ABF8; +load_asset_by_name = 0x8005ACE8; +get_asset_offset = 0x8005ADD0; +allocate_hit_tables = 0x8005AEA0; +initialize_collision = 0x8005AF94; +load_hit_asset = 0x8005AFC0; +load_collision = 0x8005B058; +load_stage_collision = 0x8005B1A0; +load_hit_data = 0x8005B23C; +parent_collider_to_model = 0x8005B780; +_add_hit_vert_to_buffer = 0x8005B9A0; +_get_hit_vert_index_from_buffer = 0x8005B9F4; +update_collider_transform = 0x8005BA24; +get_collider_type_by_id = 0x8005BDA8; +get_collider_center = 0x8005BE10; +test_ray_triangle_general = 0x8005BE84; +test_down_ray_triangle = 0x8005C49C; +test_up_ray_triangle = 0x8005C7A4; +test_ray_colliders = 0x8005CCD0; +test_ray_zones = 0x8005D124; +test_up_ray_collider = 0x8005D2DC; +test_ray_entities = 0x8005D448; +get_npc_pos = 0x8005DE10; +nuBoot = 0x8005E8B0; +boot_idle = 0x8005E90C; +nuScCreateScheduler = 0x8005E9B0; +nuScExecuteAudio = 0x8005EBE0; +nuScExecuteGraphics = 0x8005ED14; // ! +nuScAddClient = 0x8005EE30; // ! +nuScRemoveClient = 0x8005EEBC; +nuScResetClientMesgType = 0x8005EF38; +nuScGetGfxMQ = 0x8005EF78; +nuScGetAudioMQ = 0x8005EF84; +nuScSetFrameBufferNum = 0x8005EF90; +nuScGetFrameRate = 0x8005EF9C; +nuScEventHandler = 0x8005EFA8; +nuScEventBroadcast = 0x8005F0C0; // ! +nuScWaitTaskReady = 0x8005F120; +nuGfxFuncSet = 0x8005F250; +nuGfxPreNMIFuncSet = 0x8005F290; +nuGfxTaskAllEndWait = 0x8005F2D0; +nuGfxSetCfb = 0x8005F2F0; +nuGfxDisplayOff = 0x8005F400; +nuGfxDisplayOn = 0x8005F430; +nuPiInit = 0x8005F450; +nuPiReadRom = 0x8005F490; +nuGfxInitEX2 = 0x8005F560; +nuContInit = 0x8005F610; +nuContDataGet = 0x8005F650; +nuContPakMgrInit = 0x8005F6B0; +nuContPakMgrRemove = 0x8005F6D4; +contPakOpen = 0x8005F6F8; +contPakFree = 0x8005F748; +contPakFileReadWrite = 0x8005F770; +contPakFileOpen = 0x8005F7B0; +contPakFileDelete = 0x8005F864; +contPakFileState = 0x8005F8A4; +contPakFileNum = 0x8005F8D0; +contPakRepairId = 0x8005F8FC; +contRmbControl = 0x8005F920; +contRmbRetrace = 0x8005FB20; +nuContRmbMgrInit = 0x8005FC8C; +nuContRmbMgrRemove = 0x8005FCEC; +contRmbCheckMesg = 0x8005FD10; +contRmbStartMesg = 0x8005FD58; +contRmbStopMesg = 0x8005FDE4; +contRmbForceStopMesg = 0x8005FE0C; +contRmbForceStopEndMesg = 0x8005FE54; +nuContRmbStart = 0x8005FE90; +nuContRmbCheck = 0x8005FEF0; +nuContRmbModeSet = 0x8005FF90; +nuContRmbForceStop = 0x800600A0; +nuContRmbForceStopEnd = 0x800600C0; +nuPiReadRomOverlay = 0x800600E0; +nuGfxThreadStart = 0x800601F0; +nuGfxThread = 0x80060248; +nuGfxSwapCfbFuncSet = 0x80060310; +nuGfxSwapCfb = 0x80060350; +nuGfxRetraceWait = 0x80060370; +nuSiCallBackAdd = 0x800603F0; +nuSiCallBackRemove = 0x80060490; +nuContMgrInit = 0x80060510; +nuContMgrRemove = 0x800605E8; +nuContDataClose = 0x8006060C; +nuContDataOpen = 0x80060634; +contRetrace = 0x8006065C; +contReadData = 0x80060738; +contReadNW = 0x800607B4; +contQuery = 0x80060870; +nuContDataLock = 0x800608C0; +nuContDataUnLock = 0x800608F0; +nuContQueryRead = 0x80060920; +osSetIntMask = 0x80060940; +osCreatePiManager = 0x800609E0; +osEPiRawStartDma = 0x80060B70; +osEPiWriteIo = 0x80060D60; +osEPiReadIo = 0x80060DC0; +osEPiStartDma = 0x80060E20; +osEPiLinkHandle = 0x80060EC0; +osCartRomInit = 0x80060F10; +osDevMgrMain = 0x80061090; +osPiCreateAccessQueue = 0x80061450; +osPiGetAccess = 0x800614A4; +osPiRelAccess = 0x80061510; +osAiGetLength = 0x80061540; +osAiGetStatus = 0x80061550; +osAiSetFrequency = 0x80061560; +osAiSetNextBuffer = 0x80061680; +osInvalDCache = 0x80061720; +osInvalICache = 0x800617D0; +osWritebackDCache = 0x80061850; +osWritebackDCacheAll = 0x800618D0; +osContStartQuery = 0x80061900; +osContGetQuery = 0x80061980; +osContStartReadData = 0x800619A0; +osContGetReadData = 0x80061A28; +osPackReadData = 0x80061AC4; +osContInit = 0x80061B80; +osContGetInitData = 0x80061D1C; +osPackRequestData = 0x80061DD0; +osVirtualToPhysical = 0x80061E90; +sqrtf = 0x80061EF0; +coss = 0x80061F00; +guFrustumF = 0x80061F30; +guFrustum = 0x80062060; +guLookAtF = 0x800621B0; +guLookAt = 0x80062530; +guLookAtHiliteF = 0x800628C0; +guLookAtHilite = 0x80063244; +guLookAtReflectF = 0x80063320; +guLookAtReflect = 0x80063898; +guOrthoF = 0x80063910; +guOrtho = 0x80063A40; +guPerspectiveF = 0x80063B90; +guPerspective = 0x80063D40; +guPositionF = 0x80063F10; +guPosition = 0x800640E8; +guRotateAnglesF = 0x800642D0; +guRotateAngles = 0x80064458; +sins = 0x800645F0; +bcopy = 0x80064650; +bzero = 0x80064970; // ! +strchr = 0x80064A10; +strlen = 0x80064A50; +memcpy = 0x80064A74; +_Printf = 0x80064AA0; +_Putfld = 0x80065020; +sprintf = 0x800654F0; +proutSprintf = 0x80065548; +osCreateMesgQueue = 0x80065580; +osJamMesg = 0x800655B0; +osRecvMesg = 0x800656F0; +osSendMesg = 0x80065820; +osSetEventMesg = 0x80065950; +osGetCount = 0x80065A00; +osSpTaskLoad = 0x80065A10; +osSpTaskStartGo = 0x80065C1C; +osSpTaskYield = 0x80065C50; +osSpTaskYielded = 0x80065C70; +osSiRawStartDma = 0x80065CC0; +osSiCreateAccessQueue = 0x80065D70; +osSiGetAccess = 0x80065DC4; +osSiRelAccess = 0x80065E30; +osCreateThread = 0x80065E60; +osGetThreadPri = 0x80065F30; +osSetThreadPri = 0x80065F50; +osStartThread = 0x80066020; +osStopThread = 0x80066140; +osDequeueThread = 0x80066200; +osYieldThread = 0x80066240; +osGetActiveQueue = 0x80066290; +osGetTime = 0x800662A0; +osSetTime = 0x80066330; +osSetTimer = 0x80066350; +osTimerServicesInit = 0x80066480; +osTimerInterrupt = 0x800664D4; +osSetTimerIntr = 0x80066610; +osInsertTimer = 0x80066690; +osMapTLB = 0x800667A0; +osProbeTLB = 0x80066860; +osUnmapTLB = 0x80066920; +osUnmapTLBAll = 0x80066960; +osViGetCurrentFramebuffer = 0x800669B0; +osViGetNextFramebuffer = 0x800669F0; +osViGetCurrentMode = 0x80066A30; +osCreateViManager = 0x80066A70; +viMgrMain = 0x80066C10; +osViSetEvent = 0x80066DB0; +osViSetMode = 0x80066E10; +osViSetSpecialFeatures = 0x80066E60; +osViSetYScale = 0x80066FD0; +osViSwapBuffer = 0x80067020; +osViSwapContext = 0x80067070; +osViBlack = 0x80067380; +osViRepeatLine = 0x800673E0; +guMtxIdent = 0x80067440; +guMtxIdentF = 0x800674A0; +guMtxF2L = 0x80067500; +guMtxL2F = 0x80067580; +guMtxCatF = 0x80067600; +guScale = 0x80067700; +guScaleF = 0x800677C0; +guTranslate = 0x80067820; +guTranslateF = 0x80067900; +guMtxCat = 0x80067960; +guMtxXFML = 0x800679E0; +guMtxXFMF = 0x80067A70; +guRotateF = 0x80067B20; +guRotate = 0x80067C80; +__osMotorAccess = 0x80067E00; +osMotorInit = 0x80067F44; +osPfsAllocateFile = 0x80068190; +osPfsDeclearPage = 0x8006849C; +osPfsDeleteFile = 0x800685C0; +osPfsReleasePages = 0x8006876C; +osPfsReadWriteFile = 0x800687E0; +osPfsFileState = 0x80068C20; +osPfsFindFile = 0x80068DC0; +osPfsFreeBlocks = 0x80068F80; +osPfsNumFiles = 0x80069090; +osPfsInitPak = 0x80069190; +osPfsCheckRamArea = 0x80069388; +osPfsRepairId = 0x80069460; +osPfsGetStatus = 0x800694C0; +osPfsRequestOneChannel = 0x800695B0; +osPfsGetOneChannelData = 0x80069644; +osPfsSelectBank = 0x800696D0; +osSumcalc = 0x80069740; +osIdCheckSum = 0x80069774; +osRepairPackId = 0x800697B8; +osCheckPackId = 0x80069AA4; +osGetId = 0x80069C08; +osCheckId = 0x80069DD4; +osPfsRWInode = 0x80069E8C; +osContRamRead = 0x8006A1D0; +osContRamWrite = 0x8006A3C0; +osAfterPreNMI = 0x8006A630; +osInitialize = 0x8006A708; +osExceptionPreamble = 0x8006AA00; +func_8006AA34 = 0x8006AA34; // ! +ai = 0x8006AD64; +si = 0x8006AD90; +dp = 0x8006AE0C; +send_mesg = 0x8006AF7C; // ! +handle_CPU = 0x8006B038; // ! +osEnqueueAndYield = 0x8006B06C; // ! +osEnqueueThread = 0x8006B174; // ! +osPopThread = 0x8006B1BC; // ! +osDispatchThread = 0x8006B1D4; // ! +osDispatchThreadSave = 0x8006B1F4; +__osDisableInt = 0x8006B360; +__osRestoreInt = 0x8006B3D0; +osSetGlobalIntMask = 0x8006B3F0; +osResetGlobalIntMask = 0x8006B430; +osPiRawStartDma = 0x8006B480; +osPiGetCmdQueue = 0x8006B550; +osEPiRawReadIo = 0x8006B570; +osEPiRawWriteIo = 0x8006B6E0; +osAiDeviceBusy = 0x8006B850; +bcmp = 0x8006B870; +_Litob = 0x8006B980; +_Ldtob = 0x8006BBD0; +_Ldunscale = 0x8006C01C; +_Genld = 0x8006C0B4; +osGetCause = 0x8006C660; +osGetSR = 0x8006C670; +osSetCompare = 0x8006C680; +osSetFpcCsr = 0x8006C690; +osSetSR = 0x8006C6A0; +osSetWatchLo = 0x8006C6B0; +osSpDeviceBusy = 0x8006C6C0; +osSpGetStatus = 0x8006C6E0; +osSpSetStatus = 0x8006C6F0; +osSpSetPc = 0x8006C700; +osSpRawStartDma = 0x8006C730; +osSiRawReadIo = 0x8006C7C0; +osSiRawWriteIo = 0x8006C810; +osContAddressCrc = 0x8006C860; +osContDataCrc = 0x8006C8CC; +osDestroyThread = 0x8006C950; +osMapTLBRdb = 0x8006CA30; +osViInit = 0x8006CA90; +osViGetCurrentContext = 0x8006CBA0; +guNormalize = 0x8006CBC0; +osPfsChecker = 0x8006CC20; +corrupted_init = 0x8006D080; +corrupted = 0x8006D1D8; +osPfsIsPlug = 0x8006D340; +osPfsRequestData = 0x8006D4BC; +osPfsGetInitData = 0x8006D560; +ldiv = 0x8006D620; +lldiv = 0x8006D6A4; +osSiDeviceBusy = 0x8006D7E0; +strcpy = 0x8006ED40; +strcmp = 0x8006ED70; +memset = 0x8006EDB0; +decode_yay0 = 0x8006EDF0; +osFlashInit = 0x8006EF68; +osFlashReadStatus = 0x8006F0B8; +osFlashReadId = 0x8006F184; +osFlashClearStatus = 0x8006F29C; +osFlashAllErase = 0x8006F308; +osFlashSectorErase = 0x8006F424; +osFlashWriteBuffer = 0x8006F550; +osFlashWriteArray = 0x8006F61C; +osFlashReadArray = 0x8006F75C; +fx_walk_large = 0x8006FAD0; +fx_walk_normal = 0x8006FB30; +fx_emote = 0x8006FE90; +fx_sweat = 0x80070790; +fx_sleep_bubble = 0x800707F0; +load_battle = 0x80072C90; +setup_demo_player = 0x80072D2C; +load_demo_battle = 0x80072E14; +EnemyNpcHit = 0x80077F70; +EnemyNpcDefeat = 0x8007809C; +D_80078DB0 = 0x80078DB0; +D_80078DB4 = 0x80078DB4; +gEffectTable = 0x8007F214; +gAreas = 0x800934F0; +gBattleState = 0x800DC068; +test_below_player = 0x800DDFD0; +trace_below_player = 0x800DE54C; +collision_check_above = 0x800DE7E4; +trace_above_player = 0x800DEA08; +do_lateral_collision = 0x800DEC04; +test_player_lateral = 0x800DF460; +update_player = 0x800DF740; +check_input_use_partner = 0x800DFA00; +clear_player_status = 0x800DFC50; +enable_player_shadow = 0x800E00B0; +disable_player_shadow = 0x800E00E4; +disable_player_static_collisions = 0x800E0114; +enable_player_static_collisions = 0x800E0140; +disable_player_input = 0x800E0178; +enable_player_input = 0x800E01A4; +render_player = 0x800E1138; +render_player_model = 0x800E1168; +appendGfx_player = 0x800E12F4; +appendGfx_player_spin = 0x800E1704; +update_player_shadow = 0x800E1BC4; +update_player_input = 0x800E1F90; +input_to_move_vector = 0x800E2304; +move_player = 0x800E2778; +collision_main_above = 0x800E27E0; +update_fall_state = 0x800E2D18; +gravity_use_jump_parms = 0x800E2FD0; +gravity_use_fall_parms = 0x800E306C; +phys_player_land = 0x800E3278; +integrate_gravity = 0x800E3448; +collision_main_lateral = 0x800E363C; +collision_check_player_intersecting_world = 0x800E4308; +check_input_midair_jump = 0x800E4FCC; +get_current_partner_id = 0x800E5088; +save_ground_pos = 0x800E54E0; +set_action_state = 0x800E5DA4; +update_locomotion_state = 0x800E5F68; +start_falling = 0x800E5FD0; +start_bounce_a = 0x800E6034; +start_bounce_b = 0x800E608C; +check_input_hammer = 0x800E60E0; +check_input_jump = 0x800E6160; +check_input_spin = 0x800E6268; +make_disguise_npc = 0x800E657C; +can_pause = 0x800E69DC; +setup_partner_popup = 0x800E6B78; +setup_item_popup = 0x800E6C44; +check_input_open_menus = 0x800E6CE4; +check_input_status_menu = 0x800E728C; +clear_player_data = 0x800E73A0; +get_player_data = 0x800E7564; +add_item = 0x800E7574; +get_item_count = 0x800E75EC; +get_item_empty_count = 0x800E7620; +find_item = 0x800E7644; +sort_items = 0x800E76CC; +add_badge = 0x800E773C; +store_item = 0x800E77C4; +get_stored_count = 0x800E7814; +get_stored_empty_count = 0x800E7848; +enforce_hpfp_limits = 0x800E786C; +initialize_status_menu = 0x800E7934; +status_menu_draw_number = 0x800E7CA4; +status_menu_draw_stat = 0x800E7E34; +update_status_menu = 0x800E80B4; +coin_counter_draw_content = 0x800E92D8; +update_coin_counter = 0x800E93DC; +show_coin_counter = 0x800E9518; +hide_coin_counter = 0x800E9698; +ShowCoinCounter = 0x800E96F8; +draw_status_ui = 0x800E973C; +open_status_menu_long = 0x800E9760; +open_status_menu_short = 0x800E978C; +is_status_menu_visible = 0x800E9910; +status_menu_start_blinking_hp = 0x800E9920; +status_menu_stop_blinking_hp = 0x800E9964; +status_menu_start_blinking_fp = 0x800E998C; +status_menu_stop_blinking_fp = 0x800E99D0; +status_menu_start_blinking_coins = 0x800E99F4; +status_menu_stop_blinking_coins = 0x800E9A38; +status_menu_start_blinking_sp = 0x800E9A60; +status_menu_stop_blinking_sp = 0x800E9A94; +status_menu_start_blinking_sp_bars = 0x800E9AB8; +status_menu_start_blinking_starpoints = 0x800E9AE4; +status_menu_stop_blinking_starpoints = 0x800E9B0C; +decrement_status_menu_disabled = 0x800E9B30; +increment_status_menu_disabled = 0x800E9B54; +sync_status_menu = 0x800E9B6C; +reset_status_menu = 0x800E9BB0; +is_ability_active = 0x800E9D48; +is_partner_ability_active = 0x800EA0B8; +add_coins = 0x800EA0C0; +add_star_points = 0x800EA128; +add_star_pieces = 0x800EA170; +increment_max_SP = 0x800EA1B4; +set_max_SP = 0x800EA1D8; +add_SP = 0x800EA1F4; +recover_fp = 0x800EA264; +recover_hp = 0x800EA2CC; +subtract_hp = 0x800EA334; +has_full_hp = 0x800EA360; +has_full_fp = 0x800EA37C; +add_fortress_keys = 0x800EA398; +subtract_fortress_keys = 0x800EA3B8; +get_fortress_key_count = 0x800EA3E4; +use_consumable = 0x800EA400; +remove_consumable = 0x800EA47C; +is_current_partner_flying = 0x800EA5A4; +partner_use_ability = 0x800EB314; +partner_player_can_pause = 0x800EB3E0; +partner_can_use_ability = 0x800EB42C; +partner_reset_data = 0x800EB474; +partner_initialize_data = 0x800EB580; +partner_test_enemy_collision = 0x800EB5E4; +partner_get_ride_script = 0x800EB638; +partner_handle_before_battle = 0x800EB658; +partner_handle_after_battle = 0x800EB6C4; +partner_kill_ability_script = 0x800EB7CC; +partner_suspend_ability_script = 0x800EB818; +partner_resume_ability_script = 0x800EB860; +enable_partner_walking = 0x800EB8A8; +enable_partner_flying = 0x800ED310; +update_player_move_history = 0x800ED4B8; +enable_partner_ai = 0x800EF328; +clear_partner_move_history = 0x800EF45C; +draw_submenu_title = 0x800F4648; +draw_box = 0x800F52E0; +update_entities = 0x8010F6D0; +update_shadows = 0x8010FA98; +render_entities = 0x8010FEB4; +render_shadows = 0x801100CC; +update_entity_transform_matrix = 0x8011022C; +update_shadow_transform_matrix = 0x80110374; +update_entity_inverse_rotation_matrix = 0x801104A4; +get_entity_by_index = 0x801105E8; +get_shadow_by_index = 0x80110604; +get_entity_list = 0x80110620; +get_shadow_list = 0x8011064C; +get_entity_type = 0x801106A4; +delete_entity = 0x801106D0; +delete_entity_and_unload_data = 0x80110790; +entity_get_collision_flags = 0x801108B8; +test_player_entity_aabb = 0x80110AAC; +is_player_action_state = 0x80110BB0; +load_area_specific_entity_data = 0x80110C14; +clear_entity_data = 0x80110CB8; +is_entity_data_loaded = 0x8011115C; // ! +load_simple_entity_data = 0x801112A4; +load_split_entity_data = 0x80111408; +create_entity = 0x801118C4; +create_shadow_from_data = 0x80111BD8; +MakeEntity = 0x80111D38; +AssignScript = 0x80111FB0; +AssignAreaFlag = 0x80111FF8; +AssignBlockFlag = 0x8011206C; +AssignFlag = 0x801120B8; +AssignPanelFlag = 0x80112114; +AssignCrateFlag = 0x80112170; +create_entity_shadow = 0x801121CC; +create_shadow_type = 0x80112260; +set_standard_shadow_scale = 0x8011285C; +set_npc_shadow_scale = 0x80112900; +set_peach_shadow_scale = 0x801129D4; +NOP_state = 0x80112B90; +_set_game_mode = 0x80112CA8; +step_current_game_mode = 0x80112E78; +render_ui = 0x80112F58; +appendGfx_model = 0x80113090; +load_tile_header = 0x80114D6C; +get_model_property = 0x80115B0C; +_load_model_textures = 0x80115B44; +load_model_textures = 0x80115C24; +clear_model_data = 0x80115D44; +init_model_data = 0x80115FE8; +calculate_model_sizes = 0x8011612C; +render_models = 0x80116B90; +appendGfx_model_group = 0x80117C94; +get_model_from_list_index = 0x8011AD30; +load_data_for_models = 0x8011AD48; +load_model_transforms = 0x8011ADC8; +get_model_list_index_from_tree_index = 0x8011B010; +get_model_center_and_size = 0x8011B0EC; +clone_model = 0x8011B6F0; +enable_world_fog = 0x8011BB50; +disable_world_fog = 0x8011BB64; +set_world_fog_dist = 0x8011BB74; +set_world_fog_color = 0x8011BB88; +is_world_fog_enabled = 0x8011BBA4; +get_world_fog_distance = 0x8011BBB4; +get_world_fog_color = 0x8011BBD8; +set_tex_panner = 0x8011BC14; +set_main_pan_u = 0x8011BC1C; +set_main_pan_v = 0x8011BC34; +set_aux_pan_u = 0x8011BC4C; +set_aux_pan_v = 0x8011BC64; +set_background_color_blend = 0x8011BE5C; +get_background_color_blend = 0x8011BE80; +queue_render_task = 0x8011D910; +play_model_animation = 0x80120148; +clear_virtual_models = 0x80120BB0; +init_virtual_models = 0x80120C58; +load_virtual_model = 0x80120CE0; +enable_entity_fog = 0x80122FEC; +disable_entity_fog = 0x80123000; +set_entity_fog_dist = 0x80123010; +set_entity_fog_color = 0x80123028; +is_entity_fog_enabled = 0x80123050; +get_entity_fog_distance = 0x80123060; +get_entity_fog_color = 0x8012307C; +stub_dynamic_entity_delegate = 0x801230B0; +clear_dynamic_entity_list = 0x801230B8; +init_dynamic_entity_list = 0x80123114; +bind_dynamic_entity_3 = 0x80123158; +bind_dynamic_entity_7 = 0x8012323C; +bind_dynamic_entity_B = 0x80123320; +update_dynamic_entities = 0x80123404; +render_dynamic_entities = 0x80123470; +get_dynamic_entity = 0x8012363C; +clear_character_set = 0x80123660; +clear_printers = 0x80123674; +load_font_data = 0x80123708; +load_font = 0x80123734; +update_messages = 0x801237D8; +_update_message = 0x80123898; +render_messages = 0x80124204; +initialize_printer = 0x801256A4; +dma_load_string = 0x80125804; +load_message_to_buffer = 0x8012588C; +load_string = 0x80125900; +_load_string = 0x8012591C; +load_message_to_printer = 0x80125A68; +clamp_printer_coords = 0x80125AB8; +cancel_message = 0x80125B08; +set_message_images = 0x80125B2C; +set_message_string = 0x80125B3C; +set_message_value = 0x80125BE8; +close_message = 0x80125C70; +get_char_width = 0x80125DF4; +get_string_properties = 0x80125F68; +get_string_width = 0x80126474; +draw_string = 0x801264EC; +draw_digit = 0x801274C0; +draw_number = 0x8012769C; +_draw_message_box = 0x8012CC08; +draw_coin_sparkles = 0x80130B0C; +get_item_entity = 0x80130F58; +clear_item_entity_data = 0x80130FF0; +init_item_entity_list = 0x801310CC; +make_item_entity = 0x801313F4; +make_item_entity_nodelay = 0x80131A94; +make_item_entity_delayed = 0x80131AC8; +init_got_item = 0x80131B00; +update_item_entities = 0x80131EEC; +appendGfx_item_entity = 0x801321A4; +draw_item_entities = 0x80132C80; +render_item_entities = 0x80132E54; +remove_item_entity_by_reference = 0x80133930; +remove_item_entity_by_index = 0x801339FC; +test_item_player_collision = 0x80133B0C; +set_item_entity_flags = 0x80134148; +clear_item_entity_flags = 0x80134188; +set_item_entity_position = 0x8013420C; +update_item_entity_collectable = 0x80134250; +update_item_entity_static = 0x80135658; +update_item_entity_temp = 0x801356DC; +set_map_transition_effect = 0x801382A0; +init_menu_icon_list = 0x80141300; +create_icon = 0x801414A4; +update_menu_icons = 0x80141610; +render_menu_icon = 0x80142BFC; +render_menu_icons = 0x801436B4; +draw_menu_icon = 0x80144298; +draw_icon_0 = 0x801447A8; +draw_icon_1 = 0x801447C4; +draw_icon_2 = 0x801447E0; +set_menu_icon_script = 0x801447FC; +get_menu_icon_script = 0x801448B0; +get_menu_icon = 0x801448D4; +free_icon = 0x801448F4; +set_icon_render_pos = 0x80144984; +get_icon_render_pos = 0x801449AC; +set_icon_flags = 0x80144A00; +clear_icon_flags = 0x80144A2C; +icon_set_opacity = 0x80144EB0; +icon_set_tint = 0x80144EFC; +clear_saved_variables = 0x80145320; +clear_area_flags = 0x80145390; +clear_global_flag = 0x801453E0; +set_global_flag = 0x80145450; +get_global_flag = 0x801454BC; +set_global_byte = 0x80145520; +get_global_byte = 0x80145538; +clear_area_flag = 0x8014554C; +set_area_flag = 0x801455A0; +get_area_flag = 0x801455F0; +set_area_byte = 0x80145638; +get_area_byte = 0x80145650; +default_trigger_function_handler = 0x80145670; +clear_trigger_data = 0x80145680; +init_trigger_list = 0x80145728; +create_trigger = 0x8014576C; +update_triggers = 0x80145860; +delete_trigger = 0x80145BF4; +is_trigger_bound = 0x80145C6C; +get_trigger_by_id = 0x80145CD0; +load_map_bg = 0x80145D70; +read_background_size = 0x80145E28; +set_background_size = 0x80145E70; +play_ambient_sounds = 0x80147368; +set_ui_panel_properties = 0x80147CC8; +_play_sound = 0x80149AB8; +stop_sound = 0x80149C6C; +play_sound = 0x80149CB4; +play_sound_at_player = 0x80149CD8; +play_sound_at_npc = 0x80149D08; +play_sound_at_position = 0x80149D5C; +get_default_variation_for_song = 0x8014A430; +_set_music_track = 0x8014A7E0; +set_music_track = 0x8014A918; +transition_music_volume_to = 0x8014AC84; +gSongArray = 0x8014F720; +D_80156954 = 0x80156954; +gMusicUnkVolume = 0x80159AE0; +gMusicTargetVolume = 0x80159AE2; +gMusicUnkVolume2 = 0x80159AE4; +gMusicCurrentVolume = 0x80159AE6; +gMusicPlayers = 0x80159AF0; +gCollisionStatus = 0x8015A550; +get_dpad_input_radial = 0x8023E000; +initialize_battle = 0x8023E130; +update_actor_shadows = 0x8023E404; +update_battle_state = 0x8023E438; +draw_main_battle_ui = 0x8023EA7C; +draw_enemy_health_bars = 0x8023FFA0; +update_starpoints_display = 0x802403BC; +delete_actor = 0x80240BBC; +delete_player_actor = 0x80240D68; +begin_battle = 0x80241218; +update_heroes_start_turn = 0x80242024; +switch_to_player = 0x80242AC8; +pause_set_cursor_opacity = 0x80242BA0; // seg_rom:0x135EE0 +update_end_player_turn = 0x80242BB0; +pause_interp_cursor = 0x80242E6C; +switch_to_partner = 0x80242F00; +pause_interp_text_scroll = 0x80243418; +pause_interp_vertical_scroll = 0x8024346C; +pause_update_cursor = 0x802434DC; // seg_rom:0x135EE0 +pause_textbox_draw_contents = 0x80243570; +pause_tutorial_draw_contents = 0x802437F4; +switch_order = 0x80243918; +pause_init = 0x80244060; +pause_tutorial_input = 0x802442A0; +pause_handle_input = 0x80244424; +pause_cleanup = 0x80244708; // seg_rom:0x135EE0 +pause_get_total_equipped_bp_cost = 0x802447F4; +pause_draw_rect = 0x80244858; +pause_sort_item_list = 0x80244A4C; +end_battle = 0x80244A50; +pause_tabs_draw_invis = 0x80244B90; +pause_tabs_draw_stats = 0x80244B98; +pause_tabs_draw_badges = 0x80244CC0; +pause_tabs_draw_items = 0x80244DE8; +update_run_away = 0x80244F00; +pause_tabs_draw_party = 0x80244F10; +pause_tabs_draw_spirits = 0x80245038; +pause_tabs_draw_map = 0x80245160; +pause_tabs_init = 0x80245288; +pause_tabs_handle_input = 0x80245354; +pause_tabs_update = 0x802455BC; +EnablePartnerBlur = 0x802456B8; +DisablePartnerBlur = 0x802456D8; +update_swap_partner = 0x802456F8; +pause_tabs_cleanup = 0x80245930; +pause_stats_draw_contents = 0x80245980; +update_player_action = 0x80245AD0; +update_player_change_turn = 0x80246450; +pause_stats_init = 0x80246AC8; +update_partner_action = 0x80246B34; +pause_stats_handle_input = 0x80246B74; +pause_stats_cleanup = 0x80246F94; +pause_badges_comparator = 0x80246FE0; +pause_badges_count_all = 0x80247054; +pause_badges_count_equipped = 0x802470B0; +pause_badges_get_pos_x = 0x8024710C; +pause_badges_get_pos_y = 0x80247168; +pause_badges_get_column = 0x802471D8; +pause_badges_get_row = 0x80247220; +pause_badges_is_visible = 0x80247270; +pause_badges_scroll_offset_y = 0x80247298; +pause_badges_scroll_offset_x = 0x802472A8; +update_enemy_change_turn = 0x802472AC; +pause_badges_try_remove = 0x802472B0; +pause_badges_try_equip = 0x80247338; +pause_badges_draw_bp_orbs = 0x80247458; +pause_badges_draw_contents = 0x80247508; +update_enemy_action = 0x80247570; +pause_badges_load_badges = 0x80248D8C; +pause_badges_init = 0x80248FC0; +pause_badges_handle_input = 0x802490A8; +pause_badges_update = 0x8024961C; +pause_badges_cleanup = 0x80249758; +pause_items_comparator = 0x802497B0; +pause_items_get_pos_x = 0x802497D0; +pause_items_get_pos_y = 0x80249828; +pause_items_get_column = 0x80249898; +pause_items_get_row = 0x802498E0; +pause_items_is_visible = 0x80249930; +pause_items_scroll_offset_y = 0x80249958; +pause_items_scroll_offset_x = 0x80249968; +pause_items_draw_contents = 0x80249970; +pause_items_load_items = 0x8024A4DC; +pause_items_init = 0x8024A714; +pause_items_handle_input = 0x8024A7D8; +pause_items_update = 0x8024AC54; +pause_items_cleanup = 0x8024AD90; +pause_partners_load_portrait = 0x8024ADE0; +pause_partners_draw_contents = 0x8024AEF8; +pause_partners_draw_title = 0x8024BBAC; +pause_partners_draw_movelist = 0x8024BD38; +pause_partners_draw_movelist_title = 0x8024C048; +pause_partners_draw_movelist_flower = 0x8024C0A0; +pause_partners_init = 0x8024C0E0; +pause_partners_handle_input = 0x8024C338; +pause_partners_update = 0x8024C7A4; +pause_partners_cleanup = 0x8024C984; +pause_spirits_draw_contents = 0x8024CA00; +use_cam_preset = 0x8024CF34; +pause_spirits_draw_title = 0x8024D294; +pause_spirits_init = 0x8024D360; +pause_spirits_handle_input = 0x8024D44C; +pause_spirits_update = 0x8024D800; +pause_spirits_cleanup = 0x8024D8D8; +pause_map_draw_border_arrows = 0x8024DA28; +pause_map_draw_contents = 0x8024DB1C; +cam_target_actor = 0x8024E43C; +move_cam_over = 0x8024E4D8; +set_cam_target_pos = 0x8024E520; +pause_map_draw_title = 0x8024E54C; +set_cam_zoom = 0x8024E594; +add_cam_zoom = 0x8024E5B4; +set_cam_zoffset = 0x8024E5E0; +unfreeze_cam = 0x8024E600; +pause_map_init = 0x8024E604; +UseCamPreset = 0x8024E61C; +pause_map_handle_input = 0x8024E878; +SetBattleCamTarget = 0x8024E90C; +SetBattleCamOffsetZ = 0x8024EA58; +AddBattleCamOffsetZ = 0x8024EA98; +SetBattleCamYaw = 0x8024EAE4; +BattleCamTargetActor = 0x8024EB24; +MoveBattleCamOver = 0x8024EC08; +SetBattleCamZoom = 0x8024EC6C; +AddBattleCamZoom = 0x8024ECAC; +pause_map_update = 0x8024ECB0; +FreezeBattleCam = 0x8024ED78; +pause_map_cleanup = 0x8024EE2C; +pause_get_menu_string = 0x8024EE80; +pause_draw_menu_label = 0x8024EE94; +create_popup = 0x8024EF68; +show_battle_message = 0x8024F960; +show_variable_battle_message = 0x8024FA04; +is_popup_displayed = 0x8024FAB4; +set_popup_duration = 0x8024FAC4; +close_action_command_instruction_popup = 0x8024FB0C; +show_message_popup = 0x80250EA4; +ShowMessageBox = 0x802512B4; +ShowVariableMessageBox = 0x8025130C; +IsMessageBoxDisplayed = 0x80251384; +WaitForMessageBoxDone = 0x802513CC; +ForceCloseMessageBox = 0x802513F0; +SetMessageBoxDuration = 0x80251408; +calc_item_check_hit = 0x802515D0; +calc_item_damage_enemy = 0x802516E8; +ItemDamageEnemy = 0x80252728; +ItemAfflictEnemy = 0x80252924; +ItemCheckHit = 0x80252D40; +ActorSpeak = 0x80252F30; +EndActorSpeech = 0x802532D0; +ShowBattleChoice = 0x80253538; +OverrideBattleDmaDest = 0x802535F8; +LoadBattleDmaData = 0x80253624; +PlaySoundAtActor = 0x8025385C; +PlaySoundAtPart = 0x802538D0; +PlayLoopingSoundAtActor = 0x80253974; +StopLoopingSoundAtActor = 0x80253A18; +SetForegroundModelsVisibleUnsafe = 0x80253AA8; +SetForegroundModelsVisible = 0x80253AEC; +MakeStatusField = 0x80253B94; +is_actor_hp_bar_visible = 0x80253C20; +is_actortype_hpbar_visible = 0x80253C9C; +save_tattle_flags = 0x80253D10; +load_tattle_flags = 0x80253E78; +MultiplyByActorScale = 0x80253FDC; +MultiplyVec2ByActorScale = 0x80254048; +MultiplyVec3ByActorScale = 0x802540DC; +ApplyShrinkFromOwner = 0x80254198; +StartRumble = 0x80254218; +mtx_mirror_y = 0x80254288; +enable_actor_blur = 0x802542CC; +disable_actor_blur = 0x8025455C; +reset_actor_blur = 0x802545AC; +enable_partner_blur = 0x80254644; +disable_partner_blur = 0x80254668; +reset_partner_blur = 0x8025468C; +enable_player_blur = 0x802546D4; +disable_player_blur = 0x80254914; +update_actor_shadow = 0x802559BC; +update_enemy_shadows = 0x80255F5C; +update_hero_shadows = 0x80255FAC; +update_player_actor_shadow = 0x80257BAC; +_remove_part_decoration = 0x8025D03C; +activate_defend_command = 0x80260B04; +HasMerleeCastsLeft = 0x802619C8; +FXRecoverHP = 0x80261BA8; +FXRecoverFP = 0x80261C68; +IncrementPlayerHP = 0x80261D28; +IncrementPlayerFP = 0x80261D60; +create_target_list = 0x80262240; +player_create_target_list = 0x8026302C; +enemy_create_target_list = 0x80263048; +count_power_plus = 0x80263B10; +deduct_current_move_fp = 0x80263BC8; +set_animation = 0x80263CFC; +set_animation_rate = 0x80263EB8; +set_actor_yaw = 0x80263F68; +set_part_yaw = 0x80263F9C; +add_xz_vec3f = 0x80264128; +add_xz_vec3f_copy1 = 0x802641C0; +add_xz_vec3f_copy2 = 0x80264258; +play_movement_dust_effects = 0x802642F0; +get_actor_part = 0x8026445C; +load_player_actor = 0x802644A4; +load_partner_actor = 0x80264B74; +create_actor = 0x802653A4; +lookup_defense = 0x80265E44; +lookup_status_chance = 0x80265E98; +lookup_status_duration_mod = 0x80265EEC; +inflict_status = 0x80265F40; +inflict_partner_ko = 0x80266254; +get_defense = 0x802662BC; +show_damage_popup = 0x802665AC; +try_inflict_status = 0x80266B78; +inflict_status_set_duration = 0x80266CF0; +add_part_decoration = 0x80267114; +add_actor_decoration = 0x80267190; +remove_part_decoration = 0x80267218; +remove_actor_decoration = 0x80267234; +heroes_is_ability_active = 0x802672AC; +create_part_shadow = 0x8026731C; +remove_part_shadow = 0x802673A0; +create_part_shadow_by_ref = 0x802673E4; +remove_player_buffs = 0x80267454; +reset_all_actor_sounds = 0x80267A9C; +hide_foreground_models_unsafe = 0x80267BDC; +show_foreground_models_unsafe = 0x80267C48; +hide_foreground_models = 0x80267CB4; +show_foreground_models = 0x80267D28; +StartRumbleWithParams = 0x80267D9C; +start_rumble_type = 0x80267DF4; +LoadItemScript = 0x80267ED0; +LoadFreeItemScript = 0x8026801C; +LoadMoveScript = 0x80268130; +LoadActionCommand = 0x802681C0; +check_block_input = 0x80268ECC; +GetActionSuccess = 0x80269294; +SetActionSuccess = 0x802692C0; +CloseActionCommandInfo = 0x80269410; +GetActionSuccessCopy = 0x802694F8; +GetBlockResult = 0x8026957C; +count_targets = 0x80269660; +get_nearest_home_index = 0x80269698; +set_goal_pos_to_part = 0x80269754; +set_part_goal_to_actor_part = 0x802699D8; +set_actor_current_position = 0x80269C24; +set_part_absolute_position = 0x80269C70; +set_actor_home_position = 0x80269D20; +get_actor = 0x80269D6C; +LoadBattleSection = 0x80269DE4; +GetBattlePhase = 0x80269E28; +GetLastElement = 0x80269E54; +SetGoalToHome = 0x80269EC4; +SetIdleGoalToHome = 0x80269F2C; +SetGoalToIndex = 0x80269F94; +GetIndexFromPos = 0x8026A05C; +GetIndexFromHome = 0x8026A0D4; +CountPlayerTargets = 0x8026A14C; +ForceHomePos = 0x8026A1EC; +SetHomePos = 0x8026A2D0; +SetGoalToTarget = 0x8026A3A8; +SetPartGoalToTarget = 0x8026A404; +SetGoalToFirstTarget = 0x8026A49C; +SetGoalPos = 0x8026A510; +SetIdleGoal = 0x8026A62C; +AddGoalPos = 0x8026A748; +GetGoalPos = 0x8026A820; +GetIdleGoal = 0x8026A8EC; +GetPartTarget = 0x8026A9B8; +GetActorPos = 0x8026AAA8; +GetPartOffset = 0x8026AB74; +GetPartPos = 0x8026AC88; +GetHomePos = 0x8026AD74; +SetActorPos = 0x8026AE40; +SetPartPos = 0x8026AF18; +SetEnemyTargetOffset = 0x8026B0A0; +SetAnimation = 0x8026B1B0; +GetAnimation = 0x8026B238; +SetAnimationRate = 0x8026B2D0; +SetActorYaw = 0x8026B358; +GetActorYaw = 0x8026B3C8; +SetPartYaw = 0x8026B438; +GetPartYaw = 0x8026B4C0; +SetActorJumpGravity = 0x8026B55C; +SetActorIdleJumpGravity = 0x8026B5D8; +SetActorSpeed = 0x8026B654; +SetActorIdleSpeed = 0x8026B6D0; +SetPartJumpGravity = 0x8026B74C; +SetPartMoveSpeed = 0x8026B7EC; +SetJumpAnimations = 0x8026B88C; +AddActorPos = 0x8026B92C; +SetActorDispOffset = 0x8026BA04; +GetPartDispOffset = 0x8026BAE8; +SetPartDispOffset = 0x8026BC38; +AddPartDispOffset = 0x8026BD88; +GetActorVar = 0x8026BFB4; +SetActorVar = 0x8026C044; +AddActorVar = 0x8026C0D4; +GetPartMovementVar = 0x8026C170; +SetPartMovementVar = 0x8026C22C; +AddPartMovementVar = 0x8026C2E8; +SetActorRotation = 0x8026C3AC; +SetActorRotationOffset = 0x8026C4AC; +GetActorRotation = 0x8026C56C; +SetPartRotation = 0x8026C634; +SetPartRotationOffset = 0x8026C740; +GetPartRotation = 0x8026C828; +SetActorScale = 0x8026C904; +SetActorScaleModifier = 0x8026C9C4; +GetActorScale = 0x8026CA84; +SetPartScale = 0x8026CB4C; +GetPartScale = 0x8026CC34; +GetBattleFlags = 0x8026CD10; +SetBattleFlagBits = 0x8026CD3C; +GetBattleFlags2 = 0x8026CDA0; +SetBattleFlagBits2 = 0x8026CDCC; +SetActorFlags = 0x8026CE30; +SetActorFlagBits = 0x8026CE8C; +GetActorFlags = 0x8026CF20; +SetPartFlags = 0x8026CF88; +SetPartFlagBits = 0x8026D010; +SetPartTargetFlags = 0x8026D0D0; +SetPartTargetFlagBits = 0x8026D158; +GetPartFlags = 0x8026D218; +GetPartTargetFlags = 0x8026D2AC; +SetPartEventFlags = 0x8026D340; +SetPartEventBits = 0x8026D3C8; +GetPartEventFlags = 0x8026D488; +HPBarToHome = 0x8026D664; +HPBarToCurrent = 0x8026D7A8; +SummonEnemy = 0x8026DB64; +GetOwnerID = 0x8026DE00; +SetOwnerID = 0x8026DE28; +ActorExists = 0x8026DE5C; +SetBattleInputMask = 0x8026E050; +SetBattleInputButtons = 0x8026E068; +CheckButtonPress = 0x8026E098; +CheckButtonHeld = 0x8026E0D0; +CheckButtonDown = 0x8026E108; +GetBattleState = 0x8026E140; +PlayerCreateTargetList = 0x8026E2CC; +EnemyCreateTargetList = 0x8026E310; +InitTargetIterator = 0x8026E354; +SetOwnerTarget = 0x8026E3A8; +ChooseNextTarget = 0x8026E414; +GetTargetListLength = 0x8026E864; +GetOwnerTarget = 0x8026E8AC; +GetAttackerActorID = 0x8026E974; +GetDistanceToGoal = 0x8026E9FC; +AddActorDecoration = 0x8026EE88; +RemoveActorDecoration = 0x8026EF4C; +ModifyActorDecoration = 0x8026EFF0; +UseIdleAnimation = 0x8026F0EC; +GetStatusFlags = 0x8026F230; +RemovePlayerBuffs = 0x8026F44C; +SetPartAlpha = 0x8026F470; +CreatePartShadow = 0x8026F52C; +RemovePartShadow = 0x8026F59C; +SetBattleVar = 0x8026F638; +GetBattleVar = 0x8026F694; +ResetAllActorSounds = 0x8026F6EC; +SetActorSounds = 0x8026F740; +gPauseMenuStrings = 0x8026F778; +ResetActorSounds = 0x8026F838; +SetPartSounds = 0x8026FA00; +SetActorType = 0x8026FB20; +ShowShockEffect = 0x8026FBB0; +GetActorAttackBoost = 0x8026FC04; +GetActorDefenseBoost = 0x8026FC6C; +BoostAttack = 0x8026FCD4; +BoostDefense = 0x80270174; +VanishActor = 0x80270614; +ElectrifyActor = 0x8027095C; +HealActor = 0x80270CA4; +WaitForBuffDone = 0x8027114C; +CopyBuffs = 0x80271160; +dispatch_event_player = 0x80271658; +dispatch_event_player_continue_turn = 0x802716E4; +calc_player_test_enemy = 0x80271754; +calc_player_damage_enemy = 0x80271944; +dispatch_damage_event_player = 0x802731BC; +dispatch_damage_event_player_0 = 0x8027337C; +dispatch_damage_event_player_1 = 0x802733A8; +GetMenuSelection = 0x802733C4; +PlayerFallToGoal = 0x80273894; +PlayerLandJump = 0x80273B04; +PlayerRunToGoal = 0x80273C64; +CancelablePlayerRunToGoal = 0x80273EFC; +GetPlayerHP = 0x80274234; +PlayerDamageEnemy = 0x80274260; +PlayerPowerBounceEnemy = 0x802744A0; +PlayerTestEnemy = 0x802746F0; +DispatchDamagePlayerEvent = 0x8027491C; +EnablePlayerBlur = 0x80274978; +DidActionSucceed = 0x80276EB4; +dispatch_event_general = 0x80276F8C; +play_hit_sound = 0x80277004; +dispatch_event_actor = 0x80277160; +calc_enemy_test_target = 0x802771F8; +calc_enemy_damage_target = 0x8027742C; +dispatch_damage_event_actor = 0x802786D4; +dispatch_damage_event_actor_0 = 0x802788F8; +dispatch_damage_event_actor_1 = 0x80278914; +BindTakeTurn = 0x80278930; +PauseTakeTurn = 0x802789A4; +ResumeTakeTurn = 0x80278A1C; +BindIdle = 0x80278A94; +EnableIdleScript = 0x80278B4C; +BindHandleEvent = 0x80278C20; +BindNextTurn = 0x80278C94; +JumpToGoal = 0x80278D08; +IdleJumpToGoal = 0x8027910C; +JumpToGoalSimple2 = 0x80279420; +JumpWithBounce = 0x80279728; +LandJump = 0x80279AD4; +FallToGoal = 0x80279BEC; +RunToGoal = 0x80279E64; +IdleRunToGoal = 0x8027A264; +JumpPartTo = 0x8027A4E4; +FallPartTo = 0x8027A854; +LandJumpPart = 0x8027AB5C; +RunPartTo = 0x8027ACAC; +update_lerp_battle = 0x8027B0DC; +FlyToGoal = 0x8027B624; +IdleFlyToGoal = 0x8027BBB8; +FlyPartTo = 0x8027BF38; +GetLastEvent = 0x8027C4E0; +SetTargetActor = 0x8027C548; +SetEnemyHP = 0x8027C5C8; +GetActorHP = 0x8027C6A0; +GetEnemyMaxHP = 0x8027C748; +RemoveActor = 0x8027C7B0; +DropStarPoints = 0x8027C8A4; +SetDefenseTable = 0x8027CA74; +SetStatusTable = 0x8027CB08; +SetIdleAnimations = 0x8027CB7C; +EnemyDamageTarget = 0x8027CCB4; +EnemyFollowupAfflictTarget = 0x8027CED4; +EnemyTestTarget = 0x8027CFB8; +DispatchDamageEvent = 0x8027D1BC; +DispatchEvent = 0x8027D264; +SetTargetOffset = 0x8027D380; +EnableActorBlur = 0x8027D57C; +AfflictActor = 0x8027D67C; +GetEncounterState = 0x8027D7C4; +YieldTurn = 0x8027D7F0; +SetActorSize = 0x8027D810; +GetActorSize = 0x8027D8E0; +SetPartSize = 0x8027D970; +GetOriginalActorType = 0x8027DA68; +GetCurrentActorType = 0x8027DAD4; +GetLastDamage = 0x8027DB3C; +EnableActorGlow = 0x8027DBA4; +WasStatusInflicted = 0x8027DC68; +CopyStatusEffects = 0x8027DCBC; +ClearStatusEffects = 0x8027DDA0; +dispatch_event_partner = 0x8027DE80; +dispatch_event_partner_continue_turn = 0x8027DF0C; +calc_partner_test_enemy = 0x8027DF7C; +calc_partner_damage_enemy = 0x8027E328; +dispatch_damage_event_partner = 0x8027F9CC; +dispatch_damage_event_partner_0 = 0x8027FB80; +dispatch_damage_event_partner_1 = 0x8027FB9C; +MakeOwnerTargetIndex = 0x8027FBB8; +GetActorLevel = 0x8027FD48; +PartnerDamageEnemy = 0x8027FDB4; +PartnerAfflictEnemy = 0x80280004; +PartnerPowerBounceEnemy = 0x80280270; +PartnerTestEnemy = 0x802804D0; +DeletePartner = 0x802807A8; +GetDamageIntensity = 0x80280840; +ActorAddMovePos = 0x80280880; +LoadStarPowerScript = 0x80280950; +BtlPutPartnerAway = 0x80280A34; +BtlBringPartnerOut = 0x80280B6C; +draw_shop_items = 0x80281524; +MakeShop = 0x80281860; +MakeShopOwner = 0x80281BD8; +MakeDoorAdvanced = 0x80281CAC; +CheckActionState = 0x802831DC; +CreatePushBlockGrid = 0x802832E0; +SetPushBlock = 0x8028347C; +GetPushBlock = 0x802835C0; +GetGridIndexFromPos = 0x802836B8; +SetPushBlockFallEffect = 0x802837AC; +TeleportPartnerToPlayer = 0x8028387C; +gBattleDmaDest = 0x80284000; +MarioEnterStage = 0x80284A40; +PeachEnterStage = 0x80284D04; +PlayerScriptDispatcher = 0x80284EBC; +PeachScriptDispatcher = 0x80285010; +ExecutePlayerAction = 0x8028505C; +ExecutePeachAction = 0x80285174; +PlayerFirstStrike = 0x802851FC; +StartDefend = 0x802852B8; +HandleEvent_Player = 0x802852D4; +EnterWalk = 0x80285960; +EnterWalkShort = 0x80285A60; +EnterSavePoint = 0x80285CB0; +ExitWalk = 0x80285CF4; +ExitSingleDoor = 0x80285DAC; +EnterSingleDoor = 0x80285DD4; +ExitDoubleDoor = 0x80285E4C; +EnterDoubleDoor = 0x80285E74; +RunAwayStart = 0x802868BC; +RunAwayFail = 0x80287078; +RunAwayReset = 0x80287128; +PlayEatFX = 0x802878D0; +PlayDrinkFX = 0x80287948; +UseLifeShroom = 0x802879C0; +MerleeRunOut = 0x80288398; +MerleeAttackBonus = 0x80288400; +MerleeDefenseBonus = 0x8028870C; +MerleeExpBonus = 0x80288A58; +PlayerHappy = 0x80288D64; +DoDizzyAttack = 0x8028907C; +RegainAbility = 0x80289110; +UseMystery = 0x80293E40; +gMoveScriptTable = 0x80293E80; +DoSleepHit = 0x802945E0; +DoDizzyHit = 0x802945FC; +DoParalyzeHit = 0x80294618; +DoPoisonHit = 0x80294634; +DoStopHit = 0x80294650; +DoFreezeHit = 0x8029466C; +DoShinkHit = 0x802946B8; +ForceNextTarget = 0x80298BF0; +DoNormalHit = 0x80299044; +DoBurnHit = 0x8029A0D0; +DoShockHit = 0x8029A6FC; +DoImmune = 0x8029AC70; +DoDeath = 0x8029AEC0; +DoScareAway = 0x8029B22C; +DoSpinSmashHit = 0x8029B998; +DoJumpBack = 0x8029BD70; +DoReturnHome = 0x8029BEB8; +DoRecover = 0x8029BFA0; +DoAirLift = 0x8029C37C; +DoBlowAway = 0x8029C4A8; +gSpeakingActorPrintCtx = 0x8029FA60; +gSpeakingActorPrintIsDone = 0x8029FA68; +gSpeakingActorTalkAnim = 0x8029FA6C; +gSpeakingActorIdleAnim = 0x8029FA70; +gSpeakingActor = 0x8029FA74; +gSpeakingActorPart = 0x8029FA78; +draw_battle_wheel = 0x802A1C54; +can_switch_to_player = 0x802A5818; +update_player_menu = 0x802A5988; +update_partner_menu = 0x802A81C8; +func_802A91F8 = 0x802A91F8; +func_802A9208 = 0x802A9208; +func_802A9228 = 0x802A9228; +func_802A9234 = 0x802A9234; +func_802A9254 = 0x802A9254; +func_802A9278 = 0x802A9278; +func_802A928C = 0x802A928C; +func_802A9294 = 0x802A9294; +func_802A9298 = 0x802A9298; +func_802A92A0 = 0x802A92A0; +func_802A92D4 = 0x802A92D4; +func_802A92DC = 0x802A92DC; +func_802A92F0 = 0x802A92F0; +func_802A9310 = 0x802A9310; +func_802A936C = 0x802A936C; +func_802A9378 = 0x802A9378; +func_802A948C = 0x802A948C; +func_802A94A4 = 0x802A94A4; +func_802A94D8 = 0x802A94D8; +func_802A9544 = 0x802A9544; +func_802A955C = 0x802A955C; +func_802A9590 = 0x802A9590; +func_802A959C = 0x802A959C; +func_802A9634 = 0x802A9634; +func_802A963C = 0x802A963C; +func_802A9664 = 0x802A9664; +func_802A96B8 = 0x802A96B8; +func_802A96DC = 0x802A96DC; +func_802A96EC = 0x802A96EC; +func_802A96F4 = 0x802A96F4; +func_802A9708 = 0x802A9708; +func_802A9718 = 0x802A9718; +func_802A9720 = 0x802A9720; +func_802A973C = 0x802A973C; +func_802A9744 = 0x802A9744; +func_802A9764 = 0x802A9764; +func_802A97AC = 0x802A97AC; +func_802A97BC = 0x802A97BC; +func_802A97CC = 0x802A97CC; +func_802A97F8 = 0x802A97F8; +func_802A97FC = 0x802A97FC; +func_802A9810 = 0x802A9810; +func_802A981C = 0x802A981C; +func_802A9834 = 0x802A9834; +func_802A984C = 0x802A984C; +func_802A9894 = 0x802A9894; +func_802A9898 = 0x802A9898; +func_802A98B0 = 0x802A98B0; +func_802A98D0 = 0x802A98D0; +func_802A98DC = 0x802A98DC; +func_802A98E0 = 0x802A98E0; +func_802A9914 = 0x802A9914; +func_802A992C = 0x802A992C; +func_802A9990 = 0x802A9990; +func_802A99D4 = 0x802A99D4; +func_802A9A30 = 0x802A9A30; +func_802A9A54 = 0x802A9A54; +func_802AA014 = 0x802AA014; +func_802AA0D8 = 0x802AA0D8; +update_targeting_enemies = 0x802AA688; +func_802AB330 = 0x802AB330; +func_802AB338 = 0x802AB338; +func_802B71D4 = 0x802B71D4; +func_802B71E8 = 0x802B71E8; +func_802BD7DC = 0x802BD7DC; +func_802BE070 = 0x802BE070; +sort_scripts = 0x802C3000; +find_script_labels = 0x802C3148; +clear_script_list = 0x802C31DC; +init_script_list = 0x802C32EC; +start_script = 0x802C33E0; +start_script_in_group = 0x802C35D0; +start_child_script = 0x802C37C8; +restart_script = 0x802C3D04; +update_scripts = 0x802C3D74; +kill_script = 0x802C3F3C; +kill_script_by_ID = 0x802C40AC; +kill_all_scripts = 0x802C4114; +does_script_exist = 0x802C4164; +does_script_exist_by_ref = 0x802C41A4; +set_script_priority = 0x802C41D8; +set_script_timescale = 0x802C41E0; +set_global_timespace = 0x802C4200; +get_global_timespace = 0x802C420C; +set_script_group = 0x802C4218; +bind_trigger = 0x802C4220; +bind_trigger_1 = 0x802C42A8; +suspend_group_script = 0x802C42D8; +resume_group_script = 0x802C437C; +suspend_all_script = 0x802C4420; +resume_all_script = 0x802C448C; +suspend_group_script_index = 0x802C44F8; +resume_group_script_index = 0x802C4570; +suspend_all_group = 0x802C45E8; +resume_all_group = 0x802C4648; +suspend_group_others = 0x802C46A8; +resume_group_others = 0x802C471C; +get_script_by_index = 0x802C4790; +get_script_by_id = 0x802C47A8; +set_script_flags = 0x802C47E8; +clear_script_flags = 0x802C4880; +fixed_var_to_float = 0x802C4920; +float_to_fixed_var = 0x802C496C; +si_handle_return = 0x802C4998; +si_handle_label = 0x802C49B8; +si_handle_goto = 0x802C49C0; +si_handle_loop = 0x802C4A00; +si_handle_end_loop = 0x802C4A48; +si_handle_break_loop = 0x802C4B0C; +si_handle_wait = 0x802C4B5C; +si_handle_wait_seconds = 0x802C4BB8; +si_handle_if_equal = 0x802C4C40; +si_handle_if_not_equal = 0x802C4CA0; +si_handle_if_less = 0x802C4D00; +si_handle_if_greater = 0x802C4D64; +si_handle_if_less_equal = 0x802C4DC8; +si_handle_if_greater_equal = 0x802C4E2C; +si_handle_if_AND = 0x802C4E90; +si_handle_if_not_AND = 0x802C4EE8; +si_handle_else = 0x802C4F40; +si_handle_end_if = 0x802C4F6C; +si_handle_switch = 0x802C4F74; +si_handle_switch_const = 0x802C4FE4; +si_handle_case_equal = 0x802C5030; +si_handle_case_not_equal = 0x802C50BC; +si_handle_case_less = 0x802C5148; +si_handle_case_less_equal = 0x802C51D8; +si_handle_case_greater = 0x802C5268; +si_handle_case_greater_equal = 0x802C52F8; +si_handle_case_range = 0x802C5388; +si_handle_case_default = 0x802C5444; +si_handle_case_AND = 0x802C549C; +si_handle_case_equal_OR = 0x802C5518; +si_handle_case_equal_AND = 0x802C55B8; +si_handle_end_case_group = 0x802C565C; +si_handle_break_case = 0x802C56D4; +si_handle_end_switch = 0x802C5718; +si_handle_set_var = 0x802C5744; +si_handle_set_const = 0x802C5790; +si_handle_set_float = 0x802C57B8; +si_handle_add = 0x802C5804; +si_handle_subtract = 0x802C5868; +si_handle_multiply = 0x802C58CC; +si_handle_divide = 0x802C5934; +si_handle_mod = 0x802C59BC; +si_handle_addF = 0x802C5A84; +si_handle_subtractF = 0x802C5AEC; +si_handle_multiplyF = 0x802C5B54; +si_handle_divideF = 0x802C5BC0; +si_handle_set_int_buffer_ptr = 0x802C5C28; +si_handle_set_float_buffer_ptr = 0x802C5C5C; +si_handle_get_1_word = 0x802C5C90; +si_handle_get_2_word = 0x802C5CC4; +si_handle_get_3_word = 0x802C5D2C; +si_handle_get_4_word = 0x802C5DB4; +si_handle_get_Nth_word = 0x802C5E5C; +si_handle_get_1_float = 0x802C5EB4; +si_handle_get_2_float = 0x802C5F0C; +si_handle_get_3_float = 0x802C5F9C; +si_handle_get_4_float = 0x802C605C; +si_handle_get_Nth_float = 0x802C614C; +si_handle_set_array = 0x802C61AC; +si_handle_set_flag_array = 0x802C61E0; +si_handle_allocate_array = 0x802C6214; +si_handle_AND = 0x802C6270; +si_handle_AND_const = 0x802C62D4; +si_handle_OR = 0x802C632C; +si_handle_OR_const = 0x802C6390; +si_handle_call = 0x802C63E8; +si_handle_exec1 = 0x802C646C; +si_handle_exec2 = 0x802C6524; +si_handle_exec_wait = 0x802C65FC; +si_handle_jump = 0x802C6640; +_bound_script_trigger_handler = 0x802C667C; +si_handle_bind = 0x802C6714; +DeleteTrigger = 0x802C6824; +si_handle_unbind = 0x802C6850; +si_handle_kill = 0x802C6870; +si_handle_set_priority = 0x802C689C; +si_handle_set_timescale = 0x802C68D8; +si_handle_set_group = 0x802C6914; +si_handle_suspend_all = 0x802C6950; +si_handle_resume_all = 0x802C697C; +si_handle_suspend_others = 0x802C69A8; +si_handle_resume_others = 0x802C69E4; +si_handle_suspend = 0x802C6A20; +si_handle_resume = 0x802C6A4C; +si_handle_does_script_exist = 0x802C6A78; +si_standard_trigger_executor = 0x802C6AD0; +si_handle_bind_lock = 0x802C6B54; +si_handle_thread = 0x802C6C78; +si_handle_end_thread = 0x802C6D4C; +si_handle_child_thread = 0x802C6D6C; +si_handle_end_child_thread = 0x802C6DF4; +si_handle_print_debug_var = 0x802C6E1C; +si_execute_next_command = 0x802C7404; +get_variable = 0x802C7ABC; +get_variable_index = 0x802C7DA8; +get_variable_index_alt = 0x802C7F20; +set_variable = 0x802C8098; +get_float_variable = 0x802C842C; +set_float_variable = 0x802C8640; +si_find_label = 0x802C8890; +si_skip_if = 0x802C88FC; +si_skip_else = 0x802C8978; +si_goto_end_case = 0x802C89E4; // ! +si_goto_next_case = 0x802C8A60; +si_goto_end_loop = 0x802C8AE4; +TranslateModel = 0x802C8B60; +RotateModel = 0x802C8C64; +ScaleModel = 0x802C8D88; +GetModelIndex = 0x802C8E8C; +CloneModel = 0x802C8F28; +GetModelCenter = 0x802C8F80; +SetTexPanner = 0x802C9000; +SetModelFlag10 = 0x802C907C; +EnableTexPanning = 0x802C9208; +EnableModel = 0x802C9288; +SetGroupEnabled = 0x802C9308; +SetTexPanOffset = 0x802C9364; +SetModelFlags = 0x802C9518; +TranslateGroup = 0x802C97B4; +RotateGroup = 0x802C98D8; +ScaleGroup = 0x802C9A1C; +EnableGroup = 0x802C9B98; +modify_collider_family_flags = 0x802C9CE8; +ModifyColliderFlags = 0x802C9DCC; +ResetFromLava = 0x802C9ED8; +GetColliderCenter = 0x802CA0AC; +ParentColliderToModel = 0x802CA114; +UpdateColliderTransform = 0x802CA188; +set_zone_enabled = 0x802CA1B8; +SetZoneEnabled = 0x802CA254; +goto_map = 0x802CA304; +GotoMap = 0x802CA400; +GotoMapSpecial = 0x802CA420; +GotoMapByID = 0x802CA440; +GetEntryID = 0x802CA460; +GetMapID = 0x802CA490; +GetLoadType = 0x802CA4C0; +SetRenderMode = 0x802CA4F4; +PlaySoundAtModel = 0x802CA558; +PlaySoundAtCollider = 0x802CA614; +SetCamEnabled = 0x802CA6C0; +SetCamFlag80 = 0x802CA774; +SetCamPerspective = 0x802CA828; +SetCamViewport = 0x802CAB18; +SetCamBGColor = 0x802CAD98; +SetCamTarget = 0x802CAF2C; +ShakeCam = 0x802CB2A8; +exec_ShakeCam1 = 0x802CB56C; +exec_ShakeCamX = 0x802CB5C8; +SetCamLeadPlayer = 0x802CB680; +PanToTarget = 0x802CB79C; +UseSettingsFrom = 0x802CB860; +LoadSettings = 0x802CB9F8; +SetCamType = 0x802CBAB4; +SetCamPitch = 0x802CBB48; +SetCamDistance = 0x802CBBE4; +SetCamPosA = 0x802CBC58; +SetCamPosB = 0x802CBCF4; +SetCamPosC = 0x802CBD90; +SetPanTarget = 0x802CBE2C; +SetCamSpeed = 0x802CBEF0; +GetCamType = 0x802CBF64; +GetCamPitch = 0x802CBFF4; +GetCamDistance = 0x802CC084; +GetCamPosA = 0x802CC0F4; +GetCamPosB = 0x802CC184; +GetCamPosC = 0x802CC214; +GetCamPosition = 0x802CC2A4; +WaitForCam = 0x802CC354; +SetCamProperties = 0x802CC3EC; +AdjustCam = 0x802CC660; +ResetCam = 0x802CC8C8; +draw_anim_models = 0x802CCB18; +LoadModelAnimation = 0x802CCCEC; +PlayModelAnimation = 0x802CCE6C; +ChangeModelAnimation = 0x802CCF6C; +SetAnimModelPosition = 0x802CCFE4; +GetAnimModelPosition = 0x802CD090; +AddAnimModelPosition = 0x802CD12C; +SetAnimModelRotation = 0x802CD1F0; +SetAnimModelScale = 0x802CD29C; +resolve_npc = 0x802CDAC0; +set_npc_animation = 0x802CDB0C; +CreateNpc = 0x802CDBA4; +DeleteNpc = 0x802CDC1C; +GetNpcPointer = 0x802CDC58; +SetNpcPos = 0x802CDCB0; +SetNpcRotation = 0x802CDDB0; +SetNpcScale = 0x802CDED4; +SetNpcCollisionSize = 0x802CDF8C; +SetNpcSpeed = 0x802CE01C; +SetNpcJumpscale = 0x802CE088; +SetNpcAnimation = 0x802CE0F4; +GetNpcAnimation = 0x802CE160; +SetNpcAnimationSpeed = 0x802CE1C0; +NpcMoveTo = 0x802CE22C; +_npc_jump_to = 0x802CE434; +NpcJump0 = 0x802CE6C4; +NpcJump1 = 0x802CE6E0; +NpcFlyTo = 0x802CE6FC; +GetNpcYaw = 0x802CEA10; +SetNpcYaw = 0x802CEA84; +InterpNpcYaw = 0x802CEB04; +NpcFacePlayer = 0x802CECC8; +NpcFaceNpc = 0x802CEE80; +SetNpcFlagBits = 0x802CF060; +GetNpcPos = 0x802CF0F4; +EnableNpcShadow = 0x802CF268; +EnableNpcBlur = 0x802CF2EC; +ClearPartnerMoveHistory = 0x802CF370; +NpcSetHomePosToCurrent = 0x802CF3BC; +GetPartnerPos = 0x802CF438; +DisablePartnerAI = 0x802CF4E8; +EnablePartnerAI = 0x802CF52C; +BringPartnerOut = 0x802CF5B8; +PutPartnerAway = 0x802CF988; +GetCurrentPartnerID = 0x802CFC74; +PartnerCanUseAbility = 0x802CFCA0; +PartnerIsFlying = 0x802CFCE8; +SetNpcEffect = 0x802D0118; +PlaySoundAtNpc = 0x802D01AC; +SpeakToPlayer = 0x802D02B0; +EndSpeech = 0x802D02CC; +ContinueSpeech = 0x802D02E8; +SpeakToNpc = 0x802D0304; +_show_message = 0x802D0320; +ShowMessageAtScreenPos = 0x802D0894; +ShowMessageAtWorldPos = 0x802D095C; +CloseMessage = 0x802D0A98; +SwitchMessage = 0x802D0AFC; +ShowChoice = 0x802D0B6C; +CloseChoice = 0x802D0BF8; +CancelMessage = 0x802D0C20; +CancelMessageAndBlock = 0x802D0C48; +SetMessageImages = 0x802D0C70; +SetMessageString = 0x802D0CEC; +SetMessageValue = 0x802D0D44; +HidePlayerShadow = 0x802D0DA0; +DisablePlayerPhysics = 0x802D0DE4; +DisablePlayerInput = 0x802D0E28; +SetPlayerPos = 0x802D0EF0; +SetPlayerCollisionSize = 0x802D0FB0; +SetPlayerSpeed = 0x802D1024; +SetPlayerJumpscale = 0x802D1054; +SetPlayerAnimation = 0x802D1084; +SetPlayerActionState = 0x802D10D8; +SetPlayerAnimationSpeed = 0x802D1104; +PlayerMoveTo = 0x802D1134; +player_jump = 0x802D14E0; +PlayerJump = 0x802D18E8; +PlayerJump1 = 0x802D1904; +PlayerJump2 = 0x802D1920; +InterpPlayerYaw = 0x802D193C; +PlayerFaceNpc = 0x802D1B04; +GetPlayerTargetYaw = 0x802D1D28; +SetPlayerFlagBits = 0x802D1D60; +GetPlayerActionState = 0x802D1DD0; +GetPlayerPos = 0x802D1DFC; +GetPlayerAnimation = 0x802D1E94; +FullyRestoreHPandFP = 0x802D1EC0; +FullyRestoreSP = 0x802D1EE0; +EnablePartner = 0x802D1EFC; +DisablePartner = 0x802D1F38; +UseEntryHeading = 0x802D1F70; +UseExitHeading = 0x802D216C; +DisablePulseStone = 0x802D2AA8; +GetCurrentPartner = 0x802D2B0C; +Disable8bitMario = 0x802D2B88; +PlaySoundAtPlayer = 0x802D2CD8; +MakeLerp = 0x802D45B0; +UpdateLerp = 0x802D462C; +RandInt = 0x802D46B0; +GetAngleBetweenNPCs = 0x802D4708; +GetAngleToNPC = 0x802D47B4; +GetAngleToPlayer = 0x802D4830; +AwaitPlayerApproach = 0x802D48AC; +IsPlayerWithin = 0x802D4964; +AwaitPlayerLeave = 0x802D4A5C; +AddVectorPolar = 0x802D4B14; +setup_path_data = 0x802D4DAC; +LoadPath = 0x802D5430; +GetNextPathPos = 0x802D5524; +GetDist2D = 0x802D5770; +SetValueByRef = 0x802D58E0; +GetValueByRef = 0x802D593C; +EnableStatusMenu = 0x802D5998; +ShowStatusMenu = 0x802D59DC; +SetGameMode = 0x802D5A28; +ClampAngleInt = 0x802D5A58; +ClampAngleFloat = 0x802D5AB4; +FadeOutMusic = 0x802D5CE0; +SetMusicTrack = 0x802D5D4C; +FadeInMusic = 0x802D5DF4; +ClearAmbientSounds = 0x802D60E8; +PlayAmbientSounds = 0x802D611C; +PlaySound = 0x802D6150; +PlaySoundAt = 0x802D61DC; +StopSound = 0x802D62B8; +UseDoorSounds = 0x802D6314; +PlaySoundAtF = 0x802D636C; +RemoveKeyItemAt = 0x802D6858; +RemoveItemAt = 0x802D688C; +AddKeyItem = 0x802D68C8; +HasKeyItem = 0x802D699C; +FindKeyItem = 0x802D6A14; +AddItem = 0x802D6A98; +FindItem = 0x802D6B18; +RemoveItem = 0x802D6B9C; +CountFortressKeys = 0x802D6C4C; +RemoveFortressKeys = 0x802D6C94; +MakeItemEntity = 0x802D6CC0; +DropItemEntity = 0x802D6DC0; +DropItemEntityB = 0x802D6EC0; +RemoveItemEntity = 0x802D6FCC; +AddBadge = 0x802D6FF8; +RemoveBadge = 0x802D7050; +SetItemPos = 0x802D70D0; +SetItemFlags = 0x802D7194; +AddCoin = 0x802D7278; +AddStarPoints = 0x802D72B4; +AddStarPieces = 0x802D72F0; +GetItemPower = 0x802D732C; +ShowGotItem = 0x802D73A4; +ShowEmote = 0x802D78A0; +RemoveEffect = 0x802D7AE4; +ShowSleepBubble = 0x802D8028; +PlayEffect = 0x802D829C; +SetSpriteShading = 0x802D9700; +EnableSpriteShading = 0x802D9A3C; +GetDemoState = 0x802D9A90; +DemoPressButton = 0x802D9AC0; +DemoReleaseButton = 0x802D9AF8; +DemoSetButtons = 0x802D9B34; +DemoJoystickRadial = 0x802D9B64; +DemoJoystickXY = 0x802D9C10; +gStaticScriptCounter = 0x802D9CA0; +D_802D9CA4 = 0x802D9CA4; +gGlobalTimeSpace = 0x802D9CA8; +ShakeCam1 = 0x802D9CB0; +ShakeCamX = 0x802D9CE8; +D_802D9D50 = 0x802D9D50; +spr_appendMDL_component = 0x802DC8F4; +spr_transform_point = 0x802DCD00; +spr_draw_component = 0x802DCEDC; +_spr_sign_extend_12bit = 0x802DD0DC; +_spr_sign_extend_16bit = 0x802DD0FC; +update_component = 0x802DD11C; +set_anim_timescale = 0x802DD88C; +render_sprite = 0x802DDC40; +load_sprite = 0x802DEB0C; +create_shadow_callback = 0x802E0D90; +save_game_at_player_position = 0x802E11A0; +entity_init_BlueSwitch = 0x802E2380; +entity_init_HugeBlueSwitch = 0x802E2408; +entity_init_Hammer23Block_normal = 0x802E36E4; +entity_init_Hammer1Block_normal = 0x802E3E00; +entity_init_HammerBlock_small = 0x802E3E30; +entity_init_Chest = 0x802E7D84; +player_enter_blue_pipe = 0x802E8CCC; +push_entity_matrix = 0x802E8E4C; From 5d160b9f080b6d45e6b8530bc65f69d8913589fe Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 18:28:44 -0500 Subject: [PATCH 34/45] gPlayerData offsets --- .../code_102610_len_2330/func_802E1660.s | 4 +- .../code_104940_len_dc0/func_802E3BA4.s | 12 +-- .../code_105700_len_2130/func_802E54CC.s | 4 +- .../code_1086a0_len_fc0/func_802E7AE4.s | 8 +- .../code_135EE0/pause_badges_draw_contents.s | 20 ++--- .../code_135EE0/pause_badges_try_remove.s | 4 +- .../code_135EE0/pause_stats_draw_contents.s | 44 +++++----- asm/nonmatchings/code_182B30/func_80255FE0.s | 4 +- asm/nonmatchings/code_190B20/func_80263464.s | 4 +- .../code_1A5830/calc_enemy_damage_target.s | 8 +- .../code_1a1f0_len_5390/func_8003F7CC.s | 12 +-- .../code_20ec0_len_5040/spawn_drops.s | 16 ++-- .../code_7E3700/TeleportPartnerToPlayer.s | 4 +- asm/nonmatchings/code_7E3700/func_80283908.s | 4 +- .../code_80850_len_3060/update_status_menu.s | 84 +++++++++---------- .../code_838b0_len_5900/partner_reset_data.s | 4 +- .../code_838b0_len_5900/use_consumable.s | 4 +- .../dgb_04/C36530/func_802424F0_C38A20.s | 4 +- .../dgb_04/C36530/func_80242818_C38D48.s | 4 +- .../flo_08/CAED40/func_80240120_CAEE60.s | 4 +- .../flo_08/CAED40/func_80240448_CAF188.s | 4 +- .../flo_14/CCB310/func_802403D4_CCB6E4.s | 4 +- .../flo_16/CD1F10/func_80240200_CD2030.s | 4 +- .../flo_16/CD1F10/func_80240528_CD2358.s | 4 +- .../hos_00/A0C4B0/func_802407C0_A0C4B0.s | 4 +- .../hos_00/A0C4E0/func_80240908_A0C5F8.s | 4 +- .../hos_06/A397F0/func_80240A68_A39F48.s | 4 +- .../hos_06/A3A230/func_802417EC_A3ACCC.s | 4 +- .../hos_10/A3FEB0/func_80240BEC_A4032C.s | 4 +- .../isk_10/988B60/func_80240120_988C80.s | 4 +- .../isk_10/988B60/func_80240448_988FA8.s | 4 +- .../iwa_10/91E6D0/func_80240410_91E980.s | 4 +- .../iwa_10/91E6D0/func_80240738_91ECA8.s | 4 +- .../jan_08/B5E910/func_80240780_B5EA30.s | 4 +- .../jan_08/B5E910/func_80240AA8_B5ED58.s | 4 +- .../kkj_14/ADAEF0/func_8024035C_ADB1FC.s | 4 +- .../kkj_15/AE5590/func_8024030C_AE589C.s | 4 +- .../kkj_16/AED410/func_80240000_AED410.s | 4 +- .../kkj_18/AF2CA0/func_8024030C_AF2FAC.s | 4 +- .../kkj_23/B028A0/func_80240020_B028A0.s | 4 +- .../kkj_26/B13120/func_80240000_B13120.s | 4 +- .../kkj_29/B150B0/func_80240000_B150B0.s | 4 +- .../kmr_02/8B0070/func_80242788_8B27F8.s | 4 +- .../kmr_04/8CA960/func_80240434_8CAD34.s | 4 +- .../kmr_20/8EBE50/func_802406C8_8EC4E8.s | 4 +- .../kpa_12/A54CA0/func_8024037C_A54CCC.s | 4 +- .../kpa_13/A56270/func_8024037C_A5629C.s | 4 +- .../kpa_14/A57830/func_8024073C_A57BEC.s | 4 +- .../kpa_96/A927C0/func_80240000_A927C0.s | 4 +- .../kzn_02/C5AA50/func_802403DC_C5AB1C.s | 4 +- .../kzn_04/C68440/func_80240430_C68560.s | 4 +- .../kzn_04/C68440/func_80240758_C68888.s | 4 +- .../kzn_09/C76CE0/func_80240120_C76E00.s | 4 +- .../kzn_09/C76CE0/func_80240448_C77128.s | 4 +- .../kzn_11/C804B0/func_80240310_C804B0.s | 4 +- .../mac_00/7EB340/func_80242224_7ECF34.s | 4 +- .../mgm_01/E12930/func_802416CC_E13E2C.s | 4 +- .../mgm_02/E15D80/func_80242314_E18094.s | 4 +- .../nok_11/9F4A40/func_80241F08_9F6948.s | 4 +- .../omo_11/DDCFC0/func_802408B0_DDD0E0.s | 4 +- .../omo_11/DDCFC0/func_80240BD8_DDD408.s | 4 +- .../sam_08/D2FC80/func_80240120_D2FDA0.s | 4 +- .../sam_08/D2FC80/func_80240448_D300C8.s | 4 +- .../sbk_56/953FC0/func_802401A0_954160.s | 4 +- .../sbk_56/953FC0/func_802404C8_954488.s | 4 +- .../tik_07/879BE0/func_80240400_879FE0.s | 4 +- .../tik_07/879BE0/func_80240728_87A308.s | 4 +- .../tik_10/8866D0/func_802407A0_886B60.s | 4 +- .../tik_10/8866D0/func_80240AC8_886E88.s | 4 +- .../tik_12/8891C0/func_80240D3C_88990C.s | 4 +- .../tik_12/8891C0/func_80241064_889C34.s | 4 +- .../tik_15/890190/func_80240AD0_890670.s | 4 +- .../tik_17/892A50/func_80240150_892B70.s | 4 +- .../tik_17/892A50/func_80240478_892E98.s | 4 +- .../tik_19/897BD0/func_80240710_897CF0.s | 4 +- .../tik_19/897BD0/func_80240A38_898018.s | 4 +- .../trd_10/9C3130/func_80240820_9C3130.s | 4 +- requirements.txt | 1 + tools/symbol_addrs.txt | 1 + 79 files changed, 242 insertions(+), 240 deletions(-) diff --git a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s index 194061e592..080da0f3c1 100644 --- a/asm/nonmatchings/code_102610_len_2330/func_802E1660.s +++ b/asm/nonmatchings/code_102610_len_2330/func_802E1660.s @@ -22,8 +22,8 @@ glabel func_802E1660 /* 102F24 802E16A4 822300B4 */ lb $v1, 0xb4($s1) /* 102F28 802E16A8 14620009 */ bne $v1, $v0, .L802E16D0 /* 102F2C 802E16AC 2402000D */ addiu $v0, $zero, 0xd -/* 102F30 802E16B0 3C028011 */ lui $v0, 0x8011 -/* 102F34 802E16B4 8042F291 */ lb $v0, -0xd6f($v0) +/* 102F30 802E16B0 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 102F34 802E16B4 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 102F38 802E16B8 0440001A */ bltz $v0, .L802E1724 /* 102F3C 802E16BC 00000000 */ nop /* 102F40 802E16C0 080B85C2 */ j .L802E1708 diff --git a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s index a58bef3f9d..ac142e5bf1 100644 --- a/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s +++ b/asm/nonmatchings/code_104940_len_dc0/func_802E3BA4.s @@ -97,8 +97,8 @@ glabel func_802E3BA4 /* 105570 802E3CF0 080B8F42 */ j .L802E3D08 /* 105574 802E3CF4 00000000 */ nop .L802E3CF8: -/* 105578 802E3CF8 3C028011 */ lui $v0, 0x8011 -/* 10557C 802E3CFC 8042F291 */ lb $v0, -0xd6f($v0) +/* 105578 802E3CF8 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 10557C 802E3CFC 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 105580 802E3D00 04430001 */ bgezl $v0, .L802E3D08 /* 105584 802E3D04 24100001 */ addiu $s0, $zero, 1 .L802E3D08: @@ -121,8 +121,8 @@ glabel func_802E3BA4 /* 1055C8 802E3D48 080B8F58 */ j .L802E3D60 /* 1055CC 802E3D4C 00000000 */ nop .L802E3D50: -/* 1055D0 802E3D50 3C028011 */ lui $v0, 0x8011 -/* 1055D4 802E3D54 8042F291 */ lb $v0, -0xd6f($v0) +/* 1055D0 802E3D50 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 1055D4 802E3D54 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 1055D8 802E3D58 5C400001 */ bgtzl $v0, .L802E3D60 /* 1055DC 802E3D5C 24100001 */ addiu $s0, $zero, 1 .L802E3D60: @@ -135,8 +135,8 @@ glabel func_802E3BA4 /* 1055F8 802E3D78 C6200050 */ lwc1 $f0, 0x50($s1) /* 1055FC 802E3D7C 080B8F6C */ j .L802E3DB0 /* 105600 802E3D80 24040150 */ addiu $a0, $zero, 0x150 -/* 105604 802E3D84 3C028011 */ lui $v0, 0x8011 -/* 105608 802E3D88 8042F291 */ lb $v0, -0xd6f($v0) +/* 105604 802E3D84 3C028011 */ lui $v0, %hi(gPlayerData+0x1) +/* 105608 802E3D88 8042F291 */ lb $v0, %lo(gPlayerData+0x1)($v0) /* 10560C 802E3D8C 28420002 */ slti $v0, $v0, 2 /* 105610 802E3D90 14400015 */ bnez $v0, .L802E3DE8 /* 105614 802E3D94 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s index 77c53f1b52..cc83ebeea2 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E54CC.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E54CC -/* 106D4C 802E54CC 3C028011 */ lui $v0, 0x8011 -/* 106D50 802E54D0 9042F2AC */ lbu $v0, -0xd54($v0) +/* 106D4C 802E54CC 3C028011 */ lui $v0, %hi(gPlayerData+0x1C) +/* 106D50 802E54D0 9042F2AC */ lbu $v0, %lo(gPlayerData+0x1C)($v0) /* 106D54 802E54D4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 106D58 802E54D8 AFB00010 */ sw $s0, 0x10($sp) /* 106D5C 802E54DC 0080802D */ daddu $s0, $a0, $zero diff --git a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s index a3dc79dc42..b84b2c3964 100644 --- a/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s +++ b/asm/nonmatchings/code_1086a0_len_fc0/func_802E7AE4.s @@ -34,16 +34,16 @@ glabel func_802E7AE4 /* 1093D8 802E7B58 A022F290 */ sb $v0, %lo(gPlayerData)($at) /* 1093DC 802E7B5C 080B9EE2 */ j .L802E7B88 /* 1093E0 802E7B60 00000000 */ nop -/* 1093E4 802E7B64 3C018011 */ lui $at, 0x8011 -/* 1093E8 802E7B68 A020F291 */ sb $zero, -0xd6f($at) +/* 1093E4 802E7B64 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 1093E8 802E7B68 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 1093EC 802E7B6C 080B9EE2 */ j .L802E7B88 /* 1093F0 802E7B70 00000000 */ nop /* 1093F4 802E7B74 080B9EE0 */ j .L802E7B80 /* 1093F8 802E7B78 24020001 */ addiu $v0, $zero, 1 /* 1093FC 802E7B7C 24020002 */ addiu $v0, $zero, 2 .L802E7B80: -/* 109400 802E7B80 3C018011 */ lui $at, 0x8011 -/* 109404 802E7B84 A022F291 */ sb $v0, -0xd6f($at) +/* 109400 802E7B80 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 109404 802E7B84 A022F291 */ sb $v0, %lo(gPlayerData+0x1)($at) .L802E7B88: /* 109408 802E7B88 8E020010 */ lw $v0, 0x10($s0) /* 10940C 802E7B8C 10400027 */ beqz $v0, .L802E7C2C diff --git a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s index 5f0ccdd553..16a96ab4e8 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_draw_contents.s @@ -60,8 +60,8 @@ glabel pause_badges_draw_contents /* 13A91C 802475DC 00005810 */ mfhi $t3 /* 13A920 802475E0 24040004 */ addiu $a0, $zero, 4 /* 13A924 802475E4 8FA700C8 */ lw $a3, 0xc8($sp) -/* 13A928 802475E8 3C088011 */ lui $t0, 0x8011 -/* 13A92C 802475EC 8108F298 */ lb $t0, -0xd68($t0) +/* 13A928 802475E8 3C088011 */ lui $t0, %hi(gPlayerData+0x8) +/* 13A92C 802475EC 8108F298 */ lb $t0, %lo(gPlayerData+0x8)($t0) /* 13A930 802475F0 3C058027 */ lui $a1, 0x8027 /* 13A934 802475F4 24A5FC48 */ addiu $a1, $a1, -0x3b8 /* 13A938 802475F8 AFA00010 */ sw $zero, 0x10($sp) @@ -211,8 +211,8 @@ glabel pause_badges_draw_contents /* 13AB60 80247820 AFAA0094 */ sw $t2, 0x94($sp) .L80247824: /* 13AB64 80247824 8FAB0078 */ lw $t3, 0x78($sp) -/* 13AB68 80247828 3C128011 */ lui $s2, 0x8011 -/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, -0xb68 +/* 13AB68 80247828 3C128011 */ lui $s2, %hi(gPlayerData+0x208) +/* 13AB6C 8024782C 2652F498 */ addiu $s2, $s2, %lo(gPlayerData+0x208) /* 13AB70 80247830 AFA00084 */ sw $zero, 0x84($sp) /* 13AB74 80247834 8D620004 */ lw $v0, 4($t3) /* 13AB78 80247838 24037FFF */ addiu $v1, $zero, 0x7fff @@ -1012,8 +1012,8 @@ glabel pause_badges_draw_contents /* 13B734 802483F4 24070001 */ addiu $a3, $zero, 1 /* 13B738 802483F8 241500FF */ addiu $s5, $zero, 0xff /* 13B73C 802483FC 8FAB00C4 */ lw $t3, 0xc4($sp) -/* 13B740 80248400 3C048011 */ lui $a0, 0x8011 -/* 13B744 80248404 8084F298 */ lb $a0, -0xd68($a0) +/* 13B740 80248400 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B744 80248404 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B748 80248408 24140003 */ addiu $s4, $zero, 3 /* 13B74C 8024840C AFB30010 */ sw $s3, 0x10($sp) /* 13B750 80248410 AFB50014 */ sw $s5, 0x14($sp) @@ -1023,8 +1023,8 @@ glabel pause_badges_draw_contents /* 13B760 80248420 0C0911FD */ jal pause_get_total_equipped_bp_cost /* 13B764 80248424 0000902D */ daddu $s2, $zero, $zero /* 13B768 80248428 3C056666 */ lui $a1, 0x6666 -/* 13B76C 8024842C 3C048011 */ lui $a0, 0x8011 -/* 13B770 80248430 8084F298 */ lb $a0, -0xd68($a0) +/* 13B76C 8024842C 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 13B770 80248430 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 13B774 80248434 34A56667 */ ori $a1, $a1, 0x6667 /* 13B778 80248438 2483FFFF */ addiu $v1, $a0, -1 /* 13B77C 8024843C 00650018 */ mult $v1, $a1 @@ -1068,8 +1068,8 @@ glabel pause_badges_draw_contents /* 13B810 802484D0 0060202D */ daddu $a0, $v1, $zero /* 13B814 802484D4 24630008 */ addiu $v1, $v1, 8 /* 13B818 802484D8 ACC30000 */ sw $v1, ($a2) -/* 13B81C 802484DC 3C108011 */ lui $s0, 0x8011 -/* 13B820 802484E0 8210F298 */ lb $s0, -0xd68($s0) +/* 13B81C 802484DC 3C108011 */ lui $s0, %hi(gPlayerData+0x8) +/* 13B820 802484E0 8210F298 */ lb $s0, %lo(gPlayerData+0x8)($s0) /* 13B824 802484E4 241E0064 */ addiu $fp, $zero, 0x64 /* 13B828 802484E8 AC820000 */ sw $v0, ($a0) /* 13B82C 802484EC 3C028027 */ lui $v0, 0x8027 diff --git a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s index e4973f8e35..d1916c5b06 100644 --- a/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s +++ b/asm/nonmatchings/code_135EE0/pause_badges_try_remove.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel pause_badges_try_remove -/* 13A5F0 802472B0 3C068011 */ lui $a2, 0x8011 -/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, -0xb68 +/* 13A5F0 802472B0 3C068011 */ lui $a2, %hi(gPlayerData+0x208) +/* 13A5F4 802472B4 24C6F498 */ addiu $a2, $a2, %lo(gPlayerData+0x208) /* 13A5F8 802472B8 00C0182D */ daddu $v1, $a2, $zero /* 13A5FC 802472BC 00042400 */ sll $a0, $a0, 0x10 /* 13A600 802472C0 00042403 */ sra $a0, $a0, 0x10 diff --git a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s index e7d909e93b..27f6124019 100644 --- a/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s +++ b/asm/nonmatchings/code_135EE0/pause_stats_draw_contents.s @@ -44,8 +44,8 @@ glabel pause_stats_draw_contents /* 138D5C 80245A1C 0200302D */ daddu $a2, $s0, $zero /* 138D60 80245A20 24070001 */ addiu $a3, $zero, 1 /* 138D64 80245A24 8FA80084 */ lw $t0, 0x84($sp) -/* 138D68 80245A28 3C048011 */ lui $a0, 0x8011 -/* 138D6C 80245A2C 8484F29C */ lh $a0, -0xd64($a0) +/* 138D68 80245A28 3C048011 */ lui $a0, %hi(gPlayerData+0xC) +/* 138D6C 80245A2C 8484F29C */ lh $a0, %lo(gPlayerData+0xC)($a0) /* 138D70 80245A30 24120003 */ addiu $s2, $zero, 3 /* 138D74 80245A34 AFB20018 */ sw $s2, 0x18($sp) /* 138D78 80245A38 25140119 */ addiu $s4, $t0, 0x119 @@ -85,8 +85,8 @@ glabel pause_stats_draw_contents /* 138E00 80245AC0 0280282D */ daddu $a1, $s4, $zero /* 138E04 80245AC4 0200302D */ daddu $a2, $s0, $zero /* 138E08 80245AC8 24070001 */ addiu $a3, $zero, 1 -/* 138E0C 80245ACC 3C048011 */ lui $a0, 0x8011 -/* 138E10 80245AD0 8084F2A0 */ lb $a0, -0xd60($a0) +/* 138E0C 80245ACC 3C048011 */ lui $a0, %hi(gPlayerData+0x10) +/* 138E10 80245AD0 8084F2A0 */ lb $a0, %lo(gPlayerData+0x10)($a0) /* 138E14 80245AD4 2408000A */ addiu $t0, $zero, 0xa /* 138E18 80245AD8 AFA80010 */ sw $t0, 0x10($sp) /* 138E1C 80245ADC 240800FF */ addiu $t0, $zero, 0xff @@ -121,8 +121,8 @@ glabel pause_stats_draw_contents /* 138E90 80245B50 0280282D */ daddu $a1, $s4, $zero /* 138E94 80245B54 0200302D */ daddu $a2, $s0, $zero /* 138E98 80245B58 24070001 */ addiu $a3, $zero, 1 -/* 138E9C 80245B5C 3C048011 */ lui $a0, 0x8011 -/* 138EA0 80245B60 9084F29F */ lbu $a0, -0xd61($a0) +/* 138E9C 80245B5C 3C048011 */ lui $a0, %hi(gPlayerData+0xF) +/* 138EA0 80245B60 9084F29F */ lbu $a0, %lo(gPlayerData+0xF)($a0) /* 138EA4 80245B64 2408000A */ addiu $t0, $zero, 0xa /* 138EA8 80245B68 AFA80010 */ sw $t0, 0x10($sp) /* 138EAC 80245B6C 240800FF */ addiu $t0, $zero, 0xff @@ -165,8 +165,8 @@ glabel pause_stats_draw_contents /* 138F40 80245C00 AFA80014 */ sw $t0, 0x14($sp) /* 138F44 80245C04 0200302D */ daddu $a2, $s0, $zero /* 138F48 80245C08 8FA80084 */ lw $t0, 0x84($sp) -/* 138F4C 80245C0C 3C048011 */ lui $a0, 0x8011 -/* 138F50 80245C10 8084F292 */ lb $a0, -0xd6e($a0) +/* 138F4C 80245C0C 3C048011 */ lui $a0, %hi(gPlayerData+0x2) +/* 138F50 80245C10 8084F292 */ lb $a0, %lo(gPlayerData+0x2)($a0) /* 138F54 80245C14 24070001 */ addiu $a3, $zero, 1 /* 138F58 80245C18 AFA00010 */ sw $zero, 0x10($sp) /* 138F5C 80245C1C AFB20018 */ sw $s2, 0x18($sp) @@ -187,8 +187,8 @@ glabel pause_stats_draw_contents /* 138F98 80245C58 AFA80014 */ sw $t0, 0x14($sp) /* 138F9C 80245C5C 0200302D */ daddu $a2, $s0, $zero /* 138FA0 80245C60 8FA80084 */ lw $t0, 0x84($sp) -/* 138FA4 80245C64 3C048011 */ lui $a0, 0x8011 -/* 138FA8 80245C68 8084F293 */ lb $a0, -0xd6d($a0) +/* 138FA4 80245C64 3C048011 */ lui $a0, %hi(gPlayerData+0x3) +/* 138FA8 80245C68 8084F293 */ lb $a0, %lo(gPlayerData+0x3)($a0) /* 138FAC 80245C6C 24070001 */ addiu $a3, $zero, 1 /* 138FB0 80245C70 AFA00010 */ sw $zero, 0x10($sp) /* 138FB4 80245C74 AFB20018 */ sw $s2, 0x18($sp) @@ -221,8 +221,8 @@ glabel pause_stats_draw_contents /* 139020 80245CE0 0260282D */ daddu $a1, $s3, $zero /* 139024 80245CE4 0200302D */ daddu $a2, $s0, $zero /* 139028 80245CE8 24070001 */ addiu $a3, $zero, 1 -/* 13902C 80245CEC 3C048011 */ lui $a0, 0x8011 -/* 139030 80245CF0 8084F295 */ lb $a0, -0xd6b($a0) +/* 13902C 80245CEC 3C048011 */ lui $a0, %hi(gPlayerData+0x5) +/* 139030 80245CF0 8084F295 */ lb $a0, %lo(gPlayerData+0x5)($a0) /* 139034 80245CF4 240800FF */ addiu $t0, $zero, 0xff /* 139038 80245CF8 AFA00010 */ sw $zero, 0x10($sp) /* 13903C 80245CFC AFA80014 */ sw $t0, 0x14($sp) @@ -241,8 +241,8 @@ glabel pause_stats_draw_contents /* 139070 80245D30 02E0282D */ daddu $a1, $s7, $zero /* 139074 80245D34 0200302D */ daddu $a2, $s0, $zero /* 139078 80245D38 24070001 */ addiu $a3, $zero, 1 -/* 13907C 80245D3C 3C048011 */ lui $a0, 0x8011 -/* 139080 80245D40 8084F296 */ lb $a0, -0xd6a($a0) +/* 13907C 80245D3C 3C048011 */ lui $a0, %hi(gPlayerData+0x6) +/* 139080 80245D40 8084F296 */ lb $a0, %lo(gPlayerData+0x6)($a0) /* 139084 80245D44 240800FF */ addiu $t0, $zero, 0xff /* 139088 80245D48 AFA00010 */ sw $zero, 0x10($sp) /* 13908C 80245D4C AFA80014 */ sw $t0, 0x14($sp) @@ -272,8 +272,8 @@ glabel pause_stats_draw_contents /* 1390EC 80245DAC 0260282D */ daddu $a1, $s3, $zero /* 1390F0 80245DB0 0200302D */ daddu $a2, $s0, $zero /* 1390F4 80245DB4 24070001 */ addiu $a3, $zero, 1 -/* 1390F8 80245DB8 3C048011 */ lui $a0, 0x8011 -/* 1390FC 80245DBC 8084F298 */ lb $a0, -0xd68($a0) +/* 1390F8 80245DB8 3C048011 */ lui $a0, %hi(gPlayerData+0x8) +/* 1390FC 80245DBC 8084F298 */ lb $a0, %lo(gPlayerData+0x8)($a0) /* 139100 80245DC0 240800FF */ addiu $t0, $zero, 0xff /* 139104 80245DC4 AFA00010 */ sw $zero, 0x10($sp) /* 139108 80245DC8 AFA80014 */ sw $t0, 0x14($sp) @@ -298,8 +298,8 @@ glabel pause_stats_draw_contents /* 139154 80245E14 0C04993B */ jal draw_string /* 139158 80245E18 AFA80014 */ sw $t0, 0x14($sp) /* 13915C 80245E1C 3C020149 */ lui $v0, 0x149 -/* 139160 80245E20 3C148011 */ lui $s4, 0x8011 -/* 139164 80245E24 8E94F54C */ lw $s4, -0xab4($s4) +/* 139160 80245E20 3C148011 */ lui $s4, %hi(gPlayerData+0x2BC) +/* 139164 80245E24 8E94F54C */ lw $s4, %lo(gPlayerData+0x2BC)($s4) /* 139168 80245E28 344296FF */ ori $v0, $v0, 0x96ff /* 13916C 80245E2C 0054102A */ slt $v0, $v0, $s4 /* 139170 80245E30 10400003 */ beqz $v0, .L80245E40 @@ -423,8 +423,8 @@ glabel pause_stats_draw_contents /* 139344 80246004 00442023 */ subu $a0, $v0, $a0 /* 139348 80246008 3C028011 */ lui $v0, %hi(gPlayerData) /* 13934C 8024600C 9042F290 */ lbu $v0, %lo(gPlayerData)($v0) -/* 139350 80246010 3C038011 */ lui $v1, 0x8011 -/* 139354 80246014 9063F291 */ lbu $v1, -0xd6f($v1) +/* 139350 80246010 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 139354 80246014 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 139358 80246018 8FA80084 */ lw $t0, 0x84($sp) /* 13935C 8024601C 27C7000C */ addiu $a3, $fp, 0xc /* 139360 80246020 AFA00010 */ sw $zero, 0x10($sp) @@ -432,8 +432,8 @@ glabel pause_stats_draw_contents /* 139368 80246028 00029603 */ sra $s2, $v0, 0x18 /* 13936C 8024602C 00031E00 */ sll $v1, $v1, 0x18 /* 139370 80246030 00039E03 */ sra $s3, $v1, 0x18 -/* 139374 80246034 3C028011 */ lui $v0, 0x8011 -/* 139378 80246038 9042F299 */ lbu $v0, -0xd67($v0) +/* 139374 80246034 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 139378 80246038 9042F299 */ lbu $v0, %lo(gPlayerData+0x9)($v0) /* 13937C 8024603C 00021600 */ sll $v0, $v0, 0x18 /* 139380 80246040 0002A603 */ sra $s4, $v0, 0x18 /* 139384 80246044 0280102D */ daddu $v0, $s4, $zero diff --git a/asm/nonmatchings/code_182B30/func_80255FE0.s b/asm/nonmatchings/code_182B30/func_80255FE0.s index 8a6421b9ed..58297a1373 100644 --- a/asm/nonmatchings/code_182B30/func_80255FE0.s +++ b/asm/nonmatchings/code_182B30/func_80255FE0.s @@ -658,8 +658,8 @@ glabel func_80255FE0 .L802569B0: /* 185290 802569B0 1100000B */ beqz $t0, .L802569E0 /* 185294 802569B4 24020006 */ addiu $v0, $zero, 6 -/* 185298 802569B8 3C038011 */ lui $v1, 0x8011 -/* 18529C 802569BC 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 185298 802569B8 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 18529C 802569BC 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 1852A0 802569C0 14620007 */ bne $v1, $v0, .L802569E0 /* 1852A4 802569C4 00000000 */ nop /* 1852A8 802569C8 16000005 */ bnez $s0, .L802569E0 diff --git a/asm/nonmatchings/code_190B20/func_80263464.s b/asm/nonmatchings/code_190B20/func_80263464.s index 574798d6fd..521e4d14c4 100644 --- a/asm/nonmatchings/code_190B20/func_80263464.s +++ b/asm/nonmatchings/code_190B20/func_80263464.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80263464 -/* 191D44 80263464 3C028011 */ lui $v0, 0x8011 -/* 191D48 80263468 8042F292 */ lb $v0, -0xd6e($v0) +/* 191D44 80263464 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 191D48 80263468 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) /* 191D4C 8026346C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 191D50 80263470 1C40000D */ bgtz $v0, .L802634A8 /* 191D54 80263474 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s index f6181bec33..48e88bc850 100644 --- a/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s +++ b/asm/nonmatchings/code_1A5830/calc_enemy_damage_target.s @@ -56,8 +56,8 @@ glabel calc_enemy_damage_target /* 1A5DCC 802774EC 00000000 */ nop /* 1A5DD0 802774F0 16C00007 */ bnez $s6, .L80277510 /* 1A5DD4 802774F4 00000000 */ nop -/* 1A5DD8 802774F8 3C028011 */ lui $v0, 0x8011 -/* 1A5DDC 802774FC 9042F292 */ lbu $v0, -0xd6e($v0) +/* 1A5DD8 802774F8 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 1A5DDC 802774FC 9042F292 */ lbu $v0, %lo(gPlayerData+0x2)($v0) /* 1A5DE0 80277500 0809DD44 */ j .L80277510 /* 1A5DE4 80277504 A26201B8 */ sb $v0, 0x1b8($s3) .L80277508: @@ -513,8 +513,8 @@ glabel calc_enemy_damage_target /* 1A6458 80277B78 00501021 */ addu $v0, $v0, $s0 /* 1A645C 80277B7C A282007B */ sb $v0, 0x7b($s4) /* 1A6460 80277B80 926201B8 */ lbu $v0, 0x1b8($s3) -/* 1A6464 80277B84 3C018011 */ lui $at, 0x8011 -/* 1A6468 80277B88 A022F292 */ sb $v0, -0xd6e($at) +/* 1A6464 80277B84 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 1A6468 80277B88 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) .L80277B8C: /* 1A646C 80277B8C 3C02800E */ lui $v0, %hi(gBattleStatus) /* 1A6470 80277B90 8C42C070 */ lw $v0, %lo(gBattleStatus)($v0) diff --git a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s index 7a5a543e63..b1957f3e01 100644 --- a/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s +++ b/asm/nonmatchings/code_1a1f0_len_5390/func_8003F7CC.s @@ -759,8 +759,8 @@ glabel func_8003F7CC /* 1B6FC 800402FC 0000282D */ daddu $a1, $zero, $zero /* 1B700 80040300 0C052757 */ jal play_sound_at_position /* 1B704 80040304 E7A00010 */ swc1 $f0, 0x10($sp) -/* 1B708 80040308 3C038011 */ lui $v1, 0x8011 -/* 1B70C 8004030C 9063F291 */ lbu $v1, -0xd6f($v1) +/* 1B708 80040308 3C038011 */ lui $v1, %hi(gPlayerData+0x1) +/* 1B70C 8004030C 9063F291 */ lbu $v1, %lo(gPlayerData+0x1)($v1) /* 1B710 80040310 24020004 */ addiu $v0, $zero, 4 /* 1B714 80040314 A2620005 */ sb $v0, 5($s3) /* 1B718 80040318 0801015F */ j .L8004057C @@ -1030,8 +1030,8 @@ glabel func_8003F7CC /* 1BB14 80040714 1040000A */ beqz $v0, .L80040740 /* 1BB18 80040718 00000000 */ nop /* 1BB1C 8004071C 8E220018 */ lw $v0, 0x18($s1) -/* 1BB20 80040720 3C038011 */ lui $v1, 0x8011 -/* 1BB24 80040724 8063F299 */ lb $v1, -0xd67($v1) +/* 1BB20 80040720 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BB24 80040724 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BB28 80040728 84420028 */ lh $v0, 0x28($v0) /* 1BB2C 8004072C 0062182A */ slt $v1, $v1, $v0 /* 1BB30 80040730 14600003 */ bnez $v1, .L80040740 @@ -1126,8 +1126,8 @@ glabel func_8003F7CC /* 1BC80 80040880 5040001C */ beql $v0, $zero, .L800408F4 /* 1BC84 80040884 A2700004 */ sb $s0, 4($s3) /* 1BC88 80040888 8E220018 */ lw $v0, 0x18($s1) -/* 1BC8C 8004088C 3C038011 */ lui $v1, 0x8011 -/* 1BC90 80040890 8063F299 */ lb $v1, -0xd67($v1) +/* 1BC8C 8004088C 3C038011 */ lui $v1, %hi(gPlayerData+0x9) +/* 1BC90 80040890 8063F299 */ lb $v1, %lo(gPlayerData+0x9)($v1) /* 1BC94 80040894 84420028 */ lh $v0, 0x28($v0) /* 1BC98 80040898 0062182A */ slt $v1, $v1, $v0 /* 1BC9C 8004089C 54600015 */ bnel $v1, $zero, .L800408F4 diff --git a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s index 7b4c785996..ae5a24ac34 100644 --- a/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s +++ b/asm/nonmatchings/code_20ec0_len_5040/spawn_drops.s @@ -245,10 +245,10 @@ glabel spawn_drops /* 23A10 80048610 4481D000 */ mtc1 $at, $f26 /* 23A14 80048614 3C0142C8 */ lui $at, 0x42c8 /* 23A18 80048618 4481E000 */ mtc1 $at, $f28 -/* 23A1C 8004861C 3C028011 */ lui $v0, 0x8011 -/* 23A20 80048620 8042F292 */ lb $v0, -0xd6e($v0) -/* 23A24 80048624 3C038011 */ lui $v1, 0x8011 -/* 23A28 80048628 8063F293 */ lb $v1, -0xd6d($v1) +/* 23A1C 8004861C 3C028011 */ lui $v0, %hi(gPlayerData+0x2) +/* 23A20 80048620 8042F292 */ lb $v0, %lo(gPlayerData+0x2)($v0) +/* 23A24 80048624 3C038011 */ lui $v1, %hi(gPlayerData+0x3) +/* 23A28 80048628 8063F293 */ lb $v1, %lo(gPlayerData+0x3)($v1) /* 23A2C 8004862C 24130002 */ addiu $s3, $zero, 2 /* 23A30 80048630 AFA00030 */ sw $zero, 0x30($sp) /* 23A34 80048634 44821000 */ mtc1 $v0, $f2 @@ -431,10 +431,10 @@ glabel spawn_drops /* 23CC0 800488C0 4481D000 */ mtc1 $at, $f26 /* 23CC4 800488C4 3C0142C8 */ lui $at, 0x42c8 /* 23CC8 800488C8 4481E000 */ mtc1 $at, $f28 -/* 23CCC 800488CC 3C028011 */ lui $v0, 0x8011 -/* 23CD0 800488D0 8042F295 */ lb $v0, -0xd6b($v0) -/* 23CD4 800488D4 3C038011 */ lui $v1, 0x8011 -/* 23CD8 800488D8 8063F296 */ lb $v1, -0xd6a($v1) +/* 23CCC 800488CC 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 23CD0 800488D0 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) +/* 23CD4 800488D4 3C038011 */ lui $v1, %hi(gPlayerData+0x6) +/* 23CD8 800488D8 8063F296 */ lb $v1, %lo(gPlayerData+0x6)($v1) /* 23CDC 800488DC 24130002 */ addiu $s3, $zero, 2 /* 23CE0 800488E0 AFA00030 */ sw $zero, 0x30($sp) /* 23CE4 800488E4 44821000 */ mtc1 $v0, $f2 diff --git a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s index 140cbadd07..3af1e3c00a 100644 --- a/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s +++ b/asm/nonmatchings/code_7E3700/TeleportPartnerToPlayer.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel TeleportPartnerToPlayer -/* 7E46FC 8028387C 3C028011 */ lui $v0, 0x8011 -/* 7E4700 80283880 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 7E46FC 8028387C 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 7E4700 80283880 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 7E4704 80283884 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 7E4708 80283888 AFB10014 */ sw $s1, 0x14($sp) /* 7E470C 8028388C 3C118011 */ lui $s1, %hi(gPlayerStatus) diff --git a/asm/nonmatchings/code_7E3700/func_80283908.s b/asm/nonmatchings/code_7E3700/func_80283908.s index 6e6e927ccb..e00af2cf6e 100644 --- a/asm/nonmatchings/code_7E3700/func_80283908.s +++ b/asm/nonmatchings/code_7E3700/func_80283908.s @@ -38,8 +38,8 @@ glabel func_80283908 /* 7E480C 8028398C 00431021 */ addu $v0, $v0, $v1 /* 7E4810 80283990 000210C0 */ sll $v0, $v0, 3 /* 7E4814 80283994 E6000030 */ swc1 $f0, 0x30($s0) -/* 7E4818 80283998 3C038011 */ lui $v1, 0x8011 -/* 7E481C 8028399C 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 7E4818 80283998 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 7E481C 8028399C 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 7E4820 802839A0 10600022 */ beqz $v1, .L80283A2C /* 7E4824 802839A4 00449021 */ addu $s2, $v0, $a0 /* 7E4828 802839A8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s index 1db095db11..1316ee7478 100644 --- a/asm/nonmatchings/code_80850_len_3060/update_status_menu.s +++ b/asm/nonmatchings/code_80850_len_3060/update_status_menu.s @@ -40,16 +40,16 @@ glabel update_status_menu /* 815F0 800E8140 80420070 */ lb $v0, 0x70($v0) /* 815F4 800E8144 14400008 */ bnez $v0, .L800E8168 /* 815F8 800E8148 00000000 */ nop -/* 815FC 800E814C 3C038011 */ lui $v1, 0x8011 -/* 81600 800E8150 8463F29C */ lh $v1, -0xd64($v1) +/* 815FC 800E814C 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 81600 800E8150 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81604 800E8154 86620040 */ lh $v0, 0x40($s3) /* 81608 800E8158 10620007 */ beq $v1, $v0, .L800E8178 /* 8160C 800E815C 00628023 */ subu $s0, $v1, $v0 /* 81610 800E8160 0C03A67D */ jal status_menu_start_blinking_coins /* 81614 800E8164 00000000 */ nop .L800E8168: -/* 81618 800E8168 3C038011 */ lui $v1, 0x8011 -/* 8161C 800E816C 8463F29C */ lh $v1, -0xd64($v1) +/* 81618 800E8168 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* 8161C 800E816C 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* 81620 800E8170 86620040 */ lh $v0, 0x40($s3) /* 81624 800E8174 00628023 */ subu $s0, $v1, $v0 .L800E8178: @@ -69,8 +69,8 @@ glabel update_status_menu /* 81654 800E81A4 00628023 */ subu $s0, $v1, $v0 /* 81658 800E81A8 96620040 */ lhu $v0, 0x40($s3) /* 8165C 800E81AC 8264003D */ lb $a0, 0x3d($s3) -/* 81660 800E81B0 3C038011 */ lui $v1, 0x8011 -/* 81664 800E81B4 8063F292 */ lb $v1, -0xd6e($v1) +/* 81660 800E81B0 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81664 800E81B4 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81668 800E81B8 00501021 */ addu $v0, $v0, $s0 /* 8166C 800E81BC 1083000C */ beq $a0, $v1, .L800E81F0 /* 81670 800E81C0 A6620040 */ sh $v0, 0x40($s3) @@ -88,8 +88,8 @@ glabel update_status_menu /* 8169C 800E81EC A6620038 */ sh $v0, 0x38($s3) .L800E81F0: /* 816A0 800E81F0 8263003E */ lb $v1, 0x3e($s3) -/* 816A4 800E81F4 3C028011 */ lui $v0, 0x8011 -/* 816A8 800E81F8 8042F295 */ lb $v0, -0xd6b($v0) +/* 816A4 800E81F4 3C028011 */ lui $v0, %hi(gPlayerData+0x5) +/* 816A8 800E81F8 8042F295 */ lb $v0, %lo(gPlayerData+0x5)($v0) /* 816AC 800E81FC 1062000C */ beq $v1, $v0, .L800E8230 /* 816B0 800E8200 00000000 */ nop /* 816B4 800E8204 82620044 */ lb $v0, 0x44($s3) @@ -106,8 +106,8 @@ glabel update_status_menu /* 816DC 800E822C A6620038 */ sh $v0, 0x38($s3) .L800E8230: /* 816E0 800E8230 86630048 */ lh $v1, 0x48($s3) -/* 816E4 800E8234 3C028011 */ lui $v0, 0x8011 -/* 816E8 800E8238 8442F520 */ lh $v0, -0xae0($v0) +/* 816E4 800E8234 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 816E8 800E8238 8442F520 */ lh $v0, %lo(gPlayerData+0x290)($v0) /* 816EC 800E823C 1062000C */ beq $v1, $v0, .L800E8270 /* 816F0 800E8240 00000000 */ nop /* 816F4 800E8244 82620044 */ lb $v0, 0x44($s3) @@ -124,8 +124,8 @@ glabel update_status_menu /* 8171C 800E826C A6620038 */ sh $v0, 0x38($s3) .L800E8270: /* 81720 800E8270 8264003D */ lb $a0, 0x3d($s3) -/* 81724 800E8274 3C038011 */ lui $v1, 0x8011 -/* 81728 800E8278 8063F292 */ lb $v1, -0xd6e($v1) +/* 81724 800E8274 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81728 800E8278 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 8172C 800E827C 1083002E */ beq $a0, $v1, .L800E8338 /* 81730 800E8280 00000000 */ nop /* 81734 800E8284 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -139,8 +139,8 @@ glabel update_status_menu /* 81754 800E82A4 00000000 */ nop .L800E82A8: /* 81758 800E82A8 8262003D */ lb $v0, 0x3d($s3) -/* 8175C 800E82AC 3C038011 */ lui $v1, 0x8011 -/* 81760 800E82B0 8063F292 */ lb $v1, -0xd6e($v1) +/* 8175C 800E82AC 3C038011 */ lui $v1, %hi(gPlayerData+0x2) +/* 81760 800E82B0 8063F292 */ lb $v1, %lo(gPlayerData+0x2)($v1) /* 81764 800E82B4 0043102A */ slt $v0, $v0, $v1 /* 81768 800E82B8 10400018 */ beqz $v0, .L800E831C /* 8176C 800E82BC 9263003D */ lbu $v1, 0x3d($s3) @@ -178,8 +178,8 @@ glabel update_status_menu /* 817E4 800E8334 A262003D */ sb $v0, 0x3d($s3) .L800E8338: /* 817E8 800E8338 8264003E */ lb $a0, 0x3e($s3) -/* 817EC 800E833C 3C038011 */ lui $v1, 0x8011 -/* 817F0 800E8340 8063F295 */ lb $v1, -0xd6b($v1) +/* 817EC 800E833C 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 817F0 800E8340 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 817F4 800E8344 1083002E */ beq $a0, $v1, .L800E8400 /* 817F8 800E8348 00000000 */ nop /* 817FC 800E834C 3C028007 */ lui $v0, %hi(gGameStatusPtr) @@ -193,8 +193,8 @@ glabel update_status_menu /* 8181C 800E836C 00000000 */ nop .L800E8370: /* 81820 800E8370 8262003E */ lb $v0, 0x3e($s3) -/* 81824 800E8374 3C038011 */ lui $v1, 0x8011 -/* 81828 800E8378 8063F295 */ lb $v1, -0xd6b($v1) +/* 81824 800E8374 3C038011 */ lui $v1, %hi(gPlayerData+0x5) +/* 81828 800E8378 8063F295 */ lb $v1, %lo(gPlayerData+0x5)($v1) /* 8182C 800E837C 0043102A */ slt $v0, $v0, $v1 /* 81830 800E8380 10400018 */ beqz $v0, .L800E83E4 /* 81834 800E8384 9263003E */ lbu $v1, 0x3e($s3) @@ -232,8 +232,8 @@ glabel update_status_menu /* 818AC 800E83FC A262003E */ sb $v0, 0x3e($s3) .L800E8400: /* 818B0 800E8400 86620048 */ lh $v0, 0x48($s3) -/* 818B4 800E8404 3C048011 */ lui $a0, 0x8011 -/* 818B8 800E8408 8484F520 */ lh $a0, -0xae0($a0) +/* 818B4 800E8404 3C048011 */ lui $a0, %hi(gPlayerData+0x290) +/* 818B8 800E8408 8484F520 */ lh $a0, %lo(gPlayerData+0x290)($a0) /* 818BC 800E840C 96630048 */ lhu $v1, 0x48($s3) /* 818C0 800E8410 1044001A */ beq $v0, $a0, .L800E847C /* 818C4 800E8414 0044102A */ slt $v0, $v0, $a0 @@ -241,12 +241,12 @@ glabel update_status_menu /* 818CC 800E841C 2462000A */ addiu $v0, $v1, 0xa /* 818D0 800E8420 A6620048 */ sh $v0, 0x48($s3) /* 818D4 800E8424 00021400 */ sll $v0, $v0, 0x10 -/* 818D8 800E8428 3C038011 */ lui $v1, 0x8011 -/* 818DC 800E842C 8463F520 */ lh $v1, -0xae0($v1) +/* 818D8 800E8428 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 818DC 800E842C 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 818E0 800E8430 00021403 */ sra $v0, $v0, 0x10 /* 818E4 800E8434 0062182A */ slt $v1, $v1, $v0 -/* 818E8 800E8438 3C028011 */ lui $v0, 0x8011 -/* 818EC 800E843C 9442F520 */ lhu $v0, -0xae0($v0) +/* 818E8 800E8438 3C028011 */ lui $v0, %hi(gPlayerData+0x290) +/* 818EC 800E843C 9442F520 */ lhu $v0, %lo(gPlayerData+0x290)($v0) /* 818F0 800E8440 5460000E */ bnel $v1, $zero, .L800E847C /* 818F4 800E8444 A6620048 */ sh $v0, 0x48($s3) /* 818F8 800E8448 0803A11F */ j .L800E847C @@ -255,12 +255,12 @@ glabel update_status_menu /* 81900 800E8450 2462FFF6 */ addiu $v0, $v1, -0xa /* 81904 800E8454 A6620048 */ sh $v0, 0x48($s3) /* 81908 800E8458 00021400 */ sll $v0, $v0, 0x10 -/* 8190C 800E845C 3C038011 */ lui $v1, 0x8011 -/* 81910 800E8460 8463F520 */ lh $v1, -0xae0($v1) +/* 8190C 800E845C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81910 800E8460 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81914 800E8464 00021403 */ sra $v0, $v0, 0x10 /* 81918 800E8468 0043102A */ slt $v0, $v0, $v1 -/* 8191C 800E846C 3C038011 */ lui $v1, 0x8011 -/* 81920 800E8470 9463F520 */ lhu $v1, -0xae0($v1) +/* 8191C 800E846C 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81920 800E8470 9463F520 */ lhu $v1, %lo(gPlayerData+0x290)($v1) /* 81924 800E8474 54400001 */ bnel $v0, $zero, .L800E847C /* 81928 800E8478 A6630048 */ sh $v1, 0x48($s3) .L800E847C: @@ -492,8 +492,8 @@ glabel update_status_menu /* 81C78 800E87C8 86650034 */ lh $a1, 0x34($s3) /* 81C7C 800E87CC 86660036 */ lh $a2, 0x36($s3) /* 81C80 800E87D0 8267003D */ lb $a3, 0x3d($s3) -/* 81C84 800E87D4 3C028011 */ lui $v0, 0x8011 -/* 81C88 800E87D8 8042F293 */ lb $v0, -0xd6d($v0) +/* 81C84 800E87D4 3C028011 */ lui $v0, %hi(gPlayerData+0x3) +/* 81C88 800E87D8 8042F293 */ lb $v0, %lo(gPlayerData+0x3)($v0) /* 81C8C 800E87DC 24A50030 */ addiu $a1, $a1, 0x30 /* 81C90 800E87E0 24C60008 */ addiu $a2, $a2, 8 /* 81C94 800E87E4 0C039F8D */ jal status_menu_draw_stat @@ -550,20 +550,20 @@ glabel update_status_menu /* 81D50 800E88A0 86650034 */ lh $a1, 0x34($s3) /* 81D54 800E88A4 86660036 */ lh $a2, 0x36($s3) /* 81D58 800E88A8 8267003E */ lb $a3, 0x3e($s3) -/* 81D5C 800E88AC 3C028011 */ lui $v0, 0x8011 -/* 81D60 800E88B0 8042F296 */ lb $v0, -0xd6a($v0) +/* 81D5C 800E88AC 3C028011 */ lui $v0, %hi(gPlayerData+0x6) +/* 81D60 800E88B0 8042F296 */ lb $v0, %lo(gPlayerData+0x6)($v0) /* 81D64 800E88B4 24A50088 */ addiu $a1, $a1, 0x88 /* 81D68 800E88B8 24C60008 */ addiu $a2, $a2, 8 /* 81D6C 800E88BC 0C039F8D */ jal status_menu_draw_stat /* 81D70 800E88C0 AFA20010 */ sw $v0, 0x10($sp) .L800E88C4: -/* 81D74 800E88C4 3C028011 */ lui $v0, 0x8011 -/* 81D78 800E88C8 8042F299 */ lb $v0, -0xd67($v0) +/* 81D74 800E88C4 3C028011 */ lui $v0, %hi(gPlayerData+0x9) +/* 81D78 800E88C8 8042F299 */ lb $v0, %lo(gPlayerData+0x9)($v0) /* 81D7C 800E88CC 2842001B */ slti $v0, $v0, 0x1b /* 81D80 800E88D0 14400003 */ bnez $v0, .L800E88E0 /* 81D84 800E88D4 00000000 */ nop -/* 81D88 800E88D8 3C018011 */ lui $at, 0x8011 -/* 81D8C 800E88DC A020F2A0 */ sb $zero, -0xd60($at) +/* 81D88 800E88D8 3C018011 */ lui $at, %hi(gPlayerData+0x10) +/* 81D8C 800E88DC A020F2A0 */ sb $zero, %lo(gPlayerData+0x10)($at) .L800E88E0: /* 81D90 800E88E0 82620052 */ lb $v0, 0x52($s3) /* 81D94 800E88E4 1040000B */ beqz $v0, .L800E8914 @@ -605,8 +605,8 @@ glabel update_status_menu /* 81E1C 800E896C 24020002 */ addiu $v0, $zero, 2 /* 81E20 800E8970 AFA20010 */ sw $v0, 0x10($sp) /* 81E24 800E8974 86660036 */ lh $a2, 0x36($s3) -/* 81E28 800E8978 3C078011 */ lui $a3, 0x8011 -/* 81E2C 800E897C 80E7F2A0 */ lb $a3, -0xd60($a3) +/* 81E28 800E8978 3C078011 */ lui $a3, %hi(gPlayerData+0x10) +/* 81E2C 800E897C 80E7F2A0 */ lb $a3, %lo(gPlayerData+0x10)($a3) /* 81E30 800E8980 24A500C8 */ addiu $a1, $a1, 0xc8 /* 81E34 800E8984 0C039F29 */ jal status_menu_draw_number /* 81E38 800E8988 24C60008 */ addiu $a2, $a2, 8 @@ -711,8 +711,8 @@ glabel update_status_menu /* 81FA0 800E8AF0 24020001 */ addiu $v0, $zero, 1 /* 81FA4 800E8AF4 1462002B */ bne $v1, $v0, .L800E8BA4 /* 81FA8 800E8AF8 00000000 */ nop -/* 81FAC 800E8AFC 3C038011 */ lui $v1, 0x8011 -/* 81FB0 800E8B00 8463F520 */ lh $v1, -0xae0($v1) +/* 81FAC 800E8AFC 3C038011 */ lui $v1, %hi(gPlayerData+0x290) +/* 81FB0 800E8B00 8463F520 */ lh $v1, %lo(gPlayerData+0x290)($v1) /* 81FB4 800E8B04 04610002 */ bgez $v1, .L800E8B10 /* 81FB8 800E8B08 0060102D */ daddu $v0, $v1, $zero /* 81FBC 800E8B0C 246200FF */ addiu $v0, $v1, 0xff @@ -1064,8 +1064,8 @@ glabel update_status_menu /* 824C8 800E9018 3C16800F */ lui $s6, 0x800f /* 824CC 800E901C 26D67FE8 */ addiu $s6, $s6, 0x7fe8 /* 824D0 800E9020 8FA90050 */ lw $t1, 0x50($sp) -/* 824D4 800E9024 3C048011 */ lui $a0, 0x8011 -/* 824D8 800E9028 8084F51E */ lb $a0, -0xae2($a0) +/* 824D4 800E9024 3C048011 */ lui $a0, %hi(gPlayerData+0x28E) +/* 824D8 800E9028 8084F51E */ lb $a0, %lo(gPlayerData+0x28E)($a0) /* 824DC 800E902C 00091080 */ sll $v0, $t1, 2 /* 824E0 800E9030 00491021 */ addu $v0, $v0, $t1 /* 824E4 800E9034 00021080 */ sll $v0, $v0, 2 diff --git a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s index 6441e053df..ffe2fa71ae 100644 --- a/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s +++ b/asm/nonmatchings/code_838b0_len_5900/partner_reset_data.s @@ -8,8 +8,8 @@ glabel partner_reset_data /* 84930 800EB480 2631EBB0 */ addiu $s1, $s1, %lo(D_8010EBB0) /* 84934 800EB484 0220202D */ daddu $a0, $s1, $zero /* 84938 800EB488 AFB00010 */ sw $s0, 0x10($sp) -/* 8493C 800EB48C 3C108011 */ lui $s0, 0x8011 -/* 84940 800EB490 8210F2A2 */ lb $s0, -0xd5e($s0) +/* 8493C 800EB48C 3C108011 */ lui $s0, %hi(gPlayerData+0x12) +/* 84940 800EB490 8210F2A2 */ lb $s0, %lo(gPlayerData+0x12)($s0) /* 84944 800EB494 AFBF0018 */ sw $ra, 0x18($sp) /* 84948 800EB498 0C00A580 */ jal mem_clear /* 8494C 800EB49C 24050360 */ addiu $a1, $zero, 0x360 diff --git a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s index c341840e85..4ce96bddbf 100644 --- a/asm/nonmatchings/code_838b0_len_5900/use_consumable.s +++ b/asm/nonmatchings/code_838b0_len_5900/use_consumable.s @@ -16,9 +16,9 @@ glabel use_consumable /* 838DC 800EA42C 00111040 */ sll $v0, $s1, 1 /* 838E0 800EA430 3C018011 */ lui $at, %hi(D_8010CD20) /* 838E4 800EA434 AC31CD20 */ sw $s1, %lo(D_8010CD20)($at) -/* 838E8 800EA438 3C118011 */ lui $s1, 0x8011 +/* 838E8 800EA438 3C118011 */ lui $s1, %hi(gPlayerData+0x1B4) /* 838EC 800EA43C 02228821 */ addu $s1, $s1, $v0 -/* 838F0 800EA440 8631F444 */ lh $s1, -0xbbc($s1) +/* 838F0 800EA440 8631F444 */ lh $s1, %lo(gPlayerData+0x1B4)($s1) /* 838F4 800EA444 0C00A5CF */ jal dma_copy /* 838F8 800EA448 00000000 */ nop /* 838FC 800EA44C 24050001 */ addiu $a1, $zero, 1 diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s index 9c04bc7950..6a5639e28f 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_802424F0_C38A20.s @@ -12,8 +12,8 @@ glabel func_802424F0_C38A20 /* C38A3C 8024250C AFB50024 */ sw $s5, 0x24($sp) /* C38A40 80242510 0200A82D */ daddu $s5, $s0, $zero /* C38A44 80242514 AFB10014 */ sw $s1, 0x14($sp) -/* C38A48 80242518 3C118011 */ lui $s1, 0x8011 -/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C38A48 80242518 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C38A4C 8024251C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C38A50 80242520 AFBF0028 */ sw $ra, 0x28($sp) /* C38A54 80242524 AFB20018 */ sw $s2, 0x18($sp) /* C38A58 80242528 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s index 431c983a4e..474b20ce22 100644 --- a/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s +++ b/asm/nonmatchings/world/area_dgb/dgb_04/C36530/func_80242818_C38D48.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80242818_C38D48 -/* C38D48 80242818 3C028011 */ lui $v0, 0x8011 -/* C38D4C 8024281C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C38D48 80242818 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C38D4C 8024281C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C38D50 80242820 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C38D54 80242824 AFBF0010 */ sw $ra, 0x10($sp) /* C38D58 80242828 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s index d258a5b4c0..fda576323c 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240120_CAEE60.s @@ -12,8 +12,8 @@ glabel func_80240120_CAEE60 /* CAEE7C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* CAEE80 80240140 0200A82D */ daddu $s5, $s0, $zero /* CAEE84 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* CAEE88 80240148 3C118011 */ lui $s1, 0x8011 -/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CAEE88 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CAEE8C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CAEE90 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* CAEE94 80240154 AFB20018 */ sw $s2, 0x18($sp) /* CAEE98 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s index 78f957404c..a19c129a53 100644 --- a/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s +++ b/asm/nonmatchings/world/area_flo/flo_08/CAED40/func_80240448_CAF188.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_CAF188 -/* CAF188 80240448 3C028011 */ lui $v0, 0x8011 -/* CAF18C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CAF188 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CAF18C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CAF190 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CAF194 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* CAF198 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s index 316b599ad3..6f5aee6437 100644 --- a/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s +++ b/asm/nonmatchings/world/area_flo/flo_14/CCB310/func_802403D4_CCB6E4.s @@ -3,8 +3,8 @@ glabel func_802403D4_CCB6E4 /* CCB6E4 802403D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* CCB6E8 802403D8 3C028011 */ lui $v0, 0x8011 -/* CCB6EC 802403DC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CCB6E8 802403D8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CCB6EC 802403DC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CCB6F0 802403E0 0080182D */ daddu $v1, $a0, $zero /* CCB6F4 802403E4 1040000C */ beqz $v0, .L80240418 /* CCB6F8 802403E8 AFBF0010 */ sw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s index 49186a69c3..6543d3568a 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240200_CD2030.s @@ -12,8 +12,8 @@ glabel func_80240200_CD2030 /* CD204C 8024021C AFB50024 */ sw $s5, 0x24($sp) /* CD2050 80240220 0200A82D */ daddu $s5, $s0, $zero /* CD2054 80240224 AFB10014 */ sw $s1, 0x14($sp) -/* CD2058 80240228 3C118011 */ lui $s1, 0x8011 -/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, -0xd68 +/* CD2058 80240228 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* CD205C 8024022C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* CD2060 80240230 AFBF0028 */ sw $ra, 0x28($sp) /* CD2064 80240234 AFB20018 */ sw $s2, 0x18($sp) /* CD2068 80240238 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s index aca75a6bbd..8c9e36a0d3 100644 --- a/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s +++ b/asm/nonmatchings/world/area_flo/flo_16/CD1F10/func_80240528_CD2358.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240528_CD2358 -/* CD2358 80240528 3C028011 */ lui $v0, 0x8011 -/* CD235C 8024052C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* CD2358 80240528 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* CD235C 8024052C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* CD2360 80240530 27BDFFE8 */ addiu $sp, $sp, -0x18 /* CD2364 80240534 AFBF0010 */ sw $ra, 0x10($sp) /* CD2368 80240538 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s index 8a35eb943d..231a5b2a96 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4B0/func_802407C0_A0C4B0.s @@ -8,8 +8,8 @@ glabel func_802407C0_A0C4B0 /* A0C4BC 802407CC 0C0B1EAF */ jal get_variable /* A0C4C0 802407D0 8C450000 */ lw $a1, ($v0) /* A0C4C4 802407D4 8FBF0010 */ lw $ra, 0x10($sp) -/* A0C4C8 802407D8 3C018011 */ lui $at, 0x8011 -/* A0C4CC 802407DC A022F2A2 */ sb $v0, -0xd5e($at) +/* A0C4C8 802407D8 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A0C4CC 802407DC A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* A0C4D0 802407E0 24020002 */ addiu $v0, $zero, 2 /* A0C4D4 802407E4 03E00008 */ jr $ra /* A0C4D8 802407E8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s index 33ee37042b..a48de861df 100644 --- a/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s +++ b/asm/nonmatchings/world/area_hos/hos_00/A0C4E0/func_80240908_A0C5F8.s @@ -3,7 +3,7 @@ glabel func_80240908_A0C5F8 /* A0C5F8 80240908 24020001 */ addiu $v0, $zero, 1 -/* A0C5FC 8024090C 3C018011 */ lui $at, 0x8011 -/* A0C600 80240910 A022F29A */ sb $v0, -0xd66($at) +/* A0C5FC 8024090C 3C018011 */ lui $at, %hi(gPlayerData+0xA) +/* A0C600 80240910 A022F29A */ sb $v0, %lo(gPlayerData+0xA)($at) /* A0C604 80240914 03E00008 */ jr $ra /* A0C608 80240918 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s index 08a17c7972..20cbc0e829 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A397F0/func_80240A68_A39F48.s @@ -5,8 +5,8 @@ glabel func_80240A68_A39F48 /* A39F48 80240A68 27BDFFE8 */ addiu $sp, $sp, -0x18 /* A39F4C 80240A6C AFBF0010 */ sw $ra, 0x10($sp) /* A39F50 80240A70 8C82000C */ lw $v0, 0xc($a0) -/* A39F54 80240A74 3C068011 */ lui $a2, 0x8011 -/* A39F58 80240A78 90C6F29F */ lbu $a2, -0xd61($a2) +/* A39F54 80240A74 3C068011 */ lui $a2, %hi(gPlayerData+0xF) +/* A39F58 80240A78 90C6F29F */ lbu $a2, %lo(gPlayerData+0xF)($a2) /* A39F5C 80240A7C 0C0B2026 */ jal set_variable /* A39F60 80240A80 8C450000 */ lw $a1, ($v0) /* A39F64 80240A84 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s index deb496c038..0a3e0f9ec6 100644 --- a/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s +++ b/asm/nonmatchings/world/area_hos/hos_06/A3A230/func_802417EC_A3ACCC.s @@ -11,8 +11,8 @@ glabel func_802417EC_A3ACCC /* A3ACE4 80241804 8E050000 */ lw $a1, ($s0) /* A3ACE8 80241808 0C0B1EAF */ jal get_variable /* A3ACEC 8024180C 26100004 */ addiu $s0, $s0, 4 -/* A3ACF0 80241810 3C038011 */ lui $v1, 0x8011 -/* A3ACF4 80241814 8463F29C */ lh $v1, -0xd64($v1) +/* A3ACF0 80241810 3C038011 */ lui $v1, %hi(gPlayerData+0xC) +/* A3ACF4 80241814 8463F29C */ lh $v1, %lo(gPlayerData+0xC)($v1) /* A3ACF8 80241818 3C018024 */ lui $at, 0x8024 /* A3ACFC 8024181C 00220821 */ addu $at, $at, $v0 /* A3AD00 80241820 902247D0 */ lbu $v0, 0x47d0($at) diff --git a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s index 71cf0b78e9..3405093595 100644 --- a/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s +++ b/asm/nonmatchings/world/area_hos/hos_10/A3FEB0/func_80240BEC_A4032C.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240BEC_A4032C -/* A4032C 80240BEC 3C018011 */ lui $at, 0x8011 -/* A40330 80240BF0 A020F2A2 */ sb $zero, -0xd5e($at) +/* A4032C 80240BEC 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* A40330 80240BF0 A020F2A2 */ sb $zero, %lo(gPlayerData+0x12)($at) /* A40334 80240BF4 03E00008 */ jr $ra /* A40338 80240BF8 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s index 0918131edf..d25a33d76e 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240120_988C80.s @@ -12,8 +12,8 @@ glabel func_80240120_988C80 /* 988C9C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* 988CA0 80240140 0200A82D */ daddu $s5, $s0, $zero /* 988CA4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* 988CA8 80240148 3C118011 */ lui $s1, 0x8011 -/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 988CA8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 988CAC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 988CB0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* 988CB4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* 988CB8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s index 62065d9373..09a3bfe846 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240448_988FA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_988FA8 -/* 988FA8 80240448 3C028011 */ lui $v0, 0x8011 -/* 988FAC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 988FA8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 988FAC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 988FB0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 988FB4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* 988FB8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s index 8bd8afd955..f2b96dfb38 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240410_91E980.s @@ -12,8 +12,8 @@ glabel func_80240410_91E980 /* 91E99C 8024042C AFB50024 */ sw $s5, 0x24($sp) /* 91E9A0 80240430 0200A82D */ daddu $s5, $s0, $zero /* 91E9A4 80240434 AFB10014 */ sw $s1, 0x14($sp) -/* 91E9A8 80240438 3C118011 */ lui $s1, 0x8011 -/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 91E9A8 80240438 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 91E9AC 8024043C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 91E9B0 80240440 AFBF0028 */ sw $ra, 0x28($sp) /* 91E9B4 80240444 AFB20018 */ sw $s2, 0x18($sp) /* 91E9B8 80240448 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s index 4077c47e03..51476c406b 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s +++ b/asm/nonmatchings/world/area_iwa/iwa_10/91E6D0/func_80240738_91ECA8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240738_91ECA8 -/* 91ECA8 80240738 3C028011 */ lui $v0, 0x8011 -/* 91ECAC 8024073C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 91ECA8 80240738 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 91ECAC 8024073C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 91ECB0 80240740 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 91ECB4 80240744 AFBF0010 */ sw $ra, 0x10($sp) /* 91ECB8 80240748 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s index d1c7f51216..e4c639c610 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240780_B5EA30.s @@ -12,8 +12,8 @@ glabel func_80240780_B5EA30 /* B5EA4C 8024079C AFB50024 */ sw $s5, 0x24($sp) /* B5EA50 802407A0 0200A82D */ daddu $s5, $s0, $zero /* B5EA54 802407A4 AFB10014 */ sw $s1, 0x14($sp) -/* B5EA58 802407A8 3C118011 */ lui $s1, 0x8011 -/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, -0xd68 +/* B5EA58 802407A8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* B5EA5C 802407AC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* B5EA60 802407B0 AFBF0028 */ sw $ra, 0x28($sp) /* B5EA64 802407B4 AFB20018 */ sw $s2, 0x18($sp) /* B5EA68 802407B8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s index 5ad0aa5525..a92c7dc2dd 100644 --- a/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s +++ b/asm/nonmatchings/world/area_jan/jan_08/B5E910/func_80240AA8_B5ED58.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AA8_B5ED58 -/* B5ED58 80240AA8 3C028011 */ lui $v0, 0x8011 -/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* B5ED58 80240AA8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* B5ED5C 80240AAC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* B5ED60 80240AB0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5ED64 80240AB4 AFBF0010 */ sw $ra, 0x10($sp) /* B5ED68 80240AB8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s index bb07a690db..92d6421284 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_8024035C_ADB1FC.s @@ -8,7 +8,7 @@ glabel func_8024035C_ADB1FC /* ADB208 80240368 306300FE */ andi $v1, $v1, 0xfe /* ADB20C 8024036C A043007E */ sb $v1, 0x7e($v0) /* ADB210 80240370 90820087 */ lbu $v0, 0x87($a0) -/* ADB214 80240374 3C018011 */ lui $at, 0x8011 -/* ADB218 80240378 A022F2A2 */ sb $v0, -0xd5e($at) +/* ADB214 80240374 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* ADB218 80240378 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* ADB21C 8024037C 03E00008 */ jr $ra /* ADB220 80240380 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s index 83eeebf918..a10ef85d26 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s +++ b/asm/nonmatchings/world/area_kkj/kkj_15/AE5590/func_8024030C_AE589C.s @@ -8,8 +8,8 @@ glabel func_8024030C_AE589C /* AE58A8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AE58AC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AE58B0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AE58B4 80240324 3C018011 */ lui $at, 0x8011 -/* AE58B8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AE58B4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AE58B8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AE58BC 8024032C 03E00008 */ jr $ra /* AE58C0 80240330 24020002 */ addiu $v0, $zero, 2 /* AE58C4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s index 026a624c18..820eae1f4a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240000_AED410.s @@ -8,7 +8,7 @@ glabel func_80240000_AED410 /* AED41C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* AED420 80240010 A043007E */ sb $v1, 0x7e($v0) /* AED424 80240014 90820087 */ lbu $v0, 0x87($a0) -/* AED428 80240018 3C018011 */ lui $at, 0x8011 -/* AED42C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* AED428 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AED42C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AED430 80240020 03E00008 */ jr $ra /* AED434 80240024 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s index a5f8b01d5f..440e2f628a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2CA0/func_8024030C_AF2FAC.s @@ -8,8 +8,8 @@ glabel func_8024030C_AF2FAC /* AF2FB8 80240318 306300FE */ andi $v1, $v1, 0xfe /* AF2FBC 8024031C A043007E */ sb $v1, 0x7e($v0) /* AF2FC0 80240320 90820087 */ lbu $v0, 0x87($a0) -/* AF2FC4 80240324 3C018011 */ lui $at, 0x8011 -/* AF2FC8 80240328 A022F2A2 */ sb $v0, -0xd5e($at) +/* AF2FC4 80240324 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* AF2FC8 80240328 A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* AF2FCC 8024032C 03E00008 */ jr $ra /* AF2FD0 80240330 24020002 */ addiu $v0, $zero, 2 /* AF2FD4 80240334 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s index 37e564b43e..556262f71c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240020_B028A0.s @@ -8,7 +8,7 @@ glabel func_80240020_B028A0 /* B028AC 8024002C 306300FE */ andi $v1, $v1, 0xfe /* B028B0 80240030 A043007E */ sb $v1, 0x7e($v0) /* B028B4 80240034 90820087 */ lbu $v0, 0x87($a0) -/* B028B8 80240038 3C018011 */ lui $at, 0x8011 -/* B028BC 8024003C A022F2A2 */ sb $v0, -0xd5e($at) +/* B028B8 80240038 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B028BC 8024003C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B028C0 80240040 03E00008 */ jr $ra /* B028C4 80240044 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s index 8245428187..76b334fb4d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s +++ b/asm/nonmatchings/world/area_kkj/kkj_26/B13120/func_80240000_B13120.s @@ -8,8 +8,8 @@ glabel func_80240000_B13120 /* B1312C 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B13130 80240010 A043007E */ sb $v1, 0x7e($v0) /* B13134 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B13138 80240018 3C018011 */ lui $at, 0x8011 -/* B1313C 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B13138 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B1313C 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B13140 80240020 03E00008 */ jr $ra /* B13144 80240024 24020002 */ addiu $v0, $zero, 2 /* B13148 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s index eb90b313f0..a398faff3c 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_29/B150B0/func_80240000_B150B0.s @@ -8,8 +8,8 @@ glabel func_80240000_B150B0 /* B150BC 8024000C 306300FE */ andi $v1, $v1, 0xfe /* B150C0 80240010 A043007E */ sb $v1, 0x7e($v0) /* B150C4 80240014 90820087 */ lbu $v0, 0x87($a0) -/* B150C8 80240018 3C018011 */ lui $at, 0x8011 -/* B150CC 8024001C A022F2A2 */ sb $v0, -0xd5e($at) +/* B150C8 80240018 3C018011 */ lui $at, %hi(gPlayerData+0x12) +/* B150CC 8024001C A022F2A2 */ sb $v0, %lo(gPlayerData+0x12)($at) /* B150D0 80240020 03E00008 */ jr $ra /* B150D4 80240024 24020002 */ addiu $v0, $zero, 2 /* B150D8 80240028 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s index 28e2cc6a96..421fff4889 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_02/8B0070/func_80242788_8B27F8.s @@ -4,8 +4,8 @@ glabel func_80242788_8B27F8 /* 8B27F8 80242788 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 8B27FC 8024278C AFBF0010 */ sw $ra, 0x10($sp) -/* 8B2800 80242790 3C018011 */ lui $at, 0x8011 -/* 8B2804 80242794 A020F2CC */ sb $zero, -0xd34($at) +/* 8B2800 80242790 3C018011 */ lui $at, %hi(gPlayerData+0x3C) +/* 8B2804 80242794 A020F2CC */ sb $zero, %lo(gPlayerData+0x3C)($at) /* 8B2808 80242798 0C03ACA9 */ jal func_800EB2A4 /* 8B280C 8024279C 0000202D */ daddu $a0, $zero, $zero /* 8B2810 802427A0 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s index 8096c27b8f..03e5caf0ac 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s +++ b/asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_80240434_8CAD34.s @@ -2,7 +2,7 @@ .set noreorder # don't insert nops after branches glabel func_80240434_8CAD34 -/* 8CAD34 80240434 3C018011 */ lui $at, 0x8011 -/* 8CAD38 80240438 A020F291 */ sb $zero, -0xd6f($at) +/* 8CAD34 80240434 3C018011 */ lui $at, %hi(gPlayerData+0x1) +/* 8CAD38 80240438 A020F291 */ sb $zero, %lo(gPlayerData+0x1)($at) /* 8CAD3C 8024043C 03E00008 */ jr $ra /* 8CAD40 80240440 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s index 49b7180b4b..c3b167fe1c 100644 --- a/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s +++ b/asm/nonmatchings/world/area_kmr/kmr_20/8EBE50/func_802406C8_8EC4E8.s @@ -51,8 +51,8 @@ glabel func_802406C8_8EC4E8 /* 8EC590 80240770 2402FFFF */ addiu $v0, $zero, -1 /* 8EC594 80240774 1602001F */ bne $s0, $v0, .L802407F4 /* 8EC598 80240778 0000202D */ daddu $a0, $zero, $zero -/* 8EC59C 8024077C 3C028011 */ lui $v0, 0x8011 -/* 8EC5A0 80240780 9442F552 */ lhu $v0, -0xaae($v0) +/* 8EC59C 8024077C 3C028011 */ lui $v0, %hi(gPlayerData+0x2C2) +/* 8EC5A0 80240780 9442F552 */ lhu $v0, %lo(gPlayerData+0x2C2)($v0) /* 8EC5A4 80240784 10400021 */ beqz $v0, .L8024080C /* 8EC5A8 80240788 00000000 */ nop /* 8EC5AC 8024078C 08090203 */ j .L8024080C diff --git a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s index e3900f6019..6a65e7a67c 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_12/A54CA0/func_8024037C_A54CCC.s @@ -32,8 +32,8 @@ glabel func_8024037C_A54CCC /* A54D34 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A54D38 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A54D3C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A54D40 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A54D3C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A54D40 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A54D44 802403F4 1040000D */ beqz $v0, .L8024042C /* A54D48 802403F8 00000000 */ nop /* A54D4C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s index 986383060d..286ddccde5 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s +++ b/asm/nonmatchings/world/area_kpa/kpa_13/A56270/func_8024037C_A5629C.s @@ -32,8 +32,8 @@ glabel func_8024037C_A5629C /* A56304 802403E4 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* A56308 802403E8 E440001C */ swc1 $f0, 0x1c($v0) .L802403EC: -/* A5630C 802403EC 3C028011 */ lui $v0, 0x8011 -/* A56310 802403F0 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A5630C 802403EC 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A56310 802403F0 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A56314 802403F4 1040000D */ beqz $v0, .L8024042C /* A56318 802403F8 00000000 */ nop /* A5631C 802403FC 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s index 58774ad020..4060728c1e 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s +++ b/asm/nonmatchings/world/area_kpa/kpa_14/A57830/func_8024073C_A57BEC.s @@ -46,8 +46,8 @@ glabel func_8024073C_A57BEC /* A57C8C 802407DC 46800020 */ cvt.s.w $f0, $f0 /* A57C90 802407E0 E4A0001C */ swc1 $f0, 0x1c($a1) .L802407E4: -/* A57C94 802407E4 3C028011 */ lui $v0, 0x8011 -/* A57C98 802407E8 8042F2A2 */ lb $v0, -0xd5e($v0) +/* A57C94 802407E4 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* A57C98 802407E8 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* A57C9C 802407EC 1040000D */ beqz $v0, .L80240824 /* A57CA0 802407F0 00000000 */ nop /* A57CA4 802407F4 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s index fe9c426885..5648433c0f 100644 --- a/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s +++ b/asm/nonmatchings/world/area_kpa/kpa_96/A927C0/func_80240000_A927C0.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240000_A927C0 -/* A927C0 80240000 3C028011 */ lui $v0, 0x8011 -/* A927C4 80240004 8442F29C */ lh $v0, -0xd64($v0) +/* A927C0 80240000 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* A927C4 80240004 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* A927C8 80240008 18400003 */ blez $v0, .L80240018 /* A927CC 8024000C 24020001 */ addiu $v0, $zero, 1 /* A927D0 80240010 08090007 */ j .L8024001C diff --git a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s index 80c68ebcfc..22b6850ea0 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s +++ b/asm/nonmatchings/world/area_kzn/kzn_02/C5AA50/func_802403DC_C5AB1C.s @@ -42,8 +42,8 @@ glabel func_802403DC_C5AB1C /* C5ABAC 8024046C 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C5ABB0 80240470 E440001C */ swc1 $f0, 0x1c($v0) .L80240474: -/* C5ABB4 80240474 3C028011 */ lui $v0, 0x8011 -/* C5ABB8 80240478 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C5ABB4 80240474 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C5ABB8 80240478 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C5ABBC 8024047C 1040000E */ beqz $v0, .L802404B8 /* C5ABC0 80240480 00000000 */ nop /* C5ABC4 80240484 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s index ae3cc022c2..91f5ce6c99 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240430_C68560.s @@ -12,8 +12,8 @@ glabel func_80240430_C68560 /* C6857C 8024044C AFB50024 */ sw $s5, 0x24($sp) /* C68580 80240450 0200A82D */ daddu $s5, $s0, $zero /* C68584 80240454 AFB10014 */ sw $s1, 0x14($sp) -/* C68588 80240458 3C118011 */ lui $s1, 0x8011 -/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C68588 80240458 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C6858C 8024045C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C68590 80240460 AFBF0028 */ sw $ra, 0x28($sp) /* C68594 80240464 AFB20018 */ sw $s2, 0x18($sp) /* C68598 80240468 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s index 72cceee892..bfe0eaa7e8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s +++ b/asm/nonmatchings/world/area_kzn/kzn_04/C68440/func_80240758_C68888.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240758_C68888 -/* C68888 80240758 3C028011 */ lui $v0, 0x8011 -/* C6888C 8024075C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C68888 80240758 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C6888C 8024075C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C68890 80240760 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C68894 80240764 AFBF0010 */ sw $ra, 0x10($sp) /* C68898 80240768 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s index 4dc454419d..595e9bc7eb 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240120_C76E00.s @@ -12,8 +12,8 @@ glabel func_80240120_C76E00 /* C76E1C 8024013C AFB50024 */ sw $s5, 0x24($sp) /* C76E20 80240140 0200A82D */ daddu $s5, $s0, $zero /* C76E24 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* C76E28 80240148 3C118011 */ lui $s1, 0x8011 -/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* C76E28 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* C76E2C 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* C76E30 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* C76E34 80240154 AFB20018 */ sw $s2, 0x18($sp) /* C76E38 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s index 0508dc7eed..82da4bb2f8 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s +++ b/asm/nonmatchings/world/area_kzn/kzn_09/C76CE0/func_80240448_C77128.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_C77128 -/* C77128 80240448 3C028011 */ lui $v0, 0x8011 -/* C7712C 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C77128 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C7712C 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C77130 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* C77134 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* C77138 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s index 5fc4cae48e..83315e428b 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s +++ b/asm/nonmatchings/world/area_kzn/kzn_11/C804B0/func_80240310_C804B0.s @@ -42,8 +42,8 @@ glabel func_80240310_C804B0 /* C80540 802403A0 2442EFC8 */ addiu $v0, $v0, %lo(gPlayerStatus) /* C80544 802403A4 E440001C */ swc1 $f0, 0x1c($v0) .L802403A8: -/* C80548 802403A8 3C028011 */ lui $v0, 0x8011 -/* C8054C 802403AC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* C80548 802403A8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* C8054C 802403AC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* C80550 802403B0 1040000E */ beqz $v0, .L802403EC /* C80554 802403B4 00000000 */ nop /* C80558 802403B8 0C00EABB */ jal get_npc_unsafe diff --git a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s index 34b66ddccc..f5db5f7529 100644 --- a/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s +++ b/asm/nonmatchings/world/area_mac/mac_00/7EB340/func_80242224_7ECF34.s @@ -5,8 +5,8 @@ glabel func_80242224_7ECF34 /* 7ECF34 80242224 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 7ECF38 80242228 24020001 */ addiu $v0, $zero, 1 /* 7ECF3C 8024222C AFBF0010 */ sw $ra, 0x10($sp) -/* 7ECF40 80242230 3C018011 */ lui $at, 0x8011 -/* 7ECF44 80242234 A022F292 */ sb $v0, -0xd6e($at) +/* 7ECF40 80242230 3C018011 */ lui $at, %hi(gPlayerData+0x2) +/* 7ECF44 80242234 A022F292 */ sb $v0, %lo(gPlayerData+0x2)($at) /* 7ECF48 80242238 0C03A6DB */ jal sync_status_menu /* 7ECF4C 8024223C 00000000 */ nop /* 7ECF50 80242240 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s index 9fe30cc31d..9ab507f9fd 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s +++ b/asm/nonmatchings/world/area_mgm/mgm_01/E12930/func_802416CC_E13E2C.s @@ -4,8 +4,8 @@ glabel func_802416CC_E13E2C /* E13E2C 802416CC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E13E30 802416D0 3C05FE36 */ lui $a1, 0xfe36 -/* E13E34 802416D4 3C068011 */ lui $a2, 0x8011 -/* E13E38 802416D8 84C6F29C */ lh $a2, -0xd64($a2) +/* E13E34 802416D4 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E13E38 802416D8 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E13E3C 802416DC AFBF0010 */ sw $ra, 0x10($sp) /* E13E40 802416E0 0C0B2026 */ jal set_variable /* E13E44 802416E4 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s index 11f9e63790..9ec8c4b87f 100644 --- a/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s +++ b/asm/nonmatchings/world/area_mgm/mgm_02/E15D80/func_80242314_E18094.s @@ -4,8 +4,8 @@ glabel func_80242314_E18094 /* E18094 80242314 27BDFFE8 */ addiu $sp, $sp, -0x18 /* E18098 80242318 3C05FE36 */ lui $a1, 0xfe36 -/* E1809C 8024231C 3C068011 */ lui $a2, 0x8011 -/* E180A0 80242320 84C6F29C */ lh $a2, -0xd64($a2) +/* E1809C 8024231C 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* E180A0 80242320 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* E180A4 80242324 AFBF0010 */ sw $ra, 0x10($sp) /* E180A8 80242328 0C0B2026 */ jal set_variable /* E180AC 8024232C 34A53C8A */ ori $a1, $a1, 0x3c8a diff --git a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s index f53c31221c..edc2d8a84b 100644 --- a/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s +++ b/asm/nonmatchings/world/area_nok/nok_11/9F4A40/func_80241F08_9F6948.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241F08_9F6948 -/* 9F6948 80241F08 3C028011 */ lui $v0, 0x8011 -/* 9F694C 80241F0C 8442F29C */ lh $v0, -0xd64($v0) +/* 9F6948 80241F08 3C028011 */ lui $v0, %hi(gPlayerData+0xC) +/* 9F694C 80241F0C 8442F29C */ lh $v0, %lo(gPlayerData+0xC)($v0) /* 9F6950 80241F10 28420064 */ slti $v0, $v0, 0x64 /* 9F6954 80241F14 14400003 */ bnez $v0, .L80241F24 /* 9F6958 80241F18 24020001 */ addiu $v0, $zero, 1 diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s index bdd6db4f0b..8395e83a4f 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_802408B0_DDD0E0.s @@ -12,8 +12,8 @@ glabel func_802408B0_DDD0E0 /* DDD0FC 802408CC AFB50024 */ sw $s5, 0x24($sp) /* DDD100 802408D0 0200A82D */ daddu $s5, $s0, $zero /* DDD104 802408D4 AFB10014 */ sw $s1, 0x14($sp) -/* DDD108 802408D8 3C118011 */ lui $s1, 0x8011 -/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, -0xd68 +/* DDD108 802408D8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* DDD10C 802408DC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* DDD110 802408E0 AFBF0028 */ sw $ra, 0x28($sp) /* DDD114 802408E4 AFB20018 */ sw $s2, 0x18($sp) /* DDD118 802408E8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s index 9f71ad3c2a..fcf58055c1 100644 --- a/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s +++ b/asm/nonmatchings/world/area_omo/omo_11/DDCFC0/func_80240BD8_DDD408.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240BD8_DDD408 -/* DDD408 80240BD8 3C028011 */ lui $v0, 0x8011 -/* DDD40C 80240BDC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* DDD408 80240BD8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* DDD40C 80240BDC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* DDD410 80240BE0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* DDD414 80240BE4 AFBF0010 */ sw $ra, 0x10($sp) /* DDD418 80240BE8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s index 992bb5f768..1ca8e08a15 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240120_D2FDA0.s @@ -12,8 +12,8 @@ glabel func_80240120_D2FDA0 /* D2FDBC 8024013C AFB50024 */ sw $s5, 0x24($sp) /* D2FDC0 80240140 0200A82D */ daddu $s5, $s0, $zero /* D2FDC4 80240144 AFB10014 */ sw $s1, 0x14($sp) -/* D2FDC8 80240148 3C118011 */ lui $s1, 0x8011 -/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, -0xd68 +/* D2FDC8 80240148 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* D2FDCC 8024014C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* D2FDD0 80240150 AFBF0028 */ sw $ra, 0x28($sp) /* D2FDD4 80240154 AFB20018 */ sw $s2, 0x18($sp) /* D2FDD8 80240158 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s index 0847937065..4b92b691f8 100644 --- a/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s +++ b/asm/nonmatchings/world/area_sam/sam_08/D2FC80/func_80240448_D300C8.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240448_D300C8 -/* D300C8 80240448 3C028011 */ lui $v0, 0x8011 -/* D300CC 8024044C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* D300C8 80240448 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* D300CC 8024044C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* D300D0 80240450 27BDFFE8 */ addiu $sp, $sp, -0x18 /* D300D4 80240454 AFBF0010 */ sw $ra, 0x10($sp) /* D300D8 80240458 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s index dfcc790296..f8c1b51d98 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802401A0_954160.s @@ -12,8 +12,8 @@ glabel func_802401A0_954160 /* 95417C 802401BC AFB50024 */ sw $s5, 0x24($sp) /* 954180 802401C0 0200A82D */ daddu $s5, $s0, $zero /* 954184 802401C4 AFB10014 */ sw $s1, 0x14($sp) -/* 954188 802401C8 3C118011 */ lui $s1, 0x8011 -/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 954188 802401C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 95418C 802401CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 954190 802401D0 AFBF0028 */ sw $ra, 0x28($sp) /* 954194 802401D4 AFB20018 */ sw $s2, 0x18($sp) /* 954198 802401D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s index 8bf79961fa..44ffb326cc 100644 --- a/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s +++ b/asm/nonmatchings/world/area_sbk/sbk_56/953FC0/func_802404C8_954488.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802404C8_954488 -/* 954488 802404C8 3C028011 */ lui $v0, 0x8011 -/* 95448C 802404CC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 954488 802404C8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 95448C 802404CC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 954490 802404D0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 954494 802404D4 AFBF0010 */ sw $ra, 0x10($sp) /* 954498 802404D8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s index f012d08dc5..0456b51d0e 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240400_879FE0.s @@ -12,8 +12,8 @@ glabel func_80240400_879FE0 /* 879FFC 8024041C AFB50024 */ sw $s5, 0x24($sp) /* 87A000 80240420 0200A82D */ daddu $s5, $s0, $zero /* 87A004 80240424 AFB10014 */ sw $s1, 0x14($sp) -/* 87A008 80240428 3C118011 */ lui $s1, 0x8011 -/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 87A008 80240428 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 87A00C 8024042C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 87A010 80240430 AFBF0028 */ sw $ra, 0x28($sp) /* 87A014 80240434 AFB20018 */ sw $s2, 0x18($sp) /* 87A018 80240438 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s index 882caca4b4..31dd9f6013 100644 --- a/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s +++ b/asm/nonmatchings/world/area_tik/tik_07/879BE0/func_80240728_87A308.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240728_87A308 -/* 87A308 80240728 3C028011 */ lui $v0, 0x8011 -/* 87A30C 8024072C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 87A308 80240728 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 87A30C 8024072C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 87A310 80240730 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 87A314 80240734 AFBF0010 */ sw $ra, 0x10($sp) /* 87A318 80240738 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s index baf65714b0..4316a071b1 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_802407A0_886B60.s @@ -12,8 +12,8 @@ glabel func_802407A0_886B60 /* 886B7C 802407BC AFB50024 */ sw $s5, 0x24($sp) /* 886B80 802407C0 0200A82D */ daddu $s5, $s0, $zero /* 886B84 802407C4 AFB10014 */ sw $s1, 0x14($sp) -/* 886B88 802407C8 3C118011 */ lui $s1, 0x8011 -/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, -0xd68 +/* 886B88 802407C8 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 886B8C 802407CC 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 886B90 802407D0 AFBF0028 */ sw $ra, 0x28($sp) /* 886B94 802407D4 AFB20018 */ sw $s2, 0x18($sp) /* 886B98 802407D8 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s index ccdcc41a3c..848ec6f9a2 100644 --- a/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s +++ b/asm/nonmatchings/world/area_tik/tik_10/8866D0/func_80240AC8_886E88.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AC8_886E88 -/* 886E88 80240AC8 3C028011 */ lui $v0, 0x8011 -/* 886E8C 80240ACC 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 886E88 80240AC8 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 886E8C 80240ACC 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 886E90 80240AD0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 886E94 80240AD4 AFBF0010 */ sw $ra, 0x10($sp) /* 886E98 80240AD8 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s index f175cb7772..3b5c3812b5 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80240D3C_88990C.s @@ -12,8 +12,8 @@ glabel func_80240D3C_88990C /* 889928 80240D58 AFB50024 */ sw $s5, 0x24($sp) /* 88992C 80240D5C 0200A82D */ daddu $s5, $s0, $zero /* 889930 80240D60 AFB10014 */ sw $s1, 0x14($sp) -/* 889934 80240D64 3C118011 */ lui $s1, 0x8011 -/* 889938 80240D68 2631F298 */ addiu $s1, $s1, -0xd68 +/* 889934 80240D64 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 889938 80240D68 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 88993C 80240D6C AFBF0028 */ sw $ra, 0x28($sp) /* 889940 80240D70 AFB20018 */ sw $s2, 0x18($sp) /* 889944 80240D74 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s index 0a9d47f416..1d3b0c3706 100644 --- a/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s +++ b/asm/nonmatchings/world/area_tik/tik_12/8891C0/func_80241064_889C34.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80241064_889C34 -/* 889C34 80241064 3C028011 */ lui $v0, 0x8011 -/* 889C38 80241068 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 889C34 80241064 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 889C38 80241068 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 889C3C 8024106C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 889C40 80241070 AFBF0010 */ sw $ra, 0x10($sp) /* 889C44 80241074 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s index 6af3cd00aa..71b84ffbed 100644 --- a/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s +++ b/asm/nonmatchings/world/area_tik/tik_15/890190/func_80240AD0_890670.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240AD0_890670 -/* 890670 80240AD0 3C068011 */ lui $a2, 0x8011 -/* 890674 80240AD4 84C6F29C */ lh $a2, -0xd64($a2) +/* 890670 80240AD0 3C068011 */ lui $a2, %hi(gPlayerData+0xC) +/* 890674 80240AD4 84C6F29C */ lh $a2, %lo(gPlayerData+0xC)($a2) /* 890678 80240AD8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 89067C 80240ADC AFBF0010 */ sw $ra, 0x10($sp) /* 890680 80240AE0 8C82000C */ lw $v0, 0xc($a0) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s index 809235df88..c35cdb854f 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240150_892B70.s @@ -12,8 +12,8 @@ glabel func_80240150_892B70 /* 892B8C 8024016C AFB50024 */ sw $s5, 0x24($sp) /* 892B90 80240170 0200A82D */ daddu $s5, $s0, $zero /* 892B94 80240174 AFB10014 */ sw $s1, 0x14($sp) -/* 892B98 80240178 3C118011 */ lui $s1, 0x8011 -/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 892B98 80240178 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 892B9C 8024017C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 892BA0 80240180 AFBF0028 */ sw $ra, 0x28($sp) /* 892BA4 80240184 AFB20018 */ sw $s2, 0x18($sp) /* 892BA8 80240188 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s index fc1c5daadf..fa7adf807c 100644 --- a/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s +++ b/asm/nonmatchings/world/area_tik/tik_17/892A50/func_80240478_892E98.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240478_892E98 -/* 892E98 80240478 3C028011 */ lui $v0, 0x8011 -/* 892E9C 8024047C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 892E98 80240478 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 892E9C 8024047C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 892EA0 80240480 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 892EA4 80240484 AFBF0010 */ sw $ra, 0x10($sp) /* 892EA8 80240488 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s index b4830cf40d..9d6fab67d9 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240710_897CF0.s @@ -12,8 +12,8 @@ glabel func_80240710_897CF0 /* 897D0C 8024072C AFB50024 */ sw $s5, 0x24($sp) /* 897D10 80240730 0200A82D */ daddu $s5, $s0, $zero /* 897D14 80240734 AFB10014 */ sw $s1, 0x14($sp) -/* 897D18 80240738 3C118011 */ lui $s1, 0x8011 -/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, -0xd68 +/* 897D18 80240738 3C118011 */ lui $s1, %hi(gPlayerData+0x8) +/* 897D1C 8024073C 2631F298 */ addiu $s1, $s1, %lo(gPlayerData+0x8) /* 897D20 80240740 AFBF0028 */ sw $ra, 0x28($sp) /* 897D24 80240744 AFB20018 */ sw $s2, 0x18($sp) /* 897D28 80240748 8E6200B4 */ lw $v0, 0xb4($s3) diff --git a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s index b70f6286fe..5e8d297207 100644 --- a/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s +++ b/asm/nonmatchings/world/area_tik/tik_19/897BD0/func_80240A38_898018.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240A38_898018 -/* 898018 80240A38 3C028011 */ lui $v0, 0x8011 -/* 89801C 80240A3C 8042F2A2 */ lb $v0, -0xd5e($v0) +/* 898018 80240A38 3C028011 */ lui $v0, %hi(gPlayerData+0x12) +/* 89801C 80240A3C 8042F2A2 */ lb $v0, %lo(gPlayerData+0x12)($v0) /* 898020 80240A40 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 898024 80240A44 AFBF0010 */ sw $ra, 0x10($sp) /* 898028 80240A48 00021100 */ sll $v0, $v0, 4 diff --git a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s index 2ec406ce53..b9206ebf5f 100644 --- a/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s +++ b/asm/nonmatchings/world/area_trd/trd_10/9C3130/func_80240820_9C3130.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_80240820_9C3130 -/* 9C3130 80240820 3C038011 */ lui $v1, 0x8011 -/* 9C3134 80240824 8063F2A2 */ lb $v1, -0xd5e($v1) +/* 9C3130 80240820 3C038011 */ lui $v1, %hi(gPlayerData+0x12) +/* 9C3134 80240824 8063F2A2 */ lb $v1, %lo(gPlayerData+0x12)($v1) /* 9C3138 80240828 24020003 */ addiu $v0, $zero, 3 /* 9C313C 8024082C 54620003 */ bnel $v1, $v0, .L8024083C /* 9C3140 80240830 AC800084 */ sw $zero, 0x84($a0) diff --git a/requirements.txt b/requirements.txt index 361a2122c4..679782c268 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ capstone PyYAML lark-parser +python-ranges diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index dddb3344c8..7026becfac 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -692,6 +692,7 @@ enable_partner_ai = 0x800EF328; clear_partner_move_history = 0x800EF45C; draw_submenu_title = 0x800F4648; draw_box = 0x800F52E0; +gPlayerData = 0x8010F290; // size:0x340 update_entities = 0x8010F6D0; update_shadows = 0x8010FA98; render_entities = 0x8010FEB4; From 3a134d6a7d5f5fb2166708e365e528ba4f3579f7 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 18:37:28 -0500 Subject: [PATCH 35/45] gPlayerStatus offsets --- asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s | 4 ++-- asm/nonmatchings/code_FBE10/ShowEmote.s | 4 ++-- .../world/area_isk/isk_10/988B60/func_80240D38_989898.s | 4 ++-- .../world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s | 4 ++-- .../world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s | 4 ++-- .../world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s | 4 ++-- .../world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s | 4 ++-- .../world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s | 4 ++-- .../world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s | 4 ++-- .../world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s | 4 ++-- .../world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s | 4 ++-- .../world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s | 4 ++-- .../world/area_kkj/kkj_16/AED410/func_80240028_AED438.s | 4 ++-- .../world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s | 4 ++-- .../world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s | 4 ++-- .../world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s | 4 ++-- .../world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s | 4 ++-- .../world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s | 4 ++-- .../world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s | 4 ++-- .../world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s | 4 ++-- .../world/area_osr/osr_02/AB2190/func_80240020_AB2190.s | 4 ++-- .../world/area_osr/osr_02/AB2290/func_80240120_AB2290.s | 4 ++-- .../world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s | 4 ++-- tools/symbol_addrs.txt | 1 + 24 files changed, 47 insertions(+), 46 deletions(-) diff --git a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s index e87865cbe0..ba61951dcc 100644 --- a/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s +++ b/asm/nonmatchings/code_105700_len_2130/func_802E3E9C.s @@ -2,8 +2,8 @@ .set noreorder # don't insert nops after branches glabel func_802E3E9C -/* 10571C 802E3E9C 3C028011 */ lui $v0, 0x8011 -/* 105720 802E3EA0 8C42EFCC */ lw $v0, -0x1034($v0) +/* 10571C 802E3E9C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x4) +/* 105720 802E3EA0 8C42EFCC */ lw $v0, %lo(gPlayerStatus+0x4)($v0) /* 105724 802E3EA4 9083000B */ lbu $v1, 0xb($a0) /* 105728 802E3EA8 30420001 */ andi $v0, $v0, 1 /* 10572C 802E3EAC 50400007 */ beql $v0, $zero, .L802E3ECC diff --git a/asm/nonmatchings/code_FBE10/ShowEmote.s b/asm/nonmatchings/code_FBE10/ShowEmote.s index 1d1d874dae..d78e090254 100644 --- a/asm/nonmatchings/code_FBE10/ShowEmote.s +++ b/asm/nonmatchings/code_FBE10/ShowEmote.s @@ -66,8 +66,8 @@ glabel ShowEmote /* FC344 802D7994 080B5E9E */ j .L802D7A78 /* FC348 802D7998 4600B106 */ mov.s $f4, $f22 .L802D799C: -/* FC34C 802D799C 3C028011 */ lui $v0, 0x8011 -/* FC350 802D79A0 9442F078 */ lhu $v0, -0xf88($v0) +/* FC34C 802D799C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* FC350 802D79A0 9442F078 */ lhu $v0, %lo(gPlayerStatus+0xB0)($v0) /* FC354 802D79A4 34A55556 */ ori $a1, $a1, 0x5556 /* FC358 802D79A8 00021400 */ sll $v0, $v0, 0x10 /* FC35C 802D79AC 00022403 */ sra $a0, $v0, 0x10 diff --git a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s index 8021cc8534..02b81e54e7 100644 --- a/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s +++ b/asm/nonmatchings/world/area_isk/isk_10/988B60/func_80240D38_989898.s @@ -3,8 +3,8 @@ glabel func_80240D38_989898 /* 989898 80240D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 98989C 80240D3C 3C028011 */ lui $v0, 0x8011 -/* 9898A0 80240D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* 98989C 80240D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 9898A0 80240D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 9898A4 80240D44 3C018024 */ lui $at, 0x8024 /* 9898A8 80240D48 D4201EA0 */ ldc1 $f0, 0x1ea0($at) /* 9898AC 80240D4C 2406FFFF */ addiu $a2, $zero, -1 diff --git a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s index 0cc6c4b83c..3e46faef59 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s +++ b/asm/nonmatchings/world/area_iwa/iwa_03/918BB0/func_802402BC_918E6C.s @@ -3,8 +3,8 @@ glabel func_802402BC_918E6C /* 918E6C 802402BC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 918E70 802402C0 3C028011 */ lui $v0, 0x8011 -/* 918E74 802402C4 8442EFE0 */ lh $v0, -0x1020($v0) +/* 918E70 802402C0 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 918E74 802402C4 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 918E78 802402C8 3C014069 */ lui $at, 0x4069 /* 918E7C 802402CC 44810800 */ mtc1 $at, $f1 /* 918E80 802402D0 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s index 330f487e77..81b2d5b654 100644 --- a/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s +++ b/asm/nonmatchings/world/area_iwa/iwa_04/91B8E0/func_80240000_91B8E0.s @@ -3,8 +3,8 @@ glabel func_80240000_91B8E0 /* 91B8E0 80240000 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 91B8E4 80240004 3C028011 */ lui $v0, 0x8011 -/* 91B8E8 80240008 8442EFE0 */ lh $v0, -0x1020($v0) +/* 91B8E4 80240004 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* 91B8E8 80240008 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* 91B8EC 8024000C 3C01C059 */ lui $at, 0xc059 /* 91B8F0 80240010 44810800 */ mtc1 $at, $f1 /* 91B8F4 80240014 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s index 3a055bd399..a3d711160f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACAB20/func_80240034_ACAB54.s @@ -11,8 +11,8 @@ glabel func_80240034_ACAB54 /* ACAB6C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACAB70 80240050 44021000 */ mfc1 $v0, $f2 /* ACAB74 80240054 00000000 */ nop -/* ACAB78 80240058 3C018011 */ lui $at, 0x8011 -/* ACAB7C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACAB78 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACAB7C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACAB80 80240060 24020002 */ addiu $v0, $zero, 2 /* ACAB84 80240064 03E00008 */ jr $ra /* ACAB88 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s index 9d39c1729e..a1a360bf0d 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s +++ b/asm/nonmatchings/world/area_kkj/kkj_10/ACB3C0/func_80240F18_ACBA38.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACBA38 /* ACBA38 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACBA3C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACBA40 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACBA44 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACBA48 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACBA44 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACBA48 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACBA4C 80240F2C 0C0B2026 */ jal set_variable /* ACBA50 80240F30 8C450000 */ lw $a1, ($v0) /* ACBA54 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s index e47bcd0f46..e1c1fc0aec 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE140/func_80240034_ACE174.s @@ -11,8 +11,8 @@ glabel func_80240034_ACE174 /* ACE18C 8024004C 4600008D */ trunc.w.s $f2, $f0 /* ACE190 80240050 44021000 */ mfc1 $v0, $f2 /* ACE194 80240054 00000000 */ nop -/* ACE198 80240058 3C018011 */ lui $at, 0x8011 -/* ACE19C 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* ACE198 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* ACE19C 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* ACE1A0 80240060 24020002 */ addiu $v0, $zero, 2 /* ACE1A4 80240064 03E00008 */ jr $ra /* ACE1A8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s index 175d6c8e95..2efc6d90e5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s +++ b/asm/nonmatchings/world/area_kkj/kkj_11/ACE9E0/func_80240F18_ACF058.s @@ -5,8 +5,8 @@ glabel func_80240F18_ACF058 /* ACF058 80240F18 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ACF05C 80240F1C AFBF0010 */ sw $ra, 0x10($sp) /* ACF060 80240F20 8C82000C */ lw $v0, 0xc($a0) -/* ACF064 80240F24 3C068011 */ lui $a2, 0x8011 -/* ACF068 80240F28 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ACF064 80240F24 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ACF068 80240F28 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ACF06C 80240F2C 0C0B2026 */ jal set_variable /* ACF070 80240F30 8C450000 */ lw $a1, ($v0) /* ACF074 80240F34 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s index 11f07f8482..bef78bbf6a 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4090/func_80240034_AD40C4.s @@ -11,8 +11,8 @@ glabel func_80240034_AD40C4 /* AD40DC 8024004C 4600008D */ trunc.w.s $f2, $f0 /* AD40E0 80240050 44021000 */ mfc1 $v0, $f2 /* AD40E4 80240054 00000000 */ nop -/* AD40E8 80240058 3C018011 */ lui $at, 0x8011 -/* AD40EC 8024005C A022EFD5 */ sb $v0, -0x102b($at) +/* AD40E8 80240058 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AD40EC 8024005C A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AD40F0 80240060 24020002 */ addiu $v0, $zero, 2 /* AD40F4 80240064 03E00008 */ jr $ra /* AD40F8 80240068 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s index cb509ba3dc..bd512fcc47 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s +++ b/asm/nonmatchings/world/area_kkj/kkj_12/AD4100/func_802406E8_AD4778.s @@ -5,8 +5,8 @@ glabel func_802406E8_AD4778 /* AD4778 802406E8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AD477C 802406EC AFBF0010 */ sw $ra, 0x10($sp) /* AD4780 802406F0 8C82000C */ lw $v0, 0xc($a0) -/* AD4784 802406F4 3C068011 */ lui $a2, 0x8011 -/* AD4788 802406F8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AD4784 802406F4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AD4788 802406F8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AD478C 802406FC 0C0B2026 */ jal set_variable /* AD4790 80240700 8C450000 */ lw $a1, ($v0) /* AD4794 80240704 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s index 864f81aff4..808e385b3b 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s +++ b/asm/nonmatchings/world/area_kkj/kkj_14/ADAEF0/func_802403A0_ADB240.s @@ -5,8 +5,8 @@ glabel func_802403A0_ADB240 /* ADB240 802403A0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* ADB244 802403A4 AFBF0010 */ sw $ra, 0x10($sp) /* ADB248 802403A8 8C82000C */ lw $v0, 0xc($a0) -/* ADB24C 802403AC 3C068011 */ lui $a2, 0x8011 -/* ADB250 802403B0 80C6EFD4 */ lb $a2, -0x102c($a2) +/* ADB24C 802403AC 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* ADB250 802403B0 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* ADB254 802403B4 0C0B2026 */ jal set_variable /* ADB258 802403B8 8C450000 */ lw $a1, ($v0) /* ADB25C 802403BC 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s index 7b606c7ce4..95c3f3ba12 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AED410/func_80240028_AED438.s @@ -11,8 +11,8 @@ glabel func_80240028_AED438 /* AED450 80240040 4600008D */ trunc.w.s $f2, $f0 /* AED454 80240044 44021000 */ mfc1 $v0, $f2 /* AED458 80240048 00000000 */ nop -/* AED45C 8024004C 3C018011 */ lui $at, 0x8011 -/* AED460 80240050 A022EFD5 */ sb $v0, -0x102b($at) +/* AED45C 8024004C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AED460 80240050 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AED464 80240054 24020002 */ addiu $v0, $zero, 2 /* AED468 80240058 03E00008 */ jr $ra /* AED46C 8024005C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s index 2a22d7bf22..dcb61015b5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_16/AEDC60/func_80240EC8_AEE2D8.s @@ -5,8 +5,8 @@ glabel func_80240EC8_AEE2D8 /* AEE2D8 80240EC8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AEE2DC 80240ECC AFBF0010 */ sw $ra, 0x10($sp) /* AEE2E0 80240ED0 8C82000C */ lw $v0, 0xc($a0) -/* AEE2E4 80240ED4 3C068011 */ lui $a2, 0x8011 -/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AEE2E4 80240ED4 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AEE2E8 80240ED8 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AEE2EC 80240EDC 0C0B2026 */ jal set_variable /* AEE2F0 80240EE0 8C450000 */ lw $a1, ($v0) /* AEE2F4 80240EE4 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s index 52f74b189e..12097d8f4f 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s +++ b/asm/nonmatchings/world/area_kkj/kkj_18/AF2FE0/func_80240730_AF33D0.s @@ -12,8 +12,8 @@ glabel func_80240730_AF33D0 /* AF33EC 8024074C 4600008D */ trunc.w.s $f2, $f0 /* AF33F0 80240750 44021000 */ mfc1 $v0, $f2 /* AF33F4 80240754 00000000 */ nop -/* AF33F8 80240758 3C018011 */ lui $at, 0x8011 -/* AF33FC 8024075C A022F08C */ sb $v0, -0xf74($at) +/* AF33F8 80240758 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF33FC 8024075C A022F08C */ sb $v0, %lo(gPlayerStatus+0xC4)($at) /* AF3400 80240760 A0620080 */ sb $v0, 0x80($v1) /* AF3404 80240764 8FBF0010 */ lw $ra, 0x10($sp) /* AF3408 80240768 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s index 0256e6abbd..43ea5d1890 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s +++ b/asm/nonmatchings/world/area_kkj/kkj_19/AF7C00/func_80240C10_AF8560.s @@ -10,8 +10,8 @@ glabel func_80240C10_AF8560 /* AF8574 80240C24 3C048007 */ lui $a0, %hi(gGameStatusPtr) /* AF8578 80240C28 8C84419C */ lw $a0, %lo(gGameStatusPtr)($a0) /* AF857C 80240C2C 0040182D */ daddu $v1, $v0, $zero -/* AF8580 80240C30 3C018011 */ lui $at, 0x8011 -/* AF8584 80240C34 A023F08C */ sb $v1, -0xf74($at) +/* AF8580 80240C30 3C018011 */ lui $at, %hi(gPlayerStatus+0xC4) +/* AF8584 80240C34 A023F08C */ sb $v1, %lo(gPlayerStatus+0xC4)($at) /* AF8588 80240C38 A0830080 */ sb $v1, 0x80($a0) /* AF858C 80240C3C 8FBF0010 */ lw $ra, 0x10($sp) /* AF8590 80240C40 24020002 */ addiu $v0, $zero, 2 diff --git a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s index 139246b4ac..e2880bba27 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s +++ b/asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_802405BC_AFE0FC.s @@ -5,8 +5,8 @@ glabel func_802405BC_AFE0FC /* AFE0FC 802405BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AFE100 802405C0 AFBF0010 */ sw $ra, 0x10($sp) /* AFE104 802405C4 8C82000C */ lw $v0, 0xc($a0) -/* AFE108 802405C8 3C068011 */ lui $a2, 0x8011 -/* AFE10C 802405CC 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AFE108 802405C8 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AFE10C 802405CC 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AFE110 802405D0 0C0B2026 */ jal set_variable /* AFE114 802405D4 8C450000 */ lw $a1, ($v0) /* AFE118 802405D8 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s index d6223aa13a..888e49bad5 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240048_B028C8.s @@ -11,8 +11,8 @@ glabel func_80240048_B028C8 /* B028E0 80240060 4600008D */ trunc.w.s $f2, $f0 /* B028E4 80240064 44021000 */ mfc1 $v0, $f2 /* B028E8 80240068 00000000 */ nop -/* B028EC 8024006C 3C018011 */ lui $at, 0x8011 -/* B028F0 80240070 A022EFD5 */ sb $v0, -0x102b($at) +/* B028EC 8024006C 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* B028F0 80240070 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* B028F4 80240074 24020002 */ addiu $v0, $zero, 2 /* B028F8 80240078 03E00008 */ jr $ra /* B028FC 8024007C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s index 3669829815..d829944e67 100644 --- a/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s +++ b/asm/nonmatchings/world/area_kkj/kkj_23/B028A0/func_80240758_B02FD8.s @@ -5,8 +5,8 @@ glabel func_80240758_B02FD8 /* B02FD8 80240758 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B02FDC 8024075C AFBF0010 */ sw $ra, 0x10($sp) /* B02FE0 80240760 8C82000C */ lw $v0, 0xc($a0) -/* B02FE4 80240764 3C068011 */ lui $a2, 0x8011 -/* B02FE8 80240768 80C6EFD4 */ lb $a2, -0x102c($a2) +/* B02FE4 80240764 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* B02FE8 80240768 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* B02FEC 8024076C 0C0B2026 */ jal set_variable /* B02FF0 80240770 8C450000 */ lw $a1, ($v0) /* B02FF4 80240774 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s index a16bbd1a0c..4107d94080 100644 --- a/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s +++ b/asm/nonmatchings/world/area_kzn/kzn_03/C63A10/func_80242D38_C63A48.s @@ -3,8 +3,8 @@ glabel func_80242D38_C63A48 /* C63A48 80242D38 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* C63A4C 80242D3C 3C028011 */ lui $v0, 0x8011 -/* C63A50 80242D40 8442EFE0 */ lh $v0, -0x1020($v0) +/* C63A4C 80242D3C 3C028011 */ lui $v0, %hi(gPlayerStatus+0x18) +/* C63A50 80242D40 8442EFE0 */ lh $v0, %lo(gPlayerStatus+0x18)($v0) /* C63A54 80242D44 3C014089 */ lui $at, 0x4089 /* C63A58 80242D48 44810800 */ mtc1 $at, $f1 /* C63A5C 80242D4C 44800000 */ mtc1 $zero, $f0 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s index c5260c8342..661b45cb0c 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2190/func_80240020_AB2190.s @@ -11,8 +11,8 @@ glabel func_80240020_AB2190 /* AB21A8 80240038 4600008D */ trunc.w.s $f2, $f0 /* AB21AC 8024003C 44021000 */ mfc1 $v0, $f2 /* AB21B0 80240040 00000000 */ nop -/* AB21B4 80240044 3C018011 */ lui $at, 0x8011 -/* AB21B8 80240048 A022EFD5 */ sb $v0, -0x102b($at) +/* AB21B4 80240044 3C018011 */ lui $at, %hi(gPlayerStatus+0xD) +/* AB21B8 80240048 A022EFD5 */ sb $v0, %lo(gPlayerStatus+0xD)($at) /* AB21BC 8024004C 24020002 */ addiu $v0, $zero, 2 /* AB21C0 80240050 03E00008 */ jr $ra /* AB21C4 80240054 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s index ffdeabcd3f..e2a05b2af3 100644 --- a/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s +++ b/asm/nonmatchings/world/area_osr/osr_02/AB2290/func_80240120_AB2290.s @@ -5,8 +5,8 @@ glabel func_80240120_AB2290 /* AB2290 80240120 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AB2294 80240124 AFBF0010 */ sw $ra, 0x10($sp) /* AB2298 80240128 8C82000C */ lw $v0, 0xc($a0) -/* AB229C 8024012C 3C068011 */ lui $a2, 0x8011 -/* AB22A0 80240130 80C6EFD4 */ lb $a2, -0x102c($a2) +/* AB229C 8024012C 3C068011 */ lui $a2, %hi(gPlayerStatus+0xC) +/* AB22A0 80240130 80C6EFD4 */ lb $a2, %lo(gPlayerStatus+0xC)($a2) /* AB22A4 80240134 0C0B2026 */ jal set_variable /* AB22A8 80240138 8C450000 */ lw $a1, ($v0) /* AB22AC 8024013C 8FBF0010 */ lw $ra, 0x10($sp) diff --git a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s index fe2a36ff96..9107c8a9ef 100644 --- a/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s +++ b/asm/nonmatchings/world/area_trd/trd_05/9AE700/func_80240508_9AEC08.s @@ -23,8 +23,8 @@ glabel func_80240508_9AEC08 /* 9AEC50 80240550 44103000 */ mfc1 $s0, $f6 /* 9AEC54 80240554 0C0B210B */ jal get_float_variable /* 9AEC58 80240558 0220202D */ daddu $a0, $s1, $zero -/* 9AEC5C 8024055C 3C028011 */ lui $v0, 0x8011 -/* 9AEC60 80240560 8442F078 */ lh $v0, -0xf88($v0) +/* 9AEC5C 8024055C 3C028011 */ lui $v0, %hi(gPlayerStatus+0xB0) +/* 9AEC60 80240560 8442F078 */ lh $v0, %lo(gPlayerStatus+0xB0)($v0) /* 9AEC64 80240564 3C018024 */ lui $at, 0x8024 /* 9AEC68 80240568 D4223078 */ ldc1 $f2, 0x3078($at) /* 9AEC6C 8024056C 44822000 */ mtc1 $v0, $f4 diff --git a/tools/symbol_addrs.txt b/tools/symbol_addrs.txt index 7026becfac..30190c2498 100644 --- a/tools/symbol_addrs.txt +++ b/tools/symbol_addrs.txt @@ -692,6 +692,7 @@ enable_partner_ai = 0x800EF328; clear_partner_move_history = 0x800EF45C; draw_submenu_title = 0x800F4648; draw_box = 0x800F52E0; +gPlayerStatus = 0x8010EFC8; // size:0x288 gPlayerData = 0x8010F290; // size:0x340 update_entities = 0x8010F6D0; update_shadows = 0x8010FA98; From 43245322cc33ba61d673a02687e20c4a645cdd3b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 18:43:23 -0500 Subject: [PATCH 36/45] splat update --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 037d80e00c..8430b327b1 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 037d80e00cb3aeae37bdad77bfac871036982456 +Subproject commit 8430b327b1839c3b805c4e70784023175605d26d From b545f6fc51399af830730580848a71638a35c491 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 19:03:20 -0500 Subject: [PATCH 37/45] splat bump --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 8430b327b1..bf5e3719d1 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 8430b327b1839c3b805c4e70784023175605d26d +Subproject commit bf5e3719d154d850e92a66029220ae0d6f547b75 From d6fbf1d71ea9665584a707125892e0a745d518da Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Sun, 1 Nov 2020 19:10:41 -0500 Subject: [PATCH 38/45] splat bump2 --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index bf5e3719d1..3c85092045 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit bf5e3719d154d850e92a66029220ae0d6f547b75 +Subproject commit 3c8509204537026d863002e88af9014b4ed0c5c1 From 81a672b268630876806fb15a47b853b65926714b Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 00:32:18 -0500 Subject: [PATCH 39/45] trying to fix a bug --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 3c85092045..41e1c8c74a 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 3c8509204537026d863002e88af9014b4ed0c5c1 +Subproject commit 41e1c8c74aaf40313a44f2197bd0284543d44109 From 8a614385bfb37082cd0a5dabaa8c1223b486bb22 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 00:37:04 -0500 Subject: [PATCH 40/45] trying to fix bug (2) --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 41e1c8c74a..34487bb623 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 41e1c8c74aaf40313a44f2197bd0284543d44109 +Subproject commit 34487bb6230f2fa6afa4b1c3845da4b479276337 From cee95c6d92b3a7f028c708192b523b4690f68e95 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 00:58:08 -0500 Subject: [PATCH 41/45] (3) --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 34487bb623..094d6cc622 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 34487bb6230f2fa6afa4b1c3845da4b479276337 +Subproject commit 094d6cc62212f59a375f070f09e4380736526abd From f88b57873dd8b93217dce936f71e1875de105057 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 11:05:38 -0500 Subject: [PATCH 42/45] 4 --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 094d6cc622..bc9b7e9f0e 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 094d6cc62212f59a375f070f09e4380736526abd +Subproject commit bc9b7e9f0ef0afab6a28e4faa7ab0c43cf045d83 From 134fcbfa44aeba1a2498d4e43b289b872041de67 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Mon, 2 Nov 2020 11:08:20 -0500 Subject: [PATCH 43/45] PR comment --- tools/sort_symbol_addrs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/sort_symbol_addrs.py b/tools/sort_symbol_addrs.py index 071c20706a..0e4ed32e8b 100644 --- a/tools/sort_symbol_addrs.py +++ b/tools/sort_symbol_addrs.py @@ -21,6 +21,6 @@ for line in symbol_lines: sys.exit(55) syms[addr] = line -with open("test.txt", newline="\n", mode="w") as f: +with open(file_path, newline="\n", mode="w") as f: for addr in sorted(syms): f.write(syms[addr]) From b4a19e09e5595270f07e9caed0df21fb767278fe Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Mon, 2 Nov 2020 16:39:29 +0000 Subject: [PATCH 44/45] fix splat issues --- Makefile | 9 ++---- tools/convert_image.py | 2 +- tools/n64splat | 2 +- tools/splat.yaml | 70 +++++++++++++++++++++--------------------- 4 files changed, 40 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 326fe78c20..1b38d467bd 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ submodules: split: rm -rf bin img - $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS rgba16 rgba32 ia4 ia8 ia16 i4 i8 ci4 ci8 + $(SPLAT) --modes ld bin Yay0 PaperMarioMapFS img split-%: $(SPLAT) --modes ld $* @@ -156,15 +156,12 @@ $(BUILD_DIR)/%.rgba32.png: %.png $(BUILD_DIR)/%.ci8.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ci8 $< $@ $(IMG_FLAGS) -$(BUILD_DIR)/%.ci8palette.png: %.png - @mkdir -p $(shell dirname $@) - $(PYTHON) tools/convert_image.py ci8palette $< $@ $(IMG_FLAGS) $(BUILD_DIR)/%.ci4.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ci4 $< $@ $(IMG_FLAGS) -$(BUILD_DIR)/%.ci4palette.png: %.png +$(BUILD_DIR)/%.palette.png: %.png @mkdir -p $(shell dirname $@) - $(PYTHON) tools/convert_image.py ci4palette $< $@ $(IMG_FLAGS) + $(PYTHON) tools/convert_image.py palette $< $@ $(IMG_FLAGS) $(BUILD_DIR)/%.ia4.png: %.png @mkdir -p $(shell dirname $@) $(PYTHON) tools/convert_image.py ia4 $< $@ $(IMG_FLAGS) diff --git a/tools/convert_image.py b/tools/convert_image.py index afc92d94bc..d9fc14a4d7 100755 --- a/tools/convert_image.py +++ b/tools/convert_image.py @@ -84,7 +84,7 @@ class Converter(): for a, b in iter_in_groups(row, 2): byte = (a << 4) | b f.write(byte.to_bytes(1, byteorder="big")) - elif self.mode == "ci8palette" or self.mode == "ci4palette": + elif self.mode == "palette": img.preamble(True) palette = img.palette(alpha="force") diff --git a/tools/n64splat b/tools/n64splat index bc9b7e9f0e..23a4ba2652 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit bc9b7e9f0ef0afab6a28e4faa7ab0c43cf045d83 +Subproject commit 23a4ba2652f929a71e5e6b2ff759ae63304b24aa diff --git a/tools/splat.yaml b/tools/splat.yaml index 5c3c04deb6..0d94d576d5 100644 --- a/tools/splat.yaml +++ b/tools/splat.yaml @@ -212,13 +212,13 @@ segments: - [0x8a860, "c", "code_8a860_len_3f30"] - [0x8e790, "c", "code_8e790_len_2850"] - [0x90fe0, "bin"] - - [0x93CD0, ci4, ui/hammer, 32, 32] - - [0x93ED0, ci4palette, ui/hammer] - - [0x93EF0, ci4palette, ui/hammer.disabled] + - [0x93CD0, ci4, ui/hammer, 32, 32] + - [0x93ED0, palette, ui/hammer] + - [0x93EF0, palette, ui/hammer.disabled] - [0x93FF0, bin] - - [0x9D658, rgba32, ui/stat_heart, 16, 16] + - [0x9D658, rgba32, ui/stat_heart, 16, 16] - [0x9DA58, bin] - - [0x9DA60, rgba32, ui/stat_flower, 16, 16] + - [0x9DA60, rgba32, ui/stat_flower, 16, 16] - [0x9DE60, bin] - type: code start: 0xA5DD0 @@ -276,15 +276,15 @@ segments: - [0x1086a0, "c", "code_1086a0_len_fc0"] - [0x109660, "c", "code_109660_len_1270"] - [0x10A8D0, "c", "code_10A8D0"] - - [0x10A9F0, i4, shadow/square, 16, 16] - - [0x10AA70, i4, shadow/circle, 16, 16] + - [0x10A9F0, i4, shadow/square, 16, 16] + - [0x10AA70, i4, shadow/circle, 16, 16] - [0x10AAF0, bin] - - [0x10AB70, i4, shadow/10AB70, 32, 32] - - [0x10AD70, i4, shadow/10AD70, 32, 32] + - [0x10AB70, i4, shadow/10AB70, 32, 32] + - [0x10AD70, i4, shadow/10AD70, 32, 32] - [0x10AF70, bin] # TODO - - [0x1164B8, ci8, peach_letter, 150, 105] + - [0x1164B8, ci8, peach_letter, 150, 105] - [0x11A23E, bin] - - [0x11A240, ci8palette, peach_letter] + - [0x11A240, palette, peach_letter] - [0x11A440, bin] - [0x131340, bin] - type: code @@ -298,26 +298,26 @@ segments: - [0x1421C0, "c"] - [0x1422A0, "bin"] - [0x1443F0, ci8, pause/world_map, 320, 320] - - [0x15D3F0, ci8palette, pause/world_map] + - [0x15D3F0, palette, pause/world_map] - [0x15D5F0, ci4, pause/spirits_bg, 128, 110] - - [0x15F170, ci4palette, pause/spirits_bg] + - [0x15F170, palette, pause/spirits_bg] - [0x15F270, bin] - [0x15F970, ci4, pause/banner_hp, 64, 16] - - [0x15FB70, ci4palette, pause/banner_hp] + - [0x15FB70, palette, pause/banner_hp] - [0x15FD70, ci4, pause/banner_fp, 64, 16] - - [0x15FF70, ci4palette, pause/banner_fp] + - [0x15FF70, palette, pause/banner_fp] - [0x160170, ci4, pause/banner_bp, 64, 16] - - [0x160370, ci4palette, pause/banner_bp] + - [0x160370, palette, pause/banner_bp] - [0x160570, ci4, pause/banner_boots, 48, 16] - - [0x1606F0, ci4palette, pause/banner_boots] + - [0x1606F0, palette, pause/banner_boots] - [0x1608F0, ci4, pause/banner_hammer, 48, 16] - - [0x160A70, ci4palette, pause/banner_hammer] + - [0x160A70, palette, pause/banner_hammer] - [0x160C70, ci4, pause/banner_star_energy, 48, 16] - - [0x160DF0, ci4palette, pause/banner_star_energy] + - [0x160DF0, palette, pause/banner_star_energy] - [0x160FF0, ci4, pause/available, 64, 16] - - [0x1611F0, ci4palette, pause/available] + - [0x1611F0, palette, pause/available] - [0x1613F0, ci4, pause/prompt_check_abilities, 128, 16] - - [0x1617F0, ci4palette, pause/prompt_check_abilities] + - [0x1617F0, palette, pause/prompt_check_abilities] - [0x1619F0, bin] - type: code start: 0x163400 @@ -352,20 +352,20 @@ segments: - [0x1AF230, "c"] - [0x1AF2D0, "bin"] - [0x1CC310, "bin"] # icon images and palettes, vram unknown - - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] - - [0x2051B0, rgba16, title/logo_is, 256, 122] - - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] - - [0x2191B0, ci8, title/bg_1, 264, 162] - - [0x2238C0, ci8palette, title/bg_1] - - [0x223AC0, ci8, title/bg_2, 264, 162] - - [0x22E1D0, ci8palette, title/bg_2] - - [0x22E3D0, ci8, title/bg_3, 264, 162] - - [0x238AE0, ci8palette, title/bg_3] - - [0x238CE0, ci8, title/bg_4, 264, 162] - - [0x2433F0, ci8palette, title/bg_4] - - [0x2435F0, ia8, title/tape, 128, 128] - - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] - - [0x24B5F0, ci8palette, title/bowser_silhouette] + - [0x1FE1B0, rgba16, title/logo_n64, 128, 112] + - [0x2051B0, rgba16, title/logo_is, 256, 122] + - [0x2131B0, rgba16, title/logo_nintendo, 256, 48] + - [0x2191B0, ci8, title/bg_1, 264, 162] + - [0x2238C0, palette, title/bg_1] + - [0x223AC0, ci8, title/bg_2, 264, 162] + - [0x22E1D0, palette, title/bg_2] + - [0x22E3D0, ci8, title/bg_3, 264, 162] + - [0x238AE0, palette, title/bg_3] + - [0x238CE0, ci8, title/bg_4, 264, 162] + - [0x2433F0, palette, title/bg_4] + - [0x2435F0, ia8, title/tape, 128, 128] + - [0x2475F0, ci8, title/bowser_silhouette, 128, 128] + - [0x24B5F0, palette, title/bowser_silhouette] - [0x24B7F0, bin] - type: code start: 0x3169F0 From 0c0780821ed3eecbf465d6a9ffdb871b1342745e Mon Sep 17 00:00:00 2001 From: Alex Bates <16batesa@gmail.com> Date: Mon, 2 Nov 2020 16:55:38 +0000 Subject: [PATCH 45/45] bump splat --- tools/n64splat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/n64splat b/tools/n64splat index 23a4ba2652..42c5f587eb 160000 --- a/tools/n64splat +++ b/tools/n64splat @@ -1 +1 @@ -Subproject commit 23a4ba2652f929a71e5e6b2ff759ae63304b24aa +Subproject commit 42c5f587eb8b2bc669f2710c93ff10c46ae48dc3