thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
data/mapObjects/route22.asm
View file

@ -5,7 +5,7 @@ Route22Object: ; 0x50022 (size=27)
db $5, $8, $0, ROUTE_22_GATE
db $1 ; signs
db $b, $7, $3 ; Route22Text3
db $b, $7, $3 ; Route22FrontGateText
db $2 ; people
db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $1 ; person