From e0e8885781d40288e44fe55388f08e8b99d38182 Mon Sep 17 00:00:00 2001 From: Ethan Roseman Date: Fri, 20 Nov 2020 17:45:02 -0500 Subject: [PATCH] GetEncounterEnemyIsOwner --- .../iwa_01/90FBD0/func_8024228C_91193C.s | 18 ----------------- .../kpa_03/A48720/func_80241DC4_A4A384.s | 18 ----------------- .../kpa_08/A4CAC0/func_8024141C_A4DE3C.s | 18 ----------------- .../kpa_09/A4F0A0/func_802412B4_A502B4.s | 19 ------------------ .../kpa_102/A93A50/func_80241524_A94C64.s | 18 ----------------- .../kpa_111/A99590/func_80241384_A9A914.s | 19 ------------------ .../kpa_115/A9ED40/func_80241384_AA00C4.s | 19 ------------------ .../kpa_50/A609D0/func_80241214_A61BE4.s | 18 ----------------- .../kpa_51/A640E0/func_802413CC_A6545C.s | 18 ----------------- .../kpa_52/A671E0/func_802412F4_A683F4.s | 19 ------------------ .../kpa_61/A6E6F0/func_802422B8_A70698.s | 18 ----------------- .../omo_02/D9D510/func_80242B70_DA0040.s | 20 ------------------- .../omo_09/DCD6B0/func_80243580_DD0250.s | 18 ----------------- .../omo_17/DEF400/func_802436D4_DF2574.s | 19 ------------------ src/world/area_iwa/iwa_01/90FBD0.c | 2 +- src/world/area_kpa/kpa_03/A48720.c | 2 +- src/world/area_kpa/kpa_08/A4CAC0.c | 2 +- src/world/area_kpa/kpa_09/A4F0A0.c | 2 +- src/world/area_kpa/kpa_102/A93A50.c | 3 ++- src/world/area_kpa/kpa_111/A99590.c | 2 +- src/world/area_kpa/kpa_115/A9ED40.c | 2 +- src/world/area_kpa/kpa_50/A609D0.c | 2 +- src/world/area_kpa/kpa_51/A640E0.c | 2 +- src/world/area_kpa/kpa_52/A671E0.c | 2 +- src/world/area_kpa/kpa_61/A6E6F0.c | 2 +- src/world/area_omo/omo_02/D9D510.c | 2 +- src/world/area_omo/omo_09/DCD6B0.c | 2 +- src/world/area_omo/omo_17/DEF400.c | 2 +- .../common/GetEncounterEnemyIsOwner.inc.c | 9 +++++++++ 29 files changed, 24 insertions(+), 273 deletions(-) delete mode 100644 asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s delete mode 100644 asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s delete mode 100644 asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s create mode 100644 src/world/common/GetEncounterEnemyIsOwner.inc.c diff --git a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s b/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s deleted file mode 100644 index 0807b080c8..0000000000 --- a/asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_8024228C_91193C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024228C_91193C -/* 91193C 8024228C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 911940 80242290 3C05FE36 */ lui $a1, 0xfe36 -/* 911944 80242294 AFBF0010 */ sw $ra, 0x10($sp) -/* 911948 80242298 8C820148 */ lw $v0, 0x148($a0) -/* 91194C 8024229C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* 911950 802422A0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* 911954 802422A4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* 911958 802422A8 00C23026 */ xor $a2, $a2, $v0 -/* 91195C 802422AC 0C0B2026 */ jal set_variable -/* 911960 802422B0 2CC60001 */ sltiu $a2, $a2, 1 -/* 911964 802422B4 8FBF0010 */ lw $ra, 0x10($sp) -/* 911968 802422B8 24020002 */ addiu $v0, $zero, 2 -/* 91196C 802422BC 03E00008 */ jr $ra -/* 911970 802422C0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s b/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s deleted file mode 100644 index fc4c63b986..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_03/A48720/func_80241DC4_A4A384.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241DC4_A4A384 -/* A4A384 80241DC4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4A388 80241DC8 3C05FE36 */ lui $a1, 0xfe36 -/* A4A38C 80241DCC AFBF0010 */ sw $ra, 0x10($sp) -/* A4A390 80241DD0 8C820148 */ lw $v0, 0x148($a0) -/* A4A394 80241DD4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A4A398 80241DD8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A4A39C 80241DDC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4A3A0 80241DE0 00C23026 */ xor $a2, $a2, $v0 -/* A4A3A4 80241DE4 0C0B2026 */ jal set_variable -/* A4A3A8 80241DE8 2CC60001 */ sltiu $a2, $a2, 1 -/* A4A3AC 80241DEC 8FBF0010 */ lw $ra, 0x10($sp) -/* A4A3B0 80241DF0 24020002 */ addiu $v0, $zero, 2 -/* A4A3B4 80241DF4 03E00008 */ jr $ra -/* A4A3B8 80241DF8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s b/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s deleted file mode 100644 index 210996abf8..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_08/A4CAC0/func_8024141C_A4DE3C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8024141C_A4DE3C -/* A4DE3C 8024141C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A4DE40 80241420 3C05FE36 */ lui $a1, 0xfe36 -/* A4DE44 80241424 AFBF0010 */ sw $ra, 0x10($sp) -/* A4DE48 80241428 8C820148 */ lw $v0, 0x148($a0) -/* A4DE4C 8024142C 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A4DE50 80241430 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A4DE54 80241434 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A4DE58 80241438 00C23026 */ xor $a2, $a2, $v0 -/* A4DE5C 8024143C 0C0B2026 */ jal set_variable -/* A4DE60 80241440 2CC60001 */ sltiu $a2, $a2, 1 -/* A4DE64 80241444 8FBF0010 */ lw $ra, 0x10($sp) -/* A4DE68 80241448 24020002 */ addiu $v0, $zero, 2 -/* A4DE6C 8024144C 03E00008 */ jr $ra -/* A4DE70 80241450 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s b/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s deleted file mode 100644 index e123baebee..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_09/A4F0A0/func_802412B4_A502B4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412B4_A502B4 -/* A502B4 802412B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A502B8 802412B8 3C05FE36 */ lui $a1, 0xfe36 -/* A502BC 802412BC AFBF0010 */ sw $ra, 0x10($sp) -/* A502C0 802412C0 8C820148 */ lw $v0, 0x148($a0) -/* A502C4 802412C4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A502C8 802412C8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A502CC 802412CC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A502D0 802412D0 00C23026 */ xor $a2, $a2, $v0 -/* A502D4 802412D4 0C0B2026 */ jal set_variable -/* A502D8 802412D8 2CC60001 */ sltiu $a2, $a2, 1 -/* A502DC 802412DC 8FBF0010 */ lw $ra, 0x10($sp) -/* A502E0 802412E0 24020002 */ addiu $v0, $zero, 2 -/* A502E4 802412E4 03E00008 */ jr $ra -/* A502E8 802412E8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A502EC 802412EC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s b/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s deleted file mode 100644 index 2c0932f688..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_102/A93A50/func_80241524_A94C64.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241524_A94C64 -/* A94C64 80241524 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A94C68 80241528 3C05FE36 */ lui $a1, 0xfe36 -/* A94C6C 8024152C AFBF0010 */ sw $ra, 0x10($sp) -/* A94C70 80241530 8C820148 */ lw $v0, 0x148($a0) -/* A94C74 80241534 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A94C78 80241538 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A94C7C 8024153C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A94C80 80241540 00C23026 */ xor $a2, $a2, $v0 -/* A94C84 80241544 0C0B2026 */ jal set_variable -/* A94C88 80241548 2CC60001 */ sltiu $a2, $a2, 1 -/* A94C8C 8024154C 8FBF0010 */ lw $ra, 0x10($sp) -/* A94C90 80241550 24020002 */ addiu $v0, $zero, 2 -/* A94C94 80241554 03E00008 */ jr $ra -/* A94C98 80241558 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s b/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s deleted file mode 100644 index 4aff6c4dfa..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_111/A99590/func_80241384_A9A914.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384_A9A914 -/* A9A914 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A9A918 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* A9A91C 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* A9A920 80241390 8C820148 */ lw $v0, 0x148($a0) -/* A9A924 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A9A928 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A9A92C 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A9A930 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* A9A934 802413A4 0C0B2026 */ jal set_variable -/* A9A938 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* A9A93C 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* A9A940 802413B0 24020002 */ addiu $v0, $zero, 2 -/* A9A944 802413B4 03E00008 */ jr $ra -/* A9A948 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* A9A94C 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s b/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s deleted file mode 100644 index 6446b26c99..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_115/A9ED40/func_80241384_AA00C4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241384_AA00C4 -/* AA00C4 80241384 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AA00C8 80241388 3C05FE36 */ lui $a1, 0xfe36 -/* AA00CC 8024138C AFBF0010 */ sw $ra, 0x10($sp) -/* AA00D0 80241390 8C820148 */ lw $v0, 0x148($a0) -/* AA00D4 80241394 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* AA00D8 80241398 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* AA00DC 8024139C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* AA00E0 802413A0 00C23026 */ xor $a2, $a2, $v0 -/* AA00E4 802413A4 0C0B2026 */ jal set_variable -/* AA00E8 802413A8 2CC60001 */ sltiu $a2, $a2, 1 -/* AA00EC 802413AC 8FBF0010 */ lw $ra, 0x10($sp) -/* AA00F0 802413B0 24020002 */ addiu $v0, $zero, 2 -/* AA00F4 802413B4 03E00008 */ jr $ra -/* AA00F8 802413B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* AA00FC 802413BC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s b/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s deleted file mode 100644 index 8bc4b14a03..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_50/A609D0/func_80241214_A61BE4.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80241214_A61BE4 -/* A61BE4 80241214 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A61BE8 80241218 3C05FE36 */ lui $a1, 0xfe36 -/* A61BEC 8024121C AFBF0010 */ sw $ra, 0x10($sp) -/* A61BF0 80241220 8C820148 */ lw $v0, 0x148($a0) -/* A61BF4 80241224 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A61BF8 80241228 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A61BFC 8024122C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A61C00 80241230 00C23026 */ xor $a2, $a2, $v0 -/* A61C04 80241234 0C0B2026 */ jal set_variable -/* A61C08 80241238 2CC60001 */ sltiu $a2, $a2, 1 -/* A61C0C 8024123C 8FBF0010 */ lw $ra, 0x10($sp) -/* A61C10 80241240 24020002 */ addiu $v0, $zero, 2 -/* A61C14 80241244 03E00008 */ jr $ra -/* A61C18 80241248 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s b/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s deleted file mode 100644 index 614677514b..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_51/A640E0/func_802413CC_A6545C.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802413CC_A6545C -/* A6545C 802413CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A65460 802413D0 3C05FE36 */ lui $a1, 0xfe36 -/* A65464 802413D4 AFBF0010 */ sw $ra, 0x10($sp) -/* A65468 802413D8 8C820148 */ lw $v0, 0x148($a0) -/* A6546C 802413DC 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A65470 802413E0 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A65474 802413E4 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A65478 802413E8 00C23026 */ xor $a2, $a2, $v0 -/* A6547C 802413EC 0C0B2026 */ jal set_variable -/* A65480 802413F0 2CC60001 */ sltiu $a2, $a2, 1 -/* A65484 802413F4 8FBF0010 */ lw $ra, 0x10($sp) -/* A65488 802413F8 24020002 */ addiu $v0, $zero, 2 -/* A6548C 802413FC 03E00008 */ jr $ra -/* A65490 80241400 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s b/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s deleted file mode 100644 index 2b4c656970..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_52/A671E0/func_802412F4_A683F4.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802412F4_A683F4 -/* A683F4 802412F4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A683F8 802412F8 3C05FE36 */ lui $a1, 0xfe36 -/* A683FC 802412FC AFBF0010 */ sw $ra, 0x10($sp) -/* A68400 80241300 8C820148 */ lw $v0, 0x148($a0) -/* A68404 80241304 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A68408 80241308 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A6840C 8024130C 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A68410 80241310 00C23026 */ xor $a2, $a2, $v0 -/* A68414 80241314 0C0B2026 */ jal set_variable -/* A68418 80241318 2CC60001 */ sltiu $a2, $a2, 1 -/* A6841C 8024131C 8FBF0010 */ lw $ra, 0x10($sp) -/* A68420 80241320 24020002 */ addiu $v0, $zero, 2 -/* A68424 80241324 03E00008 */ jr $ra -/* A68428 80241328 27BD0018 */ addiu $sp, $sp, 0x18 -/* A6842C 8024132C 00000000 */ nop diff --git a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s b/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s deleted file mode 100644 index 5a1b21582d..0000000000 --- a/asm/nonmatchings/world/area_kpa/kpa_61/A6E6F0/func_802422B8_A70698.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802422B8_A70698 -/* A70698 802422B8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* A7069C 802422BC 3C05FE36 */ lui $a1, 0xfe36 -/* A706A0 802422C0 AFBF0010 */ sw $ra, 0x10($sp) -/* A706A4 802422C4 8C820148 */ lw $v0, 0x148($a0) -/* A706A8 802422C8 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* A706AC 802422CC 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* A706B0 802422D0 34A53C80 */ ori $a1, $a1, 0x3c80 -/* A706B4 802422D4 00C23026 */ xor $a2, $a2, $v0 -/* A706B8 802422D8 0C0B2026 */ jal set_variable -/* A706BC 802422DC 2CC60001 */ sltiu $a2, $a2, 1 -/* A706C0 802422E0 8FBF0010 */ lw $ra, 0x10($sp) -/* A706C4 802422E4 24020002 */ addiu $v0, $zero, 2 -/* A706C8 802422E8 03E00008 */ jr $ra -/* A706CC 802422EC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s b/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s deleted file mode 100644 index 434e29bc59..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_02/D9D510/func_80242B70_DA0040.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80242B70_DA0040 -/* DA0040 80242B70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DA0044 80242B74 3C05FE36 */ lui $a1, 0xfe36 -/* DA0048 80242B78 AFBF0010 */ sw $ra, 0x10($sp) -/* DA004C 80242B7C 8C820148 */ lw $v0, 0x148($a0) -/* DA0050 80242B80 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DA0054 80242B84 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DA0058 80242B88 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DA005C 80242B8C 00C23026 */ xor $a2, $a2, $v0 -/* DA0060 80242B90 0C0B2026 */ jal set_variable -/* DA0064 80242B94 2CC60001 */ sltiu $a2, $a2, 1 -/* DA0068 80242B98 8FBF0010 */ lw $ra, 0x10($sp) -/* DA006C 80242B9C 24020002 */ addiu $v0, $zero, 2 -/* DA0070 80242BA0 03E00008 */ jr $ra -/* DA0074 80242BA4 27BD0018 */ addiu $sp, $sp, 0x18 -/* DA0078 80242BA8 00000000 */ nop -/* DA007C 80242BAC 00000000 */ nop diff --git a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s b/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s deleted file mode 100644 index f7a949c140..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_09/DCD6B0/func_80243580_DD0250.s +++ /dev/null @@ -1,18 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_80243580_DD0250 -/* DD0250 80243580 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DD0254 80243584 3C05FE36 */ lui $a1, 0xfe36 -/* DD0258 80243588 AFBF0010 */ sw $ra, 0x10($sp) -/* DD025C 8024358C 8C820148 */ lw $v0, 0x148($a0) -/* DD0260 80243590 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DD0264 80243594 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DD0268 80243598 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DD026C 8024359C 00C23026 */ xor $a2, $a2, $v0 -/* DD0270 802435A0 0C0B2026 */ jal set_variable -/* DD0274 802435A4 2CC60001 */ sltiu $a2, $a2, 1 -/* DD0278 802435A8 8FBF0010 */ lw $ra, 0x10($sp) -/* DD027C 802435AC 24020002 */ addiu $v0, $zero, 2 -/* DD0280 802435B0 03E00008 */ jr $ra -/* DD0284 802435B4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s b/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s deleted file mode 100644 index 770626c909..0000000000 --- a/asm/nonmatchings/world/area_omo/omo_17/DEF400/func_802436D4_DF2574.s +++ /dev/null @@ -1,19 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_802436D4_DF2574 -/* DF2574 802436D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* DF2578 802436D8 3C05FE36 */ lui $a1, 0xfe36 -/* DF257C 802436DC AFBF0010 */ sw $ra, 0x10($sp) -/* DF2580 802436E0 8C820148 */ lw $v0, 0x148($a0) -/* DF2584 802436E4 3C06800B */ lui $a2, %hi(gCurrentEncounter+0x8C) -/* DF2588 802436E8 8CC60F9C */ lw $a2, %lo(gCurrentEncounter+0x8C)($a2) -/* DF258C 802436EC 34A53C80 */ ori $a1, $a1, 0x3c80 -/* DF2590 802436F0 00C23026 */ xor $a2, $a2, $v0 -/* DF2594 802436F4 0C0B2026 */ jal set_variable -/* DF2598 802436F8 2CC60001 */ sltiu $a2, $a2, 1 -/* DF259C 802436FC 8FBF0010 */ lw $ra, 0x10($sp) -/* DF25A0 80243700 24020002 */ addiu $v0, $zero, 2 -/* DF25A4 80243704 03E00008 */ jr $ra -/* DF25A8 80243708 27BD0018 */ addiu $sp, $sp, 0x18 -/* DF25AC 8024370C 00000000 */ nop diff --git a/src/world/area_iwa/iwa_01/90FBD0.c b/src/world/area_iwa/iwa_01/90FBD0.c index e338751117..80bae76a5c 100644 --- a/src/world/area_iwa/iwa_01/90FBD0.c +++ b/src/world/area_iwa/iwa_01/90FBD0.c @@ -38,7 +38,7 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241D70_911420); INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80241F6C_91161C); -INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_8024228C_91193C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_802422C4_911974); diff --git a/src/world/area_kpa/kpa_03/A48720.c b/src/world/area_kpa/kpa_03/A48720.c index ebb5c86a49..e0934095cb 100644 --- a/src/world/area_kpa/kpa_03/A48720.c +++ b/src/world/area_kpa/kpa_03/A48720.c @@ -44,6 +44,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D20_A4A2E0); INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241D6C_A4A32C); -INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DC4_A4A384); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_03/A48720", func_80241DFC_A4A3BC); diff --git a/src/world/area_kpa/kpa_08/A4CAC0.c b/src/world/area_kpa/kpa_08/A4CAC0.c index 65b3b813f6..ed1a8e393d 100644 --- a/src/world/area_kpa/kpa_08/A4CAC0.c +++ b/src/world/area_kpa/kpa_08/A4CAC0.c @@ -32,6 +32,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241378_A4DD98); INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_802413C4_A4DDE4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_8024141C_A4DE3C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_08/A4CAC0", func_80241454_A4DE74); diff --git a/src/world/area_kpa/kpa_09/A4F0A0.c b/src/world/area_kpa/kpa_09/A4F0A0.c index 1e2c040072..d743fdfada 100644 --- a/src/world/area_kpa/kpa_09/A4F0A0.c +++ b/src/world/area_kpa/kpa_09/A4F0A0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240B38_A4FB38); INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_80240F94_A4FF94); -INCLUDE_ASM(s32, "world/area_kpa/kpa_09/A4F0A0", func_802412B4_A502B4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_102/A93A50.c b/src/world/area_kpa/kpa_102/A93A50.c index aa2a75d518..9dfe396b46 100644 --- a/src/world/area_kpa/kpa_102/A93A50.c +++ b/src/world/area_kpa/kpa_102/A93A50.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80240DA8_A944E8); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241204_A94944); -INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80241524_A94C64); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024155C_A94C9C); @@ -58,6 +58,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243198_A968D8); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243270_A969B0); +// Should be #include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_80243504_A96C44); INCLUDE_ASM(s32, "world/area_kpa/kpa_102/A93A50", func_8024353C_A96C7C); diff --git a/src/world/area_kpa/kpa_111/A99590.c b/src/world/area_kpa/kpa_111/A99590.c index 8dce9e0b33..fa015f3ce2 100644 --- a/src/world/area_kpa/kpa_111/A99590.c +++ b/src/world/area_kpa/kpa_111/A99590.c @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80240C08_A9A198); INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241064_A9A5F4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_111/A99590", func_80241384_A9A914); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_115/A9ED40.c b/src/world/area_kpa/kpa_115/A9ED40.c index a0565dc965..18a449af2e 100644 --- a/src/world/area_kpa/kpa_115/A9ED40.c +++ b/src/world/area_kpa/kpa_115/A9ED40.c @@ -22,4 +22,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80240C08_A9F948); INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80241064_A9FDA4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_115/A9ED40", func_80241384_AA00C4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_50/A609D0.c b/src/world/area_kpa/kpa_50/A609D0.c index a6331c4ed8..bd09c0f292 100644 --- a/src/world/area_kpa/kpa_50/A609D0.c +++ b/src/world/area_kpa/kpa_50/A609D0.c @@ -18,7 +18,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240A98_A61468); INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80240EF4_A618C4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_80241214_A61BE4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_50/A609D0", func_8024124C_A61C1C); diff --git a/src/world/area_kpa/kpa_51/A640E0.c b/src/world/area_kpa/kpa_51/A640E0.c index c95cf9cf60..34a635e984 100644 --- a/src/world/area_kpa/kpa_51/A640E0.c +++ b/src/world/area_kpa/kpa_51/A640E0.c @@ -32,7 +32,7 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241328_A653B8); INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241374_A65404); -INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_802413CC_A6545C); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_51/A640E0", func_80241404_A65494); diff --git a/src/world/area_kpa/kpa_52/A671E0.c b/src/world/area_kpa/kpa_52/A671E0.c index f99b8b7b90..60ecd38b10 100644 --- a/src/world/area_kpa/kpa_52/A671E0.c +++ b/src/world/area_kpa/kpa_52/A671E0.c @@ -18,4 +18,4 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240B78_A67C78); INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_80240FD4_A680D4); -INCLUDE_ASM(s32, "world/area_kpa/kpa_52/A671E0", func_802412F4_A683F4); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_kpa/kpa_61/A6E6F0.c b/src/world/area_kpa/kpa_61/A6E6F0.c index bf70addef6..81693950ac 100644 --- a/src/world/area_kpa/kpa_61/A6E6F0.c +++ b/src/world/area_kpa/kpa_61/A6E6F0.c @@ -38,6 +38,6 @@ INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_80241F4C_A7032C); INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", update_heroes_start_turn_A70404); -INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422B8_A70698); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_kpa/kpa_61/A6E6F0", func_802422F0_A706D0); diff --git a/src/world/area_omo/omo_02/D9D510.c b/src/world/area_omo/omo_02/D9D510.c index e483675d7a..4309be5666 100644 --- a/src/world/area_omo/omo_02/D9D510.c +++ b/src/world/area_omo/omo_02/D9D510.c @@ -56,4 +56,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_8024283C_D9FD0C); INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B5C_DA002C); -INCLUDE_ASM(s32, "world/area_omo/omo_02/D9D510", func_80242B70_DA0040); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/area_omo/omo_09/DCD6B0.c b/src/world/area_omo/omo_09/DCD6B0.c index 3c29e3c094..e6cefd9193 100644 --- a/src/world/area_omo/omo_09/DCD6B0.c +++ b/src/world/area_omo/omo_09/DCD6B0.c @@ -64,7 +64,7 @@ INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024324C_DCFF1C); INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_8024356C_DD023C); -INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_80243580_DD0250); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" INCLUDE_ASM(s32, "world/area_omo/omo_09/DCD6B0", func_802435B8_DD0288); diff --git a/src/world/area_omo/omo_17/DEF400.c b/src/world/area_omo/omo_17/DEF400.c index 5f99a47bd6..ec96ab11c7 100644 --- a/src/world/area_omo/omo_17/DEF400.c +++ b/src/world/area_omo/omo_17/DEF400.c @@ -58,4 +58,4 @@ INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802433A0_DF2240); INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436C0_DF2560); -INCLUDE_ASM(s32, "world/area_omo/omo_17/DEF400", func_802436D4_DF2574); +#include "world/common/GetEncounterEnemyIsOwner.inc.c" diff --git a/src/world/common/GetEncounterEnemyIsOwner.inc.c b/src/world/common/GetEncounterEnemyIsOwner.inc.c new file mode 100644 index 0000000000..5104d73901 --- /dev/null +++ b/src/world/common/GetEncounterEnemyIsOwner.inc.c @@ -0,0 +1,9 @@ +#include "common.h" +#include "map.h" + +static ApiStatus GetEncounterEnemyIsOwner(ScriptInstance* script, s32 isInitialCall) { + Enemy* enemy = script->owner1.enemy; + + set_variable(script, SI_VAR(0), gCurrentEncounter.currentEnemy == enemy); + return ApiStatus_DONE2; +}