summaryrefslogtreecommitdiff
path: root/src/pokemon_storage_system_3.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-07-24 17:34:20 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-07-24 18:50:44 -0500
commite76b56b000739b418f04d286764652b101bbd8a8 (patch)
treed624952e8e95e602611a9aee2364a9e1e674bfac /src/pokemon_storage_system_3.c
parent8ca8d353ee520be31ca35aae1aae2ea2b9b4ffd8 (diff)
Merge pokemon_storage_system 4 and 5
Diffstat (limited to 'src/pokemon_storage_system_3.c')
-rw-r--r--src/pokemon_storage_system_3.c61
1 files changed, 30 insertions, 31 deletions
diff --git a/src/pokemon_storage_system_3.c b/src/pokemon_storage_system_3.c
index da26c6fc5..cbac7a504 100644
--- a/src/pokemon_storage_system_3.c
+++ b/src/pokemon_storage_system_3.c
@@ -23,6 +23,35 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite);
// .rodata
const struct OamData gOamData_83B6F2C;
+const struct SpriteTemplate gSpriteTemplate_83B6F14 = {
+ 0x000f,
+ 0xdac0,
+ &gOamData_83B6F2C,
+ gDummySpriteAnimTable,
+ NULL,
+ gDummySpriteAffineAnimTable,
+ SpriteCallbackDummy
+};
+
+const struct OamData gOamData_83B6F2C = {
+ .size = 2
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = {
+ AFFINEANIMCMD_FRAME(-2, -2, 0, 120),
+ AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = {
+ AFFINEANIMCMD_FRAME(16, 16, 0, 0),
+ AFFINEANIMCMD_FRAME(16, 16, 0, 15),
+ AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = {
+ gSpriteAffineAnim_83B6F34,
+ gSpriteAffineAnim_83B6F44
+};
// .text
@@ -481,8 +510,6 @@ bool8 sub_809971C(void)
return TRUE;
}
-const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[];
-
void sub_809981C(u8 mode, u8 idx)
{
switch (mode)
@@ -599,15 +626,7 @@ static void PSS_ForgetSpeciesIcon(u16 a0)
static struct Sprite *PSS_SpawnMonIconSprite(u16 species, u32 personality, s16 x, s16 y, u8 priority, u8 subpriority)
{
- struct SpriteTemplate template = {
- 0x000f,
- 0xdac0,
- &gOamData_83B6F2C,
- gDummySpriteAnimTable,
- NULL,
- gDummySpriteAffineAnimTable,
- SpriteCallbackDummy
- };
+ struct SpriteTemplate template = gSpriteTemplate_83B6F14;
u16 tileNum;
u8 spriteId;
@@ -633,23 +652,3 @@ static void PSS_DestroyMonIconSprite(struct Sprite *sprite)
PSS_ForgetSpeciesIcon(sprite->data[0]);
DestroySprite(sprite);
}
-
-const struct OamData gOamData_83B6F2C = {
- .size = 2
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_83B6F34[] = {
- AFFINEANIMCMD_FRAME(-2, -2, 0, 120),
- AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd gSpriteAffineAnim_83B6F44[] = {
- AFFINEANIMCMD_FRAME(16, 16, 0, 0),
- AFFINEANIMCMD_FRAME(16, 16, 0, 15),
- AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd *const gSpriteAffineAnimTable_83B6F5C[] = {
- gSpriteAffineAnim_83B6F34,
- gSpriteAffineAnim_83B6F44
-};