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 a900929a9..71336e1f0 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 47771f810..c3edc8702 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/Map046.rxdata b/Data/Map046.rxdata index 16bc04878..24e369386 100644 Binary files a/Data/Map046.rxdata and b/Data/Map046.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index dd8e404cb..5a6252e51 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/DownloadedSettings.rb b/Data/Scripts/DownloadedSettings.rb index c57aba03a..6fd1fc532 100644 --- a/Data/Scripts/DownloadedSettings.rb +++ b/Data/Scripts/DownloadedSettings.rb @@ -1,6 +1,6 @@ module Settings - LATEST_GAME_RELEASE = "6.3.0" + LATEST_GAME_RELEASE = "6.4.0" SHINY_POKEMON_CHANCE = 16 DISCORD_URL = "https://discord.com/invite/infinitefusion" 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 b1910e893..69206e87a 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 6fd4dee80..81118b37b 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/Data/messages.dat b/Data/messages.dat index 66b00326b..c010527da 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Graphics/Characters/player/clothes/VeteranM/README.txt b/Graphics/Characters/player/clothes/VeteranM/README.txt new file mode 100644 index 000000000..61b111e86 --- /dev/null +++ b/Graphics/Characters/player/clothes/VeteranM/README.txt @@ -0,0 +1 @@ +The only change is fixing the surf sprite sheet. Everything else should be fine \ No newline at end of file diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_bike_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_bike_delinquentoutfit.png new file mode 100644 index 000000000..a79209fd7 Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_bike_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_dive_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_dive_delinquentoutfit.png new file mode 100644 index 000000000..edaef482e Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_dive_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_fish_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_fish_delinquentoutfit.png new file mode 100644 index 000000000..e9e50b59e Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_fish_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_run_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_run_delinquentoutfit.png new file mode 100644 index 000000000..aabc73c24 Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_run_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_swim_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_swim_delinquentoutfit.png new file mode 100644 index 000000000..db438a59a Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_swim_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_trainer_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_trainer_delinquentoutfit.png new file mode 100644 index 000000000..73f9eca38 Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_trainer_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/delinquentoutfit/clothes_walk_delinquentoutfit.png b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_walk_delinquentoutfit.png new file mode 100644 index 000000000..0d7ff1d55 Binary files /dev/null and b/Graphics/Characters/player/clothes/delinquentoutfit/clothes_walk_delinquentoutfit.png differ diff --git a/Graphics/Characters/player/clothes/dragonconqueror/clothes_run_dragonconqueror(1).png b/Graphics/Characters/player/clothes/dragonconqueror/clothes_run_dragonconqueror(1).png new file mode 100644 index 000000000..8b5df2993 Binary files /dev/null and b/Graphics/Characters/player/clothes/dragonconqueror/clothes_run_dragonconqueror(1).png differ diff --git a/Graphics/Characters/player/hair/SpecialLatias/hair_1_SpecialLatias(1).png b/Graphics/Characters/player/hair/SpecialLatias/hair_1_SpecialLatias(1).png new file mode 100644 index 000000000..5db8aac08 Binary files /dev/null and b/Graphics/Characters/player/hair/SpecialLatias/hair_1_SpecialLatias(1).png differ diff --git a/Graphics/Characters/player/hair/SpecialLatias/hair_2_SpecialLatias(1).png b/Graphics/Characters/player/hair/SpecialLatias/hair_2_SpecialLatias(1).png new file mode 100644 index 000000000..d76dc661d Binary files /dev/null and b/Graphics/Characters/player/hair/SpecialLatias/hair_2_SpecialLatias(1).png differ diff --git a/Graphics/Characters/player/hair/SpecialLatias/hair_3_SpecialLatias(1).png b/Graphics/Characters/player/hair/SpecialLatias/hair_3_SpecialLatias(1).png new file mode 100644 index 000000000..433af96f0 Binary files /dev/null and b/Graphics/Characters/player/hair/SpecialLatias/hair_3_SpecialLatias(1).png differ diff --git a/Graphics/Characters/player/hair/SpecialLatias/hair_4_SpecialLatias(1).png b/Graphics/Characters/player/hair/SpecialLatias/hair_4_SpecialLatias(1).png new file mode 100644 index 000000000..3b046b452 Binary files /dev/null and b/Graphics/Characters/player/hair/SpecialLatias/hair_4_SpecialLatias(1).png differ diff --git a/Graphics/Characters/player/hair/SpecialLatias/hair_5_SpecialLatias(1).png b/Graphics/Characters/player/hair/SpecialLatias/hair_5_SpecialLatias(1).png new file mode 100644 index 000000000..8006f22a1 Binary files /dev/null and b/Graphics/Characters/player/hair/SpecialLatias/hair_5_SpecialLatias(1).png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_1_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_1_elm.png new file mode 100644 index 000000000..9d1476754 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_1_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_2_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_2_elm.png new file mode 100644 index 000000000..bdf4bdcd8 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_2_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_3_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_3_elm.png new file mode 100644 index 000000000..3e7b4f31f Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_3_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_4_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_4_elm.png new file mode 100644 index 000000000..c427439b7 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_4_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_trainer_1_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_trainer_1_elm.png new file mode 100644 index 000000000..8b6ff4be6 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_trainer_1_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_trainer_2_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_trainer_2_elm.png new file mode 100644 index 000000000..530ab9036 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_trainer_2_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_trainer_3_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_trainer_3_elm.png new file mode 100644 index 000000000..0c2ab8174 Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_trainer_3_elm.png differ diff --git a/Graphics/Characters/player/hair/emo/elm/hair_trainer_4_elm.png b/Graphics/Characters/player/hair/emo/elm/hair_trainer_4_elm.png new file mode 100644 index 000000000..579a6441a Binary files /dev/null and b/Graphics/Characters/player/hair/emo/elm/hair_trainer_4_elm.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_1_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_1_pompadour.png new file mode 100644 index 000000000..16c4a7d2d Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_1_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_2_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_2_pompadour.png new file mode 100644 index 000000000..54c9a8342 Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_2_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_3_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_3_pompadour.png new file mode 100644 index 000000000..cfb257f5a Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_3_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_4_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_4_pompadour.png new file mode 100644 index 000000000..097f90a54 Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_4_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit(1).png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit(1).png new file mode 100644 index 000000000..34dc55e0a Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit(1).png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit.png new file mode 100644 index 000000000..951f100ec Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_pompadourdelinquentoutfit.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_1_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_1_pompadour.png new file mode 100644 index 000000000..483de7abf Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_1_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_2_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_2_pompadour.png new file mode 100644 index 000000000..5e286a1e3 Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_2_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_3_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_3_pompadour.png new file mode 100644 index 000000000..c8ffa41ba Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_3_pompadour.png differ diff --git a/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_4_pompadour.png b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_4_pompadour.png new file mode 100644 index 000000000..e2cf3f81f Binary files /dev/null and b/Graphics/Characters/player/hair/pompadourdelinquentoutfit/hair_trainer_4_pompadour.png differ diff --git a/Graphics/Characters/player/hat/flying/hat_flying.png b/Graphics/Characters/player/hat/flying/hat_flying.png new file mode 100644 index 000000000..27fb88af1 Binary files /dev/null and b/Graphics/Characters/player/hat/flying/hat_flying.png differ diff --git a/Graphics/Characters/player/hat/flying/hat_trainer_flying.png b/Graphics/Characters/player/hat/flying/hat_trainer_flying.png new file mode 100644 index 000000000..c6e8c3213 Binary files /dev/null and b/Graphics/Characters/player/hat/flying/hat_trainer_flying.png differ diff --git a/Graphics/Characters/player/hat/ogremaskblue/hat_ogremaskblue.png b/Graphics/Characters/player/hat/ogremaskblue/hat_ogremaskblue.png new file mode 100644 index 000000000..33d736674 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskblue/hat_ogremaskblue.png differ diff --git a/Graphics/Characters/player/hat/ogremaskblue/hat_trainer_ogremaskblue.png b/Graphics/Characters/player/hat/ogremaskblue/hat_trainer_ogremaskblue.png new file mode 100644 index 000000000..e28c2b2ba Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskblue/hat_trainer_ogremaskblue.png differ diff --git a/Graphics/Characters/player/hat/ogremaskgreen/hat_ogremaskgreen.png b/Graphics/Characters/player/hat/ogremaskgreen/hat_ogremaskgreen.png new file mode 100644 index 000000000..7a59918d9 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskgreen/hat_ogremaskgreen.png differ diff --git a/Graphics/Characters/player/hat/ogremaskgreen/hat_trainer_ogremaskgreen.png b/Graphics/Characters/player/hat/ogremaskgreen/hat_trainer_ogremaskgreen.png new file mode 100644 index 000000000..f791e66bc Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskgreen/hat_trainer_ogremaskgreen.png differ diff --git a/Graphics/Characters/player/hat/ogremaskgrey/hat_ogremaskgrey.png b/Graphics/Characters/player/hat/ogremaskgrey/hat_ogremaskgrey.png new file mode 100644 index 000000000..2f27f4f94 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskgrey/hat_ogremaskgrey.png differ diff --git a/Graphics/Characters/player/hat/ogremaskgrey/hat_trainer_ogremaskgrey.png b/Graphics/Characters/player/hat/ogremaskgrey/hat_trainer_ogremaskgrey.png new file mode 100644 index 000000000..0311f2294 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskgrey/hat_trainer_ogremaskgrey.png differ diff --git a/Graphics/Characters/player/hat/ogremaskred/hat_ogremaskred.png b/Graphics/Characters/player/hat/ogremaskred/hat_ogremaskred.png new file mode 100644 index 000000000..2a4c31637 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskred/hat_ogremaskred.png differ diff --git a/Graphics/Characters/player/hat/ogremaskred/hat_trainer_ogremaskred.png b/Graphics/Characters/player/hat/ogremaskred/hat_trainer_ogremaskred.png new file mode 100644 index 000000000..9b26f2fa6 Binary files /dev/null and b/Graphics/Characters/player/hat/ogremaskred/hat_trainer_ogremaskred.png differ diff --git a/Graphics/Characters/player/hat/triangularsunglasses/hat_trainer_triangularsunglasses.png b/Graphics/Characters/player/hat/triangularsunglasses/hat_trainer_triangularsunglasses.png new file mode 100644 index 000000000..4465cc78e Binary files /dev/null and b/Graphics/Characters/player/hat/triangularsunglasses/hat_trainer_triangularsunglasses.png differ diff --git a/Graphics/Characters/player/hat/triangularsunglasses/hat_triangularsunglasses.png b/Graphics/Characters/player/hat/triangularsunglasses/hat_triangularsunglasses.png new file mode 100644 index 000000000..91af1392c Binary files /dev/null and b/Graphics/Characters/player/hat/triangularsunglasses/hat_triangularsunglasses.png differ