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

Assorted functions

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-28 02:42:14 -04:00
parent 2ad6bb1677
commit 90e7a9acab
18 changed files with 150 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
asm/nonmatchings/code_F5750/func_802D24F4.s
View File

@ -1,9 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802D24F4
/* F6EA4 802D24F4 3C028011 */ lui $v0, 0x8011
/* F6EA8 802D24F8 8442EFDA */ lh $v0, -0x1026($v0)
/* F6EAC 802D24FC 2C420001 */ sltiu $v0, $v0, 1
/* F6EB0 802D2500 03E00008 */ jr $ra
/* F6EB4 802D2504 00021040 */ sll $v0, $v0, 1

68
asm/nonmatchings/code_f2470_len_27f0/func_802CFD30.s
View File

@ -1,68 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802CFD30
/* F46E0 802CFD30 27BDFFC0 */ addiu $sp, $sp, -0x40
/* F46E4 802CFD34 AFB10024 */ sw $s1, 0x24($sp)
/* F46E8 802CFD38 0080882D */ daddu $s1, $a0, $zero
/* F46EC 802CFD3C AFBF003C */ sw $ra, 0x3c($sp)
/* F46F0 802CFD40 AFB60038 */ sw $s6, 0x38($sp)
/* F46F4 802CFD44 AFB50034 */ sw $s5, 0x34($sp)
/* F46F8 802CFD48 AFB40030 */ sw $s4, 0x30($sp)
/* F46FC 802CFD4C AFB3002C */ sw $s3, 0x2c($sp)
/* F4700 802CFD50 AFB20028 */ sw $s2, 0x28($sp)
/* F4704 802CFD54 AFB00020 */ sw $s0, 0x20($sp)
/* F4708 802CFD58 8E30000C */ lw $s0, 0xc($s1)
/* F470C 802CFD5C 8E050000 */ lw $a1, ($s0)
/* F4710 802CFD60 0C0B1EAF */ jal get_variable
/* F4714 802CFD64 26100004 */ addiu $s0, $s0, 4
/* F4718 802CFD68 8E050000 */ lw $a1, ($s0)
/* F471C 802CFD6C 26100004 */ addiu $s0, $s0, 4
/* F4720 802CFD70 0220202D */ daddu $a0, $s1, $zero
/* F4724 802CFD74 0C0B1EAF */ jal get_variable
/* F4728 802CFD78 0040902D */ daddu $s2, $v0, $zero
/* F472C 802CFD7C 8E050000 */ lw $a1, ($s0)
/* F4730 802CFD80 26100004 */ addiu $s0, $s0, 4
/* F4734 802CFD84 0220202D */ daddu $a0, $s1, $zero
/* F4738 802CFD88 0C0B1EAF */ jal get_variable
/* F473C 802CFD8C 0040B02D */ daddu $s6, $v0, $zero
/* F4740 802CFD90 8E050000 */ lw $a1, ($s0)
/* F4744 802CFD94 26100004 */ addiu $s0, $s0, 4
/* F4748 802CFD98 0220202D */ daddu $a0, $s1, $zero
/* F474C 802CFD9C 0C0B1EAF */ jal get_variable
/* F4750 802CFDA0 0040A82D */ daddu $s5, $v0, $zero
/* F4754 802CFDA4 8E050000 */ lw $a1, ($s0)
/* F4758 802CFDA8 26100004 */ addiu $s0, $s0, 4
/* F475C 802CFDAC 0220202D */ daddu $a0, $s1, $zero
/* F4760 802CFDB0 0C0B1EAF */ jal get_variable
/* F4764 802CFDB4 0040A02D */ daddu $s4, $v0, $zero
/* F4768 802CFDB8 0220202D */ daddu $a0, $s1, $zero
/* F476C 802CFDBC 8E050000 */ lw $a1, ($s0)
/* F4770 802CFDC0 0C0B1EAF */ jal get_variable
/* F4774 802CFDC4 0040982D */ daddu $s3, $v0, $zero
/* F4778 802CFDC8 0220202D */ daddu $a0, $s1, $zero
/* F477C 802CFDCC 0240282D */ daddu $a1, $s2, $zero
/* F4780 802CFDD0 0C0B36B0 */ jal resolve_npc
/* F4784 802CFDD4 0040802D */ daddu $s0, $v0, $zero
/* F4788 802CFDD8 10400009 */ beqz $v0, .L802CFE00
/* F478C 802CFDDC 0040202D */ daddu $a0, $v0, $zero
/* F4790 802CFDE0 02C0282D */ daddu $a1, $s6, $zero
/* F4794 802CFDE4 02A0302D */ daddu $a2, $s5, $zero
/* F4798 802CFDE8 AFB30010 */ sw $s3, 0x10($sp)
/* F479C 802CFDEC AFB00014 */ sw $s0, 0x14($sp)
/* F47A0 802CFDF0 948200A2 */ lhu $v0, 0xa2($a0)
/* F47A4 802CFDF4 0280382D */ daddu $a3, $s4, $zero
/* F47A8 802CFDF8 0C00F589 */ jal func_8003D624
/* F47AC 802CFDFC AFA20018 */ sw $v0, 0x18($sp)
.L802CFE00:
/* F47B0 802CFE00 24020002 */ addiu $v0, $zero, 2
/* F47B4 802CFE04 8FBF003C */ lw $ra, 0x3c($sp)
/* F47B8 802CFE08 8FB60038 */ lw $s6, 0x38($sp)
/* F47BC 802CFE0C 8FB50034 */ lw $s5, 0x34($sp)
/* F47C0 802CFE10 8FB40030 */ lw $s4, 0x30($sp)
/* F47C4 802CFE14 8FB3002C */ lw $s3, 0x2c($sp)
/* F47C8 802CFE18 8FB20028 */ lw $s2, 0x28($sp)
/* F47CC 802CFE1C 8FB10024 */ lw $s1, 0x24($sp)
/* F47D0 802CFE20 8FB00020 */ lw $s0, 0x20($sp)
/* F47D4 802CFE24 03E00008 */ jr $ra
/* F47D8 802CFE28 27BD0040 */ addiu $sp, $sp, 0x40

