make menu indicators compile

This commit is contained in:
DizzyEggg
2018-05-19 11:53:22 +02:00
parent 4857757431
commit 9385036ff7
9 changed files with 6 additions and 12 deletions
+1 -2
View File
@@ -1,5 +1,6 @@
#include "global.h" #include "global.h"
#include "pokemon.h" #include "pokemon.h"
#include "battle.h"
#include "daycare.h" #include "daycare.h"
#include "string_util.h" #include "string_util.h"
#include "constants/species.h" #include "constants/species.h"
@@ -22,8 +23,6 @@
#define EGG_MOVES_ARRAY_COUNT 10 #define EGG_MOVES_ARRAY_COUNT 10
#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 #define EGG_LVL_UP_MOVES_ARRAY_COUNT 50
extern u16 gMoveToLearn;
// text // text
extern const u8 gText_MaleSymbol4[]; extern const u8 gText_MaleSymbol4[];
extern const u8 gText_FemaleSymbol4[]; extern const u8 gText_FemaleSymbol4[];
-1
View File
@@ -21,7 +21,6 @@
#include "list_menu.h" #include "list_menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "menu.h" #include "menu.h"
#include "menu_indicators.h"
#include "sound.h" #include "sound.h"
#include "event_scripts.h" #include "event_scripts.h"
#include "event_data.h" #include "event_data.h"
-1
View File
@@ -26,7 +26,6 @@
#include "malloc.h" #include "malloc.h"
#include "map_name_popup.h" #include "map_name_popup.h"
#include "menu.h" #include "menu.h"
#include "menu_indicators.h"
#include "money.h" #include "money.h"
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"
+2
View File
@@ -13,6 +13,8 @@
#include "sound.h" #include "sound.h"
#include "constants/songs.h" #include "constants/songs.h"
// This file needs better labels and function names.
struct UnknownMysteryGiftLinkMenuStruct struct UnknownMysteryGiftLinkMenuStruct
{ {
s32 field_0; s32 field_0;
+1 -1
View File
@@ -16,7 +16,7 @@
#include "link.h" #include "link.h"
#include "main.h" #include "main.h"
#include "menu.h" #include "menu.h"
#include "menu_indicators.h" #include "list_menu.h"
#include "mystery_event_menu.h" #include "mystery_event_menu.h"
#include "naming_screen.h" #include "naming_screen.h"
#include "option_menu.h" #include "option_menu.h"
+2 -1
View File
@@ -2,7 +2,8 @@
#include "dma3.h" #include "dma3.h"
#include "graphics.h" #include "graphics.h"
#include "main.h" #include "main.h"
#include "menu_indicators.h" #include "window.h"
#include "list_menu.h"
#include "mon_markings.h" #include "mon_markings.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "sound.h" #include "sound.h"
-4
View File
@@ -18,7 +18,6 @@
#include "malloc.h" #include "malloc.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "menu_indicators.h"
#include "overworld.h" #include "overworld.h"
#include "palette.h" #include "palette.h"
#include "party_menu.h" #include "party_menu.h"
@@ -43,9 +42,6 @@ struct Struct203BCC4
u8 spriteIds[7]; u8 spriteIds[7];
}; };
// extern offset
void (*gFieldCallback)(void);
// static functions // static functions
static void InitPlayerPCMenu(u8 taskId); static void InitPlayerPCMenu(u8 taskId);
static void PlayerPCProcessMenuInput(u8 taskId); static void PlayerPCProcessMenuInput(u8 taskId);
-1
View File
@@ -24,7 +24,6 @@
#include "constants/songs.h" #include "constants/songs.h"
#include "sound.h" #include "sound.h"
#include "berry.h" #include "berry.h"
#include "menu_indicators.h"
#include "event_data.h" #include "event_data.h"
#include "battle_message.h" #include "battle_message.h"
#include "safari_zone.h" #include "safari_zone.h"
-1
View File
@@ -10,7 +10,6 @@
#include "list_menu.h" #include "list_menu.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "menu_indicators.h"
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/species.h" #include "constants/species.h"