summaryrefslogtreecommitdiff
path: root/include/fldeff_flash.h
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-20 17:58:19 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-20 17:58:19 -0500
commit70cc2c16becca3a66b21a71f0a781654dc55290b (patch)
treeee931ee96a0438cd56ca67b0a765bbd650bf7d55 /include/fldeff_flash.h
parent2c7a4e1406b078cf9bcc2a16e92a58497390aa17 (diff)
parentc6207577802db057298917089e427a6ab9e6edf9 (diff)
Merge remote-tracking branch 'upstream/master' into assets
Diffstat (limited to 'include/fldeff_flash.h')
-rw-r--r--include/fldeff_flash.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fldeff_flash.h b/include/fldeff_flash.h
index 3b1fbf812..0b56c64dc 100644
--- a/include/fldeff_flash.h
+++ b/include/fldeff_flash.h
@@ -2,8 +2,8 @@
#define GUARD_FLDEFF_FLASH_H
void sub_810CC80(void);
-u8 sub_810CDB8(u8, u8);
-u8 fade_type_for_given_maplight_pair(u8, u8);
+u8 GetMapPairFadeToType(u8, u8);
+u8 GetMapPairFadeFromType(u8, u8);
void debug_sub_8122080(void);
#endif // GUARD_FLDEFF_FLASH_H