Merge branch 'master' into decompile_battle1
This commit is contained in:
+4
-4
@@ -3696,7 +3696,7 @@ _0807920E:
|
||||
thumb_func_start sub_8079218
|
||||
sub_8079218: @ 8079218
|
||||
push {lr}
|
||||
bl sub_8198C58
|
||||
bl ProcessMenuInputNoWrap_
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -3798,7 +3798,7 @@ _080792D8:
|
||||
thumb_func_start sub_80792E4
|
||||
sub_80792E4: @ 80792E4
|
||||
push {lr}
|
||||
bl sub_8198C58
|
||||
bl ProcessMenuInputNoWrap_
|
||||
lsls r0, 24
|
||||
asrs r1, r0, 24
|
||||
cmp r1, 0
|
||||
@@ -13369,7 +13369,7 @@ sub_807E7E8: @ 807E7E8
|
||||
ldrh r0, [r5, 0x28]
|
||||
cmp r0, 0
|
||||
beq _0807E960
|
||||
bl itemid_is_mail
|
||||
bl ItemIsMail
|
||||
lsls r0, 24
|
||||
cmp r0, 0
|
||||
beq _0807E954
|
||||
@@ -13442,7 +13442,7 @@ _0807E98E:
|
||||
bl StringCopy
|
||||
adds r0, r4, 0
|
||||
movs r1, 0
|
||||
bl sub_81DB4DC
|
||||
bl PadNameString
|
||||
ldr r1, [r6, 0x18]
|
||||
lsrs r0, r1, 24
|
||||
strb r0, [r5, 0x1A]
|
||||
|
||||
Reference in New Issue
Block a user