github-mirror/sa2
1
0 Fork 0
mirror of https://github.com/SAT-R/sa2.git synced 2026-10-28 09:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add DISPLAY_CENTER_X|Y

Browse Source
This commit is contained in:
JaceCear committed 2026-03-25 23:27:28 +01:00
1 parent 3cd7b33b97
commit aafedee043
35 files changed
+143 -143
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/course_select.c
+2 -2
View File
@@ -256,8 +256,8 @@ void CreateCourseSelect(bool8 arg0)
state->task18 = task1;
s = &state->s;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = strc54->s.graphics.dest + 0xC0;
s->oamFlags = 0x80;
s->graphics.size = 0;
src/game/edit_language_screen.c
+2 -2
View File
@@ -185,8 +185,8 @@ void Task_EditLanguageScreenInit(void)
if (screen->unk28D > 1) {
Sprite *s = &screen->spr250;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = ALLOC_TILES(SA1_ANIM_ONLY_CHAO_MSGBOX);
s->oamFlags = SPRITE_OAM_ORDER(0);
s->graphics.size = 0;
src/game/egg_rocket_transitions.c
+1 -1
View File
@@ -56,7 +56,7 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_8028CE4.inc", void Task_8
EggRocketScreenShake *shake = TASK_DATA(gCurTask);
u32 i;
if (++gCamera.shiftY >= shake->worldY - gCamera.y + (DISPLAY_HEIGHT / 2)) {
if (++gCamera.shiftY >= shake->worldY - gCamera.y + DISPLAY_CENTER_Y) {
// _08028D1C
void *tiles;
struct Task *t;
src/game/enemies/boss_1_egg_hammer_tank.c
+1 -1
View File
@@ -1215,7 +1215,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_1__Task_8027600.inc", void Task_802
hammer->unk3E = y;
}
if (x < gCamera.x + (DISPLAY_WIDTH / 2)) {
if (x < gCamera.x + DISPLAY_CENTER_X) {
hammer->qUnk4C = +Q(2);
} else {
hammer->qUnk4C = -Q(2);
src/game/enemies/boss_3_egg_ball.c
+1 -1
View File
@@ -818,7 +818,7 @@ void Task_8030364(void)
s->x = worldX - gCamera.x;
s->y = worldY - gCamera.y;
if (worldX < gCamera.x + (DISPLAY_WIDTH / 2)) {
if (worldX < gCamera.x + DISPLAY_CENTER_X) {
boss_44->qUnk38 = +Q(2);
} else {
boss_44->qUnk38 = -Q(2);
src/game/enemies/boss_6_egg_snake.c
+1 -1
View File
@@ -309,7 +309,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_6__CreateEntity_EggSnake.inc",
s2->hitboxes[0].index = -1;
s2->frameFlags = 0x2000;
#if PORTABLE && (DISPLAY_WIDTH > 320)
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - (DISPLAY_WIDTH / 2), s->x + (DISPLAY_WIDTH / 2));
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - DISPLAY_CENTER_X, s->x + DISPLAY_CENTER_X);
#else
Bosses_SetCamBounds(s->y - (DISPLAY_HEIGHT - 32), s->y + 32, s->x - 144, s->x + 176);
#endif
src/game/enemies/boss_x1_egg_wrecker.c
+4 -4
View File
@@ -281,8 +281,8 @@ void Task_EggWreckerInit(void)
switch (boss->unk8D) {
case 0: {
if (boss->worldX - (DISPLAY_WIDTH / 2) <= gCamera.x) {
gCamera.minX = boss->worldX - (DISPLAY_WIDTH / 2);
if (boss->worldX - DISPLAY_CENTER_X <= gCamera.x) {
gCamera.minX = boss->worldX - DISPLAY_CENTER_X;
gCamera.maxX = gCamera.minX + DISPLAY_WIDTH;
boss->unk8D = 1;
}
@@ -296,7 +296,7 @@ void Task_EggWreckerInit(void)
} break;
}
if ((gCamera.minX == (boss->worldX - (DISPLAY_WIDTH / 2))) && (gCamera.maxY == (boss->worldY + DISPLAY_HEIGHT))) {
if ((gCamera.minX == (boss->worldX - DISPLAY_CENTER_X)) && (gCamera.maxY == (boss->worldY + DISPLAY_HEIGHT))) {
boss->unk8D = 0;
boss->unk78 = 0x100;
gCurTask->main = Task_8034718;
@@ -375,7 +375,7 @@ void Task_8034718(void)
boss->unk8D = 0;
gCurTask->main = Task_803491C;
CreatePreBossCameraPan(gCamera.minY - (DISPLAY_HEIGHT / 2), gCamera.maxY);
CreatePreBossCameraPan(gCamera.minY - DISPLAY_CENTER_Y, gCamera.maxY);
}
} break;
}
src/game/enemies/boss_x2_egg_drillster.c
+3 -3
View File
@@ -276,9 +276,9 @@ void Task_EggDrillsterInit(void)
switch (boss->unk8D) {
case 0: {
if (boss->worldX - (DISPLAY_WIDTH / 2) <= gCamera.x) {
gCamera.minX = boss->worldX - (DISPLAY_WIDTH / 2) - 32;
gCamera.maxX = boss->worldX + (DISPLAY_WIDTH / 2) + 32;
if (boss->worldX - DISPLAY_CENTER_X <= gCamera.x) {
gCamera.minX = boss->worldX - DISPLAY_CENTER_X - 32;
gCamera.maxX = boss->worldX + DISPLAY_CENTER_X + 32;
boss->unk8D = 1;
}
} break;
src/game/enemies/boss_x3_egg_x.c
+5 -5
View File
@@ -495,9 +495,9 @@ void Task_EggXMain()
switch (boss->unk99) {
case 0:
if ((boss->unk88 - (DISPLAY_WIDTH / 2)) <= gCamera.x) {
gCamera.minX = (u16)boss->unk88 - ((DISPLAY_WIDTH / 2) + 24);
gCamera.maxX = (u16)boss->unk88 + ((DISPLAY_WIDTH / 2) + 24);
if ((boss->unk88 - DISPLAY_CENTER_X) <= gCamera.x) {
gCamera.minX = (u16)boss->unk88 - (DISPLAY_CENTER_X + 24);
gCamera.maxX = (u16)boss->unk88 + (DISPLAY_CENTER_X + 24);
boss->unk99 = 1;
return;
}
@@ -844,7 +844,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_x3__Task_803775C.inc", void Task_80
{
// Likely easily matchable once sub_803A6EC__inline() matches
u16 v0;
var_r5 = gCamera.x + (DISPLAY_WIDTH / 2);
var_r5 = gCamera.x + DISPLAY_CENTER_X;
v0 = ((u16)s->x - 88);
spC = NULL;
sp10.left = -v0;
@@ -866,7 +866,7 @@ NONMATCH("asm/non_matching/game/enemies/boss_x3__Task_803775C.inc", void Task_80
}
// Likely easily matchable once sub_803A6EC__inline() matches
var_r5 = (u16)gCamera.x + (DISPLAY_WIDTH / 2);
var_r5 = (u16)gCamera.x + DISPLAY_CENTER_X;
sp14 = 0;
sp18.left = 88;
sp18.right = s->x - 0x98;
src/game/enemies/bosses_misc.c
+4 -4
View File
@@ -198,7 +198,7 @@ void Task_801623C()
s = &capsule->s;
s2 = &capsule->s2;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = (capsule->worldY - gCamera.y) - capsule->offsetY;
s2->x = s->x;
s2->y = s->y;
@@ -221,7 +221,7 @@ void Task_801623C()
}
capsule->worldY = (capsule->worldY - capsule->offsetY) + res;
gCurTask->main = Task_BossCapsuleUpdate;
capsule->worldX = gCamera.x + (DISPLAY_WIDTH / 2);
capsule->worldX = gCamera.x + DISPLAY_CENTER_X;
CreateScreenShake(0x800U, 0x40U, 0x100U, -1U, 0x80U);
m4aSongNumStart(SE_136);
@@ -235,7 +235,7 @@ void Task_801623C()
if ((Coll_Player_Entity_Intersection(s, capsule->worldX, capsule->worldY, p) & 0x80000)
|| (Coll_Player_Entity_Intersection(s2, capsule->worldX, capsule->worldY, p) & 0x80000)) {
p->timerInvulnerability = TIME(0, 2);
if (I(p->qWorldX) < gCamera.x + (DISPLAY_WIDTH / 2)) {
if (I(p->qWorldX) < gCamera.x + DISPLAY_CENTER_X) {
p->qSpeedAirX = -Q(2);
sideX = (capsule->worldX + s->hitboxes[0].b.left) - p->spriteOffsetX;
if (I(p->qWorldX) > sideX) {
@@ -848,7 +848,7 @@ void Task_8017334()
p = strc->p;
screenX = I(p->qWorldX) - gCamera.x;
if (screenX > (DISPLAY_WIDTH / 2)) {
if (screenX > DISPLAY_CENTER_X) {
p->moveState |= MOVESTATE_IGNORE_INPUT;
p->heldInput = DPAD_RIGHT;
if ((200 - (p->playerID * 8)) < screenX) {
src/game/extra_stage_results.c
+27 -27
View File
@@ -274,8 +274,8 @@ void CreateCongratulationsAnimation(void)
s->graphics.dest = (void *)OBJ_VRAM0 + 0x20;
s->graphics.anim = gUnknown_0868B3D8[gSelectedCharacter][0];
s->variant = gUnknown_0868B3D8[gSelectedCharacter][1];
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->oamFlags = 0x180;
s->graphics.size = 0;
s->animCursor = 0;
@@ -288,9 +288,9 @@ void CreateCongratulationsAnimation(void)
UpdateSpriteAnimation(s);
strc164->unk3C = 0;
strc164->unk44 = 0x780;
strc164->unk40 = Q(DISPLAY_WIDTH / 2);
strc164->unk40 = Q(DISPLAY_CENTER_X);
strc164->unk4C = 0;
strc164->unk48 = Q(DISPLAY_HEIGHT / 2);
strc164->unk48 = Q(DISPLAY_CENTER_Y);
sp4C = TaskCreate(Task_8066E58_164, sizeof(ExtraStageResults_164), 0x2120U, 0U, NULL);
strc164 = TASK_DATA(sp4C);
@@ -400,8 +400,8 @@ void CreateCongratulationsAnimation(void)
s->graphics.dest = (void *)OBJ_VRAM0 + 0x09C0;
s->graphics.anim = 0x308;
s->variant = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->oamFlags = SPRITE_OAM_ORDER(0);
s->graphics.size = 0;
s->animCursor = 0;
@@ -1101,7 +1101,7 @@ void Task_8066ACC(void)
s32 v = gUnknown_0868B498[i][0] + 0xF8;
s->x = v - unk3C;
index = ((u8)strc164->unk15C + i * 8) & 0x3F;
s->y = gUnknown_0868B498[i][1] + (DISPLAY_HEIGHT / 2) + strc164->unkD6[index];
s->y = gUnknown_0868B498[i][1] + DISPLAY_CENTER_Y + strc164->unkD6[index];
DisplaySprite(s);
}
}
@@ -1134,7 +1134,7 @@ void Task_8066BA4(void)
s32 v;
s->x = gUnknown_0868B498[i][0] + 0xBC;
index = ((u8)strc164->unk15C + i * 8) & 0x3F;
s->y = gUnknown_0868B498[i][1] + (DISPLAY_HEIGHT / 2) + strc164->unkD6[index];
s->y = gUnknown_0868B498[i][1] + DISPLAY_CENTER_Y + strc164->unkD6[index];
DisplaySprite(s);
}
}
@@ -1191,7 +1191,7 @@ void Task_8066D64()
if (unk3C > gUnknown_0868B4BE[strc64->qUnk44[0]]) {
unk3C -= gUnknown_0868B4BE[strc64->qUnk44[0]];
unk3C *= 3;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = 180 - unk3C;
if (s->y < gUnknown_0868B4B8[strc64->qUnk44[0]]) {
s->y = gUnknown_0868B4B8[strc64->qUnk44[0]];
@@ -1516,13 +1516,13 @@ void CreateExtraStageResults(void)
strc64 = TASK_DATA(task64_1);
s = &strc64->s;
strc64->unk3C = 0;
strc64->qUnk44[0] = Q(DISPLAY_WIDTH / 2);
strc64->qUnk54[0] = Q((DISPLAY_HEIGHT / 2) + 10);
strc64->qUnk44[0] = Q(DISPLAY_CENTER_X);
strc64->qUnk54[0] = Q(DISPLAY_CENTER_Y + 10);
s->graphics.dest = OBJ_VRAM0 + 0x440;
s->graphics.anim = SA1_END_CUTSCENE_PILOT_FACE;
s->variant = 1; // Tails
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->oamFlags = SPRITE_OAM_ORDER(3);
s->graphics.size = 0;
s->animCursor = 0;
@@ -1537,13 +1537,13 @@ void CreateExtraStageResults(void)
strc64 = TASK_DATA(task64_2);
s = &strc64->s;
strc64->unk3C = 0;
strc64->qUnk44[0] = Q(DISPLAY_WIDTH / 2);
strc64->qUnk54[0] = Q((DISPLAY_HEIGHT / 2) + 10);
strc64->qUnk44[0] = Q(DISPLAY_CENTER_X);
strc64->qUnk54[0] = Q(DISPLAY_CENTER_Y + 10);
s->graphics.dest = OBJ_VRAM0 + 0x560;
s->graphics.anim = SA1_ANIM_FINAL_CUTSCENE_TORNADO_SIDE;
s->variant = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->oamFlags = SPRITE_OAM_ORDER(6);
s->graphics.size = 0;
s->animCursor = 0;
@@ -1569,8 +1569,8 @@ void CreateExtraStageResults(void)
s->graphics.dest = OBJ_VRAM0 + 0x20;
s->graphics.anim = 731;
s->variant = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->oamFlags = SPRITE_OAM_ORDER(15);
s->graphics.size = 0;
s->animCursor = 0;
@@ -2184,8 +2184,8 @@ void Task_8067F9C()
strc64->s.graphics.dest = OBJ_VRAM0 + 0x26E0;
strc64->s.graphics.anim = SA1_ANIM_FINAL_CUTSCENE_ART_B;
strc64->s.variant = 0;
strc64->s.x = (DISPLAY_WIDTH / 2);
strc64->s.y = (DISPLAY_HEIGHT / 2);
strc64->s.x = DISPLAY_CENTER_X;
strc64->s.y = DISPLAY_CENTER_Y;
strc64->s.oamFlags = 0x3C0;
strc64->s.frameFlags = 0x2000;
}
@@ -2202,8 +2202,8 @@ void Task_8068004()
strc64->s.graphics.dest = OBJ_VRAM0 + 0x26E0;
strc64->s.graphics.anim = SA1_ANIM_FINAL_CUTSCENE_ART_B;
strc64->s.variant = 1;
strc64->s.x = (DISPLAY_WIDTH / 2);
strc64->s.y = (DISPLAY_HEIGHT / 2);
strc64->s.x = DISPLAY_CENTER_X;
strc64->s.y = DISPLAY_CENTER_Y;
strc64->s.oamFlags = 0x3C0;
strc64->s.frameFlags = 0x2000;
}
@@ -2474,8 +2474,8 @@ void Task_8068570()
strc64->s.graphics.dest = OBJ_VRAM0 + 0x26E0;
strc64->s.graphics.anim = SA1_ANIM_FINAL_CUTSCENE_ART_A;
strc64->s.variant = 0;
strc64->s.x = (DISPLAY_WIDTH / 2);
strc64->s.y = (DISPLAY_HEIGHT / 2);
strc64->s.x = DISPLAY_CENTER_X;
strc64->s.y = DISPLAY_CENTER_Y;
strc64->s.frameFlags = 0;
}
UpdateSpriteAnimation(&strc64->s);
@@ -2492,8 +2492,8 @@ void Task_80685C8()
strc64->s.graphics.dest = OBJ_VRAM0 + 0x26E0;
strc64->s.graphics.anim = SA1_ANIM_FINAL_CUTSCENE_ART_A;
strc64->s.variant = 1;
strc64->s.x = (DISPLAY_WIDTH / 2);
strc64->s.y = (DISPLAY_HEIGHT / 2);
strc64->s.x = DISPLAY_CENTER_X;
strc64->s.y = DISPLAY_CENTER_Y;
strc64->s.frameFlags = 0;
}
UpdateSpriteAnimation(&strc64->s);
src/game/game_2_3.c
+2 -2
View File
@@ -218,8 +218,8 @@ void sub_8062F90(void)
strc5C->task10 = t;
s = &strc5C->s;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = OBJ_VRAM0 + 0xF00;
s->oamFlags = 0x80;
s->graphics.size = 0;
src/game/interactables/stage_goal.c
+3 -3
View File
@@ -112,7 +112,7 @@ NONMATCH("asm/non_matching/game/interactables/stage_goal__Task_StageGoal.inc", v
if (I(gPlayer.qWorldX) > worldX) {
// _0801F336
if ((gCurrentLevel != LEVEL_INDEX(ZONE_4, ACT_2)) || I(gPlayer.qWorldY) <= worldY - (DISPLAY_HEIGHT / 2)) {
if ((gCurrentLevel != LEVEL_INDEX(ZONE_4, ACT_2)) || I(gPlayer.qWorldY) <= worldY - DISPLAY_CENTER_Y) {
// _0801F34C
if (IS_MULTI_PLAYER) {
if ((gCurrentLevel == LEVEL_INDEX(ZONE_6, ACT_1)) && (I(gPlayer.qWorldY) < worldY)) {
@@ -142,7 +142,7 @@ NONMATCH("asm/non_matching/game/interactables/stage_goal__Task_StageGoal.inc", v
}
_0801F3D2:
mpp->unk5C |= 0x1;
gCamera.maxX = worldX + (DISPLAY_WIDTH / 2);
gCamera.maxX = worldX + DISPLAY_CENTER_X;
i = 0;
if (gMultiplayerPlayerTasks[i] != NULL) {
@@ -187,7 +187,7 @@ NONMATCH("asm/non_matching/game/interactables/stage_goal__Task_StageGoal.inc", v
} else if (I(gPlayer.qWorldX) > worldX) {
// _0801F4D8 + 0x10
// _0801F4E6
if ((gCurrentLevel == LEVEL_INDEX(ZONE_4, ACT_2) && (I(gPlayer.qWorldY) > worldY - (DISPLAY_HEIGHT / 2)))
if ((gCurrentLevel == LEVEL_INDEX(ZONE_4, ACT_2) && (I(gPlayer.qWorldY) > worldY - DISPLAY_CENTER_Y))
|| (((IS_MULTI_PLAYER && (gCurrentLevel == LEVEL_INDEX(ZONE_6, ACT_1) && I(gPlayer.qWorldY) < worldY))
|| (IS_SINGLE_PLAYER
&& ((gCurrentLevel == LEVEL_INDEX(ZONE_6, ACT_1))
src/game/interactables/teleport_orb.c
+2 -2
View File
@@ -99,8 +99,8 @@ NONMATCH("asm/non_matching/game/interactables/TeleportOrb__Task_TeleportOrb.inc"
PLAYER(i).moveState &= ~MOVESTATE_IA_OVERRIDE;
if (PLAYER(i).playerID == PLAYER_1) {
PLAYER(i).qWorldY = Q(gCamera.y + (DISPLAY_HEIGHT / 2));
PLAYER(i).qWorldX = Q(gCamera.x + (DISPLAY_WIDTH / 2));
PLAYER(i).qWorldY = Q(gCamera.y + DISPLAY_CENTER_Y);
PLAYER(i).qWorldX = Q(gCamera.x + DISPLAY_CENTER_X);
gCamera.SA2_LABEL(unkC) = 0;
gCamera.SA2_LABEL(unk8) = 0;
}
src/game/intro_animation.c
+1 -1
View File
@@ -16,7 +16,7 @@
#define INTRO_SPOTLIGHT_COUNT 2
#define EMERALD_START_X (DISPLAY_WIDTH / 2)
#define EMERALD_START_X DISPLAY_CENTER_X
#define EMERALD_START_Y -36
typedef struct IntroSprite {
Sprite s;
src/game/multiplayer/communication_outcome.c
+3 -3
View File
@@ -131,7 +131,7 @@ void CreateMultipackOutcomeScreen(u8 outcome)
UpdateSpriteAnimation(s);
#elif (GAME == GAME_SA2)
s = &outcomeScreen->spr100;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_HEIGHT - 20;
s->graphics.dest = (void *)OBJ_VRAM0;
s->oamFlags = SPRITE_OAM_ORDER(15);
@@ -164,7 +164,7 @@ void CreateMultipackOutcomeScreen(u8 outcome)
UpdateSpriteAnimation(s);
#elif (GAME == GAME_SA2)
s = &outcomeScreen->sprD0;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = 36;
s->graphics.dest = (void *)OBJ_VRAM0 + 0x2000;
s->oamFlags = SPRITE_OAM_ORDER(15);
@@ -197,7 +197,7 @@ void CreateMultipackOutcomeScreen(u8 outcome)
UpdateSpriteAnimation(s);
#elif (GAME == GAME_SA2)
s = &outcomeScreen->sprA0;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_HEIGHT - 40;
s->graphics.dest = (void *)OBJ_VRAM0 + 0x4000;
s->oamFlags = SPRITE_OAM_ORDER(15);
src/game/multiplayer/continue_screen.c
+2 -2
View File
@@ -142,8 +142,8 @@ void CreateMultiplayerContinueScreen(void)
s->frameFlags = 0;
s = &screen->spr130;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = VramMalloc(0xCU);
s->oamFlags = 0x80;
s->graphics.size = 0;
src/game/multiplayer/indicators.c
+16 -16
View File
@@ -97,21 +97,21 @@ static void TaskDestructor_OpponentPositionIndicator(struct Task *);
} \
\
if (rot == 0) { \
tfy = (DISPLAY_HEIGHT / 2); \
tfy = DISPLAY_CENTER_Y; \
tfx = DISPLAY_WIDTH; \
} else if (rot == 256) { \
tfy = DISPLAY_HEIGHT; \
tfx = (DISPLAY_WIDTH / 2); \
tfx = DISPLAY_CENTER_X; \
} else if (rot == 512) { \
tfy = (DISPLAY_HEIGHT / 2); \
tfy = DISPLAY_CENTER_Y; \
tfx = 0; \
} else if (rot == 768) { \
tfy = 0; \
tfx = (DISPLAY_WIDTH / 2); \
tfx = DISPLAY_CENTER_X; \
} else { \
if ((targetX) > 0) { \
s16 divRes = Div(SIN_24_8(rot) * 256, COS_24_8(rot)); \
tfy = ((divRes * 15) >> 5) + (DISPLAY_HEIGHT / 2); \
tfy = ((divRes * 15) >> 5) + DISPLAY_CENTER_Y; \
\
if ((targetY) > 0) { \
if (tfy >= DISPLAY_HEIGHT) { \
@@ -119,7 +119,7 @@ static void TaskDestructor_OpponentPositionIndicator(struct Task *);
tfy = DISPLAY_HEIGHT; \
sinVal = (256 - rot) & ONE_CYCLE; \
divRes = Div(SIN_24_8(sinVal) * 256, COS_24_8(sinVal)); \
tfx = ((divRes * 5) >> 4) + (DISPLAY_WIDTH / 2); \
tfx = ((divRes * 5) >> 4) + DISPLAY_CENTER_X; \
} else { \
tfx = DISPLAY_WIDTH; \
} \
@@ -129,7 +129,7 @@ static void TaskDestructor_OpponentPositionIndicator(struct Task *);
tfy = 0; \
sinVal = (256 - rot) & ONE_CYCLE; \
divRes = Div(SIN_24_8(sinVal) * 256, COS_24_8(sinVal)); \
tfx = (DISPLAY_WIDTH / 2) - ((divRes * 5) >> 4); \
tfx = DISPLAY_CENTER_X - ((divRes * 5) >> 4); \
} else { \
tfx = DISPLAY_WIDTH; \
} \
@@ -138,14 +138,14 @@ static void TaskDestructor_OpponentPositionIndicator(struct Task *);
} else { \
s16 divRes \
= Div((SIN_24_8((rot - (SIN_PERIOD / 2)) & ONE_CYCLE)) * 0x100, (COS_24_8((rot - (SIN_PERIOD / 2)) & ONE_CYCLE))); \
tfy = (DISPLAY_HEIGHT / 2) - ((divRes * 15) >> 5); \
tfy = DISPLAY_CENTER_Y - ((divRes * 15) >> 5); \
if ((targetY) > 0) { \
if (tfy >= DISPLAY_HEIGHT) { \
s32 sinVal; \
tfy = DISPLAY_HEIGHT; \
sinVal = (768 - rot) & ONE_CYCLE; \
divRes = Div(SIN_24_8(sinVal) * 256, COS_24_8(sinVal)); \
tfx = ((divRes * 5) >> 4) + (DISPLAY_WIDTH / 2); \
tfx = ((divRes * 5) >> 4) + DISPLAY_CENTER_X; \
} else { \
tfx = 0; \
} \
@@ -156,7 +156,7 @@ static void TaskDestructor_OpponentPositionIndicator(struct Task *);
\
sinVal = (768 - rot) & ONE_CYCLE; \
divRes = Div(SIN_24_8(sinVal) * 256, COS_24_8(sinVal)); \
tfx = (DISPLAY_WIDTH / 2) - ((divRes * 5) >> 4); \
tfx = DISPLAY_CENTER_X - ((divRes * 5) >> 4); \
} else { \
tfx = 0; \
} \
@@ -273,8 +273,8 @@ static void SA2_LABEL(Task_801951C)(void)
RETURN_IF_PLAYER_ONSCREEN(mpp->pos.x, mpp->pos.y, gCamera.x, gCamera.y);
opponentX2 = (unsigned)(mpp->pos.x - (DISPLAY_WIDTH / 2) - gCamera.x);
opponentY2 = (unsigned)(mpp->pos.y - (DISPLAY_HEIGHT / 2) - gCamera.y);
opponentX2 = (unsigned)(mpp->pos.x - DISPLAY_CENTER_X - gCamera.x);
opponentY2 = (unsigned)(mpp->pos.y - DISPLAY_CENTER_Y - gCamera.y);
UPDATE_INDICATOR(opponentX2, opponentY2, spr, transform);
}
@@ -293,8 +293,8 @@ static void Task_8019898()
RETURN_IF_PLAYER_ONSCREEN(mpp->pos.x, mpp->pos.y, gCamera.x, gCamera.y);
opponentX = (unsigned)(mpp->pos.x - (DISPLAY_WIDTH / 2) - gCamera.x);
opponentY = (unsigned)(mpp->pos.y - (DISPLAY_HEIGHT / 2) - gCamera.y);
opponentX = (unsigned)(mpp->pos.x - DISPLAY_CENTER_X - gCamera.x);
opponentY = (unsigned)(mpp->pos.y - DISPLAY_CENTER_Y - gCamera.y);
// Only addition is from here
if (gCamera.x >= 961) {
@@ -307,8 +307,8 @@ static void Task_8019898()
RETURN_IF_PLAYER_ONSCREEN(mpp->pos.x, mpp->pos.y, normalizedCamX, normalizedCamY);
normalizedCamX = ({ mpp->pos.x - (DISPLAY_WIDTH / 2); }) - normalizedCamX;
normalizedCamY = ({ mpp->pos.y - (DISPLAY_HEIGHT / 2); }) - normalizedCamY;
normalizedCamX = ({ mpp->pos.x - DISPLAY_CENTER_X; }) - normalizedCamX;
normalizedCamY = ({ mpp->pos.y - DISPLAY_CENTER_Y; }) - normalizedCamY;
if (MAX(ABS(opponentX), ABS(opponentY)) > MAX(ABS(normalizedCamX), ABS(normalizedCamY))) {
opponentX = normalizedCamX;
src/game/multiplayer/multiplayer_event_mgr.c
+2 -2
View File
@@ -178,8 +178,8 @@ void ReceiveRoomEvent_ItemEffect(union MultiSioData *recv, u8 i)
gPlayer.moveState |= MOVESTATE_IN_AIR;
mpp->unk60 = 30;
gPlayer.timerInvulnerability = TIME(0, 2);
gCamera.x = (I(gPlayer.qWorldX) + gCamera.shiftX) - (DISPLAY_WIDTH / 2);
gCamera.y = (I(gPlayer.qWorldY) + gCamera.shiftY) - (DISPLAY_HEIGHT / 2);
gCamera.x = (I(gPlayer.qWorldX) + gCamera.shiftX) - DISPLAY_CENTER_X;
gCamera.y = (I(gPlayer.qWorldY) + gCamera.shiftY) - DISPLAY_CENTER_Y;
#if (GAME == GAME_SA2)
m4aSongNumStart(SE_218);
#endif
src/game/multiplayer/results.c
+2 -2
View File
@@ -82,8 +82,8 @@ void sub_8018538(void)
UpdateSpriteAnimation(s);
s = &strc->spr1C0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = strc->s2.graphics.dest + 0x180;
s->oamFlags = 0x80;
s->graphics.size = 0;
src/game/multiplayer/results_2.c
+4 -4
View File
@@ -329,8 +329,8 @@ void SA2_LABEL(Task_808207C)(void)
#ifndef COLLECT_RINGS_ROM
if (gMultiSioStatusFlags & MULTI_SIO_PARENT) {
s = &resultsScreen->unk400;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
if (resultsScreen->unk434) {
s->graphics.dest = resultsScreen->unk370[2].graphics.dest + UNK_GFX_SIZE;
@@ -629,7 +629,7 @@ void SA2_LABEL(sub_8082788)(void)
u16 temp;
s = &resultsScreen->unk80[i].unk0;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = gMultiplayerRanks[i] * 40 + 20;
UpdateSpriteAnimation(s);
DisplaySprite(s);
@@ -671,7 +671,7 @@ void SA2_LABEL(sub_8082788)(void)
} else {
u16 temp;
s = &resultsScreen->unk80[i].unk0;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = i * 40 + 20;
UpdateSpriteAnimation(s);
DisplaySprite(s);
src/game/multiplayer/unk_0.c
+1 -1
View File
@@ -11,7 +11,7 @@ void sub_801C9AC(void);
void sub_801C9C0(int_vcount vcount);
void TaskDestructor_801C980(struct Task *t);
#define ROOT (DISPLAY_WIDTH / 2)
#define ROOT DISPLAY_CENTER_X
#define X_RANGE(offset) WIN_RANGE((ROOT) - (offset), (ROOT) + (offset))
static const winreg_t sWin0Ranges[DISPLAY_HEIGHT] = {
src/game/multiplayer/unk_1.c
+1 -1
View File
@@ -120,7 +120,7 @@ void sub_801C9D8(void)
SpriteStrc *spr = &strc->sprites[i];
Sprite *s = &spr->s;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = 20 + i * 0x28;
s->graphics.dest = OBJ_VRAM0 + (i << 0xB);
s->oamFlags = 0x400;
src/game/options_menu.c
+2 -2
View File
@@ -218,8 +218,8 @@ void CreateOptionsMenu()
UpdateSpriteAnimation(s);
s = &menu->s270;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = VramMalloc(0x90U);
s->oamFlags = 0;
s->graphics.size = 0;
src/game/sa1_sa2_shared/demo_manager.c
+4 -4
View File
@@ -78,8 +78,8 @@ void CreateDemoManager(void)
gStageFlags |= STAGE_FLAG__DEMO_RUNNING;
s = &dm->textPressStart;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2) + 33;
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y + 33;
#if (GAME == GAME_SA1)
s->graphics.dest = ALLOC_TILES(SA1_ANIM_PRESS_START_MSG_JP);
@@ -107,8 +107,8 @@ void CreateDemoManager(void)
UpdateSpriteAnimation(s);
s = &dm->textDemoPlay;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
#if (GAME == GAME_SA1)
s->graphics.dest = ALLOC_TILES(SA1_ANIM_DEMO_PLAY);
src/game/sa1_sa2_shared/pause_menu.c
+8 -8
View File
@@ -44,8 +44,8 @@ void CreatePauseMenu(void)
s->prevVariant = -1;
s->animSpeed = SPRITE_ANIM_SPEED(1.0);
s->palId = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
UpdateSpriteAnimation(s);
@@ -62,8 +62,8 @@ void CreatePauseMenu(void)
s->prevVariant = -1;
s->animSpeed = SPRITE_ANIM_SPEED(1.0);
s->palId = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
UpdateSpriteAnimation(s);
} else {
@@ -79,8 +79,8 @@ void CreatePauseMenu(void)
s->prevVariant = -1;
s->animSpeed = SPRITE_ANIM_SPEED(1.0);
s->palId = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
UpdateSpriteAnimation(s);
@@ -96,8 +96,8 @@ void CreatePauseMenu(void)
s->prevVariant = -1;
s->animSpeed = SPRITE_ANIM_SPEED(1.0);
s->palId = 0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
UpdateSpriteAnimation(s);
}
src/game/special_stage/main.c
+2 -2
View File
@@ -668,8 +668,8 @@ void sub_8029EA8(s16 unusedCharacterId)
s->graphics.anim = strc5690->anim48;
s->variant = strc5690->variant4A;
s->prevVariant = -1;
s->x = (DISPLAY_WIDTH / 2) + I(strc5690->unk0);
s->y = (DISPLAY_HEIGHT / 2) - I(strc5690->unk4);
s->x = DISPLAY_CENTER_X + I(strc5690->unk0);
s->y = DISPLAY_CENTER_Y - I(strc5690->unk4);
s->oamFlags = 0x180;
s->qAnimDelay = 0;
s->animSpeed = SPRITE_ANIM_SPEED(1.0);
src/game/staff_credits.c
+4 -4
View File
@@ -162,7 +162,7 @@ void CreateStaffCredits()
s->graphics.anim = SA1_ANIM_CREDITS_COPYRIGHT;
s->variant = 1;
s->graphics.dest = VRAM_RESERVED_STAFF_CREDITS_C;
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = 0;
s->oamFlags = 0x480;
s->graphics.size = 0;
@@ -382,7 +382,7 @@ NONMATCH("asm/non_matching/game/staff_credits__Task_805E888.inc", void Task_805E
s->y = yPos + (var_r8 * 0x10);
if (s->y < 0x9B) {
s32 xPos = (DISPLAY_WIDTH / 2);
s32 xPos = DISPLAY_CENTER_X;
s->x = xPos;
switch (var_r5) {
@@ -398,8 +398,8 @@ NONMATCH("asm/non_matching/game/staff_credits__Task_805E888.inc", void Task_805E
default:
s->graphics.anim = 0x2E4;
s->variant = 3;
if (s->y < (DISPLAY_HEIGHT / 2)) {
s->y = (DISPLAY_HEIGHT / 2);
if (s->y < DISPLAY_CENTER_Y) {
s->y = DISPLAY_CENTER_Y;
}
s2->x = xPos;
s2->y = s->y + 40;
src/game/stage/camera.c
+19 -19
View File
@@ -547,10 +547,10 @@ void InitCamera(u32 level)
camera->maxX = gRefCollision->pxWidth;
#if (GAME == GAME_SA1)
camera->sa2__unk10 = I(gPlayer.qWorldX) - (DISPLAY_WIDTH / 2);
camera->x = I(gPlayer.qWorldX) - (DISPLAY_WIDTH / 2);
camera->sa2__unk14 = (I(gPlayer.qWorldY) + camera->sa2__unk4C) - ((DISPLAY_HEIGHT / 2) + 4);
camera->y = (I(gPlayer.qWorldY) + camera->sa2__unk4C) - ((DISPLAY_HEIGHT / 2) + 4);
camera->sa2__unk10 = I(gPlayer.qWorldX) - DISPLAY_CENTER_X;
camera->x = I(gPlayer.qWorldX) - DISPLAY_CENTER_X;
camera->sa2__unk14 = (I(gPlayer.qWorldY) + camera->sa2__unk4C) - (DISPLAY_CENTER_Y + 4);
camera->y = (I(gPlayer.qWorldY) + camera->sa2__unk4C) - (DISPLAY_CENTER_Y + 4);
camera->sa2__unk8 = 16;
camera->sa2__unkC = 12;
@@ -575,7 +575,7 @@ void InitCamera(u32 level)
gBossCameraClampYLower = gBossCameraYClamps[ZONE_FINAL + 1][0];
gBossCameraClampYUpper = gBossCameraYClamps[ZONE_FINAL + 1][1];
camera->x = 600;
camera->unk10 = (DISPLAY_WIDTH / 2);
camera->unk10 = DISPLAY_CENTER_X;
camera->unk14 = 0;
camera->y = 0;
camera->unk64 = -4;
@@ -585,13 +585,13 @@ void InitCamera(u32 level)
// for now we use the original GBA values as otherwise the boss
// goes off the screen (not sure why yet)
camera->unk10 = I(player->qWorldX) - (2 * 240);
camera->y = I(player->qWorldY) - ((DISPLAY_HEIGHT / 2) + 4);
camera->y = I(player->qWorldY) - (DISPLAY_CENTER_Y + 4);
camera->unk14 = camera->y;
camera->unk64 = player->spriteOffsetY - 4;
}
} else {
camera->x = I(player->qWorldX) - (DISPLAY_WIDTH / 2);
camera->y = I(player->qWorldY) - ((DISPLAY_HEIGHT / 2) + 4);
camera->x = I(player->qWorldX) - DISPLAY_CENTER_X;
camera->y = I(player->qWorldY) - (DISPLAY_CENTER_Y + 4);
if (camera->x < 0) {
camera->x = 0;
@@ -635,7 +635,7 @@ void InitCamera(u32 level)
// Only need to use the original value for these zones
#define DISPLAY_WIDTH_FOR_BOSS_TAS \
((LEVEL_TO_ZONE(gCurrentLevel) == ZONE_2 || LEVEL_TO_ZONE(gCurrentLevel) == ZONE_6) ? (240 / 2) : (DISPLAY_WIDTH / 2))
((LEVEL_TO_ZONE(gCurrentLevel) == ZONE_2 || LEVEL_TO_ZONE(gCurrentLevel) == ZONE_6) ? (240 / 2) : DISPLAY_CENTER_X)
void UpdateCamera(void)
{
@@ -693,19 +693,19 @@ void UpdateCamera(void)
#if TAS_TESTING && TAS_TESTING_WIDESCREEN_HACK && DISPLAY_WIDTH > 240
if (newX + (DISPLAY_WIDTH_FOR_BOSS_TAS + 1) < I(player->qWorldX))
#else
if (newX + ((DISPLAY_WIDTH / 2) + 1) < I(player->qWorldX))
if (newX + (DISPLAY_CENTER_X + 1) < I(player->qWorldX))
#endif
{
if ((camera->sa2__unk20 + (DISPLAY_HEIGHT / 2)) > newX) {
if ((camera->sa2__unk20 + DISPLAY_CENTER_Y) > newX) {
s32 playerScreenX = I(player->qWorldX);
#if TAS_TESTING && TAS_TESTING_WIDESCREEN_HACK && DISPLAY_WIDTH > 240
playerScreenX -= DISPLAY_WIDTH_FOR_BOSS_TAS;
#else
playerScreenX -= DISPLAY_WIDTH / 2;
playerScreenX -= DISPLAY_CENTER_X;
#endif
camera->shiftX = playerScreenX - newX;
} else {
newX = (camera->sa2__unk20 + (DISPLAY_HEIGHT / 2));
newX = (camera->sa2__unk20 + DISPLAY_CENTER_Y);
camera->shiftX = 0;
}
} else {
@@ -759,7 +759,7 @@ void UpdateCamera(void)
MultiplayerPlayer *mpp = TASK_DATA(gMultiplayerPlayerTasks[camera->spectatorTarget]);
if (!(camera->sa2__unk50 & 0x1)) {
camera->sa2__unk10 = (mpp->pos.x + camera->shiftX) - (DISPLAY_WIDTH / 2);
camera->sa2__unk10 = (mpp->pos.x + camera->shiftX) - DISPLAY_CENTER_X;
}
if (!(camera->sa2__unk50 & 2)) {
@@ -784,16 +784,16 @@ void UpdateCamera(void)
camera->sa2__unk64 = unk64;
}
camera->sa2__unk14 = ((mpp->pos.y) + camera->shiftY) - (DISPLAY_HEIGHT / 2) + camera->sa2__unk4C + unk64;
camera->sa2__unk14 = ((mpp->pos.y) + camera->shiftY) - DISPLAY_CENTER_Y + camera->sa2__unk4C + unk64;
}
} else
#elif (GAME == GAME_SA2)
camera->unk14 = I(player->qWorldY) + camera->shiftY - (DISPLAY_HEIGHT / 2) + camera->unk4C + unk64;
camera->unk14 = I(player->qWorldY) + camera->shiftY - DISPLAY_CENTER_Y + camera->unk4C + unk64;
#endif
{
if (!(camera->sa2__unk50 & 1)) {
s16 airSpeedX = player->qSpeedAirX;
camera->sa2__unk10 = I(player->qWorldX) + camera->shiftX - (DISPLAY_WIDTH / 2);
camera->sa2__unk10 = I(player->qWorldX) + camera->shiftX - DISPLAY_CENTER_X;
#if (GAME == GAME_SA2)
camera->unk56 = (airSpeedX + (camera->unk56 * 15)) >> 4;
camera->unk10 += (camera->unk56 >> 5);
@@ -822,9 +822,9 @@ void UpdateCamera(void)
}
#if (GAME == GAME_SA1)
camera->sa2__unk14 = I(player->qWorldY) + camera->shiftY - (DISPLAY_HEIGHT / 2) + camera->sa2__unk4C + unk64;
camera->sa2__unk14 = I(player->qWorldY) + camera->shiftY - DISPLAY_CENTER_Y + camera->sa2__unk4C + unk64;
#elif (GAME == GAME_SA2)
camera->unk14 = I(player->qWorldY) + camera->shiftY - (DISPLAY_HEIGHT / 2) + camera->unk4C + unk64;
camera->unk14 = I(player->qWorldY) + camera->shiftY - DISPLAY_CENTER_Y + camera->unk4C + unk64;
#endif
}
}
src/game/stage/player.c
+3 -3
View File
@@ -3830,8 +3830,8 @@ void Task_PlayerHandleDeath(void)
gSpecialRingCount = 0;
#endif
InitializePlayer(&gPlayer);
gCamera.x = I(gPlayer.qWorldX) + gCamera.shiftX - (DISPLAY_WIDTH / 2);
gCamera.y = I(gPlayer.qWorldY) + gCamera.shiftY - (DISPLAY_HEIGHT / 2);
gCamera.x = I(gPlayer.qWorldX) + gCamera.shiftX - DISPLAY_CENTER_X;
gCamera.y = I(gPlayer.qWorldY) + gCamera.shiftY - DISPLAY_CENTER_Y;
m4aMPlayTempoControl(&gMPlayInfo_BGM, 256);
gPlayer.moveState = 0;
gStageFlags &= ~STAGE_FLAG__GRAVITY_INVERTED;
@@ -4220,7 +4220,7 @@ NONMATCH("asm/non_matching/game/stage/Player__Task_804597C.inc", void Task_80459
r1 = 0;
}
} else {
if (qPartnerWorldY > Q(cam->y - (DISPLAY_HEIGHT / 2))) {
if (qPartnerWorldY > Q(cam->y - DISPLAY_CENTER_Y)) {
r1 = 0;
} else {
r1 = 1;
src/game/stage/ui_z.c
+1 -1
View File
@@ -555,7 +555,7 @@ NONMATCH("asm/non_matching/game/stage/ui__Task_8055458.inc", void Task_8055458(v
}
if (IS_EXTRA_STAGE(gCurrentLevel)) {
sub_804A5D8(Q(DISPLAY_WIDTH / 2), Q(DISPLAY_HEIGHT / 2));
sub_804A5D8(Q(DISPLAY_CENTER_X), Q(DISPLAY_CENTER_Y));
}
} else if (gCurrentLevel == LEVEL_INDEX(ZONE_4, ACT_1) || gCurrentLevel == LEVEL_INDEX(ZONE_4, ACT_2)) {
//_08055708
src/game/time_attack/lobby.c
+1 -1
View File
@@ -240,7 +240,7 @@ void sub_806A5BC(void)
DisplaySprite(s);
s++;
s->x = I(lobby->qUnk12C) + (DISPLAY_WIDTH / 2);
s->x = I(lobby->qUnk12C) + DISPLAY_CENTER_X;
if (UpdateSpriteAnimation(s) == ACMD_RESULT__ENDED) {
s->graphics.anim = gUnknown_0868B6A0[gSelectedCharacter][1];
s->variant = gUnknown_0868B6B8[gSelectedCharacter][1];
src/game/time_over.c
+1 -1
View File
@@ -121,7 +121,7 @@ void Task_TimeOverStateUpdate()
timer = state->timer;
if (timer > TIME(0, 2.0)) {
state->s2.x = state->s.x = (DISPLAY_WIDTH / 2);
state->s2.x = state->s.x = DISPLAY_CENTER_X;
} else if (timer > TIME(0, 0.5)) {
state->s2.x = state->s.x = (DISPLAY_WIDTH + 60) - ((timer - TIME(0, 0.5)) * 2);
}
src/game/title_screen.c
+3 -3
View File
@@ -534,8 +534,8 @@ void CreateMainMenu(u32 param0)
menu->unk1AC = 0;
menu->unk1AF = param0;
s->x = (DISPLAY_WIDTH / 2);
s->y = (DISPLAY_HEIGHT / 2);
s->x = DISPLAY_CENTER_X;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = (void *)BG_VRAM + 0x40;
s->graphics.size = 0;
s->graphics.anim = 1; // TODO: Why?
@@ -655,7 +655,7 @@ void Task_MainMenuInit(void)
for (i = 0; i < ARRAY_COUNT(menu->items); i++) {
s = &menu->items[i];
s->x = (DISPLAY_WIDTH / 2);
s->x = DISPLAY_CENTER_X;
s->y = (i * MENU_ITEMS_SPACE) + MENU_ITEMS_TOP_Y;
s->graphics.dest = VramMalloc((u32)sTitlescreenFrameTileSizes[i]);
s->graphics.size = 0;
src/game/to_be_continued_screen.c
+5 -5
View File
@@ -47,7 +47,7 @@ void CreateToBeContinuedScreen(void)
tbc->unk7C = 0;
s->x = DISPLAY_WIDTH;
s->y = DISPLAY_HEIGHT / 2;
s->y = DISPLAY_CENTER_Y;
s->graphics.dest = VRAM_RESERVED_TO_BE_CONTINUED;
s->oamFlags = SPRITE_OAM_ORDER(18);
@@ -63,7 +63,7 @@ void CreateToBeContinuedScreen(void)
tbc->tasks74[i] = t2 = sub_80125C0(t2, i + 1);
}
DmaFill32(3, ((480 << 16) | (DISPLAY_HEIGHT / 2)), tbc->positions, sizeof(tbc->positions));
DmaFill32(3, ((480 << 16) | DISPLAY_CENTER_Y), tbc->positions, sizeof(tbc->positions));
gBgPalette[0] = RGB_BLACK;
gFlags |= FLAGS_UPDATE_BACKGROUND_PALETTES;
@@ -81,7 +81,7 @@ void Task_ToBeContinuedScreenInit(void)
tbc->unk7C = (tbc->unk7C + 8) & ONE_CYCLE;
s = &tbc->s;
s->x = ((COS_24_8(tbc->unk7C) * 15) >> 4) + (DISPLAY_WIDTH / 2);
s->x = ((COS_24_8(tbc->unk7C) * 15) >> 4) + DISPLAY_CENTER_X;
tbc->positions[tbc->unk30][0] = s->x;
tbc->positions[tbc->unk30][1] = s->y;
@@ -89,7 +89,7 @@ void Task_ToBeContinuedScreenInit(void)
DisplaySprite(s);
if (tbc->unk7C == 0x100) {
s->x = DISPLAY_WIDTH / 2;
s->x = DISPLAY_CENTER_X;
tbc->unk7E = 0;
gCurTask->main = Task_80124C4;
} else if (tbc->unk7C == 0x200) {
@@ -161,7 +161,7 @@ struct Task *sub_80125C0(struct Task *tbcTask, u8 priority)
s->frameFlags = SPRITE_FLAG(PRIORITY, 0);
UpdateSpriteAnimation(s);
DmaFill32(3, ((480 << 16) | (DISPLAY_HEIGHT / 2)), shrunk->positions, sizeof(shrunk->positions));
DmaFill32(3, ((480 << 16) | DISPLAY_CENTER_Y), shrunk->positions, sizeof(shrunk->positions));
return t;
}