diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:11:20 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:11:20 -0500 |
| commit | ea8b1011d30c3f70f1da79553d8ed887b12596f2 (patch) | |
| tree | 2f24f71d69c7aaac48e8eccba906b79cace1fd71 /include | |
| parent | e92cc7752b5934d7501c5027057a6b7c52601bd7 (diff) | |
| parent | 5fff2f2234755af166612a4829d178408eb740bb (diff) | |
Merge master into fix-eventobj
Diffstat (limited to 'include')
| -rw-r--r-- | include/fldeff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/fldeff.h b/include/fldeff.h index 5da189c2a..deb54372c 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -33,7 +33,7 @@ void ChooseMonForSoftboiled(u8 taskId); // flash bool8 SetUpFieldMove_Flash(void); -void c2_change_map(void); +void CB2_DoChangeMap(void); bool8 GetMapPairFadeToType(u8 a1, u8 a2); bool8 GetMapPairFadeFromType(u8 a1, u8 a2); |