dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: more fixes

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
asm/field_specials.s
+2 -2
View File
@@ -9,13 +9,13 @@
sub_80CA618: @ 80CA618 sub_80CA618: @ 80CA618
push {lr} push {lr}
bl sub_8112364 bl sub_8112364
ldr r0, _080CA62C @ =DiplomaInit ldr r0, _080CA62C @ =CB2_ShowDiploma
bl SetMainCallback2 bl SetMainCallback2
bl ScriptContext2_Enable bl ScriptContext2_Enable
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080CA62C: .4byte DiplomaInit _080CA62C: .4byte CB2_ShowDiploma
thumb_func_end sub_80CA618 thumb_func_end sub_80CA618
thumb_func_start sub_80CA630 thumb_func_start sub_80CA630
src/diploma.c
+3 -3
View File
@@ -56,14 +56,14 @@ static EWRAM_DATA struct Diploma *gDiploma = NULL;
extern const u32 gUnknown_84154E8[]; extern const u32 gUnknown_84154E8[];
static void CB2_DiplomaOam(void) static void VCBC_DiplomaOam(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
TransferPlttBuffer(); TransferPlttBuffer();
} }
void DiplomaInit(void) void CB2_ShowDiploma(void)
{ {
gDiploma = AllocZeroed(sizeof(*gDiploma)); gDiploma = AllocZeroed(sizeof(*gDiploma));
gDiploma->state = 0; gDiploma->state = 0;
@@ -122,7 +122,7 @@ static void Task_DiplomaInit(u8 taskId)
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
break; break;
case 8: case 8:
SetVBlankCallback(CB2_DiplomaOam); SetVBlankCallback(VCBC_DiplomaOam);
break; break;
default: default:
if (gPaletteFade.active) if (gPaletteFade.active)