summaryrefslogtreecommitdiff
path: root/src/intro_credits_graphics.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/intro_credits_graphics.c')
-rw-r--r--src/intro_credits_graphics.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index 73210c5d9..45f104f83 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -303,7 +303,7 @@ const struct CompressedSpriteSheet gUnknown_08416E34[] = {
EWRAM_DATA u16 gUnknown_02039358 = 0;
EWRAM_DATA s16 gUnknown_0203935A = 0;
-EWRAM_DATA s16 gUnknown_0203935C = 0;
+EWRAM_DATA s16 gIntroCredits_MovingSceneryState = 0;
extern u8 gReservedSpritePaletteCount;
@@ -335,7 +335,7 @@ void load_intro_part2_graphics(u8 a)
sub_8149264();
break;
}
- gUnknown_0203935C = 0;
+ gIntroCredits_MovingSceneryState = 0;
gReservedSpritePaletteCount = 8;
}
@@ -407,7 +407,7 @@ void sub_8148CB0(u8 a)
break;
}
gReservedSpritePaletteCount = 8;
- gUnknown_0203935C = 0;
+ gIntroCredits_MovingSceneryState = 0;
}
void sub_8148E90(u8 a)
@@ -480,7 +480,7 @@ void sub_8148F3C(u8 taskId)
}
}
-void sub_8149020(u8 mode)
+void CycleSceneryPalette(u8 mode)
{
u16 x;
u16 y;
@@ -527,23 +527,23 @@ void sub_8149020(u8 mode)
void sub_814910C(struct Sprite *sprite)
{
- if (gUnknown_0203935C)
+ if (gIntroCredits_MovingSceneryState)
{
DestroySprite(sprite);
}
else
{
- s32 var = ((sprite->pos1.x << 16) | (u16)sprite->data[2]) + (u16)sprite->data[1];
- sprite->pos1.x = var >> 16;
+ s32 var = ((sprite->x << 16) | (u16)sprite->data[2]) + (u16)sprite->data[1];
+ sprite->x = var >> 16;
sprite->data[2] = var;
- if (sprite->pos1.x > 255) sprite->pos1.x = 0xFFE0;
+ if (sprite->x > 255) sprite->x = 0xFFE0;
if (sprite->data[0])
{
- sprite->pos2.y = -(gUnknown_02039358 + gUnknown_0203935A);
+ sprite->y2 = -(gUnknown_02039358 + gUnknown_0203935A);
}
else
{
- sprite->pos2.y = -gUnknown_02039358;
+ sprite->y2 = -gUnknown_02039358;
}
}
}
@@ -590,10 +590,10 @@ void nullsub_82(struct Sprite *sprite)
void sub_81492A0(struct Sprite* sprite)
{
sprite->invisible = gSprites[sprite->data[0]].invisible;
- sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
- sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + 8;
- sprite->pos2.x = gSprites[sprite->data[0]].pos2.x;
- sprite->pos2.y = gSprites[sprite->data[0]].pos2.y;
+ sprite->x = gSprites[sprite->data[0]].x;
+ sprite->y = gSprites[sprite->data[0]].y + 8;
+ sprite->x2 = gSprites[sprite->data[0]].x2;
+ sprite->y2 = gSprites[sprite->data[0]].y2;
}
@@ -621,9 +621,9 @@ void nullsub_83(struct Sprite *sprite)
void sub_81493C4(struct Sprite* sprite)
{
sprite->invisible = gSprites[sprite->data[0]].invisible;
- sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
- sprite->pos2.x = gSprites[sprite->data[0]].pos2.x;
- sprite->pos2.y = gSprites[sprite->data[0]].pos2.y;
+ sprite->y = gSprites[sprite->data[0]].y;
+ sprite->x2 = gSprites[sprite->data[0]].x2;
+ sprite->y2 = gSprites[sprite->data[0]].y2;
}
u8 intro_create_latios_sprite(s16 a, s16 b)