Skeleton factory and more Titania assets (#160)

* skellingtons

* sort

assets/yaml/us/ast_7_ti_1.yml

@@ -0,0 +1,324 @@
+:config:
+  segments:
+    - [0x07, 0xA0E340]
+  header:
+    code:
+      - '#include "assets/ast_7_ti_1.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+
+D_AST_7_TI_1_7000000:
+  { type: TEXTURE, ctype: u8, format: IA8, width: 96, height: 28, offset: 0x07000000, symbol: D_AST_7_TI_1_7000000, tlut: 0x07001108 }
+
+D_7000A80:
+  { type: GFX, offset: 0x7000A80, symbol: D_7000A80 }
+
+D_7000D08:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07000D08, symbol: D_7000D08, tlut: 0x07001108 }
+
+D_7001108:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 176, offset: 0x07001108, symbol: D_7001108 }
+
+D_7001268:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 64, offset: 0x7001268, symbol: D_7001268, pad: 8 }
+
+D_7002270:
+  { type: GFX, offset: 0x7002270, symbol: D_7002270 }
+
+D_7002490:
+  { type: GFX, offset: 0x7002490, symbol: D_7002490 }
+
+D_7002730:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07002730, symbol: D_7002730 }
+
+D_7002930:
+  { type: GFX, offset: 0x7002930, symbol: D_7002930 }
+
+D_7002C88:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x7002C88, symbol: D_7002C88 }
+
+D_7003488:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07003488, symbol: D_7003488, tlut: 0x07003888 }
+
+D_7003888:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x07003888, symbol: D_7003888, pad: 8 }
+
+D_7003A90:
+  { type: GFX, offset: 0x7003A90, symbol: D_7003A90 }
+
+D_7003C50:
+  { type: GFX, offset: 0x7003C50, symbol: D_7003C50 }
+
+D_7003E30:
+  { type: GFX, offset: 0x7003E30, symbol: D_7003E30 }
+
+PAD_7003FB8: 
+  { type: BLOB, size: 8, offset: 0x7003FB8, symbol: PAD_7003FB8 }
+
+D_7003FC0:
+  { type: GFX, offset: 0x7003FC0, symbol: D_7003FC0 }
+
+D_7004170:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004170, symbol: D_7004170 }
+
+D_7004370:
+  { type: GFX, offset: 0x7004370, symbol: D_7004370 }
+
+D_7004560:
+  { type: GFX, offset: 0x7004560, symbol: D_7004560 }
+
+PAD_7004778: 
+  { type: BLOB, size: 8, offset: 0x7004778, symbol: PAD_7004778 }
+
+D_7004780:
+  { type: GFX, offset: 0x7004780, symbol: D_7004780 }
+
+D_70049A0:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070049A0, symbol: D_70049A0 }
+
+D_7004BA0:
+  { type: GFX, offset: 0x7004BA0, symbol: D_7004BA0 }
+
+D_7004E78:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07004E78, symbol: D_7004E78 }
+
+D_7005078:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07005078, symbol: D_7005078, pad: 8 }
+
+D_7005280:
+  { type: GFX, offset: 0x7005280, symbol: D_7005280 }
+
+PAD_7005418: 
+  { type: BLOB, size: 8, offset: 0x7005418, symbol: PAD_7005418 }
+
+D_7005420:
+  { type: GFX, offset: 0x7005420, symbol: D_7005420 }
+
+PAD_7005648: 
+  { type: BLOB, size: 8, offset: 0x7005648, symbol: PAD_7005648 }
+
+D_70067C4:
+  { type: SF64:ANIM, offset: 0x70067C4, symbol: D_70067C4 }
+
+D_7006990:
+  { type: SF64:SKELETON, offset: 0x7006990, symbol: D_7006990}
+
+PAD_70069CC: 
+  { type: BLOB, size: 4, offset: 0x70069CC, symbol: PAD_70069CC }
+
+D_7006F74:
+  { type: SF64:ANIM, offset: 0x7006F74, symbol: D_7006F74 }
+
+D_7007130:
+  { type: SF64:ANIM, offset: 0x7007130, symbol: D_7007130 }
+
+PAD_700713C: 
+  { type: BLOB, size: 4, offset: 0x700713C, symbol: PAD_700713C }
+
+D_7007234:
+  { type: SF64:ANIM, offset: 0x7007234, symbol: D_7007234 }
+
+D_700733C:
+  { type: SF64:ANIM, offset: 0x700733C, symbol: D_700733C }
+
+PAD_7007348: 
+  { type: BLOB, size: 8, offset: 0x7007348, symbol: PAD_7007348 }
+
+D_7007350:
+  { type: GFX, offset: 0x7007350, symbol: D_7007350 }
+
+D_7007AB0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x7007AB0, symbol: D_7007AB0, tlut: 0x07007EB0 }
+
+D_7007EB0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 240, offset: 0x07007EB0, symbol: D_7007EB0 }
+
+D_7008090:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x07008090, symbol: D_7008090, tlut: 0x07008490 }
+
+D_7008490:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 248, offset: 0x07008490, symbol: D_7008490 }
+
+D_7008680:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x07008680, symbol: D_7008680, tlut: 0x07008490 }
+
+D_7008780:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 216, offset: 0x07008780, symbol: D_7008780 }
+
+D_7008930:
+  { type: GFX, offset: 0x7008930, symbol: D_7008930 }
+
+D_7008D10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008D10, symbol: D_7008D10 }
+
+D_7008F10:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x7008F10, symbol: D_7008F10 }
+
+D_7009110:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009110, symbol: D_7009110 }
+
+D_7009310:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009310, symbol: D_7009310 }
+
+D_7009510:
+  { type: GFX, offset: 0x7009510, symbol: D_7009510 }
+
+D_70096D8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x070096D8, symbol: D_70096D8, pad: 8 }
+
+D_70098E0:
+  { type: GFX, offset: 0x70098E0, symbol: D_70098E0 }
+
+D_7009B58:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x07009B58, symbol: D_7009B58, pad: 8 }
+
+D_7009D60:
+  { type: GFX, offset: 0x7009D60, symbol: D_7009D60 }
+
+D_700A190:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0700A190, symbol: D_700A190 }
+
+D_700A990:
+  { type: GFX, offset: 0x700A990, symbol: D_700A990 }
+
+D_700AAD8:
+  { type: TEXTURE, ctype: u8, format: CI4, width: 16, height: 16, offset: 0x700AAD8, symbol: D_700AAD8, tlut: 0x700AB58 }
+
+D_700AB58:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 8, offset: 0x700AB58, symbol: D_700AB58, pad: 8 }
+
+D_700AB70:
+  { type: GFX, offset: 0x700AB70, symbol: D_700AB70 }
+
+D_700AEA8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700AEA8, symbol: D_700AEA8, pad: 8 }
+
+D_700AF30:
+  { type: GFX, offset: 0x700AF30, symbol: D_700AF30 }
+
+D_700B5B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B5B8, symbol: D_700B5B8 }
+
+D_700B7B8:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700B7B8, symbol: D_700B7B8, pad: 8 }
+
+D_700B9C0:
+  { type: GFX, offset: 0x700B9C0, symbol: D_700B9C0 }
+
+D_700BB10:
+  { type: GFX, offset: 0x700BB10, symbol: D_700BB10 }
+
+PAD_700BDF8:
+  { type: BLOB, size: 8, offset: 0x700BDF8, symbol: PAD_700BDF8 }
+
+D_700BE00:
+  { type: GFX, offset: 0x700BE00, symbol: D_700BE00 }
+
+D_700BFB0:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x0700BFB0, symbol: D_700BFB0, tlut: 0x0700C3B0 }
+
+D_700C3B0:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 128, offset: 0x0700C3B0, symbol: D_700C3B0 }
+
+D_700C4B0:
+  { type: GFX, offset: 0x700C4B0, symbol: D_700C4B0 }
+
+PAD_700C888:
+  { type: BLOB, size: 8, offset: 0x700C888, symbol: PAD_700C888 }
+
+D_700C8D8:
+  { type: SF64:ANIM, offset: 0x700C8D8, symbol: D_700C8D8 }
+
+D_700C964:
+  { type: SF64:SKELETON, offset: 0x700C964, symbol: D_700C964 }
+
+PAD_700C978:
+  { type: BLOB, size: 8, offset: 0x700C978, symbol: PAD_700C978 }
+
+D_700C980:
+  { type: GFX, offset: 0x700C980, symbol: D_700C980 }
+
+PAD_700CA58:
+  { type: BLOB, size: 8, offset: 0x700CA58, symbol: PAD_700CA58 }
+
+D_700CAF4:
+  { type: SF64:ANIM, offset: 0x700CAF4, symbol: D_700CAF4}
+
+D_700CB60:
+  {type: SF64:SKELETON, offset: 0x700CB60, symbol: D_700CB60}
+
+D_700D534:
+  { type: SF64:ANIM, offset: 0x700D534, symbol: D_700D534 }
+
+D_700D700:
+  {type: SF64:SKELETON, offset: 0x700D700, symbol: D_700D700}
+
+D_700D740:
+  { type: GFX, offset: 0x700D740, symbol: D_700D740 }
+
+PAD_700D878: 
+  { type: BLOB, size: 0x8, offset: 0x700D878, symbol: PAD_700D878 }
+
+D_700D880:
+  { type: GFX, offset: 0x700D880, symbol: D_700D880 }
+
+PAD_700D9A8: 
+  { type: BLOB, size: 0x8, offset: 0x700D9A8, symbol: PAD_700D9A8 }
+
+D_700D9B0:
+  { type: GFX, offset: 0x700D9B0, symbol: D_700D9B0 }
+
+PAD_700DAC8: 
+  { type: BLOB, size: 0x8, offset: 0x700DAC8, symbol: PAD_700DAC8 }
+
+D_700DAD0:
+  { type: GFX, offset: 0x700DAD0, symbol: D_700DAD0 }
+
+PAD_700DBA8: 
+  { type: BLOB, size: 0x8, offset: 0x700DBA8, symbol: PAD_700DBA8 }
+
+D_700DBB0:
+  { type: GFX, offset: 0x700DBB0, symbol: D_700DBB0 }
+
+D_700DC50:
+  { type: GFX, offset: 0x700DC50, symbol: D_700DC50 }
+
+D_700DD68:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0700DD68, symbol: D_700DD68 }
+
+PAD_700DDE8:
+  { type: BLOB, size: 0x8, offset: 0x700DDE8, symbol: PAD_700DDE8 }
+
+D_700DDF0:
+  { type: GFX, offset: 0x700DDF0, symbol: D_700DDF0 }
+
+PAD_700DEC8:
+  { type: BLOB, size: 0x8, offset: 0x700DEC8, symbol: PAD_700DEC8 }
+
+D_700DED0:
+  { type: GFX, offset: 0x700DED0, symbol: D_700DED0 }
+
+D_700DF70:
+  { type: GFX, offset: 0x700DF70, symbol: D_700DF70 }
+
+PAD_700E028:
+  { type: BLOB, size: 0x8, offset: 0x700E028, symbol: PAD_700E028 }
+
+D_700E030:
+  { type: GFX, offset: 0x700E030, symbol: D_700E030 }
+
+D_700E1E8: 
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E1E8, symbol: D_700E1E8, pad: 8 }
+
+D_700E3F0:
+  { type: GFX, offset: 0x700E3F0, symbol: D_700E3F0 }
+
+D_700E858:
+  { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0700E858, symbol: D_700E858, pad: 8 }
+
+D_700EA60:
+  { type: GFX, offset: 0x700EA60, symbol: D_700EA60 }
+
+# size = 0xEDB0

