Skip to content

Update title_screen.c #257

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 3 commits into from
Closed

Update title_screen.c #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2393863
Update title_screen.c
JJODY4 Apr 27, 2026
cd5ab5f
Update title_screen.c
JJODY4 Apr 27, 2026
010f2fa
Update items.h
JJODY4 Apr 27, 2026
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
16 changes: 3 additions & 13 deletions include/constants/sa1/items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
#ifndef GUARD_CONSTANTS_ITEMS_H
#define GUARD_CONSTANTS_ITEMS_H

#if (GAME == GAME_SA1)
#define ITEM__ONE_UP 0
#define ITEM__SHIELD 1
Expand All @@ -13,15 +10,7 @@
#define ITEM__MP_8 8
#define ITEM__MP_9 9
#define ITEM__MP_10 10

#if (GAME == GAME_SA1)
#define ITEM__COUNT 11
#else
#define ITEM__MP_11 11
#define ITEM__MP_12 12

#define ITEM__COUNT 13
#endif
#define ITEM__COUNT 11
#elif (GAME == GAME_SA2)
#define ITEM__ONE_UP 0
#define ITEM__SHIELD 1
Expand All @@ -37,6 +26,7 @@
#define ITEM__MP_ATTACK 11
#define ITEM__MP_ATTACK_2 12
#define ITEM__MP_RANDOM 13
#endif
#define ITEM__COUNT 13
//#endif

#endif // GUARD_CONSTANTS_ITEMS_H
16 changes: 8 additions & 8 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 @@ -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(Bg2_SetWindowRegionExtended)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], (gBgScrollRegs[2][1] + 160) - logo->unk0);
SA2_LABEL(Bg2_SetWindowRegion)(2U, (160 - logo->unk0), 160, (u16)gBgScrollRegs[2][0], gBgScrollRegs[2][1]);

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

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(Bg2_SetWindowRegion)(2U, 0U, (160 - logo->unk0), gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(Bg2_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(Bg2_SetWindowRegion)(2, 0, 40, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
SA2_LABEL(Bg2_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(Bg2_SetWindowRegion)(2U, (64 - logo->unk0), 120, gBgScrollRegs[2][0], gBgScrollRegs[2][1]);
}
#endif
} else {
Expand Down
Loading