Merge pull request #184 from DizzyEggg/decompile_pokemon_animation

decompilie pokemon animation
This commit is contained in:
Diegoisawesome 2018-01-30 13:06:32 -06:00 committed by GitHub
commit b08b94978b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 5790 additions and 12155 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
#include "constants/rgb.h"
#include "constants/songs.h"
.include "asm/macros/battle_anim_script.inc" .include "asm/macros/battle_anim_script.inc"
.include "include/constants/battle_anim.h" .include "include/constants/battle_anim.h"
.include "include/constants/songs.h"
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
@ -684,7 +685,7 @@ Move_FLAME_WHEEL:
createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6 createsprite gUnknown_0857FE70, 0x2, 0, 24, 0, 0, 6
delay 0x4 delay 0x4
createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1 createvisualtask sub_80D51AC, 0x2, 1, 5, 0, 8, 1
createvisualtask sub_80A7B98, 0x3, 1, 31, 12, 1, 1 createvisualtask sub_80A7B98, 0x3, 1, RGB_RED, 12, 1, 1
playsewithpan SE_W172B, +63 playsewithpan SE_W172B, +63
call AnimScript_82D2D18 call AnimScript_82D2D18
delay 0x7 delay 0x7
@ -789,7 +790,7 @@ Move_DOUBLE_EDGE:
waitplaysewithpan SE_W207, -64, 0x8 waitplaysewithpan SE_W207, -64, 0x8
createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4 createvisualtask sub_80D5830, 0x2, 0, 18, 6, 2, 4
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 0, 16, 16, RGB_WHITE
createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4 createsprite gUnknown_0857FE70, 0x2, 0, 20, 0, 0, 4
delay 0x3 delay 0x3
waitforvisualfinish waitforvisualfinish
@ -801,7 +802,7 @@ Move_DOUBLE_EDGE:
createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0 createvisualtask sub_80D6134, 0x2, 8, -256, 1, 0
createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1 createvisualtask sub_80D5484, 0x2, 0, 4, 0, 12, 1
createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1 createvisualtask sub_80D5484, 0x2, 1, 4, 0, 12, 1
createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1 createvisualtask sub_80D6134, 0x2, 8, -256, 0, 1
createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1 createvisualtask sub_80D6134, 0x2, 8, -256, 1, 1
@ -942,7 +943,7 @@ Move_MEGA_PUNCH:
loadspritegfx 0x279F loadspritegfx 0x279F
monbg ANIM_TARGET monbg ANIM_TARGET
delay 0x2 delay 0x2
createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
setalpha 0x80C setalpha 0x80C
playsewithpan SE_W025, +63 playsewithpan SE_W025, +63
createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50 createsprite gUnknown_08595F48, 0x3, 0, 0, 0, 50
@ -990,7 +991,7 @@ Move_MEGA_KICK:
loadspritegfx 0x279F loadspritegfx 0x279F
monbg ANIM_TARGET monbg ANIM_TARGET
delay 0x2 delay 0x2
createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 0, 0, 16, RGB_BLACK
setalpha 0x80C setalpha 0x80C
playsewithpan SE_W025, +63 playsewithpan SE_W025, +63
createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50 createsprite gUnknown_08595F48, 0x3, 0, 0, 1, 50
@ -1232,7 +1233,7 @@ Move_HIDDEN_POWER:
createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
waitforvisualfinish waitforvisualfinish
delay 0x1E delay 0x1E
createvisualtask sub_80A7B98, 0x5, 0, 20479, 12, 5, 1 createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 31, 19), 12, 5, 1
delay 0x4 delay 0x4
createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0 createvisualtask sub_80D6064, 0x5, -7, -7, 11, 0, 0
playsewithpan SE_W179, -64 playsewithpan SE_W179, -64
@ -1705,7 +1706,7 @@ Move_PROTECT:
Move_DETECT: Move_DETECT:
loadspritegfx 0x2757 loadspritegfx 0x2757
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 9, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF createvisualtask sub_8116620, 0xA, 2, 1, 0, 9, 0x7FFF
delay 0x12 delay 0x12
@ -1713,7 +1714,7 @@ Move_DETECT:
createsprite gUnknown_0853EE84, 0xD, 20, -20 createsprite gUnknown_0853EE84, 0xD, 20, -20
waitforvisualfinish waitforvisualfinish
delay 0xA delay 0xA
createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 9, 0, RGB_BLACK
createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF createvisualtask sub_8116620, 0xA, 2, 2, 9, 0, 0x7FFF
waitforvisualfinish waitforvisualfinish
end end
@ -2118,12 +2119,12 @@ Move_MEAN_LOOK:
loadspritegfx 0x27CB loadspritegfx 0x27CB
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
playsewithpan SE_W060, -64 playsewithpan SE_W060, -64
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
loopsewithpan SE_W109, +63, 0xF, 0x4 loopsewithpan SE_W109, +63, 0xF, 0x4
waitplaysewithpan SE_W043, +63, 0x55 waitplaysewithpan SE_W043, +63, 0x55
createsprite gUnknown_085CE104, 0x2 createsprite gUnknown_085CE104, 0x2
delay 0x78 delay 0x78
createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
delay 0x1E delay 0x1E
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
waitforvisualfinish waitforvisualfinish
@ -2792,7 +2793,7 @@ Move_RAGE:
loadspritegfx 0x2767 loadspritegfx 0x2767
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 0x80C setalpha 0x80C
createvisualtask sub_80A7B98, 0x3, 0, 31, 10, 0, 2 createvisualtask sub_80A7B98, 0x3, 0, RGB_RED, 10, 0, 2
createsprite gUnknown_0859368C, 0x2, 0, -20, -28 createsprite gUnknown_0859368C, 0x2, 0, -20, -28
playsewithpan SE_W207B, -64 playsewithpan SE_W207B, -64
delay 0x14 delay 0x14
@ -3068,7 +3069,7 @@ Move_SUPER_FANG:
playsewithpan SE_W082, -64 playsewithpan SE_W082, -64
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1 createvisualtask sub_80D5484, 0x2, 0, 3, 0, 48, 1
createvisualtask sub_80A7B98, 0x2, 0, 1247, 12, 4, 1 createvisualtask sub_80A7B98, 0x2, 0, RGB(31, 6, 1), 12, 4, 1
waitforvisualfinish waitforvisualfinish
delay 0x14 delay 0x14
createsprite gUnknown_0857FE28, 0x2, 4, 4 createsprite gUnknown_0857FE28, 0x2, 4, 4
@ -3137,7 +3138,7 @@ Move_NIGHTMARE:
end end
AnimScript_82CD4CF: AnimScript_82CD4CF:
createvisualtask sub_80A7B98, 0x2, 0, 0x7FFF, 10, 2, 1 createvisualtask sub_80A7B98, 0x2, 0, RGB_WHITE, 10, 2, 1
createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1 createvisualtask sub_80D51AC, 0x2, 0, 3, 0, 32, 1
playsewithpan SE_W171, +63 playsewithpan SE_W171, +63
waitforvisualfinish waitforvisualfinish
@ -3220,7 +3221,7 @@ Move_FORESIGHT:
delay 0x18 delay 0x18
playsewithpan SE_W166, +63 playsewithpan SE_W166, +63
delay 0xA delay 0xA
createvisualtask sub_80A7B98, 0x5, 1, 0x7FFF, 12, 2, 1 createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 2, 1
playsewithpan SE_W197, +63 playsewithpan SE_W197, +63
waitforvisualfinish waitforvisualfinish
blendoff blendoff
@ -3418,7 +3419,7 @@ Move_MOONLIGHT:
loadspritegfx 0x27D3 loadspritegfx 0x27D3
loadspritegfx 0x272F loadspritegfx 0x272F
setalpha 0x1000 setalpha 0x1000
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 16, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08592EBC, 0x2, 120, 56 createsprite gUnknown_08592EBC, 0x2, 120, 56
createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1 createvisualtask sub_80A7A74, 0x3, 0, 16, 16, 0, 1
@ -3517,7 +3518,7 @@ Move_UPROAR:
Move_HEAT_WAVE: Move_HEAT_WAVE:
loadspritegfx 0x2815 loadspritegfx 0x2815
createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, 31 createvisualtask sub_8116848, 0x5, 10261, 0, 6, 6, RGB_RED
createvisualtask sub_8110BCC, 0x5, 1 createvisualtask sub_8110BCC, 0x5, 1
createvisualtask sub_810A060, 0x6, 6, 31 createvisualtask sub_810A060, 0x6, 6, 31
panse_1B SE_W257, -64, +63, +2, 0x0 panse_1B SE_W257, -64, +63, +2, 0x0
@ -3555,7 +3556,7 @@ Move_TORMENT:
loadspritegfx 0x27E1 loadspritegfx 0x27E1
createvisualtask sub_815AFF0, 0x2 createvisualtask sub_815AFF0, 0x2
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80A7B98, 0x2, 1, 31, 10, 1, 1 createvisualtask sub_80A7B98, 0x2, 1, RGB_RED, 10, 1, 1
createsprite gUnknown_0859368C, 0x82, 1, -20, -28 createsprite gUnknown_0859368C, 0x82, 1, -20, -28
playsewithpan SE_W207B, +63 playsewithpan SE_W207B, +63
delay 0x14 delay 0x14
@ -3625,7 +3626,7 @@ Move_CHARGE:
loadspritegfx 0x27E5 loadspritegfx 0x27E5
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12 createvisualtask sub_810AAFC, 0x2, 0, 60, 2, 12
playsewithpan SE_W268, -64 playsewithpan SE_W268, -64
@ -3649,7 +3650,7 @@ Move_CHARGE:
createsprite gUnknown_0859598C, 0x2, 0, -16, -16 createsprite gUnknown_0859598C, 0x2, 0, -16, -16
playsewithpan SE_W085B, -64 playsewithpan SE_W085B, -64
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
blendoff blendoff
end end
@ -3688,7 +3689,7 @@ Move_HELPING_HAND:
delay 0x14 delay 0x14
playsewithpan SE_W227, 0 playsewithpan SE_W227, 0
createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1 createvisualtask sub_80D52D0, 0x2, 2, 3, 0, 10, 1
createvisualtask sub_80A7B98, 0x2, 2, 1023, 12, 1, 1 createvisualtask sub_80A7B98, 0x2, 2, RGB_YELLOW, 12, 1, 1
end end
Move_ASSIST: Move_ASSIST:
@ -3750,7 +3751,7 @@ Move_RECYCLE:
createsprite gUnknown_085CE9B0, 0x2 createsprite gUnknown_085CE9B0, 0x2
loopsewithpan SE_W036, -64, 0x18, 0x3 loopsewithpan SE_W036, -64, 0x18, 0x3
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80A7B98, 0x5, 0, 0x7FFF, 12, 2, 1 createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 2, 1
playsewithpan SE_W036, -64 playsewithpan SE_W036, -64
waitforvisualfinish waitforvisualfinish
blendoff blendoff
@ -3780,13 +3781,13 @@ AnimScript_82CE0A7:
playsewithpan SE_W233, +63 playsewithpan SE_W233, +63
delay 0x14 delay 0x14
createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
delay 0x25 delay 0x25
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
playsewithpan SE_W233B, +63 playsewithpan SE_W233B, +63
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
end end
@ -3807,7 +3808,7 @@ AnimScript_82CE154:
playsewithpan SE_W233, +63 playsewithpan SE_W233, +63
delay 0x14 delay 0x14
createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3 createvisualtask sub_80D5C50, 0x2, 0, -24, 0, 24, 10, 24, 3
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 6, RGB_BLACK
delay 0x25 delay 0x25
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 1
createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0 createsprite gUnknown_08595E98, 0x4, 0, 0, 10, 1, 0
@ -3819,7 +3820,7 @@ AnimScript_82CE154:
createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12 createsprite gUnknown_08595FA8, 0x2, 1, 3, 8, 12
playsewithpan SE_W280, +63 playsewithpan SE_W280, +63
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 6, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
end end
@ -3845,7 +3846,7 @@ Move_ENDEAVOR:
loadspritegfx 0x2797 loadspritegfx 0x2797
createvisualtask sub_815DCA4, 0x2, 0, 2 createvisualtask sub_815DCA4, 0x2, 0, 2
loopsewithpan SE_W039, -64, 0x18, 0x2 loopsewithpan SE_W039, -64, 0x18, 0x2
createvisualtask sub_80A7B98, 0x5, 0, 703, 12, 1, 2 createvisualtask sub_80A7B98, 0x5, 0, RGB(31, 21, 0), 12, 1, 2
delay 0x6 delay 0x6
createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0 createvisualtask sub_80D6388, 0x5, 0, 1, 8, 1, 0
createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2 createsprite gUnknown_08597358, 0x82, 12, -12, 1, 2
@ -3858,7 +3859,7 @@ Move_ENDEAVOR:
Move_ERUPTION: Move_ERUPTION:
loadspritegfx 0x27D9 loadspritegfx 0x27D9
createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, 31 createsprite gUnknown_08597274, 0x2, 31, 2, 0, 4, RGB_RED
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8109460, 0x2 createvisualtask sub_8109460, 0x2
waitplaysewithpan SE_W153, -64, 0x3C waitplaysewithpan SE_W153, -64, 0x3C
@ -3878,18 +3879,18 @@ Move_ERUPTION:
createvisualtask sub_81152DC, 0x5, 4, 8, 60 createvisualtask sub_81152DC, 0x5, 4, 8, 60
loopsewithpan SE_W088, +63, 0x10, 0xC loopsewithpan SE_W088, +63, 0x10, 0xC
delay 0x50 delay 0x50
createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, 31 createsprite gUnknown_08597274, 0x28, 31, 4, 4, 0, RGB_RED
end end
Move_SKILL_SWAP: Move_SKILL_SWAP:
loadspritegfx 0x280B loadspritegfx 0x280B
call AnimScript_82D7CD1 call AnimScript_82D7CD1
createvisualtask sub_810FBF0, 0x3, 1 createvisualtask sub_810FBF0, 0x3, 1
createvisualtask sub_80A7B98, 0x5, 1, 0x7FFF, 12, 3, 1 createvisualtask sub_80A7B98, 0x5, 1, RGB_WHITE, 12, 3, 1
loopsewithpan SE_W179, -64, 0x18, 0x3 loopsewithpan SE_W179, -64, 0x18, 0x3
delay 0x10 delay 0x10
createvisualtask sub_810FBF0, 0x3, 0 createvisualtask sub_810FBF0, 0x3, 0
createvisualtask sub_80A7B98, 0x5, 0, 0x7FFF, 12, 3, 1 createvisualtask sub_80A7B98, 0x5, 0, RGB_WHITE, 12, 3, 1
waitforvisualfinish waitforvisualfinish
call AnimScript_82D7CDD call AnimScript_82D7CDD
end end
@ -3951,13 +3952,13 @@ Move_TAIL_GLOW:
loadspritegfx 0x27E4 loadspritegfx 0x27E4
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08596AC8, 0x42, 0 createsprite gUnknown_08596AC8, 0x42, 0
delay 0x12 delay 0x12
loopsewithpan SE_W234, -64, 0x10, 0x6 loopsewithpan SE_W234, -64, 0x10, 0x6
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
blendoff blendoff
delay 0x1 delay 0x1
@ -4193,7 +4194,7 @@ Move_AROMATHERAPY:
loadspritegfx 0x27AF loadspritegfx 0x27AF
loadspritegfx 0x27DB loadspritegfx 0x27DB
loadspritegfx 0x2741 loadspritegfx 0x2741
createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, 13293 createsprite gUnknown_08597274, 0x0, 1, 0, 0, 7, RGB(13, 31, 12)
delay 0x1 delay 0x1
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
delay 0x1 delay 0x1
@ -4211,7 +4212,7 @@ Move_AROMATHERAPY:
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, 13293 createsprite gUnknown_08597274, 0x0, 1, 0, 7, 0, RGB(13, 31, 12)
delay 0x1 delay 0x1
playsewithpan SE_W287, -64 playsewithpan SE_W287, -64
createvisualtask sub_815DFCC, 0x2, 1 createvisualtask sub_815DFCC, 0x2, 1
@ -4222,7 +4223,7 @@ Move_AROMATHERAPY:
createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1 createsprite gUnknown_08592B94, 0x10, 12, -5, 0, 0, 32, 60, 1
waitforvisualfinish waitforvisualfinish
playsewithpan SE_REAPOKE, -64 playsewithpan SE_REAPOKE, -64
createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, 13293 createsprite gUnknown_08597274, 0x0, 43, 3, 10, 0, RGB(13, 31, 12)
createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1 createsprite gUnknown_08593868, 0x10, 0, 0, 0, 1
waitforvisualfinish waitforvisualfinish
end end
@ -4231,7 +4232,7 @@ Move_FAKE_TEARS:
loadspritegfx 0x27AB loadspritegfx 0x27AB
loadspritegfx 0x27E1 loadspritegfx 0x27E1
loadspritegfx 0x2758 loadspritegfx 0x2758
createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, 32108 createvisualtask sub_8116848, 0x5, 10155, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815C478, 0x5, 0, 2, 1 createvisualtask sub_815C478, 0x5, 0, 2, 1
loopsewithpan SE_W039, -64, 0xC, 0x4 loopsewithpan SE_W039, -64, 0xC, 0x4
@ -4289,7 +4290,7 @@ Move_ODOR_SLEUTH:
Move_GRASS_WHISTLE: Move_GRASS_WHISTLE:
loadspritegfx 0x2758 loadspritegfx 0x2758
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 13298 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB(18, 31, 12)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8102BE8, 0x2 createvisualtask sub_8102BE8, 0x2
waitforvisualfinish waitforvisualfinish
@ -4320,19 +4321,19 @@ Move_GRASS_WHISTLE:
delay 0x4 delay 0x4
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8102CA0, 0x2 createvisualtask sub_8102CA0, 0x2
createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, 13298 createsprite gUnknown_08597274, 0x2, 1, 4, 4, 0, RGB(18, 31, 12)
waitforvisualfinish waitforvisualfinish
end end
Move_TICKLE: Move_TICKLE:
loadspritegfx 0x27EA loadspritegfx 0x27EA
createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 2, 0, 0, 16, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08593A84, 0x0, -16, -8 createsprite gUnknown_08593A84, 0x0, -16, -8
createsprite gUnknown_08593A84, 0x0, 16, -8 createsprite gUnknown_08593A84, 0x0, 16, -8
playsewithpan SE_W197, -64 playsewithpan SE_W197, -64
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, 0 createsprite gUnknown_08597274, 0x2, 2, 0, 16, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
delay 0x14 delay 0x14
createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0 createvisualtask sub_80D5EB8, 0x3, 0, 6, 1280, 3, 0
@ -4384,11 +4385,11 @@ Move_EXTRASENSORY:
call AnimScript_82D7CD1 call AnimScript_82D7CD1
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
setalpha 0x80C setalpha 0x80C
createvisualtask sub_80A7B98, 0x5, 0, 891, 12, 1, 1 createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
createvisualtask sub_810FE14, 0x5, 0 createvisualtask sub_810FE14, 0x5, 0
playsewithpan SE_W020, +63 playsewithpan SE_W020, +63
waitforvisualfinish waitforvisualfinish
createvisualtask sub_80A7B98, 0x5, 0, 891, 12, 1, 1 createvisualtask sub_80A7B98, 0x5, 0, RGB(27, 27, 0), 12, 1, 1
createvisualtask sub_810FE14, 0x5, 1 createvisualtask sub_810FE14, 0x5, 1
playsewithpan SE_W020, +63 playsewithpan SE_W020, +63
waitforvisualfinish waitforvisualfinish
@ -4607,7 +4608,7 @@ Move_SHOCK_WAVE:
loadspritegfx 0x2735 loadspritegfx 0x2735
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 4, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2 createvisualtask sub_810AAFC, 0x2, 0, 20, 0, 2
playsewithpan SE_W268, -64 playsewithpan SE_W268, -64
@ -4725,7 +4726,7 @@ Move_ICE_PUNCH:
loadspritegfx 0x279D loadspritegfx 0x279D
loadspritegfx 0x2797 loadspritegfx 0x2797
loadspritegfx 0x279F loadspritegfx 0x279F
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588 createvisualtask sub_8116620, 0xA, 4, 2, 0, 9, 32588
delay 0x14 delay 0x14
playsewithpan SE_W081, +63 playsewithpan SE_W081, +63
@ -4750,7 +4751,7 @@ Move_ICE_PUNCH:
delay 0x5 delay 0x5
createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588 createvisualtask sub_8116620, 0xA, 4, 2, 9, 0, 32588
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -4829,7 +4830,7 @@ Move_THUNDER:
waitbgfadeout waitbgfadeout
createvisualtask sub_8117660, 0x5, -256, 0, 1, -1 createvisualtask sub_8117660, 0x5, -256, 0, 1, -1
waitbgfadein waitbgfadein
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
delay 0x10 delay 0x10
createvisualtask sub_8115F10, 0x2, 257, 257, 257 createvisualtask sub_8115F10, 0x2, 257, 257, 257
playsewithpan SE_W086, +63 playsewithpan SE_W086, +63
@ -4873,7 +4874,7 @@ Move_THUNDER:
delay 0x2 delay 0x2
createvisualtask sub_8115F10, 0x2, 257, 257, 257 createvisualtask sub_8115F10, 0x2, 257, 257, 257
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, 0 createsprite gUnknown_08597274, 0x82, 1, 2, 16, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
restorebg restorebg
waitbgfadeout waitbgfadeout
@ -4887,7 +4888,7 @@ Move_THUNDER_PUNCH:
loadspritegfx 0x2735 loadspritegfx 0x2735
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 0, 16, RGB_BLACK
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W004, +63 playsewithpan SE_W004, +63
createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0 createsprite gUnknown_08595E98, 0x84, 0, 0, 8, 1, 0
@ -4907,7 +4908,7 @@ Move_THUNDER_PUNCH:
createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1 createvisualtask sub_80D51AC, 0x2, 1, 0, 3, 15, 1
createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2 createsprite gUnknown_08597358, 0x3, 0, 0, 1, 2
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 2, 16, 0, RGB_BLACK
delay 0x14 delay 0x14
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
@ -5413,7 +5414,7 @@ Move_ICE_BEAM:
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 0x80C setalpha 0x80C
loadspritegfx 0x279D loadspritegfx 0x279D
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, 0 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 7, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10 createsoundtask sub_8158C58, 183, -64, 63, 4, 4, 0, 10
createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20 createsprite gUnknown_08595B2C, 0x2, 20, 12, 0, 12, 20
@ -5422,7 +5423,7 @@ Move_ICE_BEAM:
call AnimScript_82D07C1 call AnimScript_82D07C1
call AnimScript_82D07C1 call AnimScript_82D07C1
call AnimScript_82D07C1 call AnimScript_82D07C1
createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, 32384 createsprite gUnknown_08597274, 0x2, 4, -31, 0, 7, RGB(0, 20, 31)
createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1 createvisualtask sub_80D52D0, 0x2, 1, 2, 0, 25, 1
call AnimScript_82D07C1 call AnimScript_82D07C1
call AnimScript_82D07C1 call AnimScript_82D07C1
@ -5438,9 +5439,9 @@ Move_ICE_BEAM:
waitforvisualfinish waitforvisualfinish
delay 0x14 delay 0x14
call AnimScript_82D7720 call AnimScript_82D7720
createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, 32384 createsprite gUnknown_08597274, 0x2, 4, 5, 7, 0, RGB(0, 20, 31)
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, 0 createsprite gUnknown_08597274, 0x2, 1, 0, 7, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
blendoff blendoff
@ -5648,7 +5649,7 @@ AnimScript_82D0CB2:
Move_POWDER_SNOW: Move_POWDER_SNOW:
loadspritegfx 0x279D loadspritegfx 0x279D
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, 0 createsprite gUnknown_08597274, 0x2, 31, 1, 0, 3, RGB_BLACK
waitforvisualfinish waitforvisualfinish
panse_1B SE_W016, -64, +63, +2, 0x0 panse_1B SE_W016, -64, +63, +2, 0x0
call AnimScript_82D0D03 call AnimScript_82D0D03
@ -5660,7 +5661,7 @@ Move_POWDER_SNOW:
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
delay 0x14 delay 0x14
createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, 0 createsprite gUnknown_08597274, 0x2, 31, 1, 3, 0, RGB_BLACK
end end
AnimScript_82D0D03: AnimScript_82D0D03:
@ -5778,7 +5779,7 @@ Move_ABSORB:
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET monbgprio_2A ANIM_TARGET
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W071, +63 playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 2
@ -5791,7 +5792,7 @@ Move_ABSORB:
delay 0xF delay 0xF
call AnimScript_82D79DF call AnimScript_82D79DF
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -5831,7 +5832,7 @@ Move_MEGA_DRAIN:
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET monbgprio_2A ANIM_TARGET
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 8, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W071, +63 playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 1
@ -5844,7 +5845,7 @@ Move_MEGA_DRAIN:
delay 0xF delay 0xF
call AnimScript_82D79DF call AnimScript_82D79DF
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 8, 0, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -5892,7 +5893,7 @@ Move_GIGA_DRAIN:
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
monbgprio_2A ANIM_TARGET monbgprio_2A ANIM_TARGET
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 12, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W071, +63 playsewithpan SE_W071, +63
createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0 createsprite gUnknown_08597358, 0x2, 0, 0, 1, 0
@ -5905,7 +5906,7 @@ Move_GIGA_DRAIN:
delay 0xF delay 0xF
call AnimScript_82D79DF call AnimScript_82D79DF
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 12, 0, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -6446,14 +6447,14 @@ Move_WHIRLPOOL:
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 0x80C setalpha 0x80C
delay 0x0 delay 0x0
createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 23968 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
playsewithpan SE_W250, +63 playsewithpan SE_W250, +63
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 50, 1
call AnimScript_82D1F5B call AnimScript_82D1F5B
call AnimScript_82D1F5B call AnimScript_82D1F5B
call AnimScript_82D1F5B call AnimScript_82D1F5B
delay 0xC delay 0xC
createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 23968 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
@ -7354,7 +7355,7 @@ Move_POISON_TAIL:
loadspritegfx 0x2797 loadspritegfx 0x2797
loadspritegfx 0x27A6 loadspritegfx 0x27A6
loopsewithpan SE_W231, -64, 0x1C, 0x2 loopsewithpan SE_W231, -64, 0x1C, 0x2
createvisualtask sub_81144F8, 0x5, 1, 1, 23768 createvisualtask sub_81144F8, 0x5, 1, 1, RGB(24, 6, 23)
waitforvisualfinish waitforvisualfinish
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 0x80C setalpha 0x80C
@ -7783,7 +7784,7 @@ Move_SOFT_BOILED:
delay 0x78 delay 0x78
delay 0x7 delay 0x7
playsewithpan SE_W030, -64 playsewithpan SE_W030, -64
createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, 31500 createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
delay 0x8 delay 0x8
createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1 createsprite gUnknown_0859381C, 0x3, 31, 16, 0, 1
@ -7855,7 +7856,7 @@ Move_FAKE_OUT:
createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1 createvisualtask sub_80D52D0, 0x2, 1, 4, 0, 5, 1
createvisualtask sub_8106020, 0x3 createvisualtask sub_8106020, 0x3
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
end end
Move_SCARY_FACE: Move_SCARY_FACE:
@ -8270,7 +8271,7 @@ Move_STOCKPILE:
call AnimScript_82D4972 call AnimScript_82D4972
call AnimScript_82D4972 call AnimScript_82D4972
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, 0x7FFF createsprite gUnknown_08597274, 0x2, 2, 0, 12, 0, RGB_WHITE
end end
AnimScript_82D4972: AnimScript_82D4972:
@ -8585,7 +8586,7 @@ Move_REFRESH:
call AnimScript_82D79B4 call AnimScript_82D79B4
waitforvisualfinish waitforvisualfinish
playsewithpan SE_REAPOKE, -64 playsewithpan SE_REAPOKE, -64
createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, 31500 createsprite gUnknown_08597274, 0x2, 31, 3, 10, 0, RGB(12, 24, 30)
createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
end end
@ -8622,7 +8623,7 @@ Move_HYPER_VOICE:
end end
AnimScript_82D50FA: AnimScript_82D50FA:
createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, 1023 createsprite gUnknown_08597274, 0x2, 31, 3, 8, 0, RGB_YELLOW
createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0 createvisualtask sub_80D6064, 0x5, -5, -5, 5, 0, 0
createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1 createsprite gUnknown_08593880, 0x0, 45, 0, 0, 0, 0, 0, 1
createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1 createvisualtask sub_80D52D0, 0x2, 1, 1, 0, 6, 1
@ -8633,14 +8634,14 @@ AnimScript_82D50FA:
Move_SAND_TOMB: Move_SAND_TOMB:
loadspritegfx 0x275A loadspritegfx 0x275A
createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 563 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 43, 1
playsewithpan SE_W328, +63 playsewithpan SE_W328, +63
call AnimScript_82D51B7 call AnimScript_82D51B7
call AnimScript_82D51B7 call AnimScript_82D51B7
call AnimScript_82D51B7 call AnimScript_82D51B7
delay 0x16 delay 0x16
createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 563 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
waitforvisualfinish waitforvisualfinish
end end
@ -9422,7 +9423,7 @@ Move_OVERHEAT:
loadspritegfx 0x2797 loadspritegfx 0x2797
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
setalpha 0x120C setalpha 0x120C
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, 28 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 5, RGB(28, 0, 0)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8117C44, 0x5 createvisualtask sub_8117C44, 0x5
waitforvisualfinish waitforvisualfinish
@ -9433,7 +9434,7 @@ Move_OVERHEAT:
playsewithpan SE_W082, -64 playsewithpan SE_W082, -64
createvisualtask sub_8117CA0, 0x5, 1, 0 createvisualtask sub_8117CA0, 0x5, 1, 0
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, 28 createsprite gUnknown_08597274, 0x2, 2, 1, 0, 13, RGB(28, 0, 0)
createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1 createvisualtask sub_80D51AC, 0x5, 0, 2, 0, 15, 1
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W172B, -64 playsewithpan SE_W172B, -64
@ -9479,12 +9480,12 @@ Move_OVERHEAT:
playsewithpan SE_W007, +63 playsewithpan SE_W007, +63
createvisualtask sub_8117DD8, 0x5, 1 createvisualtask sub_8117DD8, 0x5, 1
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, 19026 createsprite gUnknown_08597274, 0x2, 2, -1, 0, 13, RGB(18, 18, 18)
createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1 createvisualtask sub_80D51AC, 0x5, 0, 3, 0, 15, 1
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8117D3C, 0x5, 0, 1 createvisualtask sub_8117D3C, 0x5, 0, 1
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, 28 createsprite gUnknown_08597274, 0x2, 1, 1, 5, 0, RGB(28, 0, 0)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff
@ -9492,7 +9493,7 @@ Move_OVERHEAT:
delay 0xF delay 0xF
createvisualtask sub_8117D3C, 0x5, 1, 0 createvisualtask sub_8117D3C, 0x5, 1, 0
delay 0x1 delay 0x1
createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, 19026 createsprite gUnknown_08597274, 0x2, 2, 0, 13, 0, RGB(18, 18, 18)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8117C70, 0x5 createvisualtask sub_8117C70, 0x5
waitforvisualfinish waitforvisualfinish
@ -9643,7 +9644,7 @@ Move_WATER_PULSE:
monbg ANIM_TARGET monbg ANIM_TARGET
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
playsewithpan SE_W145C, -64 playsewithpan SE_W145C, -64
createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, 29472 createsprite gUnknown_08597274, 0x2, 1, 0, 0, 7, RGB(0, 25, 28)
delay 0xA delay 0xA
createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0 createsprite gUnknown_085952F8, 0x42, 100, 100, 8, 1, 20, 40, 0
createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1 createsprite gUnknown_085952F8, 0x42, 20, 100, 16, 2, 10, 35, 1
@ -9663,7 +9664,7 @@ Move_WATER_PULSE:
delay 0xD delay 0xD
createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1 createvisualtask sub_80D51AC, 0x2, 1, 0, 8, 18, 1
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, 29472 createsprite gUnknown_08597274, 0x2, 1, 1, 7, 0, RGB(0, 25, 28)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
@ -10560,13 +10561,13 @@ AnimScript_82D800E:
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 0x80C setalpha 0x80C
delay 0x0 delay 0x0
createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 23968 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(0, 13, 23)
playsewithpan SE_W250, +63 playsewithpan SE_W250, +63
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
call AnimScript_82D1F5B call AnimScript_82D1F5B
call AnimScript_82D1F5B call AnimScript_82D1F5B
delay 0xC delay 0xC
createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 23968 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(0, 13, 23)
waitforvisualfinish waitforvisualfinish
stopsound stopsound
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
@ -10591,13 +10592,13 @@ AnimScript_82D8062:
AnimScript_82D80BF: AnimScript_82D80BF:
loadspritegfx 0x275A loadspritegfx 0x275A
createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, 563 createsprite gUnknown_08597274, 0x0, 4, 2, 0, 7, RGB(19, 17, 0)
createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1 createvisualtask sub_80D51AC, 0x5, 1, 0, 2, 30, 1
playsewithpan SE_W328, +63 playsewithpan SE_W328, +63
call AnimScript_82D51B7 call AnimScript_82D51B7
call AnimScript_82D51B7 call AnimScript_82D51B7
delay 0x16 delay 0x16
createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, 563 createsprite gUnknown_08597274, 0x0, 4, 2, 7, 0, RGB(19, 17, 0)
waitforvisualfinish waitforvisualfinish
stopsound stopsound
end end
@ -10619,7 +10620,7 @@ Anim_ItemEffect:
call AnimScript_82D79B4 call AnimScript_82D79B4
waitforvisualfinish waitforvisualfinish
playsewithpan SE_REAPOKE, -64 playsewithpan SE_REAPOKE, -64
createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, 26609 createsprite gUnknown_08597274, 0x2, 2, 3, 7, 0, RGB(17, 31, 25)
createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0 createsprite gUnknown_0859381C, 0x3, 0, 0, 0, 0
waitforvisualfinish waitforvisualfinish
end end
@ -10663,11 +10664,11 @@ Anim_SmokeBallEscape:
end end
Anim_HangedOn: Anim_HangedOn:
createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, 31 createsprite gUnknown_08597274, 0x0, 2, 7, 0, 9, RGB_RED
playsewithpan SE_W082, -64 playsewithpan SE_W082, -64
createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1 createvisualtask sub_815DB90, 0x5, 30, 128, 0, 1, 2, 0, 1
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, 31 createsprite gUnknown_08597274, 0x0, 2, 4, 9, 0, RGB_RED
waitforvisualfinish waitforvisualfinish
delay 0x6 delay 0x6
createsprite gUnknown_0857FE58, 0x0, 0, 0, 15 createsprite gUnknown_0857FE58, 0x0, 0, 0, 15
@ -10769,7 +10770,7 @@ Anim_FutureSightHit:
Anim_DoomDesireHit: Anim_DoomDesireHit:
createvisualtask sub_8117F10, 0x2 createvisualtask sub_8117F10, 0x2
loadspritegfx 0x27D6 loadspritegfx 0x27D6
createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 3, 0, 16, RGB_WHITE
waitforvisualfinish waitforvisualfinish
delay 0xA delay 0xA
createvisualtask sub_815C0A4, 0x5 createvisualtask sub_815C0A4, 0x5
@ -10796,7 +10797,7 @@ Anim_DoomDesireHit:
playsewithpan SE_W120, +63 playsewithpan SE_W120, +63
createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1 createsprite gUnknown_0859371C, 0x3, 16, 16, 1, 1
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, 0x7FFF createsprite gUnknown_08597274, 0x2, 1, 3, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
end end
@ -10818,7 +10819,7 @@ Status_Ingrain:
loadspritegfx 0x272F loadspritegfx 0x272F
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
setalpha 0x80C setalpha 0x80C
createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 0, 4, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
delay 0x3 delay 0x3
call AnimScript_82D1009 call AnimScript_82D1009
@ -10826,7 +10827,7 @@ Status_Ingrain:
delay 0xF delay 0xF
call AnimScript_82D79DF call AnimScript_82D79DF
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, 13293 createsprite gUnknown_08597274, 0x2, 1, 1, 4, 0, RGB(13, 31, 12)
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
blendoff blendoff

