Skip to content

Commit cefd62e

Browse files
fresholliefreshollie
committed
start camera.c alignment
1 parent 46ee4c5 commit cefd62e

14 files changed

Lines changed: 492 additions & 265 deletions

File tree

‎sa1/src/game/shared/stage/camera.c‎

Lines changed: 235 additions & 163 deletions
Large diffs are not rendered by default.

‎sa1/src/game/shared/stage/stage.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ void StageInit_Zone6Act1(void)
704704
//
705705
// Rocket "started", so don't allow player to leave.
706706
gCamera.minX = EGG_ROCKET_LAUNCH_MIN_X;
707-
gCamera.sa2__unk50 |= 0x8000;
707+
gCamera.SA2_LABEL(unk50) |= 0x8000;
708708
gBgCntRegs[3] &= ~(BGCNT_TXT512x512);
709709

710710
if (gGameMode == GAME_MODE_SINGLE_PLAYER) {
@@ -718,7 +718,7 @@ void StageInit_Zone6Act1(void)
718718
//
719719
// 'maxY' set because we are "climbing" the rocket and positive Y goes down.
720720
gCamera.maxY = EGG_ROCKET_BOOSTER_DEPART_MAX_Y;
721-
gCamera.sa2__unk50 |= 0x8000;
721+
gCamera.SA2_LABEL(unk50) |= 0x8000;
722722
gBgCntRegs[3] &= ~(BGCNT_TXT512x512);
723723

724724
if (gGameMode == GAME_MODE_SINGLE_PLAYER) {
@@ -729,8 +729,8 @@ void StageInit_Zone6Act1(void)
729729

730730
if (gBossIndex > 2) {
731731
gBgCntRegs[3] &= ~(BGCNT_TXT512x512);
732-
gCamera.sa2__unk50 |= 0x4000;
733-
gCamera.sa2__unk50 &= ~0x8000;
732+
gCamera.SA2_LABEL(unk50) |= 0x4000;
733+
gCamera.SA2_LABEL(unk50) &= ~0x8000;
734734
gCamera.maxY = EGG_ROCKET_MIDDLE_DEPART_MAX_Y;
735735

736736
if (gGameMode == GAME_MODE_SINGLE_PLAYER) {

‎src/game/sa1/stage/backgrounds/zone_1.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ void StageBgUpdate_Zone1Acts12(s32 x, s32 UNUSED y)
1212
s32 i;
1313
s32 r3;
1414

15-
x -= cam->sa2__unk20;
15+
x -= cam->SA2_LABEL(unk20);
1616

1717
bg = &gStageBackgroundsRam.unkC0;
1818

19-
gBgScrollRegs[3][0] = cam->sa2__unk52 = 0;
20-
gBgScrollRegs[3][1] = cam->sa2__unk54 = 0;
19+
gBgScrollRegs[3][0] = cam->SA2_LABEL(unk52) = 0;
20+
gBgScrollRegs[3][1] = cam->SA2_LABEL(unk54) = 0;
2121

2222
bg->scrollX = 0;
2323
bg->scrollY = 0;

‎src/game/sa1/stage/backgrounds/zone_2_interior.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ NONMATCH("asm/non_matching/game/sa1/stage/backgrounds/StageBgUpdate_Zone2_Interi
1616
s32 i, v;
1717

1818
// Scroll BG every 4 pixels
19-
gBgScrollRegs[3][0] = cam->sa2__unk52 = xSub = (x >> 2) % 256u;
20-
gBgScrollRegs[3][1] = cam->sa2__unk54 = ySub = (y >> 2) % 256u;
19+
gBgScrollRegs[3][0] = cam->SA2_LABEL(unk52) = xSub = (x >> 2) % 256u;
20+
gBgScrollRegs[3][1] = cam->SA2_LABEL(unk54) = ySub = (y >> 2) % 256u;
2121

2222
gFlags |= FLAGS_EXECUTE_HBLANK_COPY;
2323

‎src/game/sa1/stage/backgrounds/zone_3.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ void Task_UpdateFireworkAnimation(void)
4343
return;
4444
}
4545

46-
s->x = firework->qWorldX - cam->sa2__unk52;
47-
s->y = firework->qWorldY - cam->sa2__unk54;
46+
s->x = firework->qWorldX - cam->SA2_LABEL(unk52);
47+
s->y = firework->qWorldY - cam->SA2_LABEL(unk54);
4848

4949
s->frameFlags &= ~(SPRITE_FLAG(18, 1) | SPRITE_FLAG(19, 1));
5050
UpdateSpriteAnimation(s);
@@ -74,8 +74,8 @@ void StageBgUpdate_Zone3Acts12(s32 x, s32 y)
7474
u32 *ptr;
7575
s32 i;
7676

77-
x -= cam->sa2__unk20;
78-
y -= cam->sa2__unk24;
77+
x -= cam->SA2_LABEL(unk20);
78+
y -= cam->SA2_LABEL(unk24);
7979

8080
collision = gRefCollision;
8181

‎src/game/sa1/stage/backgrounds/zone_4.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ void StageBgUpdate_Zone4Acts12(s32 x, s32 y)
1717
gBldRegs.bldCnt = (BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND | BLDCNT_TGT1_BG0);
1818
gBldRegs.bldAlpha = BLDALPHA_BLEND(16, 16);
1919

20-
x -= cam->sa2__unk20;
21-
y -= cam->sa2__unk24;
20+
x -= cam->SA2_LABEL(unk20);
21+
y -= cam->SA2_LABEL(unk24);
2222

2323
// Snow layer
2424
bg = &gStageBackgroundsRam.unk0;
@@ -32,11 +32,11 @@ void StageBgUpdate_Zone4Acts12(s32 x, s32 y)
3232
coll = gRefCollision;
3333

3434
xSub = Div(x << 4, coll->pxWidth - DISPLAY_WIDTH);
35-
cam->sa2__unk52 = xSub;
35+
cam->SA2_LABEL(unk52) = xSub;
3636
gBgScrollRegs[3][0] = xSub;
3737

3838
ySub = Div(((y << 8) + (y << 6) + (y << 5)), coll->pxHeight - DISPLAY_HEIGHT);
39-
cam->sa2__unk54 = ySub;
39+
cam->SA2_LABEL(unk54) = ySub;
4040
gBgScrollRegs[3][1] = ySub;
4141

4242
if (gWater.SA2_LABEL(unk1) == 0) {

‎src/game/sa1/stage/backgrounds/zone_7_act_1.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ void StageBgUpdate_Zone7Act1(s32 x, s32 y)
1111
const Collision *collision;
1212
s32 xSub, ySub;
1313

14-
x -= gCamera.sa2__unk20;
15-
y -= gCamera.sa2__unk24;
14+
x -= gCamera.SA2_LABEL(unk20);
15+
y -= gCamera.SA2_LABEL(unk24);
1616

1717
collision = gRefCollision;
1818

1919
xSub = Div(x * 64 - x * 8, collision->pxWidth - DISPLAY_WIDTH);
20-
gBgScrollRegs[3][0] = gCamera.sa2__unk52 = xSub;
20+
gBgScrollRegs[3][0] = gCamera.SA2_LABEL(unk52) = xSub;
2121

2222
ySub = Div((y << 4) + y * 8, collision->pxHeight - DISPLAY_HEIGHT);
23-
gCamera.sa2__unk54 = ySub;
23+
gCamera.SA2_LABEL(unk54) = ySub;
2424
gBgScrollRegs[3][1] = ySub;
2525
}

‎src/game/sa1/stage/backgrounds/zone_7_act_2.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ void StageBgUpdate_Zone7Act2(void)
1717
u32 *offsets;
1818
s32 i;
1919

20-
gBgScrollRegs[1][0] = cam->sa2__unk52 = 0;
21-
gBgScrollRegs[1][1] = cam->sa2__unk54 = 0;
20+
gBgScrollRegs[1][0] = cam->SA2_LABEL(unk52) = 0;
21+
gBgScrollRegs[1][1] = cam->SA2_LABEL(unk54) = 0;
2222

2323
bg->scrollX = 0;
2424
bg->scrollY = 0;

‎src/game/sa1/stage/enemies/boss_6_egg_snake.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -848,7 +848,7 @@ void sub_8032F58(void)
848848
gPlayer.heldInput = DPAD_LEFT;
849849
}
850850

851-
gCamera.sa2__unk8 = 0;
851+
gCamera.SA2_LABEL(unk8) = 0;
852852
gCamera.maxX = gCamera.x + 480;
853853
} else {
854854
gPlayer.heldInput = 0;

‎src/game/sa1/stage/enemies/boss_x3_egg_x.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ void Task_8038554()
12101210
} break;
12111211

12121212
case 4: {
1213-
gPlayer.sa2__unk72 = 0x3C;
1213+
gPlayer.SA2_LABEL(unk72) = 0x3C;
12141214

12151215
if (--strc10->unk6 == 0) {
12161216
gPlayer.charState = CHARSTATE_50;

0 commit comments

Comments
 (0)