diff options
| author | dannye <33dannye@gmail.com> | 2020-12-05 23:03:40 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-12-05 23:03:40 -0600 |
| commit | b1dfed568a346d407f8925a6561c27c23c96adfa (patch) | |
| tree | eb73f16b923fcb26a3a7230f00e72c5687762e9f /src/engine/effect_functions.asm | |
| parent | ff2d704ab42fdabb33a222a497d15ddb84bd314f (diff) | |
| parent | 66a5ec1006d54e0e48d544bc0514fba169d47954 (diff) | |
Merge branch 'master' of https://github.com/pret/poketcg
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 75b0f76..dae33a0 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -763,4 +763,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 |