diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/data/effect_commands.asm | 2 | ||||
| -rw-r--r-- | src/engine/bank03.asm | 16 | ||||
| -rw-r--r-- | src/engine/effect_functions.asm | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/src/data/effect_commands.asm b/src/data/effect_commands.asm index 8275fe9..7360aff 100644 --- a/src/data/effect_commands.asm +++ b/src/data/effect_commands.asm @@ -1491,7 +1491,7 @@ FullHealEffectCommands: db $00 ImposterProfessorOakEffectCommands: - dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImpostorProfessorOakEffect + dbw EFFECTCMDTYPE_BEFORE_DAMAGE, ImposterProfessorOakEffect db $00 ComputerSearchEffectCommands: 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 |