diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 10:38:20 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-19 16:05:19 -0400 |
| commit | 1a0992a2f16ba2026c7fbf9fcfd1576a0f81c329 (patch) | |
| tree | 0981af81f93d33b07cbfe47674d87ae4aa2d46b0 /data | |
| parent | 82ffb336a975fe8cf9c3953fc380339feaae65b3 (diff) | |
| parent | d218d1972a9be5b9d0025a17842239e1fbf5b622 (diff) | |
Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
main.asm
text.asm
text/maps/route_22.asm
Diffstat (limited to 'data')
| -rwxr-xr-x | data/mapObjects/route22.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/mapObjects/route22.asm b/data/mapObjects/route22.asm index cd7e8f46..ac67ed9f 100755 --- a/data/mapObjects/route22.asm +++ b/data/mapObjects/route22.asm @@ -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 |