ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #851 from Sewef/patch-3

Browse Source 
battle_anim_effects_3
This commit is contained in:
huderlem 2019-11-24 12:02:54 -06:00 committed by GitHub
commit 9a81661075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 378 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
data/battle_anim_scripts.s
View File

@ -1657,9 +1657,9 @@ Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3 loopsewithpan SE_W161, SOUND_PAN_ATTACKER, 18, 3
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
createvisualtask sub_815B338, 5 createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE338, ANIM_ATTACKER, 2, 0, 6, 0, 1 createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
waitforvisualfinish waitforvisualfinish
@ -2086,7 +2086,7 @@ Move_MEAN_LOOK:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, RGB_BLACK
loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4 loopsewithpan SE_W109, SOUND_PAN_TARGET, 15, 4
waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55 waitplaysewithpan SE_W043, SOUND_PAN_TARGET, 0x55
createsprite gUnknown_085CE104, ANIM_ATTACKER, 2 createsprite gMeanLookEyeSpriteTemplate, ANIM_ATTACKER, 2
delay 120 delay 120
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_BLACK
delay 30 delay 30
@ -2264,23 +2264,23 @@ Move_SMOKESCREEN:
loadspritegfx ANIM_TAG_BLACK_SMOKE loadspritegfx ANIM_TAG_BLACK_SMOKE
loadspritegfx ANIM_TAG_BLACK_BALL loadspritegfx ANIM_TAG_BLACK_BALL
playsewithpan SE_W104, SOUND_PAN_ATTACKER playsewithpan SE_W104, SOUND_PAN_ATTACKER
createsprite gUnknown_085CE050, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815A160, 2 createvisualtask AnimTask_SmokescreenImpact, 2
delay 2 delay 2
playsewithpan SE_W028, SOUND_PAN_TARGET playsewithpan SE_W028, SOUND_PAN_TARGET
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 104, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 104, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -12, 72, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -12, 72, 1, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 56, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 56, 1, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, -6, 88, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, -6, 88, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 56, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 0, 56, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 0, 88, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 0, 88, 1, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 72, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 6, 72, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 6, 104, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 6, 104, 1, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 72, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 12, 72, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 12, 56, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 12, 56, 1, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 80, 0, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 18, 80, 0, 75
createsprite gUnknown_085CE038, ANIM_TARGET, 4, 0, 18, 72, 1, 75 createsprite gBlackSmokeSpriteTemplate, ANIM_TARGET, 4, 0, 18, 72, 1, 75
waitforvisualfinish waitforvisualfinish
end end
@ -3340,8 +3340,8 @@ Move_RAPID_SPIN:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_RAPID_SPIN loadspritegfx ANIM_TAG_RAPID_SPIN
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
createsprite gUnknown_085CE288, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2
createvisualtask sub_815ADB0, 2, 0, 2, 0 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0
loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
waitforvisualfinish waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2
@ -3349,7 +3349,7 @@ Move_RAPID_SPIN:
playsewithpan SE_W003, SOUND_PAN_TARGET playsewithpan SE_W003, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
delay 8 delay 8
createvisualtask sub_815ADB0, 2, 0, 2, 1 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1
loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4 loopsewithpan SE_W013B, SOUND_PAN_ATTACKER, 8, 4
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
@ -3493,7 +3493,7 @@ Move_HAIL:
Move_TORMENT: Move_TORMENT:
loadspritegfx ANIM_TAG_ANGER loadspritegfx ANIM_TAG_ANGER
loadspritegfx ANIM_TAG_THOUGHT_BUBBLE loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
createvisualtask sub_815AFF0, 2 createvisualtask AnimTask_TormentAttacker, 2
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1 createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_TARGET, RGB_RED, 10, 1, 1
createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28 createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, -20, -28
@ -3906,7 +3906,7 @@ Move_LUSTER_PURGE:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
fadetobg BG_PSYCHIC fadetobg BG_PSYCHIC
waitbgfadeout waitbgfadeout
createvisualtask sub_815A5C8, 5 createvisualtask AnimTask_FadeScreenToWhite, 5
waitbgfadein waitbgfadein
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 12, 8 setalpha 12, 8
@ -4623,8 +4623,8 @@ Move_MIND_READER:
loadspritegfx ANIM_TAG_ROUND_WHITE_HALO loadspritegfx ANIM_TAG_ROUND_WHITE_HALO
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
playsewithpan SE_W109, SOUND_PAN_TARGET playsewithpan SE_W109, SOUND_PAN_TARGET
createsprite gUnknown_085CE07C, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0
createsprite gUnknown_085CE094, ANIM_ATTACKER, 5 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5
delay 40 delay 40
playsewithpan SE_W043, SOUND_PAN_TARGET playsewithpan SE_W043, SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK createvisualtask sub_8115A04, 2, 1, 1, 2, 0, 10, RGB_BLACK
@ -4634,26 +4634,26 @@ Move_MIND_READER:
end end
MindReaderEffect: MindReaderEffect:
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 70, 0, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 70, 0, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 40, 40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 40, 40, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 10, -60, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 10, -60, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, -40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -50, -40, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, 40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -40, 40, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -50, 6
delay 2 delay 2
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -30, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -30, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 60, 10, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 60, 10, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, 60, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0, 60, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 0, -40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0, -40, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, 20, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, -30, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, -30, 6
delay 2 delay 2
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -50, 50, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -50, 50, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -60, 20, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -60, 20, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, -40, -40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, -40, -40, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 20, -60, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 20, -60, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 50, -50, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 50, -50, 6
createsprite gUnknown_085CE0AC, ANIM_ATTACKER, 4, 35, 40, 6 createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 35, 40, 6
delay 2 delay 2
return return
@ -4912,7 +4912,7 @@ Move_SCRATCH:
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
playsewithpan SE_W010, SOUND_PAN_TARGET playsewithpan SE_W010, SOUND_PAN_TARGET
createsprite gUnknown_085CE020, ANIM_ATTACKER, 2, 0, 0, 1, 0 createsprite gScratchSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
@ -6086,14 +6086,14 @@ Move_SPIKES:
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
playsewithpan SE_W026, SOUND_PAN_ATTACKER playsewithpan SE_W026, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 0, 24, 30 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 24, 30
delay 10 delay 10
playsewithpan SE_W026, SOUND_PAN_ATTACKER playsewithpan SE_W026, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, -24, 24, 30 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, -24, 24, 30
delay 10 delay 10
waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28 waitplaysewithpan SE_W030, SOUND_PAN_TARGET, 28
createsprite gUnknown_085CE11C, ANIM_TARGET, 2, 20, 0, 24, 24, 30 createsprite gSpikesSpriteTemplate, ANIM_TARGET, 2, 20, 0, 24, 24, 30
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
@ -6986,7 +6986,7 @@ Move_LEER:
monbgprio_28 ANIM_ATTACKER monbgprio_28 ANIM_ATTACKER
setalpha 8, 8 setalpha 8, 8
playsewithpan SE_W043, SOUND_PAN_ATTACKER playsewithpan SE_W043, SOUND_PAN_ATTACKER
createsprite gUnknown_085CE150, ANIM_ATTACKER, 2, 24, -12 createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 24, -12
createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
waitforvisualfinish waitforvisualfinish
delay 10 delay 10
@ -7915,7 +7915,7 @@ Move_BATON_PASS:
loadspritegfx ANIM_TAG_POKEBALL loadspritegfx ANIM_TAG_POKEBALL
playsewithpan SE_W226, SOUND_PAN_ATTACKER playsewithpan SE_W226, SOUND_PAN_ATTACKER
createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30) createvisualtask sub_8115A04, 2, 31, 1, 2, 0, 11, RGB(31, 22, 30)
createsprite gUnknown_085CE370, ANIM_ATTACKER, 2 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2
end end
Move_PERISH_SONG: Move_PERISH_SONG:
@ -7958,26 +7958,26 @@ Move_SLEEP_TALK:
loadspritegfx ANIM_TAG_LETTER_Z loadspritegfx ANIM_TAG_LETTER_Z
createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, ANIM_ATTACKER
delay 20 delay 20
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
playsewithpan SE_W173, SOUND_PAN_ATTACKER playsewithpan SE_W173, SOUND_PAN_ATTACKER
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -1 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1
delay 20 delay 20
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
playsewithpan SE_W173, SOUND_PAN_ATTACKER playsewithpan SE_W173, SOUND_PAN_ATTACKER
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -5 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -5
delay 20 delay 20
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3
playsewithpan SE_W173, SOUND_PAN_ATTACKER playsewithpan SE_W173, SOUND_PAN_ATTACKER
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3
delay 6 delay 6
createsprite gUnknown_085CE190, ANIM_TARGET, 2, 0, 20, 5, -3 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -3
waitforvisualfinish waitforvisualfinish
end end
@ -7993,7 +7993,7 @@ Move_HYPER_FANG:
goto HyperFangOnPlayer goto HyperFangOnPlayer
HyperFangContinue: HyperFangContinue:
waitbgfadeout waitbgfadeout
createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 createsprite gFangSpriteTemplate, ANIM_TARGET, 2
waitbgfadein waitbgfadein
createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 0, 10, 10, 1
playsewithpan SE_W043, SOUND_PAN_TARGET playsewithpan SE_W043, SOUND_PAN_TARGET
@ -8013,8 +8013,8 @@ HyperFangInContest:
goto HyperFangContinue goto HyperFangContinue
Move_TRI_ATTACK: Move_TRI_ATTACK:
loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE loadspritegfx ANIM_TAG_TRI_ATTACK_TRIANGLE
createsprite gUnknown_085CE2F8, ANIM_TARGET, 2, 16, 0 createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0
playsewithpan SE_W161, SOUND_PAN_ATTACKER playsewithpan SE_W161, SOUND_PAN_ATTACKER
delay 20 delay 20
playsewithpan SE_W161, SOUND_PAN_ATTACKER playsewithpan SE_W161, SOUND_PAN_ATTACKER
@ -8095,21 +8095,21 @@ Move_WILL_O_WISP:
Move_ENCORE: Move_ENCORE:
loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_SPOTLIGHT
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask sub_815ABEC, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE22C, ANIM_TARGET, 2, 0, -8 createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8
createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9
createsprite gUnknown_085CE244, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 1, 0, 9
createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9 createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, -2, 0, 0, 0, 9
createsprite gUnknown_085CE25C, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9 createsprite gClappingHand2SpriteTemplate, ANIM_ATTACKER, 3, 2, 0, 1, 0, 9
delay 16 delay 16
createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815AC8C, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
Move_TRICK: Move_TRICK:
@ -8146,7 +8146,7 @@ Move_WISH:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, RGB_BLACK
waitforvisualfinish waitforvisualfinish
panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0 panse_27 SE_W115, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, -3, 0
createsprite gUnknown_085CE388, ANIM_ATTACKER, 40 createsprite gWishStarSpriteTemplate, ANIM_ATTACKER, 40
waitforvisualfinish waitforvisualfinish
delay 60 delay 60
loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3 loopsewithpan SE_W215, SOUND_PAN_ATTACKER, 16, 3
@ -8160,7 +8160,7 @@ Move_STOCKPILE:
loadspritegfx ANIM_TAG_GRAY_ORB loadspritegfx ANIM_TAG_GRAY_ORB
playsewithpan SE_W025, SOUND_PAN_ATTACKER playsewithpan SE_W025, SOUND_PAN_ATTACKER
createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask sub_8115A04, 2, 2, 8, 1, 0, 12, RGB_WHITE
createvisualtask sub_815B65C, 5 createvisualtask AnimTask_StockpileDeformMon, 5
call Stockpile1 call Stockpile1
call Stockpile1 call Stockpile1
waitforvisualfinish waitforvisualfinish
@ -8189,7 +8189,7 @@ Move_SPIT_UP:
loadspritegfx ANIM_TAG_RED_ORB_2 loadspritegfx ANIM_TAG_RED_ORB_2
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_815B6B4, 5 createvisualtask AnimTask_SpitUpDeformMon, 5
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
delay 45 delay 45
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
@ -8236,7 +8236,7 @@ Move_SWALLOW:
loadspritegfx ANIM_TAG_BLUE_ORB loadspritegfx ANIM_TAG_BLUE_ORB
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
playsewithpan SE_W036, SOUND_PAN_ATTACKER playsewithpan SE_W036, SOUND_PAN_ATTACKER
createvisualtask sub_815B778, 5 createvisualtask AnimTask_SwallowDeformMon, 5
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 8, 2
delay 38 delay 38
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
@ -8249,15 +8249,15 @@ SwallowContinue:
call HealingEffect call HealingEffect
end end
SwallowEffect: SwallowEffect:
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 0, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -24, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -24, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 16, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 16, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, -16, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, -16, -8
delay 1 delay 1
createsprite gUnknown_085CE418, ANIM_ATTACKER, 2, 24, -8 createsprite gSwallowBlueOrbSpriteTemplate, ANIM_ATTACKER, 2, 24, -8
delay 1 delay 1
return return
SwallowGood: SwallowGood:
@ -8272,7 +8272,7 @@ Move_TRANSFORM:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
playsewithpan SE_W100, SOUND_PAN_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
createvisualtask sub_815B7D0, 2, 0 createvisualtask AnimTask_TransformMon, 2, 0
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
end end
@ -8280,7 +8280,7 @@ Move_TRANSFORM:
Move_MORNING_SUN: Move_MORNING_SUN:
loadspritegfx ANIM_TAG_GREEN_STAR loadspritegfx ANIM_TAG_GREEN_STAR
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask sub_815BB84, 5 createvisualtask AnimTask_MorningSunLightBeam, 5
delay 8 delay 8
createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE createvisualtask sub_8116620, 10, 0x781, 8, 0, 12, RGB_WHITE
delay 14 delay 14
@ -8305,7 +8305,7 @@ Move_MORNING_SUN:
call HealingEffect call HealingEffect
end end
MorningSun1: MorningSun1:
createsprite gUnknown_085CE48C, ANIM_ATTACKER, 2, 30, 640 createsprite gGreenStarSpriteTemplate, ANIM_ATTACKER, 2, 30, 640
delay 5 delay 5
return return
@ -8401,7 +8401,7 @@ Move_FLATTER:
loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_SPOTLIGHT
loadspritegfx ANIM_TAG_CONFETTI loadspritegfx ANIM_TAG_CONFETTI
createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET createvisualtask sub_8159244, 5, 223, SOUND_PAN_TARGET
createvisualtask sub_815ABEC, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
@ -8435,7 +8435,7 @@ Move_FLATTER:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1 createvisualtask sub_8116960, 2, 248, 3, 10, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815AC8C, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
CreateFlatterConfetti: CreateFlatterConfetti:
createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
@ -8768,7 +8768,7 @@ Move_POISON_FANG:
loadspritegfx ANIM_TAG_FANG_ATTACK loadspritegfx ANIM_TAG_FANG_ATTACK
loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_POISON_BUBBLE
playsewithpan SE_W044, SOUND_PAN_TARGET playsewithpan SE_W044, SOUND_PAN_TARGET
createsprite gUnknown_085CE1DC, ANIM_TARGET, 2 createsprite gFangSpriteTemplate, ANIM_TARGET, 2
delay 10 delay 10
createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1 createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 3, 0, 10, 1
waitforvisualfinish waitforvisualfinish
@ -9523,7 +9523,7 @@ Move_PSYCHO_BOOST:
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
fadetobg BG_PSYCHIC fadetobg BG_PSYCHIC
waitbgfadeout waitbgfadeout
createvisualtask sub_815A5C8, 5 createvisualtask AnimTask_FadeScreenToWhite, 5
waitbgfadein waitbgfadein
delay 6 delay 6
createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK createvisualtask sub_8115A04, 2, 1, 2, 8, 0, 10, RGB_BLACK
@ -10154,7 +10154,7 @@ ConfusionEffect:
SetPsychicBackground: SetPsychicBackground:
fadetobg BG_PSYCHIC fadetobg BG_PSYCHIC
waitbgfadeout waitbgfadeout
createvisualtask sub_815A504, 5 createvisualtask AnimTask_SetPsychicBackground, 5
waitbgfadein waitbgfadein
return return
@ -10292,19 +10292,19 @@ Status_Nightmare:
end end
General_CastformChange: General_CastformChange:
createvisualtask sub_815BB18, 2 createvisualtask AnimTask_IsMonInvisible, 2
jumpreteq 1, AnimScript_82D7ECA jumpreteq 1, AnimScript_82D7ECA
goto AnimScript_82D7EB2 goto AnimScript_82D7EB2
AnimScript_82D7EB2: AnimScript_82D7EB2:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
playsewithpan SE_W100, SOUND_PAN_ATTACKER playsewithpan SE_W100, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48 waitplaysewithpan SE_W107, SOUND_PAN_ATTACKER, 48
createvisualtask sub_815B7D0, 2, 1 createvisualtask AnimTask_TransformMon, 2, 1
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
end end
AnimScript_82D7ECA: AnimScript_82D7ECA:
createvisualtask sub_815BB58, 2, 1 createvisualtask AnimTask_CastformGfxChange, 2, 1
end end
General_StatsChange: General_StatsChange:
@ -10589,7 +10589,7 @@ General_DoomDesireHit:
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE
waitforvisualfinish waitforvisualfinish
delay 10 delay 10
createvisualtask sub_815C0A4, 5 createvisualtask AnimTask_DoomDesireLightBeam, 5
delay 9 delay 9
playsewithpan SE_W109, SOUND_PAN_ATTACKER playsewithpan SE_W109, SOUND_PAN_ATTACKER
delay 9 delay 9

