falso
/
papermario
mirror of https://github.com/pmret/papermario.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

match func_802A11D4_72F8F4

This commit is contained in:
Alex Bates 2021-02-03 20:50:52 +00:00
parent 8a1ba58aac
commit 4be34af3d8
2 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
asm/nonmatchings/code_72F720/func_802A11D4_72F8F4.s generated
View File

@ -1,32 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel func_802A11D4_72F8F4
/* 72F8F4 802A11D4 27BDFFE8 */ addiu $sp, $sp, -0x18
/* 72F8F8 802A11D8 3C03800E */ lui $v1, %hi(gBattleStatus)
/* 72F8FC 802A11DC 2463C070 */ addiu $v1, $v1, %lo(gBattleStatus)
/* 72F900 802A11E0 AFBF0014 */ sw $ra, 0x14($sp)
/* 72F904 802A11E4 AFB00010 */ sw $s0, 0x10($sp)
/* 72F908 802A11E8 8462017A */ lh $v0, 0x17a($v1)
/* 72F90C 802A11EC 8C6400D8 */ lw $a0, 0xd8($v1)
/* 72F910 802A11F0 00021140 */ sll $v0, $v0, 5
/* 72F914 802A11F4 3C108008 */ lui $s0, %hi(gItemTable+0xC)
/* 72F918 802A11F8 02028021 */ addu $s0, $s0, $v0
/* 72F91C 802A11FC 861078EC */ lh $s0, %lo(gItemTable+0xC)($s0)
/* 72F920 802A1200 0C099CAB */ jal heroes_is_ability_active
/* 72F924 802A1204 2405001D */ addiu $a1, $zero, 0x1d
/* 72F928 802A1208 10400007 */ beqz $v0, .L802A1228
/* 72F92C 802A120C 00000000 */ nop
/* 72F930 802A1210 1A000005 */ blez $s0, .L802A1228
/* 72F934 802A1214 00000000 */ nop
/* 72F938 802A1218 3C04802A */ lui $a0, %hi(D_802A1E80)
/* 72F93C 802A121C 8C841E80 */ lw $a0, %lo(D_802A1E80)($a0)
/* 72F940 802A1220 0C05123D */ jal free_icon
/* 72F944 802A1224 00000000 */ nop
.L802A1228:
/* 72F948 802A1228 8FBF0014 */ lw $ra, 0x14($sp)
/* 72F94C 802A122C 8FB00010 */ lw $s0, 0x10($sp)
/* 72F950 802A1230 24020002 */ addiu $v0, $zero, 2
/* 72F954 802A1234 03E00008 */ jr $ra
/* 72F958 802A1238 27BD0018 */ addiu $sp, $sp, 0x18
/* 72F95C 802A123C 00000000 */ nop

19
src/battle/item/coconut.c
View File

@ -1,9 +1,20 @@
#include "common.h"
#include "script_api/battle.h"
INCLUDE_ASM(s32, "battle/item/coconut", func_802A1000_72F720);
MenuIcon* D_802A1E80;
INCLUDE_ASM(s32, "battle/item/coconut", func_802A11D4_72F8F4);
INCLUDE_ASM(s32, "battle/item/coconut", func_802A1000_72F720); // alloc and show icon
ApiStatus func_802A11D4_72F8F4(ScriptInstance* script, s32 isInitialCall) {
BattleStatus* battleStatus = BATTLE_STATUS;
s32 sellValue = gItemTable[battleStatus->selectedItemID].sellValue;
if (heroes_is_ability_active(battleStatus->playerActor, Ability_REFUND) && sellValue > 0) {
free_icon(D_802A1E80);
}
return ApiStatus_DONE2;
}
Script D_802A1240_72F960 = SCRIPT({
if (SI_VAR(1) == 0) {
@ -161,3 +172,7 @@ Script D_802A1B6C_7304B0 = SCRIPT({
0x802D3624(SI_VAR(10));
await D_802A1670_72FFD0;
});
s32 foo = 0;
s32 bar = 0;
MenuIcon* D_802A1E80 = NULL;