Skip to content

Improve data matching #2752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ribbanya wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Improve data matching #2752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions config/GALE01/splits.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,9 @@ melee/ft/ftdevice.c:
.sdata start:0x804D3C18 end:0x804D3C20
.sbss start:0x804D6570 end:0x804D6580

melee/ft/ft_459A.c:
.bss start:0x80459A98 end:0x8045A6C0

melee/ft/chara/ftCommon/ftCo_Bury.c:
.text start:0x800C0874 end:0x800C15F4
.data start:0x803C6BA0 end:0x803C6BD8
Expand Down Expand Up @@ -4343,44 +4346,49 @@ melee/if/soundtest.c:
.text start:0x802FF7DC end:0x80301E44
.data start:0x803F9F28 end:0x803FDC20
.sdata start:0x804D5850 end:0x804D5A40
.sbss start:0x804D6DA8 end:0x804D6F2C

melee/if/textdraw.c:
.text start:0x80301E44 end:0x80302834
.rodata start:0x803B8790 end:0x803B8810
.data start:0x803FDC20 end:0x803FDD18
.text start:0x80301E44 end:0x803029B4
.rodata start:0x803B8790 end:0x803B87A8
.data start:0x803FDC20 end:0x803FDC80
.bss start:0x804A1FD8 end:0x804A2688
.sbss start:0x804D6E18 end:0x804D6E40
.sdata2 start:0x804DDC58 end:0x804DDC88

melee/if/textlib.c:
.text start:0x80302834 end:0x80305058
.bss start:0x804A2688 end:0x804A2EA8
.text start:0x803029B4 end:0x80304870
.rodata start:0x803B87A8 end:0x803B8844
.bss start:0x804A2688 end:0x804A26B8

melee/ty/toy.c:
.text start:0x80305058 end:0x803124BC
.rodata start:0x803B8810 end:0x803B8958
.text start:0x80304870 end:0x803124BC
.rodata start:0x803B8844 end:0x803B8958
.data start:0x803FDD18 end:0x803FE880
.bss start:0x804A26B8 end:0x804A284C
.sdata start:0x804D5A40 end:0x804D5A78
.sdata2 start:0x804DDCC8 end:0x804DDE28

melee/ty/tylist.c:
.text start:0x803124BC end:0x80314AA8
.data start:0x803FE880 end:0x803FEA10
.bss start:0x804A284C end:0x804A2D98
.sdata start:0x804D5A78 end:0x804D5A90
.sdata2 start:0x804DDE28 end:0x804DDEA0

melee/ty/tyfigupon.c:
.text start:0x80314AA8 end:0x803182D4
.rodata start:0x803B8958 end:0x803B8988
.data start:0x803FEA10 end:0x803FEFF0
.bss start:0x804A2D98 end:0x804A2E98
.sdata start:0x804D5A90 end:0x804D5AA8
.sdata2 start:0x804DDEA0 end:0x804DDF70

melee/ty/tydisplay.c:
.text start:0x803182D4 end:0x8031C99C
.rodata start:0x803B8988 end:0x803B8B90
.data start:0x803FEFF0 end:0x803FFDA0
.bss start:0x804A2E98 end:0x804A2EA8
.sdata start:0x804D5AA8 end:0x804D5AC8
.sbss start:0x804D6F2C end:0x804D6F30
.sdata2 start:0x804DDF70 end:0x804DE040

melee/vi/vi.c:
Expand All @@ -4397,7 +4405,7 @@ melee/vi/vi0401.c:
.text start:0x8031D020 end:0x8031D6E4
.data start:0x80400038 end:0x80400088
.sdata start:0x804D5AC8 end:0x804D5AD8
.sbss start:0x804D6F3C end:0x804D6F68
.sbss start:0x804D6F48 end:0x804D6F68
.sdata2 start:0x804DE050 end:0x804DE058