58
asm/nonmatchings/code_f2470_len_27f0/func_802CFEEC.s
View File

@ -1,58 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802CFEEC
/* F489C 802CFEEC 27BDFFC8 */ addiu $sp, $sp, -0x38
/* F48A0 802CFEF0 AFB1001C */ sw $s1, 0x1c($sp)
/* F48A4 802CFEF4 0080882D */ daddu $s1, $a0, $zero
/* F48A8 802CFEF8 AFBF0030 */ sw $ra, 0x30($sp)
/* F48AC 802CFEFC AFB5002C */ sw $s5, 0x2c($sp)
/* F48B0 802CFF00 AFB40028 */ sw $s4, 0x28($sp)
/* F48B4 802CFF04 AFB30024 */ sw $s3, 0x24($sp)
/* F48B8 802CFF08 AFB20020 */ sw $s2, 0x20($sp)
/* F48BC 802CFF0C AFB00018 */ sw $s0, 0x18($sp)
/* F48C0 802CFF10 8E30000C */ lw $s0, 0xc($s1)
/* F48C4 802CFF14 8E050000 */ lw $a1, ($s0)
/* F48C8 802CFF18 0C0B1EAF */ jal get_variable
/* F48CC 802CFF1C 26100004 */ addiu $s0, $s0, 4
/* F48D0 802CFF20 8E050000 */ lw $a1, ($s0)
/* F48D4 802CFF24 26100004 */ addiu $s0, $s0, 4
/* F48D8 802CFF28 0220202D */ daddu $a0, $s1, $zero
/* F48DC 802CFF2C 0C0B1EAF */ jal get_variable
/* F48E0 802CFF30 0040902D */ daddu $s2, $v0, $zero
/* F48E4 802CFF34 8E050000 */ lw $a1, ($s0)
/* F48E8 802CFF38 26100004 */ addiu $s0, $s0, 4
/* F48EC 802CFF3C 0220202D */ daddu $a0, $s1, $zero
/* F48F0 802CFF40 0C0B1EAF */ jal get_variable
/* F48F4 802CFF44 0040A82D */ daddu $s5, $v0, $zero
/* F48F8 802CFF48 8E050000 */ lw $a1, ($s0)
/* F48FC 802CFF4C 26100004 */ addiu $s0, $s0, 4
/* F4900 802CFF50 0220202D */ daddu $a0, $s1, $zero
/* F4904 802CFF54 0C0B1EAF */ jal get_variable
/* F4908 802CFF58 0040A02D */ daddu $s4, $v0, $zero
/* F490C 802CFF5C 0220202D */ daddu $a0, $s1, $zero
/* F4910 802CFF60 8E050000 */ lw $a1, ($s0)
/* F4914 802CFF64 0C0B1EAF */ jal get_variable
/* F4918 802CFF68 0040982D */ daddu $s3, $v0, $zero
/* F491C 802CFF6C 0220202D */ daddu $a0, $s1, $zero
/* F4920 802CFF70 0240282D */ daddu $a1, $s2, $zero
/* F4924 802CFF74 0C0B36B0 */ jal resolve_npc
/* F4928 802CFF78 0040802D */ daddu $s0, $v0, $zero
/* F492C 802CFF7C 10400006 */ beqz $v0, .L802CFF98
/* F4930 802CFF80 0040202D */ daddu $a0, $v0, $zero
/* F4934 802CFF84 AFB00010 */ sw $s0, 0x10($sp)
/* F4938 802CFF88 02A0282D */ daddu $a1, $s5, $zero
/* F493C 802CFF8C 0280302D */ daddu $a2, $s4, $zero
/* F4940 802CFF90 0C00ED13 */ jal func_8003B44C
/* F4944 802CFF94 0260382D */ daddu $a3, $s3, $zero
.L802CFF98:
/* F4948 802CFF98 24020002 */ addiu $v0, $zero, 2
/* F494C 802CFF9C 8FBF0030 */ lw $ra, 0x30($sp)
/* F4950 802CFFA0 8FB5002C */ lw $s5, 0x2c($sp)
/* F4954 802CFFA4 8FB40028 */ lw $s4, 0x28($sp)
/* F4958 802CFFA8 8FB30024 */ lw $s3, 0x24($sp)
/* F495C 802CFFAC 8FB20020 */ lw $s2, 0x20($sp)
/* F4960 802CFFB0 8FB1001C */ lw $s1, 0x1c($sp)
/* F4964 802CFFB4 8FB00018 */ lw $s0, 0x18($sp)
/* F4968 802CFFB8 03E00008 */ jr $ra
/* F496C 802CFFBC 27BD0038 */ addiu $sp, $sp, 0x38

