make sure struct names match up

red031000 · Jul 12, 2023 · a5fc094 · a5fc094
1 parent ec77aff
commit a5fc094
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/include/credits/data.h b/include/credits/data.h
@@ -172,7 +172,7 @@ static const BgTemplate ov76_021E6F34 = {
     .mosaic     = FALSE,
 };
 
-static const GraphicsBanks sCreditsGXBanksConfig = {
+static const GraphicsBanks sCreditsGraphicsBanks = {
     .bg            = GX_VRAM_BG_128_B,
     .bgextpltt     = GX_VRAM_BGEXTPLTT_NONE,
     .subbg         = GX_VRAM_SUB_BG_128_C,

diff --git a/include/gx_layers.h b/include/gx_layers.h
@@ -33,7 +33,7 @@ enum GFBgLayer {
     GF_BG_LYR_UNALLOC = 0xFF,
 };
 
-typedef struct GXBanksConfig {
+typedef struct GraphicsBanks {
     GXVRamBG bg;
     GXVRamBGExtPltt bgextpltt;
     GXVRamSubBG subbg;

diff --git a/src/choose_starter_app.c b/src/choose_starter_app.c
@@ -589,7 +589,7 @@ static void vBlankCB(struct ChooseStarterAppWork *work) {
 }
 
 static void setGxBanks(void) {
-    const struct GXBanksConfig cfg = {
+    const struct GraphicsBanks cfg = {
         GX_VRAM_BG_80_EF,
         GX_VRAM_BGEXTPLTT_NONE,
         GX_VRAM_SUB_BG_128_C,

diff --git a/src/credits/credits.c b/src/credits/credits.c
@@ -391,7 +391,7 @@ static void VBlankCB(CreditsAppWork *work) {
 }
 
 static void SetGXBanks(void) {
-    GraphicsBanks banks = sCreditsGXBanksConfig;
+    GraphicsBanks banks = sCreditsGraphicsBanks;
     GX_SetBanks(&banks);
 }
 

diff --git a/src/field_black_out.c b/src/field_black_out.c
@@ -34,7 +34,7 @@ void _PrintMessage(struct BlackoutScreenWork *work, int msgno, u8 x, u8 y);
 
 static void _InitDisplays(BgConfig *bgConfig) {
     {
-        static const struct GXBanksConfig _020FC550 = {
+        static const struct GraphicsBanks _020FC550 = {
             GX_VRAM_BG_128_B,
             GX_VRAM_BGEXTPLTT_NONE,
             GX_VRAM_SUB_BG_128_C,

diff --git a/src/voltorb_flip/voltorb_flip.c b/src/voltorb_flip/voltorb_flip.c
@@ -133,7 +133,7 @@ static void ov122_021E8068(void);
 static void ov122_021E8094(OVY_MANAGER *);
 static void FreeOverlayData(OVY_MANAGER *);
 
-extern const GraphicsBanks sVoltorbFlipGXBanksConfig;
+extern const GraphicsBanks sVoltorbFlipGraphicsBanks;
 extern const MsgNoList sMenuMsgNos[];
 extern const Ov122_021E9278 ov122_021E9278;
 extern const u16 ov122_021E92A0[8];
@@ -1987,7 +1987,7 @@ static void ov122_021E8004(VoltorbFlipAppWork *work) {
 }
 
 static void SetGXBanks(void) {
-    GraphicsBanks banks = sVoltorbFlipGXBanksConfig;
+    GraphicsBanks banks = sVoltorbFlipGraphicsBanks;
     GX_SetBanks(&banks);
 }
 

diff --git a/src/voltorb_flip/voltorb_flip_data2.c b/src/voltorb_flip/voltorb_flip_data2.c
@@ -39,7 +39,7 @@ const Unk122_021E92E4 ov122_021E92E4 = { 2, 2, 2, 2, 0, 0 };
 
 const Unk122_021E92FC ov122_021E92FC = { 0, 0x7e, 0, 0x20, 1, 0x7e, 0, 0x20 };
 
-const GraphicsBanks sVoltorbFlipGXBanksConfig = {
+const GraphicsBanks sVoltorbFlipGraphicsBanks = {
     GX_VRAM_BG_128_B,
     GX_VRAM_BGEXTPLTT_NONE,
     GX_VRAM_SUB_BG_128_C,