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

TT_000 import BSS section (#1110)

Browse Source 
I had to cherry-pick the following PR on our splat fork:
https://github.com/ethteck/splat/pull/305
This commit is contained in:
Luciano Ciccariello 2024-04-03 23:26:07 +01:00 committed by GitHub
parent 1511a3c552
commit cd71d838cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/splat.us.tt_000.yaml
View File

@ -23,12 +23,13 @@ options:
- ".rodata"
- ".text"
- ".bss"
ld_bss_is_noload: False
segments:
- name: tt_000
type: code
start: 0x00000000
vram: 0x80170000
subalign: 2
subalign: 4
subsegments:
- [0x0, .data, 10E8]
- [0x40, .data, spriteparts]
@ -38,5 +39,5 @@ segments:
- [0x10AC, .rodata, 10E8] # func_80172120
- [0x10C4, .rodata, 10E8]
- [0x10E8, c]
- [0x48D8, sbss]
- [0x48D8, .bss, 10E8]
- [0xA000]

4
include/servant.h
View File

@ -48,9 +48,11 @@ typedef struct {
#define CHECK_CASTLE_FLAG 0x80000000
#define FOR_CASTLE_FLAG(x) CHECK_CASTLE_FLAG | x
extern ServantDesc g_ServantDesc;
extern SpriteParts* D_80170040[];
extern u16 D_80170448[];
extern s32 D_801704A8[];
extern s32 D_80170514[];
extern s32 D_8017054C[];
extern s32 D_801705EC[];
extern s32* D_801705F4[];
@ -59,5 +61,3 @@ extern s32 D_80170658[][5];
extern u16 D_80170720[];
extern s32 D_80171090;
extern EntitySearch D_80171094[];
extern ServantDesc g_ServantDesc;

67
src/servant/tt_000/10E8.c
View File

@ -4,40 +4,39 @@
#define SFX_BAT_SCREECH SOUND_BAT_SCREECH
#define SFX_BAT_NOTIFY SE_UI_OVERWRITE_MSG
extern s32 D_801748D8[0x80];
extern Collider D_80174AD8;
extern s16 D_80174AFC;
extern s16 D_80174B00;
extern s16 D_80174B04;
extern s16 D_80174B08;
extern s16 D_80174B0C;
extern s16 D_80174B10;
extern s16 D_80174B14;
extern s16 D_80174B18;
extern s32 D_80174B1C;
extern s32 D_80174B20;
extern s32 D_80174B24;
extern s32 D_80174B28;
extern s32 D_80174B2C;
extern s32 D_80174B2C;
extern s32 D_80174B30;
extern s32 D_80174B34;
extern s16 D_80174B38;
extern s16 D_80174B3C;
extern s16 D_80174B40;
extern s16 D_80174B44;
extern Primitive* D_80174B48;
extern s32 D_80174B4C[16];
extern Point16 D_80174B8C[16];
extern s16 D_80174BCC[16];
extern s16 D_80174BEC[16];
extern s16 D_80174C0C[16];
extern s32 D_80174C2C;
extern Unkstruct_8011A3AC D_80174C30;
extern Point16 D_80174C3C[4][16];
extern s32 D_80174D3C;
extern s32 D_80174D40;
extern s32 D_80170514[];
s32 D_801748D8[0x80];
Collider D_80174AD8;
s16 D_80174AFC, D_80174AFC_;
s16 D_80174B00, D_80174B00_;
s16 D_80174B04, D_80174B04_;
s16 D_80174B08, D_80174B08_;
s16 D_80174B0C, D_80174B0C_;
s16 D_80174B10, D_80174B10_;
s16 D_80174B14, D_80174B14_;
s16 D_80174B18, D_80174B18_;
s32 D_80174B1C;
s32 D_80174B20;
s32 D_80174B24;
s32 D_80174B28;
s32 D_80174B2C;
s32 D_80174B2C;
s32 D_80174B30;
s32 D_80174B34;
s16 D_80174B38, D_80174B38_;
s16 D_80174B3C, D_80174B3C_;
s16 D_80174B40, D_80174B40_;
s16 D_80174B44, D_80174B44_;
Primitive* D_80174B48;
s32 D_80174B4C[16];
Point16 D_80174B8C[16];
s16 D_80174BCC[16];
s16 D_80174BEC[16];
s16 D_80174C0C[16];
s32 D_80174C2C;
Unkstruct_8011A3AC D_80174C30;
Point16 D_80174C3C[4][16];
s32 D_80174D3C;
s32 D_80174D40;
void func_80171ED4(s32 arg0);
void func_80172120(Entity* self);

2
tools/n64splat

@ -1 +1 @@
Subproject commit e60277d6966edcfec1b06253c18e4344fef441a8
Subproject commit 828c34950bc599805d26968dc0e675428074982d