diff options
| -rw-r--r-- | include/script_pokemon_util.h (renamed from include/script_pokemon_util_80A0058.h) | 0 | ||||
| -rw-r--r-- | ld_script.txt | 2 | ||||
| -rw-r--r-- | src/battle_setup.c | 2 | ||||
| -rw-r--r-- | src/battle_tower.c | 2 | ||||
| -rw-r--r-- | src/post_battle_event_funcs.c | 2 | ||||
| -rw-r--r-- | src/scrcmd.c | 2 | ||||
| -rw-r--r-- | src/script_pokemon_util.c (renamed from src/script_pokemon_util_80A0058.c) | 6 |
7 files changed, 8 insertions, 8 deletions
diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util.h index f02193538..f02193538 100644 --- a/include/script_pokemon_util_80A0058.h +++ b/include/script_pokemon_util.h diff --git a/ld_script.txt b/ld_script.txt index 6b2a3fe23..2544f8d42 100644 --- a/ld_script.txt +++ b/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); diff --git a/src/battle_setup.c b/src/battle_setup.c index dee0c492b..056fe9273 100644 --- a/src/battle_setup.c +++ b/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" diff --git a/src/battle_tower.c b/src/battle_tower.c index c8098abf4..fb22d4fd1 100644 --- a/src/battle_tower.c +++ b/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" diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c index 1e61b9b77..112889710 100644 --- a/src/post_battle_event_funcs.c +++ b/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" diff --git a/src/scrcmd.c b/src/scrcmd.c index 6d2b1f430..4eaea9cef 100644 --- a/src/scrcmd.c +++ b/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" diff --git a/src/script_pokemon_util_80A0058.c b/src/script_pokemon_util.c index 6477f4a4d..4069f09fa 100644 --- a/src/script_pokemon_util_80A0058.c +++ b/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; |