Merge branch 'master' of https://github.com/huderlem/pokered into pull-data

Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
This commit is contained in:
U-Fish-PC\Daniel 2014-05-19 10:38:20 -04:00
commit 1a0992a2f1
42 changed files with 916 additions and 1155 deletions

View file

@ -346,9 +346,7 @@ Func_21673: ; 21673 (8:5673)
jp Func_214e8
Func_216b3: ; 216b3 (8:56b3)
ld b, BANK(Func_738a1)
ld hl, Func_738a1
call Bankswitch ; indirect jump to Func_738a1 (738a1 (1c:78a1))
callba Func_738a1
jp Func_214e8
Func_216be: ; 216be (8:56be)