summaryrefslogtreecommitdiff
path: root/src/credits.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/credits.c')
-rw-r--r--src/credits.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/credits.c b/src/credits.c
index a88e4b549..cbf77f1b3 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -12,7 +12,7 @@
#include "gpu_regs.h"
#include "m4a.h"
#include "constants/rgb.h"
-#include "battle_dome_cards.h"
+#include "trainer_pokemon_sprites.h"
#include "starter_choose.h"
#include "decompress.h"
#include "intro_credits_graphics.h"
@@ -948,7 +948,15 @@ static const struct BgTemplate gUnknown_085E6F68[] =
};
static const struct WindowTemplate gUnknown_085E6F6C[] =
{
- { 0x00, 0x00, 0x09, 0x1E, 0x0C, 0x08, 0x0001 },
+ {
+ .priority = 0,
+ .tilemapLeft = 0,
+ .tilemapTop = 9,
+ .width = 30,
+ .height = 12,
+ .paletteNum = 8,
+ .baseBlock = 1
+ },
DUMMY_WIN_TEMPLATE,
};
static const u8 gUnknown_085E6F7C[][2] =
@@ -1197,7 +1205,6 @@ void sub_8175620(void)
u8 taskIdA;
s16 taskIdC;
u8 taskIdB;
- u16 savedIme;
sub_8175CE4();
SetVBlankCallback(NULL);
@@ -1333,7 +1340,7 @@ static void sub_81758E4(u8 taskIdA)
u16 *temp;
ResetSpriteData();
- dp13_810BB8C();
+ ResetAllPicSprites();
FreeAllSpritePalettes();
gReservedSpritePaletteCount = 8;
LZ77UnCompVram(&gBirchHelpGfx, (void *)VRAM);
@@ -2164,7 +2171,7 @@ static void sub_8177050(struct Sprite *sprite)
{
if (gUnknown_0203BD28)
{
- sub_818D820(sprite->data[6]);
+ FreeAndDestroyMonPicSprite(sprite->data[6]);
return;
}
@@ -2242,7 +2249,7 @@ static void sub_8177050(struct Sprite *sprite)
case 10:
SetGpuReg(REG_OFFSET_BLDCNT, 0);
SetGpuReg(REG_OFFSET_BLDALPHA, 0);
- sub_818D820(sprite->data[6]);
+ FreeAndDestroyMonPicSprite(sprite->data[6]);
break;
}
}