diff --git a/include/constants/tactic.h b/include/constants/tactic.h
index 179a2ea26..541d906b5 100644
--- a/include/constants/tactic.h
+++ b/include/constants/tactic.h
@@ -3,19 +3,19 @@
 
 enum TacticID
 {
-    TACTIC_LETS_GO_TOGETHER = 0x0,
-    TACTIC_GO_THE_OTHER_WAY = 0x1,
-    TACTIC_GO_AFTER_FOES = 0x2,
-    TACTIC_AVOID_THE_FIRST_HIT = 0x3,
-    TACTIC_ALL_FOR_ONE = 0x4, // Unused
-    TACTIC_GROUP_SAFETY = 0x5, // Unused
-    TACTIC_AVOID_TROUBLE = 0x6,
-    TACTIC_BE_PATIENT = 0x7,
-    TACTIC_KEEP_YOUR_DISTANCE = 0x8,
-    TACTIC_WAIT_THERE = 0x9,
-    TACTIC_GET_AWAY = 0xA,
-    TACTIC_UNUSED = 0xB,
-    NUM_TACTICS = 0xC
+    TACTIC_LETS_GO_TOGETHER,
+    TACTIC_GO_THE_OTHER_WAY,
+    TACTIC_GO_AFTER_FOES,
+    TACTIC_AVOID_THE_FIRST_HIT,
+    TACTIC_ALL_FOR_ONE, // Unused
+    TACTIC_GROUP_SAFETY, // Unused
+    TACTIC_AVOID_TROUBLE,
+    TACTIC_BE_PATIENT,
+    TACTIC_KEEP_YOUR_DISTANCE,
+    TACTIC_WAIT_THERE,
+    TACTIC_GET_AWAY,
+    TACTIC_UNUSED,
+    NUM_TACTICS
 };
 
-#endif
+#endif // GUARD_CONSTANTS_TACTIC_H
\ No newline at end of file
diff --git a/include/constants/trap.h b/include/constants/trap.h
index bdcf091d1..df0ffc12b 100644
--- a/include/constants/trap.h
+++ b/include/constants/trap.h
@@ -3,26 +3,26 @@
 
 enum TrapID
 {
-    TRAP_TRIP_TRAP = 0x0,
-    TRAP_MUD_TRAP = 0x1,
-    TRAP_STICKY_TRAP = 0x2,
-    TRAP_GRIMY_TRAP = 0x3,
-    TRAP_SUMMON_TRAP = 0x4,
-    TRAP_PITFALL_TRAP = 0x5,
-    TRAP_WARP_TRAP = 0x6,
-    TRAP_WHIRLWIND_TRAP = 0x7,
-    TRAP_SPIN_TRAP = 0x8,
-    TRAP_SLUMBER_TRAP = 0x9,
-    TRAP_SLOW_TRAP = 0xA,
-    TRAP_SEAL_TRAP = 0xB,
-    TRAP_POISON_TRAP = 0xC,
-    TRAP_SELFDESTRUCT_TRAP = 0xD,
-    TRAP_EXPLOSION_TRAP = 0xE,
-    TRAP_PP_ZERO_TRAP = 0xF,
-    TRAP_CHESTNUT_TRAP = 0x10,
-    TRAP_WONDER_TILE = 0x11,
-    TRAP_POKEMON_TRAP = 0x12,
-    TRAP_SPIKE_TRAP = 0x13
+    TRAP_TRIP_TRAP,
+    TRAP_MUD_TRAP,
+    TRAP_STICKY_TRAP,
+    TRAP_GRIMY_TRAP,
+    TRAP_SUMMON_TRAP,
+    TRAP_PITFALL_TRAP,
+    TRAP_WARP_TRAP,
+    TRAP_WHIRLWIND_TRAP,
+    TRAP_SPIN_TRAP,
+    TRAP_SLUMBER_TRAP,
+    TRAP_SLOW_TRAP,
+    TRAP_SEAL_TRAP,
+    TRAP_POISON_TRAP,
+    TRAP_SELFDESTRUCT_TRAP,
+    TRAP_EXPLOSION_TRAP,
+    TRAP_PP_ZERO_TRAP,
+    TRAP_CHESTNUT_TRAP,
+    TRAP_WONDER_TILE,
+    TRAP_POKEMON_TRAP,
+    TRAP_SPIKE_TRAP
 };
 
