Module-owns-placement migration + rolling-inventory engine

.gitignore

@@ -1,7 +1,13 @@
 build/**
 *.smc
+*.sfc
 oldies
 
+# a816 build artifacts
+a.out
+a.out.adbg
+*.o
+
 # Generated build assets (keep intro source files)
 assets/*
 !assets/intro.col

a816.toml

@@ -0,0 +1,3 @@
+entrypoint = "ff4.s"
+module-paths = ["build/obj", "src"]
+include-paths = ["src"]

build.py

@@ -86,7 +86,7 @@ def assets_need_refresh(source, destination):
 
 
 def build_patch(input, output, lang):
-    from a816.module_builder import build_with_imports_direct
+    from a816.module_builder import build_with_imports
 
     obj_dir = Path("build/obj")
     if obj_dir.exists():
@@ -97,15 +97,15 @@ def build_patch(input, output, lang):
     if out_path.exists():
         out_path.unlink()
 
-    result = build_with_imports_direct(
+    result = build_with_imports(
         main_source=Path(input),
         output_file=Path(output),
         output_format="ips",
         module_paths=[Path("build/obj"), Path("src")],
         output_dir=Path("build/obj"),
         symbols={"LANG": lang},
-        include_paths=[Path("src")],
-        prelude_file=Path("config.i"),
+        include_paths=[Path("src"), Path(".")],
+        overlap_mode="warn",
     )
 
     if result.exit_code != 0:
@@ -165,7 +165,9 @@ def build_fixed_asset(table, input_file, binary_text_file):
     write_pointers_value_as_binary(pointers, binary_text_file)
 
 
-def build_fixed_to_ptr_asset(table, input_file, binary_text_file, pointers_file, buffer_width=None):
+def build_fixed_to_ptr_asset(
+    table, input_file, binary_text_file, pointers_file, buffer_width=None
+):
     pointers = read_fixed_from_xml(
         input_file, table, formatter=lambda t: t.strip() + "[end]"
     )
@@ -184,7 +186,7 @@ def build_fixed_to_ptr_asset(table, input_file, binary_text_file, pointers_file,
             print(f"{text} is too long ({ptr_len}px , {math.ceil(ptr_len / 8)} tiles)")
 
     text = table.to_text(max_ptr[1].value)
-    print(f"{text} is the largest ({max_length}px ({math.ceil(max_length/8)})")
+    print(f"{text} is the largest ({max_length}px ({math.ceil(max_length / 8)})")
     write_pointers_value_as_binary(pointers, binary_text_file)
 
     write_pointers_addresses_as_binary(
@@ -327,8 +329,7 @@ def add_custom_kernings(text: str, advance: int) -> None:
         known_pairs_to_kern = [
             "Ya",
             "Pa",
-            "Po"
-            "Fa",
+            "PoFa",
             "Fe",
             "Fo",
             "Fu",
@@ -489,6 +490,12 @@ def build_assets(assets):
             menu_table,
         ),
         ("fixed", menu_table, os.path.join(text_root, "items.xml"), "assets/items.dat"),
+        (
+            "fixed",
+            menu_table,
+            os.path.join(text_root, "items_unleashed.xml"),
+            "assets/items_unleashed.dat",
+        ),
         ("fixed", menu_table, os.path.join(text_root, "magic.xml"), "assets/magic.dat"),
         (
             "fixed",
@@ -528,7 +535,7 @@ def build_assets(assets):
             os.path.join(text_root, "monsters_long.xml"),
             "assets/monsters_long.dat",
             "assets/monsters_long.ptr",
-            80
+            80,
         ),
         (
             "nullterminated",

config.i

@@ -13,6 +13,7 @@ ENABLE_BUTTON_DISPLAY := 1
 BATTLE_CMD_VWF := 1
 BATTLE_NAMES_VWF := 1
 BATTLE_MONSTERS_VWF := 1
+BATTLE_ITEMS_VWF := 1
 INVENTORY_ROLLING_BUFFER := 1
 TREASURE_INVENTORY_ROLLING := 1  ; WIP, treasure rolling-buffer scaffolding only
 TREASURE_DEBUG_ALWAYS_DROP := 1  ; force every win to drop an item (testing)