Name functions after their files, also global variables in engine and ovl_i1-6 (#196)

* cleanup

* mass rename

* forgot some
This commit is contained in:
petrie911
2024-04-02 20:20:08 -03:00
committed by GitHub
parent 34b0701ac1
commit 988a36d03f
89 changed files with 15902 additions and 15754 deletions
+4 -1
View File
@@ -131,7 +131,10 @@
"ast_versus.h": "c",
"ast_macbeth.h": "c",
"ast_7_ti_1.h": "c",
"ast_meteo.h": "c"
"ast_meteo.h": "c",
"ast_font_3d.h": "c",
"ast_vs_menu.h": "c",
"sf64mesg.h": "c"
},
"C_Cpp_Runner.msvcBatchPath": ""
}
+1 -4
View File
@@ -508,10 +508,7 @@ D_10182C0:
{ type: GFX, offset: 0x10182C0, symbol: D_10182C0 }
D_10190C0:
{ type: TEXTURE, format: IA8, width: 16, height: 32, ctype: u8, offset: 0x10190C0, symbol: D_10190C0 }
D_10192C0:
{ type: TEXTURE, format: RGBA16, width: 16, height: 16, ctype: u16, offset: 0x10192C0, symbol: D_10192C0 }
{ type: TEXTURE, format: RGBA16, width: 16, height: 32, ctype: u16, offset: 0x10190C0, symbol: D_10190C0 }
D_10194C0:
{ type: GFX, offset: 0x10194C0, symbol: D_10194C0 }
+204 -204
View File
File diff suppressed because it is too large Load Diff
+93 -93
View File
@@ -80,7 +80,7 @@ typedef enum OptionId {
extern void* D_menu_801B68B0[];
extern u8* D_menu_801B68D4[];
extern s32 D_menu_801B8220[]; // total hits ranking? see func_menu_80197DE4
extern s32 D_menu_801B8220[]; // total hits ranking? see Option_80197DE4
extern s32 D_menu_801B827C;
extern s32 D_menu_801B8280;
extern s32 D_menu_801B8284;
@@ -97,31 +97,31 @@ extern u8 D_menu_801C6C10[96 * 96];
extern u8 D_menu_801C9010[96 * 96];
extern u8 D_menu_801CB410[96 * 96];
void func_menu_801877F0(void);
s32 func_menu_80187ABC(void);
void func_menu_80187B00(void);
void func_menu_80187E28(void);
void func_menu_801888E8(void);
void func_menu_8018994C(void);
void func_menu_8018A644(void);
void func_menu_8018ACEC(void);
void func_menu_8018B5C4(void);
void func_menu_8018C644(void);
void func_menu_80187CA8(void);
s32 func_menu_80188010(void);
void func_menu_80189208(void);
void func_menu_8018A2F8(void);
void func_menu_8018A990(void);
void func_menu_8018B038(void);
void func_menu_8018C114(void);
void func_menu_8018CB90(void);
void func_menu_8018F680(void);
void func_menu_8018F77C(void);
void func_menu_8018F85C(void);
void func_menu_8018F8E4(void);
void func_menu_8018FC14(void);
void func_menu_8018FD08(void);
void func_menu_8018FF74(void);
void Title_801877F0(void);
s32 Title_80187ABC(void);
void Title_80187B00(void);
void Title_80187E28(void);
void Title_801888E8(void);
void Title_8018994C(void);
void Title_8018A644(void);
void Title_8018ACEC(void);
void Title_8018B5C4(void);
void Title_8018C644(void);
void Title_80187CA8(void);
s32 Title_80188010(void);
void Title_80189208(void);
void Title_8018A2F8(void);
void Title_8018A990(void);
void Title_8018B038(void);
void Title_8018C114(void);
void Title_8018CB90(void);
void Title_8018F680(void);
void Title_8018F77C(void);
void Title_8018F85C(void);
void Title_8018F8E4(void);
void Title_8018FC14(void);
void Title_8018FD08(void);
void Title_8018FF74(void);
void Option_UpdateEntry(void);
void Option_MapUpdate(void);
@@ -132,96 +132,96 @@ void Option_VersusUpdate(void);
void Option_VersusDraw(void);
void Option_SoundInit(void);
void Option_SoundUpdate(void);
void func_menu_80194AEC(void);
void func_menu_80194BD0(void);
void Option_80194AEC(void);
void Option_80194BD0(void);
void Option_SoundDraw(void);
void func_menu_801952B4(void);
void Option_801952B4(void);
void Option_ExpertSoundInit(void);
void Option_ExpertSoundUpdate(void);
void Option_ExpertSoundDraw(void);
void Option_DataInit(void);
void Option_DataUpdate(void);
void func_menu_8019669C(void);
void Option_8019669C(void);
void Option_DataDraw(void);
void Option_RankingInit(void);
void Option_RankingUpdate(void);
void Option_RankingDraw(void);
void func_menu_80196FC4(void);
void func_menu_80197074(void);
void func_menu_8019715C(void);
void Option_80196FC4(void);
void Option_80197074(void);
void Option_8019715C(void);
void Option_RankingMenuDraw(void);
void func_menu_8019752C(void);
void func_menu_80197914(void);
void func_menu_80197A3C(s32, s32, s32);
void func_menu_80197D30(s32, s32, s32);
void func_menu_80197DE4(s32, s32, s32);
void func_menu_80197F74(s32, s32, s32);
void func_menu_80198164(s32, f32, f32);
void func_menu_801982B0(s32, s32, f32, f32, s32);
void func_menu_801984D0(s32, s32, f32, f32);
void func_menu_80198608(s32, s32, f32, f32);
void func_menu_8019882C(s32, s32, f32, f32);
void func_menu_8019896C(s32, f32, s32);
void func_menu_80199198(f32 arg0, f32 arg1, f32 arg2);
s32 func_menu_80199284(PlanetId start, PlanetId end);
void Option_8019752C(void);
void Option_80197914(void);
void Option_80197A3C(s32, s32, s32);
void Option_80197D30(s32, s32, s32);
void Option_80197DE4(s32, s32, s32);
void Option_80197F74(s32, s32, s32);
void Option_80198164(s32, f32, f32);
void Option_801982B0(s32, s32, f32, f32, s32);
void Option_801984D0(s32, s32, f32, f32);
void Option_80198608(s32, s32, f32, f32);
void Option_8019882C(s32, s32, f32, f32);
void Option_8019896C(s32, f32, s32);
void Option_80199198(f32 arg0, f32 arg1, f32 arg2);
s32 Option_80199284(PlanetId start, PlanetId end);
void Option_VersusMenuInit(void);
void Option_VersusMenuUpdate(void);
void func_menu_8019949C(void);
void Option_8019949C(void);
void Option_VersusMenuDraw(void);
void func_menu_80199820(s32);
void func_menu_80199EA8(void);
void Option_80199820(s32);
void Option_80199EA8(void);
void Option_VersusStageInit(void);
void func_menu_8019A080(void);
void Option_8019A080(void);
void Option_VersusStageUpdate(void);
void func_menu_8019A124(void);
void func_menu_8019A1A8(void);
void func_menu_8019A214(void);
void func_menu_8019A298(void);
void func_menu_8019A2E0(void);
void func_menu_8019A4DC(void);
void func_menu_8019A6DC(void);
void func_menu_8019A954(void);
void Option_8019A124(void);
void Option_8019A1A8(void);
void Option_8019A214(void);
void Option_8019A298(void);
void Option_8019A2E0(void);
void Option_8019A4DC(void);
void Option_8019A6DC(void);
void Option_8019A954(void);
void Option_VersusStageDraw(void);
void func_menu_8019AB30(void);
void func_menu_8019AD84(void);
void func_menu_8019AFFC(void);
void func_menu_8019B1F8(void);
void func_menu_8019B3DC(void);
void func_menu_8019B5AC(void);
void func_menu_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b);
void func_menu_8019B7D4(void);
void func_menu_8019B8A0(s32 arg0);
void func_menu_8019B8C8(void);
void Option_8019AB30(void);
void Option_8019AD84(void);
void Option_8019AFFC(void);
void Option_8019B1F8(void);
void Option_8019B3DC(void);
void Option_8019B5AC(void);
void Option_8019B6D8(f32 xPos, f32 yPos, f32 offset, s32 r, s32 g, s32 b);
void Option_8019B7D4(void);
void Option_8019B8A0(s32 arg0);
void Option_8019B8C8(void);
void Option_DrawMenuLabel(void);
void Option_DrawMenuCard(MenuContext_38 arg0);
void Option_DrawMenuArwing(ArwingPosition arg0);
void func_menu_8019BC44(f32, f32, f32, f32, f32, f32);
void func_menu_8019BDF0(void);
void func_menu_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *);
void func_menu_8019BF34(void);
void func_menu_8019C04C(void);
void Option_8019BC44(f32, f32, f32, f32, f32, f32);
void Option_8019BDF0(void);
void Option_8019BE7C(f32, f32, f32, f32 *, f32 *, f32 *);
void Option_8019BF34(void);
void Option_8019C04C(void);
void Option_DrawCardLabel(OptionTexture arg0);
s32 func_menu_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8);
s32 func_menu_8019C5A0(s32*);
s32 func_menu_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3);
void func_menu_8019C824(f32* );
s32 func_menu_8019C8C4(void);
void func_menu_8019CAE0(void);
void func_menu_8019CBC0(void);
void func_menu_8019CD54(void);
void func_menu_8019D118(void);
void func_menu_8019D624(void);
void func_menu_8019DB20(s32, f32, f32, f32, f32, f32, f32, f32);
s32 func_menu_8019DCE8(s32 arg0);
void func_menu_8019DD44(void);
void func_menu_8019DE74(void);
void func_menu_8019DF64(void);
s32 Option_8019C418(s32* arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, UnkStruct_D_menu_801B9250* arg8);
s32 Option_8019C5A0(s32*);
s32 Option_8019C66C(f32* arg0, f32 arg1, f32 arg2, UnkStruct_D_menu_801B9250* arg3);
void Option_8019C824(f32* );
s32 Option_8019C8C4(void);
void Option_8019CAE0(void);
void Option_8019CBC0(void);
void Option_8019CD54(void);
void Option_8019D118(void);
void Option_8019D624(void);
void Option_8019DB20(s32, f32, f32, f32, f32, f32, f32, f32);
s32 Option_8019DCE8(s32 arg0);
void Option_8019DD44(void);
void Option_8019DE74(void);
void Option_8019DF64(void);
void Option_InvoiceUpdate(void);
void Option_InvoiceDraw(void);
void func_menu_8019E8D0(void);
void func_menu_801A07E8(u8*, u8*, f32*);
void func_menu_801AD7EC(s32, s32, s32);
void func_menu_801A9FD4(s32);
void Map_8019E8D0(void);
void Map_801A07E8(u8*, u8*, f32*);
void Map_801AD7EC(s32, s32, s32);
void Map_801A9FD4(s32);
#endif
+433 -427
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -107,8 +107,8 @@ void Lights_SetTwoLights(Gfx** dList, s32 dir1x, s32 dir1y, s32 dir1z, s32 dir2x
char* Graphics_ClearPrintBuffer(char *buf, s32 fill, s32 len);
s32 Graphics_Printf(const char *fmt, ...);
void Texture_Scroll(void *texture, s32 width, s32 height, u8 mode);
void Texture_Mottle(void *dst, void *src, u8 mode);
void Texture_Scroll(u16 *texture, s32 width, s32 height, u8 mode);
void Texture_Mottle(u16 *dst, u16 *src, u8 mode);
s32 Animation_GetLimbIndex(Limb* limb, Limb** skeleton);
void Animation_DrawLimb(s32 mode, Limb* limb, Limb* *skeleton, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data);
void Animation_DrawSkeleton(s32 mode, Limb** skeletonSegment, Vec3f* jointTable, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, void* data, Matrix* transform);
+59 -59
View File
@@ -8,67 +8,67 @@
#include "sf64player.h"
#include "sf64mesg.h"
extern Gfx* D_i1_8019A008[];
extern f32 D_i1_8019A9B8[];
extern Gfx* D_VE1_8019A008[];
extern f32 D_VE1_8019A9B8[];
extern void func_i1_8018F880(Player*);
extern void func_i1_80191160(Player*);
extern void func_i1_801988B8(Player*);
extern void Corneria_8018F880(Player*);
extern void Corneria_80191160(Player*);
extern void Venom1_801988B8(Player*);
void func_i1_801875A4(Object_4C*);
void func_i1_80189058(Boss*);
void func_i1_8018AA74(Boss*);
void func_i1_8018AED0(Actor*);
void func_i1_8018B15C(Actor*);
void func_i1_8018B418(Actor*);
void func_i1_8018B58C(Actor*);
void func_i1_8018BAAC(Actor*);
void func_i1_8018BBA4(Actor*);
void func_i1_8018BBF8(Actor*);
void func_i1_8018BD7C(Actor*);
void func_i1_8018C19C(Boss*);
void func_i1_8018DDAC(Boss*);
void func_i1_8018E290(Boss*);
void func_i1_8018E76C(Boss*);
void func_i1_8018ECAC(Boss*);
void func_i1_8018ED78(Boss*);
void func_i1_8018EE84(Boss*);
void func_i1_8018EF90(Boss*);
void func_i1_8018F044(Object_80*);
void func_i1_8018F31C(Object_80*);
void func_i1_801922DC(Object_4C*);
void func_i1_80192358(Object_4C*);
void func_i1_801923C0(Object_4C*);
void func_i1_8019243C(Object_4C*);
void func_i1_80192518(Actor*);
void func_i1_80192CD4(Actor*);
void func_i1_80192E2C(Actor*);
void func_i1_80192EB0(Actor*);
void func_i1_801933DC(Actor*);
void func_i1_801934D0(Actor*);
void func_i1_80193540(Object_80*);
void func_i1_80194398(Boss*);
void func_i1_801985E4(Boss*);
void func_i1_80198968(Item*);
void Corneria_801875A4(Object_4C*);
void Corneria_80189058(Boss*);
void Corneria_8018AA74(Boss*);
void Corneria_8018AED0(Actor*);
void Corneria_8018B15C(Actor*);
void Corneria_8018B418(Actor*);
void Corneria_8018B58C(Actor*);
void Corneria_8018BAAC(Actor*);
void Corneria_8018BBA4(Actor*);
void Corneria_8018BBF8(Actor*);
void Corneria_8018BD7C(Actor*);
void Corneria_8018C19C(Boss*);
void Corneria_8018DDAC(Boss*);
void Corneria_8018E290(Boss*);
void Corneria_8018E76C(Boss*);
void Corneria_8018ECAC(Boss*);
void Corneria_8018ED78(Boss*);
void Corneria_8018EE84(Boss*);
void Corneria_8018EF90(Boss*);
void Corneria_8018F044(Object_80*);
void Corneria_8018F31C(Object_80*);
void Venom1_801922DC(Object_4C*);
void Venom1_80192358(Object_4C*);
void Venom1_801923C0(Object_4C*);
void Venom1_8019243C(Object_4C*);
void Venom1_80192518(Actor*);
void Venom1_80192CD4(Actor*);
void Venom1_80192E2C(Actor*);
void Venom1_80192EB0(Actor*);
void Venom1_801933DC(Actor*);
void Venom1_801934D0(Actor*);
void Venom1_80193540(Object_80*);
void Venom1_80194398(Boss*);
void Venom1_801985E4(Boss*);
void Training_80198968(Item*);
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 OvlI1_CallFunction(s32, void*);
void Corneria_80187530(Object_80*);
void Corneria_8018753C(Object_80*);
void Corneria_801878D8(Boss *);
void Corneria_8018B0B4(Actor *);
void Corneria_8018BE7C(Boss *);
void Corneria_8018ED78(Boss*);
void Venom1_801924A8(Object_80* );
void Venom1_8019250C(Actor *);
void Venom1_80192CB0(Actor *);
void Venom1_80192EA4(Actor *);
void Venom1_801933B4(Actor *);
void Venom1_801935CC(Boss *);
void Venom1_80198310(Boss *);
void Venom1_80198594(Boss *);
void Training_801988E0(void);
void Training_80198C50(void);
void Training_8019949C(void);
void Venom1_8019864C(PlayerShot*);
#endif
+35 -35
View File
@@ -8,42 +8,42 @@
#include "sf64player.h"
#include "sf64mesg.h"
void func_i2_8018CD8C(Player*);
void func_i2_8018E084(Player*);
void func_i2_8018ED9C(Actor*);
void func_i2_80193A30(Player*);
void func_i2_80194728(Player*);
void Meteo_8018CD8C(Player*);
void Meteo_8018E084(Player*);
void Meteo_8018ED9C(Actor*);
void SectorX_80193A30(Player*);
void SectorX_80194728(Player*);
void func_i2_80187520(s32, void*);
void func_i2_80187B08(Actor *);
void func_i2_80188A40(Boss *);
void func_i2_8018CCF8(Actor *);
void OvlI2_CallFunction(s32, void*);
void Meteo_80187B08(Actor *);
void Meteo_80188A40(Boss *);
void Meteo_8018CCF8(Actor *);
void func_i2_8018756C(Actor*);
void func_i2_80187650(Actor*);
void func_i2_801877C4(Actor*);
void func_i2_8018795C(Actor*);
void func_i2_80188344(Boss*);
void func_i2_801887D0(Boss*);
void func_i2_80188CAC(Effect*);
void func_i2_80188FAC(Effect*);
void func_i2_80189114(Effect*);
void func_i2_8018978C(Boss*);
void func_i2_8018BACC(Boss*);
void func_i2_8018D9EC(Actor*);
void func_i2_8018DA6C(Actor*);
void func_i2_8018DAEC(Actor*);
void func_i2_8018DB6C(Actor*);
void func_i2_8018DBEC(Effect*);
void func_i2_8018DCE4(Effect*);
void func_i2_8018DE14(Effect*);
void func_i2_8018F330(Actor*);
void func_i2_8018F884(Actor*);
void func_i2_8018FE38(Boss*);
void func_i2_8018FF20(Boss*);
void func_i2_8018FF84(Boss*);
void func_i2_80190020(Boss*);
void func_i2_80190078(Boss*);
void func_i2_80193434(Boss*);
void Meteo_8018756C(Actor*);
void Meteo_80187650(Actor*);
void Meteo_801877C4(Actor*);
void Meteo_8018795C(Actor*);
void Meteo_80188344(Boss*);
void Meteo_801887D0(Boss*);
void Meteo_80188CAC(Effect*);
void Meteo_80188FAC(Effect*);
void Meteo_80189114(Effect*);
void Meteo_8018978C(Boss*);
void Meteo_8018BACC(Boss*);
void Meteo_8018D9EC(Actor*);
void Meteo_8018DA6C(Actor*);
void Meteo_8018DAEC(Actor*);
void Meteo_8018DB6C(Actor*);
void Meteo_8018DBEC(Effect*);
void Meteo_8018DCE4(Effect*);
void Meteo_8018DE14(Effect*);
void SectorX_8018F330(Actor*);
void SectorX_8018F884(Actor*);
void SectorX_8018FE38(Boss*);
void SectorX_8018FF20(Boss*);
void SectorX_8018FF84(Boss*);
void SectorX_80190020(Boss*);
void SectorX_80190078(Boss*);
void SectorX_80193434(Boss*);
#endif
+136 -136
View File
@@ -8,147 +8,147 @@
#include "sf64player.h"
#include "sf64mesg.h"
// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
extern f32 D_AQ_801C4188;
void func_i3_801BE034(Actor*);
void Aquas_801BE034(Actor*);
void func_i3_8018DA58(Actor*);
void func_i3_8019E5F0(Actor*);
void func_i3_801A8BE8(Actor*);
void func_i3_801AB9B0(Player*);
void func_i3_801BE0F0(Actor*);
void Area6_8018DA58(Actor*);
void Zoness_8019E5F0(Actor*);
void Solar_801A8BE8(Actor*);
void Aquas_801AB9B0(Player*);
void Aquas_801BE0F0(Actor*);
void func_i3_80187520(s32, void*);
void func_i3_80187754(Boss *);
void func_i3_80187944(Boss*);
void func_i3_8018C54C(Boss*);
void func_i3_8018DF74(Player *player);
void func_i3_8018ED78(Player*);
void OvlI3_CallFunction(s32, void*);
void Area6_80187754(Boss *);
void Area6_80187944(Boss*);
void Area6_8018C54C(Boss*);
void Area6_8018DF74(Player *player);
void Area6_8018ED78(Player*);
void func_i3_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void func_i3_80190430(Actor* actor);
void func_i3_801904CC(Actor* actor);
void func_i3_80190A00(Actor* actor);
void func_i3_80190F08(Actor* actor);
void func_i3_80191010(Actor* actor);
void func_i3_801914C4(Actor* actor);
void func_i3_801915A4(Actor* actor);
void func_i3_80191680(Actor* actor);
void func_i3_80191B4C(Actor* actor);
void func_i3_80191BB8(Actor* actor);
void func_i3_80191BC4(Actor* actor);
void func_i3_80191DB0(Actor* actor);
void func_i3_80191DB0(Actor* actor);
void func_i3_80191FFC(Actor* actor);
void func_i3_80192094(Actor* actor);
void func_i3_80192834(Actor* actor);
void func_i3_80192C18(Actor* actor);
void func_i3_80192E64(Actor* actor);
void func_i3_80193240(Actor* actor);
void func_i3_801932AC(Boss* bossZO);
void func_i3_801949DC(Boss* bossZO);
void func_i3_80194A84(Boss* bossZO);
void func_i3_8019969C(Actor* actor);
void func_i3_8019983C(Actor* actor);
void func_i3_80199A28(Actor* actor);
void func_i3_80199E24(Actor* actor);
void func_i3_80199F10(Actor* actor);
void func_i3_8019A1FC(Actor* actor);
void func_i3_8019A5D4(Actor* actor);
void func_i3_8019ACCC(Actor* actor);
void func_i3_8019B1F0(Actor* actor);
void func_i3_8019B548(Actor* actor);
void func_i3_8019B7DC(Actor* actor);
void func_i3_8019B810(Actor* actor);
void func_i3_8019B854(Actor* actor);
void func_i3_8019BDE0(Actor* actor);
void func_i3_8019BE48(Actor* actor);
void func_i3_8019C1CC(Actor* actor);
void func_i3_8019C200(Actor* actor);
void func_i3_8019C454(Actor* actor);
void func_i3_8019C83C(Actor* actor);
void func_i3_8019CBEC(Actor* actor);
void func_i3_8019CE58(Actor* actor);
void func_i3_8019D060(Actor* actor);
void func_i3_8019D15C(Actor* actor);
void func_i3_8019D3C4(Actor* actor);
void func_i3_8019D428(Player* player);
void func_i3_8019D76C(Player* player);
void Zoness_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void Zoness_80190430(Actor* actor);
void Zoness_801904CC(Actor* actor);
void Zoness_80190A00(Actor* actor);
void Zoness_80190F08(Actor* actor);
void Zoness_80191010(Actor* actor);
void Zoness_801914C4(Actor* actor);
void Zoness_801915A4(Actor* actor);
void Zoness_80191680(Actor* actor);
void Zoness_80191B4C(Actor* actor);
void Zoness_80191BB8(Actor* actor);
void Zoness_80191BC4(Actor* actor);
void Zoness_80191DB0(Actor* actor);
void Zoness_80191DB0(Actor* actor);
void Zoness_80191FFC(Actor* actor);
void Zoness_80192094(Actor* actor);
void Zoness_80192834(Actor* actor);
void Zoness_80192C18(Actor* actor);
void Zoness_80192E64(Actor* actor);
void Zoness_80193240(Actor* actor);
void Zoness_801932AC(Boss* bossZO);
void Zoness_801949DC(Boss* bossZO);
void Zoness_80194A84(Boss* bossZO);
void Zoness_8019969C(Actor* actor);
void Zoness_8019983C(Actor* actor);
void Zoness_80199A28(Actor* actor);
void Zoness_80199E24(Actor* actor);
void Zoness_80199F10(Actor* actor);
void Zoness_8019A1FC(Actor* actor);
void Zoness_8019A5D4(Actor* actor);
void Zoness_8019ACCC(Actor* actor);
void Zoness_8019B1F0(Actor* actor);
void Zoness_8019B548(Actor* actor);
void Zoness_8019B7DC(Actor* actor);
void Zoness_8019B810(Actor* actor);
void Zoness_8019B854(Actor* actor);
void Zoness_8019BDE0(Actor* actor);
void Zoness_8019BE48(Actor* actor);
void Zoness_8019C1CC(Actor* actor);
void Zoness_8019C200(Actor* actor);
void Zoness_8019C454(Actor* actor);
void Zoness_8019C83C(Actor* actor);
void Zoness_8019CBEC(Actor* actor);
void Zoness_8019CE58(Actor* actor);
void Zoness_8019D060(Actor* actor);
void Zoness_8019D15C(Actor* actor);
void Zoness_8019D3C4(Actor* actor);
void Zoness_8019D428(Player* player);
void Zoness_8019D76C(Player* player);
void func_i3_8019E8B8(f32, f32, f32, f32);
void func_i3_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_i3_8019EA7C(Actor*);
void func_i3_8019F20C(Actor*);
void func_i3_8019F7AC(Actor*);
void func_i3_801A003C(Actor*);
void func_i3_801A0120(Effect*);
void func_i3_801A0AF0(Effect*);
void func_i3_801A10F4(Player* player);
void func_i3_801A5B3C(Boss*);
void func_i3_801A71B8(Boss*);
void func_i3_801A8BE8(Actor*);
void func_i3_801A7930(Player* player);
void Solar_8019E8B8(f32, f32, f32, f32);
void Solar_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void Solar_8019EA7C(Actor*);
void Solar_8019F20C(Actor*);
void Solar_8019F7AC(Actor*);
void Solar_801A003C(Actor*);
void Solar_801A0120(Effect*);
void Solar_801A0AF0(Effect*);
void Solar_801A10F4(Player* player);
void Solar_801A5B3C(Boss*);
void Solar_801A71B8(Boss*);
void Solar_801A8BE8(Actor*);
void Solar_801A7930(Player* player);
void func_i3_801A9824(void);
void func_i3_801AA20C(void);
void func_i3_801AA8E8(Player*);
void func_i3_801AACF8(Player*);
void func_i3_801ABA40(PlayerShot*);
void func_i3_801AC274(Player*);
void func_i3_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(Player*);
void func_i3_801ACE50(Player*);
void func_i3_801AD328(Player*);
void func_i3_801AD688(Actor *);
void func_i3_801AD6C0(Actor*);
void func_i3_801AE168(Actor*);
void func_i3_801AE3AC(Actor *);
void func_i3_801AE3D8(Actor*);
void func_i3_801AEB44(Actor*);
void func_i3_801AF9FC(Actor *);
void func_i3_801AFA5C(Actor*);
void func_i3_801B099C(Actor*);
void func_i3_801B0B60(Actor*);
void func_i3_801B0EC0(Actor*);
void func_i3_801B10F8(Boss*);
void func_i3_801B134C(Boss*);
void func_i3_801B4D84(Boss*);
void func_i3_801B504C(Actor*);
void func_i3_801B50E8(Actor*);
void func_i3_801B619C(Actor*);
void func_i3_801B6344(Actor *);
void func_i3_801B638C(Actor*);
void func_i3_801B6E54(Actor *);
void func_i3_801B6FF8(Actor*);
void func_i3_801B7A24(Actor*);
void func_i3_801B7AF0(Actor *);
void func_i3_801B7C78(Actor*);
void func_i3_801B90DC(Actor*);
void func_i3_801B91A4(Actor*);
void func_i3_801BA108(Actor*);
void func_i3_801BA26C(Actor*);
void func_i3_801BA4E4(Actor*);
void func_i3_801BA57C(Actor *);
void func_i3_801BA6A4(Actor*);
void func_i3_801BAD7C(Actor*);
void func_i3_801BADF8(Actor*);
void func_i3_801BB204(Actor*);
void func_i3_801BB26C(Actor *);
void func_i3_801BB79C(Actor*);
void func_i3_801BC930(Actor*);
void func_i3_801BC9A0(Actor*);
void func_i3_801BD264(Actor*);
void func_i3_801BD54C(Actor*);
void func_i3_801BDE6C(Actor*);
void func_i3_801BDF14(void);
void func_i3_801BE1FC(Object_80*);
void func_i3_801BE3F8(Actor*);
void func_i3_801BEB1C(Actor*);
void func_i3_801BEC50(Boss*);
void func_i3_801BEC5C(Boss*);
void func_i3_801BEC68(Actor*);
void func_i3_801BEC74(Actor*);
void func_i3_801BEC80(Player*);
void Aquas_801A9824(void);
void Aquas_801AA20C(void);
void Aquas_801AA8E8(Player*);
void Aquas_801AACF8(Player*);
void Aquas_801ABA40(PlayerShot*);
void Aquas_801AC274(Player*);
void Aquas_801AC8A8(f32, f32, f32, f32, s32);
void Aquas_801AC918(Effect*);
void Aquas_801ACBB4(Player*);
void Aquas_801ACE50(Player*);
void Aquas_801AD328(Player*);
void Aquas_801AD688(Actor *);
void Aquas_801AD6C0(Actor*);
void Aquas_801AE168(Actor*);
void Aquas_801AE3AC(Actor *);
void Aquas_801AE3D8(Actor*);
void Aquas_801AEB44(Actor*);
void Aquas_801AF9FC(Actor *);
void Aquas_801AFA5C(Actor*);
void Aquas_801B099C(Actor*);
void Aquas_801B0B60(Actor*);
void Aquas_801B0EC0(Actor*);
void Aquas_801B10F8(Boss*);
void Aquas_801B134C(Boss*);
void Aquas_801B4D84(Boss*);
void Aquas_801B504C(Actor*);
void Aquas_801B50E8(Actor*);
void Aquas_801B619C(Actor*);
void Aquas_801B6344(Actor *);
void Aquas_801B638C(Actor*);
void Aquas_801B6E54(Actor *);
void Aquas_801B6FF8(Actor*);
void Aquas_801B7A24(Actor*);
void Aquas_801B7AF0(Actor *);
void Aquas_801B7C78(Actor*);
void Aquas_801B90DC(Actor*);
void Aquas_801B91A4(Actor*);
void Aquas_801BA108(Actor*);
void Aquas_801BA26C(Actor*);
void Aquas_801BA4E4(Actor*);
void Aquas_801BA57C(Actor *);
void Aquas_801BA6A4(Actor*);
void Aquas_801BAD7C(Actor*);
void Aquas_801BADF8(Actor*);
void Aquas_801BB204(Actor*);
void Aquas_801BB26C(Actor *);
void Aquas_801BB79C(Actor*);
void Aquas_801BC930(Actor*);
void Aquas_801BC9A0(Actor*);
void Aquas_801BD264(Actor*);
void Aquas_801BD54C(Actor*);
void Aquas_801BDE6C(Actor*);
void Aquas_801BDF14(void);
void Aquas_801BE1FC(Object_80*);
void Aquas_801BE3F8(Actor*);
void Aquas_801BEB1C(Actor*);
void Aquas_801BEC50(Boss*);
void Aquas_801BEC5C(Boss*);
void Aquas_801BEC68(Actor*);
void Aquas_801BEC74(Actor*);
void Aquas_801BEC80(Player*);
#endif
+39 -38
View File
@@ -8,46 +8,47 @@
#include "sf64player.h"
#include "sf64mesg.h"
extern Matrix D_i4_8019EE80;
extern s32 D_BO_801A03DC;
extern Matrix D_BO_8019EE80;
void func_i4_8018EF6C(Player*);
void func_i4_8018F94C(Player*);
void func_i4_80192E20(Player*);
void func_i4_80197290(Player*);
void func_i4_80197F10(Actor*);
void func_i4_8019BA64(Player*);
void func_i4_8019C85C(Player*);
void func_i4_8019DD20(Actor*);
void Bolse_8018EF6C(Player*);
void Bolse_8018F94C(Player*);
void Katina_80192E20(Player*);
void Katina_80197290(Player*);
void Katina_80197F10(Actor*);
void SectorZ_8019BA64(Player*);
void SectorZ_8019C85C(Player*);
void SectorZ_8019DD20(Actor*);
void func_i4_80187520(u32, void*);
void func_i4_80187960(Actor*);
void func_i4_8018BA2C(void);
void func_i4_8018C158(Actor*);
void func_i4_80191ED8(void);
void func_i4_80192264(void);
void func_i4_80193CA4(Boss *);
void func_i4_80198594(Actor*);
void func_i4_80198930(void);
void func_i4_80199900(Actor *, s32);
void func_i4_80199C60(Actor*);
void func_i4_8019AB8C(Actor*);
void func_i4_8019EA68(void);
void OvlI4_CallFunction(u32, void*);
void Fortuna_80187960(Actor*);
void Fortuna_8018BA2C(void);
void Bolse_8018C158(Actor*);
void Bolse_80191ED8(void);
void Bolse_80192264(void);
void Katina_80193CA4(Boss *);
void Katina_80198594(Actor*);
void Katina_80198930(void);
void SectorZ_80199900(Actor *, s32);
void SectorZ_80199C60(Actor*);
void SectorZ_8019AB8C(Actor*);
void SectorZ_8019EA68(void);
void func_i4_80188AD0(Actor*);
void func_i4_80188FE4(Actor*);
void func_i4_80191054(Effect*);
void func_i4_80191180(Effect*);
void func_i4_801912FC(Boss*);
void func_i4_80191AFC(Boss*);
void func_i4_80192984(Effect*);
void func_i4_80192A68(Effect*);
void func_i4_80193718(Boss*);
void func_i4_80193B1C(Boss*);
void func_i4_801946C4(Boss*);
void func_i4_801968F4(Boss*);
void func_i4_8019E234(Actor*);
void func_i4_8019E3A8(Actor*);
void func_i4_8019E454(Boss*);
void func_i4_8019E98C(Boss*);
void Fortuna_80188AD0(Actor*);
void Fortuna_80188FE4(Actor*);
void Bolse_80191054(Effect*);
void Bolse_80191180(Effect*);
void Bolse_801912FC(Boss*);
void Bolse_80191AFC(Boss*);
void Katina_80192984(Effect*);
void Katina_80192A68(Effect*);
void Katina_80193718(Boss*);
void Katina_80193B1C(Boss*);
void Katina_801946C4(Boss*);
void Katina_801968F4(Boss*);
void SectorZ_8019E234(Actor*);
void SectorZ_8019E3A8(Actor*);
void SectorZ_8019E454(Boss*);
void SectorZ_8019E98C(Boss*);
#endif
+118 -136
View File
@@ -8,145 +8,127 @@
#include "sf64player.h"
#include "sf64mesg.h"
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;
void func_i5_8018769C(Player*);
void func_i5_801882CC(Player*);
void func_i5_801AC754(Player*);
void func_i5_801AF8F4(Player*);
void func_i5_801B28BC(Actor*);
void func_i5_801B3D04(Player*);
extern Gfx* D_TI_801B7584[];
extern Gfx* D_TI_801B7608[];
extern Gfx* D_TI_801B769C[];
extern f32 D_TI_801B83A8[];
extern u8 D_MA_801BA1E8;
extern f32 D_MA_801BE250[40];
extern s16 D_MA_801BE2F0[9];
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(void);
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);
s32 func_i5_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void func_i5_801AD144(PlayerShot*);
void func_i5_80189120(f32, f32, f32, f32, f32);
bool func_i5_801A3C20(f32);
s32 func_i5_801A3300(Player*, f32, f32);
s32 func_i5_801A3790(Player*, f32, f32);
void Titania_8018769C(Player*);
void Titania_801882CC(Player*);
void Macbeth_801AC754(Player*);
void Macbeth_801AF8F4(Player*);
void Macbeth_801B28BC(Actor*);
void Macbeth_801B3D04(Player*);
void func_i5_80188F60(Effect*);
void func_i5_80188FA8(Effect*);
void func_i5_80189194(Actor*);
void func_i5_801895B8(Actor*);
void func_i5_80189AFC(Actor*);
void func_i5_80189CC8(Actor*);
void func_i5_8018A1C0(Actor*);
void func_i5_8018A544(Actor*);
void func_i5_8018AABC(Actor*);
void func_i5_8018AB44(Actor*);
void func_i5_8018B268(Actor*);
void func_i5_8018B6AC(Actor*);
void func_i5_8018B9D0(Actor*);
void func_i5_8018BE84(Actor*);
void func_i5_8018C8A8(Actor*);
void func_i5_8018E2D8(Actor*);
void func_i5_8018E54C(Actor*);
void func_i5_8018E5B4(Actor*);
void func_i5_8018E5F8(Actor*);
void func_i5_8018EF14(Actor*);
void func_i5_8018F038(Object_4C*);
void func_i5_8018F4D8(Object_80*);
void func_i5_8018F8B8(Object_80*);
void func_i5_80197A94(Boss*);
void func_i5_801982A8(Boss*);
void func_i5_8019C778(Actor*);
void func_i5_8019CE88(Actor*);
void func_i5_8019D700(Actor*);
void func_i5_8019E410(Actor*);
void func_i5_8019EA60(Actor*);
void func_i5_8019EE68(Actor*);
void func_i5_8019FF9C(Actor*);
void func_i5_801A0BD8(Object_80*);
void func_i5_801A12C4(Actor*);
void func_i5_801A23AC(Object_80*);
void func_i5_801A2A78(Object_80*);
void func_i5_801A2B24(Object_80*);
void func_i5_801A2DD8(Object_80*);
void func_i5_801A3240(Object_80*);
void func_i5_801A3E98(Actor*);
void func_i5_801A43BC(Actor*);
void func_i5_801A46A0(Actor*);
void func_i5_801A4A64(Actor*);
void func_i5_801A4B24(Actor*);
void func_i5_801A54E8(Actor*);
void func_i5_801A57D0(Effect*);
void func_i5_801A5AF0(Effect*);
void func_i5_801A5B4C(Effect*);
void func_i5_801A5D68(Effect*);
void func_i5_801A5E54(Actor*);
void func_i5_801A5F90(Actor*);
void func_i5_801A5FD0(Actor*);
void func_i5_801A6100(Actor*);
void func_i5_801A6144(Actor*);
void func_i5_801A6540(Actor*);
void func_i5_801A6608(Object_80*);
void func_i5_801A67C8(Actor*);
void func_i5_801A68EC(Actor*);
void func_i5_801A7E7C(Actor*);
void func_i5_801AC294(Actor*);
void func_i5_801AC438(Actor*);
void func_i5_801AD6F0(Actor*);
void func_i5_801ADAC8(Actor*);
void func_i5_801ADD68(Actor*);
void func_i5_801AE2C0(Actor*);
void func_i5_801AE87C(Effect*);
void func_i5_801AEAA0(Effect*);
void func_i5_801AEC04(Actor*);
void func_i5_801AEEFC(Actor*);
s32 func_i5_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
void OvlI5_CallFunction(u32 mode, void* ptr);
void Titania_8018769C(Player *);
void Titania_80188F30(void);
void Titania_80189B80(Actor *);
void Titania_8018ADC4(Actor *);
void Titania_8018B720(Actor *);
void Titania_8018B96C(Actor *);
void Titania_8018BFB0(Actor *);
void Titania_8018E3B0(Actor *);
void Titania_8018E3CC(Actor *);
void Titania_8018E5E8(Actor *);
void Titania_8018EFF0(Object_4C *);
void Titania_8018F0D8(Object_80 *);
void Titania_8018FA48(Boss *);
void Titania_801990DC(Boss *);
void Macbeth_80199920(void);
void Macbeth_80199F8C(Actor *);
void Macbeth_801A3E70(Actor *);
void Macbeth_801A4660(Actor *);
void Macbeth_801A4AF8(Actor *);
void Macbeth_801A5E2C(Actor *);
void Macbeth_801A6134(Actor *);
void Macbeth_801A65E0(Object_80 *);
void Macbeth_801A7D98(Actor *);
void Macbeth_801ACFBC(void);
void Macbeth_801AD080(void);
void Ground_801B5110(f32, f32, f32);
void Ground_801B58AC(Gfx **, f32);
bool Ground_801B6AEC(f32, f32, f32);
s32 Ground_801B6E20(f32, f32, f32 *, f32 *, f32 *);
void Macbeth_801AD144(PlayerShot*);
void Titania_80189120(f32, f32, f32, f32, f32);
bool Macbeth_801A3C20(f32);
s32 Macbeth_801A3300(Player*, f32, f32);
s32 Macbeth_801A3790(Player*, f32, f32);
typedef struct {
/* 0x00 */ PosRot unk_00;
/* 0x18 */ u16 unk_18;
} UnkStruct_i5_801BD738; // size = 0x1C
typedef struct {
/* 0x00 */ PosRot unk_00;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ s16 unk_24;
/* 0x26 */ u16 unk_26;
} UnkStruct_i5_801BBF00; // size = 0x28
typedef struct {
s32 unk_00;
s32 unk_04;
Actor* actor;
s32 unk_0C;
} UnkStruct_i5_801B8198; // size = 0x10
void Titania_80188F60(Effect*);
void Titania_80188FA8(Effect*);
void Titania_80189194(Actor*);
void Titania_801895B8(Actor*);
void Titania_80189AFC(Actor*);
void Titania_80189CC8(Actor*);
void Titania_8018A1C0(Actor*);
void Titania_8018A544(Actor*);
void Titania_8018AABC(Actor*);
void Titania_8018AB44(Actor*);
void Titania_8018B268(Actor*);
void Titania_8018B6AC(Actor*);
void Titania_8018B9D0(Actor*);
void Titania_8018BE84(Actor*);
void Titania_8018C8A8(Actor*);
void Titania_8018E2D8(Actor*);
void Titania_8018E54C(Actor*);
void Titania_8018E5B4(Actor*);
void Titania_8018E5F8(Actor*);
void Titania_8018EF14(Actor*);
void Titania_8018F038(Object_4C*);
void Titania_8018F4D8(Object_80*);
void Titania_8018F8B8(Object_80*);
void Titania_80197A94(Boss*);
void Titania_801982A8(Boss*);
void Macbeth_8019C778(Actor*);
void Macbeth_8019CE88(Actor*);
void Macbeth_8019D700(Actor*);
void Macbeth_8019E410(Actor*);
void Macbeth_8019EA60(Actor*);
void Macbeth_8019EE68(Actor*);
void Macbeth_8019FF9C(Actor*);
void Macbeth_801A0BD8(Object_80*);
void Macbeth_801A12C4(Actor*);
void Macbeth_801A23AC(Object_80*);
void Macbeth_801A2A78(Object_80*);
void Macbeth_801A2B24(Object_80*);
void Macbeth_801A2DD8(Object_80*);
void Macbeth_801A3240(Object_80*);
void Macbeth_801A3E98(Actor*);
void Macbeth_801A43BC(Actor*);
void Macbeth_801A46A0(Actor*);
void Macbeth_801A4A64(Actor*);
void Macbeth_801A4B24(Actor*);
void Macbeth_801A54E8(Actor*);
void Macbeth_801A57D0(Effect*);
void Macbeth_801A5AF0(Effect*);
void Macbeth_801A5B4C(Effect*);
void Macbeth_801A5D68(Effect*);
void Macbeth_801A5E54(Actor*);
void Macbeth_801A5F90(Actor*);
void Macbeth_801A5FD0(Actor*);
void Macbeth_801A6100(Actor*);
void Macbeth_801A6144(Actor*);
void Macbeth_801A6540(Actor*);
void Macbeth_801A6608(Object_80*);
void Macbeth_801A67C8(Actor*);
void Macbeth_801A68EC(Actor*);
void Macbeth_801A7E7C(Actor*);
void Macbeth_801AC294(Actor*);
void Macbeth_801AC438(Actor*);
void Macbeth_801AD6F0(Actor*);
void Macbeth_801ADAC8(Actor*);
void Macbeth_801ADD68(Actor*);
void Macbeth_801AE2C0(Actor*);
void Macbeth_801AE87C(Effect*);
void Macbeth_801AEAA0(Effect*);
void Macbeth_801AEC04(Actor*);
void Macbeth_801AEEFC(Actor*);
s32 Macbeth_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
#endif
+58 -71
View File
@@ -8,79 +8,66 @@
#include "sf64player.h"
#include "sf64mesg.h"
extern f32 D_i6_801A7F40;
extern f32 D_i6_801A7F44;
extern f32 D_i6_801A7F48;
extern f32 D_i6_801A7F4C;
extern f32 D_i6_801A7F50;
extern f32 D_i6_801A7F54;
extern f32 D_i6_801A7F58;
extern f32 D_i6_801A7F5C;
extern f32 D_i6_801A7F60;
extern f32 D_i6_801A7F64;
extern f32 D_i6_801A7F68;
extern f32 D_i6_801A7F6C;
extern f32 D_i6_801A7F70;
extern f32 D_i6_801A7F74;
extern f32 D_i6_801A7F78;
extern f32 D_i6_801A7F7C;
extern Vec3f D_i6_801A7F80[100];
extern f32 D_i6_801A8430;
extern f32 D_Andross_801A7F58;
extern f32 D_Andross_801A7F60;
extern f32 D_Andross_801A7F68;
extern f32 D_Andross_801A7F70;
extern f32 D_Andross_801A7F78;
void func_i6_80187530(Actor*);
void func_i6_80193C4C(Player*);
void func_i6_80195E44(Actor*);
void func_i6_80196BF8(Player*);
void func_i6_80196D88(Player*);
void func_i6_8019EE60(Player*);
void func_i6_8019FF00(Actor*);
void func_i6_801A0AC0(Player*);
void Andross_80187530(Actor*);
void Andross_80193C4C(Player*);
void Andross_80195E44(Actor*);
void Venom2_80196BF8(Player*);
void Venom2_80196D88(Player*);
void SectorY_8019EE60(Player*);
void SectorY_8019FF00(Actor*);
void SectorY_801A0AC0(Player*);
void func_i6_8018769C(Actor*);
void func_i6_80187520(u32 mode, void* ptr);
void func_i6_801878A8(void);
void func_i6_801888F4(Actor *);
void func_i6_80189214(void);
void func_i6_8018BDD8(void);
void func_i6_8018C390(Player*);
void func_i6_8018D16C(Boss *);
void func_i6_801961AC(void);
void func_i6_80196314(Actor*);
void func_i6_80196968(void);
void func_i6_80197CC4(Boss *);
void func_i6_801A3BD4(Actor*);
void func_i6_801A4CB0(Actor*);
void func_i6_801A5AD4(Player*);
void func_i6_801A5FC0(Player*);
void func_i6_801A6164(Player *);
void Andross_8018769C(Actor*);
void OvlI6_CallFunction(u32 mode, void* ptr);
void Andross_801878A8(void);
void Andross_801888F4(Actor *);
void Andross_80189214(void);
void Andross_8018BDD8(void);
void Andross_8018C390(Player*);
void Andross_8018D16C(Boss *);
void Andross_801961AC(void);
void Venom2_80196314(Actor*);
void Venom2_80196968(void);
void SectorY_80197CC4(Boss *);
void SectorY_801A3BD4(Actor*);
void SectorY_801A4CB0(Actor*);
void Turret_801A5AD4(Player*);
void Turret_801A5FC0(Player*);
void Turret_801A6164(Player *);
void func_i6_801880E4(Actor*);
void func_i6_80188448(Actor*);
void func_i6_80188528(Actor*);
void func_i6_80188660(Actor*);
void func_i6_8018933C(Actor*);
void func_i6_801893B8(Actor*);
void func_i6_80189470(Actor*);
void func_i6_80189724(Actor*);
void func_i6_80189B70(Boss*);
void func_i6_8018B8C0(Boss*);
void func_i6_8018CAD4(Effect*);
void func_i6_8018CF98(Effect*);
void func_i6_8018DBF0(Boss*);
void func_i6_801928C8(Boss*);
void func_i6_80192E94(Actor*);
void func_i6_80193244(Actor*);
void func_i6_80193380(Object_80*);
void func_i6_8019350C(Object_80*);
void func_i6_8019356C(Object_80*);
void func_i6_801935D4(Object_80*);
void func_i6_80196210(Boss*);
void func_i6_80196288(Boss*);
void func_i6_80197C64(Effect*);
void func_i6_80197CB8(Object_80*);
void func_i6_8019C888(Boss*);
void func_i6_8019E2C4(Boss*);
void func_i6_801A4E44(Object_80*);
void func_i6_801A52B8(Object_80*);
void Andross_801880E4(Actor*);
void Andross_80188448(Actor*);
void Andross_80188528(Actor*);
void Andross_80188660(Actor*);
void Andross_8018933C(Actor*);
void Andross_801893B8(Actor*);
void Andross_80189470(Actor*);
void Andross_80189724(Actor*);
void Andross_80189B70(Boss*);
void Andross_8018B8C0(Boss*);
void Andross_8018CAD4(Effect*);
void Andross_8018CF98(Effect*);
void Andross_8018DBF0(Boss*);
void Andross_801928C8(Boss*);
void Andross_80192E94(Actor*);
void Andross_80193244(Actor*);
void Andross_80193380(Object_80*);
void Andross_8019350C(Object_80*);
void Andross_8019356C(Object_80*);
void Andross_801935D4(Object_80*);
void Venom2_80196210(Boss*);
void Venom2_80196288(Boss*);
void SectorY_80197C64(Effect*);
void SectorY_80197CB8(Object_80*);
void SectorY_8019C888(Boss*);
void SectorY_8019E2C4(Boss*);
void SectorY_801A4E44(Object_80*);
void SectorY_801A52B8(Object_80*);
#endif
+7 -1
View File
@@ -1196,7 +1196,13 @@ void AudioThread_ResetAudioHeap(s32);
void AudioThread_PreNMIReset(void);
void AudioThread_Init(void);
extern AudioTable gSampleBankTableInit;
// extern AudioTableEntry gSampleBankTableInitEntries[];
extern AudioTable gSeqTableInit;
// extern AudioTableEntry gSeqTableInitEntries[];
extern AudioTable gSoundFontTableInit;
// extern AudioTableEntry gSoundFontTableInitEntries[];
extern u8 gSeqFontTableInit[];
extern u8 gSamplesPerWavePeriod[4];
+2 -2
View File
@@ -100,8 +100,8 @@ typedef enum RadioCharacterId {
} RadioCharacterId;
void Radio_PlayMessage(u16*, enum RadioCharacterId);
void func_800BB388(void);
void func_800BB5D0(void);
void func_radio_800BB388(void);
void func_radio_800BB5D0(void);
typedef enum {
MSGCHAR_END,
+1 -1
View File
@@ -701,7 +701,7 @@ typedef enum ObjectId {
#define OBJ_UNK_1000 1000
Actor* func_800A3608(ObjectId);
Actor* func_game_800A3608(ObjectId);
// template enums for boss work buffers
+12 -12
View File
@@ -40,23 +40,23 @@ s32 vsprintf(char* dst, const char* fmt, va_list args);
void Game_Initialize(void);
void Game_Update(void);
extern s32 D_800D2860[];
extern s32 D_800D2870;
extern s32 D_game_800D2860[];
extern s32 D_game_800D2870;
extern f32 D_80161A10;
extern f32 D_80161A14;
extern f32 D_game_80161A10;
extern f32 D_game_80161A14;
extern s32 gPlayerInactive[4];
extern s32 D_80161A28;
extern u8 D_80161A2C;
extern u16 D_80161A2E;
extern s32 D_game_80161A28;
extern u8 D_game_80161A2C;
extern u16 D_game_80161A2E;
extern u16 gNextLevel;
extern u16 gNextGameState;
extern u16 D_80161A34;
extern u16 D_game_80161A34;
extern u16 gBgColor;
extern u8 gBlurAlpha;
extern u8 D_80161A39;
extern f32 D_80161A3C;
extern f32 D_80161A40;
extern f32 D_80161A44;
extern u8 D_game_80161A39;
extern f32 D_game_80161A3C;
extern f32 D_game_80161A40;
extern f32 D_game_80161A44;
#endif
+132 -179
View File
@@ -8,235 +8,187 @@
#include "sf64player.h"
// fox_360
extern s32 D_800C9B4C;
extern s32 D_360_800C9B4C;
// fox_bg
extern u16 D_800C9C3C[16];
extern u16 D_bg_800C9C3C[16];
// fox_boss
extern s32 D_boss_800C9E90[];
// fox_tank
extern Vec3f D_800C9F2C;
extern Vec3f D_tank_800C9F2C;
// fox_display
extern s32 D_800CA220;
extern f32 D_800CA230;
extern Actor* D_800CA234;
extern s32 D_Timer_800CA238;
extern s32 D_display_800CA220;
extern f32 D_display_800CA230;
extern Actor* D_display_800CA234;
extern s32 D_display_Timer_800CA238;
// fox_edata
extern f32 D_800CBE70[];
extern f32 D_800CBE8C[];
extern f32 D_800CBEA8[];
extern f32 D_800CBEC4[];
extern f32 D_800CBEE0[];
extern f32 D_800CBEFC[];
extern f32 D_800CBF18[];
extern f32 D_800CBF34[];
extern f32 D_800CBF38[];
extern f32 D_800CBF54[];
extern f32 D_800CBF70[];
extern f32 D_800CBF8C[];
extern f32 D_800CBFA8[];
extern f32 D_800CBFC8[];
extern f32 D_800CBFE4[];
extern f32 D_800CC000[];
extern f32 D_800CC01C[];
extern f32 D_800CC038[];
extern f32 D_800CC054[];
extern f32 D_800CC070[];
extern f32 D_800CC0D4[];
extern f32 D_800CC0F0[];
extern ObjectInfo D_800CC124[];
extern f32 D_edata_800CBE70[];
extern f32 D_edata_800CBE8C[];
extern f32 D_edata_800CBEA8[];
extern f32 D_edata_800CBEC4[];
extern f32 D_edata_800CBEE0[];
extern f32 D_edata_800CBEFC[];
extern f32 D_edata_800CBF18[];
extern f32 D_edata_800CBF34[];
extern f32 D_edata_800CBF38[];
extern f32 D_edata_800CBF54[];
extern f32 D_edata_800CBF70[];
extern f32 D_edata_800CBF8C[];
extern f32 D_edata_800CBFA8[];
extern f32 D_edata_800CBFC8[];
extern f32 D_edata_800CBFE4[];
extern f32 D_edata_800CC000[];
extern f32 D_edata_800CC01C[];
extern f32 D_edata_800CC038[];
extern f32 D_edata_800CC054[];
extern f32 D_edata_800CC070[];
extern f32 D_edata_800CC0D4[];
extern f32 D_edata_800CC0F0[];
extern ObjectInfo D_edata_800CC124[];
extern f32* D_edata_800CF964[];
// fox_edisplay
extern f32 D_800CF9B0[];
extern Gfx* D_800CFA54[];
extern Gfx* D_800CFAC4[];
extern Gfx* D_800CFADC[];
extern Gfx* D_800CFB08[];
extern Gfx* D_800CFB14[];
extern Gfx* D_800CFB28[];
extern Gfx* D_800CFB40[];
extern Gfx* D_800CFB64[];
extern Gfx* D_800CFB88[];
extern Gfx* D_800CFBA8[];
extern Gfx* D_800CFBE4[];
extern Gfx* D_800CFC0C[];
extern Gfx* D_800CFC40[];
extern Gfx* D_800CFC50[];
extern Gfx* D_800CFC64[];
extern Gfx* D_800CFC7C[];
extern f32* D_800CF964[];
extern f32 D_800CFCA0[];
extern f32 D_800CFCCC[];
extern Gfx D_800CFD80[];
extern f32 D_edisplay_800CF9B0[];
extern Gfx* D_edisplay_800CFA54[];
extern Gfx* D_edisplay_800CFAC4[];
extern Gfx* D_edisplay_800CFADC[];
extern Gfx* D_edisplay_800CFB08[];
extern Gfx* D_edisplay_800CFB14[];
extern Gfx* D_edisplay_800CFB28[];
extern Gfx* D_edisplay_800CFB40[];
extern Gfx* D_edisplay_800CFB64[];
extern Gfx* D_edisplay_800CFB88[];
extern Gfx* D_edisplay_800CFBA8[];
extern Gfx* D_edisplay_800CFBE4[];
extern Gfx* D_edisplay_800CFC0C[];
extern Gfx* D_edisplay_800CFC40[];
extern Gfx* D_edisplay_800CFC50[];
extern Gfx* D_edisplay_800CFC64[];
extern Gfx* D_edisplay_800CFC7C[];
extern f32 D_edisplay_800CFCA0[];
extern f32 D_edisplay_800CFCCC[];
extern Gfx D_edisplay_800CFD80[];
// fox_enmy
extern ObjectInit* D_800CFDA0[];
extern s32 D_800CFDF4[];
extern f32 D_800CFE5C[];
extern Vec3f D_800CFEC4[6];
extern Vec3f D_800CFF0C[6];
extern u32 D_800CFF54[9];
extern ObjectInit* D_enmy_800CFDA0[];
extern u32 D_enmy_800CFF54[9];
// fox_6B3B0
extern s32 D_800CFF80[4];
extern s32 D_800CFF90;
extern s16 D_800CFF94[];
extern u8 D_800CFFB4[];
extern f32 D_800CFFC4[];
// fox_enmy2
extern s32 D_enmy2_800CFF80[4];
extern s32 D_enmy2_800CFF90;
// fox_hud
extern s16 D_800D1970;
extern f32 D_800D19AC[];
extern f32 D_800D19E0[];
extern Gfx D_800D1A40[];
extern s32 D_800D1EB4;
extern s32 D_800D1EB8;
extern s32 D_800D1EBC;
extern s32 D_800D20D8;
extern s32 D_800D2180[];
extern s32 D_800D2190[];
extern f32 D_800D21A0;
extern f32 D_800D21A4;
extern s16 D_hud_800D1970;
// fox_A4290
extern CollisionHeader D_800D2B38[];
extern CollisionHeader2 D_800D2CA0[];
// fox_play
extern u8 D_800D2F68;
extern u8 D_800D3180[30];
extern u8 D_play_800D2F68;
extern u8 D_play_800D3180[30];
// fox_radio
extern s32 gCurrentMsgPri;
// fox_360
extern s32 D_8015F900;
extern s32 D_8015F904;
extern s16 D_8015F908;
extern s32 D_8015F90C;
extern s32 D_8015F910;
extern f32 D_8015F914;
extern f32 D_8015F918;
extern f32 D_8015F91C;
extern u8 D_8015F920;
extern u8 D_8015F921;
extern s32 D_8015F924;
extern s32 D_8015F928;
extern s32 D_8015F930[3];
extern s32 D_8015F93C;
extern s32 D_8015F940;
extern f32 D_8015F944;
extern s32 D_360_8015F900;
extern s32 D_360_8015F904;
extern s16 D_360_8015F908;
extern s32 D_360_8015F90C;
extern s32 D_360_8015F910;
extern f32 D_360_8015F914;
extern f32 D_360_8015F918;
extern f32 D_360_8015F91C;
extern u8 D_360_8015F920;
extern u8 D_360_8015F921;
extern s32 D_360_8015F924;
extern s32 D_360_8015F928;
extern s32 D_360_8015F930[3];
extern s32 D_360_8015F93C;
extern s32 D_360_8015F940;
extern f32 D_360_8015F944;
// fox_bg
extern f32 D_8015F960;
extern u8 D_8015F964;
extern f32 D_8015F968;
extern f32 D_8015F96C;
extern f32 D_8015F970;
extern s32 D_8015F974;
extern s32 D_8015F978;
extern s32 D_8015F97C;
extern s32 D_8015F980;
extern f32 D_8015F984;
extern f32 D_bg_800C9C30;
extern u16 D_bg_800C9C34;
extern f32 D_bg_8015F960;
extern u8 D_bg_8015F964;
extern f32 D_bg_8015F968;
extern f32 D_bg_8015F96C;
extern f32 D_bg_8015F970;
extern s32 D_bg_8015F974;
extern s32 D_bg_8015F978;
extern s32 D_bg_8015F97C;
extern s32 D_bg_8015F980;
extern f32 D_bg_8015F984;
// fox_boss
extern s32 gBossFrameCount;
// fox_display
extern Vec3f D_801613B0[];
extern Vec3f D_801613E0[];
extern s16 D_80161410;
extern Matrix D_80161418[4];
extern Vec3f D_80161518[4];
extern Vec3f D_80161548[4];
extern Vec3f D_80161578[4];
extern f32 D_801615A8[4];
extern f32 D_801615B8[4];
extern Vec3f D_display_801613B0[]; // static, here for reordering
extern Vec3f D_display_801613E0[]; // static, here for reordering
extern s16 D_display_80161410;
extern Matrix D_display_80161418[]; // static, here for reordering
extern Vec3f D_display_80161518[]; // static, here for reordering
extern Vec3f D_display_80161548[]; // static, here for reordering
extern Vec3f D_display_80161578[];
extern f32 D_display_801615A8[];
extern f32 D_display_801615B8[];
// fox_edisplay
extern Vec3f D_801615D0;
extern Vec3f D_edisplay_801615D0;
// fox_enmy
extern s32 D_Timer_80161670[4];
extern s32 D_80161680;
extern u8 D_80161684;
extern s32 D_enmy_Timer_80161670[4];
extern s32 D_enmy_80161680;
extern u8 D_enmy_80161684;
// fox_enmy2
extern s32 D_80161690;
extern s32 D_enmy2_80161690;
// fox_hud
extern s32 D_80161704;
extern s32 D_80161708;
extern s32 D_8016170C;
extern s32 D_hud_80161704;
extern s32 D_hud_80161708;
extern s32 D_hud_8016170C;
extern s32 D_hud_80161710;
extern s32 gTotalHits; // 0x80161714 gTotalGameScore
extern f32 D_80161720[3];
extern s32 D_8016172C;
extern s32 D_80161730;
extern f32 D_hud_80161720[3];
extern s32 D_hud_8016172C;
extern s32 D_hud_80161730;
extern s32 gShowBossHealth; // 0x80161734
// fox_play
extern u8 D_80161A50;
extern f32 D_80161A54;
extern s32 D_80161A58;
extern s32 D_80161A5C;
extern u16 D_Timer_80161A60;
extern u16 D_80161A62;
extern s32 D_80161A64;
extern EnvSettings* sEnvSettings;
extern u8 D_play_80161A50;
extern f32 D_play_80161A54;
extern s32 D_play_80161A58;
extern s32 D_play_80161A5C;
extern u16 D_play_Timer_80161A60;
extern u16 D_play_80161A62;
//fox_radio
extern u16** D_80178720;
extern s32 D_80178724;
extern s32 D_80178728;
extern s32 D_8017872C;
extern f32 D_80178730;
extern f32 D_80178734;
extern f32 D_80178738;
extern f32 D_8017873C;
extern f32 D_80178740;
extern s32 D_80178744;
extern s32 D_80178748;
extern s32 D_8017874C;
extern u16** D_radio_80178720;
extern s32 D_radio_80178724;
extern s32 D_radio_80178728;
extern s32 D_radio_8017872C;
extern f32 D_radio_80178730;
extern f32 D_radio_80178734;
extern f32 D_radio_80178738;
extern f32 D_radio_8017873C;
extern f32 D_radio_80178740;
// fox_versus
extern s32 D_80178750;
extern s32 D_80178754;
extern s32 D_80178758;
extern s32 D_versus_80178750;
extern s32 D_versus_80178754;
extern s32 D_versus_80178758;
extern s32 sUnlockLandmaster; // sUnlockLandmaster
extern s32 sUnlockOnFoot; // sUnlockOnFoot
extern s32 D_80178768[];
extern s32 D_80178768[];
extern s32 D_80178778;
extern s32 D_80178780[4];
extern s32 D_80178790;
extern s32 D_80178794;
extern s32 D_80178798;
extern s32 D_8017879C;
extern s32 D_801787A0;
extern s32 D_801787A4;
extern s32 D_801787A8;
extern f32 D_801787AC;
extern f32 D_801787B0;
extern s32 D_801787B4;
extern s32 D_801787B8;
extern s32 D_801787BC;
extern f32 D_801787C0;
extern f32 D_801787C4;
extern f32 D_801787C8;
extern f32 D_801787CC;
extern f32 D_801787D0;
extern f32 D_801787D8[4];
extern f32 D_801787E8[4];
extern s32 D_801787F8[4];
extern u16 D_80178808[4];
extern s32 D_80178810[4];
extern s32 D_80178820[4];
extern s32 D_80178830;
extern s32 D_80178838[5];
extern s32 D_80178850[4];
extern OSTime D_80178860;
extern OSTime D_80178868;
extern s32 D_versus_80178768[];
// gfx_data
extern u16 D_Unk_800DACB8[][32];
@@ -245,7 +197,8 @@ extern u16 D_Tex_800DBA20[];
extern Gfx D_Gfx_800DBAA0[];
extern Gfx D_Gfx_800DAC20[];
extern Gfx D_Gfx_800D9688[];
extern u8 D_Unk_800DB4B8[];
extern Gfx D_Gfx_800D94D0[];
#endif // VARIABLES_H
+13 -13
View File
@@ -58,28 +58,28 @@ ast_radio_ROM_END = 0xDF4260; //defined:true
D_800C90F0 = 0x800C90F0;
D_800C45E0 = 0x800C45E0;
D_801615D0 = 0x801615D0;//size:0xC
D_801615E0 = 0x801615E0;//size:0xC
D_800CFF80 = 0x800CFF80;//size:0x10
D_edisplay_801615D0 = 0x801615D0;//size:0xC
D_edisplay_801615E0 = 0x801615E0;//size:0xC
D_enmy2_800CFF80 = 0x800CFF80;//size:0x10
D_80161578 = 0x80161578;//size:0x30
D_800CA23C = 0x800CA23C;//size:0x18
D_800CA26C = 0x800CA26C;//size:0x20
D_display_80161578 = 0x80161578;//size:0x30
D_display_800CA23C = 0x800CA23C;//size:0x18
D_display_800CA26C = 0x800CA26C;//size:0x20
D_800CA260 = 0x800CA260;//size:0xC
D_801613E0 = 0x801613E0;//size:0x18
D_800CC124 = 0x800CC124;//type:u8
D_800C9E90 = 0x800C9E90;//size:0x70
D_display_801613E0 = 0x801613E0;//size:0x18
D_edata_800CC124 = 0x800CC124;//type:u8
D_boss_800C9E90 = 0x800C9E90;//size:0x70
D_800D3180 = 0x800D3180; // size:0x20
D_play_800D3180 = 0x800D3180; // size:0x20
gSetupDLs = 0x800D31B0; // size:0x18C0
D_800CFCA0 = 0x800CFCA0;
D_edisplay_800CFCA0 = 0x800CFCA0;
sControllerMotor = 0x800DD900; // size:0x1A0
D_800CBDD4 = 0x800CBDD4; //size:0x98
D_800D55D0 = 0x800D55D0; //type:f32
D_boss_800D55D0 = 0x800D55D0; //type:f32
__libm_qnan_f = 0x800C9570;
__floorf = 0x8001FE60;
@@ -138,7 +138,7 @@ D_A4000000 = 0xA4000000;
D_A5000508 = 0xA5000508;
D_A5000510 = 0xA5000510;
D_800CFA54 = 0x800CFA54;
D_edisplay_800CFA54 = 0x800CFA54;
D_800D934C = 0x800D934C; // force_migration:True
D_800D503C = 0x800D503C; // force_migration:True
+1 -1
View File
@@ -2,7 +2,7 @@ Option_ExpertSoundUpdate = 0x80195944; // segment:ovl_menu
Option_VersusStageInit = 0x80199FA8; // segment:ovl_menu
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
Map_GetPlanetId = 0x801A6480; // force_migration:True segment:ovl_menu
sOptionCardList = 0x801AE638; // type:OptionEntry segment:ovl_menu size:0x240
D_menu_801AE99C = 0x801AE99C; // force_migration:True segment:ovl_menu
sTimeTrialMinuteTextures = 0x801AF28C; // force_migration:True segment:ovl_menu
File diff suppressed because it is too large Load Diff

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