From a527e6437f366cdd3093f8c431e88e460630c094 Mon Sep 17 00:00:00 2001 From: Lukas Krickl Date: Fri, 27 Dec 2024 16:13:36 +0100 Subject: [PATCH] map: renamed curr_room_init_actors to curr_room_actor_table --- src/map.s | 4 ++-- src/wram.s | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/map.s b/src/map.s index 874aab8..2977303 100644 --- 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] diff --git a/src/wram.s b/src/wram.s index 342c2b4..6949744 100644 --- a/src/wram.s +++ b/src/wram.s @@ -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 -- 2.30.2