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 7989f71f4..0aaf9edfa 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/Map107.rxdata b/Data/Map107.rxdata index fc2c79941..c7585fec8 100644 Binary files a/Data/Map107.rxdata and b/Data/Map107.rxdata differ diff --git a/Data/Map341.rxdata b/Data/Map341.rxdata index 6bd62074b..7e87f186e 100644 Binary files a/Data/Map341.rxdata and b/Data/Map341.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index e4b534641..84ff6e010 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/Map556.rxdata b/Data/Map556.rxdata index cd3f71a81..5c93e5883 100644 Binary files a/Data/Map556.rxdata and b/Data/Map556.rxdata differ diff --git a/Data/Map655.rxdata b/Data/Map655.rxdata index c6b1ae726..38d2bcef6 100644 Binary files a/Data/Map655.rxdata and b/Data/Map655.rxdata differ diff --git a/Data/Map757.rxdata b/Data/Map757.rxdata index 8a5fc3145..a0c0b13e6 100644 Binary files a/Data/Map757.rxdata and b/Data/Map757.rxdata differ diff --git a/Data/Map758.rxdata b/Data/Map758.rxdata index f7d2122a7..a59ff3709 100644 Binary files a/Data/Map758.rxdata and b/Data/Map758.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 57fbb35f6..77834bdef 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb index a34566ba6..31abd452c 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb @@ -411,6 +411,11 @@ class HallOfFame_Scene Input.update pbUpdate end + while !(waitForInput) + Graphics.update + Input.update + pbUpdate + end setPokemonSpritesOpacity(-1, OPACITY) if !SINGLEROW createTrainerBattler end @@ -432,6 +437,14 @@ class HallOfFame_Scene end end + def waitForInput + if Input.trigger?(Input::USE) || Input.trigger?(Input::BACK) + return true + end + return false + end + + def pbUpdatePC # Change the team if @battlerIndex >= @hallEntry.size diff --git a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb index 93b377e35..3d84b8896 100644 --- a/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb +++ b/Data/Scripts/017_Minigames/004_Minigame_VoltorbFlip.rb @@ -283,7 +283,7 @@ class VoltorbFlip @squares[i][3]=true # If Voltorb (0), display all tiles on the board if @squares[i][2]==0 - pbSEPlay("Voltorb Flip explosion") + pbSEPlay("Voltorb Flip Explosion") # Play explosion animation # Part1 animation=[] @@ -302,7 +302,7 @@ class VoltorbFlip @sprites["animation"].bitmap.clear end # Unskippable text block, parameter 2 = wait time (corresponds to ME length) - pbMessage(_INTL("\\me[Voltorb Flip game over]Oh no! You get 0 Coins!\\wtnp[50]")) + pbMessage(_INTL("\\me[Voltorb Flip Game Over]Oh no! You get 0 Coins!\\wtnp[50]")) pbShowAndDispose @sprites["mark"].bitmap.clear if @level>1 @@ -343,10 +343,10 @@ class VoltorbFlip end if @points==0 @points+=@squares[i][2] - pbSEPlay("Voltorb Flip point") + pbSEPlay("Voltorb Flip Point") elsif @squares[i][2]>1 @points*=@squares[i][2] - pbSEPlay("Voltorb Flip point") + pbSEPlay("Voltorb Flip Point") end break end @@ -363,10 +363,10 @@ class VoltorbFlip # Game cleared if count==0 @sprites["curtain"].opacity=100 - pbMessage(_INTL("\\me[Voltorb Flip win]Game clear!\\wtnp[40]")) + pbMessage(_INTL("\\me[Voltorb Flip Win]Game clear!\\wtnp[40]")) # pbMessage(_INTL("You've found all of the hidden x2 and x3 cards.")) # pbMessage(_INTL("This means you've found all the Coins in this game, so the game is now over.")) - pbMessage(_INTL("\\se[Voltorb Flip gain coins]{1} received {2} Coins!",$Trainer.name,@points.to_s_formatted)) + pbMessage(_INTL("\\se[Voltorb Flip Gain Coins]{1} received {2} Coins!",$Trainer.name,@points.to_s_formatted)) # Update level text @sprites["level"].bitmap.clear pbDrawShadowText(@sprites["level"].bitmap,8,150,118,28,_INTL("Level {1}",@level.to_s),Color.new(60,60,60),Color.new(150,190,170),1) @@ -384,12 +384,12 @@ class VoltorbFlip @sprites["curtain"].opacity=100 if @level<8 @level+=1 - pbMessage(_INTL("\\se[Voltorb Flip level up]Advanced to Game Lv. {1}!",@level.to_s)) + pbMessage(_INTL("\\se[Voltorb Flip Level Up]Advanced to Game Lv. {1}!",@level.to_s)) # if @firstRound # pbMessage(_INTL("Congratulations!")) # pbMessage(_INTL("You can receive even more Coins in the next game!")) @firstRound=false -# end +# end pbDisposeSpriteHash(@sprites) pbNewGame 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 4cb01327a..a7510bfe3 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index ec292660a..acaa59516 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