summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/code_2.s8
-rw-r--r--asm/code_800D090.s16
-rw-r--r--asm/code_8012A18.s10
-rw-r--r--asm/code_801B3C0.s32
-rw-r--r--asm/code_801C620.s20
-rw-r--r--asm/code_8027C84.s20
-rw-r--r--asm/code_802B640.s6
-rw-r--r--asm/code_80428A0.s64
-rw-r--r--asm/code_8048480.s6
-rw-r--r--asm/code_8057824.s202
-rw-r--r--asm/code_807001C.s44
-rw-r--r--asm/code_8090208.s6
-rw-r--r--asm/code_8092334.s44
-rw-r--r--asm/code_80958E8.s6
-rw-r--r--asm/code_8098BDC.s18
-rw-r--r--asm/code_809D148.s22
-rw-r--r--asm/event_flag.s22
-rw-r--r--asm/felicity_bank.s12
-rw-r--r--asm/friend_area_action_menu.s8
-rw-r--r--asm/friend_list_menu.s114
-rw-r--r--asm/items.s2172
-rw-r--r--asm/items_1.s1435
-rw-r--r--asm/kangaskhan_storage.s6
-rw-r--r--asm/kangaskhan_storage_1.s22
-rw-r--r--asm/kangaskhan_storage_2.s48
-rw-r--r--asm/kecleon_items.s36
-rw-r--r--asm/other_menus.s8
-rw-r--r--asm/pokemon_3.s74
-rw-r--r--asm/pokemon_square.s64
-rw-r--r--asm/wonder_mail_3.s12
30 files changed, 1913 insertions, 2644 deletions
diff --git a/asm/code_2.s b/asm/code_2.s
index 2fca8d0..b9d3464 100644
--- a/asm/code_2.s
+++ b/asm/code_2.s
@@ -1509,7 +1509,7 @@ _08001266:
adds r4, 0x1
cmp r4, 0x13
ble _0800124E
- bl sub_80910B4
+ bl FillInventoryGaps
movs r4, 0
ldr r5, _080012BC
movs r3, 0x1
@@ -1548,7 +1548,7 @@ _08001298:
pop {r0}
bx r0
.align 2, 0
-_080012B8: .4byte gUnknown_203B460
+_080012B8: .4byte gTeamInventory_203B460
_080012BC: .4byte gRecruitedPokemonRef
thumb_func_end sub_8001248
@@ -1568,7 +1568,7 @@ _080012C8:
adds r3, 0x1
cmp r3, 0x13
ble _080012C8
- bl sub_80910B4
+ bl FillInventoryGaps
movs r3, 0
ldr r5, _08001328
movs r4, 0x1
@@ -1607,7 +1607,7 @@ _08001306:
pop {r0}
bx r0
.align 2, 0
-_08001324: .4byte gUnknown_203B460
+_08001324: .4byte gTeamInventory_203B460
_08001328: .4byte gRecruitedPokemonRef
thumb_func_end sub_80012C0
diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index fc0455f..8b1845d 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -7718,7 +7718,7 @@ _08010BD0:
movs r0, 0xC
movs r1, 0x2
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
add sp, 0x64
@@ -7816,7 +7816,7 @@ _08010C86:
movs r1, 0
adds r2, r5, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
movs r0, 0x1
@@ -7826,13 +7826,13 @@ _08010C86:
movs r0, 0xA
movs r1, 0
movs r3, 0x1
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r2, _08010D78
str r4, [sp]
movs r0, 0xA
movs r1, 0xC
movs r3, 0x1
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0x1
bl sub_80073E0
add r0, sp, 0x4
@@ -8739,7 +8739,7 @@ _08011406:
movs r1, 0x2
add r2, sp, 0x4
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
ldr r0, _08011480
@@ -8936,7 +8936,7 @@ _0801152A:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r6, 0
cmp r6, r9
bge _08011678
@@ -8965,7 +8965,7 @@ _080115DC:
adds r1, r4, 0
ldr r2, _0801163C
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08011672
.align 2, 0
_08011610: .4byte gUnknown_203B0E4
@@ -9003,7 +9003,7 @@ _08011640:
adds r1, r4, 0
ldr r2, _08011698
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08011672:
adds r6, 0x1
cmp r6, r9
diff --git a/asm/code_8012A18.s b/asm/code_8012A18.s
index 7d65e4a..350e33d 100644
--- a/asm/code_8012A18.s
+++ b/asm/code_8012A18.s
@@ -469,7 +469,7 @@ sub_8012EBC:
ldr r3, [r5, 0x10]
movs r1, 0
str r1, [sp]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08012F24:
ldr r7, [r5, 0x8]
ldr r4, [r5, 0x4]
@@ -521,7 +521,7 @@ _08012F64:
str r0, [sp]
movs r0, 0x8
mov r2, r8
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r4, 0x8
movs r1, 0x1
add r9, r1
@@ -4717,8 +4717,8 @@ _08014FE8:
bx r1
thumb_func_end sub_8014FA8
- thumb_func_start sub_8014FF0
-sub_8014FF0:
+ thumb_func_start xxx_format_and_draw
+xxx_format_and_draw:
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -4750,7 +4750,7 @@ sub_8014FF0:
bx r0
.align 2, 0
_08015030: .4byte 0x000001f7
- thumb_func_end sub_8014FF0
+ thumb_func_end xxx_format_and_draw
thumb_func_start sub_8015034
sub_8015034:
diff --git a/asm/code_801B3C0.s b/asm/code_801B3C0.s
index 9d9fddc..966c4c3 100644
--- a/asm/code_801B3C0.s
+++ b/asm/code_801B3C0.s
@@ -29,7 +29,7 @@ sub_801B60C:
strb r4, [r0, 0x12]
ldr r0, [r6]
ldrb r0, [r0, 0x12]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -366,7 +366,7 @@ _0801B8FE:
_0801B914:
movs r0, 0xFA
lsls r0, 2
- bl sub_80913A0
+ bl AddToTeamMoney
movs r0, 0x4
bl sub_801B748
b _0801BB0E
@@ -381,12 +381,12 @@ _0801B92A:
bl sub_801B748
b _0801BB0E
_0801B938:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _0801B986
ldr r0, [r4]
ldrb r0, [r0, 0x12]
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _0801B968
@@ -408,7 +408,7 @@ _0801B968:
movs r0, 0x6
b _0801B99C
.align 2, 0
-_0801B970: .4byte gUnknown_203B460
+_0801B970: .4byte gTeamInventory_203B460
_0801B974: .4byte 0x000003e7
_0801B978:
strh r1, [r3]
@@ -420,8 +420,8 @@ _0801B978:
_0801B986:
ldr r0, [r4]
adds r0, 0x10
- bl sub_8091290
- bl sub_80910B4
+ bl AddItemToInventory
+ bl FillInventoryGaps
movs r0, 0xCB
bl PlaySound
ldr r1, [r4]
@@ -888,7 +888,7 @@ _0801BCFC:
b _0801BD7A
.align 2, 0
_0801BD28: .4byte gUnknown_203B234
-_0801BD2C: .4byte gUnknown_203B460
+_0801BD2C: .4byte gTeamInventory_203B460
_0801BD30: .4byte gUnknown_202DEA8
_0801BD34:
bl sub_801A8AC
@@ -913,7 +913,7 @@ _0801BD34:
b _0801BD7A
.align 2, 0
_0801BD64: .4byte gUnknown_203B234
-_0801BD68: .4byte gUnknown_203B460
+_0801BD68: .4byte gTeamInventory_203B460
_0801BD6C: .4byte gUnknown_202DEA8
_0801BD70:
bl sub_801A928
@@ -972,11 +972,11 @@ _0801BDD2:
bl sub_80917B8
ldr r0, [r4]
ldr r0, [r0, 0x24]
- bl sub_80911F8
+ bl ShiftItemsDownFrom
ldr r0, [r4]
adds r0, 0x10
- bl sub_8091290
- bl sub_80910B4
+ bl AddItemToInventory
+ bl FillInventoryGaps
movs r0, 0xCB
bl PlaySound
movs r0, 0
@@ -1049,11 +1049,11 @@ _0801BE78:
_0801BE80:
ldr r0, [r4]
ldr r0, [r0, 0x24]
- bl sub_80911F8
+ bl ShiftItemsDownFrom
ldr r0, [r4]
adds r0, 0x10
- bl sub_8091290
- bl sub_80910B4
+ bl AddItemToInventory
+ bl FillInventoryGaps
movs r0, 0xCB
bl PlaySound
bl sub_801A928
@@ -1968,7 +1968,7 @@ _0801C5AE:
movs r0, 0xC
adds r1, r7, 0
ldr r2, _0801C5E8
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r5, 0x1
ldr r0, [r6]
movs r1, 0x3E
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]
diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s
index c007807..c2bbfa0 100644
--- a/asm/code_8027C84.s
+++ b/asm/code_8027C84.s
@@ -115,7 +115,7 @@ sub_8027D40:
movs r0, 0x4
movs r1, 0x3
adds r3, r6, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
bl sub_80073E0
add sp, 0x14
@@ -209,7 +209,7 @@ sub_8027E18:
movs r0, 0
b _08027E46
_08027E28:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _08027E34
movs r0, 0x1
@@ -237,12 +237,12 @@ sub_8027E4C:
adds r4, r5, 0
adds r4, 0x28
ldrb r0, [r4]
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _08027E88
ldrb r0, [r4]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08027E94
@@ -264,7 +264,7 @@ _08027E88:
movs r0, 0
b _08027EAA
.align 2, 0
-_08027E8C: .4byte gUnknown_203B460
+_08027E8C: .4byte gTeamInventory_203B460
_08027E90: .4byte 0x000003e7
_08027E94:
ldr r0, _08027EB0
@@ -284,7 +284,7 @@ _08027EAA:
pop {r1}
bx r1
.align 2, 0
-_08027EB0: .4byte gUnknown_203B460
+_08027EB0: .4byte gTeamInventory_203B460
_08027EB4: .4byte 0x000003e6
thumb_func_end sub_8027E4C
@@ -310,7 +310,7 @@ _08027ED8:
ldr r0, [r4]
adds r0, 0x14
bl sub_8091274
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]
@@ -331,7 +331,7 @@ _08027F0C:
bl PlaySound
ldr r0, [r4]
ldrb r0, [r0, 0x14]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08027F40
@@ -348,7 +348,7 @@ _08027F0C:
b _08027F52
.align 2, 0
_08027F38: .4byte 0x0000014d
-_08027F3C: .4byte gUnknown_203B460
+_08027F3C: .4byte gTeamInventory_203B460
_08027F40:
ldr r0, _08027F74
ldr r1, [r0]
@@ -376,7 +376,7 @@ _08027F52:
bl sub_8027184
b _08027F82
.align 2, 0
-_08027F74: .4byte gUnknown_203B460
+_08027F74: .4byte gTeamInventory_203B460
_08027F78: .4byte gUnknown_203B2BC
_08027F7C:
movs r0, 0x2
diff --git a/asm/code_802B640.s b/asm/code_802B640.s
index cdef6e2..68c3ef2 100644
--- a/asm/code_802B640.s
+++ b/asm/code_802B640.s
@@ -409,7 +409,7 @@ _0802B930:
str r0, [sp]
movs r0, 0x15
adds r1, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r6, 0x1
ldr r0, [r7]
adds r0, 0x52
@@ -668,7 +668,7 @@ sub_802BB28:
str r4, [sp]
movs r0, 0xA
movs r1, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r3, [r5]
ldr r1, [r3, 0x8]
lsls r1, 2
@@ -680,7 +680,7 @@ sub_802BB28:
str r4, [sp]
movs r0, 0x6
movs r1, 0x14
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, [r5]
ldr r0, [r0, 0x24]
bl sub_80073E0
diff --git a/asm/code_80428A0.s b/asm/code_80428A0.s
index c85bf60..70dee43 100644
--- a/asm/code_80428A0.s
+++ b/asm/code_80428A0.s
@@ -2824,7 +2824,7 @@ _080441A4:
.align 2, 0
_080441AC: .4byte gUnknown_203B418
_080441B0: .4byte 0x00000644
-_080441B4: .4byte gUnknown_203B460
+_080441B4: .4byte gTeamInventory_203B460
_080441B8: .4byte gRecruitedPokemonRef
thumb_func_end sub_8044124
@@ -4249,7 +4249,7 @@ sub_8044CC8:
adds r0, r1
b _08044D34
.align 2, 0
-_08044CE8: .4byte gUnknown_203B460
+_08044CE8: .4byte gTeamInventory_203B460
_08044CEC:
adds r0, r1, 0
cmp r0, 0x80
@@ -4319,10 +4319,10 @@ sub_8044D40:
strb r0, [r1, 0x2]
strb r0, [r1, 0x1]
strb r0, [r1]
- bl sub_80910B4
+ bl FillInventoryGaps
b _08044D88
.align 2, 0
-_08044D70: .4byte gUnknown_203B460
+_08044D70: .4byte gTeamInventory_203B460
_08044D74:
lsls r0, r1, 24
lsrs r0, 24
@@ -4419,7 +4419,7 @@ _08044E10:
strb r0, [r1, 0x2]
strb r0, [r1, 0x1]
strb r0, [r1]
- bl sub_80910B4
+ bl FillInventoryGaps
_08044E1C:
pop {r4}
pop {r0}
@@ -4440,7 +4440,7 @@ sub_8044E24:
ldr r0, [r4, 0x70]
mov r8, r0
ldrb r0, [r5, 0x2]
- bl sub_80915A0
+ bl IsHMItem
lsls r0, 24
cmp r0, 0
bne _08044EBA
@@ -6369,7 +6369,7 @@ sub_8045C28:
bl sub_8090A8C
movs r7, 0
adds r0, r4, 0
- bl sub_8091544
+ bl IsNotSpecialItem
lsls r0, 24
cmp r0, 0
beq _08045C72
@@ -6519,7 +6519,7 @@ _08045D58:
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
bne _08045D6E
@@ -6640,8 +6640,8 @@ _08045E40:
lsls r0, 1
bl PlaySoundEffect
adds r0, r5, 0
- bl sub_80915D4
- bl sub_80913A0
+ bl GetMoneyValue
+ bl AddToTeamMoney
ldr r0, _08045E74
adds r1, r5, 0
bl sub_8045BF8
@@ -6679,7 +6679,7 @@ _08045E94:
.align 2, 0
_08045EA8: .4byte gUnknown_203B418
_08045EAC: .4byte 0x0000065b
-_08045EB0: .4byte gUnknown_203B460
+_08045EB0: .4byte gTeamInventory_203B460
_08045EB4:
ldr r0, [sp, 0xAC]
adds r0, 0x60
@@ -6924,7 +6924,7 @@ _0804608C: .4byte gUnknown_202DE58
_08046090: .4byte gUnknown_80F8FC4
_08046094:
adds r0, r5, 0
- bl sub_8091290
+ bl AddItemToInventory
lsls r0, 24
cmp r0, 0
beq _080460C0
@@ -7007,7 +7007,7 @@ _08046110:
cmp r0, 0
beq _08046186
ldrb r0, [r6, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _08046186
@@ -7019,7 +7019,7 @@ _08046110:
cmp r7, 0
beq _08046186
adds r0, r6, 0
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _08046168
ldr r2, [r1]
ldr r1, _0804616C
@@ -7029,7 +7029,7 @@ _08046168: .4byte gUnknown_203B418
_0804616C: .4byte 0x0000068c
_08046170:
adds r0, r6, 0
- bl sub_8090CCC
+ bl GetStackSellPrice
ldr r1, _080461BC
ldr r2, [r1]
movs r1, 0xD2
@@ -7107,7 +7107,7 @@ _080461F2:
cmp r0, 0
beq _0804624E
ldrb r0, [r4, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0804624E
@@ -7119,7 +7119,7 @@ _080461F2:
cmp r7, 0
beq _0804624E
adds r0, r4, 0
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _08046230
ldr r2, [r1]
ldr r1, _08046234
@@ -7130,7 +7130,7 @@ _08046230: .4byte gUnknown_203B418
_08046234: .4byte 0x0000068c
_08046238:
adds r0, r4, 0
- bl sub_8090CCC
+ bl GetStackSellPrice
ldr r1, _0804628C
ldr r2, [r1]
movs r3, 0xD2
@@ -8672,7 +8672,7 @@ _08046DC8:
_08046E1E:
cmp r7, 0
bne _08046D96
- bl sub_80910B4
+ bl FillInventoryGaps
cmp r6, 0
beq _08046ED4
bl sub_8083600
@@ -8749,7 +8749,7 @@ _08046ED4:
pop {r0}
bx r0
.align 2, 0
-_08046EDC: .4byte gUnknown_203B460
+_08046EDC: .4byte gTeamInventory_203B460
_08046EE0: .4byte sub_80861A8
_08046EE4: .4byte gUnknown_203B418
_08046EE8: .4byte 0x0001356c
@@ -8775,7 +8775,7 @@ sub_8046F00:
lsls r0, 16
lsrs r7, r0, 16
ldrb r0, [r4, 0x2]
- bl sub_80915A0
+ bl IsHMItem
lsls r0, 24
cmp r0, 0
bne _08046F6E
@@ -8856,7 +8856,7 @@ _08046FAE:
adds r5, 0x1
cmp r5, 0x13
ble _08046F90
- bl sub_80910B4
+ bl FillInventoryGaps
movs r5, 0
movs r6, 0
_08046FBC:
@@ -8895,7 +8895,7 @@ _08046FF4:
pop {r0}
bx r0
.align 2, 0
-_08047000: .4byte gUnknown_203B460
+_08047000: .4byte gTeamInventory_203B460
_08047004: .4byte gUnknown_203B418
_08047008: .4byte 0x0001357c
thumb_func_end sub_8046F84
@@ -8922,7 +8922,7 @@ _0804702C:
adds r5, 0x1
cmp r5, 0x13
ble _08047012
- bl sub_80910B4
+ bl FillInventoryGaps
movs r5, 0
_08047038:
ldr r0, _0804707C
@@ -8957,7 +8957,7 @@ _0804706C:
pop {r0}
bx r0
.align 2, 0
-_08047078: .4byte gUnknown_203B460
+_08047078: .4byte gTeamInventory_203B460
_0804707C: .4byte gUnknown_203B418
_08047080: .4byte 0x0001357c
thumb_func_end sub_804700C
@@ -8985,7 +8985,7 @@ _080470A2:
adds r5, 0x1
cmp r5, 0x13
ble _08047090
- bl sub_80910B4
+ bl FillInventoryGaps
movs r5, 0
_080470B0:
ldr r0, _080470EC
@@ -9016,7 +9016,7 @@ _080470E2:
movs r0, 0x1
b _080470FC
.align 2, 0
-_080470E8: .4byte gUnknown_203B460
+_080470E8: .4byte gTeamInventory_203B460
_080470EC: .4byte gUnknown_203B418
_080470F0: .4byte 0x0001357c
_080470F4:
@@ -9049,8 +9049,8 @@ _0804710A:
cmp r0, 0x69
bne _08047132
adds r0, r4, 0
- bl sub_80915D4
- bl sub_80913A0
+ bl GetMoneyValue
+ bl AddToTeamMoney
strb r5, [r4, 0x2]
strb r5, [r4, 0x1]
strb r5, [r4]
@@ -9067,12 +9067,12 @@ _08047142:
adds r6, 0x1
cmp r6, 0x13
ble _0804710A
- bl sub_80910B4
+ bl FillInventoryGaps
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_08047154: .4byte gUnknown_203B460
+_08047154: .4byte gTeamInventory_203B460
thumb_func_end sub_8047104
thumb_func_start sub_8047158
@@ -9106,7 +9106,7 @@ _08047180:
pop {r0}
bx r0
.align 2, 0
-_0804718C: .4byte gUnknown_203B460
+_0804718C: .4byte gTeamInventory_203B460
thumb_func_end sub_8047158
thumb_func_start sub_8047190
diff --git a/asm/code_8048480.s b/asm/code_8048480.s
index c24da61..df967ae 100644
--- a/asm/code_8048480.s
+++ b/asm/code_8048480.s
@@ -584,7 +584,7 @@ _08048984: .4byte gUnknown_80FE3E8
_08048988:
mov r1, r8
ldrb r0, [r1, 0x2]
- bl sub_80915A0
+ bl IsHMItem
lsls r0, 24
cmp r0, 0
beq _080489A0
@@ -1095,7 +1095,7 @@ _08048D78:
cmp r0, 0x1
bne _08048DB0
ldrb r0, [r2, 0x2]
- bl sub_8091570
+ bl IsEdibleItem
lsls r0, 24
cmp r0, 0
beq _08048DB0
@@ -20335,7 +20335,7 @@ _08052196:
movs r0, 0
b _080521CA
.align 2, 0
-_080521B4: .4byte gUnknown_203B460
+_080521B4: .4byte gTeamInventory_203B460
_080521B8: .4byte gRecruitedPokemonRef
_080521BC: .4byte 0x00008df8
_080521C0: .4byte 0x00008e38
diff --git a/asm/code_8057824.s b/asm/code_8057824.s
index f69391b..6324830 100644
--- a/asm/code_8057824.s
+++ b/asm/code_8057824.s
@@ -8250,7 +8250,7 @@ _0805B7C2:
bl sub_80522F4
b _0805B7E8
.align 2, 0
-_0805B7D4: .4byte gUnknown_203B460
+_0805B7D4: .4byte gTeamInventory_203B460
_0805B7D8: .4byte gUnknown_80FDC9C
_0805B7DC:
ldr r0, _0805B7F8
@@ -8840,7 +8840,7 @@ _0805BC30:
bl sub_80522F4
b _0805BC60
.align 2, 0
-_0805BC44: .4byte gUnknown_203B460
+_0805BC44: .4byte gTeamInventory_203B460
_0805BC48: .4byte gUnknown_203B418
_0805BC4C: .4byte 0x0001357c
_0805BC50: .4byte gUnknown_80FC8F0
@@ -12726,7 +12726,7 @@ _0805DEFC: .4byte gUnknown_203B46C
_0805DF00: .4byte gRealInputs
_0805DF04: .4byte gUnknown_202F22D
_0805DF08: .4byte 0x01000200
-_0805DF0C: .4byte gUnknown_203B460
+_0805DF0C: .4byte gTeamInventory_203B460
_0805DF10: .4byte gUnknown_203B418
_0805DF14: .4byte 0x0001820a
_0805DF18: .4byte gUnknown_202EE00
@@ -16153,7 +16153,7 @@ _0805FA62:
movs r0, 0x73
movs r1, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _0805FBC8
ldr r0, [r0]
movs r1, 0x98
@@ -16167,7 +16167,7 @@ _0805FA62:
movs r0, 0x73
movs r1, 0xC
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r5, _0805FBD0
movs r0, 0
bl sub_807E580
@@ -16182,7 +16182,7 @@ _0805FA62:
movs r0, 0x73
movs r1, 0x18
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, [sp, 0x4]
str r0, [r4]
ldr r0, [sp, 0x8]
@@ -16195,7 +16195,7 @@ _0805FA62:
movs r0, 0x73
movs r1, 0x24
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r7, 0
mov r8, r4
_0805FB3A:
@@ -16230,7 +16230,7 @@ _0805FB3A:
movs r0, 0x4
adds r1, r7, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r7, 0xC
cmp r7, 0x2F
bgt _0805FB8C
@@ -16259,7 +16259,7 @@ _0805FBB8: .4byte gFieldMenuGroundPtr
_0805FBBC: .4byte gPlayTimeRef
_0805FBC0: .4byte gUnknown_202DE30
_0805FBC4: .4byte gUnknown_80F9174
-_0805FBC8: .4byte gUnknown_203B460
+_0805FBC8: .4byte gTeamInventory_203B460
_0805FBCC: .4byte gUnknown_80F9190
_0805FBD0: .4byte gAvailablePokemonNames
_0805FBD4: .4byte gUnknown_80F91A8
@@ -16747,7 +16747,7 @@ _0805FF66:
b _0805FFE8
.align 2, 0
_0805FFA8: .4byte gUnknown_202F240
-_0805FFAC: .4byte gUnknown_203B460
+_0805FFAC: .4byte gTeamInventory_203B460
_0805FFB0: .4byte gUnknown_203B418
_0805FFB4: .4byte 0x0001357c
_0805FFB8: .4byte gUnknown_202F258
@@ -16904,7 +16904,7 @@ _080600D8:
lsls r0, 1
bl PlaySoundEffect
bl sub_8047158
- bl sub_80912C8
+ bl ConvertMoneyItemToMoney
movs r0, 0
ldr r2, _08060140
str r0, [r2]
@@ -17196,7 +17196,7 @@ _0806033C:
.align 2, 0
_0806034C: .4byte gUnknown_202EE10
_08060350: .4byte gUnknown_202F248
-_08060354: .4byte gUnknown_203B460
+_08060354: .4byte gTeamInventory_203B460
_08060358: .4byte gUnknown_202F240
_0806035C: .4byte gRealInputs
_08060360: .4byte gUnknown_203B418
@@ -17454,7 +17454,7 @@ _08060564:
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r4, 0
adds r6, r5, 0
movs r7, 0
@@ -17486,14 +17486,14 @@ _08060592:
movs r0, 0x8
adds r2, r5, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r4, 0x1
cmp r4, 0x9
ble _0806057E
b _08060794
.align 2, 0
_080605C0: .4byte gTeamToolboxAPtr
-_080605C4: .4byte gUnknown_203B460
+_080605C4: .4byte gTeamInventory_203B460
_080605C8: .4byte gUnknown_8106B60
_080605CC:
ldr r0, _08060630
@@ -17503,7 +17503,7 @@ _080605CC:
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r4, 0
adds r6, r5, 0
movs r7, 0
@@ -17538,14 +17538,14 @@ _080605FC:
movs r0, 0x8
adds r2, r5, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r4, 0x1
cmp r4, 0x9
ble _080605E6
b _08060794
.align 2, 0
_08060630: .4byte gTeamToolboxBPtr
-_08060634: .4byte gUnknown_203B460
+_08060634: .4byte gTeamInventory_203B460
_08060638: .4byte gUnknown_8106B60
_0806063C:
mov r1, r9
@@ -17564,7 +17564,7 @@ _0806063C:
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldrb r1, [r7]
movs r0, 0x1
ands r0, r1
@@ -17587,7 +17587,7 @@ _0806063C:
movs r0, 0x8
adds r2, r4, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08060698:
ldr r1, [sp, 0x70]
cmp r1, 0
@@ -17615,7 +17615,7 @@ _080606B0:
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldrb r1, [r7]
movs r0, 0x1
ands r0, r1
@@ -17638,7 +17638,7 @@ _080606B0:
movs r0, 0x8
adds r2, r4, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08060794
.align 2, 0
_0806070C: .4byte gAvailablePokemonNames
@@ -17676,7 +17676,7 @@ _08060718:
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldrb r1, [r7]
movs r0, 0x1
ands r0, r1
@@ -17700,7 +17700,7 @@ _08060718:
movs r0, 0x8
adds r2, r5, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08060794:
ldr r2, _080607F4
movs r3, 0x18
@@ -17726,7 +17726,7 @@ _080607A6:
movs r0, 0x4
movs r1, 0x2
movs r3, 0x1
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0x1
bl sub_80073E0
_080607D0:
@@ -17952,7 +17952,7 @@ _08060964: .4byte gUnknown_202F238
_08060968: .4byte gUnknown_202EE6C
_0806096C: .4byte gUnknown_203B418
_08060970: .4byte 0x0000065b
-_08060974: .4byte gUnknown_203B460
+_08060974: .4byte gTeamInventory_203B460
_08060978:
mov r0, r10
adds r0, 0x60
@@ -18122,7 +18122,7 @@ _08060ABE:
bl sub_8044FF0
b _08060B3C
.align 2, 0
-_08060AD4: .4byte gUnknown_203B460
+_08060AD4: .4byte gTeamInventory_203B460
_08060AD8: .4byte gUnknown_202F238
_08060ADC: .4byte gUnknown_203B418
_08060AE0: .4byte 0x0001357c
@@ -18150,7 +18150,7 @@ _08060AE8:
.align 2, 0
_08060B10: .4byte gUnknown_203B418
_08060B14: .4byte 0x0000065b
-_08060B18: .4byte gUnknown_203B460
+_08060B18: .4byte gTeamInventory_203B460
_08060B1C:
ldrb r1, [r7, 0x2]
movs r0, 0x37
@@ -18296,7 +18296,7 @@ _08060C32:
.align 2, 0
_08060C50: .4byte gUnknown_203B418
_08060C54: .4byte 0x0001357c
-_08060C58: .4byte gUnknown_203B460
+_08060C58: .4byte gTeamInventory_203B460
_08060C5C: .4byte 0x0000065b
_08060C60:
ldrb r1, [r7, 0x2]
@@ -18526,7 +18526,7 @@ _08060E1A:
.align 2, 0
_08060E28: .4byte gUnknown_203B418
_08060E2C: .4byte 0x0000065b
-_08060E30: .4byte gUnknown_203B460
+_08060E30: .4byte gTeamInventory_203B460
_08060E34: .4byte 0x0001357c
thumb_func_end sub_8060D64
@@ -19065,7 +19065,7 @@ _0806125C:
movs r0, 0xC
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08061286:
movs r6, 0
cmp r6, r7
@@ -19253,7 +19253,7 @@ _080613EE:
movs r0, 0x9
ldr r2, _08061428
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08061438
.align 2, 0
_0806141C: .4byte gUnknown_8106BD0
@@ -19265,7 +19265,7 @@ _0806142C:
movs r0, 0x9
ldr r2, _08061458
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08061438:
adds r6, 0x1
cmp r6, r7
@@ -19957,7 +19957,7 @@ _080619B8:
mov r1, r8
ldr r2, _080619E0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _080619F4
.align 2, 0
_080619DC: .4byte gAvailablePokemonNames
@@ -19969,7 +19969,7 @@ _080619E4:
mov r1, r8
ldr r2, _08061A34
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_080619F4:
adds r6, 0x1
movs r0, 0xC
@@ -21569,7 +21569,7 @@ _08062650:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r0, r10
bl GetIQSkillDescription
adds r2, r0, 0
@@ -21578,7 +21578,7 @@ _08062650:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -21699,7 +21699,7 @@ _0806276C:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r0, r10
bl GetTacticsDescription
adds r2, r0, 0
@@ -21708,7 +21708,7 @@ _0806276C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
mov r0, r10
@@ -21852,7 +21852,7 @@ sub_806285C:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r0, r10
bl sub_808E51C
adds r2, r0, 0
@@ -21861,7 +21861,7 @@ sub_806285C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
add r4, sp, 0x4
@@ -22180,7 +22180,7 @@ sub_8062B74:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r1, 0x10
mov r8, r1
mov r0, r9
@@ -22213,7 +22213,7 @@ _08062BDE:
movs r0, 0xC
mov r1, r8
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08062C8A
.align 2, 0
_08062BF0: .4byte gUnknown_8106C90
@@ -22285,7 +22285,7 @@ _08062C6C:
mov r1, r8
ldr r2, _08062CA4
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0xC
add r8, r0
_08062C80:
@@ -22331,7 +22331,7 @@ sub_8062CA8:
movs r0, 0xC
movs r1, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r7, 0x8
movs r6, 0x12
adds r0, r5, 0
@@ -22380,7 +22380,7 @@ _08062D18:
_08062D2C:
adds r1, r6, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08062D52
.align 2, 0
_08062D38: .4byte gUnknown_8106C9C
@@ -22393,7 +22393,7 @@ _08062D3C:
adds r0, r7, 0
adds r1, r6, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08062D52:
movs r0, 0x2
bl sub_80073E0
@@ -23391,7 +23391,7 @@ _08063526:
movs r0, 0x4
movs r1, 0
movs r3, 0x2
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0x2
bl sub_80073E0
add sp, 0x24
@@ -23440,7 +23440,7 @@ sub_8063578:
adds r0, r4, 0
movs r1, 0
mov r3, r8
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r1, 0
mov r9, r1
ldr r0, [sp, 0x10]
@@ -23523,7 +23523,7 @@ _08063658:
adds r1, r4, 0
ldr r2, _08063694
mov r3, r8
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08063668:
adds r7, 0x8
adds r5, 0x8
@@ -24002,13 +24002,13 @@ sub_80639E4:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r2, [r5, 0x4]
str r4, [sp]
movs r0, 0x4
movs r1, 0x10
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
ldr r0, _08063A6C
@@ -27169,7 +27169,7 @@ _080652D2:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -27179,7 +27179,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -27189,7 +27189,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r4, 0
movs r1, 0x2
bl sub_8013800
@@ -27199,7 +27199,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r5, 0x4
adds r0, r4, 0
movs r1, 0x3
@@ -27210,7 +27210,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, _080653D8
ldr r0, [r1]
movs r1, 0xCB
@@ -27233,7 +27233,7 @@ _080652D2:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0806540E
.align 2, 0
_080653D0: .4byte gUnknown_202EE10
@@ -27256,7 +27256,7 @@ _080653F4:
str r7, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0806540E:
ldr r0, _08065444
adds r1, r5, 0
@@ -27268,7 +27268,7 @@ _0806540E:
str r0, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -27379,7 +27379,7 @@ sub_806544C:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r4, 0
movs r1, 0
bl sub_8013800
@@ -27392,7 +27392,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r4, 0
movs r1, 0x1
bl sub_8013800
@@ -27404,7 +27404,7 @@ sub_806544C:
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
add sp, 0xC8
@@ -27531,28 +27531,28 @@ CreateFieldGameOptionsMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x4]
ldr r0, _080656B4
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x8]
ldr r0, _080656B8
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0xC]
ldr r0, _080656BC
ldr r2, [r0]
str r6, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
add sp, 0xD4
@@ -27693,42 +27693,42 @@ CreateFieldDungeonMenu:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x4]
ldr r0, _08065848
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x8]
ldr r0, _0806584C
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0xC]
ldr r0, _08065850
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x10]
ldr r0, _08065854
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [sp, 0x14]
ldr r0, _08065858
ldr r2, [r0]
str r5, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _0806585C
ldrb r0, [r0]
adds r4, r7, 0
@@ -27976,14 +27976,14 @@ _08065A0A:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, [r6]
ldr r0, _08065A84
ldr r2, [r0]
str r4, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _08065A88
ldrb r1, [r0, 0x8]
lsls r3, r1, 2
@@ -28413,7 +28413,7 @@ sub_8065CAC:
movs r0, 0x10
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r4, 0
ldr r5, _08065DB8
_08065D7A:
@@ -28426,7 +28426,7 @@ _08065D7A:
str r0, [sp]
movs r0, 0x8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r4, 0x1
cmp r4, 0x6
ble _08065D7A
@@ -28582,7 +28582,7 @@ _08065E0C:
str r7, [sp]
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r1, _08065F38
ldr r2, [sp, 0xC8]
lsls r0, r2, 5
@@ -28593,7 +28593,7 @@ _08065E0C:
movs r0, 0x8
movs r1, 0x10
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
_08065EF4:
@@ -29005,7 +29005,7 @@ _08066208:
mov r1, r8
add r2, sp, 0x4
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08066244:
subs r7, 0x1
adds r5, 0x2
@@ -29103,7 +29103,7 @@ _080662C4:
movs r1, 0x14
add r2, sp, 0x4
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
movs r0, 0x45
@@ -29205,7 +29205,7 @@ _080663A0:
adds r1, r6, 0
add r2, sp, 0x4
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0
bl sub_80073E0
movs r0, 0xD
@@ -29702,7 +29702,7 @@ _08066798:
ldr r0, _080667CC
b _080667DE
.align 2, 0
-_080667C0: .4byte gUnknown_203B460
+_080667C0: .4byte gTeamInventory_203B460
_080667C4: .4byte gUnknown_202DE58
_080667C8: .4byte 0x00000133
_080667CC: .4byte gUnknown_80F8D04
@@ -29797,7 +29797,7 @@ _08066856:
bl sub_80522A8
b _080668BE
.align 2, 0
-_0806688C: .4byte gUnknown_203B460
+_0806688C: .4byte gTeamInventory_203B460
_08066890: .4byte gUnknown_202DE58
_08066894: .4byte gUnknown_80F8C7C
_08066898:
@@ -29934,7 +29934,7 @@ _08066968:
_080669A8: .4byte 0xffffff00
_080669AC:
mov r0, sp
- bl sub_8091290
+ bl AddItemToInventory
_080669B2:
ldr r0, [sp, 0x4]
str r0, [r7, 0x60]
@@ -30079,7 +30079,7 @@ sub_8066AC0:
ldr r0, _08066AF4
b _08066B10
.align 2, 0
-_08066AF0: .4byte gUnknown_203B460
+_08066AF0: .4byte gTeamInventory_203B460
_08066AF4: .4byte gUnknown_80F8D60
_08066AF8:
ldrb r1, [r5]
@@ -30123,7 +30123,7 @@ _08066B24:
strb r4, [r5, 0x1]
strb r4, [r5]
mov r0, sp
- bl sub_8091290
+ bl AddItemToInventory
ldr r0, _08066BC4
bl PlaySoundEffect
ldr r0, _08066BC8
@@ -30420,7 +30420,7 @@ _08066DC4:
strb r6, [r5, 0x2]
strb r6, [r5, 0x1]
strb r6, [r5]
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, _08066E00
bl PlaySoundEffect
ldr r0, _08066E04
@@ -30596,9 +30596,9 @@ _08066F30:
b _08066F46
_08066F40:
mov r0, sp
- bl sub_8091290
+ bl AddItemToInventory
_08066F46:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r4, _08066F90
add r1, sp, 0x4
adds r0, r4, 0
@@ -30776,9 +30776,9 @@ _080670B4:
b _080670CA
_080670C4:
add r0, sp, 0x4
- bl sub_8091290
+ bl AddItemToInventory
_080670CA:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, _08067100
bl PlaySoundEffect
ldr r0, _08067104
@@ -31008,7 +31008,7 @@ _080672A8:
strb r0, [r4, 0x2]
strb r0, [r4, 0x1]
strb r0, [r4]
- bl sub_80910B4
+ bl FillInventoryGaps
b _080672F6
.align 2, 0
_080672C0: .4byte 0xffffff00
@@ -32570,7 +32570,7 @@ sub_8067F00:
movs r0, 0xC
movs r1, 0
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r1, 0
mov r10, r1
b _08067FF6
@@ -32633,7 +32633,7 @@ _08067FA4:
movs r0, 0x7
mov r1, r8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08067FE6
.align 2, 0
_08067FCC: .4byte gUnknown_202DE58
@@ -32645,7 +32645,7 @@ _08067FD8:
movs r0, 0x7
mov r1, r8
movs r3, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08067FE6:
movs r2, 0x1
add r10, r2
@@ -32677,7 +32677,7 @@ _08068000:
movs r0, 0x8
movs r1, 0x2
movs r3, 0x1
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0806804C
.align 2, 0
_08068028: .4byte gUnknown_8106E48
@@ -32694,7 +32694,7 @@ _08068034:
movs r0, 0x8
movs r1, 0x2
movs r3, 0x1
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0806804C:
movs r0, 0x1
bl sub_80073E0
@@ -34220,8 +34220,8 @@ _08068C06:
cmp r0, 0x69
bne _08068C50
adds r0, r4, 0
- bl sub_80915D4
- bl sub_80913A0
+ bl GetMoneyValue
+ bl AddToTeamMoney
strb r5, [r4, 0x2]
strb r5, [r4, 0x1]
strb r5, [r4]
@@ -44950,7 +44950,7 @@ _0806DEC8:
bl sub_807A5D0
b _0806DEF2
.align 2, 0
-_0806DED4: .4byte gUnknown_203B460
+_0806DED4: .4byte gTeamInventory_203B460
_0806DED8: .4byte gUnknown_203B418
_0806DEDC: .4byte 0x00000679
_0806DEE0: .4byte 0x00000676
diff --git a/asm/code_807001C.s b/asm/code_807001C.s
index 71cd91a..52b13ab 100644
--- a/asm/code_807001C.s
+++ b/asm/code_807001C.s
@@ -7475,7 +7475,7 @@ _080738A4:
bl sub_8044C94
b _080738CE
.align 2, 0
-_080738C0: .4byte gUnknown_203B460
+_080738C0: .4byte gTeamInventory_203B460
_080738C4:
adds r0, r6, 0
adds r0, 0x44
@@ -8170,8 +8170,8 @@ _08073DF4:
bl PlaySoundEffect
_08073DFC:
adds r0, r5, 0
- bl sub_80915D4
- bl sub_80913A0
+ bl GetMoneyValue
+ bl AddToTeamMoney
ldr r0, _08073E1C
adds r1, r5, 0
bl sub_8045BF8
@@ -8219,7 +8219,7 @@ _08073E48:
.align 2, 0
_08073E64: .4byte gUnknown_203B418
_08073E68: .4byte 0x0000065b
-_08073E6C: .4byte gUnknown_203B460
+_08073E6C: .4byte gTeamInventory_203B460
_08073E70:
mov r0, r10
adds r0, 0x60
@@ -8454,7 +8454,7 @@ _0807402C: .4byte gUnknown_202DE58
_08074030: .4byte gUnknown_80F9018
_08074034:
adds r0, r5, 0
- bl sub_8091290
+ bl AddItemToInventory
lsls r0, 24
cmp r0, 0
beq _08074060
@@ -30546,7 +30546,7 @@ _0807F04E:
ldr r0, [r4]
adds r0, r5
ldr r0, [r0]
- bl sub_80913A0
+ bl AddToTeamMoney
ldr r0, [r4]
ldr r2, _0807F17C
adds r1, r0, r2
@@ -30616,7 +30616,7 @@ _0807F09A:
lsrs r0, 16
lsls r0, 24
lsrs r0, 24
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
add r3, sp, 0x8
cmp r0, 0
@@ -30761,14 +30761,14 @@ _0807F204:
movs r0, 0x2
b _0807F31C
.align 2, 0
-_0807F224: .4byte gUnknown_203B460
+_0807F224: .4byte gTeamInventory_203B460
_0807F228: .4byte gUnknown_80FE520
_0807F22C:
movs r0, 0xA6
lsls r0, 1
bl PlaySoundEffect
negs r0, r4
- bl sub_80913A0
+ bl AddToTeamMoney
movs r6, 0
_0807F23C:
movs r5, 0
@@ -30793,7 +30793,7 @@ _0807F240:
bl sub_8045108
adds r4, r0, 0
ldrb r0, [r4, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0807F27E
@@ -30820,7 +30820,7 @@ _0807F28C:
cmp r0, 0
beq _0807F2B2
ldrb r0, [r4, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0807F2B2
@@ -30855,7 +30855,7 @@ _0807F2BA:
cmp r0, 0
beq _0807F2F8
ldrb r0, [r4, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0807F2F8
@@ -30888,7 +30888,7 @@ _0807F31C:
pop {r1}
bx r1
.align 2, 0
-_0807F324: .4byte gUnknown_203B460
+_0807F324: .4byte gTeamInventory_203B460
_0807F328: .4byte gUnknown_203B418
_0807F32C: .4byte 0x000135cc
_0807F330: .4byte 0x00000694
@@ -31014,7 +31014,7 @@ _0807F41C: .4byte gUnknown_203B418
_0807F420: .4byte 0x0000066e
_0807F424: .4byte 0x0000066f
_0807F428: .4byte gUnknown_80FE4B8
-_0807F42C: .4byte gUnknown_203B460
+_0807F42C: .4byte gTeamInventory_203B460
_0807F430: .4byte 0x000135cc
_0807F434: .4byte 0x00000694
_0807F438: .4byte 0x0000068c
@@ -32841,7 +32841,7 @@ _08080290:
cmp r0, 0
beq _080802C2
ldrb r0, [r2, 0x2]
- bl sub_8091544
+ bl IsNotSpecialItem
lsls r0, 24
cmp r0, 0
beq _080802C2
@@ -32870,7 +32870,7 @@ _080802C8:
mov r0, r8
adds r0, 0x62
ldrb r0, [r0]
- bl sub_8091544
+ bl IsNotSpecialItem
lsls r0, 24
cmp r0, 0
beq _080802FA
@@ -32896,7 +32896,7 @@ _08080300:
bl sub_80522F4
b _0808034A
.align 2, 0
-_0808030C: .4byte gUnknown_203B460
+_0808030C: .4byte gTeamInventory_203B460
_08080310: .4byte gUnknown_80FDC40
_08080314:
adds r0, r6, 0
@@ -33137,7 +33137,7 @@ _080804B6:
ldr r0, _080804C8
b _080804D4
.align 2, 0
-_080804C0: .4byte gUnknown_203B460
+_080804C0: .4byte gTeamInventory_203B460
_080804C4: .4byte gUnknown_80F4E0E
_080804C8: .4byte gUnknown_80FD788
_080804CC:
@@ -33888,7 +33888,7 @@ sub_8080A5C:
str r0, [sp, 0x8]
movs r0, 0
strb r0, [r2]
- bl sub_80910B4
+ bl FillInventoryGaps
movs r1, 0xC8
lsls r1, 1
adds r0, r4, 0
@@ -41223,7 +41223,7 @@ _080844FC: .4byte gUnknown_203B418
_08084500: .4byte 0x0000068a
_08084504: .4byte gUnknown_80FA32C
_08084508: .4byte gUnknown_202DE58
-_0808450C: .4byte gUnknown_203B460
+_0808450C: .4byte gTeamInventory_203B460
_08084510: .4byte gUnknown_80FA448
_08084514:
lsls r1, r3, 2
@@ -41233,7 +41233,7 @@ _08084514:
strb r0, [r1, 0x2]
strb r0, [r1, 0x1]
strb r0, [r1]
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, _08084538
ldr r1, [r0]
movs r0, 0
@@ -44550,7 +44550,7 @@ _08086104:
movs r0, 0x1
b _0808611C
.align 2, 0
-_08086108: .4byte gUnknown_203B460
+_08086108: .4byte gTeamInventory_203B460
_0808610C: .4byte gUnknown_203B418
_08086110: .4byte 0x0001357c
_08086114:
diff --git a/asm/code_8090208.s b/asm/code_8090208.s
index 56fef8f..19e7efa 100644
--- a/asm/code_8090208.s
+++ b/asm/code_8090208.s
@@ -132,7 +132,7 @@ sub_809034C:
lsls r2, 24
lsrs r2, 24
str r2, [sp, 0xE8]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
str r0, [sp, 0xEC]
movs r5, 0
movs r0, 0
@@ -395,7 +395,7 @@ _08090578:
mov r2, r10
adds r0, r2, r6
ldrb r0, [r0]
- bl sub_80911A4
+ bl GetItemPossessionCount
cmp r0, 0
beq _080905A6
_0809059E:
@@ -685,7 +685,7 @@ _080907F0: .4byte gUnknown_8115DD4
_080907F4: .4byte gUnknown_8115E00
_080907F8: .4byte gUnknown_8115E28
_080907FC: .4byte gUnknown_8115E54
-_08090800: .4byte gUnknown_203B460
+_08090800: .4byte gTeamInventory_203B460
_08090804: .4byte gUnknown_8115E80
_08090808: .4byte gUnknown_8108F50
_0809080C:
diff --git a/asm/code_8092334.s b/asm/code_8092334.s
index 28ab356..2b93365 100644
--- a/asm/code_8092334.s
+++ b/asm/code_8092334.s
@@ -3167,7 +3167,7 @@ sub_8093DE8:
adds r0, r4, 0
movs r1, 0
adds r3, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r3, 0x13
ldrh r1, [r6, 0x2]
ldr r4, _08093E8C
@@ -3187,7 +3187,7 @@ _08093E3A:
movs r0, 0x4
adds r1, r3, 0
adds r3, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
adds r1, r5, 0
bl sub_8093E90
@@ -3243,14 +3243,14 @@ sub_8093E90:
movs r0, 0x4
movs r1, 0x4A
adds r3, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _08093F08
ldr r2, [r0]
str r4, [sp]
movs r0, 0x4
movs r1, 0x56
adds r3, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
bl sub_8092B00
lsls r0, 24
@@ -3261,7 +3261,7 @@ sub_8093E90:
movs r0, 0x40
movs r1, 0x56
adds r3, r5, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
bl sub_8092BC0
ldr r1, _08093F0C
@@ -3273,7 +3273,7 @@ sub_8093E90:
.align 2, 0
_08093F00: .4byte gAvailablePokemonNames
_08093F04: .4byte gUnknown_810CF00
-_08093F08: .4byte gUnknown_810CF0C
+_08093F08: .4byte gPtrTypeText
_08093F0C: .4byte gUnknown_202DE30
thumb_func_end sub_8093E90
@@ -4189,7 +4189,7 @@ sub_8094558:
movs r1, 0
adds r2, r4, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r4, _080945D0
adds r1, r6, 0
adds r1, 0x18
@@ -4201,7 +4201,7 @@ sub_8094558:
movs r0, 0x4
movs r1, 0x10
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r5, 0x1A
adds r0, r4, 0
adds r1, r6, 0
@@ -4251,7 +4251,7 @@ _080945EA:
adds r1, r5, 0
add r2, sp, 0x4
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r5, 0xA
movs r1, 0x14
ldrsh r0, [r6, r1]
@@ -4268,7 +4268,7 @@ _080945EA:
adds r1, r5, 0
add r2, sp, 0x4
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r5, 0x10
ldr r1, _08094660
ldr r0, [r6, 0x20]
@@ -4286,7 +4286,7 @@ _080945EA:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0809467A
.align 2, 0
_0809465C: .4byte gUnknown_8113870
@@ -4300,7 +4300,7 @@ _08094668:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0809467A:
adds r5, 0xA
ldr r4, _080946D0
@@ -4315,7 +4315,7 @@ _0809467A:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r5, 0xA
adds r0, r6, 0
adds r0, 0x26
@@ -4339,7 +4339,7 @@ _0809467A:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _080946EC
.align 2, 0
_080946CC: .4byte gUnknown_8113898
@@ -4353,7 +4353,7 @@ _080946DC:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_080946EC:
adds r0, r6, 0
adds r0, 0x2D
@@ -4371,7 +4371,7 @@ _080946EC:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08094730
.align 2, 0
_08094714: .4byte gUnknown_81138E4
@@ -4384,7 +4384,7 @@ _08094720:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08094730:
adds r5, 0xA
ldr r2, _0809476C
@@ -4410,7 +4410,7 @@ _08094730:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _08094784
.align 2, 0
_08094768: .4byte gUnknown_8113900
@@ -4423,7 +4423,7 @@ _08094774:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_08094784:
adds r0, r6, 0
adds r0, 0x2E
@@ -4441,7 +4441,7 @@ _08094784:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _080947C8
.align 2, 0
_080947AC: .4byte gUnknown_8113918
@@ -4454,7 +4454,7 @@ _080947B8:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
_080947C8:
adds r5, 0x10
adds r2, r6, 0
@@ -4485,7 +4485,7 @@ _080947F6:
movs r0, 0x4
adds r1, r5, 0
adds r3, r7, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r7, 0
bl sub_80073E0
add sp, 0xCC
diff --git a/asm/code_80958E8.s b/asm/code_80958E8.s
index 896c0dd..40e970d 100644
--- a/asm/code_80958E8.s
+++ b/asm/code_80958E8.s
@@ -561,12 +561,12 @@ _08095F34:
_08095F48:
lsrs r4, 24
adds r0, r4, 0
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
bne _08095F6A
adds r0, r4, 0
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _08095F6A
@@ -2244,7 +2244,7 @@ _08096B6A:
bge _08096B56
b _08096B92
.align 2, 0
-_08096B74: .4byte gUnknown_203B460
+_08096B74: .4byte gTeamInventory_203B460
_08096B78:
ldrb r0, [r3]
cmp r0, 0x9
diff --git a/asm/code_8098BDC.s b/asm/code_8098BDC.s
index fb72947..e068e60 100644
--- a/asm/code_8098BDC.s
+++ b/asm/code_8098BDC.s
@@ -6500,7 +6500,7 @@ _0809C2CA:
adds r0, r1
ldrb r4, [r0, 0x2]
adds r0, r4, 0
- bl sub_8091570
+ bl IsEdibleItem
lsls r0, 24
cmp r0, 0
beq _0809C30C
@@ -6509,7 +6509,7 @@ _0809C2CA:
movs r2, 0
bl sub_8090DC4
adds r0, r5, 0
- bl sub_80911F8
+ bl ShiftItemsDownFrom
ldr r0, [r6]
movs r2, 0x86
lsls r2, 3
@@ -6517,7 +6517,7 @@ _0809C2CA:
movs r1, 0x1
b _0809C318
.align 2, 0
-_0809C304: .4byte gUnknown_203B460
+_0809C304: .4byte gTeamInventory_203B460
_0809C308: .4byte gUnknown_202DE58
_0809C30C:
ldr r0, [r6]
@@ -7637,7 +7637,7 @@ sub_809CBA4:
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8091130
+ bl FindItemInInventory
cmp r0, 0
bge _0809CBB6
movs r0, 0
@@ -7693,7 +7693,7 @@ sub_809CBBC:
.align 2, 0
_0809CC0C: .4byte gUnknown_81163E4
_0809CC10: .4byte gItemParametersData
-_0809CC14: .4byte gUnknown_203B460
+_0809CC14: .4byte gTeamInventory_203B460
_0809CC18: .4byte 0x0001869f
_0809CC1C:
str r1, [r2]
@@ -7709,7 +7709,7 @@ _0809CC20:
adds r1, r4, 0
movs r2, 0
bl sub_8090E14
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _0809CC52
cmp r5, 0
@@ -7727,7 +7727,7 @@ _0809CC52:
ldrb r0, [r4, 0x2]
movs r1, 0
bl sub_809124C
- bl sub_80910B4
+ bl FillInventoryGaps
_0809CC5E:
cmp r7, 0
beq _0809CC80
@@ -7779,10 +7779,10 @@ sub_809CC90:
b _0809CCD6
.align 2, 0
_0809CCBC: .4byte gUnknown_81163BC
-_0809CCC0: .4byte gUnknown_203B460
+_0809CCC0: .4byte gTeamInventory_203B460
_0809CCC4: .4byte 0x0001869f
_0809CCC8:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _0809CCD4
movs r0, 0x2
diff --git a/asm/code_809D148.s b/asm/code_809D148.s
index 0527650..b571869 100644
--- a/asm/code_809D148.s
+++ b/asm/code_809D148.s
@@ -7038,12 +7038,12 @@ _080A0E3A:
ldrh r0, [r0, 0x2]
lsls r0, 24
lsrs r0, 24
- bl sub_8091130
+ bl FindItemInInventory
cmp r0, 0
bge _080A0E4E
bl _0809EAE0
_080A0E4E:
- bl sub_80911F8
+ bl ShiftItemsDownFrom
bl _0809EAE0
_080A0E56:
add r0, sp, 0x8
@@ -8685,13 +8685,13 @@ _080A1C16:
_080A1C28: .4byte gUnknown_81167BC
_080A1C2C: .4byte gUnknown_2039D98
_080A1C30:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080A1C70
ldr r0, _080A1C64
ldrb r4, [r0, 0x2]
adds r0, r4, 0
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
bne _080A1C4A
@@ -8713,14 +8713,14 @@ _080A1C5E:
b _080A236A
.align 2, 0
_080A1C64: .4byte gUnknown_81167E4
-_080A1C68: .4byte gUnknown_203B460
+_080A1C68: .4byte gTeamInventory_203B460
_080A1C6C: .4byte 0x000003e6
_080A1C70:
ldr r0, _080A1C80
ldrb r0, [r0, 0x2]
movs r1, 0
bl sub_809124C
- bl sub_80910B4
+ bl FillInventoryGaps
b _080A236A
.align 2, 0
_080A1C80: .4byte gUnknown_81167E4
@@ -9039,7 +9039,7 @@ _080A1EE8:
bne _080A1EBE
_080A1F28:
ldr r0, _080A1F38
- bl sub_80913A0
+ bl AddToTeamMoney
b _080A236A
.align 2, 0
_080A1F30: .4byte gUnknown_202DE58
@@ -9127,12 +9127,12 @@ _080A1FDA:
ldr r7, _080A2010
movs r5, 0x2
_080A1FE0:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080A2018
ldrb r4, [r6, 0x2]
adds r0, r4, 0
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _080A2024
@@ -9150,12 +9150,12 @@ _080A1FE0:
.align 2, 0
_080A200C: .4byte gUnknown_8116844
_080A2010: .4byte 0x000003e6
-_080A2014: .4byte gUnknown_203B460
+_080A2014: .4byte gTeamInventory_203B460
_080A2018:
ldrb r0, [r6, 0x2]
movs r1, 0
bl sub_809124C
- bl sub_80910B4
+ bl FillInventoryGaps
_080A2024:
subs r5, 0x1
cmp r5, 0
diff --git a/asm/event_flag.s b/asm/event_flag.s
index 1affa18..6777a5b 100644
--- a/asm/event_flag.s
+++ b/asm/event_flag.s
@@ -487,7 +487,7 @@ _08001754:
lsls r1, 2
b _0800176C
.align 2, 0
-_08001760: .4byte gUnknown_203B460
+_08001760: .4byte gTeamInventory_203B460
_08001764:
ldr r0, _08001774
ldr r0, [r0]
@@ -498,7 +498,7 @@ _0800176C:
ldr r0, [r0]
b _0800177A
.align 2, 0
-_08001774: .4byte gUnknown_203B460
+_08001774: .4byte gTeamInventory_203B460
_08001778:
movs r0, 0
_0800177A:
@@ -652,7 +652,7 @@ _080018A4:
ldr r0, [r0]
b _080018CE
.align 2, 0
-_080018B4: .4byte gUnknown_203B460
+_080018B4: .4byte gTeamInventory_203B460
_080018B8:
ldr r0, _080018C8
ldr r0, [r0]
@@ -662,7 +662,7 @@ _080018B8:
ldr r0, [r0]
b _080018CE
.align 2, 0
-_080018C8: .4byte gUnknown_203B460
+_080018C8: .4byte gTeamInventory_203B460
_080018CC:
movs r0, 0
_080018CE:
@@ -757,7 +757,7 @@ _08001972:
adds r0, r1
b _0800198E
.align 2, 0
-_08001980: .4byte gUnknown_203B460
+_08001980: .4byte gTeamInventory_203B460
_08001984:
ldr r0, _08001998
ldr r0, [r0]
@@ -772,7 +772,7 @@ _08001990:
pop {r0}
bx r0
.align 2, 0
-_08001998: .4byte gUnknown_203B460
+_08001998: .4byte gTeamInventory_203B460
thumb_func_end sub_80018D8
thumb_func_start sub_800199C
@@ -871,7 +871,7 @@ _08001A4E:
lsls r1, 2
b _08001A64
.align 2, 0
-_08001A58: .4byte gUnknown_203B460
+_08001A58: .4byte gTeamInventory_203B460
_08001A5C:
ldr r0, _08001A70
ldr r0, [r0]
@@ -886,7 +886,7 @@ _08001A68:
pop {r0}
bx r0
.align 2, 0
-_08001A70: .4byte gUnknown_203B460
+_08001A70: .4byte gTeamInventory_203B460
thumb_func_end sub_800199C
thumb_func_start sub_8001A74
@@ -1400,7 +1400,7 @@ _08001E3E:
movs r1, 0x1
bl sub_80973A8
movs r0, 0xE7
- bl sub_8091130
+ bl FindItemInInventory
movs r1, 0x1
negs r1, r1
cmp r0, r1
@@ -1499,7 +1499,7 @@ _08001F06:
bl ScenarioCalc
_08001F20:
movs r0, 0xE2
- bl sub_8091130
+ bl FindItemInInventory
movs r1, 0x1
negs r1, r1
cmp r0, r1
@@ -1698,7 +1698,7 @@ _080020D4:
pop {r0}
bx r0
.align 2, 0
-_080020DC: .4byte gUnknown_203B460
+_080020DC: .4byte gTeamInventory_203B460
_080020E0: .4byte 0x0000021e
_080020E4: .4byte 0x00000113
thumb_func_end sub_8001D88
diff --git a/asm/felicity_bank.s b/asm/felicity_bank.s
index c60b295..7711bc9 100644
--- a/asm/felicity_bank.s
+++ b/asm/felicity_bank.s
@@ -93,7 +93,7 @@ _080165B4:
b _08016632
.align 2, 0
_080165FC: .4byte gUnknown_203B204
-_08016600: .4byte gUnknown_203B460
+_08016600: .4byte gTeamInventory_203B460
_08016604: .4byte gFelicityDialogue
_08016608:
ldr r0, _08016648
@@ -168,7 +168,7 @@ _08016668:
ldr r2, [r1]
b _08016844
.align 2, 0
-_08016698: .4byte gUnknown_203B460
+_08016698: .4byte gTeamInventory_203B460
_0801669C: .4byte gFelicityDialogue
_080166A0:
ldr r0, _080166BC
@@ -221,7 +221,7 @@ _080166DC:
adds r2, 0x1C
b _0801683C
.align 2, 0
-_08016700: .4byte gUnknown_203B460
+_08016700: .4byte gTeamInventory_203B460
_08016704: .4byte gFelicityDialogue
_08016708:
movs r5, 0x99
@@ -301,7 +301,7 @@ _0801676E:
movs r0, 0x1
b _080168AE
.align 2, 0
-_080167A0: .4byte gUnknown_203B460
+_080167A0: .4byte gTeamInventory_203B460
_080167A4: .4byte 0x0098967f
_080167A8:
ldr r3, [r2]
@@ -341,7 +341,7 @@ _080167CC:
adds r2, 0x30
b _0801683C
.align 2, 0
-_080167F4: .4byte gUnknown_203B460
+_080167F4: .4byte gTeamInventory_203B460
_080167F8: .4byte 0x0001869e
_080167FC: .4byte gFelicityDialogue
_08016800:
@@ -439,7 +439,7 @@ _080168B2:
bl CreateFelicityMoneySavingsHeader
b _080168EC
.align 2, 0
-_080168BC: .4byte gUnknown_203B460
+_080168BC: .4byte gTeamInventory_203B460
_080168C0: .4byte 0x0001869f
_080168C4:
ldr r3, [r2]
diff --git a/asm/friend_area_action_menu.s b/asm/friend_area_action_menu.s
index 998bb5c..f984e29 100644
--- a/asm/friend_area_action_menu.s
+++ b/asm/friend_area_action_menu.s
@@ -142,7 +142,7 @@ _08027552:
adds r2, r3
movs r0, 0xA
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08027588
ldr r0, [r4]
@@ -165,7 +165,7 @@ _08027588:
adds r2, r3
movs r0, 0xB
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _080275AE
ldr r0, [r4]
@@ -320,7 +320,7 @@ sub_80276A8:
adds r1, r2, r3
movs r0, 0xA
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080276E4
ldr r0, [r5]
@@ -697,7 +697,7 @@ _080279D8:
adds r0, 0x14
bl sub_8091274
_080279F0:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]
diff --git a/asm/friend_list_menu.s b/asm/friend_list_menu.s
index 46903a6..d2e6283 100644
--- a/asm/friend_list_menu.s
+++ b/asm/friend_list_menu.s
@@ -334,7 +334,7 @@ _0801F074:
b _0801F12E
.align 2, 0
_0801F0C8: .4byte gUnknown_203B270
-_0801F0CC: .4byte gUnknown_203B460
+_0801F0CC: .4byte gTeamInventory_203B460
_0801F0D0:
ldr r0, _0801F0E0
ldr r1, [r0]
@@ -599,7 +599,7 @@ sub_801F280:
str r0, [sp]
movs r0, 0xC
movs r1, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r7, 0
ldr r0, [r4]
movs r1, 0x36
@@ -691,7 +691,7 @@ _0801F372:
adds r0, r4, 0
adds r1, r6, 0
ldr r2, _0801F3F4
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0801F386:
adds r7, 0x1
mov r1, r8
@@ -728,7 +728,7 @@ _0801F394:
str r0, [sp]
movs r0, 0x8
movs r1, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, [r4]
ldr r0, [r0, 0x54]
bl sub_80073E0
@@ -1535,7 +1535,7 @@ _0801F9F0:
str r4, [sp]
movs r0, 0x10
movs r1, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r3, [r5]
ldr r1, [r3, 0xC]
lsls r1, 2
@@ -1548,7 +1548,7 @@ _0801F9F0:
str r4, [sp]
movs r0, 0x4
movs r1, 0x10
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, [r5]
ldr r0, [r0, 0x5C]
bl sub_80073E0
@@ -1922,7 +1922,7 @@ _0801FD68:
movs r0, 0x3
b _0801FD76
.align 2, 0
-_0801FD6C: .4byte gUnknown_203B460
+_0801FD6C: .4byte gTeamInventory_203B460
_0801FD70:
bl sub_8021130
_0801FD74:
@@ -4213,7 +4213,7 @@ _08020FB8:
bl sub_801FDA8
b _080210BE
.align 2, 0
-_08020FD8: .4byte gUnknown_203B460
+_08020FD8: .4byte gTeamInventory_203B460
_08020FDC:
ldr r4, _08020FFC
ldr r1, [r4]
@@ -4599,7 +4599,7 @@ _080212BC:
bl PlayMenuSoundEffect
b _080212F2
.align 2, 0
-_080212E8: .4byte gUnknown_203B460
+_080212E8: .4byte gTeamInventory_203B460
_080212EC:
movs r0, 0
bl PlayMenuSoundEffect
@@ -4915,7 +4915,7 @@ _08021502:
.align 2, 0
_08021568: .4byte gUnknown_203B280
_0802156C: .4byte gUnknown_80DC494
-_08021570: .4byte gUnknown_203B460
+_08021570: .4byte gTeamInventory_203B460
_08021574:
mov r0, r10
ldr r1, _08021598
@@ -6907,7 +6907,7 @@ _080224F8:
bl sub_8021D44
b _08022532
.align 2, 0
-_08022524: .4byte gUnknown_203B460
+_08022524: .4byte gTeamInventory_203B460
_08022528: .4byte gUnknown_203B290
_0802252C:
movs r0, 0xA
@@ -7034,7 +7034,7 @@ _08022612:
bl sub_8021D44
b _0802265E
.align 2, 0
-_0802262C: .4byte gUnknown_203B460
+_0802262C: .4byte gTeamInventory_203B460
_08022630:
ldr r0, _08022644
ldr r0, [r0]
@@ -7295,7 +7295,7 @@ _08022820:
adds r0, r4, 0
adds r1, r5, 0
bl strcpy
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08022850
movs r0, 0x12
@@ -8097,7 +8097,7 @@ _08022E94:
b _08022EEE
.align 2, 0
_08022EB4: .4byte gUnknown_203B294
-_08022EB8: .4byte gUnknown_203B460
+_08022EB8: .4byte gTeamInventory_203B460
_08022EBC:
bl sub_801A8AC
ldr r1, _08022EE0
@@ -8116,7 +8116,7 @@ _08022EBC:
b _08022EEE
.align 2, 0
_08022EE0: .4byte gUnknown_203B294
-_08022EE4: .4byte gUnknown_203B460
+_08022EE4: .4byte gTeamInventory_203B460
_08022EE8:
movs r0, 0x16
bl sub_8022924
@@ -8224,7 +8224,7 @@ _08022F68:
beq _08022FD0
ldr r0, [r4]
ldr r0, [r0, 0x4C]
- bl sub_80911F8
+ bl ShiftItemsDownFrom
_08022FD0:
movs r0, 0
bl sub_8099690
@@ -8242,7 +8242,7 @@ _08022FD0:
.align 2, 0
_08022FEC: .4byte gUnknown_203B294
_08022FF0: .4byte gUnknown_202DE58
-_08022FF4: .4byte gUnknown_203B460
+_08022FF4: .4byte gTeamInventory_203B460
_08022FF8: .4byte _08022FFC
.align 2, 0
_08022FFC:
@@ -8339,8 +8339,8 @@ _080230B0:
_080230B8:
ldr r0, [r4]
ldr r0, [r0, 0x4C]
- bl sub_80911F8
- bl sub_8090A34
+ bl ShiftItemsDownFrom
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080230DA
movs r0, 0
@@ -11772,15 +11772,15 @@ _08024B74:
ldr r0, [r1, 0x14]
cmp r0, 0x14
beq _08024BCA
- bl sub_8091234
+ bl ClearItemSlotAt
_08024BCA:
ldr r0, [r5]
ldr r0, [r0, 0x18]
cmp r0, 0x14
beq _08024BD6
- bl sub_8091234
+ bl ClearItemSlotAt
_08024BD6:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, _08024C14
bl sub_801199C
movs r0, 0xD2
@@ -12230,7 +12230,7 @@ _08024F36:
.align 2, 0
_08024F48: .4byte gUnknown_203B2B0
_08024F4C:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08024F5C
movs r0, 0xF
@@ -12283,7 +12283,7 @@ _08024FA6:
bl sub_80247EC
b _08024FCC
_08024FAE:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x1
bgt _08024FBE
movs r0, 0x10
@@ -12336,7 +12336,7 @@ _08024FF0:
b _08025052
.align 2, 0
_08025014: .4byte gUnknown_203B2B0
-_08025018: .4byte gUnknown_203B460
+_08025018: .4byte gTeamInventory_203B460
_0802501C:
bl sub_801A8AC
ldr r1, _08025040
@@ -12354,7 +12354,7 @@ _0802501C:
b _08025052
.align 2, 0
_08025040: .4byte gUnknown_203B2B0
-_08025044: .4byte gUnknown_203B460
+_08025044: .4byte gTeamInventory_203B460
_08025048:
bl sub_801A928
movs r0, 0x5
@@ -12401,7 +12401,7 @@ _08025074:
b _080250E6
.align 2, 0
_080250A0: .4byte gUnknown_203B2B0
-_080250A4: .4byte gUnknown_203B460
+_080250A4: .4byte gTeamInventory_203B460
_080250A8:
movs r0, 0x2
bl PlayMenuSoundEffect
@@ -12423,7 +12423,7 @@ _080250B0:
b _080250E6
.align 2, 0
_080250D4: .4byte gUnknown_203B2B0
-_080250D8: .4byte gUnknown_203B460
+_080250D8: .4byte gTeamInventory_203B460
_080250DC:
bl sub_801A928
movs r0, 0xA
@@ -12651,7 +12651,7 @@ _08025276:
movs r0, 0
b _08025292
.align 2, 0
-_08025284: .4byte gUnknown_203B460
+_08025284: .4byte gTeamInventory_203B460
_08025288:
ldr r0, _080252B0
ldr r0, [r0]
@@ -12673,7 +12673,7 @@ _08025292:
pop {r0}
bx r0
.align 2, 0
-_080252B0: .4byte gUnknown_203B460
+_080252B0: .4byte gTeamInventory_203B460
_080252B4: .4byte gUnknown_203B2B0
thumb_func_end sub_8025254
@@ -13260,7 +13260,7 @@ sub_8025728:
adds r1, 0x4
movs r0, 0xA
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08025774
ldr r0, [r5]
@@ -13279,7 +13279,7 @@ _08025774:
adds r1, 0xD4
movs r0, 0xB
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _08025796
ldr r0, [r5]
@@ -13498,7 +13498,7 @@ sub_802591C:
adds r1, 0xCC
movs r0, 0xA
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08025952
ldr r0, [r5]
@@ -13741,7 +13741,7 @@ _08025B28:
adds r0, 0x18
bl sub_8091274
_08025B40:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x18]
@@ -13878,7 +13878,7 @@ _08025C34:
b _08025CAE
.align 2, 0
_08025C60: .4byte gUnknown_203B2B4
-_08025C64: .4byte gUnknown_203B460
+_08025C64: .4byte gTeamInventory_203B460
_08025C68:
bl sub_801A8AC
ldr r4, _08025C9C
@@ -13904,7 +13904,7 @@ _08025C68:
b _08025CAE
.align 2, 0
_08025C9C: .4byte gUnknown_203B2B4
-_08025CA0: .4byte gUnknown_203B460
+_08025CA0: .4byte gTeamInventory_203B460
_08025CA4:
bl sub_801A928
movs r0, 0x2
@@ -13958,8 +13958,8 @@ _08025CF8:
ldr r5, _08025D6C
ldr r0, [r5]
ldr r0, [r0, 0x10]
- bl sub_80911F8
- bl sub_80910B4
+ bl ShiftItemsDownFrom
+ bl FillInventoryGaps
ldr r1, [r5]
ldrb r0, [r1, 0x18]
cmp r0, 0
@@ -14162,7 +14162,7 @@ sub_8025E68:
movs r0, 0x4
movs r1, 0x3
adds r3, r6, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
bl sub_80073E0
add sp, 0x14
@@ -15053,7 +15053,7 @@ _080265EC:
adds r2, r3
movs r0, 0xB
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _0802661A
ldr r0, [r4]
@@ -15076,7 +15076,7 @@ _0802661A:
adds r2, r3
movs r0, 0xC
str r0, [r2]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _08026640
ldr r0, [r4]
@@ -15271,7 +15271,7 @@ sub_802678C:
adds r1, r2, r3
movs r0, 0xB
str r0, [r1]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080267C8
ldr r0, [r5]
@@ -15567,7 +15567,7 @@ _08026A10:
adds r0, 0x14
bl sub_8091274
_08026A28:
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]
@@ -15781,7 +15781,7 @@ _08026B94:
b _08026C0E
.align 2, 0
_08026BC0: .4byte gUnknown_203B2B8
-_08026BC4: .4byte gUnknown_203B460
+_08026BC4: .4byte gTeamInventory_203B460
_08026BC8:
bl sub_801A8AC
ldr r4, _08026BFC
@@ -15807,7 +15807,7 @@ _08026BC8:
b _08026C0E
.align 2, 0
_08026BFC: .4byte gUnknown_203B2B8
-_08026C00: .4byte gUnknown_203B460
+_08026C00: .4byte gTeamInventory_203B460
_08026C04:
bl sub_801A928
movs r0, 0x2
@@ -15861,8 +15861,8 @@ _08026C58:
ldr r5, _08026CCC
ldr r0, [r5]
ldr r0, [r0, 0xC]
- bl sub_80911F8
- bl sub_80910B4
+ bl ShiftItemsDownFrom
+ bl FillInventoryGaps
ldr r1, [r5]
ldrb r0, [r1, 0x14]
cmp r0, 0
@@ -16045,7 +16045,7 @@ sub_8026DAC:
movs r0, 0x4
movs r1, 0x3
adds r3, r6, 0
- bl sub_8014FF0
+ bl xxx_format_and_draw
adds r0, r6, 0
bl sub_80073E0
add sp, 0x14
@@ -16195,7 +16195,7 @@ sub_8026F04:
movs r0, 0
b _08026F32
_08026F14:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _08026F20
movs r0, 0x1
@@ -16223,12 +16223,12 @@ sub_8026F38:
adds r4, r5, 0
adds r4, 0x28
ldrb r0, [r4]
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _08026F74
ldrb r0, [r4]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08026F80
@@ -16250,7 +16250,7 @@ _08026F74:
movs r0, 0
b _08026F96
.align 2, 0
-_08026F78: .4byte gUnknown_203B460
+_08026F78: .4byte gTeamInventory_203B460
_08026F7C: .4byte 0x000003e7
_08026F80:
ldr r0, _08026F9C
@@ -16270,7 +16270,7 @@ _08026F96:
pop {r1}
bx r1
.align 2, 0
-_08026F9C: .4byte gUnknown_203B460
+_08026F9C: .4byte gTeamInventory_203B460
_08026FA0: .4byte 0x000003e6
thumb_func_end sub_8026F38
@@ -16296,7 +16296,7 @@ _08026FC4:
ldr r0, [r4]
adds r0, 0x14
bl sub_8091274
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, [r4]
movs r1, 0
strb r1, [r0, 0x14]
@@ -16317,7 +16317,7 @@ _08026FF8:
bl PlaySound
ldr r0, [r4]
ldrb r0, [r0, 0x14]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _0802702C
@@ -16334,7 +16334,7 @@ _08026FF8:
b _0802703E
.align 2, 0
_08027024: .4byte 0x0000014d
-_08027028: .4byte gUnknown_203B460
+_08027028: .4byte gTeamInventory_203B460
_0802702C:
ldr r0, _08027060
ldr r1, [r0]
@@ -16362,7 +16362,7 @@ _0802703E:
bl sub_8026074
b _0802706E
.align 2, 0
-_08027060: .4byte gUnknown_203B460
+_08027060: .4byte gTeamInventory_203B460
_08027064: .4byte gUnknown_203B2B8
_08027068:
movs r0, 0x19
diff --git a/asm/items.s b/asm/items.s
index 639ee66..5587b92 100644
--- a/asm/items.s
+++ b/asm/items.s
@@ -72,7 +72,7 @@ _08090E90:
bne _08090EB0
ldr r4, _08090EAC
adds r0, r5, 0
- bl sub_80915D4
+ bl GetMoneyValue
adds r2, r0, 0
mov r0, sp
adds r1, r4, 0
@@ -182,13 +182,13 @@ _08090F6C:
bcc _08090F8A
cmp r1, 0x2
bhi _08090F7E
- bl sub_8090BE4
+ bl GetStackBuyValue
adds r1, r0, 0
b _08090F8C
_08090F7E:
cmp r1, 0x4
bhi _08090F8A
- bl sub_8090C30
+ bl GetStackSellValue
adds r1, r0, 0
b _08090F8C
_08090F8A:
@@ -349,2170 +349,4 @@ _08091080:
bx r1
thumb_func_end sub_8090FEC
- thumb_func_start sub_80910B4
-sub_80910B4:
- push {r4-r7,lr}
- movs r2, 0
- movs r4, 0
- ldr r7, _080910C0
- movs r3, 0
- b _080910DA
- .align 2, 0
-_080910C0: .4byte gUnknown_203B460
-_080910C4:
- cmp r2, r4
- ble _080910D4
- ldr r0, [r7]
- lsls r1, r4, 2
- adds r1, r0, r1
- adds r0, r3
- ldr r0, [r0]
- str r0, [r1]
-_080910D4:
- adds r3, 0x4
- adds r2, 0x1
- adds r4, 0x1
-_080910DA:
- cmp r2, 0x13
- bgt _08091106
- ldr r0, [r7]
- adds r0, r3, r0
- ldrb r1, [r0]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- bne _08091106
- ldr r5, _0809112C
- movs r6, 0x1
-_080910F0:
- adds r3, 0x4
- adds r2, 0x1
- cmp r2, 0x13
- bgt _08091106
- ldr r0, [r5]
- adds r0, r3, r0
- ldrb r1, [r0]
- adds r0, r6, 0
- ands r0, r1
- cmp r0, 0
- beq _080910F0
-_08091106:
- cmp r2, 0x14
- bne _080910C4
- cmp r4, 0x13
- bgt _08091124
- ldr r3, _0809112C
- movs r2, 0
-_08091112:
- lsls r1, r4, 2
- ldr r0, [r3]
- adds r1, r0
- strb r2, [r1, 0x2]
- strb r2, [r1, 0x1]
- strb r2, [r1]
- adds r4, 0x1
- cmp r4, 0x13
- ble _08091112
-_08091124:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0809112C: .4byte gUnknown_203B460
- thumb_func_end sub_80910B4
-
- thumb_func_start sub_8091130
-sub_8091130:
- push {r4,r5,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- movs r3, 0
- ldr r0, _08091154
- ldr r2, [r0]
- movs r5, 0x1
-_0809113E:
- ldrb r1, [r2]
- adds r0, r5, 0
- ands r0, r1
- cmp r0, 0
- beq _08091158
- ldrb r0, [r2, 0x2]
- cmp r0, r4
- bne _08091158
- adds r0, r3, 0
- b _08091164
- .align 2, 0
-_08091154: .4byte gUnknown_203B460
-_08091158:
- adds r2, 0x4
- adds r3, 0x1
- cmp r3, 0x13
- ble _0809113E
- movs r0, 0x1
- negs r0, r0
-_08091164:
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8091130
-
- thumb_func_start sub_809116C
-sub_809116C:
- push {r4-r6,lr}
- lsls r0, 24
- lsrs r5, r0, 24
- movs r4, 0
- ldr r0, _080911A0
- ldr r2, [r0]
- movs r6, 0x1
- movs r3, 0x13
-_0809117C:
- ldrb r1, [r2]
- adds r0, r6, 0
- ands r0, r1
- cmp r0, 0
- beq _0809118E
- ldrb r0, [r2, 0x2]
- cmp r0, r5
- bne _0809118E
- adds r4, 0x1
-_0809118E:
- adds r2, 0x4
- subs r3, 0x1
- cmp r3, 0
- bge _0809117C
- adds r0, r4, 0
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_080911A0: .4byte gUnknown_203B460
- thumb_func_end sub_809116C
-
- thumb_func_start sub_80911A4
-sub_80911A4:
- push {r4-r7,lr}
- lsls r0, 24
- lsrs r5, r0, 24
- adds r0, r5, 0
- bl sub_809116C
- adds r4, r0, 0
- movs r3, 0
- ldr r0, _080911F4
- ldr r7, [r0]
- movs r6, 0x1
-_080911BA:
- movs r0, 0x58
- muls r0, r3
- adds r2, r7, r0
- ldrh r1, [r2]
- adds r0, r6, 0
- ands r0, r1
- cmp r0, 0
- beq _080911E2
- lsrs r0, r1, 1
- ands r0, r6
- cmp r0, 0
- beq _080911E2
- adds r0, r2, 0
- adds r0, 0x28
- ldrb r0, [r0]
- cmp r0, 0
- beq _080911E2
- cmp r0, r5
- bne _080911E2
- adds r4, 0x1
-_080911E2:
- adds r3, 0x1
- movs r0, 0xCE
- lsls r0, 1
- cmp r3, r0
- ble _080911BA
- adds r0, r4, 0
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_080911F4: .4byte gRecruitedPokemonRef
- thumb_func_end sub_80911A4
-
- thumb_func_start sub_80911F8
-sub_80911F8:
- push {r4,r5,lr}
- adds r2, r0, 0
- ldr r4, _08091230
- cmp r2, 0x12
- bgt _0809121C
- adds r5, r4, 0
- lsls r0, r2, 2
- adds r3, r0, 0x4
-_08091208:
- ldr r0, [r5]
- lsls r1, r2, 2
- adds r1, r0, r1
- adds r0, r3
- ldr r0, [r0]
- str r0, [r1]
- adds r3, 0x4
- adds r2, 0x1
- cmp r2, 0x12
- ble _08091208
-_0809121C:
- ldr r0, [r4]
- adds r0, 0x4E
- movs r1, 0
- strb r1, [r0]
- ldr r0, [r4]
- adds r0, 0x4C
- strb r1, [r0]
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_08091230: .4byte gUnknown_203B460
- thumb_func_end sub_80911F8
-
- thumb_func_start sub_8091234
-sub_8091234:
- ldr r3, _08091248
- ldr r1, [r3]
- lsls r0, 2
- adds r1, r0
- movs r2, 0
- strb r2, [r1, 0x2]
- ldr r1, [r3]
- adds r1, r0
- strb r2, [r1]
- bx lr
- .align 2, 0
-_08091248: .4byte gUnknown_203B460
- thumb_func_end sub_8091234
-
- thumb_func_start sub_809124C
-sub_809124C:
- push {lr}
- sub sp, 0x4
- adds r3, r0, 0
- adds r2, r1, 0
- lsls r3, 24
- lsrs r3, 24
- lsls r2, 24
- lsrs r2, 24
- mov r0, sp
- adds r1, r3, 0
- bl sub_8090A8C
- mov r0, sp
- bl sub_8091290
- lsls r0, 24
- lsrs r0, 24
- add sp, 0x4
- pop {r1}
- bx r1
- thumb_func_end sub_809124C
-
- thumb_func_start sub_8091274
-sub_8091274:
- push {lr}
- sub sp, 0x4
- adds r1, r0, 0
- mov r0, sp
- bl sub_8090B64
- mov r0, sp
- bl sub_8091290
- lsls r0, 24
- lsrs r0, 24
- add sp, 0x4
- pop {r1}
- bx r1
- thumb_func_end sub_8091274
-
- thumb_func_start sub_8091290
-sub_8091290:
- push {r4-r6,lr}
- adds r4, r0, 0
- movs r3, 0
- ldr r5, _080912B4
- movs r6, 0x1
-_0809129A:
- lsls r1, r3, 2
- ldr r0, [r5]
- adds r2, r1, r0
- ldrb r1, [r2]
- adds r0, r6, 0
- ands r0, r1
- cmp r0, 0
- bne _080912B8
- ldr r0, [r4]
- str r0, [r2]
- movs r0, 0
- b _080912C0
- .align 2, 0
-_080912B4: .4byte gUnknown_203B460
-_080912B8:
- adds r3, 0x1
- cmp r3, 0x13
- ble _0809129A
- movs r0, 0x1
-_080912C0:
- pop {r4-r6}
- pop {r1}
- bx r1
- thumb_func_end sub_8091290
-
- thumb_func_start sub_80912C8
-sub_80912C8:
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- movs r5, 0
- movs r6, 0
-_080912D6:
- ldr r0, _0809139C
- lsls r1, r5, 2
- ldr r0, [r0]
- adds r4, r0, r1
- ldrb r1, [r4]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080912FE
- ldrb r0, [r4, 0x2]
- cmp r0, 0x69
- bne _080912FE
- adds r0, r4, 0
- bl sub_80915D4
- bl sub_80913A0
- strb r6, [r4, 0x2]
- strb r6, [r4, 0x1]
- strb r6, [r4]
-_080912FE:
- adds r5, 0x1
- cmp r5, 0x13
- ble _080912D6
- bl sub_80910B4
- movs r5, 0
-_0809130A:
- movs r0, 0x1
- negs r0, r0
- mov r9, r0
- lsls r2, r5, 2
- ldr r1, _0809139C
- mov r8, r1
- ldr r0, [r1]
- adds r3, r2, r0
- ldrb r1, [r3]
- movs r0, 0x1
- ands r0, r1
- mov r10, r2
- adds r7, r5, 0x1
- cmp r0, 0
- beq _08091382
- ldrb r0, [r3, 0x2]
- bl GetItemOrder
- adds r6, r0, 0
- adds r4, r7, 0
- cmp r7, 0x13
- bgt _08091368
-_08091336:
- lsls r5, r4, 2
- mov r1, r8
- ldr r0, [r1]
- adds r2, r5, r0
- ldrb r1, [r2]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08091362
- ldrb r0, [r2, 0x2]
- bl GetItemOrder
- cmp r6, r0
- ble _08091362
- mov r9, r4
- mov r1, r8
- ldr r0, [r1]
- adds r0, r5
- ldrb r0, [r0, 0x2]
- bl GetItemOrder
- adds r6, r0, 0
-_08091362:
- adds r4, 0x1
- cmp r4, 0x13
- ble _08091336
-_08091368:
- mov r4, r9
- cmp r4, 0
- blt _08091382
- ldr r0, _0809139C
- ldr r1, [r0]
- mov r0, r10
- adds r2, r1, r0
- ldr r3, [r2]
- lsls r0, r4, 2
- adds r1, r0
- ldr r0, [r1]
- str r0, [r2]
- str r3, [r1]
-_08091382:
- adds r5, r7, 0
- cmp r5, 0x13
- ble _0809130A
- bl sub_80910B4
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_0809139C: .4byte gUnknown_203B460
- thumb_func_end sub_80912C8
-
- thumb_func_start sub_80913A0
-sub_80913A0:
- push {lr}
- ldr r1, _080913C4
- ldr r1, [r1]
- movs r3, 0x98
- lsls r3, 2
- adds r2, r1, r3
- ldr r1, [r2]
- adds r1, r0
- str r1, [r2]
- ldr r0, _080913C8
- cmp r1, r0
- bgt _080913BE
- cmp r1, 0
- bge _080913C0
- movs r0, 0
-_080913BE:
- str r0, [r2]
-_080913C0:
- pop {r0}
- bx r0
- .align 2, 0
-_080913C4: .4byte gUnknown_203B460
-_080913C8: .4byte 0x0001869f
- thumb_func_end sub_80913A0
-
- thumb_func_start GetItemMove
-GetItemMove:
- lsls r0, 24
- ldr r1, _080913DC
- ldr r1, [r1]
- lsrs r0, 19
- adds r0, r1
- ldrh r0, [r0, 0x18]
- bx lr
- .align 2, 0
-_080913DC: .4byte gItemParametersData
- thumb_func_end GetItemMove
-
- thumb_func_start sub_80913E0
-sub_80913E0:
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x5C
- adds r6, r0, 0
- adds r5, r1, 0
- mov r8, r2
- ldrb r0, [r6, 0x2]
- bl GetItemDescription
- ldrb r1, [r6, 0x2]
- add r0, sp, 0x4
- movs r2, 0
- bl sub_8090DC4
- ldrb r0, [r6, 0x2]
- cmp r0, 0x7C
- bne _08091414
- ldr r0, _080914D4
- ldrb r1, [r6, 0x1]
- adds r1, 0x7D
- lsls r1, 24
- lsrs r1, 24
- movs r2, 0
- bl sub_8090DC4
-_08091414:
- adds r0, r5, 0
- bl sub_80073B8
- movs r7, 0
- str r7, [sp]
- movs r0, 0x10
- movs r1, 0
- add r2, sp, 0x4
- adds r3, r5, 0
- bl sub_8014FF0
- ldrb r0, [r6, 0x2]
- bl GetItemDescription
- adds r2, r0, 0
- str r7, [sp]
- movs r0, 0x8
- movs r1, 0x18
- adds r3, r5, 0
- bl sub_8014FF0
- ldrb r0, [r6, 0x2]
- bl GetItemType
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x5
- bne _080914B6
- add r4, sp, 0x54
- ldrb r0, [r6, 0x2]
- bl GetItemMove
- adds r1, r0, 0
- lsls r1, 16
- lsrs r1, 16
- adds r0, r4, 0
- bl sub_8092A88
- movs r0, 0x7
- str r0, [sp]
- adds r0, r5, 0
- movs r1, 0x4
- movs r2, 0x52
- movs r3, 0xC8
- bl sub_80078A4
- ldr r0, _080914D8
- ldr r2, [r0]
- str r7, [sp]
- movs r0, 0x4
- movs r1, 0x54
- adds r3, r5, 0
- bl sub_8014FF0
- adds r0, r4, 0
- bl sub_8092B00
- lsls r0, 24
- lsrs r0, 24
- bl GetUnformattedTypeString
- adds r2, r0, 0
- str r7, [sp]
- movs r0, 0x40
- movs r1, 0x54
- adds r3, r5, 0
- bl sub_8014FF0
- adds r0, r4, 0
- bl sub_8092BF4
- ldr r1, _080914DC
- str r0, [r1]
- ldr r0, _080914E0
- ldr r2, [r0]
- str r7, [sp]
- movs r0, 0x80
- movs r1, 0x54
- adds r3, r5, 0
- bl sub_8014FF0
-_080914B6:
- adds r0, r5, 0
- bl sub_80073E0
- ldrb r0, [r6, 0x2]
- bl GetItemDescription
- mov r1, r8
- bl sub_8097DF0
- add sp, 0x5C
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r1}
- bx r1
- .align 2, 0
-_080914D4: .4byte gUnknown_202DE58
-_080914D8: .4byte gUnknown_810CF0C
-_080914DC: .4byte gUnknown_202DE30
-_080914E0: .4byte gUnknown_8115970
- thumb_func_end sub_80913E0
-
- thumb_func_start sub_80914E4
-sub_80914E4:
- push {r4,lr}
- lsls r0, 24
- lsrs r0, 24
- adds r4, r0, 0
- cmp r0, 0
- beq _0809151A
- cmp r0, 0x69
- beq _0809151A
- cmp r0, 0x79
- beq _0809151A
- cmp r0, 0x77
- beq _0809151A
- cmp r0, 0x78
- beq _0809151A
- cmp r0, 0x7A
- beq _0809151A
- bl GetItemSellPrice
- cmp r0, 0
- beq _0809151A
- adds r0, r4, 0
- bl GetItemBuyPrice
- cmp r0, 0
- beq _0809151A
- movs r0, 0x1
- b _0809151C
-_0809151A:
- movs r0, 0
-_0809151C:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_80914E4
-
- thumb_func_start sub_8091524
-sub_8091524:
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- adds r1, r0, 0
- cmp r0, 0
- beq _0809153C
- cmp r0, 0x69
- beq _0809153C
- cmp r1, 0x7C
- beq _0809153C
- movs r0, 0x1
- b _0809153E
-_0809153C:
- movs r0, 0
-_0809153E:
- pop {r1}
- bx r1
- thumb_func_end sub_8091524
-
- thumb_func_start sub_8091544
-sub_8091544:
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- adds r1, r0, 0
- cmp r0, 0
- beq _08091568
- cmp r0, 0x69
- beq _08091568
- cmp r0, 0x79
- beq _08091568
- cmp r0, 0x77
- beq _08091568
- cmp r0, 0x78
- beq _08091568
- cmp r1, 0x7A
- beq _08091568
- movs r0, 0x1
- b _0809156A
-_08091568:
- movs r0, 0
-_0809156A:
- pop {r1}
- bx r1
- thumb_func_end sub_8091544
-
- thumb_func_start sub_8091570
-sub_8091570:
- push {r4,lr}
- lsls r0, 24
- lsrs r4, r0, 24
- adds r0, r4, 0
- bl GetItemType
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x2
- beq _08091596
- adds r0, r4, 0
- bl GetItemType
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x3
- beq _08091596
- movs r0, 0
- b _08091598
-_08091596:
- movs r0, 0x1
-_08091598:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8091570
-
- thumb_func_start sub_80915A0
-sub_80915A0:
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- adds r1, r0, 0
- cmp r0, 0xE0
- beq _080915CC
- cmp r0, 0xE1
- beq _080915CC
- cmp r0, 0xE2
- beq _080915CC
- cmp r0, 0xE3
- beq _080915CC
- cmp r0, 0xE4
- beq _080915CC
- cmp r0, 0xE5
- beq _080915CC
- cmp r0, 0xE6
- beq _080915CC
- cmp r1, 0xE7
- beq _080915CC
- movs r0, 0
- b _080915CE
-_080915CC:
- movs r0, 0x1
-_080915CE:
- pop {r1}
- bx r1
- thumb_func_end sub_80915A0
-
- thumb_func_start sub_80915D4
-sub_80915D4:
- ldr r1, _080915E0
- ldrb r0, [r0, 0x1]
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bx lr
- .align 2, 0
-_080915E0: .4byte gUnknown_810A3F0
- thumb_func_end sub_80915D4
-
- thumb_func_start sub_80915E4
-sub_80915E4:
- ldr r1, _080915F0
- ldrb r0, [r0, 0x1]
- lsls r0, 2
- adds r0, r1
- ldr r0, [r0]
- bx lr
- .align 2, 0
-_080915F0: .4byte gUnknown_810A3F0
- thumb_func_end sub_80915E4
-
- thumb_func_start sub_80915F4
-sub_80915F4:
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- adds r6, r0, 0
- adds r7, r3, 0
- lsls r1, 24
- lsrs r5, r1, 24
- lsls r2, 24
- lsrs r2, 24
- mov r8, r2
- ldr r0, _080916B8
- strh r0, [r7]
- movs r0, 0
- strh r0, [r7, 0x2]
- adds r0, r5, 0
- bl sub_8091764
- lsls r0, 24
- cmp r0, 0
- bne _0809161E
- b _08091756
-_0809161E:
- movs r1, 0x8
- ldrsh r0, [r6, r1]
- movs r1, 0
- bl GetPokemonType
- adds r4, r0, 0
- lsls r4, 24
- lsrs r4, 24
- movs r2, 0x8
- ldrsh r0, [r6, r2]
- movs r1, 0x1
- bl GetPokemonType
- lsls r0, 24
- lsrs r0, 24
- adds r2, r5, 0
- subs r2, 0x55
- ldr r5, _080916BC
- lsls r2, 1
- lsls r1, r4, 3
- adds r1, r4
- lsls r1, 2
- adds r1, r2, r1
- adds r1, r5
- movs r4, 0
- ldrsh r3, [r1, r4]
- lsls r1, r0, 3
- adds r1, r0
- lsls r1, 2
- adds r2, r1
- adds r2, r5
- movs r1, 0
- ldrsh r0, [r2, r1]
- movs r2, 0x14
- ldrsh r1, [r6, r2]
- adds r3, r0
- ldrh r4, [r6, 0x14]
- adds r3, r4
- strh r3, [r6, 0x14]
- movs r2, 0x14
- ldrsh r0, [r6, r2]
- subs r1, r0, r1
- lsls r3, 16
- cmp r3, 0
- bgt _0809167C
- movs r0, 0x1
- strh r0, [r6, 0x14]
-_0809167C:
- movs r4, 0x14
- ldrsh r0, [r6, r4]
- ldr r2, _080916C0
- cmp r0, r2
- ble _08091688
- strh r2, [r6, 0x14]
-_08091688:
- movs r0, 0
- cmp r1, 0x8
- bgt _0809169C
- movs r0, 0x1
- cmp r1, 0x4
- bgt _0809169C
- movs r0, 0x3
- cmp r1, 0x2
- ble _0809169C
- movs r0, 0x2
-_0809169C:
- strh r0, [r7]
- mov r1, r8
- cmp r1, 0
- bne _08091756
- cmp r0, 0
- bne _080916C4
- movs r0, 0x10
- bl RandomCapped
- cmp r0, 0xA
- bne _080916C4
- movs r0, 0xF
- b _080916D2
- .align 2, 0
-_080916B8: .4byte 0x0000ffff
-_080916BC: .4byte gUnknown_810A580
-_080916C0: .4byte 0x000003e7
-_080916C4:
- movs r0, 0x4
- bl RandomCapped
- ldr r1, _080916EC
- lsls r0, 1
- adds r0, r1
- ldrh r0, [r0]
-_080916D2:
- strh r0, [r7, 0x2]
- ldrh r1, [r7, 0x2]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080916F6
- ldrb r0, [r6, 0x18]
- cmp r0, 0xFE
- bhi _080916F0
- adds r0, 0x1
- strb r0, [r6, 0x18]
- b _080916F6
- .align 2, 0
-_080916EC: .4byte gUnknown_81097E0
-_080916F0:
- ldr r0, _0809170C
- ands r0, r1
- strh r0, [r7, 0x2]
-_080916F6:
- ldrh r1, [r7, 0x2]
- movs r0, 0x2
- ands r0, r1
- cmp r0, 0
- beq _08091716
- ldrb r0, [r6, 0x19]
- cmp r0, 0xFE
- bhi _08091710
- adds r0, 0x1
- strb r0, [r6, 0x19]
- b _08091716
- .align 2, 0
-_0809170C: .4byte 0x0000fffe
-_08091710:
- ldr r0, _0809172C
- ands r0, r1
- strh r0, [r7, 0x2]
-_08091716:
- ldrh r1, [r7, 0x2]
- movs r0, 0x4
- ands r0, r1
- cmp r0, 0
- beq _08091736
- ldrb r0, [r6, 0x1A]
- cmp r0, 0xFE
- bhi _08091730
- adds r0, 0x1
- strb r0, [r6, 0x1A]
- b _08091736
- .align 2, 0
-_0809172C: .4byte 0x0000fffd
-_08091730:
- ldr r0, _0809174C
- ands r0, r1
- strh r0, [r7, 0x2]
-_08091736:
- ldrh r1, [r7, 0x2]
- movs r0, 0x8
- ands r0, r1
- cmp r0, 0
- beq _08091756
- ldrb r0, [r6, 0x1B]
- cmp r0, 0xFE
- bhi _08091750
- adds r0, 0x1
- strb r0, [r6, 0x1B]
- b _08091756
- .align 2, 0
-_0809174C: .4byte 0x0000fffb
-_08091750:
- ldr r0, _08091760
- ands r0, r1
- strh r0, [r7, 0x2]
-_08091756:
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08091760: .4byte 0x0000fff7
- thumb_func_end sub_80915F4
-
- thumb_func_start sub_8091764
-sub_8091764:
- push {lr}
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x55
- bls _08091776
- cmp r0, 0x66
- bhi _08091776
- movs r0, 0x1
- b _08091778
-_08091776:
- movs r0, 0
-_08091778:
- pop {r1}
- bx r1
- thumb_func_end sub_8091764
-
- thumb_func_start sub_809177C
-sub_809177C:
- push {r4,lr}
- movs r4, 0
-_08091780:
- lsls r1, r4, 2
- ldr r0, _080917A4
- ldr r0, [r0]
- adds r2, r1, r0
- ldrb r1, [r2]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _080917A8
- ldrb r0, [r2, 0x2]
- bl sub_8091764
- lsls r0, 24
- cmp r0, 0
- beq _080917A8
- movs r0, 0x1
- b _080917B0
- .align 2, 0
-_080917A4: .4byte gUnknown_203B460
-_080917A8:
- adds r4, 0x1
- cmp r4, 0x13
- ble _08091780
- movs r0, 0
-_080917B0:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_809177C
-
- thumb_func_start sub_80917B8
-sub_80917B8:
- push {r4,lr}
- adds r4, r0, 0
- ldrb r0, [r4, 0x2]
- bl sub_8090A60
- lsls r0, 24
- cmp r0, 0
- beq _080917E0
- ldr r2, _080917DC
- ldr r1, [r2]
- ldrb r0, [r4, 0x2]
- lsls r0, 1
- adds r1, 0x50
- adds r1, r0
- ldrh r0, [r1]
- ldrb r3, [r4, 0x1]
- adds r0, r3
- b _080917F0
- .align 2, 0
-_080917DC: .4byte gUnknown_203B460
-_080917E0:
- ldr r2, _0809180C
- ldr r1, [r2]
- ldrb r0, [r4, 0x2]
- lsls r0, 1
- adds r1, 0x50
- adds r1, r0
- ldrh r0, [r1]
- adds r0, 0x1
-_080917F0:
- strh r0, [r1]
- ldr r0, [r2]
- ldrb r1, [r4, 0x2]
- lsls r1, 1
- adds r0, 0x50
- adds r2, r0, r1
- ldrh r0, [r2]
- ldr r1, _08091810
- cmp r0, r1
- bls _08091806
- strh r1, [r2]
-_08091806:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_0809180C: .4byte gUnknown_203B460
-_08091810: .4byte 0x000003e7
- thumb_func_end sub_80917B8
-
- thumb_func_start sub_8091814
-sub_8091814:
- push {lr}
- movs r3, 0
- ldr r0, _0809183C
- ldr r0, [r0]
- movs r2, 0x8C
- lsls r2, 2
- adds r1, r0, r2
- movs r2, 0x7
-_08091824:
- ldrb r0, [r1]
- cmp r0, 0
- beq _0809182C
- adds r3, 0x1
-_0809182C:
- adds r1, 0x4
- subs r2, 0x1
- cmp r2, 0
- bge _08091824
- adds r0, r3, 0
- pop {r1}
- bx r1
- .align 2, 0
-_0809183C: .4byte gUnknown_203B460
- thumb_func_end sub_8091814
-
- thumb_func_start sub_8091840
-sub_8091840:
- lsls r0, 24
- ldr r1, _08091858
- lsrs r0, 22
- movs r2, 0x8C
- lsls r2, 2
- adds r0, r2
- ldr r1, [r1]
- adds r1, r0
- movs r0, 0
- strb r0, [r1]
- strb r0, [r1, 0x1]
- bx lr
- .align 2, 0
-_08091858: .4byte gUnknown_203B460
- thumb_func_end sub_8091840
-
- thumb_func_start sub_809185C
-sub_809185C:
- lsls r0, 24
- ldr r1, _08091870
- lsrs r0, 22
- movs r2, 0x8C
- lsls r2, 2
- adds r0, r2
- ldr r1, [r1]
- adds r1, r0
- adds r0, r1, 0
- bx lr
- .align 2, 0
-_08091870: .4byte gUnknown_203B460
- thumb_func_end sub_809185C
-
- thumb_func_start sub_8091874
-sub_8091874:
- push {r4-r7,lr}
- movs r2, 0
- movs r4, 0
- ldr r7, _08091884
- movs r6, 0x8C
- lsls r6, 2
- movs r3, 0
- b _080918A0
- .align 2, 0
-_08091884: .4byte gUnknown_203B460
-_08091888:
- cmp r2, r4
- ble _0809189A
- ldr r0, [r7]
- lsls r1, r4, 2
- adds r0, r6
- adds r1, r0, r1
- adds r0, r3
- ldr r0, [r0]
- str r0, [r1]
-_0809189A:
- adds r3, 0x4
- adds r2, 0x1
- adds r4, 0x1
-_080918A0:
- cmp r2, 0x7
- bgt _080918CA
- ldr r0, [r7]
- adds r0, r3
- adds r0, r6
- ldrb r0, [r0]
- cmp r0, 0
- bne _080918CA
- ldr r5, _080918E8
- movs r1, 0x8C
- lsls r1, 2
-_080918B6:
- adds r3, 0x4
- adds r2, 0x1
- cmp r2, 0x7
- bgt _080918CA
- ldr r0, [r5]
- adds r0, r3
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0
- beq _080918B6
-_080918CA:
- cmp r2, 0x8
- bne _08091888
- cmp r4, 0x7
- bgt _080918E0
-_080918D2:
- lsls r0, r4, 24
- lsrs r0, 24
- bl sub_8091840
- adds r4, 0x1
- cmp r4, 0x7
- ble _080918D2
-_080918E0:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080918E8: .4byte gUnknown_203B460
- thumb_func_end sub_8091874
-
- thumb_func_start sub_80918EC
-sub_80918EC:
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- movs r0, 0
-_080918F8:
- adds r1, r0, 0x1
- mov r8, r1
- mov r6, r8
- cmp r1, 0x7
- bgt _08091964
- ldr r1, _08091978
- mov r9, r1
- lsls r7, r0, 2
- movs r0, 0x8C
- lsls r0, 2
- mov r10, r0
-_0809190E:
- mov r1, r9
- ldr r0, [r1]
- adds r0, r7
- add r0, r10
- ldrb r0, [r0]
- bl GetItemOrder
- adds r4, r0, 0
- mov r1, r9
- ldr r0, [r1]
- lsls r5, r6, 2
- adds r0, r5
- add r0, r10
- ldrb r0, [r0]
- bl GetItemOrder
- cmp r4, r0
- bgt _0809194C
- cmp r4, r0
- bne _0809195E
- mov r1, r9
- ldr r0, [r1]
- adds r2, r0, r7
- ldr r1, _0809197C
- adds r2, r1
- adds r0, r5
- adds r0, r1
- ldrb r1, [r2]
- ldrb r0, [r0]
- cmp r1, r0
- bcs _0809195E
-_0809194C:
- mov r1, r9
- ldr r0, [r1]
- add r0, r10
- adds r2, r0, r7
- ldr r3, [r2]
- adds r0, r5
- ldr r1, [r0]
- str r1, [r2]
- str r3, [r0]
-_0809195E:
- adds r6, 0x1
- cmp r6, 0x7
- ble _0809190E
-_08091964:
- mov r0, r8
- cmp r0, 0x6
- ble _080918F8
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08091978: .4byte gUnknown_203B460
-_0809197C: .4byte 0x00000231
- thumb_func_end sub_80918EC
-
- thumb_func_start sub_8091980
-sub_8091980:
- push {r4-r7,lr}
- mov r7, r8
- push {r7}
- sub sp, 0x10
- lsls r0, 24
- lsrs r0, 24
- mov r8, r0
- mov r1, sp
- ldr r0, _080919F4
- ldm r0!, {r2-r4}
- stm r1!, {r2-r4}
- ldr r0, [r0]
- str r0, [r1]
- movs r5, 0
-_0809199C:
- lsls r0, r5, 24
- lsrs r0, 24
- bl sub_8091840
- adds r5, 0x1
- cmp r5, 0x7
- ble _0809199C
- mov r0, r8
- lsls r7, r0, 2
- ldr r6, _080919F8
- movs r5, 0x7
-_080919B2:
- adds r0, r6, 0
- bl RandomCapped
- adds r4, r0, 0
- adds r0, r6, 0
- bl RandomCapped
- adds r2, r0, 0
- mov r1, sp
- adds r0, r1, r7
- ldr r0, [r0]
- adds r1, r4, 0
- bl sub_8091E94
- lsls r0, 24
- lsrs r0, 24
- bl sub_80919FC
- subs r5, 0x1
- cmp r5, 0
- bge _080919B2
- bl sub_80918EC
- mov r0, r8
- bl sub_8091BB4
- add sp, 0x10
- pop {r3}
- mov r8, r3
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_080919F4: .4byte gUnknown_81097E8
-_080919F8: .4byte 0x0000270f
- thumb_func_end sub_8091980
-
- thumb_func_start sub_80919FC
-sub_80919FC:
- push {r4,r5,lr}
- sub sp, 0x4
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- mov r0, sp
- bl sub_8090B08
- movs r3, 0
- ldr r5, _08091A34
- movs r4, 0x8C
- lsls r4, 2
-_08091A14:
- ldr r1, [r5]
- lsls r2, r3, 2
- adds r0, r1, r2
- adds r0, r4
- ldrb r0, [r0]
- cmp r0, 0
- bne _08091A38
- movs r3, 0x8C
- lsls r3, 2
- adds r0, r1, r3
- adds r0, r2
- ldr r1, [sp]
- str r1, [r0]
- movs r0, 0
- b _08091A40
- .align 2, 0
-_08091A34: .4byte gUnknown_203B460
-_08091A38:
- adds r3, 0x1
- cmp r3, 0x7
- ble _08091A14
- movs r0, 0x1
-_08091A40:
- add sp, 0x4
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_80919FC
-
- thumb_func_start sub_8091A48
-sub_8091A48:
- push {lr}
- movs r3, 0
- ldr r0, _08091A70
- ldr r0, [r0]
- movs r2, 0x94
- lsls r2, 2
- adds r1, r0, r2
- movs r2, 0x3
-_08091A58:
- ldrb r0, [r1]
- cmp r0, 0
- beq _08091A60
- adds r3, 0x1
-_08091A60:
- adds r1, 0x4
- subs r2, 0x1
- cmp r2, 0
- bge _08091A58
- adds r0, r3, 0
- pop {r1}
- bx r1
- .align 2, 0
-_08091A70: .4byte gUnknown_203B460
- thumb_func_end sub_8091A48
-
- thumb_func_start sub_8091A74
-sub_8091A74:
- lsls r0, 24
- ldr r1, _08091A8C
- lsrs r0, 22
- movs r2, 0x94
- lsls r2, 2
- adds r0, r2
- ldr r1, [r1]
- adds r1, r0
- movs r0, 0
- strb r0, [r1]
- strb r0, [r1, 0x1]
- bx lr
- .align 2, 0
-_08091A8C: .4byte gUnknown_203B460
- thumb_func_end sub_8091A74
-
- thumb_func_start sub_8091A90
-sub_8091A90:
- lsls r0, 24
- ldr r1, _08091AA4
- lsrs r0, 22
- movs r2, 0x94
- lsls r2, 2
- adds r0, r2
- ldr r1, [r1]
- adds r1, r0
- adds r0, r1, 0
- bx lr
- .align 2, 0
-_08091AA4: .4byte gUnknown_203B460
- thumb_func_end sub_8091A90
-
- thumb_func_start sub_8091AA8
-sub_8091AA8:
- push {r4-r7,lr}
- movs r2, 0
- movs r4, 0
- ldr r7, _08091AB8
- movs r6, 0x94
- lsls r6, 2
- movs r3, 0
- b _08091AD4
- .align 2, 0
-_08091AB8: .4byte gUnknown_203B460
-_08091ABC:
- cmp r2, r4
- ble _08091ACE
- ldr r0, [r7]
- lsls r1, r4, 2
- adds r0, r6
- adds r1, r0, r1
- adds r0, r3
- ldr r0, [r0]
- str r0, [r1]
-_08091ACE:
- adds r3, 0x4
- adds r2, 0x1
- adds r4, 0x1
-_08091AD4:
- cmp r2, 0x3
- bgt _08091AFE
- ldr r0, [r7]
- adds r0, r3
- adds r0, r6
- ldrb r0, [r0]
- cmp r0, 0
- bne _08091AFE
- ldr r5, _08091B1C
- movs r1, 0x94
- lsls r1, 2
-_08091AEA:
- adds r3, 0x4
- adds r2, 0x1
- cmp r2, 0x3
- bgt _08091AFE
- ldr r0, [r5]
- adds r0, r3
- adds r0, r1
- ldrb r0, [r0]
- cmp r0, 0
- beq _08091AEA
-_08091AFE:
- cmp r2, 0x4
- bne _08091ABC
- cmp r4, 0x3
- bgt _08091B14
-_08091B06:
- lsls r0, r4, 24
- lsrs r0, 24
- bl sub_8091A74
- adds r4, 0x1
- cmp r4, 0x3
- ble _08091B06
-_08091B14:
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08091B1C: .4byte gUnknown_203B460
- thumb_func_end sub_8091AA8
-
- thumb_func_start sub_8091B20
-sub_8091B20:
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- movs r0, 0
-_08091B2C:
- adds r1, r0, 0x1
- mov r8, r1
- mov r6, r8
- cmp r1, 0x3
- bgt _08091B98
- ldr r1, _08091BAC
- mov r9, r1
- lsls r7, r0, 2
- movs r0, 0x94
- lsls r0, 2
- mov r10, r0
-_08091B42:
- mov r1, r9
- ldr r0, [r1]
- adds r0, r7
- add r0, r10
- ldrb r0, [r0]
- bl GetItemOrder
- adds r4, r0, 0
- mov r1, r9
- ldr r0, [r1]
- lsls r5, r6, 2
- adds r0, r5
- add r0, r10
- ldrb r0, [r0]
- bl GetItemOrder
- cmp r4, r0
- bgt _08091B80
- cmp r4, r0
- bne _08091B92
- mov r1, r9
- ldr r0, [r1]
- adds r2, r0, r7
- ldr r1, _08091BB0
- adds r2, r1
- adds r0, r5
- adds r0, r1
- ldrb r1, [r2]
- ldrb r0, [r0]
- cmp r1, r0
- bcs _08091B92
-_08091B80:
- mov r1, r9
- ldr r0, [r1]
- add r0, r10
- adds r2, r0, r7
- ldr r3, [r2]
- adds r0, r5
- ldr r1, [r0]
- str r1, [r2]
- str r3, [r0]
-_08091B92:
- adds r6, 0x1
- cmp r6, 0x3
- ble _08091B42
-_08091B98:
- mov r0, r8
- cmp r0, 0x2
- ble _08091B2C
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08091BAC: .4byte gUnknown_203B460
-_08091BB0: .4byte 0x00000251
- thumb_func_end sub_8091B20
-
- thumb_func_start sub_8091BB4
-sub_8091BB4:
- push {r4-r7,lr}
- sub sp, 0x10
- lsls r0, 24
- lsrs r4, r0, 24
- mov r1, sp
- ldr r0, _08091C14
- ldm r0!, {r2,r3,r5}
- stm r1!, {r2,r3,r5}
- ldr r0, [r0]
- str r0, [r1]
- movs r5, 0
-_08091BCA:
- lsls r0, r5, 24
- lsrs r0, 24
- bl sub_8091A74
- adds r5, 0x1
- cmp r5, 0x3
- ble _08091BCA
- lsls r7, r4, 2
- ldr r6, _08091C18
- movs r5, 0x3
-_08091BDE:
- adds r0, r6, 0
- bl RandomCapped
- adds r4, r0, 0
- adds r0, r6, 0
- bl RandomCapped
- adds r2, r0, 0
- mov r1, sp
- adds r0, r1, r7
- ldr r0, [r0]
- adds r1, r4, 0
- bl sub_8091E94
- lsls r0, 24
- lsrs r0, 24
- bl sub_8091C1C
- subs r5, 0x1
- cmp r5, 0
- bge _08091BDE
- bl sub_8091B20
- add sp, 0x10
- pop {r4-r7}
- pop {r0}
- bx r0
- .align 2, 0
-_08091C14: .4byte gUnknown_81097F8
-_08091C18: .4byte 0x0000270f
- thumb_func_end sub_8091BB4
-
- thumb_func_start sub_8091C1C
-sub_8091C1C:
- push {r4,r5,lr}
- sub sp, 0x4
- adds r1, r0, 0
- lsls r1, 24
- lsrs r1, 24
- mov r0, sp
- bl sub_8090B08
- movs r3, 0
- ldr r5, _08091C54
- movs r4, 0x94
- lsls r4, 2
-_08091C34:
- ldr r1, [r5]
- lsls r2, r3, 2
- adds r0, r1, r2
- adds r0, r4
- ldrb r0, [r0]
- cmp r0, 0
- bne _08091C58
- movs r3, 0x94
- lsls r3, 2
- adds r0, r1, r3
- adds r0, r2
- ldr r1, [sp]
- str r1, [r0]
- movs r0, 0
- b _08091C60
- .align 2, 0
-_08091C54: .4byte gUnknown_203B460
-_08091C58:
- adds r3, 0x1
- cmp r3, 0x3
- ble _08091C34
- movs r0, 0x1
-_08091C60:
- add sp, 0x4
- pop {r4,r5}
- pop {r1}
- bx r1
- thumb_func_end sub_8091C1C
-
- thumb_func_start sub_8091C68
-sub_8091C68:
- push {r4-r6,lr}
- sub sp, 0x10
- adds r3, r0, 0
- adds r2, r1, 0
- mov r0, sp
- adds r1, r3, 0
- bl sub_809486C
- movs r4, 0
- ldr r5, _08091D10
-_08091C7C:
- lsls r0, r4, 2
- ldr r1, [r5]
- adds r1, r0
- mov r0, sp
- bl sub_8091E28
- adds r4, 0x1
- cmp r4, 0x13
- ble _08091C7C
- ldr r6, _08091D10
- movs r5, 0x50
- movs r4, 0xEF
-_08091C94:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- movs r2, 0xA
- bl sub_809488C
- adds r5, 0x2
- subs r4, 0x1
- cmp r4, 0
- bge _08091C94
- ldr r6, _08091D10
- movs r5, 0x8C
- lsls r5, 2
- movs r4, 0x7
-_08091CB0:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- bl sub_8091DE0
- adds r5, 0x4
- subs r4, 0x1
- cmp r4, 0
- bge _08091CB0
- ldr r6, _08091D10
- movs r5, 0x94
- lsls r5, 2
- movs r4, 0x3
-_08091CCA:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- bl sub_8091DE0
- adds r5, 0x4
- subs r4, 0x1
- cmp r4, 0
- bge _08091CCA
- ldr r4, _08091D10
- ldr r1, [r4]
- movs r0, 0x98
- lsls r0, 2
- adds r1, r0
- mov r0, sp
- movs r2, 0x18
- bl sub_809488C
- ldr r1, [r4]
- movs r0, 0x99
- lsls r0, 2
- adds r1, r0
- mov r0, sp
- movs r2, 0x18
- bl sub_809488C
- mov r0, sp
- bl nullsub_102
- ldr r0, [sp, 0x8]
- add sp, 0x10
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08091D10: .4byte gUnknown_203B460
- thumb_func_end sub_8091C68
-
- thumb_func_start sub_8091D14
-sub_8091D14:
- push {r4-r6,lr}
- sub sp, 0x10
- adds r3, r0, 0
- adds r2, r1, 0
- mov r0, sp
- adds r1, r3, 0
- bl sub_809485C
- movs r4, 0
- ldr r5, _08091DBC
-_08091D28:
- lsls r0, r4, 2
- ldr r1, [r5]
- adds r1, r0
- mov r0, sp
- bl sub_8091E00
- adds r4, 0x1
- cmp r4, 0x13
- ble _08091D28
- ldr r6, _08091DBC
- movs r5, 0x50
- movs r4, 0xEF
-_08091D40:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- movs r2, 0xA
- bl sub_8094924
- adds r5, 0x2
- subs r4, 0x1
- cmp r4, 0
- bge _08091D40
- ldr r6, _08091DBC
- movs r5, 0x8C
- lsls r5, 2
- movs r4, 0x7
-_08091D5C:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- bl sub_8091DC0
- adds r5, 0x4
- subs r4, 0x1
- cmp r4, 0
- bge _08091D5C
- ldr r6, _08091DBC
- movs r5, 0x94
- lsls r5, 2
- movs r4, 0x3
-_08091D76:
- ldr r1, [r6]
- adds r1, r5
- mov r0, sp
- bl sub_8091DC0
- adds r5, 0x4
- subs r4, 0x1
- cmp r4, 0
- bge _08091D76
- ldr r4, _08091DBC
- ldr r1, [r4]
- movs r0, 0x98
- lsls r0, 2
- adds r1, r0
- mov r0, sp
- movs r2, 0x18
- bl sub_8094924
- ldr r1, [r4]
- movs r0, 0x99
- lsls r0, 2
- adds r1, r0
- mov r0, sp
- movs r2, 0x18
- bl sub_8094924
- mov r0, sp
- bl nullsub_102
- ldr r0, [sp, 0x8]
- add sp, 0x10
- pop {r4-r6}
- pop {r1}
- bx r1
- .align 2, 0
-_08091DBC: .4byte gUnknown_203B460
- thumb_func_end sub_8091D14
-
- thumb_func_start sub_8091DC0
-sub_8091DC0:
- push {r4,r5,lr}
- adds r5, r0, 0
- adds r4, r1, 0
- movs r2, 0x8
- bl sub_8094924
- adds r4, 0x1
- adds r0, r5, 0
- adds r1, r4, 0
- movs r2, 0x7
- bl sub_8094924
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8091DC0
-
- thumb_func_start sub_8091DE0
-sub_8091DE0:
- push {r4,r5,lr}
- adds r5, r0, 0
- adds r4, r1, 0
- movs r2, 0x8
- bl sub_809488C
- adds r4, 0x1
- adds r0, r5, 0
- adds r1, r4, 0
- movs r2, 0x7
- bl sub_809488C
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8091DE0
-
- thumb_func_start sub_8091E00
-sub_8091E00:
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- movs r2, 0x8
- bl sub_8094924
- adds r1, r5, 0x1
- adds r0, r4, 0
- movs r2, 0x7
- bl sub_8094924
- adds r5, 0x2
- adds r0, r4, 0
- adds r1, r5, 0
- movs r2, 0x8
- bl sub_8094924
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8091E00
-
- thumb_func_start sub_8091E28
-sub_8091E28:
- push {r4,r5,lr}
- adds r4, r0, 0
- adds r5, r1, 0
- movs r2, 0x8
- bl sub_809488C
- adds r1, r5, 0x1
- adds r0, r4, 0
- movs r2, 0x7
- bl sub_809488C
- adds r5, 0x2
- adds r0, r4, 0
- adds r1, r5, 0
- movs r2, 0x8
- bl sub_809488C
- pop {r4,r5}
- pop {r0}
- bx r0
- thumb_func_end sub_8091E28
-
- thumb_func_start sub_8091E50
-sub_8091E50:
- lsls r0, 24
- ldr r1, _08091E5C
- lsrs r0, 22
- adds r0, r1
- ldr r0, [r0]
- bx lr
- .align 2, 0
-_08091E5C: .4byte gUnknown_810AF50
- thumb_func_end sub_8091E50
-
- thumb_func_start sub_8091E60
-sub_8091E60:
- push {r4,lr}
- lsls r0, 24
- lsrs r3, r0, 24
- lsls r0, r1, 24
- lsrs r4, r0, 24
- cmp r3, 0x3E
- bhi _08091E8C
- ldr r2, _08091E88
- lsrs r0, 27
- lsls r1, r3, 5
- adds r0, r1
- adds r0, r2
- ldrb r0, [r0]
- movs r1, 0x7
- ands r1, r4
- asrs r0, r1
- movs r1, 0x1
- ands r0, r1
- b _08091E8E
- .align 2, 0
-_08091E88: .4byte gUnknown_8108F64
-_08091E8C:
- movs r0, 0
-_08091E8E:
- pop {r4}
- pop {r1}
- bx r1
- thumb_func_end sub_8091E60
-
- thumb_func_start sub_8091E94
-sub_8091E94:
- push {r4-r7,lr}
- mov r7, r10
- mov r6, r9
- mov r5, r8
- push {r5-r7}
- ldr r4, _08091EE4
- add sp, r4
- mov r8, r1
- mov r10, r2
- ldr r1, _08091EE8
- subs r0, 0x1
- lsls r0, 2
- adds r0, r1
- movs r3, 0
- add r1, sp, 0x18
- mov r9, r1
- ldr r2, _08091EEC
- mov r12, r2
- add r6, sp, 0x1F8
- ldr r2, [r0]
- adds r7, r6, 0
- movs r4, 0
-_08091EC0:
- ldrh r1, [r2]
- cmp r1, r12
- bls _08091EF4
- ldrh r0, [r2]
- ldr r1, _08091EF0
- adds r0, r1
- cmp r0, 0
- beq _08091EFC
- movs r5, 0
- adds r1, r7, r4
-_08091ED4:
- strh r5, [r1]
- adds r1, 0x2
- adds r4, 0x2
- adds r3, 0x1
- subs r0, 0x1
- cmp r0, 0
- bne _08091ED4
- b _08091EFC
- .align 2, 0
-_08091EE4: .4byte 0xfffffc10
-_08091EE8: .4byte gUnknown_8108E58
-_08091EEC: .4byte 0x0000752f
-_08091EF0: .4byte 0xffff8ad0
-_08091EF4:
- adds r0, r6, r4
- strh r1, [r0]
- adds r4, 0x2
- adds r3, 0x1
-_08091EFC:
- adds r2, 0x2
- cmp r3, 0xFB
- ble _08091EC0
- movs r3, 0xB
- add r2, sp, 0x1F8
- mov r1, sp
-_08091F08:
- ldrh r0, [r2]
- strh r0, [r1]
- adds r2, 0x2
- adds r1, 0x2
- subs r3, 0x1
- cmp r3, 0
- bge _08091F08
- mov r2, r9
- add r1, sp, 0x210
- movs r3, 0xEF
-_08091F1C:
- ldrh r0, [r1]
- strh r0, [r2]
- adds r1, 0x2
- adds r2, 0x2
- subs r3, 0x1
- cmp r3, 0
- bge _08091F1C
- movs r7, 0xC
- movs r6, 0
- mov r0, sp
- movs r2, 0
- ldrsh r0, [r0, r2]
- cmp r0, 0
- beq _08091F4A
- mov r0, sp
- movs r1, 0
- ldrsh r0, [r0, r1]
- cmp r0, r8
- blt _08091F4A
- movs r7, 0
- b _08091F66
-_08091F46:
- mov r8, r5
- b _08091F9C
-_08091F4A:
- adds r6, 0x1
- cmp r6, 0xB
- bgt _08091F66
- lsls r0, r6, 1
- mov r2, sp
- adds r1, r2, r0
- movs r2, 0
- ldrsh r0, [r1, r2]
- cmp r0, 0
- beq _08091F4A
- cmp r0, r8
- blt _08091F4A
- lsls r0, r6, 24
- lsrs r7, r0, 24
-_08091F66:
- movs r0, 0x46
- mov r8, r0
- cmp r7, 0xC
- beq _08091F9C
- movs r6, 0
- mov r4, r9
-_08091F72:
- movs r1, 0
- ldrsh r0, [r4, r1]
- cmp r0, 0
- beq _08091F94
- lsls r0, r6, 24
- lsrs r5, r0, 24
- adds r0, r5, 0
- bl GetItemType
- lsls r0, 24
- lsrs r0, 24
- cmp r0, r7
- bne _08091F94
- movs r2, 0
- ldrsh r0, [r4, r2]
- cmp r0, r10
- bge _08091F46
-_08091F94:
- adds r4, 0x2
- adds r6, 0x1
- cmp r6, 0xEF
- ble _08091F72
-_08091F9C:
- mov r0, r8
- movs r3, 0xFC
- lsls r3, 2
- add sp, r3
- pop {r3-r5}
- mov r8, r3
- mov r9, r4
- mov r10, r5
- pop {r4-r7}
- pop {r1}
- bx r1
- thumb_func_end sub_8091E94
-
- thumb_func_start sub_8091FB4
-sub_8091FB4:
- push {r4-r6,lr}
- movs r6, 0
-_08091FB8:
- ldr r0, _08092038
- lsls r1, r6, 2
- ldr r0, [r0]
- adds r4, r0, r1
- ldrb r1, [r4]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08091FE8
- movs r0, 0xF7
- ands r0, r1
- movs r5, 0
- strb r0, [r4]
- ldrb r0, [r4, 0x2]
- cmp r0, 0x69
- bne _08091FE8
- adds r0, r4, 0
- bl sub_80915D4
- bl sub_80913A0
- strb r5, [r4, 0x2]
- strb r5, [r4, 0x1]
- strb r5, [r4]
-_08091FE8:
- adds r6, 0x1
- cmp r6, 0x13
- ble _08091FB8
- bl sub_80910B4
- movs r6, 0
-_08091FF4:
- movs r0, 0x58
- adds r1, r6, 0
- muls r1, r0
- ldr r0, _0809203C
- ldr r0, [r0]
- adds r2, r1, r0
- ldrb r1, [r2]
- movs r0, 0x1
- ands r0, r1
- cmp r0, 0
- beq _08092026
- adds r4, r2, 0
- adds r4, 0x28
- ldrb r0, [r4]
- cmp r0, 0
- beq _08092026
- cmp r0, 0x69
- bne _08092026
- adds r0, r4, 0
- bl sub_80915E4
- bl sub_80913A0
- movs r0, 0
- strb r0, [r4]
-_08092026:
- adds r6, 0x1
- movs r0, 0xCE
- lsls r0, 1
- cmp r6, r0
- ble _08091FF4
- pop {r4-r6}
- pop {r0}
- bx r0
- .align 2, 0
-_08092038: .4byte gUnknown_203B460
-_0809203C: .4byte gRecruitedPokemonRef
- thumb_func_end sub_8091FB4
-
.align 2,0
diff --git a/asm/items_1.s b/asm/items_1.s
new file mode 100644
index 0000000..50b1f34
--- /dev/null
+++ b/asm/items_1.s
@@ -0,0 +1,1435 @@
+ .include "constants/gba_constants.inc"
+ .include "asm/macros.inc"
+
+ .syntax unified
+
+ .text
+
+ thumb_func_start sub_80915F4
+sub_80915F4:
+ push {r4-r7,lr}
+ mov r7, r8
+ push {r7}
+ adds r6, r0, 0
+ adds r7, r3, 0
+ lsls r1, 24
+ lsrs r5, r1, 24
+ lsls r2, 24
+ lsrs r2, 24
+ mov r8, r2
+ ldr r0, _080916B8
+ strh r0, [r7]
+ movs r0, 0
+ strh r0, [r7, 0x2]
+ adds r0, r5, 0
+ bl sub_8091764
+ lsls r0, 24
+ cmp r0, 0
+ bne _0809161E
+ b _08091756
+_0809161E:
+ movs r1, 0x8
+ ldrsh r0, [r6, r1]
+ movs r1, 0
+ bl GetPokemonType
+ adds r4, r0, 0
+ lsls r4, 24
+ lsrs r4, 24
+ movs r2, 0x8
+ ldrsh r0, [r6, r2]
+ movs r1, 0x1
+ bl GetPokemonType
+ lsls r0, 24
+ lsrs r0, 24
+ adds r2, r5, 0
+ subs r2, 0x55
+ ldr r5, _080916BC
+ lsls r2, 1
+ lsls r1, r4, 3
+ adds r1, r4
+ lsls r1, 2
+ adds r1, r2, r1
+ adds r1, r5
+ movs r4, 0
+ ldrsh r3, [r1, r4]
+ lsls r1, r0, 3
+ adds r1, r0
+ lsls r1, 2
+ adds r2, r1
+ adds r2, r5
+ movs r1, 0
+ ldrsh r0, [r2, r1]
+ movs r2, 0x14
+ ldrsh r1, [r6, r2]
+ adds r3, r0
+ ldrh r4, [r6, 0x14]
+ adds r3, r4
+ strh r3, [r6, 0x14]
+ movs r2, 0x14
+ ldrsh r0, [r6, r2]
+ subs r1, r0, r1
+ lsls r3, 16
+ cmp r3, 0
+ bgt _0809167C
+ movs r0, 0x1
+ strh r0, [r6, 0x14]
+_0809167C:
+ movs r4, 0x14
+ ldrsh r0, [r6, r4]
+ ldr r2, _080916C0
+ cmp r0, r2
+ ble _08091688
+ strh r2, [r6, 0x14]
+_08091688:
+ movs r0, 0
+ cmp r1, 0x8
+ bgt _0809169C
+ movs r0, 0x1
+ cmp r1, 0x4
+ bgt _0809169C
+ movs r0, 0x3
+ cmp r1, 0x2
+ ble _0809169C
+ movs r0, 0x2
+_0809169C:
+ strh r0, [r7]
+ mov r1, r8
+ cmp r1, 0
+ bne _08091756
+ cmp r0, 0
+ bne _080916C4
+ movs r0, 0x10
+ bl RandomCapped
+ cmp r0, 0xA
+ bne _080916C4
+ movs r0, 0xF
+ b _080916D2
+ .align 2, 0
+_080916B8: .4byte 0x0000ffff
+_080916BC: .4byte gUnknown_810A580
+_080916C0: .4byte 0x000003e7
+_080916C4:
+ movs r0, 0x4
+ bl RandomCapped
+ ldr r1, _080916EC
+ lsls r0, 1
+ adds r0, r1
+ ldrh r0, [r0]
+_080916D2:
+ strh r0, [r7, 0x2]
+ ldrh r1, [r7, 0x2]
+ movs r0, 0x1
+ ands r0, r1
+ cmp r0, 0
+ beq _080916F6
+ ldrb r0, [r6, 0x18]
+ cmp r0, 0xFE
+ bhi _080916F0
+ adds r0, 0x1
+ strb r0, [r6, 0x18]
+ b _080916F6
+ .align 2, 0
+_080916EC: .4byte gUnknown_81097E0
+_080916F0:
+ ldr r0, _0809170C
+ ands r0, r1
+ strh r0, [r7, 0x2]
+_080916F6:
+ ldrh r1, [r7, 0x2]
+ movs r0, 0x2
+ ands r0, r1
+ cmp r0, 0
+ beq _08091716
+ ldrb r0, [r6, 0x19]
+ cmp r0, 0xFE
+ bhi _08091710
+ adds r0, 0x1
+ strb r0, [r6, 0x19]
+ b _08091716
+ .align 2, 0
+_0809170C: .4byte 0x0000fffe
+_08091710:
+ ldr r0, _0809172C
+ ands r0, r1
+ strh r0, [r7, 0x2]
+_08091716:
+ ldrh r1, [r7, 0x2]
+ movs r0, 0x4
+ ands r0, r1
+ cmp r0, 0
+ beq _08091736
+ ldrb r0, [r6, 0x1A]
+ cmp r0, 0xFE
+ bhi _08091730
+ adds r0, 0x1
+ strb r0, [r6, 0x1A]
+ b _08091736
+ .align 2, 0
+_0809172C: .4byte 0x0000fffd
+_08091730:
+ ldr r0, _0809174C
+ ands r0, r1
+ strh r0, [r7, 0x2]
+_08091736:
+ ldrh r1, [r7, 0x2]
+ movs r0, 0x8
+ ands r0, r1
+ cmp r0, 0
+ beq _08091756
+ ldrb r0, [r6, 0x1B]
+ cmp r0, 0xFE
+ bhi _08091750
+ adds r0, 0x1
+ strb r0, [r6, 0x1B]
+ b _08091756
+ .align 2, 0
+_0809174C: .4byte 0x0000fffb
+_08091750:
+ ldr r0, _08091760
+ ands r0, r1
+ strh r0, [r7, 0x2]
+_08091756:
+ pop {r3}
+ mov r8, r3
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08091760: .4byte 0x0000fff7
+ thumb_func_end sub_80915F4
+
+ thumb_func_start sub_8091764
+sub_8091764:
+ push {lr}
+ lsls r0, 24
+ lsrs r0, 24
+ cmp r0, 0x55
+ bls _08091776
+ cmp r0, 0x66
+ bhi _08091776
+ movs r0, 0x1
+ b _08091778
+_08091776:
+ movs r0, 0
+_08091778:
+ pop {r1}
+ bx r1
+ thumb_func_end sub_8091764
+
+ thumb_func_start sub_809177C
+sub_809177C:
+ push {r4,lr}
+ movs r4, 0
+_08091780:
+ lsls r1, r4, 2
+ ldr r0, _080917A4
+ ldr r0, [r0]
+ adds r2, r1, r0
+ ldrb r1, [r2]
+ movs r0, 0x1
+ ands r0, r1
+ cmp r0, 0
+ beq _080917A8
+ ldrb r0, [r2, 0x2]
+ bl sub_8091764
+ lsls r0, 24
+ cmp r0, 0
+ beq _080917A8
+ movs r0, 0x1
+ b _080917B0
+ .align 2, 0
+_080917A4: .4byte gTeamInventory_203B460
+_080917A8:
+ adds r4, 0x1
+ cmp r4, 0x13
+ ble _08091780
+ movs r0, 0
+_080917B0:
+ pop {r4}
+ pop {r1}
+ bx r1
+ thumb_func_end sub_809177C
+
+ thumb_func_start sub_80917B8
+sub_80917B8:
+ push {r4,lr}
+ adds r4, r0, 0
+ ldrb r0, [r4, 0x2]
+ bl IsThrowableItem
+ lsls r0, 24
+ cmp r0, 0
+ beq _080917E0
+ ldr r2, _080917DC
+ ldr r1, [r2]
+ ldrb r0, [r4, 0x2]
+ lsls r0, 1
+ adds r1, 0x50
+ adds r1, r0
+ ldrh r0, [r1]
+ ldrb r3, [r4, 0x1]
+ adds r0, r3
+ b _080917F0
+ .align 2, 0
+_080917DC: .4byte gTeamInventory_203B460
+_080917E0:
+ ldr r2, _0809180C
+ ldr r1, [r2]
+ ldrb r0, [r4, 0x2]
+ lsls r0, 1
+ adds r1, 0x50
+ adds r1, r0
+ ldrh r0, [r1]
+ adds r0, 0x1
+_080917F0:
+ strh r0, [r1]
+ ldr r0, [r2]
+ ldrb r1, [r4, 0x2]
+ lsls r1, 1
+ adds r0, 0x50
+ adds r2, r0, r1
+ ldrh r0, [r2]
+ ldr r1, _08091810
+ cmp r0, r1
+ bls _08091806
+ strh r1, [r2]
+_08091806:
+ pop {r4}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_0809180C: .4byte gTeamInventory_203B460
+_08091810: .4byte 0x000003e7
+ thumb_func_end sub_80917B8
+
+ thumb_func_start sub_8091814
+sub_8091814:
+ push {lr}
+ movs r3, 0
+ ldr r0, _0809183C
+ ldr r0, [r0]
+ movs r2, 0x8C
+ lsls r2, 2
+ adds r1, r0, r2
+ movs r2, 0x7
+_08091824:
+ ldrb r0, [r1]
+ cmp r0, 0
+ beq _0809182C
+ adds r3, 0x1
+_0809182C:
+ adds r1, 0x4
+ subs r2, 0x1
+ cmp r2, 0
+ bge _08091824
+ adds r0, r3, 0
+ pop {r1}
+ bx r1
+ .align 2, 0
+_0809183C: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091814
+
+ thumb_func_start sub_8091840
+sub_8091840:
+ lsls r0, 24
+ ldr r1, _08091858
+ lsrs r0, 22
+ movs r2, 0x8C
+ lsls r2, 2
+ adds r0, r2
+ ldr r1, [r1]
+ adds r1, r0
+ movs r0, 0
+ strb r0, [r1]
+ strb r0, [r1, 0x1]
+ bx lr
+ .align 2, 0
+_08091858: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091840
+
+ thumb_func_start sub_809185C
+sub_809185C:
+ lsls r0, 24
+ ldr r1, _08091870
+ lsrs r0, 22
+ movs r2, 0x8C
+ lsls r2, 2
+ adds r0, r2
+ ldr r1, [r1]
+ adds r1, r0
+ adds r0, r1, 0
+ bx lr
+ .align 2, 0
+_08091870: .4byte gTeamInventory_203B460
+ thumb_func_end sub_809185C
+
+ thumb_func_start sub_8091874
+sub_8091874:
+ push {r4-r7,lr}
+ movs r2, 0
+ movs r4, 0
+ ldr r7, _08091884
+ movs r6, 0x8C
+ lsls r6, 2
+ movs r3, 0
+ b _080918A0
+ .align 2, 0
+_08091884: .4byte gTeamInventory_203B460
+_08091888:
+ cmp r2, r4
+ ble _0809189A
+ ldr r0, [r7]
+ lsls r1, r4, 2
+ adds r0, r6
+ adds r1, r0, r1
+ adds r0, r3
+ ldr r0, [r0]
+ str r0, [r1]
+_0809189A:
+ adds r3, 0x4
+ adds r2, 0x1
+ adds r4, 0x1
+_080918A0:
+ cmp r2, 0x7
+ bgt _080918CA
+ ldr r0, [r7]
+ adds r0, r3
+ adds r0, r6
+ ldrb r0, [r0]
+ cmp r0, 0
+ bne _080918CA
+ ldr r5, _080918E8
+ movs r1, 0x8C
+ lsls r1, 2
+_080918B6:
+ adds r3, 0x4
+ adds r2, 0x1
+ cmp r2, 0x7
+ bgt _080918CA
+ ldr r0, [r5]
+ adds r0, r3
+ adds r0, r1
+ ldrb r0, [r0]
+ cmp r0, 0
+ beq _080918B6
+_080918CA:
+ cmp r2, 0x8
+ bne _08091888
+ cmp r4, 0x7
+ bgt _080918E0
+_080918D2:
+ lsls r0, r4, 24
+ lsrs r0, 24
+ bl sub_8091840
+ adds r4, 0x1
+ cmp r4, 0x7
+ ble _080918D2
+_080918E0:
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_080918E8: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091874
+
+ thumb_func_start sub_80918EC
+sub_80918EC:
+ push {r4-r7,lr}
+ mov r7, r10
+ mov r6, r9
+ mov r5, r8
+ push {r5-r7}
+ movs r0, 0
+_080918F8:
+ adds r1, r0, 0x1
+ mov r8, r1
+ mov r6, r8
+ cmp r1, 0x7
+ bgt _08091964
+ ldr r1, _08091978
+ mov r9, r1
+ lsls r7, r0, 2
+ movs r0, 0x8C
+ lsls r0, 2
+ mov r10, r0
+_0809190E:
+ mov r1, r9
+ ldr r0, [r1]
+ adds r0, r7
+ add r0, r10
+ ldrb r0, [r0]
+ bl GetItemOrder
+ adds r4, r0, 0
+ mov r1, r9
+ ldr r0, [r1]
+ lsls r5, r6, 2
+ adds r0, r5
+ add r0, r10
+ ldrb r0, [r0]
+ bl GetItemOrder
+ cmp r4, r0
+ bgt _0809194C
+ cmp r4, r0
+ bne _0809195E
+ mov r1, r9
+ ldr r0, [r1]
+ adds r2, r0, r7
+ ldr r1, _0809197C
+ adds r2, r1
+ adds r0, r5
+ adds r0, r1
+ ldrb r1, [r2]
+ ldrb r0, [r0]
+ cmp r1, r0
+ bcs _0809195E
+_0809194C:
+ mov r1, r9
+ ldr r0, [r1]
+ add r0, r10
+ adds r2, r0, r7
+ ldr r3, [r2]
+ adds r0, r5
+ ldr r1, [r0]
+ str r1, [r2]
+ str r3, [r0]
+_0809195E:
+ adds r6, 0x1
+ cmp r6, 0x7
+ ble _0809190E
+_08091964:
+ mov r0, r8
+ cmp r0, 0x6
+ ble _080918F8
+ pop {r3-r5}
+ mov r8, r3
+ mov r9, r4
+ mov r10, r5
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08091978: .4byte gTeamInventory_203B460
+_0809197C: .4byte 0x00000231
+ thumb_func_end sub_80918EC
+
+ thumb_func_start sub_8091980
+sub_8091980:
+ push {r4-r7,lr}
+ mov r7, r8
+ push {r7}
+ sub sp, 0x10
+ lsls r0, 24
+ lsrs r0, 24
+ mov r8, r0
+ mov r1, sp
+ ldr r0, _080919F4
+ ldm r0!, {r2-r4}
+ stm r1!, {r2-r4}
+ ldr r0, [r0]
+ str r0, [r1]
+ movs r5, 0
+_0809199C:
+ lsls r0, r5, 24
+ lsrs r0, 24
+ bl sub_8091840
+ adds r5, 0x1
+ cmp r5, 0x7
+ ble _0809199C
+ mov r0, r8
+ lsls r7, r0, 2
+ ldr r6, _080919F8
+ movs r5, 0x7
+_080919B2:
+ adds r0, r6, 0
+ bl RandomCapped
+ adds r4, r0, 0
+ adds r0, r6, 0
+ bl RandomCapped
+ adds r2, r0, 0
+ mov r1, sp
+ adds r0, r1, r7
+ ldr r0, [r0]
+ adds r1, r4, 0
+ bl sub_8091E94
+ lsls r0, 24
+ lsrs r0, 24
+ bl sub_80919FC
+ subs r5, 0x1
+ cmp r5, 0
+ bge _080919B2
+ bl sub_80918EC
+ mov r0, r8
+ bl sub_8091BB4
+ add sp, 0x10
+ pop {r3}
+ mov r8, r3
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_080919F4: .4byte gUnknown_81097E8
+_080919F8: .4byte 0x0000270f
+ thumb_func_end sub_8091980
+
+ thumb_func_start sub_80919FC
+sub_80919FC:
+ push {r4,r5,lr}
+ sub sp, 0x4
+ adds r1, r0, 0
+ lsls r1, 24
+ lsrs r1, 24
+ mov r0, sp
+ bl sub_8090B08
+ movs r3, 0
+ ldr r5, _08091A34
+ movs r4, 0x8C
+ lsls r4, 2
+_08091A14:
+ ldr r1, [r5]
+ lsls r2, r3, 2
+ adds r0, r1, r2
+ adds r0, r4
+ ldrb r0, [r0]
+ cmp r0, 0
+ bne _08091A38
+ movs r3, 0x8C
+ lsls r3, 2
+ adds r0, r1, r3
+ adds r0, r2
+ ldr r1, [sp]
+ str r1, [r0]
+ movs r0, 0
+ b _08091A40
+ .align 2, 0
+_08091A34: .4byte gTeamInventory_203B460
+_08091A38:
+ adds r3, 0x1
+ cmp r3, 0x7
+ ble _08091A14
+ movs r0, 0x1
+_08091A40:
+ add sp, 0x4
+ pop {r4,r5}
+ pop {r1}
+ bx r1
+ thumb_func_end sub_80919FC
+
+ thumb_func_start sub_8091A48
+sub_8091A48:
+ push {lr}
+ movs r3, 0
+ ldr r0, _08091A70
+ ldr r0, [r0]
+ movs r2, 0x94
+ lsls r2, 2
+ adds r1, r0, r2
+ movs r2, 0x3
+_08091A58:
+ ldrb r0, [r1]
+ cmp r0, 0
+ beq _08091A60
+ adds r3, 0x1
+_08091A60:
+ adds r1, 0x4
+ subs r2, 0x1
+ cmp r2, 0
+ bge _08091A58
+ adds r0, r3, 0
+ pop {r1}
+ bx r1
+ .align 2, 0
+_08091A70: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091A48
+
+ thumb_func_start sub_8091A74
+sub_8091A74:
+ lsls r0, 24
+ ldr r1, _08091A8C
+ lsrs r0, 22
+ movs r2, 0x94
+ lsls r2, 2
+ adds r0, r2
+ ldr r1, [r1]
+ adds r1, r0
+ movs r0, 0
+ strb r0, [r1]
+ strb r0, [r1, 0x1]
+ bx lr
+ .align 2, 0
+_08091A8C: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091A74
+
+ thumb_func_start sub_8091A90
+sub_8091A90:
+ lsls r0, 24
+ ldr r1, _08091AA4
+ lsrs r0, 22
+ movs r2, 0x94
+ lsls r2, 2
+ adds r0, r2
+ ldr r1, [r1]
+ adds r1, r0
+ adds r0, r1, 0
+ bx lr
+ .align 2, 0
+_08091AA4: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091A90
+
+ thumb_func_start sub_8091AA8
+sub_8091AA8:
+ push {r4-r7,lr}
+ movs r2, 0
+ movs r4, 0
+ ldr r7, _08091AB8
+ movs r6, 0x94
+ lsls r6, 2
+ movs r3, 0
+ b _08091AD4
+ .align 2, 0
+_08091AB8: .4byte gTeamInventory_203B460
+_08091ABC:
+ cmp r2, r4
+ ble _08091ACE
+ ldr r0, [r7]
+ lsls r1, r4, 2
+ adds r0, r6
+ adds r1, r0, r1
+ adds r0, r3
+ ldr r0, [r0]
+ str r0, [r1]
+_08091ACE:
+ adds r3, 0x4
+ adds r2, 0x1
+ adds r4, 0x1
+_08091AD4:
+ cmp r2, 0x3
+ bgt _08091AFE
+ ldr r0, [r7]
+ adds r0, r3
+ adds r0, r6
+ ldrb r0, [r0]
+ cmp r0, 0
+ bne _08091AFE
+ ldr r5, _08091B1C
+ movs r1, 0x94
+ lsls r1, 2
+_08091AEA:
+ adds r3, 0x4
+ adds r2, 0x1
+ cmp r2, 0x3
+ bgt _08091AFE
+ ldr r0, [r5]
+ adds r0, r3
+ adds r0, r1
+ ldrb r0, [r0]
+ cmp r0, 0
+ beq _08091AEA
+_08091AFE:
+ cmp r2, 0x4
+ bne _08091ABC
+ cmp r4, 0x3
+ bgt _08091B14
+_08091B06:
+ lsls r0, r4, 24
+ lsrs r0, 24
+ bl sub_8091A74
+ adds r4, 0x1
+ cmp r4, 0x3
+ ble _08091B06
+_08091B14:
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08091B1C: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091AA8
+
+ thumb_func_start sub_8091B20
+sub_8091B20:
+ push {r4-r7,lr}
+ mov r7, r10
+ mov r6, r9
+ mov r5, r8
+ push {r5-r7}
+ movs r0, 0
+_08091B2C:
+ adds r1, r0, 0x1
+ mov r8, r1
+ mov r6, r8
+ cmp r1, 0x3
+ bgt _08091B98
+ ldr r1, _08091BAC
+ mov r9, r1
+ lsls r7, r0, 2
+ movs r0, 0x94
+ lsls r0, 2
+ mov r10, r0
+_08091B42:
+ mov r1, r9
+ ldr r0, [r1]
+ adds r0, r7
+ add r0, r10
+ ldrb r0, [r0]
+ bl GetItemOrder
+ adds r4, r0, 0
+ mov r1, r9
+ ldr r0, [r1]
+ lsls r5, r6, 2
+ adds r0, r5
+ add r0, r10
+ ldrb r0, [r0]
+ bl GetItemOrder
+ cmp r4, r0
+ bgt _08091B80
+ cmp r4, r0
+ bne _08091B92
+ mov r1, r9
+ ldr r0, [r1]
+ adds r2, r0, r7
+ ldr r1, _08091BB0
+ adds r2, r1
+ adds r0, r5
+ adds r0, r1
+ ldrb r1, [r2]
+ ldrb r0, [r0]
+ cmp r1, r0
+ bcs _08091B92
+_08091B80:
+ mov r1, r9
+ ldr r0, [r1]
+ add r0, r10
+ adds r2, r0, r7
+ ldr r3, [r2]
+ adds r0, r5
+ ldr r1, [r0]
+ str r1, [r2]
+ str r3, [r0]
+_08091B92:
+ adds r6, 0x1
+ cmp r6, 0x3
+ ble _08091B42
+_08091B98:
+ mov r0, r8
+ cmp r0, 0x2
+ ble _08091B2C
+ pop {r3-r5}
+ mov r8, r3
+ mov r9, r4
+ mov r10, r5
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08091BAC: .4byte gTeamInventory_203B460
+_08091BB0: .4byte 0x00000251
+ thumb_func_end sub_8091B20
+
+ thumb_func_start sub_8091BB4
+sub_8091BB4:
+ push {r4-r7,lr}
+ sub sp, 0x10
+ lsls r0, 24
+ lsrs r4, r0, 24
+ mov r1, sp
+ ldr r0, _08091C14
+ ldm r0!, {r2,r3,r5}
+ stm r1!, {r2,r3,r5}
+ ldr r0, [r0]
+ str r0, [r1]
+ movs r5, 0
+_08091BCA:
+ lsls r0, r5, 24
+ lsrs r0, 24
+ bl sub_8091A74
+ adds r5, 0x1
+ cmp r5, 0x3
+ ble _08091BCA
+ lsls r7, r4, 2
+ ldr r6, _08091C18
+ movs r5, 0x3
+_08091BDE:
+ adds r0, r6, 0
+ bl RandomCapped
+ adds r4, r0, 0
+ adds r0, r6, 0
+ bl RandomCapped
+ adds r2, r0, 0
+ mov r1, sp
+ adds r0, r1, r7
+ ldr r0, [r0]
+ adds r1, r4, 0
+ bl sub_8091E94
+ lsls r0, 24
+ lsrs r0, 24
+ bl sub_8091C1C
+ subs r5, 0x1
+ cmp r5, 0
+ bge _08091BDE
+ bl sub_8091B20
+ add sp, 0x10
+ pop {r4-r7}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08091C14: .4byte gUnknown_81097F8
+_08091C18: .4byte 0x0000270f
+ thumb_func_end sub_8091BB4
+
+ thumb_func_start sub_8091C1C
+sub_8091C1C:
+ push {r4,r5,lr}
+ sub sp, 0x4
+ adds r1, r0, 0
+ lsls r1, 24
+ lsrs r1, 24
+ mov r0, sp
+ bl sub_8090B08
+ movs r3, 0
+ ldr r5, _08091C54
+ movs r4, 0x94
+ lsls r4, 2
+_08091C34:
+ ldr r1, [r5]
+ lsls r2, r3, 2
+ adds r0, r1, r2
+ adds r0, r4
+ ldrb r0, [r0]
+ cmp r0, 0
+ bne _08091C58
+ movs r3, 0x94
+ lsls r3, 2
+ adds r0, r1, r3
+ adds r0, r2
+ ldr r1, [sp]
+ str r1, [r0]
+ movs r0, 0
+ b _08091C60
+ .align 2, 0
+_08091C54: .4byte gTeamInventory_203B460
+_08091C58:
+ adds r3, 0x1
+ cmp r3, 0x3
+ ble _08091C34
+ movs r0, 0x1
+_08091C60:
+ add sp, 0x4
+ pop {r4,r5}
+ pop {r1}
+ bx r1
+ thumb_func_end sub_8091C1C
+
+ thumb_func_start sub_8091C68
+sub_8091C68:
+ push {r4-r6,lr}
+ sub sp, 0x10
+ adds r3, r0, 0
+ adds r2, r1, 0
+ mov r0, sp
+ adds r1, r3, 0
+ bl sub_809486C
+ movs r4, 0
+ ldr r5, _08091D10
+_08091C7C:
+ lsls r0, r4, 2
+ ldr r1, [r5]
+ adds r1, r0
+ mov r0, sp
+ bl sub_8091E28
+ adds r4, 0x1
+ cmp r4, 0x13
+ ble _08091C7C
+ ldr r6, _08091D10
+ movs r5, 0x50
+ movs r4, 0xEF
+_08091C94:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ movs r2, 0xA
+ bl sub_809488C
+ adds r5, 0x2
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091C94
+ ldr r6, _08091D10
+ movs r5, 0x8C
+ lsls r5, 2
+ movs r4, 0x7
+_08091CB0:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ bl sub_8091DE0
+ adds r5, 0x4
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091CB0
+ ldr r6, _08091D10
+ movs r5, 0x94
+ lsls r5, 2
+ movs r4, 0x3
+_08091CCA:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ bl sub_8091DE0
+ adds r5, 0x4
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091CCA
+ ldr r4, _08091D10
+ ldr r1, [r4]
+ movs r0, 0x98
+ lsls r0, 2
+ adds r1, r0
+ mov r0, sp
+ movs r2, 0x18
+ bl sub_809488C
+ ldr r1, [r4]
+ movs r0, 0x99
+ lsls r0, 2
+ adds r1, r0
+ mov r0, sp
+ movs r2, 0x18
+ bl sub_809488C
+ mov r0, sp
+ bl nullsub_102
+ ldr r0, [sp, 0x8]
+ add sp, 0x10
+ pop {r4-r6}
+ pop {r1}
+ bx r1
+ .align 2, 0
+_08091D10: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091C68
+
+ thumb_func_start sub_8091D14
+sub_8091D14:
+ push {r4-r6,lr}
+ sub sp, 0x10
+ adds r3, r0, 0
+ adds r2, r1, 0
+ mov r0, sp
+ adds r1, r3, 0
+ bl sub_809485C
+ movs r4, 0
+ ldr r5, _08091DBC
+_08091D28:
+ lsls r0, r4, 2
+ ldr r1, [r5]
+ adds r1, r0
+ mov r0, sp
+ bl sub_8091E00
+ adds r4, 0x1
+ cmp r4, 0x13
+ ble _08091D28
+ ldr r6, _08091DBC
+ movs r5, 0x50
+ movs r4, 0xEF
+_08091D40:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ movs r2, 0xA
+ bl sub_8094924
+ adds r5, 0x2
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091D40
+ ldr r6, _08091DBC
+ movs r5, 0x8C
+ lsls r5, 2
+ movs r4, 0x7
+_08091D5C:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ bl sub_8091DC0
+ adds r5, 0x4
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091D5C
+ ldr r6, _08091DBC
+ movs r5, 0x94
+ lsls r5, 2
+ movs r4, 0x3
+_08091D76:
+ ldr r1, [r6]
+ adds r1, r5
+ mov r0, sp
+ bl sub_8091DC0
+ adds r5, 0x4
+ subs r4, 0x1
+ cmp r4, 0
+ bge _08091D76
+ ldr r4, _08091DBC
+ ldr r1, [r4]
+ movs r0, 0x98
+ lsls r0, 2
+ adds r1, r0
+ mov r0, sp
+ movs r2, 0x18
+ bl sub_8094924
+ ldr r1, [r4]
+ movs r0, 0x99
+ lsls r0, 2
+ adds r1, r0
+ mov r0, sp
+ movs r2, 0x18
+ bl sub_8094924
+ mov r0, sp
+ bl nullsub_102
+ ldr r0, [sp, 0x8]
+ add sp, 0x10
+ pop {r4-r6}
+ pop {r1}
+ bx r1
+ .align 2, 0
+_08091DBC: .4byte gTeamInventory_203B460
+ thumb_func_end sub_8091D14
+
+ thumb_func_start sub_8091DC0
+sub_8091DC0:
+ push {r4,r5,lr}
+ adds r5, r0, 0
+ adds r4, r1, 0
+ movs r2, 0x8
+ bl sub_8094924
+ adds r4, 0x1
+ adds r0, r5, 0
+ adds r1, r4, 0
+ movs r2, 0x7
+ bl sub_8094924
+ pop {r4,r5}
+ pop {r0}
+ bx r0
+ thumb_func_end sub_8091DC0
+
+ thumb_func_start sub_8091DE0
+sub_8091DE0:
+ push {r4,r5,lr}
+ adds r5, r0, 0
+ adds r4, r1, 0
+ movs r2, 0x8
+ bl sub_809488C
+ adds r4, 0x1
+ adds r0, r5, 0
+ adds r1, r4, 0
+ movs r2, 0x7
+ bl sub_809488C
+ pop {r4,r5}
+ pop {r0}
+ bx r0
+ thumb_func_end sub_8091DE0
+
+ thumb_func_start sub_8091E00
+sub_8091E00:
+ push {r4,r5,lr}
+ adds r4, r0, 0
+ adds r5, r1, 0
+ movs r2, 0x8
+ bl sub_8094924
+ adds r1, r5, 0x1
+ adds r0, r4, 0
+ movs r2, 0x7
+ bl sub_8094924
+ adds r5, 0x2
+ adds r0, r4, 0
+ adds r1, r5, 0
+ movs r2, 0x8
+ bl sub_8094924
+ pop {r4,r5}
+ pop {r0}
+ bx r0
+ thumb_func_end sub_8091E00
+
+ thumb_func_start sub_8091E28
+sub_8091E28:
+ push {r4,r5,lr}
+ adds r4, r0, 0
+ adds r5, r1, 0
+ movs r2, 0x8
+ bl sub_809488C
+ adds r1, r5, 0x1
+ adds r0, r4, 0
+ movs r2, 0x7
+ bl sub_809488C
+ adds r5, 0x2
+ adds r0, r4, 0
+ adds r1, r5, 0
+ movs r2, 0x8
+ bl sub_809488C
+ pop {r4,r5}
+ pop {r0}
+ bx r0
+ thumb_func_end sub_8091E28
+
+ thumb_func_start sub_8091E50
+sub_8091E50:
+ lsls r0, 24
+ ldr r1, _08091E5C
+ lsrs r0, 22
+ adds r0, r1
+ ldr r0, [r0]
+ bx lr
+ .align 2, 0
+_08091E5C: .4byte gUnknown_810AF50
+ thumb_func_end sub_8091E50
+
+ thumb_func_start sub_8091E60
+sub_8091E60:
+ push {r4,lr}
+ lsls r0, 24
+ lsrs r3, r0, 24
+ lsls r0, r1, 24
+ lsrs r4, r0, 24
+ cmp r3, 0x3E
+ bhi _08091E8C
+ ldr r2, _08091E88
+ lsrs r0, 27
+ lsls r1, r3, 5
+ adds r0, r1
+ adds r0, r2
+ ldrb r0, [r0]
+ movs r1, 0x7
+ ands r1, r4
+ asrs r0, r1
+ movs r1, 0x1
+ ands r0, r1
+ b _08091E8E
+ .align 2, 0
+_08091E88: .4byte gUnknown_8108F64
+_08091E8C:
+ movs r0, 0
+_08091E8E:
+ pop {r4}
+ pop {r1}
+ bx r1
+ thumb_func_end sub_8091E60
+
+ thumb_func_start sub_8091E94
+sub_8091E94:
+ push {r4-r7,lr}
+ mov r7, r10
+ mov r6, r9
+ mov r5, r8
+ push {r5-r7}
+ ldr r4, _08091EE4
+ add sp, r4
+ mov r8, r1
+ mov r10, r2
+ ldr r1, _08091EE8
+ subs r0, 0x1
+ lsls r0, 2
+ adds r0, r1
+ movs r3, 0
+ add r1, sp, 0x18
+ mov r9, r1
+ ldr r2, _08091EEC
+ mov r12, r2
+ add r6, sp, 0x1F8
+ ldr r2, [r0]
+ adds r7, r6, 0
+ movs r4, 0
+_08091EC0:
+ ldrh r1, [r2]
+ cmp r1, r12
+ bls _08091EF4
+ ldrh r0, [r2]
+ ldr r1, _08091EF0
+ adds r0, r1
+ cmp r0, 0
+ beq _08091EFC
+ movs r5, 0
+ adds r1, r7, r4
+_08091ED4:
+ strh r5, [r1]
+ adds r1, 0x2
+ adds r4, 0x2
+ adds r3, 0x1
+ subs r0, 0x1
+ cmp r0, 0
+ bne _08091ED4
+ b _08091EFC
+ .align 2, 0
+_08091EE4: .4byte 0xfffffc10
+_08091EE8: .4byte gUnknown_8108E58
+_08091EEC: .4byte 0x0000752f
+_08091EF0: .4byte 0xffff8ad0
+_08091EF4:
+ adds r0, r6, r4
+ strh r1, [r0]
+ adds r4, 0x2
+ adds r3, 0x1
+_08091EFC:
+ adds r2, 0x2
+ cmp r3, 0xFB
+ ble _08091EC0
+ movs r3, 0xB
+ add r2, sp, 0x1F8
+ mov r1, sp
+_08091F08:
+ ldrh r0, [r2]
+ strh r0, [r1]
+ adds r2, 0x2
+ adds r1, 0x2
+ subs r3, 0x1
+ cmp r3, 0
+ bge _08091F08
+ mov r2, r9
+ add r1, sp, 0x210
+ movs r3, 0xEF
+_08091F1C:
+ ldrh r0, [r1]
+ strh r0, [r2]
+ adds r1, 0x2
+ adds r2, 0x2
+ subs r3, 0x1
+ cmp r3, 0
+ bge _08091F1C
+ movs r7, 0xC
+ movs r6, 0
+ mov r0, sp
+ movs r2, 0
+ ldrsh r0, [r0, r2]
+ cmp r0, 0
+ beq _08091F4A
+ mov r0, sp
+ movs r1, 0
+ ldrsh r0, [r0, r1]
+ cmp r0, r8
+ blt _08091F4A
+ movs r7, 0
+ b _08091F66
+_08091F46:
+ mov r8, r5
+ b _08091F9C
+_08091F4A:
+ adds r6, 0x1
+ cmp r6, 0xB
+ bgt _08091F66
+ lsls r0, r6, 1
+ mov r2, sp
+ adds r1, r2, r0
+ movs r2, 0
+ ldrsh r0, [r1, r2]
+ cmp r0, 0
+ beq _08091F4A
+ cmp r0, r8
+ blt _08091F4A
+ lsls r0, r6, 24
+ lsrs r7, r0, 24
+_08091F66:
+ movs r0, 0x46
+ mov r8, r0
+ cmp r7, 0xC
+ beq _08091F9C
+ movs r6, 0
+ mov r4, r9
+_08091F72:
+ movs r1, 0
+ ldrsh r0, [r4, r1]
+ cmp r0, 0
+ beq _08091F94
+ lsls r0, r6, 24
+ lsrs r5, r0, 24
+ adds r0, r5, 0
+ bl GetItemType
+ lsls r0, 24
+ lsrs r0, 24
+ cmp r0, r7
+ bne _08091F94
+ movs r2, 0
+ ldrsh r0, [r4, r2]
+ cmp r0, r10
+ bge _08091F46
+_08091F94:
+ adds r4, 0x2
+ adds r6, 0x1
+ cmp r6, 0xEF
+ ble _08091F72
+_08091F9C:
+ mov r0, r8
+ movs r3, 0xFC
+ lsls r3, 2
+ add sp, r3
+ pop {r3-r5}
+ mov r8, r3
+ mov r9, r4
+ mov r10, r5
+ pop {r4-r7}
+ pop {r1}
+ bx r1
+ thumb_func_end sub_8091E94
+
+ thumb_func_start sub_8091FB4
+sub_8091FB4:
+ push {r4-r6,lr}
+ movs r6, 0
+_08091FB8:
+ ldr r0, _08092038
+ lsls r1, r6, 2
+ ldr r0, [r0]
+ adds r4, r0, r1
+ ldrb r1, [r4]
+ movs r0, 0x1
+ ands r0, r1
+ cmp r0, 0
+ beq _08091FE8
+ movs r0, 0xF7
+ ands r0, r1
+ movs r5, 0
+ strb r0, [r4]
+ ldrb r0, [r4, 0x2]
+ cmp r0, 0x69
+ bne _08091FE8
+ adds r0, r4, 0
+ bl GetMoneyValue
+ bl AddToTeamMoney
+ strb r5, [r4, 0x2]
+ strb r5, [r4, 0x1]
+ strb r5, [r4]
+_08091FE8:
+ adds r6, 0x1
+ cmp r6, 0x13
+ ble _08091FB8
+ bl FillInventoryGaps
+ movs r6, 0
+_08091FF4:
+ movs r0, 0x58
+ adds r1, r6, 0
+ muls r1, r0
+ ldr r0, _0809203C
+ ldr r0, [r0]
+ adds r2, r1, r0
+ ldrb r1, [r2]
+ movs r0, 0x1
+ ands r0, r1
+ cmp r0, 0
+ beq _08092026
+ adds r4, r2, 0
+ adds r4, 0x28
+ ldrb r0, [r4]
+ cmp r0, 0
+ beq _08092026
+ cmp r0, 0x69
+ bne _08092026
+ adds r0, r4, 0
+ bl GetMoneyValue2
+ bl AddToTeamMoney
+ movs r0, 0
+ strb r0, [r4]
+_08092026:
+ adds r6, 0x1
+ movs r0, 0xCE
+ lsls r0, 1
+ cmp r6, r0
+ ble _08091FF4
+ pop {r4-r6}
+ pop {r0}
+ bx r0
+ .align 2, 0
+_08092038: .4byte gTeamInventory_203B460
+_0809203C: .4byte gRecruitedPokemonRef
+ thumb_func_end sub_8091FB4
+
+ .align 2,0
diff --git a/asm/kangaskhan_storage.s b/asm/kangaskhan_storage.s
index cdd121a..58d18fd 100644
--- a/asm/kangaskhan_storage.s
+++ b/asm/kangaskhan_storage.s
@@ -389,7 +389,7 @@ _0801731C:
_0801733C: .4byte gUnknown_203B208
_08017340: .4byte gUnknown_80D5404
_08017344:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _0801735C
bl sub_801A928
@@ -508,7 +508,7 @@ _08017404:
movs r0, 0x63
b _0801743A
.align 2, 0
-_08017430: .4byte gUnknown_203B460
+_08017430: .4byte gTeamInventory_203B460
_08017434:
adds r1, r2, 0
adds r1, 0xB4
@@ -634,7 +634,7 @@ _08017530:
lsls r0, 24
cmp r0, 0
bne _08017544
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _08017554
_08017544:
diff --git a/asm/kangaskhan_storage_1.s b/asm/kangaskhan_storage_1.s
index 190c3ce..29c152c 100644
--- a/asm/kangaskhan_storage_1.s
+++ b/asm/kangaskhan_storage_1.s
@@ -328,7 +328,7 @@ _08017858:
beq _080178BA
b _080178C8
_08017862:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08017872
movs r0, 0x5
@@ -357,7 +357,7 @@ _0801788E:
bl UpdateKangaskhanStorageState
b _080178C8
_080178A2:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080178B2
movs r0, 0x6
@@ -407,8 +407,8 @@ _080178F4:
bl sub_80917B8
ldr r0, [r4]
ldr r0, [r0, 0x10]
- bl sub_80911F8
- bl sub_80910B4
+ bl ShiftItemsDownFrom
+ bl FillInventoryGaps
movs r0, 0x13
bl UpdateKangaskhanStorageState
b _0801791E
@@ -475,7 +475,7 @@ _0801794C:
bl UpdateKangaskhanStorageState
b _080179A2
.align 2, 0
-_0801798C: .4byte gUnknown_203B460
+_0801798C: .4byte gTeamInventory_203B460
_08017990: .4byte gUnknown_203B208
_08017994: .4byte 0xffffff00
_08017998: .4byte 0xffff00ff
@@ -531,13 +531,13 @@ _080179F2:
adds r5, 0x1
cmp r5, 0x13
ble _080179D2
- bl sub_80910B4
+ bl FillInventoryGaps
bl sub_801AE84
movs r0, 0x13
bl UpdateKangaskhanStorageState
b _08017A12
.align 2, 0
-_08017A08: .4byte gUnknown_203B460
+_08017A08: .4byte gTeamInventory_203B460
_08017A0C:
movs r0, 0xE
bl UpdateKangaskhanStorageState
@@ -585,7 +585,7 @@ _08017A44:
str r0, [sp, 0x4]
add r4, sp, 0x4
ldrb r0, [r4]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08017AA2
@@ -606,7 +606,7 @@ _08017A44:
.align 2, 0
_08017A88: .4byte 0xffff00ff
_08017A8C: .4byte 0xffffff00
-_08017A90: .4byte gUnknown_203B460
+_08017A90: .4byte gTeamInventory_203B460
_08017A94:
lsls r1, 24
lsrs r1, 16
@@ -643,13 +643,13 @@ _08017ACE:
adds r5, 0x1
cmp r5, 0xEF
ble _08017A44
- bl sub_80910B4
+ bl FillInventoryGaps
bl sub_801CF94
movs r0, 0x1D
bl UpdateKangaskhanStorageState
b _08017AEE
.align 2, 0
-_08017AE4: .4byte gUnknown_203B460
+_08017AE4: .4byte gTeamInventory_203B460
_08017AE8:
movs r0, 0x17
bl UpdateKangaskhanStorageState
diff --git a/asm/kangaskhan_storage_2.s b/asm/kangaskhan_storage_2.s
index efdac5f..58c8bc6 100644
--- a/asm/kangaskhan_storage_2.s
+++ b/asm/kangaskhan_storage_2.s
@@ -24,7 +24,7 @@ sub_80182E4:
str r0, [r1, 0x20]
movs r0, 0x2
str r0, [r1, 0x24]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
beq _0801831C
movs r0, 0
@@ -59,7 +59,7 @@ _08018324:
lsls r0, 24
cmp r0, 0
bne _08018358
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _08018366
_08018358:
@@ -276,7 +276,7 @@ sub_80184D4:
str r0, [r1, 0x20]
movs r0, 0x3
str r0, [r1, 0x24]
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _08018500
ldr r0, [r4]
@@ -394,7 +394,7 @@ _080185C8:
beq _080185EA
b _08018616
_080185CE:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
beq _080185F6
movs r0, 0
@@ -476,9 +476,9 @@ _0801866A:
adds r5, 0x1
cmp r5, 0x13
ble _0801864A
- bl sub_80910B4
+ bl FillInventoryGaps
bl sub_801AE84
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _08018690
bl sub_801A928
@@ -486,7 +486,7 @@ _0801866A:
bl sub_8017F10
b _080186F2
.align 2, 0
-_0801868C: .4byte gUnknown_203B460
+_0801868C: .4byte gTeamInventory_203B460
_08018690:
movs r0, 0x5
bl sub_8017F10
@@ -507,7 +507,7 @@ _08018698:
b _080186F2
.align 2, 0
_080186B8: .4byte gUnknown_203B20C
-_080186BC: .4byte gUnknown_203B460
+_080186BC: .4byte gTeamInventory_203B460
_080186C0:
bl sub_801A8AC
ldr r1, _080186E0
@@ -524,7 +524,7 @@ _080186C0:
b _080186F2
.align 2, 0
_080186E0: .4byte gUnknown_203B20C
-_080186E4: .4byte gUnknown_203B460
+_080186E4: .4byte gTeamInventory_203B460
_080186E8:
bl sub_801A928
movs r0, 0x1
@@ -578,7 +578,7 @@ _0801872C:
orrs r0, r4
str r0, [sp]
ldrb r0, [r5]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08018786
@@ -599,7 +599,7 @@ _0801872C:
.align 2, 0
_0801876C: .4byte 0xffff00ff
_08018770: .4byte 0xffffff00
-_08018774: .4byte gUnknown_203B460
+_08018774: .4byte gTeamInventory_203B460
_08018778:
lsls r1, 24
lsrs r1, 16
@@ -636,21 +636,21 @@ _080187B2:
adds r6, 0x1
cmp r6, 0xEF
ble _0801872C
- bl sub_80910B4
+ bl FillInventoryGaps
bl sub_801CF94
movs r0, 0x1
bl sub_801CF14
lsls r0, 24
cmp r0, 0
bne _08018838
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
bgt _08018838
movs r0, 0xB
bl sub_8017F10
b _0801884A
.align 2, 0
-_080187DC: .4byte gUnknown_203B460
+_080187DC: .4byte gTeamInventory_203B460
_080187E0:
bl sub_801CB24
ldr r4, _08018808
@@ -760,7 +760,7 @@ sub_8018854:
lsls r0, 24
cmp r0, 0
bne _080188D2
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080188F0
_080188D2:
@@ -770,7 +770,7 @@ _080188D2:
b _080188FC
.align 2, 0
_080188E0: .4byte gUnknown_203B20C
-_080188E4: .4byte gUnknown_203B460
+_080188E4: .4byte gTeamInventory_203B460
_080188E8: .4byte 0xffffff00
_080188EC: .4byte 0xffff00ff
_080188F0:
@@ -828,7 +828,7 @@ _0801894E:
ldr r4, _08018978
ldr r0, [r4]
ldrb r0, [r0, 0xA]
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _0801896C
@@ -852,9 +852,9 @@ _0801897C:
bl sub_80917B8
ldr r0, [r4]
ldr r0, [r0, 0xC]
- bl sub_80911F8
- bl sub_80910B4
- bl sub_8090A34
+ bl ShiftItemsDownFrom
+ bl FillInventoryGaps
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080189A4
bl sub_801A928
@@ -920,7 +920,7 @@ _08018A0C:
beq _08018AB0
b _08018ABE
_08018A12:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _08018A2C
ldr r0, _08018A28
@@ -935,7 +935,7 @@ _08018A2C:
ldr r4, _08018A44
ldr r0, [r4]
ldrb r0, [r0, 0xA]
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _08018A48
@@ -975,7 +975,7 @@ _08018A48:
lsls r0, 24
cmp r0, 0
bne _08018A90
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _08018AA8
_08018A90:
@@ -984,7 +984,7 @@ _08018A90:
bl sub_8017F10
b _08018ABE
.align 2, 0
-_08018A9C: .4byte gUnknown_203B460
+_08018A9C: .4byte gTeamInventory_203B460
_08018AA0: .4byte 0xffffff00
_08018AA4: .4byte 0xffff00ff
_08018AA8:
diff --git a/asm/kecleon_items.s b/asm/kecleon_items.s
index 1902345..044ae99 100644
--- a/asm/kecleon_items.s
+++ b/asm/kecleon_items.s
@@ -489,7 +489,7 @@ _080192B4:
.align 2, 0
_080192BC: .4byte gUnknown_203B210
_080192C0:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080192EC
ldr r0, _080192D8
@@ -636,7 +636,7 @@ _080193F4:
bl sub_801B3C0
b _080194E8
_080193FE:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
beq _08019418
ldr r0, _08019424
@@ -655,7 +655,7 @@ _08019418:
movs r0, 0x1
b _08019436
.align 2, 0
-_08019424: .4byte gUnknown_203B460
+_08019424: .4byte gTeamInventory_203B460
_08019428: .4byte 0x0001869e
_0801942C: .4byte gUnknown_203B210
_08019430:
@@ -1099,7 +1099,7 @@ _08019784:
bl UpdateKecleonStoreState
b _0801984A
_08019794:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0x13
ble _080197A4
movs r0, 0xA
@@ -1110,7 +1110,7 @@ _080197A4:
bl UpdateKecleonStoreState
b _0801984A
_080197AC:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
beq _080197EC
ldr r0, _080197D8
@@ -1132,10 +1132,10 @@ _080197AC:
b _0801984A
.align 2, 0
_080197D8: .4byte gUnknown_203B210
-_080197DC: .4byte gUnknown_203B460
+_080197DC: .4byte gTeamInventory_203B460
_080197E0: .4byte 0x0001869e
_080197E4:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _080197F4
_080197EC:
@@ -1171,7 +1171,7 @@ _08019822:
bl UpdateKecleonStoreState
b _0801984A
.align 2, 0
-_0801982C: .4byte gUnknown_203B460
+_0801982C: .4byte gTeamInventory_203B460
_08019830: .4byte 0x0001869f
_08019834:
movs r0, 0x1F
@@ -1215,7 +1215,7 @@ _08019874:
ldr r0, [r4]
ldr r0, [r0, 0x10]
negs r0, r0
- bl sub_80913A0
+ bl AddToTeamMoney
ldr r1, [r4]
ldrb r0, [r1, 0x4]
cmp r0, 0
@@ -1285,10 +1285,10 @@ _0801990C:
ldr r4, _08019930
ldr r0, [r4]
ldr r0, [r0, 0x10]
- bl sub_80913A0
+ bl AddToTeamMoney
ldr r0, [r4]
ldr r0, [r0, 0x24]
- bl sub_80911F8
+ bl ShiftItemsDownFrom
movs r0, 0xA6
lsls r0, 1
bl PlaySound
@@ -1340,21 +1340,21 @@ _0801996C:
cmp r0, 0
beq _0801998E
ldrb r0, [r2, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0801998E
adds r0, r4, 0
- bl sub_8091234
+ bl ClearItemSlotAt
_0801998E:
adds r4, 0x1
cmp r4, 0x13
ble _0801996C
- bl sub_80910B4
+ bl FillInventoryGaps
ldr r0, _080199B8
ldr r0, [r0]
ldr r0, [r0, 0x18]
- bl sub_80913A0
+ bl AddToTeamMoney
movs r0, 0xA6
lsls r0, 1
bl PlaySound
@@ -1362,7 +1362,7 @@ _0801998E:
bl UpdateKecleonStoreState
b _080199C2
.align 2, 0
-_080199B4: .4byte gUnknown_203B460
+_080199B4: .4byte gTeamInventory_203B460
_080199B8: .4byte gUnknown_203B210
_080199BC:
movs r0, 0x1
@@ -1445,7 +1445,7 @@ _08019A3C:
strb r0, [r1, 0x1D]
ldr r0, [r4]
adds r0, 0x1C
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, [r4]
str r0, [r1, 0x10]
movs r0, 0x14
@@ -1492,7 +1492,7 @@ _08019AA4:
strb r0, [r1, 0x1D]
ldr r0, [r4]
adds r0, 0x1C
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, [r4]
str r0, [r1, 0x10]
movs r0, 0x15
diff --git a/asm/other_menus.s b/asm/other_menus.s
index 6cefea7..676ba9a 100644
--- a/asm/other_menus.s
+++ b/asm/other_menus.s
@@ -1299,7 +1299,7 @@ _08037E5A:
ldrb r0, [r4]
b _08037E76
.align 2, 0
-_08037E6C: .4byte gUnknown_203B460
+_08037E6C: .4byte gTeamInventory_203B460
_08037E70:
ldr r0, _08037E8C
ldr r1, [r0]
@@ -1316,7 +1316,7 @@ _08037E76:
pop {r0}
bx r0
.align 2, 0
-_08037E8C: .4byte gUnknown_203B460
+_08037E8C: .4byte gTeamInventory_203B460
thumb_func_end sub_8037E38
thumb_func_start sub_8037E90
@@ -1543,7 +1543,7 @@ _08038036:
ldrb r0, [r4]
b _08038052
.align 2, 0
-_08038048: .4byte gUnknown_203B460
+_08038048: .4byte gTeamInventory_203B460
_0803804C:
ldr r0, _08038070
ldr r1, [r0]
@@ -1566,7 +1566,7 @@ _08038068:
pop {r1}
bx r1
.align 2, 0
-_08038070: .4byte gUnknown_203B460
+_08038070: .4byte gTeamInventory_203B460
_08038074: .4byte 0x000003e7
thumb_func_end sub_8038014
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index a008794..50a9aec 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -1094,7 +1094,7 @@ _0808F5C8:
b _0808F5E6
_0808F5D0:
ldrb r0, [r7, 0x4]
- bl sub_8091130
+ bl FindItemInInventory
cmp r0, 0
bge _0808F5E6
ldrh r0, [r4, 0x4]
@@ -1184,7 +1184,7 @@ _0808F666:
_0808F670:
movs r0, 0x31
_0808F672:
- bl sub_8091130
+ bl FindItemInInventory
cmp r0, 0
bge _0808F6CA
ldrh r0, [r4, 0x4]
@@ -1225,7 +1225,7 @@ _0808F6A4:
b _0808F6DE
_0808F6BC:
movs r0, 0x2F
- bl sub_8091130
+ bl FindItemInInventory
cmp r0, 0
bge _0808F6CA
movs r0, 0x1
@@ -1484,7 +1484,7 @@ _0808F8A0:
str r5, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r4, _0808F99C
mov r1, r10
ldr r0, [r1, 0x2C]
@@ -1497,7 +1497,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xA
add r9, r2
ldr r0, _0808F9A4
@@ -1506,7 +1506,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r3, 0xA
add r9, r3
mov r0, r10
@@ -1529,7 +1529,7 @@ _0808F8A0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808F914:
movs r3, 0xC
add r9, r3
@@ -1544,7 +1544,7 @@ _0808F914:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xA
add r9, r2
ldr r0, _0808F9B0
@@ -1553,7 +1553,7 @@ _0808F914:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _0808F9B4
ldr r2, [r0]
mov r0, r10
@@ -1574,7 +1574,7 @@ _0808F964:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r1, r10
adds r1, 0x3B
ldrb r3, [r1]
@@ -1592,7 +1592,7 @@ _0808F964:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0808F9D8
.align 2, 0
_0808F998: .4byte gUnknown_8107754
@@ -1616,7 +1616,7 @@ _0808F9C0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808F9D8:
movs r3, 0xA
add r9, r3
@@ -1627,7 +1627,7 @@ _0808F9D8:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r0, _0808FA4C
ldr r2, [r0]
ldr r4, _0808FA50
@@ -1649,7 +1649,7 @@ _0808FA0E:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r1, r10
adds r1, 0x3C
ldrb r3, [r1]
@@ -1667,7 +1667,7 @@ _0808FA0E:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0808FA74
.align 2, 0
_0808FA44: .4byte gUnknown_810DE38
@@ -1687,7 +1687,7 @@ _0808FA5C:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808FA74:
movs r0, 0xA
add r9, r0
@@ -1719,7 +1719,7 @@ _0808FAA6:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r1, 0xC
add r9, r1
ldr r1, _0808FB30
@@ -1754,7 +1754,7 @@ _0808FAE0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xA
add r9, r2
mov r0, r10
@@ -1789,13 +1789,13 @@ _0808FB44:
str r4, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r2, _0808FBEC
str r4, [sp]
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r3, r10
ldrb r0, [r3, 0x16]
bl GetFormattedTypeString
@@ -1804,7 +1804,7 @@ _0808FB44:
movs r0, 0x38
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r1, r10
ldrb r0, [r1, 0x17]
cmp r0, 0
@@ -1815,7 +1815,7 @@ _0808FB44:
movs r0, 0x60
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808FB94:
movs r2, 0xC
add r9, r2
@@ -1824,7 +1824,7 @@ _0808FB94:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r3, 0xC
add r9, r3
mov r1, r10
@@ -1867,7 +1867,7 @@ _0808FBF4:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r0, r10
adds r0, 0x56
movs r1, 0
@@ -1915,7 +1915,7 @@ _0808FC38:
movs r0, 0xC
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
mov r0, r8
cmp r0, 0
ble _0808FC78
@@ -1960,7 +1960,7 @@ _0808FCB0:
movs r1, 0
str r1, [sp]
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
add r4, sp, 0x14
mov r0, r10
movs r2, 0x3E
@@ -2044,7 +2044,7 @@ _0808FD64:
movs r0, 0xC
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808FD74:
movs r2, 0x1
add r8, r2
@@ -2071,7 +2071,7 @@ _0808FD98:
movs r0, 0xC
movs r1, 0x20
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0808FED6
.align 2, 0
_0808FDA4: .4byte gUnknown_810778C
@@ -2085,7 +2085,7 @@ _0808FDB0:
str r5, [sp]
movs r1, 0
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
ldr r6, _0808FEF0
mov r2, r10
movs r3, 0
@@ -2103,7 +2103,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0xA
add r9, r0
mov r1, r10
@@ -2124,7 +2124,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r3, 0xA
add r9, r3
ldr r0, _0808FF04
@@ -2133,7 +2133,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r0, 0xD
add r9, r0
ldr r0, _0808FF08
@@ -2142,7 +2142,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r1, 0xA
add r9, r1
mov r1, r10
@@ -2155,7 +2155,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xD
add r9, r2
mov r3, r10
@@ -2172,7 +2172,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xD
add r9, r2
ldr r4, _0808FF14
@@ -2192,7 +2192,7 @@ _0808FDB0:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
movs r2, 0xD
add r9, r2
ldr r1, _0808FF1C
@@ -2207,7 +2207,7 @@ _0808FECC:
movs r0, 0x4
mov r1, r9
ldr r3, [sp, 0x50]
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0808FED6:
ldr r0, [sp, 0x50]
bl sub_80073E0
diff --git a/asm/pokemon_square.s b/asm/pokemon_square.s
index c2618bc..c09d8bc 100644
--- a/asm/pokemon_square.s
+++ b/asm/pokemon_square.s
@@ -132,7 +132,7 @@ _08019F24:
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _08019F70
ldr r1, [r1]
movs r2, 0x98
@@ -147,7 +147,7 @@ _08019F24:
.align 2, 0
_08019F68: .4byte 0xff00ffff
_08019F6C: .4byte 0xffff00ff
-_08019F70: .4byte gUnknown_203B460
+_08019F70: .4byte gTeamInventory_203B460
_08019F74:
movs r0, 0
bl PlayMenuSoundEffect
@@ -406,7 +406,7 @@ _0801A122:
adds r2, r5, 0
bl sub_8090E14
adds r0, r4, 0
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _0801A1B8
ldr r1, [r1]
movs r2, 0x98
@@ -433,7 +433,7 @@ _0801A1A8: .4byte gUnknown_80DB8E4
_0801A1AC: .4byte 0xff00ffff
_0801A1B0: .4byte 0xffff00ff
_0801A1B4: .4byte 0xffffff00
-_0801A1B8: .4byte gUnknown_203B460
+_0801A1B8: .4byte gTeamInventory_203B460
_0801A1BC:
mov r0, r8
ldr r1, _0801A204
@@ -600,7 +600,7 @@ _0801A2F0:
orrs r1, r0
str r1, [sp]
mov r0, sp
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _0801A33C
ldr r1, [r1]
movs r2, 0x98
@@ -615,7 +615,7 @@ _0801A2F0:
.align 2, 0
_0801A334: .4byte 0xff00ffff
_0801A338: .4byte 0xffff00ff
-_0801A33C: .4byte gUnknown_203B460
+_0801A33C: .4byte gTeamInventory_203B460
_0801A340:
movs r0, 0
bl PlayMenuSoundEffect
@@ -874,7 +874,7 @@ _0801A4EE:
adds r2, r5, 0
bl sub_8090E14
adds r0, r4, 0
- bl sub_8090C7C
+ bl GetStackBuyPrice
ldr r1, _0801A584
ldr r1, [r1]
movs r2, 0x98
@@ -901,7 +901,7 @@ _0801A574: .4byte gUnknown_80DB92C
_0801A578: .4byte 0xff00ffff
_0801A57C: .4byte 0xffff00ff
_0801A580: .4byte 0xffffff00
-_0801A584: .4byte gUnknown_203B460
+_0801A584: .4byte gTeamInventory_203B460
_0801A588:
mov r0, r8
ldr r1, _0801A5D0
@@ -951,7 +951,7 @@ sub_801A5D8:
adds r6, r1, 0
adds r7, r2, 0
mov r8, r3
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r0, 0
bne _0801A5F2
movs r0, 0
@@ -968,7 +968,7 @@ _0801A5F2:
_0801A604:
ldr r0, [r5]
str r4, [r0]
- bl sub_80910B4
+ bl FillInventoryGaps
bl sub_801AE84
ldr r0, [r5]
adds r1, r0, 0
@@ -1032,7 +1032,7 @@ _0801A66E:
bl sub_800641C
ldr r4, [r5]
adds r4, 0x54
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
adds r1, r0, 0
adds r0, r4, 0
mov r2, r8
@@ -1167,12 +1167,12 @@ _0801A7AC:
str r0, [sp]
mov r0, sp
ldrb r0, [r0, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
cmp r0, 0
beq _0801A7F4
mov r0, sp
- bl sub_8090CCC
+ bl GetStackSellPrice
ldr r1, [r5]
movs r2, 0x98
lsls r2, 2
@@ -1187,7 +1187,7 @@ _0801A7E2:
bl PlayMenuSoundEffect
b _0801A802
.align 2, 0
-_0801A7EC: .4byte gUnknown_203B460
+_0801A7EC: .4byte gTeamInventory_203B460
_0801A7F0: .4byte 0x0001869f
_0801A7F4:
movs r0, 0x2
@@ -1316,8 +1316,8 @@ sub_801A8D0:
movs r1, 0
movs r2, 0
bl sub_800641C
- bl sub_80910B4
- bl sub_8090A34
+ bl FillInventoryGaps
+ bl GetNumberOfFilledInventorySlots
adds r1, r0, 0
ldr r0, [r5]
adds r2, r0, 0
@@ -1522,7 +1522,7 @@ _0801AA90:
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_0801AA9C: .4byte gUnknown_203B460
+_0801AA9C: .4byte gTeamInventory_203B460
_0801AAA0: .4byte _0801AAA4
.align 2, 0
_0801AAA4:
@@ -1632,7 +1632,7 @@ _0801AB88: .4byte gUnknown_202DE58
_0801AB8C: .4byte gUnknown_80DB994
_0801AB90:
ldrb r0, [r4, 0x2]
- bl sub_80914E4
+ bl CanSellItem
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -1651,7 +1651,7 @@ _0801AB90:
adds r1, r4, 0
bl sub_8090E14
adds r0, r4, 0
- bl sub_8090CCC
+ bl GetStackSellPrice
ldr r1, _0801AC00
ldr r1, [r1]
movs r2, 0x98
@@ -1682,7 +1682,7 @@ _0801AB90:
bl xxx_call_draw_string
b _0801ACC4
.align 2, 0
-_0801AC00: .4byte gUnknown_203B460
+_0801AC00: .4byte gTeamInventory_203B460
_0801AC04: .4byte 0x0001869f
_0801AC08: .4byte gUnknown_80DB9A0
_0801AC0C: .4byte gUnknown_203B224
@@ -1708,7 +1708,7 @@ _0801AC10:
str r5, [sp]
_0801AC3C:
movs r0, 0x8
- bl sub_8014FF0
+ bl xxx_format_and_draw
b _0801ACC4
.align 2, 0
_0801AC44: .4byte gUnknown_202DE58
@@ -1768,7 +1768,7 @@ _0801AC9C:
ldr r3, [r0]
str r5, [sp]
movs r0, 0x8
- bl sub_8014FF0
+ bl xxx_format_and_draw
_0801ACC4:
mov r0, r8
bl sub_801AED0
@@ -1840,7 +1840,7 @@ sub_801AD34:
movs r1, 0
adds r3, r4, 0
bl xxx_call_draw_string
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
adds r2, r0, 0
movs r5, 0x7
str r5, [sp]
@@ -1883,12 +1883,12 @@ sub_801ADA0:
ldr r6, [r1]
lsls r4, r6, 8
lsrs r0, r4, 24
- bl sub_8091524
+ bl IsNotMoneyOrUsedTMItem
lsls r0, 24
cmp r0, 0
beq _0801AE12
lsrs r0, r4, 24
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _0801ADF4
@@ -1910,7 +1910,7 @@ sub_801ADA0:
ldr r1, _0801ADF0
b _0801AE0E
.align 2, 0
-_0801ADEC: .4byte gUnknown_203B460
+_0801ADEC: .4byte gTeamInventory_203B460
_0801ADF0: .4byte 0x000003e7
_0801ADF4:
lsrs r0, r4, 24
@@ -1965,7 +1965,7 @@ _0801AE2E:
lsrs r0, r1, 24
cmp r0, r7
bne _0801AE72
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _0801AE6C
@@ -1976,7 +1976,7 @@ _0801AE2E:
b _0801AE6E
.align 2, 0
_0801AE64: .4byte gUnknown_203B224
-_0801AE68: .4byte gUnknown_203B460
+_0801AE68: .4byte gTeamInventory_203B460
_0801AE6C:
adds r0, r5, 0x1
_0801AE6E:
@@ -1985,7 +1985,7 @@ _0801AE6E:
_0801AE72:
adds r6, 0x1
_0801AE74:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r6, r0
blt _0801AE2E
adds r0, r5, 0
@@ -2131,12 +2131,12 @@ _0801AF4C:
_0801AF6C:
adds r7, 0x1
_0801AF6E:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
cmp r7, r0
blt _0801AF12
mov r9, r8
_0801AF78:
- bl sub_8090A34
+ bl GetNumberOfFilledInventorySlots
subs r0, 0x1
cmp r9, r0
blt _0801AF08
@@ -2148,7 +2148,7 @@ _0801AF78:
pop {r0}
bx r0
.align 2, 0
-_0801AF90: .4byte gUnknown_203B460
+_0801AF90: .4byte gTeamInventory_203B460
_0801AF94: .4byte gUnknown_203B224
thumb_func_end sub_801AEF8
diff --git a/asm/wonder_mail_3.s b/asm/wonder_mail_3.s
index df1ab03..501d8b0 100644
--- a/asm/wonder_mail_3.s
+++ b/asm/wonder_mail_3.s
@@ -1443,15 +1443,15 @@ _0802DDFC:
ldr r0, [r5]
ldr r0, [r0, 0x34]
ldrb r0, [r0, 0x10]
- bl sub_8091130
+ bl FindItemInInventory
adds r1, r0, 0
movs r0, 0x1
negs r0, r0
cmp r1, r0
beq _0802DE1A
adds r0, r1, 0
- bl sub_80911F8
- bl sub_80910B4
+ bl ShiftItemsDownFrom
+ bl FillInventoryGaps
_0802DE1A:
ldr r0, _0802DE2C
_0802DE1C:
@@ -4234,7 +4234,7 @@ _0802F3E8:
ldr r0, [r0]
ldr r0, [r0, 0x10]
ldr r0, [r0, 0x18]
- bl sub_80913A0
+ bl AddToTeamMoney
movs r0, 0
bl sub_808D544
cmp r0, 0x1
@@ -4314,7 +4314,7 @@ _0802F494:
beq _0802F4BC
movs r0, 0xFA
lsls r0, 2
- bl sub_80913A0
+ bl AddToTeamMoney
ldr r0, _0802F4B8
b _0802F4DA
.align 2, 0
@@ -4383,7 +4383,7 @@ _0802F524:
lsrs r0, 16
lsls r0, 24
lsrs r0, 24
- bl sub_8090A60
+ bl IsThrowableItem
lsls r0, 24
cmp r0, 0
beq _0802F56C
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 08:06:08 +0000