diff --git a/Data/Map037.rxdata b/Data/Map037.rxdata index a90208f58..39feafeea 100644 Binary files a/Data/Map037.rxdata and b/Data/Map037.rxdata differ diff --git a/Data/Map062.rxdata b/Data/Map062.rxdata index 57018fa52..7e56e3da5 100644 Binary files a/Data/Map062.rxdata and b/Data/Map062.rxdata differ diff --git a/Data/Map144.rxdata b/Data/Map144.rxdata index 9bbe54d14..5bbb0ede9 100644 Binary files a/Data/Map144.rxdata and b/Data/Map144.rxdata differ diff --git a/Data/Map197.rxdata b/Data/Map197.rxdata index 59bad9b3c..19e06ac33 100644 Binary files a/Data/Map197.rxdata and b/Data/Map197.rxdata differ diff --git a/Data/Map198.rxdata b/Data/Map198.rxdata index 97637d468..41dd4ba6f 100644 Binary files a/Data/Map198.rxdata and b/Data/Map198.rxdata differ diff --git a/Data/Map207.rxdata b/Data/Map207.rxdata index de66aa1dc..88b07f110 100644 Binary files a/Data/Map207.rxdata and b/Data/Map207.rxdata differ diff --git a/Data/Map221.rxdata b/Data/Map221.rxdata index 9a2d06cb4..dbb20773c 100644 Binary files a/Data/Map221.rxdata and b/Data/Map221.rxdata differ diff --git a/Data/Map314.rxdata b/Data/Map314.rxdata index c4689476d..68f92ab52 100644 Binary files a/Data/Map314.rxdata and b/Data/Map314.rxdata differ diff --git a/Data/Map363.rxdata b/Data/Map363.rxdata index 80d8771f3..a279a3dd3 100644 Binary files a/Data/Map363.rxdata and b/Data/Map363.rxdata differ diff --git a/Data/Map405.rxdata b/Data/Map405.rxdata index 8b4942abe..315ab2c19 100644 Binary files a/Data/Map405.rxdata and b/Data/Map405.rxdata differ diff --git a/Data/Map406.rxdata b/Data/Map406.rxdata index f4f03f882..3ff9d2048 100644 Binary files a/Data/Map406.rxdata and b/Data/Map406.rxdata differ diff --git a/Data/Map414.rxdata b/Data/Map414.rxdata index 836ec5479..faff98156 100644 Binary files a/Data/Map414.rxdata and b/Data/Map414.rxdata differ diff --git a/Data/Map431.rxdata b/Data/Map431.rxdata index b7572b246..8bc91b4fb 100644 Binary files a/Data/Map431.rxdata and b/Data/Map431.rxdata differ diff --git a/Data/Map432.rxdata b/Data/Map432.rxdata index e3ba44cdf..cd8030e3f 100644 Binary files a/Data/Map432.rxdata and b/Data/Map432.rxdata differ diff --git a/Data/Map438.rxdata b/Data/Map438.rxdata index bcfd90b18..142c93e1d 100644 Binary files a/Data/Map438.rxdata and b/Data/Map438.rxdata differ diff --git a/Data/Map465.rxdata b/Data/Map465.rxdata index 9df5d5ab8..26ddd540e 100644 Binary files a/Data/Map465.rxdata and b/Data/Map465.rxdata differ diff --git a/Data/Map498.rxdata b/Data/Map498.rxdata index b35ff7c5a..394a23db6 100644 Binary files a/Data/Map498.rxdata and b/Data/Map498.rxdata differ diff --git a/Data/Map500.rxdata b/Data/Map500.rxdata index 56bd70aea..105fc07a2 100644 Binary files a/Data/Map500.rxdata and b/Data/Map500.rxdata differ diff --git a/Data/Map502.rxdata b/Data/Map502.rxdata index 8a0b477c4..c368166c2 100644 Binary files a/Data/Map502.rxdata and b/Data/Map502.rxdata differ diff --git a/Data/Map505.rxdata b/Data/Map505.rxdata index c8a64b67a..be59d24a9 100644 Binary files a/Data/Map505.rxdata and b/Data/Map505.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 36296fb84..66daa48cd 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 2b054b98e..ed27b7bc9 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -3,7 +3,6 @@ # Version 19.1.dev # # https://github.com/Maruno17/pokemon-essentials # #==============================================================================# - module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' @@ -57,6 +56,8 @@ module Settings MAXIMUM_LEVEL = 100 # The level of newly hatched Pokémon. EGG_LEVEL = 1 + # Number of badges in the game + NB_BADGES = 16 # The odds of a newly generated Pokémon being shiny (out of 65536). SHINY_POKEMON_CHANCE = (MECHANICS_GENERATION >= 6) ? 16 : 8 # The odds of a wild Pokémon/bred egg having Pokérus (out of 65536). diff --git a/Data/Scripts/016_UI/015_UI_Options.rb b/Data/Scripts/016_UI/015_UI_Options.rb index cd2dbbb12..2529e3276 100644 --- a/Data/Scripts/016_UI/015_UI_Options.rb +++ b/Data/Scripts/016_UI/015_UI_Options.rb @@ -375,7 +375,7 @@ class PokemonOption_Scene } ) ] - if $game_switches && $game_switches[NEW_GAME_PLUS] #beat the league + if $game_switches && ($game_switches[NEW_GAME_PLUS] || $game_switches[BEAT_THE_LEAGUE]) #beat the league @PokemonOptions << EnumOption.new(_INTL("Battle type"), [_INTL("Single"), _INTL("Double"), _INTL("Triple")], proc { $PokemonSystem.textspeed }, diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index bb20b0961..a5fb30f75 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -1,8 +1,15 @@ #Switches NEW_GAME_PLUS = 972 +BEAT_THE_LEAGUE = 12 #Variables DEFAULT_BATTLE_TYPE = 242 + + +#Settings +# This is for settings that are used in scripts since it's a chore to change them everywhere to include the module name +NUM_BADGES=Settings::NB_BADGES +EGGINITIALLEVEL=Settings::EGG_LEVEL \ No newline at end of file diff --git a/Data/Scripts/049_Compatibility/PBItems.rb b/Data/Scripts/049_Compatibility/PBItems.rb index b8d1b8790..d261f1269 100644 --- a/Data/Scripts/049_Compatibility/PBItems.rb +++ b/Data/Scripts/049_Compatibility/PBItems.rb @@ -474,6 +474,10 @@ module PBItems XDEFENSE2 = 470 XDEFENSE3 = 471 XDEFENSE6 = 472 + XDEFEND = 469 + XDEFEND2 = 470 + XDEFEND3 = 471 + XDEFEND6 = 472 XSPATK = 473 XSPECIAL = 473 XSPATK2 = 474 diff --git a/Data/Scripts/050_AddOns/GeneralUtils.rb b/Data/Scripts/050_AddOns/GeneralUtils.rb index 23168be2a..812087614 100644 --- a/Data/Scripts/050_AddOns/GeneralUtils.rb +++ b/Data/Scripts/050_AddOns/GeneralUtils.rb @@ -54,7 +54,7 @@ def pbGenerateEgg(pokemon, text = "") pokemon = getID(PBSpecies, pokemon) end if pokemon.is_a?(Integer) - pokemon = PokeBattle_Pokemon.new(pokemon, EGGINITIALLEVEL, $Trainer) + pokemon = PokeBattle_Pokemon.new(pokemon, Settings::EGG_LEVEL, $Trainer) end # Get egg steps eggsteps = $pkmn_dex[pokemon.species][10] diff --git a/Data/Scripts/050_AddOns/PokemonFusion.rb b/Data/Scripts/050_AddOns/PokemonFusion.rb index f31faa51e..af226ed18 100644 --- a/Data/Scripts/050_AddOns/PokemonFusion.rb +++ b/Data/Scripts/050_AddOns/PokemonFusion.rb @@ -515,7 +515,7 @@ class PokemonFusionScene end - # Starts the evolution screen with the given Pokemon and new Pokemon species. + # Starts the fusion screen def pbStartScreen(pokemon1, pokemon2, newspecies) @sprites = {} diff --git a/Data/System.rxdata b/Data/System.rxdata index 739df701b..b145e3282 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index 70ed2977c..9034af492 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1823,8 +1823,9 @@ Pokemon = B20H70,24 #Weepinicate, Pokemon = B88H44,24 #Gloomer, ###################### -[TEAMROCKET_M,Ritchie] -Pokemon = B73H109,25 #Koffcruel, +[TEAMROCKET_M,Richard] +Pokemon = KOFFING,24 #Koffcruel, +Pokemon = B88H81,24 #Magnemer, ##################### [TEAMROCKET_F,Kaitlin] @@ -2600,27 +2601,27 @@ Pokemon = MEW,92 #Blastizard, [CHAMPION,Blue,1] Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE -Pokemon = B18H105,64 #Maroeot, +Pokemon = B18H105,59 #Maroeot, Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE AbilityIndex = 1 Item = LAXINCENSE -Pokemon = B103H128,64 #Taucutor, +Pokemon = B103H128,59 #Taucutor, Moves = ZENHEADBUTT,GIGAIMPACT,SCARYFACE,SWAGGER AbilityIndex = 2 Item = KINGSROCK -Pokemon = B268H265,65 #Rhypemortar, +Pokemon = B268H265,59 #Rhypemortar, Moves = FIREBLAST,DRILLRUN,WILLOWISP,STONEEDGE AbilityIndex = 1 Item = ABSORBBULB -Pokemon = B130H267,66 #Electados +Pokemon = B130H267,61 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,63 #Starkazam +Pokemon = B65H120,58 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES -Pokemon = MEW,69 #Venutoise, +Pokemon = MEW,64 #Venutoise, Moves = POWERWHIP,HYDROCANNON,SLEEPPOWDER,PROTECT AbilityIndex = 0 Item = LEFTOVERS @@ -2683,27 +2684,27 @@ Pokemon = MEW,92 #Venutoise, [CHAMPION,Blue,2] Items = FULLRESTORE,FULLRESTORE,FULLRESTORE,FULLRESTORE -Pokemon = B18H105,64 #Maroeot, +Pokemon = B18H105,59 #Maroeot, Moves = EARTHQUAKE,WINGATTACK,DOUBLETEAM,SWORDSDANCE AbilityIndex = 1 Item = LAXINCENSE -Pokemon = B103H128,64 #Taucutor, +Pokemon = B103H128,59 #Taucutor, Moves = ZENHEADBUTT,GIGAIMPACT,SCARYFACE,SWAGGER AbilityIndex = 2 Item = KINGSROCK -Pokemon = B268H265,65 #Rhypemortar, +Pokemon = B268H265,60 #Rhypemortar, Moves = FIREBLAST,DRILLRUN,WILLOWISP,STONEEDGE AbilityIndex = 1 Item = ABSORBBULB -Pokemon = B130H267,66 #Electados +Pokemon = B130H267,61 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,63 #Starkazam +Pokemon = B65H120,58 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES -Pokemon = MEW,69 #Charusaur, +Pokemon = MEW,64 #Charusaur, Moves = SLEEPPOWDER,POWERWHIP,FLAREBLITZ,FLY AbilityIndex = 0 Item = LEFTOVERS diff --git a/changelog.txt b/changelog.txt index a71c0a433..af90367d0 100644 --- a/changelog.txt +++ b/changelog.txt @@ -94,6 +94,7 @@ Removed features that will be coming back eventually - In-game clock - Hard mode, Easy mode - Some quests probably don't work +- Obtaining items from Rock Smash and fishing Removed features that probably won't be coming back ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