Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

src/diploma.c

@@ -73,7 +73,7 @@ void CB2_ShowDiploma(void)
     ResetPaletteFade();
     FreeAllSpritePalettes();
     LoadPalette(sDiplomaPalettes, BG_PLTT_ID(0), 2 * PLTT_SIZE_4BPP);
-    sDiplomaTilemapPtr = malloc(0x1000);
+    sDiplomaTilemapPtr = Alloc(0x1000);
     InitDiplomaBg();
     InitDiplomaWindow();
     ResetTempTileDataBuffers();