assets/yaml/us/ast_A_ti.yaml

@@ -0,0 +1,80 @@
+:config:
+  segments:
+    - [0x0A, 0xA049A0]
+  header:
+    code:
+      - '#include "assets/ast_A_ti.h"'
+    header:
+      - '#include "gfx.h"'
+      - '#include "sf64object.h"'
+      - '#include "structs.h"'
+      
+D_A000000:
+  {type: "GFX", offset: 0xA000000, symbol: D_A000000}
+
+D_A0000C8:
+  { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x0A0000C8, symbol: D_A0000C8, tlut: 0x0A0001C8 }
+
+D_A0001C8:
+  { type: TEXTURE, ctype: u16, format: TLUT, colors: 60, offset: 0x0A0001C8, symbol: D_A0001C8 }
+
+D_A0002BC:
+  {type: "SF64:ANIM", offset: 0xA0002BC, symbol: D_A0002BC}
+
+PAD_A0002C8:
+  { type: BLOB, size: 8, offset: 0xA0002C8, symbol: PAD_A0002C8 }
+
+D_A00047C:
+  {type: "SF64:ANIM", offset: 0xA00047C, symbol: D_A00047C}
+
+D_A000568:
+  {type: "SF64:SKELETON", offset: 0xA000568, symbol: D_A000568}
+
+PAD_A000588:
+  { type: BLOB, size: 8, offset: 0xA000588, symbol: PAD_A000588 }
+
+D_A000858:
+  {type: "SF64:ANIM", offset: 0xA000858, symbol: D_A000858}
+
+PAD_A000864:
+  { type: BLOB, size: 12, offset: 0xA000864, symbol: PAD_A000864 }
+
+D_A000934:
+  {type: "SF64:ANIM", offset: 0xA000934, symbol: D_A000934}
+
+D_A000D50:
+  {type: "SF64:ANIM", offset: 0xA000D50, symbol: D_A000D50}
+
+D_A000EDC:
+  {type: "SF64:SKELETON", offset: 0xA000EDC, symbol: D_A000EDC}
+
+D_A001A70:
+  {type: "SF64:SKELETON", offset: 0xA001A70, symbol: D_A001A70}
+
+D_A001BE0:
+  {type: "GFX", offset: 0xA001BE0, symbol: D_A001BE0}
+
+PAD_A001DA8:
+  { type: BLOB, size: 8, offset: 0xA001DA8, symbol: PAD_A001DA8 }
+
+D_A001DB0:
+  {type: "GFX", offset: 0xA001DB0, symbol: D_A001DB0}
+
+D_A001EC0:
+  {type: "GFX", offset: 0xA001EC0, symbol: D_A001EC0}
+
+D_A001FA0:
+  {type: "GFX", offset: 0xA001FA0, symbol: D_A001FA0}
+
+PAD_A002168:
+  { type: BLOB, size: 8, offset: 0xA002168, symbol: PAD_A002168 }
+
+D_A002170:
+  {type: "GFX", offset: 0xA002170, symbol: D_A002170}
+
+PAD_A002378:
+  { type: BLOB, size: 8, offset: 0xA002378, symbol: PAD_A002378 }
+
+D_A009990:
+  {type: "SF64:ANIM", offset: 0xA009990, symbol: D_A009990}
+

include/assets/ast_A_ti.h

@@ -1,8 +0,0 @@
-#ifndef AST_A_TI_H
-#define AST_A_TI_H
-
-#include "gfx.h"
-#include "sf64object.h"
-#include "structs.h"
-
-#endif

linker_scripts/us/undefined_syms.ld

@@ -2145,7 +2145,8 @@ D_7003650 = 0x7003650;
 D_7003830 = 0x7003830;
 D_7003C70 = 0x7003C70;
 D_7003E10 = 0x7003E10;
-D_07003EE8 = 0x7003EE8;
+D_7003EE8 = 0x7003EE8;
+D_07003EE8 = 0x07003EE8;
 D_7003F10 = 0x7003F10;
 D_7004010 = 0x7004010;
 D_7004050 = 0x7004050;

tools/Torch

@@ -1 +1 @@
-Subproject commit 4de8d6b8dce7f6c1e5d14761f14af4e7cf87fc50
+Subproject commit e4608e57763f86b8326422c8011db43d8b8d9b95