diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 15 | ||||
| -rw-r--r-- | include/menu.h | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/global.h b/include/global.h index 5b78fc4c0..4bfa6194d 100644 --- a/include/global.h +++ b/include/global.h @@ -393,19 +393,8 @@ struct BattleFrontier /*0xD0A*/ u8 field_D0A; /*0xD0B*/ u8 field_D0B; /*0xD0C*/ u16 field_D0C[2][2]; - /*0xD14*/ u16 field_D14[2]; - /*0xD18*/ u8 field_D18; - /*0xD19*/ u8 field_D19; - /*0xD1A*/ u8 field_D1A; - /*0xD1B*/ u8 field_D1B; - /*0xD1C*/ u8 field_D1C; - /*0xD1D*/ u8 field_D1D; - /*0xD1E*/ u8 field_D1E; - /*0xD1F*/ u8 field_D1F; - /*0xD20*/ u8 field_D20; - /*0xD21*/ u8 field_D21; - /*0xD22*/ u8 field_D22; - /*0xD23*/ u8 field_D23; + /*0xD14*/ u16 field_D14[2][2]; + /*0xD1C*/ u16 field_D1C[2][2]; /*0xD24*/ struct BattleDomeTrainer domeTrainers[DOME_TOURNAMENT_TRAINERS_COUNT]; /*0xD64*/ u16 domeMonId[DOME_TOURNAMENT_TRAINERS_COUNT][3]; /*0xDC8*/ u16 field_DC8[2]; diff --git a/include/menu.h b/include/menu.h index 5dfd99c64..627374758 100644 --- a/include/menu.h +++ b/include/menu.h @@ -53,7 +53,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 CreateWindowTemplate(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); +void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, int size, u16 offset, u8 mode); s8 Menu_ProcessInputNoWrap_(void); s8 ProcessMenuInput_other(void); void do_scheduled_bg_tilemap_copies_to_vram(void); |