8
data/smokescreen.s
View File

@ -13,11 +13,11 @@ gUnknown_0831C604:: @ 831C604
.byte 0x00, 0x00, 0x00, 0x00 .byte 0x00, 0x00, 0x00, 0x00
.align 2 .align 2
gUnknown_0831C620:: @ 831C620 gSmokescreenImpactSpriteSheet:: @ 831C620
obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb obj_tiles gSmokescreenImpactTiles, 0x0180, 0xd6eb
.align 2 .align 2
gUnknown_0831C628:: @ 831C628 gSmokescreenlImpactSpritePalette:: @ 831C628
obj_pal gSmokescreenImpactPalette, 0xd6eb obj_pal gSmokescreenImpactPalette, 0xd6eb
.align 2 .align 2
@ -48,8 +48,8 @@ gUnknown_0831C678:: @ 831C678
.4byte gUnknown_0831C668 .4byte gUnknown_0831C668
.align 2 .align 2
gUnknown_0831C688:: @ 831C688 gSmokescreenImpactSpriteTemplate:: @ 831C688
spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, sub_80753B4 spr_template 0xd6eb, 0xd6eb, gUnknown_0831C630, gUnknown_0831C678, NULL, gDummySpriteAffineAnimTable, SpriteCB_DestroySprite
.align 2 .align 2
gSpriteSheet_EnemyShadow:: @ 831C6A0 gSpriteSheet_EnemyShadow:: @ 831C6A0

