Merge branch 'develop' of github.com:Malkierian/Shipwright into reindeer-games

2025-12-03 09:14:56 -07:00
parent 42c995700a 9401d4fd71
commit e3029a834b
66 changed files with 977 additions and 473 deletions
--- a/soh/include/z64save.h
+++ b/soh/include/z64save.h
@@ -9,6 +9,10 @@
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/Enhancements/boss-rush/BossRush.h"

+#define FULL_HEART_HEALTH 0x10
+#define STARTING_HEALTH (3 * FULL_HEART_HEALTH)
+#define MAX_HEALTH (20 * FULL_HEART_HEALTH)
+
 typedef enum {
    /* 0x0 */ MAGIC_STATE_IDLE, // Regular gameplay
    /* 0x1 */ MAGIC_STATE_CONSUME_SETUP, // Sets the speed at which magic border flashes