pret · GriffinRichards · Jan 20, 2022 · Jan 11, 2022 · Jan 11, 2022 · Jan 11, 2022
diff --git a/graphics/misc/bag.pal → graphics/bag/bag.pal b/graphics/misc/bag.pal → graphics/bag/bag.pal
diff --git a/graphics/misc/bag_female.png → graphics/bag/bag_female.png b/graphics/misc/bag_female.png → graphics/bag/bag_female.png
diff --git a/graphics/misc/bag_male.png → graphics/bag/bag_male.png b/graphics/misc/bag_male.png → graphics/bag/bag_male.png
diff --git a/graphics/interface/bag_pyramid.pal → graphics/bag/bag_pyramid.pal b/graphics/interface/bag_pyramid.pal → graphics/bag/bag_pyramid.pal
diff --git a/graphics/interface/bag_pyramid.png → graphics/bag/bag_pyramid.png b/graphics/interface/bag_pyramid.png → graphics/bag/bag_pyramid.png
diff --git a/graphics/interface/berry_tag.bin → graphics/bag/berry_tag.bin b/graphics/interface/berry_tag.bin → graphics/bag/berry_tag.bin
diff --git a/graphics/interface/berry_tag_screen.pal → graphics/bag/berry_tag_screen.pal b/graphics/interface/berry_tag_screen.pal → graphics/bag/berry_tag_screen.pal
diff --git a/graphics/interface/berry_tag_title.bin → graphics/bag/berry_tag_title.bin b/graphics/interface/berry_tag_title.bin → graphics/bag/berry_tag_title.bin
diff --git a/graphics/interface/check_berry.pal → graphics/bag/check_berry.pal b/graphics/interface/check_berry.pal → graphics/bag/check_berry.pal
diff --git a/graphics/interface/check_berry.png → graphics/bag/check_berry.png b/graphics/interface/check_berry.png → graphics/bag/check_berry.png
diff --git a/graphics/interface/check_berry_circle.png → graphics/bag/check_berry_circle.png b/graphics/interface/check_berry_circle.png → graphics/bag/check_berry_circle.png
diff --git a/graphics/interface/hm.png → graphics/bag/hm.png b/graphics/interface/hm.png → graphics/bag/hm.png
diff --git a/graphics/interface/bag_screen_tilemap.bin → graphics/bag/menu.bin b/graphics/interface/bag_screen_tilemap.bin → graphics/bag/menu.bin
diff --git a/graphics/interface/bag_screen.png → graphics/bag/menu.png b/graphics/interface/bag_screen.png → graphics/bag/menu.png
diff --git a/graphics/interface/bag_screen_female.pal → graphics/bag/menu_female.pal b/graphics/interface/bag_screen_female.pal → graphics/bag/menu_female.pal
diff --git a/graphics/interface/bag_screen_male.pal → graphics/bag/menu_male.pal b/graphics/interface/bag_screen_male.pal → graphics/bag/menu_male.pal
diff --git a/graphics/interface/bag_pyramid_tilemap.bin → graphics/bag/menu_pyramid.bin b/graphics/interface/bag_pyramid_tilemap.bin → graphics/bag/menu_pyramid.bin
diff --git a/graphics/interface/bag_pyramid_interface.pal → graphics/bag/menu_pyramid.pal b/graphics/interface/bag_pyramid_interface.pal → graphics/bag/menu_pyramid.pal
diff --git a/graphics/interface/bag_spinner.png → graphics/bag/rotating_ball.png b/graphics/interface/bag_spinner.png → graphics/bag/rotating_ball.png
diff --git a/graphics/interface/select_button.png → graphics/bag/select_button.png b/graphics/interface/select_button.png → graphics/bag/select_button.png
diff --git a/graphics/interface/ball/dive.png → graphics/balls/dive.png b/graphics/interface/ball/dive.png → graphics/balls/dive.png
diff --git a/graphics/interface/ball/great.png → graphics/balls/great.png b/graphics/interface/ball/great.png → graphics/balls/great.png
diff --git a/graphics/interface/ball/luxury.png → graphics/balls/luxury.png b/graphics/interface/ball/luxury.png → graphics/balls/luxury.png
diff --git a/graphics/interface/ball/master.png → graphics/balls/master.png b/graphics/interface/ball/master.png → graphics/balls/master.png
diff --git a/graphics/interface/ball/nest.png → graphics/balls/nest.png b/graphics/interface/ball/nest.png → graphics/balls/nest.png
diff --git a/graphics/interface/ball/net.png → graphics/balls/net.png b/graphics/interface/ball/net.png → graphics/balls/net.png
diff --git a/graphics/interface/ball_open.png → graphics/balls/open.png b/graphics/interface/ball_open.png → graphics/balls/open.png
diff --git a/graphics/interface/ball/poke.png → graphics/balls/poke.png b/graphics/interface/ball/poke.png → graphics/balls/poke.png
diff --git a/graphics/interface/ball/premier.png → graphics/balls/premier.png b/graphics/interface/ball/premier.png → graphics/balls/premier.png
diff --git a/graphics/interface/ball/repeat.png → graphics/balls/repeat.png b/graphics/interface/ball/repeat.png → graphics/balls/repeat.png
diff --git a/graphics/interface/ball/safari.png → graphics/balls/safari.png b/graphics/interface/ball/safari.png → graphics/balls/safari.png
diff --git a/graphics/interface/ball/timer.png → graphics/balls/timer.png b/graphics/interface/ball/timer.png → graphics/balls/timer.png
diff --git a/graphics/interface/ball/ultra.png → graphics/balls/ultra.png b/graphics/interface/ball/ultra.png → graphics/balls/ultra.png
diff --git a/...battle_frontier/tourney_line_mask_map.bin → graphics/battle_frontier/tourney_tree.bin b/...battle_frontier/tourney_line_mask_map.bin → graphics/battle_frontier/tourney_tree.bin
diff --git a/graphics/battle_frontier/tourney_bg.png → graphics/battle_frontier/tourney_tree.png b/graphics/battle_frontier/tourney_bg.png → graphics/battle_frontier/tourney_tree.png
diff --git a/graphics/interface/hpbar_anim.png → ...cs/battle_interface/hpbar_anim_unused.png b/graphics/interface/hpbar_anim.png → ...cs/battle_interface/hpbar_anim_unused.png
diff --git a/graphics/interface/party_menu_hpbar.png → graphics/battle_interface/hpbar_unused.png b/graphics/interface/party_menu_hpbar.png → graphics/battle_interface/hpbar_unused.png
diff --git a/graphics/interface/numbers1.png → graphics/battle_interface/numbers1.png b/graphics/interface/numbers1.png → graphics/battle_interface/numbers1.png
diff --git a/graphics/interface/numbers2.png → graphics/battle_interface/numbers2.png b/graphics/interface/numbers2.png → graphics/battle_interface/numbers2.png
diff --git a/graphics/battle_frontier/text_pp.pal → graphics/battle_interface/text_pp.pal b/graphics/battle_frontier/text_pp.pal → graphics/battle_interface/text_pp.pal
diff --git a/graphics/berry_crush/crusher.bin → graphics/berry_crush/text_windows.bin b/graphics/berry_crush/crusher.bin → graphics/berry_crush/text_windows.bin
diff --git a/graphics/unused/intro_birch_beauty.png → graphics/birch_speech/unused_beauty.png b/graphics/unused/intro_birch_beauty.png → graphics/birch_speech/unused_beauty.png
diff --git a/graphics/misc/cave_transition_black.pal → graphics/cave_transition/black.pal b/graphics/misc/cave_transition_black.pal → graphics/cave_transition/black.pal
diff --git a/graphics/misc/cave_transition_enter.pal → graphics/cave_transition/enter.pal b/graphics/misc/cave_transition_enter.pal → graphics/cave_transition/enter.pal
diff --git a/graphics/misc/cave_transition_exit.pal → graphics/cave_transition/exit.pal b/graphics/misc/cave_transition_exit.pal → graphics/cave_transition/exit.pal
diff --git a/graphics/misc/cave_transition_map.bin → graphics/cave_transition/tilemap.bin b/graphics/misc/cave_transition_map.bin → graphics/cave_transition/tilemap.bin
diff --git a/graphics/misc/cave_transition.png → graphics/cave_transition/tiles.png b/graphics/misc/cave_transition.png → graphics/cave_transition/tiles.png
diff --git a/graphics/misc/cave_transition_white.pal → graphics/cave_transition/white.pal b/graphics/misc/cave_transition_white.pal → graphics/cave_transition/white.pal
diff --git a/...s/misc/decoration_putting_away_cursor.png → graphics/decorations/put_away_cursor.png b/...s/misc/decoration_putting_away_cursor.png → graphics/decorations/put_away_cursor.png
diff --git a/graphics/misc/diploma_hoenn.pal → graphics/diploma/hoenn.pal b/graphics/misc/diploma_hoenn.pal → graphics/diploma/hoenn.pal
diff --git a/graphics/misc/diploma_national.pal → graphics/diploma/national.pal b/graphics/misc/diploma_national.pal → graphics/diploma/national.pal
diff --git a/graphics/misc/diploma_map.bin → graphics/diploma/tilemap.bin b/graphics/misc/diploma_map.bin → graphics/diploma/tilemap.bin
diff --git a/graphics/misc/diploma.png → graphics/diploma/tiles.png b/graphics/misc/diploma.png → graphics/diploma/tiles.png
diff --git a/graphics/misc/deoxys1.pal → .../field_effects/palettes/deoxys_rock_1.pal b/graphics/misc/deoxys1.pal → .../field_effects/palettes/deoxys_rock_1.pal
diff --git a/graphics/misc/deoxys10.pal → ...field_effects/palettes/deoxys_rock_10.pal b/graphics/misc/deoxys10.pal → ...field_effects/palettes/deoxys_rock_10.pal
diff --git a/graphics/misc/deoxys11.pal → ...field_effects/palettes/deoxys_rock_11.pal b/graphics/misc/deoxys11.pal → ...field_effects/palettes/deoxys_rock_11.pal
diff --git a/graphics/misc/deoxys2.pal → .../field_effects/palettes/deoxys_rock_2.pal b/graphics/misc/deoxys2.pal → .../field_effects/palettes/deoxys_rock_2.pal
diff --git a/graphics/misc/deoxys3.pal → .../field_effects/palettes/deoxys_rock_3.pal b/graphics/misc/deoxys3.pal → .../field_effects/palettes/deoxys_rock_3.pal
diff --git a/graphics/misc/deoxys4.pal → .../field_effects/palettes/deoxys_rock_4.pal b/graphics/misc/deoxys4.pal → .../field_effects/palettes/deoxys_rock_4.pal
diff --git a/graphics/misc/deoxys5.pal → .../field_effects/palettes/deoxys_rock_5.pal b/graphics/misc/deoxys5.pal → .../field_effects/palettes/deoxys_rock_5.pal
diff --git a/graphics/misc/deoxys6.pal → .../field_effects/palettes/deoxys_rock_6.pal b/graphics/misc/deoxys6.pal → .../field_effects/palettes/deoxys_rock_6.pal
diff --git a/graphics/misc/deoxys7.pal → .../field_effects/palettes/deoxys_rock_7.pal b/graphics/misc/deoxys7.pal → .../field_effects/palettes/deoxys_rock_7.pal
diff --git a/graphics/misc/deoxys8.pal → .../field_effects/palettes/deoxys_rock_8.pal b/graphics/misc/deoxys8.pal → .../field_effects/palettes/deoxys_rock_8.pal
diff --git a/graphics/misc/deoxys9.pal → .../field_effects/palettes/deoxys_rock_9.pal b/graphics/misc/deoxys9.pal → .../field_effects/palettes/deoxys_rock_9.pal
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_left.png
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_bottom_right.png
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_left.png
diff --git a/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png b/graphics/field_effects/pics/deoxys_rock_fragment_top_right.png
diff --git a/graphics/field_effects/pics/emotion_exclamation.png b/graphics/field_effects/pics/emotion_exclamation.png
diff --git a/graphics/field_effects/pics/emotion_heart.png b/graphics/field_effects/pics/emotion_heart.png
diff --git a/graphics/field_effects/pics/emotion_question.png b/graphics/field_effects/pics/emotion_question.png
diff --git a/graphics/misc/field_move_streaks_map.bin → ...field_effects/pics/field_move_streaks.bin b/graphics/misc/field_move_streaks_map.bin → ...field_effects/pics/field_move_streaks.bin
diff --git a/graphics/misc/field_move_streaks.png → ...field_effects/pics/field_move_streaks.png b/graphics/misc/field_move_streaks.png → ...field_effects/pics/field_move_streaks.png
diff --git a/.../misc/darkness_field_move_streaks_map.bin → ...fects/pics/field_move_streaks_indoors.bin b/.../misc/darkness_field_move_streaks_map.bin → ...fects/pics/field_move_streaks_indoors.bin
diff --git a/...hics/misc/darkness_field_move_streaks.png → ...fects/pics/field_move_streaks_indoors.png b/...hics/misc/darkness_field_move_streaks.png → ...fects/pics/field_move_streaks_indoors.png
diff --git a/graphics/field_effects/pics/hof_monitor_big.png b/graphics/field_effects/pics/hof_monitor_big.png
diff --git a/graphics/field_effects/pics/hof_monitor_small.png b/graphics/field_effects/pics/hof_monitor_small.png
diff --git a/graphics/field_effects/pics/pokeball_glow.png b/graphics/field_effects/pics/pokeball_glow.png
diff --git a/graphics/misc/pokecenter_monitor/0.png → ...eld_effects/pics/pokecenter_monitor/0.png b/graphics/misc/pokecenter_monitor/0.png → ...eld_effects/pics/pokecenter_monitor/0.png
diff --git a/graphics/misc/pokecenter_monitor/1.png → ...eld_effects/pics/pokecenter_monitor/1.png b/graphics/misc/pokecenter_monitor/1.png → ...eld_effects/pics/pokecenter_monitor/1.png
diff --git a/graphics/misc/spotlight.png → graphics/field_effects/pics/spotlight.png b/graphics/misc/spotlight.png → graphics/field_effects/pics/spotlight.png
diff --git a/graphics/misc/main_menu_bg.pal → graphics/interface/main_menu_bg.pal b/graphics/misc/main_menu_bg.pal → graphics/interface/main_menu_bg.pal
diff --git a/graphics/misc/main_menu_text.pal → graphics/interface/main_menu_text.pal b/graphics/misc/main_menu_text.pal → graphics/interface/main_menu_text.pal
diff --git a/graphics/misc/mon_markings.png → graphics/interface/mon_markings.png b/graphics/misc/mon_markings.png → graphics/interface/mon_markings.png
diff --git a/graphics/misc/mon_markings_menu.png → graphics/interface/mon_markings_menu.png b/graphics/misc/mon_markings_menu.png → graphics/interface/mon_markings_menu.png
diff --git a/graphics/misc/option_menu_equals_sign.png → ...ics/interface/option_menu_equals_sign.png b/graphics/misc/option_menu_equals_sign.png → ...ics/interface/option_menu_equals_sign.png
diff --git a/graphics/misc/option_menu_text.pal → graphics/interface/option_menu_text.pal b/graphics/misc/option_menu_text.pal → graphics/interface/option_menu_text.pal
diff --git a/graphics/interface/bag_swap.png → graphics/interface/swap_line.png b/graphics/interface/bag_swap.png → graphics/interface/swap_line.png
diff --git a/graphics/minigame_countdown/321start.png → graphics/link/321start.png b/graphics/minigame_countdown/321start.png → graphics/link/321start.png
diff --git a/...cs/minigame_countdown/321start_static.png → graphics/link/321start_static.png b/...cs/minigame_countdown/321start_static.png → graphics/link/321start_static.png
diff --git a/graphics/interface/comm_error_bg.png → graphics/link/comm_error_bg.png b/graphics/interface/comm_error_bg.png → graphics/link/comm_error_bg.png
diff --git a/graphics/interface/link_test_digits.png → graphics/link/test_digits.png b/graphics/interface/link_test_digits.png → graphics/link/test_digits.png
diff --git a/graphics/interface/wireless_link_display.bin → graphics/link/wireless_display.bin b/graphics/interface/wireless_link_display.bin → graphics/link/wireless_display.bin
diff --git a/graphics/interface/wireless_link_display.png → graphics/link/wireless_display.png b/graphics/interface/wireless_link_display.png → graphics/link/wireless_display.png
diff --git a/graphics/interface/wireless_link_icon.png → graphics/link/wireless_icon.png b/graphics/interface/wireless_link_icon.png → graphics/link/wireless_icon.png
diff --git a/graphics/interface/wireless_info_screen.bin → graphics/link/wireless_info_screen.bin b/graphics/interface/wireless_info_screen.bin → graphics/link/wireless_info_screen.bin
diff --git a/graphics/interface/wireless_info_screen.pal → graphics/link/wireless_info_screen.pal b/graphics/interface/wireless_info_screen.pal → graphics/link/wireless_info_screen.pal
diff --git a/graphics/interface/wireless_info_screen.png → graphics/link/wireless_info_screen.png b/graphics/interface/wireless_info_screen.png → graphics/link/wireless_info_screen.png
diff --git a/graphics/interface/map_popup/brick.png → graphics/map_popup/brick.png b/graphics/interface/map_popup/brick.png → graphics/map_popup/brick.png
diff --git a/...ics/interface/map_popup/brick_outline.png → graphics/map_popup/brick_outline.png b/...ics/interface/map_popup/brick_outline.png → graphics/map_popup/brick_outline.png
diff --git a/graphics/interface/map_popup/marble.png → graphics/map_popup/marble.png b/graphics/interface/map_popup/marble.png → graphics/map_popup/marble.png
diff --git a/...cs/interface/map_popup/marble_outline.png → graphics/map_popup/marble_outline.png b/...cs/interface/map_popup/marble_outline.png → graphics/map_popup/marble_outline.png
diff --git a/graphics/interface/map_popup/stone.png → graphics/map_popup/stone.png b/graphics/interface/map_popup/stone.png → graphics/map_popup/stone.png
diff --git a/graphics/interface/map_popup/stone2.png → graphics/map_popup/stone2.png b/graphics/interface/map_popup/stone2.png → graphics/map_popup/stone2.png
diff --git a/...cs/interface/map_popup/stone2_outline.png → graphics/map_popup/stone2_outline.png b/...cs/interface/map_popup/stone2_outline.png → graphics/map_popup/stone2_outline.png
diff --git a/...ics/interface/map_popup/stone_outline.png → graphics/map_popup/stone_outline.png b/...ics/interface/map_popup/stone_outline.png → graphics/map_popup/stone_outline.png
diff --git a/graphics/interface/map_popup/underwater.pal → graphics/map_popup/underwater.pal b/graphics/interface/map_popup/underwater.pal → graphics/map_popup/underwater.pal
diff --git a/graphics/interface/map_popup/underwater.png → graphics/map_popup/underwater.png b/graphics/interface/map_popup/underwater.png → graphics/map_popup/underwater.png
diff --git a/...nterface/map_popup/underwater_outline.png → graphics/map_popup/underwater_outline.png b/...nterface/map_popup/underwater_outline.png → graphics/map_popup/underwater_outline.png
diff --git a/graphics/interface/map_popup/wood.png → graphics/map_popup/wood.png b/graphics/interface/map_popup/wood.png → graphics/map_popup/wood.png
diff --git a/...hics/interface/map_popup/wood_outline.png → graphics/map_popup/wood_outline.png b/...hics/interface/map_popup/wood_outline.png → graphics/map_popup/wood_outline.png
diff --git a/graphics/misc/deoxys_rock_fragment_bottom_left.png b/graphics/misc/deoxys_rock_fragment_bottom_left.png
diff --git a/graphics/misc/deoxys_rock_fragment_bottom_right.png b/graphics/misc/deoxys_rock_fragment_bottom_right.png
diff --git a/graphics/misc/deoxys_rock_fragment_top_left.png b/graphics/misc/deoxys_rock_fragment_top_left.png
diff --git a/graphics/misc/deoxys_rock_fragment_top_right.png b/graphics/misc/deoxys_rock_fragment_top_right.png
diff --git a/graphics/misc/emotion_exclamation.png b/graphics/misc/emotion_exclamation.png
diff --git a/graphics/misc/emotion_heart.png b/graphics/misc/emotion_heart.png
diff --git a/graphics/misc/emotion_question.png b/graphics/misc/emotion_question.png
diff --git a/graphics/misc/hof_monitor_big.png b/graphics/misc/hof_monitor_big.png
diff --git a/graphics/misc/hof_monitor_small.png b/graphics/misc/hof_monitor_small.png
diff --git a/graphics/misc/pokeball_glow.png b/graphics/misc/pokeball_glow.png
diff --git a/graphics/interface/party_menu_bg.bin → graphics/party_menu/bg.bin b/graphics/interface/party_menu_bg.bin → graphics/party_menu/bg.bin
diff --git a/graphics/interface/party_menu_bg.pal → graphics/party_menu/bg.pal b/graphics/interface/party_menu_bg.pal → graphics/party_menu/bg.pal
diff --git a/graphics/interface/party_menu_bg.png → graphics/party_menu/bg.png b/graphics/interface/party_menu_bg.png → graphics/party_menu/bg.png
diff --git a/...cs/interface/party_menu_cancel_button.bin → graphics/party_menu/cancel_button.bin b/...cs/interface/party_menu_cancel_button.bin → graphics/party_menu/cancel_button.bin
diff --git a/...s/interface/party_menu_confirm_button.bin → graphics/party_menu/confirm_button.bin b/...s/interface/party_menu_confirm_button.bin → graphics/party_menu/confirm_button.bin
diff --git a/graphics/interface/hold_icons.png → graphics/party_menu/hold_icons.png b/graphics/interface/hold_icons.png → graphics/party_menu/hold_icons.png
diff --git a/graphics/interface/party_menu_pokeball.png → graphics/party_menu/pokeball.png b/graphics/interface/party_menu_pokeball.png → graphics/party_menu/pokeball.png
diff --git a/...s/interface/party_menu_pokeball_small.png → graphics/party_menu/pokeball_small.png b/...s/interface/party_menu_pokeball_small.png → graphics/party_menu/pokeball_small.png
diff --git a/graphics/interface/pokeblock_device.png → graphics/pokeblock/device.png b/graphics/interface/pokeblock_device.png → graphics/pokeblock/device.png
diff --git a/...cs/interface/pokeblock_feeding_bg_map.bin → graphics/pokeblock/feeding_bg.bin b/...cs/interface/pokeblock_feeding_bg_map.bin → graphics/pokeblock/feeding_bg.bin
diff --git a/graphics/interface/pokeblock.bin → graphics/pokeblock/menu.bin b/graphics/interface/pokeblock.bin → graphics/pokeblock/menu.bin
diff --git a/graphics/interface/pokeblock_case_frame.pal → graphics/pokeblock/menu.pal b/graphics/interface/pokeblock_case_frame.pal → graphics/pokeblock/menu.pal
diff --git a/graphics/interface/pokeblock_case_frame.png → graphics/pokeblock/menu.png b/graphics/interface/pokeblock_case_frame.png → graphics/pokeblock/menu.png
diff --git a/graphics/misc/rotating_gate_1.png → graphics/rotating_gates/l1.png b/graphics/misc/rotating_gate_1.png → graphics/rotating_gates/l1.png
diff --git a/graphics/misc/rotating_gate_2.png → graphics/rotating_gates/l2.png b/graphics/misc/rotating_gate_2.png → graphics/rotating_gates/l2.png
diff --git a/graphics/misc/rotating_gate_3.png → graphics/rotating_gates/l3.png b/graphics/misc/rotating_gate_3.png → graphics/rotating_gates/l3.png
diff --git a/graphics/misc/rotating_gate_4.png → graphics/rotating_gates/l4.png b/graphics/misc/rotating_gate_4.png → graphics/rotating_gates/l4.png
diff --git a/graphics/misc/rotating_gate_5.png → graphics/rotating_gates/t1.png b/graphics/misc/rotating_gate_5.png → graphics/rotating_gates/t1.png
diff --git a/graphics/misc/rotating_gate_6.png → graphics/rotating_gates/t2.png b/graphics/misc/rotating_gate_6.png → graphics/rotating_gates/t2.png
diff --git a/graphics/misc/rotating_gate_7.png → graphics/rotating_gates/t3.png b/graphics/misc/rotating_gate_7.png → graphics/rotating_gates/t3.png
diff --git a/graphics/misc/rotating_gate_8.png → graphics/rotating_gates/t4.png b/graphics/misc/rotating_gate_8.png → graphics/rotating_gates/t4.png
diff --git a/graphics/interface/mart_frame.bin → graphics/shop/menu.bin b/graphics/interface/mart_frame.bin → graphics/shop/menu.bin
diff --git a/graphics/interface/mart_frame.png → graphics/shop/menu.png b/graphics/interface/mart_frame.png → graphics/shop/menu.png
diff --git a/graphics/interface/money.png → graphics/shop/money.png b/graphics/interface/money.png → graphics/shop/money.png
diff --git a/graphics/misc/birch_bag_map.bin → graphics/starter_choose/birch_bag.bin b/graphics/misc/birch_bag_map.bin → graphics/starter_choose/birch_bag.bin
diff --git a/graphics/misc/birch_bag.png → graphics/starter_choose/birch_bag.png b/graphics/misc/birch_bag.png → graphics/starter_choose/birch_bag.png
diff --git a/graphics/misc/birch_grass_map.bin → graphics/starter_choose/birch_grass.bin b/graphics/misc/birch_grass_map.bin → graphics/starter_choose/birch_grass.bin
diff --git a/graphics/misc/birch_grass.png → graphics/starter_choose/birch_grass.png b/graphics/misc/birch_grass.png → graphics/starter_choose/birch_grass.png
diff --git a/graphics/misc/pokeball_selection.png → ...ics/starter_choose/pokeball_selection.png b/graphics/misc/pokeball_selection.png → ...ics/starter_choose/pokeball_selection.png
diff --git a/graphics/misc/starter_circle.png → graphics/starter_choose/starter_circle.png b/graphics/misc/starter_circle.png → graphics/starter_choose/starter_circle.png
diff --git a/graphics/interface/summary_a_button.png → graphics/summary_screen/a_button.png b/graphics/interface/summary_a_button.png → graphics/summary_screen/a_button.png
diff --git a/graphics/interface/summary_b_button.png → graphics/summary_screen/b_button.png b/graphics/interface/summary_b_button.png → graphics/summary_screen/b_button.png
diff --git a/graphics/interface/powacc_tilemap.bin → graphics/summary_screen/effect_battle.bin b/graphics/interface/powacc_tilemap.bin → graphics/summary_screen/effect_battle.bin
diff --git a/graphics/interface/summary.bin → graphics/summary_screen/effect_cancel.bin b/graphics/interface/summary.bin → graphics/summary_screen/effect_cancel.bin
diff --git a/graphics/interface/appealjam_tilemap.bin → graphics/summary_screen/effect_contest.bin b/graphics/interface/appealjam_tilemap.bin → graphics/summary_screen/effect_contest.bin
diff --git a/graphics/interface/summary_markings.pal → graphics/summary_screen/markings.pal b/graphics/interface/summary_markings.pal → graphics/summary_screen/markings.pal
diff --git a/graphics/interface/summary_frames.png → graphics/summary_screen/move_select.png b/graphics/interface/summary_frames.png → graphics/summary_screen/move_select.png
diff --git a/...s/interface/summary_page_battle_moves.bin → ...hics/summary_screen/page_battle_moves.bin b/...s/interface/summary_page_battle_moves.bin → ...hics/summary_screen/page_battle_moves.bin
diff --git a/.../interface/summary_page_contest_moves.bin → ...ics/summary_screen/page_contest_moves.bin b/.../interface/summary_page_contest_moves.bin → ...ics/summary_screen/page_contest_moves.bin
diff --git a/graphics/interface/summary_page_info.bin → graphics/summary_screen/page_info.bin b/graphics/interface/summary_page_info.bin → graphics/summary_screen/page_info.bin
diff --git a/...hics/interface/summary_page_info_copy.bin → graphics/summary_screen/page_info_egg.bin b/...hics/interface/summary_page_info_copy.bin → graphics/summary_screen/page_info_egg.bin
diff --git a/graphics/interface/summary_page_skills.bin → graphics/summary_screen/page_skills.bin b/graphics/interface/summary_page_skills.bin → graphics/summary_screen/page_skills.bin
diff --git a/graphics/interface/status_tilemap.bin → graphics/summary_screen/status_tilemap.bin b/graphics/interface/status_tilemap.bin → graphics/summary_screen/status_tilemap.bin
diff --git a/graphics/interface/summary_screen.pal → graphics/summary_screen/tiles.pal b/graphics/interface/summary_screen.pal → graphics/summary_screen/tiles.pal
diff --git a/graphics/interface/summary_screen.png → graphics/summary_screen/tiles.png b/graphics/interface/summary_screen.png → graphics/summary_screen/tiles.png
diff --git a/graphics/link/gba.png → graphics/trade/gba.png b/graphics/link/gba.png → graphics/trade/gba.png
diff --git a/graphics/link/gba_pal2.pal → graphics/trade/gba_pal2.pal b/graphics/link/gba_pal2.pal → graphics/trade/gba_pal2.pal
diff --git a/graphics/misc/trainer_hill_ereader.pal → graphics/trainer_hill/ereader.pal b/graphics/misc/trainer_hill_ereader.pal → graphics/trainer_hill/ereader.pal
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
@@ -19,6 +19,7 @@ OBJEVENTGFXDIR := graphics/object_events
 MISCGFXDIR := graphics/misc
 JPCONTESTGFXDIR := graphics/contest/japanese
 POKEDEXGFXDIR := graphics/pokedex