-#endif
+#endif // GUARD_CONSTANTS_TRAP_H
\ No newline at end of file
diff --git a/include/constants/wonder_mail.h b/include/constants/wonder_mail.h
index 25a5c6c62..48cbc2a33 100644
--- a/include/constants/wonder_mail.h
+++ b/include/constants/wonder_mail.h
@@ -16,36 +16,44 @@ enum RewardType
     END_REWARDS
 };
 
-enum WonderMailMode {
+enum WonderMailMode
+{
     WONDER_MAIL_MODE_SEND = 1,
-    WONDER_MAIL_MODE_RECEIVE = 2,
+    WONDER_MAIL_MODE_RECEIVE,
 };
 
-enum WonderMailMethod {
+enum WonderMailMethod
+{
+    // 0 - 2
     WONDER_MAIL_GAME_LINK = 3,
-    WONDER_MAIL_PASSWORD = 5, 
+    // 4
+    WONDER_MAIL_PASSWORD = 5,
 };
 
-enum WonderMailTypes {
+enum WonderMailTypes
+{
     WONDER_MAIL_TYPE_NONE = 0,
-    WONDER_MAIL_TYPE_SOS = 1,
+    WONDER_MAIL_TYPE_SOS,
     //WONDER_MAIL_TYPE_SOS = 2, // SOS MAIL is 1 and 2?
+    // 2 - 3
     WONDER_MAIL_TYPE_AOK = 4,
     WONDER_MAIL_TYPE_THANK_YOU = 5,
     WONDER_MAIL_TYPE_WONDER = 5,
-    WONDER_MAIL_TYPE_COMPLETED = 6,
-    WONDER_MAIL_TYPE_OKD = 7,
+    WONDER_MAIL_TYPE_COMPLETED,
+    WONDER_MAIL_TYPE_OKD,
 };
 
 // Used in CreateRescueTitle and CreateRescueDescription
-enum MailStatuses {
+enum MailStatuses
+{
     MAIL_STATUS_SUSPENDED,
     MAIL_STATUS_TAKE_JOB,
     MAIL_STATUS_DONE
 };
 
 // Used in CreateRescueTitle and CreateRescueDescription
-enum MissionTypes {
+enum MissionTypes
+{
     MISSION_TYPE_FRIEND_RESCUE,
     MISSION_TYPE_FIND_ITEM,
     MISSION_TYPE_DELIVER_ITEM,
@@ -57,11 +65,12 @@ enum MissionTypes {
 
 enum WonderMailMissionTypes
 {
-    WONDER_MAIL_MISSION_TYPE_RESCUE_CLIENT = 0,
-    WONDER_MAIL_MISSION_TYPE_RESCUE_TARGET = 1,
-    WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT = 2,
-    WONDER_MAIL_MISSION_TYPE_FIND_ITEM = 3,
-    WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM = 4,
+    WONDER_MAIL_MISSION_TYPE_RESCUE_CLIENT,
+    WONDER_MAIL_MISSION_TYPE_RESCUE_TARGET,
+    WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT,
+    WONDER_MAIL_MISSION_TYPE_FIND_ITEM,
+    WONDER_MAIL_MISSION_TYPE_DELIVER_ITEM,
+    // 5
     WONDER_MAIL_MISSION_TYPE_UNK6 = 6,
 };
 
@@ -73,4 +82,4 @@ enum WonderMailMissionTypes
 #define MAX_ITEM_REWARDS 3
 
 
-#endif //GUARD_CONSTANTS_WONDER_MAIL_H
+#endif //GUARD_CONSTANTS_WONDER_MAIL_H
\ No newline at end of file
diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h
index ba8af7951..911f8e25e 100644
--- a/include/friend_area_action_menu.h
+++ b/include/friend_area_action_menu.h
@@ -12,13 +12,13 @@ enum FriendAreaActionMenuStates
     FRIEND_AREA_ACTION_MENU_INIT,
     FRIEND_AREA_ACTION_MENU_MAIN,
     FRIEND_AREA_ACTION_MENU_MAIN_2,
-    //
+    // 3
     FRIEND_AREA_ACTION_MENU_SUMMARY = 4,
     FRIEND_AREA_ACTION_MENU_CHECK_IQ,
-    //
+    // 6 - 7
     FRIEND_AREA_ACTION_MENU_SAY_FAREWELL_PROMPT = 8,
     FRIEND_AREA_ACTION_MENU_SAY_FAREWELL_CONFIRM,
-    //
+    // 10 - 16
     FRIEND_AREA_ACTION_MENU_EXIT = 17,
 };
 
diff --git a/include/kangaskhan_storage1.h b/include/kangaskhan_storage1.h
index 6fdc58fb0..551af5a45 100644
--- a/include/kangaskhan_storage1.h
+++ b/include/kangaskhan_storage1.h
@@ -10,11 +10,11 @@ enum KangaskhanStorageStates
 {
     KANGASKHAN_STORAGE_INIT,
     KANGASKHAN_STORAGE_MAIN_MENU,
-    //
+    // 2 - 3
     KANGASKHAN_STORAGE_EXIT = 4,
     KANGASKHAN_STORAGE_NO_INV_ITEMS,
     KANGASKHAN_STORAGE_TOO_MANY_ITEMS,
-    //
+    // 7 - 8
     KANGASKHAN_STORAGE_IS_MONEY_USED_TM = 9,
 };
 
diff --git a/include/kecleon_bros1.h b/include/kecleon_bros1.h
index c7a1de6dc..f753ce5b0 100644
--- a/include/kecleon_bros1.h
+++ b/include/kecleon_bros1.h
@@ -9,14 +9,17 @@
 enum KecleonStoreStates
 {
     KECLEON_STORE_INIT = 0,
-    KECLEON_STORE_MAIN_MENU = 1,
+    KECLEON_STORE_MAIN_MENU,
+    // 2 - 3
     KECLEON_STORE_EXIT = 4,
-    KECLEON_STORE_NO_STORE_ITEMS = 5,
-    KECLEON_STORE_NO_MONEY = 6,
+    KECLEON_STORE_NO_STORE_ITEMS,
+    KECLEON_STORE_NO_MONEY,
+    // 7 - 8
     KECLEON_STORE_NO_ITEMS_TO_SELL = 9,
-    KECLEON_STORE_TOO_MANY_ITEMS = 10,
+    KECLEON_STORE_TOO_MANY_ITEMS,
+    // 11
     KECLEON_STORE_NOT_ENOUGH_MONEY = 12,
-    KECLEON_STORE_CANT_SELL_ITEM = 13,
+    KECLEON_STORE_CANT_SELL_ITEM,
 };
 
 // size: 0x148
diff --git a/include/mailbox.h b/include/mailbox.h
index 649ee7b3f..4ff13cf58 100644
--- a/include/mailbox.h
+++ b/include/mailbox.h
@@ -25,19 +25,20 @@ struct unkStruct_203B304
 extern void SetMailboxState(u32);
 extern s32 GetNumAcceptedJobs(void);
 
-enum MailBoxStates {
+enum MailBoxStates
+{
     INITIALIZE_MAILBOX,
     MAIN_MAILBOX_MENU,
-    // 2 is ???
+    // 2
     MAILBOX_EXIT = 3,
-    MAIL_MENU = 4,
-    MAIL_MENU_1 = 5,
-    MAIL_ACTION_MENU = 6,
-    MAIL_INFO = 7,
-    JOB_LIST_MENU = 8,
-    PKMN_NEWS_MENU = 0x9,
-    PKMN_NEWS_MENU_1 = 0xA,
-    DISPLAY_SEL_PKMN_NEWS = 0xB,
+    MAIL_MENU,
+    MAIL_MENU_1,
+    MAIL_ACTION_MENU,
+    MAIL_INFO,
+    JOB_LIST_MENU,
+    PKMN_NEWS_MENU,
+    PKMN_NEWS_MENU_1,
+    DISPLAY_SEL_PKMN_NEWS,
 };
 
 #endif // GUARD_MAILBOX_H
diff --git a/include/makuhita_dojo1.h b/include/makuhita_dojo1.h
index 083cb346e..ffd0f420a 100644
--- a/include/makuhita_dojo1.h
+++ b/include/makuhita_dojo1.h
@@ -7,14 +7,14 @@
 
 enum MakuhitaDojoInitMode
 {
-    MAKUHITA_DOJO_INIT_MODE_UNK0_AWAKE = 0,
-    MAKUHITA_DOJO_INIT_MODE_UNK1_AWAKE = 1,
-    MAKUHITA_DOJO_INIT_MODE_UNK2_AWAKE = 2,
-    MAKUHITA_DOJO_INIT_MODE_UNK3_AWAKE = 3,
-    MAKUHITA_DOJO_INIT_MODE_UNK4_ASLEEP = 4,
-    MAKUHITA_DOJO_INIT_MODE_UNK5_ASLEEP = 5,
-    MAKUHITA_DOJO_INIT_MODE_UNK6_ASLEEP = 6,
-    MAKUHITA_DOJO_INIT_MODE_UNK7_ASLEEP = 7,
+    MAKUHITA_DOJO_INIT_MODE_UNK0_AWAKE,
+    MAKUHITA_DOJO_INIT_MODE_UNK1_AWAKE,
+    MAKUHITA_DOJO_INIT_MODE_UNK2_AWAKE,
+    MAKUHITA_DOJO_INIT_MODE_UNK3_AWAKE,
+    MAKUHITA_DOJO_INIT_MODE_UNK4_ASLEEP,
+    MAKUHITA_DOJO_INIT_MODE_UNK5_ASLEEP,
+    MAKUHITA_DOJO_INIT_MODE_UNK6_ASLEEP,
+    MAKUHITA_DOJO_INIT_MODE_UNK7_ASLEEP,
 };
 
 // size: 0xCC
diff --git a/include/music.h b/include/music.h
index 6298927e1..0e6007db9 100644
--- a/include/music.h
+++ b/include/music.h
@@ -30,14 +30,16 @@ enum MusicPlayerIndex
 // TODO: continue to doc the rest of BG/Fanfare Player States
 enum BG_Player_State
 {
-    BG_PLAYER_STATE_INITIALIZE = 0,
-    BG_PLAYER_STATE_PLAYING = 1,
+    BG_PLAYER_STATE_INITIALIZE,
+    BG_PLAYER_STATE_PLAYING,
+    // 2 - 3
     BG_PLAYER_STATE_STOPPED = 4,
 };
 
 enum Fanfare_Player_State
 {
-    FANFARE_PLAYER_STATE_INITIALIZE = 0,
+    FANFARE_PLAYER_STATE_INITIALIZE,
+    // 1 - 2
     FANFARE_PLAYER_STATE_PLAYING = 3,
 };
 
diff --git a/include/pelipper_board.h b/include/pelipper_board.h
index bc063ac22..646d55e6e 100644
--- a/include/pelipper_board.h
+++ b/include/pelipper_board.h
@@ -17,11 +17,13 @@ struct unkStruct_203B308
 extern struct unkStruct_203B308 *gPelipperBoard;
 
 
-enum PelipperBoardStates {
+enum PelipperBoardStates
+{
     INITIALIZE_PELIPPER_BOARD,
     MAIN_PELIPPER_BOARD_MENU,
-    // 2 is ???
+    // 2
     PELIPPER_BOARD_EXIT = 3,
+    // 4 - 6
     PELIPPER_JOB_INFO = 7,
     PELIPPER_JOB_LIST_MENU,
 };
diff --git a/include/pokemon.h b/include/pokemon.h
index d4d00d795..6d49ca3bd 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -9,7 +9,8 @@
 #define OFFENSE_NRM 0
 #define OFFENSE_SP 1
 
-enum PokemonUnk0Flags {
+enum PokemonUnk0Flags
+{
     FLAG_ON_TEAM = 2,
 };
 
diff --git a/include/structs/dungeon_entity.h b/include/structs/dungeon_entity.h
index 3c6602677..18e522120 100644
--- a/include/structs/dungeon_entity.h
+++ b/include/structs/dungeon_entity.h
@@ -312,20 +312,22 @@ enum ShopkeeperMode
 
 enum AIObjective
 {
+    // 0
     AI_CHASE_TARGET = 1,
-    AI_CHASE_REMEMBERED_TARGET = 2,
-    AI_ROAM = 3,
-    AI_LEAVE_ROOM = 4,
-    AI_RUN_AWAY = 5,
-    AI_STAND_STILL = 6,
-    AI_TAKE_ITEM = 7
+    AI_CHASE_REMEMBERED_TARGET,
+    AI_ROAM,
+    AI_LEAVE_ROOM,
+    AI_RUN_AWAY,
+    AI_STAND_STILL,
+    AI_TAKE_ITEM
 };
 
 enum ClientType
 {
-    CLIENT_TYPE_NONE = 0,
-    CLIENT_TYPE_CLIENT = 1, // Used for mission clients that need rescuing.
+    CLIENT_TYPE_NONE,
+    CLIENT_TYPE_CLIENT, // Used for mission clients that need rescuing.
     CLIENT_TYPE_PARTNER,
+    // 3
     CLIENT_TYPE_DONT_MOVE = 4 // Used for Diglett in the Skarmory boss fight.
 };
 
@@ -336,4 +338,4 @@ enum VisualFlag
     VISUAL_FLAG_RUN_AWAY = 2
 };
 
-#endif
+#endif
\ No newline at end of file
diff --git a/include/structs/map.h b/include/structs/map.h
index dda57e86f..69172c1c8 100644
--- a/include/structs/map.h
+++ b/include/structs/map.h
@@ -22,10 +22,10 @@ enum TerrainType
 
 enum CrossableTerrain
 {
-    CROSSABLE_TERRAIN_REGULAR = 0,
-    CROSSABLE_TERRAIN_LIQUID = 1,
-    CROSSABLE_TERRAIN_CREVICE = 2,
-    CROSSABLE_TERRAIN_WALL = 3,
+    CROSSABLE_TERRAIN_REGULAR,
+    CROSSABLE_TERRAIN_LIQUID,
+    CROSSABLE_TERRAIN_CREVICE,
+    CROSSABLE_TERRAIN_WALL,
     NUM_CROSSABLE_TERRAIN
 };
 
diff --git a/include/structs/str_items.h b/include/structs/str_items.h
index ab1933e6e..44085fd76 100644
--- a/include/structs/str_items.h
+++ b/include/structs/str_items.h
@@ -68,6 +68,7 @@ typedef struct TeamInventory
 } TeamInventory;
 
 // TODO: These should be in constants/
+// Not doing it now since we cannot include enums in the constants file due to being used by the data_item and data_monster assemblers
 
 enum ItemFlag
 {
diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h
index c5ed2afc4..68453b718 100644
--- a/include/trade_items_menu.h
+++ b/include/trade_items_menu.h
@@ -16,10 +16,13 @@ enum TradeItemsScreens
     TRADE_ITEMS_ITEM_INFO,
     TRADE_ITEMS_SEND_ITEM_CONFIRM,
     TRADE_ITEMS_RECEIVE_ITEM,
+    // 8
     TRADE_ITEMS_IN_COMMUNICATION = 9,
+    // 10 - 14
     TRADE_ITEMS_PREPARE_TRADE_SAVING = 15,
+    // 16
     TRADE_ITEMS_PRE_EXIT = 17,
-    TRADE_ITEMS_EXIT = 18,
+    TRADE_ITEMS_EXIT,
 };
 
 enum TradeItemsModes
diff --git a/include/wonder_mail_3.h b/include/wonder_mail_3.h
index 37da8c42a..9ea7a9dd6 100644
--- a/include/wonder_mail_3.h
+++ b/include/wonder_mail_3.h
@@ -61,22 +61,17 @@ typedef struct unkStruct_203B2F8
 enum WonderMailRescueStates
 {
     INITIAL_WONDER_MAIL_CHECK = 0,
-    // 1 is ??
+    // 1
     WONDER_MAIL_EXIT = 2,
-    DUPLICATE_WONDER_MAIL = 3,
-    DUPLICATE_WONDER_MAIL_1 = 4,
-    // 5 is ??
-    // 6 is ??
-    // 7 is ??
+    DUPLICATE_WONDER_MAIL,
+    DUPLICATE_WONDER_MAIL_1,
+    // 5 - 7
     RECEIVE_WONDER_MAIL = 8,
-    // 9 is ??
+    // 9
     JOB_LIST_FULL = 10,
-    DRAW_JOB_LIST = 11,
-    DRAW_JOB_LIST_1 = 12,
-    // 13 is ??
-    // 14 is ??
-    // 15 is ??
-    // 16 is ??
+    DRAW_JOB_LIST,
+    DRAW_JOB_LIST_1,
+    // 13 - 16
 };
 
 u32 sub_802D098(unkSubStruct_203B2F8 *mail);
diff --git a/src/code_80958E8.c b/src/code_80958E8.c
index a33c98421..ed72436ec 100644
--- a/src/code_80958E8.c
+++ b/src/code_80958E8.c
@@ -68,7 +68,7 @@ bool8 IsValidWonderMail(WonderMail *WonderMailData)
 {
     // Has to equal 5 for Wonder Mail
     // https://web.archive.org/web/20080913124416/http://www.upokecenter.com/games/dungeon/guides/passwords.html
-    //
+
     if(WonderMailData->mailType != WONDER_MAIL_TYPE_WONDER)
     {
         return FALSE;
diff --git a/src/debug_menu1.c b/src/debug_menu1.c
index 381ffbfcd..bc735f4a7 100644
--- a/src/debug_menu1.c
+++ b/src/debug_menu1.c
@@ -21,7 +21,7 @@ enum DebugMenuOptions
     MENU_DEBUG_MENU_DEBUG_MENU,
     MENU_DEBUG_MENU_UNKNOWN_1,
     MENU_DEBUG_MENU_STORAGE,
-    //
+    // 7 - 8
     MENU_DEBUG_MENU_H_OPEN = 9,
 };
 
diff --git a/src/luminous_cave.c b/src/luminous_cave.c
index fa0c65964..f50a9d827 100644
--- a/src/luminous_cave.c
+++ b/src/luminous_cave.c
@@ -27,11 +27,11 @@ enum
     LUMINOUS_CAVE_ASK_EVOLVE,
     LUMINOUS_CAVE_EVOLVE_INFO,
     LUMINOUS_CAVE_SHALL_RETURN,
-    //
+    // 4
     LUMINOUS_CAVE_GIVE_ITEM_1 = 5,
-    //
+    // 6 - 9
     LUMINOUS_CAVE_GIVE_ITEM_2 = 10,
-    //
+    // 11 - 14
     LUMINOUS_CAVE_LACK_WHAT_NEEDED = 15,
     LUMINOUS_CAVE_ONLY_ONE_ITEM,
     LUMINOUS_CAVE_LET_US_BEGIN,
diff --git a/src/wonder_mail.c b/src/wonder_mail.c
index da0f72226..15cb54cd8 100644
--- a/src/wonder_mail.c
+++ b/src/wonder_mail.c
@@ -117,41 +117,56 @@ extern const u8 DontSendPokemon_80DDB80[];
 extern const u8 SendPokemon_80DDB98[];
 extern const u8 SendWOPokemon[];
 
-enum FriendRescueStates {
+enum FriendRescueStates
+{
     INITIALIZE_FRIEND_RESCUE = 0,
     FRIEND_RESCUE_MAIN = 1,
     FRIEND_RESCUE_EXIT_PRE = 2,
     FRIEND_RESCUE_COUNTER_EXIT = 3,
+    // 4
     FRIEND_RESCUE_COMMUNICATING_PRE = 5,
     FRIEND_RESCUE_COMMUNICATING = 6,
     FRIEND_RESCUE_ERROR = 7,
+    // 8
     NO_MAIL_ROOM = 9,
-    NO_SOS_MAIL = 0xC,
-    NO_AOK_MAIL = 0xE,
-    NO_MAIL = 0x10,
-    PROMPT_DELETE_ALL_MAIL = 0x12,
-    CONFIRM_DELETE_ALL_MAIL_1 = 0x13,
-    CONFIRM_DELETE_ALL_MAIL_2 = 0x14,
-    DELETE_ALL_MAIL_SAVE_PRE = 0x15,
-    NO_SOS_MAIL_TO_SEND = 0x1A,
-    CANT_GO_TO_DUNGEON = 0x1C,
-    FRIEND_RESCUE_FAILED = 0x1D,
-    PROMPT_CHOOSE_SOS_MAIL = 0x1E,
-    RECEIVED_FRIEND_SOS_MAIL = 0x23,
-    RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE = 0x24,
-    RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE = 0x25,
-    PROMPT_SOS_MAIL_PASSWORD = 0x26,
-    PROMPT_CHOOSE_AOK_MAIL = 0x29,
-    NO_AOK_MAIL_TO_SEND = 0x2F,
-    NO_POKEMON_IN_FRIEND_AREA = 0x31,
-    PROMPT_SELECT_HELPER_POKEMON = 0x32,
-    SELECT_HELPER_POKEMON = 0x33,
-    CONFIRM_SEND_HELPER_POKEMON = 0x36,
-    SENT_AOK_MAIL = 0x37,
-    SENT_AOK_MAIL_SAVE_PRE = 0x38,
-    SENT_AOK_MAIL_SAVE_COMPLETE = 0x39,
-    AOK_PASSWORD_DISPLAY = 0x3A,
-    DEFAULT_FALLBACK_STATE = 0x3D
+    // 10 - 11
+    NO_SOS_MAIL = 12,
+    // 13
+    NO_AOK_MAIL = 14,
+    // 15
+    NO_MAIL = 16,
+    // 17
+    PROMPT_DELETE_ALL_MAIL = 18,
+    CONFIRM_DELETE_ALL_MAIL_1,
+    CONFIRM_DELETE_ALL_MAIL_2,
+    DELETE_ALL_MAIL_SAVE_PRE,
+    // 22 - 25
+    NO_SOS_MAIL_TO_SEND = 26,
+    // 27
+    CANT_GO_TO_DUNGEON = 28,
+    FRIEND_RESCUE_FAILED,
+    PROMPT_CHOOSE_SOS_MAIL,
+    // 31 - 34
+    RECEIVED_FRIEND_SOS_MAIL = 35,
+    RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE,
+    RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE,
+    PROMPT_SOS_MAIL_PASSWORD,
+    // 39 - 40
+    PROMPT_CHOOSE_AOK_MAIL = 41,
+    // 42 - 46
+    NO_AOK_MAIL_TO_SEND = 47,
+    // 48
+    NO_POKEMON_IN_FRIEND_AREA = 49,
+    PROMPT_SELECT_HELPER_POKEMON,
+    SELECT_HELPER_POKEMON,
+    // 52 - 53
+    CONFIRM_SEND_HELPER_POKEMON = 54,
+    SENT_AOK_MAIL,
+    SENT_AOK_MAIL_SAVE_PRE,
+    SENT_AOK_MAIL_SAVE_COMPLETE,
+    AOK_PASSWORD_DISPLAY,
+    // 59 - 60
+    DEFAULT_FALLBACK_STATE = 61
 };
 
 const MenuItem gUnknown_80DD970[] =
diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c
index f24799c65..061c8abdc 100644
--- a/src/wonder_mail_3_mid.c
+++ b/src/wonder_mail_3_mid.c
@@ -77,17 +77,18 @@ struct unkStruct_203B314
 extern struct unkStruct_203B314 *gUnknown_203B314;
 
 
-enum FriendRewardStates {
-    PREP_MONEY_REWARD = 0,
-    MONEY_REWARD = 1,
-    PREP_FRIEND_AREA_REWARD = 2,
-    UNLOCK_FRIEND_AREA = 3,
-    PREP_ITEM_REWARD = 4,
-    GIVE_ITEM_REWARD = 5,
-    NEXT_ITEM = 6,
-    TEAM_PNTS_REWARD = 7,
-    NEW_TEAM_RANK = 8,
-    REWARD_EXIT = 9,
+enum FriendRewardStates
+{
+    PREP_MONEY_REWARD,
+    MONEY_REWARD,
+    PREP_FRIEND_AREA_REWARD,
+    UNLOCK_FRIEND_AREA,
+    PREP_ITEM_REWARD,
+    GIVE_ITEM_REWARD,
+    NEXT_ITEM,
+    TEAM_PNTS_REWARD,
+    NEW_TEAM_RANK,
+    REWARD_EXIT,
 };
 
 extern bool8 sub_802FCF0(u32);