Merge branch 'ShiraTheMogul:master' into master

data/pokemon/base_stats/evolotto.asm

@@ -0,0 +1,21 @@
+	db 0 ; species ID placeholder
+
+	db  30,  30,  30,  30, 30,  30
+	;   hp  atk  def  spd  sat  sdf
+
+	db NORMAL, NORMAL ; type
+	db 45 ; catch rate
+	db 64 ; base exp
+	db NO_ITEM, NO_ITEM ; items
+	db GENDER_UNKNOWN ; gender ratio
+	db 100 ; unknown 1
+	db 120 ; step cycles to hatch
+	db 5 ; unknown 2
+	INCBIN "gfx/pokemon/evolotto/front.dimensions"
+	dw NULL, NULL ; unused (beta front/back pics)
+	db GROWTH_FAST ; growth rate
+	dn EGG_NONE, EGG_NONE ; egg groups
+
+	; tm/hm learnset
+	tmhm HIDDEN_POWER
+	; end

data/pokemon/dex_entries/evolotto.asm

@@ -0,0 +1,10 @@
+	db "LOTTERY@" ; species name
+	dw 104, 80 ; height, weight
+	
+	db	 "Only responds to"
+	next "sound and light."
+	next "How it manipula-"
+	
+	page "tes its body is"
+	next "a common resea-"
+	next "rch topic.@"

data/trainers/parties.asm

@@ -108,7 +108,7 @@ JasmineGroup: ; Jasmine is going to use Egg Moves!
 	db 34
 	dw SKARMORY
 	dw DRILL_PECK, SAND_ATTACK, STEEL_WING, LEER
-	db 35 
+	; db 35 
 	; dw SHARPOON
 	; dw IRON_TAIL, BUBBLEBEAM, CRUNCH, SWORDS_DANCE
 	db 35 
@@ -5431,30 +5431,40 @@ KimonoGirlGroup:
 
 	next_list_item ; KIMONO_GIRL (2)
 	db "NAOKO@", TRAINERTYPE_NORMAL
+	db 15
+	dw BELLOSSOM
 	db 17
 	dw FLAREON
 	db -1 ; end
 
 	next_list_item ; KIMONO_GIRL (3)
 	db "SAYO@", TRAINERTYPE_NORMAL
+	db 15
+	dw BELLOSSOM
 	db 17
 	dw ESPEON
 	db -1 ; end
 
 	next_list_item ; KIMONO_GIRL (4)
 	db "ZUKI@", TRAINERTYPE_NORMAL
+	db 15
+	dw BELLOSSOM
 	db 17
 	dw UMBREON
 	db -1 ; end
 
 	next_list_item ; KIMONO_GIRL (5)
 	db "KUNI@", TRAINERTYPE_NORMAL
+	db 15
+	dw BELLOSSOM
 	db 17
 	dw VAPOREON
 	db -1 ; end
 
 	next_list_item ; KIMONO_GIRL (6)
 	db "MIKI@", TRAINERTYPE_NORMAL
+	db 15
+	dw BELLOSSOM
 	db 17
 	dw JOLTEON
 	db -1 ; end