From 5bd2c0ef5c185e248436e34cb3fded49736cfcfa Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 4 May 2020 14:34:45 -0400 Subject: Fix mislabeled starter script --- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 277bc579b..164e973e5 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1174,9 +1174,9 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1 compare PLAYER_STARTER_NUM, 0 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur compare PLAYER_STARTER_NUM, 1 - goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander - compare PLAYER_STARTER_NUM, 2 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle + compare PLAYER_STARTER_NUM, 2 + goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander end PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 @@ -1187,7 +1187,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33 +PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C33 msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter @@ -1195,7 +1195,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33 goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter end -PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C52 +PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C52 msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO compare VAR_RESULT, YES goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter -- cgit v1.2.3 From d6a494551ac6b50403a2ab831b7aaecad6865f5e Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 4 May 2020 14:45:07 -0400 Subject: Fix corresponding mislabeled rival script --- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 16 ++++++++-------- 1 file 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 -- cgit v1.2.3