izzy/Starship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Starship.git synced 2026-07-05 15:19:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

File splits and names (#82)

Browse Source 
* working file splits

* ovl_i2

* func_E08400_80187520

* working so far

* resolve conflicts

* .

* i2 working

* i1 working

* i1

* ovl_i1

* fox_i2

* i5 split

* i5 good

* ovl_i6

* split bss in ovl_menu

* so far, so good

* maaaan...

* ovl_unused

* ovl_i4 bss split

* ovl_i4

* ovl_i2

* foxmat!

* import more data and bss

* renamings
This commit is contained in:
Alejandro Asenjo Nitti
2024-01-14 01:30:21 -03:00
committed by GitHub
parent cbe2ad4546
commit 1cc17481e9
85 changed files with 8183 additions and 8134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/fox_map.h
+1 -1
View File
@@ -18,7 +18,7 @@ typedef struct {
/* 0x10 */ char pad10[0x4];
/* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18;
} UnkStruct_D_EBFBE0_801AFD18; // size = 0x1C
} UnkStruct_D_menu_801AFD18; // size = 0x1C
typedef struct {
/* 0x00 */ s32 id;
include/fox_option.h
+229 -229
View File
File diff suppressed because it is too large Load Diff
include/functions.h
+219 -219
View File
@@ -583,31 +583,31 @@ s32 Save_Read(void);
void func_EFFA40_80187520(s32, void*);
void func_DF4260_80187520(s32, void*);
void func_DF4260_80187530(Object_80*);
void func_DF4260_8018753C(Object_80*);
void func_DF4260_801878D8(Boss *);
void func_DF4260_8018B0B4(Actor *);
void func_DF4260_8018BE7C(Boss *);
void func_DF4260_8018ED78(Boss*);
void func_DF4260_801924A8(Object_80* );
void func_DF4260_8019250C(Actor *);
void func_DF4260_80192CB0(Actor *);
void func_DF4260_80192EA4(Actor *);
void func_DF4260_801933B4(Actor *);
void func_DF4260_801935CC(Boss *);
void func_DF4260_80198310(Boss *);
void func_DF4260_80198594(Boss *);
void func_DF4260_801988E0(void);
void func_DF4260_80198C50(void);
void func_DF4260_8019949C(void);
void func_DF4260_8019864C(PlayerShot*);
void func_i1_80187520(s32, void*);
void func_i1_80187530(Object_80*);
void func_i1_8018753C(Object_80*);
void func_i1_801878D8(Boss *);
void func_i1_8018B0B4(Actor *);
void func_i1_8018BE7C(Boss *);
void func_i1_8018ED78(Boss*);
void func_i1_801924A8(Object_80* );
void func_i1_8019250C(Actor *);
void func_i1_80192CB0(Actor *);
void func_i1_80192EA4(Actor *);
void func_i1_801933B4(Actor *);
void func_i1_801935CC(Boss *);
void func_i1_80198310(Boss *);
void func_i1_80198594(Boss *);
void func_i1_801988E0(void);
void func_i1_80198C50(void);
void func_i1_8019949C(void);
void func_i1_8019864C(PlayerShot*);
void func_E08400_80187520(s32, void*);
void func_E08400_80187B08(Actor *);
void func_E08400_80188A40(Boss *);
void func_E08400_8018CCF8(Actor *);
void func_i2_80187520(s32, void*);
void func_i2_80187B08(Actor *);
void func_i2_80188A40(Boss *);
void func_i2_8018CCF8(Actor *);
void func_i3_80187520(s32, void*);
void func_i3_80187754(Boss *);
@@ -743,59 +743,59 @@ void func_i3_801BEC74(Actor*);
void func_i3_801BEC80(Player*);
void func_E51970_80187520(s32, void*);
void func_E51970_80187960(Actor*);
void func_E51970_8018BA2C(Object_58**);
void func_E51970_8018C158(Actor*);
void func_E51970_80191ED8(Object_58**);
void func_E51970_80192264(void);
void func_E51970_80193CA4(Boss *);
void func_E51970_80198594(Actor*);
void func_E51970_80198930(Object_58**);
void func_E51970_80199900(Actor *, s32);
void func_E51970_80199C60(Actor*);
void func_E51970_8019AB8C(Actor*);
void func_E51970_8019EA68(Object_58**);
void func_i4_80187520(u32, void*);
void func_i4_80187960(Actor*);
void func_i4_8018BA2C(Object_58**);
void func_i4_8018C158(Actor*);
void func_i4_80191ED8(Object_58**);
void func_i4_80192264(void);
void func_i4_80193CA4(Boss *);
void func_i4_80198594(Actor*);
void func_i4_80198930(Object_58**);
void func_i4_80199900(Actor *, s32);
void func_i4_80199C60(Actor*);
void func_i4_8019AB8C(Actor*);
void func_i4_8019EA68(Object_58**);
void func_E6A810_80187520(s32, void*);
void func_E6A810_8018769C(Player *);
void func_E6A810_80188F30(void);
void func_E6A810_80189B80(Actor *);
void func_E6A810_8018ADC4(Actor *);
void func_E6A810_8018B720(Actor *);
void func_E6A810_8018B96C(Actor *);
void func_E6A810_8018BFB0(Actor *);
void func_E6A810_8018E3B0(Actor *);
void func_E6A810_8018E3CC(Actor *);
void func_E6A810_8018E5E8(Actor *);
void func_E6A810_8018EFF0(Object_4C *);
void func_E6A810_8018F0D8(Object_80 *);
void func_E6A810_8018FA48(Boss *);
void func_E6A810_801990DC(Boss *);
void func_E6A810_80199920(void);
void func_E6A810_80199F8C(Actor *);
void func_E6A810_801A3E70(Actor *);
void func_E6A810_801A4660(Actor *);
void func_E6A810_801A4AF8(Actor *);
void func_E6A810_801A5E2C(Actor *);
void func_E6A810_801A6134(Actor *);
void func_E6A810_801A65E0(Object_80 *);
void func_E6A810_801A7D98(Actor *);
void func_E6A810_801ACFBC(ObjectInit*);
void func_E6A810_801AD080(void);
void func_E6A810_801B5110(f32, f32, f32);
void func_E6A810_801B58AC(Gfx **, f32);
bool func_E6A810_801B6AEC(f32, f32, f32);
void func_E6A810_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_E6A810_801AD144(PlayerShot*);
void func_E6A810_80189120(f32 x, f32 y, f32 z, f32, f32);
bool func_E6A810_801A3C20(f32);
s32 func_E6A810_801A3300(Player*, f32, f32);
s32 func_E6A810_801A3790(Player*, f32, f32);
void func_i5_80187520(u32 mode, void* ptr);
void func_i5_8018769C(Player *);
void func_i5_80188F30(void);
void func_i5_80189B80(Actor *);
void func_i5_8018ADC4(Actor *);
void func_i5_8018B720(Actor *);
void func_i5_8018B96C(Actor *);
void func_i5_8018BFB0(Actor *);
void func_i5_8018E3B0(Actor *);
void func_i5_8018E3CC(Actor *);
void func_i5_8018E5E8(Actor *);
void func_i5_8018EFF0(Object_4C *);
void func_i5_8018F0D8(Object_80 *);
void func_i5_8018FA48(Boss *);
void func_i5_801990DC(Boss *);
void func_i5_80199920(void);
void func_i5_80199F8C(Actor *);
void func_i5_801A3E70(Actor *);
void func_i5_801A4660(Actor *);
void func_i5_801A4AF8(Actor *);
void func_i5_801A5E2C(Actor *);
void func_i5_801A6134(Actor *);
void func_i5_801A65E0(Object_80 *);
void func_i5_801A7D98(Actor *);
void func_i5_801ACFBC(ObjectInit*);
void func_i5_801AD080(void);
void func_i5_801B5110(f32, f32, f32);
void func_i5_801B58AC(Gfx **, f32);
bool func_i5_801B6AEC(f32, f32, f32);
void func_i5_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_i5_801AD144(PlayerShot*);
void func_i5_80189120(f32 x, f32 y, f32 z, f32, f32);
bool func_i5_801A3C20(f32);
s32 func_i5_801A3300(Player*, f32, f32);
s32 func_i5_801A3790(Player*, f32, f32);
void func_E9F1D0_8018769C(Actor*);
void func_E9F1D0_80187520(s32, void*);
void func_E9F1D0_80187520(u32 mode, void* ptr);
void func_E9F1D0_801878A8(Object_58**);
void func_E9F1D0_801888F4(Actor *);
void func_E9F1D0_80189214(void);
@@ -812,157 +812,157 @@ void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E9F1D0_801A6164(Player *);
void func_EBFBE0_80187520(s32, void*);
void func_menu_80187520(u32, void*);
void func_EF0260_8018A96C(void);
void func_EF0260_8018AAC4(void);
// void func_DF4260_801875A4(Object*);
// void func_DF4260_80189058(Object*);
// void func_DF4260_8018AA74(Object*);
// void func_DF4260_8018AED0(Object*);
// void func_DF4260_8018B15C(Object*);
// void func_DF4260_8018B418(Object*);
// void func_DF4260_8018B58C(Object*);
// void func_DF4260_8018BAAC(Object*);
// void func_DF4260_8018BBA4(Object*);
// void func_DF4260_8018BBF8(Object*);
// void func_DF4260_8018BD7C(Object*);
// void func_DF4260_8018C19C(Object*);
// void func_DF4260_8018DDAC(Object*);
// void func_DF4260_8018E290(Object*);
// void func_DF4260_8018E76C(Object*);
// void func_DF4260_8018ECAC(Object*);
// void func_DF4260_8018ED78(Object*);
// void func_DF4260_8018EE84(Object*);
// void func_DF4260_8018EF90(Object*);
// void func_DF4260_8018F044(Object*);
// void func_DF4260_8018F31C(Object*);
// void func_DF4260_801922DC(Object*);
// void func_DF4260_80192358(Object*);
// void func_DF4260_801923C0(Object*);
// void func_DF4260_8019243C(Object*);
// void func_DF4260_80192518(Object*);
// void func_DF4260_80192CD4(Object*);
// void func_DF4260_80192E2C(Object*);
// void func_DF4260_80192EB0(Object*);
// void func_DF4260_801933DC(Object*);
// void func_DF4260_801934D0(Object*);
// void func_DF4260_80193540(Object*);
// void func_DF4260_80194398(Object*);
// void func_DF4260_801985E4(Object*);
// void func_DF4260_80198968(Object*);
// void func_E08400_8018756C(Object*);
// void func_E08400_80187650(Object*);
// void func_E08400_801877C4(Object*);
// void func_E08400_8018795C(Object*);
// void func_E08400_80188344(Object*);
// void func_E08400_801887D0(Object*);
// void func_E08400_80188CAC(Object*);
// void func_E08400_80188FAC(Object*);
// void func_E08400_80189114(Object*);
// void func_E08400_8018978C(Object*);
// void func_E08400_8018BACC(Object*);
// void func_E08400_8018D9EC(Object*);
// void func_E08400_8018DA6C(Object*);
// void func_E08400_8018DAEC(Object*);
// void func_E08400_8018DB6C(Object*);
// void func_E08400_8018DBEC(Object*);
// void func_E08400_8018DCE4(Object*);
// void func_E08400_8018DE14(Object*);
// void func_E08400_8018F330(Object*);
// void func_E08400_8018F884(Object*);
// void func_E08400_8018FE38(Object*);
// void func_E08400_8018FF20(Object*);
// void func_E08400_8018FF84(Object*);
// void func_E08400_80190020(Object*);
// void func_E08400_80190078(Object*);
// void func_E08400_80193434(Object*);
// void func_E51970_80188AD0(Object*);
// void func_E51970_80188FE4(Object*);
// void func_E51970_80191054(Object*);
// void func_E51970_80191180(Object*);
// void func_E51970_801912FC(Object*);
// void func_E51970_80191AFC(Object*);
// void func_E51970_80192984(Object*);
// void func_E51970_80192A68(Object*);
// void func_E51970_80193718(Object*);
// void func_E51970_80193B1C(Object*);
// void func_E51970_801946C4(Object*);
// void func_E51970_801968F4(Object*);
// void func_E51970_8019E234(Object*);
// void func_E51970_8019E3A8(Object*);
// void func_E51970_8019E454(Object*);
// void func_E51970_8019E98C(Object*);
// void func_E6A810_80188F60(Object*);
// void func_E6A810_80188FA8(Object*);
// void func_E6A810_80189194(Object*);
// void func_E6A810_801895B8(Object*);
// void func_E6A810_80189AFC(Object*);
// void func_E6A810_80189CC8(Object*);
// void func_E6A810_8018A1C0(Object*);
// void func_E6A810_8018A544(Object*);
// void func_E6A810_8018AABC(Object*);
// void func_E6A810_8018AB44(Object*);
// void func_E6A810_8018B268(Object*);
// void func_E6A810_8018B6AC(Object*);
// void func_E6A810_8018B9D0(Object*);
// void func_E6A810_8018BE84(Object*);
// void func_E6A810_8018C8A8(Object*);
// void func_E6A810_8018E2D8(Object*);
// void func_E6A810_8018E54C(Object*);
// void func_E6A810_8018E5B4(Object*);
// void func_E6A810_8018E5F8(Object*);
// void func_E6A810_8018EF14(Object*);
// void func_E6A810_8018F038(Object*);
// void func_E6A810_8018F4D8(Object*);
// void func_E6A810_8018F8B8(Object*);
// void func_E6A810_80197A94(Object*);
// void func_E6A810_801982A8(Object*);
// void func_E6A810_8019C778(Object*);
// void func_E6A810_8019CE88(Object*);
// void func_E6A810_8019D700(Object*);
// void func_E6A810_8019E410(Object*);
// void func_E6A810_8019EA60(Object*);
// void func_E6A810_8019EE68(Object*);
// void func_E6A810_8019FF9C(Object*);
// void func_E6A810_801A0BD8(Object*);
// void func_E6A810_801A12C4(Object*);
// void func_E6A810_801A23AC(Object*);
// void func_E6A810_801A2A78(Object*);
// void func_E6A810_801A2B24(Object*);
// void func_E6A810_801A2DD8(Object*);
// void func_E6A810_801A3240(Object*);
// void func_E6A810_801A3E98(Object*);
// void func_E6A810_801A43BC(Object*);
// void func_E6A810_801A46A0(Object*);
// void func_E6A810_801A4A64(Object*);
// void func_E6A810_801A4B24(Object*);
// void func_E6A810_801A54E8(Object*);
// void func_E6A810_801A57D0(Object*);
// void func_E6A810_801A5AF0(Object*);
// void func_E6A810_801A5B4C(Object*);
// void func_E6A810_801A5D68(Object*);
// void func_E6A810_801A5E54(Object*);
// void func_E6A810_801A5F90(Object*);
// void func_E6A810_801A5FD0(Object*);
// void func_E6A810_801A6100(Object*);
// void func_E6A810_801A6144(Object*);
// void func_E6A810_801A6540(Object*);
// void func_E6A810_801A6608(Object*);
// void func_E6A810_801A67C8(Object*);
// void func_E6A810_801A68EC(Object*);
// void func_E6A810_801A7E7C(Object*);
// void func_E6A810_801AC294(Object*);
// void func_E6A810_801AC438(Object*);
// void func_E6A810_801AD6F0(Object*);
// void func_E6A810_801ADAC8(Object*);
// void func_E6A810_801ADD68(Object*);
// void func_E6A810_801AE2C0(Object*);
// void func_E6A810_801AE87C(Object*);
// void func_E6A810_801AEAA0(Object*);
// void func_E6A810_801AEC04(Object*);
// void func_E6A810_801AEEFC(Object*);
// void func_i1_801875A4(Object*);
// void func_i1_80189058(Object*);
// void func_i1_8018AA74(Object*);
// void func_i1_8018AED0(Object*);
// void func_i1_8018B15C(Object*);
// void func_i1_8018B418(Object*);
// void func_i1_8018B58C(Object*);
// void func_i1_8018BAAC(Object*);
// void func_i1_8018BBA4(Object*);
// void func_i1_8018BBF8(Object*);
// void func_i1_8018BD7C(Object*);
// void func_i1_8018C19C(Object*);
// void func_i1_8018DDAC(Object*);
// void func_i1_8018E290(Object*);
// void func_i1_8018E76C(Object*);
// void func_i1_8018ECAC(Object*);
// void func_i1_8018ED78(Object*);
// void func_i1_8018EE84(Object*);
// void func_i1_8018EF90(Object*);
// void func_i1_8018F044(Object*);
// void func_i1_8018F31C(Object*);
// void func_i1_801922DC(Object*);
// void func_i1_80192358(Object*);
// void func_i1_801923C0(Object*);
// void func_i1_8019243C(Object*);
// void func_i1_80192518(Object*);
// void func_i1_80192CD4(Object*);
// void func_i1_80192E2C(Object*);
// void func_i1_80192EB0(Object*);
// void func_i1_801933DC(Object*);
// void func_i1_801934D0(Object*);
// void func_i1_80193540(Object*);
// void func_i1_80194398(Object*);
// void func_i1_801985E4(Object*);
// void func_i1_80198968(Object*);
// void func_i2_8018756C(Object*);
// void func_i2_80187650(Object*);
// void func_i2_801877C4(Object*);
// void func_i2_8018795C(Object*);
// void func_i2_80188344(Object*);
// void func_i2_801887D0(Object*);
// void func_i2_80188CAC(Object*);
// void func_i2_80188FAC(Object*);
// void func_i2_80189114(Object*);
// void func_i2_8018978C(Object*);
// void func_i2_8018BACC(Object*);
// void func_i2_8018D9EC(Object*);
// void func_i2_8018DA6C(Object*);
// void func_i2_8018DAEC(Object*);
// void func_i2_8018DB6C(Object*);
// void func_i2_8018DBEC(Object*);
// void func_i2_8018DCE4(Object*);
// void func_i2_8018DE14(Object*);
// void func_i2_8018F330(Object*);
// void func_i2_8018F884(Object*);
// void func_i2_8018FE38(Object*);
// void func_i2_8018FF20(Object*);
// void func_i2_8018FF84(Object*);
// void func_i2_80190020(Object*);
// void func_i2_80190078(Object*);
// void func_i2_80193434(Object*);
// void func_i4_80188AD0(Object*);
// void func_i4_80188FE4(Object*);
// void func_i4_80191054(Object*);
// void func_i4_80191180(Object*);
// void func_i4_801912FC(Object*);
// void func_i4_80191AFC(Object*);
// void func_i4_80192984(Object*);
// void func_i4_80192A68(Object*);
// void func_i4_80193718(Object*);
// void func_i4_80193B1C(Object*);
// void func_i4_801946C4(Object*);
// void func_i4_801968F4(Object*);
// void func_i4_8019E234(Object*);
// void func_i4_8019E3A8(Object*);
// void func_i4_8019E454(Object*);
// void func_i4_8019E98C(Object*);
// void func_i5_80188F60(Object*);
// void func_i5_80188FA8(Object*);
// void func_i5_80189194(Object*);
// void func_i5_801895B8(Object*);
// void func_i5_80189AFC(Object*);
// void func_i5_80189CC8(Object*);
// void func_i5_8018A1C0(Object*);
// void func_i5_8018A544(Object*);
// void func_i5_8018AABC(Object*);
// void func_i5_8018AB44(Object*);
// void func_i5_8018B268(Object*);
// void func_i5_8018B6AC(Object*);
// void func_i5_8018B9D0(Object*);
// void func_i5_8018BE84(Object*);
// void func_i5_8018C8A8(Object*);
// void func_i5_8018E2D8(Object*);
// void func_i5_8018E54C(Object*);
// void func_i5_8018E5B4(Object*);
// void func_i5_8018E5F8(Object*);
// void func_i5_8018EF14(Object*);
// void func_i5_8018F038(Object*);
// void func_i5_8018F4D8(Object*);
// void func_i5_8018F8B8(Object*);
// void func_i5_80197A94(Object*);
// void func_i5_801982A8(Object*);
// void func_i5_8019C778(Object*);
// void func_i5_8019CE88(Object*);
// void func_i5_8019D700(Object*);
// void func_i5_8019E410(Object*);
// void func_i5_8019EA60(Object*);
// void func_i5_8019EE68(Object*);
// void func_i5_8019FF9C(Object*);
// void func_i5_801A0BD8(Object*);
// void func_i5_801A12C4(Object*);
// void func_i5_801A23AC(Object*);
// void func_i5_801A2A78(Object*);
// void func_i5_801A2B24(Object*);
// void func_i5_801A2DD8(Object*);
// void func_i5_801A3240(Object*);
// void func_i5_801A3E98(Object*);
// void func_i5_801A43BC(Object*);
// void func_i5_801A46A0(Object*);
// void func_i5_801A4A64(Object*);
// void func_i5_801A4B24(Object*);
// void func_i5_801A54E8(Object*);
// void func_i5_801A57D0(Object*);
// void func_i5_801A5AF0(Object*);
// void func_i5_801A5B4C(Object*);
// void func_i5_801A5D68(Object*);
// void func_i5_801A5E54(Object*);
// void func_i5_801A5F90(Object*);
// void func_i5_801A5FD0(Object*);
// void func_i5_801A6100(Object*);
// void func_i5_801A6144(Object*);
// void func_i5_801A6540(Object*);
// void func_i5_801A6608(Object*);
// void func_i5_801A67C8(Object*);
// void func_i5_801A68EC(Object*);
// void func_i5_801A7E7C(Object*);
// void func_i5_801AC294(Object*);
// void func_i5_801AC438(Object*);
// void func_i5_801AD6F0(Object*);
// void func_i5_801ADAC8(Object*);
// void func_i5_801ADD68(Object*);
// void func_i5_801AE2C0(Object*);
// void func_i5_801AE87C(Object*);
// void func_i5_801AEAA0(Object*);
// void func_i5_801AEC04(Object*);
// void func_i5_801AEEFC(Object*);
// void func_E9F1D0_801880E4(Object*);
// void func_E9F1D0_80188448(Object*);
// void func_E9F1D0_80188528(Object*);
include/sf64dma.h
+24 -24
View File
@@ -94,31 +94,31 @@ extern DmaEntry gDmaTable[]; // 178A70
extern OverlayInit sNoOvl_Logo[1]; // sets segment 15 with no overlay
extern OverlayInit sOvlEF0260_Credits[6]; // overlay EF0260
extern OverlayInit sOvlEBFBE0_Title[1]; // EBFBE0
extern OverlayInit sOvlEBFBE0_Menu[1]; // EBFBE0
extern OverlayInit sOvlEBFBE0_Map[1]; // EBFBE0
extern OverlayInit sOvlEBFBE0_State5[1]; // EBFBE0
extern OverlayInit sOvlDF4260_Corneria[1]; // DF4260
extern OverlayInit sOvlE08400_Meteo[2]; // E08400
extern OverlayInit sOvlE6A810_Titania[6]; // E6A810
extern OverlayInit sOvlE08400_SectorX[2]; // E08400
extern OverlayInit sOvlE51970_SectorZ[1]; // E51970
extern OverlayInit sOvlmenu_Title[1]; // EBFBE0
extern OverlayInit sOvlmenu_Menu[1]; // EBFBE0
extern OverlayInit sOvlmenu_Map[1]; // EBFBE0
extern OverlayInit sOvlmenu_State5[1]; // EBFBE0
extern OverlayInit sOvli1_Corneria[1]; // fox_i1
extern OverlayInit sOvli2_Meteo[2]; // fox_i2
extern OverlayInit sOvli5_Titania[6]; // E6A810
extern OverlayInit sOvli2_SectorX[2]; // fox_i2
extern OverlayInit sOvli4_SectorZ[1]; // i4
extern OverlayInit sOvli3_Aquas[1]; // i3
extern OverlayInit sOvli3_Area6[1]; // i3
extern OverlayInit sOvlE51970_Fortuna[2]; // E51970
extern OverlayInit sOvli4_Fortuna[2]; // i4
extern OverlayInit sOvli3_Unk4[1]; // i3
extern OverlayInit sOvlE9F1D0_SectorY[1]; // E9F1D0
extern OverlayInit sOvli3_Solar[1]; // i3
extern OverlayInit sOvli3_Zoness[1]; // i3
extern OverlayInit sOvlDF4260_Venom1[1]; // DF4260
extern OverlayInit sOvli1_Venom1[1]; // fox_i1
extern OverlayInit sOvlE9F1D0_Venom2[1]; // E9F1D0
extern OverlayInit sOvlE9F1D0_VenomSW[2]; // E9F1D0
extern OverlayInit sOvlE08400_Setup20[1]; // E08400
extern OverlayInit sOvlE51970_Bolse[1]; // E51970
extern OverlayInit sOvlE51970_Katina[1]; // E51970
extern OverlayInit sOvlE6A810_Macbeth[2]; // E6A810
extern OverlayInit sOvlDF4260_Training[1]; // DF4260
extern OverlayInit sOvlE08400_Versus[2]; // E08400
extern OverlayInit sOvli2_Setup20[1]; // fox_i2
extern OverlayInit sOvli4_Bolse[1]; // i4
extern OverlayInit sOvli4_Katina[1]; // i4
extern OverlayInit sOvli5_Macbeth[2]; // E6A810
extern OverlayInit sOvli1_Training[1]; // fox_i1
extern OverlayInit sOvli2_Versus[2]; // fox_i2
extern OverlayInit sEFFA40_Overlay[1]; // EFFA40
DECLARE_SEGMENT(makerom);
@@ -176,14 +176,14 @@ DECLARE_SEGMENT(ast_D68480);
DECLARE_SEGMENT(ast_D91F10);
DECLARE_SEGMENT(ast_DDC010);
DECLARE_SEGMENT(ast_DE5D50);
DECLARE_SEGMENT(ovl_DF4260);
DECLARE_SEGMENT(ovl_E08400);
DECLARE_SEGMENT(ovl_i1);
DECLARE_SEGMENT(ovl_i2);
DECLARE_SEGMENT(ovl_i3);
DECLARE_SEGMENT(ovl_E51970);
DECLARE_SEGMENT(ovl_E6A810);
DECLARE_SEGMENT(ovl_E9F1D0);
DECLARE_SEGMENT(ovl_i4);
DECLARE_SEGMENT(ovl_i5);
DECLARE_SEGMENT(ovl_i6);
DECLARE_SEGMENT(ovl_menu);
DECLARE_SEGMENT(ovl_EF0260);
DECLARE_SEGMENT(ovl_EFFA40);
DECLARE_SEGMENT(ovl_ending);
DECLARE_SEGMENT(ovl_unused);
#endif
include/structs.h
+1 -1
View File
@@ -93,7 +93,7 @@ typedef struct {
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
} UnkStruct_D_EBFBE0_801B8294; // size = 0x18
} UnkStruct_D_menu_801B8294; // size = 0x18
typedef enum OptionState {
OPTION_WAIT,
include/variables.h
+18 -18
View File
@@ -840,25 +840,25 @@ extern f32 gHeadsetPanVolume[];
extern f32 gStereoPanVolume[];
extern f32 gDefaultPanVolume[];
// ovl_DF4260
extern Gfx* D_DF4260_8019A008[];
extern f32 D_DF4260_8019A9B8[];
// ovl_i1
extern Gfx* D_i1_8019A008[];
extern f32 D_i1_8019A9B8[];
// ovl_i3
// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
// ovl_E51970
extern Matrix D_E51970_8019EE80;
extern s32 D_E51970_801A03DC;
// ovl_i4
extern Matrix D_i4_8019EE80;
extern s32 D_i4_801A03DC;
// ovl_E6A810
extern Gfx* D_E6A810_801B7584[];
extern Gfx* D_E6A810_801B7608[];
extern Gfx* D_E6A810_801B769C[];
extern f32 D_E6A810_801B83A8[];
extern u8 D_E6A810_801BA1E8;
// ovl_i5
extern Gfx* D_i5_801B7584[];
extern Gfx* D_i5_801B7608[];
extern Gfx* D_i5_801B769C[];
extern f32 D_i5_801B83A8[];
extern u8 D_i5_801BA1E8;
// ovl_E9F1D0
// ovl_i6
extern f32 D_E9F1D0_801A7F58;
extern f32 D_E9F1D0_801A7F60;
extern f32 D_E9F1D0_801A7F68;
@@ -866,11 +866,11 @@ extern f32 D_E9F1D0_801A7F70;
extern f32 D_E9F1D0_801A7F78;
// ovl_menu
extern s32 D_EBFBE0_801B8220[]; // total hits ranking? see func_EBFBE0_80197DE4
extern s32 D_EBFBE0_801B8280;
extern s32 D_EBFBE0_801B8284;
extern s32 D_EBFBE0_801B827C;
extern s32 D_EBFBE0_801B8288;
extern s32 D_menu_801B8220[]; // total hits ranking? see func_menu_80197DE4
extern s32 D_menu_801B8280;
extern s32 D_menu_801B8284;
extern s32 D_menu_801B827C;
extern s32 D_menu_801B8288;
// buffers
extern u64 gDramStack[SP_DRAM_STACK_SIZE64];