Merge branch 'master' into fix-eventobj · 655910a16f - PokemonEmeraldSafariFrontier - Gitea: Git with a cup of tea

dionmoustos/PokemonEmeraldSafariFrontier

Merge branch 'master' into fix-eventobj

This commit is contained in:

GriffinR

2020-01-12 22:42:43 -05:00

committed by

GitHub

parent 635267ce32 fa5816915d

commit 655910a16f

127 changed files with 15606 additions and 21934 deletions

									
										src/decoration.c
									
		+2
		-1
	
												View File
												
				@@ -2154,7 +2154,8 @@ void sub_8129708(void)

				    }

				}

				void sub_81297AC(void)

				// Unused

				void GetEventObjectLocalIdByFlag(void)

				{

				    u8 i;