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

[Gfx] - Prefix s for static symbols

Browse Source
This commit is contained in:
hjk321
2021-04-12 16:26:46 -05:00
parent 47cc3aa0f1
commit f6e5d2a233
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_interface.c
+1 -1
View File
@@ -342,7 +342,7 @@ static const struct SubspriteTable gUnknown_8260404[] = {
{NELEMS(gUnknown_82603E4), gUnknown_82603E4} {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[] = { static const struct CompressedSpriteSheet sStatusSummaryBarSpriteSheets[] = {
{gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052}, {gFile_graphics_battle_interface_ball_status_bar_sheet, 0x0200, 55052},
src/diploma.c
+6 -6
View File
@@ -29,9 +29,9 @@ static void Task_WaitForExit(u8);
static void Task_DiplomaInit(u8); static void Task_DiplomaInit(u8);
static void Task_DiplomaReturnToOverworld(u8); static void Task_DiplomaReturnToOverworld(u8);
static const u32 gDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz"); static const u32 sDiplomaGfx[] = INCBIN_U32("graphics/diploma/diploma.4bpp.lz");
static const u32 gDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz"); static const u32 sDiplomaTilemap[] = INCBIN_U32("graphics/diploma/diploma.bin.lz");
static const u16 gDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal"); static const u16 sDiplomaPal[] = INCBIN_U16("graphics/diploma/diploma.gbapal");
static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー"); static const u8 gUnknown_8415994[] = _("{HIGHLIGHT TRANSPARENT}プレイヤー");
static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま"); static const u8 gUnknown_841599D[] = _("{HIGHLIGHT TRANSPARENT}さま");
@@ -118,7 +118,7 @@ static void Task_DiplomaInit(u8 taskId)
} }
break; break;
case 3: case 3:
CopyToBgTilemapBuffer(1, gDiplomaTilemap, 0, 0); CopyToBgTilemapBuffer(1, sDiplomaTilemap, 0, 0);
break; break;
case 4: case 4:
if (HasAllMons()) if (HasAllMons())
@@ -231,7 +231,7 @@ static u8 DiplomaLoadGfx(void)
ResetTempTileDataBuffers(); ResetTempTileDataBuffers();
break; break;
case 1: case 1:
DecompressAndCopyTileDataToVram(1, gDiplomaGfx, 0, 0, 0); DecompressAndCopyTileDataToVram(1, sDiplomaGfx, 0, 0, 0);
break; break;
case 2: case 2:
if (!(FreeTempTileDataBuffersIfPossible() == 1)) if (!(FreeTempTileDataBuffersIfPossible() == 1))
@@ -240,7 +240,7 @@ static u8 DiplomaLoadGfx(void)
} }
return 0; return 0;
case 3: case 3:
LoadPalette(gDiplomaPal, 0, 0x40); LoadPalette(sDiplomaPal, 0, 0x40);
default: default:
return 1; return 1;
} }