diff options
| author | Aroymart <andrewrmartinek@gmail.com> | 2020-12-06 21:06:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-06 21:06:54 -0500 |
| commit | d7f996687fa01473b08cb572d7b1f59275eaa851 (patch) | |
| tree | c46cfba092c5797e9787fe190e8f21cfcb7fd120 /src/engine/effect_functions.asm | |
| parent | 6c44ebb86d6d45150e69fbab82d4e1a251c7366b (diff) | |
| parent | db90dae74cc91f53e9ec815531572bdd295efacc (diff) | |
Merge branch 'master' into rgbds
Diffstat (limited to 'src/engine/effect_functions.asm')
| -rw-r--r-- | src/engine/effect_functions.asm | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 89d5dc6..4ed3dbe 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -726,4 +726,35 @@ Func_2cbfb: ; 2cbfb (b:4bfb) ret ; 0x2cc0a - INCROM $2cc0a, $30000 + INCROM $2cc0a, $2f4e1 + +ImposterProfessorOakEffect: ; 2f4e1 (b:74e1) + 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 +.shuffle + 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 +.revert_turn_to_user + call SwapTurn + ret +; 0x2f513 + + + INCROM $2f513, $30000 |