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

finish overlay file renaming and split off their headers (#92)

Browse Source 
* names

* format 1

* more names
This commit is contained in:
petrie911
2024-01-17 12:36:58 -03:00
committed by GitHub
parent f4257e65b9
commit 0fb8d58334
72 changed files with 2973 additions and 3218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diff_settings.py
+1 -1
View File
@@ -6,4 +6,4 @@ def apply(config, args):
config['mapfile'] = 'build/starfox64.us.map'
config['source_directories'] = ['./src','./include']
config['objdump_flags'] = ['-M','reg-names=32']
config['makeflags'] = ["KEEP_MDEBUG=1"]
config['makeflags'] = ["KEEP_MDEBUG=1"]
include/assets.h
+1177
View File
File diff suppressed because it is too large Load Diff
include/functions.h
+5 -411
View File
@@ -131,7 +131,7 @@ void func_80040CDC(void);
void func_80040CE4(void);
void func_80042D38(void);
// fox_43AC0
// fox_boss
void func_80042EC0(Boss* boss);
void func_80042FAC(Boss* boss);
void func_80042FB8(Boss* boss);
@@ -142,7 +142,7 @@ void func_80042FE8(Boss* boss);
void func_800430DC(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3);
// fox_43E80
// fox_tank
void func_80043468(Player* player);
void func_800444BC(Player * player);
void func_80044868(Player*);
@@ -241,7 +241,6 @@ bool func_80062DBC(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot,
s32 func_800631A8(Vec3f*, f32*, Vec3f*);
s32 func_8006326C(Vec3f* , Vec3f* , ObjectId , Object* );
s32 func_8006351C(s32 , Vec3f* , Vec3f* , s32 );
s32 func_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
void func_800652CC(Object_80*);
void func_800654E4(Object *);
void func_800656D4(Actor*);
@@ -568,6 +567,7 @@ void func_800A887C(Player* player);
s32 func_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot,
f32 zRot, f32 arg9, f32 argA, f32 argB);
bool func_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8);
void func_800A4F4C(Object_58*);
// fox_radio
s32 func_800BA7BC(u16*, s32);
@@ -589,415 +589,9 @@ void func_800C26C8(void);
s32 Save_Write(void);
s32 Save_Read(void);
void func_EFFA40_80187520(s32, void*);
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_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 *);
void func_i3_80187944(Boss*);
void func_i3_8018C54C(Boss*);
void func_i3_8018DF74(Player *player);
void func_i3_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 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 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_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(void);
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_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 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_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(u32 mode, void* ptr);
void func_E9F1D0_801878A8(void);
void func_E9F1D0_801888F4(Actor *);
void func_E9F1D0_80189214(void);
void func_E9F1D0_8018BDD8(void);
void func_E9F1D0_8018C390(Player*);
void func_E9F1D0_8018D16C(Boss *);
void func_E9F1D0_801961AC(Object_58**);
void func_E9F1D0_80196314(Actor*);
void func_E9F1D0_80196968(Object_58**);
void func_E9F1D0_80197CC4(Boss *);
void func_E9F1D0_801A3BD4(Actor*);
void func_E9F1D0_801A4CB0(Actor*);
void func_E9F1D0_801A5AD4(Player*);
void func_E9F1D0_801A5FC0(Player*);
void func_E9F1D0_801A6164(Player *);
void func_menu_80187520(u32, void*);
void func_EF0260_8018A96C(void);
void func_EF0260_8018AAC4(void);
// 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(Item*);
// 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*);
// void func_E9F1D0_80188660(Object*);
// void func_E9F1D0_8018933C(Object*);
// void func_E9F1D0_801893B8(Object*);
// void func_E9F1D0_80189470(Object*);
// void func_E9F1D0_80189724(Object*);
// void func_E9F1D0_80189B70(Object*);
// void func_E9F1D0_8018B8C0(Object*);
// void func_E9F1D0_8018CAD4(Object*);
// void func_E9F1D0_8018CF98(Object*);
// void func_E9F1D0_8018DBF0(Object*);
// void func_E9F1D0_801928C8(Object*);
// void func_E9F1D0_80192E94(Object*);
// void func_E9F1D0_80193244(Object*);
// void func_E9F1D0_80193380(Object*);
// void func_E9F1D0_8019350C(Object*);
// void func_E9F1D0_8019356C(Object*);
// void func_E9F1D0_801935D4(Object*);
// void func_E9F1D0_80196210(Object*);
// void func_E9F1D0_80196288(Object*);
// void func_E9F1D0_80197C64(Object*);
// void func_E9F1D0_80197CB8(Object*);
// void func_E9F1D0_8019C888(Object*);
// void func_E9F1D0_8019E2C4(Object*);
// void func_E9F1D0_801A4E44(Object*);
// void func_E9F1D0_801A52B8(Object*);
void func_ending_8018A96C(void);
void func_ending_8018AAC4(void);
#endif
include/global.h
+7
View File
@@ -22,5 +22,12 @@
#include "sf64thread.h"
#include "sf64player.h"
#include "gfx.h"
#include "i1.h"
#include "i2.h"
#include "i3.h"
#include "i4.h"
#include "i5.h"
#include "i6.h"
#include "assets.h"
#endif // GLOBAL_H
include/i1.h
+75
View File
@@ -0,0 +1,75 @@
#ifndef I1_H
#define I1_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "sf64mesg.h"
extern Gfx* D_i1_8019A008[];
extern f32 D_i1_8019A9B8[];
extern void func_i1_8018F880(Player*);
extern void func_i1_80191160(Player*);
extern void func_i1_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 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*);
#endif
include/i2.h
+50
View File
@@ -0,0 +1,50 @@
#ifndef I2_H
#define I2_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#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 func_i2_80187520(s32, void*);
void func_i2_80187B08(Actor *);
void func_i2_80188A40(Boss *);
void func_i2_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*);
#endif
include/i3.h
+153
View File
@@ -0,0 +1,153 @@
#ifndef I3_H
#define I3_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "sf64mesg.h"
// extern f32 D_i3_801C4188; Currently externed in relevant files for bss ordering
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 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 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 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 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_801AC8A8(f32, f32, f32, f32, s32);
void func_i3_801AC918(Effect*);
void func_i3_801ACBB4(void);
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_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*);
#endif
include/i4.h
+55
View File
@@ -0,0 +1,55 @@
#ifndef I4_H
#define I4_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "sf64mesg.h"
extern Matrix D_i4_8019EE80;
extern s32 D_i4_801A03DC;
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 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 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*);
#endif
include/i5.h
+132
View File
@@ -0,0 +1,132 @@
#ifndef I5_H
#define I5_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#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*);
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_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 );
#endif
include/i6.h
+73
View File
@@ -0,0 +1,73 @@
#ifndef I6_H
#define I6_H
#include "libc/stdbool.h"
#include "structs.h"
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "sf64mesg.h"
extern f32 D_i6_801A7F58;
extern f32 D_i6_801A7F60;
extern f32 D_i6_801A7F68;
extern f32 D_i6_801A7F70;
extern f32 D_i6_801A7F78;
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 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 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*);
#endif
include/libc/math.h
+3
View File
@@ -12,6 +12,9 @@
#define SHT_MAX 32767.0f
#define SHT_MINV (1.0f / SHT_MAX)
#define RAD_TO_DEG(radians) ((radians * 180.0f) / M_PI)
#define DEG_TO_RAD(degrees) ((degrees * M_PI) / 180.0f)
typedef union {
struct {
u32 hi;
include/sf64dma.h
+5 -5
View File
@@ -93,7 +93,7 @@ typedef struct {
extern DmaEntry gDmaTable[]; // 178A70
extern OverlayInit sNoOvl_Logo[1]; // sets segment 15 with no overlay
extern OverlayInit sOvlEF0260_Credits[6]; // overlay EF0260
extern OverlayInit sOvlending_Credits[6]; // overlay EF0260
extern OverlayInit sOvlmenu_Title[1]; // EBFBE0
extern OverlayInit sOvlmenu_Menu[1]; // EBFBE0
extern OverlayInit sOvlmenu_Map[1]; // EBFBE0
@@ -107,19 +107,19 @@ extern OverlayInit sOvli3_Aquas[1]; // i3
extern OverlayInit sOvli3_Area6[1]; // i3
extern OverlayInit sOvli4_Fortuna[2]; // i4
extern OverlayInit sOvli3_Unk4[1]; // i3
extern OverlayInit sOvlE9F1D0_SectorY[1]; // E9F1D0
extern OverlayInit sOvli6_SectorY[1]; // E9F1D0
extern OverlayInit sOvli3_Solar[1]; // i3
extern OverlayInit sOvli3_Zoness[1]; // i3
extern OverlayInit sOvli1_Venom1[1]; // fox_i1
extern OverlayInit sOvlE9F1D0_Venom2[1]; // E9F1D0
extern OverlayInit sOvlE9F1D0_VenomSW[2]; // E9F1D0
extern OverlayInit sOvli6_Venom2[1]; // E9F1D0
extern OverlayInit sOvli6_VenomSW[2]; // E9F1D0
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
extern OverlayInit sunused_Overlay[1]; // EFFA40
DECLARE_SEGMENT(makerom);
DECLARE_SEGMENT(main);
include/variables.h
+4 -1192
View File
File diff suppressed because it is too large Load Diff
linker_scripts/us/symbol_addrs.txt
+4 -4
View File
@@ -77,7 +77,7 @@ Save_Checksum = 0x800C2FB0;
Save_Write = 0x800C3084;
Save_Read = 0x800C3194;
sEFFA40_Overlay = 0x800CBD3C;
sunused_Overlay = 0x800CBD3C;
D_800CFA54 = 0x800CFA54;
@@ -100,8 +100,8 @@ 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_ending_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
D_i6_801A7560 = 0x801A7560; // force_migration:True segment:ovl_i6
D_i6_801A792C = 0x801A792C; // force_migration:True segment:ovl_i6
linker_scripts/us/symbol_addrs_engine.txt
+2 -2
View File
@@ -151,7 +151,7 @@ Message_IsPrintingChar = 0x800C2F30;
D_800C9CC4 = 0x800C9CC4;
D_800C9CF8 = 0x800C9CF8;
// fox_43AC0
// fox_boss
gBossFrameCount = 0x801613A0;
// fox_save
@@ -515,7 +515,7 @@ D_80177D68 = 0x80177D68;
D_80177D70 = 0x80177D70;
D_80177D88 = 0x80177D88;
gBombCount = 0x80177DA0;
gFrameCount = 0x80177DB0;
gGameFrameCount = 0x80177DB0;
D_80177DC8 = 0x80177DC8;
D_80177E70 = 0x80177E70;
D_80177E78 = 0x80177E78;
linker_scripts/us/symbol_addrs_nlib_vars.txt
+1 -1
View File
@@ -75,7 +75,7 @@ gLight = 0x80137E6C;
gFrameBuffer = 0x80137E70;
gTextureRender = 0x80137E74;
D_80137E78 = 0x80137E78;
gFrameCounter = 0x80137E7C;
gSysFrameCount = 0x80137E7C;
gStartNMI = 0x80137E80;
gStopTasks = 0x80137E81;
D_80137E84 = 0x80137E84; // size:0x4
linker_scripts/us/symbol_addrs_overlays.txt
+10 -10
View File
@@ -134,14 +134,14 @@ D_i5_801BE29C = 0x801BE29C;
D_i5_801BE2FA = 0x801BE2FA;
D_i5_801BE2A4 = 0x801BE2A4;
func_E9F1D0_801888F4 = 0x801888F4;
func_E9F1D0_80197CC4 = 0x80197CC4;
func_E9F1D0_8018D16C = 0x8018D16C;
D_E9F1D0_801A7F30 = 0x801A7F30;
D_E9F1D0_801A7F58 = 0x801A7F58;
D_E9F1D0_801A7F60 = 0x801A7F60;
D_E9F1D0_801A7F68 = 0x801A7F68;
D_E9F1D0_801A7F70 = 0x801A7F70;
D_E9F1D0_801A7F78 = 0x801A7F78;
func_i6_801888F4 = 0x801888F4;
func_i6_80197CC4 = 0x80197CC4;
func_i6_8018D16C = 0x8018D16C;
D_i6_801A7F30 = 0x801A7F30;
D_i6_801A7F58 = 0x801A7F58;
D_i6_801A7F60 = 0x801A7F60;
D_i6_801A7F68 = 0x801A7F68;
D_i6_801A7F70 = 0x801A7F70;
D_i6_801A7F78 = 0x801A7F78;
D_EFFA40_801875C0 = 0x801875C0;
D_unused_801875C0 = 0x801875C0;
src/main/fox_360.c
+16 -16
View File
@@ -683,7 +683,7 @@ void func_8003010C(Actor* actor) {
func_i4_8019AB8C(actor);
break;
case LEVEL_VENOM_2:
func_E9F1D0_80196314(actor);
func_i6_80196314(actor);
break;
}
func_8002FEF0(actor);
@@ -1212,7 +1212,7 @@ void func_800319AC(Actor* this) {
}
}
if ((this->timer_0CA[0] != 0) && (gCurrentLevel != LEVEL_VENOM_2) && (this->unk_0E4 < 10) &&
(this->timer_0CA[0] < 5) && !(gFrameCount & 0x1F)) {
(this->timer_0CA[0] < 5) && !(gGameFrameCount & 0x1F)) {
this->iwork[16] = 10;
}
if ((this->iwork[16] != 0) && (this->unk_0B8 < 7)) {
@@ -1452,9 +1452,9 @@ void func_800319AC(Actor* this) {
}
if ((this->unk_0E4 >= 4) && (this->unk_0E4 != 8) &&
((gCurrentLevel != LEVEL_VENOM_2) || (this->unk_0E4 != 4))) {
spCC = __sinf(((this->index * 45) + gFrameCount) * M_DTOR) * 100.0f;
spC8 = __cosf(((this->index * 45) + (gFrameCount * 2)) * M_DTOR) * 100.0f;
spC4 = __sinf(((this->index * 45) + gFrameCount) * M_DTOR) * 100.0f;
spCC = __sinf(((this->index * 45) + gGameFrameCount) * M_DTOR) * 100.0f;
spC8 = __cosf(((this->index * 45) + (gGameFrameCount * 2)) * M_DTOR) * 100.0f;
spC4 = __sinf(((this->index * 45) + gGameFrameCount) * M_DTOR) * 100.0f;
}
if (gPlayer[0].unk_4DC == 0) {
this->fwork[4] = gPlayer[0].pos.x + spCC;
@@ -1482,9 +1482,9 @@ void func_800319AC(Actor* this) {
}
} else if (this->unk_0E6 != 100) {
if (this->unk_0E4 >= 10) {
spCC = __sinf(((this->index * 45) + gFrameCount) * M_DTOR) * 200.0f;
spC8 = __cosf(((this->index * 45) + (gFrameCount * 2)) * M_DTOR) * 200.0f;
spC4 = __sinf(((this->index * 45) + gFrameCount) * M_DTOR) * 200.0f;
spCC = __sinf(((this->index * 45) + gGameFrameCount) * M_DTOR) * 200.0f;
spC8 = __cosf(((this->index * 45) + (gGameFrameCount * 2)) * M_DTOR) * 200.0f;
spC4 = __sinf(((this->index * 45) + gGameFrameCount) * M_DTOR) * 200.0f;
}
this->fwork[4] = gActors[this->unk_0E6].obj.pos.x + spCC;
this->fwork[5] = gActors[this->unk_0E6].obj.pos.y + spC8;
@@ -1528,8 +1528,8 @@ void func_800319AC(Actor* this) {
if ((spE8 < spF4) && (spEC < spF4)) {
this->iwork[4]++;
this->iwork[5] = 1;
if (!((this->index + gFrameCount) & sp10F) && (Rand_ZeroOne() < spF0) && func_80031900(this) &&
((gActors[0].unk_0B8 == 2) || (gCurrentLevel == LEVEL_TRAINING))) {
if (!((this->index + gGameFrameCount) & sp10F) && (Rand_ZeroOne() < spF0) &&
func_80031900(this) && ((gActors[0].unk_0B8 == 2) || (gCurrentLevel == LEVEL_TRAINING))) {
if ((this->unk_0E6 == 0) && (gCurrentLevel != LEVEL_TRAINING)) {
if ((this->iwork[4] > 250) && (gCurrentLevel != LEVEL_VENOM_ANDROSS)) {
if ((Rand_ZeroOne() < 0.5f) || (gCurrentLevel == LEVEL_VENOM_2)) {
@@ -1871,7 +1871,7 @@ void func_800319AC(Actor* this) {
if (gCurrentLevel == LEVEL_VENOM_2) {
var_v0 = 1;
}
if (!((this->index + gFrameCount) & var_v0)) {
if (!((this->index + gGameFrameCount) & var_v0)) {
this->fwork[19] = Math_RadToDeg(Math_Atan2F(spE4, spDC));
this->fwork[20] = Math_RadToDeg(Math_Atan2F(spE0, sqrtf(SQ(spE4) + SQ(spDC))));
}
@@ -1918,7 +1918,7 @@ void func_800319AC(Actor* this) {
spD0 = 360.0f - spD0;
}
if ((this->fwork[7] > 0.01f) && (this->fwork[7] < 359.9f)) {
if (!((gFrameCount + 0xF) & 0x1F) && (gCurrentLevel != LEVEL_VENOM_2)) {
if (!((gGameFrameCount + 0xF) & 0x1F) && (gCurrentLevel != LEVEL_VENOM_2)) {
this->timer_0CA[0] = 0;
}
} else {
@@ -1933,7 +1933,7 @@ void func_800319AC(Actor* this) {
}
if ((this->fwork[7] > 0.01f) && (this->fwork[7] < 359.9f)) {
Math_SmoothStepToAngle(&this->obj.rot.z, this->fwork[7], 0.2f, 100.0f, 0.01f);
if ((this->unk_0E4 == 8) && !(gFrameCount & 1)) {
if ((this->unk_0E4 == 8) && !(gGameFrameCount & 1)) {
if ((this->fwork[7] > 10.0f) && (this->fwork[7] < 350.0f)) {
Matrix_RotateY(gCalcMatrix, this->obj.rot.y * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, this->obj.rot.x * M_DTOR, 1);
@@ -2099,7 +2099,7 @@ void func_80034E64(Actor* actor) {
}
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -30.0f, 1);
Matrix_Scale(gGfxMatrix, sp24, sp24 * 0.5f, sp24, 1);
Matrix_RotateY(gGfxMatrix, gFrameCount * 3.0f * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * 3.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL(&gMasterDisp, 0x29);
if (gCurrentLevel == LEVEL_KATINA) {
@@ -2125,7 +2125,7 @@ void func_80035098(Actor* actor) {
Matrix_RotateX(gGfxMatrix, -actor->obj.rot.x * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, M_DTOR * -actor->obj.rot.y - gPlayer[0].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[0].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * actor->iwork[15] * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 20.0f * actor->iwork[15] * M_DTOR, 1);
if (actor->iwork[15] < 0) {
Matrix_RotateX(gGfxMatrix, M_PI, 1);
}
@@ -2149,7 +2149,7 @@ bool func_800352E0(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f* rot, void* thi
RCP_SetupDL(&gMasterDisp, 0x1D);
}
if ((limbIndex == 1) || (limbIndex == 3)) {
rot->z += gFrameCount * 3.0f;
rot->z += gGameFrameCount * 3.0f;
}
if ((limbIndex == 1) || (limbIndex == 2)) {
RCP_SetupDL(&gMasterDisp, 0x22);
src/main/fox_852F0.c
+2 -2
View File
@@ -8,9 +8,9 @@ void func_800846F0(FrameBuffer* arg0) {
s32 sp4C[5];
s32 sp38[5];
for (i = 0; i < gFrameCounter % SCREEN_HEIGHT; i++) {
for (i = 0; i < gSysFrameCount % SCREEN_HEIGHT; i++) {
var_v0 = SCREEN_WIDTH * i + arg0->data;
for (j = 0; j < gFrameCounter % SCREEN_WIDTH; j++, var_v0++) {
for (j = 0; j < gSysFrameCount % SCREEN_WIDTH; j++, var_v0++) {
sp60[1] = RGBA16_RED(var_v0[0]);
sp4C[1] = RGBA16_GRN(var_v0[0]);
sp38[1] = RGBA16_BLU(var_v0[0]);
src/main/fox_A4290_colheaders.c
+1
View File
@@ -1,6 +1,7 @@
#include "structs.h"
#include "macros.h"
#include "variables.h"
#include "assets.h"
static Vec3f D_800D2920[16] = {
{ 1075.0f, 0.0f, 0.0f }, { 746.0f, 0.0f, -746.0f }, { 202.0f, 361.0f, -202.0f }, { 0.0f, 0.0f, -1075.0f },

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