Fix duty label numbers
Add OAM data
Unincbin more map scripts
update submodule
Merge branch 'master' of https://github.com/dannye/pokered.git
Merge branch 'music' of https://github.com/dannye/pokered
Merge branch 'master' into german

Conflicts:
	extras
add german files to 'make clean'