aboutsummaryrefslogtreecommitdiff
path: root/entity
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-05-02 15:28:14 +0200
committerAstatin <[email protected]>2025-05-02 15:28:14 +0200
commit4e618ff322cc0a6b1b7b8947983e4055b96e43d2 (patch)
treed28235e111fb147bfe3488a33a15dcd0d8012295 /entity
parentf137ecaba8297bb99b33559832e3131fda3646c2 (diff)
Make stairs avoid bunny room
Diffstat (limited to 'entity')
-rw-r--r--entity/init.gbasm33
1 files changed, 6 insertions, 27 deletions
diff --git a/entity/init.gbasm b/entity/init.gbasm
index 8267ee0..afbd9f3 100644
--- a/entity/init.gbasm
+++ b/entity/init.gbasm
@@ -22,6 +22,7 @@ Initialize_Entities:
LD A, $mem_number_of_rooms
CALL =RNG_Bound
+ LD $tmp_var_1, A
SLA A
SLA A
ADD low($mem_room_list)
@@ -102,6 +103,9 @@ Initialize_Entities:
CALL =Initialize_Enemy
CALL =Initialize_Enemy
CALL =Initialize_Enemy
+ LD A, $tmp_var_1
+ LD $mem_bunny_current_room_idx, A
+
CALL =Reset_Entities_Collision_Map
Fix_Bunny_screen:
@@ -144,33 +148,8 @@ Initialize_Entity: ; HL => pointer to entity struct, A => entity loaded index, 1
LD (HL+), A
LD A, $mem_bunny_current_room_idx
- LD $tmp_var_6, A
- CP $FF
- JR Z, =Initialize_Enemy.All_rooms_allowed
- LD B, A
- Initialize_Enemy.Skip_bunny_room:
- LD A, $mem_number_of_rooms
- CP $01
- JR Z, =Initialize_Enemy.All_rooms_allowed
-
- DEC A
- CALL =RNG_Bound
- LD $tmp_var_5, A
- INC A
- LD C, A
- LD A, B
- CP C
- LD A, C
- JR C, =Initialize_Enemy.Room_restriction.end
- DEC A
-
- JR =Initialize_Enemy.Room_restriction.end
-
- Initialize_Enemy.All_rooms_allowed:
- LD A, $mem_number_of_rooms
- CALL =RNG_Bound
- Initialize_Enemy.Room_restriction.end:
- LD $tmp_var_4, A
+ CALL =Pick_Random_Room_Avoid_A
+
SLA A
SLA A
ADD low($mem_room_list)