summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-30 09:22:59 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-30 09:22:59 +0200
commit2766bd78df51c90175b66dd344fe4211121b9749 (patch)
treebbfdcb954ee266378ce3c1525241e151ac6becb9 /data
parent5d9d9c14235c93ac35f8833cdaca8f0d0b9b9c36 (diff)
split the second file
Diffstat (limited to 'data')
-rw-r--r--data/battle_tower.s (renamed from data/rom_85CECB0.s)51
-rw-r--r--data/use_pokeblock.s55
2 files changed, 55 insertions, 51 deletions
diff --git a/data/rom_85CECB0.s b/data/battle_tower.s
index c0233bb8c..a952e0773 100644
--- a/data/rom_85CECB0.s
+++ b/data/battle_tower.s
@@ -101,54 +101,3 @@ gUnknown_085DFA46:: @ 85DFA46
gUnknown_085DFA52:: @ 85DFA52
.incbin "baserom.gba", 0x5dfa52, 0xe
-
-gUnknown_085DFA60:: @ 85DFA60
- .incbin "baserom.gba", 0x5dfa60, 0x20
-
-gUnknown_085DFA80:: @ 85DFA80
- .incbin "baserom.gba", 0x5dfa80, 0xe0
-
-gUnknown_085DFB60:: @ 85DFB60
- .incbin "baserom.gba", 0x5dfb60, 0xac
-
-gUnknown_085DFC0C:: @ 85DFC0C
- .incbin "baserom.gba", 0x5dfc0c, 0xa4
-
-gUnknown_085DFCB0:: @ 85DFCB0
- .incbin "baserom.gba", 0x5dfcb0, 0x14
-
-gUnknown_085DFCC4:: @ 85DFCC4
- .incbin "baserom.gba", 0x5dfcc4, 0x5
-
-gUnknown_085DFCC9:: @ 85DFCC9
- .incbin "baserom.gba", 0x5dfcc9, 0x3
-
-gUnknown_085DFCCC:: @ 85DFCCC
- .incbin "baserom.gba", 0x5dfccc, 0x10
-
-gUnknown_085DFCDC:: @ 85DFCDC
- .incbin "baserom.gba", 0x5dfcdc, 0x20
-
-gUnknown_085DFCFC:: @ 85DFCFC
- .incbin "baserom.gba", 0x5dfcfc, 0x8
-
-gUnknown_085DFD04:: @ 85DFD04
- .incbin "baserom.gba", 0x5dfd04, 0x14
-
-gUnknown_085DFD18:: @ 85DFD18
- .incbin "baserom.gba", 0x5dfd18, 0x8
-
-gUnknown_085DFD20:: @ 85DFD20
- .incbin "baserom.gba", 0x5dfd20, 0x8
-
-gUnknown_085DFD28:: @ 85DFD28
- .incbin "baserom.gba", 0x5dfd28, 0x34
-
-gUnknown_085DFD5C:: @ 85DFD5C
- .incbin "baserom.gba", 0x5dfd5c, 0x44
-
-gUnknown_085DFDA0:: @ 85DFDA0
- .incbin "baserom.gba", 0x5dfda0, 0x18
-
-gUnknown_085DFDB8:: @ 85DFDB8
- .incbin "baserom.gba", 0x5dfdb8, 0x8
diff --git a/data/use_pokeblock.s b/data/use_pokeblock.s
new file mode 100644
index 000000000..9b557a0dd
--- /dev/null
+++ b/data/use_pokeblock.s
@@ -0,0 +1,55 @@
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
+ .section .rodata
+
+gUnknown_085DFA60:: @ 85DFA60
+ .incbin "baserom.gba", 0x5dfa60, 0x20
+
+gUnknown_085DFA80:: @ 85DFA80
+ .incbin "baserom.gba", 0x5dfa80, 0xe0
+
+gUnknown_085DFB60:: @ 85DFB60
+ .incbin "baserom.gba", 0x5dfb60, 0xac
+
+gUnknown_085DFC0C:: @ 85DFC0C
+ .incbin "baserom.gba", 0x5dfc0c, 0xa4
+
+gUnknown_085DFCB0:: @ 85DFCB0
+ .incbin "baserom.gba", 0x5dfcb0, 0x14
+
+gUnknown_085DFCC4:: @ 85DFCC4
+ .incbin "baserom.gba", 0x5dfcc4, 0x5
+
+gUnknown_085DFCC9:: @ 85DFCC9
+ .incbin "baserom.gba", 0x5dfcc9, 0x3
+
+gUnknown_085DFCCC:: @ 85DFCCC
+ .incbin "baserom.gba", 0x5dfccc, 0x10
+
+gUnknown_085DFCDC:: @ 85DFCDC
+ .incbin "baserom.gba", 0x5dfcdc, 0x20
+
+gUnknown_085DFCFC:: @ 85DFCFC
+ .incbin "baserom.gba", 0x5dfcfc, 0x8
+
+gUnknown_085DFD04:: @ 85DFD04
+ .incbin "baserom.gba", 0x5dfd04, 0x14
+
+gUnknown_085DFD18:: @ 85DFD18
+ .incbin "baserom.gba", 0x5dfd18, 0x8
+
+gUnknown_085DFD20:: @ 85DFD20
+ .incbin "baserom.gba", 0x5dfd20, 0x8
+
+gUnknown_085DFD28:: @ 85DFD28
+ .incbin "baserom.gba", 0x5dfd28, 0x34
+
+gUnknown_085DFD5C:: @ 85DFD5C
+ .incbin "baserom.gba", 0x5dfd5c, 0x44
+
+gUnknown_085DFDA0:: @ 85DFDA0
+ .incbin "baserom.gba", 0x5dfda0, 0x18
+
+gUnknown_085DFDB8:: @ 85DFDB8
+ .incbin "baserom.gba", 0x5dfdb8, 0x8