4 files changed, 11 insertions, 11 deletions
diff --git a/src/battle/anim/glow.c b/src/battle/anim/glow.c
index 63466c0ff..174655080 100644
--- a/src/battle/anim/glow.c
+++ b/src/battle/anim/glow.c
@@ -13,7 +13,7 @@ extern u8 gAnimBankTarget;
 
 extern u16 gUnknown_083D7A5C[5];
 
-extern struct INCBIN_U8 gBattleAnimSpritePalette_206;
+extern const u8 gBattleAnimSpritePalette_206[];
 
 // glow (a whitening effect where the Pokemon glows white in a cycle.)
 // Used in Heal Bell.
diff --git a/src/battle/anim/love_bg.c b/src/battle/anim/love_bg.c
index c3828c681..72d9325f2 100644
--- a/src/battle/anim/love_bg.c
+++ b/src/battle/anim/love_bg.c
@@ -10,9 +10,9 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
-extern struct INCBIN_U8 gAttractTilemap;
-extern struct INCBIN_U8 gAttractGfx;
-extern struct INCBIN_U8 gAttractPal;
+extern const u8 gAttractTilemap[];
+extern const u8 gAttractGfx[];
+extern const u8 gAttractPal[];
 
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG1_X;
diff --git a/src/battle/anim/scary_face.c b/src/battle/anim/scary_face.c
index 8d51521ee..8bc7bbd07 100644
--- a/src/battle/anim/scary_face.c
+++ b/src/battle/anim/scary_face.c
@@ -10,11 +10,11 @@ extern s16 gBattleAnimArgs[];
 extern u8 gAnimBankAttacker;
 extern u8 gAnimBankTarget;
 
-extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceContest;
-extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFacePlayer;
-extern struct INCBIN_U8 gBattleAnimBackgroundTilemap_ScaryFaceOpponent;
-extern struct INCBIN_U8 gBattleAnimBackgroundImage_ScaryFace;
-extern struct INCBIN_U8 gBattleAnimBackgroundPalette_ScaryFace;
+extern const u8 gBattleAnimBackgroundTilemap_ScaryFaceContest[];
+extern const u8 gBattleAnimBackgroundTilemap_ScaryFacePlayer[];
+extern const u8 gBattleAnimBackgroundTilemap_ScaryFaceOpponent[];
+extern const u8 gBattleAnimBackgroundImage_ScaryFace[];
+extern const u8 gBattleAnimBackgroundPalette_ScaryFace[];
 
 extern u16 gBattle_BG1_Y;
 extern u16 gBattle_BG1_X;
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 3e259a21b..f9190eb39 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -614,7 +614,7 @@ struct ChooseMoveStruct
     u8 pp[4];
     u8 unkC[0x12-0xC];
     u8 unk12;
-    u8 unk13;
+    u8 effectStringId;
     u8 filler14[0x20-0x14];
 };
 
@@ -637,7 +637,7 @@ void sub_802C68C(void)
         PlaySE(SE_SELECT);
 
         if (r6->moves[gMoveSelectionCursor[gActiveBank]] == MOVE_CURSE)
-            r4 = (r6->unk12 != TYPE_GHOST && (r6->unk13 ^ 7)) ? 0x10 : 0;
+            r4 = (r6->unk12 != TYPE_GHOST && (r6->effectStringId ^ 7)) ? 0x10 : 0;
         else
             r4 = gBattleMoves[r6->moves[gMoveSelectionCursor[gActiveBank]]].target;