diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-02-05 17:38:23 -0600 |
| commit | 607cba8c2e5253874f378cd6280fd066b0c9fa3d (patch) | |
| tree | 8894b0b686adc29286d078500932306fabbc2973 /src/trainer_see.c | |
| parent | 663ecd00145da49fda7d2509d629d737ea633cd8 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into battle_refactor
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 53bc5cbbb..7706da703 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -6,7 +6,7 @@ #include "field_effect.h" #include "field_map_obj.h" #include "field_player_avatar.h" -#include "map_obj_8097404.h" +#include "field_map_obj_helpers.h" #include "pokenav.h" #include "task.h" #include "util.h" @@ -639,7 +639,7 @@ void sub_80B45D0(void) gApproachingTrainerId++; gSpecialVar_Result = 1; UnfreezeMapObjects(); - sub_80974D0(gApproachingTrainers[1].mapObjectId); + FreezeMapObjectsExceptOne(gApproachingTrainers[1].mapObjectId); } else { |