diff --git a/Data/Map001.rxdata b/Data/Map001.rxdata index 6d4258b9b..0cc6bed39 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Map012.rxdata b/Data/Map012.rxdata index 9bc6ca203..f9eed5bfd 100644 Binary files a/Data/Map012.rxdata and b/Data/Map012.rxdata differ diff --git a/Data/Map042.rxdata b/Data/Map042.rxdata index abce9d0ae..b2e98d204 100644 Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ diff --git a/Data/Map078.rxdata b/Data/Map078.rxdata index 8dd5d0e4f..7cac66121 100644 Binary files a/Data/Map078.rxdata and b/Data/Map078.rxdata differ diff --git a/Data/Map106.rxdata b/Data/Map106.rxdata index 614766f0a..372c04c0b 100644 Binary files a/Data/Map106.rxdata and b/Data/Map106.rxdata differ diff --git a/Data/Map154.rxdata b/Data/Map154.rxdata index 888726656..d01f6dc52 100644 Binary files a/Data/Map154.rxdata and b/Data/Map154.rxdata differ diff --git a/Data/Map437.rxdata b/Data/Map437.rxdata index d898e640b..ca5afee59 100644 Binary files a/Data/Map437.rxdata and b/Data/Map437.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index f101effcb..aa8d730d9 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/Map528.rxdata b/Data/Map528.rxdata index ce2127ea3..b3cd7cdf8 100644 Binary files a/Data/Map528.rxdata and b/Data/Map528.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 83b71a03f..d74951094 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb b/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb index cd5f94a44..a7e61c33a 100644 --- a/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb +++ b/Data/Scripts/006_Map renderer/004_TileDrawingHelper.rb @@ -170,7 +170,7 @@ def createMinimap(mapid) map = load_data(sprintf("Data/Map%03d.rxdata", mapid)) rescue nil return Bitmap.new(32, 32) if !map bitmap = Bitmap.new(map.width * 4, map.height * 4) - black = Color.black + black=Color.new(0,0,0) tilesets = $data_tilesets tileset = tilesets[map.tileset_id] return bitmap if !tileset diff --git a/Data/Scripts/052_AddOns/Spped Up.rb b/Data/Scripts/052_AddOns/Spped Up.rb index 778567fa6..81c9d88de 100644 --- a/Data/Scripts/052_AddOns/Spped Up.rb +++ b/Data/Scripts/052_AddOns/Spped Up.rb @@ -58,7 +58,7 @@ module Graphics if $PokemonSystem && $PokemonSystem.speedup == 1 speedStage = SPEEDUP_STAGES[$GameSpeed] else - speedStage =$PokemonSystem.speedup 1 + speedStage = 1 if Input.press?(Input::AUX1) && $CanToggle $PokemonSystem.speedup_speed = Settings::DEFAULT_SPEED_UP_SPEED if !$PokemonSystem.speedup_speed || $PokemonSystem.speedup_speed==0 speedStage=$PokemonSystem.speedup_speed+1 @@ -68,19 +68,4 @@ module Graphics fast_forward_update $frame = 0 end -end - - - -class PokemonSystem - attr_accessor :speedup - attr_accessor :speedup_speed - - - alias pokemonSystem_SpeedUp initialize - def initialize - pokemonSystem_SpeedUp - @speedup = 0 #0= hold, 1=toggle - @speedup_speed = 3 #for hold only - end end \ No newline at end of file diff --git a/Data/System.rxdata b/Data/System.rxdata index d2b634675..2a291f360 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