mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-31 00:05:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove errant field in LcdControls struct

Browse Source
This commit is contained in:
Marcus Huderle
2020-08-15 14:50:46 -05:00
parent bb76c4d0de
commit f782111cba
7 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/manager/manager1.c
+6 -6
View File
@@ -35,7 +35,7 @@ void sub_080570B8(Entity *this)
this->height.WORD = 0;
pbVar1 = ((u8 *)&this->field_0x20 + 1);
if (*pbVar1 == 3) {
gScreen.affine.bg3xOffset = 1;
gScreen.affine.unk4 = 1;
}
else {
gUnk_08107C48[*pbVar1](this);
@@ -45,7 +45,7 @@ void sub_080570B8(Entity *this)
void sub_080570F8(void)
{
gScreen.lcd.lcdControl2 &= 0xf7ff;
gScreen.controls.windowOutsideControl = 0;
gScreen.controls.layerFXControl = 0;
sub_08056250();
}
@@ -56,9 +56,9 @@ void sub_08057118(Entity *this)
((u8 *)&this->field_0x20)[1] = 0;
((u8 *)&this->field_0x20)[2] = 0;
this->action = 1;
gScreen.affine.unk2 = 0x1e04;
*(u16 *)&gScreen.lcd.lcdControl2 |= 0x800;
gScreen.controls.windowOutsideControl = 0x3648;
gScreen.controls.mosaicSize = 0x1000;
gScreen.affine.bg3Control = 0x1e04;
gScreen.lcd.lcdControl2 |= 0x800;
gScreen.controls.layerFXControl = 0x3648;
gScreen.controls.alphaBlend = 0x1000;
sub_08052D74(this, sub_080570B8, sub_080570F8);
}
src/manager/manager2.c
+2 -2
View File
@@ -10,8 +10,8 @@ void Manager2(Entity *this)
{
if (this->action == 0) {
this->action = 1;
gScreen.affine.bg3xOffset = 0;
gScreen.bg2.bg0xOffset = 0;
gScreen.affine.unk4 = 0;
gScreen.bg2.bg0Updated = 0;
sub_08052D74(this, sub_080576A0, 0);
}
sub_0805754C(this);