diff options
| author | Astatin <[email protected]> | 2025-05-15 15:42:26 +0200 |
|---|---|---|
| committer | Astatin <[email protected]> | 2025-05-15 15:42:26 +0200 |
| commit | a1dad7db479d8203df30a649a688f7351b667d8e (patch) | |
| tree | 66c878c78365d87f7b37a2ea506c1e1979e0d536 /entity | |
| parent | ef9de76cd0bc313385b7edac3659e03ab36d3c1e (diff) | |
Fix some bugs owl found
Diffstat (limited to 'entity')
| -rw-r--r-- | entity/bunny.gbasm | 12 | ||||
| -rw-r--r-- | entity/questgoal.gbasm | 18 |
2 files changed, 14 insertions, 16 deletions
diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index 3806df4..7520720 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -191,6 +191,8 @@ Move_Bunny: LD A, D LD $mem_bunny_direction, A + LD A, $00 + LD $mem_bunny_animation, A BIT 3, D JR Z, =.Start_action_or_movement.end @@ -240,7 +242,11 @@ Move_Bunny: LD A, (HL) DEC A DAA - LD (HL+), A + JR C, =.skip_update_health + LD (HL), A + + .skip_update_health: + INC HL SET 3, (HL) LD A, $24 @@ -451,7 +457,7 @@ Center_viewport_around_entity: ; Entity pointer in HL LD B, A LD A, (HL) - SUB $04 + SUB $05 LD $mem_viewport_y, A LD A, (HL+) @@ -480,7 +486,7 @@ Center_viewport_around_entity: ; Entity pointer in HL LD A, C SWAP A AND $f0 - SUB $38 + SUB $48 LD C, A LD A, E diff --git a/entity/questgoal.gbasm b/entity/questgoal.gbasm index 445f56c..64cd745 100644 --- a/entity/questgoal.gbasm +++ b/entity/questgoal.gbasm @@ -38,6 +38,10 @@ Open_Dialogue: LD (HL), $enum_direction_up JR =.Check_end .Check_end: + LD A, (HL) + SWAP A + OR (HL) + LD (HL), A .START_SCRIPT =Demo_quest_bunny @@ -78,19 +82,7 @@ QuestGoal_Turn: CALL =Walking.Random_walker .Start_action_or_movement.end: - .End_movement: - LD A, $mem_moving_animation_step - CP $0f - JP NZ, =.End_movement.end - LD A, D - AND $07 - BIT 3, D - LD D, A - JR Z, =.End_movement.end - LD A, $01 - .ADD_A_TO_DIRECTION_BC - - .End_movement.end: + CALL =Entity_End_movement .Skip_Turn: LD A, L |