mergin and chill

4 files changed, 9 insertions, 9 deletions

diff --git a/src/battle_2.c b/src/battle_2.c
index be0d0be72..92c48c427 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -246,7 +246,7 @@ static void sub_8038F34(void);
 static void sub_80392A8(void);
 static void sub_803937C(void);
 static void sub_803939C(void);
-static void oac_poke_opponent(struct Sprite *sprite);
+void oac_poke_opponent(struct Sprite *sprite);
 static void sub_803980C(struct Sprite *sprite);
 static void sub_8039838(struct Sprite *sprite);
 static void sub_8039894(struct Sprite *sprite);
@@ -1651,7 +1651,7 @@ void CB2_QuitRecordedBattle(void)
     }
 }
 
-static void sub_8038528(struct Sprite* sprite)
+void sub_8038528(struct Sprite* sprite)
 {
     sprite->data0 = 0;
     sprite->callback = sub_8038538;
@@ -2418,7 +2418,7 @@ u32 sub_80397C4(u32 setId, u32 tableId)
 #define tBank               data0
 #define tSpeciesId          data2
 
-static void oac_poke_opponent(struct Sprite *sprite)
+void oac_poke_opponent(struct Sprite *sprite)
 {
     sprite->callback = sub_803980C;
     StartSpriteAnimIfDifferent(sprite, 0);
diff --git a/src/battle_dome_cards.c b/src/battle_dome_cards.c
index c0557ac70..5251ee06a 100644
--- a/src/battle_dome_cards.c
+++ b/src/battle_dome_cards.c
@@ -17,7 +17,7 @@ extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[];
 extern const union AffineAnimCmd *const gUnknown_082FF618[];
 extern const union AffineAnimCmd *const gUnknown_082FF694[];
 extern const union AnimCmd *const gUnknown_082FF70C[];
-extern const union AnimCmd *const *const gUnknown_08309AAC[NUM_SPECIES];
+extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[NUM_SPECIES];
 extern const union AnimCmd *const *const gUnknown_0830536C[];
 extern const u8 gUnknown_0831F578[];
 
@@ -282,7 +282,7 @@ u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y,
         images[j].size = 0x800;
     }
     gUnknown_0203CCEC.tileTag = 0xFFFF;
-    gUnknown_0203CCEC.anims = gUnknown_08309AAC[species];
+    gUnknown_0203CCEC.anims = gMonAnimationsSpriteAnimsPtrTable[species];
     gUnknown_0203CCEC.images = images;
     if (flags2 == 0x01)
     {
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 8a16954a7..ee54f0e4d 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -28,7 +28,7 @@ extern const u32 gBitTable[];
 extern const struct SpriteTemplate gUnknown_08329D98[];
 extern const struct SpriteTemplate gUnknown_08329DF8[];
 extern const union AnimCmd* gUnknown_082FF70C[];
-extern const union AnimCmd* const * const gUnknown_08309AAC[];
+extern const union AnimCmd* const * const gMonAnimationsSpriteAnimsPtrTable[];
 extern const union AnimCmd* const * const gUnknown_08305D0C[];
 extern const union AnimCmd* const * const gUnknown_0830536C[];
 extern const u8 gText_BadEgg[];
@@ -165,9 +165,9 @@ void sub_806A068(u16 species, u8 bankIdentity)
     if (bankIdentity == 0 || bankIdentity == 2)
         gUnknown_0202499C.anims = gUnknown_082FF70C;
     else if (species > 500)
-        gUnknown_0202499C.anims = gUnknown_08309AAC[species - 500];
+        gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species - 500];
     else
-        gUnknown_0202499C.anims = gUnknown_08309AAC[species];
+        gUnknown_0202499C.anims = gMonAnimationsSpriteAnimsPtrTable[species];
 }
 
 void sub_806A12C(u16 trainerSpriteId, u8 bankIdentity)
diff --git a/src/util.c b/src/util.c
index 27b7c5ee5..58088c3ee 100644
--- a/src/util.c
+++ b/src/util.c
@@ -112,7 +112,7 @@ static const u16 sCrc16Table[] =
     0x7BC7, 0x6A4E, 0x58D5, 0x495C, 0x3DE3, 0x2C6A, 0x1EF1, 0x0F78,
 };
 
-const u8 gMiscBlank_Gfx[] = INCBIN_U8("graphics/interface/blank.4bpp"); // unused in Emerald
+const u8 gMiscBlank_Gfx[] = INCBIN_U8("graphics/interface/blank.4bpp");
 
 u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *))
 {