Battle message buffers; review comments

5 files changed, 25 insertions, 26 deletions

diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index bbdddf883..728b8e56e 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -57,9 +57,9 @@ struct HofGfx
     u8 tilemap2[0x1000];
 };
 
-EWRAM_DATA u32 sSelectedPaletteIndices = 0;
-EWRAM_DATA struct HallofFameTeam * sHofMonPtr = NULL;
-EWRAM_DATA struct HofGfx * sHofGfxPtr = NULL;
+static EWRAM_DATA u32 sSelectedPaletteIndices = 0;
+static EWRAM_DATA struct HallofFameTeam * sHofMonPtr = NULL;
+static EWRAM_DATA struct HofGfx * sHofGfxPtr = NULL;
 
 #define HALL_OF_FAME_MAX_TEAMS 50
 #define HALL_OF_FAME_BG_PAL    (RGB(22, 24, 29))
@@ -74,8 +74,8 @@ static void Task_Hof_PlayMonCryAndPrintInfo(u8 taskId);
 static void Task_Hof_TryDisplayAnotherMon(u8 taskId);
 static void Task_Hof_PaletteFadeAndPrintWelcomeText(u8 taskId);
 static void Task_Hof_ApplauseAndConfetti(u8 taskId);
-static void Hof_WaitBorderFadeAway(u8 taskId);
-static void Hof_SpawnPlayerPic(u8 taskId);
+static void Task_Hof_WaitBorderFadeAway(u8 taskId);
+static void Task_Hof_SpawnPlayerPic(u8 taskId);
 static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId);
 static void Task_Hof_ExitOnKeyPressed(u8 taskId);
 static void Task_Hof_HandlePaletteOnExit(u8 taskId);
@@ -541,8 +541,8 @@ static void Task_Hof_PlayMonCryAndPrintInfo(u8 taskId)
 
 static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
 {
-    u16 currPokeID = gTasks[taskId].data[1];
-    struct HallofFameMon* currMon = &sHofMonPtr[0].mon[currPokeID];
+    u16 currPokeId = gTasks[taskId].data[1];
+    struct HallofFameMon* currMon = &sHofMonPtr[0].mon[currPokeId];
 
     if (gTasks[taskId].data[3] != 0)
     {
@@ -550,12 +550,12 @@ static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
     }
     else
     {
-        sSelectedPaletteIndices |= (0x10000 << gSprites[gTasks[taskId].data[5 + currPokeID]].oam.paletteNum);
+        sSelectedPaletteIndices |= (0x10000 << gSprites[gTasks[taskId].data[5 + currPokeId]].oam.paletteNum);
         if (gTasks[taskId].data[1] < PARTY_SIZE - 1 && currMon[1].species != SPECIES_NONE) // there is another pokemon to display
         {
             gTasks[taskId].data[1]++;
             BeginNormalPaletteFade(sSelectedPaletteIndices, 0, 12, 12, HALL_OF_FAME_BG_PAL);
-            gSprites[gTasks[taskId].data[5 + currPokeID]].oam.priority = 1;
+            gSprites[gTasks[taskId].data[5 + currPokeId]].oam.priority = 1;
             gTasks[taskId].func = Task_Hof_DisplayMon;
         }
         else
@@ -602,15 +602,15 @@ static void Task_Hof_ApplauseAndConfetti(u8 taskId)
         FillWindowPixelBuffer(0, PIXEL_FILL(0));
         CopyWindowToVram(0, 3);
         gTasks[taskId].data[3] = 7;
-        gTasks[taskId].func = Hof_WaitBorderFadeAway;
+        gTasks[taskId].func = Task_Hof_WaitBorderFadeAway;
     }
 }
 
-static void Hof_WaitBorderFadeAway(u8 taskId)
+static void Task_Hof_WaitBorderFadeAway(u8 taskId)
 {
     if (gTasks[taskId].data[3] > 15)
     {
-        gTasks[taskId].func = Hof_SpawnPlayerPic;
+        gTasks[taskId].func = Task_Hof_SpawnPlayerPic;
     }
     else
     {
@@ -619,7 +619,7 @@ static void Hof_WaitBorderFadeAway(u8 taskId)
     }
 }
 
-static void Hof_SpawnPlayerPic(u8 taskId)
+static void Task_Hof_SpawnPlayerPic(u8 taskId)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_MODE_0 | DISPCNT_OBJ_1D_MAP | DISPCNT_OBJ_ON);
     ShowBg(0);
@@ -809,7 +809,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
 
     for (i = 0; i < PARTY_SIZE; i++, currMon++)
     {
-        if (currMon->species != 0)
+        if (currMon->species != SPECIES_NONE)
             gTasks[taskId].data[4]++;
     }
 
