aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2018-09-15 02:32:13 +0200
committerStapleButter <thetotalworm@gmail.com>2018-09-15 02:32:13 +0200
commitfea79556757d01450826cbbaca888885e5d409cd (patch)
treeced3144eeee28eedf497cd211769a226f74e8b84 /src
parent1d19145983069c622b72acfc5528eff3cef4f5f0 (diff)
fixor copyright years.
Diffstat (limited to 'src')
-rw-r--r--src/ARM.cpp2
-rw-r--r--src/ARM.h2
-rw-r--r--src/ARMInterpreter.cpp2
-rw-r--r--src/ARMInterpreter.h2
-rw-r--r--src/ARMInterpreter_ALU.cpp2
-rw-r--r--src/ARMInterpreter_ALU.h2
-rw-r--r--src/ARMInterpreter_Branch.cpp2
-rw-r--r--src/ARMInterpreter_Branch.h2
-rw-r--r--src/ARMInterpreter_LoadStore.cpp2
-rw-r--r--src/ARMInterpreter_LoadStore.h2
-rw-r--r--src/ARM_InstrTable.h2
-rw-r--r--src/CP15.cpp2
-rw-r--r--src/CP15.h2
-rw-r--r--src/Config.cpp2
-rw-r--r--src/Config.h2
-rw-r--r--src/DMA.cpp2
-rw-r--r--src/DMA.h2
-rw-r--r--src/FIFO.h2
-rw-r--r--src/GPU.cpp2
-rw-r--r--src/GPU.h2
-rw-r--r--src/GPU2D.cpp6
-rw-r--r--src/GPU2D.h2
-rw-r--r--src/GPU3D.cpp2
-rw-r--r--src/GPU3D.h2
-rw-r--r--src/GPU3D_Soft.cpp2
-rw-r--r--src/NDS.cpp2
-rw-r--r--src/NDS.h2
-rw-r--r--src/NDSCart.cpp2
-rw-r--r--src/NDSCart.h2
-rw-r--r--src/Platform.h2
-rw-r--r--src/RTC.cpp2
-rw-r--r--src/RTC.h2
-rw-r--r--src/SPI.cpp2
-rw-r--r--src/SPI.h2
-rw-r--r--src/SPU.cpp2
-rw-r--r--src/SPU.h2
-rw-r--r--src/Savestate.cpp2
-rw-r--r--src/Savestate.h2
-rw-r--r--src/Wifi.cpp2
-rw-r--r--src/Wifi.h2
-rw-r--r--src/WifiAP.cpp2
-rw-r--r--src/WifiAP.h2
-rw-r--r--src/libui_sdl/DlgEmuSettings.cpp2
-rw-r--r--src/libui_sdl/DlgEmuSettings.h2
-rw-r--r--src/libui_sdl/DlgInputConfig.cpp4
-rw-r--r--src/libui_sdl/DlgInputConfig.h2
-rw-r--r--src/libui_sdl/Platform.cpp2
-rw-r--r--src/libui_sdl/main.cpp44
-rw-r--r--src/melon_fopen.h2
-rw-r--r--src/types.h2
-rw-r--r--src/version.h2
51 files changed, 96 insertions, 54 deletions
diff --git a/src/ARM.cpp b/src/ARM.cpp
index bbfb7f7..dee40f2 100644
--- a/src/ARM.cpp
+++ b/src/ARM.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARM.h b/src/ARM.h
index 564c7bb..be58362 100644
--- a/src/ARM.h
+++ b/src/ARM.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter.cpp b/src/ARMInterpreter.cpp
index 16eb111..32b5658 100644
--- a/src/ARMInterpreter.cpp
+++ b/src/ARMInterpreter.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter.h b/src/ARMInterpreter.h
index 2d4c1a8..2982011 100644
--- a/src/ARMInterpreter.h
+++ b/src/ARMInterpreter.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_ALU.cpp b/src/ARMInterpreter_ALU.cpp
index 4f76b8b..58bf94d 100644
--- a/src/ARMInterpreter_ALU.cpp
+++ b/src/ARMInterpreter_ALU.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_ALU.h b/src/ARMInterpreter_ALU.h
index 4cc3760..813135d 100644
--- a/src/ARMInterpreter_ALU.h
+++ b/src/ARMInterpreter_ALU.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_Branch.cpp b/src/ARMInterpreter_Branch.cpp
index 88f316d..740375d 100644
--- a/src/ARMInterpreter_Branch.cpp
+++ b/src/ARMInterpreter_Branch.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_Branch.h b/src/ARMInterpreter_Branch.h
index 202f490..aa5b995 100644
--- a/src/ARMInterpreter_Branch.h
+++ b/src/ARMInterpreter_Branch.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_LoadStore.cpp b/src/ARMInterpreter_LoadStore.cpp
index 7edf88c..adb44a9 100644
--- a/src/ARMInterpreter_LoadStore.cpp
+++ b/src/ARMInterpreter_LoadStore.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARMInterpreter_LoadStore.h b/src/ARMInterpreter_LoadStore.h
index 4ea0e54..58da587 100644
--- a/src/ARMInterpreter_LoadStore.h
+++ b/src/ARMInterpreter_LoadStore.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/ARM_InstrTable.h b/src/ARM_InstrTable.h
index 47b3e1c..afcc3b2 100644
--- a/src/ARM_InstrTable.h
+++ b/src/ARM_InstrTable.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/CP15.cpp b/src/CP15.cpp
index cc6a6af..8bf68fb 100644
--- a/src/CP15.cpp
+++ b/src/CP15.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/CP15.h b/src/CP15.h
index eedea10..b448bf2 100644
--- a/src/CP15.h
+++ b/src/CP15.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Config.cpp b/src/Config.cpp
index d9e2b50..57c5abc 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Config.h b/src/Config.h
index 0f5ca9e..08e4e86 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/DMA.cpp b/src/DMA.cpp
index 39dcb85..8c25e26 100644
--- a/src/DMA.cpp
+++ b/src/DMA.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/DMA.h b/src/DMA.h
index 11ee1ad..e34126a 100644
--- a/src/DMA.h
+++ b/src/DMA.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/FIFO.h b/src/FIFO.h
index 4130b85..215abd8 100644
--- a/src/FIFO.h
+++ b/src/FIFO.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU.cpp b/src/GPU.cpp
index 8ac3e74..2f1fbb4 100644
--- a/src/GPU.cpp
+++ b/src/GPU.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU.h b/src/GPU.h
index d45f383..8611444 100644
--- a/src/GPU.h
+++ b/src/GPU.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp
index 7550562..3edfc44 100644
--- a/src/GPU2D.cpp
+++ b/src/GPU2D.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
@@ -614,12 +614,12 @@ void GPU2D::DrawScanline(u32 line)
for (int i = 0; i < 256; i++)
{
u32 c = dst[i];
-
+
u32 r = c << 18;
u32 g = (c << 2) & 0xFC00;
u32 b = (c >> 14) & 0xFC;
c = r | g | b;
-
+
dst[i] = c | ((c & 0x00C0C0C0) >> 6) | 0xFF000000;
}
}
diff --git a/src/GPU2D.h b/src/GPU2D.h
index d059fa0..8eafc21 100644
--- a/src/GPU2D.h
+++ b/src/GPU2D.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index b890f7f..13c721c 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU3D.h b/src/GPU3D.h
index 3ee1a7f..0a299ef 100644
--- a/src/GPU3D.h
+++ b/src/GPU3D.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp
index 8f7d041..4560fd0 100644
--- a/src/GPU3D_Soft.cpp
+++ b/src/GPU3D_Soft.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/NDS.cpp b/src/NDS.cpp
index fa7cb84..bf5e0ef 100644
--- a/src/NDS.cpp
+++ b/src/NDS.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/NDS.h b/src/NDS.h
index 71f6d41..68f37e9 100644
--- a/src/NDS.h
+++ b/src/NDS.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp
index 411d773..0dfadd6 100644
--- a/src/NDSCart.cpp
+++ b/src/NDSCart.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/NDSCart.h b/src/NDSCart.h
index 7267ad3..dce6eed 100644
--- a/src/NDSCart.h
+++ b/src/NDSCart.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Platform.h b/src/Platform.h
index 7fb6793..091e607 100644
--- a/src/Platform.h
+++ b/src/Platform.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/RTC.cpp b/src/RTC.cpp
index 3d45bef..fd60eaf 100644
--- a/src/RTC.cpp
+++ b/src/RTC.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/RTC.h b/src/RTC.h
index 6ada5c1..516eb5d 100644
--- a/src/RTC.h
+++ b/src/RTC.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/SPI.cpp b/src/SPI.cpp
index 12e9291..98f5903 100644
--- a/src/SPI.cpp
+++ b/src/SPI.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/SPI.h b/src/SPI.h
index d122da8..05a610d 100644
--- a/src/SPI.h
+++ b/src/SPI.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/SPU.cpp b/src/SPU.cpp
index 7f70e65..5a0eaa5 100644
--- a/src/SPU.cpp
+++ b/src/SPU.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/SPU.h b/src/SPU.h
index 85c27ee..94011bd 100644
--- a/src/SPU.h
+++ b/src/SPU.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Savestate.cpp b/src/Savestate.cpp
index 77773e6..0d7b266 100644
--- a/src/Savestate.cpp
+++ b/src/Savestate.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Savestate.h b/src/Savestate.h
index 3c06764..fa01f6b 100644
--- a/src/Savestate.h
+++ b/src/Savestate.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Wifi.cpp b/src/Wifi.cpp
index ed92ad8..71e8ba3 100644
--- a/src/Wifi.cpp
+++ b/src/Wifi.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/Wifi.h b/src/Wifi.h
index 72334e0..81cc3bb 100644
--- a/src/Wifi.h
+++ b/src/Wifi.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/WifiAP.cpp b/src/WifiAP.cpp
index 963b4d2..3e8bdb0 100644
--- a/src/WifiAP.cpp
+++ b/src/WifiAP.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/WifiAP.h b/src/WifiAP.h
index fccfa1a..6f963c4 100644
--- a/src/WifiAP.h
+++ b/src/WifiAP.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/libui_sdl/DlgEmuSettings.cpp b/src/libui_sdl/DlgEmuSettings.cpp
index 8cb2ccc..77bb18e 100644
--- a/src/libui_sdl/DlgEmuSettings.cpp
+++ b/src/libui_sdl/DlgEmuSettings.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/libui_sdl/DlgEmuSettings.h b/src/libui_sdl/DlgEmuSettings.h
index f26ae14..f8da148 100644
--- a/src/libui_sdl/DlgEmuSettings.h
+++ b/src/libui_sdl/DlgEmuSettings.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/libui_sdl/DlgInputConfig.cpp b/src/libui_sdl/DlgInputConfig.cpp
index 5a98a91..6496307 100644
--- a/src/libui_sdl/DlgInputConfig.cpp
+++ b/src/libui_sdl/DlgInputConfig.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
@@ -309,7 +309,7 @@ void Open()
uiBoxAppend(in_ctrl, uiControl(g_key), 1);
uiGrid* b_key = uiNewGrid();
uiGroupSetChild(g_key, uiControl(b_key));
-
+
const int width = 120;
for (int i = 0; i < 12; i++)
diff --git a/src/libui_sdl/DlgInputConfig.h b/src/libui_sdl/DlgInputConfig.h
index 33529c2..c044016 100644
--- a/src/libui_sdl/DlgInputConfig.h
+++ b/src/libui_sdl/DlgInputConfig.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/libui_sdl/Platform.cpp b/src/libui_sdl/Platform.cpp
index 80aa0e9..0c29f6b 100644
--- a/src/libui_sdl/Platform.cpp
+++ b/src/libui_sdl/Platform.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp
index 6736fbc..873d95a 100644
--- a/src/libui_sdl/main.cpp
+++ b/src/libui_sdl/main.cpp
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
@@ -37,6 +37,8 @@
#include "../Platform.h"
#include "../Config.h"
+#include "../Savestate.h"
+
const int kScreenRot[4] = {0, 1, 2, 3};
const int kScreenGap[6] = {0, 1, 8, 64, 90, 128};
@@ -1046,6 +1048,46 @@ int main(int argc, char** argv)
return 1;
}
+ // TESTORZ
+
+ u32 zab = 12;
+ u16 zib = 18;
+ u8 zob = 9;
+ u32 zub = 42;
+
+ Savestate* dorp = new Savestate("dorp.zog", true);
+ dorp->Section("BAKA");
+ dorp->Var32(&zab);
+ dorp->Var8(&zob);
+ dorp->Section("SHIT");
+ dorp->Var16(&zib);
+ dorp->Var32(&zub);
+ delete dorp;
+
+ zab = 0; zib = 0; zob = 0; zub = 0;
+ dorp = new Savestate("dorp.zog", false);
+ dorp->Section("BAKA");
+ dorp->Var32(&zab);
+ dorp->Var8(&zob);
+ dorp->Section("SHIT");
+ dorp->Var16(&zib);
+ dorp->Var32(&zub);
+ delete dorp;
+ printf("-> %d %d %d %d\n", zab, zib, zob, zub);
+
+ zab = 0; zib = 0; zob = 0; zub = 0;
+ dorp = new Savestate("dorp.zog", false);
+ dorp->Section("SHIT");
+ dorp->Var16(&zib);
+ dorp->Var32(&zub);
+ dorp->Section("BAKA");
+ dorp->Var32(&zab);
+ dorp->Var8(&zob);
+ delete dorp;
+ printf("-> %d %d %d %d\n", zab, zib, zob, zub);
+
+ // TESTORZ END
+
Config::Load();
if (!Config::HasConfigFile("bios7.bin") || !Config::HasConfigFile("bios9.bin") || !Config::HasConfigFile("firmware.bin"))
diff --git a/src/melon_fopen.h b/src/melon_fopen.h
index 8e79e8b..a45ad97 100644
--- a/src/melon_fopen.h
+++ b/src/melon_fopen.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/types.h b/src/types.h
index 8a6c7e3..1c4f140 100644
--- a/src/types.h
+++ b/src/types.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.
diff --git a/src/version.h b/src/version.h
index 9e2d867..64bcdd3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,5 +1,5 @@
/*
- Copyright 2016-2017 StapleButter
+ Copyright 2016-2019 StapleButter
This file is part of melonDS.