diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
| commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
| tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/battle_factory_screen.c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
| parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) | |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
Diffstat (limited to 'src/battle_factory_screen.c')
| -rw-r--r-- | src/battle_factory_screen.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 60b233daf..0bcdc0d66 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -131,8 +131,6 @@ struct FactorySwapMonsStruct bool8 unk30; }; -extern u8 gUnknown_0203CF20; - extern const u16 gBattleFrontierHeldItems[]; extern const struct FacilityMon gBattleFrontierMons[]; extern const struct FacilityMon gSlateportBattleTentMons[]; @@ -1167,7 +1165,7 @@ static void CB2_InitSelectScreen(void) case 4: LoadSpritePalettes(gUnknown_086103F4); LoadSpriteSheets(gUnknown_086103BC); - LoadCompressedObjectPic(gUnknown_086103E4); + LoadCompressedSpriteSheet(gUnknown_086103E4); ShowBg(0); ShowBg(1); SetVBlankCallback(Select_VblankCb); @@ -3171,7 +3169,7 @@ static void CB2_InitSwapScreen(void) case 4: LoadSpritePalettes(gUnknown_086106B0); LoadSpriteSheets(gUnknown_08610650); - LoadCompressedObjectPic(gUnknown_086106A0); + LoadCompressedSpriteSheet(gUnknown_086106A0); SetVBlankCallback(Swap_VblankCb); gMain.state++; break; |