mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-23 23:05:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add Item.cpp stub

Browse Source
This commit is contained in:
Aetias
2024-03-19 00:56:11 +01:00
parent 7490c0fc8c
commit 6f5558cf65
13 changed files with 107 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/ov05.inc
+3 -3
View File
@@ -829,7 +829,7 @@
.extern func_ov09_0211ca20
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern _ZNK11ItemManager13HasAllPotionsEv
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern func_ov03_020fb0b0
.extern func_ov00_020a8138
.extern func_ov00_020a8158
@@ -960,9 +960,9 @@
.extern func_ov00_020a8360
.extern func_ov00_020c1500
.extern func_ov00_020a8390
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern _ZN11ItemManager8GiveItemEjjj
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern func_ov00_020a8c78
.extern func_ov00_020a8be8
.extern func_ov00_020b4440
asm/include/ov14.inc
+1 -1
View File
@@ -4618,7 +4618,7 @@
.extern func_ov03_020fb118
.extern func_ov00_020d71a0
.extern data_ov09_0211f5dc
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern func_ov03_020fc10c
.extern _ZN11ItemManager18func_ov00_020ae648Ejjj
.extern func_ov03_020fab60
asm/include/ov15.inc
+2 -2
View File
@@ -3072,7 +3072,7 @@
.extern func_ov00_0207c1b0
.extern func_ov00_020ceacc
.extern func_0202e58c
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern func_ov03_020fb0b0
.extern func_ov09_0211ca20
.extern func_ov09_0211cac0
@@ -6126,7 +6126,7 @@
.extern _ZN11ItemManager15LoadFanfareItemEj
.extern gItemManager
.extern data_027e0fe4
.extern func_ov00_020ad020
.extern _ZN4Item18func_ov00_020ad020Ei
.extern func_ov03_020fc10c
.extern func_ov00_020d73bc
.extern func_ov00_0207c1b0
asm/ov00/Item/Item.s
+77
View File
@@ -0,0 +1,77 @@
.include "macros/function.inc"
.text
.global _ZN4Item18func_ov00_020ad020Ei
thumb_func_start _ZN4Item18func_ov00_020ad020Ei
_ZN4Item18func_ov00_020ad020Ei: ; 0x020ad020
cmp r0, #0x2b
bgt _020ad02c
bge _020ad060
cmp r0, #0x25
beq _020ad060
b _020ad064
_020ad02c:
cmp r0, #0x3d
bgt _020ad034
beq _020ad060
b _020ad064
_020ad034:
sub r0, #0x79
cmp r0, #0xc
bhi _020ad064
add r0, r0, r0
add r0, pc
ldrh r0, [r0, #6]
lsl r0, r0, #0x10
asr r0, r0, #0x10
add pc, r0
_020ad046: ; jump table
.short _020ad060 - _020ad046 - 2 ; case 0
.short _020ad060 - _020ad046 - 2 ; case 1
.short _020ad060 - _020ad046 - 2 ; case 2
.short _020ad060 - _020ad046 - 2 ; case 3
.short _020ad064 - _020ad046 - 2 ; case 4
.short _020ad060 - _020ad046 - 2 ; case 5
.short _020ad064 - _020ad046 - 2 ; case 6
.short _020ad064 - _020ad046 - 2 ; case 7
.short _020ad064 - _020ad046 - 2 ; case 8
.short _020ad064 - _020ad046 - 2 ; case 9
.short _020ad064 - _020ad046 - 2 ; case 10
.short _020ad064 - _020ad046 - 2 ; case 11
.short _020ad060 - _020ad046 - 2 ; case 12
_020ad060:
mov r0, #1
bx lr
_020ad064:
mov r0, #0
bx lr
thumb_func_end _ZN4Item18func_ov00_020ad020Ei
.global _ZN4Item18func_ov00_020ad068Ei
thumb_func_start _ZN4Item18func_ov00_020ad068Ei
_ZN4Item18func_ov00_020ad068Ei: ; 0x020ad068
sub r0, #0x6b
cmp r0, #5
bhi _020ad08a
add r0, r0, r0
add r0, pc
ldrh r0, [r0, #6]
lsl r0, r0, #0x10
asr r0, r0, #0x10
add pc, r0
_020ad07a: ; jump table
.short _020ad086 - _020ad07a - 2 ; case 0
.short _020ad086 - _020ad07a - 2 ; case 1
.short _020ad086 - _020ad07a - 2 ; case 2
.short _020ad086 - _020ad07a - 2 ; case 3
.short _020ad086 - _020ad07a - 2 ; case 4
.short _020ad086 - _020ad07a - 2 ; case 5
_020ad086:
mov r0, #1
bx lr
_020ad08a:
mov r0, #0
bx lr
.align 2, 0
thumb_func_end _ZN4Item18func_ov00_020ad068Ei
asm/ov00/include/ov00_020ae7a4.inc
+2 -2
View File
@@ -1167,9 +1167,9 @@
.extern func_ov05_021096bc
.extern func_ov00_020a914c
.extern func_ov00_020a914c
.extern func_ov00_020ad068
.extern _ZN4Item18func_ov00_020ad068Ei
.extern func_ov00_020a914c
.extern func_ov00_020ad068
.extern _ZN4Item18func_ov00_020ad068Ei
.extern func_ov00_020a914c
.extern func_ov00_020b3024
.extern func_ov00_020a914c
asm/ov00/ov00_020773c0.s
-74
View File
@@ -71927,80 +71927,6 @@ func_ov00_020ad018: ; 0x020ad018
bx lr
arm_func_end func_ov00_020ad018
.global func_ov00_020ad020
thumb_func_start func_ov00_020ad020
func_ov00_020ad020: ; 0x020ad020
cmp r0, #0x2b
bgt _020ad02c
bge _020ad060
cmp r0, #0x25
beq _020ad060
b _020ad064
_020ad02c:
cmp r0, #0x3d
bgt _020ad034
beq _020ad060
b _020ad064
_020ad034:
sub r0, #0x79
cmp r0, #0xc
bhi _020ad064
add r0, r0, r0
add r0, pc
ldrh r0, [r0, #6]
lsl r0, r0, #0x10
asr r0, r0, #0x10
add pc, r0
_020ad046: ; jump table
.short _020ad060 - _020ad046 - 2 ; case 0
.short _020ad060 - _020ad046 - 2 ; case 1
.short _020ad060 - _020ad046 - 2 ; case 2
.short _020ad060 - _020ad046 - 2 ; case 3
.short _020ad064 - _020ad046 - 2 ; case 4
.short _020ad060 - _020ad046 - 2 ; case 5
.short _020ad064 - _020ad046 - 2 ; case 6
.short _020ad064 - _020ad046 - 2 ; case 7
.short _020ad064 - _020ad046 - 2 ; case 8
.short _020ad064 - _020ad046 - 2 ; case 9
.short _020ad064 - _020ad046 - 2 ; case 10
.short _020ad064 - _020ad046 - 2 ; case 11
.short _020ad060 - _020ad046 - 2 ; case 12
_020ad060:
mov r0, #1
bx lr
_020ad064:
mov r0, #0
bx lr
thumb_func_end func_ov00_020ad020
.global func_ov00_020ad068
thumb_func_start func_ov00_020ad068
func_ov00_020ad068: ; 0x020ad068
sub r0, #0x6b
cmp r0, #5
bhi _020ad08a
add r0, r0, r0
add r0, pc
ldrh r0, [r0, #6]
lsl r0, r0, #0x10
asr r0, r0, #0x10
add pc, r0
_020ad07a: ; jump table
.short _020ad086 - _020ad07a - 2 ; case 0
.short _020ad086 - _020ad07a - 2 ; case 1
.short _020ad086 - _020ad07a - 2 ; case 2
.short _020ad086 - _020ad07a - 2 ; case 3
.short _020ad086 - _020ad07a - 2 ; case 4
.short _020ad086 - _020ad07a - 2 ; case 5
_020ad086:
mov r0, #1
bx lr
_020ad08a:
mov r0, #0
bx lr
.align 2, 0
thumb_func_end func_ov00_020ad068
.rodata
.global data_ov00_020d8770
data_ov00_020d8770: ; 0x020d8770
asm/ov00/ov00_020ae7a4.s
+2 -2
View File
@@ -18238,7 +18238,7 @@ func_ov00_020bcefc: ; 0x020bcefc
ldmeqia sp!, {r3, pc}
bl func_ov00_020a914c
ldr r0, [r0, #0x74]
blx func_ov00_020ad068
blx _ZN4Item18func_ov00_020ad068Ei
cmp r0, #0
moveq r0, #1
movne r0, #0
@@ -18255,7 +18255,7 @@ func_ov00_020bcf2c: ; 0x020bcf2c
ldmeqia sp!, {r3, pc}
bl func_ov00_020a914c
ldr r0, [r0, #0x74]
blx func_ov00_020ad068
blx _ZN4Item18func_ov00_020ad068Ei
ldmia sp!, {r3, pc}
arm_func_end func_ov00_020bcf2c
asm/ov05.s
+3 -3
View File
@@ -9700,7 +9700,7 @@ _02108bd0:
strne r0, [r4, #0x74]
_02108be8:
ldr r0, [r4, #0x74]
blx func_ov00_020ad020
blx _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
ldr r1, [r4, #0x74]
beq _02108c14
@@ -10640,7 +10640,7 @@ _02109874:
b _021098bc
_0210989c:
mov r0, r4
blx func_ov00_020ad020
blx _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
bne _021098bc
ldr r0, _021099cc ; =gItemManager
@@ -10649,7 +10649,7 @@ _0210989c:
blx _ZN11ItemManager8GiveItemEjjj
_021098bc:
mov r0, r4
blx func_ov00_020ad020
blx _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
bne _02109914
ldr r0, _021099d0 ; =data_027e0c68
asm/ov14.s
+1 -1
View File
@@ -61799,7 +61799,7 @@ func_ov14_021508b8: ; 0x021508b8
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #8]
bl func_ov00_020ad020
bl _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
beq _021508ce
ldr r0, _021508dc ; =data_027e0c68
asm/ov15.s
+2 -2
View File
@@ -44494,7 +44494,7 @@ _0214526c:
cmp r0, #0
beq _02145420
bl func_ov15_021464fc
blx func_ov00_020ad020
blx _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
movne r0, #0xb
strneb r0, [sb, #0x34d]
@@ -88280,7 +88280,7 @@ func_ov15_0216a968: ; 0x0216a968
sub sp, sp, #0x1c
mov r4, r0
ldr r0, [r4, #8]
blx func_ov00_020ad020
blx _ZN4Item18func_ov00_020ad020Ei
cmp r0, #0
beq _0216a994
ldr r0, _0216aa1c ; =data_027e0c68
include/Item/Item.hpp
+6 -1
View File
@@ -48,7 +48,7 @@ enum ItemFlag_ {
ItemFlag_COUNT = 128,
};
typedef u32 ItemId;
typedef s32 ItemId;
enum ItemId_ {
ItemId_SmallKey = 1,
ItemId_GreenRupee = 2,
@@ -143,3 +143,8 @@ enum ItemId_ {
ItemId_Unk_133 = 133,
};
namespace Item {
bool func_ov00_020ad020(ItemId item);
bool func_ov00_020ad068(ItemId item);
}
src/00_Core/Item/Item.cpp
+8
View File
@@ -0,0 +1,8 @@
#include "Item/Item.hpp"
#ifdef STUBS
bool Item::func_ov00_020ad020(ItemId item) {}
bool Item::func_ov00_020ad068(ItemId item) {}
#endif
src/00_Core/ItemManager.cpp → src/00_Core/Item/ItemManager.cpp
View File