bugfixes 1.3

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).

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 },

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

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

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]

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 = {}

PBS/trainers.txt

@@ -1823,8 +1823,9 @@ Pokemon = B20H70,24 #Weepinicate,
 Pokemon = B88H44,24 #Gloomer,
 ######################
 
-[TEAMROCKET_M,Ritchie]
+[TEAMROCKET_M,Richard]
-Pokemon = B73H109,25 #Koffcruel,
+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

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
 ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