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

Merge branch 'master' into continue_union_room

Browse Source
This commit is contained in:
PikalaxALT
2019-03-30 12:41:10 -04:00
parent 3b9275b133 35cffea987
commit ccac4694cd
26 changed files with 3595 additions and 8781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/union_room.c
+1 -1
View File
@@ -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);