Synced pmdsky-debug symbols

This commit is contained in:
AnonymousRandomPerson 2023-10-05 18:57:00 -04:00
parent b380312051
commit 76a0769dde
39 changed files with 250 additions and 250 deletions

View File

@ -112,11 +112,11 @@
.public sub_02006BFC
.public sub_02006C8C
.public sub_0200D310
.public sub_0200FFAC
.public sub_0200FFF4
.public ConvertStorageItemAtIdxToBulkItem
.public ConvertStorageItemAtIdxToItem
.public sub_02010044
.public sub_02010154
.public sub_020103AC
.public AddItemToStorage
.public sub_02017CCC
.public sub_02025404
.public sub_0202561C

View File

@ -43,14 +43,14 @@
.public sub_0200D310
.public sub_0200D8E4
.public sub_0200FD48
.public sub_0200FD78
.public sub_0200FFAC
.public sub_0200FFF4
.public CountNbOfItemsInStorage
.public ConvertStorageItemAtIdxToBulkItem
.public ConvertStorageItemAtIdxToItem
.public sub_02010044
.public sub_0201007C
.public sub_02010154
.public sub_020101A0
.public sub_020103AC
.public RemoveItemAtIdxInStorage
.public AddItemToStorage
.public sub_02017CCC
.public sub_02029F88
.public sub_02029FBC
@ -86,6 +86,6 @@
.public sub_02046C78
.public sub_02046D20
.public sub_0204A018
.public sub_02050CE4
.public GetRankStorageSize
.public sub_0206351C
.public UnloadFile

View File

@ -225,8 +225,8 @@
.public sub_0200B3FC
.public sub_0200C4CC
.public sub_0200D310
.public sub_0200F910
.public sub_0200FB54
.public CleanStickyItemsInBag
.public RemoveHolderForItemInBag
.public sub_02017A68
.public sub_02017ACC
.public sub_02017C80

View File

@ -11,7 +11,7 @@
.public _02130214
.public abs
.public AddItemToBagNoHeld
.public AddItemToStorage
.public AddBulkItemToStorage
.public AnimationControlGetAllocForMaxFrame
.public AnyDungeonRequestsDone
.public BAG_ITEMS_PTR_MIRROR
@ -282,14 +282,14 @@
.public RandRange
.public RemoveItemNoHole
.public RemoveItemNoHoleCheck
.public RemoveItemsTypeInStorage
.public RemoveBulkItemInStorage
.public Render3dElement64
.public SaveScriptVariableValue
.public SaveScriptVariableValueAtIndex
.public SaveScriptVariableValueBytes
.public ScriptSpecialProcess0x17
.public ScriptSpecialProcess0x3
.public ScriptSpecialProcess0x39
.public IsStorageFull
.public ScriptSpecialProcess0x3D
.public ScriptSpecialProcess0x3E
.public ScriptSpecialProcess0x4
@ -404,12 +404,12 @@
.public sub_0200D310
.public sub_0200D65C
.public sub_0200D670
.public sub_0200FC24
.public SortItemsInBag
.public sub_0200FD48
.public sub_02010044
.public sub_0201080C
.public sub_02011220
.public sub_02011394
.public GetHpBoostFromExclusiveItems
.public sub_02011420
.public sub_020114F8
.public ApplyGummiBoostsToGroundMonster
@ -724,7 +724,7 @@
.public sub_0205882C
.public sub_02058AFC
.public EnableAllLearnableIqSkills
.public sub_0205AE28
.public CreateMonsterSummaryFromTeamMember
.public sub_0205B028
.public sub_0205B584
.public sub_0205B77C

View File

@ -56,7 +56,7 @@
.public StrcpySimple
.public StrncpySimple
.public StrncpySimpleNoPadSafe
.public sub_02010260
.public RemoveItemInStorage
.public sub_02017C50
.public sub_02017C74
.public sub_02017CB4

View File

@ -66,7 +66,7 @@
.public ShowPortraitBox
.public strcat
.public ItemToBulkItem
.public sub_0200FC24
.public SortItemsInBag
.public sub_0201077C
.public ApplyGummiBoostsToGroundMonster
.public ApplySitrusBerryBoostToGroundMonster

View File

@ -36,7 +36,7 @@
.public sub_020037A4
.public sub_0200D670
.public sub_02010044
.public sub_020103AC
.public AddItemToStorage
.public sub_02011CF4
.public sub_02011D9C
.public sub_02011DB8

View File

@ -1,5 +1,5 @@
#pragma once
.public AddItemToStorage
.public AddBulkItemToStorage
.public AddMoneyCarried
.public CreateDBox
.public CreateNormalMenu
@ -50,7 +50,7 @@
.public RemoveEmptyItemsInBag
.public RemoveItem
.public RemoveItemByIdAndStackNoHole
.public RemoveItemsTypeInStorage
.public RemoveBulkItemInStorage
.public SetPortraitEmotion
.public SetPortraitLayout
.public ShowDBox
@ -59,7 +59,7 @@
.public SpecialProcAddItemToBag
.public ItemToBulkItem
.public sub_0201007C
.public sub_020101A0
.public RemoveItemAtIdxInStorage
.public sub_02013150
.public sub_02017C74
.public sub_02017C80

View File

@ -35,12 +35,12 @@
.public ShowPortraitBox
.public SpecialProcAddItemToBag
.public sub_0200D670
.public sub_0200FFAC
.public sub_0200FFF4
.public ConvertStorageItemAtIdxToBulkItem
.public ConvertStorageItemAtIdxToItem
.public sub_0201007C
.public sub_02010154
.public sub_020101A0
.public sub_020103AC
.public RemoveItemAtIdxInStorage
.public AddItemToStorage
.public sub_02017CCC
.public sub_0202836C
.public sub_0202E3CC

View File

@ -35,13 +35,13 @@
.public ShowMessageInDBox
.public sub_0200D670
.public sub_0200FD48
.public sub_0200FD78
.public sub_0200FFAC
.public sub_0200FFF4
.public CountNbOfItemsInStorage
.public ConvertStorageItemAtIdxToBulkItem
.public ConvertStorageItemAtIdxToItem
.public sub_0201007C
.public sub_02010154
.public sub_020101A0
.public sub_020103AC
.public RemoveItemAtIdxInStorage
.public AddItemToStorage
.public GetMoneyStored
.public AddMoneyStored
.public sub_02017CCC
@ -83,5 +83,5 @@
.public sub_02044094
.public sub_020440B8
.public sub_020440DC
.public sub_02050CE4
.public GetRankStorageSize
.public sub_020582E0

View File

@ -31,7 +31,7 @@
.public ov29_022E56A0
.public ov29_022E58B0
.public ov29_022E7A30
.public ov29_022F89CC
.public CreateMonsterSummaryFromMonster
.public ov29_022F9840
.public ov29_0234B034
.public ov29_02352690

View File

@ -69,8 +69,8 @@
.public SPATK_STAT_IDX
.public SpawnMonster
.public sub_02001888
.public sub_0200FA68
.public sub_0200FAEC
.public TransmuteHeldItemInBag
.public SetFlagsForHeldItemInBag
.public SubstitutePlaceholderStringTags
.public TryBlowAway
.public TryExplosion

View File

@ -176,8 +176,8 @@
.public SpawnItem
.public sub_02001AB0
.public sub_02006B70
.public sub_0200FB54
.public sub_0200FBE0
.public RemoveHolderForItemInBag
.public SetHolderForItemInBag
.public sub_02017C80
.public sub_02017CCC
.public sub_0201B9F8

