mapgen: the generated map is now loaded

All tiles are now walls by default.

diff --git a/src/mapgen.s b/src/mapgen.s
index 13763dee4f6e904b49cb06ab8e70f62d10958963..7fbf8c694a55f68738496b3304c8efe53f5f474c 100644 (file)
--- a/src/mapgen.s
+++ b/src/mapgen.s
@@ -4,8 +4,8 @@
        ; writes map to map buffer and mapgen_header
        ; writes tiles to mapgen_tiles
 map_generate:
-       ; clear the map
-       ld d, TT_WALL
+       ; clear the map with wall tiles
+       ld d, 0
        ld hl, mapgen_tiles
        ld bc, MAP_TILES
        call memset

diff --git a/src/update.s b/src/update.s
index 11210a8dab829bcacb15d5adebe6e10abae31f78..fa2969bc818fe4e54b3eaade9b07cf3a05ab443e 100644 (file)
--- a/src/update.s
+++ b/src/update.s
@@ -162,7 +162,7 @@ new_game:
        call map_generate
 
        call player_init
-       ld de, l1
+       ld de, mapgen_map_header
        call map_load
 
        ld hl, update_game

diff --git a/src/wram.s b/src/wram.s
index 6741772ab05d25270ea9368d297b70b93998bd73..376d05a3356ae999bde98b816fcda1e79efc74b9 100644 (file)
--- a/src/wram.s
+++ b/src/wram.s
@@ -134,8 +134,6 @@ mapgen_game_seed: .adv 2
        ;               - possible actors that may spawn
 mapgen_floor: .adv 1
        
-       ; generated map header
-mapgen_map_header: .adv map_header_size
        
        ; collision related data
        ; y/x positions
@@ -172,6 +170,8 @@ map_mark_flag: .adv 1
 render_canary: .adv 4
 #endif
 
+; generated map header
+mapgen_map_header: .adv map_header_size
 ; mapgen tile memory
 mapgen_tiles: .adv MAP_TILES