Merge pull request #1599 from GriffinRichards/fix-tilemaps

Browse Source

Break up graphics/interface and graphics/misc

...

This commit is contained in:

GriffinR authored and GitHub committed 2022-01-20 08:53:44 -05:00

2 parents a7e6045d71 bd43b905b7

commit 062cdbe01c

203 files changed

+330 -323

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

graphics/misc/bag.pal → graphics/bag/bag.pal

File renamed without changes.

graphics/misc/bag_female.png → graphics/bag/bag_female.png

File renamed without changes.

graphics/misc/bag_male.png → graphics/bag/bag_male.png

File renamed without changes.

graphics/interface/bag_pyramid.pal → graphics/bag/bag_pyramid.pal

File renamed without changes.

graphics/interface/bag_pyramid.png → graphics/bag/bag_pyramid.png

File renamed without changes.

graphics/interface/berry_tag.bin → graphics/bag/berry_tag.bin

File renamed without changes.

graphics/interface/berry_tag_screen.pal → graphics/bag/berry_tag_screen.pal

File renamed without changes.

graphics/interface/berry_tag_title.bin → graphics/bag/berry_tag_title.bin

File renamed without changes.

graphics/interface/check_berry.pal → graphics/bag/check_berry.pal

File renamed without changes.

graphics/interface/check_berry.png → graphics/bag/check_berry.png

File renamed without changes.

graphics/interface/check_berry_circle.png → graphics/bag/check_berry_circle.png

File renamed without changes.

graphics/interface/hm.png → graphics/bag/hm.png

File renamed without changes.

graphics/interface/bag_screen_tilemap.bin → graphics/bag/menu.bin

File renamed without changes.

graphics/interface/bag_screen.png → graphics/bag/menu.png

File renamed without changes.

graphics/interface/bag_screen_female.pal → graphics/bag/menu_female.pal

File renamed without changes.

graphics/interface/bag_screen_male.pal → graphics/bag/menu_male.pal

File renamed without changes.

graphics/interface/bag_pyramid_tilemap.bin → graphics/bag/menu_pyramid.bin

File renamed without changes.

graphics/interface/bag_pyramid_interface.pal → graphics/bag/menu_pyramid.pal

File renamed without changes.

graphics/interface/bag_spinner.png → graphics/bag/rotating_ball.png

File renamed without changes.

graphics/interface/select_button.png → graphics/bag/select_button.png

File renamed without changes.

graphics/interface/ball/dive.png → graphics/balls/dive.png

File renamed without changes.

graphics/interface/ball/great.png → graphics/balls/great.png

File renamed without changes.

graphics/interface/ball/luxury.png → graphics/balls/luxury.png

File renamed without changes.

graphics/interface/ball/master.png → graphics/balls/master.png

File renamed without changes.

graphics/interface/ball/nest.png → graphics/balls/nest.png

File renamed without changes.

graphics/interface/ball/net.png → graphics/balls/net.png

File renamed without changes.

graphics/interface/ball_open.png → graphics/balls/open.png

File renamed without changes.

graphics/interface/ball/poke.png → graphics/balls/poke.png

File renamed without changes.

graphics/interface/ball/premier.png → graphics/balls/premier.png

File renamed without changes.

graphics/interface/ball/repeat.png → graphics/balls/repeat.png

File renamed without changes.

graphics/interface/ball/safari.png → graphics/balls/safari.png

File renamed without changes.

graphics/interface/ball/timer.png → graphics/balls/timer.png

File renamed without changes.

graphics/interface/ball/ultra.png → graphics/balls/ultra.png

File renamed without changes.

graphics/battle_frontier/tourney_line_mask_map.bin → graphics/battle_frontier/tourney_tree.bin

File renamed without changes.

graphics/battle_frontier/tourney_bg.png → graphics/battle_frontier/tourney_tree.png

File renamed without changes.

graphics/interface/hpbar_anim.png → graphics/battle_interface/hpbar_anim_unused.png

File renamed without changes.

graphics/interface/party_menu_hpbar.png → graphics/battle_interface/hpbar_unused.png

File renamed without changes.

graphics/interface/numbers1.png → graphics/battle_interface/numbers1.png

File renamed without changes.

graphics/interface/numbers2.png → graphics/battle_interface/numbers2.png

File renamed without changes.

graphics/battle_frontier/text_pp.pal → graphics/battle_interface/text_pp.pal

File renamed without changes.

graphics/berry_crush/crusher.bin → graphics/berry_crush/text_windows.bin

File renamed without changes.

graphics/unused/intro_birch_beauty.png → graphics/birch_speech/unused_beauty.png

File renamed without changes.

graphics/misc/cave_transition_black.pal → graphics/cave_transition/black.pal

File renamed without changes.

graphics/misc/cave_transition_enter.pal → graphics/cave_transition/enter.pal

File renamed without changes.

graphics/misc/cave_transition_exit.pal → graphics/cave_transition/exit.pal

File renamed without changes.

graphics/misc/cave_transition_map.bin → graphics/cave_transition/tilemap.bin

File renamed without changes.

graphics/misc/cave_transition.png → graphics/cave_transition/tiles.png

File renamed without changes.

graphics/misc/cave_transition_white.pal → graphics/cave_transition/white.pal

File renamed without changes.

graphics/misc/decoration_putting_away_cursor.png → graphics/decorations/put_away_cursor.png

File renamed without changes.

