diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-10 17:14:44 -0500 |
| commit | 690021476f3ec334e06b0dfc95267114949ecfc7 (patch) | |
| tree | d06cd3f1d45ed0e957f3bede6c0955f1375877c4 /data | |
| parent | 8d658666a14f8364df32d3f14c6923ebe194153e (diff) | |
| parent | d4afe49b06a7ef2422839fcd0340c06c6a8e541b (diff) | |
conflict fix
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/graphics.s b/data/graphics.s index 7792e8a9e..6cc1c2db7 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -4522,7 +4522,7 @@ gPokenavRibbonPokeView_Gfx:: @ 8EA0028 .incbin "graphics/pokenav/ribbon_pokeview.4bpp" .align 2 -gMessageBox_Gfx:: @ 8EA0108 +gDialogueFrame_Gfx:: @ 8EA0108 .incbin "graphics/text_window/message_box.4bpp" .align 2 |