fixes

bates64 · Oct 31, 2024 · ba6f410 · ba6f410
1 parent 765e6cf
commit ba6f410
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/src/battle/btl_states_menus.c b/src/battle/btl_states_menus.c
@@ -444,19 +444,11 @@ BSS s32 D_802AD6D4;
 void create_battle_popup_menu(PopupMenu* popup);
 
 s32 get_player_anim_for_status(s32 animID);
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/main
 void btl_menu_moves_draw_content(void* data, s32 x, s32 y);
 void btl_menu_moves_show_title(void* data, s32 x, s32 y);
 void btl_menu_moves_show_icon(void* data, s32 x, s32 y);
 void btl_menu_moves_show_desc(void* data, s32 x, s32 y);
 void btl_menu_moves_show_error(void* data, s32 x, s32 y);
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/main
 void btl_menu_strats_draw_content(void* data, s32 x, s32 y);
 void btl_menu_strats_show_title(void* data, s32 x, s32 y);
 void btl_menu_strats_show_desc(void* data, s32 x, s32 y);

diff --git a/src/filemenu/filemenu_main.c b/src/filemenu/filemenu_main.c
@@ -752,7 +752,6 @@ void filemenu_main_init(MenuPanel* menu) {
     setup_pause_menu_tab(filemenu_main_windowBPs, ARRAY_COUNT(filemenu_main_windowBPs));
     menu->selected = MENU_PANEL_SELECTED_GRID_DATA(menu);
 
-#if VERSION_PAL
     gWindows[WIN_FILES_TITLE].pos.y = 1;
     gWindows[WIN_FILES_TITLE].width = 162;
     gWindows[WIN_FILES_TITLE].height = 25;