fix item pickup and prepare to clear tech debt

splch · May 24, 2022 · 0ffadc1 · 0ffadc1
1 parent 19b6389
commit 0ffadc1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 10 deletions.
diff --git a/build/duck/Pirates Folly.duck b/build/duck/Pirates Folly.duck
diff --git a/build/gb/Pirates Folly.gb b/build/gb/Pirates Folly.gb
diff --git a/build/gbc/Pirates Folly.gbc b/build/gbc/Pirates Folly.gbc
diff --git a/build/pocket/Pirates Folly.pocket b/build/pocket/Pirates Folly.pocket
diff --git a/src/main.h b/src/main.h
@@ -16,9 +16,9 @@
 #define SCREEN_WIDTH DEVICE_SCREEN_WIDTH / 2 // metatiles are 16x16
 #define SCREEN_HEIGHT DEVICE_SCREEN_HEIGHT / 2
 #define CENTER_X SCREEN_WIDTH / 2
-#define CENTER_Y SCREEN_HEIGHT / 2 + 1
-#define CENTER_X_PX SCREEN_WIDTH * 8 + 8  // 8 pixels per tile, move right 8 pixels
-#define CENTER_Y_PX SCREEN_HEIGHT * 8 + 8 // move down 8 pixels
+#define CENTER_Y SCREEN_HEIGHT / 2 + 2
+#define CENTER_X_PX SCREEN_WIDTH * 8 - 8  // 8 pixels per tile, move right 8 pixels
+#define CENTER_Y_PX SCREEN_HEIGHT * 8 + 8 // move up 8 pixels
 // ----------------- //
 
 #define bool uint8_t

diff --git a/src/map.c b/src/map.c
@@ -46,18 +46,13 @@ uint8_t generate_item(uint8_t x, uint8_t y)
 bool is_removed(const uint8_t x, const uint8_t y)
 {
   // returns true if item has been picked up at (x, y)
-  printf("%u, %u\n", x + 1, arr_4kb[x + 1]);
-  waitpad(0b11111111);
-  return arr_4kb[x + 1] == y + 2;
+  return arr_4kb[x] == y - 4;
 }
 
 void remove_item(const uint8_t x, const uint8_t y)
 {
   // item has been picked up at (x, y)
-  printf("%u, %u\n", x + 1, y + 2);
-  delay(1000);
-  waitpad(0b11111111);
-  arr_4kb[x + 1] = y + 2;
+  arr_4kb[x] = y;
 }
 
 void shift_array_right()