@@ -817,7 +817,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
 
     for (i = 0; i < PARTY_SIZE; i++, currMon++)
     {
-        if (currMon->species != 0)
+        if (currMon->species != SPECIES_NONE)
         {
             u16 spriteId;
             s16 posX, posY;
@@ -862,7 +862,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
     struct HallofFameTeam* savedTeams = sHofMonPtr;
     struct HallofFameMon* currMon;
     u16 i;
-    u16 currMonID;
+    u16 currMonId;
 
     for (i = 0; i < gTasks[taskId].data[0]; i++)
         savedTeams++;
@@ -874,9 +874,9 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
             gSprites[spriteId].oam.priority = 1;
     }
 
-    currMonID = gTasks[taskId].data[5 + gTasks[taskId].data[2]];
-    gSprites[currMonID].oam.priority = 0;
-    sSelectedPaletteIndices = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000;
+    currMonId = gTasks[taskId].data[5 + gTasks[taskId].data[2]];
+    gSprites[currMonId].oam.priority = 0;
+    sSelectedPaletteIndices = (0x10000 << gSprites[currMonId].oam.paletteNum) ^ 0xFFFF0000;
     BlendPalettesUnfaded(sSelectedPaletteIndices, 0xC, HALL_OF_FAME_BG_PAL);
 
     currMon = &savedTeams->mon[gTasks[taskId].data[2]];
diff --git a/src/mevent.c b/src/mevent.c
index 2f74ff0b4..846ccbaa8 100644
--- a/src/mevent.c
+++ b/src/mevent.c
@@ -507,7 +507,7 @@ struct MEventBuffer_3430_Sub * sav1_get_mevent_buffer_2(void)
 
 struct MENewsJisanStruct * GetMENewsJisanStructPtr(void)
 {
-    return &gSaveBlock1Ptr->mysteryEventBuffers.mejisan;
+    return &gSaveBlock1Ptr->mysteryEventBuffers.me_jisan;
 }
 
 u16 * GetMEventProfileECWordsMaybe(void)
diff --git a/src/mevent_client.c b/src/mevent_client.c
index 546fb310d..f4432cc11 100644
--- a/src/mevent_client.c
+++ b/src/mevent_client.c
@@ -14,7 +14,7 @@ static void mevent_client_init(struct mevent_client *, u32, u32);
 static u32 mevent_client_exec(struct mevent_client *);
 static void mevent_client_free_resources(struct mevent_client *);
 
-extern const struct mevent_client_cmd gMEventClientScript_IntialListen[];
+extern const struct mevent_client_cmd gMEventClientScript_InotialListen[];
 
 void mevent_client_do_init(void)
 {
@@ -89,7 +89,7 @@ static void mevent_client_send_word(struct mevent_client * svr, u32 ident, u32 w
 static u32 client_mainseq_0(struct mevent_client * svr)
 {
     // init
-    memcpy(svr->cmdBuffer, gMEventClientScript_IntialListen, ME_SEND_BUF_SIZE);
+    memcpy(svr->cmdBuffer, gMEventClientScript_InotialListen, ME_SEND_BUF_SIZE);
     svr->cmdidx = 0;
     svr->mainseqno = 4;
     svr->flag = 0;
diff --git a/src/pokemon.c b/src/pokemon.c
index e772fd3a8..c4ae0c4da 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -5624,7 +5624,6 @@ u8 GetNumberOfRelearnableMoves(struct Pokemon *mon)
     return numMoves;
 }
 
-// SpeciesToPokedexNum?
 u16 SpeciesToPokedexNum(u16 species)
 {
     species = SpeciesToNationalPokedexNum(species);
diff --git a/src/tm_case.c b/src/tm_case.c
index ca149a6c6..260efaa53 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -105,7 +105,7 @@ static void Task_SelectTMAction_Type3(u8 taskId);
 static void Task_SelectTMAction_FromSellMenu(u8 taskId);
 static void Task_AskConfirmSaleWithAmount(u8 taskId);
 static void Task_PlaceYesNoBox(u8 taskId);
-static void Task_SaleOfTMsCancelled(u8 taskId);
+static void Task_SaleOfTMsCanceled(u8 taskId);
 static void Task_InitQuantitySelectUI(u8 taskId);
 static void SellTM_PrintQuantityAndSalePrice(s16 quantity, s32 value);
 static void Task_QuantitySelect_HandleInput(u8 taskId);
@@ -178,7 +178,7 @@ static const struct MenuAction sMenuActions_UseGiveExit[] = {
 
 static const u8 sMenuActionIndices_Field[] = {0, 1, 2};
 static const u8 sMenuActionIndices_UnionRoom[] = {1, 2};
-static const struct YesNoFuncTable sYesNoFuncTable = {Task_PrintSaleConfirmedText, Task_SaleOfTMsCancelled};
+static const struct YesNoFuncTable sYesNoFuncTable = {Task_PrintSaleConfirmedText, Task_SaleOfTMsCanceled};
 
 static const u8 sText_ClearTo18[] = _("{CLEAR_TO 18}");
 static const u8 sText_SingleSpace[] = _(" ");
@@ -1012,7 +1012,7 @@ static void Task_PlaceYesNoBox(u8 taskId)
     HandleCreateYesNoMenu(taskId, &sYesNoFuncTable);
 }
 
-static void Task_SaleOfTMsCancelled(u8 taskId)
+static void Task_SaleOfTMsCanceled(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;