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

Match 10 ItemManager functions

Browse Source
This commit is contained in:
Aetias
2024-01-16 17:46:57 +01:00
parent 18ccb308d8
commit 8ea0c6dfdf
20 changed files with 78 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/include/ov12.inc
+2 -2
View File
@@ -700,8 +700,8 @@
.extern data_02050f54
.extern func_ov00_020a9bec
.extern func_ov00_020b4944
.extern _ZN11ItemManager14Shield_vfunc_38Ev
.extern _ZN11ItemManager17EquipItem_vfunc_38Ev
.extern _ZN11ItemManager15Shield_vfunc_38Ej
.extern _ZN11ItemManager18EquipItem_vfunc_38Ej
.extern gItemManager
.extern func_ov00_020d7b20
.extern data_ov00_020dc878
asm/include/ov14.inc
+1 -1
View File
@@ -3271,7 +3271,7 @@
.extern func_ov00_02083ee0
.extern data_027e0e60
.extern func_ov00_020b4944
.extern _ZN11ItemManager17EquipItem_vfunc_38Ev
.extern _ZN11ItemManager18EquipItem_vfunc_38Ej
.extern gItemManager
.extern func_ov05_02102c2c
.extern data_ov00_020e9370
asm/ov00/ItemManager/ItemManager.s
-134
View File
@@ -3,140 +3,6 @@
.text
.global _ZN11ItemManager18func_ov00_020ad528Ev
arm_func_start _ZN11ItemManager18func_ov00_020ad528Ev
_ZN11ItemManager18func_ov00_020ad528Ev: ; 0x020ad528
bx lr
arm_func_end _ZN11ItemManager18func_ov00_020ad528Ev
.global _ZN11ItemManager12GetItemModelEj
arm_func_start _ZN11ItemManager12GetItemModelEj
_ZN11ItemManager12GetItemModelEj: ; 0x020ad52c
add r0, r0, r1, lsl #2
ldr r0, [r0, #0xc0]
bx lr
arm_func_end _ZN11ItemManager12GetItemModelEj
.global _ZNK11ItemManager18func_ov00_020ad538Ej
arm_func_start _ZNK11ItemManager18func_ov00_020ad538Ej
_ZNK11ItemManager18func_ov00_020ad538Ej: ; 0x020ad538
stmdb sp!, {r4, lr}
ldr r0, _020ad55c ; =data_027e0fc4
mov r4, r1
ldr r0, [r0]
mov r1, #6
blx func_ov00_020bb3a8
mov r1, r4
bl func_ov00_020c0bdc
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZNK11ItemManager18func_ov00_020ad538Ej
_020ad55c: .word data_027e0fc4
.global _ZNK11ItemManager18func_ov00_020ad560Ej
arm_func_start _ZNK11ItemManager18func_ov00_020ad560Ej
_ZNK11ItemManager18func_ov00_020ad560Ej: ; 0x020ad560
stmdb sp!, {r4, lr}
ldr r0, _020ad584 ; =data_027e0fc4
mov r4, r1
ldr r0, [r0]
mov r1, #7
blx func_ov00_020bb3a8
mov r1, r4
bl func_ov00_020c0bdc
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZNK11ItemManager18func_ov00_020ad560Ej
_020ad584: .word data_027e0fc4
.global _ZN11ItemManager19GetDungeonItemModelEj
arm_func_start _ZN11ItemManager19GetDungeonItemModelEj
_ZN11ItemManager19GetDungeonItemModelEj: ; 0x020ad588
add r0, r0, r1, lsl #2
ldr r0, [r0, #0x100]
bx lr
arm_func_end _ZN11ItemManager19GetDungeonItemModelEj
.global _ZNK11ItemManager18func_ov00_020ad594Ej
arm_func_start _ZNK11ItemManager18func_ov00_020ad594Ej
_ZNK11ItemManager18func_ov00_020ad594Ej: ; 0x020ad594
stmdb sp!, {r4, lr}
ldr r0, _020ad5b8 ; =data_027e0fc4
mov r4, r1
ldr r0, [r0]
mov r1, #0xb
blx func_ov00_020bb3a8
mov r1, r4
bl func_ov00_020c0bdc
ldmia sp!, {r4, pc}
.align 2, 0
arm_func_end _ZNK11ItemManager18func_ov00_020ad594Ej
_020ad5b8: .word data_027e0fc4
.global _ZN11ItemManager13Sword_vfunc_38Ev
arm_func_start _ZN11ItemManager13Sword_vfunc_38Ev
_ZN11ItemManager13Sword_vfunc_38Ev: ; 0x020ad5bc
stmdb sp!, {r3, lr}
ldr r0, [r0, #0xac]
ldr r0, [r0]
ldr r2, [r0]
ldr r2, [r2, #0x38]
blx r2
ldmia sp!, {r3, pc}
arm_func_end _ZN11ItemManager13Sword_vfunc_38Ev
.global _ZN11ItemManager14Shield_vfunc_38Ev
arm_func_start _ZN11ItemManager14Shield_vfunc_38Ev
_ZN11ItemManager14Shield_vfunc_38Ev: ; 0x020ad5d8
stmdb sp!, {r3, lr}
ldr r0, [r0, #0xac]
ldr r0, [r0, #4]
ldr r2, [r0]
ldr r2, [r2, #0x38]
blx r2
ldmia sp!, {r3, pc}
arm_func_end _ZN11ItemManager14Shield_vfunc_38Ev
.global _ZN11ItemManager17EquipItem_vfunc_38Ev
arm_func_start _ZN11ItemManager17EquipItem_vfunc_38Ev
_ZN11ItemManager17EquipItem_vfunc_38Ev: ; 0x020ad5f4
stmdb sp!, {r3, r4, r5, lr}
ldr r2, _020ad670 ; =data_027e0618
mov r5, r0
ldr r2, [r2]
mov r4, r1
cmp r2, #6
beq _020ad620
bl _ZN11ItemManager13Sword_vfunc_38Ev
mov r0, r5
mov r1, r4
bl _ZN11ItemManager14Shield_vfunc_38Ev
_020ad620:
ldr r0, _020ad674 ; =data_027e0d38
ldr r0, [r0]
ldr r0, [r0, #0x14]
cmp r0, #1
ldmeqia sp!, {r3, r4, r5, pc}
mov r0, r5
bl _ZNK11ItemManager15GetEquippedItemEv
mvn r1, #0
cmp r0, r1
ldmeqia sp!, {r3, r4, r5, pc}
ldrh r1, [r5, #0x20]
cmp r1, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r2, [r5, #0xac]
mov r1, r4
ldr r0, [r2, r0, lsl #2]
ldr r2, [r0]
ldr r2, [r2, #0x38]
blx r2
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
arm_func_end _ZN11ItemManager17EquipItem_vfunc_38Ev
_020ad670: .word data_027e0618
_020ad674: .word data_027e0d38
.global _ZN11ItemManager18func_ov00_020ad678Ejjj
arm_func_start _ZN11ItemManager18func_ov00_020ad678Ejjj
_ZN11ItemManager18func_ov00_020ad678Ejjj: ; 0x020ad678
asm/ov00/ItemManager/ItemManager_TickEquipItem.inc
-60
View File
@@ -1,60 +0,0 @@
func_ov00_020ad434: // 0x020ad434
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
bl _ZNK11ItemManager15GetEquippedItemEv
ldrh r1, [r5, #0x20]
mov r4, r0
cmp r1, #0
beq _020ad4b4
sub r0, r1, #1
strh r0, [r5, #0x20]
ldrh r0, [r5, #0x20]
cmp r0, #0
bne _020ad4b4
mvn r0, #0
cmp r4, r0
beq _020ad4b4
lda r0, data_027e0d38
ldr r0, [r0]
ldr r0, [r0, #0x14]
cmp r0, #1
beq _020ad4b4
lda r0, gOverlayManager
mov r1, r4
bl _ZN14OverlayManager13LoadEquipItemEj
lda r0, gPlayerAnimHandler
mov r1, r4
ldr r0, [r0]
bl LoadEquipItemModel
ldr r0, [r5, #0xac]
ldr r0, [r0, r4, lsl #2]
ldr r1, [r0]
ldr r1, [r1]
dcd 0xe12fff31 // blx r1
_020ad4b4:
ldr r0, [r5, #0xac]
ldr r0, [r0]
ldr r1, [r0]
ldr r1, [r1, #0x30]
dcd 0xe12fff31 // blx r1
ldr r0, [r5, #0xac]
ldr r0, [r0, #4]
ldr r1, [r0]
ldr r1, [r1, #0x30]
dcd 0xe12fff31 // blx r1
lda r0, data_027e0d38
ldr r0, [r0]
ldr r0, [r0, #0x14]
cmp r0, #1
mvnne r0, #0
cmpne r4, r0
ldmeqia sp!, {r3, r4, r5, pc}
ldrh r0, [r5, #0x20]
cmp r0, #0
ldmneia sp!, {r3, r4, r5, pc}
ldr r0, [r5, #0xac]
ldr r0, [r0, r4, lsl #2]
ldr r1, [r0]
ldr r1, [r1, #0x30]
dcd 0xe12fff31 // blx r1
ldmia sp!, {r3, r4, r5, pc}
asm/ov00/ItemManager/include/ItemManager.inc
+2
View File
@@ -79,3 +79,5 @@
.extern func_ov00_020d73bc
.extern gItemManager
.extern data_ov00_020eec68
.extern _ZN11ItemManager14Sword_vfunc_38Ej
.extern _ZN11ItemManager15Shield_vfunc_38Ej
asm/ov12.s
+2 -2
View File
@@ -10803,12 +10803,12 @@ func_ov12_0211b8bc: ; 0x0211b8bc
ldr r0, _0211b994 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl _ZN11ItemManager14Shield_vfunc_38Ev
bl _ZN11ItemManager15Shield_vfunc_38Ej
_0211b96c:
ldr r0, _0211b994 ; =gItemManager
mov r1, r4
ldr r0, [r0]
bl _ZN11ItemManager17EquipItem_vfunc_38Ev
bl _ZN11ItemManager18EquipItem_vfunc_38Ej
_0211b97c:
ldr r0, [r5, #0x230]
mov r1, #0
asm/ov14.s
+1 -1
View File
@@ -42817,7 +42817,7 @@ func_ov14_021419d8: ; 0x021419d8
ldr r0, _02141a70 ; =gItemManager
ldrb r1, [r4, #0x4c0]
ldr r0, [r0]
bl _ZN11ItemManager17EquipItem_vfunc_38Ev
bl _ZN11ItemManager18EquipItem_vfunc_38Ej
ldrb r0, [r4, #0x4c0]
cmp r0, #0
ldmneia sp!, {r4, pc}