View File

@ -1,240 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
gUnknown_0860A8C8:: @ 860A8C8
.byte 0x00, 0x13, 0x02, 0x08, 0x12, 0x15, 0x17, 0x12, 0x12, 0x19, 0x02, 0x13, 0x11, 0x02, 0x13, 0x01, 0x0f, 0x15, 0x0f, 0x0a, 0x0a, 0x0f, 0x15, 0x0f, 0x09, 0x16, 0x16, 0x12, 0x10, 0x12, 0x15, 0x09
.byte 0x12, 0x15, 0x09, 0x13, 0x13, 0x10, 0x01, 0x13, 0x06, 0x11, 0x09, 0x02, 0x02, 0x14, 0x02, 0x08, 0x0a, 0x11, 0x09, 0x09, 0x10, 0x0f, 0x02, 0x14, 0x10, 0x10, 0x15, 0x15, 0x12, 0x09, 0x0e, 0x14
.byte 0x14, 0x0d, 0x15, 0x09, 0x09, 0x0b, 0x0b, 0x0b, 0x02, 0x02, 0x0e, 0x08, 0x08, 0x17, 0x15, 0x02, 0x13, 0x0f, 0x0f, 0x02, 0x0f, 0x15, 0x13, 0x02, 0x0b, 0x0c, 0x13, 0x0f, 0x01, 0x01, 0x14, 0x09
.byte 0x13, 0x14, 0x0a, 0x09, 0x15, 0x15, 0x02, 0x10, 0x15, 0x10, 0x02, 0x0f, 0x02, 0x06, 0x06, 0x0e, 0x0e, 0x12, 0x0b, 0x12, 0x13, 0x11, 0x11, 0x11, 0x13, 0x19, 0x14, 0x0f, 0x13, 0x16, 0x17, 0x0e
.byte 0x0e, 0x10, 0x09, 0x19, 0x05, 0x12, 0x19, 0x16, 0x17, 0x01, 0x13, 0x13, 0x13, 0x15, 0x15, 0x13, 0x19, 0x16, 0x17, 0x02, 0x0f, 0x09, 0x0d, 0x12, 0x12, 0x02, 0x09, 0x12, 0x15, 0x17, 0x15, 0x15
.byte 0x09, 0x12, 0x10, 0x11, 0x0f, 0x0a, 0x11, 0x0a, 0x02, 0x0f, 0x0b, 0x16, 0x12, 0x13, 0x13, 0x13, 0x11, 0x12, 0x14, 0x12, 0x13, 0x16, 0x11, 0x12, 0x13, 0x02, 0x10, 0x11, 0x11, 0x11, 0x10, 0x13
.byte 0x02, 0x11, 0x0b, 0x02, 0x14, 0x14, 0x12, 0x13, 0x01, 0x14, 0x0b, 0x14, 0x08, 0x09, 0x0f, 0x05, 0x09, 0x15, 0x09, 0x0d, 0x15, 0x13, 0x15, 0x0f, 0x13, 0x09, 0x17, 0x17, 0x0a, 0x08, 0x02, 0x02
.byte 0x05, 0x0f, 0x02, 0x15, 0x09, 0x09, 0x19, 0x15, 0x0e, 0x01, 0x13, 0x02, 0x0f, 0x07, 0x02, 0x08, 0x17, 0x02, 0x13, 0x16, 0x17, 0x19, 0x0e, 0x09, 0x0e, 0x19, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x15, 0x09, 0x12, 0x10, 0x17, 0x02, 0x12, 0x19, 0x12, 0x08
.byte 0x0f, 0x15, 0x0b, 0x08, 0x11, 0x08, 0x0f, 0x02, 0x10, 0x10, 0x13, 0x09, 0x14, 0x0a, 0x01, 0x14, 0x12, 0x15, 0x13, 0x15, 0x07, 0x11, 0x11, 0x03, 0x11, 0x19, 0x19, 0x13, 0x12, 0x01, 0x13, 0x14
.byte 0x0e, 0x17, 0x01, 0x0b, 0x09, 0x04, 0x0f, 0x15, 0x03, 0x19, 0x04, 0x15, 0x13, 0x01, 0x0f, 0x0e, 0x0e, 0x15, 0x09, 0x0e, 0x17, 0x13, 0x09, 0x09, 0x0a, 0x08, 0x0f, 0x0f, 0x13, 0x13, 0x10, 0x10
.byte 0x14, 0x12, 0x12, 0x09, 0x14, 0x14, 0x11, 0x11, 0x12, 0x01, 0x01, 0x18, 0x02, 0x10, 0x08, 0x0b, 0x0b, 0x0e, 0x13, 0x09, 0x0d, 0x13, 0x11, 0x11, 0x14, 0x01, 0x01, 0x0b, 0x15, 0x02, 0x15, 0x09
.byte 0x0e, 0x11, 0x11, 0x11, 0x0c, 0x0b, 0x0f, 0x09, 0x14, 0x14, 0x14, 0x09, 0x09, 0x08, 0x0f, 0x15, 0x09, 0x09, 0x09, 0x09, 0x19, 0x17, 0x0d, 0x01, 0x01, 0x11, 0x14, 0x11
gUnknown_0860AA64:: @ 860AA64
.byte 0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff
gUnknown_0860AA80:: @ 860AA80
.byte 0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00
.align 2
gUnknown_0860AA88:: @ 860AA88
.4byte pokemonanimfunc_00
.4byte pokemonanimfunc_01
.4byte pokemonanimfunc_02
.4byte pokemonanimfunc_03
.4byte pokemonanimfunc_04
.4byte pokemonanimfunc_05
.4byte pokemonanimfunc_06
.4byte pokemonanimfunc_07
.4byte pokemonanimfunc_08
.4byte pokemonanimfunc_09
.4byte pokemonanimfunc_0A
.4byte pokemonanimfunc_0B
.4byte pokemonanimfunc_0C
.4byte pokemonanimfunc_0D
.4byte pokemonanimfunc_0E
.4byte pokemonanimfunc_0F
.4byte pokemonanimfunc_10
.4byte pokemonanimfunc_11
.4byte pokemonanimfunc_12
.4byte pokemonanimfunc_13
.4byte pokemonanimfunc_14
.4byte pokemonanimfunc_15
.4byte pokemonanimfunc_16
.4byte pokemonanimfunc_17
.4byte pokemonanimfunc_18
.4byte pokemonanimfunc_19
.4byte pokemonanimfunc_1A
.4byte pokemonanimfunc_1B
.4byte pokemonanimfunc_1C
.4byte pokemonanimfunc_1D
.4byte pokemonanimfunc_1E
.4byte pokemonanimfunc_1F
.4byte pokemonanimfunc_20
.4byte pokemonanimfunc_21
.4byte pokemonanimfunc_22
.4byte pokemonanimfunc_23
.4byte pokemonanimfunc_24
.4byte pokemonanimfunc_25
.4byte pokemonanimfunc_26
.4byte pokemonanimfunc_27
.4byte pokemonanimfunc_28
.4byte pokemonanimfunc_29
.4byte pokemonanimfunc_2A
.4byte pokemonanimfunc_2B
.4byte pokemonanimfunc_2C
.4byte pokemonanimfunc_2D
.4byte pokemonanimfunc_2E
.4byte pokemonanimfunc_2F
.4byte pokemonanimfunc_30
.4byte pokemonanimfunc_31
.4byte pokemonanimfunc_32
.4byte pokemonanimfunc_33
.4byte pokemonanimfunc_34
.4byte pokemonanimfunc_35
.4byte pokemonanimfunc_36
.4byte pokemonanimfunc_37
.4byte pokemonanimfunc_38
.4byte pokemonanimfunc_39
.4byte pokemonanimfunc_3A
.4byte pokemonanimfunc_3B
.4byte pokemonanimfunc_3C
.4byte pokemonanimfunc_3D
.4byte pokemonanimfunc_3E
.4byte pokemonanimfunc_3F
.4byte pokemonanimfunc_40
.4byte pokemonanimfunc_41
.4byte pokemonanimfunc_42
.4byte pokemonanimfunc_43
.4byte pokemonanimfunc_44
.4byte pokemonanimfunc_45
.4byte pokemonanimfunc_46
.4byte pokemonanimfunc_47
.4byte pokemonanimfunc_48
.4byte pokemonanimfunc_49
.4byte pokemonanimfunc_4A
.4byte pokemonanimfunc_4B
.4byte pokemonanimfunc_4C
.4byte pokemonanimfunc_4D
.4byte pokemonanimfunc_4E
.4byte pokemonanimfunc_4F
.4byte pokemonanimfunc_50
.4byte pokemonanimfunc_51
.4byte pokemonanimfunc_52
.4byte pokemonanimfunc_53
.4byte pokemonanimfunc_54
.4byte pokemonanimfunc_55
.4byte pokemonanimfunc_56
.4byte pokemonanimfunc_57
.4byte pokemonanimfunc_58
.4byte pokemonanimfunc_59
.4byte pokemonanimfunc_5A
.4byte pokemonanimfunc_5B
.4byte pokemonanimfunc_5C
.4byte pokemonanimfunc_5D
.4byte pokemonanimfunc_5E
.4byte pokemonanimfunc_5F
.4byte pokemonanimfunc_60
.4byte pokemonanimfunc_61
.4byte pokemonanimfunc_62
.4byte pokemonanimfunc_63
.4byte pokemonanimfunc_64
.4byte pokemonanimfunc_65
.4byte pokemonanimfunc_66
.4byte pokemonanimfunc_67
.4byte pokemonanimfunc_68
.4byte pokemonanimfunc_69
.4byte pokemonanimfunc_6A
.4byte pokemonanimfunc_6B
.4byte pokemonanimfunc_6C
.4byte pokemonanimfunc_6D
.4byte pokemonanimfunc_6E
.4byte pokemonanimfunc_6F
.4byte pokemonanimfunc_70
.4byte pokemonanimfunc_71
.4byte pokemonanimfunc_72
.4byte pokemonanimfunc_73
.4byte pokemonanimfunc_74
.4byte pokemonanimfunc_75
.4byte pokemonanimfunc_76
.4byte pokemonanimfunc_77
.4byte pokemonanimfunc_78
.4byte pokemonanimfunc_79
.4byte pokemonanimfunc_7A
.4byte pokemonanimfunc_7B
.4byte pokemonanimfunc_7C
.4byte pokemonanimfunc_7D
.4byte pokemonanimfunc_7E
.4byte pokemonanimfunc_7F
.4byte pokemonanimfunc_80
.4byte pokemonanimfunc_81
.4byte pokemonanimfunc_82
.4byte pokemonanimfunc_83
.4byte pokemonanimfunc_84
.4byte pokemonanimfunc_85
.4byte pokemonanimfunc_86
.4byte pokemonanimfunc_87
.4byte pokemonanimfunc_88
.4byte pokemonanimfunc_89
.4byte pokemonanimfunc_8A
.4byte pokemonanimfunc_8B
.4byte pokemonanimfunc_8C
.4byte pokemonanimfunc_8D
.4byte pokemonanimfunc_8E
.4byte pokemonanimfunc_8F
.4byte pokemonanimfunc_90
.4byte pokemonanimfunc_91
.4byte pokemonanimfunc_92
.4byte pokemonanimfunc_93
.4byte pokemonanimfunc_94
.4byte pokemonanimfunc_95
.4byte pokemonanimfunc_96
gUnknown_0860ACE4:: @ 860ACE4
.byte 0x60, 0x5f, 0x02, 0x5e, 0x03, 0x46, 0x6d, 0x3e, 0x6e, 0x6f, 0x70, 0x3f, 0x71, 0x13, 0x72, 0x6c, 0x6b, 0x3a, 0x64, 0x14, 0x4f, 0x5d, 0x0f, 0x4c, 0x61, 0x57, 0x58, 0x67, 0x66, 0x59, 0x74, 0x73
.byte 0x5a, 0x75, 0x76, 0x5b, 0x77, 0x78, 0x65, 0x63, 0x5c, 0x62, 0x6a, 0x69, 0x68, 0x7b, 0x7a, 0x79, 0x7e, 0x7d, 0x7c, 0x81, 0x80, 0x7f, 0x84, 0x82, 0x83, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b
.byte 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96
gUnknown_0860AD2F:: @ 860AD2F
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01
.align 2
gSpriteAffineAnim_860AD48:: @ 860AD48
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnim_860AD58:: @ 860AD58
obj_rot_scal_anim_frame -0x100, 0x100, 0, 0
obj_rot_scal_anim_end
.align 2
gSpriteAffineAnimTable_860AD68:: @ 860AD68
.4byte gSpriteAffineAnim_860AD48
.4byte gSpriteAffineAnim_860AD58
gUnknown_0860AD70:: @ 860AD70
.byte 0xff, 0xff, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xfe, 0xfe, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00
gUnknown_0860AD8E:: @ 860AD8E
.byte 0x00, 0x08, 0x08, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x08, 0xf8, 0x18, 0xf8, 0x08
.byte 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x08, 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x00, 0x18, 0x00, 0x00, 0x00
gUnknown_0860ADBE:: @ 860ADBE
.byte 0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
gUnknown_0860ADCC:: @ 860ADCC
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
gUnknown_0860AE1C:: @ 860AE1C
.byte 0x00, 0x05, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
gUnknown_0860AE54:: @ 860AE54
.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
.align 2
gUnknown_0860AE7C:: @ 860AE7C
.4byte gUnknown_0860ADCC
.4byte gUnknown_0860AE1C
.4byte gUnknown_0860AE54
.align 1
gUnknown_0860AE88:: @ 860AE88
.2byte 0x001f, 0x03e0, 0x7c00, 0x0000

