Merge pull request #2 from Cuphat/hud_cosmetics

Move Display D-Pad HUD patch to patch_cosmetics.

Cosmetics.py

@@ -91,6 +91,13 @@ def patch_cosmetics(settings, rom):
     else:
         rom.write_byte(0xB71E6D, 0x00)
 
+    # Display D-Pad HUD
+    dpad_sym = rom.sym('display_dpad')
+    if settings.display_dpad:
+        rom.write_byte(dpad_sym, 0x01)
+    else:
+        rom.write_byte(dpad_sym, 0x00)
+
     # patch music
     if settings.background_music == 'random':
         restore_music(rom)
@@ -336,6 +343,7 @@ def cosmetics_output(self):
 
         output += format_string.format(key='Default Targeting Option:', value=self.settings.default_targeting, width=padding)
         output += format_string.format(key='Background Music:', value=self.settings.background_music, width=padding)
+        output += format_string.format(key='Display D-Pad HUD:', value=self.settings.display_dpad, width=padding)
 
         output += '\n\nColors:\n'
         for tunic, options in self.tunic_colors.items():

Patches.py

@@ -31,13 +31,6 @@ def patch_rom(spoiler:Spoiler, world:World, rom:LocalRom):
     # Force language to be English in the event a Japanese rom was submitted
     rom.write_byte(0x3E, 0x45)
 
-    # Display DPAD HUD
-    dpad_sym = rom.sym('display_dpad')
-    if world.display_dpad:
-        rom.write_byte(dpad_sym, 0x01)
-    else:
-        rom.write_byte(dpad_sym,0x00)
-
     # Increase the instance size of Bombchus prevent the heap from becoming corrupt when
     # a Dodongo eats a Bombchu. Does not fix stale pointer issues with the animation
     rom.write_int32(0xD6002C, 0x1F0)

SettingsList.py

@@ -1759,11 +1759,11 @@ def logic_tricks_list_tooltip(widget, pos):
             args_help      = '''\
                              Shows an additional HUD element displaying current available options on the DPAD
                              ''',
-            gui_text       = 'Display DPAD HUD',
+            gui_text       = 'Display D-Pad HUD',
             gui_group      = 'cosmetic',
             gui_tooltip    = '''\
                              Shows an additional HUD element displaying
-                             current available options on the DPAD
+                             current available options on the D-Pad.
                              ''',
             default        = True,
             ),