diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 41edc8e26..7967a5432 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 71336e1f0..a900929a9 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 901f2bb2b..2249bec14 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 73af1ea9e..e631808ba 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index be622f513..004ee903d 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index fe767fa0b..3e62ba6d2 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map056.rxdata b/Data/Map056.rxdata index 3e5e8e54c..030b16aac 100644 Binary files a/Data/Map056.rxdata and b/Data/Map056.rxdata differ diff --git a/Data/Map057.rxdata b/Data/Map057.rxdata index 5b197b10a..ce43d89c3 100644 Binary files a/Data/Map057.rxdata and b/Data/Map057.rxdata differ diff --git a/Data/Map528.rxdata b/Data/Map528.rxdata index ce2127ea3..dfb47b999 100644 Binary files a/Data/Map528.rxdata and b/Data/Map528.rxdata differ diff --git a/Data/Map559.rxdata b/Data/Map559.rxdata index a77ba0564..46e8a7f28 100644 Binary files a/Data/Map559.rxdata and b/Data/Map559.rxdata differ diff --git a/Data/Map762.rxdata b/Data/Map762.rxdata index c8f650fdd..6910a5140 100644 Binary files a/Data/Map762.rxdata and b/Data/Map762.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 83b71a03f..c7b3ff5d3 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ 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/Skills.rxdata b/Data/Skills.rxdata index a45219f5e..61cba7ea2 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 868d49e59..0f9b4ae5d 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index d2b634675..a4cdb94d7 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index cca6483e6..df8dafddd 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index c7ea19a7a..d9bd35260 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