wip: room loading

diff --git a/src/map.s b/src/map.s
index 837d5f4433cf999dabcb2fbdb4feb2abdc3bfe6d..83845c242518b57ed404b4776eef6f80cf6e2e55 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -26,6 +26,14 @@
 #define TWALLD1 0x4A
 #define TWALLL1 0x4C
 
+  ; loads a map
+  ; inputs:
+  ;   curr_room: ptr to current room
+  ;   curr_room_init_act: ptr to initial actors to be loaded 
+map_load:
+  call room_draw
+  ret
+
   ; maps are collections of rooms
 
   ; rooms are made up of 2x2 meta tiles 

diff --git a/src/wram.s b/src/wram.s
index 673710c97be5c3f3d486c85f1afd31a876343aea..ff26def7507d9a219e91674cd7c6a2b09c66f682 100644 (file)
--- a/src/wram.s
+++ b/src/wram.s
@@ -90,6 +90,10 @@ curr_room: .adv 2
   ; flags for current tiles
 curr_room_flags: .adv 2
 
+  ; ptr to actor table of size actors_max/2
+  ; populate before loading a map
+curr_room_init_act: .adv 2
+
   ; drawing related flags
 
   ; UI flags