Merge pull request #197 from NicholasMoser/master

Add Naruto Rev3 PAL and Fix Rev3 US and GNT4/SCON4

Author: bkacjios

README.md

@@ -95,7 +95,7 @@
 * The SpongeBob SquarePants Movie (NTSC-U v1.1, PAL v1.0)
 * Super Mario Strikers (NTSC-U v1.0)
 * TimeSplitters 2 (NTSC-U v1.0)
-* Naruto - Clash of Ninja Revolution 3 (NTSC-U v1.0)
+* Naruto - Clash of Ninja Revolution 3 (NTSC-U v1.0, PAL v1.0)
 * Naruto - Gekitou Ninja Taisen! 4 (NTSC-J v1.0)
   - [Naruto: Super Clash of Ninja 4](https://gnt4.online/scon4/)
 * Need for Speed Underground 1 (NTSC-U v1.0)

source/modules/games/G4NJDA-0.lua

@@ -7,9 +7,7 @@ local game = core.newGame()
 local polling_addresses = {
 	0x80222D40,
 	0x80222D74,
-	0x80222DA8,
-	0x80222DDC,
-	0x80222E10,
+	0x80222DA8
 }
 
 local controllers = {

source/modules/games/RNEEDA-0.lua

@@ -10,10 +10,10 @@ local polling_addresses = {
 }
 
 local controllers = {
-	[1] = 0x40 * 0,
-	[2] = 0x40 * 1,
-	[3] = 0x40 * 2,
-	[4] = 0x40 * 3,
+	[1] = 0xC * 0,
+	[2] = 0xC * 1,
+	[3] = 0xC * 2,
+	[4] = 0xC * 3,
 }
 
 local controller_struct = {

source/modules/games/RNEPDA-0.lua

@@ -0,0 +1,52 @@
+-- Naruto - Clash of Ninja Revolution 3 (PAL v1.0)
+
+local core = require("games.core")
+
+local game = core.newGame()
+
+local polling_addresses = {
+	0x803BE480,
+	0x803BE4B0,
+}
+
+local controllers = {
+	[1] = 0xC * 0,
+	[2] = 0xC * 1,
+	[3] = 0xC * 2,
+	[4] = 0xC * 3,
+}
+
+local controller_struct = {
+	[0x0] = { type = "short",	name = "controller.%d.buttons.pressed" },
+	[0x2] = { type = "sbyte",	name = "controller.%d.joystick.x" },
+	[0x3] = { type = "sbyte",	name = "controller.%d.joystick.y" },
+	[0x4] = { type = "sbyte",	name = "controller.%d.cstick.x" },
+	[0x5] = { type = "sbyte",	name = "controller.%d.cstick.y" },
+	[0x6] = { type = "byte",	name = "controller.%d.analog.l" },
+	[0x7] = { type = "byte",	name = "controller.%d.analog.r" },
+	[0xA] = { type = "byte",	name = "controller.%d.plugged" },
+}
+
+for _, polling_addr in ipairs(polling_addresses) do
+	-- For every polling address..
+	for port, controller_addr in ipairs(controllers) do
+		-- For every controller 
+		for offset, info in pairs(controller_struct) do
+			game.memorymap[polling_addr + controller_addr + offset] = {
+				type = info.type,
+				debug = info.debug,
+				name = info.name:format(port),
+			}
+		end
+	end
+end
+
+function game.translateJoyStick(x, y)
+	x = x/100
+	y = y/100
+	return x, y
+end
+
+game.translateCStick = game.translateJoyStick
+
+return game