Merge pull request #1189 from aaaaaa123456789/reverts

Undo PokeCodec's PRs and port changes

1 files changed, 5 insertions, 4 deletions

diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index 806300539..009cf783f 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -438,7 +438,6 @@ static u32 LoopedTask_SlideMenuHeaderDown(s32 a0)
         ChangeBgY(0, 0, 0);
         return LT_FINISH;
     }
-
     return LT_PAUSE;
 }
 
@@ -459,9 +458,11 @@ void Pokenav_AllocAndLoadPalettes(const struct SpritePalette *palettes)
         {
             break;
         }
-
-        index = (index * 16) + 0x100;
-        CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
+        else
+        {
+            index = (index * 16) + 0x100;
+            CopyPaletteIntoBufferUnfaded(current->data, index, 0x20);
+        }
     }
 }