diff --git a/dist/tekken/bananatools.ini b/dist/tekken/bananatools.ini index 3421f59..c8526e5 100644 --- a/dist/tekken/bananatools.ini +++ b/dist/tekken/bananatools.ini @@ -47,9 +47,6 @@ access_code=00000000000000000000 enable=1 port=3 -; Mappings for the najv4 IO board. To disable JVS emulation and use -; a real board, set enable to 0 in the "jvs" section. -[najv4] test=0x24 coin=0x2D service=0x2E diff --git a/tekkenio/config.c b/tekkenio/config.c index 3a4865e..254ac0c 100644 --- a/tekkenio/config.c +++ b/tekkenio/config.c @@ -6,18 +6,18 @@ #include "tekkenio/config.h" -void tekken_io_najv4_config_load(struct tekken_najv4_config *cfg, const wchar_t *filename) +void tekken_io_najv4_config_load(struct tekken_jvs_config *cfg, const wchar_t *filename) { - cfg->test = GetPrivateProfileIntW(L"najv4", L"test", VK_HOME, filename); - cfg->service = GetPrivateProfileIntW(L"najv4", L"service", VK_DELETE, filename); - cfg->coin = GetPrivateProfileIntW(L"najv4", L"coin", VK_INSERT, filename); - cfg->up = GetPrivateProfileIntW(L"najv4", L"up", VK_UP, filename); - cfg->down = GetPrivateProfileIntW(L"najv4", L"down", VK_DOWN, filename); - cfg->left = GetPrivateProfileIntW(L"najv4", L"left", VK_LEFT, filename); - cfg->right = GetPrivateProfileIntW(L"najv4", L"right", VK_RIGHT, filename); - cfg->start = GetPrivateProfileIntW(L"najv4", L"start", VK_SPACE, filename); - cfg->p1b1 = GetPrivateProfileIntW(L"najv4", L"p1b1", '1', filename); - cfg->p1b2 = GetPrivateProfileIntW(L"najv4", L"p1b2", '2', filename); - cfg->p1b3 = GetPrivateProfileIntW(L"najv4", L"p1b3", '3', filename); - cfg->p1b4 = GetPrivateProfileIntW(L"najv4", L"p1b4", '4', filename); + cfg->test = GetPrivateProfileIntW(L"jvs", L"test", VK_HOME, filename); + cfg->service = GetPrivateProfileIntW(L"jvs", L"service", VK_DELETE, filename); + cfg->coin = GetPrivateProfileIntW(L"jvs", L"coin", VK_INSERT, filename); + cfg->up = GetPrivateProfileIntW(L"jvs", L"up", VK_UP, filename); + cfg->down = GetPrivateProfileIntW(L"jvs", L"down", VK_DOWN, filename); + cfg->left = GetPrivateProfileIntW(L"jvs", L"left", VK_LEFT, filename); + cfg->right = GetPrivateProfileIntW(L"jvs", L"right", VK_RIGHT, filename); + cfg->start = GetPrivateProfileIntW(L"jvs", L"start", VK_SPACE, filename); + cfg->p1b1 = GetPrivateProfileIntW(L"jvs", L"p1b1", '1', filename); + cfg->p1b2 = GetPrivateProfileIntW(L"jvs", L"p1b2", '2', filename); + cfg->p1b3 = GetPrivateProfileIntW(L"jvs", L"p1b3", '3', filename); + cfg->p1b4 = GetPrivateProfileIntW(L"jvs", L"p1b4", '4', filename); } diff --git a/tekkenio/config.h b/tekkenio/config.h index f80364c..0a11896 100644 --- a/tekkenio/config.h +++ b/tekkenio/config.h @@ -3,7 +3,7 @@ #include #include -struct tekken_najv4_config { +struct tekken_jvs_config { uint8_t test; uint8_t service; uint8_t up; @@ -18,4 +18,4 @@ struct tekken_najv4_config { uint8_t p1b4; }; -void tekken_io_najv4_config_load(struct tekken_najv4_config *cfg, const wchar_t *filename); +void tekken_io_najv4_config_load(struct tekken_jvs_config *cfg, const wchar_t *filename); diff --git a/tekkenio/tekkenio.c b/tekkenio/tekkenio.c index f6568b0..05375d9 100644 --- a/tekkenio/tekkenio.c +++ b/tekkenio/tekkenio.c @@ -13,7 +13,7 @@ static bool tekken_io_coin = false; static bool tekken_test_toggle = false; static uint16_t tekken_coin_ct = 0; -static struct tekken_najv4_config najv4_cfg; +static struct tekken_jvs_config najv4_cfg; uint16_t tekken_io_get_api_version(void) {