Menu
▾
▴
vba-commit
|
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); + } |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X