Merge branch 'master' into link

sym_ewram.txt

@@ -645,57 +645,8 @@ gUnknown_02038BC4: @ 2038BC4
 gUnknown_02038BC6: @ 2038BC6
 	.space 0x2
 
-gUnknown_02038BC8: @ 2038BC8
-	.space 0x2
-
-gTrainerBattleOpponent_A: @ 2038BCA
-	.space 0x2
-
-gTrainerBattleOpponent_B: @ 2038BCC
-	.space 0x2
-
-gPartnerTrainerId: @ 2038BCE
-	.space 0x2
-
-gUnknown_02038BD0: @ 2038BD0
-	.space 0x4
-
-gUnknown_02038BD4: @ 2038BD4
-	.space 0x4
-
-gUnknown_02038BD8: @ 2038BD8
-	.space 0x4
-
-gUnknown_02038BDC: @ 2038BDC
-	.space 0x4
-
-gUnknown_02038BE0: @ 2038BE0
-	.space 0x4
-
-gUnknown_02038BE4: @ 2038BE4
-	.space 0x4
-
-gUnknown_02038BE8: @ 2038BE8
-	.space 0x4
-
-gUnknown_02038BEC: @ 2038BEC
-	.space 0x4
-
-gUnknown_02038BF0: @ 2038BF0
-	.space 0x4
-
-gUnknown_02038BF4: @ 2038BF4
-	.space 0x4
-
-gUnknown_02038BF8: @ 2038BF8
-	.space 0x1
-
-gUnknown_02038BF9: @ 2038BF9
-	.space 0x3
-
-gUnknown_02038BFC: @ 2038BFC
-	.space 0x4
-
+	.include "src/battle_setup.o"
+	.include "src/trainer_see.o"
     .include "src/wild_encounter.o"
 
 gFieldEffectArguments: @ 2038C08
@@ -1103,20 +1054,13 @@ gUnknown_0203AB34: @ 203AB34
 .align 2
 gUnknown_0203AB40: @ 203AB40
 	.space 0x8
+	
+	.include "src/pokeblock.o"
 
-gUnknown_0203AB48: @ 203AB48
-	.space 0x6
-
-gUnknown_0203AB4E: @ 203AB4E
-	.space 0x2
-
-gUnknown_0203AB50: @ 203AB50
-	.space 0x4
-
-gUnknown_0203AB54: @ 203AB54
+gBikeCyclingChallenge: @ 203AB54
 	.space 0x1
 
-gUnknown_0203AB55: @ 203AB55
+gBikeCollisions: @ 203AB55
 	.space 0x3
 
 gUnknown_0203AB58: @ 203AB58
@@ -1188,10 +1132,7 @@ gUnknown_0203AB98: @ 203AB98
 	.space 0x4
 
     .include "src/coins.o"
-    
-    .align 2
-sTransitionStructPtr: @ 203ABA0
-	.space 0x4
+    .include "src/battle_transition.o"
 
 gAbilitiesPerBank: @ 203ABA4
 	.space 0x4
@@ -1245,32 +1186,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
@@ -1332,11 +1248,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