diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 12:09:36 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-06 12:09:36 -0400 |
| commit | 96a58ce52ac4b8c4c8b2ecbf0f185d1ebda10a6e (patch) | |
| tree | 94af78e339c96436e8ee2180e19279788659056d /scripts/fanclub.asm | |
| parent | aafed67874b49180b4640eeaf5b20981c24ce9fc (diff) | |
Split out pikachu engine functions; sprite state data macros
Diffstat (limited to 'scripts/fanclub.asm')
| -rwxr-xr-x | scripts/fanclub.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/fanclub.asm b/scripts/fanclub.asm index a03fd2d7..fbc6d959 100755 --- a/scripts/fanclub.asm +++ b/scripts/fanclub.asm @@ -10,18 +10,18 @@ FanClubScriptPointers: dw FanClubScript2 FanClubScript1: - ld hl, wPreventBlackout + ld hl, wd492 bit 7, [hl] call z, FanClubScript_59a44 - ld hl, wPreventBlackout + ld hl, wd492 set 7, [hl] ret FanClubScript2: - ld hl, wPreventBlackout + ld hl, wd492 bit 7, [hl] call z, FanClubScript_59a39 - ld hl, wPreventBlackout + ld hl, wd492 set 7, [hl] ret @@ -50,7 +50,7 @@ FanClubScript_59a44: ld [wEmotionBubbleSpriteIndex], a predef EmotionBubble ld hl, PikachuMovementScript_59a8c - call Func_159b + call ApplyPikachuMovementData ld a, $2 ld [wSpriteStateData1 + 3 * $10 + 1], a ; Seel xor a ; SPRITE_FACING_DOWN |