PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-02 16:23:57 +03:00
Code Issues Actions 2 Packages Projects Releases 1 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 09:36:58 -06:00 committed by GitHub
parent f4257e65b9
commit 0fb8d58334
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
72 changed files with 2973 additions and 3218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff_settings.py
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"]

1177
include/assets.h Normal file
View File

File diff suppressed because it is too large Load Diff

416
include/functions.h
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

7
include/global.h
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

75
include/i1.h Normal file
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

50
include/i2.h Normal file
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

153
include/i3.h Normal file
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

55
include/i4.h Normal file
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

132
include/i5.h Normal file
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

73
include/i6.h Normal file
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

3
include/libc/math.h
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;

10
include/sf64dma.h
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);

1196
include/variables.h
View File

File diff suppressed because it is too large Load Diff

8
linker_scripts/us/symbol_addrs.txt
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

4
linker_scripts/us/symbol_addrs_engine.txt
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;

2
linker_scripts/us/symbol_addrs_nlib_vars.txt
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

20
linker_scripts/us/symbol_addrs_overlays.txt
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;

32
src/main/fox_360.c
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);

4
src/main/fox_852F0.c
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]);

1
src/main/fox_A4290_colheaders.c
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 },

30
src/main/fox_beam.c
View File

@ -1250,8 +1250,8 @@ void func_80039A50(PlayerShot* shot) {
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 40.0f * M_DTOR, 1);
if (!(gFrameCount & 1)) {
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 40.0f * M_DTOR, 1);
if (!(gGameFrameCount & 1)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, 1);
@ -1314,21 +1314,21 @@ void func_80039A50(PlayerShot* shot) {
D_800C9C08[shot->playerNum], 255);
RCP_SetupDL(&gMasterDisp, 0x31);
if (gLaserStrength[shot->playerNum] != LASERS_SINGLE) {
Matrix_RotateZ(gGfxMatrix, gFrameCount * 48.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 48.0f * M_DTOR, 1);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, 50.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 70.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_301AD60);
Matrix_Pop(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, -50.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 70.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 70.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_301AD60);
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
var_fv1 = M_PI;
} else {
var_fv1 = 0.0f;
@ -1340,7 +1340,7 @@ void func_80039A50(PlayerShot* shot) {
gSPDisplayList(gMasterDisp++, D_301AD60);
}
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
var_fv1 = M_PI;
} else {
var_fv1 = 0.0f;
@ -1365,7 +1365,7 @@ void func_80039A50(PlayerShot* shot) {
gDPSetEnvColor(gMasterDisp++, D_800C9C00[shot->playerNum], D_800C9C04[shot->playerNum],
D_800C9C08[shot->playerNum], 255);
if (gLaserStrength[shot->playerNum] != LASERS_SINGLE) {
Matrix_RotateZ(gGfxMatrix, gFrameCount * 48.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 48.0f * M_DTOR, 1);
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.f, 40.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
@ -1422,14 +1422,14 @@ void func_80039A50(PlayerShot* shot) {
} else {
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 255);
}
Matrix_RotateZ(gGfxMatrix, gFrameCount * 53.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_RotateZ(gGfxMatrix, gFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.7f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.3f, 1);
@ -1445,7 +1445,7 @@ void func_80039A50(PlayerShot* shot) {
Matrix_Translate(gGfxMatrix, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + D_80177D20, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.2f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.5f, 1.5f, 1.5f, 1);
@ -1553,7 +1553,7 @@ void func_8003B00C(PlayerShot* shot, Player* player) {
shot->unk_48 += shot->vel.x;
shot->unk_4C += shot->vel.y;
shot->unk_50 += shot->vel.z;
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_800A668C(D_8017849C, D_801784A0, D_80178498);
}
if ((fabsf(shot->obj.pos.x - shot->unk_48) < 200.0f) && (fabsf(shot->obj.pos.y - shot->unk_4C) < 200.0f) &&
@ -1756,10 +1756,10 @@ void func_8003C008(PlayerShot* shot) {
for (i = 0; i < ARRAY_COUNT(gBosses); i++, boss++) {
if ((boss->obj.status == 2) && (boss->timer_05A == 0)) {
if (boss->obj.id == OBJ_BOSS_316) {
var_s6 = gFrameCount & 7;
var_s6 = gGameFrameCount & 7;
var_fs2 = shot->unk_44 * 40.0f;
} else {
var_s6 = gFrameCount & 0xF;
var_s6 = gGameFrameCount & 0xF;
var_fs2 = shot->unk_44 * 30.0f;
}
hitboxData = boss->info.hitbox;

17
src/main/fox_bg.c
View File

@ -340,7 +340,7 @@ void func_8003E1E8(void) {
} else if ((D_80177AB0 == 3) || (D_80177AB0 == 4)) {
RCP_SetupDL(&gMasterDisp, 0x3E);
if (D_80177AB0 == 4) {
if (!(gFrameCount & 8)) {
if (!(gGameFrameCount & 8)) {
Math_SmoothStepToF(&D_80161394, 0.0f, 1.0f, 30.0f, 0);
} else {
Math_SmoothStepToF(&D_80161394, 120.0f, 1.0f, 30.0f, 0);
@ -371,14 +371,15 @@ void func_8003E1E8(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -290.0f, 1);
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 11.0f, 11.0f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gFrameCount * 1.5f)) * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * 1.5f)) * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C039208);
Matrix_Pop(&gGfxMatrix);
if (D_80177AB0 != 5) {
Matrix_Push(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gFrameCount * -1.3f)) * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, (gPlayer[0].unk_034 + (gGameFrameCount * -1.3f)) * M_DTOR,
1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C039208);
Matrix_Pop(&gGfxMatrix);
@ -523,9 +524,9 @@ void func_8003E1E8(void) {
Matrix_Translate(gGfxMatrix, sp138 - 120.0f, -(sp134 - 120.0f), -290.0f, 1);
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1);
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.07f, 0.93f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.07f, 0.93f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_7001540);
@ -1113,7 +1114,7 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -2000.0f, 1);
Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
gSPDisplayList(gMasterDisp++, D_60005B0);
} else {
gSPDisplayList(gMasterDisp++, D_6002E60);
@ -1124,7 +1125,7 @@ void func_80040CE4(void) {
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -1500.0f, 1);
Matrix_Scale(gGfxMatrix, 3.0f, 2.0f, 3.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
gSPDisplayList(gMasterDisp++, D_6008830);
} else {
gSPDisplayList(gMasterDisp++, D_600B0E0);
@ -1150,7 +1151,7 @@ void func_80042D38(void) {
RCP_SetupDL_37(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 125);
Matrix_SetGfxMtx(&gMasterDisp);
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
gSPDisplayList(gMasterDisp++, D_602C030);
} else {
gSPDisplayList(gMasterDisp++, D_602C088);

38
src/main/fox_43AC0.c → src/main/fox_boss.c
View File

@ -10,30 +10,30 @@ s32 D_800C9E90[28] = {
const f32 D_800D55D0[] = { 6000.0f, 18000.0f, -6000.0f, -18000.0f };
void func_80042EC0(Boss* boss) {
s32 var_a3;
f32 var_fv0;
s32 bonus;
f32 yOffset;
if (gBossFrameCount < 0xF00) {
var_a3 = 10;
} else if (gBossFrameCount < 0x1680) {
var_a3 = 5;
} else if (gBossFrameCount < 0x1E00) {
var_a3 = 2;
} else if (gBossFrameCount < 0x2580) {
var_a3 = 1;
if (gBossFrameCount < 3840) {
bonus = 10;
} else if (gBossFrameCount < 5760) {
bonus = 5;
} else if (gBossFrameCount < 7680) {
bonus = 2;
} else if (gBossFrameCount < 9600) {
bonus = 1;
} else {
var_a3 = 0;
bonus = 0;
}
if (var_a3 != 0) {
var_fv0 = 0.0f;
if (bonus != 0) {
yOffset = 0.0f;
if (boss->obj.id == OBJ_BOSS_292) {
var_fv0 = 300.0f;
yOffset = 300.0f;
} else if (boss->obj.id == OBJ_BOSS_306) {
var_fv0 = 200.0f;
yOffset = 200.0f;
}
func_80077240(boss->obj.pos.x, boss->obj.pos.y + var_fv0, boss->obj.pos.z, var_a3);
func_80077240(boss->obj.pos.x, boss->obj.pos.y + yOffset, boss->obj.pos.z, bonus);
}
gHitCount += var_a3 + 1;
gHitCount += bonus + 1;
D_80177850 = 15;
}
@ -91,8 +91,8 @@ void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f
}
}
void func_80043188(Actor* actor) {
actor->info.unk_10 = 30000.0f;
void func_80043188(Boss* boss) {
boss->info.unk_10 = 30000.0f;
}
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {

169
src/main/fox_demo.c
View File

@ -131,41 +131,6 @@ AnimationHeader* D_800CA1F4[] = {
D_60265B4, D_602B8DC, D_60034C4, D_602A2CC, D_602CEB4, D_602B778, (AnimationHeader*) 0x0601F3B8,
};
extern void func_i5_8018769C(Player*);
extern void func_801882CC(Player*, OSContPad**, OSContPad**);
extern void func_8018CD8C(Player*);
extern void func_8018DA58(Actor*);
extern void func_8018E084(Player*);
extern void func_8018ED9C(Actor*);
extern void func_8018EF6C(Player*);
extern void func_8018F880(Player*);
extern void func_8018F94C(Player*);
extern void func_80191160(Player*);
extern void func_80192E20(Player*);
extern void func_80193A30(Player*);
extern void func_80193C4C(Player*);
extern void func_80194728(Player*);
extern void func_80195E44(Actor*);
extern void func_80196BF8(Player*);
extern void func_80196D88(Player*);
extern void func_80197290(Player*);
extern void func_80197F10(Actor*);
extern void func_801988B8(Player*);
extern void func_8019BA64(Player*);
extern void func_8019C85C(Player*);
extern void func_8019DD20(Actor*);
extern void func_8019E5F0(Actor*);
extern void func_8019EE60(Player*);
extern void func_8019FF00(Actor*);
extern void func_E9F1D0_801A0AC0(Player*);
extern void func_801A8BE8(Actor*);
extern void func_801AB9B0(Player*);
extern void func_i5_801AC754(Player*);
extern void func_801AF8F4(Player*, OSContPad**, OSContPad**);
extern void func_801B28BC(Actor*);
extern void func_801B3D04(Player*, OSContPad**, OSContPad**);
extern void func_801BE0F0(Actor*);
void func_80048AC0(s32 teamId) {
s32 teamShield;
@ -699,16 +664,16 @@ void func_8004A52C(Player* player) {
if (gLevelMode == LEVELMODE_ON_RAILS) {
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
func_8018F880(player);
func_i1_8018F880(player);
func_800AA800(player);
break;
case LEVEL_METEO:
func_8018CD8C(player);
func_i2_8018CD8C(player);
break;
case LEVEL_SECTOR_X:
func_80193A30(player);
func_i2_80193A30(player);
break;
case LEVEL_TITANIA:
@ -725,7 +690,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_SECTOR_Y:
func_E9F1D0_801A0AC0(player);
func_i6_801A0AC0(player);
break;
case LEVEL_SOLAR:
@ -733,7 +698,7 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_VENOM_1:
func_801988B8(player);
func_i1_801988B8(player);
func_800AA800(player);
break;
@ -755,22 +720,22 @@ void func_8004A52C(Player* player) {
break;
case LEVEL_VENOM_2:
func_80196BF8(player);
func_i6_80196BF8(player);
func_800AA800(player);
break;
case LEVEL_BOLSE:
func_8018EF6C(player);
func_i4_8018EF6C(player);
func_800AA800(player);
break;
case LEVEL_KATINA:
func_80192E20(player);
func_i4_80192E20(player);
func_800AA800(player);
break;
case LEVEL_SECTOR_Z:
func_8019BA64(player);
func_i4_8019BA64(player);
default:
break;
@ -841,7 +806,7 @@ void func_8004A888(Effect* effect) {
void func_8004AA84(void) {
s32 i;
if (!(gFrameCount & 7) && (gLevelType == LEVEL_CORNERIA)) {
if (!(gGameFrameCount & 7) && (gLevelType == LEVEL_CORNERIA)) {
for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
if (!gEffects[i].obj.status) {
func_8004A888(&gEffects[i]);
@ -1265,15 +1230,15 @@ void func_8004B368(Player* player) {
D_80178478 = player->unk_138 + sp6C.z;
switch (D_80177A80) {
case 0x14A:
case 330:
D_80177840 = 100;
break;
case 0x19A:
case 410:
func_800BA808(gMsg_ID_2335, RCID_FOX);
break;
case 0x226:
case 550:
if ((gTeamShields[2] == (-1)) || (gTeamShields[2] == 0)) {
func_800BA808(gMsg_ID_20333, RCID_ROB64);
} else {
@ -1281,7 +1246,7 @@ void func_8004B368(Player* player) {
}
break;
case 0x2AA:
case 682:
if ((gTeamShields[3] == -1) || (gTeamShields[3] == 0)) {
func_800BA808(gMsg_ID_20332, RCID_ROB64);
} else {
@ -1289,7 +1254,7 @@ void func_8004B368(Player* player) {
}
break;
case 0x330:
case 816:
if ((gTeamShields[1] == (-1)) || (gTeamShields[1] == 0)) {
func_800BA808(gMsg_ID_20331, RCID_ROB64);
} else {
@ -1351,15 +1316,15 @@ void func_8004B368(Player* player) {
}
switch (D_80177A80) {
case 0x3C1:
case 961:
D_80177830 = 1;
break;
case 0x489:
case 1161:
D_80177830 = 0;
break;
case 0x4E7:
case 1255:
player->unk_1D0 = 3;
player->timer_1F8 = 0xA;
func_800A6028(&player->unk_460, 0x09000002U);
@ -1415,10 +1380,10 @@ void func_8004C930(Player* player) {
switch (player->form) {
case FORM_ARWING:
if ((gCurrentLevel == LEVEL_VENOM_ANDROSS) || ((gCurrentLevel == LEVEL_VENOM_2) && (D_8017827C == 1))) {
func_80193C4C(player);
func_i6_80193C4C(player);
} else if (gCurrentLevel == LEVEL_SECTOR_X) {
if (D_8017827C == 0) {
func_80194728(player);
func_i2_80194728(player);
} else {
func_80048E40(player);
}
@ -1428,15 +1393,15 @@ void func_8004C930(Player* player) {
func_8004C90C(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_BOLSE) {
func_8018F94C(player);
func_i4_8018F94C(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_SECTOR_Z) {
func_8019C85C(player);
func_i4_8019C85C(player);
} else if (gCurrentLevel == LEVEL_KATINA) {
func_80197290(player);
func_i4_80197290(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_SECTOR_Y) {
func_8019EE60(player);
func_i6_8019EE60(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_SOLAR) {
func_i3_801A7930(player);
@ -1445,19 +1410,19 @@ void func_8004C930(Player* player) {
func_i3_8019D76C(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_VENOM_2) {
func_80196D88(player);
func_i6_80196D88(player);
func_800AA800(player);
} else if (gCurrentLevel == LEVEL_METEO) {
if (D_8017827C == 0) {
func_8018E084(player);
func_i2_8018E084(player);
} else {
func_80048E40(player);
}
} else if ((gCurrentLevel == LEVEL_CORNERIA) && (gLevelMode == LEVELMODE_ALL_RANGE)) {
func_80191160(player);
func_i1_80191160(player);
func_800AA800(player);
} else {
if (D_80177A80 == 0xAA) {
if (D_80177A80 == 170) {
func_8001D444(0, 0x26U, 0, 0xFFU);
}
func_8004B368(player);
@ -1476,11 +1441,11 @@ void func_8004C930(Player* player) {
gInputPress->stick_x = btn;
if (gCurrentLevel == LEVEL_TITANIA) {
func_801882CC(player, &gInputPress, &gInputHold);
func_i5_801882CC(player);
} else if (D_80177930 != 0) {
func_801AF8F4(player, &gInputPress, &gInputHold);
func_i5_801AF8F4(player);
} else {
func_801B3D04(player, &gInputPress, &gInputHold);
func_i5_801B3D04(player);
}
func_80046358(player);
@ -1770,11 +1735,11 @@ void func_8004D828(Player* player) {
}
if (gCamCount == 1) {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007D24C((Rand_ZeroOne() - 0.5f) * 20.0 + player->pos.x,
(Rand_ZeroOne() - 0.5f) * 20.0 + player->pos.y, player->unk_138, 2.2f);
}
} else if (!(gFrameCount & 3)) {
} else if (!(gGameFrameCount & 3)) {
func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + player->pos.x,
(Rand_ZeroOne() - 0.5f) * 10.0f + player->pos.y,
((Rand_ZeroOne() - 0.5f) * 10.0f) + player->unk_138, 2.2f);
@ -1888,7 +1853,7 @@ void func_8004DEF8(Player* player) {
player->unk_0E4 += 26.0f;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
sp34 = Rand_ZeroOne();
func_8007D24C(((sp34 - 0.5f) * 20.0) + player->pos.x, ((Rand_ZeroOne() - 0.5f) * 20.0) + player->pos.y,
player->unk_138, 2.2f);
@ -1953,7 +1918,7 @@ void func_8004E3D8(Player* player) {
player->unk_228 = 0;
player->unk_280 = 0;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_80137E84[gPlayerNum] = 1;
}
@ -1974,7 +1939,7 @@ void func_8004E3D8(Player* player) {
break;
case FORM_BLUE_MARINE:
func_801AB9B0(player);
func_i3_801AB9B0(player);
break;
case FORM_ON_FOOT:
@ -2275,13 +2240,13 @@ void func_8004F05C(Actor* actor) {
break;
case LEVEL_AREA_6:
func_8018DA58(actor);
func_i3_8018DA58(actor);
break;
case LEVEL_SECTOR_Y:
switch (actor->unk_0B6) {
case 0:
func_8019FF00(actor);
func_i6_8019FF00(actor);
break;
case 42:
@ -2318,50 +2283,50 @@ void func_8004F05C(Actor* actor) {
default:
switch (actor->unk_0B8) {
case 0x64:
case 100:
Math_SmoothStepToF(&actor->obj.pos.x, actor->vwork[0x14].x, 0.03f, 3.0f, 0.0f);
Math_SmoothStepToF(&actor->obj.pos.y, actor->vwork[0x14].y, 0.03f, 2.0f, 0.0f);
Math_SmoothStepToF(&actor->obj.pos.z, actor->vwork[0x14].z, 0.03f, 2.0f, 0.0f);
Math_SmoothStepToF(&actor->obj.rot.z, 0.0f, 0.02f, 0.3f, 0);
break;
case 0x0:
case 0:
actor->obj.rot.z = actor->unk_0F4.z;
if (actor->unk_0B6 == 0xA) {
actor->obj.pos.z = gPlayer[0].camEye.z + 12000.0f;
}
break;
case 0x1:
case 1:
actor->vel.y += 0.8f;
actor->vel.x += 0.8f;
Math_SmoothStepToF(&actor->obj.rot.z, 420.0f, 0.1f, 15.0f, 0.001f);
break;
case 0x2:
case 2:
actor->vel.y += 0.8f;
actor->vel.x -= 0.8f;
Math_SmoothStepToF(&actor->obj.rot.z, -420.0f, 0.1f, 15.0f, 0.001f);
break;
case 0x3:
case 3:
actor->vel.y += 1.2f;
actor->vel.z += 0.1f;
Math_SmoothStepToF(&actor->obj.rot.x, -45.0f, 0.1f, 15.0f, 0.001f);
break;
case 0xA:
case 10:
actor->vel.x -= 1.0f;
Math_SmoothStepToF(&actor->obj.rot.z, -45.0f, 0.05f, 0.5f, 0.0f);
break;
case 0xB:
case 11:
actor->vel.x -= 2.0f;
Math_SmoothStepToF(&actor->obj.rot.z, -70.0f, 0.1f, 6.0f, 0.0f);
Math_SmoothStepToF(&actor->obj.rot.y, 225.0f, 0.05f, 2.0f, 0.0f);
break;
case 0xC:
case 12:
actor->vel.x += 2.0f;
actor->vel.y += 1.0f;
Math_SmoothStepToF(&actor->obj.rot.z, 80.0f, 0.1f, 6.0f, 0.0f);
@ -2369,7 +2334,7 @@ void func_8004F05C(Actor* actor) {
Math_SmoothStepToF(&actor->obj.rot.y, 135.0f, 0.05f, 2.0f, 0.0f);
break;
case 0xD:
case 13:
actor->vel.y += 2.0f;
Math_SmoothStepToF(&actor->obj.rot.z, -400.0f, 0.2f, 14.0f, 0.0f);
Math_SmoothStepToF(&actor->obj.rot.x, -45.0f, 0.05f, 4.0f, 0.0f);
@ -2412,42 +2377,42 @@ void func_8004F8AC(Actor* actor) {
switch (gCurrentLevel) {
case LEVEL_SECTOR_Y:
if (gPlayer[0].unk_1D0 >= 3) {
func_8019FF00(actor);
func_i6_8019FF00(actor);
}
break;
case LEVEL_SOLAR:
if (gPlayer[0].unk_1D0 >= 3) {
func_801A8BE8(actor);
func_i3_801A8BE8(actor);
}
break;
case LEVEL_ZONESS:
if (gPlayer[0].unk_1D0 >= 3) {
func_8019E5F0(actor);
func_i3_8019E5F0(actor);
}
break;
case LEVEL_VENOM_ANDROSS:
case LEVEL_VENOM_2:
func_80195E44(actor);
func_i6_80195E44(actor);
break;
case LEVEL_KATINA:
func_80197F10(actor);
func_i4_80197F10(actor);
break;
case LEVEL_SECTOR_Z:
func_8019DD20(actor);
func_i4_8019DD20(actor);
break;
case LEVEL_AREA_6:
func_8018DA58(actor);
func_i3_8018DA58(actor);
break;
case LEVEL_METEO:
if (D_8017827C == 0) {
func_8018ED9C(actor);
func_i2_8018ED9C(actor);
break;
}
@ -2518,7 +2483,7 @@ void func_8004F8AC(Actor* actor) {
break;
case LEVEL_MACBETH:
func_801B28BC(actor);
func_i5_801B28BC(actor);
break;
case LEVEL_BOLSE:
@ -2541,7 +2506,7 @@ void func_8004F8AC(Actor* actor) {
case PLAYERSTATE_1C8_0:
if (gCurrentLevel == LEVEL_SECTOR_Y) {
func_8019FF00(actor);
func_i6_8019FF00(actor);
}
break;
}
@ -2685,7 +2650,7 @@ void func_8004FEC0(Actor* actor) {
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * actor->fwork[20],
((Rand_ZeroOneSeeded() - 0.5f) * 3000.0f) * actor->fwork[20], 1);
Matrix_RotateY(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * M_PI), 1);
Matrix_RotateZ(gGfxMatrix, (2.0f * gFrameCount) * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, (2.0f * gGameFrameCount) * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, 2.0f * (Rand_ZeroOneSeeded() * M_PI), 1);
switch (sp2D0 & 3) {
@ -2719,11 +2684,11 @@ void func_8004FEC0(Actor* actor) {
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_2) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateX(gGfxMatrix, 0.34906584f, 1);
Matrix_RotateY(gGfxMatrix, (gFrameCount * 0.5f) * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, (gGameFrameCount * 0.5f) * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
} else {
Matrix_RotateX(gGfxMatrix, -0.17453292f, 1);
Matrix_RotateY(gGfxMatrix, (gFrameCount * 0.3f) * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, (gGameFrameCount * 0.3f) * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 4.0f, 4.0f, 4.0f, 1);
Matrix_Push(&gGfxMatrix);
}
@ -2738,7 +2703,7 @@ void func_8004FEC0(Actor* actor) {
RCP_SetupDL(&gMasterDisp, 0x40);
switch ((gFrameCount >> 3) & 3) {
switch ((gGameFrameCount >> 3) & 3) {
case 0:
sp2DC = 255.0f;
sp2D8 = 0.0f;
@ -2910,7 +2875,7 @@ void func_8004FEC0(Actor* actor) {
break;
case 41:
func_801BE0F0(actor);
func_i3_801BE0F0(actor);
break;
case 42:
@ -2997,13 +2962,13 @@ void func_800515C4(void) {
if ((i != 1) || (D_80177B8C != 0)) {
sp9C[i] = 0.0f;
if (i < 2) {
if (!(gFrameCount & 0x38)) {
sp9C[i] = D_800CA170[gFrameCount & 7];
if (!(gGameFrameCount & 0x38)) {
sp9C[i] = D_800CA170[gGameFrameCount & 7];
}
gDPSetEnvColor(gMasterDisp++, 255, 32, 32, 128);
} else {
if (!((gFrameCount + 32) & 0x38)) {
sp9C[i] = D_800CA170[gFrameCount & 7];
if (!((gGameFrameCount + 32) & 0x38)) {
sp9C[i] = D_800CA170[gGameFrameCount & 7];
}
gDPSetEnvColor(gMasterDisp++, 32, 32, 255, 128);
}
@ -3019,7 +2984,7 @@ void func_800515C4(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 48);
gDPSetEnvColor(gMasterDisp++, 255, 255, 0, 48);
for (i = 0, var_s6_2 = D_800CA0EC; i < 3; i++, var_s6_2++) {
sp9C[i] = D_800CA190[gFrameCount & 1];
sp9C[i] = D_800CA190[gGameFrameCount & 1];
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, var_s6_2->x, var_s6_2->y, var_s6_2->z, 1);
Matrix_Scale(gGfxMatrix, sp9C[i], sp9C[i], 1.0f, 1);

46
src/main/fox_display.c
View File

@ -284,7 +284,7 @@ void func_80052884(Player* player) {
if (gPlayerNum == player->num) {
sp64 = 0.0f;
if (gChargeTimers[player->num] >= 20) {
sp64 = (f32) (gFrameCount & 7) * 80.0f;
sp64 = (f32) (gGameFrameCount & 7) * 80.0f;
}
sp58.x = 0.0f;
sp58.y = 0.0f;
@ -357,7 +357,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
sp2C *= 1.1f;
}
Matrix_Push(&gGfxMatrix);
@ -380,7 +380,7 @@ void func_80052D48(Player* player) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
sp2C *= 1.1f;
}
Matrix_Push(&gGfxMatrix);
@ -599,7 +599,7 @@ void func_80053C38(Player* player, s32 arg1) {
if ((gPlayerNum == player->num) && (arg1 == 0)) {
sp48 = 0.0f;
if (gChargeTimers[player->num] >= 20) {
sp48 = (f32) (gFrameCount & 7) * 80.0f;
sp48 = (f32) (gGameFrameCount & 7) * 80.0f;
}
sp4C.x = 0.0f;
sp4C.y = 0.0f;
@ -782,7 +782,7 @@ void func_8005478C(Player* player) {
} else {
Matrix_Scale(gGfxMatrix, player->unk_194, player->unk_194, 1.0f, 1);
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
Matrix_Scale(gGfxMatrix, 0.9f, 0.63f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 0.80999994f, 0.567f, 1.0f, 1);
@ -816,7 +816,7 @@ void func_80054914(Player* player) {
player->unk_138 + player->unk_144 + sp34.z, 1);
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].unk_058, 1);
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].unk_05C, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 20.0f * sp4C * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 20.0f * sp4C * M_DTOR, 1);
if (player->form == FORM_ARWING) {
Matrix_Scale(gGfxMatrix, 2.0f, 2.0f, 2.0f, 1);
} else {
@ -903,10 +903,10 @@ void func_80054E80(Player* player) {
} else {
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 128);
}
Matrix_RotateZ(gGfxMatrix, gFrameCount * 53.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_RotateZ(gGfxMatrix, gFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
@ -914,7 +914,7 @@ void func_80054E80(Player* player) {
Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1);
}
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1);
@ -1008,15 +1008,15 @@ void func_80055788(Player* player) {
} else {
gDPSetEnvColor(gMasterDisp++, 0, 255, 0, 128);
}
Matrix_RotateZ(gGfxMatrix, gFrameCount * 53.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 53.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_RotateZ(gGfxMatrix, gFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * -53.0f * 2.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_Scale(gGfxMatrix, 1.7f, 1.7f, 1.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 1.3f, 1.3f, 1.0f, 1);
@ -1095,7 +1095,7 @@ void func_80055E98(Player* player) {
}
if (player->unk_25C != 0.0f) {
sp54 = 0.0f;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
sp54 = 180.0f;
}
var_fs0 = player->unk_0E8;
@ -1313,8 +1313,8 @@ void func_80056E2C(Player* player) {
f32 sp2C;
if ((player->unk_234 != 0) && (player->unk_240 == 0)) {
sp34 = D_800CA334[gFrameCount & 7];
sp30 = D_800CA334[(gFrameCount + 4) & 7];
sp34 = D_800CA334[gGameFrameCount & 7];
sp30 = D_800CA334[(gGameFrameCount + 4) & 7];
if (player->unk_1D4 != 0) {
sp34 = sp30 = 0.0f;
}
@ -1358,7 +1358,7 @@ void func_80057248(void) {
s32 i;
f32 var_fs0;
if (!(gFrameCount & 4)) {
if (!(gGameFrameCount & 4)) {
RCP_SetupDL_40();
for (i = 0; i < ARRAY_COUNT(D_80177E98); i++) {
if (D_80177E98[i].z < 0.0f) {
@ -1500,9 +1500,9 @@ void func_800578C4(Player* player) {
D_801779D8.x = player->pos.x + sp40.x;
D_801779D8.y = player->pos.y + sp40.y + 20.0f;
D_801779D8.z = player->unk_138 + sp40.z;
D_801779E8.x = (__sinf(gFrameCount * 3.0f * M_DTOR) * 3.0f) + player->pos.x;
D_801779E8.y = (__cosf(gFrameCount * 4.0f * M_DTOR) * 3.0f) + player->pos.y;
D_801779E8.z = (__sinf(gFrameCount * 3.5f * M_DTOR) * 3.0f) + player->unk_138;
D_801779E8.x = (__sinf(gGameFrameCount * 3.0f * M_DTOR) * 3.0f) + player->pos.x;
D_801779E8.y = (__cosf(gGameFrameCount * 4.0f * M_DTOR) * 3.0f) + player->pos.y;
D_801779E8.z = (__sinf(gGameFrameCount * 3.5f * M_DTOR) * 3.0f) + player->unk_138;
break;
}
}
@ -1527,9 +1527,9 @@ void func_80057D00(void) {
} else {
Math_SmoothStepToF(&D_800CA230, 0.0f, 0.2f, 0.002f, 0.0f);
}
Matrix_RotateZ(gGfxMatrix, gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.0f + D_800CA230, 1.0f - D_800CA230, 1.0f, 1);
Matrix_Push(&gGfxMatrix);
func_800B73E0(player);
@ -1556,7 +1556,7 @@ void func_80057D00(void) {
D_801779E8.z += player->unk_138 + player->unk_144;
if ((player->unk_238 != 0) && (player->unk_110 > 5.0f)) {
D_801779E8.x += __sinf(gFrameCount * 150.0f * M_DTOR) * player->unk_110 * 0.2f;
D_801779E8.x += __sinf(gGameFrameCount * 150.0f * M_DTOR) * player->unk_110 * 0.2f;
}
} else if (player->state_1C8 == PLAYERSTATE_1C8_7) {
func_800578C4(player);
@ -1698,7 +1698,7 @@ void func_80057D00(void) {
}
}
if ((gLevelMode == LEVELMODE_UNK_2) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3)) {
func_E9F1D0_801A6164(gPlayer);
func_i6_801A6164(gPlayer);
}
func_80040954();
if ((gCamCount != 1) && ((player->state_1C8 == PLAYERSTATE_1C8_3) || (player->state_1C8 == PLAYERSTATE_1C8_5))) {

620
src/main/fox_edata_1C.c
View File

@ -1,359 +1,5 @@
#include "global.h"
// these are overlay functions. They will need to be replaced with their proper overlay names given below them.
// func_i1_801875A4
void func_801875A4(Object*);
// func_i1_80189058
void func_80189058(Object*);
// func_i1_8018AA74
void func_8018AA74(Object*);
// func_i1_8018AED0
void func_8018AED0(Object*);
// func_i1_8018B15C
void func_8018B15C(Object*);
// func_i1_8018B418
void func_8018B418(Object*);
// func_i1_8018B58C
void func_8018B58C(Object*);
// func_i1_8018BAAC
void func_8018BAAC(Object*);
// func_i1_8018BBA4
void func_8018BBA4(Object*);
// func_i1_8018BBF8
void func_8018BBF8(Object*);
// func_i1_8018BD7C
void func_8018BD7C(Object*);
// func_i1_8018C19C
void func_8018C19C(Object*);
// func_i1_8018DDAC
void func_8018DDAC(Object*);
// func_i1_8018E290
void func_8018E290(Object*);
// func_i1_8018E76C
void func_8018E76C(Object*);
// func_i1_8018ECAC
void func_8018ECAC(Object*);
// func_i1_8018ED78
void func_8018ED78(Object*);
// func_i1_8018EE84
void func_8018EE84(Object*);
// func_i1_8018EF90
void func_8018EF90(Object*);
// func_i1_8018F044
void func_8018F044(Object*);
// func_i1_8018F31C
void func_8018F31C(Object*);
// func_i1_801922DC
void func_801922DC(Object*);
// func_i1_80192358
void func_80192358(Object*);
// func_i1_801923C0
void func_801923C0(Object*);
// func_i1_8019243C
void func_8019243C(Object*);
// func_i1_80192518
void func_80192518(Object*);
// func_i1_80192CD4
void func_80192CD4(Object*);
// func_i1_80192E2C
void func_80192E2C(Object*);
// func_i1_80192EB0
void func_80192EB0(Object*);
// func_i1_801933DC
void func_801933DC(Object*);
// func_i1_801934D0
void func_801934D0(Object*);
// func_i1_80193540
void func_80193540(Object*);
// func_i1_80194398
void func_80194398(Object*);
// func_i1_801985E4
void func_801985E4(Object*);
// func_i1_80198968
void func_80198968(Item*);
// func_i2_8018756C
void func_8018756C(Object*);
// func_i2_80187650
void func_80187650(Object*);
// func_i2_801877C4
void func_801877C4(Object*);
// func_i2_8018795C
void func_8018795C(Object*);
// func_i2_80188344
void func_80188344(Object*);
// func_i2_801887D0
void func_801887D0(Object*);
// func_i2_80188CAC
void func_80188CAC(Object*);
// func_i2_80188FAC
void func_80188FAC(Object*);
// func_i2_80189114
void func_80189114(Object*);
// func_i2_8018978C
void func_8018978C(Object*);
// func_i2_8018BACC
void func_8018BACC(Object*);
// func_i2_8018D9EC
void func_8018D9EC(Object*);
// func_i2_8018DA6C
void func_8018DA6C(Object*);
// func_i2_8018DAEC
void func_8018DAEC(Object*);
// func_i2_8018DB6C
void func_8018DB6C(Object*);
// func_i2_8018DBEC
void func_8018DBEC(Object*);
// func_i2_8018DCE4
void func_8018DCE4(Object*);
// func_i2_8018DE14
void func_8018DE14(Object*);
// func_i2_8018F330
void func_8018F330(Object*);
// func_i2_8018F884
void func_8018F884(Object*);
// func_i2_8018FE38
void func_8018FE38(Object*);
// func_i2_8018FF20
void func_8018FF20(Object*);
// func_i2_8018FF84
void func_8018FF84(Object*);
// func_i2_80190020
void func_80190020(Object*);
// func_i2_80190078
void func_80190078(Object*);
// func_i2_80193434
void func_80193434(Object*);
// func_i4_80188AD0
void func_80188AD0(Object*);
// func_i4_80188FE4
void func_80188FE4(Object*);
// func_i4_80191054
void func_80191054(Object*);
// func_i4_80191180
void func_80191180(Object*);
// func_i4_801912FC
void func_801912FC(Object*);
// func_i4_80191AFC
void func_80191AFC(Object*);
// func_i4_80192984
void func_80192984(Object*);
// func_i4_80192A68
void func_80192A68(Object*);
// func_i4_80193718
void func_80193718(Object*);
// func_i4_80193B1C
void func_80193B1C(Object*);
// func_i4_801946C4
void func_801946C4(Object*);
// func_i4_801968F4
void func_801968F4(Object*);
// func_i4_8019E234
void func_8019E234(Object*);
// func_i4_8019E3A8
void func_8019E3A8(Object*);
// func_i4_8019E454
void func_8019E454(Object*);
// func_i4_8019E98C
void func_8019E98C(Object*);
// func_i5_80188F60
void func_80188F60(Object*);
// func_i5_80188FA8
void func_80188FA8(Object*);
// func_i5_80189194
void func_80189194(Object*);
// func_i5_801895B8
void func_801895B8(Object*);
// func_i5_80189AFC
void func_80189AFC(Object*);
// func_i5_80189CC8
void func_80189CC8(Object*);
// func_i5_8018A1C0
void func_8018A1C0(Object*);
// func_i5_8018A544
void func_8018A544(Object*);
// func_i5_8018AABC
void func_8018AABC(Object*);
// func_i5_8018AB44
void func_8018AB44(Object*);
// func_i5_8018B268
void func_8018B268(Object*);
// func_i5_8018B6AC
void func_8018B6AC(Object*);
// func_i5_8018B9D0
void func_8018B9D0(Object*);
// func_i5_8018BE84
void func_8018BE84(Object*);
// func_i5_8018C8A8
void func_8018C8A8(Object*);
// func_i5_8018E2D8
void func_8018E2D8(Object*);
// func_i5_8018E54C
void func_8018E54C(Object*);
// func_i5_8018E5B4
void func_8018E5B4(Object*);
// func_i5_8018E5F8
void func_8018E5F8(Object*);
// func_i5_8018EF14
void func_8018EF14(Object*);
// func_i5_8018F038
void func_8018F038(Object*);
// func_i5_8018F4D8
void func_8018F4D8(Object*);
// func_i5_8018F8B8
void func_8018F8B8(Object*);
// func_i5_80197A94
void func_80197A94(Object*);
// func_i5_801982A8
void func_801982A8(Object*);
// func_i5_8019C778
void func_8019C778(Object*);
// func_i5_8019CE88
void func_8019CE88(Object*);
// func_i5_8019D700
void func_8019D700(Object*);
// func_i5_8019E410
void func_8019E410(Object*);
// func_i5_8019EA60
void func_8019EA60(Object*);
// func_i5_8019EE68
void func_8019EE68(Object*);
// func_i5_8019FF9C
void func_8019FF9C(Object*);
// func_i5_801A0BD8
void func_801A0BD8(Object*);
// func_i5_801A12C4
void func_801A12C4(Object*);
// func_i5_801A23AC
void func_801A23AC(Object*);
// func_i5_801A2A78
void func_801A2A78(Object*);
// func_i5_801A2B24
void func_801A2B24(Object*);
// func_i5_801A2DD8
void func_801A2DD8(Object*);
// func_i5_801A3240
void func_801A3240(Object*);
// func_i5_801A3E98
void func_801A3E98(Object*);
// func_i5_801A43BC
void func_801A43BC(Object*);
// func_i5_801A46A0
void func_801A46A0(Object*);
// func_i5_801A4A64
void func_801A4A64(Object*);
// func_i5_801A4B24
void func_801A4B24(Object*);
// func_i5_801A54E8
void func_801A54E8(Object*);
// func_i5_801A57D0
void func_801A57D0(Object*);
// func_i5_801A5AF0
void func_801A5AF0(Object*);
// func_i5_801A5B4C
void func_801A5B4C(Object*);
// func_i5_801A5D68
void func_801A5D68(Object*);
// func_i5_801A5E54
void func_801A5E54(Object*);
// func_i5_801A5F90
void func_801A5F90(Object*);
// func_i5_801A5FD0
void func_801A5FD0(Object*);
// func_i5_801A6100
void func_801A6100(Object*);
// func_i5_801A6144
void func_801A6144(Object*);
// func_i5_801A6540
void func_801A6540(Object*);
// func_i5_801A6608
void func_801A6608(Object*);
// func_i5_801A67C8
void func_801A67C8(Object*);
// func_i5_801A68EC
void func_801A68EC(Object*);
// func_i5_801A7E7C
void func_801A7E7C(Object*);
// func_i5_801AC294
void func_801AC294(Object*);
// func_i5_801AC438
void func_801AC438(Object*);
// func_i5_801AD6F0
void func_801AD6F0(Object*);
// func_i5_801ADAC8
void func_801ADAC8(Object*);
// func_i5_801ADD68
void func_801ADD68(Object*);
// func_i5_801AE2C0
void func_801AE2C0(Object*);
// func_i5_801AE87C
void func_801AE87C(Object*);
// func_i5_801AEAA0
void func_801AEAA0(Object*);
// func_i5_801AEC04
void func_801AEC04(Object*);
// func_i5_801AEEFC
void func_801AEEFC(Object*);
// func_E9F1D0_801880E4
void func_801880E4(Object*);
// func_E9F1D0_80188448
void func_80188448(Object*);
// func_E9F1D0_80188528
void func_80188528(Object*);
// func_E9F1D0_80188660
void func_80188660(Object*);
// func_E9F1D0_8018933C
void func_8018933C(Object*);
// func_E9F1D0_801893B8
void func_801893B8(Object*);
// func_E9F1D0_80189470
void func_80189470(Object*);
// func_E9F1D0_80189724
void func_80189724(Object*);
// func_E9F1D0_80189B70
void func_80189B70(Object*);
// func_E9F1D0_8018B8C0
void func_8018B8C0(Object*);
// func_E9F1D0_8018CAD4
void func_8018CAD4(Object*);
// func_E9F1D0_8018CF98
void func_8018CF98(Object*);
// func_E9F1D0_8018DBF0
void func_8018DBF0(Object*);
// func_E9F1D0_801928C8
void func_801928C8(Object*);
// func_E9F1D0_80192E94
void func_80192E94(Object*);
// func_E9F1D0_80193244
void func_80193244(Object*);
// func_E9F1D0_80193380
void func_80193380(Object*);
// func_E9F1D0_8019350C
void func_8019350C(Object*);
// func_E9F1D0_8019356C
void func_8019356C(Object*);
// func_E9F1D0_801935D4
void func_801935D4(Object*);
// func_E9F1D0_80196210
void func_80196210(Object*);
// func_E9F1D0_80196288
void func_80196288(Object*);
// func_E9F1D0_80197C64
void func_80197C64(Object*);
// func_E9F1D0_80197CB8
void func_80197CB8(Object*);
// func_E9F1D0_8019C888
void func_8019C888(Object*);
// func_E9F1D0_8019E2C4
void func_8019E2C4(Object*);
// func_E9F1D0_801A4E44
void func_801A4E44(Object*);
// func_E9F1D0_801A52B8
void func_801A52B8(Object*);
f32 D_800CBE70[] = {
1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
};
@ -476,20 +122,20 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_49, */ {(void*) func_800595D0, 1, (ObjectFunc) NULL, D_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_50, */ {(void*) D_6007410, 0, (ObjectFunc) NULL, D_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_51, */ {(void*) D_6006F50, 0, (ObjectFunc) NULL, D_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_52, */ {(void*) D_6005780, 0, (ObjectFunc) func_i1_80193540, D_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_53, */ {(void*) D_6003610, 0, (ObjectFunc) NULL, D_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_54, */ {(void*) D_6000E00, 0, (ObjectFunc) func_8006AA98, D_603E0EC, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_55, */ {(void*) D_6013B50, 0, (ObjectFunc) NULL, D_603E88C, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_8018F31C, 2, (ObjectFunc) func_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_8018F8B8, 1, (ObjectFunc) func_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_56, */ {(void*) func_i1_8018F31C, 2, (ObjectFunc) func_i1_8018F044, D_603E8A8, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_80_57, */ {(void*) func_i5_8018F8B8, 1, (ObjectFunc) func_i5_8018F4D8, D_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_58, */ {(void*) D_700BE00, 0, (ObjectFunc) NULL, D_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_59, */ {(void*) D_6024010, 0, (ObjectFunc) NULL, D_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_60, */ {(void*) D_6027180, 0, (ObjectFunc) NULL, D_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) func_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_61, */ {(void*) func_i5_801A2A78, 1, (ObjectFunc) NULL, D_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_62, */ {(void*) D_60270E0, 0, (ObjectFunc) NULL, D_800CBF34, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_63, */ {(void*) D_6013960, 0, (ObjectFunc) NULL, D_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_64, */ {(void*) D_600AF40, 0, (ObjectFunc) NULL, D_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_65, */ {(void*) func_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_65, */ {(void*) func_i5_801A6608, 1, (ObjectFunc) NULL, D_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_66, */ {(void*) D_601F1D0, 0, (ObjectFunc) NULL, D_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_67, */ {(void*) D_60238F0, 0, (ObjectFunc) NULL, D_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 },
/* OBJ_80_68, */ {(void*) D_601B7C0, 0, (ObjectFunc) NULL, D_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
@ -501,42 +147,42 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_74, */ {(void*) D_602DC20, 0, (ObjectFunc) NULL, D_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_75, */ {(void*) D_601B0D0, 0, (ObjectFunc) NULL, D_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_76, */ {(void*) D_60075D0, 0, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_77, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_78, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_79, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_80, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_81, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_82, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_83, */ {(void*) func_801A3240, 1, (ObjectFunc) func_801A2DD8, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_84, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_85, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_86, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_87, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_88, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_89, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_90, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_91, */ {(void*) func_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_92, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_93, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_94, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_95, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_96, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_97, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_98, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_99, */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_100 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_101 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_102 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_103 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_104 */ {(void*) func_801A23AC, 1, (ObjectFunc) func_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_105 */ {(void*) func_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_77, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_78, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_79, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_80, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_81, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_82, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_83, */ {(void*) func_i5_801A3240, 1, (ObjectFunc) func_i5_801A2DD8, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_84, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_85, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_86, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_87, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_88, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_89, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_90, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_91, */ {(void*) func_i5_801A2B24, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_92, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_93, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_94, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_95, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_96, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_97, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_98, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_99, */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_100 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_101 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_102 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_103 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_800CBF34, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_104 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) func_i5_801A0BD8, D_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_105 */ {(void*) func_i5_801A23AC, 1, (ObjectFunc) NULL, D_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_106 */ {(void*) D_60097E0, 0, (ObjectFunc) NULL, D_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_107 */ {(void*) D_601D730, 0, (ObjectFunc) NULL, D_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_108 */ {(void*) D_60102C0, 0, (ObjectFunc) NULL, D_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_109 */ {(void*) D_60036A0, 0, (ObjectFunc) func_801A4E44, D_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_109 */ {(void*) D_60036A0, 0, (ObjectFunc) func_i6_801A4E44, D_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_110 */ {(void*) D_6005360, 0, (ObjectFunc) NULL, D_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_111 */ {(void*) func_80074F90, 1, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_80_112 */ {(void*) D_600F6C0, 0, (ObjectFunc) func_801A52B8, D_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_112 */ {(void*) D_600F6C0, 0, (ObjectFunc) func_i6_801A52B8, D_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_113 */ {(void*) D_601B610, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_114 */ {(void*) D_601C6A0, 0, (ObjectFunc) NULL, D_800CBF34, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_115 */ {(void*) D_60188D0, 0, (ObjectFunc) NULL, D_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -555,8 +201,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_128 */ {(void*) D_9003F50, 0, (ObjectFunc) NULL, D_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_129 */ {(void*) D_900F060, 0, (ObjectFunc) NULL, D_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_130 */ {(void*) D_900F1D0, 0, (ObjectFunc) NULL, D_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
/* OBJ_80_131 */ {(void*) func_801935D4, 1, (ObjectFunc) func_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_132 */ {(void*) func_8019350C, 1, (ObjectFunc) func_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_131 */ {(void*) func_i6_801935D4, 1, (ObjectFunc) func_i6_8019356C, D_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_132 */ {(void*) func_i6_8019350C, 1, (ObjectFunc) func_i6_80193380, D_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
/* OBJ_80_133 */ {(void*) D_60030F0, 0, (ObjectFunc) NULL, D_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_80_134 */ {(void*) D_6003000, 0, (ObjectFunc) NULL, D_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
/* OBJ_80_135 */ {(void*) D_6006890_Gfx, 0, (ObjectFunc) NULL, D_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
@ -580,7 +226,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_80_153 */ {(void*) D_600B8B0, 0, (ObjectFunc) NULL, D_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_154 */ {(void*) D_600BAF0, 0, (ObjectFunc) NULL, D_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_156 */ {(void*) func_80197CB8, 1, (ObjectFunc) NULL, D_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_156 */ {(void*) func_i6_80197CB8, 1, (ObjectFunc) NULL, D_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_157 */ {(void*) D_6001DA0, 0, (ObjectFunc) NULL, D_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_158 */ {(void*) D_6001360, 0, (ObjectFunc) NULL, D_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_80_159 */ {(void*) D_6008370, 0, (ObjectFunc) NULL, D_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -593,25 +239,25 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_4C_166 */ {(void*) D_601F500, 0, (ObjectFunc) NULL, D_800CBF34, -100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_167 */ {(void*) func_80059C34, 1, (ObjectFunc) func_80066E8C, D_800CBF34, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_168 */ {(void*) func_80059850, 1, (ObjectFunc) NULL, D_800CBF34, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_60023B0, 0, (ObjectFunc) func_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_169 */ {(void*) D_60023B0, 0, (ObjectFunc) func_i5_8018F038, D_60068BC, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_170 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801875A4, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_171 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801922DC, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_172 */ {(void*) NULL, 1, (ObjectFunc) func_i1_80192358, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_173 */ {(void*) NULL, 1, (ObjectFunc) func_i1_801923C0, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_174 */ {(void*) NULL, 1, (ObjectFunc) func_i1_8019243C, D_800CBF34, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_4C_175 */ {(void*) NULL, 1, (ObjectFunc) NULL, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ACTOR_176 */ {(void*) func_8018BAAC, 2, (ObjectFunc) func_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_8018BBA4, 2, (ObjectFunc) func_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_8018BBF8, 2, (ObjectFunc) func_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_8018BD7C, 2, (ObjectFunc) func_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_176 */ {(void*) func_i1_8018BAAC, 2, (ObjectFunc) func_i1_8018AED0, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_177 */ {(void*) func_i1_8018BBA4, 2, (ObjectFunc) func_i1_8018B15C, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_178 */ {(void*) func_i1_8018BBF8, 2, (ObjectFunc) func_i1_8018B418, D_603E5D0, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
/* OBJ_ACTOR_179 */ {(void*) func_i1_8018BD7C, 2, (ObjectFunc) func_i1_8018B58C, D_603E604, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_180 */ {(void*) func_8005B6A4, 1, (ObjectFunc) func_80066A80, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_183 */ {(void*) func_8018DA6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_184 */ {(void*) func_8018DAEC, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_185 */ {(void*) func_8018DB6C, 1, (ObjectFunc) func_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_181 */ {(void*) D_6018C00, 0, (ObjectFunc) func_i2_8018756C, D_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_182 */ {(void*) func_8005B71C, 1, (ObjectFunc) func_i2_80187650, D_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_183 */ {(void*) func_i2_8018DA6C, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_184 */ {(void*) func_i2_8018DAEC, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_185 */ {(void*) func_i2_8018DB6C, 1, (ObjectFunc) func_i2_8018D9EC, D_800CBF34, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_186 */ {(void*) func_8005B7CC, 1, (ObjectFunc) func_i2_8018795C, D_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_187 */ {(void*) D_6018450, 0, (ObjectFunc) func_i2_801877C4, D_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_188 */ {(void*) func_i3_801BEC74, 1, (ObjectFunc) func_i3_801BEC68, D_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_189 */ {(void*) func_8005A094, 1, (ObjectFunc) func_8006C008, D_800CBF34, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_190 */ {(void*) func_8005B848, 1, (ObjectFunc) func_800656D4, D_800CBFE4, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
@ -623,41 +269,41 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_196 */ {(void*) func_80059BF0, 1, (ObjectFunc) func_8006BB78, D_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_197 */ {(void*) func_80035448, 1, (ObjectFunc) func_800319AC, D_800CC038, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_198 */ {(void*) func_80035448, 1, (ObjectFunc) func_80092EC0, D_800CC01C, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) func_80188448, 1, (ObjectFunc) func_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_199 */ {(void*) func_i6_80188448, 1, (ObjectFunc) func_i6_801880E4, D_800CBF34, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_200 */ {(void*) func_80074FF0, 1, (ObjectFunc) func_80072594, D_800CBF34, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
/* OBJ_ACTOR_201 */ {(void*) func_800598E8, 1, (ObjectFunc) func_8006AC08, D_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_202 */ {(void*) func_80059A24, 1, (ObjectFunc) func_8006AD18, D_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
/* OBJ_ACTOR_203 */ {(void*) func_8018F884, 1, (ObjectFunc) func_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_204 */ {(void*) func_E9F1D0_801A4CB0, 1, (ObjectFunc) func_E9F1D0_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_205 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_207 */ {(void*) func_801AC294, 2, (ObjectFunc) func_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_208 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_209 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_210 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_211 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_212 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_213 */ {(void*) func_801A12C4, 1, (ObjectFunc) func_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_214 */ {(void*) func_801A43BC, 1, (ObjectFunc) func_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_215 */ {(void*) func_801A4A64, 1, (ObjectFunc) func_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_ACTOR_216 */ {(void*) func_801A5F90, 1, (ObjectFunc) func_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_217 */ {(void*) func_801A6100, 1, (ObjectFunc) func_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_218 */ {(void*) func_801A6540, 1, (ObjectFunc) func_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) func_801A68EC, 1, (ObjectFunc) func_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_220 */ {(void*) func_801ADAC8, 1, (ObjectFunc) func_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_221 */ {(void*) func_801AE2C0, 1, (ObjectFunc) func_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_222 */ {(void*) func_801AEEFC, 1, (ObjectFunc) func_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_801A54E8, 1, (ObjectFunc) func_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_80189AFC, 1, (ObjectFunc) func_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_8018E5B4, 1, (ObjectFunc) func_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_8018EF14, 1, (ObjectFunc) func_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_229 */ {(void*) func_8018E2D8, 1, (ObjectFunc) func_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_ACTOR_230 */ {(void*) func_8018AABC, 1, (ObjectFunc) func_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_231 */ {(void*) func_8018BE84, 1, (ObjectFunc) func_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) func_8018B6AC, 1, (ObjectFunc) func_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_8018A1C0, 1, (ObjectFunc) func_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_203 */ {(void*) func_i2_8018F884, 1, (ObjectFunc) func_i2_8018F330, D_800CBF34, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_204 */ {(void*) func_i6_801A4CB0, 1, (ObjectFunc) func_i6_801A3BD4, D_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_205 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019C778, D_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_206 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_801AC438, D_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_207 */ {(void*) func_i5_801AC294, 2, (ObjectFunc) func_i5_801A7E7C, D_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_208 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EA60, D_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_209 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019D700, D_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_210 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019CE88, D_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_211 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019E410, D_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_212 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019FF9C, D_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_213 */ {(void*) func_i5_801A12C4, 1, (ObjectFunc) func_i5_8019EE68, D_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_214 */ {(void*) func_i5_801A43BC, 1, (ObjectFunc) func_i5_801A3E98, D_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_215 */ {(void*) func_i5_801A4A64, 1, (ObjectFunc) func_i5_801A46A0, D_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
/* OBJ_ACTOR_216 */ {(void*) func_i5_801A5F90, 1, (ObjectFunc) func_i5_801A5E54, D_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_217 */ {(void*) func_i5_801A6100, 1, (ObjectFunc) func_i5_801A5FD0, D_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_218 */ {(void*) func_i5_801A6540, 1, (ObjectFunc) func_i5_801A6144, D_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_219 */ {(void*) func_i5_801A68EC, 1, (ObjectFunc) func_i5_801A67C8, D_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_220 */ {(void*) func_i5_801ADAC8, 1, (ObjectFunc) func_i5_801AD6F0, D_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_221 */ {(void*) func_i5_801AE2C0, 1, (ObjectFunc) func_i5_801ADD68, D_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_222 */ {(void*) func_i5_801AEEFC, 1, (ObjectFunc) func_i5_801AEC04, D_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
/* OBJ_ACTOR_223 */ {(void*) func_i5_801A54E8, 1, (ObjectFunc) func_i5_801A4B24, D_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) func_i5_80189194, D_800CBF34, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
/* OBJ_ACTOR_225 */ {(void*) D_700AB70, 0, (ObjectFunc) func_i5_8018AB44, D_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
/* OBJ_ACTOR_226 */ {(void*) func_i5_80189AFC, 1, (ObjectFunc) func_i5_801895B8, D_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
/* OBJ_ACTOR_227 */ {(void*) func_i5_8018E5B4, 1, (ObjectFunc) func_i5_8018E54C, D_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
/* OBJ_ACTOR_228 */ {(void*) func_i5_8018EF14, 1, (ObjectFunc) func_i5_8018E5F8, D_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_229 */ {(void*) func_i5_8018E2D8, 1, (ObjectFunc) func_i5_8018C8A8, D_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
/* OBJ_ACTOR_230 */ {(void*) func_i5_8018AABC, 1, (ObjectFunc) func_i5_8018A544, D_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_231 */ {(void*) func_i5_8018BE84, 1, (ObjectFunc) func_i5_8018B9D0, D_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
/* OBJ_ACTOR_232 */ {(void*) func_i5_8018B6AC, 1, (ObjectFunc) func_i5_8018B268, D_6006890_f32, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
/* OBJ_ACTOR_233 */ {(void*) func_i5_8018A1C0, 1, (ObjectFunc) func_i5_80189CC8, D_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
/* OBJ_ACTOR_234 */ {(void*) func_80077218, 1, (ObjectFunc) func_800771CC, D_800CBF34, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
/* OBJ_ACTOR_235 */ {(void*) func_i3_80190430, 2, (ObjectFunc) func_i3_801904CC, D_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
/* OBJ_ACTOR_236 */ {(void*) func_i3_80190F08, 1, (ObjectFunc) func_i3_80190A00, D_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
@ -697,55 +343,55 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ACTOR_270 */ {(void*) func_i3_801BEB1C, 1, (ObjectFunc) func_i3_801BE3F8, D_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_271 */ {(void*) func_8002E694, 2, (ObjectFunc) func_8002E670, D_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
/* OBJ_ACTOR_272 */ {(void*) func_8002E6DC, 1, (ObjectFunc) func_8002E6B8, D_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
/* OBJ_ACTOR_273 */ {(void*) func_80188FE4, 2, (ObjectFunc) func_80188AD0, D_600FF30_Hitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) func_8019E3A8, 1, (ObjectFunc) func_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_273 */ {(void*) func_i4_80188FE4, 2, (ObjectFunc) func_i4_80188AD0, D_600FF30_Hitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
/* OBJ_ACTOR_274 */ {(void*) func_i4_8019E3A8, 1, (ObjectFunc) func_i4_8019E234, D_800CBEC4, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
/* OBJ_ACTOR_275 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_276 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBE8C, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_277 */ {(void*) func_i3_8019F7AC, 1, (ObjectFunc) func_i3_8019F20C, D_800CBEC4, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) func_i3_8019EA7C, D_800CBF34, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) func_i3_801A003C, D_800CBF34, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
/* OBJ_ACTOR_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_281 */ {(void*) func_80192E2C, 1, (ObjectFunc) func_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_284 */ {(void*) func_801934D0, 1, (ObjectFunc) func_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_285 */ {(void*) func_80193244, 1, (ObjectFunc) func_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_ACTOR_286 */ {(void*) func_80188660, 1, (ObjectFunc) func_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) func_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) func_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_280 */ {(void*) D_900DD20, 0, (ObjectFunc) func_i1_80192518, D_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_281 */ {(void*) func_i1_80192E2C, 1, (ObjectFunc) func_i1_80192CD4, D_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_282 */ {(void*) D_901DA50, 0, (ObjectFunc) func_i1_80192CD4, D_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_283 */ {(void*) D_9023AD0, 0, (ObjectFunc) func_i1_80192EB0, D_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_284 */ {(void*) func_i1_801934D0, 1, (ObjectFunc) func_i1_801933DC, D_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_ACTOR_285 */ {(void*) func_i6_80193244, 1, (ObjectFunc) func_i6_80192E94, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
/* OBJ_ACTOR_286 */ {(void*) func_i6_80188660, 1, (ObjectFunc) func_i6_80188528, D_800CBE8C, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) func_i6_80189724, D_800CBF34, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) func_i6_801893B8, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_289 */ {(void*) func_800596B0, 1, (ObjectFunc) func_i6_80189470, D_800CBF34, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) func_i6_8018933C, D_800CBF34, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_ACTOR_291 */ {(void*) func_80067874, 1, (ObjectFunc) func_8006753C, D_800CBEA8, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
/* OBJ_BOSS_292 */ {(void*) func_8018AA74, 2, (ObjectFunc) func_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_8018ECAC, 1, (ObjectFunc) func_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_8018ED78, 1, (ObjectFunc) func_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_8018EE84, 1, (ObjectFunc) func_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_8018EF90, 1, (ObjectFunc) func_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_297 */ {(void*) func_8018BACC, 1, (ObjectFunc) func_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_298 */ {(void*) func_801887D0, 1, (ObjectFunc) func_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_292 */ {(void*) func_i1_8018AA74, 2, (ObjectFunc) func_i1_80189058, D_603E620, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_293 */ {(void*) func_i1_8018ECAC, 1, (ObjectFunc) func_i1_8018C19C, D_603E840, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_294 */ {(void*) func_i1_8018ED78, 1, (ObjectFunc) func_i1_8018DDAC, D_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_295 */ {(void*) func_i1_8018EE84, 1, (ObjectFunc) func_i1_8018E290, D_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_296 */ {(void*) func_i1_8018EF90, 1, (ObjectFunc) func_i1_8018E76C, D_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_297 */ {(void*) func_i2_8018BACC, 1, (ObjectFunc) func_i2_8018978C, D_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_298 */ {(void*) func_i2_801887D0, 1, (ObjectFunc) func_i2_80188344, D_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_299 */ {(void*) func_80042FC4, 2, (ObjectFunc) func_80042FB8, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_300 */ {(void*) func_80042FE8, 1, (ObjectFunc) func_80042FDC, D_800CBF34, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_301 */ {(void*) func_i3_801BEC5C, 1, (ObjectFunc) func_i3_801BEC50, D_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_A6 */ {(void*) func_i3_8018C54C, 1, (ObjectFunc) func_i3_80187944, D_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) func_80193434, 2, (ObjectFunc) func_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_8018FF84, 2, (ObjectFunc) func_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_80190020, 2, (ObjectFunc) func_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_801982A8, 1, (ObjectFunc) func_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_303 */ {(void*) func_i2_80193434, 2, (ObjectFunc) func_i2_80190078, D_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_304 */ {(void*) func_i2_8018FF84, 2, (ObjectFunc) func_i2_8018FE38, D_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_305 */ {(void*) func_i2_80190020, 2, (ObjectFunc) func_i2_8018FF20, D_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
/* OBJ_BOSS_306 */ {(void*) func_i5_801982A8, 1, (ObjectFunc) func_i5_80197A94,D_i5_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_ZO */ {(void*) func_i3_801949DC, 2, (ObjectFunc) func_i3_80194A84, D_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
/* OBJ_BOSS_308 */ {(void*) func_8008FE78, 1, (ObjectFunc) func_800907C4, D_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_309 */ {(void*) func_8002E604, 1, (ObjectFunc) func_8002E5E0, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_310 */ {(void*) func_8002E64C, 1, (ObjectFunc) func_8002E628, D_800CBF34, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_311 */ {(void*) func_80191AFC, 2, (ObjectFunc) func_801912FC, D_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_312 */ {(void*) func_80196288, 2, (ObjectFunc) func_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_313 */ {(void*) func_8019E98C, 1, (ObjectFunc) func_8019E454, D_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_314 */ {(void*) func_8019E2C4, 2, (ObjectFunc) func_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_311 */ {(void*) func_i4_80191AFC, 2, (ObjectFunc) func_i4_801912FC, D_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_312 */ {(void*) func_i6_80196288, 2, (ObjectFunc) func_i6_80196210, D_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_313 */ {(void*) func_i4_8019E98C, 1, (ObjectFunc) func_i4_8019E454, D_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_314 */ {(void*) func_i6_8019E2C4, 2, (ObjectFunc) func_i6_8019C888, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_SO */ {(void*) func_i3_801A71B8, 2, (ObjectFunc) func_i3_801A5B3C, D_800CBF34, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_316 */ {(void*) func_801968F4, 1, (ObjectFunc) func_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) func_80193B1C, 1, (ObjectFunc) func_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_316 */ {(void*) func_i4_801968F4, 1, (ObjectFunc) func_i4_801946C4, D_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_317 */ {(void*) func_i4_80193B1C, 1, (ObjectFunc) func_i4_80193718, D_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_AQ */ {(void*) func_i3_801B4D84, 2, (ObjectFunc) func_i3_801B134C, D_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_801985E4, 1, (ObjectFunc) func_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_801928C8, 2, (ObjectFunc) func_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_8018B8C0, 1, (ObjectFunc) func_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_319 */ {(void*) func_i1_801985E4, 1, (ObjectFunc) func_i1_80194398,D_i1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
/* OBJ_BOSS_320 */ {(void*) func_i6_801928C8, 2, (ObjectFunc) func_i6_8018DBF0, D_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_BOSS_321 */ {(void*) func_i6_8018B8C0, 1, (ObjectFunc) func_i6_80189B70, D_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
/* OBJ_ITEM_LASERS */ {(void*) func_8005CC9C, 1, (ObjectFunc) func_80067F6C, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_CHECKPOINT */ {(void*) func_8005C5F0, 1, (ObjectFunc) func_80068914, D_800CBF38, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_SILVER_RING */ {(void*) func_8005C900, 1, (ObjectFunc) func_80068020, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
@ -762,7 +408,7 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_ITEM_1UP */ {(void*) D_1022120, 0, (ObjectFunc) func_80067B1C, D_800CBE8C, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_GOLD_RING */ {(void*) func_8005CA80, 1, (ObjectFunc) func_800685F8, D_800CBF54, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_WING_REPAIR */ {(void*) D_3007650, 0, (ObjectFunc) func_80068618, D_800CBFA8, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_TRAINING_RING */ {(void*) D_6006140, 0, (ObjectFunc) func_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_ITEM_TRAINING_RING */ {(void*) D_6006140, 0, (ObjectFunc) func_i1_80198968, D_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_339 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D2F4, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_340 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D748, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_341 */ {(void*) func_8007D55C, 1, (ObjectFunc) func_8007D8A8, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
@ -778,11 +424,11 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_EFFECT_351 */ {(void*) func_80078438, 1, (ObjectFunc) func_8007E3E4, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_352 */ {(void*) func_800784B4, 1, (ObjectFunc) func_8007B62C, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_353 */ {(void*) func_80078B8C, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_354 */ {(void*) func_80197C64, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_354 */ {(void*) func_i6_80197C64, 1, (ObjectFunc) func_8007FE88, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_355 */ {(void*) func_80078AEC, 1, (ObjectFunc) func_800802B8, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 },
/* OBJ_EFFECT_356 */ {(void*) func_80078C84, 1, (ObjectFunc) func_800802F8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_357 */ {(void*) func_800798F0, 1, (ObjectFunc) func_8007968C, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_358 */ {(void*) func_80192A68, 1, (ObjectFunc) func_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_358 */ {(void*) func_i4_80192A68, 1, (ObjectFunc) func_i4_80192984, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_359 */ {(void*) func_8007AA60, 1, (ObjectFunc) func_8007A994, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_360 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BE54, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_361 */ {(void*) func_8007BEE8, 1, (ObjectFunc) func_8007BDE0, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
@ -792,19 +438,19 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_EFFECT_365 */ {(void*) func_8007E5CC, 1, (ObjectFunc) func_8007E45C, NULL, -200.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_366 */ {(void*) func_80078550, 1, (ObjectFunc) func_i3_801AC918, NULL, 100.0f, 1, 2, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_367 */ {(void*) func_80078604, 1, (ObjectFunc) func_8007E648, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_368 */ {(void*) func_80188FA8, 1, (ObjectFunc) func_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_369 */ {(void*) func_8018DCE4, 1, (ObjectFunc) func_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_370 */ {(void*) func_8018DBEC, 1, (ObjectFunc) func_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_371 */ {(void*) func_8018DE14, 1, (ObjectFunc) func_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_368 */ {(void*) func_i5_80188FA8, 1, (ObjectFunc) func_i5_80188F60, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_369 */ {(void*) func_i2_8018DCE4, 1, (ObjectFunc) func_i2_80188CAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_370 */ {(void*) func_i2_8018DBEC, 1, (ObjectFunc) func_i2_80188FAC, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_371 */ {(void*) func_i2_8018DE14, 1, (ObjectFunc) func_i2_80189114, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_372 */ {(void*) func_80077A00, 1, (ObjectFunc) func_8007AB50, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_373 */ {(void*) NULL, 1, (ObjectFunc) func_8007A748, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_374 */ {(void*) func_8007DED4, 1, (ObjectFunc) func_8007DB70, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_375 */ {(void*) func_8007DAE4, 1, (ObjectFunc) func_8007DA58, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_376 */ {(void*) func_80078CE8, 1, (ObjectFunc) func_80080360, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_377 */ {(void*) func_80078BE0, 1, (ObjectFunc) func_800802D8, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_378 */ {(void*) func_801A5AF0, 1, (ObjectFunc) func_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_379 */ {(void*) func_801AEAA0, 1, (ObjectFunc) func_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_380 */ {(void*) func_801A5D68, 1, (ObjectFunc) func_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_378 */ {(void*) func_i5_801A5AF0, 1, (ObjectFunc) func_i5_801A57D0, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_379 */ {(void*) func_i5_801AEAA0, 1, (ObjectFunc) func_i5_801AE87C, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_380 */ {(void*) func_i5_801A5D68, 1, (ObjectFunc) func_i5_801A5B4C, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_381 */ {(void*) func_80077A7C, 1, (ObjectFunc) func_8007B0F4, NULL, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_382 */ {(void*) NULL, 1, (ObjectFunc) func_8007B040, NULL, 200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_383 */ {(void*) func_8007A3C0, 1, (ObjectFunc) func_8007A28C, NULL, 10000.0f, 0, 1, 0, 0, 0.0f, 0 },
@ -820,8 +466,8 @@ ObjectInfo D_800CC124[0x190] = {
/* OBJ_EFFECT_393 */ {(void*) func_80078F78, 1, (ObjectFunc) func_80078EBC, NULL, 300.0f, 1, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_394 */ {(void*) func_80080D04, 1, (ObjectFunc) func_80080ACC, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
/* OBJ_EFFECT_395 */ {(void*) func_80082F78, 1, (ObjectFunc) func_80081C5C, NULL, 300.0f, 0, 1, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_396 */ {(void*) func_8018CF98, 1, (ObjectFunc) func_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 },
/* OBJ_EFFECT_397 */ {(void*) func_80191180, 1, (ObjectFunc) func_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_396 */ {(void*) func_i6_8018CF98, 1, (ObjectFunc) func_i6_8018CAD4, NULL, 2000.0f, 0, 1, 40, 2, 0.0f, 0 },
/* OBJ_EFFECT_397 */ {(void*) func_i4_80191180, 1, (ObjectFunc) func_i4_80191054, NULL, 2000.0f, 0, 1, 20, 0, 0.0f, 0 },
/* OBJ_EFFECT_398 */ {(void*) func_8008092C, 1, (ObjectFunc) func_8008040C, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
/* OBJ_EFFECT_399 */ {(void*) func_80084194, 1, (ObjectFunc) func_80083FA8, NULL, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
};

26
src/main/fox_edisplay.c
View File

@ -10,9 +10,9 @@ WingInfo D_80161630;
char D_800CF970[] = "$Id: fox_edisplay.c,v 1.196 1997/05/08 08:31:50 morita Exp $";
void func_800596C0(void) {
Matrix_RotateZ(gGfxMatrix, gFrameCount * 13.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 13.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.02f, 0.98f, 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 13.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 13.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, 1.02f, 0.98f, 1.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
}
@ -432,7 +432,7 @@ void func_8005ADAC(Actor* actor) {
}
Math_SmoothStepToF(&actor->fwork[29], temp1, 0.3f, 5.0f, 0.0f);
sp5C = actor->fwork[29];
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
sp5C *= 1.111f;
}
Matrix_Push(&gGfxMatrix);
@ -450,7 +450,7 @@ void func_8005ADAC(Actor* actor) {
sp5C = actor->fwork[21];
if ((sp5C != 0.0f) && (gLevelType == LEVELTYPE_PLANET)) {
sp54 = 0.0f;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
sp54 = 180.0f;
}
RCP_SetupDL_64_2();
@ -488,7 +488,7 @@ void func_8005B1E8(Actor* actor, s32 levelType) {
if (actor->iwork[11] >= 2) {
scale = D_800CFCA0[actor->iwork[11] - 2] * 0.45f;
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
scale *= 1.2f;
}
Matrix_Push(&gGfxMatrix);
@ -585,7 +585,7 @@ void func_8005B848(Actor* actor) {
break;
}
scale = 2.0f;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
scale = 1.7f;
}
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -60.0f, 1);
@ -651,8 +651,8 @@ void func_8005BAB4(ObjectId objId, s32 index) {
gSPDisplayList(gMasterDisp++, D_1024AC0);
break;
default:
temp1 = D_800CFCCC[gFrameCount % 8U];
temp2 = D_800CFCCC[(gFrameCount + 4) % 8U];
temp1 = D_800CFCCC[gGameFrameCount % 8U];
temp2 = D_800CFCCC[(gGameFrameCount + 4) % 8U];
Matrix_Scale(gGfxMatrix, 1.4f + temp1, 0.0f, 1.4f + temp2, 1);
Matrix_RotateY(gGfxMatrix, M_PI, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, 30.0f, 1);
@ -759,7 +759,7 @@ void func_8005BAB4(ObjectId objId, s32 index) {
void func_8005C5F0(Item* item) {
s32 i;
if ((gFrameCount & 0x18) && (item->unk_46 == 0)) {
if ((gGameFrameCount & 0x18) && (item->unk_46 == 0)) {
Matrix_Push(&gGfxMatrix);
RCP_SetupDL(&gMasterDisp, 0x40);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
@ -779,7 +779,7 @@ void func_8005C5F0(Item* item) {
Matrix_Push(&gGfxMatrix);
Matrix_RotateZ(gGfxMatrix, i * 45.0f * M_DTOR, 1);
Matrix_Translate(gGfxMatrix, 2.0f * item->scale, 0.0f, 0.0f, 1);
Matrix_RotateZ(gGfxMatrix, (gFrameCount + (i * 110.0f)) * M_DTOR * 7.2f * item->unk_54, 1);
Matrix_RotateZ(gGfxMatrix, (gGameFrameCount + (i * 110.0f)) * M_DTOR * 7.2f * item->unk_54, 1);
Graphics_SetScaleMtx(2.0f * item->unk_50);
gSPDisplayList(gMasterDisp++, D_101CAE0);
Matrix_Pop(&gGfxMatrix);
@ -1783,19 +1783,19 @@ void func_80060968(void) {
Matrix_Scale(gGfxMatrix, ent30->unk_28, ent30->unk_28, ent30->unk_24, 1);
if ((gCurrentLevel == LEVEL_AQUAS) || (gCurrentLevel == LEVEL_VENOM_ANDROSS)) {
s32 alpha = (gFrameCount & 1) ? 180 : 50;
s32 alpha = (gGameFrameCount & 1) ? 180 : 50;
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
if (gCurrentLevel == LEVEL_AQUAS) {
Matrix_Scale(gGfxMatrix, 0.01f, 0.3f, 0.0025f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 5.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 5.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_60119A0);
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 0.0025f, 1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 25.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 25.0f * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_C017440);
}

45
src/main/fox_effect.c
View File

@ -283,7 +283,7 @@ void func_80077B84(Effect* effect) {
if (gCurrentLevel == LEVEL_BOLSE) {
RCP_SetupDL(&gMasterDisp, 0x26);
}
switch ((effect->index + gFrameCount) & 3) {
switch ((effect->index + gGameFrameCount) & 3) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 0, 0, effect->unk_44);
break;
@ -364,12 +364,12 @@ void func_800780F8(Effect* effect) {
s32 i;
if (effect->unk_4A >= 0xB) {
if (!((effect->index + gFrameCount) & 1)) {
if (!((effect->index + gGameFrameCount) & 1)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 32);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 128, 128, 128);
}
} else if (!((effect->index + gFrameCount) & 1)) {
} else if (!((effect->index + gGameFrameCount) & 1)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255);
@ -487,7 +487,7 @@ void func_80078AE0(void* effect) {
void func_80078AEC(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 180);
Graphics_SetScaleMtx(effect->scale2 * (13.0f + ((gFrameCount & 1) * 2.5f)));
Graphics_SetScaleMtx(effect->scale2 * (13.0f + ((gGameFrameCount & 1) * 2.5f)));
gSPDisplayList(gMasterDisp++, D_102ED50);
}
@ -503,7 +503,7 @@ void func_80078BE0(Effect* effect) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 160);
var_fv0 = 3.0f;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
var_fv0 *= 1.2f;
}
Graphics_SetScaleMtx(effect->scale2 * var_fv0);
@ -699,7 +699,7 @@ void func_8007968C(Effect* effect) {
Object_Kill(&effect->obj, &effect->sfxPos);
}
} else {
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_8007D2C8(effect->obj.pos.x, effect->obj.pos.y + 550.0f, effect->obj.pos.z, 10.0f);
}
if ((effect->timer_50 == 0) || (effect->obj.pos.y < (gGroundLevel - 100.0f))) {
@ -1440,7 +1440,8 @@ void func_8007B9DC(Effect* effect) {
if (gCurrentLevel != LEVEL_MACBETH) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 140, 99, 58, effect->unk_4A);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, (gFrameCount & 3) + 5, (gFrameCount & 3) + 3, (gFrameCount & 3) + 3, 220);
gDPSetPrimColor(gMasterDisp++, 0, 0, (gGameFrameCount & 3) + 5, (gGameFrameCount & 3) + 3,
(gGameFrameCount & 3) + 3, 220);
}
//! DEBUG: Hold Z on controller 4 to set up a display list.
if (!(gControllerHold[3].button & A_BUTTON)) {
@ -2655,7 +2656,7 @@ void func_8007F2FC(Effect* effect) {
effect->obj.pos.z -= effect->vel.z * 0.5f;
}
if ((effect->unk_44 == 1) && !(gFrameCount & 1)) {
if ((effect->unk_44 == 1) && !(gGameFrameCount & 1)) {
func_8007D0E0(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 1.5f);
}
}
@ -2706,7 +2707,7 @@ void func_8007F5AC(Effect* effect) {
effect->vel.x -= 0.5f;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
effect->unk_44--;
if (effect->unk_44 < 20) {
Object_Kill(&effect->obj, &effect->sfxPos);
@ -2714,7 +2715,7 @@ void func_8007F5AC(Effect* effect) {
}
effect->scale2 += 0.02f;
if (!(gFrameCount & 0x10)) {
if (!(gGameFrameCount & 0x10)) {
effect->scale2 += 0.01f;
} else {
effect->scale2 -= 0.01f;
@ -2740,7 +2741,7 @@ void func_8007F6B0(Effect* effect) {
Object_Kill(&effect->obj, &effect->sfxPos);
}
if (!(gFrameCount & 3) && (effect->unk_4E == 0)) {
if (!(gGameFrameCount & 3) && (effect->unk_4E == 0)) {
randfloat = Rand_ZeroOne() * 30.0f;
for (i = 0; i < 36; i += 2) {
temp = (i * 10.0f * M_DTOR) + randfloat;
@ -2787,7 +2788,7 @@ void func_8007F958(Effect* effect) {
return;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
randFloat = Rand_ZeroOne() * 144.0f;
for (i = 0; i < 5; i++) {
temp = (i * 72.0f * M_DTOR) + randFloat;
@ -2828,7 +2829,7 @@ void func_8007FBE0(Effect* effect) {
Object_Kill(&effect->obj, &effect->sfxPos);
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
randFloat = Rand_ZeroOne() * 144.0f;
for (i = 0; i < 10; i++) {
temp = (i * 36.0f * M_DTOR) + randFloat;
@ -2942,7 +2943,7 @@ void func_8007FE88(Effect* effect) {
func_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f);
Object_Kill(&effect->obj, &effect->sfxPos);
}
} else if (func_801A55D4(1000, &effect->obj.pos, &velocity, 0) != 0) {
} else if (func_i5_801A55D4(1000, &effect->obj.pos, &velocity, 0) != 0) {
func_8007D10C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, 2.0f);
Object_Kill(&effect->obj, &effect->sfxPos);
}
@ -2960,7 +2961,7 @@ void func_800802F8(Effect* effect) {
func_8007FE88(effect);
effect->obj.rot.z += 10.0f;
effect->scale2 = 3.0f;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
effect->scale2 = 3.5f;
}
}
@ -3293,7 +3294,7 @@ void func_80080D04(Effect* effect) {
D_800D18E4++;
}
if (!((effect->index + gFrameCount) & 1)) {
if (!((effect->index + gGameFrameCount) & 1)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0, 0, 96, 96, 255, 255);
@ -3519,7 +3520,7 @@ void func_80081C5C(Effect* effect) {
break;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007C484(((Rand_ZeroOne() - 0.5f) * 50.0f) + effect->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 50.0f) + effect->obj.pos.y,
((Rand_ZeroOne() - 0.5f) * 50.0f) + effect->obj.pos.z, effect->vel.x, effect->vel.y,
@ -3542,7 +3543,7 @@ void func_80081C5C(Effect* effect) {
effect->unk_60.z += 10.0f;
effect->vel.z = 5.0f;
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
effect->unk_44++;
effect->unk_44 &= 1;
}
@ -3585,7 +3586,7 @@ void func_80081C5C(Effect* effect) {
break;
}
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_8007C120((((Rand_ZeroOne() - 0.5f) * effect->scale2) * 50.0f) + effect->obj.pos.x,
(((Rand_ZeroOne() - 0.5f) * effect->scale2) * 50.0f) + effect->obj.pos.y,
(((Rand_ZeroOne() - 0.5f) * effect->scale2) * 50.0f) + effect->obj.pos.z, effect->vel.x,
@ -3643,7 +3644,7 @@ void func_80081C5C(Effect* effect) {
case 7:
switch (gCurrentLevel) {
case LEVEL_AQUAS:
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2, 6);
}
effect->obj.rot.x += effect->unk_60.x;
@ -3656,7 +3657,7 @@ void func_80081C5C(Effect* effect) {
break;
case LEVEL_ZONESS:
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
// clang-format off
func_80081A8C(effect->obj.pos.x, effect->obj.pos.y, effect->obj.pos.z, effect->scale2 * 3.0f, 6);
// clang-format on
@ -3789,7 +3790,7 @@ void func_80081C5C(Effect* effect) {
if (effect->unk_46 != 0) {
effect->unk_46 -= 1;
}
if ((!(gFrameCount & 0xF)) && (effect->timer_50 == 0)) {
if ((!(gGameFrameCount & 0xF)) && (effect->timer_50 == 0)) {
D_800D18EC = Math_Atan2F(gPlayer[0].camEye.x - gBosses[0].obj.pos.x,
gPlayer[0].camEye.z - (gBosses[0].obj.pos.z + D_80177D20)) *
180.0f / M_PI;

18
src/main/fox_enmy.c
View File

@ -468,8 +468,8 @@ void Object_Load(ObjectInit* objInit, f32 arg1, f32 arg2, f32 arg3, f32 arg4) {
D_i5_801BA1E8 = 98;
break;
case OBJ_UNK_402:
D_E9F1D0_801A7F78 = objInit->rot.z * 0.1f;
D_E9F1D0_801A7F60 = -(f32) objInit->rot.x;
D_i6_801A7F78 = objInit->rot.z * 0.1f;
D_i6_801A7F60 = -(f32) objInit->rot.x;
break;
case OBJ_UNK_400:
D_801782B8++;
@ -1166,13 +1166,13 @@ void Object_Init(s32 index, ObjectId objId) {
gActors[index].unk_0C9 = 1;
break;
case OBJ_BOSS_320:
func_E9F1D0_8018D16C(&gBosses[index]);
func_i6_8018D16C(&gBosses[index]);
break;
case OBJ_BOSS_316:
func_i4_80193CA4(&gBosses[index]);
break;
case OBJ_BOSS_314:
func_E9F1D0_80197CC4(&gBosses[index]);
func_i6_80197CC4(&gBosses[index]);
break;
case OBJ_ACTOR_205:
case OBJ_ACTOR_206:
@ -1452,7 +1452,7 @@ void func_800656D4(Actor* actor) {
spA8[i] = temp_v0;
}
}
switch (gFrameCount % 6U) {
switch (gGameFrameCount % 6U) {
case 0:
case 1:
case 2:
@ -1930,8 +1930,8 @@ void func_800671D0(Item* item) {
} else {
var_v0 = 7;
}
if (!(var_v0 & gFrameCount)) {
Matrix_RotateY(gCalcMatrix, gFrameCount * 23.0f * M_DTOR, 0);
if (!(var_v0 & gGameFrameCount)) {
Matrix_RotateY(gCalcMatrix, gGameFrameCount * 23.0f * M_DTOR, 0);
sp40.x = 50.0f;
sp40.y = (Rand_ZeroOne() - 0.5f) * 120.0f;
sp40.z = 0.0f;
@ -2202,7 +2202,7 @@ void func_80068020(Item* item) {
}
if (item->scale > 0.3f) {
Matrix_RotateY(gCalcMatrix, item->obj.rot.y * M_DTOR, 0);
Matrix_RotateZ(gCalcMatrix, gFrameCount * 37.0f * M_DTOR, 1);
Matrix_RotateZ(gCalcMatrix, gGameFrameCount * 37.0f * M_DTOR, 1);
sp4C.x = 0.0f;
sp4C.y = item->scale * 100.0f;
sp4C.z = 0.0f;
@ -2432,7 +2432,7 @@ void func_800690D0(s32 index, ObjectId objId) {
break;
case OBJ_ACTOR_197:
if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
func_E9F1D0_801888F4(&gActors[index]);
func_i6_801888F4(&gActors[index]);
} else {
func_800763A4(&gActors[index]);
}

58
src/main/fox_enmy2.c
View File

@ -89,7 +89,7 @@ void func_8006AA98(Object_80* obj80) {
Vec3f sp18;
Texture_Scroll(D_60038F8, 32, 32, 1);
if ((gFrameCount % 4) == 0) {
if ((gGameFrameCount % 4) == 0) {
Matrix_RotateY(gCalcMatrix, obj80->obj.rot.y * M_DTOR, 0);
sp18.x = (Rand_ZeroOne() - 0.5f) * 700.0f;
@ -139,7 +139,7 @@ void func_8006AD18(Actor* actor) {
actor->iwork[1] = true;
}
if (!(gFrameCount & 0x1F)) {
if (!(gGameFrameCount & 0x1F)) {
func_8007F11C(OBJ_EFFECT_353, actor->obj.pos.x, actor->obj.pos.y + 180.0f, actor->obj.pos.z, D_80177828);
}
@ -248,7 +248,7 @@ void func_8006B0A0(Actor* actor) {
actor->vel.y = sp34.y;
actor->vel.z = sp34.z;
if ((actor->timer_0BC == 0) && !(gFrameCount & 3)) {
if ((actor->timer_0BC == 0) && !(gGameFrameCount & 3)) {
temp_hi = (D_800CFF94[actor->unk_04A] + actor->unk_04E) % 100;
if (actor->unk_04A == 0) {
func_8007D2C8(D_80176558[actor->unk_046][temp_hi], D_80176878[actor->unk_046][temp_hi],
@ -449,11 +449,11 @@ void func_8006BB78(Actor* actor) {
break;
}
if ((actor->obj.pos.y <= (gGroundLevel + 10.0f)) && !(gFrameCount & 7)) {
if ((actor->obj.pos.y <= (gGroundLevel + 10.0f)) && !(gGameFrameCount & 7)) {
func_8006BB1C(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
}
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
func_8006A900(((Rand_ZeroOne() - 0.5f) * 50.0f) + actor->obj.pos.x, actor->obj.pos.y + 10.0f,
((Rand_ZeroOne() - 0.5f) * 50.0f) + actor->obj.pos.z, 0.5f);
}
@ -585,7 +585,7 @@ void func_8006C008(Actor* actor) {
actor->obj.rot.y += actor->fwork[1];
actor->obj.rot.z += actor->fwork[2];
if ((actor->iwork[0] == 1) && !(gFrameCount & 7)) {
if ((actor->iwork[0] == 1) && !(gGameFrameCount & 7)) {
func_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 2.0f);
}
@ -2771,17 +2771,17 @@ void func_80071DC0(Actor* actor) {
Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1194[rInd], &sp38);
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007C120(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, actor->vel.x,
actor->vel.y, actor->vel.z, 0.3f, 0x14);
}
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
func_8007BFFC(actor->obj.pos.x + sp38.x, actor->obj.pos.y + sp38.y, actor->obj.pos.z + sp38.z, actor->vel.x,
actor->vel.y, actor->vel.z, 10.0f, 9);
}
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
Audio_PlaySfx(0x2903B009, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
@ -2790,7 +2790,7 @@ void func_80071DC0(Actor* actor) {
actor->obj.rot.x += 0.2f;
actor->obj.rot.z += 0.3f;
if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
actor->timer_0C6 = 4;
}
}
@ -2936,7 +2936,7 @@ void func_80072594(Actor* actor) {
if (actor->unk_0B8 == 0x3E8) {
actor->obj.rot.y += actor->fwork[15];
actor->obj.rot.x += actor->fwork[16];
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
func_8007C120(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
actor->vel.z, 0.3f, 0xA);
}
@ -3115,8 +3115,8 @@ void func_80072594(Actor* actor) {
break;
case 13:
spDC = __sinf(((actor->index * 45) + gFrameCount) * M_DTOR) * actor->fwork[17];
spD8 = __cosf(((actor->index * 45) + (gFrameCount * 2)) * M_DTOR) * actor->fwork[17];
spDC = __sinf(((actor->index * 45) + gGameFrameCount) * M_DTOR) * actor->fwork[17];
spD8 = __cosf(((actor->index * 45) + (gGameFrameCount * 2)) * M_DTOR) * actor->fwork[17];
pad = actor->iwork[1];
pad = gActors[pad].iwork[12];
D_Timer_80161670[pad] = 5;
@ -3386,7 +3386,7 @@ void func_80072594(Actor* actor) {
case 94:
case 95:
case 96:
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
actor->fwork[18] = Rand_ZeroOne() * 255.0f;
actor->fwork[19] = Rand_ZeroOne() * 255.0f;
actor->fwork[20] = Rand_ZeroOne() * 255.0f;
@ -3402,7 +3402,7 @@ void func_80072594(Actor* actor) {
if (Math_SmoothStepToF(&actor->obj.pos.y, spEC, 0.5f, 7.0f, 0.0f) >= 0.0f) {
spF0 = 350.0f;
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_8007240C(actor->obj.pos.x, spEC, actor->obj.pos.z, actor->obj.rot.y);
Audio_PlaySfx(0x19800017, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
@ -3422,12 +3422,12 @@ void func_80072594(Actor* actor) {
break;
case 31:
actor->obj.rot.z = gFrameCount;
actor->obj.rot.z = gGameFrameCount;
break;
case 21:
case 22:
actor->obj.rot.z = gFrameCount * 3.0f;
actor->obj.rot.z = gGameFrameCount * 3.0f;
break;
case 3:
@ -3441,7 +3441,7 @@ void func_80072594(Actor* actor) {
if (actor->unk_0B6 >= Animation_GetFrameCount(&D_600636C)) {
actor->unk_0B6 = 0;
}
if (((s32) gFrameCount % 3) == 0) {
if (((s32) gGameFrameCount % 3) == 0) {
func_i3_8019E9F4(actor->obj.pos.x, actor->obj.pos.y - 20, actor->obj.pos.z - 180.0f, 0.0f,
Rand_ZeroOne() * 20.0f * -1.0f, 0.0f, 4.0f, 2);
}
@ -3463,7 +3463,7 @@ void func_80072594(Actor* actor) {
case 48:
case 49:
case 50:
func_E9F1D0_801A3BD4(actor);
func_i6_801A3BD4(actor);
break;
case 52:
@ -3531,7 +3531,7 @@ void func_80072594(Actor* actor) {
break;
}
if ((fabsf(actor->fwork[0]) > 10.0f) && !(gFrameCount & 1)) {
if ((fabsf(actor->fwork[0]) > 10.0f) && !(gGameFrameCount & 1)) {
effect = func_8007783C(OBJ_EFFECT_394);
if (effect != NULL) {
Matrix_RotateZ(gCalcMatrix, actor->unk_0F4.z * M_DTOR, 0);
@ -3557,12 +3557,12 @@ void func_80072594(Actor* actor) {
effect->unk_60.z = -effect->unk_60.z;
}
if (gFrameCount & 2) {
if (gGameFrameCount & 2) {
effect->vel.y = -effect->vel.y;
}
}
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
effect = func_8007783C(OBJ_EFFECT_394);
if (effect != NULL) {
effect->unk_78 = effect->unk_7A = 0xB;
@ -3582,7 +3582,7 @@ void func_80072594(Actor* actor) {
effect->unk_60.z = -effect->unk_60.z;
}
if (gFrameCount & 4) {
if (gGameFrameCount & 4) {
effect->vel.y = -effect->vel.y;
}
}
@ -3634,7 +3634,7 @@ void func_80072594(Actor* actor) {
if (actor->unk_0B6 >= 49) {
actor->unk_0B6 = 49;
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
func_i3_801AC8A8(((Rand_ZeroOne() - 0.5f) * 100.0f) + actor->obj.pos.x,
(Rand_ZeroOne() * 50.0f) + actor->obj.pos.y,
((Rand_ZeroOne() - 0.5f) * 100.0f) + actor->obj.pos.z, 1.0f, 0);
@ -3647,8 +3647,8 @@ void func_80072594(Actor* actor) {
case 88:
if (actor->unk_04A == 0) {
actor->unk_046 += 4;
if (actor->unk_046 >= 0xFF) {
actor->unk_046 = 0xFF;
if (actor->unk_046 >= 255) {
actor->unk_046 = 255;
actor->unk_04A = 1;
}
} else {
@ -3961,7 +3961,7 @@ void func_80074FF0(Actor* actor) {
case 48:
case 49:
case 50:
func_E9F1D0_801A4CB0(actor);
func_i6_801A4CB0(actor);
break;
case 52:
@ -4056,7 +4056,7 @@ void func_80074FF0(Actor* actor) {
case 103:
case 104:
func_E9F1D0_8018769C(actor);
func_i6_8018769C(actor);
break;
case 105:
@ -4326,7 +4326,7 @@ void func_800763A4(Actor* actor) {
void func_8007717C(Actor* actor) {
if ((actor->unk_0B4 == 0x30) || (actor->unk_0B4 == 0x31) || (actor->unk_0B4 == 0x32)) {
func_E9F1D0_801A3BD4(actor);
func_i6_801A3BD4(actor);
} else {
func_800763A4(actor);
}

4
src/main/fox_game.c
View File

@ -273,7 +273,7 @@ void func_800A24DC(s32 arg0) {
case DRAWMODE_8:
func_8003DAF0();
gPlayerNum = arg0;
func_EF0260_8018AAC4();
func_ending_8018AAC4();
break;
}
}
@ -460,7 +460,7 @@ void func_800A26C0(void) {
break;
case GSTATE_CREDITS:
gDrawMode = DRAWMODE_8;
func_EF0260_8018A96C();
func_ending_8018A96C();
break;
default:
break;

8
src/main/fox_load.c
View File

@ -140,7 +140,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
changeOvl = Overlay_Init(&sOvli3_Unk4[ovlStage]);
break;
case OVL_SETUP_SECTOR_Y:
changeOvl = Overlay_Init(&sOvlE9F1D0_SectorY[ovlStage]);
changeOvl = Overlay_Init(&sOvli6_SectorY[ovlStage]);
break;
case OVL_SETUP_SOLAR:
changeOvl = Overlay_Init(&sOvli3_Solar[ovlStage]);
@ -149,7 +149,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
changeOvl = Overlay_Init(&sOvli3_Zoness[ovlStage]);
break;
case OVL_SETUP_VENOM_ANDROSS:
changeOvl = Overlay_Init(&sOvlE9F1D0_Venom2[ovlStage]);
changeOvl = Overlay_Init(&sOvli6_Venom2[ovlStage]);
break;
case OVL_SETUP_TRAINING:
changeOvl = Overlay_Init(&sOvli1_Training[ovlStage]);
@ -158,7 +158,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
changeOvl = Overlay_Init(&sOvli1_Venom1[ovlStage]);
break;
case OVL_SETUP_VENOM_2:
changeOvl = Overlay_Init(&sOvlE9F1D0_VenomSW[ovlStage]);
changeOvl = Overlay_Init(&sOvli6_VenomSW[ovlStage]);
break;
case OVL_SETUP_20:
changeOvl = Overlay_Init(&sOvli2_Setup20[ovlStage]);
@ -185,7 +185,7 @@ u8 Overlay_Load(u8 ovlSetup, u8 ovlStage) {
}
break;
case OVL_SETUP_CREDITS:
changeOvl = Overlay_Init(&sOvlEF0260_Credits[ovlStage]);
changeOvl = Overlay_Init(&sOvlending_Credits[ovlStage]);
break;
default:
(void) "DMA MODE ERROR %d\n";

10
src/main/fox_load_inits.c
View File

@ -40,7 +40,7 @@ OverlayInit sNoOvl_Logo[1] = {
/* 0xF */ ROM_SEGMENT(ast_D25100) } },
};
OverlayInit sOvlEF0260_Credits[6] = {
OverlayInit sOvlending_Credits[6] = {
{ OVERLAY_OFFSETS(ovl_ending),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,
@ -514,7 +514,7 @@ OverlayInit sOvli3_Unk4[1] = {
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvlE9F1D0_SectorY[1] = {
OverlayInit sOvli6_SectorY[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_873CB0),
/* 0x2 */ ROM_SEGMENT(ast_8A68C0),
@ -590,7 +590,7 @@ OverlayInit sOvli1_Venom1[1] = {
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvlE9F1D0_Venom2[1] = {
OverlayInit sOvli6_Venom2[1] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_873CB0),
/* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
@ -609,7 +609,7 @@ OverlayInit sOvlE9F1D0_Venom2[1] = {
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sOvlE9F1D0_VenomSW[2] = {
OverlayInit sOvli6_VenomSW[2] = {
{ OVERLAY_OFFSETS(ovl_i6),
{ /* 0x1 */ ROM_SEGMENT(ast_873CB0),
/* 0x2 */ ROM_SEGMENT(ast_8AE0A0),
@ -790,7 +790,7 @@ OverlayInit sOvli2_Versus[2] = {
/* 0xF */ NO_SEGMENT } },
};
OverlayInit sEFFA40_Overlay[1] = {
OverlayInit sunused_Overlay[1] = {
{ OVERLAY_OFFSETS(ovl_unused),
{ /* 0x1 */ NO_SEGMENT,
/* 0x2 */ NO_SEGMENT,

90
src/main/fox_play.c
View File

@ -110,7 +110,7 @@ void func_800A3FEC(void) {
D_801782FC++;
switch (gCurrentLevel) {
case LEVEL_SOLAR:
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
spB4 = SEGMENTED_TO_VIRTUAL(D_6001C50);
} else {
spB4 = SEGMENTED_TO_VIRTUAL(D_6004500);
@ -123,7 +123,7 @@ void func_800A3FEC(void) {
sp84 = 0.5f;
break;
case LEVEL_ZONESS:
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
spB4 = SEGMENTED_TO_VIRTUAL(D_6009ED0);
} else {
spB4 = SEGMENTED_TO_VIRTUAL(D_600C780);
@ -194,22 +194,22 @@ void func_800A46A0(Player* player) {
if ((player->unk_238 == 0) || (gLevelMode == LEVELMODE_ALL_RANGE)) {
if (player->wings.rightState <= WINGSTATE_BROKEN) {
if (!(gFrameCount & 1) && (D_80177D70[player->num] != 0)) {
if (!(gGameFrameCount & 1) && (D_80177D70[player->num] != 0)) {
func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + player->hit1.x,
(Rand_ZeroOne() * 5.0f) + player->hit1.y, player->hit1.z, 1.0f);
}
if (!(gFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) {
if (!(gGameFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) {
func_8007C484(((Rand_ZeroOne() - 0.5f) * 5.0f) + player->hit1.x,
(Rand_ZeroOne() * 5.0f) + player->hit1.y, player->hit1.z, player->vel.x, player->vel.y,
player->vel.z, (Rand_ZeroOne() * 0.02f) + 0.02f, player->num + 1);
}
}
if (player->wings.leftState <= WINGSTATE_BROKEN) {
if (!(gFrameCount & 1) && (D_80177D88[player->num] != 0)) {
if (!(gGameFrameCount & 1) && (D_80177D88[player->num] != 0)) {
func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + player->hit2.x,
(Rand_ZeroOne() * 5.0f) + player->hit2.y, player->hit2.z, 1.0f);
}
if (!(gFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) {
if (!(gGameFrameCount & 1) && (Rand_ZeroOne() < 0.5f) && !gVersusMode) {
func_8007C484(((Rand_ZeroOne() - 0.5f) * 5.0f) + player->hit2.x,
(Rand_ZeroOne() * 5.0f) + player->hit2.y, player->hit2.z, player->vel.x, player->vel.y,
player->vel.z, (Rand_ZeroOne() * 0.02f) + 0.02f, player->num + 1);
@ -232,12 +232,12 @@ void func_800A46A0(Player* player) {
if (player->form == FORM_LANDMASTER) {
sp40 = 30.0f;
}
if (!(gFrameCount & var_v1)) {
if (!(gGameFrameCount & var_v1)) {
func_8007D10C(((Rand_ZeroOne() - 0.5f) * 10.0f) + player->pos.x,
(Rand_ZeroOne() * 10.0f) + (player->pos.y + sp40),
((Rand_ZeroOne() - 0.5f) * 10.0f) + player->unk_138, 2.2f);
}
if (!((var_v1 >> 2) & gFrameCount) && (Rand_ZeroOne() < 0.5f)) {
if (!((var_v1 >> 2) & gGameFrameCount) && (Rand_ZeroOne() < 0.5f)) {
func_8007C484(((Rand_ZeroOne() - 0.5f) * 30.0f) + player->pos.x,
(Rand_ZeroOne() * 10.0f) + (player->pos.y + sp40),
((Rand_ZeroOne() - 0.5f) * 30.0f) + player->unk_138, player->vel.x, player->vel.y,
@ -246,7 +246,7 @@ void func_800A46A0(Player* player) {
player->timer_224 = 2;
}
}
} else if (!((var_v1 >> 2) & gFrameCount) && (Rand_ZeroOne() < 0.5f) && (player->timer_224 == 0)) {
} else if (!((var_v1 >> 2) & gGameFrameCount) && (Rand_ZeroOne() < 0.5f) && (player->timer_224 == 0)) {
player->timer_224 = 2;
}
}
@ -266,11 +266,11 @@ void func_800A4C40(Player* player) {
Matrix_MultVec3f(gCalcMatrix, &sp54, &sp3C);
Matrix_MultVec3f(gCalcMatrix, &sp48, &sp30);
if (player->pos.y < (gGroundLevel + 100.0f)) {
if ((sp3C.y < gGroundLevel + 80.0f) && !(gFrameCount & 1)) {
if ((sp3C.y < gGroundLevel + 80.0f) && !(gGameFrameCount & 1)) {
if (D_80161A64) {}
func_8007ACE0(sp3C.x, gGroundLevel, sp3C.z, 0.1f, 2.0f, player->unk_0E8 + player->unk_114 + 20.0f);
}
if ((sp30.y < gGroundLevel + 80.0f) && !(gFrameCount & 1)) {
if ((sp30.y < gGroundLevel + 80.0f) && !(gGameFrameCount & 1)) {
func_8007ACE0(sp30.x, gGroundLevel, sp30.z, 0.1f, 2.0f, player->unk_0E8 + player->unk_114 - 20.0f);
}
}
@ -1749,7 +1749,7 @@ void func_800A8BA4(Player* player) {
D_80178570 = 20;
D_80178574 = 20;
D_80178578 = 20;
player->unk_23C = 0x50;
player->unk_23C = 80;
}
if (player->unk_22C == 0) {
Audio_PlaySfx(0x19000001, &obj80->sfxPos, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
@ -2389,7 +2389,7 @@ void func_800AB334(void) {
case LEVEL_VENOM_ANDROSS:
D_80177A98 = 0;
D_80177AB0 = 6;
D_E9F1D0_801A7F58 = D_E9F1D0_801A7F60 = D_E9F1D0_801A7F68 = D_E9F1D0_801A7F70 = D_E9F1D0_801A7F78 = 0.0f;
D_i6_801A7F58 = D_i6_801A7F60 = D_i6_801A7F68 = D_i6_801A7F70 = D_i6_801A7F78 = 0.0f;
break;
case LEVEL_AQUAS:
D_80137E78 = 3;
@ -2555,7 +2555,7 @@ void func_800ABAB4(void) {
}
D_80177E7C = 0;
func_800A594C();
D_80161A62 = D_8017796C = D_Timer_80177B44 = D_80177B4C = D_8015F928 = D_8015F940 = D_80178284 = gFrameCount =
D_80161A62 = D_8017796C = D_Timer_80177B44 = D_80177B4C = D_8015F928 = D_8015F940 = D_80178284 = gGameFrameCount =
D_80178480 = D_801782FC = gBossFrameCount = D_80161690 = D_8015F900 = D_80177930 = 0;
if (gCurrentLevel == LEVEL_SECTOR_X) {
@ -2624,28 +2624,28 @@ void func_800ABAB4(void) {
switch (gCurrentLevel) {
case LEVEL_SECTOR_Z:
if (D_8017782C == 0) {
func_i4_8019EA68(&gObjects58);
func_i4_8019EA68();
func_8002F180();
}
break;
case LEVEL_FORTUNA:
func_i4_8018BA2C(&gObjects58);
func_i4_8018BA2C();
func_8002F180();
break;
case LEVEL_KATINA:
func_i4_80198930(&gObjects58);
func_i4_80198930();
if (D_8017782C == 0) {
func_8002F180();
}
break;
case LEVEL_BOLSE:
if (D_8017782C == 0) {
func_i4_80191ED8(&gObjects58);
func_i4_80191ED8();
func_8002F180();
}
break;
case LEVEL_VENOM_2:
func_E9F1D0_80196968(&gObjects58);
func_i6_80196968();
if (D_8017827C == 0) {
func_8002F180();
}
@ -2653,9 +2653,9 @@ void func_800ABAB4(void) {
case LEVEL_VENOM_ANDROSS:
if (D_8017827C == 1) {
if (D_8015F924 == 0) {
func_E9F1D0_801878A8();
func_i6_801878A8();
} else {
func_E9F1D0_801961AC(&gObjects58);
func_i6_801961AC();
}
}
break;
@ -2958,7 +2958,7 @@ bool func_800AD1F4(Player* player) {
}
if ((!(gInputHold->button & R_TRIG) || !(gInputHold->button & Z_TRIG) || (player->form != FORM_ARWING) ||
(player->state_1C8 != PLAYERSTATE_1C8_3)) &&
!(gFrameCount & 3) && func_800AD118(player->num)) {
!(gGameFrameCount & 3) && func_800AD118(player->num)) {
if (gChargeTimers[player->num] >= 21) {
for (i = 0; i < 13; i++) {
if (gPlayerShots[i].obj.status == 0) {
@ -3610,7 +3610,7 @@ void func_800AF07C(Player* player) {
player->vel.y = (sp5C.y + sp50.y) * player->unk_150;
player->vel.z = sp5C.z + sp50.z;
if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
player->vel.z += D_E9F1D0_801A7F58;
player->vel.z += D_i6_801A7F58;
}
sp68.x = 0.0f;
sp68.y = 0.0f;
@ -3850,13 +3850,13 @@ void func_800B0194(Player* player) {
Math_SmoothStepToF(&player->unk_164, sp74 * 0.3f, 0.1f, 10.0f, 0.00001f);
Math_SmoothStepToF(&player->unk_168, -sp74 * 0.3f, 0.1f, 10.0f, 0.00001f);
} else {
if (((gFrameCount & 0xF) == 0) && (Rand_ZeroOne() < 0.5f)) {
if (((gGameFrameCount & 0xF) == 0) && (Rand_ZeroOne() < 0.5f)) {
player->unk_17C = (Rand_ZeroOne() - 0.5f) * 100.0f;
}
if (((gFrameCount & 0xF) == 3) && (Rand_ZeroOne() < 0.5f)) {
if (((gGameFrameCount & 0xF) == 3) && (Rand_ZeroOne() < 0.5f)) {
player->unk_174 = (Rand_ZeroOne() - 0.2f) * 50.0f;
}
if (((gFrameCount & 0xF) == 10) && (Rand_ZeroOne() < 0.5f)) {
if (((gGameFrameCount & 0xF) == 10) && (Rand_ZeroOne() < 0.5f)) {
player->unk_178 = (Rand_ZeroOne() - 0.2f) * 50.0f;
}
Math_SmoothStepToF(&player->unk_15C, player->unk_17C, 0.15f, 10.0f, 0.00001f);
@ -3921,7 +3921,7 @@ void func_800B0194(Player* player) {
player->unk_010 += 2.0f;
}
sp64 = player->unk_0D0;
if (gFrameCount & 4) {
if (gGameFrameCount & 4) {
sp64 = 2.0f * player->unk_0D0;
}
Math_SmoothStepToF(&player->unk_164, sp64, 0.5f, 20.0f, 0.0001f);
@ -4570,7 +4570,7 @@ void func_800B2574(Player* player) {
if (player->unk_258 > 50.0f) {
player->unk_258 = 50.0f;
}
if (!(gFrameCount & 1) && (gBlurAlpha > 64)) {
if (!(gGameFrameCount & 1) && (gBlurAlpha > 64)) {
if (1) {}
gBlurAlpha--;
}
@ -4829,7 +4829,7 @@ void func_800B3314(Player* player) {
}
}
if ((player->unk_16C > 0.2f) && (player->unk_170 > 0.2f) && (player->timer_220 == 0)) {
player->unk_12C += (((__cosf(gFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f);
player->unk_12C += (((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f);
Math_SmoothStepToAngle(&player->unk_0E4, 0.0f, 0.05f, 5.0f, 0.00001f);
Math_SmoothStepToAngle(&player->unk_0EC, 0.0f, 0.05f, 5.0f, 0.00001f);
temp = gInputPress->stick_y;
@ -4837,11 +4837,11 @@ void func_800B3314(Player* player) {
Math_SmoothStepToF(&player->unk_110, 30.0f, 0.5f, 5.0f, 0.0f);
player->unk_0D4 = -0.4f;
Math_SmoothStepToF(&D_801779A8[player->num], 30.0f, 1.0f, 10.0f, 0.0f);
if ((gCamCount == 1) && !(gFrameCount & 1)) {
if ((gCamCount == 1) && !(gGameFrameCount & 1)) {
func_8007BC7C(((Rand_ZeroOne() - 0.5f) * 20.0f) + player->pos.x, player->unk_068 + 10.0f,
player->unk_138 - 10.0f, (2.0f * Rand_ZeroOne()) + 4.0f);
}
} else if ((gCamCount == 1) && !(gFrameCount & 3) && (player->unk_1DC == 0)) {
} else if ((gCamCount == 1) && !(gGameFrameCount & 3) && (player->unk_1DC == 0)) {
if ((player->unk_16C > 0.2f) && (player->timer_220 == 0)) {
func_8007BC7C(((Rand_ZeroOne() - 0.5f) * 10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f,
player->unk_138 - 10.0f, (2.0f * Rand_ZeroOne()) + 3.0f);
@ -5012,7 +5012,7 @@ void func_800B415C(Player* player) {
} else {
var_v0 = 0xF;
}
if (!(gFrameCount & var_v0)) {
if (!(gGameFrameCount & var_v0)) {
func_80060F30(&player->unk_460, 0x49001026, player->num);
}
}
@ -5237,7 +5237,7 @@ void func_800B48BC(Player* player) {
}
if (D_Timer_80177BD0[player->num] != 0) {
D_Timer_80177BD0[player->num]--;
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
*D_80177984 = 1;
}
}
@ -5336,7 +5336,7 @@ void func_800B48BC(Player* player) {
break;
case LEVELMODE_UNK_2:
D_80178488 = true;
func_E9F1D0_801A5AD4(player);
func_i6_801A5AD4(player);
func_800A8BA4(player);
break;
}
@ -5390,7 +5390,7 @@ void func_800B48BC(Player* player) {
D_80161A2C = 0;
break;
case PLAYERSTATE_1C8_11:
func_E9F1D0_8018C390(player);
func_i6_8018C390(player);
func_800B40AC(player);
break;
case PLAYERSTATE_1C8_12:
@ -5638,7 +5638,7 @@ void func_800B5FBC(Player* player, s32 playerNum, bool arg2) {
if (gPlayer[playerNum].form == FORM_LANDMASTER) {
var_v0 = 0xFF;
}
if (((var_v0 & gFrameCount) == (gPlayerNum * 32)) || arg2) {
if (((var_v0 & gGameFrameCount) == (gPlayerNum * 32)) || arg2) {
for (i = 0; i < 100; i++) {
playerNum = (s32) (Rand_ZeroOne() * 3.9f);
if ((gPlayer[playerNum].state_1C8 != PLAYERSTATE_1C8_13) && !gPlayerInactive[playerNum]) {
@ -5943,7 +5943,7 @@ void func_800B71E4(Player* player) {
func_800B7184(player, 0);
break;
case LEVELMODE_UNK_2:
func_E9F1D0_801A5FC0(player);
func_i6_801A5FC0(player);
break;
}
break;
@ -5977,7 +5977,7 @@ void func_800B73E0(Player* player) {
if ((gCurrentLevel == LEVEL_AQUAS) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_2)) {
D_801784D4 = D_801784C8 = D_801784C8 = D_801784FC = D_801784C8 = 110.0f;
if (gFrameCount & 0x20) {
if (gGameFrameCount & 0x20) {
D_801784D4 = D_801784C8 = D_801784C8 = D_801784FC = D_801784C8 = 90.0f;
}
D_801784E8 = D_80178510 = D_80178538 = 1.0f;
@ -6100,14 +6100,14 @@ void func_800B79B0(void) {
}
break;
case LEVEL_VENOM_ANDROSS:
func_E9F1D0_8018BDD8();
func_i6_8018BDD8();
gGroundLevel = -25000.0f;
gPlayer[0].unk_0A0 = 612.0f;
gPlayer[0].unk_0A4 = -544.0f;
if (D_Timer_80177B44 != 0) {
D_Timer_80177B44--;
if (D_Timer_80177B44 == 0) {
func_E9F1D0_80189214();
func_i6_80189214();
}
}
break;
@ -6135,7 +6135,7 @@ void func_800B79B0(void) {
break;
case LEVEL_CORNERIA:
func_8008C104(D_603EB38, D_6028A60);
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
Texture_Scroll(D_600CBD8, 64, 32, 3);
}
break;
@ -6175,7 +6175,7 @@ void func_800B79B0(void) {
var_v0_2 = 0;
}
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && !(gFrameCount & var_v0_2)) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && !(gGameFrameCount & var_v0_2)) {
gPlayer[0].shields--;
if (gPlayer[0].shields <= 0) {
gPlayer[0].shields = 0;
@ -6190,7 +6190,7 @@ void func_800B79B0(void) {
}
var_a0 = MIN(gPlayer[0].shields, 0xFF);
func_8001D1C8(var_a0, sp3A);
if (!(gFrameCount & 7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
if (!(gGameFrameCount & 7) && (gPlayer[0].state_1C8 != PLAYERSTATE_1C8_7)) {
func_i3_8019E8B8((Rand_ZeroOne() - 0.5f) * 6000.0f, -80.0f,
gPlayer[0].unk_138 + ((Rand_ZeroOne() * 2000.0f) + -6000.0f),
(Rand_ZeroOne() * 10.0f) + 20.0f);
@ -6266,7 +6266,7 @@ void func_800B832C(void) {
if (var_fv1 > 20.0f) {
var_fv1 = 20.0f;
}
D_8017847C = var_fv1 * __sinf(gFrameCount * 70.0f * M_DTOR);
D_8017847C = var_fv1 * __sinf(gGameFrameCount * 70.0f * M_DTOR);
}
func_800B79B0();
}
@ -6340,7 +6340,7 @@ void func_800B86CC(void) {
}
if (D_80177854 != 100) {
(void) "play_time = %d\n";
gFrameCount++;
gGameFrameCount++;
}
switch (D_80177854) {
case 0:

23
src/main/fox_radio.c
View File

@ -505,7 +505,7 @@ void func_800BB5D0(void) {
D_Timer_801782AC = 10;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
break;
@ -516,7 +516,7 @@ void func_800BB5D0(void) {
D_Timer_801782AC = 10;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
break;
@ -623,7 +623,7 @@ void func_800BB5D0(void) {
gRadioState++;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
D_80177D50 -= 0.26f;
@ -640,7 +640,7 @@ void func_800BB5D0(void) {
gRadioState = 0;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
break;
@ -671,8 +671,8 @@ void func_800BB5D0(void) {
if (temp_ft0 == RCID_PEPPY) {
var_v1 = 3;
}
if ((gTeamShields[var_v1] <= 0) && (gFrameCount & 4) && (gTeamShields[var_v1] != -2) && (D_801782A4 != 2) &&
(D_801782A4 != 3) && (D_801782A4 != 1000)) {
if ((gTeamShields[var_v1] <= 0) && (gGameFrameCount & 4) && (gTeamShields[var_v1] != -2) &&
(D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
@ -718,8 +718,9 @@ void func_800BB5D0(void) {
break;
}
if ((gActors[var_v1].obj.status != 2) && (gFrameCount & 4) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) &&
(D_801782A4 != 2) && (D_801782A4 != 3) && (D_801782A4 != 1000)) {
if ((gActors[var_v1].obj.status != 2) && (gGameFrameCount & 4) &&
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (D_801782A4 != 2) && (D_801782A4 != 3) &&
(D_801782A4 != 1000)) {
RCP_SetupDL(&gMasterDisp, 0x4C);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 0, 255);
Graphics_DisplaySmallText(31, 167, 1.0f, 1.0f, "DOWN");
@ -775,7 +776,7 @@ void func_800BC040(void) {
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
break;
@ -821,7 +822,7 @@ void func_800BC040(void) {
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
@ -839,7 +840,7 @@ void func_800BC040(void) {
D_Timer_801782AC = 5;
}
D_801782A4 = 2;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_801782A4 = 3;
}
break;

10
src/main/fox_std_lib.c
View File

@ -82,7 +82,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
switch (mode) {
case 2:
for (var_s3 = 0; var_s3 < 0x400; var_s3 += 0x20) {
temp_ft3 = 3.0f * __sinf((s32) (((var_s3 / 32) + (gFrameCount / 4)) % 0x20U) * (M_PI / 16.0f));
temp_ft3 = 3.0f * __sinf((s32) (((var_s3 / 32) + (gGameFrameCount / 4)) % 0x20U) * (M_PI / 16.0f));
for (var_v1 = 0; var_v1 < 0x20; var_v1++) {
((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x20U] = ((u16*) src)[var_s3 + var_v1];
}
@ -90,7 +90,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
break;
case 3:
for (var_s3 = 0; var_s3 < 0x580; var_s3 += 0x40) {
temp_ft3 = __sinf((s32) (((var_s3 / 64) + (gFrameCount / 4)) % 0x20U) * (M_PI / 4.0f));
temp_ft3 = __sinf((s32) (((var_s3 / 64) + (gGameFrameCount / 4)) % 0x20U) * (M_PI / 4.0f));
for (var_v1 = 0; var_v1 < 0x40; var_v1++) {
((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x40U] = ((u16*) src)[var_s3 + var_v1];
}
@ -98,7 +98,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
break;
case 1:
for (var_s3 = 0; var_s3 < 0x100; var_s3 += 0x10) {
temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 16) + (gFrameCount / 2)) % 0x10U) * (M_PI / 8.0f));
temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 16) + (gGameFrameCount / 2)) % 0x10U) * (M_PI / 8.0f));
for (var_v1 = 0; var_v1 < 0x10; var_v1++) {
((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x10U] = ((u16*) src)[var_s3 + var_v1];
}
@ -106,7 +106,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
break;
case 0:
for (var_s3 = 0; var_s3 < 0x400; var_s3 += 0x20) {
temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 32) + (gFrameCount / 2)) % 0x20U) * (M_PI / 16.0f));
temp_ft3 = 2.0f * __sinf((s32) (((var_s3 / 32) + (gGameFrameCount / 2)) % 0x20U) * (M_PI / 16.0f));
for (var_v1 = 0; var_v1 < 0x20; var_v1++) {
((u16*) dst)[var_s3 + (temp_ft3 + var_v1) % 0x20U] = ((u16*) src)[var_s3 + var_v1];
}
@ -116,7 +116,7 @@ void Texture_Mottle(void* dst, void* src, u8 mode) {
var_s0_2 = (u8*) dst;
var_s4_2 = (u8*) src;
for (var_s3 = 0; var_s3 < 0x1000; var_s3 += 0x40) {
temp_ft3 = 4.0f * __sinf((s32) (((var_s3 / 64) + (gFrameCount / 4)) % 0x20U) * (M_PI / 16.0f));
temp_ft3 = 4.0f * __sinf((s32) (((var_s3 / 64) + (gGameFrameCount / 4)) % 0x20U) * (M_PI / 16.0f));
for (var_v1 = 0; var_v1 < 0x40; var_v1++) {
var_s0_2[var_s3 + (temp_ft3 + var_v1) % 0x40U] = var_s4_2[var_s3 + var_v1];
}

28
src/main/fox_43E80.c → src/main/fox_tank.c
View File

@ -197,11 +197,11 @@ void func_80043B18(Player* player) {
if (gCurrentLevel == LEVEL_MACBETH) {
func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.3f);
}
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z, 2.0f,
0xFF, 0xF, 0);
}
@ -212,15 +212,15 @@ void func_80043B18(Player* player) {
sp48.x = 36.0f;
Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C);
if (gCurrentLevel == 0xB) {
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
}
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
if (!(gGameFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z,
2.0f, 0xFF, 0xF, 0);
}
@ -230,15 +230,15 @@ void func_80043B18(Player* player) {
sp48.x = -36.0f;
Matrix_MultVec3f(gCalcMatrix, &sp48, &sp3C);
if (gCurrentLevel == 0xB) {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z, 0.2f);
}
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_i5_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->unk_138 + sp3C.z,
player->unk_0E8 + sp38, 1.0f);
}
if (!(gFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
if (!(gGameFrameCount & 3) && (player->unk_0D0 >= 5.0f)) {
func_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->unk_138 + sp3C.z,
2.0f, 0xFF, 0xF, 0);
}
@ -508,16 +508,16 @@ void func_80044868(Player* player) {
if (player->unk_0D0 > 0.0f) {
Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && (D_80178284 == 0)) {
func_80043280(D_3005EA8, D_6009BB8, gFrameCount * -55.0f);
func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
}
if ((gCurrentLevel == LEVEL_MACBETH) && (player->state_1C8 == PLAYERSTATE_1C8_7)) {
func_80043280(D_3005EA8, *D_Unk_800DACB8, gFrameCount * -55.0f);
func_80043280(D_3005EA8, *D_Unk_800DACB8, gGameFrameCount * -55.0f);
}
}
if (player->unk_0D0 > 10.0f) {
Texture_Scroll(D_3002E80, 0x20, 0x20, 0);
if ((gCurrentLevel == LEVEL_TITANIA) && (D_80178284 == 0)) {
func_80043280(D_3005EA8, D_6009BB8, gFrameCount * -55.0f);
func_80043280(D_3005EA8, D_6009BB8, gGameFrameCount * -55.0f);
}
}
func_800A46A0(player);
@ -680,7 +680,7 @@ void func_80045678(Player* player) {
func_8001A55C(&player->unk_460, 0x01004024);
Audio_PlaySfx(0x01008016, &player->unk_460, 0, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
player->unk_12C += ((__cosf(gFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f;
player->unk_12C += ((__cosf(gGameFrameCount * M_DTOR * 8.0f) * 10.0f) - player->unk_12C) * 0.1f;
temp = -gInputPress->stick_y;
Math_SmoothStepToF(&player->unk_0E4, temp * 0.3f, 0.05f, 5.0f, 0.00001f);
Math_SmoothStepToF(&player->unk_110, 15.0f, 0.5f, 5.0f, 0.0f);
@ -692,13 +692,13 @@ void func_80045678(Player* player) {
player->unk_0D4 = 0.0f;
Math_SmoothStepToF(&player->vel.y, 0.0f, 0.1f, 2.0f, 0);
}
if ((gCamCount == 1) && !(gFrameCount & 1)) {
if ((gCamCount == 1) && !(gGameFrameCount & 1)) {
func_8007A900(((Rand_ZeroOne() - 0.5f) * 20.0f) + player->pos.x, player->unk_068 + 10.0f,
player->unk_138 - 10.0f, (2.0f * Rand_ZeroOne()) + 3.5f, 0xFF, 0x10, 1);
}
} else {
D_800C9F3C = 0;
if ((gCamCount == 1) && !(gFrameCount & 3) && (player->unk_1DC == 0)) {
if ((gCamCount == 1) && !(gGameFrameCount & 3) && (player->unk_1DC == 0)) {
if ((player->unk_16C > 0.2f) && (player->timer_220 == 0)) {
func_8007A900(((Rand_ZeroOne() - 0.5f) * 10.0f) + (player->pos.x - 57.0f), player->unk_068 + 10.0f,
player->unk_138 - 10.0f, Rand_ZeroOne() + 1.5f, 0xFF, 0xF, 0);

6
src/main/fox_versus.c
View File

@ -772,7 +772,7 @@ void func_800BF750(void) {
continue;
}
for (j = 0, temp = 0; j < 4; j++) {
if ((D_80177B00[i][j] != 0) && (gFrameCount & 4)) {
if ((D_80177B00[i][j] != 0) && (gGameFrameCount & 4)) {
gDPSetPrimColor(gMasterDisp++, 0, 0, D_800D4C3C[j], D_800D4C4C[j], D_800D4C5C[j], 255);
func_800BDA54(D_800D4C1C[i] + temp * 9.0f, D_800D4C2C[i]);
temp++;
@ -1838,7 +1838,7 @@ void func_800C20B0(void) {
D_80178758 = 0;
break;
}
gFrameCount++;
gGameFrameCount++;
}
void func_800C2190(void) {
@ -1903,7 +1903,7 @@ void func_800C2244(Actor* actor) {
y = actor->fwork[5] - actor->obj.pos.y;
z = actor->fwork[6] - actor->obj.pos.z;
if (!((gFrameCount + actor->index) & 7)) {
if (!((gGameFrameCount + actor->index) & 7)) {
actor->fwork[19] = Math_RadToDeg((Math_Atan2F(x, z)));
z = sqrtf(SQ(x) + SQ(z));
actor->fwork[20] = Math_RadToDeg((Math_Atan2F(y, z)));

24
src/main/sf_hud.c
View File

@ -1109,7 +1109,7 @@ void func_80087B5C(void) {
D_801617E8[0] = 10;
D_801617C0[0]++;
} else {
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Audio_PlaySfx(0x4900C024U, &D_800C5D28, 4U, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
D_801617C0[3]++;
}
@ -1758,7 +1758,7 @@ void func_80089C38(void) {
RCP_SetupDL(&gMasterDisp, 0xC);
alpha = gFrameCount % 21;
alpha = gGameFrameCount % 21;
if (alpha > 10) {
alpha = 20 - alpha;
@ -1776,7 +1776,7 @@ void func_80089D28(void) {
RCP_SetupDL(&gMasterDisp, 1);
gb = gFrameCount % 21;
gb = gGameFrameCount % 21;
if (gb > 10) {
gb = 20 - gb;
@ -1820,7 +1820,7 @@ void func_80089E98(s32 arg0) {
break;
}
}
if ((var_a1_2 == gPlayerNum) && (gFrameCount & 2)) {
if ((var_a1_2 == gPlayerNum) && (gGameFrameCount & 2)) {
var_a1 = (var_a1 * 2) + 1;
} else {
var_a1 = var_a1 * 2;
@ -1942,7 +1942,7 @@ void func_8008A240(void) {
continue;
}
if (gFrameCount & 63) {
if (gGameFrameCount & 63) {
gUnkEntities28[i].unk_02 = 999;
}
}
@ -2323,7 +2323,7 @@ void func_8008B2F0(void) {
}
}
if (((D_801617B0 != 0) || ((D_801617A4 - D_801617A8) > 0.1f)) && (gFrameCount & 2)) {
if (((D_801617B0 != 0) || ((D_801617A4 - D_801617A8) > 0.1f)) && (gGameFrameCount & 2)) {
D_800D1EB4 = 0;
D_800D1EB8 = 255;
D_800D1EBC = 0;
@ -2766,10 +2766,10 @@ void func_8008CA44(void) {
j = (D_800D2048[i] ^ 0xFF) & j;
if (gFrameCount & 4) {
if (gGameFrameCount & 4) {
func_8008C6F4(i, 0);
}
if ((gFrameCount - 2) & 4) {
if ((gGameFrameCount - 2) & 4) {
func_8008C6F4(i, 1);
}
}
@ -3692,12 +3692,12 @@ void func_8008FFF0(Boss* boss, s32 arg1) {
i = Rand_ZeroOne() * 36.0f;
if (!(gFrameCount & 2)) {
if (!(gGameFrameCount & 2)) {
func_8007C120(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y,
boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 0.3f * temp, 20);
}
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
func_8007BFFC(boss->obj.pos.x + D_800D21C8[i].x, boss->obj.pos.y + D_800D21C8[i].y,
boss->obj.pos.z + D_800D21C8[i].z, 0.0f, 0.0f, 0.0f, 7.0f * temp, 10);
}
@ -4458,13 +4458,13 @@ void func_800922F4(Actor* actor) {
temp = 63;
}
if (!(gFrameCount & temp)) {
if (!(gGameFrameCount & temp)) {
func_8007D10C(actor->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 10.0f),
actor->obj.pos.y + (Rand_ZeroOne() * 10.0f),
actor->obj.pos.z + ((Rand_ZeroOne() - 0.5f) * 10.0f), 2.2f);
}
if (!((temp >> 2) & gFrameCount)) {
if (!((temp >> 2) & gGameFrameCount)) {
if (Rand_ZeroOne() < 0.5f) {
func_8007C120(actor->obj.pos.x + ((Rand_ZeroOne() - 0.5f) * 30.0f),
actor->obj.pos.y + (Rand_ZeroOne() * 10.0f),

16
src/main/sys_main.c
View File

@ -54,7 +54,7 @@ FrameBuffer* gFrameBuffer;
u16* gTextureRender;
u8 D_80137E78;
u32 gFrameCounter;
u32 gSysFrameCount;
u8 gStartNMI;
u8 gStopTasks;
u8 D_80137E84[4];
@ -135,7 +135,7 @@ extern FrameBuffer* gFrameBuffer;
extern u16* gTextureRender;
extern u8 D_80137E78;
extern u32 gFrameCounter;
extern u32 gSysFrameCount;
extern u8 gStartNMI;
extern u8 gStopTasks;
extern u8 D_80137E84[4];
@ -154,7 +154,7 @@ void Main_Initialize(void) {
u8 i;
D_80137E78 = 0;
gFrameCounter = 0;
gSysFrameCount = 0;
gStartNMI = false;
gStopTasks = false;
gFillScreenColor = 0;
@ -310,7 +310,7 @@ void Graphics_ThreadEntry(void* arg0) {
Game_Initialize();
osSendMesg(&gSerialThreadMsgQueue, (OSMesg) SI_READ_CONTROLLER, OS_MESG_PRI_NORMAL);
Graphics_InitializeTask(gFrameCounter);
Graphics_InitializeTask(gSysFrameCount);
{
gSPSegment(gUnkDisp1++, 0, 0);
gSPDisplayList(gMasterDisp++, gGfxPool->unkDL1);
@ -323,8 +323,8 @@ void Graphics_ThreadEntry(void* arg0) {
}
Graphics_SetTask();
while (1) {
gFrameCounter++;
Graphics_InitializeTask(gFrameCounter);
gSysFrameCount++;
Graphics_InitializeTask(gSysFrameCount);
osRecvMesg(&gControllerMsgQueue, NULL, OS_MESG_BLOCK);
osSendMesg(&gSerialThreadMsgQueue, (OSMesg) SI_RUMBLE, OS_MESG_PRI_NORMAL);
Controller_UpdateInput();
@ -348,9 +348,9 @@ void Graphics_ThreadEntry(void* arg0) {
osRecvMesg(&gGfxTaskMsgQueue, NULL, OS_MESG_BLOCK);
Graphics_SetTask();
if (gFillScreen == 0) {
osViSwapBuffer(&gFrameBuffers[(gFrameCounter - 1) % 3]);
osViSwapBuffer(&gFrameBuffers[(gSysFrameCount - 1) % 3]);
}
func_80007FE4(&gFrameBuffers[(gFrameCounter - 1) % 3], SCREEN_WIDTH, 16);
func_80007FE4(&gFrameBuffers[(gSysFrameCount - 1) % 3], SCREEN_WIDTH, 16);
var_v1 = MIN(D_80137E78, 4);
var_v2 = MAX(var_v1, gGfxVImsgQueue.validCount + 1);

67
src/overlays/ovl_ending/EF0260.c
View File

@ -1,67 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187520.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801876A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187860.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80187D3C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188030.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188394.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018845C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188634.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801886F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_801888F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80188DB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80189108.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_80189C64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A024.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A124.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A2A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A570.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A828.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A8FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018A96C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018AAC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018ABE8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B174.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B3D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B3E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B52C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B624.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B6D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018B860.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018BAD0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018BCB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/func_EF0260_8018C21C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF0260/D_EF0260_80196240.s")

221
src/overlays/ovl_ending/EF5B60.c
View File

@ -1,221 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018CE20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D250.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D28C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D2C8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D398.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D4BC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D638.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018D814.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196640.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019664C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196660.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019666C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019667C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019668C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019669C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801966EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196708.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196718.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019672C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196740.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196750.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196760.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196774.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196788.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196798.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801967FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196808.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196818.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019682C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196838.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019684C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019685C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019686C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019687C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196890.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968BC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801968F8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196904.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196910.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196928.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196938.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019694C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_8019695C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196974.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196980.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196994.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969E0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_801969F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A1C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A5C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A70.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A84.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196A94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AA0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196AF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B14.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B54.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/D_EF0260_80196B68.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018DA0C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018DCB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018E1B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018E7B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018EDB8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018F2A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018F64C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8018FC60.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190274.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190648.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190778.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80190CF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191234.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191294.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191700.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191710.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191C58.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80191C7C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80192164.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_80192290.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_8019237C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_801924EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/EF5B60/func_EF0260_801926D4.s")

67
src/overlays/ovl_ending/sf_ending_1.c Normal file
View File

@ -0,0 +1,67 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80187520.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_801876A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80187860.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80187D3C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80188030.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80188394.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018845C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80188634.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_801886F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_801888F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80188DB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80189108.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_80189C64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A024.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A124.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A2A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A570.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A828.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A8FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018A96C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018AAC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018ABE8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B174.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B3D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B3E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B52C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B624.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B6D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018B860.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018BAD0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018BCB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/func_ending_8018C21C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_1/D_ending_80196240.s")

221
src/overlays/ovl_ending/sf_ending_2.c Normal file
View File

@ -0,0 +1,221 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018CE20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D250.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D28C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D2C8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D398.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D4BC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D638.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018D814.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196640.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019664C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196660.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019666C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019667C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019668C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019669C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801966B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801966C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801966D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801966DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801966EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196708.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196718.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019672C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196740.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196750.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196760.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196774.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196788.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196798.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801967FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196808.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196818.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019682C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196838.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019684C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019685C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019686C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019687C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196890.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968BC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801968F8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196904.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196910.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196928.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196938.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019694C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_8019695C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196974.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196980.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196994.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801969A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801969C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801969D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801969E0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_801969F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A1C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A5C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A70.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A84.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196A94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AA0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196AF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B14.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B54.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/D_ending_80196B68.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018DA0C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018DCB4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018E1B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018E7B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018EDB8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018F2A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018F64C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8018FC60.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80190274.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80190648.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80190778.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80190CF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191234.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191294.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191700.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191710.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191C58.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80191C7C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80192164.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_80192290.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_8019237C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_801924EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_ending/sf_ending_2/func_ending_801926D4.s")

76
src/overlays/ovl_i1/DFEE30.c
View File

@ -1,76 +0,0 @@
#include "global.h"
#include "DFEE30.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801920F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801922DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192358.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801923C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019243C.s")
void func_i1_801924A8(Object_80* arg0) {
switch (arg0->unk_48) {
case 0:
if (gPlayer[0].pos.z < arg0->obj.pos.z) {
D_80177AB0 = 0;
D_80177A98 = 0;
arg0->unk_48++;
}
case 1:
return;
}
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019250C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192518.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192AA4.s")
void func_i1_80192CB0(Actor* actor) {
actor->iwork[0] = actor->obj.rot.x;
actor->obj.rot.x = 0.0f;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192CD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192E2C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192EA4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80192EB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801933B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801933DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801934D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80193540.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801935CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801937F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80193D64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80194398.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198310.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198414.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_80198594.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801985E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_8019864C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/func_i1_801988B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/DFEE30/D_i1_8019B2B0.s")

9
src/overlays/ovl_i1/E05990.c
View File

@ -1,9 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80198C50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80198DCC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_80199024.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/E05990/func_i1_8019949C.s")

84
src/overlays/ovl_i1/fox_co.c
View File

@ -16,16 +16,16 @@ void func_i1_8018753C(Object_80* obj80) {
GSGM_BACK();
}
void func_801875A4(Object* obj) {
void func_i1_801875A4(Object_4C* obj4C) {
f32 sp1C;
f32 sp18;
f32 var_f;
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
sp1C = (Rand_ZeroOne() - 0.5f) * 10.0f;
sp18 = (Rand_ZeroOne() - 0.5f) * 10.0f;
var_f = ((Rand_ZeroOne() * 0.5f) + 1.0f);
func_8007C85C(obj->pos.x + sp1C, obj->pos.y + sp18, obj->pos.z, 4.0f * var_f);
func_8007C85C(obj4C->obj.pos.x + sp1C, obj4C->obj.pos.y + sp18, obj4C->obj.pos.z, 4.0f * var_f);
}
}
@ -314,23 +314,23 @@ void func_i1_80187AC8(Boss* boss) {
}
}
}
if ((boss->swork[1] == 1000) && !(gFrameCount & 3)) {
if ((boss->swork[1] == 1000) && !(gGameFrameCount & 3)) {
func_8007BFFC(D_i1_8019B6D8[3], D_i1_8019B6D8[4], D_i1_8019B6D8[5],
(D_i1_8019B6D8[3] - boss->obj.pos.x) * 0.1f, 0.0f,
(D_i1_8019B6D8[5] - boss->obj.pos.z) * 0.1f, 1.5f, 5);
}
if ((boss->swork[2] == 1000) && !(gFrameCount & 3)) {
if ((boss->swork[2] == 1000) && !(gGameFrameCount & 3)) {
func_8007BFFC(D_i1_8019B6D8[9], D_i1_8019B6D8[10], D_i1_8019B6D8[11],
(D_i1_8019B6D8[9] - boss->obj.pos.x) * 0.1f, 0.0f,
(D_i1_8019B6D8[11] - boss->obj.pos.z) * 0.1f, 1.5f, 5);
}
if ((boss->swork[3] == 1000) && !(gFrameCount & 3)) {
if ((boss->swork[3] == 1000) && !(gGameFrameCount & 3)) {
func_8007BFFC(D_i1_8019B6D8[12], D_i1_8019B6D8[13], D_i1_8019B6D8[14], 0.0f, 20.0f, 0.0f, 2.0f, 5);
}
if ((boss->swork[4] == 1000) && !(gFrameCount & 3)) {
if ((boss->swork[4] == 1000) && !(gGameFrameCount & 3)) {
func_8007BFFC(D_i1_8019B6D8[56], D_i1_8019B6D8[57], D_i1_8019B6D8[58], 0.0f, 10.0f, 0.0f, 2.0f, 5);
}
if ((boss->swork[7] == 1000) && !(gFrameCount & 3)) {
if ((boss->swork[7] == 1000) && !(gGameFrameCount & 3)) {
func_8007BFFC(D_i1_8019B6D8[59], D_i1_8019B6D8[60], D_i1_8019B6D8[61], 0.0f, 10.0f, 0.0f, 2.0f, 5);
}
}
@ -810,7 +810,7 @@ void func_i1_80189058(Boss* boss) {
case 6:
boss->unk_05E = 0;
D_8017812C = 1;
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
D_i1_8019B6D8[17] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].pos.x;
D_i1_8019B6D8[18] = gPlayer[0].pos.y;
D_i1_8019B6D8[19] = ((Rand_ZeroOne() - 0.5f) * 2000.0f) + gPlayer[0].unk_138;
@ -822,11 +822,11 @@ void func_i1_80189058(Boss* boss) {
boss->obj.rot.z = 60.0f;
func_i1_80188C7C(boss);
if ((gFrameCount & 0x1FF) == 0) {
if ((gGameFrameCount & 0x1FF) == 0) {
func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA);
}
if ((gFrameCount & 0x1FF) == 0x100) {
if ((gGameFrameCount & 0x1FF) == 0x100) {
func_800BA808(gMsg_ID_2220, RCID_BOSS_CORNERIA);
}
}
@ -837,10 +837,10 @@ void func_i1_80189058(Boss* boss) {
boss->obj.rot.z = -60.0f;
func_i1_80188C7C(boss);
if ((gFrameCount & 0x1FF) == 0) {
if ((gGameFrameCount & 0x1FF) == 0) {
func_800BA808(gMsg_ID_2275, RCID_BOSS_CORNERIA);
}
if ((gFrameCount & 0x1FF) == 0x100) {
if ((gGameFrameCount & 0x1FF) == 0x100) {
func_800BA808(gMsg_ID_2220, RCID_BOSS_CORNERIA);
}
}
@ -859,7 +859,7 @@ void func_i1_80189058(Boss* boss) {
}
boss->unk_068 = __sinf(boss->obj.rot.z * M_DTOR) * 30.0f;
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
boss->unk_04C = (s32) (Rand_ZeroOne() * 100.0f);
}
Animation_GetFrameData(&D_602BC18, boss->unk_04C, sp84);
@ -1183,7 +1183,7 @@ void func_i1_8018ACE0(Actor* actor) {
}
}
}
if ((actor->unk_0CE < 11) && !(gFrameCount & 3)) {
if ((actor->unk_0CE < 11) && !(gGameFrameCount & 3)) {
func_8007D2C8(((Rand_ZeroOne() - 0.5f) * 100.0f) + actor->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 100.0f) + (actor->obj.pos.y + 200.0f),
(Rand_ZeroOne() * 50.0f) + (actor->obj.pos.z + 50.0f), 3.0f);
@ -1416,7 +1416,7 @@ void func_i1_8018B58C(Actor* actor) {
}
break;
case 101:
if ((actor->timer_0BE != 0) && !(gFrameCount & 1)) {
if ((actor->timer_0BE != 0) && !(gGameFrameCount & 1)) {
func_8007797C(actor->obj.pos.x, actor->obj.pos.y + 150.0f, actor->obj.pos.z, 0.0f, 10.0f, 0.0f, 3.0f);
}
break;
@ -1633,7 +1633,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->vel.y = sp6C.y;
boss->vel.z = sp6C.z - D_80177D08;
boss->fwork[16] = 4.0f;
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[0], &sp84[6]);
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[1], &sp84[7]);
Matrix_MultVec3f(gCalcMatrix, &D_i1_8019992C, &sp84[8]);
@ -1663,7 +1663,7 @@ void func_i1_8018C19C(Boss* boss) {
for (i = 0; var_v1 >= 60; i++, var_v1 -= 60) {}
for (var_v0 = 0, var_v1 = 13; var_v0 < i; var_v0++, var_v1++) {
if ((gFrameCount & 0xF) == (var_v0 & 0xF)) {
if ((gGameFrameCount & 0xF) == (var_v0 & 0xF)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_8019995C[var_v0], &sp84[var_v1]);
func_8007D0E0(sp84[var_v1].x + boss->obj.pos.x, sp84[var_v1].y + boss->obj.pos.y,
sp84[var_v1].z + boss->obj.pos.z, boss->fwork[17]);
@ -1710,7 +1710,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->fwork[15] = 0.5f;
}
}
if ((gBosses[1].actionState != 0) && !(gFrameCount & 0xF)) {
if ((gBosses[1].actionState != 0) && !(gGameFrameCount & 0xF)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199908, &sp84[5]);
func_8007D0E0(gBosses[0].obj.pos.x + sp84[5].x, gBosses[0].obj.pos.y + sp84[5].y,
gBosses[0].obj.pos.z + sp84[5].z, 5.0f);
@ -1718,24 +1718,24 @@ void func_i1_8018C19C(Boss* boss) {
if (gBosses[2].actionState != 0) {
gBosses[3].unk_05E = 1;
if (gBosses[3].actionState != 0) {
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199950, &sp84[11]);
func_8007D0E0(gBosses[0].obj.pos.x + sp84[11].x, gBosses[0].obj.pos.y + sp84[11].y,
gBosses[0].obj.pos.z + sp84[11].z, 7.0f);
}
} else if (!(gFrameCount & 0xF)) {
} else if (!(gGameFrameCount & 0xF)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199938, &sp84[9]);
func_8007D0E0(gBosses[0].obj.pos.x + sp84[9].x, gBosses[0].obj.pos.y + sp84[9].y,
gBosses[0].obj.pos.z + sp84[9].z, 5.0f);
}
}
if ((gBosses[3].actionState != 0) && (gBosses[2].actionState == 0) && !(gFrameCount & 0xF)) {
if ((gBosses[3].actionState != 0) && (gBosses[2].actionState == 0) && !(gGameFrameCount & 0xF)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199944, &sp84[10]);
func_8007D0E0(gBosses[0].obj.pos.x + sp84[10].x, gBosses[0].obj.pos.y + sp84[10].y,
gBosses[0].obj.pos.z + sp84[10].z, 5.0f);
}
if (((boss->actionState == 1) || (boss->actionState == 2)) && !(gFrameCount & 7)) {
if (((boss->actionState == 1) || (boss->actionState == 2)) && !(gGameFrameCount & 7)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[0], &sp84[6]);
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199914[1], &sp84[7]);
Matrix_MultVec3f(gCalcMatrix, &D_i1_8019992C, &sp84[8]);
@ -1902,7 +1902,7 @@ void func_i1_8018C19C(Boss* boss) {
boss->swork[6]++;
boss->swork[6] &= 1;
}
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
if (fabsf(boss->obj.pos.z - gPlayer[0].unk_138) > 700.0f) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_801998F0[0], &sp84[3]);
@ -1966,7 +1966,7 @@ void func_i1_8018C19C(Boss* boss) {
break;
case 8:
D_801779A8[0] = 20.0f;
if (!(gFrameCount & 0x1F)) {
if (!(gGameFrameCount & 0x1F)) {
for (i = 0; i < 10; i++) {
func_80079618(((Rand_ZeroOne() - 0.5f) * 300.0f) + boss->obj.pos.x, boss->obj.pos.y,
boss->obj.pos.z, 1.0f);
@ -2014,7 +2014,7 @@ void func_i1_8018C19C(Boss* boss) {
}
break;
case 9:
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
for (i = 0; i < 10; i++) {
func_80079618(((Rand_ZeroOne() - 0.5f) * 300.0f) + boss->obj.pos.x, boss->obj.pos.y,
boss->obj.pos.z, 1.0f);
@ -2037,7 +2037,7 @@ void func_i1_8018C19C(Boss* boss) {
}
break;
case 10:
if (!(gFrameCount & 7)) {
if (!(gGameFrameCount & 7)) {
for (i = 0; i < 10; i++) {
func_80079618(((Rand_ZeroOne() - 0.5f) * 300.0f) + boss->obj.pos.x, boss->obj.pos.y,
boss->obj.pos.z, 1.0f);
@ -2154,11 +2154,11 @@ void func_i1_8018DDAC(Boss* boss) {
Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 0);
gBosses[0].fwork[15] += 0.5f;
if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
boss->timer_05C = 4;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A6C, &sp4C);
func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x,
boss->vel.y, boss->vel.z, 0.2f, 10);
@ -2247,11 +2247,11 @@ void func_i1_8018E290(Boss* boss) {
Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 0);
gBosses[0].fwork[15] += 0.5f;
if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
boss->timer_05C = 4;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A84, &sp4C);
func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x,
boss->vel.y, boss->vel.z, 0.2f, 10);
@ -2342,10 +2342,10 @@ void func_i1_8018E76C(Boss* boss) {
case 1:
Matrix_RotateZ(gCalcMatrix, boss->obj.rot.z * M_DTOR, 0);
gBosses[0].fwork[15] += 0.5f;
if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
boss->timer_05C = 4;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_MultVec3f(gCalcMatrix, &D_i1_80199A9C, &sp4C);
func_8007C120(boss->obj.pos.x + sp4C.x, boss->obj.pos.y + sp4C.y, boss->obj.pos.z + sp4C.z, boss->vel.x,
boss->vel.y, boss->vel.z, 0.2f, 10);
@ -2520,7 +2520,7 @@ void func_i1_8018F3BC(Object_80* obj80, f32 arg1) {
void func_i1_8018F4A4(void) {
s32 i;
if (!(gFrameCount & 0xF) && !(gPlayer[0].unk_1D0 < 4)) {
if (!(gGameFrameCount & 0xF) && !(gPlayer[0].unk_1D0 < 4)) {
for (i = 0; i < 50; i++) {
if (gObjects80[i].obj.status == 0) {
func_i1_8018F3BC(&gObjects80[i], 4000.0f);
@ -2558,7 +2558,7 @@ void func_i1_8018F55C(Effect* effect) {
void func_i1_8018F678(void) {
s32 i;
if (!(gFrameCount & 0x1F) && gPlayer[0].pos.x == 0.0f) {
if (!(gGameFrameCount & 0x1F) && gPlayer[0].pos.x == 0.0f) {
for (i = 0; i < ARRAY_COUNT(gEffects); i++) {
if (gEffects[i].obj.status == 0) {
@ -2786,7 +2786,7 @@ void func_i1_8018F880(Player* player) {
actor0->obj.pos.y = player->pos.y + 80.0f;
actor0->obj.pos.z += 100.0f;
}
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
break;
@ -2796,14 +2796,14 @@ void func_i1_8018F880(Player* player) {
D_80177A48[0] = 0.0f;
player->timer_1F8 = 190;
}
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
D_80177980 = player->pos.y + 10.0f;
D_801779B8 = player->pos.y + 10.0f;
break;
case 4:
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
Math_SmoothStepToF(&D_80177A48[0], 0.1f, 1.0f, 0.001f, 0.0f);
@ -2824,7 +2824,7 @@ void func_i1_8018F880(Player* player) {
Math_SmoothStepToF(&actor0->fwork[19], 50.0f, 0.1f, 3.0f, 0.01f);
}
actor0->fwork[20] = 0.0f;
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
actor0->fwork[20] = 5.0f;
}
break;
@ -2864,7 +2864,7 @@ void func_i1_8018F880(Player* player) {
func_800BA808(gMsg_ID_2030, RCID_PEPPY);
}
actor2->fwork[20] = 0.0f;
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
actor2->fwork[20] = 5.0f;
}
break;
@ -2891,7 +2891,7 @@ void func_i1_8018F880(Player* player) {
Math_SmoothStepToF(&actor1->fwork[19], -20.0f, 0.1f, 3.0f, 0.01f);
}
actor1->fwork[20] = 0.0f;
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
actor1->fwork[20] = 5.0f;
}
break;
@ -2914,7 +2914,7 @@ void func_i1_8018F880(Player* player) {
func_800BA808(gMsg_ID_2050, RCID_FOX);
}
player->wings.unk_30 = 0.0f;
if ((D_801782F8 != 0) && (gFrameCount & 2)) {
if ((D_801782F8 != 0) && (gGameFrameCount & 2)) {
player->wings.unk_30 = 5.0f;
}
if (player->timer_1F8 == 80) {

0
src/overlays/ovl_i1/E05620.c → src/overlays/ovl_i1/fox_tr.c
View File

9
src/overlays/ovl_i1/sf_tr360.c Normal file
View File

@ -0,0 +1,9 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_tr360/func_i1_80198C50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_tr360/func_i1_80198DCC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_tr360/func_i1_80199024.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_tr360/func_i1_8019949C.s")

76
src/overlays/ovl_i1/sf_ve1.c Normal file
View File

@ -0,0 +1,76 @@
#include "global.h"
#include "sf_ve1.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801920F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801922DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192358.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801923C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_8019243C.s")
void func_i1_801924A8(Object_80* arg0) {
switch (arg0->unk_48) {
case 0:
if (gPlayer[0].pos.z < arg0->obj.pos.z) {
D_80177AB0 = 0;
D_80177A98 = 0;
arg0->unk_48++;
}
case 1:
return;
}
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_8019250C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192518.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192AA4.s")
void func_i1_80192CB0(Actor* actor) {
actor->iwork[0] = actor->obj.rot.x;
actor->obj.rot.x = 0.0f;
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192CD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192E2C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192EA4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80192EB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801933B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801933DC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801934D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80193540.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801935CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801937F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80193D64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80194398.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80198310.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80198414.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_80198594.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801985E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_8019864C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/func_i1_801988B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i1/sf_ve1/D_i1_8019B2B0.s")

4
src/overlays/ovl_i1/DFEE30.h → src/overlays/ovl_i1/sf_ve1.h
View File

@ -1,5 +1,5 @@
#ifndef OVL_DFEE30_H
#define OVL_DFEE30_H
#ifndef OVL_VE1_H
#define OVL_VE1_H
#include "global.h"

40
src/overlays/ovl_i3/fox_a6.c
View File

@ -627,7 +627,7 @@ void func_i3_80187944(Boss* bossA6) {
Math_SmoothStepToF(&D_i3_801C22F0.b[i], D_i3_801BECB0[var_s0][2], 1.0f, 10.0f, 0);
}
if ((bossA6->swork[A6_SWK_15 + 0] == 0) && (bossA6->swork[A6_SWK_15 + 1] == 0) &&
(bossA6->swork[A6_SWK_15 + 2] == 0) && (bossA6->fwork[A6_FWK_0] != 0) && !(gFrameCount & 1)) {
(bossA6->swork[A6_SWK_15 + 2] == 0) && (bossA6->fwork[A6_FWK_0] != 0) && !(gGameFrameCount & 1)) {
func_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 200.0f, bossA6->vel.x, bossA6->vel.y,
bossA6->vel.z, 0.3f, 1);
}
@ -650,18 +650,18 @@ void func_i3_80187944(Boss* bossA6) {
Math_SmoothStepToAngle(&bossA6->fwork[A6_FWK_9], bossA6->fwork[A6_FWK_32], 0.05f, 0.02f, 0.00001f);
Math_SmoothStepToAngle(&bossA6->obj.rot.z, bossA6->fwork[A6_FWK_8], 0.05f, bossA6->fwork[A6_FWK_9], 0.00001f);
if (bossA6->swork[A6_SWK_25] >= 2) {
if (!(gFrameCount & 0x3F) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 0x3F) && (Rand_ZeroOne() < 0.5f)) {
bossA6->fwork[A6_FWK_6] = gPlayer[0].camEye.x + ((Rand_ZeroOne() - 0.5f) * 500.0f);
}
if (!(gFrameCount & 0x3F) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 0x3F) && (Rand_ZeroOne() < 0.5f)) {
bossA6->fwork[A6_FWK_7] = gPlayer[0].camEye.y + ((Rand_ZeroOne() - 0.5f) * 500.0f);
}
} else {
if (!(gFrameCount & 0x1F) && (Rand_ZeroOne() < 0.7f)) {
if (!(gGameFrameCount & 0x1F) && (Rand_ZeroOne() < 0.7f)) {
bossA6->fwork[A6_FWK_6] = gPlayer[0].camEye.x + (Rand_ZeroOne() - 0.5f) * 1000.0f;
bossA6->fwork[A6_FWK_30] = 0.0f;
}
if (!(gFrameCount & 0x1F) && (Rand_ZeroOne() < 0.7f)) {
if (!(gGameFrameCount & 0x1F) && (Rand_ZeroOne() < 0.7f)) {
bossA6->fwork[A6_FWK_7] = gPlayer[0].camEye.y + (Rand_ZeroOne() - 0.5f) * 1000.0f;
bossA6->fwork[A6_FWK_31] = 0.0f;
}
@ -705,7 +705,7 @@ void func_i3_80187944(Boss* bossA6) {
if (bossA6->timer_05C == 0) {
bossA6->timer_05C = 15;
}
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BED04, &spC8[0]);
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BED10, &spC8[1]);
Matrix_MultVec3f(gCalcMatrix, &D_i3_801BED1C, &spC8[2]);
@ -720,12 +720,12 @@ void func_i3_80187944(Boss* bossA6) {
bossA6->obj.pos.z + spC8[i].z, 10.0f);
}
}
if (!(gFrameCount & 0x1F)) {
if (!(gGameFrameCount & 0x1F)) {
func_8007C120(bossA6->obj.pos.x, bossA6->obj.pos.y, bossA6->obj.pos.z + 300.0f, bossA6->vel.x,
bossA6->vel.y, bossA6->vel.z, 0.5f, 70);
}
}
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
sp114 = fabsf(bossA6->fwork[A6_FWK_3] / -1700.0f);
if (sp114 < 1.0f) {
sp114 = 1.0f;
@ -959,7 +959,7 @@ void func_i3_80187944(Boss* bossA6) {
D_i3_801C2250[A6_BSS_30]++;
D_i3_801C2250[A6_BSS_30] &= 1;
}
if (!(gFrameCount & 0x3F)) {
if (!(gGameFrameCount & 0x3F)) {
bossA6->fwork[A6_FWK_8] = Rand_ZeroOne() * 360.0f;
bossA6->fwork[A6_FWK_9] = 0.0f;
}
@ -1026,7 +1026,7 @@ void func_i3_80187944(Boss* bossA6) {
Math_SmoothStepToF(&D_i3_801C22F0.unk_28[0], sp68->r, 0.5f, 100.0f, 0.00001f);
Math_SmoothStepToF(&D_i3_801C22F0.unk_28[2], sp68->g, 0.5f, 100.0f, 0.00001f);
Math_SmoothStepToF(&D_i3_801C22F0.unk_28[1], sp68->b, 0.5f, 100.0f, 0.00001f);
if (!(gFrameCount & 0xF)) {
if (!(gGameFrameCount & 0xF)) {
D_i3_801C2250[A6_BSS_9]++;
D_i3_801C2250[A6_BSS_9] &= 3;
}
@ -1156,7 +1156,7 @@ void func_i3_80187944(Boss* bossA6) {
func_i3_8018A464(bossA6, 1);
func_i3_8018A464(bossA6, 2);
for (i = 0; i < 5; i++) {
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
D_i3_801BF280[i] = (Rand_ZeroOne() - 0.5f) * 10.0f;
D_i3_801BF2B0[i] = (Rand_ZeroOne() - 0.5f) * 10.0f;
D_i3_801BF2E0[i] = (Rand_ZeroOne() - 0.5f) * 10.0f;
@ -1445,7 +1445,7 @@ void func_i3_8018A464(Boss* bossA6, s32 arg1) {
if (bossA6->swork[A6_SWK_25] < 2) {
var_fs0 = 0.7f;
}
if (!(gFrameCount & 31) && (Rand_ZeroOne() < var_fs0) && (D_i3_801C2250[A6_BSS_5] == 0) &&
if (!(gGameFrameCount & 31) && (Rand_ZeroOne() < var_fs0) && (D_i3_801C2250[A6_BSS_5] == 0) &&
(bossA6->swork[A6_SWK_33 + arg1] != 0)) {
if ((Rand_ZeroOne() < 0.2f) || (bossA6->swork[A6_SWK_25] < 2)) {
if (bossA6->swork[A6_SWK_18] == 0) {
@ -1470,7 +1470,7 @@ void func_i3_8018A464(Boss* bossA6, s32 arg1) {
}
} else {
for (i = 0; i < 3; i++) {
if ((i == (gFrameCount & 15)) && (bossA6->swork[A6_SWK_18 + i] == 0)) {
if ((i == (gGameFrameCount & 15)) && (bossA6->swork[A6_SWK_18 + i] == 0)) {
bossA6->swork[A6_SWK_12 + i] = 15;
bossA6->swork[A6_SWK_18 + i] = 1;
i = 3;
@ -1725,7 +1725,7 @@ void func_i3_8018C0D0(f32* arg0, f32 arg1, Vec3f* arg2, f32 arg3, s32 arg4) {
f32 spAC;
f32 var_fs3 = 5.0f;
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
spAC = 0.0f;
} else {
spAC = 180.0f;
@ -1798,17 +1798,17 @@ void func_i3_8018C54C(Boss* bossA6) {
RCP_SetupDL(&gMasterDisp, 0x47);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, (s32) D_i3_801C22F0.unk_24);
spAC.x = 0.0f;
if ((gFrameCounter & 1) == 0) {
if ((gSysFrameCount & 1) == 0) {
spAC.x = 0.0f;
}
spAC.y = spAC.z = 0.0f;
Matrix_RotateZ(gCalcMatrix, gFrameCount * 6.0f * M_DTOR, 0);
Matrix_RotateZ(gCalcMatrix, gGameFrameCount * 6.0f * M_DTOR, 0);
Matrix_MultVec3f(gCalcMatrix, &spAC, &spB8);
Matrix_Translate(gGfxMatrix, spB8.x, spB8.y, 0.0f, 1);
Matrix_Scale(gGfxMatrix, bossA6->unk_3F8, bossA6->unk_3F8, bossA6->unk_3F8, 1);
Matrix_RotateZ(gGfxMatrix, gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, bossA6->fwork[A6_FWK_34], bossA6->fwork[A6_FWK_35], 1.0f, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gFrameCount * 10.0f * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, -(f32) gGameFrameCount * 10.0f * M_DTOR, 1);
Matrix_Scale(gGfxMatrix, bossA6->fwork[A6_FWK_34], bossA6->fwork[A6_FWK_35], 1.0f, 1);
} else {
RCP_SetupDL(&gMasterDisp, 0x1B);
@ -1826,8 +1826,8 @@ void func_i3_8018C54C(Boss* bossA6) {
if (bossA6->unk_3F8 >= 1.0f) {
for (i = 0; i < 3; i++) {
if ((bossA6->swork[A6_SWK_33 + i] == 0) && (bossA6->actionState != 3) &&
(D_i3_801C2250[A6_BSS_2_0 + i] == 0) && !(gFrameCount & 3) && (bossA6->swork[A6_SWK_27 + i] != 0) &&
(D_80177854 != 0x64)) {
(D_i3_801C2250[A6_BSS_2_0 + i] == 0) && !(gGameFrameCount & 3) &&
(bossA6->swork[A6_SWK_27 + i] != 0) && (D_80177854 != 0x64)) {
Matrix_RotateY(gCalcMatrix, bossA6->obj.rot.y * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, bossA6->obj.rot.x * M_DTOR, 1);
Matrix_RotateZ(gCalcMatrix, bossA6->obj.rot.z * M_DTOR, 1);

40
src/overlays/ovl_i3/fox_zo.c
View File

@ -1069,7 +1069,7 @@ void func_i3_80191680(Actor* actor) {
actor->fwork[4] = sp38->obj.pos.x;
actor->fwork[5] = sp38->obj.pos.y;
actor->fwork[6] = sp38->obj.pos.z;
if (!(gFrameCount & 0xF) && (fabsf(gPlayer[0].pos.x - actor->obj.pos.x) < 100.0f)) {
if (!(gGameFrameCount & 0xF) && (fabsf(gPlayer[0].pos.x - actor->obj.pos.x) < 100.0f)) {
func_80081BEC(actor->fwork[4], actor->fwork[5], actor->fwork[6], 1.0f, 0);
}
} else {
@ -1103,7 +1103,7 @@ void func_i3_80191BC4(Actor* actor) {
}
actor->fwork[0] += 10.0f;
func_i3_8018FF50(actor);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007C484(((Rand_ZeroOne() - 0.5f) * 50.0f) + actor->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 50.0f) + actor->obj.pos.y,
((Rand_ZeroOne() - 0.5f) * 50.0f) + actor->obj.pos.z, actor->vel.x, actor->vel.y, actor->vel.z,
@ -2067,7 +2067,7 @@ void func_i3_80194A84(Boss* bossZO) {
Math_SmoothStepToF(&bossZO->obj.pos.z, sZoFwork[ZO_BSF_28] + (gPlayer[0].camEye.z - D_80177D20), 0.1f,
sZoFwork[ZO_BSF_27], 0.00001f);
}
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
if ((bossZO->obj.rot.y <= 90.0f) || (bossZO->obj.rot.y >= 270.0f)) {
sZoSwork[ZO_BSS_43] = bossZO->obj.rot.y;
if (sZoSwork[ZO_BSS_43] > 270) {
@ -2134,7 +2134,7 @@ void func_i3_80194A84(Boss* bossZO) {
}
switch (bossZO->actionState) { /* switch 1 */
case 0: /* switch 1 */
if ((!(gFrameCount & 7) || (bossZO->timer_050 == 43)) && (bossZO->swork[ZO_SWK_13] == 0) &&
if ((!(gGameFrameCount & 7) || (bossZO->timer_050 == 43)) && (bossZO->swork[ZO_SWK_13] == 0) &&
((bossZO->swork[ZO_SWK_12] < 7) || (bossZO->timer_050 == 43))) {
D_801779A8[0] = 20.0f;
if (func_800A73E4(&sp134, &sp130, sZoFwork[ZO_BSF_43_X], sZoFwork[ZO_BSF_43_Y] - 300.0f,
@ -2184,7 +2184,7 @@ void func_i3_80194A84(Boss* bossZO) {
func_i3_8019962C(bossZO, 0.0f);
Math_SmoothStepToF(&sZoFwork[ZO_BSF_1], sZoFwork[ZO_BSF_74], 0.1f, 2.0f, 0.00001f);
Math_SmoothStepToF(&sZoFwork[ZO_BSF_11], sZoFwork[ZO_BSF_75], 0.1f, 2.0f, 0.00001f);
if ((bossZO->timer_050 == 0) && !(gFrameCount & 3)) {
if ((bossZO->timer_050 == 0) && !(gGameFrameCount & 3)) {
if (sZoSwork[ZO_BSS_9] != 0) {
func_i3_80193908(sZoFwork[ZO_BSF_29_X], sZoFwork[ZO_BSF_29_Y], sZoFwork[ZO_BSF_29_Z],
bossZO->obj.rot.y);
@ -2489,7 +2489,7 @@ void func_i3_80194A84(Boss* bossZO) {
if (D_80178480 == 29) {
D_80178348 = D_80178350 = D_80178354 = D_80178340 = 0;
}
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
spE4.x = ((Rand_ZeroOne() - 0.5f) * 300.0f) + bossZO->obj.pos.x;
spE4.y = ((Rand_ZeroOne() - 0.5f) * 200.0f) + (bossZO->obj.pos.y + 600.0f);
spE4.z = bossZO->obj.pos.z - 50.0f;
@ -2504,7 +2504,7 @@ void func_i3_80194A84(Boss* bossZO) {
}
bossZO->vel.x = 0.0f;
Math_SmoothStepToF(&bossZO->obj.pos.x, 0.0f, 0.1f, 5.0f, 0.00001f);
if (!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
if (!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f)) {
sZoLimbTimers[ZO_LIMB_36] = 15;
sZoLimbTimers[ZO_LIMB_25] = 15;
}
@ -2544,7 +2544,7 @@ void func_i3_80194A84(Boss* bossZO) {
break;
case 7: /* switch 1 */
D_801779A8[0] = 20.0f;
if (!(gFrameCount & 7) &&
if (!(gGameFrameCount & 7) &&
(func_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, -300.0f, bossZO->obj.pos.z) != 0)) {
func_8008377C(((Rand_ZeroOne() - 0.5f) * 500.0f) + bossZO->obj.pos.x, sp134 - 300.0f,
((Rand_ZeroOne() - 0.5f) * 3000.0f) + bossZO->obj.pos.z, 5.0f, 2.0f);
@ -2628,7 +2628,7 @@ void func_i3_80194A84(Boss* bossZO) {
spE4.z = gPlayer[0].unk_138 - bossZO->obj.pos.z;
Math_SmoothStepToAngle(&sZoFwork[ZO_BSF_14], Math_RadToDeg(Math_Atan2F(spE4.x, spE4.z)), 0.5f, 100.0f, 0.001f);
Math_SmoothStepToAngle(&sZoFwork[ZO_BSF_0], sZoFwork[ZO_BSF_76], 0.2f, 4.0f, 0.0001f);
if ((!(gFrameCount & 0x3F) || (sZoSwork[ZO_BSS_22] != 0)) &&
if ((!(gGameFrameCount & 0x3F) || (sZoSwork[ZO_BSS_22] != 0)) &&
((Rand_ZeroOne() < 0.5f) || (sZoSwork[ZO_BSS_22] != 0)) && (sZoSwork[ZO_BSS_23] == 0)) {
sZoSwork[ZO_BSS_23] = D_i3_801BF5F0[sZoSwork[ZO_BSS_22]];
sZoFwork[ZO_BSF_76] = D_i3_801BF608[sZoSwork[ZO_BSS_22]];
@ -2735,7 +2735,7 @@ void func_i3_80194A84(Boss* bossZO) {
}
if ((sZoSwork[ZO_BSS_13] < 2) && (sZoLimbTimers[ZO_LIMB_5] != LIMB_DESTROYED)) {
D_801779A8[0] = 20.0f;
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007D0E0(((Rand_ZeroOne() - 0.5f) * 200.0f) + sZoFwork[ZO_BSF_52_X],
((Rand_ZeroOne() - 0.5f) * 200.0f) + sZoFwork[ZO_BSF_52_Y],
((Rand_ZeroOne() - 0.5f) * 100.0f) + sZoFwork[ZO_BSF_52_Z], 5.0f);
@ -3037,9 +3037,9 @@ void func_i3_80194A84(Boss* bossZO) {
}
if (func_800A73E4(&sp134, &sp130, bossZO->obj.pos.x, bossZO->obj.pos.y - 500.0f, bossZO->obj.pos.z) != 0) {
Math_SmoothStepToF(&bossZO->obj.pos.y, sp134 - 20.0f, 0.1f, bossZO->fwork[ZO_FWK_4], 0.0f);
bossZO->fwork[ZO_FWK_1] = __sinf(gFrameCount * 7.0f * M_DTOR) * 12.0f;
bossZO->fwork[ZO_FWK_2] = __cosf(gFrameCount * 9.0f * M_DTOR) * 12.0f;
bossZO->fwork[ZO_FWK_3] = __sinf(gFrameCount * 10.0f * M_DTOR) * 30.0f;
bossZO->fwork[ZO_FWK_1] = __sinf(gGameFrameCount * 7.0f * M_DTOR) * 12.0f;
bossZO->fwork[ZO_FWK_2] = __cosf(gGameFrameCount * 9.0f * M_DTOR) * 12.0f;
bossZO->fwork[ZO_FWK_3] = __sinf(gGameFrameCount * 10.0f * M_DTOR) * 30.0f;
if ((bossZO->timer_054 == 0) && (sZoSwork[ZO_BSS_5] < 2)) {
func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 50.0f, 0.0f, 5.0f);
func_8007AFD0(bossZO->obj.pos.x, bossZO->obj.pos.z, 46.0f, 19.0f, 5.0f);
@ -3249,13 +3249,13 @@ void func_i3_80198ECC(Boss* bossZO) {
}
void func_i3_80198F3C(Boss* bossZO, s32 arg1, s32 arg2) {
if ((!(gFrameCount & 7) && (Rand_ZeroOne() < 0.5f))) {
if ((!(gGameFrameCount & 7) && (Rand_ZeroOne() < 0.5f))) {
sZoLimbTimers[ZO_LIMB_7 + 4 * arg1] = sZoLimbTimers[ZO_LIMB_21 + 2 * arg1] =
sZoLimbTimers[ZO_LIMB_22 + 2 * arg1] = 15;
}
func_8007D0E0(sZoFwork[ZO_BSF_0 + arg2] + ((Rand_ZeroOne() - 0.5f) * 400.0f),
sZoFwork[ZO_BSF_1 + arg2] + (Rand_ZeroOne() - 0.2f) * 800.0f, sZoFwork[ZO_BSF_2 + arg2], 7.0f);
if (!(gFrameCount & 1)) {
if (!(gGameFrameCount & 1)) {
func_8007C120(sZoFwork[ZO_BSF_0 + arg2], sZoFwork[ZO_BSF_1 + arg2], sZoFwork[ZO_BSF_2 + arg2], bossZO->vel.x,
bossZO->vel.y, bossZO->vel.z, 0.2f, 10);
}
@ -3600,7 +3600,7 @@ void func_i3_8019A1FC(Actor* actor) {
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
GCGM_BACK();
if (((actor->unk_0B8 == 1) && (gBosses[0].timer_052 != 0)) || (actor->unk_0B8 == 0)) {
Matrix_RotateY(gGfxMatrix, gFrameCount * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
}
// var_s1 = 1;
var_fv0 = sZoFwork[ZO_BSF_60_Y] + -1.0f * actor->fwork[0] - actor->obj.pos.y;
@ -3749,7 +3749,7 @@ void func_i3_8019A5D4(Actor* actor) {
}
actor->unk_0D0 = 0;
}
if (!(gFrameCount & 7) && (actor->unk_0B8 != 0) && (actor->iwork[0] < 8) &&
if (!(gGameFrameCount & 7) && (actor->unk_0B8 != 0) && (actor->iwork[0] < 8) &&
(func_800A73E4(&sp44, &sp40, actor->obj.pos.x, actor->obj.pos.y - 100.0f, actor->obj.pos.z) != 0)) {
func_8008377C(actor->obj.pos.x, sp44, actor->obj.pos.z, 0.0f, 0.7f);
actor->iwork[0]++;
@ -4312,7 +4312,7 @@ void func_i3_8019C83C(Actor* actor) {
Matrix_SetGfxMtx(&gMasterDisp);
GDL(D_601C590);
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
Matrix_RotateY(gGfxMatrix, gFrameCount * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, gGameFrameCount * M_DTOR, 1);
var_fv1 = (fabsf(actor->fwork[3]) * 1.3f) + 50.0f;
for (var_s1 = 0; var_fv1 > 0.0f; var_s1++) {
@ -4343,9 +4343,9 @@ void func_i3_8019CBEC(Actor* actor) {
actor->timer_0C2 = 30000;
switch (actor->unk_0B8) {
case 0:
actor->fwork[5] = D_i3_801BF8CC[gFrameCount & 1];
actor->fwork[5] = D_i3_801BF8CC[gGameFrameCount & 1];
if (D_80161684 != 0) {
actor->fwork[5] = D_i3_801BF8C4[gFrameCount & 1];
actor->fwork[5] = D_i3_801BF8C4[gGameFrameCount & 1];
actor->iwork[1] = 1;
}
actor->unk_0B8++;

1
src/overlays/ovl_i3/sf_aq.c
View File

@ -1,3 +1,4 @@
#include "prevent_bss_reordering.h"
#include "global.h"
void func_i3_801AC918(Effect*);

2
src/overlays/ovl_i3/sf_so.c
View File

@ -978,7 +978,7 @@ void func_i3_801A7930(Player* player) {
D_80178358 = 0;
D_8017835C = 4;
if (D_801782F8 != 0) {
player->wings.unk_30 = (gFrameCount & 1) * 5.0f;
player->wings.unk_30 = (gGameFrameCount & 1) * 5.0f;
}
switch (D_80177A80) {
case 0x1C2:

27
src/overlays/ovl_i5/E97CC0.c
View File

@ -1,27 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B49D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B4A54.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B4AA8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5110.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B58AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B5FE0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B68A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6AEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6B40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B6E20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/func_i5_801B7240.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/E97CC0/D_i5_801BBDF0.s")

13
src/overlays/ovl_i5/fox_ti_cs.c
View File

@ -217,7 +217,8 @@ void func_i5_8018769C(Player* player) {
Object_Kill(&gActors[3].obj, &gActors[3].sfxPos);
}
Math_SmoothStepToF(&player->unk_0F0, __sinf(((gFrameCount) *5.0f) * M_DTOR) * 10.0f, 0.1f, 100.0f, 0.0f);
Math_SmoothStepToF(&player->unk_0F0, __sinf(((gGameFrameCount) *5.0f) * M_DTOR) * 10.0f, 0.1f, 100.0f,
0.0f);
if (D_80177A80 == 0x244) {
D_80177838 = 0x32;
@ -357,7 +358,7 @@ void func_i5_801882CC(Player* player) {
func_800A8BA4(player);
func_800ADF58(player);
if (!(gFrameCount & 3)) {
if (!(gGameFrameCount & 3)) {
f32 x;
f32 y;
f32 z;
@ -383,7 +384,7 @@ void func_i5_801882CC(Player* player) {
D_801779C0 = player->pos.z + player->unk_144;
if (player->pos.y < 100.0f) {
camAtY = __sinf((gFrameCount * 130.0f) * 0.017453292f) * 3.0f;
camAtY = __sinf((gGameFrameCount * 130.0f) * 0.017453292f) * 3.0f;
}
Math_SmoothStepToF(&player->unk_170, 2.0f, 1.0f, 0.2f, 0.0f);
@ -398,12 +399,12 @@ void func_i5_801882CC(Player* player) {
func_8007A900(((Rand_ZeroOne() - 0.5f) * 30.0f) + (player->pos.x - 30.0f), 30.0f,
((Rand_ZeroOne() - 0.5f) * 30.0f) + player->unk_138, (2.0f * Rand_ZeroOne()) + 3.5f, 255, 12,
1);
Math_SmoothStepToF(&player->unk_0F0, __sinf((gFrameCount * 6.0f) * 0.017453292f) * 18.0f, 0.1f, 100.0f,
Math_SmoothStepToF(&player->unk_0F0, __sinf((gGameFrameCount * 6.0f) * 0.017453292f) * 18.0f, 0.1f, 100.0f,
0.0f);
Math_SmoothStepToF(&player->unk_080, __sinf((gFrameCount * 3.0f) * 0.017453292f) * 5.0f, 0.1f, 100.0f,
Math_SmoothStepToF(&player->unk_080, __sinf((gGameFrameCount * 3.0f) * 0.017453292f) * 5.0f, 0.1f, 100.0f,
0.0f);
x = __sinf((gFrameCount * 4.0f) * 0.017453292f) * -1.5f;
x = __sinf((gGameFrameCount * 4.0f) * 0.017453292f) * -1.5f;
player->vel.x = x;
player->vel.y += 0.1f;

27
src/overlays/ovl_i5/sf_i5_4.c Normal file
View File

@ -0,0 +1,27 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B49D0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B4A54.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B4AA8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B5110.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B5244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B58AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B5FE0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B68A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B6AEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B6B40.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B6E20.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/func_i5_801B7240.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i5/sf_i5_4/D_i5_801BBDF0.s")

17
src/overlays/ovl_i6/EADECO.c
View File

@ -1,17 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196210.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_8019624C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196288.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_801962F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196314.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196968.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196BF8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EADECO/func_E9F1D0_80196D88.s")

13
src/overlays/ovl_i6/EBD210.c
View File

@ -1,13 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5560.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A581C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A58A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5AD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A5FC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/EBD210/func_E9F1D0_801A6164.s")

6
src/overlays/ovl_i6/fox_i6.c
View File

@ -1,8 +1,8 @@
#include "global.h"
UNK_TYPE D_E9F1D0_801A7F30;
s32 D_E9F1D0_801A6750 = 0;
UNK_TYPE D_i6_801A7F30;
s32 D_i6_801A6750 = 0;
void func_E9F1D0_80187520(u32 mode, void* ptr) {
void func_i6_80187520(u32 mode, void* ptr) {
PRINTF("i6 指定外！\n");
}

104
src/overlays/ovl_i6/fox_sy.c
View File

@ -1,105 +1,105 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197B30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197B30.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197C64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197C64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197CB8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197CB8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197CC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197CC4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197F18.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197F18.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80197F84.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80197F84.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198238.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80198238.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80198244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801983E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801983E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198ABC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80198ABC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198CE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80198CE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80198F5C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80198F5C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199438.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80199438.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199D64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80199D64.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_80199DAC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_80199DAC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A434.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A434.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A520.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A520.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A640.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A640.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A66C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A66C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A82C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A82C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019A898.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019A898.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AA08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019AA08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AAF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019AAF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AEC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019AEC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019AEEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019AEEC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B528.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019B528.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B5CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019B5CC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019B6E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019B6E8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019BBBC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019BBBC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019BC14.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019BC14.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019C194.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019C194.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019C888.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019C888.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019DC4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019DC4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019DE10.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019DE10.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019E014.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019E014.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019E2C4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019E2C4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019EB80.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019EB80.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019EE60.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019EE60.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_8019FF00.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_8019FF00.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0510.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A0510.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A06A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A06A4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A07FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A07FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0A08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A0A08.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A0AC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A0AC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A39FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A39FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A3B50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A3B50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A3BD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A3BD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4A18.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A4A18.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4C34.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A4C34.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4CB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A4CB0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A4E44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A4E44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_E9F1D0_801A52B8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/fox_sy/func_i6_801A52B8.s")

162
src/overlays/ovl_i6/E9F1E0.c → src/overlays/ovl_i6/sf_i6_1.c
View File

@ -1,9 +1,9 @@
#include "global.h"
extern s32 D_E9F1D0_801A6760[12];
extern f32 D_E9F1D0_801A7F64[2];
extern s32 D_i6_801A6760[12];
extern f32 D_i6_801A7F64[2];
void func_E9F1D0_80187530(Actor* actor) {
void func_i6_80187530(Actor* actor) {
s32 index;
switch (actor->unk_048) {
@ -26,11 +26,11 @@ void func_E9F1D0_80187530(Actor* actor) {
}
index = actor->unk_0B6 / 18.0f;
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_E9F1D0_801A6760[index]);
actor->obj.rot.z = D_E9F1D0_801A7F64[1];
actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_i6_801A6760[index]);
actor->obj.rot.z = D_i6_801A7F64[1];
}
s32 func_E9F1D0_8018767C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) {
s32 func_i6_8018767C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* arg4) {
if (arg0 == 13) {
*arg1 = 0;
}
@ -39,20 +39,19 @@ s32 func_E9F1D0_8018767C(s32 arg0, Gfx** arg1, Vec3f* arg2, Vec3f* arg3, void* a
extern Limb* D_6014844[];
void func_E9F1D0_8018769C(Actor* actor) {
void func_i6_8018769C(Actor* actor) {
Vec3f sp28[20];
Animation_GetFrameData(&D_6014658, actor->unk_0B6, sp28);
Animation_DrawSkeleton(1, D_6014844, sp28, func_E9F1D0_8018767C, NULL, NULL, &gIdentityMatrix);
Animation_DrawSkeleton(1, D_6014844, sp28, func_i6_8018767C, NULL, NULL, &gIdentityMatrix);
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801876FC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801876FC.s")
extern void func_800A4F4C(Object_58*);
extern ObjectInit* D_C0356CC;
extern f32* D_C038CCC;
void func_E9F1D0_801878A8() {
void func_i6_801878A8() {
Actor* var_s0_2;
Item* var_s0_3;
Object_58* var_s0;
@ -123,7 +122,7 @@ extern ObjectInit* D_C036310;
extern ObjectInit* D_C036B6C;
extern ObjectInit* D_C03733C;
void func_E9F1D0_80187C5C(void) {
void func_i6_80187C5C(void) {
Actor* var_s0_2;
Item* var_s0_3;
Object_58* var_s0;
@ -204,7 +203,7 @@ void func_E9F1D0_80187C5C(void) {
}
}
void func_E9F1D0_801880E4(Actor* arg0) {
void func_i6_801880E4(Actor* arg0) {
s32 i;
Vec3f sp60;
Object_58* var_v0;
@ -229,7 +228,7 @@ void func_E9F1D0_801880E4(Actor* arg0) {
if ((fabsf(sp60.z) < 300.0f) && (fabsf(sp60.y) < 300.0f) && (fabsf(sp60.x) < 300.0f)) {
arg0->unk_04E += 1;
}
if (!(gFrameCount & 0x1F)) {
if (!(gGameFrameCount & 0x1F)) {
arg0->iwork[0xB] = 1;
arg0->fwork[1] = 47.0f;
if ((fabsf(arg0->obj.pos.x - gPlayer[0].pos.x) < 1000.0f) &&
@ -265,11 +264,11 @@ void func_E9F1D0_801880E4(Actor* arg0) {
arg0->vel.z = sp3C.z;
}
void func_E9F1D0_80188448(Actor* arg0) {
void func_i6_80188448(Actor* arg0) {
func_8005B388(arg0);
}
void func_E9F1D0_80188468(void) {
void func_i6_80188468(void) {
Actor* actor = &gActors[0];
Actor_Initialize(actor);
@ -284,9 +283,7 @@ void func_E9F1D0_80188468(void) {
Audio_PlaySfx(0x3100000C, &actor->sfxPos, 4, &D_800C5D34, &D_800C5D34, &D_800C5D3C);
}
#define RAD_TO_DEG(radians) ((radians * 180.0f) / M_PI)
void func_E9F1D0_80188528(Actor* arg0) {
void func_i6_80188528(Actor* arg0) {
Math_SmoothStepToF(&arg0->vel.x, 0.0f, 0.2f, 0.5f, 0.0f);
Math_SmoothStepToF(&arg0->vel.y, 0.0f, 0.2f, 0.5f, 0.0f);
Math_SmoothStepToF(&arg0->vel.z, 0.0f, 0.2f, 0.5f, 0.0f);
@ -304,7 +301,7 @@ void func_E9F1D0_80188528(Actor* arg0) {
extern Gfx* D_6009300;
void func_E9F1D0_80188660(Actor* arg0) {
void func_i6_80188660(Actor* arg0) {
RCP_SetupDL(&gMasterDisp, 0x3D);
GPC(255, 255, 255, 255);
@ -317,7 +314,7 @@ void func_E9F1D0_80188660(Actor* arg0) {
GDL(&D_6009300);
}
void func_E9F1D0_801887B0(Actor* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) {
void func_i6_801887B0(Actor* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) {
Actor_Initialize(arg0);
arg0->obj.status = 2;
arg0->obj.id = 0x11E;
@ -336,18 +333,18 @@ void func_E9F1D0_801887B0(Actor* arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f
Object_SetInfo(&arg0->info, arg0->obj.id);
}
void func_E9F1D0_8018887C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
void func_i6_8018887C(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) {
s32 i;
for (i = 0; i < ARRAY_COUNT(gActors); i++) {
if (gActors[i].obj.status == 0) {
func_E9F1D0_801887B0(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5);
func_i6_801887B0(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5);
break;
}
}
}
void func_E9F1D0_801888F4(Actor* arg0) {
void func_i6_801888F4(Actor* arg0) {
s32 i;
arg0->obj.rot.z -= 8.0f;
@ -371,7 +368,7 @@ void func_E9F1D0_801888F4(Actor* arg0) {
}
}
void func_E9F1D0_80188A4C(Boss* arg0) {
void func_i6_80188A4C(Boss* arg0) {
if (arg0->damage >= 21) {
arg0->damage = 20;
@ -430,7 +427,7 @@ void func_E9F1D0_80188A4C(Boss* arg0) {
extern AnimationHeader D_600C038;
void func_E9F1D0_80188CB8(Boss* arg0) {
void func_i6_80188CB8(Boss* arg0) {
s32 i;
Vec3f sp50;
Vec3f sp44;
@ -467,11 +464,11 @@ void func_E9F1D0_80188CB8(Boss* arg0) {
if (arg0->swork[7] != 0) {
arg0->swork[7]--;
if (!(gFrameCount & 1)) {
func_E9F1D0_8018887C(((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 300.0f) + (arg0->obj.pos.y - 250.0f),
((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.z, (Rand_ZeroOne() - 0.5f) * 50.0f,
(Rand_ZeroOne() - 0.5f) * 10.0f, (Rand_ZeroOne() - 0.5f) * 50.0f);
if (!(gGameFrameCount & 1)) {
func_i6_8018887C(((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.x,
((Rand_ZeroOne() - 0.5f) * 300.0f) + (arg0->obj.pos.y - 250.0f),
((Rand_ZeroOne() - 0.5f) * 100.0f) + arg0->obj.pos.z, (Rand_ZeroOne() - 0.5f) * 50.0f,
(Rand_ZeroOne() - 0.5f) * 10.0f, (Rand_ZeroOne() - 0.5f) * 50.0f);
}
}
arg0->fwork[14] += arg0->fwork[15];
@ -502,7 +499,7 @@ void func_E9F1D0_80188CB8(Boss* arg0) {
}
}
void func_E9F1D0_80189098(Object* arg0) {
void func_i6_80189098(Object* arg0) {
Actor* actor = &gActors[10];
Actor_Initialize(actor);
@ -536,7 +533,7 @@ void func_E9F1D0_80189098(Object* arg0) {
extern void func_800B56BC(Player*);
void func_E9F1D0_80189214(void) {
void func_i6_80189214(void) {
s32 i;
Player* player = &gPlayer[0];
@ -568,14 +565,14 @@ void func_E9F1D0_80189214(void) {
func_800B56BC(player);
}
void func_E9F1D0_8018933C(Actor* arg0) {
void func_i6_8018933C(Actor* arg0) {
if ((fabsf(arg0->obj.pos.x - gPlayer->pos.x) < 1000.0f) && (fabsf(arg0->obj.pos.z - gPlayer->unk_138) < 1000.0f)) {
D_Timer_80177B44 = 0x32;
Object_Kill(&arg0->obj, &arg0->sfxPos);
}
}
void func_E9F1D0_801893B8(Actor* arg0) {
void func_i6_801893B8(Actor* arg0) {
if (D_8015F924 == 0) {
arg0->unk_04E++;
@ -596,22 +593,23 @@ void func_E9F1D0_801893B8(Actor* arg0) {
}
}
void func_E9F1D0_80193710(void);
void func_i6_80193710(void);
void func_E9F1D0_80189470(Object* arg0) {
void func_i6_80189470(Actor* arg0) {
s32 i;
Player* player = &gPlayer[0];
if ((D_80177AB0 != 7) && (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) &&
(fabsf(arg0->pos.x - gPlayer[0].pos.x) < 9000.0f) && (fabsf(arg0->pos.z - gPlayer[0].unk_138) < 9000.0f)) {
(fabsf(arg0->obj.pos.x - gPlayer[0].pos.x) < 9000.0f) &&
(fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) < 9000.0f)) {
D_80177AB0 = 7;
func_800BA808(gMsg_ID_19370, RCID_JAMES);
func_800182F4(0x101400FF);
func_800182F4(0x111400FF);
}
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (fabsf(arg0->pos.x - gPlayer[0].pos.x) < 500.0f) &&
(fabsf(arg0->pos.z - gPlayer[0].unk_138) < 500.0f)) {
if ((gPlayer[0].state_1C8 == PLAYERSTATE_1C8_3) && (fabsf(arg0->obj.pos.x - gPlayer[0].pos.x) < 500.0f) &&
(fabsf(arg0->obj.pos.z - gPlayer[0].unk_138) < 500.0f)) {
func_8001A838(0x11403076);
func_8001D400(0);
gCurrentLevel = LEVEL_VENOM_2;
@ -636,7 +634,7 @@ void func_E9F1D0_80189470(Object* arg0) {
gObjects58[i].obj.status = 0;
}
func_E9F1D0_80193710();
func_i6_80193710();
D_8017782C = 1;
func_800A594C();
D_80178348 = D_80178350 = D_80178354 = 0;
@ -647,84 +645,84 @@ void func_E9F1D0_80189470(Object* arg0) {
}
}
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189724.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80189724.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801899E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801899E4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189B00.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80189B00.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80189B70.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80189B70.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018B47C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018B47C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018B8C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018B8C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018BDD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018BDD8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C390.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C390.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C660.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C660.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C734.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C734.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C7A0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C7A0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C8D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C8D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018C958.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018C958.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CA50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018CA50.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CAD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018CAD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018CF98.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018CF98.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D0D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018D0D8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D16C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018D16C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D2B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018D2B0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018D9C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018D9C0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018DA94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018DA94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8018DBF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8018DBF0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801917F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801917F0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801924B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801924B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801928C8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801928C8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80192E94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80192E94.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193244.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193380.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193380.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801934EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801934EC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8019350C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8019350C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_8019356C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_8019356C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801935B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801935B4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801935D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801935D4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193668.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193668.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193710.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193710.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801939A0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801939A0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193AE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193AE4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80193C4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80193C4C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_80195E44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_80195E44.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/func_E9F1D0_801961AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/func_i6_801961AC.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/E9F1E0/D_E9F1D0_801A6BA0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_1/D_i6_801A6BA0.s")

17
src/overlays/ovl_i6/sf_i6_2.c Normal file
View File

@ -0,0 +1,17 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196210.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_8019624C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196288.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_801962F4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196314.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196968.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196BF8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_2/func_i6_80196D88.s")

13
src/overlays/ovl_i6/sf_i6_4.c Normal file
View File

@ -0,0 +1,13 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A5560.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A581C.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A58A8.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A5AD4.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A5FC0.s")
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_i6/sf_i6_4/func_i6_801A6164.s")

32
src/overlays/ovl_menu/fox_map.c
View File

@ -1341,7 +1341,7 @@ void func_menu_8019E99C(void) {
func_8001DC6C(0, 0x118);
D_80137E78 = 2;
gFrameCount = 0;
gGameFrameCount = 0;
func_menu_80188010();
@ -1942,7 +1942,7 @@ void func_menu_8019FF48(void) {
func_800B6F50(D_menu_801CD9F4, D_menu_801CD9F8, D_menu_801CD9FC, D_menu_801CDA00, D_menu_801CDA04,
D_menu_801CDA08);
}
gFrameCount++;
gGameFrameCount++;
#if MODS_LEVEL_SELECT == true
Map_LevelSelect();
#endif
@ -3925,7 +3925,7 @@ void func_menu_801A5834(void) {
D_menu_801CF000[colorIndex]--;
}
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, D_6000840, 96, 22, x + 11.0f, y + 3.0f, 1.0f, 1.0f);
@ -3940,7 +3940,7 @@ void func_menu_801A5834(void) {
D_menu_801CF000[colorIndex]--;
}
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, D_60018C0, 96, 10, x + 10.0f, y + z + 8.0f, 1.0f, 1.0f);
}
@ -3954,7 +3954,7 @@ void func_menu_801A5834(void) {
D_menu_801CF000[colorIndex]--;
}
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
gDPSetPrimColor(gMasterDisp++, 0, 0, r[colorIndex], g[colorIndex], b[colorIndex], 255);
TextureRect_8bIA(&gMasterDisp, texture, 96, 22, x + 9.0f, y + z + 5.0f, 1.0f, 1.0f);
}
@ -4463,7 +4463,7 @@ void func_menu_801A6A98(PlanetId planetId) {
func_menu_801A7D3C(planetId);
Matrix_Push(&gGfxMatrix);
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
if (planetId == PLANET_TITANIA) {
func_menu_801A791C(planetId);
}
@ -5264,7 +5264,7 @@ void func_menu_801A9224(void) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, planet[PLANET_METEO].alpha);
}
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
for (i = 0; i < 42; i++) {
Matrix_Push(&gGfxMatrix);
@ -5320,7 +5320,7 @@ void func_menu_801A9448(void) {
dest.y = 0.0f;
dest.z = 0.0f;
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
for (i = 0; i < 4; i++) {
Matrix_Push(&gGfxMatrix);
@ -5503,7 +5503,7 @@ void func_menu_801A9DE8(void) {
D_menu_801CF00C--;
}
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
func_menu_801AD7EC(254, 16, gLifeCount[gPlayerNum]);
}
@ -5672,7 +5672,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
switch (planetId) {
case PLANET_SOLAR:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x43);
gDPSetPrimColor(gMasterDisp++, 0, 0, 240, 0, 0, 255);
@ -5699,7 +5699,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
break;
case PLANET_METEO:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x3E);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -5726,7 +5726,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
case PLANET_SECTOR_X:
case PLANET_SECTOR_Y:
case PLANET_SECTOR_Z:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x3E);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 144);
@ -5746,7 +5746,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
break;
case PLANET_BOLSE:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x17);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 50, 50, 40, 100, 100, 100);
@ -5768,7 +5768,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
break;
case PLANET_AREA_6:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x17);
Lights_SetOneLight(&gMasterDisp, 0, 0, 100, 50, 50, 40, 100, 100, 100);
@ -5790,7 +5790,7 @@ void func_menu_801AA778(s32 arg0, f32 x, f32 y, PlanetId planetId) {
break;
default:
if (gFrameCount & mask) {
if (gGameFrameCount & mask) {
RCP_SetupDL(&gMasterDisp, 0x3E);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 255, 255);
@ -6060,7 +6060,7 @@ void func_menu_801AB978(s32 arg0) {
case 0:
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
if (gFrameCount & 0x10) {
if (gGameFrameCount & 0x10) {
Graphics_DisplaySmallText(D_menu_801B6B0C[i], 131 + 28, 1.0f, 1.0f, "OK !");
}
sp90[i] = D_menu_801CEA74;

22
src/overlays/ovl_menu/fox_option.c
View File

@ -400,7 +400,7 @@ void Option_Setup(void) {
var_v0_2 = gExpertMode;
gExpertMode = false;
gFrameCount = 0;
gGameFrameCount = 0;
D_menu_801B8284 = 0;
D_menu_801B9178 = 0;
D_menu_801B917C = 0;
@ -546,7 +546,7 @@ void Option_Init(void) {
Option_UpdateEntry();
break;
}
gFrameCount++;
gGameFrameCount++;
}
void Option_UpdateEntry(void) {
@ -1950,13 +1950,13 @@ void Option_DataDraw(void) {
}
}
if (gFrameCount & sp74[1]) {
if (gGameFrameCount & sp74[1]) {
sp7C[1] = D_menu_801AED20[1];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[1], sp7C[1], 255);
TextureRect_8bIA(&gMasterDisp, D_8009980, 32, 12, D_menu_801AF094[1], D_menu_801AF0AC[1], 1.0f, 1.0f);
}
if (gFrameCount & sp74[0]) {
if (gGameFrameCount & sp74[0]) {
sp7C[0] = D_menu_801AED20[0];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, sp7C[0], sp7C[0], 255);
TextureRect_8bIA(&gMasterDisp, D_8009B00, 40, 12, D_menu_801AF094[2], D_menu_801AF0AC[2], 1.0f, 1.0f);
@ -2785,7 +2785,7 @@ void func_menu_80199820(s32 arg0) {
D_menu_801B9348[arg0]--;
}
if (gFrameCount & var_v0) {
if (gGameFrameCount & var_v0) {
colorGB = D_menu_801B9358[arg0];
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
@ -3192,7 +3192,7 @@ void func_menu_8019AB30(void) {
}
}
if (gFrameCount & var_v0) {
if (gGameFrameCount & var_v0) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
@ -3260,7 +3260,7 @@ void func_menu_8019AD84(void) {
}
}
if (gFrameCount & var_v0) {
if (gGameFrameCount & var_v0) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
@ -3326,7 +3326,7 @@ void func_menu_8019AFFC(void) {
}
}
if (gFrameCount & var_v0) {
if (gGameFrameCount & var_v0) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
@ -3447,7 +3447,7 @@ void func_menu_8019B5AC(void) {
}
}
if (gFrameCount & var_v0) {
if (gGameFrameCount & var_v0) {
RCP_SetupDL(&gMasterDisp, 0x53);
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, colorGB, colorGB, 255);
TextureRect_8bIA(&gMasterDisp, D_7003650, 40, 12, 143.0f, 210.0f, 1.0f, 1.0f);
@ -4091,7 +4091,7 @@ void func_menu_8019D118(void) {
Graphics_DisplaySmallText(D_menu_801AF30C[2], D_menu_801AF324[2], 1.0f, 1.0f, "TOTAL HITS");
(void) "p:%d x:%f y:%f\n";
if (D_menu_801B9138 == 1) {
if (gFrameCount & 0x10) {
if (gGameFrameCount & 0x10) {
gDPSetPrimColor(gMasterDisp++, 0, 0, 255, 255, 0, 255);
TextureRect_8bIA(&gMasterDisp, D_50021F0, 32, 8, D_menu_801AF30C[5], D_menu_801AF324[5], 1.0f, 1.0f);
}
@ -4136,7 +4136,7 @@ void func_menu_8019D118(void) {
Matrix_SetGfxMtx(&gMasterDisp);
for (i = 0; i < 3; i++) {
if (gFrameCount & mask[i]) {
if (gGameFrameCount & mask[i]) {
func_menu_8019DB20(D_menu_801B9150[i][0], D_menu_801AF300[i], 18.0f, -455.0f, 1.0f,
D_menu_801B90C0[i] + D_menu_801B90F0[i], D_menu_801B90D0[i] + D_menu_801B9100[i],
D_menu_801B90E0[i] + D_menu_801B9110[i]);

14
src/overlays/ovl_menu/fox_title.c
View File

@ -38,7 +38,7 @@ u16* D_menu_801ADA30[5] = {
void func_menu_801875E0(void) {
D_80137E78 = 2;
gFrameCount = 0;
gGameFrameCount = 0;
D_80177AE0 = 2;
@ -108,7 +108,7 @@ void func_menu_80187754(void) {
func_menu_801877F0();
break;
}
gFrameCount++;
gGameFrameCount++;
}
void func_menu_801877F0(void) {
@ -263,7 +263,7 @@ void func_menu_80187B00(void) {
break;
}
if ((D_menu_801B82A8 == 0) && ((gFrameCount & 7) == 7) && (D_menu_801B8288 < 10)) {
if ((D_menu_801B82A8 == 0) && ((gGameFrameCount & 7) == 7) && (D_menu_801B8288 < 10)) {
D_menu_801B8288++;
}
}
@ -667,7 +667,7 @@ void func_menu_801888E8(void) {
}
if (D_menu_801B82B0 == 0) {
if (gFrameCount & 0x80) {
if (gGameFrameCount & 0x80) {
if (D_menu_801B8350[1].unk_20 + D_menu_801B8350[1].unk_24 < -20.0f) {
D_menu_801B8350[1].unk_24 = 4.0f;
}
@ -1286,7 +1286,7 @@ void func_menu_8018A990(void) {
{ 255.0f, 255.0f, 155.0f },
};
if ((gFrameCount & 7) == 7) {
if ((gGameFrameCount & 7) == 7) {
if (D_menu_801B8338 != 0) {
D_menu_801B8334 = (D_menu_801B8334 + 1) & 3;
D_menu_801B8328 = D_menu_801ADF54[D_menu_801B8334].unk_0;
@ -1300,7 +1300,7 @@ void func_menu_8018A990(void) {
D_menu_801B8338 ^= 1;
}
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
D_menu_801B86CC += 30.0f;
if (D_menu_801B86CC > 90.0f) {
D_menu_801B86CC = -90.0f;
@ -2185,7 +2185,7 @@ void func_menu_8018D510(s32 arg0) {
var_fv0 = D_menu_801B84E8[arg0].unk_44;
if (gFrameCount & 1) {
if (gGameFrameCount & 1) {
var_fv0 += var_fv1;
}

3
src/overlays/ovl_unused/EFFA40.c
View File

@ -1,3 +0,0 @@
#include "common.h"
#pragma GLOBAL_ASM("asm/us/nonmatchings/overlays/ovl_unused/EFFA40/func_EFFA40_80187520.s")

11
src/overlays/ovl_unused/fox_unused.c Normal file
View File

@ -0,0 +1,11 @@
#include "global.h"
UNK_TYPE D_unused_801875C0;
f32* D_unused_80187530[] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, D_C038DC0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
};
void func_unused_80187520(void) {
}

14
yamls/us/main.yaml
View File

@ -173,8 +173,8 @@
- [0x2EFE0, c, fox_360]
- [0x36930, c, fox_beam]
- [0x3E6F0, c, fox_bg]
- [0x43AC0, c, fox_43AC0]
- [0x43E80, c, fox_43E80]
- [0x43AC0, c, fox_boss]
- [0x43E80, c, fox_tank]
- [0x496C0, c, fox_demo]
- [0x52730, c, fox_display]
- [0x59780, c, fox_load]
@ -266,8 +266,8 @@
- [0xCA690, .data, fox_360]
- [0xCA7C0, .data, fox_beam]
- [0xCA830, .data, fox_bg]
- [0xCAA90, .data, fox_43AC0]
- [0xCAB00, .data, fox_43E80]
- [0xCAA90, .data, fox_boss]
- [0xCAB00, .data, fox_tank]
- [0xCAB60, .data, fox_demo]
- [0xCAE20, .data, fox_display]
- [0xCAFB0, .data, fox_load]
@ -291,8 +291,8 @@
- [0xD5A10, .rodata, fox_360]
- [0xD5CF0, .rodata, fox_beam]
- [0xD5F90, .rodata, fox_bg]
- [0xD61D0, .rodata, fox_43AC0]
- [0xD61F0, .rodata, fox_43E80]
- [0xD61D0, .rodata, fox_boss]
- [0xD61F0, .rodata, fox_tank]
- [0xD6350, .rodata, fox_demo]
- [0xD69A0, .rodata, fox_display]
- [0xD6BA0, .rodata, fox_load]
@ -359,7 +359,7 @@
- { start: 0xDE480, type: .bss, vram: 0x8015F900, name: fox_360 }
- { start: 0xDE480, type: .bss, vram: 0x8015F950, name: fox_beam }
- { start: 0xDE480, type: .bss, vram: 0x8015F960, name: fox_bg }
- { start: 0xDE480, type: .bss, vram: 0x801613A0, name: fox_43AC0 }
- { start: 0xDE480, type: .bss, vram: 0x801613A0, name: fox_boss }
- { start: 0xDE480, type: .bss, vram: 0x801613B0, name: fox_display }
- { start: 0xDE480, type: .bss, vram: 0x801615D0, name: fox_edisplay }
- { start: 0xDE480, type: .bss, vram: 0x80161670, name: fox_enmy }

73
yamls/us/overlays.yaml
View File

@ -9,20 +9,20 @@
subsegments:
- [0xDF4260, c, fox_i1]
- [0xDF4270, c, fox_co]
- [0xDFEE30, c, DFEE30]
- [0xE05620, c, E05620]
- [0xE05990, c, E05990]
- [0xDFEE30, c, sf_ve1]
- [0xE05620, c, fox_tr]
- [0xE05990, c, sf_tr360]
- [0xE06510, .data, fox_i1]
- [0xE06520, .data, fox_co]
- [0xE06880, data, DFEE30]
- [0xE07B90, data, E05990]
- [0xE06880, data, sf_ve1]
- [0xE07B90, data, sf_tr360]
- [0xE07C30, .rodata, fox_co]
- [0xE07FF0, .rodata, DFEE30]
- [0xE08380, .rodata, E05620]
- [0xE083C0, .rodata, E05990]
- [0xE07FF0, .rodata, sf_ve1]
- [0xE08380, .rodata, fox_tr]
- [0xE083C0, .rodata, sf_tr360]
- { start: 0xE08400, type: .bss, vram: 0x8019B6C0, name: fox_i1 }
- { type: .bss, vram: 0x8019B6D0, name: fox_co }
- { type: bss, vram: 0x8019B7F0, name: DFEE30 }
- { type: bss, vram: 0x8019B7F0, name: sf_ve1 }
- name: ovl_i2
type: code
@ -115,20 +115,20 @@
- [0xE6A820, c, fox_ti_cs]
- [0xE6C220, c, fox_ti]
- [0xE7CC10, c, fox_ma]
- [0xE97CC0, c, E97CC0]
- [0xE97CC0, c, sf_i5_4]
- [0xE9A580, .data, fox_i5]
- [0xE9A590, .data, fox_ti_cs]
- [0xE9A650, data, fox_ti]
- [0xE9DC00, data, E97CC0]
- [0xE9DC00, data, sf_i5_4]
- [0xE9DCD0, .rodata, fox_i5]
- [0xE9DCE0, .rodata, fox_ti_cs]
- [0xE9DD40, .rodata, fox_ti]
- [0xE9E5A0, .rodata, fox_ma]
- [0xE9F0E0, .rodata, E97CC0]
- [0xE9F0E0, .rodata, sf_i5_4]
- { start: 0xE9F1D0, type: .bss, vram: 0x801BBEE0, name: fox_i5 }
- { type: bss, vram: 0x801BBEF0, name: fox_ti }
- { type: bss, vram: 0x801BE240, name: fox_ma }
- { type: bss, vram: 0x801BE740, name: E97CC0 }
- { type: bss, vram: 0x801BE740, name: sf_i5_4 }
- name: ovl_i6
type: code
@ -137,25 +137,25 @@
vram: 0x80187520
bss_size: 0x520
exclusive_ram_id: overlay
symbol_name_format: E9F1D0_$VRAM
symbol_name_format: i6_$VRAM
subsegments:
- [0xE9F1D0, c, fox_i6]
- [0xE9F1E0, c, E9F1E0]
- [0xEADEC0, c, EADECO]
- [0xE9F1E0, c, sf_i6_1]
- [0xEADEC0, c, sf_i6_2]
- [0xEAF7E0, c, fox_sy]
- [0xEBD210, c, EBD210]
- [0xEBD210, c, sf_i6_4]
- [0xEBE400, .data, fox_i6]
- [0xEBE410, data, E9F1E0]
- [0xEBE560, data, EADCE0]
- [0xEBE410, data, sf_i6_1]
- [0xEBE560, data, sf_i6_2]
- [0xEBE5C0, data, fox_sy]
- [0xEBE830, data, EBD210]
- [0xEBE830, data, sf_i6_4]
- [0xEBE840, .rodata, fox_i6]
- [0xEBE850, .rodata, E9F1E0]
- [0xEBF0F0, .rodata, EADECO]
- [0xEBE850, .rodata, sf_i6_1]
- [0xEBF0F0, .rodata, sf_i6_2]
- [0xEBF130, .rodata, fox_sy]
- [0xEBFB80, .rodata, EBD210]
- [0xEBFB80, .rodata, sf_i6_4]
- { start: 0xEBFBE0, type: .bss, vram: 0x801A7F30, name: fox_i6 }
- { type: bss, vram: 0x801A7F40, name: E9F1E0 }
- { type: bss, vram: 0x801A7F40, name: sf_i6_1 }
- { type: bss, vram: 0x801A8440, name: fox_sy }
- name: ovl_menu
@ -190,15 +190,16 @@
vram: 0x80187520
bss_size: 0x2710
exclusive_ram_id: overlay
symbol_name_format: EF0260_$VRAM
symbol_name_format: ending_$VRAM
subsegments:
- [0xEF0260, c, EF0260]
- [0xEF5B60, c, EF5B60]
- [0xEFB560, data, EF0260]
- [0xEFBBB0, data, EF5B60]
- [0xEFEF80, .rodata, EF0260]
- [0xEFF380, .rodata, EF5B60]
- { start: 0xEFFA40, type: bss, vram: 0x80196D00, name: ovl_ending }
- [0xEF0260, c, sf_ending_1]
- [0xEF5B60, c, sf_ending_2]
- [0xEFB560, data, sf_ending_1]
- [0xEFBBB0, data, sf_ending_2]
- [0xEFEF80, .rodata, sf_ending_1]
- [0xEFF380, .rodata, sf_ending_2]
- { start: 0xEFFA40, type: bss, vram: 0x80196D00, name: sf_ending_1 }
- { type: bss, vram: 0x80198590, name: sf_ending_2 }
- name: ovl_unused
type: code
@ -207,10 +208,10 @@
vram: 0x80187520
bss_size: 0x10
exclusive_ram_id: overlay
symbol_name_format: EFFA40_$VRAM
symbol_name_format: unused_$VRAM
subsegments:
- [0xEFFA40, c, EFFA40]
- [0xEFFA50, data, EFFA40]
- { start: 0xEFFAE0, type: bss, vram: 0x801875C0, name: ovl_unused }
- [0xEFFA40, c, fox_unused]
- [0xEFFA50, .data, fox_unused]
- { start: 0xEFFAE0, type: .bss, vram: 0x801875C0, name: fox_unused }
- [0xEFFAE0]