dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #337 from GriffinRichards/fix-scriptlabel

Browse Source 
Fix mislabeled starter script
This commit is contained in:
PikalaxALT
2020-05-27 07:51:13 -04:00
committed by GitHub
parent b7318eaa15 d6a494551a
commit 94b68c54e8
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+12 -12
View File
@@ -1174,9 +1174,9 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmStarterChoice:: @ 8169BE1
compare PLAYER_STARTER_NUM, 0 compare PLAYER_STARTER_NUM, 0
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur
compare PLAYER_STARTER_NUM, 1 compare PLAYER_STARTER_NUM, 1
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander
compare PLAYER_STARTER_NUM, 2
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle
compare PLAYER_STARTER_NUM, 2
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander
end end
PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14 PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14
@@ -1187,7 +1187,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmBulbasaur:: @ 8169C14
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
end end
PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33 PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C33
msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingSquirtle, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
@@ -1195,7 +1195,7 @@ PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C33
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter goto_if_eq PalletTown_ProfessorOaksLab_EventScript_DeclinedStarter
end end
PalletTown_ProfessorOaksLab_EventScript_ConfirmSquirtle:: @ 8169C52 PalletTown_ProfessorOaksLab_EventScript_ConfirmCharmander:: @ 8169C52
msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO msgbox PalletTown_ProfessorOaksLab_Text_OakChoosingCharmander, MSGBOX_YESNO
compare VAR_RESULT, YES compare VAR_RESULT, YES
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter goto_if_eq PalletTown_ProfessorOaksLab_EventScript_ChoseStarter
@@ -1240,9 +1240,9 @@ PalletTown_ProfessorOaksLab_EventScript_RivalPicksStarter:: @ 8169CDC
compare PLAYER_STARTER_NUM, 0 compare PLAYER_STARTER_NUM, 0
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander
compare PLAYER_STARTER_NUM, 1 compare PLAYER_STARTER_NUM, 1
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle
compare PLAYER_STARTER_NUM, 2
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur
compare PLAYER_STARTER_NUM, 2
goto_if_eq PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle
end end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF
@@ -1251,14 +1251,14 @@ PalletTown_ProfessorOaksLab_EventScript_RivalWalksToCharmander:: @ 8169CFF
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D0F PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D0F
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle
waitmovement 0 waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end end
PalletTown_ProfessorOaksLab_EventScript_RivalWalksToSquirtle:: @ 8169D1F PalletTown_ProfessorOaksLab_EventScript_RivalWalksToBulbasaur:: @ 8169D1F
applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle applymovement LOCALID_RIVAL, PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur
waitmovement 0 waitmovement 0
goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter goto PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter
end end
@@ -1293,7 +1293,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToCharmander:: @ 8169D62
walk_up walk_up
step_end step_end
PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D6B
walk_down walk_down
walk_right walk_right
walk_right walk_right
@@ -1302,7 +1302,7 @@ PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D6B
walk_in_place_fastest_up walk_in_place_fastest_up
step_end step_end
PalletTown_ProfessorOaksLab_Movement_RivalWalksToSquirtle:: @ 8169D72 PalletTown_ProfessorOaksLab_Movement_RivalWalksToBulbasaur:: @ 8169D72
walk_down walk_down
walk_right walk_right
walk_right walk_right