diff --git a/index.html b/index.html index 78a00ee..b8f12a7 100644 --- a/index.html +++ b/index.html @@ -118,8 +118,8 @@

2. Tweak Settings

- Cartridge Type: - @@ -141,10 +141,22 @@
- +
+ Ticker Text: + +
+ + + + + + + +
+
- + ROM Hacks:
diff --git a/script/app.js b/script/app.js index 9fd12b3..d84966d 100644 --- a/script/app.js +++ b/script/app.js @@ -27,7 +27,7 @@ Vue.component('bitmap-preview', { }); Vue.component('ticker-settings', { - props: ['processor', 'fontsLoaded', 'fontIndex'], + props: ['processor', 'fontsLoaded', 'fontIndex', 'show'], data: function() { return ({ text: "Created with GBNP on " + (new Date).toISOString().slice(0, 10) + "!" @@ -45,18 +45,14 @@ Vue.component('ticker-settings', { text: function() { this.updateBitmap() } }, template: ` -
- Ticker Text: +
+
+ +
-
-
- -
- -
- - -
+
+ +
` @@ -76,6 +72,7 @@ let app = new Vue({ forceDMG: false, englishPatch: false, cartType: 0, + tickerType: 1, fontsLoaded: false, }, created: function() { @@ -85,6 +82,7 @@ let app = new Vue({ this.processor.tickerText = this.tickerText; this.processor.forceDMG = this.forceDMG; this.processor.englishPatch = this.englishPatch; + this.processor.tickerType = this.tickerType; if (window.location.search.substr(1).toLowerCase() == 'ig') { this.cartType = 1; @@ -129,6 +127,10 @@ let app = new Vue({ this.processor.englishPatch = this.englishPatch; this.writeSettingsToStorage(); }, + tickerType: function() { + this.processor.tickerType = this.tickerType; + this.writeSettingsToStorage(); + }, fontIndex: function() { for (let i = 0; i < this.roms.length; i++) { this.roms[i].updateBitmap(this.fontIndex); } this.writeSettingsToStorage(); @@ -214,17 +216,20 @@ let app = new Vue({ window.localStorage.setItem('forceDMG', this.forceDMG); window.localStorage.setItem('englishPatch', this.englishPatch); window.localStorage.setItem('cartType', this.cartType); + window.localStorage.setItem('tickerType', this.tickerType); }, loadSettingsFromStorage: function() { const fontIndex = window.localStorage.getItem('fontIndex'); const forceDMG = window.localStorage.getItem('forceDMG'); const englishPatch = window.localStorage.getItem('englishPatch'); const cartType = window.localStorage.getItem('cartType'); + const tickerType = window.localStorage.getItem('tickerType'); if (fontIndex) { this.fontIndex = parseInt(fontIndex); } if (forceDMG) { this.forceDMG = parseBool(forceDMG); } if (englishPatch) { this.englishPatch = parseBool(englishPatch); } if (cartType) { this.cartType = parseInt(cartType); } + if (tickerType) { this.tickerType = parseInt(tickerType); } }, triggerAddMenuLabel: function(e) { this.$refs.addMenuLabel.click(); }, triggerAddRomLabel: function(e) { this.$refs.addRomLabel.click(); }, diff --git a/script/gbnp.js b/script/gbnp.js index bd6e0e1..5c629df 100644 --- a/script/gbnp.js +++ b/script/gbnp.js @@ -215,6 +215,7 @@ class Processor { this.tickerBitmap = []; this.cartType = 0; this.englishPatch = false; + this.tickerType = 1; } romTotalKB() { @@ -343,10 +344,12 @@ class Processor { } // ticker text - romFile.seek(0x18040); - romFile.writeByteUntil(0x00, 0x19140); // overwrite existing data - romFile.seek(0x18040); - romFile.writeBytes(Array.from(this.tickerBitmap)); + if (this.tickerType == 1) { + romFile.seek(0x18040); + romFile.writeByteUntil(0x00, 0x19140); // overwrite existing data + romFile.seek(0x18040); + romFile.writeBytes(Array.from(this.tickerBitmap)); + } let romBase = 0x01; let romFileIndex = 0x1C200; diff --git a/style/style.css b/style/style.css index be8743f..85b52e1 100644 --- a/style/style.css +++ b/style/style.css @@ -223,3 +223,11 @@ noscript { .single-rom-download { margin-top: 1.5rem; } + +.hide { + display: none; +} + +.ticker-settings { + margin-top: 0.4rem; +}