Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 16 deletions include/constants/sa1/items.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@
#if (GAME == GAME_SA1)
#define ITEM__ONE_UP 0
#define ITEM__SHIELD 1
#define ITEM__SHIELD_MAGNETIC 2
#define ITEM__INVINCIBILITY 3
#define ITEM__SPEED_UP 4
#define ITEM__RINGS_RANDOM 5
#define ITEM__RINGS_5 6
#define ITEM__RINGS_10 7
#define ITEM__MP_8 8
#define ITEM__MP_9 9
#define ITEM__MP_10 10
Expand All @@ -25,18 +19,8 @@
#elif (GAME == GAME_SA2)
#define ITEM__ONE_UP 0
#define ITEM__SHIELD 1
#define ITEM__SHIELD_MAGNETIC 2
#define ITEM__INVINCIBILITY 3
#define ITEM__SPEED_UP 4
#define ITEM__RINGS_RANDOM 5
#define ITEM__RINGS_5 6
#define ITEM__RINGS_10 7
#define ITEM__MP_SWAP 8
#define ITEM__MP_CONFUSION 9
#define ITEM__MP_SLOWDOWN 10
#define ITEM__MP_ATTACK 11
#define ITEM__MP_ATTACK_2 12
#define ITEM__MP_RANDOM 13
#endif

#endif // GUARD_CONSTANTS_ITEMS_H
16 changes: 8 additions & 8 deletions src/game/sa1/menus/title_screen.c
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