Paramaterise trap effects
Make everything that isn't saved in the savefiles that was previously a 8 or 16 bit integer an 'int'.
Merge pull request #341 from takkaria/restruct

More restruct patches