From 81f72036b8c7b1f46e059238fccfab5c190c8263 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Sat, 23 Oct 2010 02:50:13 +0000
Subject: [PATCH] add 20.12 display to ram watch

---
 desmume/src/windows/ramwatch.cpp |  21 ++++++++++++++++-----
 desmume/src/windows/resource.h   |   2 +-
 desmume/src/windows/resources.rc | Bin 947726 -> 949576 bytes
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp
index c185e894c..17a96f290 100644
--- a/desmume/src/windows/ramwatch.cpp
+++ b/desmume/src/windows/ramwatch.cpp
@@ -683,6 +683,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 				case 'h':
 					SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0);
 					break;
+				case 'f':
+					SendDlgItemMessage(hDlg, IDC_2012, BM_SETCHECK, BST_CHECKED, 0);
+					break;
 				default:
 					t = 0;
 					break;
@@ -703,6 +706,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 				case IDC_HEX:
 					t='h';
 					return true;
+				case IDC_2012:
+					t='f';
+					return true;
 				case IDC_1_BYTE:
 					s = 'b';
 					return true;
@@ -967,13 +973,18 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
 									int t = rswatches[iNum].Type;
 									int size = rswatches[iNum].Size;
 									const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X"));
-									switch (size)
+									if(t=='f')
 									{
-										case 'b':
-										default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
-										case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
-										case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
+										sprintf(num,"%f",i/4096.0f);
 									}
+									else
+										switch (size)
+										{
+											case 'b':
+											default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
+											case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
+											case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
+										}
 
 									Item->item.pszText = num;
 								}	return true;
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index 455ba8fa0..a16a307f0 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -248,6 +248,7 @@
 #define IDC_2_BYTES                     958
 #define IDC_4_BYTES                     959
 #define IDC_WATCHLIST                   960
+#define IDC_HEX2                        960
 #define IDC_C_WATCH_EDIT                961
 #define IDC_C_WATCH_REMOVE              962
 #define IDC_C_WATCH                     963
@@ -386,7 +387,6 @@
 #define IDC_RFILE                       1038
 #define IDC_EXPORT                      1038
 #define IDC_RFOLDER                     1039
-#define IDC_STATIC2                     1039
 #define IDC_2012                        1039
 #define IDC_BBROWSE2                    1040
 #define IDC_PATHDESMUME                 1041
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index c7e3ba25c6d1f6b50adcccb86574b25251e26188..7c3b7370a3337a2a7c0ec0c5a92f7a5e19780292 100644
GIT binary patch
delta 1140
zcmcJOUr19?9LLZ7yIps;Tr7>LaT!A_%(km@-fAT@1cPiVn_^}L1qxw%5DT&8C>ktS
z8`t@(P{=(*gb$N}M@T3WA|%Izh#o|YB6{dyKJ*eYI$N{I*Ye>W?(cif56<`Z{hY`*
z<;@Qz=?imqBqJwK!zBwT^SxD?Y6SaxY7b;L7<bAOxtkX@rl}6_vm&2ri1pAK2dYJO
zWP^|2MHiGlrYwRTDMgKX%2%oDF^i)G^`jf;3c8FW<U!X+HGl@mzl?0Cj<n0jLRwmp
z8=XKG3o6kdNQ>w7PUIw8jfGVK?~qUh)3<aINO4NK-8UBM8>4XF7@bhm%5W*XN@{(S
z0yFoygU}Y?hC+cfjRR>Wv7|;TwUi9rR^b$keqsml*N5x}nsFed;0T*1*=CNkdJhRM
z@M~EXCK7D*FQEc@kMh?4<^r!I*wziz9NwM3@8R)Tt(mc-CNS>j%At2wTe;<6{j}i`
zBs26Xj>fsnJUL`njmAYdkkgH*FC`mz+W7z^zi>5izu2j+#jH5s<7FDM9shJ)$_X=*
z>=8^-9-z5=nu@v-cY&l4Yq<JiSpm_0#sbl0(EypVyhqJcSRmWZ+jKH&AZKKfYb{JQ
z)8!CtV65QRv1~jmHc<{(m|&fdHi^GQ7WVDZTOilTn_%cURR@s^Oj*d^&67`q{oPu(
zcYC~;#JfpDVMHfm+!G)pT7sTCx^di=(snHthGk!_S8e<mwNyHWuU;2S49UAl@Q9Bu
z!JmhP@Lx>hw>O1>KTsRb(Jn~31uKENh&8;BspHOSv_nXTOhEygf+Y`f+YLkdlwlJ_
zgSs+2KdO5+vPA<XG~{S_$LhN<F*QyTdh&0ym|jypF1YlXP+f>mF4R+NjB5u?%xT2X
ToJNo5G={w`+l^piq`BrNb4fqB

delta 549
zcmX@{%d+o{<%X~>M$74n_c?;6H*l~NY?kT1!!(^`Axre;;J#L->1+#G;x?O2jALRp
zW6+ttv4c@|@_}hi?1l_R3<eMZ(dh@OI3=ck&}8;%cAMJnHkEO^+f=3*meU(rxl7t#
zoM+np;ym-BQ<DR_*nk!ZN-}3o|8ST&VtdGJmK$K3qPDlqV{u@ezNv#zX1YNyi`w)%
z4$KOyNEQ@WFo{jxa93dZuJvpM(*rV@S4<D!Wi{Adw~Xc5`|S-EnaUWaPq1JTn0{e8
zYsmCH+c?s;$IWDA+XMC3_6f{9dCVYB#cYpa=a~ZW)pmtwwhV-~raySX;el)^%vVnB
z9SLke%)Y!Mfg=#)tG4X|6In}`rUNaWHT@Mki`ev8lUXMqT(BMJg0LgVp}PG>HKz#F
z1s?UBlb|lJXyVL6c0mJ|8}^WOY7c4S+#b@#HSOPapaXW*Qpsm=d_3)Oe7xJ^`1r)!
ZKwkSb-C-81#q@&7tRmY3!uWou0RXj)#E$>~