21 files changed, 84 insertions, 63 deletions
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 8745b0d26..d8b2cd4db 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -112,7 +112,6 @@ void GetBattleAnimBg1Data(struct BattleAnimBgData*);
 void GetBattleAnimBgData(struct BattleAnimBgData*, u32 arg1);
 u8 GetBattlerSpriteSubpriority(u8 battlerId);
 bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
-void sub_80A6630(struct Sprite *sprite);
 void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
 void ResetSpriteRotScale(u8 spriteId);
 void SetSpriteRotScale(u8 spriteId, s16 xScale, s16 yScale, u16 rotation);
@@ -129,7 +128,6 @@ void AnimLoadCompressedBgTilemapHandleContest(struct BattleAnimBgData*, const vo
 void AnimLoadCompressedBgGfx(u32, const u32*, u32);
 void UpdateAnimBg3ScreenSize(bool8);
 void TranslateSpriteInGrowingCircle(struct Sprite *);
-void sub_80A653C(struct Sprite *);
 void SetBattlerSpriteYOffsetFromYScale(u8 spriteId);
 void PrepareEruptAnimTaskData(struct Task *task, u8 a2, s16 a3, s16 a4, s16 a5, s16 a6, u16 a7);
 u8 UpdateEruptAnimTask(struct Task *task);
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
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 6ad4b55e4..8ceea4d29 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -110,8 +110,8 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId);
 void SetObjectInvisibility(u8, u8, u8, bool8);
 void FreeAndReserveObjectSpritePalettes(void);
 void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y);
-void ResetObjectPriority(u8, u8, u8);
-void SetObjectPriority(u8, u8, u8, u8);
+void ResetObjectSubpriority(u8, u8, u8);
+void SetObjectSubpriority(u8, u8, u8, u8);
 void AllowObjectAtPosTriggerGroundEffects(s16, s16);
 void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup);
 void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 17e5afb63..e02fcd5af 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -25,15 +25,9 @@ struct FieldInput
 void FieldClearPlayerInput(struct FieldInput *pStruct);
 void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
 int ProcessPlayerFieldInput(struct FieldInput *pStruct);
-u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
 void RestartWildEncounterImmunitySteps(void);
-u8 *sub_8068E24(struct MapPosition *);
 const u8 *GetObjectEventScriptPointerPlayerFacing(void);
-bool8 sub_8068870(u16 a);
-bool8 sub_8068894(void);
-bool8 sub_8068A64(struct MapPosition *, u16);
-u8 sub_8068F18(void);
 bool8 TryDoDiveWarp(struct MapPosition *position, u16 b);
 int SetCableClubWarp(void);
 u8 TrySetDiveWarp(void);
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 4e4725041..973e06ef3 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -33,13 +33,12 @@ void DoMossdeepGymWarp(void);
 void DoPortholeWarp(void);
 void DoCableClubWarp(void);
 void DoContestHallWarp(void);
-void AnimateFlash(u8 flashLevel);
+void AnimateFlash(u8 newFlashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
 void DoSpinEnterWarp(void);
 void DoSpinExitWarp(void);
 void DoOrbEffect(void);
 void FadeOutOrbEffect(void);
-void sub_80B05B4(void);
 void WriteFlashScanlineEffectBuffer(u8 flashLevel);
 bool8 IsPlayerStandingStill(void);
 
diff --git a/include/field_special_scene.h b/include/field_special_scene.h
index a54b344d9..3f701f41b 100644
--- a/include/field_special_scene.h
+++ b/include/field_special_scene.h
@@ -9,7 +9,6 @@ void Task_Truck3(u8 taskId);
 void Task_HandleTruckSequence(u8 taskId);
 void ExecuteTruckSequence(void);
 void EndTruckSequence(u8);
-void sub_80C791C(void);
 void FieldCB_ShowPortholeView(void);
 
 #endif // GUARD_FIELD_SPECIAL_SCENE_H
diff --git a/include/field_weather.h b/include/field_weather.h
index 72a56ab6e..1d8cfe422 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -221,9 +221,9 @@ void Bubbles_Main(void);
 void Bubbles_InitAll(void);
 bool8 Bubbles_Finish(void);
 
-u8 GetSav1Weather(void);
-void SetSav1Weather(u32 weather);
-void SetSav1WeatherFromCurrMapHeader(void);
+u8 GetSavedWeather(void);
+void SetSavedWeather(u32 weather);
+void SetSavedWeatherFromCurrMapHeader(void);
 void SetWeather(u32 weather);
 void DoCurrentWeather(void);
 void UpdateWeatherPerDay(u16 increment);
diff --git a/include/global.h b/include/global.h
index 53e9ba134..024280f98 100644
--- a/include/global.h
+++ b/include/global.h
@@ -10,6 +10,7 @@
 #include "constants/vars.h"
 #include "constants/species.h"
 #include "constants/berry.h"
+#include "constants/maps.h"
 
 // Prevent cross-jump optimization.
 #define BLOCK_CROSS_JUMP asm("");
@@ -971,10 +972,10 @@ struct SaveBlock1
     /*0x2B92*/ u8 outbreakLocationMapNum;
     /*0x2B93*/ u8 outbreakLocationMapGroup;
     /*0x2B94*/ u8 outbreakPokemonLevel;
-    /*0x2B95*/ u8 outbreakUnk1;
-    /*0x2B96*/ u16 outbreakUnk2;
+    /*0x2B95*/ u8 outbreakUnused1;
+    /*0x2B96*/ u16 outbreakUnused2;
     /*0x2B98*/ u16 outbreakPokemonMoves[MAX_MON_MOVES];
-    /*0x2BA0*/ u8 outbreakUnk4;
+    /*0x2BA0*/ u8 outbreakUnused3;
     /*0x2BA1*/ u8 outbreakPokemonProbability;
     /*0x2BA2*/ u16 outbreakDaysLeft;
     /*0x2BA4*/ struct GabbyAndTyData gabbyAndTyData;
diff --git a/include/global.tv.h b/include/global.tv.h
index 2bc7dda99..e24ead3f2 100644
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -61,7 +61,7 @@ typedef union // size = 0x24
         /*0x0F*/ u8 filler_0F[1];
         /*0x10*/ u8 nickname[PLAYER_NAME_LENGTH + 1];
         /*0x18*/ u16 words18[2];
-        /*0x1C*/ u16 words[4];
+        /*0x1C*/ u16 words[2];
     } fanclubOpinions;
 
     // TVSHOW_DUMMY
