diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-29 16:24:41 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-29 16:24:41 -0400 |
| commit | 9abb62033819774d7b256ee0222f7c6ece987bfe (patch) | |
| tree | ade69ea7b4186c8438592bca84c1968c2d41fcbd /home | |
| parent | Pewter houses, Pewter mart (diff) | |
| download | pokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.tar.gz pokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.tar.xz pokeyellow-9abb62033819774d7b256ee0222f7c6ece987bfe.zip | |
Pewter Pokecenter
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 3a9708d9..bc7ae029 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 Func_154a + call CheckPikachuAsleep jr nz,.collision ld a,[hJoyHeld] and $2 diff --git a/home/pikachu.asm b/home/pikachu.asm index 5239873c..9e0ab541 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -30,21 +30,21 @@ Func_152d:: ; 152d (0:152d) pop hl ret -Func_153a:: ; 153a (0:153a) +SetPikachuAsleep:: ; 153a (0:153a) push hl ld hl, wPikachuOverworldStateFlags set 1, [hl] pop hl ret -Func_1542:: ; 1542 (0:1542) +ResetPikachuAsleep:: ; 1542 (0:1542) push hl ld hl, wPikachuOverworldStateFlags res 1, [hl] pop hl ret -Func_154a:: ; 154a (0:154a) +CheckPikachuAsleep:: ; 154a (0:154a) push hl ld hl, wPikachuOverworldStateFlags bit 1, [hl] |