diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-26 23:41:52 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-26 23:41:52 -0600 |
| commit | 2da7bdbb1175802e55103c4f9df95e035aa38c40 (patch) | |
| tree | 9f6051ec143da9f029c8867ef98fb5c6ff7dff2c /include | |
| parent | 7d8a2ae7f0d9edaca7770cf472909bf9197acf2a (diff) | |
Begin menu.s decomp
Diffstat (limited to 'include')
| -rw-r--r-- | include/gba/defines.h | 4 | ||||
| -rw-r--r-- | include/menu.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/gba/defines.h b/include/gba/defines.h index 702d4a352..6925864a2 100644 --- a/include/gba/defines.h +++ b/include/gba/defines.h @@ -39,8 +39,8 @@ #define BG_CHAR_ADDR(n) (BG_VRAM + (BG_CHAR_SIZE * (n))) #define BG_SCREEN_ADDR(n) (BG_VRAM + (BG_SCREEN_SIZE * (n))) -#define BG_TILE_H_FLIP(n) (0x400 | (n)) -#define BG_TILE_V_FLIP(n) (0x800 | (n)) +#define BG_TILE_H_FLIP(n) (0x400 + (n)) +#define BG_TILE_V_FLIP(n) (0x800 + (n)) // text-mode BG #define OBJ_VRAM0 (VRAM + 0x10000) diff --git a/include/menu.h b/include/menu.h index 425908aea..2b9ec4438 100644 --- a/include/menu.h +++ b/include/menu.h @@ -30,15 +30,15 @@ void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y); void reset_temp_tile_data_buffers(void); int decompress_and_copy_tile_data_to_vram(u8 bg_id, const void *src, int size, u16 offset, u8 mode); bool8 free_temp_tile_data_buffers_if_possible(void); -u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns something but it isn't used, fix when menu.s is decomp'd +struct WindowTemplate sub_8198A50(u8, u8, u8, u8, u8, u8, u16); void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos); s8 ProcessMenuInputNoWrap_(void); void do_scheduled_bg_tilemap_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void); void AddTextPrinterParameterized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str); -void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3); +void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u8 a3); void sub_81995E4(u8 windowId, u8 optionsNo, const struct MenuAction *actions, const u8 *actionIds); void sub_8197DF8(u8 windowId, bool8 copyToVram); -u8 sub_8198AA4(u8, u8, u8, u8, u8, u8, u16); +u16 sub_8198AA4(u8, u8, u8, u8, u8, u8, u16); #endif // GUARD_MENU_H |