diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-11-21 09:04:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-21 09:04:10 -0500 |
| commit | 1234d0252cbe2b0001784b10b75f0d339824632d (patch) | |
| tree | 04bd826b0a6313c2223b907956581d661d602066 /src/battle_main.c | |
| parent | 1849ad778d5a94edc076ce5ecf7aec97aa8db4fa (diff) | |
| parent | a1b21100524b01231c3e571621bb36ae25a20e2e (diff) | |
Merge pull request #161 from PikalaxALT/dism_more_data
Evolution Scene and other data dism
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 14b191e52..1125a8d2d 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -696,7 +696,7 @@ static void CB2_InitBattleInternal(void) gBattle_BG3_X = 0; gBattle_BG3_Y = 0; gBattleTerrain = BattleSetup_GetTerrainId(); - sub_800F34C(); + InitBattleBgsVideo(); LoadBattleTextboxAndBackground(); ResetSpriteData(); ResetTasks(); @@ -1774,7 +1774,7 @@ void sub_8011A1C(void) gBattle_BG2_Y = 0; gBattle_BG3_X = 0; gBattle_BG3_Y = 0; - sub_800F34C(); + InitBattleBgsVideo(); LoadCompressedPalette(gBattleTextboxPalette, 0, 64); LoadBattleMenuWindowGfx(); ResetSpriteData(); @@ -1835,7 +1835,7 @@ static void sub_8011BB0(void) } } -u32 sub_8011C44(u8 arrayId, u8 caseId) +u32 GetBattleBgAttribute(u8 arrayId, u8 caseId) { u32 ret = 0; |