summaryrefslogtreecommitdiff
path: root/src/engine/bank01.asm
diff options
context:
space:
mode:
authorxCrystal <rgr.crystal@gmail.com>2018-07-05 03:46:20 +0200
committerxCrystal <rgr.crystal@gmail.com>2018-07-05 03:47:16 +0200
commit0473d5e2999dbc5e49e3f757a385f302392cd1e3 (patch)
tree1f4c75aed3f218710053016e6aaf643b2a752cbc /src/engine/bank01.asm
parent169dc3d8fdd5603efd1766acd9ad1b8c23093e7f (diff)
Misc additions and corrections
Diffstat (limited to 'src/engine/bank01.asm')
-rw-r--r--src/engine/bank01.asm12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm
index 97fe32a..09b9db2 100644
--- a/src/engine/bank01.asm
+++ b/src/engine/bank01.asm
@@ -320,9 +320,9 @@ HandleTurn: ; 4225 (1:4225)
call c, DisplayPlayerDrawCardScreen
jr DuelMainInterface
-; display the animation of the player drawing the card at hTempCardIndex_ff98
-; save duel state to SRAM, and fall through to DuelMainInterface to effectively
-; begin the turn
+; display the animation of the player drawing the card at hTempCardIndex_ff98,
+; save duel state to SRAM, and fall through to DuelMainInterface
+; to effectively begin the turn
HandleTurn_PlayerDrewCard:
call DisplayPlayerDrawCardScreen
call SaveDuelStateToSRAM
@@ -929,7 +929,7 @@ Func_4611: ; 4611 (1:4611)
jr nc, .asm_466a
ldh a, [hTempCardIndex_ff98]
call RemoveCardFromDuelTempList
- call Func_4693
+ call DisplayEnergyDiscardScreen
jr .asm_4633
.asm_466a
ld a, [wcbd5]
@@ -956,7 +956,9 @@ Func_4673: ; 4673 (1:4673)
ld [wcbfa], a
; fallthrough
-Func_4693: ; 4693 (1:4693)
+; display the screen that prompts the player to select energy cards to discard
+; in order to retreat a Pokemon card
+DisplayEnergyDiscardScreen: ; 4693 (1:4693)
lb de, 0, 3
lb bc, 20, 10
call DrawRegularTextBox