diff options
| author | Yanis002 <35189056+Yanis002@users.noreply.github.com> | 2025-06-29 21:29:34 +0200 |
|---|---|---|
| committer | Yanis002 <35189056+Yanis002@users.noreply.github.com> | 2025-06-29 21:29:34 +0200 |
| commit | 0f53991581f38ff989aec005414d46a4ace702d1 (patch) | |
| tree | 305793c706925ee7328b4a1a9a3fe4dab08d01c7 /src/00_Core/Player/LinkStateItem.cpp | |
| parent | 1c9bf116969f08fbca76f1b8630f17f683519c7f (diff) | |
| parent | 3fe49695b4936ea29526eb8b7d07250a69a06c38 (diff) | |
Merge remote-tracking branch 'upstream/main' into displaytext
Diffstat (limited to 'src/00_Core/Player/LinkStateItem.cpp')
| -rw-r--r-- | src/00_Core/Player/LinkStateItem.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/00_Core/Player/LinkStateItem.cpp b/src/00_Core/Player/LinkStateItem.cpp index 240b94c8..9e42961f 100644 --- a/src/00_Core/Player/LinkStateItem.cpp +++ b/src/00_Core/Player/LinkStateItem.cpp @@ -1,5 +1,6 @@ #include "Player/LinkStateItem.hpp" #include "DTCM/UnkStruct_027e103c.hpp" +#include "DTCM/UnkStruct_027e1098.hpp" #include "Item/ItemManager.hpp" #include "Player/EquipBomb.hpp" #include "Player/EquipHammer.hpp" @@ -8,13 +9,8 @@ #include "Player/PlayerControl.hpp" #include "Save/AdventureFlags.hpp" -extern void func_ov000_020cf9dc(s32 param1, s32 param2, s32 param3); -extern void func_ov014_0213ec64(s32 param1); -extern void func_ov014_0211fd04(s32 *param1); extern void func_ov000_020b7e6c(s32 *param1); -extern s32 *data_027e1098; - THUMB void LinkStateItem::vfunc_00() {} ARM LinkStateId LinkStateItem::GetId() { @@ -42,7 +38,7 @@ ARM void LinkStateItem::OnStateLeave(s32 param1) { if (*(u8 *) (iVar3 + 0xe0) == '\0') { GetEquipBombchu()->func_ov014_0213ec64(); } - func_ov014_0211fd04(data_027e1098); + data_027e1098->func_ov014_0211fd04(); break; case ItemFlag_OshusSword: break; case ItemFlag_WoodenShield: break; |