Brings in surfable tile data structure

data/metatile_behavior.s

@@ -1,8 +1,6 @@
 	.section .rodata
 
 	.align 2
-sTileBitAttributes:: @ 8352F78
-	.incbin "baserom.gba", 0x352F78, 0xF0
 
 gUnknown_8353068:: @ 8353068
 	.incbin "baserom.gba", 0x353068, 0x8420

include/constants/metatile_behaviors.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_METATILE_BEHAVIORS
 #define GUARD_METATILE_BEHAVIORS
 
+#define METATILE_COUNT 0xF0
 #define MB_NORMAL 0x00
 #define MB_01 0x01
 #define MB_TALL_GRASS 0x02

include/metatile_behavior.h

@@ -149,7 +149,6 @@ bool8 MetatileBehavior_IsImpressiveMachine(u8 metatileBehavior);
 bool8 MetatileBehavior_IsVideoGame(u8 metatileBehavior);
 bool8 MetatileBehavior_IsBurglary(u8 metatileBehavior);
 bool8 MetatileBehavior_IsMBA3(u8 metatileBehavior);
-extern u8 sTileBitAttributes[];
 extern u8 gUnknown_8353068[];
 
 #endif // GUARD_METATILE_BEHAVIOR

ld_script.txt

@@ -364,6 +364,7 @@ SECTIONS {
         src/bg_regs.o(.rodata);
         src/string_util.o(.rodata);
         data/data.o(.rodata);
+        src/metatile_behavior.o(.rodata);
         data/metatile_behavior.o(.rodata);
         data/data_835B488.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);

src/metatile_behavior.c

@@ -2,6 +2,20 @@
 #include "metatile_behavior.h"
 #include "constants/metatile_behaviors.h"
 
+static const bool8 sTileSurfable[METATILE_COUNT] = {
+    [MB_POND_WATER] = TRUE,
+    [MB_SEMI_DEEP_WATER] = TRUE,
+    [MB_DEEP_WATER] = TRUE,
+    [MB_WATERFALL] = TRUE,
+    [MB_SPLASHING_WATER] = TRUE,
+    [MB_1A] = TRUE,
+    [MB_1B] = TRUE,
+    [MB_EASTWARD_CURRENT] = TRUE,
+    [MB_WESTWARD_CURRENT] = TRUE,
+    [MB_NORTHWARD_CURRENT] = TRUE,
+    [MB_SOUTHWARD_CURRENT] = TRUE
+};
+
 bool8 MetatileBehavior_UnusedReturnTrue(u8 metatileBehavior)
 {
     return TRUE;
@@ -181,7 +195,7 @@ bool8 MetatileBehavior_ReturnFalse_2(u8 metatileBehavior) { return FALSE; }
 
 bool8 MetatileBehavior_IsSurfable(u8 metatileBehavior)
 {
-    if(sTileBitAttributes[metatileBehavior] & 1)
+    if(sTileSurfable[metatileBehavior] & 1)
         return TRUE;
     else
         return FALSE;
@@ -501,7 +515,7 @@ bool8 MetatileBehavior_IsDeepSemiDeepOrSplashingWater(u8 metatileBehavior)
         return FALSE;
 }
 
-bool8 MetatileBehavior_IsMB1A(u8 metatileBehavior)
+bool8 MetatileBehavior_UnusedIsMB1A(u8 metatileBehavior)
 {
     if(metatileBehavior == MB_1A)
         return TRUE;