From 5dd5534f952480d10633ec55960302550eb82ba5 Mon Sep 17 00:00:00 2001 From: Alejandro Javier Asenjo Nitti Date: Sat, 2 Mar 2024 22:12:21 -0300 Subject: [PATCH] MATCHPOINT! --- assets/yaml/us/ast_bg_space.yaml | 94 ++++++++++++++++++++++++++++++++ include/assets/ast_bg_space.h | 43 +++++++++++++++ yamls/us/assets.yaml | 6 +- 3 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 assets/yaml/us/ast_bg_space.yaml diff --git a/assets/yaml/us/ast_bg_space.yaml b/assets/yaml/us/ast_bg_space.yaml new file mode 100644 index 00000000..4793f806 --- /dev/null +++ b/assets/yaml/us/ast_bg_space.yaml @@ -0,0 +1,94 @@ +:config: + segments: + seg2: 0x8A68C0 + header: + code: + - '#include "assets/ast_bg_space.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_2000000: + { type: GFX, offset: 0x2000000, symbol: D_2000000 } + +D_2000088: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000088, symbol: D_2000088, pad: 8 } + +D_2000890: + { type: GFX, offset: 0x2000890, symbol: D_2000890 } + +D_2000918: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x2000918, symbol: D_2000918, pad: 8 } + +D_2001120: + { type: GFX, offset: 0x2001120, symbol: D_2001120 } + +D_20011A8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020011A8, symbol: D_20011A8, pad: 8 } + +D_20019B0: + { type: GFX, offset: 0x20019B0, symbol: D_20019B0 } + +D_2001A38: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02001A38, symbol: D_2001A38, pad: 8 } + +D_2002240: + { type: GFX, offset: 0x2002240, symbol: D_2002240 } + +D_20022C8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020022C8, symbol: D_20022C8, pad: 8 } + +D_2002AD0: + { type: GFX, offset: 0x2002AD0, symbol: D_2002AD0 } + +D_2002B58: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02002B58, symbol: D_2002B58, pad: 8 } + +D_2003360: + { type: GFX, offset: 0x2003360, symbol: D_2003360 } + +D_20033E8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x020033E8, symbol: D_20033E8, pad: 8 } + +D_2003BF0: + { type: GFX, offset: 0x2003BF0, symbol: D_2003BF0 } + +D_2003C78: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02003C78, symbol: D_2003C78, pad: 8 } + +D_2004480: + { type: GFX, offset: 0x2004480, symbol: D_2004480 } + +D_2004508: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004508, symbol: D_2004508, pad: 8 } + +D_2004D10: + { type: GFX, offset: 0x2004D10, symbol: D_2004D10 } + +D_2004D98: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02004D98, symbol: D_2004D98, pad: 8 } + +D_20055A0: + { type: GFX, offset: 0x20055A0, symbol: D_20055A0 } + +D_2005628: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005628, symbol: D_2005628, pad: 8 } + +D_2005E30: + { type: GFX, offset: 0x2005E30, symbol: D_2005E30 } + +D_2005EB8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02005EB8, symbol: D_2005EB8, pad: 8 } + +D_20066C0: + { type: GFX, offset: 0x20066C0, symbol: D_20066C0 } + +D_2006748: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006748, symbol: D_2006748, pad: 8 } + +D_2006F50: + { type: GFX, offset: 0x2006F50, symbol: D_2006F50 } + +D_2006FD8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x02006FD8, symbol: D_2006FD8, pad: 8 } diff --git a/include/assets/ast_bg_space.h b/include/assets/ast_bg_space.h index dac2f9b6..0a0b0a3a 100644 --- a/include/assets/ast_bg_space.h +++ b/include/assets/ast_bg_space.h @@ -5,4 +5,47 @@ #include "sf64object.h" #include "structs.h" +extern Gfx D_2000000[]; +extern Vtx ast_bg_space_seg2_vtx_00000058[]; +extern u16 D_2000088[]; +extern Gfx D_2000890[]; +extern Vtx ast_bg_space_seg2_vtx_000008E8[]; +extern u16 D_2000918[]; +extern Gfx D_2001120[]; +extern Vtx ast_bg_space_seg2_vtx_00001178[]; +extern u16 D_20011A8[]; +extern Gfx D_20019B0[]; +extern Vtx ast_bg_space_seg2_vtx_00001A08[]; +extern u16 D_2001A38[]; +extern Gfx D_2002240[]; +extern Vtx ast_bg_space_seg2_vtx_00002298[]; +extern u16 D_20022C8[]; +extern Gfx D_2002AD0[]; +extern Vtx ast_bg_space_seg2_vtx_00002B28[]; +extern u16 D_2002B58[]; +extern Gfx D_2003360[]; +extern Vtx ast_bg_space_seg2_vtx_000033B8[]; +extern u16 D_20033E8[]; +extern Gfx D_2003BF0[]; +extern Vtx ast_bg_space_seg2_vtx_00003C48[]; +extern u16 D_2003C78[]; +extern Gfx D_2004480[]; +extern Vtx ast_bg_space_seg2_vtx_000044D8[]; +extern u16 D_2004508[]; +extern Gfx D_2004D10[]; +extern Vtx ast_bg_space_seg2_vtx_00004D68[]; +extern u16 D_2004D98[]; +extern Gfx D_20055A0[]; +extern Vtx ast_bg_space_seg2_vtx_000055F8[]; +extern u16 D_2005628[]; +extern Gfx D_2005E30[]; +extern Vtx ast_bg_space_seg2_vtx_00005E88[]; +extern u16 D_2005EB8[]; +extern Gfx D_20066C0[]; +extern Vtx ast_bg_space_seg2_vtx_00006718[]; +extern u16 D_2006748[]; +extern Gfx D_2006F50[]; +extern Vtx ast_bg_space_seg2_vtx_00006FA8[]; +extern u16 D_2006FD8[]; + #endif diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 670f4285..b3601573 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -17,8 +17,12 @@ - name: ast_bg_space exclusive_ram_id: segment_02 - type: bin + type: code + dir: assets start: 0x8A68C0 + vram: 0x02000000 + subsegments: + - [0x8A68C0, .data, ast_bg_space/ast_bg_space] - name: ast_bg_planet exclusive_ram_id: segment_02