diff options
| author | yenatch <yenatch@gmail.com> | 2017-07-17 19:52:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 19:52:52 -0400 |
| commit | cc3da4cdc00eb0c1ed36f50780b00c0d843884a1 (patch) | |
| tree | ded87aae0570892c2718b0969957249b68736637 /asm-de/easy_chat.s | |
| parent | d5c9a02e514d8bd75cbe192d6465ab4bb5af43ad (diff) | |
| parent | c6e9dd8a2a56e13cf93ca3b7ad0dae73918771df (diff) | |
Merge pull request #358 from marijnvdwerf/sapphire
Build German Sapphire (1.0)
Diffstat (limited to 'asm-de/easy_chat.s')
| -rw-r--r-- | asm-de/easy_chat.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 3bbec3f30..2f6c28fdb 100644 --- a/asm-de/easy_chat.s +++ b/asm-de/easy_chat.s @@ -4212,7 +4212,7 @@ _080E812C: mov r2, r8 strb r2, [r0] adds r0, 0x1 - ldr r1, _080E81A4 @ =0x083e7686 + ldr r1, _080E81A4 @ =gBerryMasterWifePhrases + 0x2 adds r4, r1 ldrh r1, [r4] movs r2, 0 @@ -4246,7 +4246,7 @@ _080E818A: _080E8198: .4byte 0x0200b19a _080E819C: .4byte 0xffff5e66 _080E81A0: .4byte gBerryMasterWifePhrases -_080E81A4: .4byte 0x083e7686 +_080E81A4: .4byte gBerryMasterWifePhrases + 0x2 _080E81A8: lsls r0, r4, 16 lsrs r5, r0, 16 |