diff options
| author | dheu <gwimminus@gmail.com> | 2019-07-08 19:02:28 +0800 |
|---|---|---|
| committer | dheu <gwimminus@gmail.com> | 2019-07-08 19:02:28 +0800 |
| commit | 23a05eb6ac4118cb928d095a4f0c649d5f0bd3b0 (patch) | |
| tree | a9cb69434cc1b5257a2d373c3ea7d57991f85988 | |
| parent | cc77a3ecbf453ed38ec2fcddae0ad506182b10d9 (diff) | |
fix: more fixes
| -rw-r--r-- | asm/field_specials.s | 4 | ||||
| -rw-r--r-- | src/diploma.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/asm/field_specials.s b/asm/field_specials.s index 4e4d50c7b..b4980a87a 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -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 diff --git a/src/diploma.c b/src/diploma.c index 60a6d2fba..1c3755526 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -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) |