diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 826e1e8a6..1be4a9d8f 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Map108.rxdata b/Data/Map108.rxdata index 3ab6701ba..ac809f2b6 100644 Binary files a/Data/Map108.rxdata and b/Data/Map108.rxdata differ diff --git a/Data/Map110.rxdata b/Data/Map110.rxdata index bb031b04d..781c81d97 100644 Binary files a/Data/Map110.rxdata and b/Data/Map110.rxdata differ diff --git a/Data/Map156.rxdata b/Data/Map156.rxdata index 734c2f98a..fd951a42f 100644 Binary files a/Data/Map156.rxdata and b/Data/Map156.rxdata differ diff --git a/Data/Map183.rxdata b/Data/Map183.rxdata index 17393f34a..c33b7b6a7 100644 Binary files a/Data/Map183.rxdata and b/Data/Map183.rxdata differ diff --git a/Data/Map192.rxdata b/Data/Map192.rxdata index 56e461d90..7cd25da8a 100644 Binary files a/Data/Map192.rxdata and b/Data/Map192.rxdata differ diff --git a/Data/Map247.rxdata b/Data/Map247.rxdata index 16960548f..f8c0f76c8 100644 Binary files a/Data/Map247.rxdata and b/Data/Map247.rxdata differ diff --git a/Data/Map619.rxdata b/Data/Map619.rxdata index 359eb5d82..95bf4a061 100644 Binary files a/Data/Map619.rxdata and b/Data/Map619.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 7c94f3d16..28a328240 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 75cbf25aa..bbec51be9 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.3.0.6" + GAME_VERSION_NUMBER = "5.3.0.7" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18 diff --git a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb index 2b6737227..a05882c85 100644 --- a/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb +++ b/Data/Scripts/007_Objects and windows/005_SpriteWindow_text.rb @@ -741,6 +741,7 @@ class SpriteWindow_Selectable < SpriteWindow_Base @row_height = 32 @column_spacing = 32 @ignore_input = false + @allow_arrows_jump=false end def itemCount @@ -767,6 +768,10 @@ class SpriteWindow_Selectable < SpriteWindow_Base end end + def setAllowArrowsJump(value) + @allow_arrows_jump=value + end + def columns return @column_max || 1 end @@ -848,63 +853,89 @@ class SpriteWindow_Selectable < SpriteWindow_Base super if self.active && @item_max > 0 && @index >= 0 && !@ignore_input if Input.repeat?(Input::UP) - if @index >= @column_max || - (Input.trigger?(Input::UP) && (@item_max % @column_max)==0) - oldindex = @index - @index = (@index - @column_max + @item_max) % @item_max - if @index!=oldindex - pbPlayCursorSE() - update_cursor_rect - end - end + scroll_up() elsif Input.repeat?(Input::DOWN) - if @index < @item_max - @column_max || - (Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0) - oldindex = @index - @index = (@index + @column_max) % @item_max - if @index!=oldindex - pbPlayCursorSE() - update_cursor_rect - end - end - elsif Input.repeat?(Input::LEFT) - if @column_max >= 2 && @index > 0 - oldindex = @index - @index -= 1 - if @index!=oldindex - pbPlayCursorSE() - update_cursor_rect - end - end - elsif Input.repeat?(Input::RIGHT) - if @column_max >= 2 && @index < @item_max - 1 - oldindex = @index - @index += 1 - if @index!=oldindex - pbPlayCursorSE() - update_cursor_rect - end - end - elsif Input.repeat?(Input::JUMPUP) - if @index > 0 - oldindex = @index - @index = [self.index-self.page_item_max, 0].max - if @index!=oldindex - pbPlayCursorSE() - self.top_row -= self.page_row_max - update_cursor_rect - end - end - elsif Input.repeat?(Input::JUMPDOWN) - if @index < @item_max-1 - oldindex = @index - @index = [self.index+self.page_item_max, @item_max-1].min - if @index!=oldindex - pbPlayCursorSE() - self.top_row += self.page_row_max - update_cursor_rect - end - end + scroll_down() + elsif Input.repeat?(Input::LEFT) && !@allow_arrows_jump + scroll_left() + elsif Input.repeat?(Input::RIGHT) && !@allow_arrows_jump + scroll_right() + elsif Input.repeat?(Input::JUMPUP) || (Input.repeat?(Input::LEFT) && @allow_arrows_jump) + jump_up() + elsif Input.repeat?(Input::JUMPDOWN) || (Input.repeat?(Input::RIGHT) && @allow_arrows_jump) + jump_down() + end + end + end + + def scroll_up() + if @index >= @column_max || + (Input.trigger?(Input::UP) && (@item_max % @column_max)==0) + oldindex = @index + @index = (@index - @column_max + @item_max) % @item_max + if @index!=oldindex + pbPlayCursorSE() + update_cursor_rect + end + end + end + + def scroll_down() + if @index < @item_max - @column_max || + (Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0) + oldindex = @index + @index = (@index + @column_max) % @item_max + if @index!=oldindex + pbPlayCursorSE() + update_cursor_rect + end + end + end + + def scroll_left() + if @column_max >= 2 && @index < @item_max - 1 + oldindex = @index + @index += 1 + if @index!=oldindex + pbPlayCursorSE() + update_cursor_rect + end + end + end + + def scroll_right() + if @column_max >= 2 && @index > 0 + oldindex = @index + @index -= 1 + if @index!=oldindex + pbPlayCursorSE() + update_cursor_rect + end + end + end + + + def jump_up() + if @index > 0 + oldindex = @index + @index = [self.index-self.page_item_max, 0].max + if @index!=oldindex + pbPlayCursorSE() + self.top_row -= self.page_row_max + update_cursor_rect + end + end + end + + + def jump_down() + if @index < @item_max-1 + oldindex = @index + @index = [self.index+self.page_item_max, @item_max-1].min + if @index!=oldindex + pbPlayCursorSE() + self.top_row += self.page_row_max + update_cursor_rect end end end diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb index 85a28a605..e83b901ff 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/004_UI_Evolution.rb @@ -588,6 +588,9 @@ class PokemonEvolutionScene end # Success jingle/message pbMEPlay("Evolution success") + sprite_bitmap=@sprites["rsprite2"].getBitmap + drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport) + newspeciesname = GameData::Species.get(@newspecies).name if !reversing pbMessageDisplay(@sprites["msgwindow"], @@ -599,6 +602,7 @@ class PokemonEvolutionScene @pokemon.name,newspeciesname)) { pbUpdate } end + @sprites["msgwindow"].text = "" # Check for consumed item and check if Pokémon should be duplicated pbEvolutionMethodAfterEvolution if !reversing diff --git a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb index 3f703497e..5de29d2fa 100644 --- a/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb +++ b/Data/Scripts/016_UI/003_UI_Pokedex_Main.rb @@ -8,6 +8,7 @@ class Window_Pokedex < Window_DrawableCommand @selarrow = AnimatedBitmap.new("Graphics/Pictures/Pokedex/cursor_list") @pokeballOwn = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_own") @pokeballSeen = AnimatedBitmap.new("Graphics/Pictures/Pokedex/icon_seen") + @allow_arrows_jump=true self.baseColor = Color.new(88,88,80) self.shadowColor = Color.new(168,184,184) self.windowskin = nil diff --git a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb index 56cc50e67..fb0573232 100644 --- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb +++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb @@ -113,9 +113,14 @@ class PokemonPokedexInfo_Scene @sprites["infosprite"].x = 104 @sprites["infosprite"].y = 136 @sprites["overlay"] = BitmapSprite.new(Graphics.width,Graphics.height,@viewport) - pbSetSystemFont(@sprites["overlay"].bitmap) - pbUpdateDummyPokemon - drawPage(@page) + + + + pbSetSystemFont(@sprites["overlay"].bitmap) + pbUpdateDummyPokemon + drawPage(@page) + sprite_bitmap= @sprites["infosprite"].getBitmap + pbFadeInAndShow(@sprites) { pbUpdate } end diff --git a/Data/Scripts/016_UI/015_UI_Options.rb b/Data/Scripts/016_UI/015_UI_Options.rb index 0779e8d30..c2c9d3043 100644 --- a/Data/Scripts/016_UI/015_UI_Options.rb +++ b/Data/Scripts/016_UI/015_UI_Options.rb @@ -196,9 +196,10 @@ class Window_PokemonOption < Window_DrawableCommand @selBaseColor = Color.new(31 * 8, 6 * 8, 3 * 8) @selShadowColor = Color.new(31 * 8, 17 * 8, 16 * 8) @optvalues = [] - @mustUpdateOptions = false + @mustUpdateOptions = false @mustUpdateDescription = false @selected_position = 0 + @allow_arrows_jump=false for i in 0...@options.length @optvalues[i] = 0 end diff --git a/Data/Scripts/020_Debug/003_Editor_Listers.rb b/Data/Scripts/020_Debug/003_Editor_Listers.rb index 420f19dfe..ee8d467e8 100644 --- a/Data/Scripts/020_Debug/003_Editor_Listers.rb +++ b/Data/Scripts/020_Debug/003_Editor_Listers.rb @@ -3,6 +3,7 @@ #=============================================================================== def pbListWindow(cmds, width = Graphics.width / 2) list = Window_CommandPokemon.newWithSize(cmds, 0, 0, width, Graphics.height) + list.setAllowArrowsJump(true) list.index = 0 list.rowHeight = 24 pbSetSmallFont(list.contents) diff --git a/Data/Scripts/048_Fusion/PokemonFusion.rb b/Data/Scripts/048_Fusion/PokemonFusion.rb index 9ef61464e..41cc59807 100644 --- a/Data/Scripts/048_Fusion/PokemonFusion.rb +++ b/Data/Scripts/048_Fusion/PokemonFusion.rb @@ -691,7 +691,7 @@ class PokemonFusionScene overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap sprite_bitmap = @sprites["rsprite2"].getBitmap - drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, overlay) + drawSpriteCredits(sprite_bitmap.filename,sprite_bitmap.path, @viewport) Kernel.pbMessageDisplay(@sprites["msgwindow"], _INTL("\\se[]Congratulations! Your Pokémon were fused into {2}!\\wt[80]", @pokemon1.name, newspeciesname)) @@ -770,7 +770,9 @@ class PokemonFusionScene end end -def drawSpriteCredits(filename,path,overlay) +def drawSpriteCredits(filename,path,viewport) + overlay = BitmapSprite.new(Graphics.width, Graphics.height, @viewport).bitmap + return if path.start_with?(Settings::BATTLERS_FOLDER) x= Graphics.width/2 y=240 diff --git a/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb b/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb index 81b0abda2..7c47e5e15 100644 --- a/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb +++ b/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb @@ -50,7 +50,7 @@ class FusionQuiz prompt_quit = pbMessage(_INTL("You still have {1} rounds to go. You'll only keep your points if you finish all {2} rounds. Do you really want to quit now?", rounds_left, nb_rounds), ["Yes", "No"]) if prompt_quit @abandonned = true - return + break end end round_multiplier += round_multiplier_increase @@ -63,12 +63,14 @@ class FusionQuiz end def end_quiz() + hide_fusion_picture Kernel.pbClearText() previous_highest = pbGet(VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE) pbSet(VAR_STAT_FUSION_QUIZ_HIGHEST_SCORE,@score) if @score > previous_highest previous_total = pbGet(VAR_STAT_FUSION_QUIZ_TOTAL_PTS) pbSet(VAR_STAT_FUSION_QUIZ_TOTAL_PTS,previous_total+@score) + dispose end def start_quiz_new_round(round_multiplier = 1) diff --git a/Data/System.rxdata b/Data/System.rxdata index d6e06dbed..37ac89f02 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 328f9c904..6d74b21a8 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