From 4595516cc3d0653b52d2b600fd4ed0fa5bbcb237 Mon Sep 17 00:00:00 2001 From: Skeli Date: Sun, 25 Aug 2019 03:25:53 -0400 Subject: [PATCH] Fix Build Errors --- include/pokedex.h | 4 ++-- src/Pokedex_Data_Table.c | 4 ++-- src/defines.h | 5 ++++- strings/Pokedex_Data.string | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/pokedex.h b/include/pokedex.h index bec6045..c71a2c7 100644 --- a/include/pokedex.h +++ b/include/pokedex.h @@ -1302,6 +1302,6 @@ extern const u8 DEX_ENTRY_ORICORIO_S[]; extern const u8 DEX_ENTRY_LYCANROC_N[]; extern const u8 DEX_ENTRY_LYCANROC_DUSK[]; extern const u8 DEX_ENTRY_WISHIWASHI_S[]; -extern const u8 DEX_ENTRY_NECROZMA_MANE[]; -extern const u8 DEX_ENTRY_NECROZMA_WINGS[]; +extern const u8 DEX_ENTRY_NECROZMA_DUSK_MANE[]; +extern const u8 DEX_ENTRY_NECROZMA_DAWN_WINGS[]; extern const u8 DEX_ENTRY_NECROZMA_ULTRA[]; \ No newline at end of file diff --git a/src/Pokedex_Data_Table.c b/src/Pokedex_Data_Table.c index d687af9..8237179 100644 --- a/src/Pokedex_Data_Table.c +++ b/src/Pokedex_Data_Table.c @@ -11379,8 +11379,8 @@ const struct AlternateDexEntries gAlternateDexEntries[] = ALTERNATE_ENTRY(LYCANROC_N), ALTERNATE_ENTRY(LYCANROC_DUSK), ALTERNATE_ENTRY(WISHIWASHI_S), - ALTERNATE_ENTRY(NECROZMA_MANE), - ALTERNATE_ENTRY(NECROZMA_WINGS), + ALTERNATE_ENTRY(NECROZMA_DUSK_MANE), + ALTERNATE_ENTRY(NECROZMA_DAWN_WINGS), ALTERNATE_ENTRY(NECROZMA_ULTRA), {SPECIES_TABLES_TERMIN, 0} }; diff --git a/src/defines.h b/src/defines.h index 2bd937a..c60b1e5 100644 --- a/src/defines.h +++ b/src/defines.h @@ -18,4 +18,7 @@ // gLevelUpLearnsets from "repointall" found in the root BEFORE compiling. If you've // already compiled, run "python scripts//clean.py" first. -//#define INCLUDE_FOOTPRINTS //If you uncomment this line, make sure to uncomment gMonFootprintTable in "repoints", and remove the footprint remover in "bytereplacement" \ No newline at end of file +//#define INCLUDE_FOOTPRINTS //If you uncomment this line, make sure to uncomment gMonFootprintTable in "repoints", and remove the footprint remover in "bytereplacement" + +#define NUM_TMSHMS 128 +#define NUM_MOVE_TUTOR_MOVES 64 \ No newline at end of file diff --git a/strings/Pokedex_Data.string b/strings/Pokedex_Data.string index 019be67..923efb6 100644 --- a/strings/Pokedex_Data.string +++ b/strings/Pokedex_Data.string @@ -1347,10 +1347,10 @@ This strange form is the result of it\nevolving at dusk. An intense fighting\nsp #org @DEX_ENTRY_WISHIWASHI_S At their appearance, even Gyarados flee.\nWhen they team up to use Water Gun, its\npower exceeds that of Hydro Pump. -#org @DEX_ENTRY_NECROZMA_MANE +#org @DEX_ENTRY_NECROZMA_DUSK_MANE This is Necrozma while it's absorbing\nthe power of Solgaleo, making it very\nferocious and impossible to control. -#org @DEX_ENTRY_NECROZMA_WINGS +#org @DEX_ENTRY_NECROZMA_DAWN_WINGS Lunala no longer has a will of its own.\nNow under the control of Necrozma, it\ncontinuously expels all of its energy. #org @DEX_ENTRY_NECROZMA_ULTRA