From 96a58ce52ac4b8c4c8b2ecbf0f185d1ebda10a6e Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Mon, 6 Jun 2016 12:09:36 -0400 Subject: Split out pikachu engine functions; sprite state data macros --- main.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main.asm') diff --git a/main.asm b/main.asm index cc67186d..12b1d645 100755 --- a/main.asm +++ b/main.asm @@ -689,7 +689,7 @@ Func_2fd6a: ; 2fd6a (b:7d6a) callab IsThisPartymonStarterPikachu_Party ret nc ld a, $3 - ld [wd431], a + ld [wPikachuSpawnState], a ret INCLUDE "engine/battle/scale_sprites.asm" @@ -1186,7 +1186,7 @@ MtMoon3Script_4a325: ; pikachu-related function? pop af ld [wUpdateSpritesEnabled], a pop hl - call Func_159b + call ApplyPikachuMovementData ret INCLUDE "data/mapHeaders/safarizonewest.asm" -- cgit v1.3.1-sl0p