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

fix: diploma.c static

Browse Source
This commit is contained in:
dheu
2019-07-08 18:20:14 +08:00
parent 02001f7197
commit 1a0186c3f6
1 changed files with 94 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/diploma.c
+20 -20
View File
@@ -1,3 +1,4 @@
#include "constants/fanfares.h"
#include "gba/macro.h" #include "gba/macro.h"
#include "global.h" #include "global.h"
#include "gpu_regs.h" #include "gpu_regs.h"
@@ -20,16 +21,16 @@
void sub_80568FC(void); void sub_80568FC(void);
u16 sub_8088F84(void); u16 sub_8088F84(void);
void DiplomaBgInit(void); static void DiplomaBgInit(void);
void DiplomaPrintText(void); static void DiplomaPrintText(void);
u8 DiplomaLoadGfx(void); static u8 DiplomaLoadGfx(void);
void DiplomaVblankHandler(void); static void DiplomaVblankHandler(void);
void CB2_DiplomaInit(void); static void CB2_DiplomaInit(void);
void Task_WaitForExit(u8); static void Task_WaitForExit(u8);
void Task_DiplomaInit(u8); static void Task_DiplomaInit(u8);
void Task_DiplomaReturnToOverworld(u8); static void Task_DiplomaReturnToOverworld(u8);
extern const struct BgTemplate gUnknown_8415A08[2]; extern const struct BgTemplate gUnknown_8415A08[2];
extern const struct WindowTemplate gUnknown_8415A10[]; extern const struct WindowTemplate gUnknown_8415A10[];
@@ -48,14 +49,13 @@ struct Diploma
u8 state; u8 state;
u8 gfxStep; u8 gfxStep;
u8 callbackStep; u8 callbackStep;
u8 padding; u16 tilemapBuffer[0x800];
u8 tilemapBuffer[0x1000];
} }
*gDiploma = NULL; *gDiploma = NULL;
extern const u32 gUnknown_84154E8[]; extern const u32 gUnknown_84154E8[];
void CB2_DiplomaOam(void) static void CB2_DiplomaOam(void)
{ {
LoadOam(); LoadOam();
ProcessSpriteCopyRequests(); ProcessSpriteCopyRequests();
@@ -73,7 +73,7 @@ void DiplomaInit(void)
SetMainCallback2(CB2_DiplomaInit); SetMainCallback2(CB2_DiplomaInit);
} }
void CB2_DiplomaInit(void) static void CB2_DiplomaInit(void)
{ {
RunTasks(); RunTasks();
AnimateSprites(); AnimateSprites();
@@ -81,7 +81,7 @@ void CB2_DiplomaInit(void)
UpdatePaletteFade(); UpdatePaletteFade();
} }
void Task_DiplomaInit(u8 taskId) static void Task_DiplomaInit(u8 taskId)
{ {
switch (gDiploma->callbackStep) switch (gDiploma->callbackStep)
{ {
@@ -128,13 +128,13 @@ void Task_DiplomaInit(u8 taskId)
{ {
break; break;
} }
PlayFanfareByFanfareNum(5); PlayFanfareByFanfareNum(FANFARE_05);
gTasks[taskId].func = Task_WaitForExit; gTasks[taskId].func = Task_WaitForExit;
} }
gDiploma->callbackStep++; gDiploma->callbackStep++;
} }
void Task_WaitForExit(u8 taskId) static void Task_WaitForExit(u8 taskId)
{ {
switch (gDiploma->state) switch (gDiploma->state)
{ {
@@ -157,7 +157,7 @@ void Task_WaitForExit(u8 taskId)
} }
} }
void Task_DiplomaReturnToOverworld(u8 taskId) static void Task_DiplomaReturnToOverworld(u8 taskId)
{ {
if (gPaletteFade.active) if (gPaletteFade.active)
return; return;
@@ -167,7 +167,7 @@ void Task_DiplomaReturnToOverworld(u8 taskId)
SetMainCallback2(sub_80568FC); SetMainCallback2(sub_80568FC);
} }
void DiplomaBgInit(void) static void DiplomaBgInit(void)
{ {
ResetSpriteData(); ResetSpriteData();
ResetPaletteFade(); ResetPaletteFade();
@@ -176,7 +176,7 @@ void DiplomaBgInit(void)
ScanlineEffect_Stop(); ScanlineEffect_Stop();
} }
void DiplomaVblankHandler(void) static void DiplomaVblankHandler(void)
{ {
void *vram = (void *)VRAM; void *vram = (void *)VRAM;
DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000); DmaClearLarge16(3, vram, VRAM_SIZE, 0x1000);
@@ -203,7 +203,7 @@ void DiplomaVblankHandler(void)
FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 30, 20); FillBgTilemapBufferRect_Palette0(1, 0, 0, 0, 30, 20);
} }
u8 DiplomaLoadGfx(void) static u8 DiplomaLoadGfx(void)
{ {
switch (gDiploma->gfxStep) switch (gDiploma->gfxStep)
{ {
@@ -228,7 +228,7 @@ u8 DiplomaLoadGfx(void)
return 0; return 0;
} }
void DiplomaPrintText(void) static void DiplomaPrintText(void)
{ {
u8 arr[160]; u8 arr[160];
uintptr_t len; uintptr_t len;