fix: more fixes

This commit is contained in:
dheu
2019-07-08 19:02:28 +08:00
parent cc77a3ecbf
commit 23a05eb6ac
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -9,13 +9,13 @@
sub_80CA618: @ 80CA618
push {lr}
bl sub_8112364
ldr r0, _080CA62C @ =DiplomaInit
ldr r0, _080CA62C @ =CB2_ShowDiploma
bl SetMainCallback2
bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
_080CA62C: .4byte DiplomaInit
_080CA62C: .4byte CB2_ShowDiploma
thumb_func_end sub_80CA618
thumb_func_start sub_80CA630
+3 -3
View File
@@ -56,14 +56,14 @@ static EWRAM_DATA struct Diploma *gDiploma = NULL;
extern const u32 gUnknown_84154E8[];
static void CB2_DiplomaOam(void)
static void VCBC_DiplomaOam(void)
{
LoadOam();
ProcessSpriteCopyRequests();
TransferPlttBuffer();
}
void DiplomaInit(void)
void CB2_ShowDiploma(void)
{
gDiploma = AllocZeroed(sizeof(*gDiploma));
gDiploma->state = 0;
@@ -122,7 +122,7 @@ static void Task_DiplomaInit(u8 taskId)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break;
case 8:
SetVBlankCallback(CB2_DiplomaOam);
SetVBlankCallback(VCBC_DiplomaOam);
break;
default:
if (gPaletteFade.active)