diff options
| author | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-19 16:25:15 +0200 |
| commit | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (patch) | |
| tree | b402ddfd95a21402d2ab76368d44b9f04f937725 /text | |
| parent | 3ef626d37864f4dae26f115c26e448351f19da7c (diff) | |
| parent | f399315a489c7eff28ec1941c41d12264fb38039 (diff) | |
merge conflicts resolved
Diffstat (limited to 'text')
| -rw-r--r-- | text/common_3.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/text/common_3.asm b/text/common_3.asm index ad1846f9b..bc510568d 100644 --- a/text/common_3.asm +++ b/text/common_3.asm @@ -1222,7 +1222,7 @@ UnknownText_0x1c123a: ; 1c123a text_from_ram StringBuffer1 text " caught by" line "@" - text_from_ram wdfe9 + 1 + text_from_ram wMagikarpRecordHoldersName text_waitbutton db "@" ; 1c1260 |