summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/data_80F4E2C.s25
-rw-r--r--data/data_80F54B4.s22
-rw-r--r--data/data_8106A4C.s15
-rw-r--r--data/data_8106F7C.s9
4 files changed, 31 insertions, 40 deletions
diff --git a/data/data_80F4E2C.s b/data/data_80F4E2C.s
index 367ed2e..1d81050 100644
--- a/data/data_80F4E2C.s
+++ b/data/data_80F4E2C.s
@@ -805,28 +805,3 @@ gUnknown_80F51EC: @ 80F51EC
.global gUnknown_80F520C
gUnknown_80F520C: @ 80F520C
.incbin "baserom.gba", 0xF520C, 0x20
-
- .global gTypeEffectivenessChart
-gTypeEffectivenessChart: @ 80F522C
- .incbin "baserom.gba", 0xF522C, 0x288
-
- .global gUnknown_80F54B4
-gUnknown_80F54B4: @ 80F54B4
- .incbin "baserom.gba", 0xF54B4, 0x40
-
- .global gUnknown_80F54F4
-gUnknown_80F54F4: @ 80F54F4
- .incbin "baserom.gba", 0xF54F4, 0xA0
-
- .global gWarpScarfActivationChances
-gWarpScarfActivationChances: @ 80F5594
-@ replacing .incbin "baserom.gba", 0xF5594, 0x28
- .2byte 0, 6, 12, 30, 50, 70, 90, 110, 130, 150, 170, 190, 210, 230, 250, 270, 290, 310, 999, 0
-
- .global gUnknown_80F55BC
-gUnknown_80F55BC: @ 80F55BC
- .incbin "baserom.gba", 0xF55BC, 0x30
-
- .global gUnknown_80F55EC
-gUnknown_80F55EC: @ 80F55EC
- .incbin "baserom.gba", 0xF55EC, 0x30
diff --git a/data/data_80F54B4.s b/data/data_80F54B4.s
new file mode 100644
index 0000000..3b2262a
--- /dev/null
+++ b/data/data_80F54B4.s
@@ -0,0 +1,22 @@
+ .section .rodata
+
+ .global gUnknown_80F54B4
+gUnknown_80F54B4: @ 80F54B4
+ .incbin "baserom.gba", 0xF54B4, 0x40
+
+ .global gUnknown_80F54F4
+gUnknown_80F54F4: @ 80F54F4
+ .incbin "baserom.gba", 0xF54F4, 0xA0
+
+ .global gWarpScarfActivationChances
+gWarpScarfActivationChances: @ 80F5594
+@ replacing .incbin "baserom.gba", 0xF5594, 0x28
+ .2byte 0, 6, 12, 30, 50, 70, 90, 110, 130, 150, 170, 190, 210, 230, 250, 270, 290, 310, 999, 0
+
+ .global gUnknown_80F55BC
+gUnknown_80F55BC: @ 80F55BC
+ .incbin "baserom.gba", 0xF55BC, 0x30
+
+ .global gUnknown_80F55EC
+gUnknown_80F55EC: @ 80F55EC
+ .incbin "baserom.gba", 0xF55EC, 0x30
diff --git a/data/data_8106A4C.s b/data/data_8106A4C.s
index d8e604b..5cb7a3b 100644
--- a/data/data_8106A4C.s
+++ b/data/data_8106A4C.s
@@ -347,18 +347,3 @@ gUnknown_8106F54: @ 8106F54
gUnknown_8106F64: @ 8106F64
.byte 0x00, 0x00, 0x00, 0x00
.byte 0x00, 0xC0, 0x00, 0x00
-
- .global gTypeEffectivenessMultipliers
-gTypeEffectivenessMultipliers: @ 8106F6C
- .byte 0x00, 0x00, 0x00, 0x00
- .byte 0x01, 0x00, 0x00, 0x00
- .byte 0x02, 0x00, 0x00, 0x00
- .byte 0x04, 0x00, 0x00, 0x00
-
- .global gUnknown_8106F7C
-gUnknown_8106F7C: @ 8106F7C
- .incbin "baserom.gba", 0x106F7C, 0x28
-
- .global gUnknown_8106FA4
-gUnknown_8106FA4: @ 8106FA4
- .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"
diff --git a/data/data_8106F7C.s b/data/data_8106F7C.s
new file mode 100644
index 0000000..07165d7
--- /dev/null
+++ b/data/data_8106F7C.s
@@ -0,0 +1,9 @@
+ .section .rodata
+
+ .global gUnknown_8106F7C
+gUnknown_8106F7C: @ 8106F7C
+ .incbin "baserom.gba", 0x106F7C, 0x28
+
+ .global gUnknown_8106FA4
+gUnknown_8106FA4: @ 8106FA4
+ .string "{COLOR_2}%c%s{END_COLOR_TEXT_2}\0"