Misc tidying

.rubocop.yml

@@ -154,7 +154,7 @@ Style/SymbolArray:
 Style/WordArray:
   EnforcedStyle: brackets
 
-# Patentheses around the condition in a ternary operator helps to differentiate
+# Parentheses around the condition in a ternary operator helps to differentiate
 # it from the true/false results.
 Style/TernaryParentheses:
   EnforcedStyle: require_parentheses

Data/Scripts/001_Technical/002_RubyUtilities.rb

@@ -359,7 +359,7 @@ class CallbackWrapper
   def execute(given_block = nil, *args)
     execute_block = given_block || @code_block
     @params.each do |key, value|
-      args.instance_variable_set("@#{key.to_s}", value)
+      args.instance_variable_set("@#{key}", value)
     end
     args.instance_eval(&execute_block)
   end

Data/Scripts/004_Game classes/009_Game_Player.rb

@@ -474,7 +474,7 @@ class Game_Player < Game_Character
     if !@moved_last_frame || @stopped_last_frame   # Started a new step
       if pbTerrainTag.ice
         set_movement_type(:ice_sliding)
-      else#if !@move_route_forcing
+      else
         faster = can_run?
         if $PokemonGlobal&.diving
           set_movement_type((faster) ? :diving_fast : :diving)

Data/Scripts/012_Overworld/002_Battle triggering/004_Overworld_EncounterModifiers.rb

@@ -32,10 +32,10 @@ EventHandlers.add(:on_wild_pokemon_created, :level_depends_on_party,
 # Note that you can only modify a partner trainer's Pokémon, and not the trainer
 # themselves nor their items this way, as those are generated from scratch
 # before each battle.
-#EventHandlers.add(:on_trainer_load, :put_a_name_here,
-#  proc { |trainer|
-#    if trainer   # An NPCTrainer object containing party/items/lose text, etc.
-#      YOUR CODE HERE
-#    end
-#  }
-#)
+# EventHandlers.add(:on_trainer_load, :put_a_name_here,
+#   proc { |trainer|
+#     if trainer   # An NPCTrainer object containing party/items/lose text, etc.
+#       YOUR CODE HERE
+#     end
+#   }
+# )

Data/Scripts/013_Items/004_Item_Phone.rb

@@ -1,6 +1,16 @@
 # TODO: Add an information window with details of the person in a phone call.
 #       Make this work with common event calls (create and dispose the info
 #       window in start_message and end_message).
+# TODO: Look at the "ready to rematch" timers to see if they can be improved?
+#       Should they be limited to one trainer becoming ready every ~5 minutes?
+# TODO: See if incoming phone calls can be made optional somehow. Maybe just
+#       interrupt as normal with the start of the call and ask if the player
+#       wants to answer? Wait for a couple of seconds before asking to make sure
+#       the player doesn't accidentally skip/answer a call they didn't want to.
+# TODO: Add a Debug way of upgrading old phone script calls to new ones, or at
+#       least to find events using old phone scripts for the dev to update.
+# TODO: More Debug control over contacts (changing their "time to rebattle",
+#       unhiding hidden contacts, etc.) and the phone (time until next call).
 
 # TODO: Add calling a contact at a particular time forcing rematch readiness.
 #       Add trainer comments for this.
@@ -8,10 +18,6 @@
 #       requiring the player to call them at their particular time of day/week.
 # TODO: Be able to put the Phone on silent mode (prevent all phone calls from
 #       trainers, but allow scripted calls as normal).
-
-# TODO: Better messages, more customisation of messages.
-# TODO: Add a Debug way of upgrading old phone script calls to new ones, or at
-#       least to find events using old phone scripts for the dev to update.
 #===============================================================================
 #
 #===============================================================================
@@ -250,7 +256,7 @@ class Phone
     attr_accessor :trainer_type, :start_version, :versions_count, :version
     attr_accessor :time_to_ready, :rematch_flag, :variant_beaten
     attr_accessor :common_event_id
-    attr_accessor :visible
+    attr_reader   :visible
 
     # Map ID, event ID, trainer type, name, versions count = 1, start version = 0
     # Map ID, name, common event ID

Data/Scripts/021_Compiler/004_Compiler_MapsAndEvents.rb

@@ -506,7 +506,7 @@ module Compiler
       end
     end
     # Compile the trainer comments
-    rewriteComments = true #false   # You can change this
+    rewriteComments = false   # You can change this
     battles        = []
     trtype         = nil
     trname         = nil

PBS/phone.txt

@@ -28,7 +28,7 @@ Body1 = My \TP is looking more and more like me. It's getting cuter!
 Body2 = And you know? Now we can KO \TE easily.\mI should challenge the Cedolan Gym.
 Body2 = And you know? We just failed to beat \TE by a tiny margin.\mI'm guessing my Pokémon's levels aren't high enough yet...
 BattleRequest = You must be a lot better now, huh?\mHow about showing me your technique in a real battle with me?\mI'll be waiting on \TM.
-BattleReminder = Where are you? Let’s have our battle soon!\mI'll be waiting on \TM.
+BattleReminder = Where are you? Let's have our battle soon!\mI'll be waiting on \TM.
 End = See you later!
 #-------------------------------
 [PICNICKER,Susie]
@@ -41,8 +41,8 @@ IntroAfternoon = Hi, this is \TN! Good afternoon, \PN!
 IntroEvening = This is \TN! Good evening, \PN!
 IntroEvening = Hi, this is \TN! Good evening, \PN!
 Body1 = My \TP and I are getting more in sync with each other.
-Body2 = We battled a wild \TE and managed to beat it in a close match.\mWe’re getting into the groove!
-Body2 = But, you know what? I still haven’t caught \TE.\mIt’s getting beyond frustrating...
+Body2 = We battled a wild \TE and managed to beat it in a close match.\mWe're getting into the groove!
+Body2 = But, you know what? I still haven't caught \TE.\mIt's getting beyond frustrating...
 BattleRequest = Would you be my practice partner again sometime?\mI'll be waiting on \TM...\mCould you take it a little easier on me next time?
 BattleReminder = How soon can I expect to see you?\mDon't forget, \TM!
-End = Bye! Let’s chat again!
+End = Bye! Let's chat again!