diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
| commit | a58d9a16dd7e4f263ebccda50e70103e7490886b (patch) | |
| tree | ddde359501adee874131731c700862c615c46e77 /src/pokedex_cry_screen.c | |
| parent | a677d1f4cb6f2925e9694b8d2b408273dcd13d9b (diff) | |
| parent | 9e74409bb2032e25d431dda116462759e5b51fe0 (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/pokedex_cry_screen.c')
| -rw-r--r--[-rwxr-xr-x] | src/pokedex_cry_screen.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c index 8ca0c8d6e..487db6d58 100755..100644 --- a/src/pokedex_cry_screen.c +++ b/src/pokedex_cry_screen.c @@ -169,9 +169,14 @@ const struct OamData gOamData_85B8C60 = { .y = 160, .affineMode = ST_OAM_AFFINE_NORMAL, + .objMode = ST_OAM_OBJ_NORMAL, + .bpp = ST_OAM_4BPP, .shape = SPRITE_SHAPE(64x64), + .x = 0, .size = SPRITE_SIZE(64x64), - .priority = 1 + .tileNum = 0, + .priority = 1, + .paletteNum = 0, }; const struct SpriteTemplate gUnknown_085B8C68 = @@ -521,3 +526,4 @@ static void sub_8145B24(s8 a0) sCryVolumeMeter->unk1 = r2; sCryVolumeMeter->unk2 = 5; } + |