Skip to content

Changes to title_screen #260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JJODY4 wants to merge 1 commit into from
Closed

Changes to title_screen #260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/bg_triangles.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ extern void SA2_LABEL(sub_800724C)(u8 bg, TriParam1 *param1);
extern void SA2_LABEL(sub_80075D0)(u8 bg, int_vcount param1, int_vcount param2, s16 param3, s16 param4, u16 param5);
extern void SA2_LABEL(sub_8007738)(u8 bg, int_vcount minY, int_vcount maxY, u16 param3, u8 param4, u8 param5, u16 param6, u8 param7,
u8 param8, s16 param9, s16 param10);
extern void SA2_LABEL(sub_8007858)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4);
extern void SA2_LABEL(sub_80078D4)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd);
extern void SA2_LABEL(SetWindowRegionExtended)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4);
extern void SA2_LABEL(SetWindowRegion)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd);
void SA2_LABEL(sub_8007958)(u8 bg, int_vcount minY, int_vcount maxY, s16 param3, s8 param4, u16 param5, u16 param6);
#endif
8 changes: 4 additions & 4 deletions sa1/asm/non_matching/game/egg_rocket_trans__Task_8029194.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ _080293F0:
str r0, [sp]
movs r0, #2
movs r1, #0
bl sa2__sub_80078D4
bl sa2__SetWindowRegion
ldrb r1, [r6, #4]
ldrb r0, [r5, #2]
subs r1, r1, r0
Expand All @@ -330,7 +330,7 @@ _080293F0:
movs r0, #0xf0
str r0, [sp]
movs r0, #2
bl sa2__sub_8007858
bl sa2__SetWindowRegionExtended
adds r4, r5, #0
b _08029466
.align 2, 0
Expand All @@ -346,7 +346,7 @@ _08029450:
str r0, [sp]
movs r0, #2
movs r1, #0
bl sa2__sub_8007858
bl sa2__SetWindowRegionExtended
_08029466:
lsrs r1, r4, #0x18
ldr r0, _08029484 @ =gBgScrollRegs
Expand All @@ -360,7 +360,7 @@ _08029466:
str r0, [sp]
movs r0, #2
movs r2, #0xa0
bl sa2__sub_80078D4
bl sa2__SetWindowRegion
b _08029494
.align 2, 0
_08029484: .4byte gBgScrollRegs
Expand Down
6 changes: 3 additions & 3 deletions sa1/asm/non_matching/game/egg_rocket_trans__Task_80294A8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ _0802977C:
str r0, [sp]
movs r0, #2
movs r1, #0
bl sa2__sub_80078D4
bl sa2__SetWindowRegion
ldr r2, [sp, #4]
ldrb r1, [r2, #4]
ldrb r0, [r5, #2]
Expand All @@ -372,7 +372,7 @@ _0802977C:
str r0, [sp]
movs r0, #2
movs r2, #0xa0
bl sa2__sub_8007858
bl sa2__SetWindowRegionExtended
b _080297D2
.align 2, 0
_080297BC: .4byte gBgScrollRegs
Expand All @@ -384,7 +384,7 @@ _080297C0:
movs r0, #2
movs r1, #0
movs r2, #0xa0
bl sa2__sub_8007858
bl sa2__SetWindowRegionExtended
_080297D2:
add sp, #0x14
pop {r3, r4, r5}
Expand Down
4 changes: 2 additions & 2 deletions src/bg_triangles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ void SA2_LABEL(sub_8007738)(u8 bg, int_vcount minY, int_vcount maxY, u16 param3,
}
}

void SA2_LABEL(sub_8007858)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4)
void SA2_LABEL(SetWindowRegionExtended)(u8 param0, int_vcount minY, int_vcount maxY, u16 param3, u16 param4)
{
u16 *cursor;

Expand Down Expand Up @@ -825,7 +825,7 @@ const u16 gUnknown_082B5304[] = {
#endif
#endif

void SA2_LABEL(sub_80078D4)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd)
void SA2_LABEL(SetWindowRegion)(u8 bg, int_vcount minY, int_vcount maxY, u16 offsetEven, u16 offsetOdd)
{
s32 fillVal;

Expand Down
22 changes: 11 additions & 11 deletions src/game/sa1/menus/title_screen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void Task_SegaLogoInit();
void Task_SetSegaLogoTask();
void Task_SonicTeamLogoInit();
void Task_SwitchTo_Task_MainMenu_Select();
void Task_800D11C();
void Task_SegaLogoScrollOut(); //Originally Task_800D11C
void sub_800D364();
void sub_800D3E0();
void SwitchToSonicTeamLogo();
Expand Down Expand Up @@ -146,23 +146,23 @@ void Task_SegaLogoInit(void)
logo = TASK_DATA(gCurTask);
gDispCnt |= DISPCNT_BG2_ON;
logo->unk0++;
SA2_LABEL(sub_8007858)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);
SA2_LABEL(sub_80078D4)(2U, (160 - logo->unk0), 160, (u16)gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegionExtended)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0); //Originally sub_80078D4
SA2_LABEL(SetWindowRegion)(2U, (160 - logo->unk0), 160, (u16)gBgScrollRegs[2][0], gBgScrollRegs[2][1]); //Originally sub_8007858

if (logo->unk0 == 160) {
gCurTask->main = sub_800D3E0;
logo->unk0 = 0U;
logo->unk0 = 0U;6
}
}

void Task_800D11C(void)
void Task_SegaLogoScrollOut(void)
{
SegaLogo *logo;

logo = TASK_DATA(gCurTask);
logo->unk0++;
SA2_LABEL(sub_80078D4)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(sub_8007858)
SA2_LABEL(SetWindowRegion)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegionExtended)
(2U, (160 - logo->unk0), 160, gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);

if (logo->unk0 == 160) {
Expand Down Expand Up @@ -228,8 +228,8 @@ void Task_800D268(void)

logo->unk0 += 2;
if (logo->unk0 < 280) {
SA2_LABEL(sub_80078D4)(2, 0, 40, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(sub_80078D4)(2, 120, 160, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2, 0, 40, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2, 120, 160, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);

#if !PORTABLE
// BUG: For some reason this currently overwrites memory it shouldn't be able to access.
Expand All @@ -239,7 +239,7 @@ void Task_800D268(void)
SA2_LABEL(sub_8007958)(2U, 40, 120, (s16)(280 - logo->unk0), -1, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
} else {
SA2_LABEL(sub_8007958)(2U, 40, (64 - logo->unk0), (280 - logo->unk0), -1, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(sub_80078D4)(2U, (64 - logo->unk0), 120, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2U, (64 - logo->unk0), 120, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
}
#endif
} else {
Expand Down Expand Up @@ -280,7 +280,7 @@ void sub_800D3E0(void)
SegaLogo *logo = TASK_DATA(gCurTask);

if (++logo->unk0 == 120) {
gCurTask->main = Task_800D11C;
gCurTask->main = Task_SegaLogoScrollOut;
logo->unk0 = 0U;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/game/sa1/multiplayer/chao_message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,21 +811,21 @@ void sub_803BE0C()

var_r4 = message->unk50;
if (message->unk50 != 0) {
SA2_LABEL(sub_80078D4)(0U, 0U, var_r4, DISPLAY_WIDTH, 0U);
SA2_LABEL(SetWindowRegion)(0U, 0U, var_r4, DISPLAY_WIDTH, 0U);
}

for (var_r6 = 0; var_r6 < message->unk54; var_r6++) {
u32 mask = 0x1FF;
#ifndef NON_MATCHING
SA2_LABEL(sub_80078D4)(0U, var_r4, var_r4 += 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
SA2_LABEL(SetWindowRegion)(0U, var_r4, var_r4 += 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
#else
SA2_LABEL(sub_80078D4)(0U, var_r4, var_r4 + 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
SA2_LABEL(SetWindowRegion)(0U, var_r4, var_r4 + 0x28, ~message->unk48[var_r6] & mask, (-message->unk50));
var_r4 += 0x28;
#endif
}

if (var_r4 < DISPLAY_HEIGHT) {
SA2_LABEL(sub_80078D4)(0U, var_r4, DISPLAY_HEIGHT, DISPLAY_WIDTH, 0U);
SA2_LABEL(SetWindowRegion)(0U, var_r4, DISPLAY_HEIGHT, DISPLAY_WIDTH, 0U);
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/game/sa1/stage/backgrounds/zone_6.inc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,18 +202,18 @@ void StageBgUpdate_Zone6Act1(s32 x, s32 y)
}

if (!(cam->SA2_LABEL(unk50) & 0x8000)) {
SA2_LABEL(sub_80078D4)(0, 0, 100, (u16)gBgScrollRegs[0][0], (u16)gBgScrollRegs[0][1]);
SA2_LABEL(sub_80078D4)(0, 100, 104, 0, DISPLAY_HEIGHT);
SA2_LABEL(SetWindowRegion)(0, 0, 100, (u16)gBgScrollRegs[0][0], (u16)gBgScrollRegs[0][1]);
SA2_LABEL(SetWindowRegion)(0, 100, 104, 0, DISPLAY_HEIGHT);

if ((128 - ((gStageTime >> 5) & 0x7F)) > 56) {
SA2_LABEL(sub_80078D4)(0, 104, 160, 0, ((gStageTime >> 5) & 0x7F) + 160);
SA2_LABEL(SetWindowRegion)(0, 104, 160, 0, ((gStageTime >> 5) & 0x7F) + 160);
} else {
int_vcount v = 232 - ((gStageTime >> 5) & 0x7F);
int_vcount w;
SA2_LABEL(sub_80078D4)(0, 104, v, 0, ((gStageTime >> 5) & 0x7F) + 160);
SA2_LABEL(SetWindowRegion)(0, 104, v, 0, ((gStageTime >> 5) & 0x7F) + 160);

w = 232 - ((gStageTime >> 5) & 0x7F);
SA2_LABEL(sub_80078D4)(0, w, 160, 0, ((gStageTime >> 5) & 0x7F) + 32);
SA2_LABEL(SetWindowRegion)(0, w, 160, 0, ((gStageTime >> 5) & 0x7F) + 32);
}
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/game/sa1/stage/egg_rocket_transitions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@ void Task_8028F20(void)
Task_8029070();
} else if ((ip > 0) && (r7 < DISPLAY_HEIGHT)) {
if (shake->worldY - gCamera.y > 0) {
SA2_LABEL(sub_80078D4)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);

SA2_LABEL(sub_8007858)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
} else {
SA2_LABEL(sub_8007858)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
}
SA2_LABEL(sub_80078D4)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
SA2_LABEL(SetWindowRegion)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
} else {
gFlags &= ~FLAGS_EXECUTE_HBLANK_COPY;
}
Expand Down Expand Up @@ -176,13 +176,13 @@ void Task_8029070(void)
Task_8029194();
} else if ((ip > 0) && (r7 < DISPLAY_HEIGHT)) {
if (shake->worldY - gCamera.y > 0) {
SA2_LABEL(sub_80078D4)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);

SA2_LABEL(sub_8007858)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
} else {
SA2_LABEL(sub_8007858)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
}
SA2_LABEL(sub_80078D4)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
SA2_LABEL(SetWindowRegion)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
} else {
gFlags &= ~FLAGS_EXECUTE_HBLANK_COPY;
}
Expand Down Expand Up @@ -266,13 +266,13 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_8029194.inc", void Task_8
} else {
if ((ip > 0) && (r7 < DISPLAY_HEIGHT)) {
if (shake->worldY - gCamera.y > 0) {
SA2_LABEL(sub_80078D4)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegion)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);

SA2_LABEL(sub_8007858)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, shake->worldY - gCamera.y, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
} else {
SA2_LABEL(sub_8007858)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, 0, r7, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
}
SA2_LABEL(sub_80078D4)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
SA2_LABEL(SetWindowRegion)(2, r7, DISPLAY_HEIGHT, gBgScrollRegs[2][0], gBgScrollRegs[2][1] - I(shake->qUnk8));
} else {
gFlags &= ~FLAGS_EXECUTE_HBLANK_COPY;
}
Expand Down Expand Up @@ -380,10 +380,10 @@ NONMATCH("asm/non_matching/game/egg_rocket_trans__Task_80294A8.inc", void Task_8

gCamera.SA2_LABEL(unk50) &= ~0x8000;
} else if ((shake->worldY - gCamera.y) > 0) {
SA2_LABEL(sub_80078D4)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(sub_8007858)(2, shake->worldY - gCamera.y, DISPLAY_HEIGHT, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegion)(2, 0, shake->worldY - gCamera.y, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(SetWindowRegionExtended)(2, shake->worldY - gCamera.y, DISPLAY_HEIGHT, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
} else {
SA2_LABEL(sub_8007858)(2, 0, DISPLAY_HEIGHT, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
SA2_LABEL(SetWindowRegionExtended)(2, 0, DISPLAY_HEIGHT, gBgScrollRegs[2][0], (DISPLAY_HEIGHT + 80));
}
}
END_NONMATCH
Expand Down
14 changes: 7 additions & 7 deletions src/game/sa1/stage/mp_unk_1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void Task_801CB80()
}

if (strc->unk432 != 0) {
SA2_LABEL(sub_80078D4)(3U, 0U, strc->unk432, 0xF0U, 0U);
SA2_LABEL(SetWindowRegion)(3U, 0U, strc->unk432, 0xF0U, 0U);
}

for (i = 0; i < MULTI_SIO_PLAYERS_MAX; i++) {
Expand All @@ -187,16 +187,16 @@ void Task_801CB80()
}

if (1 & i) {
SA2_LABEL(sub_80078D4)
SA2_LABEL(SetWindowRegion)
(3U, strc->unk432 + (i * 40), strc->unk432 + ((i + 1) * 40), (DISPLAY_WIDTH - I(strc->qUnk430)), (-strc->unk432) & 0xFF);
} else {
SA2_LABEL(sub_80078D4)
SA2_LABEL(SetWindowRegion)
(3U, strc->unk432 + (i * 40), strc->unk432 + ((i + 1) * 40), (I(strc->qUnk430) - DISPLAY_WIDTH), (-strc->unk432) & 0xFF);
}
}

if (strc->unk432 != 0) {
SA2_LABEL(sub_80078D4)(3U, (u8)(strc->unk432 + (i * 40)), DISPLAY_HEIGHT, DISPLAY_WIDTH, 0U);
SA2_LABEL(SetWindowRegion)(3U, (u8)(strc->unk432 + (i * 40)), DISPLAY_HEIGHT, DISPLAY_WIDTH, 0U);
}
}

Expand Down Expand Up @@ -302,15 +302,15 @@ void sub_801CF08()

strc = TASK_DATA(gCurTask);
if (strc->unk432 != 0) {
SA2_LABEL(sub_80078D4)(3U, 0U, strc->unk432, 240, 0U);
SA2_LABEL(SetWindowRegion)(3U, 0U, strc->unk432, 240, 0U);
}

for (i = 0; i < 4; i++) {
if (!GetBit(gMultiplayerConnections, i)) {
break;
}

SA2_LABEL(sub_80078D4)(3U, (strc->unk432 + (i * 0x28)), (strc->unk432 + ((i + 1) * 0x28)), 0U, (-strc->unk432) & 0xFF);
SA2_LABEL(SetWindowRegion)(3U, (strc->unk432 + (i * 0x28)), (strc->unk432 + ((i + 1) * 0x28)), 0U, (-strc->unk432) & 0xFF);

if ((i == SIO_MULTI_CNT->id) || GetBit(gMultiplayerConnections, i)) {
spriteStrc = &strc->sprites[gMultiplayerCharacters[i]];
Expand All @@ -322,7 +322,7 @@ void sub_801CF08()
}

if (strc->unk432 != 0) {
SA2_LABEL(sub_80078D4)(3U, (strc->unk432 + (i * 0x28)), 0xA0U, 0xF0U, 0U);
SA2_LABEL(SetWindowRegion)(3U, (strc->unk432 + (i * 0x28)), 0xA0U, 0xF0U, 0U);
}
}

Expand Down
12 changes: 6 additions & 6 deletions src/game/shared/collect_rings/results.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,17 +494,17 @@ void Task_MultiplayerSinglePakResultsScreenInit(void)
for (i = 0; i < 4; i++) {
if (!(gMultiSioStatusFlags & MULTI_SIO_RECV_ID(i + 8))) {
if (gMultiplayerRanks[i] & 1) {
SA2_LABEL(sub_80078D4)(3, i * 40, (i + 1) * 40, DISPLAY_WIDTH - resultsScreen->unk430, DISPLAY_HEIGHT - i * 40);
SA2_LABEL(SetWindowRegion)(3, i * 40, (i + 1) * 40, DISPLAY_WIDTH - resultsScreen->unk430, DISPLAY_HEIGHT - i * 40);
} else {
SA2_LABEL(sub_80078D4)(3, i * 40, (i + 1) * 40, resultsScreen->unk430 - DISPLAY_WIDTH, DISPLAY_HEIGHT - i * 40);
SA2_LABEL(SetWindowRegion)(3, i * 40, (i + 1) * 40, resultsScreen->unk430 - DISPLAY_WIDTH, DISPLAY_HEIGHT - i * 40);
}
} else {
if (gMultiplayerRanks[i] & 1) {
SA2_LABEL(sub_80078D4)
SA2_LABEL(SetWindowRegion)
(3, gMultiplayerRanks[i] * 40, (gMultiplayerRanks[i] + 1) * 40, DISPLAY_WIDTH - resultsScreen->unk430,
(i * 5 - gMultiplayerRanks[i] * 5) * 8);
} else {
SA2_LABEL(sub_80078D4)
SA2_LABEL(SetWindowRegion)
(3, gMultiplayerRanks[i] * 40, (gMultiplayerRanks[i] + 1) * 40, resultsScreen->unk430 - DISPLAY_WIDTH,
(i * 5 - gMultiplayerRanks[i] * 5) * 8);
}
Expand Down Expand Up @@ -709,10 +709,10 @@ void SA2_LABEL(sub_8082788)(void)
#endif
}
#endif
SA2_LABEL(sub_80078D4)(3, i * 40, (i + 1) * 40, 0, DISPLAY_HEIGHT - i * 40);
SA2_LABEL(SetWindowRegion)(3, i * 40, (i + 1) * 40, 0, DISPLAY_HEIGHT - i * 40);
} else {
union MultiSioData *send_recv;
SA2_LABEL(sub_80078D4)
SA2_LABEL(SetWindowRegion)
(3, gMultiplayerRanks[i] * 40, (gMultiplayerRanks[i] + 1) * 40, 0, i * 40 - gMultiplayerRanks[i] * 40);
#if (GAME == GAME_SA1)
send_recv = &gMultiSioRecv[i];
Expand Down
Loading