91
asm/nonmatchings/code_f2470_len_27f0/func_802CFFC0.s
View File

@ -1,91 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802CFFC0
/* F4970 802CFFC0 27BDFFB8 */ addiu $sp, $sp, -0x48
/* F4974 802CFFC4 AFB10024 */ sw $s1, 0x24($sp)
/* F4978 802CFFC8 0080882D */ daddu $s1, $a0, $zero
/* F497C 802CFFCC AFBF0044 */ sw $ra, 0x44($sp)
/* F4980 802CFFD0 AFBE0040 */ sw $fp, 0x40($sp)
/* F4984 802CFFD4 AFB7003C */ sw $s7, 0x3c($sp)
/* F4988 802CFFD8 AFB60038 */ sw $s6, 0x38($sp)
/* F498C 802CFFDC AFB50034 */ sw $s5, 0x34($sp)
/* F4990 802CFFE0 AFB40030 */ sw $s4, 0x30($sp)
/* F4994 802CFFE4 AFB3002C */ sw $s3, 0x2c($sp)
/* F4998 802CFFE8 AFB20028 */ sw $s2, 0x28($sp)
/* F499C 802CFFEC AFB00020 */ sw $s0, 0x20($sp)
/* F49A0 802CFFF0 8E30000C */ lw $s0, 0xc($s1)
/* F49A4 802CFFF4 8E050000 */ lw $a1, ($s0)
/* F49A8 802CFFF8 0C0B1EAF */ jal get_variable
/* F49AC 802CFFFC 26100004 */ addiu $s0, $s0, 4
/* F49B0 802D0000 8E050000 */ lw $a1, ($s0)
/* F49B4 802D0004 26100004 */ addiu $s0, $s0, 4
/* F49B8 802D0008 0220202D */ daddu $a0, $s1, $zero
/* F49BC 802D000C 0C0B1EAF */ jal get_variable
/* F49C0 802D0010 0040902D */ daddu $s2, $v0, $zero
/* F49C4 802D0014 8E050000 */ lw $a1, ($s0)
/* F49C8 802D0018 26100004 */ addiu $s0, $s0, 4
/* F49CC 802D001C 0220202D */ daddu $a0, $s1, $zero
/* F49D0 802D0020 0C0B1EAF */ jal get_variable
/* F49D4 802D0024 AFA20018 */ sw $v0, 0x18($sp)
/* F49D8 802D0028 8E050000 */ lw $a1, ($s0)
/* F49DC 802D002C 26100004 */ addiu $s0, $s0, 4
/* F49E0 802D0030 0220202D */ daddu $a0, $s1, $zero
/* F49E4 802D0034 0C0B1EAF */ jal get_variable
/* F49E8 802D0038 0040F02D */ daddu $fp, $v0, $zero
/* F49EC 802D003C 8E050000 */ lw $a1, ($s0)
/* F49F0 802D0040 26100004 */ addiu $s0, $s0, 4
/* F49F4 802D0044 0220202D */ daddu $a0, $s1, $zero
/* F49F8 802D0048 0C0B1EAF */ jal get_variable
/* F49FC 802D004C 0040B82D */ daddu $s7, $v0, $zero
/* F4A00 802D0050 8E050000 */ lw $a1, ($s0)
/* F4A04 802D0054 26100004 */ addiu $s0, $s0, 4
/* F4A08 802D0058 0220202D */ daddu $a0, $s1, $zero
/* F4A0C 802D005C 0C0B1EAF */ jal get_variable
/* F4A10 802D0060 0040B02D */ daddu $s6, $v0, $zero
/* F4A14 802D0064 8E050000 */ lw $a1, ($s0)
/* F4A18 802D0068 26100004 */ addiu $s0, $s0, 4
/* F4A1C 802D006C 0220202D */ daddu $a0, $s1, $zero
/* F4A20 802D0070 0C0B1EAF */ jal get_variable
/* F4A24 802D0074 0040A82D */ daddu $s5, $v0, $zero
/* F4A28 802D0078 8E050000 */ lw $a1, ($s0)
/* F4A2C 802D007C 26100004 */ addiu $s0, $s0, 4
/* F4A30 802D0080 0220202D */ daddu $a0, $s1, $zero
/* F4A34 802D0084 0C0B1EAF */ jal get_variable
/* F4A38 802D0088 0040A02D */ daddu $s4, $v0, $zero
/* F4A3C 802D008C 0220202D */ daddu $a0, $s1, $zero
/* F4A40 802D0090 8E050000 */ lw $a1, ($s0)
/* F4A44 802D0094 0C0B1EAF */ jal get_variable
/* F4A48 802D0098 0040982D */ daddu $s3, $v0, $zero
/* F4A4C 802D009C 0220202D */ daddu $a0, $s1, $zero
/* F4A50 802D00A0 0240282D */ daddu $a1, $s2, $zero
/* F4A54 802D00A4 0C0B36B0 */ jal resolve_npc
/* F4A58 802D00A8 0040882D */ daddu $s1, $v0, $zero
/* F4A5C 802D00AC 0040802D */ daddu $s0, $v0, $zero
/* F4A60 802D00B0 1200000C */ beqz $s0, .L802D00E4
/* F4A64 802D00B4 0200202D */ daddu $a0, $s0, $zero
/* F4A68 802D00B8 03C0302D */ daddu $a2, $fp, $zero
/* F4A6C 802D00BC 8FA50018 */ lw $a1, 0x18($sp)
/* F4A70 802D00C0 02E0382D */ daddu $a3, $s7, $zero
/* F4A74 802D00C4 0C00ED13 */ jal func_8003B44C
/* F4A78 802D00C8 AFB60010 */ sw $s6, 0x10($sp)
/* F4A7C 802D00CC 0200202D */ daddu $a0, $s0, $zero
/* F4A80 802D00D0 02A0282D */ daddu $a1, $s5, $zero
/* F4A84 802D00D4 0280302D */ daddu $a2, $s4, $zero
/* F4A88 802D00D8 0260382D */ daddu $a3, $s3, $zero
/* F4A8C 802D00DC 0C00ED19 */ jal func_8003B464
/* F4A90 802D00E0 AFB10010 */ sw $s1, 0x10($sp)
.L802D00E4:
/* F4A94 802D00E4 24020002 */ addiu $v0, $zero, 2
/* F4A98 802D00E8 8FBF0044 */ lw $ra, 0x44($sp)
/* F4A9C 802D00EC 8FBE0040 */ lw $fp, 0x40($sp)
/* F4AA0 802D00F0 8FB7003C */ lw $s7, 0x3c($sp)
/* F4AA4 802D00F4 8FB60038 */ lw $s6, 0x38($sp)
/* F4AA8 802D00F8 8FB50034 */ lw $s5, 0x34($sp)
/* F4AAC 802D00FC 8FB40030 */ lw $s4, 0x30($sp)
/* F4AB0 802D0100 8FB3002C */ lw $s3, 0x2c($sp)
/* F4AB4 802D0104 8FB20028 */ lw $s2, 0x28($sp)
/* F4AB8 802D0108 8FB10024 */ lw $s1, 0x24($sp)
/* F4ABC 802D010C 8FB00020 */ lw $s0, 0x20($sp)
/* F4AC0 802D0110 03E00008 */ jr $ra
/* F4AC4 802D0114 27BD0048 */ addiu $sp, $sp, 0x48

