diff options
| author | Yanis002 <35189056+Yanis002@users.noreply.github.com> | 2025-07-02 18:15:38 +0200 |
|---|---|---|
| committer | Yanis002 <35189056+Yanis002@users.noreply.github.com> | 2025-07-02 18:15:38 +0200 |
| commit | 2f22188826ea13546bf901bf94ec3031d8c47cfc (patch) | |
| tree | 967cdc6b0dd8da80a2cd702aaa12e627057c0395 | |
| parent | f32b21a8c9d75a81666ac7f5047ac64979418b97 (diff) | |
match Item.cpp
| -rw-r--r-- | config/eur/arm9/overlays/ov000/delinks.txt | 2 | ||||
| -rw-r--r-- | config/usa/arm9/overlays/ov000/delinks.txt | 2 | ||||
| -rw-r--r-- | src/00_Core/Item/Item.cpp | 33 |
3 files changed, 33 insertions, 4 deletions
diff --git a/config/eur/arm9/overlays/ov000/delinks.txt b/config/eur/arm9/overlays/ov000/delinks.txt index 56207f63..c223a7da 100644 --- a/config/eur/arm9/overlays/ov000/delinks.txt +++ b/config/eur/arm9/overlays/ov000/delinks.txt @@ -71,8 +71,8 @@ src/00_Core/Actor/Navi/ActorWisdomNavi.cpp: .sbss start:0x020ee590 end:0x020ee5b0 src/00_Core/Item/Item.cpp: + complete .text start:0x020ad020 end:0x020ad090 - .rodata start:0x020dc574 end:0x020dc6c4 src/00_Core/Item/ItemManager.cpp: complete diff --git a/config/usa/arm9/overlays/ov000/delinks.txt b/config/usa/arm9/overlays/ov000/delinks.txt index 894e26de..fc0373f2 100644 --- a/config/usa/arm9/overlays/ov000/delinks.txt +++ b/config/usa/arm9/overlays/ov000/delinks.txt @@ -71,8 +71,8 @@ src/00_Core/Actor/Navi/ActorWisdomNavi.cpp: .sbss start:0x020ee530 end:0x020ee550 src/00_Core/Item/Item.cpp: + complete .text start:0x020acfc0 end:0x020ad030 - .rodata start:0x020dc514 end:0x020dc664 src/00_Core/Item/ItemManager.cpp: complete diff --git a/src/00_Core/Item/Item.cpp b/src/00_Core/Item/Item.cpp index 817d86db..09c8bd31 100644 --- a/src/00_Core/Item/Item.cpp +++ b/src/00_Core/Item/Item.cpp @@ -1,4 +1,33 @@ #include "Item/Item.hpp" +#include "global.h" -bool Item::func_ov00_020ad020(ItemId item) {} -bool Item::func_ov00_020ad068(ItemId item) {} +THUMB bool Item::func_ov00_020ad020(ItemId item) { + switch (item) { + case ItemId_Cannon: + case ItemId_Unk_43: + case ItemId_SalvageArm: + case ItemId_GoldenChimney: + case ItemId_GoldenHandrail: + case ItemId_GoldenCannon: + case ItemId_GoldenHull: + case ItemId_Unk_126: + case ItemId_Unk_133: return true; + default: break; + } + + return false; +} + +THUMB bool Item::func_ov00_020ad068(ItemId item) { + switch (item) { + case ItemId_SpiritOfPowerUpgradeLvl1: + case ItemId_SpiritOfWisdomUpgradeLvl1: + case ItemId_SpiritOfCourageUpgradeLvl1: + case ItemId_SpiritOfPowerUpgradeLvl2: + case ItemId_SpiritOfWisdomUpgradeLvl2: + case ItemId_SpiritOfCourageUpgradeLvl2: return true; + default: break; + } + + return false; +} |