From 3ebdca0594c0c21754128556d0f8675b883ef172 Mon Sep 17 00:00:00 2001 From: Skeli Date: Sun, 13 Jun 2021 02:41:33 -0400 Subject: [PATCH] Updated Insert Offsets --- linker.ld | 2 +- scripts/insert.py | 2 +- scripts/make.py | 2 +- src/Learnsets.c | 16 ++++++---------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/linker.ld b/linker.ld index f5af216..cf219bf 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x1900000), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x1618aa0), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/scripts/insert.py b/scripts/insert.py index 92f4a8a..3c5ce3d 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x1900000 +OFFSET_TO_PUT = 0x1618aa0 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index 4200477..cb10d73 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -9,7 +9,7 @@ import sys ############ ROM_NAME = "Pokemon Unbound.gba" # The name of your rom -OFFSET_TO_PUT = 0x1900000 +OFFSET_TO_PUT = 0x1618aa0 SEARCH_FREE_SPACE = False # Set to True if you want the script to search for free space # Set to False if you don't want to search for free space as you update the engine diff --git a/src/Learnsets.c b/src/Learnsets.c index 7de3c86..62c4c6e 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -18212,7 +18212,7 @@ static const struct LevelUpMove sMelmetalLevelUpLearnset[] = { LEVEL_UP_END }; -/* + static const struct LevelUpMove sGrookeyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), @@ -19686,10 +19686,6 @@ static const struct LevelUpMove sZarudeLevelUpLearnset[] = { LEVEL_UP_END }; -static const struct LevelUpMove sUnknownMythicalLevelUpLearnset[] = { - LEVEL_UP_END -}; - static const struct LevelUpMove sCalyrexLevelUpLearnset[] = { LEVEL_UP_END }; @@ -20098,7 +20094,7 @@ static const struct LevelUpMove sStunfiskGLevelUpLearnset[] = { LEVEL_UP_MOVE(50, MOVE_FLAIL), LEVEL_UP_MOVE(55, MOVE_FISSURE), LEVEL_UP_END -};*/ +}; const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = { @@ -21204,7 +21200,7 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PIKACHU_CAP_PARTNER] = sPikachuLevelUpLearnset, [SPECIES_PICHU_SPIKY] = sPichuLevelUpLearnset, [SPECIES_XERNEAS_NATURAL] = sXerneasLevelUpLearnset, -/* [SPECIES_GROOKEY] = sGrookeyLevelUpLearnset, + [SPECIES_GROOKEY] = sGrookeyLevelUpLearnset, [SPECIES_THWACKEY] = sThwackeyLevelUpLearnset, [SPECIES_RILLABOOM] = sRillaboomLevelUpLearnset, [SPECIES_SCORBUNNY] = sScorbunnyLevelUpLearnset, @@ -21330,7 +21326,7 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DARMANITAN_G] = sDarmanitanGLevelUpLearnset, [SPECIES_DARMANITAN_G_ZEN] = sDarmanitanGLevelUpLearnset, [SPECIES_YAMASK_G] = sYamaskGLevelUpLearnset, - [SPECIES_STUNFISK_G] = sStunfiskGLevelUpLearnset,*/ + [SPECIES_STUNFISK_G] = sStunfiskGLevelUpLearnset, [SPECIES_VENUSAUR_GIGA] = sVenusaurLevelUpLearnset, [SPECIES_CHARIZARD_GIGA] = sCharizardLevelUpLearnset, [SPECIES_BLASTOISE_GIGA] = sBlastoiseLevelUpLearnset, @@ -21345,7 +21341,7 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SNORLAX_GIGA] = sSnorlaxLevelUpLearnset, [SPECIES_GARBODOR_GIGA] = sGarbodorLevelUpLearnset, [SPECIES_MELMETAL_GIGA] = sMelmetalLevelUpLearnset, -/* [SPECIES_RILLABOOM_GIGA] = sRillaboomLevelUpLearnset, + [SPECIES_RILLABOOM_GIGA] = sRillaboomLevelUpLearnset, [SPECIES_CINDERACE_GIGA] = sCinderaceLevelUpLearnset, [SPECIES_INTELEON_GIGA] = sInteleonLevelUpLearnset, [SPECIES_CORVIKNIGHT_GIGA] = sCorviknightLevelUpLearnset, @@ -21364,6 +21360,6 @@ const struct LevelUpMove* const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_COPPERAJAH_GIGA] = sCopperajahLevelUpLearnset, [SPECIES_DURALUDON_GIGA] = sDuraludonLevelUpLearnset, [SPECIES_URSHIFU_SINGLE_GIGA] = sUrshifuLevelUpLearnset, - [SPECIES_URSHIFU_RAPID_GIGA] = sUrshifuRapidLevelUpLearnset,*/ + [SPECIES_URSHIFU_RAPID_GIGA] = sUrshifuRapidLevelUpLearnset, }; #endif