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

Merge remote-tracking branch 'upstream/master' into move-tutor

Browse Source 
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
This commit is contained in:
Marcus Huderle
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/menu_specialized.h
View File

@@ -3,6 +3,7 @@
#include "player_pc.h"
#include "list_menu.h"
#include "pokemon.h"
struct UnknownSubStruct_81D1ED4
{
@@ -47,5 +48,6 @@ bool16 MoveRelearnerRunTextPrinters(void);
void MoveRelearnerCreateYesNoMenu(void);
u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
void InitMoveRelearnerWindows(bool8 useContextWindow);
void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation);
#endif // GUARD_MENU_SPECIALIZED_H