release 6.2

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

@@ -19,10 +19,18 @@ class Game_Map
   attr_accessor :fog_opacity # fog opacity level
   attr_accessor :fog_blend_type # fog blending method
   attr_accessor :fog_zoom # fog zoom rate
+
   attr_accessor :fog_sx # fog sx
   attr_accessor :fog_sy # fog sy
   attr_accessor :fog_ox # fog x-coordinate starting point
   attr_accessor :fog_oy # fog y-coordinate starting point
+
+  attr_accessor :fog2_ox # fog x-coordinate starting point
+  attr_accessor :fog2_oy # fog y-coordinate starting point
+  attr_accessor :fog2_sx # fog sx
+  attr_accessor :fog2_sy # fog sy
+  attr_accessor :fog2_opacity # fog sy
+
   attr_reader :fog_tone # fog color tone
   attr_accessor :battleback_name # battleback file name
   attr_reader :display_x # display x-coordinate * 128
@@ -49,6 +57,13 @@ class Game_Map
     updateTileset
     @fog_ox = 0
     @fog_oy = 0
+
+    @fog2_ox = 0
+    @fog2_oy = 0
+    @fog2_sx = 0
+    @fog2_sy = 0
+    @fog2_opacity = 0
+
     @fog_tone = Tone.new(0, 0, 0, 0)
     @fog_tone_target = Tone.new(0, 0, 0, 0)
     @fog_tone_duration = 0
@@ -133,6 +148,21 @@ class Game_Map
     end
   end
 
+  def setFog2(filename,sx=0,sy=0,opacity=32)
+    @fog2_sx=sx
+    @fog2_sy=-sy
+    @fog2_opacity = opacity
+    $scene.spriteset.setFog2(filename)
+  end
+
+  def eraseFog2()
+    @fog2_sx=0
+    @fog2_sy=-0
+    @fog2_opacity = 0
+    $scene.spriteset.disposeFog2()
+  end
+
+
   #-----------------------------------------------------------------------------
   # * Plays background music
   #   Plays music called "[normal BGM]_n" if it's night time and it exists
@@ -459,6 +489,10 @@ class Game_Map
     # Update fog
     @fog_ox -= @fog_sx / 8.0
     @fog_oy -= @fog_sy / 8.0
+
+    @fog2_ox -= @fog2_sx / 8.0 if @fog2_ox
+    @fog2_oy -= @fog2_sy / 8.0 if @fog2_oy
+
     if @fog_tone_duration >= 1
       d = @fog_tone_duration
       target = @fog_tone_target

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

@@ -371,7 +371,7 @@ class Game_Character
   end
 
   def force_move_route(move_route)
-    echoln screen_z() if self == $game_player
+    #echoln screen_z() if self == $game_player
     if @original_move_route == nil
       @original_move_route = @move_route
       @original_move_route_index = @move_route_index

Data/Scripts/004_Game classes/009_Game_Player.rb

@@ -9,6 +9,7 @@ class Game_Player < Game_Character
   attr_accessor :bump_se
   attr_accessor :charsetData
   attr_accessor :encounter_count
+  attr_accessor :outfit_changed
   attr_accessor :x
   attr_accessor :y
 
@@ -390,9 +391,9 @@ def pbGetPlayerCharset(meta,charset,trainer=nil,force=false)
   $game_player.charsetData = [$Trainer.character_ID,charset,outfit] if $game_player
   ret = meta[charset]
   ret = meta[1] if nil_or_empty?(ret)
-  if pbResolveBitmap("Graphics/Characters/"+ret+"_"+outfit.to_s)
-    ret = ret+"_"+outfit.to_s
-  end
+  # if pbResolveBitmap("Graphics/Characters/player/"+ret+"_"+outfit.to_s)
+  #   ret = ret+"_"+outfit.to_s
+  # end
   return ret
 end
 

Data/Scripts/004_Game classes/010_Game_Player_Visuals.rb

@@ -40,12 +40,35 @@ class Game_Player < Game_Character
       meta = GameData::Metadata.get_player($Trainer.character_ID)
       if meta && !$PokemonGlobal.bicycle && !$PokemonGlobal.diving && !$PokemonGlobal.surfing
         charset = 1   # Display normal character sprite
-        if pbCanRun? && (moving? || @wasmoving) && Input.dir4!=0 && meta[4] && meta[4]!=""
+
+
+        player_is_moving = moving?
+        if pbCanRun? && (player_is_moving || @wasmoving) && Input.dir4!=0 && meta[4] && meta[4]!=""
           charset = 4   # Display running character sprite
         end
+
         newCharName = pbGetPlayerCharset(meta,charset)
+
+        if newCharName
+          # echoln caller
+          # echoln newCharName
+          # echoln "moving: " + moving?.to_s
+          # echoln "was moving: " + @wasmoving.to_s
+          #
+          # echoln "can run: " + pbCanRun?.to_s
+          # echoln "Input.dir4 " + Input.dir4.to_s
+          #
+          #
+          # echoln (moving? || @wasmoving)
+          # echoln charset
+          # echoln ""
+        end
+
+
+
+
         @character_name = newCharName if newCharName
-        @wasmoving = moving?
+        @wasmoving = player_is_moving
       end
     end
     return @character_name