Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile
This commit is contained in:
LOuroboros committed
commit
1b039062da
970 files changed
+49287
-47189
No files matched your search
+32
-32
@@ -532,7 +532,7 @@ gBattleAnims_Moves::
|
||||
.4byte Move_QUASH
|
||||
.4byte Move_ACROBATICS
|
||||
.4byte Move_REFLECT_TYPE
|
||||
.4byte Move_RETALITATE
|
||||
.4byte Move_RETALIATE
|
||||
.4byte Move_FINAL_GAMBIT
|
||||
.4byte Move_BESTOW
|
||||
.4byte Move_INFERNO
|
||||
@@ -1123,7 +1123,7 @@ Move_METAL_BURST:
|
||||
loadspritegfx ANIM_TAG_ECLIPSING_ORB
|
||||
loadspritegfx ANIM_TAG_RED_ORB
|
||||
loopsewithpan SE_M_TRI_ATTACK, -64, 18, 3
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_DefenseCurlDeformMon, 5
|
||||
waitforvisualfinish
|
||||
setarg 7, -1
|
||||
@@ -1138,7 +1138,7 @@ Move_METAL_BURST:
|
||||
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 20, 192
|
||||
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -3495,7 +3495,7 @@ Move_IRON_HEAD:
|
||||
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
|
||||
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -4470,18 +4470,18 @@ ShadowForcePrep:
|
||||
monbg ANIM_ATTACKER
|
||||
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER,
|
||||
createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 0
|
||||
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
|
||||
createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1
|
||||
delay 80
|
||||
createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 1
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATTACKER
|
||||
invisible 0
|
||||
@@ -5611,7 +5611,7 @@ Move_REFLECT_TYPE:
|
||||
blendoff
|
||||
end
|
||||
|
||||
Move_RETALITATE:
|
||||
Move_RETALIATE:
|
||||
loadspritegfx ANIM_TAG_CUT @Cut
|
||||
monbg ANIM_DEF_PARTNER
|
||||
setalpha 9, 8
|
||||
@@ -13482,7 +13482,7 @@ Move_BODY_PRESS::
|
||||
end
|
||||
|
||||
Move_DECORATE::
|
||||
end @to do:
|
||||
goto Move_FLOWER_SHIELD
|
||||
|
||||
Move_DRUM_BEATING::
|
||||
loadspritegfx ANIM_TAG_MUSIC_NOTES
|
||||
@@ -13958,7 +13958,7 @@ Move_EXPANDING_FORCE::
|
||||
end @to do:
|
||||
|
||||
Move_STEEL_ROLLER::
|
||||
end @to do:
|
||||
goto Move_GYRO_BALL
|
||||
|
||||
Move_SCALE_SHOT::
|
||||
end @to do:
|
||||
@@ -13985,7 +13985,7 @@ Move_SKITTER_SMACK::
|
||||
end @to do:
|
||||
|
||||
Move_BURNING_JEALOUSY::
|
||||
end @to do:
|
||||
goto Move_OVERHEAT
|
||||
|
||||
Move_LASH_OUT::
|
||||
end @to do:
|
||||
@@ -14012,7 +14012,7 @@ Move_SCORCHING_SANDS::
|
||||
end @to do:
|
||||
|
||||
Move_JUNGLE_HEALING::
|
||||
end @to do:
|
||||
goto Move_AROMATHERAPY
|
||||
|
||||
Move_WICKED_BLOW::
|
||||
end @to do:
|
||||
@@ -15282,12 +15282,12 @@ Explosion1:
|
||||
Move_DEFENSE_CURL:
|
||||
loadspritegfx ANIM_TAG_ECLIPSING_ORB
|
||||
loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
|
||||
createvisualtask AnimTask_DefenseCurlDeformMon, 5
|
||||
waitforvisualfinish
|
||||
createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -20864,7 +20864,7 @@ Move_IRON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
waitforvisualfinish
|
||||
@@ -20884,7 +20884,7 @@ Move_POISON_TAIL:
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
|
||||
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
call PoisonBubblesEffect
|
||||
@@ -21161,7 +21161,7 @@ Move_DISABLE:
|
||||
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
|
||||
createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 24, -16
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_GrowAndGreyscale, 5
|
||||
createvisualtask AnimTask_GrowAndGrayscale, 5
|
||||
loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4
|
||||
waitforvisualfinish
|
||||
delay 1
|
||||
@@ -21556,16 +21556,16 @@ Move_PERISH_SONG:
|
||||
panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
|
||||
delay 80
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0
|
||||
delay 100
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
@@ -23191,7 +23191,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask GetIsDoomDesireHitTurn, 2
|
||||
delay 1
|
||||
monbg ANIM_ATK_PARTNER
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, FALSE
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, FALSE
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
setalpha 8, 8
|
||||
@@ -23199,7 +23199,7 @@ Move_DOOM_DESIRE:
|
||||
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
|
||||
waitforvisualfinish
|
||||
delay 20
|
||||
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, TRUE
|
||||
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, TRUE
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATK_PARTNER
|
||||
|
||||
Reference in new issue
Block a user