PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed yamls to export cross-file assets

Browse Source
This commit is contained in:
KiritoDv 2024-05-25 09:29:26 -06:00 committed by Sonic Dreamcaster
parent ce9c6d0120
commit 9e53a4cf73
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/yaml/us/rev1/ast_7_ti_1.yaml
View File

@ -7,6 +7,8 @@
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
external_files:
- "assets/yaml/us/rev1/ast_8_ti.yaml"
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 }

2
assets/yaml/us/rev1/ast_8_ti.yaml
View File

@ -24,6 +24,7 @@ D_TI_8000FC0: { type: TEXTURE, ctype: u16, format: IA16, width: 16, height: 16,
D_TI_80011C0: { type: GFX, offset: 0x80011C0, symbol: D_TI_80011C0 }
D_TI_80012E8: { type: TEXTURE, ctype: u8, format: CI8, width: 16, height: 16, offset: 0x80012E8, symbol: D_TI_80012E8, tlut: 0x80013E8}
D_TI_80013E8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 88, offset: 0x80013E8, symbol: D_TI_80013E8}
D_TI_80014A0: { type: GFX, offset: 0x80014A0, symbol: D_TI_80014A0 }
@ -62,6 +63,7 @@ D_TI_80035A8: { type: TEXTURE, ctype: u16, format: TLUT, colors: 72, offset: 0x8
D_TI_8003640: { type: GFX, offset: 0x8003640, symbol: D_TI_8003640 }
D_TI_8004200: { type: TEXTURE, ctype: u8, format: CI8, width: 32, height: 32, offset: 0x8004200, symbol: D_TI_8004200, tlut: 0x8004600}
D_TI_8004600: { type: TEXTURE, ctype: u16, format: TLUT, colors: 256, offset: 0x8004600, symbol: D_TI_8004600}
D_TI_8008FE8: { type: SF64:ANIM, offset: 0x8008FE8, symbol: D_TI_8008FE8 }

11
assets/yaml/us/rev1/ast_A_ti.yaml
View File

@ -10,19 +10,11 @@
header:
- '#include "gfx.h"'
- '#include "sf64object.h"'
<<<<<<< HEAD
external_files:
- "assets/yaml/us/rev1/ast_7_ti_2.yaml"
- "assets/yaml/us/rev1/ast_8_ti.yaml"
- "assets/yaml/us/rev1/ast_9_ti.yaml"
=======
<<<<<<<< HEAD:assets/yaml/jp/rev0/ast_A_ti.yaml
========
>>>>>>>> 6fe91928 (Repo upstreamed):assets/yaml/us/rev1/ast_A_ti.yaml
>>>>>>> 6fe91928 (Repo upstreamed)
D_TI_A000000:
{type: GFX, offset: 0xA000000, symbol: D_TI_A000000}
@ -73,7 +65,4 @@ D_TI_A002170:
D_TI_A009990:
{type: SF64:ANIM, offset: 0xA009990, symbol: D_TI_A009990}
<<<<<<< HEAD
=======
>>>>>>> 6fe91928 (Repo upstreamed)