Removed obsolete macro call
Fixed internal scenario id numbers
Merge branch 'master' of https://github.com/Vultraz/NX-RPG