7 files changed, 52 insertions, 20 deletions

diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
index 1958c792e..6b99f19bd 100644
--- a/include/constants/event_objects.h
+++ b/include/constants/event_objects.h
@@ -311,5 +311,6 @@
 #define LOCALID_MOSSDEEP_MART_CLERK 1
 #define LOCALID_SOOTOPOLIS_MART_CLERK 1
 #define LOCALID_BATTLE_FRONTIER_MART_CLERK 1
+#define LOCALID_SLATEPORT_ENERGY_GURU 25
 
 #endif  // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/constants/maps.h b/include/constants/maps.h
index b849749a9..6524f8c14 100644
--- a/include/constants/maps.h
+++ b/include/constants/maps.h
@@ -15,4 +15,16 @@
 #define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
 #define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
 
+// IDs for dynamic warps. Both are used in the dest_warp_id field for warp events, but they
+// are never read in practice. A dest_map of MAP_NONE is used to indicate that a
+// dynamic warp should be used, at which point the warp id is ignored. It can be passed to
+// SetDynamicWarp/SetDynamicWarpWithCoords as the first argument, but this argument is unused.
+// As only one dynamic warp is saved at a time there's no need to distinguish between them.
+#define WARP_ID_SECRET_BASE 0x7E
+#define WARP_ID_DYNAMIC     0x7F
+
+// Used to indicate an invalid warp id, for dummy warps or when a warp should
+// use the given coordinates rather than the coordinates of a target warp.
+#define WARP_ID_NONE (-1)
+
 #endif  // GUARD_CONSTANTS_MAPS_H
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index dde821358..5f37713f3 100755
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -117,10 +117,10 @@
 #define MB_BRIDGE_OVER_POND_LOW 0x71
 #define MB_BRIDGE_OVER_POND_MED 0x72
 #define MB_BRIDGE_OVER_POND_HIGH 0x73
-#define MB_PACIFIDLOG_VERTICAL_LOG_1 0x74
-#define MB_PACIFIDLOG_VERTICAL_LOG_2 0x75
-#define MB_PACIFIDLOG_HORIZONTAL_LOG_1 0x76
-#define MB_PACIFIDLOG_HORIZONTAL_LOG_2 0x77
+#define MB_PACIFIDLOG_VERTICAL_LOG_TOP 0x74
+#define MB_PACIFIDLOG_VERTICAL_LOG_BOTTOM 0x75
+#define MB_PACIFIDLOG_HORIZONTAL_LOG_LEFT 0x76
+#define MB_PACIFIDLOG_HORIZONTAL_LOG_RIGHT 0x77
 #define MB_FORTREE_BRIDGE 0x78
 #define MB_UNUSED_79 0x79
 #define MB_BRIDGE_OVER_POND_MED_EDGE_1 0x7A
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index 519120082..3c484e39a 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -182,22 +182,22 @@
 #define METATILE_Cave_ShoalCave_BlueStone_Small         0x35B
 
 // gTileset_Pacifidlog
-#define METATILE_Pacifidlog_Door                          0x21A
-#define METATILE_Pacifidlog_FloatingLogs_Horizontal0      0x250
-#define METATILE_Pacifidlog_FloatingLogs_Horizontal1      0x251
-#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal0 0x252
-#define METATILE_Pacifidlog_HalfSubmergedLogs_Horizontal1 0x253
-#define METATILE_Pacifidlog_SubmergedLogs_Horizontal0     0x254
-#define METATILE_Pacifidlog_SubmergedLogs_Horizontal1     0x255
-#define METATILE_Pacifidlog_FloatingLogs_Vertical0        0x258
-#define METATILE_Pacifidlog_FloatingLogs_Vertical1        0x260
-#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical0   0x259
-#define METATILE_Pacifidlog_HalfSubmergedLogs_Vertical1   0x261
-#define METATILE_Pacifidlog_SubmergedLogs_Vertical0       0x25A
-#define METATILE_Pacifidlog_SubmergedLogs_Vertical1       0x262
-#define METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole   0x237
-#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Top        0x2AA
-#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom     0x2B2
+#define METATILE_Pacifidlog_Door                              0x21A
+#define METATILE_Pacifidlog_FloatingLogs_HorizontalLeft       0x250
+#define METATILE_Pacifidlog_FloatingLogs_HorizontalRight      0x251
+#define METATILE_Pacifidlog_HalfSubmergedLogs_HorizontalLeft  0x252
+#define METATILE_Pacifidlog_HalfSubmergedLogs_HorizontalRight 0x253
+#define METATILE_Pacifidlog_SubmergedLogs_HorizontalLeft      0x254
+#define METATILE_Pacifidlog_SubmergedLogs_HorizontalRight     0x255
+#define METATILE_Pacifidlog_FloatingLogs_VerticalTop          0x258
+#define METATILE_Pacifidlog_FloatingLogs_VerticalBottom       0x260
+#define METATILE_Pacifidlog_HalfSubmergedLogs_VerticalTop     0x259
+#define METATILE_Pacifidlog_HalfSubmergedLogs_VerticalBottom  0x261
+#define METATILE_Pacifidlog_SubmergedLogs_VerticalTop         0x25A
+#define METATILE_Pacifidlog_SubmergedLogs_VerticalBottom      0x262
+#define METATILE_Pacifidlog_SkyPillar_CrackedFloor_Hole       0x237
+#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Top            0x2AA
+#define METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom         0x2B2
 
 // gTileset_Fortree
 #define METATILE_Fortree_LongGrass_Root                   0x208
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index e31debb49..f95bfa90f 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_PARTY_MENU_H
 #define GUARD_CONSTANTS_PARTY_MENU_H
 
+#define PARTY_NOTHING_CHOSEN 0xFF
+
 #define AILMENT_NONE  0
 #define AILMENT_PSN   1
 #define AILMENT_PRZ   2
diff --git a/include/constants/slot_machine.h b/include/constants/slot_machine.h
index 81848f208..865d7e5d0 100644
--- a/include/constants/slot_machine.h
+++ b/include/constants/slot_machine.h
@@ -3,4 +3,13 @@
 
 #define SLOT_MACHINE_COUNT 12
 
+// Slot machine IDs
+#define SLOT_MACHINE_UNLUCKIEST 0
+#define SLOT_MACHINE_UNLUCKIER  1
+#define SLOT_MACHINE_UNLUCKY    2
+#define SLOT_MACHINE_LUCKY      3
+#define SLOT_MACHINE_LUCKIER    4
+#define SLOT_MACHINE_LUCKIEST   5
+#define NUM_SLOT_MACHINE_IDS    6
+
 #endif // GUARD_CONSTANTS_SLOT_MACHINE_H
diff --git a/include/constants/tv.h b/include/constants/tv.h
index 3fe6c57b2..4c8dd4fa8 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -8,6 +8,14 @@
 #define POKENEWS_BLENDMASTER  4
 #define NUM_POKENEWS_TYPES    4 // Excludes NONE
 
+#define POKENEWS_STATE_INACTIVE 0
+#define POKENEWS_STATE_UPCOMING 1
+#define POKENEWS_STATE_ACTIVE   2
+
+// Number of days to count down until the news event occurs.
+// Nothing is aired on TV the first day
+#define POKENEWS_COUNTDOWN 4
+
 // TV shows are categorized as being in one of 3 groups
 // - TVGROUP_NORMAL, TV shows that can appear without Record Mixing
 // - TVGROUP_RECORD_MIX, TV shows that can only appear via Record Mixing