Merge pull request #242 from jiangzhengwenjz/field

field_screen_effect

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[];

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

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

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

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[];