diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9c6fee88e..000000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/* -!/Data/Scripts/ -!/Data/Scripts/** \ No newline at end of file diff --git a/Audio/SE/Battle ball drop.ogg b/Audio/SE/Battle ball drop.ogg new file mode 100644 index 000000000..a52f4820f Binary files /dev/null and b/Audio/SE/Battle ball drop.ogg differ diff --git a/Audio/SE/Battle ball hit.ogg b/Audio/SE/Battle ball hit.ogg new file mode 100644 index 000000000..4d71a5f63 Binary files /dev/null and b/Audio/SE/Battle ball hit.ogg differ diff --git a/Audio/SE/Battle ball shake.ogg b/Audio/SE/Battle ball shake.ogg new file mode 100644 index 000000000..0d6309036 Binary files /dev/null and b/Audio/SE/Battle ball shake.ogg differ diff --git a/Audio/SE/Battle catch click.ogg b/Audio/SE/Battle catch click.ogg new file mode 100644 index 000000000..c0979474c Binary files /dev/null and b/Audio/SE/Battle catch click.ogg differ diff --git a/Audio/SE/Battle damage normal.ogg b/Audio/SE/Battle damage normal.ogg new file mode 100644 index 000000000..2d2601564 Binary files /dev/null and b/Audio/SE/Battle damage normal.ogg differ diff --git a/Audio/SE/Battle damage super.ogg b/Audio/SE/Battle damage super.ogg new file mode 100644 index 000000000..193547afd Binary files /dev/null and b/Audio/SE/Battle damage super.ogg differ diff --git a/Audio/SE/Battle damage weak.ogg b/Audio/SE/Battle damage weak.ogg new file mode 100644 index 000000000..8b0c312b3 Binary files /dev/null and b/Audio/SE/Battle damage weak.ogg differ diff --git a/Audio/SE/Battle flee.ogg b/Audio/SE/Battle flee.ogg new file mode 100644 index 000000000..871223143 Binary files /dev/null and b/Audio/SE/Battle flee.ogg differ diff --git a/Audio/SE/Battle jump to ball.ogg b/Audio/SE/Battle jump to ball.ogg new file mode 100644 index 000000000..7d2ef42dd Binary files /dev/null and b/Audio/SE/Battle jump to ball.ogg differ diff --git a/Audio/SE/Battle recall.ogg b/Audio/SE/Battle recall.ogg new file mode 100644 index 000000000..31378c3be Binary files /dev/null and b/Audio/SE/Battle recall.ogg differ diff --git a/Audio/SE/Battle throw.ogg b/Audio/SE/Battle throw.ogg new file mode 100644 index 000000000..d2434a540 Binary files /dev/null and b/Audio/SE/Battle throw.ogg differ diff --git a/Audio/SE/Exclaim.wav b/Audio/SE/Exclaim.wav new file mode 100644 index 000000000..c70770544 Binary files /dev/null and b/Audio/SE/Exclaim.wav differ diff --git a/Audio/SE/GUI menu close.ogg b/Audio/SE/GUI menu close.ogg new file mode 100644 index 000000000..64a4c0b38 Binary files /dev/null and b/Audio/SE/GUI menu close.ogg differ diff --git a/Audio/SE/GUI menu open.ogg b/Audio/SE/GUI menu open.ogg new file mode 100644 index 000000000..4f4eefabe Binary files /dev/null and b/Audio/SE/GUI menu open.ogg differ diff --git a/Audio/SE/GUI naming confirm.ogg b/Audio/SE/GUI naming confirm.ogg new file mode 100644 index 000000000..ce379c9b6 Binary files /dev/null and b/Audio/SE/GUI naming confirm.ogg differ diff --git a/Audio/SE/GUI naming tab swap end.ogg b/Audio/SE/GUI naming tab swap end.ogg new file mode 100644 index 000000000..2b732c194 Binary files /dev/null and b/Audio/SE/GUI naming tab swap end.ogg differ diff --git a/Audio/SE/GUI naming tab swap start.ogg b/Audio/SE/GUI naming tab swap start.ogg new file mode 100644 index 000000000..c185c6488 Binary files /dev/null and b/Audio/SE/GUI naming tab swap start.ogg differ diff --git a/Audio/SE/GUI party switch.ogg b/Audio/SE/GUI party switch.ogg new file mode 100644 index 000000000..e9bea48b5 Binary files /dev/null and b/Audio/SE/GUI party switch.ogg differ diff --git a/Audio/SE/GUI save choice.ogg b/Audio/SE/GUI save choice.ogg new file mode 100644 index 000000000..2aac49a49 Binary files /dev/null and b/Audio/SE/GUI save choice.ogg differ diff --git a/Audio/SE/GUI sel buzzer.ogg b/Audio/SE/GUI sel buzzer.ogg new file mode 100644 index 000000000..7962ab43e Binary files /dev/null and b/Audio/SE/GUI sel buzzer.ogg differ diff --git a/Audio/SE/GUI sel cancel.ogg b/Audio/SE/GUI sel cancel.ogg new file mode 100644 index 000000000..23c85ec34 Binary files /dev/null and b/Audio/SE/GUI sel cancel.ogg differ diff --git a/Audio/SE/GUI sel cursor.ogg b/Audio/SE/GUI sel cursor.ogg new file mode 100644 index 000000000..ac12abc0e Binary files /dev/null and b/Audio/SE/GUI sel cursor.ogg differ diff --git a/Audio/SE/GUI sel decision.ogg b/Audio/SE/GUI sel decision.ogg new file mode 100644 index 000000000..23c85ec34 Binary files /dev/null and b/Audio/SE/GUI sel decision.ogg differ diff --git a/Audio/SE/GUI storage hide party panel.ogg b/Audio/SE/GUI storage hide party panel.ogg new file mode 100644 index 000000000..6bc06c861 Binary files /dev/null and b/Audio/SE/GUI storage hide party panel.ogg differ diff --git a/Audio/SE/GUI storage pick up.ogg b/Audio/SE/GUI storage pick up.ogg new file mode 100644 index 000000000..3e822187e Binary files /dev/null and b/Audio/SE/GUI storage pick up.ogg differ diff --git a/Audio/SE/GUI storage put down.ogg b/Audio/SE/GUI storage put down.ogg new file mode 100644 index 000000000..e10dd5cec Binary files /dev/null and b/Audio/SE/GUI storage put down.ogg differ diff --git a/Audio/SE/GUI storage show party panel.ogg b/Audio/SE/GUI storage show party panel.ogg new file mode 100644 index 000000000..4cc2b50f0 Binary files /dev/null and b/Audio/SE/GUI storage show party panel.ogg differ diff --git a/Audio/SE/GUI summary change page.ogg b/Audio/SE/GUI summary change page.ogg new file mode 100644 index 000000000..cfb204fd6 Binary files /dev/null and b/Audio/SE/GUI summary change page.ogg differ diff --git a/Audio/SE/GUI trainer card open.ogg b/Audio/SE/GUI trainer card open.ogg new file mode 100644 index 000000000..f465f9141 Binary files /dev/null and b/Audio/SE/GUI trainer card open.ogg differ diff --git a/Audio/SE/Mart buy item.ogg b/Audio/SE/Mart buy item.ogg new file mode 100644 index 000000000..e5f501c8b Binary files /dev/null and b/Audio/SE/Mart buy item.ogg differ diff --git a/Audio/SE/PC access.ogg b/Audio/SE/PC access.ogg new file mode 100644 index 000000000..659ccef67 Binary files /dev/null and b/Audio/SE/PC access.ogg differ diff --git a/Audio/SE/PC close.ogg b/Audio/SE/PC close.ogg new file mode 100644 index 000000000..f1ce514a8 Binary files /dev/null and b/Audio/SE/PC close.ogg differ diff --git a/Audio/SE/PC open.ogg b/Audio/SE/PC open.ogg new file mode 100644 index 000000000..a41dacc76 Binary files /dev/null and b/Audio/SE/PC open.ogg differ diff --git a/Audio/SE/Pkmn exp full.ogg b/Audio/SE/Pkmn exp full.ogg new file mode 100644 index 000000000..fbcf05618 Binary files /dev/null and b/Audio/SE/Pkmn exp full.ogg differ diff --git a/Audio/SE/Pkmn exp gain.ogg b/Audio/SE/Pkmn exp gain.ogg new file mode 100644 index 000000000..9504303d0 Binary files /dev/null and b/Audio/SE/Pkmn exp gain.ogg differ diff --git a/Audio/SE/Pkmn faint.ogg b/Audio/SE/Pkmn faint.ogg new file mode 100644 index 000000000..d32789b7b Binary files /dev/null and b/Audio/SE/Pkmn faint.ogg differ diff --git a/Audio/SE/Pkmn move learnt.ogg b/Audio/SE/Pkmn move learnt.ogg new file mode 100644 index 000000000..10c00f889 Binary files /dev/null and b/Audio/SE/Pkmn move learnt.ogg differ diff --git a/Audio/SE/Player bump.ogg b/Audio/SE/Player bump.ogg new file mode 100644 index 000000000..0c6219694 Binary files /dev/null and b/Audio/SE/Player bump.ogg differ diff --git a/Audio/SE/Player jump.ogg b/Audio/SE/Player jump.ogg new file mode 100644 index 000000000..e0a874c21 Binary files /dev/null and b/Audio/SE/Player jump.ogg differ diff --git a/Audio/SE/Rock Smash.ogg b/Audio/SE/Rock Smash.ogg new file mode 100644 index 000000000..120a7017b Binary files /dev/null and b/Audio/SE/Rock Smash.ogg differ diff --git a/Audio/SE/Vs flash.ogg b/Audio/SE/Vs flash.ogg new file mode 100644 index 000000000..cfd323e6f Binary files /dev/null and b/Audio/SE/Vs flash.ogg differ diff --git a/Audio/SE/Vs sword.ogg b/Audio/SE/Vs sword.ogg new file mode 100644 index 000000000..d919b98f7 Binary files /dev/null and b/Audio/SE/Vs sword.ogg differ 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 22a06f68e..eba36f0b2 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/Map019.rxdata b/Data/Map019.rxdata index 1b0a423a0..0a8dd4259 100644 Binary files a/Data/Map019.rxdata and b/Data/Map019.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6a1c19b83..5e7e2b538 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb index 3a188ecbf..785d1e3ea 100644 --- a/Data/Scripts/004_Game classes/009_Game_Player.rb +++ b/Data/Scripts/004_Game classes/009_Game_Player.rb @@ -32,7 +32,7 @@ class Game_Player < Game_Character def bump_into_object return if @bump_se && @bump_se>0 pbSEPlay("Player bump") - @bump_se = Graphics.frame_rate/4 + @bump_se = Graphics.frame_rate/2 end def move_generic(dir, turn_enabled = true) diff --git a/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb b/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb index 9e9d375e0..b26b2e0a0 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/002_PokeBattle_SceneAnimations.rb @@ -621,7 +621,7 @@ class BattlerDamageAnimation < PokeBattle_Animation # Animation delay = 0 case @effectiveness - when 0 then battler.setSE(delay, "Battle damage normal") + when 0 then battler.setSE(delay, "Battle damage normal"); when 1 then battler.setSE(delay, "Battle damage weak") when 2 then battler.setSE(delay, "Battle damage super") end diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index e33e6244a..01700b4fd 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -657,6 +657,7 @@ def pbRockSmash pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) facingEvent = $game_player.pbFacingEvent(true) + pbSEPlay("Rock Smash", 80) $scene.spriteset.addUserAnimation(Settings::ROCK_SMASH_ANIMATION_ID, facingEvent.x, facingEvent.y, false) return true end 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 469ddfce1..a04dc6536 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 3aeb3d610..328f9c904 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 diff --git a/x64-msvcrt-ruby300.dll b/x64-msvcrt-ruby300.dll new file mode 100644 index 000000000..a69c81e64 Binary files /dev/null and b/x64-msvcrt-ruby300.dll differ