Sector Z, Fortuna & General Docs (#261)

* Sector Z Docs initial

* Sector Z docs

* some other things

* correction

* Space Junk

* SectorZ_SetLevelObjects

* rename assets with correct prefix

* aSzBackgroundTex

* details

* pr review

* Sector X initials

* Meteo Initials

* Sector X things I forgot

* fox_tr360 & fox_ve1 & fox_so initials

* fox_so details

* Zones initials

* More Zones initials

* more zones initials

* area 6 initials

* fortuna inits

* fortuna actors

* some more docs

* more docs for Fortuna

* fix mistake in data incorrectly imported

* Fortuna Radars

* BossFO

* Sector Y Initials

* Venom 2 general Docs

* Some Corneria Docs

* Actor, Scenery and Boss IDs in update and draw functions of gObjectInfo

* more docs and this usage

* fox_360 this usage

* more actor types and this usages

* fox_effect type usage

* training docs

* some Sector X docs

* fix incorrect usage of "this"

* fix comment

* more docs

* funcNames

* fox_bg spacing

* boolean

* scenery corneria bumbs

* terrain bumps

* corneria arch

* more corneria objects

* hitboxes

* more corneria objects

* more corneria level objects

* more corneria objects

* aCoWaterfallDL

* corneria docs

* more corneria docs

* Granga swork start

* corneria swork

* Corneria

* Corneria Granga docs

* more granga docs

* granga work buffer enum

* CarrierParts enum use

* option

* Corneria Docs

* GRANGA_FWK

* fox_co.h header

* fix Fault_FillRectangle typo

* PR reviews

* sCsTeamInitialPos

* Doodad
This commit is contained in:
Alejandro Asenjo Nitti
2024-07-06 09:47:49 -03:00
committed by GitHub
parent 24e316a2b2
commit c348962cab
75 changed files with 14011 additions and 12859 deletions
+162
View File
@@ -0,0 +1,162 @@
#ifndef FOX_CO_H
#define FOX_CO_H
// Granga Boss:
#define DMG_FLICKER_5 (5) // Damage indicator flickers for 5 frames
#define DMG_FLICKER_15 (15) // Damage indicator flickers for 15 frames
#define DMG_DESTROYED (1000) // Damage part is destroyed
typedef enum GrangaStates {
/* 0 */ GRANGA_STATIONARY,
/* 1 */ GRANGA_STATE_1,
/* 2 */ GRANGA_STATE_2,
/* 3 */ GRANGA_STATE_3,
/* 4 */ GRANGA_STATE_4,
/* 5 */ GRANGA_STATE_5,
/* 6 */ GRANGA_STATE_6,
/* 7 */ GRANGA_STATE_7,
} GrangaStates;
typedef enum GrangaWork {
/* 00 */ GRANGA_WORK_00, // x of missiles launched from it's right arm ?
/* 01 */ GRANGA_WORK_01, // y of missiles launched from it's right arm ?
/* 02 */ GRANGA_WORK_02, // z of missiles launched from it's right arm ?
/* 03 */ GRANGA_WORK_03, // x of something // destroy effect related?
/* 04 */ GRANGA_WORK_04, // y of something // destroy effect related?
/* 05 */ GRANGA_WORK_05, // z of something // destroy effect related?
/* 06 */ GRANGA_WORK_06, // x of missiles launched from it's left arm ?
/* 07 */ GRANGA_WORK_07, // y of missiles launched from it's left arm ?
/* 08 */ GRANGA_WORK_08, // z of missiles launched from it's left arm ?
/* 09 */ GRANGA_WORK_09,
/* 10 */ GRANGA_WORK_10,
/* 11 */ GRANGA_WORK_11,
/* 12 */ GRANGA_WORK_12,
/* 13 */ GRANGA_WORK_13,
/* 14 */ GRANGA_WORK_14,
/* 15 */ GRANGA_WORK_15,
/* 16 */ GRANGA_WORK_16, // yRot of missiles launched from both arms ?
/* 17 */ GRANGA_WORK_17, // x of something
/* 18 */ GRANGA_WORK_18, // y of something
/* 19 */ GRANGA_WORK_19, // z of something
/* 20 */ GRANGA_WORK_20,
/* 21 */ GRANGA_WORK_21,
/* 22 */ GRANGA_WORK_22,
/* 23 */ GRANGA_WORK_23,
/* 24 */ GRANGA_WORK_24,
/* 25 */ GRANGA_WORK_25,
/* 26 */ GRANGA_WORK_26,
/* 27 */ GRANGA_WORK_27,
/* 28 */ GRANGA_WORK_28,
/* 29 */ GRANGA_WORK_29,
/* 30 */ GRANGA_WORK_30,
/* 31 */ GRANGA_WORK_31,
/* 32 */ GRANGA_WORK_32,
/* 33 */ GRANGA_WORK_33,
/* 34 */ GRANGA_WORK_34,
/* 35 */ GRANGA_WORK_35,
/* 36 */ GRANGA_WORK_36,
/* 37 */ GRANGA_WORK_37,
/* 38 */ GRANGA_WORK_38,
/* 39 */ GRANGA_WORK_39,
/* 40 */ GRANGA_WORK_40,
/* 41 */ GRANGA_WORK_41,
/* 42 */ GRANGA_WORK_42,
/* 43 */ GRANGA_WORK_43,
/* 44 */ GRANGA_WORK_44,
/* 45 */ GRANGA_WORK_45,
/* 46 */ GRANGA_WORK_46,
/* 47 */ GRANGA_WORK_47,
/* 48 */ GRANGA_WORK_48,
/* 49 */ GRANGA_WORK_49,
/* 50 */ GRANGA_WORK_50,
/* 51 */ GRANGA_WORK_51,
/* 52 */ GRANGA_WORK_52,
/* 53 */ GRANGA_WORK_53,
/* 54 */ GRANGA_WORK_54,
/* 55 */ GRANGA_WORK_55,
/* 56 */ GRANGA_WORK_56,
/* 57 */ GRANGA_WORK_57,
/* 58 */ GRANGA_WORK_58,
/* 59 */ GRANGA_WORK_59,
/* 60 */ GRANGA_WORK_60,
/* 61 */ GRANGA_WORK_61,
/* 62 */ GRANGA_WORK_62, // x
/* 63 */ GRANGA_WORK_63, // y
/* 64 */ GRANGA_WORK_64, // z
/* 65 */ GRANGA_WORK_65,
/* 66 */ GRANGA_WORK_66, // xTargetPos ?
/* 67 */ GRANGA_WORK_67 // zTargetPos ?
} GrangaWork;
typedef enum GrangaSwork {
/* 00 */ GRANGA_SWK_0,
// Damage indicators, one per limb
/* 01 */ GRANGA_RIGHT_ARM_DMG_IND,
/* 02 */ GRANGA_LEFT_ARM_DMG_IND,
/* 03 */ GRANGA_GUN_DMG_IND,
/* 04 */ GRANGA_RIGHT_LEG_DMG_IND,
/* 07 */ GRANGA_LEFT_LEG_DMG_IND = 7,
/* 10 */ GRANGA_BACKPACK_DMG_IND = 10,
/* 18 */ GRANGA_SWK_18 = 18,
/* 19 */ GRANGA_SWK_19,
/* 20 */ GRANGA_SWK_20,
/* 21 */ GRANGA_SWK_21,
/* 22 */ GRANGA_SWK_22,
/* 23 */ GRANGA_SWK_23,
/* 24 */ GRANGA_LEFT_LEG_HP,
/* 25 */ GRANGA_RIGHT_LEG_HP,
/* 26 */ GRANGA_LEFT_ARM_HP,
/* 27 */ GRANGA_RIGHT_ARM_HP,
/* 28 */ GRANGA_PLASMA_GUN_HP,
/* 29 */ GRANGA_BACKPACK_HP,
/* 30 */ GRANGA_ATTACK_STATE,
/* 31 */ GRANGA_NEXT_STATE,
/* 32 */ GRANGA_SWK_32,
/* 33 */ GRANGA_INIT,
/* 35 */ GRANGA_MISSILE_COUNT = 35,
/* 36 */ GRANGA_1UP_CHECK
} GrangaSwork;
typedef enum GrangaFwork {
/* 00 */ GRANGA_FWK_00,
/* 01 */ GRANGA_FWK_01,
/* 02 */ GRANGA_FWK_02,
/* 03 */ GRANGA_FWK_03,
/* 04 */ GRANGA_FWK_04,
/* 12 */ GRANGA_FWK_12 = 12,
/* 13 */ GRANGA_FWK_13,
/* 14 */ GRANGA_FWK_14,
} GrangaFwork;
typedef enum GrangaDmgParts {
/* 0 */ GRANGA_DMG_BACKPACK,
/* 1 */ GRANGA_DMG_LEFT_ARM,
/* 2 */ GRANGA_DMG_RIGHT_ARM,
/* 3 */ GRANGA_DMG_GUN,
/* 4 */ GRANGA_DMG_LEFT_LEG,
/* 5 */ GRANGA_DMG_RIGHT_LEG,
} GrangaDmgParts;
typedef enum GrangaAttackState {
/* 0 */ GRANGA_ATTACK_IDLE,
/* 1 */ GRANGA_ATTACK_MISSILES,
/* 2 */ GRANGA_ATTACK_LASERS,
/* 3 */ GRANGA_ATTACK_PLASMA,
} GrangaAttackState;
// Carrier Boss:
typedef enum CoCarrierParts {
/* 0 */ CARRIER_0,
/* 1 */ CARRIER_1,
/* 2 */ CARRIER_2,
/* 3 */ CARRIER_3
} CarrierParts;
#endif
+120 -119
View File
@@ -25,7 +25,7 @@ void ActorAllRange_SetShadowData(Actor* this);
void ActorAllRange_SpawnTeam(void);
void ActorAllRange_PlayMessage(u16* msg, RadioCharacterId character);
void ActorAllRange_UpdateStarWolfEvents(Actor*);
void ActorAllRange_UpdateEvemyEvents(Actor*);
void ActorAllRange_UpdateEnemyEvents(Actor*);
void ActorAllRange_ApplyDamage(Actor*);
bool func_360_80031900(Actor*);
void ActorAllRange_Update(Actor* this);
@@ -50,7 +50,7 @@ void Background_dummy_80040CDC(void);
void Background_DrawGround(void);
// fox_boss
void Boss_AwardBonus(Boss* boss);
void Boss_AwardBonus(Boss* this);
void Boss299_Init(Boss* boss);
void Boss299_Update(Boss* boss);
void Boss299_Draw(Boss* boss);
@@ -92,10 +92,10 @@ void func_display_80057814(Player*);
void Play_Draw(void);
// fox_edata
void func_edata_800594F0(Scenery*);
void func_edata_800595D0(Scenery*);
void Scenery48_Draw(Scenery*);
void Scenery49_Draw(Scenery*);
void Object_ApplyWaterDistortion(void);
void func_edata_800596B0(Actor*);
void Actor289_Draw(Actor*);
// fox_edisplay
void Graphics_SetScaleMtx(f32);
@@ -104,22 +104,22 @@ void Actor201_Draw(Actor*);
void Actor202_Draw(Actor*);
void MeteoTunnel_Draw(Scenery*);
void Scenery_DrawTitaniaBones(Scenery*);
void Scenery42_Draw(Scenery*);
void CoIBeam_Draw(Scenery*);
void Actor196_Draw(Actor*);
void Sprite167_Draw(Sprite*);
void FogShadow_Draw(Sprite*);
void func_edisplay_80059F68(Scenery*);
void func_edisplay_80059FDC(Scenery*);
void CoBuilding9_Draw(Scenery*);
void CoBuilding10_Draw(Scenery*);
void ActorDebris_Draw(Actor*);
void Actor_DrawEngineAndContrails(Actor*);
void Actor_DrawEngineGlow(Actor*, s32);
void func_edisplay_8005B388(Actor*);
void func_edisplay_8005B6A4(Actor*);
void func_edisplay_8005B71C(Actor*);
void func_edisplay_8005B7CC(Actor*);
void func_edisplay_8005B848(Actor*);
void func_edisplay_8005B9A4(Actor*);
void func_edisplay_8005BA30(Actor*);
void Actor180_Draw(Actor*);
void Actor182_Draw(Actor*);
void Actor186_Draw(Actor*);
void Actor190_191_Draw(Actor*);
void Actor192_Draw(Actor*);
void Actor193_Draw(Actor*);
void ItemCheckpoint_Draw(Item*);
void ItemSilverRing_Draw(Item*);
void ItemSilverStar_Draw(Item*);
@@ -160,20 +160,20 @@ void func_enmy_80062C38(f32, f32);
bool Object_CheckHitboxCollision(Vec3f* pos, f32* hitboxData, Object* obj, f32 xRot, f32 yRot, f32 zRot);
bool Object_CheckSingleHitbox(Vec3f*, f32*, Vec3f*);
bool Object_CheckPolyCollision(Vec3f* , Vec3f* , ObjectId , Object* );
s32 Object_CheckCollision(s32 , Vec3f* , Vec3f* , s32 );
s32 Object_CheckCollision(s32 index, Vec3f* pos, Vec3f* vel, s32 mode);
void Scenery_UpdateTitaniaBones(Scenery*);
void func_enmy_800654E4(Object*);
void func_enmy_800656D4(Actor*);
void Actors190_191_Update(Actor*);
void func_enmy_800660F0(Actor*);
void Actor_Despawn(Actor*);
void func_enmy_8006654C(Actor*);
void Actor192_Update(Actor*);
void func_enmy_8006684C(Actor*);
void func_enmy_800669A0(Actor*);
void func_enmy_80066A80(Actor*);
void Actor193_Update(Actor*);
void Actor180_Update(Actor*);
void func_enmy_80066C00(Scenery*);
void func_enmy_80066D5C(Scenery*);
void CoBuilding9_Update(Scenery*);
void Sprite167_Update(Sprite*);
void func_enmy_80066EA8(Scenery*);
void SceneryRotateTowardsCamera(Scenery*);
void Item_CheckBounds(Item*);
void Item_SpinPickup(Item*);
void Actor_SpawnDebris70(f32, f32, f32, f32, f32, f32, f32, f32);
@@ -212,18 +212,19 @@ void Object_Update(void);
//fox_enmy2
void Actor237_Update(Actor*);
void Actor237_Draw(Actor*);
void Scenery54_Update(Scenery*);
void CoWaterfall_Update(Scenery*);
void Actor201_Update(Actor*);
void Actor202_Update(Actor*);
void Actor194_Update(Actor*);
void Actor194_Dying(Actor*);
void Actor194_Draw(Actor*);
void Scenery42_Update(Scenery*);
void CoIBeam_Update(Scenery*);
void Actor196_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);
void Actor_SpawnPlayerLaser(s32 actorId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot,
f32 zRot);
void Actor_SpawnGreatFoxLaser(s32 actorId, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 xRot, f32 yRot,
f32 zRot);
void ActorEvent_SpawnEffect347(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
@@ -243,78 +244,78 @@ void BonusText_Update(void);
void BonusText_DrawAll(void);
Effect* func_effect_8007783C(ObjectId objId);
void func_effect_8007797C(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
void func_effect_80077A00(Effect* );
void func_effect_80077A7C(Effect* );
void func_effect_80077B78(Effect* );
void func_effect_80077B84(Effect* );
void func_effect_80078038(Effect* );
void func_effect_800780F8(Effect* );
void func_effect_800783C0(Effect* );
void func_effect_80078438(Effect* );
void func_effect_800784B4(Effect* );
void func_effect_80078550(Effect* );
void func_effect_80078604(Effect* );
void func_effect_8007868C(Effect* );
void func_effect_8007879C(Effect* );
void func_effect_800788B0(Effect* );
void func_effect_80078A64(Effect* );
void func_effect_80078AEC(Effect* );
void func_effect_80078B8C(Effect*);
void func_effect_80078BE0(Effect* );
void func_effect_80078C84(Effect* );
void func_effect_80078CE8(Effect* );
void Effect_Effect372_Draw(Effect* );
void Effect_Effect382_Draw(Effect* );
void Effect_Effect388_Draw(Effect* );
void Effect_Effect384_Draw(Effect* );
void Effect_Effect385_Draw(Effect* );
void Effect_Effect389_Draw(Effect* );
void Effect_Effect347_Draw(Effect* );
void Effect_Effect351_Draw(Effect* );
void Effect_Clouds_Draw(Effect* );
void Effect_Effect366_Draw(Effect* );
void Effect_Effect367_Draw(Effect* );
void Effect_Effect344_Draw(Effect* );
void Effect_Effect345_Draw(Effect* );
void Effect_Effect346_Draw(Effect* );
void Effect_Effect348_Draw(Effect* );
void Effect_Effect355_Draw(Effect* );
void Effect_Effect353_Draw(Effect*);
void Macbeth_Effect377_Draw(Effect* );
void Effect_Effect356_Draw(Effect* );
void Macbeth_Effect376_Draw(Effect* );
void func_effect_80078E50(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_80078EBC(Effect* );
void func_effect_80078F78(Effect* );
void Effect_Effect393_Update(Effect* );
void Effect_Effect393_Draw(Effect* );
void func_effect_800794CC(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007953C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_800795AC(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_80079618(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007968C(Effect*);
void func_effect_800798F0(Effect* );
void func_effect_8007A28C(Effect* );
void func_effect_8007A3C0(Effect* );
void Effect_Effect357_Update(Effect*);
void Effect_Effect357_Draw(Effect* );
void Effect_Effect383_Update(Effect* );
void Effect_Effect383_Draw(Effect* );
void func_effect_8007A568(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
void func_effect_8007A5F8(Effect* , Vec3f* pos, u32 sfxId);
void func_effect_8007A6F0(Vec3f* pos, s32 sfxId);
void func_effect_8007A748(Effect*);
void Effect_SetupTimedSfxAtPos(Effect* , Vec3f* pos, u32 sfxId);
void Effect_SpawnTimedSfxAtPos(Vec3f* pos, s32 sfxId);
void Effect_TimedSfx_Update(Effect*);
bool func_effect_8007A774(Player*, Effect*, f32);
void func_effect_8007A900(f32 xPos, f32 yPos, f32 zPos, f32 scale1, u8, u8, u16);
void func_effect_8007A994(Effect*);
void func_effect_8007AA60(Effect*);
void func_effect_8007AB50(Effect*);
void Effect_Effect359_Update(Effect359*);
void Effect_Effect359_Draw(Effect*);
void Effect_Effect372_Update(Effect*);
void func_effect_8007ACE0(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, f32 yRot);
void func_effect_8007ADF4(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1);
void func_effect_8007AFD0(f32 xPos, f32 zPos, f32 xVel, f32 zVel, f32 scale1);
void func_effect_8007B040(Effect*);
void func_effect_8007B0F4(Effect*);
void Effect_Effect382_Update(Effect*);
void Effect_Effect381_Update(Effect*);
void func_effect_8007B228(f32 xPos, f32 yPos, f32 zPos, f32 scale1);
void func_effect_8007B344(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
void func_effect_8007B3B8(Effect*);
void Effect_Effect384_Update(Effect*);
void func_effect_8007B550(f32 xPos, f32 yPos, f32 zPos, f32 scale1, s32 );
void func_effect_8007B5C0(Effect*);
void func_effect_8007B62C(Effect*);
void func_effect_8007B670(Effect*);
void func_effect_8007B67C(Effect*);
void func_effect_8007B758(Effect*);
void Effect_Effect385_Update(Effect*);
void Effect_Clouds_Update(Effect*);
void Effect_Effect388_Update(Effect*);
void Effect_Effect389_Update(Effect*);
void Effect_Effect347_Update(Effect*);
void func_effect_8007B8F8(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007B960(Effect*);
void Effect_Effect364_Update(Effect*);
void func_effect_8007BC7C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007BCE8(Effect*);
void func_effect_8007B9DC(Effect*);
void func_effect_8007BDE0(Effect*);
void func_effect_8007BE54(Effect*);
void func_effect_8007BEE8(Effect*);
void Effect_Effect362_Update(Effect*);
void Effect_Effect364_Draw(Effect*);
void Effect_Effect361_Update(Effect*);
void Effect_Effect360_Update(Effect*);
void Effect_Effect360_361_362_Draw(Effect*);
void func_effect_8007BFFC(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
void func_effect_8007C120(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 timer50);
void func_effect_8007C250(Effect*);
void Effect_Effect386_Update(Effect*);
void func_effect_8007C484(f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 scale2, s32 arg7);
void func_effect_8007C50C(Effect*);
void Effect_Effect390_Update(Effect*);
void func_effect_8007C688(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 timer50);
void func_effect_8007C8C4(Effect*);
void Effect_Effect387_Update(Effect*);
void func_effect_8007C85C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007C9E0(Effect*);
void func_effect_8007CAF0(Effect*);
void Effect_Effect343_Update(Effect*);
void Effect_Effect343_Draw(Effect*);
void func_effect_8007CF30(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D074(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D0E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
@@ -322,54 +323,54 @@ void func_effect_8007D10C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D1E0(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D24C(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D2C8(f32 xPos, f32 yPos, f32 zPos, f32 scale2);
void func_effect_8007D2F4(Effect*);
void func_effect_8007D55C(Effect*);
void func_effect_8007D748(Effect*);
void func_effect_8007D8A8(Effect*);
void Effect_Effect339_Update(Effect*);
void Effect_FireSmoke_Draw(Effect*);
void Effect_Effect340_Update(Effect*);
void Effect_Effect341_Update(Effect*);
void func_effect_8007D9DC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, f32 scale1, s32 timer50);
void func_effect_8007DA58(Effect*);
void func_effect_8007DAE4(Effect*);
void func_effect_8007DB70(Effect*);
void func_effect_8007DED4(Effect*);
void func_effect_8007E014(Effect*);
void func_effect_8007E258(Effect*);
void func_effect_8007E298(Effect*);
void func_effect_8007E330(Effect*);
void func_effect_8007E3E4(Effect*);
void func_effect_8007E45C(Effect*);
void func_effect_8007E5CC(Effect*);
void func_effect_8007E648(Effect*);
void func_effect_8007E93C(Effect* effect, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 speed);
void Effect_Effect375_Update(Effect*);
void Macbeth_Effect375_Draw(Effect*);
void Effect_Effect374_Update(Effect*);
void Macbeth_Effect374_Draw(Effect*);
void Effect_Effect344_Update(Effect*);
void Effect_Effect345_Update(Effect*);
void Effect_Effect342_Update(Effect*);
void Effect_Effect342_Draw(Effect*);
void Effect_Effect351_Update(Effect*);
void Effect_Effect365_Update(Effect*);
void Effect_Effect365_Draw(Effect*);
void Effect_Effect367_Update(Effect*);
void func_effect_8007E93C(Effect* this, u32 objId, f32 xPos, f32 yPos, f32 zPos, f32 speed);
void func_effect_8007EE68(ObjectId objId, Vec3f* pos, Vec3f* rot, Vec3f* arg3, Vec3f* arg4, f32 scale2);
void func_effect_8007F04C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 xRot, f32 yRot, f32 zRot, f32 unkX, f32 unkY, f32 unkZ, f32 xVel, f32 yVel, f32 zVel, f32 scale2);
void func_effect_8007F11C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 speed);
void Effect_EnemyLaser(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 speed);
void func_effect_8007F20C(ObjectId objId, f32 xPos, f32 yPos, f32 zPos, f32 speed);
void func_effect_8007F438(Effect*);
void func_effect_8007F6B0(Effect*);
void func_effect_8007F958(Effect*);
void func_effect_8007FBE0(Effect*);
void func_effect_8007FE88(Effect*);
void Effect_Effect346_Update(Effect*);
void Effect_Effect348_Update(Effect*);
void Effect_Effect349_Update(Effect*);
void Effect_Effect350_Update(Effect*);
void Effect_Effect353_354_Update(Effect*);
bool func_effect_8007FD84(Effect*);
void func_effect_800802B8(Effect*);
void func_effect_800802D8(Effect*);
void func_effect_800802F8(Effect*);
void func_effect_80080360(Effect*);
void func_effect_8008040C(Effect*);
void func_effect_8008092C(Effect*);
void func_effect_80080ACC(Effect*);
void func_effect_80080D04(Effect*);
void Effect_Effect355_Update(Effect*);
void Effect_Effect377_Update(Effect*);
void Effect_Effect356_Update(Effect*);
void Effect_Effect376_Update(Effect*);
void Effect_Effect398_Update(Effect*);
void Effect_Effect398_Draw(Effect*);
void Effect_Effect394_Update(Effect*);
void Effect_Effect394_Draw(Effect*);
void func_effect_800815DC(void);
void func_effect_80081A8C(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
void func_effect_80081BEC(f32 xPos, f32 yPos, f32 zPos, f32 scale2, s32 arg4);
void func_effect_80081C5C(Effect*);
void func_effect_80082F78(Effect*);
void Effect_Effect395_Update(Effect*);
void Effect_Effect395_Draw(Effect*);
void func_effect_8008377C(f32, f32, f32, f32, f32);
void func_effect_800837EC(Effect*);
void func_effect_80083B8C(Effect*);
void func_effect_80083C70(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8);
void Effect_Effect391_Update(Effect*);
void Effect_Effect391_Draw(Effect*);
void func_effect_80083C70(Effect* this, f32 xPos, f32 yPos, f32 zPos, f32 xVel, f32 yVel, f32 zVel, f32 arg7, s32 arg8);
void func_effect_80083D2C(f32 xPos, f32 yPos, f32 zPos, f32 srcZ);
void func_effect_80083FA8(Effect*);
void func_effect_80084194(Effect*);
void Effect_Effect399_Update(Effect*);
void Effect_Effect399_Draw(Effect*);
// fox_fade
void Wipe_Draw(WipeMode mode, s32 frame);
@@ -385,7 +386,7 @@ void func_hud_80087530(f32, f32, s32);
void func_hud_800884E4(void);
void func_hud_80088564(void);
void HUD_DrawStatusScreens(void);
s32 func_hud_8008AC54(s32);
s32 Hud_MissileSeekModeCheck(s32);
void func_hud_8008AD94(void);
void func_hud_8008B5B0(f32 x, f32 y);
s32 func_hud_8008B774(void);
@@ -419,8 +420,8 @@ void func_hud_800953A0(Actor*, s32);
void func_hud_8009546C(Actor*, s32);
void func_hud_80095538(Actor*, s32);
void HUD_AquasComplete(Player*);
void func_hud_80094954(Effect*);
void func_hud_80094BBC(Effect*);
void Hud_Effect363_Update(Effect*);
void Hud_Effect363_Draw(Effect*);
void func_hud_80094D20(f32, f32);
void func_hud_80096A74(Player* player);
@@ -465,12 +466,12 @@ 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_FollowPlayer(Player*, s32 , bool);
void Camera_UpdateArwing360(Player*, bool);
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_Update360(Player*, bool);
void Camera_SetupLights(Player*);
void Play_SpawnVsItem(ObjectId , Item*);
void Play_Main(void);
+37 -37
View File
@@ -14,50 +14,50 @@ extern void Corneria_LevelStart(Player*);
extern void Corneria_LevelComplete1(Player*);
extern void Venom1_LevelStart(Player*);
void Corneria_801875A4(Sprite*);
void Corneria_80189058(Boss*);
void Corneria_8018AA74(Boss*);
void Corneria_8018AED0(Actor*);
void Corneria_8018B15C(Actor*);
void Corneria_8018B418(Actor*);
void Corneria_8018B58C(Actor*);
void Corneria_8018BAAC(Actor*);
void Corneria_8018BBA4(Actor*);
void Corneria_8018BBF8(Actor*);
void Corneria_8018BD7C(Actor*);
void Corneria_8018C19C(Boss*);
void Corneria_8018DDAC(Boss*);
void Corneria_8018E290(Boss*);
void Corneria_8018E76C(Boss*);
void Corneria_8018ECAC(Boss*);
void Corneria_8018ED78(Boss*);
void Corneria_8018EE84(Boss*);
void Corneria_8018EF90(Boss*);
void Corneria_8018F044(Scenery*);
void Corneria_8018F31C(Scenery*);
void Corneria_Smoke_Update(Sprite*);
void Corneria_Granga_Update(Granga*);
void Corneria_Granga_Draw(Granga*);
void Corneria_CoGaruda1_Update(CoGaruda1*);
void Corneria_CoGaruda2_Update(CoGaruda2*);
void Corneria_CoGaruda3_Update(CoGaruda3*);
void Corneria_CoGarudaDestroy_Update(CoGarudaDestroy*);
void Corneria_CoGaruda1_Draw(CoGaruda1*);
void Corneria_CoGaruda2_Draw(CoGaruda2*);
void Corneria_CoGaruda3_Draw(CoGaruda3*);
void Corneria_CoGarudaDestroy_Draw(CoGarudaDestroy*);
void Corneria_Carrier_Update(Carrier*);
void Corneria_Boss294_Update(Boss294*);
void Corneria_Boss295_Update(Boss295*);
void Corneria_Boss296_Update(Boss296*);
void Corneria_Carrier_Draw(Carrier*);
void Corneria_Boss294_Draw(Boss294*);
void Corneria_Boss295_Draw(Boss295*);
void Corneria_Boss296_Draw(Boss296*);
void Corneria_Doors_Update(Scenery*);
void Corneria_Doors_Draw(Scenery*);
void Venom1_BossTrigger1_Update(Sprite*);
void Venom1_BossTrigger2_Update(Sprite*);
void Venom1_BossTrigger3_Update(Sprite*);
void Venom1_BossTrigger4_Update(Sprite*);
void Venom1_80192518(Actor*);
void Venom1_80192CD4(Actor*);
void Venom1_80192E2C(Actor*);
void Venom1_80192EB0(Actor*);
void Venom1_801933DC(Actor*);
void Venom1_801934D0(Actor*);
void Venom1_80193540(Scenery*);
void Venom1_Actor280_Update(Actor*);
void Venom1_Doodad_Update(Actor*);
void Venom1_Actor281_Draw(Actor*);
void Venom1_Actor283_Update(Actor*);
void Venom1_Actor284_Update(Actor*);
void Venom1_Actor284_Draw(Actor*);
void Venom1_Scenery52_Update(Scenery*);
void Venom1_Boss_Update(Boss*);
void Venom1_Boss_Draw(Boss*);
void Training_ItemRing_Update(Item*);
void OvlI1_CallFunction(s32, void*);
void Corneria_80187530(Scenery*);
void Corneria_8018753C(Scenery*);
void Corneria_Boss292_Init(Boss *);
void Corneria_8018B0B4(Actor *);
void Corneria_Boss293_Init(Boss *);
void Corneria_8018ED78(Boss*);
void Venom1_801924A8(Scenery* );
void Corneria_BuildingOnFire_Update(Scenery*);
void Corneria_BuildingOnFire_Draw(Scenery*);
void Corneria_Granga_Init(Boss *);
void Corneria_IBeam_Init(Actor *);
void Corneria_Carrier_Init(Carrier *);
void Corneria_Boss294_Draw(Boss*);
void Venom1_Scenery127_Update(Scenery* );
void Venom1_8019250C(Actor *);
void Venom1_80192CB0(Actor *);
void Venom1_80192EA4(Actor *);
@@ -65,9 +65,9 @@ void Venom1_801933B4(Actor *);
void Venom1_Boss319_Init(Boss *);
void Venom1_80198310(Boss *);
void Venom1_80198594(Boss *);
void Training_801988E0(void);
void Training_RingPassCount_Draw(void);
void Training_Setup360(void);
void Training_8019949C(void);
void Training_SpawnEnemies(void);
void Venom1_8019864C(PlayerShot*);
#endif
+26 -26
View File
@@ -18,31 +18,31 @@ void Meteo_80187B08(Actor *);
void Meteo_Boss297_Init(Boss *);
void Meteo_8018CCF8(Actor *);
void Meteo_8018756C(Actor*);
void Meteo_80187650(Actor*);
void Meteo_801877C4(Actor*);
void Meteo_8018795C(Actor*);
void Meteo_80188344(Boss*);
void Meteo_801887D0(Boss*);
void Meteo_80188CAC(Effect*);
void Meteo_80188FAC(Effect*);
void Meteo_80189114(Effect*);
void Meteo_8018978C(Boss*);
void Meteo_8018BACC(Boss*);
void Meteo_8018D9EC(Actor*);
void Meteo_8018DA6C(Actor*);
void Meteo_8018DAEC(Actor*);
void Meteo_8018DB6C(Actor*);
void Meteo_8018DBEC(Effect*);
void Meteo_8018DCE4(Effect*);
void Meteo_8018DE14(Effect*);
void SectorX_8018F330(Actor*);
void SectorX_8018F884(Actor*);
void SectorX_8018FE38(Boss*);
void SectorX_8018FF20(Boss*);
void SectorX_8018FF84(Boss*);
void SectorX_80190020(Boss*);
void SectorX_80190078(Boss*);
void SectorX_80193434(Boss*);
void Meteo_Actor181_Update(Actor*);
void Meteo_Actor182_Update(Actor*);
void Meteo_Actor187_Update(Actor*);
void Meteo_Actor186_Update(Actor*);
void Meteo_Boss298_Update(Boss*);
void Meteo_Boss298_Draw(Boss*);
void Meteo_Effect369_Update(Effect*);
void Meteo_Effect370_Update(Effect*);
void Meteo_Effect371_Update(Effect*);
void Meteo_Boss297_Update(Boss*);
void Meteo_Boss297_Draw(Boss*);
void Meteo_ActorDoodad_Update(Actor*);
void Meteo_Actor183_Draw(Actor*);
void Meteo_Actor184_Draw(Actor*);
void Meteo_Actor185_Draw(Actor*);
void Meteo_Effect370_Draw(Effect*);
void Meteo_Effect369_Draw(Effect*);
void Meteo_Effect371_Draw(Effect*);
void SectorX_Slippy_Update(Actor*);
void SectorX_Slippy_Draw(Actor*);
void SectorX_Boss304_Update(Boss*);
void SectorX_Boss305_Update(Boss*);
void SectorX_Boss304_Draw(Boss*);
void SectorX_Boss305_Draw(Boss*);
void SectorX_Boss_Update(Boss*);
void SectorX_Boss_Draw(Boss*);
#endif
+87 -88
View File
@@ -13,7 +13,6 @@ void Aquas_801BE034(Actor*);
void Area6_8018DA58(Actor*);
void Zoness_8019E5F0(Actor*);
void Solar_801A8BE8(Actor*);
void Aquas_BlueMarineDown(Player*);
void Aquas_801BE0F0(Actor*);
@@ -25,67 +24,67 @@ void Area6_LevelStart(Player *player);
void Area6_LevelComplete(Player*);
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);
void Zoness_80190F08(Actor* actor);
void Zoness_80191010(Actor* actor);
void Zoness_801914C4(Actor* actor);
void Zoness_801915A4(Actor* actor);
void Zoness_80191680(Actor* actor);
void Zoness_80191B4C(Actor* actor);
void Zoness_Actor235_Draw(Actor235* this);
void Zoness_Actor235_Update(Actor235* this);
void Zoness_Actor236_Update(Actor* this);
void Zoness_Actor236_Draw(Actor* this);
void Zoness_Actor238_Update(Actor* this);
void Zoness_Actor238_Draw(Actor* this);
void Zoness_801915A4(Actor* this);
void Zoness_Actor240_Update(Actor* this);
void Zoness_Actor240_Draw(Actor* this);
void Zoness_80191BB8(Actor* actor);
void Zoness_80191BC4(Actor* actor);
void Zoness_80191DB0(Actor* actor);
void Zoness_80191DB0(Actor* actor);
void Zoness_80191FFC(Actor* actor);
void Zoness_80192094(Actor* actor);
void Zoness_80192834(Actor* actor);
void Zoness_80192C18(Actor* actor);
void Zoness_80192E64(Actor* actor);
void Zoness_80193240(Actor* actor);
void Zoness_Actor241_Update(Actor* this);
void Zoness_Actor241_Draw(Actor* this);
void Zoness_Actor241_Draw(Actor* this);
void Zoness_Actor242_Draw(Actor* this);
void Zoness_Actor242_Update(Actor* this);
void Zoness_Actor243_Update(Actor* this);
void Zoness_Actor243_Draw(Actor* this);
void Zoness_Actor244_Update(Actor* this);
void Zoness_Actor244_Draw(Actor* actor);
void Zoness_BossZo_Init(Boss* this);
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);
void Zoness_80199E24(Actor* actor);
void Zoness_80199F10(Actor* actor);
void Zoness_8019A1FC(Actor* actor);
void Zoness_8019A5D4(Actor* actor);
void Zoness_8019ACCC(Actor* actor);
void Zoness_Boss_Draw(Boss* this);
void Zoness_Boss_Update(Boss* this);
void Zoness_Actor245_Update(Actor245* this);
void Zoness_Actor245_Draw(Actor* actor);
void Zoness_Actor246_Update(Actor* this);
void Zoness_Actor246_Draw(Actor246* actor);
void Zoness_Actor248_Update(Actor* this);
void Zoness_Actor248_Draw(Actor* this);
void Zoness_Actor249_Update(Actor* this);
void Zoness_Actor249_Draw(Actor* this);
void Zoness_8019B1F0(Actor* actor);
void Zoness_8019B548(Actor* actor);
void Zoness_8019B7DC(Actor* actor);
void Zoness_8019B810(Actor* actor);
void Zoness_8019B854(Actor* actor);
void Zoness_8019BDE0(Actor* actor);
void Zoness_8019BE48(Actor* actor);
void Zoness_8019C1CC(Actor* actor);
void Zoness_8019C200(Actor* actor);
void Zoness_8019C454(Actor* actor);
void Zoness_8019C83C(Actor* actor);
void Zoness_8019CBEC(Actor* actor);
void Zoness_8019CE58(Actor* actor);
void Zoness_Actor250_Update(Actor* this);
void Zoness_Actor250_Draw(Actor* actor);
void Zoness_8019B810(Actor* this);
void Zoness_Actor251_Update(Actor* this);
void Zoness_Actor251_Draw(Actor* this);
void Zoness_Actor252_Update(Actor* this);
void Zoness_Actor252_Draw(Actor* actor);
void Zoness_8019C200(Actor* this);
void Zoness_Actor253_Update(Actor* this);
void Zoness_Actor253_Draw(Actor* this);
void Zoness_Actor254_Update(Actor* this);
void Zoness_Actor254_Draw(Actor* this);
void Zoness_Actor247_Init(Actor* this);
void Zoness_8019D15C(Actor* actor);
void Zoness_8019D3C4(Actor* actor);
void Zoness_Actor247_Update(Actor* this);
void Zoness_Actor247_Draw(Actor* this);
void Zoness_LevelStart(Player* player);
void Zoness_LevelComplete(Player* player);
void Solar_8019E8B8(f32, f32, f32, f32);
void Solar_8019E9F4(f32, f32, f32, f32, f32, f32, f32, s32);
void Solar_8019EA7C(Actor*);
void Solar_8019F20C(Actor*);
void Solar_8019F7AC(Actor*);
void Solar_801A003C(Actor*);
void Solar_801A0120(Effect*);
void Solar_801A0AF0(Effect*);
void Solar_Actor278_Update(Actor278*);
void Solar_Doodad_Update(Actor*);
void Solar_Doodad_Draw(Actor*);
void Solar_Actor279_Update(Actor279*);
void Solar_Effect392_Update(Effect392*);
void Solar_Effect392_Draw(Effect392*);
void Solar_LevelStart(Player* player);
void Solar_Boss_Update(Boss*);
void Solar_Boss_Draw(Boss*);
void Solar_801A8BE8(Actor*);
void Solar_Boss_Update(BossSO*);
void Solar_Boss_Draw(BossSO*);
void Solar_801A8BE8(ActorCutscene*);
void Solar_LevelComplete(Player* player);
void Aquas_801A9824(void);
@@ -95,59 +94,59 @@ void Aquas_BlueMarineMove(Player*);
void Aquas_801ABA40(PlayerShot*);
void Aquas_BlueMarineShoot(Player*);
void Aquas_801AC8A8(f32, f32, f32, f32, s32);
void Aquas_801AC918(Effect*);
void Aquas_Effect366_Update(Effect*);
void Aquas_801ACBB4(Player*);
void Aquas_BlueMarineBoost(Player*);
void Aquas_BlueMarineBrake(Player*);
void Aquas_801AD688(Actor *);
void Aquas_801AD6C0(Actor*);
void Aquas_801AE168(Actor*);
void Aquas_Actor255_Update(Actor*);
void Aquas_Actor255_Draw(Actor*);
void Aquas_801AE3AC(Actor *);
void Aquas_801AE3D8(Actor*);
void Aquas_801AEB44(Actor*);
void Aquas_Actor256_Update(Actor*);
void Aquas_Actor256_Draw(Actor*);
void Aquas_801AF9FC(Actor *);
void Aquas_801AFA5C(Actor*);
void Aquas_801B099C(Actor*);
void Aquas_801B0B60(Actor*);
void Aquas_801B0EC0(Actor*);
void Aquas_Actor257_Update(Actor*);
void Aquas_Actor257_Draw(Actor*);
void Aquas_Actor258_Update(Actor*);
void Aquas_Actor258_Draw(Actor*);
void Aquas_BossAq_Init(Boss*);
void Aquas_Boss_Update(Boss*);
void Aquas_Boss_Draw(Boss*);
void Aquas_801B504C(Actor*);
void Aquas_801B50E8(Actor*);
void Aquas_801B619C(Actor*);
void Aquas_Actor261_Draw(Actor*);
void Aquas_Actor261_Update(Actor*);
void Aquas_Actor259_Draw(Actor*);
void Aquas_801B6344(Actor *);
void Aquas_801B638C(Actor*);
void Aquas_Actor259_Update(Actor*);
void Aquas_801B6E54(Actor *);
void Aquas_801B6FF8(Actor*);
void Aquas_801B7A24(Actor*);
void Aquas_Actor262_Update(Actor*);
void Aquas_Actor262_Draw(Actor*);
void Aquas_801B7AF0(Actor *);
void Aquas_801B7C78(Actor*);
void Aquas_801B90DC(Actor*);
void Aquas_801B91A4(Actor*);
void Aquas_801BA108(Actor*);
void Aquas_801BA26C(Actor*);
void Aquas_801BA4E4(Actor*);
void Aquas_Actor260_Update(Actor*);
void Aquas_Actor260_Draw(Actor*);
void Aquas_Actor263_Update(Actor*);
void Aquas_Actor263_Draw(Actor*);
void Aquas_Actor264_Update(Actor*);
void Aquas_Actor264_Draw(Actor*);
void Aquas_801BA57C(Actor *);
void Aquas_801BA6A4(Actor*);
void Aquas_801BAD7C(Actor*);
void Aquas_801BADF8(Actor*);
void Aquas_801BB204(Actor*);
void Aquas_Actor265_Update(Actor*);
void Aquas_Actor265_Draw(Actor*);
void Aquas_Actor266_Update(Actor*);
void Aquas_Actor266_Draw(Actor*);
void Aquas_801BB26C(Actor *);
void Aquas_801BB79C(Actor*);
void Aquas_801BC930(Actor*);
void Aquas_801BC9A0(Actor*);
void Aquas_801BD264(Actor*);
void Aquas_801BD54C(Actor*);
void Aquas_801BDE6C(Actor*);
void Aquas_Actor267_Update(Actor*);
void Aquas_Actor267_Draw(Actor*);
void Aquas_Actor269_Update(Actor*);
void Aquas_Actor269_Draw(Actor*);
void Aquas_Actor268_Update(Actor*);
void Aquas_Actor268_Draw(Actor*);
void Aquas_801BDF14(void);
void Aquas_801BE1FC(Scenery*);
void Aquas_801BE3F8(Actor*);
void Aquas_801BEB1C(Actor*);
void Aquas_Scenery126_Draw(Scenery*);
void Aquas_Actor270_Update(Actor*);
void Aquas_Actor270_Draw(Actor*);
void Aquas_Boss301_Update(Boss*);
void Aquas_Boss301_Draw(Boss*);
void Aquas_801BEC68(Actor*);
void Aquas_801BEC74(Actor*);
void Aquas_Actor188_Update(Actor*);
void Aquas_Actor188_Draw(Actor*);
void Aquas_Update360(Player*);
#endif
+14 -14
View File
@@ -17,37 +17,37 @@ void Katina_LevelComplete(Player*);
void Katina_SFTeamFlyTowardsCamera(Actor*);
void SectorZ_LevelStart(Player*);
void SectorZ_LevelComplete(Player*);
void SectorZ_8019DD20(Actor*);
void SectorZ_LevelCompleteCsUpdate(Actor*);
void OvlI4_CallFunction(u32, void*);
void Fortuna_UpdateEvents(Actor*);
void Fortuna_8018BA2C(void);
void Fortuna_LoadLevelObjects(void);
void Bolse_UpdateEventHandler(Actor*);
void Bolse_80191ED8(void);
void Bolse_DrawDynamicGround(void);
void Katina_BossSetup(Boss *);
void Katina_UpdateEvents(Actor*);
void Katina_Init(void);
void SectorZ_80199900(Actor *, s32);
void SectorZ_MissileExplode(ActorAllRange* this, bool shotDown);
void SectorZ_Missile_Update(Actor*);
void SectorZ_UpdateEvents(Actor*);
void SectorZ_8019EA68(void);
void SectorZ_LoadLevelObjects(void);
void Fortuna_80188AD0(Actor*);
void Fortuna_80188FE4(Actor*);
void Bolse_80191054(Effect*);
void Bolse_80191180(Effect*);
void Bolse_801912FC(Boss*);
void Bolse_80191AFC(Boss*);
void Fortuna_Radar_Update(Actor*);
void Fortuna_Radar_Draw(Actor*);
void Bolse_Effect397_Update(Effect*);
void Bolse_Effect397_Draw(Effect*);
void Bolse_Boss311_Update(Boss*);
void Bolse_Boss311_Draw(Boss*);
void Katina_LaserEnergyParticlesUpdate(Effect*);
void Katina_LaserEnergyParticlesDraw(Effect*);
void Katina_BaseUpdate(Boss*);
void Katina_Base_Draw(Boss*);
void Katina_BossUpdate(Boss*);
void Katina_BossDraw(Boss*);
void SectorZ_8019E234(Actor*);
void SectorZ_8019E3A8(Actor*);
void SectorZ_Boss_Update(Boss*);
void SectorZ_Boss_Draw(Boss*);
void SectorZ_SpaceJunkUpdate(Actor*);
void SectorZ_SpaceJunkDraw(Actor*);
void SectorZ_GreatFoxUpdate(Boss*);
void SectorZ_GreatFoxDraw(Boss*);
#endif
+66 -66
View File
@@ -59,75 +59,75 @@ bool Macbeth_801A3C20(f32);
bool Macbeth_801A3300(Player*, f32, f32);
bool Macbeth_801A3790(Player*, f32, f32);
void Titania_80188F60(Effect*);
void Titania_80188FA8(Effect*);
void Titania_80189194(Actor*);
void Titania_801895B8(Actor*);
void Titania_80189AFC(Actor*);
void Titania_80189CC8(Actor*);
void Titania_8018A1C0(Actor*);
void Titania_8018A544(Actor*);
void Titania_8018AABC(Actor*);
void Titania_8018AB44(Actor*);
void Titania_8018B268(Actor*);
void Titania_8018B6AC(Actor*);
void Titania_8018B9D0(Actor*);
void Titania_8018BE84(Actor*);
void Titania_8018C8A8(Actor*);
void Titania_8018E2D8(Actor*);
void Titania_8018E54C(Actor*);
void Titania_8018E5B4(Actor*);
void Titania_8018E5F8(Actor*);
void Titania_8018EF14(Actor*);
void Titania_Effect368_Update(Effect*);
void Titania_Effect368_Draw(Effect*);
void Titania_Actor224_Update(Actor*);
void Titania_Actor226_Update(Actor*);
void Titania_Actor226_Draw(Actor*);
void Titania_Actor233_Update(Actor*);
void Titania_Actor233_Draw(Actor*);
void Titania_Actor230_Update(Actor*);
void Titania_Actor230_Draw(Actor*);
void Titania_Actor225_Update(Actor*);
void Titania_Actor232_Update(Actor*);
void Titania_Actor232_Draw(Actor*);
void Titania_Actor231_Update(Actor*);
void Titania_Actor231_Draw(Actor*);
void Titania_Actor229_Update(Actor*);
void Titania_Actor229_Draw(Actor*);
void Titania_Actor227_Update(Actor*);
void Titania_Actor227_Draw(Actor*);
void Titania_Actor228_Update(Actor*);
void Titania_Actor228_Draw(Actor*);
void Titania_Cactus_Update(Sprite*);
void Titania_8018F4D8(Scenery*);
void Titania_8018F8B8(Scenery*);
void Titania_Scenery57_Update(Scenery*);
void Titania_Scenery57_Draw(Scenery*);
void Titania_Boss_Update(Boss*);
void Titania_Boss_Draw(Boss*);
void Macbeth_8019C778(Actor*);
void Macbeth_8019CE88(Actor*);
void Macbeth_8019D700(Actor*);
void Macbeth_8019E410(Actor*);
void Macbeth_8019EA60(Actor*);
void Macbeth_8019EE68(Actor*);
void Macbeth_8019FF9C(Actor*);
void Macbeth_801A0BD8(Scenery*);
void Macbeth_801A12C4(Actor*);
void Macbeth_801A23AC(Scenery*);
void Macbeth_801A2A78(Scenery*);
void Macbeth_801A2B24(Scenery*);
void Macbeth_801A2DD8(Scenery*);
void Macbeth_801A3240(Scenery*);
void Macbeth_801A3E98(Actor*);
void Macbeth_801A43BC(Actor*);
void Macbeth_801A46A0(Actor*);
void Macbeth_801A4A64(Actor*);
void Macbeth_801A4B24(Actor*);
void Macbeth_801A54E8(Actor*);
void Macbeth_801A57D0(Effect*);
void Macbeth_801A5AF0(Effect*);
void Macbeth_801A5B4C(Effect*);
void Macbeth_801A5D68(Effect*);
void Macbeth_801A5E54(Actor*);
void Macbeth_801A5F90(Actor*);
void Macbeth_801A5FD0(Actor*);
void Macbeth_801A6100(Actor*);
void Macbeth_801A6144(Actor*);
void Macbeth_801A6540(Actor*);
void Macbeth_801A6608(Scenery*);
void Macbeth_801A67C8(Actor*);
void Macbeth_801A68EC(Actor*);
void Macbeth_801A7E7C(Actor*);
void Macbeth_801AC294(Actor*);
void Macbeth_801AC438(Actor*);
void Macbeth_801AD6F0(Actor*);
void Macbeth_801ADAC8(Actor*);
void Macbeth_801ADD68(Actor*);
void Macbeth_801AE2C0(Actor*);
void Macbeth_801AE87C(Effect*);
void Macbeth_801AEAA0(Effect*);
void Macbeth_801AEC04(Actor*);
void Macbeth_801AEEFC(Actor*);
void Macbeth_Actor205_Update(Actor*);
void Macbeth_Actor210_Update(Actor*);
void Macbeth_Actor209_Update(Actor*);
void Macbeth_Actor211_Update(Actor*);
void Macbeth_Actor208_Update(Actor*);
void Macbeth_Actor213_Update(Actor*);
void Macbeth_Actor212_Update(Actor*);
void Macbeth_Scenery104_Update(Scenery*);
void Macbeth_ActorDoodad_Draw(Actor*);
void Macbeth_SceneryDoodad_Draw(Scenery*);
void Macbeth_Scenery61_Draw(Scenery*);
void Macbeth_SceneryDoodad2_Draw(Scenery*);
void Macbeth_Scenery83_Update(Scenery*);
void Macbeth_Scenery83_Draw(Scenery*);
void Macbeth_Actor214_Update(Actor*);
void Macbeth_Actor214_Draw(Actor*);
void Macbeth_Actor215_Update(Actor*);
void Macbeth_Actor215_Draw(Actor*);
void Macbeth_Actor223_Update(Actor*);
void Macbeth_Actor223_Draw(Actor*);
void Macbeth_Effect378_Update(Effect*);
void Macbeth_Effect378_Draw(Effect*);
void Macbeth_Effect380_Update(Effect*);
void Macbeth_Effect380_Draw(Effect*);
void Macbeth_Actor216_Update(Actor*);
void Macbeth_Actor216_Draw(Actor*);
void Macbeth_Actor217_Update(Actor*);
void Macbeth_Actor217_Draw(Actor*);
void Macbeth_Actor218_Update(Actor*);
void Macbeth_Actor218_Draw(Actor*);
void Macbeth_Scenery65_Draw(Scenery*);
void Macbeth_Actor219_Update(Actor*);
void Macbeth_Actor219_Draw(Actor*);
void Macbeth_Actor207_Update(Actor*);
void Macbeth_Actor207_Draw(Actor*);
void Macbeth_Actor206_Update(Actor*);
void Macbeth_Actor220_Update(Actor*);
void Macbeth_Actor220_Draw(Actor*);
void Macbeth_Actor221_Update(Actor*);
void Macbeth_Actor221_Draw(Actor*);
void Macbeth_Effect379_Update(Effect*);
void Macbeth_Effect379_Draw(Effect*);
void Macbeth_Actor222_Update(Actor*);
void Macbeth_Actor222_Draw(Actor*);
s32 Macbeth_801A55D4(s32 , Vec3f* , Vec3f* , s32 );
#endif
+25 -25
View File
@@ -32,7 +32,7 @@ void Andross_8018C390(Player*);
void Andross_Boss320_Init(Boss *);
void Andross_801961AC(void);
void Venom2_UpdateEvents(Actor*);
void Venom2_80196968(void);
void Venom2_LoadLevelObjects(void);
void SectorY_Boss314_Init(Boss *);
void SectorY_Actor204_Update(Actor*);
void SectorY_Actor204_Draw(Actor*);
@@ -40,33 +40,33 @@ void Turret_Update(Player*);
void Turret_UpdateCamera(Player*);
void Turret_Draw(Player *);
void Andross_801880E4(Actor*);
void Andross_80188448(Actor*);
void Andross_80188528(Actor*);
void Andross_80188660(Actor*);
void Andross_8018933C(Actor*);
void Andross_801893B8(Actor*);
void Andross_80189470(Actor*);
void Andross_80189724(Actor*);
void Andross_80189B70(Boss*);
void Andross_8018B8C0(Boss*);
void Andross_8018CAD4(Effect*);
void Andross_8018CF98(Effect*);
void Andross_8018DBF0(Boss*);
void Andross_801928C8(Boss*);
void Andross_80192E94(Actor*);
void Andross_80193244(Actor*);
void Andross_80193380(Scenery*);
void Andross_8019350C(Scenery*);
void Andross_8019356C(Scenery*);
void Andross_801935D4(Scenery*);
void Andross_Actor199_Update(Actor*);
void Andross_Actor199_Draw(Actor*);
void Andross_Actor286_Update(Actor*);
void Andross_Actor286_Draw(Actor*);
void Andross_Actor290_Update(Actor*);
void Andross_Actor288_Update(Actor*);
void Andross_Actor289_Update(Actor*);
void Andross_Actor287_Update(Actor*);
void Andross_Boss321_Update(Boss*);
void Andross_Boss321_Draw(Boss*);
void Andross_Effect396_Update(Effect*);
void Andross_Effect396_Draw(Effect*);
void Andross_Boss320_Update(Boss*);
void Andross_Boss320_Draw(Boss*);
void Andross_Actor285_Update(Actor*);
void Andross_Actor285_Draw(Actor*);
void Andross_Scenery132_Update(Scenery*);
void Andross_Scenery132_Draw(Scenery*);
void Andross_Scenery131_Update(Scenery*);
void Andross_Scenery131_Draw(Scenery*);
void Venom2_Boss_Update(Boss*);
void Venom2_Boss_Draw(Boss*);
void SectorY_80197C64(Effect*);
void SectorY_80197CB8(Scenery*);
void SectorY_Effect354_Draw(Effect*);
void SectorY_Scenery156_Draw(Scenery*);
void SectorY_Boss_Update(Boss*);
void SectorY_Boss_Draw(Boss*);
void SectorY_801A4E44(Scenery*);
void SectorY_801A52B8(Scenery*);
void SectorY_Scenery109_Update(Scenery*);
void SectorY_Scenery112_Update(Scenery*);
#endif
+2
View File
@@ -7,6 +7,8 @@
#define SCREEN_HEIGHT 240
#define SCREEN_MARGIN 8
#define TIME_IN_SECONDS(x) (x * 30);
#define RAND_FLOAT(max) (Rand_ZeroOne()*(max))
#define RAND_INT(max) ((s32)(Rand_ZeroOne()*(max)))
#define RAND_FLOAT_CENTERED(width) ((Rand_ZeroOne()-0.5f)*(width))
+577 -580
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -318,7 +318,7 @@ typedef struct Player {
/* 0x498 */ s32 mercyTimer;
/* 0x49C */ WingInfo wings;
/* 0x4D8 */ f32 aerobaticPitch;
/* 0x4DC */ s32 somersault;
/* 0x4DC */ bool somersault;
} Player; // size = 0x4E0