ghost

data/data_835B488.s

@@ -924,13 +924,7 @@ gUnknown_83E74D8:: @ 83E74D8
 	.incbin "baserom.gba", 0x3E74D8, 0x18
 
 gUnknown_83E74F0:: @ 83E74F0
-	.incbin "baserom.gba", 0x3E74F0, 0x178
+	.incbin "baserom.gba", 0x3E74F0, 0xB8
-
-gUnknown_83E7668:: @ 83E7668
-	.incbin "baserom.gba", 0x3E7668, 0x78
-
-gUnknown_83E76E0:: @ 83E76E0
-	.incbin "baserom.gba", 0x3E76E0, 0x30
 
 	.section .rodata.83E7CFC
 

include/battle_anim.h

@@ -50,7 +50,6 @@ extern s16 gBattleAnimArgs[ANIM_ARGS_COUNT];
 extern u8 gAnimMoveTurn;
 extern u8 gBattleAnimAttacker;
 extern u8 gBattleAnimTarget;
-extern u8 gUnknown_02038440;
 extern u8 gBattlerSpriteIds[MAX_BATTLERS_COUNT];
 extern u16 gAnimMovePower;
 extern s32 gAnimMoveDmg;
@@ -68,6 +67,13 @@ extern struct OamData gOamData_83ACAF8;
 extern struct OamData gOamData_83ACB60;
 extern struct OamData gOamData_83ACA30;
 extern struct OamData gOamData_83ACA98;
+extern struct OamData gOamData_83ACA90;
+extern struct OamData gOamData_83ACAF0;
+extern struct OamData gOamData_83ACB10;
+extern struct OamData gOamData_83ACB18;
+extern struct OamData gOamData_83ACB38;
+extern struct OamData gOamData_83ACA18;
+extern struct OamData gOamData_83ACB20;
 
 void ClearBattleAnimationVars(void);
 void DoMoveAnim(u16 move);
@@ -84,7 +90,7 @@ s16 sub_80A52EC(s16 a);
 s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
 bool8 IsBattlerSpriteVisible(u8 battlerId);
 s16 KeepPanInRange(s16 a, s32 oldPan);
-void sub_80730C0(u16, const u16 *, u16 *, u8);
+void sub_80730C0(u16, const u16 *, s32, u8);
 
 // battle_intro.c
 void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
@@ -287,6 +293,16 @@ void sub_80B9800(u8 taskId);
 // dragon.c
 void sub_80B75E0(u8 taskId);
 
+// ghost.c
+void sub_80B54E8(u8 taskId);
+void sub_80B58AC(u8 taskId);
+void sub_80B5AAC(u8 taskId);
+void sub_80B6020(u8 taskId);
+void sub_80B63B4(u8 taskId);
+void sub_80B68C8(u8 taskId);
+void sub_80B6BBC(u8 taskId);
+
+
 // flying.s
 void sub_80B1D3C(struct Sprite *sprite);
 

include/graphics.h

@@ -981,6 +981,11 @@ extern const u32 gMetalShineGfx[];
 extern const u32 gMetalShinePalette[];
 extern const u32 gMetalShineTilemap[];
 
+// ghost
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_sheet[];
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_palette[];
+extern const u32 gFile_graphics_battle_anims_backgrounds_scary_face_player_tilemap[];
+
 // title_screen
 extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
 extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
@@ -994,6 +999,7 @@ extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
 extern const u16 gGraphics_TitleScreen_FirePals[];
 extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
 
+// battle_gfx_sfx_util
 extern const u32 gHealthboxSinglesPlayerGfx[];
 extern const u32 gHealthboxSinglesOpponentGfx[];
 extern const u32 gHealthboxDoublesPlayerGfx[];
@@ -1003,7 +1009,6 @@ extern const u32 gBlankGfxCompressed[];
 extern const u16 gBattleInterface_BallStatusBarPal[];
 extern const u16 gBattleInterface_BallDisplayPal[];
 extern const u32 gFile_graphics_interface_hp_numbers[];
-
 extern const u32 gGhostFrontPic[];
 extern const u32 gGhostPalette[];
 extern const u32 gSubstituteDollGfx[];

ld_script.txt

@@ -165,7 +165,7 @@ SECTIONS {
         asm/psychic.o(.text);
         asm/bug.o(.text);
         asm/rock.o(.text);
-        asm/ghost.o(.text);
+        src/ghost.o(.text);
         src/dragon.o(.text);
         src/dark.o(.text);
         src/ground.o(.text);
@@ -423,6 +423,7 @@ SECTIONS {
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
         data/data_835B488.o(.rodata.83DF09C);
+        src/ghost.o(.rodata);
         src/dragon.o(.rodata);
         src/dark.o(.rodata);
         src/ground.o(.rodata);

src/dark.c

@@ -213,7 +213,7 @@ static void sub_80B7954(u8 taskId)
         gTasks[taskId].data[2] = 0;
         if (blendA == 16)
         {
-            gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 1;
+            gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = TRUE;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -730,11 +730,11 @@ void sub_80B85B8(u8 taskId)
     u8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? 1 : 0;
 
     MoveBattlerSpriteToBG(gBattleAnimAttacker, toBG2);
-    gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = 0;
+    gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].invisible = FALSE;
     if (IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
     {
         MoveBattlerSpriteToBG(gBattleAnimAttacker ^ 2, toBG2 ^ 1);
-        gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = 0;
+        gSprites[gBattlerSpriteIds[gBattleAnimAttacker ^ 2]].invisible = FALSE;
     }
     DestroyAnimVisualTask(taskId);
 }