From: Lukas Krickl <lukas@krickl.dev>
Date: Tue, 24 Dec 2024 07:18:34 +0000 (+0100)
Subject: Fixed crash during room transitions
X-Git-Url: https://git.krickl.dev/?a=commitdiff_plain;h=412ac834769cd65bbc39d4f131e64cff1bfa2522;p=gbrg%2F.git

Fixed crash during room transitions

This was caused by a bad pointer being passed to load_room_from.
---

diff --git a/src/map.s b/src/map.s
index d941d92..3bddb82 100644
--- a/src/map.s
+++ b/src/map.s
@@ -147,7 +147,7 @@ room_goto_player_pos:
   ; default use special exit
   ld a, EXIT_SPECIAL 
   ; no need to jmp in default case
-
+  ret ; TODO: enable special exit?
 
   ; transitions to a new room 
   ; that is part of the map:
@@ -173,9 +173,9 @@ room_goto:
 
   ; load room ptr into de
   ld a, [hl+] 
-  ld d, a
-  ld a, [hl]
   ld e, a
+  ld a, [hl]
+  ld d, a
  
   call room_load_from