diff --git a/linker.ld b/linker.ld index 909af6fb..5aeb425a 100644 --- a/linker.ld +++ b/linker.ld @@ -889,7 +889,7 @@ SECTIONS { asm/code_080A3BD0.o(.text); src/sub_080A554C.o(.text); asm/code_080A5574.o(.text); - src/introSetTransition.o(.text); + src/intro.o(.text); asm/sub_080AD8F0.o(.text); asm/code_080AD90C.o(.text); /* library functions */ @@ -923,7 +923,7 @@ SECTIONS { data/data_081208A0.o(.rodata); src/object/heartContainer.o(.rodata); data/data_08121C58.o(.rodata); - src/introSetTransition.o(.rodata); + src/intro.o(.rodata); data/data_081320FC.o(.rodata); data/strings.o(.rodata); data/data_089FC6C4.o(.rodata); diff --git a/src/introSetTransition.c b/src/intro.c similarity index 98% rename from src/introSetTransition.c rename to src/intro.c index fa7ae48b..261becd8 100644 --- a/src/introSetTransition.c +++ b/src/intro.c @@ -57,7 +57,7 @@ static const u16 sLightRaysAlphaBlends[] = { BLDALPHA_BLEND(8, 10), }; -static u32 IntroSetTransition(u32 transition) +static u32 AdvanceIntroSequence(u32 transition) { gUnk_02032EC0.transitionType = transition; gUnk_03001000.funcIndex = 2; @@ -72,7 +72,7 @@ void HandleIntroScreen(void) case 0: sub_08056418(); _DmaZero(&gUnk_02032EC0, 0x3b4); - IntroSetTransition(0); + AdvanceIntroSequence(0); break; case 1: sIntroSequenceHandlers[gUnk_02032EC0.transitionType](); @@ -119,7 +119,7 @@ static void HandleNintendoCapcomLogos(void) if (advance == ADVANCE_KEY_PRESSED) { gUnk_02000010.listenForKeyPresses = 1; - IntroSetTransition(1); + AdvanceIntroSequence(1); } } @@ -202,7 +202,7 @@ static void HandleTitlescreen(void) else { advance = ADVANCE_NONE; } - IntroSetTransition(advance); + AdvanceIntroSequence(advance); PlaySFX(0x80080000); } UpdatePressStartIcon();