1 files changed, 29 insertions, 30 deletions

diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 1c40e146f..de962ccd6 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "alloc.h"
+#include "malloc.h"
 #include "decompress.h"
 #include "bg.h"
 #include "palette.h"
@@ -220,32 +220,31 @@ static const struct WindowTemplate gUnknown_086202CC =
 
 static const u8 *const gUnknown_086202D4[] =
 {
-    gUnknown_085EBCC5,
-    gUnknown_085EBCE8,
-    gUnknown_085EBD01,
-    gUnknown_085EBD1C,
-    gUnknown_085EBD34,
-    gUnknown_085EBD83,
-    gUnknown_085EBDA2,
-    gUnknown_085EBDBF,
-    gUnknown_085EBDDB,
-    gUnknown_085EBDEE,
-    gUnknown_085EBE06,
-    gUnknown_085EBE19,
-    gUnknown_085EBE2D,
-    gUnknown_085EBE41
+    gText_CheckMapOfHoenn,
+    gText_CheckPokemonInDetail,
+    gText_CallRegisteredTrainer,
+    gText_CheckObtainedRibbons,
+    gText_PutAwayPokenav,
+    gText_CheckPartyPokemonInDetail,
+    gText_CheckAllPokemonInDetail,
+    gText_ReturnToPokenavMenu,
+    gText_FindCoolPokemon,
+    gText_FindBeautifulPokemon,
+    gText_FindCutePokemon,
+    gText_FindSmartPokemon,
+    gText_FindToughPokemon,
+    gText_ReturnToConditionMenu
 };
 
-static const u8 gUnknown_0862030C[] = {6, 8, 7};
-
-static const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0};
+static const u8 sOptionDescTextColors[] = {TEXT_COLOR_GREEN, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_GREEN};
+static const u8 sOptionDescTextColors2[] = {TEXT_COLOR_GREEN, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_GREEN};
 
 static const struct OamData gUnknown_08620314 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .size = SPRITE_SIZE(32x16),
@@ -287,9 +286,9 @@ static const struct SpriteTemplate gUnknown_0862034C =
 static const struct OamData gUnknown_08620364 =
 {
     .y = 0,
-    .affineMode = 0,
-    .objMode = 0,
-    .bpp = 0,
+    .affineMode = ST_OAM_AFFINE_OFF,
+    .objMode = ST_OAM_OBJ_NORMAL,
+    .bpp = ST_OAM_4BPP,
     .shape = SPRITE_SHAPE(32x16),
     .x = 0,
     .size = SPRITE_SIZE(32x16),
@@ -324,7 +323,7 @@ static bool32 sub_81C98D4(void)
     for (i = 0; i < REMATCH_TABLE_ENTRIES; i++)
     {
         if (sub_81CB0C8(i) == gMapHeader.regionMapSectionId
-            && sub_81CAE08(i)
+            && IsRematchEntryRegistered(i)
             && gSaveBlock1Ptr->trainerRematches[i])
             return TRUE;
     }
@@ -707,10 +706,10 @@ static u32 sub_81C9F28(s32 state)
     switch (state)
     {
     case 0:
-        sub_81C7BA4(sub_81C98C4());
+        PrintHelpBarText(GetHelpBarTextId());
         return LT_INC_AND_PAUSE;
     case 1:
-        if (IsDma3ManagerBusyWithBgCopy_())
+        if (WaitForHelpBar())
             return LT_PAUSE;
         sub_81C7880();
         sub_81CA9C8();
@@ -1030,7 +1029,7 @@ static void sub_81CA4AC(struct Sprite * sprite)
             {
                 sprite->invisible = TRUE;
                 FreeOamMatrix(sprite->oam.matrixNum);
-                CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0);
+                CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, ST_OAM_AFFINE_OFF);
                 sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
                 sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
                 sprite->callback = SpriteCallbackDummy;
@@ -1130,7 +1129,7 @@ static void sub_81CA714(void)
     const u8 * s = gUnknown_086202D4[i];
     u32 width = GetStringWidth(1, s, -1);
     FillWindowPixelBuffer(ptr->optionDescriptionWindowId, PIXEL_FILL(6));
-    AddTextPrinterParameterized3(ptr->optionDescriptionWindowId, 1, (192 - width) / 2, 1, gUnknown_0862030C, 0, s);
+    AddTextPrinterParameterized3(ptr->optionDescriptionWindowId, 1, (192 - width) / 2, 1, sOptionDescTextColors, 0, s);
 }
 
 
@@ -1140,7 +1139,7 @@ static void sub_81CA770(void)
     const u8 * s = gText_NoRibbonWinners;
     u32 width = GetStringWidth(1, s, -1);
     FillWindowPixelBuffer(ptr->optionDescriptionWindowId, PIXEL_FILL(6));
-    AddTextPrinterParameterized3(ptr->optionDescriptionWindowId, 1, (192 - width) / 2, 1, gUnknown_0862030F, 0, s);
+    AddTextPrinterParameterized3(ptr->optionDescriptionWindowId, 1, (192 - width) / 2, 1, sOptionDescTextColors2, 0, s);
 }
 
 static bool32 sub_81CA7C4(void)