I added back my remap code.

If you don't like the pow(2) bit you can delete it if you want.

Author: oshaboy

gameinfo.txt

@@ -0,0 +1 @@
+KIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNTKIRBY TNT

input/input_driver.c

@@ -4750,15 +4750,41 @@ void joypad_driver_reinit(void *data, const char *joypad_driver_name)
  **/
 float input_get_sensor_state(unsigned port, unsigned id)
 {
-   settings_t *settings      = config_get_ptr();
-   bool input_sensors_enable = settings->bools.input_sensors_enable;
-   unsigned joy_idx          = settings->uints.input_joypad_index[port];
-   float sensitivity         = 1.0f;
-   if (id >= RETRO_SENSOR_ACCELEROMETER_X && id <= RETRO_SENSOR_ACCELEROMETER_Z)
-      sensitivity = settings->floats.input_sensor_accelerometer_sensitivity;
-   else if (id >= RETRO_SENSOR_GYROSCOPE_X && id <= RETRO_SENSOR_GYROSCOPE_Z)
-      sensitivity = settings->floats.input_sensor_gyroscope_sensitivity;
-   return input_driver_get_sensor(joy_idx, input_sensors_enable, id) * sensitivity;
+   settings_t *settings                   = config_get_ptr();
+   bool input_sensors_enable              = settings->bools.input_sensors_enable;
+   float sensitivity;
+   int remapped_port;
+   int invert;
+   unsigned remapped_input_sensor_id;
+   if (id >= RETRO_SENSOR_END) {
+      RARCH_DBG("[input_driver] Invalid Sensor ID %u\n", id);
+      return 0.f;
+   }
+   if (port >= MAX_USERS) {
+      RARCH_DBG("[input_driver] Port number given (%u) is greater than the maximum number of users\n", port);
+      return 0.f;
+   }
+   remapped_port = settings->uints.input_sensor_index[port];
+   remapped_input_sensor_id =
+      id == RETRO_SENSOR_ILLUMINANCE ?
+      RETRO_SENSOR_ILLUMINANCE :
+      settings->uints.input_sensor_ids[port][id]/2;
+   if (id >= RETRO_SENSOR_ACCELEROMETER_X && id <= RETRO_SENSOR_ACCELEROMETER_Z) {
+      invert=(settings->uints.input_sensor_ids[port][id]%2)?-1:1;
+      sensitivity=settings->floats.input_sensor_accelerometer_sensitivity;
+   } else if (id >= RETRO_SENSOR_GYROSCOPE_X && id <= RETRO_SENSOR_GYROSCOPE_Z) {
+      invert=(settings->uints.input_sensor_ids[port][id]%2)?-1:1;
+      sensitivity=settings->floats.input_sensor_gyroscope_sensitivity;
+   } else {
+      invert=1;
+      sensitivity=0.f;
+   }
+   return input_driver_get_sensor(
+         remapped_port,
+         input_sensors_enable,
+         remapped_input_sensor_id)
+      *invert*((float)pow(2,sensitivity));
+   
 }
 
 /**
@@ -5245,16 +5271,19 @@ static void input_config_set_auxiliary_device_display_name(unsigned port, const
    if (!string_is_empty(name))
    {
       string_copy_only_ascii(name_ascii, name);
-   if (aux_device_type == SENSOR_AUX_DEVICE) 
-      aux_device_info=&input_st->input_sensor_info[port];
-   else /*(aux_device_type == MOUSE_AUX_DEVICE)*/
-      aux_device_info=&input_st->input_mouse_info[port]; 
       string_trim_whitespace(name_ascii);
+
    }
 
-   if (!string_is_empty(name_ascii))
+   if (!string_is_empty(name_ascii)){
+      if (aux_device_type == SENSOR_AUX_DEVICE) 
+         aux_device_info=&input_st->input_sensor_info[port];
+      else { /*(aux_device_type == MOUSE_AUX_DEVICE)*/
+         aux_device_info=&input_st->input_mouse_info[port]; 
+      }
       strlcpy(aux_device_info->display_name, name_ascii,
             sizeof(aux_device_info->display_name));
+   }
 }
 void input_config_set_sensor_display_name(unsigned port, const char *name)
 {