From 9ffd0c73829e5a0aded23518887007da9c3fc44c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 17 Dec 2018 23:00:08 +0100 Subject: 3.5 asm left --- src/battle_bg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_bg.c') diff --git a/src/battle_bg.c b/src/battle_bg.c index bb66a41fd..7ba59e6be 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -1103,7 +1103,7 @@ void DrawBattleEntryBackground(void) SetGpuReg(REG_OFFSET_WINOUT, 0x36); gBattle_BG1_Y = 0xFF5C; gBattle_BG2_Y = 0xFF5C; - LoadCompressedObjectPicUsingHeap(&gUnknown_0831AA00); + LoadCompressedSpriteSheetUsingHeap(&gUnknown_0831AA00); } else if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_LINK | BATTLE_TYPE_x2000000 | BATTLE_TYPE_EREADER_TRAINER)) { -- cgit v1.2.3 From efa820469afcd92b0fdd6b7fff589143ea63c45c Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 23 Dec 2018 14:52:47 +0100 Subject: move data to c --- src/battle_bg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/battle_bg.c') diff --git a/src/battle_bg.c b/src/battle_bg.c index 7ba59e6be..a6919be1d 100644 --- a/src/battle_bg.c +++ b/src/battle_bg.c @@ -11,6 +11,7 @@ #include "link.h" #include "main.h" #include "menu.h" +#include "overworld.h" #include "palette.h" #include "sound.h" #include "sprite.h" @@ -31,8 +32,6 @@ struct BattleBackground const void *palette; }; -extern u8 GetCurrentMapBattleScene(void); - // .rodata static const u16 sUnrefArray[] = {0x0300, 0x0000}; //OamData? -- cgit v1.2.3