Moved the timer IDs to an external include because, if they're located in resource.h, Resedit will blow them up when saving.
This commit is contained in:
parent
107ede7375
commit
6a769e0bc0
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="shift_jis"?>
|
<?xml version="1.0" encoding="shift_jis"?>
|
||||||
<VisualStudioProject
|
<VisualStudioProject
|
||||||
ProjectType="Visual C++"
|
ProjectType="Visual C++"
|
||||||
Version="9.00"
|
Version="9,00"
|
||||||
Name="DeSmuME_VS2008"
|
Name="DeSmuME_VS2008"
|
||||||
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
|
||||||
RootNamespace="DeSmuME"
|
RootNamespace="DeSmuME"
|
||||||
|
@ -981,10 +981,6 @@
|
||||||
RelativePath="..\instruction_tabdef.inc"
|
RelativePath="..\instruction_tabdef.inc"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
<File
|
|
||||||
RelativePath="..\shaders.h"
|
|
||||||
>
|
|
||||||
</File>
|
|
||||||
<File
|
<File
|
||||||
RelativePath="..\thumb_tabdef.inc"
|
RelativePath="..\thumb_tabdef.inc"
|
||||||
>
|
>
|
||||||
|
@ -1060,6 +1056,10 @@
|
||||||
RelativePath=".\palView.h"
|
RelativePath=".\palView.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath=".\res_timer_ids.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\resource.h"
|
RelativePath=".\resource.h"
|
||||||
>
|
>
|
||||||
|
@ -1224,6 +1224,10 @@
|
||||||
RelativePath="..\saves.h"
|
RelativePath="..\saves.h"
|
||||||
>
|
>
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\shaders.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\softrender.h"
|
RelativePath="..\softrender.h"
|
||||||
>
|
>
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
#include "../armcpu.h"
|
#include "../armcpu.h"
|
||||||
|
|
||||||
|
|
|
@ -29,6 +29,7 @@
|
||||||
#include "disView.h"
|
#include "disView.h"
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "colorctrl.h"
|
#include "colorctrl.h"
|
||||||
#include "gfx3d.h"
|
#include "gfx3d.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
// Convert B5G5R5 color format into R8G8B8 color format
|
// Convert B5G5R5 color format into R8G8B8 color format
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include "../addons.h"
|
#include "../addons.h"
|
||||||
#endif
|
#endif
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "memView.h"
|
#include "memView.h"
|
||||||
#include "disView.h"
|
#include "disView.h"
|
||||||
#include "ginfo.h"
|
#include "ginfo.h"
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
|
|
||||||
#include "mapView.h"
|
#include "mapView.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
|
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "gfx3d.h"
|
#include "gfx3d.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
#include "../GPU.h"
|
#include "../GPU.h"
|
||||||
#include "../NDSSystem.h"
|
#include "../NDSSystem.h"
|
||||||
|
|
|
@ -23,6 +23,7 @@
|
||||||
#include <commctrl.h>
|
#include <commctrl.h>
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
#define IDT_VIEW_DISASM7 50001
|
||||||
|
#define IDT_VIEW_DISASM9 50002
|
||||||
|
#define IDT_VIEW_MEM7 50003
|
||||||
|
#define IDT_VIEW_MEM9 50004
|
||||||
|
#define IDT_VIEW_IOREG 50005
|
||||||
|
#define IDT_VIEW_PAL 50006
|
||||||
|
#define IDT_VIEW_TILE 50007
|
||||||
|
#define IDT_VIEW_MAP 50008
|
||||||
|
#define IDT_VIEW_OAM 50009
|
||||||
|
#define IDT_VIEW_MATRIX 50010
|
||||||
|
#define IDT_VIEW_LIGHTS 50011
|
||||||
|
#define IDM_EXEC 50112
|
File diff suppressed because it is too large
Load Diff
|
@ -22,6 +22,7 @@
|
||||||
#include "tileView.h"
|
#include "tileView.h"
|
||||||
#include "commctrl.h"
|
#include "commctrl.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
#include "res_timer_ids.h"
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
#include "../MMU.h"
|
#include "../MMU.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue