diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-07-08 08:07:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-08 08:07:53 -0400 |
| commit | 39d68ebd445be5657a916dec1b4872717e9c40d3 (patch) | |
| tree | 4394601f49f220e3c32d9879a3c26284c9c92771 /include/overworld.h | |
| parent | 7980c4aa071685983f84861cc7dc69d6daf30a90 (diff) | |
| parent | 122f1395823cfa3dfd96842c61411ad29700f8de (diff) | |
Merge pull request #77 from jiangzhengwenjz/misc
corrected sprite.h + finished safari_zone, list_menu, menu_indicators, field_poison, buy_menu_helpers, dynamic_placeholder_text_util
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/overworld.h b/include/overworld.h index bab4797ff..60fa566f7 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -2,7 +2,6 @@ #define GUARD_ROM4_H #include "global.h" - #include "main.h" struct UnkPlayerStruct @@ -69,8 +68,8 @@ void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *); void sub_8086230(void); void CB2_ReturnToField(void); bool32 sub_8087598(void); -void c2_exit_to_overworld_1_continue_scripts_restart_music(void); -void warp_in(void); +void CB2_ReturnToFieldContinueScriptPlayMapMusic(void); +void WarpIntoMap(void); u8 get_map_light_level_by_bank_and_number(s8 mapGroup, s8 mapNum); void sub_8086194(void); void sub_8084CCC(u8 spawn); @@ -110,7 +109,7 @@ bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType); void Overworld_ResetStateAfterTeleport(void); void Overworld_FadeOutMapMusic(void); -void sub_805671C(void); +void CB2_LoadMap(void); bool8 sub_8055FC4(void); bool8 is_light_level_8_or_9(u8 mapType); bool32 sub_8055C9C(void); |