Add animation for level cleared in level selection menu (#12)

This commit is contained in:
xCrystal 2024-04-04 21:26:26 +02:00
parent 5e176f814e
commit 11a12bfba5
5 changed files with 51 additions and 5 deletions

View File

@ -29,8 +29,9 @@ DEF LSMTEXTBOX_LEVEL_NUMBERS_FIRST_TILE EQU $31 ; and $41
; events when entering Level Selection menu (wLevelSelectionMenuEntryEventQueue) ; events when entering Level Selection menu (wLevelSelectionMenuEntryEventQueue)
const_def const_def
const LSMEVENT_SHOW_UNLOCKED_LEVELS ; 0 const LSMEVENT_SHOW_CLEARED_LEVEL ; 0
const LSMEVENT_ANIMATE_TIME_OF_DAY ; 1 const LSMEVENT_SHOW_UNLOCKED_LEVELS ; 1
const LSMEVENT_ANIMATE_TIME_OF_DAY ; 2
DEF NUM_LSM_EVENTS EQU const_value DEF NUM_LSM_EVENTS EQU const_value
; used in CaughtData (legacy) ; used in CaughtData (legacy)

View File

@ -62,12 +62,22 @@ AddLevelCoinsToBalance:
ClearLevel: ClearLevel:
ld a, [wCurSpaceEffect] ; End Space effect byte contains STAGE_*_F ld a, [wCurSpaceEffect] ; End Space effect byte contains STAGE_*_F
ld [wLastClearedLevelStage], a
call GetClearedLevelsStageAddress call GetClearedLevelsStageAddress
ld b, SET_FLAG ld b, CHECK_FLAG
ld d, 0 ld d, 0
ld a, [wCurLevel] ld a, [wCurLevel]
ld e, a ld e, a
push de
call FlagAction call FlagAction
pop de
jr nz, .already_cleared ; return if this level stage already cleared
ld b, SET_FLAG
call FlagAction
ret
.already_cleared
ld a, $ff
ld [wLastClearedLevelStage], a
ret ret
UnlockLevels: UnlockLevels:

View File

@ -146,11 +146,12 @@ GameMenu_World:
call ClearObjectStructs call ClearObjectStructs
call ClearBGPalettes call ClearBGPalettes
call ClearSprites call ClearSprites
; clear unlocked levels ; initialize buffer for temporary unlocked and cleared levels
xor a xor a
ld [wLastUnlockedLevelsCount], a ld [wLastUnlockedLevelsCount], a
ld a, $ff ld a, $ff
ld [wLastUnlockedLevels], a ld [wLastUnlockedLevels], a
ld [wLastClearedLevelStage], a
; handle overworld exit ; handle overworld exit
ld a, [wExitOverworldReason] ld a, [wExitOverworldReason]
cp CLEARED_LEVEL cp CLEARED_LEVEL
@ -160,6 +161,11 @@ GameMenu_World:
farcall ClearedLevelScreen farcall ClearedLevelScreen
ld hl, wLevelSelectionMenuEntryEventQueue ld hl, wLevelSelectionMenuEntryEventQueue
set LSMEVENT_ANIMATE_TIME_OF_DAY, [hl] set LSMEVENT_ANIMATE_TIME_OF_DAY, [hl]
ld a, [wLastClearedLevelStage]
inc a
jr z, .no_new_stage_cleared
set LSMEVENT_SHOW_CLEARED_LEVEL, [hl]
.no_new_stage_cleared
ld a, [wLastUnlockedLevelsCount] ld a, [wLastUnlockedLevelsCount]
and a and a
jr z, .save_and_return jr z, .save_and_return

View File

@ -119,6 +119,28 @@ LevelSelectionMenu::
call LevelSelectionMenu_DrawStageTrophies call LevelSelectionMenu_DrawStageTrophies
call LevelSelectionMenu_RefreshTextboxAttrs call LevelSelectionMenu_RefreshTextboxAttrs
ld a, [wLevelSelectionMenuEntryEventQueue]
bit LSMEVENT_SHOW_CLEARED_LEVEL, a
jr z, .check_animate_tod
ld a, [wLastClearedLevelStage]
cp NUM_LEVEL_STAGES
jr nc, .check_animate_tod
call LevelSelectionMenu_Delay10Frames
; the previous LevelSelectionMenu_DrawStageTrophies showed this stage trophy empty
; due to wLastClearedLevelStage being set to a non-$ff value.
; redisplay stage trophies to show the stage being cleared.
ld a, $ff
ld [wLastClearedLevelStage], a
call LevelSelectionMenu_DrawStageTrophies
ld de, SFX_FORESIGHT
call PlaySFX
call LevelSelectionMenu_Delay10Frames
call LevelSelectionMenu_Delay10Frames
.check_animate_tod
ld a, [wLevelSelectionMenuEntryEventQueue] ld a, [wLevelSelectionMenuEntryEventQueue]
bit LSMEVENT_ANIMATE_TIME_OF_DAY, a bit LSMEVENT_ANIMATE_TIME_OF_DAY, a
jp z, .main_loop jp z, .main_loop
@ -723,8 +745,13 @@ LevelSelectionMenu_DrawStageTrophies:
ret ret
.IsLevelStageCleared: .IsLevelStageCleared:
; return nz if [wCurLevel]'s stage in a has been cleared, z otherwise. ; return z if a is equal to wLastClearedLevelStage (for LSMEVENT_SHOW_CLEARED_LEVEL animation).
; else, return nz if [wCurLevel]'s stage in a has been cleared
; return z otherwise.
; preserve a and de. ; preserve a and de.
ld hl, wLastClearedLevelStage
cp [hl]
ret z
ld c, a ld c, a
push bc push bc
push de push de

View File

@ -2537,6 +2537,8 @@ wLevelSelectionMenuEntryEventQueue:: flag_array NUM_LSM_EVENTS
; list of unlocked levels during post-level screen ; list of unlocked levels during post-level screen
wLastUnlockedLevelsCount:: db wLastUnlockedLevelsCount:: db
wLastUnlockedLevels:: ds MAX_UNLOCK_LEVELS_AT_ONCE + 1 wLastUnlockedLevels:: ds MAX_UNLOCK_LEVELS_AT_ONCE + 1
; which stage of the current level cleared during post-level screen ($ff if no new stage cleared)
wLastClearedLevelStage:: db
wPlayerDataEnd:: wPlayerDataEnd::