From 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 Mon Sep 17 00:00:00 2001 From: scnorton Date: Mon, 18 Dec 2017 14:55:28 -0500 Subject: Decompile data: intro_credits_graphics --- src/scene/credits.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/scene/credits.c') diff --git a/src/scene/credits.c b/src/scene/credits.c index 81be60c9f..40dc5488f 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); -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- src/scene/credits.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/scene/credits.c') diff --git a/src/scene/credits.c b/src/scene/credits.c index 81be60c9f..e7744822b 100644 --- a/src/scene/credits.c +++ b/src/scene/credits.c @@ -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; -- cgit v1.2.3