View File

@ -1,12 +1,6 @@
#ifndef GUARD_BLEND_PALETTE_H #ifndef GUARD_BLEND_PALETTE_H
#define GUARD_BLEND_PALETTE_H #define GUARD_BLEND_PALETTE_H
// Exported type declarations void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
// Exported RAM declarations
// Exported ROM declarations
void BlendPalette(u16, u16, u8, u16);
#endif // GUARD_BLEND_PALETTE_H #endif // GUARD_BLEND_PALETTE_H

15
include/constants/rgb.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef GUARD_RGB_H
#define GUARD_RGB_H
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
#define RGB_BLACK RGB(0, 0, 0)
#define RGB_WHITE RGB(31, 31, 31)
#define RGB_RED RGB(31, 0, 0)
#define RGB_GREEN RGB(0, 31, 0)
#define RGB_BLUE RGB(0, 0, 31)
#define RGB_YELLOW RGB(31, 31, 0)
#define RGB_MAGENTA RGB(31, 0, 31)
#define RGB_CYAN RGB(0, 31, 31)
#endif // GUARD_RGB_H

View File

@ -60,11 +60,6 @@
#define TOTAL_OBJ_TILE_COUNT 1024 #define TOTAL_OBJ_TILE_COUNT 1024
#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
#define RGB_BLACK RGB(0, 0, 0)
#define RGB_WHITE RGB(31, 31, 31)
#define WIN_RANGE(a, b) (((a) << 8) | (b)) #define WIN_RANGE(a, b) (((a) << 8) | (b))
#endif // GUARD_GBA_DEFINES #endif // GUARD_GBA_DEFINES

