merge changes

This commit is contained in:
Samuel Yuan 2015-03-22 12:47:21 -04:00
commit d4fc9b355b
4 changed files with 8 additions and 2 deletions

View File

@ -3326,16 +3326,19 @@ swapmode=2
[53ED2DC4-06258002-C:50]
Good Name=Star Wars Episode I - Racer (E) (M3)
Internal Name=STAR WARS EP1 RACER
fb_render=1
swapmode=2
[61F5B152-046122AB-C:4A]
Good Name=Star Wars Episode I - Racer (J)
Internal Name=STAR WARS EP1 RACER
fb_render=1
swapmode=2
[72F70398-6556A98B-C:45]
Good Name=Star Wars Episode I - Racer (U)
Internal Name=STAR WARS EP1 RACER
fb_render=1
swapmode=2
[42CF5EA3-9A1334DF-C:50]

View File

@ -5425,6 +5425,7 @@ Sync Audio=0
Good Name=Star Wars Episode I - Racer (E) (M3)
Internal Name=STAR WARS EP1 RACER
Status=Compatible
Counter Factor=1
Culling=1
Emulate Clear=1
RDRAM Size=8
@ -5434,6 +5435,7 @@ Save Type=16kbit Eeprom
Good Name=Star Wars Episode I - Racer (J)
Internal Name=STAR WARS EP1 RACER
Status=Compatible
Counter Factor=1
Culling=1
Emulate Clear=1
RDRAM Size=8
@ -5443,6 +5445,7 @@ Save Type=16kbit Eeprom
Good Name=Star Wars Episode I - Racer (U)
Internal Name=STAR WARS EP1 RACER
Status=Compatible
Counter Factor=1
Culling=1
Emulate Clear=1
RDRAM Size=8

View File

@ -274,7 +274,7 @@
#527# "Usar TLB"
#528# "Registrar almacenamiento en caché"
#529# "Demorar Interrupción SI"
#530# "Hackeo de SP"
#530# "SP Rápido"
#531# "Predeterminado"
#532# "Señal de Audio RSP"
#533# "Tiempo de Audio Fijo"

View File

@ -305,7 +305,7 @@ enum LanguageStringID{
ROM_USE_TLB = 527,
ROM_REG_CACHE = 528,
ROM_DELAY_SI = 529,
ROM_SP_HACK = 530,
ROM_FAST_SP = 530,
ROM_DEFAULT = 531,
ROM_AUDIO_SIGNAL = 532,
ROM_FIXED_AUDIO = 533,