From: Lukas Krickl <lukas@krickl.dev>
Date: Sat, 28 Dec 2024 09:14:56 +0000 (+0100)
Subject: WIP: Added placeholders for map generator
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=87b31d03e5b7ab4504fb89c4c3dc18f964d4c107;p=gbrg%2F.git

WIP: Added placeholders for map generator
---

diff --git a/src/main.s b/src/main.s
index d4ea2a2..c774c97 100644
--- 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 2977303..d9e5a81 100644
--- 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 7d83b89..e0ff943 100644
--- 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 fc66033..a825b54 100644
--- 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 a81f6bd..c26fc19 100644
--- 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