diff options
author | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:17 -0500 |
---|---|---|
committer | GriffinR <griffin.richards@comcast.net> | 2019-12-06 21:37:33 -0500 |
commit | b93101bbebaae9be44b9b4ada81766264135cca9 (patch) | |
tree | 73373641b7f1eed21c4c5d9423cd5668ab8c4a27 /src/battle_script_commands.c | |
parent | 1b30f0c9733da023e89b9aaa9e3d74cdd78b3e53 (diff) | |
parent | 47ea65b96e4575a335d3197483841041cb361541 (diff) |
Merge master into ObjEvent rename
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index eab7b7d04..c44411f8d 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -730,10 +730,10 @@ static const u8 sRubyLevelUpStatBoxStats[] = static const struct OamData sOamData_MonIconOnLvlUpBox = { .y = 0, - .affineMode = 0, - .objMode = 0, + .affineMode = ST_OAM_AFFINE_OFF, + .objMode = ST_OAM_OBJ_NORMAL, .mosaic = 0, - .bpp = 0, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(32x32), .x = 0, .matrixNum = 0, |