diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-24 13:14:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-24 13:14:50 -0400 |
| commit | 74e2a0e123be0ecd0e0df516ce242aea9c348117 (patch) | |
| tree | a72251dbaad4ae8770a1895a6a416bf27fea0e50 /asm/main_menu.s | |
| parent | 3edbbb1758727fe7e74dbcba4844a186fdc8897f (diff) | |
| parent | d179300de71b214e6d5808b3780457ce41b3c92a (diff) | |
Merge pull request #88 from ultima-soul/pokedex_2
Port/Decompile pokedex.c and Dump Pokedex Entries and Text to C
Diffstat (limited to 'asm/main_menu.s')
| -rw-r--r-- | asm/main_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/main_menu.s b/asm/main_menu.s index f88fea21a..fed088ff3 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -1504,13 +1504,13 @@ sub_800CF3C: @ 800CF3C cmp r0, 0 beq _0800CF64 movs r0, 0x1 - bl pokedex_count + bl GetNationalPokedexCount b _0800CF6A .align 2, 0 _0800CF60: .4byte 0x00000829 _0800CF64: movs r0, 0x1 - bl sub_8088EDC + bl GetKantoPokedexCount _0800CF6A: lsls r0, 16 lsrs r6, r0, 16 |