Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Legends: Arceus' move data #2280

Merged
merged 4 commits into from
Sep 1, 2022
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 51 additions & 30 deletions data/battle_anim_scripts.s
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,31 @@ gBattleAnims_Moves::
.4byte Move_GLACIAL_LANCE
.4byte Move_ASTRAL_BARRAGE
.4byte Move_EERIE_SPELL
@@@@LA MOVES
.4byte Move_DIRE_CLAW
.4byte Move_PSYSHIELD_BASH
.4byte Move_POWER_SHIFT
.4byte Move_STONE_AXE
.4byte Move_SPRINGTIDE_STORM
.4byte Move_MYSTICAL_POWER
.4byte Move_RAGING_FURY
.4byte Move_WAVE_CRASH
.4byte Move_CHLOROBLAST
.4byte Move_MOUNTAIN_GALE
.4byte Move_VICTORY_DANCE
.4byte Move_HEADLONG_RUSH
.4byte Move_BARB_BARRAGE
.4byte Move_ESPER_WING
.4byte Move_BITTER_MALICE
.4byte Move_SHELTER
.4byte Move_TRIPLE_ARROWS
.4byte Move_INFERNAL_PARADE
.4byte Move_CEASELESS_EDGE
.4byte Move_BLEAKWIND_STORM
.4byte Move_WILDBOLT_STORM
.4byte Move_SANDSEAR_STORM
.4byte Move_LUNAR_BLESSING
.4byte Move_TAKE_HEART
@@@@ Z MOVES
.4byte Move_BREAKNECK_BLITZ
.4byte Move_ALL_OUT_PUMMELING
Expand Down Expand Up @@ -14270,55 +14295,51 @@ Move_POLTERGEIST::
end

Move_CORROSIVE_GAS::
end @to do:

Move_COACHING::
end @to do:

Move_FLIP_TURN::
end @to do:

Move_TRIPLE_AXEL::
end @to do:

Move_DUAL_WINGBEAT::
end @to do:

Move_SCORCHING_SANDS::
end @to do:
end @to do

Move_JUNGLE_HEALING::
goto Move_AROMATHERAPY

Move_WICKED_BLOW::
end @to do:

Move_SURGING_STRIKES::
end @to do:

Move_THUNDER_CAGE::
end @to do:

Move_DRAGON_ENERGY::
end @to do:

Move_FREEZING_GLARE::
end @to do:

Move_FIERY_WRATH::
end @to do:

Move_THUNDEROUS_KICK::
end @to do:

Move_GLACIAL_LANCE::
end @to do:

Move_ASTRAL_BARRAGE::
end @to do:

Move_EERIE_SPELL::
end @to do:
Move_DIRE_CLAW::
Move_PSYSHIELD_BASH::
Move_POWER_SHIFT::
Move_STONE_AXE::
Move_SPRINGTIDE_STORM::
Move_MYSTICAL_POWER::
Move_RAGING_FURY::
Move_WAVE_CRASH::
Move_CHLOROBLAST::
Move_MOUNTAIN_GALE::
Move_VICTORY_DANCE::
Move_HEADLONG_RUSH::
Move_BARB_BARRAGE::
Move_ESPER_WING::
Move_BITTER_MALICE::
Move_SHELTER::
Move_TRIPLE_ARROWS::
Move_INFERNAL_PARADE::
Move_CEASELESS_EDGE::
Move_BLEAKWIND_STORM::
Move_WILDBOLT_STORM::
Move_SANDSEAR_STORM::
Move_LUNAR_BLESSING::
Move_TAKE_HEART::
end @to do

@@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@
Move_NONE:
Expand Down
27 changes: 26 additions & 1 deletion include/constants/moves.h
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,33 @@
#define MOVE_GLACIAL_LANCE 752
#define MOVE_ASTRAL_BARRAGE 753
#define MOVE_EERIE_SPELL 754
// Legends: Arceus Moves
#define MOVE_DIRE_CLAW 755
#define MOVE_PSYSHIELD_BASH 756
#define MOVE_POWER_SHIFT 757
#define MOVE_STONE_AXE 758
#define MOVE_SPRINGTIDE_STORM 759
#define MOVE_MYSTICAL_POWER 760
#define MOVE_RAGING_FURY 761
#define MOVE_WAVE_CRASH 762
#define MOVE_CHLOROBLAST 763
#define MOVE_MOUNTAIN_GALE 764
#define MOVE_VICTORY_DANCE 765
#define MOVE_HEADLONG_RUSH 766
#define MOVE_BARB_BARRAGE 767
#define MOVE_ESPER_WING 768
#define MOVE_BITTER_MALICE 769
#define MOVE_SHELTER 770
#define MOVE_TRIPLE_ARROWS 771
#define MOVE_INFERNAL_PARADE 772
#define MOVE_CEASELESS_EDGE 773
#define MOVE_BLEAKWIND_STORM 774
#define MOVE_WILDBOLT_STORM 775
#define MOVE_SANDSEAR_STORM 776
#define MOVE_LUNAR_BLESSING 777
#define MOVE_TAKE_HEART 778

#define MOVES_COUNT_GEN8 755
#define MOVES_COUNT_GEN8 779

#define MOVES_COUNT MOVES_COUNT_GEN8

Expand Down
Loading