diff options
| author | YamaArashi <shadow962@live.com> | 2017-05-08 13:55:31 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2017-05-08 15:47:45 -0700 |
| commit | e6868bbdb2b9a0f00085029817d3a451781973cd (patch) | |
| tree | a67f4e64f6850944f5b25c94df415923b1c325a5 /src/rom4.c | |
| parent | f6e3598f5efbda472c6605c94b5597d1196ea619 (diff) | |
decompile roamer.s
Diffstat (limited to 'src/rom4.c')
| -rw-r--r-- | src/rom4.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/rom4.c b/src/rom4.c index 39c182731..5beb698ab 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -25,6 +25,7 @@ #include "palette.h" #include "play_time.h" #include "rng.h" +#include "roamer.h" #include "safari_zone.h" #include "script.h" #include "script_pokemon_80C4.h" @@ -164,8 +165,8 @@ void sub_805308C(void) FlagReset(SYS_SAFARI_MODE); sub_8054164(); ResetCyclingRoadChallengeData(); - mapnumbers_history_shift_sav1_0_2_4_out(); - sub_8134348(); + UpdateLocationHistoryForRoamer(); + RoamerMoveToOtherLocationSet(); } void ResetGameStats(void) @@ -531,8 +532,8 @@ void sub_80538F0(u8 mapGroup, u8 mapNum) sub_807D874(i); sub_8072ED0(); - mapnumbers_history_shift_sav1_0_2_4_out(); - sub_8134394(); + UpdateLocationHistoryForRoamer(); + RoamerMove(); DoCurrentWeather(); ResetFieldTasksArgs(); mapheader_run_script_with_tag_x5(); @@ -561,8 +562,8 @@ void sub_8053994(u32 a1) sub_8053C98(); sav1_reset_battle_music_maybe(); mapheader_run_script_with_tag_x3(); - mapnumbers_history_shift_sav1_0_2_4_out(); - sub_8134348(); + UpdateLocationHistoryForRoamer(); + RoamerMoveToOtherLocationSet(); not_trainer_hill_battle_pyramid(); if (a1 != 1 && v3) { |