Fix item remapping v2

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