map: renamed curr_room_init_actors to curr_room_actor_table
authorLukas Krickl <lukas@krickl.dev>
Fri, 27 Dec 2024 15:13:36 +0000 (16:13 +0100)
committerLukas Krickl <lukas@krickl.dev>
Fri, 27 Dec 2024 15:13:36 +0000 (16:13 +0100)
src/map.s
src/wram.s

index 874aab817b2b2d932d18b9f82bcf1bc91a055a7d..2977303d32db7088fa26e80f1e0786923044673f 100644 (file)
--- a/src/map.s
+++ b/src/map.s
@@ -207,7 +207,7 @@ room_goto:
   
 
   ; loads actors from 
-  ; [curr_room_init_act
+  ; [curr_room_actor_table
   ; into the active actor table 
 room_load_actors:
   ; clear actor table 
@@ -217,7 +217,7 @@ room_load_actors:
   call memset
 
   ; hl = ptr to initial actor table 
-  ld hl, curr_room_init_act
+  ld hl, curr_room_actor_table
   ld a, [hl+]
   ld e, a
   ld a, [hl]
index 342c2b408b3124e907367b85c419b53449623575..6949744c829ffb4a27ead76e4585b33efb54be6e 100644 (file)
@@ -33,6 +33,7 @@ prev_inputs: .adv 1
 
 #define ACTOR_TABLE_SIZE ACTORS_MAX * actor_size
 
+  ; ptr to current actor table 
 actor_table: .adv ACTOR_TABLE_SIZE 
 
 actor_soam_ptr: .adv 2
@@ -131,7 +132,7 @@ curr_room_flags: .adv 2
   ; layout:
   ;   byte 0: length of actor table 
   ;   bytes 1-n: n bytes of actor data to be copied to actor table
-curr_room_init_act: .adv 2
+curr_room_actor_table: .adv 2
 
   ; ptr to exits
 curr_room_exits: .adv 2