summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arm9/arm9.lcf1
-rw-r--r--arm9/asm/unk_02034710.s62
-rw-r--r--arm9/asm/unk_02034E84.s64
3 files changed, 64 insertions, 63 deletions
diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf
index 46c4b318..080f8d30 100644
--- a/arm9/arm9.lcf
+++ b/arm9/arm9.lcf
@@ -635,6 +635,7 @@ SECTIONS {
unk_02033F50.o (.rodata)
unk_02034188.o (.rodata)
unk_02034710.o (.rodata)
+ unk_02034E84.o (.rodata)
unk_02034FE4.o (.rodata)
unk_02035068.o (.rodata)
unk_020377B0.o (.rodata)
diff --git a/arm9/asm/unk_02034710.s b/arm9/asm/unk_02034710.s
index fb727215..965a7bb6 100644
--- a/arm9/asm/unk_02034710.s
+++ b/arm9/asm/unk_02034710.s
@@ -612,68 +612,6 @@ UNK_020EEDBC: ; 0x020EEDBC
map_header 0x2e, 0xf, 0x42, 0x170, 0x33b, 0x12, 0x428, 0x428, 0xffff, 0x0, MAPSEC_TURNBACK_CAVE, 0xe, 0x0, 0x3, 0x7b
map_header 0x20, 0xf, 0xa6, 0x74, 0x243, 0x79, 0x441, 0x441, 0xffff, 0x1ff, MAPSEC_CONTEST_HALL, 0x0, 0x0, 0x4, 0x7
- .global UNK_020F2224
-UNK_020F2224: ; 0x020F2224
- .short 0x019E, 0x0008, 0x0008, 0x019B, 0x0074, 0x0376
- .byte 0x01, 0x01, 0x00, 0x00
-
- .short 0x01A4, 0x0008, 0x0006, 0x01A2, 0x00B1, 0x034B
- .byte 0x01, 0x01, 0x01, 0x00
-
- .short 0x01AC, 0x0008, 0x0006, 0x01AA, 0x00B0, 0x029B
- .byte 0x01, 0x01, 0x02, 0x00
-
- .short 0x01B3, 0x0008, 0x0006, 0x01B1, 0x0236, 0x0291
- .byte 0x01, 0x01, 0x03, 0x00
-
- .short 0x01BB, 0x0008, 0x0006, 0x01BA, 0x01D8, 0x021B
- .byte 0x01, 0x01, 0x04, 0x00
-
- .short 0x0006, 0x0008, 0x0006, 0x0003, 0x00B4, 0x0309
- .byte 0x01, 0x01, 0x07, 0x00
-
- .short 0x0024, 0x0008, 0x0006, 0x0021, 0x003A, 0x02D3
- .byte 0x01, 0x01, 0x08, 0x00
-
- .short 0x0030, 0x0008, 0x0006, 0x002D, 0x012F, 0x02F5
- .byte 0x01, 0x01, 0x09, 0x00
-
- .short 0x0045, 0x0008, 0x0006, 0x0041, 0x0131, 0x0213
- .byte 0x01, 0x01, 0x0A, 0x00
-
- .short 0x0065, 0x0008, 0x0006, 0x0056, 0x01D1, 0x02BA
- .byte 0x01, 0x01, 0x0B, 0x00
-
- .short 0x007B, 0x0008, 0x0006, 0x0078, 0x0258, 0x0330
- .byte 0x01, 0x01, 0x0C, 0x00
-
- .short 0x0086, 0x0008, 0x0006, 0x0084, 0x02CD, 0x0264
- .byte 0x01, 0x01, 0x0D, 0x00
-
- .short 0x0097, 0x0008, 0x0006, 0x0096, 0x035C, 0x0311
- .byte 0x01, 0x01, 0x0E, 0x00
-
- .short 0x00A8, 0x0008, 0x0006, 0x00A5, 0x017B, 0x00EA
- .byte 0x01, 0x01, 0x0F, 0x00
-
- .short 0x00AD, 0x0008, 0x0006, 0x00AC, 0x034A, 0x0257
- .byte 0x01, 0x00, 0x10, 0x00
-
- .short 0x00BD, 0x0008, 0x0006, 0x00BC, 0x0287, 0x01B0
- .byte 0x01, 0x01, 0x11, 0x00
-
- .short 0x01C4, 0x0008, 0x0006, 0x01C2, 0x0291, 0x0153
- .byte 0x01, 0x01, 0x05, 0x00
-
- .short 0x01CB, 0x0008, 0x0006, 0x01C9, 0x0327, 0x01CA
- .byte 0x01, 0x01, 0x06, 0x00
-
- .short 0x0189, 0x0008, 0x0006, 0x0188, 0x0132, 0x038E
- .byte 0x00, 0x00, 0x42, 0x00
-
- .short 0x00AF, 0x0004, 0x0006, 0x00AC, 0x034F, 0x0230
- .byte 0x01, 0x00, 0x44, 0x00
-
.text
thumb_func_start FUN_02034710
diff --git a/arm9/asm/unk_02034E84.s b/arm9/asm/unk_02034E84.s
index acee45c4..f9c569d9 100644
--- a/arm9/asm/unk_02034E84.s
+++ b/arm9/asm/unk_02034E84.s
@@ -1,7 +1,69 @@
.include "asm/macros.inc"
.include "global.inc"
- .extern UNK_020F2224
+ .rodata
+
+ .global UNK_020F2224
+UNK_020F2224: ; 0x020F2224
+ .short 0x019E, 0x0008, 0x0008, 0x019B, 0x0074, 0x0376
+ .byte 0x01, 0x01, 0x00, 0x00
+
+ .short 0x01A4, 0x0008, 0x0006, 0x01A2, 0x00B1, 0x034B
+ .byte 0x01, 0x01, 0x01, 0x00
+
+ .short 0x01AC, 0x0008, 0x0006, 0x01AA, 0x00B0, 0x029B
+ .byte 0x01, 0x01, 0x02, 0x00
+
+ .short 0x01B3, 0x0008, 0x0006, 0x01B1, 0x0236, 0x0291
+ .byte 0x01, 0x01, 0x03, 0x00
+
+ .short 0x01BB, 0x0008, 0x0006, 0x01BA, 0x01D8, 0x021B
+ .byte 0x01, 0x01, 0x04, 0x00
+
+ .short 0x0006, 0x0008, 0x0006, 0x0003, 0x00B4, 0x0309
+ .byte 0x01, 0x01, 0x07, 0x00
+
+ .short 0x0024, 0x0008, 0x0006, 0x0021, 0x003A, 0x02D3
+ .byte 0x01, 0x01, 0x08, 0x00
+
+ .short 0x0030, 0x0008, 0x0006, 0x002D, 0x012F, 0x02F5
+ .byte 0x01, 0x01, 0x09, 0x00
+
+ .short 0x0045, 0x0008, 0x0006, 0x0041, 0x0131, 0x0213
+ .byte 0x01, 0x01, 0x0A, 0x00
+
+ .short 0x0065, 0x0008, 0x0006, 0x0056, 0x01D1, 0x02BA
+ .byte 0x01, 0x01, 0x0B, 0x00
+
+ .short 0x007B, 0x0008, 0x0006, 0x0078, 0x0258, 0x0330
+ .byte 0x01, 0x01, 0x0C, 0x00
+
+ .short 0x0086, 0x0008, 0x0006, 0x0084, 0x02CD, 0x0264
+ .byte 0x01, 0x01, 0x0D, 0x00
+
+ .short 0x0097, 0x0008, 0x0006, 0x0096, 0x035C, 0x0311
+ .byte 0x01, 0x01, 0x0E, 0x00
+
+ .short 0x00A8, 0x0008, 0x0006, 0x00A5, 0x017B, 0x00EA
+ .byte 0x01, 0x01, 0x0F, 0x00
+
+ .short 0x00AD, 0x0008, 0x0006, 0x00AC, 0x034A, 0x0257
+ .byte 0x01, 0x00, 0x10, 0x00
+
+ .short 0x00BD, 0x0008, 0x0006, 0x00BC, 0x0287, 0x01B0
+ .byte 0x01, 0x01, 0x11, 0x00
+
+ .short 0x01C4, 0x0008, 0x0006, 0x01C2, 0x0291, 0x0153
+ .byte 0x01, 0x01, 0x05, 0x00
+
+ .short 0x01CB, 0x0008, 0x0006, 0x01C9, 0x0327, 0x01CA
+ .byte 0x01, 0x01, 0x06, 0x00
+
+ .short 0x0189, 0x0008, 0x0006, 0x0188, 0x0132, 0x038E
+ .byte 0x00, 0x00, 0x42, 0x00
+
+ .short 0x00AF, 0x0004, 0x0006, 0x00AC, 0x034F, 0x0230
+ .byte 0x01, 0x00, 0x44, 0x00
.text