diff options
| author | Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com> | 2024-08-24 19:36:53 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-24 19:36:53 -0300 |
| commit | e82019fa2bd527bca3a9dad48175a6b8f2a1fee7 (patch) | |
| tree | da9bba80666743402ec29c7219c53f526a98a01a /src/engine/fox_play.c | |
| parent | 669fff8759859306d6ca8ae71f40073a934a188f (diff) | |
Actor Docs (#270)
* Docs
* actor timer_04C -> work_04C
* Actor & Boss unk_04A -> work_04A
* actor & boss unk_048 -> work_048
* actor & boss unk_046 -> work_046
* boss unk_044 -> work_044
* actor event docs
* ActorEvent docs
* name all Event Actor IDs
* EVID names in EventActorInfo comments
* refactor EVC_PASSED_ALL_RINGS by @inspectredc
* clarification comment
* some option docs
* audio enums and macros
* some audio renamings
Diffstat (limited to 'src/engine/fox_play.c')
| -rw-r--r-- | src/engine/fox_play.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/fox_play.c b/src/engine/fox_play.c index 1605f40c..b49886e4 100644 --- a/src/engine/fox_play.c +++ b/src/engine/fox_play.c @@ -2035,14 +2035,14 @@ void Player_CollisionCheck(Player* player) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } } else if (actor->obj.id == OBJ_ACTOR_EVENT) { - if (actor->eventType == EVID_42) { + if (actor->eventType == EVID_SY_SHIP_2) { temp_v0 = Player_CheckPolyCollision(player, ACTOR_EVENT_ID, actor->obj.pos.x, actor->obj.pos.y, actor->obj.pos.z, actor->obj.rot.x, actor->obj.rot.y, actor->obj.rot.z); if (temp_v0 != 0) { Player_ApplyDamage(player, temp_v0, actor->info.damage); } - } else if (actor->eventType == EVID_63) { + } else if (actor->eventType == EVID_ME_BIG_METEOR) { spfD4.x = fabsf(actor->obj.pos.x - player->pos.x); spfD4.y = fabsf(actor->obj.pos.y - player->pos.y); spfD4.z = fabsf(actor->obj.pos.z - player->trueZpos); @@ -2059,7 +2059,7 @@ void Player_CollisionCheck(Player* player) { if ((temp_v0 < 0) && (actor->eventType == EVID_SX_WARP_GATE)) { actor->info.hitbox = SEGMENTED_TO_VIRTUAL(D_SX_6032328); if (gRingPassCount >= 0) { - actor->unk_046 = 2; + actor->work_046 = 2; gRingPassCount++; if (gRingPassCount == 3) { Radio_PlayMessage(gMsg_ID_5504, RCID_FALCO); |