images

SheepWizard · Aug 17, 2024 · 7780c79 · 7780c79
1 parent 08fc0b9
commit 7780c79
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/assets/cell_flag.png b/assets/cell_flag.png
diff --git a/assets/cursor.png b/assets/cursor.png
diff --git a/make_assets.sh b/make_assets.sh
@@ -38,6 +38,5 @@ grit $ASSETS/smiley_win.png -gb -gB16
 grit $ASSETS/title_screen.png -gb -gB16
 grit $ASSETS/title_screen2.png -gb -gB16
 grit $ASSETS/menu_screen.png -gb -gB16
-grit $ASSETS/cursor.png -gb -gB16
 grit $ASSETS/game_background.png -gb -gB16
 grit $ASSETS/highscore_screen.png -gb -gB16
diff --git a/source/views/menuView/menuView.c b/source/views/menuView/menuView.c
@@ -13,17 +13,9 @@ static void update_menu_selector(const int previousPosition)
   }
 
   yOffset = (SELECTOR_GAP * selectorPosition) + SELECTOR_Y_OFFSET;
-  int x, y;
-  for (y = 0; y < SELECTOR_SIZE; y++)
+  for (i = 0; i < SELECTOR_SIZE; i++)
   {
-    for (x = 0; x < SELECTOR_SIZE; x++)
-    {
-      if (cursorBitmap[y * (SELECTOR_SIZE / 2) + (x / 2)] == 0x00000000)
-      {
-        continue;
-      }
-      memcpy(&vid_mem[(y + yOffset) * M3_WIDTH + (SELECTOR_X_OFFSET + x)], &cursorBitmap[y * (SELECTOR_SIZE / 2) + (x / 2)], 2);
-    }
+    memcpy(&vid_mem[(i + yOffset) * M3_WIDTH + SELECTOR_X_OFFSET], &smiley_playBitmap[i * (SELECTOR_SIZE / 2)], SELECTOR_SIZE * 2);
   }
 }
 

diff --git a/source/views/menuView/menuView.h b/source/views/menuView/menuView.h
@@ -1,15 +1,15 @@
 #pragma once
 #include "tonc.h"
 #include "../../assets/menu_screen.h"
-#include "../../assets/cursor.h"
+#include "../../assets/smiley_play.h"
 #include "../../view.h"
 #include "../gameView/gameView.h"
 #include <string.h>
 
 static const int SELECTOR_SIZE = 16;
 static const int SELECTOR_GAP = 25;
-static const int SELECTOR_X_OFFSET = 12;
-static const int SELECTOR_Y_OFFSET = 45;
+static const int SELECTOR_X_OFFSET = 16;
+static const int SELECTOR_Y_OFFSET = 50;
 static const int MAX_SELECTOR_POSITION = 3;
 
 void init_menu_view();