dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up FRLG-specific anim scripts

Browse Source
This commit is contained in:
GriffinR
2022-08-19 09:58:34 -04:00
parent 17b2faa182
commit c976547c02
2 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/battle_anim_scripts.s
+25 -25
View File
@@ -4844,10 +4844,10 @@ UnusedFutureSightHit:
setalpha 8, 8 setalpha 8, 8
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8 waitplaysewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 8
createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 15, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 15, 1
createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, 1, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 15, ANIM_TARGET, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 24, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 24, 1
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@@ -9759,10 +9759,10 @@ Move_DOOM_DESIRE:
UnusedDoomDesireHit: UnusedDoomDesireHit:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 0, 16, RGB_WHITE
waitforvisualfinish waitforvisualfinish
delay 10 delay 10
createvisualtask AnimTask_DoomDesireLightBeam, 5, createvisualtask AnimTask_DoomDesireLightBeam, 5
delay 5 delay 5
playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_ATTACKER
delay 10 delay 10
@@ -9786,7 +9786,7 @@ UnusedDoomDesireHit:
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
end end
@@ -10892,46 +10892,46 @@ General_WishHeal:
waitforvisualfinish waitforvisualfinish
call HealingEffect call HealingEffect
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 10, 0, 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 10, 0, RGB_BLACK
end end
General_MonScared: General_MonScared:
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1
waitforvisualfinish waitforvisualfinish
loadspritegfx ANIM_TAG_SWEAT_BEAD loadspritegfx ANIM_TAG_SWEAT_BEAD
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 10, 26336 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, 2, 0, 10, RGB(0, 23, 25)
createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 10, 1
delay 20 delay 20
createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1
playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET playsewithpan SE_M_SKETCH, SOUND_PAN_TARGET
createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1
createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
createvisualtask AnimTask_StretchTargetUp, 3, createvisualtask AnimTask_StretchTargetUp, 3
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 10, 0, 26336 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, 2, 10, 0, RGB(0, 23, 25)
waitforvisualfinish waitforvisualfinish
end end
General_GhostGetOut: General_GhostGetOut:
createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1 createvisualtask AnimTask_SafariOrGhost_DecideAnimSides, 2, 1
waitforvisualfinish waitforvisualfinish
fadetobg 2 fadetobg BG_GHOST
waitbgfadeout waitbgfadeout
monbg_static 0 monbg_static ANIM_ATTACKER
createvisualtask sub_80B6BBC, 2, createvisualtask AnimTask_GhostGetOut, 2
waitbgfadein waitbgfadein
loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3 loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3
waitforvisualfinish waitforvisualfinish
clearmonbg_static 0 clearmonbg_static ANIM_ATTACKER
delay 1 delay 1
loadspritegfx ANIM_TAG_SWEAT_BEAD loadspritegfx ANIM_TAG_SWEAT_BEAD
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, -1, 0, 6, 27349 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, -1, 0, 6, RGB(21, 22, 26)
createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 0, 1
createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1 createsprite gSprayWaterDropletSpriteTemplate, ANIM_TARGET, 5, 1, 1
createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
createvisualtask AnimTask_StretchTargetUp, 3, createvisualtask AnimTask_StretchTargetUp, 3
waitforvisualfinish waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, -1, 6, 0, 27349 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_TARGET, -1, 6, 0, RGB(21, 22, 26)
waitforvisualfinish waitforvisualfinish
restorebg restorebg
waitbgfadein waitbgfadein
@@ -10968,11 +10968,11 @@ General_SafariRockThrow:
end end
General_SafariReaction: General_SafariReaction:
createvisualtask AnimTask_SafariGetReaction, 2, createvisualtask AnimTask_SafariGetReaction, 2
waitforvisualfinish waitforvisualfinish
jumpargeq 7, 0, SafariReaction_WatchingCarefully jumpreteq 0, SafariReaction_WatchingCarefully
jumpargeq 7, 1, SafariReaction_Angry jumpreteq 1, SafariReaction_Angry
jumpargeq 7, 2, SafariReaction_Eating jumpreteq 2, SafariReaction_Eating
end end
SafariReaction_WatchingCarefully: SafariReaction_WatchingCarefully:
@@ -11075,7 +11075,7 @@ BallThrowTrainerBlock:
BallThrowGhostDodged: BallThrowGhostDodged:
delay 16 delay 16
createvisualtask AnimTask_WindUpLunge, 2, 1, 48, 6, 16, 48, -48, 16 createvisualtask AnimTask_WindUpLunge, 2, ANIM_TARGET, 48, 6, 16, 48, -48, 16
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_TARGET playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_TARGET
waitplaysewithpan SE_M_TAKE_DOWN, SOUND_PAN_TARGET, 48 waitplaysewithpan SE_M_TAKE_DOWN, SOUND_PAN_TARGET, 48
waitforvisualfinish waitforvisualfinish
src/battle_anim_ghost.c
+14 -12
View File
@@ -38,9 +38,9 @@ static void AnimGhostStatusSprite_End(struct Sprite *sprite);
static void AnimTask_GrudgeFlames_Step(u8 taskId); static void AnimTask_GrudgeFlames_Step(u8 taskId);
static void AnimGrudgeFlame(struct Sprite *sprite); static void AnimGrudgeFlame(struct Sprite *sprite);
static void AnimMonMoveCircular(struct Sprite *sprite); static void AnimMonMoveCircular(struct Sprite *sprite);
static void sub_80B6BE4(u8 taskId); static void AnimTask_GhostGetOut_Step1(u8 taskId);
static void sub_80B6F30(u8 taskId); static void AnimTask_GhostGetOut_Step2(u8 taskId);
static void sub_80B6FC4(u8 taskId); static void AnimTask_GhostGetOut_Step3(u8 taskId);
static void AnimMonMoveCircular_Step(struct Sprite *sprite); static void AnimMonMoveCircular_Step(struct Sprite *sprite);
static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] = static const union AffineAnimCmd sAffineAnim_ConfuseRayBallBounce[] =
@@ -1262,16 +1262,18 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
} }
} }
void sub_80B6BBC(u8 taskId) // Used by the ghost Marowak when it hasn't been revealed by the Silph Scope.
// Animates a shimmering copy of the attacker (the ghost) accompanied by the 'Scary Face' graphics
void AnimTask_GhostGetOut(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
task->data[15] = 0; task->data[15] = 0;
task->func = sub_80B6BE4; task->func = AnimTask_GhostGetOut_Step1;
sub_80B6BE4(taskId); task->func(taskId);
} }
static void sub_80B6BE4(u8 taskId) static void AnimTask_GhostGetOut_Step1(u8 taskId)
{ {
s16 y; s16 y;
struct BattleAnimBgData animBgData; struct BattleAnimBgData animBgData;
@@ -1367,14 +1369,14 @@ static void sub_80B6BE4(u8 taskId)
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG1_ON);
else else
SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON); SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_BG2_ON);
task->func = sub_80B6F30; task->func = AnimTask_GhostGetOut_Step2;
task->data[15] = 0; task->data[15] = 0;
break; break;
} }
++task->data[15]; ++task->data[15];
} }
static void sub_80B6F30(u8 taskId) static void AnimTask_GhostGetOut_Step2(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];
@@ -1388,12 +1390,12 @@ static void sub_80B6F30(u8 taskId)
if (task->data[1] == 128) if (task->data[1] == 128)
{ {
task->data[15] = 0; task->data[15] = 0;
task->func = sub_80B6FC4; task->func = AnimTask_GhostGetOut_Step3;
sub_80B6FC4(taskId); task->func(taskId);
} }
} }
static void sub_80B6FC4(u8 taskId) static void AnimTask_GhostGetOut_Step3(u8 taskId)
{ {
struct Task *task = &gTasks[taskId]; struct Task *task = &gTasks[taskId];