summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/battle_anim.s271
-rw-r--r--data/data_835B488.s75
-rw-r--r--ld_script.txt1
-rw-r--r--src/text.c4
4 files changed, 274 insertions, 77 deletions
diff --git a/data/battle_anim.s b/data/battle_anim.s
new file mode 100644
index 000000000..21f3e5158
--- /dev/null
+++ b/data/battle_anim.s
@@ -0,0 +1,271 @@
+ .section .rodata
+ .align 2
+gOamData_83AC9C8::
+ .4byte 0x00000000, 0x00000800
+
+gOamData_83AC9D0::
+ .4byte 0x40000000, 0x00000800
+
+gOamData_83AC9D8::
+ .4byte 0x80000000, 0x00000800
+
+gOamData_83AC9E0::
+ .4byte 0xc0000000, 0x00000800
+
+gOamData_83AC9E8::
+ .4byte 0x00004000, 0x00000800
+
+gOamData_83AC9F0::
+ .4byte 0x40004000, 0x00000800
+
+gOamData_83AC9F8::
+ .4byte 0x80004000, 0x00000800
+
+gOamData_83ACA00::
+ .4byte 0xc0004000, 0x00000800
+
+gOamData_83ACA08::
+ .4byte 0x00008000, 0x00000800
+
+gOamData_83ACA10::
+ .4byte 0x40008000, 0x00000800
+
+gOamData_83ACA18::
+ .4byte 0x80008000, 0x00000800
+
+gOamData_83ACA20::
+ .4byte 0xc0008000, 0x00000800
+
+gOamData_83ACA28::
+ .4byte 0x00000100, 0x00000800
+
+gOamData_83ACA30::
+ .4byte 0x40000100, 0x00000800
+
+gOamData_83ACA38::
+ .4byte 0x80000100, 0x00000800
+
+gOamData_83ACA40::
+ .4byte 0xc0000100, 0x00000800
+
+gOamData_83ACA48::
+ .4byte 0x00004100, 0x00000800
+
+gOamData_83ACA50::
+ .4byte 0x40004100, 0x00000800
+
+gOamData_83ACA58::
+ .4byte 0x80004100, 0x00000800
+
+gOamData_83ACA60::
+ .4byte 0xc0004100, 0x00000800
+
+gOamData_83ACA68::
+ .4byte 0x00008100, 0x00000800
+
+gOamData_83ACA70::
+ .4byte 0x40008100, 0x00000800
+
+gOamData_83ACA78::
+ .4byte 0x80008100, 0x00000800
+
+gOamData_83ACA80::
+ .4byte 0xc0008100, 0x00000800
+
+gOamData_83ACA88::
+ .4byte 0x00000300, 0x00000800
+
+gOamData_83ACA90::
+ .4byte 0x40000300, 0x00000800
+
+gOamData_83ACA98::
+ .4byte 0x80000300, 0x00000800
+
+gOamData_83ACAA0::
+ .4byte 0xc0000300, 0x00000800
+
+gOamData_83ACAA8::
+ .4byte 0x00004300, 0x00000800
+
+gOamData_83ACAB0::
+ .4byte 0x40004300, 0x00000800
+
+gOamData_83ACAB8::
+ .4byte 0x80004300, 0x00000800
+
+gOamData_83ACAC0::
+ .4byte 0xc0004300, 0x00000800
+
+gOamData_83ACAC8::
+ .4byte 0x00008300, 0x00000800
+
+gOamData_83ACAD0::
+ .4byte 0x40008300, 0x00000800
+
+gOamData_83ACAD8::
+ .4byte 0x80008300, 0x00000800
+
+gOamData_83ACAE0::
+ .4byte 0xc0008300, 0x00000800
+
+gOamData_83ACAE8::
+ .4byte 0x00000400, 0x00000800
+
+gOamData_83ACAF0::
+ .4byte 0x40000400, 0x00000800
+
+gOamData_83ACAF8::
+ .4byte 0x80000400, 0x00000800
+
+gOamData_83ACB00::
+ .4byte 0xc0000400, 0x00000800
+
+gOamData_83ACB08::
+ .4byte 0x00004400, 0x00000800
+
+gOamData_83ACB10::
+ .4byte 0x40004400, 0x00000800
+
+gOamData_83ACB18::
+ .4byte 0x80004400, 0x00000800
+
+gOamData_83ACB20::
+ .4byte 0xc0004400, 0x00000800
+
+gOamData_83ACB28::
+ .4byte 0x00008400, 0x00000800
+
+gOamData_83ACB30::
+ .4byte 0x40008400, 0x00000800
+
+gOamData_83ACB38::
+ .4byte 0x80008400, 0x00000800
+
+gOamData_83ACB40::
+ .4byte 0xc0008400, 0x00000800
+
+gOamData_83ACB48::
+ .4byte 0x00000500, 0x00000800
+
+gOamData_83ACB50::
+ .4byte 0x40000500, 0x00000800
+
+gOamData_83ACB58::
+ .4byte 0x80000500, 0x00000800
+
+gOamData_83ACB60::
+ .4byte 0xc0000500, 0x00000800
+
+gOamData_83ACB68::
+ .4byte 0x00004500, 0x00000800
+
+gOamData_83ACB70::
+ .4byte 0x40004500, 0x00000800
+
+gOamData_83ACB78::
+ .4byte 0x80004500, 0x00000800
+
+gOamData_83ACB80::
+ .4byte 0xc0004500, 0x00000800
+
+gOamData_83ACB88::
+ .4byte 0x00008500, 0x00000800
+
+gOamData_83ACB90::
+ .4byte 0x40008500, 0x00000800
+
+gOamData_83ACB98::
+ .4byte 0x80008500, 0x00000800
+
+gOamData_83ACBA0::
+ .4byte 0xc0008500, 0x00000800
+
+gOamData_83ACBA8::
+ .4byte 0x00000700, 0x00000800
+
+gOamData_83ACBB0::
+ .4byte 0x40000700, 0x00000800
+
+gOamData_83ACBB8::
+ .4byte 0x80000700, 0x00000800
+
+gOamData_83ACBC0::
+ .4byte 0xc0000700, 0x00000800
+
+gOamData_83ACBC8::
+ .4byte 0x00004700, 0x00000800
+
+gOamData_83ACBD0::
+ .4byte 0x40004700, 0x00000800
+
+gOamData_83ACBD8::
+ .4byte 0x80004700, 0x00000800
+
+gOamData_83ACBE0::
+ .4byte 0xc0004700, 0x00000800
+
+gOamData_83ACBE8::
+ .4byte 0x00008700, 0x00000800
+
+gOamData_83ACBF0::
+ .4byte 0x40008700, 0x00000800
+
+gOamData_83ACBF8::
+ .4byte 0x80008700, 0x00000800
+
+gOamData_83ACC00::
+ .4byte 0xc0008700, 0x00000800
+
+gUnknown_83ACC08:: @ 83ACC08
+ .incbin "baserom.gba", 0x3ACC08, 0x440
+
+gUnknown_83AD048:: @ 83AD048
+ .incbin "baserom.gba", 0x3AD048, 0x308
+
+gUnknown_83AD350:: @ 83AD350
+ .incbin "baserom.gba", 0x3AD350, 0x120
+
+gUnknown_83AD470:: @ 83AD470
+ .incbin "baserom.gba", 0x3AD470, 0x4E0
+
+gUnknown_83AD950:: @ 83AD950
+ .incbin "baserom.gba", 0x3AD950, 0x308
+
+gUnknown_83ADC58:: @ 83ADC58
+ .incbin "baserom.gba", 0x3ADC58, 0x120
+
+gUnknown_83ADD78:: @ 83ADD78
+ .incbin "baserom.gba", 0x3ADD78, 0xA0
+
+gUnknown_83ADE18:: @ 83ADE18
+ .incbin "baserom.gba", 0x3ADE18, 0x144
+
+gUnknown_83ADF5C:: @ 83ADF5C
+ .incbin "baserom.gba", 0x3ADF5C, 0xC0
+
+gUnknown_83AE01C:: @ 83AE01C
+ .incbin "baserom.gba", 0x3AE01C, 0x20
+
+gUnknown_83AE03C:: @ 83AE03C
+ .incbin "baserom.gba", 0x3AE03C, 0x10
+
+gUnknown_83AE04C:: @ 83AE04C
+ .incbin "baserom.gba", 0x3AE04C, 0x4
+
+gUnknown_83AE050:: @ 83AE050
+ .incbin "baserom.gba", 0x3AE050, 0x4
+
+gUnknown_83AE054:: @ 83AE054
+ .incbin "baserom.gba", 0x3AE054, 0x30
+
+gUnknown_83AE084:: @ 83AE084
+ .incbin "baserom.gba", 0x3AE084, 0x114D0
+
+gUnknown_83BF554:: @ 83BF554
+ .incbin "baserom.gba", 0x3BF554, 0x8
+
+gUnknown_83BF55C:: @ 83BF55C
+ .incbin "baserom.gba", 0x3BF55C, 0x18
+
+gUnknown_83BF574:: @ 83BF574
+ .incbin "baserom.gba", 0x3BF574, 0x18
diff --git a/data/data_835B488.s b/data/data_835B488.s
index f01fe4ad4..032136c18 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -1,80 +1,5 @@
.section .rodata
.align 2
-gOamData_83AC9C0::
- .4byte 0x00000000, 0x00000800
-
-gUnknown_83AC9D0:: @ 83AC9D0
- .incbin "baserom.gba", 0x3AC9D0, 0x8
-
-gOamData_83AC9D8::
- .incbin "baserom.gba", 0x3AC9D8, 0x10
-
-gOamData_83AC9E8::
- .incbin "baserom.gba", 0x3AC9E8, 0x10
-
-gOamData_83AC9F8::
- .incbin "baserom.gba", 0x3AC9F8, 0x8
-
-gUnknown_83ACA00::
- .incbin "baserom.gba", 0x3ACA00, 0xF8
-
-gOamData_83ACAF8::
- .incbin "baserom.gba", 0x3ACAF8, 0x110
-
-gUnknown_83ACC08:: @ 83ACC08
- .incbin "baserom.gba", 0x3ACC08, 0x440
-
-gUnknown_83AD048:: @ 83AD048
- .incbin "baserom.gba", 0x3AD048, 0x308
-
-gUnknown_83AD350:: @ 83AD350
- .incbin "baserom.gba", 0x3AD350, 0x120
-
-gUnknown_83AD470:: @ 83AD470
- .incbin "baserom.gba", 0x3AD470, 0x4E0
-
-gUnknown_83AD950:: @ 83AD950
- .incbin "baserom.gba", 0x3AD950, 0x308
-
-gUnknown_83ADC58:: @ 83ADC58
- .incbin "baserom.gba", 0x3ADC58, 0x120
-
-gUnknown_83ADD78:: @ 83ADD78
- .incbin "baserom.gba", 0x3ADD78, 0xA0
-
-gUnknown_83ADE18:: @ 83ADE18
- .incbin "baserom.gba", 0x3ADE18, 0x144
-
-gUnknown_83ADF5C:: @ 83ADF5C
- .incbin "baserom.gba", 0x3ADF5C, 0xC0
-
-gUnknown_83AE01C:: @ 83AE01C
- .incbin "baserom.gba", 0x3AE01C, 0x20
-
-gUnknown_83AE03C:: @ 83AE03C
- .incbin "baserom.gba", 0x3AE03C, 0x10
-
-gUnknown_83AE04C:: @ 83AE04C
- .incbin "baserom.gba", 0x3AE04C, 0x4
-
-gUnknown_83AE050:: @ 83AE050
- .incbin "baserom.gba", 0x3AE050, 0x4
-
-gUnknown_83AE054:: @ 83AE054
- .incbin "baserom.gba", 0x3AE054, 0x30
-
-gUnknown_83AE084:: @ 83AE084
- .incbin "baserom.gba", 0x3AE084, 0x114D0
-
-gUnknown_83BF554:: @ 83BF554
- .incbin "baserom.gba", 0x3BF554, 0x8
-
-gUnknown_83BF55C:: @ 83BF55C
- .incbin "baserom.gba", 0x3BF55C, 0x18
-
-gUnknown_83BF574:: @ 83BF574
- .incbin "baserom.gba", 0x3BF574, 0x18
-
gUnknown_83BF58C:: @ 83BF58C
.incbin "baserom.gba", 0x3BF58C, 0x1C
diff --git a/ld_script.txt b/ld_script.txt
index ba6b4f9bf..4b9645de2 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -382,6 +382,7 @@ SECTIONS {
data/tileset_anims.o(.rodata);
data/palette.o(.rodata);
src/sound.o(.rodata);
+ data/battle_anim.o(.rodata);
data/data_835B488.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data_83F5738.o(.rodata);
diff --git a/src/text.c b/src/text.c
index 86b60485d..d83b36f88 100644
--- a/src/text.c
+++ b/src/text.c
@@ -9,7 +9,7 @@
extern u8 gGlyphInfo[0x90];
extern u8 gUnknown_203ADFA;
extern u16 gUnknown_841F408[];
-extern const struct OamData gUnknown_83AC9D0;
+extern const struct OamData gOamData_83AC9D0;
extern void FillBitmapRect4Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
extern void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);
@@ -60,7 +60,7 @@ const struct SpriteTemplate gUnknown_81EA6B4 =
{
.tileTag = 0x8000,
.paletteTag = 0x8000,
- .oam = &gUnknown_83AC9D0,
+ .oam = &gOamData_83AC9D0,
.anims = gDummySpriteAnimTable,
.images = NULL,
.affineAnims = gDummySpriteAffineAnimTable,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 09:04:35 +0000