diff options
| author | Astatin <[email protected]> | 2025-08-27 17:04:54 +0200 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-08-27 17:04:54 +0200 |
| commit | 09a173d2f1123b6ac203c247094c312473705802 (patch) | |
| tree | 83be7ff3a2f804492a9edc7b7234399f12d11534 /modes | |
| parent | fb897a615f65af2ff99dc6070067262c809a2ac4 (diff) | |
Fix health not updated on death, fix penguin freeze not working on bunny blink, fix entity initial spawn
Diffstat (limited to 'modes')
| -rw-r--r-- | modes/dialoguemenu.gbasm | 15 | ||||
| -rw-r--r-- | modes/dungeon.gbasm | 22 | ||||
| -rw-r--r-- | modes/dungeongeneration.gbasm | 1 |
3 files changed, 23 insertions, 15 deletions
diff --git a/modes/dialoguemenu.gbasm b/modes/dialoguemenu.gbasm index 126495b..76d7470 100644 --- a/modes/dialoguemenu.gbasm +++ b/modes/dialoguemenu.gbasm @@ -18,12 +18,25 @@ Dialogue_VBLANK_Entrypoint: LD $reg_lyc, A .top_bar.end: - CALL $OAM_DMA_Transfer_routine + LD A, $mem_current_mode + CP $enum_dead_mode + JR NZ, =.update_health_mana.end + LD HL, $9d60 + LD A, $mem_bunny_health + CALL =Print_8bit + + LD HL, $9d64 + LD A, $mem_bunny_mana + CALL =Print_8bit + .update_health_mana.end: + CALL =Dialogue_Arrow_Animation CALL =Copy_Dialogue_Buffer CALL =Display_dialogue_cursor + CALL $OAM_DMA_Transfer_routine + ; LYC LD A, $0a LD $reg_lyc, A diff --git a/modes/dungeon.gbasm b/modes/dungeon.gbasm index 0386a5f..ae9d052 100644 --- a/modes/dungeon.gbasm +++ b/modes/dungeon.gbasm @@ -163,20 +163,16 @@ Dungeon_VBLANK_Entrypoint: CALL $OAM_DMA_Transfer_routine - LD A, $mem_current_mode - BIT 7, A - JR NZ, =Skip_VBlank_Dungeon_Update - LD HL, $9d60 - LD A, $mem_bunny_health - CALL =Print_8bit + LD HL, $9d60 + LD A, $mem_bunny_health + CALL =Print_8bit - LD HL, $9d64 - LD A, $mem_bunny_mana - CALL =Print_8bit + LD HL, $9d64 + LD A, $mem_bunny_mana + CALL =Print_8bit - CALL =Display_Prepared_Blocks - CALL =Display_Object - Skip_VBlank_Dungeon_Update: + CALL =Display_Prepared_Blocks + CALL =Display_Object ; LYC .ENABLE_LYC_INTERRUPT @@ -192,7 +188,7 @@ Dungeon_VBLANK_Entrypoint: CALL =Entities_Actions CALL =Object_Interactions_Check - CALL =Respawn_Entities + CALL =Maybe_Respawn_Entity CALL =Prepare_Scrolling_Map Skip_Dungeon_Update: diff --git a/modes/dungeongeneration.gbasm b/modes/dungeongeneration.gbasm index dc6fd8a..08643c5 100644 --- a/modes/dungeongeneration.gbasm +++ b/modes/dungeongeneration.gbasm @@ -145,7 +145,6 @@ New_Floor: CALL =Dungeon_Generation CALL =Initialize_Entities CALL =Initialize_Objects - .map.end: ; Reset animations |