diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:41:27 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-14 10:46:04 -0400 |
| commit | b8fec3d9f617ec9a764bb56804c526ff7449631f (patch) | |
| tree | 2e84d0bf6107a15ebcb94a23c3158e2bc6382f6f /data/maps | |
| parent | 9fe74ac590f75a0571de8ebcd499fdf892419328 (diff) | |
| parent | 8efae5c807bf6b27f5c90bfb0c5887dbde24f10d (diff) | |
Merge branch 'master' into trade
Diffstat (limited to 'data/maps')
| -rw-r--r-- | data/maps/PalletTown_PlayersHouse_2F/scripts.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index 3700d06be..51865301c 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -36,7 +36,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 goto_if_eq EventScript_1A7AE0 lockall setvar VAR_0x8004, 32 - special sub_812B220 + special Special_SetSomeVariable setvar VAR_0x8004, 1 special sub_80CA86C playse SE_PC_ON @@ -47,7 +47,7 @@ PalletTown_PlayersHouse_2F_EventScript_168CE4:: @ 8168CE4 releaseall end -gUnknown_8168D17:: @ 8168D17 +EventScript_PalletTown_PlayersHouse_2F_ShutDownPC:: @ 8168D17 setvar VAR_0x8004, 1 playse SE_PC_OFF special sub_80CA9A8 |