Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit aafedee

Browse files
JaceCearJaceCear
committed
Add DISPLAY_CENTER_X|Y
1 parent 3cd7b33 commit aafedee

35 files changed

Lines changed: 143 additions & 143 deletions

‎src/game/course_select.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ void CreateCourseSelect(bool8 arg0)
256256

257257
state->task18 = task1;
258258
s = &state->s;
259-
s->x = (DISPLAY_WIDTH / 2);
260-
s->y = (DISPLAY_HEIGHT / 2);
259+
s->x = DISPLAY_CENTER_X;
260+
s->y = DISPLAY_CENTER_Y;
261261
s->graphics.dest = strc54->s.graphics.dest + 0xC0;
262262
s->oamFlags = 0x80;
263263
s->graphics.size = 0;

‎src/game/edit_language_screen.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,8 @@ void Task_EditLanguageScreenInit(void)
185185

186186
if (screen->unk28D > 1) {
187187
Sprite *s = &screen->spr250;
188-
s->x = (DISPLAY_WIDTH / 2);
189-
s->y = (DISPLAY_HEIGHT / 2);
188+
s->x = DISPLAY_CENTER_X;
189+
s->y = DISPLAY_CENTER_Y;
190190
s->graphics.dest = ALLOC_TILES(SA1_ANIM_ONLY_CHAO_MSGBOX);
191191
s->oamFlags = SPRITE_OAM_ORDER(0);
192192
s->graphics.size = 0;

‎src/game/egg_rocket_transitions.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_8028CE4.inc", void Task_8
5656
EggRocketScreenShake *shake = TASK_DATA(gCurTask);
5757
u32 i;
5858

59-
if (++gCamera.shiftY >= shake->worldY - gCamera.y + (DISPLAY_HEIGHT / 2)) {
59+
if (++gCamera.shiftY >= shake->worldY - gCamera.y + DISPLAY_CENTER_Y) {
6060
// _08028D1C
6161
void *tiles;
6262
struct Task *t;

‎src/game/enemies/boss_1_egg_hammer_tank.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_1__Task_8027600.inc", void Task_802
12151215
hammer->unk3E = y;
12161216
}
12171217

1218-
if (x < gCamera.x + (DISPLAY_WIDTH / 2)) {
1218+
if (x < gCamera.x + DISPLAY_CENTER_X) {
12191219
hammer->qUnk4C = +Q(2);
12201220
} else {
12211221
hammer->qUnk4C = -Q(2);

‎src/game/enemies/boss_3_egg_ball.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ void Task_8030364(void)
818818
s->x = worldX - gCamera.x;
819819
s->y = worldY - gCamera.y;
820820

821-
if (worldX < gCamera.x + (DISPLAY_WIDTH / 2)) {
821+
if (worldX < gCamera.x + DISPLAY_CENTER_X) {
822822
boss_44->qUnk38 = +Q(2);
823823
} else {
824824
boss_44->qUnk38 = -Q(2);

‎src/game/enemies/boss_6_egg_snake.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_6__CreateEntity_EggSnake.inc",
309309
s2->hitboxes[0].index = -1;
310310
s2->frameFlags = 0x2000;
311311
#if PORTABLE && (DISPLAY_WIDTH > 320)
312-
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - (DISPLAY_WIDTH / 2), s->x + (DISPLAY_WIDTH / 2));
312+
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - DISPLAY_CENTER_X, s->x + DISPLAY_CENTER_X);
313313
#else
314314
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - 144, s->x + 176);
315315
#endif

‎src/game/enemies/boss_x1_egg_wrecker.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,8 @@ void Task_EggWreckerInit(void)
281281

282282
switch (boss->unk8D) {
283283
case 0: {
284-
if (boss->worldX - (DISPLAY_WIDTH / 2) <= gCamera.x) {
285-
gCamera.minX = boss->worldX - (DISPLAY_WIDTH / 2);
284+
if (boss->worldX - DISPLAY_CENTER_X <= gCamera.x) {
285+
gCamera.minX = boss->worldX - DISPLAY_CENTER_X;
286286
gCamera.maxX = gCamera.minX + DISPLAY_WIDTH;
287287
boss->unk8D = 1;
288288
}
@@ -296,7 +296,7 @@ void Task_EggWreckerInit(void)
296296
} break;
297297
}
298298

299-
if ((gCamera.minX == (boss->worldX - (DISPLAY_WIDTH / 2))) && (gCamera.maxY == (boss->worldY + DISPLAY_HEIGHT))) {
299+
if ((gCamera.minX == (boss->worldX - DISPLAY_CENTER_X)) && (gCamera.maxY == (boss->worldY + DISPLAY_HEIGHT))) {
300300
boss->unk8D = 0;
301301
boss->unk78 = 0x100;
302302
gCurTask->main = Task_8034718;
@@ -375,7 +375,7 @@ void Task_8034718(void)
375375
boss->unk8D = 0;
376376
gCurTask->main = Task_803491C;
377377

378-
CreatePreBossCameraPan(gCamera.minY - (DISPLAY_HEIGHT / 2), gCamera.maxY);
378+
CreatePreBossCameraPan(gCamera.minY - DISPLAY_CENTER_Y, gCamera.maxY);
379379
}
380380
} break;
381381
}

‎src/game/enemies/boss_x2_egg_drillster.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,9 @@ void Task_EggDrillsterInit(void)
276276

277277
switch (boss->unk8D) {
278278
case 0: {
279-
if (boss->worldX - (DISPLAY_WIDTH / 2) <= gCamera.x) {
280-
gCamera.minX = boss->worldX - (DISPLAY_WIDTH / 2) - 32;
281-
gCamera.maxX = boss->worldX + (DISPLAY_WIDTH / 2) + 32;
279+
if (boss->worldX - DISPLAY_CENTER_X <= gCamera.x) {
280+
gCamera.minX = boss->worldX - DISPLAY_CENTER_X - 32;
281+
gCamera.maxX = boss->worldX + DISPLAY_CENTER_X + 32;
282282
boss->unk8D = 1;
283283
}
284284
} break;

‎src/game/enemies/boss_x3_egg_x.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,9 @@ void Task_EggXMain()
495495

496496
switch (boss->unk99) {
497497
case 0:
498-
if ((boss->unk88 - (DISPLAY_WIDTH / 2)) <= gCamera.x) {
499-
gCamera.minX = (u16)boss->unk88 - ((DISPLAY_WIDTH / 2) + 24);
500-
gCamera.maxX = (u16)boss->unk88 + ((DISPLAY_WIDTH / 2) + 24);
498+
if ((boss->unk88 - DISPLAY_CENTER_X) <= gCamera.x) {
499+
gCamera.minX = (u16)boss->unk88 - (DISPLAY_CENTER_X + 24);
500+
gCamera.maxX = (u16)boss->unk88 + (DISPLAY_CENTER_X + 24);
501501
boss->unk99 = 1;
502502
return;
503503
}
@@ -844,7 +844,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_x3__Task_803775C.inc", void Task_80
844844
{
845845
// Likely easily matchable once sub_803A6EC__inline() matches
846846
u16 v0;
847-
var_r5 = gCamera.x + (DISPLAY_WIDTH / 2);
847+
var_r5 = gCamera.x + DISPLAY_CENTER_X;
848848
v0 = ((u16)s->x - 88);
849849
spC = NULL;
850850
sp10.left = -v0;
@@ -866,7 +866,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_x3__Task_803775C.inc", void Task_80
866866
}
867867

868868
// Likely easily matchable once sub_803A6EC__inline() matches
869-
var_r5 = (u16)gCamera.x + (DISPLAY_WIDTH / 2);
869+
var_r5 = (u16)gCamera.x + DISPLAY_CENTER_X;
870870
sp14 = 0;
871871
sp18.left = 88;
872872
sp18.right = s->x - 0x98;

‎src/game/enemies/bosses_misc.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void Task_801623C()
198198

199199
s = &capsule->s;
200200
s2 = &capsule->s2;
201-
s->x = (DISPLAY_WIDTH / 2);
201+
s->x = DISPLAY_CENTER_X;
202202
s->y = (capsule->worldY - gCamera.y) - capsule->offsetY;
203203
s2->x = s->x;
204204
s2->y = s->y;
@@ -221,7 +221,7 @@ void Task_801623C()
221221
}
222222
capsule->worldY = (capsule->worldY - capsule->offsetY) + res;
223223
gCurTask->main = Task_BossCapsuleUpdate;
224-
capsule->worldX = gCamera.x + (DISPLAY_WIDTH / 2);
224+
capsule->worldX = gCamera.x + DISPLAY_CENTER_X;
225225
CreateScreenShake(0x800U, 0x40U, 0x100U, -1U, 0x80U);
226226
m4aSongNumStart(SE_136);
227227

@@ -235,7 +235,7 @@ void Task_801623C()
235235
if ((Coll_Player_Entity_Intersection(s, capsule->worldX, capsule->worldY, p) & 0x80000)
236236
|| (Coll_Player_Entity_Intersection(s2, capsule->worldX, capsule->worldY, p) & 0x80000)) {
237237
p->timerInvulnerability = TIME(0, 2);
238-
if (I(p->qWorldX) < gCamera.x + (DISPLAY_WIDTH / 2)) {
238+
if (I(p->qWorldX) < gCamera.x + DISPLAY_CENTER_X) {
239239
p->qSpeedAirX = -Q(2);
240240
sideX = (capsule->worldX + s->hitboxes[0].b.left) - p->spriteOffsetX;
241241
if (I(p->qWorldX) > sideX) {
@@ -848,7 +848,7 @@ void Task_8017334()
848848
p = strc->p;
849849
screenX = I(p->qWorldX) - gCamera.x;
850850

851-
if (screenX > (DISPLAY_WIDTH / 2)) {
851+
if (screenX > DISPLAY_CENTER_X) {
852852
p->moveState |= MOVESTATE_IGNORE_INPUT;
853853
p->heldInput = DPAD_RIGHT;
854854
if ((200 - (p->playerID * 8)) < screenX) {

0 commit comments

Comments
 (0)