pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 20:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

more

Browse Source
This commit is contained in:
Ethan Roseman 2020-12-31 16:22:25 +09:00
parent abacae0966
commit 58da6d1e01
3 changed files with 9 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F10_9125C0.s
View File

@ -1,22 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80242F10_9125C0
/* 9125C0 80242F10 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 9125C4 80242F14 AFB00010 */ sw $s0, 0x10($sp)
/* 9125C8 80242F18 0080802D */ daddu $s0, $a0, $zero
/* 9125CC 80242F1C AFBF0014 */ sw $ra, 0x14($sp)
/* 9125D0 80242F20 8E020148 */ lw $v0, 0x148($s0)
/* 9125D4 80242F24 0C00EABB */ jal get_npc_unsafe
/* 9125D8 80242F28 84440008 */ lh $a0, 8($v0)
/* 9125DC 80242F2C 9443008E */ lhu $v1, 0x8e($v0)
/* 9125E0 80242F30 2463FFFF */ addiu $v1, $v1, -1
/* 9125E4 80242F34 A443008E */ sh $v1, 0x8e($v0)
/* 9125E8 80242F38 00031C00 */ sll $v1, $v1, 0x10
/* 9125EC 80242F3C 58600001 */ blezl $v1, .L80242F44
/* 9125F0 80242F40 AE000070 */ sw $zero, 0x70($s0)
.L80242F44:
/* 9125F4 80242F44 8FBF0014 */ lw $ra, 0x14($sp)
/* 9125F8 80242F48 8FB00010 */ lw $s0, 0x10($sp)
/* 9125FC 80242F4C 03E00008 */ jr $ra
/* 912600 80242F50 27BD0018 */ addiu $sp, $sp, 0x18

12
asm/nonmatchings/world/area_iwa/iwa_01/90FBD0/func_80242F54_912604.s
View File

@ -71,7 +71,7 @@ glabel func_80242F54_912604
/* 912700 80243050 8E4300B0 */ lw $v1, 0xb0($s2)
/* 912704 80243054 30620004 */ andi $v0, $v1, 4
/* 912708 80243058 10400007 */ beqz $v0, .L80243078
/* 91270C 8024305C 00000000 */ nop
/* 91270C 8024305C 00000000 */ nop
/* 912710 80243060 824200B4 */ lb $v0, 0xb4($s2)
/* 912714 80243064 14400086 */ bnez $v0, .L80243280
/* 912718 80243068 0000102D */ daddu $v0, $zero, $zero
@ -99,7 +99,7 @@ glabel func_80242F54_912604
/* 912768 802430B8 00220821 */ addu $at, $at, $v0
/* 91276C 802430BC 8C2265E8 */ lw $v0, %lo(D_802465E8)($at)
/* 912770 802430C0 00400008 */ jr $v0
/* 912774 802430C4 00000000 */ nop
/* 912774 802430C4 00000000 */ nop
/* 912778 802430C8 0260202D */ daddu $a0, $s3, $zero
/* 91277C 802430CC 0280282D */ daddu $a1, $s4, $zero
/* 912780 802430D0 0C090909 */ jal func_80242424_911AD4
@ -207,7 +207,7 @@ glabel func_80242F54_912604
/* 912918 80243268 0000102D */ daddu $v0, $zero, $zero
/* 91291C 8024326C 0260202D */ daddu $a0, $s3, $zero
/* 912920 80243270 0280282D */ daddu $a1, $s4, $zero
/* 912924 80243274 0C090BC4 */ jal func_80242F10_9125C0
/* 912924 80243274 0C090BC4 */ jal dup_iwa_01_UnkDurationCheck
/* 912928 80243278 0200302D */ daddu $a2, $s0, $zero
.L8024327C:
/* 91292C 8024327C 0000102D */ daddu $v0, $zero, $zero
@ -221,6 +221,6 @@ glabel func_80242F54_912604
/* 912948 80243298 8FB00030 */ lw $s0, 0x30($sp)
/* 91294C 8024329C 03E00008 */ jr $ra
/* 912950 802432A0 27BD0050 */ addiu $sp, $sp, 0x50
/* 912954 802432A4 00000000 */ nop
/* 912958 802432A8 00000000 */ nop
/* 91295C 802432AC 00000000 */ nop
/* 912954 802432A4 00000000 */ nop
/* 912958 802432A8 00000000 */ nop
/* 91295C 802432AC 00000000 */ nop

5
src/world/area_iwa/iwa_01/90FBD0.c
View File

@ -68,7 +68,8 @@ INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242E2C_9124DC);
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242EA8_912558);
// Should be #include "world/common/UnkDurationCheck.inc.c"
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F10_9125C0);
#define NAMESPACE dup_iwa_01
#include "world/common/UnkDurationCheck.inc.c"
#define NAMESPACE iwa_01
INCLUDE_ASM(s32, "world/area_iwa/iwa_01/90FBD0", func_80242F54_912604);