@@ -334,7 +334,7 @@ typedef union // size = 0x24
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
         /*0x02*/ u8 avgLevel;
-        /*0x03*/ u8 nDecorations;
+        /*0x03*/ u8 numDecorations;
         /*0x04*/ u8 decorations[4];
         /*0x08*/ u16 species;
         /*0x0a*/ u16 move;
@@ -437,8 +437,8 @@ typedef union // size = 0x24
     struct {
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
-        /*0x02*/ u8 nMonsCaught;
-        /*0x03*/ u8 nPkblkUsed;
+        /*0x02*/ u8 monsCaught;
+        /*0x03*/ u8 pokeblocksUsed;
         /*0x04*/ u8 language;
         /*0x05*/ u8 filler_05[14];
         /*0x13*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
@@ -449,27 +449,27 @@ typedef union // size = 0x24
     struct {
         /*0x00*/ u8 kind;
         /*0x01*/ bool8 active;
-        /*0x02*/ u8 var02;
-        /*0x03*/ u8 var03;
+        /*0x02*/ u8 unused1;
+        /*0x03*/ u8 unused3;
         /*0x04*/ u16 moves[MAX_MON_MOVES];
         /*0x0C*/ u16 species;
-        /*0x0E*/ u16 var0E;
+        /*0x0E*/ u16 unused2;
         /*0x10*/ u8 locationMapNum;
         /*0x11*/ u8 locationMapGroup;
-        /*0x12*/ u8 var12;
+        /*0x12*/ u8 unused4;
         /*0x13*/ u8 probability;
         /*0x14*/ u8 level;
-        /*0x15*/ u8 var15;
+        /*0x15*/ u8 unused5;
         /*0x16*/ u16 daysLeft;
         /*0x18*/ u8 language;
     } massOutbreak;
 } TVShow;
 
-typedef struct // 2b50
+typedef struct
 {
     u8 kind;
     u8 state;
-    u16 days;
+    u16 dayCountdown;
 } PokeNews;
 
 struct GabbyAndTyData
diff --git a/include/mail.h b/include/mail.h
index 8236811cb..68c532b31 100644
--- a/include/mail.h
+++ b/include/mail.h
@@ -27,7 +27,7 @@ u16 MailSpeciesToSpecies(u16 mailSpecies, u16 *buffer);
 u8 GiveMailToMon(struct Pokemon *mon, struct Mail *mail);
 void TakeMailFromMon(struct Pokemon *mon);
 void ClearMailItemId(u8 mailId);
-u8 TakeMailFromMon2(struct Pokemon *mon);
+u8 TakeMailFromMonAndSave(struct Pokemon *mon);
 bool8 ItemIsMail(u16 itemId);
 
 #endif // GUARD_MAIL_H
diff --git a/include/mauville_old_man.h b/include/mauville_old_man.h
index 23a3cabfb..b22294f1b 100644
--- a/include/mauville_old_man.h
+++ b/include/mauville_old_man.h
@@ -6,9 +6,7 @@ extern struct BardSong gBardSong;
 void SetMauvilleOldMan(void);
 u8 GetCurrentMauvilleOldMan(void);
 void SetMauvilleOldManObjEventGfx(void);
