diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /data | |
| parent | Fix IsDungeonMap comments (diff) | |
| parent | Remove redundant dimensions in image filenames. (diff) | |
| download | pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.gz pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.tar.xz pokeyellow-286c160c27e58caad32f776cec684eb8cb2cb22a.zip | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'data')
| -rwxr-xr-x | data/sgb_border.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 716a991e..5a0bbb2d 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -55,8 +55,8 @@ ENDC SGBBorderGraphics: ; 72fe8 (1c:6fe8) IF _RED - INCBIN "gfx/red/sgbborder.w128.2bpp" + INCBIN "gfx/red/sgbborder.2bpp" ENDC IF _BLUE - INCBIN "gfx/blue/sgbborder.w128.2bpp" + INCBIN "gfx/blue/sgbborder.2bpp" ENDC |