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_2.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_2.s')
| -rw-r--r-- | asm/battle_2.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 0826ea927..ee7b80ad4 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -13497,7 +13497,7 @@ sub_8016AC0: @ 8016AC0 strh r1, [r0] ldr r0, _08016B08 @ =gBattle_BG0_Y strh r1, [r0] - ldr r1, _08016B0C @ =gUnknown_2039994 + ldr r1, _08016B0C @ =gNumSafariBalls ldrb r0, [r1] subs r0, 0x1 strb r0, [r1] @@ -13518,7 +13518,7 @@ _08016AFC: .4byte gUnknown_2023BDE _08016B00: .4byte gUnknown_2023BE2 _08016B04: .4byte gBattle_BG0_X _08016B08: .4byte gBattle_BG0_Y -_08016B0C: .4byte gUnknown_2039994 +_08016B0C: .4byte gNumSafariBalls _08016B10: .4byte gUnknown_2023D68 _08016B14: .4byte gUnknown_2023D74 _08016B18: .4byte gUnknown_81D99B0 |