Level selection menu: entry transition events (#12) (#35) [commit 3]

This commit is contained in:
xCrystal
2024-02-03 14:22:00 +01:00
parent 403d2aee7e
commit 435d441d58
8 changed files with 64 additions and 56 deletions

View File

@@ -78,6 +78,7 @@ SpriteAnimFrameData:
dw .Frameset_BoardMenuBreakDie
dw .Frameset_BoardMenuAppearDieNumber
dw .Frameset_BoardMenuMoveDieNumber
dw .Frameset_LevelSelectionMenuHighlightLevel
assert_table_length NUM_SPRITE_ANIM_FRAMESETS
.Frameset_00:
@@ -586,3 +587,12 @@ SpriteAnimFrameData:
.Frameset_BoardMenuMoveDieNumber:
oamframe SPRITE_ANIM_OAMSET_BOARD_MENU_DIE_NUMBER, 42
oamdelete
.Frameset_LevelSelectionMenuHighlightLevel:
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1, 15
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2, 15
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1, 15
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2, 15
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1, 15
oamframe SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2, 15
oamdelete

View File

@@ -168,6 +168,8 @@ SpriteAnimOAMData:
spriteanimoam $00, .OAMData_BreakDie3 ; SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_3
spriteanimoam $00, .OAMData_BreakDie4 ; SPRITE_ANIM_OAMSET_BOARD_MENU_BREAK_DIE_4
spriteanimoam $00, .OAMData_DieNumber ; SPRITE_ANIM_OAMSET_BOARD_MENU_DIE_NUMBER
spriteanimoam $00, .OAMData_HighlightLevel1 ; SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_1
spriteanimoam $00, .OAMData_HighlightLevel2 ; SPRITE_ANIM_OAMSET_LSM_HIGHLIGHT_LEVEL_2
assert_table_length NUM_SPRITE_ANIM_OAMSETS
@@ -1186,3 +1188,17 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 0, $51, 1
dbsprite 0, 0, 4, 0, $52, 1
dbsprite 1, 0, 4, 0, $53, 1
.OAMData_HighlightLevel1:
db 4
dbsprite -1, -1, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 0, 0
dbsprite 0, -1, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 1, 0
dbsprite -1, 0, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 2, 0
dbsprite 0, 0, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 3, 0
.OAMData_HighlightLevel2:
db 4
dbsprite -1, -1, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 4, 0
dbsprite 0, -1, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 5, 0
dbsprite -1, 0, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 6, 0
dbsprite 0, 0, 0, 0, 24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2 + NUM_DAYTIMES * 4 + 7, 0

View File

@@ -114,5 +114,7 @@ SpriteAnimObjects:
db SPRITE_ANIM_FRAMESET_BOARD_MENU_APPEAR_DIE_NUMBER, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_BOARD_MENU_MOVE_DIE_NUMBER
db SPRITE_ANIM_FRAMESET_BOARD_MENU_MOVE_DIE_NUMBER, SPRITE_ANIM_FUNC_BOARD_MENU_MOVE_DIE_NUMBER, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_OBJ_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL
db SPRITE_ANIM_FRAMESET_LEVEL_SELECTION_MENU_HIGHLIGHT_LEVEL, SPRITE_ANIM_FUNC_NULL, SPRITE_ANIM_DICT_DEFAULT
assert_table_length NUM_SPRITE_ANIM_OBJS

View File

@@ -1,23 +0,0 @@
MACRO sprite_anim_obj_gfx
; # tiles, gfx pointer
db \1
dbw \2, \3
ENDM
UnusedSpriteAnimGFX:
; entries correspond to SPRITE_ANIM_DICT_* constants
table_width 4, UnusedSpriteAnimGFX
; # tiles, gfx bank, gfx pointer
; (all pointers were dummied out to .DeletedGFX)
sprite_anim_obj_gfx 128, $01, .DeletedGFX ; SPRITE_ANIM_DICT_DEFAULT
sprite_anim_obj_gfx 128, $01, .DeletedGFX ; unused
sprite_anim_obj_gfx 128, $01, .DeletedGFX ; unused
sprite_anim_obj_gfx 128, $01, .DeletedGFX ; unused
sprite_anim_obj_gfx 16, $37, .DeletedGFX ; unused
sprite_anim_obj_gfx 16, $11, .DeletedGFX ; SPRITE_ANIM_DICT_TEXT_CURSOR
sprite_anim_obj_gfx 16, $39, .DeletedGFX ; SPRITE_ANIM_DICT_GS_SPLASH (the bank includes engine/movie/splash.asm)
sprite_anim_obj_gfx 16, $24, .DeletedGFX ; SPRITE_ANIM_DICT_SLOTS (the bank includes engine/games/slot_machine.asm)
sprite_anim_obj_gfx 16, $21, .DeletedGFX ; SPRITE_ANIM_DICT_ARROW_CURSOR
assert_table_length NUM_SPRITE_ANIM_GFX
.DeletedGFX