diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-04 14:45:07 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-05-04 14:45:07 -0400 |
| commit | d6a494551ac6b50403a2ab831b7aaecad6865f5e (patch) | |
| tree | fe583048a5ed9defc2c7bfd20e34fc5dbbac1bfd | |
| parent | 5bd2c0ef5c185e248436e34cb3fded49736cfcfa (diff) | |
Fix corresponding mislabeled rival script
| -rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 164e973e5..c21a0e184 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1240,9 +1240,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC compare PLAYER_STARTER_NUM, 0 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander compare PLAYER_STARTER_NUM, 1 - goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle - compare PLAYER_STARTER_NUM, 2 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle end PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF @@ -1251,14 +1251,14 @@ PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D0F - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D0F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end -PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D1F - applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle +PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D1F + applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur waitmovement 0 goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter end @@ -1293,7 +1293,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62 walk_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B +PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D6B walk_down walk_right walk_right @@ -1302,7 +1302,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B walk_in_place_fastest_up step_end -PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D72 +PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D72 walk_down walk_right walk_right |