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 ce49eedbd..42fb12cc7 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/Map040.rxdata b/Data/Map040.rxdata index 30cbbb82a..ca7cbee69 100644 Binary files a/Data/Map040.rxdata and b/Data/Map040.rxdata differ diff --git a/Data/Map272.rxdata b/Data/Map272.rxdata index 22d940c1a..1a0811d33 100644 Binary files a/Data/Map272.rxdata and b/Data/Map272.rxdata differ diff --git a/Data/Map638.rxdata b/Data/Map638.rxdata index 5524588b7..d77bc7a9f 100644 Binary files a/Data/Map638.rxdata and b/Data/Map638.rxdata differ diff --git a/Data/Map655.rxdata b/Data/Map655.rxdata index cd0d3d055..6496a9cce 100644 Binary files a/Data/Map655.rxdata and b/Data/Map655.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 8599e170a..2e0e514f1 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 ad3c1af07..f1eb0d59f 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -481,7 +481,8 @@ module Settings [561, 50, :FLETCHINDER,32,45], #Mt. Ember [562, 50, :NINJASK,45,50], #Boon Island [603, 50, :KECLEON,45,50], #Chrono Island - [654, 50, :WHIMSICOTT,32,45] #Brine Road + [654, 50, :WHIMSICOTT,32,45], #Brine Road + [654, 50, :SCRAGGY,32,45] #Kindle Road ] #============================================================================= diff --git a/Data/Scripts/012_Overworld/001_Overworld.rb b/Data/Scripts/012_Overworld/001_Overworld.rb index b6d5b24b5..5a00312a9 100644 --- a/Data/Scripts/012_Overworld/001_Overworld.rb +++ b/Data/Scripts/012_Overworld/001_Overworld.rb @@ -887,9 +887,9 @@ def pbReceiveItem(item, quantity = 1, item_name = "", music = nil, canRandom = t if item == :LEFTOVERS pbMessage(_INTL("\\me[{1}]You obtained some \\c[1]{2}\\c[0]!\\wtnp[30]", meName, itemname)) elsif item.is_machine? # TM or HM - if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] && $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] && $game_variables[VAR_CURRENT_GYM_TYPE] > -1 - item = GameData::Item.get(randomizeGymTM(item)) - end + # if $game_switches[SWITCH_RANDOMIZE_GYMS_SEPARATELY] && $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] && $game_variables[VAR_CURRENT_GYM_TYPE] > -1 + # item = GameData::Item.get(randomizeGymTM(item)) + # end pbMessage(_INTL("\\me[{1}]You obtained \\c[1]{2} {3}\\c[0]!\\wtnp[30]", meName, itemname, GameData::Move.get(move).name)) elsif quantity > 1 pbMessage(_INTL("\\me[{1}]You obtained {2} #{text_color}{3}\\c[0]!\\wtnp[30]", meName, quantity, itemname)) diff --git a/Data/Scripts/048_Fusion/FusedSpecies.rb b/Data/Scripts/048_Fusion/FusedSpecies.rb index aa874b1d1..9c7727c1f 100644 --- a/Data/Scripts/048_Fusion/FusedSpecies.rb +++ b/Data/Scripts/048_Fusion/FusedSpecies.rb @@ -317,8 +317,9 @@ module GameData end echoln body_entry echoln head_entry - - return split_and_combine_text(body_entry, head_entry, ".") + combined_entry = split_and_combine_text(body_entry, head_entry, ".") + combined_entry += "." unless combined_entry.end_with?(".") + return combined_entry end def calculate_egg_groups 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 cc800ff42..0ca80d1ed 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 c010527da..7d9d92f90 100644 Binary files a/Data/messages.dat and b/Data/messages.dat differ diff --git a/Data/pokedex/rate_limit.log b/Data/pokedex/rate_limit.log index bf4dcdd65..9fd3fc11e 100644 --- a/Data/pokedex/rate_limit.log +++ b/Data/pokedex/rate_limit.log @@ -1 +1 @@ -1735012654 \ No newline at end of file +1735358913 \ No newline at end of file diff --git a/Data/trainers.dat b/Data/trainers.dat index 4e4d27d8d..716efd506 100644 Binary files a/Data/trainers.dat and b/Data/trainers.dat differ