diff options
| author | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-08-03 00:10:09 +0100 |
|---|---|---|
| committer | ElectroDeoxys <ElectroDeoxys@gmail.com> | 2019-08-03 00:10:09 +0100 |
| commit | e980a09f3b3055bbb3657965d5432b0e147308e8 (patch) | |
| tree | c996282292c2dc709f456747ead53885c8c8f691 | |
| parent | c196e542ceafdab41c28b8e4cd69a9d8ffca2569 (diff) | |
Correct SubstractHPFromCard label
| -rw-r--r-- | src/engine/bank05.asm | 6 | ||||
| -rw-r--r-- | src/engine/home.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/bank05.asm b/src/engine/bank05.asm index 33f857f..327b523 100644 --- a/src/engine/bank05.asm +++ b/src/engine/bank05.asm @@ -1988,7 +1988,7 @@ Func_15f4c: ; 15f4c (5:5f4c) .check_damage ld a, [wCurCardPlayAreaLocation] ld e, a - call SubstractHPFromCard + call GetCardDamage or a jr z, .asm_160b7 srl a @@ -2160,7 +2160,7 @@ Func_16120: ; 16120 (5:6120) dec b ld e, b push bc - call SubstractHPFromCard + call GetCardDamage pop bc add c ld c, a @@ -2188,7 +2188,7 @@ Func_16120: ; 16120 (5:6120) ; a Muk in any duelist's Play Area .is_active ld e, 0 - call SubstractHPFromCard + call GetCardDamage cp 50 jr c, .asm_161ab ld e, PLAY_AREA_ARENA diff --git a/src/engine/home.asm b/src/engine/home.asm index 5271270..6a64246 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -5256,9 +5256,9 @@ MoveCardToDiscardPileIfInArena: ; 1c13 (0:1c13) ret ; 0x1c35 -; substract [hl] HP from the turn holder's card at CARD_LOCATION_PLAY_AREA + e +; calculate damage of card at CARD_LOCATION_PLAY_AREA + e ; return the result in a -SubstractHPFromCard: ; 1c35 (0:1c35) +GetCardDamage: ; 1c35 (0:1c35) push hl push de ld a, DUELVARS_ARENA_CARD |