diff options
Diffstat (limited to 'map')
| -rw-r--r-- | map/loading.gbasm | 6 | ||||
| -rw-r--r-- | map/objects.gbasm | 19 |
2 files changed, 10 insertions, 15 deletions
diff --git a/map/loading.gbasm b/map/loading.gbasm index 505bc53..878d0e1 100644 --- a/map/loading.gbasm +++ b/map/loading.gbasm @@ -1,4 +1,4 @@ -Load_Map: +Load_Prepared_Map: LD A, $mem_viewport_x SUB $02 LD C, A @@ -13,6 +13,10 @@ Load_Map: .For_X: LD A, C CALL =Load_Block + LD A, $mem_prepared_block_position_1 + SUB $98 + ADD $c4 + LD $mem_prepared_block_position_1, A CALL =Display_Main_Prepared_Block INC C diff --git a/map/objects.gbasm b/map/objects.gbasm index 80832a7..ae2b60f 100644 --- a/map/objects.gbasm +++ b/map/objects.gbasm @@ -142,18 +142,10 @@ Object_Interaction_Jump_table: JP =Restore_EP_Action Stairs_Action: - DI - LD A, $00 - LD $reg_interrupt_flags, A - .Wait_VBlank: - LD A, $reg_lcd_status - AND $03 - CP $01 - JR NZ, =.Wait_VBlank - - ; LCDC - XOR A - LD $reg_lcd_controller, A + LD A, $enum_dungeon_generation_mode + LD $mem_current_mode, A + LD $mem_requested_mode, A + CALL =Update_VBlank_Handler LD A, $mem_floor_count INC A @@ -163,8 +155,7 @@ Stairs_Action: LD $mem_floor_count, A .skip_update_floor_count: - CALL =Reset_Map - JP =New_Dungeon + RET Heal_Action: LD A, $mem_bunny_health |