Skip to content

Commit

Permalink
Centered Game Over, timeout on level select screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@kandowontu
kandowontu committed Jan 15, 2025
1 parent 552a4ce commit ea7b0c5
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 45 deletions.
11 changes: 6 additions & 5 deletions SAUCE/defines/menunametable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,23 @@ const unsigned char game_main_menu[284]={ // level select
0x02,0x01,0x00,0x03,0x05,0x04,0x01,0x00,0x00,0x04,0x05,0x03,0x03,0x01,0x00,0x03,
0x08,0x41,0x00,0x03,0x05,0x14,0x00,0x03,0x06,0x00,0x03,0x00
};
const unsigned char gameover[187]={
const unsigned char gameover[188]={
0x03,0x02,0xfe,0x02,0x03,0x02,0xfe,0x02,0x03,0x10,0xfe,0xfe,0x02,0xfe,0x03,0x02,
0x02,0x02,0xfe,0x02,0xfe,0xfe,0x02,0xfe,0x02,0x03,0x08,0xfe,0xfe,0x02,0x03,0x05,
0xfe,0x03,0x02,0x02,0xfe,0x03,0x02,0x02,0x02,0xfe,0x03,0x02,0x02,0x03,0x09,0xfe,
0x02,0xfe,0x03,0x13,0x02,0x02,0xfe,0x02,0x03,0x06,0xfe,0x03,0xde,0xc1,0xbb,0xc7,
0x02,0xfe,0x03,0x13,0x02,0x02,0xfe,0x02,0x03,0x06,0xfe,0x03,0xdf,0xc1,0xbb,0xc7,
0xbf,0xfe,0x03,0x3f,0xc9,0xdb,0xbf,0xcc,0xfe,0x03,0x99,0x98,0x99,0x98,0x99,0xfe,
0x03,0x1b,0xa8,0xa9,0xa8,0xa9,0xfe,0x03,0x5c,0x9a,0x9b,0xfe,0x03,0x1d,0xaa,0xab,
0xfe,0x03,0xb4,0x02,0xfe,0xfe,0x02,0x03,0x05,0xfe,0xfe,0x02,0x03,0x05,0xfe,0x03,
0xfe,0x03,0xb3,0x02,0xfe,0xfe,0x02,0x03,0x05,0xfe,0xfe,0x02,0x03,0x05,0xfe,0x03,
0x04,0x02,0x03,0x02,0xfe,0x03,0x02,0x02,0xfe,0x03,0x02,0x02,0xfe,0x02,0xfe,0x03,
0x04,0x02,0x03,0x09,0xfe,0x02,0xfe,0xfe,0x02,0x03,0x02,0xfe,0xfe,0x00,0x00,0x50,
0x10,0x40,0x50,0x00,0x03,0x0a,0x84,0x21,0x00,0x03,0x02,0x01,0x00,0x03,0x05,0x04,
0x01,0x00,0x00,0x04,0x05,0x00,0x04,0x05,0x01,0x00,0x03,0x03,0x44,0x00,0x03,0x03,
0x41,0x00,0x03,0x05,0x14,0x00,0x03,0x06,0x00,0x03,0x00
0x01,0x00,0x00,0x04,0x05,0x00,0x04,0x05,0x01,0x00,0x03,0x03,0x44,0x11,0x00,0x03,
0x02,0x41,0x00,0x03,0x05,0x14,0x00,0x03,0x06,0x00,0x03,0x00
};



const unsigned char game_start_screen[293]={
0x01,0xff,0x01,0x87,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x22,0x23,
0x22,0x2b,0x2c,0x2c,0xff,0x01,0x0f,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,
Expand Down
25 changes: 18 additions & 7 deletions SAUCE/gamestates/state_menu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void levelselection() {
// pal_bg(paletteMenu);
set_scroll_x(0);
set_scroll_y(0);

menutimer = 0;
if (!coins_inserted) {
pal_bg(gameoverpalette);
vram_adr(NAMETABLE_A);
Expand Down Expand Up @@ -265,24 +265,35 @@ void levelselection() {

//if (pad[0] & PAD_UP && pad_new[0] & PAD_SELECT) { twoplayer ^= 0x01; sfx_play(sfx_coin, 0); }

menutimer++;
if (menutimer == 2000) {
exitingLevelSelect = 1;
kandowatchesyousleep = 0;
return;
}

if (joypad1.press & (PAD_START | PAD_A)){
start_the_level();
menutimer = 0;
return;
}

if (joypad1.press_b){
exitingLevelSelect = 1;
kandowatchesyousleep = 0;
menutimer = 0;
return;
}

if (joypad1.press_right){
drawBarFlag = 2;
levelinc();
menutimer = 0;
}
if (joypad1.press_left){
drawBarFlag = 2;
leveldec();
menutimer = 0;
}

// NOTE: this is hardcoded. It used to be 0x3F with the old scroll scheme
Expand Down Expand Up @@ -884,31 +895,31 @@ void state_menu() {
multi_vram_buffer_horz(vstext, sizeof(vstext)-1, NTADR_A(25,5));
if (!coins_inserted) multi_vram_buffer_horz(nocoinstext, sizeof(nocoinstext)-1, NTADR_A(11,9));
else {
multi_vram_buffer_horz(coinstext, sizeof(coinstext)-1, NTADR_A(7,9));
multi_vram_buffer_horz(coinstext, sizeof(coinstext)-1, NTADR_A(8,9));
hexToDec(coins_inserted);

tmp1 = 0;

if (hexToDecOutputBuffer[4]) {
one_vram_buffer(0xD0+hexToDecOutputBuffer[4], NTADR_A(23,9));
one_vram_buffer(0xD0+hexToDecOutputBuffer[4], NTADR_A(24,9));
tmp1++;
}

if (hexToDecOutputBuffer[4] | hexToDecOutputBuffer[3]) {
one_vram_buffer(0xD0+hexToDecOutputBuffer[3], NTADR_A(23+tmp1,9));
one_vram_buffer(0xD0+hexToDecOutputBuffer[3], NTADR_A(24+tmp1,9));
tmp1++;
}

if (hexToDecOutputBuffer[4] | hexToDecOutputBuffer[3] | hexToDecOutputBuffer[2]) {
one_vram_buffer(0xD0+hexToDecOutputBuffer[2], NTADR_A(23+tmp1,9));
one_vram_buffer(0xD0+hexToDecOutputBuffer[2], NTADR_A(24+tmp1,9));
tmp1++;
}

if (hexToDecOutputBuffer[4] | hexToDecOutputBuffer[3] | hexToDecOutputBuffer[2] | hexToDecOutputBuffer[1]) {
one_vram_buffer(0xD0+hexToDecOutputBuffer[1], NTADR_A(23+tmp1,9));
one_vram_buffer(0xD0+hexToDecOutputBuffer[1], NTADR_A(24+tmp1,9));
tmp1++;
}
one_vram_buffer(0xD0+hexToDecOutputBuffer[0], NTADR_A(23+tmp1,9));
one_vram_buffer(0xD0+hexToDecOutputBuffer[0], NTADR_A(24+tmp1,9));
}

pal_col(0x11,titlecolor3);
Expand Down
56 changes: 28 additions & 28 deletions menus/gameover.nss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NSTssTXT

BtnTiles=0
BtnTiles=1
BtnChecker=0
BtnSelTiles=0
BtnChrBank1=1
Expand Down Expand Up @@ -45,7 +45,7 @@ ChkSwapBanks_Labels=1
VarTileViewTagBuf=0
VarBgPalCur=3
VarPalActive=1
VarTileActive=171
VarTileActive=254
VarBankActive=0
VarPPUMask=0
VarPPUMaskSet0=0
Expand All @@ -67,10 +67,10 @@ VarNameSelectionT=-1
VarNameSelectionB=6
VarNameCopyW=18
VarNameCopyH=1
VarCHRSelectionL=11
VarCHRSelectionR=12
VarCHRSelectionT=10
VarCHRSelectionB=11
VarCHRSelectionL=14
VarCHRSelectionR=15
VarCHRSelectionT=15
VarCHRSelectionB=16
VarCHRCopyW=1
VarCHRCopyH=1
VarCHRCopyRect=1
Expand Down Expand Up @@ -144,13 +144,13 @@ RadioAutoexport_UseSubDir_NEXXT=0
CheckAutoexport_MetatileAsBMP=0


VarCHRSelected=00[ab]0100[54]
VarCHRSelected=00[fe]0100


Palette=120f1430120f0530120f1630120f[4]1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c


PalUndo=120f1430120f0528120f1630120f[4]1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c
PalUndo=120f1430120f0530120f1630120f[4]1121310f1222320f1323330f1424340f1525350f1626360f1727370f1828380f1929390f1a2a3a0f1b2b3b0f1c2c3c


CHRMain=ff[10]00[8]ff[10]00[8]ff[8]00[8]ff[8]00ff[7]00[6]ff[8]00[2]ff[8]00[2]3f[6]ff[8]00[2]fc[6]c0[6]ff[2]3f[6]00[2]03[6]ff[2]fc[6]00[2]ff[3]80[3]ff[2]007f[5]00[2]ff[3]01[3]ff[2]00fe[5]00[2]e3[8]7c[8]c7[8]3e[8]ff[8]00[2]ff[e]00182442[2]241800ff00[4]0a[3]ff00[7]ff00[4]aa[3]ff00[7]0a[8]00[8]aa[8]00[8]0a[3]00[4]ff00[7]ffaa[3]00[4]ff00[7]ff183c2418[2]3c24180018[2]00[2]18[2]00[3]183c[2]1800[c]183c[2]1800[4]183c[2]1800[2]070b1f3d3f2b7f[2]00070f1e1c[2]003fe0d0f8bcfcd4fe[2]00e0f07838[2]00fc03070f040e1f[2]1d00030400[2]0e090a0080e89c3890c4fe00[2]a008900480542f[2]5f6f74bb9ce0151a3d1e2f746000e777fef4e000[3]42a224e000[4]ff81bd[4]81ff007e425a[2]427e00[4]1f[3]ff[2]00[4]0f[3]7e00[3]ff[5]00[4]fe[3]00[4]1f[2]ff[3]00[4]0f[2]7e[2]00[3]fc[2]ff[2]7f00[4]f8[2]3e[2]00[2]3e[3]ff[3]00[3]1c[3]7f[2]00[2]03[3]df[3]00[3]01[3]8f[2]00[2]f8[3]ff[3]00[3]f0[3]fe[2]00[3]1f[3]ff[2]00[4]0e[3]7e00[3]ff[4]3f00[4]7f[2]1e[2]00[3]fc[2]ff[2]7f00[4]f8[2]3e[2]ff[4]81[3]ff007e[6]00[4]f8[4]00[5]f0[2]00[5]f8[2]ff[3]00[4]70[2]7e[2]4143[3]41[3]7f3e3c[2]3e[3]3f00ff[8]007f[7]ff[8]00fe[7]ff[4]81[4]7e7f[3]7e[4]f8[5]00[4]f0[3]00[4]ff[3]808382[3]7e7f[3]7c[4]ff[3]01c141[2]713efe[3]3e[3]0eff[4]8382[3]7f[4]7c[4]ff[4]81[3]f18ffe[3]7e[3]0eff[2]7f[2]41[4]fe3e[7]ff[4]81[4]7e[8]3f[4]21[3]201e[7]1f7f[4]41[2]c1073e[7]f8ff[3]80ff0003027e7f[3]00[3]01ff[3]0181[3]0f00fe[3]7e[3]f0ff[3]8081[3]f17e[2]7f[2]7e[3]0eff[3]0181[3]f17e[2]fe[2]7e[3]0e80[7]ff7f[7]0001[7]fffe[7]0081[2]f111[2]1f00[2]7e[2]0e[3]00[3]e0f8feff[2]fef8e00060787e[2]78600082[2]f2121e00[3]7c[2]0c[2]00[4]11[2]1f00[5]0e[2]00[6]829e90[2]f000[3]7c60[3]00[4]111f00[6]0e00[7]41[4]4f48[2]783e[4]30[3]00818f88[2]f800[3]7e70[3]00[4]20[2]38080f00[3]1f[2]07[2]00[4]04[2]3c20e000[3]f8[2]c0[2]00[4]02[2]0300[5]01[2]00[6]08[2]f800[5]f0[2]00[6]11[2]1f00[5]0e[2]00[6]82c2[3]82[3]fe7c3c[2]7c[3]fc00ff[5]fafeff0001050d0f[3]07ff[5]5f7fff0080a0b0f0[3]e000[4]0f08[3]00[5]07[2]00[2]3f[3]ff3f202c00[2]1f[3]df[2]1300fc[3]fffc04[2]00[2]f8[3]fb[2]f800[4]f010[3]00[5]e0[2]00[7]030200[7]0100[3]1f[3]ff1000[4]0f[3]ef00[3]f8[3]ff0800[4]f0[3]f700[6]c04000[7]8002[3]1f[4]1000[4]0f0e[2]0f1e3f5efcfaf7efc7010e2d1b3deed73b091f3f3e51efffe0f0e9d9dfbe71efdf40c040f8[4]0800[2]8000f0[4]071f3f7f[2]ff[3]00[8]e0f8fcfe[2]ff[3]00[8]7f[2]3f1f0f070301003f1f0f07030100fe[2]fcf8f0e0c08000fcf8f0e0c0800008[2]7f[6]00[3]3f[5]2a2deeef[5]151617f7[5]04[2]8747a7d7eff7f8[2]78bfdfeff7fb10[2]fe[6]00[3]fc[5]02[3]1f[4]1000[4]0f[4]107f[2]ff[2]f3[2]7f0f003f[2]a1ad[2]a108fe[2]ff[2]cf[2]fef000fc[2]85b5[2]8540[3]f8[4]0800[4]f0[4]10[4]1f0203020f[4]000100[2]070e7dfafc[2]74a8fbf78e7dfb9b[2]17e070b85c2f17090fdfef77bbdceef6f0ff00[6]ff00ff[6]00ff[3]7f[2]3f1f0700[8]ff[3]fe[2]fcf8e000[9]03070f1f3f7fff00[2]02060e1e3e7e00c0e0f0f8fcfeff00[2]406070787c7e40[5]7f08[2]3f[5]00[3]0f[5]ee2d2af7[5]171615f4e8d0a0408704[2]fbf7efdfbf78f8[2]02[5]fe10[2]fc[5]00[3]10[4]1f02[3]0f[4]00[4]7f[2]70[2]ff7f[2]10bfa0af[2]203f000ffe[2]0e[2]fffe[2]08fd05f5[2]04fc00f008[4]f840[3]f0[4]00[4]071b3f577fb7979c0007002f[2]6f686be0d8fceafeede93900e000f4[2]f616d6071b2e5f7fffef9f00071136075f[2]6ee0d874fafefff7f900e0886ce0fa[2]763f7fff[4]7f3f00[8]fcfeff[4]fefc00[8]ff7f3f1f0f0703007e3e1e0e060200[2]fffefcf8f0e0c0007e7c7870604000[2]08[3]0f00[c]2c20[2]e020[2]3f00131f[5]00[2]04[3]0704[2]fc00f8[6]00[2]10[3]f000[c]020300[e]10f010[2]1f00[3]0f[4]00[4]080f08[2]f800[3]f0[4]00[4]40c000[e]bdfdd57c402718074b3b[2]033f1f0700b9[2]79faaa7c18e0d6[2]9674[2]80e0009dbea77e492e18076e5f[2]0736110700b97de57e927418e076fa[2]e06c88e0003f4080[4]403f003f7f[4]3f00fc0201[4]02fc00fcfe[4]fc00ff[8]0018[2]7e3c[2]6600ff[8]00183c7e[2]3c1800fff8fce0cc969e800007031f3369617fff1f3f073359790100e0c0f8cca686fefff8fce0cc9e[2]8c0007031f33696173ff1f3f073379[2]3100e0c0f8cca686cefff8e0fec08c9e[2]00071f013f736961ff1f077f033179[2]00e0f880fccea686fff8ecc2cd9e[2]8c0007133d32696173ff1f3743b379[2]3100e0c8bc4ca686cefffce4c2cd969e8c00031b3d32696173ff3f2743b359793100c0d8bc4ca686cefff8e0f8f4b696be40675f273b5d6d41ff1f071f2f6d697d02e6fae4dcbab682fffbfffdffebff[2]00070f1e1c[2]003fffdfffbfffd7ff[2]00e0f07838[2]00fc071b6fbfff7f1f0700061e7e[2]1e0600e0d8f6fdfffef8e00060787e[2]786000b8bf[2]dfdee7f8ff47585f28231807001dfd[2]fb7be71fffe21afa14c418e00080a098c7c0e0f8ff7f5f67383f1f0700010519e303071ffffefae61cfcf8e00080[2]83c0[2]e0f8ff7f[2]7c3f[2]1f070001[2]c103[2]071ffffe[2]3efc[2]f8e00080838cc1c0e0f8ff7f7c733e3f1f070001c1318303071ffffe3ece7cfcf8e000838f9fdffefff8ff7c736f2c1b000700c1f1f9fb7fff1fff3ecef634d800e000ff[4]c7e0f8ff28456c05381f0700ff[4]f3071fff34a236b00cf8e000c1c3[3]c1[3]ff3e3c[2]3e[3]3f0083c3[3]83[3]ff7c3c[2]7c[3]fc00ff[8]0814[2]0814[2]0814ff[8]140814[2]08143e7fdbbdf7ffefbddbff3c7e6e66767e3c00dfffbfff[5]3c7c[2]1c[4]00dbffafddbdffbdff3c7e5e3e7a7e[2]00bdfeaeffaefebdff7e7f5f3e5f7f7e00efdfafdfff[4]1e3e7e6f7f0e[2]00ffbffb7d9fff7fc73e7e7cfe7edefc38dbbff9fefab2ddff3c7c7e7f777f3e00bfff[2]edffdbff[2]7e[2]6e1e1c3c3800bdfb[2]ffdf[2]bdff7e767e3c7e6e7e00ffe7f7bfefffdfff3c7e6e7e1e3e3c00ffabf7fdbfefd5ff00765e[2]7a[2]6e00d7fbbfdd6fff[3]383c7c7edefece007bfdf5fbf5fd7bfffcfeeefceefefc00bb7df7fff77dbbff7cfe[2]f0fe[2]7c00bbfdfbfffbfdbbff7c7e7672767e7c00bffffbfffbffbfff7e[2]7c7e7c7e[2]00bdff7b7f79ffb7ff7e[2]fcfe[2]78[2]00bb7dff[2]fb7fbbff7cfef6f0f6fe7e007dffe7ffe7ff7dffe6[2]fe[3]e6[2]00dbff[4]dfdbff3c[7]00dbff[3]fbbf7fff3c[5]78f000bbf7fdfbfff7bfff767e[2]7c[2]7e7600b7ff[5]bdff78[5]7e[2]00ed7f7efed7ef3bff7efeff[3]d7c7005deff7ff[2]cf55ffe6f6fe[4]ee00bb7ddfd7f77dbbff7cfeee[3]fe7c00bdf3fffdf7ff[3]7e[2]727e7870[2]00bb7fdfd7f77db7fb7cfeee[3]fe7e047fe5ff[2]fdeff7fffcfee6fcfe[2]ee00bb7f7dff7dfdbbff7cfef638defe7c007dff[7]fe[2]38[5]006fef[3]f77dbbfff6[4]fe[2]7c005abdf7ffefbd5a3c[2]7e6e66767e3c005ebefe7e3e[3]3c[2]7c[2]1c[4]005affaf5dbdffbd7e3c7e5e3e7a7e[2]003dfeae7faefebd7e[2]7f5f3e5f7f7e000f1f2fdfff7f1f0e1e3e7e6f7f0e[2]007f3ffb7d9fff7e443e7e7cfe7edefc385abef9fefab25d3e3c7c7e7f777f3e00bfff[2]ed7e5a7c[2]7e[2]6e1e1c3c3800bdfb[2]7edf[2]bd7e[2]767e3c7e6e7e007ee7f7bf6f7f5e3c[2]7e6e7e1e3e3c0066abf7fc3fefd56600765e[2]7a[2]6e00dbef777dffbbdfffe6f6fe[2]7c[2]3800dfe3eb7f7e76e7ffe3ff[5]7e00df6dffbbff6df7ffe6fe7c[3]fece00dae76dff[5]e7fe[2]7c38[3]00ff[2]ddffbbff[3]7e[2]3e3c7c7e[2]000e161a2c34586870000c[2]18[2]30[2]00547abedc6fff[2]cf383c7c7edefece007afdf5faf5fd7afc[2]feeefceefefc00ba7df7fff77dba7c[2]fe[2]f0fe[2]7c00bafdfbfffbfdbafc7c7e7672767e7c00bffffafffaffbf7e[3]7c7e7c7e[2]00bdff7a7f79feb4787e[2]fcfe[2]78[2]00ba7dff[2]fb7fbb7e7cfef6f0f6fe7e006defe7ffe7ef6deef6[2]fe[3]f6[2]005a7e[4]5e5a3e3c[7]005a7e[3]7abc78f03c[5]78f000bbf7fdfafef7bfff767e[2]7c[2]7e7600b4fc[3]ff[2]bd7e78[5]7e[2]00ed7f7efed7ef3bc77efeff[3]d7c70055eff7ffdfef75cee6f6fe[3]dece00ba7ddfd7f77dba7c[2]feee[3]fe7c00bdf3fffdf6f8[2]707e[2]727e7870[2]00bb7fdfd7f77db77a7cfeee[3]fe7e047ee5fffefceff7effcfee6fcfe[2]ee003a7f7dfe7dfdba7c[2]fef638defe7c007dfffe7c[4]38fe[2]38[5]006fef[3]f77dba7cf6[4]fe[2]7c00dbef777dfeba5c38e6f6fe[2]7c[2]3800dfe3eb7f7e76e77ee3ff[5]7e00df6dfe38fe6df7cfe6fe7c[3]fece00dae76dfe7c[3]38e7fe[2]7c38[3]00ff[2]dd7ebaff[2]fe7e[2]3e3c7c7e[2]00fff7fbeff7dfefff000c[2]18[2]30[2]00ff[2]e7ff[3]e7ff0018[2]00[2]18[2]00ff[18]00[3018]
Expand All @@ -162,22 +162,22 @@ CHRUndo=ff[10]00[8]ff[10]00[8]ff[8]00[8]ff[8]00ff[7]00[6]ff[8]00[2]ff[8]00[2]3f[
CHRCopy=01[7]fffe[7]00ff81bd[4]81ff007e425a[2]427e00ff[3]8081[3]f17e[2]7f[2]7e[3]0eff[3]0181[3]f17e[2]fe[2]7e[3]0e11[2]1f00[5]0e[2]00[6]ff81bd[4]81ff007e425a[2]427e00[fa1]


NameTable=02fe02[3]fe02[11]fe[2]02fe[3]02[2]fe02fe[2]02fe02[9]fe[2]02[6]fe[3]02fe[3]02[2]fe[3]02[a]fe02fe[14]02[2]fe02[7]fe[df]c1bbc7bffe[40]c9dbbfccfe[9a]98999899fe[1c]a8a9a8a9fe[5d]9a9bfe[1e]aaabfe[b5]02fe[2]02[6]fe[2]02[6]fe[5]02[3]fe[3]02fe[3]02fe02fe[5]02[a]fe02fe[2]02[3]fe[2]
NameTable=02fe02[3]fe02[11]fe[2]02fe[3]02[2]fe02fe[2]02fe02[9]fe[2]02[6]fe[3]02fe[3]02[2]fe[3]02[a]fe02fe[14]02[2]fe02[7]fe[e0]c1bbc7bffe[40]c9dbbfccfe[9a]98999899fe[1c]a8a9a8a9fe[5d]9a9bfe[1e]aaabfe[b4]02fe[2]02[6]fe[2]02[6]fe[5]02[3]fe[3]02fe[3]02fe02fe[5]02[a]fe02fe[2]02[3]fe[2]


NameCopy=f4effff4efe7[2]ece5ffd2fff0ece1f9e5f2f409130607fd[2]0a080901[2]fe[8]8efe[2a]02[2]fe[11]6cfe[12]6dff[18]eeeff2ede1ecff[2]edefe4e5ff[4]7cfe[7]ff[3]bafe[2]02[5]7dff[17]f0f2e1e3f4e9e3e5ff[2]edefe4e5ff[3]7cfe[7]ff[3]bafe[7]7d00[2d0]


NameUndo=02fe02[3]fe02[11]fe[2]02fe[3]02[2]fe02fe[2]02fe02[9]fe[2]02[6]fe[3]02fe[3]02[2]fe[3]02[a]fe02fe[14]02[2]fe02[7]fe[df]c1bbc7bffe[40]c9dbbfccfe[9a]98999899fe[1c]a8a9a8a9fe[5d]9a9bfe[1e]aaabfe[b5]02fe[2]02[6]fe[2]02[6]fe[5]02[3]fe[3]02fe[3]02fe02fe[5]02[a]fe02fe[2]02[3]fe[2]
NameUndo=02fe02[3]fe02[11]fe[2]02fe[3]02[2]fe02fe[2]02fe02[9]fe[2]02[6]fe[3]02fe[3]02[2]fe[3]02[a]fe02fe[14]02[2]fe02[7]fe[e0]c1bbc7bffe[40]c9dbbfccfe[9a]98999899fe[1c]a8a9a8a9fe[5c]9a[2]9bfe[1d]aa[2]abfe[b4]02fe[2]02[6]fe[2]02[6]fe[5]02[3]fe[3]02fe[3]02fe02fe[5]02[a]fe02fe[2]02[3]fe[2]


AttrTable=00[2]5010405000[b]842100[3]0100[6]040100[2]04050004050100[4]4400[4]4100[6]1400[8]
AttrTable=00[2]5010405000[b]842100[3]0100[6]040100[2]04050004050100[4]441100[3]4100[6]1400[8]


AttrCopy=00[13]010301[2]03[3]01[2]03[2]00[6]01[4]00[18]


AttrUndo=00[2]5010405000[b]842100[3]0100[6]040100[2]04050004050100[4]4400[4]4100[6]1400[8]
AttrUndo=00[2]5010405000[b]842100[3]0100[6]040100[2]04050004050100[4]441100[3]4100[6]1400[8]


MetaSprites=ff[10000]
Expand Down Expand Up @@ -315,18 +315,18 @@ MetatileSet_8x8_props=00[2000]
MetatileSet_8x8_propsUndo=00[2000]


MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

MetatileSetLabels_8x8=Unlabeled,Unlabeled
MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled
MetatileSetLabels_8x8=Unlabeled,Unlabeled
MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled

CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled
CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled

CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_Palette=00[40]

Expand Down Expand Up @@ -433,15 +433,15 @@ Checkpoint_MetatileSet_8x8_props=00[2000]
Checkpoint_MetatileSet_8x8_propsUndo=00[2000]


Checkpoint_MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_2x2Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_4x4Undo=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_MetatileSetLabels_8x8=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8=Unlabeled,Unlabeled
Checkpoint_MetatileSetLabels_8x8Undo=Unlabeled,Unlabeled

Checkpoint_CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_CHRBankLabels=Unlabeled,Unlabeled,Unlabeled,Unlabeled

Checkpoint_CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Checkpoint_CHRBankLabelsUndo=Unlabeled,Unlabeled,Unlabeled,Unlabeled
Expand Down
10 changes: 5 additions & 5 deletions menus/h/gameover.h
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const unsigned char gameover[187]={
const unsigned char gameover[188]={
0x03,0x02,0xfe,0x02,0x03,0x02,0xfe,0x02,0x03,0x10,0xfe,0xfe,0x02,0xfe,0x03,0x02,
0x02,0x02,0xfe,0x02,0xfe,0xfe,0x02,0xfe,0x02,0x03,0x08,0xfe,0xfe,0x02,0x03,0x05,
0xfe,0x03,0x02,0x02,0xfe,0x03,0x02,0x02,0x02,0xfe,0x03,0x02,0x02,0x03,0x09,0xfe,
0x02,0xfe,0x03,0x13,0x02,0x02,0xfe,0x02,0x03,0x06,0xfe,0x03,0xde,0xc1,0xbb,0xc7,
0x02,0xfe,0x03,0x13,0x02,0x02,0xfe,0x02,0x03,0x06,0xfe,0x03,0xdf,0xc1,0xbb,0xc7,
0xbf,0xfe,0x03,0x3f,0xc9,0xdb,0xbf,0xcc,0xfe,0x03,0x99,0x98,0x99,0x98,0x99,0xfe,
0x03,0x1b,0xa8,0xa9,0xa8,0xa9,0xfe,0x03,0x5c,0x9a,0x9b,0xfe,0x03,0x1d,0xaa,0xab,
0xfe,0x03,0xb4,0x02,0xfe,0xfe,0x02,0x03,0x05,0xfe,0xfe,0x02,0x03,0x05,0xfe,0x03,
0xfe,0x03,0xb3,0x02,0xfe,0xfe,0x02,0x03,0x05,0xfe,0xfe,0x02,0x03,0x05,0xfe,0x03,
0x04,0x02,0x03,0x02,0xfe,0x03,0x02,0x02,0xfe,0x03,0x02,0x02,0xfe,0x02,0xfe,0x03,
0x04,0x02,0x03,0x09,0xfe,0x02,0xfe,0xfe,0x02,0x03,0x02,0xfe,0xfe,0x00,0x00,0x50,
0x10,0x40,0x50,0x00,0x03,0x0a,0x84,0x21,0x00,0x03,0x02,0x01,0x00,0x03,0x05,0x04,
0x01,0x00,0x00,0x04,0x05,0x00,0x04,0x05,0x01,0x00,0x03,0x03,0x44,0x00,0x03,0x03,
0x41,0x00,0x03,0x05,0x14,0x00,0x03,0x06,0x00,0x03,0x00
0x01,0x00,0x00,0x04,0x05,0x00,0x04,0x05,0x01,0x00,0x03,0x03,0x44,0x11,0x00,0x03,
0x02,0x41,0x00,0x03,0x05,0x14,0x00,0x03,0x06,0x00,0x03,0x00
};

0 comments on commit ea7b0c5

Please sign in to comment.