pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-09-18 23:42:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

matched a fire flower func to explain decomp to a friend so here's a PR (#211)

Browse Source 
* matched a fire flower func to explain decomp to a friend so here's a PR

* remove unnecessary line
This commit is contained in:
Ethan Roseman 2021-03-13 10:59:26 -05:00 committed by GitHub
parent a1f7a21114
commit 8a734c15cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/battle/item/fire_flower_716C60.c
View File

@ -1,8 +1,18 @@
#include "common.h"
extern s32 D_802A1D70;
INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A1000_716C60);
INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A11D4_716E34);
ApiStatus func_802A11D4_716E34(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battlestatus = &gBattleStatus;
s32 sellValue = gItemTable[battlestatus->selectedItemID].sellValue;
if (heroes_is_ability_active(battlestatus->playerActor, Ability_REFUND) && sellValue > 0) {
free_icon(D_802A1D70);
}
return ApiStatus_DONE2;
}
INCLUDE_ASM(s32, "battle/item/fire_flower_716C60", func_802A123C_716E9C);

31
ver/us/asm/nonmatchings/battle/item/fire_flower_716C60/func_802A11D4_716E34.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A11D4_716E34
/* 716E34 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 716E38 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 716E3C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 716E40 802A11E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 716E44 802A11E4 AFB00010 */ sw $s0, 0x10($sp)
/* 716E48 802A11E8 8462017A */ lh $v0, 0x17a($v1)
/* 716E4C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1)
/* 716E50 802A11F0 00021140 */ sll $v0, $v0, 5
/* 716E54 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC)
/* 716E58 802A11F8 02028021 */ addu $s0, $s0, $v0
/* 716E5C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0)
/* 716E60 802A1200 0C099CAB */ jal heroes_is_ability_active
/* 716E64 802A1204 2405001D */ addiu $a1, $zero, 0x1d
/* 716E68 802A1208 10400007 */ beqz $v0, .L802A1228
/* 716E6C 802A120C 00000000 */ nop
/* 716E70 802A1210 1A000005 */ blez $s0, .L802A1228
/* 716E74 802A1214 00000000 */ nop
/* 716E78 802A1218 3C04802A */ lui $a0, %hi(D_802A1D70)
/* 716E7C 802A121C 8C841D70 */ lw $a0, %lo(D_802A1D70)($a0)
/* 716E80 802A1220 0C05123D */ jal free_icon
/* 716E84 802A1224 00000000 */ nop
.L802A1228:
/* 716E88 802A1228 8FBF0014 */ lw $ra, 0x14($sp)
/* 716E8C 802A122C 8FB00010 */ lw $s0, 0x10($sp)
/* 716E90 802A1230 24020002 */ addiu $v0, $zero, 2
/* 716E94 802A1234 03E00008 */ jr $ra
/* 716E98 802A1238 27BD0018 */ addiu $sp, $sp, 0x18

125
ver/us/asm/nonmatchings/code_716C60/func_802A1000_716C60.s
View File

