Skip to content

Commit 0d2d428

Browse files
JustBurnJustBurn
JustBurn
authored and
JustBurn
committed
source clean up, out of range error
1 parent 723a89c commit 0d2d428

File tree

3 files changed

+188
-89
lines changed

3 files changed

+188
-89
lines changed

banks.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<h1>NDS Homebrew VRAM Banks Selector</h1>
1313
<h4>For the VRAM BG Allocation Conflict Viewer tool <a href="vram.html">click here</a></h4>
1414
<h4>Please contact mtheall in #dsdev on irc.blitzed.org regarding errors, discrepancies, suggestions, or bugs with this tool</h4>
15-
<h4>Link for sharing: <span id='ShareLink'>Javascript must be enabled</span></h4>
15+
<h4>Link for sharing: <span id='ShareLink'>Loading...</span></h4>
1616
<hr />
1717
<h2 id='Notify'>None</h2>
1818
<table class='main'>
@@ -433,14 +433,14 @@ <h2 id='Notify'>None</h2>
433433
<thead>
434434
<tr><td class='left'>Function call</td></tr>
435435
</thead>
436-
<tr><td class='left' id='FunctionCall'>Javascript must be enabled</td></tr>
436+
<tr><td class='left' id='FunctionCall'>Loading...</td></tr>
437437
</table>
438438
<p>&nbsp;</p>
439439
<table>
440440
<thead>
441441
<tr><td class='left'>CPU Access</td></tr>
442442
</thead>
443-
<tr><td class='left' id='CPUAccess'>Javascript must be enabled</td></tr>
443+
<tr><td class='left' id='CPUAccess'>Loading...</td></tr>
444444
</table>
445445
</td>
446446
</tr></table>

banks.js