melee/vi/vi0402.c:
Expand Down
55 changes: 33 additions & 22 deletions config/GALE01/symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20196,9 +20196,9 @@ it_803B8730 = .rodata:0x803B8730; // type:object size:0xC scope:global data:4byt
@208 = .rodata:0x803B8780; // type:object size:0x10 scope:local data:4byte
un_803B8790 = .rodata:0x803B8790; // type:object size:0xC scope:global data:4byte
un_803B879C = .rodata:0x803B879C; // type:object size:0xC scope:global data:4byte
un_803B87A8 = .rodata:0x803B87A8; // type:object size:0x34 scope:global data:4byte
un_803B87DC = .rodata:0x803B87DC; // type:object size:0x34 scope:global data:4byte
un_803B8810 = .rodata:0x803B8810; // type:object size:0x34 scope:global data:4byte
un_803B87A8 = .rodata:0x803B87A8; // type:object size:0x34 scope:global data:short
un_803B87DC = .rodata:0x803B87DC; // type:object size:0x34 scope:global data:short
un_803B8810 = .rodata:0x803B8810; // type:object size:0x34 scope:global data:short
un_803B8844 = .rodata:0x803B8844; // type:object size:0x14 scope:global data:4byte
un_803B8858 = .rodata:0x803B8858; // type:object size:0xC scope:global data:4byte
un_803B8864 = .rodata:0x803B8864; // type:object size:0x38 scope:global data:4byte
Expand Down Expand Up @@ -21195,7 +21195,8 @@ ftLk_Init_AnimDatFilename = .data:0x803C8224; // type:object size:0xB scope:glob
@231 = .data:0x803C8284; // type:object size:0x1B scope:local data:string
ftLk_Init_DemoMotionFilenames = .data:0x803C82A0; // type:object size:0x10 scope:global
ftLk_Init_CostumeStrings = .data:0x803C82B0; // type:object size:0x3C scope:global
ftLk_Init_803C82EC = .data:0x803C82EC; // type:object size:0x7C scope:global
ftLk_Init_803C82EC = .data:0x803C82EC; // type:object size:0x18 scope:global
pad = .data:0x803C8304; // type:object size:0x64 scope:local
ftKb_Init_MotionStateTable = .data:0x803C8368; // type:object size:0x1960 scope:global
ftKb_Init_803C9CC8 = .data:0x803C9CC8; // type:object size:0x108 scope:global
ftKb_Init_803C9DD0 = .data:0x803C9DD0; // type:object size:0x84 scope:global
Expand Down Expand Up @@ -24669,17 +24670,27 @@ un_803FE604 = .data:0x803FE604; // type:object size:0x14 scope:global
un_803FE618 = .data:0x803FE618; // type:object size:0x4C scope:global
un_803FE664 = .data:0x803FE664; // type:object size:0x14 scope:global
un_803FE678 = .data:0x803FE678; // type:object size:0xF8 scope:global
str_TyDataf_dat = .data:0x803FE770; // type:object size:0xC scope:global data:string
str_tyModelFileTbl = .data:0x803FE77C; // type:object size:0x10 scope:global data:string
str_tyModelFileUsTbl = .data:0x803FE78C; // type:object size:0x14 scope:global data:string
un_803FE7A0 = .data:0x803FE7A0; // type:object size:0xF scope:global data:string
un_803FE7B0 = .data:0x803FE7B0; // type:object size:0x10 scope:global data:string
un_803FE7C0 = .data:0x803FE7C0; // type:object size:0x22 scope:global data:string
un_803FE7E4 = .data:0x803FE7E4; // type:object size:0x9C scope:global
un_803FE880 = .data:0x803FE880; // type:object size:0x50 scope:global
un_803FE8D0 = .data:0x803FE8D0; // type:object size:0x1D scope:global data:string
un_803FE8F0 = .data:0x803FE8F0; // type:object size:0x9 scope:global data:string
un_803FE8FC = .data:0x803FE8FC; // type:object size:0x114 scope:global
str_TyDataf_dat = .data:0x803FE770; // type:object size:0xC scope:local data:string
str_tyModelFileTbl = .data:0x803FE77C; // type:object size:0x10 scope:local data:string
str_tyModelFileUsTbl = .data:0x803FE78C; // type:object size:0x14 scope:local data:string
un_803FE7A0 = .data:0x803FE7A0; // type:object size:0xF scope:local data:string
un_803FE7B0 = .data:0x803FE7B0; // type:object size:0x10 scope:local data:string
un_803FE7C0 = .data:0x803FE7C0; // type:object size:0x22 scope:local data:string
un_803FE7E4 = .data:0x803FE7E4; // type:object size:0x9C scope:local data:string
lbl_803FE880 = .data:0x803FE880; // type:object size:0x11 scope:local data:string
lbl_803FE894 = .data:0x803FE894; // type:object size:0x12 scope:local data:string
lbl_803FE8A8 = .data:0x803FE8A8; // type:object size:0x13 scope:local data:string
lbl_803FE8BC = .data:0x803FE8BC; // type:object size:0x13 scope:local data:string
un_803FE8D0 = .data:0x803FE8D0; // type:object size:0x1D scope:local data:string
un_803FE8F0 = .data:0x803FE8F0; // type:object size:0x9 scope:local data:string
lbl_803FE8FC = .data:0x803FE8FC; // type:object size:0x2D scope:local data:string
lbl_803FE92C = .data:0x803FE92C; // type:object size:0x1F scope:local data:string
lbl_803FE94C = .data:0x803FE94C; // type:object size:0x1C scope:local data:string
lbl_803FE968 = .data:0x803FE968; // type:object size:0x24 scope:local data:string
lbl_803FE98C = .data:0x803FE98C; // type:object size:0x1F scope:local data:string
lbl_803FE9AC = .data:0x803FE9AC; // type:object size:0x1E scope:local data:string
lbl_803FE9CC = .data:0x803FE9CC; // type:object size:0x22 scope:local data:string
lbl_803FE9F0 = .data:0x803FE9F0; // type:object size:0x19 scope:local data:string
un_803FEA10 = .data:0x803FEA10; // type:object size:0xE0 scope:local
jumptable_803FEAF0 = .data:0x803FEAF0; // type:object size:0x28 scope:local
lbl_803FEB18 = .data:0x803FEB18; // type:object size:0x24
Expand Down Expand Up @@ -25995,7 +26006,7 @@ un_804A1F10 = .bss:0x804A1F10; // type:object size:0x34 scope:global data:4byte
un_804A1F48 = .bss:0x804A1F48; // type:object size:0x10 scope:global data:2byte
un_804A1F58 = .bss:0x804A1F58; // type:object size:0x80 scope:global data:4byte
un_804A1FD8 = .bss:0x804A1FD8; // type:object size:0x6B0 scope:global
un_804A2688 = .bss:0x804A2688; // type:object size:0x30 scope:global
un_804A2688 = .bss:0x804A2688; // type:object size:0x2C scope:global
un_804A26B8 = .bss:0x804A26B8; // type:object size:0xC scope:global align:4 data:float
un_804A26C4 = .bss:0x804A26C4; // type:object size:0x8C scope:global
un_804A2750 = .bss:0x804A2750; // type:object size:0xFC scope:global
Expand Down Expand Up @@ -28363,7 +28374,7 @@ mnCount_804D6C70 = .sbss:0x804D6C70; // type:object size:0x8 scope:global data:4
mnInfo_804D6C78 = .sbss:0x804D6C78; // type:object size:0x8 scope:global data:4byte
mnInfoBonus_804D6C80 = .sbss:0x804D6C80; // type:object size:0x8 scope:global data:byte
mnGallery_804D6C88 = .sbss:0x804D6C88; // type:object size:0x4 scope:global data:4byte
mnGallery_804D6C8C = .sbss:0x804D6C8C; // type:object size:0x4 scope:global data:4byte
rate_table = .sbss:0x804D6C8C; // type:object size:0x4 scope:local data:4byte
mnStageSel_804D6C90 = .sbss:0x804D6C90; // type:object size:0x4 scope:global data:4byte
mnStageSel_804D6C94 = .sbss:0x804D6C94; // type:object size:0x4 scope:global data:4byte
mnStageSel_804D6C98 = .sbss:0x804D6C98; // type:object size:0x4 scope:global data:4byte
Expand Down Expand Up @@ -28462,15 +28473,15 @@ un_804D6E08 = .sbss:0x804D6E08; // type:object size:0x4 scope:global data:4byte
un_804D6E0C = .sbss:0x804D6E0C; // type:object size:0x4 scope:global data:4byte
un_804D6E10 = .sbss:0x804D6E10; // type:object size:0x4 scope:global data:4byte
un_804D6E14 = .sbss:0x804D6E14; // type:object size:0x4 scope:global data:4byte
un_804D6E18 = .sbss:0x804D6E18; // type:object size:0x4 scope:global data:4byte
un_804D6E1C = .sbss:0x804D6E1C; // type:object size:0x4 scope:global data:4byte
devtext_drawlist = .sbss:0x804D6E18; // type:object size:0x4 scope:global data:4byte
devtext_gobj = .sbss:0x804D6E1C; // type:object size:0x4 scope:global data:4byte
un_804D6E20 = .sbss:0x804D6E20; // type:object size:0x4 scope:global data:4byte
un_804D6E24 = .sbss:0x804D6E24; // type:object size:0x4 scope:global data:4byte
un_804D6E28 = .sbss:0x804D6E28; // type:object size:0x4 scope:global data:4byte
un_804D6E2C = .sbss:0x804D6E2C; // type:object size:0x4 scope:global data:4byte
un_804D6E30 = .sbss:0x804D6E30; // type:object size:0x4 scope:global data:4byte
un_804D6E34 = .sbss:0x804D6E34; // type:object size:0x4 scope:global data:4byte
un_804D6E38 = .sbss:0x804D6E38; // type:object size:0x8 scope:global data:4byte
devtext_poolhead = .sbss:0x804D6E38; // type:object size:0x4 scope:global data:4byte
un_804D6E40 = .sbss:0x804D6E40; // type:object size:0x4 scope:global data:4byte
un_804D6E44 = .sbss:0x804D6E44; // type:object size:0x4 scope:global data:4byte
un_804D6E48 = .sbss:0x804D6E48; // type:object size:0x4 scope:global data:4byte
Expand Down Expand Up @@ -28576,7 +28587,7 @@ un_804D6FF8 = .sbss:0x804D6FF8; // type:object size:0x4 scope:global data:4byte
un_804D6FFC = .sbss:0x804D6FFC; // type:object size:0x1 scope:global data:byte
un_804D6FFD = .sbss:0x804D6FFD; // type:object size:0x1 scope:global data:byte
un_804D7000 = .sbss:0x804D7000; // type:object size:0x4 scope:global data:4byte
un_804D7004 = .sbss:0x804D7004; // type:object size:0xC scope:global data:byte
un_804D7004 = .sbss:0x804D7004; // type:object size:0x4 scope:global data:byte
un_804D7010 = .sbss:0x804D7010; // type:object size:0x4 scope:global data:4byte
un_804D7014 = .sbss:0x804D7014; // type:object size:0x4 scope:global data:4byte
un_804D7018 = .sbss:0x804D7018; // type:object size:0x4 scope:global data:4byte
Expand All @@ -28587,7 +28598,7 @@ un_804D7028 = .sbss:0x804D7028; // type:object size:0x4 scope:global data:4byte
un_804D702C = .sbss:0x804D702C; // type:object size:0x4 scope:global data:4byte
un_804D7030 = .sbss:0x804D7030; // type:object size:0x4 scope:global data:4byte
un_804D7034 = .sbss:0x804D7034; // type:object size:0x4 scope:global data:4byte
un_804D7038 = .sbss:0x804D7038; // type:object size:0x8 scope:global data:byte
un_804D7038 = .sbss:0x804D7038; // type:object size:0x4 scope:global data:byte
un_804D7040 = .sbss:0x804D7040; // type:object size:0x4 scope:global data:4byte
un_804D7044 = .sbss:0x804D7044; // type:object size:0x4 scope:global data:4byte
un_804D7048 = .sbss:0x804D7048; // type:object size:0x4 scope:global data:4byte
Expand Down
1 change: 1 addition & 0 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,6 +631,7 @@ def MatchingFor(*versions):
Object(Matching, "melee/ft/ftmaterial.c"),
Object(Matching, "melee/ft/ftcolanim.c"),
Object(Matching, "melee/ft/ftdevice.c"),
Object(NonMatching, "melee/ft/ft_459A.c"),
Object(NonMatching, "melee/ft/chara/ftCommon/ftCo_Bury.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_FlyReflect.c"),
Object(Matching, "melee/ft/chara/ftCommon/ftCo_PassiveWall.c"),
Expand Down
3 changes: 2 additions & 1 deletion src/melee/ft/chara/ftLink/ftLk_Init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ Fighter_CostumeStrings ftLk_Init_CostumeStrings[] = {
{ ftLk_Init_803C81E0, ftLk_Init_803C81EC, ftLk_Init_803C8204 },
};

