diff --git a/Credits.txt b/Credits.txt index 40c335dd9..97b390810 100644 --- a/Credits.txt +++ b/Credits.txt @@ -44,6 +44,9 @@ Special thanks to Aegide for helping to rip the sprites from the website and to the owners of the respective fusion websites for accepting to share their sprites. +Intro cinamatic +##################### +Kiwi Custom fusion sprites ##################### diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index d9768a4e2..24cf727f5 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map055.rxdata b/Data/Map055.rxdata index b4ce7444c..625ba3e96 100644 Binary files a/Data/Map055.rxdata and b/Data/Map055.rxdata differ diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata index 583e7452f..f31dddf34 100644 Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ diff --git a/Data/Map079.rxdata b/Data/Map079.rxdata index 670f459c6..a0b34de19 100644 Binary files a/Data/Map079.rxdata and b/Data/Map079.rxdata differ diff --git a/Data/Map096.rxdata b/Data/Map096.rxdata index ff3503c6b..719d22cab 100644 Binary files a/Data/Map096.rxdata and b/Data/Map096.rxdata differ diff --git a/Data/Map144.rxdata b/Data/Map144.rxdata index 4d8555277..0c0eef6e0 100644 Binary files a/Data/Map144.rxdata and b/Data/Map144.rxdata differ diff --git a/Data/Map152.rxdata b/Data/Map152.rxdata index cdb00d4f8..711f56a2d 100644 Binary files a/Data/Map152.rxdata and b/Data/Map152.rxdata differ diff --git a/Data/Map218.rxdata b/Data/Map218.rxdata index 124f85819..bb5370317 100644 Binary files a/Data/Map218.rxdata and b/Data/Map218.rxdata differ diff --git a/Data/Map318.rxdata b/Data/Map318.rxdata index 1038f1247..e7cf04fd6 100644 Binary files a/Data/Map318.rxdata and b/Data/Map318.rxdata differ diff --git a/Data/Map385.rxdata b/Data/Map385.rxdata index 54e2e6e7c..033fe22f7 100644 Binary files a/Data/Map385.rxdata and b/Data/Map385.rxdata differ diff --git a/Data/Map472.rxdata b/Data/Map472.rxdata index 641fc8230..9298885a4 100644 Binary files a/Data/Map472.rxdata and b/Data/Map472.rxdata differ diff --git a/Data/Map479.rxdata b/Data/Map479.rxdata index 1e71583b9..2bed9fafa 100644 Binary files a/Data/Map479.rxdata and b/Data/Map479.rxdata differ diff --git a/Data/Map482.rxdata b/Data/Map482.rxdata index 8f9b5a409..1b903ed85 100644 Binary files a/Data/Map482.rxdata and b/Data/Map482.rxdata differ diff --git a/Data/Map487.rxdata b/Data/Map487.rxdata index f4ff94f8c..aa862adc2 100644 Binary files a/Data/Map487.rxdata and b/Data/Map487.rxdata differ diff --git a/Data/Map489.rxdata b/Data/Map489.rxdata deleted file mode 100644 index 6998f1a89..000000000 Binary files a/Data/Map489.rxdata and /dev/null differ diff --git a/Data/Map506.rxdata b/Data/Map506.rxdata index f5f91c78c..f4a367d86 100644 Binary files a/Data/Map506.rxdata and b/Data/Map506.rxdata differ diff --git a/Data/Map660.rxdata b/Data/Map660.rxdata index c05ac5d4a..b70bbf65b 100644 Binary files a/Data/Map660.rxdata and b/Data/Map660.rxdata differ diff --git a/Data/Map662.rxdata b/Data/Map662.rxdata index f2eede61b..bca2cb04c 100644 Binary files a/Data/Map662.rxdata and b/Data/Map662.rxdata differ diff --git a/Data/Map664.rxdata b/Data/Map664.rxdata index 4cfda635f..efa7a2cda 100644 Binary files a/Data/Map664.rxdata and b/Data/Map664.rxdata differ diff --git a/Data/Map758.rxdata b/Data/Map758.rxdata index 4e75d5f5c..f7d2122a7 100644 Binary files a/Data/Map758.rxdata and b/Data/Map758.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index bd5f0432f..0f6cfb66b 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_AddOns/New HMs.rb b/Data/Scripts/050_AddOns/New HMs.rb index e108b9645..b695064f6 100644 --- a/Data/Scripts/050_AddOns/New HMs.rb +++ b/Data/Scripts/050_AddOns/New HMs.rb @@ -85,7 +85,8 @@ end ############### MORNING SUN / MOONLIGHT HiddenMoveHandlers::CanUseMove.add(:MORNINGSUN,proc{|move,pkmn| - if !GameData::MapMetadata.get($game_map.map_id).outdoor_map + mapMetadata = GameData::MapMetadata.get($game_map.map_id) + if !mapMetadata || !mapMetadata.outdoor_map Kernel.pbMessage(_INTL("Can't use that here.")) next false end @@ -107,7 +108,8 @@ HiddenMoveHandlers::UseMove.add(:MORNINGSUN,proc{|move,pokemon| }) HiddenMoveHandlers::CanUseMove.add(:MOONLIGHT,proc{|move,pkmn| - if !GameData::MapMetadata.get($game_map.map_id).outdoor_map + mapMetadata = GameData::MapMetadata.get($game_map.map_id) + if !mapMetadata || !mapMetadata.outdoor_map Kernel.pbMessage(_INTL("Can't use that here.")) next false end diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb index b37ec9cdc..2f3718cc6 100644 --- a/Data/Scripts/999_Main/999_Main.rb +++ b/Data/Scripts/999_Main/999_Main.rb @@ -30,6 +30,8 @@ def handleReplaceExistingSprites() when 0 #Do not import pbMessage("You can manually sort the new sprites in the /indexed folder to choose which ones you want to keep.") pbMessage("You can also delete the ones you don't want to replace the main sprites and restart the game.") + pbMessage("Keep in mind that the game will take longer to load until these sprites are imported/removed.") + return when 1 #Replace olds spritesToReplaceList.each do |oldPath, newPath| diff --git a/Data/System.rxdata b/Data/System.rxdata index b985856f7..5f4a4a991 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index a7e9f4cf9..acaa59516 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/map_connections.dat b/Data/map_connections.dat index 30d6bedfd..fb901176a 100644 Binary files a/Data/map_connections.dat and b/Data/map_connections.dat differ diff --git a/Data/map_metadata.dat b/Data/map_metadata.dat index c41942304..8db11e971 100644 Binary files a/Data/map_metadata.dat and b/Data/map_metadata.dat differ diff --git a/Data/messages.dat b/Data/messages.dat index 4e720ff22..46cb7ad9a 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/trainers.dat b/Data/trainers.dat index 4b6f13dd5..a3eb9ad72 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ diff --git a/Graphics/CustomBattlers/232-1.png b/Graphics/CustomBattlers/232-1.png deleted file mode 100644 index 0b0d28547..000000000 Binary files a/Graphics/CustomBattlers/232-1.png and /dev/null differ diff --git a/Graphics/CustomBattlers/243c.png b/Graphics/CustomBattlers/243c.png deleted file mode 100644 index 9df2bb2ce..000000000 Binary files a/Graphics/CustomBattlers/243c.png and /dev/null differ diff --git a/Graphics/CustomBattlers/270c.png b/Graphics/CustomBattlers/270c.png deleted file mode 100644 index b6cc5c9f3..000000000 Binary files a/Graphics/CustomBattlers/270c.png and /dev/null differ diff --git a/Graphics/CustomBattlers/282c.png b/Graphics/CustomBattlers/282c.png deleted file mode 100644 index a2da9fd47..000000000 Binary files a/Graphics/CustomBattlers/282c.png and /dev/null differ diff --git a/Graphics/CustomBattlers/284c.png b/Graphics/CustomBattlers/284c.png deleted file mode 100644 index f3b7f4454..000000000 Binary files a/Graphics/CustomBattlers/284c.png and /dev/null differ diff --git a/Graphics/CustomBattlers/374a.png b/Graphics/CustomBattlers/374a.png deleted file mode 100644 index be959a0ea..000000000 Binary files a/Graphics/CustomBattlers/374a.png and /dev/null differ diff --git a/Graphics/CustomBattlers/59a.png b/Graphics/CustomBattlers/59a.png deleted file mode 100644 index daac9c937..000000000 Binary files a/Graphics/CustomBattlers/59a.png and /dev/null differ diff --git a/Graphics/CustomBattlers/67a.png b/Graphics/CustomBattlers/67a.png deleted file mode 100644 index 9a0cc894d..000000000 Binary files a/Graphics/CustomBattlers/67a.png and /dev/null differ diff --git a/Graphics/CustomBattlers/187.50.PNG b/Graphics/CustomBattlers/indexed/187/187.50.png similarity index 100% rename from Graphics/CustomBattlers/187.50.PNG rename to Graphics/CustomBattlers/indexed/187/187.50.png diff --git a/PBS/connections.txt b/PBS/connections.txt index 24839efec..fffc17334 100644 --- a/PBS/connections.txt +++ b/PBS/connections.txt @@ -6,10 +6,6 @@ 437,South,0,440,North,11 # Route 15 (444) - Route 14 (440) 444,East,0,440,West,6 -# Area 5 (487) - Secret Area (489) -487,West,0,489,East,0 -# Secret Area (489) - Area 1 (445) -489,65,85,445,0,0 # Vermillion City (19) - Route 6 (16) 19,North,1,16,South,0 # Vermillion City (19) - Route 11 (155)