diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 8e67182ba..826e1e8a6 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 37352e4b4..c60eae99c 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 4e0d878d1..a6d240bc3 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index c37634fba..ba2537d45 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -6,7 +6,7 @@ module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. GAME_VERSION = '5.0.0' - GAME_VERSION_NUMBER = "5.0.26 - beta" + GAME_VERSION_NUMBER = "5.0.27 - beta" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 diff --git a/Data/Scripts/002_BattleSettings.rb b/Data/Scripts/002_BattleSettings.rb index 271b0d273..a50ce0886 100644 --- a/Data/Scripts/002_BattleSettings.rb +++ b/Data/Scripts/002_BattleSettings.rb @@ -64,7 +64,7 @@ module Settings # based on a total of 600+ species (i.e. that many species need to be caught # to provide the greatest critical capture chance of 2.5x), and there may be # fewer species in your game. - ENABLE_CRITICAL_CAPTURES = (MECHANICS_GENERATION >= 5) + ENABLE_CRITICAL_CAPTURES = false#(MECHANICS_GENERATION >= 5) # Whether Pokémon gain Exp for capturing a Pokémon. GAIN_EXP_FOR_CAPTURE = (MECHANICS_GENERATION >= 5) # The Game Switch which, whie ON, prevents the player from losing money if diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb index a06d943ef..c375bd723 100644 --- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb +++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb @@ -221,6 +221,8 @@ class PokemonPokedexInfo_Scene @sprites["previousSprite"].visible = (@page==3) if @sprites["previousSprite"] @sprites["selectedSprite"].visible = (@page==3) if @sprites["selectedSprite"] @sprites["nextSprite"].visible = (@page==3) if @sprites["nextSprite"] + + hide_all_selected_windows # Draw page-specific information case page when 1 then drawPageInfo diff --git a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb b/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb index 36db8e6f0..f1621eba7 100644 --- a/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb +++ b/Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb @@ -5,7 +5,7 @@ class PokemonPokedexInfo_Scene Y_POSITION_SMALL = 80#40 Y_POSITION_BIG = 50 X_POSITION_PREVIOUS = 20#-20 - X_POSITION_SELECTED = 120 + X_POSITION_SELECTED = 115 X_POSITION_NEXT = 380#340 Y_POSITION_BG_SMALL = 70 @@ -98,11 +98,14 @@ class PokemonPokedexInfo_Scene return pbGetAvailableAlts end - def update_selected + def hide_all_selected_windows @sprites["bgSelected_previous"].visible = false @sprites["bgSelected_center"].visible = false @sprites["bgSelected_next"].visible = false + end + def update_selected + hide_all_selected_windows previous_index = @selected_index == 0 ? @available.size - 1 : @selected_index - 1 next_index = @selected_index == @available.size - 1 ? 0 : @selected_index + 1 diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index f20de2fb1..40ab7df78 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 2c6933d73..8d113cbfb 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