Fix item remapping v2

Adressing some issues with your manual merge 752bb63900e67f7242accdef0799ae7bd2a7c9aa of Pokefenn/Chisel#44