Merge pull request #284 from ArchZombie/master

Bug
.
Merge remote-tracking branch 'main/master'
Enigma Berry

I could have easily change the message to 3 for the berry but I don't know the point of message 6 as "restored a some HP" so I figured I would just change that to match 3.  Feel free to ignore since this isn't anything big.
Merge pull request #285 from BeastCharizard/patch-1

Enigma Berry
Fix ARM signed char problems

Fix #277
Merge remote-tracking branch 'main/master'
other ARM stuff