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
.vscode/settings.json
Vendored
+1 -1
View File
@@ -36,7 +36,7 @@
"limits": "c",
"algorithm": "c",
"dfee30.h": "c",
"df4260.h": "c",
"fox_i1.h": "c",
"symbol_addrs_overlays": "cpp",
"string.h": "c",
"stdarg.h": "c",
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];
linker_scripts/us/symbol_addrs.txt
+11 -11
View File
@@ -90,18 +90,18 @@ D_800D8570 = 0x800D8570; // force_migration:True
D_800D8594 = 0x800D8594; // force_migration:True
D_800C93EC = 0x800C93EC; // force_migration:True
D_DF4260_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_DF4260
D_DF4260_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_DF4260
D_i1_8019B1EC = 0x8019B1EC; // force_migration:True segment:ovl_i1
D_i1_8019B6D8 = 0x8019B6D8; // size:0x110 segment:ovl_i1
D_i3_801C171C = 0x801C171C; // force_migration:True segment:ovl_i3
D_i3_801C1728 = 0x801C1728; // force_migration:True segment:ovl_i3
D_i3_801C1730 = 0x801C1730; // force_migration:True segment:ovl_i3
D_i3_801C1758 = 0x801C1758; // force_migration:True segment:ovl_i3
D_E6A810_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_E6A810
D_E6A810_801BB808 = 0x801BB808; // force_migration:True segment:ovl_E6A810
D_E6A810_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_E6A810
D_E6A810_801BBAE4 = 0x801BBAE4; // force_migration:True segment:ovl_E6A810
D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_EF0260
D_E51970_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_E51970
D_E51970_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_E51970
D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_E9F1D0
D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_E9F1D0
D_i5_801BB83C = 0x801BB83C; // force_migration:True segment:ovl_i5
D_i5_801BB808 = 0x801BB808; // force_migration:True segment:ovl_i5
D_i5_801BBAD0 = 0x801BBAD0; // force_migration:True segment:ovl_i5
D_i5_801BBAE4 = 0x801BBAE4; // force_migration:True segment:ovl_i5
D_EF0260_80196BF4 = 0x80196BF4; // force_migration:True segment:ovl_ending
D_ovl_i4_8019FE74 = 0x8019FE74; // force_migration:True segment:ovl_i4
D_ovl_i4_8019FEFC = 0x8019FEFC; // force_migration:True segment:ovl_i4
D_E9F1D0_801A7560 = 0x801A7560; // force_migration:True segment:ovl_i6
D_E9F1D0_801A792C = 0x801A792C; // force_migration:True segment:ovl_i6
linker_scripts/us/symbol_addrs_EBFBE0.txt
+103 -103
View File
@@ -4,111 +4,111 @@ planet = 0x801AF4A0; // type:Planet segment:ovl_menu size:0x38
sPlanetNames = 0x801AF9F4; // type:s32 segment:ovl_menu size:0xF
GetPlanetId = 0x801A6480; // force_migration:True segment:ovl_menu
sOptionCardList = 0x801AE638; // type:OptionEntry segment:ovl_menu size:0x240
D_EBFBE0_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu
sPlanetList = 0x801AF7E8;
spectrumAnalizerMode = 0x801B9318;
D_EBFBE0_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu
D_EBFBE0_801B7BA0 = 0x801B7BA0;
D_EBFBE0_801B827C = 0x801B827C;
D_EBFBE0_801B9710 = 0x801B9710;
D_EBFBE0_801B9A10 = 0x801B9A10;
D_EBFBE0_801B9D10 = 0x801B9D10;
D_EBFBE0_801BA010 = 0x801BA010;
D_EBFBE0_801BA310 = 0x801BA310;
D_EBFBE0_801BA610 = 0x801BA610;
D_EBFBE0_801BA910 = 0x801BA910;
D_EBFBE0_801BAC10 = 0x801BAC10;
D_EBFBE0_801BAF10 = 0x801BAF10;
D_EBFBE0_801BB210 = 0x801BB210;
D_EBFBE0_801BB510 = 0x801BB510;
D_EBFBE0_801BBB10 = 0x801BBB10;
D_EBFBE0_801BBE10 = 0x801BBE10;
D_EBFBE0_801BC110 = 0x801BC110;
D_EBFBE0_801BC410 = 0x801BC410;
D_EBFBE0_801BC710 = 0x801BC710;
D_EBFBE0_801BCA10 = 0x801BCA10;
D_EBFBE0_801BCD10 = 0x801BCD10;
D_EBFBE0_801BD010 = 0x801BD010;
D_EBFBE0_801BD310 = 0x801BD310;
D_EBFBE0_801BD610 = 0x801BD610;
D_EBFBE0_801BD910 = 0x801BD910;
D_EBFBE0_801BDF10 = 0x801BDF10;
D_EBFBE0_801BE210 = 0x801BE210;
D_EBFBE0_801BE510 = 0x801BE510;
D_EBFBE0_801BE810 = 0x801BE810;
D_EBFBE0_801BEB10 = 0x801BEB10;
D_EBFBE0_801BEE10 = 0x801BEE10;
D_EBFBE0_801BF110 = 0x801BF110;
D_EBFBE0_801BF410 = 0x801BF410;
D_EBFBE0_801BF710 = 0x801BF710;
D_EBFBE0_801BFA10 = 0x801BFA10;
D_EBFBE0_801BFD10 = 0x801BFD10;
D_EBFBE0_801C0310 = 0x801C0310;
D_EBFBE0_801C0610 = 0x801C0610;
D_EBFBE0_801C0910 = 0x801C0910;
D_EBFBE0_801C0C10 = 0x801C0C10;
D_EBFBE0_801C0F10 = 0x801C0F10;
D_EBFBE0_801C1210 = 0x801C1210;
D_EBFBE0_801C1510 = 0x801C1510;
D_EBFBE0_801C1810 = 0x801C1810;
D_EBFBE0_801C1B10 = 0x801C1B10;
D_EBFBE0_801C1E10 = 0x801C1E10;
D_EBFBE0_801C2110 = 0x801C2110;
D_EBFBE0_801C2710 = 0x801C2710;
D_EBFBE0_801C2A10 = 0x801C2A10;
D_EBFBE0_801C2D10 = 0x801C2D10;
D_EBFBE0_801C3010 = 0x801C3010;
D_EBFBE0_801C3310 = 0x801C3310;
D_EBFBE0_801C3610 = 0x801C3610;
D_EBFBE0_801C3910 = 0x801C3910;
D_EBFBE0_801C3C10 = 0x801C3C10;
D_EBFBE0_801C3F10 = 0x801C3F10;
D_EBFBE0_801C4210 = 0x801C4210;
D_EBFBE0_801C4510 = 0x801C4510;
D_EBFBE0_801C4B10 = 0x801C4B10;
D_EBFBE0_801C4E10 = 0x801C4E10;
D_EBFBE0_801C5110 = 0x801C5110;
D_EBFBE0_801C5410 = 0x801C5410;
D_EBFBE0_801C5710 = 0x801C5710;
D_EBFBE0_801C5A10 = 0x801C5A10;
D_EBFBE0_801C5D10 = 0x801C5D10;
D_EBFBE0_801C6010 = 0x801C6010;
D_EBFBE0_801C6310 = 0x801C6310;
D_EBFBE0_801C6610 = 0x801C6610;
D_EBFBE0_801C6910 = 0x801C6910;
D_EBFBE0_801C6F10 = 0x801C6F10;
D_EBFBE0_801C7210 = 0x801C7210;
D_EBFBE0_801C7510 = 0x801C7510;
D_EBFBE0_801C7810 = 0x801C7810;
D_EBFBE0_801C7B10 = 0x801C7B10;
D_EBFBE0_801C7E10 = 0x801C7E10;
D_EBFBE0_801C8110 = 0x801C8110;
D_EBFBE0_801C8410 = 0x801C8410;
D_EBFBE0_801C8710 = 0x801C8710;
D_EBFBE0_801C8A10 = 0x801C8A10;
D_EBFBE0_801C8D10 = 0x801C8D10;
D_EBFBE0_801C9310 = 0x801C9310;
D_EBFBE0_801C9610 = 0x801C9610;
D_EBFBE0_801C9910 = 0x801C9910;
D_EBFBE0_801C9C10 = 0x801C9C10;
D_EBFBE0_801C9F10 = 0x801C9F10;
D_EBFBE0_801CA210 = 0x801CA210;
D_EBFBE0_801CA510 = 0x801CA510;
D_EBFBE0_801CA810 = 0x801CA810;
D_EBFBE0_801CAB10 = 0x801CAB10;
D_EBFBE0_801CAE10 = 0x801CAE10;
D_EBFBE0_801CB110 = 0x801CB110;
D_EBFBE0_801CB710 = 0x801CB710;
D_EBFBE0_801CBA10 = 0x801CBA10;
D_EBFBE0_801CBD10 = 0x801CBD10;
D_EBFBE0_801CC010 = 0x801CC010;
D_EBFBE0_801CC310 = 0x801CC310;
D_EBFBE0_801CC610 = 0x801CC610;
D_EBFBE0_801CC910 = 0x801CC910;
D_EBFBE0_801CCC10 = 0x801CCC10;
D_EBFBE0_801CCF10 = 0x801CCF10;
D_EBFBE0_801CD210 = 0x801CD210;
D_EBFBE0_801CD510 = 0x801CD510;
D_menu_801B6E50 = 0x801B6E50; // force_migration:True segment:ovl_menu
D_menu_801B7BA0 = 0x801B7BA0;
D_menu_801B827C = 0x801B827C;
D_menu_801B9710 = 0x801B9710;
D_menu_801B9A10 = 0x801B9A10;
D_menu_801B9D10 = 0x801B9D10;
D_menu_801BA010 = 0x801BA010;
D_menu_801BA310 = 0x801BA310;
D_menu_801BA610 = 0x801BA610;
D_menu_801BA910 = 0x801BA910;
D_menu_801BAC10 = 0x801BAC10;
D_menu_801BAF10 = 0x801BAF10;
D_menu_801BB210 = 0x801BB210;
D_menu_801BB510 = 0x801BB510;
D_menu_801BBB10 = 0x801BBB10;
D_menu_801BBE10 = 0x801BBE10;
D_menu_801BC110 = 0x801BC110;
D_menu_801BC410 = 0x801BC410;
D_menu_801BC710 = 0x801BC710;
D_menu_801BCA10 = 0x801BCA10;
D_menu_801BCD10 = 0x801BCD10;
D_menu_801BD010 = 0x801BD010;
D_menu_801BD310 = 0x801BD310;
D_menu_801BD610 = 0x801BD610;
D_menu_801BD910 = 0x801BD910;
D_menu_801BDF10 = 0x801BDF10;
D_menu_801BE210 = 0x801BE210;
D_menu_801BE510 = 0x801BE510;
D_menu_801BE810 = 0x801BE810;
D_menu_801BEB10 = 0x801BEB10;
D_menu_801BEE10 = 0x801BEE10;
D_menu_801BF110 = 0x801BF110;
D_menu_801BF410 = 0x801BF410;
D_menu_801BF710 = 0x801BF710;
D_menu_801BFA10 = 0x801BFA10;
D_menu_801BFD10 = 0x801BFD10;
D_menu_801C0310 = 0x801C0310;
D_menu_801C0610 = 0x801C0610;
D_menu_801C0910 = 0x801C0910;
D_menu_801C0C10 = 0x801C0C10;
D_menu_801C0F10 = 0x801C0F10;
D_menu_801C1210 = 0x801C1210;
D_menu_801C1510 = 0x801C1510;
D_menu_801C1810 = 0x801C1810;
D_menu_801C1B10 = 0x801C1B10;
D_menu_801C1E10 = 0x801C1E10;
D_menu_801C2110 = 0x801C2110;
D_menu_801C2710 = 0x801C2710;
D_menu_801C2A10 = 0x801C2A10;
D_menu_801C2D10 = 0x801C2D10;
D_menu_801C3010 = 0x801C3010;
D_menu_801C3310 = 0x801C3310;
D_menu_801C3610 = 0x801C3610;
D_menu_801C3910 = 0x801C3910;
D_menu_801C3C10 = 0x801C3C10;
D_menu_801C3F10 = 0x801C3F10;
D_menu_801C4210 = 0x801C4210;
D_menu_801C4510 = 0x801C4510;
D_menu_801C4B10 = 0x801C4B10;
D_menu_801C4E10 = 0x801C4E10;
D_menu_801C5110 = 0x801C5110;
D_menu_801C5410 = 0x801C5410;
D_menu_801C5710 = 0x801C5710;
D_menu_801C5A10 = 0x801C5A10;
D_menu_801C5D10 = 0x801C5D10;
D_menu_801C6010 = 0x801C6010;
D_menu_801C6310 = 0x801C6310;
D_menu_801C6610 = 0x801C6610;
D_menu_801C6910 = 0x801C6910;
D_menu_801C6F10 = 0x801C6F10;
D_menu_801C7210 = 0x801C7210;
D_menu_801C7510 = 0x801C7510;
D_menu_801C7810 = 0x801C7810;
D_menu_801C7B10 = 0x801C7B10;
D_menu_801C7E10 = 0x801C7E10;
D_menu_801C8110 = 0x801C8110;
D_menu_801C8410 = 0x801C8410;
D_menu_801C8710 = 0x801C8710;
D_menu_801C8A10 = 0x801C8A10;
D_menu_801C8D10 = 0x801C8D10;
D_menu_801C9310 = 0x801C9310;
D_menu_801C9610 = 0x801C9610;
D_menu_801C9910 = 0x801C9910;
D_menu_801C9C10 = 0x801C9C10;
D_menu_801C9F10 = 0x801C9F10;
D_menu_801CA210 = 0x801CA210;
D_menu_801CA510 = 0x801CA510;
D_menu_801CA810 = 0x801CA810;
D_menu_801CAB10 = 0x801CAB10;
D_menu_801CAE10 = 0x801CAE10;
D_menu_801CB110 = 0x801CB110;
D_menu_801CB710 = 0x801CB710;
D_menu_801CBA10 = 0x801CBA10;
D_menu_801CBD10 = 0x801CBD10;
D_menu_801CC010 = 0x801CC010;
D_menu_801CC310 = 0x801CC310;
D_menu_801CC610 = 0x801CC610;
D_menu_801CC910 = 0x801CC910;
D_menu_801CCC10 = 0x801CCC10;
D_menu_801CCF10 = 0x801CCF10;
D_menu_801CD210 = 0x801CD210;
D_menu_801CD510 = 0x801CD510;
sCurrentPlanetId = 0x801CD954;
// sPlanetsPositions = 0x801CE960; // force_migration:True segment:ovl_menu
linker_scripts/us/symbol_addrs_overlays.txt
+65 -65
View File
@@ -1,34 +1,34 @@
func_DF4260_8018ED78 = 0x8018ED78;
func_DF4260_8018EE84 = 0x8018EE84;
func_DF4260_8018B0B4 = 0x8018B0B4;
func_DF4260_801878D8 = 0x801878D8;
func_DF4260_8018BE7C = 0x8018BE7C;
func_DF4260_8019250C = 0x8019250C;
func_DF4260_80192CB0 = 0x80192CB0;
func_DF4260_80192EA4 = 0x80192EA4;
func_DF4260_801933B4 = 0x801933B4;
func_DF4260_801935CC = 0x801935CC;
D_DF4260_8019B6C0 = 0x8019B6C0;
D_DF4260_8019A008 = 0x8019A008;
func_i1_8018ED78 = 0x8018ED78;
func_i1_8018EE84 = 0x8018EE84;
func_i1_8018B0B4 = 0x8018B0B4;
func_i1_801878D8 = 0x801878D8;
func_i1_8018BE7C = 0x8018BE7C;
func_i1_8019250C = 0x8019250C;
func_i1_80192CB0 = 0x80192CB0;
func_i1_80192EA4 = 0x80192EA4;
func_i1_801933B4 = 0x801933B4;
func_i1_801935CC = 0x801935CC;
D_i1_8019B6C0 = 0x8019B6C0;
D_i1_8019A008 = 0x8019A008;
func_E08400_80187B08 = 0x80187B08;
func_E08400_80188A40 = 0x80188A40;
D_E08400_80195D70 = 0x80195D70;
func_i2_80187B08 = 0x80187B08;
func_i2_80188A40 = 0x80188A40;
D_i2_80195D70 = 0x80195D70;
sOptionCardPosY = 0x801AE570; // type:f32 size:0x18 force_migration:True segment:ovl_menu
sOptionCardTextPosX = 0x801AE588; // type:f32 size:0x18 force_migration:True segment:ovl_menu
sOptionCardTextPosY = 0x801AE5A0; // type:f32 size:0x18 force_migration:True segment:ovl_menu
sOptionCardCurTextPosX = 0x801AE5B8; // type:f32 size:0x18 force_migration:True segment:ovl_menu
sOptionCardCurTextPosY = 0x801AE5D0; // type:f32 size:0x18 force_migration:True segment:ovl_menu
D_EBFBE0_801AE9A0 = 0x801AE9A0; // type:f32 size:0x10 force_migration:True segment:ovl_menu
D_EBFBE0_801AE9B0 = 0x801AE9B0; // type:f32 size:0x10 force_migration:True segment:ovl_menu
D_EBFBE0_801AE9C0 = 0x801AE9C0; // type:s32 size:0xE0 force_migration:True segment:ovl_menu
D_EBFBE0_801AEAA0 = 0x801AEAA0; // type:s32 size:0xA8 force_migration:True segment:ovl_menu
D_EBFBE0_801AEB48 = 0x801AEB48; // type:s32 size:0xA8 force_migration:True segment:ovl_menu
D_EBFBE0_801AED20 = 0x801AED20; // type:f32 size:0x8 force_migration:True segment:ovl_menu
D_EBFBE0_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment:ovl_menu
D_EBFBE0_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu
D_EBFBE0_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu
D_menu_801AE9A0 = 0x801AE9A0; // type:f32 size:0x10 force_migration:True segment:ovl_menu
D_menu_801AE9B0 = 0x801AE9B0; // type:f32 size:0x10 force_migration:True segment:ovl_menu
D_menu_801AE9C0 = 0x801AE9C0; // type:s32 size:0xE0 force_migration:True segment:ovl_menu
D_menu_801AEAA0 = 0x801AEAA0; // type:s32 size:0xA8 force_migration:True segment:ovl_menu
D_menu_801AEB48 = 0x801AEB48; // type:s32 size:0xA8 force_migration:True segment:ovl_menu
D_menu_801AED20 = 0x801AED20; // type:f32 size:0x8 force_migration:True segment:ovl_menu
D_menu_801AEE6C = 0x801AEE6C; // type:s32 size:0x58 force_migration:True segment:ovl_menu
D_menu_801AF25C = 0x801AF25C; // type:f32 size:0x18 force_migration:True segment:ovl_menu
D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment:ovl_menu
func_i3_80187754 = 0x80187754;
func_i3_801932AC = 0x801932AC;
@@ -91,48 +91,48 @@ D_i3_801C2740 = 0x801C2740; //segment:ovl_i3 size:0x28
D_i3_801C2768 = 0x801C2768; //segment:ovl_i3 size:0x38
D_i3_801C27A0 = 0x801C27A0; //segment:ovl_i3 size:0x20
func_E51970_80198594 = 0x80198594;
func_E51970_80193CA4 = 0x80193CA4;
D_E51970_801A03C0 = 0x801A03C0;
D_E51970_8019EE80 = 0x8019EE80;
D_E51970_801A03DC = 0x801A03DC;
func_i4_80198594 = 0x80198594;
func_i4_80193CA4 = 0x80193CA4;
D_i4_801A03C0 = 0x801A03C0;
D_i4_8019EE80 = 0x8019EE80;
D_i4_801A03DC = 0x801A03DC;
func_E6A810_8018E3B0 = 0x8018E3B0;
func_E6A810_8018B720 = 0x8018B720;
func_E6A810_801990DC = 0x801990DC;
func_E6A810_801B6AEC = 0x801B6AEC;
func_E6A810_80189B80 = 0x80189B80;
func_E6A810_8018ADC4 = 0x8018ADC4;
func_E6A810_8018B96C = 0x8018B96C;
func_E6A810_8018BFB0 = 0x8018BFB0;
func_E6A810_8018E3CC = 0x8018E3CC;
func_E6A810_8018E5E8 = 0x8018E5E8;
func_E6A810_8018EFF0 = 0x8018EFF0;
func_E6A810_8018F0D8 = 0x8018F0D8;
func_E6A810_8018FA48 = 0x8018FA48;
func_E6A810_80199F8C = 0x80199F8C;
func_E6A810_801A3E70 = 0x801A3E70;
func_E6A810_801A4660 = 0x801A4660;
func_E6A810_801A4AF8 = 0x801A4AF8;
func_E6A810_801A5E2C = 0x801A5E2C;
func_E6A810_801A6134 = 0x801A6134;
func_E6A810_801A65E0 = 0x801A65E0;
func_E6A810_801A7D98 = 0x801A7D98;
func_E6A810_801B6E20 = 0x801B6E20;
D_E6A810_801BBEE0 = 0x801BBEE0;
D_E6A810_801BA1E8 = 0x801BA1E8;
D_E6A810_801B7584 = 0x801B7584;
D_E6A810_801B7608 = 0x801B7608;
D_E6A810_801B769C = 0x801B769C;
D_E6A810_801BE250 = 0x801BE250;
D_E6A810_801BE258 = 0x801BE258;
D_E6A810_801BE25C = 0x801BE25C;
D_E6A810_801BE274 = 0x801BE274;
D_E6A810_801BE280 = 0x801BE280;
D_E6A810_801BE284 = 0x801BE284;
D_E6A810_801BE29C = 0x801BE29C;
D_E6A810_801BE2FA = 0x801BE2FA;
D_E6A810_801BE2A4 = 0x801BE2A4;
func_i5_8018E3B0 = 0x8018E3B0;
func_i5_8018B720 = 0x8018B720;
func_i5_801990DC = 0x801990DC;
func_i5_801B6AEC = 0x801B6AEC;
func_i5_80189B80 = 0x80189B80;
func_i5_8018ADC4 = 0x8018ADC4;
func_i5_8018B96C = 0x8018B96C;
func_i5_8018BFB0 = 0x8018BFB0;
func_i5_8018E3CC = 0x8018E3CC;
func_i5_8018E5E8 = 0x8018E5E8;
func_i5_8018EFF0 = 0x8018EFF0;
func_i5_8018F0D8 = 0x8018F0D8;
func_i5_8018FA48 = 0x8018FA48;
func_i5_80199F8C = 0x80199F8C;
func_i5_801A3E70 = 0x801A3E70;
func_i5_801A4660 = 0x801A4660;
func_i5_801A4AF8 = 0x801A4AF8;
func_i5_801A5E2C = 0x801A5E2C;
func_i5_801A6134 = 0x801A6134;
func_i5_801A65E0 = 0x801A65E0;
func_i5_801A7D98 = 0x801A7D98;
func_i5_801B6E20 = 0x801B6E20;
D_i5_801BBEE0 = 0x801BBEE0;
D_i5_801BA1E8 = 0x801BA1E8;
D_i5_801B7584 = 0x801B7584;
D_i5_801B7608 = 0x801B7608;
D_i5_801B769C = 0x801B769C;
D_i5_801BE250 = 0x801BE250;
D_i5_801BE258 = 0x801BE258;
D_i5_801BE25C = 0x801BE25C;
D_i5_801BE274 = 0x801BE274;
D_i5_801BE280 = 0x801BE280;
D_i5_801BE284 = 0x801BE284;
D_i5_801BE29C = 0x801BE29C;
D_i5_801BE2FA = 0x801BE2FA;
D_i5_801BE2A4 = 0x801BE2A4;
func_E9F1D0_801888F4 = 0x801888F4;
func_E9F1D0_80197CC4 = 0x80197CC4;
src/main/dmatable.c
+7 -7
View File
@@ -61,13 +61,13 @@ DmaEntry gDmaTable[90] = {
{ SEGMENT_ROM_START(ast_D91F10), { SEGMENT_ROM_START(ast_D91F10), SEGMENT_ROM_END(ast_D91F10) }, false },
{ SEGMENT_ROM_START(ast_DDC010), { SEGMENT_ROM_START(ast_DDC010), SEGMENT_ROM_END(ast_DDC010) }, false },
{ SEGMENT_ROM_START(ast_DE5D50), { SEGMENT_ROM_START(ast_DE5D50), SEGMENT_ROM_END(ast_DE5D50) }, false },
{ SEGMENT_ROM_START(ovl_DF4260), { SEGMENT_ROM_START(ovl_DF4260), SEGMENT_ROM_END(ovl_DF4260) }, false },
{ SEGMENT_ROM_START(ovl_E08400), { SEGMENT_ROM_START(ovl_E08400), SEGMENT_ROM_END(ovl_E08400) }, false },
{ SEGMENT_ROM_START(ovl_i1), { SEGMENT_ROM_START(ovl_i1), SEGMENT_ROM_END(ovl_i1) }, false },
{ SEGMENT_ROM_START(ovl_i2), { SEGMENT_ROM_START(ovl_i2), SEGMENT_ROM_END(ovl_i2) }, false },
{ SEGMENT_ROM_START(ovl_i3), { SEGMENT_ROM_START(ovl_i3), SEGMENT_ROM_END(ovl_i3) }, false },
{ SEGMENT_ROM_START(ovl_E51970), { SEGMENT_ROM_START(ovl_E51970), SEGMENT_ROM_END(ovl_E51970) }, false },
{ SEGMENT_ROM_START(ovl_E6A810), { SEGMENT_ROM_START(ovl_E6A810), SEGMENT_ROM_END(ovl_E6A810) }, false },
{ SEGMENT_ROM_START(ovl_E9F1D0), { SEGMENT_ROM_START(ovl_E9F1D0), SEGMENT_ROM_END(ovl_E9F1D0) }, false },
{ SEGMENT_ROM_START(ovl_i4), { SEGMENT_ROM_START(ovl_i4), SEGMENT_ROM_END(ovl_i4) }, false },
{ SEGMENT_ROM_START(ovl_i5), { SEGMENT_ROM_START(ovl_i5), SEGMENT_ROM_END(ovl_i5) }, false },
{ SEGMENT_ROM_START(ovl_i6), { SEGMENT_ROM_START(ovl_i6), SEGMENT_ROM_END(ovl_i6) }, false },
{ SEGMENT_ROM_START(ovl_menu), { SEGMENT_ROM_START(ovl_menu), SEGMENT_ROM_END(ovl_menu) }, false },
{ SEGMENT_ROM_START(ovl_EF0260), { SEGMENT_ROM_START(ovl_EF0260), SEGMENT_ROM_END(ovl_EF0260) }, false },
{ SEGMENT_ROM_START(ovl_EFFA40), { SEGMENT_ROM_START(ovl_EFFA40), SEGMENT_ROM_END(ovl_EFFA40) }, false },
{ SEGMENT_ROM_START(ovl_ending), { SEGMENT_ROM_START(ovl_ending), SEGMENT_ROM_END(ovl_ending) }, false },
{ SEGMENT_ROM_START(ovl_unused), { SEGMENT_ROM_START(ovl_unused), SEGMENT_ROM_END(ovl_unused) }, false },
};
src/main/fox_360.c
+14 -14
View File
@@ -108,35 +108,35 @@ void func_8002E548(void) {
}
void func_8002E5E0(Boss* boss) {
func_E51970_80187520(91, boss);
func_i4_80187520(91, boss);
}
void func_8002E604(Boss* boss) {
func_E51970_80187520(92, boss);
func_i4_80187520(92, boss);
}
void func_8002E628(Boss* boss) {
func_E51970_80187520(93, boss);
func_i4_80187520(93, boss);
}
void func_8002E64C(Boss* boss) {
func_E51970_80187520(94, boss);
func_i4_80187520(94, boss);
}
void func_8002E670(Actor* actor) {
func_E51970_80187520(95, actor);
func_i4_80187520(95, actor);
}
void func_8002E694(Actor* actor) {
func_E51970_80187520(96, actor);
func_i4_80187520(96, actor);
}
void func_8002E6B8(Actor* actor) {
func_E51970_80187520(97, actor);
func_i4_80187520(97, actor);
}
void func_8002E6DC(Actor* actor) {
func_E51970_80187520(98, actor);
func_i4_80187520(98, actor);
}
void func_8002E700(Player* player) {
@@ -671,16 +671,16 @@ void func_8003010C(Actor* actor) {
D_8015F928++;
switch (gCurrentLevel) {
case LEVEL_FORTUNA:
func_E51970_80187960(actor);
func_i4_80187960(actor);
break;
case LEVEL_KATINA:
func_E51970_80198594(actor);
func_i4_80198594(actor);
break;
case LEVEL_BOLSE:
func_E51970_8018C158(actor);
func_i4_8018C158(actor);
break;
case LEVEL_SECTOR_Z:
func_E51970_8019AB8C(actor);
func_i4_8019AB8C(actor);
break;
case LEVEL_VENOM_2:
func_E9F1D0_80196314(actor);
@@ -833,7 +833,7 @@ void func_8003088C(Actor* arg0) {
if (arg0->unk_0CE <= 0) {
arg0->unk_0CE = 0;
if (arg0->unk_0E4 == 200) {
func_E51970_80199900(arg0, 1);
func_i4_80199900(arg0, 1);
if (arg0->unk_0D4 == 1) {
if (gActors[8].obj.status == 2) {
func_800BA808(gMsg_ID_16140, RCID_KATT);
@@ -1369,7 +1369,7 @@ void func_800319AC(Actor* this) {
sp104 = 2;
break;
case 5:
func_E51970_80199C60(this);
func_i4_80199C60(this);
sp104 = 1;
break;
case 0:
src/main/fox_43E80.c
+77 -80
View File
@@ -17,8 +17,8 @@ typedef struct {
/* 0x6C */ f32 unk_6C;
/* 0x70 */ f32 unk_70;
/* 0x74 */ f32 unk_74;
} UnkStruct_D_E6A810_801BE250; // probably fake. investigate later.
extern UnkStruct_D_E6A810_801BE250 D_E6A810_801BE250;
} UnkStruct_D_i5_801BE250; // probably fake. investigate later.
extern UnkStruct_D_i5_801BE250 D_i5_801BE250;
static u8 D_800C9F00 = 0;
static u8 D_800C9F04 = 0;
@@ -33,14 +33,14 @@ static f32 D_800C9F28 = 0.0f;
Vec3f D_800C9F2C = { 0.0f, 0.0f, 0.0f };
static s32 D_800C9F38 = 0; // unused
extern f32 D_E6A810_801BE258;
extern f32 D_E6A810_801BE25C;
extern f32 D_E6A810_801BE274;
extern f32 D_E6A810_801BE280;
extern f32 D_E6A810_801BE284;
extern f32 D_E6A810_801BE29C;
extern f32 D_E6A810_801BE2A4;
extern s16 D_E6A810_801BE2FA;
extern f32 D_i5_801BE258;
extern f32 D_i5_801BE25C;
extern f32 D_i5_801BE274;
extern f32 D_i5_801BE280;
extern f32 D_i5_801BE284;
extern f32 D_i5_801BE29C;
extern f32 D_i5_801BE2A4;
extern s16 D_i5_801BE2FA;
void func_80043280(u16* text0, u16* text1, f32 zRot) {
s32 py;
@@ -93,18 +93,18 @@ void func_80043468(Player* player) {
sp50 += player->unk_17C * 0.5f;
sp4C += player->unk_17C * -5.0f;
if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_E6A810_801BA1E8 == 102)) {
if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) {
sp50 = player->pos.y + 45.0f + (-player->unk_0E4 * 5.0f);
sp4C = player->pos.y + 200.0f + (player->unk_0E4 * 10.0f);
sp50 += player->unk_17C * 0.2f;
sp4C += player->unk_17C * -3.0f;
}
if (D_E6A810_801BA1E8 == 99) {
if (D_i5_801BA1E8 == 99) {
sp50 = player->pos.y + 40.0f + (-player->unk_0E4 * 5.0f);
sp4C = player->pos.y + 200.0f + (player->unk_0E4 * 10.0f);
sp50 += player->unk_17C * 0.2f;
sp4C += player->unk_17C * -3.0f;
} else if (D_E6A810_801BA1E8 == 98) {
} else if (D_i5_801BA1E8 == 98) {
sp50 = player->pos.y + 100.0f;
sp4C = player->pos.y + (player->unk_0E4 * 10.0f);
sp4C += player->unk_17C * -3.0f;
@@ -113,10 +113,10 @@ void func_80043468(Player* player) {
sp50 = player->pos.y + 50.0f;
sp4C = player->pos.y;
if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_E6A810_801BA1E8 == 102)) {
if (0 || (gCurrentLevel == LEVEL_MACBETH) && (D_i5_801BA1E8 == 102)) {
sp4C = player->pos.y + 150.0f;
}
if (D_E6A810_801BA1E8 == 0x63) {
if (D_i5_801BA1E8 == 0x63) {
sp4C = player->pos.y + 150.0f;
}
}
@@ -198,8 +198,8 @@ void func_80043B18(Player* player) {
func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
} else {
if (!(gFrameCount & 1)) {
func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.3f);
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.3f);
}
if (!(gFrameCount & 3)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, 2.0f,
@@ -217,8 +217,8 @@ void func_80043B18(Player* player) {
}
} else {
if (!(gFrameCount & 1)) {
func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z,
@@ -235,8 +235,8 @@ void func_80043B18(Player* player) {
}
} else {
if (!(gFrameCount & 1)) {
func_E6A810_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z,
@@ -328,16 +328,16 @@ void func_800444BC(Player* player) {
sp40 = sp3C = 0.0f;
sp38 = gGroundLevel;
if (D_801784AC == 4) {
func_E6A810_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C);
func_i5_801B6E20(player->pos.x, player->unk_138 + player->unk_144, &sp40, &sp38, &sp3C);
}
if (gCurrentLevel == LEVEL_MACBETH) {
D_E6A810_801BE250.unk_6C = gGroundLevel;
D_E6A810_801BE250.unk_70 = D_E6A810_801BE250.unk_74 = 0.0f;
D_i5_801BE250.unk_6C = gGroundLevel;
D_i5_801BE250.unk_70 = D_i5_801BE250.unk_74 = 0.0f;
D_800C9F10 = 0.0f;
func_80047754(player);
sp38 = D_E6A810_801BE250.unk_6C;
sp40 = D_E6A810_801BE250.unk_70;
sp3C = D_E6A810_801BE250.unk_74;
sp38 = D_i5_801BE250.unk_6C;
sp40 = D_i5_801BE250.unk_70;
sp3C = D_i5_801BE250.unk_74;
}
if ((player->pos.y - sp30) < sp38) {
if (player->vel.y < -10.0f) {
@@ -832,7 +832,7 @@ void func_80046358(Player* player) {
player->unk_248 = 0.0f;
player->unk_24C = 0.0f;
player->unk_070 = 0.0f;
func_E6A810_801B6E20(player->unk_064, player->unk_06C + player->unk_144, &spD4, &spD0, &spCC);
func_i5_801B6E20(player->unk_064, player->unk_06C + player->unk_144, &spD4, &spD0, &spCC);
player->unk_068 = spD0 + 2.0f;
player->unk_248 = spD4;
player->unk_24C = spCC;
@@ -862,16 +862,16 @@ void func_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 a
sp80 = sp64.y + arg3;
sp7C = sp64.z + arg4;
if (func_800A8054(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
if (D_E6A810_801BE250.unk_6C < arg3 + sp58.y) {
D_E6A810_801BE250.unk_6C = arg3 + sp58.y;
if (D_i5_801BE250.unk_6C < arg3 + sp58.y) {
D_i5_801BE250.unk_6C = arg3 + sp58.y;
if (arg1 == OBJ_80_67) {
player->unk_1DC = 0;
D_800C9F04 = 1;
}
}
D_E6A810_801BE250.unk_70 = sp58.x;
D_E6A810_801BE250.unk_74 = sp58.z;
} else if ((arg1 == OBJ_80_67) && (D_E6A810_801BE250.unk_6C == 0.0f) &&
D_i5_801BE250.unk_70 = sp58.x;
D_i5_801BE250.unk_74 = sp58.z;
} else if ((arg1 == OBJ_80_67) && (D_i5_801BE250.unk_6C == 0.0f) &&
func_800A8054(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
player->unk_1DC = 9;
player->timer_1E8 = 15;
@@ -918,9 +918,9 @@ void func_80046704(Player* player) {
if (((player->pos.x - 820.0f) <= obj80->obj.pos.x) && (obj80->obj.pos.x <= (player->pos.x + 820.0f)) &&
((player->pos.y - 50.0f) <= obj80->obj.pos.y) && (obj80->obj.pos.y <= (player->pos.y + 50.0f)) &&
(player->unk_138 <= obj80->obj.pos.z) && (obj80->obj.pos.z <= (player->unk_138 + 960.0f))) {
D_E6A810_801BE250.unk_6C = obj80->obj.pos.y;
D_i5_801BE250.unk_6C = obj80->obj.pos.y;
player->unk_064 = player->pos.x;
player->unk_068 = D_E6A810_801BE250.unk_6C - 3.0f;
player->unk_068 = D_i5_801BE250.unk_6C - 3.0f;
}
}
if ((obj80->obj.id == OBJ_80_59) || (obj80->obj.id == OBJ_80_60) || (obj80->obj.id == OBJ_80_61) ||
@@ -970,7 +970,7 @@ void func_80046704(Player* player) {
if (!(((player->pos.x - 210.0f) <= obj80->obj.pos.x) &&
(obj80->obj.pos.x <= (player->pos.x + 210.0f))) &&
(D_E6A810_801BE250.unk_6C == 0.f) && (player->vel.y < 0.f)) {
(D_i5_801BE250.unk_6C == 0.f) && (player->vel.y < 0.f)) {
player->unk_1DC = 9;
player->timer_1E8 = 15;
if ((player->pos.x - 200.0f) <= obj80->obj.pos.x) {
@@ -980,7 +980,7 @@ void func_80046704(Player* player) {
}
} else {
D_800C9F04 = 1;
D_E6A810_801BE250.unk_6C = obj80->obj.pos.y + 206.0f;
D_i5_801BE250.unk_6C = obj80->obj.pos.y + 206.0f;
player->unk_1DC = 0;
}
}
@@ -990,10 +990,10 @@ void func_80046704(Player* player) {
(obj80->obj.pos.z <= (player->unk_138 + 220.0f)) && (player->pos.y >= 200.0f)) {
player->unk_068 = obj80->obj.pos.y + 204.0f;
}
} else if ((obj80->obj.id == OBJ_80_105) && func_E6A810_801A3C20(player->unk_138)) {
if (((player->pos.x - 200.0f) < D_E6A810_801BE250.unk_54) &&
(D_E6A810_801BE250.unk_54 < (player->pos.x + 200.0f))) {
player->unk_068 = D_E6A810_801BE250.unk_58 - 1.0f;
} else if ((obj80->obj.id == OBJ_80_105) && func_i5_801A3C20(player->unk_138)) {
if (((player->pos.x - 200.0f) < D_i5_801BE250.unk_54) &&
(D_i5_801BE250.unk_54 < (player->pos.x + 200.0f))) {
player->unk_068 = D_i5_801BE250.unk_58 - 1.0f;
}
}
}
@@ -1183,49 +1183,46 @@ void func_80047504(Player* player) {
void func_80047754(Player* player) {
u8 sp2F = false;
if ((D_E6A810_801BE2FA == 0) && (func_E6A810_801A3300(player, player->unk_138, player->unk_0E8) == 0)) {
if (((player->pos.x - 110.0f) < D_E6A810_801BE274) && (D_E6A810_801BE274 < (player->pos.x + 110.0f)) &&
((player->pos.y - 60.0f) < (D_E6A810_801BE258 + 30.0f)) &&
((D_E6A810_801BE258 + 30.0f) < (player->pos.y + 60.f))) {
func_80047D38(player, D_E6A810_801BE258 + 29.0f);
player->unk_0E4 = D_E6A810_801BE25C;
if ((D_i5_801BE2FA == 0) && (func_i5_801A3300(player, player->unk_138, player->unk_0E8) == 0)) {
if (((player->pos.x - 110.0f) < D_i5_801BE274) && (D_i5_801BE274 < (player->pos.x + 110.0f)) &&
((player->pos.y - 60.0f) < (D_i5_801BE258 + 30.0f)) && ((D_i5_801BE258 + 30.0f) < (player->pos.y + 60.f))) {
func_80047D38(player, D_i5_801BE258 + 29.0f);
player->unk_0E4 = D_i5_801BE25C;
func_80047FBC(player);
sp2F = true;
} else if (((player->pos.x - 150.0f) < D_E6A810_801BE274) && (D_E6A810_801BE274 < (player->pos.x + 150.0f)) &&
((player->pos.y - 60.0f) < (D_E6A810_801BE258 + 30.0f)) &&
((D_E6A810_801BE258 + 30.0f) < (player->pos.y + 60.0f))) {
func_80047E7C(player, D_E6A810_801BE274, D_E6A810_801BE258 + 30.0f);
} else if (((player->pos.x - 150.0f) < D_i5_801BE274) && (D_i5_801BE274 < (player->pos.x + 150.0f)) &&
((player->pos.y - 60.0f) < (D_i5_801BE258 + 30.0f)) &&
((D_i5_801BE258 + 30.0f) < (player->pos.y + 60.0f))) {
func_80047E7C(player, D_i5_801BE274, D_i5_801BE258 + 30.0f);
}
}
if (func_E6A810_801A3C20(player->unk_138)) {
player->unk_0E4 = D_E6A810_801BE250.unk_5C;
if (((player->pos.x - 200.0f) < D_E6A810_801BE250.unk_54) &&
(D_E6A810_801BE250.unk_54 < (player->pos.x + 200.0f))) {
if (((player->pos.y - 60.0f) < D_E6A810_801BE250.unk_58) &&
(D_E6A810_801BE250.unk_58 < (player->pos.y + 60.0f))) {
func_80047D38(player, D_E6A810_801BE250.unk_58);
if (func_i5_801A3C20(player->unk_138)) {
player->unk_0E4 = D_i5_801BE250.unk_5C;
if (((player->pos.x - 200.0f) < D_i5_801BE250.unk_54) && (D_i5_801BE250.unk_54 < (player->pos.x + 200.0f))) {
if (((player->pos.y - 60.0f) < D_i5_801BE250.unk_58) && (D_i5_801BE250.unk_58 < (player->pos.y + 60.0f))) {
func_80047D38(player, D_i5_801BE250.unk_58);
} else {
if ((100.0f < (D_E6A810_801BE250.unk_58 - player->pos.y)) &&
((D_E6A810_801BE250.unk_58 - player->pos.y) < 130.0f)) {
if ((100.0f < (D_i5_801BE250.unk_58 - player->pos.y)) &&
((D_i5_801BE250.unk_58 - player->pos.y) < 130.0f)) {
player->unk_0A0 = 999.0f;
player->pos.y = player->unk_090.y - 1.0f;
}
goto label_29;
}
if (!(((player->pos.x - 65.0f) < D_E6A810_801BE250.unk_54) &&
(D_E6A810_801BE250.unk_54 < (player->pos.x + 65.0f)))) {
if (!(((player->pos.x - 100.0f) < D_E6A810_801BE250.unk_54) &&
(D_E6A810_801BE250.unk_54 < (player->pos.x + 100.0f)))) {
if (!(((player->pos.x - 65.0f) < D_i5_801BE250.unk_54) &&
(D_i5_801BE250.unk_54 < (player->pos.x + 65.0f)))) {
if (!(((player->pos.x - 100.0f) < D_i5_801BE250.unk_54) &&
(D_i5_801BE250.unk_54 < (player->pos.x + 100.0f)))) {
player->unk_1D4 = 9;
Math_SmoothStepToF(&player->pos.y, D_E6A810_801BE250.unk_58 + 100.0f, 0.5f, 20.0f, 0);
Math_SmoothStepToF(&player->pos.y, D_i5_801BE250.unk_58 + 100.0f, 0.5f, 20.0f, 0);
player->vel.y = 2.0f;
Math_SmoothStepToF(&player->unk_0E8, 0.0f, 0.5f, 20.0f, 0);
Math_SmoothStepToF(&player->pos.x, D_E6A810_801BE2A4, 0.02f, 30.0f, 0);
Math_SmoothStepToF(&player->pos.x, D_i5_801BE2A4, 0.02f, 30.0f, 0);
Math_SmoothStepToF(&player->unk_12C, -30.0f, 1.0f, 10.0f, 0);
D_E6A810_801BE284 += 0; // fake?
D_i5_801BE284 += 0; // fake?
}
player->unk_188 = 0;
if (player->pos.x < D_E6A810_801BE250.unk_54) {
if (player->pos.x < D_i5_801BE250.unk_54) {
player->vel.x = 0.0f;
player->pos.x += 8.0f;
} else {
@@ -1237,21 +1234,21 @@ void func_80047754(Player* player) {
}
label_29:
if (((D_E6A810_801BE2FA == 1) || (player->unk_138 < -116467.875f)) &&
(func_E6A810_801A3790(player, player->unk_138, player->unk_0E8) == 0)) {
if (((player->pos.x - 110.0f) < D_E6A810_801BE29C) && (D_E6A810_801BE29C < (player->pos.x + 110.0f)) &&
((player->pos.y - 60.0f) < (D_E6A810_801BE280 + 30.0f)) &&
((D_E6A810_801BE280 + 30.0f) < (player->pos.y + 60.0f))) {
if (((D_i5_801BE2FA == 1) || (player->unk_138 < -116467.875f)) &&
(func_i5_801A3790(player, player->unk_138, player->unk_0E8) == 0)) {
if (((player->pos.x - 110.0f) < D_i5_801BE29C) && (D_i5_801BE29C < (player->pos.x + 110.0f)) &&
((player->pos.y - 60.0f) < (D_i5_801BE280 + 30.0f)) &&
((D_i5_801BE280 + 30.0f) < (player->pos.y + 60.0f))) {
sp2F = true;
func_80047D38(player, D_E6A810_801BE280 + 29.0f);
player->unk_0E4 = D_E6A810_801BE284; // not fake, but weird
player->unk_0E4 = D_E6A810_801BE284;
func_80047D38(player, D_i5_801BE280 + 29.0f);
player->unk_0E4 = D_i5_801BE284; // not fake, but weird
player->unk_0E4 = D_i5_801BE284;
func_80047FBC(player);
} else {
if (((player->pos.x - 150.0f) < D_E6A810_801BE29C) && (D_E6A810_801BE29C < (player->pos.x + 150.0f)) &&
((player->pos.y - 60.0f) < (D_E6A810_801BE280 + 30.0f)) &&
((D_E6A810_801BE280 + 30.0f) < (player->pos.y + 60.0f))) {
func_80047E7C(player, D_E6A810_801BE29C, D_E6A810_801BE280 + 30.0f);
if (((player->pos.x - 150.0f) < D_i5_801BE29C) && (D_i5_801BE29C < (player->pos.x + 150.0f)) &&
((player->pos.y - 60.0f) < (D_i5_801BE280 + 30.0f)) &&
((D_i5_801BE280 + 30.0f) < (player->pos.y + 60.0f))) {
func_80047E7C(player, D_i5_801BE29C, D_i5_801BE280 + 30.0f);
}
}
}
src/main/fox_beam.c
+3 -3
View File
@@ -878,7 +878,7 @@ void func_80038140(PlayerShot* shot) {
}
}
}
if ((D_801784AC == 4) && func_E6A810_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20)) {
if ((D_801784AC == 4) && func_i5_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20)) {
func_80036318(shot);
if (shot->obj.id != PLAYERSHOT_4) {
func_8007A900(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0);
@@ -1918,9 +1918,9 @@ void func_8003C4D0(PlayerShot* shot, s32 unkD6) {
}
}
if (gCurrentLevel == LEVEL_MACBETH) {
func_E6A810_801AD144(shot);
func_i5_801AD144(shot);
} else if (gCurrentLevel == LEVEL_VENOM_1) {
func_DF4260_8019864C(shot);
func_i1_8019864C(shot);
} else {
func_8003C008(shot);
}
src/main/fox_bg.c
+1 -1
View File
@@ -795,7 +795,7 @@ void func_80040CE4(void) {
return;
}
if ((gCurrentLevel == LEVEL_BOLSE) && (D_800C9C34 != 0)) {
func_E51970_80192264();
func_i4_80192264();
return;
}
sp1D4 = 0.0f;
src/main/fox_demo.c
+5 -5
View File
@@ -131,7 +131,7 @@ AnimationHeader* D_800CA1F4[] = {
D_60265B4, D_602B8DC, D_60034C4, D_602A2CC, D_602CEB4, D_602B778, (AnimationHeader*) 0x0601F3B8,
};
extern void func_E6A810_8018769C(Player*);
extern void func_i5_8018769C(Player*);
extern void func_801882CC(Player*, OSContPad**, OSContPad**);
extern void func_8018CD8C(Player*);
extern void func_8018DA58(Actor*);
@@ -160,7 +160,7 @@ extern void func_8019FF00(Actor*);
extern void func_E9F1D0_801A0AC0(Player*);
extern void func_801A8BE8(Actor*);
extern void func_801AB9B0(Player*);
extern void func_E6A810_801AC754(Player*);
extern void func_i5_801AC754(Player*);
extern void func_801AF8F4(Player*, OSContPad**, OSContPad**);
extern void func_801B28BC(Actor*);
extern void func_801B3D04(Player*, OSContPad**, OSContPad**);
@@ -712,7 +712,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_TITANIA:
func_E6A810_8018769C(player);
func_i5_8018769C(player);
func_800AA800(player);
break;
@@ -721,7 +721,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_MACBETH:
func_E6A810_801AC754(player);
func_i5_801AC754(player);
break;
case LEVEL_SECTOR_Y:
@@ -1402,7 +1402,7 @@ void func_8004B368(Player* player) {
}
void func_8004C90C(Player* player) {
func_E51970_80187520(90, player);
func_i4_80187520(90, player);
}
void func_8004C930(Player* player) {
src/main/fox_display.c
+1 -1
View File
@@ -1594,7 +1594,7 @@ void func_80057D00(void) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
func_E6A810_801B58AC(&gMasterDisp, D_80177CC8);
func_i5_801B58AC(&gMasterDisp, D_80177CC8);
D_80177CC8 = 0.0f;
Matrix_Pop(&gGfxMatrix);
} else if (D_80161A88 != 2) {
src/main/fox_edata_1C.c
+150 -150
View File
@@ -1,300 +1,300 @@
#include "global.h"
// these are overlay functions. They will need to be replaced with their proper overlay names given below them.
// func_DF4260_801875A4
// func_i1_801875A4
void func_801875A4(Object*);
// func_DF4260_80189058
// func_i1_80189058
void func_80189058(Object*);
// func_DF4260_8018AA74
// func_i1_8018AA74
void func_8018AA74(Object*);
// func_DF4260_8018AED0
// func_i1_8018AED0
void func_8018AED0(Object*);
// func_DF4260_8018B15C
// func_i1_8018B15C
void func_8018B15C(Object*);
// func_DF4260_8018B418
// func_i1_8018B418
void func_8018B418(Object*);
// func_DF4260_8018B58C
// func_i1_8018B58C
void func_8018B58C(Object*);
// func_DF4260_8018BAAC
// func_i1_8018BAAC
void func_8018BAAC(Object*);
// func_DF4260_8018BBA4
// func_i1_8018BBA4
void func_8018BBA4(Object*);
// func_DF4260_8018BBF8
// func_i1_8018BBF8
void func_8018BBF8(Object*);
// func_DF4260_8018BD7C
// func_i1_8018BD7C
void func_8018BD7C(Object*);
// func_DF4260_8018C19C
// func_i1_8018C19C
void func_8018C19C(Object*);
// func_DF4260_8018DDAC
// func_i1_8018DDAC
void func_8018DDAC(Object*);
// func_DF4260_8018E290
// func_i1_8018E290
void func_8018E290(Object*);
// func_DF4260_8018E76C
// func_i1_8018E76C
void func_8018E76C(Object*);
// func_DF4260_8018ECAC
// func_i1_8018ECAC
void func_8018ECAC(Object*);
// func_DF4260_8018ED78
// func_i1_8018ED78
void func_8018ED78(Object*);
// func_DF4260_8018EE84
// func_i1_8018EE84
void func_8018EE84(Object*);
// func_DF4260_8018EF90
// func_i1_8018EF90
void func_8018EF90(Object*);
// func_DF4260_8018F044
// func_i1_8018F044
void func_8018F044(Object*);
// func_DF4260_8018F31C
// func_i1_8018F31C
void func_8018F31C(Object*);
// func_DF4260_801922DC
// func_i1_801922DC
void func_801922DC(Object*);
// func_DF4260_80192358
// func_i1_80192358
void func_80192358(Object*);
// func_DF4260_801923C0
// func_i1_801923C0
void func_801923C0(Object*);
// func_DF4260_8019243C
// func_i1_8019243C
void func_8019243C(Object*);
// func_DF4260_80192518
// func_i1_80192518
void func_80192518(Object*);
// func_DF4260_80192CD4
// func_i1_80192CD4
void func_80192CD4(Object*);
// func_DF4260_80192E2C
// func_i1_80192E2C
void func_80192E2C(Object*);
// func_DF4260_80192EB0
// func_i1_80192EB0
void func_80192EB0(Object*);
// func_DF4260_801933DC
// func_i1_801933DC
void func_801933DC(Object*);
// func_DF4260_801934D0
// func_i1_801934D0
void func_801934D0(Object*);
// func_DF4260_80193540
// func_i1_80193540
void func_80193540(Object*);
// func_DF4260_80194398
// func_i1_80194398
void func_80194398(Object*);
// func_DF4260_801985E4
// func_i1_801985E4
void func_801985E4(Object*);
// func_DF4260_80198968
// func_i1_80198968
void func_80198968(Object*);
// func_E08400_8018756C
// func_i2_8018756C
void func_8018756C(Object*);
// func_E08400_80187650
// func_i2_80187650
void func_80187650(Object*);
// func_E08400_801877C4
// func_i2_801877C4
void func_801877C4(Object*);
// func_E08400_8018795C
// func_i2_8018795C
void func_8018795C(Object*);
// func_E08400_80188344
// func_i2_80188344
void func_80188344(Object*);
// func_E08400_801887D0
// func_i2_801887D0
void func_801887D0(Object*);
// func_E08400_80188CAC
// func_i2_80188CAC
void func_80188CAC(Object*);
// func_E08400_80188FAC
// func_i2_80188FAC
void func_80188FAC(Object*);
// func_E08400_80189114
// func_i2_80189114
void func_80189114(Object*);
// func_E08400_8018978C
// func_i2_8018978C
void func_8018978C(Object*);
// func_E08400_8018BACC
// func_i2_8018BACC
void func_8018BACC(Object*);
// func_E08400_8018D9EC
// func_i2_8018D9EC
void func_8018D9EC(Object*);
// func_E08400_8018DA6C
// func_i2_8018DA6C
void func_8018DA6C(Object*);
// func_E08400_8018DAEC
// func_i2_8018DAEC
void func_8018DAEC(Object*);
// func_E08400_8018DB6C
// func_i2_8018DB6C
void func_8018DB6C(Object*);
// func_E08400_8018DBEC
// func_i2_8018DBEC
void func_8018DBEC(Object*);
// func_E08400_8018DCE4
// func_i2_8018DCE4
void func_8018DCE4(Object*);
// func_E08400_8018DE14
// func_i2_8018DE14
void func_8018DE14(Object*);
// func_E08400_8018F330
// func_i2_8018F330
void func_8018F330(Object*);
// func_E08400_8018F884
// func_i2_8018F884
void func_8018F884(Object*);
// func_E08400_8018FE38
// func_i2_8018FE38
void func_8018FE38(Object*);
// func_E08400_8018FF20
// func_i2_8018FF20
void func_8018FF20(Object*);
// func_E08400_8018FF84
// func_i2_8018FF84
void func_8018FF84(Object*);
// func_E08400_80190020
// func_i2_80190020
void func_80190020(Object*);
// func_E08400_80190078
// func_i2_80190078
void func_80190078(Object*);
// func_E08400_80193434
// func_i2_80193434
void func_80193434(Object*);
// func_E51970_80188AD0
// func_i4_80188AD0
void func_80188AD0(Object*);
// func_E51970_80188FE4
// func_i4_80188FE4
void func_80188FE4(Object*);
// func_E51970_80191054
// func_i4_80191054
void func_80191054(Object*);
// func_E51970_80191180
// func_i4_80191180
void func_80191180(Object*);
// func_E51970_801912FC
// func_i4_801912FC
void func_801912FC(Object*);
// func_E51970_80191AFC
// func_i4_80191AFC
void func_80191AFC(Object*);
// func_E51970_80192984
// func_i4_80192984
void func_80192984(Object*);
// func_E51970_80192A68
// func_i4_80192A68
void func_80192A68(Object*);
// func_E51970_80193718
// func_i4_80193718
void func_80193718(Object*);
// func_E51970_80193B1C
// func_i4_80193B1C
void func_80193B1C(Object*);
// func_E51970_801946C4
// func_i4_801946C4
void func_801946C4(Object*);
// func_E51970_801968F4
// func_i4_801968F4
void func_801968F4(Object*);
// func_E51970_8019E234
// func_i4_8019E234
void func_8019E234(Object*);
// func_E51970_8019E3A8
// func_i4_8019E3A8
void func_8019E3A8(Object*);
// func_E51970_8019E454
// func_i4_8019E454
void func_8019E454(Object*);
// func_E51970_8019E98C
// func_i4_8019E98C
void func_8019E98C(Object*);
// func_E6A810_80188F60
// func_i5_80188F60
void func_80188F60(Object*);
// func_E6A810_80188FA8
// func_i5_80188FA8
void func_80188FA8(Object*);
// func_E6A810_80189194
// func_i5_80189194
void func_80189194(Object*);
// func_E6A810_801895B8
// func_i5_801895B8
void func_801895B8(Object*);
// func_E6A810_80189AFC
// func_i5_80189AFC
void func_80189AFC(Object*);
// func_E6A810_80189CC8
// func_i5_80189CC8
void func_80189CC8(Object*);
// func_E6A810_8018A1C0
// func_i5_8018A1C0
void func_8018A1C0(Object*);
// func_E6A810_8018A544
// func_i5_8018A544
void func_8018A544(Object*);
// func_E6A810_8018AABC
// func_i5_8018AABC
void func_8018AABC(Object*);
// func_E6A810_8018AB44
// func_i5_8018AB44
void func_8018AB44(Object*);
// func_E6A810_8018B268
// func_i5_8018B268
void func_8018B268(Object*);
// func_E6A810_8018B6AC
// func_i5_8018B6AC
void func_8018B6AC(Object*);
// func_E6A810_8018B9D0
// func_i5_8018B9D0
void func_8018B9D0(Object*);
// func_E6A810_8018BE84
// func_i5_8018BE84
void func_8018BE84(Object*);
// func_E6A810_8018C8A8
// func_i5_8018C8A8
void func_8018C8A8(Object*);
// func_E6A810_8018E2D8
// func_i5_8018E2D8
void func_8018E2D8(Object*);
// func_E6A810_8018E54C
// func_i5_8018E54C
void func_8018E54C(Object*);
// func_E6A810_8018E5B4
// func_i5_8018E5B4
void func_8018E5B4(Object*);
// func_E6A810_8018E5F8
// func_i5_8018E5F8
void func_8018E5F8(Object*);
// func_E6A810_8018EF14
// func_i5_8018EF14
void func_8018EF14(Object*);
// func_E6A810_8018F038
// func_i5_8018F038
void func_8018F038(Object*);
// func_E6A810_8018F4D8
// func_i5_8018F4D8
void func_8018F4D8(Object*);
// func_E6A810_8018F8B8
// func_i5_8018F8B8
void func_8018F8B8(Object*);
// func_E6A810_80197A94
// func_i5_80197A94
void func_80197A94(Object*);
// func_E6A810_801982A8
// func_i5_801982A8
void func_801982A8(Object*);
// func_E6A810_8019C778
// func_i5_8019C778
void func_8019C778(Object*);
// func_E6A810_8019CE88
// func_i5_8019CE88
void func_8019CE88(Object*);
// func_E6A810_8019D700
// func_i5_8019D700
void func_8019D700(Object*);
// func_E6A810_8019E410
// func_i5_8019E410
void func_8019E410(Object*);
// func_E6A810_8019EA60
// func_i5_8019EA60
void func_8019EA60(Object*);
// func_E6A810_8019EE68
// func_i5_8019EE68
void func_8019EE68(Object*);
// func_E6A810_8019FF9C
// func_i5_8019FF9C
void func_8019FF9C(Object*);
// func_E6A810_801A0BD8
// func_i5_801A0BD8
void func_801A0BD8(Object*);
// func_E6A810_801A12C4
// func_i5_801A12C4
void func_801A12C4(Object*);
// func_E6A810_801A23AC
// func_i5_801A23AC
void func_801A23AC(Object*);
// func_E6A810_801A2A78
// func_i5_801A2A78
void func_801A2A78(Object*);
// func_E6A810_801A2B24
// func_i5_801A2B24
void func_801A2B24(Object*);
// func_E6A810_801A2DD8
// func_i5_801A2DD8
void func_801A2DD8(Object*);
// func_E6A810_801A3240
// func_i5_801A3240
void func_801A3240(Object*);
// func_E6A810_801A3E98
// func_i5_801A3E98
void func_801A3E98(Object*);
// func_E6A810_801A43BC
// func_i5_801A43BC
void func_801A43BC(Object*);
// func_E6A810_801A46A0
// func_i5_801A46A0
void func_801A46A0(Object*);
// func_E6A810_801A4A64
// func_i5_801A4A64
void func_801A4A64(Object*);
// func_E6A810_801A4B24
// func_i5_801A4B24
void func_801A4B24(Object*);
// func_E6A810_801A54E8
// func_i5_801A54E8
void func_801A54E8(Object*);
// func_E6A810_801A57D0
// func_i5_801A57D0
void func_801A57D0(Object*);
// func_E6A810_801A5AF0
// func_i5_801A5AF0
void func_801A5AF0(Object*);
// func_E6A810_801A5B4C
// func_i5_801A5B4C
void func_801A5B4C(Object*);
// func_E6A810_801A5D68
// func_i5_801A5D68
void func_801A5D68(Object*);
// func_E6A810_801A5E54
// func_i5_801A5E54
void func_801A5E54(Object*);
// func_E6A810_801A5F90
// func_i5_801A5F90
void func_801A5F90(Object*);
// func_E6A810_801A5FD0
// func_i5_801A5FD0
void func_801A5FD0(Object*);
// func_E6A810_801A6100
// func_i5_801A6100
void func_801A6100(Object*);
// func_E6A810_801A6144
// func_i5_801A6144
void func_801A6144(Object*);
// func_E6A810_801A6540
// func_i5_801A6540
void func_801A6540(Object*);
// func_E6A810_801A6608
// func_i5_801A6608
void func_801A6608(Object*);
// func_E6A810_801A67C8
// func_i5_801A67C8
void func_801A67C8(Object*);
// func_E6A810_801A68EC
// func_i5_801A68EC
void func_801A68EC(Object*);
// func_E6A810_801A7E7C
// func_i5_801A7E7C
void func_801A7E7C(Object*);
// func_E6A810_801AC294
// func_i5_801AC294
void func_801AC294(Object*);
// func_E6A810_801AC438
// func_i5_801AC438
void func_801AC438(Object*);
// func_E6A810_801AD6F0
// func_i5_801AD6F0
void func_801AD6F0(Object*);
// func_E6A810_801ADAC8
// func_i5_801ADAC8
void func_801ADAC8(Object*);
// func_E6A810_801ADD68
// func_i5_801ADD68
void func_801ADD68(Object*);
// func_E6A810_801AE2C0
// func_i5_801AE2C0
void func_801AE2C0(Object*);
// func_E6A810_801AE87C
// func_i5_801AE87C
void func_801AE87C(Object*);
// func_E6A810_801AEAA0
// func_i5_801AEAA0
void func_801AEAA0(Object*);
// func_E6A810_801AEC04
// func_i5_801AEC04
void func_801AEC04(Object*);
// func_E6A810_801AEEFC
// func_i5_801AEEFC
void func_801AEEFC(Object*);
// func_E9F1D0_801880E4
@@ -442,7 +442,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_15, */ {(void*) D_60361F0, 0, (ObjectFunc) func_80066EA8, D_603E014, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_16, */ {(void*) D_6018E80, 0, (ObjectFunc) func_80066EA8, D_603E030, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_17, */ {(void*) D_6035F10, 0, (ObjectFunc) func_80066EA8, D_603E09C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_DF4260_8018753C, 1, (ObjectFunc) func_DF4260_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_18, */ {(void*) func_i1_8018753C, 1, (ObjectFunc) func_i1_80187530, D_603E98C, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_19, */ {(void*) D_60153B0, 0, (ObjectFunc) NULL, D_603E118, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_20, */ {(void*) D_601F5A0, 0, (ObjectFunc) NULL, D_603E14C, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_21, */ {(void*) D_60137B0, 0, (ObjectFunc) NULL, D_603E1B4, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
@@ -551,7 +551,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_124 */ {(void*) D_600EEF0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_125 */ {(void*) D_600BF80, 0, (ObjectFunc) NULL, D_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_126 */ {(void*) func_i3_801BE1FC, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_DF4260_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_127 */ {(void*) D_9005C80, 0, (ObjectFunc) func_i1_801924A8, D_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
@@ -730,7 +730,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_303 */ {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_E6A810_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
@@ -743,7 +743,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_BOSS_316 */ {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_DF4260_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_ITEM_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
src/main/fox_edisplay.c
+6 -6
View File
@@ -284,7 +284,7 @@ void func_8005A094(Actor* actor) {
break;
}
if (gCurrentLevel != LEVEL_SOLAR) {
gSPDisplayList(gMasterDisp++, D_E6A810_801B769C[actor->unk_046]);
gSPDisplayList(gMasterDisp++, D_i5_801B769C[actor->unk_046]);
} else {
if (gBosses[0].fwork[3] < 4800.0f) {
RCP_SetupDL(&gMasterDisp, 0x1E);
@@ -323,10 +323,10 @@ void func_8005A094(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x21);
}
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_E6A810_801B7584[actor->unk_048]);
gSPDisplayList(gMasterDisp++, D_i5_801B7584[actor->unk_048]);
break;
case 47:
gSPDisplayList(gMasterDisp++, D_E6A810_801B7608[actor->unk_048]);
gSPDisplayList(gMasterDisp++, D_i5_801B7608[actor->unk_048]);
break;
case 48:
Graphics_SetScaleMtx(actor->scale);
@@ -406,7 +406,7 @@ void func_8005A094(Actor* actor) {
gSPDisplayList(gMasterDisp++, D_10177C0);
break;
case 57:
gSPDisplayList(gMasterDisp++, D_DF4260_8019A008[actor->unk_048]);
gSPDisplayList(gMasterDisp++, D_i1_8019A008[actor->unk_048]);
break;
default:
if (actor->unk_0B8 > 9) { // part of switch tree somehow?
@@ -751,7 +751,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
case OBJ_BOSS_319:
func_DF4260_80198310(&gBosses[index]);
func_i1_80198310(&gBosses[index]);
break;
}
}
@@ -1556,7 +1556,7 @@ void Object_DrawAll(s32 arg0) {
spAC.x = obj58->sfxPos.x;
spAC.y = obj58->sfxPos.y;
spAC.z = obj58->sfxPos.z;
Matrix_MultVec3fNoTranslate(&D_E51970_8019EE80, &spAC, &obj58->obj.pos);
Matrix_MultVec3fNoTranslate(&D_i4_8019EE80, &spAC, &obj58->obj.pos);
obj58->obj.rot.y = gBosses[0].obj.rot.y + (*obj58).unk_54;
}
Matrix_Push(&gGfxMatrix);
src/main/fox_effect.c
+5 -6
View File
@@ -2274,7 +2274,7 @@ void func_8007E014(Effect* effect) {
f32 y;
if (D_801784AC == 4) {
func_E6A810_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_80177D20, &x, &y, &z);
func_i5_801B6E20(effect->obj.pos.x, effect->obj.pos.z + D_80177D20, &x, &y, &z);
effect->obj.pos.y = y + 3.0f;
effect->obj.rot.x = (x * 180.0f) / M_PI;
effect->obj.rot.z = (z * 180.0f) / M_PI;
@@ -2749,7 +2749,7 @@ void func_8007F6B0(Effect* effect) {
posY = gGroundLevel + 40.0f;
if (D_801784AC == 4) {
func_E6A810_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z);
func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z);
posY = y + 30.0f;
}
@@ -2796,7 +2796,7 @@ void func_8007F958(Effect* effect) {
posY = gGroundLevel + 10.0f;
if (D_801784AC == 4) {
func_E6A810_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z);
func_i5_801B6E20(effect->obj.pos.x + sin, effect->obj.pos.z + cos + D_80177D20, &x, &y, &z);
posY = y + 10.0f;
}
@@ -2922,7 +2922,7 @@ void func_8007FE88(Effect* effect) {
}
if (D_801784AC == 4) {
if (func_E6A810_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) {
if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) {
Object_Kill(&effect->obj, &effect->sfxPos);
}
} else if (effect->obj.pos.y < gGroundLevel) {
@@ -3052,8 +3052,7 @@ void func_8008040C(Effect* effect) {
}
if (D_801784AC == 4) {
if (func_E6A810_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) !=
0) {
if (func_i5_801B6AEC(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z + D_80177D20) != 0) {
Object_Kill(&effect->obj, &effect->sfxPos);
}
} else if (effect->obj.pos.y < gGroundLevel) {

Some files were not shown because too many files have changed in this diff Show More