diff options
| author | E <shealyrd@email.uscupstate.edu> | 2020-11-28 14:18:00 -0600 |
|---|---|---|
| committer | E <shealyrd@email.uscupstate.edu> | 2020-11-28 14:18:00 -0600 |
| commit | 757858f3a32350082c246e96051645c064fdca82 (patch) | |
| tree | b09c977dff79eadcae19414df52dee844392de69 /src | |
| parent | 6c74edb245a25feaf202f9ee101774be9155bf48 (diff) | |
* Adding script that runs after tutorial battle with Sam.
* Adding Impostor Professor Oak effect
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/bank03.asm | 45 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 33 |
2 files changed, 76 insertions, 2 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 07e903e..8edbdde 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3416,7 +3416,50 @@ Script_d827: ; d827 (3:5827) run_command ScriptCommand_QuitScriptFully ; 0xd82d - INCROM $d82d, $d880 + INCROM $d82d, $d834 + +AfterTutorialBattleScript: ; d834 (3:5834) + start_script + run_command ScriptCommand_PrintTextString + tx Text05eb + run_command ScriptCommand_PrintTextString + tx Text05ef + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_MoveActiveNPC + dw $5896 + run_command ScriptCommand_SetPlayerDirection + db NORTH + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_MovePlayer + db NORTH + db $01 + run_command ScriptCommand_SetPlayerDirection + db EAST + run_command ScriptCommand_MovePlayer + db EAST + db $01 + run_command ScriptCommand_MovePlayer + db EAST + db $01 + run_command ScriptCommand_SetPlayerDirection + db NORTH + run_command ScriptCommand_PrintTextString + tx Text05f0 + run_command ScriptCommand_CloseTextBox + run_command Func_ccdc + tx Text05f1 + run_command ScriptCommand_CloseTextBox + run_command ScriptCommand_PrintTextString + tx Text05f2 + run_command Func_d271 +; 0xd860 + + INCROM $d860, $d880 NPCMovement_d880: ; d880 (3:5880) db EAST diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index 75b0f76..e3c4d90 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 + +ImposterProssorOakEffect: ; 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 |