diff options
| author | Astatin <[email protected]> | 2024-11-11 17:56:54 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2024-11-11 17:56:54 +0900 |
| commit | d605c2900ae7c62f1937e250a2ae489678d99214 (patch) | |
| tree | 4c1fc76f3b9e50b5f8461784fc349bff685e465a /entity | |
| parent | 5eb8b27696e9fa2f60fd75ffb1b31fe049fcc772 (diff) | |
Add dungeon menu choice selection mode
Diffstat (limited to 'entity')
| -rw-r--r-- | entity/actions.gbasm | 19 | ||||
| -rw-r--r-- | entity/bunny.gbasm | 6 |
2 files changed, 15 insertions, 10 deletions
diff --git a/entity/actions.gbasm b/entity/actions.gbasm index 9c696e0..b1e48a8 100644 --- a/entity/actions.gbasm +++ b/entity/actions.gbasm @@ -53,7 +53,7 @@ Entity_Action: Update_Animation_Steps: LD A, $mem_map_loading_flags BIT 3, A - JR Z, =Update_Animation_Steps.end + JR Z, =Update_Animation_Steps.update_mode LD A, $mem_moving_animation_step INC A @@ -68,6 +68,8 @@ Update_Animation_Steps: SET 1, A LD $mem_map_loading_flags, A + Update_Animation_Steps.update_mode: + LD A, $mem_requested_mode LD $mem_current_mode, A @@ -116,15 +118,16 @@ Fox_Interaction: RET Open_Dialogue: - LD HL, $dialogue_first_line - LD BC, =Bunny_Prefix - CALL =Print_str + CALL =Init_Menu + ; LD HL, $dialogue_first_line + ; LD BC, =Bunny_Prefix + ; CALL =Print_str - LD HL, $dialogue_third_line - LD BC, =Text_1 - CALL =Print_str + ; LD HL, $dialogue_third_line + ; LD BC, =Text_1 + ; CALL =Print_str - LD A, $03 + LD A, $01 LD $mem_display_flag, A LD A, $mem_bunny_direction diff --git a/entity/bunny.gbasm b/entity/bunny.gbasm index 4e27929..01206e8 100644 --- a/entity/bunny.gbasm +++ b/entity/bunny.gbasm @@ -26,13 +26,11 @@ Move_Bunny: SET 3, A LD $mem_map_loading_flags, A - PUSH BC LD A, D CALL =Get_Position_After_Move LD A, C CALL =Is_Collisionable CALL =Carve_Entity_Collision_Map - POP BC CP $00 JR Z, =Start_action_or_movement.not_collision RES 3, D @@ -48,7 +46,11 @@ Move_Bunny: JR =Start_action_or_movement.end Start_action_or_movement.test_action: + LD A, $mem_last_button_action + LD B, A LD A, $mem_button_action + CP B + JR Z, =Start_action_or_movement.end BIT 0, A JR Z, =Start_action_or_movement.end LD A, $mem_bunny_direction |