diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /include/quest_log.h | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'include/quest_log.h')
| -rw-r--r-- | include/quest_log.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/quest_log.h b/include/quest_log.h index 3f6c94de5..3dfd5f35c 100644 --- a/include/quest_log.h +++ b/include/quest_log.h @@ -47,7 +47,6 @@ void sub_81139BC(void); void *QuestLogGetFlagOrVarPtr(bool8 isFlag, u16 idx); void QuestLogSetFlagOrVar(bool8 isFlag, u16 idx, u16 value); void sub_8110840(void *oldSave); - -extern u8 gUnknown_203ADFA; +void sub_8112F18(u8 windowId); #endif //GUARD_QUEST_LOG_H |