summaryrefslogtreecommitdiff
path: root/src/title_screen.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-12-20 13:30:27 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-12-20 13:30:27 -0500
commitd0e15e34c57ae87a5c6f1ea886c6ccf4fc5b88c6 (patch)
treee8199a3d95969dfaf3cf07473ad7088a4d867c70 /src/title_screen.c
parent981c0dd3981c0cc0038cb45bda2e638a692f8cd3 (diff)
Dump LeafGreen encounters
Diffstat (limited to 'src/title_screen.c')
-rw-r--r--src/title_screen.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/title_screen.c b/src/title_screen.c
index b2091a4c5..442ce9896 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -162,14 +162,21 @@ static const struct SpriteTemplate sSpriteTemplate_FlameOrLeaf_State1 = {
};
#if defined(FIRERED)
-#define sOamData_LG_83BF950 sOamData_FlameOrLeaf
+static const struct SpriteTemplate sSpriteTemplate_FlameOrLeaf_State0 = {
+ .tileTag = 1,
+ .paletteTag = 0,
+ .oam = &sOamData_FlameOrLeaf,
+ .anims = sSpriteAnimTable_FlameOrLeaf,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy
+};
#elif defined(LEAFGREEN)
static const struct OamData sOamData_LG_83BF950 = {
.shape = SPRITE_SHAPE(32x16),
.size = SPRITE_SIZE(32x16),
.priority = 3
};
-#endif
static const struct SpriteTemplate sSpriteTemplate_FlameOrLeaf_State0 = {
.tileTag = 1,
@@ -180,8 +187,9 @@ static const struct SpriteTemplate sSpriteTemplate_FlameOrLeaf_State0 = {
.affineAnims = gDummySpriteAffineAnimTable,
.callback = SpriteCallbackDummy
};
+#endif
-static const struct OamData sOamData_UnknownTemptySprite = {
+static const struct OamData sOamData_UnknownEmptySprite = {
.objMode = ST_OAM_OBJ_NORMAL,
.shape = ST_OAM_V_RECTANGLE,
.size = ST_OAM_SIZE_3,
@@ -193,7 +201,7 @@ static const struct OamData sOamData_UnknownTemptySprite = {
static const struct SpriteTemplate sUnknownEmptySprite = {
.tileTag = 2,
.paletteTag = 2,
- .oam = &sOamData_UnknownTemptySprite,
+ .oam = &sOamData_UnknownEmptySprite,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,