diff --git a/src/game/chraction.c b/src/game/chraction.c index e4bf21bc0..132f7b37d 100644 --- a/src/game/chraction.c +++ b/src/game/chraction.c @@ -4,7 +4,6 @@ #include "game/dlights.h" #include "game/footstep.h" #include "game/game_006900.h" -#include "game/pdmode.h" #include "game/chr.h" #include "game/body.h" #include "game/prop.h" @@ -1324,8 +1323,6 @@ f32 chrGetRangedSpeed(struct chrdata *chr, f32 min, f32 max) { f32 speedrating = chr->speedrating; - speedrating = pdmodeGetEnemyReactionSpeed() * (100.0f - speedrating) + speedrating; - return (max - min) * speedrating * 0.01f + min; } @@ -1344,9 +1341,6 @@ f32 chrGetRangedSpeed(struct chrdata *chr, f32 min, f32 max) s32 chrGetPercentageOfSlowness(struct chrdata *chr, s32 percentage) { s32 speedrating = chr->speedrating; - s32 extra = pdmodeGetEnemyReactionSpeed() * (100 - speedrating); - - speedrating = extra + speedrating; return (100 - speedrating) * percentage / 100; } @@ -4710,13 +4704,6 @@ void chrCalculateHit(struct chrdata *chr, bool *angleokptr, bool *hit, struct gs } } - // Apply PD mode enemy accuracy setting (default 1 which is no op) - if (pdmodeGetEnemyAccuracy() <= 1) { - accuracy *= pdmodeGetEnemyAccuracy(); - } else { - accuracy *= 9 / (10.001f - pdmodeGetEnemyAccuracy()); - } - // Apply difficulty multiplier (solo A = 0.6, SA = 0.8, PA = 1.175) accuracy *= g_EnemyAccuracyScale; diff --git a/src/game/pdmode.c b/src/game/pdmode.c index 58f979dfa..2e4f9936b 100644 --- a/src/game/pdmode.c +++ b/src/game/pdmode.c @@ -10,25 +10,6 @@ #include "data.h" #include "types.h" -f32 pdmodeGetEnemyReactionSpeed(void) -{ - return 0; -} - -f32 pdmodeGetEnemyAccuracy(void) -{ - if (g_MissionConfig.pdmode) { - return g_MissionConfig.pdmodeaccuracyf; - } - - return 1; -} - -void func0f01b148(u32 arg0) -{ - var800624e0 = arg0; -} - void titleSetNextStage(s32 stagenum) { g_TitleNextStage = stagenum; diff --git a/src/lib/main.c b/src/lib/main.c index 8bd48d417..30424724a 100644 --- a/src/lib/main.c +++ b/src/lib/main.c @@ -839,8 +839,6 @@ void mainLoop(void) titleSetNextStage(g_StageNum); if (g_StageNum < STAGE_TITLE) { - func0f01b148(0); - if (argFindByPrefix(1, "-hard")) { lvSetDifficulty(argFindByPrefix(1, "-hard")[0] - '0'); }