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

oh god the docs (#234)

Browse Source
This commit is contained in:
petrie911
2024-05-06 19:45:24 -03:00
committed by GitHub
parent baaba960e6
commit a864e5ebe2
57 changed files with 1808 additions and 1712 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/context.h
+1 -1
View File
@@ -86,7 +86,7 @@ extern LevelId gCurrentLevel;
extern s32 gLevelPhase;
extern s32 gBossActive;
extern s32 D_ctx_8017828C;
extern s32 D_ctx_80178294;
extern s32 gUseDynaFloor;
extern s32 gRadioState;
extern s32 gCurrentRadioPortrait;
extern s32 gRadioStateTimer;
include/functions.h
+57 -57
View File
@@ -32,13 +32,13 @@ void ActorAllRange_Update(Actor* this);
void ActorAllRange_Draw(Actor* this);
//fox_beam
void func_beam_80038140(PlayerShot* shot);
void func_beam_80036318(PlayerShot* shot);
void func_beam_80035DEC(f32 xPos, f32 yPos, f32 zPos);
void PlayerShot_CollisionCheck(PlayerShot* shot);
void PlayerShot_Impact(PlayerShot* shot);
void PlayerShot_SpawnEffect351(f32 xPos, f32 yPos, f32 zPos);
void PlayerShot_Initialize(PlayerShot*);
void func_beam_800365E4(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void PlayerShot_Update(void);
void PlayerShot_Draw(void);
void PlayerShot_SpawnEffect344(f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void PlayerShot_UpdateAll(void);
void PlayerShot_DrawAll(void);
// fox_bg
void Background_DrawStarfield(void);
@@ -58,17 +58,17 @@ void Boss299_Draw(Boss* boss);
void Boss300_Init(Boss* boss);
void Boss300_Update(Boss* boss);
void Boss300_Draw(Boss* boss);
void Boss_SpawnActor189(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void Boss_SpawnDebris(f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32);
void Boss_CompleteLevel(Player* player, f32 xPos, f32 yPos, f32 zPos);
// fox_tank
void func_tank_80043468(Player* player);
void Player_UpdateTankCamOnRails(Player* player);
void func_tank_800444BC(Player* player);
void func_tank_80044868(Player*);
void func_tank_80045130(Player*);
void func_tank_80045678(Player*);
void func_tank_80045E7C(Player*);
void func_tank_80047504(Player* player);
void Tank_UpdateOnRails(Player* player);
void func_tank_80046358(Player*);
// fox_demo
@@ -111,7 +111,7 @@ void Sprite167_Draw(Sprite*);
void FogShadow_Draw(Sprite*);
void func_edisplay_80059F68(Scenery*);
void func_edisplay_80059FDC(Scenery*);
void Actor189_Draw(Actor*);
void ActorDebris_Draw(Actor*);
void Actor_DrawEngineAndContrails(Actor*);
void Actor_DrawEngineGlow(Actor*, s32);
void func_edisplay_8005B388(Actor*);
@@ -129,9 +129,9 @@ void ItemBomb_Draw(Item*);
void ItemLasers_Draw(Item*);
void ItemMeteoWarp_Draw(Item*);
void Object_ClampSfxSource(f32*);
void func_edisplay_8005F0E8(f32*, Vec3f*);
void func_edisplay_8005F1EC(f32*);
void func_edisplay_8005F290(f32*, Vec3f*);
void Object_SetSfxSourceToPos(f32*, Vec3f*);
void Object_UpdateSfxSource(f32*);
void Object_SetSfxSourceToView(f32*, Vec3f*);
void Display_SetSecondLight(Vec3f*);
bool func_edisplay_8005F9DC(Vec3f*);
@@ -140,7 +140,7 @@ void Object_Draw(s32 );
void Effect_Draw(u8 );
void TexturedLine_Draw(void);
void TexturedLine_DrawPath(s32);
void func_enmy_80060F30(f32* , u32 , s32 );
void Object_PlayerSfx(f32* , u32 , s32 );
void Object_Kill(Object*, f32*);
bool func_enmy_80060FE4(Vec3f*, f32);
void Object_SetInfo(ObjectInfo* info, u32 objId);
@@ -177,7 +177,7 @@ void Sprite167_Update(Sprite*);
void func_enmy_80066EA8(Scenery*);
void Item_CheckBounds(Item*);
void Item_SpinPickup(Item*);
void func_enmy_800674B4(f32, f32, f32, f32, f32, f32, f32, f32);
void Actor_SpawnDebris70(f32, f32, f32, f32, f32, f32, f32, f32);
void ActorSupplies_Update(Actor*);
void ActorSupplies_Draw(Actor*);
void func_enmy_80067A40(void);
@@ -221,7 +221,7 @@ void Actor194_Dying(Actor*);
void Actor194_Draw(Actor*);
void Scenery42_Update(Scenery*);
void Actor196_Update(Actor*);
void Actor189_Update(Actor*);
void ActorDebris_Update(Actor*);
void MeteoTunnel_Update(Scenery*);
void Actor_SetupPlayerShot(PlayerShotId, PlayerShot*, s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
void Actor_SpawnPlayerLaser(s32, f32, f32, f32, f32, f32, f32, f32, f32, f32);
@@ -407,11 +407,11 @@ void HUD_DrawCountdown(s32* , f32);
void func_hud_8008E9EC(f32, f32);
void func_hud_8008EA14(f32, f32);
void HUD_Draw(void);
void func_hud_8008FE78(Boss*);
void HUD_BossFO_Draw(Boss*);
void func_hud_8008FFF0(Boss*, s32);
s32 func_hud_80090200(Boss* boss);
bool func_hud_8009092C(Actor*);
void func_hud_800907C4(Boss*);
void HUD_BossFO_Update(Boss*);
bool func_hud_800915FC(Actor*);
bool func_hud_800924E0(Actor*);
@@ -442,54 +442,54 @@ void func_800A3CA0(void);
// fox_play
bool Play_CheckMedalStatus(u16);
void func_play_800A3FB0(void);
void Play_dummy_MuteSfx(void);
s32 Play_GetMaxShields(void);
void func_play_800A6028(f32*, u32);
void func_play_800AC290(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 speed);
void Play_PlaySfxFirstPlayer(f32*, u32);
void Player_SetupArwingShot(Player* player, PlayerShot* shot, f32 arg2, f32 arg3, PlayerShotId shotId, f32 speed);
void Play_Setup(void);
void func_play_800A594C(void);
void Play_InitEnvironment(void);
void Play_GenerateStarfield(void);
void Play_SetupStarfield(void);
void func_play_800A5EBC(void);
void func_play_800A5FA0(f32* , u32 , s32 );
void func_play_800A6070(f32* , u32 );
void Player_PlaySfx(f32* , u32 , s32 );
void Play_PlaySfxNoPlayer(f32* , u32 );
void Play_ClearObjectData(void);
void func_play_800A69F8(s32 , f32 , f32 , f32 );
void Play_SpawnDebris(s32 , f32 , f32 , f32 );
void Player_ApplyDamage(Player* player, s32 direction, s32 damage);
bool func_play_800A73E4(f32* , s32* , f32 xPos, f32 yPos, f32 zPos);
bool func_play_800A78C4(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void func_play_800A8BA4(Player* player);
void func_play_800AA800(Player* player);
void func_play_800ACDC0(Player*, PlayerShot*, PlayerShotId );
void func_play_800B0F50(Player*);
void func_play_800B44C4(Player*);
void func_play_800AB334(void);
void func_play_800ABA08(void);
void func_play_800AE278(Player*);
void func_play_800B2130(Player*);
void func_play_800B2574(Player*);
void func_play_800B56BC(Player*);
void func_play_800B5D30(Player*, s32);
void func_play_800B5FBC(Player*, s32 , bool );
void func_play_800B63BC(Player*, s32);
void func_play_800B6848(Player*, s32 );
void func_play_800B6BFC(Player*, s32 );
void func_play_800B6F50(f32, f32, f32, f32, f32, f32);
void func_play_800B7184(Player*, s32);
void func_play_800B73E0(Player*);
bool Play_CheckDynaFloorCollision(f32* , s32* , f32 xPos, f32 yPos, f32 zPos);
bool Play_CheckSingleHitbox(Hitbox* hitbox, f32 , f32 , f32 , f32 , f32 , f32 );
void Player_CollisionCheck(Player* player);
void Player_FloorCheck(Player* player);
void Player_SetupOnFootShot(Player*, PlayerShot*, PlayerShotId );
void Player_Setup(Player*);
void Player_Update360(Player*);
void Play_InitLevel(void);
void Player_InitVersus(void);
void Player_CheckBounds360(Player*);
void Player_UpdateArwingRoll(Player*);
void Player_ArwingBoost(Player*);
void Camera_UpdateArwingOnRails(Player*);
void Camera_UpdateCockpitOnRails(Player*, s32);
void Camera_FollowPlayer(Player*, s32 , bool );
void Camera_UpdateArwing360(Player*, s32);
void Camera_UpdateTank360(Player*, s32 );
void Camera_UpdateOnFoot360(Player*, s32 );
void Camera_SetStarfieldPos(f32, f32, f32, f32, f32, f32);
void Camera_Update360(Player*, s32);
void Camera_SetupLights(Player*);
void Play_SpawnVsItem(ObjectId , Item*);
void Play_Main(void);
void func_play_800A668C(f32 xPos, f32 yPos, f32 zPos);
void func_play_800AD7F0(Player* player);
void func_play_800ADF58(Player* player);
void func_play_800B415C(Player* player);
void func_play_800B41E0(Player* player);
void Play_SpawnHitmark(f32 xPos, f32 yPos, f32 zPos);
void Player_Shoot(Player* player);
void Player_UpdatePath(Player* player);
void Player_LowHealthAlarm(Player* player);
void Play_dummy_800B41E0(Player* player);
void Player_Down(Player* player);
void func_play_800A46A0(Player* player);
void func_play_800A86E4(Player* player);
void func_play_800A887C(Player* player);
s32 func_play_800A7974(Player* player, f32* hitboxData, s32* index, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot,
void Player_DamageEffects(Player* player);
void Player_CheckItemCollect(Player* player);
void Player_UpdateHitbox(Player* player);
s32 Player_CheckHitboxCollision(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_play_800A8054(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8);
bool Play_CheckPolyCollision(ObjectId objId, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, Vec3f* arg7, Vec3f* arg8);
void Scenery360_Initialize(Scenery360*);
// fox_versus
include/i1.h
+3 -3
View File
@@ -46,8 +46,8 @@ void Venom1_80192EB0(Actor*);
void Venom1_801933DC(Actor*);
void Venom1_801934D0(Actor*);
void Venom1_80193540(Scenery*);
void Venom1_80194398(Boss*);
void Venom1_801985E4(Boss*);
void Venom1_Boss_Update(Boss*);
void Venom1_Boss_Draw(Boss*);
void Training_ItemRing_Update(Item*);
void OvlI1_CallFunction(s32, void*);
@@ -66,7 +66,7 @@ void Venom1_Boss319_Init(Boss *);
void Venom1_80198310(Boss *);
void Venom1_80198594(Boss *);
void Training_801988E0(void);
void Training_80198C50(void);
void Training_Setup360(void);
void Training_8019949C(void);
void Venom1_8019864C(PlayerShot*);
include/i3.h
+17 -17
View File
@@ -19,12 +19,12 @@ void Aquas_801BE0F0(Actor*);
void OvlI3_CallFunction(s32, void*);
void Area6_BossA6_Init(Boss *);
void Area6_80187944(Boss*);
void Area6_8018C54C(Boss*);
void Area6_Boss_Update(Boss*);
void Area6_Boss_Draw(Boss*);
void Area6_LevelStart(Player *player);
void Area6_LevelComplete(Player*);
void Zoness_801900FC(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void Zoness_SpawnDebris(Vec3f*, Vec3f*, f32, f32, f32, s32, f32, s32, s32);
void Zoness_80190430(Actor* actor);
void Zoness_801904CC(Actor* actor);
void Zoness_80190A00(Actor* actor);
@@ -45,8 +45,8 @@ void Zoness_80192C18(Actor* actor);
void Zoness_80192E64(Actor* actor);
void Zoness_80193240(Actor* actor);
void Zoness_BossZo_Init(Boss* this);
void Zoness_801949DC(Boss* bossZO);
void Zoness_80194A84(Boss* bossZO);
void Zoness_Boss_Draw(Boss* bossZO);
void Zoness_Boss_Update(Boss* bossZO);
void Zoness_8019969C(Actor* actor);
void Zoness_8019983C(Actor* actor);
void Zoness_80199A28(Actor* actor);
@@ -83,22 +83,22 @@ void Solar_801A003C(Actor*);
void Solar_801A0120(Effect*);
void Solar_801A0AF0(Effect*);
void Solar_LevelStart(Player* player);
void Solar_801A5B3C(Boss*);
void Solar_801A71B8(Boss*);
void Solar_Boss_Update(Boss*);
void Solar_Boss_Draw(Boss*);
void Solar_801A8BE8(Actor*);
void Solar_LevelComplete(Player* player);
void Aquas_801A9824(void);
void Aquas_801AA20C(void);
void Aquas_801AA8E8(Player*);
void Aquas_801AACF8(Player*);
void Aquas_UpdateCamera(Player*);
void Aquas_BlueMarineMove(Player*);
void Aquas_801ABA40(PlayerShot*);
void Aquas_801AC274(Player*);
void Aquas_BlueMarineShoot(Player*);
void Aquas_801AC8A8(f32, f32, f32, f32, s32);
void Aquas_801AC918(Effect*);
void Aquas_801ACBB4(Player*);
void Aquas_801ACE50(Player*);
void Aquas_801AD328(Player*);
void Aquas_BlueMarineBoost(Player*);
void Aquas_BlueMarineBrake(Player*);
void Aquas_801AD688(Actor *);
void Aquas_801AD6C0(Actor*);
void Aquas_801AE168(Actor*);
@@ -111,8 +111,8 @@ void Aquas_801B099C(Actor*);
void Aquas_801B0B60(Actor*);
void Aquas_801B0EC0(Actor*);
void Aquas_BossAq_Init(Boss*);
void Aquas_801B134C(Boss*);
void Aquas_801B4D84(Boss*);
void Aquas_Boss_Update(Boss*);
void Aquas_Boss_Draw(Boss*);
void Aquas_801B504C(Actor*);
void Aquas_801B50E8(Actor*);
void Aquas_801B619C(Actor*);
@@ -144,10 +144,10 @@ void Aquas_801BDF14(void);
void Aquas_801BE1FC(Scenery*);
void Aquas_801BE3F8(Actor*);
void Aquas_801BEB1C(Actor*);
void Aquas_801BEC50(Boss*);
void Aquas_801BEC5C(Boss*);
void Aquas_Boss301_Update(Boss*);
void Aquas_Boss301_Draw(Boss*);
void Aquas_801BEC68(Actor*);
void Aquas_801BEC74(Actor*);
void Aquas_801BEC80(Player*);
void Aquas_Update360(Player*);
#endif
include/i4.h
+2 -2
View File
@@ -47,7 +47,7 @@ void Katina_BossUpdate(Boss*);
void Katina_BossDraw(Boss*);
void SectorZ_8019E234(Actor*);
void SectorZ_8019E3A8(Actor*);
void SectorZ_8019E454(Boss*);
void SectorZ_8019E98C(Boss*);
void SectorZ_Boss_Update(Boss*);
void SectorZ_Boss_Draw(Boss*);
#endif
include/i5.h
+2 -2
View File
@@ -82,8 +82,8 @@ void Titania_8018EF14(Actor*);
void Titania_Cactus_Update(Sprite*);
void Titania_8018F4D8(Scenery*);
void Titania_8018F8B8(Scenery*);
void Titania_80197A94(Boss*);
void Titania_801982A8(Boss*);
void Titania_Boss_Update(Boss*);
void Titania_Boss_Draw(Boss*);
void Macbeth_8019C778(Actor*);
void Macbeth_8019CE88(Actor*);
void Macbeth_8019D700(Actor*);
include/i6.h
+7 -7
View File
@@ -36,9 +36,9 @@ void Venom2_80196968(void);
void SectorY_Boss314_Init(Boss *);
void SectorY_Actor204_Update(Actor*);
void SectorY_Actor204_Draw(Actor*);
void Turret_801A5AD4(Player*);
void Turret_801A5FC0(Player*);
void Turret_801A6164(Player *);
void Turret_Update(Player*);
void Turret_UpdateCamera(Player*);
void Turret_Draw(Player *);
void Andross_801880E4(Actor*);
void Andross_80188448(Actor*);
@@ -60,12 +60,12 @@ void Andross_80193380(Scenery*);
void Andross_8019350C(Scenery*);
void Andross_8019356C(Scenery*);
void Andross_801935D4(Scenery*);
void Venom2_80196210(Boss*);
void Venom2_80196288(Boss*);
void Venom2_Boss_Update(Boss*);
void Venom2_Boss_Draw(Boss*);
void SectorY_80197C64(Effect*);
void SectorY_80197CB8(Scenery*);
void SectorY_8019C888(Boss*);
void SectorY_8019E2C4(Boss*);
void SectorY_Boss_Update(Boss*);
void SectorY_Boss_Draw(Boss*);
void SectorY_801A4E44(Scenery*);
void SectorY_801A52B8(Scenery*);
include/prevent_context_reordering.h
+3 -3
View File
@@ -1,15 +1,15 @@
#ifndef PREVENT_CONTEXT_REORDERING_H
#define PREVENT_CONTEXT_REORDERING_H
// extern int Dummyhalf;
extern int Dummyhalf;
// struct Dummy0 {int x;};
// struct Dummy1 {int x;};
// struct Dummy2 {int x;};
// struct Dummy3 {int x;};
// struct Dummy4 {int x;};
// struct Dummy5 {int x;};
struct Dummy6 {int x;};
struct Dummy7 {int x;};
// struct Dummy6 {int x;};
// struct Dummy7 {int x;};
struct Dummy8 {int x;};
struct Dummy9 {int x;};
struct Dummy10 {int x;};
include/sf64audio_external.h
+1
View File
@@ -14,6 +14,7 @@ typedef enum AudioType {
/* 0 */ AUDIO_TYPE_MUSIC,
/* 1 */ AUDIO_TYPE_VOICE,
/* 2 */ AUDIO_TYPE_SFX,
/* 3 */ AUDIO_TYPE_MAX,
} AudioType;
typedef enum {
include/sf64object.h
+29 -15
View File
@@ -45,12 +45,12 @@ typedef enum {
/* 1 */ COL1_1, // OBJ_SCENERY_ME_TUNNEL
/* 2 */ COL1_2,
/* 3 */ COL1_3, // ACTOR_EVENT_ID
/* 4 */ COL1_4, // OBJ_BOSS_308
/* 4 */ COL1_4, // OBJ_BOSS_FO
/* 5 */ COL1_5, // OBJ_SCENERY_149
/* 6 */ COL1_6, // OBJ_SCENERY_150
/* 7 */ COL1_7, // OBJ_BOSS_309
/* 8 */ COL1_8, // OBJ_BOSS_313
/* 9 */ COL1_9, // OBJ_BOSS_312
/* 8 */ COL1_8, // OBJ_BOSS_SZ
/* 9 */ COL1_9, // OBJ_BOSS_VE2
} CollisonId_1;
typedef enum {
@@ -502,7 +502,7 @@ typedef enum ObjectId {
/* 186 */ OBJ_ACTOR_186,
/* 187 */ OBJ_ACTOR_187,
/* 188 */ OBJ_ACTOR_188,
/* 189 */ OBJ_ACTOR_189,
/* 189 */ OBJ_ACTOR_DEBRIS,
/* 190 */ OBJ_ACTOR_190,
/* 191 */ OBJ_ACTOR_191,
/* 192 */ OBJ_ACTOR_192,
@@ -619,20 +619,20 @@ typedef enum ObjectId {
/* 303 */ OBJ_BOSS_303,
/* 304 */ OBJ_BOSS_304,
/* 305 */ OBJ_BOSS_305,
/* 306 */ OBJ_BOSS_306,
/* 306 */ OBJ_BOSS_TI,
/* 307 */ OBJ_BOSS_ZO,
/* 308 */ OBJ_BOSS_308,
/* 308 */ OBJ_BOSS_FO,
/* 309 */ OBJ_BOSS_309,
/* 310 */ OBJ_BOSS_310,
/* 311 */ OBJ_BOSS_311,
/* 312 */ OBJ_BOSS_312,
/* 313 */ OBJ_BOSS_313,
/* 314 */ OBJ_BOSS_314,
/* 312 */ OBJ_BOSS_VE2,
/* 313 */ OBJ_BOSS_SZ,
/* 314 */ OBJ_BOSS_SY,
/* 315 */ OBJ_BOSS_SO,
/* 316 */ OBJ_BOSS_316,
/* 317 */ OBJ_BOSS_317,
/* 316 */ OBJ_BOSS_KA,
/* 317 */ OBJ_BOSS_KA_BASE,
/* 318 */ OBJ_BOSS_AQ,
/* 319 */ OBJ_BOSS_319,
/* 319 */ OBJ_BOSS_VE1,
/* 320 */ OBJ_BOSS_320,
/* 321 */ OBJ_BOSS_321,
/* 322 */ OBJ_ITEM_LASERS,
@@ -719,10 +719,24 @@ typedef enum ObjectId {
/* 403 */ OBJ_UNK_403,
/* 404 */ OBJ_UNK_404,
/* 405 */ OBJ_UNK_405,
/* 406 */ OBJ_UNK_406,
/* 407 */ OBJ_ID_MAX,
} ObjectId;
#define OBJ_SCENERY_START OBJ_SCENERY_0
#define OBJ_SPRITE_START OBJ_SPRITE_CO_POLE
#define OBJ_ACTOR_START OBJ_ACTOR_176
#define OBJ_BOSS_START OBJ_BOSS_292
#define OBJ_ITEM_START OBJ_ITEM_LASERS
#define OBJ_EFFECT_START OBJ_EFFECT_FIRE_SMOKE
#define OBJ_ENV_START OBJ_UNK_400
#define OBJ_SCENERY_MAX OBJ_SPRITE_START
#define OBJ_SPRITE_MAX OBJ_ACTOR_START
#define OBJ_ACTOR_MAX OBJ_BOSS_START
#define OBJ_BOSS_MAX OBJ_ITEM_START
#define OBJ_ITEM_MAX OBJ_EFFECT_START
#define OBJ_EFFECT_MAX OBJ_ENV_START
#define ACTOR_EVENT_ID 1000
typedef enum ItemDrop {
@@ -772,7 +786,7 @@ typedef enum AllRangeAi {
/* 200 */ AI360_EVENT_HANDLER = 1000,
} AllRangeAi;
Actor* func_game_800A3608(ObjectId);
Actor* Game_SpawnActor(ObjectId);
// template enums for boss work buffers
@@ -1117,7 +1131,7 @@ typedef Actor Actor185;
typedef Actor Actor186;
typedef Actor Actor187;
typedef Actor Actor188;
typedef Actor Actor189;
typedef Actor ActorDebris;
typedef Actor Actor190;
typedef Actor Actor191;
typedef Actor Actor192;
include/sf64player.h
+26 -20
View File
@@ -73,17 +73,23 @@ typedef enum PlayerState1C8 {
/* 13 */ PLAYERSTATE_1C8_VS_STANDBY,
} PlayerState1C8;
typedef enum {
/* 0 */ PLAYERSHOT_0, // single laser?
/* 1 */ PLAYERSHOT_1, // twin laser?
typedef enum PlayerShotStatus {
/* 0 */ SHOT_FREE,
/* 1 */ SHOT_ACTIVE,
/* 2 */ SHOT_HITMARK,
} PlayerShotStatus;
typedef enum PlayerShotId {
/* 0 */ PLAYERSHOT_SINGLE_LASER, // single laser?
/* 1 */ PLAYERSHOT_TWIN_LASER, // twin laser?
/* 2 */ PLAYERSHOT_2,
/* 3 */ PLAYERSHOT_BOMB, // bomb?
/* 4 */ PLAYERSHOT_4,
/* 5 */ PLAYERSHOT_5, // landmaster shot
/* 6 */ PLAYERSHOT_6, // on-foot shot
/* 4 */ PLAYERSHOT_LOCK_SEARCH,
/* 5 */ PLAYERSHOT_TANK, // landmaster shot
/* 6 */ PLAYERSHOT_ON_FOOT, // on-foot shot
/* 7 */ PLAYERSHOT_7, // unused? related to on-foot shot somehow
/* 8 */ PLAYERSHOT_8, // charge shot
/* 9 */ PLAYERSHOT_9,
/* 8 */ PLAYERSHOT_LOCK_ON, // charge shot
/* 9 */ PLAYERSHOT_GFOX_LASER,
} PlayerShotId;
#define NPC_SHOT_ID 100
@@ -91,14 +97,14 @@ typedef enum {
#define DMG_SRC_2 2
#define DMG_SRC_100 100
typedef enum {
typedef enum LaserStrength {
/* 0 */ LASERS_SINGLE,
/* 1 */ LASERS_TWIN,
/* 2 */ LASERS_HYPER,
/* 3 */ LASERS_UNK_3,
} LaserStrength;
typedef struct {
typedef struct PlayerShot {
/* 0x00 */ Object obj;
/* 0x1C */ s32 index;
/* 0x20 */ Vec3f vel;
@@ -112,12 +118,12 @@ typedef struct {
/* 0x58 */ s32 unk_58;
/* 0x5C */ s32 unk_5C;
/* 0x60 */ s32 unk_60;
/* 0x64 */ s32 unk_64;
/* 0x64 */ s32 timer;
/* 0x68 */ s32 sourceId;
/* 0x6C */ u8 bonus;
} PlayerShot; // size = 0x70
typedef struct {
typedef struct WingInfo {
/* 0x00 */ u8 rightState;
/* 0x01 */ u8 leftState;
/* 0x04 */ f32 unk_04;
@@ -136,7 +142,7 @@ typedef struct {
/* 0x38 */ f32 unk_38;
} WingInfo; // size = 0x3C
typedef struct {
typedef struct PlayerSfx {
/* 0x00 */ u8 levelType;
/* 0x01 */ u8 form;
/* 0x04 */ f32 *srcPos;
@@ -167,7 +173,7 @@ typedef struct Player {
/* 0x040 */ CameraPoint cam;
/* 0x058 */ f32 camYaw;
/* 0x05C */ f32 camPitch;
/* 0x05C */ f32 unk_060;
/* 0x05C */ f32 xRock;
/* 0x064 */ Vec3f groundPos; // position on ground directly below player
/* 0x070 */ f32 groundRotY; // y rotation of actor under player when acting as ground
/* 0x074 */ Vec3f pos; // pos.z is position along path. see trueZpos for the actual z position
@@ -236,11 +242,11 @@ typedef struct Player {
/* 0x1A0 */ s32 unk_1A0;
/* 0x1A4 */ s32 unk_1A4;
/* 0x1A8 */ char pad1A8[8];
/* 0x1B0 */ s32 unk_1B0;
/* 0x1B4 */ s32 unk_1B4;
/* 0x1B0 */ s32 turretState;
/* 0x1B4 */ s32 turretActor;
/* 0x1B8 */ char pad1B8[4];
/* 0x1BC */ s32 unk_1BC;
/* 0x1C0 */ s32 unk_1C0;
/* 0x1BC */ s32 turretRecoil;
/* 0x1C0 */ s32 turretLockOnCount;
/* 0x1C4 */ s32 num;
/* 0x1C8 */ PlayerState1C8 state_1C8;
/* 0x1CC */ PlayerForm form;
@@ -273,7 +279,7 @@ typedef struct Player {
/* 0x238 */ s32 cockpitView;
/* 0x23C */ s32 shadowing;
/* 0x240 */ s32 unk_240;
/* 0x244 */ s32 timer_244;
/* 0x244 */ s32 shotTimer;
/* 0x248 */ f32 unk_248;
/* 0x24C */ f32 unk_24C;
/* 0x250 */ f32 unk_250; // checked for by event actors, but unused?
@@ -290,7 +296,7 @@ typedef struct Player {
/* 0x27C */ s32 meteoWarpTimer;
/* 0x280 */ s32 barrelRollAlpha;
/* 0x284 */ s32 unk_284;
/* 0x288 */ s32 unk_288;
/* 0x288 */ s32 attacker;
/* 0x28C */ char pad28C[0x28];
/* 0x2B4 */ bool boostCooldown;
/* 0x2B8 */ bool boostActive;
include/sfx.h
+2 -2
View File
@@ -303,8 +303,8 @@ typedef enum SfxBankId {
#define NA_SE_EXPLOSION_DEMO5 0x3143402E
#define NA_SE_EN_BOSS_BEAM0 0x3143102F
#define NA_SE_EN_BOSS_CHARGE 0x39435830
#define NA_SE_EN_BOSS_ATTACK 0x29003031
#define NA_SE_EN_SAND_BOUND_M 0x29403031
#define NA_SE_OB_SAND_BOUND_M 0x29003031
#define NA_SE_EN_BOSS_ATTACK 0x29403031
#define NA_SE_OB_SPEAR_PILLAR 0x29503032
#define NA_SE_EN_WT_EXPLOSION_S 0x29038033
#define NA_SE_EN_WT_EXPLOSION_M 0x29000034 // Unreferenced.
linker_scripts/us/symbol_addrs_engine.txt
+89 -89
View File
@@ -186,7 +186,7 @@ func_edisplay_80059FDC = 0x80059FDC;
func_edisplay_8005A010 = 0x8005A010;
func_edisplay_8005A07C = 0x8005A07C;
func_edisplay_8005A088 = 0x8005A088;
Actor189_Draw = 0x8005A094;
ActorDebris_Draw = 0x8005A094;
Actor_DrawEngineAndContrails = 0x8005ADAC;
Actor_DrawEngineGlow = 0x8005B1E8;
func_edisplay_8005B388 = 0x8005B388;
@@ -219,9 +219,9 @@ Item_Draw = 0x8005E7B8;
ActorAllRange_DrawShadow = 0x8005EA24;
Object_DrawShadow = 0x8005ECD8;
Object_ClampSfxSource = 0x8005F030;
func_edisplay_8005F0E8 = 0x8005F0E8;
func_edisplay_8005F1EC = 0x8005F1EC;
func_edisplay_8005F290 = 0x8005F290;
Object_SetSfxSourceToPos = 0x8005F0E8;
Object_UpdateSfxSource = 0x8005F1EC;
Object_SetSfxSourceToView = 0x8005F290;
Scenery360_Draw = 0x8005F2F4;
Display_SetSecondLight = 0x8005F670;
func_edisplay_8005F9DC = 0x8005F9DC;
@@ -252,7 +252,7 @@ func_effect_80081A8C = 0x80081A8C;
func_effect_8008377C = 0x8008377C;
// fox_enmy
func_enmy_80060F30 = 0x80060F30;
Object_PlayerSfx = 0x80060F30;
Object_Kill = 0x80060FBC;
func_enmy_80060FE4 = 0x80060FE4;
func_enmy_80061148 = 0x80061148;
@@ -313,8 +313,8 @@ func_enmy_80066EA8 = 0x80066EA8;
func_enmy_80066EE4 = 0x80066EE4;
Item_CheckBounds = 0x80066EF0;
Item_SpinPickup = 0x800671D0;
func_enmy_80067348 = 0x80067348;
func_enmy_800674B4 = 0x800674B4;
Actor_SetupDebris70 = 0x80067348;
Actor_SpawnDebris70 = 0x800674B4;
ActorSupplies_Update = 0x8006753C;
ActorSupplies_Draw = 0x80067874;
func_enmy_80067A40 = 0x80067A40;
@@ -384,7 +384,7 @@ Game_InitViewport = 0x800A1FB0;
Game_Draw = 0x800A24DC;
Game_SetScene = 0x800A25DC;
Game_Update = 0x800A26C0;
func_game_800A3608 = 0x800A3608;
Game_SpawnActor = 0x800A3608;
// sf_hud
@@ -568,7 +568,7 @@ gBossActive = 0x80178284;
gStarOffsetsX = 0x80178288;
D_ctx_8017828C = 0x8017828C;
gStarOffsetsY = 0x80178290;
D_ctx_80178294 = 0x80178294;
gUseDynaFloor = 0x80178294;
gStarFillColors = 0x80178298;
gRadioState = 0x8017829C;
gCurrentRadioPortrait = 0x801782A4;
@@ -667,104 +667,104 @@ gLight2GTarget = 0x80178574;
gLight2BTarget = 0x80178578;
Play_GetMaxShields = 0x800A3FC4;
func_play_800A3FB0 = 0x800A3FB0;
Play_dummy_MuteSfx = 0x800A3FB0;
Play_CheckMedalStatus = 0x800A3F50;
func_play_800A3FEC = 0x800A3FEC;
func_play_800A4460 = 0x800A4460;
func_play_800A46A0 = 0x800A46A0;
func_play_800A4C40 = 0x800A4C40;
Play_UpdateDynaFloor = 0x800A3FEC;
Player_WingEffects = 0x800A4460;
Player_DamageEffects = 0x800A46A0;
Player_WaterEffects = 0x800A4C40;
Scenery360_Initialize = 0x800A4F4C;
func_play_800A4F7C = 0x800A4F7C;
func_play_800A5330 = 0x800A5330;
func_play_800A5338 = 0x800A5338;
func_play_800A55B0 = 0x800A55B0;
func_play_800A57E0 = 0x800A57E0;
Play_InitVsStage = 0x800A4F7C;
Play_dummy_800A5330 = 0x800A5330;
Play_Setup360_CO = 0x800A5338;
Play_Setup360_SY = 0x800A55B0;
Play_Setup360_AND = 0x800A57E0;
Play_Setup = 0x800A5844;
func_play_800A594C = 0x800A594C;
Play_SetupStarfield = 0x800A5D6C;
func_play_800A5EBC = 0x800A5EBC;
func_play_800A5FA0 = 0x800A5FA0;
func_play_800A6028 = 0x800A6028;
func_play_800A6070 = 0x800A6070;
Play_InitEnvironment = 0x800A594C;
Play_GenerateStarfield = 0x800A5D6C;
Play_SetupStarfield = 0x800A5EBC;
Player_PlaySfx = 0x800A5FA0;
Play_PlaySfxFirstPlayer = 0x800A6028;
Play_PlaySfxNoPlayer = 0x800A6070;
BonusText_Initialize = 0x800A60B8;
TexturedLine_Initialize = 0x800A60E8;
RadarMark_Initialize = 0x800A6118;
Play_ClearObjectData = 0x800A6148;
Play_UpdateFillScreen = 0x800A6590;
func_play_800A668C = 0x800A668C;
func_play_800A670C = 0x800A670C;
func_play_800A69F8 = 0x800A69F8;
func_play_800A6A74 = 0x800A6A74;
Play_SpawnHitmark = 0x800A668C;
Play_SetupDebris = 0x800A670C;
Play_SpawnDebris = 0x800A69F8;
Player_CheckAllGoldRings = 0x800A6A74;
Player_DamageWings = 0x800A6AC0;
Player_ApplyDamage = 0x800A6CD0;
func_play_800A729C = 0x800A729C;
func_play_800A73E4 = 0x800A73E4;
func_play_800A78C4 = 0x800A78C4;
func_play_800A7974 = 0x800A7974;
func_play_800A8054 = 0x800A8054;
func_play_800A8304 = 0x800A8304;
func_play_800A86E4 = 0x800A86E4;
func_play_800A8804 = 0x800A8804;
func_play_800A887C = 0x800A887C;
func_play_800A8BA4 = 0x800A8BA4;
func_play_800AA800 = 0x800AA800;
func_play_800AB2AC = 0x800AB2AC;
Player_GroundedCollision = 0x800A729C;
Play_CheckDynaFloorCollision = 0x800A73E4;
Play_CheckSingleHitbox = 0x800A78C4;
Player_CheckHitboxCollision = 0x800A7974;
Play_CheckPolyCollision = 0x800A8054;
Player_CheckPolyCollision = 0x800A8304;
Player_CheckItemCollect = 0x800A86E4;
Player_Collide = 0x800A8804;
Player_UpdateHitbox = 0x800A887C;
Player_CollisionCheck = 0x800A8BA4;
Player_FloorCheck = 0x800AA800;
Player_InitializeAll = 0x800AB2AC;
Player_Initialize = 0x800AB304;
func_play_800AB334 = 0x800AB334;
func_play_800AB964 = 0x800AB964;
func_play_800ABA08 = 0x800ABA08;
Play_InitLevel = 0x800AB334;
Player_ResetVsData = 0x800AB964;
Player_InitVersus = 0x800ABA08;
Play_Init = 0x800ABAB4;
func_play_800AC290 = 0x800AC290;
func_play_800AC650 = 0x800AC650;
func_play_800ACA40 = 0x800ACA40;
func_play_800ACABC = 0x800ACABC;
func_play_800ACC7C = 0x800ACC7C;
func_play_800ACDC0 = 0x800ACDC0;
func_play_800AD094 = 0x800AD094;
func_play_800AD118 = 0x800AD118;
func_play_800AD1F4 = 0x800AD1F4;
func_play_800AD7F0 = 0x800AD7F0;
func_play_800ADA28 = 0x800ADA28;
func_play_800ADD98 = 0x800ADD98;
func_play_800ADF58 = 0x800ADF58;
func_play_800AE278 = 0x800AE278;
func_play_800AE4A4 = 0x800AE4A4;
func_play_800AECAC = 0x800AECAC;
func_play_800AF07C = 0x800AF07C;
func_play_800AF928 = 0x800AF928;
func_play_800B00C0 = 0x800B00C0;
func_play_800B0194 = 0x800B0194;
func_play_800B0F50 = 0x800B0F50;
func_play_800B2130 = 0x800B2130;
func_play_800B22C0 = 0x800B22C0;
func_play_800B2574 = 0x800B2574;
func_play_800B2BE0 = 0x800B2BE0;
func_play_800B2C00 = 0x800B2C00;
func_play_800B3010 = 0x800B3010;
func_play_800B3314 = 0x800B3314;
func_play_800B39E0 = 0x800B39E0;
Player_SetupArwingShot = 0x800AC290;
Player_SetupTankShot = 0x800AC650;
Player_TankCannon = 0x800ACA40;
Player_ArwingLaser = 0x800ACABC;
Player_SmartBomb = 0x800ACC7C;
Player_SetupOnFootShot = 0x800ACDC0;
Player_OnFootGun = 0x800AD094;
Player_CanLockOn = 0x800AD118;
Player_UpdateLockOn = 0x800AD1F4;
Player_Shoot = 0x800AD7F0;
Player_ArwingBank = 0x800ADA28;
Player_UseTankJets = 0x800ADD98;
Player_UpdatePath = 0x800ADF58;
Player_CheckBounds360 = 0x800AE278;
Player_ArwingMove360 = 0x800AE4A4;
Player_PerformLoop = 0x800AECAC;
Player_ArwingMoveOnRails = 0x800AF07C;
Player_TankMove360 = 0x800AF928;
Player_OnFootUpdateSpeed = 0x800B00C0;
Player_OnFootMove = 0x800B0194;
Player_Setup = 0x800B0F50;
Player_UpdateArwingRoll = 0x800B2130;
Player_UpdateTankRoll = 0x800B22C0;
Player_ArwingBoost = 0x800B2574;
Player_ArwingBoost2 = 0x800B2BE0;
Player_ArwingBrake = 0x800B2C00;
Player_TankBoostBrake = 0x800B3010;
Player_UpdateTankJets = 0x800B3314;
Player_UpdateEffects = 0x800B39E0;
Player_UpdateShields = 0x800B40AC;
func_play_800B415C = 0x800B415C;
func_play_800B41E0 = 0x800B41E0;
Player_LowHealthAlarm = 0x800B415C;
Play_dummy_800B41E0 = 0x800B41E0;
Player_Down = 0x800B41EC;
func_play_800B42B0 = 0x800B42B0;
func_play_800B44C4 = 0x800B44C4;
func_play_800B46F8 = 0x800B46F8;
Player_UpdateOnRails = 0x800B42B0;
Player_Update360 = 0x800B44C4;
Player_LowHealthMsg = 0x800B46F8;
Player_Update = 0x800B48BC;
func_play_800B56BC = 0x800B56BC;
func_play_800B5D30 = 0x800B5D30;
func_play_800B5FBC = 0x800B5FBC;
func_play_800B63BC = 0x800B63BC;
func_play_800B6848 = 0x800B6848;
func_play_800B6BFC = 0x800B6BFC;
func_play_800B6F50 = 0x800B6F50;
func_play_800B7184 = 0x800B7184;
Player_UpdateCamera = 0x800B71E4;
func_play_800B73E0 = 0x800B73E0;
Camera_UpdateArwingOnRails = 0x800B56BC;
Camera_UpdateCockpitOnRails = 0x800B5D30;
Camera_FollowPlayer = 0x800B5FBC;
Camera_UpdateArwing360 = 0x800B63BC;
Camera_UpdateTank360 = 0x800B6848;
Camera_UpdateOnFoot360 = 0x800B6BFC;
Camera_SetStarfieldPos = 0x800B6F50;
Camera_Update360 = 0x800B7184;
Camera_Update = 0x800B71E4;
Camera_SetupLights = 0x800B73E0;
Play_UpdateLevel = 0x800B79B0;
Play_Update = 0x800B832C;
Play_SpawnVsItem = 0x800B852C;
func_play_800B86A4 = 0x800B86A4;
Play_SetupZPos360 = 0x800B86A4;
Play_Main = 0x800B86CC;
D_tank_800C9F2C = 0x800C9F2C;
linker_scripts/us/symbol_addrs_overlays.txt
+7 -7
View File
@@ -8,7 +8,7 @@ Venom1_80192CB0 = 0x80192CB0;//segment:ovl_i1
Venom1_80192EA4 = 0x80192EA4;//segment:ovl_i1
Venom1_801933B4 = 0x801933B4;//segment:ovl_i1
Venom1_Boss319_Init = 0x801935CC;//segment:ovl_i1
Venom1_80194398 = 0x80194398;//segment:ovl_i1
Venom1_Boss_Update = 0x80194398;//segment:ovl_i1
Venom1_801920F0 = 0x801920F0;//segment:ovl_i1
D_i1_8019A04C = 0x8019A04C; // size:0xC type:s16 segment:ovl_i1
D_i1_8019B6C0 = 0x8019B6C0;//segment:ovl_i1
@@ -58,22 +58,22 @@ D_menu_801AF274 = 0x801AF274; // type:f32 size:0x18 force_migration:True segment
Area6_801875E4 = 0x801875E4;//segment:ovl_i3
Area6_80187704 = 0x80187704;//segment:ovl_i3
Area6_BossA6_Init = 0x80187754;//segment:ovl_i3
Area6_80187944 = 0x80187944;//segment:ovl_i3
Area6_Boss_Update = 0x80187944;//segment:ovl_i3
Area6_8018A1B0 = 0x8018A1B0;//segment:ovl_i3
Area6_8018A2C4 = 0x8018A2C4;//segment:ovl_i3
Area6_8018A464 = 0x8018A464;//segment:ovl_i3
Area6_8018B9BC = 0x8018B9BC;//segment:ovl_i3
Area6_8018BCD4 = 0x8018BCD4;//segment:ovl_i3
Area6_8018C0D0 = 0x8018C0D0;//segment:ovl_i3
Area6_8018C54C = 0x8018C54C;//segment:ovl_i3
Zoness_801900FC = 0x801900FC;//segment:ovl_i3
Area6_Boss_Draw = 0x8018C54C;//segment:ovl_i3
Zoness_SpawnDebris = 0x801900FC;//segment:ovl_i3
Zoness_801915A4 = 0x801915A4;//segment:ovl_i3
Zoness_80191BB8 = 0x80191BB8;//segment:ovl_i3
Zoness_BossZo_Init = 0x801932AC;//segment:ovl_i3
Zoness_80193908 = 0x80193908;//segment:ovl_i3
Zoness_80193A98 = 0x80193A98;//segment:ovl_i3
Zoness_80193CC8 = 0x80193CC8;//segment:ovl_i3
Zoness_80194A84 = 0x80194A84;//segment:ovl_i3
Zoness_Boss_Update = 0x80194A84;//segment:ovl_i3
Zoness_801986FC = 0x801986FC;//segment:ovl_i3
Zoness_801989FC = 0x801989FC;//segment:ovl_i3
Zoness_80198BE8 = 0x80198BE8;//segment:ovl_i3
@@ -90,7 +90,7 @@ Zoness_8019B810 = 0x8019B810;//segment:ovl_i3
Zoness_8019C200 = 0x8019C200;//segment:ovl_i3
Zoness_Actor247_Init = 0x8019D060;//segment:ovl_i3
Solar_LevelComplete = 0x801A7930;//segment:ovl_i3
Aquas_801A9448 = 0x801A9448;//segment:ovl_i3
Aquas_SpawnDebris = 0x801A9448;//segment:ovl_i3
Aquas_801A94EC = 0x801A94EC;//segment:ovl_i3
Aquas_801A958C = 0x801A958C;//segment:ovl_i3
Aquas_801AC8A8 = 0x801AC8A8;//segment:ovl_i3
@@ -102,7 +102,7 @@ Aquas_801B0F88 = 0x801B0F88;//segment:ovl_i3
Aquas_801B0FCC = 0x801B0FCC;//segment:ovl_i3
Aquas_801B1008 = 0x801B1008;//segment:ovl_i3
Aquas_BossAq_Init = 0x801B10F8;//segment:ovl_i3
Aquas_801B134C = 0x801B134C;//segment:ovl_i3
Aquas_Boss_Update = 0x801B134C;//segment:ovl_i3
Aquas_801B6344 = 0x801B6344;//segment:ovl_i3
Aquas_801B638C = 0x801B638C;//segment:ovl_i3
Aquas_801B6E54 = 0x801B6E54;//segment:ovl_i3
src/audio/audio_general.c
+5 -5
View File
@@ -71,7 +71,7 @@ u8 sUsedChannelsPerBank[5][5] = {
};
u8 sSfxRequestWriteIndex = 0;
u8 sSfxRequestReadIndex = 0;
u8 sSfxChannelLayout = 0;
u8 sSfxChannelLayout = SFXCHAN_0;
u16 sChannelMuteFlags = 0;
f32 gDefaultSfxSource[3] = { 0.0f, 0.0f, 0.0f };
f32 gDefaultMod = 1.0f;
@@ -596,7 +596,7 @@ s8 Audio_GetSfxReverb(u8 bankId, u8 entryIndex, u8 channelId) {
}
s8 Audio_GetSfxPan(f32 xPos, f32 zPos, u8 mode) {
if (sSfxChannelLayout != 3) {
if (sSfxChannelLayout != SFXCHAN_3) {
f32 absx = ABSF(xPos);
f32 absz = ABSF(zPos);
f32 pan;
@@ -638,7 +638,7 @@ f32 Audio_GetSfxFreqMod(u8 bankId, u8 entryIndex) {
freqMod += 0.2f * (distance / 33000.0f);
}
}
if ((sSfxChannelLayout != 0) && (sSfxBanks[bankId][entryIndex].token & 2)) {
if ((sSfxChannelLayout != SFXCHAN_0) && (sSfxBanks[bankId][entryIndex].token & 2)) {
freqMod *= 1.1f;
}
return freqMod;
@@ -669,12 +669,12 @@ void Audio_SetSfxProperties(u8 bankId, u8 entryIndex, u8 channelId) {
reverb = Audio_GetSfxReverb(bankId, entryIndex, channelId);
freqMod = Audio_GetSfxFreqMod(bankId, entryIndex) * *entry->freqMod;
if (!((bankId == SFX_BANK_PLAYER) && ((-200.0f < *entry->zPos) && (*entry->zPos < 200.0f)) &&
(sSfxChannelLayout != 3))) {
(sSfxChannelLayout != SFXCHAN_3))) {
pan = Audio_GetSfxPan(*entry->xPos, *entry->zPos, entry->token);
}
break;
case SFX_BANK_SYSTEM:
if (sSfxChannelLayout == 3) {
if (sSfxChannelLayout == SFXCHAN_3) {
if (entry->token != 4) {
pan = (entry->token & 1) * 127;
}
src/engine/fox_360.c
+1 -1
View File
@@ -792,7 +792,7 @@ s32 func_360_8003049C(Actor* this) {
} else if (boss->obj.id == OBJ_BOSS_309) {
sp44 = 2000.0f;
var_ft5 = 750.0f;
} else if (boss->obj.id == OBJ_BOSS_317) {
} else if (boss->obj.id == OBJ_BOSS_KA_BASE) {
sp44 = 1500.0f;
var_ft5 = 700.0f;
}
src/engine/fox_beam.c
+379 -372
View File
File diff suppressed because it is too large Load Diff
src/engine/fox_boss.c
+7 -7
View File
@@ -32,7 +32,7 @@ void Boss_AwardBonus(Boss* boss) {
yOffset = 0.0f;
if (boss->obj.id == OBJ_BOSS_292) {
yOffset = 300.0f;
} else if (boss->obj.id == OBJ_BOSS_306) {
} else if (boss->obj.id == OBJ_BOSS_TI) {
yOffset = 200.0f;
}
BonusText_Display(boss->obj.pos.x, boss->obj.pos.y + yOffset, boss->obj.pos.z, bonus);
@@ -59,11 +59,11 @@ void Boss300_Update(Boss300* this) {
void Boss300_Draw(Boss300* this) {
}
void Boss_SetupActor189(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, f32 argA, s32 argB, s32 argC) {
void Boss_SetupDebris(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, f32 argA, s32 argB, s32 argC) {
Actor_Initialize(actor);
actor->obj.status = OBJ_INIT;
actor->obj.id = OBJ_ACTOR_189;
actor->obj.id = OBJ_ACTOR_DEBRIS;
actor->state = argB;
actor->obj.pos.x = arg1;
actor->obj.pos.y = arg2;
@@ -83,13 +83,13 @@ void Boss_SetupActor189(Actor* actor, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f3
}
}
void Boss_SpawnActor189(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, s32 argA, s32 argB) {
void Boss_SpawnDebris(f32 arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
f32 arg9, s32 argA, s32 argB) {
s32 i;
for (i = (ARRAY_COUNT(gActors)) - 1; i >= 0; i--) {
if (gActors[i].obj.status == OBJ_FREE) {
Boss_SetupActor189(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB);
Boss_SetupDebris(&gActors[i], arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, argA, argB);
return;
}
}
src/engine/fox_context.c
+1 -1
View File
@@ -88,7 +88,7 @@ LevelId gCurrentLevel;
s32 gLevelPhase;
s32 gBossActive;
s32 D_ctx_8017828C;
s32 D_ctx_80178294;
s32 gUseDynaFloor;
s32 gRadioState;
s32 gCurrentRadioPortrait;
s32 gRadioStateTimer;
src/engine/fox_demo.c
+49 -49
View File
@@ -521,7 +521,7 @@ void Cutscene_EnterWarpZone(Player* player) {
if (player->csTimer <= 100) {
if (player->csTimer == 100) {
func_play_800A6028(player->sfxSource, NA_SE_ARWING_WARP_DASH);
Play_PlaySfxFirstPlayer(player->sfxSource, NA_SE_ARWING_WARP_DASH);
player->unk_194 = 5.0f;
player->unk_190 = 5.0f;
}
@@ -589,7 +589,7 @@ void Cutscene_EnterWarpZone(Player* player) {
gLevelPhase = 1;
D_display_800CA230 = 0.15f;
AUDIO_PLAY_SFX(NA_SE_WARP_OUT, gDefaultSfxSource, 0);
func_play_800AB334();
Play_InitLevel();
}
}
break;
@@ -644,7 +644,7 @@ void Cutscene_LevelStart(Player* player) {
switch (gCurrentLevel) {
case LEVEL_CORNERIA:
Corneria_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_METEO:
@@ -657,7 +657,7 @@ void Cutscene_LevelStart(Player* player) {
case LEVEL_TITANIA:
Titania_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_ZONESS:
@@ -678,7 +678,7 @@ void Cutscene_LevelStart(Player* player) {
case LEVEL_VENOM_1:
Venom1_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_AQUAS:
@@ -694,22 +694,22 @@ void Cutscene_LevelStart(Player* player) {
switch (gCurrentLevel) {
case LEVEL_FORTUNA:
AllRange_FortunaIntro(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_VENOM_2:
Venom2_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_BOLSE:
Bolse_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_KATINA:
Katina_LevelStart(player);
func_play_800AA800(player);
Player_FloorCheck(player);
break;
case LEVEL_SECTOR_Z:
@@ -945,7 +945,7 @@ void Cutscene_AllRangeMode(Player* player) {
player->rockPhase += 8.0f;
player->rockAngle = SIN_DEG(player->rockPhase);
func_play_800AA800(player);
Player_FloorCheck(player);
}
void Cutscene_CoComplete2(Player* player) {
@@ -1307,7 +1307,7 @@ void Cutscene_CoComplete2(Player* player) {
case 1255:
player->csState = 3;
player->csTimer = 10;
func_play_800A6028(player->sfxSource, NA_SE_ARWING_BOOST);
Play_PlaySfxFirstPlayer(player->sfxSource, NA_SE_ARWING_BOOST);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 50);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 50);
break;
@@ -1371,27 +1371,27 @@ void Cutscene_LevelComplete(Player* player) {
Area6_LevelComplete(player);
} else if (gCurrentLevel == LEVEL_FORTUNA) {
Cutscene_FortunaComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_BOLSE) {
Bolse_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_SECTOR_Z) {
SectorZ_LevelComplete(player);
} else if (gCurrentLevel == LEVEL_KATINA) {
Katina_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_SECTOR_Y) {
SectorY_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_SOLAR) {
Solar_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_ZONESS) {
Zoness_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_VENOM_2) {
Venom2_LevelComplete(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else if (gCurrentLevel == LEVEL_METEO) {
if (gLevelPhase == 0) {
Meteo_LevelComplete(player);
@@ -1400,15 +1400,15 @@ void Cutscene_LevelComplete(Player* player) {
}
} else if ((gCurrentLevel == LEVEL_CORNERIA) && (gLevelMode == LEVELMODE_ALL_RANGE)) {
Corneria_LevelComplete1(player);
func_play_800AA800(player);
Player_FloorCheck(player);
} else {
if (gCsFrameCount == 170) {
AUDIO_PLAY_BGM(SEQ_ID_GOOD_END);
}
Cutscene_CoComplete2(player);
func_play_800AA800(player);
Player_FloorCheck(player);
}
func_play_800B2130(player);
Player_UpdateArwingRoll(player);
break;
case FORM_LANDMASTER:
@@ -1514,7 +1514,7 @@ void Cutscene_UTurn(Player* player) {
player->zRotBank = -180.0f;
}
player->csState = 3;
func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
Player_PlaySfx(player->sfxSource, NA_SE_ARWING_BOOST, player->num);
player->unk_194 = 7.0f;
player->unk_190 = 7.0f;
}
@@ -1587,11 +1587,11 @@ void Cutscene_UTurn(Player* player) {
player->pos.z += player->vel.z;
player->trueZpos = player->pos.z;
func_play_800B2574(player);
func_play_800B2130(player);
func_play_800AD7F0(player);
func_play_800AA800(player);
func_play_800A46A0(player);
Player_ArwingBoost(player);
Player_UpdateArwingRoll(player);
Player_Shoot(player);
Player_FloorCheck(player);
Player_DamageEffects(player);
}
void func_demo_8004D3C8(s32 arg0) {
@@ -1612,7 +1612,7 @@ void Cutscene_KillPlayer(Player* player) {
Audio_StopPlayerNoise(player->num);
Audio_KillSfxBySourceAndId(player->sfxSource, NA_SE_ARWING_DOWN);
func_play_800A5FA0(player->sfxSource, NA_SE_ARWING_EXPLOSION, player->num);
Player_PlaySfx(player->sfxSource, NA_SE_ARWING_EXPLOSION, player->num);
player->state_1C8 = PLAYERSTATE_1C8_NEXT;
player->csTimer = 70;
player->timer_224 = 20;
@@ -1653,11 +1653,11 @@ void Cutscene_KillPlayer(Player* player) {
gLifeCount[gPlayerNum] -= 1;
}
} else {
if (player->unk_288 > 0) {
D_ctx_80177DD0[player->unk_288 - 1][D_ctx_80177DB8[player->unk_288 - 1]] = player->num;
D_ctx_80177DB8[player->unk_288 - 1] += 1;
if (gVsPointsToWin == D_ctx_80177DB8[player->unk_288 - 1]) {
player->unk_288 = -1;
if (player->attacker > 0) {
D_ctx_80177DD0[player->attacker - 1][D_ctx_80177DB8[player->attacker - 1]] = player->num;
D_ctx_80177DB8[player->attacker - 1] += 1;
if (gVsPointsToWin == D_ctx_80177DB8[player->attacker - 1]) {
player->attacker = -1;
if (player->unk_284 == 0) {
func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 1000);
}
@@ -1728,7 +1728,7 @@ void func_demo_8004D828(Player* player) {
player->vel.y = 10.0f;
player->csState = 1;
func_play_800A6070(player->sfxSource, NA_SE_EXPLOSION_S);
Play_PlaySfxNoPlayer(player->sfxSource, NA_SE_EXPLOSION_S);
if ((gCurrentLevel == LEVEL_CORNERIA) || (gCurrentLevel == LEVEL_FORTUNA)) {
func_enmy_80062C38(player->pos.x, player->pos.z);
@@ -1737,12 +1737,12 @@ void func_demo_8004D828(Player* player) {
}
if (player->wings.rightState == WINGSTATE_INTACT) {
func_play_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z);
Play_SpawnDebris(1, player->hit1.x, player->hit1.y, player->hit1.z);
player->wings.rightState = WINGSTATE_BROKEN;
func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
}
if (player->wings.leftState == WINGSTATE_INTACT) {
func_play_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z);
Play_SpawnDebris(0, player->hit2.x, player->hit2.y, player->hit2.z);
player->wings.leftState = WINGSTATE_BROKEN;
func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f);
}
@@ -1759,11 +1759,11 @@ void func_demo_8004D828(Player* player) {
}
if (gLevelType == LEVELTYPE_PLANET) {
for (i = 0; i < 4; i++) {
func_play_800A69F8(2, player->pos.x, player->pos.y, player->trueZpos);
Play_SpawnDebris(2, player->pos.x, player->pos.y, player->trueZpos);
}
for (i = 0; i < 2; i++) {
func_play_800A69F8(3, player->pos.x, player->pos.y, player->trueZpos);
Play_SpawnDebris(3, player->pos.x, player->pos.y, player->trueZpos);
}
}
func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 5.0f);
@@ -1790,14 +1790,14 @@ void func_demo_8004D828(Player* player) {
if ((gLevelType == LEVELTYPE_PLANET) || (gCurrentLevel == LEVEL_BOLSE)) {
player->cam.eye.y = (player->pos.y * player->unk_148) + dest.y;
player->cam.eye.y -= player->unk_02C - 50.0f;
player->cam.at.y = (player->pos.y * player->unk_14C) + 20.0f + (player->unk_060 * 5.0f);
player->cam.at.y = (player->pos.y * player->unk_14C) + 20.0f + (player->xRock * 5.0f);
} else {
player->cam.eye.y = player->pos.y + dest.y;
player->cam.at.y = player->pos.y;
}
if (gVersusMode != 0) {
func_play_800AE278(player);
Player_CheckBounds360(player);
}
}
@@ -1838,19 +1838,19 @@ void func_demo_8004DEF8(Player* player) {
player->radioDamageTimer = 0;
player->vel.y = 10.0f;
player->csState = 1;
func_play_800A6070(player->sfxSource, NA_SE_EXPLOSION_S);
Play_PlaySfxNoPlayer(player->sfxSource, NA_SE_EXPLOSION_S);
if (gCurrentLevel == LEVEL_CORNERIA) {
func_enmy_80062C38(player->pos.x, player->pos.z);
}
if (player->wings.rightState == WINGSTATE_INTACT) {
func_play_800A69F8(1, player->hit1.x, player->hit1.y, player->hit1.z);
Play_SpawnDebris(1, player->hit1.x, player->hit1.y, player->hit1.z);
player->wings.rightState = WINGSTATE_NONE;
func_effect_8007D0E0(player->hit1.x, player->hit1.y, player->hit1.z, 2.0f);
}
if (player->wings.leftState == WINGSTATE_INTACT) {
func_play_800A69F8(0, player->hit2.x, player->hit2.y, player->hit2.z);
Play_SpawnDebris(0, player->hit2.x, player->hit2.y, player->hit2.z);
player->wings.leftState = WINGSTATE_NONE;
func_effect_8007D0E0(player->hit2.x, player->hit2.y, player->hit2.z, 2.0f);
}
@@ -1867,11 +1867,11 @@ void func_demo_8004DEF8(Player* player) {
0.0f, 0.0f, 0.0f, 3.0f, 20);
if (gLevelType == LEVELTYPE_PLANET) {
for (i = 0; i < 2; i++) {
func_play_800A69F8(2, player->pos.x, player->pos.y, player->trueZpos);
Play_SpawnDebris(2, player->pos.x, player->pos.y, player->trueZpos);
}
for (i = 0; i < 4; i++) {
func_play_800A69F8(4, player->pos.x, player->pos.y, player->trueZpos);
Play_SpawnDebris(4, player->pos.x, player->pos.y, player->trueZpos);
}
}
Cutscene_KillPlayer(player);
@@ -1903,10 +1903,10 @@ void Cutscene_PlayerDown(Player* player) {
func_demo_8004D828(player);
} else {
func_demo_8004DEF8(player);
func_play_800ADF58(player);
Player_UpdatePath(player);
}
func_play_800A8BA4(player);
func_play_800AA800(player);
Player_CollisionCheck(player);
Player_FloorCheck(player);
break;
case FORM_LANDMASTER:
@@ -2111,7 +2111,7 @@ void func_demo_8004EBD0(ActorCutscene* this) {
if (this->timer_0BC == 0) {
this->state++;
this->timer_0BC = 10;
func_play_800A6028(this->sfxSource, NA_SE_ARWING_BOOST);
Play_PlaySfxFirstPlayer(this->sfxSource, NA_SE_ARWING_BOOST);
this->fwork[29] = 5.0f;
}
break;

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