pokeblock merge conflicts

2017-12-21 23:12:36 +01:00
parent df479661ff a705a863d1
commit bcffcb0c1c
51 changed files with 5037 additions and 1907 deletions
@@ -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