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 b5413ec5f..065a7e253 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 0f9a3f787..b8d159f71 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/Map001.rxdata b/Data/Map001.rxdata index 7b88a9f72..8de12b105 100644 Binary files a/Data/Map001.rxdata and b/Data/Map001.rxdata differ diff --git a/Data/Map009.rxdata b/Data/Map009.rxdata index ff4658514..86cd1be32 100644 Binary files a/Data/Map009.rxdata and b/Data/Map009.rxdata differ diff --git a/Data/Map012.rxdata b/Data/Map012.rxdata index 89b311eb9..5acaa9c0f 100644 Binary files a/Data/Map012.rxdata and b/Data/Map012.rxdata differ diff --git a/Data/Map016.rxdata b/Data/Map016.rxdata index f1e4980ac..ff6b70611 100644 Binary files a/Data/Map016.rxdata and b/Data/Map016.rxdata differ diff --git a/Data/Map086.rxdata b/Data/Map086.rxdata index 8c454ccdb..4e49623e0 100644 Binary files a/Data/Map086.rxdata and b/Data/Map086.rxdata differ diff --git a/Data/Map090.rxdata b/Data/Map090.rxdata index 6969219b7..9c9f007a0 100644 Binary files a/Data/Map090.rxdata and b/Data/Map090.rxdata differ diff --git a/Data/Map095.rxdata b/Data/Map095.rxdata index 3ed843207..71ccb7e77 100644 Binary files a/Data/Map095.rxdata and b/Data/Map095.rxdata differ diff --git a/Data/Map154.rxdata b/Data/Map154.rxdata index 561657633..0c00b2a0e 100644 Binary files a/Data/Map154.rxdata and b/Data/Map154.rxdata differ diff --git a/Data/Map159.rxdata b/Data/Map159.rxdata index f3494cb15..aa024add0 100644 Binary files a/Data/Map159.rxdata and b/Data/Map159.rxdata differ diff --git a/Data/Map171.rxdata b/Data/Map171.rxdata index 2da21c135..c72a6782e 100644 Binary files a/Data/Map171.rxdata and b/Data/Map171.rxdata differ diff --git a/Data/Map254.rxdata b/Data/Map254.rxdata index e0a74c620..a63b0e24e 100644 Binary files a/Data/Map254.rxdata and b/Data/Map254.rxdata differ diff --git a/Data/Map261.rxdata b/Data/Map261.rxdata index 110cf67ed..d4f43707c 100644 Binary files a/Data/Map261.rxdata and b/Data/Map261.rxdata differ diff --git a/Data/Map262.rxdata b/Data/Map262.rxdata index db9f900a3..4d4a60e1d 100644 Binary files a/Data/Map262.rxdata and b/Data/Map262.rxdata differ diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata index f9889bc78..55c2e787b 100644 Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index b903daf4c..ee35237cf 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map409.rxdata b/Data/Map409.rxdata index 6b09e1a60..41143ad0b 100644 Binary files a/Data/Map409.rxdata and b/Data/Map409.rxdata differ diff --git a/Data/Map438.rxdata b/Data/Map438.rxdata index 142c93e1d..72a79f63f 100644 Binary files a/Data/Map438.rxdata and b/Data/Map438.rxdata differ diff --git a/Data/Map491.rxdata b/Data/Map491.rxdata index 09e30a453..a14d2f185 100644 Binary files a/Data/Map491.rxdata and b/Data/Map491.rxdata differ diff --git a/Data/Map495.rxdata b/Data/Map495.rxdata index 580501de9..c11176d37 100644 Binary files a/Data/Map495.rxdata and b/Data/Map495.rxdata differ diff --git a/Data/Map562.rxdata b/Data/Map562.rxdata index 392c4e9ed..2660e30fa 100644 Binary files a/Data/Map562.rxdata and b/Data/Map562.rxdata differ diff --git a/Data/Map563.rxdata b/Data/Map563.rxdata index e3d37d241..37e6fe1b9 100644 Binary files a/Data/Map563.rxdata and b/Data/Map563.rxdata differ diff --git a/Data/Map580.rxdata b/Data/Map580.rxdata index 31e65ab27..c9aaae81b 100644 Binary files a/Data/Map580.rxdata and b/Data/Map580.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index a609ef2c2..0555f9366 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 ed27b7bc9..f3d876a9e 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -348,6 +348,9 @@ module Settings # is on the map (for new plant growth mechanics only). PLANT_SPARKLE_ANIMATION_ID = 7 + CUT_TREE_ANIMATION_ID =19 + ROCK_SMASH_ANIMATION_ID =20 + #============================================================================= # An array of available languages in the game, and their corresponding message diff --git a/Data/Scripts/003_Game processing/003_Interpreter.rb b/Data/Scripts/003_Game processing/003_Interpreter.rb index 547428d2f..4bb176065 100644 --- a/Data/Scripts/003_Game processing/003_Interpreter.rb +++ b/Data/Scripts/003_Game processing/003_Interpreter.rb @@ -294,7 +294,10 @@ class Interpreter # it can stay erased when the game is saved then loaded again. def pbEraseThisEvent if $game_map.events[@event_id] - $game_map.events[@event_id].erase + if $game_map.events[@event_id].name[/cuttree/i] + pbSmashThisEvent() + end + $game_map.events[@event_id].erase $PokemonMap.addErasedEvent(@event_id) if $PokemonMap end @index += 1 diff --git a/Data/Scripts/004_Game classes/009_Game_Player.rb b/Data/Scripts/004_Game classes/009_Game_Player.rb index aa0276784..3bb7751ba 100644 --- a/Data/Scripts/004_Game classes/009_Game_Player.rb +++ b/Data/Scripts/004_Game classes/009_Game_Player.rb @@ -122,7 +122,9 @@ class Game_Player < Game_Character # Check the tile in front of the player for events new_x = @x + (@direction == 6 ? 1 : @direction == 4 ? -1 : 0) new_y = @y + (@direction == 2 ? 1 : @direction == 8 ? -1 : 0) + return nil if !$game_map.valid?(new_x, new_y) + for event in $game_map.events.values next if !event.at_coordinate?(new_x, new_y) next if event.jumping? || event.over_trigger? diff --git a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb index 4380d037f..8846cbf3b 100644 --- a/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb +++ b/Data/Scripts/012_Overworld/004_Overworld_FieldMoves.rb @@ -230,8 +230,10 @@ def pbSmashEvent(event) return if !event if event.name[/cuttree/i] pbSEPlay("Cut", 80) + $scene.spriteset.addUserAnimation(Settings::CUT_TREE_ANIMATION_ID,event.x,event.y,false,1) elsif event.name[/smashrock/i] pbSEPlay("Rock Smash", 80) + $scene.spriteset.addUserAnimation(Settings::ROCK_SMASH_ANIMATION_ID,event.x,event.y,false,1) end pbMoveRoute(event, [ PBMoveRoute::Wait, 2, @@ -620,6 +622,8 @@ def pbRockSmash speciesname = (movefinder) ? movefinder.name : $Trainer.name pbMessage(_INTL("{1} used {2}!", speciesname, GameData::Move.get(move).name)) pbHiddenMoveAnimation(movefinder) + facingEvent = $game_player.pbFacingEvent(true) + $scene.spriteset.addUserAnimation(Settings::ROCK_SMASH_ANIMATION_ID,facingEvent.x,facingEvent.y,false) return true end return false diff --git a/Data/Scripts/016_UI/006_UI_Summary.rb b/Data/Scripts/016_UI/006_UI_Summary.rb index 3e4a220be..ded916875 100644 --- a/Data/Scripts/016_UI/006_UI_Summary.rb +++ b/Data/Scripts/016_UI/006_UI_Summary.rb @@ -122,6 +122,8 @@ class PokemonSummary_Scene @sprites["pokemon"].setOffset(PictureOrigin::Center) @sprites["pokemon"].x = 104 @sprites["pokemon"].y = 206 + @sprites["pokemon"].zoom_x = Settings::FRONTSPRITE_SCALE + @sprites["pokemon"].zoom_y = Settings::FRONTSPRITE_SCALE @sprites["pokemon"].setPokemonBitmap(@pokemon) @sprites["pokeicon"] = PokemonIconSprite.new(@pokemon,@viewport) @sprites["pokeicon"].setOffset(PictureOrigin::Center) 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 f934eef0e..e467d2ad0 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index e301f0042..aab88dc2e 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/PBS/trainers.txt b/PBS/trainers.txt index e4f8b0213..a93e240ed 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -2015,7 +2015,7 @@ Pokemon = B130H299,71 #GARDOS [LEADER_Surge,Lt. Surge] Items = SUPERPOTION,SUPERPOTION Pokemon = B98H100,24 #voltby, - Moves = METALCLAW,BUBBLEBEAM,LIGHTSCREEN,SPARK + Moves = METALCLAW,BUBBLE,LIGHTSCREEN,SPARK AbilityIndex = 1 Item = MAGNET Pokemon = B17H25,24 #Pikeotto,