diff options
Diffstat (limited to 'data')
42 files changed, 894 insertions, 2651 deletions
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 4cc93f85e..c6dc96bf4 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -5,6 +5,36 @@ .include "asm/macros.inc" .include "asm/macros/battle_anim_script.inc" +#define FALSE 0 +#define TRUE 1 + +#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10)) +#define RGB_BLACK 0x0000 +#define RGB_WHITE 0x7FFF +#define RGB_WHITEALPHA 0xFFFF + +// BLDCNT +// Bits 0-5 select layers for the 1st target +#define BLDCNT_TGT1_BG0 (1 << 0) +#define BLDCNT_TGT1_BG1 (1 << 1) +#define BLDCNT_TGT1_BG2 (1 << 2) +#define BLDCNT_TGT1_BG3 (1 << 3) +#define BLDCNT_TGT1_OBJ (1 << 4) +#define BLDCNT_TGT1_BD (1 << 5) +// Bits 6-7 select the special effect +#define BLDCNT_EFFECT_NONE (0 << 6) // no special effect +#define BLDCNT_EFFECT_BLEND (1 << 6) // 1st+2nd targets mixed (controlled by BLDALPHA) +#define BLDCNT_EFFECT_LIGHTEN (2 << 6) // 1st target becomes whiter (controlled by BLDY) +#define BLDCNT_EFFECT_DARKEN (3 << 6) // 1st target becomes blacker (controlled by BLDY) +// Bits 8-13 select layers for the 2nd target +#define BLDCNT_TGT2_BG0 (1 << 8) +#define BLDCNT_TGT2_BG1 (1 << 9) +#define BLDCNT_TGT2_BG2 (1 << 10) +#define BLDCNT_TGT2_BG3 (1 << 11) +#define BLDCNT_TGT2_OBJ (1 << 12) +#define BLDCNT_TGT2_BD (1 << 13) +#define BLDCNT_TGT2_ALL (BLDCNT_TGT2_BG0 | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD) + .section script_data, "aw", %progbits .align 2 @@ -16,7 +46,7 @@ gMovesWithQuietBGM:: @ 81C68EC gBattleAnims_Moves:: .4byte Move_NONE - .4byte Move_NONE + .4byte Move_POUND .4byte Move_KARATE_CHOP .4byte Move_DOUBLE_SLAP .4byte Move_COMET_PUNCH @@ -134,7 +164,7 @@ gBattleAnims_Moves:: .4byte Move_FOCUS_ENERGY .4byte Move_BIDE .4byte Move_METRONOME - .4byte Move_NONE + .4byte Move_MIRROR_MOVE .4byte Move_SELF_DESTRUCT .4byte Move_EGG_BOMB .4byte Move_LICK @@ -423,7 +453,9 @@ gBattleAnims_Special:: .4byte Special_MonToSubstitute Move_NONE:: @ 81C6F34 - loadspritegfx 10135 +Move_POUND:: @ 81C6F34 +Move_MIRROR_MOVE:: @ 81C6F34 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -435,7 +467,7 @@ Move_NONE:: @ 81C6F34 end Move_DOUBLE_SLAP:: @ 81C6F65 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C6F90, gUnknown_81C6FA4 @@ -457,8 +489,8 @@ gUnknown_81C6FA4:: @ 81C6FA4 goto gUnknown_81C6F76 Move_POISON_POWDER:: @ 81C6FB8 - loadspritegfx 10065 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_POWDER + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W077, 63, 10, 6 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -482,7 +514,7 @@ Move_POISON_POWDER:: @ 81C6FB8 end Move_STUN_SPORE:: @ 81C70E9 - loadspritegfx 10068 + loadspritegfx ANIM_TAG_STUN_SPORE loopsewithpan SE_W077, 63, 10, 6 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gStunSporeParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -506,7 +538,7 @@ Move_STUN_SPORE:: @ 81C70E9 end Move_SLEEP_POWDER:: @ 81C7217 - loadspritegfx 10067 + loadspritegfx ANIM_TAG_SLEEP_POWDER loopsewithpan SE_W077, 63, 10, 6 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, -30, -22, 117, 80, 5, 1 createsprite gSleepPowderParticleSpriteTemplate, ANIM_TARGET, 2, 10, -22, 117, 80, -5, 1 @@ -530,8 +562,8 @@ Move_SLEEP_POWDER:: @ 81C7217 end Move_SWIFT:: @ 81C7345 - loadspritegfx 10174 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_YELLOW_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W129, 192 @@ -557,7 +589,7 @@ Move_SWIFT:: @ 81C7345 end Move_STRENGTH:: @ 81C73FE - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -583,7 +615,7 @@ Move_STRENGTH:: @ 81C73FE end Move_TACKLE:: @ 81C7492 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -597,7 +629,7 @@ Move_TACKLE:: @ 81C7492 end Move_BODY_SLAM:: @ 81C74D0 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -623,7 +655,7 @@ Move_BODY_SLAM:: @ 81C74D0 end Move_SUPERSONIC:: @ 81C755D - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING monbg 2 monbgprio_2A 0 setalpha 12, 8 @@ -646,7 +678,7 @@ gUnknown_81C759B:: @ 81C759B return Move_SCREECH:: @ 81C75B5 - loadspritegfx 10164 + loadspritegfx ANIM_TAG_PURPLE_RING createvisualtask AnimTask_ShakeMon2, 2, 0, 3, 0, 2, 1 call gUnknown_81C75E8 call gUnknown_81C75E8 @@ -662,7 +694,7 @@ gUnknown_81C75E8:: @ 81C75E8 return Move_FLAME_WHEEL:: @ 81C7602 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_2A 1 createsprite gUnknown_83E5DFC, ANIM_ATTACKER, 3, 0, 0, 56, 0 @@ -702,8 +734,8 @@ Move_FLAME_WHEEL:: @ 81C7602 return Move_PIN_MISSILE:: @ 81C76FC - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -731,8 +763,8 @@ Move_PIN_MISSILE:: @ 81C76FC end Move_ICICLE_SPEAR:: @ 81C77C1 - loadspritegfx 10262 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ICICLE_SPEAR + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -760,7 +792,7 @@ Move_ICICLE_SPEAR:: @ 81C77C1 end Move_TAKE_DOWN:: @ 81C7886 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W036, 192 @@ -784,16 +816,16 @@ Move_TAKE_DOWN:: @ 81C7886 end Move_DOUBLE_EDGE:: @ 81C791A - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W129, 192 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0 waitforvisualfinish delay 10 playsewithpan SE_W207, 192 waitplaysewithpan SE_W207, 192, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 2, 4 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 16, 16, RGB_WHITE createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 delay 3 waitforvisualfinish @@ -805,7 +837,7 @@ Move_DOUBLE_EDGE:: @ 81C791A createvisualtask sub_8099980, 2, 8, -256, 1, 0 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 4, 0, 12, 1 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, RGB_WHITE waitforvisualfinish createvisualtask sub_8099980, 2, 8, -256, 0, 1 createvisualtask sub_8099980, 2, 8, -256, 1, 1 @@ -817,9 +849,9 @@ Move_DOUBLE_EDGE:: @ 81C791A end Move_POISON_STING:: @ 81C7A2D - loadspritegfx 10161 - loadspritegfx 10135 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -837,8 +869,8 @@ Move_POISON_STING:: @ 81C7A2D end Move_TWINEEDLE:: @ 81C7A82 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -857,13 +889,13 @@ Move_TWINEEDLE:: @ 81C7A82 end Move_FIRE_BLAST:: @ 81C7AF5 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsoundtask sub_80DCE10, 137, 138 call gUnknown_81C7B89 call gUnknown_81C7B89 call gUnknown_81C7B89 delay 24 - createvisualtask sub_80BA7F8, 10, 1, 3, 0, 8, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 8, RGB_BLACK waitforvisualfinish delay 19 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 20, 1 @@ -885,7 +917,7 @@ Move_FIRE_BLAST:: @ 81C7AF5 delay 3 call gUnknown_81C7BCD waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 2, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 2, 8, 0, RGB_BLACK waitforvisualfinish end @@ -907,7 +939,7 @@ gUnknown_81C7BCD:: @ 81C7BCD return Move_LEECH_SEED:: @ 81C7C23 - loadspritegfx 10006 + loadspritegfx ANIM_TAG_SEED playsewithpan SE_W077, 192 createsprite gLeechSeedSpriteTemplate, ANIM_TARGET, 2, 15, 0, 0, 24, 35, -32 delay 8 @@ -922,7 +954,7 @@ Move_LEECH_SEED:: @ 81C7C23 end Move_EMBER:: @ 81C7C79 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W052, 192, 5, 2 createsprite gEmberSpriteTemplate, ANIM_TARGET, 2, 20, 0, -16, 24, 20, 1 delay 4 @@ -942,20 +974,20 @@ gUnknown_81C7CD5:: @ 81C7CD5 return Move_MEGA_PUNCH:: @ 81C7CED - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 playsewithpan SE_W025, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 50 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 call gUnknown_81C7D89 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 playsewithpan SE_W233B, 63 waitforvisualfinish @@ -990,21 +1022,21 @@ gUnknown_81C7DC0:: @ 81C7DC0 goto gUnknown_81C7DB1 Move_MEGA_KICK:: @ 81C7DC7 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 delay 2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 0, 16, 0 setalpha 12, 8 playsewithpan SE_W025, 63 createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 50 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 50 playsewithpan SE_W025B, 63 call gUnknown_81C7D89 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 22, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 waitforvisualfinish clearmonbg 1 @@ -1015,8 +1047,8 @@ Move_MEGA_KICK:: @ 81C7DC7 end Move_COMET_PUNCH:: @ 81C7E63 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C7E91, gUnknown_81C7EB6 @@ -1040,8 +1072,8 @@ gUnknown_81C7EB6:: @ 81C7EB6 goto gUnknown_81C7E77 Move_SONIC_BOOM:: @ 81C7EDB - loadspritegfx 10003 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -1067,31 +1099,31 @@ gUnknown_81C7F2A:: @ 81C7F2A return Move_THUNDER_SHOCK:: @ 81C7F3C - loadspritegfx 10001 - loadspritegfx 10011 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 0, -44, 0 playsewithpan SE_W085, 63 delay 9 - createvisualtask sub_80BA7F8, 10, 4, 0, 0, 13, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 13, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 call gUnknown_81D58D4 waitforvisualfinish delay 20 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDERBOLT:: @ 81C7FAA - loadspritegfx 10001 - loadspritegfx 10282 - loadspritegfx 10011 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SHOCK_3 + loadspritegfx ANIM_TAG_SPARK_2 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 24, -52, 0 @@ -1103,9 +1135,9 @@ Move_THUNDERBOLT:: @ 81C7FAA createvisualtask sub_80AE220, 5, 0, -60, 1 playsewithpan SE_W085, 63 delay 9 - createvisualtask sub_80BA7F8, 10, 4, 0, 0, 13, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 0, 13, RGB_BLACK waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 13, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 13, 0, RGB_BLACK waitforvisualfinish delay 20 createsprite gUnknown_83E6058, ANIM_TARGET, 3, 44, 0, 0, 3 @@ -1119,28 +1151,28 @@ Move_THUNDERBOLT:: @ 81C7FAA createsprite gUnknown_83E6070, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765 playsewithpan SE_W063, 63 delay 0 - createvisualtask sub_80BA7F8, 10, 1, 0, 2, 2, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 6, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 2, 2, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 2, 2, RGB_BLACK delay 6 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 6, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 6, RGB_BLACK waitforvisualfinish delay 20 waitplaysewithpan SE_W085B, 63, 19 call gUnknown_81D58D4 waitforvisualfinish delay 20 - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_THUNDER_WAVE:: @ 81C8160 - loadspritegfx 10001 - loadspritegfx 10011 - loadspritegfx 10173 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 6, 0 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_SPARK_2 + loadspritegfx ANIM_TAG_SPARK_H + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 6, RGB_BLACK waitforvisualfinish delay 10 createvisualtask sub_80AE220, 5, 0, -48, 0 @@ -1153,13 +1185,13 @@ Move_THUNDER_WAVE:: @ 81C8160 delay 4 createsprite gUnknown_83E60B8, ANIM_TARGET, 2, -16, 16 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 0, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 6, 0, RGB_BLACK waitforvisualfinish end Move_BEAT_UP:: @ 81C81CF - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 1 setalpha 12, 8 choosetwoturnanim gUnknown_81C81E8, gUnknown_81C8259 @@ -1195,8 +1227,8 @@ gUnknown_81C8259:: @ 81C8259 goto gUnknown_81C81E3 Move_STOMP:: @ 81C82CA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W104, 63 @@ -1217,7 +1249,7 @@ Move_TAIL_WHIP:: @ 81C8311 end Move_CUT:: @ 81C832A - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 playsewithpan SE_W015, 63 @@ -1231,7 +1263,7 @@ Move_CUT:: @ 81C832A end Move_HIDDEN_POWER:: @ 81C835C - loadspritegfx 10217 + loadspritegfx ANIM_TAG_RED_ORB playsewithpan SE_W036, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -7, -7, 11, 0, 0 waitforvisualfinish @@ -1261,14 +1293,14 @@ Move_HIDDEN_POWER:: @ 81C835C end Move_REVERSAL:: @ 81C8445 - loadspritegfx 10236 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W197, 192 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, 32767, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 3, RGB_WHITE, 8, 0, 0 waitforvisualfinish delay 30 - createvisualtask sub_80B9BDC, 2, 31, 3, 2, 0, 10, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 31, 3, 2, 0, 10, RGB_WHITE delay 10 playsewithpan SE_W179, 192 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0 @@ -1282,14 +1314,14 @@ Move_REVERSAL:: @ 81C8445 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 8 playsewithpan SE_W233B, 63 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 8, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 8, 0, 0 createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0, 0, 10, 1, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createvisualtask sub_8099BD4, 5, 0, 1, 8, 1, 0 end Move_PURSUIT:: @ 81C8520 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 fadetobg 1 waitbgfadein @@ -1319,8 +1351,8 @@ gUnknown_81C8568:: @ 81C8568 goto gUnknown_81C8536 Move_SPIKE_CANNON:: @ 81C8591 - loadspritegfx 10161 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -1343,7 +1375,7 @@ Move_SPIKE_CANNON:: @ 81C8591 end Move_SWORDS_DANCE:: @ 81C8644 - loadspritegfx 10005 + loadspritegfx ANIM_TAG_SWORD monbg 0 setalpha 12, 8 playsewithpan SE_W014, 192 @@ -1358,7 +1390,7 @@ Move_SWORDS_DANCE:: @ 81C8644 end Move_PSYCH_UP:: @ 81C868A - loadspritegfx 10196 + loadspritegfx ANIM_TAG_SPIRAL monbg 2 createvisualtask sub_80B9CE4, 2, 1, 2, 6, 1, 11, 0 setalpha 12, 8 @@ -1369,7 +1401,7 @@ Move_PSYCH_UP:: @ 81C868A delay 4 playsewithpan SE_W060, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, 0, 1 - createvisualtask sub_80BA7F8, 9, 2, 2, 10, 0, 1023 + createvisualtask AnimTask_BlendSelected, 9, 2, 2, 10, 0, RGB(31, 31, 0) delay 30 clearmonbg 2 blendoff @@ -1377,9 +1409,9 @@ Move_PSYCH_UP:: @ 81C868A end Move_DIZZY_PUNCH:: @ 81C86FC - loadspritegfx 10073 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_DUCK + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 call gUnknown_81C8817 @@ -1415,7 +1447,7 @@ gUnknown_81C8817:: @ 81C8817 return Move_FIRE_SPIN:: @ 81C8836 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 47, 1 call gUnknown_81C885F @@ -1440,7 +1472,7 @@ gUnknown_81C885F:: @ 81C885F return Move_FURY_CUTTER:: @ 81C88EA - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 playsewithpan SE_W013, 63 @@ -1485,8 +1517,8 @@ gUnknown_81C899F:: @ 81C899F goto gUnknown_81C892E Move_SELF_DESTRUCT:: @ 81C89B9 - loadspritegfx 10198 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 9, 31 + loadspritegfx ANIM_TAG_EXPLOSION + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 @@ -1495,7 +1527,7 @@ Move_SELF_DESTRUCT:: @ 81C89B9 call gUnknown_81C8A3F call gUnknown_81C8A3F waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 1, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 9, 0, RGB(31, 0, 0) end gUnknown_81C8A3F:: @ 81C8A3F @@ -1517,8 +1549,8 @@ gUnknown_81C8A3F:: @ 81C8A3F return Move_SLAM:: @ 81C8AA9 - loadspritegfx 10056 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W004, 192 @@ -1541,7 +1573,7 @@ Move_SLAM:: @ 81C8AA9 end Move_VINE_WHIP:: @ 81C8B31 - loadspritegfx 10287 + loadspritegfx ANIM_TAG_WHIP_HIT playsewithpan SE_W026, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 6 @@ -1552,8 +1584,8 @@ Move_VINE_WHIP:: @ 81C8B31 end Move_DRILL_PECK:: @ 81C8B68 - loadspritegfx 10135 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -1571,9 +1603,9 @@ Move_DRILL_PECK:: @ 81C8B68 end Move_WATERFALL:: @ 81C8BC1 - loadspritegfx 10148 - loadspritegfx 10155 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 setalpha 12, 8 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 23, 1 @@ -1652,7 +1684,7 @@ gUnknown_81C8CA2:: @ 81C8CA2 return Move_EXPLOSION:: @ 81C8E15 - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 8, 9, 8474, 8, 0, 8 createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 @@ -1662,9 +1694,9 @@ Move_EXPLOSION:: @ 81C8E15 call gUnknown_81C8EB2 call gUnknown_81C8EB2 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 1, 16, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1, 1, 16, 16, RGB_WHITE delay 50 - createvisualtask sub_80BA7F8, 10, 1, 3, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 16, 0, RGB_WHITE end gUnknown_81C8EB2:: @ 81C8EB2 @@ -1686,7 +1718,7 @@ gUnknown_81C8EB2:: @ 81C8EB2 return Move_DEFENSE_CURL:: @ 81C8F1C - loadspritegfx 10234 + loadspritegfx ANIM_TAG_ECLIPSING_ORB loopsewithpan SE_W161, 192, 18, 3 createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 0, 0 createvisualtask AnimTask_DefenseCurlDeformMon, 5, @@ -1698,7 +1730,7 @@ Move_DEFENSE_CURL:: @ 81C8F1C end Move_PROTECT:: @ 81C8F55 - loadspritegfx 10280 + loadspritegfx ANIM_TAG_PROTECT monbg 2 monbgprio_28 0 waitplaysewithpan SE_W115, 192, 16 @@ -1708,23 +1740,23 @@ Move_PROTECT:: @ 81C8F55 end Move_DETECT:: @ 81C8F72 - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 9, 0 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 9, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 9, RGB_WHITE delay 18 playsewithpan SE_W197, 192 createsprite gSpriteTemplate_83BF480, ANIM_ATTACKER, 13, 20, -20 waitforvisualfinish delay 10 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 9, 0, 0 - createvisualtask sub_80BA7F8, 10, 2, 2, 9, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 9, 0, RGB_WHITE waitforvisualfinish end Move_FRUSTRATION:: @ 81C8FD0 - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg 3 setalpha 12, 8 createvisualtask AnimTask_GetFrustrationPowerLevel, 1, @@ -1742,7 +1774,7 @@ gUnknown_81C8FFF:: @ 81C8FFF gUnknown_81C9004:: @ 81C9004 playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 - createvisualtask sub_80BA7F8, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 @@ -1773,13 +1805,13 @@ gUnknown_81C9004:: @ 81C9004 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 18, -18, 1, 0 playsewithpan SE_W004, 63 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto gUnknown_81C8FFF gUnknown_81C910A:: @ 81C910A playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon2, 5, 0, 1, 0, 15, 1 - createvisualtask sub_80BA7F8, 10, 2, 3, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 0, 9, RGB(31, 0, 0) waitforvisualfinish delay 20 playsewithpan SE_W207B, 192 @@ -1800,7 +1832,7 @@ gUnknown_81C910A:: @ 81C910A createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, -12, -6, 1, 1 createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 6, 1 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 3, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 3, 9, 0, RGB(31, 0, 0) goto gUnknown_81C8FFF gUnknown_81C91D7:: @ 81C91D7 @@ -1833,7 +1865,7 @@ gUnknown_81C9253:: @ 81C9253 goto gUnknown_81C8FFF Move_SAFEGUARD:: @ 81C9297 - loadspritegfx 10244 + loadspritegfx ANIM_TAG_GUARD_RING monbg 2 setalpha 8, 8 playsewithpan SE_W208, 192 @@ -1844,14 +1876,14 @@ Move_SAFEGUARD:: @ 81C9297 createsprite gGuardRingSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish playsewithpan SE_REAPOKE, 192 - createvisualtask sub_80B9BDC, 2, 10, 0, 2, 0, 10, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 10, 0, 2, 0, 10, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff end Move_PAIN_SPLIT:: @ 81C92D9 - loadspritegfx 10239 + loadspritegfx ANIM_TAG_PAIN_SPLIT createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, 1 delay 10 @@ -1875,8 +1907,8 @@ Move_PAIN_SPLIT:: @ 81C92D9 end Move_VICE_GRIP:: @ 81C9381 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -1891,8 +1923,8 @@ Move_VICE_GRIP:: @ 81C9381 end Move_GUILLOTINE:: @ 81C93C9 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 fadetobgfromset 12, 13, 14 @@ -1900,7 +1932,7 @@ Move_GUILLOTINE:: @ 81C93C9 playsewithpan SE_W011, 63 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_BLACK delay 9 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 23, 1 delay 46 @@ -1916,8 +1948,8 @@ Move_GUILLOTINE:: @ 81C93C9 end Move_PAY_DAY:: @ 81C9455 - loadspritegfx 10100 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_COIN + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -1934,9 +1966,9 @@ Move_PAY_DAY:: @ 81C9455 end Move_OUTRAGE:: @ 81C94A8 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER loopsewithpan SE_W082, 192, 8, 3 - createvisualtask sub_80B9BDC, 2, 7, 2, 5, 3, 8, 430 + createvisualtask AnimTask_CurseBlendEffect, 2, 7, 2, 5, 3, 8, 430 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 12, 6, 5, 4 delay 0 createsprite gUnknown_83E772C, ANIM_TARGET, 2, 0, 0, 30, 1280, 0, 3 @@ -1980,28 +2012,28 @@ gUnknown_81C95AF:: @ 81C95AF return Move_SPARK:: @ 81C9643 - loadspritegfx 10135 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_SPARK_2 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 5, 5, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0 delay 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 10 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 5, 5, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 5, 5, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1 delay 0 createsprite gUnknown_83E5FC4, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1 delay 0 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 delay 20 - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 7, 7, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 7, 7, 23551 playsewithpan SE_W085B, 192 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0 @@ -2013,20 +2045,20 @@ Move_SPARK:: @ 81C9643 createsprite gUnknown_83E6070, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0 delay 4 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 3, -31, 1, 0, 0, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 3, -31, 1, 0, 0, 23551 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 delay 4 playsewithpan SE_W063, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 2 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 6, 1 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 4, -31, 2, 0, 6, 23551 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, -31, 2, 0, 6, 23551 call gUnknown_81D58D4 waitforvisualfinish end Move_ATTRACT:: @ 81C985A - loadspritegfx 10216 + loadspritegfx ANIM_TAG_RED_HEART loopsewithpan SE_W204, 192, 12, 3 createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, 0 delay 15 @@ -2051,7 +2083,7 @@ Move_ATTRACT:: @ 81C985A createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 112, 256, 90 createsprite gRedHeartRisingSpriteTemplate, ANIM_ATTACKER, 40, 200, 272, 90 delay 75 - createvisualtask sub_80B9BDC, 2, 4, 4, 4, 0, 10, 28479 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 4, 4, 0, 10, 28479 end Move_GROWTH:: @ 81C9953 @@ -2062,13 +2094,13 @@ Move_GROWTH:: @ 81C9953 end gUnknown_81C9960:: @ 81C9960 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE playsewithpan SE_W036, 192 createvisualtask AnimTask_ScaleMonAndRestore, 5, -3, -3, 16, 0, 0 return Move_WHIRLWIND:: @ 81C9989 - loadspritegfx 10162 + loadspritegfx ANIM_TAG_WHIRLWIND_LINES createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, -8, 1, 60, 0 createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, 0, 1, 60, 1 createsprite gUnknown_83E6C84, ANIM_ATTACKER, 2, 0, 8, 1, 60, 2 @@ -2087,7 +2119,7 @@ Move_WHIRLWIND:: @ 81C9989 end Move_CONFUSE_RAY:: @ 81C9A31 - loadspritegfx 10013 + loadspritegfx ANIM_TAG_YELLOW_BALL monbg 3 fadetobg 2 waitbgfadein @@ -2107,7 +2139,7 @@ Move_CONFUSE_RAY:: @ 81C9A31 end Move_LOCK_ON:: @ 81C9A84 - loadspritegfx 10014 + loadspritegfx ANIM_TAG_LOCK_ON createsprite gLockOnTargetSpriteTemplate, ANIM_ATTACKER, 40, createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 1 createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 2 @@ -2119,7 +2151,7 @@ Move_LOCK_ON:: @ 81C9A84 end Move_MEAN_LOOK:: @ 81C9ABA - loadspritegfx 10187 + loadspritegfx ANIM_TAG_EYE monbg 3 playsewithpan SE_W060, 192 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 @@ -2134,7 +2166,7 @@ Move_MEAN_LOOK:: @ 81C9ABA end Move_ROCK_THROW:: @ 81C9AFF - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_83E7B88, ANIM_TARGET, 2, 6, 1, 15, 1 createsprite gUnknown_83E73B4, ANIM_TARGET, 2, 0, 1, 0, 0 playsewithpan SE_W088, 63 @@ -2155,7 +2187,7 @@ Move_ROCK_THROW:: @ 81C9AFF end Move_ROCK_SLIDE:: @ 81C9B8B - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS monbg 3 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 7, 1, 11, 1 createsprite gUnknown_83E73B4, ANIM_TARGET, 2, -5, 1, -5, 1 @@ -2206,7 +2238,7 @@ gUnknown_81C9C23:: @ 81C9C23 return Move_THIEF:: @ 81C9CCC - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 delay 1 fadetobg 1 @@ -2226,8 +2258,8 @@ Move_THIEF:: @ 81C9CCC end Move_BUBBLE_BEAM:: @ 81C9D13 - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -2265,10 +2297,10 @@ gUnknown_81C9D4D:: @ 81C9D4D return Move_ICY_WIND:: @ 81C9DF0 - loadspritegfx 10141 - loadspritegfx 10142 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_ICE_SPIKES monbg 3 - createvisualtask sub_80BA7F8, 10, 11, 4, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 11, 4, 0, 4, RGB_BLACK fadetobg 15 waitbgfadeout playsewithpan SE_W196, 0 @@ -2285,7 +2317,7 @@ Move_ICY_WIND:: @ 81C9DF0 clearmonbg 3 restorebg waitbgfadeout - createvisualtask sub_80BA7F8, 10, 11, 4, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 11, 4, 4, 0, RGB_BLACK waitbgfadein end @@ -2302,8 +2334,8 @@ gUnknown_81C9E48:: @ 81C9E48 return Move_SMOKESCREEN:: @ 81C9EB0 - loadspritegfx 10016 - loadspritegfx 10017 + loadspritegfx ANIM_TAG_BLACK_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W104, 192 createsprite gBlackBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 35, -25 waitforvisualfinish @@ -2326,7 +2358,7 @@ Move_SMOKESCREEN:: @ 81C9EB0 end Move_CONVERSION:: @ 81C9FA9 - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg 2 monbgprio_28 0 setalpha 16, 0 @@ -2378,7 +2410,7 @@ Move_CONVERSION:: @ 81C9FA9 end Move_CONVERSION_2:: @ 81CA0BE - loadspritegfx 10018 + loadspritegfx ANIM_TAG_CONVERSION monbg 3 monbgprio_2A 1 setalpha 0, 16 @@ -2423,8 +2455,8 @@ Move_CONVERSION_2:: @ 81CA0BE end Move_ROLLING_KICK:: @ 81CA1DA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 @@ -2445,7 +2477,7 @@ Move_ROLLING_KICK:: @ 81CA1DA end Move_HEADBUTT:: @ 81CA25D - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2461,8 +2493,8 @@ Move_HEADBUTT:: @ 81CA25D end Move_HORN_ATTACK:: @ 81CA2BA - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W029, 192 waitforvisualfinish @@ -2479,8 +2511,8 @@ Move_HORN_ATTACK:: @ 81CA2BA end Move_FURY_ATTACK:: @ 81CA327 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT createvisualtask sub_8099980, 2, 4, 256, 0, 2 choosetwoturnanim gUnknown_81CA358, gUnknown_81CA37E @@ -2504,8 +2536,8 @@ gUnknown_81CA37E:: @ 81CA37E goto gUnknown_81CA345 Move_HORN_DRILL:: @ 81CA3A4 - loadspritegfx 10135 - loadspritegfx 10020 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HORN_HIT jumpifcontest gUnknown_81CA50A fadetobg 7 waitbgfadeout @@ -2572,8 +2604,8 @@ gUnknown_81CA50A:: @ 81CA50A goto gUnknown_81CA3C1 Move_THRASH:: @ 81CA521 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createvisualtask AnimTask_ThrashMoveMonHorizontal, 2, createvisualtask AnimTask_ThrashMoveMonVertical, 2, createsprite gUnknown_83E6728, ANIM_TARGET, 3, 1, 10, 0 @@ -2590,7 +2622,7 @@ Move_THRASH:: @ 81CA521 end Move_SING:: @ 81CA5A0 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES monbg 3 createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish @@ -2626,8 +2658,8 @@ Move_SING:: @ 81CA5A0 end Move_LOW_KICK:: @ 81CA674 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4 createsprite gUnknown_83E6758, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 delay 4 @@ -2643,24 +2675,24 @@ Move_EARTHQUAKE:: @ 81CA6D1 createvisualtask sub_80B94B4, 5, 4, 10, 50 playsewithpan SE_W089, 0 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 end Move_FISSURE:: @ 81CA71E - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask sub_80B94B4, 3, 5, 10, 50 createvisualtask sub_80B94B4, 3, 1, 10, 50 playsewithpan SE_W089, 63 delay 8 call gUnknown_81CA79F delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 15 call gUnknown_81CA7F0 delay 15 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 15 call gUnknown_81CA79F delay 50 @@ -2698,8 +2730,8 @@ gUnknown_81CA84A:: @ 81CA84A end gUnknown_81CA84B:: @ 81CA84B - loadspritegfx 10074 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_DIRT_MOUND createsprite gUnknown_83E7AC4, ANIM_ATTACKER, 1, 0, 0, 180 createsprite gUnknown_83E7AC4, ANIM_ATTACKER, 1, 0, 1, 180 monbg_22 0 @@ -2718,8 +2750,8 @@ gUnknown_81CA84B:: @ 81CA84B goto gUnknown_81CA84A gUnknown_81CA8A6:: @ 81CA8A6 - loadspritegfx 10135 - loadspritegfx 10281 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_DIRT_MOUND createvisualtask sub_80B90EC, 2, 0 waitforvisualfinish monbg 0 @@ -2757,7 +2789,7 @@ Move_AGILITY:: @ 81CA97A monbg 2 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 4, 4 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 10 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 10 playsewithpan SE_W104, 192 delay 12 playsewithpan SE_W104, 192 @@ -2775,11 +2807,11 @@ Move_AGILITY:: @ 81CA97A end Move_QUICK_ATTACK:: @ 81CA9C4 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 2 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 3 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 playsewithpan SE_W026, 192 delay 4 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 6, 1 @@ -2792,8 +2824,8 @@ Move_QUICK_ATTACK:: @ 81CA9C4 end Move_RAGE:: @ 81CAA1C - loadspritegfx 10135 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ANGER monbg 1 setalpha 12, 8 createvisualtask AnimTask_BlendMonInAndOut, 3, 0, 31, 10, 0, 2 @@ -2857,8 +2889,8 @@ Move_MINIMIZE:: @ 81CAAF2 end Move_METRONOME:: @ 81CAB05 - loadspritegfx 10064 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_FINGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100 playsewithpan SE_W118, 192 delay 6 @@ -2891,12 +2923,12 @@ gUnknown_81CAB49:: @ 81CAB49 return gUnknown_81CAB86:: @ 81CAB86 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SkullBashPosition, 2, 0 playsewithpan SE_W036, 192 waitforvisualfinish playse SE_BAN - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 40, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, 1, 10, 0, 40, 1 createsprite gUnknown_83E7C98, ANIM_TARGET, 4, 0, 0, 1, 0 @@ -2906,7 +2938,7 @@ gUnknown_81CAB86:: @ 81CAB86 goto gUnknown_81CAB38 Move_AMNESIA:: @ 81CABF5 - loadspritegfx 10093 + loadspritegfx ANIM_TAG_AMNESIA call gUnknown_81D59BB delay 8 createsprite gUnknown_83E6FF4, ANIM_ATTACKER, 20, @@ -2918,8 +2950,8 @@ Move_AMNESIA:: @ 81CABF5 end Move_KINESIS:: @ 81CAC19 - loadspritegfx 10075 - loadspritegfx 10097 + loadspritegfx ANIM_TAG_ALERT + loadspritegfx ANIM_TAG_BENT_SPOON playsewithpan SE_W060, 192 call gUnknown_81D59BB createsprite gUnknown_83E6F8C, ANIM_ATTACKER, 20, @@ -2937,12 +2969,12 @@ Move_KINESIS:: @ 81CAC19 end Move_GLARE:: @ 81CAC6A - loadspritegfx 10248 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_SMALL_RED_EYE + loadspritegfx ANIM_TAG_EYE_SPARKLE createvisualtask AnimTask_GlareEyeDots, 5, 0 playsewithpan SE_W060B, 192 waitforvisualfinish - createvisualtask sub_80BA7F8, 5, 1, 0, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 0, 0, 16, RGB_BLACK waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, 16, -8 @@ -2951,11 +2983,11 @@ Move_GLARE:: @ 81CAC6A delay 2 createvisualtask sub_80ADAD8, 3, 20, 1, 0 waitforvisualfinish - createvisualtask sub_80BA7F8, 5, 1, 0, 16, 0, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 0, 16, 0, RGB_BLACK end Move_BARRAGE:: @ 81CACD3 - loadspritegfx 10254 + loadspritegfx ANIM_TAG_RED_BALL createvisualtask AnimTask_BarrageBall, 3, playsewithpan SE_W207, 192 delay 24 @@ -2979,46 +3011,46 @@ gUnknown_81CAD25:: @ 81CAD25 goto gUnknown_81CADB7 gUnknown_81CAD40:: @ 81CAD40 - createvisualtask sub_80BA7F8, 10, 27, 1, 0, 12, 0 + createvisualtask AnimTask_BlendSelected, 10, 27, 1, 0, 12, RGB_BLACK waitforvisualfinish delay 12 - createvisualtask sub_80BA7F8, 10, 2, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_80B94B4, 5, 0, 2, 16 loopsewithpan SE_W287, 192, 4, 8 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 15, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 - createvisualtask sub_80BA7F8, 10, 2, 1, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 25, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 25, 1, 8, 0, RGB_BLACK waitforvisualfinish clearmonbg 3 blendoff goto gUnknown_81CAD24 gUnknown_81CADB7:: @ 81CADB7 - createvisualtask sub_80BA83C, 10, 1, 1, 0, 12, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 1, 0, 12, 0 waitforvisualfinish delay 12 - createvisualtask sub_80BA7F8, 10, 2, 1, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 8, 0, RGB_BLACK createvisualtask sub_80B94B4, 5, 0, 2, 16 playsewithpan SE_W287, 192 delay 8 - createvisualtask sub_80BA7F8, 10, 2, 1, 0, 15, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 0, 15, RGB_WHITE delay 20 - createvisualtask sub_80BA7F8, 10, 2, 1, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 1, 15, 0, RGB_WHITE waitforvisualfinish - createvisualtask sub_80BA83C, 10, 4, 1, 8, 0, 0 + createvisualtask AnimTask_BlendExcept, 10, 4, 1, 8, 0, 0 waitforvisualfinish clearmonbg 3 blendoff goto gUnknown_81CAD24 gUnknown_81CAE2E:: @ 81CAE2E - loadspritegfx 10135 - loadspritegfx 10284 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_BIRD call gUnknown_81D59CF monbg 0 - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 16, RGB_WHITE delay 4 createvisualtask sub_80B78E0, 5, 0 waitforvisualfinish @@ -3030,7 +3062,7 @@ gUnknown_81CAE2E:: @ 81CAE2E delay 20 createvisualtask sub_80B79DC, 5, 1 delay 2 - createvisualtask sub_80BA7F8, 10, 2, 0, 15, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 15, 0, RGB_WHITE waitforvisualfinish clearmonbg 0 call gUnknown_81D59FF @@ -3061,13 +3093,13 @@ Move_ACID_ARMOR:: @ 81CAED5 end Move_SHARPEN:: @ 81CAEEE - loadspritegfx 10185 + loadspritegfx ANIM_TAG_SPHERE_TO_CUBE createsprite gSharpenSphereSpriteTemplate, ANIM_ATTACKER, 2, waitforvisualfinish end Move_SUPER_FANG:: @ 81CAEFA - loadspritegfx 10192 + loadspritegfx ANIM_TAG_FANG_ATTACK createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 1, 0, 20, 1 playsewithpan SE_W082, 192 waitforvisualfinish @@ -3080,14 +3112,14 @@ Move_SUPER_FANG:: @ 81CAEFA createsprite gSuperFangSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W044, 63 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 2143, 14, RGB_WHITE, 14 createvisualtask AnimTask_ShakeMon, 2, 1, 0, 7, 12, 1 waitforvisualfinish blendoff end Move_SLASH:: @ 81CAF7B - loadspritegfx 10183 + loadspritegfx ANIM_TAG_SLASH createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0 playsewithpan SE_W013, 63 delay 4 @@ -3098,8 +3130,8 @@ Move_SLASH:: @ 81CAF7B end Move_STRUGGLE:: @ 81CAFB5 - loadspritegfx 10135 - loadspritegfx 10215 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MOVEMENT_WAVES monbg 1 setalpha 12, 8 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 3, 0, 12, 4 @@ -3116,7 +3148,7 @@ Move_STRUGGLE:: @ 81CAFB5 end Move_SKETCH:: @ 81CB01B - loadspritegfx 10002 + loadspritegfx ANIM_TAG_PENCIL monbg 1 createvisualtask sub_80A8874, 2, createsprite gPencilSpriteTemplate, ANIM_TARGET, 2, @@ -3141,7 +3173,7 @@ Move_NIGHTMARE:: @ 81CB043 end gUnknown_81CB06F:: @ 81CB06F - createvisualtask AnimTask_BlendMonInAndOut, 2, 0, 32767, 10, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 2, 0, RGB_WHITE, 10, 2, 1 createvisualtask AnimTask_ShakeMon, 2, 0, 3, 0, 32, 1 playsewithpan SE_W171, 63 waitforvisualfinish @@ -3150,7 +3182,7 @@ gUnknown_81CB06F:: @ 81CB06F end Move_FLAIL:: @ 81CB099 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 createvisualtask AnimTask_FlailMovement, 2, 0 @@ -3169,7 +3201,7 @@ Move_SPITE:: @ 81CB0D6 playsewithpan SE_W060, 192 waitbgfadein monbg 3 - createvisualtask sub_80B9BDC, 2, 2, 2, 6, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 6, 0, 8, RGB_WHITE createvisualtask sub_80B5AAC, 2, loopsewithpan SE_W060, 63, 20, 3 waitforvisualfinish @@ -3179,8 +3211,8 @@ Move_SPITE:: @ 81CB0D6 end Move_MACH_PUNCH:: @ 81CB105 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 2 createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CB186 @@ -3213,7 +3245,7 @@ gUnknown_81CB186:: @ 81CB186 goto gUnknown_81CB11E Move_FORESIGHT:: @ 81CB18D - loadspritegfx 10258 + loadspritegfx ANIM_TAG_MAGNIFYING_GLASS monbg 3 monbgprio_28 1 setalpha 16, 0 @@ -3224,7 +3256,7 @@ Move_FORESIGHT:: @ 81CB18D delay 24 playsewithpan SE_W166, 63 delay 10 - createvisualtask AnimTask_BlendMonInAndOut, 5, 1, 32767, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 2, 1 playsewithpan SE_W197, 63 waitforvisualfinish blendoff @@ -3232,7 +3264,7 @@ Move_FORESIGHT:: @ 81CB18D end Move_DESTINY_BOND:: @ 81CB1CC - loadspritegfx 10188 + loadspritegfx ANIM_TAG_WHITE_SHADOW fadetobg 2 playsewithpan SE_W060, 192 waitbgfadein @@ -3240,9 +3272,9 @@ Move_DESTINY_BOND:: @ 81CB1CC playsewithpan SE_W109, 192 delay 48 createvisualtask AnimTask_ShakeMonInPlace, 2, 0, 2, 0, 24, 1 - createvisualtask sub_80BA83C, 2, 6, 1, 0, 12, 30653 + createvisualtask AnimTask_BlendExcept, 2, 6, 1, 0, 12, 30653 delay 24 - createvisualtask sub_80BA83C, 2, 6, 1, 12, 0, 30653 + createvisualtask AnimTask_BlendExcept, 2, 6, 1, 12, 0, 30653 playsewithpan SE_W171, 63 waitforvisualfinish restorebg @@ -3252,11 +3284,11 @@ Move_DESTINY_BOND:: @ 81CB1CC end Move_ENDURE:: @ 81CB227 - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -3277,7 +3309,7 @@ gUnknown_81CB267:: @ 81CB267 return Move_CHARM:: @ 81CB2BB - loadspritegfx 10210 + loadspritegfx ANIM_TAG_MAGENTA_HEART createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 @@ -3291,9 +3323,9 @@ Move_CHARM:: @ 81CB2BB end Move_ROLLOUT:: @ 81CB2FE - loadspritegfx 10135 - loadspritegfx 10074 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_MUD_SAND + loadspritegfx ANIM_TAG_ROCKS monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -3308,8 +3340,8 @@ Move_ROLLOUT:: @ 81CB2FE end Move_FALSE_SWIPE:: @ 81CB33F - loadspritegfx 10286 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLASH_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gFalseSwipeSliceSpriteTemplate, ANIM_TARGET, 2, playsewithpan SE_W233, 63 delay 16 @@ -3335,8 +3367,8 @@ Move_FALSE_SWIPE:: @ 81CB33F end Move_SWAGGER:: @ 81CB3C6 - loadspritegfx 10086 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_BREATH + loadspritegfx ANIM_TAG_ANGER createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish @@ -3353,9 +3385,9 @@ Move_SWAGGER:: @ 81CB3C6 end Move_MILK_DRINK:: @ 81CB40E - loadspritegfx 10099 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MILK_BOTTLE + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg 1 createsprite gMilkBottleSpriteTemplate, ANIM_ATTACKER, 2, delay 40 @@ -3393,14 +3425,14 @@ gUnknown_81CB48E:: @ 81CB48E createvisualtask sub_80B94B4, 5, 4, 0, 50 loopsewithpan SE_W070, 63, 8, 10 delay 10 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 delay 16 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, 32767, 14 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 1, 0, 14, RGB_WHITE, 14 goto gUnknown_81CB468 Move_RAPID_SPIN:: @ 81CB4E1 - loadspritegfx 10135 - loadspritegfx 10229 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_RAPID_SPIN monbg 0 createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2 createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0 @@ -3418,9 +3450,9 @@ Move_RAPID_SPIN:: @ 81CB4E1 end Move_MOONLIGHT:: @ 81CB54E - loadspritegfx 10194 - loadspritegfx 10195 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_MOON + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR setalpha 0, 16 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 16, 0 waitforvisualfinish @@ -3445,8 +3477,8 @@ Move_MOONLIGHT:: @ 81CB54E end Move_EXTREME_SPEED:: @ 81CB5DE - loadspritegfx 10207 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SPEED_DUST + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CB695 fadetobg 9 @@ -3495,8 +3527,8 @@ gUnknown_81CB695:: @ 81CB695 goto gUnknown_81CB5F5 Move_UPROAR:: @ 81CB69C - loadspritegfx 10225 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE + loadspritegfx ANIM_TAG_THIN_RING monbg 3 createvisualtask AnimTask_UproarDistortion, 2, 0 createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8 @@ -3520,7 +3552,7 @@ Move_UPROAR:: @ 81CB69C end Move_HEAT_WAVE:: @ 81CB766 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT createvisualtask AnimTask_BlendParticle, 5, 10261, 0, 6, 6, 31 createvisualtask AnimTask_LoadSandstormBackground, 5, 1 createvisualtask AnimTask_BlendBackground, 6, 6, 31 @@ -3544,19 +3576,19 @@ Move_HEAT_WAVE:: @ 81CB766 end Move_HAIL:: @ 81CB816 - loadspritegfx 10263 - loadspritegfx 10141 - createvisualtask sub_80BA7F8, 10, 1, 3, 0, 6, 0 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 0, 6, RGB_BLACK waitforvisualfinish createvisualtask AnimTask_Hail1, 5, loopsewithpan SE_W258, 0, 8, 10 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 3, 6, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 3, 6, 0, RGB_BLACK end Move_TORMENT:: @ 81CB84E - loadspritegfx 10087 - loadspritegfx 10209 + loadspritegfx ANIM_TAG_ANGER + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE createvisualtask AnimTask_TormentAttacker, 2, waitforvisualfinish createvisualtask AnimTask_BlendMonInAndOut, 2, 1, 31, 10, 1, 1 @@ -3592,15 +3624,15 @@ Move_MEMENTO:: @ 81CB892 end Move_FACADE:: @ 81CB8D6 - loadspritegfx 10243 + loadspritegfx ANIM_TAG_SWEAT_DROP createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 3 createvisualtask AnimTask_FacadeColorBlend, 2, 0, 72 loopsewithpan SE_W207, 192, 24, 3 end Move_SMELLING_SALT:: @ 81CB8F6 - loadspritegfx 10247 - loadspritegfx 10255 + loadspritegfx ANIM_TAG_TAG_HAND + loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 0, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, 1, 1, 2 delay 32 @@ -3614,7 +3646,7 @@ Move_SMELLING_SALT:: @ 81CB8F6 end Move_FOLLOW_ME:: @ 81CB951 - loadspritegfx 10064 + loadspritegfx ANIM_TAG_FINGER createsprite gFollowMeFingerSpriteTemplate, ANIM_ATTACKER, 2, 0 playsewithpan SE_W039, 192 delay 18 @@ -3624,9 +3656,9 @@ Move_FOLLOW_ME:: @ 81CB951 end Move_CHARGE:: @ 81CB970 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -3659,9 +3691,9 @@ Move_CHARGE:: @ 81CB970 end Move_TAUNT:: @ 81CBA0B - loadspritegfx 10214 - loadspritegfx 10209 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_FINGER_2 + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_ANGER createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 45 playsewithpan SE_W118, 192 delay 6 @@ -3679,7 +3711,7 @@ Move_TAUNT:: @ 81CBA0B end Move_HELPING_HAND:: @ 81CBA5F - loadspritegfx 10247 + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_HelpingHandAttackerMovement, 5, createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1 @@ -3696,7 +3728,7 @@ Move_HELPING_HAND:: @ 81CBA5F end Move_ASSIST:: @ 81CBAD2 - loadspritegfx 10252 + loadspritegfx ANIM_TAG_PAW_PRINT createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36 delay 2 createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36 @@ -3713,9 +3745,9 @@ Move_ASSIST:: @ 81CBAD2 end Move_SUPERPOWER:: @ 81CBB43 - loadspritegfx 10212 - loadspritegfx 10256 - loadspritegfx 10257 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_METEOR + loadspritegfx ANIM_TAG_FLAT_ROCK monbg 2 monbgprio_28 0 setalpha 12, 8 @@ -3747,14 +3779,14 @@ Move_SUPERPOWER:: @ 81CBB43 end Move_RECYCLE:: @ 81CBBFE - loadspritegfx 10278 + loadspritegfx ANIM_TAG_RECYCLE monbg 0 setalpha 0, 16 delay 1 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2, loopsewithpan SE_W036, 192, 24, 3 waitforvisualfinish - createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 32767, 12, 2, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 2, 1 playsewithpan SE_W036, 192 waitforvisualfinish blendoff @@ -3763,10 +3795,10 @@ Move_RECYCLE:: @ 81CBBFE end Move_BRICK_BREAK:: @ 81CBC32 - loadspritegfx 10167 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_TORN_METAL choosetwoturnanim gUnknown_81CBC47, gUnknown_81CBD16 gUnknown_81CBC47:: @ 81CBC47 @@ -3833,7 +3865,7 @@ gUnknown_81CBD16:: @ 81CBD16 end Move_YAWN:: @ 81CBE37 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD createvisualtask AnimTask_DeepInhale, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -3849,8 +3881,8 @@ Move_YAWN:: @ 81CBE37 end Move_ENDEAVOR:: @ 81CBE7A - loadspritegfx 10243 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SWEAT_DROP + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_SquishAndSweatDroplets, 2, 0, 2 loopsewithpan SE_W039, 192, 24, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 703, 12, 1, 2 @@ -3865,7 +3897,7 @@ Move_ENDEAVOR:: @ 81CBE7A end Move_ERUPTION:: @ 81CBEEF - loadspritegfx 10201 + loadspritegfx ANIM_TAG_WARM_ROCK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 2, 0, 4, 31 waitforvisualfinish createvisualtask sub_80ACEA4, 2, @@ -3890,21 +3922,21 @@ Move_ERUPTION:: @ 81CBEEF end Move_SKILL_SWAP:: @ 81CBFBC - loadspritegfx 10251 + loadspritegfx ANIM_TAG_BLUEGREEN_ORB call gUnknown_81D59BB createvisualtask sub_80B3834, 3, 1 - createvisualtask AnimTask_BlendMonInAndOut, 5, 1, 32767, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 1, RGB_WHITE, 12, 3, 1 loopsewithpan SE_W179, 192, 24, 3 delay 16 createvisualtask sub_80B3834, 3, 0 - createvisualtask AnimTask_BlendMonInAndOut, 5, 0, 32767, 12, 3, 1 + createvisualtask AnimTask_BlendMonInAndOut, 5, 0, RGB_WHITE, 12, 3, 1 waitforvisualfinish call gUnknown_81D59C7 end Move_IMPRISON:: @ 81CC007 - loadspritegfx 10249 - loadspritegfx 10250 + loadspritegfx ANIM_TAG_HOLLOW_ORB + loadspritegfx ANIM_TAG_X_SIGN call gUnknown_81D59BB monbg 3 createvisualtask sub_80B3584, 5, @@ -3920,7 +3952,7 @@ Move_IMPRISON:: @ 81CC007 end Move_GRUDGE:: @ 81CC04A - loadspritegfx 10253 + loadspritegfx ANIM_TAG_PURPLE_FLAME monbg 0 monbgprio_29 fadetobg 2 @@ -3956,7 +3988,7 @@ Move_CAMOUFLAGE:: @ 81CC072 end Move_TAIL_GLOW:: @ 81CC0B8 - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -3972,8 +4004,8 @@ Move_TAIL_GLOW:: @ 81CC0B8 end Move_LUSTER_PURGE:: @ 81CC0FB - loadspritegfx 10267 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_IMPACT fadetobg 3 waitbgfadeout createvisualtask AnimTask_FadeScreenToWhite, 5, @@ -3983,7 +4015,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB playsewithpan SE_W076, 192 createsprite gUnknown_83E7148, ANIM_ATTACKER, 41, 0, 0, 0, 0 delay 20 - createvisualtask sub_80BA83C, 5, 5, 2, 0, 16, -1 + createvisualtask AnimTask_BlendExcept, 5, 5, 2, 0, 16, -1 createvisualtask AnimTask_BlendParticle, 5, 10267, 2, 0, 16, -1 waitforvisualfinish createvisualtask AnimTask_BlendParticle, 5, 10135, 0, 12, 12, 23552 @@ -4006,7 +4038,7 @@ Move_LUSTER_PURGE:: @ 81CC0FB createsprite gUnknown_83E7C50, ANIM_TARGET, 3, 1, 2 createvisualtask sub_80DD3DC, 5, 208, 63 waitforvisualfinish - createvisualtask sub_80BA83C, 5, 5, 2, 16, 0, -1 + createvisualtask AnimTask_BlendExcept, 5, 5, 2, 16, 0, -1 createvisualtask sub_80B94B4, 5, 1, 5, 14 waitforvisualfinish clearmonbg 0 @@ -4015,27 +4047,27 @@ Move_LUSTER_PURGE:: @ 81CC0FB end Move_MIST_BALL:: @ 81CC212 - loadspritegfx 10155 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WHITE_FEATHER delay 0 playsewithpan SE_W081, 192 createsprite gUnknown_83E64E8, ANIM_TARGET, 0, 0, 0, 0, 0, 30, 0 waitforvisualfinish playsewithpan SE_W028, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 10, 0 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, 32767, 16 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 1, 1, 32279, 16, RGB_WHITE, 16 delay 0 playsewithpan SE_W114, 0 createvisualtask AnimTask_LoadMistTiles, 5, - createvisualtask sub_80BA7F8, 10, 4, 3, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 3, 0, 16, RGB_WHITE delay 8 createvisualtask AnimTask_ShakeMon, 2, 1, 4, 0, 70, 0 delay 70 - createvisualtask sub_80BA7F8, 10, 4, 2, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE end Move_FEATHER_DANCE:: @ 81CC2A1 - loadspritegfx 10270 + loadspritegfx ANIM_TAG_WHITE_FEATHER monbg 3 monbgprio_29 playsewithpan SE_W080, 63 @@ -4057,8 +4089,8 @@ Move_FEATHER_DANCE:: @ 81CC2A1 end Move_TEETER_DANCE:: @ 81CC371 - loadspritegfx 10072 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_TeeterDanceMovement, 5, createsprite gFastFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0, 16, -2 playsewithpan SE_W298, 192 @@ -4077,7 +4109,7 @@ Move_TEETER_DANCE:: @ 81CC371 end Move_MUD_SPORT:: @ 81CC3DC - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createvisualtask AnimTask_Splash, 2, 0, 6 delay 24 createsprite gUnknown_83E7A94, ANIM_TARGET, 2, 0, -4, -16 @@ -4124,9 +4156,9 @@ Move_MUD_SPORT:: @ 81CC3DC end Move_NEEDLE_ARM:: @ 81CC513 - loadspritegfx 10266 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_GREEN_SPIKE + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET loopsewithpan SE_W030, 63, 2, 16 createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 0, -32, 16 delay 2 @@ -4167,7 +4199,7 @@ Move_NEEDLE_ARM:: @ 81CC513 end Move_SLACK_OFF:: @ 81CC6C3 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_SlackOffSquish, 2, 0 playsewithpan SE_W281, 192 waitforvisualfinish @@ -4176,9 +4208,9 @@ Move_SLACK_OFF:: @ 81CC6C3 end Move_CRUSH_CLAW:: @ 81CC6DB - loadspritegfx 10167 - loadspritegfx 10039 - loadspritegfx 10208 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL + loadspritegfx ANIM_TAG_CLAW_SLASH + loadspritegfx ANIM_TAG_TORN_METAL monbg 1 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 @@ -4199,9 +4231,9 @@ Move_CRUSH_CLAW:: @ 81CC6DB Move_AROMATHERAPY:: @ 81CC74B playsewithpan SE_W080, 0 - loadspritegfx 10159 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 0, 0, 7, 13293 delay 1 monbg 0 @@ -4237,9 +4269,9 @@ Move_AROMATHERAPY:: @ 81CC74B end Move_FAKE_TEARS:: @ 81CC8AD - loadspritegfx 10155 - loadspritegfx 10209 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_THOUGHT_BUBBLE + loadspritegfx ANIM_TAG_MUSIC_NOTES createvisualtask AnimTask_BlendParticle, 5, 10155, 0, 4, 4, 32108 waitforvisualfinish createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 1 @@ -4260,9 +4292,9 @@ Move_FAKE_TEARS:: @ 81CC8AD end Move_AIR_CUTTER:: @ 81CC93D - loadspritegfx 10003 - loadspritegfx 10138 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE + loadspritegfx ANIM_TAG_CUT + loadspritegfx ANIM_TAG_IMPACT delay 0 monbg 3 setalpha 12, 8 @@ -4297,7 +4329,7 @@ Move_ODOR_SLEUTH:: @ 81CC99F end Move_GRASS_WHISTLE:: @ 81CC9E9 - loadspritegfx 10072 + loadspritegfx ANIM_TAG_MUSIC_NOTES createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 13298 waitforvisualfinish createvisualtask AnimTask_MusicNotesRainbowBlend, 2, @@ -4334,7 +4366,7 @@ Move_GRASS_WHISTLE:: @ 81CC9E9 end Move_TICKLE:: @ 81CCADC - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 0, 16, 0 waitforvisualfinish createsprite gEyeSparkleSpriteTemplate, ANIM_ATTACKER, 0, -16, -8 @@ -4352,8 +4384,8 @@ Move_TICKLE:: @ 81CCADC end Move_WATER_SPOUT:: @ 81CCB48 - loadspritegfx 10268 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 createvisualtask sub_80ABB28, 5, @@ -4369,8 +4401,8 @@ Move_WATER_SPOUT:: @ 81CCB48 end Move_SHADOW_PUNCH:: @ 81CCB76 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET fadetobg 2 waitbgfadein monbg 2 @@ -4411,11 +4443,11 @@ Move_EXTRASENSORY:: @ 81CCBD1 end Move_AERIAL_ACE:: @ 81CCC39 - loadspritegfx 10138 + loadspritegfx ANIM_TAG_CUT monbg 1 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 24, 6, 1, 5 - createvisualtask sub_80BAB98, 2, 0, 4, 7, 3 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 7, 3 createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0 playsewithpan SE_W013B, 192 delay 5 @@ -4435,13 +4467,13 @@ Move_IRON_DEFENSE:: @ 81CCCA3 end Move_BLOCK:: @ 81CCCCD - loadspritegfx 10250 + loadspritegfx ANIM_TAG_X_SIGN createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66, playsewithpan SE_W207, 63 end Move_HOWL:: @ 81CCCDC - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask AnimTask_DeepInhale, 2, 0 delay 12 call gUnknown_81CDB06 @@ -4451,7 +4483,7 @@ Move_HOWL:: @ 81CCCDC end Move_BULK_UP:: @ 81CCCFE - loadspritegfx 10086 + loadspritegfx ANIM_TAG_BREATH createvisualtask AnimTask_GrowAndShrink, 2, playsewithpan SE_W207, 192 waitforvisualfinish @@ -4461,8 +4493,8 @@ Move_BULK_UP:: @ 81CCCFE end Move_COVET:: @ 81CCD1C - loadspritegfx 10210 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_MAGENTA_HEART + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_RockMonBackAndForth, 5, 0, 2, 0 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 playsewithpan SE_W204, 192 @@ -4478,12 +4510,12 @@ Move_COVET:: @ 81CCD1C end Move_VOLT_TACKLE:: @ 81CCD79 - loadspritegfx 10001 - loadspritegfx 10212 - loadspritegfx 10213 + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_ELECTRICITY monbg 0 setalpha 12, 8 - createvisualtask sub_80BA7F8, 10, 1, 0, 0, 8, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 0, 8, RGB_BLACK waitforvisualfinish createsprite gUnknown_83E621C, ANIM_ATTACKER, 1, playsewithpan SE_W268, 192 @@ -4520,12 +4552,12 @@ Move_VOLT_TACKLE:: @ 81CCD79 delay 2 createsprite gUnknown_83E6204, ANIM_ATTACKER, 2, 0, -16, -16 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1, 0, 8, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 8, 0, RGB_BLACK waitforvisualfinish end Move_WATER_SPORT:: @ 81CCE71 - loadspritegfx 10268 + loadspritegfx ANIM_TAG_GLOWY_BLUE_ORB createvisualtask sub_80AC328, 5, delay 8 playsewithpan SE_W057, 192 @@ -4538,9 +4570,9 @@ Move_WATER_SPORT:: @ 81CCE71 end Move_CALM_MIND:: @ 81CCE97 - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING monbg 2 - createvisualtask sub_80BA83C, 5, 0, 0, 0, 16, 0 + createvisualtask AnimTask_BlendExcept, 5, 0, 0, 0, 16, 0 waitforvisualfinish createvisualtask sub_80BB9B0, 5, 1 waitforvisualfinish @@ -4556,14 +4588,14 @@ Move_CALM_MIND:: @ 81CCE97 createvisualtask sub_80BB9B0, 5, 0 visible 0 waitforvisualfinish - createvisualtask sub_80BA83C, 5, 0, 0, 16, 0, 0 + createvisualtask AnimTask_BlendExcept, 5, 0, 0, 16, 0, 0 waitforvisualfinish clearmonbg 2 end Move_LEAF_BLADE:: @ 81CCF17 - loadspritegfx 10063 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_CROSS_IMPACT createvisualtask AnimTask_LeafBlade, 5, delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 8, 1 @@ -4587,7 +4619,7 @@ Move_LEAF_BLADE:: @ 81CCF17 end Move_DRAGON_DANCE:: @ 81CCF9A - loadspritegfx 10249 + loadspritegfx ANIM_TAG_HOLLOW_ORB monbg 0 monbgprio_28 0 delay 1 @@ -4611,10 +4643,10 @@ Move_DRAGON_DANCE:: @ 81CCF9A end Move_SHOCK_WAVE:: @ 81CD009 - loadspritegfx 10211 - loadspritegfx 10212 - loadspritegfx 10001 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_ELECTRIC_ORBS + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT + loadspritegfx ANIM_TAG_SPARK + loadspritegfx ANIM_TAG_LIGHTNING monbg 0 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 4, 0 @@ -4631,10 +4663,10 @@ Move_SHOCK_WAVE:: @ 81CD009 playsewithpan SE_W161B, 63 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 2, 1, 0, 6, 18, 1 - createvisualtask sub_80BA7F8, 5, 1, 3, 16, 0, 32767 - createvisualtask sub_80BA7F8, 5, 4, 0, 16, 16, 0 + createvisualtask AnimTask_BlendSelected, 5, 1, 3, 16, 0, RGB_WHITE + createvisualtask AnimTask_BlendSelected, 5, 4, 0, 16, 16, RGB_BLACK delay 4 - createvisualtask sub_80BA7F8, 5, 4, 0, 0, 0, 0 + createvisualtask AnimTask_BlendSelected, 5, 4, 0, 0, 0, RGB_BLACK waitforvisualfinish clearmonbg 0 blendoff @@ -4647,8 +4679,8 @@ Move_HARDEN:: @ 81CD0AB end Move_BELLY_DRUM:: @ 81CD0C0 - loadspritegfx 10072 - loadspritegfx 10193 + loadspritegfx ANIM_TAG_MUSIC_NOTES + loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE createvisualtask AnimTask_MusicNotesRainbowBlend, 2, waitforvisualfinish call gUnknown_81CD18D @@ -4690,16 +4722,16 @@ gUnknown_81CD18D:: @ 81CD18D return Move_MIND_READER:: @ 81CD1A8 - loadspritegfx 10189 - loadspritegfx 10190 - loadspritegfx 10191 + loadspritegfx ANIM_TAG_TEAL_ALERT + loadspritegfx ANIM_TAG_OPENING_EYE + loadspritegfx ANIM_TAG_ROUND_WHITE_HALO monbg 4 playsewithpan SE_W109, 63 createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0, 0, 1, 0 createsprite gWhiteHaloSpriteTemplate, ANIM_ATTACKER, 5, delay 40 playsewithpan SE_W043, 63 - createvisualtask sub_80B9BDC, 2, 1, 1, 2, 0, 10, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 1, 1, 2, 0, 10, 0 call gUnknown_81CD1EF waitforvisualfinish clearmonbg 4 @@ -4732,11 +4764,11 @@ gUnknown_81CD1EF:: @ 81CD1EF Move_ICE_PUNCH:: @ 81CD2E0 monbg 3 setalpha 12, 8 - loadspritegfx 10141 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 9, 32588 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(12, 26, 31) delay 20 playsewithpan SE_W081, 63 createsprite gUnknown_83E6360, ANIM_ATTACKER, 2, 0 @@ -4758,7 +4790,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 delay 15 call gUnknown_81D540A delay 5 - createvisualtask sub_80BA7F8, 10, 4, 2, 9, 0, 32588 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 9, 0, RGB(12, 26, 31) waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7, 0, 0 waitforvisualfinish @@ -4768,7 +4800,7 @@ Move_ICE_PUNCH:: @ 81CD2E0 Move_REST:: @ 81CD3CB playsewithpan SE_W173, 192 - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 20 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 @@ -4782,7 +4814,7 @@ Move_CONFUSION:: @ 81CD40B call gUnknown_81D59BB setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE waitforvisualfinish playsewithpan SE_W048, 63 createvisualtask AnimTask_ShakeMon, 2, 1, 3, 0, 15, 1 @@ -4799,7 +4831,7 @@ Move_PSYCHIC:: @ 81CD46C call gUnknown_81D59BB setalpha 8, 8 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, 767 waitforvisualfinish loopsewithpan SE_W048, 63, 10, 3 createvisualtask AnimTask_ShakeMon, 2, 1, 5, 0, 15, 1 @@ -4826,7 +4858,7 @@ gUnknown_81CD4DD:: @ 81CD4DD call gUnknown_81D59BB setalpha 8, 8 playsewithpan SE_W048, 192 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 8, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 8, RGB_WHITE createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, 0, 1 waitforvisualfinish clearmonbg 2 @@ -4848,7 +4880,7 @@ gUnknown_81CD4DD:: @ 81CD4DD goto gUnknown_81CD4D4 Move_THUNDER:: @ 81CD570 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_LIGHTNING fadetobg 11 waitbgfadeout createvisualtask sub_80BB82C, 5, -256, 0, 1, -1 @@ -4906,9 +4938,9 @@ Move_THUNDER:: @ 81CD570 end Move_THUNDER_PUNCH:: @ 81CD6CA - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10037 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_LIGHTNING monbg 1 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 @@ -4939,8 +4971,8 @@ Move_THUNDER_PUNCH:: @ 81CD6CA end Move_SACRED_FIRE:: @ 81CD793 - loadspritegfx 10033 - loadspritegfx 10035 + loadspritegfx ANIM_TAG_FIRE + loadspritegfx ANIM_TAG_FIRE_PLUME loopsewithpan SE_W221, 192, 7, 5 createsprite gUnknown_83E5CA0, ANIM_ATTACKER, 2, -32, 0, 50, 5, -2, 0 delay 1 @@ -4996,7 +5028,7 @@ Move_SACRED_FIRE:: @ 81CD793 end Move_SCRATCH:: @ 81CD97A - loadspritegfx 10137 + loadspritegfx ANIM_TAG_SCRATCH monbg 1 setalpha 12, 8 playsewithpan SE_W010, 63 @@ -5009,7 +5041,7 @@ Move_SCRATCH:: @ 81CD97A end Move_DRAGON_BREATH:: @ 81CD9AC - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_28 1 loopsewithpan SE_W172, 192, 7, 7 @@ -5017,7 +5049,7 @@ Move_DRAGON_BREATH:: @ 81CD9AC delay 2 createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 - createvisualtask sub_80BA7F8, 10, 4, 1, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 0, 9, RGB(31, 0, 0) createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 delay 2 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 21, 1 @@ -5037,13 +5069,13 @@ Move_DRAGON_BREATH:: @ 81CD9AC delay 2 createsprite gUnknown_83E77A4, ANIM_TARGET, 2, 0, 0, 0, 0, 20 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 1, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 9, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 end Move_ROAR:: @ 81CDAC0 - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE monbg 0 monbgprio_28 0 setalpha 8, 8 @@ -5071,7 +5103,7 @@ gUnknown_81CDB06:: @ 81CDB06 return Move_GROWL:: @ 81CDB57 - loadspritegfx 10053 + loadspritegfx ANIM_TAG_NOISE_LINE createvisualtask sub_80DD148, 2, 0, 255 call gUnknown_81CDB06 delay 10 @@ -5083,7 +5115,7 @@ Move_GROWL:: @ 81CDB57 end Move_SNORE:: @ 81CDB98 - loadspritegfx 10197 + loadspritegfx ANIM_TAG_SNORE_Z monbg 2 setalpha 8, 8 call gUnknown_81CDBB1 @@ -5105,8 +5137,8 @@ gUnknown_81CDBB1:: @ 81CDBB1 return Move_LIGHT_SCREEN:: @ 81CDC28 - loadspritegfx 10070 - loadspritegfx 10166 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_GREEN_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gUnknown_83E6E10, ANIM_ATTACKER, 1, 40, 0, 10166 @@ -5132,8 +5164,8 @@ gUnknown_81CDC4F:: @ 81CDC4F return Move_MIRROR_COAT:: @ 81CDCB4 - loadspritegfx 10070 - loadspritegfx 10168 + loadspritegfx ANIM_TAG_SPARKLE_3 + loadspritegfx ANIM_TAG_RED_LIGHT_WALL setalpha 0, 16 createsprite gUnknown_83E6E40, ANIM_ATTACKER, 1, 40, 0, 10168 delay 10 @@ -5145,8 +5177,8 @@ Move_MIRROR_COAT:: @ 81CDCB4 end Move_REFLECT:: @ 81CDCDA - loadspritegfx 10071 - loadspritegfx 10167 + loadspritegfx ANIM_TAG_SPARKLE_4 + loadspritegfx ANIM_TAG_BLUE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W115, 192, 15 createsprite gUnknown_83E6E28, ANIM_ATTACKER, 1, 40, 0, 10167 @@ -5162,7 +5194,7 @@ Move_REFLECT:: @ 81CDCDA end Move_BARRIER:: @ 81CDD2D - loadspritegfx 10169 + loadspritegfx ANIM_TAG_GRAY_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gUnknown_83E6E58, ANIM_ATTACKER, 3, 40, 0, 10169 @@ -5172,8 +5204,8 @@ Move_BARRIER:: @ 81CDD2D end Move_BUBBLE:: @ 81CDD4A - loadspritegfx 10146 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_BUBBLE + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 1 setalpha 12, 8 delay 1 @@ -5208,7 +5240,7 @@ Move_BUBBLE:: @ 81CDD4A end Move_SMOG:: @ 81CDE20 - loadspritegfx 10172 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD monbg 3 monbgprio_29 setalpha 12, 8 @@ -5222,7 +5254,7 @@ Move_SMOG:: @ 81CDE20 call gUnknown_81CDE85 delay 120 loopsewithpan SE_W092, 63, 18, 2 - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 26650 delay 10 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 15, 1 waitforvisualfinish @@ -5236,7 +5268,7 @@ gUnknown_81CDE85:: @ 81CDE85 return Move_FAINT_ATTACK:: @ 81CDE9B - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 0 fadetobg 1 waitbgfadein @@ -5272,7 +5304,7 @@ Move_FAINT_ATTACK:: @ 81CDE9B end Move_SAND_ATTACK:: @ 81CDF22 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND monbg 2 monbgprio_28 0 setalpha 12, 8 @@ -5301,7 +5333,7 @@ gUnknown_81CDF72:: @ 81CDF72 return Move_MUD_SLAP:: @ 81CDFCA - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND playsewithpan SE_W028, 192 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -10, 0, 0, 3 waitforvisualfinish @@ -5325,8 +5357,8 @@ gUnknown_81CE010:: @ 81CE010 return Move_DRAGON_RAGE:: @ 81CE068 - loadspritegfx 10029 - loadspritegfx 10035 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_FIRE_PLUME playsewithpan SE_W082, 192 createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 40, 1 waitforvisualfinish @@ -5357,22 +5389,22 @@ Move_DRAGON_RAGE:: @ 81CE068 end Move_RAIN_DANCE:: @ 81CE145 - loadspritegfx 10115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 - createvisualtask sub_80BA7F8, 10, 1921, 2, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_80AABC0, 2, 0, 3, 120 createvisualtask sub_80AABC0, 2, 0, 3, 120 delay 120 delay 30 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 2, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end Move_BITE:: @ 81CE190 - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W044, 63 @@ -5388,8 +5420,8 @@ Move_BITE:: @ 81CE190 end Move_CRUNCH:: @ 81CE1EE - loadspritegfx 10139 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SHARP_TEETH + loadspritegfx ANIM_TAG_IMPACT monbg 1 fadetobg 1 waitbgfadein @@ -5416,8 +5448,8 @@ Move_CRUNCH:: @ 81CE1EE end Move_CLAMP:: @ 81CE29E - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -5436,7 +5468,7 @@ Move_ICE_BEAM:: @ 81CE2FB monbg 1 monbgprio_28 1 setalpha 12, 8 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 7, 0 waitforvisualfinish createsoundtask mas_80DCF38, 176, -64, 63, 4, 4, 0, 10 @@ -5484,7 +5516,7 @@ Move_WITHDRAW:: @ 81CE432 end Move_AURORA_BEAM:: @ 81CE43F - loadspritegfx 10140 + loadspritegfx ANIM_TAG_RAINBOW_RINGS fadetobg 20 waitbgfadein playsewithpan SE_W062, 192 @@ -5521,23 +5553,23 @@ gUnknown_81CE4C6:: @ 81CE4C6 return Move_SOLAR_BEAM:: @ 81CE513 - loadspritegfx 10147 - choosetwoturnanim gUnknown_81CE521, gUnknown_81CE61E + loadspritegfx ANIM_TAG_ORBS + choosetwoturnanim BattleAnimScript_SolarBeam_Turn1, BattleAnimScript_SolarBeam_Turn2 -gUnknown_81CE51F:: @ 81CE51F +BattleAnimScript_SolarBeam_End:: @ 81CE51F waitforvisualfinish end -gUnknown_81CE521:: @ 81CE521 +BattleAnimScript_SolarBeam_Turn1:: @ 81CE521 monbg 2 setalpha 12, 8 - createvisualtask sub_80B9BDC, 2, 2, 1, 4, 0, 11, 12287 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 1, 4, 0, 11, 12287 playsewithpan SE_W025, 192 call gUnknown_81CE54B waitforvisualfinish clearmonbg 2 blendoff - goto gUnknown_81CE51F + goto BattleAnimScript_SolarBeam_End gUnknown_81CE54B:: @ 81CE54B createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 40, 40, 16 @@ -5570,7 +5602,7 @@ gUnknown_81CE54B:: @ 81CE54B delay 2 return -gUnknown_81CE61E:: @ 81CE61E +BattleAnimScript_SolarBeam_Turn2:: @ 81CE61E call gUnknown_81D5A07 panse_1B SE_W076, 192, 63, 2, 0 createvisualtask AnimTask_CreateSmallSolarbeamOrbs, 5, @@ -5578,7 +5610,7 @@ gUnknown_81CE61E:: @ 81CE61E delay 4 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1 delay 4 - createvisualtask sub_80BA7F8, 10, 4, 1, 0, 10, 1017 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 0, 10, RGB(25, 31, 0) createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2 delay 4 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 65, 1 @@ -5593,9 +5625,9 @@ gUnknown_81CE61E:: @ 81CE61E call gUnknown_81CE6F0 call gUnknown_81CE6F0 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 1, 10, 0, 1017 + createvisualtask AnimTask_BlendSelected, 10, 4, 1, 10, 0, RGB(25, 31, 0) call gUnknown_81D5A41 - goto gUnknown_81CE51F + goto BattleAnimScript_SolarBeam_End gUnknown_81CE6F0:: @ 81CE6F0 createsprite gSolarbeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 0 @@ -5615,7 +5647,7 @@ gUnknown_81CE6F0:: @ 81CE6F0 return Move_BLIZZARD:: @ 81CE768 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 createvisualtask AnimTask_GetAttackerSide, 2, jumpargeq 7, 1, gUnknown_81CE8ED @@ -5670,7 +5702,7 @@ gUnknown_81CE8ED:: @ 81CE8ED goto gUnknown_81CE77E Move_POWDER_SNOW:: @ 81CE8F4 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS monbg 3 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 1, 0, 3, 0 waitforvisualfinish @@ -5705,8 +5737,8 @@ gUnknown_81CE93E:: @ 81CE93E return Move_HYDRO_PUMP:: @ 81CE9EE - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -5754,9 +5786,9 @@ gUnknown_81CEACE:: @ 81CEACE return Move_SIGNAL_BEAM:: @ 81CEAED - loadspritegfx 10264 - loadspritegfx 10265 - loadspritegfx 10073 + loadspritegfx ANIM_TAG_GLOWY_RED_ORB + loadspritegfx ANIM_TAG_GLOWY_GREEN_ORB + loadspritegfx ANIM_TAG_DUCK createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 25, 1 delay 6 panse_1B SE_W062, 192, 63, 1, 0 @@ -5796,9 +5828,9 @@ gUnknown_81CEBB4:: @ 81CEBB4 return Move_ABSORB:: @ 81CEBD5 - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5849,9 +5881,9 @@ gUnknown_81CEC44:: @ 81CEC44 return Move_MEGA_DRAIN:: @ 81CECED - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5910,9 +5942,9 @@ gUnknown_81CED5C:: @ 81CED5C return Move_GIGA_DRAIN:: @ 81CEE7D - loadspritegfx 10147 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -5979,11 +6011,11 @@ gUnknown_81CEEEC:: @ 81CEEEC return Move_LEECH_LIFE:: @ 81CF085 - loadspritegfx 10161 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_NEEDLE + loadspritegfx ANIM_TAG_ORBS delay 1 - loadspritegfx 10031 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_2A 1 setalpha 12, 8 @@ -6009,9 +6041,9 @@ Move_LEECH_LIFE:: @ 81CF085 end Move_SYNTHESIS:: @ 81CF107 - loadspritegfx 10031 - loadspritegfx 10049 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 16, 19451 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 16, 19451 playsewithpan SE_W025, 192 call gUnknown_81D569E waitforvisualfinish @@ -6020,8 +6052,8 @@ Move_SYNTHESIS:: @ 81CF107 end Move_TOXIC:: @ 81CF131 - loadspritegfx 10151 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_TOXIC_BUBBLE + loadspritegfx ANIM_TAG_POISON_BUBBLE call gUnknown_81CF14B call gUnknown_81CF14B waitforvisualfinish @@ -6046,18 +6078,18 @@ gUnknown_81CF14B:: @ 81CF14B return Move_SLUDGE:: @ 81CF1A0 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W145C, 192 createsprite gUnknown_83E6A20, ANIM_TARGET, 2, 20, 0, 40, 0 waitforvisualfinish createvisualtask AnimTask_ShakeMon, 5, 1, 3, 0, 5, 1 - createvisualtask sub_80B9BDC, 2, 4, 1, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 2, 0, 12, 31774 call gUnknown_81D575B waitforvisualfinish end Move_SLUDGE_BOMB:: @ 81CF1E2 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE call gUnknown_81CF2F2 call gUnknown_81CF2F2 call gUnknown_81CF2F2 @@ -6069,7 +6101,7 @@ Move_SLUDGE_BOMB:: @ 81CF1E2 call gUnknown_81CF2F2 call gUnknown_81CF2F2 createvisualtask AnimTask_ShakeMon2, 5, 1, 3, 0, 15, 1 - createvisualtask sub_80B9BDC, 2, 4, 1, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 2, 0, 12, 31774 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, 42, 27, 20 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, -27, 44, 20 createsprite gUnknown_83E6A50, ANIM_TARGET, 2, 39, -28, 20 @@ -6101,7 +6133,7 @@ gUnknown_81CF2F2:: @ 81CF2F2 return Move_ACID:: @ 81CF308 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_POISON_BUBBLE monbg 3 createsprite gUnknown_83E6A38, ANIM_TARGET, 2, 20, 0, 40, 1, 0, 0 playsewithpan SE_W145C, 192 @@ -6114,7 +6146,7 @@ Move_ACID:: @ 81CF308 delay 15 createvisualtask AnimTask_ShakeMon2, 5, 1, 2, 0, 10, 1 createvisualtask AnimTask_ShakeMon2, 5, 3, 2, 0, 10, 1 - createvisualtask sub_80B9BDC, 2, 20, 2, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 20, 2, 2, 0, 12, 31774 createsprite gUnknown_83E6A84, ANIM_TARGET, 2, 0, -22, 0, 15, 55 playsewithpan SE_W145, 63 delay 10 @@ -6134,8 +6166,8 @@ Move_ACID:: @ 81CF308 end Move_BONEMERANG:: @ 81CF402 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6154,8 +6186,8 @@ Move_BONEMERANG:: @ 81CF402 end Move_BONE_CLUB:: @ 81CF456 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6172,8 +6204,8 @@ Move_BONE_CLUB:: @ 81CF456 end Move_BONE_RUSH:: @ 81CF4B8 - loadspritegfx 10000 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_BONE + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W155, 63 @@ -6188,7 +6220,7 @@ Move_BONE_RUSH:: @ 81CF4B8 end Move_SPIKES:: @ 81CF503 - loadspritegfx 10152 + loadspritegfx ANIM_TAG_SPIKES monbg 3 playsewithpan SE_W026, 192 waitplaysewithpan SE_W030, 63, 28 @@ -6205,8 +6237,8 @@ Move_SPIKES:: @ 81CF503 end Move_MEGAHORN:: @ 81CF55A - loadspritegfx 10153 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HORN_HIT_2 + loadspritegfx ANIM_TAG_IMPACT monbg 3 playsewithpan SE_W082, 192 jumpifcontest gUnknown_81CF631 @@ -6229,7 +6261,7 @@ gUnknown_81CF57D:: @ 81CF57D createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, 4, 1, 4 waitforvisualfinish createvisualtask AnimTask_ShakeMonInPlace, 2, 1, -4, 1, 12, 1 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 7, 5, 1, RGB_WHITE, 10, 0, 0 delay 10 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 11 delay 3 @@ -6251,8 +6283,8 @@ gUnknown_81CF631:: @ 81CF631 goto gUnknown_81CF57D Move_GUST:: @ 81CF648 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6269,8 +6301,8 @@ Move_GUST:: @ 81CF648 end Move_WING_ATTACK:: @ 81CF699 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6293,7 +6325,7 @@ Move_WING_ATTACK:: @ 81CF699 end Move_PECK:: @ 81CF736 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W030, 63 createvisualtask sub_8099A78, 2, 3, -768, 1, 2 createsprite gUnknown_83E7C98, ANIM_TARGET, 3, -12, 0, 1, 3 @@ -6301,8 +6333,8 @@ Move_PECK:: @ 81CF736 end Move_AEROBLAST:: @ 81CF75D - loadspritegfx 10154 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg 3 call gUnknown_81D59CF monbgprio_28 1 @@ -6343,8 +6375,8 @@ gUnknown_81CF7B9:: @ 81CF7B9 return Move_WATER_GUN:: @ 81CF87A - loadspritegfx 10155 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6367,8 +6399,8 @@ Move_WATER_GUN:: @ 81CF87A end Move_CRABHAMMER:: @ 81CF907 - loadspritegfx 10141 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_ICE_CRYSTALS + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E7C38, ANIM_ATTACKER, 4, 0, 0, 1, 0 @@ -6411,7 +6443,7 @@ Move_SURF:: @ 81CFA01 end Move_FLAMETHROWER:: @ 81CFA15 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6444,7 +6476,7 @@ gUnknown_81CFA8F:: @ 81CFA8F return Move_SANDSTORM:: @ 81CFAB2 - loadspritegfx 10261 + loadspritegfx ANIM_TAG_FLYING_DIRT playsewithpan SE_W201, 0 createvisualtask AnimTask_LoadSandstormBackground, 5, 0 delay 16 @@ -6464,7 +6496,7 @@ Move_SANDSTORM:: @ 81CFAB2 end Move_WHIRLPOOL:: @ 81CFB3A - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6497,20 +6529,20 @@ gUnknown_81CFB92:: @ 81CFB92 return Move_FLY:: @ 81CFC1D - loadspritegfx 10156 - loadspritegfx 10135 - choosetwoturnanim gUnknown_81CFC2E, gUnknown_81CFC46 + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT + choosetwoturnanim BattleAnimScript_Fly_Turn1, BattleAnimScript_Fly_Turn2 -gUnknown_81CFC2C:: @ 81CFC2C +BattleAnimScript_Fly_End:: @ 81CFC2C waitforvisualfinish end -gUnknown_81CFC2E:: @ 81CFC2E +BattleAnimScript_Fly_Turn1:: @ 81CFC2E playsewithpan SE_W019, 192 createsprite gUnknown_83E6BB8, ANIM_ATTACKER, 2, 0, 0, 13, 336 - goto gUnknown_81CFC2C + goto BattleAnimScript_Fly_End -gUnknown_81CFC46:: @ 81CFC46 +BattleAnimScript_Fly_Turn2:: @ 81CFC46 monbg 3 setalpha 12, 8 playsewithpan SE_W104, 192 @@ -6522,22 +6554,22 @@ gUnknown_81CFC46:: @ 81CFC46 waitforvisualfinish clearmonbg 3 blendoff - goto gUnknown_81CFC2C + goto BattleAnimScript_Fly_End Move_BOUNCE:: @ 81CFC87 - loadspritegfx 10156 - loadspritegfx 10135 - choosetwoturnanim gUnknown_81CFC97, gUnknown_81CFCAB + loadspritegfx ANIM_TAG_ROUND_SHADOW + loadspritegfx ANIM_TAG_IMPACT + choosetwoturnanim BattleAnimScript_Bounce_Turn1, BattleAnimScript_Bounce_Turn2 -gUnknown_81CFC96:: @ 81CFC96 +BattleAnimScript_Bounce_End:: @ 81CFC96 end -gUnknown_81CFC97:: @ 81CFC97 +BattleAnimScript_Bounce_Turn1:: @ 81CFC97 playsewithpan SE_W100, 192 createsprite gUnknown_83E6CD0, ANIM_ATTACKER, 2, 0, 0 - goto gUnknown_81CFC96 + goto BattleAnimScript_Bounce_End -gUnknown_81CFCAB:: @ 81CFCAB +BattleAnimScript_Bounce_Turn2:: @ 81CFCAB monbg 3 setalpha 12, 8 playsewithpan SE_W207, 63 @@ -6549,11 +6581,11 @@ gUnknown_81CFCAB:: @ 81CFCAB waitforvisualfinish clearmonbg 3 blendoff - goto gUnknown_81CFC96 + goto BattleAnimScript_Bounce_End Move_KARATE_CHOP:: @ 81CFCEA - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -6569,8 +6601,8 @@ Move_KARATE_CHOP:: @ 81CFCEA end Move_CROSS_CHOP:: @ 81CFD3C - loadspritegfx 10143 - loadspritegfx 10285 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_CROSS_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W025, 63 @@ -6578,7 +6610,7 @@ Move_CROSS_CHOP:: @ 81CFD3C createsprite gUnknown_83E6740, ANIM_ATTACKER, 2, 0, 0, 1 delay 40 playsewithpan SE_W013, 63 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 32767, 10, 0, 10 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10 createsprite gUnknown_83E7C80, ANIM_ATTACKER, 3, 0, 0, 1, 20 createvisualtask AnimTask_ShakeMon, 5, 1, 7, 0, 9, 1 waitforvisualfinish @@ -6587,8 +6619,8 @@ Move_CROSS_CHOP:: @ 81CFD3C end Move_JUMP_KICK:: @ 81CFDA5 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4 @@ -6605,8 +6637,8 @@ Move_JUMP_KICK:: @ 81CFDA5 end Move_HI_JUMP_KICK:: @ 81CFE02 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 0, 8 @@ -6631,8 +6663,8 @@ Move_HI_JUMP_KICK:: @ 81CFE02 end Move_DOUBLE_KICK:: @ 81CFE98 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E6728, ANIM_ATTACKER, 3, 1, 20, 1 @@ -6645,8 +6677,8 @@ Move_DOUBLE_KICK:: @ 81CFE98 end Move_TRIPLE_KICK:: @ 81CFECB - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W233B, 63 @@ -6679,10 +6711,10 @@ gUnknown_81CFF5C:: @ 81CFF5C goto gUnknown_81CFEEB Move_DYNAMIC_PUNCH:: @ 81CFF92 - loadspritegfx 10143 - loadspritegfx 10135 - loadspritegfx 10198 - loadspritegfx 10007 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_EXPLOSION_6 delay 1 monbg 3 setalpha 12, 8 @@ -6713,8 +6745,8 @@ Move_DYNAMIC_PUNCH:: @ 81CFF92 end Move_COUNTER:: @ 81D005A - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 3 setalpha 12, 8 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, 0, 18, 6, 1, 4 @@ -6745,7 +6777,7 @@ Move_COUNTER:: @ 81D005A end Move_VITAL_THROW:: @ 81D0129 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W233, 192 @@ -6768,9 +6800,9 @@ Move_VITAL_THROW:: @ 81D0129 end Move_ROCK_SMASH:: @ 81D01A4 - loadspritegfx 10058 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET monbg 3 setalpha 12, 8 delay 1 @@ -6795,7 +6827,7 @@ Move_ROCK_SMASH:: @ 81D01A4 end Move_SUBMISSION:: @ 81D029C - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W104, 192 @@ -6828,10 +6860,10 @@ gUnknown_81D030B:: @ 81D030B return Move_SUNNY_DAY:: @ 81D033F - loadspritegfx 10157 + loadspritegfx ANIM_TAG_SUNLIGHT monbg 2 setalpha 13, 3 - createvisualtask sub_80BA7F8, 10, 1921, 1, 0, 6, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 0, 6, RGB_WHITE waitforvisualfinish panse_26 SE_W080, 192, 63, 1, 0 call gUnknown_81D038B @@ -6839,7 +6871,7 @@ Move_SUNNY_DAY:: @ 81D033F call gUnknown_81D038B call gUnknown_81D038B waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 1, 6, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 1, 6, 0, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff @@ -6851,7 +6883,7 @@ gUnknown_81D038B:: @ 81D038B return Move_COTTON_SPORE:: @ 81D0395 - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg 3 monbgprio_28 1 loopsewithpan SE_W077, 63, 18, 10 @@ -6872,7 +6904,7 @@ gUnknown_81D03B5:: @ 81D03B5 return Move_SPORE:: @ 81D03EF - loadspritegfx 10158 + loadspritegfx ANIM_TAG_SPORE monbg 3 setalpha 12, 8 createvisualtask AnimTask_SporeDoubleBattle, 2, @@ -6896,8 +6928,8 @@ gUnknown_81D041A:: @ 81D041A return Move_PETAL_DANCE:: @ 81D0454 - loadspritegfx 10159 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FLOWER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W080, 192 @@ -6934,9 +6966,9 @@ Move_PETAL_DANCE:: @ 81D0454 end Move_RAZOR_LEAF:: @ 81D058C - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 delay 1 @@ -6974,8 +7006,8 @@ Move_RAZOR_LEAF:: @ 81D058C end Move_ANCIENT_POWER:: @ 81D0693 - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createsprite gUnknown_83E7B88, ANIM_ATTACKER, 2, 4, 1, 10, 1 @@ -7007,8 +7039,8 @@ Move_ANCIENT_POWER:: @ 81D0693 end Move_OCTAZOOKA:: @ 81D07BB - loadspritegfx 10030 - loadspritegfx 10017 + loadspritegfx ANIM_TAG_GRAY_SMOKE + loadspritegfx ANIM_TAG_BLACK_BALL playsewithpan SE_W025B, 192 createsprite gOctazookaBallSpriteTemplate, ANIM_TARGET, 2, 20, 0, 0, 0, 20, 0 waitforvisualfinish @@ -7024,7 +7056,7 @@ Move_OCTAZOOKA:: @ 81D07BB end Move_MIST:: @ 81D0821 - loadspritegfx 10144 + loadspritegfx ANIM_TAG_MIST_CLOUD monbg 2 setalpha 12, 8 loopsewithpan SE_W054, 192, 20, 15 @@ -7036,7 +7068,7 @@ Move_MIST:: @ 81D0821 call gUnknown_81D086C call gUnknown_81D086C delay 32 - createvisualtask sub_80B9BDC, 2, 10, 8, 2, 0, 14, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 10, 8, 2, 0, 14, RGB_WHITE waitforvisualfinish clearmonbg 2 blendoff @@ -7052,18 +7084,18 @@ Move_HAZE:: @ 81D0882 playsewithpan SE_W114, 0 createvisualtask AnimTask_Haze1, 5, delay 30 - createvisualtask sub_80BA7F8, 10, 1920, 2, 0, 16, 0 + createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 2, 0, 16, RGB_BLACK delay 90 - createvisualtask sub_80BA7F8, 10, 1920, 1, 16, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 0 | (0xF << 7), 1, 16, 0, RGB_BLACK end Move_FIRE_PUNCH:: @ 81D08B5 - loadspritegfx 10143 - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 9, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 9, RGB(31, 0, 0) createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 0 createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 64 createsprite gUnknown_83E5BE0, ANIM_TARGET, 1, 128 @@ -7077,7 +7109,7 @@ Move_FIRE_PUNCH:: @ 81D08B5 delay 4 playsewithpan SE_W007, 63 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 4, 0, 9, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 4, 0, 9, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 blendoff @@ -7094,7 +7126,7 @@ gUnknown_81D0950:: @ 81D0950 return Move_LEER:: @ 81D09C8 - loadspritegfx 10027 + loadspritegfx ANIM_TAG_LEER monbg 0 monbgprio_28 0 setalpha 8, 8 @@ -7113,8 +7145,8 @@ Move_LEER:: @ 81D09C8 end Move_DREAM_EATER:: @ 81D0A1F - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 3 monbgprio_2A 1 playsewithpan SE_W060, 192 @@ -7181,8 +7213,8 @@ gUnknown_81D0A89:: @ 81D0A89 return Move_POISON_GAS:: @ 81D0C22 - loadspritegfx 10172 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_PURPLE_GAS_CLOUD + loadspritegfx ANIM_TAG_POISON_BUBBLE delay 0 monbg 3 monbgprio_29 @@ -7207,7 +7239,7 @@ Move_POISON_GAS:: @ 81D0C22 createsprite gUnknown_83E6514, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 delay 40 loopsewithpan SE_W054, 63, 28, 6 - createvisualtask sub_80B9BDC, 2, 4, 6, 2, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 6, 2, 0, 12, 26650 waitforvisualfinish blendoff clearmonbg 3 @@ -7235,14 +7267,14 @@ Move_WRAP:: @ 81D0D3A goto gUnknown_81D0D16 Move_PSYBEAM:: @ 81D0D50 - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING playsewithpan SE_W060, 192 call gUnknown_81D59BB createsoundtask mas_80DCF38, 193, -64, 63, 3, 4, 0, 15 call gUnknown_81D0DD4 call gUnknown_81D0DD4 createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, 1 - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 32351 call gUnknown_81D0DD4 call gUnknown_81D0DD4 call gUnknown_81D0DD4 @@ -7263,12 +7295,12 @@ gUnknown_81D0DD4:: @ 81D0DD4 return Move_HYPNOSIS:: @ 81D0DEA - loadspritegfx 10163 + loadspritegfx ANIM_TAG_GOLD_RING call gUnknown_81D59BB call gUnknown_81D0E1D call gUnknown_81D0E1D call gUnknown_81D0E1D - createvisualtask sub_80B9BDC, 2, 4, 2, 2, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 2, 2, 0, 12, 32351 waitforvisualfinish delay 1 call gUnknown_81D59C7 @@ -7282,14 +7314,14 @@ gUnknown_81D0E1D:: @ 81D0E1D return Move_PSYWAVE:: @ 81D0E4A - loadspritegfx 10165 + loadspritegfx ANIM_TAG_BLUE_RING playsewithpan SE_W060, 192 call gUnknown_81D59BB createvisualtask sub_80AB100, 5, 100 createsoundtask mas_80DCF38, 196, -64, 63, 2, 9, 0, 10 call gUnknown_81D0EAD call gUnknown_81D0EAD - createvisualtask sub_80B9BDC, 2, 4, 1, 4, 0, 12, 32351 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 1, 4, 0, 12, 32351 call gUnknown_81D0EAD call gUnknown_81D0EAD call gUnknown_81D0EAD @@ -7307,8 +7339,8 @@ gUnknown_81D0EAD:: @ 81D0EAD return Move_ZAP_CANNON:: @ 81D0ED0 - loadspritegfx 10171 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_BLACK_BALL_2 + loadspritegfx ANIM_TAG_SPARK_2 playsewithpan SE_W086, 192 createsprite gUnknown_83E5FDC, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0 createsprite gUnknown_83E6008, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0 @@ -7328,8 +7360,8 @@ Move_ZAP_CANNON:: @ 81D0ED0 end Move_STEEL_WING:: @ 81D0FB5 - loadspritegfx 10009 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_GUST + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish @@ -7355,7 +7387,7 @@ Move_STEEL_WING:: @ 81D0FB5 end Move_IRON_TAIL:: @ 81D1064 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 waitforvisualfinish @@ -7374,8 +7406,8 @@ Move_IRON_TAIL:: @ 81D1064 end Move_POISON_TAIL:: @ 81D10C2 - loadspritegfx 10135 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_POISON_BUBBLE loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 1, 1, 23768 waitforvisualfinish @@ -7395,7 +7427,7 @@ Move_POISON_TAIL:: @ 81D10C2 end Move_METAL_CLAW:: @ 81D1128 - loadspritegfx 10039 + loadspritegfx ANIM_TAG_CLAW_SLASH loopsewithpan SE_W231, 192, 28, 2 createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 waitforvisualfinish @@ -7426,7 +7458,7 @@ Move_NIGHT_SHADE:: @ 81D11BB createvisualtask sub_80B54E8, 5, 85 delay 70 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 12, 1 - createvisualtask sub_80B9BDC, 2, 4, 0, 2, 0, 13, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 0, 2, 0, 13, 0 waitforvisualfinish clearmonbg 0 delay 1 @@ -7435,8 +7467,8 @@ Move_NIGHT_SHADE:: @ 81D11BB end Move_EGG_BOMB:: @ 81D1203 - loadspritegfx 10198 - loadspritegfx 10175 + loadspritegfx ANIM_TAG_EXPLOSION + loadspritegfx ANIM_TAG_LARGE_FRESH_EGG playsewithpan SE_W039, 192 createsprite gEggThrowSpriteTemplate, ANIM_TARGET, 2, 10, 0, 0, 0, 25, -32 waitforvisualfinish @@ -7460,7 +7492,7 @@ Move_EGG_BOMB:: @ 81D1203 end Move_SHADOW_BALL:: @ 81D129D - loadspritegfx 10176 + loadspritegfx ANIM_TAG_SHADOW_BALL fadetobg 2 waitbgfadein delay 15 @@ -7475,7 +7507,7 @@ Move_SHADOW_BALL:: @ 81D129D end Move_LICK:: @ 81D12E0 - loadspritegfx 10177 + loadspritegfx ANIM_TAG_LICK delay 15 playsewithpan SE_W122, 63 createsprite gUnknown_83E763C, ANIM_TARGET, 2, 0, 0 @@ -7484,11 +7516,11 @@ Move_LICK:: @ 81D12E0 end Move_FOCUS_ENERGY:: @ 81D1307 - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, RGB_WHITE createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -7497,22 +7529,22 @@ Move_FOCUS_ENERGY:: @ 81D1307 end Move_BIDE:: @ 81D1347 - choosetwoturnanim gUnknown_81D1351, gUnknown_81D137D + choosetwoturnanim BattleAnimScript_Bide_Setup, BattleAnimScript_Bide_Release end -gUnknown_81D1351:: @ 81D1351 +BattleAnimScript_Bide_Setup:: @ 81D1351 loopsewithpan SE_W036, 192, 9, 2 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish end -gUnknown_81D137D:: @ 81D137D - loadspritegfx 10135 +BattleAnimScript_Bide_Release:: @ 81D137D + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 loopsewithpan SE_W036, 192, 9, 2 - createvisualtask sub_80BA7F8, 10, 2, 2, 0, 11, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 0, 11, RGB(31, 0, 0) createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 waitforvisualfinish createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, 0, 0, 4 @@ -7531,15 +7563,15 @@ gUnknown_81D137D:: @ 81D137D delay 5 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 2, 2, 11, 0, 31 + createvisualtask AnimTask_BlendSelected, 10, 2, 2, 11, 0, RGB(31, 0, 0) waitforvisualfinish clearmonbg 3 blendoff end Move_STRING_SHOT:: @ 81D1446 - loadspritegfx 10179 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_STRING + loadspritegfx ANIM_TAG_WEB_THREAD monbg 3 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 @@ -7583,8 +7615,8 @@ gUnknown_81D1504:: @ 81D1504 return Move_SPIDER_WEB:: @ 81D1518 - loadspritegfx 10181 - loadspritegfx 10180 + loadspritegfx ANIM_TAG_SPIDER_WEB + loadspritegfx ANIM_TAG_WEB_THREAD monbg 3 delay 0 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 0, 9, 0 @@ -7620,14 +7652,14 @@ gUnknown_81D15A5:: @ 81D15A5 return Move_RAZOR_WIND:: @ 81D15B9 - choosetwoturnanim gUnknown_81D15C4, gUnknown_81D1614 + choosetwoturnanim BattleAnimScript_RazorWInd_Turn1, BattleAnimScript_RazorWInd_Turn2 gUnknown_81D15C2:: @ 81D15C2 waitforvisualfinish end -gUnknown_81D15C4:: @ 81D15C4 - loadspritegfx 10009 +BattleAnimScript_RazorWInd_Turn1:: @ 81D15C4 + loadspritegfx ANIM_TAG_GUST playsewithpan SE_W016, 192 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 0, 7, 40 createsprite gRazorWindTornadoSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 16, 16, 85, 7, 40 @@ -7636,9 +7668,9 @@ gUnknown_81D15C4:: @ 81D15C4 playsewithpan SE_W016B, 192 goto gUnknown_81D15C2 -gUnknown_81D1614:: @ 81D1614 - loadspritegfx 10154 - loadspritegfx 10135 +BattleAnimScript_RazorWInd_Turn2:: @ 81D1614 + loadspritegfx ANIM_TAG_AIR_WAVE_2 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W013B, 192 @@ -7659,7 +7691,7 @@ gUnknown_81D1614:: @ 81D1614 goto gUnknown_81D15C2 Move_DISABLE:: @ 81D169F - loadspritegfx 10071 + loadspritegfx ANIM_TAG_SPARKLE_4 monbg 1 monbgprio_28 1 setalpha 8, 8 @@ -7675,12 +7707,12 @@ Move_DISABLE:: @ 81D169F end Move_RECOVER:: @ 81D16CD - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 2 setalpha 12, 8 loopsewithpan SE_W025, 192, 13, 3 - createvisualtask sub_80B9BDC, 2, 2, 0, 6, 0, 11, 12287 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 6, 0, 11, 12287 call gUnknown_81D170D call gUnknown_81D170D call gUnknown_81D170D @@ -7710,7 +7742,7 @@ gUnknown_81D170D:: @ 81D170D return Move_MIMIC:: @ 81D1777 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS monbg_22 3 setalpha 11, 5 panse_1B SE_W107, 63, 192, 253, 0 @@ -7721,14 +7753,14 @@ Move_MIMIC:: @ 81D1777 setarg 7, 65535 waitforvisualfinish playsewithpan SE_W036, 192 - createvisualtask sub_80B9BDC, 2, 2, 0, 2, 0, 11, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 2, 0, 11, RGB_WHITE waitforvisualfinish clearmonbg_23 3 blendoff end Move_CONSTRICT:: @ 81D17C1 - loadspritegfx 10186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 4 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 2 delay 7 @@ -7745,11 +7777,11 @@ Move_CONSTRICT:: @ 81D17C1 end Move_CURSE:: @ 81D1829 - choosetwoturnanim gUnknown_81D1832, gUnknown_81D18AF + choosetwoturnanim BattleAnimScript_Curse_Ghost, BattleAnimScript_Curse_Other -gUnknown_81D1832:: @ 81D1832 - loadspritegfx 10199 - loadspritegfx 10200 +BattleAnimScript_Curse_Ghost:: @ 81D1832 + loadspritegfx ANIM_TAG_NAIL + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg 2 createvisualtask sub_80B63B4, 5, waitforvisualfinish @@ -7779,7 +7811,7 @@ gUnknown_81D1899:: @ 81D1899 playsewithpan SE_W020, 192 return -gUnknown_81D18AF:: @ 81D18AF +BattleAnimScript_Curse_Other:: @ 81D18AF createvisualtask AnimTask_SwayMon, 5, 0, 10, 1536, 3, 0 waitforvisualfinish delay 10 @@ -7789,14 +7821,14 @@ gUnknown_81D18AF:: @ 81D18AF gUnknown_81D18CA:: @ 81D18CA playsewithpan SE_W082, 192 - createvisualtask sub_80BACEC, 5, - createvisualtask sub_80B9BDC, 5, 2, 4, 2, 0, 10, 31 + createvisualtask AnimTask_SetUpCurseBackground, 5, + createvisualtask AnimTask_CurseBlendEffect, 5, 2, 4, 2, 0, 10, 31 return Move_SOFT_BOILED:: @ 81D18E9 - loadspritegfx 10202 - loadspritegfx 10203 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BREAKING_EGG + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_BLUE_STAR monbg 2 playsewithpan SE_W039, 192 createvisualtask AnimTask_ShakeMon, 2, 0, 0, 2, 6, 1 @@ -7817,10 +7849,10 @@ Move_SOFT_BOILED:: @ 81D18E9 end Move_HEAL_BELL:: @ 81D196B - loadspritegfx 10205 - loadspritegfx 10206 - loadspritegfx 10203 - createvisualtask sub_80BA7F8, 10, 10, 0, 0, 10, 32767 + loadspritegfx ANIM_TAG_BELL + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 + loadspritegfx ANIM_TAG_THIN_RING + createvisualtask AnimTask_BlendSelected, 10, 10, 0, 0, 10, RGB_WHITE waitforvisualfinish createvisualtask sub_80A96B4, 5, createsprite gBellSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, 0, 1 @@ -7845,26 +7877,26 @@ Move_HEAL_BELL:: @ 81D196B waitforvisualfinish createvisualtask sub_80A9760, 5, waitforvisualfinish - unloadspritegfx 10205 - unloadspritegfx 10206 - unloadspritegfx 10203 - loadspritegfx 10049 + unloadspritegfx ANIM_TAG_BELL + unloadspritegfx ANIM_TAG_MUSIC_NOTES_2 + unloadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W234, 192 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, -15, 0, 0, 0, 32, 60, 1 delay 8 createsprite gSparklingStarsSpriteTemplate, ANIM_ATTACKER, 16, 12, -5, 0, 0, 32, 60, 1 waitforvisualfinish - unloadspritegfx 10049 - loadspritegfx 10203 + unloadspritegfx ANIM_TAG_SPARKLE_2 + loadspritegfx ANIM_TAG_THIN_RING playsewithpan SE_REAPOKE, 192 - createvisualtask sub_80BA83C, 10, 4, 3, 10, 0, 31500 - createvisualtask sub_80BA7F8, 10, 10, 3, 10, 0, 32767 + createvisualtask AnimTask_BlendExcept, 10, 4, 3, 10, 0, 31500 + createvisualtask AnimTask_BlendSelected, 10, 10, 3, 10, 0, RGB_WHITE createsprite gBlendThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 16, 0, 0, 0, 1 end gUnknown_81D1B2F:: @ 81D1B2F - createvisualtask sub_80BA83C, 10, 4, 3, 8, 0, 31500 - createvisualtask sub_80BA7F8, 10, 10, 3, 2, 10, 32767 + createvisualtask AnimTask_BlendExcept, 10, 4, 3, 8, 0, 31500 + createvisualtask AnimTask_BlendSelected, 10, 10, 3, 2, 10, RGB_WHITE createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 40, 0, -24, 0, 1 playsewithpan SE_W215, 192 return @@ -7877,11 +7909,11 @@ Move_FAKE_OUT:: @ 81D1B65 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 5, 1 createvisualtask sub_80A9A20, 3, waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE end Move_SCARY_FACE:: @ 81D1BA0 - loadspritegfx 10218 + loadspritegfx ANIM_TAG_EYE_SPARKLE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 27, 3, 0, 16, 0 playsewithpan SE_W060, 192 waitforvisualfinish @@ -7899,8 +7931,8 @@ Move_SCARY_FACE:: @ 81D1BA0 end Move_SWEET_KISS:: @ 81D1C03 - loadspritegfx 10216 - loadspritegfx 10220 + loadspritegfx ANIM_TAG_RED_HEART + loadspritegfx ANIM_TAG_ANGEL createsprite gAngelSpriteTemplate, ANIM_TARGET, 2, 16, -48 playsewithpan SE_W215, 63 delay 23 @@ -7918,8 +7950,8 @@ Move_SWEET_KISS:: @ 81D1C03 end Move_LOVELY_KISS:: @ 81D1C6C - loadspritegfx 10219 - loadspritegfx 10221 + loadspritegfx ANIM_TAG_PINK_HEART + loadspritegfx ANIM_TAG_DEVIL createsprite gDevilSpriteTemplate, ANIM_TARGET, 2, 0, -24 playsewithpan SE_W060B, 63 waitforvisualfinish @@ -7931,7 +7963,7 @@ Move_LOVELY_KISS:: @ 81D1C6C end Move_FURY_SWIPES:: @ 81D1CB3 - loadspritegfx 10222 + loadspritegfx ANIM_TAG_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 5, 5 delay 4 playsewithpan SE_W010, 63 @@ -7946,8 +7978,8 @@ Move_FURY_SWIPES:: @ 81D1CB3 end Move_INGRAIN:: @ 81D1D17 - loadspritegfx 10223 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_ORBS createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 16, 26, -1, 2, 150 playsewithpan SE_W010, 192 delay 10 @@ -7976,7 +8008,7 @@ Move_INGRAIN:: @ 81D1D17 end Move_PRESENT:: @ 81D1DC8 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask AnimTask_IsHealingMove, 2, createsprite gPresentSpriteTemplate, ANIM_TARGET, 2, 0, -5, 10, 2, -1 playsewithpan SE_W039, 192 @@ -7992,7 +8024,7 @@ Move_PRESENT:: @ 81D1DC8 end gUnknown_81D1E0B:: @ 81D1E0B - loadspritegfx 10198 + loadspritegfx ANIM_TAG_EXPLOSION playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 delay 6 @@ -8010,8 +8042,8 @@ gUnknown_81D1E0B:: @ 81D1E0B end gUnknown_81D1E76:: @ 81D1E76 - loadspritegfx 10195 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_GREEN_SPARKLE + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W234, 63 createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1 delay 3 @@ -8036,14 +8068,14 @@ gUnknown_81D1E76:: @ 81D1E76 end Move_BATON_PASS:: @ 81D1F1F - loadspritegfx 10226 + loadspritegfx ANIM_TAG_POKEBALL playsewithpan SE_W226, 192 - createvisualtask sub_80B9BDC, 2, 31, 1, 2, 0, 11, 31455 + createvisualtask AnimTask_CurseBlendEffect, 2, 31, 1, 2, 0, 11, 31455 createsprite gBatonPassPokeballSpriteTemplate, ANIM_ATTACKER, 2, end Move_PERISH_SONG:: @ 81D1F41 - loadspritegfx 10206 + loadspritegfx ANIM_TAG_MUSIC_NOTES_2 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 0 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 1, 1, 16 createsprite gPerishSongMusicNoteSpriteTemplate, ANIM_ATTACKER, 4, 2, 1, 32 @@ -8079,7 +8111,7 @@ Move_PERISH_SONG:: @ 81D1F41 end Move_SLEEP_TALK:: @ 81D20AA - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z createvisualtask AnimTask_SwayMon, 5, 0, 4, 4096, 2, 0 delay 20 createsprite gLetterZSpriteTemplate, ANIM_TARGET, 2, 0, 20, 5, -1 @@ -8106,7 +8138,7 @@ Move_SLEEP_TALK:: @ 81D20AA end Move_HYPER_FANG:: @ 81D2165 - loadspritegfx 10192 + loadspritegfx ANIM_TAG_FANG_ATTACK playsewithpan SE_W044, 63 delay 1 delay 2 @@ -8141,7 +8173,7 @@ gUnknown_81D21C5:: @ 81D21C5 goto gUnknown_81D2193 Move_TRI_ATTACK:: @ 81D21CC - loadspritegfx 10230 + loadspritegfx ANIM_TAG_TRI_FORCE_TRIANGLE createsprite gTriAttackTriangleSpriteTemplate, ANIM_TARGET, 2, 16, 0 playsewithpan SE_W161, 192 delay 20 @@ -8151,7 +8183,7 @@ Move_TRI_ATTACK:: @ 81D21CC waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 16, 0 delay 16 - loadspritegfx 10033 + loadspritegfx ANIM_TAG_FIRE createsprite gUnknown_83E5C88, ANIM_TARGET, 2, 0, 0, 30, 30, -1, 0 playsewithpan SE_W172B, 63 createsprite gUnknown_83E5C88, ANIM_TARGET, 2, 0, 0, 30, 30, 0, 1 @@ -8170,7 +8202,7 @@ Move_TRI_ATTACK:: @ 81D21CC delay 2 createvisualtask sub_80ADAD8, 2, 20, 3, 1, 1 waitforvisualfinish - loadspritegfx 10037 + loadspritegfx ANIM_TAG_LIGHTNING createvisualtask sub_80BA0E8, 2, 257, 257, 257 playsewithpan SE_W161B, 63 createsprite gUnknown_83E5F38, ANIM_TARGET, 2, 0, -48 @@ -8183,15 +8215,15 @@ Move_TRI_ATTACK:: @ 81D21CC delay 2 createvisualtask sub_80BA0E8, 2, 257, 257, 257 waitforvisualfinish - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CRYSTALS call gUnknown_81D540A createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 16, 0, 0 waitforvisualfinish end Move_WILL_O_WISP:: @ 81D2340 - loadspritegfx 10232 - loadspritegfx 10231 + loadspritegfx ANIM_TAG_WISP_FIRE + loadspritegfx ANIM_TAG_WISP_ORB monbg 3 monbgprio_2A 1 playsewithpan SE_W052, 192 @@ -8221,10 +8253,10 @@ Move_WILL_O_WISP:: @ 81D2340 end Move_ENCORE:: @ 81D23FE - loadspritegfx 10227 - loadspritegfx 10247 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_TAG_HAND createvisualtask AnimTask_CreateSpotlight, 2, - createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 @@ -8235,14 +8267,14 @@ Move_ENCORE:: @ 81D23FE createvisualtask sub_80DD410, 5, 216, 63 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, 1 waitforvisualfinish - createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2, end Move_TRICK:: @ 81D24A5 - loadspritegfx 10224 - loadspritegfx 10207 + loadspritegfx ANIM_TAG_ITEM_BAG + loadspritegfx ANIM_TAG_SPEED_DUST createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 80 createsprite gTrickBagSpriteTemplate, ANIM_ATTACKER, 2, -40, 208 delay 16 @@ -8269,8 +8301,8 @@ Move_TRICK:: @ 81D24A5 end Move_WISH:: @ 81D2523 - loadspritegfx 10233 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish panse_27 SE_W115, 63, 192, 253, 0 @@ -8285,14 +8317,14 @@ Move_WISH:: @ 81D2523 end Move_STOCKPILE:: @ 81D256B - loadspritegfx 10235 + loadspritegfx ANIM_TAG_GRAY_ORB playsewithpan SE_W025, 192 - createvisualtask sub_80B9BDC, 2, 2, 8, 1, 0, 12, 32767 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 8, 1, 0, 12, RGB_WHITE createvisualtask AnimTask_StockpileDeformMon, 5, call gUnknown_81D25A9 call gUnknown_81D25A9 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 0, 12, 0, RGB_WHITE end gUnknown_81D25A9:: @ 81D25A9 @@ -8315,8 +8347,8 @@ gUnknown_81D25A9:: @ 81D25A9 return Move_SPIT_UP:: @ 81D2622 - loadspritegfx 10237 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_RED_ORB_2 + loadspritegfx ANIM_TAG_IMPACT playsewithpan SE_W036, 192 createvisualtask AnimTask_SpitUpDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 @@ -8365,8 +8397,8 @@ gUnknown_81D2718:: @ 81D2718 goto gUnknown_81D26B2 Move_SWALLOW:: @ 81D2765 - loadspritegfx 10236 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_BLUE_ORB + loadspritegfx ANIM_TAG_BLUE_STAR playsewithpan SE_W036, 192 createvisualtask AnimTask_SwallowDeformMon, 5, createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 8, 2 @@ -8414,11 +8446,11 @@ Move_TRANSFORM:: @ 81D2811 end Move_MORNING_SUN:: @ 81D2829 - loadspritegfx 10241 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_GREEN_STAR + loadspritegfx ANIM_TAG_BLUE_STAR createvisualtask AnimTask_MorningSunLightBeam, 5, delay 8 - createvisualtask sub_80BA7F8, 10, 1921, 8, 0, 12, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 8, 0, 12, RGB_WHITE delay 14 call gUnknown_81D28AF call gUnknown_81D28AF @@ -8435,7 +8467,7 @@ Move_MORNING_SUN:: @ 81D2829 call gUnknown_81D28AF call gUnknown_81D28AF call gUnknown_81D28AF - createvisualtask sub_80BA7F8, 10, 1921, 3, 12, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 3, 12, 0, RGB_WHITE waitforvisualfinish waitsound call gUnknown_81D56C9 @@ -8447,7 +8479,7 @@ gUnknown_81D28AF:: @ 81D28AF return Move_SWEET_SCENT:: @ 81D28BD - loadspritegfx 10238 + loadspritegfx ANIM_TAG_PINK_PETAL playsewithpan SE_W230, 192 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100 delay 25 @@ -8455,7 +8487,7 @@ Move_SWEET_SCENT:: @ 81D28BD call gUnknown_81D2901 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0 setpan 63 - createvisualtask sub_80B9BDC, 2, 20, 1, 5, 5, 13, 22207 + createvisualtask AnimTask_CurseBlendEffect, 2, 20, 1, 5, 5, 13, 22207 call gUnknown_81D2901 waitforvisualfinish end @@ -8486,7 +8518,7 @@ gUnknown_81D2901:: @ 81D2901 return Move_HYPER_BEAM:: @ 81D29A7 - loadspritegfx 10147 + loadspritegfx ANIM_TAG_ORBS createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 0, 16, 0 waitforvisualfinish delay 10 @@ -8503,7 +8535,7 @@ Move_HYPER_BEAM:: @ 81D29A7 call gUnknown_81D2AD8 call gUnknown_81D2AD8 createvisualtask AnimTask_ShakeMon2, 2, 1, 4, 0, 50, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 11, 26425 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 11, RGB(25, 25, 25) call gUnknown_81D2AD8 call gUnknown_81D2AD8 call gUnknown_81D2AD8 @@ -8525,7 +8557,7 @@ Move_HYPER_BEAM:: @ 81D29A7 call gUnknown_81D2AD8 call gUnknown_81D2AD8 call gUnknown_81D2AD8 - createvisualtask sub_80BA7F8, 10, 4, 2, 11, 0, 26425 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 11, 0, RGB(25, 25, 25) waitforvisualfinish createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 4, 16, 0, 0 end @@ -8537,11 +8569,11 @@ gUnknown_81D2AD8:: @ 81D2AD8 return Move_FLATTER:: @ 81D2AE9 - loadspritegfx 10227 - loadspritegfx 10240 + loadspritegfx ANIM_TAG_SPOTLIGHT + loadspritegfx ANIM_TAG_CONFETTI createvisualtask sub_80DD410, 5, 216, 63 createvisualtask AnimTask_CreateSpotlight, 2, - createvisualtask sub_80BAB38, 2, 248, 3, 0, 10, 0 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE waitforvisualfinish createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 delay 0 @@ -8572,7 +8604,7 @@ Move_FLATTER:: @ 81D2AE9 delay 5 createvisualtask sub_80DD3DC, 5, 222, 63 waitforvisualfinish - createvisualtask sub_80BAB38, 2, 248, 3, 10, 0, 1 + createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE waitforvisualfinish createvisualtask AnimTask_RemoveSpotlight, 2, end @@ -8584,7 +8616,7 @@ gUnknown_81D2BD2:: @ 81D2BD2 Move_ROLE_PLAY:: @ 81D2BE5 monbg 2 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 16, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 0, 10, 0 waitforvisualfinish playsewithpan SE_W161, 192 @@ -8592,14 +8624,14 @@ Move_ROLE_PLAY:: @ 81D2BE5 createvisualtask AnimTask_RolePlaySilhouette, 2, waitforvisualfinish clearmonbg 2 - createvisualtask sub_80BA7F8, 10, 4, 2, 16, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 16, 0, RGB_WHITE delay 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 2, 10, 0, 0 end Move_REFRESH:: @ 81D2C42 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 playsewithpan SE_W287, 192 createvisualtask sub_80E2084, 2, 0 waitforvisualfinish @@ -8612,19 +8644,19 @@ Move_REFRESH:: @ 81D2C42 end Move_BLAZE_KICK:: @ 81D2C85 - loadspritegfx 10135 - loadspritegfx 10143 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_SMALL_EMBER monbg 1 setalpha 12, 8 playsewithpan SE_W172, 63 createsprite gUnknown_83E678C, ANIM_TARGET, 3, 0, 0, 1, 30 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 7, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 7, RGB_WHITE delay 30 playsewithpan SE_W007, 63 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0 createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 14, 1 - createvisualtask sub_80BA7F8, 10, 4, 2, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 4, 2, 0, 0, RGB_WHITE createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, 0, 8, 0, 0 call gUnknown_81D0950 waitforvisualfinish @@ -8633,7 +8665,7 @@ Move_BLAZE_KICK:: @ 81D2C85 end Move_HYPER_VOICE:: @ 81D2D0D - loadspritegfx 10203 + loadspritegfx ANIM_TAG_THIN_RING call gUnknown_81D2D1F waitforvisualfinish delay 8 @@ -8653,7 +8685,7 @@ gUnknown_81D2D1F:: @ 81D2D1F return Move_SAND_TOMB:: @ 81D2D96 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 43, 1 playsewithpan SE_W328, 63 @@ -8685,7 +8717,7 @@ Move_SHEER_COLD:: @ 81D2E6E waitbgfadeout playsewithpan SE_W196, 0 waitbgfadein - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -8699,8 +8731,8 @@ Move_SHEER_COLD:: @ 81D2E6E end Move_ARM_THRUST:: @ 81D2E93 - loadspritegfx 10143 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_HANDS_AND_FEET + loadspritegfx ANIM_TAG_IMPACT monbgprio_28 1 setalpha 12, 8 createvisualtask sub_8099980, 5, 8, 5, 0, 0 @@ -8735,7 +8767,7 @@ Move_MUDDY_WATER:: @ 81D2F28 end Move_BULLET_SEED:: @ 81D2F3A - loadspritegfx 10006 + loadspritegfx ANIM_TAG_SEED createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 delay 5 createsprite gBulletSeedSpriteTemplate, ANIM_TARGET, 2, 20, 0 @@ -8760,10 +8792,10 @@ Move_BULLET_SEED:: @ 81D2F3A end Move_DRAGON_CLAW:: @ 81D2FD0 - loadspritegfx 10029 - loadspritegfx 10039 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_CLAW_SLASH playsewithpan SE_W221B, 192 - createvisualtask sub_80BA7F8, 10, 2, 4, 0, 8, 639 + createvisualtask AnimTask_BlendSelected, 10, 2, 4, 0, 8, RGB(31, 19, 0) createvisualtask AnimTask_ShakeMon, 5, 0, 0, 2, 15, 1 call gUnknown_81D31AD call gUnknown_81D31AD @@ -8800,7 +8832,7 @@ Move_DRAGON_CLAW:: @ 81D2FD0 createsprite gUnknown_83E7438, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, 0 delay 2 createsprite gUnknown_83E7438, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, 0 - createvisualtask sub_80BA7F8, 10, 2, 4, 8, 0, 639 + createvisualtask AnimTask_BlendSelected, 10, 2, 4, 8, 0, RGB(31, 19, 0) waitforvisualfinish end @@ -8821,7 +8853,7 @@ gUnknown_81D31AD:: @ 81D31AD end Move_MUD_SHOT:: @ 81D3239 - loadspritegfx 10259 + loadspritegfx ANIM_TAG_BROWN_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -8854,9 +8886,9 @@ gUnknown_81D32B3:: @ 81D32B3 return Move_METEOR_MASH:: @ 81D32D6 - loadspritegfx 10233 - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_GOLD_STARS + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET panse_1B SE_W112, 192, 63, 3, 0 fadetobg 16 waitbgfadein @@ -8879,23 +8911,23 @@ Move_METEOR_MASH:: @ 81D32D6 end Move_REVENGE:: @ 81D335D - loadspritegfx 10245 + loadspritegfx ANIM_TAG_PURPLE_SCRATCH monbg 1 setalpha 12, 8 playsewithpan SE_W036, 192 createsprite gUnknown_83E6900, ANIM_ATTACKER, 2, 10, -10 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 2, 0, 4, 2, 8, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 0, 4, 2, 8, 31 waitforvisualfinish - unloadspritegfx 10245 - loadspritegfx 10246 + unloadspritegfx ANIM_TAG_PURPLE_SCRATCH + loadspritegfx ANIM_TAG_PURPLE_SWIPE createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 delay 4 playsewithpan SE_W207, 63 createsprite gUnknown_83E6948, ANIM_TARGET, 2, 10, -10 waitforvisualfinish - unloadspritegfx 10246 - loadspritegfx 10135 + unloadspritegfx ANIM_TAG_PURPLE_SWIPE + loadspritegfx ANIM_TAG_IMPACT createvisualtask AnimTask_ShakeMon2, 2, 1, 3, 0, 10, 1 createsprite gUnknown_83E7CB0, ANIM_TARGET, 3, -10, -8, 1, 1, 8 playsewithpan SE_W233B, 63 @@ -8908,14 +8940,14 @@ Move_REVENGE:: @ 81D335D end Move_POISON_FANG:: @ 81D33F4 - loadspritegfx 10192 - loadspritegfx 10150 + loadspritegfx ANIM_TAG_FANG_ATTACK + loadspritegfx ANIM_TAG_POISON_BUBBLE playsewithpan SE_W044, 63 createsprite gFangSpriteTemplate, ANIM_TARGET, 2, delay 10 createvisualtask AnimTask_ShakeMon, 3, 1, 3, 0, 10, 1 waitforvisualfinish - createvisualtask sub_80B9BDC, 2, 4, 0, 4, 0, 12, 26650 + createvisualtask AnimTask_CurseBlendEffect, 2, 4, 0, 4, 0, 12, 26650 call gUnknown_81D575B waitforvisualfinish end @@ -8926,8 +8958,8 @@ Move_SUBSTITUTE:: @ 81D3433 end Move_FRENZY_PLANT:: @ 81D343F - loadspritegfx 10223 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROOTS + loadspritegfx ANIM_TAG_IMPACT monbg 1 monbgprio_28 1 setalpha 12, 8 @@ -8986,7 +9018,7 @@ Move_FRENZY_PLANT:: @ 81D343F end Move_METAL_SOUND:: @ 81D35E3 - loadspritegfx 10260 + loadspritegfx ANIM_TAG_METAL_SOUND_WAVES monbg 3 monbgprio_2A 1 createvisualtask AnimTask_ShakeMon2, 2, 0, 2, 0, 8, 1 @@ -9014,8 +9046,8 @@ gUnknown_81D3638:: @ 81D3638 end gUnknown_81D363A:: @ 81D363A - loadspritegfx 10135 - loadspritegfx 10143 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_HANDS_AND_FEET delay 1 createvisualtask AnimTask_IsContest, 2, jumpargeq 7, 1, gUnknown_81D36F3 @@ -9061,7 +9093,7 @@ gUnknown_81D36F3:: @ 81D36F3 goto gUnknown_81D3668 Move_RETURN:: @ 81D36FA - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 createvisualtask AnimTask_GetReturnPowerLevel, 2, @@ -9157,13 +9189,13 @@ gUnknown_81D38FD:: @ 81D38FD createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 waitforvisualfinish delay 2 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 0 createvisualtask sub_80DD410, 5, 160, -64 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 4, 2, 0 createvisualtask sub_80DD410, 5, 160, -64 @@ -9171,7 +9203,7 @@ gUnknown_81D38FD:: @ 81D38FD createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -8, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish call gUnknown_81D3B35 call gUnknown_81D3B35 @@ -9199,12 +9231,12 @@ gUnknown_81D3B35:: @ 81D3B35 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2 createvisualtask sub_80DD3DC, 5, 116, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 6, 0, 8, 1 - createvisualtask sub_80BAB98, 2, 0, 4, 5, 1 + createvisualtask AnimTask_CloneBattlerSpriteWithBlend, 2, 0, 4, 5, 1 waitforvisualfinish return Move_COSMIC_POWER:: @ 81D3B89 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_SPARKLE_2 createvisualtask sub_80DD410, 5, 236, 0 playsewithpan SE_W322, 0 createvisualtask sub_80BB7DC, 2, 0, 0, 15, 0 @@ -9229,8 +9261,8 @@ Move_COSMIC_POWER:: @ 81D3B89 end Move_BLAST_BURN:: @ 81D3C0E - loadspritegfx 10035 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_FIRE_PLUME + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W221, 192 @@ -9274,8 +9306,8 @@ Move_BLAST_BURN:: @ 81D3C0E end Move_ROCK_TOMB:: @ 81D3E50 - loadspritegfx 10250 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_X_SIGN + loadspritegfx ANIM_TAG_ROCKS createvisualtask sub_80BA47C, 2, 2, 0, 10, 1 waitforvisualfinish createsprite gUnknown_83E7508, ANIM_TARGET, 2, 20, 12, 64, 114, 0 @@ -9306,14 +9338,14 @@ Move_ROCK_TOMB:: @ 81D3E50 end Move_SILVER_WIND:: @ 81D3F37 - loadspritegfx 10271 + loadspritegfx ANIM_TAG_SPARKLE_6 panse_1B SE_W016, 192, 63, 2, 0 playsewithpan SE_W234, 0 delay 0 monbg 3 monbgprio_29 delay 0 - createvisualtask sub_80BA83C, 10, 1, 0, 0, 4, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 0, 0, 4, 0 createvisualtask AnimTask_GetTargetSide, 2, jumpargeq 7, 1, gUnknown_81D4138 fadetobg 22 @@ -9322,7 +9354,7 @@ Move_SILVER_WIND:: @ 81D3F37 gUnknown_81D3F7E:: @ 81D3F7E delay 0 - createvisualtask sub_80BA7F8, 10, 1, 0, 4, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1, 0, 4, 4, RGB_BLACK waitbgfadein createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1 createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1 @@ -9353,7 +9385,7 @@ gUnknown_81D3F7E:: @ 81D3F7E delay 0 restorebg waitbgfadeout - createvisualtask sub_80BA83C, 10, 1, 0, 4, 0, 0 + createvisualtask AnimTask_BlendExcept, 10, 1, 0, 4, 0, 0 setarg 7, 65535 waitbgfadein end @@ -9370,12 +9402,12 @@ Move_SNATCH:: @ 81D414F end Move_DIVE:: @ 81D4169 - loadspritegfx 10272 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SPLASH + loadspritegfx ANIM_TAG_SWEAT_BEAD choosetwoturnanim gUnknown_81D4178, gUnknown_81D41CD gUnknown_81D4178:: @ 81D4178 - loadspritegfx 10156 + loadspritegfx ANIM_TAG_ROUND_SHADOW playsewithpan SE_W029, 192 createsprite gUnknown_83E6D40, ANIM_ATTACKER, 2, 0, 0, 13, 336 waitforvisualfinish @@ -9394,8 +9426,8 @@ gUnknown_81D41B6:: @ 81D41B6 return gUnknown_81D41CD:: @ 81D41CD - loadspritegfx 10148 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_WATER_IMPACT + loadspritegfx ANIM_TAG_SMALL_BUBBLES monbg 3 setalpha 12, 8 playsewithpan SE_W153, 63 @@ -9419,8 +9451,8 @@ gUnknown_81D420C:: @ 81D420C return Move_ROCK_BLAST:: @ 81D4223 - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 3 playsewithpan SE_W207, 192 @@ -9437,8 +9469,8 @@ Move_ROCK_BLAST:: @ 81D4223 end Move_OVERHEAT:: @ 81D42C0 - loadspritegfx 10029 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SMALL_EMBER + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 18 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 5, 28 @@ -9518,8 +9550,8 @@ Move_OVERHEAT:: @ 81D42C0 end Move_HYDRO_CANNON:: @ 81D45B2 - loadspritegfx 10149 - loadspritegfx 10148 + loadspritegfx ANIM_TAG_WATER_ORB + loadspritegfx ANIM_TAG_WATER_IMPACT monbg 3 setalpha 12, 8 playsewithpan SE_W057, 192 @@ -9561,7 +9593,7 @@ gUnknown_81D467C:: @ 81D467C return Move_ASTONISH:: @ 81D46E4 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD playsewithpan SE_W227, 192 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 25 @@ -9574,8 +9606,8 @@ Move_ASTONISH:: @ 81D46E4 end Move_SEISMIC_TOSS:: @ 81D472C - loadspritegfx 10135 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS setarg 7, 0 monbg 3 setalpha 12, 8 @@ -9647,7 +9679,7 @@ gUnknown_81D4828:: @ 81D4828 return Move_MAGIC_COAT:: @ 81D4889 - loadspritegfx 10170 + loadspritegfx ANIM_TAG_ORANGE_LIGHT_WALL setalpha 0, 16 waitplaysewithpan SE_W112, 192, 15 createsprite gUnknown_83E6E70, ANIM_ATTACKER, 3, 40, 0, 10170 @@ -9657,8 +9689,8 @@ Move_MAGIC_COAT:: @ 81D4889 end Move_WATER_PULSE:: @ 81D48A6 - loadspritegfx 10155 - loadspritegfx 10288 + loadspritegfx ANIM_TAG_SMALL_BUBBLES + loadspritegfx ANIM_TAG_BLUE_RING_2 monbg 1 monbgprio_28 1 playsewithpan SE_W145C, 192 @@ -9688,14 +9720,14 @@ Move_WATER_PULSE:: @ 81D48A6 end Move_PSYCHO_BOOST:: @ 81D499B - loadspritegfx 10212 + loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT monbg 2 fadetobg 3 waitbgfadeout createvisualtask AnimTask_FadeScreenToWhite, 5, waitbgfadein delay 6 - createvisualtask sub_80B9BDC, 2, 1, 2, 8, 0, 10, 0 + createvisualtask AnimTask_CurseBlendEffect, 2, 1, 2, 8, 0, 10, 0 delay 0 monbgprio_28 0 setalpha 8, 8 @@ -9715,14 +9747,14 @@ Move_PSYCHO_BOOST:: @ 81D499B end Move_KNOCK_OFF:: @ 81D4A0F - loadspritegfx 10277 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_SLAM_HIT_2 + loadspritegfx ANIM_TAG_IMPACT createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 delay 4 playsewithpan SE_W233, 63 createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16 delay 8 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 playsewithpan SE_W004, 63 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -12, 10, 0, 3 @@ -9753,8 +9785,8 @@ Move_DOOM_DESIRE:: @ 81D4A9F clearmonbg 2 blendoff end - loadspritegfx 10198 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, @@ -9781,12 +9813,12 @@ Move_DOOM_DESIRE:: @ 81D4A9F playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end Move_SKY_UPPERCUT:: @ 81D4BC1 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 3 monbgprio_28 1 fadetobg 17 @@ -9843,9 +9875,9 @@ Move_SECRET_POWER:: @ 81D4CBA goto Move_SLAM Move_TWISTER:: @ 81D4D0E - loadspritegfx 10063 - loadspritegfx 10135 - loadspritegfx 10058 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_IMPACT + loadspritegfx ANIM_TAG_ROCKS monbg 3 monbgprio_28 1 playsewithpan SE_W239, 63 @@ -9889,9 +9921,9 @@ Move_TWISTER:: @ 81D4D0E end Move_MAGICAL_LEAF:: @ 81D4E6D - loadspritegfx 10063 - loadspritegfx 10160 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_LEAF + loadspritegfx ANIM_TAG_RAZOR_LEAF + loadspritegfx ANIM_TAG_IMPACT monbg 3 setalpha 12, 8 delay 1 @@ -9933,8 +9965,8 @@ Move_MAGICAL_LEAF:: @ 81D4E6D end Move_ICE_BALL:: @ 81D4F8E - loadspritegfx 10043 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_ICE_CHUNK + loadspritegfx ANIM_TAG_ICE_CRYSTALS createvisualtask AnimTask_GetRolloutCounter, 5, 0 jumpargeq 0, 4, gUnknown_81D5005 @@ -10034,7 +10066,7 @@ gUnknown_81D5151:: @ 81D5151 return Move_WEATHER_BALL:: @ 81D515D - loadspritegfx 10283 + loadspritegfx ANIM_TAG_WEATHER_BALL createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 8, 1, 0 delay 8 playsewithpan SE_W207, 192 @@ -10042,7 +10074,7 @@ Move_WEATHER_BALL:: @ 81D515D waitforvisualfinish delay 15 playsewithpan SE_W197, 0 - createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, 32767, 10, 0, 0 + createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 waitforvisualfinish createvisualtask AnimTask_GetWeather, 2, delay 1 @@ -10053,7 +10085,7 @@ Move_WEATHER_BALL:: @ 81D515D jumpargeq 7, 4, gUnknown_81D536D gUnknown_81D51C8:: @ 81D51C8 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT createsprite gSpriteTemplate_83BF44C, ANIM_TARGET, 2, -30, -100, 25, 1, 0, 0 waitforvisualfinish playsewithpan SE_W025B, 63 @@ -10063,7 +10095,7 @@ gUnknown_81D51C8:: @ 81D51C8 end gUnknown_81D5205:: @ 81D5205 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER createsprite gUnknown_83E5E14, ANIM_TARGET, 2, -30, -100, 25, 1, 40, 10 playsewithpan SE_W172, 63 delay 10 @@ -10079,7 +10111,7 @@ gUnknown_81D5205:: @ 81D5205 end gUnknown_81D5269:: @ 81D5269 - loadspritegfx 10155 + loadspritegfx ANIM_TAG_SMALL_BUBBLES createsprite gUnknown_83E5BA0, ANIM_TARGET, 2, -30, -100, 25, 1, 50, 10 playsewithpan SE_W152, 63 delay 8 @@ -10095,7 +10127,7 @@ gUnknown_81D5269:: @ 81D5269 end gUnknown_81D52CD:: @ 81D52CD - loadspritegfx 10058 + loadspritegfx ANIM_TAG_ROCKS createsprite gUnknown_83E7590, ANIM_TARGET, 2, -30, -100, 25, 1, 30, 0 playsewithpan SE_W088, 63 delay 5 @@ -10115,8 +10147,8 @@ gUnknown_81D52CD:: @ 81D52CD end gUnknown_81D536D:: @ 81D536D - loadspritegfx 10263 - loadspritegfx 10141 + loadspritegfx ANIM_TAG_HAIL + loadspritegfx ANIM_TAG_ICE_CRYSTALS createsprite gUnknown_83E65BC, ANIM_TARGET, 2, -30, -100, 25, 25, -40, 20 playsewithpan SE_W258, 63 delay 10 @@ -10133,7 +10165,7 @@ gUnknown_81D536D:: @ 81D536D end Move_COUNT:: @ 81D53D9 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10433,16 +10465,16 @@ gUnknown_81D5A41:: @ 81D5A41 Status_Poison:: @ 81D5A44 loopsewithpan SE_W092, 63, 13, 6 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 18, 2 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 12, 31774 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 12, 31774 end Status_Confusion:: @ 81D5A6F - loadspritegfx 10073 + loadspritegfx ANIM_TAG_DUCK call gUnknown_81D595F end Status_Burn:: @ 81D5A78 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W172, 63 call gUnknown_81D5A90 call gUnknown_81D5A90 @@ -10456,7 +10488,7 @@ gUnknown_81D5A90:: @ 81D5A90 return Status_Infatuation:: @ 81D5AA8 - loadspritegfx 10210 + loadspritegfx ANIM_TAG_MAGENTA_HEART playsewithpan SE_W204, 192 createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0, 20 delay 15 @@ -10468,7 +10500,7 @@ Status_Infatuation:: @ 81D5AA8 end Status_Sleep:: @ 81D5ADD - loadspritegfx 10228 + loadspritegfx ANIM_TAG_LETTER_Z playsewithpan SE_W173, 192 createsprite gSleepLetterZSpriteTemplate, ANIM_ATTACKER, 2, 4, -10, 16, 0, 0 delay 30 @@ -10476,14 +10508,14 @@ Status_Sleep:: @ 81D5ADD end Status_Paralysis:: @ 81D5B09 - loadspritegfx 10011 + loadspritegfx ANIM_TAG_SPARK_2 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 10, 1 call gUnknown_81D58D4 end Status_Freeze:: @ 81D5B23 playsewithpan SE_W196, 0 - loadspritegfx 10010 + loadspritegfx ANIM_TAG_ICE_CUBE monbg 3 monbgprio_28 1 waitplaysewithpan SE_W258, 63, 17 @@ -10493,7 +10525,7 @@ Status_Freeze:: @ 81D5B23 end Status_Curse:: @ 81D5B3E - loadspritegfx 10200 + loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT monbg 3 playsewithpan SE_W171, 63 createsprite gUnknown_83E7698, ANIM_TARGET, 2, @@ -10503,7 +10535,7 @@ Status_Curse:: @ 81D5B3E end Status_Nightmare:: @ 81D5B63 - loadspritegfx 10221 + loadspritegfx ANIM_TAG_DEVIL monbg 3 playsewithpan SE_W171, 63 createsprite gUnknown_83E76B0, ANIM_TARGET, 2, @@ -10538,13 +10570,13 @@ General_StatsChange:: @ 81D5BBE General_SubstituteFade:: @ 81D5BC7 monbg 0 createvisualtask sub_80F15C8, 5, - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 16, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 16, RGB_WHITE waitforvisualfinish delay 1 clearmonbg 0 delay 2 blendoff - createvisualtask sub_80BA7F8, 10, 2, 0, 0, 0, 32767 + createvisualtask AnimTask_BlendSelected, 10, 2, 0, 0, 0, RGB_WHITE createvisualtask sub_80F1420, 2, 1 end @@ -10566,7 +10598,7 @@ General_PokeblockThrow:: @ 81D5C0C end General_ItemKnockoff:: @ 81D5C54 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createsprite gKnockOffItemSpriteTemplate, ANIM_TARGET, 2, end @@ -10579,7 +10611,7 @@ General_TurnTrap:: @ 81D5C5F goto gUnknown_81D5C8B gUnknown_81D5C8B:: @ 81D5C8B - loadspritegfx 10186 + loadspritegfx ANIM_TAG_TENDRILS loopsewithpan SE_W010, 63, 6, 2 createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1 delay 7 @@ -10593,7 +10625,7 @@ gUnknown_81D5C8B:: @ 81D5C8B end gUnknown_81D5CD3:: @ 81D5CD3 - loadspritegfx 10029 + loadspritegfx ANIM_TAG_SMALL_EMBER playsewithpan SE_W221B, 63 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 call gUnknown_81C885F @@ -10603,7 +10635,7 @@ gUnknown_81D5CD3:: @ 81D5CD3 end gUnknown_81D5CF8:: @ 81D5CF8 - loadspritegfx 10149 + loadspritegfx ANIM_TAG_WATER_ORB monbg 3 monbgprio_28 1 setalpha 12, 8 @@ -10621,8 +10653,8 @@ gUnknown_81D5CF8:: @ 81D5CF8 end gUnknown_81D5D4C:: @ 81D5D4C - loadspritegfx 10145 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_CLAMP + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W011, 63 @@ -10638,7 +10670,7 @@ gUnknown_81D5D4C:: @ 81D5D4C end gUnknown_81D5DA9:: @ 81D5DA9 - loadspritegfx 10074 + loadspritegfx ANIM_TAG_MUD_SAND createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 7, 563 createvisualtask AnimTask_ShakeMon, 5, 1, 0, 2, 30, 1 playsewithpan SE_W328, 63 @@ -10651,8 +10683,8 @@ gUnknown_81D5DA9:: @ 81D5DA9 end General_ItemEffect:: @ 81D5DF2 - loadspritegfx 10203 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_THIN_RING + loadspritegfx ANIM_TAG_SPARKLE_2 delay 0 playsewithpan SE_W036, 192 createvisualtask sub_8099A78, 2, 16, 128, 0, 2 @@ -10673,7 +10705,7 @@ General_ItemEffect:: @ 81D5DF2 end General_SmokeballEscape:: @ 81D5E66 - loadspritegfx 10242 + loadspritegfx ANIM_TAG_PINK_CLOUD monbg 0 setalpha 12, 4 delay 0 @@ -10722,15 +10754,15 @@ General_HangedOn:: @ 81D5F42 end General_Rain:: @ 81D5F8F - loadspritegfx 10115 + loadspritegfx ANIM_TAG_RAIN_DROPS playsewithpan SE_W240, 192 - createvisualtask sub_80BA7F8, 10, 1921, 2, 0, 4, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 0, 4, RGB_BLACK waitforvisualfinish createvisualtask sub_80AABC0, 2, 0, 3, 60 createvisualtask sub_80AABC0, 2, 0, 3, 60 delay 50 waitforvisualfinish - createvisualtask sub_80BA7F8, 10, 1921, 2, 4, 0, 0 + createvisualtask AnimTask_BlendSelected, 10, 1 | (0xF << 7), 2, 4, 0, RGB_BLACK waitforvisualfinish end @@ -10749,7 +10781,7 @@ General_LeechSeedDrain:: @ 81D5FE7 goto Move_ABSORB General_MonHit:: @ 81D5FF5 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT monbg 1 setalpha 12, 8 playsewithpan SE_W003, 63 @@ -10761,7 +10793,7 @@ General_MonHit:: @ 81D5FF5 end General_ItemSteal:: @ 81D6026 - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80BC0FC, 2, createvisualtask AnimTask_TargetToEffectBattler, 2, delay 1 @@ -10769,7 +10801,7 @@ General_ItemSteal:: @ 81D6026 end General_SnatchMove:: @ 81D604B - loadspritegfx 10224 + loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_80BC060, 2, call gUnknown_81D6476 delay 1 @@ -10816,8 +10848,8 @@ General_FutureSightHit:: @ 81D60A9 General_DoomDesireHit:: @ 81D6108 createvisualtask sub_80BC0DC, 2, - loadspritegfx 10198 - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, 32767 + loadspritegfx ANIM_TAG_EXPLOSION + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_WHITE waitforvisualfinish delay 10 createvisualtask AnimTask_DoomDesireLightBeam, 5, @@ -10844,16 +10876,16 @@ General_DoomDesireHit:: @ 81D6108 playsewithpan SE_W120, 63 createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 16, 16, 1, 1 waitforvisualfinish - createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, 32767 + createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_WHITE waitforvisualfinish end General_FocusPunchSetUp:: @ 81D61CD - loadspritegfx 10184 + loadspritegfx ANIM_TAG_FOCUS_ENERGY playsewithpan SE_W082, 192 call gUnknown_81CB267 delay 8 - createvisualtask sub_80B9BDC, 2, 2, 2, 2, 0, 11, 31 + createvisualtask AnimTask_CurseBlendEffect, 2, 2, 2, 2, 0, 11, 31 createvisualtask AnimTask_ShakeMon2, 2, 0, 1, 0, 32, 1 call gUnknown_81CB267 delay 8 @@ -10862,8 +10894,8 @@ General_FocusPunchSetUp:: @ 81D61CD end General_IngrainHeal:: @ 81D620D - loadspritegfx 10147 - loadspritegfx 10031 + loadspritegfx ANIM_TAG_ORBS + loadspritegfx ANIM_TAG_BLUE_STAR monbg 3 setalpha 12, 8 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, 13293 @@ -10881,8 +10913,8 @@ General_IngrainHeal:: @ 81D620D end General_WishHeal:: @ 81D6250 - loadspritegfx 10031 - loadspritegfx 10049 + loadspritegfx ANIM_TAG_BLUE_STAR + loadspritegfx ANIM_TAG_SPARKLE_2 createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 10, 0 waitforvisualfinish playsewithpan SE_W025, 192 @@ -10896,7 +10928,7 @@ General_WishHeal:: @ 81D6250 gUnknown_81D628A:: @ 81D628A createvisualtask sub_80F1C8C, 2, 1 waitforvisualfinish - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, 2, 0, 10, 26336 createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 10, 1 delay 20 @@ -10922,7 +10954,7 @@ gUnknown_81D6301:: @ 81D6301 waitforvisualfinish clearmonbg_23 0 delay 1 - loadspritegfx 10273 + loadspritegfx ANIM_TAG_SWEAT_BEAD createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 4, -1, 0, 6, 27349 createsprite gUnknown_83E6D94, ANIM_TARGET, 5, 0, 1 createsprite gUnknown_83E6D94, ANIM_TARGET, 5, 1, 1 @@ -10948,8 +10980,8 @@ gUnknown_81D637B:: @ 81D637B gUnknown_81D6394:: @ 81D6394 createvisualtask sub_80F1C8C, 2, 0 waitforvisualfinish - loadspritegfx 10058 - loadspritegfx 10135 + loadspritegfx ANIM_TAG_ROCKS + loadspritegfx ANIM_TAG_IMPACT delay 0 waitplaysewithpan SE_W026, 192, 22 createsprite gUnknown_840C210, ANIM_TARGET, 3, -17, 14, 8, 0 @@ -10982,7 +11014,7 @@ gUnknown_81D63FD:: @ 81D63FD end gUnknown_81D6425:: @ 81D6425 - loadspritegfx 10087 + loadspritegfx ANIM_TAG_ANGER createsprite gAngerMarkSpriteTemplate, ANIM_TARGET, 2, 1, 20, -20 playsewithpan SE_W207B, 63 waitforvisualfinish @@ -11061,7 +11093,7 @@ gUnknown_81D6524:: @ 81D6524 end gUnknown_81D652D:: @ 81D652D - loadspritegfx 10135 + loadspritegfx ANIM_TAG_IMPACT delay 25 monbg 3 setalpha 12, 8 diff --git a/data/decoration_tiles.inc b/data/decoration_tiles.inc deleted file mode 100644 index 2a53f2d8e..000000000 --- a/data/decoration_tiles.inc +++ /dev/null @@ -1,359 +0,0 @@ -gUnknown_8454004:: @ 8454004 - .2byte 0x087 - -gUnknown_8454006:: @ 8454006 - .2byte 0x08F - -gUnknown_8454008:: @ 8454008 - .2byte 0x090, 0x091, 0x092, 0x098, 0x099, 0x09A - -gUnknown_8454014:: @ 8454014 - .2byte 0x093, 0x094, 0x095, 0x09B, 0x09C, 0x09D - -gUnknown_8454020:: @ 8454020 - .2byte 0x096, 0x097, 0x0A3, 0x09E, 0x09F, 0x0AB - -gUnknown_845402C:: @ 845402C - .2byte 0x0BD, 0x0BE, 0x0BF, 0x0C5, 0x0C6, 0x0C7, 0x0CD, 0x0CE, 0x0CF - -gUnknown_845403E:: @ 845403E - .2byte 0x0A0, 0x0A1, 0x0A2, 0x0A8, 0x0A9, 0x0AA, 0x0B0, 0x0B1, 0x0B2 - -gUnknown_8454050:: @ 8454050 - .2byte 0x0A4, 0x0A5, 0x0A6, 0x0AC, 0x0AD, 0x0AE, 0x0B4, 0x0B5, 0x0B6 - -gUnknown_8454062:: @ 8454062 - .2byte 0x0A7, 0x0BB, 0x0BC, 0x0AF, 0x0C3, 0x0C4, 0x0B7, 0x0CB, 0x0CC - -gUnknown_8454074:: @ 8454074 - .2byte 0x0B8 - -gUnknown_8454076:: @ 8454076 - .2byte 0x0B9 - -gUnknown_8454078:: @ 8454078 - .2byte 0x0BA - -gUnknown_845407A:: @ 845407A - .2byte 0x0C0 - -gUnknown_845407C:: @ 845407C - .2byte 0x0C1 - -gUnknown_845407E:: @ 845407E - .2byte 0x0C2 - -gUnknown_8454080:: @ 8454080 - .2byte 0x0C8 - -gUnknown_8454082:: @ 8454082 - .2byte 0x0C9 - -gUnknown_8454084:: @ 8454084 - .2byte 0x0CA - -gUnknown_8454086:: @ 8454086 - .2byte 0x0D0, 0x0D8 - -gUnknown_845408A:: @ 845408A - .2byte 0x0D2, 0x0DA - -gUnknown_845408E:: @ 845408E - .2byte 0x0D4, 0x0DC - -gUnknown_8454092:: @ 8454092 - .2byte 0x0E0, 0x0E2, 0x0E8, 0x0E9 - -gUnknown_845409A:: @ 845409A - .2byte 0x0E4, 0x0E6, 0x0EC, 0x0ED - -gUnknown_84540A2:: @ 84540A2 - .2byte 0x0F0, 0x0F2, 0x0F8, 0x0F9 - -gUnknown_84540AA:: @ 84540AA - .2byte 0x025, 0x02D - -gUnknown_84540AE:: @ 84540AE - .2byte 0x026, 0x02E - -gUnknown_84540B2:: @ 84540B2 - .2byte 0x027, 0x02F - -gUnknown_84540B6:: @ 84540B6 - .2byte 0x138 - -gUnknown_84540B8:: @ 84540B8 - .2byte 0x13C - -gUnknown_84540BA:: @ 84540BA - .2byte 0x140 - -gUnknown_84540BC:: @ 84540BC - .2byte 0x030, 0x031, 0x032, 0x038, 0x039, 0x03A, 0x040, 0x041, 0x03B - -gUnknown_84540CE:: @ 84540CE - .2byte 0x048, 0x049, 0x068, 0x050, 0x051, 0x070, 0x058, 0x059, 0x069 - -gUnknown_84540E0:: @ 84540E0 - .2byte 0x034, 0x03C - -gUnknown_84540E4:: @ 84540E4 - .2byte 0x035, 0x036, 0x03D, 0x03E, 0x063, 0x064, 0x06F, 0x077 - -gUnknown_84540F4:: @ 84540F4 - .2byte 0x033 - -gUnknown_84540F6:: @ 84540F6 - .2byte 0x02C - -gUnknown_84540F8:: @ 84540F8 - .2byte 0x080, 0x081, 0x088, 0x089 - -gUnknown_8454100:: @ 8454100 - .2byte 0x06A, 0x06B, 0x06C, 0x06D, 0x072, 0x073, 0x074, 0x075 - -gUnknown_8454110:: @ 8454110 - .2byte 0x028 - -gUnknown_8454112:: @ 8454112 - .2byte 0x037, 0x03F - -gUnknown_8454116:: @ 8454116 - .2byte 0x085, 0x08D - -gUnknown_845411A:: @ 845411A - .2byte 0x0D6, 0x0DE - -gUnknown_845411E:: @ 845411E - .2byte 0x12E, 0x136 - -gUnknown_8454122:: @ 8454122 - .2byte 0x082, 0x08A - -gUnknown_8454126:: @ 8454126 - .2byte 0x0F4 - -gUnknown_8454128:: @ 8454128 - .2byte 0x0F5 - -gUnknown_845412A:: @ 845412A - .2byte 0x0F6 - -gUnknown_845412C:: @ 845412C - .2byte 0x060 - -gUnknown_845412E:: @ 845412E - .2byte 0x061 - -gUnknown_8454130:: @ 8454130 - .2byte 0x062 - -gUnknown_8454132:: @ 8454132 - .2byte 0x078 - -gUnknown_8454134:: @ 8454134 - .2byte 0x079 - -gUnknown_8454136:: @ 8454136 - .2byte 0x07A - -gUnknown_8454138:: @ 8454138 - .2byte 0x07B - -gUnknown_845413A:: @ 845413A - .2byte 0x07C - -gUnknown_845413C:: @ 845413C - .2byte 0x07D - -gUnknown_845413E:: @ 845413E - .2byte 0x07E - -gUnknown_8454140:: @ 8454140 - .2byte 0x0B3 - -gUnknown_8454142:: @ 8454142 - .2byte 0x042, 0x043, 0x044, 0x04A, 0x04B, 0x04C, 0x052, 0x053, 0x054 - -gUnknown_8454154:: @ 8454154 - .2byte 0x045, 0x046, 0x047, 0x04D, 0x04E, 0x04F, 0x055, 0x056, 0x057 - -gUnknown_8454166:: @ 8454166 - .2byte 0x05A, 0x05B, 0x05C, 0x05D, 0x05E, 0x05F, 0x065, 0x066, 0x067 - -gUnknown_8454178:: @ 8454178 - .2byte 0x100, 0x101, 0x102, 0x108, 0x109, 0x10A, 0x110, 0x111, 0x112 - -gUnknown_845418A:: @ 845418A - .2byte 0x103, 0x104, 0x105, 0x10B, 0x10C, 0x10D, 0x113, 0x114, 0x115 - -gUnknown_845419C:: @ 845419C - .2byte 0x106, 0x107, 0x118, 0x10E, 0x10F, 0x120, 0x116, 0x117, 0x128 - -gUnknown_84541AE:: @ 84541AE - .2byte 0x119, 0x11A, 0x11B, 0x121, 0x122, 0x123, 0x129, 0x12A, 0x12B - -gUnknown_84541C0:: @ 84541C0 - .2byte 0x130 - -gUnknown_84541C2:: @ 84541C2 - .2byte 0x131 - -gUnknown_84541C4:: @ 84541C4 - .2byte 0x132 - -gUnknown_84541C6:: @ 84541C6 - .2byte 0x133 - -gUnknown_84541C8:: @ 84541C8 - .2byte 0x134 - -gUnknown_84541CA:: @ 84541CA - .2byte 0x11C, 0x11D - -gUnknown_84541CE:: @ 84541CE - .2byte 0x11E, 0x11F - -gUnknown_84541D2:: @ 84541D2 - .2byte 0x124, 0x125 - -gUnknown_84541D6:: @ 84541D6 - .2byte 0x126, 0x127 - -gUnknown_84541DA:: @ 84541DA - .2byte 0x12C, 0x12D - -gUnknown_84541DE:: @ 84541DE - .2byte 0x05C - -gUnknown_84541E0:: @ 84541E0 - .2byte 0x05C - -gUnknown_84541E2:: @ 84541E2 - .2byte 0x05C - -gUnknown_84541E4:: @ 84541E4 - .2byte 0x05C - -gUnknown_84541E6:: @ 84541E6 - .2byte 0x05C - -gUnknown_84541E8:: @ 84541E8 - .2byte 0x05C - -gUnknown_84541EA:: @ 84541EA - .2byte 0x05C - -gUnknown_84541EC:: @ 84541EC - .2byte 0x05C - -gUnknown_84541EE:: @ 84541EE - .2byte 0x05C - -gUnknown_84541F0:: @ 84541F0 - .2byte 0x05C - -gUnknown_84541F2:: @ 84541F2 - .2byte 0x05C - -gUnknown_84541F4:: @ 84541F4 - .2byte 0x05C - -gUnknown_84541F6:: @ 84541F6 - .2byte 0x05C - -gUnknown_84541F8:: @ 84541F8 - .2byte 0x05C - -gUnknown_84541FA:: @ 84541FA - .2byte 0x05C - -gUnknown_84541FC:: @ 84541FC - .2byte 0x05C - -gUnknown_84541FE:: @ 84541FE - .2byte 0x05C - -gUnknown_8454200:: @ 8454200 - .2byte 0x05C - -gUnknown_8454202:: @ 8454202 - .2byte 0x05C - -gUnknown_8454204:: @ 8454204 - .2byte 0x05C - -gUnknown_8454206:: @ 8454206 - .2byte 0x05C - -gUnknown_8454208:: @ 8454208 - .2byte 0x05C - -gUnknown_845420A:: @ 845420A - .2byte 0x05C - -gUnknown_845420C:: @ 845420C - .2byte 0x05C - -gUnknown_845420E:: @ 845420E - .2byte 0x05C - -gUnknown_8454210:: @ 8454210 - .2byte 0x05C - -gUnknown_8454212:: @ 8454212 - .2byte 0x05C - -gUnknown_8454214:: @ 8454214 - .2byte 0x05C - -gUnknown_8454216:: @ 8454216 - .2byte 0x05C - -gUnknown_8454218:: @ 8454218 - .2byte 0x05C - -gUnknown_845421A:: @ 845421A - .2byte 0x05C - -gUnknown_845421C:: @ 845421C - .2byte 0x05C - -gUnknown_845421E:: @ 845421E - .2byte 0x05C - -gUnknown_8454220:: @ 8454220 - .2byte 0x05C - -gUnknown_8454222:: @ 8454222 - .2byte 0x05C - -gUnknown_8454224:: @ 8454224 - .2byte 0x05C - -gUnknown_8454226:: @ 8454226 - .2byte 0x05C - -gUnknown_8454228:: @ 8454228 - .2byte 0x05C - -gUnknown_845422A:: @ 845422A - .2byte 0x05C - -gUnknown_845422C:: @ 845422C - .2byte 0x05C - -gUnknown_845422E:: @ 845422E - .2byte 0x05C - -gUnknown_8454230:: @ 8454230 - .2byte 0x05C - -gUnknown_8454232:: @ 8454232 - .2byte 0x05C - -gUnknown_8454234:: @ 8454234 - .2byte 0x05C - -gUnknown_8454236:: @ 8454236 - .2byte 0x05C diff --git a/data/decorations.s b/data/decorations.s deleted file mode 100644 index 0d6e85efe..000000000 --- a/data/decorations.s +++ /dev/null @@ -1,857 +0,0 @@ -#include "constants/decorations.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2 - - .include "data/decoration_tiles.inc" - .include "data/text/decoration_descriptions.inc" - - .align 2 -gDecorations:: @ 84556F8 - .byte DECOR_NONE - .string "SMALL DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 0, 0 - .4byte gUnknown_8454238 - .4byte gUnknown_8454004 - - .byte DECOR_SMALL_DESK - .string "SMALL DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 3000, 0 - .4byte gUnknown_8454238 - .4byte gUnknown_8454004 - - .byte DECOR_POKEMON_DESK - .string "POKéMON DESK$", 16 - .byte 0x00, 0x00, 0x00 - .2byte 3000, 0 - .4byte gUnknown_8454254 - .4byte gUnknown_8454006 - - .byte DECOR_HEAVY_DESK - .string "HEAVY DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_8454284 - .4byte gUnknown_8454008 - - .byte DECOR_RAGGED_DESK - .string "RAGGED DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_84542BC - .4byte gUnknown_8454014 - - .byte DECOR_COMFORT_DESK - .string "COMFORT DESK$", 16 - .byte 0x00, 0x09, 0x00 - .2byte 6000, 0 - .4byte gUnknown_84542F3 - .4byte gUnknown_8454020 - - .byte DECOR_PRETTY_DESK - .string "PRETTY DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_845432C - .4byte gUnknown_845402C - - .byte DECOR_BRICK_DESK - .string "BRICK DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_8454362 - .4byte gUnknown_845403E - - .byte DECOR_CAMP_DESK - .string "CAMP DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_8454398 - .4byte gUnknown_8454050 - - .byte DECOR_HARD_DESK - .string "HARD DESK$", 16 - .byte 0x00, 0x08, 0x00 - .2byte 9000, 0 - .4byte gUnknown_84543D1 - .4byte gUnknown_8454062 - - .byte DECOR_SMALL_CHAIR - .string "SMALL CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454404 - .4byte gUnknown_8454074 - - .byte DECOR_POKEMON_CHAIR - .string "POKéMON CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454420 - .4byte gUnknown_8454076 - - .byte DECOR_HEAVY_CHAIR - .string "HEAVY CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_8454451 - .4byte gUnknown_8454078 - - .byte DECOR_PRETTY_CHAIR - .string "PRETTY CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_845446E - .4byte gUnknown_845407A - - .byte DECOR_COMFORT_CHAIR - .string "COMFORT CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_845448B - .4byte gUnknown_845407C - - .byte DECOR_RAGGED_CHAIR - .string "RAGGED CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544A9 - .4byte gUnknown_845407E - - .byte DECOR_BRICK_CHAIR - .string "BRICK CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544C5 - .4byte gUnknown_8454080 - - .byte DECOR_CAMP_CHAIR - .string "CAMP CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544E2 - .4byte gUnknown_8454082 - - .byte DECOR_HARD_CHAIR - .string "HARD CHAIR$", 16 - .byte 0x01, 0x00, 0x01 - .2byte 2000, 0 - .4byte gUnknown_84544FE - .4byte gUnknown_8454084 - - .byte DECOR_RED_PLANT - .string "RED PLANT$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_845451A - .4byte gUnknown_8454086 - - .byte DECOR_TROPICAL_PLANT - .string "TROPICAL PLANT$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_8454534 - .4byte gUnknown_845408A - - .byte DECOR_PRETTY_FLOWERS - .string "PRETTY FLOWERS$", 16 - .byte 0x02, 0x05, 0x02 - .2byte 3000, 0 - .4byte gUnknown_8454559 - .4byte gUnknown_845408E - - .byte DECOR_COLORFUL_PLANT - .string "COLORFUL PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_8454570 - .4byte gUnknown_8454092 - - .byte DECOR_BIG_PLANT - .string "BIG PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_8454598 - .4byte gUnknown_845409A - - .byte DECOR_GORGEOUS_PLANT - .string "GORGEOUS PLANT$", 16 - .byte 0x02, 0x04, 0x02 - .2byte 5000, 0 - .4byte gUnknown_84545C6 - .4byte gUnknown_84540A2 - - .byte DECOR_RED_BRICK - .string "RED BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_84545EE - .4byte gUnknown_84540AA - - .byte DECOR_YELLOW_BRICK - .string "YELLOW BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_8454625 - .4byte gUnknown_84540AE - - .byte DECOR_BLUE_BRICK - .string "BLUE BRICK$", 16 - .byte 0x00, 0x05, 0x03 - .2byte 500, 0 - .4byte gUnknown_845465A - .4byte gUnknown_84540B2 - - .byte DECOR_RED_BALLOON - .string "RED BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_845468D - .4byte gUnknown_84540B6 - - .byte DECOR_BLUE_BALLOON - .string "BLUE BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84546C4 - .4byte gUnknown_84540B8 - - .byte DECOR_YELLOW_BALLOON - .string "YELLOW BALLOON$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84546FC - .4byte gUnknown_84540BA - - .byte DECOR_RED_TENT - .string "RED TENT$", 16 - .byte 0x01, 0x08, 0x03 - .2byte 10000, 0 - .4byte gUnknown_8454734 - .4byte gUnknown_84540BC - - .byte DECOR_BLUE_TENT - .string "BLUE TENT$", 16 - .byte 0x01, 0x08, 0x03 - .2byte 10000, 0 - .4byte gUnknown_845475E - .4byte gUnknown_84540CE - - .byte DECOR_SOLID_BOARD - .string "SOLID BOARD$", 16 - .byte 0x01, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_8454789 - .4byte gUnknown_84540E0 - - .byte DECOR_SLIDE - .string "SLIDE$", 16 - .byte 0x01, 0x07, 0x03 - .2byte 8000, 0 - .4byte gUnknown_84547B7 - .4byte gUnknown_84540E4 - - .byte DECOR_FENCE_LENGTH - .string "FENCE LENGTH$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84547DC - .4byte gUnknown_84540F4 - - .byte DECOR_FENCE_WIDTH - .string "FENCE WIDTH$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 500, 0 - .4byte gUnknown_84547FF - .4byte gUnknown_84540F6 - - .byte DECOR_TIRE - .string "TIRE$", 16 - .byte 0x00, 0x04, 0x03 - .2byte 800, 0 - .4byte gUnknown_8454822 - .4byte gUnknown_84540F8 - - .byte DECOR_STAND - .string "STAND$", 16 - .byte 0x01, 0x03, 0x03 - .2byte 7000, 0 - .4byte gUnknown_8454857 - .4byte gUnknown_8454100 - - .byte DECOR_MUD_BALL - .string "MUD BALL$", 16 - .byte 0x01, 0x00, 0x03 - .2byte 200, 0 - .4byte gUnknown_8454874 - .4byte gUnknown_8454110 - - .byte DECOR_BREAKABLE_DOOR - .string "BREAKABLE DOOR$", 16 - .byte 0x01, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_84548A1 - .4byte gUnknown_8454112 - - .byte DECOR_SAND_ORNAMENT - .string "SAND ORNAMENT$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 3000, 0 - .4byte gUnknown_84548D2 - .4byte gUnknown_8454116 - - .byte DECOR_SILVER_SHIELD - .string "SILVER SHIELD$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454901 - .4byte gUnknown_845411A - - .byte DECOR_GOLD_SHIELD - .string "GOLD SHIELD$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454933 - .4byte gUnknown_845411E - - .byte DECOR_GLASS_ORNAMENT - .string "GLASS ORNAMENT$", 16 - .byte 0x02, 0x05, 0x03 - .2byte 0, 0 - .4byte gUnknown_8454966 - .4byte gUnknown_8454122 - - .byte DECOR_TV - .string "TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 3000, 0 - .4byte gUnknown_845499F - .4byte gUnknown_8454126 - - .byte DECOR_ROUND_TV - .string "ROUND TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 4000, 0 - .4byte gUnknown_84549BE - .4byte gUnknown_8454128 - - .byte DECOR_CUTE_TV - .string "CUTE TV$", 16 - .byte 0x00, 0x00, 0x03 - .2byte 4000, 0 - .4byte gUnknown_84549E9 - .4byte gUnknown_845412A - - .byte DECOR_GLITTER_MAT - .string "GLITTER MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A14 - .4byte gUnknown_845412C - - .byte DECOR_JUMP_MAT - .string "JUMP MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A3C - .4byte gUnknown_845412E - - .byte DECOR_SPIN_MAT - .string "SPIN MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 2000, 0 - .4byte gUnknown_8454A6A - .4byte gUnknown_8454130 - - .byte DECOR_C_LOW_NOTE_MAT - .string "C Low NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454A99 - .4byte gUnknown_8454132 - - .byte DECOR_D_NOTE_MAT - .string "D NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454AC8 - .4byte gUnknown_8454134 - - .byte DECOR_E_NOTE_MAT - .string "E NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454AF3 - .4byte gUnknown_8454136 - - .byte DECOR_F_NOTE_MAT - .string "F NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B1F - .4byte gUnknown_8454138 - - .byte DECOR_G_NOTE_MAT - .string "G NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B4B - .4byte gUnknown_845413A - - .byte DECOR_A_NOTE_MAT - .string "A NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454B76 - .4byte gUnknown_845413C - - .byte DECOR_B_NOTE_MAT - .string "B NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454BA2 - .4byte gUnknown_845413E - - .byte DECOR_C_HIGH_NOTE_MAT - .string "C High NOTE MAT$", 16 - .byte 0x01, 0x00, 0x04 - .2byte 500, 0 - .4byte gUnknown_8454BCD - .4byte gUnknown_8454140 - - .byte DECOR_SURF_MAT - .string "SURF MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454BFD - .4byte gUnknown_8454142 - - .byte DECOR_THUNDER_MAT - .string "THUNDER MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454C31 - .4byte gUnknown_8454154 - - .byte DECOR_FIRE_BLAST_MAT - .string "FIRE BLAST MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454C68 - .4byte gUnknown_8454166 - - .byte DECOR_POWDER_SNOW_MAT - .string "POWDER SNOW MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454CA2 - .4byte gUnknown_8454178 - - .byte DECOR_ATTRACT_MAT - .string "ATTRACT MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454CDB - .4byte gUnknown_845418A - - .byte DECOR_FISSURE_MAT - .string "FISSURE MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454D13 - .4byte gUnknown_845419C - - .byte DECOR_SPIKES_MAT - .string "SPIKES MAT$", 16 - .byte 0x01, 0x08, 0x04 - .2byte 4000, 0 - .4byte gUnknown_8454D4A - .4byte gUnknown_84541AE - - .byte DECOR_BALL_POSTER - .string "BALL POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454D80 - .4byte gUnknown_84541C0 - - .byte DECOR_GREEN_POSTER - .string "GREEN POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DA8 - .4byte gUnknown_84541C2 - - .byte DECOR_RED_POSTER - .string "RED POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DCD - .4byte gUnknown_84541C4 - - .byte DECOR_BLUE_POSTER - .string "BLUE POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454DF2 - .4byte gUnknown_84541C6 - - .byte DECOR_CUTE_POSTER - .string "CUTE POSTER$", 16 - .byte 0x03, 0x00, 0x05 - .2byte 1000, 0 - .4byte gUnknown_8454E16 - .4byte gUnknown_84541C8 - - .byte DECOR_PIKA_POSTER - .string "PIKA POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E3C - .4byte gUnknown_84541CA - - .byte DECOR_LONG_POSTER - .string "LONG POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E6B - .4byte gUnknown_84541CE - - .byte DECOR_SEA_POSTER - .string "SEA POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454E90 - .4byte gUnknown_84541D2 - - .byte DECOR_SKY_POSTER - .string "SKY POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454EB7 - .4byte gUnknown_84541D6 - - .byte DECOR_KISS_POSTER - .string "KISS POSTER$", 16 - .byte 0x03, 0x01, 0x05 - .2byte 1500, 0 - .4byte gUnknown_8454EDC - .4byte gUnknown_84541DA - - .byte DECOR_PICHU_DOLL - .string "PICHU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F02 - .4byte gUnknown_84541DE - - .byte DECOR_PIKACHU_DOLL - .string "PIKACHU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F2D - .4byte gUnknown_84541E0 - - .byte DECOR_MARILL_DOLL - .string "MARILL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F5A - .4byte gUnknown_84541E2 - - .byte DECOR_TOGEPI_DOLL - .string "TOGEPI DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454F86 - .4byte gUnknown_84541E4 - - .byte DECOR_CYNDAQUIL_DOLL - .string "CYNDAQUIL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454FB2 - .4byte gUnknown_84541E6 - - .byte DECOR_CHIKORITA_DOLL - .string "CHIKORITA DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8454FE1 - .4byte gUnknown_84541E8 - - .byte DECOR_TOTODILE_DOLL - .string "TOTODILE DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455010 - .4byte gUnknown_84541EA - - .byte DECOR_JIGGLYPUFF_DOLL - .string "JIGGLYPUFF DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845503E - .4byte gUnknown_84541EC - - .byte DECOR_MEOWTH_DOLL - .string "MEOWTH DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845506E - .4byte gUnknown_84541EE - - .byte DECOR_CLEFAIRY_DOLL - .string "CLEFAIRY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845509A - .4byte gUnknown_84541F0 - - .byte DECOR_DITTO_DOLL - .string "DITTO DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84550C8 - .4byte gUnknown_84541F2 - - .byte DECOR_SMOOCHUM_DOLL - .string "SMOOCHUM DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84550F3 - .4byte gUnknown_84541F4 - - .byte DECOR_TREECKO_DOLL - .string "TREECKO DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455121 - .4byte gUnknown_84541F6 - - .byte DECOR_TORCHIC_DOLL - .string "TORCHIC DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845514E - .4byte gUnknown_84541F8 - - .byte DECOR_MUDKIP_DOLL - .string "MUDKIP DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845517B - .4byte gUnknown_84541FA - - .byte DECOR_DUSKULL_DOLL - .string "DUSKULL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84551A7 - .4byte gUnknown_84541FC - - .byte DECOR_WYNAUT_DOLL - .string "WYNAUT DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84551D4 - .4byte gUnknown_84541FE - - .byte DECOR_BALTOY_DOLL - .string "BALTOY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455200 - .4byte gUnknown_8454200 - - .byte DECOR_KECLEON_DOLL - .string "KECLEON DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845522C - .4byte gUnknown_8454202 - - .byte DECOR_AZURILL_DOLL - .string "AZURILL DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455259 - .4byte gUnknown_8454204 - - .byte DECOR_SKITTY_DOLL - .string "SKITTY DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455287 - .4byte gUnknown_8454206 - - .byte DECOR_SWABLU_DOLL - .string "SWABLU DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84552B3 - .4byte gUnknown_8454208 - - .byte DECOR_GULPIN_DOLL - .string "GULPIN DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_84552DF - .4byte gUnknown_845420A - - .byte DECOR_LOTAD_DOLL - .string "LOTAD DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_845530B - .4byte gUnknown_845420C - - .byte DECOR_SEEDOT_DOLL - .string "SEEDOT DOLL$", 16 - .byte 0x04, 0x00, 0x06 - .2byte 3000, 0 - .4byte gUnknown_8455336 - .4byte gUnknown_845420E - - .byte DECOR_PIKA_CUSHION - .string "PIKA CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455362 - .4byte gUnknown_8454210 - - .byte DECOR_ROUND_CUSHION - .string "ROUND CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455392 - .4byte gUnknown_8454212 - - .byte DECOR_KISS_CUSHION - .string "KISS CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84553C1 - .4byte gUnknown_8454214 - - .byte DECOR_ZIGZAG_CUSHION - .string "ZIGZAG CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84553F2 - .4byte gUnknown_8454216 - - .byte DECOR_SPIN_CUSHION - .string "SPIN CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455424 - .4byte gUnknown_8454218 - - .byte DECOR_DIAMOND_CUSHION - .string "DIAMOND CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455453 - .4byte gUnknown_845421A - - .byte DECOR_BALL_CUSHION - .string "BALL CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455483 - .4byte gUnknown_845421C - - .byte DECOR_GRASS_CUSHION - .string "GRASS CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84554B0 - .4byte gUnknown_845421E - - .byte DECOR_FIRE_CUSHION - .string "FIRE CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_84554E3 - .4byte gUnknown_8454220 - - .byte DECOR_WATER_CUSHION - .string "WATER CUSHION$", 16 - .byte 0x04, 0x00, 0x07 - .2byte 2000, 0 - .4byte gUnknown_8455515 - .4byte gUnknown_8454222 - - .byte DECOR_SNORLAX_DOLL - .string "SNORLAX DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455548 - .4byte gUnknown_8454224 - - .byte DECOR_RHYDON_DOLL - .string "RHYDON DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455573 - .4byte gUnknown_8454226 - - .byte DECOR_LAPRAS_DOLL - .string "LAPRAS DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845559E - .4byte gUnknown_8454228 - - .byte DECOR_VENUSAUR_DOLL - .string "VENUSAUR DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84555C9 - .4byte gUnknown_845422A - - .byte DECOR_CHARIZARD_DOLL - .string "CHARIZARD DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84555F4 - .4byte gUnknown_845422C - - .byte DECOR_BLASTOISE_DOLL - .string "BLASTOISE DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845561F - .4byte gUnknown_845422E - - .byte DECOR_WAILMER_DOLL - .string "WAILMER DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_845564A - .4byte gUnknown_8454230 - - .byte DECOR_REGIROCK_DOLL - .string "REGIROCK DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_8455675 - .4byte gUnknown_8454232 - - .byte DECOR_REGICE_DOLL - .string "REGICE DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84556A0 - .4byte gUnknown_8454234 - - .byte DECOR_REGISTEEL_DOLL - .string "REGISTEEL DOLL$", 16 - .byte 0x04, 0x05, 0x06 - .2byte 10000, 0 - .4byte gUnknown_84556CB - .4byte gUnknown_8454236 diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a54d8e1a..ec9409782 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1223,10 +1223,10 @@ EventScript_DoInGameTrade:: @ 81A8CD9 faceplayer return -gUnknown_81A8CED:: @ 81A8CED - special sub_810C3A4 +EventScript_VsSeekerChargingDone:: @ 81A8CED + special VsSeekerFreezeObjectsAfterChargeComplete waitstate - special sub_810C444 + special VsSeekerResetObjectMovementAfterChargeComplete releaseall end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index 2f26f58ab..01417f0d1 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -43,7 +43,7 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8165271 lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special DoDeoxysTriangleInteraction waitstate switch VAR_RESULT diff --git a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc index fb7cac74d..fe0d13a8a 100644 --- a/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc +++ b/data/maps/CeladonCity_DepartmentStore_Roof/scripts.inc @@ -3,7 +3,7 @@ CeladonCity_DepartmentStore_Roof_MapScripts:: @ 816BCCC CeladonCity_DepartmentStore_Roof_EventScript_ThirstyGirl:: @ 816BCCD goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer call CeladonCity_DepartmentStore_Roof_EventScript_CheckPlayerHasDrinks diff --git a/data/maps/CeruleanCave_B1F/scripts.inc b/data/maps/CeruleanCave_B1F/scripts.inc index e040978fc..ee0cd370e 100644 --- a/data/maps/CeruleanCave_B1F/scripts.inc +++ b/data/maps/CeruleanCave_B1F/scripts.inc @@ -24,7 +24,7 @@ CeruleanCave_B1F_EventScript_ShowMewtwo:: @ 81624F1 CeruleanCave_B1F_EventScript_Mewtwo:: @ 81624F5 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/CeruleanCity_House4/scripts.inc b/data/maps/CeruleanCity_House4/scripts.inc index b27579cee..5d63feb07 100644 --- a/data/maps/CeruleanCity_House4/scripts.inc +++ b/data/maps/CeruleanCity_House4/scripts.inc @@ -3,7 +3,7 @@ CeruleanCity_House4_MapScripts:: @ 816ACEE CeruleanCity_House4_EventScript_WonderNewsBerryMan:: @ 816ACEF goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock specialvar VAR_0x8004, GetMENewsJisanItemAndState copyvar VAR_0x8008, VAR_RESULT diff --git a/data/maps/FiveIsland_MemorialPillar/scripts.inc b/data/maps/FiveIsland_MemorialPillar/scripts.inc index 7fd2a810d..19115df34 100644 --- a/data/maps/FiveIsland_MemorialPillar/scripts.inc +++ b/data/maps/FiveIsland_MemorialPillar/scripts.inc @@ -33,7 +33,7 @@ FiveIsland_MemorialPillar_EventScript_ReturnedForTM42:: @ 8168A22 FiveIsland_MemorialPillar_EventScript_Memorial:: @ 8168A48 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall goto_if_set FLAG_GOT_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced goto_if_set FLAG_NO_ROOM_FOR_TM42_AT_MEMORIAL_PILLAR, FiveIsland_MemorialPillar_EventScript_MemorialLemonadeAlreadyPlaced diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index 4a5662865..0d70919dd 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_House_MapScripts:: @ 8171EBD FiveIsland_ResortGorgeous_House_EventScript_Selphy:: @ 8171EBE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set SHOWN_REQUESTED_MON, FiveIsland_ResortGorgeous_House_EventScript_JustFulfilledRequest diff --git a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc index 956652eb7..875cb284e 100644 --- a/data/maps/FiveIsland_WaterLabyrinth/scripts.inc +++ b/data/maps/FiveIsland_WaterLabyrinth/scripts.inc @@ -3,7 +3,7 @@ FiveIsland_WaterLabyrinth_MapScripts:: @ 816884D FiveIsland_WaterLabyrinth_EventScript_EggGentleman:: @ 816884E goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_GOT_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_PostEggComment diff --git a/data/maps/FourIsland/scripts.inc b/data/maps/FourIsland/scripts.inc index f8de01374..17f509515 100644 --- a/data/maps/FourIsland/scripts.inc +++ b/data/maps/FourIsland/scripts.inc @@ -73,7 +73,7 @@ FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52 FourIsland_EventScript_DaycareMan:: @ 8167D55 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer special GetDaycareMonNicknames diff --git a/data/maps/MtEmber_Summit/scripts.inc b/data/maps/MtEmber_Summit/scripts.inc index fef05c1ce..815a86ddc 100644 --- a/data/maps/MtEmber_Summit/scripts.inc +++ b/data/maps/MtEmber_Summit/scripts.inc @@ -24,7 +24,7 @@ MtEmber_Summit_EventScript_ShowMoltres:: @ 8163B2F MtEmber_Summit_EventScript_Moltres:: @ 8163B33 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_MOLTRES, 50, ITEM_NONE diff --git a/data/maps/MtMoon_B2F/scripts.inc b/data/maps/MtMoon_B2F/scripts.inc index 515242568..46a308ce9 100644 --- a/data/maps/MtMoon_B2F/scripts.inc +++ b/data/maps/MtMoon_B2F/scripts.inc @@ -63,7 +63,7 @@ MtMoon_B2F_EventScript_DomeFossil:: @ 816071B removeobject LOCALID_DOME_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedDomeFossil, ITEM_DOME_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToHelixFossil waitmovement 0 @@ -95,7 +95,7 @@ MtMoon_B2F_EventScript_HelixFossil:: @ 816077F removeobject LOCALID_HELIX_FOSSIL giveitem_msg MtMoon_B2F_Text_ObtainedHelixFossil, ITEM_HELIX_FOSSIL, 1, MUS_FAN5 closemessage - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc delay 10 applymovement LOCALID_MIGUEL, MtMoon_B2F_Movement_MiguelToDomeFossil waitmovement 0 diff --git a/data/maps/NavelRock_Base/scripts.inc b/data/maps/NavelRock_Base/scripts.inc index 707ad84f7..a47454024 100644 --- a/data/maps/NavelRock_Base/scripts.inc +++ b/data/maps/NavelRock_Base/scripts.inc @@ -30,7 +30,7 @@ NavelRock_Base_EventScript_TryRemoveLugia:: @ 8165120 NavelRock_Base_EventScript_Lugia:: @ 8165134 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer waitse diff --git a/data/maps/NavelRock_Summit/scripts.inc b/data/maps/NavelRock_Summit/scripts.inc index b2983cf47..93e1fcdb1 100644 --- a/data/maps/NavelRock_Summit/scripts.inc +++ b/data/maps/NavelRock_Summit/scripts.inc @@ -33,7 +33,7 @@ NavelRock_Summit_EventScript_TryRemoveHoOh:: @ 8164FE7 NavelRock_Summit_EventScript_HoOh:: @ 8164FFB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lockall setvar VAR_TEMP_1, 1 special SpawnCameraObject diff --git a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc index 67c48c033..524c99272 100644 --- a/data/maps/OneIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/OneIsland_PokemonCenter_1F/scripts.inc @@ -289,7 +289,7 @@ OneIsland_PokemonCenter_1F_EventScript_GiveCelioSapphire:: @ 8170FA5 applymovement LOCALID_CELIO, Movement_FacePlayer waitmovement 0 msgbox OneIsland_PokemonCenter_1F_Text_ManagedToLinkWithHoennThankYou - special sub_810B82C + special SetPostgameFlags setflag FLAG_SYS_CAN_LINK_WITH_RS setflag FLAG_HIDE_CERULEAN_CAVE_GUARD setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 1b98d4cb4..62e9d8a01 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -451,7 +451,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar SIGN_LADY_READY, FALSE special SetWalkingIntoSignVars - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PalletTown_Text_PressStartToOpenMenuCopy normalmsg diff --git a/data/maps/PalletTown_GarysHouse/scripts.inc b/data/maps/PalletTown_GarysHouse/scripts.inc index be4e8dd09..a595182fe 100644 --- a/data/maps/PalletTown_GarysHouse/scripts.inc +++ b/data/maps/PalletTown_GarysHouse/scripts.inc @@ -50,7 +50,7 @@ PalletTown_GarysHouse_EventScript_HeardBattledRival:: @ 8168DAF PalletTown_GarysHouse_EventScript_GroomMon:: @ 8168DB9 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_MASSAGE_COOLDOWN_STEP_COUNTER, 500 goto_if_lt PalletTown_GarysHouse_EventScript_RateMonFriendship msgbox PalletTown_GarysHouse_Text_LikeMeToGroomMon, MSGBOX_YESNO diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index facebea6b..fecfd0b48 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -723,7 +723,7 @@ PalletTown_ProfessorOaksLab_EventScript_ReceiveDexScene:: @ 816961E waitfanfare call EventScript_RestorePrevTextColor setflag FLAG_SYS_POKEDEX_GET - special sub_810B810 + special SetUnlockedPokedexFlags setvar VAR_MAP_SCENE_POKEMON_CENTER_TEALA, 1 msgbox PalletTown_ProfessorOaksLab_Text_OakCatchMonsForDataTakeThese giveitem_msg PalletTown_ProfessorOaksLab_Text_ReceivedFivePokeBalls, ITEM_POKE_BALL, 5 @@ -1000,7 +1000,7 @@ PalletTown_ProfessorOaksLab_EventScript_DontStartNationalDexScene:: @ 81699F9 PalletTown_ProfessorOaksLab_EventScript_CheckIfPlayerNeedsBalls:: @ 81699FB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc goto_if_set FLAG_OAK_SKIP_22_RIVAL_CHECK, PalletTown_ProfessorOaksLab_EventScript_MonsAroundWorldWait goto_if_set FLAG_GOT_POKEBALLS_FROM_OAK_AFTER_22_RIVAL, PalletTown_ProfessorOaksLab_EventScript_PlayerAlreadyGotBalls checkitem ITEM_POKE_BALL, 1 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index c50fcdb2d..5bb795169 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -724,7 +724,7 @@ PewterCity_EventScript_AideGiveRunningShoes:: @ 81662DE waitmessage waitfanfare msgbox PewterCity_Text_SwitchedShoesWithRunningShoes - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox PewterCity_Text_ExplainRunningShoes normalmsg diff --git a/data/maps/PokemonTower_6F/scripts.inc b/data/maps/PokemonTower_6F/scripts.inc index d5236139c..bb20b6ac3 100644 --- a/data/maps/PokemonTower_6F/scripts.inc +++ b/data/maps/PokemonTower_6F/scripts.inc @@ -9,7 +9,7 @@ PokemonTower_6F_EventScript_MarowakGhost:: @ 81634B8 setwildbattle SPECIES_MAROWAK, 30, ITEM_NONE special StartMarowakBattle waitstate - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_RESULT, FALSE @ Set by CB2_EndMarowakBattle goto_if_eq PokemonTower_6F_EventScript_DefeatedMarowakGhost applymovement OBJ_EVENT_ID_PLAYER, PokemonTower_6F_Movement_ForcePlayerUp diff --git a/data/maps/PowerPlant/scripts.inc b/data/maps/PowerPlant/scripts.inc index 3877d5f57..59ba7c6cc 100644 --- a/data/maps/PowerPlant/scripts.inc +++ b/data/maps/PowerPlant/scripts.inc @@ -35,7 +35,7 @@ PowerPlant_EventScript_ShowElectrode2:: @ 81637B4 PowerPlant_EventScript_Zapdos:: @ 81637B8 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ZAPDOS, 50, ITEM_NONE @@ -84,7 +84,7 @@ PowerPlant_EventScript_Electrode1:: @ 816382F setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode1 @@ -113,7 +113,7 @@ PowerPlant_EventScript_Electrode2:: @ 816388D setflag FLAG_SYS_SPECIAL_WILD_BATTLE dowildbattle clearflag FLAG_SYS_SPECIAL_WILD_BATTLE - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc specialvar VAR_RESULT, GetBattleOutcome compare VAR_RESULT, B_OUTCOME_WON goto_if_eq PowerPlant_EventScript_FoughtElectrode2 diff --git a/data/maps/Route12/scripts.inc b/data/maps/Route12/scripts.inc index 9ace7b7b0..af0ab05a4 100644 --- a/data/maps/Route12/scripts.inc +++ b/data/maps/Route12/scripts.inc @@ -15,7 +15,7 @@ Route12_EventScript_Snorlax:: @ 8168014 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route12_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route12_EventScript_DontUsePokeFlute diff --git a/data/maps/Route12_FishingHouse/scripts.inc b/data/maps/Route12_FishingHouse/scripts.inc index 70c8bf48f..646987ddb 100644 --- a/data/maps/Route12_FishingHouse/scripts.inc +++ b/data/maps/Route12_FishingHouse/scripts.inc @@ -31,7 +31,7 @@ Route12_FishingHouse_EventScript_NoRoomForSuperRod:: @ 816FF75 Route12_FishingHouse_EventScript_CheckMagikarpRecord:: @ 816FF7F goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_MAGIKARP specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/Route16/scripts.inc b/data/maps/Route16/scripts.inc index 62d47983f..2096b6a2a 100644 --- a/data/maps/Route16/scripts.inc +++ b/data/maps/Route16/scripts.inc @@ -34,7 +34,7 @@ Route16_EventScript_Snorlax:: @ 8168121 faceplayer goto_if_unset FLAG_GOT_POKE_FLUTE, Route16_EventScript_SnorlaxNoPokeFlute goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc msgbox Text_WantToUsePokeFlute, MSGBOX_YESNO compare VAR_RESULT, NO goto_if_eq Route16_EventScript_DontUsePokeFlute diff --git a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc index a8e74c94b..3659a1cc6 100644 --- a/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc +++ b/data/maps/SaffronCity_CopycatsHouse_2F/scripts.inc @@ -19,7 +19,7 @@ SaffronCity_CopycatsHouse_2F_EventScript_Doll:: @ 816EB70 SaffronCity_CopycatsHouse_2F_EventScript_Copycat:: @ 816EB7B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer checkitem ITEM_POKE_DOLL, 1 diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 3e63ff0ed..47accfa73 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -100,7 +100,7 @@ SeafoamIslands_B4F_EventScript_EnterByFalling:: @ 8163121 call_if_lt SeafoamIslands_B4F_EventScript_RideCurrentFar compare VAR_0x8008, 9 call_if_ge SeafoamIslands_B4F_EventScript_RideCurrentClose - special sub_805D1A8 + special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand setvar VAR_TEMP_1, 0 releaseall end @@ -159,7 +159,7 @@ SeafoamIslands_B4F_Movement_WalkUp:: @ 81631AA SeafoamIslands_B4F_EventScript_Articuno:: @ 81631AC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer setwildbattle SPECIES_ARTICUNO, 50, ITEM_NONE diff --git a/data/maps/SixIsland_WaterPath_House1/scripts.inc b/data/maps/SixIsland_WaterPath_House1/scripts.inc index 9f9b33c7f..ce1520ce0 100644 --- a/data/maps/SixIsland_WaterPath_House1/scripts.inc +++ b/data/maps/SixIsland_WaterPath_House1/scripts.inc @@ -5,7 +5,7 @@ SixIsland_WaterPath_House1_EventScript_Beauty:: @ 817206D lock faceplayer goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc setvar VAR_0x8004, SPECIES_HERACROSS specialvar VAR_RESULT, DoesPlayerPartyContainSpecies compare VAR_RESULT, FALSE diff --git a/data/maps/ThreeIsland_BerryForest/scripts.inc b/data/maps/ThreeIsland_BerryForest/scripts.inc index dab6cb795..faa340706 100644 --- a/data/maps/ThreeIsland_BerryForest/scripts.inc +++ b/data/maps/ThreeIsland_BerryForest/scripts.inc @@ -23,7 +23,7 @@ ThreeIsland_BerryForest_EventScript_Lostelle:: @ 8163C83 waitmoncry setwildbattle SPECIES_HYPNO, 30, ITEM_NONE dowildbattle - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc applymovement 1, Movement_FacePlayer waitmovement 0 msgbox ThreeIsland_BerryForest_Text_ThankYouHaveThis diff --git a/data/maps/TwoIsland_House/scripts.inc b/data/maps/TwoIsland_House/scripts.inc index 20b0a2710..297a82295 100644 --- a/data/maps/TwoIsland_House/scripts.inc +++ b/data/maps/TwoIsland_House/scripts.inc @@ -8,7 +8,7 @@ TwoIsland_House_MapScripts:: @ 8171618 TwoIsland_House_EventScript_MoveManiac:: @ 8171619 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer clearflag HAS_BIG_MUSHROOM diff --git a/data/maps/VermilionCity/scripts.inc b/data/maps/VermilionCity/scripts.inc index 0485cd89e..07abeefd0 100644 --- a/data/maps/VermilionCity/scripts.inc +++ b/data/maps/VermilionCity/scripts.inc @@ -86,7 +86,7 @@ VermilionCity_EventScript_CheckSeagallopPresent:: @ 8166996 VermilionCity_EventScript_ChooseSeagallopDestRainbowPass:: @ 81669BB goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call VermilionCity_EventScript_CheckHasMysticTicket compare VAR_RESULT, TRUE goto_if_eq VermilionCity_EventScript_HasMysticTicket diff --git a/data/maps/VermilionCity_Gym/scripts.inc b/data/maps/VermilionCity_Gym/scripts.inc index 232453543..b7e07a106 100644 --- a/data/maps/VermilionCity_Gym/scripts.inc +++ b/data/maps/VermilionCity_Gym/scripts.inc @@ -142,7 +142,7 @@ VermilionCity_Gym_EventScript_TrashCan15:: @ 816B837 VermilionCity_Gym_EventScript_TrashCan:: @ 816B843 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc copyvar SWITCH1_ID, VAR_TEMP_0 copyvar SWITCH2_ID, VAR_TEMP_1 goto_if_set FLAG_FOUND_BOTH_VERMILION_GYM_SWITCHES, VermilionCity_Gym_EventScript_LocksAlreadyOpen diff --git a/data/maps/ViridianCity/scripts.inc b/data/maps/ViridianCity/scripts.inc index 5309c0493..5eef02b91 100644 --- a/data/maps/ViridianCity/scripts.inc +++ b/data/maps/ViridianCity/scripts.inc @@ -146,7 +146,7 @@ ViridianCity_EventScript_WatchToLearnBasics:: @ 8165A5B ViridianCity_EventScript_TutorialUnused:: @ 8165A65 msgbox ViridianCity_Text_ThatWasEducationalTakeThis goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate release @@ -239,7 +239,7 @@ ViridianCity_EventScript_DoTutorialBattle:: @ 8165B4C msgbox ViridianCity_Text_ShowYouHowToCatchMons closemessage goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc special StartOldManTutorialBattle waitstate lock diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 1053c1028..8bb85bc9f 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -15,7 +15,7 @@ EventScript_HideMysteryGiftMan:: @ 81BB1CE CableClub_EventScript_MysteryGiftMan:: @ 81BB1D2 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc execram @ Unused @@ -111,7 +111,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 81BB2FD CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 81BB315 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -137,7 +137,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 81BB34F CableClub_EventScript_PlayerExitTradeCenter:: @ 81BB367 special CloseLink special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -161,7 +161,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 81BB39C CableClub_EventScript_PlayerExitUnionRoom:: @ 81BB3B4 special HelpSystem_Enable - special sub_811390C + special QuestLog_StartRecordingInputsAfterDeferredEvent setvar VAR_CABLE_CLUB_STATE, 0 textcolor 1 compare VAR_0x8007, 0 @@ -775,7 +775,7 @@ CableClub_EventScript_DoLinkRoomExit:: @ 81BB9FC CableClub_EventScript_UnionRoomAttendant:: @ 81BBA04 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -885,7 +885,7 @@ CableClub_EventScript_DontAskAboutLinking:: @ 81BBB92 CableClub_EventScript_DirectCornerAttendant:: @ 81BBB9C goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements @@ -1195,7 +1195,7 @@ CableClub_OnResume:: @ 81BC05C JoyfulGameCorner_EventScript_InfoMan2:: @ 81BC060 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_DescribeWhichGame @@ -1225,7 +1225,7 @@ CableClub_EventScript_MinigameInfoExit:: @ 81BC0C4 JoyfulGameCorner_EventScript_MinigameAttendant:: @ 81BC0CE goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer message Text_WelcomeCanYouWait diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index 46d4a7c52..ceea4f7bb 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -448,7 +448,7 @@ EventScript_BodySlamTaught:: @ 81C4DE2 TwoIsland_CapeBrink_House_EventScript_StarterTutor:: @ 81C4DEC goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc lock faceplayer goto_if_set FLAG_LEARNED_ALL_MOVES_AT_CAPE_BRINK, CapeBrinkTutor_EventScript_TaughtAllMoves @@ -556,7 +556,7 @@ EventScript_ChooseMoveTutorMon:: @ 81C4F30 EventScript_CanOnlyBeLearnedOnce:: @ 81C4F37 textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_MoveCanOnlyBeLearnedOnce, MSGBOX_YESNO normalmsg diff --git a/data/scripts/pokedex_rating.inc b/data/scripts/pokedex_rating.inc index 79f4ad84c..5cea3a753 100644 --- a/data/scripts/pokedex_rating.inc +++ b/data/scripts/pokedex_rating.inc @@ -1,6 +1,6 @@ PokedexRating_EventScript_RateInPerson:: @ 81A737B goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc call_if_set FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_DexCompleteIntro call_if_unset FLAG_OAK_SAW_DEX_COMPLETION, PokedexRating_EventScript_NormalIntro call PokedexRating_EventScript_Rate diff --git a/data/scripts/questionnaire.inc b/data/scripts/questionnaire.inc index c7636ce22..75508be5c 100644 --- a/data/scripts/questionnaire.inc +++ b/data/scripts/questionnaire.inc @@ -29,7 +29,7 @@ EventScript_EnableMysteryGift:: @ 81A774D msgbox Text_YouKnowThoseWords setflag FLAG_SYS_MYSTERY_GIFT_ENABLED textcolor 3 - special sub_80699BC + special DisableMsgBoxWalkaway signmsg msgbox Text_YouCanAccessMysteryGift normalmsg diff --git a/data/scripts/seagallop.inc b/data/scripts/seagallop.inc index 51fd0c675..ca3b2bc6b 100644 --- a/data/scripts/seagallop.inc +++ b/data/scripts/seagallop.inc @@ -111,7 +111,7 @@ EventScript_SetSail:: @ 81A90DA closemessage delay 20 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc fadescreen FADE_TO_BLACK special DoSeagallopFerryScene waitstate diff --git a/data/scripts/trainer_card.inc b/data/scripts/trainer_card.inc index 993db55bc..0f2171d7c 100644 --- a/data/scripts/trainer_card.inc +++ b/data/scripts/trainer_card.inc @@ -92,7 +92,7 @@ FourIsland_House2_EventScript_StickerManAskForBrag:: @ 81B2994 applymovement 1, Movement_FacePlayer waitmovement 0 goto_if_questlog EventScript_ReleaseEnd - special sub_8112364 + special QuestLog_OnInteractionWithSpecialNpc compare VAR_0x8008, 0 goto_if_eq FourIsland_House2_EventScript_NothingToBragAbout message FourIsland_House2_Text_BragAboutWhatToday diff --git a/data/specials.inc b/data/specials.inc index ab7309c32..c06019606 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -100,7 +100,7 @@ gSpecials:: @ 815FD60 def_special NullFieldSpecial def_special NullFieldSpecial def_special NullFieldSpecial - def_special sub_8081128 + def_special TryContestLinkup def_special Field_AskSaveTheGame def_special DoWateringBerryTreeAnim def_special ShowEasyChatScreen @@ -349,14 +349,14 @@ gSpecials:: @ 815FD60 def_special Dummy_TryEnableBravoTrainerBattleTower def_special DoesPartyHaveEnigmaBerry def_special NullFieldSpecial - def_special sub_810B82C + def_special SetPostgameFlags def_special StartMarowakBattle def_special ForcePlayerOntoBike def_special ListMenu def_special ReturnToListMenu def_special DoPicboxCancel def_special SetVermilionTrashCans - def_special sub_805D1A8 + def_special SeafoamIslandsB4F_CurrentDumpsPlayerOnLand def_special SampleResortGorgeousMonAndReward def_special CheckAddCoins def_special GetDaycarePokemonCount @@ -364,7 +364,7 @@ gSpecials:: @ 815FD60 def_special ForcePlayerToStartSurfing def_special GetStarterSpecies def_special SetSeenMon - def_special sub_810C444 + def_special VsSeekerResetObjectMovementAfterChargeComplete def_special ShouldShowBoxWasFullMessage def_special ChangeBoxPokemonNickname def_special UpdateTrainerCardPhotoIcons @@ -377,8 +377,8 @@ gSpecials:: @ 815FD60 def_special ShowWirelessCommunicationScreen def_special EnableNationalPokedex def_special SetWalkingIntoSignVars - def_special sub_80699BC - def_special sub_810C3A4 + def_special DisableMsgBoxWalkaway + def_special VsSeekerFreezeObjectsAfterChargeComplete def_special SetFlavorTextFlagFromSpecialVars def_special UpdatePickStateFromSpecialVar8005 def_special OverworldWhiteOutGetMoneyLoss @@ -393,14 +393,14 @@ gSpecials:: @ 815FD60 def_special BackupHelpContext def_special RestoreHelpContext def_special ValidateReceivedWonderCard - def_special sub_810B810 + def_special SetUnlockedPokedexFlags def_special InitUnionRoom def_special BufferUnionRoomPlayerName - def_special sub_811390C + def_special QuestLog_StartRecordingInputsAfterDeferredEvent def_special GetMartClerkObjectId def_special BattleCardAction def_special GetQuestLogState - def_special sub_8112364 + def_special QuestLog_OnInteractionWithSpecialNpc def_special GetMENewsJisanItemAndState def_special GetPCBoxToSendMon def_special OpenMuseumFossilPic @@ -418,7 +418,7 @@ gSpecials:: @ 815FD60 def_special DaisyMassageServices def_special HelpSystem_Disable def_special HelpSystem_Enable - def_special sub_810B82C + def_special SetPostgameFlags def_special CheckHasAtLeastOneBerry def_special DisplayBerryPowderVendorMenu def_special RemoveBerryPowderVendorMenu diff --git a/data/text/decoration_descriptions.inc b/data/text/decoration_descriptions.inc deleted file mode 100644 index 358070cb1..000000000 --- a/data/text/decoration_descriptions.inc +++ /dev/null @@ -1,573 +0,0 @@ -gUnknown_8454238:: @ 8454238 - .string "A small desk built\n" - .string "for one.$" - -gUnknown_8454254:: @ 8454254 - .string "A small desk built in\n" - .string "the shape of a POKé\n" - .string "BALL.$" - -gUnknown_8454284:: @ 8454284 - .string "A large desk made\n" - .string "of steel. Put some\n" - .string "decorations on it.$" - -gUnknown_84542BC:: @ 84542BC - .string "A large desk made\n" - .string "of wood. Put some\n" - .string "decorations on it.$" - -gUnknown_84542F3:: @ 84542F3 - .string "A large desk made\n" - .string "of leaves. Put some\n" - .string "decorations on it.$" - -gUnknown_845432C:: @ 845432C - .string "A huge desk made\n" - .string "of glass. Holds lots\n" - .string "of decorations.$" - -gUnknown_8454362:: @ 8454362 - .string "A huge desk made\n" - .string "of brick. Holds lots\n" - .string "of decorations.$" - -gUnknown_8454398:: @ 8454398 - .string "A huge desk made\n" - .string "of logs. Put lots of\n" - .string "decorations on it.$" - -gUnknown_84543D1:: @ 84543D1 - .string "A huge desk made\n" - .string "of rocks. Holds\n" - .string "many decorations.$" - -gUnknown_8454404:: @ 8454404 - .string "A small chair made\n" - .string "for one.$" - -gUnknown_8454420:: @ 8454420 - .string "A small chair built\n" - .string "in the shape of a\n" - .string "POKé BALL.$" - -gUnknown_8454451:: @ 8454451 - .string "A small chair made\n" - .string "of steel.$" - -gUnknown_845446E:: @ 845446E - .string "A small chair made\n" - .string "of glass.$" - -gUnknown_845448B:: @ 845448B - .string "A small chair made\n" - .string "of leaves.$" - -gUnknown_84544A9:: @ 84544A9 - .string "A small chair made\n" - .string "of wood.$" - -gUnknown_84544C5:: @ 84544C5 - .string "A small chair made\n" - .string "of brick.$" - -gUnknown_84544E2:: @ 84544E2 - .string "A small chair made\n" - .string "of logs.$" - -gUnknown_84544FE:: @ 84544FE - .string "A small chair made\n" - .string "of rock.$" - -gUnknown_845451A:: @ 845451A - .string "A vivid red potted\n" - .string "plant.$" - -gUnknown_8454534:: @ 8454534 - .string "A flowering tropical\n" - .string "plant in a pot.$" - -gUnknown_8454559:: @ 8454559 - .string "A pot of cute\n" - .string "flowers.$" - -gUnknown_8454570:: @ 8454570 - .string "A large pot with\n" - .string "many colorful\n" - .string "flowers.$" - -gUnknown_8454598:: @ 8454598 - .string "A large, umbrella-\n" - .string "shaped plant in a\n" - .string "big pot.$" - -gUnknown_84545C6:: @ 84545C6 - .string "A large, impressive\n" - .string "plant in a big pot.$" - -gUnknown_84545EE:: @ 84545EE - .string "A red-colored brick.\n" - .string "Decorations can be\n" - .string "placed on top.$" - -gUnknown_8454625:: @ 8454625 - .string "A yellow-colored\n" - .string "brick. Put some\n" - .string "decorations on top.$" - -gUnknown_845465A:: @ 845465A - .string "A blue-colored\n" - .string "brick. Put some\n" - .string "decorations on top.$" - -gUnknown_845468D:: @ 845468D - .string "A red balloon filled\n" - .string "with water. Bursts\n" - .string "if stepped on.$" - -gUnknown_84546C4:: @ 84546C4 - .string "A blue balloon filled\n" - .string "with water. Bursts\n" - .string "if stepped on.$" - -gUnknown_84546FC:: @ 84546FC - .string "A yellow balloon\n" - .string "filled with water.\n" - .string "Pops if stepped on.$" - -gUnknown_8454734:: @ 8454734 - .string "A large red tent.\n" - .string "You can hide inside\n" - .string "it.$" - -gUnknown_845475E:: @ 845475E - .string "A large blue tent.\n" - .string "You can hide inside\n" - .string "it.$" - -gUnknown_8454789:: @ 8454789 - .string "Place over a hole to\n" - .string "cross to the other\n" - .string "side.$" - -gUnknown_84547B7:: @ 84547B7 - .string "Use to slide down\n" - .string "from the platform.$" - -gUnknown_84547DC:: @ 84547DC - .string "A small fence that\n" - .string "blocks passage.$" - -gUnknown_84547FF:: @ 84547FF - .string "A small fence that\n" - .string "blocks passage.$" - -gUnknown_8454822:: @ 8454822 - .string "An old large tire.\n" - .string "Decorations can be\n" - .string "placed on top.$" - -gUnknown_8454857:: @ 8454857 - .string "A large pedestal\n" - .string "with steps.$" - -gUnknown_8454874:: @ 8454874 - .string "A large ball of mud.\n" - .string "Crumbles if stepped\n" - .string "on.$" - -gUnknown_84548A1:: @ 84548A1 - .string "A weird door that\n" - .string "people can walk\n" - .string "right through.$" - -gUnknown_84548D2:: @ 84548D2 - .string "An ornament made\n" - .string "of sand. Crumbles if\n" - .string "touched.$" - -gUnknown_8454901:: @ 8454901 - .string "Awarded for 50\n" - .string "straight wins at\n" - .string "the BATTLE TOWER.$" - -gUnknown_8454933:: @ 8454933 - .string "Awarded for 100\n" - .string "straight wins at\n" - .string "the BATTLE TOWER.$" - -gUnknown_8454966:: @ 8454966 - .string "A glass replica of\n" - .string "a famous sculpture\n" - .string "at the ART MUSEUM.$" - -gUnknown_845499F:: @ 845499F - .string "A small, gray-\n" - .string "colored toy TV.$" - -gUnknown_84549BE:: @ 84549BE - .string "A toy TV modeled\n" - .string "in the image of a\n" - .string "SEEDOT.$" - -gUnknown_84549E9:: @ 84549E9 - .string "A toy TV modeled\n" - .string "in the image of a\n" - .string "SKITTY.$" - -gUnknown_8454A14:: @ 8454A14 - .string "An odd mat that\n" - .string "glitters if stepped\n" - .string "on.$" - -gUnknown_8454A3C:: @ 8454A3C - .string "A trick mat that\n" - .string "jumps when it is\n" - .string "stepped on.$" - -gUnknown_8454A6A:: @ 8454A6A - .string "A trick mat that\n" - .string "spins around when\n" - .string "stepped on.$" - -gUnknown_8454A99:: @ 8454A99 - .string "A mat that plays\n" - .string "a low C note when\n" - .string "stepped on.$" - -gUnknown_8454AC8:: @ 8454AC8 - .string "A mat that plays\n" - .string "a D note when\n" - .string "stepped on.$" - -gUnknown_8454AF3:: @ 8454AF3 - .string "A mat that plays\n" - .string "an E note when\n" - .string "stepped on.$" - -gUnknown_8454B1F:: @ 8454B1F - .string "A mat that plays\n" - .string "an F note when\n" - .string "stepped on.$" - -gUnknown_8454B4B:: @ 8454B4B - .string "A mat that plays\n" - .string "a G note when\n" - .string "stepped on.$" - -gUnknown_8454B76:: @ 8454B76 - .string "A mat that plays\n" - .string "an A note when\n" - .string "stepped on.$" - -gUnknown_8454BA2:: @ 8454BA2 - .string "A mat that plays\n" - .string "a B note when\n" - .string "stepped on.$" - -gUnknown_8454BCD:: @ 8454BCD - .string "A mat that plays\n" - .string "a high C note when\n" - .string "stepped on.$" - -gUnknown_8454BFD:: @ 8454BFD - .string "A mat designed with\n" - .string "a SURF image.\n" - .string "Put items on top.$" - -gUnknown_8454C31:: @ 8454C31 - .string "A mat designed with\n" - .string "a THUNDER image.\n" - .string "Put items on top.$" - -gUnknown_8454C68:: @ 8454C68 - .string "A mat designed with\n" - .string "a FIRE BLAST image.\n" - .string "Put items on top.$" - -gUnknown_8454CA2:: @ 8454CA2 - .string "A mat with a POWDER\n" - .string "SNOW image design.\n" - .string "Put items on top.$" - -gUnknown_8454CDB:: @ 8454CDB - .string "A mat designed with\n" - .string "an ATTRACT image.\n" - .string "Put items on top.$" - -gUnknown_8454D13:: @ 8454D13 - .string "A mat designed with\n" - .string "a FISSURE image.\n" - .string "Put items on top.$" - -gUnknown_8454D4A:: @ 8454D4A - .string "A mat designed with\n" - .string "a SPIKES image.\n" - .string "Put items on top.$" - -gUnknown_8454D80:: @ 8454D80 - .string "A small poster\n" - .string "printed with POKé\n" - .string "BALLS.$" - -gUnknown_8454DA8:: @ 8454DA8 - .string "A small poster with\n" - .string "a TREECKO print.$" - -gUnknown_8454DCD:: @ 8454DCD - .string "A small poster with\n" - .string "a TORCHIC print.$" - -gUnknown_8454DF2:: @ 8454DF2 - .string "A small poster with\n" - .string "a MUDKIP print.$" - -gUnknown_8454E16:: @ 8454E16 - .string "A small poster with\n" - .string "an AZURILL print.$" - -gUnknown_8454E3C:: @ 8454E3C - .string "A large poster with\n" - .string "a PIKACHU and\n" - .string "PICHU print.$" - -gUnknown_8454E6B:: @ 8454E6B - .string "A large poster with\n" - .string "a SEVIPER print.$" - -gUnknown_8454E90:: @ 8454E90 - .string "A large poster with\n" - .string "a RELICANTH print.$" - -gUnknown_8454EB7:: @ 8454EB7 - .string "A large poster with\n" - .string "a WINGULL print.$" - -gUnknown_8454EDC:: @ 8454EDC - .string "A large poster with\n" - .string "a SMOOCHUM print.$" - -gUnknown_8454F02:: @ 8454F02 - .string "A PICHU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F2D:: @ 8454F2D - .string "A PIKACHU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F5A:: @ 8454F5A - .string "A MARILL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454F86:: @ 8454F86 - .string "A TOGEPI doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454FB2:: @ 8454FB2 - .string "A CYNDAQUIL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8454FE1:: @ 8454FE1 - .string "A CHIKORITA doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455010:: @ 8455010 - .string "A TOTODILE doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845503E:: @ 845503E - .string "A JIGGLYPUFF doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845506E:: @ 845506E - .string "A MEOWTH doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845509A:: @ 845509A - .string "A CLEFAIRY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84550C8:: @ 84550C8 - .string "A DITTO doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84550F3:: @ 84550F3 - .string "A SMOOCHUM doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455121:: @ 8455121 - .string "A TREECKO doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845514E:: @ 845514E - .string "A TORCHIC doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845517B:: @ 845517B - .string "A MUDKIP doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84551A7:: @ 84551A7 - .string "A DUSKULL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84551D4:: @ 84551D4 - .string "A WYNAUT doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455200:: @ 8455200 - .string "A BALTOY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845522C:: @ 845522C - .string "A KECLEON doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455259:: @ 8455259 - .string "An AZURILL doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455287:: @ 8455287 - .string "A SKITTY doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84552B3:: @ 84552B3 - .string "A SWABLU doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84552DF:: @ 84552DF - .string "A GULPIN doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845530B:: @ 845530B - .string "A LOTAD doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455336:: @ 8455336 - .string "A SEEDOT doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455362:: @ 8455362 - .string "A PIKACHU cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455392:: @ 8455392 - .string "A MARILL cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84553C1:: @ 84553C1 - .string "A SMOOCHUM\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_84553F2:: @ 84553F2 - .string "A ZIGZAGOON\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455424:: @ 8455424 - .string "A SPINDA cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455453:: @ 8455453 - .string "A SABLEYE cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455483:: @ 8455483 - .string "A BALL cushion.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84554B0:: @ 84554B0 - .string "A grass-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_84554E3:: @ 84554E3 - .string "A fire-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455515:: @ 8455515 - .string "A water-mark\n" - .string "cushion. Place it on\n" - .string "a mat or a desk.$" - -gUnknown_8455548:: @ 8455548 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455573:: @ 8455573 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845559E:: @ 845559E - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84555C9:: @ 84555C9 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84555F4:: @ 84555F4 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845561F:: @ 845561F - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_845564A:: @ 845564A - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_8455675:: @ 8455675 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84556A0:: @ 84556A0 - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" - -gUnknown_84556CB:: @ 84556CB - .string "A large doll.\n" - .string "Place it on a mat\n" - .string "or a desk.$" |