View File

@ -197,7 +197,7 @@
.public ShowPpRestoreEffect
.public StoryRestrictionsEnabled
.public sub_0200F9B4
.public sub_0200FB54
.public RemoveHolderForItemInBag
.public sub_0201405C
.public sub_02017C50
.public sub_0201C0CC
@ -212,7 +212,7 @@
.public sub_020585B4
.public sub_02058674
.public EnableAllLearnableIqSkills
.public sub_0205A450
.public GetStatBoostsForMonsterSummary
.public SubFixedPoint
.public SubstitutePlaceholderStringTags
.public TEAM_MEMBER_TABLE_PTR

View File

@ -258,7 +258,7 @@
.public SPECIAL_BAND_STAT_BOOST
.public StringFromMessageId
.public StrncpySimpleNoPad
.public sub_0200FB54
.public RemoveHolderForItemInBag
.public StrncpyName
.public sub_02025888
.public sub_0204AF00

View File

@ -107,7 +107,7 @@
.public SpawnDroppedItemWrapper
.public SPEED_BOOST_TURNS
.public sub_0200D8AC
.public sub_0201116C
.public GetExclusiveItemForMonsterFromBag
.public sub_02050FF8
.public SubFixedPoint
.public SubstitutePlaceholderStringTags

View File

@ -167,7 +167,7 @@
.public sub_0200B330
.public sub_0200B3FC
.public sub_0200C008
.public sub_0200F940
.public CountStickyItemsInBag
.public sub_0201B9F8
.public sub_0201E13C
.public sub_0201F2A0

View File

@ -98,7 +98,7 @@
.public sub_0200D1FC
.public sub_0200D894
.public sub_0200D8AC
.public sub_0200F910
.public CleanStickyItemsInBag
.public sub_0201B9F8
.public sub_02024FE8
.public sub_0204F7A8

View File

@ -114,7 +114,7 @@
.public ov29_022EBC2C
.public ov29_022ECDE4
.public ov29_022F0B9C
.public ov29_022F89CC
.public CreateMonsterSummaryFromMonster
.public ov29_022F9C40
.public ov29_023002F0
.public ov29_02300818
@ -157,7 +157,7 @@
.public sub_0200B3D4
.public sub_0200D310
.public sub_0200D894
.public sub_0200FC24
.public SortItemsInBag
.public sub_02017C74
.public sub_02017C80
.public sub_02017CCC

View File

