diff --git a/Data/Map004.rxdata b/Data/Map004.rxdata index 58c2c1db8..98bd419db 100644 Binary files a/Data/Map004.rxdata and b/Data/Map004.rxdata differ diff --git a/Data/Map019.rxdata b/Data/Map019.rxdata index c39f295ed..9e58fb696 100644 Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ diff --git a/Data/Map028.rxdata b/Data/Map028.rxdata index c996703ce..38cec99bf 100644 Binary files a/Data/Map028.rxdata and b/Data/Map028.rxdata differ diff --git a/Data/Map098.rxdata b/Data/Map098.rxdata index f2c4b4345..fbd8332a0 100644 Binary files a/Data/Map098.rxdata and b/Data/Map098.rxdata differ diff --git a/Data/Map107.rxdata b/Data/Map107.rxdata index a96959ac9..fc2c79941 100644 Binary files a/Data/Map107.rxdata and b/Data/Map107.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 96d3f1e1f..58fcc7813 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map121.rxdata b/Data/Map121.rxdata index 4d209d069..1d47aeb19 100644 Binary files a/Data/Map121.rxdata and b/Data/Map121.rxdata differ diff --git a/Data/Map206.rxdata b/Data/Map206.rxdata index d2e4cbfb6..37d49ec5f 100644 Binary files a/Data/Map206.rxdata and b/Data/Map206.rxdata differ diff --git a/Data/Map208.rxdata b/Data/Map208.rxdata index 5abe0317f..17f5e3f79 100644 Binary files a/Data/Map208.rxdata and b/Data/Map208.rxdata differ diff --git a/Data/Map212.rxdata b/Data/Map212.rxdata index a9c40816b..1271d8a53 100644 Binary files a/Data/Map212.rxdata and b/Data/Map212.rxdata differ diff --git a/Data/Map305.rxdata b/Data/Map305.rxdata index e9c22e05f..a3f3ecf6e 100644 Binary files a/Data/Map305.rxdata and b/Data/Map305.rxdata differ diff --git a/Data/Map400.rxdata b/Data/Map400.rxdata index 9ab61b6bc..663625f1e 100644 Binary files a/Data/Map400.rxdata and b/Data/Map400.rxdata differ diff --git a/Data/Map491.rxdata b/Data/Map491.rxdata index ffa007a83..8ad14f775 100644 Binary files a/Data/Map491.rxdata and b/Data/Map491.rxdata differ diff --git a/Data/Map546.rxdata b/Data/Map546.rxdata index 41d8c97fe..03d9e390e 100644 Binary files a/Data/Map546.rxdata and b/Data/Map546.rxdata differ diff --git a/Data/Map566.rxdata b/Data/Map566.rxdata index 2b4f29750..1c001573b 100644 Binary files a/Data/Map566.rxdata and b/Data/Map566.rxdata differ diff --git a/Data/Map609.rxdata b/Data/Map609.rxdata index ae257aca9..80ff06ab9 100644 Binary files a/Data/Map609.rxdata and b/Data/Map609.rxdata differ diff --git a/Data/Map616.rxdata b/Data/Map616.rxdata index 55276c36b..d5f803bff 100644 Binary files a/Data/Map616.rxdata and b/Data/Map616.rxdata differ diff --git a/Data/Map659.rxdata b/Data/Map659.rxdata index 6fb8139dd..73083c0a1 100644 Binary files a/Data/Map659.rxdata and b/Data/Map659.rxdata differ diff --git a/Data/Map665.rxdata b/Data/Map665.rxdata index 67b655415..38a45c9df 100644 Binary files a/Data/Map665.rxdata and b/Data/Map665.rxdata differ diff --git a/Data/Map703.rxdata b/Data/Map703.rxdata index aec702aaf..6db08d159 100644 Binary files a/Data/Map703.rxdata and b/Data/Map703.rxdata differ diff --git a/Data/Map752.rxdata b/Data/Map752.rxdata index 4fac11e4d..450deaeca 100644 Binary files a/Data/Map752.rxdata and b/Data/Map752.rxdata differ diff --git a/Data/Map753.rxdata b/Data/Map753.rxdata index 4c6d7486c..b8ed51789 100644 Binary files a/Data/Map753.rxdata and b/Data/Map753.rxdata differ diff --git a/Data/Map754.rxdata b/Data/Map754.rxdata index 21270c3c1..3d0c47907 100644 Binary files a/Data/Map754.rxdata and b/Data/Map754.rxdata differ diff --git a/Data/Map755.rxdata b/Data/Map755.rxdata index 410de1d2c..971f38962 100644 Binary files a/Data/Map755.rxdata and b/Data/Map755.rxdata differ diff --git a/Data/Map757.rxdata b/Data/Map757.rxdata index 1f35a8c69..0cd24487f 100644 Binary files a/Data/Map757.rxdata and b/Data/Map757.rxdata differ diff --git a/Data/Map758.rxdata b/Data/Map758.rxdata index cab14cf0b..907d90aca 100644 Binary files a/Data/Map758.rxdata and b/Data/Map758.rxdata differ diff --git a/Data/Map774.rxdata b/Data/Map774.rxdata new file mode 100644 index 000000000..41f29a123 Binary files /dev/null and b/Data/Map774.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index da77abce6..a7b54fb46 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 6e526be24..280ad5377 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -166,7 +166,7 @@ module Settings BADGE_FOR_CUT = 1 BADGE_FOR_FLASH = 1 BADGE_FOR_ROCKSMASH = 0 - BADGE_FOR_SURF = 5 + BADGE_FOR_SURF = 6 BADGE_FOR_FLY = 3 BADGE_FOR_STRENGTH = 5 BADGE_FOR_DIVE = 9 diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 01717d18d..4f6936bf5 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -390,8 +390,8 @@ Events.onAction += proc { |_sender, _e| break end if surface_map_id && - #$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive - $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_surf + $MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_dive + #$MapFactory.getTerrainTag(surface_map_id, $game_player.x, $game_player.y).can_surf pbSurfacing end else diff --git a/Data/Scripts/050_AddOns/FusionSprites.rb b/Data/Scripts/050_AddOns/FusionSprites.rb index b6304468e..ed7b92b14 100644 --- a/Data/Scripts/050_AddOns/FusionSprites.rb +++ b/Data/Scripts/050_AddOns/FusionSprites.rb @@ -147,6 +147,12 @@ module GameData return sprintf(base_path + "144.145.146") when Settings::ZAPMOLCUNO_NB + 22 #birdBoss right return sprintf(base_path +"invisible") + when Settings::ZAPMOLCUNO_NB + 23 #sinnohboss left + return sprintf(base_path +"invisible") + when Settings::ZAPMOLCUNO_NB + 24 #sinnohboss middle + return sprintf(base_path +"343.344.345") + when Settings::ZAPMOLCUNO_NB + 25 #sinnohboss right + return sprintf(base_path +"invisible") else return sprintf(base_path + "000") end diff --git a/Data/System.rxdata b/Data/System.rxdata index 56988dd53..241b0e3e0 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 1ff2dd4f5..d587ad879 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/PBS/trainers.txt b/PBS/trainers.txt index 318b83043..5f6e92ce6 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1980,21 +1980,21 @@ Pokemon = B67H72,31 #Tentachoke, [ROCKETBOSS,Giovanni,0] Items = MAXPOTION Pokemon = B95H24,32 #Arbix, - Ball = ROCKETBALL + Ball = ULTRABALL Pokemon = B131H111,32 #Rhyras, - Ball = ROCKETBALL + Ball = ULTRABALL Pokemon = B115H93,35 #Hauntkan, - Ball = ROCKETBALL + Ball = ULTRABALL [ROCKETBOSS,Giovanni,4] #Silph co Items = MAXPOTION Pokemon = B33H57,45 #nidorino + primeape - Ball = ROCKETBALL + Ball = ULTRABALL Pokemon = B131H112,45 #rhydon + lapras - Ball = ROCKETBALL + Ball = ULTRABALL Pokemon = B115H94,47 #gengar + kangaskhan - Ball = ROCKETBALL + Ball = ULTRABALL Pokemon = B31H28,51 #nidoqueen + Sandslash - Ball = ROCKETBALL + Ball = ULTRABALL ############################## @@ -2237,42 +2237,61 @@ Pokemon = B131H265,50 #Rhyras, Moves = SURF,BULLDOZE,SANDSTORM,SING AbilityIndex = 1 Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B51H125,50 #Electatrio, Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE AbilityIndex = 0 Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B68H76,52 #GOLCHAMP, Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE AbilityIndex = 0 Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B248H273,54 #DNIDOKING, Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB AbilityIndex = 1 Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B143H112,54 #snordon, Moves = EARTHQUAKE,REST,SNORE,HORNDRILL AbilityIndex = 0 Item = SOFTSAND + Ball = ULTRABALL [LEADER_Giovanni,Giovanni,1] Items = FULLRESTORE,FULLRESTORE Pokemon = B131H265,72 #Rhyras, Moves = SURF,BULLDOZE,SANDSTORM,SING Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B51H125,73 #Electatrio, Moves = BULLDOZE,LIGHTSCREEN,THUNDERWAVE,DISCHARGE Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B68H76,74 #GOLCHAMP, Moves = EARTHQUAKE,DYNAMICPUNCH,COUNTER,SCARYFACE Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B248H273,72 #DNIDOKING, Moves = EARTHQUAKE,THRASH,MEGAHORN,POISONJAB Item = SOFTSAND + Ball = ULTRABALL + Pokemon = B143H112,75 #Nidon, Moves = EARTHQUAKE,REST,SNORE,HORNDRILL Item = SOFTSAND + Ball = ULTRABALL Pokemon = B299H248,75 #TYRANCHOMP Item = SOFTSAND + Ball = ULTRABALL ####################### #### E4 ############### ################### @@ -3556,17 +3575,17 @@ Pokemon = BIRDBOSS,50 # [ROCKETBOSS,Giovanni,5] Items = FULLHEAL,FULLHEAL,FULLHEAL -Pokemon = BIRDBOSS_3,60 # #Articuno +Pokemon = BIRDBOSS_3,50 # #Articuno Moves = HAZE,REFLECT,ICEBEAM,ROOST Ball = INVISIBALL AbilityIndex = 0 Item = CHARTIBERRY -Pokemon = BIRDBOSS_2,60 # #Moltres +Pokemon = BIRDBOSS_2,50 # #Moltres Moves = TAILWIND,SAFEGUARD,FLAMETHROWER,ROOST Ball = MASTERBALL AbilityIndex = 0 Item = CHARTIBERRY -Pokemon = BIRDBOSS_1,60 # #Zapdos +Pokemon = BIRDBOSS_1,50 # #Zapdos Moves = LIGHTSCREEN,THUNDERBOLT,DRILLPECK,ROOST Ball = INVISIBALL AbilityIndex = 0