From b04f0aaa2beb4dad08f78716ce1865b797fc34bd Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Sat, 20 Feb 2021 00:30:37 -0500
Subject: Use SPRITE_NONE constant

---
 src/use_pokeblock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index b4ccbfe06..7298ac9f1 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -486,7 +486,7 @@ static void LoadUsePokeblockMenu(void)
     switch (sInfo->mainState)
     {
     case 0:
-        sMenu->curMonSpriteId = 0xFF;
+        sMenu->curMonSpriteId = SPRITE_NONE;
         InitConditionGraphData(&sMenu->graph);
         sInfo->mainState++;
         break;
@@ -853,7 +853,7 @@ static void CloseUsePokeblockMenu(void)
         for (i = 0; i < ARRAY_COUNT(sMenu->condition); i++)
             DestroySprite(sMenu->condition[i]);
 
-        if (sMenu->curMonSpriteId != 0xFF)
+        if (sMenu->curMonSpriteId != SPRITE_NONE)
             DestroySprite(&gSprites[sMenu->curMonSpriteId]);
 
         SetVBlankCallback(NULL);
@@ -1215,7 +1215,7 @@ static void UpdateMonPic(u8 loadId)
     struct SpriteSheet spriteSheet;
     struct SpritePalette spritePal;
 
-    if (sMenu->curMonSpriteId == 0xFF)
+    if (sMenu->curMonSpriteId == SPRITE_NONE)
     {
         LoadConditionMonPicTemplate(&spriteSheet, &spriteTemplate, &spritePal);
         spriteSheet.data = sMenu->partySheets[loadId];
@@ -1228,7 +1228,7 @@ static void UpdateMonPic(u8 loadId)
         {
             FreeSpriteTilesByTag(TAG_CONDITION_MON);
             FreeSpritePaletteByTag(TAG_CONDITION_MON);
-            sMenu->curMonSpriteId = 0xFF;
+            sMenu->curMonSpriteId = SPRITE_NONE;
         }
         else
         {
-- 
cgit v1.2.3


From b71b10623b31065a9a29b43938cf602087bcfc73 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Wed, 24 Feb 2021 11:01:02 -0500
Subject: Add palette selection constants

---
 src/use_pokeblock.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 7298ac9f1..5d8f5ce24 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -569,7 +569,7 @@ static void ShowUsePokeblockMenu(void)
     switch (sInfo->mainState)
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         SetVBlankCallback(VBlankCB_UsePokeblockMenu);
         ShowBg(0);
         ShowBg(1);
@@ -695,7 +695,7 @@ static void FeedPokeblockToMon(void)
         gPokeblockMonId = GetPartyIdFromSelectionId(sMenu->info.curSelection);
         sExitCallback = sInfo->exitCallback;
         sPokeblock = sInfo->pokeblock;
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
         sInfo->mainState++;
         break;
     case 1:
@@ -739,7 +739,7 @@ static void ShowUsePokeblockMenuForResults(void)
     case 2:
         break;
     case 3:
-        BlendPalettes(0xFFFFFFFF, 16, RGB_BLACK);
+        BlendPalettes(PALETTES_ALL, 16, RGB_BLACK);
         sInfo->mainState++;
         break;
     case 4:
@@ -751,7 +751,7 @@ static void ShowUsePokeblockMenuForResults(void)
         break;
     case 5:
         SetVBlankCallback(VBlankCB_UsePokeblockMenu);
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         sInfo->mainState++;
         break;
     case 6:
@@ -827,7 +827,7 @@ static void CloseUsePokeblockMenu(void)
     switch (sInfo->mainState)
     {
     case 0:
-        BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
         sInfo->mainState++;
         break;
     case 1:
-- 
cgit v1.2.3


From 62968895ca220cf5b6f7c066e9061cf45fe7913e Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 29 Mar 2021 09:38:19 -0400
Subject: Add MON_PIC_SIZE constant

---
 src/use_pokeblock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 5d8f5ce24..cfaec6f18 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -1241,7 +1241,7 @@ static void UpdateMonPic(u8 loadId)
     }
     else
     {
-        Dma3CopyLarge16_(sMenu->partySheets[loadId], sMenu->curMonTileStart, 0x800);
+        Dma3CopyLarge16_(sMenu->partySheets[loadId], sMenu->curMonTileStart, MON_PIC_SIZE);
         LoadPalette(sMenu->partyPalettes[loadId], sMenu->curMonPalette, 32);
     }
 }
-- 
cgit v1.2.3


From 042a2ecc417001be93bd363cbaff5415be65308c Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Mon, 12 Apr 2021 12:33:06 -0400
Subject: Document pokeblock feed scene

---
 src/use_pokeblock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/use_pokeblock.c')

diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index cfaec6f18..669b6ab25 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -708,7 +708,7 @@ static void FeedPokeblockToMon(void)
             FREE_AND_SET_NULL(sMenu);
             FreeAllWindowBuffers();
             gMain.savedCallback = CB2_ReturnAndChooseMonToGivePokeblock;
-            CB2_PreparePokeblockFeedScene();
+            PreparePokeblockFeedScene();
         }
         break;
     }
-- 
cgit v1.2.3