diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-07-06 09:47:49 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-06 09:47:49 -0300 |
| commit | c348962cab034335f5eb1ee4bc2ed4851f40542e (patch) | |
| tree | d3fffe889776bc638195982b3f16852c09cd834d /include | |
| parent | 24e316a2b26ff768f15ec217798898b4b0a7b8f9 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/fox_co.h | 162 | ||||
| -rw-r--r-- | include/functions.h | 239 | ||||
| -rw-r--r-- | include/i1.h | 74 | ||||
| -rw-r--r-- | include/i2.h | 52 | ||||
| -rw-r--r-- | include/i3.h | 175 | ||||
| -rw-r--r-- | include/i4.h | 28 | ||||
| -rw-r--r-- | include/i5.h | 132 | ||||
| -rw-r--r-- | include/i6.h | 50 | ||||
| -rw-r--r-- | include/macros.h | 2 | ||||
| -rw-r--r-- | include/sf64object.h | 1157 | ||||
| -rw-r--r-- | include/sf64player.h | 2 |
11 files changed, 1117 insertions, 956 deletions
diff --git a/include/fox_co.h b/include/fox_co.h new file mode 100644 index 00000000..7ffad414 --- /dev/null +++ b/include/fox_co.h @@ -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 diff --git a/include/functions.h b/include/functions.h index 717a5235..e0c9f879 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/include/i1.h b/include/i1.h index ba1ce7fe..42dced9d 100644 --- a/include/i1.h +++ b/include/i1.h @@ -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 diff --git a/include/i2.h b/include/i2.h index 326cfe64..92d7b465 100644 --- a/include/i2.h +++ b/include/i2.h @@ -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 diff --git a/include/i3.h b/include/i3.h index f9ece938..5d70bdc9 100644 --- a/include/i3.h +++ b/include/i3.h @@ -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 diff --git a/include/i4.h b/include/i4.h index 3f8a3bfd..4769796e 100644 --- a/include/i4.h +++ b/include/i4.h @@ -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 diff --git a/include/i5.h b/include/i5.h index ae2b94d4..75a3374b 100644 --- a/include/i5.h +++ b/include/i5.h @@ -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 diff --git a/include/i6.h b/include/i6.h index 844e4fb5..f02600e9 100644 --- a/include/i6.h +++ b/include/i6.h @@ -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 diff --git a/include/macros.h b/include/macros.h index 6d7a15e6..f92ceb4f 100644 --- a/include/macros.h +++ b/include/macros.h @@ -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)) diff --git a/include/sf64object.h b/include/sf64object.h index 1fae1be1..3fe7dc3b 100644 --- a/include/sf64object.h +++ b/include/sf64object.h @@ -20,8 +20,8 @@ typedef struct { } Hitbox; // size = 0x18 typedef struct { - /* 0x00 */ Triangle tri; - /* 0x08 */ PlaneI plane; + /* 0x00 */ Triangle tri; + /* 0x08 */ PlaneI plane; } CollisionPoly; // size = 0x14 typedef struct { @@ -33,11 +33,11 @@ typedef struct { } CollisionHeader; // size = 0x24 typedef struct { - /* 0x00 */ Vec3f min; - /* 0x0C */ Vec3f max; - /* 0x18 */ s32 polyCount; - /* 0x1C */ Triangle* polys; - /* 0x20 */ Vec3f* mesh; + /* 0x00 */ Vec3f min; + /* 0x0C */ Vec3f max; + /* 0x18 */ s32 polyCount; + /* 0x1C */ Triangle* polys; + /* 0x20 */ Vec3f* mesh; } CollisionHeader2; // size = 0x24 typedef enum { @@ -49,21 +49,21 @@ typedef enum { /* 5 */ COL1_5, // OBJ_SCENERY_149 /* 6 */ COL1_6, // OBJ_SCENERY_150 /* 7 */ COL1_7, // OBJ_BOSS_309 - /* 8 */ COL1_8, // OBJ_BOSS_SZ + /* 8 */ COL1_8, // OBJ_BOSS_SZ_GREAT_FOX /* 9 */ COL1_9, // OBJ_BOSS_VE2 } CollisonId_1; typedef enum { - /* 0 */ COL2_0, // default - /* 1 */ COL2_1, // OBJ_SCENERY_4, OBJ_SCENERY_5 - /* 2 */ COL2_2, // OBJ_SCENERY_2 - /* 3 */ COL2_3, // OBJ_SCENERY_3, OBJ_SCENERY_69 - /* 4 */ COL2_4, // OBJ_SCENERY_140 - /* 5 */ COL2_5, // PLAYERSHOT_7 ? - /* 6 */ COL2_6, // OBJ_SCENERY_141 - /* 7 */ COL2_7, // OBJ_SCENERY_47 - /* 8 */ COL2_8, // OBJ_SCENERY_70 - /* 9 */ COL2_9, // OBJ_SCENERY_72 + /* 0 */ COL2_0, // default + /* 1 */ COL2_1, // OBJ_SCENERY_CO_BUMP_4, OBJ_SCENERY_CO_BUMP_5 + /* 2 */ COL2_2, // OBJ_SCENERY_CO_BUMP_2 + /* 3 */ COL2_3, // OBJ_SCENERY_CO_BUMP_3, OBJ_SCENERY_69 + /* 4 */ COL2_4, // OBJ_SCENERY_140 + /* 5 */ COL2_5, // PLAYERSHOT_7 ? + /* 6 */ COL2_6, // OBJ_SCENERY_141 + /* 7 */ COL2_7, // OBJ_SCENERY_47 + /* 8 */ COL2_8, // OBJ_SCENERY_70 + /* 9 */ COL2_9, // OBJ_SCENERY_72 /* 10 */ COL2_10, // OBJ_SCENERY_71 /* 11 */ COL2_11, // OBJ_SCENERY_73 /* 12 */ COL2_12, // OBJ_SCENERY_67 @@ -123,7 +123,7 @@ typedef enum ObjectStatus { /* 3 */ OBJ_DYING, } ObjectStatus; -typedef struct { +typedef struct Object { /* 0x00 */ u8 status; /* 0x02 */ u16 id; /* 0x04 */ Vec3f pos; @@ -132,7 +132,7 @@ typedef struct { typedef void (*ObjectFunc)(Object*); -typedef struct { +typedef struct ObjectInfo { /* 0x00 */ union { ObjectFunc draw; Gfx* dList; @@ -140,16 +140,16 @@ typedef struct { /* 0x00 */ u8 drawType; /* 0x08 */ ObjectFunc action; // argument must have object type. /* 0x0C */ f32* hitbox; - /* 0x10 */ f32 cullDistance; // z coordinate of something - /* 0x14 */ s16 unk_14; // can be -1, 0, 1. governs camera-related behavior in effects (billboarding?) - /* 0x16 */ s16 unk_16; // can be 0, 1, 2. affects death behavior? + /* 0x10 */ f32 cullDistance; // z coordinate of something + /* 0x14 */ s16 unk_14; // can be -1, 0, 1. governs camera-related behavior in effects (billboarding?) + /* 0x16 */ s16 unk_16; // can be 0, 1, 2. affects death behavior? /* 0x18 */ u8 damage; - /* 0x19 */ u8 unk_19; // can be 0, 1, 2. Also camera-related? - /* 0x1C */ f32 targetOffset; // target lock y offset. 0.0f can't be targeted - /* 0x20 */ u8 bonus; // hits when killed. numbers above 1 indicate the hit+ bonus -} ObjectInfo; // size = 0x24 + /* 0x19 */ u8 unk_19; // can be 0, 1, 2. Also camera-related? + /* 0x1C */ f32 targetOffset; // target lock y offset. 0.0f can't be targeted + /* 0x20 */ u8 bonus; // hits when killed. numbers above 1 indicate the hit+ bonus +} ObjectInfo; // size = 0x24 -typedef struct { +typedef struct Scenery360 { /* 0x00 */ Object obj; /* 0x1C */ ObjectInfo info; /* 0x40 */ u8 pathIndex; @@ -158,7 +158,7 @@ typedef struct { /* 0x54 */ f32 unk_54; } Scenery360; // size = 0x58 -typedef struct { +typedef struct Scenery { /* 0x00 */ Object obj; /* 0x1C */ ObjectInfo info; /* 0x40 */ s32 index; @@ -173,7 +173,7 @@ typedef struct { /* 0x7C */ char pad7C[4]; } Scenery; // size = 0x80 -typedef struct { +typedef struct Sprite { /* 0x00 */ Object obj; /* 0x1C */ ObjectInfo info; /* 0x40 */ s32 index; @@ -183,7 +183,7 @@ typedef struct { /* 0x48 */ s32 toLeft; } Sprite; // size = 0x4C -typedef struct { +typedef struct Item { /* 0x00 */ Object obj; /* 0x1C */ ObjectInfo info; /* 0x40 */ s32 index; @@ -200,7 +200,7 @@ typedef struct { /* 0x68 */ f32 width; } Item; // size 0x6C -typedef struct { +typedef struct Effect { /* 0x00 */ Object obj; /* 0x1C */ ObjectInfo info; /* 0x40 */ s32 index; @@ -223,14 +223,14 @@ typedef struct { /* 0x80 */ f32 sfxSource[3]; } Effect; // size 0x8C -typedef struct { +typedef struct Boss { /* 0x000 */ Object obj; /* 0x01C */ ObjectInfo info; /* 0x040 */ s32 index; /* 0x044 */ s16 unk_044; - /* 0x046 */ s16 unk_046; - /* 0x048 */ s16 unk_048; - /* 0x04A */ s16 unk_04A; + /* 0x046 */ s16 unk_046; + /* 0x048 */ s16 unk_048; + /* 0x04A */ s16 unk_04A; /* 0x04C */ s16 unk_04C; /* 0x04E */ s16 state; /* 0x050 */ s16 timer_050; @@ -248,7 +248,7 @@ typedef struct { /* 0x068 */ f32 yOffset; /* 0x06C */ Vec3f vel; /* 0x078 */ Vec3f rot_078; - /* 0x084 */ f32 gravity; + /* 0x084 */ f32 gravity; /* 0x088 */ s16 swork[40]; /* 0x0D8 */ f32 fwork[50]; /* 0x1A0 */ Vec3f vwork[50]; @@ -261,11 +261,9 @@ typedef struct { #define DMG_BEAM 1 #define DMG_NONE 0 #define DMG_BOMB -1 -#define DMG_UNK_100 100 +#define DMG_MISSILE 100 - - -typedef struct { +typedef struct Actor { /* 0x000 */ Object obj; /* 0x01C */ ObjectInfo info; /* 0x040 */ s32 index; @@ -295,7 +293,7 @@ typedef struct { /* 0x0D4 */ s16 dmgSource; /* 0x0D6 */ u16 damage; /* 0x0D8 */ Vec3f hitPos; - /* 0x0E4 */ s16 aiType; // Actor index for AllRange, script index for Event + /* 0x0E4 */ s16 aiType; // Actor index for AllRange, script index for Event /* 0x0E6 */ s16 aiIndex; // Target index for AllRange, program counter for Event /* 0x0E8 */ Vec3f vel; /* 0x0F4 */ Vec3f rot_0F4; @@ -307,430 +305,430 @@ typedef struct { } Actor; // size = 0x2F4 typedef enum ObjectId { - /* -1 */ OBJ_INVALID=-1, - /* 0 */ OBJ_SCENERY_0, - /* 1 */ OBJ_SCENERY_1, - /* 2 */ OBJ_SCENERY_2, - /* 3 */ OBJ_SCENERY_3, - /* 4 */ OBJ_SCENERY_4, - /* 5 */ OBJ_SCENERY_5, - /* 6 */ OBJ_SCENERY_6, - /* 7 */ OBJ_SCENERY_7, - /* 8 */ OBJ_SCENERY_8, - /* 9 */ OBJ_SCENERY_9, - /* 10 */ OBJ_SCENERY_10, - /* 11 */ OBJ_SCENERY_11, - /* 12 */ OBJ_SCENERY_12, - /* 13 */ OBJ_SCENERY_13, - /* 14 */ OBJ_SCENERY_14, - /* 15 */ OBJ_SCENERY_15, - /* 16 */ OBJ_SCENERY_16, - /* 17 */ OBJ_SCENERY_17, - /* 18 */ OBJ_SCENERY_18, - /* 19 */ OBJ_SCENERY_19, - /* 20 */ OBJ_SCENERY_20, - /* 21 */ OBJ_SCENERY_21, - /* 22 */ OBJ_SCENERY_22, - /* 23 */ OBJ_SCENERY_23, - /* 24 */ OBJ_SCENERY_24, - /* 25 */ OBJ_SCENERY_25, - /* 26 */ OBJ_SCENERY_26, - /* 27 */ OBJ_SCENERY_27, - /* 28 */ OBJ_SCENERY_28, - /* 29 */ OBJ_SCENERY_TI_SKULL, - /* 30 */ OBJ_SCENERY_TI_RIB_0, - /* 31 */ OBJ_SCENERY_TI_RIB_1, - /* 32 */ OBJ_SCENERY_TI_RIB_2, - /* 33 */ OBJ_SCENERY_TI_RIB_3, - /* 34 */ OBJ_SCENERY_TI_RIB_4, - /* 35 */ OBJ_SCENERY_TI_RIB_5, - /* 36 */ OBJ_SCENERY_TI_RIB_6, - /* 37 */ OBJ_SCENERY_TI_RIB_7, - /* 38 */ OBJ_SCENERY_TI_RIB_8, - /* 39 */ OBJ_SCENERY_ME_TUNNEL, - /* 40 */ OBJ_SCENERY_40, - /* 41 */ OBJ_SCENERY_41, - /* 42 */ OBJ_SCENERY_42, - /* 43 */ OBJ_SCENERY_43, - /* 44 */ OBJ_SCENERY_44, - /* 45 */ OBJ_SCENERY_45, - /* 46 */ OBJ_SCENERY_46, - /* 47 */ OBJ_SCENERY_47, - /* 48 */ OBJ_SCENERY_48, - /* 49 */ OBJ_SCENERY_49, - /* 50 */ OBJ_SCENERY_50, - /* 51 */ OBJ_SCENERY_51, - /* 52 */ OBJ_SCENERY_52, - /* 53 */ OBJ_SCENERY_53, - /* 54 */ OBJ_SCENERY_54, - /* 55 */ OBJ_SCENERY_55, - /* 56 */ OBJ_SCENERY_56, - /* 57 */ OBJ_SCENERY_57, - /* 58 */ OBJ_SCENERY_58, - /* 59 */ OBJ_SCENERY_59, - /* 60 */ OBJ_SCENERY_60, - /* 61 */ OBJ_SCENERY_61, - /* 62 */ OBJ_SCENERY_62, - /* 63 */ OBJ_SCENERY_63, - /* 64 */ OBJ_SCENERY_64, - /* 65 */ OBJ_SCENERY_65, - /* 66 */ OBJ_SCENERY_66, - /* 67 */ OBJ_SCENERY_67, - /* 68 */ OBJ_SCENERY_68, - /* 69 */ OBJ_SCENERY_69, - /* 70 */ OBJ_SCENERY_70, - /* 71 */ OBJ_SCENERY_71, - /* 72 */ OBJ_SCENERY_72, - /* 73 */ OBJ_SCENERY_73, - /* 74 */ OBJ_SCENERY_74, - /* 75 */ OBJ_SCENERY_75, - /* 76 */ OBJ_SCENERY_76, - /* 77 */ OBJ_SCENERY_77, - /* 78 */ OBJ_SCENERY_78, - /* 79 */ OBJ_SCENERY_79, - /* 80 */ OBJ_SCENERY_80, - /* 81 */ OBJ_SCENERY_81, - /* 82 */ OBJ_SCENERY_82, - /* 83 */ OBJ_SCENERY_83, - /* 84 */ OBJ_SCENERY_84, - /* 85 */ OBJ_SCENERY_85, - /* 86 */ OBJ_SCENERY_86, - /* 87 */ OBJ_SCENERY_87, - /* 88 */ OBJ_SCENERY_88, - /* 89 */ OBJ_SCENERY_89, - /* 90 */ OBJ_SCENERY_90, - /* 91 */ OBJ_SCENERY_91, - /* 92 */ OBJ_SCENERY_92, - /* 93 */ OBJ_SCENERY_93, - /* 94 */ OBJ_SCENERY_94, - /* 95 */ OBJ_SCENERY_95, - /* 96 */ OBJ_SCENERY_96, - /* 97 */ OBJ_SCENERY_97, - /* 98 */ OBJ_SCENERY_98, - /* 99 */ OBJ_SCENERY_99, - /* 100 */ OBJ_SCENERY_100, - /* 101 */ OBJ_SCENERY_101, - /* 102 */ OBJ_SCENERY_102, - /* 103 */ OBJ_SCENERY_103, - /* 104 */ OBJ_SCENERY_104, - /* 105 */ OBJ_SCENERY_105, - /* 106 */ OBJ_SCENERY_106, - /* 107 */ OBJ_SCENERY_107, - /* 108 */ OBJ_SCENERY_108, - /* 109 */ OBJ_SCENERY_109, - /* 110 */ OBJ_SCENERY_110, - /* 111 */ OBJ_SCENERY_111, - /* 112 */ OBJ_SCENERY_112, - /* 113 */ OBJ_SCENERY_113, - /* 114 */ OBJ_SCENERY_114, - /* 115 */ OBJ_SCENERY_115, - /* 116 */ OBJ_SCENERY_116, - /* 117 */ OBJ_SCENERY_117, - /* 118 */ OBJ_SCENERY_118, - /* 119 */ OBJ_SCENERY_119, - /* 120 */ OBJ_SCENERY_120, - /* 121 */ OBJ_SCENERY_121, - /* 122 */ OBJ_SCENERY_122, - /* 123 */ OBJ_SCENERY_123, - /* 124 */ OBJ_SCENERY_124, - /* 125 */ OBJ_SCENERY_125, - /* 126 */ OBJ_SCENERY_126, - /* 127 */ OBJ_SCENERY_127, - /* 128 */ OBJ_SCENERY_128, - /* 129 */ OBJ_SCENERY_129, - /* 130 */ OBJ_SCENERY_130, - /* 131 */ OBJ_SCENERY_131, - /* 132 */ OBJ_SCENERY_132, - /* 133 */ OBJ_SCENERY_133, - /* 134 */ OBJ_SCENERY_134, - /* 135 */ OBJ_SCENERY_135, - /* 136 */ OBJ_SCENERY_136, - /* 137 */ OBJ_SCENERY_137, - /* 138 */ OBJ_SCENERY_138, - /* 139 */ OBJ_SCENERY_139, - /* 140 */ OBJ_SCENERY_140, - /* 141 */ OBJ_SCENERY_141, - /* 142 */ OBJ_SCENERY_142, - /* 143 */ OBJ_SCENERY_143, - /* 144 */ OBJ_SCENERY_144, - /* 145 */ OBJ_SCENERY_145, - /* 146 */ OBJ_SCENERY_146, - /* 147 */ OBJ_SCENERY_147, - /* 148 */ OBJ_SCENERY_148, - /* 149 */ OBJ_SCENERY_149, - /* 150 */ OBJ_SCENERY_150, - /* 151 */ OBJ_SCENERY_151, - /* 152 */ OBJ_SCENERY_152, - /* 153 */ OBJ_SCENERY_153, - /* 154 */ OBJ_SCENERY_154, - /* 155 */ OBJ_SCENERY_155, - /* 156 */ OBJ_SCENERY_156, - /* 157 */ OBJ_SCENERY_157, - /* 158 */ OBJ_SCENERY_158, - /* 159 */ OBJ_SCENERY_159, - /* 160 */ OBJ_SCENERY_160, - /* 161 */ OBJ_SPRITE_CO_POLE, - /* 162 */ OBJ_SPRITE_CO_TREE, - /* 163 */ OBJ_SPRITE_FO_POLE, - /* 164 */ OBJ_SPRITE_FOG_SHADOW, - /* 165 */ OBJ_SPRITE_CO_RUIN1, - /* 166 */ OBJ_SPRITE_CO_RUIN2, - /* 167 */ OBJ_SPRITE_167, - /* 168 */ OBJ_SPRITE_168, - /* 169 */ OBJ_SPRITE_TI_CACTUS, - /* 170 */ OBJ_SPRITE_CO_SMOKE, - /* 171 */ OBJ_SPRITE_VE1_BOSS_TRIGGER1, - /* 172 */ OBJ_SPRITE_VE1_BOSS_TRIGGER2, - /* 173 */ OBJ_SPRITE_VE1_BOSS_TRIGGER3, - /* 174 */ OBJ_SPRITE_VE1_BOSS_TRIGGER4, - /* 175 */ OBJ_SPRITE_GFOX_TARGET, - /* 176 */ OBJ_ACTOR_176, - /* 177 */ OBJ_ACTOR_177, - /* 178 */ OBJ_ACTOR_178, - /* 179 */ OBJ_ACTOR_179, - /* 180 */ OBJ_ACTOR_180, - /* 181 */ OBJ_ACTOR_181, - /* 182 */ OBJ_ACTOR_182, - /* 183 */ OBJ_ACTOR_183, - /* 184 */ OBJ_ACTOR_184, - /* 185 */ OBJ_ACTOR_185, - /* 186 */ OBJ_ACTOR_186, - /* 187 */ OBJ_ACTOR_187, - /* 188 */ OBJ_ACTOR_188, - /* 189 */ OBJ_ACTOR_DEBRIS, - /* 190 */ OBJ_ACTOR_190, - /* 191 */ OBJ_ACTOR_191, - /* 192 */ OBJ_ACTOR_192, - /* 193 */ OBJ_ACTOR_193, - /* 194 */ OBJ_ACTOR_194, - /* 195 */ OBJ_ACTOR_CUTSCENE, - /* 196 */ OBJ_ACTOR_196, - /* 197 */ OBJ_ACTOR_ALLRANGE, - /* 198 */ OBJ_ACTOR_TEAM_BOSS, - /* 199 */ OBJ_ACTOR_199, - /* 200 */ OBJ_ACTOR_EVENT, - /* 201 */ OBJ_ACTOR_201, - /* 202 */ OBJ_ACTOR_202, - /* 203 */ OBJ_ACTOR_SLIPPY_SX, - /* 204 */ OBJ_ACTOR_204, - /* 205 */ OBJ_ACTOR_205, - /* 206 */ OBJ_ACTOR_206, - /* 207 */ OBJ_ACTOR_207, - /* 208 */ OBJ_ACTOR_208, - /* 209 */ OBJ_ACTOR_209, - /* 210 */ OBJ_ACTOR_210, - /* 211 */ OBJ_ACTOR_211, - /* 212 */ OBJ_ACTOR_212, - /* 213 */ OBJ_ACTOR_213, - /* 214 */ OBJ_ACTOR_214, - /* 215 */ OBJ_ACTOR_215, - /* 216 */ OBJ_ACTOR_216, - /* 217 */ OBJ_ACTOR_217, - /* 218 */ OBJ_ACTOR_218, - /* 219 */ OBJ_ACTOR_219, - /* 220 */ OBJ_ACTOR_220, - /* 221 */ OBJ_ACTOR_221, - /* 222 */ OBJ_ACTOR_222, - /* 223 */ OBJ_ACTOR_223, - /* 224 */ OBJ_ACTOR_224, - /* 225 */ OBJ_ACTOR_225, - /* 226 */ OBJ_ACTOR_226, - /* 227 */ OBJ_ACTOR_227, - /* 228 */ OBJ_ACTOR_228, - /* 229 */ OBJ_ACTOR_229, - /* 230 */ OBJ_ACTOR_230, - /* 231 */ OBJ_ACTOR_231, - /* 232 */ OBJ_ACTOR_232, - /* 233 */ OBJ_ACTOR_233, - /* 234 */ OBJ_ACTOR_234, - /* 235 */ OBJ_ACTOR_235, - /* 236 */ OBJ_ACTOR_236, - /* 237 */ OBJ_ACTOR_237, - /* 238 */ OBJ_ACTOR_238, - /* 239 */ OBJ_ACTOR_239, - /* 240 */ OBJ_ACTOR_240, - /* 241 */ OBJ_ACTOR_241, - /* 242 */ OBJ_ACTOR_242, - /* 243 */ OBJ_ACTOR_243, - /* 244 */ OBJ_ACTOR_244, - /* 245 */ OBJ_ACTOR_245, - /* 246 */ OBJ_ACTOR_246, - /* 247 */ OBJ_ACTOR_247, - /* 248 */ OBJ_ACTOR_248, - /* 249 */ OBJ_ACTOR_249, - /* 250 */ OBJ_ACTOR_250, - /* 251 */ OBJ_ACTOR_251, - /* 252 */ OBJ_ACTOR_252, - /* 253 */ OBJ_ACTOR_253, - /* 254 */ OBJ_ACTOR_254, - /* 255 */ OBJ_ACTOR_255, - /* 256 */ OBJ_ACTOR_256, - /* 257 */ OBJ_ACTOR_257, - /* 258 */ OBJ_ACTOR_258, - /* 259 */ OBJ_ACTOR_259, - /* 260 */ OBJ_ACTOR_260, - /* 261 */ OBJ_ACTOR_261, - /* 262 */ OBJ_ACTOR_262, - /* 263 */ OBJ_ACTOR_263, - /* 264 */ OBJ_ACTOR_264, - /* 265 */ OBJ_ACTOR_265, - /* 266 */ OBJ_ACTOR_266, - /* 267 */ OBJ_ACTOR_267, - /* 268 */ OBJ_ACTOR_268, - /* 269 */ OBJ_ACTOR_269, - /* 270 */ OBJ_ACTOR_270, - /* 271 */ OBJ_ACTOR_271, - /* 272 */ OBJ_ACTOR_272, - /* 273 */ OBJ_ACTOR_273, - /* 274 */ OBJ_ACTOR_274, - /* 275 */ OBJ_ACTOR_275, - /* 276 */ OBJ_ACTOR_276, - /* 277 */ OBJ_ACTOR_277, - /* 278 */ OBJ_ACTOR_278, - /* 279 */ OBJ_ACTOR_279, - /* 280 */ OBJ_ACTOR_280, - /* 281 */ OBJ_ACTOR_281, - /* 282 */ OBJ_ACTOR_282, - /* 283 */ OBJ_ACTOR_283, - /* 284 */ OBJ_ACTOR_284, - /* 285 */ OBJ_ACTOR_285, - /* 286 */ OBJ_ACTOR_286, - /* 287 */ OBJ_ACTOR_287, - /* 288 */ OBJ_ACTOR_288, - /* 289 */ OBJ_ACTOR_289, - /* 290 */ OBJ_ACTOR_290, - /* 291 */ OBJ_ACTOR_SUPPLIES, - /* 292 */ OBJ_BOSS_292, - /* 293 */ OBJ_BOSS_293, - /* 294 */ OBJ_BOSS_294, - /* 295 */ OBJ_BOSS_295, - /* 296 */ OBJ_BOSS_296, - /* 297 */ OBJ_BOSS_297, - /* 298 */ OBJ_BOSS_298, - /* 299 */ OBJ_BOSS_299, - /* 300 */ OBJ_BOSS_300, - /* 301 */ OBJ_BOSS_301, - /* 302 */ OBJ_BOSS_A6, - /* 303 */ OBJ_BOSS_303, - /* 304 */ OBJ_BOSS_304, - /* 305 */ OBJ_BOSS_305, - /* 306 */ OBJ_BOSS_TI, - /* 307 */ OBJ_BOSS_ZO, - /* 308 */ OBJ_BOSS_FO, - /* 309 */ OBJ_BOSS_309, - /* 310 */ OBJ_BOSS_310, - /* 311 */ OBJ_BOSS_311, - /* 312 */ OBJ_BOSS_VE2, - /* 313 */ OBJ_BOSS_SZ, - /* 314 */ OBJ_BOSS_SY, - /* 315 */ OBJ_BOSS_SO, - /* 316 */ OBJ_BOSS_KA, - /* 317 */ OBJ_BOSS_KA_BASE, - /* 318 */ OBJ_BOSS_AQ, - /* 319 */ OBJ_BOSS_VE1, - /* 320 */ OBJ_BOSS_320, - /* 321 */ OBJ_BOSS_321, - /* 322 */ OBJ_ITEM_LASERS, - /* 323 */ OBJ_ITEM_CHECKPOINT, - /* 324 */ OBJ_ITEM_SILVER_RING, - /* 325 */ OBJ_ITEM_SILVER_STAR, - /* 326 */ OBJ_ITEM_METEO_WARP, - /* 327 */ OBJ_ITEM_BOMB, - /* 328 */ OBJ_ITEM_PATH_SPLIT_X, - /* 329 */ OBJ_ITEM_PATH_TURN_LEFT, - /* 330 */ OBJ_ITEM_PATH_TURN_RIGHT, - /* 331 */ OBJ_ITEM_PATH_SPLIT_Y, - /* 332 */ OBJ_ITEM_PATH_TURN_UP, - /* 333 */ OBJ_ITEM_PATH_TURN_DOWN, - /* 334 */ OBJ_ITEM_RING_CHECK, - /* 335 */ OBJ_ITEM_1UP, - /* 336 */ OBJ_ITEM_GOLD_RING, - /* 337 */ OBJ_ITEM_WING_REPAIR, - /* 338 */ OBJ_ITEM_TRAINING_RING, - /* 339 */ OBJ_EFFECT_FIRE_SMOKE, - /* 340 */ OBJ_EFFECT_340, - /* 341 */ OBJ_EFFECT_341, - /* 342 */ OBJ_EFFECT_342, - /* 343 */ OBJ_EFFECT_343, - /* 344 */ OBJ_EFFECT_344, - /* 345 */ OBJ_EFFECT_345, - /* 346 */ OBJ_EFFECT_346, - /* 347 */ OBJ_EFFECT_347, - /* 348 */ OBJ_EFFECT_348, - /* 349 */ OBJ_EFFECT_349, - /* 350 */ OBJ_EFFECT_350, - /* 351 */ OBJ_EFFECT_351, - /* 352 */ OBJ_EFFECT_352, - /* 353 */ OBJ_EFFECT_353, - /* 354 */ OBJ_EFFECT_354, - /* 355 */ OBJ_EFFECT_355, - /* 356 */ OBJ_EFFECT_356, - /* 357 */ OBJ_EFFECT_357, - /* 358 */ OBJ_EFFECT_358, - /* 359 */ OBJ_EFFECT_359, - /* 360 */ OBJ_EFFECT_360, - /* 361 */ OBJ_EFFECT_361, - /* 362 */ OBJ_EFFECT_362, - /* 363 */ OBJ_EFFECT_363, - /* 364 */ OBJ_EFFECT_364, - /* 365 */ OBJ_EFFECT_365, - /* 366 */ OBJ_EFFECT_366, - /* 367 */ OBJ_EFFECT_367, - /* 368 */ OBJ_EFFECT_368, - /* 369 */ OBJ_EFFECT_369, - /* 370 */ OBJ_EFFECT_370, - /* 371 */ OBJ_EFFECT_371, - /* 372 */ OBJ_EFFECT_372, - /* 373 */ OBJ_EFFECT_373, - /* 374 */ OBJ_EFFECT_374, - /* 375 */ OBJ_EFFECT_375, - /* 376 */ OBJ_EFFECT_376, - /* 377 */ OBJ_EFFECT_377, - /* 378 */ OBJ_EFFECT_378, - /* 379 */ OBJ_EFFECT_379, - /* 380 */ OBJ_EFFECT_380, - /* 381 */ OBJ_EFFECT_381, - /* 382 */ OBJ_EFFECT_382, - /* 383 */ OBJ_EFFECT_383, - /* 384 */ OBJ_EFFECT_384, - /* 385 */ OBJ_EFFECT_385, - /* 386 */ OBJ_EFFECT_386, - /* 387 */ OBJ_EFFECT_387, - /* 388 */ OBJ_EFFECT_388, - /* 389 */ OBJ_EFFECT_389, - /* 390 */ OBJ_EFFECT_390, - /* 391 */ OBJ_EFFECT_391, - /* 392 */ OBJ_EFFECT_392, - /* 393 */ OBJ_EFFECT_393, - /* 394 */ OBJ_EFFECT_394, - /* 395 */ OBJ_EFFECT_395, - /* 396 */ OBJ_EFFECT_396, - /* 397 */ OBJ_EFFECT_397, - /* 398 */ OBJ_EFFECT_398, - /* 399 */ OBJ_EFFECT_399, - /* 400 */ OBJ_UNK_400, - /* 401 */ OBJ_UNK_401, - /* 402 */ OBJ_UNK_402, - /* 403 */ OBJ_UNK_403, - /* 404 */ OBJ_UNK_404, - /* 405 */ OBJ_UNK_405, - /* 407 */ OBJ_ID_MAX, + /* -1 */ OBJ_INVALID = -1, + /* 0 */ OBJ_SCENERY_CO_STONE_ARCH, + /* 1 */ OBJ_SCENERY_CO_BUMP_1, // Terrain bump 1 + /* 2 */ OBJ_SCENERY_CO_BUMP_2, // Terrain bump 2 + /* 3 */ OBJ_SCENERY_CO_BUMP_3, // Terrain bump 3 + /* 4 */ OBJ_SCENERY_CO_BUMP_4, // Terrain bump 4 + /* 5 */ OBJ_SCENERY_CO_BUMP_5, // Terrain bump 5 + /* 6 */ OBJ_SCENERY_CO_HIGHWAY_1, + /* 7 */ OBJ_SCENERY_CO_HIGHWAY_2, + /* 8 */ OBJ_SCENERY_CO_HIGHWAY_3, + /* 9 */ OBJ_SCENERY_CO_HIGHWAY_4, + /* 10 */ OBJ_SCENERY_CO_BUILDING_1, // Building with "GOOD LUCK!" legend. + /* 11 */ OBJ_SCENERY_CO_BUILDING_2, + /* 12 */ OBJ_SCENERY_CO_BUILDING_3, + /* 13 */ OBJ_SCENERY_CO_BUILDING_4, + /* 14 */ OBJ_SCENERY_CO_BUILDING_5, + /* 15 */ OBJ_SCENERY_CO_BUILDING_6, + /* 16 */ OBJ_SCENERY_CO_BUILDING_7, // Building with Pepper's face on it + /* 17 */ OBJ_SCENERY_CO_BUILDING_8, + /* 18 */ OBJ_SCENERY_CO_BUILDING_ON_FIRE, + /* 19 */ OBJ_SCENERY_CO_TOWER, + /* 20 */ OBJ_SCENERY_CO_ARCH_1, + /* 21 */ OBJ_SCENERY_CO_ARCH_2, + /* 22 */ OBJ_SCENERY_CO_ARCH_3, + /* 23 */ OBJ_SCENERY_CO_RADAR, + /* 24 */ OBJ_SCENERY_CO_HIGHWAY_5, + /* 25 */ OBJ_SCENERY_CO_HIGHWAY_6, + /* 26 */ OBJ_SCENERY_CO_HIGHWAY_7, + /* 27 */ OBJ_SCENERY_CO_HIGHWAY_8, + /* 28 */ OBJ_SCENERY_CO_HIGHWAY_9, + /* 29 */ OBJ_SCENERY_TI_SKULL, + /* 30 */ OBJ_SCENERY_TI_RIB_0, + /* 31 */ OBJ_SCENERY_TI_RIB_1, + /* 32 */ OBJ_SCENERY_TI_RIB_2, + /* 33 */ OBJ_SCENERY_TI_RIB_3, + /* 34 */ OBJ_SCENERY_TI_RIB_4, + /* 35 */ OBJ_SCENERY_TI_RIB_5, + /* 36 */ OBJ_SCENERY_TI_RIB_6, + /* 37 */ OBJ_SCENERY_TI_RIB_7, + /* 38 */ OBJ_SCENERY_TI_RIB_8, + /* 39 */ OBJ_SCENERY_ME_TUNNEL, + /* 40 */ OBJ_SCENERY_CO_BUILDING_9, + /* 41 */ OBJ_SCENERY_CO_BUILDING_10, + /* 42 */ OBJ_SCENERY_IBEAM, + /* 43 */ OBJ_SCENERY_ZO_ROCK_1, + /* 44 */ OBJ_SCENERY_44, + /* 45 */ OBJ_SCENERY_45, + /* 46 */ OBJ_SCENERY_46, + /* 47 */ OBJ_SCENERY_47, + /* 48 */ OBJ_SCENERY_48, + /* 49 */ OBJ_SCENERY_49, + /* 50 */ OBJ_SCENERY_50, + /* 51 */ OBJ_SCENERY_51, + /* 52 */ OBJ_SCENERY_52, + /* 53 */ OBJ_SCENERY_53, + /* 54 */ OBJ_SCENERY_CO_WATERFALL, + /* 55 */ OBJ_SCENERY_CO_ROCKWALL, + /* 56 */ OBJ_SCENERY_CO_DOORS, + /* 57 */ OBJ_SCENERY_57, + /* 58 */ OBJ_SCENERY_58, + /* 59 */ OBJ_SCENERY_59, + /* 60 */ OBJ_SCENERY_60, + /* 61 */ OBJ_SCENERY_61, + /* 62 */ OBJ_SCENERY_62, + /* 63 */ OBJ_SCENERY_63, + /* 64 */ OBJ_SCENERY_64, + /* 65 */ OBJ_SCENERY_65, + /* 66 */ OBJ_SCENERY_66, + /* 67 */ OBJ_SCENERY_67, + /* 68 */ OBJ_SCENERY_68, + /* 69 */ OBJ_SCENERY_69, + /* 70 */ OBJ_SCENERY_70, + /* 71 */ OBJ_SCENERY_71, + /* 72 */ OBJ_SCENERY_72, + /* 73 */ OBJ_SCENERY_73, + /* 74 */ OBJ_SCENERY_74, + /* 75 */ OBJ_SCENERY_75, + /* 76 */ OBJ_SCENERY_76, + /* 77 */ OBJ_SCENERY_77, + /* 78 */ OBJ_SCENERY_78, + /* 79 */ OBJ_SCENERY_79, + /* 80 */ OBJ_SCENERY_80, + /* 81 */ OBJ_SCENERY_81, + /* 82 */ OBJ_SCENERY_82, + /* 83 */ OBJ_SCENERY_83, + /* 84 */ OBJ_SCENERY_84, + /* 85 */ OBJ_SCENERY_85, + /* 86 */ OBJ_SCENERY_86, + /* 87 */ OBJ_SCENERY_87, + /* 88 */ OBJ_SCENERY_88, + /* 89 */ OBJ_SCENERY_89, + /* 90 */ OBJ_SCENERY_90, + /* 91 */ OBJ_SCENERY_91, + /* 92 */ OBJ_SCENERY_92, + /* 93 */ OBJ_SCENERY_93, + /* 94 */ OBJ_SCENERY_94, + /* 95 */ OBJ_SCENERY_95, + /* 96 */ OBJ_SCENERY_96, + /* 97 */ OBJ_SCENERY_97, + /* 98 */ OBJ_SCENERY_98, + /* 99 */ OBJ_SCENERY_99, + /* 100 */ OBJ_SCENERY_100, + /* 101 */ OBJ_SCENERY_101, + /* 102 */ OBJ_SCENERY_102, + /* 103 */ OBJ_SCENERY_103, + /* 104 */ OBJ_SCENERY_104, + /* 105 */ OBJ_SCENERY_105, + /* 106 */ OBJ_SCENERY_106, + /* 107 */ OBJ_SCENERY_107, + /* 108 */ OBJ_SCENERY_108, + /* 109 */ OBJ_SCENERY_109, + /* 110 */ OBJ_SCENERY_110, + /* 111 */ OBJ_SCENERY_111, + /* 112 */ OBJ_SCENERY_112, + /* 113 */ OBJ_SCENERY_113, + /* 114 */ OBJ_SCENERY_114, + /* 115 */ OBJ_SCENERY_115, + /* 116 */ OBJ_SCENERY_116, + /* 117 */ OBJ_SCENERY_117, + /* 118 */ OBJ_SCENERY_118, + /* 119 */ OBJ_SCENERY_119, + /* 120 */ OBJ_SCENERY_120, + /* 121 */ OBJ_SCENERY_121, + /* 122 */ OBJ_SCENERY_122, + /* 123 */ OBJ_SCENERY_123, + /* 124 */ OBJ_SCENERY_124, + /* 125 */ OBJ_SCENERY_125, + /* 126 */ OBJ_SCENERY_126, + /* 127 */ OBJ_SCENERY_127, + /* 128 */ OBJ_SCENERY_128, + /* 129 */ OBJ_SCENERY_129, + /* 130 */ OBJ_SCENERY_130, + /* 131 */ OBJ_SCENERY_131, + /* 132 */ OBJ_SCENERY_132, + /* 133 */ OBJ_SCENERY_133, + /* 134 */ OBJ_SCENERY_134, + /* 135 */ OBJ_SCENERY_135, + /* 136 */ OBJ_SCENERY_136, + /* 137 */ OBJ_SCENERY_137, + /* 138 */ OBJ_SCENERY_138, + /* 139 */ OBJ_SCENERY_139, + /* 140 */ OBJ_SCENERY_140, + /* 141 */ OBJ_SCENERY_141, + /* 142 */ OBJ_SCENERY_142, + /* 143 */ OBJ_SCENERY_143, + /* 144 */ OBJ_SCENERY_144, + /* 145 */ OBJ_SCENERY_145, + /* 146 */ OBJ_SCENERY_146, + /* 147 */ OBJ_SCENERY_147, + /* 148 */ OBJ_SCENERY_148, + /* 149 */ OBJ_SCENERY_149, + /* 150 */ OBJ_SCENERY_150, + /* 151 */ OBJ_SCENERY_151, + /* 152 */ OBJ_SCENERY_152, + /* 153 */ OBJ_SCENERY_153, + /* 154 */ OBJ_SCENERY_154, + /* 155 */ OBJ_SCENERY_155, + /* 156 */ OBJ_SCENERY_156, + /* 157 */ OBJ_SCENERY_157, + /* 158 */ OBJ_SCENERY_158, + /* 159 */ OBJ_SCENERY_159, + /* 160 */ OBJ_SCENERY_160, + /* 161 */ OBJ_SPRITE_CO_POLE, + /* 162 */ OBJ_SPRITE_CO_TREE, + /* 163 */ OBJ_SPRITE_FO_POLE, + /* 164 */ OBJ_SPRITE_FOG_SHADOW, + /* 165 */ OBJ_SPRITE_CO_RUIN1, + /* 166 */ OBJ_SPRITE_CO_RUIN2, + /* 167 */ OBJ_SPRITE_167, + /* 168 */ OBJ_SPRITE_168, + /* 169 */ OBJ_SPRITE_TI_CACTUS, + /* 170 */ OBJ_SPRITE_CO_SMOKE, + /* 171 */ OBJ_SPRITE_VE1_BOSS_TRIGGER1, + /* 172 */ OBJ_SPRITE_VE1_BOSS_TRIGGER2, + /* 173 */ OBJ_SPRITE_VE1_BOSS_TRIGGER3, + /* 174 */ OBJ_SPRITE_VE1_BOSS_TRIGGER4, + /* 175 */ OBJ_SPRITE_GFOX_TARGET, + /* 176 */ OBJ_ACTOR_CO_GARUDA_1, // Robot that pushes buildings. + /* 177 */ OBJ_ACTOR_CO_GARUDA_2, // Robot that throws I-Beams. + /* 178 */ OBJ_ACTOR_CO_GARUDA_3, // Robot that spins I-Beams. + /* 179 */ OBJ_ACTOR_CO_GARUDA_DESTROY, + /* 180 */ OBJ_ACTOR_180, + /* 181 */ OBJ_ACTOR_181, + /* 182 */ OBJ_ACTOR_182, + /* 183 */ OBJ_ACTOR_183, + /* 184 */ OBJ_ACTOR_184, + /* 185 */ OBJ_ACTOR_185, + /* 186 */ OBJ_ACTOR_186, + /* 187 */ OBJ_ACTOR_187, + /* 188 */ OBJ_ACTOR_188, + /* 189 */ OBJ_ACTOR_DEBRIS, + /* 190 */ OBJ_MISSILE_SEEK_TEAM, + /* 191 */ OBJ_MISSILE_SEEK_PLAYER, + /* 192 */ OBJ_ACTOR_192, + /* 193 */ OBJ_ACTOR_193, + /* 194 */ OBJ_ACTOR_194, + /* 195 */ OBJ_ACTOR_CUTSCENE, + /* 196 */ OBJ_ACTOR_196, + /* 197 */ OBJ_ACTOR_ALLRANGE, + /* 198 */ OBJ_ACTOR_TEAM_BOSS, + /* 199 */ OBJ_ACTOR_199, + /* 200 */ OBJ_ACTOR_EVENT, + /* 201 */ OBJ_ACTOR_201, + /* 202 */ OBJ_ACTOR_202, + /* 203 */ OBJ_ACTOR_SLIPPY_SX, + /* 204 */ OBJ_ACTOR_204, + /* 205 */ OBJ_ACTOR_205, + /* 206 */ OBJ_ACTOR_206, + /* 207 */ OBJ_ACTOR_207, + /* 208 */ OBJ_ACTOR_208, + /* 209 */ OBJ_ACTOR_209, + /* 210 */ OBJ_ACTOR_210, + /* 211 */ OBJ_ACTOR_211, + /* 212 */ OBJ_ACTOR_212, + /* 213 */ OBJ_ACTOR_213, + /* 214 */ OBJ_ACTOR_214, + /* 215 */ OBJ_ACTOR_215, + /* 216 */ OBJ_ACTOR_216, + /* 217 */ OBJ_ACTOR_217, + /* 218 */ OBJ_ACTOR_218, + /* 219 */ OBJ_ACTOR_219, + /* 220 */ OBJ_ACTOR_220, + /* 221 */ OBJ_ACTOR_221, + /* 222 */ OBJ_ACTOR_222, + /* 223 */ OBJ_ACTOR_223, + /* 224 */ OBJ_ACTOR_224, + /* 225 */ OBJ_ACTOR_225, + /* 226 */ OBJ_ACTOR_226, + /* 227 */ OBJ_ACTOR_227, + /* 228 */ OBJ_ACTOR_228, + /* 229 */ OBJ_ACTOR_229, + /* 230 */ OBJ_ACTOR_230, + /* 231 */ OBJ_ACTOR_231, + /* 232 */ OBJ_ACTOR_232, + /* 233 */ OBJ_ACTOR_233, + /* 234 */ OBJ_ACTOR_234, + /* 235 */ OBJ_ACTOR_235, + /* 236 */ OBJ_ACTOR_236, + /* 237 */ OBJ_ACTOR_237, + /* 238 */ OBJ_ACTOR_238, + /* 239 */ OBJ_ACTOR_239, + /* 240 */ OBJ_ACTOR_240, + /* 241 */ OBJ_ACTOR_241, + /* 242 */ OBJ_ACTOR_242, + /* 243 */ OBJ_ACTOR_243, + /* 244 */ OBJ_ACTOR_244, + /* 245 */ OBJ_ACTOR_245, + /* 246 */ OBJ_ACTOR_246, + /* 247 */ OBJ_ACTOR_247, + /* 248 */ OBJ_ACTOR_248, + /* 249 */ OBJ_ACTOR_249, + /* 250 */ OBJ_ACTOR_250, + /* 251 */ OBJ_ACTOR_251, + /* 252 */ OBJ_ACTOR_252, + /* 253 */ OBJ_ACTOR_253, + /* 254 */ OBJ_ACTOR_254, + /* 255 */ OBJ_ACTOR_255, + /* 256 */ OBJ_ACTOR_256, + /* 257 */ OBJ_ACTOR_257, + /* 258 */ OBJ_ACTOR_258, + /* 259 */ OBJ_ACTOR_259, + /* 260 */ OBJ_ACTOR_260, + /* 261 */ OBJ_ACTOR_261, + /* 262 */ OBJ_ACTOR_262, + /* 263 */ OBJ_ACTOR_263, + /* 264 */ OBJ_ACTOR_264, + /* 265 */ OBJ_ACTOR_265, + /* 266 */ OBJ_ACTOR_266, + /* 267 */ OBJ_ACTOR_267, + /* 268 */ OBJ_ACTOR_268, + /* 269 */ OBJ_ACTOR_269, + /* 270 */ OBJ_ACTOR_270, + /* 271 */ OBJ_ACTOR_271, + /* 272 */ OBJ_ACTOR_272, + /* 273 */ OBJ_ACTOR_FO_RADAR, + /* 274 */ OBJ_ACTOR_SZ_SPACE_JUNK, + /* 275 */ OBJ_ACTOR_275, + /* 276 */ OBJ_ACTOR_276, + /* 277 */ OBJ_ACTOR_277, + /* 278 */ OBJ_ACTOR_278, + /* 279 */ OBJ_ACTOR_279, + /* 280 */ OBJ_ACTOR_280, + /* 281 */ OBJ_ACTOR_281, + /* 282 */ OBJ_ACTOR_282, + /* 283 */ OBJ_ACTOR_283, + /* 284 */ OBJ_ACTOR_284, + /* 285 */ OBJ_ACTOR_285, + /* 286 */ OBJ_ACTOR_286, + /* 287 */ OBJ_ACTOR_287, + /* 288 */ OBJ_ACTOR_288, + /* 289 */ OBJ_ACTOR_289, + /* 290 */ OBJ_ACTOR_290, + /* 291 */ OBJ_ACTOR_SUPPLIES, + /* 292 */ OBJ_BOSS_CO_GRANGA, + /* 293 */ OBJ_BOSS_CO_CARRIER, + /* 294 */ OBJ_BOSS_294, + /* 295 */ OBJ_BOSS_295, + /* 296 */ OBJ_BOSS_296, + /* 297 */ OBJ_BOSS_297, + /* 298 */ OBJ_BOSS_298, + /* 299 */ OBJ_BOSS_299, + /* 300 */ OBJ_BOSS_300, + /* 301 */ OBJ_BOSS_301, + /* 302 */ OBJ_BOSS_A6, + /* 303 */ OBJ_BOSS_SX_SPYBORG, + /* 304 */ OBJ_BOSS_304, + /* 305 */ OBJ_BOSS_305, + /* 306 */ OBJ_BOSS_TI, + /* 307 */ OBJ_BOSS_ZO, + /* 308 */ OBJ_BOSS_FO, + /* 309 */ OBJ_BOSS_309, + /* 310 */ OBJ_BOSS_310, + /* 311 */ OBJ_BOSS_311, + /* 312 */ OBJ_BOSS_VE2, + /* 313 */ OBJ_BOSS_SZ_GREAT_FOX, + /* 314 */ OBJ_BOSS_SY, + /* 315 */ OBJ_BOSS_SO, + /* 316 */ OBJ_BOSS_KA, + /* 317 */ OBJ_BOSS_KA_BASE, + /* 318 */ OBJ_BOSS_AQ, + /* 319 */ OBJ_BOSS_VE1, + /* 320 */ OBJ_BOSS_320, + /* 321 */ OBJ_BOSS_321, + /* 322 */ OBJ_ITEM_LASERS, + /* 323 */ OBJ_ITEM_CHECKPOINT, + /* 324 */ OBJ_ITEM_SILVER_RING, + /* 325 */ OBJ_ITEM_SILVER_STAR, + /* 326 */ OBJ_ITEM_METEO_WARP, + /* 327 */ OBJ_ITEM_BOMB, + /* 328 */ OBJ_ITEM_PATH_SPLIT_X, + /* 329 */ OBJ_ITEM_PATH_TURN_LEFT, + /* 330 */ OBJ_ITEM_PATH_TURN_RIGHT, + /* 331 */ OBJ_ITEM_PATH_SPLIT_Y, + /* 332 */ OBJ_ITEM_PATH_TURN_UP, + /* 333 */ OBJ_ITEM_PATH_TURN_DOWN, + /* 334 */ OBJ_ITEM_RING_CHECK, + /* 335 */ OBJ_ITEM_1UP, + /* 336 */ OBJ_ITEM_GOLD_RING, + /* 337 */ OBJ_ITEM_WING_REPAIR, + /* 338 */ OBJ_ITEM_TRAINING_RING, + /* 339 */ OBJ_EFFECT_FIRE_SMOKE, + /* 340 */ OBJ_EFFECT_340, + /* 341 */ OBJ_EFFECT_341, + /* 342 */ OBJ_EFFECT_342, + /* 343 */ OBJ_EFFECT_343, + /* 344 */ OBJ_EFFECT_344, + /* 345 */ OBJ_EFFECT_345, + /* 346 */ OBJ_EFFECT_346, + /* 347 */ OBJ_EFFECT_347, + /* 348 */ OBJ_EFFECT_348, + /* 349 */ OBJ_EFFECT_349, + /* 350 */ OBJ_EFFECT_350, + /* 351 */ OBJ_EFFECT_351, + /* 352 */ OBJ_EFFECT_CLOUDS, + /* 353 */ OBJ_EFFECT_ENEMY_LASER_1, + /* 354 */ OBJ_EFFECT_354, + /* 355 */ OBJ_EFFECT_355, + /* 356 */ OBJ_EFFECT_356, + /* 357 */ OBJ_EFFECT_357, + /* 358 */ OBJ_EFFECT_358, + /* 359 */ OBJ_EFFECT_359, + /* 360 */ OBJ_EFFECT_360, + /* 361 */ OBJ_EFFECT_361, + /* 362 */ OBJ_EFFECT_362, + /* 363 */ OBJ_EFFECT_363, + /* 364 */ OBJ_EFFECT_364, + /* 365 */ OBJ_EFFECT_365, + /* 366 */ OBJ_EFFECT_366, + /* 367 */ OBJ_EFFECT_367, + /* 368 */ OBJ_EFFECT_368, + /* 369 */ OBJ_EFFECT_369, + /* 370 */ OBJ_EFFECT_370, + /* 371 */ OBJ_EFFECT_371, + /* 372 */ OBJ_EFFECT_372, + /* 373 */ OBJ_EFFECT_TIMED_SFX, + /* 374 */ OBJ_EFFECT_374, + /* 375 */ OBJ_EFFECT_375, + /* 376 */ OBJ_EFFECT_376, + /* 377 */ OBJ_EFFECT_377, + /* 378 */ OBJ_EFFECT_378, + /* 379 */ OBJ_EFFECT_379, + /* 380 */ OBJ_EFFECT_380, + /* 381 */ OBJ_EFFECT_381, + /* 382 */ OBJ_EFFECT_382, + /* 383 */ OBJ_EFFECT_383, + /* 384 */ OBJ_EFFECT_384, + /* 385 */ OBJ_EFFECT_385, + /* 386 */ OBJ_EFFECT_386, + /* 387 */ OBJ_EFFECT_387, + /* 388 */ OBJ_EFFECT_388, + /* 389 */ OBJ_EFFECT_389, + /* 390 */ OBJ_EFFECT_390, + /* 391 */ OBJ_EFFECT_391, + /* 392 */ OBJ_EFFECT_392, + /* 393 */ OBJ_EFFECT_393, + /* 394 */ OBJ_EFFECT_394, + /* 395 */ OBJ_EFFECT_395, + /* 396 */ OBJ_EFFECT_396, + /* 397 */ OBJ_EFFECT_397, + /* 398 */ OBJ_EFFECT_398, + /* 399 */ OBJ_EFFECT_399, + /* 400 */ OBJ_UNK_400, + /* 401 */ OBJ_UNK_401, + /* 402 */ OBJ_UNK_402, + /* 403 */ OBJ_UNK_403, + /* 404 */ OBJ_UNK_404, + /* 405 */ OBJ_UNK_405, + /* 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_START OBJ_SCENERY_CO_STONE_ARCH +#define OBJ_SPRITE_START OBJ_SPRITE_CO_POLE +#define OBJ_ACTOR_START OBJ_ACTOR_CO_GARUDA_1 +#define OBJ_BOSS_START OBJ_BOSS_CO_GRANGA +#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 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 @@ -775,7 +773,7 @@ typedef enum AllRangeAi { /* 7 */ AI360_ANDREW, /* 8 */ AI360_KATT, /* 9 */ AI360_BILL, - /* 10 */ AI360_10, + /* 10 */ AI360_ENEMY, /* 100 */ AI360_GREAT_FOX = 100, /* 200 */ AI360_MISSILE = 200, /* 200 */ AI360_EVENT_HANDLER = 1000, @@ -937,106 +935,106 @@ typedef enum { /* 50 */ LN_VWK_MAX, } BossLNvwork; -typedef Scenery Scenery_0; -typedef Scenery Scenery_1; -typedef Scenery Scenery_2; -typedef Scenery Scenery_3; -typedef Scenery Scenery_4; -typedef Scenery Scenery_5; -typedef Scenery Scenery_6; -typedef Scenery Scenery_7; -typedef Scenery Scenery_8; -typedef Scenery Scenery_9; -typedef Scenery Scenery_10; -typedef Scenery Scenery_11; -typedef Scenery Scenery_12; -typedef Scenery Scenery_13; -typedef Scenery Scenery_14; -typedef Scenery Scenery_15; -typedef Scenery Scenery_16; -typedef Scenery Scenery_17; -typedef Scenery Scenery_18; -typedef Scenery Scenery_19; -typedef Scenery Scenery_20; -typedef Scenery Scenery_21; -typedef Scenery Scenery_22; -typedef Scenery Scenery_23; -typedef Scenery Scenery_24; -typedef Scenery Scenery_25; -typedef Scenery Scenery_26; -typedef Scenery Scenery_27; -typedef Scenery Scenery_28; -typedef Scenery Scenery_29; -typedef Scenery Scenery_30; -typedef Scenery Scenery_31; -typedef Scenery Scenery_32; -typedef Scenery Scenery_33; -typedef Scenery Scenery_34; -typedef Scenery Scenery_35; -typedef Scenery Scenery_36; -typedef Scenery Scenery_37; -typedef Scenery Scenery_38; -typedef Scenery MeteoTunnel; -typedef Scenery Scenery_40; -typedef Scenery Scenery_41; -typedef Scenery Scenery_42; -typedef Scenery Scenery_43; -typedef Scenery Scenery_44; -typedef Scenery Scenery_45; -typedef Scenery Scenery_46; -typedef Scenery Scenery_47; -typedef Scenery Scenery_48; -typedef Scenery Scenery_49; -typedef Scenery Scenery_50; -typedef Scenery Scenery_51; -typedef Scenery Scenery_52; -typedef Scenery Scenery_53; -typedef Scenery Scenery_54; -typedef Scenery Scenery_55; -typedef Scenery Scenery_56; -typedef Scenery Scenery_57; -typedef Scenery Scenery_58; -typedef Scenery Scenery_59; -typedef Scenery Scenery_60; -typedef Scenery Scenery_61; -typedef Scenery Scenery_62; -typedef Scenery Scenery_63; -typedef Scenery Scenery_64; -typedef Scenery Scenery_65; -typedef Scenery Scenery_66; -typedef Scenery Scenery_67; -typedef Scenery Scenery_68; -typedef Scenery Scenery_69; -typedef Scenery Scenery_70; -typedef Scenery Scenery_71; -typedef Scenery Scenery_72; -typedef Scenery Scenery_73; -typedef Scenery Scenery_74; -typedef Scenery Scenery_75; -typedef Scenery Scenery_76; -typedef Scenery Scenery_77; -typedef Scenery Scenery_78; -typedef Scenery Scenery_79; -typedef Scenery Scenery_80; -typedef Scenery Scenery_81; -typedef Scenery Scenery_82; -typedef Scenery Scenery_83; -typedef Scenery Scenery_84; -typedef Scenery Scenery_85; -typedef Scenery Scenery_86; -typedef Scenery Scenery_87; -typedef Scenery Scenery_88; -typedef Scenery Scenery_89; -typedef Scenery Scenery_90; -typedef Scenery Scenery_91; -typedef Scenery Scenery_92; -typedef Scenery Scenery_93; -typedef Scenery Scenery_94; -typedef Scenery Scenery_95; -typedef Scenery Scenery_96; -typedef Scenery Scenery_97; -typedef Scenery Scenery_98; -typedef Scenery Scenery_99; +typedef Scenery Scenery_0; +typedef Scenery Scenery_1; +typedef Scenery Scenery_2; +typedef Scenery Scenery_3; +typedef Scenery Scenery_4; +typedef Scenery Scenery_5; +typedef Scenery Scenery_6; +typedef Scenery Scenery_7; +typedef Scenery Scenery_8; +typedef Scenery Scenery_9; +typedef Scenery Scenery_10; +typedef Scenery Scenery_11; +typedef Scenery Scenery_12; +typedef Scenery Scenery_13; +typedef Scenery Scenery_14; +typedef Scenery Scenery_15; +typedef Scenery Scenery_16; +typedef Scenery Scenery_17; +typedef Scenery CoBuildingOnFire; +typedef Scenery Scenery_19; +typedef Scenery Scenery_20; +typedef Scenery Scenery_21; +typedef Scenery Scenery_22; +typedef Scenery Scenery_23; +typedef Scenery Scenery_24; +typedef Scenery Scenery_25; +typedef Scenery Scenery_26; +typedef Scenery Scenery_27; +typedef Scenery Scenery_28; +typedef Scenery Scenery_29; +typedef Scenery Scenery_30; +typedef Scenery Scenery_31; +typedef Scenery Scenery_32; +typedef Scenery Scenery_33; +typedef Scenery Scenery_34; +typedef Scenery Scenery_35; +typedef Scenery Scenery_36; +typedef Scenery Scenery_37; +typedef Scenery Scenery_38; +typedef Scenery MeteoTunnel; +typedef Scenery CoBuilding9; +typedef Scenery CoBuilding10; +typedef Scenery CoIBeam; +typedef Scenery Scenery_43; +typedef Scenery Scenery_44; +typedef Scenery Scenery_45; +typedef Scenery Scenery_46; +typedef Scenery Scenery_47; +typedef Scenery Scenery_48; +typedef Scenery Scenery_49; +typedef Scenery Scenery_50; +typedef Scenery Scenery_51; +typedef Scenery Scenery_52; +typedef Scenery Scenery_53; +typedef Scenery CoWaterfall; +typedef Scenery Scenery_55; +typedef Scenery CoDoors; +typedef Scenery Scenery_57; +typedef Scenery Scenery_58; +typedef Scenery Scenery_59; +typedef Scenery Scenery_60; +typedef Scenery Scenery_61; +typedef Scenery Scenery_62; +typedef Scenery Scenery_63; +typedef Scenery Scenery_64; +typedef Scenery Scenery_65; +typedef Scenery Scenery_66; +typedef Scenery Scenery_67; +typedef Scenery Scenery_68; +typedef Scenery Scenery_69; +typedef Scenery Scenery_70; +typedef Scenery Scenery_71; +typedef Scenery Scenery_72; +typedef Scenery Scenery_73; +typedef Scenery Scenery_74; +typedef Scenery Scenery_75; +typedef Scenery Scenery_76; +typedef Scenery Scenery_77; +typedef Scenery Scenery_78; +typedef Scenery Scenery_79; +typedef Scenery Scenery_80; +typedef Scenery Scenery_81; +typedef Scenery Scenery_82; +typedef Scenery Scenery_83; +typedef Scenery Scenery_84; +typedef Scenery Scenery_85; +typedef Scenery Scenery_86; +typedef Scenery Scenery_87; +typedef Scenery Scenery_88; +typedef Scenery Scenery_89; +typedef Scenery Scenery_90; +typedef Scenery Scenery_91; +typedef Scenery Scenery_92; +typedef Scenery Scenery_93; +typedef Scenery Scenery_94; +typedef Scenery Scenery_95; +typedef Scenery Scenery_96; +typedef Scenery Scenery_97; +typedef Scenery Scenery_98; +typedef Scenery Scenery_99; typedef Scenery Scenery_100; typedef Scenery Scenery_101; typedef Scenery Scenery_102; @@ -1113,10 +1111,10 @@ typedef Sprite Ve1BossTrigger2; typedef Sprite Ve1BossTrigger3; typedef Sprite Ve1BossTrigger4; typedef Sprite GfoxTarget; -typedef Actor Actor176; -typedef Actor Actor177; -typedef Actor Actor178; -typedef Actor Actor179; +typedef Actor CoGaruda1; +typedef Actor CoGaruda2; +typedef Actor CoGaruda3; +typedef Actor CoGarudaDestroy; typedef Actor Actor180; typedef Actor Actor181; typedef Actor Actor182; @@ -1210,8 +1208,8 @@ typedef Actor Actor269; typedef Actor Actor270; typedef Actor Actor271; typedef Actor Actor272; -typedef Actor Actor273; -typedef Actor Actor274; +typedef Actor FoRadar; +typedef Actor ActorSpaceJunk; typedef Actor Actor275; typedef Actor Actor276; typedef Actor Actor277; @@ -1229,8 +1227,8 @@ typedef Actor Actor288; typedef Actor Actor289; typedef Actor Actor290; typedef Actor ActorSupplies; -typedef Boss Boss292; -typedef Boss Boss293; +typedef Boss Granga; +typedef Boss Carrier; typedef Boss Boss294; typedef Boss Boss295; typedef Boss Boss296; @@ -1240,18 +1238,18 @@ typedef Boss Boss299; typedef Boss Boss300; typedef Boss Boss301; typedef Boss BossA6; -typedef Boss Boss303; +typedef Boss Spyborg; typedef Boss Boss304; typedef Boss Boss305; typedef Boss Boss306; typedef Boss BossZO; -typedef Boss Boss308; +typedef Boss BossFO; typedef Boss Boss309; typedef Boss Boss310; typedef Boss Boss311; -typedef Boss Boss312; -typedef Boss Boss313; -typedef Boss Boss314; +typedef Boss BossVE2; +typedef Boss GreatFoxSZ; +typedef Boss BossSY; typedef Boss BossSO; typedef Boss Saucerer; typedef Boss Frontlinebase; @@ -1289,7 +1287,7 @@ typedef Effect Effect348; typedef Effect Effect349; typedef Effect Effect350; typedef Effect Effect351; -typedef Effect Effect352; +typedef Effect Clouds; typedef Effect Effect353; typedef Effect Effect354; typedef Effect Effect355; @@ -1310,7 +1308,7 @@ typedef Effect Effect369; typedef Effect Effect370; typedef Effect Effect371; typedef Effect Effect372; -typedef Effect Effect373; +typedef Effect TimedSfx; typedef Effect Effect374; typedef Effect Effect375; typedef Effect Effect376; @@ -1338,5 +1336,4 @@ typedef Effect Effect397; typedef Effect Effect398; typedef Effect Effect399; - #endif diff --git a/include/sf64player.h b/include/sf64player.h index 2d191a66..72aee784 100644 --- a/include/sf64player.h +++ b/include/sf64player.h @@ -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 |