From 5e6a668bbdd5edb4a2751aa7796f0a07ce6918ec Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Wed, 30 Aug 2023 19:38:28 -0700
Subject: [PATCH] address review comments

---
 include/pokemon_3.h           |  2 +-
 src/code_801D760.c            |  2 +-
 src/friend_area_action_menu.c |  2 +-
 src/pokemon_3.c               | 12 ++++++------
 src/rescue_password_menu.c    |  2 +-
 src/wigglytuff_shop.c         |  4 ----
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/include/pokemon_3.h b/include/pokemon_3.h
index 84d2c49fe..eb62866e4 100644
--- a/include/pokemon_3.h
+++ b/include/pokemon_3.h
@@ -10,7 +10,7 @@ struct EvolveStatus
     s16 targetEvolveSpecies;
 };
 
-bool8 HasRecruitedMon(s16 species_);
+bool8 HasRecruitedMon(s16 species);
 s16 GetBaseSpecies(s16 index);
 s16 GetBaseSpeciesNoUnown(s16 index);
 bool8 TacticsTargetLeader(u8 tactic);
diff --git a/src/code_801D760.c b/src/code_801D760.c
index 8f2d1954e..b1047f1e8 100644
--- a/src/code_801D760.c
+++ b/src/code_801D760.c
@@ -676,7 +676,7 @@ void sub_801DBD4(void)
 #ifndef NONMATCHING
     register s32 x asm("r4");
 #else
-    register s32 x;
+    s32 x;
 #endif
     s16 index;
     int counter;
diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c
index beb261a4d..dac7208c6 100644
--- a/src/friend_area_action_menu.c
+++ b/src/friend_area_action_menu.c
@@ -533,7 +533,7 @@ void sub_80278B4(void)
       case FRIEND_AREA_ACTION_MENU_ACTION_JOIN_TEAM:
         if (sub_808D750(gUnknown_203B2BC->targetPoke)) {
 #ifdef NONMATCHING
-            pokeStruct1 = &gRecruiedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
+            pokeStruct1 = &gRecruitedPokemonRef->pokemon[gUnknown_203B2BC->targetPoke];
 #else
         register size_t offset asm("r1") = offsetof(struct unkStruct_203B45C, pokemon[gUnknown_203B2BC->targetPoke]);
         struct PokemonStruct* p = gRecruitedPokemonRef->pokemon;
diff --git a/src/pokemon_3.c b/src/pokemon_3.c
index f686e4464..a4f7e54fb 100644
--- a/src/pokemon_3.c
+++ b/src/pokemon_3.c
@@ -104,14 +104,14 @@ void sub_808E6F4(struct unkStruct_808E6F4* a1)
     a1->unk2 = 2;
 }
 
-bool8 HasRecruitedMon(s16 species_) {
-    s32 species = species_;
+bool8 HasRecruitedMon(s16 species) {
+    s32 species_s32 = species;
     s32 i = 0;
     struct PokemonStruct *pokemon = gRecruitedPokemonRef->pokemon;
 
     for (i = 0; i < NUM_MONSTERS; i++) {
         if (((u8)pokemon->unk0 & 1)) {
-            if(pokemon->speciesNum == species)
+            if(pokemon->speciesNum == species_s32)
                 return TRUE;
         }
         pokemon++;
@@ -928,7 +928,7 @@ void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatu
 #endif
 
     evolveStatus->evolutionConditionStatus = 0;
-    for(index = MONSTER_BULBASAUR; index < 0x1A8; index++)
+    for(index = MONSTER_BULBASAUR; index <= MONSTER_MAX; index++)
     {
         if ((s16)index == MONSTER_ALAKAZAM) {
             GetPokemonEvolveConditions(MONSTER_ALAKAZAM, &evolveConditions);
@@ -939,11 +939,11 @@ void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatu
         if(((evolveConditions.preEvolution.evolveType != EVOLVE_TYPE_NONE) && (param_1->speciesNum == evolveConditions.preEvolution.evolveFrom)))
             break;
     };
-    if (index == 0x1a8) {
+    if (index == MONSTER_MAX + 1) {
         evolveStatus->evolutionConditionStatus = EVOLUTION_NO_MORE;
     }
     else {
-        for(index = MONSTER_BULBASAUR, defaultReason = EVOLUTION_LACK_ITEM; index < 0x1A8; index++)
+        for(index = MONSTER_BULBASAUR, defaultReason = EVOLUTION_LACK_ITEM; index <= MONSTER_MAX; index++)
         {
             evolFlag = FALSE;
             index2 = (s16)index;
diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c
index 160f7986e..fd7c50a36 100644
--- a/src/rescue_password_menu.c
+++ b/src/rescue_password_menu.c
@@ -636,7 +636,7 @@ u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, struct unkStruct_203B480 *para
 {
   if ( (!sub_803D204(passwordBuffer, param_3)) || (WONDER_MAIL_TYPE_OKD < param_3->mailType) ||
        (param_3->unk4.dungeon.floor >= GetDungeonFloorCount(param_3->unk4.dungeon.id)) ||
-       (param_3->clientSpecies == MONSTER_NONE) || (MONSTER_RAYQUAZA_CUTSCENE < param_3->clientSpecies) ||
+       (param_3->clientSpecies == MONSTER_NONE) || (MONSTER_MAX < param_3->clientSpecies) ||
        (IsInvalidItemReward(param_3->item.id))) {
         return PASSWORD_ENTRY_INCORRECT_PASSWORD;
   }
diff --git a/src/wigglytuff_shop.c b/src/wigglytuff_shop.c
index c0bdc2aa3..925c4597b 100644
--- a/src/wigglytuff_shop.c
+++ b/src/wigglytuff_shop.c
@@ -118,10 +118,6 @@ void sub_8021D5C(void);
 void UpdateWigglytuffDialogue(void);
 
 extern void sub_8008C54(u32);
-//extern void sub_80073B8(u32);
-//extern void sub_80073E0(u32);
-//void sub_800792C(u32, u32, u32, u32, u32);
-//void sub_8007A78(u32, u32, u32, u32, u32);
 
 void sub_8021878(void);
 void sub_8021894(void);