From 7c64f94d2240bac45a1d1c68e37fa4ff7bae2a41 Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Mon, 11 Mar 2024 21:50:12 -0300 Subject: [PATCH] export configuration for ast_font_3d (#159) * progress * goodbye header * Torch * new torch * Update Torch * progress * Matchpoint --- assets/yaml/us/ast_font_3d.yaml | 204 ++++++++++++++++++++++++++++++++ include/assets/ast_font_3d.h | 8 -- yamls/us/assets.yaml | 6 +- 3 files changed, 209 insertions(+), 9 deletions(-) create mode 100644 assets/yaml/us/ast_font_3d.yaml delete mode 100644 include/assets/ast_font_3d.h diff --git a/assets/yaml/us/ast_font_3d.yaml b/assets/yaml/us/ast_font_3d.yaml new file mode 100644 index 00000000..2c5a1f98 --- /dev/null +++ b/assets/yaml/us/ast_font_3d.yaml @@ -0,0 +1,204 @@ +:config: + segments: + - [0x09, 0xCDDCA0] + header: + code: + - '#include "assets/ast_font_3d.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_9000000: + { type: GFX, offset: 0x9000000, symbol: D_9000000 } + +D_90001F0: + { type: GFX, offset: 0x90001F0, symbol: D_90001F0 } + +D_9000528: + { type: TEXTURE, ctype: u8, format: CI4, width: 8, height: 8, offset: 0x09000528, symbol: D_9000528, tlut: 0x09000548 } + +D_9000548: + { type: TEXTURE, ctype: u16, format: TLUT, colors: 16, offset: 0x09000548, symbol: D_9000548 } + +PAD_9000568: + { type: BLOB, size: 8, offset: 0x9000568, symbol: PAD_9000568 } + +D_9000570: + { type: GFX, offset: 0x9000570, symbol: D_9000570 } + +PAD_9000978: + { type: BLOB, size: 8, offset: 0x9000978, symbol: PAD_9000978 } + +D_9000980: + { type: GFX, offset: 0x9000980, symbol: D_9000980 } + +PAD_9001118: + { type: BLOB, size: 8, offset: 0x9001118, symbol: PAD_9001118 } + +D_9001120: + { type: GFX, offset: 0x9001120, symbol: D_9001120 } + +PAD_90014D8: + { type: BLOB, size: 8, offset: 0x90014D8, symbol: PAD_90014D8 } + +D_90014E0: + { type: GFX, offset: 0x90014E0, symbol: D_90014E0 } + +PAD_9001A08: + { type: BLOB, size: 8, offset: 0x9001A08, symbol: PAD_9001A08 } + +D_9001A10: + { type: GFX, offset: 0x9001A10, symbol: D_9001A10 } + +PAD_9001E88: + { type: BLOB, size: 8, offset: 0x9001E88, symbol: PAD_9001E88 } + +D_9001E90: + { type: GFX, offset: 0x9001E90, symbol: D_9001E90 } + +D_90022A0: + { type: GFX, offset: 0x90022A0, symbol: D_90022A0 } + +D_9002890: + { type: GFX, offset: 0x9002890, symbol: D_9002890 } + +PAD_9002E98: + { type: BLOB, size: 8, offset: 0x9002E98, symbol: PAD_9002E98 } + +D_9002EA0: + { type: GFX, offset: 0x9002EA0, symbol: D_9002EA0 } + +D_9003230: + { type: GFX, offset: 0x9003230, symbol: D_9003230 } + +PAD_9003618: + { type: BLOB, size: 8, offset: 0x9003618, symbol: PAD_9003618 } + +D_9003620: + { type: GFX, offset: 0x9003620, symbol: D_9003620 } + +PAD_9003A28: + { type: BLOB, size: 8, offset: 0x9003A28, symbol: PAD_9003A28 } + +D_9003A30: + { type: GFX, offset: 0x9003A30, symbol: D_9003A30 } + +PAD_9004228: + { type: BLOB, size: 8, offset: 0x9004228, symbol: PAD_9004228 } + +D_9004230: + { type: GFX, offset: 0x9004230, symbol: D_9004230 } + +PAD_9004918: + { type: BLOB, size: 8, offset: 0x9004918, symbol: PAD_9004918 } + +D_9004920: + { type: GFX, offset: 0x9004920, symbol: D_9004920 } + +PAD_9004E08: + { type: BLOB, size: 8, offset: 0x9004E08, symbol: PAD_9004E08 } + +D_9004E10: + { type: GFX, offset: 0x9004E10, symbol: D_9004E10 } + +PAD_9005378: + { type: BLOB, size: 8, offset: 0x9005378, symbol: PAD_9005378 } + +D_9005380: + { type: GFX, offset: 0x9005380, symbol: D_9005380 } + +D_9005980: + { type: GFX, offset: 0x9005980, symbol: D_9005980 } + +PAD_9005C98: + { type: BLOB, size: 8, offset: 0x9005C98, symbol: PAD_9005C98 } + +D_9005CA0: + { type: GFX, offset: 0x9005CA0, symbol: D_9005CA0 } + +PAD_90062C8: + { type: BLOB, size: 8, offset: 0x90062C8, symbol: PAD_90062C8 } + +D_90062C8: + { type: GFX, offset: 0x90062D0, symbol: D_90062C8 } + +D_9006500: + { type: GFX, offset: 0x9006500, symbol: D_9006500 } + +D_9006AE0: + { type: GFX, offset: 0x9006AE0, symbol: D_9006AE0 } + +D_90070C0: + { type: GFX, offset: 0x90070C0, symbol: D_90070C0 } + +D_90075A0: + { type: GFX, offset: 0x90075A0, symbol: D_90075A0 } + +PAD_9007BA8: + { type: BLOB, size: 8, offset: 0x9007BA8, symbol: PAD_9007BA8 } + +D_9007BB0: + { type: GFX, offset: 0x9007BB0, symbol: D_9007BB0 } + +PAD_9007FC8: + { type: BLOB, size: 8, offset: 0x9007FC8, symbol: PAD_9007FC8 } + +D_9007FD0: + { type: GFX, offset: 0x9007FD0, symbol: D_9007FD0 } + +PAD_90086E8: + { type: BLOB, size: 8, offset: 0x90086E8, symbol: PAD_90086E8 } + +D_90086F0: + { type: GFX, offset: 0x90086F0, symbol: D_90086F0 } + +D_9008C60: + { type: GFX, offset: 0x9008C60, symbol: D_9008C60 } + +PAD_9009278: + { type: BLOB, size: 8, offset: 0x9009278, symbol: PAD_9009278 } + +D_9009280: + { type: GFX, offset: 0x9009280, symbol: D_9009280 } + +PAD_9009988: + { type: BLOB, size: 8, offset: 0x9009988, symbol: PAD_9009988 } + +D_9009990: + { type: GFX, offset: 0x9009990, symbol: D_9009990 } + +PAD_9009CA8: + { type: BLOB, size: 8, offset: 0x9009CA8, symbol: PAD_9009CA8 } + +D_9009CB0: + { type: GFX, offset: 0x9009CB0, symbol: D_9009CB0 } + +PAD_900A288: + { type: BLOB, size: 8, offset: 0x900A288, symbol: PAD_900A288 } + +D_900A290: + { type: GFX, offset: 0x900A290, symbol: D_900A290 } + +D_900A870: + { type: GFX, offset: 0x900A870, symbol: D_900A870 } + +PAD_900AF58: + { type: BLOB, size: 8, offset: 0x900AF58, symbol: PAD_900AF58 } + +D_900AF60: + { type: GFX, offset: 0x900AF60, symbol: D_900AF60 } + +PAD_900B578: + { type: BLOB, size: 8, offset: 0x900B578, symbol: PAD_900B578 } + +D_900B580: + { type: GFX, offset: 0x900B580, symbol: D_900B580 } + +PAD_900BB88: + { type: BLOB, size: 8, offset: 0x900BB88, symbol: PAD_900BB88 } + +D_900BB90: + { type: GFX, offset: 0x900BB90, symbol: D_900BB90 } + +# size = 0xC1D0 diff --git a/include/assets/ast_font_3d.h b/include/assets/ast_font_3d.h deleted file mode 100644 index ce76188d..00000000 --- a/include/assets/ast_font_3d.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef AST_FONT_3D_H -#define AST_FONT_3D_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -#endif diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 62bc88da..99ceca27 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -245,8 +245,12 @@ - name: ast_font_3d exclusive_ram_id: segment_09 - type: bin + type: code + dir: assets + vram: 0x09000000 start: 0xCDDCA0 + subsegments: + - [0xCDDCA0, .data, ast_font_3d/ast_font_3d] - name: ast_andross exclusive_ram_id: segment_0C