diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-06-25 20:12:52 -0400 |
| commit | f85513f76999c79c6355711fcefaf058d02c7c46 (patch) | |
| tree | ad60d6edad654974f1ef82538da0a402abd69903 /asm/learn_move.s | |
| parent | 637774362fdbedd8a54b651e6196a1e1a4f4c093 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into sound_check_menu
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: |