diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-01 01:01:18 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-01 01:01:18 +0100 |
| commit | 988f0b7e19a4505bdd0e846550382661dcf53cc7 (patch) | |
| tree | 0e1ccb1aaa62828adbcf2108c7d8c59909ff55c4 /data/event_scripts.s | |
| parent | d29b9d268fe46322c740fe5ac440641834686f9d (diff) | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
Merge branch 'master' into decompile_battle_link_817C95C
Diffstat (limited to 'data/event_scripts.s')
| -rw-r--r-- | data/event_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
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 |