diff options
author | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
---|---|---|
committer | PikalaxALT <PikalaxALT@gmail.com> | 2016-01-18 00:39:01 -0500 |
commit | 8bf255b9f84f7e4f93e85a75512a002ef240a10f (patch) | |
tree | 786ae5588f8bfe4b067cb3e91fd66cc4d95bd2da /engine/time_capsule | |
parent | 7cc2571529d6b3f5ffcbb71c62fab31b27ba224a (diff) |
Prepare to merge
Diffstat (limited to 'engine/time_capsule')
-rwxr-xr-x | engine/time_capsule/conversion.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm index e2c545c48..5d093d515 100755 --- a/engine/time_capsule/conversion.asm +++ b/engine/time_capsule/conversion.asm @@ -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 |