diff options
| author | Astatin <[email protected]> | 2024-11-07 18:08:41 +0900 |
|---|---|---|
| committer | Astatin <[email protected]> | 2024-11-07 18:08:41 +0900 |
| commit | 5eb8b27696e9fa2f60fd75ffb1b31fe049fcc772 (patch) | |
| tree | 91242c268135495be116d4f2be2d6582ce557782 | |
| parent | c7be90f10a2b8bca27edab06c0bc8e164d4a7d9a (diff) | |
Fix rollback on mode change
| -rw-r--r-- | definitions.gbasm | 3 | ||||
| -rw-r--r-- | entity/actions.gbasm | 5 | ||||
| -rw-r--r-- | scripts/generate-tiledata.py | 4 | ||||
| -rw-r--r-- | sprites/gui/cursor.png | bin | 0 -> 128 bytes | |||
| -rw-r--r-- | sprites/gui/heart.png (renamed from sprites/bg/heart.png) | bin | 126 -> 126 bytes | |||
| -rw-r--r-- | tileset.gbasm | 3 |
6 files changed, 13 insertions, 2 deletions
diff --git a/definitions.gbasm b/definitions.gbasm index ba623bd..081192a 100644 --- a/definitions.gbasm +++ b/definitions.gbasm @@ -53,9 +53,12 @@ ; bit 0: if dialogue box is displayed .DEFINE mem_current_mode ($c014) +.DEFINE mem_requested_mode ($c015) .DEFINE enum_dungeon_mode $00 .DEFINE enum_dungeon_menu_mode $01 +.DEFINE mem_menu_cursor_position ($c016) + .DEFINE next_free_head_higher_bytes $c7 .DEFINE mem_next_free_head_lower_bytes ($c6ff) diff --git a/entity/actions.gbasm b/entity/actions.gbasm index cf8cab8..9c696e0 100644 --- a/entity/actions.gbasm +++ b/entity/actions.gbasm @@ -68,6 +68,9 @@ Update_Animation_Steps: SET 1, A LD $mem_map_loading_flags, A + LD A, $mem_requested_mode + LD $mem_current_mode, A + Update_Animation_Steps.end: RET @@ -129,7 +132,7 @@ Open_Dialogue: LD $mem_bunny_direction, A LD A, $enum_dungeon_menu_mode - LD $mem_current_mode, A + LD $mem_requested_mode, A RET Fox_Turn: diff --git a/scripts/generate-tiledata.py b/scripts/generate-tiledata.py index d3ee127..13e7295 100644 --- a/scripts/generate-tiledata.py +++ b/scripts/generate-tiledata.py @@ -25,7 +25,9 @@ get_sprite_png_parse_output("./sprites/bg/carrot.png") print("Small_sprites:") print("\n\t; Heart") -get_sprite_png_parse_output("./sprites/bg/heart.png") +get_sprite_png_parse_output("./sprites/gui/heart.png") +print("\n\t; Cursor") +get_sprite_png_parse_output("./sprites/gui/cursor.png") sprite_idx = 0x80 print("\nFont_Data:") diff --git a/sprites/gui/cursor.png b/sprites/gui/cursor.png Binary files differnew file mode 100644 index 0000000..41a08d3 --- /dev/null +++ b/sprites/gui/cursor.png diff --git a/sprites/bg/heart.png b/sprites/gui/heart.png Binary files differindex cd787da..cd787da 100644 --- a/sprites/bg/heart.png +++ b/sprites/gui/heart.png diff --git a/tileset.gbasm b/tileset.gbasm index f872563..7b745c9 100644 --- a/tileset.gbasm +++ b/tileset.gbasm @@ -92,6 +92,9 @@ Small_sprites: ; Heart .DB $00, $00, $6c, $6c, $fe, $fe, $fe, $fe, $7c, $7c, $38, $38, $10, $10, $00, $00 ; 0x68 + ; Cursor + .DB $00, $00, $60, $60, $78, $78, $7e, $7e, $7e, $7e, $78, $78, $60, $60, $00, $00 ; 0x69 + Font_Data: .DB $00, $00, $38, $3c, $44, $46, $44, $46, $44, $46, $44, $46, $38, $3c, $00, $00 ; 0x80 .DB $00, $00, $10, $18, $30, $38, $10, $18, $10, $18, $10, $18, $7c, $7e, $00, $00 ; 0x81 |