@ -1,125 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A1000_716C60
/* 716C60 802A1000 27BDFF98 */ addiu $sp, $sp, -0x68
/* 716C64 802A1004 AFB50044 */ sw $s5, 0x44($sp)
/* 716C68 802A1008 0080A82D */ daddu $s5, $a0, $zero
/* 716C6C 802A100C AFB10034 */ sw $s1, 0x34($sp)
/* 716C70 802A1010 0000882D */ daddu $s1, $zero, $zero
/* 716C74 802A1014 2405001D */ addiu $a1, $zero, 0x1d
/* 716C78 802A1018 F7B40050 */ sdc1 $f20, 0x50($sp)
/* 716C7C 802A101C 4480A000 */ mtc1 $zero, $f20
/* 716C80 802A1020 3C02800E */ lui $v0, %hi(gBattleStatus)
/* 716C84 802A1024 2442C070 */ addiu $v0, $v0, %lo(gBattleStatus)
/* 716C88 802A1028 AFBF0048 */ sw $ra, 0x48($sp)
/* 716C8C 802A102C AFB40040 */ sw $s4, 0x40($sp)
/* 716C90 802A1030 AFB3003C */ sw $s3, 0x3c($sp)
/* 716C94 802A1034 AFB20038 */ sw $s2, 0x38($sp)
/* 716C98 802A1038 AFB00030 */ sw $s0, 0x30($sp)
/* 716C9C 802A103C F7B80060 */ sdc1 $f24, 0x60($sp)
/* 716CA0 802A1040 F7B60058 */ sdc1 $f22, 0x58($sp)
/* 716CA4 802A1044 8C5300D8 */ lw $s3, 0xd8($v0)
/* 716CA8 802A1048 8442017A */ lh $v0, 0x17a($v0)
/* 716CAC 802A104C 0260202D */ daddu $a0, $s3, $zero
/* 716CB0 802A1050 00021140 */ sll $v0, $v0, 5
/* 716CB4 802A1054 3C128008 */ lui $s2, %hi(gItemTable+0xC)
/* 716CB8 802A1058 02429021 */ addu $s2, $s2, $v0
/* 716CBC 802A105C 865278EC */ lh $s2, %lo(gItemTable+0xC)($s2)
/* 716CC0 802A1060 92620191 */ lbu $v0, 0x191($s3)
/* 716CC4 802A1064 C6620148 */ lwc1 $f2, 0x148($s3)
/* 716CC8 802A1068 44820000 */ mtc1 $v0, $f0
/* 716CCC 802A106C 00000000 */ nop
/* 716CD0 802A1070 46800020 */ cvt.s.w $f0, $f0
/* 716CD4 802A1074 0C099CAB */ jal heroes_is_ability_active
/* 716CD8 802A1078 46001580 */ add.s $f22, $f2, $f0
/* 716CDC 802A107C 50400048 */ beql $v0, $zero, .L802A11A0
/* 716CE0 802A1080 AEB10084 */ sw $s1, 0x84($s5)
/* 716CE4 802A1084 1A400045 */ blez $s2, .L802A119C
/* 716CE8 802A1088 3C0451EB */ lui $a0, 0x51eb
/* 716CEC 802A108C 3484851F */ ori $a0, $a0, 0x851f
/* 716CF0 802A1090 00121880 */ sll $v1, $s2, 2
/* 716CF4 802A1094 00721821 */ addu $v1, $v1, $s2
/* 716CF8 802A1098 00031100 */ sll $v0, $v1, 4
/* 716CFC 802A109C 00431023 */ subu $v0, $v0, $v1
/* 716D00 802A10A0 24420063 */ addiu $v0, $v0, 0x63
/* 716D04 802A10A4 00440018 */ mult $v0, $a0
/* 716D08 802A10A8 000217C3 */ sra $v0, $v0, 0x1f
/* 716D0C 802A10AC 00004010 */ mfhi $t0
/* 716D10 802A10B0 00081943 */ sra $v1, $t0, 5
/* 716D14 802A10B4 00629023 */ subu $s2, $v1, $v0
/* 716D18 802A10B8 0232102A */ slt $v0, $s1, $s2
/* 716D1C 802A10BC 10400019 */ beqz $v0, .L802A1124
/* 716D20 802A10C0 0220802D */ daddu $s0, $s1, $zero
/* 716D24 802A10C4 24140017 */ addiu $s4, $zero, 0x17
/* 716D28 802A10C8 3C0141F0 */ lui $at, 0x41f0
/* 716D2C 802A10CC 4481C000 */ mtc1 $at, $f24
/* 716D30 802A10D0 24110001 */ addiu $s1, $zero, 1
.L802A10D4:
/* 716D34 802A10D4 C6600144 */ lwc1 $f0, 0x144($s3)
/* 716D38 802A10D8 C662014C */ lwc1 $f2, 0x14c($s3)
/* 716D3C 802A10DC 4600A10D */ trunc.w.s $f4, $f20
/* 716D40 802A10E0 E7A40018 */ swc1 $f4, 0x18($sp)
/* 716D44 802A10E4 24040157 */ addiu $a0, $zero, 0x157
/* 716D48 802A10E8 AFB10014 */ sw $s1, 0x14($sp)
/* 716D4C 802A10EC 26310003 */ addiu $s1, $s1, 3
/* 716D50 802A10F0 26100001 */ addiu $s0, $s0, 1
/* 716D54 802A10F4 4406B000 */ mfc1 $a2, $f22
/* 716D58 802A10F8 44050000 */ mfc1 $a1, $f0
/* 716D5C 802A10FC 44071000 */ mfc1 $a3, $f2
/* 716D60 802A1100 4618A500 */ add.s $f20, $f20, $f24
/* 716D64 802A1104 AFB40010 */ sw $s4, 0x10($sp)
/* 716D68 802A1108 0C04C4FD */ jal make_item_entity
/* 716D6C 802A110C AFA0001C */ sw $zero, 0x1c($sp)
/* 716D70 802A1110 0C03A830 */ jal add_coins
/* 716D74 802A1114 24040001 */ addiu $a0, $zero, 1
/* 716D78 802A1118 0212102A */ slt $v0, $s0, $s2
/* 716D7C 802A111C 1440FFED */ bnez $v0, .L802A10D4
/* 716D80 802A1120 00000000 */ nop
.L802A1124:
/* 716D84 802A1124 00101040 */ sll $v0, $s0, 1
/* 716D88 802A1128 00501021 */ addu $v0, $v0, $s0
/* 716D8C 802A112C 2451001E */ addiu $s1, $v0, 0x1e
/* 716D90 802A1130 C6600144 */ lwc1 $f0, 0x144($s3)
/* 716D94 802A1134 C6760148 */ lwc1 $f22, 0x148($s3)
/* 716D98 802A1138 C662014C */ lwc1 $f2, 0x14c($s3)
/* 716D9C 802A113C 3C048007 */ lui $a0, %hi(gCurrentCameraID)
/* 716DA0 802A1140 8C847410 */ lw $a0, %lo(gCurrentCameraID)($a0)
/* 716DA4 802A1144 27A20020 */ addiu $v0, $sp, 0x20
/* 716DA8 802A1148 AFA20010 */ sw $v0, 0x10($sp)
/* 716DAC 802A114C 27A20024 */ addiu $v0, $sp, 0x24
/* 716DB0 802A1150 AFA20014 */ sw $v0, 0x14($sp)
/* 716DB4 802A1154 44050000 */ mfc1 $a1, $f0
/* 716DB8 802A1158 4406B000 */ mfc1 $a2, $f22
/* 716DBC 802A115C 44071000 */ mfc1 $a3, $f2
/* 716DC0 802A1160 27A20028 */ addiu $v0, $sp, 0x28
/* 716DC4 802A1164 0C00B94E */ jal get_screen_coords
/* 716DC8 802A1168 AFA20018 */ sw $v0, 0x18($sp)
/* 716DCC 802A116C 3C048011 */ lui $a0, %hi(D_80108A64)
/* 716DD0 802A1170 24848A64 */ addiu $a0, $a0, %lo(D_80108A64)
/* 716DD4 802A1174 0C050529 */ jal create_icon
/* 716DD8 802A1178 00000000 */ nop
/* 716DDC 802A117C 8FA50020 */ lw $a1, 0x20($sp)
/* 716DE0 802A1180 8FA60024 */ lw $a2, 0x24($sp)
/* 716DE4 802A1184 0040202D */ daddu $a0, $v0, $zero
/* 716DE8 802A1188 3C01802A */ lui $at, %hi(D_802A1D70)
/* 716DEC 802A118C AC241D70 */ sw $a0, %lo(D_802A1D70)($at)
/* 716DF0 802A1190 24A50024 */ addiu $a1, $a1, 0x24
/* 716DF4 802A1194 0C051261 */ jal set_icon_render_pos
/* 716DF8 802A1198 24C6FFC1 */ addiu $a2, $a2, -0x3f
.L802A119C:
/* 716DFC 802A119C AEB10084 */ sw $s1, 0x84($s5)
.L802A11A0:
/* 716E00 802A11A0 8FBF0048 */ lw $ra, 0x48($sp)
/* 716E04 802A11A4 8FB50044 */ lw $s5, 0x44($sp)
/* 716E08 802A11A8 8FB40040 */ lw $s4, 0x40($sp)
/* 716E0C 802A11AC 8FB3003C */ lw $s3, 0x3c($sp)
/* 716E10 802A11B0 8FB20038 */ lw $s2, 0x38($sp)
/* 716E14 802A11B4 8FB10034 */ lw $s1, 0x34($sp)
/* 716E18 802A11B8 8FB00030 */ lw $s0, 0x30($sp)
/* 716E1C 802A11BC D7B80060 */ ldc1 $f24, 0x60($sp)
/* 716E20 802A11C0 D7B60058 */ ldc1 $f22, 0x58($sp)
/* 716E24 802A11C4 D7B40050 */ ldc1 $f20, 0x50($sp)
/* 716E28 802A11C8 24020002 */ addiu $v0, $zero, 2
/* 716E2C 802A11CC 03E00008 */ jr $ra
/* 716E30 802A11D0 27BD0068 */ addiu $sp, $sp, 0x68

