diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_anim_80CA710.s | 2 | ||||
| -rw-r--r-- | data/battle_anim_scripts.s | 153 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 84 | ||||
| -rw-r--r-- | data/battle_scripts_2.s | 8 |
4 files changed, 124 insertions, 123 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s index 72ed3cffa..24881ab7c 100644 --- a/data/battle_anim_80CA710.s +++ b/data/battle_anim_80CA710.s @@ -1000,7 +1000,7 @@ gSpriteAnimTable_83D6E94:: @ 83D6E94 .4byte gSpriteAnim_83D6E80 .align 2 -gBattleAnimSpriteTemplate_83D6E98:: @ 83D6E98 +gBattleAnimSpriteTemplate_EndureFlame:: @ 83D6E98 spr_template 10184, 10184, gOamData_837DF74, gSpriteAnimTable_83D6E94, NULL, gDummySpriteAffineAnimTable, sub_80CDF0C .align 2 diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 74205e66c..d38bfaf60 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -382,40 +382,40 @@ gBattleAnims_StatusConditions:: @ 81C76F8 .4byte StatusCondition_Nightmare .align 2 -gBattleAnims_Unknown1:: @ 81C771C - .4byte Unknown_81D63B4 - .4byte Unknown_81D63EA - .4byte Unknown_81D63F3 - .4byte Unknown_81D6430 - .4byte Unknown_81D6438 - .4byte Unknown_81D647E - .4byte Unknown_81D6489 - .4byte Unknown_81D661C - .4byte Unknown_81D6690 - .4byte Unknown_81D676E - .4byte Unknown_Weather_Rain - .4byte Unknown_Weather_HarshSunlight - .4byte Unknown_Weather_Sandstorm - .4byte Unknown_Weather_Hail - .4byte Unknown_81D6813 - .4byte Unknown_81D6821 - .4byte Unknown_81D6852 - .4byte Unknown_81D6877 - .4byte Unknown_81D68D5 - .4byte Unknown_81D6934 - .4byte Unknown_81D69F9 - .4byte Unknown_81D6A39 - .4byte Unknown_81D6A7C +gBattleAnims_General:: @ 81C771C + .4byte General_CastformChange + .4byte General_StatsChange + .4byte General_SubstituteFade + .4byte General_SubstituteAppear + .4byte General_PokeblockThrow + .4byte General_ItemKnockoff + .4byte General_TurnTrap + .4byte General_ItemEffect + .4byte General_SmokeballEscape + .4byte General_HangedOn + .4byte General_Rain + .4byte General_Sun + .4byte General_Sandstorm + .4byte General_Hail + .4byte General_LeechSeedDrain + .4byte General_MonHit + .4byte General_ItemSteal + .4byte General_SnatchMove + .4byte General_FutureSightHit + .4byte General_DoomDesireHit + .4byte General_FocusPunchSetUp + .4byte General_IngrainHeal + .4byte General_WishHeal .align 2 gBattleAnims_Unknown2:: @ 81C7778 - .4byte Unknown_81D6AF6 - .4byte Unknown_81D6B17 - .4byte Unknown_81D6B28 - .4byte Unknown_81D6B39 - .4byte Unknown_81D6B8D - .4byte Unknown_81D6BA6 - .4byte Unknown_81D6BB0 + .4byte Special_LevelUp + .4byte Special_SwitchOutPlayerMon + .4byte Special_SwitchOutOpponentMon + .4byte Special_BallThrow + .4byte Special_SafariBallThrow + .4byte Special_SubstituteToMon + .4byte Special_MonToSubstitute Move_POUND: @ 81C7794 loadsprite 10135 @@ -3182,25 +3182,26 @@ Move_DESTINY_BOND: @ 81CBA2C Move_ENDURE: @ 81CBA87 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -_81CBAC7: - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -24, 26, 2 + +EndureFlamesAnim: + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -24, 26, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 14, 28, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 14, 28, 1 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -5, 10, 2 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -5, 10, 2 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, 28, 26, 3 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, 28, 26, 3 pause 4 - sprite gBattleAnimSpriteTemplate_83D6E98, 2, 0, -12, 0, 1 + sprite gBattleAnimSpriteTemplate_EndureFlame, 2, 0, -12, 0, 1 ret Move_CHARM: @ 81CBB1B @@ -7348,13 +7349,13 @@ Move_LICK: @ 81D1B32 Move_FOCUS_ENERGY: @ 81D1B59 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 32767 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end @@ -10287,7 +10288,7 @@ StatusCondition_Nightmare: @ 81D638F clearmonbg 3 end -Unknown_81D63B4: @ 81D63B4 +General_CastformChange: @ 81D63B4 createtask c3_80DFBE4, 2 jumpvareq 7, 1, _81D63E0 jump _81D63C8 @@ -10303,12 +10304,12 @@ _81D63E0: createtask sub_812DB58, 2, 1 end -Unknown_81D63EA: @ 81D63EA +General_StatsChange: @ 81D63EA createtask sub_807BB88, 5 wait end -Unknown_81D63F3: @ 81D63F3 +General_SubstituteFade: @ 81D63F3 monbg 0 createtask sub_81416C4, 5 createtask sub_80E2A38, 10, 2, 0, 0, 16, 32767 @@ -10321,11 +10322,11 @@ Unknown_81D63F3: @ 81D63F3 createtask sub_814151C, 2, 1 end -Unknown_81D6430: @ 81D6430 +General_SubstituteAppear: @ 81D6430 createtask sub_81312E4, 2 end -Unknown_81D6438: @ 81D6438 +General_PokeblockThrow: @ 81D6438 createtask sub_8141D7C, 2 createtask sub_8141BD4, 2 pause 0 @@ -10338,12 +10339,12 @@ Unknown_81D6438: @ 81D6438 createtask sub_8141C08, 2 end -Unknown_81D647E: @ 81D647E +General_ItemKnockoff: @ 81D647E loadsprite 10224 sprite gBattleAnimSpriteTemplate_83D6734, 130 end -Unknown_81D6489: @ 81D6489 +General_TurnTrap: @ 81D6489 createtask sub_8141DAC, 5 jumpvareq 0, 1, _81D64FD jumpvareq 0, 2, _81D6522 @@ -10418,7 +10419,7 @@ _81D65D3: stopsound end -Unknown_81D661C: @ 81D661C +General_ItemEffect: @ 81D661C loadsprite 10203 loadsprite 10049 pause 0 @@ -10440,7 +10441,7 @@ Unknown_81D661C: @ 81D661C wait end -Unknown_81D6690: @ 81D6690 +General_SmokeballEscape: @ 81D6690 loadsprite 10242 monbg 0 setalpha 12, 4 @@ -10479,7 +10480,7 @@ Unknown_81D6690: @ 81D6690 blendoff end -Unknown_81D676E: @ 81D676E +General_HangedOn: @ 81D676E sprite gBattleAnimSpriteTemplate_83DB3C4, 0, 2, 7, 0, 9, 31 panse_19 SE_W082, 192 createtask sub_812FC68, 5, 30, 128, 0, 1, 2, 0, 1 @@ -10490,7 +10491,7 @@ Unknown_81D676E: @ 81D676E sprite gBattleAnimSpriteTemplate_83C1FE0, 0, 0, 0, 15 end -Unknown_Weather_Rain: @ 81D67BB +General_Rain: @ 81D67BB loadsprite 10115 panse_19 SE_W240, 192 createtask sub_80E2A38, 10, 1921, 2, 0, 4, 0 @@ -10503,21 +10504,21 @@ Unknown_Weather_Rain: @ 81D67BB wait end -Unknown_Weather_HarshSunlight: @ 81D6804 +General_Sun: @ 81D6804 jump Move_SUNNY_DAY -Unknown_Weather_Sandstorm: @ 81D6809 +General_Sandstorm: @ 81D6809 jump Move_SANDSTORM -Unknown_Weather_Hail: @ 81D680E +General_Hail: @ 81D680E jump Move_HAIL -Unknown_81D6813: @ 81D6813 +General_LeechSeedDrain: @ 81D6813 createtask sub_8141E10, 5 pause 0 jump Move_ABSORB -Unknown_81D6821: @ 81D6821 +General_MonHit: @ 81D6821 loadsprite 10135 monbg 1 setalpha 12, 8 @@ -10529,7 +10530,7 @@ Unknown_81D6821: @ 81D6821 blendoff end -Unknown_81D6852: @ 81D6852 +General_ItemSteal: @ 81D6852 loadsprite 10224 createtask sub_80E42D0, 2 createtask sub_8141808, 2 @@ -10537,7 +10538,7 @@ Unknown_81D6852: @ 81D6852 sprite gBattleAnimSpriteTemplate_83D677C, 2, 0, -5, 10, 2, -1 end -Unknown_81D6877: @ 81D6877 +General_SnatchMove: @ 81D6877 loadsprite 10224 createtask sub_80E4234, 2 call Unknown_81D6AB6 @@ -10560,7 +10561,7 @@ _81D68C5: createtask sub_8131FFC, 2 jump _81D68AE -Unknown_81D68D5: @ 81D68D5 +General_FutureSightHit: @ 81D68D5 createtask sub_80E42B0, 2 monbg 3 panse_19 SE_W060, 192 @@ -10580,7 +10581,7 @@ Unknown_81D68D5: @ 81D68D5 call Unknown_81D61F3 end -Unknown_81D6934: @ 81D6934 +General_DoomDesireHit: @ 81D6934 createtask sub_80E42B0, 2 loadsprite 10198 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 16, 32767 @@ -10614,20 +10615,20 @@ Unknown_81D6934: @ 81D6934 wait end -Unknown_81D69F9: @ 81D69F9 +General_FocusPunchSetUp: @ 81D69F9 loadsprite 10184 panse_19 SE_W082, 192 - call _81CBAC7 + call EndureFlamesAnim pause 8 createtask sub_80E1F8C, 2, 2, 2, 2, 0, 11, 31 createtask sub_80A7FA0, 2, 0, 1, 0, 32, 1 - call _81CBAC7 + call EndureFlamesAnim pause 8 - call _81CBAC7 + call EndureFlamesAnim wait end -Unknown_81D6A39: @ 81D6A39 +General_IngrainHeal: @ 81D6A39 loadsprite 10147 loadsprite 10031 monbg 3 @@ -10646,7 +10647,7 @@ Unknown_81D6A39: @ 81D6A39 blendoff end -Unknown_81D6A7C: @ 81D6A7C +General_WishHeal: @ 81D6A7C loadsprite 10031 loadsprite 10049 sprite gBattleAnimSpriteTemplate_83DB3C4, 2, 1, 3, 0, 10, 0 @@ -10681,7 +10682,7 @@ _81D6AE7: wait jump _81D6AE5 -Unknown_81D6AF6: @ 81D6AF6 +Special_LevelUp: @ 81D6AF6 panse_19 SE_EXPMAX, 0 createtask sub_813F4EC, 2 pause 0 @@ -10690,19 +10691,19 @@ Unknown_81D6AF6: @ 81D6AF6 createtask sub_813F5E8, 2 end -Unknown_81D6B17: @ 81D6B17 +Special_SwitchOutPlayerMon: @ 81D6B17 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B28: @ 81D6B28 +Special_SwitchOutOpponentMon: @ 81D6B28 createtask sub_813F844, 2 pause 10 createtask sub_813F798, 2 end -Unknown_81D6B39: @ 81D6B39 +Special_BallThrow: @ 81D6B39 createtask sub_813F990, 2 pause 0 panse_19 SE_NAGERU, 0 @@ -10726,7 +10727,7 @@ _81D6B65: blendoff jump _81D6B5C -Unknown_81D6B8D: @ 81D6B8D +Special_SafariBallThrow: @ 81D6B8D createtask sub_813F990, 2 pause 0 createtask sub_813FBB8, 2 @@ -10734,10 +10735,10 @@ Unknown_81D6B8D: @ 81D6B8D createtask sub_813F9B8, 2 end -Unknown_81D6BA6: @ 81D6BA6 +Special_SubstituteToMon: @ 81D6BA6 createtask sub_814151C, 2, 1 end -Unknown_81D6BB0: @ 81D6BB0 +Special_MonToSubstitute: @ 81D6BB0 createtask sub_814151C, 2, 0 end diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 83bacd844..45bf5cc95 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -535,7 +535,7 @@ BattleScript_1D71CE: @ 81D71CE BattleScript_1D71D0: @ 81D71D0 atk47 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D71D8: @ 81D71D8 printfromtable BattleTextList_401570 @@ -545,7 +545,7 @@ BattleScript_1D71E0: @ 81D71E0 jump BattleScript_EndTurn BattleScript_StatUp:: @ 81D71E5 - playanimation 2, 1, gSharedMem + 0x160A4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 return @@ -585,7 +585,7 @@ BattleScript_1D725F: @ 81D725F attackanimation waitanimation atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 BattleScript_1D7269: @ 81D7269 printfromtable BattleTextList_40157C @@ -595,7 +595,7 @@ BattleScript_1D7271: @ 81D7271 jump BattleScript_EndTurn BattleScript_StatDown:: @ 81D7276 - playanimation 2, 1, gSharedMem + 0x160A4 + playanimation 2, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_40157C waitmessage 64 return @@ -1694,7 +1694,7 @@ MoveEffect_Swagger: @ 81D7EA2 statbuffchange 1, BattleScript_1D7EE5 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D7EE5 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -1898,7 +1898,7 @@ MoveEffect_SkullBash: @ 81D8085 statbuffchange 65, BattleScript_1D80CF jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D80CF atk47 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -2264,7 +2264,7 @@ MoveEffect_Flatter: @ 81D84B1 statbuffchange 1, BattleScript_1D84F4 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D84F4 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printfromtable BattleTextList_401570 waitmessage 64 @@ -3081,7 +3081,7 @@ gUnknown_081D8E0D:: @ 81D8E0D end2 gUnknown_081D8E14:: @ 81D8E14 - playanimation USER, 8, 0x0 + playanimation USER, B_ANIM_SMOKEBALL_ESCAPE, 0x0 printstring BATTLE_TEXT_FledUsingItem waitmessage 64 end2 @@ -3238,7 +3238,7 @@ gUnknown_081D8F62:: @ 81D8F62 printfromtable BattleTextList_401534 waitmessage 64 jumpifbyte 0, gUnknown_02024D1F + 0x4, 2, BattleScript_1D8F7C - playanimation USER, 10, 0x0 + playanimation USER, B_ANIM_RAIN_CONTINUES, 0x0 BattleScript_1D8F7C: @ 81D8F7C end2 @@ -3280,7 +3280,7 @@ gUnknown_081D8FFF:: @ 81D8FFF gUnknown_081D9008:: @ 81D9008 printstring BATTLE_TEXT_SunStrong waitmessage 64 - playanimation USER, 11, 0x0 + playanimation USER, B_ANIM_SUN_CONTINUES, 0x0 end2 gUnknown_081D9016:: @ 81D9016 @@ -3312,7 +3312,7 @@ gUnknown_081D9041:: @ 81D9041 end2 BattleScript_LeechSeedTurnDrain:: @ 81D904B - playanimation USER, 14, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_LEECH_SEED_DRAIN, gSharedMem + 0x160A4 orword gHitMarker, 0x100100 graphicalhpupdate USER datahpupdate USER @@ -3559,11 +3559,11 @@ BattleScript_1D92F4: @ 81D92F4 BattleScript_1D92FB: @ 81D92FB atk8 jumpifbyte 1, gUnknown_02024D1F + 0x4, 0, BattleScript_1D9313 - playanimation USER, 18, 0x0 + playanimation USER, B_ANIM_FUTURE_SIGHT_HIT, 0x0 jump BattleScript_1D931A BattleScript_1D9313: @ 81D9313 - playanimation USER, 19, 0x0 + playanimation USER, B_ANIM_DOOM_DESIRE_HIT, 0x0 BattleScript_1D931A: @ 81D931A missmessage @@ -3626,7 +3626,7 @@ BattleScript_MoveUsedIsTaunted:: @ 81D938F BattleScript_WishComesTrue:: @ 81D939A atkd4 1, BattleScript_1D93C1 - playanimation TARGET, 22, 0x0 + playanimation TARGET, B_ANIM_WISH_HEAL, 0x0 printstring BATTLE_TEXT_WishTrue waitmessage 64 orword gHitMarker, 0x100 @@ -3645,7 +3645,7 @@ BattleScript_1D93C1: @ 81D93C1 end2 BattleScript_IngrainTurnHeal:: @ 81D93D1 - playanimation USER, 21, 0x0 + playanimation USER, B_ANIM_INGRAIN_HEAL, 0x0 printstring BATTLE_TEXT_AbsorbNutrients waitmessage 64 orword gHitMarker, 0x100 @@ -3681,7 +3681,7 @@ BattleScript_1D944A: @ 81D944A return BattleScript_KnockedOff:: @ 81D944B - playanimation TARGET, 5, 0x0 + playanimation TARGET, B_ANIM_ITEM_KNOCKOFF, 0x0 printstring BATTLE_TEXT_KnockedOffItem waitmessage 64 return @@ -3714,7 +3714,7 @@ BattleScript_SnatchedMove:: @ 81D9487 attackstring ppreduce snatchmove - playanimation TARGET, 17, 0x0 + playanimation TARGET, B_ANIM_SNATCH_MOVE, 0x0 printstring BATTLE_TEXT_SnatchedMove waitmessage 64 orword gHitMarker, 0x800c00 @@ -3743,10 +3743,10 @@ BattleScript_SAtkDown2:: @ 81D94B0 BattleScript_1D94D9: @ 81D94D9 return -gUnknown_081D94DA:: @ 81D94DA +BattleScript_FocusPunchSetUp:: @ 81D94DA printstring BATTLE_TEXT_Terminator2 waitmessage 1 - playanimation USER, 20, 0x0 + playanimation USER, B_ANIM_FOCUS_PUNCH_SET_UP, 0x0 printstring BATTLE_TEXT_TightenFocus waitmessage 64 end2 @@ -3866,7 +3866,7 @@ gUnknown_081D95DB:: @ 81D95DB return BattleScript_WrapTurnDmg:: @ 81D95E2 - playanimation USER, 6, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_TURN_TRAP, gSharedMem + 0x160A4 printstring BATTLE_TEXT_HurtBy waitmessage 64 jump BattleScript_1D9520 @@ -3991,7 +3991,7 @@ BattleScript_1D96F5: @ 81D96F5 return BattleScript_ItemSteal:: @ 81D96F6 - playanimation TARGET, 16, 0x0 + playanimation TARGET, B_ANIM_ITEM_STEAL, 0x0 printstring BATTLE_TEXT_StoleSomething waitmessage 64 return @@ -4000,12 +4000,12 @@ BattleScript_DrizzleActivates:: @ 81D9704 pause 32 printstring BATTLE_TEXT_RainMade waitstateatk - playanimation 7, 10, 0x0 + playanimation 7, B_ANIM_RAIN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 BattleScript_SpeedBoostActivates:: @ 81D9718 - playanimation USER, 1, gSharedMem + 0x160A4 + playanimation USER, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_SpeedRisen waitmessage 64 end3 @@ -4028,7 +4028,7 @@ BattleScript_SandstreamActivates:: @ 81D9744 pause 32 printstring BATTLE_TEXT_WhipSandstorm waitstateatk - playanimation 7, 12, 0x0 + playanimation 7, B_ANIM_SANDSTORM_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4078,7 +4078,7 @@ BattleScript_1D97A1: @ 81D97A1 statbuffchange 33, BattleScript_1D97E4 jumpifbyte 2, gUnknown_02024D1F + 0x4, 1, BattleScript_1D97E4 atk47 - playanimation TARGET, 1, gSharedMem + 0x160A4 + playanimation TARGET, B_ANIM_STATS_CHANGE, gSharedMem + 0x160A4 printstring BATTLE_TEXT_CutsAttack waitmessage 64 @@ -4099,7 +4099,7 @@ BattleScript_DroughtActivates:: @ 81D97FE pause 32 printstring BATTLE_TEXT_SunIntensified waitstateatk - playanimation 7, 11, 0x0 + playanimation 7, B_ANIM_SUN_CONTINUES, 0x0 callatk BattleScript_1D9761 end3 @@ -4297,7 +4297,7 @@ gUnknown_081D99A0:: @ 81D99A0 jump BattleScript_1D95AC BattleScript_SubstituteFade:: @ 81D99AB - playanimation TARGET, 2, 0x0 + playanimation TARGET, B_ANIM_SUBSTITUTE_FADE, 0x0 printstring BATTLE_TEXT_SubFaded return @@ -4306,7 +4306,7 @@ BattleScript_BerryCurePrlzEnd2:: @ 81D99B6 end2 BattleScript_BerryCureParRet:: @ 81D99BC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredParalysis waitmessage 64 atk98 10 @@ -4318,7 +4318,7 @@ BattleScript_BerryCurePsnEnd2:: @ 81D99CE end2 BattleScript_BerryCurePsnRet:: @ 81D99D4 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredPoison waitmessage 64 atk98 10 @@ -4330,7 +4330,7 @@ BattleScript_BerryCureBrnEnd2:: @ 81D99E6 end2 BattleScript_BerryCureBrnRet:: @ 81D99EC - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredBurn waitmessage 64 atk98 10 @@ -4342,7 +4342,7 @@ BattleScript_BerryCureFrzEnd2:: @ 81D99FE end2 BattleScript_BerryCureFrzRet:: @ 81D9A04 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredFreeze waitmessage 64 atk98 10 @@ -4354,7 +4354,7 @@ BattleScript_BerryCureSlpEnd2:: @ 81D9A16 end2 BattleScript_BerryCureSlpRet:: @ 81D9A1C - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredSleep waitmessage 64 atk98 10 @@ -4366,7 +4366,7 @@ BattleScript_BerryCureConfusionEnd2:: @ 81D9A2E end2 BattleScript_BerryCureConfusionRet:: @ 81D9A34 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_CuredConfusion waitmessage 64 removeitem 10 @@ -4377,7 +4377,7 @@ gUnknown_081D9A44:: @ 81D9A44 end2 gUnknown_081D9A4A:: @ 81D9A4A - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printfromtable BattleTextList_40162C waitmessage 64 atk98 10 @@ -4389,14 +4389,14 @@ BattleScript_WhiteHerbEnd2:: @ 81D9A5E end2 BattleScript_WhiteHerbRet:: @ 81D9A64 - playanimation 10, 7, 0x0 + playanimation 10, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredStatus waitmessage 64 removeitem 10 return BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 @@ -4406,7 +4406,7 @@ BattleScript_ItemHealHP_RemoveItem:: @ 81D9A74 end2 BattleScript_BerryPPHealEnd2:: @ 81D9A91 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredPP waitmessage 64 removeitem USER @@ -4417,7 +4417,7 @@ BattleScript_ItemHealHP_End2:: @ 81D9AA1 end2 BattleScript_ItemHealHP_Ret:: @ 81D9AA7 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHPLittle waitmessage 64 orword gHitMarker, 0x100 @@ -4430,13 +4430,13 @@ BattleScript_MoveSelectionChoiceBanded:: @ 81D9AC2 atk44 BattleScript_HangedOnMsg:: @ 81D9AC6 - playanimation TARGET, 9, 0x0 + playanimation TARGET, B_ANIM_HANGED_ON, 0x0 printstring BATTLE_TEXT_FocusSash waitmessage 64 return BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_RestoredHealth waitmessage 64 orword gHitMarker, 0x100 @@ -4450,7 +4450,7 @@ BattleScript_BerryConfuseHealEnd2:: @ 81D9AD4 end2 BattleScript_BerryStatRaiseEnd2:: @ 81D9AFE - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 statbuffchange 65, BattleScript_1D9B0B BattleScript_1D9B0B: @ 81D9B0B @@ -4460,7 +4460,7 @@ BattleScript_1D9B0B: @ 81D9B0B end2 BattleScript_BerryFocusEnergyEnd2:: @ 81D9B19 - playanimation USER, 7, 0x0 + playanimation USER, B_ANIM_ITEM_EFFECT, 0x0 printstring BATTLE_TEXT_HustleUse waitmessage 64 removeitem USER diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 0833b7bf2..22ecc7769 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -5,7 +5,7 @@ .section script_data, "aw", %progbits .align 2 -gUnknown_081D9E48:: @ 81D9E48 +gBattlescriptsForBallThrow:: @ 81D9E48 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 .4byte BattleScript_1D9EA8 @@ -28,10 +28,10 @@ gUnknown_081D9E7C:: @ 81D9E7C .4byte BattleScript_1D9F9C .4byte BattleScript_1D9FBB -gUnknown_081D9E94:: @ 81D9E94 +gBattlescriptsForRunningByItem:: @ 81D9E94 .4byte BattleScript_1D9FDA -gUnknown_081D9E98:: @ 81D9E98 +gBattlescriptsForSafariActions:: @ 81D9E98 .4byte BattleScript_1D9FE4 .4byte BattleScript_1D9FEB .4byte BattleScript_1D9FF4 @@ -177,7 +177,7 @@ BattleScript_1D9FEB: @ 81D9FEB BattleScript_1D9FF4: @ 81D9FF4 printstring BATTLE_TEXT_ThrewBlock waitmessage 64 - playanimation USER, 4, 0x0 + playanimation USER, B_ANIM_POKEBLOCK_THROW, 0x0 printfromtable BattleTextList_40161A waitmessage 64 end2 |