summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/data_835B488.s131
-rw-r--r--data/field_weather.s101
-rw-r--r--data/title_screen.s34
-rw-r--r--ld_script.txt2
4 files changed, 137 insertions, 131 deletions
diff --git a/data/data_835B488.s b/data/data_835B488.s
index 032136c18..1377d8599 100644
--- a/data/data_835B488.s
+++ b/data/data_835B488.s
@@ -1,136 +1,5 @@
.section .rodata
.align 2
-gUnknown_83BF58C:: @ 83BF58C
- .incbin "baserom.gba", 0x3BF58C, 0x1C
-
-gUnknown_83BF5A8:: @ 83BF5A8
- .incbin "baserom.gba", 0x3BF5A8, 0x55C
-
-gUnknown_83BFB04:: @ 83BFB04
- .incbin "baserom.gba", 0x3BFB04, 0x18
-
-gUnknown_83BFB1C:: @ 83BFB1C
- .incbin "baserom.gba", 0x3BFB1C, 0x20
-
-gUnknown_83BFB3C:: @ 83BFB3C
- .incbin "baserom.gba", 0x3BFB3C, 0x20
-
-gUnknown_83BFB5C:: @ 83BFB5C
- .incbin "baserom.gba", 0x3BFB5C, 0x18
-
-gUnknown_83BFB74:: @ 83BFB74
- .incbin "baserom.gba", 0x3BFB74, 0x10
-
-gUnknown_83BFB84:: @ 83BFB84
- .incbin "baserom.gba", 0x3BFB84, 0x18
-
-gUnknown_83BFB9C:: @ 83BFB9C
- .incbin "baserom.gba", 0x3BFB9C, 0x20
-
-gUnknown_83BFBBC:: @ 83BFBBC
- .incbin "baserom.gba", 0x3BFBBC, 0x18
-
-gUnknown_83BFBD4:: @ 83BFBD4
- .incbin "baserom.gba", 0x3BFBD4, 0x2FE8
-
-gUnknown_83C2BBC:: @ 83C2BBC
- .incbin "baserom.gba", 0x3C2BBC, 0x4
-
-gUnknown_83C2BC0:: @ 83C2BC0
- .incbin "baserom.gba", 0x3C2BC0, 0xF0
-
-gUnknown_83C2CB0:: @ 83C2CB0
- .incbin "baserom.gba", 0x3C2CB0, 0x10
-
-gUnknown_83C2CC0:: @ 83C2CC0
- .incbin "baserom.gba", 0x3C2CC0, 0x20
-
-gUnknown_83C2CE0:: @ 83C2CE0
- .incbin "baserom.gba", 0x3C2CE0, 0x20
-
-gUnknown_83C2D00:: @ 83C2D00
- .incbin "baserom.gba", 0x3C2D00, 0x20
-
-gUnknown_83C2D20:: @ 83C2D20
- .incbin "baserom.gba", 0x3C2D20, 0x820
-
-gUnknown_83C3540:: @ 83C3540
- .incbin "baserom.gba", 0x3C3540, 0x3080
-
-gUnknown_83C65C0:: @ 83C65C0
- .incbin "baserom.gba", 0x3C65C0, 0x4
-
-gUnknown_83C65C4:: @ 83C65C4
- .incbin "baserom.gba", 0x3C65C4, 0x4
-
-gUnknown_83C65C8:: @ 83C65C8
- .incbin "baserom.gba", 0x3C65C8, 0xC
-
-gUnknown_83C65D4:: @ 83C65D4
- .incbin "baserom.gba", 0x3C65D4, 0x1C
-
-gUnknown_83C65F0:: @ 83C65F0
- .incbin "baserom.gba", 0x3C65F0, 0x18
-
-gUnknown_83C6608:: @ 83C6608
- .incbin "baserom.gba", 0x3C6608, 0x9C
-
-gUnknown_83C66A4:: @ 83C66A4
- .incbin "baserom.gba", 0x3C66A4, 0x18
-
-gUnknown_83C66BC:: @ 83C66BC
- .incbin "baserom.gba", 0x3C66BC, 0x8
-
-gUnknown_83C66C4:: @ 83C66C4
- .incbin "baserom.gba", 0x3C66C4, 0x8
-
-gUnknown_83C66CC:: @ 83C66CC
- .incbin "baserom.gba", 0x3C66CC, 0x38
-
-gUnknown_83C6704:: @ 83C6704
- .incbin "baserom.gba", 0x3C6704, 0x8C
-
-gUnknown_83C6790:: @ 83C6790
- .incbin "baserom.gba", 0x3C6790, 0x18
-
-gUnknown_83C67A8:: @ 83C67A8
- .incbin "baserom.gba", 0x3C67A8, 0x8
-
-gUnknown_83C67B0:: @ 83C67B0
- .incbin "baserom.gba", 0x3C67B0, 0x20
-
-gUnknown_83C67D0:: @ 83C67D0
- .incbin "baserom.gba", 0x3C67D0, 0x18
-
-gUnknown_83C67E8:: @ 83C67E8
- .incbin "baserom.gba", 0x3C67E8, 0x1C
-
-gUnknown_83C6804:: @ 83C6804
- .incbin "baserom.gba", 0x3C6804, 0x38
-
-gUnknown_83C683C:: @ 83C683C
- .incbin "baserom.gba", 0x3C683C, 0x18
-
-gUnknown_83C6854:: @ 83C6854
- .incbin "baserom.gba", 0x3C6854, 0x8
-
-gUnknown_83C685C:: @ 83C685C
- .incbin "baserom.gba", 0x3C685C, 0xC
-
-gUnknown_83C6868:: @ 83C6868
- .incbin "baserom.gba", 0x3C6868, 0x8
-
-gUnknown_83C6870:: @ 83C6870
- .incbin "baserom.gba", 0x3C6870, 0x8
-
-gUnknown_83C6878:: @ 83C6878
- .incbin "baserom.gba", 0x3C6878, 0x44
-
-gUnknown_83C68BC:: @ 83C68BC
- .incbin "baserom.gba", 0x3C68BC, 0x18
-
-gUnknown_83C68D4:: @ 83C68D4
- .incbin "baserom.gba", 0x3C68D4, 0xC
gUnknown_83C68E0:: @ 83C68E0
.incbin "baserom.gba", 0x3C68E0, 0x4
diff --git a/data/field_weather.s b/data/field_weather.s
new file mode 100644
index 000000000..a25e44344
--- /dev/null
+++ b/data/field_weather.s
@@ -0,0 +1,101 @@
+ .section .rodata
+ .align 2
+
+gUnknown_83C2BBC:: @ 83C2BBC
+ .incbin "baserom.gba", 0x3C2BBC, 0x4
+
+gUnknown_83C2BC0:: @ 83C2BC0
+ .incbin "baserom.gba", 0x3C2BC0, 0xF0
+
+gUnknown_83C2CB0:: @ 83C2CB0
+ .incbin "baserom.gba", 0x3C2CB0, 0x10
+
+gUnknown_83C2CC0:: @ 83C2CC0
+ .incbin "baserom.gba", 0x3C2CC0, 0x20
+
+gUnknown_83C2CE0:: @ 83C2CE0
+ .incbin "baserom.gba", 0x3C2CE0, 0x20
+
+gUnknown_83C2D00:: @ 83C2D00
+ .incbin "baserom.gba", 0x3C2D00, 0x20
+
+gUnknown_83C2D20:: @ 83C2D20
+ .incbin "baserom.gba", 0x3C2D20, 0x820
+
+gUnknown_83C3540:: @ 83C3540
+ .incbin "baserom.gba", 0x3C3540, 0x3080
+
+gUnknown_83C65C0:: @ 83C65C0
+ .incbin "baserom.gba", 0x3C65C0, 0x4
+
+gUnknown_83C65C4:: @ 83C65C4
+ .incbin "baserom.gba", 0x3C65C4, 0x4
+
+gUnknown_83C65C8:: @ 83C65C8
+ .incbin "baserom.gba", 0x3C65C8, 0xC
+
+gUnknown_83C65D4:: @ 83C65D4
+ .incbin "baserom.gba", 0x3C65D4, 0x1C
+
+gUnknown_83C65F0:: @ 83C65F0
+ .incbin "baserom.gba", 0x3C65F0, 0x18
+
+gUnknown_83C6608:: @ 83C6608
+ .incbin "baserom.gba", 0x3C6608, 0x9C
+
+gUnknown_83C66A4:: @ 83C66A4
+ .incbin "baserom.gba", 0x3C66A4, 0x18
+
+gUnknown_83C66BC:: @ 83C66BC
+ .incbin "baserom.gba", 0x3C66BC, 0x8
+
+gUnknown_83C66C4:: @ 83C66C4
+ .incbin "baserom.gba", 0x3C66C4, 0x8
+
+gUnknown_83C66CC:: @ 83C66CC
+ .incbin "baserom.gba", 0x3C66CC, 0x38
+
+gUnknown_83C6704:: @ 83C6704
+ .incbin "baserom.gba", 0x3C6704, 0x8C
+
+gUnknown_83C6790:: @ 83C6790
+ .incbin "baserom.gba", 0x3C6790, 0x18
+
+gUnknown_83C67A8:: @ 83C67A8
+ .incbin "baserom.gba", 0x3C67A8, 0x8
+
+gUnknown_83C67B0:: @ 83C67B0
+ .incbin "baserom.gba", 0x3C67B0, 0x20
+
+gUnknown_83C67D0:: @ 83C67D0
+ .incbin "baserom.gba", 0x3C67D0, 0x18
+
+gUnknown_83C67E8:: @ 83C67E8
+ .incbin "baserom.gba", 0x3C67E8, 0x1C
+
+gUnknown_83C6804:: @ 83C6804
+ .incbin "baserom.gba", 0x3C6804, 0x38
+
+gUnknown_83C683C:: @ 83C683C
+ .incbin "baserom.gba", 0x3C683C, 0x18
+
+gUnknown_83C6854:: @ 83C6854
+ .incbin "baserom.gba", 0x3C6854, 0x8
+
+gUnknown_83C685C:: @ 83C685C
+ .incbin "baserom.gba", 0x3C685C, 0xC
+
+gUnknown_83C6868:: @ 83C6868
+ .incbin "baserom.gba", 0x3C6868, 0x8
+
+gUnknown_83C6870:: @ 83C6870
+ .incbin "baserom.gba", 0x3C6870, 0x8
+
+gUnknown_83C6878:: @ 83C6878
+ .incbin "baserom.gba", 0x3C6878, 0x44
+
+gUnknown_83C68BC:: @ 83C68BC
+ .incbin "baserom.gba", 0x3C68BC, 0x18
+
+gUnknown_83C68D4:: @ 83C68D4
+ .incbin "baserom.gba", 0x3C68D4, 0xC
diff --git a/data/title_screen.s b/data/title_screen.s
new file mode 100644
index 000000000..93d0f2f83
--- /dev/null
+++ b/data/title_screen.s
@@ -0,0 +1,34 @@
+ .section .rodata
+ .align 2
+gUnknown_83BF58C:: @ 83BF58C
+ .incbin "baserom.gba", 0x3BF58C, 0x1C
+
+gUnknown_83BF5A8:: @ 83BF5A8
+ .incbin "baserom.gba", 0x3BF5A8, 0x55C
+
+gUnknown_83BFB04:: @ 83BFB04
+ .incbin "baserom.gba", 0x3BFB04, 0x18
+
+gUnknown_83BFB1C:: @ 83BFB1C
+ .incbin "baserom.gba", 0x3BFB1C, 0x20
+
+gUnknown_83BFB3C:: @ 83BFB3C
+ .incbin "baserom.gba", 0x3BFB3C, 0x20
+
+gUnknown_83BFB5C:: @ 83BFB5C
+ .incbin "baserom.gba", 0x3BFB5C, 0x18
+
+gUnknown_83BFB74:: @ 83BFB74
+ .incbin "baserom.gba", 0x3BFB74, 0x10
+
+gUnknown_83BFB84:: @ 83BFB84
+ .incbin "baserom.gba", 0x3BFB84, 0x18
+
+gUnknown_83BFB9C:: @ 83BFB9C
+ .incbin "baserom.gba", 0x3BFB9C, 0x20
+
+gUnknown_83BFBBC:: @ 83BFBBC
+ .incbin "baserom.gba", 0x3BFBBC, 0x18
+
+gUnknown_83BFBD4:: @ 83BFBD4
+ .incbin "baserom.gba", 0x3BFBD4, 0x2FE8
diff --git a/ld_script.txt b/ld_script.txt
index 4b9645de2..090b18fa1 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -383,6 +383,8 @@ SECTIONS {
data/palette.o(.rodata);
src/sound.o(.rodata);
data/battle_anim.o(.rodata);
+ data/title_screen.o(.rodata);
+ data/field_weather.o(.rodata);
data/data_835B488.o(.rodata);
src/battle_ai_script_commands.o(.rodata);
data/data_83F5738.o(.rodata);