11
asm/nonmatchings/code_f270_len_1190/func_80034388.s
View File

@ -1,11 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80034388
/* F788 80034388 27BDFFE8 */ addiu $sp, $sp, -0x18
/* F78C 8003438C AFBF0010 */ sw $ra, 0x10($sp)
/* F790 80034390 0C00D0E9 */ jal func_800343A4
/* F794 80034394 00000000 */ nop
/* F798 80034398 8FBF0010 */ lw $ra, 0x10($sp)
/* F79C 8003439C 03E00008 */ jr $ra
/* F7A0 800343A0 27BD0018 */ addiu $sp, $sp, 0x18

8
asm/nonmatchings/code_f270_len_1190/func_80034FF0.s
View File

@ -1,8 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80034FF0
/* 103F0 80034FF0 03E00008 */ jr $ra
/* 103F4 80034FF4 00000000 */ nop
/* 103F8 80034FF8 00000000 */ nop
/* 103FC 80034FFC 00000000 */ nop

45
asm/nonmatchings/world/area_gv/gv_01/E1E460/func_802405EC_E1EA4C.s
View File

@ -1,45 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802405EC_E1EA4C
/* E1EA4C 802405EC 27BDFFE8 */ addiu $sp, $sp, -0x18
/* E1EA50 802405F0 AFB00010 */ sw $s0, 0x10($sp)
/* E1EA54 802405F4 0080802D */ daddu $s0, $a0, $zero
/* E1EA58 802405F8 10A00008 */ beqz $a1, .L8024061C
/* E1EA5C 802405FC AFBF0014 */ sw $ra, 0x14($sp)
/* E1EA60 80240600 3C013F80 */ lui $at, 0x3f80
/* E1EA64 80240604 44816000 */ mtc1 $at, $f12
/* E1EA68 80240608 0C00AFB7 */ jal set_curtain_scale_goal
/* E1EA6C 8024060C AE000070 */ sw $zero, 0x70($s0)
/* E1EA70 80240610 44806000 */ mtc1 $zero, $f12
/* E1EA74 80240614 0C00AFC9 */ jal set_curtain_fade
/* E1EA78 80240618 00000000 */ nop
.L8024061C:
/* E1EA7C 8024061C 8E020070 */ lw $v0, 0x70($s0)
/* E1EA80 80240620 24420005 */ addiu $v0, $v0, 5
/* E1EA84 80240624 AE020070 */ sw $v0, 0x70($s0)
/* E1EA88 80240628 28420100 */ slti $v0, $v0, 0x100
/* E1EA8C 8024062C 14400003 */ bnez $v0, .L8024063C
/* E1EA90 80240630 24040001 */ addiu $a0, $zero, 1
/* E1EA94 80240634 240200FF */ addiu $v0, $zero, 0xff
/* E1EA98 80240638 AE020070 */ sw $v0, 0x70($s0)
.L8024063C:
/* E1EA9C 8024063C 240500D0 */ addiu $a1, $zero, 0xd0
/* E1EAA0 80240640 00A0302D */ daddu $a2, $a1, $zero
/* E1EAA4 80240644 0C04DF84 */ jal func_80137E10
/* E1EAA8 80240648 00A0382D */ daddu $a3, $a1, $zero
/* E1EAAC 8024064C C6000070 */ lwc1 $f0, 0x70($s0)
/* E1EAB0 80240650 46800020 */ cvt.s.w $f0, $f0
/* E1EAB4 80240654 44050000 */ mfc1 $a1, $f0
/* E1EAB8 80240658 0C04DF69 */ jal func_80137DA4
/* E1EABC 8024065C 0000202D */ daddu $a0, $zero, $zero
/* E1EAC0 80240660 24040001 */ addiu $a0, $zero, 1
/* E1EAC4 80240664 0C04E035 */ jal func_801380D4
/* E1EAC8 80240668 0000282D */ daddu $a1, $zero, $zero
/* E1EACC 8024066C 8E020070 */ lw $v0, 0x70($s0)
/* E1EAD0 80240670 8FBF0014 */ lw $ra, 0x14($sp)
/* E1EAD4 80240674 8FB00010 */ lw $s0, 0x10($sp)
/* E1EAD8 80240678 384200FF */ xori $v0, $v0, 0xff
/* E1EADC 8024067C 2C420001 */ sltiu $v0, $v0, 1
/* E1EAE0 80240680 03E00008 */ jr $ra
/* E1EAE4 80240684 27BD0018 */ addiu $sp, $sp, 0x18

