Fix incorrect item names

This commit is contained in:
Aetias
2024-01-16 17:51:24 +01:00
parent 8ea0c6dfdf
commit e1a9c2736a
7 changed files with 12 additions and 12 deletions
+1 -1
View File
@@ -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
+4 -4
View File
@@ -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
+1 -1
View File
@@ -1019,6 +1019,6 @@
.extern data_027e0618
.extern gItemManager
.extern func_01ffa0f4
.extern _ZNK11ItemManager13HasBluePotionEv
.extern _ZNK11ItemManager15HasPurplePotionEv
.extern data_027e0618
.extern gItemManager
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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` | ---
+3 -3
View File
@@ -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