diff options
author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
---|---|---|
committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /graphics | |
parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) |
Merge remote-tracking branch 'upstream/master' into fldeff
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/battle_interface/textbox.png (renamed from graphics/interface/menu.png) | bin | 444 -> 444 bytes | |||
-rw-r--r-- | graphics/battle_interface/textbox_0.pal (renamed from graphics/interface/menu_0.pal) | 0 | ||||
-rw-r--r-- | graphics/battle_interface/textbox_1.pal (renamed from graphics/interface/menu_1.pal) | 0 | ||||
-rw-r--r-- | graphics/battle_interface/textbox_map.bin (renamed from graphics/interface/menu_map.bin) | bin | 4096 -> 4096 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/graphics/interface/menu.png b/graphics/battle_interface/textbox.png Binary files differindex 96f6b8b15..96f6b8b15 100644 --- a/graphics/interface/menu.png +++ b/graphics/battle_interface/textbox.png diff --git a/graphics/interface/menu_0.pal b/graphics/battle_interface/textbox_0.pal index 67e1af896..67e1af896 100644 --- a/graphics/interface/menu_0.pal +++ b/graphics/battle_interface/textbox_0.pal diff --git a/graphics/interface/menu_1.pal b/graphics/battle_interface/textbox_1.pal index 3adc73766..3adc73766 100644 --- a/graphics/interface/menu_1.pal +++ b/graphics/battle_interface/textbox_1.pal diff --git a/graphics/interface/menu_map.bin b/graphics/battle_interface/textbox_map.bin Binary files differindex 8a7b3f1f0..8a7b3f1f0 100644 --- a/graphics/interface/menu_map.bin +++ b/graphics/battle_interface/textbox_map.bin |