summaryrefslogtreecommitdiff
path: root/src/engine/effect_functions.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-12-14 12:02:36 -0600
committerdannye <33dannye@gmail.com>2020-12-14 12:02:36 -0600
commitde98637af1bbb51d98cfdfc1555ce6f205f45401 (patch)
treeb1f9a15fb2f5f8539e4e57050642d5b0a402eb77 /src/engine/effect_functions.asm
parent0b5fd66db9a00876d77e62f71c30f8c87cf0d421 (diff)
Clean up whitespace
Diffstat (limited to 'src/engine/effect_functions.asm')
-rw-r--r--src/engine/effect_functions.asm45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm
index 4ed3dbe..896d03c 100644
--- a/src/engine/effect_functions.asm
+++ b/src/engine/effect_functions.asm
@@ -727,34 +727,33 @@ Func_2cbfb: ; 2cbfb (b:4bfb)
; 0x2cc0a
INCROM $2cc0a, $2f4e1
-
+
ImposterProfessorOakEffect: ; 2f4e1 (b:74e1)
- call SwapTurn
- call CreateHandCardList
- call SortCardsInDuelTempListByID
- ld hl, wDuelTempList
+ call SwapTurn
+ call CreateHandCardList
+ call SortCardsInDuelTempListByID
+ ld hl, wDuelTempList
.return_hand_to_deck_loop
- ld a, [hli]
- cp $ff
- jr z, .shuffle
- call RemoveCardFromHand
- call ReturnCardToDeck
- jr .return_hand_to_deck_loop
+ ld a, [hli]
+ cp $ff
+ jr z, .shuffle
+ call RemoveCardFromHand
+ call ReturnCardToDeck
+ jr .return_hand_to_deck_loop
.shuffle
- call Func_2c0bd
- ld a, $07
- bank1call $4935
- ld c, $07
+ call Func_2c0bd
+ ld a, $07
+ bank1call $4935
+ ld c, $07
.draw_loop
- call DrawCardFromDeck
- jr c, .revert_turn_to_user
- call AddCardToHand
- dec c
- jr nz, .draw_loop
+ call DrawCardFromDeck
+ jr c, .revert_turn_to_user
+ call AddCardToHand
+ dec c
+ jr nz, .draw_loop
.revert_turn_to_user
- call SwapTurn
- ret
+ call SwapTurn
+ ret
; 0x2f513
-
INCROM $2f513, $30000