4 files changed, 11 insertions, 43 deletions
diff --git a/include/constants/items.h b/include/constants/items.h
index 6f54e6ee4..a52c72599 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -363,38 +363,6 @@
 #define ITEM_15B 347
 #define ITEM_15C 348
 
-// FireRed/LeafGreen
-#define ITEM_OAKS_PARCEL 349
-#define ITEM_POKE_FLUTE 350
-#define ITEM_SECRET_KEY 351
-#define ITEM_BIKE_VOUCHER 352
-#define ITEM_GOLD_TEETH 353
-#define ITEM_OLD_AMBER 354
-#define ITEM_CARD_KEY 355
-#define ITEM_LIFT_KEY 356
-#define ITEM_HELIX_FOSSIL 357
-#define ITEM_DOME_FOSSIL 358
-#define ITEM_SILPH_SCOPE 359
-#define ITEM_BICYCLE 360
-#define ITEM_TOWN_MAP 361
-#define ITEM_VS_SEEKER 362
-#define ITEM_FAME_CHECKER 363
-#define ITEM_TM_CASE 364
-#define ITEM_BERRY_POUCH 365
-#define ITEM_TEACHY_TV 366
-#define ITEM_TRI_PASS 367
-#define ITEM_RAINBOW_PASS 368
-#define ITEM_TEA 369
-#define ITEM_MYSTIC_TICKET 370
-#define ITEM_AURORA_TICKET 371
-#define ITEM_POWDER_JAR 372
-#define ITEM_RUBY 373
-#define ITEM_SAPPHIRE 374
-
-// Emerald
-#define ITEM_MAGMA_EMBLEM 375
-#define ITEM_OLD_SEA_MAP 376
-
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8
 
diff --git a/include/contest_painting.h b/include/contest_painting.h
index 48ab95fbc..81535ec8b 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -40,9 +40,9 @@ struct Unk2015E00
 
 struct ContestEntry
 {
-    /*0x00*/ u8 var0;
-    /*0x04*/ u32 var4;
-    /*0x08*/ u16 var8;
+    /*0x00*/ u32 personality;
+    /*0x04*/ u32 otId;
+    /*0x08*/ u16 species;
     /*0x0A*/ u8 contestType;
     /*0x0B*/ u8 pokemon_name[POKEMON_NAME_LENGTH];
     /*0x15*/ u8 pad15;
diff --git a/include/global.h b/include/global.h
index ec82d5d1d..faa4ace68 100644
--- a/include/global.h
+++ b/include/global.h
@@ -632,7 +632,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x24*/ struct WarpData warp4;
     /*0x2C*/ u16 savedMusic;
     /*0x2E*/ u8 weather;
-    /*0x2F*/ u8 filler_2F;
+    /*0x2F*/ u8 weatherCycleStage;
     /*0x30*/ u8 flashLevel;  // flash level on current map, 0 being normal and 4 being the darkest
     /*0x32*/ u16 mapDataId;
     /*0x34*/ u16 mapView[0x100];
diff --git a/include/rom_8077ABC.h b/include/rom_8077ABC.h
index ed42871a6..1910b7cb2 100644
--- a/include/rom_8077ABC.h
+++ b/include/rom_8077ABC.h
@@ -12,10 +12,10 @@ struct Struct_sub_8078914 {
 
 u8 GetBankPosition(u8, u8);
 u8 sub_8077E44(u8 slot, u16 species, u8 a3);
-u8 GetAnimBankSpriteId(u8 side);
+u8 GetAnimBankSpriteId(u8 bank);
 void StoreSpriteCallbackInData(struct Sprite *sprite, void(*callback)(struct Sprite *));
 void sub_8078314(struct Sprite *sprite);
-void sub_8078364(struct Sprite *sprite);
+void TranslateSpriteOverDuration(struct Sprite *sprite);
 void TranslateMonBGUntil(struct Sprite *sprite);
 void TranslateMonBGSubPixelUntil(struct Sprite *sprite);
 u8 GetBankSide(u8);
@@ -47,8 +47,8 @@ void sub_8078F9C(u8 sprite);
 void sub_8079518(struct Sprite *sprite);
 void sub_8079534(struct Sprite *sprite);
 void sub_80796F8(u8 task);
-void sub_80797EC(struct Task *task);
-void sub_8079814(u8 taskId);
+void AnimTask_BlendMonInAndOutSetup(struct Task *task);
+void AnimTask_BlendMonInAndOutStep(u8 taskId);
 void sub_8079A64(u8 sprite);
 u16 sub_8079B10(u8 sprite);
 void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr);
@@ -68,8 +68,8 @@ void InitAnimSpritePos(struct Sprite *sprite, u8);
 void sub_8078764(struct Sprite *sprite, u8);
 void StartTranslateAnimSpriteByDeltas(struct Sprite *sprite);
 void sub_8078D60(struct Sprite *sprite);
-void sub_80786EC(struct Sprite *sprite);
-void sub_80782D8(struct Sprite *sprite);
+void InitAnimSpriteTranslationOverDuration(struct Sprite *sprite);
+void WaitAnimForDuration(struct Sprite *sprite);
 void sub_8078CC0(struct Sprite *sprite);
 void sub_8078600(struct Sprite *sprite);
 void sub_8078504(struct Sprite *sprite);
@@ -85,7 +85,7 @@ void sub_80793C4(struct Sprite *sprite);
 void SetAverageBattlerPositions(u8 slot, u8 a2, s16 *a3, s16 *a4);
 u8 sub_8079ED4(u8 slot);
 s16 sub_807A100(u8 slot, u8 a2);
-u16 sub_80790F0(s16 a, s16 b);
+u16 ArcTan2Neg(s16 a, s16 b);
 void sub_8078FDC(struct Sprite *sprite, bool8 a2, s16 xScale, s16 yScale, u16 rotation);
 void sub_807867C(struct Sprite *sprite, s16 a2);
 u8 sub_8077EE4(u8 slot, u8 a2);