Finish item_use
This commit is contained in:
+1
-1
@@ -265,7 +265,7 @@ sub_814B8F0: @ 814B8F0
|
||||
ldr r1, _0814B910 @ =sub_814B860
|
||||
movs r0, 0x5
|
||||
movs r2, 0
|
||||
bl sub_813CD50
|
||||
bl InitBerryPouch
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
|
||||
+3
-3
@@ -5,8 +5,8 @@
|
||||
|
||||
.text
|
||||
|
||||
thumb_func_start sub_813CD50
|
||||
sub_813CD50: @ 813CD50
|
||||
thumb_func_start InitBerryPouch
|
||||
InitBerryPouch: @ 813CD50
|
||||
push {r4-r7,lr}
|
||||
mov r7, r8
|
||||
push {r7}
|
||||
@@ -92,7 +92,7 @@ _0813CDF0: .4byte gTextFlags
|
||||
_0813CDF4: .4byte gSpecialVar_ItemId
|
||||
_0813CDF8: .4byte sub_813CE30
|
||||
_0813CDFC: .4byte 0x0000080c
|
||||
thumb_func_end sub_813CD50
|
||||
thumb_func_end InitBerryPouch
|
||||
|
||||
thumb_func_start sub_813CE00
|
||||
sub_813CE00: @ 813CE00
|
||||
|
||||
+6
-6
@@ -138,8 +138,8 @@ _08107EB0: .4byte gUnknown_203AD10
|
||||
_08107EB4: .4byte gUnknown_203ACFC
|
||||
thumb_func_end sub_8107DB4
|
||||
|
||||
thumb_func_start UseFameCheckerFromMenu
|
||||
UseFameCheckerFromMenu: @ 8107EB8
|
||||
thumb_func_start ReturnToBagFromKeyItem
|
||||
ReturnToBagFromKeyItem: @ 8107EB8
|
||||
push {lr}
|
||||
ldr r2, _08107EC8 @ =sub_80568A8
|
||||
movs r0, 0
|
||||
@@ -149,7 +149,7 @@ UseFameCheckerFromMenu: @ 8107EB8
|
||||
bx r0
|
||||
.align 2, 0
|
||||
_08107EC8: .4byte sub_80568A8
|
||||
thumb_func_end UseFameCheckerFromMenu
|
||||
thumb_func_end ReturnToBagFromKeyItem
|
||||
|
||||
thumb_func_start sub_8107ECC
|
||||
sub_8107ECC: @ 8107ECC
|
||||
@@ -4776,7 +4776,7 @@ sub_810A448: @ 810A448
|
||||
ldr r1, _0810A458 @ =sub_810A45C
|
||||
movs r0, 0x1
|
||||
movs r2, 0
|
||||
bl sub_813CD50
|
||||
bl InitBerryPouch
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -4905,7 +4905,7 @@ sub_810A540: @ 810A540
|
||||
ldr r1, _0810A550 @ =sub_810A554
|
||||
movs r0, 0x3
|
||||
movs r2, 0
|
||||
bl sub_813CD50
|
||||
bl InitBerryPouch
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
@@ -5050,7 +5050,7 @@ sub_810A668: @ 810A668
|
||||
ldr r1, _0810A678 @ =sub_810A67C
|
||||
movs r0, 0x2
|
||||
movs r2, 0
|
||||
bl sub_813CD50
|
||||
bl InitBerryPouch
|
||||
pop {r0}
|
||||
bx r0
|
||||
.align 2, 0
|
||||
|
||||
-1506
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -12617,7 +12617,7 @@ sub_8124DB0: @ 8124DB0
|
||||
movs r0, 0x6
|
||||
movs r1, 0
|
||||
movs r2, 0xFF
|
||||
bl sub_813CD50
|
||||
bl InitBerryPouch
|
||||
pop {r0}
|
||||
bx r0
|
||||
thumb_func_end sub_8124DB0
|
||||
|
||||
+2
-2
@@ -911,14 +911,14 @@ _0806F498:
|
||||
bl PlayRainStoppingSoundEffect
|
||||
bl sub_806EF18
|
||||
bl CleanupOverworldWindowsAndTilemaps
|
||||
ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu
|
||||
ldr r0, _0806F4B0 @ =ReturnToBagFromKeyItem
|
||||
bl SetMainCallback2
|
||||
movs r0, 0x1
|
||||
_0806F4AC:
|
||||
pop {r1}
|
||||
bx r1
|
||||
.align 2, 0
|
||||
_0806F4B0: .4byte UseFameCheckerFromMenu
|
||||
_0806F4B0: .4byte ReturnToBagFromKeyItem
|
||||
thumb_func_end sub_806F480
|
||||
|
||||
thumb_func_start sub_806F4B4
|
||||
|
||||
Reference in New Issue
Block a user