Merge branch 'master' into battle

include/overworld.h

@@ -104,7 +104,7 @@ void SetWarpDestinationToFixedHoleWarp(s16 x, s16 y);
 void ResetInitialPlayerAvatarState(void);
 void sub_8055D40(u16 mapDataId);
 void CleanupOverworldWindowsAndTilemaps(void);
-u32 sub_8054C04(void);
+u32 ComputeWhiteOutMoneyLoss(void);
 
 extern u8 gDisableMapMusicChangeOnMapLoad;
 extern u8 gUnknown_2036E28;