View File

@ -1,7 +1,10 @@
#ifndef GUARD_POKEMON_ANIMATION_H #ifndef GUARD_POKEMON_ANIMATION_H
#define GUARD_POKEMON_ANIMATION_H #define GUARD_POKEMON_ANIMATION_H
u8 GetSpeciesBackAnimSet(u16 species);
void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId); void LaunchAnimationTaskForFrontSprite(struct Sprite *sprite, u8 frontAnimId);
void LaunchAnimationTaskForBackSprite(struct Sprite* sprite, u8 backAnimId); void StartMonSummaryAnimation(struct Sprite *sprite, u8 frontAnimId);
void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet);
void SetSpriteCB_MonAnimDummy(struct Sprite *sprite);
#endif // GUARD_POKEMON_ANIMATION_H #endif // GUARD_POKEMON_ANIMATION_H

View File

@ -233,6 +233,7 @@ extern s16 gSpriteCoordOffsetX;
extern s16 gSpriteCoordOffsetY; extern s16 gSpriteCoordOffsetY;
extern struct Sprite gSprites[]; extern struct Sprite gSprites[];
extern struct OamMatrix gOamMatrices[];
void ResetSpriteData(void); void ResetSpriteData(void);
void AnimateSprites(void); void AnimateSprites(void);

