mirror of
https://github.com/HarbourMasters/Starship
synced 2026-06-22 17:22:57 -04:00
General docs (#269)
* fox_display.c DOCS * PRINTF * actor->destroy boolean * corneria docs * Boss->unk_04C to Boss->animFrame * aCoGrangaWalkingAnim * more corneria docs * Spawner * Spawner code refined * Spawner description * Actor Spawn guard * Molar Rock (name by @inspectredc) * more docs * actor docs * initial disassembly config for lodgenet * correct vram addresses for lodgenet * Actor Docs * More actor docs * more actor docs * correction * correction * more actor docs * Preliminary work for Effect documentation * Change Init for Setup * fox_play cleanup and defake * fox_zo function names * fox_so function renaming * more object docs * venom 1 actors * actor docs * some fox_bo docs * some fox_fo corrections * fox_ma obj->this * fox_ma renamings * fox_ma docs * fox_ti Actors * revert permuter settings to ido * some renames on fox_andross.c * fox_sy actors * object names * corrections * some effect comments * fix AudioTable struct and data to avoid UB * uintptr_t in audio * audio load changes * event id enum usage in fox_sy * clear padding in sPlaylists * HUD_FoBase_ExplodeCs * HUD
This commit is contained in:
Alejandro Asenjo Nitti
committed by
GitHub
GitHub
parent
83c5442915
commit
0251769d16
+28
-26
@@ -106,36 +106,36 @@ void AllRange_DrawCountdown(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void Boss309_Update(Boss309* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BOSS309_UPDATE, this);
|
||||
void BoBase_Update(BoBase* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_BASE_UPDATE, this);
|
||||
}
|
||||
|
||||
void Boss309_Draw(Boss309* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BOSS309_DRAW, this);
|
||||
void BoBase_Draw(BoBase* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_BASE_DRAW, this);
|
||||
}
|
||||
|
||||
void Boss310_Update(Boss310* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BOSS310_UPDATE, this);
|
||||
void BoBaseShield_Update(BoBaseShield* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_BASE_SHIELD_UPDATE, this);
|
||||
}
|
||||
|
||||
void Boss310_Draw(Boss310* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BOSS310_DRAW, this);
|
||||
void BoBaseShield_Draw(BoBaseShield* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_BASE_SHIELD_DRAW, this);
|
||||
}
|
||||
|
||||
void Actor271_Update(Actor271* this) {
|
||||
OvlI4_CallFunction(OVLCALL_ACTOR271_UPDATE, this);
|
||||
void BoShieldReactor_Update(BoShieldReactor* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_SHIELD_REACTOR_UPDATE, this);
|
||||
}
|
||||
|
||||
void Actor271_Draw(Actor271* this) {
|
||||
OvlI4_CallFunction(OVLCALL_ACTOR271_DRAW, this);
|
||||
void BoShieldReactor_Draw(BoShieldReactor* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_SHIELD_REACTOR_DRAW, this);
|
||||
}
|
||||
|
||||
void Actor272_Update(Actor272* this) {
|
||||
OvlI4_CallFunction(OVLCALL_ACTOR272_UPDATE, this);
|
||||
void BoLaserCannon_Update(BoLaserCannon* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_LASER_CANNON_UPDATE, this);
|
||||
}
|
||||
|
||||
void Actor272_Draw(Actor272* this) {
|
||||
OvlI4_CallFunction(OVLCALL_ACTOR272_DRAW, this);
|
||||
void BoLaserCannon_Draw(BoLaserCannon* this) {
|
||||
OvlI4_CallFunction(OVLCALL_BO_LASER_CANNON_DRAW, this);
|
||||
}
|
||||
|
||||
void AllRange_GreatFoxRepair(Player* player) {
|
||||
@@ -309,8 +309,9 @@ void ActorAllRange_SetShadowData(Actor* this) {
|
||||
if (this->drawShadow && (gLevelMode == LEVELMODE_ALL_RANGE) && (gLevelType == LEVELTYPE_PLANET)) {
|
||||
for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) {
|
||||
if ((scenery360->obj.status == OBJ_ACTIVE) &&
|
||||
((scenery360->obj.id == OBJ_SCENERY_150) || (scenery360->obj.id == OBJ_SCENERY_149) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_148) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
|
||||
((scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_1) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3)) &&
|
||||
(fabsf(scenery360->obj.pos.x - this->obj.pos.x) < 2500.0f) &&
|
||||
(fabsf(scenery360->obj.pos.z - this->obj.pos.z) < 2500.0f)) {
|
||||
@@ -332,8 +333,9 @@ void ActorAllRange_SetShadowData(Actor* this) {
|
||||
spCC.y = spD8.y + temp1.y;
|
||||
spCC.z = spD8.z + temp1.z;
|
||||
|
||||
if ((scenery360->obj.id == OBJ_SCENERY_149) || (scenery360->obj.id == OBJ_SCENERY_150)) {
|
||||
if (scenery360->obj.id == OBJ_SCENERY_149) {
|
||||
if ((scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3)) {
|
||||
if (scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) {
|
||||
colId = COL1_5;
|
||||
} else {
|
||||
colId = COL1_6;
|
||||
@@ -831,10 +833,10 @@ s32 func_360_8003049C(ActorAllRange* this) {
|
||||
|
||||
if (boss->obj.id == OBJ_BOSS_CO_CARRIER) {
|
||||
var_ft5 = 350.0f;
|
||||
} else if (boss->obj.id == OBJ_BOSS_309) {
|
||||
} else if (boss->obj.id == OBJ_BOSS_BO_BASE) {
|
||||
sp44 = 2000.0f;
|
||||
var_ft5 = 750.0f;
|
||||
} else if (boss->obj.id == OBJ_BOSS_KA_BASE) {
|
||||
} else if (boss->obj.id == OBJ_BOSS_KA_FLBASE) {
|
||||
sp44 = 1500.0f;
|
||||
var_ft5 = 700.0f;
|
||||
}
|
||||
@@ -2127,8 +2129,8 @@ void ActorAllRange_Update(ActorAllRange* this) {
|
||||
spA8.y = 70.0f;
|
||||
spA8.z = -70.0f;
|
||||
Matrix_MultVec3fNoTranslate(gCalcMatrix, &spA8, &sp9C);
|
||||
func_effect_80078E50(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z,
|
||||
3.1f);
|
||||
Effect_Effect393_Spawn(this->obj.pos.x + sp9C.x, this->obj.pos.y + sp9C.y, this->obj.pos.z + sp9C.z,
|
||||
3.1f);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2260,7 +2262,7 @@ void ActorAllRange_Update(ActorAllRange* this) {
|
||||
this->timer_0BE = 2;
|
||||
this->obj.status = OBJ_DYING;
|
||||
this->itemDrop = DROP_NONE;
|
||||
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15);
|
||||
Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, 0.0f, 0.0f, 5.0f, 15);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
} else {
|
||||
this->dmgType = DMG_BEAM;
|
||||
@@ -2339,7 +2341,7 @@ void ActorAllRange_DrawBarrelRoll(ActorAllRange* this) {
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_67);
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, alpha);
|
||||
gDPSetEnvColor(gMasterDisp++, 0, 0, 160, alpha);
|
||||
gSPDisplayList(gMasterDisp++, D_101DC10);
|
||||
gSPDisplayList(gMasterDisp++, aBarrelRollTex);
|
||||
Matrix_Pop(&gGfxMatrix);
|
||||
}
|
||||
}
|
||||
|
||||
+112
-109
@@ -61,14 +61,14 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
|
||||
if (shot->obj.pos.y < (gGroundHeight + 450.0f)) {
|
||||
gCameraShake = 15;
|
||||
if (gGroundSurface == SURFACE_WATER) {
|
||||
func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 0);
|
||||
func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 5);
|
||||
func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 10);
|
||||
func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
|
||||
shot->unk_48 * 0.5f);
|
||||
Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 0);
|
||||
Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 5);
|
||||
Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 10);
|
||||
Effect_Effect372_Spawn2(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
|
||||
shot->unk_48 * 0.5f);
|
||||
Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
|
||||
} else {
|
||||
func_enmy_80062B60(shot->obj.pos.x, shot->obj.pos.z, 0, shot->unk_48 * 3.0f);
|
||||
@@ -83,8 +83,8 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
|
||||
if (var_fv1 > 2.0f) {
|
||||
var_fv1 = 2.0f;
|
||||
}
|
||||
func_effect_8007B550(shot->obj.pos.x, gGroundHeight + 6.0f, shot->obj.pos.z,
|
||||
shot->unk_48 * (1.5f + var_fv1), var_fv0);
|
||||
Effect_Effect385_Spawn(shot->obj.pos.x, gGroundHeight + 6.0f, shot->obj.pos.z,
|
||||
shot->unk_48 * (1.5f + var_fv1), var_fv0);
|
||||
}
|
||||
|
||||
if (gVersusMode) {
|
||||
@@ -92,7 +92,7 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
|
||||
} else {
|
||||
var_v0 = 0;
|
||||
}
|
||||
func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0);
|
||||
Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, shot->unk_48 * 1.5f, var_v0);
|
||||
if (gUseDynaFloor) {
|
||||
var_fs0 = 5.0f;
|
||||
if (shot->obj.pos.y > 300.0f) {
|
||||
@@ -105,15 +105,15 @@ void PlayerShot_ExplodeBomb(PlayerShot* shot) {
|
||||
var_fs0 = 4.0f;
|
||||
}
|
||||
var_fs0 *= 2.0f;
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0);
|
||||
func_effect_8007AFD0(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 50.0f, 0.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 46.0f, 19.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 35.0f, 35.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 19.0f, 46.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, 0.0f, 50.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -50.0f, 0.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -46.0f, 19.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -35.0f, 35.0f, var_fs0);
|
||||
Effect_Effect382_Spawn(shot->obj.pos.x, shot->obj.pos.z, -19.0f, 46.0f, var_fs0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -144,15 +144,15 @@ void PlayerShot_Impact(PlayerShot* shot) {
|
||||
shot->vel.x = shot->vel.y = shot->vel.z = 0.0f;
|
||||
if (gCurrentLevel == LEVEL_AQUAS) {
|
||||
gLight3R = gLight3G = gLight3B = 0;
|
||||
func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4);
|
||||
func_effect_8007C120(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30);
|
||||
Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, 4);
|
||||
Effect_Effect390_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 0.0f, 0.0f, 0.0f, 0.3f, 30);
|
||||
} else {
|
||||
if (gVersusMode) {
|
||||
var_v0_2 = shot->sourceId + 10;
|
||||
} else {
|
||||
var_v0_2 = 12;
|
||||
}
|
||||
func_effect_8007B344(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2);
|
||||
Effect_Effect384_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 10.0f, var_v0_2);
|
||||
func_effect_8007D2C8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 4.0f);
|
||||
}
|
||||
} else {
|
||||
@@ -165,7 +165,7 @@ void PlayerShot_SetupEffect344(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32
|
||||
s32 time) {
|
||||
Effect_Initialize(effect);
|
||||
effect->obj.status = OBJ_INIT;
|
||||
effect->obj.id = OBJ_EFFECT_344;
|
||||
effect->obj.id = OBJ_EFFECT_EXPLOSION_MARK_1;
|
||||
effect->obj.pos.x = xPos;
|
||||
effect->obj.pos.y = yPos;
|
||||
effect->obj.pos.z = zPos;
|
||||
@@ -198,7 +198,7 @@ void PlayerShot_SpawnEffect344(f32 xPos, f32 yPos, f32 zPos, f32 arg3, f32 arg4,
|
||||
void PlayerShot_SetupEffect345(Effect* effect, f32 xPos, f32 yPos, f32 zPos, f32 yRot, f32 scale) {
|
||||
Effect_Initialize(effect);
|
||||
effect->obj.status = OBJ_INIT;
|
||||
effect->obj.id = OBJ_EFFECT_345;
|
||||
effect->obj.id = OBJ_EFFECT_LASER_MARK_1;
|
||||
effect->obj.pos.x = xPos;
|
||||
effect->obj.pos.y = yPos;
|
||||
effect->obj.pos.z = zPos;
|
||||
@@ -504,7 +504,7 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
sp58.z = obj->pos.z;
|
||||
useCol2 = false;
|
||||
switch (objId) {
|
||||
case OBJ_ACTOR_180:
|
||||
case OBJ_ACTOR_ME_MOLAR_ROCK:
|
||||
objId = COL1_0;
|
||||
break;
|
||||
case OBJ_SCENERY_CO_BUMP_4:
|
||||
@@ -512,19 +512,19 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
objId = COL2_1;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_149:
|
||||
case OBJ_SCENERY_FO_MOUNTAIN_2:
|
||||
objId = COL1_5;
|
||||
break;
|
||||
case OBJ_SCENERY_150:
|
||||
case OBJ_SCENERY_FO_MOUNTAIN_3:
|
||||
objId = COL1_6;
|
||||
break;
|
||||
case OBJ_BOSS_FO:
|
||||
case OBJ_BOSS_FO_BASE:
|
||||
objId = COL1_4;
|
||||
break;
|
||||
case OBJ_BOSS_VE2:
|
||||
case OBJ_BOSS_VE2_BASE:
|
||||
objId = COL1_9;
|
||||
break;
|
||||
case OBJ_BOSS_309:
|
||||
case OBJ_BOSS_BO_BASE:
|
||||
objId = COL1_7;
|
||||
break;
|
||||
case ACTOR_EVENT_ID:
|
||||
@@ -536,23 +536,23 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
case OBJ_SCENERY_ME_TUNNEL:
|
||||
objId = COL1_1;
|
||||
break;
|
||||
case OBJ_SCENERY_120:
|
||||
case OBJ_SCENERY_AQ_CORAL_REEF_2:
|
||||
objId = COL2_18;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_143:
|
||||
case OBJ_SCENERY_VS_KA_FLBASE:
|
||||
objId = COL2_17;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_124:
|
||||
case OBJ_SCENERY_AQ_BUMP_1:
|
||||
objId = COL2_15;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_126:
|
||||
case OBJ_SCENERY_AQ_BUMP_2:
|
||||
objId = COL2_16;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_47:
|
||||
case OBJ_SCENERY_ZO_ISLAND:
|
||||
objId = COL2_7;
|
||||
useCol2 = true;
|
||||
break;
|
||||
@@ -561,43 +561,43 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_CO_BUMP_3:
|
||||
case OBJ_SCENERY_69:
|
||||
case OBJ_SCENERY_MA_TERRAIN_BUMP:
|
||||
objId = COL2_3;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_140:
|
||||
case OBJ_SCENERY_VS_PYRAMID_1:
|
||||
objId = COL2_4;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_141:
|
||||
case OBJ_SCENERY_VS_PYRAMID_2:
|
||||
objId = COL2_6;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_117:
|
||||
case OBJ_SCENERY_AQ_CORAL_REEF_1:
|
||||
objId = COL2_14;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_70:
|
||||
case OBJ_SCENERY_MA_FLOOR_1:
|
||||
objId = COL2_8;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_72:
|
||||
case OBJ_SCENERY_MA_FLOOR_3:
|
||||
objId = COL2_9;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_71:
|
||||
case OBJ_SCENERY_MA_FLOOR_2:
|
||||
objId = COL2_10;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_73:
|
||||
case OBJ_SCENERY_MA_FLOOR_4:
|
||||
objId = COL2_11;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_67:
|
||||
case OBJ_SCENERY_MA_WALL_3:
|
||||
objId = COL2_12;
|
||||
useCol2 = true;
|
||||
break;
|
||||
case OBJ_SCENERY_74:
|
||||
case OBJ_SCENERY_MA_FLOOR_5:
|
||||
objId = COL2_13;
|
||||
useCol2 = true;
|
||||
break;
|
||||
@@ -625,8 +625,8 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
shot->obj.pos.z = obj->pos.z + sp70.z;
|
||||
}
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -638,8 +638,8 @@ bool PlayerShot_CheckPolyCollision(PlayerShot* shot, ObjectId objId, Object* obj
|
||||
PlayerShot_Impact(shot);
|
||||
Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_EN_REFLECT);
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@@ -691,10 +691,10 @@ void PlayerShot_ApplyDamageToActor(PlayerShot* shot, Actor* actor, s32 hitIndex)
|
||||
((actor->obj.id == OBJ_ACTOR_ALLRANGE) && (actor->fwork[23] > 1.0f)) ||
|
||||
((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->dmgPart == 0) &&
|
||||
(actor->eventType == EVID_METEO_PYRAMID_SHIP)) ||
|
||||
((actor->obj.id == OBJ_ACTOR_261) && (shot->obj.id != PLAYERSHOT_LOCK_ON) &&
|
||||
((actor->obj.id == OBJ_ACTOR_AQ_SCULPIN) && (shot->obj.id != PLAYERSHOT_LOCK_ON) &&
|
||||
((actor->state < 3) || (actor->state >= 5))) ||
|
||||
((actor->obj.id == OBJ_ACTOR_260) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && (actor->timer_0BC != 0))) {
|
||||
if ((actor->obj.id == OBJ_ACTOR_261) && (actor->state < 2)) {
|
||||
((actor->obj.id == OBJ_ACTOR_AQ_GAROA) && (shot->obj.id != PLAYERSHOT_LOCK_ON) && (actor->timer_0BC != 0))) {
|
||||
if ((actor->obj.id == OBJ_ACTOR_AQ_SCULPIN) && (actor->state < 2)) {
|
||||
actor->state = 2;
|
||||
}
|
||||
if ((shot->obj.id == PLAYERSHOT_LOCK_ON) || (shot->obj.id == PLAYERSHOT_BOMB)) {
|
||||
@@ -713,7 +713,7 @@ void PlayerShot_ApplyDamageToActor(PlayerShot* shot, Actor* actor, s32 hitIndex)
|
||||
shot->obj.pos.y += shot->vel.y * 5.0f;
|
||||
shot->obj.pos.z += shot->vel.z * 5.0f;
|
||||
actor->timer_0C2 = 3;
|
||||
func_effect_80078E50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
|
||||
Effect_Effect393_Spawn(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 8.0f);
|
||||
AUDIO_PLAY_SFX(NA_SE_EN_REFLECT, actor->sfxSource, 4);
|
||||
Play_SpawnHitmark(gShotHitPosX, gShotHitPosY, gShotHitPosZ);
|
||||
}
|
||||
@@ -759,7 +759,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
for (i = 0, actor = gActors; i < ARRAY_COUNT(gActors); i++, actor++) {
|
||||
if ((actor->obj.status >= OBJ_ACTIVE) && (actor->timer_0C2 == 0)) {
|
||||
switch (actor->obj.id) {
|
||||
case OBJ_ACTOR_180:
|
||||
case OBJ_ACTOR_ME_MOLAR_ROCK:
|
||||
if (PlayerShot_CheckPolyCollision(shot, actor->obj.id, &actor->obj)) {
|
||||
actor->dmgType = DMG_BEAM;
|
||||
actor->dmgPart = shot->sourceId;
|
||||
@@ -862,7 +862,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
shot->obj.pos.z += 2.0f * shot->vel.z;
|
||||
shot->timer = 5;
|
||||
AUDIO_PLAY_SFX(NA_SE_ROLLING_REFLECT, player->sfxSource, 0);
|
||||
func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 8.0f);
|
||||
Effect_Effect393_Spawn(player->pos.x, player->pos.y, player->trueZpos, 8.0f);
|
||||
} else {
|
||||
PlayerShot_Impact(shot);
|
||||
if (player->hitTimer == 0) {
|
||||
@@ -879,7 +879,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
player->knockback.y = shot->vel.y * 0.1f;
|
||||
player->knockback.z = shot->vel.z * 0.1f;
|
||||
if (player->form != FORM_ON_FOOT) {
|
||||
func_effect_8007D1E0(player->pos.x, player->pos.y, player->trueZpos, 2.0f);
|
||||
Effect_Effect341_Spawn(player->pos.x, player->pos.y, player->trueZpos, 2.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -890,25 +890,28 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
if ((gGroundType == 4) && Ground_801B6AEC(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z + gPathProgress)) {
|
||||
PlayerShot_Impact(shot);
|
||||
if (shot->obj.id != PLAYERSHOT_LOCK_SEARCH) {
|
||||
func_effect_8007A900(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 2.0f, 255, 15, 0);
|
||||
}
|
||||
}
|
||||
if (gUseDynaFloor &&
|
||||
Play_CheckDynaFloorCollision(&sp94, &spA4, shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z)) {
|
||||
PlayerShot_Impact(shot);
|
||||
if (shot->obj.id != PLAYERSHOT_LOCK_SEARCH) {
|
||||
func_effect_8007B228(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f);
|
||||
Effect_Effect381_Spawn(shot->obj.pos.x, sp94, shot->obj.pos.z, 1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
if ((gLevelMode == LEVELMODE_ALL_RANGE) && (shot->sourceId < 110)) {
|
||||
for (i = 0, scenery360 = gScenery360; i < 200; i++, scenery360++) {
|
||||
if (scenery360->obj.status == OBJ_ACTIVE) {
|
||||
if ((scenery360->obj.id == OBJ_SCENERY_117) || (scenery360->obj.id == OBJ_SCENERY_141) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_149) || (scenery360->obj.id == OBJ_SCENERY_150) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_148) || (scenery360->obj.id == OBJ_SCENERY_143) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_160) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3) || (scenery360->obj.id == OBJ_SCENERY_140)) {
|
||||
if ((scenery360->obj.id == OBJ_SCENERY_AQ_CORAL_REEF_1) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_VS_PYRAMID_2) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_2) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_3) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_FO_MOUNTAIN_1) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_VS_KA_FLBASE) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_VE2_MOUNTAIN) || (scenery360->obj.id == OBJ_SCENERY_CO_BUMP_1) ||
|
||||
(scenery360->obj.id == OBJ_SCENERY_CO_BUMP_3) || (scenery360->obj.id == OBJ_SCENERY_VS_PYRAMID_1)) {
|
||||
PlayerShot_CheckPolyCollision(shot, scenery360->obj.id, &scenery360->obj);
|
||||
} else {
|
||||
PlayerShot_CheckObjectHitbox(shot, scenery360->info.hitbox, &scenery360->obj);
|
||||
@@ -920,10 +923,10 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
if (scenery->obj.status == OBJ_ACTIVE) {
|
||||
if ((scenery->obj.id == OBJ_SCENERY_CO_BUMP_1) || (scenery->obj.id == OBJ_SCENERY_ME_TUNNEL) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_CO_BUMP_4) || (scenery->obj.id == OBJ_SCENERY_CO_BUMP_5) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_120) || (scenery->obj.id == OBJ_SCENERY_124) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_126) || (scenery->obj.id == OBJ_SCENERY_47) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_AQ_CORAL_REEF_2) || (scenery->obj.id == OBJ_SCENERY_AQ_BUMP_1) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_AQ_BUMP_2) || (scenery->obj.id == OBJ_SCENERY_ZO_ISLAND) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_CO_BUMP_2) || (scenery->obj.id == OBJ_SCENERY_CO_BUMP_3) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_67) || (scenery->obj.id == OBJ_SCENERY_74) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_WALL_3) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_5) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_CO_BUMP_3)) {
|
||||
PlayerShot_CheckPolyCollision(shot, scenery->obj.id, &scenery->obj);
|
||||
} else {
|
||||
@@ -941,11 +944,11 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
if (sprite->obj.status == OBJ_ACTIVE) {
|
||||
if (sprite->obj.id != OBJ_SPRITE_TI_CACTUS) {
|
||||
if (PlayerShot_CheckSpriteHitbox(shot, sprite)) {
|
||||
sprite->destroy = 1;
|
||||
sprite->destroy = true;
|
||||
}
|
||||
} else {
|
||||
if (PlayerShot_CheckObjectHitbox(shot, sprite->info.hitbox, &sprite->obj) != 0) {
|
||||
sprite->destroy = 1;
|
||||
sprite->destroy = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -953,10 +956,10 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
}
|
||||
for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
|
||||
if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
|
||||
if ((boss->obj.id == OBJ_BOSS_FO) || (boss->obj.id == OBJ_BOSS_VE2) || (boss->obj.id == OBJ_BOSS_309) ||
|
||||
(boss->obj.id == OBJ_BOSS_SZ_GREAT_FOX)) {
|
||||
if ((boss->obj.id == OBJ_BOSS_FO_BASE) || (boss->obj.id == OBJ_BOSS_VE2_BASE) ||
|
||||
(boss->obj.id == OBJ_BOSS_BO_BASE) || (boss->obj.id == OBJ_BOSS_SZ_GREAT_FOX)) {
|
||||
PlayerShot_CheckPolyCollision(shot, boss->obj.id, &boss->obj);
|
||||
} else if (boss->obj.id == OBJ_BOSS_310) {
|
||||
} else if (boss->obj.id == OBJ_BOSS_BO_BASE_SHIELD) {
|
||||
test.x = fabsf(boss->obj.pos.x - shot->obj.pos.x) * .8333333f;
|
||||
test.y = fabsf(boss->obj.pos.y - shot->obj.pos.y) * 2;
|
||||
test.z = fabsf(boss->obj.pos.z - shot->obj.pos.z) * 0.8333333f;
|
||||
@@ -970,7 +973,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (boss->obj.id == OBJ_BOSS_KA) {
|
||||
if (boss->obj.id == OBJ_BOSS_KA_SAUCERER) {
|
||||
test.x = fabsf(boss->obj.pos.x - shot->obj.pos.x);
|
||||
test.y = fabsf(boss->obj.pos.y - 300.0f - shot->obj.pos.y) * 7.42f;
|
||||
test.z = fabsf(boss->obj.pos.z - shot->obj.pos.z);
|
||||
@@ -990,7 +993,7 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
if (shot->obj.id == PLAYERSHOT_LOCK_SEARCH) {
|
||||
Object_Kill(&shot->obj, shot->sfxSource);
|
||||
} else {
|
||||
if ((boss->obj.id == OBJ_BOSS_KA) && (shot->sourceId != TEAM_ID_FOX)) {
|
||||
if ((boss->obj.id == OBJ_BOSS_KA_SAUCERER) && (shot->sourceId != TEAM_ID_FOX)) {
|
||||
break;
|
||||
}
|
||||
boss->dmgType = DMG_BEAM;
|
||||
@@ -1016,13 +1019,13 @@ void PlayerShot_CollisionCheck(PlayerShot* shot) {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (boss->obj.id == OBJ_BOSS_SY) {
|
||||
if (boss->obj.id == OBJ_BOSS_SY_SHOGUN) {
|
||||
boss->swork[19] = shot->sourceId;
|
||||
}
|
||||
boss->dmgPart = temp_v0 - 1;
|
||||
if (boss->obj.id == OBJ_BOSS_301) {
|
||||
if (boss->obj.id == OBJ_BOSS_AQ_UNK_301) {
|
||||
boss->swork[5] = shot->obj.id;
|
||||
} else if (boss->obj.id == OBJ_BOSS_VE1) {
|
||||
} else if (boss->obj.id == OBJ_BOSS_VE1_GOLEMECH) {
|
||||
boss->fwork[47] = shot->obj.pos.x;
|
||||
boss->fwork[48] = shot->obj.pos.y;
|
||||
boss->fwork[49] = shot->obj.pos.z;
|
||||
@@ -1594,9 +1597,9 @@ void PlayerShot_UpdateShot2(PlayerShot* shot, Player* player) {
|
||||
PlayerShot_Impact(shot);
|
||||
PlayerShot_HitGround(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->obj.rot.y, 2.0f);
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
}
|
||||
}
|
||||
PlayerShot_CollisionCheck(shot);
|
||||
@@ -1608,8 +1611,8 @@ void PlayerShot_UpdateBeam(PlayerShot* shot, s32 index) {
|
||||
Vec3f sp38;
|
||||
|
||||
if ((gGroundSurface == SURFACE_WATER) && (shot->obj.pos.y < (gGroundHeight + 50.0f)) && (index == 0)) {
|
||||
func_effect_8007ACE0(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
|
||||
func_effect_8007ACE0(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
|
||||
Effect_Effect372_Spawn1(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y + 20.0f);
|
||||
Effect_Effect372_Spawn1(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, 0.1f, 1.5f, shot->obj.rot.y - 20.0f);
|
||||
}
|
||||
if ((shot->obj.pos.y < gGroundHeight) && (gGroundType != 4)) {
|
||||
PlayerShot_Impact(shot);
|
||||
@@ -1641,20 +1644,20 @@ void PlayerShot_UpdateBeam(PlayerShot* shot, s32 index) {
|
||||
return;
|
||||
}
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007BC7C(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect362_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
}
|
||||
if (gCurrentLevel == LEVEL_AQUAS) {
|
||||
func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
func_effect_8007B8F8(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
|
||||
shot->obj.pos.z, 0.8f, 0);
|
||||
Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
|
||||
shot->obj.pos.z, 0.8f, 0);
|
||||
Aquas_801AC8A8(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x, RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y,
|
||||
shot->obj.pos.z, 0.8f, 0);
|
||||
Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Effect_Effect364_Spawn(shot->obj.pos.x, shot->obj.pos.y, shot->obj.pos.z, 3.0f);
|
||||
Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
|
||||
RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
|
||||
Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
|
||||
RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
|
||||
Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.x,
|
||||
RAND_FLOAT_CENTERED(10.0f) + shot->obj.pos.y, shot->obj.pos.z, 0.8f, 0);
|
||||
}
|
||||
}
|
||||
if (shot->timer == 0) {
|
||||
@@ -1777,7 +1780,7 @@ void PlayerShot_CheckBossHitbox(PlayerShot* shot) {
|
||||
boss = gBosses;
|
||||
for (i = 0; i < ARRAY_COUNT(gBosses); i++, boss++) {
|
||||
if ((boss->obj.status == OBJ_ACTIVE) && (boss->timer_05A == 0)) {
|
||||
if (boss->obj.id == OBJ_BOSS_KA) {
|
||||
if (boss->obj.id == OBJ_BOSS_KA_SAUCERER) {
|
||||
var_s6 = gGameFrameCount % 8U;
|
||||
var_fs2 = shot->scale * 40.0f;
|
||||
} else {
|
||||
@@ -1883,17 +1886,17 @@ void PlayerShot_ApplyExplosionDamage(PlayerShot* shot, s32 damage) {
|
||||
dy = sprite->obj.pos.y - shot->obj.pos.y;
|
||||
dz = sprite->obj.pos.z - shot->obj.pos.z;
|
||||
if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < radius) {
|
||||
sprite->destroy = 1;
|
||||
sprite->destroy = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
actor = gActors;
|
||||
for (i = 0; i < ARRAY_COUNT(gActors); i++, actor++) {
|
||||
if ((actor->obj.status == OBJ_ACTIVE) && (actor->timer_0C2 == 0) &&
|
||||
!((gCurrentLevel == LEVEL_MACBETH) && (OBJ_ACTOR_205 <= actor->obj.id) &&
|
||||
(actor->obj.id < OBJ_ACTOR_214)) &&
|
||||
!((gCurrentLevel == LEVEL_MACBETH) && (OBJ_ACTOR_MA_LOCOMOTIVE <= actor->obj.id) &&
|
||||
(actor->obj.id < OBJ_ACTOR_MA_RAILROAD_SWITCH)) &&
|
||||
!((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->iwork[12] != 0)) &&
|
||||
((actor->scale >= 0.0f) || (actor->obj.id == OBJ_ACTOR_271))) {
|
||||
((actor->scale >= 0.0f) || (actor->obj.id == OBJ_ACTOR_BO_SHIELD_REACTOR))) {
|
||||
dx = actor->obj.pos.x - shot->obj.pos.x;
|
||||
dy = actor->obj.pos.y - shot->obj.pos.y;
|
||||
dz = actor->obj.pos.z - shot->obj.pos.z;
|
||||
@@ -1904,12 +1907,12 @@ void PlayerShot_ApplyExplosionDamage(PlayerShot* shot, s32 damage) {
|
||||
actor->hitPos.y = shot->obj.pos.y;
|
||||
actor->hitPos.z = shot->obj.pos.z;
|
||||
if (sqrtf(SQ(dx) + SQ(dy) + SQ(dz)) < radius) {
|
||||
if ((actor->obj.id == OBJ_ACTOR_193) || (actor->obj.id == OBJ_ACTOR_186) ||
|
||||
(actor->obj.id == OBJ_MISSILE_SEEK_TEAM) || (actor->obj.id == OBJ_ACTOR_202) ||
|
||||
(actor->obj.id == OBJ_ACTOR_201) || (actor->obj.id == OBJ_ACTOR_187) ||
|
||||
if ((actor->obj.id == OBJ_ACTOR_CO_RADAR) || (actor->obj.id == OBJ_ACTOR_ME_LASER_CANNON_1) ||
|
||||
(actor->obj.id == OBJ_MISSILE_SEEK_TEAM) || (actor->obj.id == OBJ_ACTOR_ME_HOPBOT) ||
|
||||
(actor->obj.id == OBJ_ACTOR_ME_METEO_BALL) || (actor->obj.id == OBJ_ACTOR_ME_LASER_CANNON_2) ||
|
||||
((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->eventType == EVID_SUPPLY_CRATE)) ||
|
||||
((actor->obj.id == OBJ_ACTOR_EVENT) && (actor->eventType == EVID_SX_WARP_GATE)) ||
|
||||
(actor->obj.id == OBJ_ACTOR_196)) {
|
||||
(actor->obj.id == OBJ_ACTOR_CO_MOLE_MISSILE)) {
|
||||
actor->dmgType = DMG_EXPLOSION;
|
||||
actor->dmgPart = 0;
|
||||
actor->dmgSource = shot->sourceId + 1;
|
||||
@@ -2088,12 +2091,12 @@ void PlayerShot_UpdateLockOnShot(PlayerShot* shot) {
|
||||
if ((shot->obj.pos.y < gGroundHeight) || (shot->timer == 1)) {
|
||||
if ((gGroundSurface == SURFACE_WATER) && (shot->obj.pos.y < gGroundHeight)) {
|
||||
shot->unk_48 = 10.0f;
|
||||
func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 0);
|
||||
func_effect_8007D9DC(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 5);
|
||||
func_effect_8007ADF4(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
|
||||
shot->unk_48 * 0.5f);
|
||||
Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 0);
|
||||
Effect_Effect367_Spawn(shot->obj.pos.x, gGroundHeight + 2.0f, shot->obj.pos.z, shot->unk_48 * 0.1f,
|
||||
shot->unk_48 * 3.0f, 5);
|
||||
Effect_Effect372_Spawn2(shot->obj.pos.x, gGroundHeight, shot->obj.pos.z, shot->unk_48 * 0.05f,
|
||||
shot->unk_48 * 0.5f);
|
||||
Effect_SpawnTimedSfxAtPos(&shot->obj.pos, NA_SE_OB_WATER_BOUND_M);
|
||||
}
|
||||
PlayerShot_Impact(shot);
|
||||
|
||||
+2
-2
@@ -263,7 +263,7 @@ void Background_DrawBackdrop(void) {
|
||||
|
||||
Matrix_Push(&gGfxMatrix);
|
||||
|
||||
if (D_ctx_80177C70 == 2) {
|
||||
if (gFovYMode == 2) {
|
||||
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, MTXF_APPLY);
|
||||
}
|
||||
|
||||
@@ -931,7 +931,7 @@ void Background_DrawGround(void) {
|
||||
Matrix_Push(&gGfxMatrix);
|
||||
Matrix_Translate(gGfxMatrix, gPlayer[gPlayerNum].xPath, -3.0f + gCameraShakeY, sp1D4, MTXF_APPLY);
|
||||
|
||||
if (D_ctx_80177C70 == 2) {
|
||||
if (gFovYMode == 2) {
|
||||
Matrix_Scale(gGfxMatrix, 1.2f, 1.2f, 1.0f, MTXF_APPLY);
|
||||
}
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ void Boss_AwardBonus(Boss* this) {
|
||||
yOffset = 0.0f;
|
||||
if (this->obj.id == OBJ_BOSS_CO_GRANGA) {
|
||||
yOffset = 300.0f;
|
||||
} else if (this->obj.id == OBJ_BOSS_TI) {
|
||||
} else if (this->obj.id == OBJ_BOSS_TI_GORAS) {
|
||||
yOffset = 200.0f;
|
||||
}
|
||||
BonusText_Display(this->obj.pos.x, this->obj.pos.y + yOffset, this->obj.pos.z, bonus);
|
||||
@@ -42,21 +42,27 @@ void Boss_AwardBonus(Boss* this) {
|
||||
}
|
||||
|
||||
void Boss299_Init(Boss299* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss299_Update(Boss299* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss299_Draw(Boss299* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss300_Init(Boss300* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss300_Update(Boss300* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss300_Draw(Boss300* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Boss_SetupDebris(ActorDebris* this, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6, f32 arg7, f32 arg8,
|
||||
|
||||
+10
-10
@@ -180,7 +180,7 @@ s32 D_ctx_80178494; // Torpedoes have this set to their unk_5C. Were they
|
||||
f32 gShotHitPosZ;
|
||||
f32 gShotHitPosX;
|
||||
f32 gShotHitPosY;
|
||||
s32 gZOSnakeWaypointCount;
|
||||
s32 gZoDodoraWaypointCount;
|
||||
UNK_TYPE F_801784A8;
|
||||
GroundType gGroundType;
|
||||
UNK_TYPE F_801784B0;
|
||||
@@ -276,13 +276,13 @@ PlayerShot gPlayerShots[16];
|
||||
TexturedLine gTexturedLines[100];
|
||||
RadarMark gRadarMarks[65];
|
||||
BonusText gBonusText[10];
|
||||
s32 gActor194Status[2];
|
||||
f32 gActor194xPos[2][100];
|
||||
f32 gActor194yPos[2][100];
|
||||
f32 gActor194zPos[2][100];
|
||||
f32 gActor194xRot[2][100];
|
||||
f32 gActor194yRot[2][100];
|
||||
f32 gActor194zRot[2][100];
|
||||
s32 gMeMoraStatus[2];
|
||||
f32 gMeMoraXpos[2][100];
|
||||
f32 gMeMoraYpos[2][100];
|
||||
f32 gMeMoraZpos[2][100];
|
||||
f32 gMeMoraXrot[2][100];
|
||||
f32 gMeMoraYrot[2][100];
|
||||
f32 gMeMoraZrot[2][100];
|
||||
UNK_TYPE P_800D31A8 = 0;
|
||||
u16 gEnemyShotSpeed; // enemy shot speed?
|
||||
u8 gShowLevelClearStatusScreen;
|
||||
@@ -330,7 +330,7 @@ u8 gTiStartLandmaster;
|
||||
u16 gControllerRumbleTimers[4];
|
||||
u16 gPlayerScores[4];
|
||||
s32 gCircleWipeFrame;
|
||||
s32 D_ctx_80177C70; // sets camera field of view Y. initialized to 0 and never changed
|
||||
s32 gFovYMode; // sets camera field of view Y. initialized to 0 and never changed
|
||||
s32 gTraining360MsgTimer;
|
||||
s32 gTraining360MsgIndex;
|
||||
s32 D_ctx_80177C94; // these save player parameters across the Venom -> Andross transition
|
||||
@@ -368,7 +368,7 @@ Scenery360* gScenery360;
|
||||
UNK_TYPE F_801782B0;
|
||||
s32 gDrawSmallRocks;
|
||||
s32 D_ctx_801782BC; // set to 0, never used
|
||||
PosRot* gZOSnakePosRots;
|
||||
PosRot* gZoDodoraPosRots;
|
||||
f32* D_ctx_801782CC; // arrays used for dynamic floor
|
||||
f32* D_ctx_801782D4;
|
||||
f32* D_ctx_801782DC;
|
||||
|
||||
+21
-22
@@ -692,7 +692,7 @@ void func_demo_8004A840(s32 actor) {
|
||||
func_demo_8004A700(&gActors[actor], actor);
|
||||
}
|
||||
|
||||
void func_demo_8004A888(Clouds* this) {
|
||||
void func_demo_8004A888(EffectClouds* this) {
|
||||
Vec3f src;
|
||||
Vec3f dest;
|
||||
|
||||
@@ -1226,7 +1226,7 @@ void Cutscene_CoComplete2(Player* player) {
|
||||
player->csState = 5;
|
||||
player->baseSpeed = 0.0f;
|
||||
player->csTimer = 10;
|
||||
func_effect_80078E50(player->pos.x, player->pos.y, player->trueZpos, 30.0f);
|
||||
Effect_Effect393_Spawn(player->pos.x, player->pos.y, player->trueZpos, 30.0f);
|
||||
}
|
||||
gCsCamAtX = player->pos.x;
|
||||
gCsCamAtY = player->pos.y - D_ctx_80177A48[6];
|
||||
@@ -1612,7 +1612,7 @@ void Cutscene_KillPlayer(Player* player) {
|
||||
if (gVsPointsToWin == gVsPoints[player->attacker - 1]) {
|
||||
player->attacker = -1;
|
||||
if (player->unk_284 == 0) {
|
||||
func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 1000);
|
||||
Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 1000);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1631,10 +1631,10 @@ void Cutscene_LandmasterDown(Player* player) {
|
||||
player->pos.y += 30.0f;
|
||||
func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 6.0f);
|
||||
if (gCamCount == 1) {
|
||||
func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 80);
|
||||
func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 800);
|
||||
Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 80);
|
||||
Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos, 3.0f, 800);
|
||||
} else {
|
||||
func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 10);
|
||||
Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, 0.0f, 0.0f, 0.0f, 3.0f, 10);
|
||||
}
|
||||
Cutscene_KillPlayer(player);
|
||||
}
|
||||
@@ -1704,7 +1704,8 @@ void Cutscene_ArwingDown360(Player* player) {
|
||||
(player->csTimer == 0)) {
|
||||
if (gCamCount != 4) {
|
||||
if (player->unk_284 == 0) {
|
||||
func_effect_8007C688(player->pos.x, player->pos.y, player->trueZpos - (2.0f * player->vel.z), 3.0f, 80);
|
||||
Effect_Effect387_Spawn(player->pos.x, player->pos.y, player->trueZpos - (2.0f * player->vel.z), 3.0f,
|
||||
80);
|
||||
}
|
||||
if (player->pos.y < player->pathFloor) {
|
||||
func_enmy_80062C38(player->pos.x, player->pos.z);
|
||||
@@ -1720,8 +1721,7 @@ void Cutscene_ArwingDown360(Player* player) {
|
||||
}
|
||||
}
|
||||
func_effect_8007D0E0(player->pos.x, player->pos.y, player->trueZpos, 5.0f);
|
||||
func_effect_8007BFFC(player->pos.x, player->pos.y, player->trueZpos, player->vel.x, 0.0f, player->vel.z, 5.0f,
|
||||
20);
|
||||
Effect386_Spawn1(player->pos.x, player->pos.y, player->trueZpos, player->vel.x, 0.0f, player->vel.z, 5.0f, 20);
|
||||
Cutscene_KillPlayer(player);
|
||||
}
|
||||
Math_SmoothStepToF(&player->camRoll, 0.0f, 0.05f, 5.0f, 0.00001f);
|
||||
@@ -1810,14 +1810,14 @@ void Cutscene_ArwingDownOnRails(Player* player) {
|
||||
} else if (((player->radioDamageTimer > 0) || (player->pos.y < player->pathFloor) || (player->csEventTimer == 0)) &&
|
||||
(player->csTimer == 0)) {
|
||||
if (player->pos.y < player->pathFloor) {
|
||||
func_effect_8007C688(player->pos.x, gGroundHeight + 20.0f, player->trueZpos - (2.0f * player->vel.z), 3.0f,
|
||||
800);
|
||||
Effect_Effect387_Spawn(player->pos.x, gGroundHeight + 20.0f, player->trueZpos - (2.0f * player->vel.z),
|
||||
3.0f, 800);
|
||||
func_enmy_80062C38(player->pos.x, player->pos.z);
|
||||
}
|
||||
func_effect_8007D0E0(player->pos.x, player->pos.y - (2.0f * player->vel.y),
|
||||
player->trueZpos - (2.0f * player->vel.z), 6.0f);
|
||||
func_effect_8007BFFC(player->pos.x, player->pos.y - player->vel.y, player->trueZpos - (2.0f * player->vel.z),
|
||||
0.0f, 0.0f, 0.0f, 3.0f, 20);
|
||||
Effect386_Spawn1(player->pos.x, player->pos.y - player->vel.y, player->trueZpos - (2.0f * player->vel.z), 0.0f,
|
||||
0.0f, 0.0f, 3.0f, 20);
|
||||
if (gLevelType == LEVELTYPE_PLANET) {
|
||||
for (i = 0; i < 2; i++) {
|
||||
Play_SpawnDebris(2, player->pos.x, player->pos.y, player->trueZpos);
|
||||
@@ -1837,8 +1837,8 @@ void Cutscene_ArwingDownOnRails(Player* player) {
|
||||
}
|
||||
|
||||
if ((gGroundSurface == SURFACE_WATER) && (player->pos.y <= player->pathFloor)) {
|
||||
func_effect_8007D9DC(player->pos.x, gGroundHeight + 2.0f, player->trueZpos, 3.0f, 20.0f, 0);
|
||||
func_effect_8007ADF4(player->pos.x, gGroundHeight, player->trueZpos, 0.1f, 2.0f);
|
||||
Effect_Effect367_Spawn(player->pos.x, gGroundHeight + 2.0f, player->trueZpos, 3.0f, 20.0f, 0);
|
||||
Effect_Effect372_Spawn2(player->pos.x, gGroundHeight, player->trueZpos, 0.1f, 2.0f);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2103,7 +2103,7 @@ void func_demo_8004EBD0(ActorCutscene* this) {
|
||||
this->vel.z = dest.z;
|
||||
|
||||
if (this->timer_0BC == 0) {
|
||||
func_effect_80078E50(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 30.0f);
|
||||
Effect_Effect393_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 30.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
}
|
||||
break;
|
||||
@@ -2299,7 +2299,6 @@ void func_demo_8004F798(ActorCutscene* this) {
|
||||
}
|
||||
|
||||
void ActorCutscene_Update(ActorCutscene* this) {
|
||||
|
||||
if (gCurrentLevel == LEVEL_AQUAS) {
|
||||
func_hud_80093164(this);
|
||||
return;
|
||||
@@ -2747,14 +2746,14 @@ void ActorCutscene_Draw(ActorCutscene* this) {
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
/* fallthrough */
|
||||
case 39:
|
||||
gSPDisplayList(gMasterDisp++, D_SY_60097E0);
|
||||
gSPDisplayList(gMasterDisp++, aSyShip1DL);
|
||||
func_demo_8004FCB8(this, 4);
|
||||
break;
|
||||
|
||||
case 36:
|
||||
Matrix_Scale(gGfxMatrix, this->scale, this->scale, this->scale, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_SY_601D730);
|
||||
gSPDisplayList(gMasterDisp++, aSyShip2DL);
|
||||
func_demo_8004FCB8(this, 0);
|
||||
break;
|
||||
|
||||
@@ -2874,15 +2873,15 @@ void ActorCutscene_Draw(ActorCutscene* this) {
|
||||
case 45:
|
||||
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_AQ_600EEF0);
|
||||
gSPDisplayList(gMasterDisp++, aAqBump2DL);
|
||||
break;
|
||||
|
||||
case 46:
|
||||
gSPDisplayList(gMasterDisp++, D_AQ_601DE60);
|
||||
gSPDisplayList(gMasterDisp++, aAqCoralReef2DL);
|
||||
break;
|
||||
|
||||
case 47:
|
||||
gSPDisplayList(gMasterDisp++, D_AQ_602B4C0);
|
||||
gSPDisplayList(gMasterDisp++, aAqRockDL);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+205
-166
File diff suppressed because it is too large
Load Diff
@@ -4,7 +4,7 @@
|
||||
|
||||
f32* D_edata_800CF964[] = { NULL }; // Likely a scrapped array of scenery shadow boxes
|
||||
|
||||
void Scenery48_Draw(Scenery* scenery) {
|
||||
void Ve1SceneryWall1_Draw(Scenery* scenery) {
|
||||
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
@@ -12,7 +12,7 @@ void Scenery48_Draw(Scenery* scenery) {
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
}
|
||||
|
||||
void Scenery49_Draw(Scenery* scenery) {
|
||||
void Ve1SceneryWall2_Draw(Scenery* scenery) {
|
||||
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
Matrix_RotateY(gGfxMatrix, M_PI, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
@@ -20,5 +20,5 @@ void Scenery49_Draw(Scenery* scenery) {
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
}
|
||||
|
||||
void Actor289_Draw(Actor* actor) {
|
||||
void AndJamesTrigger_Draw(Actor* actor) {
|
||||
}
|
||||
|
||||
+291
-291
@@ -22,7 +22,7 @@
|
||||
#include "assets/ast_area_6.h"
|
||||
#include "assets/ast_zoness.h"
|
||||
|
||||
f32 gActor241Hitbox[] = {
|
||||
f32 gZoEnergyBallHitbox[] = {
|
||||
1.0f, 0.0f, 50.0f, 0.0f, 25.0f, 0.0f, 25.0f,
|
||||
};
|
||||
f32 gCubeHitbox100[] = {
|
||||
@@ -65,10 +65,10 @@ f32 gItemLasersHitbox[] = {
|
||||
f32 gItemBombHitbox[] = {
|
||||
1.0f, 0.0f, 120.0f, 0.0f, 120.0f, 0.0f, 120.0f,
|
||||
};
|
||||
f32 gActor190_191Hitbox[] = {
|
||||
f32 gActorMissileSeekHitbox[] = {
|
||||
1.0f, 0.0f, 40.0f, 0.0f, 40.0f, 0.0f, 40.0f,
|
||||
};
|
||||
f32 gActor194Hitbox[] = {
|
||||
f32 gMeMoraHitbox[] = {
|
||||
1.0f, 0.0f, 50.0f, 0.0f, 50.0f, 0.0f, 50.0f,
|
||||
};
|
||||
f32 gTeamHitbox[] = {
|
||||
@@ -93,167 +93,167 @@ f32 gWarpZoneEvent93Hitbox[] = {
|
||||
|
||||
// clang-format off
|
||||
ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_SCENERY_CO_STONE_ARCH, */ {(void*) aCoStoneArchDL, 0, (ObjectFunc) NULL, aCoStoneArchHitbox, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_1, */ {(void*) aCoBump1DL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_2, */ {(void*) aCoBump2DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_3, */ {(void*) aCoBump3DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_4, */ {(void*) aCoBump4DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_5, */ {(void*) aCoBump5DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_1, */ {(void*) aCoHighway1DL, 0, (ObjectFunc) NULL, aCoHighway1Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_2, */ {(void*) aCoHighway2DL, 0, (ObjectFunc) NULL, aCoHighway2Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_3, */ {(void*) aCoHighway3DL, 0, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_4, */ {(void*) aCoHighway4DL, 0, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_1, */ {(void*) aCoBuilding1DL, 0, (ObjectFunc) NULL, aCoBuilding1Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_2, */ {(void*) aCoBuilding2DL, 0, (ObjectFunc) NULL, aCoBuilding2Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_3, */ {(void*) aCoBuilding3DL, 0, (ObjectFunc) NULL, aCoBuilding3Hitbox, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_4, */ {(void*) aCoBuilding4DL, 0, (ObjectFunc) NULL, aCoBuilding4Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_5, */ {(void*) aCoBuilding5DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding5Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_6, */ {(void*) aCoBuilding6DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding6Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_7, */ {(void*) aCoBuilding7DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding7Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_8, */ {(void*) aCoBuilding8DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding8Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_ON_FIRE, */ {(void*) Corneria_BuildingOnFire_Draw, 1, (ObjectFunc) Corneria_BuildingOnFire_Update, aCoBuildingOnFireHitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_STONE_ARCH */ {(void*) aCoStoneArchDL, 0, (ObjectFunc) NULL, aCoStoneArchHitbox, 800.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_1 */ {(void*) aCoBump1DL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_2 */ {(void*) aCoBump2DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_3 */ {(void*) aCoBump3DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_4 */ {(void*) aCoBump4DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUMP_5 */ {(void*) aCoBump5DL, 0, (ObjectFunc) NULL, gNoHitbox, 3000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_1 */ {(void*) aCoHighway1DL, 0, (ObjectFunc) NULL, aCoHighway1Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_2 */ {(void*) aCoHighway2DL, 0, (ObjectFunc) NULL, aCoHighway2Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_3 */ {(void*) aCoHighway3DL, 0, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_4 */ {(void*) aCoHighway4DL, 0, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_1 */ {(void*) aCoBuilding1DL, 0, (ObjectFunc) NULL, aCoBuilding1Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_2 */ {(void*) aCoBuilding2DL, 0, (ObjectFunc) NULL, aCoBuilding2Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_3 */ {(void*) aCoBuilding3DL, 0, (ObjectFunc) NULL, aCoBuilding3Hitbox, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_4 */ {(void*) aCoBuilding4DL, 0, (ObjectFunc) NULL, aCoBuilding4Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_5 */ {(void*) aCoBuilding5DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding5Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_6 */ {(void*) aCoBuilding6DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding6Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_7 */ {(void*) aCoBuilding7DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding7Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_8 */ {(void*) aCoBuilding8DL, 0, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding8Hitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_ON_FIRE, */ {(void*) Corneria_CoBuildingOnFire_Draw, 1, (ObjectFunc) Corneria_CoBuildingOnFire_Update, aCoBuildingOnFireHitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_TOWER, */ {(void*) aCoTowerDL, 0, (ObjectFunc) NULL, aCoTowerHitbox, 100.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_ARCH_1, */ {(void*) aCoArch1DL, 0, (ObjectFunc) NULL, aCoArch1Hitbox, 500.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_ARCH_2, */ {(void*) aCoArch2DL, 0, (ObjectFunc) NULL, aCoArch2Hitbox, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_ARCH_3, */ {(void*) aCoArch3DL, 0, (ObjectFunc) NULL, aCoArch3Hitbox, 400.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_RADAR, */ {(void*) aRadarDL, 0, (ObjectFunc) NULL, aCoRadarHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_RADAR_DISH, */ {(void*) aRadarDL, 0, (ObjectFunc) NULL, aCoRadarHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_5, */ {(void*) aCoHighway5DL, 0, (ObjectFunc) NULL, aCoHighway5Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_6, */ {(void*) aCoHighway6DL, 0, (ObjectFunc) NULL, aCoHighway6Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_7, */ {(void*) aCoHighway7DL, 0, (ObjectFunc) NULL, aCoHighway7Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_8, */ {(void*) aCoHighway8DL, 0, (ObjectFunc) NULL, aCoHighway8Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_HIGHWAY_9, */ {(void*) aCoHighway9DL, 0, (ObjectFunc) NULL, aCoHighway9Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_SKULL, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiSkullHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_0, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib0Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_1, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib1Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_2, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib2Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_3, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib3Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_4, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib4Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_5, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib5Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_6, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib6Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_7, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib7Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_8, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib8Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_SKULL, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiSkullHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_0, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib0Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_1, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib1Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_2, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib2Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_3, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib3Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_4, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib4Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_5, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib5Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_6, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib6Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_7, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib7Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_RIB_8, */ {(void*) Scenery_DrawTitaniaBones, 1, (ObjectFunc) Scenery_UpdateTitaniaBones, aTiRib8Hitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ME_TUNNEL, */ {(void*) MeteoTunnel_Draw, 1, (ObjectFunc) MeteoTunnel_Update, gNoHitbox, 6000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_9, */ {(void*) CoBuilding9_Draw, 1, (ObjectFunc) CoBuilding9_Update, aCoBuilding9Hitbox, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_BUILDING_10, */ {(void*) CoBuilding10_Draw, 1, (ObjectFunc) SceneryRotateTowardsCamera, aCoBuilding10Hitbox, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_IBEAM, */ {(void*) CoIBeam_Draw, 1, (ObjectFunc) CoIBeam_Update, aCoIBeamHitbox, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_ROCK_1, */ {(void*) aZoRock1DL, 0, (ObjectFunc) NULL, aZoRock1Hitbox, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_44, */ {(void*) D_ZO_600F560, 0, (ObjectFunc) NULL, D_ZO_602BA20, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_45, */ {(void*) D_ZO_600EC90, 0, (ObjectFunc) NULL, D_ZO_602BAE4, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_46, */ {(void*) D_ZO_600E820, 0, (ObjectFunc) NULL, D_ZO_602BBD8, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_47, */ {(void*) D_ZO_601FCB0, 0, (ObjectFunc) NULL, D_ZO_602BC54, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_48, */ {(void*) Scenery48_Draw, 1, (ObjectFunc) NULL, D_VE1_601B4E0, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_49, */ {(void*) Scenery49_Draw, 1, (ObjectFunc) NULL, D_VE1_601B4FC, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_50, */ {(void*) D_VE1_6007410, 0, (ObjectFunc) NULL, D_VE1_601B518, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_51, */ {(void*) D_VE1_6006F50, 0, (ObjectFunc) NULL, D_VE1_601B584, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_52, */ {(void*) D_VE1_6005780, 0, (ObjectFunc) Venom1_Scenery52_Update, D_VE1_601B5F4, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_53, */ {(void*) D_VE1_6003610, 0, (ObjectFunc) NULL, D_VE1_601B644, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_ROCK, */ {(void*) aZoRockDL, 0, (ObjectFunc) NULL, aZoRockHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_OIL_RIG_1, */ {(void*) aZoOilRig1DL, 0, (ObjectFunc) NULL, aZoOilRig1Hitbox, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_OIL_RIG_2, */ {(void*) aZoOilRig2DL, 0, (ObjectFunc) NULL, aZoOilRig2Hitbox, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_OIL_RIG_3, */ {(void*) aZoOilRig3DL, 0, (ObjectFunc) NULL, aZoOilRig3Hitbox, 1500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_ZO_ISLAND, */ {(void*) aZoIslandDL, 0, (ObjectFunc) NULL, aZoIslandHitbox, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_WALL_1, */ {(void*) Ve1SceneryWall1_Draw, 1, (ObjectFunc) NULL, aVe1SceneryWall1Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_WALL_2, */ {(void*) Ve1SceneryWall2_Draw, 1, (ObjectFunc) NULL, aVe1SceneryWall2Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_WALL_3, */ {(void*) aVe1SceneryWall3DL, 0, (ObjectFunc) NULL, aVe1SceneryWall3Hitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_HALLWAY_OBSTACLE, */ {(void*) aVe1HallwayObstacleDL, 0, (ObjectFunc) NULL, aVe1HallwayObstacleHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_GENERATOR, */ {(void*) aVe1GeneratorDL, 0, (ObjectFunc) Venom1_Ve1Generator_Update, aVe1GeneratorHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_WATCH_POST, */ {(void*) aVe1WatchPostDL, 0, (ObjectFunc) NULL, aVe1WatchPostHitbox, 2500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_WATERFALL, */ {(void*) aCoWaterfallDL, 0, (ObjectFunc) CoWaterfall_Update, aCoWaterfallHitbox, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_ROCKWALL, */ {(void*) aCoRockwallDL, 0, (ObjectFunc) NULL, aCoRockwallHitbox, 1000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_DOORS, */ {(void*) Corneria_Doors_Draw, 2, (ObjectFunc) Corneria_Doors_Update, aCoDoorsHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_57, */ {(void*) Titania_Scenery57_Draw, 1, (ObjectFunc) Titania_Scenery57_Update, D_TI_6006BF0, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_58, */ {(void*) D_TI1_700BE00, 0, (ObjectFunc) NULL, D_TI_6006C44, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_59, */ {(void*) D_MA_6024010, 0, (ObjectFunc) NULL, D_MA_603626C, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_60, */ {(void*) D_MA_6027180, 0, (ObjectFunc) NULL, D_MA_6036288, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_61, */ {(void*) Macbeth_Scenery61_Draw, 1, (ObjectFunc) NULL, D_MA_60362A4, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_62, */ {(void*) D_MA_60270E0, 0, (ObjectFunc) NULL, gNoHitbox, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_CO_DOORS, */ {(void*) Corneria_CoDoors_Draw, 2, (ObjectFunc) Corneria_CoDoors_Update, aCoDoorsHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_PILLAR, */ {(void*) Titania_TiPillar_Draw, 1, (ObjectFunc) Titania_TiPillar_Update, aTiPillarHitbox, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TI_BRIDGE, */ {(void*) aTiBridgeDL, 0, (ObjectFunc) NULL, aTiBridgeHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_BUILDING_1, */ {(void*) aMaBuilding1DL, 0, (ObjectFunc) NULL, aMaBuilding1Hitbox, 300.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_BUILDING_2, */ {(void*) aMaBuilding2DL, 0, (ObjectFunc) NULL, aMaBuilding2Hitbox, 400.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TOWER, */ {(void*) Macbeth_MaTower_Draw, 1, (ObjectFunc) NULL, aMaTowerHitbox, 200.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_WALL_1, */ {(void*) aMaWall1DL, 0, (ObjectFunc) NULL, gNoHitbox, 1500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_63, */ {(void*) D_MA_6013960, 0, (ObjectFunc) NULL, D_MA_6036894, 500.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_64, */ {(void*) D_MA_600AF40, 0, (ObjectFunc) NULL, D_MA_60368E0, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_65, */ {(void*) Macbeth_Scenery65_Draw, 1, (ObjectFunc) NULL, D_MA_6036724, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_66, */ {(void*) D_MA_601F1D0, 0, (ObjectFunc) NULL, D_MA_60362D8, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_67, */ {(void*) D_MA_60238F0, 0, (ObjectFunc) NULL, D_MA_6036328, 2000.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_68, */ {(void*) D_MA_601B7C0, 0, (ObjectFunc) NULL, D_MA_60362F4, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_69, */ {(void*) D_MA_6030500, 0, (ObjectFunc) NULL, D_MA_6036370, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_70, */ {(void*) D_MA_602DAE0, 0, (ObjectFunc) NULL, D_MA_603638C, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_71, */ {(void*) D_MA_6027900, 0, (ObjectFunc) NULL, D_MA_60363B8, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_72, */ {(void*) D_MA_602DB80, 0, (ObjectFunc) NULL, D_MA_60363E4, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_73, */ {(void*) D_MA_6030630, 0, (ObjectFunc) NULL, D_MA_6036410, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_74, */ {(void*) D_MA_602DC20, 0, (ObjectFunc) NULL, D_MA_603643C, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_75, */ {(void*) D_MA_601B0D0, 0, (ObjectFunc) NULL, D_MA_6036760, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_76, */ {(void*) D_MA_60075D0, 0, (ObjectFunc) NULL, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_77, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, D_MA_6036344, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_78, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_79, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_80, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_81, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_82, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_83, */ {(void*) Macbeth_Scenery83_Draw, 1, (ObjectFunc) Macbeth_Scenery83_Update, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_84, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_85, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_86, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_87, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_88, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_89, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_90, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_91, */ {(void*) Macbeth_SceneryDoodad2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_92, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_93, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_94, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_95, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_96, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_97, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_98, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_99, */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_100 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_101 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_102 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_103 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_104 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) Macbeth_Scenery104_Update, D_MA_6036594, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_105 */ {(void*) Macbeth_SceneryDoodad_Draw, 1, (ObjectFunc) NULL, D_MA_6036204, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_106 */ {(void*) D_SY_60097E0, 0, (ObjectFunc) NULL, D_SY_6034478, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_107 */ {(void*) D_SY_601D730, 0, (ObjectFunc) NULL, D_SY_603450C, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_108 */ {(void*) D_SY_60102C0, 0, (ObjectFunc) NULL, D_SY_6034588, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_109 */ {(void*) D_SY_60036A0, 0, (ObjectFunc) SectorY_Scenery109_Update, D_SY_6034664, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_110 */ {(void*) D_SY_6005360, 0, (ObjectFunc) NULL, D_SY_6034770, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_111 */ {(void*) Scenery111_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_112 */ {(void*) D_SY_600F6C0, 0, (ObjectFunc) SectorY_Scenery112_Update, D_SY_60347F0, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_113 */ {(void*) D_SY_601B610, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_114 */ {(void*) D_SY_601C6A0, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_115 */ {(void*) D_SY_60188D0, 0, (ObjectFunc) NULL, D_SY_603486C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_116 */ {(void*) D_SY_60034D0, 0, (ObjectFunc) NULL, D_SY_60347D4, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_117 */ {(void*) D_AQ_60231C0, 0, (ObjectFunc) NULL, D_AQ_6030C60, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_118 */ {(void*) D_AQ_6011EE0, 0, (ObjectFunc) NULL, D_AQ_6030C7C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_119 */ {(void*) D_AQ_6015730, 0, (ObjectFunc) NULL, D_AQ_6030D74, 2000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_120 */ {(void*) D_AQ_601DE60, 0, (ObjectFunc) NULL, D_AQ_6030DF8, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_121 */ {(void*) D_AQ_602B4C0, 0, (ObjectFunc) NULL, D_AQ_6030E14, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_122 */ {(void*) D_AQ_600EE10, 0, (ObjectFunc) NULL, D_AQ_6030E30_Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_123 */ {(void*) D_AQ_60120F0, 0, (ObjectFunc) NULL, D_AQ_6030E4C, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_124 */ {(void*) D_AQ_600EEF0, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_125 */ {(void*) D_AQ_600BF80, 0, (ObjectFunc) NULL, D_AQ_6030E68, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_126 */ {(void*) Aquas_Scenery126_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_127 */ {(void*) D_VE1_9005C80, 0, (ObjectFunc) Venom1_Scenery127_Update, D_VE1_601B678, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_128 */ {(void*) D_VE1_9003F50, 0, (ObjectFunc) NULL, D_VE1_601B6C4, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_129 */ {(void*) D_VE1_900F060, 0, (ObjectFunc) NULL, D_VE1_601B710, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_130 */ {(void*) D_VE1_900F1D0, 0, (ObjectFunc) NULL, D_VE1_601B75C, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_131 */ {(void*) Andross_Scenery131_Draw, 1, (ObjectFunc) Andross_Scenery131_Update, D_ANDROSS_C038BD8, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_132 */ {(void*) Andross_Scenery132_Draw, 1, (ObjectFunc) Andross_Scenery132_Update, D_ANDROSS_C038A48, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_133 */ {(void*) D_TR_60030F0, 0, (ObjectFunc) NULL, D_TR_6009CC4, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_134 */ {(void*) D_VE2_6003000, 0, (ObjectFunc) NULL, D_ANDROSS_C038BA4, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_135 */ {(void*) D_VE2_6006890, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_136 */ {(void*) D_VE2_6002990, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_137 */ {(void*) D_VE2_6004170, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_138 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE64, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_139 */ {(void*) D_versus_3017600, 0, (ObjectFunc) NULL, D_versus_302EE80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_140 */ {(void*) D_versus_30173C0, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_141 */ {(void*) D_versus_30174E0, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_142 */ {(void*) D_versus_301B080, 0, (ObjectFunc) NULL, D_versus_302EE9C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_143 */ {(void*) D_versus_3016B00, 0, (ObjectFunc) NULL, D_versus_302EE00, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_144 */ {(void*) D_versus_3013780, 0, (ObjectFunc) NULL, D_versus_302ED4C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_145 */ {(void*) D_versus_3013580, 0, (ObjectFunc) NULL, D_versus_302ED98, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_146 */ {(void*) D_versus_3012ED0, 0, (ObjectFunc) NULL, D_versus_302EDB4, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_GUILLOTINE, */ {(void*) aMaGuillotineDL, 0, (ObjectFunc) NULL, aMaGuillotineHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_PROXIMITY_LIGHT, */ {(void*) Macbeth_MaProximityLight_Draw, 1, (ObjectFunc) NULL, aMaProximityLightHitbox, 400.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_WALL_2, */ {(void*) aMaWall2DL, 0, (ObjectFunc) NULL, aMaWall2Hitbox, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_WALL_3, */ {(void*) aMaWall3DL, 0, (ObjectFunc) NULL, aMaWall3Hitbox, 2000.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_WALL_4, */ {(void*) aMaWall4DL, 0, (ObjectFunc) NULL, aMaWall4Hitbox, 2500.0f, 0, 0, 5, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TERRAIN_BUMP, */ {(void*) aMaTerrainBumpDL, 0, (ObjectFunc) NULL, aMaTerrainBumpHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_1, */ {(void*) aMaFloor1DL, 0, (ObjectFunc) NULL, aMaFloor1Hitbox, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_2, */ {(void*) aMaFloor2DL, 0, (ObjectFunc) NULL, aMaFloor2Hitbox, 1900.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_3, */ {(void*) aMaFloor3DL, 0, (ObjectFunc) NULL, aMaFloor3Hitbox, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_4, */ {(void*) aMaFloor4DL, 0, (ObjectFunc) NULL, aMaFloor4Hitbox, 1100.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_5, */ {(void*) aMaFloor5DL, 0, (ObjectFunc) NULL, aMaFloor5Hitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_FLOOR_6, */ {(void*) aMaFloor6DL, 0, (ObjectFunc) NULL, aMaFloor6Hitbox, 3000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_WEAPONS_FACTORY, */ {(void*) aMaWeaponsFactoryDL, 0, (ObjectFunc) NULL, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_INDICATOR_SIGN, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, aMaIndicatorSignHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_DISTANCE_SIGN_1, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_DISTANCE_SIGN_2, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_DISTANCE_SIGN_3, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_DISTANCE_SIGN_4, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_DISTANCE_SIGN_5, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_STOP_BLOCK, */ {(void*) Macbeth_MaTrainStopBlock_Draw, 1, (ObjectFunc) Macbeth_MaTrainStopBlock_Update, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_1, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_2, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_3, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_4, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_5, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_6, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_7, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_RAILROAD_SWITCH_8, */ {(void*) Macbeth_IndicatorSign_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_1, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_2, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_3, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_4, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_5, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_6, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_7, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 15000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_8, */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_9 */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_10 */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_11 */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_12 */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_SWITCH_TRACK */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) Macbeth_MaSwitchTrack_Update, aMaSwitchTrackHitbox, 2500.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_MA_TRAIN_TRACK_13 */ {(void*) Macbeth_TrainTrack_Draw, 1, (ObjectFunc) NULL, aMaTrainTrack13Hitbox, 1300.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_1 */ {(void*) aSyShip1DL, 0, (ObjectFunc) NULL, aSyShip1Hitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_2 */ {(void*) aSyShip2DL, 0, (ObjectFunc) NULL, aSyShip2Hitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_3 */ {(void*) aSyShip3DL, 0, (ObjectFunc) NULL, aSyShip3Hitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_3_DESTROYED */ {(void*) aSyShip3DestroyedDL, 0, (ObjectFunc) SectorY_SyShip3Destroyed_Update, aSyShip3DestroyedHitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_4 */ {(void*) aSyShip4DL, 0, (ObjectFunc) NULL, aSyShip4Hitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_DEBRIS */ {(void*) Scenery111_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_2_DESTROYED */ {(void*) aSyShip4DestroyedDL, 0, (ObjectFunc) SectorY_SyShip4Destroyed_Update, aSyShip4DestroyedHitbox, 4000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_SY_SHIP_2 */ {(void*) aSyShip2SpriteDL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_SY_SHIP_3 */ {(void*) aSyShip3SpriteDL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_PROJECTILE */ {(void*) aSyShipProjectileDL, 0, (ObjectFunc) NULL, aSyShipProjectileHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SY_SHIP_WINDOWS */ {(void*) aSyShipWindowsDL, 0, (ObjectFunc) NULL, aSyShipWindowsHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_CORAL_REEF_1 */ {(void*) aAqCoralReef1DL, 0, (ObjectFunc) NULL, aAqCoralReef1Hitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_TUNNEL_1 */ {(void*) aAqTunnel1DL, 0, (ObjectFunc) NULL, aAqTunnel1Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_ARCH */ {(void*) aAqArchDL, 0, (ObjectFunc) NULL, aAqArchHitbox, 2000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_CORAL_REEF_2 */ {(void*) aAqCoralReef2DL, 0, (ObjectFunc) NULL, aAqCoralReef2Hitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_ROCK */ {(void*) aAqRockDL, 0, (ObjectFunc) NULL, aAqRockHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_WALL_1 */ {(void*) aAqWall1DL, 0, (ObjectFunc) NULL, aAqWall1Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_ROOF */ {(void*) aAqRoofDL, 0, (ObjectFunc) NULL, aAqRoofHitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_BUMP_1 */ {(void*) aAqBump2DL, 0, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_TUNNEL_2 */ {(void*) aAqTunnel2DL, 0, (ObjectFunc) NULL, aAqTunnel2Hitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AQ_BUMP_2 */ {(void*) Aquas_AqBump2_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 2000.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_TEMPLE_ENTRANCE */ {(void*) aVe1TempleEntranceDL, 0, (ObjectFunc) Venom1_Ve1TempleEntrance_Update, aVe1TempleEntranceHitbox, 1000.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_1 */ {(void*) aVe1TempleInterior1DL, 0, (ObjectFunc) NULL, aVe1TempleInterior1Hitbox, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_2 */ {(void*) aVe1TempleInterior2DL, 0, (ObjectFunc) NULL, aVe1TempleInterior2Hitbox, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE1_TEMPLE_INTERIOR_3 */ {(void*) aVe1TempleInterior3DL, 0, (ObjectFunc) NULL, aVe1TempleInterior3Hitbox, 3200.0f, 0, 0, 42, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_PASSAGE */ {(void*) Andross_AndPassage_Draw, 1, (ObjectFunc) Andross_AndPassage_Update, aAndPassageHitbox, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_DOOR */ {(void*) Andross_AndDoor_Draw, 1, (ObjectFunc) Andross_AndDoor_Update, aAndDoorHitbox, 500.0f, 0, 0, 41, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_TR_BUILDING */ {(void*) aTrBuildingDL, 0, (ObjectFunc) NULL, aTrBuildingHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_PATH_INTERSECTION */ {(void*) aAndPathIntersectionDL, 0, (ObjectFunc) NULL, aAndPathIntersectionHitbox, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_PATH_WALLS */ {(void*) aAndPathWallsDL, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_PATH_EXIT */ {(void*) aAndPathExitDL, 0, (ObjectFunc) NULL, D_ANDROSS_C038B40, 0.0f, 0, 0, 41, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_AND_PATH_ENTRANCE */ {(void*) aAndPathEntranceDL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 1, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_BUILDING_1 */ {(void*) aVsBuildingDL, 0, (ObjectFunc) NULL, aVsBuilding1Hibox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_BUILDING_2 */ {(void*) aVsBuildingDL, 0, (ObjectFunc) NULL, aVsBuilding2Hibox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_PYRAMID_1 */ {(void*) aVsPyramid1DL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_PYRAMID_2 */ {(void*) aVsPyramid2DL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_ARCH */ {(void*) aVsArchDL, 0, (ObjectFunc) NULL, aVsArchHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_KA_FLBASE */ {(void*) aVsKaFlBaseDL, 0, (ObjectFunc) NULL, aVsKaFlBaseHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_SPACE_JUNK_1 */ {(void*) aVsSpaceJunk1DL, 0, (ObjectFunc) NULL, aVsSpaceJunk1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_SPACE_JUNK_2 */ {(void*) aVsSpaceJunk2DL, 0, (ObjectFunc) NULL, aVsSpaceJunk2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VS_SPACE_JUNK_3 */ {(void*) aVsSpaceJunk3DL, 0, (ObjectFunc) NULL, aVsSpaceJunk3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_147 */ {(void*) NULL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_148 */ {(void*) D_FO_60079B0, 0, (ObjectFunc) NULL, D_FO_600FF80, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_149 */ {(void*) D_FO_6007D80, 0, (ObjectFunc) NULL, D_FO_600FFA0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_150 */ {(void*) D_FO_6006310, 0, (ObjectFunc) NULL, D_FO_600FFC0, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_151 */ {(void*) D_FO_60066E0, 0, (ObjectFunc) NULL, D_FO_600FEB8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_152 */ {(void*) D_BO_600F4C0, 0, (ObjectFunc) NULL, D_BO_6011C10, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_153 */ {(void*) D_BO_600B8B0, 0, (ObjectFunc) NULL, D_BO_6011C48, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_154 */ {(void*) aKaFLBaseDL, 0, (ObjectFunc) NULL, D_KA_601115C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_156 */ {(void*) SectorY_Scenery156_Draw, 1, (ObjectFunc) NULL, D_SY_6034368, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_157 */ {(void*) aSzSpaceJunk3DL, 0, (ObjectFunc) NULL, D_SZ_600924C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_158 */ {(void*) aSzSpaceJunk1DL, 0, (ObjectFunc) NULL, D_SZ_60092E8, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_159 */ {(void*) D_VE2_6008370, 0, (ObjectFunc) NULL, D_VE2_601668C, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_160 */ {(void*) D_VE2_6010960, 0, (ObjectFunc) NULL, D_VE2_6016714, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_FO_MOUNTAIN_1 */ {(void*) aFoMountain1DL, 0, (ObjectFunc) NULL, aFoMountain1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_FO_MOUNTAIN_2 */ {(void*) aFoMountain2DL, 0, (ObjectFunc) NULL, aFoMountain2Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_FO_MOUNTAIN_3 */ {(void*) aFoMountain3DL, 0, (ObjectFunc) NULL, aFoMountain3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_FO_TOWER */ {(void*) aFoTowerDL, 0, (ObjectFunc) NULL, aFoTowerHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_BO_POLE */ {(void*) aBoPoleDL, 0, (ObjectFunc) NULL, aBoPoleHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_BO_BUILDING */ {(void*) aBoBuildingDL, 0, (ObjectFunc) NULL, aBoBuildingHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_KA_FLBASE */ {(void*) aKaFLBaseDL, 0, (ObjectFunc) NULL, aKaFrontlineBaseHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_UNK_155 */ {(void*) NULL, 0, (ObjectFunc) NULL, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_UNK_156 */ {(void*) SectorY_Scenery156_Draw, 1, (ObjectFunc) NULL, aSyScenery156Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SZ_SPACE_JUNK_3 */ {(void*) aSzSpaceJunk3DL, 0, (ObjectFunc) NULL, aSzSpaceJunk3Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_SZ_SPACE_JUNK_1 */ {(void*) aSzSpaceJunk1DL, 0, (ObjectFunc) NULL, aSzSpaceJunk1Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE2_TOWER */ {(void*) aVe2TowerDL, 0, (ObjectFunc) NULL, aVe2TowerHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SCENERY_VE2_MOUNTAIN */ {(void*) aVe2MountainDL, 0, (ObjectFunc) NULL, aVe2MountainHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_CO_POLE */ {(void*) aCoPoleDL, 0, (ObjectFunc) Sprite_UpdateDoodad, aCoPoleHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_CO_TREE */ {(void*) aCoTreeDL, 0, (ObjectFunc) Sprite_UpdateDoodad, aCoTreeHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_FO_POLE */ {(void*) aFoPoleDL, 0, (ObjectFunc) Sprite_UpdateDoodad, aFoPoleHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
@@ -263,7 +263,7 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_SPRITE_167 */ {(void*) Sprite167_Draw, 1, (ObjectFunc) Sprite167_Update, gNoHitbox, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_168 */ {(void*) Sprite168_Draw, 1, (ObjectFunc) NULL, gNoHitbox, 100.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_TI_CACTUS */ {(void*) aTiCactusDL, 0, (ObjectFunc) Titania_Cactus_Update, aTiCactusHitbox, 100.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_CO_SMOKE */ {(void*) NULL, 1, (ObjectFunc) Corneria_Smoke_Update, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_CO_SMOKE */ {(void*) NULL, 1, (ObjectFunc) Corneria_CoSmoke_Update, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_VE1_BOSS_TRIGGER1 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger1_Update, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_VE1_BOSS_TRIGGER2 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger2_Update, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_SPRITE_VE1_BOSS_TRIGGER3 */ {(void*) NULL, 1, (ObjectFunc) Venom1_BossTrigger3_Update, gNoHitbox, 0.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
@@ -273,148 +273,148 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_ACTOR_CO_GARUDA_2 */ {(void*) Corneria_CoGaruda2_Draw, 2, (ObjectFunc) Corneria_CoGaruda2_Update, CoGarudaHitbox, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_GARUDA_3 */ {(void*) Corneria_CoGaruda3_Draw, 2, (ObjectFunc) Corneria_CoGaruda3_Update, CoGarudaHitbox, 500.0f, 0, 0, 39, 1, 200.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_GARUDA_DESTROY */ {(void*) Corneria_CoGarudaDestroy_Draw, 2, (ObjectFunc) Corneria_CoGarudaDestroy_Update, aCoGarudaDestroyHitbox, 500.0f, 0, 0, 39, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_180 */ {(void*) Actor180_Draw, 1, (ObjectFunc) Actor180_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_181 */ {(void*) D_ME_6018C00, 0, (ObjectFunc) Meteo_Actor181_Update, D_ME_602F6EC, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_182 */ {(void*) Actor182_Draw, 1, (ObjectFunc) Meteo_Actor182_Update, D_ME_602F708, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_183 */ {(void*) Meteo_Actor183_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_184 */ {(void*) Meteo_Actor184_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_185 */ {(void*) Meteo_Actor185_Draw, 1, (ObjectFunc) Meteo_ActorDoodad_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_186 */ {(void*) Actor186_Draw, 1, (ObjectFunc) Meteo_Actor186_Update, D_ME_602F724, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_187 */ {(void*) D_ME_6018450, 0, (ObjectFunc) Meteo_Actor187_Update, D_ME_602F740, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_188 */ {(void*) Aquas_Actor188_Draw, 1, (ObjectFunc) Aquas_Actor188_Update, D_AQ_6030BE0, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_MOLAR_ROCK */ {(void*) MeMolarRock_Draw, 1, (ObjectFunc) MeMolarRock_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_METEOR_1 */ {(void*) aMeMeteor1DL, 0, (ObjectFunc) Meteo_MeMeteor1_Update, aMeMeteor1Hitbox, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_METEOR_2 */ {(void*) MeMeteor2_Draw, 1, (ObjectFunc) Meteo_MeMeteor2_Update, aMeMeteor2Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_METEOR_SHOWER_1 */ {(void*) Meteo_MeMeteorShower1_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_METEOR_SHOWER_2 */ {(void*) Meteo_MeMeteorShower2_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_METEOR_SHOWER_3 */ {(void*) Meteo_MeMeteorShower3_Draw, 1, (ObjectFunc) Meteo_MeteorShower_Update, gNoHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_LASER_CANNON_1 */ {(void*) MeLaserCannon1_Draw, 1, (ObjectFunc) Meteo_MeLaserCannon1_Update, aMeLaserCannon1Hitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_LASER_CANNON_2 */ {(void*) aMeLaserCannon2DL, 0, (ObjectFunc) Meteo_MeLaserCannon2_Update, aMeLaserCannon2Hitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_AQ_UNK_188 */ {(void*) Aquas_Actor188_Draw, 1, (ObjectFunc) Aquas_Actor188_Update, aAqActor188Hitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_DEBRIS */ {(void*) ActorDebris_Draw, 1, (ObjectFunc) ActorDebris_Update, gNoHitbox, 0.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_MISSILE_SEEK_TEAM */ {(void*) Actor190_191_Draw, 1, (ObjectFunc) Actors190_191_Update, gActor190_191Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_MISSILE_SEEK_PLAYER */ {(void*) Actor190_191_Draw, 1, (ObjectFunc) Actors190_191_Update, gActor190_191Hitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_192 */ {(void*) Actor192_Draw, 1, (ObjectFunc) Actor192_Update, D_CO_603E54C, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
|
||||
/* OBJ_ACTOR_193 */ {(void*) Actor193_Draw, 1, (ObjectFunc) Actor193_Update, D_CO_603E598, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_194 */ {(void*) Actor194_Draw, 1, (ObjectFunc) Actor194_Update, gActor194Hitbox, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_MISSILE_SEEK_TEAM */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_MISSILE_SEEK_PLAYER */ {(void*) ActorMissileSeek_Draw, 1, (ObjectFunc) ActorMissileSeek_Update, gActorMissileSeekHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_CO_SKIBOT */ {(void*) ActorSkibot_Draw, 1, (ObjectFunc) ActorSkibot_Update, aCoActorSkibotHitbox, 200.0f, 0, 1, 39, 0, 50.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_RADAR */ {(void*) ActorRadar_Draw, 1, (ObjectFunc) ActorRadar_Update, aCoActorRadarHitbox, 100.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ME_MORA */ {(void*) MeMora_Draw, 1, (ObjectFunc) MeMora_Update, gMeMoraHitbox, 200.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_CUTSCENE */ {(void*) ActorCutscene_Draw, 1, (ObjectFunc) ActorCutscene_Update, gNoHitbox, 20000.0f, 0, 1, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_196 */ {(void*) Actor196_Draw, 1, (ObjectFunc) Actor196_Update, D_CO_603E5B4, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_CO_MOLE_MISSILE */ {(void*) ActorMoleMissile_Draw, 1, (ObjectFunc) ActorMoleMissile_Update, aCoMoleMissileHitbox, 200.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ALLRANGE */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorAllRange_Update, gActorAllRangeHItbox, 20000.0f, 0, 1, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_TEAM_BOSS */ {(void*) ActorAllRange_Draw, 1, (ObjectFunc) ActorTeamBoss_Update, gTeamHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_199 */ {(void*) Andross_Actor199_Draw, 1, (ObjectFunc) Andross_Actor199_Update, gNoHitbox, 20000.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_EVENT */ {(void*) ActorEvent_Draw, 1, (ObjectFunc) ActorEvent_Update, gNoHitbox, 2000.0f, 0, 1, 39, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_201 */ {(void*) Actor201_Draw, 1, (ObjectFunc) Actor201_Update, D_ME_602F684, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_202 */ {(void*) Actor202_Draw, 1, (ObjectFunc) Actor202_Update, D_ME_602F6A0, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
|
||||
/* OBJ_ACTOR_SLIPPY_SX */ {(void*) SectorX_Slippy_Draw, 1, (ObjectFunc) SectorX_Slippy_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_204 */ {(void*) SectorY_Actor204_Draw, 1, (ObjectFunc) SectorY_Actor204_Update, D_SY_603405C, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_205 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor205_Update, D_MA_60359C8, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_206 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor206_Update, D_MA_6035A48, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_207 */ {(void*) Macbeth_Actor207_Draw, 2, (ObjectFunc) Macbeth_Actor207_Update, D_MA_603677C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_208 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor208_Update, D_MA_6035A14, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_209 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor209_Update, D_MA_6035AE0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_210 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor210_Update, D_MA_6035D9C, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_211 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor211_Update, D_MA_6035E04, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_212 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor212_Update, D_MA_60360C0, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_213 */ {(void*) Macbeth_ActorDoodad_Draw, 1, (ObjectFunc) Macbeth_Actor213_Update, D_MA_6036154, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_214 */ {(void*) Macbeth_Actor214_Draw, 1, (ObjectFunc) Macbeth_Actor214_Update, D_MA_6036458, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_215 */ {(void*) Macbeth_Actor215_Draw, 1, (ObjectFunc) Macbeth_Actor215_Update, D_MA_60364C0, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_216 */ {(void*) Macbeth_Actor216_Draw, 1, (ObjectFunc) Macbeth_Actor216_Update, D_MA_60366EC, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_217 */ {(void*) Macbeth_Actor217_Draw, 1, (ObjectFunc) Macbeth_Actor217_Update, D_MA_6036708, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_218 */ {(void*) Macbeth_Actor218_Draw, 1, (ObjectFunc) Macbeth_Actor218_Update, D_MA_6036728, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_219 */ {(void*) Macbeth_Actor219_Draw, 1, (ObjectFunc) Macbeth_Actor219_Update, D_MA_6036744, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_220 */ {(void*) Macbeth_Actor220_Draw, 1, (ObjectFunc) Macbeth_Actor220_Update, D_MA_6036930, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_221 */ {(void*) Macbeth_Actor221_Draw, 1, (ObjectFunc) Macbeth_Actor221_Update, D_MA_603694C, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_222 */ {(void*) Macbeth_Actor222_Draw, 1, (ObjectFunc) Macbeth_Actor222_Update, D_MA_6036968, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_223 */ {(void*) Macbeth_Actor223_Draw, 1, (ObjectFunc) Macbeth_Actor223_Update, D_MA_60364DC, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_224 */ {(void*) NULL, 1, (ObjectFunc) Titania_Actor224_Update, gNoHitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_225 */ {(void*) D_TI1_700AB70, 0, (ObjectFunc) Titania_Actor225_Update, D_TI_60064AC, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_226 */ {(void*) Titania_Actor226_Draw, 1, (ObjectFunc) Titania_Actor226_Update, D_TI_60064C8, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
|
||||
/* OBJ_ACTOR_227 */ {(void*) Titania_Actor227_Draw, 1, (ObjectFunc) Titania_Actor227_Update, D_TI_60067C4, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_228 */ {(void*) Titania_Actor228_Draw, 1, (ObjectFunc) Titania_Actor228_Update, D_TI_6006808, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_229 */ {(void*) Titania_Actor229_Draw, 1, (ObjectFunc) Titania_Actor229_Update, D_TI_6006A3C, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_230 */ {(void*) Titania_Actor230_Draw, 1, (ObjectFunc) Titania_Actor230_Update, D_TI_600683C, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_231 */ {(void*) Titania_Actor231_Draw, 1, (ObjectFunc) Titania_Actor231_Update, D_TI_6006858, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_232 */ {(void*) Titania_Actor232_Draw, 1, (ObjectFunc) Titania_Actor232_Update, D_TI_6006890, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
|
||||
/* OBJ_ACTOR_233 */ {(void*) Titania_Actor233_Draw, 1, (ObjectFunc) Titania_Actor233_Update, D_TI_60068F0, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_234 */ {(void*) Actor234_Draw, 1, (ObjectFunc) Actor234_Update, gNoHitbox, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
|
||||
/* OBJ_ACTOR_235 */ {(void*) Zoness_Actor235_Draw, 2, (ObjectFunc) Zoness_Actor235_Update, D_ZO_602C294, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_236 */ {(void*) Zoness_Actor236_Draw, 1, (ObjectFunc) Zoness_Actor236_Update, D_ZO_602BC58, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_237 */ {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update, gNoHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
|
||||
/* OBJ_ACTOR_238 */ {(void*) Zoness_Actor238_Draw, 2, (ObjectFunc) Zoness_Actor238_Update, gCubeHitbox100, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_239 */ {(void*) NULL, 1, (ObjectFunc) NULL, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_240 */ {(void*) Zoness_Actor240_Draw, 1, (ObjectFunc) Zoness_Actor240_Update, gCubeHitbox100, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
|
||||
/* OBJ_ACTOR_241 */ {(void*) Zoness_Actor241_Draw, 1, (ObjectFunc) Zoness_Actor241_Update, gActor241Hitbox, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_242 */ {(void*) Zoness_Actor242_Draw, 2, (ObjectFunc) Zoness_Actor242_Update, D_ZO_602BE3C, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_243 */ {(void*) Zoness_Actor243_Draw, 2, (ObjectFunc) Zoness_Actor243_Update, gCubeHitbox100, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_244 */ {(void*) Zoness_Actor244_Draw, 2, (ObjectFunc) Zoness_Actor244_Update, D_ZO_602BE58, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
|
||||
/* OBJ_ACTOR_245 */ {(void*) Zoness_Actor245_Draw, 1, (ObjectFunc) Zoness_Actor245_Update, gCubeHitbox100, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_246 */ {(void*) Zoness_Actor246_Draw, 1, (ObjectFunc) Zoness_Actor246_Update, gCubeHitbox100, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_247 */ {(void*) Zoness_Actor247_Draw, 1, (ObjectFunc) Zoness_Actor247_Update, D_ZO_602BFC4, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_248 */ {(void*) Zoness_Actor248_Draw, 1, (ObjectFunc) Zoness_Actor248_Update, gCubeHitbox150, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_249 */ {(void*) Zoness_Actor249_Draw, 1, (ObjectFunc) Zoness_Actor249_Update, gCubeHitbox200, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_250 */ {(void*) Zoness_Actor250_Draw, 1, (ObjectFunc) Zoness_Actor250_Update, D_ZO_602C1D4, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_251 */ {(void*) Zoness_Actor251_Draw, 2, (ObjectFunc) Zoness_Actor251_Update, D_ZO_602C218, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_252 */ {(void*) Zoness_Actor252_Draw, 1, (ObjectFunc) Zoness_Actor252_Update, D_ZO_602C234, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
|
||||
/* OBJ_ACTOR_253 */ {(void*) Zoness_Actor253_Draw, 1, (ObjectFunc) Zoness_Actor253_Update, D_ZO_602C250, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_254 */ {(void*) Zoness_Actor254_Draw, 1, (ObjectFunc) Zoness_Actor254_Update, D_ZO_602C2B0, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ME_METEO_BALL */ {(void*) MeteoBall_Draw, 1, (ObjectFunc) MeteoBall_Update, aMeMeteoBallHitbox, 100.0f, 0, 1, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ME_HOPBOT */ {(void*) ActorHopBot_Draw, 1, (ObjectFunc) ActorHopBot_Update, aMeHopBotHitbox, 100.0f, 0, 1, 39, 0, 180.0f, 1 },
|
||||
/* OBJ_ACTOR_SLIPPY_SX */ {(void*) SectorX_SxSlippy_Draw, 1, (ObjectFunc) SectorX_SxSlippy_Update, gNoHitbox, 1000.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_SY_ROBOT */ {(void*) SectorY_SyRobot_Draw, 1, (ObjectFunc) SectorY_SyRobot_Update, aSyRobotHitbox, 1000.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_MA_LOCOMOTIVE */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaLocomotive_Update, aMaLocomotiveHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_1 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar1_Update, aMaTrainCar1Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_207 */ {(void*) Macbeth_Actor207_Draw, 2, (ObjectFunc) Macbeth_Actor207_Update, aMaActor207Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_2 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar2_Update, aMaTrainCar2Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_3 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar3_Update, aMaTrainCar3Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_4 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar4_Update, aMaTrainCar4Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_5 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar5_Update, aMaTrainCar5Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_6 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar6_Update, aMaTrainCar6Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_TRAIN_CAR_7 */ {(void*) Macbeth_Train_Draw, 1, (ObjectFunc) Macbeth_MaTrainCar7_Update, aMaTrainCar7Hitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_RAILROAD_SWITCH */ {(void*) Macbeth_MaRailroadSwitch_Draw, 1, (ObjectFunc) Macbeth_MaRailroadSwitch_Update, aMaMaRailroadSwitchHitbox, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_BOULDER */ {(void*) Macbeth_MaBoulder_Draw, 1, (ObjectFunc) Macbeth_MaBoulder_Update, aMaBoulderHitbox, 300.0f, 0, 1, 40, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_MA_HORIZONTAL_LOCK_BAR */ {(void*) Macbeth_MaHorizontalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaHorizontalLockBar_Update, aMaHorizontalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_VERTICAL_LOCK_BAR */ {(void*) Macbeth_MaVerticalLockBar_Draw, 1, (ObjectFunc) Macbeth_MaVerticalLockBar_Update, aMaVerticalLockBarHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_BARRIER */ {(void*) Macbeth_MaBarrier_Draw, 1, (ObjectFunc) Macbeth_MaBarrier_Update, aMaBarrierHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_219 */ {(void*) Macbeth_Actor219_Draw, 1, (ObjectFunc) Macbeth_Actor219_Update, aMaActor219Hitbox, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_BOMBDROP */ {(void*) Macbeth_MaBombDrop_Draw, 1, (ObjectFunc) Macbeth_MaBombDrop_Update, aMaBombDropHitbox, 200.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_SPEAR */ {(void*) Macbeth_MaSpear_Draw, 1, (ObjectFunc) Macbeth_MaSpear_Update, aMaSpearHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_SHOCK_BOX */ {(void*) Macbeth_MaShockBox_Draw, 1, (ObjectFunc) Macbeth_MaShockBox_Update, aMaShockBoxHitbox, 300.0f, 0, 0, 40, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_MA_RAILWAY_SIGNAL */ {(void*) Macbeth_MaRailwaySignal_Draw, 1, (ObjectFunc) Macbeth_MaRailwaySignal_Update, aMaRailwaySignalHitbox, 300.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_TI_TERRAIN */ {(void*) NULL, 1, (ObjectFunc) Titania_TiTerrain_Update, gNoHitbox, 200.0f, 0, 0, 39, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_TI_LANDMINE */ {(void*) aTi1LandmineDL, 0, (ObjectFunc) Titania_TiLandmine_Update, aTi1LandmineHitbox, 50.0f, 0, 0, 39, 1, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_TI_DESERT_ROVER */ {(void*) Titania_TiDesertRover_Draw, 1, (ObjectFunc) Titania_TiDesertRover_Update, aTiDesertRoverHitbox, 300.0f, 0, 0, 39, 1, 70.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_DELPHOR */ {(void*) Titania_TiDelphor_Draw, 1, (ObjectFunc) Titania_TiDelphor_Update, aTiDelphorHitbox, 0.0f, 0, 0, 39, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_TI_DELPHOR_HEAD */ {(void*) Titania_TiDelphorHead_Draw, 1, (ObjectFunc) Titania_TiDelphorHead_Update, aTiDelphorHeadHitbox, 0.0f, 0, 0, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_DESERT_CRAWLER */ {(void*) Titania_TiDesertCrawler_Draw, 1, (ObjectFunc) Titania_TiDesertCrawler_Update, aTiDesertCrawlerHitbox, 1000.0f, 0, 0, 20, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_BOULDER */ {(void*) Titania_TiBoulder_Draw, 1, (ObjectFunc) Titania_TiBoulder_Update, aTiBoulderHitbox, 0.0f, 0, 1, 39, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_BOMB */ {(void*) Titania_TiBomb_Draw, 1, (ObjectFunc) Titania_TiBomb_Update, aTiBombHitbox, 0.0f, 0, 0, 39, 1, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_RASCO */ {(void*) Titania_TiRasco_Draw, 1, (ObjectFunc) Titania_TiRasco_Update, aTiRascoHitbox, 0.0f, 0, 0, 39, 1, 20.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_FEKUDA */ {(void*) Titania_TiFekuda_Draw, 1, (ObjectFunc) Titania_TiFekuda_Update, aTiFekudaHitbox, 200.0f, 0, 0, 39, 1, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_TI_GREAT_FOX */ {(void*) TiGreatFox_Draw, 1, (ObjectFunc) TiGreatFox_Update, gNoHitbox, 2000.0f, 0, 0, 39, 0, 0.0f, 5 },
|
||||
/* OBJ_ACTOR_ZO_BIRD */ {(void*) Zoness_ZoBird_Draw, 2, (ObjectFunc) Zoness_ZoBird_Update, aZoBirdHitbox, 1000.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ZO_DODORA */ {(void*) Zoness_ZoDodora_Draw, 1, (ObjectFunc) Zoness_ZoDodora_Update, aZoDodoraHitbox, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_UNK_237 */ {(void*) Actor237_Draw, 1, (ObjectFunc) Actor237_Update, gNoHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 2 },
|
||||
/* OBJ_ACTOR_ZO_FISH */ {(void*) Zoness_ZoFish_Draw, 2, (ObjectFunc) Zoness_ZoFish_Update, gCubeHitbox100, 200.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ZO_DODORA_WP_COUNT */ {(void*) NULL, 1, (ObjectFunc) NULL, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_Z_GULL */ {(void*) Zoness_ZGull_Draw, 1, (ObjectFunc) Zoness_ZGull_Update, gCubeHitbox100, 1500.0f, 0, 1, 40, 0, 20.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_ENERGY_BALL */ {(void*) Zoness_ZoEnergyBall_Draw, 1, (ObjectFunc) Zoness_ZoEnergyBall_Update, gZoEnergyBallHitbox, 1500.0f, 0, 1, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_TROIKA */ {(void*) Zoness_ZoTroika_Draw, 2, (ObjectFunc) Zoness_ZoTroika_Update, aZoTroikaHitbox, 500.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_SHRIMP */ {(void*) Zoness_ZoShrimp_Draw, 2, (ObjectFunc) Zoness_ZoShrimp_Update, gCubeHitbox100, 0.0f, 0, 1, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ZO_OBNEMA */ {(void*) Zoness_ZoObnema_Draw, 2, (ObjectFunc) Zoness_ZoObnema_Update, aZoObnemaHitbox, 2000.0f, 0, 0, 40, 0, 50.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_BALL */ {(void*) Zoness_ZoBall_Draw, 1, (ObjectFunc) Zoness_ZoBall_Update, gCubeHitbox100, 200.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_MINE */ {(void*) Zoness_ZoMine_Draw, 1, (ObjectFunc) Zoness_ZoMine_Update, gCubeHitbox100, 2000.0f, 0, 0, 40, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_BARRIER */ {(void*) Zoness_ZoBarrier_Draw, 1, (ObjectFunc) Zoness_ZoBarrier_Update, aZoBarrierHitbox, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_CRANE_MAGNET */ {(void*) Zoness_ZoCraneMagnet_Draw, 1, (ObjectFunc) Zoness_ZoCraneMagnet_Update, gCubeHitbox150, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_SPIKEBALL */ {(void*) Zoness_ZoSpikeBall_Draw, 1, (ObjectFunc) Zoness_ZoSpikeBall_Update, gCubeHitbox200, 5000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_CARGOSHIP */ {(void*) Zoness_ZoCargoShip_Draw, 1, (ObjectFunc) Zoness_ZoCargoShip_Update, aZoCargoShipHitbox, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_CONTAINER */ {(void*) Zoness_ZoContainer_Draw, 2, (ObjectFunc) Zoness_ZoContainer_Update, aZoContainerHitbox, 1000.0f, 0, 0, 40, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_ZO_RADARBUOY */ {(void*) Zoness_ZoRadarBuoy_Draw, 1, (ObjectFunc) Zoness_ZoRadarBuoy_Update, aZoRadarBuoyHitbox, 200.0f, 0, 0, 40, 0, 80.0f, 1 },
|
||||
/* OBJ_ACTOR_ZO_SUPPLYCRANE */ {(void*) Zoness_ZoSupplyCrane_Draw, 1, (ObjectFunc) Zoness_ZoSupplyCrane_Update, aZoSupplyCraneHitbox, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_ZO_SEARCHLIGHT */ {(void*) Zoness_ZoSearchLight_Draw, 1, (ObjectFunc) Zoness_ZoSearchLight_Update, aZoSearchLightHitbox, 300.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_255 */ {(void*) Aquas_Actor255_Draw, 1, (ObjectFunc) Aquas_Actor255_Update, D_AQ_6030BFC, 500.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_256 */ {(void*) Aquas_Actor256_Draw, 1, (ObjectFunc) Aquas_Actor256_Update, D_AQ_6030C18, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_257 */ {(void*) Aquas_Actor257_Draw, 1, (ObjectFunc) Aquas_Actor257_Update, D_AQ_6030C44, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_258 */ {(void*) Aquas_Actor258_Draw, 1, (ObjectFunc) Aquas_Actor258_Update, gCubeHitbox100, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_259 */ {(void*) Aquas_Actor259_Draw, 2, (ObjectFunc) Aquas_Actor259_Update, D_AQ_6031398, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_260 */ {(void*) Aquas_Actor260_Draw, 2, (ObjectFunc) Aquas_Actor260_Update, D_AQ_60313CC, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_261 */ {(void*) Aquas_Actor261_Draw, 2, (ObjectFunc) Aquas_Actor261_Update, D_AQ_6031400, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_262 */ {(void*) Aquas_Actor262_Draw, 2, (ObjectFunc) Aquas_Actor262_Update, D_AQ_603144C, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_263 */ {(void*) Aquas_Actor263_Draw, 2, (ObjectFunc) Aquas_Actor263_Update, D_AQ_6031480, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_264 */ {(void*) Aquas_Actor264_Draw, 1, (ObjectFunc) Aquas_Actor264_Update, gCubeHitbox100, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_265 */ {(void*) Aquas_Actor265_Draw, 1, (ObjectFunc) Aquas_Actor265_Update, D_AQ_6031500, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_266 */ {(void*) Aquas_Actor266_Draw, 2, (ObjectFunc) Aquas_Actor266_Update, D_AQ_6031538, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_267 */ {(void*) Aquas_Actor267_Draw, 2, (ObjectFunc) Aquas_Actor267_Update, D_AQ_6031554, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_268 */ {(void*) Aquas_Actor268_Draw, 1, (ObjectFunc) Aquas_Actor268_Update, D_AQ_6031570, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_269 */ {(void*) Aquas_Actor269_Draw, 1, (ObjectFunc) Aquas_Actor269_Update, D_AQ_6030D20, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_270 */ {(void*) Aquas_Actor270_Draw, 1, (ObjectFunc) Aquas_Actor270_Update, D_AQ_60314C8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_271 */ {(void*) Actor271_Draw, 2, (ObjectFunc) Actor271_Update, D_BO_6011B24, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
|
||||
/* OBJ_ACTOR_272 */ {(void*) Actor272_Draw, 1, (ObjectFunc) Actor272_Update, D_BO_6011BF4, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
|
||||
/* OBJ_ACTOR_FO_RADAR */ {(void*) Fortuna_Radar_Draw, 2, (ObjectFunc) Fortuna_Radar_Update, aFoRadarHitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
|
||||
/* OBJ_ACTOR_AQ_PEARL */ {(void*) Aquas_AqPearl_Draw, 1, (ObjectFunc) Aquas_AqPearl_Update, gCubeHitbox100, 200.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_ANGLERFISH */ {(void*) Aquas_AqAnglerFish_Draw, 2, (ObjectFunc) Aquas_AqAnglerFish_Update, aAqAnglerFishHitbox, 10000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_GAROA */ {(void*) Aquas_AqGaroa_Draw, 2, (ObjectFunc) Aquas_AqGaroa_Update, aAqGaroaHitbox, 300.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_SCULPIN */ {(void*) Aquas_AqSculpin_Draw, 2, (ObjectFunc) Aquas_AqSculpin_Update, aAqSculpinHitbox, 300.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_AQ_SPINDLYFISH */ {(void*) Aquas_AqSpindlyFish_Draw, 2, (ObjectFunc) Aquas_AqSpindlyFish_Update, aAqSpindlyFishHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_SQUID */ {(void*) Aquas_AqSquid_Draw, 2, (ObjectFunc) Aquas_AqSquid_Update, aAqSquidHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_AQ_SEAWEED */ {(void*) Aquas_AqSeaweed_Draw, 1, (ObjectFunc) Aquas_AqSeaweed_Update, gCubeHitbox100, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_BOULDER */ {(void*) Aquas_AqBoulder_Draw, 1, (ObjectFunc) Aquas_AqBoulder_Update, aAqBoulderHitbox, 200.0f, 0, 0, 40, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_AQ_CORAL */ {(void*) Aquas_AqCoral_Draw, 2, (ObjectFunc) Aquas_AqCoral_Update, aAqCoralHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_JELLYFISH */ {(void*) Aquas_AqJellyfish_Draw, 2, (ObjectFunc) Aquas_AqJellyfish_Update, aAqJellyfishHitbox, 800.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_FISHGROUP */ {(void*) Aquas_AqFishGroup_Draw, 1, (ObjectFunc) Aquas_AqFishGroup_Update, aAqFishGroupHitbox, 10000.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_STONE_COLUMN */ {(void*) Aquas_AqStoneColumn_Draw, 1, (ObjectFunc) Aquas_AqStoneColumn_Update, aAqStoneColumnHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AQ_OYSTER */ {(void*) Aquas_AqOyster_Draw, 1, (ObjectFunc) Aquas_AqOyster_Update, aAqOysterHitbox, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_BO_SHIELD_REACTOR */ {(void*) BoShieldReactor_Draw, 2, (ObjectFunc) BoShieldReactor_Update, aBoShieldReactorHitbox, 0.0f, 0, 0, 39, 0, 730.0f, 1 },
|
||||
/* OBJ_ACTOR_BO_LASER_CANNON */ {(void*) BoLaserCannon_Draw, 1, (ObjectFunc) BoLaserCannon_Update, aBoLaserCannonHitbox, 0.0f, 0, 0, 39, 0, 150.0f, 1 },
|
||||
/* OBJ_ACTOR_FO_RADAR */ {(void*) Fortuna_FoRadar_Draw, 2, (ObjectFunc) Fortuna_FoRadar_Update, aFoRadarHitbox, 0.0f, 0, 0, 39, 0, 220.0f, 1 },
|
||||
/* OBJ_ACTOR_SZ_SPACE_JUNK */ {(void*) SectorZ_SpaceJunkDraw, 1, (ObjectFunc) SectorZ_SpaceJunkUpdate, gCubeHitbox200, 0.0f, 0, 0, 39, 0, 1.0f, 0 },
|
||||
/* OBJ_ACTOR_275 */ {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update, gCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_276 */ {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update, gCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_277 */ {(void*) Solar_Doodad_Draw, 1, (ObjectFunc) Solar_Doodad_Update, gCubeHitbox200, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_278 */ {(void*) NULL, 1, (ObjectFunc) Solar_Actor278_Update, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_279 */ {(void*) NULL, 1, (ObjectFunc) Solar_Actor279_Update, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_280 */ {(void*) D_VE1_900DD20, 0, (ObjectFunc) Venom1_Actor280_Update, D_VE1_601B7F8, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_281 */ {(void*) Venom1_Actor281_Draw, 1, (ObjectFunc) Venom1_Doodad_Update, D_VE1_601B830, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_282 */ {(void*) D_VE1_901DA50, 0, (ObjectFunc) Venom1_Doodad_Update, D_VE1_601B868, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_283 */ {(void*) D_VE1_9023AD0, 0, (ObjectFunc) Venom1_Actor283_Update, D_VE1_601B8A0, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_284 */ {(void*) Venom1_Actor284_Draw, 1, (ObjectFunc) Venom1_Actor284_Update, D_VE1_601B8D8, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_285 */ {(void*) Andross_Actor285_Draw, 1, (ObjectFunc) Andross_Actor285_Update, gCubeHitbox100, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_286 */ {(void*) Andross_Actor286_Draw, 1, (ObjectFunc) Andross_Actor286_Update, gCubeHitbox100, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_287 */ {(void*) NULL, 1, (ObjectFunc) Andross_Actor287_Update, gNoHitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_288 */ {(void*) NULL, 1, (ObjectFunc) Andross_Actor288_Update, gNoHitbox, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_289 */ {(void*) Actor289_Draw, 1, (ObjectFunc) Andross_Actor289_Update, gNoHitbox, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_290 */ {(void*) NULL, 1, (ObjectFunc) Andross_Actor290_Update, gNoHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_SO_ROCK_1 */ {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update, gCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_SO_ROCK_2 */ {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update, gCubeHitbox100, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_SO_ROCK_3 */ {(void*) Solar_SoRock_Draw, 1, (ObjectFunc) Solar_SoRock_Update, gCubeHitbox200, 200.0f, 0, 0, 39, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_SO_WAVE */ {(void*) NULL, 1, (ObjectFunc) Solar_SoWave_Update, gNoHitbox, 200.0f, 0, 0, 0, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_SO_PROMINENCE */ {(void*) NULL, 1, (ObjectFunc) Solar_SoProminence_Update, gNoHitbox, 1000.0f, 0, 0, 0, 0, 0.0f, 1 },
|
||||
/* OBJ_ACTOR_VE1_PILLAR_1 */ {(void*) aVe1Pillar1DL, 0, (ObjectFunc) Venom1_Ve1Pillar1_Update, aVe1Pillar1Hitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_VE1_PILLAR_2 */ {(void*) Venom1_Ve1Pillar2_Draw, 1, (ObjectFunc) Venom1_Pillar2_3_Update, aVe1Pillar2Hitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_VE1_PILLAR_3 */ {(void*) aVe1Pillar3DL, 0, (ObjectFunc) Venom1_Pillar2_3_Update, aVe1Pillar3Hitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_VE1_PILLAR_4 */ {(void*) aVe1Pillar4DL, 0, (ObjectFunc) Venom1_Ve1Pillar4_Update, aVe1Pillar4Hitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_VE1_MONKEY_STATUE */ {(void*) Venom1_Ve1MonkeyStatue_Draw, 1, (ObjectFunc) Venom1_Ve1MonkeyStatue_Update, aVe1MonkeyStatueHitbox, 1000.0f, 0, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AND_LASER_EMITTER */ {(void*) Andross_AndLaserEmitter_Draw, 1, (ObjectFunc) Andross_AndLaserEmitter_Update, gCubeHitbox100, 1000.0f, 0, 0, 20, 0, 1.0f, 1 },
|
||||
/* OBJ_ACTOR_AND_BRAIN_WASTE */ {(void*) Andross_AndBrainWaste_Draw, 1, (ObjectFunc) Andross_AndBrainWaste_Update, gCubeHitbox100, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AND_EXPLOSION */ {(void*) NULL, 1, (ObjectFunc) Andross_AndExplosion_Update, gNoHitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AND_RADIO */ {(void*) NULL, 1, (ObjectFunc) Andross_AndRadio_Update, gNoHitbox, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AND_JAMES_TRIGGER */ {(void*) AndJamesTrigger_Draw, 1, (ObjectFunc) Andross_AndJamesTrigger_Update, gNoHitbox, 1000.0f, 0, 0, 20, 1, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_AND_BOSS_TIMER_SET */ {(void*) NULL, 1, (ObjectFunc) Andross_AndBossTimer_Update, gNoHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_ACTOR_SUPPLIES */ {(void*) ActorSupplies_Draw, 1, (ObjectFunc) ActorSupplies_Update, gCubeHitbox150, 1000.0f, 0, 0, 0, 0, 1.0f, 0 },
|
||||
/* OBJ_BOSS_CO_GRANGA */ {(void*) Corneria_Granga_Draw, 2, (ObjectFunc) Corneria_Granga_Update, aCoGrangaHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_CARRIER */ {(void*) Corneria_Carrier_Draw, 1, (ObjectFunc) Corneria_Carrier_Update, aCoCarrierHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_294 */ {(void*) Corneria_Boss294_Draw, 1, (ObjectFunc) Corneria_Boss294_Update, D_CO_603E714, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_295 */ {(void*) Corneria_Boss295_Draw, 1, (ObjectFunc) Corneria_Boss295_Update, D_CO_603E748, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_296 */ {(void*) Corneria_Boss296_Draw, 1, (ObjectFunc) Corneria_Boss296_Update, D_CO_603E7C4, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_297 */ {(void*) Meteo_Boss297_Draw, 1, (ObjectFunc) Meteo_Boss297_Update, D_ME_602F75C, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_298 */ {(void*) Meteo_Boss298_Draw, 1, (ObjectFunc) Meteo_Boss298_Update, D_ME_602FA50, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_299 */ {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update, gNoHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_300 */ {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update, gNoHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_301 */ {(void*) Aquas_Boss301_Draw, 1, (ObjectFunc) Aquas_Boss301_Update, D_AQ_6030B10, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_A6 */ {(void*) Area6_Boss_Draw, 1, (ObjectFunc) Area6_Boss_Update, D_A6_6028454, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SX_SPYBORG */ {(void*) SectorX_Boss_Draw, 2, (ObjectFunc) SectorX_Boss_Update, D_SX_6032550, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_304 */ {(void*) SectorX_Boss304_Draw, 2, (ObjectFunc) SectorX_Boss304_Update, D_SX_6032488, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_305 */ {(void*) SectorX_Boss305_Draw, 2, (ObjectFunc) SectorX_Boss305_Update, D_SX_60324EC, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_TI */ {(void*) Titania_Boss_Draw, 1, (ObjectFunc) Titania_Boss_Update,D_TI_801B83A8, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_ZO */ {(void*) Zoness_Boss_Draw, 2, (ObjectFunc) Zoness_Boss_Update, D_ZO_602C044, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
|
||||
/* OBJ_BOSS_FO */ {(void*) HUD_BossFO_Draw, 1, (ObjectFunc) HUD_BossFO_Update, D_FO_600FFE0, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_309 */ {(void*) Boss309_Draw, 1, (ObjectFunc) Boss309_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_310 */ {(void*) Boss310_Draw, 1, (ObjectFunc) Boss310_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_311 */ {(void*) Bolse_Boss311_Draw, 2, (ObjectFunc) Bolse_Boss311_Update, D_BO_6011C80, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_VE2 */ {(void*) Venom2_Boss_Draw, 2, (ObjectFunc) Venom2_Boss_Update, D_VE2_60166F4, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SZ_GREAT_FOX */ {(void*) SectorZ_GreatFoxDraw, 1, (ObjectFunc) SectorZ_GreatFoxUpdate, D_SZ_6009388, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SY */ {(void*) SectorY_Boss_Draw, 2, (ObjectFunc) SectorY_Boss_Update, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SO */ {(void*) Solar_Boss_Draw, 2, (ObjectFunc) Solar_Boss_Update, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_KA */ {(void*) Katina_BossDraw, 1, (ObjectFunc) Katina_BossUpdate, D_KA_6011058, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_KA_BASE */ {(void*) Katina_Base_Draw, 1, (ObjectFunc) Katina_BaseUpdate, D_KA_601115C, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_AQ */ {(void*) Aquas_Boss_Draw, 2, (ObjectFunc) Aquas_Boss_Update, D_AQ_6030F74, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_VE1 */ {(void*) Venom1_Boss_Draw, 1, (ObjectFunc) Venom1_Boss_Update,D_VE1_8019A9B8, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_320 */ {(void*) Andross_Boss320_Draw, 2, (ObjectFunc) Andross_Boss320_Update, D_ANDROSS_C038DC0, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_321 */ {(void*) Andross_Boss321_Draw, 1, (ObjectFunc) Andross_Boss321_Update, D_ANDROSS_C038F24, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_GRANGA */ {(void*) Corneria_CoGranga_Draw, 2, (ObjectFunc) Corneria_CoGranga_Update, aCoGrangaHitbox, 20000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_CARRIER */ {(void*) Corneria_CoCarrier_Draw, 1, (ObjectFunc) Corneria_CoCarrier_Update, aCoCarrierHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_CARRIER_LEFT */ {(void*) Corneria_CoCarrierLeft_Draw, 1, (ObjectFunc) Corneria_CarrierLeft_Update, aCoCarrierLeftHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_CARRIER_UPPER */ {(void*) Corneria_CoCarrierUpper_Draw, 1, (ObjectFunc) Corneria_CarrierUpper_Update, aCoCarrierUpperHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_CO_CARRIER_BOTTOM */ {(void*) Corneria_CoCarrierBottom_Draw, 1, (ObjectFunc) Corneria_CarrierBottom_Update, aCoCarrierBottomHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_ME_CRUSHER */ {(void*) Meteo_MeCrusher_Draw, 1, (ObjectFunc) Meteo_MeCrusher_Update, aMeCrusherHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_ME_CRUSHER_SHIELD */ {(void*) Meteo_MeCrusherShield_Draw, 1, (ObjectFunc) Meteo_MeCrusherShield_Update, aMeCrusherShieldHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_UNK_299 */ {(void*) Boss299_Draw, 2, (ObjectFunc) Boss299_Update, gNoHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_UNK_300 */ {(void*) Boss300_Draw, 1, (ObjectFunc) Boss300_Update, gNoHitbox, 20000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_AQ_UNK_301 */ {(void*) Aquas_Boss301_Draw, 1, (ObjectFunc) Aquas_Boss301_Update, aBoss301Hitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_A6_GORGON */ {(void*) Area6_A6Gorgon_Draw, 1, (ObjectFunc) Area6_A6Gorgon_Update, aA6GorgonHitbox, 2000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SX_SPYBORG */ {(void*) SectorX_SxSpyborg_Draw, 2, (ObjectFunc) SectorX_SxSpyborg_Update, aSxSpyborgHitbox, 20000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SX_SPYBORG_LEFT_ARM */ {(void*) SectorX_SxSpyborgLeftArm_Draw, 2, (ObjectFunc) SectorX_SxSpyborgLeftArm_Update, aSxSpyborgLeftArmHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SX_SPYBORG_RIGHT_ARM */ {(void*) SectorX_SxSpyborgRightArm_Draw, 2, (ObjectFunc) SectorX_SxSpyborgRightArm_Update, aSxSpyborgRightArmHitbox, 1000.0f, 0, 0, 20, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_TI_GORAS */ {(void*) Titania_TiGoras_Draw, 1, (ObjectFunc) Titania_TiGoras_Update, aTiGorasHitbox, 1000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_ZO_SARUMARINE */ {(void*) Zoness_ZoSarumarine_Draw, 2, (ObjectFunc) Zoness_ZoSarumarine_Update, aZoSarumarineHitbox, 1000.0f, 0, 0, 40, 0, 1.0f, 10 },
|
||||
/* OBJ_BOSS_FO_BASE */ {(void*) HUD_FoBase_Draw, 1, (ObjectFunc) HUD_FoBase_Update, aFoBaseHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_BO_BASE */ {(void*) BoBase_Draw, 1, (ObjectFunc) BoBase_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_BO_BASE_SHIELD */ {(void*) BoBaseShield_Draw, 1, (ObjectFunc) BoBaseShield_Update, gNoHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_BO_BASE_CORE */ {(void*) Bolse_BoBaseCore_Draw, 2, (ObjectFunc) Bolse_BoBaseCore_Update, aBoBaseCoreHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_VE2_BASE */ {(void*) Venom2_Ve2Base_Draw, 2, (ObjectFunc) Venom2_Ve2Base_Update, aVe2BaseHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SZ_GREAT_FOX */ {(void*) SectorZ_SzGreatFox_Draw, 1, (ObjectFunc) SectorZ_SzGreatFox_Update, aSzGreatFoxHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SY_SHOGUN */ {(void*) SectorY_SyShogun_Draw, 2, (ObjectFunc) SectorY_SyShogun_Update, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_SO_VULKAIN */ {(void*) Solar_SoVulkain_Draw, 2, (ObjectFunc) Solar_SoVulkain_Update, gNoHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_KA_SAUCERER */ {(void*) Katina_KaSaucerer_Draw, 1, (ObjectFunc) Katina_KaSaucerer_Update, aKaSaucererHitbox, 0.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_KA_FLBASE */ {(void*) Katina_KaFrontlineBase_Draw, 1, (ObjectFunc) Katina_KaFrontlineBase_Update, aKaFrontlineBaseHitbox, 0.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_AQ_BACOON */ {(void*) Aquas_AqBacoon_Draw, 2, (ObjectFunc) Aquas_AqBacoon_Update, aAqBacoonHitbox, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_VE1_GOLEMECH */ {(void*) Venom1_Ve1Golemech_Draw, 1, (ObjectFunc) Venom1_Ve1Golemech_Update, aVe1GolemechHitbox, 3000.0f, 0, 0, 40, 1, 0.0f, 10 },
|
||||
/* OBJ_BOSS_AND_ANDROSS */ {(void*) Andross_AndAndross_Draw, 2, (ObjectFunc) Andross_AndAndross_Update, aAndAndrossHitbox, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_BOSS_AND_BRAIN */ {(void*) Andross_AndBrain_Draw, 1, (ObjectFunc) Andross_AndBrain_Update, aAndBrainHitbox, 10000.0f, 0, 0, 40, 0, 0.0f, 10 },
|
||||
/* OBJ_ITEM_LASERS */ {(void*) ItemLasers_Draw, 1, (ObjectFunc) ItemLasers_Update, gItemLasersHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ITEM_CHECKPOINT */ {(void*) ItemCheckpoint_Draw, 1, (ObjectFunc) ItemCheckpoint_Update, gItemCheckpointHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ITEM_SILVER_RING */ {(void*) ItemSilverRing_Draw, 1, (ObjectFunc) ItemSupplyRing_Update, gItemSupplyRingHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
@@ -432,13 +432,13 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_ITEM_GOLD_RING */ {(void*) ItemGoldRing_Draw, 1, (ObjectFunc) ItemGoldRing_Update, gItemSupplyRingHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ITEM_WING_REPAIR */ {(void*) aArwingItemLasersDL, 0, (ObjectFunc) ItemWingRepair_Update, gItemLasersHitbox, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_ITEM_TRAINING_RING */ {(void*) gItemTrainingRingDL, 0, (ObjectFunc) Training_ItemRing_Update, D_TR_6009CFC, 700.0f, 0, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_FIRE_SMOKE */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect339_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_340 */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect340_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_341 */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect341_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_342 */ {(void*) Effect_Effect342_Draw, 1, (ObjectFunc) Effect_Effect342_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_343 */ {(void*) Effect_Effect343_Draw, 1, (ObjectFunc) Effect_Effect343_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_344 */ {(void*) Effect_Effect344_Draw, 1, (ObjectFunc) Effect_Effect344_Update, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_345 */ {(void*) Effect_Effect345_Draw, 1, (ObjectFunc) Effect_Effect345_Update, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_FIRE_SMOKE_1 */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect339_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_FIRE_SMOKE_2 */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect340_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_FIRE_SMOKE_3 */ {(void*) Effect_FireSmoke_Draw, 1, (ObjectFunc) Effect_Effect341_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_SMOKE_1 */ {(void*) Effect_Effect342_Draw, 1, (ObjectFunc) Effect_Effect342_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_SMOKE_2 */ {(void*) Effect_Effect343_Draw, 1, (ObjectFunc) Effect_Effect343_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_EXPLOSION_MARK_1 */ {(void*) Effect_Effect344_Draw, 1, (ObjectFunc) Effect_Effect344_Update, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_LASER_MARK_1 */ {(void*) Effect_Effect345_Draw, 1, (ObjectFunc) Effect_Effect345_Update, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_346 */ {(void*) Effect_Effect346_Draw, 1, (ObjectFunc) Effect_Effect346_Update, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_347 */ {(void*) Effect_Effect347_Draw, 1, (ObjectFunc) Effect_Effect347_Update, NULL, 100.0f, 1, 0, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_348 */ {(void*) Effect_Effect348_Draw, 1, (ObjectFunc) Effect_Effect348_Update, NULL, -200.0f, -1, 1, 0, 0, 0.0f, 0 },
|
||||
@@ -451,7 +451,7 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_EFFECT_355 */ {(void*) Effect_Effect355_Draw, 1, (ObjectFunc) Effect_Effect355_Update, NULL, 100.0f, 1, 0, 20, 1, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_356 */ {(void*) Effect_Effect356_Draw, 1, (ObjectFunc) Effect_Effect356_Update, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_357 */ {(void*) Effect_Effect357_Draw, 1, (ObjectFunc) Effect_Effect357_Update, NULL, 100.0f, 0, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_358 */ {(void*) Katina_LaserEnergyParticlesDraw, 1, (ObjectFunc) Katina_LaserEnergyParticlesUpdate, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_KA_ENERGY_PARTICLES */ {(void*) Katina_LaserEnergyParticlesDraw, 1, (ObjectFunc) Katina_LaserEnergyParticlesUpdate, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_359 */ {(void*) Effect_Effect359_Draw, 1, (ObjectFunc) Effect_Effect359_Update, NULL, -100.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_360 */ {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect360_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_361 */ {(void*) Effect_Effect360_361_362_Draw, 1, (ObjectFunc) Effect_Effect361_Update, NULL, -200.0f, 1, 2, 0, 0, 0.0f, 0 },
|
||||
@@ -467,10 +467,10 @@ ObjectInfo gObjectInfo[] = {
|
||||
/* OBJ_EFFECT_371 */ {(void*) Meteo_Effect371_Draw, 1, (ObjectFunc) Meteo_Effect371_Update, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_372 */ {(void*) Effect_Effect372_Draw, 1, (ObjectFunc) Effect_Effect372_Update, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_TIMED_SFX */ {(void*) NULL, 1, (ObjectFunc) Effect_TimedSfx_Update, NULL, 500.0f, 0, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_374 */ {(void*) Macbeth_Effect374_Draw, 1, (ObjectFunc) Effect_Effect374_Update, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_375 */ {(void*) Macbeth_Effect375_Draw, 1, (ObjectFunc) Effect_Effect375_Update, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_376 */ {(void*) Macbeth_Effect376_Draw, 1, (ObjectFunc) Effect_Effect376_Update, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_377 */ {(void*) Macbeth_Effect377_Draw, 1, (ObjectFunc) Effect_Effect377_Update, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_374 */ {(void*) Effect_Effect374_Draw, 1, (ObjectFunc) Effect_Effect374_Update, NULL, 100.0f, 0, 1, 40, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_375 */ {(void*) Effect_Effect375_Draw, 1, (ObjectFunc) Effect_Effect375_Update, NULL, -200.0f, 0, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_376 */ {(void*) Effect_Effect376_Draw, 1, (ObjectFunc) Effect_Effect376_Update, NULL, -200.0f, 1, 0, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_377 */ {(void*) Effect_Effect377_Draw, 1, (ObjectFunc) Effect_Effect377_Update, NULL, 100.0f, 1, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_378 */ {(void*) Macbeth_Effect378_Draw, 1, (ObjectFunc) Macbeth_Effect378_Update, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_379 */ {(void*) Macbeth_Effect379_Draw, 1, (ObjectFunc) Macbeth_Effect379_Update, NULL, 100.0f, 1, 1, 0, 0, 0.0f, 0 },
|
||||
/* OBJ_EFFECT_380 */ {(void*) Macbeth_Effect380_Draw, 1, (ObjectFunc) Macbeth_Effect380_Update, NULL, 100.0f, 0, 0, 20, 0, 0.0f, 0 },
|
||||
|
||||
+55
-54
@@ -59,13 +59,13 @@ void Sprite168_Draw(Sprite168* this) {
|
||||
void Object_dummy_800598DC(s32 arg0) {
|
||||
}
|
||||
|
||||
void Actor201_Draw(Actor201* this) {
|
||||
void MeteoBall_Draw(MeteoBall* this) {
|
||||
RCP_SetupDL_60(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
gSPDisplayList(gMasterDisp++, D_MA_6025B50);
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
}
|
||||
|
||||
void Actor202_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) {
|
||||
void ActorHopBot_PostLimbDraw(s32 limbIndex, Vec3f* rot, void* index) {
|
||||
Vec3f sp24;
|
||||
Vec3f sp18;
|
||||
|
||||
@@ -88,17 +88,17 @@ f32 D_edisplay_800CFA2C[] = {
|
||||
1.0f, 1.0f, 0.95f, 0.9f, 0.85f, 0.8f, 0.75f, 0.7f, 0.65f, 0.6f,
|
||||
};
|
||||
|
||||
void Actor202_Draw(Actor202* this) {
|
||||
void ActorHopBot_Draw(ActorHopBot* this) {
|
||||
Vec3f sp30[30];
|
||||
f32 temp = D_edisplay_800CF9B0[this->animFrame] - 114.0f;
|
||||
|
||||
Matrix_Translate(gGfxMatrix, 0.f, -temp, 0.0f, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
Animation_GetFrameData(&D_ME_601E8C4, this->animFrame, sp30);
|
||||
Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, Actor202_PostLimbDraw, &this->index, &gIdentityMatrix);
|
||||
Animation_DrawSkeleton(1, D_ME_601E9D0, sp30, NULL, ActorHopBot_PostLimbDraw, &this->index, &gIdentityMatrix);
|
||||
}
|
||||
|
||||
void MeteoTunnel_Draw(MeteoTunnel* this) {
|
||||
void MeteoTunnel_Draw(MeTunnel* this) {
|
||||
gSPDisplayList(gMasterDisp++, D_ME_601AE40);
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ void CoIBeam_Draw(CoIBeam* this) {
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6023AC0);
|
||||
}
|
||||
|
||||
void Actor196_Draw(Actor196* this) {
|
||||
void ActorMoleMissile_Draw(ActorMoleMissile* this) {
|
||||
if (this->animFrame != 0) {
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6032BC0);
|
||||
}
|
||||
@@ -231,7 +231,7 @@ Gfx* D_edisplay_800CFC0C[] = {
|
||||
D_AQ_60294A0, D_AQ_60291B0, D_AQ_60287F0, D_AQ_6029330, D_AQ_6029240, D_AQ_6029790, D_AQ_6029900,
|
||||
D_AQ_6028F50, D_AQ_60290C0, D_AQ_6029530, D_AQ_60296A0, D_AQ_6028A80, D_AQ_6028910,
|
||||
};
|
||||
Gfx* D_edisplay_800CFC40[] = { D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0, D_AQ_6014FD0 };
|
||||
Gfx* D_edisplay_800CFC40[] = { aAqBoulderDL, aAqBoulderDL, aAqBoulderDL, aAqBoulderDL };
|
||||
Gfx* D_edisplay_800CFC50[] = { D_AQ_601EDE0, D_AQ_601F2F0, D_AQ_601F830, D_AQ_601FD70, D_AQ_601D110 };
|
||||
Gfx* D_edisplay_800CFC64[] = { D_AQ_6023940, D_AQ_6023D70, D_AQ_60249C0, D_AQ_6023EB0, D_AQ_60249C0, D_AQ_6023B80 };
|
||||
Gfx* D_edisplay_800CFC7C[] = { D_ZO_601B570, D_ZO_601B710, D_ZO_60209B0, D_ZO_6020B70, D_ZO_6020D50,
|
||||
@@ -448,7 +448,7 @@ void Actor_DrawEngineAndContrails(Actor* actor) {
|
||||
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].camYaw, MTXF_APPLY);
|
||||
Matrix_RotateX(gGfxMatrix, gPlayer[gPlayerNum].camPitch, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
Play_DrawEngineGlow(gLevelType);
|
||||
Display_DrawEngineGlow(gLevelType);
|
||||
Matrix_Pop(&gGfxMatrix);
|
||||
}
|
||||
sp5C = actor->fwork[21];
|
||||
@@ -502,16 +502,17 @@ void Actor_DrawEngineGlow(Actor* actor, s32 levelType) {
|
||||
Matrix_RotateY(gGfxMatrix, -actor->obj.rot.y * M_DTOR, MTXF_APPLY);
|
||||
Matrix_RotateY(gGfxMatrix, -gPlayer[gPlayerNum].camYaw, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
Play_DrawEngineGlow(levelType);
|
||||
Display_DrawEngineGlow(levelType);
|
||||
Matrix_Pop(&gGfxMatrix);
|
||||
}
|
||||
}
|
||||
|
||||
void func_edisplay_8005B388(Actor* actor) {
|
||||
void func_edisplay_8005B388(Actor199* actor) {
|
||||
Vec3f sp3C = { 0.0f, 0.0f, 0.0f };
|
||||
Vec3f sp30;
|
||||
|
||||
Matrix_MultVec3f(gGfxMatrix, &sp3C, &sp30);
|
||||
|
||||
if ((((fabsf(sp30.z) < 3000.0f) && (fabsf(sp30.x) < 3000.0f) && !gBossActive) ||
|
||||
(gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) || (gCurrentLevel == LEVEL_VENOM_ANDROSS) ||
|
||||
(gCurrentLevel == LEVEL_VENOM_2) || (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_LEVEL_COMPLETE)) &&
|
||||
@@ -545,7 +546,7 @@ void func_edisplay_8005B388(Actor* actor) {
|
||||
D_edisplay_80161630.unk_04 = D_edisplay_80161630.unk_08 = D_edisplay_80161630.unk_0C =
|
||||
D_edisplay_80161630.unk_10 = 0.0f;
|
||||
}
|
||||
func_display_80053658(&D_edisplay_80161630);
|
||||
Display_ArwingWings(&D_edisplay_80161630);
|
||||
} else if (gLevelType == LEVELTYPE_PLANET) {
|
||||
gSPDisplayList(gMasterDisp++, D_ENMY_PLANET_40018A0);
|
||||
} else if (gPlayer[0].wingPosition == 2) {
|
||||
@@ -556,25 +557,25 @@ void func_edisplay_8005B388(Actor* actor) {
|
||||
Actor_DrawEngineAndContrails(actor);
|
||||
}
|
||||
|
||||
void Actor180_Draw(Actor* actor) {
|
||||
void MeMolarRock_Draw(Actor* actor) {
|
||||
Matrix_Scale(gGfxMatrix, 1.0f, 1.0f, 1.0f, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_ME_6024B60);
|
||||
}
|
||||
|
||||
void Actor182_Draw(Actor* actor) {
|
||||
void MeMeteor2_Draw(Actor* actor) {
|
||||
RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar);
|
||||
Matrix_Scale(gGfxMatrix, 0.5f, 0.5f, 0.5f, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_ME_6018C00);
|
||||
gSPDisplayList(gMasterDisp++, aMeMeteor1DL);
|
||||
}
|
||||
|
||||
void Actor186_Draw(Actor* actor) {
|
||||
void MeLaserCannon1_Draw(Actor* actor) {
|
||||
RCP_SetupDL_29(actor->unk_046, gFogGreen, gFogBlue, gFogAlpha, actor->unk_048, gFogFar);
|
||||
gSPDisplayList(gMasterDisp++, D_ME_6022920);
|
||||
}
|
||||
|
||||
void Actor190_191_Draw(Actor* actor) {
|
||||
void ActorMissileSeek_Draw(Actor* actor) {
|
||||
f32 scale;
|
||||
|
||||
switch (actor->eventType) {
|
||||
@@ -599,13 +600,13 @@ void Actor190_191_Draw(Actor* actor) {
|
||||
Actor_DrawEngineGlow(actor, 2);
|
||||
}
|
||||
|
||||
void Actor192_Draw(Actor* actor) {
|
||||
void ActorSkibot_Draw(Actor* actor) {
|
||||
Matrix_Translate(gGfxMatrix, 0.0f, -124.0f, 0.0f, MTXF_APPLY);
|
||||
Animation_GetFrameData(&D_CO_6029528, actor->animFrame, actor->vwork);
|
||||
Animation_DrawSkeleton(1, D_CO_6029674, actor->vwork, NULL, NULL, actor, &gIdentityMatrix);
|
||||
}
|
||||
|
||||
void Actor193_Draw(Actor* actor) {
|
||||
void ActorRadar_Draw(Actor* actor) {
|
||||
if (actor->timer_0BC != 0) {
|
||||
RCP_SetupDL_27();
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 0, 0, 255);
|
||||
@@ -670,7 +671,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
case OBJ_BOSS_CO_GRANGA:
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
|
||||
break;
|
||||
case OBJ_BOSS_KA:
|
||||
case OBJ_BOSS_KA_SAUCERER:
|
||||
if (gPlayer[0].state_1C8 == PLAYERSTATE_1C8_STANDBY) {
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 200);
|
||||
@@ -680,9 +681,9 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
gSPDisplayList(gMasterDisp++, D_102A8A0);
|
||||
break;
|
||||
case OBJ_BOSS_CO_CARRIER:
|
||||
case OBJ_BOSS_294:
|
||||
case OBJ_BOSS_295:
|
||||
case OBJ_BOSS_296:
|
||||
case OBJ_BOSS_CO_CARRIER_LEFT:
|
||||
case OBJ_BOSS_CO_CARRIER_UPPER:
|
||||
case OBJ_BOSS_CO_CARRIER_BOTTOM:
|
||||
COS_DEG(gBosses[index].obj.rot.z);
|
||||
if (gGroundSurface == SURFACE_WATER) {
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 90);
|
||||
@@ -693,22 +694,22 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
case OBJ_BOSS_CO_CARRIER:
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6036840);
|
||||
break;
|
||||
case OBJ_BOSS_294:
|
||||
case OBJ_BOSS_CO_CARRIER_LEFT:
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6036CD0);
|
||||
break;
|
||||
case OBJ_BOSS_295:
|
||||
case OBJ_BOSS_296:
|
||||
case OBJ_BOSS_CO_CARRIER_UPPER:
|
||||
case OBJ_BOSS_CO_CARRIER_BOTTOM:
|
||||
gSPDisplayList(gMasterDisp++, D_CO_60363B0);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case OBJ_ACTOR_192:
|
||||
case OBJ_ACTOR_CO_SKIBOT:
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 150);
|
||||
Matrix_Scale(gGfxMatrix, 0.4f, 0.4f, gActors[index].scale, MTXF_APPLY);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_CO_6034B90);
|
||||
break;
|
||||
case OBJ_ACTOR_230:
|
||||
case OBJ_ACTOR_TI_BOULDER:
|
||||
RCP_SetupDL_48();
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
|
||||
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
|
||||
@@ -721,7 +722,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_1024AC0);
|
||||
break;
|
||||
case OBJ_ACTOR_229:
|
||||
case OBJ_ACTOR_TI_DESERT_CRAWLER:
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_68);
|
||||
gSPSetGeometryMode(gMasterDisp++, G_CULL_BACK);
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
|
||||
@@ -735,7 +736,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_1024AC0);
|
||||
break;
|
||||
case OBJ_ACTOR_231:
|
||||
case OBJ_ACTOR_TI_BOMB:
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_69);
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
|
||||
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 0);
|
||||
@@ -747,7 +748,7 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_1024AC0);
|
||||
break;
|
||||
case OBJ_ACTOR_215:
|
||||
case OBJ_ACTOR_MA_BOULDER:
|
||||
RCP_SetupDL_48();
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 0, 0, 0, 255);
|
||||
gDPSetEnvColor(gMasterDisp++, 0, 0, 0, 255);
|
||||
@@ -755,8 +756,8 @@ void Object_SetShadowDL(ObjectId objId, s32 index) {
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
gSPDisplayList(gMasterDisp++, D_1024AC0);
|
||||
break;
|
||||
case OBJ_BOSS_VE1:
|
||||
Venom1_80198310(&gBosses[index]);
|
||||
case OBJ_BOSS_VE1_GOLEMECH:
|
||||
Venom1_Ve1Golemech_SetShadow(&gBosses[index]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -947,7 +948,7 @@ void Scenery_Draw(Scenery* this, s32 arg1) {
|
||||
this->obj.pos.y -= gCameraShakeY;
|
||||
if (this->info.drawType == 0) {
|
||||
if ((this->obj.id == OBJ_SCENERY_CO_TOWER) || (this->obj.id == OBJ_SCENERY_CO_ROCKWALL) ||
|
||||
(this->obj.id == OBJ_SCENERY_CO_HIGHWAY_4) || (this->obj.id == OBJ_SCENERY_50)) {
|
||||
(this->obj.id == OBJ_SCENERY_CO_HIGHWAY_4) || (this->obj.id == OBJ_SCENERY_VE1_WALL_3)) {
|
||||
RCP_SetupDL_57(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
gSPClearGeometryMode(gMasterDisp++, G_CULL_BACK);
|
||||
if (arg1 < 0) {
|
||||
@@ -995,15 +996,15 @@ void Actor_DrawOnRails(Actor* this) {
|
||||
|
||||
if (this->info.draw != NULL) {
|
||||
switch (this->obj.id) {
|
||||
case OBJ_ACTOR_194:
|
||||
Actor194_Draw(this);
|
||||
case OBJ_ACTOR_ME_MORA:
|
||||
MeMora_Draw(this);
|
||||
return;
|
||||
case OBJ_ACTOR_236:
|
||||
Zoness_Actor236_Draw(this);
|
||||
case OBJ_ACTOR_ZO_DODORA:
|
||||
Zoness_ZoDodora_Draw(this);
|
||||
return;
|
||||
}
|
||||
if ((this->obj.id == OBJ_ACTOR_EVENT) && (this->eventType == EVID_200)) {
|
||||
Actor194_Draw(this);
|
||||
MeMora_Draw(this);
|
||||
} else {
|
||||
if (this->info.unk_19 != 0) {
|
||||
this->obj.pos.y += gCameraShakeY;
|
||||
@@ -1115,7 +1116,7 @@ void Actor_DrawAllRange(Actor* this) {
|
||||
}
|
||||
if (!sDrewActor) {
|
||||
this->lockOnTimers[gPlayerNum] = 0;
|
||||
if ((this->obj.id == OBJ_ACTOR_DEBRIS) || (this->obj.id == OBJ_ACTOR_286)) {
|
||||
if ((this->obj.id == OBJ_ACTOR_DEBRIS) || (this->obj.id == OBJ_ACTOR_AND_BRAIN_WASTE)) {
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
}
|
||||
}
|
||||
@@ -1149,7 +1150,7 @@ void Boss_Draw(Boss* this, s32 arg1) {
|
||||
}
|
||||
Matrix_MultVec3f(&D_edisplay_801615F0, &origin, &D_edisplay_801615D0);
|
||||
Object_SetSfxSourceToView(this->sfxSource, &D_edisplay_801615D0);
|
||||
if ((this->obj.id == OBJ_BOSS_KA) || (this->obj.id == OBJ_BOSS_KA_BASE)) {
|
||||
if ((this->obj.id == OBJ_BOSS_KA_SAUCERER) || (this->obj.id == OBJ_BOSS_KA_FLBASE)) {
|
||||
var_fa1 = 6000.0f;
|
||||
var_fv0 = 6000.0f;
|
||||
var_ft5 = 0.9f;
|
||||
@@ -1170,8 +1171,8 @@ void Boss_Draw(Boss* this, s32 arg1) {
|
||||
if (fabsf(D_edisplay_801615D0.x) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) {
|
||||
if (fabsf(D_edisplay_801615D0.y) < (fabsf(D_edisplay_801615D0.z * var_ft5) + var_fa1)) {
|
||||
sp3C = 1.0f;
|
||||
if (this->obj.id != OBJ_BOSS_309) {
|
||||
if (this->obj.id != OBJ_BOSS_KA) {
|
||||
if (this->obj.id != OBJ_BOSS_BO_BASE) {
|
||||
if (this->obj.id != OBJ_BOSS_KA_SAUCERER) {
|
||||
Display_SetSecondLight(&this->obj.pos);
|
||||
}
|
||||
if (this->info.drawType != 2) {
|
||||
@@ -1186,7 +1187,7 @@ void Boss_Draw(Boss* this, s32 arg1) {
|
||||
}
|
||||
}
|
||||
D_edisplay_801615D0.y = sp3C;
|
||||
if (this->obj.id == OBJ_BOSS_309) {
|
||||
if (this->obj.id == OBJ_BOSS_BO_BASE) {
|
||||
this->vwork[30] = D_edisplay_801615D0;
|
||||
Display_SetSecondLight(&this->obj.pos);
|
||||
Matrix_SetGfxMtx(&gMasterDisp);
|
||||
@@ -1321,16 +1322,16 @@ void Object_DrawShadow(s32 index, Object* obj) {
|
||||
ActorAllRange_DrawShadow(&gActors[index]);
|
||||
} else {
|
||||
switch (obj->id) {
|
||||
case OBJ_ACTOR_230:
|
||||
case OBJ_ACTOR_TI_BOULDER:
|
||||
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gActors[index].fwork[1],
|
||||
obj->pos.z + gPathProgress, MTXF_APPLY);
|
||||
break;
|
||||
case OBJ_ACTOR_229:
|
||||
case OBJ_ACTOR_231:
|
||||
case OBJ_ACTOR_TI_DESERT_CRAWLER:
|
||||
case OBJ_ACTOR_TI_BOMB:
|
||||
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gActors[index].fwork[0],
|
||||
obj->pos.z + gPathProgress, MTXF_APPLY);
|
||||
break;
|
||||
case OBJ_BOSS_KA:
|
||||
case OBJ_BOSS_KA_SAUCERER:
|
||||
Matrix_Translate(gGfxMatrix, obj->pos.x, gGroundHeight + 2.0f + gCameraShakeY, obj->pos.z, MTXF_APPLY);
|
||||
break;
|
||||
default:
|
||||
@@ -1342,8 +1343,8 @@ void Object_DrawShadow(s32 index, Object* obj) {
|
||||
Matrix_Scale(gGfxMatrix, 1.0f, 0.0f, 1.0f, MTXF_APPLY);
|
||||
Matrix_RotateY(gGfxMatrix, obj->rot.y * M_DTOR, MTXF_APPLY);
|
||||
}
|
||||
if ((obj->id < OBJ_ACTOR_MAX) && (obj->id != OBJ_ACTOR_230) && (obj->id != OBJ_ACTOR_229) &&
|
||||
(obj->id != OBJ_ACTOR_231)) {
|
||||
if ((obj->id < OBJ_ACTOR_MAX) && (obj->id != OBJ_ACTOR_TI_BOULDER) &&
|
||||
(obj->id != OBJ_ACTOR_TI_DESERT_CRAWLER) && (obj->id != OBJ_ACTOR_TI_BOMB)) {
|
||||
Matrix_RotateX(gGfxMatrix, obj->rot.x * M_DTOR, MTXF_APPLY);
|
||||
Matrix_RotateZ(gGfxMatrix, obj->rot.z * M_DTOR, MTXF_APPLY);
|
||||
}
|
||||
@@ -1428,14 +1429,14 @@ void Scenery360_Draw(Scenery360* this) {
|
||||
f32 sp3C = 2000.0f;
|
||||
f32 sp38 = 0.5f;
|
||||
|
||||
if (this->obj.id == OBJ_SCENERY_156) {
|
||||
if (this->obj.id == OBJ_SCENERY_UNK_156) {
|
||||
sp44 = 4000.0f;
|
||||
sp40 = -13000.0f;
|
||||
sp3C = 4500.0f;
|
||||
} else if (gCurrentLevel == LEVEL_VENOM_ANDROSS) {
|
||||
sp40 = -20000.0f;
|
||||
sp38 = 0.4f;
|
||||
} else if (this->obj.id == OBJ_SCENERY_143) {
|
||||
} else if (this->obj.id == OBJ_SCENERY_VS_KA_FLBASE) {
|
||||
sp44 = 6000.0f;
|
||||
sp40 = -20000.0f;
|
||||
sp3C = 6000.0f;
|
||||
@@ -1451,7 +1452,7 @@ void Scenery360_Draw(Scenery360* this) {
|
||||
if (fabsf(sp48.y) < (fabsf(sp48.z * sp38) + sp3C)) {
|
||||
if (fabsf(sp48.x) < (fabsf(sp48.z * sp38) + sp3C)) {
|
||||
Display_SetSecondLight(&this->obj.pos);
|
||||
if (this->obj.id == OBJ_SCENERY_131) {
|
||||
if (this->obj.id == OBJ_SCENERY_AND_PASSAGE) {
|
||||
Matrix_RotateY(gGfxMatrix, this->obj.rot.y * M_DTOR, MTXF_APPLY);
|
||||
Matrix_RotateX(gGfxMatrix, this->obj.rot.x * M_DTOR, MTXF_APPLY);
|
||||
Matrix_RotateZ(gGfxMatrix, this->obj.rot.z * M_DTOR, MTXF_APPLY);
|
||||
@@ -1583,7 +1584,7 @@ void Object_DrawAll(s32 arg0) {
|
||||
}
|
||||
}
|
||||
for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
|
||||
if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id != OBJ_BOSS_310)) {
|
||||
if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id != OBJ_BOSS_BO_BASE_SHIELD)) {
|
||||
if ((boss->timer_05C % 2) == 0) {
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
} else {
|
||||
@@ -1708,7 +1709,7 @@ void Effect_DrawAll(s32 arg0) {
|
||||
}
|
||||
}
|
||||
for (i = 0, boss = gBosses; i < ARRAY_COUNT(gBosses); i++, boss++) {
|
||||
if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_310)) {
|
||||
if ((boss->obj.status >= OBJ_ACTIVE) && (boss->obj.id == OBJ_BOSS_BO_BASE_SHIELD)) {
|
||||
if ((boss->timer_05C % 2) == 0) {
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
} else {
|
||||
|
||||
+170
-143
File diff suppressed because it is too large
Load Diff
+249
-216
File diff suppressed because it is too large
Load Diff
+150
-146
@@ -70,9 +70,11 @@ void func_enmy2_8006A900(f32 xPos, f32 yPos, f32 zPos, f32 scale2) {
|
||||
}
|
||||
|
||||
void Actor237_Update(Actor237* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Actor237_Draw(Actor237* this) {
|
||||
/* Unimplemented */
|
||||
}
|
||||
|
||||
void Obj54_8006A984(Effect* this, f32 xPos, f32 yPos, f32 zPos) {
|
||||
@@ -120,17 +122,18 @@ void CoWaterfall_Update(CoWaterfall* this) {
|
||||
}
|
||||
}
|
||||
|
||||
bool Actor201_8006ABA4(Actor201* this) {
|
||||
bool MeteoBall_IsCloseToPlayer(MeteoBall* this) {
|
||||
if ((fabsf(this->obj.pos.x - gPlayer[0].pos.x) < 700.0f) && (fabsf(this->obj.pos.y - gPlayer[0].pos.y) < 700.0f)) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void Actor201_Update(Actor201* this) {
|
||||
// Unused Meteo Ball
|
||||
void MeteoBall_Update(MeteoBall* this) {
|
||||
f32 sp2C;
|
||||
|
||||
if (Actor201_8006ABA4(this) && (this->timer_0BC == 0)) {
|
||||
if (MeteoBall_IsCloseToPlayer(this) && (this->timer_0BC == 0)) {
|
||||
Effect_EnemyLaser(OBJ_EFFECT_ENEMY_LASER_1, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, gEnemyShotSpeed);
|
||||
this->timer_0BC = 20;
|
||||
}
|
||||
@@ -141,7 +144,7 @@ void Actor201_Update(Actor201* this) {
|
||||
sqrtf(SQ(gPlayer[0].cam.eye.z - sp2C) + SQ(gPlayer[0].cam.eye.x - this->obj.pos.x))));
|
||||
}
|
||||
|
||||
void Actor202_Update(Actor202* this) {
|
||||
void ActorHopBot_Update(ActorHopBot* this) {
|
||||
bool sp34;
|
||||
|
||||
this->gravity = 1.5f;
|
||||
@@ -213,8 +216,8 @@ void Actor202_Update(Actor202* this) {
|
||||
this->health -= 10;
|
||||
if ((this->health <= 0) || (this->dmgType >= DMG_EXPLOSION)) {
|
||||
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 10.0f);
|
||||
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, 8.0f, 30);
|
||||
Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, 8.0f, 30);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
gHitCount += this->info.bonus;
|
||||
@@ -223,12 +226,12 @@ void Actor202_Update(Actor202* this) {
|
||||
this->dmgType = DMG_NONE;
|
||||
this->timer_0C6 = 20;
|
||||
AUDIO_PLAY_SFX(NA_SE_EN_DAMAGE_S, this->sfxSource, 4);
|
||||
func_effect_8007D1E0(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f);
|
||||
Effect_Effect341_Spawn(this->obj.pos.x, this->obj.pos.y + 180.0f, this->obj.pos.z, 5.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Actor194_Update(Actor194* this) {
|
||||
void MeMora_Update(MeMora* this) {
|
||||
}
|
||||
|
||||
static s16 D_800CFF94[16] = {
|
||||
@@ -240,9 +243,9 @@ static f32 D_800CFFC4[16] = {
|
||||
};
|
||||
static Gfx* D_800D0004[3] = { D_ENMY_SPACE_4000170, D_ENMY_SPACE_40084D0, D_ENMY_SPACE_400A630 };
|
||||
|
||||
void Actor194_Dying(Actor194* this) {
|
||||
void MeMora_Dying(MeMora* this) {
|
||||
Vec3f sp34;
|
||||
s32 temp_hi;
|
||||
s32 index;
|
||||
|
||||
this->counter_04E++;
|
||||
|
||||
@@ -250,12 +253,12 @@ void Actor194_Dying(Actor194* this) {
|
||||
this->counter_04E = 0;
|
||||
}
|
||||
|
||||
gActor194xPos[this->unk_046][this->counter_04E] = this->obj.pos.x;
|
||||
gActor194yPos[this->unk_046][this->counter_04E] = this->obj.pos.y;
|
||||
gActor194zPos[this->unk_046][this->counter_04E] = this->obj.pos.z;
|
||||
gActor194xRot[this->unk_046][this->counter_04E] = this->obj.rot.x;
|
||||
gActor194yRot[this->unk_046][this->counter_04E] = this->obj.rot.y;
|
||||
gActor194zRot[this->unk_046][this->counter_04E] = this->obj.rot.z;
|
||||
gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x;
|
||||
gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y;
|
||||
gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z;
|
||||
gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x;
|
||||
gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y;
|
||||
gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z;
|
||||
|
||||
this->obj.rot.x -= 10.0f;
|
||||
this->obj.rot.y += 3.0f;
|
||||
@@ -268,13 +271,13 @@ void Actor194_Dying(Actor194* this) {
|
||||
this->vel.z = sp34.z;
|
||||
|
||||
if ((this->timer_0BC == 0) && ((gGameFrameCount % 4) == 0)) {
|
||||
temp_hi = (D_800CFF94[this->unk_04A] + this->counter_04E) % 100;
|
||||
index = (D_800CFF94[this->unk_04A] + this->counter_04E) % 100;
|
||||
if (this->unk_04A == 0) {
|
||||
func_effect_8007D2C8(gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
|
||||
gActor194zPos[this->unk_046][temp_hi], 7.0f);
|
||||
func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index],
|
||||
gMeMoraZpos[this->unk_046][index], 7.0f);
|
||||
} else {
|
||||
func_effect_8007D2C8(gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
|
||||
gActor194zPos[this->unk_046][temp_hi], 4.0f);
|
||||
func_effect_8007D2C8(gMeMoraXpos[this->unk_046][index], gMeMoraYpos[this->unk_046][index],
|
||||
gMeMoraZpos[this->unk_046][index], 4.0f);
|
||||
}
|
||||
|
||||
AUDIO_PLAY_SFX(NA_SE_EN_EXPLOSION_M, this->sfxSource, 4);
|
||||
@@ -282,15 +285,15 @@ void Actor194_Dying(Actor194* this) {
|
||||
|
||||
if (this->unk_04A > 15) {
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
gActor194Status[this->unk_046] = 0;
|
||||
gMeMoraStatus[this->unk_046] = 0;
|
||||
gHitCount += this->info.bonus;
|
||||
D_ctx_80177850 = 15;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Actor194_8006B46C(Actor194* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 arg7,
|
||||
f32 scale, s32 arg9) {
|
||||
void MeMora_8006B46C(MeMora* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 xRot, f32 yRot, f32 zRot, u8 arg7, f32 scale,
|
||||
s32 arg9) {
|
||||
Vec3f sp34 = { 0.0f, 0.0f, 0.0f };
|
||||
|
||||
Matrix_Push(&gGfxMatrix);
|
||||
@@ -328,16 +331,15 @@ void Actor194_8006B46C(Actor194* this, f32 xTrans, f32 yTrans, f32 zTrans, f32 x
|
||||
RCP_SetupDL_29(gFogRed, gFogGreen, gFogBlue, gFogAlpha, gFogNear, gFogFar);
|
||||
}
|
||||
|
||||
void Actor194_Draw(Actor194* this) {
|
||||
s16 var_s0;
|
||||
s16 temp_hi;
|
||||
void MeMora_Draw(MeMora* this) {
|
||||
s16 i;
|
||||
s16 j;
|
||||
|
||||
for (var_s0 = this->unk_04A; var_s0 < 16; var_s0++) {
|
||||
temp_hi = (D_800CFF94[var_s0] + this->counter_04E) % 100;
|
||||
Actor194_8006B46C(this, gActor194xPos[this->unk_046][temp_hi], gActor194yPos[this->unk_046][temp_hi],
|
||||
gActor194zPos[this->unk_046][temp_hi], gActor194xRot[this->unk_046][temp_hi],
|
||||
gActor194yRot[this->unk_046][temp_hi], gActor194zRot[this->unk_046][temp_hi],
|
||||
D_800CFFB4[var_s0], D_800CFFC4[var_s0], this->timer_0C6 % 2U);
|
||||
for (i = this->unk_04A; i < ARRAY_COUNT(D_800CFF94); i++) {
|
||||
j = (D_800CFF94[i] + this->counter_04E) % 100;
|
||||
MeMora_8006B46C(this, gMeMoraXpos[this->unk_046][j], gMeMoraYpos[this->unk_046][j],
|
||||
gMeMoraZpos[this->unk_046][j], gMeMoraXrot[this->unk_046][j], gMeMoraYrot[this->unk_046][j],
|
||||
gMeMoraZrot[this->unk_046][j], D_800CFFB4[i], D_800CFFC4[i], this->timer_0C6 % 2U);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -394,7 +396,7 @@ void func_enmy2_8006BB1C(f32 xPos, f32 yPos, f32 zPos) {
|
||||
}
|
||||
}
|
||||
|
||||
void Actor196_Update(Actor196* this) {
|
||||
void ActorMoleMissile_Update(ActorMoleMissile* this) {
|
||||
Vec3f sp44;
|
||||
|
||||
switch (this->state) {
|
||||
@@ -481,7 +483,7 @@ void Actor196_Update(Actor196* this) {
|
||||
}
|
||||
|
||||
if ((this->dmgType != DMG_NONE) && (this->animFrame != 0)) {
|
||||
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, this->vel.y, 0.0f, 3.0f, 5);
|
||||
Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 0.0f, this->vel.y, 0.0f, 3.0f, 5);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
this->itemDrop = DROP_SILVER_RING;
|
||||
Actor_Despawn(this);
|
||||
@@ -489,8 +491,8 @@ void Actor196_Update(Actor196* this) {
|
||||
this->dmgType = DMG_NONE;
|
||||
}
|
||||
|
||||
static f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f }; // could be in-function
|
||||
void func_enmy2_8006BF7C(f32 xPos, f32 yPos, f32 zPos) {
|
||||
static f32 D_800D001C[5] = { 0.0f, 30.0f, 60.0f, -60.0f, -30.0f };
|
||||
s32 i;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(D_800D001C); i++) {
|
||||
@@ -664,7 +666,7 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
|
||||
(this->obj.pos.y < (gGroundHeight + 10.0f))) &&
|
||||
(this->timer_0BE == 0)) {
|
||||
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
@@ -675,7 +677,7 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
|
||||
(this->obj.pos.y < (gGroundHeight + 10.0f))) &&
|
||||
(this->timer_0BE == 0)) {
|
||||
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
@@ -696,7 +698,7 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
|
||||
(this->obj.pos.y < (gGroundHeight + 10.0f))) &&
|
||||
(this->timer_0BE == 0)) {
|
||||
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 50.0f, this->scale * 10.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
@@ -706,8 +708,8 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
if (((this->timer_0BC == 0) || (Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
|
||||
(this->obj.pos.y < (gGroundHeight + 10.0f))) &&
|
||||
(this->timer_0BE == 0)) {
|
||||
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
|
||||
func_effect_8007B8F8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
|
||||
Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
|
||||
Effect_Effect364_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z + 70.0f, this->scale * 20.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
@@ -792,7 +794,7 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
if (Play_CheckDynaFloorCollision(&sp44, &sp40, this->obj.pos.x, this->obj.pos.y, this->obj.pos.z)) {
|
||||
func_effect_8007B228(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f);
|
||||
Effect_Effect381_Spawn(this->obj.pos.x, sp44, this->obj.pos.z, 2.0f);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
}
|
||||
} else if (this->state >= 10) {
|
||||
@@ -803,8 +805,8 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
(Object_CheckCollision(this->index, &this->obj.pos, &D_800D0030, 1) != 0) ||
|
||||
(this->obj.pos.y < (gGroundHeight + 10.0f))) &&
|
||||
(this->timer_0BE == 0)) {
|
||||
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 1.5f, 4);
|
||||
Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 1.5f, 4);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
}
|
||||
@@ -831,12 +833,12 @@ void ActorDebris_Update(ActorDebris* this) {
|
||||
if ((this->state != 2) && (this->state != 4)) {
|
||||
func_enmy2_8006BF7C(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z);
|
||||
} else if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
func_effect_8007BC7C(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
Effect_Effect362_Spawn(RAND_FLOAT_CENTERED(10.0f) + this->obj.pos.x, this->obj.pos.y,
|
||||
this->obj.pos.z, 1.0f);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -909,7 +911,7 @@ void func_enmy2_8006D0F4(Actor* this) {
|
||||
}
|
||||
}
|
||||
|
||||
void MeteoTunnel_Update(MeteoTunnel* this) {
|
||||
void MeteoTunnel_Update(MeTunnel* this) {
|
||||
this->obj.rot.z += 1.0f;
|
||||
}
|
||||
|
||||
@@ -952,7 +954,7 @@ static EventActorInfo sEventActorInfo[108] = {
|
||||
/* 10 */ { D_ENMY_SPACE_400BD20, gCubeHitbox200, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 11 */ { D_ENMY_SPACE_4001310, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 },
|
||||
/* 12 */ { D_ENMY_SPACE_400B390, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 13 */ { D_ME_6018C00, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 13 */ { aMeMeteor1DL, gCubeHitbox100, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 14 */ { D_ME_601F2A0, gCubeHitbox400, 7.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 15 */ { D_ENMY_SPACE_400AAE0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 16 */ { D_ENMY_SPACE_4000650, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ALIEN_FLY, 0, 1.0f, 1 },
|
||||
@@ -980,23 +982,23 @@ static EventActorInfo sEventActorInfo[108] = {
|
||||
/* 38 */ { NULL, D_SX_603238C, 1.0f, 500.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 39 */ { D_SX_6020D20, D_SX_60328CC, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 40 */ { NULL, gNoHitbox, 1.0f, 100.0f, 3001.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 41 */ { D_SY_60097E0, D_SY_6034478, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 42 */ { D_SY_601D730, D_SY_603450C, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 41 */ { aSyShip1DL, aSyShip1Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 42 */ { aSyShip2DL, aSyShip2Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 43 */ { NULL, gCubeHitbox100, 1.0f, 20000.0f, 3000.0f, 1, 0, EISFX_ARWING_ENGINE_FG, 0, 0.0f, 0 },
|
||||
/* 44 */ { D_SY_60102C0, D_SY_6034588, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 44 */ { aSyShip3DL, aSyShip3Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 45 */ { D_ME_6017B60, gCubeHitbox200, -1.0f, 300.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 46 */ { D_ZO_6004D00, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_SHIP_ENGINE_S, 0, 1.0f, 1 },
|
||||
/* 47 */ { D_ME_601A880, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 48 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 49 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 50 */ { NULL, D_SY_603405C, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 48 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 49 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 50 */ { NULL, aSyRobotHitbox, 0.3f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 51 */ { D_SY_6015D60, D_SY_6034124, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 52 */ { NULL, D_ZO_602C1A0, -1.0f, 1000.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 53 */ { D_SX_600B540, D_SX_60328E8, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 54 */ { D_ENMY_SPACE_4000EC0, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 55 */ { D_ENMY_SPACE_4008D50, gCubeHitbox100, 1.5f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 56 */ { NULL, gNoHitbox, -1.0f, 2000.0f, 3000.0f, 0, 0, EISFX_GREATFOX_ENGINE, 0, 0.0f, 1 },
|
||||
/* 57 */ { D_SY_60102C0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 57 */ { aSyShip3DL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 58 */ { D_SY_601F3D0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 59 */ { D_SY_6022B10, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 60 */ { D_SY_60209F0, gNoHitbox, 2.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
@@ -1008,17 +1010,18 @@ static EventActorInfo sEventActorInfo[108] = {
|
||||
/* 66 */ { D_ME_600BD40, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 67 */ { NULL, D_ME_602F604, 3.0f, 100.0f, 3000.0f, 2, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
/* 68 */ { D_SY_60205D0, D_SY_603445C, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 69 */ { D_SY_60036A0, D_SY_6034664, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 69 */ { aSyShip3DestroyedDL, aSyShip3DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 70 */ { D_SY_601AD70, gNoHitbox, 4.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 71 */ { aArwingItemLasersDL, gNoHitbox, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_OB_WING, 0, 0.0f, 1 },
|
||||
/* 72 */ { D_SY_60034D0, D_SY_60347D4, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 73 */ { D_SY_6005360, D_SY_6034770, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 74 */ { D_SY_600F6C0, D_SY_60347F0, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 75 */ { D_SY_601B610, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 76 */ { D_SY_601C6A0, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 77 */ { D_SY_60188D0, D_SY_603486C, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 72 */ { aSyShipWindowsDL, aSyShipWindowsHitbox, 3.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 73 */ { aSyShip4DL, aSyShip4Hitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 74 */ { aSyShip4DestroyedDL, aSyShip4DestroyedHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 75 */ { aSyShip2SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 76 */ { aSyShip3SpriteDL, gNoHitbox, -1.0f, 10000.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 77 */
|
||||
{ aSyShipProjectileDL, aSyShipProjectileHitbox, 3.0f, 100.0f, 3001.0f, 0, 0, EISFX_EN_ENGINE_01, 0, 0.0f, 1 },
|
||||
/* 78 */ { NULL, gCubeHitbox150, 1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 1.0f, 0 },
|
||||
/* 79 */ { NULL, D_ZO_602C294, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 79 */ { NULL, aZoBirdHitbox, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 80 */ { NULL, D_VE1_601B474, -1.0f, 100.0f, 3000.0f, 2, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 81 */ { NULL, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 82 */ { NULL, gCubeHitbox100, 2.0f, 100.0f, 3000.0f, 1, 0, EISFX_EN_ENGINE_01, 0, 1.0f, 1 },
|
||||
@@ -1030,14 +1033,14 @@ static EventActorInfo sEventActorInfo[108] = {
|
||||
/* 88 */ { NULL, D_AQ_6030B30, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 89 */ { NULL, D_AQ_6030B14_f32, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 90 */ { D_MA_601C520, D_MA_60368FC, 1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 91 */ { D_MA_600AF40, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 91 */ { aMaGuillotineDL, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 92 */ { D_WZ_7000C40, gWarpZoneEvent92Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 93 */ { D_WZ_70010E0, gWarpZoneEvent93Hitbox, -1.0f, 2100.0f, 3001.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 94 */ { D_WZ_7000E80, gWarpZoneEvent94Hitbox, 2.5f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 95 */ { D_WZ_70008F0, gCubeHitbox100, -1.0f, 100.0f, 8000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
|
||||
/* 96 */ { D_WZ_7000280, gWarpZoneEvent96Hitbox, -1.0f, 1000.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 0 },
|
||||
/* 97 */ { D_ME_600AC70, gCubeHitbox100, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 98 */ { D_MA_601A2B0, D_MA_60364C0, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 98 */ { D_MA_601A2B0, aMaBoulderHitbox, 1.0f, 100.0f, 3000.0f, 1, 1, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 99 */ { D_VE1_6002500, D_VE1_601B944, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 100 */ { D_VE1_60043F0, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 101 */ { D_VE1_6004310, gNoHitbox, -1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
@@ -1046,7 +1049,7 @@ static EventActorInfo sEventActorInfo[108] = {
|
||||
/* 104 */ { NULL, gNoHitbox, -1.0f, 500.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 0.0f, 0 },
|
||||
/* 105 */ { NULL, gCubeHitbox200, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_NONE, 0, 1.0f, 1 },
|
||||
/* 106 */ { NULL, gCubeHitbox100, 1.0f, 100.0f, 3000.0f, 0, 0, EISFX_EN_ALIEN_FLY, 0, 0.0f, 0 },
|
||||
/* 107 */ { D_MA_6002890, D_MA_60368E0, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
/* 107 */ { D_MA_6002890, aMaGuillotineHitbox, -1.0f, 100.0f, 3000.0f, 1, 0, EISFX_NONE, 0, 0.0f, 1 },
|
||||
};
|
||||
|
||||
static Color_RGBA32 sEventTexLineColors[6] = {
|
||||
@@ -1148,12 +1151,12 @@ void ActorEvent_ProcessScript(ActorEvent* this) {
|
||||
this->info.targetOffset = 1.0f;
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
if (gActor194Status[i] == 0) {
|
||||
gActor194Status[i] = 1;
|
||||
if (gMeMoraStatus[i] == 0) {
|
||||
gMeMoraStatus[i] = 1;
|
||||
this->unk_046 = i;
|
||||
for (j = 0; j < 100; j++) {
|
||||
gActor194yPos[i][j] = this->obj.pos.y;
|
||||
gActor194zPos[i][j] = this->obj.pos.z;
|
||||
gMeMoraYpos[i][j] = this->obj.pos.y;
|
||||
gMeMoraZpos[i][j] = this->obj.pos.z;
|
||||
}
|
||||
if (this->eventType == EVID_200) {
|
||||
AUDIO_PLAY_SFX(NA_SE_EN_SPACE_SNAKE, this->sfxSource, 4);
|
||||
@@ -1658,7 +1661,7 @@ void ActorEvent_SpawnEffect374(f32 xPos, f32 yPos, f32 zPos) {
|
||||
void ActorEvent_SetupTIMine(Actor* actor, f32 xPos, f32 yPos, f32 zPos) {
|
||||
Actor_Initialize(actor);
|
||||
actor->obj.status = OBJ_INIT;
|
||||
actor->obj.id = OBJ_ACTOR_225;
|
||||
actor->obj.id = OBJ_ACTOR_TI_LANDMINE;
|
||||
|
||||
actor->obj.pos.x = xPos;
|
||||
actor->obj.pos.y = yPos;
|
||||
@@ -1941,8 +1944,8 @@ void ActorEvent_ProcessActions(ActorEvent* this) {
|
||||
break;
|
||||
|
||||
case EVACT_11:
|
||||
func_effect_8007BFFC(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 3.0f, 15);
|
||||
Effect386_Spawn1(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 3.0f, 15);
|
||||
Actor_Despawn(this);
|
||||
Object_Kill(&this->obj, this->sfxSource);
|
||||
Effect_SpawnTimedSfxAtPos(&this->obj.pos, NA_SE_EN_EXPLOSION_M);
|
||||
@@ -2043,8 +2046,8 @@ void ActorEvent_8006FEEC(ActorEvent* this) {
|
||||
|
||||
if (this->health <= 0) {
|
||||
for (i = 3; i < 11; i++) {
|
||||
Zoness_SpawnDebris(&this->vwork[i], &this->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f),
|
||||
RAND_FLOAT(-10.0f), RAND_FLOAT(10.0f), 41, this->scale, 200, i);
|
||||
Zoness_ActorDebris_Spawn(&this->vwork[i], &this->vwork[i + 11], RAND_FLOAT_CENTERED(20.0f),
|
||||
RAND_FLOAT(-10.0f), RAND_FLOAT(10.0f), 41, this->scale, 200, i);
|
||||
}
|
||||
this->itemDrop = DROP_NONE;
|
||||
Actor_Despawn(this);
|
||||
@@ -2189,7 +2192,7 @@ void ActorEvent_800701E0(ActorEvent* this) {
|
||||
break;
|
||||
|
||||
case EVID_61:
|
||||
Meteo_8018CCF8(this);
|
||||
Meteo_Effect346_Spawn(this);
|
||||
break;
|
||||
|
||||
case EVID_27:
|
||||
@@ -2218,7 +2221,7 @@ void ActorEvent_800701E0(ActorEvent* this) {
|
||||
if (this->eventType == EVID_82) {
|
||||
AUDIO_PLAY_SFX(NA_SE_OB_SMOKE, this->sfxSource, 0);
|
||||
this->dmgType = DMG_BEAM;
|
||||
func_effect_8007C688(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60);
|
||||
Effect_Effect387_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 3.0f, 60);
|
||||
}
|
||||
} else {
|
||||
this->timer_0C6 = 20;
|
||||
@@ -2292,12 +2295,12 @@ void ActorEvent_800701E0(ActorEvent* this) {
|
||||
this->obj.pos.z -= this->vel.z;
|
||||
this->dmgType = DMG_BEAM;
|
||||
if (this->eventType == EVID_13) {
|
||||
this->obj.id = OBJ_ACTOR_182;
|
||||
this->obj.id = OBJ_ACTOR_ME_METEOR_2;
|
||||
func_enmy_800654E4(&this->obj);
|
||||
}
|
||||
|
||||
if (this->eventType == EVID_61) {
|
||||
Meteo_8018CCF8(this);
|
||||
Meteo_Effect346_Spawn(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2308,8 +2311,8 @@ void ActorEvent_80070BA8(ActorEvent* this) {
|
||||
this->dmgType = DMG_NONE;
|
||||
if ((this->eventType != EVID_17) || ((this->eventType == EVID_17) && (this->dmgPart == 0))) {
|
||||
this->timer_0C6 = 10;
|
||||
func_effect_8007C120(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y, this->vel.z,
|
||||
0.2f, 10);
|
||||
Effect_Effect390_Spawn(this->hitPos.x, this->hitPos.y, this->hitPos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, 0.2f, 10);
|
||||
this->health -= this->damage;
|
||||
AUDIO_PLAY_SFX(NA_SE_EN_SPARK_DAMAGE_M, this->sfxSource, 4);
|
||||
if (this->health <= 0) {
|
||||
@@ -2871,13 +2874,13 @@ void ActorEvent_80071DC0(ActorEvent* this) {
|
||||
}
|
||||
|
||||
if (((gGameFrameCount % 2) == 0)) {
|
||||
func_effect_8007C120(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
|
||||
this->vel.y, this->vel.z, 0.3f, 20);
|
||||
Effect_Effect390_Spawn(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z,
|
||||
this->vel.x, this->vel.y, this->vel.z, 0.3f, 20);
|
||||
}
|
||||
|
||||
if (((gGameFrameCount % 8) == 0)) {
|
||||
func_effect_8007BFFC(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
|
||||
this->vel.y, this->vel.z, 10.0f, 9);
|
||||
Effect386_Spawn1(this->obj.pos.x + sp38.x, this->obj.pos.y + sp38.y, this->obj.pos.z + sp38.z, this->vel.x,
|
||||
this->vel.y, this->vel.z, 10.0f, 9);
|
||||
}
|
||||
|
||||
if (((gGameFrameCount % 16) == 0)) {
|
||||
@@ -3033,9 +3036,9 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
if (this->state == EVSTATE_1000) {
|
||||
this->obj.rot.y += this->fwork[15];
|
||||
this->obj.rot.x += this->fwork[16];
|
||||
if (((gGameFrameCount % 16) == 0)) {
|
||||
func_effect_8007C120(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, 0.3f, 10);
|
||||
if ((gGameFrameCount % 16) == 0) {
|
||||
Effect_Effect390_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, 0.3f, 10);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -3054,12 +3057,12 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
this->counter_04E = 0;
|
||||
}
|
||||
|
||||
gActor194xPos[this->unk_046][this->counter_04E] = this->obj.pos.x;
|
||||
gActor194yPos[this->unk_046][this->counter_04E] = this->obj.pos.y;
|
||||
gActor194zPos[this->unk_046][this->counter_04E] = this->obj.pos.z;
|
||||
gActor194xRot[this->unk_046][this->counter_04E] = this->obj.rot.x;
|
||||
gActor194yRot[this->unk_046][this->counter_04E] = this->obj.rot.y;
|
||||
gActor194zRot[this->unk_046][this->counter_04E] = this->obj.rot.z;
|
||||
gMeMoraXpos[this->unk_046][this->counter_04E] = this->obj.pos.x;
|
||||
gMeMoraYpos[this->unk_046][this->counter_04E] = this->obj.pos.y;
|
||||
gMeMoraZpos[this->unk_046][this->counter_04E] = this->obj.pos.z;
|
||||
gMeMoraXrot[this->unk_046][this->counter_04E] = this->obj.rot.x;
|
||||
gMeMoraYrot[this->unk_046][this->counter_04E] = this->obj.rot.y;
|
||||
gMeMoraZrot[this->unk_046][this->counter_04E] = this->obj.rot.z;
|
||||
|
||||
if (this->dmgType != DMG_NONE) {
|
||||
this->dmgType = DMG_NONE;
|
||||
@@ -3074,7 +3077,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
func_effect_8007D2C8(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, 8.0f);
|
||||
this->obj.status = OBJ_DYING;
|
||||
this->timer_0BC = 20;
|
||||
this->obj.id = OBJ_ACTOR_194;
|
||||
this->obj.id = OBJ_ACTOR_ME_MORA;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -3484,7 +3487,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
case EVID_94:
|
||||
case EVID_95:
|
||||
case EVID_96:
|
||||
if (((gGameFrameCount % 8) == 0)) {
|
||||
if ((gGameFrameCount % 8) == 0) {
|
||||
this->fwork[18] = RAND_FLOAT(255.0f);
|
||||
this->fwork[19] = RAND_FLOAT(255.0f);
|
||||
this->fwork[20] = RAND_FLOAT(255.0f);
|
||||
@@ -3561,7 +3564,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
case EVID_48:
|
||||
case EVID_49:
|
||||
case EVID_50:
|
||||
SectorY_Actor204_Update(this);
|
||||
SectorY_SyRobot_Update(this);
|
||||
break;
|
||||
|
||||
case EVID_52:
|
||||
@@ -3598,7 +3601,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
|
||||
if ((this->obj.pos.y + sp90.y) > -30.0f) {
|
||||
for (sp74 = 0; sp74 < 7; sp74++) {
|
||||
effect = func_effect_8007783C(OBJ_EFFECT_394);
|
||||
effect = Effect_Load(OBJ_EFFECT_394);
|
||||
|
||||
if (effect != NULL) {
|
||||
effect->unk_78 = effect->unk_7A = 12;
|
||||
@@ -3630,7 +3633,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
}
|
||||
|
||||
if ((fabsf(this->fwork[0]) > 10.0f) && ((gGameFrameCount % 2) == 0)) {
|
||||
effect = func_effect_8007783C(OBJ_EFFECT_394);
|
||||
effect = Effect_Load(OBJ_EFFECT_394);
|
||||
if (effect != NULL) {
|
||||
Matrix_RotateZ(gCalcMatrix, this->rot_0F4.z * M_DTOR, MTXF_NEW);
|
||||
Matrix_MultVec3fNoTranslate(gCalcMatrix, &D_800D1290, &sp90);
|
||||
@@ -3661,7 +3664,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
}
|
||||
|
||||
if (((gGameFrameCount % 4) == 0)) {
|
||||
effect = func_effect_8007783C(OBJ_EFFECT_394);
|
||||
effect = Effect_Load(OBJ_EFFECT_394);
|
||||
if (effect != NULL) {
|
||||
effect->unk_78 = effect->unk_7A = 11;
|
||||
effect->obj.status = OBJ_ACTIVE;
|
||||
@@ -3724,7 +3727,7 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
}
|
||||
|
||||
if ((this->animFrame >= 18) && (this->animFrame < 24)) {
|
||||
func_effect_8007BC7C(this->obj.pos.x, this->obj.pos.y + 80.0f, this->obj.pos.z + 60.0f, 20.0f);
|
||||
Effect_Effect362_Spawn(this->obj.pos.x, this->obj.pos.y + 80.0f, this->obj.pos.z + 60.0f, 20.0f);
|
||||
}
|
||||
|
||||
if (this->animFrame < 49) {
|
||||
@@ -3733,9 +3736,9 @@ void ActorEvent_Update(ActorEvent* this) {
|
||||
this->animFrame = 49;
|
||||
}
|
||||
if ((gGameFrameCount % 2) != 0) {
|
||||
Aquas_801AC8A8(RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.x,
|
||||
RAND_FLOAT(50.0f) + this->obj.pos.y,
|
||||
RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.z, 1.0f, 0);
|
||||
Aquas_Effect366_Spawn(RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.x,
|
||||
RAND_FLOAT(50.0f) + this->obj.pos.y,
|
||||
RAND_FLOAT_CENTERED(100.0f) + this->obj.pos.z, 1.0f, 0);
|
||||
}
|
||||
}
|
||||
this->timer_0C2 = 10000;
|
||||
@@ -3843,7 +3846,7 @@ bool ActorEvent_OverrideLimbDraw3(s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3f*
|
||||
return false;
|
||||
}
|
||||
|
||||
s32 Scenery111_Draw(Scenery_111* this) {
|
||||
s32 Scenery111_Draw(SyShipDebris* this) {
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_60);
|
||||
gSPDisplayList(gMasterDisp++, D_SY_601AD70);
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_64);
|
||||
@@ -3862,8 +3865,8 @@ void ActorEvent_Draw(ActorEvent* this) {
|
||||
(this->eventType != EVID_62) && (this->eventType != EVID_AQ_CLAM) && (this->eventType != EVID_98) &&
|
||||
(this->scale > 0.5f) && (this->timer_0C6 >= 9) && ((this->timer_0C6 & 3) == 0) &&
|
||||
(gPlayState != PLAY_PAUSE)) {
|
||||
func_effect_8007C120(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 0.07f, 3);
|
||||
Effect_Effect390_Spawn(this->obj.pos.x, this->obj.pos.y, this->obj.pos.z, this->vel.x, this->vel.y,
|
||||
this->vel.z, this->scale * 0.07f, 3);
|
||||
}
|
||||
|
||||
if ((this->eventType != EVID_A6_MISSILE) && (this->eventType != EVID_23) && (this->eventType != EVID_79) &&
|
||||
@@ -4063,7 +4066,7 @@ void ActorEvent_Draw(ActorEvent* this) {
|
||||
case EVID_48:
|
||||
case EVID_49:
|
||||
case EVID_50:
|
||||
SectorY_Actor204_Draw(this);
|
||||
SectorY_SyRobot_Draw(this);
|
||||
break;
|
||||
|
||||
case EVID_52:
|
||||
@@ -4104,7 +4107,7 @@ void ActorEvent_Draw(ActorEvent* this) {
|
||||
case EVID_79:
|
||||
temp_s0 = this->state;
|
||||
this->state = 2; // actor 235 state
|
||||
Zoness_Actor235_Draw(this);
|
||||
Zoness_ZoBird_Draw(this);
|
||||
this->state = temp_s0;
|
||||
break;
|
||||
|
||||
@@ -4131,8 +4134,8 @@ void ActorEvent_Draw(ActorEvent* this) {
|
||||
|
||||
case EVID_AQ_CLAM:
|
||||
Matrix_Scale(gGfxMatrix, 3.0f, 3.0f, 3.0f, MTXF_APPLY);
|
||||
Animation_GetFrameData(&D_AQ_602201C, this->animFrame, sp114);
|
||||
Animation_DrawSkeleton(1, D_AQ_60220E8, sp114, NULL, NULL, this, &gIdentityMatrix);
|
||||
Animation_GetFrameData(&aAqOysterAnim, this->animFrame, sp114);
|
||||
Animation_DrawSkeleton(1, aAqOysterSkel, sp114, NULL, NULL, this, &gIdentityMatrix);
|
||||
break;
|
||||
|
||||
case EVID_BILL:
|
||||
@@ -4260,9 +4263,9 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
|
||||
if (gUseDynaFloor &&
|
||||
Play_CheckDynaFloorCollision(&sp58, &sp5C, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z)) {
|
||||
func_effect_8007BFFC(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
|
||||
actor->scale * 3.0f, 5);
|
||||
func_effect_8007B228(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f);
|
||||
Effect386_Spawn1(actor->obj.pos.x, sp58 + 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f, actor->scale * 3.0f,
|
||||
5);
|
||||
Effect_Effect381_Spawn(actor->obj.pos.x, sp58, actor->obj.pos.z, 2.0f);
|
||||
actor->timer_0BE = 2;
|
||||
Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
return;
|
||||
@@ -4271,8 +4274,8 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
if (gGroundType == 4) {
|
||||
if (Ground_801B6AEC(actor->obj.pos.x, actor->obj.pos.y - 10.0f, actor->obj.pos.z + gPathProgress) != 0) {
|
||||
func_effect_8007D2C8(actor->obj.pos.x, actor->obj.pos.y + 20.0f, actor->obj.pos.z, actor->scale * 6.0f);
|
||||
func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
|
||||
actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20);
|
||||
Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
|
||||
actor->obj.pos.z - actor->vel.z, 0.0f, 0.0f, 0.0f, actor->scale * 4.0f, 20);
|
||||
func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z);
|
||||
actor->timer_0BE = 2;
|
||||
Effect_SpawnTimedSfxAtPos(&actor->obj.pos, NA_SE_EN_EXPLOSION_S);
|
||||
@@ -4326,21 +4329,21 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
if ((actor->obj.pos.y < (gGroundHeight + 30.0f)) && (gLevelType == LEVELTYPE_PLANET)) {
|
||||
actor->vel.z = 0.0f;
|
||||
if (gGroundSurface == SURFACE_WATER) {
|
||||
func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
|
||||
0);
|
||||
func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
|
||||
10);
|
||||
func_effect_8007D9DC(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f, 20.0f,
|
||||
20);
|
||||
func_effect_8007ADF4(actor->obj.pos.x, gGroundHeight, actor->obj.pos.z, 0.1f, 3.0f);
|
||||
Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
|
||||
20.0f, 0);
|
||||
Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
|
||||
20.0f, 10);
|
||||
Effect_Effect367_Spawn(actor->obj.pos.x, gGroundHeight + 2.0f, actor->obj.pos.z, 3.0f,
|
||||
20.0f, 20);
|
||||
Effect_Effect372_Spawn2(actor->obj.pos.x, gGroundHeight, actor->obj.pos.z, 0.1f, 3.0f);
|
||||
} else {
|
||||
PlayerShot_SpawnEffect344(actor->obj.pos.x, 3.0f, actor->obj.pos.z, actor->obj.pos.x,
|
||||
actor->obj.pos.z, 0.0f, 0.0f, 90.0f, 6.5f, 0, 0);
|
||||
}
|
||||
func_effect_8007C120(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
|
||||
actor->scale * 0.05f, 30);
|
||||
Effect_Effect390_Spawn(actor->obj.pos.x, 20.0f, actor->obj.pos.z, 0.0f, 0.0f, 0.0f,
|
||||
actor->scale * 0.05f, 30);
|
||||
if ((gCurrentLevel == LEVEL_FORTUNA) || (gCurrentLevel == LEVEL_VENOM_2)) {
|
||||
func_effect_8007C688(actor->obj.pos.x, gGroundHeight + 30.0f, actor->obj.pos.z, 3.0f, 60);
|
||||
Effect_Effect387_Spawn(actor->obj.pos.x, gGroundHeight + 30.0f, actor->obj.pos.z, 3.0f, 60);
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
func_enmy_80062C38(actor->obj.pos.x, actor->obj.pos.z);
|
||||
}
|
||||
@@ -4351,25 +4354,26 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
func_effect_8007D0E0(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
|
||||
actor->obj.pos.z - actor->vel.z, actor->scale * 5.0f);
|
||||
if (gLevelMode == LEVELMODE_ALL_RANGE) {
|
||||
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x,
|
||||
10.0f, actor->vel.z, actor->scale * 3.0f, 20);
|
||||
Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y + 30.0f, actor->obj.pos.z, actor->vel.x,
|
||||
10.0f, actor->vel.z, actor->scale * 3.0f, 20);
|
||||
if (sp60 == 999) {
|
||||
func_effect_8007C688(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
|
||||
actor->scale * 3.0f, 70);
|
||||
Effect_Effect387_Spawn(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
|
||||
actor->scale * 3.0f, 70);
|
||||
}
|
||||
for (var_s0 = 0; var_s0 < 4; var_s0++) {
|
||||
if (Rand_ZeroOne() < 0.7f) {
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
|
||||
} else {
|
||||
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
|
||||
Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z,
|
||||
1.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
func_effect_8007BFFC(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
|
||||
(actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f,
|
||||
actor->scale * 3.0f, 5);
|
||||
Effect386_Spawn1(actor->obj.pos.x - actor->vel.x, actor->obj.pos.y + 30.0f,
|
||||
(actor->obj.pos.z - actor->vel.z) + 48.0f, 0.0f, 0.0f, 0.0f,
|
||||
actor->scale * 3.0f, 5);
|
||||
}
|
||||
|
||||
actor->timer_0BE = 2;
|
||||
@@ -4390,13 +4394,13 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
if (gCurrentLevel == LEVEL_FORTUNA) {
|
||||
Play_SpawnDebris(4, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z);
|
||||
} else {
|
||||
func_effect_800794CC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
|
||||
Effect_Effect357_Spawn50(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, 1.0f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
|
||||
actor->vel.z, 5.0f, 15);
|
||||
Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
|
||||
actor->vel.z, 5.0f, 15);
|
||||
func_effect_8007D0E0(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z - actor->vel.z, 8.0f);
|
||||
} else {
|
||||
if ((actor->eventType != EVID_13) && (actor->eventType != EVID_61)) {
|
||||
@@ -4405,8 +4409,8 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
}
|
||||
|
||||
if (actor->eventType == EVID_36) {
|
||||
func_effect_8007BFFC(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x,
|
||||
actor->vel.y, actor->vel.z, 5.0f, 15);
|
||||
Effect386_Spawn1(actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->vel.x, actor->vel.y,
|
||||
actor->vel.z, 5.0f, 15);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4433,13 +4437,13 @@ void func_enmy2_800763A4(Actor* actor) {
|
||||
|
||||
void ActorEvent_Dying(ActorEvent* this) {
|
||||
if ((this->eventType == EVID_48) || (this->eventType == EVID_49) || (this->eventType == EVID_50)) {
|
||||
SectorY_Actor204_Update(this);
|
||||
SectorY_SyRobot_Update(this);
|
||||
} else {
|
||||
func_enmy2_800763A4(this);
|
||||
}
|
||||
}
|
||||
|
||||
void Actor234_Update(Actor234* this) {
|
||||
void TiGreatFox_Update(TiGreatFox* this) {
|
||||
Vec3f sp24;
|
||||
|
||||
Math_Vec3fFromAngles(&sp24, this->obj.rot.x, this->obj.rot.y, 50.0f);
|
||||
@@ -4448,6 +4452,6 @@ void Actor234_Update(Actor234* this) {
|
||||
this->vel.z = sp24.z;
|
||||
}
|
||||
|
||||
void Actor234_Draw(Actor234* this) {
|
||||
void TiGreatFox_Draw(TiGreatFox* this) {
|
||||
Cutscene_DrawGreatFox();
|
||||
}
|
||||
|
||||
@@ -41,7 +41,7 @@ void Wipe_Draw(WipeMode mode, s32 frame) {
|
||||
Wipe_Vertical(frame);
|
||||
break;
|
||||
default:
|
||||
(void) "そのような フェード は ない (%d)\n"; // There is no such fade
|
||||
PRINTF("そのような フェード は ない (%d)\n"); // There is no such fade
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
+33
-3
@@ -20,7 +20,7 @@ f32 gFovY;
|
||||
f32 gProjectNear;
|
||||
f32 gProjectFar;
|
||||
|
||||
bool gShowCrosshairs[4] = { true, true, true, true };
|
||||
bool gShowReticles[4] = { true, true, true, true };
|
||||
bool D_game_800D2870 = false;
|
||||
static s32 sVsCameraULx[] = { 0, SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2 };
|
||||
static s32 sVsCameraLRx[] = { SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1, SCREEN_WIDTH / 2 - 1, SCREEN_WIDTH - 1 };
|
||||
@@ -114,6 +114,7 @@ void Game_SetGameState(void) {
|
||||
gSceneSetup = 0;
|
||||
gFillScreenColor = gBgColor = 0;
|
||||
gPathProgress = 0.0f;
|
||||
|
||||
if ((gCurrentLevel == LEVEL_VENOM_2) && (gLevelPhase == 2)) {
|
||||
gFillScreenColor = gBgColor = 0xFFFF; // 248, 248, 248
|
||||
gFillScreenRed = gFillScreenGreen = gFillScreenBlue = 255;
|
||||
@@ -281,7 +282,7 @@ void Game_Draw(s32 playerNum) {
|
||||
break;
|
||||
case DRAW_PLAY:
|
||||
gPlayerNum = playerNum;
|
||||
Play_Draw();
|
||||
Display_Update();
|
||||
break;
|
||||
case DRAW_UNK_MAP: // likely game over
|
||||
Background_DrawStarfield();
|
||||
@@ -342,29 +343,36 @@ void Game_Update(void) {
|
||||
u8 soundMode;
|
||||
|
||||
Game_SetGameState();
|
||||
|
||||
if (gGameStandby) {
|
||||
Game_InitStandbyDL(&gUnkDisp1);
|
||||
gGameStandby = false;
|
||||
return;
|
||||
}
|
||||
|
||||
Game_InitMasterDL(&gUnkDisp1);
|
||||
Game_SetScene();
|
||||
|
||||
if (Game_ChangeScene() != true) {
|
||||
Lib_InitPerspective(&gUnkDisp1);
|
||||
Game_InitViewport(&gUnkDisp1, gCamCount, 0);
|
||||
|
||||
if (gNextGameStateTimer != 0) {
|
||||
gNextGameStateTimer--;
|
||||
}
|
||||
|
||||
switch (gGameState) {
|
||||
case GSTATE_BOOT:
|
||||
gNextGameStateTimer = 2;
|
||||
gGameState++;
|
||||
break;
|
||||
|
||||
case GSTATE_BOOT_WAIT:
|
||||
if (gNextGameStateTimer == 0) {
|
||||
gGameState++;
|
||||
}
|
||||
break;
|
||||
|
||||
case GSTATE_SHOW_LOGO:
|
||||
RCP_SetupDL(&gMasterDisp, SETUPDL_76);
|
||||
gDPSetPrimColor(gMasterDisp++, 0x00, 0x00, 255, 255, 255, 255);
|
||||
@@ -375,6 +383,7 @@ void Game_Update(void) {
|
||||
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
|
||||
gGameState++;
|
||||
break;
|
||||
|
||||
case GSTATE_CHECK_SAVE:
|
||||
if (Save_Read() != 0) {
|
||||
#ifdef AVOID_UB
|
||||
@@ -397,11 +406,13 @@ void Game_Update(void) {
|
||||
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 3], 128, 16, 100.0f, 134.0f, 1.0f, 1.0f);
|
||||
TextureRect_IA8(&gMasterDisp, &gNintendoLogo[128 * 16 * 4], 128, 10, 100.0f, 150.0f, 1.0f, 1.0f);
|
||||
break;
|
||||
|
||||
case GSTATE_START:
|
||||
gGameState = GSTATE_INIT;
|
||||
gSceneId = SCENE_TITLE;
|
||||
gSceneSetup = 0;
|
||||
break;
|
||||
|
||||
case GSTATE_INIT:
|
||||
gGameState = GSTATE_TITLE;
|
||||
gTitleState = 1;
|
||||
@@ -430,17 +441,21 @@ void Game_Update(void) {
|
||||
|
||||
D_ctx_80177858[i] = 3;
|
||||
gPlayerForms[i] = FORM_ARWING;
|
||||
gShowCrosshairs[i] = true;
|
||||
gShowReticles[i] = true;
|
||||
gPlayerGlareAlphas[i] = 0;
|
||||
}
|
||||
|
||||
gVersusStage = 0;
|
||||
gVsPointsToWin = 3;
|
||||
gBlurAlpha = 255;
|
||||
|
||||
for (i = 0; i < ARRAY_COUNT(gLeveLClearStatus); i++) {
|
||||
gLeveLClearStatus[i] = 0;
|
||||
}
|
||||
|
||||
gExpertMode = false;
|
||||
gOptionSoundMode = gSaveFile.save.data.soundMode;
|
||||
|
||||
switch (gOptionSoundMode) {
|
||||
case OPTIONSOUND_STEREO:
|
||||
soundMode = SOUNDMODE_STEREO;
|
||||
@@ -456,10 +471,12 @@ void Game_Update(void) {
|
||||
soundMode = SOUNDMODE_STEREO;
|
||||
break;
|
||||
}
|
||||
|
||||
SEQCMD_SET_SOUND_MODE(soundMode);
|
||||
gVolumeSettings[AUDIO_TYPE_MUSIC] = gSaveFile.save.data.musicVolume;
|
||||
gVolumeSettings[AUDIO_TYPE_VOICE] = gSaveFile.save.data.voiceVolume;
|
||||
gVolumeSettings[AUDIO_TYPE_SFX] = gSaveFile.save.data.sfxVolume;
|
||||
|
||||
if (gVolumeSettings[AUDIO_TYPE_MUSIC] > 99) {
|
||||
gVolumeSettings[AUDIO_TYPE_MUSIC] = 99;
|
||||
}
|
||||
@@ -473,6 +490,7 @@ void Game_Update(void) {
|
||||
Audio_SetVolume(AUDIO_TYPE_VOICE, gVolumeSettings[AUDIO_TYPE_VOICE]);
|
||||
Audio_SetVolume(AUDIO_TYPE_SFX, gVolumeSettings[AUDIO_TYPE_SFX]);
|
||||
break;
|
||||
|
||||
case GSTATE_TITLE:
|
||||
OvlMenu_CallFunction(OVLCALL_TITLE_UPDATE, NULL);
|
||||
break;
|
||||
@@ -498,7 +516,9 @@ void Game_Update(void) {
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Game_Draw(0);
|
||||
|
||||
if (gCamCount == 2) {
|
||||
Game_InitViewport(&gMasterDisp, gCamCount, 1);
|
||||
Game_Draw(1);
|
||||
@@ -538,7 +558,9 @@ void Game_Update(void) {
|
||||
|
||||
HUD_dummy_8008CB8C();
|
||||
}
|
||||
|
||||
partialFill = false;
|
||||
|
||||
if (gCamCount == 1) {
|
||||
Graphics_FillRectangle(&gMasterDisp, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, gPlayerGlareReds[0],
|
||||
gPlayerGlareGreens[0], gPlayerGlareBlues[0], gPlayerGlareAlphas[0]);
|
||||
@@ -565,9 +587,11 @@ void Game_Update(void) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Background_dummy_80040CDC();
|
||||
HUD_DrawStatusScreens();
|
||||
AllRange_DrawCountdown();
|
||||
|
||||
if ((gGameState == GSTATE_PLAY) && gVersusMode) {
|
||||
Versus_Draw();
|
||||
}
|
||||
@@ -584,6 +608,9 @@ void Game_Update(void) {
|
||||
#endif
|
||||
#if MODS_FPS_COUNTER == 1
|
||||
Play_RenderFps();
|
||||
#endif
|
||||
#if MODS_SPAWNER == 1
|
||||
Spawner();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@@ -594,6 +621,9 @@ void Game_Update(void) {
|
||||
#if MODS_RAM_MOD == 1
|
||||
#include "../mods/object_ram.c"
|
||||
#endif
|
||||
#if MODS_SPAWNER == 1
|
||||
#include "../mods/spawner.c"
|
||||
#endif
|
||||
|
||||
Actor* Game_SpawnActor(ObjectId objId) {
|
||||
Actor* actor = gActors;
|
||||
|
||||
+574
-573
File diff suppressed because it is too large
Load Diff
+856
-301
File diff suppressed because it is too large
Load Diff
@@ -769,7 +769,7 @@ void Radio_Draw(void) {
|
||||
}
|
||||
if (((gCurrentRadioPortrait != RCID_STATIC) && (gCurrentRadioPortrait != RCID_STATIC + 1)) &&
|
||||
(gCurrentRadioPortrait != RCID_1000)) {
|
||||
func_hud_8008AD94();
|
||||
HUD_RadioCharacterName_Draw();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+51
-48
@@ -179,12 +179,12 @@ void func_tank_80043B18(Player* player) {
|
||||
func_tank_80043AA0(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z, 0.2f);
|
||||
} else {
|
||||
if (((gGameFrameCount % 2) == 0)) {
|
||||
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.3f);
|
||||
Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.3f);
|
||||
}
|
||||
if (((gGameFrameCount % 4) == 0)) {
|
||||
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f, player->trueZpos + sp3C.z,
|
||||
2.0f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
|
||||
player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
@@ -198,12 +198,12 @@ void func_tank_80043B18(Player* player) {
|
||||
}
|
||||
} else {
|
||||
if (((gGameFrameCount % 2) == 0)) {
|
||||
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.0f);
|
||||
Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.0f);
|
||||
}
|
||||
if (((gGameFrameCount % 4) == 0) && (player->baseSpeed >= 5.0f)) {
|
||||
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
|
||||
player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
|
||||
player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -216,12 +216,12 @@ void func_tank_80043B18(Player* player) {
|
||||
}
|
||||
} else {
|
||||
if (((gGameFrameCount % 2) == 0)) {
|
||||
Titania_80189120(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.0f);
|
||||
Titania_Effect368_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y, player->trueZpos + sp3C.z,
|
||||
player->rot.y + sp38, 1.0f);
|
||||
}
|
||||
if (((gGameFrameCount % 4) == 0) && (player->baseSpeed >= 5.0f)) {
|
||||
func_effect_8007A900(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
|
||||
player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(player->pos.x + sp3C.x, player->pos.y + sp3C.y + 20.0f,
|
||||
player->trueZpos + sp3C.z, 2.0f, 255, 15, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -285,7 +285,7 @@ void func_tank_800443DC(Player* player) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_58) &&
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_TI_BRIDGE) &&
|
||||
((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
|
||||
func_tank_800441C8(player, scenery->info.hitbox, scenery->obj.pos.x, scenery->obj.pos.y, scenery->obj.pos.z,
|
||||
scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
|
||||
@@ -673,19 +673,21 @@ void func_tank_80045678(Player* player) {
|
||||
Math_SmoothStepToF(&player->vel.y, 0.0f, 0.1f, 2.0f, 0);
|
||||
}
|
||||
if ((gCamCount == 1) && ((gGameFrameCount % 2) == 0)) {
|
||||
func_effect_8007A900(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->groundPos.y + 10.0f,
|
||||
player->trueZpos - 10.0f, RAND_FLOAT(2.0f) + 3.5f, 255, 16, 1);
|
||||
Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(20.0f) + player->pos.x, player->groundPos.y + 10.0f,
|
||||
player->trueZpos - 10.0f, RAND_FLOAT(2.0f) + 3.5f, 255, 16, 1);
|
||||
}
|
||||
} else {
|
||||
D_800C9F3C = 0;
|
||||
if ((gCamCount == 1) && ((gGameFrameCount % 4) == 0) && (player->rollState == 0)) {
|
||||
if ((player->unk_16C > 0.2f) && (player->radioDamageTimer == 0)) {
|
||||
func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f), player->groundPos.y + 10.0f,
|
||||
player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x - 57.0f),
|
||||
player->groundPos.y + 10.0f, player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f,
|
||||
255, 15, 0);
|
||||
}
|
||||
if ((player->unk_170 > 0.2f) && (player->radioDamageTimer == 0)) {
|
||||
func_effect_8007A900(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f), player->groundPos.y + 10.0f,
|
||||
player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f, 255, 15, 0);
|
||||
Effect_Effect359_Spawn(RAND_FLOAT_CENTERED(10.0f) + (player->pos.x + 57.0f),
|
||||
player->groundPos.y + 10.0f, player->trueZpos - 10.0f, RAND_FLOAT(1.0f) + 1.5f,
|
||||
255, 15, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -789,7 +791,7 @@ void func_tank_80046260(Player* player) {
|
||||
s32 i;
|
||||
|
||||
for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_58) &&
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id == OBJ_SCENERY_TI_BRIDGE) &&
|
||||
((player->trueZpos - 2000.0f) < scenery->obj.pos.z) && (scenery->obj.pos.y < player->pos.y)) {
|
||||
func_tank_800460E0(player, scenery->info.hitbox, scenery->obj.pos.x, scenery->obj.pos.y, scenery->obj.pos.z,
|
||||
scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
|
||||
@@ -844,14 +846,14 @@ void func_tank_8004641C(Player* player, s32 arg1, f32 arg2, f32 arg3, f32 arg4,
|
||||
if (Play_CheckPolyCollision(arg1, arg2, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
|
||||
if (D_MA_801BE250[27] < arg3 + sp58.y) {
|
||||
D_MA_801BE250[27] = arg3 + sp58.y;
|
||||
if (arg1 == OBJ_SCENERY_67) {
|
||||
if (arg1 == OBJ_SCENERY_MA_WALL_3) {
|
||||
player->rollState = 0;
|
||||
D_800C9F04 = 1;
|
||||
}
|
||||
}
|
||||
D_MA_801BE250[28] = sp58.x;
|
||||
D_MA_801BE250[29] = sp58.z;
|
||||
} else if ((arg1 == OBJ_SCENERY_67) && (D_MA_801BE250[27] == 0.0f) &&
|
||||
} else if ((arg1 == OBJ_SCENERY_MA_WALL_3) && (D_MA_801BE250[27] == 0.0f) &&
|
||||
Play_CheckPolyCollision(arg1, arg2 + 20.0f, arg3, arg4, sp84, sp80, sp7C, &sp58, &sp4C)) {
|
||||
player->rollState = 9;
|
||||
player->rollTimer = 15;
|
||||
@@ -886,9 +888,9 @@ void func_tank_80046704(Player* player) {
|
||||
if (1) {}
|
||||
for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
|
||||
if ((scenery->obj.id == OBJ_SCENERY_69) || (scenery->obj.id == OBJ_SCENERY_70) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_71) || (scenery->obj.id == OBJ_SCENERY_72) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_73) || (scenery->obj.id == OBJ_SCENERY_67)) {
|
||||
if ((scenery->obj.id == OBJ_SCENERY_MA_TERRAIN_BUMP) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_1) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_FLOOR_2) || (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_3) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_FLOOR_4) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_3)) {
|
||||
temp1 = scenery->obj.pos.x - player->pos.x;
|
||||
temp2 = scenery->obj.pos.z - player->trueZpos;
|
||||
|
||||
@@ -896,7 +898,7 @@ void func_tank_80046704(Player* player) {
|
||||
func_tank_8004641C(player, scenery->obj.id, scenery->obj.pos.x, scenery->obj.pos.y,
|
||||
scenery->obj.pos.z, scenery->obj.rot.x, scenery->obj.rot.y, scenery->obj.rot.z);
|
||||
}
|
||||
} else if (scenery->obj.id == OBJ_SCENERY_74) {
|
||||
} else if (scenery->obj.id == OBJ_SCENERY_MA_FLOOR_5) {
|
||||
if (((player->pos.x - 820.0f) <= scenery->obj.pos.x) &&
|
||||
(scenery->obj.pos.x <= (player->pos.x + 820.0f)) &&
|
||||
((player->pos.y - 50.0f) <= scenery->obj.pos.y) &&
|
||||
@@ -907,10 +909,10 @@ void func_tank_80046704(Player* player) {
|
||||
player->groundPos.y = D_MA_801BE250[27] - 3.0f;
|
||||
}
|
||||
}
|
||||
if ((scenery->obj.id == OBJ_SCENERY_59) || (scenery->obj.id == OBJ_SCENERY_60) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_61) || (scenery->obj.id == OBJ_SCENERY_63) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_105) || (scenery->obj.id == OBJ_SCENERY_66) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_67) || (scenery->obj.id == OBJ_SCENERY_68)) {
|
||||
if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) || (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_TOWER) || (scenery->obj.id == OBJ_SCENERY_63) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_TRAIN_TRACK_13) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_2) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_WALL_3) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) {
|
||||
s32 temp_v0;
|
||||
s32 sp94;
|
||||
|
||||
@@ -934,9 +936,9 @@ void func_tank_80046704(Player* player) {
|
||||
player->pos.x += (D_800C9F4C[temp_v0] * 5.0f);
|
||||
break;
|
||||
case 3:
|
||||
if ((scenery->obj.id == OBJ_SCENERY_59) || (scenery->obj.id == OBJ_SCENERY_60) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_63) || (scenery->obj.id == OBJ_SCENERY_66) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_68)) {
|
||||
if ((scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_BUILDING_2) || (scenery->obj.id == OBJ_SCENERY_63) ||
|
||||
(scenery->obj.id == OBJ_SCENERY_MA_WALL_2) || (scenery->obj.id == OBJ_SCENERY_MA_WALL_4)) {
|
||||
Player_ApplyDamage(player, temp_v0, 5);
|
||||
}
|
||||
player->baseSpeed = -(D_800C9F00 * 1.5f);
|
||||
@@ -945,7 +947,7 @@ void func_tank_80046704(Player* player) {
|
||||
AUDIO_PLAY_SFX(NA_SE_TANK_WALL_HIT, player->sfxSource, 0);
|
||||
break;
|
||||
}
|
||||
if (scenery->obj.id == OBJ_SCENERY_59) {
|
||||
if (scenery->obj.id == OBJ_SCENERY_MA_BUILDING_1) {
|
||||
if (((player->pos.x - 230.0f) <= scenery->obj.pos.x) &&
|
||||
(scenery->obj.pos.x <= (player->pos.x + 230.0f)) &&
|
||||
((80.0f <= player->pos.y - scenery->obj.pos.y)) &&
|
||||
@@ -975,7 +977,7 @@ void func_tank_80046704(Player* player) {
|
||||
(scenery->obj.pos.z <= (player->trueZpos + 220.0f)) && (player->pos.y >= 200.0f)) {
|
||||
player->groundPos.y = scenery->obj.pos.y + 204.0f;
|
||||
}
|
||||
} else if ((scenery->obj.id == OBJ_SCENERY_105) && Macbeth_801A3C20(player->trueZpos)) {
|
||||
} else if ((scenery->obj.id == OBJ_SCENERY_MA_TRAIN_TRACK_13) && Macbeth_801A3C20(player->trueZpos)) {
|
||||
if (((player->pos.x - 200.0f) < D_MA_801BE250[21]) &&
|
||||
(D_MA_801BE250[21] < (player->pos.x + 200.0f))) {
|
||||
player->groundPos.y = D_MA_801BE250[22] - 1.0f;
|
||||
@@ -1342,14 +1344,15 @@ void func_tank_800481F4(Player* player) {
|
||||
func_tank_800444BC(player);
|
||||
if (player->mercyTimer == 0) {
|
||||
for (i = 0, scenery = gScenery; i < ARRAY_COUNT(gScenery); i++, scenery++) {
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id != OBJ_SCENERY_58) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_105) && (scenery->obj.id != OBJ_SCENERY_59) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_60) && (scenery->obj.id != OBJ_SCENERY_63) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_66) && (scenery->obj.id != OBJ_SCENERY_67) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_68) && (scenery->obj.id != OBJ_SCENERY_70) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_72) && (scenery->obj.id != OBJ_SCENERY_71) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_73) && (scenery->obj.id != OBJ_SCENERY_74) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_69) && ((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
|
||||
if ((scenery->obj.status == OBJ_ACTIVE) && (scenery->obj.id != OBJ_SCENERY_TI_BRIDGE) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_TRAIN_TRACK_13) && (scenery->obj.id != OBJ_SCENERY_MA_BUILDING_1) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_BUILDING_2) && (scenery->obj.id != OBJ_SCENERY_63) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_WALL_2) && (scenery->obj.id != OBJ_SCENERY_MA_WALL_3) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_WALL_4) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_1) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_FLOOR_3) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_2) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_FLOOR_4) && (scenery->obj.id != OBJ_SCENERY_MA_FLOOR_5) &&
|
||||
(scenery->obj.id != OBJ_SCENERY_MA_TERRAIN_BUMP) &&
|
||||
((player->trueZpos - 2000.0f) < scenery->obj.pos.z)) {
|
||||
var_fv1 = scenery->obj.rot.y;
|
||||
if (scenery->info.action == (ObjectFunc) SceneryRotateTowardsCamera) {
|
||||
var_fv1 = 0.0f;
|
||||
@@ -1429,7 +1432,7 @@ void func_tank_800481F4(Player* player) {
|
||||
Player_ApplyDamage(player, 0, 5);
|
||||
player->mercyTimer = 1;
|
||||
}
|
||||
} else if ((OBJ_ACTOR_205 <= actor->obj.id) && (actor->obj.id <= OBJ_ACTOR_213)) {
|
||||
} else if ((OBJ_ACTOR_MA_LOCOMOTIVE <= actor->obj.id) && (actor->obj.id <= OBJ_ACTOR_MA_TRAIN_CAR_7)) {
|
||||
if (func_tank_80046E40(player, actor->info.hitbox, &sp98, actor->fwork[25] + actor->obj.pos.x,
|
||||
actor->fwork[8] + actor->obj.pos.y + 25.0f, actor->obj.pos.z,
|
||||
actor->fwork[29], actor->fwork[26], actor->obj.rot.z, 0.0f, 0.0f,
|
||||
@@ -1463,12 +1466,12 @@ void func_tank_800481F4(Player* player) {
|
||||
actor->obj.rot.y, actor->obj.rot.z, 0.0f, 0.0f, 0.0f);
|
||||
if (temp_v0 != 0) {
|
||||
actor->dmgType = DMG_COLLISION;
|
||||
if ((actor->obj.id == OBJ_ACTOR_225) || (actor->obj.id == OBJ_MISSILE_SEEK_TEAM)) {
|
||||
if ((actor->obj.id == OBJ_ACTOR_TI_LANDMINE) || (actor->obj.id == OBJ_MISSILE_SEEK_TEAM)) {
|
||||
actor->dmgType = -1;
|
||||
}
|
||||
if (actor->info.damage) {
|
||||
Player_ApplyDamage(player, temp_v0, actor->info.damage);
|
||||
if (actor->obj.id == OBJ_ACTOR_225) {
|
||||
if (actor->obj.id == OBJ_ACTOR_TI_LANDMINE) {
|
||||
player->knockback.y = 0.0f;
|
||||
}
|
||||
} else {
|
||||
@@ -1487,11 +1490,11 @@ void func_tank_800481F4(Player* player) {
|
||||
if (temp_v0 != 0) {
|
||||
if ((sprite->obj.id == OBJ_SPRITE_FO_POLE) || (sprite->obj.id == OBJ_SPRITE_CO_POLE) ||
|
||||
(sprite->obj.id == OBJ_SPRITE_CO_TREE)) {
|
||||
sprite->destroy = 1;
|
||||
sprite->destroy = true;
|
||||
player->hitTimer = 6;
|
||||
player->hitDirection = 0;
|
||||
} else if (sprite->obj.id == OBJ_SPRITE_TI_CACTUS) {
|
||||
sprite->destroy = 1;
|
||||
sprite->destroy = true;
|
||||
} else {
|
||||
Player_ApplyDamage(player, temp_v0, sprite->info.damage);
|
||||
}
|
||||
|
||||
@@ -246,7 +246,7 @@ void func_versus_800BD7C4(f32 xPos, f32 yPos, s32 arg2) {
|
||||
s32 i;
|
||||
|
||||
for (i = 10; i != 1; i /= 10) {
|
||||
if (xPos > 0 && (yPos > 0)) {
|
||||
if ((xPos > 0) && (yPos > 0)) {
|
||||
TextureRect_IA8(&gMasterDisp, D_800D4B20[arg2 / i], 16, 8, xPos, yPos, 1.0f, 1.0f);
|
||||
}
|
||||
xPos += 9.0f;
|
||||
|
||||
Reference in New Issue
Block a user