summaryrefslogtreecommitdiff
path: root/asm/code_801C620.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/code_801C620.s')
-rw-r--r--asm/code_801C620.s20
1 files changed, 10 insertions, 10 deletions
diff --git a/asm/code_801C620.s b/asm/code_801C620.s
index 8c97b65..1f2dd00 100644
--- a/asm/code_801C620.s
+++ b/asm/code_801C620.s
@@ -220,7 +220,7 @@ _0801CA7C:
movs r6, 0
cmp r0, 0
bne _0801CAB0
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
adds r4, r0, 0
bl sub_801CFB8
adds r4, r0
@@ -669,7 +669,7 @@ _0801CE44: .4byte 0x000004d2
_0801CE48: .4byte 0x000004ce
_0801CE4C: .4byte 0x000004b4
_0801CE50: .4byte 0x000004ec
-_0801CE54: .4byte gUnknown_203B460
+_0801CE54: .4byte gTeamInventory_203B460
thumb_func_end sub_801CCD8
thumb_func_start sub_801CE58
@@ -698,7 +698,7 @@ _0801CE68:
lsls r0, r6, 24
lsrs r0, 24
str r3, [sp]
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
ldr r3, [sp]
cmp r0, 0
@@ -771,7 +771,7 @@ _0801CEFC:
bx r1
.align 2, 0
_0801CF0C: .4byte gUnknown_203B244
-_0801CF10: .4byte gUnknown_203B460
+_0801CF10: .4byte gTeamInventory_203B460
thumb_func_end sub_801CE58
thumb_func_start sub_801CF14
@@ -795,7 +795,7 @@ _0801CF20:
beq _0801CF3E
lsls r0, r4, 24
lsrs r0, 24
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
bne _0801CF1A
@@ -809,7 +809,7 @@ _0801CF46:
pop {r1}
bx r1
.align 2, 0
-_0801CF4C: .4byte gUnknown_203B460
+_0801CF4C: .4byte gTeamInventory_203B460
thumb_func_end sub_801CF14
thumb_func_start sub_801CF50
@@ -826,7 +826,7 @@ _0801CF5A:
_0801CF5E:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _0801CF7C
@@ -849,7 +849,7 @@ _0801CF84:
bx r1
.align 2, 0
_0801CF8C: .4byte 0x000003e6
-_0801CF90: .4byte gUnknown_203B460
+_0801CF90: .4byte gTeamInventory_203B460
thumb_func_end sub_801CF50
thumb_func_start sub_801CF94
@@ -1554,7 +1554,7 @@ sub_801D4C0:
str r0, [r1, 0x6C]
ldr r0, _0801D558
str r0, [r1, 0x68]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _0801D4FE
ldr r0, [r4]
@@ -1640,7 +1640,7 @@ _0801D59A:
str r0, [r1, 0x74]
ldr r0, _0801D648
str r0, [r1, 0x70]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _0801D5B4
ldr r0, [r4]