-u8 sub_81201C8(void);
 void SanitizeMauvilleOldManForRuby(OldMan *dest);
-void sub_8120670(void);
 void SanitizeReceivedRubyOldMan(union OldMan * oldMan, u32 r1, u32 r6);
 void SanitizeReceivedEmeraldOldMan(union OldMan * oldMan, u32 unused, u32 a2);
 void ResetMauvilleOldManFlag(void);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 23c84dffb..5895426cf 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -102,10 +102,10 @@ bool8 MetatileBehavior_IsShortGrass(u8);
 bool8 MetatileBehavior_IsHotSprings(u8);
 bool8 MetatileBehavior_IsWaterfall(u8);
 bool8 MetatileBehavior_IsFortreeBridge(u8);
-bool8 MetatileBehavior_IsPacifidlogVerticalLog1(u8);
-bool8 MetatileBehavior_IsPacifidlogVerticalLog2(u8);
-bool8 MetatileBehavior_IsPacifidlogHorizontalLog1(u8);
-bool8 MetatileBehavior_IsPacifidlogHorizontalLog2(u8);
+bool8 MetatileBehavior_IsPacifidlogVerticalLogTop(u8);
+bool8 MetatileBehavior_IsPacifidlogVerticalLogBottom(u8);
+bool8 MetatileBehavior_IsPacifidlogHorizontalLogLeft(u8);
+bool8 MetatileBehavior_IsPacifidlogHorizontalLogRight(u8);
 bool8 MetatileBehavior_IsPacifidlogLog(u8);
 bool8 MetatileBehavior_IsTrickHousePuzzleDoor(u8);
 bool8 MetatileBehavior_IsRegionMap(u8);
diff --git a/include/overworld.h b/include/overworld.h
index e1cf100db..04b61f7fd 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -67,8 +67,8 @@ void SetGameStat(u8 index, u32 value);
 void ApplyNewEncryptionKeyToGameStats(u32 newKey);
 void LoadObjEventTemplatesFromHeader(void);
 void LoadSaveblockObjEventScripts(void);
-void Overworld_SetObjEventTemplateCoords(u8 localId, s16 x, s16 y);
-void Overworld_SetObjEventTemplateMovementType(u8 localId, u8 movementType);
+void SetObjEventTemplateCoords(u8 localId, s16 x, s16 y);
+void SetObjEventTemplateMovementType(u8 localId, u8 movementType);
 const struct MapLayout *GetMapLayout(void);
 void ApplyCurrentWarp(void);
 struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum);
@@ -98,8 +98,8 @@ void ResetInitialPlayerAvatarState(void);
 void StoreInitialPlayerAvatarState(void);
 bool32 Overworld_IsBikingAllowed(void);
 void SetDefaultFlashLevel(void);
-void Overworld_SetFlashLevel(s32 flashLevel);
-u8 Overworld_GetFlashLevel(void);
+void SetFlashLevel(s32 flashLevel);
+u8 GetFlashLevel(void);
 void SetCurrentMapLayout(u16 mapLayoutId);
 void SetObjectEventLoadFlag(u8 var);
 u16 GetLocationMusic(struct WarpData *warp);
diff --git a/include/script_menu.h b/include/script_menu.h
index 086ad147f..a690ef8b8 100644
--- a/include/script_menu.h
+++ b/include/script_menu.h
@@ -8,7 +8,7 @@ bool8 ScriptMenu_MultichoiceWithDefault(u8 left, u8 top, u8 multichoiceId, bool8
 bool8 ScriptMenu_YesNo(u8 left, u8 top);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, bool8 ignoreBPress, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 species, u8 x, u8 y);
-bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+bool8 (*ScriptMenu_HidePokemonPic(void))(void);
 int ConvertPixelWidthToTileWidth(int width);
 u8 CreateWindowFromRect(u8 x, u8 y, u8 width, u8 height);
 void ClearToTransparentAndRemoveWindow(u8 windowId);
diff --git a/include/tv.h b/include/tv.h
index 30cd13326..31c8fcc50 100644
--- a/include/tv.h
+++ b/include/tv.h
@@ -19,7 +19,7 @@ void HideBattleTowerReporter(void);
 void ReceiveTvShowsData(void *src, u32 size, u8 masterIdx);
 void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx);
 u32 GetPlayerIDAsU32(void);
-bool8 GetPriceReduction(u8 newsKind);
+bool8 IsPokeNewsActive(u8 newsKind);
 void SanitizeTVShowLocationsForRuby(TVShow *shows);
 size_t CountDigits(int value);
 u8 GetRibbonCount(struct Pokemon *pokemon);