Merge pull request #298 from BuffelSaft/readable-TMHM

Fix Meloetta, set mode
BuffelSaft · Nov 11, 2021 · 3f062c9 · 3f062c9
2 parents bd51102 + 94b921c
commit 3f062c9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/src/data/pokemon/tutor_learnsets.h b/src/data/pokemon/tutor_learnsets.h
@@ -804,7 +804,7 @@ static const u32 sTutorLearnsets[][5] = {
 	[SPECIES_LANDORUS] = {0x55EC0000,0x82200001,0x00000A64,0x00001700,0x00000000},
 	[SPECIES_KYUREM] = {0x08600080,0x806A0830,0x00800920,0x00000C00,0x00002210},
 	[SPECIES_KELDEO] = {0x04684A00,0x913828A0,0x0101088D,0x28000280,0x00001080},
-	[SPECIES_MELOETTA] = {0x68714400,0x8B2E2799,0x0000094A,0xC0000084,0x00281100},
+	[SPECIES_MELOETTA] = {0x68714400,0x8B2E2799,0x0100094A,0xC0000084,0x00281100},
 	[SPECIES_GENESECT] = {0x68630800,0x8162D010,0x0C000400,0x00000168,0x00040000},
 	[SPECIES_CHESPIN] = {0x86E01802,0x806E6167,0x8000000C,0x009016C0,0x000A8004},
 	[SPECIES_QUILLADIN] = {0x86E03802,0x806E6167,0x8000000C,0x009016C0,0x000A8004},

diff --git a/src/data/trainer_parties.h b/src/data/trainer_parties.h
@@ -10012,7 +10012,7 @@ static const struct TrainerMonItemCustomMoves sParty_Norman4[] = { // Singles wi
     .species = SPECIES_MELOETTA,
     .heldItem = ITEM_SHELL_BELL,
     .spread = SPREAD_31_IV_SPATK_SPEED_TIMID,
-    .moves = MOVE_RELIC_SONG, MOVE_PSYSHOCK, MOVE_SHADOW_BALL, MOVE_QUIVER_DANCE
+    .moves = MOVE_HYPER_VOICE, MOVE_PSYSHOCK, MOVE_SHADOW_BALL, MOVE_QUIVER_DANCE
     },
     {
     .lvl = 2,

diff --git a/src/main_menu.c b/src/main_menu.c
@@ -1854,6 +1854,7 @@ static void Task_NewGameBirchSpeech_ChooseDifficulty(u8 taskId)
         case 2:
             PlaySE(SE_SELECT);
             gSaveBlock2Ptr->gameDifficulty = DIFFICULTY_CHALLENGE;
+            gSaveBlock2Ptr->optionsBattleStyle = OPTIONS_BATTLE_STYLE_SET;
             NewGameBirchSpeech_ClearGenderWindow(4, 1);
             gTasks[taskId].func = Task_NewGameBirchSpeech_DifficultyDesc;
             break;