split data_8393054

9 files changed, 145 insertions, 111 deletions

diff --git a/data/data_8393054.s b/data/data_8393054.s
deleted file mode 100644
index 38ba47b63..000000000
--- a/data/data_8393054.s
+++ /dev/null
@@ -1,110 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteAnim_8393054:: @ 8393054
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 8, 3
-	obj_image_anim_frame 12, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_8393068:: @ 8393068
-	.4byte gSpriteAnim_8393054
-
-	.align 2
-gSpriteTemplate_839306C:: @ 839306C
-	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteTemplate_8393084:: @ 8393084
-	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544
-
-	.align 2
-gSpriteAnim_839309C:: @ 839309C
-	obj_image_anim_frame 0, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83930A4:: @ 83930A4
-	.4byte gSpriteAnim_839309C
-
-	.align 2
-gBattleAnimSpriteTemplate_83930A8:: @ 83930A8
-	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908
-
-	.align 2
-gBattleAnimSpriteTemplate_83930C0:: @ 83930C0
-	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC
-
-	.align 2
-gSpriteAnim_83930D8:: @ 83930D8
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83930F0:: @ 83930F0
-	.4byte gSpriteAnim_83930D8
-
-	.align 2
-gBattleAnimSpriteTemplate_83930F4:: @ 83930F4
-	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C
-
-	.align 2
-gSpriteTemplate_839310C:: @ 839310C
-	spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteAnim_8393124:: @ 8393124
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_839312C:: @ 839312C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_8393134:: @ 8393134
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_839313C:: @ 839313C
-	.4byte gSpriteAnim_8393124
-	.4byte gSpriteAnim_839312C
-	.4byte gSpriteAnim_8393134
-
-	.align 2
-gSpriteTemplate_8393148:: @ 8393148
-	spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
-
-	.align 2
-gSpriteAnim_8393160:: @ 8393160
-	obj_image_anim_frame 0, 15
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_8393168:: @ 8393168
-	.4byte gSpriteAnim_8393160
-
-	.align 2
-gSpriteAffineAnim_839316C:: @ 839316C
-	obj_rot_scal_anim_frame 0x60, 0x60, 0, 0
-	obj_rot_scal_anim_frame 0x2, 0x2, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_8393184:: @ 8393184
-	.4byte gSpriteAffineAnim_839316C
-
-	.align 2
-gSpriteTemplate_8393188:: @ 8393188
-	spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
diff --git a/data/gray_sun.s b/data/gray_sun.s
new file mode 100644
index 000000000..bee64873a
--- /dev/null
+++ b/data/gray_sun.s
@@ -0,0 +1,21 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_839309C:: @ 839309C
+	obj_image_anim_frame 0, 3
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_83930A4:: @ 83930A4
+	.4byte gSpriteAnim_839309C
+
+	.align 2
+gBattleAnimSpriteTemplate_83930A8:: @ 83930A8
+	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A908
+
+	.align 2
+gBattleAnimSpriteTemplate_83930C0:: @ 83930C0
+	spr_template 10283, 10283, gOamData_837DF34, gSpriteAnimTable_83930A4, NULL, gDummySpriteAffineAnimTable, sub_807A9BC
diff --git a/data/sparkle.s b/data/sparkle.s
new file mode 100644
index 000000000..0c2593fbd
--- /dev/null
+++ b/data/sparkle.s
@@ -0,0 +1,21 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_83930D8:: @ 83930D8
+	obj_image_anim_frame 0, 3
+	obj_image_anim_frame 16, 3
+	obj_image_anim_frame 32, 3
+	obj_image_anim_frame 48, 3
+	obj_image_anim_frame 64, 3
+	obj_image_anim_end
+
+	.align 2
+gSpriteAnimTable_83930F0:: @ 83930F0
+	.4byte gSpriteAnim_83930D8
+
+	.align 2
+gBattleAnimSpriteTemplate_83930F4:: @ 83930F4
+	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83930F0, NULL, gDummySpriteAffineAnimTable, sub_807A63C
diff --git a/data/unused_hit.s b/data/unused_hit.s
new file mode 100644
index 000000000..d7bdef912
--- /dev/null
+++ b/data/unused_hit.s
@@ -0,0 +1,29 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393124:: @ 8393124
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_839312C:: @ 839312C
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnim_8393134:: @ 8393134
+	obj_image_anim_frame 0, 5
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_839313C:: @ 839313C
+	.4byte gSpriteAnim_8393124
+	.4byte gSpriteAnim_839312C
+	.4byte gSpriteAnim_8393134
+
+	.align 2
+gSpriteTemplate_8393148:: @ 8393148
+	spr_template 10135, 10135, gOamData_837DF34, gSpriteAnimTable_839313C, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
diff --git a/data/unused_orb.s b/data/unused_orb.s
new file mode 100644
index 000000000..d49ddd908
--- /dev/null
+++ b/data/unused_orb.s
@@ -0,0 +1,24 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393054:: @ 8393054
+	obj_image_anim_frame 0, 3
+	obj_image_anim_frame 4, 3
+	obj_image_anim_frame 8, 3
+	obj_image_anim_frame 12, 3
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_8393068:: @ 8393068
+	.4byte gSpriteAnim_8393054
+
+	.align 2
+gSpriteTemplate_839306C:: @ 839306C
+	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
+
+	.align 2
+gSpriteTemplate_8393084:: @ 8393084
+	spr_template 10004, 10004, gOamData_837DF2C, gSpriteAnimTable_8393068, NULL, gDummySpriteAffineAnimTable, sub_807A544
diff --git a/data/unused_orb2.s b/data/unused_orb2.s
new file mode 100644
index 000000000..899f41372
--- /dev/null
+++ b/data/unused_orb2.s
@@ -0,0 +1,27 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteAnim_8393160:: @ 8393160
+	obj_image_anim_frame 0, 15
+	obj_image_anim_jump 0
+
+	.align 2
+gSpriteAnimTable_8393168:: @ 8393168
+	.4byte gSpriteAnim_8393160
+
+	.align 2
+gSpriteAffineAnim_839316C:: @ 839316C
+	obj_rot_scal_anim_frame 0x60, 0x60, 0, 0
+	obj_rot_scal_anim_frame 0x2, 0x2, 0, 1
+	obj_rot_scal_anim_jump 1
+
+	.align 2
+gSpriteAffineAnimTable_8393184:: @ 8393184
+	.4byte gSpriteAffineAnim_839316C
+
+	.align 2
+gSpriteTemplate_8393188:: @ 8393188
+	spr_template 10004, 10004, gOamData_837DFEC, gSpriteAnimTable_8393168, NULL, gSpriteAffineAnimTable_8393184, sub_807A544
diff --git a/data/unused_paw.s b/data/unused_paw.s
new file mode 100644
index 000000000..cb29168d7
--- /dev/null
+++ b/data/unused_paw.s
@@ -0,0 +1,8 @@
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+	.align 2
+gSpriteTemplate_839310C:: @ 839310C
+	spr_template 10051, 10051, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_807A5C4
diff --git a/ld_script.txt b/ld_script.txt
index 38fd4ff74..3be3a6e56 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -532,7 +532,12 @@ SECTIONS {
         src/battle/battle_anim.o(.rodata);
         src/rom_8077ABC.o(.rodata);
         data/map_events.o(.rodata);
-        data/data_8393054.o(.rodata);
+        data/unused_orb.o(.rodata); /* these files are clearly the rodata for latter part of rom_8077ABC, but the linker linked map_events before these objects for some reason. perhaps it was compiling and linking 2 folders at the same time? */
+        data/gray_sun.o(.rodata);
+        data/sparkle.o(.rodata);
+        data/unused_paw.o(.rodata);
+        data/unused_hit.o(.rodata);
+        data/unused_orb2.o(.rodata);
         src/engine/task.o(.rodata);
         src/battle/battle_anim_807B69C.o(.rodata);
         src/scene/title_screen.o(.rodata);
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 2b5a3c036..11a71155d 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -151,6 +151,7 @@ const struct SpriteSheet gUnknown_0837F5E0[] =
     { gMiscBlank_Gfx, 0x800, 55126, },
 };
 
+// pkmn_form.c
 
 u8 GetBankPosition(u8 slot, u8 a2)
 {
@@ -2149,6 +2150,8 @@ u8 sub_807A4A0(int a1, u8 sprite, int a3)
     return new_sprite;
 }
 
+// unused_orb
+
 void sub_807A544(struct Sprite *sprite)
 {
     sub_8078650(sprite);
@@ -2192,6 +2195,8 @@ void sub_807A5C4(struct Sprite *sprite)
     sprite->callback = sub_8078504;
 }
 
+// file_2
+
 void sub_807A63C(struct Sprite *sprite)
 {
     sub_8078650(sprite);
@@ -2204,6 +2209,8 @@ void sub_807A63C(struct Sprite *sprite)
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
 }
 
+// file_3 (punch effect?)
+
 void sub_807A69C(u8 taskId)
 {
     u16 src;
@@ -2287,6 +2294,8 @@ void sub_807A8D4(struct Sprite *sprite)
     }
 }
 
+// file_4
+
 void sub_807A908(struct Sprite *sprite) {
     sprite->pos1.x = GetBankPosition(gAnimBankAttacker, 2);
     sprite->pos1.y = GetBankPosition(gAnimBankAttacker, 3);