From 7a43255fea4760a1788e1e21ba9052a8d09ac29d Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Thu, 28 Mar 2024 08:01:37 -0300 Subject: [PATCH] export configuration for ast_enmy_planet (#181) * complete? * done --- assets/yaml/us/ast_enmy_planet.yaml | 113 ++++++++++++++++++++++++++++ include/assets/ast_enmy_planet.h | 25 ------ linker_scripts/us/undefined_syms.ld | 13 ---- src/overlays/ovl_i5/fox_ma.c | 1 - yamls/us/assets.yaml | 6 +- 5 files changed, 118 insertions(+), 40 deletions(-) create mode 100644 assets/yaml/us/ast_enmy_planet.yaml delete mode 100644 include/assets/ast_enmy_planet.h diff --git a/assets/yaml/us/ast_enmy_planet.yaml b/assets/yaml/us/ast_enmy_planet.yaml new file mode 100644 index 00000000..83bb6e1e --- /dev/null +++ b/assets/yaml/us/ast_enmy_planet.yaml @@ -0,0 +1,113 @@ +:config: + segments: + - [0x04, 0x918430] + header: + code: + - '#include "assets/ast_enmy_planet.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +# Seems unused +D_ENMY_PLANET_4000290: + { type: GFX, offset: 0x4000290, symbol: D_ENMY_PLANET_4000290 } + +ast_enmy_planet_seg4_vtx_8F8: + { type: VTX, count: 90, offset: 0x40008F8, symbol: ast_enmy_planet_seg4_vtx_8F8 } + +D_ENMY_PLANET_40001A4: + { type: SF64:ANIM, offset: 0x40001A4, symbol: D_ENMY_PLANET_40001A4 } + +D_ENMY_PLANET_4000270: + { type: SF64:SKELETON, offset: 0x4000270, symbol: D_ENMY_PLANET_4000270 } + +D_ENMY_PLANET_4000710: + { type: GFX, offset: 0x4000710, symbol: D_ENMY_PLANET_4000710 } + +D_ENMY_PLANET_4001298: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001298, symbol: D_ENMY_PLANET_4001298 } + +D_ENMY_PLANET_4001698: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001698, symbol: D_ENMY_PLANET_4001698 } + +D_ENMY_PLANET_4000E98: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04000E98, symbol: D_ENMY_PLANET_4000E98 } + +D_ENMY_PLANET_4001098: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001098, symbol: D_ENMY_PLANET_4001098 } + +D_ENMY_PLANET_4001498: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04001498, symbol: D_ENMY_PLANET_4001498 } + +D_ENMY_PLANET_40018A0: + { type: GFX, offset: 0x40018A0, symbol: D_ENMY_PLANET_40018A0 } + +D_ENMY_PLANET_40024B8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x040024B8, symbol: D_ENMY_PLANET_40024B8 } + +D_ENMY_PLANET_4002538: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04002538, symbol: D_ENMY_PLANET_4002538 } + +D_ENMY_PLANET_4002D38: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 64, height: 32, offset: 0x04002D38, symbol: D_ENMY_PLANET_4002D38 } + +D_ENMY_PLANET_4003D38: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04003D38, symbol: D_ENMY_PLANET_4003D38 } + +D_ENMY_PLANET_4004538: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004538, symbol: D_ENMY_PLANET_4004538 } + +D_ENMY_PLANET_4004D38: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04004D38, symbol: D_ENMY_PLANET_4004D38 } + +D_ENMY_PLANET_40057AC: + { type: SF64:ANIM, offset: 0x40057AC, symbol: D_ENMY_PLANET_40057AC } + +D_ENMY_PLANET_40058B8: + { type: SF64:SKELETON, offset: 0x40058B8, symbol: D_ENMY_PLANET_40058B8 } + +D_ENMY_PLANET_4005E78: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04005E78, symbol: D_ENMY_PLANET_4005E78 } + +D_ENMY_PLANET_4006078: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04006078, symbol: D_ENMY_PLANET_4006078 } + +D_ENMY_PLANET_4006280: + { type: GFX, offset: 0x4006280, symbol: D_ENMY_PLANET_4006280 } + +D_ENMY_PLANET_40064E8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040064E8, symbol: D_ENMY_PLANET_40064E8 } + +D_ENMY_PLANET_40066E8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x040066E8, symbol: D_ENMY_PLANET_40066E8 } + +D_ENMY_PLANET_40068F0: + { type: GFX, offset: 0x40068F0, symbol: D_ENMY_PLANET_40068F0 } + +D_ENMY_PLANET_4006E90: + { type: GFX, offset: 0x4006E90, symbol: D_ENMY_PLANET_4006E90 } + +D_ENMY_PLANET_40073C0: + { type: GFX, offset: 0x40073C0, symbol: D_ENMY_PLANET_40073C0 } + +D_ENMY_PLANET_4007AF0: + { type: GFX, offset: 0x4007AF0, symbol: D_ENMY_PLANET_4007AF0 } + +D_ENMY_PLANET_4008100: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008100, symbol: D_ENMY_PLANET_4008100 } + +D_ENMY_PLANET_4008CE0: + { type: GFX, offset: 0x4008CE0, symbol: D_ENMY_PLANET_4008CE0 } + +D_ENMY_PLANET_4008D68: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x04008D68, symbol: D_ENMY_PLANET_4008D68 } + +D_ENMY_PLANET_4008FF8: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x04008FF8, symbol: D_ENMY_PLANET_4008FF8 } + +D_ENMY_PLANET_4008F70: + { type: GFX, offset: 0x4008F70, symbol: D_ENMY_PLANET_4008F70 } + +D_ENMY_PLANET_4009800: + { type: GFX, offset: 0x4009800, symbol: D_ENMY_PLANET_4009800 } diff --git a/include/assets/ast_enmy_planet.h b/include/assets/ast_enmy_planet.h deleted file mode 100644 index 830d54bb..00000000 --- a/include/assets/ast_enmy_planet.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef AST_ENMY_PLANET_H -#define AST_ENMY_PLANET_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -extern Animation D_ENMY_PLANET_40001A4; -extern Limb* D_ENMY_PLANET_4000270[]; -extern Gfx D_ENMY_PLANET_4000710[]; -extern Gfx D_ENMY_PLANET_40018A0[]; -extern Animation D_ENMY_PLANET_40057AC; -extern Limb* D_ENMY_PLANET_40058B8[]; -extern Gfx D_ENMY_PLANET_40068F0[]; -extern Gfx D_ENMY_PLANET_4006E90[]; -extern Gfx D_ENMY_PLANET_40073C0[]; -extern Gfx D_ENMY_PLANET_4007AF0[]; -extern Gfx D_ENMY_PLANET_4008CE0[]; -extern Gfx D_ENMY_PLANET_4008CE0[]; -extern Gfx D_ENMY_PLANET_4008F70[]; -extern Gfx D_ENMY_PLANET_4008F70[]; -extern Gfx D_ENMY_PLANET_4009800[]; -extern Gfx D_ENMY_PLANET_400AAE0[]; - -#endif diff --git a/linker_scripts/us/undefined_syms.ld b/linker_scripts/us/undefined_syms.ld index c72c1afa..f7ebe2e1 100644 --- a/linker_scripts/us/undefined_syms.ld +++ b/linker_scripts/us/undefined_syms.ld @@ -1006,7 +1006,6 @@ D_6014D94 = 0x006014D94; // fox_enmy2 D_6011F90 = 0x06011F90; -D_ENMY_PLANET_4000710 = 0x04000710; D_601F2A0 = 0x0601F2A0; D_A6_6016190 = 0x06016190; D_SX_6023500 = 0x06023500; @@ -1036,9 +1035,6 @@ D_600AC70 = 0x0600AC70; D_6002500 = 0x06002500; D_60043F0 = 0x060043F0; D_6004310 = 0x06004310; -D_ENMY_PLANET_4006E90 = 0x04006E90; -D_ENMY_PLANET_4009800 = 0x04009800; -D_ENMY_PLANET_40073C0 = 0x040073C0; D_A6_60282A0 = 0x060282A0; D_SX_603298C = 0x0603298C; @@ -1417,15 +1413,6 @@ D_vs_player_302EB3C = 0x302EB3C; D_vs_player_302EC20 = 0x302EC20; D_ENMY_PLANET_4000080 = 0x4000080; D_ENMY_PLANET_400014C = 0x400014C; -D_ENMY_PLANET_40001A4 = 0x40001A4; -D_ENMY_PLANET_4000270 = 0x4000270; -D_ENMY_PLANET_40018A0 = 0x40018A0; -D_ENMY_PLANET_40057AC = 0x40057AC; -D_ENMY_PLANET_40058B8 = 0x40058B8; -D_ENMY_PLANET_40068F0 = 0x40068F0; -D_ENMY_PLANET_4007AF0 = 0x4007AF0; -D_ENMY_PLANET_4008CE0 = 0x4008CE0; -D_ENMY_PLANET_4008F70 = 0x4008F70; D_5000200 = 0x5000200; D_5000300 = 0x5000300; D_5000500 = 0x5000500; diff --git a/src/overlays/ovl_i5/fox_ma.c b/src/overlays/ovl_i5/fox_ma.c index 73854113..02a1492d 100644 --- a/src/overlays/ovl_i5/fox_ma.c +++ b/src/overlays/ovl_i5/fox_ma.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" #include "assets.h" #include "assets/ast_landmaster.h" diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 65165064..e85a62f2 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -71,8 +71,12 @@ - name: ast_enmy_planet exclusive_ram_id: segment_04 - type: bin + type: code + dir: assets start: 0x918430 + vram: 0x04000000 + subsegments: + - [0x918430, .data, ast_enmy_planet/ast_enmy_planet] - name: ast_enmy_space exclusive_ram_id: segment_04