diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2019-03-17 17:20:40 -0500 |
| commit | e9a3cc6d51ce3818eed11de585f5084342450093 (patch) | |
| tree | 414ed687f836521c1a966531e87122951c070083 /src/battle_script_commands.c | |
| parent | c3feb9871f4d05cd9874dd8fc0c2016eaa072864 (diff) | |
| parent | 4ae8a52473a0e4842cf140bf0c59f0276125a896 (diff) | |
Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
# include/pokenav.h
# src/battle_script_commands.c
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 327ff76da..0eb6dfec0 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -48,17 +48,13 @@ #include "battle_pyramid.h" #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 GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation); // pokenav.s -extern void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5); // pokenav.s -extern void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4); // pokenav.s -extern u8 sub_813B21C(void); - #define DEFENDER_IS_PROTECTED ((gProtectStructs[gBattlerTarget].protected) && (gBattleMoves[gCurrentMove].flags & FLAG_PROTECT_AFFECTED)) // this file's functions @@ -735,10 +731,10 @@ static const struct OamData sOamData_MonIconOnLvlUpBox = .objMode = 0, .mosaic = 0, .bpp = 0, - .shape = 0, + .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, - .size = 2, + .size = SPRITE_SIZE(32x32), .tileNum = 0, .priority = 0, .paletteNum = 0, |