diff options
| -rw-r--r-- | data/data2b.s | 2 | ||||
| -rw-r--r-- | include/bg.h | 10 | ||||
| -rw-r--r-- | src/reshow_battle_screen.c | 11 |
3 files changed, 11 insertions, 12 deletions
diff --git a/data/data2b.s b/data/data2b.s index 77dd6a892..e723b4c97 100644 --- a/data/data2b.s +++ b/data/data2b.s @@ -4510,7 +4510,7 @@ gUnknown_08305D0C:: @ 8305D0C @ 8305DCC .include "data/enemy_mon_elevation.inc" -@ 8309AAC +@ 8305F68 .include "data/graphics/pokemon/front_anims.inc" @ 830A18C diff --git a/include/bg.h b/include/bg.h index 0dcb84a34..0c6b4ac26 100644 --- a/include/bg.h +++ b/include/bg.h @@ -1,6 +1,16 @@ #ifndef GUARD_BG_H #define GUARD_BG_H +struct BGCntrlBitfield // for the I/O registers +{ + volatile u16 priority:2; + volatile u16 charBaseBlock:2; + volatile u16 field_0_2:4; + volatile u16 field_1_0:5; + volatile u16 areaOverflowMode:1; + volatile u16 screenSize:2; +}; + enum { BG_CTRL_ATTR_VISIBLE = 1, diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 1c13448d4..25c2ca658 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -197,17 +197,6 @@ static void CB2_ReshowBattleScreenAfterMenu(void) gBattleScripting.reshowMainState++; } -// todo: find a better place for the struct declaration -struct BGCntrlBitfield -{ - volatile u16 priority:2; - volatile u16 charBaseBlock:2; - volatile u16 field_0_2:4; - volatile u16 field_1_0:5; - volatile u16 areaOverflowMode:1; - volatile u16 screenSize:2; -}; - static void sub_80A95F4(void) { struct BGCntrlBitfield *regBgcnt1, *regBgcnt2; |