diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-12-19 12:34:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 12:34:20 -0500 |
| commit | 567589d3ddc30c1a78ce76739f278e4d8f35ef5f (patch) | |
| tree | b44bb56f76662182d7b51302c1817592491d0ca0 /src/intro.c | |
| parent | 7984a91c0892e0bd96ace89405d565ec0b43e084 (diff) | |
| parent | 3d123182a8fe8182f66d5e265067107bc276b84e (diff) | |
Merge pull request #187 from PikalaxALT/leafgreen
Match Pokemon FireRed 1.1 US
Diffstat (limited to 'src/intro.c')
| -rw-r--r-- | src/intro.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/intro.c b/src/intro.c index 33a03a389..cee1c8fec 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,17 @@ static struct Sprite * sub_80EDF68(void) return &gSprites[spriteId]; } +#if REVISION >= 1 +static void sub_rev1_80EDFAC(void) +{ + int i; + for (i = 0; i < 2; i++) + { + gSprites[CreateSprite(&gUnknown_840BCFC, 0x68 + 32 * i, 0x6c, 5)].oam.tileNum += i * 4; + } +} +#endif + static void sub_80EDF94(struct IntroSequenceData * this) { u8 taskId; |