diff --git a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp index 845fff614..ba3f7fc52 100644 --- a/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp +++ b/soh/soh/Enhancements/accessible-actors/AccessibleActorList.cpp @@ -90,7 +90,8 @@ void accessible_area_change(AccessibleActor* actor) { actor->policy.ydist = 2000; if (actor->yDistToPlayer > 500.0 && actor->sceneIndex != SCENE_DEATH_MOUNTAIN_TRAIL && - actor->play->sceneNum != SCENE_HYRULE_FIELD && actor->play->sceneNum != SCENE_KAKARIKO_VILLAGE) { + actor->play->sceneNum != SCENE_HYRULE_FIELD && actor->play->sceneNum != SCENE_KAKARIKO_VILLAGE && + actor->play->sceneNum != SCENE_LOST_WOODS) { return; } @@ -535,6 +536,11 @@ void ActorAccessibility_InitActors() { policy.n = 40; ActorAccessibility_AddSupportedActor(ACTOR_EN_ELF, policy); + ActorAccessibility_InitPolicy(&policy, "frog spot", NA_SE_EN_DODO_M_EAT); + policy.distance = 100; + policy.n = 40; + ActorAccessibility_AddSupportedActor(ACTOR_EN_FR, policy); + ActorAccessibility_InitPolicy(&policy, "big poe spawn", NA_SE_EN_PO_BIG_GET); policy.distance = 1500; policy.n = 60; diff --git a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp index 3aeb97ba1..d954f6438 100644 --- a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp +++ b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.cpp @@ -676,9 +676,6 @@ void ActorAccessibility_InterpretCurrentScene(PlayState* play) { func_80041DB8(&play->colCtx, poly, BGCHECK_SCENE) == 3)) { ActorAccessibility_PolyToVirtualActor(play, poly, VA_CLIMB, list); } - if (SurfaceType_IsWallDamage(&play->colCtx, poly, BGCHECK_SCENE)) { - ActorAccessibility_PolyToVirtualActor(play, poly, VA_SPIKE, list); - } if (SurfaceType_GetSceneExitIndex(&play->colCtx, poly, BGCHECK_SCENE) != 0) { ActorAccessibility_PolyToVirtualActor(play, poly, VA_AREA_CHANGE, list); } diff --git a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.h b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.h index d4a8e8569..7f3728d12 100644 --- a/soh/soh/Enhancements/accessible-actors/ActorAccessibility.h +++ b/soh/soh/Enhancements/accessible-actors/ActorAccessibility.h @@ -151,7 +151,6 @@ typedef enum { VA_DOOR, VA_AREA_CHANGE, VA_MARKER, - VA_SPIKE, VA_MAX, } VIRTUAL_ACTOR_TABLE;