atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix static variable names (#3637)

Browse source
This commit is contained in:
Martin Griffin 2023-12-08 12:57:13 +00:00 committed by GitHub
commit 97cb4cdb24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gflib/sprite.c
View file

@ -281,7 +281,7 @@ EWRAM_DATA static bool8 sShouldProcessSpriteCopyRequests = 0;
EWRAM_DATA static u8 sSpriteCopyRequestCount = 0; EWRAM_DATA static u8 sSpriteCopyRequestCount = 0;
EWRAM_DATA static struct SpriteCopyRequest sSpriteCopyRequests[MAX_SPRITES] = {0}; EWRAM_DATA static struct SpriteCopyRequest sSpriteCopyRequests[MAX_SPRITES] = {0};
EWRAM_DATA u8 gOamLimit = 0; EWRAM_DATA u8 gOamLimit = 0;
static EWRAM_DATA u8 gOamDummyIndex = 0; static EWRAM_DATA u8 sOamDummyIndex = 0;
EWRAM_DATA u16 gReservedSpriteTileCount = 0; EWRAM_DATA u16 gReservedSpriteTileCount = 0;
EWRAM_DATA static u8 sSpriteTileAllocBitmap[128] = {0}; EWRAM_DATA static u8 sSpriteTileAllocBitmap[128] = {0};
EWRAM_DATA s16 gSpriteCoordOffsetX = 0; EWRAM_DATA s16 gSpriteCoordOffsetX = 0;
@ -292,7 +292,7 @@ EWRAM_DATA bool8 gAffineAnimsDisabled = FALSE;
void ResetSpriteData(void) void ResetSpriteData(void)
{ {
ResetOamRange(0, 128); ResetOamRange(0, 128);
gOamDummyIndex = 0; sOamDummyIndex = 0;
ResetAllSprites(); ResetAllSprites();
ClearSpriteCopyRequests(); ClearSpriteCopyRequests();
ResetAffineAnimData(); ResetAffineAnimData();
@ -405,9 +405,9 @@ void BuildOamBuffer(void)
break; break;
} }
for (i = oamIndex; i < gOamDummyIndex; i++) for (i = oamIndex; i < sOamDummyIndex; i++)
gMain.oamBuffer[i] = gDummyOamData; gMain.oamBuffer[i] = gDummyOamData;
gOamDummyIndex = oamIndex; sOamDummyIndex = oamIndex;
for (i = 0; matrices != 0; i++, matrices >>= 1) for (i = 0; matrices != 0; i++, matrices >>= 1)
{ {

12
src/battle_anim_new.c
View file

@ -5680,13 +5680,13 @@ const struct SpriteTemplate gBlackHoleEclipseRedRingInwardsSpriteTemplate =
.affineAnims = gThinRingShrinkingAffineAnimTable, .affineAnims = gThinRingShrinkingAffineAnimTable,
.callback = AnimSpriteOnMonPos .callback = AnimSpriteOnMonPos
}; };
static const union AffineAnimCmd gGrowingBackHoleTargetAffineCmds[] = { static const union AffineAnimCmd sGrowingBackHoleTargetAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, -10, 0x88), AFFINEANIMCMD_FRAME(0, 0, -10, 0x88),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gGrowingBlackHoleTargetAffineAnimTable[] = { static const union AffineAnimCmd *const gGrowingBlackHoleTargetAffineAnimTable[] = {
gGrowingBackHoleTargetAffineCmds, sGrowingBackHoleTargetAffineCmds,
}; };
const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate = const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate =
{ {
@ -5698,13 +5698,13 @@ const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate =
.affineAnims = gGrowingBlackHoleTargetAffineAnimTable, .affineAnims = gGrowingBlackHoleTargetAffineAnimTable,
.callback = AnimSpriteOnMonPos .callback = AnimSpriteOnMonPos
}; };
static const union AffineAnimCmd gShrinkingBlackHoleAffineCmds[] = { static const union AffineAnimCmd sShrinkingBlackHoleAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(-0x10, -0x10, 0xf6, 8), AFFINEANIMCMD_FRAME(-0x10, -0x10, 0xf6, 8),
AFFINEANIMCMD_END_ALT(1), AFFINEANIMCMD_END_ALT(1),
}; };
static const union AffineAnimCmd *const gShrinkingBlackHoleAffineAnimTable[] = { static const union AffineAnimCmd *const gShrinkingBlackHoleAffineAnimTable[] = {
gShrinkingBlackHoleAffineCmds, sShrinkingBlackHoleAffineCmds,
}; };
const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate = const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate =
{ {
@ -5716,13 +5716,13 @@ const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate =
.affineAnims = gShrinkingBlackHoleAffineAnimTable, .affineAnims = gShrinkingBlackHoleAffineAnimTable,
.callback = AnimSpriteOnMonPos .callback = AnimSpriteOnMonPos
}; };
static const union AffineAnimCmd gGrowingBackHoleAffineCmds[] = { static const union AffineAnimCmd sGrowingBackHoleAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0), AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, -10, 0x48), AFFINEANIMCMD_FRAME(0, 0, -10, 0x48),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd *const gGrowingBlackHoleAffineAnimTable[] = { static const union AffineAnimCmd *const gGrowingBlackHoleAffineAnimTable[] = {
gGrowingBackHoleAffineCmds, sGrowingBackHoleAffineCmds,
}; };
const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate = const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate =
{ {

8
src/scrcmd.c
View file

@ -62,7 +62,7 @@ static EWRAM_DATA u16 sMovingNpcMapNum = 0;
static EWRAM_DATA u16 sFieldEffectScriptId = 0; static EWRAM_DATA u16 sFieldEffectScriptId = 0;
static u8 sBrailleWindowId; static u8 sBrailleWindowId;
static bool8 gIsScriptedWildDouble; static bool8 sIsScriptedWildDouble;
extern const SpecialFunc gSpecials[]; extern const SpecialFunc gSpecials[];
extern const u8 *gStdScripts[]; extern const u8 *gStdScripts[];
@ -1879,12 +1879,12 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
if(species2 == SPECIES_NONE) if(species2 == SPECIES_NONE)
{ {
CreateScriptedWildMon(species, level, item); CreateScriptedWildMon(species, level, item);
gIsScriptedWildDouble = FALSE; sIsScriptedWildDouble = FALSE;
} }
else else
{ {
CreateScriptedDoubleWildMon(species, level, item, species2, level2, item2); CreateScriptedDoubleWildMon(species, level, item, species2, level2, item2);
gIsScriptedWildDouble = TRUE; sIsScriptedWildDouble = TRUE;
} }
return FALSE; return FALSE;
@ -1892,7 +1892,7 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx) bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{ {
if (gIsScriptedWildDouble == FALSE) if (sIsScriptedWildDouble == FALSE)
BattleSetup_StartScriptedWildBattle(); BattleSetup_StartScriptedWildBattle();
else else
BattleSetup_StartScriptedDoubleWildBattle(); BattleSetup_StartScriptedDoubleWildBattle();

4
src/start_menu.c
View file

@ -182,7 +182,7 @@ static const struct WindowTemplate sWindowTemplate_PyramidPeak = {
.baseBlock = 0x8 .baseBlock = 0x8
}; };
static const u8 gText_MenuDebug[] = _("DEBUG"); static const u8 sText_MenuDebug[] = _("DEBUG");
static const struct MenuAction sStartMenuItems[] = static const struct MenuAction sStartMenuItems[] =
{ {
@ -199,7 +199,7 @@ static const struct MenuAction sStartMenuItems[] =
[MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}}, [MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
[MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}}, [MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
[MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}}, [MENU_ACTION_PYRAMID_BAG] = {gText_MenuBag, {.u8_void = StartMenuBattlePyramidBagCallback}},
[MENU_ACTION_DEBUG] = {gText_MenuDebug, {.u8_void = StartMenuDebugCallback}}, [MENU_ACTION_DEBUG] = {sText_MenuDebug, {.u8_void = StartMenuDebugCallback}},
}; };
static const struct BgTemplate sBgTemplates_LinkBattleSave[] = static const struct BgTemplate sBgTemplates_LinkBattleSave[] =