View File

@ -240,7 +240,7 @@ SECTIONS {
src/bard_music.o(.text); src/bard_music.o(.text);
src/fldeff_teleport.o(.text); src/fldeff_teleport.o(.text);
asm/battle_link_817C95C.o(.text); asm/battle_link_817C95C.o(.text);
asm/pokemon_animation.o(.text); src/pokemon_animation.o(.text);
src/recorded_battle.o(.text); src/recorded_battle.o(.text);
src/battle_controller_recorded_opponent.o(.text); src/battle_controller_recorded_opponent.o(.text);
src/battle_controller_recorded_player.o(.text); src/battle_controller_recorded_player.o(.text);
@ -514,7 +514,7 @@ SECTIONS {
src/evolution_graphics.o(.rodata); src/evolution_graphics.o(.rodata);
src/bard_music.o(.rodata); src/bard_music.o(.rodata);
data/battle_link_817C95C.o(.rodata); data/battle_link_817C95C.o(.rodata);
data/pokemon_animation.o(.rodata); src/pokemon_animation.o(.rodata);
src/battle_controller_recorded_opponent.o(.rodata); src/battle_controller_recorded_opponent.o(.rodata);
src/battle_controller_recorded_player.o(.rodata); src/battle_controller_recorded_player.o(.rodata);
src/battle_dome_cards.o(.rodata); src/battle_dome_cards.o(.rodata);

View File

@ -20,6 +20,7 @@
#include "international_string_util.h" #include "international_string_util.h"
#include "safari_zone.h" #include "safari_zone.h"
#include "battle_anim.h" #include "battle_anim.h"
#include "constants/rgb.h"
struct TestingBar struct TestingBar
{ {
@ -555,13 +556,13 @@ enum
PAL_STATUS_BRN PAL_STATUS_BRN
}; };
static const u16 sStatusIconPalettes[] = static const u16 sStatusIconColors[] =
{ {
0x6198, // PAL_STATUS_PSN RGB(24, 12, 24), // PAL_STATUS_PSN
0xEF7, // PAL_STATUS_PAR RGB(23, 23, 3), // PAL_STATUS_PAR
0x4694, // PAL_STATUS_SLP RGB(20, 20, 17), // PAL_STATUS_SLP
0x72D1, // PAL_STATUS_FRZ RGB(17, 22, 28), // PAL_STATUS_FRZ
0x29DC // PAL_STATUS_BRN RGB(28, 14, 10) // PAL_STATUS_BRN
}; };
static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2 static const struct WindowTemplate sHealthboxWindowTemplate = {0, 0, 0, 8, 2, 0, 0}; // width = 8, height = 2
@ -2071,7 +2072,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
pltAdder = gSprites[healthboxSpriteId].oam.paletteNum * 16; pltAdder = gSprites[healthboxSpriteId].oam.paletteNum * 16;
pltAdder += bank + 12; pltAdder += bank + 12;
FillPalette(sStatusIconPalettes[statusPalId], pltAdder + 0x100, 2); FillPalette(sStatusIconColors[statusPalId], pltAdder + 0x100, 2);
CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2); CpuCopy16(gPlttBufferUnfaded + 0x100 + pltAdder, (void*)(OBJ_PLTT + pltAdder * 2), 2);
CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * 32), 96); CpuCopy32(statusGfxPtr, (void*)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * 32), 96);
if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT) if (IsDoubleBattle() == TRUE || GetBankSide(bank) == SIDE_OPPONENT)

