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

Making the name changes discussed (#54)

Browse Source 
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names
This commit is contained in:
petrie911
2023-12-20 16:32:50 -03:00
committed by GitHub
parent cd865be215
commit 11197f6c28
33 changed files with 3179 additions and 2866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+40 -35
View File
@@ -6,6 +6,7 @@
#include "fox_option.h"
#include "sf64object.h"
#include "sf64thread.h"
#include "sf64player.h"
s32 Lib_vsPrintf(char* dst, const char* fmt, va_list args);
void Lib_Perspective(Gfx** dList);
@@ -105,7 +106,7 @@ void func_800319AC(Object_2F4*);
void func_80035448(Object_2F4*);
//sf_36930
void Object_70_Initialize(Object_70 *);
void PlayerShot_Initialize(PlayerShot *);
void func_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void func_8003D9B8();
void func_8003DA0C(void);
@@ -162,8 +163,8 @@ void func_80059BBC(Object_80*);
void func_80059BF0(Object_2F4*);
void func_80059C34(Object_4C*);
void func_80059C40(Object_4C*);
void func_80059F68(Object_6C*);
void func_80059FDC(Object_6C*);
void func_80059F68(Item*);
void func_80059FDC(Item*);
void func_8005A094(Object_2F4*);
void func_8005ADAC(Object_2F4*);
void func_8005B1E8(Object_2F4*, s32);
@@ -174,13 +175,13 @@ void func_8005B7CC(Object_2F4*);
void func_8005B848(Object_2F4*);
void func_8005B9A4(Object_2F4*);
void func_8005BA30(Object_2F4*);
void func_8005C5F0(Object_6C*);
void func_8005C900(Object_6C*);
void func_8005C9C0(Object_6C*);
void func_8005CA80(Object_6C*);
void func_8005CB44(Object_6C*);
void func_8005CC9C(Object_6C*);
void func_8005CDA8(Object_6C*);
void func_8005C5F0(Item*);
void func_8005C900(Item*);
void func_8005C9C0(Item*);
void func_8005CA80(Item*);
void func_8005CB44(Item*);
void func_8005CC9C(Item*);
void func_8005CDA8(Item*);
void func_8005F030(Vec3f*);
void func_8005F0E8(Vec3f*, Vec3f*);
void func_8005F1EC(Vec3f*);
@@ -195,12 +196,12 @@ void func_80060968(void);
void func_80060F30(Vec3f* , u32 , s32 );
void Object_Kill(Object*, Vec3f*);
s32 func_80060FE4(Vec3f*, f32);
void Object_Set1C(ObjectStruct_1C*, u32);
void Object_SetInfo(ObjectInfo*, u32);
void Object_80_Initialize(Object_80*);
void Object_4C_Initialize(Object_4C*);
void Object_2F4_Initialize(Object_2F4*);
void Object_408_Initialize(Object_408*);
void Object_6C_Initialize(Object_6C*);
void Item_Initialize(Item*);
void Object_8C_Initialize(Object_8C*);
void func_80061B68(void);
void func_80061CD0(void);
@@ -225,23 +226,23 @@ void func_80066C00(Object_80*);
void func_80066D5C(Object_80*);
void func_80066E8C(Object_4C*);
void func_80066EA8(Object_80*);
void func_80066EF0(Object_6C *);
void func_800671D0(Object_6C *);
void func_80066EF0(Item *);
void func_800671D0(Item *);
void func_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
void func_8006753C(Object_2F4*);
void func_80067874(Object_2F4*);
void func_80067A40(void);
void func_80067B1C(Object_6C*);
void func_80067BEC(Object_6C*);
void func_80067F6C(Object_6C*);
void func_80068020(Object_6C*);
void func_800685D8(Object_6C*);
void func_800685F8(Object_6C*);
void func_80068618(Object_6C*);
void func_80068688(Object_6C*);
void func_80068914(Object_6C*);
void func_80068C48(Object_6C*);
void func_80068C88(Object_6C*);
void func_80067B1C(Item*);
void func_80067BEC(Item*);
void func_80067F6C(Item*);
void func_80068020(Item*);
void func_800685D8(Item*);
void func_800685F8(Item*);
void func_80068618(Item*);
void func_80068688(Item*);
void func_80068914(Item*);
void func_80068C48(Item*);
void func_80068C88(Item*);
void func_80068FE0(Object_4C*);
void func_800690D0(s32, s32);
void func_80069924(Object_8C *);
@@ -249,12 +250,12 @@ void func_800693E8(Object_2F4 *);
void func_80069658(Object_408 *);
void func_800696F8(Object_80 *);
void func_80069858(Object_4C *);
void func_80069A10(Object_6C *);
void func_80069A10(Item *);
void Object_2F4_Update(Object_2F4*);
void Object_408_Update(Object_408 *);
void Object_80_Update(Object_80 *);
void Object_4C_Update(Object_4C *);
void Object_6C_Update(Object_6C *);
void Item_Update(Item *);
void Object_8C_Update(Object_8C *);
void func_8006A06C(UnkEntity30*);
void func_8006A38C(void);
@@ -478,7 +479,7 @@ void func_800A3CA0(void);
// fox_play
s32 Play_CheckMedalStatus(u16);
s32 Play_GetMaxHealth(void);
s32 Play_GetMaxShields(void);
void func_800A5844(void);
void func_800A5D6C(void);
void func_800A5FA0(Vec3f* , u32 , s32 );
@@ -486,10 +487,10 @@ void func_800A6148(void);
void func_800A69F8(s32 , f32 , f32 , f32 );
void func_800A6CD0(Player *, s32, s32);
bool func_800A73E4(f32* , s32* , f32 posX, f32 posY, f32 posZ);
s32 func_800A78C4(f32* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
s32 func_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void func_800A8BA4(Player* player);
void func_800AA800(Player *player);
void func_800ACDC0(Player *, Object_70 *, s32 );
void func_800ACDC0(Player *, PlayerShot *, s32 );
void func_800B0F50(Player *);
void func_800B44C4(Player *);
void func_800B5FBC(Player *, s32 , s32 );
@@ -499,7 +500,7 @@ void func_800B6BFC(Player *, s32 );
void func_800B6F50(f32, f32, f32, f32, f32, f32);
void func_800B7184(Player *, s32);
void func_800B73E0(Player *);
void func_800B852C(s32 , Object_6C *);
void func_800B852C(s32 , Item *);
void func_800B86CC(void);
// fox_radio
@@ -528,6 +529,7 @@ void func_DF4260_8018753C(Object_80*);
void func_DF4260_801878D8(Object_408 *);
void func_DF4260_8018B0B4(Object_2F4 *);
void func_DF4260_8018BE7C(Object_408 *);
void func_DF4260_801924A8(Object_80* );
void func_DF4260_8019250C(Object_2F4 *);
void func_DF4260_80192CB0(Object_2F4 *);
void func_DF4260_80192EA4(Object_2F4 *);
@@ -535,16 +537,17 @@ void func_DF4260_801933B4(Object_2F4 *);
void func_DF4260_801935CC(Object_408 *);
void func_DF4260_80198310(Object_408 *);
void func_DF4260_801988E0(void);
void func_DF4260_8018ED78(Object_408*);
void func_E08400_80187B08(Object_2F4 *);
void func_E08400_80188A40(Object_408 *);
void func_E08400_8018CCF8(Object_2F4 *);
void func_E16C50_801A9824(void);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_E16C50_80191DB0(Object_2F4*);
void func_E16C50_8018ED78(Player*);
void func_E16C50_80187754(Object_408 *);
void func_E16C50_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void func_E16C50_80190430(Object_2F4 *);
void func_E16C50_80190F08(Object_2F4 *);
void func_E16C50_801915A4(Object_2F4 *);
void func_E16C50_80191BB8(Object_2F4 *);
@@ -553,7 +556,10 @@ void func_E16C50_8019B1F0(Object_2F4 *);
void func_E16C50_8019B810(Object_2F4 *);
void func_E16C50_8019C200(Object_2F4 *);
void func_E16C50_8019D060(Object_2F4 *);
void func_E16C50_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void func_E16C50_801A9824(void);
void func_E16C50_801AA20C(void);
void func_E16C50_801AC8A8(f32, f32, f32, f32, s32);
void func_E16C50_801ACBB4(void);
void func_E16C50_801AD688(Object_2F4 *);
void func_E16C50_801AE3AC(Object_2F4 *);
@@ -564,7 +570,6 @@ void func_E16C50_801B6E54(Object_2F4 *);
void func_E16C50_801B7AF0(Object_2F4 *);
void func_E16C50_801BA57C(Object_2F4 *);
void func_E16C50_801BB26C(Object_2F4 *);
void func_E16C50_80190430(Object_2F4 *);
void func_E51970_80193CA4(Object_408 *);
void func_E51970_80198594(Object_408 *);
include/global.h
+1
View File
@@ -20,6 +20,7 @@
#include "sf64object.h"
#include "sf64level.h"
#include "sf64thread.h"
#include "sf64player.h"
#include "gfx.h"
#endif // GLOBAL_H
include/hud.h
+3 -3
View File
@@ -67,10 +67,10 @@ extern s32 D_801617FC;
extern s32 gHitCount;
extern s32 D_80177838;
extern s32 D_80177854;
extern s32 D_80177880;
extern s32 gTeamHealth[];
extern s32 gAllRangeMode;
extern s32 gTeamShields[];
extern s32 D_801778BC;
extern s32 D_801778E8;
extern s32 gVersusMode;
extern s32 D_80177B48;
extern s32 D_80177B50[];
extern s32 D_80177B70[];
include/sf64level.h
+6
View File
@@ -83,4 +83,10 @@ typedef enum {
LEVEL_VERSUS,
} LevelId;
typedef enum {
VSTAGE_CORNERIA,
VSTAGE_KATINA,
VSTAGE_SECTOR_Z,
} VsStage;
#endif
include/sf64object.h
+425 -446
View File
File diff suppressed because it is too large Load Diff
include/sf64player.h
+245
View File
@@ -0,0 +1,245 @@
#ifndef SF64_PLAYER
#define SF64_PLAYER
#include "sf64math.h"
#include "sf64object.h"
typedef enum {
WINGSTATE_NONE,
WINGSTATE_BROKEN,
WINGSTATE_INTACT,
} WingState;
typedef struct {
/* 0x00 */ u8 rightState;
/* 0x01 */ u8 leftState;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28;
/* 0x2C */ u8 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} WingInfo; // size = 0x3C
typedef enum {
PLAYERSHOT_0,
PLAYERSHOT_1,
PLAYERSHOT_2,
PLAYERSHOT_3,
PLAYERSHOT_4,
PLAYERSHOT_5,
PLAYERSHOT_6,
PLAYERSHOT_7,
PLAYERSHOT_8,
PLAYERSHOT_9,
} PlayerShotId;
typedef struct {
/* 0x00 */ Object obj;
/* 0x1C */ s32 index;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ Vec3f sfxPos;
/* 0x44 */ f32 unk_44;
/* 0x44 */ f32 unk_48;
/* 0x44 */ f32 unk_4C;
/* 0x44 */ f32 unk_50;
/* 0x44 */ f32 unk_54;
/* 0x58 */ s32 unk_58;
/* 0x5C */ s32 unk_5C;
/* 0x60 */ s32 unk_60;
/* 0x64 */ s32 unk_64;
/* 0x68 */ s32 unk_68;
/* 0x6C */ char pad6C[4];
} PlayerShot; // size = 0x70
typedef struct Player {
/* 0x000 */ f32 unk_000;
/* 0x004 */ f32 unk_004;
/* 0x008 */ f32 unk_008;
/* 0x00C */ f32 unk_00C;
/* 0x010 */ f32 unk_010;
/* 0x014 */ f32 unk_014;
/* 0x018 */ f32 unk_018;
/* 0x01C */ f32 unk_01C;
/* 0x020 */ char pad20[8];
/* 0x028 */ f32 unk_028;
/* 0x02C */ f32 unk_02C;
/* 0x030 */ char pad30[4];
/* 0x034 */ f32 unk_034;
/* 0x038 */ char pad38[8];
/* 0x040 */ Vec3f unk_040;
/* 0x04C */ Vec3f unk_04C;
/* 0x058 */ f32 unk_058;
/* 0x05C */ f32 unk_05C;
/* 0x05C */ f32 unk_060;
/* 0x064 */ f32 unk_064;
/* 0x068 */ f32 unk_068;
/* 0x06C */ f32 unk_06C;
/* 0x070 */ f32 unk_070;
/* 0x074 */ f32 unk_074;
/* 0x078 */ f32 unk_078;
/* 0x07C */ f32 unk_07C;
/* 0x080 */ f32 unk_080;
/* 0x084 */ f32 unk_084;
/* 0x088 */ f32 unk_088;
/* 0x08C */ Vec3f unk_08C;
/* 0x098 */ f32 unk_098;
/* 0x09C */ f32 unk_09C;
/* 0x0A0 */ f32 unk_0A0;
/* 0x0A4 */ f32 unk_0A4;
/* 0x0A8 */ f32 unk_0A8;
/* 0x0AC */ f32 unk_0AC;
/* 0x0B0 */ f32 unk_0B0;
/* 0x0B4 */ f32 unk_0B4;
/* 0x0B8 */ f32 unk_0B8;
/* 0x0BC */ f32 unk_0BC;
/* 0x0C0 */ Vec3f unk_0C0;
/* 0x0CC */ f32 unk_0CC;
/* 0x0D0 */ f32 unk_0D0;
/* 0x0D4 */ f32 unk_0D4;
/* 0x0D8 */ Vec3f unk_0D8;
/* 0x0E4 */ f32 unk_0E4;
/* 0x0E8 */ f32 unk_0E8;
/* 0x0EC */ f32 unk_0EC;
/* 0x0F0 */ f32 unk_0F0;
/* 0x0F4 */ f32 unk_0F4;
/* 0x0F8 */ f32 unk_0F8;
/* 0x0FC */ f32 unk_0FC;
/* 0x100 */ f32 unk_100;
/* 0x104 */ f32 unk_104;
/* 0x108 */ f32 unk_108;
/* 0x10C */ f32 unk_10C;
/* 0x110 */ f32 unk_110;
/* 0x114 */ f32 unk_114;
/* 0x118 */ f32 unk_118;
/* 0x11C */ f32 unk_11C;
/* 0x120 */ f32 unk_120;
/* 0x124 */ f32 unk_124;
/* 0x128 */ char pad128[4];
/* 0x12C */ f32 unk_12C;
/* 0x130 */ f32 unk_130;
/* 0x134 */ f32 unk_134;
/* 0x138 */ f32 unk_138;
/* 0x13C */ char pad13C[4];
/* 0x140 */ f32 unk_140;
/* 0x144 */ f32 unk_144;
/* 0x148 */ f32 unk_148;
/* 0x14C */ f32 unk_14C;
/* 0x150 */ f32 unk_150;
/* 0x154 */ f32 unk_154;
/* 0x158 */ f32 unk_158;
/* 0x15C */ f32 unk_15C;
/* 0x160 */ char pad160[4];
/* 0x164 */ f32 unk_164;
/* 0x168 */ f32 unk_168;
/* 0x16C */ f32 unk_16C;
/* 0x170 */ f32 unk_170;
/* 0x174 */ f32 unk_174;
/* 0x178 */ f32 unk_178;
/* 0x17C */ f32 unk_17C;
/* 0x180 */ f32 unk_180;
/* 0x184 */ f32 unk_184;
/* 0x188 */ f32 unk_188;
/* 0x18C */ f32 unk_18C;
/* 0x190 */ f32 unk_190;
/* 0x194 */ f32 unk_194;
/* 0x198 */ s32 unk_198;
/* 0x19C */ s32 unk_19C;
/* 0x1A0 */ s32 unk_1A0;
/* 0x1A4 */ s32 unk_1A4;
/* 0x1A8 */ char pad1A8[0x1C];
/* 0x1C4 */ s32 unk_1C4;
/* 0x1C8 */ s32 unk_1C8;
/* 0x1CC */ s32 unk_1CC;
/* 0x1D0 */ s32 unk_1D0;
/* 0x1D4 */ s32 unk_1D4;
/* 0x1D8 */ char pad1D8[4];
/* 0x1DC */ s32 unk_1DC;
/* 0x1E0 */ s32 unk_1E0;
/* 0x1E4 */ s32 unk_1E4;
/* 0x1E8 */ s32 unk_1E8;
/* 0x1EC */ s32 unk_1EC;
/* 0x1F0 */ s32 unk_1F0;
/* 0x1F4 */ s32 unk_1F4;
/* 0x1F8 */ s32 unk_1F8;
/* 0x1FC */ s32 unk_1FC;
/* 0x200 */ s32 unk_200;
/* 0x204 */ s32 unk_204;
/* 0x208 */ char pad208[4];
/* 0x20C */ s32 unk_20C;
/* 0x210 */ s32 unk_210;
/* 0x214 */ s32 unk_214;
/* 0x218 */ s32 unk_218;
/* 0x21C */ s32 unk_21C;
/* 0x220 */ s32 unk_220;
/* 0x224 */ s32 unk_224;
/* 0x228 */ s32 unk_228;
/* 0x22C */ s32 unk_22C;
/* 0x230 */ char pad230[4];
/* 0x234 */ s32 unk_234;
/* 0x238 */ s32 unk_238;
/* 0x23C */ s32 unk_23C;
/* 0x240 */ s32 unk_240;
/* 0x244 */ s32 unk_244;
/* 0x248 */ f32 unk_248;
/* 0x24C */ f32 unk_24C;
/* 0x250 */ f32 unk_250;
/* 0x250 */ char pad254[4];
/* 0x258 */ f32 unk_258;
/* 0x25C */ f32 unk_25C;
/* 0x260 */ char pad260[4];
/* 0x264 */ s32 shields;
/* 0x268 */ s32 damage;
/* 0x26C */ s32 heal;
/* 0x270 */ s32 unk_270;
/* 0x274 */ char pad274[4];
/* 0x278 */ s32 unk_278;
/* 0x27C */ s32 unk_27C;
/* 0x280 */ s32 unk_280;
/* 0x284 */ s32 unk_284;
/* 0x288 */ s32 unk_288;
/* 0x28C */ char pad28C[0x28];
/* 0x2B4 */ s32 unk_2B4;
/* 0x2B8 */ s32 unk_2B8;
/* 0x2BC */ f32 unk_2BC;
/* 0x2C0 */ f32 unk_2C0;
/* 0x2C4 */ s32 unk_2C4;
/* 0x2C8 */ Vec3f unk_2C8;
/* 0x2D4 */ Vec3f unk_2D4;
/* 0x2E0 */ Vec3f unk_2E0;
/* 0x2EC */ Vec3f unk_2EC;
/* 0x2F8 */ Vec3f jointTable[30];
/* 0x460 */ union {
Vec3f unk_460;
Vec3f unk_460_arr[1]; // probably fake
};
/* 0x460 */ Vec3f unk_46C;
/* 0x478 */ u8 unk_478;
/* 0x479 */ s8 unk_479;
/* 0x47C */ Vec3f *unk_47C;
/* 0x480 */ Vec3f *unk_480;
/* 0x484 */ s8 unk_484;
/* 0x485 */ s8 unk_485;
/* 0x488 */ f32 unk_488;
/* 0x48C */ u8 unk_48C;
/* 0x490 */ f32 unk_490;
/* 0x494 */ u8 unk_494;
/* 0x498 */ s32 unk_498;
/* 0x49C */ WingInfo wings;
/* 0x4D8 */ f32 unk_4D8;
/* 0x4DC */ s32 unk_4DC;
} Player; // size = 0x4E0
#endif
include/structs.h
+1 -198
View File
@@ -92,7 +92,7 @@ typedef struct {
/* 0x0 */ u16 unk_0;
/* 0x2 */ s8 unk_2;
/* 0x3 */ s8 unk_3;
} UnkStruct_gChngInputPtr; // size = 0x4
} UnkStruct_gInputPress; // size = 0x4
typedef struct {
/* 0x00 */ u8 unk_00;
@@ -118,203 +118,6 @@ typedef struct {
/* 0x2F */ u8 unk_2F;
} UnkEntity30; // size = 0x30
typedef struct {
/* 0x00 */ u8 rightState;
/* 0x01 */ u8 leftState;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ f32 unk_10;
/* 0x14 */ f32 unk_14;
/* 0x18 */ f32 unk_18;
/* 0x1C */ f32 unk_1C;
/* 0x20 */ f32 unk_20;
/* 0x24 */ f32 unk_24;
/* 0x28 */ f32 unk_28;
/* 0x2C */ u8 unk_2C;
/* 0x30 */ f32 unk_30;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
} WingInfo; // size = 0x3C
typedef struct Player {
/* 0x000 */ f32 unk_000;
/* 0x004 */ f32 unk_004;
/* 0x008 */ f32 unk_008;
/* 0x00C */ f32 unk_00C;
/* 0x010 */ f32 unk_010;
/* 0x014 */ f32 unk_014;
/* 0x018 */ f32 unk_018;
/* 0x01C */ f32 unk_01C;
/* 0x020 */ char pad20[8];
/* 0x028 */ f32 unk_028;
/* 0x02C */ f32 unk_02C;
/* 0x030 */ char pad30[4];
/* 0x034 */ f32 unk_034;
/* 0x038 */ char pad38[8];
/* 0x040 */ Vec3f unk_040;
/* 0x04C */ Vec3f unk_04C;
/* 0x058 */ f32 unk_058;
/* 0x05C */ f32 unk_05C;
/* 0x05C */ f32 unk_060;
/* 0x064 */ f32 unk_064;
/* 0x068 */ f32 unk_068;
/* 0x06C */ f32 unk_06C;
/* 0x070 */ f32 unk_070;
/* 0x074 */ f32 unk_074;
/* 0x078 */ f32 unk_078;
/* 0x07C */ f32 unk_07C;
/* 0x080 */ f32 unk_080;
/* 0x084 */ f32 unk_084;
/* 0x088 */ f32 unk_088;
/* 0x08C */ Vec3f unk_08C;
/* 0x098 */ f32 unk_098;
/* 0x09C */ f32 unk_09C;
/* 0x0A0 */ f32 unk_0A0;
/* 0x0A4 */ f32 unk_0A4;
/* 0x0A8 */ f32 unk_0A8;
/* 0x0AC */ f32 unk_0AC;
/* 0x0B0 */ f32 unk_0B0;
/* 0x0B4 */ f32 unk_0B4;
/* 0x0B8 */ f32 unk_0B8;
/* 0x0BC */ f32 unk_0BC;
/* 0x0C0 */ Vec3f unk_0C0;
/* 0x0CC */ f32 unk_0CC;
/* 0x0D0 */ f32 unk_0D0;
/* 0x0D4 */ f32 unk_0D4;
/* 0x0D8 */ Vec3f unk_0D8;
/* 0x0E4 */ f32 unk_0E4;
/* 0x0E8 */ f32 unk_0E8;
/* 0x0EC */ f32 unk_0EC;
/* 0x0F0 */ f32 unk_0F0;
/* 0x0F4 */ f32 unk_0F4;
/* 0x0F8 */ f32 unk_0F8;
/* 0x0FC */ f32 unk_0FC;
/* 0x100 */ f32 unk_100;
/* 0x104 */ f32 unk_104;
/* 0x108 */ f32 unk_108;
/* 0x10C */ f32 unk_10C;
/* 0x110 */ f32 unk_110;
/* 0x114 */ f32 unk_114;
/* 0x118 */ f32 unk_118;
/* 0x11C */ f32 unk_11C;
/* 0x120 */ f32 unk_120;
/* 0x124 */ f32 unk_124;
/* 0x128 */ char pad128[4];
/* 0x12C */ f32 unk_12C;
/* 0x130 */ f32 unk_130;
/* 0x134 */ f32 unk_134;
/* 0x138 */ f32 unk_138;
/* 0x13C */ char pad13C[4];
/* 0x140 */ f32 unk_140;
/* 0x144 */ f32 unk_144;
/* 0x148 */ f32 unk_148;
/* 0x14C */ f32 unk_14C;
/* 0x150 */ f32 unk_150;
/* 0x154 */ f32 unk_154;
/* 0x158 */ f32 unk_158;
/* 0x15C */ f32 unk_15C;
/* 0x160 */ char pad160[4];
/* 0x164 */ f32 unk_164;
/* 0x168 */ f32 unk_168;
/* 0x16C */ f32 unk_16C;
/* 0x170 */ f32 unk_170;
/* 0x174 */ f32 unk_174;
/* 0x178 */ f32 unk_178;
/* 0x17C */ f32 unk_17C;
/* 0x180 */ f32 unk_180;
/* 0x184 */ f32 unk_184;
/* 0x188 */ f32 unk_188;
/* 0x18C */ f32 unk_18C;
/* 0x190 */ f32 unk_190;
/* 0x194 */ f32 unk_194;
/* 0x198 */ s32 unk_198;
/* 0x19C */ s32 unk_19C;
/* 0x1A0 */ s32 unk_1A0;
/* 0x1A4 */ s32 unk_1A4;
/* 0x1A8 */ char pad1A8[0x1C];
/* 0x1C4 */ s32 unk_1C4;
/* 0x1C8 */ s32 unk_1C8;
/* 0x1CC */ s32 unk_1CC;
/* 0x1D0 */ s32 unk_1D0;
/* 0x1D4 */ s32 unk_1D4;
/* 0x1D8 */ char pad1D8[4];
/* 0x1DC */ s32 unk_1DC;
/* 0x1E0 */ s32 unk_1E0;
/* 0x1E4 */ s32 unk_1E4;
/* 0x1E8 */ s32 unk_1E8;
/* 0x1EC */ s32 unk_1EC;
/* 0x1F0 */ s32 unk_1F0;
/* 0x1F4 */ s32 unk_1F4;
/* 0x1F8 */ s32 unk_1F8;
/* 0x1FC */ s32 unk_1FC;
/* 0x200 */ s32 unk_200;
/* 0x204 */ s32 unk_204;
/* 0x208 */ char pad208[4];
/* 0x20C */ s32 unk_20C;
/* 0x210 */ s32 unk_210;
/* 0x214 */ s32 unk_214;
/* 0x218 */ s32 unk_218;
/* 0x21C */ s32 unk_21C;
/* 0x220 */ s32 unk_220;
/* 0x224 */ s32 unk_224;
/* 0x228 */ s32 unk_228;
/* 0x22C */ s32 unk_22C;
/* 0x230 */ char pad230[4];
/* 0x234 */ s32 unk_234;
/* 0x238 */ s32 unk_238;
/* 0x23C */ s32 unk_23C;
/* 0x240 */ s32 unk_240;
/* 0x244 */ s32 unk_244;
/* 0x248 */ f32 unk_248;
/* 0x24C */ f32 unk_24C;
/* 0x250 */ f32 unk_250;
/* 0x250 */ char pad254[4];
/* 0x258 */ f32 unk_258;
/* 0x25C */ f32 unk_25C;
/* 0x260 */ char pad260[4];
/* 0x264 */ s32 health;
/* 0x268 */ s32 damage;
/* 0x26C */ s32 heal;
/* 0x270 */ s32 unk_270;
/* 0x274 */ char pad274[4];
/* 0x278 */ s32 unk_278;
/* 0x27C */ s32 unk_27C;
/* 0x280 */ s32 unk_280;
/* 0x284 */ s32 unk_284;
/* 0x288 */ s32 unk_288;
/* 0x28C */ char pad28C[0x28];
/* 0x2B4 */ s32 unk_2B4;
/* 0x2B8 */ s32 unk_2B8;
/* 0x2BC */ f32 unk_2BC;
/* 0x2C0 */ f32 unk_2C0;
/* 0x2C4 */ s32 unk_2C4;
/* 0x2C8 */ Vec3f unk_2C8;
/* 0x2D4 */ Vec3f unk_2D4;
/* 0x2E0 */ Vec3f unk_2E0;
/* 0x2EC */ Vec3f unk_2EC;
/* 0x2F8 */ Vec3f jointTable[30];
/* 0x460 */ union {
Vec3f unk_460;
Vec3f unk_460_arr[1]; // probably fake
};
/* 0x460 */ Vec3f unk_46C;
/* 0x478 */ u8 unk_478;
/* 0x479 */ s8 unk_479;
/* 0x47C */ Vec3f *unk_47C;
/* 0x480 */ Vec3f *unk_480;
/* 0x484 */ s8 unk_484;
/* 0x485 */ s8 unk_485;
/* 0x488 */ f32 unk_488;
/* 0x48C */ u8 unk_48C;
/* 0x490 */ f32 unk_490;
/* 0x494 */ u8 unk_494;
/* 0x498 */ s32 unk_498;
/* 0x49C */ WingInfo wings;
/* 0x4D8 */ f32 unk_4D8;
/* 0x4DC */ s32 unk_4DC;
} Player; // size = 0x4E0
typedef struct {
/* 0x00 */ u8 hits;
/* 0x04 */ Vec3f pos;
include/variables.h
+21 -20
View File
@@ -8,6 +8,7 @@
#include "sf64level.h"
#include "sf64thread.h"
#include "sf64object.h"
#include "sf64player.h"
extern u64 __rspboot_start[];
extern u64 __rspboot_end[];
@@ -29,15 +30,15 @@ extern OSMesgQueue* D_800C7C5C;
extern OSMesgQueue* D_800C7C60;
extern OSMesgQueue* D_800C7C64;
extern OSContPad gCurrentInput[4];
extern OSContPad gChangedInput[4];
extern u8 gControllerStatus[4];
extern u32 gStopInputTimer;
extern u8 gRumbleStatus[4];
extern OSContPad sNextInput[4]; //
extern OSContPad sPrevInput[4]; //
extern OSContStatus D_800DD8F0[4]; //
extern OSPfs D_800DD900[4]; //
extern OSContPad gControllerHold[4];
extern OSContPad gControllerPress[4];
extern u8 gControllerPlugged[4];
extern u32 gControllerLock;
extern u8 gControllerRumble[4];
extern OSContPad sNextController[4]; //
extern OSContPad sPrevController[4]; //
extern OSContStatus sControllerStatus[4]; //
extern OSPfs sControllerMotor[4]; //
extern u8 gAudioThreadStack[0x1000]; // 800DDAA0
extern OSThread gGraphicsThread; // 800DEAA0
@@ -156,7 +157,7 @@ extern f32 D_800CC054[];
extern f32 D_800CC070[];
extern f32 D_800CC0D4[];
extern f32 D_800CC0F0[];
extern ObjectStruct_1C D_800CC124[];
extern ObjectInfo D_800CC124[];
extern f32 D_800CF9B0[];
extern Gfx* D_800CFA54[];
extern Gfx* D_800CFAC4[];
@@ -371,8 +372,8 @@ extern Object_4C gObjects4C[40];
extern Object_2F4 gObjects2F4[60];
extern Object_408 gObjects408[4];
extern Object_8C gObjects8C[100];
extern Object_6C gObjects6C[20];
extern Object_70 gObjects70[16];
extern Item gItems[20];
extern PlayerShot gPlayerShots[16];
extern UnkEntity30 gUnkEntities30[100];
extern UnkEntity28 gUnkEntities28[65];
extern UnkEntity1C gUnkEntities1C[10];
@@ -404,20 +405,20 @@ extern s32 D_80177858[4];
extern s32 D_80177868;
//
extern s32 D_80177870[4];
extern s32 D_80177880;
extern s32 gAllRangeMode;
//
extern s32 D_80177888[4];
extern s32 D_80177898;
extern s32 D_8017789C;
extern s32 gVersusStage;
extern s32 D_801778A0;
extern s32 D_801778A4;
extern s32 gCamCount;
extern s32 D_801778AC;
extern s32 gTeamHealth[6];
extern s32 gTeamShields[6];
extern s32 D_801778C8;
//
extern s32 gSavedTeamHealth[6];
extern s32 D_801778E8;
extern s32 gSavedTeamShields[6];
extern bool gVersusMode;
//
extern UNK_TYPE D_801778F0[6];
extern u16 D_80177908[4];
@@ -435,9 +436,9 @@ extern f32 D_80177958[4];
extern f32 D_80177968;
extern s32 D_8017796C;
extern f32 D_80177970;
extern OSContPad *gCurInputPtr;
extern OSContPad *gInputHold;
extern f32 D_80177978;
extern OSContPad* gChngInputPtr;
extern OSContPad* gInputPress;
extern f32 D_80177980;
extern u8 *D_80177984;
extern f32 D_80177988;
@@ -465,7 +466,7 @@ extern s32 D_80177A70[4];
extern s32 D_80177A80;
//
extern s32 D_80177A88[4];
extern s8 D_80177A98;
extern u8 D_80177A98;
//
extern f32 D_80177AA0[4];
extern u8 D_80177AB0;
linker_scripts/us/symbol_addrs.txt
+1 -1
View File
@@ -45,7 +45,7 @@ gSetupDLs = 0x800D31B0; // size:0x18C0
D_800CFCA0 = 0x800CFCA0;
D_800DD900 = 0x800DD900; // size:0x1A0
sControllerMotor = 0x800DD900; // size:0x1A0
D_800CBDD4 = 0x800CBDD4; //size:0x98
linker_scripts/us/symbol_addrs_engine.txt
+16 -16
View File
@@ -47,7 +47,7 @@ func_800A1540 = 0x800A1540;
func_800A1558 = 0x800A1558;
// sf_36930
Object_70_Initialize = 0x80035E48;
PlayerShot_Initialize = 0x80035E48;
// fox_rcp
RCP_SetupDL = 0x800B8DD0;
@@ -194,7 +194,7 @@ Object_2F4_Draw1 = 0x8005DBC0;
Object_408_Draw = 0x8005E1B8;
Object_8C_Draw1 = 0x8005E454;
Object_8C_Draw2 = 0x8005E538;
Object_6C_Draw = 0x8005E7B8;
Item_Draw = 0x8005E7B8;
func_8005EA24 = 0x8005EA24;
func_8005ECD8 = 0x8005ECD8;
func_8005F030 = 0x8005F030;
@@ -216,18 +216,18 @@ func_80060F30 = 0x80060F30;
Object_Kill = 0x80060FBC;
func_80060FE4 = 0x80060FE4;
func_80061148 = 0x80061148;
Object_Set1C = 0x800612B8;
Object_SetInfo = 0x800612B8;
Object_80_Initialize = 0x80061364;
Object_4C_Initialize = 0x80061394;
Object_2F4_Initialize = 0x800613C4;
Object_408_Initialize = 0x80061404;
Object_6C_Initialize = 0x80061444;
Item_Initialize = 0x80061444;
Object_8C_Initialize = 0x80061474;
Object_80_Spawn = 0x800614B4;
Object_4C_Spawn = 0x800615A0;
Object_2F4_Spawn = 0x8006168C;
Object_408_Spawn = 0x80061778;
Object_6C_Spawn = 0x80061864;
Item_Spawn = 0x80061864;
func_80061958 = 0x80061958;
func_80061A4C = 0x80061A4C;
func_80061B68 = 0x80061B68;
@@ -301,7 +301,7 @@ Object_2F4_Update = 0x80069AAC;
Object_408_Update = 0x80069CBC;
Object_80_Update = 0x80069DF4;
Object_4C_Update = 0x80069E88;
Object_6C_Update = 0x80069F30;
Item_Update = 0x80069F30;
Object_8C_Update = 0x80069FD4;
func_8006A06C = 0x8006A06C;
func_8006A38C = 0x8006A38C;
@@ -374,8 +374,8 @@ gObjects4C = 0x80163400; //size:0xBE0
gObjects2F4 = 0x80163FE0; //size:0xB130
gObjects408 = 0x8016F110; //size:0x1020
gObjects8C = 0x80170130; //size:0x36B0
gObjects6C = 0x801737E0; //size:0x870
gObjects70 = 0x80174050; //size:0x700
gItems = 0x801737E0; //size:0x870
gPlayerShots = 0x80174050; //size:0x700
gUnkEntities30 = 0x80174750; //size:0x12C0
gUnkEntities28 = 0x80175A10; //size:0xA28
gUnkEntities1C = 0x80176438; //size:0x18
@@ -403,19 +403,19 @@ D_80177854 = 0x80177854;
D_80177858 = 0x80177858;
D_80177868 = 0x80177868;
D_80177870 = 0x80177870;
D_80177880 = 0x80177880;
gAllRangeMode = 0x80177880;
D_80177888 = 0x80177888;
D_80177898 = 0x80177898;
D_8017789C = 0x8017789C;
gVersusStage = 0x8017789C;
D_801778A0 = 0x801778A0;
D_801778A4 = 0x801778A4;
gCamCount = 0x801778A8;
D_801778AB = 0x801778AB;
D_801778AC = 0x801778AC;
gTeamHealth = 0x801778B0; //size:0x18
gTeamShields = 0x801778B0; //size:0x18
D_801778C8 = 0x801778C8;
gSavedTeamHealth = 0x801778D0; //size:0x18
D_801778E8 = 0x801778E8;
gSavedTeamShields = 0x801778D0; //size:0x18
gVersusMode = 0x801778E8;
D_80177908 = 0x80177908;
D_80177910 = 0x80177910;
D_80177928 = 0x80177928;
@@ -425,9 +425,9 @@ D_80177940 = 0x80177940;
D_80177948 = 0x80177948;
D_80177950 = 0x80177950;
D_80177958 = 0x80177958;
gCurInputPtr = 0x80177974;
gInputHold = 0x80177974;
D_80177978 = 0x80177978;
gChngInputPtr = 0x8017797C;
gInputPress = 0x8017797C;
D_80177980 = 0x80177980;
D_80177988 = 0x80177988;
D_80177990 = 0x80177990;
@@ -606,5 +606,5 @@ D_80178570 = 0x80178570;
D_80178574 = 0x80178574;
D_80178578 = 0x80178578;
Play_GetMaxHealth = 0x800A3FC4;
Play_GetMaxShields = 0x800A3FC4;
Play_CheckMedalStatus = 0x800A3F50;
linker_scripts/us/symbol_addrs_nlib_vars.txt
+8 -8
View File
@@ -5,15 +5,15 @@ __f3dex_start = 0x80001410;
gF3dexData = 0x800C3DD0;
// sys_joybus
gCurrentInput = 0x800DD880; // size:0x18
gChangedInput = 0x800DD898; // size:0x18
gControllerStatus = 0x800DD8B0; // size:0x4
gStopInputTimer = 0x800DD8B4; // size:0x4
gRumbleStatus = 0x800DD8B8; // size:0x4
gControllerHold = 0x800DD880; // size:0x18
gControllerPress = 0x800DD898; // size:0x18
gControllerPlugged = 0x800DD8B0; // size:0x4
gControllerLock = 0x800DD8B4; // size:0x4
gControllerRumble = 0x800DD8B8; // size:0x4
D_800DD8BC = 0x800DD8BC; // ignore:true
sNextInput = 0x800DD8C0; // size:0x18
sPrevInput = 0x800DD8D8; // size:0x18
D_800DD8F0 = 0x800DD8F0; // size:0x10
sNextController = 0x800DD8C0; // size:0x18
sPrevController = 0x800DD8D8; // size:0x18
sControllerStatus = 0x800DD8F0; // size:0x10
// main
gAudioThreadStack = 0x800DDAA0;
src/assets/ast_DE5D50.c
+1 -1
View File
@@ -100,7 +100,7 @@ typedef enum {
PIP,
} CharCode;
u8 gTextCharTextures[][104] = {
u8 gTextCharTextures[][13 * 16 / 2] = {
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
src/main/fox_43AC0.c
+6 -6
View File
@@ -26,9 +26,9 @@ void func_80042EC0(Object_408* obj408) {
}
if (var_a3 != 0) {
var_fv0 = 0.0f;
if (obj408->obj.id == OBJECT_292) {
if (obj408->obj.id == OBJ_408_292) {
var_fv0 = 300.0f;
} else if (obj408->obj.id == OBJECT_306) {
} else if (obj408->obj.id == OBJ_408_306) {
var_fv0 = 200.0f;
}
func_80077240(obj408->obj.pos.x, obj408->obj.pos.y + var_fv0, obj408->obj.pos.z, var_a3);
@@ -59,7 +59,7 @@ void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f
f32 arg9, f32 argA, s32 argB, s32 argC) {
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = OBJECT_189;
obj2F4->obj.id = OBJ_2F4_189;
obj2F4->unk_0B8 = argB;
obj2F4->obj.pos.x = arg1;
obj2F4->obj.pos.y = arg2;
@@ -73,8 +73,8 @@ void func_80042FF4(Object_2F4* obj2F4, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f
obj2F4->unk_110 = argA;
obj2F4->unk_0BC = argC;
obj2F4->unk_0BE = 20;
Object_Set1C(&obj2F4->unk_01C, obj2F4->obj.id);
if (gLevelType == 0) {
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
if (gLevelType == LEVELTYPE_GROUND) {
obj2F4->unk_10C = 0.5f;
}
}
@@ -92,7 +92,7 @@ void func_800430DC(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f
}
void func_80043188(Object_2F4* obj2F4) {
obj2F4->unk_01C.unk_10 = 30000.0f;
obj2F4->info.unk_10 = 30000.0f;
}
void func_8004319C(Player* player, f32 arg1, f32 arg2, f32 arg3) {
src/main/fox_6B3B0.c
+202 -199
View File
File diff suppressed because it is too large Load Diff
src/main/fox_A48A0.c
+3 -3
View File
@@ -5,8 +5,8 @@ void func_800A3CA0(void) {
Matrix_LookAt(gGfxMatrix, D_80177978, D_80177980, D_80177988, D_801779A0, D_801779B8, D_801779C0, 0.0f, 1.0f, 0.0f,
1);
Matrix_Translate(gGfxMatrix, 0.0f, 0.0f, -200.0f, 1);
Matrix_RotateY(gGfxMatrix, gChangedInput[D_801778A0].stick_x * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, gChangedInput[D_801778A0].stick_y * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, gControllerPress[D_801778A0].stick_x * M_DTOR, 1);
Matrix_RotateX(gGfxMatrix, gControllerPress[D_801778A0].stick_y * M_DTOR, 1);
Matrix_SetGfxMtx(&gMasterDisp);
RCP_SetupDL_23();
Matrix_Pop(&gGfxMatrix);
@@ -30,7 +30,7 @@ void func_800A3E00(void) {
D_801779C0 = -10.0f;
break;
case 2:
if ((gChangedInput[0].button & START_BUTTON) || (gChangedInput[1].button & START_BUTTON)) {
if ((gControllerPress[0].button & START_BUTTON) || (gControllerPress[1].button & START_BUTTON)) {
func_8001D638(0);
D_80177868 = 3;
D_80177898 = 0;
src/main/fox_display.c
+43 -41
View File
@@ -272,7 +272,7 @@ void func_80052884(Player* player) {
Vec3f sp40 = { 0.0f, 40.0f, -70.0f };
Matrix_Push(&gGfxMatrix);
if (D_801778E8 == 0) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_3000090);
} else {
gSPDisplayList(gMasterDisp++, D_300FB80);
@@ -294,7 +294,7 @@ void func_80052884(Player* player) {
Matrix_MultVec3f(gGfxMatrix, &sp58, &D_801613E0[1]);
}
Matrix_SetGfxMtx(&gMasterDisp);
if (D_801778E8 == 0) {
if (!gVersusMode) {
if (player->unk_1A0 != 0) {
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 64, 255, 64, 255);
@@ -323,7 +323,7 @@ void func_80052B80(Player* player) {
Matrix_Scale(gGfxMatrix, D_800CA248[player->unk_1A0 - 1], D_800CA248[player->unk_1A0 - 1],
D_800CA248[player->unk_1A0 - 1], 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (D_801778E8 != 0) {
if (gVersusMode) {
RCP_SetupDL_40();
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
gSPDisplayList(gMasterDisp++, D_301FD20);
@@ -344,7 +344,7 @@ void func_80052D48(Player* player) {
Matrix_Push(&gGfxMatrix);
Matrix_Copy(gGfxMatrix, &D_80161418[player->unk_1C4]);
if (D_801778E8 != 0) {
if (gVersusMode) {
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
} else {
@@ -354,7 +354,7 @@ void func_80052D48(Player* player) {
}
sp2C = player->unk_16C;
if (sp2C > 0.2f) {
if (D_801778E8 == 0) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gFrameCount & 1) {
@@ -362,13 +362,13 @@ void func_80052D48(Player* player) {
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 20.0f, 30.0f, -10.0f, 1);
if (D_801778E8 == 0) {
if (!gVersusMode) {
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
}
Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (D_801778E8 == 0) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_301B6E0);
@@ -377,7 +377,7 @@ void func_80052D48(Player* player) {
}
sp2C = player->unk_170;
if (sp2C > 0.2f) {
if (D_801778E8 == 0) {
if (!gVersusMode) {
sp2C *= 1.1f;
}
if (gFrameCount & 1) {
@@ -385,13 +385,13 @@ void func_80052D48(Player* player) {
}
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -20.0f, 30.0f, -10.0f, 1);
if (D_801778E8 == 0) {
if (!gVersusMode) {
Matrix_RotateY(gGfxMatrix, -gPlayer[D_801778A0].unk_058, 1);
}
Matrix_Scale(gGfxMatrix, sp2C, sp2C, sp2C, 1);
Matrix_Translate(gGfxMatrix, 0.0f, -30.0f, 0.0f, 1);
Matrix_SetGfxMtx(&gMasterDisp);
if (D_801778E8 == 0) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_30066B0);
} else {
gSPDisplayList(gMasterDisp++, D_301B6E0);
@@ -417,10 +417,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi
}
switch (limbIndex) {
case 13:
if (wings->rightState == 0) {
if (wings->rightState == WINGSTATE_NONE) {
*gfxPtr = NULL;
}
if (wings->rightState == 1) {
if (wings->rightState == WINGSTATE_BROKEN) {
*gfxPtr = D_3015120;
}
if ((D_800CA22C != 0) && (D_80177D40[0] & 1)) {
@@ -449,10 +449,10 @@ bool func_800531A4(s32 limbIndex, Gfx** gfxPtr, Vec3f* pos, Vec3f* rot, void* wi
}
break;
case 12:
if (wings->rightState == 0) {
if (wings->rightState == WINGSTATE_NONE) { // should be leftState?
*gfxPtr = NULL;
}
if (wings->leftState == 1) {
if (wings->leftState == WINGSTATE_BROKEN) {
*gfxPtr = D_3014BF0;
}
if ((D_800CA22C != 0) && (D_80177D58[0] & 1)) {
@@ -607,7 +607,7 @@ void func_80053C38(Player* player, s32 arg1) {
sp4C.z = 2400.0f + sp48;
Matrix_MultVec3f(gGfxMatrix, &sp4C, &D_801613E0[1]);
}
if ((player->unk_238 != 0) && (D_80177880 == 0) &&
if ((player->unk_238 != 0) && (gAllRangeMode == 0) &&
(fabsf((player->unk_138 + D_80177D20) - player->unk_040.z) < 10.0f)) {
if (arg1 == 0) {
D_800CA228 = 1;
@@ -619,18 +619,20 @@ void func_80053C38(Player* player, s32 arg1) {
Matrix_Pop(&gGfxMatrix);
}
} else {
if (D_801778E8 != 0) {
if ((player->wings.rightState == 2) && (player->wings.leftState == 2)) {
if (gVersusMode) {
if ((player->wings.rightState == WINGSTATE_INTACT) && (player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_300EE80);
} else if ((player->wings.rightState <= 1) && (player->wings.leftState == 2)) {
} else if ((player->wings.rightState <= WINGSTATE_BROKEN) &&
(player->wings.leftState == WINGSTATE_INTACT)) {
gSPDisplayList(gMasterDisp++, D_3010A90);
} else if ((player->wings.rightState == 2) && (player->wings.leftState <= 1)) {
} else if ((player->wings.rightState == WINGSTATE_INTACT) &&
(player->wings.leftState <= WINGSTATE_BROKEN)) {
gSPDisplayList(gMasterDisp++, D_3011470);
} else {
gSPDisplayList(gMasterDisp++, D_300D550);
}
} else {
if ((gLevelType == 1) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gLevelType == LEVELTYPE_SPACE) || (gCurrentLevel == LEVEL_BOLSE)) {
player->wings.unk_28 = player->wings.unk_04 = player->wings.unk_08 = player->wings.unk_0C =
player->wings.unk_10 = 0.0f;
}
@@ -722,7 +724,7 @@ void func_80054300(Player* player) {
if (gCurrentLevel == LEVEL_MACBETH) {
RCP_SetupDL(&gMasterDisp, 0x41);
}
if (D_801778E8 == 0) {
if (!gVersusMode) {
gSPDisplayList(gMasterDisp++, D_3008100);
} else {
gSPDisplayList(gMasterDisp++, D_301E570);
@@ -865,7 +867,7 @@ void func_80054E80(Player* player) {
if (D_801779C8[player->unk_1C4] > 10) {
RCP_SetupDL(&gMasterDisp, 0x43);
Matrix_Copy(gCalcMatrix, &D_80161418[player->unk_1C4]);
if ((player->unk_238 != 0) && (D_80177880 == 0)) {
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
@@ -875,14 +877,14 @@ void func_80054E80(Player* player) {
Matrix_Translate(gGfxMatrix, sp94.x, sp94.y, sp94.z, 0);
Matrix_Scale(gGfxMatrix, sp80, sp80, 1.0f, 1);
Matrix_Push(&gGfxMatrix);
if ((player->unk_238 != 0) && (D_80177880 == 0)) {
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, 1);
} else {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
}
RCP_SetupDL(&gMasterDisp, 0x31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (D_801778E8 != 0) {
if (gVersusMode) {
switch (player->unk_1C4) {
case 0:
gDPSetEnvColor(gMasterDisp++, 255, 255, 32, 128);
@@ -907,7 +909,7 @@ void func_80054E80(Player* player) {
Matrix_SetGfxMtx(&gMasterDisp);
gSPDisplayList(gMasterDisp++, D_101C2E0);
Matrix_Pop(&gGfxMatrix);
if ((player->unk_238 != 0) && (D_80177880 == 0)) {
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
Matrix_Scale(gGfxMatrix, 0.3f, 0.3f, 0.3f, 1);
}
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 1.0f, 1);
@@ -932,7 +934,7 @@ void func_80054E80(Player* player) {
case 0:
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 192, 255, 192, 128);
gDPSetEnvColor(gMasterDisp++, 64, 255, 64, 128);
if ((player->unk_238 != 0) && (D_80177880 == 0)) {
if ((player->unk_238 != 0) && (gAllRangeMode == 0)) {
Matrix_MultVec3f(gCalcMatrix, &spB8, &sp94);
} else {
Matrix_MultVec3f(gCalcMatrix, &spC4, &sp94);
@@ -987,7 +989,7 @@ void func_80055788(Player* player) {
Matrix_Scale(gGfxMatrix, 10.0f, 10.0f, 10.0f, 1);
RCP_SetupDL(&gMasterDisp, 0x31);
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 128);
if (D_801778E8 != 0) {
if (gVersusMode) {
switch (player->unk_1C4) {
case 0:
gDPSetEnvColor(gMasterDisp++, 255, 255, 32, 128);
@@ -1108,7 +1110,7 @@ void func_80055E98(Player* player) {
}
RCP_SetupDL_64();
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 100);
if (player->wings.leftState == 2) {
if (player->wings.leftState == WINGSTATE_INTACT) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, sp5C, sp58, -100.0f, 1);
Matrix_RotateX(gGfxMatrix, M_DTOR * sp50, 1);
@@ -1121,7 +1123,7 @@ void func_80055E98(Player* player) {
gSPDisplayList(gMasterDisp++, D_102A8A0);
Matrix_Pop(&gGfxMatrix);
}
if (player->wings.rightState == 2) {
if (player->wings.rightState == WINGSTATE_INTACT) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, -sp5C, sp58, -100.0f, 1);
Matrix_RotateX(gGfxMatrix, M_DTOR * sp50, 1);
@@ -1139,7 +1141,7 @@ void func_80055E98(Player* player) {
void func_80056230(Player* player) {
if ((player->unk_234 != 0) && (player->unk_1CC == 0) && (gCurrentLevel != LEVEL_VENOM_2) &&
(gCurrentLevel != LEVEL_TRAINING) && (gLevelType == 0)) {
(gCurrentLevel != LEVEL_TRAINING) && (gLevelType == LEVELTYPE_GROUND)) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078, player->unk_138 + player->unk_144, 1);
Matrix_RotateY(gGfxMatrix, (player->unk_114 + player->unk_0E8 + 180.0f) * M_DTOR, 1);
@@ -1187,7 +1189,7 @@ void func_800564C0(Player* player, s32 arg1) {
}
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078 + player->unk_18C + 30.0f,
player->unk_138 + player->unk_144, 1);
if (D_801778E8 != 0) {
if (gVersusMode) {
for (i = 0; i < gCamCount; i++) {
if (D_80177B00[player->unk_1C4][i] != 0) {
Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]);
@@ -1208,7 +1210,7 @@ void func_800564C0(Player* player, s32 arg1) {
Matrix_RotateX(gGfxMatrix, (player->unk_0E4 + player->unk_134) * M_DTOR, 1);
Matrix_RotateZ(gGfxMatrix, (player->unk_0EC + player->unk_0F0 + player->unk_134) * M_DTOR, 1);
Matrix_RotateY(gGfxMatrix, (player->unk_114 + player->unk_0E8 + 180.0f) * M_DTOR, 1);
if (D_801778E8 != 0) {
if (gVersusMode) {
Matrix_RotateX(gGfxMatrix, player->unk_000 * M_DTOR, 1);
}
Matrix_RotateZ(gGfxMatrix, (-player->unk_12C - player->unk_130) * M_DTOR, 1);
@@ -1231,7 +1233,7 @@ void func_800564C0(Player* player, s32 arg1) {
Matrix_Translate(gCalcMatrix, player->unk_084, player->unk_080, 0.0f, 1);
} else {
Matrix_Translate(gGfxMatrix, player->unk_074, player->unk_078, player->unk_138 + player->unk_144, 1);
if (D_801778E8 != 0) {
if (gVersusMode) {
for (i = 0; i < gCamCount; i++) {
if (D_80177B00[player->unk_1C4][i] != 0) {
Matrix_MultVec3f(gGfxMatrix, &sp50, &D_80161578[i]);
@@ -1258,13 +1260,13 @@ void func_800564C0(Player* player, s32 arg1) {
}
switch (player->unk_200) {
case 0:
if (D_801778E8 == 0) {
if (!gVersusMode) {
if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_TITANIA)) {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, 1005);
} else {
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
}
} else if (D_8017789C == 2) {
} else if (gVersusStage == 2) {
RCP_SetupDL_29(128, 128, 255, 255, gFogNear, gFogFar);
} else {
RCP_SetupDL_29(0, 0, 0, 255, gFogNear, gFogFar);
@@ -1317,7 +1319,7 @@ void func_80056E2C(Player* player) {
sp34 = sp30 = 0.0f;
}
Matrix_Push(&gGfxMatrix);
if (D_80177880 == 1) {
if (gAllRangeMode == 1) {
if (player->unk_1CC == 3) {
Matrix_Translate(gGfxMatrix, player->unk_064, player->unk_068 + 2.0f, player->unk_06C, 1);
} else {
@@ -1488,8 +1490,8 @@ void func_800578C4(Player* player) {
sp3C = 360.0f - sp3C;
Math_SmoothStepToAngle(&player->wings.unk_30, sp38, 0.2f, 6.0f, 0.0f);
Math_SmoothStepToAngle(&player->wings.unk_34, sp3C, 0.2f, 6.0f, 0.0f);
Math_SmoothStepToF(&D_800CA380, gChangedInput->stick_y * 0.75f, 0.1f, 2.0f, 0.0f);
Math_SmoothStepToF(&D_800CA384, gChangedInput->stick_x * 3.0f, 0.1f, 5.0f, 0.0f);
Math_SmoothStepToF(&D_800CA380, gControllerPress->stick_y * 0.75f, 0.1f, 2.0f, 0.0f);
Math_SmoothStepToF(&D_800CA384, gControllerPress->stick_x * 3.0f, 0.1f, 5.0f, 0.0f);
Math_SmoothStepToF(&D_800CA388, D_800CA38C[D_800CA220], 0.1f, 10.0f, 0.0f);
sp4C.z = D_800CA388;
Matrix_RotateX(gCalcMatrix, (player->unk_0E8 + D_800CA380) * M_DTOR, 0);
@@ -1533,7 +1535,7 @@ void func_80057D00(void) {
func_800B73E0(player);
Lights_SetOneLight(&gMasterDisp, gLight1x, gLight1y, gLight1z, gLight1R, gLight1G, gLight1B, gAmbientR, gAmbientG,
gAmbientB);
if (D_80177880 == 0) {
if (gAllRangeMode == 0) {
Matrix_RotateY(gCalcMatrix, player->unk_114 * M_DTOR, 0);
Matrix_RotateX(gCalcMatrix, player->unk_120 * M_DTOR, 1);
sp78.x = player->unk_040.x - player->unk_074;
@@ -1583,7 +1585,7 @@ void func_80057D00(void) {
Matrix_Push(&gGfxMatrix);
Matrix_LookAt(gGfxMatrix, D_801779D8.x, D_801779D8.y, D_801779D8.z, D_801779E8.x, D_801779E8.y, D_801779E8.z,
sp6C.x, sp6C.y, sp6C.z, 1);
if ((gLevelType == 0) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gLevelType == LEVELTYPE_GROUND) || (gCurrentLevel == LEVEL_BOLSE)) {
if ((gCurrentLevel == LEVEL_TITANIA) && ((gPlayer[0].unk_1C8 != 2) || (gPlayer[0].unk_19C != 0))) {
Matrix_Push(&gGfxMatrix);
Matrix_Translate(gGfxMatrix, 0.0f, D_8017847C, 0.0f, 1);
@@ -1690,7 +1692,7 @@ void func_80057D00(void) {
}
}
}
if ((D_80177880 == 2) && (gPlayer[0].unk_1C8 == 3)) {
if ((gAllRangeMode == 2) && (gPlayer[0].unk_1C8 == 3)) {
func_E9F1D0_801A6164(gPlayer);
}
func_80040954();
src/main/fox_edata_1C.c
+662 -405
View File
File diff suppressed because it is too large Load Diff
src/main/fox_edisplay.c
+153 -152
View File
File diff suppressed because it is too large Load Diff
src/main/fox_enmy.c
+646 -645
View File
File diff suppressed because it is too large Load Diff
src/main/fox_game.c
+5 -5
View File
@@ -384,7 +384,7 @@ void func_800A26C0(void) {
gCamCount = 1;
gLifeCount[0] = 2;
D_80177D20 = 0.0f;
D_8016170C = D_80177A80 = D_80177830 = D_80177838 = D_80177840 = D_80178754 = D_801778E8 = D_80177AE0 =
D_8016170C = D_80177A80 = D_80177830 = D_80177838 = D_80177840 = D_80178754 = gVersusMode = D_80177AE0 =
D_80178410 = D_80177B40 = D_80177854 = D_8017784C = D_80177898 = D_80161734 = D_80161A2C =
gBgColor = D_80178340 = 0;
gNextGameState = D_80177C94 = D_80177CAC = D_80177CB4 = D_80177CBC = D_80177CC4 = D_80177C9C =
@@ -402,7 +402,7 @@ void func_800A26C0(void) {
D_800D2860[i] = R_CBUTTONS;
D_80178380[i] = 0;
}
D_8017789C = 0;
gVersusStage = 0;
D_801778A4 = 3;
gBlurAlpha = 255;
for (i = 0; i < 30; i++) {
@@ -491,7 +491,7 @@ void func_800A26C0(void) {
gDPFillRectangle(gMasterDisp++, SCREEN_WIDTH / 2 - 3, 8, SCREEN_WIDTH / 2 + 2, SCREEN_HEIGHT - 8);
gDPFillRectangle(gMasterDisp++, 8, SCREEN_HEIGHT / 2 - 3, SCREEN_WIDTH - 8, SCREEN_HEIGHT / 2 + 2);
if (gLevelType == 0) {
if (gLevelType == LEVELTYPE_GROUND) {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 0, 0, 0, 255);
} else {
gDPSetPrimColor(gMasterDisp++, 0x00, 0x0, 100, 100, 255, 255);
@@ -529,7 +529,7 @@ void func_800A26C0(void) {
func_80040CDC();
func_8008865C();
func_8002E548();
if ((gGameState == GSTATE_PLAY) && (D_801778E8 != 0)) {
if ((gGameState == GSTATE_PLAY) && (gVersusMode)) {
func_800C1ED4();
}
func_80084688(0, D_80177C50);
@@ -550,7 +550,7 @@ Object_2F4* func_800A3608(s32 arg0) {
Object_2F4_Initialize(obj2F4);
obj2F4->obj.status = 1;
obj2F4->obj.id = arg0;
Object_Set1C(&obj2F4->unk_01C, obj2F4->obj.id);
Object_SetInfo(&obj2F4->info, obj2F4->obj.id);
break;
}
}

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