Created module MenuHandlers for the contents of various menus

Data/Scripts/003_Game processing/005_Event_Handlers.rb

@@ -193,13 +193,6 @@ class HandlerHash2
     return nil
   end
 
-  def addIf(conditionProc, handler = nil, &handlerBlock)
-    if ![Proc, Hash].include?(handler.class) && !block_given?
-      raise ArgumentError, "addIf call for #{self.class.name} has no valid handler (#{handler.inspect} was given)"
-    end
-    @add_ifs.push([conditionProc, handler || handlerBlock])
-  end
-
   def add(sym, handler = nil, &handlerBlock)
     if ![Proc, Hash].include?(handler.class) && !block_given?
       raise ArgumentError, "#{self.class.name} for #{sym.inspect} has no valid handler (#{handler.inspect} was given)"
@@ -207,12 +200,21 @@ class HandlerHash2
     @hash[sym] = handler || handlerBlock if sym
   end
 
+  def addIf(conditionProc, handler = nil, &handlerBlock)
+    if ![Proc, Hash].include?(handler.class) && !block_given?
+      raise ArgumentError, "addIf call for #{self.class.name} has no valid handler (#{handler.inspect} was given)"
+    end
+    @add_ifs.push([conditionProc, handler || handlerBlock])
+  end
+
   def copy(src, *dests)
     handler = self[src]
     return if !handler
-    dests.each do |dest|
-      self.add(dest, handler)
-    end
+    dests.each { |dest| add(dest, handler) }
+  end
+
+  def remove(key)
+    @hash.delete(key)
   end
 
   def clear
@@ -222,7 +224,7 @@ class HandlerHash2
   def trigger(sym, *args)
     sym = sym.id if !sym.is_a?(Symbol) && sym.respond_to?("id")
     handler = self[sym]
-    return (handler) ? handler.call(sym, *args) : nil
+    return handler&.call(sym, *args)
   end
 end
 
@@ -232,9 +234,8 @@ end
 #===============================================================================
 class HandlerHashBasic
   def initialize
-    @ordered_keys = []
-    @hash         = {}
-    @addIfs       = []
+    @hash   = {}
+    @addIfs = []
   end
 
   def [](entry)
@@ -248,16 +249,11 @@ class HandlerHashBasic
     return ret
   end
 
-  def each
-    @ordered_keys.each { |key| yield key, @hash[key] }
-  end
-
   def add(entry, handler = nil, &handlerBlock)
     if ![Proc, Hash].include?(handler.class) && !block_given?
       raise ArgumentError, "#{self.class.name} for #{entry.inspect} has no valid handler (#{handler.inspect} was given)"
     end
     return if !entry || entry.empty?
-    @ordered_keys.push(entry) if !@ordered_keys.include?(entry)
     @hash[entry] = handler || handlerBlock
   end
 
@@ -271,17 +267,28 @@ class HandlerHashBasic
   def copy(src, *dests)
     handler = self[src]
     return if !handler
-    dests.each { |dest| self.add(dest, handler) }
+    dests.each { |dest| add(dest, handler) }
+  end
+
+  def remove(key)
+    @hash.delete(key)
   end
 
   def clear
     @hash.clear
-    @ordered_keys.clear
+  end
+
+  def each
+    @hash.each_pair { |key, value| yield key, value }
+  end
+
+  def keys
+    return @hash.keys.clone
   end
 
   def trigger(entry, *args)
     handler = self[entry]
-    return (handler) ? handler.call(*args) : nil
+    return handler&.call(*args)
   end
 end
 

Data/Scripts/003_Game processing/006_Event_HandlerCollections.rb

@@ -63,3 +63,59 @@ module EventHandlers
     return @@events[event]&.trigger(*args)
   end
 end
+
+#===============================================================================
+# This module stores the contents of various menus. Each command in a menu is a
+# hash of data (containing its name, relative order, code to run when chosen,
+# etc.).
+# Menus that use this module are:
+#-------------------------------------------------------------------------------
+# Pause menu
+# Pokégear main menu
+# PC main menu
+# Various debug menus (main, Pokémon, battle, battle Pokémon)
+#===============================================================================
+module MenuHandlers
+  @@handlers = {}
+
+  def self.add(menu, option, hash)
+    @@handlers[menu] = HandlerHashBasic.new if !@@handlers.has_key?(menu)
+    @@handlers[menu].add(option, hash)
+  end
+
+  def self.remove(menu, option)
+    @@handlers[menu]&.remove(option)
+  end
+
+  def self.clear(menu)
+    @@handlers[menu]&.clear
+  end
+
+  def self.each(menu)
+    return if !@@handlers.has_key?(menu)
+    @@handlers[menu].each { |option, hash| yield option, hash }
+  end
+
+  def self.each_available(menu)
+    return if !@@handlers.has_key?(menu)
+    options = @@handlers[menu]
+    keys = options.keys
+    sorted_keys = keys.sort_by { |option| options[option]["order"] || keys.index(option) }
+    sorted_keys.each do |option|
+      hash = options[option]
+      next if hash["condition"] && !hash["condition"].call
+      if hash["name"].is_a?(Proc)
+        name = hash["name"].call
+      else
+        name = _INTL(hash["name"])
+      end
+      yield option, hash, name
+    end
+  end
+
+  def self.call(menu, option, function, *args)
+    option_hash = @@handlers[menu][option]
+    return nil if !option_hash || !option_hash[function]
+    return option_hash[function].call(*args)
+  end
+end