Fixed aquas duplicates and bump torch

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: