diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 14:40:25 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 14:40:25 -0400 |
| commit | f5f4d6bc1fa9927796ed7a683fb262d2f50a87c3 (patch) | |
| tree | 2661bf35f64f5b1577ce7fcd5b7ef6e91733403d /include | |
| parent | f0fe4904d0fa8b4e964b64b896c10d4599eb15d3 (diff) | |
through InitCurrentFlashLevelScanlineEffect
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_camera.h | 1 | ||||
| -rw-r--r-- | include/field_screen_effect.h | 1 | ||||
| -rw-r--r-- | include/field_specials.h | 1 | ||||
| -rw-r--r-- | include/fieldmap.h | 1 | ||||
| -rw-r--r-- | include/load_save.h | 4 |
5 files changed, 7 insertions, 1 deletions
diff --git a/include/field_camera.h b/include/field_camera.h index fa9ac0d72..270aac57a 100644 --- a/include/field_camera.h +++ b/include/field_camera.h @@ -33,5 +33,6 @@ void InstallCameraPanAheadCallback(void); void DrawDoorMetatileAt(int x, int y, const u16 *data); void move_tilemap_camera_to_upper_left_corner(void); void CameraUpdate(void); +void FieldUpdateBgTilemapScroll(void); #endif //GUARD_FIELD_CAMERA_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index ca9242945..06c56d38a 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -10,6 +10,7 @@ void sub_807E3EC(void); void DoOutwardBarnDoorWipe(void); void Task_BarnDoorWipe(u8 taskId); void FieldCB_RushInjuredPokemonToCenter(void); +void WriteFlashScanlineEffectBuffer(u8 flashLevel); extern const s32 gMaxFlashLevel; diff --git a/include/field_specials.h b/include/field_specials.h index cc51eea87..447eb2c53 100644 --- a/include/field_specials.h +++ b/include/field_specials.h @@ -33,5 +33,6 @@ void IncrementResortGorgeousStepCounter(void); void IncrementBirthIslandRockStepCount(void); void ResetCyclingRoadChallengeData(void); void ResetFieldTasksArgs(void); +bool8 UsedPokemonCenterWarp(void); #endif // GUARD_FIELD_SPECIALS_H diff --git a/include/fieldmap.h b/include/fieldmap.h index 1971104fc..66928fab2 100644 --- a/include/fieldmap.h +++ b/include/fieldmap.h @@ -39,5 +39,6 @@ void apply_map_tileset1_tileset2_palette(struct MapLayout const * mapLayout); void InitMap(void); void copy_map_tileset2_to_vram_2(const struct MapLayout * mapLayout); void apply_map_tileset2_palette(const struct MapLayout * mapLayout); +void InitMapFromSavedGame(void); #endif //GUARD_FIELDMAP_H diff --git a/include/load_save.h b/include/load_save.h index 20df691e5..23c1429ed 100644 --- a/include/load_save.h +++ b/include/load_save.h @@ -30,6 +30,8 @@ void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey); void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey); void ClearContinueGameWarpStatus2(void); void SetContinueGameWarpStatusToDynamicWarp(void); -void sub_804C1AC(void); +void SetContinueGameWarpStatus(void); +bool32 UseContinueGameWarp(void); +void ClearContinueGameWarpStatus(); #endif // GUARD_LOAD_SAVE_H |