diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-08 08:07:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 08:07:53 -0400 |
| commit | 39d68ebd445be5657a916dec1b4872717e9c40d3 (patch) | |
| tree | 4394601f49f220e3c32d9879a3c26284c9c92771 /asm/battle_interface.s | |
| parent | 7980c4aa071685983f84861cc7dc69d6daf30a90 (diff) | |
| parent | 122f1395823cfa3dfd96842c61411ad29700f8de (diff) | |
Merge pull request #77 from jiangzhengwenjz/misc
corrected sprite.h + finished safari_zone, list_menu, menu_indicators, field_poison, buy_menu_helpers, dynamic_placeholder_text_util
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 fa06f684b..acf228669 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -4307,7 +4307,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 ldr r1, _08049D84 @ =gUnknown_83FE81C mov r0, sp bl StringCopy - ldr r1, _08049D88 @ =gUnknown_2039994 + ldr r1, _08049D88 @ =gNumSafariBalls ldrb r1, [r1] movs r2, 0 movs r3, 0x2 @@ -4351,7 +4351,7 @@ UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10 bx r0 .align 2, 0 _08049D84: .4byte gUnknown_83FE81C -_08049D88: .4byte gUnknown_2039994 +_08049D88: .4byte gNumSafariBalls _08049D8C: .4byte gSprites _08049D90: .4byte 0x060102c0 _08049D94: .4byte 0x06010a00 |