diff options
| author | YamaArashi <shadow962@live.com> | 2017-01-04 04:45:33 -0800 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-01-04 04:45:33 -0800 |
| commit | 355428ee31698073a93c335a6d9db47936c5ffbb (patch) | |
| tree | 1f10a3f9ff440dae1d9e68440e6a09236062655f /src | |
| parent | b6b8d053ecfc73c9ff0d4b5715404e3583501b84 (diff) | |
name some functions
Diffstat (limited to 'src')
| -rw-r--r-- | src/map_obj_lock.c | 2 | ||||
| -rw-r--r-- | src/pokemon_summary_screen.c | 4 | ||||
| -rw-r--r-- | src/scrcmd.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/map_obj_lock.c b/src/map_obj_lock.c index fc9882ce2..b1e7bb3df 100644 --- a/src/map_obj_lock.c +++ b/src/map_obj_lock.c @@ -36,7 +36,7 @@ bool8 sub_8064CFC(void) } } -void sub_8064D20(void) +void ScriptFreezeMapObjects(void) { FreezeMapObjects(); CreateTask(sub_8064CDC, 80); diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 5095ec3d0..58573e97e 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -18,7 +18,7 @@ extern const u8 gOtherText_FatefulEncounter[]; extern const u8 gOtherText_Met2[]; u8 *sub_80A1E9C(u8 *dest, u8 *src, u8); -u8 sub_80A0664(struct Pokemon *pokemon); +u8 PokemonSummaryScreen_CheckOT(struct Pokemon *pokemon); u8 *PokemonSummaryScreen_CopyPokemonLevel(u8 *dest, u8 level); void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 top) { @@ -35,7 +35,7 @@ void PokemonSummaryScreen_PrintTrainerMemo(struct Pokemon *pokemon, u8 left, u8 ptr = StringCopy(ptr, gOtherText_Nature); - if (sub_80A0664(pokemon) == TRUE) { + if (PokemonSummaryScreen_CheckOT(pokemon) == TRUE) { locationMet = GetMonData(pokemon, MON_DATA_MET_LOCATION); if (GetMonData(pokemon, MON_DATA_MET_LEVEL) == 0) { diff --git a/src/scrcmd.c b/src/scrcmd.c index e11f73bfc..4dc7a38dc 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -1085,7 +1085,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx) } else { - sub_8064D20(); + ScriptFreezeMapObjects(); SetupNativeScript(ctx, sub_8064CFC); return TRUE; } @@ -1106,7 +1106,7 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx) } else { - sub_8064D20(); + ScriptFreezeMapObjects(); SetupNativeScript(ctx, sub_8064CFC); } |