merge overworld with master

This commit is contained in:
DizzyEggg
2018-02-14 01:12:17 +01:00
46 changed files with 2827 additions and 7155 deletions

View File

@@ -4654,12 +4654,12 @@ fmt_pokedex: @ 8031F7C
cmp r0, 0
beq _08031FA4
movs r0, 0x1
bl pokedex_count
bl GetNationalPokedexCount
b _08031FAA
.pool
_08031FA4:
movs r0, 0x1
bl sub_80C0844
bl GetHoennPokedexCount
_08031FAA:
lsls r0, 16
lsrs r7, r0, 16