diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-26 06:45:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-26 06:45:00 -0400 |
commit | eafb77fbb912d22294f168c1e6e89575b35f0d6c (patch) | |
tree | 286f735ca16bd576926197f4f6a80ab6f0c24dc4 /asm/battle_interface.s | |
parent | 7579fc65c12bd46c045d10eb8cd9a2320fd1f3f0 (diff) | |
parent | 0ae4d58e985dcc3d265ea30505f439c34eab21ab (diff) |
Merge pull request #125 from jiangzhengwenjz/battle
battle (3rd take)
Diffstat (limited to 'asm/battle_interface.s')
-rw-r--r-- | asm/battle_interface.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 3de518630..671487d57 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -4304,7 +4304,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - ldr r1, _08049D84 @ =gUnknown_83FE81C + ldr r1, _08049D84 @ =gText_HighlightRed_Left mov r0, sp bl StringCopy ldr r1, _08049D88 @ =gNumSafariBalls @@ -4350,7 +4350,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 pop {r0} bx r0 .align 2, 0 -_08049D84: .4byte gUnknown_83FE81C +_08049D84: .4byte gText_HighlightRed_Left _08049D88: .4byte gNumSafariBalls _08049D8C: .4byte gSprites _08049D90: .4byte 0x060102c0 |