mauville_man constants

4 files changed, 12 insertions, 67 deletions

diff --git a/constants/game_stat.inc b/constants/game_stat.inc
deleted file mode 100644
index ff8b2df00..000000000
--- a/constants/game_stat.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-	.equiv GAME_STAT_SAVED_GAME,                 0
-	.equiv GAME_STAT_FIRST_HOF_PLAY_TIME,        1
-	.equiv GAME_STAT_STARTED_TRENDS,             2
-	.equiv GAME_STAT_PLANTED_BERRIES,            3
-	.equiv GAME_STAT_TRADED_BIKES,               4
-	.equiv GAME_STAT_STEPS,                      5
-	.equiv GAME_STAT_GOT_INTERVIEWED,            6
-	.equiv GAME_STAT_TOTAL_BATTLES,              7
-	.equiv GAME_STAT_WILD_BATTLES,               8
-	.equiv GAME_STAT_TRAINER_BATTLES,            9
-	.equiv GAME_STAT_ENTERED_HOF,               10
-	.equiv GAME_STAT_POKEMON_CAPTURES,          11
-	.equiv GAME_STAT_FISHING_CAPTURES,          12
-	.equiv GAME_STAT_HATCHED_EGGS,              13
-	.equiv GAME_STAT_EVOLVED_POKEMON,           14
-	.equiv GAME_STAT_USED_POKECENTER,           15
-	.equiv GAME_STAT_RESTED_AT_HOME,            16
-	.equiv GAME_STAT_ENTERED_SAFARI_ZONE,       17
-	.equiv GAME_STAT_USED_CUT,                  18
-	.equiv GAME_STAT_USED_ROCK_SMASH,           19
-	.equiv GAME_STAT_MOVED_SECRET_BASE,         20
-	.equiv GAME_STAT_POKEMON_TRADES,            21
-	.equiv GAME_STAT_UNKNOWN_22,                22
-	.equiv GAME_STAT_LINK_BATTLE_WINS,          23
-	.equiv GAME_STAT_LINK_BATTLE_LOSSES,        24
-	.equiv GAME_STAT_LINK_BATTLE_DRAWS,         25
-	.equiv GAME_STAT_USED_SPLASH,               26
-	.equiv GAME_STAT_USED_STRUGGLE,             27
-	.equiv GAME_STAT_SLOT_JACKPOTS,             28
-	.equiv GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 29
-	.equiv GAME_STAT_ENTERED_BATTLE_TOWER,      30
-	.equiv GAME_STAT_UNKNOWN_31,                31
-	.equiv GAME_STAT_BATTLE_TOWER_BEST_STREAK,  32
-	.equiv GAME_STAT_POKEBLOCKS,                33
-	.equiv GAME_STAT_POKEBLOCKS_WITH_FRIENDS,   34
-	.equiv GAME_STAT_WON_LINK_CONTEST,          35
-	.equiv GAME_STAT_ENTERED_CONTEST,           36
-	.equiv GAME_STAT_WON_CONTEST,               37
-	.equiv GAME_STAT_SHOPPED,                   38
-	.equiv GAME_STAT_USED_ITEMFINDER,           39
-	.equiv GAME_STAT_GOT_RAINED_ON,             40
-	.equiv GAME_STAT_CHECKED_POKEDEX,           41
-	.equiv GAME_STAT_RECEIVED_RIBBONS,          42
-	.equiv GAME_STAT_JUMPED_DOWN_LEDGES,        43
-	.equiv GAME_STAT_WATCHED_TV,                44
-	.equiv GAME_STAT_CHECKED_CLOCK,             45
-	.equiv GAME_STAT_WON_POKEMON_LOTTERY,       46
-	.equiv GAME_STAT_USED_DAYCARE,              47
-	.equiv GAME_STAT_RODE_CABLE_CAR,            48
-	.equiv GAME_STAT_ENTERED_HOT_SPRINGS,       49
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 402afae23..465c61d1a 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -1,11 +1,4 @@
-@ From mauville_old_man.h
-@ TODO: Put these in a header
-
-MAUVILLE_MAN_BARD        = 0
-MAUVILLE_MAN_HIPSTER     = 1
-MAUVILLE_MAN_TRADER      = 2
-MAUVILLE_MAN_STORYTELLER = 3
-MAUVILLE_MAN_GIDDY       = 4
+#include "constants/mauville_man.h"
 
 MauvilleCity_PokemonCenter_1F_EventScript_1AE744:: @ 81AE744
 	special ScrSpecial_GetCurrentMauvilleMan
diff --git a/include/constants/mauville_man.h b/include/constants/mauville_man.h
new file mode 100644
index 000000000..b00e3a291
--- /dev/null
+++ b/include/constants/mauville_man.h
@@ -0,0 +1,10 @@
+#ifndef GUARD_CONSTANTS_MAUVILLE_MAN_H
+#define GUARD_CONSTANTS_MAUVILLE_MAN_H
+
+#define MAUVILLE_MAN_BARD 0
+#define MAUVILLE_MAN_HIPSTER 1
+#define MAUVILLE_MAN_TRADER 2
+#define MAUVILLE_MAN_STORYTELLER 3
+#define MAUVILLE_MAN_GIDDY 4
+
+#endif  // GUARD_CONSTANTS_MAUVILLE_MAN_H
diff --git a/include/mauville_man.h b/include/mauville_man.h
index 2b8f139f2..622cd1bfb 100644
--- a/include/mauville_man.h
+++ b/include/mauville_man.h
@@ -1,15 +1,7 @@
 #ifndef GUARD_MAUVILLE_OLD_MAN_H
 #define GUARD_MAUVILLE_OLD_MAN_H
 
-// IDs
-enum
-{
-    MAUVILLE_MAN_BARD,
-    MAUVILLE_MAN_HIPSTER,
-    MAUVILLE_MAN_TRADER,
-    MAUVILLE_MAN_STORYTELLER,
-    MAUVILLE_MAN_GIDDY,
-};
+#include "constants/mauville_man.h"
 
 void SetupMauvilleOldMan(void);
 void sub_80F7F30(void);