Remove leftover NUM_OPTIONS macro from decoration.c, move.c, water.c