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/naming_screen.s | |
| parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
| parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/naming_screen.s')
| -rw-r--r-- | asm/naming_screen.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/naming_screen.s b/asm/naming_screen.s index 40ec65ff8..1839a7568 100644 --- a/asm/naming_screen.s +++ b/asm/naming_screen.s @@ -4033,7 +4033,7 @@ sub_80E4EF0: @ 80E4EF0 str r1, [sp] movs r1, 0 str r1, [sp, 0x4] - ldr r1, =gUnknown_085EEAF6 + ldr r1, =gText_MoveOkBack str r1, [sp, 0x8] movs r1, 0 movs r2, 0x2 |