diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/start_menu.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/start_menu.asm')
| -rwxr-xr-x | engine/start_menu.asm | 12 |
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 |