diff options
| author | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-17 08:11:32 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 08:11:32 -0800 |
| commit | 90c7299e519783fe1e22d9ec8d3351d08bda65f6 (patch) | |
| tree | b24d8bdcd6809c5465c6aa18f6d3109af2aad915 /src/rom4.c | |
| parent | 4f9aab81ffdfedc84dfeafb88b4248dc6c7c2068 (diff) | |
| parent | 46cf490edd4fd5971d3a3511516beb0910e33c32 (diff) | |
Merge pull request #193 from marijnvdwerf/clean/cleanup-1
Clean up various things
Diffstat (limited to 'src/rom4.c')
| -rw-r--r-- | src/rom4.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rom4.c b/src/rom4.c index 521f07a48..fe5b7cb45 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -4,17 +4,19 @@ #include "asm_fieldmap.h" #include "battle_setup.h" #include "berry.h" +#include "event_data.h" #include "field_camera.h" #include "field_effect.h" #include "field_map_obj.h" #include "field_message_box.h" #include "field_player_avatar.h" -#include "event_data.h" +#include "field_special_scene.h" #include "heal_location.h" #include "link.h" #include "load_save.h" #include "main.h" #include "menu.h" +#include "metatile_behavior.h" #include "new_game.h" #include "palette.h" #include "play_time.h" @@ -26,10 +28,8 @@ #include "start_menu.h" #include "task.h" #include "tileset_anim.h" -#include "field_special_scene.h" #include "weather.h" #include "wild_encounter.h" -#include "metatile_behavior.h" #ifdef SAPPHIRE #define LEGENDARY_MUSIC BGM_OOAME // Heavy Rain @@ -667,15 +667,15 @@ bool32 IsBikingAllowedByMap(void) return FALSE; if (gMapHeader.mapType == MAP_TYPE_UNDERWATER) return FALSE; - + // is player in SeafloorCavern_Room9? if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 36) return FALSE; - + // is player in CaveOfOrigin_B4F? if (gSaveBlock1.location.mapGroup == 24 && gSaveBlock1.location.mapNum == 42) return FALSE; - + return TRUE; } |