diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-16 17:57:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-16 17:57:50 -0400 |
| commit | d574795b729742efb26b80a1c5b798cd0f58c3f4 (patch) | |
| tree | 46256c02f8d772d76a81c1ec2a9f4bd15fb05b0f /asm/battle_setup.s | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
| parent | 5e12833b13223ecc6a5a9c91332ed71303358680 (diff) | |
Merge pull request #32 from Diegoisawesome/master
Extract baserom calls from data2.s and begin tidying up strings.s
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 |