mirror of
https://github.com/Xeeynamo/sotn-decomp.git
synced 2024-11-23 04:59:41 +00:00
9ce2a3fbf6
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.
|
||
|---|---|---|
| .. | ||
| asm-differ@f5fc9026f0 | ||
| dups | ||
| function_finder | ||
| gfxsotn | ||
| lints/sotn-lint | ||
| m2c@4ee07ea6b0 | ||
| maspsx@d2d24c407c | ||
| mwccgap@41429ee969 | ||
| saturn-splitter@8d549a8042 | ||
| sotn_str | ||
| sotn-assets | ||
| sotn-debugmodule | ||
| sotn-disk | ||
| splat_ext | ||
| split_jpt_yaml | ||
| vab-ex | ||
| analyze_calls.py | ||
| auto_dedupe_new_overlay.py | ||
| bin2c.py | ||
| decompile.py | ||
| dirt_patcher.py | ||
| display_texture.py | ||
| gfxstage.py | ||
| lint-license.py | ||
| m2ctx.py | ||
| make-config.py | ||
| permuter_settings.toml | ||
| png2bin.py | ||
| png2s.py | ||
| progress.py | ||
| requirements-debian.txt | ||
| requirements-python.txt | ||
| richter_symbols.py | ||
| spritesheet.py | ||
| symbols_test.py | ||
| symbols.py | ||
| tools.mk | ||