From 964e164d2aaf9e6e09d565d1bd81ab96fc8566a6 Mon Sep 17 00:00:00 2001 From: zeromus Date: Tue, 3 Mar 2009 02:01:38 +0000 Subject: [PATCH] substantial core peformance improvements of a few FPS: remove checks for 0 parameters in operand ROR which was a big waste of time; also rearranged MMU read/write routines inlinedness and added some early outs for DTCM and main mem. The MMU read/writes are a mess and will be overhauled soon in separate checkins. --- desmume/src/MMU.cpp | 101 ++++++- desmume/src/MMU.h | 16 +- desmume/src/arm_instructions.cpp | 98 +++---- desmume/src/saves.cpp | 2 +- desmume/src/windows/main.cpp | 27 +- desmume/src/windows/resource.h | 3 + desmume/src/windows/resources.rc | 489 ++++++++++++++++--------------- 7 files changed, 416 insertions(+), 320 deletions(-) diff --git a/desmume/src/MMU.cpp b/desmume/src/MMU.cpp index 84bfbe13c..0a18af9fd 100644 --- a/desmume/src/MMU.cpp +++ b/desmume/src/MMU.cpp @@ -67,32 +67,98 @@ static u16 FASTCALL _MMU_ARM7_read16(u32 adr); static u32 FASTCALL _MMU_ARM7_read32(u32 adr); -u8 _MMU_read08(int PROCNUM, u32 addr) { +u8 _MMU_read08(const int PROCNUM, u32 addr) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + //Returns data from DTCM (ARM9 only) + return T1ReadByte(ARM9Mem.ARM9_DTCM, addr & 0x3FFF); + } + + if ( (addr & 0x0F000000) == 0x02000000) + return T1ReadByte( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF); + if(PROCNUM==ARMCPU_ARM9) return _MMU_ARM9_read08(addr); else return _MMU_ARM7_read08(addr); } -u16 _MMU_read16(int PROCNUM, u32 addr) { +u16 _MMU_read16(const int PROCNUM, u32 addr) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + //Returns data from DTCM (ARM9 only) + return T1ReadWord(ARM9Mem.ARM9_DTCM, addr & 0x3FFF); + } + + if ( (addr & 0x0F000000) == 0x02000000) + return T1ReadWord( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF); + if(PROCNUM==ARMCPU_ARM9) return _MMU_ARM9_read16(addr); else return _MMU_ARM7_read16(addr); } u32 _MMU_read32(int PROCNUM, u32 addr) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + //Returns data from DTCM (ARM9 only) + return T1ReadLong(ARM9Mem.ARM9_DTCM, addr & 0x3FFF); + } + + if ( (addr & 0x0F000000) == 0x02000000) + return T1ReadLong( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF); + if(PROCNUM==ARMCPU_ARM9) return _MMU_ARM9_read32(addr); else return _MMU_ARM7_read32(addr); } -void _MMU_write08(int PROCNUM, u32 addr, u8 val) { +void _MMU_write08(const int PROCNUM, u32 addr, u8 val) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + T1WriteByte(ARM9Mem.ARM9_DTCM, addr & 0x3FFF, val); + return; + } + + if ( (addr & 0x0F000000) == 0x02000000) { + T1WriteByte( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF, val); + return; + } + if(PROCNUM==ARMCPU_ARM9) _MMU_ARM9_write08(addr,val); else _MMU_ARM7_write08(addr,val); } -void _MMU_write16(int PROCNUM, u32 addr, u16 val) { +void _MMU_write16(const int PROCNUM, u32 addr, u16 val) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + T1WriteWord(ARM9Mem.ARM9_DTCM, addr & 0x3FFF, val); + return; + } + + if ( (addr & 0x0F000000) == 0x02000000) { + T1WriteWord( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF, val); + return; + } + if(PROCNUM==ARMCPU_ARM9) _MMU_ARM9_write16(addr,val); else _MMU_ARM7_write16(addr,val); } -void _MMU_write32(int PROCNUM, u32 addr, u32 val) { +void _MMU_write32(const int PROCNUM, u32 addr, u32 val) { + if(PROCNUM==ARMCPU_ARM9) + if((addr&(~0x3FFF)) == MMU.DTCMRegion) + { + T1WriteLong(ARM9Mem.ARM9_DTCM, addr & 0x3FFF, val); + return; + } + + if ( (addr & 0x0F000000) == 0x02000000) { + T1WriteLong( ARM9Mem.MAIN_MEM, addr & 0x3FFFFF, val); + return; + } + if(PROCNUM==ARMCPU_ARM9) _MMU_ARM9_write32(addr,val); else _MMU_ARM7_write32(addr,val); } @@ -274,7 +340,7 @@ u32 MMU_struct::MMU_MASK[2][256] = { { /* 0X*/ DUP16(0x00007FFF), /* 1X*/ //DUP16(0x00007FFF) - /* 1X*/ DUP16(0x00000003), + /* 1X*/ DUP16(0x00000003), /* 2X*/ DUP16(0x003FFFFF), /* 3X*/ DUP16(0x00007FFF), /* 4X*/ DUP16(0x00FFFFFF), @@ -423,7 +489,7 @@ void MMU_clearMem() memset(ARM9Mem.ARM9_OAM, 0, 0x0800); memset(ARM9Mem.ARM9_REG, 0, 0x01000000); memset(ARM9Mem.ARM9_VMEM, 0, 0x0800); - memset(ARM9Mem.MAIN_MEM, 0, 0x400000); + memset(ARM9Mem.MAIN_MEM, 0, sizeof(ARM9Mem.MAIN_MEM)); memset(ARM9Mem.blank_memory, 0, 0x020000); @@ -2347,12 +2413,24 @@ static void FASTCALL _MMU_ARM9_write32(u32 adr, u32 val) return ; } #endif + +#ifdef EARLY_MEMORY_ACCESS + if ( (adr & 0x0F000000) == 0x02000000) { + T1WriteLong( ARM9Mem.MAIN_MEM, adr & 0x3FFFFF, val); + return; + } +#endif + if(adr<0x02000000) { T1WriteLong(ARM9Mem.ARM9_ITCM, adr&0x7FFF, val); return ; } + if(adr>=0x02400000 && adr<0x03000000) { + //int zzz=9; + } + #ifdef EXPERIMENTAL_GBASLOT if ( (adr >= 0x08000000) && (adr < 0x0A000000) ) { @@ -2988,6 +3066,15 @@ static u32 FASTCALL _MMU_ARM9_read32(u32 adr) } #endif +#ifdef EARLY_MEMORY_ACCESS + if ( (adr & 0x0F000000) == 0x02000000) + return T1ReadLong( ARM9Mem.MAIN_MEM, adr & 0x3FFFFF); +#endif + + if(adr>=0x02400000 && adr<0x03000000) { + //int zzz=9; + } + if(adr<0x02000000) return T1ReadLong(ARM9Mem.ARM9_ITCM, adr&0x7FFF); diff --git a/desmume/src/MMU.h b/desmume/src/MMU.h index 72dbffe6c..8ba89720f 100644 --- a/desmume/src/MMU.h +++ b/desmume/src/MMU.h @@ -182,12 +182,16 @@ template void _MMU_write08(u32 addr, u8 val); template void _MMU_write16(u32 addr, u16 val); template void _MMU_write32(u32 addr, u32 val); -u8 _MMU_read08(int PROCNUM, u32 addr); -u16 _MMU_read16(int PROCNUM, u32 addr); -u32 _MMU_read32(int PROCNUM, u32 addr); -void _MMU_write08(int PROCNUM, u32 addr, u8 val); -void _MMU_write16(int PROCNUM, u32 addr, u16 val); -void _MMU_write32(int PROCNUM, u32 addr, u32 val); +u8 FASTCALL arm9_read8( void *data, u32 adr); +u16 FASTCALL arm9_read16( void *data, u32 adr); +u32 FASTCALL arm9_read32( void *data, u32 adr); + +FORCEINLINE extern u8 _MMU_read08(const int PROCNUM, u32 addr); +FORCEINLINE extern u16 _MMU_read16(const int PROCNUM, u32 addr); +FORCEINLINE extern u32 _MMU_read32(const int PROCNUM, u32 addr); +FORCEINLINE extern void _MMU_write08(const int PROCNUM, u32 addr, u8 val); +FORCEINLINE extern void _MMU_write16(const int PROCNUM, u32 addr, u16 val); +FORCEINLINE extern void _MMU_write32(const int PROCNUM, u32 addr, u32 val); #ifdef MMU_ENABLE_ACL void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val); diff --git a/desmume/src/arm_instructions.cpp b/desmume/src/arm_instructions.cpp index 0361b8089..3f65bea08 100644 --- a/desmume/src/arm_instructions.cpp +++ b/desmume/src/arm_instructions.cpp @@ -3751,8 +3751,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_IMM_OFF() u32 adr = cpu->R[REG_POS(i,16)] + IMM_OFF_12; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3772,8 +3771,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_IMM_OFF() u32 adr = cpu->R[REG_POS(i,16)] - IMM_OFF_12; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3798,8 +3796,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3824,8 +3821,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3850,8 +3846,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3876,8 +3871,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3902,8 +3896,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3928,8 +3921,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3954,8 +3946,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -3980,8 +3971,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4003,8 +3993,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_IMM_OFF_PREIND() u32 adr = cpu->R[REG_POS(i,16)] + IMM_OFF_12; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4027,8 +4016,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_IMM_OFF_PREIND() u32 adr = cpu->R[REG_POS(i,16)] - IMM_OFF_12; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4056,8 +4044,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4085,8 +4072,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4114,8 +4100,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4143,8 +4128,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4172,8 +4156,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4201,8 +4184,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4230,8 +4212,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] + shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4259,8 +4240,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF_PREIND() adr = cpu->R[REG_POS(i,16)] - shift_op; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4283,8 +4263,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_IMM_OFF_POSTIND() u32 adr = cpu->R[REG_POS(i,16)]; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4309,8 +4288,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_IMM_OFF_POSTIND2() u32 adr = cpu->R[REG_POS(i,16)]; u32 val = READ32(cpu->mem_if->data, adr); u32 old; - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4338,8 +4316,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_IMM_OFF_POSTIND() u32 adr = cpu->R[REG_POS(i,16)]; u32 val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4366,8 +4343,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4394,8 +4370,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4422,8 +4397,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4450,8 +4424,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4478,8 +4451,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4506,8 +4478,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4534,8 +4505,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -4562,8 +4532,7 @@ TEMPLATE static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF_POSTIND() adr = cpu->R[REG_POS(i,16)]; val = READ32(cpu->mem_if->data, adr); - if(adr&3) - val = ROR(val, 8*(adr&3)); + val = ROR(val, 8*(adr&3)); if(REG_POS(i,12)==15) { @@ -7779,8 +7748,9 @@ TEMPLATE static u32 FASTCALL OP_SWI() //----------------BKPT------------------------- TEMPLATE static u32 FASTCALL OP_BKPT() { - LOG("Stopped (OP_BKPT)\n"); - TRAPUNDEF(); + /*LOG("Stopped (OP_BKPT)\n"); + TRAPUNDEF();*/ + return 4; } //----------------CDP----------------------- diff --git a/desmume/src/saves.cpp b/desmume/src/saves.cpp index a2a67d700..0d0ba9669 100644 --- a/desmume/src/saves.cpp +++ b/desmume/src/saves.cpp @@ -131,7 +131,7 @@ SFORMAT SF_ARM9[]={ SFORMAT SF_MEM[]={ { "ITCM", 1, 0x8000, ARM9Mem.ARM9_ITCM}, { "DTCM", 1, 0x4000, ARM9Mem.ARM9_DTCM}, - { "WRAM", 1, 0x400000, ARM9Mem.MAIN_MEM}, + { "WRAM", 1, sizeof(ARM9Mem.MAIN_MEM), ARM9Mem.MAIN_MEM}, //NOTE - this is not as large as the allocated memory. //the memory is overlarge due to the way our memory map system is setup diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 78e1b33ec..586156d67 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -241,8 +241,8 @@ struct NDS_fw_config_data win_fw_config; };*/ LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp); -LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam); +LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); struct configured_features { u16 arm9_gdb_port; @@ -2023,7 +2023,8 @@ enum CONFIGSCREEN CONFIGSCREEN_INPUT, CONFIGSCREEN_HOTKEY, CONFIGSCREEN_FIRMWARE, - CONFIGSCREEN_SOUND + CONFIGSCREEN_SOUND, + CONFIGSCREEN_EMULATION }; void RunConfig(CONFIGSCREEN which) @@ -2050,6 +2051,9 @@ void RunConfig(CONFIGSCREEN which) case CONFIGSCREEN_SOUND: DialogBox(hAppInst, MAKEINTRESOURCE(IDD_SOUNDSETTINGS), hwnd, (DLGPROC)SoundSettingsDlgProc); break; + case CONFIGSCREEN_EMULATION: + DialogBox(hAppInst, MAKEINTRESOURCE(IDD_EMULATIONSETTINGS), hwnd, (DLGPROC)EmulationSettingsDlgProc); + break; } if (tpaused) @@ -2423,6 +2427,9 @@ LRESULT CALLBACK WindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM case IDM_SOUNDSETTINGS: RunConfig(CONFIGSCREEN_SOUND); return 0; + case IDM_EMULATIONSETTINGS: + RunConfig(CONFIGSCREEN_EMULATION); + return 0; case IDM_GAME_INFO: { @@ -2932,8 +2939,18 @@ LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp) return FALSE; } -LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, - LPARAM lParam) +LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch(uMsg) + { + case WM_INITDIALOG: + break; + } + + return FALSE; +} + +LRESULT CALLBACK SoundSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { static UINT_PTR timerid=0; switch (uMsg) diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index fadda3a86..f69b46e8e 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -162,10 +162,12 @@ #define IDC_PROP1 909 #define IDD_BGMAP_VIEWER 911 #define IDB_BGTILES 913 +#define IDD_EMULATIONSETTINGS 916 #define IDC_BGMAP_SEL 1000 #define IDC_EDIT03 1000 #define IDC_SOUNDCORECB 1000 #define IDC_BGMAP_BGXCNT 1001 +#define IDC_CHECKBOX_DEBUGGERMODE 1001 #define IDC_EDIT01 1001 #define IDC_SOUNDBUFFERET 1001 #define IDC_EDIT05 1002 @@ -376,6 +378,7 @@ #define IDM_SCREENSEP_BORDER 40001 #define IDM_SCREENSEP_NDSGAP 40002 #define IDM_ABOUT 40003 +#define IDM_EMULATIONSETTINGS 40004 #define ID_VIEW_FRAMECOUNTER 40009 #define ID_VIEW_DISPLAYFPS 40010 #define IDM_FILE_RECORDAVI 40015 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index c42ac3ec8..ba49683fb 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -1,4 +1,4 @@ -// Generated by ResEdit 1.4.4.18 +// Generated by ResEdit 1.4.4.19 // Copyright (C) 2006-2008 // http://www.resedit.net @@ -27,9 +27,9 @@ ICONDESMUME ICON "DeSmuME.ico" // LANGUAGE LANG_DANISH, SUBLANG_DANISH_DENMARK MENU_PRINCIPAL MENU -BEGIN +{ POPUP "&Fil" - BEGIN + { MENUITEM "&Åbn ROM...\tCtrl O", IDM_OPEN MENUITEM "Frisk ROM", ID_FILE_RECENTROM MENUITEM "ROM &Info", IDM_GAME_INFO @@ -37,7 +37,7 @@ BEGIN MENUITEM "Gem Stadie Som...", IDM_STATE_SAVE MENUITEM "Indlæs Stadie Som...", IDM_STATE_LOAD POPUP "Gem Stadie" - BEGIN + { MENUITEM "1", IDM_STATE_SAVE_F1 MENUITEM "2", IDM_STATE_SAVE_F2 MENUITEM "3", IDM_STATE_SAVE_F3 @@ -48,9 +48,9 @@ BEGIN MENUITEM "8", IDM_STATE_SAVE_F8 MENUITEM "9", IDM_STATE_SAVE_F9 MENUITEM "10", IDM_STATE_SAVE_F10 - END + } POPUP "Indlæs Stadie" - BEGIN + { MENUITEM "1", IDM_STATE_LOAD_F1 MENUITEM "2", IDM_STATE_LOAD_F2 MENUITEM "3", IDM_STATE_LOAD_F3 @@ -61,7 +61,7 @@ BEGIN MENUITEM "8", IDM_STATE_LOAD_F8 MENUITEM "9", IDM_STATE_LOAD_F9 MENUITEM "10", IDM_STATE_LOAD_F10 - END + } MENUITEM SEPARATOR MENUITEM "Importere Backup Hukommelse", IDM_IMPORTBACKUPMEMORY MENUITEM SEPARATOR @@ -72,65 +72,65 @@ BEGIN MENUITEM "Stop AVI", IDM_FILE_STOPAVI MENUITEM SEPARATOR MENUITEM "&Afslut\tAlt F4", IDM_QUIT - END + } POPUP "&Emulation" - BEGIN + { MENUITEM "&Pause", IDM_PAUSE MENUITEM "&Genstart", IDM_RESET MENUITEM SEPARATOR MENUITEM "GBA &slot", IDM_GBASLOT POPUP "&Cheats" - BEGIN + { MENUITEM "&List", IDM_CHEATS_LIST, INACTIVE MENUITEM "&Search", IDM_CHEATS_SEARCH, INACTIVE - END - END + } + } POPUP "&Vis" - BEGIN + { POPUP "&Rotation" - BEGIN + { MENUITEM " 0 Grader", IDC_ROTATE0 MENUITEM " 90 Grader", IDC_ROTATE90 MENUITEM "180 Grader", IDC_ROTATE180 MENUITEM "270 Grader", IDC_ROTATE270 - END + } POPUP "Vindue &Størrelse" - BEGIN + { MENUITEM "1x", IDC_WINDOW1X MENUITEM "2x", IDC_WINDOW2X MENUITEM "3x", IDC_WINDOW3X MENUITEM "4x", IDC_WINDOW4X - END + } POPUP "Screen separation" - BEGIN + { MENUITEM "None\t(0 px)", IDM_SCREENSEP_NONE MENUITEM "Narrow border\t(5 px)", IDM_SCREENSEP_BORDER MENUITEM "DS\t(64 px)", IDM_SCREENSEP_NDSGAP - END + } MENUITEM "&Bevar Højde og Bredde", IDC_FORCERATIO MENUITEM "Default size", IDM_DEFSIZE MENUITEM SEPARATOR MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER MENUITEM "Display Fps", ID_VIEW_DISPLAYFPS - END + } POPUP "&Konfigure" - BEGIN + { POPUP "&Vælg Hukommelse Type" - BEGIN + { MENUITEM "Vælg Automatisk", IDC_SAVETYPE1 MENUITEM "EEPROM 4kbit", IDC_SAVETYPE2 MENUITEM "EEPROM 64kbit", IDC_SAVETYPE3 MENUITEM "EEPROM 512kbit", IDC_SAVETYPE4 MENUITEM "FRAM 256kbit", IDC_SAVETYPE5 MENUITEM "FLASH 2mbit", IDC_SAVETYPE6 - END + } MENUITEM "3D settings", IDM_3DCONFIG MENUITEM "Indput Indstillinger", IDM_CONFIG MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG MENUITEM "Lyd Indstillinger", IDM_SOUNDSETTINGS MENUITEM "Firmware Indstillinger", IDM_FIRMSETTINGS POPUP "&Frame Skip" - BEGIN + { MENUITEM "Auto", IDC_FRAMESKIPAUTO MENUITEM "0", IDC_FRAMESKIP0 MENUITEM "1", IDC_FRAMESKIP1 @@ -142,16 +142,16 @@ BEGIN MENUITEM "7", IDC_FRAMESKIP7 MENUITEM "8", IDC_FRAMESKIP8 MENUITEM "9", IDC_FRAMESKIP9 - END + } POPUP "&Language" - BEGIN + { MENUITEM "English", IDC_LANGENGLISH MENUITEM "French", IDC_LANGFRENCH MENUITEM "Danish", IDC_LANGDANISH - END - END + } + } POPUP "&Værktøjer" - BEGIN + { MENUITEM "&Disassembler", IDM_DISASSEMBLER MENUITEM "Vis &Hukommelse", IDM_MEMORY MENUITEM "Vis &Register", IDM_IOREG @@ -163,7 +163,7 @@ BEGIN MENUITEM "Vis Lights", IDM_LIGHT_VIEWER MENUITEM SEPARATOR POPUP "&Vis &Lag" - BEGIN + { MENUITEM "Hoved Baggrund 0", IDM_MBG0, CHECKED MENUITEM "Hoved Baggrund 1", IDM_MBG1, CHECKED MENUITEM "Hoved Baggrund 2", IDM_MBG2, CHECKED @@ -173,24 +173,24 @@ BEGIN MENUITEM "Under Baggrund 1", IDM_SBG1, CHECKED MENUITEM "Under Baggrund 2", IDM_SBG2, CHECKED MENUITEM "Under Baggrund 3", IDM_SBG3, CHECKED - END - END + } + } POPUP "&Hjælp" - BEGIN + { MENUITEM "&Hjemmeside", IDM_WEBSITE MENUITEM "&Forums", IDM_FORUM MENUITEM "&Indsend Fejl Rapport", IDM_SUBMITBUGREPORT MENUITEM "About", IDM_ABOUT - END -END + } +} LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US MENU_PRINCIPAL MENU -BEGIN +{ POPUP "&File" - BEGIN + { MENUITEM "&Open ROM...\tCtrl O", IDM_OPEN MENUITEM "&Recent ROM", ID_FILE_RECENTROM MENUITEM "ROM &Info", IDM_GAME_INFO @@ -198,7 +198,7 @@ BEGIN MENUITEM "Save State As...", IDM_STATE_SAVE MENUITEM "Load State As...", IDM_STATE_LOAD POPUP "Save State" - BEGIN + { MENUITEM "1", IDM_STATE_SAVE_F1 MENUITEM "2", IDM_STATE_SAVE_F2 MENUITEM "3", IDM_STATE_SAVE_F3 @@ -209,9 +209,9 @@ BEGIN MENUITEM "8", IDM_STATE_SAVE_F8 MENUITEM "9", IDM_STATE_SAVE_F9 MENUITEM "10", IDM_STATE_SAVE_F10 - END + } POPUP "Load State" - BEGIN + { MENUITEM "1", IDM_STATE_LOAD_F1 MENUITEM "2", IDM_STATE_LOAD_F2 MENUITEM "3", IDM_STATE_LOAD_F3 @@ -222,7 +222,7 @@ BEGIN MENUITEM "8", IDM_STATE_LOAD_F8 MENUITEM "9", IDM_STATE_LOAD_F9 MENUITEM "10", IDM_STATE_LOAD_F10 - END + } MENUITEM SEPARATOR MENUITEM "Import Backup Memory", IDM_IMPORTBACKUPMEMORY MENUITEM SEPARATOR @@ -233,51 +233,51 @@ BEGIN MENUITEM "Stop AVI", IDM_FILE_STOPAVI MENUITEM SEPARATOR MENUITEM "&Quit\tAlt F4", IDM_QUIT - END + } POPUP "&Emulation" - BEGIN + { MENUITEM "&Pause", IDM_PAUSE MENUITEM "&Reset", IDM_RESET MENUITEM SEPARATOR MENUITEM "GBA &slot", IDM_GBASLOT POPUP "&Cheats" - BEGIN + { MENUITEM "&List", IDM_CHEATS_LIST, INACTIVE MENUITEM "&Search", IDM_CHEATS_SEARCH, INACTIVE - END - END + } + } POPUP "&View" - BEGIN + { POPUP "&Rotation" - BEGIN + { MENUITEM " 0", IDC_ROTATE0 MENUITEM " 90", IDC_ROTATE90 MENUITEM "180", IDC_ROTATE180 MENUITEM "270", IDC_ROTATE270 - END + } POPUP "Window &Size" - BEGIN + { MENUITEM "1x", IDC_WINDOW1X MENUITEM "2x", IDC_WINDOW2X MENUITEM "3x", IDC_WINDOW3X MENUITEM "4x", IDC_WINDOW4X - END + } POPUP "Screen separation" - BEGIN + { MENUITEM "None\t(0 px)", IDM_SCREENSEP_NONE MENUITEM "Narrow border\t(5 px)", IDM_SCREENSEP_BORDER MENUITEM "DS\t(64 px)", IDM_SCREENSEP_NDSGAP - END + } MENUITEM "&Force Maintain Ratio", IDC_FORCERATIO MENUITEM "Default size", IDM_DEFSIZE MENUITEM SEPARATOR MENUITEM "Display Frame Counter", ID_VIEW_FRAMECOUNTER MENUITEM "Display FPS", ID_VIEW_DISPLAYFPS - END + } POPUP "&Config" - BEGIN + { POPUP "&Save Type" - BEGIN + { MENUITEM "Autodetect", IDC_SAVETYPE1 MENUITEM "EEPROM 4kbit", IDC_SAVETYPE2 MENUITEM "EEPROM 64kbit", IDC_SAVETYPE3 @@ -285,14 +285,15 @@ BEGIN MENUITEM "FRAM 256kbit", IDC_SAVETYPE5 MENUITEM "FLASH 2mbit", IDC_SAVETYPE6 MENUITEM "FLASH 4mbit", IDC_SAVETYPE7 - END + } MENUITEM "3D Settings", IDM_3DCONFIG MENUITEM "Control Config", IDM_CONFIG MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG MENUITEM "Sound Settings", IDM_SOUNDSETTINGS MENUITEM "Firmware Settings", IDM_FIRMSETTINGS + MENUITEM "Emulation Settings", IDM_EMULATIONSETTINGS POPUP "&Frame Skip" - BEGIN + { MENUITEM "Auto", IDC_FRAMESKIPAUTO MENUITEM "0", IDC_FRAMESKIP0 MENUITEM "1", IDC_FRAMESKIP1 @@ -304,16 +305,16 @@ BEGIN MENUITEM "7", IDC_FRAMESKIP7 MENUITEM "8", IDC_FRAMESKIP8 MENUITEM "9", IDC_FRAMESKIP9 - END + } POPUP "&Language" - BEGIN + { MENUITEM "English", IDC_LANGENGLISH MENUITEM "French", IDC_LANGFRENCH MENUITEM "Danish", IDC_LANGDANISH - END - END + } + } POPUP "&Tools" - BEGIN + { MENUITEM "&Disassembler", IDM_DISASSEMBLER MENUITEM "View &Memory", IDM_MEMORY MENUITEM "View &Registers", IDM_IOREG @@ -325,7 +326,7 @@ BEGIN MENUITEM "View Lights", IDM_LIGHT_VIEWER MENUITEM SEPARATOR POPUP "&View &Layers" - BEGIN + { MENUITEM "Main BG 0", IDM_MBG0, CHECKED MENUITEM "Main BG 1", IDM_MBG1, CHECKED MENUITEM "Main BG 2", IDM_MBG2, CHECKED @@ -335,24 +336,24 @@ BEGIN MENUITEM "Sub BG 1", IDM_SBG1, CHECKED MENUITEM "Sub BG 2", IDM_SBG2, CHECKED MENUITEM "Sub BG 3", IDM_SBG3, CHECKED - END - END + } + } POPUP "&Help" - BEGIN + { MENUITEM "&Website", IDM_WEBSITE MENUITEM "&Forums", IDM_FORUM MENUITEM "&Submit a bug report", IDM_SUBMITBUGREPORT MENUITEM "&About", IDM_ABOUT - END -END + } +} LANGUAGE LANG_FRENCH, SUBLANG_FRENCH MENU_PRINCIPAL MENU -BEGIN +{ POPUP "&Fichier" - BEGIN + { MENUITEM "&Ouvrir ROM...\tCtrl O", IDM_OPEN MENUITEM "ROMs récentes", ID_FILE_RECENTROM MENUITEM "&Info ROM", IDM_GAME_INFO @@ -360,7 +361,7 @@ BEGIN MENUITEM "Save State As...", IDM_STATE_SAVE MENUITEM "Load State As...", IDM_STATE_LOAD POPUP "Save State" - BEGIN + { MENUITEM "1", IDM_STATE_SAVE_F1 MENUITEM "2", IDM_STATE_SAVE_F2 MENUITEM "3", IDM_STATE_SAVE_F3 @@ -371,9 +372,9 @@ BEGIN MENUITEM "8", IDM_STATE_SAVE_F8 MENUITEM "9", IDM_STATE_SAVE_F9 MENUITEM "10", IDM_STATE_SAVE_F10 - END + } POPUP "Load State" - BEGIN + { MENUITEM "1", IDM_STATE_LOAD_F1 MENUITEM "2", IDM_STATE_LOAD_F2 MENUITEM "3", IDM_STATE_LOAD_F3 @@ -384,7 +385,7 @@ BEGIN MENUITEM "8", IDM_STATE_LOAD_F8 MENUITEM "9", IDM_STATE_LOAD_F9 MENUITEM "10", IDM_STATE_LOAD_F10 - END + } MENUITEM SEPARATOR MENUITEM "Import Backup Memory", IDM_IMPORTBACKUPMEMORY MENUITEM SEPARATOR @@ -395,65 +396,65 @@ BEGIN MENUITEM "Arrêter l'enregistrement", IDM_FILE_STOPAVI MENUITEM SEPARATOR MENUITEM "&Quitter\tAlt F4", IDM_QUIT - END + } POPUP "&Emulation" - BEGIN + { MENUITEM "&Pause", IDM_PAUSE MENUITEM "&Reset", IDM_RESET MENUITEM SEPARATOR MENUITEM "GBA &slot", IDM_GBASLOT POPUP "&Cheats" - BEGIN + { MENUITEM "&List", IDM_CHEATS_LIST, INACTIVE MENUITEM "&Search", IDM_CHEATS_SEARCH, INACTIVE - END - END + } + } POPUP "&View" - BEGIN + { POPUP "&Rotation" - BEGIN + { MENUITEM " 0", IDC_ROTATE0 MENUITEM " 90", IDC_ROTATE90 MENUITEM "180", IDC_ROTATE180 MENUITEM "270", IDC_ROTATE270 - END + } POPUP "Taille de la fenêtre" - BEGIN + { MENUITEM "1x", IDC_WINDOW1X MENUITEM "2x", IDC_WINDOW2X MENUITEM "3x", IDC_WINDOW3X MENUITEM "4x", IDC_WINDOW4X - END + } POPUP "Séparation écrans" - BEGIN + { MENUITEM "Aucune\t(0 px)", IDM_SCREENSEP_NONE MENUITEM "Bordure fine\t(5 px)", IDM_SCREENSEP_BORDER MENUITEM "DS\t(64 px)", IDM_SCREENSEP_NDSGAP - END + } MENUITEM "Conserver le ratio", IDC_FORCERATIO MENUITEM "Taille par défaut", IDM_DEFSIZE MENUITEM SEPARATOR MENUITEM "Compteur d'images", ID_VIEW_FRAMECOUNTER MENUITEM "Framerate", ID_VIEW_DISPLAYFPS - END + } POPUP "&Config" - BEGIN + { POPUP "Média de &sauvegarde" - BEGIN + { MENUITEM "Autodetect", IDC_SAVETYPE1 MENUITEM "EEPROM 4kbit", IDC_SAVETYPE2 MENUITEM "EEPROM 64kbit", IDC_SAVETYPE3 MENUITEM "EEPROM 512kbit", IDC_SAVETYPE4 MENUITEM "FRAM 256kbit", IDC_SAVETYPE5 MENUITEM "FLASH 2mbit", IDC_SAVETYPE6 - END + } MENUITEM "Config. 3D", IDM_3DCONFIG MENUITEM "Config. des contrôles", IDM_CONFIG MENUITEM "Hotkey Config", IDM_HOTKEY_CONFIG MENUITEM "Config. du son", IDM_SOUNDSETTINGS MENUITEM "Config. du firmware", IDM_FIRMSETTINGS POPUP "&Frame Skip" - BEGIN + { MENUITEM "Auto", IDC_FRAMESKIPAUTO MENUITEM "0", IDC_FRAMESKIP0 MENUITEM "1", IDC_FRAMESKIP1 @@ -465,16 +466,16 @@ BEGIN MENUITEM "7", IDC_FRAMESKIP7 MENUITEM "8", IDC_FRAMESKIP8 MENUITEM "9", IDC_FRAMESKIP9 - END + } POPUP "&Langage" - BEGIN + { MENUITEM "English", IDC_LANGENGLISH MENUITEM "French", IDC_LANGFRENCH MENUITEM "Danish", IDC_LANGDANISH - END - END + } + } POPUP "&Outils" - BEGIN + { MENUITEM "&Désassembleur", IDM_DISASSEMBLER MENUITEM "Visualiser la &memoire", IDM_MEMORY MENUITEM "Visualiser les ®istres", IDM_IOREG @@ -486,7 +487,7 @@ BEGIN MENUITEM "Visualiser les lights", IDM_LIGHT_VIEWER MENUITEM SEPARATOR POPUP "&Visualiser les &couches" - BEGIN + { MENUITEM "Main BG 0", IDM_MBG0, CHECKED MENUITEM "Main BG 1", IDM_MBG1, CHECKED MENUITEM "Main BG 2", IDM_MBG2, CHECKED @@ -496,55 +497,55 @@ BEGIN MENUITEM "Sub BG 1", IDM_SBG1, CHECKED MENUITEM "Sub BG 2", IDM_SBG2, CHECKED MENUITEM "Sub BG 3", IDM_SBG3, CHECKED - END - END + } + } POPUP "?" - BEGIN + { MENUITEM "Site &web", IDM_WEBSITE MENUITEM "&Forums", IDM_FORUM MENUITEM "&Soumettre un report de bug", IDM_SUBMITBUGREPORT MENUITEM "A propos", IDM_ABOUT - END -END + } +} LANGUAGE LANG_DANISH, SUBLANG_DANISH_DENMARK RECENTROMS MENU -BEGIN +{ POPUP "Recent ROMs" - BEGIN + { MENUITEM "None", 601, GRAYED MENUITEM SEPARATOR MENUITEM "Clear", 600, GRAYED - END -END + } +} LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US RECENTROMS MENU -BEGIN +{ POPUP "Recent ROMs" - BEGIN + { MENUITEM "None", 601, GRAYED MENUITEM SEPARATOR MENUITEM "Clear", 600, GRAYED - END -END + } +} LANGUAGE LANG_FRENCH, SUBLANG_FRENCH RECENTROMS MENU -BEGIN +{ POPUP "ROMs récentes" - BEGIN + { MENUITEM "Aucune", 601, GRAYED MENUITEM SEPARATOR MENUITEM "Vider", 600, GRAYED - END -END + } +} @@ -556,7 +557,7 @@ IDD_3DSETTINGS DIALOG 0, 0, 174, 120 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "3D settings" FONT 8, "MS Sans Serif" -BEGIN +{ DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Default", IDC_DEFAULT, 7, 92, 50, 14, BS_PUSHBUTTON @@ -564,7 +565,7 @@ BEGIN COMBOBOX IDC_3DCORE, 15, 23, 146, 138, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST AUTOCHECKBOX "Unrealistically High-Precision Color Interpolation", IDC_INTERPOLATECOLOR, 9, 55, 165, 10, BS_AUTOCHECKBOX LTEXT "(Presently only effective for SoftRasterizer)", IDC_STATIC, 21, 65, 134, 8, SS_LEFT -END +} @@ -573,7 +574,7 @@ IDD_3DSETTINGS DIALOGEX 0, 0, 174, 120 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "3D settings" FONT 8, "MS Sans Serif", 0, 0, 0 -BEGIN +{ DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Default", IDC_DEFAULT, 7, 92, 50, 14, BS_PUSHBUTTON @@ -581,7 +582,7 @@ BEGIN COMBOBOX IDC_3DCORE, 15, 23, 146, 138, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST AUTOCHECKBOX "Unrealistically High-Precision Color Interpolation", IDC_INTERPOLATECOLOR, 9, 55, 165, 10, BS_AUTOCHECKBOX LTEXT "(Presently only effective for SoftRasterizer)", IDC_STATIC, 21, 65, 134, 8, SS_LEFT -END +} @@ -590,7 +591,7 @@ IDD_3DSETTINGS DIALOG 0, 0, 174, 120 STYLE DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Configuration 3D" FONT 8, "MS Sans Serif" -BEGIN +{ DEFPUSHBUTTON "OK", IDOK, 62, 92, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "Annuler", IDCANCEL, 117, 92, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Par défaut", IDC_DEFAULT, 7, 92, 50, 14, BS_PUSHBUTTON @@ -598,7 +599,7 @@ BEGIN COMBOBOX IDC_3DCORE, 15, 23, 146, 138, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST AUTOCHECKBOX "Unrealistically High-Precision Color Interpolation", IDC_INTERPOLATECOLOR, 9, 55, 165, 10, BS_AUTOCHECKBOX LTEXT "(Presently only effective for SoftRasterizer)", IDC_STATIC, 21, 65, 134, 8, SS_LEFT -END +} @@ -607,7 +608,7 @@ IDD_ABOUT_BOX DIALOGEX 0, 0, 212, 298 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "About DeSmuME..." FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ CTEXT "", IDC_AUTHORS_LIST, 7, 75, 198, 188, SS_CENTER, WS_EX_CLIENTEDGE DEFPUSHBUTTON "Close", IDC_FERMER, 86, 277, 50, 14, BS_DEFPUSHBUTTON CTEXT "DeSmuME", IDC_STATIC, 7, 7, 198, 10, SS_CENTER @@ -616,7 +617,7 @@ BEGIN CTEXT "Original author", IDC_STATIC, 7, 36, 198, 10, SS_CENTER CTEXT "yopyop", IDC_STATIC, 9, 45, 196, 10, SS_CENTER CTEXT "current team", IDC_STATIC, 8, 63, 198, 10, SS_CENTER -END +} @@ -625,7 +626,7 @@ IDD_BGMAP_VIEWER DIALOG 0, 0, 495, 320 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "BG map viewer" FONT 8, "MS Sans Serif" -BEGIN +{ PUSHBUTTON "Close", IDCANCEL, 5, 301, 50, 14, BS_PUSHBUTTON GROUPBOX "Map info", IDC_STATIC, 5, 23, 142, 230 COMBOBOX IDC_BGMAP_SEL, 5, 5, 142, 154, CBS_DROPDOWNLIST | CBS_HASSTRINGS @@ -655,7 +656,7 @@ BEGIN LTEXT "mosaic here", IDC_BGMAP_MOSAIC, 75, 210, 68, 8, SS_LEFT LTEXT "special effect here", IDC_BGMAP_SPECEFF, 75, 225, 68, 8, SS_LEFT LTEXT "windows here", IDC_BGMAP_WINDOWS, 75, 240, 68, 8, SS_LEFT -END +} @@ -664,7 +665,7 @@ IDD_CHEAT_ADD DIALOGEX 0, 0, 121, 207 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Add cheat" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_EDIT1, 26, 17, 88, 14, ES_AUTOHSCROLL EDITTEXT IDC_EDIT2, 7, 53, 107, 14, ES_AUTOHSCROLL EDITTEXT IDC_EDIT3, 7, 78, 107, 30, ES_MULTILINE @@ -686,7 +687,7 @@ BEGIN LTEXT "[0..65535]", IDC_STATIC_S2, 53, 145, 60, 8, SS_LEFT LTEXT "[0..16777215]", IDC_STATIC_S3, 53, 156, 58, 8, SS_LEFT LTEXT "[0..4294967295]", IDC_STATIC_S4, 53, 166, 59, 8, SS_LEFT -END +} @@ -695,7 +696,7 @@ IDD_CHEAT_ADD_AR_CODE DIALOGEX 0, 0, 121, 193 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Add Action Replay code" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_EDIT2, 7, 17, 107, 97, ES_AUTOHSCROLL EDITTEXT IDC_EDIT3, 7, 124, 107, 30, ES_MULTILINE AUTOCHECKBOX "turn on code", IDC_CHECK1, 47, 159, 67, 10, BS_AUTOCHECKBOX @@ -703,7 +704,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 64, 172, 50, 14, BS_PUSHBUTTON LTEXT "Code:", -1, 7, 7, 20, 8, SS_LEFT LTEXT "Description:", -1, 9, 116, 39, 8, SS_LEFT -END +} @@ -712,7 +713,7 @@ IDD_CHEAT_ADD_BC_CODE DIALOGEX 0, 0, 121, 193 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Add Action Replay code" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_EDIT2, 7, 17, 107, 97, ES_AUTOHSCROLL EDITTEXT IDC_EDIT3, 7, 124, 107, 30, ES_MULTILINE AUTOCHECKBOX "turn on code", IDC_CHECK1, 47, 159, 67, 10, BS_AUTOCHECKBOX @@ -720,7 +721,7 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 64, 172, 50, 14, BS_PUSHBUTTON LTEXT "Code:", -1, 7, 7, 20, 8, SS_LEFT LTEXT "Description:", -1, 9, 116, 39, 8, SS_LEFT -END +} @@ -729,7 +730,7 @@ IDD_CHEAT_LIST DIALOGEX 0, 0, 316, 177 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Cheats list" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ CONTROL "", IDC_LIST1, WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_REPORT, 7, 7, 302, 103 PUSHBUTTON "internal", IDC_BADD, 10, 125, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Action Replay", IDC_BADD_AR, 66, 125, 67, 14, WS_DISABLED | BS_PUSHBUTTON @@ -739,7 +740,7 @@ BEGIN DEFPUSHBUTTON "Save", IDOK, 109, 156, 50, 14, WS_DISABLED | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 163, 156, 50, 14, BS_PUSHBUTTON GROUPBOX " Add cheats code as... ", IDC_STATIC, 7, 114, 205, 31 -END +} @@ -748,11 +749,11 @@ IDD_CHEAT_SEARCH DIALOGEX 0, 0, 177, 211 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Cheat search" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ PUSHBUTTON "Restart", IDC_BRESTART, 7, 190, 50, 14, WS_DISABLED | BS_PUSHBUTTON PUSHBUTTON "View", IDC_BVIEW, 64, 190, 50, 14, WS_DISABLED | BS_PUSHBUTTON DEFPUSHBUTTON "Search", IDC_BSEARCH, 120, 190, 50, 14, BS_DEFPUSHBUTTON -END +} @@ -760,7 +761,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_CHEAT_SEARCH_COMP DIALOGEX 0, 0, 177, 184 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ RTEXT "number of results: ", IDC_STATIC, 7, 169, 78, 8, SS_RIGHT LTEXT "Static", IDC_SNUMBER, 92, 169, 78, 8, SS_LEFT GROUPBOX " Select comparison ", IDC_STATIC, 7, 7, 163, 58 @@ -768,7 +769,7 @@ BEGIN AUTORADIOBUTTON "new value is < old value", IDC_RADIO2, 9, 28, 93, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "new value is = old value", IDC_RADIO3, 9, 39, 93, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "new value is != old value", IDC_RADIO4, 9, 50, 96, 10, WS_TABSTOP | BS_AUTORADIOBUTTON -END +} @@ -776,14 +777,14 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_CHEAT_SEARCH_EXACT DIALOGEX 0, 0, 177, 184 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_EVALUE, 7, 18, 163, 14, ES_AUTOHSCROLL LTEXT "Enter value:", IDC_STATIC, 7, 7, 163, 8, SS_LEFT RTEXT "Range value:", IDC_STATIC, 7, 36, 78, 8, SS_RIGHT LTEXT "Static", IDC_STATIC_RANGE, 92, 36, 78, 8, SS_LEFT RTEXT "number of results: ", IDC_STATIC, 7, 169, 78, 8, SS_RIGHT LTEXT "Static", IDC_SNUMBER, 92, 169, 78, 8, SS_LEFT -END +} @@ -791,7 +792,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_CHEAT_SEARCH_MAIN DIALOGEX 0, 0, 178, 185 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ AUTORADIOBUTTON "1 byte", IDC_RADIO1, 9, 10, 37, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "2 bytes", IDC_RADIO2, 9, 20, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "3 bytes", IDC_RADIO3, 9, 31, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -807,7 +808,7 @@ BEGIN LTEXT "[0..65535]", IDC_STATIC_S2, 53, 20, 118, 8, SS_LEFT LTEXT "[0..16777215]", IDC_STATIC_S3, 53, 31, 118, 8, SS_LEFT LTEXT "[0..4294967295]", IDC_STATIC_S4, 53, 41, 118, 8, SS_LEFT -END +} @@ -815,11 +816,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_CHEAT_SEARCH_RESULT DIALOGEX 0, 0, 177, 184 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ LTEXT "Now return to your game and come back when the next search should be processed", IDC_STATIC, 7, 7, 163, 20, SS_LEFT RTEXT "number of results: ", IDC_STATIC, 7, 169, 78, 8, SS_RIGHT LTEXT "Static", IDC_SNUMBER, 92, 169, 78, 8, SS_LEFT -END +} @@ -828,11 +829,11 @@ IDD_CHEAT_SEARCH_VIEW DIALOGEX 0, 0, 177, 211 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Cheat search - Results" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ CONTROL "", IDC_LIST, WC_LISTVIEW, WS_TABSTOP | WS_BORDER | LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_REPORT, 7, 7, 163, 180 PUSHBUTTON "Return", IDCANCEL, 64, 190, 50, 14, BS_PUSHBUTTON DEFPUSHBUTTON "Add", IDC_BADD, 120, 190, 50, 14, BS_DEFPUSHBUTTON -END +} @@ -841,7 +842,7 @@ IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -894,7 +895,7 @@ BEGIN EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} @@ -903,7 +904,7 @@ IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -956,7 +957,7 @@ BEGIN EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} @@ -965,7 +966,7 @@ IDD_DESASSEMBLEUR_VIEWER7 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Desassembleur" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1018,7 +1019,7 @@ BEGIN EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} @@ -1027,7 +1028,7 @@ IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1080,7 +1081,7 @@ BEGIN EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} @@ -1089,7 +1090,7 @@ IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Disassembler" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1142,7 +1143,7 @@ BEGIN LTEXT "secs", IDC_STATIC, 364, 5, 16, 8, SS_LEFT PUSHBUTTON "&Refresh", IDC_REFRESH, 162, 170, 50, 14, BS_PUSHBUTTON | BS_ICON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} @@ -1151,7 +1152,7 @@ IDD_DESASSEMBLEUR_VIEWER9 DIALOGEX 0, 0, 380, 186 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Desassembleur" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "Auto ", IDC_AUTO_DES, 10, 4, 35, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "ARM", IDC_ARM, 44, 4, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "Thumb", IDC_THUMB, 82, 4, 40, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1204,7 +1205,21 @@ BEGIN EDITTEXT IDC_SETPNUM, 5, 170, 34, 14, WS_GROUP | ES_AUTOHSCROLL | ES_NUMBER | ES_UPPERCASE PUSHBUTTON "&Step", IDC_STEP, 41, 170, 50, 14, BS_PUSHBUTTON AUTOCHECKBOX "Autoupd asm", IDC_AUTOUPDATE_ASM, 94, 172, 57, 10, BS_AUTOCHECKBOX -END +} + + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +IDD_EMULATIONSETTINGS DIALOG 0, 0, 186, 95 +STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_FIXEDSYS | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU +CAPTION "Emulation Settings" +FONT 8, "Ms Shell Dlg 2" +{ + DEFPUSHBUTTON "OK", IDOK, 74, 74, 50, 14, BS_DEFPUSHBUTTON + PUSHBUTTON "Cancel", IDCANCEL, 129, 74, 50, 14, BS_PUSHBUTTON + AUTOCHECKBOX "8MB Debugger Mode", IDC_CHECKBOX_DEBUGGERMODE, 7, 20, 82, 10, BS_AUTOCHECKBOX + LTEXT "If you have to ask, you don't need to change these.", IDC_STATIC, 10, 7, 169, 8, SS_LEFT +} @@ -1213,7 +1228,7 @@ IDD_FIRMSETTINGS DIALOG 0, 0, 161, 145 STYLE DS_MODALFRAME | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Firmware Indstillinger" FONT 8, "MS Sans Serif" -BEGIN +{ DEFPUSHBUTTON "&OK", IDOK, 7, 124, 50, 14, BS_DEFPUSHBUTTON PUSHBUTTON "&Fortryd", IDCANCEL, 104, 124, 50, 14, BS_PUSHBUTTON CONTROL "Favorit Farve:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 55, 52, 12 @@ -1228,7 +1243,7 @@ BEGIN EDITTEXT IDC_EDIT1, 66, 14, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN CONTROL "Besked:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 36, 52, 12 EDITTEXT IDC_EDIT2, 66, 33, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN -END +} @@ -1237,7 +1252,7 @@ IDD_FIRMSETTINGS DIALOGEX 0, 0, 161, 145 STYLE DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Firmware Settings" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ EDITTEXT IDC_EDIT1, 66, 14, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN EDITTEXT IDC_EDIT2, 66, 33, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN COMBOBOX IDC_COMBO1, 66, 53, 84, 14, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWN @@ -1252,7 +1267,7 @@ BEGIN CONTROL "Language:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 106, 52, 12 CONTROL "Nickname:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 17, 52, 12 CONTROL "Message:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 36, 52, 12 -END +} @@ -1261,7 +1276,7 @@ IDD_FIRMSETTINGS DIALOG 0, 0, 161, 145 STYLE DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Configuration du firmware" FONT 8, "MS Sans Serif" -BEGIN +{ EDITTEXT IDC_EDIT1, 66, 14, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN EDITTEXT IDC_EDIT2, 66, 33, 82, 14, WS_GROUP | ES_AUTOHSCROLL | ES_WANTRETURN COMBOBOX IDC_COMBO1, 66, 53, 84, 14, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWN @@ -1276,7 +1291,7 @@ BEGIN CONTROL "Langage:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 106, 52, 12 CONTROL "Pseudonyme:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 17, 52, 12 CONTROL "Message:", IDC_STATIC, WC_STATIC, NOT WS_GROUP | SS_LEFTNOWORDWRAP, 9, 36, 52, 12 -END +} @@ -1285,7 +1300,7 @@ IDD_GAME_INFO DIALOG 0, 0, 150, 150 STYLE DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "ROM Information" FONT 8, "MS Sans Serif" -BEGIN +{ PUSHBUTTON "&Luk", IDC_FERMER, 50, 134, 50, 14, BS_PUSHBUTTON LTEXT "Spillets Navn:", IDC_STATIC, 4, 4, 51, 8, SS_LEFT LTEXT "Kode:", IDC_STATIC, 4, 12, 51, 8, SS_LEFT @@ -1301,7 +1316,7 @@ BEGIN LTEXT "", IDC_ARM9_T, 60, 36, 100, 8, SS_LEFT LTEXT "", IDC_ARM7_T, 60, 44, 100, 8, SS_LEFT LTEXT "", IDC_DATA, 60, 52, 100, 8, SS_LEFT -END +} @@ -1310,7 +1325,7 @@ IDD_GAME_INFO DIALOG 0, 0, 150, 150 STYLE DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "ROM Info" FONT 8, "MS Sans Serif" -BEGIN +{ PUSHBUTTON "&Close", IDC_FERMER, 50, 134, 50, 14, BS_PUSHBUTTON LTEXT "Name of Game :", IDC_STATIC, 4, 4, 51, 8, SS_LEFT LTEXT "Code :", IDC_STATIC, 4, 12, 51, 8, SS_LEFT @@ -1326,7 +1341,7 @@ BEGIN LTEXT "", IDC_ARM9_T, 60, 36, 100, 8, SS_LEFT LTEXT "", IDC_ARM7_T, 60, 44, 100, 8, SS_LEFT LTEXT "", IDC_DATA, 60, 52, 100, 8, SS_LEFT -END +} @@ -1335,7 +1350,7 @@ IDD_GAME_INFO DIALOG 0, 0, 150, 150 STYLE DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "Info ROM" FONT 8, "MS Sans Serif" -BEGIN +{ PUSHBUTTON "&Fermer", IDC_FERMER, 50, 134, 50, 14, BS_PUSHBUTTON LTEXT "Nom du jeu :", IDC_STATIC, 4, 4, 41, 8, SS_LEFT LTEXT "Code :", IDC_STATIC, 4, 12, 41, 8, SS_LEFT @@ -1351,7 +1366,7 @@ BEGIN LTEXT "", IDC_ARM9_T, 45, 36, 100, 8, SS_LEFT LTEXT "", IDC_ARM7_T, 45, 44, 100, 8, SS_LEFT LTEXT "", IDC_DATA, 45, 52, 100, 8, SS_LEFT -END +} @@ -1360,12 +1375,12 @@ IDD_GBASLOT DIALOGEX 0, 0, 316, 185 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "GBA slot" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ COMBOBOX IDC_ADDONS_LIST, 7, 7, 302, 30, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST DEFPUSHBUTTON "OK", IDOK, 205, 164, 50, 14, WS_DISABLED | BS_DEFPUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 259, 164, 50, 14, BS_PUSHBUTTON CTEXT "Info", IDC_ADDONS_INFO, 7, 21, 302, 23, SS_CENTER -END +} @@ -1373,7 +1388,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GBASLOT_CFLASH DIALOGEX 7, 48, 302, 109 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ AUTORADIOBUTTON "file", IDC_RFILE, 16, 26, 25, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "folder", IDC_RFOLDER, 16, 56, 35, 10, WS_TABSTOP | BS_AUTORADIOBUTTON EDITTEXT IDC_PATHIMG, 14, 39, 223, 14, ES_AUTOHSCROLL | ES_READONLY @@ -1383,7 +1398,7 @@ BEGIN AUTOCHECKBOX "use rom folder", IDC_PATHDESMUME, 43, 82, 62, 10, BS_AUTOCHECKBOX CTEXT "Select file name or folder for Compact Flash image:", IDC_STATIC, 7, 7, 288, 14, SS_CENTER GROUPBOX "", IDC_STATIC, 7, 19, 288, 75 -END +} @@ -1391,11 +1406,11 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GBASLOT_GBAGAME DIALOGEX 7, 48, 302, 109 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_PATHGAME, 7, 34, 236, 14, ES_AUTOHSCROLL | ES_READONLY PUSHBUTTON "Browse...", IDC_BBROWSE, 245, 33, 50, 14, BS_PUSHBUTTON CTEXT "Select file name for GBA game rom:", IDC_STATIC, 7, 7, 288, 14, SS_CENTER -END +} @@ -1403,8 +1418,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GBASLOT_NONE DIALOGEX 7, 48, 302, 110 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN -END +{ +} @@ -1412,9 +1427,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_GBASLOT_RUMBLEPAK DIALOGEX 7, 48, 302, 109 STYLE DS_SHELLFONT | WS_VISIBLE | WS_CHILDWINDOW | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ CTEXT "TODO", IDC_STATIC, 7, 7, 288, 26, SS_CENTER -END +} @@ -1423,7 +1438,7 @@ IDD_INPUT DIALOGEX 0, 0, 325, 148 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Configure controls" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ EDITTEXT IDC_EDIT01, 32, 69, 26, 14, ES_CENTER | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN EDITTEXT IDC_EDIT02, 7, 83, 26, 14, ES_CENTER | ES_AUTOHSCROLL | ES_READONLY EDITTEXT IDC_EDIT03, 57, 83, 26, 14, ES_CENTER | ES_AUTOHSCROLL | ES_READONLY @@ -1459,7 +1474,7 @@ BEGIN LTEXT "open/close lid", IDC_STATIC, 36, 129, 44, 8, SS_LEFT CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 95, 41, 141, 77 LTEXT "debug", IDC_STATIC, 123, 129, 21, 8, WS_DISABLED | SS_LEFT -END +} @@ -1468,7 +1483,7 @@ IDD_INPUTCONFIG DIALOGEX 0, 0, 339, 148 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Control Config" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ CONTROL "WOG!", IDC_UP, "InputCustom", 0x50010000, 52, 15, 71, 12, 0x00000200 CONTROL "", IDC_LEFT, "InputCustom", 0x50010000, 52, 29, 71, 12, 0x00000200 CONTROL "", IDC_DOWN, "InputCustom", 0x50010000, 52, 42, 71, 12, 0x00000200 @@ -1510,7 +1525,7 @@ BEGIN RTEXT "LID", IDC_LABEL_X2, 8, 121, 39, 8, SS_RIGHT RTEXT "DEBUG", IDC_LABEL_X3, 127, 123, 29, 8, SS_RIGHT CONTROL " ", IDC_DEBUG, "InputCustom", 0x58010000, 163, 120, 71, 12, 0x00000200 -END +} @@ -1519,7 +1534,7 @@ IDD_IO_REG DIALOGEX 0, 0, 150, 200 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "IO registers" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ LTEXT "Int Handler :", IDC_STATIC, 5, 13, 41, 8, SS_LEFT LTEXT "", IDC_INTHAND9, 60, 14, 80, 8, SS_LEFT LTEXT "IE :", IDC_STATIC, 5, 21, 41, 8, SS_LEFT @@ -1559,7 +1574,7 @@ BEGIN LTEXT "", IDC_IPCSYNC7, 60, 138, 78, 8, SS_LEFT LTEXT "IPCFIFO :", IDC_STATIC, 5, 146, 41, 8, SS_LEFT LTEXT "", IDC_IPCFIFO7, 60, 147, 79, 8, SS_LEFT -END +} @@ -1568,7 +1583,7 @@ IDD_IO_REG DIALOGEX 0, 0, 150, 200 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "IO registers" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ LTEXT "Int Handler :", IDC_STATIC, 5, 13, 41, 8, SS_LEFT LTEXT "", IDC_INTHAND9, 60, 14, 80, 8, SS_LEFT LTEXT "IE :", IDC_STATIC, 5, 21, 41, 8, SS_LEFT @@ -1608,7 +1623,7 @@ BEGIN LTEXT "", IDC_IPCSYNC7, 60, 138, 78, 8, SS_LEFT LTEXT "IPCFIFO :", IDC_STATIC, 5, 146, 41, 8, SS_LEFT LTEXT "", IDC_IPCFIFO7, 60, 147, 79, 8, SS_LEFT -END +} @@ -1617,7 +1632,7 @@ IDD_IO_REG DIALOGEX 0, 0, 150, 200 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "IO registre" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ LTEXT "Int Handler :", IDC_STATIC, 5, 13, 41, 8, SS_LEFT LTEXT "", IDC_INTHAND9, 60, 14, 80, 8, SS_LEFT LTEXT "IE :", IDC_STATIC, 5, 21, 41, 8, SS_LEFT @@ -1657,7 +1672,7 @@ BEGIN LTEXT "", IDC_IPCSYNC7, 60, 138, 78, 8, SS_LEFT LTEXT "IPCFIFO :", IDC_STATIC, 5, 146, 41, 8, SS_LEFT LTEXT "", IDC_IPCFIFO7, 60, 147, 79, 8, SS_LEFT -END +} @@ -1666,7 +1681,7 @@ IDD_KEYCUSTOM DIALOGEX 0, 0, 382, 180 STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_CLIPCHILDREN | WS_DLGFRAME | WS_POPUP CAPTION "Customize Special Keys" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ PUSHBUTTON "OK", IDOK, 16, 159, 50, 14, BS_PUSHBUTTON PUSHBUTTON "Cancel", IDCANCEL, 66, 159, 50, 14, BS_PUSHBUTTON RTEXT "Item #01", IDC_LABEL_HK1, 2, 7, 80, 8, SS_RIGHT @@ -1711,7 +1726,7 @@ BEGIN CONTROL "", IDC_HOTKEY20, "InputCustomHot", 0x50010000, 276, 122, 98, 12, 0x00000200 LTEXT "Blue means the hotkey is already mapped.\nPink means it conflicts with a game button.\nRed means it's reserved by Windows.\nA hotkey can be disabled using Escape.", IDC_LABEL_BLUE, 238, 140, 136, 32, SS_LEFT COMBOBOX IDC_HKCOMBO, 16, 141, 168, 60, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST -END +} @@ -1720,7 +1735,7 @@ IDD_LIGHT_VIEWER DIALOGEX 0, 0, 197, 89 STYLE DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Light Viewer" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ DEFPUSHBUTTON "OK", IDOK, 140, 68, 50, 14, BS_DEFPUSHBUTTON GROUPBOX "Light0", IDC_LIGHT_VIWER_LIGHT0_GROUP, 7, 7, 90, 27 EDITTEXT IDC_LIGHT_VIEWER_LIGHT0VECTOR_EDIT, 58, 16, 35, 14, WS_GROUP | ES_AUTOHSCROLL | ES_READONLY @@ -1742,7 +1757,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 67, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 67, 11, 14 LTEXT "secs", IDC_STATIC, 92, 70, 16, 8, SS_LEFT -END +} @@ -1751,7 +1766,7 @@ IDD_MAP DIALOGEX 0, 0, 485, 320 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "MAP Fremviser" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_BG_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Mode :", IDC_STATIC, 4, 20, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 30, 45, 8, SS_LEFT @@ -1772,7 +1787,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 93, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 93, 11, 14 LTEXT "secs", IDC_STATIC, 83, 96, 16, 8, SS_LEFT -END +} @@ -1781,7 +1796,7 @@ IDD_MAP DIALOGEX 0, 0, 485, 320 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "MAP VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_BG_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Mode :", IDC_STATIC, 4, 20, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 30, 45, 8, SS_LEFT @@ -1804,7 +1819,7 @@ BEGIN LTEXT "secs", IDC_STATIC, 83, 106, 16, 8, SS_LEFT LTEXT "Visible :", IDC_STATIC, 4, 50, 38, 8, SS_LEFT LTEXT "CHAR", IDC_CHAR, 47, 63, 85, 8, SS_LEFT -END +} @@ -1813,7 +1828,7 @@ IDD_MAP DIALOGEX 0, 0, 485, 320 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "MAP VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_BG_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Mode :", IDC_STATIC, 4, 20, 45, 8, SS_LEFT LTEXT "Palette :", IDC_STATIC, 4, 30, 45, 8, SS_LEFT @@ -1834,7 +1849,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 93, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 93, 11, 14 LTEXT "secs", IDC_STATIC, 83, 96, 16, 8, SS_LEFT -END +} @@ -1843,7 +1858,7 @@ IDD_MATRIX_VIEWER DIALOGEX 0, 0, 364, 177 STYLE DS_CENTER | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Matrix Viewer" FONT 8, "MS Shell Dlg", 400, 0, 1 -BEGIN +{ DEFPUSHBUTTON "OK", IDOK, 307, 156, 50, 14, BS_DEFPUSHBUTTON GROUPBOX "Projection", IDC_MATRIX_VIEWER_PROJ_GROUP, 7, 86, 173, 65 EDITTEXT IDC_MATRIX_VIEWER_PROJ_11_EDIT, 11, 95, 40, 12, ES_AUTOHSCROLL | ES_READONLY @@ -1919,7 +1934,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 155, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 155, 11, 14 LTEXT "secs", IDC_STATIC, 92, 158, 16, 8, SS_LEFT -END +} @@ -1928,7 +1943,7 @@ IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Vis Hukommelse" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1941,7 +1956,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -1950,7 +1965,7 @@ IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "View Memory" FONT 8, "MS Shell Dlg", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1963,7 +1978,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -1972,7 +1987,7 @@ IDD_MEM_VIEWER7 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Visualisation de la memoire" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -1985,7 +2000,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -1994,7 +2009,7 @@ IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Vis Hukommelse" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -2007,7 +2022,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -2016,7 +2031,7 @@ IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP CAPTION "View Memory" FONT 8, "MS Shell Dlg", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -2029,7 +2044,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -2038,7 +2053,7 @@ IDD_MEM_VIEWER9 DIALOGEX 0, 0, 428, 178 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "Visualisation de la memoire" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ AUTORADIOBUTTON "8 bit", IDC_8_BIT, 10, 4, 29, 10, WS_GROUP | WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "16 bit", IDC_16_BIT, 44, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON AUTORADIOBUTTON "32 bit", IDC_32_BIT, 82, 4, 33, 10, WS_TABSTOP | BS_AUTORADIOBUTTON @@ -2051,7 +2066,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 382, 2, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 394, 2, 11, 14 LTEXT "secs", IDC_STATIC, 406, 5, 16, 8, SS_LEFT -END +} @@ -2060,7 +2075,7 @@ IDD_OAM DIALOGEX 0, 0, 300, 200 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "OAM Fremviser" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT @@ -2087,7 +2102,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT -END +} @@ -2096,7 +2111,7 @@ IDD_OAM DIALOGEX 0, 0, 300, 200 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT @@ -2123,7 +2138,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT -END +} @@ -2132,7 +2147,7 @@ IDD_OAM DIALOGEX 0, 0, 300, 200 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "OAM Viewer" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_SCR_SELECT, 4, 4, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN SCROLLBAR IDC_SCROLLER, 48, 20, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE LTEXT "Mode :", IDC_STATIC, 4, 36, 45, 8, SS_LEFT @@ -2159,7 +2174,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 59, 162, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 71, 161, 11, 14 LTEXT "secs", IDC_STATIC, 83, 163, 16, 8, SS_LEFT -END +} @@ -2168,7 +2183,7 @@ IDD_PAL DIALOGEX 0, 0, 120, 190 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "Palette Fremvisning" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2177,7 +2192,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT -END +} @@ -2186,7 +2201,7 @@ IDD_PAL DIALOGEX 0, 0, 120, 184 STYLE DS_CENTER | DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "PAL VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2195,7 +2210,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT -END +} @@ -2204,7 +2219,7 @@ IDD_PAL DIALOGEX 0, 0, 120, 194 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "PAL VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 15, 3, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 3, 21, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 18, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2214,7 +2229,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 68, 151, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 80, 151, 11, 14 LTEXT "secs", IDC_STATIC, 92, 154, 16, 8, SS_LEFT -END +} @@ -2223,7 +2238,7 @@ IDD_SOUNDSETTINGS DIALOGEX 0, 0, 174, 96 STYLE DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Lyd Indstillinger" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ GROUPBOX "Lyd Indstillinger", -1, 3, 2, 168, 28 LTEXT "Lyd Driver", -1, 10, 14, 40, 10, SS_LEFT COMBOBOX IDC_SOUNDCORECB, 54, 13, 110, 33, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST @@ -2234,7 +2249,7 @@ BEGIN CONTROL "", IDC_SLVOLUME, TRACKBAR_CLASS, 0, 40, 57, 128, 10 DEFPUSHBUTTON "&OK", IDOK, 82, 78, 40, 14, BS_DEFPUSHBUTTON PUSHBUTTON "&Fortryd", IDCANCEL, 127, 78, 40, 14, BS_PUSHBUTTON -END +} @@ -2243,7 +2258,7 @@ IDD_SOUNDSETTINGS DIALOGEX 0, 0, 174, 96 STYLE DS_CENTER | DS_MODALFRAME | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP | WS_SYSMENU CAPTION "Sound Settings" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ GROUPBOX "Sound Core Settings", -1, 3, 2, 168, 28 LTEXT "Sound Core", -1, 10, 14, 40, 10, SS_LEFT COMBOBOX IDC_SOUNDCORECB, 54, 13, 110, 33, WS_TABSTOP | WS_VSCROLL | WS_TABSTOP | CBS_DROPDOWNLIST @@ -2254,7 +2269,7 @@ BEGIN CONTROL "", IDC_SLVOLUME, TRACKBAR_CLASS, 0, 40, 57, 128, 10 DEFPUSHBUTTON "&OK", IDOK, 82, 78, 40, 14, BS_DEFPUSHBUTTON PUSHBUTTON "&Cancel", IDCANCEL, 127, 78, 40, 14, BS_PUSHBUTTON -END +} @@ -2263,7 +2278,7 @@ IDD_TILE DIALOGEX 0, 0, 446, 180 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "TILE Fremvisning" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2279,7 +2294,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT -END +} @@ -2288,7 +2303,7 @@ IDD_TILE DIALOGEX 0, 0, 446, 180 STYLE DS_CENTER | DS_SETFONT | WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_DLGFRAME CAPTION "TILE VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2304,7 +2319,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT -END +} @@ -2313,7 +2328,7 @@ IDD_TILE DIALOGEX 0, 0, 446, 180 STYLE DS_SETFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_SYSMENU CAPTION "TILE VIEW" FONT 8, "MS Sans Serif", 0, 0, 1 -BEGIN +{ COMBOBOX IDC_PAL_SELECT, 4, 13, 90, 14, WS_TABSTOP | WS_TABSTOP | CBS_DROPDOWN LTEXT "Pal : 0", IDC_PALNUM, 4, 31, 25, 8, SS_LEFT SCROLLBAR IDC_SCROLLER, 30, 28, 20, 14, NOT WS_VISIBLE | NOT WS_VISIBLE @@ -2329,7 +2344,7 @@ BEGIN EDITTEXT IDC_AUTO_UPDATE_SECS, 404, 165, 12, 14, WS_DISABLED | ES_AUTOHSCROLL | ES_READONLY CONTROL "", IDC_AUTO_UPDATE_SPIN, UPDOWN_CLASS, WS_DISABLED | UDS_ARROWKEYS | UDS_AUTOBUDDY | UDS_SETBUDDYINT, 416, 164, 11, 14 LTEXT "secs", IDC_STATIC, 428, 167, 16, 8, SS_LEFT -END +} @@ -2338,6 +2353,6 @@ END // LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDR_MAIN_ACCEL ACCELERATORS -BEGIN +{ "O", ACCEL_CTRL_O, VIRTKEY, CONTROL -END +}