@ -1531,8 +1531,8 @@ ItemZInit: ; 0x0200D81C
bx lr
arm_func_end ItemZInit
arm_func_start sub_0200D834
sub_0200D834: ; 0x0200D834
arm_func_start AreItemsEquivalent
AreItemsEquivalent: ; 0x0200D834
ldrb ip, [r0]
ldrb r3, [r1]
and ip, ip, r2
@ -1557,7 +1557,7 @@ sub_0200D834: ; 0x0200D834
movne r0, #0
and r0, r0, #0xff
bx lr
arm_func_end sub_0200D834
arm_func_end AreItemsEquivalent
arm_func_start sub_0200D894
sub_0200D894: ; 0x0200D894
@ -2357,8 +2357,8 @@ NormalizeTreasureBox: ; 0x0200E1F8
_0200E39C: .word 0xFFFFFE91
arm_func_end NormalizeTreasureBox
arm_func_start sub_0200E3A0
sub_0200E3A0: ; 0x0200E3A0
arm_func_start SortItemList
SortItemList: ; 0x0200E3A0
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
sub sp, sp, #8
mov sl, r0
@ -2529,7 +2529,7 @@ _0200E5F4:
bl RemoveEmptyItems
add sp, sp, #8
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
arm_func_end sub_0200E3A0
arm_func_end SortItemList
arm_func_start RemoveEmptyItems
RemoveEmptyItems: ; 0x0200E610
@ -3411,7 +3411,7 @@ _0200EFF4:
mov r0, r4
mov r1, r6
mov r2, r7
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
moveq r0, #1
ldmeqia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
@ -3551,7 +3551,7 @@ _0200F1B4:
mov r0, sb
mov r1, r5
mov r2, r6
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
movne r0, r4, lsl #0x10
movne r0, r0, asr #0x10
@ -3863,7 +3863,7 @@ _0200F580:
mov r0, sb
mov r1, r5
mov r2, r6
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
beq _0200F5E4
ldrb r0, [sb, #1]
@ -3914,7 +3914,7 @@ _0200F628:
mov r0, sb
mov r1, r5
mov r2, r6
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
beq _0200F678
ldrb r0, [sb, #1]
@ -3960,7 +3960,7 @@ _0200F6BC:
mov r0, r4
mov r1, r6
mov r2, r7
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
ldrneh r1, [r4, #2]
movne r0, #1
@ -4147,8 +4147,8 @@ _0200F8FC:
_0200F90C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end AddItemToBag
arm_func_start sub_0200F910
sub_0200F910: ; 0x0200F910
arm_func_start CleanStickyItemsInBag
CleanStickyItemsInBag: ; 0x0200F910
ldr r0, _0200F93C ; =BAG_ITEMS_PTR_MIRROR
mov r2, #0
ldr r0, [r0]
@ -4163,10 +4163,10 @@ _0200F920:
bx lr
.align 2, 0
_0200F93C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200F910
arm_func_end CleanStickyItemsInBag
arm_func_start sub_0200F940
sub_0200F940: ; 0x0200F940
arm_func_start CountStickyItemsInBag
CountStickyItemsInBag: ; 0x0200F940
stmdb sp!, {r4, r5, r6, lr}
ldr r0, _0200F9B0 ; =BAG_ITEMS_PTR_MIRROR
mov lr, #0
@ -4199,7 +4199,7 @@ _0200F994:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0200F9B0: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200F940
arm_func_end CountStickyItemsInBag
arm_func_start sub_0200F9B4
sub_0200F9B4: ; 0x0200F9B4
@ -4258,8 +4258,8 @@ _0200FA2C:
_0200FA64: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FA0C
arm_func_start sub_0200FA68
sub_0200FA68: ; 0x0200FA68
arm_func_start TransmuteHeldItemInBag
TransmuteHeldItemInBag: ; 0x0200FA68
stmdb sp!, {r4, lr}
ldr r1, _0200FAE8 ; =BAG_ITEMS_PTR_MIRROR
mov r4, #0
@ -4297,10 +4297,10 @@ _0200FAD8:
ldmia sp!, {r4, pc}
.align 2, 0
_0200FAE8: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FA68
arm_func_end TransmuteHeldItemInBag
arm_func_start sub_0200FAEC
sub_0200FAEC: ; 0x0200FAEC
arm_func_start SetFlagsForHeldItemInBag
SetFlagsForHeldItemInBag: ; 0x0200FAEC
stmdb sp!, {r4, lr}
cmp r0, #0
ldmeqia sp!, {r4, pc}
@ -4330,10 +4330,10 @@ _0200FB3C:
ldmia sp!, {r4, pc}
.align 2, 0
_0200FB50: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FAEC
arm_func_end SetFlagsForHeldItemInBag
arm_func_start sub_0200FB54
sub_0200FB54: ; 0x0200FB54
arm_func_start RemoveHolderForItemInBag
RemoveHolderForItemInBag: ; 0x0200FB54
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
ldr r1, _0200FBDC ; =BAG_ITEMS_PTR_MIRROR
mov r6, r0
@ -4354,7 +4354,7 @@ _0200FB7C:
mov r0, r4
mov r1, r6
mov r2, r7
bl sub_0200D834
bl AreItemsEquivalent
cmp r0, #0
beq _0200FBC4
mov r0, #0
@ -4373,10 +4373,10 @@ _0200FBCC:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0200FBDC: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FB54
arm_func_end RemoveHolderForItemInBag
arm_func_start sub_0200FBE0
sub_0200FBE0: ; 0x0200FBE0
arm_func_start SetHolderForItemInBag
SetHolderForItemInBag: ; 0x0200FBE0
stmdb sp!, {r4, lr}
ldr ip, _0200FC20 ; =BAG_ITEMS_PTR_MIRROR
mov r3, #6
@ -4395,10 +4395,10 @@ sub_0200FBE0: ; 0x0200FBE0
ldmia sp!, {r4, pc}
.align 2, 0
_0200FC20: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FBE0
arm_func_end SetHolderForItemInBag
arm_func_start sub_0200FC24
sub_0200FC24: ; 0x0200FC24
arm_func_start SortItemsInBag
SortItemsInBag: ; 0x0200FC24
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
mov r4, #0
ldr r7, _0200FCA8 ; =BAG_ITEMS_PTR_MIRROR
@ -4432,14 +4432,14 @@ _0200FC84:
mov r1, #0x32
ldr r0, [r0]
ldr r0, [r0, #0x384]
bl sub_0200E3A0
bl SortItemList
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0200FCA8: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FC24
arm_func_end SortItemsInBag
arm_func_start sub_0200FCAC
sub_0200FCAC: ; 0x0200FCAC
arm_func_start RemovePokeItemsInBag
RemovePokeItemsInBag: ; 0x0200FCAC
stmdb sp!, {r3, r4, r5, r6, r7, lr}
ldr r0, _0200FD34 ; =BAG_ITEMS_PTR_MIRROR
mov r5, #0
@ -4478,7 +4478,7 @@ _0200FD0C:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0200FD34: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FCAC
arm_func_end RemovePokeItemsInBag
arm_func_start sub_0200FD38
sub_0200FD38: ; 0x0200FD38
@ -4487,35 +4487,35 @@ sub_0200FD38: ; 0x0200FD38
arm_func_start sub_0200FD3C
sub_0200FD3C: ; 0x0200FD3C
ldr ip, _0200FD44 ; =sub_020102DC
ldr ip, _0200FD44 ; =StorageZInit
bx ip
.align 2, 0
_0200FD44: .word sub_020102DC
_0200FD44: .word StorageZInit
arm_func_end sub_0200FD3C
arm_func_start sub_0200FD48
sub_0200FD48: ; 0x0200FD48
ldr ip, _0200FD50 ; =sub_02050CE4
ldr ip, _0200FD50 ; =GetRankStorageSize
bx ip
.align 2, 0
_0200FD50: .word sub_02050CE4
_0200FD50: .word GetRankStorageSize
arm_func_end sub_0200FD48
arm_func_start ScriptSpecialProcess0x39
ScriptSpecialProcess0x39: ; 0x0200FD54
arm_func_start IsStorageFull
IsStorageFull: ; 0x0200FD54
stmdb sp!, {r4, lr}
bl sub_02050CE4
bl GetRankStorageSize
mov r4, r0
bl sub_0200FD78
bl CountNbOfItemsInStorage
cmp r0, r4
movge r0, #1
movlt r0, #0
and r0, r0, #0xff
ldmia sp!, {r4, pc}
arm_func_end ScriptSpecialProcess0x39
arm_func_end IsStorageFull
arm_func_start sub_0200FD78
sub_0200FD78: ; 0x0200FD78
arm_func_start CountNbOfItemsInStorage
CountNbOfItemsInStorage: ; 0x0200FD78
ldr r1, _0200FDAC ; =BAG_ITEMS_PTR_MIRROR
mov r0, #0
ldr r3, [r1]
@ -4532,10 +4532,10 @@ _0200FD88:
bx lr
.align 2, 0
_0200FDAC: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FD78
arm_func_end CountNbOfItemsInStorage
arm_func_start sub_0200FDB0
sub_0200FDB0: ; 0x0200FDB0
arm_func_start CountNbOfValidItemsInStorage
CountNbOfValidItemsInStorage: ; 0x0200FDB0
stmdb sp!, {r4, r5, r6, lr}
mov r5, #0
ldr r4, _0200FDFC ; =BAG_ITEMS_PTR_MIRROR
@ -4559,10 +4559,10 @@ _0200FDE8:
ldmia sp!, {r4, r5, r6, pc}
.align 2, 0
_0200FDFC: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FDB0
arm_func_end CountNbOfValidItemsInStorage
arm_func_start sub_0200FE00
sub_0200FE00: ; 0x0200FE00
arm_func_start CountNbOfValidItemsInTimeDarknessInStorage
CountNbOfValidItemsInTimeDarknessInStorage: ; 0x0200FE00
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r4, #0
ldr r6, _0200FEA4 ; =BAG_ITEMS_PTR_MIRROR
@ -4609,7 +4609,7 @@ _0200FE90:
ldmia sp!, {r3, r4, r5, r6, r7, pc}
.align 2, 0
_0200FEA4: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FE00
arm_func_end CountNbOfValidItemsInTimeDarknessInStorage
arm_func_start CountNbItemsOfTypeInStorage
CountNbItemsOfTypeInStorage: ; 0x0200FEA8
@ -4666,8 +4666,8 @@ _0200FF38:
_0200FF4C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end CountItemTypeInStorage
arm_func_start sub_0200FF50
sub_0200FF50: ; 0x0200FF50
arm_func_start GetEquivBulkItemIdxInStorage
GetEquivBulkItemIdxInStorage: ; 0x0200FF50
stmdb sp!, {r3, lr}
ldr r1, _0200FFA8 ; =BAG_ITEMS_PTR_MIRROR
mov ip, #0
@ -4694,10 +4694,10 @@ _0200FF98:
ldmia sp!, {r3, pc}
.align 2, 0
_0200FFA8: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FF50
arm_func_end GetEquivBulkItemIdxInStorage
arm_func_start sub_0200FFAC
sub_0200FFAC: ; 0x0200FFAC
arm_func_start ConvertStorageItemAtIdxToBulkItem
ConvertStorageItemAtIdxToBulkItem: ; 0x0200FFAC
ldr r3, _0200FFF0 ; =BAG_ITEMS_PTR_MIRROR
ldr r2, [r3]
add r2, r2, r0, lsl #1
@ -4717,10 +4717,10 @@ sub_0200FFAC: ; 0x0200FFAC
bx lr
.align 2, 0
_0200FFF0: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FFAC
arm_func_end ConvertStorageItemAtIdxToBulkItem
arm_func_start sub_0200FFF4
sub_0200FFF4: ; 0x0200FFF4
arm_func_start ConvertStorageItemAtIdxToItem
ConvertStorageItemAtIdxToItem: ; 0x0200FFF4
ldr r3, _02010040 ; =BAG_ITEMS_PTR_MIRROR
mov ip, #0
ldr r2, [r3]
@ -4742,7 +4742,7 @@ sub_0200FFF4: ; 0x0200FFF4
bx lr
.align 2, 0
_02010040: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_0200FFF4
arm_func_end ConvertStorageItemAtIdxToItem
arm_func_start sub_02010044
sub_02010044: ; 0x02010044
@ -4859,8 +4859,8 @@ sub_02010154: ; 0x02010154
_0201019C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010154
arm_func_start sub_020101A0
sub_020101A0: ; 0x020101A0
arm_func_start RemoveItemAtIdxInStorage
RemoveItemAtIdxInStorage: ; 0x020101A0
ldr r2, _020101E0 ; =BAG_ITEMS_PTR_MIRROR
ldr r1, [r2]
add r1, r1, r0, lsl #1
@ -4879,10 +4879,10 @@ sub_020101A0: ; 0x020101A0
bx lr
.align 2, 0
_020101E0: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_020101A0
arm_func_end RemoveItemAtIdxInStorage
arm_func_start RemoveItemsTypeInStorage
RemoveItemsTypeInStorage: ; 0x020101E4
arm_func_start RemoveBulkItemInStorage
RemoveBulkItemInStorage: ; 0x020101E4
stmdb sp!, {r4, lr}
ldr r1, _0201025C ; =BAG_ITEMS_PTR_MIRROR
mov lr, #0
@ -4918,10 +4918,10 @@ _0201024C:
ldmia sp!, {r4, pc}
.align 2, 0
_0201025C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end RemoveItemsTypeInStorage
arm_func_end RemoveBulkItemInStorage
arm_func_start sub_02010260
sub_02010260: ; 0x02010260
arm_func_start RemoveItemInStorage
RemoveItemInStorage: ; 0x02010260
stmdb sp!, {r4, lr}
ldr r1, _020102D8 ; =BAG_ITEMS_PTR_MIRROR
mov lr, #0
@ -4957,10 +4957,10 @@ _020102C8:
ldmia sp!, {r4, pc}
.align 2, 0
_020102D8: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010260
arm_func_end RemoveItemInStorage
arm_func_start sub_020102DC
sub_020102DC: ; 0x020102DC
arm_func_start StorageZInit
StorageZInit: ; 0x020102DC
mov r3, #0
ldr r1, _02010318 ; =BAG_ITEMS_PTR_MIRROR
mov r2, r3
@ -4979,14 +4979,14 @@ _020102E8:
bx lr
.align 2, 0
_02010318: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_020102DC
arm_func_end StorageZInit
arm_func_start AddItemToStorage
AddItemToStorage: ; 0x0201031C
arm_func_start AddBulkItemToStorage
AddBulkItemToStorage: ; 0x0201031C
stmdb sp!, {r3, r4, r5, lr}
sub sp, sp, #8
mov r4, r0
bl sub_02050CE4
bl GetRankStorageSize
mov r5, r0
add r0, sp, #0
mov r1, r4
@ -5024,13 +5024,13 @@ _020103A0:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_020103A8: .word BAG_ITEMS_PTR_MIRROR
arm_func_end AddItemToStorage
arm_func_end AddBulkItemToStorage
arm_func_start sub_020103AC
sub_020103AC: ; 0x020103AC
arm_func_start AddItemToStorage
AddItemToStorage: ; 0x020103AC
stmdb sp!, {r4, lr}
mov r4, r0
bl sub_02050CE4
bl GetRankStorageSize
ldr r1, _02010420 ; =BAG_ITEMS_PTR_MIRROR
mov ip, #0
ldr r3, [r1]
@ -5062,10 +5062,10 @@ _02010410:
ldmia sp!, {r4, pc}
.align 2, 0
_02010420: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_020103AC
arm_func_end AddItemToStorage
arm_func_start sub_02010424
sub_02010424: ; 0x02010424
arm_func_start SortItemsInStorage
SortItemsInStorage: ; 0x02010424
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
mov sb, r1
mov r1, #6
@ -5114,7 +5114,7 @@ _020104C8:
_020104D0:
mov r0, r7
mov r1, r8
bl sub_0200E3A0
bl SortItemList
mov r6, #0
mov r1, r6
mov r2, #1
@ -5165,7 +5165,7 @@ _02010578:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_0201058C: .word BAG_ITEMS_PTR_MIRROR
arm_func_end sub_02010424
arm_func_end SortItemsInStorage
arm_func_start sub_02010590
sub_02010590: ; 0x02010590
@ -6143,8 +6143,8 @@ _02011164: .word EXCLUSIVE_ITEM_EFFECT_DATA
_02011168: .word BAG_ITEMS_PTR_MIRROR
arm_func_end BagHasExclusiveItemTypeForMonster
arm_func_start sub_0201116C
sub_0201116C: ; 0x0201116C
arm_func_start GetExclusiveItemForMonsterFromBag
GetExclusiveItemForMonsterFromBag: ; 0x0201116C
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr}
mov sl, r0
mov sb, r1
@ -6194,7 +6194,7 @@ _02011208:
.align 2, 0
_02011218: .word BAG_ITEMS_PTR_MIRROR
_0201121C: .word EXCLUSIVE_ITEM_EFFECT_DATA
arm_func_end sub_0201116C
arm_func_end GetExclusiveItemForMonsterFromBag
arm_func_start sub_02011220
sub_02011220: ; 0x02011220
@ -6302,8 +6302,8 @@ _0201138C: .word BAG_ITEMS_PTR_MIRROR
_02011390: .word EXCLUSIVE_ITEM_EFFECT_DATA
arm_func_end sub_02011220
arm_func_start sub_02011394
sub_02011394: ; 0x02011394
arm_func_start GetHpBoostFromExclusiveItems
GetHpBoostFromExclusiveItems: ; 0x02011394
stmdb sp!, {r3, r4, r5, lr}
mov r5, r0
add r0, r5, #4
@ -6341,7 +6341,7 @@ _02011414:
ldmia sp!, {r3, r4, r5, pc}
.align 2, 0
_0201141C: .word _020A1878
arm_func_end sub_02011394
arm_func_end GetHpBoostFromExclusiveItems
arm_func_start sub_02011420
sub_02011420: ; 0x02011420
@ -7488,7 +7488,7 @@ sub_02012294: ; 0x02012294
mov r4, r0
mov r7, r8
mov r6, r8
bl sub_0200FD78
bl CountNbOfItemsInStorage
mov r0, r0, lsl #0x10
mov r5, r0, asr #0x10
cmp r5, #0
@ -7663,7 +7663,7 @@ _020124F8:
ldmneia sp!, {r3, pc}
ldrsh r0, [r0, #4]
add r1, sp, #0
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
ldrsh r0, [sp]
ldmia sp!, {r3, pc}
arm_func_end sub_020124D8
@ -7684,7 +7684,7 @@ _02012538:
ldmneia sp!, {r3, pc}
ldrsh r0, [r0, #4]
add r1, sp, #0
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
ldrh r0, [sp, #2]
ldmia sp!, {r3, pc}
.align 2, 0
@ -7862,8 +7862,8 @@ _0201273C:
b _02012780
_02012768:
add r0, sp, #4
bl sub_0200FF50
bl sub_020101A0
bl GetEquivBulkItemIdxInStorage
bl RemoveItemAtIdxInStorage
cmp r0, #0
subne r7, r7, #1
add sb, sb, #1
@ -7962,7 +7962,7 @@ _020128B0:
cmp r0, #1
bne _020128C0
ldrsh r0, [r1, #4]
bl sub_020101A0
bl RemoveItemAtIdxInStorage
_020128C0:
add r4, r4, #1
_020128C4:
@ -61058,7 +61058,7 @@ _0203E518:
add r2, r4, #0x24
mov r0, #6
mla r0, r1, r0, r2
bl sub_020103AC
bl AddItemToStorage
cmp r0, #0
beq _0203E5A0
ldr r0, _0203E4B0 ; =_020AFE74
@ -61179,7 +61179,7 @@ _0203E6D8:
add r2, r4, #0x24
mov r0, #6
mla r0, r1, r0, r2
bl sub_020103AC
bl AddItemToStorage
cmp r0, #0
beq _0203E7D8
ldr r0, _0203E4B0 ; =_020AFE74
@ -61260,7 +61260,7 @@ _0203E80C:
add r2, r4, #0x24
mov r0, #6
mla r0, r1, r0, r2
bl sub_020103AC
bl AddItemToStorage
cmp r0, #0
beq _0203E8D4
ldr r0, _0203E4B0 ; =_020AFE74
@ -61680,7 +61680,7 @@ _0203EE14:
b _0203EF9C
_0203EE30:
add r0, r4, #0x84
bl sub_020103AC
bl AddItemToStorage
cmp r0, #0
ldreq r0, _0203E4B0 ; =_020AFE74
moveq r1, #0x49
@ -65699,7 +65699,7 @@ sub_020423D8: ; 0x020423D8
_0204241C:
bl sub_0200FD48
mov r4, r0
bl sub_0200FD78
bl CountNbOfItemsInStorage
sub r7, r4, r0
mov r8, r5
mov r6, #1
@ -65766,7 +65766,7 @@ _020424CC:
mov r5, #1
b _020425D8
_02042514:
bl sub_0200FD78
bl CountNbOfItemsInStorage
mov r6, r0
bl sub_02042B20
mov r5, r0
@ -66348,7 +66348,7 @@ _02042C3C:
_02042C44:
cmp r0, r4
blt _02042C04
bl sub_0200FC24
bl SortItemsInBag
mov r2, #0
mov r7, r2
mov r0, #1
@ -66850,7 +66850,7 @@ sub_020432B4: ; 0x020432B4
ldrsh r6, [r0, #4]
add r1, sp, #0
mov r0, r6
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
ldr r2, _0204331C ; =_0209CA3C
add r1, sp, #0
mov r0, r5
@ -66875,7 +66875,7 @@ sub_02043320: ; 0x02043320
stmdb sp!, {r3, lr}
cmp r0, #7
bne _02043344
bl sub_0200FE00
bl CountNbOfValidItemsInTimeDarknessInStorage
cmp r0, #0
moveq r0, #1
movne r0, #0
@ -66885,14 +66885,14 @@ _02043344:
sub r0, r0, #5
cmp r0, #1
bhi _02043368
bl sub_0200FDB0
bl CountNbOfValidItemsInStorage
cmp r0, #0
moveq r0, #1
movne r0, #0
and r0, r0, #0xff
ldmia sp!, {r3, pc}
_02043368:
bl sub_0200FD78
bl CountNbOfItemsInStorage
cmp r0, #0
moveq r0, #1
movne r0, #0
@ -66906,7 +66906,7 @@ sub_02043380: ; 0x02043380
cmp r0, #8
moveq r0, #0
ldmeqia sp!, {r3, pc}
bl ScriptSpecialProcess0x39
bl IsStorageFull
ldmia sp!, {r3, pc}
arm_func_end sub_02043380
@ -67603,7 +67603,7 @@ _02043C5C:
bl sub_0200FD48
mov r1, r0
mov r0, r8
bl sub_02010424
bl SortItemsInStorage
mov sl, #0
ldr r0, _0204408C ; =_020AFEB4
mov r2, sl
@ -68153,7 +68153,7 @@ _020443B0:
sub r0, r0, #1
cmp r0, #1
bhi _020443F4
bl sub_0200FD78
bl CountNbOfItemsInStorage
str r0, [sp, #0x28]
bl sub_0200FD48
str r0, [sp, #0x2c]
@ -70400,7 +70400,7 @@ _02046234:
str r2, [r1, #8]
bl sub_020454E0
_020462F4:
bl sub_0200FD78
bl CountNbOfItemsInStorage
mov r4, r0
bl sub_0200FD48
cmp r4, r0
@ -83827,14 +83827,14 @@ sub_02050CD0: ; 0x02050CD0
ldmia sp!, {r3, pc}
arm_func_end sub_02050CD0
arm_func_start sub_02050CE4
sub_02050CE4: ; 0x02050CE4
arm_func_start GetRankStorageSize
GetRankStorageSize: ; 0x02050CE4
stmdb sp!, {r3, lr}
bl GetRank
bl GetRankUpEntry
ldr r0, [r0, #8]
ldmia sp!, {r3, pc}
arm_func_end sub_02050CE4
arm_func_end GetRankStorageSize
arm_func_start sub_02050CF8
sub_02050CF8: ; 0x02050CF8
@ -92725,8 +92725,8 @@ _02057CC8:
cmp sb, #4
add r8, r8, #0x68
blt _02057C68
bl sub_0200F910
bl sub_0200FCAC
bl CleanStickyItemsInBag
bl RemovePokeItemsInBag
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_02057CE4: .word TEAM_MEMBER_TABLE_PTR
@ -93107,7 +93107,7 @@ sub_02058138: ; 0x02058138
strb r1, [sp]
bl ItemZInit
add r0, sp, #0
bl sub_0200FB54
bl RemoveHolderForItemInBag
b _020581E4
_020581E0:
mov r0, #0
@ -93172,7 +93172,7 @@ _02058288:
strb r1, [sp]
bl ItemZInit
add r0, sp, #0
bl sub_0200FB54
bl RemoveHolderForItemInBag
b _020582D4
_020582C0:
add r8, r8, #1
@ -93256,7 +93256,7 @@ _02058374:
strb r2, [sp, #1]
strb r1, [sp]
strb r3, [sp, #6]
bl sub_0200FB54
bl RemoveHolderForItemInBag
ldrh r2, [sp]
add r1, sp, #0
mov r0, r5
@ -93268,7 +93268,7 @@ _02058374:
ldrsh r2, [r4, #0xa]
add r2, r2, #1
and r2, r2, #0xff
bl sub_0200FBE0
bl SetHolderForItemInBag
b _02058448
_02058404:
ldrh r2, [r1]
@ -93287,7 +93287,7 @@ _02058404:
ldrsh r2, [r4, #0xa]
add r2, r2, #1
and r2, r2, #0xff
bl sub_0200FBE0
bl SetHolderForItemInBag
_02058448:
mov r0, #1
b _02058454
@ -95701,8 +95701,8 @@ _0205A448: .word TACTIC_NAME_STRING_IDS
_0205A44C: .word CopyNStringFromMessageId
arm_func_end CopyTacticString
arm_func_start sub_0205A450
sub_0205A450: ; 0x0205A450
arm_func_start GetStatBoostsForMonsterSummary
GetStatBoostsForMonsterSummary: ; 0x0205A450
stmdb sp!, {r4, lr}
sub sp, sp, #0x10
ldrb ip, [sp, #0x18]
@ -95728,7 +95728,7 @@ sub_0205A450: ; 0x0205A450
strb r0, [r4, #0x3c]
add sp, sp, #0x10
ldmia sp!, {r4, pc}
arm_func_end sub_0205A450
arm_func_end GetStatBoostsForMonsterSummary
arm_func_start sub_0205A4B4
sub_0205A4B4: ; 0x0205A4B4
@ -96371,8 +96371,8 @@ _0205AE20: .word _020A34C4
_0205AE24: .word 0x0000096A
arm_func_end sub_0205A4B4
arm_func_start sub_0205AE28
sub_0205AE28: ; 0x0205AE28
arm_func_start CreateMonsterSummaryFromTeamMember
CreateMonsterSummaryFromTeamMember: ; 0x0205AE28
stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, lr}
sub sp, sp, #0x10
mov r8, r1
@ -96497,7 +96497,7 @@ _0205AFE8:
ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, pc}
.align 2, 0
_0205B004: .word 0x000003E7
arm_func_end sub_0205AE28
arm_func_end CreateMonsterSummaryFromTeamMember
arm_func_start sub_0205B008
sub_0205B008: ; 0x0205B008
@ -96531,7 +96531,7 @@ sub_0205B028: ; 0x0205B028
mov r2, r0
add r1, sp, #0
mov r0, r6
bl sub_0205AE28
bl CreateMonsterSummaryFromTeamMember
b _0205B098
_0205B078:
bl GetActiveTeamMember
@ -96541,7 +96541,7 @@ _0205B078:
mov r2, r0
mov r0, r6
mov r1, r4
bl sub_0205AE28
bl CreateMonsterSummaryFromTeamMember
_0205B098:
add sp, sp, #0x68
ldmia sp!, {r4, r5, r6, pc}
@ -96621,7 +96621,7 @@ sub_0205B120: ; 0x0205B120
add r0, sp, #0xc
bl sub_02011220
add r0, sp, #0xc
bl sub_02011394
bl GetHpBoostFromExclusiveItems
ldrsh r2, [r5]
ldrb r1, [sp, #0x38]
add r0, r2, r0

View File

@ -4076,7 +4076,7 @@ _023402D8:
ldr r0, [r0]
add r4, r0, #0x80
add r0, r4, #0x9e
bl sub_020103AC
bl AddItemToStorage
mov r1, #0
strh r1, [r4, #0xa2]
strh r1, [r4, #0xa0]
@ -5693,7 +5693,7 @@ _023419AC:
cmp r0, #0x1f
bne _02344184
add r0, r5, #0xae
bl sub_020103AC
bl AddItemToStorage
mov r1, #0
strh r1, [r5, #0xb2]
strh r1, [r5, #0xb0]
@ -6587,7 +6587,7 @@ _02342668:
bl InitStandardItem
_023426A8:
add r0, r5, #0xae
bl sub_020103AC
bl AddItemToStorage
mov r2, #0
strh r2, [r5, #0xb2]
ldr r1, _02341D00 ; =ov03_02346BC8
@ -10221,7 +10221,7 @@ _023459F8:
ldr r0, [r0, #0x10]
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
bl sub_0204317C
ldr r0, _02345A5C ; =ov03_02346BDC
mvn r3, #1
@ -10316,7 +10316,7 @@ _02345B80:
add r1, sp, #0x18
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
add r0, sp, #0x94
bl InitPreprocessorArgs
ldrsh r2, [sp, #0x18]
@ -10561,7 +10561,7 @@ _02345F00:
cmp r0, #3
bne _02345F34
add r0, r7, #0x9e
bl sub_020103AC
bl AddItemToStorage
mov r1, #0
strh r1, [r7, #0xa2]
ldr r0, _02345A5C ; =ov03_02346BDC
@ -10575,7 +10575,7 @@ _02345F34:
cmp r0, #2
bne _02346640
add r0, r7, #0x9e
bl sub_020103AC
bl AddItemToStorage
mov r1, #0
strh r1, [r7, #0xa2]
ldr r0, _02345A5C ; =ov03_02346BDC

View File

@ -967,7 +967,7 @@ _0233D648:
bl InitPreprocessorArgs
bl sub_0200FD48
mov r5, r0
bl sub_0200FD78
bl CountNbOfItemsInStorage
sub r0, r5, r0
str r0, [sp, #0x110]
mov r0, #0x1c
@ -1270,12 +1270,12 @@ _0233DB40:
mov r0, sb, lsl #0x10
mov r0, r0, asr #0x10
add r1, r7, sl
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
cmp r0, #0
beq _0233DBB0
mov r0, sb, lsl #0x10
mov r0, r0, asr #0x10
bl sub_020101A0
bl RemoveItemAtIdxInStorage
add r0, r4, sl
ldrsh r0, [r0, #0x80]
cmp r0, #0xb4
@ -1307,7 +1307,7 @@ _0233DBD4:
mov r0, r0, asr #0x10
bne _0233DC20
add r1, r4, #0x70
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
ldrsh r0, [r4, #0x74]
cmp r0, #0xb4
bne _0233DC64
@ -1322,7 +1322,7 @@ _0233DBD4:
b _0233DC64
_0233DC20:
add r1, r4, #0x7c
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
mov r1, #1
strh r1, [r4, #0x7a]
add r0, r4, #0x1800
@ -1377,7 +1377,7 @@ _0233DCCC:
add r1, sp, #0x12
mov r0, r0, lsl #0x10
mov r0, r0, asr #0x10
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
add r0, sp, #0x9c
bl InitPreprocessorArgs
ldrsh r2, [sp, #0x12]
@ -2037,7 +2037,7 @@ _0233E670:
bne _0233E6D4
bl sub_0200FD48
mov r5, r0
bl sub_0200FD78
bl CountNbOfItemsInStorage
add r1, r4, #0x1800
ldrh r1, [r1, #0x1c]
sub r0, r5, r0
@ -2364,7 +2364,7 @@ _0233EB20:
cmp r0, #0
bne _0233EB50
add r0, r4, #0x70
bl sub_020103AC
bl AddItemToStorage
mov r0, #0
strh r0, [r4, #0x74]
strh r0, [r4, #0x72]
@ -2378,7 +2378,7 @@ _0233EB50:
_0233EB64:
mul sb, r8, r5
add r0, r7, sb
bl sub_020103AC
bl AddItemToStorage
add r0, r4, sb
strh r6, [r0, #0x80]
strh r6, [r0, #0x7e]
@ -2456,7 +2456,7 @@ _0233EC44:
b _0233EC88
_0233EC7C:
mla r0, r7, r5, r6
bl sub_020103AC
bl AddItemToStorage
add r7, r7, #1
_0233EC88:
ldrh r0, [r4, #0x7a]
@ -2531,7 +2531,7 @@ _0233ED70:
b _0233EEB4
_0233ED90:
add r0, r4, #0x70
bl sub_020103AC
bl AddItemToStorage
add r0, r4, #0x1900
ldrh r2, [r0, #0x2a]
ldr r1, _0233EF18 ; =0x00005006

View File

@ -7263,7 +7263,7 @@ _022C29C8:
bne _022C2B0C
bl sub_020587C8
bl sub_02057CE8
bl sub_0200F910
bl CleanStickyItemsInBag
mov r8, #0
ldr r5, _022C3118 ; =BAG_ITEMS_PTR_MIRROR
mov fp, r8
@ -7291,7 +7291,7 @@ _022C2A08:
b _022C2A5C
_022C2A54:
mov r0, r7
bl sub_0200FB54
bl RemoveHolderForItemInBag
_022C2A5C:
add r8, r8, #1
cmp r8, #0x32

View File

@ -288,7 +288,7 @@ _022DC558:
add r0, sp, #0x5c
bl sub_02011220
add r0, sp, #0x5c
bl sub_02011394
bl GetHpBoostFromExclusiveItems
add r0, sb, r0
ldrsh r1, [r8, #0xe]
mov r0, r0, lsl #0x10
@ -13289,7 +13289,7 @@ _022E776C:
add r0, sp, #0x30
strh r7, [sp, #0x30]
strh r6, [sp, #0x32]
bl AddItemToStorage
bl AddBulkItemToStorage
cmp r0, #0
movne r0, #1
moveq r0, #0
@ -13300,7 +13300,7 @@ _022E778C:
mov r0, r0, asr #0x10
bl ItemAtTableIdx
add r0, sp, #0x2c
bl AddItemToStorage
bl AddBulkItemToStorage
cmp r0, #0
movne r0, #1
moveq r0, #0
@ -13354,7 +13354,7 @@ _022E7850:
add r0, sp, #0x24
strh r7, [sp, #0x24]
strh r6, [sp, #0x26]
bl RemoveItemsTypeInStorage
bl RemoveBulkItemInStorage
cmp r0, #0
movne r0, #1
moveq r0, #0
@ -13365,7 +13365,7 @@ _022E7870:
mov r0, r0, asr #0x10
bl ItemAtTableIdx
add r0, sp, #0x20
bl RemoveItemsTypeInStorage
bl RemoveBulkItemInStorage
cmp r0, #0
movne r0, #1
moveq r0, #0
@ -13501,7 +13501,7 @@ _022E7A48:
moveq r0, #0
b _022E7AC0
_022E7A5C:
bl ScriptSpecialProcess0x39
bl IsStorageFull
cmp r0, #0
movne r0, #1
moveq r0, #0
@ -49489,7 +49489,7 @@ _02305D9C:
mov r0, #5
bl sub_02017CCC
_02305DE4:
bl sub_0200FC24
bl SortItemsInBag
bl GetNbItemsInBag
ldr r2, _02306148 ; =ov11_02324D84
mov r1, r0
@ -51148,7 +51148,7 @@ _023074EC:
mov r0, #5
bl sub_02017CCC
_023074FC:
bl sub_0200FC24
bl SortItemsInBag
ldr r0, _023082B4 ; =ov11_02324D8C
mov r1, #0
ldr r0, [r0]
@ -53627,7 +53627,7 @@ _023097EC:
mov r1, r0
add r0, sp, #0xac
and r2, r5, #0xff
bl sub_0205AE28
bl CreateMonsterSummaryFromTeamMember
add r0, sp, #0xac
mov r1, #3
bl sub_0203F150

View File

@ -823,7 +823,7 @@ _0238AD2C:
cmp r0, #0
beq _0238AD40
add r0, sp, #8
bl sub_02010260
bl RemoveItemInStorage
_0238AD40:
ldr r0, _0238B0CC ; =ov16_0238CE40
ldr r1, [r0]
@ -850,7 +850,7 @@ _0238AD8C:
cmp r0, #0
beq _0238ADA0
add r0, sp, #8
bl sub_02010260
bl RemoveItemInStorage
_0238ADA0:
ldr r0, _0238B124 ; =0x00003F01
bl sub_02017CB4
@ -1921,7 +1921,7 @@ _0238BD2C:
cmp r0, #0
beq _0238BD40
add r0, sp, #8
bl sub_02010260
bl RemoveItemInStorage
_0238BD40:
ldr r0, _0238C0CC ; =ov16_0238CE40
ldr r1, [r0]
@ -1948,7 +1948,7 @@ _0238BD8C:
cmp r0, #0
beq _0238BDA0
add r0, sp, #8
bl sub_02010260
bl RemoveItemInStorage
_0238BDA0:
ldr r0, _0238C124 ; =0x00003F01
bl sub_02017CB4

View File

@ -558,7 +558,7 @@ _0238A878:
mov r0, #5
bl sub_02017CCC
_0238A888:
bl sub_0200FC24
bl SortItemsInBag
mov r0, #0
str r0, [r8, #0x58]
bl ov19_0238C5A8

View File

@ -860,7 +860,7 @@ _0238ACC0:
mov r2, #0
bl InitStandardItem
add r0, sp, #0xa
bl sub_020103AC
bl AddItemToStorage
mov r0, #0x2b
str r0, [sb, #0xc]
bl sub_02046D20
@ -887,7 +887,7 @@ _0238AD24:
mov r2, #0
bl InitStandardItem
add r0, sp, #4
bl sub_020103AC
bl AddItemToStorage
mov r0, #0x2b
str r0, [sb, #0xc]
bl sub_02046D20

View File

@ -980,7 +980,7 @@ _0238AFA4:
add r0, r1, r5, lsl #1
add r0, r0, #0x100
ldrsh r0, [r0, #0x42]
bl sub_020101A0
bl RemoveItemAtIdxInStorage
add r5, r5, #1
_0238AFB8:
ldr r1, [r4]
@ -1024,7 +1024,7 @@ _0238B018:
cmp r0, #0
bne _0238B058
mov r0, r8
bl RemoveItemsTypeInStorage
bl RemoveBulkItemInStorage
_0238B058:
add r4, r4, #1
_0238B05C:
@ -1037,7 +1037,7 @@ _0238B064:
ldr r0, _0238B08C ; =ov21_0238CF40
ldr r0, [r0]
add r0, r0, #0xe
bl AddItemToStorage
bl AddBulkItemToStorage
ldr r0, _0238B08C ; =ov21_0238CF40
mov r1, #1
b _0238B188

View File

@ -2783,7 +2783,7 @@ _0238CA0C:
ldr r1, [r0]
ldrsh r0, [r1, #0x24]
add r1, r1, #0x18
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
mov r0, #0x1b
bl ov23_0238A140
b _0238CFD0
@ -3330,7 +3330,7 @@ _0238D154:
mov r0, r5, lsl #0x10
mov r1, r4
mov r0, r0, asr #0x10
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
cmp r0, #0
beq _0238D19C
mov r0, r4
@ -3339,7 +3339,7 @@ _0238D154:
beq _0238D19C
mov r0, r5, lsl #0x10
mov r0, r0, asr #0x10
bl sub_020101A0
bl RemoveItemAtIdxInStorage
_0238D19C:
add r5, r5, #1
cmp r5, #0x3e8
@ -3378,7 +3378,7 @@ _0238D208:
mov r0, r0, asr #0x10
bl RemoveItem
mov r0, r4
bl sub_020103AC
bl AddItemToStorage
_0238D21C:
add r5, r5, #1
cmp r5, #0x32
@ -3437,7 +3437,7 @@ _0238D2B4:
ldr r0, _0238D2E4 ; =ov23_0238D8A0
ldr r0, [r0]
add r0, r0, #0x18
bl sub_020103AC
bl AddItemToStorage
bl sub_02042AF8
ldmia sp!, {r3, pc}
.align 2, 0

View File

@ -69,7 +69,7 @@ ov27_0238A140: ; 0x0238A140
ldr r1, _0238A380 ; =ov27_0238CE80
ldr r1, [r1]
str r0, [r1, #0x20]
bl sub_0200FD78
bl CountNbOfItemsInStorage
ldr r7, _0238A380 ; =ov27_0238CE80
mov r6, #0
ldr r1, [r7]
@ -135,7 +135,7 @@ _0238A2FC:
mov r0, r0, asr #0x10
bl RemoveItem
mov r0, r5
bl sub_020103AC
bl AddItemToStorage
_0238A338:
sub r4, r4, #1
cmp r4, #0
@ -2151,7 +2151,7 @@ _0238BFFC:
ldr r0, _0238C8F8 ; =ov27_0238CE84
ldr r0, [r0]
add r0, r0, #0x10
bl sub_020103AC
bl AddItemToStorage
bl sub_02042AF8
_0238C028:
bl ov27_0238C900
@ -2210,7 +2210,7 @@ _0238C0E4:
mov r0, r0, asr #0x10
bl RemoveItem
mov r0, r4
bl sub_020103AC
bl AddItemToStorage
_0238C0F8:
add r5, r5, #1
cmp r5, #0x32
@ -2292,7 +2292,7 @@ _0238C214:
ldr r1, [r0]
ldrsh r0, [r1, #0x1c]
add r1, r1, #0x10
bl sub_0200FFF4
bl ConvertStorageItemAtIdxToItem
mov r0, #0x1a
bl ov27_0238A998
b _0238C860
@ -2485,12 +2485,12 @@ _0238C4D8:
mov r0, r5, lsl #0x10
mov r1, r4
mov r0, r0, asr #0x10
bl sub_0200FFAC
bl ConvertStorageItemAtIdxToBulkItem
cmp r0, #0
beq _0238C510
mov r0, r5, lsl #0x10
mov r0, r0, asr #0x10
bl sub_020101A0
bl RemoveItemAtIdxInStorage
_0238C510:
add r5, r5, #1
cmp r5, #0x3e8

View File

@ -56,7 +56,7 @@ _022ECE6C:
_022ECE94:
mov r1, r8
add r0, r4, #0x70
bl ov29_022F89CC
bl CreateMonsterSummaryFromMonster
strh sb, [r4, #0x5a]
ldrh r1, [r6, #0x62]
ldr r0, _022ECF40 ; =0x000003E7

View File

@ -168,7 +168,7 @@ _022EE574:
cmp r5, r4
bne _022EE5C4
mov r1, #8
bl sub_0200FAEC
bl SetFlagsForHeldItemInBag
b _022EE5E8
_022EE5C4:
ldr r1, _022EE620 ; =ov29_02353538
@ -290,7 +290,7 @@ _022EE6FC:
bne _022EE77C
add r0, sp, #8
ldr r0, [r0, sb, lsl #2]
bl sub_0200FA68
bl TransmuteHeldItemInBag
b _022EE7AC
_022EE77C:
ldr r0, _022EE810 ; =ov29_02353538

View File

@ -4659,7 +4659,7 @@ _022F46C0:
b _022F4734
_022F472C:
mov r0, r1
bl sub_0200FB54
bl RemoveHolderForItemInBag
_022F4734:
ldrh r0, [sp, #6]
cmp r7, #0
@ -4674,7 +4674,7 @@ _022F4734:
mov r2, r0
add r1, sp, #6
mov r0, r7
bl sub_0200FBE0
bl SetHolderForItemInBag
b _022F4778
_022F4770:
mov r0, sb
@ -4724,7 +4724,7 @@ _022F47CC:
mov r2, r0
mov r0, r7
add r1, sb, #0x62
bl sub_0200FBE0
bl SetHolderForItemInBag
b _022F4834
_022F482C:
mov r0, sb
@ -4817,7 +4817,7 @@ _022F4928:
add r0, r5, #0x62
bl ItemZInit
add r0, sp, #0
bl sub_0200FB54
bl RemoveHolderForItemInBag
ldr r0, _022F49D4 ; =0x00001317
bl ov29_022EACCC
ldr r1, _022F49D8 ; =0x00000BB5

View File

@ -1301,7 +1301,7 @@ _022F856C:
strneb r0, [r4]
bne _022F8594
add r0, r7, #0x62
bl sub_0200FB54
bl RemoveHolderForItemInBag
mov r0, #0
strb r0, [r4]
_022F8594:
@ -1614,8 +1614,8 @@ ov29_022F89AC: ; 0x022F89AC
ldmia sp!, {r3, pc}
arm_func_end ov29_022F89AC
arm_func_start ov29_022F89CC
ov29_022F89CC: ; 0x022F89CC
arm_func_start CreateMonsterSummaryFromMonster
CreateMonsterSummaryFromMonster: ; 0x022F89CC
stmdb sp!, {r3, r4, r5, r6, r7, lr}
mov r6, r1
ldr r5, [r6, #0xb4]
@ -1673,7 +1673,7 @@ _022F8A28:
ldrsh r3, [r5, #0xe]
mov r0, r7
add r2, r5, #0x62
bl sub_0205A450
bl GetStatBoostsForMonsterSummary
ldrb r2, [r5, #0xa8]
mov r1, #0
add r0, r5, #0x90
@ -2041,7 +2041,7 @@ _022F8FD8:
.align 2, 0
_022F8FF0: .word 0x000003E7
_022F8FF4: .word ov29_02353538
arm_func_end ov29_022F89CC
arm_func_end CreateMonsterSummaryFromMonster
arm_func_start ov29_022F8FF8
ov29_022F8FF8: ; 0x022F8FF8

View File

@ -1553,7 +1553,7 @@ _0230A648:
b _0230A684
_0230A67C:
add r0, r4, #0x62
bl sub_0200FB54
bl RemoveHolderForItemInBag
_0230A684:
add r0, r4, #0x62
bl ItemZInit

View File

@ -468,7 +468,7 @@ ov29_0230F654: ; 0x0230F654
str r2, [sp]
ldrsh r2, [r3, #4]
ldrb r3, [r3, #0x5e]
bl sub_0201116C
bl GetExclusiveItemForMonsterFromBag
cmp r0, #0
moveq r0, #0
beq _0230F6C0
@ -527,7 +527,7 @@ ov29_0230F728: ; 0x0230F728
ldrsh r2, [ip, #4]
ldrb r3, [ip, #0x5e]
add r0, sp, #4
bl sub_0201116C
bl GetExclusiveItemForMonsterFromBag
ldr r1, [r4, #0x18c]
add r0, r4, #0x100
orr r1, r1, r5

View File

@ -14948,7 +14948,7 @@ _0234485C:
bl ov29_022F0604
b _02344A34
_023448C4:
bl sub_0200F940
bl CountStickyItemsInBag
cmp r0, #0
bne _023448E4
ldr r0, _02344AC4 ; =0x00000F58

View File

@ -1693,7 +1693,7 @@ ov29_02346E48: ; 0x02346E48
stmdb sp!, {r3, lr}
bl ov29_02346CBC
bl sub_02057CE8
bl sub_0200F910
bl CleanStickyItemsInBag
ldmia sp!, {r3, pc}
arm_func_end ov29_02346E48

View File

@ -1962,7 +1962,7 @@ _023842F4:
bl sub_02017CCC
_02384314:
bl ov29_02346E5C
bl sub_0200FC24
bl SortItemsInBag
mov r8, #0
_02384320:
ldr r0, _023848A8 ; =ov29_02353538
@ -5652,7 +5652,7 @@ _023876C4:
_023876E4:
add r0, sp, #0
mov r1, sb
bl ov29_022F89CC
bl CreateMonsterSummaryFromMonster
mov r2, #0
add r0, sp, #0
mov r1, r4