summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-01 23:25:19 -0800
committerYamaArashi <shadow962@live.com>2017-01-01 23:25:19 -0800
commitc4af9225bc4e2f30a240e9cabca98fca4d708501 (patch)
tree335e55961e9ca070ed2e2feff2c4f7d6bb82dd32 /src
parent80e95a204723eea4bb5fe914dd44f78a66552c03 (diff)
split rom_806936C
Diffstat (limited to 'src')
-rw-r--r--src/rom4.c6
-rw-r--r--src/scrcmd.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rom4.c b/src/rom4.c
index bd5a9d285..2f7d1fc5c 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -536,8 +536,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
sub_8072ED0();
mapnumbers_history_shift_sav1_0_2_4_out();
sub_8134394();
- sub_808073C();
- wild_encounter_reset_coro_args();
+ DoCurrentWeather();
+ ResetFieldTasksArgs();
mapheader_run_script_with_tag_x5();
AddMapNamePopUpWindowTask();
}
@@ -1629,7 +1629,7 @@ void sub_8054D4C(u32 a1)
sub_807C828();
sub_8080750();
if (!a1)
- overworld_ensure_per_step_coros_running();
+ SetUpFieldTasks();
mapheader_run_script_with_tag_x5();
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index a8567a2bb..e34ba0b7f 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -621,13 +621,13 @@ bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
bool8 ScrCmd_doweather(struct ScriptContext *ctx)
{
- sub_808073C();
+ DoCurrentWeather();
return FALSE;
}
bool8 ScrCmd_tileeffect(struct ScriptContext *ctx)
{
- activate_per_step_callback(ScriptReadByte(ctx));
+ ActivatePerStepCallback(ScriptReadByte(ctx));
return FALSE;
}