From 475078911da8b1c3bf57209bae2bb8a86728d4c0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 19 Nov 2019 15:29:57 -0500
Subject: [PATCH] Dump smokescreen data

---
 baserom.ips        | Bin 279787 -> 279077 bytes
 data/smokescreen.s |  50 +++++++++++++++++++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/baserom.ips b/baserom.ips
index 21e4c79f141b731f4ab9736766f716e193c0e791..ba29beb15e89d98ea2beb21c9575405b450a16ce 100644
GIT binary patch
delta 42
vcmaFeDY&#nkSoA3#M#4idkW))joU9UHZNdlU%<i$#7scUynO)+i?;&+UjPp*

delta 309
zcmZ45BKW#fus*;s#MwiYvxi}Yj@Si`2FBOdc*HMoyuQW&0uBr;Ac_SHIe_H<{~*2#
zkmbU_0mKk~3y|Le<hMZiM}YhzK>iUhe+j25#}*(y0>oE<`1Q5d*X97}CqT?#0W|K9
zj4}u7N*0bQyPk72FhpJlTI;~T!vJLczb3+^%JBgx53&}d?r#_~hw1hdCYFs{7Z}4C
z8QIu5I6;`38>E5(XyFr}Dr6l~f3kAy1>&DTZ1{_n!*pi{;{(3nuZr^C(N_G59GTB;
s`jXa)?5)3+wO{pzOuc@&+~$K!hZvi0F}B}g1Yss1X5M~_k;U5q04vN`GXMYp

diff --git a/data/smokescreen.s b/data/smokescreen.s
index 17d611d3c..19dceec00 100644
--- a/data/smokescreen.s
+++ b/data/smokescreen.s
@@ -1,17 +1,55 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
-	.balign 4
+	.align 2
 
 gUnknown_825098C:: @ 825098C
-	.incbin "baserom.gba", 0x25098C, 0x8
+	obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
 
 gUnknown_8250994:: @ 8250994
-	.incbin "baserom.gba", 0x250994, 0x60
+	obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
+
+gOamData_835099C::
+	.4byte 0x40000000, 0x00000400
+
+gAnimCmd_82509A4::
+	obj_image_anim_frame 0, 4
+	obj_image_anim_frame 4, 4
+	obj_image_anim_frame 8, 4
+	obj_image_anim_end
+
+gAnimCmd_82509B4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_end
+
+gAnimCmd_82509C4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_end
+
+gAnimCmd_82509D4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_end
+
+gSpriteAnimTable_82509E4::
+	.4byte gAnimCmd_82509A4
+	.4byte gAnimCmd_82509B4
+	.4byte gAnimCmd_82509C4
+	.4byte gAnimCmd_82509D4
 
 gUnknown_82509F4:: @ 82509F4
-	.incbin "baserom.gba", 0x2509F4, 0x18
+	spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, sub_804A904
 
 gSpriteSheet_EnemyShadow:: @ 8250A0C
-	.incbin "baserom.gba", 0x250A0C, 0x10
+	obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129
+
+gOamData_8250A14::
+	.4byte 0x40004000, 0x00000c00
 
 gSpriteTemplate_EnemyShadow:: @ 8250A1C
-	.incbin "baserom.gba", 0x250A1C, 0x18
+	spr_template 55129, 55039, gOamData_8250A14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible