diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-06 13:35:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-06 13:35:48 -0500 |
| commit | 26f7ba482384ad4f63063797a527b7fb33572aa1 (patch) | |
| tree | df807e701efce9007c5ae8cb7583c0375a3c6f14 /include | |
| parent | ab4fa0e76e4478804266cddf6604308a77cdcb3b (diff) | |
| parent | da2ff948a68548a44a0e0d48f869f2217ce06e2d (diff) | |
Merge pull request #204 from mrgriffin/field-screen-effect
Decompile field_screen_effect
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_screen_effect.h | 6 | ||||
| -rw-r--r-- | include/overworld.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h index 86fab62e0..e48745a7b 100644 --- a/include/field_screen_effect.h +++ b/include/field_screen_effect.h @@ -4,11 +4,11 @@ #include "global.h" void sub_80AF79C(void); -void sub_807F028(u8); +void AnimateFlash(u8); void sub_80B0244(void); void sub_807E3EC(void); -void sub_807F114(void); -void sub_807F204(u8 taskId); +void DoOutwardBarnDoorWipe(void); +void Task_BarnDoorWipe(u8 taskId); void sub_807DC00(void); #endif // GUARD_FIELD_SCREEN_EFFECT_H diff --git a/include/overworld.h b/include/overworld.h index 97cf245e5..04d28701c 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -122,7 +122,7 @@ void Overworld_ResetStateAfterTeleport(void); void Overworld_FadeOutMapMusic(void); void CB2_LoadMap(void); -bool8 sub_8055FC4(void); +bool8 BGMusicStopped(void); bool8 is_light_level_8_or_9(u8 mapType); bool32 sub_8055C9C(void); void Overworld_ResetStateAfterDigEscRope(void); |