pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

wUnlockedUnowns engine_flag constants (#1025)

Browse Source
This commit is contained in:
vulcandth 2022-12-26 12:14:10 -06:00 committed by GitHub
parent f739f8b1ac
commit 25e12c9391
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
constants/wram_constants.asm
View File

@ -310,3 +310,11 @@ DEF DAYCAREMAN_ACTIVE_F EQU 7
; wDayCareLady:: ; wDayCareLady::
DEF DAYCARELADY_HAS_MON_F EQU 0 DEF DAYCARELADY_HAS_MON_F EQU 0
DEF DAYCARELADY_ACTIVE_F EQU 7 DEF DAYCARELADY_ACTIVE_F EQU 7
; wUnlockedUnowns::
const_def
const UNLOCKED_UNOWNS_A_TO_K_F
const UNLOCKED_UNOWNS_L_TO_R_F
const UNLOCKED_UNOWNS_S_TO_W_F
const UNLOCKED_UNOWNS_X_TO_Z_F
DEF NUM_UNLOCKED_UNOWN_SETS EQU const_value

8
data/events/engine_flags.asm
View File

@ -63,10 +63,10 @@ EngineFlags:
engine_flag wKantoBadges, EARTHBADGE engine_flag wKantoBadges, EARTHBADGE
; unown sets (see data/wild/unlocked_unowns.asm) ; unown sets (see data/wild/unlocked_unowns.asm)
engine_flag wUnlockedUnowns, 0 ; A-K engine_flag wUnlockedUnowns, UNLOCKED_UNOWNS_A_TO_K_F
engine_flag wUnlockedUnowns, 1 ; L-R engine_flag wUnlockedUnowns, UNLOCKED_UNOWNS_L_TO_R_F
engine_flag wUnlockedUnowns, 2 ; S-W engine_flag wUnlockedUnowns, UNLOCKED_UNOWNS_S_TO_W_F
engine_flag wUnlockedUnowns, 3 ; X-Z engine_flag wUnlockedUnowns, UNLOCKED_UNOWNS_X_TO_Z_F
engine_flag wUnlockedUnowns, 4 ; unused engine_flag wUnlockedUnowns, 4 ; unused
engine_flag wUnlockedUnowns, 5 ; unused engine_flag wUnlockedUnowns, 5 ; unused
engine_flag wUnlockedUnowns, 6 ; unused engine_flag wUnlockedUnowns, 6 ; unused

13
data/wild/unlocked_unowns.asm
View File

@ -7,12 +7,13 @@ endr
ENDM ENDM
UnlockedUnownLetterSets: UnlockedUnownLetterSets:
; entries correspond to wUnlockedUnowns bits ; entries correspond to UNLOCKED_UNOWNS_* constants
dw .Set_A_K ; ENGINE_UNLOCKED_UNOWNS_A_TO_K table_width 2, UnlockedUnownLetterSets
dw .Set_L_R ; ENGINE_UNLOCKED_UNOWNS_L_TO_R dw .Set_A_K ; UNLOCKED_UNOWNS_A_TO_K_F
dw .Set_S_W ; ENGINE_UNLOCKED_UNOWNS_S_TO_W dw .Set_L_R ; UNLOCKED_UNOWNS_L_TO_R_F
dw .Set_X_Z ; ENGINE_UNLOCKED_UNOWNS_X_TO_Z dw .Set_S_W ; UNLOCKED_UNOWNS_S_TO_W_F
.End dw .Set_X_Z ; UNLOCKED_UNOWNS_X_TO_Z_F
assert_table_length NUM_UNLOCKED_UNOWN_SETS
.Set_A_K: .Set_A_K:
unown_set A, B, C, D, E, F, G, H, I, J, K unown_set A, B, C, D, E, F, G, H, I, J, K

2
engine/battle/core.asm
View File

@ -6476,7 +6476,7 @@ CheckUnownLetter:
inc e inc e
inc e inc e
ld a, e ld a, e
cp UnlockedUnownLetterSets.End - UnlockedUnownLetterSets cp NUM_UNLOCKED_UNOWN_SETS * 2
jr c, .loop jr c, .loop
; Hasn't been unlocked, or the letter is invalid ; Hasn't been unlocked, or the letter is invalid