summaryrefslogtreecommitdiff
path: root/engine/start_menu.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-12-28 19:34:43 -0500
committerGitHub <noreply@github.com>2017-12-28 19:34:43 -0500
commit82a05a1752b476caab8951fe03f539dcc1a63669 (patch)
tree972f867159ded40695e868338bb697a303335b62 /engine/start_menu.asm
parente2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff)
parent50fc9c3389ae8130d3670683f22f3e49555c57a3 (diff)
Merge pull request #443 from xCrystal/master
Misc style cleanup and documentation
Diffstat (limited to 'engine/start_menu.asm')
-rwxr-xr-xengine/start_menu.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/start_menu.asm b/engine/start_menu.asm
index d8fbad82d..913bf3780 100755
--- a/engine/start_menu.asm
+++ b/engine/start_menu.asm
@@ -7,7 +7,7 @@ StartMenu:: ; 125cd
farcall ReanchorBGMap_NoOAMUpdate
- ld hl, StatusFlags2
+ ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ld hl, .MenuDataHeader
jr z, .GotMenuData
@@ -284,7 +284,7 @@ endr
ld [wWhichIndexSet], a
call .FillMenuList
- ld hl, StatusFlags
+ ld hl, wStatusFlags
bit 0, [hl]
jr z, .no_pokedex
ld a, 0 ; pokedex
@@ -301,7 +301,7 @@ endr
ld a, [wLinkMode]
and a
jr nz, .no_pack
- ld hl, StatusFlags2
+ ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
jr nz, .no_pack
ld a, 2 ; pack
@@ -321,7 +321,7 @@ endr
ld a, [wLinkMode]
and a
jr nz, .no_save
- ld hl, StatusFlags2
+ ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ld a, 8 ; quit
jr nz, .write
@@ -390,7 +390,7 @@ endr
; 128d1
.DrawBugContestStatusBox: ; 128d1
- ld hl, StatusFlags2
+ ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
ret z
farcall StartMenu_DrawBugContestStatusBox
@@ -398,7 +398,7 @@ endr
; 128de
.DrawBugContestStatus: ; 128de
- ld hl, StatusFlags2
+ ld hl, wStatusFlags2
bit 2, [hl] ; bug catching contest
jr nz, .contest
ret