torch update, aquas export, some asset cleanup (#166)

* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix

* torch

* formatting

* whoops the math

.gitignore

@@ -13,6 +13,7 @@ ctx.c.m2c
 *.z64
 *.bin
 *.otr
+assets/yaml/us/ast_test.yaml
 src/assets/*
 include/assets/*
 /build

assets/yaml/us/ast_allies.yaml

@@ -86,7 +86,7 @@ D_D00B688:
   { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x0D00B688, symbol: D_D00B688, tlut: 0xD00B708 }
 
 D_D00B708:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 12, offset: 0xD00B708, symbol: D_D00B708 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0xD00B708, symbol: D_D00B708, pad: 8 }
 
 D_D00B720:
   { type: GFX, offset: 0xD00B720, symbol: D_D00B720 }

assets/yaml/us/ast_option.yaml

@@ -18,10 +18,7 @@ D_8000680:
 
 # Cornerian army attn:
 D_80006A0:
-  { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 32, offset: 0x80006A0, symbol: D_80006A0, tlut: 0x80017A0 }
-
-D_80016A0: 
-  { type: BLOB, size: 0x100, offset: 0x80016A0, symbol: D_80016A0 }
+  { type: TEXTURE, ctype: u8, format: CI4, width: 256, height: 34, offset: 0x80006A0, symbol: D_80006A0, tlut: 0x80017A0 }
 
 D_80017A0:
   { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80017A0, symbol: D_80017A0 }
@@ -217,11 +214,7 @@ D_80143B0:
   { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x80143B0, symbol: D_80143B0, tlut: D_80147B0 }
 
 D_80147B0:
-  { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x80147B0, symbol: D_80147B0 }
-
-# Seems unused, TLUT?
-D_80147D0:
-  { type: BLOB, size: 0x20, offset: 0x80147D0, symbol: D_80147D0 }
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 32, offset: 0x80147B0, symbol: D_80147B0 }
 
 D_80147F0:
   { type: GFX, offset: 0x80147F0, symbol: D_80147F0 }

assets/yaml/us/ast_sector_x.yaml

@@ -74,6 +74,7 @@ D_6005EE8:
 
 PAD_60066E8:
   { type: BLOB, size: 8, offset: 0x60066E8, symbol: PAD_60066E8 }
+
 D_60066F0:
   { type: GFX, offset: 0x60066F0, symbol: D_60066F0 }
 
@@ -193,7 +194,7 @@ D_6013798:
 
 D_6013820:
   { type: SF64:ANIM, offset: 0x6013820, symbol: D_6013820 }
-  
+
 D_601390C:
   { type: SF64:SKELETON, offset: 0x601390C, symbol: D_601390C }
 
@@ -220,7 +221,7 @@ D_601AA28:
 
 PAD_601AA34:
   { type: BLOB, size: 0xC, offset: 0x601AA34, symbol: PAD_601AA34 }
-  
+
 D_601C690:
   { type: SF64:ANIM, offset: 0x601C690, symbol: D_601C690 }
 
@@ -232,7 +233,7 @@ PAD_601CA48:
 
 PAD_601CD78:
   { type: BLOB, size: 0x8, offset: 0x601CD78, symbol: PAD_601CD78 }
- 
+
 D_60206DC:
   { type: SF64:ANIM, offset: 0x60206DC, symbol: D_60206DC }
 

include/assets/ast_aquas.h

@@ -1,29 +0,0 @@
-#ifndef AST_AQUAS_H
-#define AST_AQUAS_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-extern f32 D_6030BFC[];
-extern f32 D_6030C18[];
-extern f32 D_6030C44[];
-extern f32 D_6030D20[];
-extern f32 D_6030D3C[];
-extern f32 D_6030D58[];
-extern f32 D_6030F74[];
-extern f32 D_6031398[];
-extern f32 D_60313CC[];
-extern f32 D_6031400[];
-extern f32 D_603144C[];
-extern f32 D_6031480[];
-extern f32 D_60314AC[];
-extern f32 D_60314C8[];
-extern f32 D_60314E4[];
-extern f32 D_6031500[];
-extern f32 D_603151C[];
-extern f32 D_6031538[];
-extern f32 D_6031554[];
-extern f32 D_6031570[];
-
-#endif

src/overlays/ovl_menu/fox_option.c

@@ -4417,8 +4417,8 @@ void Option_InvoiceDraw(void) {
                          D_menu_801AF3F0[1] + (16 * i), 1.0f, 1.0f);
     }
 
-    TextureRect_4bCI(&gMasterDisp, D_80006A0 + 4096, D_80017A0, 256, 2, D_menu_801AF3D0[1], D_menu_801AF3F0[1] + 32.0f,
-                     1.0f, 1.0f);
+    TextureRect_4bCI(&gMasterDisp, D_80006A0 + 256 * 16, D_80017A0, 256, 2, D_menu_801AF3D0[1],
+                     D_menu_801AF3F0[1] + 32.0f, 1.0f, 1.0f);
 
     for (i = 0; i < 4; i++) {
         TextureRect_4bCI(&gMasterDisp, D_80017C0 + (256 * 16 * i) / 2, D_80038C0, 256, 16, D_menu_801AF3D0[2],

yamls/us/assets.yaml

@@ -154,8 +154,12 @@
 
   - name: ast_aquas
     exclusive_ram_id: segment_06
-    type: bin
+    type: code
+    dir: assets
     start: 0xA58F60
+    vram: 0x06000000
+    subsegments:
+     - [0xA58F60, .data, ast_aquas/ast_aquas]
 
   - name: ast_area_6
     exclusive_ram_id: segment_06