aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/map_sprite_functions1.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
committerdannye <corrnondacqb@yahoo.com>2016-06-11 16:16:56 -0500
commitc979b3bb03b121dd03a800df74144cd69a74601a (patch)
tree0d6bb48125efe6f6215347967383ba4c3b7da391 /engine/overworld/map_sprite_functions1.asm
parentSync with pokered (diff)
parentPart 1 of syncing with pokered. (diff)
downloadpokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.gz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.tar.xz
pokeyellow-c979b3bb03b121dd03a800df74144cd69a74601a.zip
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'engine/overworld/map_sprite_functions1.asm')
-rw-r--r--engine/overworld/map_sprite_functions1.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm
index a8412a4e..722fc14e 100644
--- a/engine/overworld/map_sprite_functions1.asm
+++ b/engine/overworld/map_sprite_functions1.asm
@@ -28,7 +28,7 @@ _UpdateSprites: ; 4bb7 (1:4bb7)
and a
jp z, UpdatePlayerSprite
cp $f0 ; pikachu
- jp z, Func_1552
+ jp z, SpawnPikachu
ld a, [hl]
UpdateNonPlayerSprite: ; 4be3 (1:4be3)