31
ver/us/asm/nonmatchings/code_716C60/func_802A11D4_716E34.s
View File

@ -1,31 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A11D4_716E34
/* 716E34 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 716E38 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 716E3C 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 716E40 802A11E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 716E44 802A11E4 AFB00010 */ sw $s0, 0x10($sp)
/* 716E48 802A11E8 8462017A */ lh $v0, 0x17a($v1)
/* 716E4C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1)
/* 716E50 802A11F0 00021140 */ sll $v0, $v0, 5
/* 716E54 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC)
/* 716E58 802A11F8 02028021 */ addu $s0, $s0, $v0
/* 716E5C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0)
/* 716E60 802A1200 0C099CAB */ jal heroes_is_ability_active
/* 716E64 802A1204 2405001D */ addiu $a1, $zero, 0x1d
/* 716E68 802A1208 10400007 */ beqz $v0, .L802A1228
/* 716E6C 802A120C 00000000 */ nop
/* 716E70 802A1210 1A000005 */ blez $s0, .L802A1228
/* 716E74 802A1214 00000000 */ nop
/* 716E78 802A1218 3C04802A */ lui $a0, %hi(D_802A1D70)
/* 716E7C 802A121C 8C841D70 */ lw $a0, %lo(D_802A1D70)($a0)
/* 716E80 802A1220 0C05123D */ jal free_icon
/* 716E84 802A1224 00000000 */ nop
.L802A1228:
/* 716E88 802A1228 8FBF0014 */ lw $ra, 0x14($sp)
/* 716E8C 802A122C 8FB00010 */ lw $s0, 0x10($sp)
/* 716E90 802A1230 24020002 */ addiu $v0, $zero, 2
/* 716E94 802A1234 03E00008 */ jr $ra
/* 716E98 802A1238 27BD0018 */ addiu $sp, $sp, 0x18

