From dec84633711c8f3a1f5c8d815fb41dfcc58a809e Mon Sep 17 00:00:00 2001 From: pinksylveon Date: Tue, 8 Dec 2020 14:35:10 -0500 Subject: Changed hex value to IMAKUNI_DECK_ID --- src/constants/deck_constants.asm | 2 +- src/engine/bank01.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm index 5efc329..8c8e8c9 100644 --- a/src/constants/deck_constants.asm +++ b/src/constants/deck_constants.asm @@ -66,5 +66,5 @@ ENDM deck_const RESHUFFLE_DECK ; $35 deck_const IMAKUNI_DECK ; $36 DECKS_END EQU const_value + -1 -DECK_IDS_END EQU DECKS_END - 2 +DECK_IDS_END EQU DECKS_END -2 diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 53f5851..c18629f 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8226,7 +8226,7 @@ Func_7364: ; 7364 (1:7364) bit D_RIGHT_F, b jr z, .asm_73a2 inc a - cp DECK_IDS_END + cp $35 jr c, .asm_73a2 xor a .asm_73a2 @@ -8250,7 +8250,7 @@ Func_7364: ; 7364 (1:7364) jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, FLAMETHROWER_DECK + ld a, IMAKUNI_DECK_ID .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 -- cgit v1.2.3