Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu

2018-02-12 14:00:47 -05:00
parent f81c52b56e a4787bc06a
commit 4ac064bbaf
130 changed files with 17694 additions and 29503 deletions
@@ -17,6 +17,8 @@ struct MenuAction
    } func;
 };

+extern const u16 gUnknown_0860F074[];
+
 void sub_81971D0(void);
 void sub_8197200(void);
 u16 sub_8197224(void);
@@ -48,6 +50,7 @@ void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size,
 bool8 free_temp_tile_data_buffers_if_possible(void);
 struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16);
 void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
+void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
 s8 ProcessMenuInputNoWrap_(void);
 void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);