summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-06-18 17:56:20 -0500
committerSeth Barberee <seth.barberee@gmail.com>2021-06-18 17:56:20 -0500
commitf1fdcc2b0ade13ad1a4cc7360eac70f27396d26a (patch)
tree3ac5b9f61650299f96095e3d3c09ad771793be08 /data
parente806b05526bfcc540cb2c1f3165a96e76f6c235d (diff)
more splitting and labeling with some decomp
Diffstat (limited to 'data')
-rw-r--r--data/data_80E2068.s14
-rw-r--r--data/data_80F4278.s26
-rw-r--r--data/data_810AE24.s2
-rw-r--r--data/text/chunsoft.inc11
4 files changed, 27 insertions, 26 deletions
diff --git a/data/data_80E2068.s b/data/data_80E2068.s
index be653e5..094f272 100644
--- a/data/data_80E2068.s
+++ b/data/data_80E2068.s
@@ -1412,7 +1412,19 @@ gUnknown_80E6DDC: @ 80E6DDC
gUnknown_80E6DF4: @ 80E6DF4
.incbin "baserom.gba", 0xE6DF4, 0x5C
- .include "data/text/chunsoft.inc"
+ .global gUnknown_80E6E50
+gUnknown_80E6E50:: @ 80E6E50
+ .string "CHUNSOFT\0"
+ .align 2,0
+
+ .string "pksdir0\0"
+
+ .string "pksdir0\0"
+
+ .string "pksdir0\0"
+
+ .string "pksdir0\0"
+
.global gUnknown_80E6E7C
gUnknown_80E6E7C: @ 80E6E7C
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index f1d78e9..9203841 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -8224,7 +8224,7 @@ gUnknown_810A350: @ 810A350
.byte 0x18, 0x19, 0x1e, 0x27, 0x31, 0x32, 0x33, 0x36, 0x37, 0x3d, 0x3f
.global gUnknown_810A35B
-gUnknown_810A35B: @ 810A35B
+gUnknown_810A35B: @ 810A35B (item related)
@ replacing .incbin "baserom.gba", 0x0010a35b, 0x10
.byte 0xed, 0xee, 0xef, 0xb1, 0xe9, 0x24, 0xd8, 0xd2, 0xb0, 0xdc, 0x32, 0x33, 0x34, 0xc2, 0xec, 0xf0
@@ -8248,18 +8248,18 @@ gUnknown_810A36B: @ 810A36B
.global gUnknown_810A378
gUnknown_810A378: @ 810A378
@ replacing .incbin "baserom.gba", 0x0010a378, 0x18
- .byte 0x01, 0x00
- .byte 0x19, 0x00
- .byte 0x01, 0x00
- .byte 0x01, 0x00
- .byte 0xe7, 0x03
- .byte 0xe7, 0x03
- .byte 0x23, 0x00
- .byte 0x28, 0x00
- .byte 0x14, 0x00
- .byte 0x0f, 0x00
- .byte 0x0a, 0x00
- .byte 0xe7, 0x03
+ .2byte 0x01
+ .2byte 0x19
+ .2byte 0x01
+ .2byte 0x01
+ .2byte 0x3e7
+ .2byte 0x3e7
+ .2byte 0x23
+ .2byte 0x28
+ .2byte 0x14
+ .2byte 0x0f
+ .2byte 0x0a
+ .2byte 0x3e7
.global gUnknown_810A390
gUnknown_810A390: @ 810A390
diff --git a/data/data_810AE24.s b/data/data_810AE24.s
index a699873..5e8528f 100644
--- a/data/data_810AE24.s
+++ b/data/data_810AE24.s
@@ -888,7 +888,7 @@ gUnknown_8116258: @ 8116258
.byte 0x01, 0x00, 0x00, 0x00
.byte 0x00, 0x00, 0x00, 0x00
.4byte CleanHelperPelipper
- .4byte sub_8031540
+ .4byte HelperPelliperCallback
.global gUnknown_8116268
gUnknown_8116268: @ 8116268
diff --git a/data/text/chunsoft.inc b/data/text/chunsoft.inc
deleted file mode 100644
index 19c7513..0000000
--- a/data/text/chunsoft.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-gUnknown_80E6E50:: @ 80E6E50
- .string "CHUNSOFT\0"
- .align 2,0
-
- .string "pksdir0\0"
-
- .string "pksdir0\0"
-
- .string "pksdir0\0"
-
- .string "pksdir0\0"