Prepare to merge

This commit is contained in:
PikalaxALT
2016-01-18 00:39:01 -05:00
parent 7cc2571529
commit 8bf255b9f8
14 changed files with 301 additions and 290 deletions

View File

@@ -367,13 +367,13 @@ NewPokedexEntry: ; fb877
ld a, [hSCX]
add -5 ; 251 ; NUM_POKEMON
ld [hSCX], a
call Functionfb8c8
call .ReturnFromDexRegistration
pop af
ld [hMapAnims], a
ret
; fb8c8
Functionfb8c8: ; fb8c8
.ReturnFromDexRegistration: ; fb8c8
call ClearTileMap
call LoadFontsExtra
call LoadStandardFont