summaryrefslogtreecommitdiff
path: root/src/battle_script_commands.c
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-03-17 17:32:42 -0500
committerGitHub <noreply@github.com>2019-03-17 17:32:42 -0500
commit7154d2614d21c5a5931fc944e247059d49cda782 (patch)
tree414ed687f836521c1a966531e87122951c070083 /src/battle_script_commands.c
parent4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff)
parente9a3cc6d51ce3818eed11de585f5084342450093 (diff)
Merge pull request #595 from Phlosioneer/move-tutor
Move tutor
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r--src/battle_script_commands.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 025d694e4..0eb6dfec0 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -49,14 +49,12 @@
#include "field_specials.h"
#include "pokemon_summary_screen.h"
#include "pokenav.h"
+#include "menu_specialized.h"
extern struct MusicPlayerInfo gMPlayInfo_BGM;
extern const u8* const gBattleScriptsForMoveEffects[];
-// functions
-extern void sub_81D388C(struct Pokemon* mon, void* statStoreLocation); // pokenav.s
-
#define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED))
// this file's functions
@@ -6319,16 +6317,16 @@ static void sub_804F100(void)
{
struct StatsArray currentStats;
- sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
- sub_81D3640(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
+ GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
+ DrawLevelUpWindowPg1(0xD, gBattleResources->statsBeforeLvlUp, &currentStats, 0xE, 0xD, 0xF);
}
static void sub_804F144(void)
{
struct StatsArray currentStats;
- sub_81D388C(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
- sub_81D3784(0xD, &currentStats, 0xE, 0xD, 0xF);
+ GetMonLevelUpWindowStats(&gPlayerParty[gBattleStruct->expGetterMonId], &currentStats);
+ DrawLevelUpWindowPg2(0xD, &currentStats, 0xE, 0xD, 0xF);
}
static void sub_804F17C(void)