summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKiritoDv <kiritodev01@gmail.com>2024-04-06 15:35:01 -0600
committerKiritoDv <kiritodev01@gmail.com>2024-04-06 15:35:01 -0600
commit2c22c1067eb5728d6a2fc09b109e026ff80934d8 (patch)
treec7d6f7714990f64f705c3901047c74497c946933
parentb36783ba8e4f633cfa9de217af80a28b3ca47bcc (diff)
Fixed aquas duplicates and bump torch
-rw-r--r--assets/yaml/us/ast_aquas.yaml6
m---------tools/Torch0
2 files changed, 3 insertions, 3 deletions
diff --git a/assets/yaml/us/ast_aquas.yaml b/assets/yaml/us/ast_aquas.yaml
index 51e98546..4d7cecde 100644
--- a/assets/yaml/us/ast_aquas.yaml
+++ b/assets/yaml/us/ast_aquas.yaml
@@ -33,7 +33,7 @@ D_AQ_6002628:
D_AQ_6002874:
{ type: SF64:SKELETON, offset: 0x6002874, symbol: D_AQ_6002874 }
-#
+#
D_AQ_6002C10:
{ type: GFX, offset: 0x6002C10, symbol: D_AQ_6002C10 }
@@ -91,7 +91,7 @@ D_AQ_6007D70:
D_AQ_6007F68:
{ type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x6007F68, symbol: D_AQ_6007F68 }
-D_AQ_6007F68:
+D_AQ_6003FF0:
{ type: TEXTURE, ctype: u8, format: IA8, width: 8, height: 32, offset: 0x6003FF0, symbol: D_AQ_6003FF0 }
D_AQ_6008168:
@@ -649,7 +649,7 @@ D_AQ_602E540:
D_AQ_602E584:
{ type: SF64:ENV_SETTINGS, offset: 0x602E584, symbol: D_AQ_602E584 }
-D_AQ_602E584:
+D_AQ_602E5C8:
{ type: SF64:OBJECT_INIT, offset: 0x602E5C8, symbol: D_AQ_602E5C8 }
D_AQ_60308B8:
diff --git a/tools/Torch b/tools/Torch
-Subproject 4d654e65a9c04b7b5486f792cf5f495186dd931
+Subproject 88409bf16532bd0c494d0245edf5c5b521500d1