Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move

2018-08-11 19:03:38 -07:00
parent 40cf61307b 2f96282c7f
commit a000eb4f36
6 changed files with 167 additions and 10 deletions
@@ -655,19 +655,14 @@ gUnknown_0203ABB8: @ 203ABB8
 	.space 0x4

    .include "src/save.o"
-    
+
 .space 0x4 /*unused var?*/

 	.include "src/mystery_event_script.o"

-gUnknown_0203BC34: @ 203BC34
-	.space 0x4
-
-gUnknown_0203BC38: @ 203BC38
-	.space 0x8
-
+	.include "src/learn_move.o"
 	.include "src/decoration_inventory.o"
-    .include "src/roamer.o"
+	.include "src/roamer.o"

 gUnknown_0203BC88: @ 203BC88
 	.space 0x4