diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-26 15:33:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-26 15:33:56 -0500 |
| commit | 2e934469b82a41cb7871c04898547e1a5d58c621 (patch) | |
| tree | 36e73aae0bcd3178cc29354f7e40172d194d0bb9 /include | |
| parent | a2c6174ee995f8980bcd38d3199ab2e395cca2ae (diff) | |
| parent | 5b36288064ee0e999a2201b2dd6479da3c99d01e (diff) | |
Merge pull request #242 from jiangzhengwenjz/field
field_screen_effect
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_scripts.h | 4 | ||||
| -rw-r--r-- | include/field_fadetransition.h | 1 | ||||
| -rw-r--r-- | include/field_screen_effect.h | 1 | ||||
| -rw-r--r-- | include/heal_location.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 4 |
5 files changed, 12 insertions, 2 deletions
diff --git a/include/event_scripts.h b/include/event_scripts.h index b8da8f3e0..f026cb57a 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1170,6 +1170,10 @@ extern const u8 EventScript_ResetAllMapFlags[]; // player_pc extern const u8 EventScript_PalletTown_PlayersHouse_2F_ShutDownPC[]; +// field_screen_effect +extern const u8 EventScript_MomHeal[]; +extern const u8 EventScript_AfterWhiteOutHeal[]; + // start_menu extern const u8 gText_WouldYouLikeToSaveTheGame[]; extern const u8 gText_AlreadySaveFile_WouldLikeToOverwrite[]; diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h index d27d0e54a..6683f5e2e 100644 --- a/include/field_fadetransition.h +++ b/include/field_fadetransition.h @@ -20,5 +20,6 @@ void FadeTransition_FadeInOnReturnToStartMenu(void); void sub_807DCE4(void); bool32 sub_807E418(void); +void palette_bg_faded_fill_black(void); #endif // GUARD_FIELD_FADETRANSITION_H diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index e48745a7b..ca7625782 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -10,5 +10,6 @@ void sub_807E3EC(void); void DoOutwardBarnDoorWipe(void); void Task_BarnDoorWipe(u8 taskId); void sub_807DC00(void); +void sub_807F5F0(void); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/heal_location.h b/include/heal_location.h index 0143b8158..aaa2178c6 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -14,8 +14,8 @@ struct HealLocation { s8 group; s8 map; - u16 x; - u16 y; + s16 x; + s16 y; }; // Exported RAM declarations diff --git a/include/strings.h b/include/strings.h index 7821825cf..5c8ffde4b 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1036,6 +1036,10 @@ extern const u8 gText_RegionMap_AreaDesc_AlteringCave[]; extern const u8 gText_RegionMap_AreaDesc_PatternBush[]; extern const u8 gText_RegionMap_AreaDesc_DottedHole[]; +// field_screen_effect +extern const u8 gUnknown_841B554[]; +extern const u8 gUnknown_841B5B6[]; + // save_failed_screen extern const u8 gText_SaveFailedScreen_CheckingBackupMemory[]; extern const u8 gText_SaveFailedScreen_BackupMemoryDamaged[]; |