Merge branch 'main' into beta

Rom.py

@@ -2788,7 +2788,7 @@ def write_strings(rom, world, player, team):
             tt['sign_ganon'] = 'Three ways to victory! %s Get to it!' % trinity_crystal_text
             tt['murahdahla'] = "Hello @. I\nam Murahdahla, brother of\nSahasrahla and Aginah. Behold the power of\ninvisibility.\n\n\n\n… … …\n\nWait! You can see me? I knew I should have\nhidden in a hollow tree. If you bring\n%d triforce pieces, I can reassemble it." % int(world.treasure_hunt_count[player])
         elif world.goal[player] == 'ganonhunt':
-            tt['sign_ganon'] = 'Go find the Triforce pieces to beat Ganon.'
+            tt['sign_ganon'] = 'Go find the Triforce pieces to beat Ganon'
         elif world.goal[player] == 'bosshunt':
             bosshunt_count = '%d guardian%s of %sdungeons' % \
                 (world.bosses_ganon[player],
@@ -2796,7 +2796,7 @@ def write_strings(rom, world, player, team):
                  '' if world.bosshunt_include_agas[player] else 'prize ')
             tt['sign_ganon'] = 'To beat Ganon you must defeat %s.' % bosshunt_count
         elif world.goal[player] == 'completionist':
-            tt['sign_ganon'] = 'Ganon only respects those who have done everything.'
+            tt['sign_ganon'] = 'Ganon only respects those who have done everything'
         tt['ganon_fall_in'] = Ganon1_texts[random.randint(0, len(Ganon1_texts) - 1)]
         tt['ganon_fall_in_alt'] = 'You cannot defeat me until you finish your goal!'
         tt['ganon_phase_3_alt'] = 'Got wax in\nyour ears?\nI can not die!'

Utils.py

@@ -8,7 +8,6 @@ import urllib.parse
 import urllib.request
 import xml.etree.ElementTree as ET
 from collections import defaultdict
-from hashlib import md5
 from itertools import count
 from math import factorial
 from pathlib import Path
@@ -103,13 +102,31 @@ def close_console():
             pass
 
 
-def get_new_romhash(new_rom='working.sfc'):
+def make_new_base2current(old_rom='Zelda no Densetsu - Kamigami no Triforce (Japan).sfc', new_rom='working.sfc'):
+    import hashlib
+    import json
+    from collections import OrderedDict
+    with open(old_rom, 'rb') as stream:
+        old_rom_data = bytearray(stream.read())
     with open(new_rom, 'rb') as stream:
         new_rom_data = bytearray(stream.read())
+    # extend to 2 mb
+    old_rom_data.extend(bytearray([0x00] * (2097152 - len(old_rom_data))))
 
-    basemd5 = md5()
+    out_data = OrderedDict()
+    for idx, old in enumerate(old_rom_data):
+        new = new_rom_data[idx]
+        if old != new:
+            out_data[idx] = [int(new)]
+    for offset in reversed(list(out_data.keys())):
+        if offset - 1 in out_data:
+            out_data[offset-1].extend(out_data.pop(offset))
+    with open('data/base2current.json', 'wt') as outfile:
+        json.dump([{key: value} for key, value in out_data.items()], outfile, separators=(",", ":"))
+
+    basemd5 = hashlib.md5()
     basemd5.update(new_rom_data)
-    return basemd5.hexdigest()
+    return "New Rom Hash: " + basemd5.hexdigest()
 
 
 def kth_combination(k, l, r):
@@ -770,11 +787,12 @@ class bidict(dict):
 class HexInt(int): pass
 
 def hex_representer(dumper, data):
+    import yaml
     return yaml.ScalarNode('tag:yaml.org,2002:int', f"{data:#0{4}x}")
 
 
 if __name__ == '__main__':
-    print("New Rom Hash:", get_new_romhash())
+    print(make_new_base2current())
     # read_entrance_data(old_rom=sys.argv[1])
     # room_palette_data(old_rom=sys.argv[1])
     # extract_data_from_us_rom(sys.argv[1])

source/enemizer/SpriteSheets.py

@@ -471,6 +471,10 @@ vanilla_sheets = [
     (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00),
     (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x00),
     (0x00, 0x00, 0x00, 0x00), (0x00, 0x00, 0x00, 0x08), (0x5D, 0x49, 0x00, 0x52), (0x55, 0x49, 0x42, 0x43),
+#    (0x61, 0x62, 0x63, 0x50), (0x61, 0x62, 0x63, 0x50), (0x61, 0x62, 0x63, 0x50), (0x61, 0x62, 0x63, 0x50),
+#    (0x61, 0x62, 0x63, 0x50), (0x61, 0x62, 0x63, 0x50), (0x61, 0x56, 0x57, 0x50), (0x61, 0x62, 0x63, 0x50),
+#    (0x61, 0x62, 0x63, 0x50), (0x61, 0x56, 0x57, 0x50), (0x61, 0x56, 0x63, 0x50), (0x61, 0x56, 0x57, 0x50),
+#    (0x61, 0x56, 0x33, 0x50), (0x61, 0x56, 0x57, 0x50), (0x61, 0x62, 0x63, 0x50), (0x61, 0x62, 0x63, 0x50)
 ]
 
 required_boss_sheets = {EnemySprite.ArmosKnight: 9, EnemySprite.Lanmolas: 11, EnemySprite.Moldorm: 12,