diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-31 00:29:38 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-31 00:29:38 -0500 |
| commit | e78697494cc020a87caab296e2b4efc796434e3d (patch) | |
| tree | 0ccd1c5617d2420e1249216aff428752255f5d9a /src/trainer_see.c | |
| parent | 155a3710640a9814686c9c3a261d5dc5575cc6d1 (diff) | |
| parent | ef3df1d40c9dd66df2b54ddac52ee3091be3707a (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
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 { |