Add restart menu

Author: binji

ref/inv.py

@@ -1,22 +1,25 @@
 import math
 
-speed = 6
-y = 40
-desty = 128
-a = []
+def output(name, a):
+  s = ', '.join(map(str, a[::-1]))
+  print(f"const u8 {name}[] = {{{s}}};")
 
-while desty - y > 1:
-  y += (desty - y) / speed
-  a.append(math.ceil(y))
+def down(speed, y, desty, a=None):
+  if a is None: a = []
+  while desty - y > 1:
+    y += (desty - y) / speed
+    a.append(math.ceil(y))
+  return a
 
-print(f"#{len(a)} {a[::-1]}")
+def up(speed, y, desty, a=None):
+  if a is None: a = []
+  while y - desty > 1:
+    y -= (y - desty) / speed
+    a.append(math.floor(y))
+  return a
 
-y = 128
-desty = 40
-a = []
+output('inventory_up_y', up(6, 128, 40))
+output('inventory_down_y', down(6, 40, 128))
 
-while y - desty > 1:
-  y -= (y - desty) / speed
-  a.append(math.floor(y))
-
-print(f"#{len(a)} {a[::-1]}")
+output('restart_menu_up_y', up(5, 144, 60, down(5, 128, 144)))
+output('restart_menu_down_y', up(5, 144, 128, down(5, 60, 144)))

src/bank0.c

@@ -542,7 +542,14 @@ const u8 inventory_map[] = {
     116, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   118,
     116, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   118,
     116, 0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   118,
-    123, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 125};
+    123, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 125,
+};
+
+const u8 restart_menu_map[] = {
+    112, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, 115,
+    116, 0,   204, 203, 205, 213, 0,   220, 207, 221, 222, 203, 220, 222, 0,   118,
+    123, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 124, 125,
+};
 
 const u8 blind_map[] = {204, 214, 211, 216, 206};
 
@@ -554,6 +561,16 @@ const u8 inventory_down_y[] = {128, 127, 127, 127, 127, 126, 126, 125, 125,
                                124, 123, 122, 120, 119, 117, 114, 111, 108,
                                104, 99,  93,  86,  78,  67,  55};
 
+const u8 restart_menu_up_y[] = {60,  61,  61,  61,  62,  62,  63,  64,  65,
+                                67,  69,  71,  74,  77,  82,  87,  94,  103,
+                                113, 127, 144, 143, 143, 143, 142, 142, 141,
+                                140, 139, 138, 136, 134, 132};
+
+const u8 restart_menu_down_y[] = {128, 129, 129, 129, 130, 130, 131, 132, 133,
+                                  134, 136, 138, 140, 144, 143, 143, 143, 142,
+                                  142, 141, 140, 139, 137, 135, 133, 130, 127,
+                                  122, 117, 110, 101, 91,  77};
+
 const u8 msg_tiles[] = {
   // "wurstlord awakens"
   0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,

src/gameplay.c

@@ -221,13 +221,16 @@ void gameplay_update(void) NONBANKED {
   }
 
   inv_animate();
+  restart_menu_animate();
   animate_end();
   pal_update();
 }
 
 void do_turn(void) {
   if (inv_anim_up) {
     inv_update();
+  } else if (restart_menu_up) {
+    restart_menu_update();
   } else if (turn == TURN_PLAYER) {
     move_player();
   }
@@ -388,6 +391,9 @@ void move_player(void) {
     } else if (joy_action & J_A) {
       inv_open();
       sfx(SFX_OK);
+    } else if (newjoy & J_START) {
+      restart_menu_open();
+      sfx(SFX_OK);
     }
     joy_action = 0;
   }

src/inventory.c

@@ -7,6 +7,7 @@
 #include "gameplay.h"
 #include "joy.h"
 #include "mob.h"
+#include "palette.h"
 #include "pickup.h"
 #include "sound.h"
 #include "sprite.h"
@@ -30,6 +31,13 @@
 #define INV_SELECT_X_OFFSET 32
 #define INV_SELECT_Y_OFFSET 40
 
+#define RESTART_MENU_WIDTH 16
+#define RESTART_MENU_HEIGHT 3
+#define RESTART_MENU_Y (32 - RESTART_MENU_HEIGHT - 8)
+#define RESTART_MENU_SELECT_X_OFFSET 32
+#define RESTART_MENU_SELECT_Y_OFFSET 24
+#define RESTART_MENU_ANIM_FRAMES 33
+
 #define INV_FLOOR_OFFSET 23      /* offset into inventory_map */
 #define INV_BLANK_ROW_OFFSET 49  /* offset into inventory_map */
 #define INV_BLIND_LEN 5          /* BLIND */
@@ -40,9 +48,12 @@
 #define TILE_0 0xe5
 
 extern const u8 inventory_map[];
+extern const u8 restart_menu_map[];
 
 extern const u8 inventory_up_y[];
 extern const u8 inventory_down_y[];
+extern const u8 restart_menu_up_y[];
+extern const u8 restart_menu_down_y[];
 
 extern const u8 pick_type_name_tile[];
 extern const u8 pick_type_name_start[];
