diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-03-19 11:00:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-19 11:00:32 -0400 |
| commit | 33b65b547000387fcdce9fe497da9b217544ece6 (patch) | |
| tree | 0c1754c67d188776ee1942fcca503ad8e1e19f05 /data/maps | |
| parent | 715c2ff3ad3a7842a97a2b221f4c02135a813139 (diff) | |
| parent | a8403c07790b1031c96ff35a1701e1684919ed95 (diff) | |
Merge pull request #307 from PikalaxALT/field_control_avatar
Field control avatar
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/PalletTown/scripts.inc | 6 | ||||
| -rw-r--r-- | data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index eb8904713..b165ae6b9 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -18,7 +18,7 @@ PalletTown_OnTransition:: @ 8165465 end PalletTown_EventScript_TryReadySignLady:: @ 8165488 - goto_if_unset FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, EventScript_Return + goto_if_unset FLAG_OPENED_START_MENU, EventScript_Return compare VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 goto_if_ge EventScript_Return setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 @@ -447,10 +447,10 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 closemessage delay 20 textcolor 3 - setflag FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN + setflag FLAG_OPENED_START_MENU setvar VAR_MAP_SCENE_PALLET_TOWN_SIGN_LADY, 1 setvar SIGN_LADY_READY, FALSE - special sub_80699E0 + special SetWalkingIntoSignVars special sub_80699BC signmsg msgbox PalletTown_Text_PressStartToOpenMenuCopy diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 395d4d385..461318e35 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -1274,7 +1274,7 @@ PalletTown_ProfessorOaksLab_EventScript_RivalTakesStarter:: @ 8169D2F playfanfare MUS_FAN5 waitfanfare setvar VAR_MAP_SCENE_PALLET_TOWN_PROFESSOR_OAKS_LAB, 3 - call_if_set FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene + call_if_set FLAG_OPENED_START_MENU, PalletTown_ProfessorOaksLab_EventScript_ReadyEndSignLadyScene release end |