+54-27
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
function getParameterByName(name) {
1+
function getParameterByName(name)
2+
{
23
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
34
var regex = new RegExp("[\\#&]" + name + "=([^&#]*)");
45
var results = regex.exec(window.location.hash);
@@ -8,7 +9,8 @@ function getParameterByName(name) {
89
return decodeURIComponent(results[1].replace(/\+/g, " "));
910
}
1011

11-
function hasParameterByName(name) {
12+
function hasParameterByName(name)
13+
{
1214
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
1315
var regex = new RegExp("[\\#&]" + name + "=([^&#]*)");
1416
var results = regex.exec(window.location.hash);
@@ -18,30 +20,39 @@ function hasParameterByName(name) {
1820
return true;
1921
}
2022

21-
function OListSize(obj) {
23+
function OListSize(obj)
24+
{
2225
var size = 0;
23-
for (key in obj) {
26+
for (key in obj)
27+
{
2428
if (obj.hasOwnProperty(key)) size++;
2529
}
2630
return size;
2731
}
2832

29-
function OListGet(obj, idx) {
33+
function OListGet(obj, idx)
34+
{
3035
var off = 0;
31-
for (key in obj) {
32-
if (obj.hasOwnProperty(key)) {
36+
for (key in obj)
37+
{
38+
if (obj.hasOwnProperty(key))
39+
{
3340
if (idx == off) return obj[key];
3441
off++;
3542
}
3643
}
3744
return null;
3845
}
3946

40-
function OListSet(obj, idx, val) {
47+
function OListSet(obj, idx, val)
48+
{
4149
var off = 0;
42-
for (key in obj) {
43-
if (obj.hasOwnProperty(key)) {
44-
if (idx == off) {
50+
for (key in obj)
51+
{
52+
if (obj.hasOwnProperty(key))
53+
{
54+
if (idx == off)
55+
{
4556
obj[key] = val;
4657
return;
4758
}
@@ -218,7 +229,8 @@ var CPUAccessMap = {
218229
var Sel = {'A':'', 'B':'', 'C':'', 'D':'', 'E':'', 'F':'', 'G':'', 'H':'', 'I':''};
219230
var Err = {'A':'', 'B':'', 'C':'', 'D':'', 'E':'', 'F':'', 'G':'', 'H':'', 'I':''};
220231

221-
function loadp() {
232+
function loadp()
233+
{
222234
var i, allElem = document.forms["banks"].elements;
223235

224236
// Load parameters
@@ -233,7 +245,8 @@ function loadp() {
233245
if (hasParameterByName('I')) Sel['I'] = getParameterByName('I');
234246

235247
// Mark selected items
236-
for (var i=0; i < allElem.length; i++) {
248+
for (var i=0; i < allElem.length; i++)
249+
{
237250
Elem = allElem[i];
238251
if (Sel[Elem.name] == Elem.value)
239252
Elem.checked = true;
@@ -243,16 +256,19 @@ function loadp() {
243256
upd();
244257
}
245258

246-
function upd() {
259+
function upd()
260+
{
247261
var allElem = document.forms["banks"].elements;
248262
var i, a, b, ShareLink;
249263
var numerr = 0;
250264

251265
// Find selected items
252-
for (var i = 0; i < allElem.length; i++) {
266+
for (var i = 0; i < allElem.length; i++)
267+
{
253268
Elem = allElem[i];
254269
ElemName = Elem.name + "_" + Elem.value;
255-
if (Elem.checked) {
270+
if (Elem.checked)
271+
{
256272
Sel[Elem.name] = Elem.value;
257273
}
258274
}
@@ -261,17 +277,23 @@ function upd() {
261277
for (var a = 0; a < 9; a++)
262278
OListSet(Err, a, 0);
263279

264-
for (var a = 0; a < 9; a++) {
265-
for (var b = a+1; b < 9; b++) {
280+
for (var a = 0; a < 9; a++)
281+
{
282+
for (var b = a+1; b < 9; b++)
283+
{
266284
cma = BankingMap['m'+OListGet(Sel, a)];
267285
cmb = BankingMap['m'+OListGet(Sel, b)];
268-
for (c = 0; c < OListSize(cma); c++) {
269-
if (cmb.indexOf(cma.charAt(c)) != -1) {
270-
if (OListGet(Err, a) == 0) {
286+
for (c = 0; c < OListSize(cma); c++)
287+
{
288+
if (cmb.indexOf(cma.charAt(c)) != -1)
289+
{
290+
if (OListGet(Err, a) == 0)
291+
{
271292
numerr++;
272293
OListSet(Err, a, 1);
273294
}
274-
if (OListGet(Err, b) == 0) {
295+
if (OListGet(Err, b) == 0)
296+
{
275297
numerr++;
276298
OListSet(Err, b, 1);
277299
}
@@ -281,10 +303,12 @@ function upd() {
281303
}
282304

283305
// Mark valid/conflicts on the table
284-
for (var i=0; i < allElem.length; i++) {
306+
for (var i=0; i < allElem.length; i++)
307+
{
285308
Elem = allElem[i];
286309
ElemName = Elem.name + "_" + Elem.value;
287-
if (Elem.checked) {
310+
if (Elem.checked)
311+
{
288312
if (Err[Elem.name] == 0)
289313
document.getElementById(ElemName).className = 'g';
290314
else
@@ -296,7 +320,8 @@ function upd() {
296320

297321
// Write result
298322
Notify = document.getElementById('Notify');
299-
if (numerr == 0) {
323+
if (numerr == 0)
324+
{
300325
Notify.style.color = "#008000";
301326
Notify.innerHTML = "No conflict found ";
302327
}
@@ -316,7 +341,8 @@ function upd() {
316341

317342
// Generate the function call
318343
FCall = document.getElementById('FunctionCall');
319-
if (numerr == 0) {
344+
if (numerr == 0)
345+
{
320346
FCall.innerHTML = "<span class='func'>vramSetBankA</span>(<span class='deff'>VRAM_A_" + BankingMap['f'+Sel['A']] + "</span>);<br />";
321347
FCall.innerHTML += "<span class='func'>vramSetBankB</span>(<span class='deff'>VRAM_B_" + BankingMap['f'+Sel['B']] + "</span>);<br />";
322348
FCall.innerHTML += "<span class='func'>vramSetBankC</span>(<span class='deff'>VRAM_C_" + BankingMap['f'+Sel['C']] + "</span>);<br />";
@@ -332,7 +358,8 @@ function upd() {
332358

333359
// Generate the cpu access
334360
CPUAcc = document.getElementById('CPUAccess');
335-
if (numerr == 0) {
361+
if (numerr == 0)
362+
{
336363
CPUAcc.innerHTML = "<b>A:</b> " + CPUAccessMap['A_'+Sel['A']] + "<br />";
337364
CPUAcc.innerHTML += "<b>B:</b> " + CPUAccessMap['B_'+Sel['B']] + "<br />";
338365
CPUAcc.innerHTML += "<b>C:</b> " + CPUAccessMap['C_'+Sel['C']] + "<br />";

0 commit comments

Comments
 (0)