@@ -64,6 +75,10 @@ PickupType inv_selected_pick;
 u8 equip_type[MAX_EQUIPS];
 u8 equip_charge[MAX_EQUIPS];
 
+u8 restart_menu_up;
+u8 restart_menu_anim_timer;
+u8 restart_menu_select;
+
 void inv_init(void) {
   inv_select_timer = INV_SELECT_FRAMES;
   inv_selected_pick = PICKUP_TYPE_NONE;
@@ -169,6 +184,81 @@ void inv_animate(void) {
   }
 }
 
+void restart_menu_update(void) {
+  if (!restart_menu_anim_timer) {
+    if (joy_action & (J_LEFT | J_RIGHT)) {
+      restart_menu_select ^= 1;
+      sfx(SFX_SELECT);
+    }
+    if (newjoy & J_B) {
+      restart_menu_close();
+      sfx(SFX_BACK);
+    } else if (joy_action & J_A) {
+      if (restart_menu_select) {
+        restart_menu_up = 0;
+        restart_menu_select = 0;
+        // restart game
+        doloadfloor = 1;
+        pal_fadeout();
+        music_main();
+        gameplay_init();
+      } else {
+        restart_menu_close();
+        sfx(SFX_BACK);
+      }
+    }
+    joy_action = 0;
+  }
+}
+
+void restart_menu_animate(void) {
+  if (restart_menu_anim_timer) {
+    --restart_menu_anim_timer;
+    if (restart_menu_up) {
+      WY_REG = restart_menu_up_y[restart_menu_anim_timer];
+      if (restart_menu_anim_timer == 20) {
+        vmemcpy((u8 *)0x9da0, (u8 *)0x9c00, 0x20 * 18);
+        set_win_tiles(0, 0, RESTART_MENU_WIDTH, RESTART_MENU_HEIGHT,
+                      restart_menu_map);
+#ifdef CGB_SUPPORT
+        if (_cpu == CGB_TYPE) {
+          VBK_REG = 1;
+          vmemcpy((u8 *)0x9da0, (u8 *)0x9c00, 0x20 * 18);
+          fill_win_rect(0, 0, RESTART_MENU_WIDTH, RESTART_MENU_HEIGHT, 3);
+          VBK_REG = 0;
+        }
+#endif
+        vmemset((u8 *)0x9c60, 0, 0x20 * 8);
+      }
+    } else {
+      WY_REG = restart_menu_down_y[restart_menu_anim_timer];
+      if (restart_menu_anim_timer == 13) {
+        vmemcpy((u8 *)0x9c00, (u8 *)0x9da0, 0x20 * 18);
+#ifdef CGB_SUPPORT
+        if (_cpu == CGB_TYPE) {
+          VBK_REG = 1;
+          vmemcpy((u8 *)0x9c00, (u8 *)0x9da0, 0x20 * 18);
+          VBK_REG = 0;
+        }
+#endif
+      }
+    }
+  }
+
+  if (restart_menu_anim_timer || restart_menu_up) {
+    if (--inv_select_timer == 0) {
+      inv_select_timer = INV_SELECT_FRAMES;
+      ++inv_select_frame;
+    }
+    *next_sprite++ = WY_REG + RESTART_MENU_SELECT_Y_OFFSET;
+    *next_sprite++ = RESTART_MENU_SELECT_X_OFFSET +
+                     pickbounce[inv_select_frame & 7] +
+                     (restart_menu_select ? 40 : 0);
+    *next_sprite++ = 0;
+    *next_sprite++ = 0;
+  }
+}
+
 void inv_display_blind(void) {
   vram_copy(INV_FLOOR_ADDR, blind_map, INV_BLIND_LEN);
   counter_thirty(&st_recover);
@@ -207,6 +297,16 @@ void inv_close(void) {
   inv_anim_up = 0;
 }
 
+void restart_menu_open(void) {
+  restart_menu_anim_timer = RESTART_MENU_ANIM_FRAMES;
+  restart_menu_up = 1;
+}
+
+void restart_menu_close(void) {
+  restart_menu_anim_timer = RESTART_MENU_ANIM_FRAMES;
+  restart_menu_up = 0;
+}
+
 u8 inv_acquire_pickup(PickupType ptype) {
   u8 i, len = pick_type_name_len[ptype];
   u16 equip_addr;

src/inventory.h

@@ -13,6 +13,8 @@
 void inv_init(void);
 void inv_update(void);
 void inv_animate(void);
+void restart_menu_update(void);
+void restart_menu_animate(void);
 
 void inv_display_blind();
 void inv_display_floor();
@@ -22,11 +24,14 @@ void inv_update_keys(void);
 
 void inv_open(void);
 void inv_close(void);
+void restart_menu_open(void);
+void restart_menu_close(void);
 
 u8 inv_acquire_pickup(PickupType ptype);
 void inv_use_pickup(void);
 
 extern u8 inv_anim_up;
 extern u8 inv_anim_timer;
+extern u8 restart_menu_up;
 
 #endif // INVENTORY_H_