diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2018-02-22 13:49:27 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2018-02-22 13:49:27 +0100 |
| commit | d543a896fd381046dee795f3020237d6da623a9e (patch) | |
| tree | fd6bb143c4a40fa85ab11e8bb1a43004c289e9d5 /src/engine/booster_packs.asm | |
| parent | 2e1d018a7a95880a36f3935307aeb76875797ae4 (diff) | |
CARD_DATA_* constants and more labeling and disasm
Diffstat (limited to 'src/engine/booster_packs.asm')
| -rw-r--r-- | src/engine/booster_packs.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/booster_packs.asm b/src/engine/booster_packs.asm index 23c3494..c24f80a 100644 --- a/src/engine/booster_packs.asm +++ b/src/engine/booster_packs.asm @@ -81,7 +81,7 @@ FindCardsInSetAndRarity: ; 1e226 (7:6226) call CheckCardViable jr c, .finished_with_current_card ld a, [wBoosterCurrentCardType] - call GetCardType + call GetBoosterCardType push af push hl ld c, a @@ -107,7 +107,7 @@ FindCardsInSetAndRarity: ; 1e226 (7:6226) CheckCardViable: ; 1e268 (7:6268) push bc ld a, e - call GetCardHeader + call GetCardTypeRarityAndSet ld [wBoosterCurrentCardType], a ld a, b ld [wBoosterCurrentCardRarity], a @@ -119,7 +119,7 @@ CheckCardViable: ; 1e268 (7:6268) cp c jr nz, .invalid_card ld a, [wBoosterCurrentCardType] - call GetCardType + call GetBoosterCardType cp BOOSTER_CARD_TYPE_ENERGY jr z, .return_valid_card ld a, [wBoosterCurrentCardSet] @@ -139,7 +139,7 @@ CheckCardViable: ; 1e268 (7:6268) ret ; Map a card's TYPE_* constant given in a to its BOOSTER_CARD_TYPE_* constant -GetCardType: ; 1e2a0 (7:62a0) +GetBoosterCardType: ; 1e2a0 (7:62a0) push hl push bc ld hl, CardTypeTable @@ -439,7 +439,7 @@ AddBoosterCardsToCollection:; 1e40a (7:640a) AddBoosterCardToTempCardCollection: ; 1e419 (7:6419) push hl - ld h, wTempCardCollection >> 8 + ld h, HIGH(wTempCardCollection) ld a, [wBoosterTempCard] ld l, a inc [hl] @@ -448,7 +448,7 @@ AddBoosterCardToTempCardCollection: ; 1e419 (7:6419) IsByteInTempCardCollectionZero: ; 1e423 (7:6423) push hl - ld h, wTempCardCollection >> 8 + ld h, HIGH(wTempCardCollection) ld a, [wBoosterTempCard] ld l, a ld a, [hl] |