diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 4dd94835f..a3f2d4843 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map015.rxdata b/Data/Map015.rxdata index ba597b4f2..7bb9fe117 100644 Binary files a/Data/Map015.rxdata and b/Data/Map015.rxdata differ diff --git a/Data/Map028.rxdata b/Data/Map028.rxdata index 624e2b76d..c996703ce 100644 Binary files a/Data/Map028.rxdata and b/Data/Map028.rxdata differ diff --git a/Data/Map036.rxdata b/Data/Map036.rxdata index 62c728b80..bdf4e9367 100644 Binary files a/Data/Map036.rxdata and b/Data/Map036.rxdata differ diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata index f4ea82a7f..5aec2a2ce 100644 Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 0937ce425..c0b89fc3f 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map237.rxdata b/Data/Map237.rxdata index 37a58f6dc..873bd6c8c 100644 Binary files a/Data/Map237.rxdata and b/Data/Map237.rxdata differ diff --git a/Data/Map444.rxdata b/Data/Map444.rxdata index eb889acaf..e1e2ac4b5 100644 Binary files a/Data/Map444.rxdata and b/Data/Map444.rxdata differ diff --git a/Data/Map539.rxdata b/Data/Map539.rxdata index bb84dcedf..5c63d1d91 100644 Binary files a/Data/Map539.rxdata and b/Data/Map539.rxdata differ diff --git a/Data/Map703.rxdata b/Data/Map703.rxdata index 845e80b61..aec702aaf 100644 Binary files a/Data/Map703.rxdata and b/Data/Map703.rxdata differ diff --git a/Data/Map716.rxdata b/Data/Map716.rxdata index 4006f13fa..746910239 100644 Binary files a/Data/Map716.rxdata and b/Data/Map716.rxdata differ diff --git a/Data/Map771.rxdata b/Data/Map771.rxdata new file mode 100644 index 000000000..6c8cf40b0 Binary files /dev/null and b/Data/Map771.rxdata differ diff --git a/Data/Map772.rxdata b/Data/Map772.rxdata new file mode 100644 index 000000000..0e7b50701 Binary files /dev/null and b/Data/Map772.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index f2658f335..19834bf4c 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts.rxdata b/Data/Scripts.rxdata index 1005890c6..954fa57f0 100644 Binary files a/Data/Scripts.rxdata and b/Data/Scripts.rxdata differ diff --git a/Data/Scripts/025-Randomizer/RandomizerUtils.rb b/Data/Scripts/025-Randomizer/RandomizerUtils.rb index 6b0d8bc1b..5501c509f 100644 --- a/Data/Scripts/025-Randomizer/RandomizerUtils.rb +++ b/Data/Scripts/025-Randomizer/RandomizerUtils.rb @@ -1,4 +1,4 @@ -NON_RANDOMIZE_ITEMS = [:CELLBATTERY, :MAGNETSTONE, :TM94] +NON_RANDOMIZE_ITEMS = [:CELLBATTERY, :MAGNETSTONE, :TM94, :DYNAMITE] HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT, :ROCKYHELMET, :EJECTBUTTON, :REDCARD, :SHEDSHELL, :SMOKEBALL, :CHOICEBAND, :CHOICESPECS, :CHOICESCARF, :HEATROCK, :DAMPROCK, :SMOOTHROCK, :ICYROCK, :LIGHTCLAY, :GRIPCLAW, :BINDINGBAND, :BIGROOT, :BLACKSLUDGE, :LEFTOVERS, :SHELLBELL, :MENTALHERB, :WHITEHERB, @@ -21,7 +21,7 @@ HELD_ITEMS = [:AIRBALLOON, :BRIGHTPOWDER, :EVIOLITE, :FLOATSTONE, :DESTINYKNOT, :JABOCABERRY, :ROWAPBERRY, :FAIRYGEM] INVALID_ITEMS = [:COVERFOSSIL, :PLUMEFOSSIL, :ACCURACYUP, :DAMAGEUP, :ANCIENTSTONE, :ODDKEYSTONE_FULL, :TM00,:DEVOLUTIONSPRAY] -RANDOM_ITEM_EXCEPTIONS = [:DNASPLICERS] +RANDOM_ITEM_EXCEPTIONS = [:DNASPLICERS, :DYNAMITE] def getRandomGivenTM(item) return item if item == nil diff --git a/Data/Scripts/050_AddOns/AttributeReader.rb b/Data/Scripts/050_AddOns/AttributeReader.rb new file mode 100644 index 000000000..e69de29bb diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 970c969d4..aa49fc168 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -1330,7 +1330,7 @@ def pbFuse(pokemon, poke2, supersplicers = false) previewwindow.y = ((Graphics.height - 96) / 2) - (previewwindow.height / 2) previewwindow.z = 1000000 - if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid))) + if (Kernel.pbConfirmMessage(_INTL("Fuse the two Pokémon?", newid))) previewwindow.dispose typeWindow.dispose fus = PokemonFusionScene.new diff --git a/Data/System.rxdata b/Data/System.rxdata index 2472ee384..b93ec4678 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 21025322b..a244a8e14 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index a64c2c2f3..3d56a3c34 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -2125,7 +2125,7 @@ Pokemon = IVYSAUR,30 ################### [LEADER_Koga,Koga] -Items = HYPERPOTION,HYPERPOTION +Items = HYPERPOTION Pokemon = B88H49,35 #Grimer + Venomoth, Moves = SIGNALBEAM,SLUDGEBOMB,FLING,DISABLE @@ -2661,7 +2661,7 @@ Pokemon = B130H267,61 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,58 #Starkazam +Pokemon = B65H121,58 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -2688,7 +2688,7 @@ Pokemon = B130H267,75 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,76 #Starkazam +Pokemon = B65H121,76 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -2715,7 +2715,7 @@ Pokemon = B130H267,85 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,86 #Starkazam +Pokemon = B65H121,86 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -2744,7 +2744,7 @@ Pokemon = B130H267,61 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,58 #Starkazam +Pokemon = B65H121,58 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -2771,7 +2771,7 @@ Pokemon = B130H267,75 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,76 #Starkazam +Pokemon = B65H121,76 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -2798,7 +2798,7 @@ Pokemon = B130H267,85 #Electados Moves = RAINDANCE,THUNDERPUNCH,WATERFALL,DRAGONDANCE AbilityIndex = 2 Item = DAMPROCK -Pokemon = B65H120,86 #Starkazam +Pokemon = B65H121,86 #Starkazam Moves = PSYCHIC,REFLECT,SURF,COSMICPOWER AbilityIndex = 1 Item = WISEGLASSES @@ -3339,7 +3339,7 @@ Items = SUPERPOTION,SUPERPOTION Pokemon = B18H34,36 #Cueot, Pokemon = TAUROS,39 #Taucute, Pokemon = B130H125,37 #Electados, -Pokemon = B65H121,36 #Starkazam, +Pokemon = B65H120,36 #Starkazam, Pokemon = MEW,41 #Warizard, #starter=charmander @@ -3349,7 +3349,7 @@ Items = SUPERPOTION,SUPERPOTION Pokemon = B18H34,36 #Cueot, Pokemon = TAUROS,39 #Taucute, Pokemon = B130H125,37 #Electados, -Pokemon = B65H121,36 #Starkazam, +Pokemon = B65H120,36 #Starkazam, Pokemon = MEW,41 #Warizard, #starter=squirtle @@ -3359,7 +3359,7 @@ Items = SUPERPOTION,SUPERPOTION Pokemon = B18H34,36 #Cueot, Pokemon = TAUROS,39 #Taucute, Pokemon = B130H125,37 #Electados, -Pokemon = B65H121,36 #Starkazam, +Pokemon = B65H120,36 #Starkazam, Pokemon = MEW,41 #Warizard, ############Encounter 7 - silph co.####### @@ -3369,7 +3369,7 @@ Pokemon = MEW,41 #Warizard, Pokemon = B18H34,44 #Cueot, Pokemon = TAUROS,45 #Taucute, Pokemon = B130H125,42 #Electados, -Pokemon = B64H121,42 #Starkazam, +Pokemon = B64H120,42 #Starkazam, Pokemon = MEW,45 #Warizard, #starter=charmander @@ -3399,7 +3399,7 @@ Pokemon = B18H34,47 #Maroeot, Pokemon = B102H128,45 #Taucute, Pokemon = B111H126,45 #Maghorn, Pokemon = B130H125,47 #Electados, -Pokemon = B65H120,50 #Starkazam, +Pokemon = B65H121,50 #Starkazam, Pokemon = MEW,53 #Blastizard, #starter=charmander @@ -3409,7 +3409,7 @@ Pokemon = B18H34,47 #Maroeot, Pokemon = B102H128,45 #Taucute, Pokemon = B111H126,45 #Maghorn, Pokemon = B130H125,47 #Electados, -Pokemon = B65H120,50 #Starkazam, +Pokemon = B65H121,50 #Starkazam, Pokemon = MEW,53 #Venutoise, #starter=squirtle @@ -3419,7 +3419,7 @@ Pokemon = B18H34,47 #Maroeot, Pokemon = B102H128,45 #Taucute, Pokemon = B111H126,45 #Maghorn, Pokemon = B130H125,47 #Electados, -Pokemon = B65H120,50 #Starkazam, +Pokemon = B65H121,50 #Starkazam, Pokemon = MEW,53 #Charusaur,