diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 00:35:33 -0400 |
| commit | 5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch) | |
| tree | 97319f45578efa0901fb1986678c16bbdeda6bcc /engine/overworld/map_sprite_functions1.asm | |
| parent | e181c27c5e396aea254b471b182df3237eeb03ce (diff) | |
| parent | 2bb64d11e6015e39e934e7359697c08636645994 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/overworld/map_sprite_functions1.asm')
| -rw-r--r-- | engine/overworld/map_sprite_functions1.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/map_sprite_functions1.asm index 46479a9f..722fc14e 100644 --- a/engine/overworld/map_sprite_functions1.asm +++ b/engine/overworld/map_sprite_functions1.asm @@ -55,7 +55,7 @@ UpdateNonPlayerSprite: ; 4be3 (1:4be3) ; multiple of $10 to make comparisons easier. DetectCollisionBetweenSprites: ; 4bf7 (1:4bf7) ; nop - + ld h, wSpriteStateData1 / $100 ld a, [H_CURRENTSPRITEOFFSET] ld l, a @@ -355,7 +355,7 @@ Func_4d0a: ; 4d0a (1:4d0a) inc l inc l ret - + SetSpriteCollisionValues: ; 4d22 (1:4d22) and a ld b, 0 |