From 1d8ac2e6e13b92d7f2d6a1c3a5c8ed945e9c654c Mon Sep 17 00:00:00 2001 From: Andre Schweiger Date: Sun, 27 Dec 2015 15:59:53 +0100 Subject: [PATCH] Swap Colors for new Lib Version TODO - fix minimap colors TODO - colors created by RGBA8 --- source/Entity.c | 16 ++-- source/Globals.c | 34 ++++----- source/Menu.c | 168 +++++++++++++++++++++--------------------- source/MenuTutorial.c | 68 ++++++++--------- source/Render.c | 66 ++++++++--------- source/SaveLoad.c | 16 ++-- source/main.c | 62 +--------------- 7 files changed, 186 insertions(+), 244 deletions(-) diff --git a/source/Entity.c b/source/Entity.c index 3d48e77..57c4503 100644 --- a/source/Entity.c +++ b/source/Entity.c @@ -82,10 +82,10 @@ Entity newZombieEntity(int lvl, int x, int y, int level){ e.yr = 3; e.canPass = false; switch(lvl){ - case 2: e.zombie.color = 0xCC8282FF; break; - case 3: e.zombie.color = 0xEFEFEFFF; break; - case 4: e.zombie.color = 0x6262AAFF; break; - default: e.zombie.color = 0x95DB95FF; break; + case 2: e.zombie.color = 0xFF8282CC; break; + case 3: e.zombie.color = 0xFFEFEFEF; break; + case 4: e.zombie.color = 0xFFAA6262; break; + default: e.zombie.color = 0xFF95DB95; break; } return e; } @@ -108,10 +108,10 @@ Entity newSlimeEntity(int lvl, int x, int y, int level){ e.yr = 3; e.canPass = false; switch(lvl){ - case 2: e.slime.color = 0xCC8282FF; break; - case 3: e.slime.color = 0xEFEFEFFF; break; - case 4: e.slime.color = 0x6262AAFF; break; - default: e.slime.color = 0x95DB95FF; break; + case 2: e.slime.color = 0xFF8282CC; break; + case 3: e.slime.color = 0xFFEFEFEF; break; + case 4: e.slime.color = 0xFFAA6262; break; + default: e.slime.color = 0xFF95DB95; break; } return e; } diff --git a/source/Globals.c b/source/Globals.c index fe4457c..9770ab3 100644 --- a/source/Globals.c +++ b/source/Globals.c @@ -351,7 +351,7 @@ void EntityVsEntity(Entity* e1, Entity* e2){ case ENTITY_PLAYER: playerEntityInteract(e2); break; case ENTITY_ZOMBIE: if(e2->type == ENTITY_PLAYER){ - hurtEntity(e2, 2, e1->zombie.dir, 0xFF00AFFF); + hurtEntity(e2, 2, e1->zombie.dir, 0xFFAF00FF); switch(e1->zombie.dir){ case 0: e1->yKnockback = -4; break; case 1: e1->yKnockback = +4; break; @@ -362,7 +362,7 @@ void EntityVsEntity(Entity* e1, Entity* e2){ break; case ENTITY_SLIME: if(e2->type == ENTITY_PLAYER){ - hurtEntity(e2, 1, e1->slime.dir, 0xFF00AFFF); + hurtEntity(e2, 1, e1->slime.dir, 0xFFAF00FF); switch(e1->slime.dir){ case 0: e1->yKnockback = -4; break; case 1: e1->yKnockback = +4; break; @@ -372,10 +372,10 @@ void EntityVsEntity(Entity* e1, Entity* e2){ } break; case ENTITY_AIRWIZARD: - if(e2->type == ENTITY_PLAYER) hurtEntity(e2, 3, e1->wizard.dir, 0xFF00AFFF); + if(e2->type == ENTITY_PLAYER) hurtEntity(e2, 3, e1->wizard.dir, 0xFFAF00FF); break; case ENTITY_SPARK: - if(e2 != e1->spark.parent) hurtEntity(e2, 1, -1, 0xFF00AFFF); + if(e2 != e1->spark.parent) hurtEntity(e2, 1, -1, 0xFFAF00FF); break; } } @@ -422,19 +422,19 @@ bool tileIsSolid(int tile, Entity * e){ /* For minimap */ u32 getTileColor(int tile){ switch(tile){ - case TILE_WATER: return 0xFFFF0000; - case TILE_LAVA: return 0xFF0000FF; - case TILE_DIRT: return 0xFF6C6D82; + case TILE_WATER: return 0xFF0000FF; + case TILE_LAVA: return 0xFFFF0000; + case TILE_DIRT: return 0xFF826D6C; case TILE_ROCK: return 0xFF7F7F7F; - case TILE_HARDROCK: return 0xFF7F5F5F; + case TILE_HARDROCK: return 0xFF5F5F7F; case TILE_GRASS: return 0xFF00FF00; case TILE_TREE: return 0xFF007F00; - case TILE_SAND: return 0xFF00FFFF; + case TILE_SAND: return 0xFFFFFF00; case TILE_CACTUS: return 0xFF009F00; - case TILE_FLOWER: return 0xFF00FF3F; - case TILE_IRONORE: return 0xFF9696DC; - case TILE_GOLDORE: return 0xFF9AE8E5; - case TILE_GEMORE: return 0xFFDE98DF; + case TILE_FLOWER: return 0xFF3FFF00; + case TILE_IRONORE: return 0xFFDC9696; + case TILE_GOLDORE: return 0xFFE5E89A; + case TILE_GEMORE: return 0xFFDF98DE; case TILE_CLOUD: return 0xFFFFFFFF; case TILE_CLOUDCACTUS: return 0xFFAFAFAF; case TILE_STAIRS_DOWN: return 0xFF9F9F9F; @@ -449,7 +449,7 @@ void healPlayer(int amount){ if(player.p.health > 10) player.p.health = 10; char healText[11]; sprintf(healText, "%d", amount); - addEntityToList(newTextParticleEntity(healText,0x00FF00FF,player.x,player.y,currentLevel), &eManager); + addEntityToList(newTextParticleEntity(healText,0xFF00FF00,player.x,player.y,currentLevel), &eManager); } s8 itemTileInteract(int tile, Item* item, int x, int y, int px, int py, int dir){ @@ -1222,8 +1222,8 @@ void entityTileInteract(Entity*e, int tile, int x, int y){ player.y = (y << 4) + 8; } return; - case TILE_CACTUS: if(e->type == ENTITY_PLAYER)hurtEntity(e,1,-1,0xFF00AFFF); return; - case TILE_LAVA: if(e->type == ENTITY_PLAYER)hurtEntity(e,1,-1,0xFF00AFFF); return; + case TILE_CACTUS: if(e->type == ENTITY_PLAYER)hurtEntity(e,1,-1,0xFFAF00FF); return; + case TILE_LAVA: if(e->type == ENTITY_PLAYER)hurtEntity(e,1,-1,0xFFAF00FF); return; case TILE_WHEAT: if(e->type == ENTITY_PLAYER || e->type == ENTITY_ZOMBIE){ if(getData(x,y) > -1 && rand()%20 == 0){ @@ -1372,7 +1372,7 @@ void tickPlayer(){ if (player.p.stamina > 0) { --player.p.stamina; } else { - hurtEntity(&player,1,-1,0xFF00AFFF); + hurtEntity(&player,1,-1,0xFFAF00FF); } } diff --git a/source/Menu.c b/source/Menu.c index 0cc7f0c..6aa3f25 100644 --- a/source/Menu.c +++ b/source/Menu.c @@ -745,16 +745,16 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); drawText("Texture Packs",122,-16); for(i = 0; i < tpFileCount; ++i){ - int color = 0x323292FF; + int color = 0xFF923232; char * text = tpFileNames[i]; char * cmtText = tpFileComment[i]; if(i == 0){ text = "Default"; cmtText = "Regular look of the game"; - color = 0x601092FF; + color = 0xFF921060; } - if(i != currentSelection) color &= 0xFFFFFF7F; // Darken color. - else if(areYouSure)color = 0xDF1010FF; + if(i != currentSelection) color &= 0x7FFFFFFF; // Darken color. + else if(areYouSure)color = 0xFF1010DF; renderFrame(1,i*5,24,(i*5)+5,color); drawText(text,(400-(strlen(text)*12))/2,i*80+16); @@ -763,17 +763,17 @@ void renderMenu(int menu,int xscr,int yscr){ char cmtTxt1[30],cmtTxt2[30]; strncpy(cmtTxt1, cmtText, 29); strncpy(cmtTxt2, cmtText + 29, strlen(cmtText)-29); - drawTextColor(cmtTxt1,(400-(strlen(cmtTxt1)*12))/2,i*80+36,0xAFAFAFFF); - drawTextColor(cmtTxt2,(400-(strlen(cmtTxt2)*12))/2,i*80+50,0xAFAFAFFF); + drawTextColor(cmtTxt1,(400-(strlen(cmtTxt1)*12))/2,i*80+36,0xFFAFAFAF); + drawTextColor(cmtTxt2,(400-(strlen(cmtTxt2)*12))/2,i*80+50,0xFFAFAFAF); } else { - drawTextColor(cmtText,(400-(strlen(cmtText)*12))/2,i*80+43,0xAFAFAFFF); + drawTextColor(cmtText,(400-(strlen(cmtText)*12))/2,i*80+43,0xFFAFAFAF); } } offsetX = 0;offsetY = 0; if(isLoadingTP > 0){ --isLoadingTP; - renderFrame(1,5,24,9,0x666666FF); - drawTextColor("Loading Texture pack...",(400-(23*12))/2,108,0xFFFF10FF); + renderFrame(1,5,24,9,0xFF666666); + drawTextColor("Loading Texture pack...",(400-(23*12))/2,108,0xFF10FFFF); if(isLoadingTP == 0){ char fullDirName[256]; sprintf(fullDirName,"texturepacks/%s.zip",tpFileNames[currentSelection]); @@ -801,15 +801,15 @@ void renderMenu(int menu,int xscr,int yscr){ offsetX = 0;offsetY = (currentSelection * 32) - 48; drawText("Select a file",122,-16); for(i = 0; i < worldFileCount + 1; ++i){ - int color = 0x201092FF; + int color = 0xFF921020; char * text = fileNames[i]; if(i == worldFileCount){ text = "Generate New World"; - color = 0x109220FF; + color = 0xFF209210; } - if(i != currentSelection) color &= 0x7F7F7FFF; // Darken color. + if(i != currentSelection) color &= 0xFF7F7F7F; // Darken color. else { - if(areYouSure)color = 0xDF1010FF; + if(areYouSure)color = 0xFF1010DF; } char scoreText[24]; @@ -831,9 +831,9 @@ void renderMenu(int menu,int xscr,int yscr){ if(errorFileName > 0){ switch(errorFileName){// Error: Filename cannot already exist. - case 1: drawTextColor("ERROR: Length cannot be 0!",(400-26*12)/2,200,0xAF1010FF); break; - case 2: drawTextColor("ERROR: You need Letters/Numbers!",(400-32*12)/2,200,0xAF1010FF); break; - case 3: drawTextColor("ERROR: Filename already exists!",(400-31*12)/2,200,0xAF1010FF); break; + case 1: drawTextColor("ERROR: Length cannot be 0!",(400-26*12)/2,200,0xFF1010AF); break; + case 2: drawTextColor("ERROR: You need Letters/Numbers!",(400-32*12)/2,200,0xFF1010AF); break; + case 3: drawTextColor("ERROR: Filename already exists!",(400-31*12)/2,200,0xFF1010AF); break; } } } @@ -841,7 +841,7 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_BOTTOM, GFX_LEFT); if(!enteringName){ // World select if(!areYouSure){ - drawTextColor("Load World",100,12,0xFFFF3FFF); + drawTextColor("Load World",100,12,0xFF3FFFFF); drawText("Press or to scroll", 28, 50); renderButtonIcon(k_up.input & -k_up.input, 98, 48, 1); renderButtonIcon(k_down.input & -k_down.input, 160, 48, 1); @@ -862,9 +862,9 @@ void renderMenu(int menu,int xscr,int yscr){ } } else { // Draw the "keyboard" - drawTextColor("Touch the keypad below",(320-22*12)/2,12,0xFFFF33FF); + drawTextColor("Touch the keypad below",(320-22*12)/2,12,0xFF33FFFF); - sf2d_draw_rectangle(0, 50, 320, 110, 0xBF7F7FFF); + sf2d_draw_rectangle(0, 50, 320, 110, 0xFF7F7FBF); drawSizedText(guiText0,4, 60, 2); drawSizedText(guiText1,4, 80, 2); drawSizedText(guiText2,12, 100, 2); @@ -885,7 +885,7 @@ void renderMenu(int menu,int xscr,int yscr){ break; case MENU_SETTINGS_REBIND: sf2d_start_frame(GFX_TOP, GFX_LEFT); - drawTextColor("Rebind Buttons",116,12,0xAFAF00FF); + drawTextColor("Rebind Buttons",116,12,0xFF00AFAF); drawText("Button",16,32); drawText("Game",140,32); drawText("Menus",280,32); @@ -896,7 +896,7 @@ void renderMenu(int menu,int xscr,int yscr){ for(i = 0; i < 5; ++i){ if((currentSelection-2) + i > 21 || (currentSelection-2) + i < 0) continue; renderButtonIcon(keys[(currentSelection-2) + i], 16, (i * 18) + 30, 2); - int ccol = 0x7F7F7FFF; + int ccol = 0xFF7F7F7F; sprintf(gameButText,"%s",getButtonFunctionGame(keys[(currentSelection-2) + i])); sprintf(menuButText,"%s",getButtonFunctionMenu(keys[(currentSelection-2) + i])); @@ -904,25 +904,25 @@ void renderMenu(int menu,int xscr,int yscr){ if(i == 2){ if(!selBut)ccol = 0xFFFFFFFF; else{ - ccol = 0x00FF00FF; + ccol = 0xFF00FF00; if(left)sprintf(gameButText,"<%s>",getButtonFunctionGame(keys[(currentSelection-2) + i])); else sprintf(menuButText,"<%s>",getButtonFunctionMenu(keys[(currentSelection-2) + i])); } } if(left){ drawTextColor(gameButText, 112, (i * 33) + 80, ccol); - drawTextColor(menuButText, 280, (i * 33) + 80, 0x7F7F7FFF); + drawTextColor(menuButText, 280, (i * 33) + 80, 0xFF7F7F7F); } else { - drawTextColor(gameButText, 112, (i * 33) + 80, 0x7F7F7FFF); + drawTextColor(gameButText, 112, (i * 33) + 80, 0xFF7F7F7F); drawTextColor(menuButText, 280, (i * 33) + 80, ccol); } } if(bindOpt){ - renderFrame(1,1,24,14,0x1010BFFF); - drawTextColor("Save changes?",122,32,0xAFAF00FF); + renderFrame(1,1,24,14,0xFFBF1010); + drawTextColor("Save changes?",122,32,0xFF00AFAF); for(i = 2; i >= 0; --i){ char* msg = keybOptions[i]; - u32 color = 0x4F4F4FFF; + u32 color = 0xFF4F4F4F; if(i == curSaveSel) color = 0xFFFFFFFF; drawTextColor(msg,(400 - (strlen(msg) * 12))/2, (i * 24) + 92, color); } @@ -972,25 +972,25 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); offsetX = 0;offsetY = 0; - renderFrame(1,1,24,14,0xAF1010FF); + renderFrame(1,1,24,14,0xFF1010AF); drawText("Paused",164,32); for(i = 2; i >= 0; --i){ char* msg = pOptions[i]; - u32 color = 0x7F7F7FFF; + u32 color = 0xFF7F7F7F; if(i == currentSelection) color = 0xFFFFFFFF; drawTextColor(msg,(400 - (strlen(msg) * 12))/2, (i * 24) + 100, color); } - if(pauseSaveDisplayTimer > 0) drawTextColor("Game Saved!", (400-(11*12))/2, 64,0x20FF20FF); + if(pauseSaveDisplayTimer > 0) drawTextColor("Game Saved!", (400-(11*12))/2, 64,0xFF20FF20); if(areYouSure || areYouSureSave){ - if(areYouSure)renderFrame(6,5,19,10,0x8F1010FF); - else renderFrame(6,5,19,10,0x108F10FF); + if(areYouSure)renderFrame(6,5,19,10,0xFF10108F); + else renderFrame(6,5,19,10,0xFF108F10); drawText("Are you sure?",122,96); drawText(" Yes", 164, 117); @@ -1005,16 +1005,16 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); offsetX = 0;offsetY = 0; - renderFrame(5,3,21,12,0x1010FFFF); + renderFrame(5,3,21,12,0xFFFF1010); if(!rev){ opacity+=5; if(opacity == 255) rev = true; } else { opacity-=5; if(opacity == 100) rev = false; } sprintf(scoreText,"Score: %d", player.p.score); - drawTextColor("You Win!",158,76,0xAFAF0000 + opacity); + drawTextColor("You Win!",158,76,0x0000AFAF + opacity); drawText(scoreText, 200-((strlen(scoreText)-1)*6), 100); drawText("Press to continue", 96, 150); renderButtonIcon(k_attack.input & -k_attack.input, 166, 148, 1); @@ -1026,16 +1026,16 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); offsetX = 0;offsetY = 0; - renderFrame(5,3,21,12,0x1010FFFF); + renderFrame(5,3,21,12,0xFFFF1010); if(!rev){ opacity+=5; if(opacity == 255) rev = true; } else { opacity-=5; if(opacity == 100) rev = false; } sprintf(scoreText,"Score: %d", player.p.score); - drawTextColor("You DIED!",158,76,0xAF000000 + opacity); + drawTextColor("You DIED!",158,76,0x000000AF + opacity); drawText(scoreText, 200-((strlen(scoreText)-1)*6), 100); drawText("Press to continue", 96, 150); renderButtonIcon(k_attack.input & -k_attack.input, 166, 148, 1); @@ -1046,12 +1046,12 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); offsetX = 0;offsetY = 0; - renderFrame(1,1,24,14,0x1010FFFF); + renderFrame(1,1,24,14,0xFFFF1010); renderItemList(player.p.inv, 1,1,24,14, curInvSel); sf2d_end_frame(); break; @@ -1059,15 +1059,15 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); offsetX = 0;offsetY = 0; - renderFrame(15,1,24,4,0x1010FFFF); - renderFrame(15,5,24,14,0x1010FFFF); - renderFrame(1,1,14,14,0x1010FFFF); + renderFrame(15,1,24,4,0xFFFF1010); + renderFrame(15,5,24,14,0xFFFF1010); + renderFrame(1,1,14,14,0xFFFF1010); renderRecipes(currentRecipes, 1, 1, 14, 14, curInvSel); Recipe* rec = ¤tRecipes->recipes[curInvSel]; @@ -1081,7 +1081,7 @@ void renderMenu(int menu,int xscr,int yscr){ for(i = 0; i < rec->numOfCosts; i++){ int amnt = countItemInv(rec->costs[i].costItem,0, player.p.inv); int ttlCst = rec->costs[i].costAmount; - int col = 0xFFFFFFFF; if(amntcosts[i].costItem,1,128,48+(i*8)); sprintf(craftText,"%d/%d",amnt,ttlCst); drawTextColor(craftText,274,96+(i*18),col); @@ -1095,17 +1095,17 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_TOP, GFX_LEFT); if(currentLevel == 0){ sf2d_draw_texture_part_scale(minimap[1],(-xscr/3)-256,(-yscr/3)-32,0,0,128,128,12.5,7.5); - sf2d_draw_rectangle(0,0,400,240, 0xDFDFDFAF); + sf2d_draw_rectangle(0,0,400,240, 0xAFDFDFDF); } offsetX = xscr;offsetY = yscr; renderMenuBackground(xscr,yscr); if (curChestEntity->entityFurniture.r == 1){ offsetX = 48;offsetY = 0;} else {offsetX = 0;offsetY = 0;} - renderFrame(1,1,14,14,0x1010FFFF); + renderFrame(1,1,14,14,0xFFFF1010); renderItemList(curChestEntity->entityFurniture.inv,1,1,14,14, curChestEntity->entityFurniture.r == 0 ? curInvSel : -curChestEntity->entityFurniture.oSel - 1); - renderFrame(15,1,28,14,0x1010FFFF); + renderFrame(15,1,28,14,0xFFFF1010); renderItemList(player.p.inv,15,1,28,14, curChestEntity->entityFurniture.r == 1 ? curInvSel : -curChestEntity->entityFurniture.oSel - 1); offsetX = 0;offsetY = 0; @@ -1119,17 +1119,17 @@ void renderMenu(int menu,int xscr,int yscr){ drawSizedText("it is dedicated to my father. <3",72,60,1.0); drawSizedText("- Markus \"Notch\" Persson",104,76,1.0); - drawTextColor("3DS Homebrew Edition",74,120,0x00FF00FF); - drawSizedTextColor("This port was made by David Benepe (Davideesk)",16,144,1.0,0x00FF00FF); - drawSizedTextColor("just for fun in September/October 2015.",44,156,1.0,0x00FF00FF); - drawSizedTextColor("TY Notch for creating a fun game to remake!",28,180,1.0,0x00FF00FF); + drawTextColor("3DS Homebrew Edition",74,120,0xFF00FF00); + drawSizedTextColor("This port was made by David Benepe (Davideesk)",16,144,1.0,0xFF00FF00); + drawSizedTextColor("just for fun in September/October 2015.",44,156,1.0,0xFF00FF00); + drawSizedTextColor("TY Notch for creating a fun game to remake!",28,180,1.0,0xFF00FF00); sf2d_end_frame(); sf2d_start_frame(GFX_BOTTOM, GFX_LEFT); drawTextColor("Special Thanks to:",52,12,0xFF7F7FFF); drawTextColor("Smea",136,60,0xFF2020FF); drawSizedTextColor("for ctrulib",116,80,1.0,0xFF2020FF); - drawTextColor("Xerpi",130,120,0x2020FFFF); - drawSizedTextColor("for sf2dlib",116,140,1.0,0x2020FFFF); + drawTextColor("Xerpi",130,120,0xFFFF2020); + drawSizedTextColor("for sf2dlib",116,140,1.0,0xFFFF2020); drawText("Press to return", 58, 220); renderButtonIcon(k_decline.input & -k_decline.input, 128, 218, 1); sf2d_end_frame(); @@ -1139,19 +1139,19 @@ void renderMenu(int menu,int xscr,int yscr){ drawText("Settings",(400-(8*12))/2,30); for(i = 4; i >= 0; --i){ char* msg = setOptions[i]; - u32 color = 0x7F7F7FFF; + u32 color = 0xFF7F7F7F; if(i == currentSelection) color = 0xFFFFFFFF; if(i == 2){ - if(shouldRenderDebug) drawSizedTextColor("On",142, ((8 + i) * 32 - 190) >> 1,2.0, 0x00DF00FF); - else drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xDF0000FF); + if(shouldRenderDebug) drawSizedTextColor("On",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xFF00DF00); + else drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xFF0000DF); } else if(i == 3){ if((MODEL_3DS & 6) != 0){ // detect if user is using a New 3DS - if(shouldSpeedup) drawSizedTextColor("On",142, ((8 + i) * 32 - 190) >> 1,2.0, 0x00DF00FF); - else drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xDF0000FF); + if(shouldSpeedup) drawSizedTextColor("On",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xFF00DF00); + else drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xFF0000DF); } else { - color = 0x3F3F3FFF; - drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0x3F3F3FFF); + color = 0xFF3F3F3F; + drawSizedTextColor("Off",142, ((8 + i) * 32 - 190) >> 1,2.0, 0xFF3F3F3F); } } drawSizedTextColor(msg,(200 - (strlen(msg) * 8))/2, ((8 + i) * 32 - 190) >> 1,2.0, color); @@ -1160,19 +1160,19 @@ void renderMenu(int menu,int xscr,int yscr){ sf2d_start_frame(GFX_BOTTOM, GFX_LEFT); switch(currentSelection){ case 0: - drawTextColor("Change the controls",(320 - (19 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Change the controls",(320 - (19 * 12))/2,24,0xFF7FFFFF); break; case 1: - drawTextColor("Change the game's art",(320 - (21 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Change the game's art",(320 - (21 * 12))/2,24,0xFF7FFFFF); break; case 2: - drawTextColor("Show FPS/Pos/Entities",(320 - (22 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Show FPS/Pos/Entities",(320 - (22 * 12))/2,24,0xFF7FFFFF); break; case 3: - drawTextColor("Use the N3DS 804mhz mode",(320 - (24 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Use the N3DS 804mhz mode",(320 - (24 * 12))/2,24,0xFF7FFFFF); break; case 4: - drawTextColor("Back to the titlescreen",(320 - (23 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Back to the titlescreen",(320 - (23 * 12))/2,24,0xFF7FFFFF); break; } drawText("Press to select", 58, 100); @@ -1188,7 +1188,7 @@ void renderMenu(int menu,int xscr,int yscr){ for(i = 4; i >= 0; --i){ char* msg = options[i]; - u32 color = 0x7F7F7FFF; + u32 color = 0xFF7F7F7F; if(i == currentSelection) color = 0xFFFFFFFF; drawSizedTextColor(msg,(200 - (strlen(msg) * 8))/2, ((8 + i) * 20 - 50) >> 1,2.0, color); } @@ -1205,32 +1205,32 @@ void renderMenu(int menu,int xscr,int yscr){ render16(startX,startY+12,0,128,0);//Player(Carrying) render16(startX,startY,128,128,0);//Workbench startX = 120;startY = 20; - render16b(startX,startY,16,96,0,0x001DC1FF);// water pit - render16b(startX+16,startY,32,96,0,0x001DC1FF); - render16b(startX,startY+16,48,96,0,0x001DC1FF); - render16b(startX+16,startY+16,64,96,0,0x001DC1FF); + render16b(startX,startY,16,96,0,0xFFC11D00);// water pit + render16b(startX+16,startY,32,96,0,0xFFC11D00); + render16b(startX,startY+16,48,96,0,0xFFC11D00); + render16b(startX+16,startY+16,64,96,0,0xFFC11D00); renderc (startX+8,startY+12,48,160,16,8,0);//Waves renderc (startX+8,startY+8,0,112,16,8,0);//Player (Top-Half) startX = 110;startY = 76; render16 (startX,startY,48,112,0);//Player renderc (startX+12,startY,40,160,8,16,0);//Slash render (startX+14,startY+4,152,144,0);//Pickaxe - render16b(startX+18,startY,80,0,0,0xDCC6AEFF);//Iron ore + render16b(startX+18,startY,80,0,0,0xFFAEC6DC);//Iron ore startX = 40;startY = 90; - render16b (startX,startY,128,112,0,0xADFFADFF);//Slime + render16b (startX,startY,128,112,0,0xFFADFFAD);//Slime render16 (startX+18,startY,48,112,1);//Player (Mirrored) renderc (startX+14,startY,32,160,8,16,0);//Slash render (startX+12,startY+4,104,144,1);//Sword startX = 64;startY = 40; - render16b(startX,startY,16,80,0,0x69B569FF);// grass pit - render16b(startX+16,startY,32,80,0,0x69B569FF); - render16b(startX,startY+16,48,80,0,0x69B569FF); - render16b(startX+16,startY+16,64,80,0,0x69B569FF); + render16b(startX,startY,16,80,0,0xFF69B569);// grass pit + render16b(startX+16,startY,32,80,0,0xFF69B569); + render16b(startX,startY+16,48,80,0,0xFF69B569); + render16b(startX+16,startY+16,64,80,0,0xFF69B569); render16 (startX+8,startY+4,0,16,0);//Tree render (startX+1,startY+14,80,152,0);// Apple render16 (startX+9,startY+18,16,112,0);//Player renderc (startX+9,startY+14,16,160,16,8,0);//Slash - drawTextColor("Play minicraft",24,24,0xFFFF7FFF); + drawTextColor("Play minicraft",24,24,0xFF7FFFFF); break; case 1: // "How To Play" startX = 72;startY = 54; @@ -1248,14 +1248,14 @@ void renderMenu(int menu,int xscr,int yscr){ render16(startX+16,startY,48,112,0);//Player render16(startX,startY,160,208,0);//C-PAD right - drawTextColor("Learn the basics",64,24,0xFFFF7FFF); + drawTextColor("Learn the basics",64,24,0xFF7FFFFF); break; case 2: // "Settings" - drawTextColor("Modify the game's feel",(320 - (22 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Modify the game's feel",(320 - (22 * 12))/2,24,0xFF7FFFFF); renderc(48,48,0,112,64,32,0); break; case 3: // "About" - drawTextColor("Who made this game?",(320 - (19 * 12))/2,24,0xFFFF7FFF); + drawTextColor("Who made this game?",(320 - (19 * 12))/2,24,0xFF7FFFFF); // Secret code ;) drawSizedText("497420776173206e6f746368",(320 - (24 * 8))/2,80,1); @@ -1271,8 +1271,8 @@ void renderMenu(int menu,int xscr,int yscr){ break; case 4: // "Exit" - drawTextColor("Exit to the homebrew menu",(320 - (25 * 12))/2,24,0xFFFF7FFF); - drawTextColor("(bye-bye)",(320 - (9 * 12))/2,100,0xFFFF7FFF); + drawTextColor("Exit to the homebrew menu",(320 - (25 * 12))/2,24,0xFF7FFFFF); + drawTextColor("(bye-bye)",(320 - (9 * 12))/2,100,0xFF7FFFFF); break; } sf2d_end_frame(); diff --git a/source/MenuTutorial.c b/source/MenuTutorial.c index dfb026d..f3a4c98 100644 --- a/source/MenuTutorial.c +++ b/source/MenuTutorial.c @@ -20,10 +20,10 @@ u32 biasedMenuXY(u32 in){ /** Oh my god, this was so damn tedious to make. */ void renderTutorialPage(bool topScreen){ if(topScreen){ - drawTextColor("How to Play",(400-11*12)/2,12,0xAFAF00FF); + drawTextColor("How to Play",(400-11*12)/2,12,0xFF00AFAF); switch(pageNum){ case 0: // Moving the character - drawTextColor("Movement",(400-8*12)/2,40,0xBF7F00FF); + drawTextColor("Movement",(400-8*12)/2,40,0xFF007FBF); drawText("Press to move up",92,90); renderButtonIcon(biasedCirclePad(k_up.input), 164, 88, 1); drawText("Press to move down",80,120); @@ -34,7 +34,7 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(biasedCirclePad(k_right.input), 146, 178, 1); break; case 1: // Attacking - drawTextColor("Attacking",(400-9*12)/2,40,0xBF7F00FF); + drawTextColor("Attacking",(400-9*12)/2,40,0xFF007FBF); drawText("Press to Attack",98,80); renderButtonIcon(k_attack.input & -k_attack.input, 168, 78, 1); drawText("Attack with an item to use it",26,120); @@ -44,7 +44,7 @@ void renderTutorialPage(bool topScreen){ drawText("Use the pickaxe to mine rock/ore",8,200); break; case 2: // Inventory - drawTextColor("Inventory",(400-9*12)/2,40,0xBF7F00FF); + drawTextColor("Inventory",(400-9*12)/2,40,0xFF007FBF); drawText("Press to open the menu",56,80); renderButtonIcon(biasedMenuXY(k_menu.input), 126, 78, 1); drawText("Press to scroll up",80,110); @@ -57,7 +57,7 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(k_decline.input & -k_decline.input, 120, 198, 1); break; case 3: // Furniture - drawTextColor("Furniture",(400-9*12)/2,40,0xBF7F00FF); + drawTextColor("Furniture",(400-9*12)/2,40,0xFF007FBF); drawText("Use furniture for item crafting",(400-31*12)/2,74); drawText("Press to open the menu",56,100); renderButtonIcon(biasedMenuXY(k_menu.input), 126, 98, 1); @@ -68,7 +68,7 @@ void renderTutorialPage(bool topScreen){ drawText("pick up furniture",(400-17*12)/2,200); break; case 4: // Crafting - drawTextColor("Crafting",(400-8*12)/2,40,0xBF7F00FF); + drawTextColor("Crafting",(400-8*12)/2,40,0xFF007FBF); drawText("Create new items and tools",(400-26*12)/2,74); drawText("Go up to a furniture item and",(400-29*12)/2,104); drawText("Press to open the menu",56,120); @@ -78,7 +78,7 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(k_accept.input & -k_accept.input, 210, 164, 1); break; case 5: // Farming - drawTextColor("Farming",(400-7*12)/2,40,0xBF7F00FF); + drawTextColor("Farming",(400-7*12)/2,40,0xFF007FBF); drawText("Grow wheat to make bread",(400-24*12)/2,74); drawText("Dig up grass to gather seeds",(400-28*12)/2,94); drawText("Use the hoe to till ground",(400-26*12)/2,114); @@ -87,7 +87,7 @@ void renderTutorialPage(bool topScreen){ drawText("It takes 4 wheat to craft bread",(400-31*12)/2,174); break; case 6: // Mining - drawTextColor("Mining",(400-6*12)/2,40,0xBF7F00FF); + drawTextColor("Mining",(400-6*12)/2,40,0xFF007FBF); drawText("Use a pickaxe tool for mining",(400-29*12)/2,74); drawText("Mine rocks for stone",(400-20*12)/2,94); drawText("Mine iron ore for iron",(400-22*12)/2,114); @@ -114,27 +114,27 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(k_attack.input & -k_attack.input, 80, 56, 2); renderc(60,68,16,160,16,8,2);//Slash - render16b(12,20,16,80,0,0x69B569FF);// grass pit - render16b(12+16,20,32,80,0,0x69B569FF); - render16b(12,20+16,48,80,0,0x69B569FF); - render16b(12+16,20+16,64,80,0,0x69B569FF); + render16b(12,20,16,80,0,0xFF69B569);// grass pit + render16b(12+16,20,32,80,0,0xFF69B569); + render16b(12,20+16,48,80,0,0xFF69B569); + render16b(12+16,20+16,64,80,0,0xFF69B569); render16(12+8,20+4,0,16,0);//Tree renderc(12+9,20+14,16,160,16,8,0);//Slash render(12+9+4,20+14,192,144,0);//Axe render16(12+9,20+18,16,112,0);//Player-up - render16b(122,62,16,80,0,0xF7F77BFF);// sand pit - render16b(122+16,62,32,80,0,0xF7F77BFF); - render16b(122,62+16,48,80,0,0xF7F77BFF); - render16b(122+16,62+16,64,80,0,0xF7F77BFF); - render16b(130,70,0,96,0,0x383838FF);// hole + render16b(122,62,16,80,0,0xFF7BF7F7);// sand pit + render16b(122+16,62,32,80,0,0xFF7BF7F7); + render16b(122,62+16,48,80,0,0xFF7BF7F7); + render16b(122+16,62+16,64,80,0,0xFF7BF7F7); + render16b(130,70,0,96,0,0xFF383838);// hole render16(116,70,48,112,0);//Player-right - renderb(136,76,16,152,0,0xAF9781FF);// Dirt item + renderb(136,76,16,152,0,0xFF8197AF);// Dirt item renderc(128,70,40,160,8,16,0);//Slash render(130,74,0,144,0);//Shovel break; case 2: // Inventory - renderFrame(4,4,17,11,0xAFFF); + renderFrame(4,4,17,11,0xFFAF); renderItemStuffWithText(ITEM_APPLE,5,false,80,78); renderItemStuffWithText(ITEM_SLIME,11,false,80,94); renderItemStuffWithText(TOOL_SWORD,4,true,80,110); @@ -147,7 +147,7 @@ void renderTutorialPage(bool topScreen){ renderButtonIcon(biasedCirclePad(k_down.input), 44, 125, 1); break; case 3: // Furniture - sf2d_draw_rectangle(64, 48, 192, 32, 0x69B569FF); + sf2d_draw_rectangle(64, 48, 192, 32, 0xFF69B569); renderc(32,24,64,128,96,16,0);//Furniture entities renderFurniture(ITEM_WORKBENCH, 50,60); @@ -159,9 +159,9 @@ void renderTutorialPage(bool topScreen){ render16(92,44,128,128,0);//Workbench break; case 4: // Crafting - renderFrame(11,3,19,6,0x1010FFFF); - renderFrame(11,7,19,12,0x1010FFFF); - renderFrame(1,3,10,12,0x1010FFFF); + renderFrame(11,3,19,6,0xFFFF1010); + renderFrame(11,7,19,12,0xFFFF1010); + renderFrame(1,3,10,12,0xFFFF1010); renderItemStuffWithText(TOOL_AXE,0,true,28,64); renderItemIcon(TOOL_AXE, 0, 94, 32); drawText("0", 206, 66); @@ -186,16 +186,16 @@ void renderTutorialPage(bool topScreen){ render(76,48,40,152,0); // Seeds sf2d_draw_rectangle(216, 80, 32, 32, dirtColor[1]); // Dirt color for grass - render16b(108, 40, 0, 80, 0, 0x69B569FF); // Grass + render16b(108, 40, 0, 80, 0, 0xFF69B569); // Grass render16(124, 40,144,0,0); // Farm Tile render16(108,54,16,112,0); // Player (Up) renderc(108,50,16,160,16,8,0); // Slash (Up) render(112,48,72,144,0); // Gem Hoe sf2d_draw_rectangle(112, 156, 32, 32, dirtColor[1]); // Dirt color for grass - render16b(56, 78, 0, 80, 0, 0x69B569FF); // Grass + render16b(56, 78, 0, 80, 0, 0xFF69B569); // Grass sf2d_draw_rectangle(80, 156, 32, 32, dirtColor[1]); // Dirt color - render16b(40, 78, 0, 0, 0, 0xA88F8FFF); // Dirt Dots + render16b(40, 78, 0, 0, 0, 0xFF8F8FA8); // Dirt Dots render(44, 82, 40,152,0); // Seeds render16(24,78,48,112,0); // Player (Right) @@ -212,11 +212,11 @@ void renderTutorialPage(bool topScreen){ render(132,82,72,152,0); // Bread break; case 6: //Mining - render16b(23,32,80,0,0,0xDFC8C8FF); // iron ore - render16b(23,52,80,0,0,0xE5E8B9FF); // gold ore - render16b(23,72,80,0,0,0xDF98DEFF); // gem ore - renderb(41,38,88,152,0,0xDFC8C8FF); // Iron ore item - renderb(41,58,88,152,0,0xE5E8B9FF); // Gold ore item + render16b(23,32,80,0,0,0xFFC8C8DF); // iron ore + render16b(23,52,80,0,0,0xFFB9E8E5); // gold ore + render16b(23,72,80,0,0,0xFFDE98DF); // gem ore + renderb(41,38,88,152,0,0xFFC8C8DF); // Iron ore item + renderb(41,58,88,152,0,0xFFB9E8E5); // Gold ore item render(41,78,112,152,0); // Gem item drawText(">",104,74); drawText(">",104,114); @@ -227,9 +227,9 @@ void renderTutorialPage(bool topScreen){ drawText(">",160,74); drawText(">",160,114); drawText(">",160,154); - renderb(88,36,96,152,0,0xDFC8C8FF); // Iron ingot item - renderb(88,56,96,152,0,0xE5E8B9FF); // Gold ingot item - renderb(88,76,152,144,0,0xE5E8B9FF); // Gem Pickaxe + renderb(88,36,96,152,0,0xFFC8C8DF); // Iron ingot item + renderb(88,56,96,152,0,0xFFB9E8E5); // Gold ingot item + renderb(88,76,152,144,0,0xFFB9E8E5); // Gem Pickaxe drawText(">",200,74); drawText(">",200,114); render16(106,32,64,128,0); // Anvil diff --git a/source/Render.c b/source/Render.c index 10394ea..463e982 100644 --- a/source/Render.c +++ b/source/Render.c @@ -538,8 +538,8 @@ void renderTile(int i, int x, int y) { | checkSurrTiles4(x >> 4, y >> 4, TILE_TREE) | checkSurrTiles4(x >> 4, y >> 4, TILE_FLOWER) | checkSurrTiles4(x >> 4, y >> 4, TILE_SAPLING_TREE); - render16b(x, y, grassTable[v], 80, 0, 0x69B569FF); - renderDotsWithColor(v, x, y, 0, 0x8ED38EFF); + render16b(x, y, grassTable[v], 80, 0, 0xFF69B569); + renderDotsWithColor(v, x, y, 0, 0xFF8ED38E); break; case TILE_TREE: render16(x, y, treeTable[checkSurrTiles8(x >> 4, y >> 4, TILE_TREE)], @@ -548,37 +548,37 @@ void renderTile(int i, int x, int y) { case TILE_ROCK: v = checkSurrTiles8(x >> 4, y >> 4, TILE_ROCK); render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFFFFF); - renderRockDotsWithColor(rockTable[v], x, y, 0x949494FF); + renderRockDotsWithColor(rockTable[v], x, y, 0xFF949494); break; case TILE_HARDROCK: v = checkSurrTiles8(x >> 4, y >> 4, TILE_HARDROCK); - render16s(x, y, rockTable[v] + 8192, 0, 0xCFCFFFFF); - renderRockDotsWithColor(rockTable[v], x, y, 0x9494FFFF); + render16s(x, y, rockTable[v] + 8192, 0, 0xFFFFCFCF); + renderRockDotsWithColor(rockTable[v], x, y, 0xFFFF9494); break; case TILE_DIRT: // render dots. if (currentLevel > 1) - render16b(x, y, 0, 0, 0, 0x383838FF); + render16b(x, y, 0, 0, 0, 0xFF383838); else - render16b(x, y, 0, 0, 0, 0xA88F8FFF); + render16b(x, y, 0, 0, 0, 0xFF8F8FA8); break; case TILE_SAND: v = checkSurrTiles4(x >> 4, y >> 4, TILE_SAND) | checkSurrTiles4(x >> 4, y >> 4, TILE_CACTUS) | checkSurrTiles4(x >> 4, y >> 4, TILE_SAPLING_CACTUS); - render16b(x, y, grassTable[v], 80, 0, 0xF7F77BFF); - renderDotsWithColor(v, x, y, 0, 0xB7B75BFF); + render16b(x, y, grassTable[v], 80, 0, 0xFF7BF7F7); + renderDotsWithColor(v, x, y, 0, 0xFF5BB7B7); break; case TILE_WATER: v = checkSurrTiles4(x >> 4, y >> 4, TILE_WATER) | checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE); - render16b(x, y, grassTable[v], 96, 0, 0x001DC1FF); + render16b(x, y, grassTable[v], 96, 0, 0xFFC11D00); srand((tickCount + (x / 2 - y) * 4311) / 10); - renderDotsWithColor(v, x, y, rand() & 3, 0x6B6BFFFF); + renderDotsWithColor(v, x, y, rand() & 3, 0xFFFF6B6B); break; case TILE_LAVA: v = checkSurrTiles4(x >> 4, y >> 4, TILE_LAVA) | checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE); - render16b(x, y, grassTable[v], 96, 0, 0xC11D00FF); + render16b(x, y, grassTable[v], 96, 0, 0xFF001DC1); srand((tickCount + (x / 2 - y) * 4311) / 10); renderDotsWithColor(v, x, y, rand() & 3, 0xFF6B6BFF); break; @@ -587,7 +587,7 @@ void renderTile(int i, int x, int y) { grassTable[checkSurrTiles4(x >> 4, y >> 4, TILE_HOLE) | checkSurrTiles4(x >> 4, y >> 4, TILE_WATER) | checkSurrTiles4(x >> 4, y >> 4, TILE_LAVA)], 96, 0, - 0x383838FF); + 0xFF383838); break; case TILE_CACTUS: render16(x, y, 48, 0, 0); @@ -604,13 +604,13 @@ void renderTile(int i, int x, int y) { render16(x, y, 112, 0, 0); break; case TILE_IRONORE: - render16b(x, y, 80, 0, 0, 0xDFC8C8FF); + render16b(x, y, 80, 0, 0, 0xFFC8C8DF); break; case TILE_GOLDORE: - render16b(x, y, 80, 0, 0, 0xE5E8B9FF); + render16b(x, y, 80, 0, 0, 0xFFB9E8E5); break; case TILE_GEMORE: - render16b(x, y, 80, 0, 0, 0xDF98DEFF); + render16b(x, y, 80, 0, 0, 0xFFDE98DF); break; case TILE_CLOUD: render16b(x, y, @@ -668,8 +668,8 @@ void renderZoomedMap() { drawText(mapText,224, 214); // "x2"/"x4"/"x6" render16(142, 2, 72, 208, 0); // Exit button renderc(126, 102, 40, 208, 32, 16, 0); // Plus/Minus zoom buttons - if(zoomLevel < 3) sf2d_draw_rectangle(258, 210, 26, 20, 0x4F4F4F7F); // gray out minus button - else if(zoomLevel > 5) sf2d_draw_rectangle(284, 210, 26, 20, 0x4F4F4F7F); // gray out minus button + if(zoomLevel < 3) sf2d_draw_rectangle(258, 210, 26, 20, 0x7F4F4F4F); // gray out minus button + else if(zoomLevel > 5) sf2d_draw_rectangle(284, 210, 26, 20, 0x7F4F4F4F); // gray out minus button } char scoreT[32]; @@ -778,7 +778,7 @@ void renderPlayer() { } void renderMenuBackground(int xScroll, int yScroll) { - sf2d_draw_rectangle(0, 0, 400, 240, RGBA8(12, 12, 12, 255)); //You might think "real" black would be better, but it actually looks better that way + sf2d_draw_rectangle(0, 0, 400, 240, 0xFF0C0C0C); //You might think "real" black would be better, but it actually looks better that way renderLightsToStencil(); renderBackground(xScroll, yScroll); resetStencilStuff(); @@ -788,7 +788,7 @@ void renderBackground(int xScroll, int yScroll) { if(currentLevel > 0) sf2d_draw_rectangle(0, 0, 400, 240, dirtColor[currentLevel]); // dirt color else { sf2d_draw_texture_part_scale(minimap[1], (-xScroll / 3) - 256, (-yScroll / 3) - 32, 0, 0, 128, 128, 12.5, 7.5); - sf2d_draw_rectangle(0, 0, 400, 240, 0xDFDFDFAF); + sf2d_draw_rectangle(0, 0, 400, 240, 0xAFDFDFDF); } int xo = xScroll >> 4; int yo = yScroll >> 4; @@ -1055,7 +1055,7 @@ void renderRecipes(RecipeManager * r, int xo, int yo, int x1, int y1, if (r->recipes[i + io].canCraft) col = 0xFFFFFFFF; else - col = 0x7F7F7FFF; + col = 0xFF7F7F7F; drawTextColor( getBasicItemName(r->recipes[i + io].itemResult, r->recipes[i + io].itemAmountLevel), x + 18, y + 2, @@ -1075,7 +1075,7 @@ void renderItemWithText(Item* item, int x, int y) { drawText(getItemName(item->id, item->countLevel), x + 18, y + 2); else drawTextColorSpecial(getItemName(item->id, item->countLevel), x + 18, - y + 2, 0xD2D2D2FF, 0xFFFFFFFF); + y + 2, 0xFFD2D2D2, 0xFFFFFFFF); } void renderItemStuffWithText(int itemID, int itemCL, bool onlyOne, int x, int y) { @@ -1084,7 +1084,7 @@ void renderItemStuffWithText(int itemID, int itemCL, bool onlyOne, int x, int y) drawText(getItemName(itemID, itemCL), x + 18, y + 2); else drawTextColorSpecial(getItemName(itemID, itemCL), x + 18, - y + 2, 0xD2D2D2FF, 0xFFFFFFFF); + y + 2, 0xFFD2D2D2, 0xFFFFFFFF); } /* For bottom screen */ @@ -1098,7 +1098,7 @@ void renderItemWithTextCentered(Item* item, int width, int y) { drawText(getItemName(item->id, item->countLevel), x + 18, y + 2); else drawTextColorSpecial(getItemName(item->id, item->countLevel), x + 18, - y + 2, 0xD2D2D2FF, 0xFFFFFFFF); + y + 2, 0xFFD2D2D2, 0xFFFFFFFF); } void renderItemIcon2(int itemID, int countLevel, int x, int y, int z) { @@ -1256,13 +1256,13 @@ void renderItemIcon(int itemID, int countLevel, int x, int y) { render(x, y, 8, 152, 0); break; case ITEM_STONE: - renderb(x, y, 16, 152, 0, 0xCFCFCFFF); + renderb(x, y, 16, 152, 0, 0xFFCFCFCF); break; case ITEM_SAND: - renderb(x, y, 16, 152, 0, 0xF7F77BFF); + renderb(x, y, 16, 152, 0, 0xFF7BF7F7); break; case ITEM_DIRT: - renderb(x, y, 16, 152, 0, 0xAF9781FF); + renderb(x, y, 16, 152, 0, 0xFF8197AF); break; case ITEM_CLOUD: renderb(x, y, 16, 152, 0, 0xFFFFFFFF); @@ -1289,22 +1289,22 @@ void renderItemIcon(int itemID, int countLevel, int x, int y) { render(x, y, 80, 152, 0); break; case ITEM_SLIME: - renderb(x, y, 88, 152, 0, 0x4DC04DFF); + renderb(x, y, 88, 152, 0, 0xFF4DC04D); break; case ITEM_COAL: - renderb(x, y, 88, 152, 0, 0x383838FF); + renderb(x, y, 88, 152, 0, 0xFF383838); break; case ITEM_IRONORE: - renderb(x, y, 88, 152, 0, 0xBC9999FF); + renderb(x, y, 88, 152, 0, 0xFF9999BC); break; case ITEM_GOLDORE: - renderb(x, y, 88, 152, 0, 0xCECE77FF); + renderb(x, y, 88, 152, 0, 0xFF77CECE); break; case ITEM_IRONINGOT: - renderb(x, y, 96, 152, 0, 0xDFC8C8FF); + renderb(x, y, 96, 152, 0, 0xFFC8C8DF); break; case ITEM_GOLDINGOT: - renderb(x, y, 96, 152, 0, 0xEAEABCFF); + renderb(x, y, 96, 152, 0, 0xFFBCEAEA); break; case ITEM_GLASS: render(x, y, 104, 152, 0); diff --git a/source/SaveLoad.c b/source/SaveLoad.c index a8664f6..37e5536 100644 --- a/source/SaveLoad.c +++ b/source/SaveLoad.c @@ -188,10 +188,10 @@ int loadWorld(char * filename, EntityManager * eManager, Entity * player, u8 * m eManager->entities[i][j].yr = 3; eManager->entities[i][j].canPass = false; switch(eManager->entities[i][j].slime.lvl){ - case 2: eManager->entities[i][j].slime.color = 0xCC8282FF; break; - case 3: eManager->entities[i][j].slime.color = 0xEFEFEFFF; break; - case 4: eManager->entities[i][j].slime.color = 0x6262AAFF; break; - default: eManager->entities[i][j].slime.color = 0x95DB95FF; break; + case 2: eManager->entities[i][j].slime.color = 0xFF8282CC; break; + case 3: eManager->entities[i][j].slime.color = 0xFFEFEFEF; break; + case 4: eManager->entities[i][j].slime.color = 0xFFAA6262; break; + default: eManager->entities[i][j].slime.color = 0xFF95DB95; break; } break; case ENTITY_ZOMBIE: @@ -206,10 +206,10 @@ int loadWorld(char * filename, EntityManager * eManager, Entity * player, u8 * m eManager->entities[i][j].yr = 3; eManager->entities[i][j].canPass = false; switch(eManager->entities[i][j].zombie.lvl){ - case 2: eManager->entities[i][j].zombie.color = 0xCC8282FF; break; - case 3: eManager->entities[i][j].zombie.color = 0xEFEFEFFF; break; - case 4: eManager->entities[i][j].zombie.color = 0x6262AAFF; break; - default: eManager->entities[i][j].zombie.color = 0x95DB95FF; break; + case 2: eManager->entities[i][j].zombie.color = 0xFF8282CC; break; + case 3: eManager->entities[i][j].zombie.color = 0xFFEFEFEF; break; + case 4: eManager->entities[i][j].zombie.color = 0xFFAA6262; break; + default: eManager->entities[i][j].zombie.color = 0xFF95DB95; break; } break; case ENTITY_ITEM: diff --git a/source/main.c b/source/main.c index 56b1b43..e321f87 100644 --- a/source/main.c +++ b/source/main.c @@ -46,65 +46,7 @@ void initMiniMap(bool loadUpWorld) { } /* Minimaps */ - switch (map[i][x + y * 128]) { - case TILE_WATER: - sf2d_set_pixel(minimap[i], x, y, 0xFFFF0000); - break; - case TILE_LAVA: - sf2d_set_pixel(minimap[i], x, y, 0xFF0000FF); - break; - case TILE_DIRT: - sf2d_set_pixel(minimap[i], x, y, 0xFF6C6D82); - break; - case TILE_ROCK: - sf2d_set_pixel(minimap[i], x, y, 0xFF7F7F7F); - break; - case TILE_HARDROCK: - sf2d_set_pixel(minimap[i], x, y, 0xFF7F5F5F); - break; - case TILE_GRASS: - sf2d_set_pixel(minimap[i], x, y, 0xFF00FF00); - break; - case TILE_TREE: - sf2d_set_pixel(minimap[i], x, y, 0xFF007F00); - break; - case TILE_SAND: - sf2d_set_pixel(minimap[i], x, y, 0xFF00FFFF); - break; - case TILE_CACTUS: - sf2d_set_pixel(minimap[i], x, y, 0xFF009F00); - break; - case TILE_FLOWER: - sf2d_set_pixel(minimap[i], x, y, 0xFF00FF3F); - break; - case TILE_IRONORE: - sf2d_set_pixel(minimap[i], x, y, 0xFF9696DC); - break; - case TILE_GOLDORE: - sf2d_set_pixel(minimap[i], x, y, 0xFF9AE8E5); - break; - case TILE_GEMORE: - sf2d_set_pixel(minimap[i], x, y, 0xFFDE98DF); - break; - case TILE_CLOUD: - sf2d_set_pixel(minimap[i], x, y, 0xFFFFFFFF); - break; - case TILE_CLOUDCACTUS: - sf2d_set_pixel(minimap[i], x, y, 0xFFAFAFAF); - break; - case TILE_STAIRS_DOWN: - sf2d_set_pixel(minimap[i], x, y, 0xFF9F9F9F); - break; - case TILE_STAIRS_UP: - sf2d_set_pixel(minimap[i], x, y, 0xFF9F9F9F); - break; - case 255: - sf2d_set_pixel(minimap[i], x, y, 0xFF007F00); - break; - default: - sf2d_set_pixel(minimap[i], x, y, 0xFF111111); - break; - } + sf2d_set_pixel(minimap[i], x, y, getTileColor(map[i][x + y * 128])); } } } @@ -198,7 +140,7 @@ void tick() { void clearScreen(int* data, u8 fill, int size) { int i; for (i = 0; i < size / 4; ++i) - data[i] = 0x000000FF; + data[i] = 0xFF000000; } char debugText[34];