aboutsummaryrefslogtreecommitdiff
path: root/map/loading.gbasm
diff options
context:
space:
mode:
authorAstatin <[email protected]>2025-06-03 14:51:59 +0200
committerAstatin <[email protected]>2025-06-03 14:51:59 +0200
commiteca91612b60b5379f9e8d6ce6f51366db54aacc3 (patch)
treec5fad4dc000a5430958fa8b354f69b3ba6628fe6 /map/loading.gbasm
parentf3a70613f78023c25d9a075231cb55639a75ee99 (diff)
Add loading from pregenerated collision map
Diffstat (limited to 'map/loading.gbasm')
-rw-r--r--map/loading.gbasm8
1 files changed, 3 insertions, 5 deletions
diff --git a/map/loading.gbasm b/map/loading.gbasm
index 1247b08..c0ea14f 100644
--- a/map/loading.gbasm
+++ b/map/loading.gbasm
@@ -14,8 +14,8 @@ Load_Prepared_Map:
LD A, C
CALL =Load_Block
LD A, $mem_prepared_block_position_1
- SUB $98
- ADD $c4
+ SUB high($VRAM_tilemap_1)
+ ADD high($mem_map_loading_buffer)
LD $mem_prepared_block_position_1, A
CALL =Display_Main_Prepared_Block
@@ -159,7 +159,7 @@ Construct_Tile_Address: ; Construct Tile Map address from A and B in DE
OR E
LD E, A
LD A, D
- OR $98
+ OR high($VRAM_tilemap_1)
LD D, A
POP BC
@@ -303,8 +303,6 @@ Display_Main_Prepared_Block:
PUSH BC
PUSH DE
-
-
LD A, $mem_prepared_block_position_1
LD D, A