diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-05 17:48:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-05 17:48:21 -0400 |
| commit | 124e2eb02c4adc46265e5b34b47ac0c625a24ec3 (patch) | |
| tree | 5c0af98d9e49a767f455fff1ceec5d07cb8539b8 /asm/learn_move.s | |
| parent | 123d5cc8b26d2a93fa3981beaccb84377c6ae20f (diff) | |
| parent | 813c1846c94fa14b55bf75cf4c14465f1fb26635 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'asm/learn_move.s')
| -rw-r--r-- | asm/learn_move.s | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/asm/learn_move.s b/asm/learn_move.s index fdf650a08..89cd2efb8 100644 --- a/asm/learn_move.s +++ b/asm/learn_move.s @@ -1037,7 +1037,7 @@ _08132F58: lsls r0, 24 cmp r0, 0 beq _08132FD6 - ldr r0, _08132F78 @ =gOtherText_ForgotOrDidNotLearnMove + ldr r0, _08132F78 @ =gOtherText_ForgotOrDidNotLearnMove / deuOtherText_ForgotAndLearned bl sub_81328E8 ldr r0, _08132F7C @ =gUnknown_030007B0 ldr r1, [r0] @@ -1047,7 +1047,11 @@ _08132F58: bl PlayFanfare b _08132FD6 .align 2, 0 +.ifdef ENGLISH _08132F78: .4byte gOtherText_ForgotOrDidNotLearnMove +.else +_08132F78: .4byte deuOtherText_ForgotAndLearned +.endif _08132F7C: .4byte gUnknown_030007B0 _08132F80: .4byte 0x0000016f _08132F84: |