mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-13 04:54:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #368 from Henny022p/item-metadata

Browse Source
This commit is contained in:
notyourav
2022-02-10 22:55:14 -08:00
committed by GitHub
parent 37b8803cdc 4860ed1fe0
commit 16d8e14488
13 changed files with 764 additions and 635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/code_080526F8.s
+8 -8
View File
@@ -1339,7 +1339,7 @@ GiveItem: @ 0x08053FF0
bl GetInventoryValue
adds r5, r0, #0
lsls r1, r6, #3
ldr r0, _08054010 @ =gUnk_080FD5B4
ldr r0, _08054010 @ =gItemMetaData
adds r4, r1, r0
cmp r5, #0
bne _08054014
@@ -1347,7 +1347,7 @@ GiveItem: @ 0x08053FF0
mov r8, r0
b _08054018
.align 2, 0
_08054010: .4byte gUnk_080FD5B4
_08054010: .4byte gItemMetaData
_08054014:
ldrh r2, [r4, #6]
mov r8, r2
@@ -1647,28 +1647,28 @@ _08054284: .4byte gSave
thumb_func_start sub_08054288
sub_08054288: @ 0x08054288
push {lr}
ldr r1, _08054298 @ =gUnk_080FD5B4
ldr r1, _08054298 @ =gItemMetaData
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #6]
bl MessageFromTarget
pop {pc}
.align 2, 0
_08054298: .4byte gUnk_080FD5B4
_08054298: .4byte gItemMetaData
thumb_func_start sub_0805429C
sub_0805429C: @ 0x0805429C
ldr r1, _080542A8 @ =gUnk_080FD5B4
ldr r1, _080542A8 @ =gItemMetaData
lsls r0, r0, #3
adds r0, r0, r1
ldrh r0, [r0, #4]
bx lr
.align 2, 0
_080542A8: .4byte gUnk_080FD5B4
_080542A8: .4byte gItemMetaData
thumb_func_start sub_080542AC
sub_080542AC: @ 0x080542AC
ldr r1, _080542BC @ =gUnk_080FD5B4
ldr r1, _080542BC @ =gItemMetaData
lsls r0, r0, #3
adds r0, r0, r1
ldrb r1, [r0, #3]
@@ -1676,7 +1676,7 @@ sub_080542AC: @ 0x080542AC
ands r0, r1
bx lr
.align 2, 0
_080542BC: .4byte gUnk_080FD5B4
_080542BC: .4byte gItemMetaData
thumb_func_start sub_080542C0
sub_080542C0: @ 0x080542C0
asm/non_matching/ForceEquipItem.inc
+2 -2
View File
@@ -18,7 +18,7 @@ _0805442A:
ldrb r7, [r6]
adds r5, r2, r0
ldrb r3, [r5]
ldr r2, _0805445C @ =gUnk_080FD5B4
ldr r2, _0805445C @ =gItemMetaData
lsls r1, r3, #3
adds r1, r1, r2
lsls r0, r4, #3
@@ -39,6 +39,6 @@ _08054456:
pop {r4, r5, r6, r7, pc}
.align 2, 0
_08054458: .4byte gSave
_0805445C: .4byte gUnk_080FD5B4
_0805445C: .4byte gItemMetaData
_08054460: .4byte gUnk_0200AF00
.syntax divided
asm/object/objectB.s
+2 -2
View File
@@ -127,14 +127,14 @@ _08083C74:
bl GetInventoryValue
ldrb r1, [r4, #0xa]
lsls r1, r1, #3
ldr r2, _08083C8C @ =gUnk_080FD5B4
ldr r2, _08083C8C @ =gItemMetaData
adds r1, r1, r2
cmp r0, #0
bne _08083C90
ldrh r1, [r1, #4]
b _08083C92
.align 2, 0
_08083C8C: .4byte gUnk_080FD5B4
_08083C8C: .4byte gItemMetaData
_08083C90:
ldrh r1, [r1, #6]
_08083C92:
asm/subtask2.s
+2 -2
View File
@@ -23,7 +23,7 @@ _080A55AA:
bl GetInventoryValue
cmp r0, #1
bne _080A55EA
ldr r1, _080A562C @ =gUnk_080FD5B4
ldr r1, _080A562C @ =gItemMetaData
lsls r0, r5, #3
adds r0, r0, r1
ldrb r1, [r0]
@@ -81,7 +81,7 @@ _080A560A:
_080A5620: .4byte gMenu
_080A5624: .4byte gUnk_08128C00
_080A5628: .4byte gUnk_08128C04
_080A562C: .4byte gUnk_080FD5B4
_080A562C: .4byte gItemMetaData
_080A5630: .4byte gUnk_02002B6B
_080A5634:
cmp r5, #0x27