Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-23 04:59:41 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Rework sotn-assets animation pointers (#1742)

Browse Source 
I was reviewing some of the animations pulled out by sotn-assets.
Speicfically, I found that in `src/st/no3/sprite_banks.h` (a file
created by sotn-assets locally, which does not exist directly in this
repo), we have:

```
extern s16* sprites_no3_0;
extern s16* sprites_no3_1;
extern s16* sprites_no3_2;
extern s16* sprites_no3_3;
extern s16* sprites_no3_4;
extern s16* sprites_no3_5;
extern s16* sprites_no3_6;
extern s16* sprites_no3_7;
extern s16* sprites_no3_8;
static s16* spriteBanks[] = {
    0,
    &sprites_no3_0,
    &sprites_no3_3,
    &sprites_no3_1,
    &sprites_no3_2,
    &sprites_no3_4,
    &sprites_no3_5,
    &sprites_no3_6,
    &sprites_no3_7,
    &sprites_no3_8,
```

However, those are not the right pointer types. `sprites_no3_#` should
have a type of `s16* []`, so I reworked the sotn-assets tool to use the
right pointers for each of these things. Now the sprite_banks.h file
looks like:
```
extern s16* sprites_no3_0[];
extern s16* sprites_no3_1[];
extern s16* sprites_no3_2[];
extern s16* sprites_no3_3[];
extern s16* sprites_no3_4[];
extern s16* sprites_no3_5[];
extern s16* sprites_no3_6[];
extern s16* sprites_no3_7[];
extern s16* sprites_no3_8[];
static s16** spriteBanks[] = {
    0,
    sprites_no3_0,
    sprites_no3_3,
    sprites_no3_1,
    sprites_no3_2,
    sprites_no3_4,
    sprites_no3_5,
    sprites_no3_6,
    sprites_no3_7,
    sprites_no3_8,
```

Which more accurately represents the data within.

Naturally, since this PR mostly just changes the tool, the real changes
are in the tool's output, so feel free to clone this branch and
investigate the sprite_banks.h file if you want to see anything further
about it.

DRA's equivalent of the SpriteBanks array is `D_800A3B70`, and is
currently in the repo as extracted data, without using `sotn-assets`;
this PR makes it so the types in the overlays (which do use
`sotn-assets`) will match the types in DRA.
This commit is contained in:
bismurphy 2024-10-05 16:28:16 -04:00 committed by GitHub
parent a979d90d9a
commit 9ce2a3fbf6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boss/mar/header.c
View File

@ -2,7 +2,7 @@
#include "mar.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
static GfxBank* gfxBanks[];

2
src/st/cen/header.c
View File

@ -2,7 +2,7 @@
#include "cen.h"
extern RoomHeader OVL_EXPORT(rooms)[];
static signed short* spriteBanks[];
static s16** spriteBanks[];
static void* Cluts[];
static MyRoomDef rooms_layers[];
static GfxBank* gfxBanks[];

2
src/st/dre/header.c
View File

@ -2,7 +2,7 @@
#include "dre.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
extern GfxBank* g_GfxBanks[];

2
src/st/no3/header.c
View File

@ -2,7 +2,7 @@
#include "no3.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
extern GfxBank* g_GfxBanks[];

2
src/st/np3/header.c
View File

@ -2,7 +2,7 @@
#include "np3.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
extern GfxBank* g_GfxBanks[];

2
src/st/nz0/header.c
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "nz0.h"
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* g_Cluts[];
extern void* g_EntityGfxs[];
extern MyRoomDef rooms_layers[];

2
src/st/rwrp/header.c
View File

@ -2,7 +2,7 @@
#include "rwrp.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
extern void* OVL_EXPORT(g_EntityGfxs)[];

2
src/st/st0/header.c
View File

@ -2,7 +2,7 @@
#include "st0.h"
extern RoomHeader OVL_EXPORT(rooms)[];
extern signed short* spriteBanks[];
extern s16** spriteBanks[];
extern void* Cluts[];
extern MyRoomDef rooms_layers[];
extern GfxBank* g_EntityGfxs[];

2
src/st/wrp/header.c
View File

@ -14,7 +14,7 @@ void BottomCornerText(u8*, u8);
extern MyRoomDef rooms_layers[];
extern RoomHeader OVL_EXPORT(rooms)[];
static signed short* spriteBanks[];
static s16** spriteBanks[];
extern void* g_Cluts[];
extern RoomDef g_TileLayers[];
extern void* OVL_EXPORT(g_EntityGfxs)[];

6
tools/sotn-assets/build.go
View File

@ -373,15 +373,15 @@ func buildSprites(fileName string, outputDir string) error {
continue
}
symbol := fmt.Sprintf("sprites_%s_%d", ovlName, i)
sbHeader.WriteString(fmt.Sprintf("extern s16* %s;\n", symbol))
sbHeader.WriteString(fmt.Sprintf("extern s16* %s[];\n", symbol))
buildSpriteGroup(&sbData, sprites, symbol, r)
symbols = append(symbols, symbol)
}
sbHeader.WriteString("static s16* spriteBanks[] = {\n")
sbHeader.WriteString("static s16** spriteBanks[] = {\n")
for _, index := range spritesBanks.Indices {
if index >= 0 {
sbHeader.WriteString(fmt.Sprintf(" &%s,\n", symbols[index]))
sbHeader.WriteString(fmt.Sprintf(" %s,\n", symbols[index]))
} else {
sbHeader.WriteString(fmt.Sprintf(" 0,\n"))
}