Merge branch 'yenatch/split-predefs-specials-stds' into fix-split-predefs-specials-stds

https://github.com/kanzure/pokecrystal/pull/198
2013-09-09 15:55:43 -05:00
parent 6d7043c0c6 3b119687f3
commit 35324ae43f
3 changed files with 2837 additions and 2643 deletions
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
--- a/main.asm
+++ b/main.asm
--- a/wram.asm
+++ b/wram.asm
@@ -477,7 +477,10 @@ BattleMonType1: ; c64a
 BattleMonType2: ; c64b
 	ds 1

-	ds 23
+	ds 10
+
+OTName: ; c656
+	ds 13

 CurOTMon: ; c663
 	ds 1