diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-30 12:41:10 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-30 12:41:10 -0400 |
| commit | ccac4694cd689eb023d65d7450645709ad47b3ba (patch) | |
| tree | 0226734542e5baef600fecb1f824f47716fe0d12 /src/union_room.c | |
| parent | 3b9275b133c875bda4f8d43fe300394d9c4cbb2a (diff) | |
| parent | 35cffea9874a8b135eddade958b62ee2ecf441c1 (diff) | |
Merge branch 'master' into continue_union_room
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/union_room.c b/src/union_room.c index 6928f13d6..338063ef1 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -43,6 +43,7 @@ #include "rom_8011DC0.h" #include "easy_chat.h" #include "event_obj_lock.h" +#include "union_room_chat.h" EWRAM_DATA u8 gUnknown_02022C20[12] = {}; EWRAM_DATA u8 gUnknown_02022C2C = 0; @@ -95,7 +96,6 @@ bool32 sub_8017678(struct UnkStruct_Shared *arg0, struct UnkStruct_Shared *arg1) u32 sub_8018120(struct TradeUnkStruct *arg0, u8 multiplayerId); void sub_801807C(struct TradeUnkStruct *arg0); void sub_801AC54(void); -void sub_801DD98(void); void sub_802A9A8(u8 monId, MainCallback callback); void sub_802493C(u8 monId, MainCallback callback); void sub_8020C70(MainCallback callback); |