diff --git a/linker.ld b/linker.ld index f1e4134..90e5d64 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x1712260), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x1717a60), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/scripts/insert.py b/scripts/insert.py index 2bbc739..c943497 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x1712260 +OFFSET_TO_PUT = 0x1717a60 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index 26a1713..23e9aab 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 = 0x1712260 +OFFSET_TO_PUT = 0x1717a60 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/Base_Stats.c b/src/Base_Stats.c index 5237cbb..cc0c539 100644 --- a/src/Base_Stats.c +++ b/src/Base_Stats.c @@ -8024,9 +8024,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, .ability1 = ABILITY_PRESSURE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INNERFOCUS, + .hiddenAbility = ABILITY_VOLTABSORB, .noFlip = TRUE, }, @@ -8057,9 +8057,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, .ability1 = ABILITY_PRESSURE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INNERFOCUS, + .hiddenAbility = ABILITY_FLASHFIRE, .noFlip = TRUE, }, @@ -8090,9 +8090,9 @@ const struct BaseStats gBaseStats[] = .eggGroup1 = EGG_GROUP_UNDISCOVERED, .eggGroup2 = EGG_GROUP_UNDISCOVERED, .ability1 = ABILITY_PRESSURE, - .ability2 = ABILITY_NONE, + .ability2 = ABILITY_INNERFOCUS, .safariZoneFleeRate = 0, - .hiddenAbility = ABILITY_INNERFOCUS, + .hiddenAbility = ABILITY_WATERABSORB, .noFlip = TRUE, }, diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index 811ab3c..4879392 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -3776,7 +3776,8 @@ const u16 gEggMoves[] = egg_moves(BUNNELBY, MOVE_SPIKES, MOVE_DEFENSECURL, - MOVE_ROLLOUT), + MOVE_ROLLOUT, + MOVE_STUFFCHEEKS), egg_moves(FLETCHLING, MOVE_TAILWIND, diff --git a/src/Learnsets.c b/src/Learnsets.c index 72fe798..9574512 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -14505,6 +14505,7 @@ static const struct LevelUpMove sHawluchaLevelUpLearnset[] = { }; static const struct LevelUpMove sDedenneLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_STUFFCHEEKS), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 7, MOVE_THUNDERSHOCK),