18
asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_802405EC_7EB2FC.s
View File

@ -1,18 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802405EC_7EB2FC
/* 7EB2FC 802405EC 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 7EB300 802405F0 AFBF0020 */ sw $ra, 0x20($sp)
/* 7EB304 802405F4 8C82000C */ lw $v0, 0xc($a0)
/* 7EB308 802405F8 0C0B1EAF */ jal get_variable
/* 7EB30C 802405FC 8C450000 */ lw $a1, ($v0)
/* 7EB310 80240600 0040202D */ daddu $a0, $v0, $zero
/* 7EB314 80240604 27A50010 */ addiu $a1, $sp, 0x10
/* 7EB318 80240608 27A60014 */ addiu $a2, $sp, 0x14
/* 7EB31C 8024060C 0C016F84 */ jal get_collider_center
/* 7EB320 80240610 27A70018 */ addiu $a3, $sp, 0x18
/* 7EB324 80240614 8FBF0020 */ lw $ra, 0x20($sp)
/* 7EB328 80240618 24020002 */ addiu $v0, $zero, 2
/* 7EB32C 8024061C 03E00008 */ jr $ra
/* 7EB330 80240620 27BD0028 */ addiu $sp, $sp, 0x28

7
asm/nonmatchings/world/area_mac/mac_00/7EAD10/func_80240624_7EB334.s
View File

