diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 11:44:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 11:44:50 -0400 |
| commit | 8c86b656d2fa97fc5eb113e9807d49f48c715f8b (patch) | |
| tree | 01e14b4dec7ef184ca50b9f0815a662590520045 /src/battle_interface.c | |
| parent | 32693e94d844cb401aed91d066b9f5ad1eb440a7 (diff) | |
| parent | 1bd678656c735bbeb603ccb80367c7a85f820f61 (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'src/battle_interface.c')
| -rw-r--r-- | src/battle_interface.c | 78 |
1 files changed, 38 insertions, 40 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c index 58f667da4..5ec42bb4b 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -15,6 +15,7 @@ #include "text.h" #include "ewram.h" #include "graphics.h" +#include "pokemon_summary_screen.h" struct UnknownStruct5 { @@ -249,7 +250,7 @@ const struct SpritePalette gUnknown_0820A774[] = { gUnknown_08D1214C, 0xd713 }, }; -const struct CompressedSpriteSheet gUnknown_0820A784[] = +const struct SpriteSheet gUnknown_0820A784[] = { { Tiles_D129AC, 0x80, 0xd714 }, { Tiles_D129AC, 0x80, 0xd715 }, @@ -269,48 +270,45 @@ const struct OamData gOamData_820A79C = .priority = 1, }; -const struct SpriteTemplate gSpriteTemplate_820A7A4 = +const struct SpriteTemplate gSpriteTemplate_820A7A4[] = { - .tileTag = 55052, - .paletteTag = 55056, - .oam = &gOamData_820A4E4, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8045030, -}; - -const struct SpriteTemplate gSpriteTemplate_820A7BC = -{ - .tileTag = 55053, - .paletteTag = 55057, - .oam = &gOamData_820A4E4, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_8045030, -}; - -const struct SpriteTemplate gSpriteTemplate_820A7D4 = -{ - .tileTag = 55060, - .paletteTag = 55058, - .oam = &gOamData_820A79C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_804507C, + { + .tileTag = 55052, + .paletteTag = 55056, + .oam = &gOamData_820A4E4, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8045030, + }, { + .tileTag = 55053, + .paletteTag = 55057, + .oam = &gOamData_820A4E4, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_8045030, + } }; -const struct SpriteTemplate gSpriteTemplate_820A7EC = -{ - .tileTag = 55061, - .paletteTag = 55059, - .oam = &gOamData_820A79C, - .anims = gDummySpriteAnimTable, - .images = NULL, - .affineAnims = gDummySpriteAffineAnimTable, - .callback = sub_804507C, +const struct SpriteTemplate gSpriteTemplate_820A7D4[] = { + { + .tileTag = 55060, + .paletteTag = 55058, + .oam = &gOamData_820A79C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_804507C, + }, { + .tileTag = 55061, + .paletteTag = 55059, + .oam = &gOamData_820A79C, + .anims = gDummySpriteAnimTable, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = sub_804507C, + } }; u8 *const gUnknown_0820A804[2] = |