0
graphics/battle_anims/sprites/tri_force_triangle.png → graphics/battle_anims/sprites/tri_attack_triangle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 481 B

4
include/battle_anim.h
View File

@ -185,7 +185,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId);
void sub_80A6C68(u32 arg0); void sub_80A6C68(u32 arg0);
u8 GetAnimBattlerSpriteId(u8 wantedBattler); u8 GetAnimBattlerSpriteId(u8 wantedBattler);
bool8 IsDoubleBattle(void); bool8 IsDoubleBattle(void);
u8 sub_80A6D94(void); u8 GetBattleBgPaletteNum(void);
u8 GetBattlerSpriteBGPriorityRank(u8 battlerId); u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*)); void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite); void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
@ -231,7 +231,7 @@ void AnimWaterPulseRing(struct Sprite *sprite);
void sub_810E2C8(struct Sprite *sprite); void sub_810E2C8(struct Sprite *sprite);
// smokescreen.c // smokescreen.c
u8 sub_807521C(s16 x, s16 y, u8 a3); u8 SmokescreenImpact(s16 x, s16 y, u8 a3);
u32 UnpackSelectedBattleAnimPalettes(s16); u32 UnpackSelectedBattleAnimPalettes(s16);

2
include/constants/battle_anim.h
View File

