diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-29 21:27:08 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-29 21:27:08 -0500 |
| commit | accc5ae8dd2b9e26179bdb641f1e3fff5e2ef392 (patch) | |
| tree | 0b25666cbc303564634e2820c3cbe82aa01b1181 /include | |
| parent | a978a6a62400b2bfba7107b66077d21822759cff (diff) | |
| parent | 7211f996a5ebf37ac7e2feffb0fd6c270d810513 (diff) | |
Merge remote-tracking branch 'upstream/master' into union_room_chat
# Conflicts:
# ld_script.txt
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/vars.h | 2 | ||||
| -rw-r--r-- | include/union_room.h | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/include/constants/vars.h b/include/constants/vars.h index 81ae99e1e..20524611b 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -60,7 +60,7 @@ #define VAR_POISON_STEP_COUNTER 0x402B #define VAR_RESET_RTC_ENABLE 0x402C #define VAR_ENIGMA_BERRY_AVAILABLE 0x402D -#define VAR_UNUSED_0x402E 0x402E // Unused Var +#define VAR_0x402E 0x402E #define VAR_FRONTIER_MANIAC_FACILITY 0x402F #define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 diff --git a/include/union_room.h b/include/union_room.h new file mode 100644 index 000000000..7634e4763 --- /dev/null +++ b/include/union_room.h @@ -0,0 +1,9 @@ +#ifndef GUARD_UNION_ROOM_H +#define GUARD_UNION_ROOM_H + +extern bool8 gUnknown_02022C60; + +void sub_8018798(u8); +void sub_80186EC(bool8, bool32); + +#endif //GUARD_UNION_ROOM_H |