From 41796de91581f586b401cf01eb0852095564e202 Mon Sep 17 00:00:00 2001 From: E Date: Sun, 29 Nov 2020 14:23:15 -0600 Subject: Updating spelling + adding NPCMovement_d896 --- src/engine/bank03.asm | 16 ++++++++++++++-- src/engine/effect_functions.asm | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src/engine') diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 8edbdde..1f1e690 100644 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -3426,7 +3426,7 @@ AfterTutorialBattleScript: ; d834 (3:5834) tx Text05ef run_command ScriptCommand_CloseTextBox run_command ScriptCommand_MoveActiveNPC - dw $5896 + dw NPCMovement_d896 run_command ScriptCommand_SetPlayerDirection db NORTH run_command ScriptCommand_MovePlayer @@ -3490,8 +3490,20 @@ NPCMovement_d88b: ; d88b (3:588b) NPCMovement_d894: ; d894 (4:5894) db SOUTH | NO_MOVE db $ff + +NPCMovement_d896: ; d896 (3:5896) + db NORTH + db NORTH + db NORTH + db EAST + db EAST + db EAST + db EAST + db SOUTH | NO_MOVE + db $ff +; 0xd89f - INCROM $d896, $d932 + INCROM $d89f, $d932 Script_d932: ; d932 (3:5932) start_script diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index f64953b..dae33a0 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -765,7 +765,7 @@ Func_2cbfb: ; 2cbfb (b:4bfb) INCROM $2cc0a, $2f4e1 -ImpostorProfessorOakEffect: ; 2f4e1 (b:74e1) +ImposterProfessorOakEffect: ; 2f4e1 (b:74e1) call SwapTurn call CreateHandCardList call SortCardsInDuelTempListByID -- cgit v1.2.3