ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanups related to prior commits

This commit is contained in:
zeromus 2020-06-18 15:58:16 -04:00
parent 622b763bf1
commit fc3d81e73a
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/firmware.cpp
View File

@ -22,6 +22,7 @@
#include "path.h" #include "path.h"
#include "encrypt.h" #include "encrypt.h"
#include "wifi.h" #include "wifi.h"
#include "version.h"
#define DFC_ID_CODE "DeSmuME Firmware User Settings" #define DFC_ID_CODE "DeSmuME Firmware User Settings"
#define DFC_ID_SIZE sizeof(DFC_ID_CODE) #define DFC_ID_SIZE sizeof(DFC_ID_CODE)
@ -31,8 +32,8 @@
#define DFC_FILE_SIZE (SETTINGS_SIZE + DFC_ID_SIZE) #define DFC_FILE_SIZE (SETTINGS_SIZE + DFC_ID_SIZE)
static _KEY1 enc(&MMU.ARM7_BIOS[0x0030]); static _KEY1 enc(&MMU.ARM7_BIOS[0x0030]);
static const char *defaultNickname = "DeSmuME"; const char *defaultNickname = DESMUME_NAME;
static const char *defaultMessage = "DeSmuME makes you happy!"; const char *defaultMessage = DESMUME_NAME " makes you happy!";
u16 CFIRMWARE::_getBootCodeCRC16(const u8 *arm9Data, const u32 arm9Size, const u8 *arm7Data, const u32 arm7Size) u16 CFIRMWARE::_getBootCodeCRC16(const u8 *arm9Data, const u32 arm9Size, const u8 *arm7Data, const u32 arm7Size)
{ {

3
desmume/src/firmware.h
View File

@ -33,6 +33,9 @@
#define MAX_FW_NICKNAME_LENGTH 10 #define MAX_FW_NICKNAME_LENGTH 10
#define MAX_FW_MESSAGE_LENGTH 26 #define MAX_FW_MESSAGE_LENGTH 26
extern const char *defaultNickname;
extern const char *defaultMessage;
struct FirmwareConfig struct FirmwareConfig
{ {
u8 consoleType; u8 consoleType;

1
desmume/src/frontend/windows/memView.cpp
View File

@ -29,6 +29,7 @@
#include "resource.h" #include "resource.h"
#include "winutil.h" #include "winutil.h"
#include "version.h"
using namespace std; using namespace std;