@ -237,7 +237,7 @@
#define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227) #define ANIM_TAG_SPOTLIGHT (ANIM_SPRITES_START + 227)
#define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228) #define ANIM_TAG_LETTER_Z (ANIM_SPRITES_START + 228)
#define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229) #define ANIM_TAG_RAPID_SPIN (ANIM_SPRITES_START + 229)
#define ANIM_TAG_TRI_FORCE_TRIANGLE (ANIM_SPRITES_START + 230) #define ANIM_TAG_TRI_ATTACK_TRIANGLE (ANIM_SPRITES_START + 230)
#define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231) #define ANIM_TAG_WISP_ORB (ANIM_SPRITES_START + 231)
#define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232) #define ANIM_TAG_WISP_FIRE (ANIM_SPRITES_START + 232)
#define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233) #define ANIM_TAG_GOLD_STARS (ANIM_SPRITES_START + 233)

4
include/graphics.h
View File

@ -4363,7 +4363,7 @@ extern const u32 gBattleAnimSpriteGfx_Pokeball[];
extern const u32 gBattleAnimSpriteGfx_Spotlight[]; extern const u32 gBattleAnimSpriteGfx_Spotlight[];
extern const u32 gBattleAnimSpriteGfx_LetterZ[]; extern const u32 gBattleAnimSpriteGfx_LetterZ[];
extern const u32 gBattleAnimSpriteGfx_RapidSpin[]; extern const u32 gBattleAnimSpriteGfx_RapidSpin[];
extern const u32 gBattleAnimSpriteGfx_TriForceTriangle[]; extern const u32 gBattleAnimSpriteGfx_TriAttackTriangle[];
extern const u32 gBattleAnimSpriteGfx_WispOrb[]; extern const u32 gBattleAnimSpriteGfx_WispOrb[];
extern const u32 gBattleAnimSpriteGfx_WispFire[]; extern const u32 gBattleAnimSpriteGfx_WispFire[];
extern const u32 gBattleAnimSpriteGfx_GoldStars[]; extern const u32 gBattleAnimSpriteGfx_GoldStars[];
@ -4646,7 +4646,7 @@ extern const u32 gBattleAnimSpritePal_JaggedMusicNote[];
extern const u32 gBattleAnimSpritePal_Pokeball[]; extern const u32 gBattleAnimSpritePal_Pokeball[];
extern const u32 gBattleAnimSpritePal_LetterZ[]; extern const u32 gBattleAnimSpritePal_LetterZ[];
extern const u32 gBattleAnimSpritePal_RapidSpin[]; extern const u32 gBattleAnimSpritePal_RapidSpin[];
extern const u32 gBattleAnimSpritePal_TriForceTriangle[]; extern const u32 gBattleAnimSpritePal_TriAttackTriangle[];
extern const u32 gBattleAnimSpritePal_WispOrb[]; extern const u32 gBattleAnimSpritePal_WispOrb[];
extern const u32 gBattleAnimSpritePal_GoldStars[]; extern const u32 gBattleAnimSpritePal_GoldStars[];
extern const u32 gBattleAnimSpritePal_EclipsingOrb[]; extern const u32 gBattleAnimSpritePal_EclipsingOrb[];

