diff options
author | yenatch <yenatch@gmail.com> | 2017-06-20 20:41:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-20 20:41:33 -0400 |
commit | 4ba573ed1eba7c37160ce6107d95447f42902385 (patch) | |
tree | 5973f1e72156bb75cb6561a11dd7f333b90fcb3f /data/scripts | |
parent | 13b02fc8232ce61062afe46ca13a1930a3bbc286 (diff) | |
parent | b22e5219ba01c70da9a03397430bff10d0b99060 (diff) |
Merge branch 'master' into patch-1
Diffstat (limited to 'data/scripts')
-rw-r--r-- | data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc | 2 | ||||
-rw-r--r-- | data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 4f121118a..0c6ec79f7 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -67,7 +67,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 releaseall end -gUnknown_08152850:: @ 8152850 +gBrendanHouse_TurnPCOff:: @ 8152850 setvar 0x8004, 1 playsfx SE_PC_OFF special 215 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 7871940ca..1aca3f86e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -215,7 +215,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C releaseall end -gUnknown_08152C75:: @ 8152C75 +gMayHouse_TurnPCOff:: @ 8152C75 setvar 0x8004, 2 playsfx SE_PC_OFF special 215 |