diff options
| author | Astatin <[email protected]> | 2025-02-28 16:18:56 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-02-28 16:18:56 +0900 |
| commit | afc683fd953bee5b7c9bed2439492cc7c1f87a49 (patch) | |
| tree | 1c32128b51ca7cabed22f6d582a6d21cd4bcb7f3 | |
| parent | 398c9d42b691bc633d22dff85bc2ac29ed635efa (diff) | |
Fix entity corruption on spawn entity right after entity cancel from collision in dungeon init
| -rw-r--r-- | definitions.gbasm | 2 | ||||
| -rw-r--r-- | entity/bunny.gbasm | 1 | ||||
| -rw-r--r-- | entity/init.gbasm | 3 | ||||
| -rw-r--r-- | main.gbasm | 7 |
4 files changed, 5 insertions, 8 deletions
diff --git a/definitions.gbasm b/definitions.gbasm index 3ff66f8..0fd7f90 100644 --- a/definitions.gbasm +++ b/definitions.gbasm @@ -211,7 +211,7 @@ ; health, max health, list of possible attacks, maybe remaining attacks ? AI status (blind, scared, slow, etc..) ; } -.DEFINE dbg_VBLANK_STATE ($dfff) +.DEFINE dbg_var ($dfff) .DEFINE enum_direction_left $01 .DEFINE enum_direction_right $02 diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index d2b9148..084cf59 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -283,6 +283,7 @@ Move_Bunny: BIT 3, A JR Z, =.Middle_movement_doublespeed_viewport_update.end LD A, E + LD $dbg_var, A CP $02 JR NZ, =.Middle_movement_doublespeed_viewport_update.end diff --git a/entity/init.gbasm b/entity/init.gbasm index d035820..76c96b4 100644 --- a/entity/init.gbasm +++ b/entity/init.gbasm @@ -202,7 +202,8 @@ Initialize_Enemy: ; HL => pointer to entity struct XOR A LD (HL-), A LD (HL-), A - LD (HL-), A + LD (HL), A + POP BC RET @@ -168,8 +168,7 @@ VBLANK_Entrypoint: LD $reg_bg_palette, A LD HL, $9d72 - LD A, $dbg_VBLANK_STATE - LD A, $mem_bunny_x + LD A, $dbg_var CALL =Print_8bit CALL $OAM_DMA_Transfer_routine @@ -193,10 +192,6 @@ VBLANK_Entrypoint: CALL =Copy_Dialogue_Buffer CALL =Display_dialogue_cursor - LD A, $reg_lcd_status - AND $03 - LD $dbg_VBLANK_STATE, A - ; LYC LD A, $0a LD $reg_lyc, A |