diff options
| author | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-09-17 13:38:33 -0400 |
| commit | 71b40f50c0de173913d11f1e5bc228060cb4a49b (patch) | |
| tree | 4029150523fe2157e746640de6375e9530f7a2d9 /asm/battle_setup.s | |
| parent | 4b04e92e8b236d91ea5cc45813f914f10a86b748 (diff) | |
| parent | 74bda5b68088f08220cf3f1b9791e5900a6a9877 (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'asm/battle_setup.s')
| -rw-r--r-- | asm/battle_setup.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 7e797e9f8..608d7843c 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -2590,7 +2590,7 @@ ReturnEmptyStringIfNull: @ 80B1C6C push {lr} cmp r0, 0 bne _080B1C74 - ldr r0, =gUnknown_085E8D03 + ldr r0, =gText_EmptyString2 _080B1C74: pop {r1} bx r1 |