diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-26 13:58:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-26 13:58:26 -0500 |
| commit | e3ffb019126c1174afbd0009d7fe687f527aafc4 (patch) | |
| tree | 0db2873d83bc80e0fe7d7d45494f14b71d7ca32d /src/metatile_behavior.c | |
| parent | ad4f363a582651657a6c27e989ce9e48dc48ea9a (diff) | |
| parent | 13f14218e139f4a552dd88dc1049e958005597d9 (diff) | |
Merge branch 'master' into doc-oneisland
Diffstat (limited to 'src/metatile_behavior.c')
| -rw-r--r-- | src/metatile_behavior.c | 41 |
1 files changed, 7 insertions, 34 deletions
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c index 8e07c1c97..7c05d1dde 100644 --- a/src/metatile_behavior.c +++ b/src/metatile_behavior.c @@ -16,39 +16,12 @@ static const bool8 sTileSurfable[METATILE_COUNT] = { [MB_SOUTHWARD_CURRENT] = TRUE }; -static const u8 sTileBitAttributes[] = { - 0x00, - 0x01, - 0x02, - 0x04, - 0x08, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00 +static const u8 sTileBitAttributes[32] = { + [0] = 0x00, + [1] = 0x01, + [2] = 0x02, + [3] = 0x04, + [4] = 0x08, }; bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior) @@ -769,7 +742,7 @@ bool8 MetatileBehavior_UnusedReturnFalse_11(u8 metatileBehavior) { return FALSE; bool8 MetatileBehavior_UnusedReturnFalse_12(u8 metatileBehavior) { return FALSE; } bool8 MetatileBehavior_UnusedReturnFalse_13(u8 metatileBehavior) { return FALSE; } -bool8 sub_805A2BC(u8 arg1, u8 arg2) +bool8 TestMetatileAttributeBit(u8 arg1, u8 arg2) { if(sTileBitAttributes[arg1] & arg2) return TRUE; |