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/start_menu.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/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index 9f6ef8662..4f898b88c 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -160,7 +160,7 @@ sub_806EE7C: @ 806EE7C movs r1, 0 bl DrawStdWindowFrame ldr r0, _0806EEFC @ =gStringVar1 - ldr r1, _0806EF00 @ =gUnknown_2039996 + ldr r1, _0806EF00 @ =gSafariZoneStepCounter ldrh r1, [r1] movs r2, 0x1 movs r3, 0x3 @@ -172,7 +172,7 @@ sub_806EE7C: @ 806EE7C movs r3, 0x3 bl ConvertIntToDecimalStringN ldr r0, _0806EF08 @ =gStringVar3 - ldr r1, _0806EF0C @ =gUnknown_2039994 + ldr r1, _0806EF0C @ =gNumSafariBalls ldrb r1, [r1] movs r2, 0x1 movs r3, 0x2 @@ -203,10 +203,10 @@ sub_806EE7C: @ 806EE7C _0806EEF4: .4byte gUnknown_2037101 _0806EEF8: .4byte gUnknown_83A738C _0806EEFC: .4byte gStringVar1 -_0806EF00: .4byte gUnknown_2039996 +_0806EF00: .4byte gSafariZoneStepCounter _0806EF04: .4byte gStringVar2 _0806EF08: .4byte gStringVar3 -_0806EF0C: .4byte gUnknown_2039994 +_0806EF0C: .4byte gNumSafariBalls _0806EF10: .4byte gStringVar4 _0806EF14: .4byte gUnknown_84162A9 thumb_func_end sub_806EE7C @@ -1009,7 +1009,7 @@ sub_806F554: @ 806F554 bl sub_806EF18 bl sub_80F7998 bl sub_806FEA0 - bl sub_80A0F3C + bl SafariZoneRetirePrompt movs r0, 0x1 pop {r1} bx r1 |