diff options
Diffstat (limited to 'src/engine')
| -rwxr-xr-x | src/engine/boosters.asm | 8 | ||||
| -rwxr-xr-x | src/engine/home.asm | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/boosters.asm b/src/engine/boosters.asm index 2e61e66..d292183 100755 --- a/src/engine/boosters.asm +++ b/src/engine/boosters.asm @@ -59,7 +59,7 @@ FindCurrRarityChance: ; 1e219 (7:6219) ret FindCardsInSetAndRarity: ; 1e226 (7:6226) - ld c, BOOSTER_CARD_TYPE_AMOUNT + ld c, NUM_BOOSTER_CARD_TYPES ld hl, wBoosterAmountOfCardTypeTable xor a .deleteTypeTableLoop @@ -171,7 +171,7 @@ CardTypeTable: ; 1e2b1 (7:62b1) db BOOSTER_CARD_TYPE_TRAINER FindTotalTypeChances: ; 1e2c2 (7:62c2) - ld c, BOOSTER_CARD_TYPE_AMOUNT + ld c, NUM_BOOSTER_CARD_TYPES xor a ld hl, wBoosterTempTypeChanceTable .deleteTempTypeChanceTableLoop @@ -223,7 +223,7 @@ DetermineBoosterCardType: ; 1e2fa (7:62fa) inc hl inc c ld a, c - cp a, BOOSTER_CARD_TYPE_AMOUNT + cp a, NUM_BOOSTER_CARD_TYPES jr c, .loopThroughCardTypes ld a, $08 .foundCardType @@ -469,7 +469,7 @@ InitBoosterData: ; 1e430 (7:6430) call CopyDataHLtoDE call LoadRarityAmountsToWram ld bc, $0 - ld d, BOOSTER_CARD_TYPE_AMOUNT + ld d, NUM_BOOSTER_CARD_TYPES ld e, $0 ld hl, wBoosterDataTypeChanceData .addChanceBytesLoop diff --git a/src/engine/home.asm b/src/engine/home.asm index 2946235..01a66d0 100755 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -5431,7 +5431,7 @@ LoadOpponentDeck: ; 2b78 (0:2b78) inc a call LoadDeck ld a, [wOpponentDeckId] - cp NUMBER_OF_DECKS + cp DECKS_END jr c, .valid_deck ld a, PRACTICE_PLAYER_DECK - 2 ld [wOpponentDeckId], a |