map: uncovering now works based entierly on the view range

diff --git a/assets b/assets
index 29e2314c3eb913a6fd39600662306cdf1ebca3f5..b47e4f809f809de27f2e55f9660ad03dabb8f2be 160000 (submodule)
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 29e2314c3eb913a6fd39600662306cdf1ebca3f5
+Subproject commit b47e4f809f809de27f2e55f9660ad03dabb8f2be

diff --git a/maps/l1.inc b/maps/l1.inc
index 6411427d307bd1d15f237a6bd50984974def49b2..4bb89bc327cce94a79d5d595232c5bd7ae0270ce 100644 (file)
--- a/maps/l1.inc
+++ b/maps/l1.inc
@@ -13,7 +13,7 @@
 .db 0x0, 0x3, 0x1, 0x3, 0x0, 0x0, 0x0, 0x3, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x3, 0x0, 0x0, 0x0, 0x3
 .db 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x0, 0x0, 0x0, 0x3, 0x3, 0x3, 0x2, 0x3, 0x3, 0x3, 0x0, 0x3, 0x2, 0x3, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x0, 0x0, 0x0, 0x3, 0x3, 0x3, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2, 0x3, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x1, 0x1, 0x1
 .db 0x1, 0x3, 0x1, 0x1, 0x1, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x3, 0x3, 0x3, 0x1, 0x3, 0x1, 0x3, 0x3, 0x1, 0x3, 0x0
@@ -23,8 +23,8 @@
 .db 0x1, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x2, 0x3, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
-.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0
+.db 0x0, 0x0, 0x0, 0x3, 0x1, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+.db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x3, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x3, 0x3, 0x2, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0
 .db 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x1

diff --git a/src/actor.s b/src/actor.s
index 6b4bb17cecce758fa9b44ab2b2af42f316ecd455..736ca78dd470d3dd883b0556c7e8fe6cf69120c0 100644 (file)
--- a/src/actor.s
+++ b/src/actor.s
@@ -178,7 +178,7 @@ act_d_bat:
        ld [hl+], a
 
        ; flags
-       xor a, a
+       ld a, OAM_FPRIO
        ld [hl], a
        
        ret

diff --git a/src/map.s b/src/map.s
index fe6da9951dc625c0fd9fe1d5878d6ddf37484e10..0ee3ffc77ef0b879a892ead6a59ff2a61dd0d70a 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -281,7 +281,7 @@ map_set_visible_row:
                
                ; hl = tile
                ld a, [hl]
-               or a, TF0_VISIBLE
+               or a, TF0_VISIBLE | TF0_UNCOVERED
                ld [hl], a
 
 @skip:

diff --git a/src/player.s b/src/player.s
index 7855fc8019e369cfd39fedb122f3858fb100eaf7..17b98b9d26679d67b2f1053dc1f0f00e41246eaa 100644 (file)
--- a/src/player.s
+++ b/src/player.s
@@ -58,23 +58,8 @@ player_update:
        ld de, player
 
        call player_handle_move
-       
-       ; check if player is currently in uncovered tile
-       ld a, [player+act_pos_y]
-       ld b, a
-       ld a, [player+act_pos_x]
-       ld c, a
-       call map_get_tile
-       inc hl ; hl = flags
-       ld a, [hl]
-       and a, TF0_UNCOVERED
-       jp z, @need_to_uncover
 
        ret
-@need_to_uncover:
-       call map_uncover_player
-       call map_full_draw 
-       ret
 
        ; draws player
 player_draw:
@@ -213,11 +198,6 @@ player_collided:
        xor a, a
        ld [hl], a
        
-       ld a, [col_y]
-       ld b, a
-       ld a, [col_x]
-       ld c, a
-       call map_uncover
        call map_full_draw
        call player_end_turn
        ret