summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_interface.c2
-rw-r--r--src/diploma.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 32bab8803..4cc39e8aa 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = {
{NELEMS(gUnknown_82603E4), gUnknown_82603E4}
};
-static const u16 gBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp");
+static const u16 sBattleInterface_Unused[] = INCBIN_U16("graphics/battle_interface/unused.4bpp");
static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = {
{gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052},
diff --git a/src/diploma.c b/src/diploma.c
index a8ca579ba..4f765437f 100644
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -29,9 +29,9 @@ static void Task_WaitForExit(u8);
static void Task_DiplomaInit(u8);
static void Task_DiplomaReturnToOverworld(u8);
-static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz");
-static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz");
-static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal");
+static const u32 sDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz");
+static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz");
+static const u16 sDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal");
static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー");
static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
@@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId)
}
break;
case 3:
- CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0);
+ CopyToBgTilemapBuffer(1, sDiplomaTilemap, 0, 0);
break;
case 4:
if (HasAllMons())
@@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void)
ResetTempTileDataBuffers();
break;
case 1:
- DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0);
+ DecompressAndCopyTileDataToVram(1, sDiplomaGfx, 0, 0, 0);
break;
case 2:
if (!(FreeTempTileDataBuffersIfPossible() == 1))
@@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void)
}
return 0;
case 3:
- LoadPalette(gDiplomaPal, 0, 0x40);
+ LoadPalette(sDiplomaPal, 0, 0x40);
default:
return 1;
}