summaryrefslogtreecommitdiff
path: root/home/pikachu.asm
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-06-08 00:35:33 -0400
commit5da4ad3d5c62292f062d4f7b4382e6c09b7faaea (patch)
tree97319f45578efa0901fb1986678c16bbdeda6bcc /home/pikachu.asm
parente181c27c5e396aea254b471b182df3237eeb03ce (diff)
parent2bb64d11e6015e39e934e7359697c08636645994 (diff)
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'home/pikachu.asm')
-rwxr-xr-xhome/pikachu.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/home/pikachu.asm b/home/pikachu.asm
index f3ab9b8e..e79fdb1b 100755
--- a/home/pikachu.asm
+++ b/home/pikachu.asm
@@ -20,7 +20,7 @@ Func_1525:: ; 1525 (0:1525)
res 3, [hl]
pop hl
ret
-
+
Func_152d:: ; 152d (0:152d)
push hl
ld hl, wPikachuOverworldStateFlags
@@ -29,7 +29,7 @@ Func_152d:: ; 152d (0:152d)
ld [hl], $ff
pop hl
ret
-
+
DisablePikachuFollowingPlayer:: ; 153a (0:153a)
push hl
ld hl, wPikachuOverworldStateFlags
@@ -43,14 +43,14 @@ EnablePikachuFollowingPlayer:: ; 1542 (0:1542)
res 1, [hl]
pop hl
ret
-
+
CheckPikachuFollowingPlayer:: ; 154a (0:154a)
push hl
ld hl, wPikachuOverworldStateFlags
bit 1, [hl]
pop hl
ret
-
+
SpawnPikachu:: ; 1552 (0:1552)
ld a, [hl]
dec a
@@ -79,7 +79,7 @@ Pikachu_IsInArray:: ; 1568 (0:1568)
dec hl
and a
ret
-
+
GetPikachuMovementScriptByte:: ; 157c (0:157c)
push hl
push bc