diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/metatile_behavior.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/metatile_behavior.c')
| -rw-r--r-- | src/metatile_behavior.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index dd594f075..2bae89ecf 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -897,7 +897,7 @@ bool8 MetatileBehavior_IsBridge(u8 metatileBehavior) return FALSE; } -u8 MetatileBehavior_GetBridgeSth(u8 metatileBehavior) +u8 MetatileBehavior_GetBridgeType(u8 metatileBehavior) { u8 result = metatileBehavior - MB_WARP_OR_BRIDGE; if (result < 4) |