diff options
| author | pinksylveon <shakibafzali@gmail.com> | 2020-12-07 17:56:31 -0500 |
|---|---|---|
| committer | pinksylveon <shakibafzali@gmail.com> | 2020-12-07 17:56:31 -0500 |
| commit | b217f4509508a5c16540fa00f1ec458c8984846a (patch) | |
| tree | f6355aa58eac70cb95de1d327fde11b4496176f3 /src | |
| parent | 342ba196ba6efb71c03622e625a54038154a6064 (diff) | |
Replaced hex values with constants
Diffstat (limited to 'src')
| -rw-r--r-- | src/constants/deck_constants.asm | 2 | ||||
| -rw-r--r-- | src/engine/bank01.asm | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/constants/deck_constants.asm b/src/constants/deck_constants.asm index 4105242..5efc329 100644 --- a/src/constants/deck_constants.asm +++ b/src/constants/deck_constants.asm @@ -66,3 +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 + diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 833b064..53f5851 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -8168,7 +8168,7 @@ Func_7310: ; 7310 (1:7310) ld a, [wDuelType] cp DUELTYPE_LINK jr z, .asm_7338 - ld a, $1e + ld a, 30 .asm_732f call DoFrame dec a @@ -8218,39 +8218,39 @@ Func_7364: ; 7364 (1:7364) or a jr z, .asm_7384 ld b, a - and $09 + and A_BUTTON | START jr nz, .asm_73cd - bit 1, b + bit B_BUTTON_F, b jr nz, .asm_73cb ld a, [wOpponentDeckID] - bit 4, b + bit D_RIGHT_F, b jr z, .asm_73a2 inc a - cp $35 + cp DECK_IDS_END jr c, .asm_73a2 xor a .asm_73a2 - bit 5, b + bit D_LEFT_F, b jr z, .asm_73ae or a jr nz, .asm_73ad - ld a, $34 + ld a, IMAKUNI_DECK_ID jr .asm_73ae .asm_73ad dec a .asm_73ae - bit 6, b + bit D_UP_F, b jr z, .asm_73b9 add $0a cp $35 jr c, .asm_73b9 xor a .asm_73b9 - bit 7, b + bit D_DOWN_F, b jr z, .asm_73c3 sub $0a jr nc, .asm_73c3 - ld a, FLAMETHROWER_DECK_ID + ld a, FLAMETHROWER_DECK .asm_73c3 ld [wOpponentDeckID], a call Func_73d8 |