summaryrefslogtreecommitdiff
path: root/src/battle_bg.c
diff options
context:
space:
mode:
authorKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
committerKurausukun <lord.uber1@gmail.com>2021-03-19 14:34:58 -0400
commitc94e5e9ab0b2b65c8c6275f84043807b2743d6f2 (patch)
treeb188427bb1942695f32e14ee3fe137855d638c8c /src/battle_bg.c
parent0643255c85d0ebd5212e731c9fad3b43d0d99a10 (diff)
parented16a7409ae9c808a110975dec1930f9f949a6d6 (diff)
Merge remote-tracking branch 'upstream/master' into port_matchings
Diffstat (limited to 'src/battle_bg.c')
-rw-r--r--src/battle_bg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c
index e66180c4d..32d3e017a 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -85,7 +85,7 @@ static const struct SpriteTemplate sVsLetter_V_SpriteTemplate = {
.oam = &gOamData_82482A0,
.anims = gDummySpriteAnimTable,
.affineAnims = gAffineAnimTable_82482E0,
- .callback = nullsub_9
+ .callback = SpriteCB_VsLetterDummy
};
static const struct SpriteTemplate sVsLetter_S_SpriteTemplate = {
@@ -94,7 +94,7 @@ static const struct SpriteTemplate sVsLetter_S_SpriteTemplate = {
.oam = &gOamData_82482A8,
.anims = gDummySpriteAnimTable,
.affineAnims = gAffineAnimTable_82482E0,
- .callback = nullsub_9
+ .callback = SpriteCB_VsLetterDummy
};
static const struct CompressedSpriteSheet sVsLettersSpriteSheet = {
@@ -584,7 +584,7 @@ UNUSED void CreateUnknownDebugSprite(void)
u8 spriteId;
ResetSpriteData();
- spriteId = CreateSprite(&gUnknown_824EFF0, 0, 0, 0);
+ spriteId = CreateSprite(&gUnknownDebugSprite, 0, 0, 0);
gSprites[spriteId].invisible = TRUE;
SetMainCallback2(CB2_unused);
}