8
src/battle_anim.c
View File

@ -1355,7 +1355,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] =
{gBattleAnimSpriteGfx_Spotlight, 0x0800, ANIM_TAG_SPOTLIGHT}, {gBattleAnimSpriteGfx_Spotlight, 0x0800, ANIM_TAG_SPOTLIGHT},
{gBattleAnimSpriteGfx_LetterZ, 0x0200, ANIM_TAG_LETTER_Z}, {gBattleAnimSpriteGfx_LetterZ, 0x0200, ANIM_TAG_LETTER_Z},
{gBattleAnimSpriteGfx_RapidSpin, 0x0300, ANIM_TAG_RAPID_SPIN}, {gBattleAnimSpriteGfx_RapidSpin, 0x0300, ANIM_TAG_RAPID_SPIN},
{gBattleAnimSpriteGfx_TriForceTriangle, 0x0800, ANIM_TAG_TRI_FORCE_TRIANGLE}, {gBattleAnimSpriteGfx_TriAttackTriangle, 0x0800, ANIM_TAG_TRI_ATTACK_TRIANGLE},
{gBattleAnimSpriteGfx_WispOrb, 0x0380, ANIM_TAG_WISP_ORB}, {gBattleAnimSpriteGfx_WispOrb, 0x0380, ANIM_TAG_WISP_ORB},
{gBattleAnimSpriteGfx_WispFire, 0x0800, ANIM_TAG_WISP_FIRE}, {gBattleAnimSpriteGfx_WispFire, 0x0800, ANIM_TAG_WISP_FIRE},
{gBattleAnimSpriteGfx_GoldStars, 0x00c0, ANIM_TAG_GOLD_STARS}, {gBattleAnimSpriteGfx_GoldStars, 0x00c0, ANIM_TAG_GOLD_STARS},
@ -1648,7 +1648,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] =
{gBattleAnimSpritePal_Pokeball, ANIM_TAG_SPOTLIGHT}, {gBattleAnimSpritePal_Pokeball, ANIM_TAG_SPOTLIGHT},
{gBattleAnimSpritePal_LetterZ, ANIM_TAG_LETTER_Z}, {gBattleAnimSpritePal_LetterZ, ANIM_TAG_LETTER_Z},
{gBattleAnimSpritePal_RapidSpin, ANIM_TAG_RAPID_SPIN}, {gBattleAnimSpritePal_RapidSpin, ANIM_TAG_RAPID_SPIN},
{gBattleAnimSpritePal_TriForceTriangle, ANIM_TAG_TRI_FORCE_TRIANGLE}, {gBattleAnimSpritePal_TriAttackTriangle, ANIM_TAG_TRI_ATTACK_TRIANGLE},
{gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_ORB}, {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_ORB},
{gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_FIRE}, {gBattleAnimSpritePal_WispOrb, ANIM_TAG_WISP_FIRE},
{gBattleAnimSpritePal_GoldStars, ANIM_TAG_GOLD_STARS}, {gBattleAnimSpritePal_GoldStars, ANIM_TAG_GOLD_STARS},
@ -2808,12 +2808,12 @@ static void LoadMoveBg(u16 bgId)
void *dmaDest; void *dmaDest;
LZDecompressWram(tilemap, gDecompressionBuffer); LZDecompressWram(tilemap, gDecompressionBuffer);
sub_80A4720(sub_80A6D94(), (void*)(gDecompressionBuffer), 0x100, 0); sub_80A4720(GetBattleBgPaletteNum(), (void*)(gDecompressionBuffer), 0x100, 0);
dmaSrc = gDecompressionBuffer; dmaSrc = gDecompressionBuffer;
dmaDest = (void *)(BG_SCREEN_ADDR(26)); dmaDest = (void *)(BG_SCREEN_ADDR(26));
DmaCopy32(3, dmaSrc, dmaDest, 0x800); DmaCopy32(3, dmaSrc, dmaDest, 0x800);
LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4))); LZDecompressVram(gBattleAnimBackgroundTable[bgId].image, (void *)(BG_SCREEN_ADDR(4)));
LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, sub_80A6D94() * 16, 32); LoadCompressedPalette(gBattleAnimBackgroundTable[bgId].palette, GetBattleBgPaletteNum() * 16, 32);
} }
else else
{ {

508
src/battle_anim_effects_3.c
View File

File diff suppressed because it is too large Load Diff

4
src/battle_anim_mons.c
View File

@ -966,7 +966,7 @@ void sub_80A6D60(struct BattleAnimBgData *unk, const void *src, u32 arg2)
CopyBgTilemapBufferToVram(unk->bgId); CopyBgTilemapBufferToVram(unk->bgId);
} }
u8 sub_80A6D94(void) u8 GetBattleBgPaletteNum(void)
{ {
if (IsContest()) if (IsContest())
return 1; return 1;
@ -1353,7 +1353,7 @@ u32 sub_80A75AC(u8 battleBackground, u8 attacker, u8 target, u8 attackerPartner,
if (!IsContest()) if (!IsContest())
selectedPalettes = 0xe; selectedPalettes = 0xe;
else else
selectedPalettes = 1 << sub_80A6D94(); selectedPalettes = 1 << GetBattleBgPaletteNum();
} }
if (attacker) if (attacker)
{ {

4
src/battle_anim_special.c
View File

@ -403,7 +403,7 @@ const struct SpriteTemplate gBattleAnimSpriteTemplate_085E535C =
.callback = sub_817330C, .callback = sub_817330C,
}; };
extern const struct SpriteTemplate gUnknown_085CE388; extern const struct SpriteTemplate gWishStarSpriteTemplate;
extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate; extern const struct SpriteTemplate gMiniTwinklingStarSpriteTemplate;
void unref_sub_8170478(u8 taskId) void unref_sub_8170478(u8 taskId)
@ -2081,7 +2081,7 @@ static void sub_8172FEC(u8 taskId)
state = gTasks[taskId].data[11]; state = gTasks[taskId].data[11];
if (state == 0) if (state == 0)
{ {
spriteId = CreateSprite(&gUnknown_085CE388, x, y, 5); spriteId = CreateSprite(&gWishStarSpriteTemplate, x, y, 5);
} }
else if (state >= 0 && gTasks[taskId].data[11] < 4) else if (state >= 0 && gTasks[taskId].data[11] < 4)
{ {

4
src/graphics.c
View File

@ -777,8 +777,8 @@ const u32 gBattleAnimSpriteGfx_Roots[] = INCBIN_U32("graphics/battle_anims/sprit
const u32 gBattleAnimSpritePal_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.gbapal.lz"); const u32 gBattleAnimSpritePal_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.gbapal.lz");
const u32 gBattleAnimSpriteGfx_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.4bpp.lz"); const u32 gBattleAnimSpriteGfx_ItemBag[] = INCBIN_U32("graphics/battle_anims/sprites/item_bag.4bpp.lz");
const u32 gBattleAnimSpritePal_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.gbapal.lz"); const u32 gBattleAnimSpritePal_TriAttackTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_attack_triangle.gbapal.lz");
const u32 gBattleAnimSpriteGfx_TriForceTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_force_triangle.4bpp.lz"); const u32 gBattleAnimSpriteGfx_TriAttackTriangle[] = INCBIN_U32("graphics/battle_anims/sprites/tri_attack_triangle.4bpp.lz");
const u32 gBattleAnimSpritePal_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.gbapal.lz"); const u32 gBattleAnimSpritePal_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.gbapal.lz");
const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.4bpp.lz"); const u32 gBattleAnimSpriteGfx_LetterZ[] = INCBIN_U32("graphics/battle_anims/sprites/letter_z.4bpp.lz");

34
src/smokescreen.c
View File

@ -4,46 +4,46 @@
#include "sprite.h" #include "sprite.h"
#include "util.h" #include "util.h"
static void sub_8075370(struct Sprite *); static void SmokescreenImpact_Callback(struct Sprite *);
extern const struct CompressedSpriteSheet gUnknown_0831C620; extern const struct CompressedSpriteSheet gSmokescreenImpactSpriteSheet;
extern const struct CompressedSpritePalette gUnknown_0831C628; extern const struct CompressedSpritePalette gSmokescreenlImpactSpritePalette;
extern const struct SpriteTemplate gUnknown_0831C688; extern const struct SpriteTemplate gSmokescreenImpactSpriteTemplate;
u8 sub_807521C(s16 x, s16 y, u8 a3) u8 SmokescreenImpact(s16 x, s16 y, u8 a3)
{ {
u8 mainSpriteId; u8 mainSpriteId;
u8 spriteId1, spriteId2, spriteId3, spriteId4; u8 spriteId1, spriteId2, spriteId3, spriteId4;
struct Sprite *mainSprite; struct Sprite *mainSprite;
if (GetSpriteTileStartByTag(gUnknown_0831C620.tag) == 0xFFFF) if (GetSpriteTileStartByTag(gSmokescreenImpactSpriteSheet.tag) == 0xFFFF)
{ {
LoadCompressedSpriteSheetUsingHeap(&gUnknown_0831C620); LoadCompressedSpriteSheetUsingHeap(&gSmokescreenImpactSpriteSheet);
LoadCompressedSpritePaletteUsingHeap(&gUnknown_0831C628); LoadCompressedSpritePaletteUsingHeap(&gSmokescreenlImpactSpritePalette);
} }
mainSpriteId = CreateInvisibleSpriteWithCallback(sub_8075370); mainSpriteId = CreateInvisibleSpriteWithCallback(SmokescreenImpact_Callback);
mainSprite = &gSprites[mainSpriteId]; mainSprite = &gSprites[mainSpriteId];
mainSprite->data[1] = a3; mainSprite->data[1] = a3;
spriteId1 = CreateSprite(&gUnknown_0831C688, x - 16, y - 16, 2); spriteId1 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x - 16, y - 16, 2);
gSprites[spriteId1].data[0] = mainSpriteId; gSprites[spriteId1].data[0] = mainSpriteId;
mainSprite->data[0]++; mainSprite->data[0]++;
AnimateSprite(&gSprites[spriteId1]); AnimateSprite(&gSprites[spriteId1]);
spriteId2 = CreateSprite(&gUnknown_0831C688, x, y - 16, 2); spriteId2 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x, y - 16, 2);
gSprites[spriteId2].data[0] = mainSpriteId; gSprites[spriteId2].data[0] = mainSpriteId;
mainSprite->data[0]++; mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId2], 1); StartSpriteAnim(&gSprites[spriteId2], 1);
AnimateSprite(&gSprites[spriteId2]); AnimateSprite(&gSprites[spriteId2]);
spriteId3 = CreateSprite(&gUnknown_0831C688, x - 16, y, 2); spriteId3 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x - 16, y, 2);
gSprites[spriteId3].data[0] = mainSpriteId; gSprites[spriteId3].data[0] = mainSpriteId;
mainSprite->data[0]++; mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId3], 2); StartSpriteAnim(&gSprites[spriteId3], 2);
AnimateSprite(&gSprites[spriteId3]); AnimateSprite(&gSprites[spriteId3]);
spriteId4 = CreateSprite(&gUnknown_0831C688, x, y, 2); spriteId4 = CreateSprite(&gSmokescreenImpactSpriteTemplate, x, y, 2);
gSprites[spriteId4].data[0] = mainSpriteId; gSprites[spriteId4].data[0] = mainSpriteId;
mainSprite->data[0]++; mainSprite->data[0]++;
StartSpriteAnim(&gSprites[spriteId4], 3); StartSpriteAnim(&gSprites[spriteId4], 3);
@ -52,12 +52,12 @@ u8 sub_807521C(s16 x, s16 y, u8 a3)
return mainSpriteId; return mainSpriteId;
} }
static void sub_8075370(struct Sprite *sprite) static void SmokescreenImpact_Callback(struct Sprite *sprite)
{ {
if (!sprite->data[0]) if (!sprite->data[0])
{ {
FreeSpriteTilesByTag(gUnknown_0831C620.tag); FreeSpriteTilesByTag(gSmokescreenImpactSpriteSheet.tag);
FreeSpritePaletteByTag(gUnknown_0831C628.tag); FreeSpritePaletteByTag(gSmokescreenlImpactSpritePalette.tag);
if (!sprite->data[1]) if (!sprite->data[1])
DestroySprite(sprite); DestroySprite(sprite);
else else
@ -65,7 +65,7 @@ static void sub_8075370(struct Sprite *sprite)
} }
} }
void sub_80753B4(struct Sprite *sprite) void SpriteCB_DestroySprite(struct Sprite *sprite)
{ {
if (sprite->animEnded) if (sprite->animEnded)
{ {