Renamed room_struct to room_header

diff --git a/maps/base_room.s b/maps/base_room.s
index 56d34664d4f01f9f1da196c29ae65098a323c03e..028afbf8e7415ae1dc6a2493316d4639efe18117 100644 (file)
--- a/maps/base_room.s
+++ b/maps/base_room.s
@@ -1,5 +1,5 @@
  ; struct for  base_room
-base_room_struct:
+base_room_header:
 dw base_room_bg
 dw base_room_flags
 dw base_room_actors

diff --git a/maps/base_room2.s b/maps/base_room2.s
index 6adb9de95d52689bdf8e98c49d79619b2a93376d..4a14eec51016b1a1da3d357b129c36485218a564 100644 (file)
--- a/maps/base_room2.s
+++ b/maps/base_room2.s
@@ -1,5 +1,5 @@
  ; struct for  base_room2
-base_room2_struct:
+base_room2_header:
 dw base_room2_bg
 dw base_room2_flags
 dw base_room2_actors

diff --git a/src/map.s b/src/map.s
index d9e5a81b4e3cf8510e85a258ac60318b6c9ef21e..08cde7ae9e44b2bd2cf0741146b0d969cae2aaaa 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -41,7 +41,7 @@
 room_load_from:
   ; copy de to current room struct 
   ; and then load the room 
-  ld hl, curr_room_struct  
+  ld hl, curr_room_header
   ld bc, room_size
   call memcpy
 
@@ -469,7 +469,19 @@ room_get_flag_masked:
   ;   sets the current room
   ;   sets player position 
 map_generate:
+  ld d, ROOMS_TOTAL ; d = loop counter
+  ld hl, map0 ; hl = current room
   ; TODO: this is placeholder mapgen
+  
+  
+  ret
+
+  ; copies a base room 
+  ; inputs:
+  ;   hl: target
+  ;   de: base room
+  ;   bc: default exit room ptr
+map_gen_copy_base_room:
   ret
 
   ; base room 
@@ -480,8 +492,8 @@ map_generate:
 
   ; exit table for empty exits 
 room_empty_exits:
-dw base_room2_struct 
-dw base_room_struct 
-dw base_room2_struct 
-dw base_room_struct 
-dw base_room_struct 
+dw base_room2_header 
+dw base_room_header
+dw base_room2_header 
+dw base_room_header
+dw base_room_header

diff --git a/src/video.s b/src/video.s
index c26fc1933aa288fa933d78567984ed225abe0131..ff7954ade2c1d803a264fb663ef34b9eb089ddd9 100644 (file)
--- a/src/video.s
+++ b/src/video.s
@@ -101,7 +101,7 @@ video_init:
   call map_generate
 
   ; initial test map
-  ld de, base_room_struct
+  ld de, base_room_header
   call room_load_from 
   
   ; set up bgp

diff --git a/src/wram.s b/src/wram.s
index 610cd6592f68be4e2e003ac42ac11a0799b3c787..de1c042dc136e342feb209efc63aca450b053def 100644 (file)
--- a/src/wram.s
+++ b/src/wram.s
@@ -121,7 +121,7 @@ damage_anim: .adv 1
   ; current room struct 
   ; same layout as room struct itself 
   ; always should point at the current map's memory region 
-curr_room_struct: 
+curr_room_header: 
   ; pointer to current room struct 
 curr_room: .adv 2
   ; flags for current tiles
@@ -140,7 +140,7 @@ curr_room_exits: .adv 2
   ; total size of a room including the struct header 
   ; tiles, flags, actors and exits
   ; rooms are always in the order specified here:
-  ; room_struct, tiles, flags, actor_table, exit_table
+  ; room_header, tiles, flags, actor_table, exit_table
 
   ; room body including all tiles, flags, actors
   ; and exits

diff --git a/tools/tms2map.py b/tools/tms2map.py
index f60d9fbaa8aaaddcd310efbc8f60a36a7227c5fe..f834fb3461a4464bbf17f3fdd9cd9d02c5051ab8 100755 (executable)
--- a/tools/tms2map.py
+++ b/tools/tms2map.py
@@ -42,7 +42,7 @@ def print_actor(atype, y, x, flags):
 
 def print_struct(name):
     print(" ; struct for ", name)
-    print(name + "_struct:")
+    print(name + "_header:")
     print("dw " + name + '_bg')
     print("dw " + name + '_flags')
     print("dw " + name + '_actors')