diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index f5884bdf1..10791092a 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -212,11 +212,8 @@ #define IDC_IPCFIFO9 1020 #define IDC_BGMAP_SCROLL 1021 #define IDC_IPCSYNC9 1021 -#define IDC_BGMAP_ROT 1022 #define IDC_IF9 1022 -#define IDC_BGMAP_SCALE 1023 #define IDC_INTHAND9 1023 -#define IDC_BGMAP_ROTSCALE 1024 #define IDC_IE9 1024 #define IDC_BGMAP_MOSAIC 1025 #define IDC_DISPCNTA9 1025 @@ -410,4 +407,6 @@ #define IDM_3DCONFIG 40040 #define IDM_GBASLOT 40042 #define IDM_CHEATS_LIST 40050 +#define IDC_BGMAP_ROTSCALEPARAMS 40051 #define IDM_CHEATS_SEARCH 40051 +#define IDC_BGMAP_ROTSCALE 40052 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 3f1101aed..ec32a1dea 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -1207,13 +1207,13 @@ END LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_BGMAP_VIEWER DIALOG 0, 0, 485, 320 +IDD_BGMAP_VIEWER DIALOG 0, 0, 495, 320 STYLE DS_CENTER | DS_MODALFRAME | DS_FIXEDSYS | 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, 273 + GROUPBOX "Map info", IDC_STATIC, 5, 23, 142, 250 COMBOBOX IDC_BGMAP_SEL, 5, 5, 142, 154, CBS_DROPDOWNLIST | CBS_HASSTRINGS LTEXT "BG control : ", IDC_STATIC, 15, 35, 60, 8, SS_LEFT LTEXT "Char base :", IDC_STATIC, 15, 65, 60, 8, SS_LEFT @@ -1223,12 +1223,11 @@ BEGIN LTEXT "Palette :", IDC_STATIC, 15, 110, 60, 8, SS_LEFT LTEXT "Size :", IDC_STATIC, 15, 125, 60, 8, SS_LEFT LTEXT "Scroll :", IDC_STATIC, 15, 140, 60, 8, SS_LEFT - LTEXT "Mosaic :", IDC_STATIC, 15, 245, 60, 8, SS_LEFT - LTEXT "Rotation :", IDC_STATIC, 15, 155, 60, 8, SS_LEFT - LTEXT "Scale :", IDC_STATIC, 15, 170, 60, 8, SS_LEFT - LTEXT "Special effect :", IDC_STATIC, 15, 260, 60, 8, SS_LEFT - LTEXT "Windows :", IDC_STATIC, 15, 275, 60, 8, SS_LEFT - LTEXT "Rot/scale params :", IDC_STATIC, 15, 185, 60, 8, SS_LEFT + LTEXT "Mosaic :", IDC_STATIC, 15, 230, 60, 8, SS_LEFT + LTEXT "Rot/scale :", IDC_STATIC, 15, 155, 60, 8, SS_LEFT + LTEXT "Special effect :", IDC_STATIC, 15, 245, 60, 8, SS_LEFT + LTEXT "Windows :", IDC_STATIC, 15, 260, 60, 8, SS_LEFT + LTEXT "Rot/scale params :", IDC_STATIC, 15, 170, 60, 8, SS_LEFT LTEXT "BGxCNT here", IDC_BGMAP_BGXCNT, 75, 35, 68, 8, SS_LEFT LTEXT "type here", IDC_BGMAP_TYPE, 75, 50, 68, 8, SS_LEFT LTEXT "charbase here", IDC_BGMAP_CHARBASE, 75, 65, 68, 8, SS_LEFT @@ -1237,12 +1236,11 @@ BEGIN LTEXT "pal here", IDC_BGMAP_PAL, 75, 110, 68, 8, SS_LEFT LTEXT "size here", IDC_BGMAP_SIZE, 75, 125, 68, 8, SS_LEFT LTEXT "scroll (x,y) here", IDC_BGMAP_SCROLL, 75, 140, 68, 8, SS_LEFT - LTEXT "rotation here", IDC_BGMAP_ROT, 75, 155, 68, 8, SS_LEFT - LTEXT "scale here", IDC_BGMAP_SCALE, 75, 170, 68, 8, SS_LEFT - LTEXT "pa/pb/pc/pd here", IDC_BGMAP_ROTSCALE, 75, 185, 68, 55, SS_LEFT - LTEXT "mosaic here", IDC_BGMAP_MOSAIC, 75, 245, 68, 8, SS_LEFT - LTEXT "special effect here", IDC_BGMAP_SPECEFF, 75, 260, 68, 8, SS_LEFT - LTEXT "windows here", IDC_BGMAP_WINDOWS, 75, 275, 68, 8, SS_LEFT + LTEXT "{yes/no} here", IDC_BGMAP_ROTSCALE, 75, 155, 68, 8, SS_LEFT + LTEXT "pa/pb/pc/pd here", IDC_BGMAP_ROTSCALEPARAMS, 75, 170, 68, 55, SS_LEFT + LTEXT "mosaic here", IDC_BGMAP_MOSAIC, 75, 230, 68, 8, SS_LEFT + LTEXT "special effect here", IDC_BGMAP_SPECEFF, 75, 245, 68, 8, SS_LEFT + LTEXT "windows here", IDC_BGMAP_WINDOWS, 75, 260, 68, 8, SS_LEFT END