diff --git a/asm/include/ov05.inc b/asm/include/ov05.inc index c04e8b1d..c4d46c51 100644 --- a/asm/include/ov05.inc +++ b/asm/include/ov05.inc @@ -1632,7 +1632,7 @@ .extern func_ov00_020a8bd8 .extern func_ov00_020a8118 .extern func_ov00_020a8c14 -.extern _ZNK11ItemManager13HasBluePotionEv +.extern _ZNK11ItemManager15HasPurplePotionEv .extern func_ov00_020a8148 .extern func_ov00_020a8148 .extern func_ov00_020a8b04 diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 4649b8f1..768f5869 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -1960,9 +1960,9 @@ _020ae5a4: ldmia sp!, {r3, r4, r5, pc} arm_func_end _ZNK11ItemManager13HasAllPotionsEv - .global _ZNK11ItemManager13HasBluePotionEv - arm_func_start _ZNK11ItemManager13HasBluePotionEv -_ZNK11ItemManager13HasBluePotionEv: ; 0x020ae5d0 + .global _ZNK11ItemManager15HasPurplePotionEv + arm_func_start _ZNK11ItemManager15HasPurplePotionEv +_ZNK11ItemManager15HasPurplePotionEv: ; 0x020ae5d0 mov r2, #0 _020ae5d4: add r1, r0, r2 @@ -1975,7 +1975,7 @@ _020ae5d4: blt _020ae5d4 mov r0, #0 bx lr - arm_func_end _ZNK11ItemManager13HasBluePotionEv + arm_func_end _ZNK11ItemManager15HasPurplePotionEv .global _ZN11ItemManager21LoadDungeonItemModelsEv thumb_func_start _ZN11ItemManager21LoadDungeonItemModelsEv diff --git a/asm/ov00/include/ov00_020a03e4.inc b/asm/ov00/include/ov00_020a03e4.inc index 54baada2..165a7043 100644 --- a/asm/ov00/include/ov00_020a03e4.inc +++ b/asm/ov00/include/ov00_020a03e4.inc @@ -1019,6 +1019,6 @@ .extern data_027e0618 .extern gItemManager .extern func_01ffa0f4 -.extern _ZNK11ItemManager13HasBluePotionEv +.extern _ZNK11ItemManager15HasPurplePotionEv .extern data_027e0618 .extern gItemManager diff --git a/asm/ov00/ov00_020a03e4.s b/asm/ov00/ov00_020a03e4.s index 7b7f9909..b429c07a 100644 --- a/asm/ov00/ov00_020a03e4.s +++ b/asm/ov00/ov00_020a03e4.s @@ -16703,7 +16703,7 @@ func_ov00_020acf28: ; 0x020acf28 bgt _020acf98 ldr r0, _020acfe4 ; =gItemManager ldr r0, [r0] - bl _ZNK11ItemManager13HasBluePotionEv + bl _ZNK11ItemManager15HasPurplePotionEv cmp r0, #0 movne r0, #0xe moveq r0, #0xf diff --git a/asm/ov05.s b/asm/ov05.s index 00915f49..ec020d78 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -17166,7 +17166,7 @@ _0210f244: bgt _0210f298 ldr r0, _0210f6c4 ; =gItemManager ldr r0, [r0] - bl _ZNK11ItemManager13HasBluePotionEv + bl _ZNK11ItemManager15HasPurplePotionEv cmp r0, #0 beq _0210f298 mov r0, r6 diff --git a/docs/items.md b/docs/items.md index 2883464a..e551c6f9 100644 --- a/docs/items.md +++ b/docs/items.md @@ -41,7 +41,7 @@ Might be inaccurate due to there being seemingly multiple IDs/enumerations for i `0x1f` | Hammer `0x20` | Grapple Hook `0x21` | Square Crystal -`0x22` | Circle Crystal +`0x22` | Round Crystal `0x23` | Triangle Crystal `0x24` | `fp` `0x25` | --- diff --git a/include/ItemManager.hpp b/include/ItemManager.hpp index af048827..cd304e5f 100644 --- a/include/ItemManager.hpp +++ b/include/ItemManager.hpp @@ -142,7 +142,7 @@ enum ItemModelId_ { ItemModelId_Bomb, // bomb ItemModelId_Bombchu, // bomchu ItemModelId_RedPotion, // rev_bin - ItemModelId_BluePotion, // rev_binP + ItemModelId_PurplePotion, // rev_binP ItemModelId_YellowPotion, // rev_binY ItemModelId_Hammer, // ham ItemModelId_RopeTop, // ropetop @@ -153,7 +153,7 @@ typedef u32 DungeonItemModelId; enum DungeonItemModelId_ { DungeonItemModelId_ForceGem, // force DungeonItemModelId_BossKey, // bosskey - DungeonItemModelId_CircleCrystal, // switch_cstl_c_c + DungeonItemModelId_RoundCrystal, // switch_cstl_c_c DungeonItemModelId_SquareCrystal, // switch_cstl_s_c DungeonItemModelId_TriangleCrystal, // switch_cstl_t_c DungeonItemModelId_COUNT, @@ -320,7 +320,7 @@ public: void SetPotion(u32 index, Potion potion); bool HasPotion(u32 index) const; bool HasAllPotions() const; - bool HasBluePotion() const; + bool HasPurplePotion() const; void UnequipPotion(); // Unknown