diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-04-29 20:42:00 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2020-04-29 20:42:00 +0100 |
| commit | 75678c46233e53c4508c811a80923216b36c61bb (patch) | |
| tree | 66b3a1ad97447138d526c92f5f409cce3ff8c2ab /src/engine/bank08.asm | |
| parent | ed0543d3d31c879a5f331c23384971f7d316b93e (diff) | |
AI init duel and turn logic
Diffstat (limited to 'src/engine/bank08.asm')
| -rw-r--r-- | src/engine/bank08.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/engine/bank08.asm b/src/engine/bank08.asm index 1113dc9..1c6f82a 100644 --- a/src/engine/bank08.asm +++ b/src/engine/bank08.asm @@ -3589,9 +3589,9 @@ AIPlay_Pokedex: ; 212b4 (8:52b4) ; 0x212dc AIDecide_Pokedex: ; 212dc (8:52dc) - ld a, [wcda6] - cp $06 - jr c, .no_carry + ld a, [wAIPokedexCounter] + cp 5 + 1 + jr c, .no_carry ; return if counter hasn't reached 6 yet ; return no carry if number of cards in deck <= 4 ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK @@ -3624,7 +3624,7 @@ AIDecide_Pokedex: ; 212dc (8:52dc) PickPokedexCards_Unreferenced: ; 212ff (8:52ff) ; unreferenced xor a - ld [wcda6], a + ld [wAIPokedexCounter], a ; reset counter ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK call GetTurnDuelistVariable @@ -3756,7 +3756,7 @@ PickPokedexCards_Unreferenced: ; 212ff (8:52ff) ; stores the resulting order in wce1a. PickPokedexCards: ; 2138e (8:538e) xor a - ld [wcda6], a + ld [wAIPokedexCounter], a ; reset counter ; reset counter ld a, DUELVARS_NUMBER_OF_CARDS_NOT_IN_DECK call GetTurnDuelistVariable @@ -6949,7 +6949,7 @@ HandleAIPeek: ; 224e6 (8:64e6) and [hl] ld [hl], a or a - ret z ; return if no prizes (should never happen) + ret z ; return if no prizes ld c, a ld b, $1 |