From 905175763e1b6cd70137ed996dae4964ec5c0324 Mon Sep 17 00:00:00 2001
From: Aetias <aetias@outlook.com>
Date: Sun, 14 Apr 2024 14:27:04 +0200
Subject: [PATCH] Decomp `ItemManager::GetFanfareItemScale`

---
 asm/ov00/Item/ItemManager.s      | 35 --------------------------------
 src/00_Core/Item/ItemManager.cpp | 15 ++++++++++++++
 2 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/asm/ov00/Item/ItemManager.s b/asm/ov00/Item/ItemManager.s
index 5c7cd03e..e3f7b78e 100644
--- a/asm/ov00/Item/ItemManager.s
+++ b/asm/ov00/Item/ItemManager.s
@@ -3,41 +3,6 @@
 
 	.text
 
-	.global _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
-	thumb_func_start _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
-_ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p: ; 0x020adca8
-	mov r2, #0x46
-	lsl r2, r2, #2
-	ldr r0, [r0, r2]
-	cmp r0, #0x1b
-	bgt _020adcc4
-	cmp r0, #0x1a
-	blt _020adcbe
-	beq _020adcc8
-	cmp r0, #0x1b
-	beq _020adcc8
-	b _020adcd4
-_020adcbe:
-	cmp r0, #9
-	beq _020adcc8
-	b _020adcd4
-_020adcc4:
-	cmp r0, #0x82
-	bne _020adcd4
-_020adcc8:
-	ldr r0, _020adcd8 ; =0x00001666
-	str r0, [r1]
-	str r0, [r1, #4]
-	str r0, [r1, #8]
-	mov r0, #1
-	bx lr
-_020adcd4:
-	mov r0, #0
-	bx lr
-	.align 2, 0
-	thumb_func_end _ZNK11ItemManager19GetFanfareItemScaleEP5Vec3p
-_020adcd8: .word 0x00001666
-
 	.global _ZN11ItemManager8GiveItemEjjj
 	thumb_func_start _ZN11ItemManager8GiveItemEjjj
 _ZN11ItemManager8GiveItemEjjj: ; 0x020adcdc
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp
index 5cf6d02b..14f47b4c 100644
--- a/src/00_Core/Item/ItemManager.cpp
+++ b/src/00_Core/Item/ItemManager.cpp
@@ -443,3 +443,18 @@ THUMB void ItemManager::LoadFanfareItem(ItemId id) {
     }
     mUnk_114->vfunc_0c(model);
 }
+
+THUMB bool ItemManager::GetFanfareItemScale(Vec3p *scale) const {
+    switch (mFanfareItem) {
+        case ItemId_BigGreenRupee:
+        case ItemId_BigRedRupee:
+        case ItemId_GoldRupee:
+        case ItemId_Rupoor50:
+            scale->x = FLOAT_TO_Q20(1.4);
+            scale->y = FLOAT_TO_Q20(1.4);
+            scale->z = FLOAT_TO_Q20(1.4);
+            return true;
+    }
+    return false;
+}
+