summaryrefslogtreecommitdiff
path: root/src/code/z_common_data.c
diff options
context:
space:
mode:
authorshawlucas <lgs84@cornell.edu>2020-03-21 18:13:55 -0700
committershawlucas <lgs84@cornell.edu>2020-03-21 18:14:17 -0700
commit08b73fe68558c041d332ae330a06bee7f052c68b (patch)
tree4de9435b02ab20ec289058acf94596f4aaaab63b /src/code/z_common_data.c
parentfd2dae78a2f90af23a834f77bab7dfff2e05f5d6 (diff)
parent1d79f4b93d77f7f52c805c2b8a04975e63cc3aaa (diff)
fixed merge conflict
Diffstat (limited to 'src/code/z_common_data.c')
-rw-r--r--src/code/z_common_data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 63802a742..0625a2b54 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -14,7 +14,7 @@ void SaveContext_Init(void)
gSaveContext.chamber_cutscene_num = 0;
gSaveContext.next_day_time = 0xFFFF;
gSaveContext.environment_time = 0;
- gSaveContext.unk_141C = 1;
+ gSaveContext.dogIsLost = 1;
gSaveContext.transition_type = 0xFF;
gSaveContext.unk_13EE = 50;
}