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

Importing tt_001 data spriteparts (#1729)

Browse Source 
Spriteparts data is the same between bat and ghost, so I moved them to a
shared header.
If they are different than other familiars, we'll have to rename the
shared header.
This commit is contained in:
H.M. Burger 2024-10-04 22:57:04 -05:00 committed by GitHub
parent bc549c75e6
commit 4282ac221e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 223 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/splat.us.tt_001.yaml
View File

@ -39,7 +39,8 @@ segments:
subalign: 4
subsegments:
- [0x0, .data, F84]
- [0x40, data]
- [0x40, .data, spriteparts]
- [0x448, data]
- [0xEFC, .rodata, F84]
- [0xF3C, .rodata, F84] # ProcessSfxState
- [0xF60, c, F84]

1
config/symbols.us.tt_001.txt
View File

@ -1,3 +1,4 @@
D_80170040 = 0x80170040;
g_Events = 0x801705B0;
g_PlaySfxStep = 0x80170EE0;
g_EntityRanges = 0x80170EE4;

213
src/servant/shared_spriteparts.h Normal file
View File

@ -0,0 +1,213 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
int D_801700C8[];
int D_801700E4[];
int D_80170100[];
int D_8017011C[];
int D_80170138[];
int D_80170154[];
int D_80170170[];
int D_8017018C[];
int D_801701A8[];
int D_801701C4[];
int D_801701E0[];
int D_801701FC[];
int D_80170218[];
int D_80170234[];
int D_80170250[];
int D_8017026C[];
int D_80170288[];
int D_801702A4[];
int D_801702C0[];
int D_801702DC[];
int D_801702F8[];
int D_80170314[];
int D_80170330[];
int D_8017034C[];
int D_80170368[];
int D_80170384[];
int D_801703A0[];
int D_801703BC[];
int D_801703D8[];
int D_801703F4[];
int D_80170410[];
int D_8017042C[];
SpriteParts* D_80170040[] = {
(SpriteParts*)NULL, (SpriteParts*)D_801700C8,
(SpriteParts*)D_801700E4, (SpriteParts*)D_80170100,
(SpriteParts*)D_8017011C, (SpriteParts*)D_80170138,
(SpriteParts*)D_80170154, (SpriteParts*)D_80170170,
(SpriteParts*)D_8017018C, (SpriteParts*)D_801701A8,
(SpriteParts*)D_801701C4, (SpriteParts*)D_801701E0,
(SpriteParts*)D_801701FC, (SpriteParts*)D_80170218,
(SpriteParts*)D_80170234, (SpriteParts*)D_80170250,
(SpriteParts*)D_8017026C, (SpriteParts*)D_80170288,
(SpriteParts*)D_801702A4, (SpriteParts*)D_801702C0,
(SpriteParts*)D_801702DC, (SpriteParts*)D_801702F8,
(SpriteParts*)D_80170314, (SpriteParts*)D_80170330,
(SpriteParts*)D_8017034C, (SpriteParts*)D_80170368,
(SpriteParts*)D_80170384, (SpriteParts*)D_801703A0,
(SpriteParts*)D_801703BC, (SpriteParts*)D_801703D8,
(SpriteParts*)D_801703F4, (SpriteParts*)D_80170410,
(SpriteParts*)D_8017042C, (SpriteParts*)NULL,
};
int D_801700C8[] = {
0x00300001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00000000, 0x00200020, 0x00000000,
};
int D_801700E4[] = {
0x00300001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00000000, 0x00200020, 0x00000000,
};
int D_80170100[] = {
0x00100001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00200000, 0x00400020, 0x00000000,
};
int D_8017011C[] = {
0x00100001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00200000, 0x00400020, 0x00000000,
};
int D_80170138[] = {
0x00200001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00000020, 0x00200040, 0x00000000,
};
int D_80170154[] = {
0x00200001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00000020, 0x00200040, 0x00000000,
};
int D_80170170[] = {
0x00000001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00200020, 0x00400040, 0x00000000,
};
int D_8017018C[] = {
0x00000001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00200020, 0x00400040, 0x00000000,
};
int D_801701A8[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400000, 0x00500010, 0x00000000,
};
int D_801701C4[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400000, 0x00500010, 0x00000000,
};
int D_801701E0[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400010, 0x00500020, 0x00000000,
};
int D_801701FC[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400010, 0x00500020, 0x00000000,
};
int D_80170218[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400020, 0x00500030, 0x00000000,
};
int D_80170234[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400020, 0x00500030, 0x00000000,
};
int D_80170250[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500000, 0x00600010, 0x00000000,
};
int D_8017026C[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500000, 0x00600010, 0x00000000,
};
int D_80170288[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500010, 0x00600020, 0x00000000,
};
int D_801702A4[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500010, 0x00600020, 0x00000000,
};
int D_801702C0[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500020, 0x00600030, 0x00000000,
};
int D_801702DC[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500020, 0x00600030, 0x00000000,
};
int D_801702F8[] = {
0x00200001, 0xFFE8FFF5, 0x00200018, 0x00000002,
0x00000040, 0x00200058, 0x00000000,
};
int D_80170314[] = {
0x00200001, 0xFFEEFFF5, 0x00180018, 0x00000002,
0x00000058, 0x00180070, 0x00000000,
};
int D_80170330[] = {
0x00000001, 0xFFF6FFF5, 0x00100018, 0x00000002,
0x00200040, 0x00300058, 0x00000000,
};
int D_8017034C[] = {
0x00000001, 0xFFF8FFF5, 0x00180018, 0x00000002,
0x00200058, 0x00380070, 0x00000000,
};
int D_80170368[] = {
0x00000001, 0xFFFBFFF5, 0x00180018, 0x00000002,
0x00380040, 0x00500058, 0x00000000,
};
int D_80170384[] = {
0x00000001, 0xFFF8FFF5, 0x00200018, 0x00000002,
0x00380058, 0x00580070, 0x00000000,
};
int D_801703A0[] = {
0x00000001, 0xFFF8FFF5, 0x00200018, 0x00000002,
0x00500040, 0x00700058, 0x00000000,
};
int D_801703BC[] = {
0x00000001, 0xFFFBFFF5, 0x00180018, 0x00000002,
0x00580058, 0x00700070, 0x00000000,
};
int D_801703D8[] = {
0x00000001, 0xFFFDFFF5, 0x00180018, 0x00000002,
0x00600018, 0x00780030, 0x00000000,
};
int D_801703F4[] = {
0x00100001, 0xFFF9FFF5, 0x00100018, 0x00000002,
0x00600000, 0x00700018, 0x00000000,
};
int D_80170410[] = {
0x00000001, 0xFFF4FFF8, 0x00180010, 0x00000002,
0x00400030, 0x00580040, 0x00000000,
};
int D_8017042C[] = {
0x00000001, 0xFFF4FFF8, 0x00180010, 0x00000002,
0x00580030, 0x00700040, 0x00000000,
};

213
src/servant/tt_000/spriteparts.c
View File

@ -1,215 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "servant.h"
int D_801700C8[];
int D_801700E4[];
int D_80170100[];
int D_8017011C[];
int D_80170138[];
int D_80170154[];
int D_80170170[];
int D_8017018C[];
int D_801701A8[];
int D_801701C4[];
int D_801701E0[];
int D_801701FC[];
int D_80170218[];
int D_80170234[];
int D_80170250[];
int D_8017026C[];
int D_80170288[];
int D_801702A4[];
int D_801702C0[];
int D_801702DC[];
int D_801702F8[];
int D_80170314[];
int D_80170330[];
int D_8017034C[];
int D_80170368[];
int D_80170384[];
int D_801703A0[];
int D_801703BC[];
int D_801703D8[];
int D_801703F4[];
int D_80170410[];
int D_8017042C[];
SpriteParts* D_80170040[] = {
(SpriteParts*)NULL, (SpriteParts*)D_801700C8,
(SpriteParts*)D_801700E4, (SpriteParts*)D_80170100,
(SpriteParts*)D_8017011C, (SpriteParts*)D_80170138,
(SpriteParts*)D_80170154, (SpriteParts*)D_80170170,
(SpriteParts*)D_8017018C, (SpriteParts*)D_801701A8,
(SpriteParts*)D_801701C4, (SpriteParts*)D_801701E0,
(SpriteParts*)D_801701FC, (SpriteParts*)D_80170218,
(SpriteParts*)D_80170234, (SpriteParts*)D_80170250,
(SpriteParts*)D_8017026C, (SpriteParts*)D_80170288,
(SpriteParts*)D_801702A4, (SpriteParts*)D_801702C0,
(SpriteParts*)D_801702DC, (SpriteParts*)D_801702F8,
(SpriteParts*)D_80170314, (SpriteParts*)D_80170330,
(SpriteParts*)D_8017034C, (SpriteParts*)D_80170368,
(SpriteParts*)D_80170384, (SpriteParts*)D_801703A0,
(SpriteParts*)D_801703BC, (SpriteParts*)D_801703D8,
(SpriteParts*)D_801703F4, (SpriteParts*)D_80170410,
(SpriteParts*)D_8017042C, (SpriteParts*)NULL,
};
int D_801700C8[] = {
0x00300001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00000000, 0x00200020, 0x00000000,
};
int D_801700E4[] = {
0x00300001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00000000, 0x00200020, 0x00000000,
};
int D_80170100[] = {
0x00100001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00200000, 0x00400020, 0x00000000,
};
int D_8017011C[] = {
0x00100001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00200000, 0x00400020, 0x00000000,
};
int D_80170138[] = {
0x00200001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00000020, 0x00200040, 0x00000000,
};
int D_80170154[] = {
0x00200001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00000020, 0x00200040, 0x00000000,
};
int D_80170170[] = {
0x00000001, 0xFFECFFF2, 0x00200020, 0x00000000,
0x00200020, 0x00400040, 0x00000000,
};
int D_8017018C[] = {
0x00000001, 0xFFECFFF2, 0x00200020, 0x00000001,
0x00200020, 0x00400040, 0x00000000,
};
int D_801701A8[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400000, 0x00500010, 0x00000000,
};
int D_801701C4[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400000, 0x00500010, 0x00000000,
};
int D_801701E0[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400010, 0x00500020, 0x00000000,
};
int D_801701FC[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400010, 0x00500020, 0x00000000,
};
int D_80170218[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00400020, 0x00500030, 0x00000000,
};
int D_80170234[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00400020, 0x00500030, 0x00000000,
};
int D_80170250[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500000, 0x00600010, 0x00000000,
};
int D_8017026C[] = {
0x00100001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500000, 0x00600010, 0x00000000,
};
int D_80170288[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500010, 0x00600020, 0x00000000,
};
int D_801702A4[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500010, 0x00600020, 0x00000000,
};
int D_801702C0[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000000,
0x00500020, 0x00600030, 0x00000000,
};
int D_801702DC[] = {
0x00000001, 0xFFF8FFFA, 0x00100010, 0x00000001,
0x00500020, 0x00600030, 0x00000000,
};
int D_801702F8[] = {
0x00200001, 0xFFE8FFF5, 0x00200018, 0x00000002,
0x00000040, 0x00200058, 0x00000000,
};
int D_80170314[] = {
0x00200001, 0xFFEEFFF5, 0x00180018, 0x00000002,
0x00000058, 0x00180070, 0x00000000,
};
int D_80170330[] = {
0x00000001, 0xFFF6FFF5, 0x00100018, 0x00000002,
0x00200040, 0x00300058, 0x00000000,
};
int D_8017034C[] = {
0x00000001, 0xFFF8FFF5, 0x00180018, 0x00000002,
0x00200058, 0x00380070, 0x00000000,
};
int D_80170368[] = {
0x00000001, 0xFFFBFFF5, 0x00180018, 0x00000002,
0x00380040, 0x00500058, 0x00000000,
};
int D_80170384[] = {
0x00000001, 0xFFF8FFF5, 0x00200018, 0x00000002,
0x00380058, 0x00580070, 0x00000000,
};
int D_801703A0[] = {
0x00000001, 0xFFF8FFF5, 0x00200018, 0x00000002,
0x00500040, 0x00700058, 0x00000000,
};
int D_801703BC[] = {
0x00000001, 0xFFFBFFF5, 0x00180018, 0x00000002,
0x00580058, 0x00700070, 0x00000000,
};
int D_801703D8[] = {
0x00000001, 0xFFFDFFF5, 0x00180018, 0x00000002,
0x00600018, 0x00780030, 0x00000000,
};
int D_801703F4[] = {
0x00100001, 0xFFF9FFF5, 0x00100018, 0x00000002,
0x00600000, 0x00700018, 0x00000000,
};
int D_80170410[] = {
0x00000001, 0xFFF4FFF8, 0x00180010, 0x00000002,
0x00400030, 0x00580040, 0x00000000,
};
int D_8017042C[] = {
0x00000001, 0xFFF4FFF8, 0x00180010, 0x00000002,
0x00580030, 0x00700040, 0x00000000,
};
#include "../shared_spriteparts.h"

4
src/servant/tt_001/F84.c
View File

@ -13,10 +13,10 @@ extern s32 D_us_801737CC;
extern s32 D_us_801737D8;
extern s32 D_us_801737DC;
extern FamiliarStats D_us_80173810;
extern SpriteParts* D_80170040[];
extern u16 D_us_80170580[48];
extern u16 D_us_80170448[48];
extern SpriteParts* D_us_80170040[];
extern Primitive*
D_us_801737FC; // Pointer to the current primitive being manipulated
@ -303,7 +303,7 @@ void ServantInit(InitializeMode mode) {
spriteBanks = g_api.o.spriteBanks;
spriteBanks += 20;
*spriteBanks = (SpriteParts*)D_us_80170040;
*spriteBanks = (SpriteParts*)D_80170040;
e = &g_Entities[4];
DestroyEntity(e);

4
src/servant/tt_001/spriteparts.c Normal file
View File

@ -0,0 +1,4 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
#include "servant.h"
#include "../shared_spriteparts.h"