Merge remote-tracking branch 'upstream' into tustin2121-patch-5

31 files changed, 0 insertions, 0 deletions

diff --git a/graphics/battle_anims/sprites/tri_force_triangle.png b/graphics/battle_anims/sprites/tri_attack_triangle.png
index 9157118fd..9157118fd 100644
--- a/graphics/battle_anims/sprites/tri_force_triangle.png
+++ b/graphics/battle_anims/sprites/tri_attack_triangle.png
diff --git a/graphics/battle_frontier/options_pal1.pal b/graphics/battle_frontier/tourney.pal
index eec4c7d71..eec4c7d71 100644
--- a/graphics/battle_frontier/options_pal1.pal
+++ b/graphics/battle_frontier/tourney.pal
diff --git a/graphics/battle_frontier/options_pal2.pal b/graphics/battle_frontier/tourney_buttons.pal
index 4a7c1f786..4a7c1f786 100644
--- a/graphics/battle_frontier/options_pal2.pal
+++ b/graphics/battle_frontier/tourney_buttons.pal
diff --git a/graphics/battle_frontier/options.png b/graphics/battle_frontier/tourney_buttons.png
index 0d8cec998..0d8cec998 100644
--- a/graphics/battle_frontier/options.png
+++ b/graphics/battle_frontier/tourney_buttons.png
diff --git a/graphics/battle_frontier/misc1.png b/graphics/battle_frontier/tourney_info_card.png
index a3c225c89..a3c225c89 100644
--- a/graphics/battle_frontier/misc1.png
+++ b/graphics/battle_frontier/tourney_info_card.png
diff --git a/graphics/unknown/unknown_D84F00.bin b/graphics/battle_frontier/tourney_info_card_bg.bin
index c38088d34..c38088d34 100644
--- a/graphics/unknown/unknown_D84F00.bin
+++ b/graphics/battle_frontier/tourney_info_card_bg.bin
diff --git a/graphics/unknown/unknown_D84970.bin b/graphics/battle_frontier/tourney_info_card_tilemap.bin
index d102290e4..d102290e4 100644
--- a/graphics/unknown/unknown_D84970.bin
+++ b/graphics/battle_frontier/tourney_info_card_tilemap.bin
diff --git a/graphics/unknown/unknown_D83B2C.bin b/graphics/battle_frontier/tourney_line_down_map.bin
index 34175237e..34175237e 100644
--- a/graphics/unknown/unknown_D83B2C.bin
+++ b/graphics/battle_frontier/tourney_line_down_map.bin
diff --git a/graphics/unknown/unknown_D83900.bin b/graphics/battle_frontier/tourney_line_mask_map.bin
index 7f3e36737..7f3e36737 100644
--- a/graphics/unknown/unknown_D83900.bin
+++ b/graphics/battle_frontier/tourney_line_mask_map.bin
diff --git a/graphics/unknown/unknown_D83C3C.bin b/graphics/battle_frontier/tourney_line_up_map.bin
index acf7cf6ad..acf7cf6ad 100644
--- a/graphics/unknown/unknown_D83C3C.bin
+++ b/graphics/battle_frontier/tourney_line_up_map.bin
diff --git a/graphics/battle_frontier/options_pal3.pal b/graphics/battle_frontier/tourney_match_card_bg.pal
index 912d5e9ec..912d5e9ec 100644
--- a/graphics/battle_frontier/options_pal3.pal
+++ b/graphics/battle_frontier/tourney_match_card_bg.pal
diff --git a/graphics/battle_frontier/text.pal b/graphics/battle_interface/text.pal
index 574999b72..574999b72 100644..100755
--- a/graphics/battle_frontier/text.pal
+++ b/graphics/battle_interface/text.pal
diff --git a/graphics/event_objects/pics/effects/unknown_33.png b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png
index 26b852200..26b852200 100644
--- a/graphics/event_objects/pics/effects/unknown_33.png
+++ b/graphics/event_objects/pics/effects/lavaridge_gym_warp.png
diff --git a/graphics/interface/party_menu_misc.bin b/graphics/interface/party_menu_bg.bin
index d6ff1114d..d6ff1114d 100644
--- a/graphics/interface/party_menu_misc.bin
+++ b/graphics/interface/party_menu_bg.bin
diff --git a/graphics/interface/party_menu_misc.pal b/graphics/interface/party_menu_bg.pal
index 0b4b30f81..0b4b30f81 100644
--- a/graphics/interface/party_menu_misc.pal
+++ b/graphics/interface/party_menu_bg.pal
diff --git a/graphics/interface/party_menu_misc.png b/graphics/interface/party_menu_bg.png
index c58f3aae9..c58f3aae9 100644
--- a/graphics/interface/party_menu_misc.png
+++ b/graphics/interface/party_menu_bg.png
diff --git a/graphics/interface/unknown_6157E0.bin b/graphics/interface/party_menu_cancel_button.bin
index 7f11aaf4e..7f11aaf4e 100644
--- a/graphics/interface/unknown_6157E0.bin
+++ b/graphics/interface/party_menu_cancel_button.bin
diff --git a/graphics/interface/unknown_6157C4.bin b/graphics/interface/party_menu_confirm_button.bin
index 8c3c1be3d..8c3c1be3d 100644
--- a/graphics/interface/unknown_6157C4.bin
+++ b/graphics/interface/party_menu_confirm_button.bin
diff --git a/graphics/pokemon/farfetch_d/anim_front.png b/graphics/pokemon/farfetchd/anim_front.png
index 23176939b..23176939b 100644
--- a/graphics/pokemon/farfetch_d/anim_front.png
+++ b/graphics/pokemon/farfetchd/anim_front.png
diff --git a/graphics/pokemon/farfetch_d/back.png b/graphics/pokemon/farfetchd/back.png
index 7f981b389..7f981b389 100644
--- a/graphics/pokemon/farfetch_d/back.png
+++ b/graphics/pokemon/farfetchd/back.png
diff --git a/graphics/pokemon/farfetch_d/footprint.png b/graphics/pokemon/farfetchd/footprint.png
index 2f08f732d..2f08f732d 100644
--- a/graphics/pokemon/farfetch_d/footprint.png
+++ b/graphics/pokemon/farfetchd/footprint.png
diff --git a/graphics/pokemon/farfetch_d/front.png b/graphics/pokemon/farfetchd/front.png
index d938c1b50..d938c1b50 100644
--- a/graphics/pokemon/farfetch_d/front.png
+++ b/graphics/pokemon/farfetchd/front.png
diff --git a/graphics/pokemon/farfetch_d/icon.png b/graphics/pokemon/farfetchd/icon.png
index cb3cd931b..cb3cd931b 100644
--- a/graphics/pokemon/farfetch_d/icon.png
+++ b/graphics/pokemon/farfetchd/icon.png
diff --git a/graphics/pokemon/farfetch_d/normal.pal b/graphics/pokemon/farfetchd/normal.pal
index 397d1195c..397d1195c 100644
--- a/graphics/pokemon/farfetch_d/normal.pal
+++ b/graphics/pokemon/farfetchd/normal.pal
diff --git a/graphics/pokemon/farfetch_d/shiny.pal b/graphics/pokemon/farfetchd/shiny.pal
index 5537612ce..5537612ce 100644
--- a/graphics/pokemon/farfetch_d/shiny.pal
+++ b/graphics/pokemon/farfetchd/shiny.pal
diff --git a/graphics/unknown/unknown_DDD704.bin b/graphics/trade/menu_mon_box.bin
index 354866137..354866137 100644
--- a/graphics/unknown/unknown_DDD704.bin
+++ b/graphics/trade/menu_mon_box.bin
diff --git a/graphics/trade/ball.png b/graphics/trade/pokeball.png
index 97cc86a6f..97cc86a6f 100644
--- a/graphics/trade/ball.png
+++ b/graphics/trade/pokeball.png
diff --git a/graphics/unknown/unknown_DDB444.pal b/graphics/trade/unknown_DDB444.pal
index bb74b34a2..bb74b34a2 100644
--- a/graphics/unknown/unknown_DDB444.pal
+++ b/graphics/trade/unknown_DDB444.pal
diff --git a/graphics/unknown/unknown_DDCF04.bin b/graphics/trade/unknown_DDCF04.bin
index 46218245f..46218245f 100644
--- a/graphics/unknown/unknown_DDCF04.bin
+++ b/graphics/trade/unknown_DDCF04.bin
diff --git a/graphics/weather/fog2.png b/graphics/weather/fog_diagonal.png
index 198c6f494..198c6f494 100644
--- a/graphics/weather/fog2.png
+++ b/graphics/weather/fog_diagonal.png
diff --git a/graphics/weather/fog1.png b/graphics/weather/fog_horizontal.png
index 02e3cd3cb..02e3cd3cb 100644
--- a/graphics/weather/fog1.png
+++ b/graphics/weather/fog_horizontal.png