pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Implement unlocking levels [Commit 2] (#35)

Browse Source
This commit is contained in:
xCrystal 2024-01-19 18:00:07 +01:00
parent 38ffe06a2c
commit 4172760b6d
3 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/levels/levels.asm
View File

@ -14,9 +14,10 @@ elif !STRCMP("\1", "NUMBER_OF_LEVELS_CLEARED")
db UNLOCK_WHEN_\1
db \2
; a list of techniques that must be cleared
; a bitfield list of techniques that must be cleared
elif !STRCMP("\1", "TECHNIQUES_CLEARED")
db UNLOCK_WHEN_\1
assert (_NARG - 1) == (NUM_TECHNIQUES + 7) / 8
rept _NARG - 1
db \2
shift
@ -35,7 +36,9 @@ if DEF(_DEBUG)
level_unlock_req NONE ; DEBUGLEVEL_1
level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_1, STAGE_1 ; DEBUGLEVEL_2
level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_2, STAGE_1 ; DEBUGLEVEL_3
level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_3, STAGE_1 ; DEBUGLEVEL_4
level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_4, STAGE_1 ; DEBUGLEVEL_5
; level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_3, STAGE_1 ; DEBUGLEVEL_4
; level_unlock_req LEVELS_CLEARED, DEBUGLEVEL_4, STAGE_1 ; DEBUGLEVEL_5
level_unlock_req NUMBER_OF_LEVELS_CLEARED, 3 ; DEBUGLEVEL_4
level_unlock_req TECHNIQUES_CLEARED, TECHNIQUE_FLASH | TECHNIQUE_WATERFALL ; DEBUGLEVEL_5
endc
assert x == NUM_LEVELS

51
engine/menus/cleared_level_screen.asm
View File

@ -31,6 +31,10 @@ ClearedLevelScreen:
.exit
call AddLevelCoinsToBalance
call ClearLevel
xor a
ld [wNumTempUnlockedLevels], a
ld a, $ff
ld [wTempUnlockedLevels], a
call UnlockLevels
ld c, 30
jp DelayFrames
@ -113,7 +117,9 @@ UnlockLevels:
cp UNLOCK_WHEN_LEVELS_CLEARED
jr z, .check_levels_cleared_loop
cp UNLOCK_WHEN_NUMBER_OF_LEVELS_CLEARED
jr z, .check_number_of_levels_cleared
cp UNLOCK_WHEN_TECHNIQUES_CLEARED
jr .check_techniques_cleared
.check_levels_cleared_loop
ld a, [hli] ; which level
@ -130,8 +136,51 @@ UnlockLevels:
jr z, .reqs_not_met ; if this level is not cleared, requirements aren't met
jr .check_levels_cleared_loop ; otherwise check next level in list
.check_number_of_levels_cleared
push hl
ld hl, wClearedLevelsStage1
ld b, ((NUM_LEVELS + 7) / 8) * 4
call CountSetBits
pop hl
ld a, [hli]
cp c
jr c, .reqs_met
jr z, .reqs_met
jr .reqs_not_met
.check_techniques_cleared
ld bc, 0
.check_techniques_cleared_loop
ld a, [hli]
ld e, a
push hl
ld hl, wUnlockedTechniques
add hl, bc
and [hl]
cp e
pop hl
jr nz, .reqs_not_met
inc c
ld a, c
cp (NUM_TECHNIQUES + 7) / 8
jr nc, .reqs_met
jr .check_techniques_cleared_loop
.reqs_met
pop bc
; add level to wTempUnlockedLevels
pop bc ; b = which level
push hl
ld a, [wNumTempUnlockedLevels]
ld e, a
ld d, 0
ld hl, wTempUnlockedLevels
add hl, de
ld [hl], b
inc hl
ld [hl], $ff
inc a
ld [wNumTempUnlockedLevels], a
pop hl
pop de
ret

7
ram/wram.asm
View File

@ -711,6 +711,13 @@ wOverworldMapBlocks:: ds 1300
wOverworldMapBlocksEnd::
SECTION UNION "Overworld Map", WRAM0
; temporary list of unlocked levels during post-level screen
wNumTempUnlockedLevels:: db
wTempUnlockedLevels:: ds NUM_LEVELS
SECTION UNION "Overworld Map", WRAM0
; GB Printer data