Address review comments, 2

ld_script.txt

@@ -145,7 +145,7 @@ SECTIONS {
         src/script_menu.o(.text);
         asm/naming_screen.o(.text);
         src/money.o(.text);
-        src/script_pokemon_util_80A0058.o(.text);
+        src/script_pokemon_util.o(.text);
         src/field_poison.o(.text);
         src/pokemon_size_record.o(.text);
         src/pc_screen_effect.o(.text);

src/battle_setup.c

@@ -9,7 +9,7 @@
 #include "safari_zone.h"
 #include "quest_log.h"
 #include "script.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "strings.h"
 #include "string_util.h"
 #include "event_data.h"

src/battle_tower.c

@@ -18,7 +18,7 @@
 #include "new_game.h"
 #include "save.h"
 #include "item.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "constants/species.h"
 #include "constants/items.h"
 #include "constants/moves.h"

src/post_battle_event_funcs.c

@@ -1,5 +1,5 @@
 #include "global.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "event_data.h"
 #include "credits.h"
 #include "overworld.h"

src/scrcmd.c

@@ -27,7 +27,7 @@
 #include "data.h"
 #include "field_specials.h"
 #include "constants/items.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "pokemon_storage_system.h"
 #include "party_menu.h"
 #include "money.h"

src/script_pokemon_util.c

@@ -9,7 +9,7 @@
 #include "overworld.h"
 #include "party_menu.h"
 #include "pokedex.h"
-#include "script_pokemon_util_80A0058.h"
+#include "script_pokemon_util.h"
 #include "constants/items.h"
 #include "constants/species.h"
 
@@ -63,8 +63,8 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u
 
     switch(sentToPc)
     {
-    case 0:
-    case 1:
+    case MON_GIVEN_TO_PARTY:
+    case MON_GIVEN_TO_PC:
         GetSetPokedexFlag(nationalDexNum, FLAG_SET_SEEN);
         GetSetPokedexFlag(nationalDexNum, FLAG_SET_CAUGHT);
         break;