diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-17 08:11:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 08:11:32 -0800 |
| commit | 90c7299e519783fe1e22d9ec8d3351d08bda65f6 (patch) | |
| tree | b24d8bdcd6809c5465c6aa18f6d3109af2aad915 /src/diploma.c | |
| parent | 4f9aab81ffdfedc84dfeafb88b4248dc6c7c2068 (diff) | |
| parent | 46cf490edd4fd5971d3a3511516beb0910e33c32 (diff) | |
Merge pull request #193 from marijnvdwerf/clean/cleanup-1
Clean up various things
Diffstat (limited to 'src/diploma.c')
| -rw-r--r-- | src/diploma.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/src/diploma.c b/src/diploma.c index 8fabe3a2f..cab528bec 100644 --- a/src/diploma.c +++ b/src/diploma.c @@ -13,7 +13,6 @@ extern u8 gDiplomaTiles[]; extern u8 gDiplomaTilemap[]; extern u8 gDiplomaPalettes[]; -extern u8 gStringVar1[]; extern u8 gOtherText_NationalDex[]; extern u8 gOtherText_HoennDex[]; extern u8 gOtherText_DiplomaCertificationGameFreak[]; @@ -35,9 +34,9 @@ static void VBlankCB(void) void sub_8145D88(void) { u32 savedIme; - + SetVBlankCallback(NULL); - + REG_DISPCNT = 0; REG_BG3CNT = 0; REG_BG2CNT = 0; @@ -51,14 +50,14 @@ void sub_8145D88(void) REG_BG1VOFS = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; - + DmaFill16(3, 0, VRAM, VRAM_SIZE); DmaFill32(3, 0, OAM, OAM_SIZE); DmaFill16(3, 0, PLTT, PLTT_SIZE); - + LZ77UnCompVram(gDiplomaTiles, (void *)VRAM); LZ77UnCompVram(gDiplomaTilemap, (void *)(VRAM + 0x3000)); - + remove_some_task(); ResetTasks(); ResetSpriteData(); @@ -69,22 +68,22 @@ void sub_8145D88(void) InitMenuWindow(&gWindowConfig_81E6CE4); DisplayDiplomaText(); BeginNormalPaletteFade(-1, 0, 0x10, 0, 0); - + savedIme = REG_IME; REG_IME = 0; REG_IE |= INTR_FLAG_VBLANK; REG_IME = savedIme; REG_DISPSTAT |= DISPSTAT_VBLANK_INTR; - + SetVBlankCallback(VBlankCB); SetMainCallback2(MainCB2); - + REG_BLDCNT = 0; REG_BLDALPHA = 0; REG_BLDY = 0; REG_BG3CNT = 0x4603; REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_ON; - + CreateTask(Task_DiplomaFadeIn, 0); } |