Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
taisel/IodineGBA
2005wind/IodineGBA
544/IodineGBA
9on/IodineGBA
AllenWooooo/IodineGBA
Amazingcup/IodineGBA
AntonyChurch/IodineGBA
ArozePhantom/IodineGBA
Beagon/IodineGBA
Cealor/IodineGBA
CodeNinjaResearch/IodineGBA
Coderoversially/IodineGBA
DabanC/IodineGBA
Daniel-Griffiths/IodineGBA
Enthri/IodineGBA
EuphoricPenguin/IodineGBA
FBuenoD/IodineGBA
GDXN/IodineGBA
Ga3u/IodineGBA
GavinHwa/IodineGBA
Gigabait/IodineGBA
GodOfKnockers/IodineGBA
Gokoucjp/IodineGBA
HS1008/IodineGBA
HansHoogerwerf/IodineGBA
HungryAnt/IodineGBA
JeffZhang02747/IodineGBA
Jia731/IodineGBA
KevenYoung/IodineGBA
Lawkapala/IodineGBA
LyuGGang/IodineGBA
MadballNeek/IodineGBA
MoodyKSA/IodineGBA
MustangSVT/IodineGBA
MyComputableRomance/IodineGBA
NAscriland/IodineGBA
NerdTaco/IodineGBA
Onimishra/IodineGBA
Patrique/IodineGBA
PiMiner/IodineGBA
PlayBoyMan/IodineGBA
PokeMaster843/IodineGBA
SUSaiyan/IodineGBA
ScreensPull/IodineGBA
SinSiXX/IodineGBA
SirPyros/IodineGBA
SourceBackups/IodineGBA
SupinfoGameDev/IodineGBA
TheMuffinGroup/IodineGBA
UFBin/IodineGBA
UnblockedEvrything/IodineGBAss
Veldmuus/IodineGBA
Weej1/IodineGBA
Woodu/IodineGBA
Z73/IodineGBA
aidanharris/IodineGBA
akan/IodineGBA
anycall/IodineGBA
awesomesnorlax123/IodineGBA
ayunami2000/IodineGBA
beartung/IodineGBA
bitnetwork/IodineGBA
boxu2104/IodineGBA
buliaoyin/IodineGBA
byerancy/IodineGBA
carriercomm/IodineGBA
chrisbrasington/IodineGBA
cinco/IodineGBA
ckosmic/IodineGBA
codeKonami/IodineGBA
dasjack/IodineGBA
dbledayr/IodineGBA
durtin/IodineGBA
earthbound2/game
exaphaser/IodineGBA
faquino/IodineGBA
genghanqiang/IodineGBA
gitblazer/IodineGBA
gzzhanghao/IodineGBA
hattoriheiji/IodineGBA
hetaay3000/IodineGBA
himacro/IodineGBA
hohhen/IodineGBA
hollowsxd/IodineGBA
houcy/IodineGBA
hybomyth/IodineGBA
iBaozi/IodineGBA
itachi1706/IodineGBA
jacobzipper/IodineGBA
jaspal29/IodineGBA
jbmorley/IodineGBA
john0909/IodineGBA
johncant/IodineGBA
josejamilena/IodineGBA
jparral/IodineGBA
junior-2016/IodineGBA
karliky/IodineGBA
kevinchau321/IodineGBA
kingp02/IodineGBA
klarkc/IodineGBA
linktlh/IodineGBA
longbai/IodineGBA
lukw00/IodineGBA
mastahype/IodineGBA
matheus013/IodineGBA
matthewdlin/IodineGBA
mercuriallee/IodineGBA
mukundr99daboss/IodineGBA
neverwell/IodineGBA
nora55974/IodineGBA
nuet/IodineGBA
nullice/IodineGBA
nullmeme/IodineGBA
oVexlz/IodineGBA
oldway520/IodineGBA
pejonic/IodineGBA
pengqin/IodineGBA
pharazone/IodineGBA
plirof/IodineGBA
pohotu3/IodineGBA
ppmmaiwo/IodineGBA
qunwang6/IodineGBA
raceli/IodineGBA
roachhd/IodineGBA
rockyjvec/IodineGBA
rub8n/IodineGBA
ryanlapeyre/IodineGBA
shadowxh/gba
shaunstanislaus/IodineGBA
shingenko/IodineGBA
shitfSign/IodineGBA
shouhei/IodineGBA
softcup/IodineGBA
soyleung/IodineGBA
studywithyou/IodineGBA
takutok/IodineGBA
tanerdamaner/IodineGBA
the-cc-dev/IodineGBA
transparentmask/IodineGBA
tsantos013/IodineGBA
universeroc/IodineGBA
watsonlu/IodineGBA
windf/IodineGBA
wladi0097/SwitchGBA
wrgbh446/IodineGBA
wxtry/IodineGBA
xj-coder/IodineGBA
yangshihit/IodineGBA
yantian001/IodineGBA
yhrC/IodineGBA
yingnansong/IodineGBA
yiyuezhuo/IodineGBA
zackteng/IodineGBA
zanhsieh/IodineGBA
zhaohuaw/IodineGBA
Nothing to show
Choose a base branch
Nothing to show
Choose a Head Repository
taisel/IodineGBA
2005wind/IodineGBA
544/IodineGBA
9on/IodineGBA
AllenWooooo/IodineGBA
Amazingcup/IodineGBA
AntonyChurch/IodineGBA
ArozePhantom/IodineGBA
Beagon/IodineGBA
Cealor/IodineGBA
CodeNinjaResearch/IodineGBA
Coderoversially/IodineGBA
DabanC/IodineGBA
Daniel-Griffiths/IodineGBA
Enthri/IodineGBA
EuphoricPenguin/IodineGBA
FBuenoD/IodineGBA
GDXN/IodineGBA
Ga3u/IodineGBA
GavinHwa/IodineGBA
Gigabait/IodineGBA
GodOfKnockers/IodineGBA
Gokoucjp/IodineGBA
HS1008/IodineGBA
HansHoogerwerf/IodineGBA
HungryAnt/IodineGBA
JeffZhang02747/IodineGBA
Jia731/IodineGBA
KevenYoung/IodineGBA
Lawkapala/IodineGBA
LyuGGang/IodineGBA
MadballNeek/IodineGBA
MoodyKSA/IodineGBA
MustangSVT/IodineGBA
MyComputableRomance/IodineGBA
NAscriland/IodineGBA
NerdTaco/IodineGBA
Onimishra/IodineGBA
Patrique/IodineGBA
PiMiner/IodineGBA
PlayBoyMan/IodineGBA
PokeMaster843/IodineGBA
SUSaiyan/IodineGBA
ScreensPull/IodineGBA
SinSiXX/IodineGBA
SirPyros/IodineGBA
SourceBackups/IodineGBA
SupinfoGameDev/IodineGBA
TheMuffinGroup/IodineGBA
UFBin/IodineGBA
UnblockedEvrything/IodineGBAss
Veldmuus/IodineGBA
Weej1/IodineGBA
Woodu/IodineGBA
Z73/IodineGBA
aidanharris/IodineGBA
akan/IodineGBA
anycall/IodineGBA
awesomesnorlax123/IodineGBA
ayunami2000/IodineGBA
beartung/IodineGBA
bitnetwork/IodineGBA
boxu2104/IodineGBA
buliaoyin/IodineGBA
byerancy/IodineGBA
carriercomm/IodineGBA
chrisbrasington/IodineGBA
cinco/IodineGBA
ckosmic/IodineGBA
codeKonami/IodineGBA
dasjack/IodineGBA
dbledayr/IodineGBA
durtin/IodineGBA
earthbound2/game
exaphaser/IodineGBA
faquino/IodineGBA
genghanqiang/IodineGBA
gitblazer/IodineGBA
gzzhanghao/IodineGBA
hattoriheiji/IodineGBA
hetaay3000/IodineGBA
himacro/IodineGBA
hohhen/IodineGBA
hollowsxd/IodineGBA
houcy/IodineGBA
hybomyth/IodineGBA
iBaozi/IodineGBA
itachi1706/IodineGBA
jacobzipper/IodineGBA
jaspal29/IodineGBA
jbmorley/IodineGBA
john0909/IodineGBA
johncant/IodineGBA
josejamilena/IodineGBA
jparral/IodineGBA
junior-2016/IodineGBA
karliky/IodineGBA
kevinchau321/IodineGBA
kingp02/IodineGBA
klarkc/IodineGBA
linktlh/IodineGBA
longbai/IodineGBA
lukw00/IodineGBA
mastahype/IodineGBA
matheus013/IodineGBA
matthewdlin/IodineGBA
mercuriallee/IodineGBA
mukundr99daboss/IodineGBA
neverwell/IodineGBA
nora55974/IodineGBA
nuet/IodineGBA
nullice/IodineGBA
nullmeme/IodineGBA
oVexlz/IodineGBA
oldway520/IodineGBA
pejonic/IodineGBA
pengqin/IodineGBA
pharazone/IodineGBA
plirof/IodineGBA
pohotu3/IodineGBA
ppmmaiwo/IodineGBA
qunwang6/IodineGBA
raceli/IodineGBA
roachhd/IodineGBA
rockyjvec/IodineGBA
rub8n/IodineGBA
ryanlapeyre/IodineGBA
shadowxh/gba
shaunstanislaus/IodineGBA
shingenko/IodineGBA
shitfSign/IodineGBA
shouhei/IodineGBA
softcup/IodineGBA
soyleung/IodineGBA
studywithyou/IodineGBA
takutok/IodineGBA
tanerdamaner/IodineGBA
the-cc-dev/IodineGBA
transparentmask/IodineGBA
tsantos013/IodineGBA
universeroc/IodineGBA
watsonlu/IodineGBA
windf/IodineGBA
wladi0097/SwitchGBA
wrgbh446/IodineGBA
wxtry/IodineGBA
xj-coder/IodineGBA
yangshihit/IodineGBA
yantian001/IodineGBA
yhrC/IodineGBA
yingnansong/IodineGBA
yiyuezhuo/IodineGBA
zackteng/IodineGBA
zanhsieh/IodineGBA
zhaohuaw/IodineGBA
Nothing to show
Choose a head branch
Nothing to show
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 09, 2016
Fix DMA (#9)
Probably there is a better way.
Commits on Dec 12, 2016
Commits on Dec 13, 2016
Modified to read ROM at startup.
ROM file path is described in rom.json.
Commits on Dec 16, 2016
Showing with 72 additions and 7 deletions.
  1. +2 −2 IodineGBA/core/memory/DMA3.js
  2. +2 −2 index.html
  3. +5 −0 rom.json
  4. +5 −0 user_css/main.css
  5. +20 −0 user_scripts/CoreGlueCode.js
  6. +10 −1 user_scripts/GUIGlueCode.js
  7. +28 −2 user_scripts/ROMLoadGlueCode.js
@@ -41,9 +41,9 @@ GameBoyAdvanceDMA3.prototype.initialize = function () {
}
GameBoyAdvanceDMA3.prototype.validateDMASource = function (address) {
address = address | 0;
- if ((address | 0) >= 0x2000000) {
+ //if ((address | 0) >= 0x2000000) {
this.source = address | 0;
- }
+ //}
}
GameBoyAdvanceDMA3.prototype.writeDMASource8_0 = function (data) {
data = data | 0;
View
@@ -75,8 +75,8 @@
<li>
File
<ul>
- <li><span>BIOS: </span> <input type="file" id="bios_load" class="files"></li>
- <li><span>Game: </span> <input type="file" id="rom_load" class="files"></li>
+ <li><span>BIOS: </span> <span id="bios_status"></span> <input type="file" id="bios_load" class="files"></li>
+ <li><span>Game: </span> <span id="rom_status"></span> <input type="file" id="rom_load" class="files"></li>
</ul>
</li>
<li id="play" class="show">Play</li>
View
@@ -0,0 +1,5 @@
+{
+ "rom":{
+ "path" : "sample.gba"
+ }
+}
View
@@ -170,6 +170,11 @@ li.hide {
opacity: 1;
}
+#bios_status, #rom_status{
+ color:red;
+}
+
+
/*
|-----------------------------------------
| Touch Controls
@@ -89,6 +89,12 @@ window.onload = function () {
registerGUIEvents();
//Register GUI settings.
registerGUISettings();
+
+ //Register Web Storage
+ registerWebStorage();
+
+ //Register onload ROM
+ registerOnLoadROM();
}
function registerIodineHandler() {
try {
@@ -141,3 +147,17 @@ function registerAudioHandler() {
IodineGUI.mixerInput = new GlueCodeMixerInput(Mixer);
IodineGUI.Iodine.attachAudioHandler(IodineGUI.mixerInput);
}
+
+function registerWebStorage() {
+ var b64 = localStorage.getItem('GBA_BIOS');
+ if(b64 != null) {
+ document.getElementById("bios_status").innerHTML = "Loaded";
+ var b = base64ToArray(b64);
+ IodineGUI.Iodine.attachBIOS(b);
+ }
+}
+
+function registerOnLoadROM(){
+ loadRegisteredROM();
+ console.log("registerOnLoadROM()");
+}
@@ -23,7 +23,16 @@ function registerGUIEvents() {
IodineGUI.Iodine.pause();
});
addEvent("click", document.getElementById("restart"), function (e) {
- IodineGUI.Iodine.restart();
+ IodineGUI.Iodine.stop();
+ IodineGUI.Iodine.ROM = null;
+ loadRegisteredROM();
+
+ setTimeout( function() {
+ if(IodineGUI.Iodine.ROM != null){
+ IodineGUI.Iodine.play();
+ }
+ }, 1000 );
+
});
addEvent("click", document.getElementById("sound"), function () {
setValue("sound", !!this.checked);
@@ -9,11 +9,21 @@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
function attachBIOS(BIOS) {
+ var b;
try {
- IodineGUI.Iodine.attachBIOS(new Uint8Array(BIOS));
+ b = new Uint8Array(BIOS)
}
catch (error) {
- IodineGUI.Iodine.attachBIOS(BIOS);
+ b = BIOS;
+ }
+
+ IodineGUI.Iodine.attachBIOS(b);
+
+ // cache bios in browser local storage
+ try {
+ localStorage.setItem('GBA_BIOS', arrayToBase64(b));
+ }
+ catch(e) {
}
}
function attachROM(ROM) {
@@ -23,6 +33,8 @@ function attachROM(ROM) {
catch (error) {
IodineGUI.Iodine.attachROM(ROM);
}
+
+ document.getElementById("rom_status").innerHTML = "Loaded";
}
function fileLoadShimCode(files, ROMHandler) {
if (typeof files != "undefined") {
@@ -79,3 +91,17 @@ function processDownload(parentObj, attachHandler) {
attachHandler(dataArray);
}
}
+
+function loadRegisteredROM(){
+ var ajax = new XMLHttpRequest();
+ ajax.onload = function (e) {
+ if (this.status === 200) {
+ var rom_json = JSON.parse(this.responseText);
+ var path = rom_json["rom"]["path"];
+ downloadFile(path, function(){ processDownload(this, attachROM); });
+ }
+ };
+ ajax.overrideMimeType("application/json");
+ ajax.open("GET", "rom.json", true);
+ ajax.send(null);
+}

No commit comments for this range