diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-02-13 22:19:14 -0500 |
| commit | e1bd37dca9a53298e733c53189b5fdba9dff050b (patch) | |
| tree | 0dabac229ff7c9a64e3c2bdc862f133a97d5ba4f /asm/start_menu.s | |
| parent | e5b6d15f9163cca8688cd67ca5a0563ce6667601 (diff) | |
| parent | bb8c53f8988be6cad8f270c46f24e0f6f1e862cc (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/start_menu.s')
| -rw-r--r-- | asm/start_menu.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/start_menu.s b/asm/start_menu.s index 23ac3710a..a57bbddc3 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -418,7 +418,7 @@ _0809FAFE: cmp r1, r0 bne _0809FB34 movs r0, 0 - bl pokedex_count + bl GetNationalPokedexCount lsls r0, 16 cmp r0, 0 beq _0809FBA0 |