ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

naomi: more rom list to cpp. remap pjustice buttons. add more inputs

This commit is contained in:
Flyinghead 2021-01-05 18:39:00 +01:00
parent 46b48dcc68
commit baa36925e2
5 changed files with 6744 additions and 6587 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -586,6 +586,7 @@ target_sources(${PROJECT_NAME} PRIVATE
core/hw/naomi/naomi.cpp
core/hw/naomi/naomi.h
core/hw/naomi/naomi_regs.h
core/hw/naomi/naomi_roms.cpp
core/hw/naomi/naomi_roms.h
core/hw/naomi/naomi_roms_input.h
core/hw/pvr/drkPvr.cpp

6637
core/hw/naomi/naomi_roms.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

6571
core/hw/naomi/naomi_roms.h
View File

File diff suppressed because it is too large Load Diff

110
core/hw/naomi/naomi_roms_input.h
View File

@ -3,26 +3,24 @@
Copyright 2018 flyinghead
This file is part of reicast.
This file is part of Flycast.
reicast is free software: you can redistribute it and/or modify
Flycast is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
reicast is distributed in the hope that it will be useful,
Flycast is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with reicast. If not, see <https://www.gnu.org/licenses/>.
along with Flycast. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef CORE_HW_NAOMI_NAOMI_ROMS_INPUT_H_
#define CORE_HW_NAOMI_NAOMI_ROMS_INPUT_H_
#pragma once
#include "hw/maple/maple_devs.h"
#include "naomi_cart.h"
//
// NAOMI Games
@ -33,6 +31,16 @@
{ NAOMI_SERVICE_KEY, "SERVICE" },
#define NAO_START_DESC { NAOMI_START_KEY, "START" },
#define INPUT_2_BUTTONS(btn0, btn1) { \
{ \
{ NAOMI_BTN0_KEY, btn0 }, \
{ NAOMI_BTN1_KEY, btn1 }, \
NAO_START_DESC \
NAO_BASE_BTN_DESC \
{ 0 }, \
} \
}; \
static InputDescriptors _18wheelr_inputs = {
{
{ NAOMI_BTN0_KEY, "HORN" },
@ -274,21 +282,46 @@ static InputDescriptors vonot_inputs = {
},
};
static InputDescriptors vtenis2c_inputs = {
{
{ NAOMI_BTN0_KEY, "SHOT1" },
{ NAOMI_BTN1_KEY, "SHOT2" },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
{ 0 },
},
{
{ NULL },
},
static InputDescriptors shot12_inputs = {
{
{ NAOMI_BTN0_KEY, "SHOT1" },
{ NAOMI_BTN1_KEY, "SHOT2" },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
static InputDescriptors shot123_inputs = {
{
{ NAOMI_BTN0_KEY, "SHOT1" },
{ NAOMI_BTN1_KEY, "SHOT2" },
{ NAOMI_BTN2_KEY, "SHOT3" },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
static InputDescriptors shot1234_inputs = {
{
{ NAOMI_BTN0_KEY, "SHOT1" },
{ NAOMI_BTN1_KEY, "SHOT2" },
{ NAOMI_BTN2_KEY, "SHOT3" },
{ NAOMI_BTN3_KEY, "SHOT4" },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
static InputDescriptors monkeyba_inputs = {
@ -325,6 +358,36 @@ static InputDescriptors cvs2_inputs = {
},
};
static InputDescriptors pjustic_inputs = {
{
{ NAOMI_BTN0_KEY, "SHOT1" },
{ NAOMI_BTN1_KEY, "SHOT2" },
{ NAOMI_BTN2_KEY, "SHOT3", NAOMI_BTN3_KEY },
{ NAOMI_BTN3_KEY, "SHOT4", NAOMI_BTN4_KEY },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
static InputDescriptors slashout_inputs = {
{
{ NAOMI_BTN0_KEY, "BLADE" },
{ NAOMI_BTN1_KEY, "CHARGE" },
{ NAOMI_BTN2_KEY, "JUMP" },
{ NAOMI_BTN3_KEY, "SHIFT" },
{ NAOMI_UP_KEY, "UP" },
{ NAOMI_DOWN_KEY, "DOWN" },
{ NAOMI_LEFT_KEY, "LEFT" },
{ NAOMI_RIGHT_KEY, "RIGHT" },
NAO_START_DESC
NAO_BASE_BTN_DESC
},
};
static InputDescriptors tokyobus_inputs = {
{
{ NAOMI_BTN0_KEY, "HORN" },
@ -607,4 +670,3 @@ static InputDescriptors blockpong_inputs = {
{ NULL },
},
};
#endif /* CORE_HW_NAOMI_NAOMI_ROMS_INPUT_H_ */

12
shell/apple/emulator-osx/reicast-osx.xcodeproj/project.pbxproj
View File

@ -243,6 +243,7 @@
AE80EDBF2157D4E600F7800F /* naomi_cart.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE80EDBB2157D4E600F7800F /* naomi_cart.cpp */; };
AE82C60025A0E45A00C79BC2 /* picoppp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE82C5FE25A0E45900C79BC2 /* picoppp.cpp */; };
AE82C60125A0E45A00C79BC2 /* dns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE82C5FF25A0E45A00C79BC2 /* dns.cpp */; };
AE82C60625A4D92D00C79BC2 /* naomi_roms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE82C60525A4D92D00C79BC2 /* naomi_roms.cpp */; };
AE8C27342111A31100D4D8F4 /* dsp_interp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE8C27332111A31100D4D8F4 /* dsp_interp.cpp */; };
AE8C274321122E2500D4D8F4 /* xbrz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE8C273D21122E2500D4D8F4 /* xbrz.cpp */; };
AE90679B235B6F6400CE473C /* gl_context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AE90679A235B6F6400CE473C /* gl_context.cpp */; };
@ -785,6 +786,8 @@
AE82C5FD25A0E45900C79BC2 /* picoppp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = picoppp.h; sourceTree = "<group>"; };
AE82C5FE25A0E45900C79BC2 /* picoppp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = picoppp.cpp; sourceTree = "<group>"; };
AE82C5FF25A0E45A00C79BC2 /* dns.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dns.cpp; sourceTree = "<group>"; };
AE82C60425A4D92D00C79BC2 /* naomi_flashrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = naomi_flashrom.h; sourceTree = "<group>"; };
AE82C60525A4D92D00C79BC2 /* naomi_roms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = naomi_roms.cpp; sourceTree = "<group>"; };
AE8C27332111A31100D4D8F4 /* dsp_interp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dsp_interp.cpp; sourceTree = "<group>"; };
AE8C273D21122E2500D4D8F4 /* xbrz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbrz.cpp; sourceTree = "<group>"; };
AE8C273E21122E2500D4D8F4 /* xbrz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xbrz.h; sourceTree = "<group>"; };
@ -2021,17 +2024,19 @@
AE2A2D5021D6846F004B308D /* m1cartridge.h */,
AE2A2D5621D68470004B308D /* m4cartridge.cpp */,
AE2A2D5421D68470004B308D /* m4cartridge.h */,
AE80EDBB2157D4E600F7800F /* naomi_cart.cpp */,
AE80EDBC2157D4E600F7800F /* naomi_cart.h */,
AEA9492F244CDF50001134C7 /* naomi_flashrom.cpp */,
AE82C60425A4D92D00C79BC2 /* naomi_flashrom.h */,
AE7BCB6C24460910007285F8 /* naomi_m3comm.cpp */,
AE7BCB6D24460910007285F8 /* naomi_m3comm.h */,
AE80EDBD2157D4E600F7800F /* naomi_regs.h */,
AEA94930244CDF50001134C7 /* naomi_roms_eeprom.h */,
AE2A2D5821D68470004B308D /* naomi_roms_input.h */,
AE82C60525A4D92D00C79BC2 /* naomi_roms.cpp */,
AE2A2D5521D68470004B308D /* naomi_roms.h */,
AE80EDB92157D4E600F7800F /* naomi.cpp */,
AE80EDBA2157D4E600F7800F /* naomi.h */,
AE80EDBB2157D4E600F7800F /* naomi_cart.cpp */,
AE80EDBC2157D4E600F7800F /* naomi_cart.h */,
AE80EDBD2157D4E600F7800F /* naomi_regs.h */,
);
path = naomi;
sourceTree = "<group>";
@ -2437,6 +2442,7 @@
buildActionMask = 2147483647;
files = (
AE649C01218C552500EF4A81 /* md5.c in Sources */,
AE82C60625A4D92D00C79BC2 /* naomi_roms.cpp in Sources */,
AEF25642227C441F00348550 /* vmem32.cpp in Sources */,
84B7BF741B72720200F9733F /* descrambl.cpp in Sources */,
AE649BF9218C552500EF4A81 /* fixed_intrin_ssse3.c in Sources */,