diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
| commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
| tree | 2998678c0f3db391b080318633bc506248542ecb /asm/walda_phrase.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/walda_phrase.s')
| -rwxr-xr-x | asm/walda_phrase.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/walda_phrase.s b/asm/walda_phrase.s index f7a1be6c2..be754f386 100755 --- a/asm/walda_phrase.s +++ b/asm/walda_phrase.s @@ -53,7 +53,7 @@ _081D9A44: bl sub_80D2578 cmp r0, 0 beq _081D9A5C - ldr r0, =gUnknown_085EE49A + ldr r0, =gText_Peekaboo bl sub_80D255C b _081D9A68 .pool |