ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

review changes

Browse Source
This commit is contained in:
DizzyEggg 2017-10-13 12:25:32 +02:00
parent b229a1c295
commit 0f44747788
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/data2b.s
View File

@ -4510,7 +4510,7 @@ gUnknown_08305D0C:: @ 8305D0C
@ 8305DCC @ 8305DCC
.include "data/enemy_mon_elevation.inc" .include "data/enemy_mon_elevation.inc"
@ 8309AAC @ 8305F68
.include "data/graphics/pokemon/front_anims.inc" .include "data/graphics/pokemon/front_anims.inc"
@ 830A18C @ 830A18C

10
include/bg.h
View File

@ -1,6 +1,16 @@
#ifndef GUARD_BG_H #ifndef GUARD_BG_H
#define 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 enum
{ {
BG_CTRL_ATTR_VISIBLE = 1, BG_CTRL_ATTR_VISIBLE = 1,

11
src/reshow_battle_screen.c
View File

@ -197,17 +197,6 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
gBattleScripting.reshowMainState++; 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) static void sub_80A95F4(void)
{ {
struct BGCntrlBitfield *regBgcnt1, *regBgcnt2; struct BGCntrlBitfield *regBgcnt1, *regBgcnt2;