From 86c1fe412bbb656f31cbd64a80bef20c80d12d9b Mon Sep 17 00:00:00 2001
From: petrie911 <pmontag@Monday.localdomain>
Date: Sun, 15 Oct 2023 17:14:01 -0500
Subject: [PATCH] yaml stuff

---
 starfox64.yaml    | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 tools/comptool.py |  7 ++--
 2 files changed, 84 insertions(+), 4 deletions(-)
 create mode 100644 starfox64.yaml

diff --git a/starfox64.yaml b/starfox64.yaml
new file mode 100644
index 00000000..07767db4
--- /dev/null
+++ b/starfox64.yaml
@@ -0,0 +1,81 @@
+name: Starfox64 (North America)
+sha1: f7475fb11e7e6830f82883412638e8390791ab87
+options:
+  basename: starfox64
+  target_path: baserom.us.uncompressed.z64
+  elf_path: build/starfox64.elf
+  base_path: .
+  platform: n64
+  compiler: GCC
+
+  asm_path: asm
+  src_path: src
+  build_path: build
+  # create_asm_dependencies: True
+
+  ld_script_path: starfox64.ld
+  ld_dependencies: True
+
+  find_file_boundaries: True
+  header_encoding: ASCII
+
+  o_as_suffix: True
+  use_legacy_include_asm: False
+  mips_abi_float_regs: o32
+
+  asm_function_macro: glabel
+  asm_jtbl_label_macro: jlabel
+  asm_data_macro: dlabel
+
+  # section_order: [".text", ".data", ".rodata", ".bss"]
+  # auto_all_sections: [".data", ".rodata", ".bss"]
+
+  symbol_addrs_path:
+    - symbol_addrs.txt
+  undefined_funcs_auto_path:
+    - undefined_funcs_auto.txt
+  undefined_syms_auto_path:
+    - undefined_syms_auto.txt
+  reloc_addrs_path:
+    - reloc_addrs.txt
+
+  extensions_path: tools/splat_ext
+
+  # string_encoding: ASCII
+  # data_string_encoding: ASCII
+  rodata_string_guesser_level: 2
+  data_string_guesser_level: 2
+  # libultra_symbols: True
+  # hardware_regs: True
+  # gfx_ucode: # one of [f3d, f3db, f3dex, f3dexb, f3dex2]
+segments:
+  - name: header
+    type: header
+    start: 0x0
+
+  - name: boot
+    type: bin
+    start: 0x40
+
+  - name: entry
+    type: code
+    start: 0x1000
+    vram: 0x80000400
+    subsegments:
+      - [0x1000, hasm]
+
+  - name: main
+    type: code
+    start: 0x1050
+    vram: 0x80000450
+    follows_vram: entry
+    bss_size: 0x9B1F0
+    subsegments:
+      - [0x1050, asm]
+      - [0x1270, data]
+      - { start: 0xDE480, type: bss, vram: 0x800DD880 }
+
+  - type: bin
+    start: 0xDE480
+    follows_vram: main
+  - [0xEFFAE0]
diff --git a/tools/comptool.py b/tools/comptool.py
index 527ef19a..e8ce9ce5 100644
--- a/tools/comptool.py
+++ b/tools/comptool.py
@@ -108,9 +108,8 @@ def compress(baserom, comprom, mio0, extract_dest=None):
             
             compfile.seek(0, 2)
 
-            print("File " + str(file_count) + ": Writing " + format(p_file_size, 'X') + " bytes at " + format(compfile.tell(),'X'))
+            # print("File " + str(file_count) + ": Writing " + format(p_file_size, 'X') + " bytes at " + format(compfile.tell(),'X'))
             
-
             compfile.write(file_bytes)
 
             p_file_end = p_file_begin + p_file_size
@@ -155,7 +154,7 @@ def decompress(baserom, decomprom, mio0, extract_dest=None):
 
             p_file_size = p_file_end - p_file_begin
             
-            print(v_file_begin, p_file_begin, p_file_end, comp_flag)
+            # print(v_file_begin, p_file_begin, p_file_end, comp_flag)
 
             if(v_file_begin == 0 and p_file_end == 0):
                 break
@@ -187,7 +186,7 @@ def decompress(baserom, decomprom, mio0, extract_dest=None):
                 if not os.path.exists(extract_dest):
                     os.mkdir(extract_dest)
 
-                file_name = format(v_file_begin, 'X') + '.bin'
+                file_name = 'file_' + str(file_count)+'_'+format(v_file_begin, 'X') + '.bin'
 
                 with open(extract_dest + os.sep + file_name, 'wb') as extract_file:
                     extract_file.write(file_bytes)