WIP: Added placeholders for map generator

diff --git a/src/main.s b/src/main.s
index d4ea2a29772ecb9156efd5843d23fd239238a391..c774c973ac4615cec0bda9504ff30ac27ec8a3df 100644 (file)
--- a/src/main.s
+++ b/src/main.s
@@ -20,7 +20,6 @@ entry:
   call lcd_off
   call video_init
   call audio_init
-  call rand_init
   call lcd_on
   call vblank_wait
   

diff --git a/src/map.s b/src/map.s
index 2977303d32db7088fa26e80f1e0786923044673f..d9e5a81b4e3cf8510e85a258ac60318b6c9ef21e 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -460,6 +460,18 @@ room_get_flag_masked:
   and a, d
   ret
 
+  ; generate a new map 
+  ; replaces the current map
+  ; inputs:
+  ;   srand
+  ; returns:
+  ;   a new map
+  ;   sets the current room
+  ;   sets player position 
+map_generate:
+  ; TODO: this is placeholder mapgen
+  ret
+
   ; base room 
   ; this can be copied and modified 
   ; by the map gen

diff --git a/src/mapram.s b/src/mapram.s
index 7d83b89277096ffa22153b0672061b09869223c2..e0ff943b8e0cbb7bd060bc95be49106c7c0eea79 100644 (file)
--- a/src/mapram.s
+++ b/src/mapram.s
@@ -3,6 +3,7 @@
   ; this RAM bank stores the current map 
 .org MAPRAM
 
+  ; first map 
 map0: .adv roomb_size * ROOMS_TOTAL
-
+map0_end:
 

diff --git a/src/mem.s b/src/mem.s
index fc66033e53e7c340ccffa928695130b2bcedaa9c..a825b54f4b8964071d2894705a431ebd404fa63e 100644 (file)
--- a/src/mem.s
+++ b/src/mem.s
@@ -4,6 +4,8 @@ mem_init:
   ld hl, WRAM
   ld bc, WRAMLEN
   call memset
+  
+  call rand_init
 
   ; copy shadow oam dma function 
   ld de, shadow_oam_to_oam 

diff --git a/src/video.s b/src/video.s
index a81f6bd57846afcc2c88eae15abe33b640d2a933..c26fc1933aa288fa933d78567984ed225abe0131 100644 (file)
--- a/src/video.s
+++ b/src/video.s
@@ -97,6 +97,8 @@ video_init:
   ld d, EMPTY_TILE
   call memset
 
+  ; generate test map
+  call map_generate
 
   ; initial test map
   ld de, base_room_struct