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

Call800EB168

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-29 23:56:54 -04:00
parent 8dc783bf5b
commit 7717a96628
27 changed files with 21 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asm/nonmatchings/world/area_dro/dro_02/9694C0/func_80243748_96C908.s
View File

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

16
asm/nonmatchings/world/area_hos/hos_03/A1BDB0/func_8024246C_A1D56C.s
View File

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

16
asm/nonmatchings/world/area_jan/jan_03/B34BD0/func_80241774_B36344.s
View File

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

16
asm/nonmatchings/world/area_kkj/kkj_20/AFDE00/func_80240584_AFE0C4.s
View File

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

16
asm/nonmatchings/world/area_kmr/kmr_02/8B30E0/func_80243334_8B33A4.s
View File

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

16
asm/nonmatchings/world/area_kmr/kmr_20/8ED0C0/func_80241564_8ED384.s
View File

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

16
asm/nonmatchings/world/area_kpa/kpa_91/A86A50/func_802417EC_A8823C.s
View File

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

16
asm/nonmatchings/world/area_kpa/kpa_95/A8CB60/func_802418CC_A8E34C.s
View File

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

16
asm/nonmatchings/world/area_mac/mac_01/8017D0/func_80243A70_8042F0.s
View File

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

16
asm/nonmatchings/world/area_nok/nok_01/9C53E0/func_80240D30_9C6110.s
View File

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

16
asm/nonmatchings/world/area_sam/sam_02/D05F60/func_80240AF4_D06224.s
View File

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

16
asm/nonmatchings/world/area_sam/sam_06/D203E0/func_80242214_D220A4.s
View File

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

2
include/functions.h
View File

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

2
src/code_838b0_len_5900.c
View File

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

2
src/world/area_dro/dro_02/9694C0.c
View File

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

2
src/world/area_hos/hos_03/A1BDB0.c
View File

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

2
src/world/area_jan/jan_03/B34BD0.c
View File

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

2
src/world/area_kkj/kkj_20/AFDE00.c
View File

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

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

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

2
src/world/area_kmr/kmr_20/8ED0C0.c
View File

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

2
src/world/area_kpa/kpa_91/A86A50.c
View File

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

2
src/world/area_kpa/kpa_95/A8CB60.c
View File

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

2
src/world/area_mac/mac_01/8017D0.c
View File

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

2
src/world/area_nok/nok_01/9C53E0.c
View File

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

2
src/world/area_sam/sam_02/D05F60.c
View File

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

2
src/world/area_sam/sam_06/D203E0.c
View File

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

6
src/world/common/Call800EB168.inc.c Normal file
View File

@ -0,0 +1,6 @@
#include "common.h"
static ApiStatus Call800EB168(ScriptInstance* script, s32 isInitialCall) {
func_800EB168(get_variable(script, *script->ptrReadPos));
return ApiStatus_DONE2;
}