merge with master

2018-08-12 12:11:35 +02:00
parent e787d5b602 40cf61307b
commit 957dcd01b3
148 changed files with 6964 additions and 11586 deletions
@@ -551,55 +551,7 @@ gPlayerFacingPosition: @ 203AB40
 	.space 0x8
 	
 	.include "src/pokeblock.o"
-
-gBikeCyclingChallenge: @ 203AB54
-	.space 0x1
-
-gBikeCollisions: @ 203AB55
-	.space 0x3
-
-gUnknown_0203AB58: @ 203AB58
-	.space 0x4
-
-gUnknown_0203AB5C: @ 203AB5C
-	.space 0x1
-
-gUnknown_0203AB5D: @ 203AB5D
-	.space 0x1
-
-gUnknown_0203AB5E: @ 203AB5E
-	.space 0x2
-
-gUnknown_0203AB60: @ 203AB60
-	.space 0x2
-
-gUnknown_0203AB62: @ 203AB62
-	.space 0x2
-
-gUnknown_0203AB64: @ 203AB64
-	.space 0x4
-
-gUnknown_0203AB68: @ 203AB68
-	.space 0x2
-
-gUnknown_0203AB6A: @ 203AB6A
-	.space 0x2
-
-gUnknown_0203AB6C: @ 203AB6C
-	.space 0x1
-
-gUnknown_0203AB6D: @ 203AB6D
-	.space 0x1
-
-gUnknown_0203AB6E: @ 203AB6E
-	.space 0x1
-
-gUnknown_0203AB6F: @ 203AB6F
-	.space 0x1
-
-gUnknown_0203AB70: @ 203AB70
-	.space 0x4
-
+	.include "src/field_specials.o"
    .include "src/battle_records.o"

 gUnknown_0203AB7C: @ 203AB7C