diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 17:19:08 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-06 17:19:08 +0200 |
| commit | c6eacc9be5423fab39c90ade16b147de4cd032fe (patch) | |
| tree | 81db81112c40a72718581d5db6a90be2895b8093 /asm/evolution_scene.s | |
| parent | 577e23a87dd7d05223eed34cec13b0cc42c1ebf0 (diff) | |
start porting pokemon1
Diffstat (limited to 'asm/evolution_scene.s')
| -rw-r--r-- | asm/evolution_scene.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s index 84bacd78b..ffdffb9d6 100644 --- a/asm/evolution_scene.s +++ b/asm/evolution_scene.s @@ -1679,7 +1679,7 @@ _0813EA2A: adds r4, r0, r1 ldrb r1, [r4, 0x10] mov r0, r9 - bl sub_8069318 + bl MonTryLearningNewMove lsls r0, 16 lsrs r6, r0, 16 cmp r6, 0 @@ -2237,7 +2237,7 @@ _0813EF3E: lsls r2, 24 lsrs r2, 24 ldr r3, =sub_813DD7C - ldr r4, =gUnknown_020244E2 + ldr r4, =gMoveToLearn ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 @@ -2318,11 +2318,11 @@ _0813F014: mov r0, r9 adds r1, r4, 0 bl sub_806B9A8 - ldr r0, =gUnknown_020244E2 + ldr r0, =gMoveToLearn ldrh r1, [r0] mov r0, r9 adds r2, r4, 0 - bl sub_80691F4 + bl SetMonMoveSlot ldr r0, =gTasks mov r3, r8 adds r1, r3, r7 @@ -2870,7 +2870,7 @@ _0813F58C: adds r5, r0, r1 ldrb r1, [r5, 0x10] mov r0, r9 - bl sub_8069318 + bl MonTryLearningNewMove lsls r0, 16 lsrs r6, r0, 16 mov r8, r4 @@ -3388,7 +3388,7 @@ _0813FA3E: lsls r2, 24 lsrs r2, 24 ldr r3, =sub_813DF70 - ldr r4, =gUnknown_020244E2 + ldr r4, =gMoveToLearn ldrh r4, [r4] str r4, [sp] bl sub_81BFA38 @@ -3471,11 +3471,11 @@ _0813FB3C: mov r0, r9 adds r1, r4, 0 bl sub_806B9A8 - ldr r0, =gUnknown_020244E2 + ldr r0, =gMoveToLearn ldrh r1, [r0] mov r0, r9 adds r2, r4, 0 - bl sub_80691F4 + bl SetMonMoveSlot ldr r0, =gUnknown_085CC270 movs r1, 0xCF lsls r1, 2 |