diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 10:39:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-03-31 10:39:11 -0400 |
| commit | db4e9505adb121b35b50d3b6fbc7e4595c2f90a8 (patch) | |
| tree | 17c6d45f75cfb684fdc87825ca8d857d40bcc0c2 /src/union_room.c | |
| parent | 0ba4d0cadcb2cf22dabc791964038457aa5b46ec (diff) | |
| parent | 500d009b5c52345afce3dfd103113cfa77e7b262 (diff) | |
Merge branch 'master' into mystery_gift
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 a623527ec..df0137379 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -44,6 +44,7 @@ #include "easy_chat.h" #include "event_obj_lock.h" #include "union_room_chat.h" +#include "berry_crush.h" EWRAM_DATA u8 gUnknown_02022C20[12] = {}; EWRAM_DATA u8 gUnknown_02022C2C = 0; @@ -98,7 +99,6 @@ void sub_801807C(struct TradeUnkStruct *arg0); void sub_801AC54(void); void sub_802A9A8(u8 monId, MainCallback callback); void sub_802493C(u8 monId, MainCallback callback); -void sub_8020C70(MainCallback callback); void sub_80149D8(void); u16 sub_8019930(void); void sub_8018784(u8 windowId); |