Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix static variable names #3637

Merged
merged 1 commit into from
Dec 8, 2023
+16 −16
Merged

Fix static variable names #3637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions gflib/sprite.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ EWRAM_DATA static bool8 sShouldProcessSpriteCopyRequests = 0;
EWRAM_DATA static u8 sSpriteCopyRequestCount = 0;
EWRAM_DATA static struct SpriteCopyRequest sSpriteCopyRequests[MAX_SPRITES] = {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 static u8 sSpriteTileAllocBitmap[128] = {0};
EWRAM_DATA s16 gSpriteCoordOffsetX = 0;
Expand All @@ -292,7 +292,7 @@ EWRAM_DATA bool8 gAffineAnimsDisabled = FALSE;
void ResetSpriteData(void)
{
ResetOamRange(0, 128);
gOamDummyIndex = 0;
sOamDummyIndex = 0;
ResetAllSprites();
ClearSpriteCopyRequests();
ResetAffineAnimData();
Expand Down Expand Up @@ -405,9 +405,9 @@ void BuildOamBuffer(void)
break;
}

for (i = oamIndex; i < gOamDummyIndex; i++)
for (i = oamIndex; i < sOamDummyIndex; i++)
gMain.oamBuffer[i] = gDummyOamData;
gOamDummyIndex = oamIndex;
sOamDummyIndex = oamIndex;

for (i = 0; matrices != 0; i++, matrices >>= 1)
{
Expand Down
12 changes: 6 additions & 6 deletions src/battle_anim_new.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5680,13 +5680,13 @@ const struct SpriteTemplate gBlackHoleEclipseRedRingInwardsSpriteTemplate =
.affineAnims = gThinRingShrinkingAffineAnimTable,
.callback = AnimSpriteOnMonPos
};
static const union AffineAnimCmd gGrowingBackHoleTargetAffineCmds[] = {
static const union AffineAnimCmd sGrowingBackHoleTargetAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, -10, 0x88),
AFFINEANIMCMD_END,
};
static const union AffineAnimCmd *const gGrowingBlackHoleTargetAffineAnimTable[] = {
gGrowingBackHoleTargetAffineCmds,
sGrowingBackHoleTargetAffineCmds,
};
const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate =
{
Expand All @@ -5698,13 +5698,13 @@ const struct SpriteTemplate gBlackHoleEclipseHoleSpriteTemplate =
.affineAnims = gGrowingBlackHoleTargetAffineAnimTable,
.callback = AnimSpriteOnMonPos
};
static const union AffineAnimCmd gShrinkingBlackHoleAffineCmds[] = {
static const union AffineAnimCmd sShrinkingBlackHoleAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(-0x10, -0x10, 0xf6, 8),
AFFINEANIMCMD_END_ALT(1),
};
static const union AffineAnimCmd *const gShrinkingBlackHoleAffineAnimTable[] = {
gShrinkingBlackHoleAffineCmds,
sShrinkingBlackHoleAffineCmds,
};
const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate =
{
Expand All @@ -5716,13 +5716,13 @@ const struct SpriteTemplate gBlackHoleEclipseHoleShrinkSpriteTemplate =
.affineAnims = gShrinkingBlackHoleAffineAnimTable,
.callback = AnimSpriteOnMonPos
};
static const union AffineAnimCmd gGrowingBackHoleAffineCmds[] = {
static const union AffineAnimCmd sGrowingBackHoleAffineCmds[] = {
AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, -10, 0x48),
AFFINEANIMCMD_END,
};
static const union AffineAnimCmd *const gGrowingBlackHoleAffineAnimTable[] = {
gGrowingBackHoleAffineCmds,
sGrowingBackHoleAffineCmds,
};
const struct SpriteTemplate gBlackHoleEclipseHoleUserSpriteTemplate =
{
Expand Down
8 changes: 4 additions & 4 deletions src/scrcmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static EWRAM_DATA u16 sMovingNpcMapNum = 0;
static EWRAM_DATA u16 sFieldEffectScriptId = 0;

static u8 sBrailleWindowId;
static bool8 gIsScriptedWildDouble;
static bool8 sIsScriptedWildDouble;

extern const SpecialFunc gSpecials[];
extern const u8 *gStdScripts[];
Expand Down Expand Up @@ -1879,20 +1879,20 @@ bool8 ScrCmd_setwildbattle(struct ScriptContext *ctx)
if(species2 == SPECIES_NONE)
{
CreateScriptedWildMon(species, level, item);
gIsScriptedWildDouble = FALSE;
sIsScriptedWildDouble = FALSE;
}
else
{
CreateScriptedDoubleWildMon(species, level, item, species2, level2, item2);
gIsScriptedWildDouble = TRUE;
sIsScriptedWildDouble = TRUE;
}

return FALSE;
}

bool8 ScrCmd_dowildbattle(struct ScriptContext *ctx)
{
if (gIsScriptedWildDouble == FALSE)
if (sIsScriptedWildDouble == FALSE)
BattleSetup_StartScriptedWildBattle();
else
BattleSetup_StartScriptedDoubleWildBattle();
Expand Down
4 changes: 2 additions & 2 deletions src/start_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static const struct WindowTemplate sWindowTemplate_PyramidPeak = {
.baseBlock = 0x8
};

static const u8 gText_MenuDebug[] = _("DEBUG");
static const u8 sText_MenuDebug[] = _("DEBUG");

static const struct MenuAction sStartMenuItems[] =
{
Expand All @@ -199,7 +199,7 @@ static const struct MenuAction sStartMenuItems[] =
[MENU_ACTION_REST_FRONTIER] = {gText_MenuRest, {.u8_void = StartMenuSaveCallback}},
[MENU_ACTION_RETIRE_FRONTIER] = {gText_MenuRetire, {.u8_void = StartMenuBattlePyramidRetireCallback}},
[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[] =
Expand Down
Loading