View File

@ -25,6 +25,7 @@
#include "random.h" #include "random.h"
#include "event_data.h" #include "event_data.h"
#include "overworld.h" #include "overworld.h"
#include "new_menu_helpers.h"
struct HallofFameMon struct HallofFameMon
{ {
@ -53,7 +54,6 @@ static EWRAM_DATA struct HofGfx *sHofGfxPtr = NULL;
extern bool8 gHasHallOfFameRecords; extern bool8 gHasHallOfFameRecords;
extern u32 gUnknown_0203BCD4; extern u32 gUnknown_0203BCD4;
extern u8 gDecompressionBuffer[];
extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern MainCallback gGameContinueCallback; extern MainCallback gGameContinueCallback;
extern u32 gDamagedSaveSectors; extern u32 gDamagedSaveSectors;
@ -82,7 +82,6 @@ extern const u8 gContestConfetti_Gfx[];
extern const u8 gContestConfetti_Pal[]; extern const u8 gContestConfetti_Pal[];
extern void sub_81973C4(u8, u8); extern void sub_81973C4(u8, u8);
extern u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
extern void sub_8175620(void); extern void sub_8175620(void);
extern u8 TrySavingData(u8); extern u8 TrySavingData(u8);
extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16); extern u8 sub_818D3E4(u16 species, u32 trainerId, u32 personality, u8 flags, s16 x, s16 y, u8, u16);

View File

@ -4,6 +4,7 @@
#include "decompress.h" #include "decompress.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "task.h" #include "task.h"
#include "constants/rgb.h"
enum enum
{ {

View File

@ -74,8 +74,6 @@ extern u8 GetFrontierOpponentClass(u16 trainerId);
extern u8 pokemon_order_func(u8 bankPartyId); extern u8 pokemon_order_func(u8 bankPartyId);
extern void GetFrontierTrainerName(u8* dest, u16 trainerId); extern void GetFrontierTrainerName(u8* dest, u16 trainerId);
extern void sub_81C488C(u8); extern void sub_81C488C(u8);
extern void sub_817F578(struct Sprite*, u8 frontAnimId);
extern u8 GetSpeciesBackAnimId(u16 species);
static void sub_806E6CC(u8 taskId); static void sub_806E6CC(u8 taskId);
@ -1508,7 +1506,7 @@ static void Task_PokemonSummaryAnimateAfterDelay(u8 taskId)
{ {
if (--gTasks[taskId].data[3] == 0) if (--gTasks[taskId].data[3] == 0)
{ {
sub_817F578(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]); StartMonSummaryAnimation(READ_PTR_FROM_TASK(taskId, 0), gTasks[taskId].data[2]);
sub_81C488C(0xFF); sub_81C488C(0xFF);
DestroyTask(taskId); DestroyTask(taskId);
} }
@ -1523,7 +1521,6 @@ void BattleAnimateFrontSprite(struct Sprite* sprite, u16 species, bool8 noCry, u
} }
extern void SpriteCallbackDummy_2(struct Sprite*); extern void SpriteCallbackDummy_2(struct Sprite*);
extern void sub_817F60C(struct Sprite*);
void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3) void DoMonFrontSpriteAnimation(struct Sprite* sprite, u16 species, bool8 noCry, u8 arg3)
{ {
@ -1580,11 +1577,11 @@ void PokemonSummaryDoMonAnimation(struct Sprite* sprite, u16 species, bool8 oneF
gTasks[taskId].data[2] = gMonFrontAnimIdsTable[species - 1]; gTasks[taskId].data[2] = gMonFrontAnimIdsTable[species - 1];
gTasks[taskId].data[3] = gMonAnimationDelayTable[species - 1]; gTasks[taskId].data[3] = gMonAnimationDelayTable[species - 1];
sub_81C488C(taskId); sub_81C488C(taskId);
sub_817F60C(sprite); SetSpriteCB_MonAnimDummy(sprite);
} }
else else
{ {
sub_817F578(sprite, gMonFrontAnimIdsTable[species - 1]); StartMonSummaryAnimation(sprite, gMonFrontAnimIdsTable[species - 1]);
} }
} }
@ -1603,7 +1600,7 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species)
} }
else else
{ {
LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimId(species)); LaunchAnimationTaskForBackSprite(sprite, GetSpeciesBackAnimSet(species));
sprite->callback = SpriteCallbackDummy_2; sprite->callback = SpriteCallbackDummy_2;
} }
} }

5658
src/pokemon_animation.c Normal file

File diff suppressed because it is too large Load Diff

View File

@ -74,15 +74,7 @@ gUnknown_03001204: @ 3001204
.space 0x4 .space 0x4
.include "src/battle_transition.o" .include "src/battle_transition.o"
.include "src/pokemon_animation.o"
gUnknown_03001240: @ 3001240
.space 0x30
gUnknown_03001270: @ 3001270
.space 0x4
gUnknown_03001274: @ 3001274
.space 0x4
gUnknown_03001278: @ 3001278 gUnknown_03001278: @ 3001278
.space 0x1 .space 0x1