diff --git a/source/Memory.cpp b/source/Memory.cpp index f516c9dc..cca5548c 100644 --- a/source/Memory.cpp +++ b/source/Memory.cpp @@ -57,20 +57,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Debugger\DebugDefs.h" #include "YamlHelper.h" -// Memory Flag -#define MF_80STORE 0x00000001 -#define MF_ALTZP 0x00000002 -#define MF_AUXREAD 0x00000004 // RAMRD -#define MF_AUXWRITE 0x00000008 // RAMWRT -#define MF_BANK2 0x00000010 -#define MF_HIGHRAM 0x00000020 -#define MF_HIRES 0x00000040 -#define MF_PAGE2 0x00000080 -#define MF_SLOTC3ROM 0x00000100 -#define MF_SLOTCXROM 0x00000200 -#define MF_WRITERAM 0x00000400 -#define MF_IMAGEMASK 0x000003F7 - #define SW_80STORE (memmode & MF_80STORE) #define SW_ALTZP (memmode & MF_ALTZP) #define SW_AUXREAD (memmode & MF_AUXREAD) diff --git a/source/Memory.h b/source/Memory.h index a0235f8f..8a3dc320 100644 --- a/source/Memory.h +++ b/source/Memory.h @@ -1,5 +1,19 @@ #pragma once +// Memory Flag +#define MF_80STORE 0x00000001 +#define MF_ALTZP 0x00000002 +#define MF_AUXREAD 0x00000004 // RAMRD +#define MF_AUXWRITE 0x00000008 // RAMWRT +#define MF_BANK2 0x00000010 // LanguageCard Bank 2 $D000.$DFFF +#define MF_HIGHRAM 0x00000020 +#define MF_HIRES 0x00000040 +#define MF_PAGE2 0x00000080 +#define MF_SLOTC3ROM 0x00000100 +#define MF_SLOTCXROM 0x00000200 +#define MF_WRITERAM 0x00000400 +#define MF_IMAGEMASK 0x000003F7 + enum { // Note: All are in bytes!