diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-09-10 19:08:37 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-09-10 19:08:37 +0100 |
| commit | a8d40599bf1c767c7247695c49a7272d2e54cedd (patch) | |
| tree | b499f6981a35fc0bbf39424e67a7f24bf6d11362 /src/engine/bank05.asm | |
| parent | d4959345dfa703a0054dd84d2e2c54ca9eac25ee (diff) | |
Label GetCardOneStageBelow
Diffstat (limited to 'src/engine/bank05.asm')
| -rw-r--r-- | src/engine/bank05.asm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm index 8c78a94..2991bf8 100644 --- a/src/engine/bank05.asm +++ b/src/engine/bank05.asm @@ -5241,6 +5241,7 @@ CheckIfAnyBasicPokemonInDeck: ; 17057 (5:7057) ret ; 0x17080 + Func_17080: ; 17080 (5:7080) ldh a, [hTempPlayAreaLocation_ff9d] push af @@ -5254,9 +5255,11 @@ Func_17080: ; 17080 (5:7080) ld a, c ldh [hTempPlayAreaLocation_ff9d], a push bc - bank1call Func_7045 + bank1call GetCardOneStageBelow pop bc jr c, .next + ; is not a basic card + ; compare its HP with current damage ld a, d push bc call LoadCardDataToBuffer2_FromDeckIndex @@ -5283,6 +5286,7 @@ Func_17080: ; 17080 (5:7080) ldh [hTempPlayAreaLocation_ff9d], a or a ret + .set_carry call SwapTurn pop af |