merged neogeo.c/inc