diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 826e1e8a6..8e67182ba 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 0c83a0a05..a73775ed5 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map017.rxdata b/Data/Map017.rxdata index 2841fcbed..234aedcd3 100644 Binary files a/Data/Map017.rxdata and b/Data/Map017.rxdata differ diff --git a/Data/Map024.rxdata b/Data/Map024.rxdata index dad50bf34..46c20c326 100644 Binary files a/Data/Map024.rxdata and b/Data/Map024.rxdata differ diff --git a/Data/Map029.rxdata b/Data/Map029.rxdata index d2f0fe9a7..626470d5c 100644 Binary files a/Data/Map029.rxdata and b/Data/Map029.rxdata differ diff --git a/Data/Map031.rxdata b/Data/Map031.rxdata index 050d9d94c..63ae0fc78 100644 Binary files a/Data/Map031.rxdata and b/Data/Map031.rxdata differ diff --git a/Data/Map035.rxdata b/Data/Map035.rxdata index 9c0d64729..77a46cc31 100644 Binary files a/Data/Map035.rxdata and b/Data/Map035.rxdata differ diff --git a/Data/Map036.rxdata b/Data/Map036.rxdata index bdf4e9367..359ed13eb 100644 Binary files a/Data/Map036.rxdata and b/Data/Map036.rxdata differ diff --git a/Data/Map047.rxdata b/Data/Map047.rxdata index 60f767389..7cf704110 100644 Binary files a/Data/Map047.rxdata and b/Data/Map047.rxdata differ diff --git a/Data/Map055.rxdata b/Data/Map055.rxdata index 3d3df3183..08c8b9b54 100644 Binary files a/Data/Map055.rxdata and b/Data/Map055.rxdata differ diff --git a/Data/Map098.rxdata b/Data/Map098.rxdata index 237351ccb..f2c4b4345 100644 Binary files a/Data/Map098.rxdata and b/Data/Map098.rxdata differ diff --git a/Data/Map099.rxdata b/Data/Map099.rxdata index 6f8ee1e7f..db2a7cb90 100644 Binary files a/Data/Map099.rxdata and b/Data/Map099.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index c0b89fc3f..f9ac336d9 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map305.rxdata b/Data/Map305.rxdata index 117bb6e32..e9c22e05f 100644 Binary files a/Data/Map305.rxdata and b/Data/Map305.rxdata differ diff --git a/Data/Map359.rxdata b/Data/Map359.rxdata index 7cf860296..b328a3c5b 100644 Binary files a/Data/Map359.rxdata and b/Data/Map359.rxdata differ diff --git a/Data/Map479.rxdata b/Data/Map479.rxdata index 6b4e22652..f56dc9761 100644 Binary files a/Data/Map479.rxdata and b/Data/Map479.rxdata differ diff --git a/Data/Map526.rxdata b/Data/Map526.rxdata index ef2c17ea7..b367db105 100644 Binary files a/Data/Map526.rxdata and b/Data/Map526.rxdata differ diff --git a/Data/Map527.rxdata b/Data/Map527.rxdata index 5e265b75d..bd1ce9272 100644 Binary files a/Data/Map527.rxdata and b/Data/Map527.rxdata differ diff --git a/Data/Map546.rxdata b/Data/Map546.rxdata index 09bae194a..41d8c97fe 100644 Binary files a/Data/Map546.rxdata and b/Data/Map546.rxdata differ diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata index afd645ab7..41faa416c 100644 Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ diff --git a/Data/Map561.rxdata b/Data/Map561.rxdata index 27800db7a..5fb08e0ad 100644 Binary files a/Data/Map561.rxdata and b/Data/Map561.rxdata differ diff --git a/Data/Map562.rxdata b/Data/Map562.rxdata index 74176122f..07e702566 100644 Binary files a/Data/Map562.rxdata and b/Data/Map562.rxdata differ diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata index e646cf0e2..5004eeb36 100644 Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ diff --git a/Data/Map570.rxdata b/Data/Map570.rxdata index fb2550e82..68d3e7029 100644 Binary files a/Data/Map570.rxdata and b/Data/Map570.rxdata differ diff --git a/Data/Map580.rxdata b/Data/Map580.rxdata index 7f5a2ebcd..c9aaae81b 100644 Binary files a/Data/Map580.rxdata and b/Data/Map580.rxdata differ diff --git a/Data/Map594.rxdata b/Data/Map594.rxdata index 274271199..ed10aa248 100644 Binary files a/Data/Map594.rxdata and b/Data/Map594.rxdata differ diff --git a/Data/Map598.rxdata b/Data/Map598.rxdata index 1c3b148fe..c5e05c681 100644 Binary files a/Data/Map598.rxdata and b/Data/Map598.rxdata differ diff --git a/Data/Map599.rxdata b/Data/Map599.rxdata index 08563850c..f32629325 100644 Binary files a/Data/Map599.rxdata and b/Data/Map599.rxdata differ diff --git a/Data/Map603.rxdata b/Data/Map603.rxdata index 4dd9efce4..d030dbcd7 100644 Binary files a/Data/Map603.rxdata and b/Data/Map603.rxdata differ diff --git a/Data/Map605.rxdata b/Data/Map605.rxdata index 6cb631f24..6c7144195 100644 Binary files a/Data/Map605.rxdata and b/Data/Map605.rxdata differ diff --git a/Data/Map608.rxdata b/Data/Map608.rxdata index 1bd53601d..cab435633 100644 Binary files a/Data/Map608.rxdata and b/Data/Map608.rxdata differ diff --git a/Data/Map616.rxdata b/Data/Map616.rxdata index bd45697b7..55276c36b 100644 Binary files a/Data/Map616.rxdata and b/Data/Map616.rxdata differ diff --git a/Data/Map621.rxdata b/Data/Map621.rxdata index 7e1046d98..4513c4a66 100644 Binary files a/Data/Map621.rxdata and b/Data/Map621.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index 76e6aa97c..fd2efa34c 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/Map645.rxdata b/Data/Map645.rxdata index e7eef4e15..1eabdbbc5 100644 Binary files a/Data/Map645.rxdata and b/Data/Map645.rxdata differ diff --git a/Data/Map665.rxdata b/Data/Map665.rxdata index e4ba02412..67b655415 100644 Binary files a/Data/Map665.rxdata and b/Data/Map665.rxdata differ diff --git a/Data/Map752.rxdata b/Data/Map752.rxdata index 0e1184e32..7ef1a8598 100644 Binary files a/Data/Map752.rxdata and b/Data/Map752.rxdata differ diff --git a/Data/Map753.rxdata b/Data/Map753.rxdata index 845203c07..4c6d7486c 100644 Binary files a/Data/Map753.rxdata and b/Data/Map753.rxdata differ diff --git a/Data/Map754.rxdata b/Data/Map754.rxdata index fe2b33613..72aa0f006 100644 Binary files a/Data/Map754.rxdata and b/Data/Map754.rxdata differ diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata index 4baeae293..01159e293 100644 Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ diff --git a/Data/Map756.rxdata b/Data/Map756.rxdata index b7efffc3e..d1471d677 100644 Binary files a/Data/Map756.rxdata and b/Data/Map756.rxdata differ diff --git a/Data/Map761.rxdata b/Data/Map761.rxdata index a96153d05..47cbd2fbd 100644 Binary files a/Data/Map761.rxdata and b/Data/Map761.rxdata differ diff --git a/Data/Map762.rxdata b/Data/Map762.rxdata index 2e31aa621..5ada54cea 100644 Binary files a/Data/Map762.rxdata and b/Data/Map762.rxdata differ diff --git a/Data/Map773.rxdata b/Data/Map773.rxdata new file mode 100644 index 000000000..200687ec5 Binary files /dev/null and b/Data/Map773.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 93de0ddeb..99fdf62ef 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 c77582692..192ed99a8 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -43,6 +43,7 @@ module Settings HARD_MODE_LEVEL_MODIFIER = 1.1 ZAPMOLCUNO_NB = 176821 + MAPS_WITHOUT_SURF_MUSIC = [762] # The generation that the battle system follows. Used throughout the battle # scripts, and also by some other settings which are used in and out of battle @@ -169,7 +170,7 @@ module Settings BADGE_FOR_FLY = 3 BADGE_FOR_STRENGTH = 5 BADGE_FOR_DIVE = 9 - BADGE_FOR_WATERFALL = 10 + BADGE_FOR_WATERFALL = 8 BADGE_FOR_TELEPORT = 3 BADGE_FOR_BOUNCE = 8 BADGE_FOR_ROCKCLIMB = 16 @@ -257,6 +258,7 @@ module Settings # will begin their numbering at 0 rather than 1 (e.g. Victini in Unova's Dex). DEXES_WITH_OFFSETS = [] + #============================================================================= # A set of arrays, each containing details of a graphic to be shown on the diff --git a/Data/Scripts/010_Data/002_PBS data/008_Species.rb b/Data/Scripts/010_Data/002_PBS data/008_Species.rb index 95c93f66a..0201e6f64 100644 --- a/Data/Scripts/010_Data/002_PBS data/008_Species.rb +++ b/Data/Scripts/010_Data/002_PBS data/008_Species.rb @@ -277,39 +277,6 @@ module GameData return @species end - def get_pre_evolutions - preEvolutions = [] - prevoSpecies = get_previous_species - prevo = GameData::Species.get(prevoSpecies) - preEvolutions << prevo.id if prevo.species != @species - - prevo2 = GameData::Species.get(prevo.get_previous_species) - preEvolutions << GameData::Species.get(prevo2).id if prevo2 != @species && !preEvolutions.include?(prevo2.id) - - prevo3 = GameData::Species.get(prevo2.get_previous_species) - preEvolutions << GameData::Species.get(prevo3).id if prevo3 != @species && !preEvolutions.include?(prevo3.id) - - prevo4 = GameData::Species.get(prevo3.get_previous_species) - preEvolutions << GameData::Species.get(prevo4).id if prevo4 != @species && !preEvolutions.include?(prevo4.id) - - - prevo5 = GameData::Species.get(prevo4.get_previous_species) - preEvolutions << GameData::Species.get(prevo5).id if prevo5 != @species && !preEvolutions.include?(prevo5.id) - - prevo6 = GameData::Species.get(prevo5.get_previous_species) - preEvolutions << GameData::Species.get(prevo6).id if prevo6 != @species && !preEvolutions.include?(prevo6.id) - - echo preEvolutions - echo "\n" - return preEvolutions - # baby = GameData::Species.get(get_baby_species) - # familyEvolutions = baby.get_family_evolutions - # for evo in familyEvolutions - # preEvolutions << evo[0] if evo[0] != @species - # end - # return preEvolutions - end - def get_baby_species(check_items = false, item1 = nil, item2 = nil) ret = @species return ret if @evolutions.length == 0 diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 7fb33738f..01717d18d 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -735,7 +735,7 @@ def pbSurf pbCancelVehicles pbHiddenMoveAnimation(movefinder) surfbgm = GameData::Metadata.get.surf_BGM - pbCueBGM(surfbgm, 0.5) if surfbgm + pbCueBGM(surfbgm, 0.5) if surfbgm && !Settings::MAPS_WITHOUT_SURF_MUSIC.include?($game_map.map_id) pbStartSurfing return true end diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index 53ee89b42..e0533479a 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -1008,7 +1008,7 @@ class PokemonPartyScreen def pbPokemonMultipleEntryScreenEx(ruleset) annot = [] statuses = [] - ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("CANNOT ENTER")] + ordinals = [_INTL("INELIGIBLE"), _INTL("NOT ENTERED"), _INTL("BANNED")] positions = [_INTL("FIRST"), _INTL("SECOND"), _INTL("THIRD"), _INTL("FOURTH"), _INTL("FIFTH"), _INTL("SIXTH"), _INTL("SEVENTH"), _INTL("EIGHTH"), _INTL("NINTH"), _INTL("TENTH"), _INTL("ELEVENTH"), _INTL("TWELFTH")] diff --git a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb index 77ab49644..c26be3d82 100644 --- a/Data/Scripts/016_UI/017_UI_PokemonStorage.rb +++ b/Data/Scripts/016_UI/017_UI_PokemonStorage.rb @@ -2156,6 +2156,7 @@ class PokemonStorageScreen pbDisplay(_INTL("{1} is already fused!", heldpoke.name)) return end + p selected if(heldpoke.egg?) pbDisplay(_INTL("It's impossible to fuse an egg!")) return diff --git a/Data/Scripts/021_Compiler/001_Compiler.rb b/Data/Scripts/021_Compiler/001_Compiler.rb index 9778c106d..c76a94872 100644 --- a/Data/Scripts/021_Compiler/001_Compiler.rb +++ b/Data/Scripts/021_Compiler/001_Compiler.rb @@ -734,7 +734,7 @@ module Compiler end def main - return + #return return if !$DEBUG begin dataFiles = [ diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 7cc8c5630..5c0f19471 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -21,6 +21,7 @@ SWITCH_REVERSED_MODE = 47 SWITCH_GAME_DIFFICULTY_EASY = 665 SWITCH_GAME_DIFFICULTY_HARD = 666 SWITCH_MODERN_MODE=974 +SWITCH_V5_1=825 #Game progression switches SWITCH_DURING_INTRO = 917 diff --git a/Data/Scripts/049_Compatibility/UtilityMethods.rb b/Data/Scripts/049_Compatibility/UtilityMethods.rb index 186e9e602..356579bb8 100644 --- a/Data/Scripts/049_Compatibility/UtilityMethods.rb +++ b/Data/Scripts/049_Compatibility/UtilityMethods.rb @@ -85,75 +85,6 @@ def extract_custom_sprites_that_evolve_into_non_customs(includeOnlyNextEvos=true end -def listAllFinalEvos - finalEvos = [] - for dexNum in 1..PBSpecies.maxValue - species = GameData::Species.get(dexNum) - if species.get_evolutions.length==0 - finalEvos << species - end - end - return finalEvos -end - -def getPreEvoCustomSprites(species, customSPritesList) - pre_evos_with_custom_sprites = [] - - for species_id in species.get_pre_evolutions - species = GameData::Species.get(species_id) - dexNum = species.id_number - if customSPritesList.include?(dexNum) - pre_evos_with_custom_sprites << species - # echo species - # echo "\n" - end - end - return pre_evos_with_custom_sprites -end - -def extract_pokes_with_non_custom_final_evos2() - - outfile = "nonCustomFinals2.csv" - customSpecies = getCustomSpeciesList() - alreadyWritten = [] - finalEvolutions = listAllFinalEvos() - echo "\n\n" - echo "WRITING FILE..." - echo "\n\n" - - File.open(outfile,"wb") { |f| - for evo in finalEvolutions - dexnum = evo.id_number - if !customSpecies.include?(dexnum) - preEvoCustomSprites = getPreEvoCustomSprites(evo,customSpecies) - if preEvoCustomSprites.length >0 - - body = getBodyID(evo.id_number) - head = getHeadID(evo.id_number,body) - - # f.write((head.to_s) +";") - # f.write(".;") - # f.write((body.to_s) +";") - f.write((head.to_s + "." + body.to_s) +";") - f.write(" evolves from : ;") - written_prevos=[] - for prevo in preEvoCustomSprites - next if written_prevos.include?(prevo) - prevoBody = getBodyID(prevo.id_number) - prevoHead = getHeadID(prevo.id_number,prevoBody) - - f.write((prevoHead.to_s + "." + prevoBody.to_s) +";") - written_prevos << prevo - end - f.write("\n") - end - end - end - - } -end - - def extract_pokes_with_non_custom_final_evos(includeOnlyNextEvos=true) outfile = "nonCustomFinals.csv" diff --git a/Data/Scripts/050_AddOns/FusionSprites.rb b/Data/Scripts/050_AddOns/FusionSprites.rb index 63a58d8b6..b6304468e 100644 --- a/Data/Scripts/050_AddOns/FusionSprites.rb +++ b/Data/Scripts/050_AddOns/FusionSprites.rb @@ -141,6 +141,12 @@ module GameData return sprintf(base_path +"316.319.322") when Settings::ZAPMOLCUNO_NB + 19 return sprintf(base_path +"317.320.323") + when Settings::ZAPMOLCUNO_NB + 20 #birdBoss Left + return sprintf(base_path +"invisible") + when Settings::ZAPMOLCUNO_NB + 21 #birdBoss middle + return sprintf(base_path + "144.145.146") + when Settings::ZAPMOLCUNO_NB + 22 #birdBoss right + return sprintf(base_path +"invisible") else return sprintf(base_path + "000") end @@ -165,7 +171,7 @@ module GameData customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + filename) species = getSpecies(dex_number) use_custom = customPath && !species.always_use_generated - if use_custom && dex_number > Settings::NB_POKEMON + if use_custom return customPath end return Settings::BATTLERS_FOLDER + folder + "/" + filename diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 963acb066..66cfb05d1 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 7ae9d8684..ff4e703bd 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ diff --git a/Data/encounters - Copy.dat b/Data/encounters - Copy.dat new file mode 100644 index 000000000..c2539cba7 Binary files /dev/null and b/Data/encounters - Copy.dat differ diff --git a/PBS/items.txt b/PBS/items.txt index fca3fb433..f1909a111 100644 --- a/PBS/items.txt +++ b/PBS/items.txt @@ -666,5 +666,7 @@ 658,TM00,TM00,TM00s,4,0,"A strange TM developped by Team Rocket. It appears to be related to Pokémon fusion.",3,0,0,FUSIONSWAP 659,TM121,TM121,TM121s,4,10000,"The user shoots boiling hot water at its target. It may also leave the target with a burn.",3,0,0,SCALD 660,LINKINGCORD,Linking Cord,Linking Cords,1,6000,"A cable exuding a mysterious energy. It’s loved by certain Pokémon.",1,0,7, +661,INVISIBALL,Invisiball,Invisiball,3,200,"A Pokéball that is completely invisble to the human eye. You shouldn't be able to obtain this item",0,4,4, +