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

some more

Browse Source
This commit is contained in:
Ethan Roseman 2020-11-23 14:44:38 -05:00
parent 9f068a6461
commit 96a2d67c2e
6 changed files with 21 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
asm/nonmatchings/code_319670/func_802BD148.s
View File

@ -1,19 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BD148
/* 3196B8 802BD148 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 3196BC 802BD14C AFBF0014 */ sw $ra, 0x14($sp)
/* 3196C0 802BD150 AFB00010 */ sw $s0, 0x10($sp)
/* 3196C4 802BD154 10A00003 */ beqz $a1, .L802BD164
/* 3196C8 802BD158 8C90014C */ lw $s0, 0x14c($a0)
/* 3196CC 802BD15C 0C03BB31 */ jal func_800EECC4
/* 3196D0 802BD160 0200202D */ daddu $a0, $s0, $zero
.L802BD164:
/* 3196D4 802BD164 0C03BB3A */ jal func_800EECE8
/* 3196D8 802BD168 0200202D */ daddu $a0, $s0, $zero
/* 3196DC 802BD16C 8FBF0014 */ lw $ra, 0x14($sp)
/* 3196E0 802BD170 8FB00010 */ lw $s0, 0x10($sp)
/* 3196E4 802BD174 0002102B */ sltu $v0, $zero, $v0
/* 3196E8 802BD178 03E00008 */ jr $ra
/* 3196EC 802BD17C 27BD0018 */ addiu $sp, $sp, 0x18

19
asm/nonmatchings/code_319670/func_802BE8D4.s
View File

@ -1,19 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802BE8D4
/* 31AE44 802BE8D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 31AE48 802BE8D8 AFBF0014 */ sw $ra, 0x14($sp)
/* 31AE4C 802BE8DC AFB00010 */ sw $s0, 0x10($sp)
/* 31AE50 802BE8E0 10A00003 */ beqz $a1, .L802BE8F0
/* 31AE54 802BE8E4 8C90014C */ lw $s0, 0x14c($a0)
/* 31AE58 802BE8E8 0C03BA65 */ jal func_800EE994
/* 31AE5C 802BE8EC 0200202D */ daddu $a0, $s0, $zero
.L802BE8F0:
/* 31AE60 802BE8F0 0C03BA6E */ jal func_800EE9B8
/* 31AE64 802BE8F4 0200202D */ daddu $a0, $s0, $zero
/* 31AE68 802BE8F8 8FBF0014 */ lw $ra, 0x14($sp)
/* 31AE6C 802BE8FC 8FB00010 */ lw $s0, 0x10($sp)
/* 31AE70 802BE900 0002102B */ sltu $v0, $zero, $v0
/* 31AE74 802BE904 03E00008 */ jr $ra
/* 31AE78 802BE908 27BD0018 */ addiu $sp, $sp, 0x18

6
asm/nonmatchings/code_3278F0/func_E00021B4.s
View File

@ -1,6 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E00021B4
/* 327AA4 E00021B4 03E00008 */ jr $ra
/* 327AA8 E00021B8 00000000 */ nop

14
asm/nonmatchings/code_3278F0/func_E0002738.s
View File

@ -1,14 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_E0002738
/* 328028 E0002738 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 32802C E000273C AFBF0010 */ sw $ra, 0x10($sp)
/* 328030 E0002740 0C080128 */ jal func_E02004A0
/* 328034 E0002744 00000000 */ nop
/* 328038 E0002748 8FBF0010 */ lw $ra, 0x10($sp)
/* 32803C E000274C 03E00008 */ jr $ra
/* 328040 E0002750 27BD0018 */ addiu $sp, $sp, 0x18
/* 328044 E0002754 00000000 */ nop
/* 328048 E0002758 00000000 */ nop
/* 32804C E000275C 00000000 */ nop

18
src/code_319670.c
View File

@ -2,7 +2,14 @@
INCLUDE_ASM(s32, "code_319670", func_802BD100_319670);
INCLUDE_ASM(s32, "code_319670", func_802BD148);
ApiStatus func_802BD148(ScriptInstance* script, s32 isInitialCall) {
s32 unk = script->owner2.npc; // todo what is this
if (isInitialCall) {
func_800EECC4(unk);
}
return func_800EECE8(unk) != 0;
}
INCLUDE_ASM(s32, "code_319670", func_802BD180);
@ -12,7 +19,14 @@ INCLUDE_ASM(s32, "code_319670", func_802BD558);
INCLUDE_ASM(s32, "code_319670", func_802BD660);
INCLUDE_ASM(s32, "code_319670", func_802BE8D4);
ApiStatus func_802BE8D4(ScriptInstance* script, s32 isInitialCall) {
s32 unk = script->owner2.npc; // todo what is this
if (isInitialCall) {
func_800EE994(unk);
}
return func_800EE9B8(unk) != 0;
}
INCLUDE_ASM(s32, "code_319670", func_802BE90C);

7
src/code_3278F0.c
View File

@ -2,7 +2,8 @@
INCLUDE_ASM(s32, "code_3278F0", func_E0002000);
INCLUDE_ASM(s32, "code_3278F0", func_E00021B4);
void func_E00021B4(void) {
}
INCLUDE_ASM(s32, "code_3278F0", func_E00021BC);
@ -10,4 +11,6 @@ INCLUDE_ASM(s32, "code_3278F0", func_E00022BC);
INCLUDE_ASM(s32, "code_3278F0", func_E0002300);
INCLUDE_ASM(s32, "code_3278F0", func_E0002738);
void func_E0002738(void) {
func_E02004A0();
}