Skip to content

Commit

Permalink
0.6.0 update!
Browse files Browse the repository at this point in the history
  • Loading branch information
TheRicePot authored Dec 8, 2023
1 parent 26df6e4 commit 0127f07
Show file tree
Hide file tree
Showing 15 changed files with 18 additions and 80 deletions.
28 changes: 0 additions & 28 deletions Credits.html

This file was deleted.

29 changes: 0 additions & 29 deletions ERROR.html

This file was deleted.

Binary file removed The Caretaker - Libet's Delay-C6ZvOCYSOVQ.webm
Binary file not shown.
File renamed without changes.
2 changes: 1 addition & 1 deletion css/style.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html {
background-image: url('https://2.bp.blogspot.com/-8Kfnv3xPyow/V6C_gyRhotI/AAAAAAAAIkc/RINiXl73VIkFyCi4z5L-UyZdEPSQYIfTgCLcB/s1600/gifImage.gif');
background-image: url('https://cdn.mos.cms.futurecdn.net/nSYaycVNmEetfGUAryo6hC.jpg')
background-size: cover;
}
button {
Expand Down
12 changes: 6 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<link id="favicon" rel="icon" href="https://i.scdn.co/image/ab67616d00001e02b8b42a17e0e8779dcb3773ce" type="image/x-icon">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
<title>GBA EMU 0.5.6s </title>
<title>GBA EMU 0.6.0 </title>
<link href="css/style.css" rel="stylesheet" type="text/css" />
</head>

<body>
<img src="https://i.scdn.co/image/ab67616d00001e02b8b42a17e0e8779dcb3773ce" width="50" height="50"
<imag src="https://i.scdn.co/image/ab67616d00001e02b8b42a17e0e8779dcb3773ce" width="50" height="50"
align=left>
<img src="https://i.scdn.co/image/ab67616d00001e02b8b42a17e0e8779dcb3773ce" width="50" height="50"
align=right>
<h1><b>Project Chaos Emulator</h1>
<hr>
<p>Version 0.5.5</p>
<p>Changelog:Some Website Changes and stuff </p>
<p> thanks for your support </p>
<p>Version 0.6.0</p>
<p>Changelog:Big update! </p>
<p> ricepot why are u at the nurse's office? i frew up :( </p>
<br>
<br>
<ul>
Expand Down Expand Up @@ -114,7 +114,7 @@ <h1><b>Project Chaos Emulator</h1>
<li><a href="./launcher.html#zelda_minish">The Legend of Zelda: The Minish Cap</a></li>
<li><a href="./launcher.html#simpsons">The Simpsons: California rush hour lol</a></li>
<li><a href="./launcher.html#mortal_kombat">Mortal Kombat</a></li>
</li><a href="https://gba-chaos2.github.io/ERROR">Legends of Zelda</a>
</li><a href="care.mp3">Legends of Zelda: Breath of the wild GBA edition</a>


</ul>
Expand Down
2 changes: 1 addition & 1 deletion launcher.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>GBA EMU 0.3.8.5 </title>
<title>GBA EMU 0.5.7 </title>
<link id="favicon" rel="icon" href="https://raw.githubusercontent.com/TheRiceFarmersTime/GBA_EMU_BETA/main/favicon.ico" type="image/x-icon">
<meta charset="UTF-8">
<!--Required Scripts-->
Expand Down
3 changes: 2 additions & 1 deletion user_scripts/IodineGBACoreGlueCode.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ var games = {
"wario_ware":"Wario Ware Inc",
"zelda_past":"The Legend of Zelda: A Link to the Past",
"zelda_minish":"The Legend of Zelda: The Minish Cap"

};
var Iodine = null;
var Blitter = null;
Expand All @@ -118,7 +119,7 @@ var MixerInput = null;
var timerID = null;
window.onload = function () {
if (!games[location.hash.substr(1)]) {
alert("Invalid game request!");
alert("game no work");
return;
}
//Initialize Iodine:
Expand Down
8 changes: 1 addition & 7 deletions user_scripts/IodineGBAGraphicsGlueCode.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
"use strict";
/*
Copyright (C) 2012-2014 Grant Galitz
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
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.
i have no fuckin idea wth is this.
*/
function GlueCodeGfx() {
this.didRAF = false; //Set when rAF has been used.
Expand Down
2 changes: 1 addition & 1 deletion user_scripts/IodineGBAJoyPadGlueCode.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
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.
*/
var keyZones = [
//Use this to control the key mapping:
//Use this to change the keys [fork of the repo needed]
//A:
[88, 74],
//B:
Expand Down
2 changes: 1 addition & 1 deletion user_scripts/IodineGBAROMLoadGlueCode.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function fileLoadShimCode(files, ROMHandler) {
ROMHandler(resultConverted);
}
catch (error) {
alert("Could not load the processed ROM file!");
alert("Could not load ROM file!");
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions user_scripts/IodineGBASavesGlueCode.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ function ImportSaveCallback(name) {
try {
var save = findValue("SAVE_" + name);
if (save != null) {
writeRedTemporaryText("Loaded save.");
writeRedTemporaryText("Save Loaded, enjoy!");
return base64ToArray(save);
}
}
catch (error) {
alert("Could not read save: " + error.message);
alert("Uh oh! Looks like there was an error with your save! " + error.message);
}
return null;
}
Expand All @@ -30,7 +30,7 @@ function ExportSaveCallback(name, save) {
setValue("SAVE_" + name, arrayToBase64(save));
}
catch (error) {
alert("Could not store save: " + error.message);
alert("could not store your save. " + error.message);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion user_scripts/XAudioJS/XAudioServer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//2010-2013 Grant Galitz - XAudioJS realtime audio output compatibility library:
//2010-2077 Grant Galitz - XAudioJS realtime audio output compatibility library:
var XAudioJSscriptsHandle = document.getElementsByTagName("script");
var XAudioJSsourceHandle = XAudioJSscriptsHandle[XAudioJSscriptsHandle.length-1].src;
function XAudioServer(channels, sampleRate, minBufferSize, maxBufferSize, underRunCallback, volume, failureCallback) {
Expand Down
2 changes: 1 addition & 1 deletion user_scripts/base64.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function base64(data) {
var index = 0;
var remainder = dataLength % 3;
while (data.length % 3 > 0) {
//Make sure we don't do fuzzy math in the next loop...
//Make sure we don't do fuzzy math in the next loop cuz we dumb idiots
data[data.length] = " ";
}
while (index < dataLength) {
Expand Down
File renamed without changes

0 comments on commit 0127f07

Please sign in to comment.