mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-03-06 07:27:47 +01:00
label some item functions
This commit is contained in:
parent
e0725bca55
commit
d5806bfe6a
@ -7622,7 +7622,7 @@ _080837EA:
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
adds r0, r7, 0
|
||||
bl sub_8136F2C
|
||||
ldr r1, [r4]
|
||||
|
76
asm/item.s
76
asm/item.s
@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start decrypt_bag_item_quantity
|
||||
decrypt_bag_item_quantity: @ 80D6554
|
||||
thumb_func_start GetBagItemQuantity
|
||||
GetBagItemQuantity: @ 80D6554
|
||||
adds r1, r0, 0
|
||||
ldr r0, =gSaveBlock2Ptr
|
||||
ldr r0, [r0]
|
||||
@ -18,10 +18,10 @@ decrypt_bag_item_quantity: @ 80D6554
|
||||
lsrs r0, 16
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end decrypt_bag_item_quantity
|
||||
thumb_func_end GetBagItemQuantity
|
||||
|
||||
thumb_func_start encrypt_bag_item_quantity
|
||||
encrypt_bag_item_quantity: @ 80D656C
|
||||
thumb_func_start SetBagItemQuantity
|
||||
SetBagItemQuantity: @ 80D656C
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
ldr r2, =gSaveBlock2Ptr
|
||||
@ -32,7 +32,7 @@ encrypt_bag_item_quantity: @ 80D656C
|
||||
strh r1, [r0]
|
||||
bx lr
|
||||
.pool
|
||||
thumb_func_end encrypt_bag_item_quantity
|
||||
thumb_func_end SetBagItemQuantity
|
||||
|
||||
thumb_func_start sub_80D6584
|
||||
sub_80D6584: @ 80D6584
|
||||
@ -321,7 +321,7 @@ _080D6780:
|
||||
cmp r0, r7
|
||||
bne _080D67A6
|
||||
adds r0, r1, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
cmp r0, r5
|
||||
@ -452,7 +452,7 @@ _080D6878:
|
||||
bne _080D68AC
|
||||
adds r0, r1, 0x2
|
||||
str r2, [sp]
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
adds r0, r1, r5
|
||||
@ -617,7 +617,7 @@ _080D69BC:
|
||||
adds r4, r1, 0x2
|
||||
adds r0, r4, 0
|
||||
str r2, [sp, 0x4]
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
adds r1, r0, r5
|
||||
@ -633,7 +633,7 @@ _080D69BC:
|
||||
lsrs r5, r0, 16
|
||||
adds r0, r4, 0
|
||||
adds r1, r2, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
ldr r2, [sp, 0x4]
|
||||
cmp r5, 0
|
||||
beq _080D6A7E
|
||||
@ -667,7 +667,7 @@ _080D6A18:
|
||||
bhi _080D6A40
|
||||
adds r0, r1, 0x2
|
||||
adds r1, r5, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
b _080D6A7E
|
||||
.pool
|
||||
_080D6A40:
|
||||
@ -679,7 +679,7 @@ _080D6A40:
|
||||
adds r0, r1, 0x2
|
||||
adds r1, r2, 0
|
||||
str r2, [sp, 0x4]
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
ldr r2, [sp, 0x4]
|
||||
_080D6A56:
|
||||
adds r0, r6, 0x1
|
||||
@ -696,7 +696,7 @@ _080D6A68:
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
adds r0, r4, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
b _080D6A7E
|
||||
_080D6A74:
|
||||
mov r0, r8
|
||||
@ -723,9 +723,9 @@ _080D6A92:
|
||||
bx r1
|
||||
thumb_func_end bag_add_item
|
||||
|
||||
thumb_func_start remove_item
|
||||
thumb_func_start RemoveBagItem
|
||||
@ pokescrcmd
|
||||
remove_item: @ 80D6AA4
|
||||
RemoveBagItem: @ 80D6AA4
|
||||
push {r4-r7,lr}
|
||||
mov r7, r9
|
||||
mov r6, r8
|
||||
@ -783,7 +783,7 @@ _080D6B10:
|
||||
cmp r0, r8
|
||||
bne _080D6B28
|
||||
adds r0, r1, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
adds r0, r4, r0
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
@ -838,7 +838,7 @@ _080D6B70:
|
||||
cmp r0, r8
|
||||
bne _080D6BE6
|
||||
adds r0, r2, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
cmp r1, r7
|
||||
@ -849,7 +849,7 @@ _080D6B70:
|
||||
subs r1, r7
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
movs r7, 0
|
||||
b _080D6BCA
|
||||
.pool
|
||||
@ -861,12 +861,12 @@ _080D6BB8:
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
movs r1, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
_080D6BCA:
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r2, r0, 16
|
||||
cmp r2, 0
|
||||
@ -891,7 +891,7 @@ _080D6BEE:
|
||||
cmp r0, r8
|
||||
bne _080D6C4C
|
||||
adds r0, r2, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r1, r0, 16
|
||||
cmp r1, r7
|
||||
@ -902,7 +902,7 @@ _080D6BEE:
|
||||
subs r1, r7
|
||||
lsls r1, 16
|
||||
lsrs r1, 16
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
movs r7, 0
|
||||
b _080D6C30
|
||||
_080D6C1E:
|
||||
@ -913,12 +913,12 @@ _080D6C1E:
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
movs r1, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
_080D6C30:
|
||||
ldr r0, [r5]
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r2, r0, 16
|
||||
cmp r2, 0
|
||||
@ -945,10 +945,10 @@ _080D6C5A:
|
||||
pop {r4-r7}
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end remove_item
|
||||
thumb_func_end RemoveBagItem
|
||||
|
||||
thumb_func_start sub_80D6C68
|
||||
sub_80D6C68: @ 80D6C68
|
||||
thumb_func_start GetPocketByItemId
|
||||
GetPocketByItemId: @ 80D6C68
|
||||
push {lr}
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
@ -957,10 +957,10 @@ sub_80D6C68: @ 80D6C68
|
||||
lsrs r0, 24
|
||||
pop {r1}
|
||||
bx r1
|
||||
thumb_func_end sub_80D6C68
|
||||
thumb_func_end GetPocketByItemId
|
||||
|
||||
thumb_func_start sub_80D6C7C
|
||||
sub_80D6C7C: @ 80D6C7C
|
||||
thumb_func_start ClearItemSlots
|
||||
ClearItemSlots: @ 80D6C7C
|
||||
push {r4-r7,lr}
|
||||
adds r6, r0, 0
|
||||
lsls r1, 24
|
||||
@ -976,7 +976,7 @@ _080D6C8E:
|
||||
strh r7, [r0]
|
||||
adds r0, 0x2
|
||||
movs r1, 0
|
||||
bl encrypt_bag_item_quantity
|
||||
bl SetBagItemQuantity
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
@ -986,7 +986,7 @@ _080D6CA6:
|
||||
pop {r4-r7}
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_80D6C7C
|
||||
thumb_func_end ClearItemSlots
|
||||
|
||||
thumb_func_start sub_80D6CAC
|
||||
sub_80D6CAC: @ 80D6CAC
|
||||
@ -1340,7 +1340,7 @@ bag_pocket_get_item_quantity: @ 80D6F30
|
||||
ldr r0, [r0]
|
||||
adds r0, r1
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
pop {r1}
|
||||
@ -1375,7 +1375,7 @@ _080D6F7A:
|
||||
ldr r0, [r6]
|
||||
adds r0, r5
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
bne _080D6F96
|
||||
@ -1424,7 +1424,7 @@ _080D6FCE:
|
||||
ldr r0, [r6]
|
||||
adds r0, r7
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
lsls r4, r5, 2
|
||||
cmp r0, 0
|
||||
@ -1432,7 +1432,7 @@ _080D6FCE:
|
||||
ldr r0, [r6]
|
||||
adds r0, r4
|
||||
adds r0, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
lsls r0, 16
|
||||
cmp r0, 0
|
||||
beq _080D7008
|
||||
@ -1541,7 +1541,7 @@ _080D709A:
|
||||
adds r1, r5
|
||||
ldr r0, [r1]
|
||||
ldrb r1, [r1, 0x4]
|
||||
bl sub_80D6C7C
|
||||
bl ClearItemSlots
|
||||
adds r0, r4, 0x1
|
||||
lsls r0, 16
|
||||
lsrs r4, r0, 16
|
||||
@ -1578,7 +1578,7 @@ _080D70DA:
|
||||
cmp r0, r6
|
||||
bne _080D70F2
|
||||
adds r0, r1, 0x2
|
||||
bl decrypt_bag_item_quantity
|
||||
bl GetBagItemQuantity
|
||||
adds r0, r7, r0
|
||||
lsls r0, 16
|
||||
lsrs r7, r0, 16
|
||||
|
@ -1664,7 +1664,7 @@ sub_80FDD74: @ 80FDD74
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
bl script_env_2_enable
|
||||
ldr r0, =gUnknown_08274482
|
||||
bl script_env_1_execute_new_script
|
||||
@ -2005,7 +2005,7 @@ sub_80FE058: @ 80FE058
|
||||
ldr r4, =gUnknown_0203CE7C
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldrh r0, [r4]
|
||||
ldr r1, =gStringVar2
|
||||
bl itemid_get_name
|
||||
@ -2364,7 +2364,7 @@ ItemUseInBattle_PokeBall: @ 80FE394
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
bl InBattlePyramid
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
@ -2453,7 +2453,7 @@ sub_80FE440: @ 80FE440
|
||||
ldr r4, =gUnknown_0203CE7C
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
bl InBattlePyramid
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
|
@ -45619,7 +45619,7 @@ sub_8020D8C: @ 8020D8C
|
||||
_08020DA8:
|
||||
ldrh r0, [r1]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
_08020DB0:
|
||||
ldr r4, =gUnknown_02022C90
|
||||
ldr r2, [r4]
|
||||
|
@ -15,7 +15,7 @@ sub_816ADF4: @ 816ADF4
|
||||
lsls r1, 3
|
||||
adds r0, r1
|
||||
movs r1, 0x32
|
||||
bl sub_80D6C7C
|
||||
bl ClearItemSlots
|
||||
ldr r1, =gUnknown_085DFEFC
|
||||
ldrh r0, [r1]
|
||||
cmp r0, 0
|
||||
|
@ -2253,7 +2253,7 @@ sub_80E7F68: @ 80E7F68
|
||||
ldrh r0, [r4]
|
||||
cmp r0, 0
|
||||
beq _080E7FEC
|
||||
bl sub_80D6C68
|
||||
bl GetPocketByItemId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
cmp r0, 0x5
|
||||
|
@ -5489,7 +5489,7 @@ _080C9FB6:
|
||||
mov r0, sp
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
_080C9FC0:
|
||||
add sp, 0x4
|
||||
pop {r0}
|
||||
|
@ -17433,7 +17433,7 @@ sub_818E490: @ 818E490
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
@ -73943,7 +73943,7 @@ bag_menu_inits_lists_menu: @ 81ABBBC
|
||||
adds r0, 0x8
|
||||
adds r4, r0
|
||||
movs r0, 0x4
|
||||
bl bag_menu_remove_item_message_window
|
||||
bl bag_menu_RemoveBagItem_message_window
|
||||
ldrb r0, [r5]
|
||||
mov r1, r8
|
||||
adds r2, r4, 0
|
||||
@ -76345,7 +76345,7 @@ Task_ActuallyToss: @ 81AD150
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
ldrh r1, [r5, 0x10]
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldrb r0, [r5]
|
||||
mov r1, r8
|
||||
adds r2, r7, 0
|
||||
@ -76944,7 +76944,7 @@ sub_81AD6FC: @ 81AD6FC
|
||||
adds r4, r0
|
||||
bl bag_menu_remove_money_window
|
||||
movs r0, 0x4
|
||||
bl bag_menu_remove_item_message_window
|
||||
bl bag_menu_RemoveBagItem_message_window
|
||||
ldrb r0, [r4]
|
||||
movs r1, 0
|
||||
bl bag_menu_print_cursor_
|
||||
@ -77069,7 +77069,7 @@ _081AD818:
|
||||
movs r0, 0x8
|
||||
bl bag_menu_remove_window
|
||||
movs r0, 0x4
|
||||
bl bag_menu_remove_item_message_window
|
||||
bl bag_menu_RemoveBagItem_message_window
|
||||
adds r0, r5, 0
|
||||
bl set_callback3_to_bag
|
||||
_081AD844:
|
||||
@ -77157,7 +77157,7 @@ sub_81AD8C8: @ 81AD8C8
|
||||
ldrh r0, [r2]
|
||||
mov r3, r10
|
||||
ldrh r1, [r3, 0x10]
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r0, =gSaveBlock1Ptr
|
||||
ldr r4, [r0]
|
||||
movs r1, 0x92
|
||||
@ -77585,13 +77585,13 @@ _081ADCAE:
|
||||
lsls r1, 3
|
||||
adds r0, r1
|
||||
movs r1, 0x1E
|
||||
bl sub_80D6C7C
|
||||
bl ClearItemSlots
|
||||
ldr r0, [r4]
|
||||
movs r2, 0xCA
|
||||
lsls r2, 3
|
||||
adds r0, r2
|
||||
movs r1, 0x10
|
||||
bl sub_80D6C7C
|
||||
bl ClearItemSlots
|
||||
bl sub_81AAB70
|
||||
pop {r4-r6}
|
||||
pop {r0}
|
||||
@ -77793,7 +77793,7 @@ unknown_ItemMenu_Give2: @ 81ADE8C
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r1, =gScriptResult
|
||||
movs r0, 0x1
|
||||
strh r0, [r1]
|
||||
@ -78192,8 +78192,8 @@ _081AE1E8:
|
||||
.pool
|
||||
thumb_func_end AddItemMessageWindow
|
||||
|
||||
thumb_func_start bag_menu_remove_item_message_window
|
||||
bag_menu_remove_item_message_window: @ 81AE1F8
|
||||
thumb_func_start bag_menu_RemoveBagItem_message_window
|
||||
bag_menu_RemoveBagItem_message_window: @ 81AE1F8
|
||||
push {r4,lr}
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
@ -78221,7 +78221,7 @@ _081AE22C:
|
||||
pop {r0}
|
||||
bx r0
|
||||
.pool
|
||||
thumb_func_end bag_menu_remove_item_message_window
|
||||
thumb_func_end bag_menu_RemoveBagItem_message_window
|
||||
|
||||
thumb_func_start bag_menu_yes_no
|
||||
bag_menu_yes_no: @ 81AE238
|
||||
@ -90088,7 +90088,7 @@ _081B4278:
|
||||
beq _081B42A4
|
||||
ldrh r0, [r6]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
movs r0, 0x9
|
||||
ldrsb r0, [r5, r0]
|
||||
mov r1, r8
|
||||
@ -90160,7 +90160,7 @@ sub_81B42D0: @ 81B42D0
|
||||
bl sub_81B1DB8
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r7, 2
|
||||
adds r0, r7
|
||||
@ -90263,7 +90263,7 @@ _081B4402:
|
||||
ldr r5, =gUnknown_0203CE7C
|
||||
ldrh r0, [r5]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r6, =gUnknown_0203CEFC
|
||||
ldrh r0, [r6]
|
||||
movs r1, 0x1
|
||||
@ -90439,7 +90439,7 @@ sub_81B4578: @ 81B4578
|
||||
bl SetMonData
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
mov r0, r8
|
||||
movs r1, 0x1
|
||||
bl bag_add_item
|
||||
@ -93690,7 +93690,7 @@ _081B6204:
|
||||
.pool
|
||||
_081B621C:
|
||||
ldrh r0, [r4]
|
||||
bl sub_80D6C68
|
||||
bl GetPocketByItemId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
movs r1, 0x5
|
||||
@ -94140,7 +94140,7 @@ _081B6624:
|
||||
beq _081B6656
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
b _081B6656
|
||||
.pool
|
||||
_081B6650:
|
||||
@ -94385,7 +94385,7 @@ _081B6874:
|
||||
bl PlaySE
|
||||
adds r0, r6, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r1, =gStringVar1
|
||||
adds r0, r5, 0
|
||||
bl GetMonNickname
|
||||
@ -94827,7 +94827,7 @@ _081B6C34:
|
||||
bl PlaySE
|
||||
adds r0, r5, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
movs r0, 0
|
||||
ldrsh r1, [r7, r0]
|
||||
adds r1, 0xD
|
||||
@ -95124,7 +95124,7 @@ sub_81B6EB4: @ 81B6EB4
|
||||
bhi _081B6EF0
|
||||
adds r0, r4, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
_081B6EF0:
|
||||
ldr r1, =gStringVar1
|
||||
adds r0, r5, 0
|
||||
@ -95761,7 +95761,7 @@ _081B74B4:
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
ldr r1, =gStringVar1
|
||||
adds r0, r5, 0
|
||||
bl GetMonNickname
|
||||
@ -96530,7 +96530,7 @@ _081B7BC8:
|
||||
ldr r0, =gUnknown_0203CE7C
|
||||
ldrh r0, [r0]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
_081B7BD8:
|
||||
ldr r1, =gTasks
|
||||
lsls r0, r4, 2
|
||||
@ -96629,7 +96629,7 @@ sub_81B7C74: @ 81B7C74
|
||||
_081B7CD8:
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
bl sub_81B06F4
|
||||
_081B7CE4:
|
||||
pop {r4-r6}
|
||||
@ -97237,7 +97237,7 @@ sub_81B81A8: @ 81B81A8
|
||||
bl SetMonData
|
||||
ldrh r0, [r4]
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
adds r0, r7, 0
|
||||
bl sub_81B841C
|
||||
ldr r0, [r6]
|
||||
@ -97479,7 +97479,7 @@ sub_81B83F0: @ 81B83F0
|
||||
_081B8410:
|
||||
adds r0, r1, 0
|
||||
movs r1, 0x1
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
_081B8418:
|
||||
pop {r0}
|
||||
bx r0
|
||||
|
@ -1002,7 +1002,7 @@ sub_80999E4: @ 80999E4
|
||||
lsls r1, 24
|
||||
lsrs r1, 24
|
||||
adds r0, r4, 0
|
||||
bl remove_item
|
||||
bl RemoveBagItem
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r5]
|
||||
@ -1087,7 +1087,7 @@ s48_get_item_type: @ 8099AB0
|
||||
lsls r0, 16
|
||||
lsrs r0, 16
|
||||
ldr r4, =gScriptResult
|
||||
bl sub_80D6C68
|
||||
bl GetPocketByItemId
|
||||
lsls r0, 24
|
||||
lsrs r0, 24
|
||||
strh r0, [r4]
|
||||
|
Loading…
x
Reference in New Issue
Block a user