diff options
Diffstat (limited to 'map')
| -rw-r--r-- | map/generation.gbasm | 14 | ||||
| -rw-r--r-- | map/loading.gbasm | 2 | ||||
| -rw-r--r-- | map/objects.gbasm | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/map/generation.gbasm b/map/generation.gbasm index 15a3301..f445d95 100644 --- a/map/generation.gbasm +++ b/map/generation.gbasm @@ -22,7 +22,7 @@ Carve_Map: ; X in C, Y in B LD L, A LD C, B - LD B, $mem_dungeon_map_high + LD B, high($mem_dungeon_map) LD A, (BC) OR (HL) @@ -51,7 +51,7 @@ Generation_Head_Mitosis: XOR B INC A - LD B, $next_free_head_higher_bytes + LD B, high($mem_dungeon_generation_heads) LD (BC), A DEC A @@ -108,11 +108,11 @@ Generation_Head_Explosion: LD A, (HL+) LD D, A ; Y - LD H, $c8 + LD H, high($mem_room_list) LD A, $mem_number_of_rooms SLA A SLA A - ADD $80 + ADD low($mem_room_list) LD L, A LD A, E @@ -335,6 +335,8 @@ Dungeon_Generation: RET Reset_Map: - LD HL, $c6ff - LD BC, $0281 + LD A, $00 + LD $mem_next_free_head_lower_bytes, A + LD HL, $mem_dungeon_generation_heads + LD BC, $0280 JP =bzero diff --git a/map/loading.gbasm b/map/loading.gbasm index 0fa66db..f7ba1ab 100644 --- a/map/loading.gbasm +++ b/map/loading.gbasm @@ -320,7 +320,7 @@ Is_Solid: ; X in A, Y in B, Result A LD L, A LD C, B - LD B, $mem_dungeon_map_high + LD B, high($mem_dungeon_map) LD A, (BC) AND (HL) diff --git a/map/objects.gbasm b/map/objects.gbasm index de34a6d..ae62b8e 100644 --- a/map/objects.gbasm +++ b/map/objects.gbasm @@ -17,10 +17,10 @@ Spawn_object_in_random_room: ; Object tile in A, Object jump table id in E CALL =RNG_Bound SLA A SLA A - ADD $80 + ADD low($mem_room_list) LD C, A - LD B, $c8 + LD B, high($mem_room_list) LD A, (BC) LD D, A |