berry blender fix merge conflicts · b0657350a4 - PokemonEmeraldSafariFrontier - Gitea: Git with a cup of tea

dionmoustos/PokemonEmeraldSafariFrontier

0 Fork 0

DizzyEggg committed 2017-11-26 19:21:51 +01:00

2 parents ad3a97e178 1e4f12e6fa

commit b0657350a4

27 files changed

+1034 -2406

No files matched your search

									
										include/link.h
									
		+1
		
												View File
												
				@@ -180,6 +180,7 @@ void LinkVSync(void);

				void Timer3Intr(void);

				void SerialCB(void);

				u8 GetLinkPlayerCount(void);

				bool32 InUnionRoom(void);

				void sub_800E0E8(void);

				bool8 sub_800A520(void);