From 677da7b5e7540b49850a52340ea20ad079d1f1cd Mon Sep 17 00:00:00 2001
From: LOuroboros <lunosouroboros@gmail.com>
Date: Tue, 28 Dec 2021 14:48:57 -0300
Subject: [PATCH] Fixed struct names
---
include/reset_rtc_screen.h | 4 ++--
src/pokemon_debug.c | 28 ++++++++++++++--------------
src/reset_rtc_screen.c | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/include/reset_rtc_screen.h b/include/reset_rtc_screen.h
index f8904063b..589616400 100644
--- a/include/reset_rtc_screen.h
+++ b/include/reset_rtc_screen.h
@@ -1,8 +1,8 @@
#ifndef GUARD_RESET_RTC_SCREEN_H
#define GUARD_RESET_RTC_SCREEN_H
-extern const struct SpritePalette sSpritePalette_Arrow;
-extern const struct SpriteTemplate sSpriteTemplate_Arrow;
+extern const struct SpritePalette gSpritePalette_Arrow;
+extern const struct SpriteTemplate gSpriteTemplate_Arrow;
void CB2_InitResetRtcScreen(void);
diff --git a/src/pokemon_debug.c b/src/pokemon_debug.c
index ef440611c..d43120e6a 100644
--- a/src/pokemon_debug.c
+++ b/src/pokemon_debug.c
@@ -570,9 +570,9 @@ static void SetArrowInvisibility(struct PokemonDebugMenu *data)
static void SetUpModifyArrows(struct PokemonDebugMenu *data)
{
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->modifyArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X, MODIFY_DIGITS_ARROW1_Y, 0);
- data->modifyArrows.arrowSpriteId[1] = CreateSprite(&sSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X, MODIFY_DIGITS_ARROW2_Y, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->modifyArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X, MODIFY_DIGITS_ARROW1_Y, 0);
+ data->modifyArrows.arrowSpriteId[1] = CreateSprite(&gSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X, MODIFY_DIGITS_ARROW2_Y, 0);
gSprites[data->modifyArrows.arrowSpriteId[1]].animNum = 1;
data->modifyArrows.minValue = 1;
@@ -588,8 +588,8 @@ static void SetUpModifyArrows(struct PokemonDebugMenu *data)
static void SetUpOptionArrows(struct PokemonDebugMenu *data)
{
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->optionArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->optionArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y, 0);
gSprites[data->optionArrows.arrowSpriteId[0]].animNum = 2;
data->optionArrows.currentDigit = 0;
@@ -599,8 +599,8 @@ static void SetUpOptionArrows(struct PokemonDebugMenu *data)
static void SetUpYPosModifyArrows(struct PokemonDebugMenu *data)
{
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->yPosModifyArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->yPosModifyArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y, 0);
gSprites[data->yPosModifyArrows.arrowSpriteId[0]].animNum = 2;
data->yPosModifyArrows.currentDigit = 0;
@@ -1705,19 +1705,19 @@ static void ReloadPokemonSprites(struct PokemonDebugMenu *data)
gSprites[data->iconspriteId].oam.priority = 0;
//Modify Arrows
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->modifyArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X + (data->modifyArrows.currentDigit * 6), MODIFY_DIGITS_ARROW1_Y, 0);
- data->modifyArrows.arrowSpriteId[1] = CreateSprite(&sSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X + (data->modifyArrows.currentDigit * 6), MODIFY_DIGITS_ARROW2_Y, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->modifyArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X + (data->modifyArrows.currentDigit * 6), MODIFY_DIGITS_ARROW1_Y, 0);
+ data->modifyArrows.arrowSpriteId[1] = CreateSprite(&gSpriteTemplate_Arrow, MODIFY_DIGITS_ARROW_X + (data->modifyArrows.currentDigit * 6), MODIFY_DIGITS_ARROW2_Y, 0);
gSprites[data->modifyArrows.arrowSpriteId[1]].animNum = 1;
//Option Arrow
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->optionArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y + data->optionArrows.currentDigit * 12, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->optionArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y + data->optionArrows.currentDigit * 12, 0);
gSprites[data->optionArrows.arrowSpriteId[0]].animNum = 2;
//Y Pos Modify Arrow
- LoadSpritePalette(&sSpritePalette_Arrow);
- data->yPosModifyArrows.arrowSpriteId[0] = CreateSprite(&sSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y + data->yPosModifyArrows.currentDigit * 12, 0);
+ LoadSpritePalette(&gSpritePalette_Arrow);
+ data->yPosModifyArrows.arrowSpriteId[0] = CreateSprite(&gSpriteTemplate_Arrow, OPTIONS_ARROW_1_X, OPTIONS_ARROW_Y + data->yPosModifyArrows.currentDigit * 12, 0);
gSprites[data->yPosModifyArrows.arrowSpriteId[0]].animNum = 2;
//Arrow invisibility
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index 34c388969..e817fdd14 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -181,7 +181,7 @@ static const struct SpriteFrameImage sPicTable_Arrow[] =
obj_frame_tiles(sArrowRight_Gfx)
};
-const struct SpritePalette sSpritePalette_Arrow =
+const struct SpritePalette gSpritePalette_Arrow =
{
sArrow_Pal, PALTAG_ARROW
};
@@ -217,7 +217,7 @@ static const union AnimCmd *const sAnims_Arrow[] =
[ARROW_RIGHT] = sAnim_Arrow_Right,
};
-const struct SpriteTemplate sSpriteTemplate_Arrow =
+const struct SpriteTemplate gSpriteTemplate_Arrow =
{
.tileTag = TAG_NONE,
.paletteTag = PALTAG_ARROW,
@@ -333,14 +333,14 @@ static void CreateCursor(u8 taskId)
{
u32 spriteId;
- LoadSpritePalette(&sSpritePalette_Arrow);
+ LoadSpritePalette(&gSpritePalette_Arrow);
- spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 53, 68, 0);
+ spriteId = CreateSpriteAtEnd(&gSpriteTemplate_Arrow, 53, 68, 0);
gSprites[spriteId].callback = SpriteCB_Cursor_UpOrRight;
gSprites[spriteId].sTaskId = taskId;
gSprites[spriteId].sState = -1;
- spriteId = CreateSpriteAtEnd(&sSpriteTemplate_Arrow, 53, 68, 0);
+ spriteId = CreateSpriteAtEnd(&gSpriteTemplate_Arrow, 53, 68, 0);
gSprites[spriteId].callback = SpriteCB_Cursor_Down;
gSprites[spriteId].sTaskId = taskId;
gSprites[spriteId].sState = -1;
@@ -348,7 +348,7 @@ static void CreateCursor(u8 taskId)
static void FreeCursorPalette(void)
{
- FreeSpritePaletteByTag(sSpritePalette_Arrow.tag);
+ FreeSpritePaletteByTag(gSpritePalette_Arrow.tag);
}
static void HideChooseTimeWindow(u8 windowId)