Merge pull request #1599 from GriffinRichards/fix-tilemaps

Browse Source

Break up graphics/interface and graphics/misc

...

This commit is contained in:

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

parent a7e6045d71 bd43b905b7

commit 062cdbe01c

No known key found for this signature in database

GPG Key ID: 4AEE18F83AFDEB23

203 changed files with 330 additions and 323 deletions

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

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

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.4 KiB After Width:  |  Height:  |  Size: 1.4 KiB

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 1.6 KiB

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 778 B After Width:  |  Height:  |  Size: 778 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 743 B After Width:  |  Height:  |  Size: 743 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 233 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 184 B After Width:  |  Height:  |  Size: 184 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 548 B After Width:  |  Height:  |  Size: 548 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 212 B After Width:  |  Height:  |  Size: 212 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 135 B After Width:  |  Height:  |  Size: 135 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 326 B After Width:  |  Height:  |  Size: 326 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 257 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 350 B After Width:  |  Height:  |  Size: 350 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 260 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 266 B After Width:  |  Height:  |  Size: 266 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 246 B After Width:  |  Height:  |  Size: 246 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 215 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 249 B After Width:  |  Height:  |  Size: 249 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 289 B After Width:  |  Height:  |  Size: 289 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 257 B After Width:  |  Height:  |  Size: 257 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 259 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 296 B After Width:  |  Height:  |  Size: 296 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 245 B After Width:  |  Height:  |  Size: 245 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 983 B After Width:  |  Height:  |  Size: 983 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 192 B After Width:  |  Height:  |  Size: 192 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 136 B After Width:  |  Height:  |  Size: 136 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 201 B After Width:  |  Height:  |  Size: 201 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 215 B After Width:  |  Height:  |  Size: 215 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.1 KiB After Width:  |  Height:  |  Size: 2.1 KiB

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 194 B After Width:  |  Height:  |  Size: 194 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 87 B After Width:  |  Height:  |  Size: 87 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 2.0 KiB

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

BIN

graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/deoxys_rock_fragment_top_left.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/deoxys_rock_fragment_top_right.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/emotion_exclamation.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/emotion_heart.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/emotion_question.png Normal file

View File

Binary file not shown.

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

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 157 B After Width:  |  Height:  |  Size: 157 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 159 B After Width:  |  Height:  |  Size: 159 B

BIN

graphics/field_effects/pics/hof_monitor_big.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/hof_monitor_small.png Normal file

View File

Binary file not shown.

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

BIN

graphics/field_effects/pics/pokeball_glow.png Normal file

View File

Binary file not shown.

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

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 143 B After Width:  |  Height:  |  Size: 143 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 150 B After Width:  |  Height:  |  Size: 150 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 312 B After Width:  |  Height:  |  Size: 312 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 489 B After Width:  |  Height:  |  Size: 489 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 353 B After Width:  |  Height:  |  Size: 353 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 81 B After Width:  |  Height:  |  Size: 81 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 159 B After Width:  |  Height:  |  Size: 159 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 815 B After Width:  |  Height:  |  Size: 815 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 778 B After Width:  |  Height:  |  Size: 778 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 71 B After Width:  |  Height:  |  Size: 71 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 269 B After Width:  |  Height:  |  Size: 269 B

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 904 B After Width:  |  Height:  |  Size: 904 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 295 B After Width:  |  Height:  |  Size: 295 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 2.0 KiB

0

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

Unescape Escape View File

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.2 KiB After Width:  |  Height:  |  Size: 1.2 KiB

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 412 B After Width:  |  Height:  |  Size: 412 B

0

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

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 461 B

Some files were not shown because too many files have changed in this diff Show More