diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 11:46:02 -0400 |
| commit | b7a20f13863331e15a074c91a4a1be38d27142c9 (patch) | |
| tree | abfb48aa129b82dc7a88c7b028f2e20a6c671f4d /home | |
| parent | 755ca8914d2878c6a6ef365e962d505ff9d7801e (diff) | |
Vermilion Fan Club
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rwxr-xr-x | home/pikachu.asm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index bc7ae029..21f5c1c8 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1222,7 +1222,7 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) ; if no sprite collision cp $f jr nz,.collision - call CheckPikachuAsleep + call CheckPikachuFollowingPlayer jr nz,.collision ld a,[hJoyHeld] and $2 diff --git a/home/pikachu.asm b/home/pikachu.asm index 9e0ab541..bd750773 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -30,21 +30,21 @@ Func_152d:: ; 152d (0:152d) pop hl ret -SetPikachuAsleep:: ; 153a (0:153a) +DisablePikachuFollowingPlayer:: ; 153a (0:153a) push hl ld hl, wPikachuOverworldStateFlags set 1, [hl] pop hl ret -ResetPikachuAsleep:: ; 1542 (0:1542) +EnablePikachuFollowingPlayer:: ; 1542 (0:1542) push hl ld hl, wPikachuOverworldStateFlags res 1, [hl] pop hl ret -CheckPikachuAsleep:: ; 154a (0:154a) +CheckPikachuFollowingPlayer:: ; 154a (0:154a) push hl ld hl, wPikachuOverworldStateFlags bit 1, [hl] |