pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-18 17:02:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

CheckPartnerFlags1000

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-30 19:03:29 -04:00
parent b0d5e8ee62
commit 51b1c9acfb
9 changed files with 9 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
asm/nonmatchings/world/area_kmr/kmr_02/8B36B0/func_80243640_8B36B0.s
View File

@ -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

15
asm/nonmatchings/world/area_kmr/kmr_03/8C7F90/func_80240184_8C8114.s
View File

@ -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

15
asm/nonmatchings/world/area_kmr/kmr_04/8CA900/func_80240000_8CA900.s
View File

@ -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

15
asm/nonmatchings/world/area_kmr/kmr_04/8CA960/func_8024029C_8CAB9C.s
View File

@ -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

2
src/world/area_kmr/kmr_02/8B36B0.c
View File

@ -1,6 +1,6 @@
#include "kmr_02.h" #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); INCLUDE_ASM(s32, "world/area_kmr/kmr_02/8B36B0", func_8024366C_8B36DC);

2
src/world/area_kmr/kmr_03/8C7F90.c
View File

@ -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_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); INCLUDE_ASM(s32, "world/area_kmr/kmr_03/8C7F90", func_802401B0_8C8140);

2
src/world/area_kmr/kmr_04/8CA900.c
View File

@ -1,5 +1,5 @@
#include "kmr_04.h" #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); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA900", func_8024002C_8CA92C);

3
src/world/area_kmr/kmr_04/8CA960.c
View File

@ -2,8 +2,7 @@
#include "world/common/SomeMatrixOperations.inc.c" #include "world/common/SomeMatrixOperations.inc.c"
#include "world/common/CheckPartnerFlags1000.inc.c"
INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_8024029C_8CAB9C);
INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8); INCLUDE_ASM(s32, "world/area_kmr/kmr_04/8CA960", func_802402C8_8CABC8);

5
src/world/common/CheckPartnerFlags1000.inc.c Normal file
View File

@ -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;
}