diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-24 03:03:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-24 03:03:45 -0500 |
| commit | 39556605cd27a567a45bfc2c46af745ac031ab90 (patch) | |
| tree | c2ff7645625d62e94b369080ba37071eb98426d1 /src/credits.c | |
| parent | ef1f9ead0ba44c67185dccc616846646d7ce9257 (diff) | |
| parent | 85e5c57e8c86cca00e8bfc7d54e21d08c9e62e69 (diff) | |
Merge branch 'master' into doc-ttower
Diffstat (limited to 'src/credits.c')
| -rw-r--r-- | src/credits.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/credits.c b/src/credits.c index a0138e57a..ceb2028f9 100644 --- a/src/credits.c +++ b/src/credits.c @@ -920,7 +920,7 @@ static s32 RollCredits(void) case CREDITSSCRCMD_MON: sCreditsMgr->mainseqno = CREDITSSCENE_MON_DESTROY_ASSETS; sCreditsMgr->whichMon = sCreditsScript[sCreditsMgr->scrcmdidx].param; - fade_screen(1, 0); + FadeScreen(1, 0); break; case CREDITSSCRCMD_THEENDGFX: sCreditsMgr->mainseqno = CREDITSSCENE_THEEND_DESTROY_ASSETS; @@ -1342,7 +1342,7 @@ static s32 RollCredits(void) "\tstrb r0, [r2, 0x9]\n" "\tmovs r0, 0x1\n" "\tmovs r1, 0\n" - "\tbl fade_screen\n" + "\tbl FadeScreen\n" "\tb _080F3E94\n" "\t.align 2, 0\n" "_080F3E50: .4byte sCreditsMgr\n" |