gitkeep

This reverts commit d559b813ed.

.gitignore

@@ -1,6 +1,8 @@
 Graphics/CustomBattlers/local_sprites/*
 Graphics/Pokemon/FusionIcons/*
-Graphics/CustomBattlers/spritesheets
+Graphics/Battlers/Shiny/*
+
+Graphics/CustomBattlers/spritesheets/*
 Graphics/CustomBattlers/*
 Data/sprites/*
 Data/VERSION

Credits.txt

@@ -1,4 +1,5 @@
 ##########		CREDITS	         ###############
+Pok?mon Infinite Fusion: Hoenn
 Game made by Chardub
 
 *This is NOT an official Pokemon game. The author of this game is not 
@@ -12,19 +13,29 @@ Chardub
 ##############################
 ##	Maps		    		##
 ##############################	
-Chardub, Kiwikelly
-
-Some of the maps were based on work by:
-BenGames,Films, and More! (Pokemon Adventures in Kanto) http://www.pokecommunity.com/showthread.php?t=303850
-Zeak6464 (Kanto Map pack) http://www.pokecommunity.com/showthread.php?t=345591
+Chardub, Kiwikelly, Payapon
 
 #################################
 #	Story / Dialogues	#
 #################################
 Chardub
 Kiwikelly
-The story and dialogues were based off Pokémon Red and Blue, as well as
-Pokémon Gold and Silver. Both games are made by Game Freak.
+The story and dialogues were based off Pok?mon Ruby, Sapphire and Emerald, as well as Pok?mon
+Omega Ruby and Alpha Sapphire, which are all made by Game Freak.
+
+##############################
+##	Music		    							##
+##############################	
+Pory
+
+##############################
+## Animation									##
+#############################
+-- Intro cinematic animation --
+Kiwikelly
+
+
+
 
 ###########################################################
 ###	Fusion Sprites										###
@@ -35,47 +46,77 @@ Generated Sprites
 Pokefusion 2 (version 4.5+)
 http://japeal.com/pkm
 
-Pokefusion (version 4.0-4.4)
-http://pokefusion.japeal.com/
-
-Alexonsager (version 3.x and below) 
-http://pokemon.alexonsager.net/
-
 Special thanks to Aegide and Reizod 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 cinematic
+Custom sprites
 #####################
-Kiwikelly
-
+Individual sprite credits can be found in Data/SPRITE_CREDS file for full, up to date credits
 
 Custom sprites collecting and handling
 Kiwikelly, Payapon, Thornsoflight
 
 Discord custom sprites coordination 
+--- Sprite Managers ---
 avianAnnihilator<s>Blaquaza
-BéBoutton<s>CaBiNE
+BBoutton<s>CaBiNE
 CoramSun<s>hero.drawing
-Howls<s>Ignus
+Howlingstarr<s>Ignus
 Kiwi<s>Maelmc
 Milchik the Miltank<s>Payapon
 Pix<s>Rosemagwin
-Thornsoflight
+Thornsoflight<s>FauxBlue
 
-Custom fusion sprites
-#####################
-Check the Data/SPRITE_CREDS file for full, up to date credits
+### Spriter application reviews (Klefki)
+007z3lda<s>barkey<s>the_cardinals
+doodledoo<s>grafaiguy<s>gummy.frog
+holgast<s>ignust<s>jcobe800
+markusknight<s>monolithyk<s>stickieanimates
+takopus<s>_woofa_<s>yumatei
+
+### Sprites quality assurance (Chansey)
+dodoowner_<s>fauxblue<s>fioretovi
+<greystorm101<s>.payapon<s>smasllcutekitty
+odditylad<s>midnightender6<s>toadettexmushina
+
+### Spriting process checking (Swablu)
+cataylor_01<s>pikahunter07<s>say_4732
+justvince.<s>
+
+### Abandoned sprites harvesting (Zigzagoon)
+_testrun_<s>greystorm101<s>.izik
+mystora<s>reddevil85<s>riberna
+chespining<s>togepimax
 
 
-Triple fusion sprites
-########################
-Legendary birds fusion sprite by Universez
-Legendary beasts fusion sprite by Milchik
-Weather trio fusion sprite by magnuzone
-Creation and Tao trio trio fusion sprite by mammuth89
 
 
+###################################
+###	Game quality assurance					###
+###################################
+### Tech support and bugs reporting management 
+sapphire_chuu<s>megaman.
+ymirbot<s>
+
+### Tech support and bugs reporting(Porygon)
+sapphire_chu<s>ernesto_gaming<s>xiaoanemo
+kitsuwren<s>lunarcharlotte<s>megaman.
+casinoluck<s>ymirbot
+
+
+
+###################################
+###	Custom Pok?dex entries					###
+###################################
+### Pok?dex entries quality control (Unown)
+luvischlo<s>char_latte3412<s>strawbearycandy
+bobosmith01<s>griddle<s>.izik
+knilk<s>lordjoostmeister<s>.realthree
+wigglypon<s>wildheartrazorfangs<s>ziggaway
+
+### Individual Pok?dex entries credits can be found in Data/pokedex/dex.json 
+
 ###########################################################
 ####		Pokemon Essentials			 ###
 ###########################################################
@@ -104,8 +145,6 @@ The following ressources were also used
 with their respective authors' consent
 #######################################################################
 ### Sprites ###
-
-
 	Overworld Sprites:
 		Custom graphics:
 		Kiwikelly, Knuckles, UnworthyPie
@@ -116,7 +155,9 @@ with their respective authors' consent
 		SailorVicious (Prof. Elm OW sprite) 	https://www.deviantart.com/sailorvicious
 		OceansLugiaSpirit (Koga OW sprite)  	http://oceanslugiaspirit.deviantart.com/
 		Wolfang62: https://www.deviantart.com/wolfang62/art/Wimpod-Sprite-Overworld-836704744
-		zender1752 (Sabrina OW sprite)
+		zender1752 (Sabrina OW sprite)	https://www.deviantart.com/zender1752/art/Pokemon-Anime-Delia-Ketchum-Overworld-sprite-840038766
+		wesleyfg (Hoenn overworld NPCs) https://www.deviantart.com/wesleyfg/art/Hoenn-People-OW-in-BW-style-274475232
+		Wergan https://www.deviantart.com/wergan/art/Pokemon-Random-characters-002-959395621
 	Battle sprites: 
 		Custom graphics:
 		Kiwikelly, UnworthyPie
@@ -125,6 +166,9 @@ with their respective authors' consent
 		luckygirl88  (Misty VS sprite) 		http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
 		Lorelei VS sprite by Nalty 		http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
 		x-5-4-5-2 (Sabrina sprite) 		https://www.deviantart.com/x-5-4-5-2/art/Game-Sabrina-204548703
+		
+		Zender1752 	(overworld mom sprite) 	https://www.deviantart.com/zender1752/art/Pokemon-Anime-Delia-Ketchum-Overworld-sprite-840038766
+		
 ### Custom tileset graphics ###
 Kiwikelly
 
@@ -173,7 +217,7 @@ audreyeyeyeye https://www.deviantart.com/audreyeyeyeye/art/Pokemon-Type-Icons-FR
 
 
 ### Other graphics			
-Region map: Kiwikelly
+Hoenn map: shivanking (Deviantart)
 Move animations:
 
 	Augmented Reborn Animations Project
@@ -188,7 +232,12 @@ Move animations:
 ###			RPG Maker Scripts		###
 ###########################################################
 
-andracass (Pokémon Reborn)	Compiler optimization
+#Custom Infinite fusion scripts: 
+Improved Shinies: anthonygourmand
+andracass (Pok?on Reborn)	Compiler optimization (legacy)
+
+#Public use scripts:
+
 Luka S.J.			Elite Battle System
 				Animated Title Screen (modified):
 shiney570 			BW2 Summary script (+ graphics)	http://reliccastle.com/forums/showthread.php?tid=1090

Data/Scripts/001_Settings.rb

@@ -5,9 +5,9 @@
 #==============================================================================#
 module Settings
   # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '6.5.1'
-  GAME_VERSION_NUMBER = "6.5.1"
-  LATEST_GAME_RELEASE = "6.5"
+  GAME_VERSION = '6.6.0'
+  GAME_VERSION_NUMBER = "6.6.0"
+  LATEST_GAME_RELEASE = "6.6"
 
   POKERADAR_LIGHT_ANIMATION_RED_ID = 17
   POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
@@ -17,11 +17,14 @@ module Settings
   LEADER_VICTORY_MUSIC="Battle victory leader"
   TRAINER_VICTORY_MUSIC="trainer-victory"
   WILD_VICTORY_MUSIC="wild-victory"
+
   #getRandomCustomFusionForIntro
   FUSION_ICON_SPRITE_OFFSET = 10
 
+  ANIMATE_REFLECTIONS= false#GAME_ID == :IF_HOENN #true
+  USE_REFLECTIONS = false
   #Infinite fusion settings
-  NB_POKEMON = 501
+  NB_POKEMON = Settings::GAME_ID == :IF_HOENN ? 565 : 501
   CUSTOM_BASE_SPRITES_FOLDER = "Graphics/CustomBattlers/local_sprites/BaseSprites/"
   CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/"
   CUSTOM_SPRITES_TO_IMPORT_FOLDER = "Graphics/CustomBattlers/Sprites to import/"
@@ -79,7 +82,7 @@ module Settings
   EGGSPRITE_SCALE = 1
   BACKSPRITE_POSITION_OFFSET = 20
   FRONTSPRITE_POSITION = 200
-  SHINY_HUE_OFFSET = 75
+  SHINY_HUE_OFFSET = 75 #no longer used
   NO_LEVEL_MODE_LEVEL_INCR = 5.8
   NO_LEVEL_MODE_LEVEL_BASE = 6
 
@@ -161,7 +164,7 @@ module Settings
   # 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 = 16#(MECHANICS_GENERATION >= 6) ? 16 : 8
+  SHINY_POKEMON_CHANCE =16#(MECHANICS_GENERATION >= 6) ? 16 : 8
 
   # The odds of a wild Pokémon/bred egg having Pokérus (out of 65536).
   POKERUS_CHANCE = 3
@@ -218,10 +221,10 @@ module Settings
   POISON_IN_FIELD = true #(MECHANICS_GENERATION <= 4)
   # Whether poisoned Pokémon will faint while walking around in the field
   # (true), or survive the poisoning with 1 HP (false).
-  POISON_FAINT_IN_FIELD = (MECHANICS_GENERATION >= 3)
+  POISON_FAINT_IN_FIELD = false
   # Whether planted berries grow according to Gen 4 mechanics (true) or Gen 3
   # mechanics (false).
-  NEW_BERRY_PLANTS = (MECHANICS_GENERATION >= 4)
+  NEW_BERRY_PLANTS = true
   # Whether fishing automatically hooks the Pokémon (true), or whether there is
   # a reaction test first (false).
   FISHING_AUTO_HOOK = false
@@ -526,6 +529,9 @@ module Settings
   # ID of the animation played when a berry tree grows a stage while the player
   # is on the map (for new plant growth mechanics only).
   PLANT_SPARKLE_ANIMATION_ID = 7
+  SPARKLE_SHORT_ANIMATION_ID = 25
+  SPARKLE_SUBTLE_ANIMATION_ID = 29
+
   SLEEP_ANIMATION_ID = 26
 
   CUT_TREE_ANIMATION_ID = 19

Data/Scripts/001_Technical/001_MKXP_Compatibility.rb

@@ -1,6 +1,8 @@
 # Using mkxp-z v2.2.0 - https://gitlab.com/mkxp-z/mkxp-z/-/releases/v2.2.0
 $VERBOSE = nil
 Font.default_shadow = false if Font.respond_to?(:default_shadow)
+Encoding.default_internal = Encoding::UTF_8
+Encoding.default_external = Encoding::UTF_8
 Graphics.frame_rate = 40
 
 def pbSetWindowText(string)
@@ -13,8 +15,15 @@ class Bitmap
   alias mkxp_draw_text draw_text unless method_defined?(:mkxp_draw_text)
 
   def draw_text(x, y, width, height, text, align = 0)
-    height = text_size(text).height
-    mkxp_draw_text(x, y, width, height, text, align)
+    if x.is_a?(Rect)
+      x.y -= (@text_offset_y || 0)
+      # rect, string & alignment
+      mkxp_draw_text(x, y, width)
+    else
+      y -= (@text_offset_y || 0)
+      height = text_size(text).height
+      mkxp_draw_text(x, y, width, height, text, align)
+    end
   end
 end
 

Data/Scripts/004_Game classes/001_Game_Screen.rb

@@ -17,6 +17,7 @@ class Game_Screen
   attr_reader   :weather_type       # weather type
   attr_reader   :weather_max        # max number of weather sprites
   attr_accessor :weather_duration   # ticks in which the weather should fade in
+  attr_accessor :weather_power
   #-----------------------------------------------------------------------------
   # * Object Initialization
   #-----------------------------------------------------------------------------
@@ -41,6 +42,7 @@ class Game_Screen
     @weather_type     = 0
     @weather_max      = 0.0
     @weather_duration = 0
+    @weather_power    = 0
   end
   #-----------------------------------------------------------------------------
   # * Start Changing Color Tone
@@ -82,6 +84,7 @@ class Game_Screen
   #-----------------------------------------------------------------------------
   def weather(type, power, duration)
     @weather_type     = GameData::Weather.get(type).id
+    @weather_power    = power
     @weather_max      = (power + 1) * RPG::Weather::MAX_SPRITES / 10
     @weather_duration = duration   # In 1/20ths of a seconds
   end

Data/Scripts/004_Game classes/001_Switches and Variables/002_Game_Switches.rb

@@ -9,7 +9,6 @@ class Game_Switches
   # * Object Initialization
   #-----------------------------------------------------------------------------
   def initialize
-    echoln caller
     @data = []
   end
   #-----------------------------------------------------------------------------

Data/Scripts/004_Game classes/004_Game_Map.rb

@@ -126,6 +126,10 @@ class Game_Map
     return @map.data;
   end
 
+  def tileset_id;
+    return @map.tileset_id;
+  end
+
   def name
     ret = pbGetMessage(MessageTypes::MapNames, @map_id)
     ret.gsub!(/\\PN/, $Trainer.name) if $Trainer

Data/Scripts/004_Game classes/007_Game_Character.rb

@@ -77,6 +77,7 @@ class Game_Character
     @locked = false
     @prelock_direction = 0
     @under_everything=false
+    @forced_z=nil
   end
 
   def at_coordinate?(check_x, check_y)
@@ -339,6 +340,7 @@ class Game_Character
   def screen_z(height = 0)
     return -1 if @under_everything
     return 999 if @always_on_top
+    return @forced_z if @forced_z
     z = screen_y_ground
     if @tile_id > 0
       begin

Data/Scripts/004_Game classes/008_Game_Event.rb

@@ -24,6 +24,9 @@ class Game_Event < Game_Character
     @through      = true
     @to_update    = true
     @tempSwitches = {}
+    if @event.name[/forced_z\s*=\s*(-?\d+)/i]
+      @forced_z = $1.to_i
+    end
     moveto(@event.x, @event.y) if map
     refresh
   end
@@ -140,6 +143,7 @@ class Game_Event < Game_Character
     return false
   end
 
+
   def pbCheckEventTriggerAfterTurning
     return if $game_system.map_interpreter.running? || @starting
     if @event.name[/trainer\((\d+)\)/i]
@@ -276,4 +280,10 @@ class Game_Event < Game_Character
       @interpreter.update
     end
   end
+
+  def active?
+    return !@erased && @page != nil
+  end
+
+
 end

Data/Scripts/005_Sprites/003_Sprite_Character.rb

@@ -75,14 +75,20 @@ class Sprite_Character < RPG::Sprite
 
     @oldbushdepth = 0
     @spriteoffset = false
-    if !character || character == $game_player || (character.name[/reflection/i] rescue false)
-      @reflection = Sprite_Reflection.new(self, character, viewport)
+    if Settings::USE_REFLECTIONS && (!character || character == $game_player || (character.name[/reflection/i] rescue false))
+      @reflection = Sprite_Reflection.new(self, viewport)
     end
     @surfbase = Sprite_SurfBase.new(self, character, viewport) if character == $game_player
-    checkModifySpriteGraphics(@character) if @character
+    if @character && @character != $game_player
+      checkModifySpriteGraphics(@character) if @character.active?
+    end
     update
   end
 
+  def event_is_active?(game_event)
+    return !game_event.event.page.nil?
+  end
+
   def checkModifySpriteGraphics(character)
     return if character == $game_player || !character.name
     if TYPE_EXPERTS_APPEARANCES.keys.include?(character.name.to_sym)
@@ -216,8 +222,8 @@ class Sprite_Character < RPG::Sprite
         @bushbitmap = nil
         #@spriteoffset = @character_name[/offset/i]
         @spriteoffset = @character_name[/fish/i] || @character_name[/dive/i] || @character_name[/surf/i]
-        @cw = @charbitmap.width / 4
-        @ch = @charbitmap.height / 4
+        @cw = @charbitmap.width / 4 if !@charbitmap.disposed?
+        @ch = @charbitmap.height / 4 if !@charbitmap.disposed?
         self.ox = @cw / 2
         @character.sprite_size = [@cw, @ch]
       end

Data/Scripts/005_Sprites/004_Sprite_Reflection.rb

@@ -1,18 +1,18 @@
+#===============================================================================
+#
+#===============================================================================
 class Sprite_Reflection
   attr_reader :visible
-  attr_accessor :event
 
-  def initialize(sprite,event,viewport=nil)
-    @rsprite  = sprite
-    @sprite   = nil
-    @event    = event
-    @height   = 0
+  def initialize(parent_sprite, viewport = nil)
+    @parent_sprite = parent_sprite
+    @sprite = nil
+    @height = 0
     @fixedheight = false
-    if @event && @event!=$game_player
-      if @event.name[/reflection\((\d+)\)/i]
-        @height = $~[1].to_i || 0
-        @fixedheight = true
-      end
+    if @parent_sprite.character && @parent_sprite.character != $game_player &&
+      @parent_sprite.character.name[/reflection\((\d+)\)/i]
+      @height = $~[1].to_i || 0
+      @fixedheight = true
     end
     @viewport = viewport
     @disposed = false
@@ -20,15 +20,19 @@ class Sprite_Reflection
   end
 
   def dispose
-    if !@disposed
-      @sprite.dispose if @sprite
-      @sprite   = nil
-      @disposed = true
-    end
+    return if @disposed
+    @sprite&.dispose
+    @sprite = nil
+    @parent_sprite = nil
+    @disposed = true
   end
 
   def disposed?
-    @disposed
+    return @disposed
+  end
+
+  def event
+    return @parent_sprite.character
   end
 
   def visible=(value)
@@ -37,51 +41,53 @@ class Sprite_Reflection
   end
 
   def update
-    return
-  #   return if disposed?
-  #   shouldShow = @rsprite.visible
-  #   if !shouldShow
-  #     # Just-in-time disposal of sprite
-  #     if @sprite
-  #       @sprite.dispose
-  #       @sprite = nil
-  #     end
-  #     return
-  #   end
-  #   # Just-in-time creation of sprite
-  #   @sprite = Sprite.new(@viewport) if !@sprite
-  #   if @sprite
-  #     x = @rsprite.x-@rsprite.ox
-  #     y = @rsprite.y-@rsprite.oy
-  #     y -= 32 if @rsprite.character.character_name[/offset/i]
-  #     @height = $PokemonGlobal.bridge if !@fixedheight
-  #     y += @height*16
-  #     width  = @rsprite.src_rect.width
-  #     height = @rsprite.src_rect.height
-  #     @sprite.x        = x+width/2
-  #     @sprite.y        = y+height+height/2
-  #     @sprite.ox       = width/2
-  #     @sprite.oy       = height/2-2   # Hard-coded 2 pixel shift up
-  #     @sprite.oy       -= @rsprite.character.bob_height*2
-  #     @sprite.z        = -50   # Still water is -100, map is 0 and above
-  #     @sprite.zoom_x   = @rsprite.zoom_x
-  #     @sprite.zoom_y   = @rsprite.zoom_y
-  #     frame = (Graphics.frame_count%40)/10
-  #     @sprite.zoom_x   *= [1.0, 0.95, 1.0, 1.05][frame]
-  #     @sprite.angle    = 180.0
-  #     @sprite.mirror   = true
-  #     @sprite.bitmap   = @rsprite.bitmap
-  #     @sprite.tone     = @rsprite.tone
-  #     if @height>0
-  #       @sprite.color   = Color.new(48,96,160,255)   # Dark still water
-  #       @sprite.opacity = @rsprite.opacity
-  #       @sprite.visible = !Settings::TIME_SHADING   # Can't time-tone a colored sprite
-  #     else
-  #       @sprite.color   = Color.new(224,224,224,96)
-  #       @sprite.opacity = @rsprite.opacity*3/4
-  #       @sprite.visible = true
-  #     end
-  #     @sprite.src_rect = @rsprite.src_rect
-  #   end
-   end
+    return if disposed?
+    shouldShow = @parent_sprite.visible
+    if !shouldShow
+      # Just-in-time disposal of sprite
+      if @sprite
+        @sprite.dispose
+        @sprite = nil
+      end
+      return
+    end
+    # Just-in-time creation of sprite
+    @sprite = Sprite.new(@viewport) if !@sprite
+    if @sprite
+      x = @parent_sprite.x - (@parent_sprite.ox * TilemapRenderer::ZOOM_X)
+      y = @parent_sprite.y - (@parent_sprite.oy * TilemapRenderer::ZOOM_Y)
+      y -= Game_Map::TILE_HEIGHT * TilemapRenderer::ZOOM_Y if event.character_name[/offset/i]
+      @height = $PokemonGlobal.bridge if !@fixedheight
+      y += @height * TilemapRenderer::ZOOM_Y * Game_Map::TILE_HEIGHT / 2
+      width  = @parent_sprite.src_rect.width
+      height = @parent_sprite.src_rect.height
+      @sprite.x        = x + ((width / 2) * TilemapRenderer::ZOOM_X)
+      @sprite.y        = y + ((height + (height / 2)) * TilemapRenderer::ZOOM_Y)
+      @sprite.ox       = width / 2
+      @sprite.oy       = (height / 2) - 2   # Hard-coded 2 pixel shift up
+      @sprite.oy       -= event.bob_height * 2
+      @sprite.z        = @parent_sprite.groundY - (Graphics.height / 2)
+      @sprite.z        -= 1000   # Still water is -2000, map is 0 and above
+      @sprite.z        += 1 if event == $game_player
+      @sprite.zoom_x   = @parent_sprite.zoom_x
+      if Settings::ANIMATE_REFLECTIONS
+        @sprite.zoom_x   += 0.05 * @sprite.zoom_x * Math.sin(2 * Math::PI * System.uptime)
+      end
+      @sprite.zoom_y   = @parent_sprite.zoom_y
+      @sprite.angle    = 180.0
+      @sprite.mirror   = true
+      @sprite.bitmap   = @parent_sprite.bitmap
+      @sprite.tone     = @parent_sprite.tone
+      if @height > 0
+        @sprite.color   = Color.new(48, 96, 160, 255)   # Dark still water
+        @sprite.opacity = @parent_sprite.opacity
+        @sprite.visible = !Settings::TIME_SHADING   # Can't time-tone a colored sprite
+      else
+        @sprite.color   = Color.new(224, 224, 224, 96)
+        @sprite.opacity = @parent_sprite.opacity * 3 / 4
+        @sprite.visible = true
+      end
+      @sprite.src_rect = @parent_sprite.src_rect
+    end
+  end
 end

Data/Scripts/005_Sprites/007_Spriteset_Map.rb

@@ -47,7 +47,11 @@ class Spriteset_Map
   def initialize(map=nil)
     @map = (map) ? map : $game_map
     $scene.map_renderer.add_tileset(@map.tileset_name)
-    @map.autotile_names.each { |filename| $scene.map_renderer.add_autotile(filename) }
+    @map.autotile_names.each do |filename|
+      $scene.map_renderer.add_autotile(filename)
+      $scene.map_renderer.add_extra_autotiles(@map.tileset_id,@map.map_id)
+    end
+
     @panorama = AnimatedPlane.new(@@viewport0)
     @fog = AnimatedPlane.new(@@viewport1)
     @fog.z = 3000
@@ -77,7 +81,10 @@ class Spriteset_Map
   def dispose
     if $scene.is_a?(Scene_Map)
       $scene.map_renderer.remove_tileset(@map.tileset_name)
-      @map.autotile_names.each { |filename| $scene.map_renderer.remove_autotile(filename) }
+      @map.autotile_names.each do |filename|
+        $scene.map_renderer.remove_autotile(filename)
+        $scene.map_renderer.remove_extra_autotiles(@map.tileset_id)
+      end
     end
     @panorama.dispose
     @fog.dispose
@@ -146,9 +153,9 @@ class Spriteset_Map
       sprite.update
     end
     if self.map!=$game_map
-      @weather.fade_in(:None, 0, 20)
+      #@weather.fade_in(:None, 0, 20)
     else
-      @weather.fade_in($game_screen.weather_type, $game_screen.weather_max, $game_screen.weather_duration)
+      @weather.fade_in($game_screen.weather_type, $game_screen.weather_power, $game_screen.weather_duration)
     end
     @weather.ox   = tmox
     @weather.oy   = tmoy