@ -1,7 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_80240624_7EB334
/* 7EB334 80240624 03E00008 */ jr $ra
/* 7EB338 80240628 24020002 */ addiu $v0, $zero, 2
/* 7EB33C 8024062C 00000000 */ nop

4
include/common_structs.h
View File

@ -106,7 +106,7 @@ typedef struct Npc {
/* 0x08E */ s16 duration; /* formerly interp_counter */
/* 0x090 */ Vec3s homePos;
/* 0x096 */ char unk_96[12];
/* 0x0A2 */ s16 unk_A2;
/* 0x0A2 */ u16 unk_A2;
/* 0x0A4 */ u8 npcID;
/* 0x0A5 */ char unk_A5;
/* 0x0A6 */ s16 collisionRadius;
@ -862,7 +862,7 @@ typedef struct GameStatus {
/* 0x040 */ s8 stickX; /* with deadzone */
/* 0x041 */ u8 altStickX; /* input used for batte when flag 80000 set */
/* 0x042 */ char unk_42[2];
/* 0x044 */ u8 stickY; /* with deadzone */
/* 0x044 */ s8 stickY; /* with deadzone */
/* 0x045 */ u8 altStickY; /* input used for batte when flag 80000 set */
/* 0x046 */ char unk_46[2];
/* 0x048 */ s16 unk_48[4];

3
include/functions.h
View File

@ -65,6 +65,9 @@ s32 func_800554E8(s32, s32);
s32 func_800555E4(s32);
s32 osGetId();
void set_curtain_scale_goal(f32 scale);
void set_curtain_fade(f32 scale);
void fx_walk_normal(s32 arg0, f32 arg1, f32 arg2, f32 arg3, s32 arg4, s32 arg5);
// Partner

2
src/code_1AC760.c
View File

@ -23,7 +23,7 @@ ApiStatus GetActorLevel(ScriptInstance* script, s32 isInitialCall) {
s32 actorID = get_variable(script, *args++);
Bytecode* outVar;
if (actorID == -0x7F) {
if (actorID == ActorId_SELF) {
actorID = script->owner1.enemyID;
}

4
src/code_F5750.c
View File

@ -238,7 +238,9 @@ INCLUDE_ASM(s32, "code_F5750", func_802D2484);
INCLUDE_ASM(s32, "code_F5750", func_802D249C);
INCLUDE_ASM(s32, "code_F5750", func_802D24F4);
ApiStatus func_802D24F4(ScriptInstance* script, s32 isInitialCall) {
return (gPlayerStatus.moveFrames == 0) * 2;
}
INCLUDE_ASM(s32, "code_F5750", func_802D2508);

83
src/code_f2470_len_27f0.c
View File

@ -35,11 +35,35 @@ ApiStatus GetNpcPointer(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
#ifdef NON_MATCHING
ApiStatus SetNpcPos(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcId npcID = get_variable(script, *args++);
f32 x = get_variable(script, *args++);
f32 y = get_variable(script, *args++);
f32 z = get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcID);
if (npc == NULL) {
return ApiStatus_DONE2;
}
npc->pos.x = x;
npc->pos.y = y;
npc->pos.z = z;
npc->colliderPos.x = x;
npc->colliderPos.y = y;
npc->colliderPos.z = z;
npc->flags |= 0x10000;
return ApiStatus_DONE2;
}
#else
INCLUDE_ASM(s32, "code_f2470_len_27f0", SetNpcPos, ScriptInstance* script, s32 isInitialCall);
#endif
ApiStatus SetNpcRotation(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 npcID = get_variable(script, *args++);
NpcId npcID = get_variable(script, *args++);
f32 rotX = get_float_variable(script, *args++);
f32 rotY = get_float_variable(script, *args++);
f32 rotZ = get_float_variable(script, *args++);
@ -404,7 +428,23 @@ ApiStatus PartnerIsFlying(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFD30);
ApiStatus func_802CFD30(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcId npcId = get_variable(script, *args++);
Bytecode var1 = get_variable(script, *args++);
Bytecode var2 = get_variable(script, *args++);
Bytecode var3 = get_variable(script, *args++);
Bytecode var4 = get_variable(script, *args++);
Bytecode var5 = get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcId);
if (npc == NULL) {
return ApiStatus_DONE2;
}
func_8003D624(npc, var1, var2, var3, var4, var5, npc->unk_A2);
return ApiStatus_DONE2;
}
ApiStatus func_802CFE2C(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
@ -434,9 +474,44 @@ ApiStatus func_802CFE80(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFEEC);
ApiStatus func_802CFEEC(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcId npcId = get_variable(script, *args++);
Bytecode var1 = get_variable(script, *args++);
Bytecode var2 = get_variable(script, *args++);
Bytecode var3 = get_variable(script, *args++);
Bytecode var4 = get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcId);
INCLUDE_ASM(s32, "code_f2470_len_27f0", func_802CFFC0);
if (npc == NULL) {
return ApiStatus_DONE2;
}
func_8003B44C(npc, var1, var2, var3, var4);
return ApiStatus_DONE2;
}
ApiStatus func_802CFFC0(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
NpcId npcId = get_variable(script, *args++);
Bytecode var1 = get_variable(script, *args++);
Bytecode var2 = get_variable(script, *args++);
Bytecode var3 = get_variable(script, *args++);
Bytecode var4 = get_variable(script, *args++);
Bytecode var5 = get_variable(script, *args++);
Bytecode var6 = get_variable(script, *args++);
Bytecode var7 = get_variable(script, *args++);
Bytecode var8 = get_variable(script, *args++);
Npc* npc = resolve_npc(script, npcId);
if (npc == NULL) {
return ApiStatus_DONE2;
}
func_8003B44C(npc, var1, var2, var3, var4);
func_8003B464(npc, var5, var6, var7, var8);
return ApiStatus_DONE2;
}
ApiStatus SetNpcEffect(ScriptInstance* script, s32 isInitialCall) {
Bytecode* ptrReadPos = script->ptrReadPos;

11
src/code_f270_len_1190.c
View File

@ -1,12 +1,16 @@
#include "common.h"
void func_800343A4();
INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_logos);
INCLUDE_ASM(s32, "code_f270_len_1190", step_logos);
INCLUDE_ASM(s32, "code_f270_len_1190", func_80034388);
void func_80034388(void) {
func_800343A4();
}
INCLUDE_ASM(s32, "code_f270_len_1190", func_800343A4);
INCLUDE_ASM(void, "code_f270_len_1190", func_800343A4);
INCLUDE_ASM(s32, "code_f270_len_1190", begin_state_pause_menu);
@ -19,4 +23,5 @@ INCLUDE_ASM(s32, "code_f270_len_1190", func_80034BFC);
INCLUDE_ASM(s32, "code_f270_len_1190", func_80034C3C);
INCLUDE_ASM(s32, "code_f270_len_1190", func_80034FF0);
void func_80034FF0(void) {
}

1
src/code_fa4c0_len_3bf0.c
View File

@ -77,7 +77,6 @@ ApiStatus func_802D6090(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}
//INCLUDE_ASM(s32, "code_fa4c0_len_3bf0", ClearAmbientSounds);
ApiStatus ClearAmbientSounds(ScriptInstance* script, s32 isInitialCall) {
Bytecode* args = script->ptrReadPos;
s32 flags = get_variable(script, *args++);

18
src/world/area_gv/gv_01/E1E460.c
View File

@ -16,6 +16,22 @@ INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_8024023C_E1E69C);
#include "world/common/UnkTexturePanFunc2.inc.c"
INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_802405EC_E1EA4C);
ApiStatus func_802405EC_E1EA4C(ScriptInstance* script, s32 isInitialCall) {
if (isInitialCall) {
script->functionTemp[0].s = 0;
set_curtain_scale_goal(1.0);
set_curtain_fade(0);
}
script->functionTemp[0].s += 5;
if (script->functionTemp[0].s > 255) {
script->functionTemp[0].s = 255;
}
func_80137E10(1, 208, 208, 208);
func_80137DA4(0, script->functionTemp[0].s);
func_801380D4(1, 0);
return script->functionTemp[0].s == 255;
}
INCLUDE_ASM(s32, "world/area_gv/gv_01/E1E460", func_80240688_E1EAE8);

39
src/world/area_mac/mac_00/7EAD10.c
View File

@ -4,7 +4,33 @@
#include "world/common/GetCurrentFloor.inc.c"
#ifdef NON_MATCHING
ApiStatus func_80240034_7EAD44(ScriptInstance* script, s32 isInitialCall) {
s32 stickY;
s32 stickX;
if (gCollisionStatus.currentFloor != script->varTable[11]) {
script->varTable[0] = 0;
return ApiStatus_DONE2;
}
stickX = GAME_STATUS->stickX;
stickY = GAME_STATUS->stickY;
if (stickX < 0) {
stickX = -stickX;
}
if ((stickX != 0) || (stickY != 0)) {
if (atan2(0.0f, 0.0f, stickX, stickY) < 60.0f) {
script->varTable[0] = 1;
return ApiStatus_DONE2;
}
}
return ApiStatus_BLOCK;
}
#else
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240034_7EAD44);
#endif
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802400F0_7EAE00);
@ -16,6 +42,15 @@ INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_8024023C_7EAF4C);
#include "world/common/UnkTexturePanFunc2.inc.c"
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_802405EC_7EB2FC);
ApiStatus func_802405EC_7EB2FC(ScriptInstance* script, s32 isInitialCall) {
f32 x;
f32 y;
f32 z;
INCLUDE_ASM(s32, "world/area_mac/mac_00/7EAD10", func_80240624_7EB334);
get_collider_center(get_variable(script, *script->ptrReadPos), &x, &y, &z);
return ApiStatus_DONE2;
}
ApiStatus func_80240624_7EB334(ScriptInstance* script, s32 isInitialCall) {
return ApiStatus_DONE2;
}