mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-24 23:21:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mangle PlayerLinkBase::func_ov00_020bbd80

Browse Source
This commit is contained in:
Aetias
2024-05-18 17:12:48 +02:00
parent 7bbc47069b
commit 80478f5485
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Item/ItemManager_func_ov00_020ad790.inc
+1 -1
View File
@@ -51,7 +51,7 @@ _020ad840:
cmp r0, #0
beq _020ad860
mov r1, r5
bl func_ov00_020bbd80
bl _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
cmp r0, #0
beq _020ad874
_020ad860:
asm/ov00/ov00_020b1498.s
+4 -4
View File
@@ -13389,9 +13389,9 @@ func_ov00_020bbd60: ; 0x020bbd60
_020bbd7c: .word data_027e0fd4
arm_func_end func_ov00_020bbd60
.global func_ov00_020bbd80
arm_func_start func_ov00_020bbd80
func_ov00_020bbd80: ; 0x020bbd80
.global _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
arm_func_start _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
_ZN14PlayerLinkBase18func_ov00_020bbd80Ei: ; 0x020bbd80
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _020bbe80 ; =gOverlayManager
ldr r3, _020bbe84 ; =0x00000005
@@ -13467,7 +13467,7 @@ _020bbe84: .word 0x00000005
_020bbe88: .word data_027e0fd4
_020bbe8c: .word data_027e0fe4
_020bbe90: .word 0x424f4d42
arm_func_end func_ov00_020bbd80
arm_func_end _ZN14PlayerLinkBase18func_ov00_020bbd80Ei
.global func_ov00_020bbe94
arm_func_start func_ov00_020bbe94
include/Player/PlayerLinkBase.hpp
+1
View File
@@ -75,6 +75,7 @@ public:
/* 84 */ virtual void ResetUnk_5e();
/* 88 */
bool func_ov00_020bbd80(s32 param1);
void func_ov00_020bc854(Vec3p *param1);
};
src/00_Core/Item/ItemManager.cpp
+3 -3
View File
@@ -1,4 +1,5 @@
#include "Item/ItemManager.hpp"
#include "Player/PlayerLinkBase.hpp"
static const char *sShipPartTypes[] = { "anc", "bow", "hul", "can", "dco", "pdl", "fnl", "brg" };
@@ -237,8 +238,7 @@ extern void *data_027e10a4;
extern "C" bool func_ov15_02136670(void *param1);
extern unk8 data_ov29_0217a4ac[];
extern "C" bool _ZN10MapManager18func_ov00_020849f8Ei(void *param1);
extern unk32 data_027e0fc8;
extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2);
extern "C" bool _ZN14PlayerLinkBase18func_ov00_020bbd80Ei(unk32 param1, unk32 param2);
extern "C" bool _ZNK11ItemManager7HasItemEi();
extern "C" void _ZN11ItemManager12GetEquipItemEi();
ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {
@@ -258,7 +258,7 @@ ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {
if (
mEquippedItem != ItemFlag_None &&
(unk2 || (u32) mEquippedItem - 9 <= 1) &&
(data_027e0fc8 == 0 || func_ov00_020bbd80(data_027e0fc8, param1)) &&
(gPlayerLink == 0 || gPlayerLink->func_ov00_020bbd80(param1)) &&
this->HasItem(mEquippedItem)
) {
equipId = mEquippedItem;