From 26a3873e16c4d73dcaab2aadc9cfc50ec311b435 Mon Sep 17 00:00:00 2001 From: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:37:20 -0300 Subject: [PATCH] export configuration for ast_star_wolf (#177) * MISSION ACCOMPLISHED * remove header * remove comment --- assets/yaml/us/ast_star_wolf.yaml | 103 ++++++++++++++++++++++++++++++ include/assets/ast_star_wolf.h | 29 --------- src/main/fox_360.c | 6 +- src/main/fox_edisplay.c | 4 +- src/main/fox_hud.c | 2 +- src/main/fox_radio.c | 32 +++++----- yamls/us/assets.yaml | 6 +- 7 files changed, 130 insertions(+), 52 deletions(-) create mode 100644 assets/yaml/us/ast_star_wolf.yaml delete mode 100644 include/assets/ast_star_wolf.h diff --git a/assets/yaml/us/ast_star_wolf.yaml b/assets/yaml/us/ast_star_wolf.yaml new file mode 100644 index 00000000..9d9ffc77 --- /dev/null +++ b/assets/yaml/us/ast_star_wolf.yaml @@ -0,0 +1,103 @@ +:config: + segments: + - [0x0F, 0x940AD0] + header: + code: + - '#include "assets/ast_star_wolf.h"' + header: + - '#include "gfx.h"' + - '#include "sf64object.h"' + - '#include "structs.h"' + +D_STAR_WOLF_F000000: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F000000, symbol: D_STAR_WOLF_F000000 } + +D_STAR_WOLF_F000F20: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F000F20, symbol: D_STAR_WOLF_F000F20 } + +D_STAR_WOLF_F001E40: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F001E40, symbol: D_STAR_WOLF_F001E40 } + +D_STAR_WOLF_F002D60: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F002D60, symbol: D_STAR_WOLF_F002D60 } + +D_STAR_WOLF_F003C80: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F003C80, symbol: D_STAR_WOLF_F003C80 } + +D_STAR_WOLF_F004BA0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F004BA0, symbol: D_STAR_WOLF_F004BA0 } + +D_STAR_WOLF_F005AC0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F005AC0, symbol: D_STAR_WOLF_F005AC0 } + +D_STAR_WOLF_F0069E0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F0069E0, symbol: D_STAR_WOLF_F0069E0 } + +D_STAR_WOLF_F007900: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F007900, symbol: D_STAR_WOLF_F007900 } + +D_STAR_WOLF_F008820: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F008820, symbol: D_STAR_WOLF_F008820 } + +D_STAR_WOLF_F009740: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F009740, symbol: D_STAR_WOLF_F009740 } + +D_STAR_WOLF_F00A660: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00A660, symbol: D_STAR_WOLF_F00A660 } + +D_STAR_WOLF_F00B580: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00B580, symbol: D_STAR_WOLF_F00B580 } + +D_STAR_WOLF_F00C4A0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00C4A0, symbol: D_STAR_WOLF_F00C4A0 } + +D_STAR_WOLF_F00D3C0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00D3C0, symbol: D_STAR_WOLF_F00D3C0 } + +D_STAR_WOLF_F00E2E0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 44, height: 44, offset: 0x0F00E2E0, symbol: D_STAR_WOLF_F00E2E0 } + +D_STAR_WOLF_F00F200: + { type: GFX, offset: 0xF00F200, symbol: D_STAR_WOLF_F00F200 } + +D_STAR_WOLF_F0101D0: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F0101D0, symbol: D_STAR_WOLF_F0101D0 } + +D_STAR_WOLF_F011E80: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0F011E80, symbol: D_STAR_WOLF_F011E80 } + +D_STAR_WOLF_F011680: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011680, symbol: D_STAR_WOLF_F011680 } + +D_STAR_WOLF_F0103D0: + { type: GFX, offset: 0xF0103D0, symbol: D_STAR_WOLF_F0103D0 } + +D_STAR_WOLF_F011F00: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F011F00, symbol: D_STAR_WOLF_F011F00 } + +D_STAR_WOLF_F012700: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F012700, symbol: D_STAR_WOLF_F012700 } + +D_STAR_WOLF_F012F00: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 16, height: 16, offset: 0x0F012F00, symbol: D_STAR_WOLF_F012F00 } + +D_STAR_WOLF_F013100: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 8, height: 8, offset: 0x0F013100, symbol: D_STAR_WOLF_F013100 } + +D_STAR_WOLF_F013180: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013180, symbol: D_STAR_WOLF_F013180 } + +D_STAR_WOLF_F013980: + { type: TEXTURE, ctype: u16, format: RGBA16, width: 32, height: 32, offset: 0x0F013980, symbol: D_STAR_WOLF_F013980 } + +D_STAR_WOLF_F014180: + { type: GFX, offset: 0xF014180, symbol: D_STAR_WOLF_F014180 } + +D_STAR_WOLF_F014208: + { type: TEXTURE, ctype: u8, format: IA8, width: 16, height: 16, offset: 0x0F014208, symbol: D_STAR_WOLF_F014208 } + +D_STAR_WOLF_F014310: + { type: GFX, offset: 0xF014310, symbol: D_STAR_WOLF_F014310 } + +D_STAR_WOLF_F014398: + { type: TEXTURE, ctype: u8, format: IA8, width: 32, height: 32, offset: 0x0F014398, symbol: D_STAR_WOLF_F014398 } diff --git a/include/assets/ast_star_wolf.h b/include/assets/ast_star_wolf.h deleted file mode 100644 index a6ade860..00000000 --- a/include/assets/ast_star_wolf.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef AST_STAR_WOLF_H -#define AST_STAR_WOLF_H - -#include "gfx.h" -#include "sf64object.h" -#include "structs.h" - -extern u16 D_F000000[]; -extern u16 D_F000F20[]; -extern u16 D_F001E40[]; -extern u16 D_F002D60[]; -extern u16 D_F003C80[]; -extern u16 D_F004BA0[]; -extern u16 D_F005AC0[]; -extern u16 D_F0069E0[]; -extern u16 D_F007900[]; -extern u16 D_F008820[]; -extern u16 D_F009740[]; -extern u16 D_F00A660[]; -extern u16 D_F00B580[]; -extern u16 D_F00C4A0[]; -extern u16 D_F00D3C0[]; -extern u16 D_F00E2E0[]; -extern Gfx D_F00F200[]; -extern Gfx D_F0103D0[]; -extern Gfx D_F014180[]; -extern Gfx D_F014310[]; - -#endif diff --git a/src/main/fox_360.c b/src/main/fox_360.c index 76c5b4fd..4e7d1b8b 100644 --- a/src/main/fox_360.c +++ b/src/main/fox_360.c @@ -2195,7 +2195,7 @@ void func_80035448(Actor* actor) { case 6: case 7: if (gCurrentLevel == LEVEL_VENOM_2) { - gSPDisplayList(gMasterDisp++, D_F0103D0); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F0103D0); Matrix_Push(&gGfxMatrix); Matrix_Translate(gGfxMatrix, 30.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 2); @@ -2207,7 +2207,7 @@ void func_80035448(Actor* actor) { func_80035098(actor); func_80034E64(actor); } else { - gSPDisplayList(gMasterDisp++, D_F00F200); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); if (gCurrentLevel == LEVEL_BOLSE) { func_8005B1E8(actor, 3); @@ -2277,7 +2277,7 @@ void func_80035448(Actor* actor) { gSPDisplayList(gMasterDisp++, D_vs_player_3015740); } else if (gCurrentLevel == LEVEL_TRAINING) { if (actor->unk_0E6 == 0) { - gSPDisplayList(gMasterDisp++, D_F00F200); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F00F200); Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1); func_8005B1E8(actor, 3); } else { diff --git a/src/main/fox_edisplay.c b/src/main/fox_edisplay.c index a880623c..4aeb53de 100644 --- a/src/main/fox_edisplay.c +++ b/src/main/fox_edisplay.c @@ -1292,11 +1292,11 @@ void func_8005EA24(Actor* actor) { gSPDisplayList(gMasterDisp++, D_600DBC0); } } else if ((actor->unk_0E4 < 8) || (gCurrentLevel != LEVEL_FORTUNA)) { - gSPDisplayList(gMasterDisp++, D_F014310); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); } else if (gCurrentLevel == LEVEL_FORTUNA) { gSPDisplayList(gMasterDisp++, D_6009F90); } else { - gSPDisplayList(gMasterDisp++, D_F014310); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014310); } } diff --git a/src/main/fox_hud.c b/src/main/fox_hud.c index 7680d23d..1d1c0705 100644 --- a/src/main/fox_hud.c +++ b/src/main/fox_hud.c @@ -1793,7 +1793,7 @@ void func_80089AF4(void) { gDPSetPrimColor(gMasterDisp++, 0, 0, 0, 0, 0, 255); Matrix_Scale(gGfxMatrix, 54.0f, 54.0f, 1.0f, 1); Matrix_SetGfxMtx(&gMasterDisp); - gSPDisplayList(gMasterDisp++, D_F014180); + gSPDisplayList(gMasterDisp++, D_STAR_WOLF_F014180); } void func_80089B94(void) { diff --git a/src/main/fox_radio.c b/src/main/fox_radio.c index 604e4806..1c649039 100644 --- a/src/main/fox_radio.c +++ b/src/main/fox_radio.c @@ -210,52 +210,52 @@ void func_800BAAE8(void) { sp44 = D_100C9E0; break; case RCID_WOLF: - sp44 = D_F00B580; + sp44 = D_STAR_WOLF_F00B580; break; case RCID_WOLF_OPEN: - sp44 = D_F00C4A0; + sp44 = D_STAR_WOLF_F00C4A0; break; case RCID_PIGMA: - sp44 = D_F003C80; + sp44 = D_STAR_WOLF_F003C80; break; case RCID_PIGMA_OPEN: - sp44 = D_F004BA0; + sp44 = D_STAR_WOLF_F004BA0; break; case RCID_LEON: - sp44 = D_F007900; + sp44 = D_STAR_WOLF_F007900; break; case RCID_LEON_OPEN: - sp44 = D_F008820; + sp44 = D_STAR_WOLF_F008820; break; case RCID_ANDREW: - sp44 = D_F000000; + sp44 = D_STAR_WOLF_F000000; break; case RCID_ANDREW_OPEN: - sp44 = D_F000F20; + sp44 = D_STAR_WOLF_F000F20; break; case RCID_WOLF_2: - sp44 = D_F00D3C0; + sp44 = D_STAR_WOLF_F00D3C0; break; case RCID_WOLF_2_OPEN: - sp44 = D_F00E2E0; + sp44 = D_STAR_WOLF_F00E2E0; break; case RCID_PIGMA_2: - sp44 = D_F005AC0; + sp44 = D_STAR_WOLF_F005AC0; break; case RCID_PIGMA_2_OPEN: - sp44 = D_F0069E0; + sp44 = D_STAR_WOLF_F0069E0; break; case RCID_LEON_2: - sp44 = D_F009740; + sp44 = D_STAR_WOLF_F009740; break; case RCID_LEON_2_OPEN: - sp44 = D_F00A660; + sp44 = D_STAR_WOLF_F00A660; break; case RCID_ANDREW_2: - sp44 = D_F001E40; + sp44 = D_STAR_WOLF_F001E40; break; case RCID_ANDREW_2_OPEN: - sp44 = D_F002D60; + sp44 = D_STAR_WOLF_F002D60; break; case RCID_BOSS_CORNERIA: sp44 = D_6026420; diff --git a/yamls/us/assets.yaml b/yamls/us/assets.yaml index 77e7e87f..65165064 100644 --- a/yamls/us/assets.yaml +++ b/yamls/us/assets.yaml @@ -94,8 +94,12 @@ - name: ast_star_wolf exclusive_ram_id: segment_0F - type: bin + type: code + dir: assets start: 0x940AD0 + vram: 0x0F000000 + subsegments: + - [0x940AD0, .data, ast_star_wolf/ast_star_wolf] - name: ast_allies exclusive_ram_id: segment_0D