Menu
▾
▴
vba-commit — CVS commits for VBA
You can subscribe to this list here.
| 2004 |
Jan
(17) |
Feb
(38) |
Mar
(24) |
Apr
(18) |
May
(75) |
Jun
(2) |
Jul
|
Aug
|
Sep
(21) |
Oct
(3) |
Nov
(19) |
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(15) |
Jul
(2) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
|
Mar
|
Apr
(6) |
May
(73) |
Jun
(57) |
Jul
(12) |
Aug
(68) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
1
(1) |
2
|
3
|
4
|
5
(8) |
6
(2) |
|
7
|
8
|
9
(2) |
10
(1) |
11
|
12
|
13
|
|
14
(3) |
15
|
16
|
17
|
18
(1) |
19
(1) |
20
|
|
21
|
22
|
23
|
24
|
25
|
26
|
27
|
|
28
|
29
|
30
|
|
|
|
|
|
From: Pokemonhacker <pok...@us...> - 2004-11-19 01:08:47
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5619 Modified Files: arm-new.h thumb.h Log Message: - fixed some instruction having incorrect cycles (caused SDL debugger to skip several instructions) Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** arm-new.h 9 Nov 2004 16:07:51 -0000 1.13 --- arm-new.h 19 Nov 2004 01:08:32 -0000 1.14 *************** *** 1114,1117 **** --- 1114,1118 ---- u32 value;\ \ + clockTicks++;\ if(shift) {\ LOGICAL_LSL_REG\ *************** *** 1151,1154 **** --- 1152,1156 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_LSR_REG\ *************** *** 1190,1193 **** --- 1192,1196 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ASR_REG\ *************** *** 1234,1237 **** --- 1237,1241 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ROR_REG\ *************** *** 1265,1269 **** {\ /* OP Rd,Rb,Rm LSL Rs */\ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 1269,1273 ---- {\ /* OP Rd,Rb,Rm LSL Rs */\ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 1310,1314 **** {\ /* OP Rd,Rb,Rm LSR Rs */ \ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 1314,1318 ---- {\ /* OP Rd,Rb,Rm LSR Rs */ \ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 1355,1359 **** {\ /* OP Rd,Rb,Rm ASR Rs */ \ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 1359,1363 ---- {\ /* OP Rd,Rb,Rm ASR Rs */ \ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 1402,1406 **** {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 1406,1410 ---- {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 1465,1468 **** --- 1469,1473 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ROR_IMM\ *************** *** 1503,1506 **** --- 1508,1512 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ \ if(shift) {\ *************** *** 1540,1543 **** --- 1546,1550 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_LSR_REG\ *************** *** 1578,1581 **** --- 1585,1589 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ASR_REG\ *************** *** 1621,1624 **** --- 1629,1633 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ROR_REG\ *************** *** 1652,1656 **** {\ /* OP Rd,Rb,Rm LSL Rs */\ ! clockTicks++;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ --- 1661,1665 ---- {\ /* OP Rd,Rb,Rm LSL Rs */\ ! clockTicks+=2;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ *************** *** 1696,1700 **** {\ /* OP Rd,Rb,Rm LSR Rs */ \ ! clockTicks++;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ --- 1705,1709 ---- {\ /* OP Rd,Rb,Rm LSR Rs */ \ ! clockTicks+=2;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ *************** *** 1740,1744 **** {\ /* OP Rd,Rb,Rm ASR Rs */ \ ! clockTicks++;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ --- 1749,1753 ---- {\ /* OP Rd,Rb,Rm ASR Rs */ \ ! clockTicks+=2;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ *************** *** 1786,1790 **** {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks++;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ --- 1795,1799 ---- {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks+=2;\ int shift = reg[(opcode >> 8)&15].B.B0;\ int dest = (opcode>>12) & 15;\ *************** *** 1847,1850 **** --- 1856,1860 ---- bool C_OUT = C_FLAG;\ u32 value;\ + clockTicks++;\ if(shift) {\ LOGICAL_ROR_IMM\ *************** *** 1885,1888 **** --- 1895,1899 ---- int dest = (opcode>>12) & 15;\ u32 value;\ + clockTicks++;\ if(shift) {\ ARITHMETIC_LSL_REG\ *************** *** 1921,1924 **** --- 1932,1936 ---- int dest = (opcode>>12) & 15;\ u32 value;\ + clockTicks++;\ if(shift) {\ ARITHMETIC_LSR_REG\ *************** *** 1957,1960 **** --- 1969,1973 ---- int dest = (opcode>>12) & 15;\ u32 value;\ + clockTicks++;\ if(shift) {\ ARITHMETIC_ASR_REG\ *************** *** 1995,1998 **** --- 2008,2012 ---- int dest = (opcode>>12) & 15;\ u32 value;\ + clockTicks++;\ if(shift) {\ ARITHMETIC_ROR_REG\ *************** *** 2031,2034 **** --- 2045,2049 ---- int dest = (opcode>>12) & 15;\ u32 value;\ + clockTicks++;\ if(shift) {\ if(shift == 32) {\ *************** *** 2066,2070 **** {\ /* OP Rd,Rb,Rm LSR Rs */\ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 2081,2085 ---- {\ /* OP Rd,Rb,Rm LSR Rs */\ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 2106,2110 **** {\ /* OP Rd,Rb,Rm ASR Rs */\ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 2121,2125 ---- {\ /* OP Rd,Rb,Rm ASR Rs */\ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 2148,2152 **** {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks++;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ --- 2163,2167 ---- {\ /* OP Rd,Rb,Rm ROR Rs */\ ! clockTicks+=2;\ int base = (opcode >> 16) & 0x0F;\ int shift = reg[(opcode >> 8)&15].B.B0;\ *************** *** 2207,2210 **** --- 2222,2226 ---- int dest = (opcode >> 12) & 0x0F;\ u32 value;\ + clockTicks++;\ {\ ARITHMETIC_ROR_IMM\ *************** *** 3199,3202 **** --- 3215,3219 ---- // MRS Rd, CPSR // TODO: check if right instruction.... + clockTicks++; CPUUpdateCPSR(); reg[(opcode >> 12) & 0x0F].I = reg[16].I; *************** *** 3209,3212 **** --- 3226,3230 ---- CPUWriteMemory(address, reg[opcode&15].I); reg[(opcode >> 12) & 15].I = temp; + clockTicks++; } break; *************** *** 3232,3235 **** --- 3250,3254 ---- reg[16].I = newValue; CPUUpdateFlags(); + clockTicks++; if(!armState) { // this should not be allowed, but it seems to work THUMB_PREFETCH; *************** *** 3263,3266 **** --- 3282,3286 ---- // TODO: check if right instruction... reg[(opcode >> 12) & 0x0F].I = reg[17].I; + clockTicks++; break; case 0x149: *************** *** 3271,3274 **** --- 3291,3295 ---- CPUWriteByte(address, reg[opcode&15].B.B0); reg[(opcode>>12)&15].I = temp; + clockTicks++; } break; *************** *** 3288,3291 **** --- 3309,3313 ---- reg[17].I = (reg[17].I & 0x00FFFFFF) | (value & 0xFF000000); } + clockTicks++; } break; *************** *** 3352,3355 **** --- 3374,3378 ---- reg[15].I = armNextPC + 2; } + clockTicks++; } break; *************** *** 3387,3390 **** --- 3410,3414 ---- reg[17].I = (reg[17].I & 0x00FFFFFF) | (value & 0xFF000000); } + clockTicks++; } break; Index: thumb.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/thumb.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** thumb.h 15 Sep 2004 22:12:52 -0000 1.12 --- thumb.h 19 Nov 2004 01:08:32 -0000 1.13 *************** *** 2273,2277 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2273,2277 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2283,2287 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2283,2287 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2293,2297 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2293,2297 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2303,2307 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2303,2307 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2313,2317 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2313,2317 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2323,2327 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2323,2327 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2333,2337 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2333,2337 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2343,2347 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2343,2347 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2353,2357 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2353,2357 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2363,2367 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2363,2367 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2373,2377 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2373,2377 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2383,2387 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2383,2387 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2393,2397 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2393,2397 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; *************** *** 2403,2407 **** reg[15].I += 2; THUMB_PREFETCH; ! clockTicks = 3; } break; --- 2403,2407 ---- reg[15].I += 2; THUMB_PREFETCH; ! clockTicks += 2; } break; |
|
From: Pokemonhacker <pok...@us...> - 2004-11-18 01:18:45
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19071 Modified Files: bios.cpp Log Message: - fix BIOS ArcTan and ArcTan2 emulation (several bugs) Index: bios.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/bios.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** bios.cpp 9 Nov 2004 16:07:51 -0000 1.14 --- bios.cpp 18 Nov 2004 01:18:36 -0000 1.15 *************** *** 71,75 **** #endif ! s32 a = -((s32)(reg[0].I * reg[0].I)) >> 14; s32 b = ((0xA9 * a) >> 14) + 0x390; b = ((b * a) >> 14) + 0x91C; --- 71,75 ---- #endif ! s32 a = -(((s32)(reg[0].I*reg[0].I)) >> 14); s32 b = ((0xA9 * a) >> 14) + 0x390; b = ((b * a) >> 14) + 0x91C; *************** *** 79,83 **** b = ((b * a) >> 14) + 0x3651; b = ((b * a) >> 14) + 0xA2F9; ! reg[0].I = (reg[0].I * b) >> 16; #ifdef DEV_VERSION --- 79,84 ---- b = ((b * a) >> 14) + 0x3651; b = ((b * a) >> 14) + 0xA2F9; ! a = ((s32)reg[0].I * b) >> 16; ! reg[0].I = a; #ifdef DEV_VERSION *************** *** 102,113 **** s16 x = reg[0].I; s16 y = reg[1].I; ! if (y == 0) { ! reg[0].I = 0x8000 & x; ! reg[3].I = 0x170; } else { if (x == 0) { ! reg[0].I = (0x8000 & y) + 0x4000; ! reg[3].I = 0x170; } else { if (abs(x) > abs(y)) { --- 103,112 ---- s16 x = reg[0].I; s16 y = reg[1].I; ! s16 res = 0; if (y == 0) { ! res = 0x8000 & x; } else { if (x == 0) { ! res = (0x8000 & y) + 0x4000; } else { if (abs(x) > abs(y)) { *************** *** 117,133 **** BIOS_ArcTan(); if (x < 0) ! reg[0].I = 0x8000 + reg[0].I; else ! reg[0].I = ((y & 0x8000) << 1 ) + reg[0].I; ! reg[3].I = 0x170; } else { reg[0].I = x << 14; BIOS_Div(); BIOS_ArcTan(); ! reg[0].I = (0x4000 + (y & 0x8000)) - reg[0].I; ! reg[3].I = 0x170; } } } #ifdef DEV_VERSION --- 116,131 ---- BIOS_ArcTan(); if (x < 0) ! res = 0x8000 + reg[0].I; else ! res = ((y & 0x8000) << 1 ) + reg[0].I; } else { reg[0].I = x << 14; BIOS_Div(); BIOS_ArcTan(); ! res = (0x4000 + (y & 0x8000)) - reg[0].I; } } } + reg[0].I = ((u32)res) & 0xffff; #ifdef DEV_VERSION |
|
From: Pokemonhacker <pok...@us...> - 2004-11-14 18:54:51
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30443 Modified Files: MainWndFile.cpp Log Message: - fixed battery saving bug when save type equals Flash or Sram - initialize sram and flash memory to 0xff instead of 0x00 - clean flash/sram on load/reload - fixed a compilation warning Index: MainWndFile.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndFile.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MainWndFile.cpp 15 Sep 2004 22:11:20 -0000 1.8 --- MainWndFile.cpp 14 Nov 2004 18:54:40 -0000 1.9 *************** *** 729,733 **** CFileStatus status; CString str; ! unsigned long time = -1; int found = 0; --- 729,733 ---- CFileStatus status; CString str; ! unsigned long time = (unsigned long)-1; int found = 0; |
|
From: Pokemonhacker <pok...@us...> - 2004-11-14 18:54:28
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30268 Modified Files: Flash.cpp Flash.h GBA.cpp Sram.cpp Sram.h Log Message: - fixed battery saving bug when save type equals Flash or Sram - initialize sram and flash memory to 0xff instead of 0x00 - clean flash/sram on load/reload - fixed a compilation warning Index: Sram.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sram.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Sram.cpp 13 May 2004 15:06:44 -0000 1.3 --- Sram.cpp 14 Nov 2004 18:54:14 -0000 1.4 *************** *** 18,21 **** --- 18,22 ---- #include "GBA.h" + #include "Globals.h" #include "Flash.h" #include "Sram.h" *************** *** 25,28 **** --- 26,35 ---- return flashSaveMemory[address & 0xFFFF]; } + void sramDelayedWrite(u32 address, u8 byte) + { + saveType = 1; + cpuSaveGameFunc = sramWrite; + sramWrite(address, byte); + } void sramWrite(u32 address, u8 byte) Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** GBA.cpp 15 Sep 2004 22:12:52 -0000 1.57 --- GBA.cpp 14 Nov 2004 18:54:14 -0000 1.58 *************** *** 1400,1403 **** --- 1400,1405 ---- } + flashInit(); + CPUUpdateRenderBuffers(true); *************** *** 3297,3300 **** --- 3299,3303 ---- cpuEEPROMEnabled = true; cpuEEPROMSensorEnabled = false; + // EEPROM usage is automatically detected break; case 2: // SRAM *************** *** 3303,3307 **** cpuEEPROMEnabled = false; cpuEEPROMSensorEnabled = false; ! cpuSaveGameFunc = sramWrite; break; case 3: // FLASH --- 3306,3310 ---- cpuEEPROMEnabled = false; cpuEEPROMSensorEnabled = false; ! cpuSaveGameFunc = sramDelayedWrite; // to insure we detect the write break; case 3: // FLASH *************** *** 3310,3314 **** cpuEEPROMEnabled = false; cpuEEPROMSensorEnabled = false; ! cpuSaveGameFunc = flashWrite; break; case 4: // EEPROM+Sensor --- 3313,3317 ---- cpuEEPROMEnabled = false; cpuEEPROMSensorEnabled = false; ! cpuSaveGameFunc = flashDelayedWrite; // to insure we detect the write break; case 4: // EEPROM+Sensor *************** *** 3317,3320 **** --- 3320,3324 ---- cpuEEPROMEnabled = true; cpuEEPROMSensorEnabled = true; + // EEPROM usage is automatically detected break; case 5: // NONE *************** *** 3323,3326 **** --- 3327,3331 ---- cpuEEPROMEnabled = false; cpuEEPROMSensorEnabled = false; + // no save at all break; } Index: Flash.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Flash.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Flash.h 13 May 2004 15:06:43 -0000 1.3 --- Flash.h 14 Nov 2004 18:54:14 -0000 1.4 *************** *** 25,32 **** --- 25,34 ---- extern u8 flashRead(u32 address); extern void flashWrite(u32 address, u8 byte); + extern void flashDelayedWrite(u32 address, u8 byte); extern u8 flashSaveMemory[0x20000]; extern void flashSaveDecide(u32 address, u8 byte); extern void flashReset(); extern void flashSetSize(int size); + extern void flashInit(); extern int flashSize; Index: Sram.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sram.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Sram.h 13 May 2004 15:06:44 -0000 1.2 --- Sram.h 14 Nov 2004 18:54:14 -0000 1.3 *************** *** 23,26 **** --- 23,27 ---- extern u8 sramRead(u32 address); extern void sramWrite(u32 address, u8 byte); + extern void sramDelayedWrite(u32 address, u8 byte); #endif // VBA_SRAM_H Index: Flash.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Flash.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Flash.cpp 13 May 2004 15:06:43 -0000 1.7 --- Flash.cpp 14 Nov 2004 18:54:02 -0000 1.8 *************** *** 68,71 **** --- 68,76 ---- }; + void flashInit() + { + memset(flashSaveMemory, 0xff, sizeof(flashSaveMemory)); + } + void flashReset() { *************** *** 147,150 **** --- 152,162 ---- } + void flashDelayedWrite(u32 address, u8 byte) + { + saveType = 2; + cpuSaveGameFunc = flashWrite; + flashWrite(address, byte); + } + void flashWrite(u32 address, u8 byte) { |
|
From: Pokemonhacker <pok...@us...> - 2004-11-14 18:53:02
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30004 Modified Files: Gfx.h Log Message: - fixed OBJWIN rendering bug when sprite wraps around (Tracker #1065447) Index: Gfx.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Gfx.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Gfx.h 13 May 2004 15:06:44 -0000 1.13 --- Gfx.h 14 Nov 2004 18:52:52 -0000 1.14 *************** *** 1254,1258 **** if(xxx < 0 || xxx >= sizeX || ! yyy < 0 || yyy >= sizeY) { } else { u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) --- 1254,1259 ---- if(xxx < 0 || xxx >= sizeX || ! yyy < 0 || yyy >= sizeY || ! sx >= 240) { } else { u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) *************** *** 1285,1289 **** // } else { if(xxx < 0 || xxx >= sizeX || ! yyy < 0 || yyy >= sizeY){ } else { u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) --- 1286,1291 ---- // } else { if(xxx < 0 || xxx >= sizeX || ! yyy < 0 || yyy >= sizeY || ! sx >= 240){ } else { u32 color = vram[0x10000 + ((((c + (yyy>>3) * inc)<<5) |
|
From: Pokemonhacker <pok...@us...> - 2004-11-10 22:15:05
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13810 Modified Files: Cheats.cpp Log Message: - Corrected a bug in CBA Type 5 code. Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Cheats.cpp 9 Nov 2004 16:11:37 -0000 1.23 --- Cheats.cpp 10 Nov 2004 22:14:56 -0000 1.24 *************** *** 760,764 **** case CBA_SUPER: { ! int count = 2*((cheatsList[i].value -1) & 0xFFFF); u32 address = cheatsList[i].address; for(int x = 0; x <= count; x++) { --- 760,764 ---- case CBA_SUPER: { ! int count = 2*((cheatsList[i].value -1) & 0xFFFF)+1; u32 address = cheatsList[i].address; for(int x = 0; x <= count; x++) { |
|
From: Pokemonhacker <pok...@us...> - 2004-11-09 16:11:47
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1669 Modified Files: Cheats.cpp Log Message: - added full CBA support (tested and verified for every CBA code type). Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Cheats.cpp 1 Nov 2004 14:52:00 -0000 1.22 --- Cheats.cpp 9 Nov 2004 16:11:37 -0000 1.23 *************** *** 57,61 **** * 4AAAAAAA YYYY - Slide code * XXXXCCCC IIII (C is count and I is address increment, X is value incr.) ! * 5AAAAAAA CCCC - Super code (Write bytes to address, CCCC is count) * BBBBBBBB BBBB * 6AAAAAAA YYYY - 16-bit and --- 57,61 ---- * 4AAAAAAA YYYY - Slide code * XXXXCCCC IIII (C is count and I is address increment, X is value incr.) ! * 5AAAAAAA CCCC - Super code (Write bytes to address, 2*CCCC is count) * BBBBBBBB BBBB [...1415 lines suppressed...] case 0x0e: ! cheatsAdd(code, desc, address & 0x0FFFFFFF, value & 0x8000 ? value | 0xFFFF0000 : value, 512, CBA_ADD); break; + case 0x0f: + cheatsAdd(code, desc, address & 0x0FFFFFFE, value, 512, + GSA_16_BIT_IF_AND); + break; default: // unsupported code *************** *** 2441,2443 **** #endif #endif ! } --- 2443,2445 ---- #endif #endif ! } \ No newline at end of file |
|
From: Pokemonhacker <pok...@us...> - 2004-11-09 16:08:00
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv994 Modified Files: arm-new.h bios.cpp Log Message: - fix prefetch emulation when MSR changes T bit (not recommended by ARM docs) - fix BIOS HuffUnComp emulation fix (off by one byte) Index: bios.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/bios.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bios.cpp 15 Sep 2004 22:12:52 -0000 1.13 --- bios.cpp 9 Nov 2004 16:07:51 -0000 1.14 *************** *** 549,553 **** u32 treeStart = source; ! source += (treeSize+1)<<1; int len = header >> 8; --- 549,553 ---- u32 treeStart = source; ! source += ((treeSize+1)<<1)-1; // minus because we already skipped one byte int len = header >> 8; Index: arm-new.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/arm-new.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** arm-new.h 15 Sep 2004 22:12:52 -0000 1.12 --- arm-new.h 9 Nov 2004 16:07:51 -0000 1.13 *************** *** 3232,3235 **** --- 3232,3239 ---- reg[16].I = newValue; CPUUpdateFlags(); + if(!armState) { // this should not be allowed, but it seems to work + THUMB_PREFETCH; + reg[15].I = armNextPC + 2; + } } break; *************** *** 3344,3347 **** --- 3348,3355 ---- reg[16].I = newValue; CPUUpdateFlags(); + if(!armState) { // this should not be allowed, but it seems to work + THUMB_PREFETCH; + reg[15].I = armNextPC + 2; + } } break; |
|
From: Pokemonhacker <pok...@us...> - 2004-11-06 14:20:05
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20945 Added Files: GameOverrides.h Log Message: Dialog to provide game override settings related to vba-over.ini --- NEW FILE: GameOverrides.h --- #if !defined(AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_) #define AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_ #if _MSC_VER > 1000 #pragma once #endif // _MSC_VER > 1000 // GameOverrides.h : header file // ///////////////////////////////////////////////////////////////////////////// // GameOverrides dialog class GameOverrides : public CDialog { // Construction public: GameOverrides(CWnd* pParent = NULL); // standard constructor // Dialog Data //{{AFX_DATA(GameOverrides) enum { IDD = IDD_GAME_OVERRIDES }; CEdit m_name; CComboBox m_flashSize; CComboBox m_saveType; CComboBox m_rtc; //}}AFX_DATA // Overrides // ClassWizard generated virtual function overrides //{{AFX_VIRTUAL(GameOverrides) protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support //}}AFX_VIRTUAL // Implementation protected: // Generated message map functions //{{AFX_MSG(GameOverrides) virtual void OnOK(); afx_msg void OnDefaults(); virtual void OnCancel(); virtual BOOL OnInitDialog(); //}}AFX_MSG DECLARE_MESSAGE_MAP() }; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. #endif // !defined(AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_) |
|
From: Pokemonhacker <pok...@us...> - 2004-11-06 14:19:49
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20898 Added Files: GameOverrides.cpp Log Message: Dialog to provide game override settings related to vba-over.ini --- NEW FILE: GameOverrides.cpp --- // GameOverrides.cpp : implementation file // #include "stdafx.h" #include "vba.h" #include "GameOverrides.h" #include "../GBA.h" #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE static char THIS_FILE[] = __FILE__; #endif ///////////////////////////////////////////////////////////////////////////// // GameOverrides dialog GameOverrides::GameOverrides(CWnd* pParent /*=NULL*/) : CDialog(GameOverrides::IDD, pParent) { //{{AFX_DATA_INIT(GameOverrides) // NOTE: the ClassWizard will add member initialization here //}}AFX_DATA_INIT } void GameOverrides::DoDataExchange(CDataExchange* pDX) { CDialog::DoDataExchange(pDX); //{{AFX_DATA_MAP(GameOverrides) DDX_Control(pDX, IDC_NAME, m_name); DDX_Control(pDX, IDC_FLASH_SIZE, m_flashSize); DDX_Control(pDX, IDC_SAVE_TYPE, m_saveType); DDX_Control(pDX, IDC_RTC, m_rtc); //}}AFX_DATA_MAP } BEGIN_MESSAGE_MAP(GameOverrides, CDialog) //{{AFX_MSG_MAP(GameOverrides) ON_BN_CLICKED(IDC_DEFAULTS, OnDefaults) //}}AFX_MSG_MAP END_MESSAGE_MAP() ///////////////////////////////////////////////////////////////////////////// // GameOverrides message handlers void GameOverrides::OnOK() { char tempName[2048]; GetModuleFileName(NULL, tempName, 2048); char *p = strrchr(tempName, '\\'); if(p) *p = 0; char buffer[5]; strncpy(buffer, (const char *)&rom[0xac], 4); buffer[4] = 0; strcat(tempName, "\\vba-over.ini"); int rtc = m_rtc.GetCurSel(); int flash = m_flashSize.GetCurSel(); int save = m_saveType.GetCurSel(); if(rtc == 0 && flash == 0 && save == 0) WritePrivateProfileString(buffer, NULL, NULL, tempName); else { char *value = NULL; switch(rtc) { case 1: value = "0"; break; case 2: value = "1"; break; } WritePrivateProfileString(buffer, "rtcEnabled", value, tempName); value = NULL; switch(flash) { case 1: value = "0x10000"; break; case 2: value = "0x20000"; break; } WritePrivateProfileString(buffer, "flashSize", value, tempName); value = NULL; switch(save) { case 1: value = "0"; break; case 2: value = "1"; break; case 3: value = "2"; break; case 4: value = "3"; break; case 5: value = "4"; break; case 6: value = "5"; break; } WritePrivateProfileString(buffer, "saveType", value, tempName); } CDialog::OnOK(); } void GameOverrides::OnDefaults() { m_rtc.SetCurSel(0); m_flashSize.SetCurSel(0); m_saveType.SetCurSel(0); } void GameOverrides::OnCancel() { CDialog::OnCancel(); } BOOL GameOverrides::OnInitDialog() { CDialog::OnInitDialog(); char tempName[2048]; const char *rtcValues[] = { "Default", "Disabled", "Enabled" }; const char *flashValues[] = { "Default", "512k", "1024k" }; const char *saveValues[] = { "Default", "Automatic", "EEPROM", "SRAM", "Flash", "EEPROM+Sensor", "None" }; int i; for(i = 0; i < 3; i++) { m_rtc.AddString(rtcValues[i]); } for(i = 0; i < 3; i++) { m_flashSize.AddString(flashValues[i]); } for(i = 0; i < 7; i++) { m_saveType.AddString(saveValues[i]); } GetModuleFileName(NULL, tempName, 2048); char *p = strrchr(tempName, '\\'); if(p) *p = 0; char buffer[5]; strncpy(buffer, (const char *)&rom[0xac], 4); buffer[4] = 0; strcat(tempName, "\\vba-over.ini"); m_name.SetWindowText(buffer); UINT v = GetPrivateProfileInt(buffer, "rtcEnabled", -1, tempName); switch(v) { case 0: m_rtc.SetCurSel(1); break; case 1: m_rtc.SetCurSel(2); break; default: m_rtc.SetCurSel(0); } v = GetPrivateProfileInt(buffer, "flashSize", -1, tempName); switch(v) { case 0x10000: m_flashSize.SetCurSel(1); break; case 0x20000: m_flashSize.SetCurSel(2); break; default: m_flashSize.SetCurSel(0); } v = GetPrivateProfileInt(buffer, "saveType", -1, tempName); if(v != (UINT)-1 && (v > 5)) v = (UINT)-1; if(v != (UINT)-1) m_saveType.SetCurSel(v+1); else m_saveType.SetCurSel(0); return TRUE; // return TRUE unless you set the focus to a control // EXCEPTION: OCX Property Pages should return FALSE } |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:52:01
|
Update of /cvsroot/vba/VisualBoyAdvance/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30025 Modified Files: GBA.dsp Log Message: Dialog to provide game override settings related to vba-over.ini Index: GBA.dsp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/win32/GBA.dsp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** GBA.dsp 15 Sep 2004 22:13:58 -0000 1.21 --- GBA.dsp 5 Nov 2004 00:51:52 -0000 1.22 *************** *** 561,564 **** --- 561,568 ---- # Begin Source File + SOURCE=..\src\win32\GameOverrides.cpp + # End Source File + # Begin Source File + SOURCE=..\src\win32\GDIDisplay.cpp # End Source File *************** *** 737,740 **** --- 741,748 ---- # Begin Source File + SOURCE=..\src\win32\GameOverrides.h + # End Source File + # Begin Source File + SOURCE=..\src\gb\GB.h # End Source File |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:51:24
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29856 Modified Files: vba.rc Log Message: Dialog to provide game override settings related to vba-over.ini Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** vba.rc 15 May 2004 14:07:51 -0000 1.47 --- vba.rc 5 Nov 2004 00:51:14 -0000 1.48 *************** *** 1202,1205 **** --- 1202,1226 ---- END + IDD_GAME_OVERRIDES DIALOG DISCARDABLE 0, 0, 271, 118 + STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU + CAPTION "Game overrides" + FONT 8, "MS Sans Serif" + BEGIN + COMBOBOX IDC_RTC,152,35,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP + COMBOBOX IDC_SAVE_TYPE,152,55,112,12,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FLASH_SIZE,152,76,112,12,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK",IDOK,7,97,50,14 + PUSHBUTTON "Defaults",IDC_DEFAULTS,110,97,50,14 + PUSHBUTTON "Cancel",IDCANCEL,213,97,50,14 + LTEXT "Overrides for game:",IDC_STATIC,7,17,140,8 + EDITTEXT IDC_NAME,152,15,112,14,ES_AUTOHSCROLL | WS_DISABLED + LTEXT "Real Time Clock:",IDC_STATIC,7,37,140,8 + LTEXT "Save Type:",IDC_STATIC,7,57,140,8 + LTEXT "Flash Size:",IDC_STATIC,7,77,140,8 + END + ///////////////////////////////////////////////////////////////////////////// *************** *** 1543,1546 **** --- 1564,1575 ---- BOTTOMMARGIN, 179 END + + IDD_GAME_OVERRIDES, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 264 + TOPMARGIN, 7 + BOTTOMMARGIN, 111 + END END #endif // APSTUDIO_INVOKED *************** *** 1783,1786 **** --- 1812,1817 ---- MENUITEM "Rewind interval...", ID_OPTIONS_EMULATOR_REWINDINTERVAL + MENUITEM "&Game Overrides...", ID_OPTIONS_EMULATOR_GAMEOVERRIDES + POPUP "Show speed" BEGIN |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:51:06
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29727 Modified Files: VBA.clw Log Message: Dialog to provide game override settings related to vba-over.ini Index: VBA.clw =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.clw,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VBA.clw 25 Jan 2004 13:38:58 -0000 1.4 --- VBA.clw 5 Nov 2004 00:50:55 -0000 1.5 *************** *** 3,7 **** [General Info] Version=1 ! LastClass=Hyperlink LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" --- 3,7 ---- [General Info] Version=1 ! LastClass=MainWnd LastTemplate=CDialog NewFileInclude1=#include "stdafx.h" *************** *** 9,13 **** LastPage=0 ! ClassCount=57 Class1=AboutDialog Class2=Associate --- 9,13 ---- LastPage=0 ! ClassCount=58 Class1=AboutDialog Class2=Associate *************** *** 40,85 **** Class29=VideoDriverSelect ! ResourceCount=44 ! Resource1=IDD_MAX_SCALE ! Resource2=IDD_GDB_WAITING ! Resource3=IDD_GB_CHEAT_LIST ! Resource4=IDD_CONFIG ! Resource5=IDD_ADD_CHEAT_DLG ! Resource6=IDD_GB_OAM_VIEW ! Resource7=IDD_GB_ROM_INFO ! Resource8=IDD_OPENDLG Resource9=IDD_MAP_VIEW ! Resource10=IDD_ABOUT ! Resource11=IDD_CHEAT_LIST ! Resource12=IDD_OAM_VIEW ! Resource13=IDD_CODE_SELECT ! Resource14=IDD_CHEATS ! Resource15=IDD_GBA_ROM_INFO ! Resource16=IDD_IO_VIEWER ! Resource17=IDD_MEM_VIEWER ! Resource18=IDD_ADDR_SIZE ! Resource19=IDR_MENU ! Resource20=IDD_PALETTE_VIEW ! Resource21=IDD_ASSOCIATIONS ! Resource22=IDD_GB_COLORS ! Resource23=IDD_ADD_CHEAT ! Resource24=IDD_DISASSEMBLE ! Resource25=IDD_MODES ! Resource26=IDD_GDB_PORT ! Resource27=IDD_LANG_SELECT ! Resource28=IDD_LOGGING ! Resource29=IDD_DRIVERS ! Resource30=IDD_EXPORT_SPS ! Resource31=IDD_THROTTLE ! Resource32=IDD_MODE_CONFIRM ! Resource33=IDD_GB_DISASSEMBLE ! Resource34=IDD_GB_PALETTE_VIEW ! Resource35=IDD_REWIND_INTERVAL ! Resource36=IDD_GB_TILE_VIEWER ! Resource37=IDD_ACCEL_EDITOR ! Resource38=IDD_GB_MAP_VIEW ! Resource39=IDD_BUG_REPORT ! Resource40=IDD_MOTION_CONFIG ! Resource41=IDD_TILE_VIEWER Class30=AddGSACode Class31=GBCheatList --- 40,85 ---- Class29=VideoDriverSelect ! ResourceCount=45 ! Resource1=IDD_GB_DISASSEMBLE ! Resource2=IDD_OAM_VIEW ! Resource3=IDD_CHEAT_LIST ! Resource4=IDD_ABOUT ! Resource5=IDD_ADD_CHEAT ! Resource6=IDD_EXPORT_SPS ! Resource7=IDD_CONFIG ! Resource8=IDD_GB_PALETTE_VIEW Resource9=IDD_MAP_VIEW ! Resource10=IDD_GB_MAP_VIEW ! Resource11=IDD_OPENDLG ! Resource12=IDD_MOTION_CONFIG ! Resource13=IDD_ASSOCIATIONS ! Resource14=IDD_MAX_SCALE ! Resource15=IDD_CHEATS ! Resource16=IDD_GB_OAM_VIEW ! Resource17=IDD_GB_ROM_INFO ! Resource18=IDD_GB_COLORS ! Resource19=IDD_IO_VIEWER ! Resource20=IDD_ADD_CHEAT_DLG ! Resource21=IDR_MENU ! Resource22=IDD_LANG_SELECT ! Resource23=IDD_BUG_REPORT ! Resource24=IDD_PALETTE_VIEW ! Resource25=IDD_DISASSEMBLE ! Resource26=IDD_MEM_VIEWER ! Resource27=IDD_GBA_ROM_INFO ! Resource28=IDD_ACCEL_EDITOR ! Resource29=IDD_GDB_PORT ! Resource30=IDD_TILE_VIEWER ! Resource31=IDD_GDB_WAITING ! Resource32=IDD_MODES ! Resource33=IDD_LOGGING ! Resource34=IDD_DRIVERS ! Resource35=IDD_GB_TILE_VIEWER ! Resource36=IDD_ADDR_SIZE ! Resource37=IDD_GB_PRINTER ! Resource38=IDD_THROTTLE ! Resource39=IDD_MODE_CONFIRM ! Resource40=IDD_GB_CHEAT_LIST ! Resource41=IDD_CODE_SELECT Class30=AddGSACode Class31=GBCheatList *************** *** 108,116 **** Class54=AccelEditor Class55=CKeyboardEdit ! Resource42=IDD_DIRECTORIES Class56=MaxScale ! Resource43=IDD_GB_PRINTER Class57=BugReport ! Resource44=IDR_ACCELERATOR [CLS:AboutDialog] --- 108,118 ---- Class54=AccelEditor Class55=CKeyboardEdit ! Resource42=IDD_REWIND_INTERVAL Class56=MaxScale ! Resource43=IDD_DIRECTORIES Class57=BugReport ! Resource44=IDD_GAME_OVERRIDES ! Class58=GameOverrides ! Resource45=IDR_ACCELERATOR [CLS:AboutDialog] *************** *** 240,244 **** HeaderFile=MainWnd.h ImplementationFile=MainWnd.cpp ! LastObject=ID_CHEATS_AUTOMATICSAVELOADCHEATS Filter=W VirtualFilter=WC --- 242,246 ---- HeaderFile=MainWnd.h ImplementationFile=MainWnd.cpp ! LastObject=ID_OPTIONS_EMULATOR_GAMEOVERRIDES Filter=W VirtualFilter=WC *************** *** 697,713 **** Control5=IDC_BG2,button,1342177289 Control6=IDC_BG3,button,1342177289 ! Control7=IDC_STRETCH,button,1342242819 ! Control8=IDC_REFRESH,button,1342373888 ! Control9=IDC_SAVE,button,1342373888 ! Control10=IDC_CLOSE,button,1342242816 ! Control11=IDC_MAP_VIEW,VbaBitmapControl,1342373888 ! Control12=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 ! Control13=IDC_COLOR,VbaColorControl,1342242816 ! Control14=IDC_R,static,1342308352 ! Control15=IDC_G,static,1342308352 ! Control16=IDC_B,static,1342308352 ! Control17=IDC_STATIC,button,1342177287 Control18=IDC_STATIC,button,1342177287 ! Control19=IDC_AUTO_UPDATE,button,1342242819 Control20=IDC_XY,static,1342308352 Control21=IDC_STATIC,static,1342308352 --- 699,715 ---- Control5=IDC_BG2,button,1342177289 Control6=IDC_BG3,button,1342177289 ! Control7=IDC_STRETCH,button,1342373891 ! Control8=IDC_AUTO_UPDATE,button,1342373891 ! Control9=IDC_REFRESH,button,1342373888 ! Control10=IDC_SAVE,button,1342373888 ! Control11=IDC_CLOSE,button,1342242816 ! Control12=IDC_MAP_VIEW,VbaBitmapControl,1342373888 ! Control13=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 ! Control14=IDC_COLOR,VbaColorControl,1342242816 ! Control15=IDC_R,static,1342308352 ! Control16=IDC_G,static,1342308352 ! Control17=IDC_B,static,1342308352 Control18=IDC_STATIC,button,1342177287 ! Control19=IDC_STATIC,button,1342177287 Control20=IDC_XY,static,1342308352 Control21=IDC_STATIC,static,1342308352 *************** *** 875,884 **** Control3=IDC_THUMB,button,1342177289 Control4=IDC_ADDRESS,edit,1350762632 ! Control5=IDC_GO,button,1342242816 Control6=IDC_DISASSEMBLE,listbox,1350631683 Control7=IDC_AUTO_UPDATE,button,1342242819 Control8=IDC_REFRESH,button,1342242816 Control9=IDC_NEXT,button,1342242816 ! Control10=IDC_CLOSE,button,1342242817 Control11=IDC_STATIC,static,1342308352 Control12=IDC_STATIC,static,1342308352 --- 877,886 ---- Control3=IDC_THUMB,button,1342177289 Control4=IDC_ADDRESS,edit,1350762632 ! Control5=IDC_GO,button,1342242817 Control6=IDC_DISASSEMBLE,listbox,1350631683 Control7=IDC_AUTO_UPDATE,button,1342242819 Control8=IDC_REFRESH,button,1342242816 Control9=IDC_NEXT,button,1342242816 ! Control10=IDC_CLOSE,button,1342242816 Control11=IDC_STATIC,static,1342308352 Control12=IDC_STATIC,static,1342308352 *************** *** 980,989 **** ControlCount=27 Control1=IDC_ADDRESS,edit,1350762632 ! Control2=IDC_GO,button,1342242816 Control3=IDC_DISASSEMBLE,listbox,1350631683 Control4=IDC_AUTO_UPDATE,button,1342242819 Control5=IDC_REFRESH,button,1342242816 Control6=IDC_NEXT,button,1342242816 ! Control7=IDC_CLOSE,button,1342242817 Control8=IDC_STATIC,static,1342308352 Control9=IDC_STATIC,static,1342308352 --- 982,991 ---- ControlCount=27 Control1=IDC_ADDRESS,edit,1350762632 ! Control2=IDC_GO,button,1342242817 Control3=IDC_DISASSEMBLE,listbox,1350631683 Control4=IDC_AUTO_UPDATE,button,1342242819 Control5=IDC_REFRESH,button,1342242816 Control6=IDC_NEXT,button,1342242816 ! Control7=IDC_CLOSE,button,1342242816 Control8=IDC_STATIC,static,1342308352 Control9=IDC_STATIC,static,1342308352 *************** *** 1264,1390 **** Command105=ID_OPTIONS_EMULATOR_AUTOHIDEMENU Command106=ID_OPTIONS_EMULATOR_REWINDINTERVAL ! Command107=ID_OPTIONS_EMULATOR_SHOWSPEED_NONE ! Command108=ID_OPTIONS_EMULATOR_SHOWSPEED_PERCENTAGE ! Command109=ID_OPTIONS_EMULATOR_SHOWSPEED_DETAILED ! Command110=ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT ! Command111=ID_OPTIONS_EMULATOR_SAVETYPE_AUTOMATIC ! Command112=ID_OPTIONS_EMULATOR_SAVETYPE_EEPROM ! Command113=ID_OPTIONS_EMULATOR_SAVETYPE_SRAM ! Command114=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH ! Command115=ID_OPTIONS_EMULATOR_SAVETYPE_EEPROMSENSOR ! Command116=ID_OPTIONS_EMULATOR_SAVETYPE_NONE ! Command117=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH512K ! Command118=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH1M ! Command119=ID_OPTIONS_EMULATOR_SAVETYPE_ENHANCEDDETECTION ! Command120=ID_OPTIONS_EMULATOR_USEBIOSFILE ! Command121=ID_OPTIONS_EMULATOR_SKIPBIOS ! Command122=ID_OPTIONS_EMULATOR_SELECTBIOSFILE ! Command123=ID_OPTIONS_EMULATOR_PNGFORMAT ! Command124=ID_OPTIONS_EMULATOR_BMPFORMAT ! Command125=ID_OPTIONS_SOUND_OFF ! Command126=ID_OPTIONS_SOUND_MUTE ! Command127=ID_OPTIONS_SOUND_ON ! Command128=ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION ! Command129=ID_OPTIONS_SOUND_ECHO ! Command130=ID_OPTIONS_SOUND_LOWPASSFILTER ! Command131=ID_OPTIONS_SOUND_REVERSESTEREO ! Command132=ID_OPTIONS_SOUND_CHANNEL1 ! Command133=ID_OPTIONS_SOUND_CHANNEL2 ! Command134=ID_OPTIONS_SOUND_CHANNEL3 ! Command135=ID_OPTIONS_SOUND_CHANNEL4 ! Command136=ID_OPTIONS_SOUND_DIRECTSOUNDA ! Command137=ID_OPTIONS_SOUND_DIRECTSOUNDB ! Command138=ID_OPTIONS_SOUND_11KHZ ! Command139=ID_OPTIONS_SOUND_22KHZ ! Command140=ID_OPTIONS_SOUND_44KHZ ! Command141=ID_OPTIONS_SOUND_VOLUME_25X ! Command142=ID_OPTIONS_SOUND_VOLUME_5X ! Command143=ID_OPTIONS_SOUND_VOLUME_1X ! Command144=ID_OPTIONS_SOUND_VOLUME_2X ! Command145=ID_OPTIONS_SOUND_VOLUME_3X ! Command146=ID_OPTIONS_SOUND_VOLUME_4X ! Command147=ID_OPTIONS_GAMEBOY_BORDER ! Command148=ID_OPTIONS_GAMEBOY_PRINTER ! Command149=ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC ! Command150=ID_OPTIONS_GAMEBOY_AUTOMATIC ! Command151=ID_OPTIONS_GAMEBOY_GBA ! Command152=ID_OPTIONS_GAMEBOY_CGB ! Command153=ID_OPTIONS_GAMEBOY_SGB ! Command154=ID_OPTIONS_GAMEBOY_SGB2 ! Command155=ID_OPTIONS_GAMEBOY_GB ! Command156=ID_OPTIONS_GAMEBOY_REALCOLORS ! Command157=ID_OPTIONS_GAMEBOY_GAMEBOYCOLORS ! Command158=ID_OPTIONS_GAMEBOY_COLORS ! Command159=ID_OPTIONS_PRIORITY_HIGHEST ! Command160=ID_OPTIONS_PRIORITY_ABOVENORMAL ! Command161=ID_OPTIONS_PRIORITY_NORMAL ! Command162=ID_OPTIONS_PRIORITY_BELOWNORMAL ! Command163=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE ! Command164=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_MOTIONBLUR ! Command165=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_SMART ! Command166=ID_OPTIONS_FILTER_NORMAL ! Command167=ID_OPTIONS_FILTER_TVMODE ! Command168=ID_OPTIONS_FILTER_2XSAI ! Command169=ID_OPTIONS_FILTER_SUPER2XSAI ! Command170=ID_OPTIONS_FILTER_SUPEREAGLE ! Command171=ID_OPTIONS_FILTER16BIT_PIXELATEEXPERIMENTAL ! Command172=ID_OPTIONS_FILTER16BIT_MOTIONBLUREXPERIMENTAL ! Command173=ID_OPTIONS_FILTER16BIT_ADVANCEMAMESCALE2X ! Command174=ID_OPTIONS_FILTER16BIT_SIMPLE2X ! Command175=ID_OPTIONS_FILTER_BILINEAR ! Command176=ID_OPTIONS_FILTER_BILINEARPLUS ! Command177=ID_OPTIONS_FILTER_SCANLINES ! Command178=ID_OPTIONS_FILTER_HQ2X ! Command179=ID_OPTIONS_FILTER_LQ2X ! Command180=ID_OPTIONS_FILTER_DISABLEMMX ! Command181=ID_OPTIONS_JOYPAD_CONFIGURE_1 ! Command182=ID_OPTIONS_JOYPAD_CONFIGURE_2 ! Command183=ID_OPTIONS_JOYPAD_CONFIGURE_3 ! Command184=ID_OPTIONS_JOYPAD_CONFIGURE_4 ! Command185=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_1 ! Command186=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_2 ! Command187=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_3 ! Command188=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_4 ! Command189=ID_OPTIONS_JOYPAD_MOTIONCONFIGURE ! Command190=ID_OPTIONS_JOYPAD_AUTOFIRE_A ! Command191=ID_OPTIONS_JOYPAD_AUTOFIRE_B ! Command192=ID_OPTIONS_JOYPAD_AUTOFIRE_L ! Command193=ID_OPTIONS_JOYPAD_AUTOFIRE_R ! Command194=ID_OPTIONS_LANGUAGE_SYSTEM ! Command195=ID_OPTIONS_LANGUAGE_ENGLISH ! Command196=ID_OPTIONS_LANGUAGE_OTHER ! Command197=ID_CHEATS_SEARCHFORCHEATS ! Command198=ID_CHEATS_CHEATLIST ! Command199=ID_CHEATS_AUTOMATICSAVELOADCHEATS ! Command200=ID_CHEATS_DISABLECHEATS ! Command201=ID_CHEATS_LOADCHEATLIST ! Command202=ID_CHEATS_SAVECHEATLIST ! Command203=ID_TOOLS_DISASSEMBLE ! Command204=ID_TOOLS_LOGGING ! Command205=ID_TOOLS_IOVIEWER ! Command206=ID_TOOLS_MAPVIEW ! Command207=ID_TOOLS_MEMORYVIEWER ! Command208=ID_TOOLS_OAMVIEWER ! Command209=ID_TOOLS_PALETTEVIEW ! Command210=ID_TOOLS_TILEVIEWER ! Command211=ID_DEBUG_NEXTFRAME ! Command212=ID_TOOLS_DEBUG_GDB ! Command213=ID_TOOLS_DEBUG_LOADANDWAIT ! Command214=ID_TOOLS_DEBUG_BREAK ! Command215=ID_TOOLS_DEBUG_DISCONNECT ! Command216=ID_OPTIONS_SOUND_STARTRECORDING ! Command217=ID_OPTIONS_SOUND_STOPRECORDING ! Command218=ID_TOOLS_RECORD_STARTAVIRECORDING ! Command219=ID_TOOLS_RECORD_STOPAVIRECORDING ! Command220=ID_TOOLS_RECORD_STARTMOVIERECORDING ! Command221=ID_TOOLS_RECORD_STOPMOVIERECORDING ! Command222=ID_TOOLS_PLAY_STARTMOVIEPLAYING ! Command223=ID_TOOLS_PLAY_STOPMOVIEPLAYING ! Command224=ID_TOOLS_REWIND ! Command225=ID_TOOLS_CUSTOMIZE ! Command226=ID_HELP_BUGREPORT ! Command227=ID_HELP_FAQ ! Command228=ID_HELP_ABOUT ! CommandCount=228 [ACL:IDR_ACCELERATOR] --- 1266,1393 ---- Command105=ID_OPTIONS_EMULATOR_AUTOHIDEMENU Command106=ID_OPTIONS_EMULATOR_REWINDINTERVAL ! Command107=ID_OPTIONS_EMULATOR_GAMEOVERRIDES ! Command108=ID_OPTIONS_EMULATOR_SHOWSPEED_NONE ! Command109=ID_OPTIONS_EMULATOR_SHOWSPEED_PERCENTAGE ! Command110=ID_OPTIONS_EMULATOR_SHOWSPEED_DETAILED ! Command111=ID_OPTIONS_EMULATOR_SHOWSPEED_TRANSPARENT ! Command112=ID_OPTIONS_EMULATOR_SAVETYPE_AUTOMATIC ! Command113=ID_OPTIONS_EMULATOR_SAVETYPE_EEPROM ! Command114=ID_OPTIONS_EMULATOR_SAVETYPE_SRAM ! Command115=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH ! Command116=ID_OPTIONS_EMULATOR_SAVETYPE_EEPROMSENSOR ! Command117=ID_OPTIONS_EMULATOR_SAVETYPE_NONE ! Command118=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH512K ! Command119=ID_OPTIONS_EMULATOR_SAVETYPE_FLASH1M ! Command120=ID_OPTIONS_EMULATOR_SAVETYPE_ENHANCEDDETECTION ! Command121=ID_OPTIONS_EMULATOR_USEBIOSFILE ! Command122=ID_OPTIONS_EMULATOR_SKIPBIOS ! Command123=ID_OPTIONS_EMULATOR_SELECTBIOSFILE ! Command124=ID_OPTIONS_EMULATOR_PNGFORMAT ! Command125=ID_OPTIONS_EMULATOR_BMPFORMAT ! Command126=ID_OPTIONS_SOUND_OFF ! Command127=ID_OPTIONS_SOUND_MUTE ! Command128=ID_OPTIONS_SOUND_ON ! Command129=ID_OPTIONS_SOUND_USEOLDSYNCHRONIZATION ! Command130=ID_OPTIONS_SOUND_ECHO ! Command131=ID_OPTIONS_SOUND_LOWPASSFILTER ! Command132=ID_OPTIONS_SOUND_REVERSESTEREO ! Command133=ID_OPTIONS_SOUND_CHANNEL1 ! Command134=ID_OPTIONS_SOUND_CHANNEL2 ! Command135=ID_OPTIONS_SOUND_CHANNEL3 ! Command136=ID_OPTIONS_SOUND_CHANNEL4 ! Command137=ID_OPTIONS_SOUND_DIRECTSOUNDA ! Command138=ID_OPTIONS_SOUND_DIRECTSOUNDB ! Command139=ID_OPTIONS_SOUND_11KHZ ! Command140=ID_OPTIONS_SOUND_22KHZ ! Command141=ID_OPTIONS_SOUND_44KHZ ! Command142=ID_OPTIONS_SOUND_VOLUME_25X ! Command143=ID_OPTIONS_SOUND_VOLUME_5X ! Command144=ID_OPTIONS_SOUND_VOLUME_1X ! Command145=ID_OPTIONS_SOUND_VOLUME_2X ! Command146=ID_OPTIONS_SOUND_VOLUME_3X ! Command147=ID_OPTIONS_SOUND_VOLUME_4X ! Command148=ID_OPTIONS_GAMEBOY_BORDER ! Command149=ID_OPTIONS_GAMEBOY_PRINTER ! Command150=ID_OPTIONS_GAMEBOY_BORDERAUTOMATIC ! Command151=ID_OPTIONS_GAMEBOY_AUTOMATIC ! Command152=ID_OPTIONS_GAMEBOY_GBA ! Command153=ID_OPTIONS_GAMEBOY_CGB ! Command154=ID_OPTIONS_GAMEBOY_SGB ! Command155=ID_OPTIONS_GAMEBOY_SGB2 ! Command156=ID_OPTIONS_GAMEBOY_GB ! Command157=ID_OPTIONS_GAMEBOY_REALCOLORS ! Command158=ID_OPTIONS_GAMEBOY_GAMEBOYCOLORS ! Command159=ID_OPTIONS_GAMEBOY_COLORS ! Command160=ID_OPTIONS_PRIORITY_HIGHEST ! Command161=ID_OPTIONS_PRIORITY_ABOVENORMAL ! Command162=ID_OPTIONS_PRIORITY_NORMAL ! Command163=ID_OPTIONS_PRIORITY_BELOWNORMAL ! Command164=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_NONE ! Command165=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_MOTIONBLUR ! Command166=ID_OPTIONS_FILTER_INTERFRAMEBLENDING_SMART ! Command167=ID_OPTIONS_FILTER_NORMAL ! Command168=ID_OPTIONS_FILTER_TVMODE ! Command169=ID_OPTIONS_FILTER_2XSAI ! Command170=ID_OPTIONS_FILTER_SUPER2XSAI ! Command171=ID_OPTIONS_FILTER_SUPEREAGLE ! Command172=ID_OPTIONS_FILTER16BIT_PIXELATEEXPERIMENTAL ! Command173=ID_OPTIONS_FILTER16BIT_MOTIONBLUREXPERIMENTAL ! Command174=ID_OPTIONS_FILTER16BIT_ADVANCEMAMESCALE2X ! Command175=ID_OPTIONS_FILTER16BIT_SIMPLE2X ! Command176=ID_OPTIONS_FILTER_BILINEAR ! Command177=ID_OPTIONS_FILTER_BILINEARPLUS ! Command178=ID_OPTIONS_FILTER_SCANLINES ! Command179=ID_OPTIONS_FILTER_HQ2X ! Command180=ID_OPTIONS_FILTER_LQ2X ! Command181=ID_OPTIONS_FILTER_DISABLEMMX ! Command182=ID_OPTIONS_JOYPAD_CONFIGURE_1 ! Command183=ID_OPTIONS_JOYPAD_CONFIGURE_2 ! Command184=ID_OPTIONS_JOYPAD_CONFIGURE_3 ! Command185=ID_OPTIONS_JOYPAD_CONFIGURE_4 ! Command186=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_1 ! Command187=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_2 ! Command188=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_3 ! Command189=ID_OPTIONS_JOYPAD_DEFAULTJOYPAD_4 ! Command190=ID_OPTIONS_JOYPAD_MOTIONCONFIGURE ! Command191=ID_OPTIONS_JOYPAD_AUTOFIRE_A ! Command192=ID_OPTIONS_JOYPAD_AUTOFIRE_B ! Command193=ID_OPTIONS_JOYPAD_AUTOFIRE_L ! Command194=ID_OPTIONS_JOYPAD_AUTOFIRE_R ! Command195=ID_OPTIONS_LANGUAGE_SYSTEM ! Command196=ID_OPTIONS_LANGUAGE_ENGLISH ! Command197=ID_OPTIONS_LANGUAGE_OTHER ! Command198=ID_CHEATS_SEARCHFORCHEATS ! Command199=ID_CHEATS_CHEATLIST ! Command200=ID_CHEATS_AUTOMATICSAVELOADCHEATS ! Command201=ID_CHEATS_DISABLECHEATS ! Command202=ID_CHEATS_LOADCHEATLIST ! Command203=ID_CHEATS_SAVECHEATLIST ! Command204=ID_TOOLS_DISASSEMBLE ! Command205=ID_TOOLS_LOGGING ! Command206=ID_TOOLS_IOVIEWER ! Command207=ID_TOOLS_MAPVIEW ! Command208=ID_TOOLS_MEMORYVIEWER ! Command209=ID_TOOLS_OAMVIEWER ! Command210=ID_TOOLS_PALETTEVIEW ! Command211=ID_TOOLS_TILEVIEWER ! Command212=ID_DEBUG_NEXTFRAME ! Command213=ID_TOOLS_DEBUG_GDB ! Command214=ID_TOOLS_DEBUG_LOADANDWAIT ! Command215=ID_TOOLS_DEBUG_BREAK ! Command216=ID_TOOLS_DEBUG_DISCONNECT ! Command217=ID_OPTIONS_SOUND_STARTRECORDING ! Command218=ID_OPTIONS_SOUND_STOPRECORDING ! Command219=ID_TOOLS_RECORD_STARTAVIRECORDING ! Command220=ID_TOOLS_RECORD_STOPAVIRECORDING ! Command221=ID_TOOLS_RECORD_STARTMOVIERECORDING ! Command222=ID_TOOLS_RECORD_STOPMOVIERECORDING ! Command223=ID_TOOLS_PLAY_STARTMOVIEPLAYING ! Command224=ID_TOOLS_PLAY_STOPMOVIEPLAYING ! Command225=ID_TOOLS_REWIND ! Command226=ID_TOOLS_CUSTOMIZE ! Command227=ID_HELP_BUGREPORT ! Command228=ID_HELP_FAQ ! Command229=ID_HELP_ABOUT ! CommandCount=229 [ACL:IDR_ACCELERATOR] *************** *** 1714,1715 **** --- 1717,1743 ---- LastObject=BugReport + [DLG:IDD_GAME_OVERRIDES] + Type=1 + Class=GameOverrides + ControlCount=11 + Control1=IDC_RTC,combobox,1344339971 + Control2=IDC_SAVE_TYPE,combobox,1344339971 + Control3=IDC_FLASH_SIZE,combobox,1344339971 + Control4=IDOK,button,1342242817 + Control5=IDC_DEFAULTS,button,1342242816 + Control6=IDCANCEL,button,1342242816 + Control7=IDC_STATIC,static,1342308352 + Control8=IDC_NAME,edit,1484849280 + Control9=IDC_STATIC,static,1342308352 + Control10=IDC_STATIC,static,1342308352 + Control11=IDC_STATIC,static,1342308352 + + [CLS:GameOverrides] + Type=0 + HeaderFile=GameOverrides.h + ImplementationFile=GameOverrides.cpp + BaseClass=CDialog + Filter=D + LastObject=IDOK + VirtualFilter=dWC + |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:50:55
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29618 Modified Files: resource.h Log Message: Dialog to provide game override settings related to vba-over.ini Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** resource.h 8 Dec 2003 11:44:46 -0000 1.36 --- resource.h 5 Nov 2004 00:50:37 -0000 1.37 *************** *** 6,9 **** --- 6,10 ---- #define IDS_CANNOT_LOAD_SGM 2 #define IDS_SAVE_GAME_NOT_USING_BIOS 3 + #define IDC_DEFAULTS 3 #define IDS_SAVE_GAME_USING_BIOS 4 #define IDS_UNSUPPORTED_SAVE_TYPE 5 *************** *** 94,97 **** --- 95,99 ---- #define IDD_MAX_SCALE 154 #define IDD_BUG_REPORT 155 + #define IDD_GAME_OVERRIDES 156 #define IDC_R0 1000 #define IDC_EDIT_UP 1000 *************** *** 488,494 **** --- 490,500 ---- #define IDC_COPY 1253 #define IDC_BIT_4 1254 + #define IDC_NAME 1254 #define IDC_BIT_5 1255 + #define IDC_RTC 1255 #define IDC_BIT_6 1256 + #define IDC_SAVE_TYPE 1256 #define IDC_BIT_7 1257 + #define IDC_FLASH_SIZE 1257 #define IDC_BIT_8 1258 #define IDC_BIT_9 1259 *************** *** 739,742 **** --- 745,749 ---- #define ID_OPTIONS_FILTER_HQ2X 40274 #define ID_OPTIONS_FILTER_LQ2X 40275 + #define ID_OPTIONS_EMULATOR_GAMEOVERRIDES 40276 // Next default values for new objects *************** *** 744,750 **** #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 156 ! #define _APS_NEXT_COMMAND_VALUE 40276 ! #define _APS_NEXT_CONTROL_VALUE 1254 #define _APS_NEXT_SYMED_VALUE 103 #endif --- 751,757 ---- #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS ! #define _APS_NEXT_RESOURCE_VALUE 158 ! #define _APS_NEXT_COMMAND_VALUE 40277 ! #define _APS_NEXT_CONTROL_VALUE 1256 #define _APS_NEXT_SYMED_VALUE 103 #endif |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:50:29
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29519 Modified Files: MainWndOptions.cpp Log Message: Dialog to provide game override settings related to vba-over.ini Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainWndOptions.cpp 13 May 2004 15:06:50 -0000 1.4 --- MainWndOptions.cpp 5 Nov 2004 00:50:18 -0000 1.5 *************** *** 23,26 **** --- 23,27 ---- #include "Directories.h" #include "FileDlg.h" + #include "GameOverrides.h" #include "GBColorDlg.h" #include "Joypad.h" *************** *** 1670,1671 **** --- 1671,1686 ---- dlg.DoModal(); } + + + void MainWnd::OnOptionsEmulatorGameoverrides() + { + if(emulating && theApp.cartridgeType == 0) { + GameOverrides dlg(this); + dlg.DoModal(); + } + } + + void MainWnd::OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI) + { + pCmdUI->Enable(emulating && theApp.cartridgeType == 0); + } |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:50:11
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29389 Modified Files: MainWnd.h Log Message: Dialog to provide game override settings related to vba-over.ini Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MainWnd.h 13 May 2004 15:06:50 -0000 1.6 --- MainWnd.h 5 Nov 2004 00:50:02 -0000 1.7 *************** *** 409,416 **** afx_msg void OnCheatsDisablecheats(); afx_msg void OnUpdateCheatsDisablecheats(CCmdUI* pCmdUI); ! afx_msg void OnOptionsVideoFullscreenmaxscale(); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() ! afx_msg BOOL OnFileRecentFile(UINT nID); afx_msg BOOL OnFileLoadSlot(UINT nID); --- 409,418 ---- afx_msg void OnCheatsDisablecheats(); afx_msg void OnUpdateCheatsDisablecheats(CCmdUI* pCmdUI); ! afx_msg void OnOptionsVideoFullscreenmaxscale(); ! afx_msg void OnOptionsEmulatorGameoverrides(); ! afx_msg void OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() ! afx_msg BOOL OnFileRecentFile(UINT nID); afx_msg BOOL OnFileLoadSlot(UINT nID); |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:49:57
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29320 Modified Files: MainWnd.cpp Log Message: Dialog to provide game override settings related to vba-over.ini Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** MainWnd.cpp 15 Sep 2004 22:07:41 -0000 1.13 --- MainWnd.cpp 5 Nov 2004 00:49:47 -0000 1.14 *************** *** 377,380 **** --- 377,382 ---- ON_UPDATE_COMMAND_UI(ID_CHEATS_DISABLECHEATS, OnUpdateCheatsDisablecheats) ON_COMMAND(ID_OPTIONS_VIDEO_FULLSCREENMAXSCALE, OnOptionsVideoFullscreenmaxscale) + ON_COMMAND(ID_OPTIONS_EMULATOR_GAMEOVERRIDES, OnOptionsEmulatorGameoverrides) + ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_GAMEOVERRIDES, OnUpdateOptionsEmulatorGameoverrides) //}}AFX_MSG_MAP ON_COMMAND_EX_RANGE(ID_FILE_MRU_FILE1, ID_FILE_MRU_FILE10, OnFileRecentFile) |
|
From: Pokemonhacker <pok...@us...> - 2004-11-05 00:49:36
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29245 Modified Files: Commands.cpp Log Message: Dialog to provide game override settings related to vba-over.ini Index: Commands.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/Commands.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** Commands.cpp 13 May 2004 15:06:49 -0000 1.22 --- Commands.cpp 5 Nov 2004 00:49:25 -0000 1.23 *************** *** 130,133 **** --- 130,134 ---- { "OptionsEmulatorSelectBIOS", ID_OPTIONS_EMULATOR_SELECTBIOSFILE }, { "OptionsEmulatorUseBIOS", ID_OPTIONS_EMULATOR_USEBIOSFILE }, + { "OptionsEmulatorGameOverrides", ID_OPTIONS_EMULATOR_GAMEOVERRIDES }, { "OptionsEmulatorSkipBIOS", ID_OPTIONS_EMULATOR_SKIPBIOS }, { "OptionsEmulatorShowSpeedNone", ID_OPTIONS_EMULATOR_SHOWSPEED_NONE }, |
|
From: Sébastien G. <kx...@us...> - 2004-11-01 14:52:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4468 Modified Files: Cheats.cpp Log Message: Compilfix on Linux. Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** Cheats.cpp 20 Sep 2004 10:17:18 -0000 1.21 --- Cheats.cpp 1 Nov 2004 14:52:00 -0000 1.22 *************** *** 437,441 **** bool onoff = true; int ticks = 0; ! for (int i = 0; i<4; i++) if (rompatch2addr [i] != 0){ CHEAT_PATCH_ROM_16BIT(rompatch2addr [i],rompatch2oldval [i]); --- 437,442 ---- bool onoff = true; int ticks = 0; ! int i; ! for (i = 0; i<4; i++) if (rompatch2addr [i] != 0){ CHEAT_PATCH_ROM_16BIT(rompatch2addr [i],rompatch2oldval [i]); *************** *** 2440,2442 **** #endif #endif ! } \ No newline at end of file --- 2441,2443 ---- #endif #endif ! } |
