diff options
| author | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-07-08 21:19:28 +0200 |
|---|---|---|
| committer | Marijn van der Werf <marijn.vanderwerf@gmail.com> | 2017-07-09 13:54:21 +0200 |
| commit | c6e9dd8a2a56e13cf93ca3b7ad0dae73918771df (patch) | |
| tree | 680a49ecf53e3cd889c219a506c26563b438f809 /asm-de | |
| parent | a0e590b739a2bdd8e76c004ae60662bd81d33ca9 (diff) | |
Build German Sapphire (1.0)
Diffstat (limited to 'asm-de')
| -rw-r--r-- | asm-de/battle_message.s | 4 | ||||
| -rw-r--r-- | asm-de/easy_chat.s | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/asm-de/battle_message.s b/asm-de/battle_message.s index dda69ce44..2f671a766 100644 --- a/asm-de/battle_message.s +++ b/asm-de/battle_message.s @@ -1561,11 +1561,11 @@ _08de121754: lsls r1, r0, 2 adds r1, r0 lsls r1, 3 - ldr r0, _08de121764 @ =0x081fd47c + ldr r0, _08de121764 @ =gTrainers+4 adds r4, r1, r0 b _081219E6 .align 2, 0 -_08de121764: .4byte 0x081fd47c +_08de121764: .4byte gTrainers+4 _08121830: lsls r0, r7, 3 subs r0, r7 diff --git a/asm-de/easy_chat.s b/asm-de/easy_chat.s index 54cf8808c..9f5254147 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 |