[s0040] Fix NPC "16580 and 16842"

Signed-off-by: Salja <salja8840@gmail.com>