thru atk6B

This commit is contained in:
jiangzhengwenjz
2019-08-26 14:38:40 +08:00
parent db0d8e5bdb
commit 184066d1c1
15 changed files with 1300 additions and 3707 deletions
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -2449,7 +2449,7 @@ _080CF2C2:
ldr r4, _080CF308 @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldrh r0, [r5, 0x14]
adds r0, 0x1
strh r0, [r5, 0x14]
@@ -3718,7 +3718,7 @@ _080CFDC6:
ldr r4, _080CFE2C @ =gMoveToLearn
ldrh r4, [r4]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldrh r0, [r5, 0x14]
adds r0, 0x1
strh r0, [r5, 0x14]
+1 -1
View File
@@ -758,7 +758,7 @@ _080E4C7E:
adds r5, r4
ldrh r4, [r5]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
ldr r1, [r7]
movs r0, 0x1C
b _080E4ED8
+1 -1
View File
@@ -14645,7 +14645,7 @@ sub_8125E4C: @ 8125E4C
ldr r3, _08125E80 @ =sub_8125E84
ldrh r4, [r4, 0xE]
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
add sp, 0x4
pop {r4}
pop {r0}
+3 -3
View File
@@ -270,8 +270,8 @@ _08134730: .4byte 0x00003204
_08134734: .4byte sub_8135C34
thumb_func_end sub_81344F8
thumb_func_start sub_8134738
sub_8134738: @ 8134738
thumb_func_start ShowSelectMovePokemonSummaryScreen
ShowSelectMovePokemonSummaryScreen: @ 8134738
push {r4,r5,lr}
sub sp, 0x4
ldr r5, [sp, 0x10]
@@ -296,7 +296,7 @@ sub_8134738: @ 8134738
.align 2, 0
_08134764: .4byte gUnknown_203B140
_08134768: .4byte 0x00003260
thumb_func_end sub_8134738
thumb_func_end ShowSelectMovePokemonSummaryScreen
thumb_func_start sub_813476C
sub_813476C: @ 813476C
+1 -1
View File
@@ -115,7 +115,7 @@ sub_80BF9BC: @ 80BF9BC
ldr r3, _080BF9FC @ =CB2_ReturnToField
movs r4, 0
str r4, [sp]
bl sub_8134738
bl ShowSelectMovePokemonSummaryScreen
movs r0, 0x3
bl sub_8138B38
ldr r1, _080BFA00 @ =gFieldCallback