Update some movesets

Pseurae · Oct 7, 2024 · 8e3249e · 8e3249e
1 parent b30a301
commit 8e3249e
Show file tree

Hide file tree

Showing 9 changed files with 385 additions and 20 deletions.
diff --git a/assembly/battle_anim_scripts.s b/assembly/battle_anim_scripts.s
@@ -368,6 +368,5 @@ gBattleAnims_Moves:
     .4byte 0x81d52cb @ MOVE_DARK_PULSE (PULSAR)
     .4byte 0x81caabd @ MOVE_ZEN_HEADBUTT (HEADBUTT)
     .4byte 0x81c8bbc @ MOVE_POWER_GEM (HIDDEN POWER)
-    .4byte 0x81d3550 @ MOVE_AURA_SPHERE (HYPER VOICE)
     .4byte 0x81cb7db @ MOVE_X_SCISSOR (SLASH)
     .4byte 0x81cbefc @ MOVE_BUG_BUZZ (UPROAR)
diff --git a/include/constants/moves.h b/include/constants/moves.h
@@ -359,8 +359,7 @@
 #define MOVE_DARK_PULSE    356
 #define MOVE_ZEN_HEADBUTT  357
 #define MOVE_POWER_GEM     358
-#define MOVE_AURA_SPHERE   359
-#define MOVE_X_SCISSOR     360
-#define MOVE_BUG_BUZZ      361
+#define MOVE_X_SCISSOR     359
+#define MOVE_BUG_BUZZ      360
 
-#define NUM_MOVES          362
+#define NUM_MOVES          361
diff --git a/notes.txt b/notes.txt
@@ -0,0 +1,33 @@
+Shadow Claw:
+Banette
+Duskclops
+Shaderu *
+
+Dark Pulse:
+Gastly
+Gigawolf *
+Duskclops
+Shaderu *
+
+Zen Headbutt:
+Ramshaker *
+Medicham
+Tauros
+Altaria
+
+Power Gem:
+Sableye
+Nosepass
+Spoink
+
+X-Scissor:
+Parasect
+Scyther
+Zangoose
+Ninjask
+
+Bug Buzz:
+Dustox
+Beautifly
+Masquerain
+Flygon
diff --git a/scripts/new_moves.asm b/scripts/new_moves.asm
@@ -226,4 +226,24 @@ bx r7
 .pool
 .endautoregion
 
+@set_learnset SPECIES_BANETTE, gBanetteLevelUpLearnset
+@set_learnset SPECIES_DUSCLOPS, gDusclopsLevelUpLearnset
+@set_learnset SPECIES_DUSTOX, gDustoxLevelUpLearnset
+@set_learnset SPECIES_BEAUTIFLY, gBeautiflyLevelUpLearnset
+@set_learnset SPECIES_ALTARIA, gAltariaLevelUpLearnset
+@set_learnset SPECIES_MEDITITE, gMedititeLevelUpLearnset
+@set_learnset SPECIES_MEDICHAM, gMedichamLevelUpLearnset
+@set_learnset SPECIES_PARAS, gParasLevelUpLearnset
+@set_learnset SPECIES_PARASECT, gParasectLevelUpLearnset
+@set_learnset SPECIES_SURSKIT, gSurskitLevelUpLearnset
+@set_learnset SPECIES_MASQUERAIN, gMasquerainLevelUpLearnset
+@set_learnset SPECIES_GASTLY, gGastlyLevelUpLearnset
+@set_learnset SPECIES_HAUNTER, gHaunterLevelUpLearnset
+@set_learnset SPECIES_GENGAR, gGengarLevelUpLearnset
+@set_learnset SPECIES_NOSEPASS, gNosepassLevelUpLearnset
+@set_learnset SPECIES_SABLEYE, gSableyeLevelUpLearnset
+@set_learnset SPECIES_SHADERU, gShaderuLevelUpLearnset
+@set_learnset SPECIES_GIGAWOLF, gGigawolfLevelUpLearnset
+@set_learnset SPECIES_RAMSHAKER, gRamshakerLevelUpLearnset
+@set_learnset SPECIES_TAUROS, gTaurosLevelUpLearnset
 .endif
diff --git a/src/data/moves/battle.c b/src/data/moves/battle.c
@@ -4314,18 +4314,6 @@ const struct BattleMove gBattleMoves[] = {
         .flags = F_AFFECTED_BY_PROTECT | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_KINGS_ROCK,
     },
 
-    [MOVE_AURA_SPHERE] = {
-        .effect = EFFECT_ALWAYS_HIT,
-        .power = 80,
-        .type = TYPE_FIGHTING,
-        .accuracy = 0,
-        .pp = 20,
-        .secondaryEffectChance = 0,
-        .target = TARGET_SELECTED_POKEMON,
-        .priority = 0,
-        .flags = F_AFFECTED_BY_PROTECT | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_KINGS_ROCK,
-    },
-
     [MOVE_X_SCISSOR] = {
         .effect = EFFECT_HIT,
         .power = 80,

diff --git a/src/data/moves/descriptions.c b/src/data/moves/descriptions.c
@@ -394,7 +394,6 @@ const u8 *const gMoveDescriptions[] = {
     [MOVE_DARK_PULSE - 1] = sMoveDescription_DarkPulse,
     [MOVE_ZEN_HEADBUTT - 1] = sMoveDescription_ZenHeadbutt,
     [MOVE_POWER_GEM - 1] = sMoveDescription_PowerGem,
-    [MOVE_AURA_SPHERE - 1] = sMoveDescription_AuraSphere,
     [MOVE_X_SCISSOR - 1] = sMoveDescription_XScissor,
     [MOVE_BUG_BUZZ - 1] = sMoveDescription_BugBuzz,
 };
diff --git a/src/data/moves/names.c b/src/data/moves/names.c
@@ -361,7 +361,6 @@ const u8 gMoveNames[][13] = {
     [MOVE_DARK_PULSE] = _("DARK PULSE"),
     [MOVE_ZEN_HEADBUTT] = _("ZEN HEADBUTT"),
     [MOVE_POWER_GEM] = _("POWER GEM"),
-    [MOVE_AURA_SPHERE] = _("AURA SPHERE"),
     [MOVE_X_SCISSOR] = _("X-SCISSOR"),
     [MOVE_BUG_BUZZ] = _("BUG BUZZ")
 };
diff --git a/src/data/moves/split.c b/src/data/moves/split.c
@@ -363,7 +363,6 @@ const u8 gBattleMoveSplit[NUM_MOVES] = {
     [MOVE_DARK_PULSE] = CATEGORY_SPECIAL,
     [MOVE_ZEN_HEADBUTT] = CATEGORY_PHYSICAL,
     [MOVE_POWER_GEM] = CATEGORY_SPECIAL,
-    [MOVE_AURA_SPHERE] = CATEGORY_SPECIAL,
     [MOVE_X_SCISSOR] = CATEGORY_PHYSICAL,
     [MOVE_BUG_BUZZ] = CATEGORY_SPECIAL
 };