45
ver/us/asm/nonmatchings/code_716C60/func_802A123C_716E9C.s
View File

@ -1,45 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A123C_716E9C
/* 716E9C 802A123C 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 716EA0 802A1240 AFB1001C */ sw $s1, 0x1c($sp)
/* 716EA4 802A1244 0080882D */ daddu $s1, $a0, $zero
/* 716EA8 802A1248 AFBF0024 */ sw $ra, 0x24($sp)
/* 716EAC 802A124C AFB20020 */ sw $s2, 0x20($sp)
/* 716EB0 802A1250 AFB00018 */ sw $s0, 0x18($sp)
/* 716EB4 802A1254 8E30000C */ lw $s0, 0xc($s1)
/* 716EB8 802A1258 8E050000 */ lw $a1, ($s0)
/* 716EBC 802A125C 0C0B1EAF */ jal get_variable
/* 716EC0 802A1260 26100004 */ addiu $s0, $s0, 4
/* 716EC4 802A1264 8E050000 */ lw $a1, ($s0)
/* 716EC8 802A1268 26100004 */ addiu $s0, $s0, 4
/* 716ECC 802A126C 0220202D */ daddu $a0, $s1, $zero
/* 716ED0 802A1270 0C0B1EAF */ jal get_variable
/* 716ED4 802A1274 0040902D */ daddu $s2, $v0, $zero
/* 716ED8 802A1278 0220202D */ daddu $a0, $s1, $zero
/* 716EDC 802A127C 8E050000 */ lw $a1, ($s0)
/* 716EE0 802A1280 0C0B1EAF */ jal get_variable
/* 716EE4 802A1284 0040802D */ daddu $s0, $v0, $zero
/* 716EE8 802A1288 44920000 */ mtc1 $s2, $f0
/* 716EEC 802A128C 00000000 */ nop
/* 716EF0 802A1290 46800020 */ cvt.s.w $f0, $f0
/* 716EF4 802A1294 44050000 */ mfc1 $a1, $f0
/* 716EF8 802A1298 44900000 */ mtc1 $s0, $f0
/* 716EFC 802A129C 00000000 */ nop
/* 716F00 802A12A0 46800020 */ cvt.s.w $f0, $f0
/* 716F04 802A12A4 44060000 */ mfc1 $a2, $f0
/* 716F08 802A12A8 44820000 */ mtc1 $v0, $f0
/* 716F0C 802A12AC 00000000 */ nop
/* 716F10 802A12B0 46800020 */ cvt.s.w $f0, $f0
/* 716F14 802A12B4 44070000 */ mfc1 $a3, $f0
/* 716F18 802A12B8 0000202D */ daddu $a0, $zero, $zero
/* 716F1C 802A12BC 0C01C40C */ jal func_80071030
/* 716F20 802A12C0 AFA00010 */ sw $zero, 0x10($sp)
/* 716F24 802A12C4 8FBF0024 */ lw $ra, 0x24($sp)
/* 716F28 802A12C8 8FB20020 */ lw $s2, 0x20($sp)
/* 716F2C 802A12CC 8FB1001C */ lw $s1, 0x1c($sp)
/* 716F30 802A12D0 8FB00018 */ lw $s0, 0x18($sp)
/* 716F34 802A12D4 24020002 */ addiu $v0, $zero, 2
/* 716F38 802A12D8 03E00008 */ jr $ra
/* 716F3C 802A12DC 27BD0028 */ addiu $sp, $sp, 0x28