+STARTERGFXDIR := graphics/starter_choose
 
 types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
 contest_types := cool beauty cute smart tough
@@ -371,9 +372,9 @@ $(UNUSEDGFXDIR)/obi2.4bpp: $(UNUSEDGFXDIR)/old_bulbasaur2.4bpp \
                            $(UNUSEDGFXDIR)/old_battle_interface_3.4bpp
 	@cat $^ >$@
 
-$(INTERFACEGFXDIR)/battle_bar.4bpp: $(INTERFACEGFXDIR)/hpbar_anim.4bpp \
-                                    $(INTERFACEGFXDIR)/numbers1.4bpp \
-                                    $(INTERFACEGFXDIR)/numbers2.4bpp
+$(BATINTGFXDIR)/battle_bar.4bpp: $(BATINTGFXDIR)/hpbar_anim_unused.4bpp \
+                                 $(BATINTGFXDIR)/numbers1.4bpp \
+                                 $(BATINTGFXDIR)/numbers2.4bpp
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
@@ -429,7 +430,7 @@ $(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 16
 
-$(INTERFACEGFXDIR)/party_menu_bg.4bpp: %.4bpp: %.png
+graphics/party_menu/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 62
 
 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
@@ -440,7 +441,7 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
                                   $(TYPESGFXDIR)/move_types_3.gbapal
 	@cat $^ >$@
 
-$(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
+graphics/bag/menu.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 53
 
 $(RAYQUAZAGFXDIR)/scene_2/rayquaza.8bpp: %.8bpp: %.png
@@ -501,7 +502,7 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
                                          $(SLOTMACHINEGFXDIR)/reel_time_machine.4bpp
 	@cat $^ >$@
 
-$(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
+graphics/birch_speech/unused_beauty.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 822
 
 
@@ -707,5 +708,5 @@ $(POKEDEXGFXDIR)/region_map.8bpp: %.8bpp: %.png
 $(POKEDEXGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
 	$(GFX) $< $@ -num_tiles 233
 
-$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
+$(STARTERGFXDIR)/birch_help.4bpp: $(STARTERGFXDIR)/birch_bag.4bpp $(STARTERGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
diff --git a/include/graphics.h b/include/graphics.h
@@ -5,31 +5,31 @@
 extern const u32 gMessageBox_Gfx[];
 extern const u16 gMessageBox_Pal[];
 
-// interface pokeballs
-extern const u32 gInterfaceGfx_PokeBall[];
-extern const u32 gInterfacePal_PokeBall[];
-extern const u32 gInterfaceGfx_GreatBall[];
-extern const u32 gInterfacePal_GreatBall[];
-extern const u32 gInterfaceGfx_SafariBall[];
-extern const u32 gInterfacePal_SafariBall[];
-extern const u32 gInterfaceGfx_UltraBall[];
-extern const u32 gInterfacePal_UltraBall[];
-extern const u32 gInterfaceGfx_MasterBall[];
-extern const u32 gInterfacePal_MasterBall[];
-extern const u32 gInterfaceGfx_NetBall[];
-extern const u32 gInterfacePal_NetBall[];
-extern const u32 gInterfaceGfx_DiveBall[];
-extern const u32 gInterfacePal_DiveBall[];
-extern const u32 gInterfaceGfx_NestBall[];
-extern const u32 gInterfacePal_NestBall[];
-extern const u32 gInterfaceGfx_RepeatBall[];
-extern const u32 gInterfacePal_RepeatBall[];
-extern const u32 gInterfaceGfx_TimerBall[];
-extern const u32 gInterfacePal_TimerBall[];
-extern const u32 gInterfaceGfx_LuxuryBall[];
-extern const u32 gInterfacePal_LuxuryBall[];
-extern const u32 gInterfaceGfx_PremierBall[];
-extern const u32 gInterfacePal_PremierBall[];
+// pokeballs
+extern const u32 gBallGfx_Poke[];
+extern const u32 gBallPal_Poke[];
+extern const u32 gBallGfx_Great[];
+extern const u32 gBallPal_Great[];
+extern const u32 gBallGfx_Safari[];
+extern const u32 gBallPal_Safari[];
+extern const u32 gBallGfx_Ultra[];
+extern const u32 gBallPal_Ultra[];
+extern const u32 gBallGfx_Master[];
+extern const u32 gBallPal_Master[];
+extern const u32 gBallGfx_Net[];
+extern const u32 gBallPal_Net[];
+extern const u32 gBallGfx_Dive[];
+extern const u32 gBallPal_Dive[];
+extern const u32 gBallGfx_Nest[];
+extern const u32 gBallPal_Nest[];
+extern const u32 gBallGfx_Repeat[];
+extern const u32 gBallPal_Repeat[];
+extern const u32 gBallGfx_Timer[];
+extern const u32 gBallPal_Timer[];
+extern const u32 gBallGfx_Luxury[];
+extern const u32 gBallPal_Luxury[];
+extern const u32 gBallGfx_Premier[];
+extern const u32 gBallPal_Premier[];
 extern const u32 gOpenPokeballGfx[];
 
 // pokemon gfx
@@ -4035,27 +4035,27 @@ extern const u32 gPokenavRibbonsSummaryBg_Tilemap[];
 extern const u32 gSummaryScreen_Gfx[];
 extern const u32 gSummaryScreen_Pal[];
 extern const u32 gSummaryPage_Info_Tilemap[];
-extern const u32 gSummaryPage_InfoCopy_Tilemap[];
+extern const u32 gSummaryPage_InfoEgg_Tilemap[];
 extern const u32 gSummaryPage_Skills_Tilemap[];
 extern const u32 gSummaryPage_BattleMoves_Tilemap[];
 extern const u32 gSummaryPage_ContestMoves_Tilemap[];
 extern const u16 gPPTextPalette[];
-extern const u16 gSummaryScreenWindow_Tilemap[];
 extern const u32 gMoveTypes_Pal[];
 
-extern const u16 gSummaryScreenPowAcc_Tilemap[];
-extern const u16 gSummaryScreenAppealJam_Tilemap[];
+extern const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[];
+extern const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[];
+extern const u16 gSummaryScreen_MoveEffect_Cancel_Tilemap[];
 
 extern const u32 gMoveTypes_Gfx[];
 extern const u32 gSummaryMoveSelect_Gfx[];
 extern const u32 gSummaryMoveSelect_Pal[];
 extern const u32 gStatusGfx_Icons[];
 extern const u32 gStatusPal_Icons[];
 
-extern const u32 gBuyMenuFrame_Gfx[];
-extern const u32 gBuyMenuFrame_Tilemap[];
-extern const u32 gMenuMoneyGfx[];
-extern const u32 gMenuMoneyPal[];
+extern const u32 gShopMenu_Gfx[];
+extern const u32 gShopMenu_Tilemap[];
+extern const u32 gShopMenu_Pal[];
+extern const u32 gShopMenuMoney_Gfx[];
 
 extern const u32 gBattleInterface_BallStatusBarGfx[];
 extern const u8 gBattleInterface_BallDisplayGfx[];
@@ -4094,8 +4094,8 @@ extern const u32 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 
-extern const u32 gBagSwapLineGfx[];
-extern const u32 gBagSwapLinePal[];
+extern const u32 gSwapLineGfx[];
+extern const u32 gSwapLinePal[];
 
 extern const u32 gBattlePyramidBag_Gfx[];
 extern const u32 gBattlePyramidBag_Pal[];
@@ -4121,11 +4121,11 @@ extern const u32 gDomeTourneyInfoCardBg_Tilemap[];
 extern const u32 gDomeTourneyTree_Pal[];
 extern const u32 gDomeTourneyTreeButtons_Pal[];
 extern const u32 gDomeTourneyMatchCardBg_Pal[];
-extern const u32 gDomeTourneyBg_Gfx[];
+extern const u32 gDomeTourneyTree_Gfx[];
 extern const u32 gDomeTourneyLine_Gfx[];
 extern const u32 gDomeTourneyLineDown_Tilemap[];
 extern const u32 gDomeTourneyLineUp_Tilemap[];
-extern const u32 gDomeTourneyLineMask_Tilemap[];
+extern const u32 gDomeTourneyTree_Tilemap[];
 extern const u32 gDomeTourneyTreeButtons_Gfx[];
 extern const u16 gTilesetAnims_BattleDomePals0_0[];
 extern const u16 gTilesetAnims_BattleDomePals0_1[];
@@ -5002,7 +5002,7 @@ extern const u16 gUsePokeblockCondition_Pal[];
 // Berry Crush
 extern const u32 gBerryCrush_Crusher_Gfx[];
 extern const u16 gBerryCrush_Crusher_Pal[];
-extern const u32 gBerryCrush_Crusher_Tilemap[];
+extern const u32 gBerryCrush_TextWindows_Tilemap[];
 
 // Pokenav
 extern const u32 gPokenavMessageBox_Gfx[];

diff --git a/src/battle_dome.c b/src/battle_dome.c
@@ -5304,10 +5304,10 @@ static void Task_ShowTourneyTree(u8 taskId)
         break;
     case 2:
         sTilemapBuffer = AllocZeroed(BG_SCREEN_SIZE);
-        LZDecompressWram(gDomeTourneyLineMask_Tilemap, sTilemapBuffer);
+        LZDecompressWram(gDomeTourneyTree_Tilemap, sTilemapBuffer);
         SetBgTilemapBuffer(1, sTilemapBuffer);
         CopyBgTilemapBufferToVram(1);
-        DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyBg_Gfx, 0x2000, 0, 0);
+        DecompressAndLoadBgGfxUsingHeap(1, gDomeTourneyTree_Gfx, 0x2000, 0, 0);
         DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLine_Gfx, 0x2000, 0, 0);
         DecompressAndLoadBgGfxUsingHeap(2, gDomeTourneyLineDown_Tilemap, 0x2000, 0, 1);
         DecompressAndLoadBgGfxUsingHeap(3, gDomeTourneyLineUp_Tilemap, 0x2000, 0, 1);

diff --git a/src/berry_crush.c b/src/berry_crush.c
@@ -1947,15 +1947,15 @@ static void DrawPlayerNameWindows(struct BerryCrushGame *game)
 static void CopyPlayerNameWindowGfxToBg(struct BerryCrushGame *game)
 {
     u8 i = 0;
-    u8 * crusherGfx;
+    u8 * windowGfx;
 
-    LZ77UnCompWram(gBerryCrush_Crusher_Tilemap, gDecompressionBuffer);
+    LZ77UnCompWram(gBerryCrush_TextWindows_Tilemap, gDecompressionBuffer);
 
-    for (crusherGfx = gDecompressionBuffer; i < game->playerCount; i++)
+    for (windowGfx = gDecompressionBuffer; i < game->playerCount; i++)
     {
         CopyToBgTilemapBufferRect(
             3,
-            &crusherGfx[game->gfx.playerCoords[i]->playerId * 40],
+            &windowGfx[game->gfx.playerCoords[i]->playerId * 40],
             game->gfx.playerCoords[i]->windowGfxX,
             game->gfx.playerCoords[i]->windowGfxY,
             10,

diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
@@ -92,7 +92,7 @@ static const struct BgTemplate sBackgroundTemplates[] =
   }
 };
 
-static const u16 sFontPalette[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
+static const u16 sFontPalette[] = INCBIN_U16("graphics/bag/berry_tag_screen.gbapal");
 
 static const u8 sTextColors[2][3] =
 {

diff --git a/src/data/graphics/berries.h b/src/data/graphics/berries.h
@@ -1,10 +1,10 @@
-const u32 gBerryCheck_Gfx[] = INCBIN_U32("graphics/interface/check_berry.4bpp.lz");
-const u32 gBerryCheck_Pal[] = INCBIN_U32("graphics/interface/check_berry.gbapal.lz");
+const u32 gBerryCheck_Gfx[] = INCBIN_U32("graphics/bag/check_berry.4bpp.lz");
+const u32 gBerryCheck_Pal[] = INCBIN_U32("graphics/bag/check_berry.gbapal.lz");
 
-const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/interface/berry_tag.bin.lz");
-const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/interface/berry_tag_title.bin.lz");
+const u32 gBerryTag_Gfx[] = INCBIN_U32("graphics/bag/berry_tag.bin.lz");
+const u32 gBerryTag_Pal[] = INCBIN_U32("graphics/bag/berry_tag_title.bin.lz");
 
-const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/interface/check_berry_circle.4bpp.lz");
+const u32 gBerryCheckCircle_Gfx[] = INCBIN_U32("graphics/bag/check_berry_circle.4bpp.lz");
 
 const u32 gBerryPic_Cheri[] = INCBIN_U32("graphics/berries/cheri.4bpp.lz");
 const u32 gBerryPic_Oran[] = INCBIN_U32("graphics/berries/oran.4bpp.lz");

diff --git a/src/data/graphics/interface_pokeballs.h b/src/data/graphics/interface_pokeballs.h
diff --git a/src/data/graphics/pokeballs.h b/src/data/graphics/pokeballs.h
@@ -0,0 +1,37 @@
+const u32 gBallGfx_Poke[] = INCBIN_U32("graphics/balls/poke.4bpp.lz");
+const u32 gBallPal_Poke[] = INCBIN_U32("graphics/balls/poke.gbapal.lz");
+
+const u32 gBallGfx_Great[] = INCBIN_U32("graphics/balls/great.4bpp.lz");
+const u32 gBallPal_Great[] = INCBIN_U32("graphics/balls/great.gbapal.lz");
+
+const u32 gBallGfx_Safari[] = INCBIN_U32("graphics/balls/safari.4bpp.lz");
+const u32 gBallPal_Safari[] = INCBIN_U32("graphics/balls/safari.gbapal.lz");
+
+const u32 gBallGfx_Ultra[] = INCBIN_U32("graphics/balls/ultra.4bpp.lz");
+const u32 gBallPal_Ultra[] = INCBIN_U32("graphics/balls/ultra.gbapal.lz");
+
+const u32 gBallGfx_Master[] = INCBIN_U32("graphics/balls/master.4bpp.lz");
+const u32 gBallPal_Master[] = INCBIN_U32("graphics/balls/master.gbapal.lz");
+
+const u32 gBallGfx_Net[] = INCBIN_U32("graphics/balls/net.4bpp.lz");
+const u32 gBallPal_Net[] = INCBIN_U32("graphics/balls/net.gbapal.lz");
+
+const u32 gBallGfx_Dive[] = INCBIN_U32("graphics/balls/dive.4bpp.lz");
+const u32 gBallPal_Dive[] = INCBIN_U32("graphics/balls/dive.gbapal.lz");
+
+const u32 gBallGfx_Nest[] = INCBIN_U32("graphics/balls/nest.4bpp.lz");
+const u32 gBallPal_Nest[] = INCBIN_U32("graphics/balls/nest.gbapal.lz");
+
+const u32 gBallGfx_Repeat[] = INCBIN_U32("graphics/balls/repeat.4bpp.lz");
+const u32 gBallPal_Repeat[] = INCBIN_U32("graphics/balls/repeat.gbapal.lz");
+
+const u32 gBallGfx_Timer[] = INCBIN_U32("graphics/balls/timer.4bpp.lz");
+const u32 gBallPal_Timer[] = INCBIN_U32("graphics/balls/timer.gbapal.lz");
+
+const u32 gBallGfx_Luxury[] = INCBIN_U32("graphics/balls/luxury.4bpp.lz");
+const u32 gBallPal_Luxury[] = INCBIN_U32("graphics/balls/luxury.gbapal.lz");
+
+const u32 gBallGfx_Premier[] = INCBIN_U32("graphics/balls/premier.4bpp.lz");
+const u32 gBallPal_Premier[] = INCBIN_U32("graphics/balls/premier.gbapal.lz");
+
+const u32 gOpenPokeballGfx[] = INCBIN_U32("graphics/balls/open.4bpp.lz");
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,7 +92,7 @@ static const struct BgTemplate sBackgroundTemplates[] = @@
       }
     };
-    static const u16 sFontPalette[] = INCBIN_U16("graphics/interface/berry_tag_screen.gbapal");
+    static const u16 sFontPalette[] = INCBIN_U16("graphics/bag/berry_tag_screen.gbapal");
     static const u8 sTextColors[2][3] =
     {
@@ Expand Down @@