diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-01-14 22:19:26 +0100 |
| commit | 05aba58d5d5783cb3942349b0a1cc7a19a871d8d (patch) | |
| tree | 8d7e4308d231420bdceb40a565af2fe10b4f58f6 /data/graphics.s | |
| parent | bc1a957674e84daf181c508afd2b623304de121d (diff) | |
| parent | d1630d481a0ff611fda2d70a100eed5046982cec (diff) | |
fix battle transition conflicts
Diffstat (limited to 'data/graphics.s')
| -rw-r--r-- | data/graphics.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/graphics.s b/data/graphics.s index 7cb4b0e54..b16e30c8e 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4476,7 +4476,7 @@ gBerryBlenderArrowTiles:: @ 8DCAB88 .space 0x2C0 .align 2 -gEasyChatCursor_Pal:: +gEasyChatCursor_Pal:: @ 8DCB648 .incbin "graphics/easy_chat/cursor.gbapal" .align 2 @@ -4484,11 +4484,11 @@ gEasyChatCursor_Gfx:: @ 8DCB668 .incbin "graphics/easy_chat/cursor.4bpp.lz" .align 2 -gEasyChatRightWindow_Pal:: +gEasyChatRightWindow_Pal:: @ 8DCB86C .incbin "graphics/easy_chat/rwindow.gbapal" .align 2 -gEasyChatRightWindow_Gfx:: +gEasyChatRightWindow_Gfx:: @ 8DCB88C .incbin "graphics/easy_chat/rwindow.4bpp.lz" .align 2 |