diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
| commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
| tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/battle_dome.c | |
| parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
| parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) | |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/battle_dome.c')
| -rw-r--r-- | src/battle_dome.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 514b57c97..24e2cbfed 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -19,6 +19,7 @@ #include "window.h" #include "palette.h" #include "decompress.h" +#include "party_menu.h" #include "menu.h" #include "sound.h" #include "pokemon_icon.h" @@ -57,12 +58,6 @@ struct UnkStruct_860DD10 u16 src; }; -extern void sub_81B8558(void); - -extern u8 gSelectedOrderFromParty[]; - -extern const struct SpriteTemplate gUnknown_0860CFA8; - // text extern const u8 gTrainerClassNames[][0xD]; @@ -3536,7 +3531,7 @@ static void sub_8190400(u8 taskId) DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D83D50, 0x2000, 0, 0); DecompressAndLoadBgGfxUsingHeap(2, gUnknown_08D84970, 0x2000, 0, 1); DecompressAndLoadBgGfxUsingHeap(3, gUnknown_08D84F00, 0x800, 0, 1); - LoadCompressedObjectPic(gUnknown_0860CF50); + LoadCompressedSpriteSheet(gUnknown_0860CF50); LoadCompressedPalette(gUnknown_08D85358, 0, 0x200); LoadCompressedPalette(gUnknown_08D85444, 0x100, 0x200); LoadCompressedPalette(gUnknown_08D85600, 0xF0, 0x20); @@ -5707,7 +5702,7 @@ static void sub_8194220(u8 taskId) gTasks[taskId].data[0]++; break; case 3: - LoadCompressedObjectPic(gUnknown_0860CF50); + LoadCompressedSpriteSheet(gUnknown_0860CF50); if (r10 == 0) { for (i = 0; i < (unsigned) 31; i++) |