diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-04 18:50:53 -0500 |
| commit | eff6795887cc27f2c5139df9a6da70f4f02338b4 (patch) | |
| tree | f91be2b0b7194b4ddff13f4935a0edafc4284a43 /src/scene/credits.c | |
| parent | 3ea9cff2c67b3db195c3326afc56fa0662c2327a (diff) | |
| parent | b1a7733c1cead8ed3d4a58c42d638afd0ead8ab0 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/scene/credits.c')
| -rw-r--r-- | src/scene/credits.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/scene/credits.c b/src/scene/credits.c index 81be60c9f..17c1bf263 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -1228,9 +1228,9 @@ static bool8 sub_8144ECC(u8 data, u8 taskIdA) case 2: if (gSaveBlock2.playerGender == MALE) { - LoadCompressedObjectPic(&gIntro2BrendanSpriteSheet); - LoadCompressedObjectPic(&gUnknown_08416E34); - LoadCompressedObjectPic(&gIntro2BicycleSpriteSheet); + LoadCompressedObjectPic(gIntro2BrendanSpriteSheet); + LoadCompressedObjectPic(gUnknown_08416E34); + LoadCompressedObjectPic(gIntro2BicycleSpriteSheet); LoadSpritePalettes(gIntro2SpritePalettes); spriteId = intro_create_brendan_sprite(120, 46); @@ -1245,9 +1245,9 @@ static bool8 sub_8144ECC(u8 data, u8 taskIdA) } else { - LoadCompressedObjectPic(&gIntro2MaySpriteSheet); - LoadCompressedObjectPic(&gUnknown_08416E24); - LoadCompressedObjectPic(&gIntro2BicycleSpriteSheet); + LoadCompressedObjectPic(gIntro2MaySpriteSheet); + LoadCompressedObjectPic(gUnknown_08416E24); + LoadCompressedObjectPic(gIntro2BicycleSpriteSheet); LoadSpritePalettes(gIntro2SpritePalettes); spriteId = intro_create_may_sprite(120, 46); @@ -1606,7 +1606,7 @@ void spritecb_814580C(struct Sprite *sprite) static void sub_81458DC(void) { struct Unk201C000 *unk201C000 = &ewram1c000; - u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_FIRST_POKE))); + u16 starter = SpeciesToNationalPokedexNum(GetStarterPokemon(VarGet(VAR_STARTER_MON))); u16 seenTypesCount; u16 page; u16 dexNum; |