From 901fceec188ff640f32b22343e5a0b6e7e4c9c42 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 17 Mar 2020 20:59:39 -0400 Subject: through GetInteractedObjectEventScript --- data/maps/PalletTown/scripts.inc | 4 ++-- data/maps/PalletTown_ProfessorOaksLab/scripts.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/maps') diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index eb8904713..43a56496e 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,7 +447,7 @@ 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 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 -- cgit v1.2.3 From e078e4b315532c5a309425df6bf450abbf7bba04 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 19 Mar 2020 08:45:32 -0400 Subject: Some documentation of field_control_avatar and related routines --- data/maps/PalletTown/scripts.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/maps') diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 43a56496e..b165ae6b9 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -450,7 +450,7 @@ PalletTown_EventScript_SignLadyShowSign:: @ 8165894 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 -- cgit v1.2.3