dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mystery_gift

Browse Source
This commit is contained in:
PikalaxALT
2019-03-31 10:39:11 -04:00
parent 0ba4d0cadc 500d009b5c
commit db4e9505ad
17 changed files with 1698 additions and 3472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/union_room.c
View File

@@ -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);