From 1616f998fc6124b8894109b3137a8448cb85f0d6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 26 Feb 2018 08:42:15 -0500 Subject: Rename some flags relevant to the conditions under which Wattson becomes available for rematch --- data/event_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 6668f0d1f..42c5aa1ad 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1161,7 +1161,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x376 setflag FLAG_0x374 setflag FLAG_0x375 - setflag FLAG_0x3C1 + setflag FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION setflag FLAG_0x378 setflag FLAG_0x2F0 setflag FLAG_0x2F5 @@ -1177,7 +1177,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_0x38F setflag FLAG_0x393 setflag FLAG_0x358 - setflag FLAG_0x390 + setflag FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON setflag FLAG_0x2FD setflag FLAG_0x398 setflag FLAG_0x399 -- cgit v1.2.3 From 89847427e48b434bbc403066673f89b688b4d9c7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 2 Mar 2018 08:44:33 -0500 Subject: match_call_t; through sub_81D17E4 --- data/event_scripts.s | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 6668f0d1f..f1026d5ff 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -49,7 +49,7 @@ gStdScripts:: @ 81DC2A0 .4byte Std_5 .4byte Std_6 .4byte Std_ObtainDecoration - .4byte Std_8 + .4byte Std_RegisteredInMatchCall .4byte Std_9 .4byte Std_10 @@ -4075,7 +4075,7 @@ Underwater3_EventScript_2742C0:: @ 82742C0 setescapewarp ROUTE_129, 255, 43, 20 return -Std_8:: @ 82742C9 +Std_RegisteredInMatchCall:: @ 82742C9 buffertrainerclassname 0, VAR_0x8000 buffertrainername 1, VAR_0x8000 closemessage -- cgit v1.2.3 From e7cf8e5c1713c624b7b9db7a58c6c812e90ec7a9 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Mon, 12 Mar 2018 13:56:20 +0530 Subject: Start decompile player_pc --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 42c5aa1ad..44705269c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1788,7 +1788,7 @@ EventScript_271DBC:: @ 8271DBC EventScript_271DF9:: @ 8271DF9 playse SE_PC_LOGIN msgbox gUnknown_082726C2, 4 - special sub_816AE98 + special PlayerPC waitstate goto EventScript_271DAC end -- cgit v1.2.3 From 57775a946d6a0274ca6d5530e00eb63d0963499d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20L=C3=B8vig?= Date: Wed, 28 Mar 2018 21:09:27 +0200 Subject: Rename start menu functions --- data/event_scripts.s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/event_scripts.s') diff --git a/data/event_scripts.s b/data/event_scripts.s index 42c5aa1ad..f4e6b1086 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -835,7 +835,7 @@ SlateportCity_BattleTentLobby_EventScript_27134F:: @ 827134F SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F:: @ 827134F TrainerHill_Entrance_EventScript_27134F:: @ 827134F VerdanturfTown_BattleTentLobby_EventScript_27134F:: @ 827134F - special sub_809FF80 + special SaveGame waitstate return -- cgit v1.2.3