mirror of https://github.com/pmret/papermario.git
more cleanup
This commit is contained in:
Ethan Roseman
parent
69a29dc8fc
commit
7a7f24431f
|
|
@ -1,73 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240040_934080
|
||||
/* 934080 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28
|
||||
/* 934084 80240044 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
/* 934088 80240048 0080982D */ daddu $s3, $a0, $zero
|
||||
/* 93408C 8024004C AFBF0024 */ sw $ra, 0x24($sp)
|
||||
/* 934090 80240050 AFB40020 */ sw $s4, 0x20($sp)
|
||||
/* 934094 80240054 AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 934098 80240058 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 93409C 8024005C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 9340A0 80240060 8E70000C */ lw $s0, 0xc($s3)
|
||||
/* 9340A4 80240064 50A0001D */ beql $a1, $zero, .L802400DC
|
||||
/* 9340A8 80240068 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 9340AC 8024006C 8E050000 */ lw $a1, ($s0)
|
||||
/* 9340B0 80240070 0C0B1EAF */ jal get_variable
|
||||
/* 9340B4 80240074 26100004 */ addiu $s0, $s0, 4
|
||||
/* 9340B8 80240078 8E050000 */ lw $a1, ($s0)
|
||||
/* 9340BC 8024007C 26100004 */ addiu $s0, $s0, 4
|
||||
/* 9340C0 80240080 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 9340C4 80240084 0C0B1EAF */ jal get_variable
|
||||
/* 9340C8 80240088 0040882D */ daddu $s1, $v0, $zero
|
||||
/* 9340CC 8024008C 0040A02D */ daddu $s4, $v0, $zero
|
||||
/* 9340D0 80240090 2402FFFF */ addiu $v0, $zero, -1
|
||||
/* 9340D4 80240094 8E120000 */ lw $s2, ($s0)
|
||||
/* 9340D8 80240098 16220004 */ bne $s1, $v0, .L802400AC
|
||||
/* 9340DC 8024009C 3C02EFE8 */ lui $v0, 0xefe8
|
||||
/* 9340E0 802400A0 8E64014C */ lw $a0, 0x14c($s3)
|
||||
/* 9340E4 802400A4 08090030 */ j .L802400C0
|
||||
/* 9340E8 802400A8 00000000 */ nop
|
||||
.L802400AC:
|
||||
/* 9340EC 802400AC 34422080 */ ori $v0, $v0, 0x2080
|
||||
/* 9340F0 802400B0 0222102A */ slt $v0, $s1, $v0
|
||||
/* 9340F4 802400B4 14400005 */ bnez $v0, .L802400CC
|
||||
/* 9340F8 802400B8 0220802D */ daddu $s0, $s1, $zero
|
||||
/* 9340FC 802400BC 0220202D */ daddu $a0, $s1, $zero
|
||||
.L802400C0:
|
||||
/* 934100 802400C0 0C00EABB */ jal get_npc_unsafe
|
||||
/* 934104 802400C4 00000000 */ nop
|
||||
/* 934108 802400C8 0040802D */ daddu $s0, $v0, $zero
|
||||
.L802400CC:
|
||||
/* 93410C 802400CC AE700070 */ sw $s0, 0x70($s3)
|
||||
/* 934110 802400D0 AE740074 */ sw $s4, 0x74($s3)
|
||||
/* 934114 802400D4 AE720078 */ sw $s2, 0x78($s3)
|
||||
/* 934118 802400D8 0260202D */ daddu $a0, $s3, $zero
|
||||
.L802400DC:
|
||||
/* 93411C 802400DC 8C900070 */ lw $s0, 0x70($a0)
|
||||
/* 934120 802400E0 8C850078 */ lw $a1, 0x78($a0)
|
||||
/* 934124 802400E4 0C0B1EAF */ jal get_variable
|
||||
/* 934128 802400E8 8C940074 */ lw $s4, 0x74($a0)
|
||||
/* 93412C 802400EC 1040000C */ beqz $v0, .L80240120
|
||||
/* 934130 802400F0 24020002 */ addiu $v0, $zero, 2
|
||||
/* 934134 802400F4 C602003C */ lwc1 $f2, 0x3c($s0)
|
||||
/* 934138 802400F8 3C0141F0 */ lui $at, 0x41f0
|
||||
/* 93413C 802400FC 44810000 */ mtc1 $at, $f0
|
||||
/* 934140 80240100 00000000 */ nop
|
||||
/* 934144 80240104 46001080 */ add.s $f2, $f2, $f0
|
||||
/* 934148 80240108 8E050038 */ lw $a1, 0x38($s0)
|
||||
/* 93414C 8024010C 8E070040 */ lw $a3, 0x40($s0)
|
||||
/* 934150 80240110 44061000 */ mfc1 $a2, $f2
|
||||
/* 934154 80240114 0C04D083 */ jal set_item_entity_position
|
||||
/* 934158 80240118 0280202D */ daddu $a0, $s4, $zero
|
||||
/* 93415C 8024011C 0000102D */ daddu $v0, $zero, $zero
|
||||
.L80240120:
|
||||
/* 934160 80240120 8FBF0024 */ lw $ra, 0x24($sp)
|
||||
/* 934164 80240124 8FB40020 */ lw $s4, 0x20($sp)
|
||||
/* 934168 80240128 8FB3001C */ lw $s3, 0x1c($sp)
|
||||
/* 93416C 8024012C 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 934170 80240130 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 934174 80240134 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 934178 80240138 03E00008 */ jr $ra
|
||||
/* 93417C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240040_935820
|
||||
/* 935820 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28
|
||||
/* 935824 80240044 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
/* 935828 80240048 0080982D */ daddu $s3, $a0, $zero
|
||||
/* 93582C 8024004C AFBF0024 */ sw $ra, 0x24($sp)
|
||||
/* 935830 80240050 AFB40020 */ sw $s4, 0x20($sp)
|
||||
/* 935834 80240054 AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 935838 80240058 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 93583C 8024005C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 935840 80240060 8E70000C */ lw $s0, 0xc($s3)
|
||||
/* 935844 80240064 50A0001D */ beql $a1, $zero, .L802400DC
|
||||
/* 935848 80240068 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 93584C 8024006C 8E050000 */ lw $a1, ($s0)
|
||||
/* 935850 80240070 0C0B1EAF */ jal get_variable
|
||||
/* 935854 80240074 26100004 */ addiu $s0, $s0, 4
|
||||
/* 935858 80240078 8E050000 */ lw $a1, ($s0)
|
||||
/* 93585C 8024007C 26100004 */ addiu $s0, $s0, 4
|
||||
/* 935860 80240080 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 935864 80240084 0C0B1EAF */ jal get_variable
|
||||
/* 935868 80240088 0040882D */ daddu $s1, $v0, $zero
|
||||
/* 93586C 8024008C 0040A02D */ daddu $s4, $v0, $zero
|
||||
/* 935870 80240090 2402FFFF */ addiu $v0, $zero, -1
|
||||
/* 935874 80240094 8E120000 */ lw $s2, ($s0)
|
||||
/* 935878 80240098 16220004 */ bne $s1, $v0, .L802400AC
|
||||
/* 93587C 8024009C 3C02EFE8 */ lui $v0, 0xefe8
|
||||
/* 935880 802400A0 8E64014C */ lw $a0, 0x14c($s3)
|
||||
/* 935884 802400A4 08090030 */ j .L802400C0
|
||||
/* 935888 802400A8 00000000 */ nop
|
||||
.L802400AC:
|
||||
/* 93588C 802400AC 34422080 */ ori $v0, $v0, 0x2080
|
||||
/* 935890 802400B0 0222102A */ slt $v0, $s1, $v0
|
||||
/* 935894 802400B4 14400005 */ bnez $v0, .L802400CC
|
||||
/* 935898 802400B8 0220802D */ daddu $s0, $s1, $zero
|
||||
/* 93589C 802400BC 0220202D */ daddu $a0, $s1, $zero
|
||||
.L802400C0:
|
||||
/* 9358A0 802400C0 0C00EABB */ jal get_npc_unsafe
|
||||
/* 9358A4 802400C4 00000000 */ nop
|
||||
/* 9358A8 802400C8 0040802D */ daddu $s0, $v0, $zero
|
||||
.L802400CC:
|
||||
/* 9358AC 802400CC AE700070 */ sw $s0, 0x70($s3)
|
||||
/* 9358B0 802400D0 AE740074 */ sw $s4, 0x74($s3)
|
||||
/* 9358B4 802400D4 AE720078 */ sw $s2, 0x78($s3)
|
||||
/* 9358B8 802400D8 0260202D */ daddu $a0, $s3, $zero
|
||||
.L802400DC:
|
||||
/* 9358BC 802400DC 8C900070 */ lw $s0, 0x70($a0)
|
||||
/* 9358C0 802400E0 8C850078 */ lw $a1, 0x78($a0)
|
||||
/* 9358C4 802400E4 0C0B1EAF */ jal get_variable
|
||||
/* 9358C8 802400E8 8C940074 */ lw $s4, 0x74($a0)
|
||||
/* 9358CC 802400EC 1040000C */ beqz $v0, .L80240120
|
||||
/* 9358D0 802400F0 24020002 */ addiu $v0, $zero, 2
|
||||
/* 9358D4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0)
|
||||
/* 9358D8 802400F8 3C0141F0 */ lui $at, 0x41f0
|
||||
/* 9358DC 802400FC 44810000 */ mtc1 $at, $f0
|
||||
/* 9358E0 80240100 00000000 */ nop
|
||||
/* 9358E4 80240104 46001080 */ add.s $f2, $f2, $f0
|
||||
/* 9358E8 80240108 8E050038 */ lw $a1, 0x38($s0)
|
||||
/* 9358EC 8024010C 8E070040 */ lw $a3, 0x40($s0)
|
||||
/* 9358F0 80240110 44061000 */ mfc1 $a2, $f2
|
||||
/* 9358F4 80240114 0C04D083 */ jal set_item_entity_position
|
||||
/* 9358F8 80240118 0280202D */ daddu $a0, $s4, $zero
|
||||
/* 9358FC 8024011C 0000102D */ daddu $v0, $zero, $zero
|
||||
.L80240120:
|
||||
/* 935900 80240120 8FBF0024 */ lw $ra, 0x24($sp)
|
||||
/* 935904 80240124 8FB40020 */ lw $s4, 0x20($sp)
|
||||
/* 935908 80240128 8FB3001C */ lw $s3, 0x1c($sp)
|
||||
/* 93590C 8024012C 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 935910 80240130 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 935914 80240134 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 935918 80240138 03E00008 */ jr $ra
|
||||
/* 93591C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240040_939970
|
||||
/* 939970 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28
|
||||
/* 939974 80240044 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
/* 939978 80240048 0080982D */ daddu $s3, $a0, $zero
|
||||
/* 93997C 8024004C AFBF0024 */ sw $ra, 0x24($sp)
|
||||
/* 939980 80240050 AFB40020 */ sw $s4, 0x20($sp)
|
||||
/* 939984 80240054 AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 939988 80240058 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 93998C 8024005C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 939990 80240060 8E70000C */ lw $s0, 0xc($s3)
|
||||
/* 939994 80240064 50A0001D */ beql $a1, $zero, .L802400DC
|
||||
/* 939998 80240068 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 93999C 8024006C 8E050000 */ lw $a1, ($s0)
|
||||
/* 9399A0 80240070 0C0B1EAF */ jal get_variable
|
||||
/* 9399A4 80240074 26100004 */ addiu $s0, $s0, 4
|
||||
/* 9399A8 80240078 8E050000 */ lw $a1, ($s0)
|
||||
/* 9399AC 8024007C 26100004 */ addiu $s0, $s0, 4
|
||||
/* 9399B0 80240080 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 9399B4 80240084 0C0B1EAF */ jal get_variable
|
||||
/* 9399B8 80240088 0040882D */ daddu $s1, $v0, $zero
|
||||
/* 9399BC 8024008C 0040A02D */ daddu $s4, $v0, $zero
|
||||
/* 9399C0 80240090 2402FFFF */ addiu $v0, $zero, -1
|
||||
/* 9399C4 80240094 8E120000 */ lw $s2, ($s0)
|
||||
/* 9399C8 80240098 16220004 */ bne $s1, $v0, .L802400AC
|
||||
/* 9399CC 8024009C 3C02EFE8 */ lui $v0, 0xefe8
|
||||
/* 9399D0 802400A0 8E64014C */ lw $a0, 0x14c($s3)
|
||||
/* 9399D4 802400A4 08090030 */ j .L802400C0
|
||||
/* 9399D8 802400A8 00000000 */ nop
|
||||
.L802400AC:
|
||||
/* 9399DC 802400AC 34422080 */ ori $v0, $v0, 0x2080
|
||||
/* 9399E0 802400B0 0222102A */ slt $v0, $s1, $v0
|
||||
/* 9399E4 802400B4 14400005 */ bnez $v0, .L802400CC
|
||||
/* 9399E8 802400B8 0220802D */ daddu $s0, $s1, $zero
|
||||
/* 9399EC 802400BC 0220202D */ daddu $a0, $s1, $zero
|
||||
.L802400C0:
|
||||
/* 9399F0 802400C0 0C00EABB */ jal get_npc_unsafe
|
||||
/* 9399F4 802400C4 00000000 */ nop
|
||||
/* 9399F8 802400C8 0040802D */ daddu $s0, $v0, $zero
|
||||
.L802400CC:
|
||||
/* 9399FC 802400CC AE700070 */ sw $s0, 0x70($s3)
|
||||
/* 939A00 802400D0 AE740074 */ sw $s4, 0x74($s3)
|
||||
/* 939A04 802400D4 AE720078 */ sw $s2, 0x78($s3)
|
||||
/* 939A08 802400D8 0260202D */ daddu $a0, $s3, $zero
|
||||
.L802400DC:
|
||||
/* 939A0C 802400DC 8C900070 */ lw $s0, 0x70($a0)
|
||||
/* 939A10 802400E0 8C850078 */ lw $a1, 0x78($a0)
|
||||
/* 939A14 802400E4 0C0B1EAF */ jal get_variable
|
||||
/* 939A18 802400E8 8C940074 */ lw $s4, 0x74($a0)
|
||||
/* 939A1C 802400EC 1040000C */ beqz $v0, .L80240120
|
||||
/* 939A20 802400F0 24020002 */ addiu $v0, $zero, 2
|
||||
/* 939A24 802400F4 C602003C */ lwc1 $f2, 0x3c($s0)
|
||||
/* 939A28 802400F8 3C0141F0 */ lui $at, 0x41f0
|
||||
/* 939A2C 802400FC 44810000 */ mtc1 $at, $f0
|
||||
/* 939A30 80240100 00000000 */ nop
|
||||
/* 939A34 80240104 46001080 */ add.s $f2, $f2, $f0
|
||||
/* 939A38 80240108 8E050038 */ lw $a1, 0x38($s0)
|
||||
/* 939A3C 8024010C 8E070040 */ lw $a3, 0x40($s0)
|
||||
/* 939A40 80240110 44061000 */ mfc1 $a2, $f2
|
||||
/* 939A44 80240114 0C04D083 */ jal set_item_entity_position
|
||||
/* 939A48 80240118 0280202D */ daddu $a0, $s4, $zero
|
||||
/* 939A4C 8024011C 0000102D */ daddu $v0, $zero, $zero
|
||||
.L80240120:
|
||||
/* 939A50 80240120 8FBF0024 */ lw $ra, 0x24($sp)
|
||||
/* 939A54 80240124 8FB40020 */ lw $s4, 0x20($sp)
|
||||
/* 939A58 80240128 8FB3001C */ lw $s3, 0x1c($sp)
|
||||
/* 939A5C 8024012C 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 939A60 80240130 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 939A64 80240134 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 939A68 80240138 03E00008 */ jr $ra
|
||||
/* 939A6C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
.set noat # allow manual use of $at
|
||||
.set noreorder # don't insert nops after branches
|
||||
|
||||
glabel func_80240040_93DD10
|
||||
/* 93DD10 80240040 27BDFFD8 */ addiu $sp, $sp, -0x28
|
||||
/* 93DD14 80240044 AFB3001C */ sw $s3, 0x1c($sp)
|
||||
/* 93DD18 80240048 0080982D */ daddu $s3, $a0, $zero
|
||||
/* 93DD1C 8024004C AFBF0024 */ sw $ra, 0x24($sp)
|
||||
/* 93DD20 80240050 AFB40020 */ sw $s4, 0x20($sp)
|
||||
/* 93DD24 80240054 AFB20018 */ sw $s2, 0x18($sp)
|
||||
/* 93DD28 80240058 AFB10014 */ sw $s1, 0x14($sp)
|
||||
/* 93DD2C 8024005C AFB00010 */ sw $s0, 0x10($sp)
|
||||
/* 93DD30 80240060 8E70000C */ lw $s0, 0xc($s3)
|
||||
/* 93DD34 80240064 50A0001D */ beql $a1, $zero, .L802400DC
|
||||
/* 93DD38 80240068 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 93DD3C 8024006C 8E050000 */ lw $a1, ($s0)
|
||||
/* 93DD40 80240070 0C0B1EAF */ jal get_variable
|
||||
/* 93DD44 80240074 26100004 */ addiu $s0, $s0, 4
|
||||
/* 93DD48 80240078 8E050000 */ lw $a1, ($s0)
|
||||
/* 93DD4C 8024007C 26100004 */ addiu $s0, $s0, 4
|
||||
/* 93DD50 80240080 0260202D */ daddu $a0, $s3, $zero
|
||||
/* 93DD54 80240084 0C0B1EAF */ jal get_variable
|
||||
/* 93DD58 80240088 0040882D */ daddu $s1, $v0, $zero
|
||||
/* 93DD5C 8024008C 0040A02D */ daddu $s4, $v0, $zero
|
||||
/* 93DD60 80240090 2402FFFF */ addiu $v0, $zero, -1
|
||||
/* 93DD64 80240094 8E120000 */ lw $s2, ($s0)
|
||||
/* 93DD68 80240098 16220004 */ bne $s1, $v0, .L802400AC
|
||||
/* 93DD6C 8024009C 3C02EFE8 */ lui $v0, 0xefe8
|
||||
/* 93DD70 802400A0 8E64014C */ lw $a0, 0x14c($s3)
|
||||
/* 93DD74 802400A4 08090030 */ j .L802400C0
|
||||
/* 93DD78 802400A8 00000000 */ nop
|
||||
.L802400AC:
|
||||
/* 93DD7C 802400AC 34422080 */ ori $v0, $v0, 0x2080
|
||||
/* 93DD80 802400B0 0222102A */ slt $v0, $s1, $v0
|
||||
/* 93DD84 802400B4 14400005 */ bnez $v0, .L802400CC
|
||||
/* 93DD88 802400B8 0220802D */ daddu $s0, $s1, $zero
|
||||
/* 93DD8C 802400BC 0220202D */ daddu $a0, $s1, $zero
|
||||
.L802400C0:
|
||||
/* 93DD90 802400C0 0C00EABB */ jal get_npc_unsafe
|
||||
/* 93DD94 802400C4 00000000 */ nop
|
||||
/* 93DD98 802400C8 0040802D */ daddu $s0, $v0, $zero
|
||||
.L802400CC:
|
||||
/* 93DD9C 802400CC AE700070 */ sw $s0, 0x70($s3)
|
||||
/* 93DDA0 802400D0 AE740074 */ sw $s4, 0x74($s3)
|
||||
/* 93DDA4 802400D4 AE720078 */ sw $s2, 0x78($s3)
|
||||
/* 93DDA8 802400D8 0260202D */ daddu $a0, $s3, $zero
|
||||
.L802400DC:
|
||||
/* 93DDAC 802400DC 8C900070 */ lw $s0, 0x70($a0)
|
||||
/* 93DDB0 802400E0 8C850078 */ lw $a1, 0x78($a0)
|
||||
/* 93DDB4 802400E4 0C0B1EAF */ jal get_variable
|
||||
/* 93DDB8 802400E8 8C940074 */ lw $s4, 0x74($a0)
|
||||
/* 93DDBC 802400EC 1040000C */ beqz $v0, .L80240120
|
||||
/* 93DDC0 802400F0 24020002 */ addiu $v0, $zero, 2
|
||||
/* 93DDC4 802400F4 C602003C */ lwc1 $f2, 0x3c($s0)
|
||||
/* 93DDC8 802400F8 3C0141F0 */ lui $at, 0x41f0
|
||||
/* 93DDCC 802400FC 44810000 */ mtc1 $at, $f0
|
||||
/* 93DDD0 80240100 00000000 */ nop
|
||||
/* 93DDD4 80240104 46001080 */ add.s $f2, $f2, $f0
|
||||
/* 93DDD8 80240108 8E050038 */ lw $a1, 0x38($s0)
|
||||
/* 93DDDC 8024010C 8E070040 */ lw $a3, 0x40($s0)
|
||||
/* 93DDE0 80240110 44061000 */ mfc1 $a2, $f2
|
||||
/* 93DDE4 80240114 0C04D083 */ jal set_item_entity_position
|
||||
/* 93DDE8 80240118 0280202D */ daddu $a0, $s4, $zero
|
||||
/* 93DDEC 8024011C 0000102D */ daddu $v0, $zero, $zero
|
||||
.L80240120:
|
||||
/* 93DDF0 80240120 8FBF0024 */ lw $ra, 0x24($sp)
|
||||
/* 93DDF4 80240124 8FB40020 */ lw $s4, 0x20($sp)
|
||||
/* 93DDF8 80240128 8FB3001C */ lw $s3, 0x1c($sp)
|
||||
/* 93DDFC 8024012C 8FB20018 */ lw $s2, 0x18($sp)
|
||||
/* 93DE00 80240130 8FB10014 */ lw $s1, 0x14($sp)
|
||||
/* 93DE04 80240134 8FB00010 */ lw $s0, 0x10($sp)
|
||||
/* 93DE08 80240138 03E00008 */ jr $ra
|
||||
/* 93DE0C 8024013C 27BD0028 */ addiu $sp, $sp, 0x28
|
||||
|
|
@ -495,7 +495,6 @@ ApiStatus GetPlayerHP(ScriptInstance* script, s32 isInitialCall) {
|
|||
return ApiStatus_DONE2;
|
||||
}
|
||||
|
||||
|
||||
INCLUDE_ASM(s32, "code_197F40", PlayerDamageEnemy);
|
||||
|
||||
INCLUDE_ASM(s32, "code_197F40", PlayerPowerBounceEnemy);
|
||||
|
|
|
|||
|
|
@ -104,7 +104,6 @@ s32 get_global_flag(s32 index) {
|
|||
return flag;
|
||||
}
|
||||
|
||||
|
||||
s8 set_global_byte(s32 index, s8 value) {
|
||||
SaveData* saveFile = &gCurrentSaveFile;
|
||||
s32 ret = saveFile->globalBytes[index];
|
||||
|
|
|
|||
|
|
@ -508,7 +508,6 @@ void kill_script_by_ID(s32 id) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
void kill_all_scripts(void) {
|
||||
s32 i;
|
||||
ScriptInstance* scriptContextPtr;
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ static s32 contRmbRetrace(NUSiCommonMesg* mesg) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
// Will match when data is decompiled.
|
||||
void nuContRmbMgrInit(void) {
|
||||
|
|
|
|||
1
src/si.c
1
src/si.c
|
|
@ -445,7 +445,6 @@ ApiStatus si_handle_case_AND(ScriptInstance* script) {
|
|||
do {} while (0); // Necessary to match
|
||||
}
|
||||
|
||||
|
||||
INCLUDE_ASM(s32, "si", si_handle_case_equal_OR);
|
||||
|
||||
INCLUDE_ASM(s32, "si", si_handle_case_equal_AND);
|
||||
|
|
|
|||
|
|
@ -13,5 +13,3 @@ INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_80243770_95E970);
|
|||
INCLUDE_ASM(s32, "world/area_dro/dro_01/95E7A0", func_802437DC_95E9DC);
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,5 +7,3 @@ INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240040_CA72E0);
|
|||
INCLUDE_ASM(s32, "world/area_flo/flo_03/CA72E0", func_80240158_CA73F8);
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_sbk/sbk_11/934080", func_80240040_934080);
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SetNpcB5_3.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_sbk/sbk_13/935820", func_80240040_935820);
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SetNpcB5_3.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_sbk/sbk_22/939970", func_80240040_939970);
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SetNpcB5_3.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,4 +3,3 @@
|
|||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
INCLUDE_ASM(s32, "world/area_sbk/sbk_26/93DD10", func_80240040_93DD10);
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SetNpcB5_3.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "world/common/Bandit_DropCoin.inc.c"
|
||||
|
||||
#include "world/common/SomeMatrixOperations.inc.c"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ ApiStatus func_802BD114_324F10(ScriptInstance* script, s32 isInitialCall) {
|
|||
return func_800EECE8(owner) != 0;
|
||||
}
|
||||
|
||||
|
||||
ApiStatus func_802BD14C_324F10(ScriptInstance* script, s32 isInitialCall) {
|
||||
PlayerData* playerData = &gPlayerData;
|
||||
Npc* owner = script->owner2.npc;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ ApiStatus func_802BD114(ScriptInstance* script, s32 isInitialCall) {
|
|||
return func_800EECE8(owner) != 0;
|
||||
}
|
||||
|
||||
|
||||
INCLUDE_ASM(s32, "world_goompa", func_802BD14C);
|
||||
|
||||
INCLUDE_ASM(s32, "world_goompa", func_802BD4E0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue