aboutsummaryrefslogtreecommitdiff
path: root/map/loading/romtiles.gbasm
diff options
context:
space:
mode:
Diffstat (limited to 'map/loading/romtiles.gbasm')
-rw-r--r--map/loading/romtiles.gbasm18
1 files changed, 12 insertions, 6 deletions
diff --git a/map/loading/romtiles.gbasm b/map/loading/romtiles.gbasm
index 989a201..e35a1e5 100644
--- a/map/loading/romtiles.gbasm
+++ b/map/loading/romtiles.gbasm
@@ -1,9 +1,17 @@
-Load_ROM_Block: ; X in A, Y in B
+Load_Block:
PUSH BC
PUSH AF
+ PUSH AF
+ LD A, $mem_dungeon_flags
+ AND $01
+ JP Z, =Load_Block_From_Solid.AF_AF_BC_Push
+ POP AF
+
+ .After_AF_BC_Push:
+
CP $20
- JP NC, =Load_Block_From_Solid.After_AF_BC_Push
+ JP NC, =Load_Block_From_Solid.AF_BC_Push
PUSH BC
LD C, A
@@ -11,14 +19,14 @@ Load_ROM_Block: ; X in A, Y in B
CP $20
LD A, C
POP BC
- JP NC, =Load_Block_From_Solid.After_AF_BC_Push
+ JP NC, =Load_Block_From_Solid.AF_BC_Push
+Load_ROM_Block: ; X in A, Y in B
PUSH DE
PUSH HL
LD C, A
-
CALL =Construct_Tile_Address
LD A, $mem_map_loading_flags
@@ -42,8 +50,6 @@ Load_ROM_Block: ; X in A, Y in B
OR C
LD C, A
- DBG
-
LD A, L
ADD C
LD L, A