move ROM data into learn_move.c

3 files changed, 129 insertions, 124 deletions

diff --git a/data/learn_move.s b/data/learn_move.s
deleted file mode 100644
index 252f47ac6..000000000
--- a/data/learn_move.s
+++ /dev/null
@@ -1,119 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.4byte 0xFF00FFEF
-	.4byte gTileBuffer
-
-	.align 2
-gOamData_8402D50:: @ 8402D50
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D58:: @ 8402D58
-	.2byte 0x8000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_8402D60:: @ 8402D60
-	.2byte 0x4000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_8402D68:: @ 8402D68
-	obj_image_anim_frame 2, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402D70:: @ 8402D70
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402D78:: @ 8402D78
-	.4byte gSpriteAnim_8402D68
-	.4byte gSpriteAnim_8402D70
-
-	.align 2
-gUnknown_08402D80:: @ 8402D80
-	obj_tiles gDexArrows_Gfx, 384, 0x1595
-
-	.align 2
-gUnknown_08402D88:: @ 8402D88
-	obj_pal gDexArrows_Pal, 0x1596
-
-	.align 2
-gSpriteTemplate_8402D90:: @ 8402D90
-	spr_template 5525, 5526, gOamData_8402D58, gSpriteAnimTable_8402D78, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DA8:: @ 8402DA8
-	obj_image_anim_frame 4, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DB0:: @ 8402DB0
-	obj_image_anim_frame 6, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DB8:: @ 8402DB8
-	.4byte gSpriteAnim_8402DA8
-	.4byte gSpriteAnim_8402DB0
-
-	.align 2
-gSpriteTemplate_8402DC0:: @ 8402DC0
-	spr_template 5525, 5526, gOamData_8402D60, gSpriteAnimTable_8402DB8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.align 2
-gSpriteAnim_8402DD8:: @ 8402DD8
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE0:: @ 8402DE0
-	obj_image_anim_frame 9, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DE8:: @ 8402DE8
-	obj_image_anim_frame 10, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_8402DF0:: @ 8402DF0
-	obj_image_anim_frame 11, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_8402DF8:: @ 8402DF8
-	.4byte gSpriteAnim_8402DD8
-	.4byte gSpriteAnim_8402DE0
-	.4byte gSpriteAnim_8402DE8
-	.4byte gSpriteAnim_8402DF0
-
-	.align 2
-gSpriteTemplate_8402E08:: @ 8402E08
-	spr_template 5525, 5526, gOamData_8402D50, gSpriteAnimTable_8402DF8, NULL, gDummySpriteAffineAnimTable, sub_8133300
-
-	.string "あきと$" @ programmer Akito Mori?
-
-gUnknown_08402E24:: @ 8402E24
-	.byte 11,  1,  1
-	.byte  3,  6,  2
-	.byte 24,  1,  3
-	.byte  3, 11,  4
-	.byte  5,  4,  5
-	.byte  3,  6,  6
-	.byte  3, 11,  7
-
-gUnknown_08402E39:: @ 8402E39
-	.byte 0, 1, 2, 3
-
-gUnknown_08402E3D:: @ 8402E3D
-	.byte 4, 5, 6
diff --git a/ld_script.txt b/ld_script.txt
index 285d15fb5..9ca2705a6 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -454,7 +454,6 @@ SECTIONS {
         data/battle_anim_81258BC.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
         src/learn_move.o(.rodata);
-        data/learn_move.o(.rodata);
         src/decoration_inventory.o(.rodata);
         src/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
diff --git a/src/learn_move.c b/src/learn_move.c
index 01a37fe70..a83d7a491 100644
--- a/src/learn_move.c
+++ b/src/learn_move.c
@@ -97,6 +97,135 @@ const struct UnknownStruct1 gUnknown_08402D08[][4] =
     },
 };
 
+// XXX: What are these for?
+const u32 unkDataFF00FFEF = 0xFF00FFEF;
+const u8 *const gTileBuffer_ = gTileBuffer;
+
+const struct OamData gOamData_8402D50 = {.shape = 0};
+const struct OamData gOamData_8402D58 = {.shape = 2};
+const struct OamData gOamData_8402D60 = {.shape = 1};
+
+const union AnimCmd gSpriteAnim_8402D68[] =
+{
+    ANIMCMD_FRAME(2, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_8402D70[] =
+{
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_8402D78[] =
+{
+    gSpriteAnim_8402D68,
+    gSpriteAnim_8402D70,
+};
+
+const struct SpriteSheet gUnknown_08402D80 = {gDexArrows_Gfx, sizeof(gDexArrows_Gfx), 5525};
+const struct SpritePalette gUnknown_08402D88 = {gDexArrows_Pal, 5526};
+
+void sub_8133300(struct Sprite *);
+const struct SpriteTemplate gSpriteTemplate_8402D90 =
+{
+    .tileTag = 5525,
+    .paletteTag = 5526,
+    .oam = &gOamData_8402D58,
+    .anims = gSpriteAnimTable_8402D78,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8133300,
+};
+
+const union AnimCmd gSpriteAnim_8402DA8[] =
+{
+    ANIMCMD_FRAME(4, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_8402DB0[] =
+{
+    ANIMCMD_FRAME(6, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_8402DB8[] =
+{
+    gSpriteAnim_8402DA8,
+    gSpriteAnim_8402DB0,
+};
+
+const struct SpriteTemplate gSpriteTemplate_8402DC0 =
+{
+    .tileTag = 5525,
+    .paletteTag = 5526,
+    .oam = &gOamData_8402D60,
+    .anims = gSpriteAnimTable_8402DB8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8133300,
+};
+
+const union AnimCmd gSpriteAnim_8402DD8[] =
+{
+    ANIMCMD_FRAME(8, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_8402DE0[] =
+{
+    ANIMCMD_FRAME(9, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_8402DE8[] =
+{
+    ANIMCMD_FRAME(10, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd gSpriteAnim_8402DF0[] =
+{
+    ANIMCMD_FRAME(11, 5),
+    ANIMCMD_END,
+};
+
+const union AnimCmd *const gSpriteAnimTable_8402DF8[] =
+{
+    gSpriteAnim_8402DD8,
+    gSpriteAnim_8402DE0,
+    gSpriteAnim_8402DE8,
+    gSpriteAnim_8402DF0,
+};
+
+const struct SpriteTemplate gSpriteTemplate_8402E08 =
+{
+    .tileTag = 5525,
+    .paletteTag = 5526,
+    .oam = &gOamData_8402D50,
+    .anims = gSpriteAnimTable_8402DF8,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = sub_8133300,
+};
+
+const u8 gString_AkitoMori[] = _("あきと");  // programmer Akito Mori?
+
+const u8 gUnknown_08402E24[7][3] =
+{
+    {11,  1,  1},
+    { 3,  6,  2},
+    {24,  1,  3},
+    { 3, 11,  4},
+    { 5,  4,  5},
+    { 3,  6,  6},
+    { 3, 11,  7},
+};
+
+const u8 gUnknown_08402E39[] = {0, 1, 2, 3};
+const u8 gUnknown_08402E3D[] = {4, 5, 6};
+
 void sub_813269C(u8);
 void sub_81326D8(void);
 void sub_8132870(void);
@@ -906,10 +1035,6 @@ void sub_8133940(u16 a, const u8 *b)
     }
 }
 
-extern const u8 gUnknown_08402E24[][3];
-extern const u8 gUnknown_08402E3D[];
-extern const u8 gUnknown_08402E39[];
-
 extern const u8 *const gUnknown_083CADD4[];
 extern const u8 *const gMoveDescriptions[];