41
ver/us/asm/nonmatchings/code_716C60/func_802A1378_716FD8.s
View File

@ -1,41 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A1378_716FD8
/* 716FD8 802A1378 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 716FDC 802A137C AFB00010 */ sw $s0, 0x10($sp)
/* 716FE0 802A1380 0080802D */ daddu $s0, $a0, $zero
/* 716FE4 802A1384 10A00003 */ beqz $a1, .L802A1394
/* 716FE8 802A1388 AFBF0014 */ sw $ra, 0x14($sp)
/* 716FEC 802A138C 24020014 */ addiu $v0, $zero, 0x14
/* 716FF0 802A1390 AE020070 */ sw $v0, 0x70($s0)
.L802A1394:
/* 716FF4 802A1394 0000202D */ daddu $a0, $zero, $zero
/* 716FF8 802A1398 0080282D */ daddu $a1, $a0, $zero
/* 716FFC 802A139C 8E020070 */ lw $v0, 0x70($s0)
/* 717000 802A13A0 0080302D */ daddu $a2, $a0, $zero
/* 717004 802A13A4 00023880 */ sll $a3, $v0, 2
/* 717008 802A13A8 00E23821 */ addu $a3, $a3, $v0
/* 71700C 802A13AC 00073840 */ sll $a3, $a3, 1
/* 717010 802A13B0 0C046F97 */ jal set_background_color_blend
/* 717014 802A13B4 30E700FE */ andi $a3, $a3, 0xfe
/* 717018 802A13B8 8E020070 */ lw $v0, 0x70($s0)
/* 71701C 802A13BC 2442FFFF */ addiu $v0, $v0, -1
/* 717020 802A13C0 10400003 */ beqz $v0, .L802A13D0
/* 717024 802A13C4 AE020070 */ sw $v0, 0x70($s0)
/* 717028 802A13C8 080A84FA */ j .L802A13E8
/* 71702C 802A13CC 0000102D */ daddu $v0, $zero, $zero
.L802A13D0:
/* 717030 802A13D0 0000202D */ daddu $a0, $zero, $zero
/* 717034 802A13D4 0080282D */ daddu $a1, $a0, $zero
/* 717038 802A13D8 0080302D */ daddu $a2, $a0, $zero
/* 71703C 802A13DC 0C046F97 */ jal set_background_color_blend
/* 717040 802A13E0 0080382D */ daddu $a3, $a0, $zero
/* 717044 802A13E4 24020002 */ addiu $v0, $zero, 2
.L802A13E8:
/* 717048 802A13E8 8FBF0014 */ lw $ra, 0x14($sp)
/* 71704C 802A13EC 8FB00010 */ lw $s0, 0x10($sp)
/* 717050 802A13F0 03E00008 */ jr $ra
/* 717054 802A13F4 27BD0018 */ addiu $sp, $sp, 0x18
/* 717058 802A13F8 00000000 */ nop
/* 71705C 802A13FC 00000000 */ nop