graphics/misc/diploma_hoenn.pal → graphics/diploma/hoenn.pal

File renamed without changes.

graphics/misc/diploma_national.pal → graphics/diploma/national.pal

File renamed without changes.

graphics/misc/diploma_map.bin → graphics/diploma/tilemap.bin

File renamed without changes.

graphics/misc/diploma.png → graphics/diploma/tiles.png

File renamed without changes.

graphics/misc/deoxys1.pal → graphics/field_effects/palettes/deoxys_rock_1.pal

File renamed without changes.

graphics/misc/deoxys10.pal → graphics/field_effects/palettes/deoxys_rock_10.pal

File renamed without changes.

graphics/misc/deoxys11.pal → graphics/field_effects/palettes/deoxys_rock_11.pal

File renamed without changes.

graphics/misc/deoxys2.pal → graphics/field_effects/palettes/deoxys_rock_2.pal

File renamed without changes.

graphics/misc/deoxys3.pal → graphics/field_effects/palettes/deoxys_rock_3.pal

File renamed without changes.

graphics/misc/deoxys4.pal → graphics/field_effects/palettes/deoxys_rock_4.pal

File renamed without changes.

graphics/misc/deoxys5.pal → graphics/field_effects/palettes/deoxys_rock_5.pal

File renamed without changes.

graphics/misc/deoxys6.pal → graphics/field_effects/palettes/deoxys_rock_6.pal

File renamed without changes.

graphics/misc/deoxys7.pal → graphics/field_effects/palettes/deoxys_rock_7.pal

File renamed without changes.

graphics/misc/deoxys8.pal → graphics/field_effects/palettes/deoxys_rock_8.pal

File renamed without changes.

graphics/misc/deoxys9.pal → graphics/field_effects/palettes/deoxys_rock_9.pal

File renamed without changes.

graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 155 B

graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 146 B

graphics/field_effects/pics/deoxys_rock_fragment_top_left.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 157 B

graphics/field_effects/pics/deoxys_rock_fragment_top_right.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 157 B

graphics/field_effects/pics/emotion_exclamation.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 166 B

graphics/field_effects/pics/emotion_heart.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 183 B

graphics/field_effects/pics/emotion_question.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 175 B

graphics/misc/field_move_streaks_map.bin → graphics/field_effects/pics/field_move_streaks.bin

File renamed without changes.

graphics/misc/field_move_streaks.png → graphics/field_effects/pics/field_move_streaks.png

File renamed without changes.

graphics/misc/darkness_field_move_streaks_map.bin → graphics/field_effects/pics/field_move_streaks_indoors.bin

File renamed without changes.

graphics/misc/darkness_field_move_streaks.png → graphics/field_effects/pics/field_move_streaks_indoors.png

File renamed without changes.

graphics/field_effects/pics/hof_monitor_big.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 189 B

graphics/field_effects/pics/hof_monitor_small.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 236 B

graphics/field_effects/pics/pokeball_glow.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 155 B

graphics/misc/pokecenter_monitor/0.png → graphics/field_effects/pics/pokecenter_monitor/0.png

File renamed without changes.

graphics/misc/pokecenter_monitor/1.png → graphics/field_effects/pics/pokecenter_monitor/1.png

File renamed without changes.

graphics/misc/spotlight.png → graphics/field_effects/pics/spotlight.png

File renamed without changes.

graphics/misc/main_menu_bg.pal → graphics/interface/main_menu_bg.pal

File renamed without changes.

graphics/misc/main_menu_text.pal → graphics/interface/main_menu_text.pal

File renamed without changes.

graphics/misc/mon_markings.png → graphics/interface/mon_markings.png

File renamed without changes.

graphics/misc/mon_markings_menu.png → graphics/interface/mon_markings_menu.png

File renamed without changes.

graphics/misc/option_menu_equals_sign.png → graphics/interface/option_menu_equals_sign.png

File renamed without changes.

graphics/misc/option_menu_text.pal → graphics/interface/option_menu_text.pal

File renamed without changes.

graphics/interface/bag_swap.png → graphics/interface/swap_line.png

File renamed without changes.

graphics/minigame_countdown/321start.png → graphics/link/321start.png

File renamed without changes.

graphics/minigame_countdown/321start_static.png → graphics/link/321start_static.png

File renamed without changes.

graphics/interface/comm_error_bg.png → graphics/link/comm_error_bg.png

File renamed without changes.

graphics/interface/link_test_digits.png → graphics/link/test_digits.png

File renamed without changes.

graphics/interface/wireless_link_display.bin → graphics/link/wireless_display.bin

File renamed without changes.

graphics/interface/wireless_link_display.png → graphics/link/wireless_display.png

File renamed without changes.

graphics/interface/wireless_link_icon.png → graphics/link/wireless_icon.png

File renamed without changes.

graphics/interface/wireless_info_screen.bin → graphics/link/wireless_info_screen.bin

File renamed without changes.

graphics/interface/wireless_info_screen.pal → graphics/link/wireless_info_screen.pal

File renamed without changes.

graphics/interface/wireless_info_screen.png → graphics/link/wireless_info_screen.png

File renamed without changes.

graphics/interface/map_popup/brick.png → graphics/map_popup/brick.png

File renamed without changes.

graphics/interface/map_popup/brick_outline.png → graphics/map_popup/brick_outline.png

File renamed without changes.

Loaded 100 of 203 files, more files were not shown because too many files have changed in this diff. Show more