hmgeo has Jump incorrectly tagged as Target. With Jump not registering as an input at all

[WarpedPolygon]

Please Note: This form is the minimum required information for submitting bugs.
Removing this form may lead to your issue being closed until it is completed.

Platform / OS / Hardware:
RetroArch Core
Windows
AMD FX 8350 Eight-Core Processor 4.00 GHz
16GB ram
NVIDIA 960

Description of the Issue

Tested all inputs in the inputs in the I/o test menu. Button 3 (Jump) isn't registering at all despite having every input set. The input tagged as Jump is actually the Target (lock on) button.

[flyinghead]

I tested the game input test and all 4 buttons are accessible, mapped to ABXY on my gamepad.

[WarpedPolygon]

Using the default layout: Jump is actually X not Y when in game, and target is on Y not RB which does not reflect the control settings.
Aside from this:
The issue with Shot 3 (Jump) not registering only happens when a remap has been done with any input.

RB is doing nothing.

So here is how the default controls appear in the image below, and the image underneath that is of the test menu with me pressing XABY only with that default layout.

Now if I simply remap Attack from B to X like in the image below, I get Shot 3 not being registered at all when Attack is actually Shot 2. Shot 3 is Jump and is being affected by the remap even if you are not changing Shot 3. This happens with any layout.

The input test image is of me holding ABXY only, with the remapped controls.

[flyinghead]

I fixed the button labels that were wrong. The new settings are:
A: Fire
B: Attack
X: Jump
Y: Target

Note that I just changed the labels, not the mappings, so I'm not sure it will fix the remapping problem.

The changes should be in libretro in the next 24h.

[WarpedPolygon]

All fixed with no issues remapping. Dude, you are committed. Updating this on Christmas Day no less, I fully appreciate your work and speed. Cheers mate