merge bike with master, fix conflicts

sym_ewram.txt

@@ -707,12 +707,7 @@ gUnknown_02038BC6: @ 2038BC6
 	.space 0x2
 
 	.include "src/battle_setup.o"
-
-.align 2
-
-gApproachingTrainerId: @ 2038BFC
-	.space 0x4
-
+	.include "src/trainer_see.o"
     .include "src/wild_encounter.o"
 
 gFieldEffectArguments: @ 2038C08
@@ -1120,15 +1115,8 @@ gUnknown_0203AB34: @ 203AB34
 .align 2
 gUnknown_0203AB40: @ 203AB40
 	.space 0x8
-
-gUnknown_0203AB48: @ 203AB48
-	.space 0x6
-
-gUnknown_0203AB4E: @ 203AB4E
-	.space 0x2
-
-gUnknown_0203AB50: @ 203AB50
-	.space 0x4
+	
+	.include "src/pokeblock.o"
 
 gBikeCyclingChallenge: @ 203AB54
 	.space 0x1
@@ -1262,32 +1250,7 @@ gUnknown_0203BC88: @ 203BC88
 gUnknown_0203BC8C: @ 203BC8C
 	.space 0x4
 
-gUnknown_0203BC90: @ 203BC90
-	.space 0x4
-
-gUnknown_0203BC94: @ 203BC94
-	.space 0x4
-
-gUnknown_0203BC98: @ 203BC98
-	.space 0x4
-
-gUnknown_0203BC9C: @ 203BC9C
-	.space 0x2
-
-gUnknown_0203BC9E: @ 203BC9E
-	.space 0x2
-
-gUnknown_0203BCA0: @ 203BCA0
-	.space 0x4
-
-gUnknown_0203BCA4: @ 203BCA4
-	.space 0x4
-
-gUnknown_0203BCA8: @ 203BCA8
-	.space 0x4
-
-gUnknown_0203BCAC: @ 203BCAC
-	.space 0x4
+	.include "src/use_pokeblock.o"
 
 gUnknown_0203BCB0: @ 203BCB0
 	.space 0x4
@@ -1349,11 +1312,7 @@ gUnknown_0203BCF8: @ 203BCF8
 gBraillePuzzleCallbackFlag: @ 203BD14
 	.space 0x4
 
-gUnknown_0203BD18: @ 203BD18
-	.space 0x4
-
-gUnknown_0203BD1C: @ 203BD1C
-	.space 0x8
+	.include "src/pokeblock_feed.o"
 
 gUnknown_0203BD24: @ 203BD24
 	.space 0x2