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
|
|
From: Pokemonhacker <pok...@us...> - 2005-06-07 10:20:56
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2074 Modified Files: GBA.cpp Log Message: - Bit 15 of WAITCNT is now read-only. Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** GBA.cpp 18 Dec 2004 23:09:56 -0000 1.59 --- GBA.cpp 7 Jun 2005 10:20:44 -0000 1.60 *************** *** 2733,2737 **** } } ! UPDATE_REG(0x204, value); } break; --- 2733,2737 ---- } } ! UPDATE_REG(0x204, value & 0x7FFF); } break; |
|
From: Pokemonhacker <pok...@us...> - 2005-06-07 10:19:37
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1641 Modified Files: bios.cpp Log Message: - Fixed Arctan2. Index: bios.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/bios.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** bios.cpp 18 Nov 2004 01:18:36 -0000 1.15 --- bios.cpp 7 Jun 2005 10:19:26 -0000 1.16 *************** *** 101,114 **** #endif ! 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)) { reg[1].I = x; reg[0].I = y << 14; --- 101,114 ---- #endif ! s32 x = reg[0].I; ! s32 y = reg[1].I; ! u32 res = 0; if (y == 0) { ! res = ((x>>16) & 0x8000); } else { if (x == 0) { ! res = ((y>>16) & 0x8000) + 0x4000; } else { ! if ((abs(x) > abs(y)) || ((abs(x) == abs(y)) && (!((x<0) && (y<0))))) { reg[1].I = x; reg[0].I = y << 14; *************** *** 118,131 **** 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 --- 118,131 ---- res = 0x8000 + reg[0].I; else ! res = (((y>>16) & 0x8000)<<1) + reg[0].I; } else { reg[0].I = x << 14; BIOS_Div(); BIOS_ArcTan(); ! res = (0x4000 + ((y>>16) & 0x8000)) - reg[0].I; } } } ! reg[0].I = res; #ifdef DEV_VERSION *************** *** 135,139 **** } #endif ! } void BIOS_BitUnPack() --- 135,139 ---- } #endif ! } void BIOS_BitUnPack() |
|
From: Pokemonhacker <pok...@us...> - 2004-12-20 15:03:35
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2301 Modified Files: debugger.cpp TestEmu.cpp Log Message: - compilation fixes and version update - news updates Index: TestEmu.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/TestEmu.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TestEmu.cpp 20 May 2004 21:01:30 -0000 1.4 --- TestEmu.cpp 20 Dec 2004 15:03:13 -0000 1.5 *************** *** 353,356 **** --- 353,388 ---- } + void sdlWriteState(int num) + { + char stateName[2048]; + + if(saveDir[0]) + sprintf(stateName, "%s/%s%d.sgm", saveDir, sdlGetFilename(filename), + num+1); + else + sprintf(stateName,"%s%d.sgm", filename, num+1); + if(emulator.emuWriteState) + emulator.emuWriteState(stateName); + sprintf(stateName, "Wrote state %d", num+1); + systemScreenMessage(stateName); + } + + void sdlReadState(int num) + { + char stateName[2048]; + + if(saveDir[0]) + sprintf(stateName, "%s/%s%d.sgm", saveDir, sdlGetFilename(filename), + num+1); + else + sprintf(stateName,"%s%d.sgm", filename, num+1); + + if(emulator.emuReadState) + emulator.emuReadState(stateName); + + sprintf(stateName, "Loaded state %d", num+1); + systemScreenMessage(stateName); + } + void systemScreenCapture(int a) { Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** debugger.cpp 18 Dec 2004 23:10:18 -0000 1.4 --- debugger.cpp 20 Dec 2004 15:03:13 -0000 1.5 *************** *** 22,25 **** --- 22,26 ---- #include <stdlib.h> #include <string.h> + #include <ctype.h> #include "GBA.h" *************** *** 74,125 **** }; ! void debuggerContinueAfterBreakpoint(); ! void debuggerHelp(int,char **); ! void debuggerNext(int,char **); ! void debuggerContinue(int, char **); ! void debuggerRegisters(int, char **); ! void debuggerBreak(int, char **); ! void debuggerBreakDelete(int, char **); ! void debuggerBreakList(int, char **); ! void debuggerBreakArm(int, char **); ! void debuggerBreakThumb(int, char **); ! void debuggerBreakChange(int, char **); ! void debuggerBreakChangeClear(int, char **); ! void debuggerBreakWriteClear(int, char **); ! void debuggerBreakWrite(int, char **); ! void debuggerDebug(int, char **); ! void debuggerDisassemble(int, char **); ! void debuggerDisassembleArm(int, char **); ! void debuggerDisassembleThumb(int, char **); ! void debuggerEditByte(int, char **); ! void debuggerEditHalfWord(int, char **); ! void debuggerEditRegister(int, char **); ! void debuggerEdit(int, char **); ! void debuggerFileDisassemble(int, char **); ! void debuggerFileDisassembleArm(int, char **); ! void debuggerFileDisassembleThumb(int, char **); ! void debuggerIo(int, char **); ! void debuggerLocals(int, char **); ! void debuggerMemoryByte(int, char **); ! void debuggerMemoryHalfWord(int, char **); ! void debuggerMemory(int, char **); ! void debuggerPrint(int, char **); ! void debuggerQuit(int, char **); ! void debuggerSetRadix(int, char **); ! void debuggerSymbols(int, char **); ! void debuggerVerbose(int, char **); ! void debuggerWhere(int, char **); ! void debuggerReadState(int, char **); ! void debuggerWriteState(int, char **); ! void debuggerDumpLoad(int, char**); ! void debuggerDumpSave(int, char**); ! void debuggerCondValidate(int n, char **args, int start); ! bool debuggerCondEvaluate(int num); ! void debuggerCondBreakThumb(int, char **); ! void debuggerCondBreakArm(int, char **); ! DebuggerCommand debuggerCommands[] = { { "?", debuggerHelp, "Show this help information. Type ? <command> for command help", "[<command>]" }, { "ba", debuggerBreakArm, "Add an ARM breakpoint", "<address>" }, --- 75,126 ---- }; ! static void debuggerContinueAfterBreakpoint(); ! static void debuggerHelp(int,char **); ! static void debuggerNext(int,char **); ! static void debuggerContinue(int, char **); ! static void debuggerRegisters(int, char **); ! static void debuggerBreak(int, char **); ! static void debuggerBreakDelete(int, char **); ! static void debuggerBreakList(int, char **); ! static void debuggerBreakArm(int, char **); ! static void debuggerBreakThumb(int, char **); ! static void debuggerBreakChange(int, char **); ! static void debuggerBreakChangeClear(int, char **); ! static void debuggerBreakWriteClear(int, char **); ! static void debuggerBreakWrite(int, char **); ! static void debuggerDebug(int, char **); ! static void debuggerDisassemble(int, char **); ! static void debuggerDisassembleArm(int, char **); ! static void debuggerDisassembleThumb(int, char **); ! static void debuggerEditByte(int, char **); ! static void debuggerEditHalfWord(int, char **); ! static void debuggerEditRegister(int, char **); ! static void debuggerEdit(int, char **); ! static void debuggerFileDisassemble(int, char **); ! static void debuggerFileDisassembleArm(int, char **); ! static void debuggerFileDisassembleThumb(int, char **); ! static void debuggerIo(int, char **); ! static void debuggerLocals(int, char **); ! static void debuggerMemoryByte(int, char **); ! static void debuggerMemoryHalfWord(int, char **); ! static void debuggerMemory(int, char **); ! static void debuggerPrint(int, char **); ! static void debuggerQuit(int, char **); ! static void debuggerSetRadix(int, char **); ! static void debuggerSymbols(int, char **); ! static void debuggerVerbose(int, char **); ! static void debuggerWhere(int, char **); ! static void debuggerReadState(int, char **); ! static void debuggerWriteState(int, char **); ! static void debuggerDumpLoad(int, char**); ! static void debuggerDumpSave(int, char**); ! static void debuggerCondValidate(int n, char **args, int start); ! static bool debuggerCondEvaluate(int num); ! static void debuggerCondBreakThumb(int, char **); ! static void debuggerCondBreakArm(int, char **); ! static DebuggerCommand debuggerCommands[] = { { "?", debuggerHelp, "Show this help information. Type ? <command> for command help", "[<command>]" }, { "ba", debuggerBreakArm, "Add an ARM breakpoint", "<address>" }, *************** *** 369,376 **** } ! void debuggerPrintValueInternal(Function *, Type *, ELFBlock *, int, int, u32); ! void debuggerPrintValueInternal(Function *f, Type *t, ! int bitSize, int bitOffset, ! u32 objLocation, LocationType type); static u32 debuggerGetValue(u32 location, LocationType type) --- 370,377 ---- } ! static void debuggerPrintValueInternal(Function *, Type *, ELFBlock *, int, int, u32); ! static void debuggerPrintValueInternal(Function *f, Type *t, ! int bitSize, int bitOffset, ! u32 objLocation, LocationType type); static u32 debuggerGetValue(u32 location, LocationType type) *************** *** 1861,1865 **** u32 value2=0; ! char size=NULL; int j=1; --- 1862,1866 ---- u32 value2=0; ! char size=0; int j=1; *************** *** 1912,1916 **** default: printf("Erroneous Condition\n"); ! debuggerUsage((toupper(args[0][2])=='T') ? "cbt" : "cba"); return; } --- 1913,1917 ---- default: printf("Erroneous Condition\n"); ! debuggerUsage((char *)((toupper(args[0][2])=='T') ? "cbt" : "cba")); return; } *************** *** 2011,2015 **** default: printf("Erroneous Condition\n"); ! debuggerUsage((toupper(args[0][2])=='T') ? "cbt" : "cba"); return; } --- 2012,2016 ---- default: printf("Erroneous Condition\n"); ! debuggerUsage((char *)((toupper(args[0][2])=='T') ? "cbt" : "cba")); return; } |
|
From: Pokemonhacker <pok...@us...> - 2004-12-20 15:02:59
|
Update of /cvsroot/vba/VisualBoyAdvance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2085 Modified Files: configure configure.in NEWS README README-win.txt VERSION Log Message: - compilation fixes and version update - news updates Index: VERSION =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/VERSION,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VERSION 29 Mar 2004 22:08:37 -0000 1.1 --- VERSION 20 Dec 2004 15:02:43 -0000 1.2 *************** *** 1 **** ! VisualBoyAdvance 1.7.2 --- 1 ---- ! VisualBoyAdvance 1.8.0 Index: configure =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** configure 29 Sep 2004 22:10:53 -0000 1.26 --- configure 20 Dec 2004 15:02:27 -0000 1.27 *************** *** 1706,1710 **** # Define the identity of the package. PACKAGE=VisualBoyAdvance ! VERSION=1.7.2 --- 1706,1710 ---- # Define the identity of the package. PACKAGE=VisualBoyAdvance ! VERSION=1.8.0 *************** *** 7849,7853 **** done ! GETTEXT_PACKAGE=vba-1.7.2 --- 7849,7853 ---- done ! GETTEXT_PACKAGE=vba-1.8.0 Index: configure.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/configure.in,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** configure.in 29 Sep 2004 22:10:53 -0000 1.25 --- configure.in 20 Dec 2004 15:02:43 -0000 1.26 *************** *** 17,21 **** esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.7.2) AC_ARG_ENABLE(c-core, --- 17,21 ---- esac ! AM_INIT_AUTOMAKE(VisualBoyAdvance, 1.8.0) AC_ARG_ENABLE(c-core, *************** *** 141,145 **** AM_GNU_GETTEXT(external) AC_CHECK_HEADERS(libintl.h) ! GETTEXT_PACKAGE=vba-1.7.2 AC_SUBST(GETTEXT_PACKAGE) --- 141,145 ---- AM_GNU_GETTEXT(external) AC_CHECK_HEADERS(libintl.h) ! GETTEXT_PACKAGE=vba-1.8.0 AC_SUBST(GETTEXT_PACKAGE) Index: README =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/README,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** README 22 May 2004 14:08:17 -0000 1.29 --- README 20 Dec 2004 15:02:43 -0000 1.30 *************** *** 1,3 **** ! Welcome to version 1.7.2 of VisualBoyAdvance [SDL]. This is a GB/GBC/GBA emulator for Windows, Linux, MacOS X and BeOS. --- 1,3 ---- ! Welcome to version 1.8.0 of VisualBoyAdvance [SDL]. This is a GB/GBC/GBA emulator for Windows, Linux, MacOS X and BeOS. Index: NEWS =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/NEWS,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** NEWS 20 May 2004 21:01:28 -0000 1.59 --- NEWS 20 Dec 2004 15:02:43 -0000 1.60 *************** *** 1,2 **** --- 1,51 ---- + Version 1.8.0: + Core changes: + - added almost all AR V3 cheat codes (PokemonHacker) + - added prefetch emulation + - added full CBA support (verified for every CBA code type) + - added emulation for DMA interaction with reading from invalid address + - fixed CPU init for 256Mbit roms + - fixed HuffUnComp bug regarding tree size (SF #984608) + - fixed RTC support for day of the week (fixed at Sunday before) + - fixed loading of ELF multiboot files (thanks J.W.) + - fixed bug on CBA code type 5 + - fixed OBJWIN rendering bug when sprite wraps around (SF #1065447) + - fixed battery saving bug when save type equals to Flash or Sram + - fixed a compilation warning + - fixed BIOS ArcTan and ArcTan2 emulation (several bugs) + - fixed some instruction having incorrect cycles (caused SDL debugger to skip several instructions) + - fixed lq2x filter (was using hq2x code) + - fixed some bugs with IntrWait emulation + - fixed some timer bugs + - fixed memory timing when loading a save state (was using the timings before loading the state) + - fixed bug writing to IO register past 0x4000400 (no mirroring) + - initialize sram and flash memory to 0xff instead of 0x00 + - clean flash/sram on load/reload + - ignore 8-bit writes to OBJ and OAM memory + - major AR V1/2/3 support by PokemonHacker + - simplified GBA emulation loop (easier to understand and maintain) + + Windows: + - added dialog to edit game overrides + - added GPL link to Help menu + - fixed GB Disassemble crash when going to another address + - fixed a minor repaint bug when focus changed + - fixed problem displaying rom names that use & character + - fixed palette save name bug + - moved vsync code to where it should be + - moved common palette initialization and cleaned up rendering code to use it + + SDL versions: + - SDL debugger improvements adapted from VBA-H: + - break on change + - conditional breakpoints (ARM and THUMB) + - dump load and save (memory) + - edit register (exception of R15) + - disassemble to file + - save and load state from debugger + + Other: + - fixed some compilation issues (libpng, gtkmm) + Version 1.7.2: Core changes: Index: README-win.txt =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/README-win.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** README-win.txt 22 May 2004 14:08:17 -0000 1.16 --- README-win.txt 20 Dec 2004 15:02:43 -0000 1.17 *************** *** 1,3 **** ! Welcome to VisualBoyAdvance version 1.7.2. Compiling the sources --- 1,3 ---- ! Welcome to VisualBoyAdvance version 1.8.0. Compiling the sources |
|
From: Pokemonhacker <pok...@us...> - 2004-12-18 23:11:21
|
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22438 Modified Files: GBACheats.cpp MainWnd.cpp MainWnd.h MainWndHelp.cpp resource.h VBA.clw vba.rc Log Message: - Added GPL link to Help menu - Fixed problem displaying rom names that use & character - SDL debugger improvements adapted from VBA-H: break on change, conditional breakpoints (ARM and THUMB), dump load and save (memory), edit register, disassemble to file, save and load state from debugger, - Fix lq2x filter (was using hq2x code) - Major AR V1/2/3 support by PokemonHacker - Simplified GBA emulation loop (easier to understand and maintain) - Fixed some bugs with IntrWait emulation - Fixed some timer bugs - Fixed memory timing when loading a save state (was using the timings before loading the state) - Added emulation for DMA interaction with reading from invalid address - Fixed bug writing to IO register past 0x4000400 (no mirroring) - Ignore 8-bit writes to OBJ and OAM memory Index: VBA.clw =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/VBA.clw,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VBA.clw 5 Nov 2004 00:50:55 -0000 1.5 --- VBA.clw 18 Dec 2004 23:11:08 -0000 1.6 *************** *** 41,85 **** 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 --- 41,85 ---- ResourceCount=45 ! Resource1=IDD_LOGGING ! Resource2=IDD_MOTION_CONFIG ! Resource3=IDD_OPENDLG ! Resource4=IDD_IO_VIEWER ! Resource5=IDR_MENU ! Resource6=IDD_TILE_VIEWER ! Resource7=IDD_BUG_REPORT ! Resource8=IDD_DRIVERS ! Resource9=IDD_GB_CHEAT_LIST ! Resource10=IDD_MODES ! Resource11=IDD_MODE_CONFIRM ! Resource12=IDD_ASSOCIATIONS ! Resource13=IDD_ABOUT ! Resource14=IDD_GB_TILE_VIEWER ! Resource15=IDD_GAME_OVERRIDES ! Resource16=IDD_EXPORT_SPS ! Resource17=IDD_CONFIG ! Resource18=IDD_MAP_VIEW ! Resource19=IDD_GB_OAM_VIEW ! Resource20=IDD_ADD_CHEAT ! Resource21=IDD_REWIND_INTERVAL ! Resource22=IDD_GBA_ROM_INFO ! Resource23=IDD_GB_MAP_VIEW ! Resource24=IDD_ADD_CHEAT_DLG ! Resource25=IDD_PALETTE_VIEW ! Resource26=IDD_GB_PRINTER ! Resource27=IDD_DIRECTORIES ! Resource28=IDD_LANG_SELECT ! Resource29=IDD_MEM_VIEWER ! Resource30=IDD_CODE_SELECT ! Resource31=IDD_OAM_VIEW ! Resource32=IDD_DISASSEMBLE ! Resource33=IDD_ACCEL_EDITOR ! Resource34=IDD_GDB_PORT ! Resource35=IDD_ADDR_SIZE ! Resource36=IDD_GB_COLORS ! Resource37=IDD_CHEAT_LIST ! Resource38=IDD_GDB_WAITING ! Resource39=IDD_THROTTLE ! Resource40=IDD_CHEATS ! Resource41=IDD_GB_ROM_INFO Class30=AddGSACode Class31=GBCheatList *************** *** 108,116 **** Class54=AccelEditor Class55=CKeyboardEdit ! Resource42=IDD_REWIND_INTERVAL Class56=MaxScale ! Resource43=IDD_DIRECTORIES Class57=BugReport ! Resource44=IDD_GAME_OVERRIDES Class58=GameOverrides Resource45=IDR_ACCELERATOR --- 108,116 ---- Class54=AccelEditor Class55=CKeyboardEdit ! Resource42=IDD_GB_DISASSEMBLE Class56=MaxScale ! Resource43=IDD_MAX_SCALE Class57=BugReport ! Resource44=IDD_GB_PALETTE_VIEW Class58=GameOverrides Resource45=IDR_ACCELERATOR *************** *** 242,246 **** HeaderFile=MainWnd.h ImplementationFile=MainWnd.cpp ! LastObject=ID_OPTIONS_EMULATOR_GAMEOVERRIDES Filter=W VirtualFilter=WC --- 242,246 ---- HeaderFile=MainWnd.h ImplementationFile=MainWnd.cpp ! LastObject=ID_HELP_GNUPUBLICLICENSE Filter=W VirtualFilter=WC *************** *** 314,318 **** Control6=IDC_STATIC,static,1342308353 Control7=IDC_STATIC,static,1342308353 ! Control8=IDC_VERSION,static,1342308353 [DLG:IDD_ASSOCIATIONS] --- 314,318 ---- Control6=IDC_STATIC,static,1342308353 Control7=IDC_STATIC,static,1342308353 ! Control8=IDC_VERSION,static,1342308481 [DLG:IDD_ASSOCIATIONS] *************** *** 530,534 **** Control4=IDC_STATIC,static,1342308352 Control5=IDC_STATIC,static,1342308352 ! Control6=IDC_LANG_NAME,static,1342308352 [DLG:IDD_MODE_CONFIRM] --- 530,534 ---- Control4=IDC_STATIC,static,1342308352 Control5=IDC_STATIC,static,1342308352 ! Control6=IDC_LANG_NAME,static,1342308480 [DLG:IDD_MODE_CONFIRM] *************** *** 539,543 **** Control2=ID_CANCEL,button,1342242816 Control3=IDC_STATIC,static,1342308353 ! Control4=IDC_TIMER,static,1342308353 [DLG:IDD_REWIND_INTERVAL] --- 539,543 ---- Control2=ID_CANCEL,button,1342242816 Control3=IDC_STATIC,static,1342308353 ! Control4=IDC_TIMER,static,1342308481 [DLG:IDD_REWIND_INTERVAL] *************** *** 562,584 **** Control6=IDC_STATIC,static,1342308352 Control7=IDC_STATIC,static,1342308352 ! Control8=IDC_ROM_TITLE,static,1342308352 ! Control9=IDC_ROM_MAKER_CODE,static,1342308352 ! Control10=IDC_ROM_UNIT_CODE,static,1342308352 ! Control11=IDC_ROM_DEVICE_TYPE,static,1342308352 ! Control12=IDC_ROM_VERSION,static,1342308352 ! Control13=IDC_ROM_CRC,static,1342308352 Control14=IDC_STATIC,static,1342308352 ! Control15=IDC_ROM_COLOR,static,1342308352 Control16=IDC_STATIC,static,1342308352 ! Control17=IDC_ROM_SIZE,static,1342308352 Control18=IDC_STATIC,static,1342308352 ! Control19=IDC_ROM_RAM_SIZE,static,1342308352 Control20=IDC_STATIC,static,1342308352 ! Control21=IDC_ROM_DEST_CODE,static,1342308352 Control22=IDC_STATIC,static,1342308352 ! Control23=IDC_ROM_LIC_CODE,static,1342308352 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_ROM_CHECKSUM,static,1342308352 ! Control26=IDC_ROM_MAKER_NAME2,static,1342308352 Control27=IDC_STATIC,static,1342308352 --- 562,584 ---- Control6=IDC_STATIC,static,1342308352 Control7=IDC_STATIC,static,1342308352 ! Control8=IDC_ROM_TITLE,static,1342308480 ! Control9=IDC_ROM_MAKER_CODE,static,1342308480 ! Control10=IDC_ROM_UNIT_CODE,static,1342308480 ! Control11=IDC_ROM_DEVICE_TYPE,static,1342308480 ! Control12=IDC_ROM_VERSION,static,1342308480 ! Control13=IDC_ROM_CRC,static,1342308480 Control14=IDC_STATIC,static,1342308352 ! Control15=IDC_ROM_COLOR,static,1342308480 Control16=IDC_STATIC,static,1342308352 ! Control17=IDC_ROM_SIZE,static,1342308480 Control18=IDC_STATIC,static,1342308352 ! Control19=IDC_ROM_RAM_SIZE,static,1342308480 Control20=IDC_STATIC,static,1342308352 ! Control21=IDC_ROM_DEST_CODE,static,1342308480 Control22=IDC_STATIC,static,1342308352 ! Control23=IDC_ROM_LIC_CODE,static,1342308480 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_ROM_CHECKSUM,static,1342308480 ! Control26=IDC_ROM_MAKER_NAME2,static,1342308480 Control27=IDC_STATIC,static,1342308352 *************** *** 595,607 **** Control7=IDC_STATIC,static,1342308352 Control8=IDC_STATIC,static,1342308352 ! Control9=IDC_ROM_TITLE,static,1342308352 ! Control10=IDC_ROM_GAME_CODE,static,1342308352 ! Control11=IDC_ROM_MAKER_CODE,static,1342308352 ! Control12=IDC_ROM_UNIT_CODE,static,1342308352 ! Control13=IDC_ROM_DEVICE_TYPE,static,1342308352 ! Control14=IDC_ROM_VERSION,static,1342308352 ! Control15=IDC_ROM_CRC,static,1342308352 ! Control16=IDC_ROM_MAKER_NAME,static,1342308352 ! Control17=IDC_STATIC,static,1342308352 [DLG:IDD_THROTTLE] --- 595,607 ---- Control7=IDC_STATIC,static,1342308352 Control8=IDC_STATIC,static,1342308352 ! Control9=IDC_STATIC,static,1342308352 ! Control10=IDC_ROM_TITLE,static,1342308480 ! Control11=IDC_ROM_GAME_CODE,static,1342308480 ! Control12=IDC_ROM_MAKER_CODE,static,1342308480 ! Control13=IDC_ROM_UNIT_CODE,static,1342308480 ! Control14=IDC_ROM_DEVICE_TYPE,static,1342308480 ! Control15=IDC_ROM_VERSION,static,1342308480 ! Control16=IDC_ROM_CRC,static,1342308480 ! Control17=IDC_ROM_MAKER_NAME,static,1342308480 [DLG:IDD_THROTTLE] *************** *** 707,740 **** 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 ! Control22=IDC_MODE,static,1342308352 Control23=IDC_STATIC,static,1342308352 ! Control24=IDC_MAPBASE,static,1342308352 Control25=IDC_STATIC,static,1342308352 ! Control26=IDC_CHARBASE,static,1342308352 Control27=IDC_STATIC,static,1342308352 ! Control28=IDC_DIM,static,1342308352 Control29=IDC_STATIC,static,1342308352 ! Control30=IDC_NUMCOLORS,static,1342308352 Control31=IDC_STATIC,static,1342308352 ! Control32=IDC_PRIORITY,static,1342308352 Control33=IDC_STATIC,static,1342308352 ! Control34=IDC_MOSAIC,static,1342308352 Control35=IDC_STATIC,static,1342308352 ! Control36=IDC_OVERFLOW,static,1342308352 Control37=IDC_STATIC,static,1342308352 ! Control38=IDC_ADDRESS,static,1342308352 Control39=IDC_STATIC,static,1342308352 ! Control40=IDC_TILE_NUM,static,1342308352 Control41=IDC_STATIC,static,1342308352 ! Control42=IDC_FLIP,static,1342308352 Control43=IDC_STATIC,static,1342308352 ! Control44=IDC_PALETTE_NUM,static,1342308352 [DLG:IDD_PALETTE_VIEW] --- 707,740 ---- Control13=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control14=IDC_COLOR,VbaColorControl,1342242816 ! Control15=IDC_R,static,1342308480 ! Control16=IDC_G,static,1342308480 ! Control17=IDC_B,static,1342308480 Control18=IDC_STATIC,button,1342177287 Control19=IDC_STATIC,button,1342177287 ! Control20=IDC_XY,static,1342308480 Control21=IDC_STATIC,static,1342308352 ! Control22=IDC_MODE,static,1342308480 Control23=IDC_STATIC,static,1342308352 ! Control24=IDC_MAPBASE,static,1342308480 Control25=IDC_STATIC,static,1342308352 ! Control26=IDC_CHARBASE,static,1342308480 Control27=IDC_STATIC,static,1342308352 ! Control28=IDC_DIM,static,1342308480 Control29=IDC_STATIC,static,1342308352 ! Control30=IDC_NUMCOLORS,static,1342308480 Control31=IDC_STATIC,static,1342308352 ! Control32=IDC_PRIORITY,static,1342308480 Control33=IDC_STATIC,static,1342308352 ! Control34=IDC_MOSAIC,static,1342308480 Control35=IDC_STATIC,static,1342308352 ! Control36=IDC_OVERFLOW,static,1342308480 Control37=IDC_STATIC,static,1342308352 ! Control38=IDC_ADDRESS,static,1342308480 Control39=IDC_STATIC,static,1342308352 ! Control40=IDC_TILE_NUM,static,1342308480 Control41=IDC_STATIC,static,1342308352 ! Control42=IDC_FLIP,static,1342308480 Control43=IDC_STATIC,static,1342308352 ! Control44=IDC_PALETTE_NUM,static,1342308480 [DLG:IDD_PALETTE_VIEW] *************** *** 746,754 **** Control3=IDC_REFRESH2,button,1342242816 Control4=IDC_CLOSE,button,1342242816 ! Control5=IDC_ADDRESS,static,1342308352 ! Control6=IDC_R,static,1342308352 ! Control7=IDC_G,static,1342308352 ! Control8=IDC_B,static,1342308352 ! Control9=IDC_VALUE,static,1342308352 Control10=IDC_COLOR,VbaColorControl,1342242816 Control11=IDC_PALETTE_VIEW,VbaPaletteViewControl,1342242816 --- 746,754 ---- Control3=IDC_REFRESH2,button,1342242816 Control4=IDC_CLOSE,button,1342242816 ! Control5=IDC_ADDRESS,static,1342308480 ! Control6=IDC_R,static,1342308480 ! Control7=IDC_G,static,1342308480 ! Control8=IDC_B,static,1342308480 ! Control9=IDC_VALUE,static,1342308480 Control10=IDC_COLOR,VbaColorControl,1342242816 Control11=IDC_PALETTE_VIEW,VbaPaletteViewControl,1342242816 *************** *** 796,811 **** Control8=IDC_OAM_VIEW_ZOOM,VbaZoomControl,1342373888 Control9=IDC_COLOR,VbaColorControl,1342242816 ! Control10=IDC_POS,static,1342308352 ! Control11=IDC_MODE,static,1342308352 ! Control12=IDC_COLORS,static,1342308352 ! Control13=IDC_PALETTE,static,1342308352 ! Control14=IDC_TILE,static,1342308352 ! Control15=IDC_PRIO,static,1342308352 ! Control16=IDC_SIZE2,static,1342308352 ! Control17=IDC_ROT,static,1342308352 ! Control18=IDC_FLAGS,static,1342308352 ! Control19=IDC_R,static,1342308352 ! Control20=IDC_G,static,1342308352 ! Control21=IDC_B,static,1342308352 Control22=IDC_STATIC,static,1342308352 Control23=IDC_STATIC,static,1342308352 --- 796,811 ---- Control8=IDC_OAM_VIEW_ZOOM,VbaZoomControl,1342373888 Control9=IDC_COLOR,VbaColorControl,1342242816 ! Control10=IDC_POS,static,1342308480 ! Control11=IDC_MODE,static,1342308480 ! Control12=IDC_COLORS,static,1342308480 ! Control13=IDC_PALETTE,static,1342308480 ! Control14=IDC_TILE,static,1342308480 ! Control15=IDC_PRIO,static,1342308480 ! Control16=IDC_SIZE2,static,1342308480 ! Control17=IDC_ROT,static,1342308480 ! Control18=IDC_FLAGS,static,1342308480 ! Control19=IDC_R,static,1342308480 ! Control20=IDC_G,static,1342308480 ! Control21=IDC_B,static,1342308480 Control22=IDC_STATIC,static,1342308352 Control23=IDC_STATIC,static,1342308352 *************** *** 859,871 **** Control16=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control17=IDC_COLOR,VbaColorControl,1342242816 ! Control18=IDC_R,static,1342308352 ! Control19=IDC_G,static,1342308352 ! Control20=IDC_B,static,1342308352 Control21=IDC_STATIC,static,1342308352 Control22=IDC_AUTO_UPDATE,button,1342242819 Control23=IDC_STATIC,static,1342308352 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_TILE_NUMBER,static,1342308352 ! Control26=IDC_ADDRESS,static,1342308352 [DLG:IDD_DISASSEMBLE] --- 859,871 ---- Control16=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control17=IDC_COLOR,VbaColorControl,1342242816 ! Control18=IDC_R,static,1342308480 ! Control19=IDC_G,static,1342308480 ! Control20=IDC_B,static,1342308480 Control21=IDC_STATIC,static,1342308352 Control22=IDC_AUTO_UPDATE,button,1342242819 Control23=IDC_STATIC,static,1342308352 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_TILE_NUMBER,static,1342308480 ! Control26=IDC_ADDRESS,static,1342308480 [DLG:IDD_DISASSEMBLE] *************** *** 891,910 **** Control17=IDC_STATIC,static,1342308352 Control18=IDC_STATIC,static,1342308352 ! Control19=IDC_R0,static,1342308352 ! Control20=IDC_R1,static,1342308352 ! Control21=IDC_R2,static,1342308352 ! Control22=IDC_R3,static,1342308352 ! Control23=IDC_R4,static,1342308352 ! Control24=IDC_R5,static,1342308352 ! Control25=IDC_R6,static,1342308352 ! Control26=IDC_R7,static,1342308352 ! Control27=IDC_R8,static,1342308352 ! Control28=IDC_R9,static,1342308352 ! Control29=IDC_R10,static,1342308352 ! Control30=IDC_R11,static,1342308352 ! Control31=IDC_R12,static,1342308352 ! Control32=IDC_R13,static,1342308352 ! Control33=IDC_R14,static,1342308352 ! Control34=IDC_R15,static,1342308352 Control35=IDC_STATIC,static,1342308352 Control36=IDC_STATIC,static,1342308352 --- 891,910 ---- Control17=IDC_STATIC,static,1342308352 Control18=IDC_STATIC,static,1342308352 ! Control19=IDC_R0,static,1342308480 ! Control20=IDC_R1,static,1342308480 ! Control21=IDC_R2,static,1342308480 ! Control22=IDC_R3,static,1342308480 ! Control23=IDC_R4,static,1342308480 ! Control24=IDC_R5,static,1342308480 ! Control25=IDC_R6,static,1342308480 ! Control26=IDC_R7,static,1342308480 ! Control27=IDC_R8,static,1342308480 ! Control28=IDC_R9,static,1342308480 ! Control29=IDC_R10,static,1342308480 ! Control30=IDC_R11,static,1342308480 ! Control31=IDC_R12,static,1342308480 ! Control32=IDC_R13,static,1342308480 ! Control33=IDC_R14,static,1342308480 ! Control34=IDC_R15,static,1342308480 Control35=IDC_STATIC,static,1342308352 Control36=IDC_STATIC,static,1342308352 *************** *** 915,919 **** Control41=IDC_STATIC,static,1342308352 Control42=IDC_STATIC,static,1342308352 ! Control43=IDC_R16,static,1342308352 Control44=IDC_STATIC,static,1342308352 Control45=IDC_N,button,1476460547 --- 915,919 ---- Control41=IDC_STATIC,static,1342308352 Control42=IDC_STATIC,static,1342308352 ! Control43=IDC_R16,static,1342308480 Control44=IDC_STATIC,static,1342308352 Control45=IDC_N,button,1476460547 *************** *** 925,929 **** Control51=IDC_T,button,1476460547 Control52=IDC_STATIC,static,1342308352 ! Control53=IDC_MODE,static,1342308352 Control54=IDC_VSCROLL,scrollbar,1342177281 Control55=IDC_GOPC,button,1342242816 --- 925,929 ---- Control51=IDC_T,button,1476460547 Control52=IDC_STATIC,static,1342308352 ! Control53=IDC_MODE,static,1342308480 Control54=IDC_VSCROLL,scrollbar,1342177281 Control55=IDC_GOPC,button,1342242816 *************** *** 944,948 **** Control1=ID_CANCEL,button,1342242816 Control2=IDC_STATIC,static,1342308352 ! Control3=IDC_PORT,static,1342308352 [DLG:IDD_LOGGING] --- 944,948 ---- Control1=ID_CANCEL,button,1342242816 Control2=IDC_STATIC,static,1342308352 ! Control3=IDC_PORT,static,1342308480 [DLG:IDD_LOGGING] *************** *** 993,1001 **** Control11=IDC_STATIC,static,1342308352 Control12=IDC_STATIC,static,1342308352 ! Control13=IDC_R0,static,1342308352 ! Control14=IDC_R1,static,1342308352 ! Control15=IDC_R2,static,1342308352 ! Control16=IDC_R3,static,1342308352 ! Control17=IDC_R6,static,1342308352 Control18=IDC_N,button,1476460547 Control19=IDC_Z,button,1476460547 --- 993,1001 ---- Control11=IDC_STATIC,static,1342308352 Control12=IDC_STATIC,static,1342308352 ! Control13=IDC_R0,static,1342308480 ! Control14=IDC_R1,static,1342308480 ! Control15=IDC_R2,static,1342308480 ! Control16=IDC_R3,static,1342308480 ! Control17=IDC_R6,static,1342308480 Control18=IDC_N,button,1476460547 Control19=IDC_Z,button,1476460547 *************** *** 1005,1011 **** Control23=IDC_GOPC,button,1342242816 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_R4,static,1342308352 Control26=IDC_STATIC,static,1342308352 ! Control27=IDC_R5,static,1342308352 [DLG:IDD_GB_OAM_VIEW] --- 1005,1011 ---- Control23=IDC_GOPC,button,1342242816 Control24=IDC_STATIC,static,1342308352 ! Control25=IDC_R4,static,1342308480 Control26=IDC_STATIC,static,1342308352 ! Control27=IDC_R5,static,1342308480 [DLG:IDD_GB_OAM_VIEW] *************** *** 1022,1034 **** Control8=IDC_OAM_VIEW_ZOOM,VbaZoomControl,1342373888 Control9=IDC_COLOR,VbaColorControl,1342242816 ! Control10=IDC_POS,static,1342308352 ! Control11=IDC_PALETTE,static,1342308352 ! Control12=IDC_TILE,static,1342308352 ! Control13=IDC_PRIO,static,1342308352 ! Control14=IDC_OAP,static,1342308352 ! Control15=IDC_FLAGS,static,1342308352 ! Control16=IDC_R,static,1342308352 ! Control17=IDC_G,static,1342308352 ! Control18=IDC_B,static,1342308352 Control19=IDC_STATIC,static,1342308352 Control20=IDC_STATIC,static,1342308352 --- 1022,1034 ---- Control8=IDC_OAM_VIEW_ZOOM,VbaZoomControl,1342373888 Control9=IDC_COLOR,VbaColorControl,1342242816 ! Control10=IDC_POS,static,1342308480 ! Control11=IDC_PALETTE,static,1342308480 ! Control12=IDC_TILE,static,1342308480 ! Control13=IDC_PRIO,static,1342308480 ! Control14=IDC_OAP,static,1342308480 ! Control15=IDC_FLAGS,static,1342308480 ! Control16=IDC_R,static,1342308480 ! Control17=IDC_G,static,1342308480 ! Control18=IDC_B,static,1342308480 Control19=IDC_STATIC,static,1342308352 Control20=IDC_STATIC,static,1342308352 *************** *** 1039,1043 **** Control25=IDC_STATIC,static,1342308352 Control26=IDC_AUTO_UPDATE,button,1342242819 ! Control27=IDC_BANK,static,1342308352 Control28=IDC_STATIC,static,1342308352 --- 1039,1043 ---- Control25=IDC_STATIC,static,1342308352 Control26=IDC_AUTO_UPDATE,button,1342242819 ! Control27=IDC_BANK,static,1342308480 Control28=IDC_STATIC,static,1342308352 *************** *** 1059,1071 **** 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,static,1342308352 Control18=IDC_AUTO_UPDATE,button,1342242819 Control19=IDC_STATIC,static,1342308352 Control20=IDC_STATIC,static,1342308352 ! Control21=IDC_TILE_NUMBER,static,1342308352 ! Control22=IDC_ADDRESS,static,1342308352 Control23=IDC_PALETTE_SLIDER,msctls_trackbar32,1342373889 --- 1059,1071 ---- Control12=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control13=IDC_COLOR,VbaColorControl,1342242816 ! Control14=IDC_R,static,1342308480 ! Control15=IDC_G,static,1342308480 ! Control16=IDC_B,static,1342308480 Control17=IDC_STATIC,static,1342308352 Control18=IDC_AUTO_UPDATE,button,1342242819 Control19=IDC_STATIC,static,1342308352 Control20=IDC_STATIC,static,1342308352 ! Control21=IDC_TILE_NUMBER,static,1342308480 ! Control22=IDC_ADDRESS,static,1342308480 Control23=IDC_PALETTE_SLIDER,msctls_trackbar32,1342373889 *************** *** 1085,1105 **** Control10=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control11=IDC_COLOR,VbaColorControl,1342242816 ! Control12=IDC_R,static,1342308352 ! Control13=IDC_G,static,1342308352 ! Control14=IDC_B,static,1342308352 Control15=IDC_STATIC,button,1342177287 Control16=IDC_STATIC,button,1342177287 Control17=IDC_AUTO_UPDATE,button,1342242819 ! Control18=IDC_XY,static,1342308352 Control19=IDC_STATIC,static,1342308352 ! Control20=IDC_PRIORITY,static,1342308352 Control21=IDC_STATIC,static,1342308352 ! Control22=IDC_ADDRESS,static,1342308352 Control23=IDC_STATIC,static,1342308352 ! Control24=IDC_TILE_NUM,static,1342308352 Control25=IDC_STATIC,static,1342308352 ! Control26=IDC_FLIP,static,1342308352 Control27=IDC_STATIC,static,1342308352 ! Control28=IDC_PALETTE_NUM,static,1342308352 [DLG:IDD_GB_PALETTE_VIEW] --- 1085,1105 ---- Control10=IDC_MAP_VIEW_ZOOM,VbaZoomControl,1342373888 Control11=IDC_COLOR,VbaColorControl,1342242816 ! Control12=IDC_R,static,1342308480 ! Control13=IDC_G,static,1342308480 ! Control14=IDC_B,static,1342308480 Control15=IDC_STATIC,button,1342177287 Control16=IDC_STATIC,button,1342177287 Control17=IDC_AUTO_UPDATE,button,1342242819 ! Control18=IDC_XY,static,1342308480 Control19=IDC_STATIC,static,1342308352 ! Control20=IDC_PRIORITY,static,1342308480 Control21=IDC_STATIC,static,1342308352 ! Control22=IDC_ADDRESS,static,1342308480 Control23=IDC_STATIC,static,1342308352 ! Control24=IDC_TILE_NUM,static,1342308480 Control25=IDC_STATIC,static,1342308352 ! Control26=IDC_FLIP,static,1342308480 Control27=IDC_STATIC,static,1342308352 ! Control28=IDC_PALETTE_NUM,static,1342308480 [DLG:IDD_GB_PALETTE_VIEW] *************** *** 1111,1119 **** Control3=IDC_REFRESH2,button,1342242816 Control4=IDC_CLOSE,button,1342242816 ! Control5=IDC_ADDRESS,static,1342308352 ! Control6=IDC_R,static,1342308352 ! Control7=IDC_G,static,1342308352 ! Control8=IDC_B,static,1342308352 ! Control9=IDC_VALUE,static,1342308352 Control10=IDC_COLOR,VbaColorControl,1342242816 Control11=IDC_PALETTE_VIEW,VbaPaletteViewControl,1342242816 --- 1111,1119 ---- Control3=IDC_REFRESH2,button,1342242816 Control4=IDC_CLOSE,button,1342242816 ! Control5=IDC_ADDRESS,static,1342308480 ! Control6=IDC_R,static,1342308480 ! Control7=IDC_G,static,1342308480 ! Control8=IDC_B,static,1342308480 ! Control9=IDC_VALUE,static,1342308480 Control10=IDC_COLOR,VbaColorControl,1342242816 Control11=IDC_PALETTE_VIEW,VbaPaletteViewControl,1342242816 *************** *** 1388,1393 **** Command227=ID_HELP_BUGREPORT Command228=ID_HELP_FAQ ! Command229=ID_HELP_ABOUT ! CommandCount=229 [ACL:IDR_ACCELERATOR] --- 1388,1394 ---- Command227=ID_HELP_BUGREPORT Command228=ID_HELP_FAQ ! Command229=ID_HELP_GNUPUBLICLICENSE ! Command230=ID_HELP_ABOUT ! CommandCount=230 [ACL:IDR_ACCELERATOR] Index: GBACheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GBACheats.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GBACheats.cpp 13 May 2004 15:06:49 -0000 1.10 --- GBACheats.cpp 18 Dec 2004 23:11:08 -0000 1.11 *************** *** 685,689 **** } ! cheatsAdd(code, buffer,address, value,-1, sizeType); return true; } --- 685,689 ---- } ! cheatsAdd(code, buffer, address ,address, value,-1, sizeType); return true; } Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** MainWnd.cpp 5 Nov 2004 00:49:47 -0000 1.14 --- MainWnd.cpp 18 Dec 2004 23:11:08 -0000 1.15 *************** *** 379,382 **** --- 379,383 ---- ON_COMMAND(ID_OPTIONS_EMULATOR_GAMEOVERRIDES, OnOptionsEmulatorGameoverrides) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_GAMEOVERRIDES, OnUpdateOptionsEmulatorGameoverrides) + ON_COMMAND(ID_HELP_GNUPUBLICLICENSE, OnHelpGnupubliclicense) //}}AFX_MSG_MAP ON_COMMAND_EX_RANGE(ID_FILE_MRU_FILE1, ID_FILE_MRU_FILE10, OnFileRecentFile) Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MainWnd.h 5 Nov 2004 00:50:02 -0000 1.7 --- MainWnd.h 18 Dec 2004 23:11:08 -0000 1.8 *************** *** 412,416 **** afx_msg void OnOptionsEmulatorGameoverrides(); afx_msg void OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() --- 412,417 ---- afx_msg void OnOptionsEmulatorGameoverrides(); afx_msg void OnUpdateOptionsEmulatorGameoverrides(CCmdUI* pCmdUI); ! afx_msg void OnHelpGnupubliclicense(); ! //}}AFX_MSG DECLARE_MESSAGE_MAP() Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** vba.rc 5 Nov 2004 00:51:14 -0000 1.48 --- vba.rc 18 Dec 2004 23:11:08 -0000 1.49 *************** *** 102,106 **** CTEXT "Contribution by Costis",IDC_STATIC,30,45,102,8 CTEXT "Version",IDC_STATIC,46,16,70,8 ! CTEXT "",IDC_VERSION,60,25,43,8 END --- 102,106 ---- CTEXT "Contribution by Costis",IDC_STATIC,30,45,102,8 CTEXT "Version",IDC_STATIC,46,16,70,8 ! CTEXT "",IDC_VERSION,60,25,43,8,SS_NOPREFIX END *************** *** 310,322 **** LTEXT "ROM version:",IDC_STATIC,7,94,60,8 LTEXT "CRC:",IDC_STATIC,7,108,60,8 - LTEXT "",IDC_ROM_TITLE,80,10,133,8 - LTEXT "",IDC_ROM_GAME_CODE,80,24,133,8 - LTEXT "",IDC_ROM_MAKER_CODE,80,38,133,8 - LTEXT "",IDC_ROM_UNIT_CODE,80,66,133,8 - LTEXT "",IDC_ROM_DEVICE_TYPE,80,80,133,8 - LTEXT "",IDC_ROM_VERSION,80,94,133,8 - LTEXT "",IDC_ROM_CRC,80,108,133,8 - LTEXT "",IDC_ROM_MAKER_NAME,80,52,133,8 LTEXT "Maker name:",IDC_STATIC,7,52,60,8 END --- 310,322 ---- LTEXT "ROM version:",IDC_STATIC,7,94,60,8 LTEXT "CRC:",IDC_STATIC,7,108,60,8 LTEXT "Maker name:",IDC_STATIC,7,52,60,8 + LTEXT "",IDC_ROM_TITLE,80,10,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_GAME_CODE,80,24,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_MAKER_CODE,80,38,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_UNIT_CODE,80,66,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_DEVICE_TYPE,80,80,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_VERSION,80,94,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_CRC,80,108,133,8,SS_NOPREFIX + LTEXT "",IDC_ROM_MAKER_NAME,80,52,133,8,SS_NOPREFIX END *************** *** 333,355 **** LTEXT "ROM version:",IDC_STATIC,7,152,60,8 LTEXT "CRC:",IDC_STATIC,7,166,60,8 ! LTEXT "",IDC_ROM_TITLE,80,10,133,8 ! LTEXT "",IDC_ROM_MAKER_CODE,80,38,133,8 ! LTEXT "",IDC_ROM_UNIT_CODE,80,68,133,8 ! LTEXT "",IDC_ROM_DEVICE_TYPE,80,82,133,8 ! LTEXT "",IDC_ROM_VERSION,80,152,133,8 ! LTEXT "",IDC_ROM_CRC,80,166,133,8 LTEXT "Color:",IDC_STATIC,7,24,60,8 ! LTEXT "",IDC_ROM_COLOR,80,24,133,8 LTEXT "ROM size:",IDC_STATIC,7,96,60,8 ! LTEXT "",IDC_ROM_SIZE,80,96,133,8 LTEXT "RAM size:",IDC_STATIC,7,110,60,8 ! LTEXT "",IDC_ROM_RAM_SIZE,80,110,133,8 LTEXT "Dest. code:",IDC_STATIC,7,124,60,8 ! LTEXT "",IDC_ROM_DEST_CODE,80,124,133,8 LTEXT "License code:",IDC_STATIC,7,138,60,8 ! LTEXT "",IDC_ROM_LIC_CODE,80,138,133,8 LTEXT "Checksum:",IDC_STATIC,7,180,60,8 ! LTEXT "",IDC_ROM_CHECKSUM,80,180,133,8 ! LTEXT "",IDC_ROM_MAKER_NAME2,80,52,133,8 LTEXT "Maker name:",IDC_STATIC,7,52,60,8 END --- 333,355 ---- LTEXT "ROM version:",IDC_STATIC,7,152,60,8 LTEXT "CRC:",IDC_STATIC,7,166,60,8 ! LTEXT "",IDC_ROM_TITLE,80,10,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_MAKER_CODE,80,38,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_UNIT_CODE,80,68,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_DEVICE_TYPE,80,82,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_VERSION,80,152,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_CRC,80,166,133,8,SS_NOPREFIX LTEXT "Color:",IDC_STATIC,7,24,60,8 ! LTEXT "",IDC_ROM_COLOR,80,24,133,8,SS_NOPREFIX LTEXT "ROM size:",IDC_STATIC,7,96,60,8 ! LTEXT "",IDC_ROM_SIZE,80,96,133,8,SS_NOPREFIX LTEXT "RAM size:",IDC_STATIC,7,110,60,8 ! LTEXT "",IDC_ROM_RAM_SIZE,80,110,133,8,SS_NOPREFIX LTEXT "Dest. code:",IDC_STATIC,7,124,60,8 ! LTEXT "",IDC_ROM_DEST_CODE,80,124,133,8,SS_NOPREFIX LTEXT "License code:",IDC_STATIC,7,138,60,8 ! LTEXT "",IDC_ROM_LIC_CODE,80,138,133,8,SS_NOPREFIX LTEXT "Checksum:",IDC_STATIC,7,180,60,8 ! LTEXT "",IDC_ROM_CHECKSUM,80,180,133,8,SS_NOPREFIX ! LTEXT "",IDC_ROM_MAKER_NAME2,80,52,133,8,SS_NOPREFIX LTEXT "Maker name:",IDC_STATIC,7,52,60,8 END *************** *** 434,438 **** LTEXT "Current system language is:",IDC_STATIC,6,9,123,8 LTEXT "Enter language name (3 letter):",IDC_STATIC,6,30,127,8 ! LTEXT "",IDC_LANG_NAME,140,9,40,8 END --- 434,438 ---- LTEXT "Current system language is:",IDC_STATIC,6,9,123,8 LTEXT "Enter language name (3 letter):",IDC_STATIC,6,30,127,8 ! LTEXT "",IDC_LANG_NAME,140,9,40,8,SS_NOPREFIX END *************** *** 476,509 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, 48,47 ! LTEXT "",IDC_R,245,173,50,8 ! LTEXT "",IDC_G,245,185,50,8 ! LTEXT "",IDC_B,245,197,50,8 GROUPBOX "Frame",IDC_STATIC,7,11,63,37 GROUPBOX "Background",IDC_STATIC,7,52,63,67 ! LTEXT "",IDC_XY,129,95,53,8 LTEXT "Mode:",IDC_STATIC,80,15,34,8 ! LTEXT "",IDC_MODE,130,15,53,8 LTEXT "Map Base:",IDC_STATIC,80,25,35,8 ! LTEXT "",IDC_MAPBASE,130,25,53,8 LTEXT "Char Base:",IDC_STATIC,80,35,36,8 ! LTEXT "",IDC_CHARBASE,130,35,53,8 LTEXT "Size:",IDC_STATIC,80,45,37,8 ! LTEXT "",IDC_DIM,130,45,53,8 LTEXT "Colors:",IDC_STATIC,80,55,37,8 ! LTEXT "",IDC_NUMCOLORS,130,55,53,8 LTEXT "Priority:",IDC_STATIC,80,65,37,8 ! LTEXT "",IDC_PRIORITY,130,65,53,8 LTEXT "Mosaic:",IDC_STATIC,80,75,37,8 ! LTEXT "",IDC_MOSAIC,130,75,53,8 LTEXT "Overflow:",IDC_STATIC,80,85,37,8 ! LTEXT "",IDC_OVERFLOW,130,85,53,8 LTEXT "Address:",IDC_STATIC,80,105,37,8 ! LTEXT "",IDC_ADDRESS,130,105,53,8 LTEXT "Tile:",IDC_STATIC,80,115,37,8 ! LTEXT "",IDC_TILE_NUM,130,115,53,8 LTEXT "Flip:",IDC_STATIC,80,125,37,8 ! LTEXT "",IDC_FLIP,130,125,53,8 LTEXT "Palette:",IDC_STATIC,80,135,37,8 ! LTEXT "",IDC_PALETTE_NUM,130,135,53,8 END --- 476,509 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, 48,47 ! LTEXT "",IDC_R,245,173,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,245,185,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,245,197,50,8,SS_NOPREFIX GROUPBOX "Frame",IDC_STATIC,7,11,63,37 GROUPBOX "Background",IDC_STATIC,7,52,63,67 ! LTEXT "",IDC_XY,129,95,53,8,SS_NOPREFIX LTEXT "Mode:",IDC_STATIC,80,15,34,8 ! LTEXT "",IDC_MODE,130,15,53,8,SS_NOPREFIX LTEXT "Map Base:",IDC_STATIC,80,25,35,8 ! LTEXT "",IDC_MAPBASE,130,25,53,8,SS_NOPREFIX LTEXT "Char Base:",IDC_STATIC,80,35,36,8 ! LTEXT "",IDC_CHARBASE,130,35,53,8,SS_NOPREFIX LTEXT "Size:",IDC_STATIC,80,45,37,8 ! LTEXT "",IDC_DIM,130,45,53,8,SS_NOPREFIX LTEXT "Colors:",IDC_STATIC,80,55,37,8 ! LTEXT "",IDC_NUMCOLORS,130,55,53,8,SS_NOPREFIX LTEXT "Priority:",IDC_STATIC,80,65,37,8 ! LTEXT "",IDC_PRIORITY,130,65,53,8,SS_NOPREFIX LTEXT "Mosaic:",IDC_STATIC,80,75,37,8 ! LTEXT "",IDC_MOSAIC,130,75,53,8,SS_NOPREFIX LTEXT "Overflow:",IDC_STATIC,80,85,37,8 ! LTEXT "",IDC_OVERFLOW,130,85,53,8,SS_NOPREFIX LTEXT "Address:",IDC_STATIC,80,105,37,8 ! LTEXT "",IDC_ADDRESS,130,105,53,8,SS_NOPREFIX LTEXT "Tile:",IDC_STATIC,80,115,37,8 ! LTEXT "",IDC_TILE_NUM,130,115,53,8,SS_NOPREFIX LTEXT "Flip:",IDC_STATIC,80,125,37,8 ! LTEXT "",IDC_FLIP,130,125,53,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,80,135,37,8 ! LTEXT "",IDC_PALETTE_NUM,130,135,53,8,SS_NOPREFIX END *************** *** 517,525 **** PUSHBUTTON "&Refresh",IDC_REFRESH2,166,245,50,14 PUSHBUTTON "&Close",IDC_CLOSE,234,245,50,14 ! LTEXT "",IDC_ADDRESS,53,168,50,8 ! LTEXT "",IDC_R,53,180,50,8 ! LTEXT "",IDC_G,53,192,50,8 ! LTEXT "",IDC_B,53,204,50,8 ! LTEXT "",IDC_VALUE,53,216,50,8 CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,161,168, 50,50 --- 517,525 ---- PUSHBUTTON "&Refresh",IDC_REFRESH2,166,245,50,14 PUSHBUTTON "&Close",IDC_CLOSE,234,245,50,14 ! LTEXT "",IDC_ADDRESS,53,168,50,8,SS_NOPREFIX ! LTEXT "",IDC_R,53,180,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,53,192,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,53,204,50,8,SS_NOPREFIX ! LTEXT "",IDC_VALUE,53,216,50,8,SS_NOPREFIX CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,161,168, 50,50 *************** *** 590,605 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, 47 ! LTEXT "",IDC_POS,31,47,50,8 ! LTEXT "",IDC_MODE,31,57,50,8 ! LTEXT "",IDC_COLORS,31,67,50,8 ! LTEXT "",IDC_PALETTE,31,77,50,8 ! LTEXT "",IDC_TILE,31,87,50,8 ! LTEXT "",IDC_PRIO,31,97,50,8 ! LTEXT "",IDC_SIZE2,31,107,50,8 ! LTEXT "",IDC_ROT,31,117,50,8 ! LTEXT "",IDC_FLAGS,31,127,50,8 ! LTEXT "",IDC_R,145,88,50,8 ! LTEXT "",IDC_G,145,100,50,8 ! LTEXT "",IDC_B,145,112,50,8 LTEXT "Pos:",IDC_STATIC,7,47,24,8 LTEXT "Mode:",IDC_STATIC,7,57,24,8 --- 590,605 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, 47 ! LTEXT "",IDC_POS,31,47,50,8,SS_NOPREFIX ! LTEXT "",IDC_MODE,31,57,50,8,SS_NOPREFIX ! LTEXT "",IDC_COLORS,31,67,50,8,SS_NOPREFIX ! LTEXT "",IDC_PALETTE,31,77,50,8,SS_NOPREFIX ! LTEXT "",IDC_TILE,31,87,50,8,SS_NOPREFIX ! LTEXT "",IDC_PRIO,31,97,50,8,SS_NOPREFIX ! LTEXT "",IDC_SIZE2,31,107,50,8,SS_NOPREFIX ! LTEXT "",IDC_ROT,31,117,50,8,SS_NOPREFIX ! LTEXT "",IDC_FLAGS,31,127,50,8,SS_NOPREFIX ! LTEXT "",IDC_R,145,88,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,145,100,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,145,112,50,8,SS_NOPREFIX LTEXT "Pos:",IDC_STATIC,7,47,24,8 LTEXT "Mode:",IDC_STATIC,7,57,24,8 *************** *** 673,679 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,183,48, 47 ! LTEXT "",IDC_R,156,192,50,8 ! LTEXT "",IDC_G,156,204,50,8 ! LTEXT "",IDC_B,156,216,50,8 LTEXT "Palette:",IDC_STATIC,7,113,65,8 CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", --- 673,679 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,183,48, 47 ! LTEXT "",IDC_R,156,192,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,156,204,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,156,216,50,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,7,113,65,8 CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", *************** *** 681,686 **** LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 ! LTEXT "",IDC_TILE_NUMBER,135,14,50,8 ! LTEXT "",IDC_ADDRESS,135,26,50,8 END --- 681,686 ---- LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 ! LTEXT "",IDC_TILE_NUMBER,135,14,50,8,SS_NOPREFIX ! LTEXT "",IDC_ADDRESS,135,26,50,8,SS_NOPREFIX END *************** *** 741,760 **** LTEXT "R6:",IDC_STATIC,309,55,18,8 LTEXT "R7:",IDC_STATIC,309,63,18,8 ! LTEXT "",IDC_R0,344,7,52,8 ! LTEXT "",IDC_R1,344,15,52,8 ! LTEXT "",IDC_R2,344,23,52,8 ! LTEXT "",IDC_R3,344,31,52,8 ! LTEXT "",IDC_R4,344,39,52,8 ! LTEXT "",IDC_R5,344,47,52,8 ! LTEXT "",IDC_R6,344,55,52,8 ! LTEXT "",IDC_R7,344,63,52,8 ! LTEXT "",IDC_R8,344,71,52,8 ! LTEXT "",IDC_R9,344,79,52,8 ! LTEXT "",IDC_R10,344,87,52,8 ! LTEXT "",IDC_R11,344,95,52,8 ! LTEXT "",IDC_R12,344,103,52,8 ! LTEXT "",IDC_R13,344,111,52,8 ! LTEXT "",IDC_R14,344,119,52,8 ! LTEXT "",IDC_R15,344,127,52,8 LTEXT "R8:",IDC_STATIC,309,71,18,8 LTEXT "R9:",IDC_STATIC,309,79,18,8 --- 741,760 ---- LTEXT "R6:",IDC_STATIC,309,55,18,8 LTEXT "R7:",IDC_STATIC,309,63,18,8 ! LTEXT "",IDC_R0,344,7,52,8,SS_NOPREFIX ! LTEXT "",IDC_R1,344,15,52,8,SS_NOPREFIX ! LTEXT "",IDC_R2,344,23,52,8,SS_NOPREFIX ! LTEXT "",IDC_R3,344,31,52,8,SS_NOPREFIX ! LTEXT "",IDC_R4,344,39,52,8,SS_NOPREFIX ! LTEXT "",IDC_R5,344,47,52,8,SS_NOPREFIX ! LTEXT "",IDC_R6,344,55,52,8,SS_NOPREFIX ! LTEXT "",IDC_R7,344,63,52,8,SS_NOPREFIX ! LTEXT "",IDC_R8,344,71,52,8,SS_NOPREFIX ! LTEXT "",IDC_R9,344,79,52,8,SS_NOPREFIX ! LTEXT "",IDC_R10,344,87,52,8,SS_NOPREFIX ! LTEXT "",IDC_R11,344,95,52,8,SS_NOPREFIX ! LTEXT "",IDC_R12,344,103,52,8,SS_NOPREFIX ! LTEXT "",IDC_R13,344,111,52,8,SS_NOPREFIX ! LTEXT "",IDC_R14,344,119,52,8,SS_NOPREFIX ! LTEXT "",IDC_R15,344,127,52,8,SS_NOPREFIX LTEXT "R8:",IDC_STATIC,309,71,18,8 LTEXT "R9:",IDC_STATIC,309,79,18,8 *************** *** 765,769 **** LTEXT "R14:",IDC_STATIC,309,119,18,8 LTEXT "R15:",IDC_STATIC,309,127,18,8 ! LTEXT "",IDC_R16,344,135,52,8 LTEXT "R16:",IDC_STATIC,309,135,20,8 CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | --- 765,769 ---- LTEXT "R14:",IDC_STATIC,309,119,18,8 LTEXT "R15:",IDC_STATIC,309,127,18,8 ! LTEXT "",IDC_R16,344,135,52,8,SS_NOPREFIX LTEXT "R16:",IDC_STATIC,309,135,20,8 CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | *************** *** 782,786 **** WS_TABSTOP,342,166,21,10 LTEXT "Mode:",IDC_STATIC,341,176,21,8 ! LTEXT "",IDC_MODE,376,176,20,8 SCROLLBAR IDC_VSCROLL,283,25,10,161,SBS_VERT PUSHBUTTON "Goto R15",IDC_GOPC,7,204,50,14 --- 782,786 ---- WS_TABSTOP,342,166,21,10 LTEXT "Mode:",IDC_STATIC,341,176,21,8 ! LTEXT "",IDC_MODE,376,176,20,8,SS_NOPREFIX SCROLLBAR IDC_VSCROLL,283,25,10,161,SBS_VERT PUSHBUTTON "Goto R15",IDC_GOPC,7,204,50,14 *************** *** 805,809 **** PUSHBUTTON "Cancel",ID_CANCEL,67,23,50,14 LTEXT "Waiting for connection on port:",IDC_STATIC,7,7,117,8 ! LTEXT "",IDC_PORT,143,7,36,8 END --- 805,809 ---- PUSHBUTTON "Cancel",ID_CANCEL,67,23,50,14 LTEXT "Waiting for connection on port:",IDC_STATIC,7,7,117,8 ! LTEXT "",IDC_PORT,143,7,36,8,SS_NOPREFIX END *************** *** 926,934 **** LTEXT "HL:",IDC_STATIC,250,55,18,8 LTEXT "IFF:",IDC_STATIC,250,85,18,8 ! LTEXT "",IDC_R0,285,25,52,8 ! LTEXT "",IDC_R1,285,35,52,8 ! LTEXT "",IDC_R2,285,45,52,8 ! LTEXT "",IDC_R3,285,55,52,8 ! LTEXT "",IDC_R6,285,85,52,8 CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,109,21,10 --- 926,934 ---- LTEXT "HL:",IDC_STATIC,250,55,18,8 LTEXT "IFF:",IDC_STATIC,250,85,18,8 ! LTEXT "",IDC_R0,285,25,52,8,SS_NOPREFIX ! LTEXT "",IDC_R1,285,35,52,8,SS_NOPREFIX ! LTEXT "",IDC_R2,285,45,52,8,SS_NOPREFIX ! LTEXT "",IDC_R3,285,55,52,8,SS_NOPREFIX ! LTEXT "",IDC_R6,285,85,52,8,SS_NOPREFIX CONTROL "N",IDC_N,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,250,109,21,10 *************** *** 942,948 **** PUSHBUTTON "Goto PC",IDC_GOPC,7,204,50,14 LTEXT "SP:",IDC_STATIC,250,65,18,8 ! LTEXT "",IDC_R4,285,65,52,8 LTEXT "PC:",IDC_STATIC,250,75,18,8 ! LTEXT "",IDC_R5,285,75,52,8 END --- 942,948 ---- PUSHBUTTON "Goto PC",IDC_GOPC,7,204,50,14 LTEXT "SP:",IDC_STATIC,250,65,18,8 ! LTEXT "",IDC_R4,285,65,52,8,SS_NOPREFIX LTEXT "PC:",IDC_STATIC,250,75,18,8 ! LTEXT "",IDC_R5,285,75,52,8,SS_NOPREFIX END *************** *** 966,978 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, 47 ! LTEXT "",IDC_POS,31,47,50,8 ! LTEXT "",IDC_PALETTE,31,87,50,8 ! LTEXT "",IDC_TILE,31,57,50,8 ! LTEXT "",IDC_PRIO,31,67,50,8 ! LTEXT "",IDC_OAP,31,77,50,8 ! LTEXT "",IDC_FLAGS,31,97,50,8 ! LTEXT "",IDC_R,145,88,50,8 ! LTEXT "",IDC_G,145,100,50,8 ! LTEXT "",IDC_B,145,112,50,8 LTEXT "Pos:",IDC_STATIC,7,47,24,8 LTEXT "Pal:",IDC_STATIC,7,87,24,8 --- 966,978 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,87,79,48, 47 ! LTEXT "",IDC_POS,31,47,50,8,SS_NOPREFIX ! LTEXT "",IDC_PALETTE,31,87,50,8,SS_NOPREFIX ! LTEXT "",IDC_TILE,31,57,50,8,SS_NOPREFIX ! LTEXT "",IDC_PRIO,31,67,50,8,SS_NOPREFIX ! LTEXT "",IDC_OAP,31,77,50,8,SS_NOPREFIX ! LTEXT "",IDC_FLAGS,31,97,50,8,SS_NOPREFIX ! LTEXT "",IDC_R,145,88,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,145,100,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,145,112,50,8,SS_NOPREFIX LTEXT "Pos:",IDC_STATIC,7,47,24,8 LTEXT "Pal:",IDC_STATIC,7,87,24,8 *************** *** 984,988 **** CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 ! LTEXT "",IDC_BANK,31,107,50,8 LTEXT "Bank:",IDC_STATIC,7,107,24,8 END --- 984,988 ---- CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,150,71,10 ! LTEXT "",IDC_BANK,31,107,50,8,SS_NOPREFIX LTEXT "Bank:",IDC_STATIC,7,107,24,8 END *************** *** 1013,1019 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,156,48, 47 ! LTEXT "",IDC_R,156,164,50,8 ! LTEXT "",IDC_G,156,176,50,8 ! LTEXT "",IDC_B,156,188,50,8 LTEXT "Palette:",IDC_STATIC,7,86,65,8 CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", --- 1013,1019 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,98,156,48, 47 ! LTEXT "",IDC_R,156,164,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,156,176,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,156,188,50,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,7,86,65,8 CONTROL "Automatic update",IDC_AUTO_UPDATE,"Button", *************** *** 1021,1026 **** LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 ! LTEXT "",IDC_TILE_NUMBER,135,14,50,8 ! LTEXT "",IDC_ADDRESS,135,26,50,8 CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32", TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,98,76,22 --- 1021,1026 ---- LTEXT "Tile:",IDC_STATIC,79,14,41,8 LTEXT "Address:",IDC_STATIC,79,26,41,8 ! LTEXT "",IDC_TILE_NUMBER,135,14,50,8,SS_NOPREFIX ! LTEXT "",IDC_ADDRESS,135,26,50,8,SS_NOPREFIX CONTROL "Slider1",IDC_PALETTE_SLIDER,"msctls_trackbar32", TBS_AUTOTICKS | WS_GROUP | WS_TABSTOP,1,98,76,22 *************** *** 1050,1071 **** CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, 48,47 ! LTEXT "",IDC_R,245,173,50,8 ! LTEXT "",IDC_G,245,185,50,8 ! LTEXT "",IDC_B,245,197,50,8 GROUPBOX "Char Base",IDC_STATIC,7,11,63,37 GROUPBOX "Map Base",IDC_STATIC,7,52,63,41 CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,55,10 ! LTEXT "",IDC_XY,129,18,53,8 LTEXT "Priority:",IDC_STATIC,80,68,37,8 ! LTEXT "",IDC_PRIORITY,130,68,53,8 LTEXT "Address:",IDC_STATIC,80,28,37,8 ! LTEXT "",IDC_ADDRESS,130,28,53,8 LTEXT "Tile:",IDC_STATIC,80,38,37,8 ! LTEXT "",IDC_TILE_NUM,130,38,53,8 LTEXT "Flip:",IDC_STATIC,80,48,37,8 ! LTEXT "",IDC_FLIP,130,48,53,8 LTEXT "Palette:",IDC_STATIC,80,58,37,8 ! LTEXT "",IDC_PALETTE_NUM,130,58,53,8 END --- 1050,1071 ---- CONTROL "Color",IDC_COLOR,"VbaColorControl",WS_TABSTOP,187,164, 48,47 ! LTEXT "",IDC_R,245,173,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,245,185,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,245,197,50,8,SS_NOPREFIX GROUPBOX "Char Base",IDC_STATIC,7,11,63,37 GROUPBOX "Map Base",IDC_STATIC,7,52,63,41 CONTROL "Auto update",IDC_AUTO_UPDATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,134,55,10 ! LTEXT "",IDC_XY,129,18,53,8,SS_NOPREFIX LTEXT "Priority:",IDC_STATIC,80,68,37,8 ! LTEXT "",IDC_PRIORITY,130,68,53,8,SS_NOPREFIX LTEXT "Address:",IDC_STATIC,80,28,37,8 ! LTEXT "",IDC_ADDRESS,130,28,53,8,SS_NOPREFIX LTEXT "Tile:",IDC_STATIC,80,38,37,8 ! LTEXT "",IDC_TILE_NUM,130,38,53,8,SS_NOPREFIX LTEXT "Flip:",IDC_STATIC,80,48,37,8 ! LTEXT "",IDC_FLIP,130,48,53,8,SS_NOPREFIX LTEXT "Palette:",IDC_STATIC,80,58,37,8 ! LTEXT "",IDC_PALETTE_NUM,130,58,53,8,SS_NOPREFIX END *************** *** 1079,1087 **** PUSHBUTTON "&Refresh",IDC_REFRESH2,139,191,50,14 PUSHBUTTON "&Close",IDC_CLOSE,73,213,50,14 ! LTEXT "",IDC_ADDRESS,53,117,50,8 ! LTEXT "",IDC_R,53,129,50,8 ! LTEXT "",IDC_G,53,141,50,8 ! LTEXT "",IDC_B,53,153,50,8 ! LTEXT "",IDC_VALUE,53,165,50,8 CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,119,117, 50,50 --- 1079,1087 ---- PUSHBUTTON "&Refresh",IDC_REFRESH2,139,191,50,14 PUSHBUTTON "&Close",IDC_CLOSE,73,213,50,14 ! LTEXT "",IDC_ADDRESS,53,117,50,8,SS_NOPREFIX ! LTEXT "",IDC_R,53,129,50,8,SS_NOPREFIX ! LTEXT "",IDC_G,53,141,50,8,SS_NOPREFIX ! LTEXT "",IDC_B,53,153,50,8,SS_NOPREFIX ! LTEXT "",IDC_VALUE,53,165,50,8,SS_NOPREFIX CONTROL "Custom1",IDC_COLOR,"VbaColorControl",WS_TABSTOP,119,117, 50,50 *************** *** 1112,1116 **** CTEXT "Do you want to keep the current mode?",IDC_STATIC,7,7, 172,8 ! CTEXT "",IDC_TIMER,7,19,172,8 END --- 1112,1116 ---- CTEXT "Do you want to keep the current mode?",IDC_STATIC,7,7, 172,8 ! CTEXT "",IDC_TIMER,7,19,172,8,SS_NOPREFIX,WS_EX_TOOLWINDOW END *************** *** 2097,2100 **** --- 2097,2101 ---- MENUITEM "Bug Report", ID_HELP_BUGREPORT MENUITEM "FAQ (website)", ID_HELP_FAQ + MENUITEM "GNU Public License...", ID_HELP_GNUPUBLICLICENSE MENUITEM SEPARATOR MENUITEM "&About...", ID_HELP_ABOUT Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** resource.h 5 Nov 2004 00:50:37 -0000 1.37 --- resource.h 18 Dec 2004 23:11:08 -0000 1.38 *************** *** 746,749 **** --- 746,750 ---- #define ID_OPTIONS_FILTER_LQ2X 40275 #define ID_OPTIONS_EMULATOR_GAMEOVERRIDES 40276 + #define ID_HELP_GNUPUBLICLICENSE 40277 // Next default values for new objects *************** *** 752,756 **** #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 --- 753,757 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 158 ! #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 #define _APS_NEXT_SYMED_VALUE 103 Index: MainWndHelp.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndHelp.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainWndHelp.cpp 13 May 2004 15:06:50 -0000 1.4 --- MainWndHelp.cpp 18 Dec 2004 23:11:08 -0000 1.5 *************** *** 45,46 **** --- 45,52 ---- dlg.DoModal(); } + + void MainWnd::OnHelpGnupubliclicense() + { + ::ShellExecute(0, _T("open"), "http://www.gnu.org/licenses/gpl.html", + 0, 0, SW_SHOWNORMAL); + } |
|
From: Pokemonhacker <pok...@us...> - 2004-12-18 23:10:28
|
Update of /cvsroot/vba/VisualBoyAdvance/src/sdl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22355 Modified Files: debugger.cpp Log Message: - Added GPL link to Help menu - Fixed problem displaying rom names that use & character - SDL debugger improvements adapted from VBA-H: break on change, conditional breakpoints (ARM and THUMB), dump load and save (memory), edit register, disassemble to file, save and load state from debugger, - Fix lq2x filter (was using hq2x code) - Major AR V1/2/3 support by PokemonHacker - Simplified GBA emulation loop (easier to understand and maintain) - Fixed some bugs with IntrWait emulation - Fixed some timer bugs - Fixed memory timing when loading a save state (was using the timings before loading the state) - Added emulation for DMA interaction with reading from invalid address - Fixed bug writing to IO register past 0x4000400 (no mirroring) - Ignore 8-bit writes to OBJ and OAM memory Index: debugger.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/sdl/debugger.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** debugger.cpp 15 Sep 2004 22:12:54 -0000 1.3 --- debugger.cpp 18 Dec 2004 23:10:18 -0000 1.4 *************** *** 17,20 **** --- 17,22 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + // Parts adapted from VBA-H (VBA for Hackers) by LabMaster + #include <stdio.h> #include <stdlib.h> *************** *** 29,32 **** --- 31,36 ---- [...1728 lines suppressed...] ! return false; //should never happen ! } ! } ! ! /*extern*/ void debuggerOutput(char *s, u32 addr) { if(s) *************** *** 1442,1446 **** } ! void debuggerMain() { char buffer[1024]; --- 2173,2177 ---- } ! /*extern*/ void debuggerMain() { char buffer[1024]; |
|
From: Pokemonhacker <pok...@us...> - 2004-12-18 23:10:09
|
Update of /cvsroot/vba/VisualBoyAdvance/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22222 Modified Files: AutoBuild.h Cheats.cpp Cheats.h GBA.cpp GBA.h GBAinline.h hq2x.cpp Sound.cpp Log Message: - Added GPL link to Help menu - Fixed problem displaying rom names that use & character - SDL debugger improvements adapted from VBA-H: break on change, conditional breakpoints (ARM and THUMB), dump load and save (memory), edit register, disassemble to file, save and load state from debugger, - Fix lq2x filter (was using hq2x code) - Major AR V1/2/3 support by PokemonHacker - Simplified GBA emulation loop (easier to understand and maintain) - Fixed some bugs with IntrWait emulation - Fixed some timer bugs - Fixed memory timing when loading a save state (was using the timings before loading the state) - Added emulation for DMA interaction with reading from invalid address - Fixed bug writing to IO register past 0x4000400 (no mirroring) - Ignore 8-bit writes to OBJ and OAM memory Index: Cheats.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Cheats.h 13 May 2004 15:06:43 -0000 1.8 --- Cheats.h 18 Dec 2004 23:09:56 -0000 1.9 *************** *** 26,29 **** --- 26,30 ---- int status; bool enabled; + u32 rawaddress; u32 address; u32 value; *************** *** 33,37 **** }; ! extern void cheatsAdd(const char *,const char *,u32,u32,int,int); extern void cheatsAddCheatCode(const char *code, const char *desc); extern void cheatsAddGSACode(const char *code, const char *desc, bool v3); --- 34,38 ---- }; ! extern void cheatsAdd(const char *,const char *,u32, u32,u32,int,int); extern void cheatsAddCheatCode(const char *code, const char *desc); extern void cheatsAddGSACode(const char *code, const char *desc, bool v3); *************** *** 46,52 **** extern void cheatsSaveCheatList(const char *file); extern bool cheatsLoadCheatList(const char *file); ! extern void cheatsWriteMemory(u32 *, u32, u32); ! extern void cheatsWriteHalfWord(u16 *, u16, u16); ! extern void cheatsWriteByte(u8 *, u8); extern int cheatsCheckKeys(u32,u32); extern int cheatsNumber; --- 47,53 ---- extern void cheatsSaveCheatList(const char *file); extern bool cheatsLoadCheatList(const char *file); ! extern void cheatsWriteMemory(u32, u32); ! extern void cheatsWriteHalfWord(u32, u16); ! extern void cheatsWriteByte(u32, u8); extern int cheatsCheckKeys(u32,u32); extern int cheatsNumber; Index: GBAinline.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBAinline.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** GBAinline.h 13 May 2004 15:06:44 -0000 1.10 --- GBAinline.h 18 Dec 2004 23:09:56 -0000 1.11 *************** *** 29,32 **** --- 29,35 ---- extern bool cpuEEPROMEnabled; extern bool cpuEEPROMSensorEnabled; + extern bool cpuDmaHack; + extern bool cpuDmaHack2; + extern u32 cpuDmaLast; #define CPUReadByteQuick(addr) \ *************** *** 117,122 **** } #endif ! ! // if(ioMem[0x205] & 0x40) { if(armState) { value = CPUReadMemoryQuick(reg[15].I); --- 120,127 ---- } #endif ! ! if(cpuDmaHack || cpuDmaHack2) { ! value = cpuDmaLast; ! } else { if(armState) { value = CPUReadMemoryQuick(reg[15].I); *************** *** 125,132 **** CPUReadHalfWordQuick(reg[15].I) << 16; } ! // } else { ! // value = *((u32 *)&bios[address & 0x3ffc]); ! // } ! // return 0xFFFFFFFF; } --- 130,134 ---- CPUReadHalfWordQuick(reg[15].I) << 16; } ! } } *************** *** 233,241 **** } #endif ! extern bool cpuDmaHack; ! extern u32 cpuDmaLast; ! extern int cpuDmaCount; ! if(cpuDmaHack && cpuDmaCount) { ! value = (u16)cpuDmaLast; } else { if(armState) { --- 235,240 ---- } #endif ! if(cpuDmaHack2 || cpuDmaHack) { ! value = cpuDmaLast & 0xFFFF; } else { if(armState) { *************** *** 245,252 **** } } - // return value; - // if(address & 1) - // value = (value >> 8) | ((value & 0xFF) << 24); - // return 0xFFFF; break; } --- 244,247 ---- *************** *** 326,341 **** unreadable: #ifdef DEV_VERSION ! if(systemVerbose & VERBOSE_ILLEGAL_READ) { ! log("Illegal byte read: %08x at %08x\n", address, armMode ? ! armNextPC - 4 : armNextPC - 2); ! } #endif ! ! if(armState) { ! return CPUReadByteQuick(reg[15].I+(address & 3)); } else { ! return CPUReadByteQuick(reg[15].I+(address & 1)); } - // return 0xFF; break; } --- 321,338 ---- unreadable: #ifdef DEV_VERSION ! if(systemVerbose & VERBOSE_ILLEGAL_READ) { ! log("Illegal byte read: %08x at %08x\n", address, armMode ? ! armNextPC - 4 : armNextPC - 2); ! } #endif ! if(cpuDmaHack || cpuDmaHack2) { ! return cpuDmaLast & 0xFF; } else { ! if(armState) { ! return CPUReadByteQuick(reg[15].I+(address & 3)); ! } else { ! return CPUReadByteQuick(reg[15].I+(address & 1)); ! } } break; } *************** *** 359,365 **** #ifdef SDL if(*((u32 *)&freezeWorkRAM[address & 0x3FFFC])) ! cheatsWriteMemory((u32 *)&workRAM[address & 0x3FFFC], ! value, ! *((u32 *)&freezeWorkRAM[address & 0x3FFFC])); else #endif --- 356,361 ---- #ifdef SDL if(*((u32 *)&freezeWorkRAM[address & 0x3FFFC])) ! cheatsWriteMemory(address & 0x203FFFC, ! value); else #endif *************** *** 369,375 **** #ifdef SDL if(*((u32 *)&freezeInternalRAM[address & 0x7ffc])) ! cheatsWriteMemory((u32 *)&internalRAM[address & 0x7FFC], ! value, ! *((u32 *)&freezeInternalRAM[address & 0x7ffc])); else #endif --- 365,370 ---- #ifdef SDL if(*((u32 *)&freezeInternalRAM[address & 0x7ffc])) ! cheatsWriteMemory(address & 0x3007FFC, ! value); else #endif *************** *** 377,382 **** break; case 0x04: ! CPUUpdateRegister((address & 0x3FC), value & 0xFFFF); ! CPUUpdateRegister((address & 0x3FC) + 2, (value >> 16)); break; case 0x05: --- 372,379 ---- break; case 0x04: ! if(address < 0x4000400) { ! CPUUpdateRegister((address & 0x3FC), value & 0xFFFF); ! CPUUpdateRegister((address & 0x3FC) + 2, (value >> 16)); ! } else goto unwritable; break; case 0x05: Index: Cheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Cheats.cpp 10 Nov 2004 22:14:56 -0000 1.24 --- Cheats.cpp 18 Dec 2004 23:09:56 -0000 1.25 *************** *** 30,52 **** /** ! * Gameshark code types: * * NNNNNNNN 001DC0DE - ID code for the game (game 4 character name) from ROM ! * DEADFACE XXXXXXXX - changes decryption seeds * 0AAAAAAA 000000YY - 8-bit constant write * 1AAAAAAA 0000YYYY - 16-bit constant write * 2AAAAAAA YYYYYYYY - 32-bit constant write ! * 3AAAAAAA YYYYYYYY - ?? [...1871 lines suppressed...] ! return; } #endif #endif ! } \ No newline at end of file --- 2758,2770 ---- #ifdef SDL if(cheatsNumber == 0) { ! int type = cheatsGetType(address); ! u8 oldValue = debuggerReadByte(address); ! if(type == 1 || (type == 2 && oldValue != value)) { ! debuggerBreakOnWrite(address, oldValue, value, 0, type); ! cpuNextEvent = 0; ! } ! debuggerWriteByte(address, value); } #endif #endif ! } Index: Sound.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/Sound.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Sound.cpp 13 May 2004 15:06:44 -0000 1.14 --- Sound.cpp 18 Dec 2004 23:09:56 -0000 1.15 *************** *** 30,33 **** --- 30,34 ---- extern bool stopState; + extern bool cpuDmaHack2; u8 soundWavePattern[4][32] = { *************** *** 852,856 **** if(soundDSAEnabled) { if(soundDSFifoACount <= 16) { ! CPUCheckDMA(3, 2); if(soundDSFifoACount <= 16) { soundEvent(FIFOA_L, (u16)0); --- 853,857 ---- if(soundDSAEnabled) { if(soundDSFifoACount <= 16) { ! cpuDmaHack2 = CPUCheckDMA(3, 2); if(soundDSFifoACount <= 16) { soundEvent(FIFOA_L, (u16)0); *************** *** 881,885 **** if(soundDSBEnabled) { if(soundDSFifoBCount <= 16) { ! CPUCheckDMA(3, 4); if(soundDSFifoBCount <= 16) { soundEvent(FIFOB_L, (u16)0); --- 882,886 ---- if(soundDSBEnabled) { if(soundDSFifoBCount <= 16) { ! cpuDmaHack2 = CPUCheckDMA(3, 4); if(soundDSFifoBCount <= 16) { soundEvent(FIFOB_L, (u16)0); Index: GBA.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** GBA.cpp 14 Nov 2004 18:54:14 -0000 1.58 --- GBA.cpp 18 Dec 2004 23:09:56 -0000 1.59 *************** *** 67,78 **** #endif - #define CPU_BREAK_LOOP \ - cpuSavedTicks = cpuSavedTicks - *extCpuLoopTicks;\ - *extCpuLoopTicks = *extClockTicks; - - #define CPU_BREAK_LOOP_2 \ - cpuSavedTicks = cpuSavedTicks - *extCpuLoopTicks;\ - *extCpuLoopTicks = *extClockTicks;\ - *extTicks = *extClockTicks; extern int emulating; --- 67,70 ---- *************** *** 80,90 **** int cpuDmaTicksToUpdate = 0; int cpuDmaCount = 0; ! bool cpuDmaHack = 0; u32 cpuDmaLast = 0; int dummyAddress = 0; ! int *extCpuLoopTicks = NULL; ! int *extClockTicks = NULL; ! int *extTicks = NULL; int gbaSaveType = 0; // used to remember the save type on reset --- 72,83 ---- int cpuDmaTicksToUpdate = 0; int cpuDmaCount = 0; ! bool cpuDmaHack = false; ! bool cpuDmaHack2 = false; u32 cpuDmaLast = 0; int dummyAddress = 0; ! bool cpuBreakLoop = true; ! int cpuNextEvent = 0; ! int cpuTotalTicks = 0; int gbaSaveType = 0; // used to remember the save type on reset *************** *** 108,113 **** static int profilScale = 0; #endif ! bool freezeWorkRAM[0x40000]; ! bool freezeInternalRAM[0x8000]; int lcdTicks = 960; bool timer0On = false; --- 101,106 ---- static int profilScale = 0; #endif ! u8 freezeWorkRAM[0x40000]; ! u8 freezeInternalRAM[0x8000]; int lcdTicks = 960; bool timer0On = false; *************** *** 341,345 **** 0xE3A01001, 0xE92D4010, - 0xE3A0C301, 0xE3A03000, 0xE3A04001, --- 334,337 ---- *************** *** 351,359 **** 0xE8BD4010, 0xE12FFF1E, 0xE5CC3208, 0xE15C20B8, 0xE0110002, ! 0x10200002, ! 0x114C00B8, 0xE5CC4208, 0xE12FFF1E, --- 343,352 ---- 0xE8BD4010, 0xE12FFF1E, + 0xE3A0C301, 0xE5CC3208, 0xE15C20B8, 0xE0110002, ! 0x10222000, ! 0x114C20B8, 0xE5CC4208, 0xE12FFF1E, *************** *** 508,513 **** }; - //int cpuLoopTicks = 0; - int cpuSavedTicks = 0; static int romSize = 0x2000000; --- 501,504 ---- *************** *** 557,561 **** cpuLoopTicks = soundTicks; ! if(timer0On && !(TM0CNT & 4) && (timer0Ticks < cpuLoopTicks)) { cpuLoopTicks = timer0Ticks; } --- 548,552 ---- cpuLoopTicks = soundTicks; ! if(timer0On && (timer0Ticks < cpuLoopTicks)) { cpuLoopTicks = timer0Ticks; } *************** *** 576,580 **** } #endif - cpuSavedTicks = cpuLoopTicks; return cpuLoopTicks; } --- 567,570 ---- *************** *** 838,841 **** --- 828,833 ---- THUMB_PREFETCH; } + + CPUUpdateRegister(0x204, CPUReadHalfWordQuick(0x4000204)); return true; *************** *** 1499,1503 **** if(breakLoop) { if(armIrqEnable && (IF & IE) && (IME & 1)) { ! CPU_BREAK_LOOP_2; } } --- 1491,1495 ---- if(breakLoop) { if(armIrqEnable && (IF & IE) && (IME & 1)) { ! cpuNextEvent = 0; } } *************** *** 1708,1712 **** if(comment == 0xf9) { emulating = 0; ! CPU_BREAK_LOOP_2; return; } --- 1700,1705 ---- if(comment == 0xf9) { emulating = 0; ! cpuNextEvent = 0; ! cpuBreakLoop = true; return; } *************** *** 1747,1750 **** --- 1740,1744 ---- holdState = true; holdType = -1; + cpuNextEvent = 0; break; case 0x03: *************** *** 1758,1761 **** --- 1752,1756 ---- holdType = -1; stopState = true; + cpuNextEvent = 0; break; case 0x04: *************** *** 1910,1914 **** } else { while(c != 0) { ! CPUWriteMemory(d, CPUReadMemory(s)); d += di; s += si; --- 1905,1910 ---- } else { while(c != 0) { ! cpuDmaLast = CPUReadMemory(s); ! CPUWriteMemory(d, cpuDmaLast); d += di; s += si; *************** *** 1930,1933 **** --- 1926,1930 ---- cpuDmaLast = CPUReadHalfWord(s); CPUWriteHalfWord(d, cpuDmaLast); + cpuDmaLast |= (cpuDmaLast<<16); d += di; s += si; *************** *** 1955,1969 **** cpuDmaTicksToUpdate += totalTicks; ! if(*extCpuLoopTicks >= 0) { ! CPU_BREAK_LOOP; ! } } ! void CPUCheckDMA(int reason, int dmamask) { cpuDmaHack = 0; // DMA 0 if((DM0CNT_H & 0x8000) && (dmamask & 1)) { if(((DM0CNT_H >> 12) & 3) == reason) { u32 sourceIncrement = 4; u32 destIncrement = 4; --- 1952,1966 ---- cpuDmaTicksToUpdate += totalTicks; ! cpuNextEvent = 0; } ! bool CPUCheckDMA(int reason, int dmamask) { + bool res = false; cpuDmaHack = 0; // DMA 0 if((DM0CNT_H & 0x8000) && (dmamask & 1)) { if(((DM0CNT_H >> 12) & 3) == reason) { + res = true; u32 sourceIncrement = 4; u32 destIncrement = 4; *************** *** 2001,2005 **** DM0CNT_L ? DM0CNT_L : 0x4000, DM0CNT_H & 0x0400); ! cpuDmaHack = 1; if(DM0CNT_H & 0x4000) { IF |= 0x0100; --- 1998,2002 ---- DM0CNT_L ? DM0CNT_L : 0x4000, DM0CNT_H & 0x0400); ! cpuDmaHack = true; if(DM0CNT_H & 0x4000) { IF |= 0x0100; *************** *** 2021,2024 **** --- 2018,2022 ---- if((DM1CNT_H & 0x8000) && (dmamask & 2)) { if(((DM1CNT_H >> 12) & 3) == reason) { + res = true; u32 sourceIncrement = 4; u32 destIncrement = 4; *************** *** 2068,2072 **** DM1CNT_H & 0x0400); } ! cpuDmaHack = 1; if(DM1CNT_H & 0x4000) { --- 2066,2070 ---- DM1CNT_H & 0x0400); } ! cpuDmaHack = true; if(DM1CNT_H & 0x4000) { *************** *** 2089,2092 **** --- 2087,2091 ---- if((DM2CNT_H & 0x8000) && (dmamask & 4)) { if(((DM2CNT_H >> 12) & 3) == reason) { + res = true; u32 sourceIncrement = 4; u32 destIncrement = 4; *************** *** 2137,2141 **** DM2CNT_H & 0x0400); } ! cpuDmaHack = 1; if(DM2CNT_H & 0x4000) { IF |= 0x0400; --- 2136,2140 ---- DM2CNT_H & 0x0400); } ! cpuDmaHack = true; if(DM2CNT_H & 0x4000) { IF |= 0x0400; *************** *** 2157,2160 **** --- 2156,2160 ---- if((DM3CNT_H & 0x8000) && (dmamask & 8)) { if(((DM3CNT_H >> 12) & 3) == reason) { + res = true; u32 sourceIncrement = 4; u32 destIncrement = 4; *************** *** 2207,2211 **** } } ! cpuDmaHack = 0; } --- 2207,2212 ---- } } ! cpuDmaHack = false; ! return res; } *************** *** 2595,2598 **** --- 2596,2602 ---- timer0Ticks = 0x10000 - TM0D; UPDATE_REG(0x100, TM0D); + int event = cpuTotalTicks + timer0Ticks; + if(event < cpuNextEvent) + cpuNextEvent = event; } timer0On = value & 0x80 ? true : false; *************** *** 2612,2615 **** --- 2616,2622 ---- timer1Ticks = 0x10000 - TM1D; UPDATE_REG(0x104, TM1D); + int event = cpuTotalTicks + timer1Ticks; + if(event < cpuNextEvent) + cpuNextEvent = event; } timer1On = value & 0x80 ? true : false; *************** *** 2628,2631 **** --- 2635,2641 ---- timer2Ticks = 0x10000 - TM2D; UPDATE_REG(0x108, TM2D); + int event = cpuTotalTicks + timer2Ticks; + if(event < cpuNextEvent) + cpuNextEvent = event; } timer2On = value & 0x80 ? true : false; *************** *** 2644,2647 **** --- 2654,2660 ---- timer3Ticks = 0x10000 - TM3D; UPDATE_REG(0x10C, TM3D); + int event = cpuTotalTicks + timer3Ticks; + if(event < cpuNextEvent) + cpuNextEvent = event; } timer3On = value & 0x80 ? true : false; *************** *** 2672,2676 **** UPDATE_REG(0x200, IE); if((IME & 1) && (IF & IE) && armIrqEnable) { ! CPU_BREAK_LOOP_2; } break; --- 2685,2689 ---- UPDATE_REG(0x200, IE); if((IME & 1) && (IF & IE) && armIrqEnable) { ! cpuNextEvent = 0; } break; *************** *** 2716,2720 **** if(value & 0x4000) { for(i = 8; i < 16; i++) { ! memoryWaitFetch32[i] = 2*cpuMemoryWait[i]; memoryWaitFetch[i] = cpuMemoryWait[i]; } --- 2729,2733 ---- if(value & 0x4000) { for(i = 8; i < 16; i++) { ! memoryWaitFetch32[i] = cpuMemoryWait32[i]; memoryWaitFetch[i] = cpuMemoryWait[i]; } *************** *** 2727,2731 **** UPDATE_REG(0x208, IME); if((IME & 1) && (IF & IE) && armIrqEnable) { ! CPU_BREAK_LOOP_2; } break; --- 2740,2744 ---- UPDATE_REG(0x208, IME); if((IME & 1) && (IF & IE) && armIrqEnable) { ! cpuNextEvent = 0; } break; *************** *** 2758,2764 **** #ifdef SDL if(*((u16 *)&freezeWorkRAM[address & 0x3FFFE])) ! cheatsWriteHalfWord((u16 *)&workRAM[address & 0x3FFFE], ! value, ! *((u16 *)&freezeWorkRAM[address & 0x3FFFE])); else #endif --- 2771,2776 ---- #ifdef SDL if(*((u16 *)&freezeWorkRAM[address & 0x3FFFE])) ! cheatsWriteHalfWord(address & 0x203FFFE, ! value); else #endif *************** *** 2768,2774 **** #ifdef SDL if(*((u16 *)&freezeInternalRAM[address & 0x7ffe])) ! cheatsWriteHalfWord((u16 *)&internalRAM[address & 0x7ffe], ! value, ! *((u16 *)&freezeInternalRAM[address & 0x7ffe])); else #endif --- 2780,2785 ---- #ifdef SDL if(*((u16 *)&freezeInternalRAM[address & 0x7ffe])) ! cheatsWriteHalfWord(address & 0x3007ffe, ! value); else #endif *************** *** 2776,2780 **** break; case 4: ! CPUUpdateRegister(address & 0x3fe, value); break; case 5: --- 2787,2793 ---- break; case 4: ! if(address < 0x4000400) ! CPUUpdateRegister(address & 0x3fe, value); ! else goto unwritable; break; case 5: *************** *** 2829,2833 **** #ifdef SDL if(freezeWorkRAM[address & 0x3FFFF]) ! cheatsWriteByte(&workRAM[address & 0x3FFFF], b); else #endif --- 2842,2846 ---- #ifdef SDL if(freezeWorkRAM[address & 0x3FFFF]) ! cheatsWriteByte(address & 0x203FFFF, b); else #endif *************** *** 2837,2841 **** #ifdef SDL if(freezeInternalRAM[address & 0x7fff]) ! cheatsWriteByte(&internalRAM[address & 0x7fff], b); else #endif --- 2850,2854 ---- #ifdef SDL if(freezeInternalRAM[address & 0x7fff]) ! cheatsWriteByte(address & 0x3007fff, b); else #endif *************** *** 2843,2908 **** break; case 4: ! switch(address & 0x3FF) { ! case 0x301: ! if(b == 0x80) ! stopState = true; ! holdState = 1; ! holdType = -1; ! break; ! case 0x60: ! case 0x61: ! case 0x62: ! case 0x63: ! case 0x64: ! case 0x65: ! case 0x68: ! case 0x69: ! case 0x6c: ! case 0x6d: ! case 0x70: ! case 0x71: ! case 0x72: ! case 0x73: ! case 0x74: ! case 0x75: ! case 0x78: ! case 0x79: ! case 0x7c: ! case 0x7d: ! case 0x80: ! case 0x81: ! case 0x84: ! case 0x85: ! case 0x90: ! case 0x91: ! case 0x92: ! case 0x93: ! case 0x94: ! case 0x95: ! case 0x96: ! case 0x97: ! case 0x98: ! case 0x99: ! case 0x9a: ! case 0x9b: ! case 0x9c: ! case 0x9d: ! case 0x9e: ! case 0x9f: ! soundEvent(address&0xFF, b); break; ! default: ! // if(address & 1) { ! // CPUWriteHalfWord(address-1, (CPUReadHalfWord(address-1)&0x00FF)|((int)b<<8)); ! // } else ! if(address & 1) ! CPUUpdateRegister(address & 0x3fe, ! ((READ16LE(((u16 *)&ioMem[address & 0x3fe]))) ! & 0x00FF) | ! b<<8); ! else ! CPUUpdateRegister(address & 0x3fe, ! ((READ16LE(((u16 *)&ioMem[address & 0x3fe])) & 0xFF00) | b)); ! } break; case 5: --- 2856,2922 ---- break; case 4: ! if(address < 0x4000400) { ! switch(address & 0x3FF) { ! case 0x301: ! if(b == 0x80) ! stopState = true; ! holdState = 1; ! holdType = -1; ! cpuNextEvent = 0; ! break; ! case 0x60: ! case 0x61: ! case 0x62: ! case 0x63: ! case 0x64: ! case 0x65: ! case 0x68: ! case 0x69: ! case 0x6c: ! case 0x6d: ! case 0x70: ! case 0x71: ! case 0x72: ! case 0x73: ! case 0x74: ! case 0x75: ! case 0x78: ! case 0x79: ! case 0x7c: ! case 0x7d: ! case 0x80: ! case 0x81: ! case 0x84: ! case 0x85: ! case 0x90: ! case 0x91: ! case 0x92: ! case 0x93: ! case 0x94: ! case 0x95: ! case 0x96: ! case 0x97: ! case 0x98: ! case 0x99: ! case 0x9a: ! case 0x9b: ! case 0x9c: ! case 0x9d: ! case 0x9e: ! case 0x9f: ! soundEvent(address&0xFF, b); ! break; ! default: ! if(address & 1) ! CPUUpdateRegister(address & 0x3fe, ! ((READ16LE(((u16 *)&ioMem[address & 0x3fe]))) ! & 0x00FF) | ! b<<8); ! else ! CPUUpdateRegister(address & 0x3fe, ! ((READ16LE(((u16 *)&ioMem[address & 0x3fe])) & 0xFF00) | b)); ! } break; ! } else goto unwritable; break; case 5: *************** *** 2911,2923 **** break; case 6: ! // no need to switch ! if(address & 0x10000) ! *((u16 *)&vram[address & 0x17FFE]) = (b << 8) | b; ! else ! *((u16 *)&vram[address & 0x1FFFE]) = (b << 8) | b; break; case 7: // no need to switch ! *((u16 *)&oam[address & 0x3FE]) = (b << 8) | b; break; case 13: --- 2925,2939 ---- break; case 6: ! // no need to switch ! // byte writes to OBJ VRAM are ignored ! if(!(address & 0x10000)) ! // *((u16 *)&vram[address & 0x17FFE]) = (b << 8) | b; ! // else ! *((u16 *)&vram[address & 0xFFFE]) = (b << 8) | b; break; case 7: // no need to switch ! // byte writes to OAM are ignored ! // *((u16 *)&oam[address & 0x3FE]) = (b << 8) | b; break; case 13: *************** *** 3334,3337 **** --- 3350,3355 ---- systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED; + + cpuDmaHack2 = false; lastTime = systemGetClock(); *************** *** 3385,3407 **** { int clockTicks; ! int cpuLoopTicks = 0; int timerOverflow = 0; // variables used by the CPU core ! ! extCpuLoopTicks = &cpuLoopTicks; ! extClockTicks = &clockTicks; ! extTicks = &ticks; ! ! cpuLoopTicks = CPUUpdateTicks(); ! if(cpuLoopTicks > ticks) { ! cpuLoopTicks = ticks; ! cpuSavedTicks = ticks; } if(intState) { ! cpuLoopTicks = 5; ! cpuSavedTicks = 5; } ! for(;;) { #ifndef FINAL_VERSION --- 3403,3420 ---- { int clockTicks; ! int totalTicks = 0; int timerOverflow = 0; // variables used by the CPU core ! cpuNextEvent = CPUUpdateTicks(); ! if(cpuNextEvent > ticks) { ! cpuNextEvent = ticks; } if(intState) { ! cpuNextEvent = 5; } ! if(cpuDmaHack2) ! cpuNextEvent = 1; ! cpuBreakLoop = false; for(;;) { #ifndef FINAL_VERSION *************** *** 3445,3455 **** clockTicks = timer0Ticks; } ! if(timer1On && (timer1Ticks < clockTicks)) { clockTicks = timer1Ticks; } ! if(timer2On && (timer2Ticks < clockTicks)) { clockTicks = timer2Ticks; } ! if(timer3On && (timer3Ticks < clockTicks)) { clockTicks = timer3Ticks; } --- 3458,3468 ---- clockTicks = timer0Ticks; } ! if(timer1On && !(TM1CNT & 4) && (timer1Ticks < clockTicks)) { clockTicks = timer1Ticks; } ! if(timer2On && !(TM2CNT & 4) && (timer2Ticks < clockTicks)) { clockTicks = timer2Ticks; } ! if(timer3On && !(TM3CNT & 4) && (timer3Ticks < clockTicks)) { clockTicks = timer3Ticks; } *************** *** 3461,3472 **** } #endif } ! ! cpuLoopTicks -= clockTicks; ! if((cpuLoopTicks <= 0)) { ! if(cpuSavedTicks) { ! clockTicks = cpuSavedTicks;// + cpuLoopTicks; ! } ! cpuDmaTicksToUpdate = -cpuLoopTicks; updateLoop: --- 3474,3489 ---- } #endif + // if((clockTicks+totalTicks) > cpuNextEvent) { + // clockTicks = cpuNextEvent - totalTicks; + // } } ! totalTicks += clockTicks; ! cpuTotalTicks = totalTicks; ! if(totalTicks >= cpuNextEvent) { ! cpuDmaHack2 = false; ! int remainingTicks = totalTicks - cpuNextEvent; ! clockTicks = cpuNextEvent; ! int oldTotalTicks = totalTicks; ! cpuTotalTicks = totalTicks = 0; updateLoop: *************** *** 3558,3565 **** u32 ext = (joy >> 10); - int cheatTicks = 0; if(cheatsEnabled) ! cheatsCheckKeys(P1^0x3FF, ext); ! cpuDmaTicksToUpdate += cheatTicks; speedup = (ext & 1) ? true : false; capture = (ext & 2) ? true : false; --- 3575,3580 ---- u32 ext = (joy >> 10); if(cheatsEnabled) ! remainingTicks += cheatsCheckKeys(P1^0x3FF, ext); speedup = (ext & 1) ? true : false; capture = (ext & 2) ? true : false; *************** *** 3578,3582 **** UPDATE_REG(0x202, IF); } ! CPUCheckDMA(1, 0x0f); if(frameCount >= framesToSkip) { systemDrawScreen(); --- 3593,3597 ---- UPDATE_REG(0x202, IF); } ! cpuDmaHack2 = CPUCheckDMA(1, 0x0f); if(frameCount >= framesToSkip) { systemDrawScreen(); *************** *** 3698,3702 **** UPDATE_REG(0x04, DISPSTAT); lcdTicks += 272; ! CPUCheckDMA(2, 0x0f); if(DISPSTAT & 16) { IF |= 2; --- 3713,3717 ---- UPDATE_REG(0x04, DISPSTAT); lcdTicks += 272; ! cpuDmaHack2 = CPUCheckDMA(2, 0x0f); if(DISPSTAT & 16) { IF |= 2; *************** *** 3721,3724 **** --- 3736,3741 ---- } TM0D = tm0d; + if(TM0D < timer0Reload) + TM0D = timer0Reload; timer0Ticks = 0x10000 - TM0D; UPDATE_REG(0x100, TM0D); *************** *** 3770,3773 **** --- 3787,3792 ---- } TM1D = tm1d; + if(TM1D < timer1Reload) + TM1D = timer1Reload; timer1Ticks = 0x10000 - TM1D; UPDATE_REG(0x104, TM1D); *************** *** 3819,3822 **** --- 3838,3843 ---- } TM2D = tm2d; + if(TM2D < timer2Reload) + TM2D = timer2Reload; timer2Ticks = 0x10000 - TM2D; UPDATE_REG(0x108, TM2D); *************** *** 3865,3868 **** --- 3886,3891 ---- } TM3D = tm3d; + if(TM3D < timer3Reload) + TM3D = timer3Reload; timer3Ticks = 0x10000 - TM3D; UPDATE_REG(0x10C, TM3D); *************** *** 3912,3926 **** ticks -= clockTicks; ! cpuLoopTicks = CPUUpdateTicks(); if(cpuDmaTicksToUpdate > 0) { ! clockTicks = cpuSavedTicks; ! if(clockTicks > cpuDmaTicksToUpdate) ! clockTicks = cpuDmaTicksToUpdate; ! cpuDmaTicksToUpdate -= clockTicks; if(cpuDmaTicksToUpdate < 0) cpuDmaTicksToUpdate = 0; goto updateLoop; } if(IF && (IME & 1) && armIrqEnable) { --- 3935,3952 ---- ticks -= clockTicks; ! cpuNextEvent = CPUUpdateTicks(); if(cpuDmaTicksToUpdate > 0) { ! if(cpuDmaTicksToUpdate < cpuNextEvent) ! cpuNextEvent = cpuDmaTicksToUpdate; ! cpuDmaTicksToUpdate -= cpuNextEvent; ! clockTicks = cpuNextEvent; if(cpuDmaTicksToUpdate < 0) cpuDmaTicksToUpdate = 0; goto updateLoop; } + + if(cpuDmaHack2) + cpuNextEvent = 1; if(IF && (IME & 1) && armIrqEnable) { *************** *** 3939,3944 **** if(!holdState) { intState = true; ! cpuLoopTicks = 5; ! cpuSavedTicks = 5; } else { CPUInterrupt(); --- 3965,3969 ---- if(!holdState) { intState = true; ! cpuNextEvent = 5; } else { CPUInterrupt(); *************** *** 3952,3956 **** } ! if(ticks <= 0) break; } --- 3977,3991 ---- } ! if(remainingTicks > 0) { ! if(remainingTicks < cpuNextEvent) ! cpuNextEvent = remainingTicks; ! remainingTicks -= cpuNextEvent; ! clockTicks = cpuNextEvent; ! if(remainingTicks < 0) ! remainingTicks = 0; ! goto updateLoop; ! } ! ! if(ticks <= 0 || cpuBreakLoop) break; } Index: GBA.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** GBA.h 13 May 2004 15:06:43 -0000 1.19 --- GBA.h 18 Dec 2004 23:09:56 -0000 1.20 *************** *** 84,89 **** extern void (*cpuSaveGameFunc)(u32,u8); ! extern bool freezeWorkRAM[0x40000]; ! extern bool freezeInternalRAM[0x8000]; extern bool CPUReadGSASnapshot(const char *); extern bool CPUWriteGSASnapshot(const char *, const char *, const char *, const char *); --- 84,89 ---- extern void (*cpuSaveGameFunc)(u32,u8); ! extern u8 freezeWorkRAM[0x40000]; ! extern u8 freezeInternalRAM[0x8000]; extern bool CPUReadGSASnapshot(const char *); extern bool CPUWriteGSASnapshot(const char *, const char *, const char *, const char *); *************** *** 107,111 **** extern void CPUReset(); extern void CPULoop(int); ! extern void CPUCheckDMA(int,int); extern bool CPUIsGBAImage(const char *); extern bool CPUIsZipFile(const char *); --- 107,111 ---- extern void CPUReset(); extern void CPULoop(int); ! extern bool CPUCheckDMA(int,int); extern bool CPUIsGBAImage(const char *); extern bool CPUIsZipFile(const char *); Index: AutoBuild.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/AutoBuild.h,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** AutoBuild.h 15 May 2004 21:38:18 -0000 1.15 --- AutoBuild.h 18 Dec 2004 23:09:56 -0000 1.16 *************** *** 21,31 **** #define __AUTOBUILD_H__ #ifndef VERSION ! #define VERSION "1.7.2" #endif //change the FALSE to TRUE for autoincrement of build number #define INCREMENT_VERSION FALSE ! #define FILEVER 1,7,2,560 ! #define PRODUCTVER 1,7,2,560 ! #define STRFILEVER "1, 7, 2, 560\0" ! #define STRPRODUCTVER "1, 7, 2, 560\0" #endif //__AUTOBUILD_H__ --- 21,31 ---- #define __AUTOBUILD_H__ #ifndef VERSION ! #define VERSION "1.8.0" #endif //change the FALSE to TRUE for autoincrement of build number #define INCREMENT_VERSION FALSE ! #define FILEVER 1,8,0,600 ! #define PRODUCTVER 1,8,0,600 ! #define STRFILEVER "1, 8, 0, 600\0" ! #define STRPRODUCTVER "1, 8, 0, 600\0" #endif //__AUTOBUILD_H__ Index: hq2x.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/hq2x.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hq2x.cpp 20 Jan 2004 22:02:03 -0000 1.2 --- hq2x.cpp 18 Dec 2004 23:09:56 -0000 1.3 *************** *** 560,564 **** dst0 += dstPitch; dst1 += dstPitch; ! hq2x_16_def(dst0, dst1, src0, src1, src2, width); src0 = src1; src1 = src2; --- 560,564 ---- dst0 += dstPitch; dst1 += dstPitch; ! lq2x_16_def(dst0, dst1, src0, src1, src2, width); src0 = src1; src1 = src2; *************** *** 588,592 **** dst0 += dstPitch >> 1; dst1 += dstPitch >> 1; ! hq2x_32_def(dst0, dst1, src0, src1, src2, width); src0 = src1; src1 = src2; --- 588,592 ---- dst0 += dstPitch >> 1; dst1 += dstPitch >> 1; ! lq2x_32_def(dst0, dst1, src0, src1, src2, width); src0 = src1; src1 = src2; |
|
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 }, |
