Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet

1 files changed, 138 insertions, 0 deletions

diff --git a/src/data2b.c b/src/data2b.c
new file mode 100644
index 000000000..46a158e09
--- /dev/null
+++ b/src/data2b.c
@@ -0,0 +1,138 @@
+#include "global.h"
+#include "data2.h"
+#include "graphics.h"
+
+extern const union AnimCmd gAnimCmd_General_Frame0[];
+extern const union AnimCmd AnimCmd_82FF540[];
+
+#include "data/pokemon_graphics/unknown_anims.h"
+#include "data/pokemon_graphics/front_pic_coordinates.h"
+#include "data/pokemon_graphics/still_front_pic_table.h"
+#include "data/pokemon_graphics/back_pic_coordinates.h"
+
+#include "data/pokemon_graphics/back_pic_table.h"
+#include "data/pokemon_graphics/palette_table.h"
+#include "data/pokemon_graphics/shiny_palette_table.h"
+
+#include "data/trainer_graphics/front_pic_anims.h"
+#include "data/trainer_graphics/front_pic_tables.h"
+#include "data/trainer_graphics/back_pic_anims.h"
+#include "data/trainer_graphics/back_pic_tables.h"
+
+#include "data/pokemon_graphics/enemy_mon_elevation.h"
+#include "data/pokemon_graphics/front_anims.h"
+#include "data/pokemon_graphics/front_pic_table.h"
+
+const u32 gUnknown830AF4C[] = // Potentially part of battle_data.c
+{
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000088, 0x00000888, 0x00000888, 0x00000886,
+    0x00000888, 0x00000886, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000886, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000886, 0x00000886,
+    0x00000888, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000888, 0x00000886, 0x00000888,
+    0x00000888, 0x00000888, 0x00000886, 0x00000886,
+    0x00000888, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000886, 0x00000886, 0x00000088,
+    0x00000886, 0x00000886, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000886, 0x00000888, 0x00000088, 0x00000088,
+    0x00000888, 0x00000888, 0x00000888, 0x00000886,
+    0x00000888, 0x00000888, 0x00000888, 0x00000886,
+    0x00000886, 0x00000886, 0x00000886, 0x00000886,
+    0x00000886, 0x00000886, 0x00000888, 0x00000888,
+    0x00000886, 0x00000886, 0x00000886, 0x00000886,
+    0x00000886, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000886, 0x00000886, 0x00000888,
+    0x00000886, 0x00000886, 0x00000888, 0x00000888,
+    0x00000088, 0x00000088, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000886, 0x00000886, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000088, 0x00000886,
+    0x00000888, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000888, 0x00000886, 0x00000888,
+    0x00000088, 0x00000088, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000888, 0x00000886,
+    0x00000886, 0x00000888, 0x00000888, 0x00000088,
+    0x00000888, 0x00000886, 0x00000886, 0x00000888,
+    0x00000886, 0x00000888, 0x00000888, 0x00000886,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000088, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000088, 0x00000888, 0x00000888, 0x00000886,
+    0x00000886, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000886,
+    0x00000888, 0x00000886, 0x00000088, 0x00000088,
+    0x00000088, 0x00000888, 0x00000088, 0x00000888,
+    0x00000888, 0x00000088, 0x00000088, 0x00000888,
+    0x00000886, 0x00000888, 0x00000886, 0x00000886,
+    0x00000886, 0x00000888, 0x00000888, 0x00000888,
+    0x00000088, 0x00000888, 0x00000888, 0x00000888,
+    0x00000088, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000088, 0x00000088,
+    0x00000886, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000088, 0x00000888,
+    0x00000886, 0x00000888, 0x00000088, 0x00000088,
+    0x00000888, 0x00000888, 0x00000088, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000088,
+    0x00000888, 0x00000888, 0x00000088, 0x00000088,
+    0x00000088, 0x00000888, 0x00000088, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000886, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000886, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000088, 0x00000886,
+    0x00000088, 0x00000886, 0x00000886, 0x00000886,
+    0x00000088, 0x00000886, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000886,
+    0x00000886, 0x00000886, 0x00000888, 0x00000888,
+    0x00000886, 0x00000886, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000886, 0x00000886,
+    0x00001882, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000886, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000886, 0x00000088, 0x00000886, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000088, 0x00000886,
+    0x00000886, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000886, 0x00000088,
+    0x00000088, 0x00000886, 0x00000886, 0x00000886,
+    0x00000886, 0x00000886, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000886,
+    0x00000886, 0x00000886, 0x00000886, 0x00000088,
+    0x00000886, 0x00000088, 0x00000886, 0x00000886,
+    0x00000886, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000886, 0x00000886,
+    0x00000886, 0x00000888, 0x00000886, 0x00000886,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000886, 0x00000886, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000088, 0x00000088, 0x00000088,
+    0x00000088, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+    0x00000888, 0x00000888, 0x00000888, 0x00000888,
+};