diff options
Diffstat (limited to 'src/rom4.c')
| -rw-r--r-- | src/rom4.c | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/src/rom4.c b/src/rom4.c index a3b0b221d..bd5a9d285 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -4,31 +4,33 @@ #include "asm_fieldmap.h" #include "battle_setup.h" #include "berry.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 "flag.h" +#include "heal_location.h" +#include "link.h" +#include "load_save.h" +#include "main.h" #include "menu.h" -#include "weather.h" -#include "task.h" -#include "tileset_anim.h" -#include "start_menu.h" -#include "play_time.h" -#include "truck_scene.h" #include "new_game.h" -#include "heal_location.h" -#include "field_message_box.h" +#include "palette.h" +#include "play_time.h" +#include "rng.h" #include "safari_zone.h" #include "script.h" #include "songs.h" #include "sound.h" -#include "rng.h" -#include "main.h" -#include "palette.h" -#include "link.h" -#include "flag.h" +#include "start_menu.h" +#include "task.h" +#include "tileset_anim.h" +#include "truck_scene.h" #include "var.h" -#include "field_camera.h" -#include "field_effect.h" +#include "weather.h" #include "wild_encounter.h" +#include "metatile_behavior.h" #ifdef SAPPHIRE #define LEGENDARY_MUSIC BGM_OOAME // Heavy Rain @@ -454,7 +456,7 @@ void sub_80537CC(u8 a1) warp_set(&gSaveBlock1.warp1, warp->group, warp->map, -1, warp->x, warp->y); } -void gpu_sync_bg_hide(void) +void gpu_sync_bg_hide() { gSaveBlock1.warp1 = gSaveBlock1.warp2; } @@ -1262,9 +1264,9 @@ void CB2_ContinueSavedGame(void) PlayTimeCounter_Start(); ScriptContext1_Init(); ScriptContext2_Disable(); - if (sub_80479F8() == 1) + if (GetSecretBase2Field_9() == 1) { - sub_8047A04(); + ClearSecretBase2Field_9(); sub_8053778(); warp_in(); SetMainCallback2(CB2_LoadMap); |