summaryrefslogtreecommitdiff
path: root/src/manager
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2020-11-23 22:18:34 -0800
committertheo3 <arisstephenson2@gmail.com>2020-11-23 22:18:34 -0800
commitedbf03101a64b05e9d20cdf53ec2ca4888a2effa (patch)
treedb67f687b238abf2961b819dd0f121fffbb341c2 /src/manager
parent0b52f80e4d01ce7c9104eeb9b474bc1cf77b94ed (diff)
done
Diffstat (limited to 'src/manager')
-rw-r--r--src/manager/manager15.c6
-rw-r--r--src/manager/manager8.c18
-rw-r--r--src/manager/manager9.c8
3 files changed, 16 insertions, 16 deletions
diff --git a/src/manager/manager15.c b/src/manager/manager15.c
index 51a675f4..23abd03e 100644
--- a/src/manager/manager15.c
+++ b/src/manager/manager15.c
@@ -427,7 +427,7 @@ void sub_0805A94C(Manager15* this) {
gScreen.controls.window1VerticalDimensions = (tmp1 << 8 | tmp2);
}
-extern u8 gUnk_02001A40[];
+extern u8 gBG3Buffer[];
#ifdef NON_MATCHING
void sub_0805A9CC(Manager15* this) {
@@ -449,7 +449,7 @@ void sub_0805A9CC(Manager15* this) {
gScreen.affine.bg3yOffset = tmp1 & 0x3F;
if (tmp1 < 0)
tmp1 += 0x3F;
- tmp3 = (&gUnk_02001A40[(tmp1 >> 6 << 9)]);
+ tmp3 = (&gBG3Buffer[(tmp1 >> 6 << 9)]);
gScreen.affine.unk5 = (u32)tmp3;
gScreen.controls.window1VerticalDimensions = 0xa0;
if (this->unk_28 == tmp3)
@@ -499,7 +499,7 @@ void sub_0805AAF0(u32 unk0) {
gScreen.controls.layerFXControl = 0x3E48;
gScreen.controls.alphaBlend = 0x1008;
gScreen.affine.bg3Control = 0x1E04;
- gScreen.affine.unk5 = &gUnk_02001A40;
+ gScreen.affine.unk5 = &gBG3Buffer;
gScreen.affine.bg3xOffset = 0;
gScreen.affine.bg3yOffset = 0;
gScreen.affine.unk4 = 1;
diff --git a/src/manager/manager8.c b/src/manager/manager8.c
index 8fd1d83b..fe0d4335 100644
--- a/src/manager/manager8.c
+++ b/src/manager/manager8.c
@@ -41,7 +41,7 @@ void sub_08057EFC(Manager8* this) {
void sub_08058004(u32, void*, void*);
-extern u8 gUnk_02001A40[];
+extern u8 gBG3Buffer[];
extern u8 gUnk_02006F00[];
void sub_08057F20(Manager8* this) {
@@ -50,8 +50,8 @@ void sub_08057F20(Manager8* this) {
tmp = tmp + (tmp >> 3) + ((0x400 - gRoomControls.width) / 2);
gScreen.affine.bg3xOffset = tmp & 0xF;
gScreen.affine.bg3yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 2);
- gScreen.affine.unk5 = gUnk_02001A40;
- sub_08058004(tmp, gUnk_02006F00, gUnk_02001A40);
+ gScreen.affine.unk5 = gBG3Buffer;
+ sub_08058004(tmp, gUnk_02006F00, gBG3Buffer);
tmp = ((tmp >> 4) << 1);
if (this->unk_38 != tmp) {
this->unk_38 = tmp;
@@ -61,8 +61,8 @@ void sub_08057F20(Manager8* this) {
tmp = tmp + (tmp >> 2) + ((0x400 - gRoomControls.width) / 2);
gScreen.bg.bg1yOffset = tmp & 0xF;
gScreen.bg.bg2xOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1);
- gScreen.bg.unk_14 = gUnk_02001A40 + 0x800;
- sub_08058004(tmp, gUnk_02006F00 + 0x2000, gUnk_02001A40 + 0x800);
+ gScreen.bg.unk_14 = gBG3Buffer + 0x800;
+ sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x800);
tmp = ((tmp >> 4) << 1);
if (this->unk_3c != tmp) {
this->unk_3c = tmp;
@@ -117,19 +117,19 @@ void sub_080580B0(u32 unk1) {
sub_08058034();
tmp = gRoomControls.roomScrollX - gRoomControls.roomOriginX; // r7
tmp = tmp + (tmp >> 3) + (0x400 - gRoomControls.width) / 2;
- sub_08058004(tmp, gUnk_02006F00, gUnk_02001A40);
+ sub_08058004(tmp, gUnk_02006F00, gBG3Buffer);
gScreen.affine.bg3xOffset = tmp & 0xF;
gScreen.affine.bg3yOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1); //?
gScreen.affine.bg3Control = 0x1D09;
- gScreen.affine.unk5 = gUnk_02001A40;
+ gScreen.affine.unk5 = gBG3Buffer;
gScreen.affine.unk4 = 1;
tmp = gRoomControls.roomScrollX - gRoomControls.roomOriginX; // r7
tmp = tmp + (tmp >> 2) + (0x400 - gRoomControls.width) / 2;
- sub_08058004(tmp, gUnk_02006F00 + 0x2000, gUnk_02001A40 + 0x800);
+ sub_08058004(tmp, gUnk_02006F00 + 0x2000, gBG3Buffer + 0x800);
gScreen.bg.bg1yOffset = tmp & 0xF;
gScreen.bg.bg2xOffset = 0x30 - ((0x30 - (gRoomControls.roomScrollY - gRoomControls.roomOriginY)) >> 1); //?
gScreen.bg.bg1xOffset = 0x1E09;
- gScreen.bg.unk_14 = gUnk_02001A40 + 0x800;
+ gScreen.bg.unk_14 = gBG3Buffer + 0x800;
gScreen.bg.bg2yOffset = 1;
gScreen.controls.layerFXControl = 0x3C48;
gScreen.controls.alphaBlend = 0x609;
diff --git a/src/manager/manager9.c b/src/manager/manager9.c
index d57942c7..c8fc2813 100644
--- a/src/manager/manager9.c
+++ b/src/manager/manager9.c
@@ -18,7 +18,7 @@ void sub_080582F8(u8*, u8*);
void sub_08058324();
extern u32 gUnk_02006F00[];
-extern u8 gUnk_02001A40[];
+extern u8 gBG3Buffer[];
const u16 gUnk_081081EC[] = { 0x30, 0x30, 0x30, 0x38 };
@@ -40,7 +40,7 @@ void sub_08058210(Manager9* this) {
if (this->unk_3c == tmp)
return;
this->unk_3c = tmp;
- sub_080582A0(tmp, gUnk_02006F00, gUnk_02001A40);
+ sub_080582A0(tmp, gUnk_02006F00, gBG3Buffer);
gScreen.bg.bg2yOffset = 1;
}
@@ -91,9 +91,9 @@ void sub_08058324(u32 unk) {
LoadPaletteGroup(unk + 0x86);
LoadGfxGroup(unk + 0x36);
sub_080582D0();
- sub_080582A0(sub_08058244(unk), gUnk_02006F00, gUnk_02001A40);
+ sub_080582A0(sub_08058244(unk), gUnk_02006F00, gBG3Buffer);
gScreen.bg.bg1xOffset = 0x1D47;
- gScreen.bg.unk_14 = gUnk_02001A40;
+ gScreen.bg.unk_14 = gBG3Buffer;
gScreen.bg.bg2yOffset = 1;
gScreen.lcd.displayControl |= 0x200;
}