ui: hpmax is now a variable.

This will have to be set by hard mode.

diff --git a/src/defs.s b/src/defs.s
index 260da4db7d203da7d06e48048de72607ff713998..9a6f0fc7df4cc625166972637e73f057a7b357e6 100644 (file)
--- a/src/defs.s
+++ b/src/defs.s
@@ -21,7 +21,7 @@
 #define HP_MAX 20
 
 #define MAP_OBJ_MAX 32
-#define RECT_MAX 4
+#define RECT_MAX 6
 
 #define MAP_ROW_H 16 ; pixels per row
 

diff --git a/src/player.s b/src/player.s
index 353c77a4ff8d8875a104438c9284b3f68b0a39fe..31325b0b3d750b4f6e6b1619d6509893e708673c 100644 (file)
--- a/src/player.s
+++ b/src/player.s
@@ -13,7 +13,7 @@ player_init:
        ld a, 0x30 ; initial next scroll
        ld [player_next_scroll_y], a
 
-       ld a, HP_MAX
+       ld a, [player_hp_max]
        ld [player+act_hp], a
        ret
        

diff --git a/src/update.s b/src/update.s
index 16368502188a8ec7da3683a5169671b758598721..202ba622fe32f474acc3ff0219997c6a4cb3b406 100644 (file)
--- a/src/update.s
+++ b/src/update.s
@@ -43,6 +43,10 @@ update_anim_timer:
        ret
 
 new_game:
+       ; TODO: handle hard mode
+       ld a, HP_MAX
+       ld [player_hp_max], a
+
        ld de, l_main_menu
        call map_load
 

diff --git a/src/wram.s b/src/wram.s
index a3aa92b72f24aff6e036865b05c216404bd6ae2b..aa3f9efc09d178feff10b12648ba4886f205994a 100644 (file)
--- a/src/wram.s
+++ b/src/wram.s
@@ -68,7 +68,8 @@ srand: .adv 2
        ; if player y < next_scroll
        ; advance if possible
 player_next_scroll_y: .adv 1
-       
+
+player_hp_max: .adv 1
 player_shoot_delay: .adv 1
 
 ; y/x sub pixel movement for player