From 1226dfd94622901bf1686bb53202646046f814ac Mon Sep 17 00:00:00 2001
From: PikalaxALT <PikalaxALT@gmail.com>
Date: Wed, 18 Dec 2019 22:17:14 -0500
Subject: Match rev1 intro.c maybe

---
 src/intro.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 33a03a389..8757db81d 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -131,6 +131,11 @@ static void sub_80EE9D4(struct Sprite * sprite);
 static void sub_80EEA94(struct IntroSequenceData * ptr);
 static void sub_80EEB08(struct Sprite * sprite);
 static void sub_80EEBE4(void);
+#if REVISION >= 1
+static void sub_rev1_80EDFAC(void);
+#else
+#define sub_rev1_80EDFAC()
+#endif
 
 extern const u32 gMultiBootProgram_PokemonColosseum_Start[];
 
@@ -828,6 +833,7 @@ static void sub_80ECD60(struct IntroSequenceData * this)
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             DestroySprite(this->field_0014);
+            sub_rev1_80EDFAC();
             this->field_0012 = 0;
             this->field_0004++;
         }
@@ -1592,6 +1598,36 @@ static struct Sprite * sub_80EDF68(void)
     return &gSprites[spriteId];
 }
 
+#if REVISION >= 1
+static const struct OamData sOamData_840BD64 = {
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_BLEND,
+    .mosaic = FALSE,
+    .bpp = ST_OAM_4BPP,
+    .shape = SPRITE_SHAPE(8x32),
+    .size = SPRITE_SIZE(8x32),
+    .priority = 3
+};
+
+static const struct SpriteTemplate sSprTemplate_rev1_840BD6C = {
+    .tileTag = 4,
+    .paletteTag = 3,
+    .oam = &sOamData_840BD64,
+    .anims = gDummySpriteAnimTable,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+static void sub_rev1_80EDFAC(void)
+{
+    int i;
+    for (i = 0; i < 2; i++)
+    {
+        gSprites[CreateSprite(&sSprTemplate_rev1_840BD6C, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
+    }
+}
+#endif
+
 static void sub_80EDF94(struct IntroSequenceData * this)
 {
     u8 taskId;
-- 
cgit v1.2.3


From dd0da2484f0c7593157e7c2c28444e068dff7586 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 19 Dec 2019 10:23:05 -0500
Subject: Match FireRed Rev1

---
 src/intro.c | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

(limited to 'src/intro.c')

diff --git a/src/intro.c b/src/intro.c
index 8757db81d..cee1c8fec 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1599,31 +1599,12 @@ static struct Sprite * sub_80EDF68(void)
 }
 
 #if REVISION >= 1
-static const struct OamData sOamData_840BD64 = {
-    .affineMode = ST_OAM_AFFINE_OFF,
-    .objMode = ST_OAM_OBJ_BLEND,
-    .mosaic = FALSE,
-    .bpp = ST_OAM_4BPP,
-    .shape = SPRITE_SHAPE(8x32),
-    .size = SPRITE_SIZE(8x32),
-    .priority = 3
-};
-
-static const struct SpriteTemplate sSprTemplate_rev1_840BD6C = {
-    .tileTag = 4,
-    .paletteTag = 3,
-    .oam = &sOamData_840BD64,
-    .anims = gDummySpriteAnimTable,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy
-};
-
 static void sub_rev1_80EDFAC(void)
 {
     int i;
     for (i = 0; i < 2; i++)
     {
-        gSprites[CreateSprite(&sSprTemplate_rev1_840BD6C, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
+        gSprites[CreateSprite(&gUnknown_840BCFC, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4;
     }
 }
 #endif
-- 
cgit v1.2.3