Comptool support for byteswapped ROMs (#249)

* comptool update

* further updates

* lodgenet

* comptool and main split

* one last thing

4 files changed, 70 insertions, 35 deletions

diff --git a/yamls/jp/rev0/main.yaml b/yamls/jp/rev0/main.yaml
index 754a6248..9bbb4b9f 100644
--- a/yamls/jp/rev0/main.yaml
+++ b/yamls/jp/rev0/main.yaml
@@ -260,8 +260,43 @@
       - [0xE7650, data, wave_samples]
       - [0xE8270, data, note_data]
 
-      # bss
-      - { start: 0xE93C0, type: bss, vram: 0x800E87C0, name: main }
+      # Nintendo Library bss
+      - { type: bss, vram: 0x800E87C0, name: sys_joybus }
+      - { type: bss, vram: 0x800E89E0, name: sys_main }
+      - { type: bss, vram: 0x801462E0, name: sys_math }
+      - { type: bss, vram: 0x80146300, name: sys_matrix }
+      - { type: bss, vram: 0x80147310, name: sys_memory }
+      - { type: bss, vram: 0x8014FB20, name: sys_timer }
+      - { type: bss, vram: 0x8014FEA0, name: sys_save }
+      - { type: bss, vram: 0x801502A0, name: sys_fault }
+      - { type: bss, vram: 0x80150C80, name: audio/audio_synthesis }
+      - { type: bss, vram: 0x80151CC0, name: audio/audio_load }
+      - { type: bss, vram: 0x80151DA0, name: audio/audio_general }
+      - { type: bss, vram: 0x80156980, name: audio/audio_context }
+      - { type: bss, vram: 0x80160CE0, name: audio/audio_thread }
+      
+      # Libultra bss
+      - { type: bss, vram: 0x80161560, name: libultra }
+
+      # Game engine bss
+      - { type: .bss, vram: 0x801650A0, name: engine/fox_360 }
+      - { type: .bss, vram: 0x801650F0, name: engine/fox_beam }
+      - { type: .bss, vram: 0x80165100, name: engine/fox_bg }
+      - { type: .bss, vram: 0x80166B40, name: engine/fox_boss }
+      - { type: .bss, vram: 0x80166B50, name: engine/fox_display }
+      - { type: .bss, vram: 0x80166D70, name: engine/fox_edisplay }
+      - { type: .bss, vram: 0x80166E10, name: engine/fox_enmy }
+      - { type: .bss, vram: 0x80166E30, name: engine/fox_enmy2 }
+      - { type: .bss, vram: 0x80166E40, name: engine/fox_hud }
+      - { type: .bss, vram: 0x801670F0, name: engine/fox_col1 }
+      - { type: .bss, vram: 0x80167140, name: engine/fox_std_lib }
+      - { type: .bss, vram: 0x801671B0, name: engine/fox_game }
+      - { type: .bss, vram: 0x801671F0, name: engine/fox_play }
+      - { type: .bss, vram: 0x80167210, name: engine/fox_context}
+      - { type: .bss, vram: 0x8017DD20, name: engine/fox_rcp }
+      - { type: .bss, vram: 0x8017DEC0, name: engine/fox_radio }
+      - { type: .bss, vram: 0x8017DEF0, name: engine/fox_versus }
+      - { type: .bss, vram: 0x8017E010, name: engine/fox_save }
 
   - name: dma_table
     type: code
diff --git a/yamls/jp/rev0/overlays.yaml b/yamls/jp/rev0/overlays.yaml
index 0ba6e18d..8f59011c 100644
--- a/yamls/jp/rev0/overlays.yaml
+++ b/yamls/jp/rev0/overlays.yaml
@@ -21,9 +21,9 @@
     - [0xDBD410, .rodata, fox_ve1]
     - [0xDBD7A0, .rodata, fox_tr]
     - [0xDBD7E0, .rodata, fox_tr360]
-    - { start: 0xDBD820, type: bss, vram: 0x80192940, name: fox_i1 }
-    - { start: 0xDBD820, type: bss, vram: 0x80192950, name: fox_co }
-    - { start: 0xDBD820, type: bss, vram: 0x80192A70, name: fox_ve1 }
+    - { type: bss, vram: 0x80192940, name: fox_i1 }
+    - { type: bss, vram: 0x80192950, name: fox_co }
+    - { type: bss, vram: 0x80192A70, name: fox_ve1 }
 
   - name: ovl_i2
     exclusive_ram_id: overlay
@@ -43,8 +43,8 @@
     - [0xDCB8F0, data, fox_sx]
     - [0xDCBA40, .rodata, fox_me]
     - [0xDCBD00, .rodata, fox_sx]
-    - { start: 0xDCC020, type: bss, vram: 0x8018CFA0, name: fox_i2 }
-    - { start: 0xDCC020, type: bss, vram: 0x8018CFB0, name: fox_sx }
+    - { type: bss, vram: 0x8018CFA0, name: fox_i2 }
+    - { type: bss, vram: 0x8018CFB0, name: fox_sx }
 
   - name: ovl_i3
     exclusive_ram_id: overlay
@@ -70,11 +70,11 @@
     - [0xE058E0, .rodata, fox_zo]
     - [0xE06000, .rodata, fox_so]
     - [0xE06560, .rodata, fox_aq]
-    - { start: 0xE06D70, type: bss, vram: 0x801B94F0, name: fox_i3 }
-    - { start: 0xE06D70, type: bss, vram: 0x801B9500, name: fox_a6 }
-    - { start: 0xE06D70, type: bss, vram: 0x801B95E0, name: fox_zo }
-    - { start: 0xE06D70, type: bss, vram: 0x801B99F0, name: fox_so }
-    - { start: 0xE06D70, type: bss, vram: 0x801B9A70, name: fox_aq }
+    - { type: bss, vram: 0x801B94F0, name: fox_i3 }
+    - { type: bss, vram: 0x801B9500, name: fox_a6 }
+    - { type: bss, vram: 0x801B95E0, name: fox_zo }
+    - { type: bss, vram: 0x801B99F0, name: fox_so }
+    - { type: bss, vram: 0x801B9A70, name: fox_aq }
 
 
   - name: ovl_i4
@@ -102,10 +102,10 @@
     - [0xE1EDE0, .rodata, fox_bo]
     - [0xE1F1E0, .rodata, fox_ka]
     - [0xE1F570, .rodata, fox_sz]
-    - { start: 0xE1F870, type: bss, vram: 0x801972A0, name: fox_i4 }
-    - { start: 0xE1F870, type: bss, vram: 0x801972B0, name: fox_bo }
-    - { start: 0xE1F870, type: bss, vram: 0x80197420, name: fox_ka }
-    - { start: 0xE1F870, type: bss, vram: 0x80197440, name: fox_sz }
+    - { type: bss, vram: 0x801972A0, name: fox_i4 }
+    - { type: bss, vram: 0x801972B0, name: fox_bo }
+    - { type: bss, vram: 0x80197420, name: fox_ka }
+    - { type: bss, vram: 0x80197440, name: fox_sz }
 
 
   - name: ovl_i5
@@ -133,10 +133,10 @@
     - [0xE52E30, .rodata, fox_ti]
     - [0xE53690, .rodata, fox_ma]
     - [0xE541D0, .rodata, fox_ground]
-    - { start: 0xE542C0, type: bss, vram: 0x801B31F0, name: fox_i5 }
-    - { start: 0xE542C0, type: bss, vram: 0x801B3200, name: fox_ti }
-    - { start: 0xE542C0, type: bss, vram: 0x801B5540, name: fox_ma }
-    - { start: 0xE542C0, type: bss, vram: 0x801B5A40, name: fox_ground }
+    - { type: bss, vram: 0x801B31F0, name: fox_i5 }
+    - { type: bss, vram: 0x801B3200, name: fox_ti }
+    - { type: bss, vram: 0x801B5540, name: fox_ma }
+    - { type: bss, vram: 0x801B5A40, name: fox_ground }
 
 
   - name: ovl_i6
@@ -164,9 +164,9 @@
     - [0xE74210, .rodata, fox_ve2]
     - [0xE74250, .rodata, fox_sy]
     - [0xE74CA0, .rodata, fox_turret]
-    - { start: 0xE74D00, type: bss, vram: 0x8019F1E0, name: fox_i6 }
-    - { start: 0xE74D00, type: bss, vram: 0x8019F1F0, name: fox_andross }
-    - { start: 0xE74D00, type: bss, vram: 0x8019F6E0, name: fox_sy }
+    - { type: bss, vram: 0x8019F1E0, name: fox_i6 }
+    - { type: bss, vram: 0x8019F1F0, name: fox_andross }
+    - { type: bss, vram: 0x8019F6E0, name: fox_sy }
 
 
   - name: ovl_menu
diff --git a/yamls/us/rev1/main.yaml b/yamls/us/rev1/main.yaml
index d570589c..bd7b919c 100644
--- a/yamls/us/rev1/main.yaml
+++ b/yamls/us/rev1/main.yaml
@@ -340,7 +340,7 @@
       - [0xDD330, .data, audio/note_data]
 
       # Nintendo Library bss
-      - { start: 0xDE480, type: .bss, vram: 0x800DD880, name: sys/sys_joybus }
+      - { type: .bss, vram: 0x800DD880, name: sys/sys_joybus }
       - { type: .bss, vram: 0x800DDAA0, name: sys/sys_main }
       - { type: .bss, vram: 0x8013B3A0, name: sys/sys_math }
       - { type: .bss, vram: 0x8013B3C0, name: sys/sys_matrix }
diff --git a/yamls/us/rev1/overlays.yaml b/yamls/us/rev1/overlays.yaml
index 3c868211..c4947cd6 100644
--- a/yamls/us/rev1/overlays.yaml
+++ b/yamls/us/rev1/overlays.yaml
@@ -21,7 +21,7 @@
     - [0xE07FF0, .rodata, fox_ve1]
     - [0xE08380, .rodata, fox_tr]
     - [0xE083C0, .rodata, fox_tr360]
-    - { start: 0xE08400, type: .bss, vram: 0x8019B6C0, name: fox_i1 }
+    - { type: .bss, vram: 0x8019B6C0, name: fox_i1 }
     - { type: .bss, vram: 0x8019B6D0, name: fox_co }
     - { type: .bss, vram: 0x8019B7F0, name: fox_ve1 }
 
@@ -43,7 +43,7 @@
     - [0xE16520, .data, fox_sx]
     - [0xE16670, .rodata, fox_me]
     - [0xE16930, .rodata, fox_sx]
-    - { start: 0xE16C50, type: .bss, vram: 0x80195D70, name: fox_i2 }
+    - { type: .bss, vram: 0x80195D70, name: fox_i2 }
     - { type: .bss, vram: 0x80195D80, name: fox_sx }
 
   - name: ovl_i3
@@ -70,7 +70,7 @@
     - [0xE504E0, .rodata, fox_zo]
     - [0xE50C00, .rodata, fox_so]
     - [0xE51160, .rodata, fox_aq]
-    - { start: 0xE51970, type: .bss, vram: 0x801C2240, name: fox_i3 }
+    - { type: .bss, vram: 0x801C2240, name: fox_i3 }
     - { type: .bss, vram: 0x801C2250, name: fox_a6 }
     - { type: .bss, vram: 0x801C2330, name: fox_zo }
     - { type: .bss, vram: 0x801C2740, name: fox_so }
@@ -101,7 +101,7 @@
     - [0xE69D70, .rodata, fox_bo]
     - [0xE6A170, .rodata, fox_ka]
     - [0xE6A510, .rodata, fox_sz]
-    - { start: 0xE6A810, type: .bss, vram: 0x801A03C0, name: fox_i4 }
+    - { type: .bss, vram: 0x801A03C0, name: fox_i4 }
     - { type: .bss, vram: 0x801A03D0, name: fox_bo }
     - { type: .bss, vram: 0x801A0540, name: fox_ka }
     - { type: .bss, vram: 0x801A0560, name: fox_sz }
@@ -112,7 +112,7 @@
     dir: overlays/ovl_i5
     start: 0xE6A810
     vram: 0x80187520
-    follows_vram: ast_radio
+    # follows_vram: ast_radio
     bss_size: 0xAF80
     symbol_name_format: i5_$VRAM
     subsegments:
@@ -131,7 +131,7 @@
     - [0xE9DD40, .rodata, fox_ti]
     - [0xE9E5A0, .rodata, fox_ma]
     - [0xE9F0E0, .rodata, fox_ground]
-    - { start: 0xE9F1D0, type: .bss, vram: 0x801BBEE0, name: fox_i5 }
+    - { type: .bss, vram: 0x801BBEE0, name: fox_i5 }
     - { type: .bss, vram: 0x801BBEF0, name: fox_ti }
     - { type: .bss, vram: 0x801BE240, name: fox_ma }
     - { type: .bss, vram: 0x801BE740, name: fox_ground }
@@ -161,7 +161,7 @@
     - [0xEBF0F0, .rodata, fox_ve2]
     - [0xEBF130, .rodata, fox_sy]
     - [0xEBFB80, .rodata, fox_turret]
-    - { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 }
+    - { type: .bss, vram: 0x801A7F30, name: fox_i6 }
     - { type: .bss, vram: 0x801A7F40, name: fox_andross }
     - { type: .bss, vram: 0x801A8440, name: fox_sy }
 
@@ -187,7 +187,7 @@
     - [0xEEF430, .rodata, fox_title]
     - [0xEEF7D0, .rodata, fox_option]
     - [0xEEFB80, .rodata, fox_map]
-    - { start: 0xEF0260, type: .bss, vram: 0x801B7BA0, name: fox_i_menu }
+    - { type: .bss, vram: 0x801B7BA0, name: fox_i_menu }
     - { type: .bss, vram: 0x801B7BB0, name: fox_title }
     - { type: .bss, vram: 0x801B9090, name: fox_option }
     - { type: .bss, vram: 0x801B9410, name: fox_map }
@@ -208,7 +208,7 @@
     - [0xEFBBB0, .data, fox_end2]
     - [0xEFEF80, .rodata, fox_end1]
     - [0xEFF380, .rodata, fox_end2]
-    - { start: 0xEFFA40, type: .bss, vram: 0x80196D00, name: fox_end1 }
+    - { type: .bss, vram: 0x80196D00, name: fox_end1 }
     - { type: .bss, vram: 0x80198590, name: fox_end2 }
 
   - name: ovl_unused
@@ -223,7 +223,7 @@
     subsegments:
     - [0xEFFA40, c, fox_unused]
     - [0xEFFA50, .data, fox_unused]
-    - { start: 0xEFFAE0, type: .bss, vram: 0x801875C0, name: fox_unused }
+    - { type: .bss, vram: 0x801875C0, name: fox_unused }
 
   - name: buffers
     exclusive_ram_id: buffer
@@ -232,6 +232,6 @@
     vram: 0x80281000
     bss_size: 0x17F000
     subsegments:
-    - { start: 0xEFFAE0, type: .bss, vram: 0x80281000, name: buffers }
+    - { type: .bss, vram: 0x80281000, name: buffers }
 
   - [0xEFFAE0]
\ No newline at end of file