int ftLk_Init_803C82EC[31] = { 0 };
/* 3C82EC */ UnkCostumeStruct ftLk_Init_803C82EC = { 0 };
/* 3C8304 */ static int pad[25] = { 0 };

bool ftLk_Init_BoomerangExists(HSD_GObj* gobj)
{
Expand Down
1 change: 1 addition & 0 deletions src/melee/ft/chara/ftLink/ftLk_Init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@
/* 3C8224 */ extern char ftLk_Init_AnimDatFilename[];
/* 3C82A0 */ extern Fighter_DemoStrings ftLk_Init_DemoMotionFilenames;
/* 3C82B0 */ extern Fighter_CostumeStrings ftLk_Init_CostumeStrings[];
/* 3C82EC */ extern UnkCostumeStruct ftLk_Init_803C82EC;

#endif
2 changes: 1 addition & 1 deletion src/melee/ft/chara/ftPurin/ftPr_Init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
#include "forward.h"

#include "ft/fighter.h"
#include "ft/ft_0852.h"
#include "ft/ft_0877.h"
#include "ft/ftanim.h"
#include "ft/ftcamera.h"
#include "ft/ftdata.h"
#include "ft/ftdynamics.h"
#include "ft/ftparts.h"
#include "ft/types.h"
Expand Down
47 changes: 47 additions & 0 deletions src/melee/ft/chara/ft_459A.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/** @file
* Each of these belong in their respective character file. They are all in
* .bss, except for Link's, which is initialized to zero and so appears in
* .data. See #CostumeListsForeachCharacter to determine indices. They are of
* variable size, but the data is used uniformly across all characters, so the
* first 0x18 bytes are probably used by #UnkCostumeStruct and then the rest is
* character-specific .bss data used elsewhere.
*/
#ifndef GALE01_4599F0
#define GALE01_4599F0

#include "ft/forward.h"

/* 4599F0 */ extern UnkCostumeStruct lbl_804599F0;
/* 459A98 */ extern UnkCostumeStruct ft_80459A98;
/* 459B28 */ extern UnkCostumeStruct ft_80459B28;
/* 459C10 */ extern UnkCostumeStruct ft_80459C10;
/* 459CA0 */ extern UnkCostumeStruct ft_80459CA0;
/* 459D18 */ extern UnkCostumeStruct ft_80459D18;
/* 459D90 */ extern UnkCostumeStruct ft_80459D90;
/* 459DF0 */ extern UnkCostumeStruct ft_80459DF0;
/* 459E68 */ extern UnkCostumeStruct ft_80459E68;
/* 459EC8 */ extern UnkCostumeStruct ft_80459EC8;
/* 459F28 */ extern UnkCostumeStruct ft_80459F28;
/* 459F88 */ extern UnkCostumeStruct ft_80459F88;
/* 45A000 */ extern UnkCostumeStruct ft_8045A000;
/* 45A090 */ extern UnkCostumeStruct ft_8045A090;
/* 45A0F0 */ extern UnkCostumeStruct ft_8045A0F0;
/* 45A168 */ extern UnkCostumeStruct ft_8045A168;
/* 45A1F8 */ extern UnkCostumeStruct ft_8045A1F8;
/* 45A270 */ extern UnkCostumeStruct ft_8045A270;
/* 45A2D0 */ extern UnkCostumeStruct ft_8045A2D0;
/* 45A330 */ extern UnkCostumeStruct ft_8045A330;
/* 45A3A8 */ extern UnkCostumeStruct ft_8045A3A8;
/* 45A420 */ extern UnkCostumeStruct ft_8045A420;
/* 45A480 */ extern UnkCostumeStruct ft_8045A480;
/* 45A4E0 */ extern UnkCostumeStruct ft_8045A4E0;
/* 45A540 */ extern UnkCostumeStruct ft_8045A540;
/* 45A5B8 */ extern UnkCostumeStruct ft_8045A5B8;
/* 45A630 */ extern UnkCostumeStruct ft_8045A630;
/* 45A648 */ extern UnkCostumeStruct ft_8045A648;
/* 45A660 */ extern UnkCostumeStruct ft_8045A660;
/* 45A678 */ extern UnkCostumeStruct ft_8045A678;
/* 45A690 */ extern UnkCostumeStruct ft_8045A690;
/* 45A6A8 */ extern UnkCostumeStruct ft_8045A6A8;

#endif
1 change: 1 addition & 0 deletions src/melee/ft/forward.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ typedef struct IKState IKState;
typedef struct KirbyHatStruct KirbyHatStruct;
typedef struct MotionState MotionState;
typedef struct TempS TempS;
typedef struct UnkCostumeStruct UnkCostumeStruct;
typedef struct UnkFloat6_Camera UnkFloat6_Camera;
typedef struct UnkPlBonusBits UnkPlBonusBits;
typedef u32 MotionFlags;
Expand Down
1 change: 1 addition & 0 deletions src/melee/ft/ft_0852.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "ft/forward.h"

#include "ft/ftdata.h"
#include "ft/inlines.h"
#include "ft/types.h"

Expand Down
4 changes: 0 additions & 4 deletions src/melee/ft/ft_0852.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,4 @@ extern int ft_8045996C[FTKIND_MAX];
/* 0852B0 */ void ft_800852B0(void);
/* 08549C */ void ft_8008549C(void);

extern struct UnkCostumeList CostumeListsForeachCharacter[FTKIND_MAX];
extern struct ftData_UnkCountStruct ftData_Table_Unk0[FTKIND_MAX];
extern struct ftData_UnkCountStruct ftData_UnkIntPairs[FTKIND_MAX];

#endif
Loading
Loading