summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/arm9.lsf1
-rw-r--r--arm9/asm/unk_0200E1D0_s.s (renamed from arm9/asm/unk_0200E1D0.s)126
-rw-r--r--arm9/src/unk_0200E1D0.c16
3 files changed, 64 insertions, 79 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 78e3e725..002ad8c9 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -32,6 +32,7 @@ Static arm9
Object unk_0200BB14.o
Object unk_0200CA44.o
Object render_window.o
+ Object unk_0200E1D0_s.o
Object unk_0200E1D0.o
Object unk_0200E850.o
Object unk_0201137C.o
diff --git a/arm9/asm/unk_0200E1D0.s b/arm9/asm/unk_0200E1D0_s.s
index b93e5e74..a84df611 100644
--- a/arm9/asm/unk_0200E1D0.s
+++ b/arm9/asm/unk_0200E1D0_s.s
@@ -1,6 +1,8 @@
.include "asm/macros.inc"
.include "global.inc"
+ .public UNK_021C46B4
+
.section .rodata
.global UNK_020ECEF4
@@ -48,40 +50,6 @@ UNK_020ECEF4: ; 0x020ECEF4
.word FUN_0200F040
.word FUN_0200F07C
- .section .bss
-
- .global UNK_021C46B4
-UNK_021C46B4: ; 0x021C46B4
- .space 0x4
-
- .global UNK_021C46B8
-UNK_021C46B8: ; 0x021C46B8
- .space 0x4
-
- .global UNK_021C46BC
-UNK_021C46BC: ; 0x021C46BC
- .space 0xc
-
- .global UNK_021C46C8
-UNK_021C46C8: ; 0x021C46C8
- .space 0x30
-
- .global UNK_021C46F8
-UNK_021C46F8: ; 0x021C46F8
- .space 0x30
-
- .global UNK_021C4728
-UNK_021C4728: ; 0x021C4728
- .space 0x18
-
- .global UNK_021C4740
-UNK_021C4740: ; 0x021C4740
- .space 0xb4
-
- .global UNK_021C47F4
-UNK_021C47F4: ; 0x021C47F4
- .space 0x14
-
.text
thumb_func_start FUN_0200E1D0
@@ -102,7 +70,7 @@ _0200E1E6:
bne _0200E1F0
bl GF_AssertFail
_0200E1F0:
- ldr r0, _0200E2AC ; =UNK_021C47F4
+ ldr r0, _0200E2AC ; =UNK_021C46B4 + 0x140
ldrh r0, [r0, #0xc]
cmp r0, #0x0
beq _0200E1FC
@@ -113,7 +81,7 @@ _0200E1FC:
ldr r1, _0200E2B0 ; =UNK_021C46B4
add r0, r5, #0x0
bl FUN_0200E558
- ldr r0, _0200E2B4 ; =UNK_021C4728
+ ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
bl FUN_0200E5F4
ldr r0, _0200E2B0 ; =UNK_021C46B4
add r1, r6, #0x0
@@ -123,16 +91,16 @@ _0200E1FC:
str r0, [sp, #0x0]
str r0, [sp, #0x4]
str r0, [sp, #0x8]
- ldr r0, _0200E2B8 ; =UNK_021C4740
+ ldr r0, _0200E2B8 ; =UNK_021C46B4 + 0x8C
ldr r2, [sp, #0x30]
str r0, [sp, #0xc]
- ldr r0, _0200E2B4 ; =UNK_021C4728
+ ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
ldr r3, [sp, #0x34]
str r0, [sp, #0x10]
ldr r0, [sp, #0x38]
add r1, r4, #0x0
str r0, [sp, #0x14]
- ldr r0, _0200E2BC ; =UNK_021C46C8
+ ldr r0, _0200E2BC ; =UNK_021C46B4 + 0x14
str r5, [sp, #0x18]
bl FUN_0200E5C8
mov r0, #0x0
@@ -140,26 +108,26 @@ _0200E1FC:
str r0, [sp, #0x4]
mov r0, #0x1
str r0, [sp, #0x8]
- ldr r0, _0200E2B8 ; =UNK_021C4740
+ ldr r0, _0200E2B8 ; =UNK_021C46B4 + 0x8C
ldr r2, [sp, #0x30]
str r0, [sp, #0xc]
- ldr r0, _0200E2B4 ; =UNK_021C4728
+ ldr r0, _0200E2B4 ; =UNK_021C46B4 + 0x74
ldr r3, [sp, #0x34]
str r0, [sp, #0x10]
ldr r0, [sp, #0x38]
add r1, r7, #0x0
str r0, [sp, #0x14]
- ldr r0, _0200E2C0 ; =UNK_021C46F8
+ ldr r0, _0200E2C0 ; =UNK_021C46B4 + 0x44
str r5, [sp, #0x18]
bl FUN_0200E5C8
- ldr r0, _0200E2AC ; =UNK_021C47F4
+ ldr r0, _0200E2AC ; =UNK_021C46B4 + 0x140
mov r1, #0x1
strh r1, [r0, #0xc]
- ldr r0, _0200E2C4 ; =UNK_021C46B8
- ldr r1, _0200E2BC ; =UNK_021C46C8
+ ldr r0, _0200E2C4 ; =UNK_021C46B4 + 0x4
+ ldr r1, _0200E2BC ; =UNK_021C46B4 + 0x14
bl FUN_0200E528
- ldr r0, _0200E2C8 ; =UNK_021C46BC
- ldr r1, _0200E2C0 ; =UNK_021C46F8
+ ldr r0, _0200E2C8 ; =UNK_021C46B4 + 0x8
+ ldr r1, _0200E2C0 ; =UNK_021C46B4 + 0x44
bl FUN_0200E528
ldr r0, _0200E2CC ; =UNK_021C46B4
ldr r0, [r0, #0xc]
@@ -188,14 +156,14 @@ _0200E2A6:
add sp, #0x1c
pop {r4-r7, pc}
nop
-_0200E2AC: .word UNK_021C47F4
+_0200E2AC: .word UNK_021C46B4 + 0x140
_0200E2B0: .word UNK_021C46B4
-_0200E2B4: .word UNK_021C4728
-_0200E2B8: .word UNK_021C4740
-_0200E2BC: .word UNK_021C46C8
-_0200E2C0: .word UNK_021C46F8
-_0200E2C4: .word UNK_021C46B8
-_0200E2C8: .word UNK_021C46BC
+_0200E2B4: .word UNK_021C46B4 + 0x74
+_0200E2B8: .word UNK_021C46B4 + 0x8C
+_0200E2BC: .word UNK_021C46B4 + 0x14
+_0200E2C0: .word UNK_021C46B4 + 0x44
+_0200E2C4: .word UNK_021C46B4 + 0x4
+_0200E2C8: .word UNK_021C46B4 + 0x8
_0200E2CC: .word UNK_021C46B4
_0200E2D0: .word 0x0000014E
_0200E2D4: .word 0x0000014F
@@ -203,7 +171,7 @@ _0200E2D4: .word 0x0000014F
thumb_func_start FUN_0200E2D8
FUN_0200E2D8: ; 0x0200E2D8
push {r4, lr}
- ldr r0, _0200E300 ; =UNK_021C47F4
+ ldr r0, _0200E300 ; =UNK_021C46B4 + 0x140
ldr r4, _0200E304 ; =UNK_021C46B4
ldrh r0, [r0, #0xc]
cmp r0, #0x0
@@ -221,12 +189,12 @@ FUN_0200E2D8: ; 0x0200E2D8
_0200E2FC:
pop {r4, pc}
nop
-_0200E300: .word UNK_021C47F4
+_0200E300: .word UNK_021C46B4 + 0x140
_0200E304: .word UNK_021C46B4
thumb_func_start FUN_0200E308
FUN_0200E308: ; 0x0200E308
- ldr r0, _0200E318 ; =UNK_021C47F4
+ ldr r0, _0200E318 ; =UNK_021C46B4 + 0x140
ldrh r0, [r0, #0xc]
cmp r0, #0x0
bne _0200E314
@@ -236,15 +204,15 @@ _0200E314:
mov r0, #0x0
bx lr
.balign 4
-_0200E318: .word UNK_021C47F4
+_0200E318: .word UNK_021C46B4 + 0x140
thumb_func_start FUN_0200E31C
FUN_0200E31C: ; 0x0200E31C
push {r3, lr}
- ldr r0, _0200E368 ; =UNK_021C4728
+ ldr r0, _0200E368 ; =UNK_021C46B4 + 0x74
mov r1, #0x0
bl FUN_0200E6A0
- ldr r0, _0200E368 ; =UNK_021C4728
+ ldr r0, _0200E368 ; =UNK_021C46B4 + 0x74
mov r1, #0x1
bl FUN_0200E6A0
ldr r0, _0200E36C ; =UNK_021C46B4
@@ -261,13 +229,13 @@ _0200E33A:
mov r1, #0x2
str r1, [r0, #0x50]
_0200E346:
- ldr r0, _0200E370 ; =UNK_021C46B8
- ldr r1, _0200E374 ; =UNK_021C46C8
+ ldr r0, _0200E370 ; =UNK_021C46B4 + 0x4
+ ldr r1, _0200E374 ; =UNK_021C46B4 + 0x14
bl FUN_0200E528
- ldr r0, _0200E378 ; =UNK_021C46BC
- ldr r1, _0200E37C ; =UNK_021C46F8
+ ldr r0, _0200E378 ; =UNK_021C46B4 + 0x8
+ ldr r1, _0200E37C ; =UNK_021C46B4 + 0x44
bl FUN_0200E528
- ldr r0, _0200E380 ; =UNK_021C47F4
+ ldr r0, _0200E380 ; =UNK_021C46B4 + 0x140
mov r1, #0x0
strh r1, [r0, #0xc]
strb r1, [r0, #0xe]
@@ -276,13 +244,13 @@ _0200E346:
bl FUN_0200E808
pop {r3, pc}
.balign 4
-_0200E368: .word UNK_021C4728
+_0200E368: .word UNK_021C46B4 + 0x74
_0200E36C: .word UNK_021C46B4
-_0200E370: .word UNK_021C46B8
-_0200E374: .word UNK_021C46C8
-_0200E378: .word UNK_021C46BC
-_0200E37C: .word UNK_021C46F8
-_0200E380: .word UNK_021C47F4
+_0200E370: .word UNK_021C46B4 + 0x4
+_0200E374: .word UNK_021C46B4 + 0x14
+_0200E378: .word UNK_021C46B4 + 0x8
+_0200E37C: .word UNK_021C46B4 + 0x44
+_0200E380: .word UNK_021C46B4 + 0x140
_0200E384: .word UNK_021C46B4
thumb_func_start FUN_0200E388
@@ -336,12 +304,12 @@ _0200E3D2:
mov r2, #0x2
bl GXS_LoadBGPltt
_0200E3DA:
- ldr r0, _0200E41C ; =UNK_021C4740
+ ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
mov r1, #0x1
add r2, r4, #0x0
bl FUN_02011634
mov r2, #0x0
- ldr r0, _0200E41C ; =UNK_021C4740
+ ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
mov r1, #0x3f
add r3, r2, #0x0
str r4, [sp, #0x0]
@@ -349,12 +317,12 @@ _0200E3DA:
mov r1, #0x0
str r1, [sp, #0x0]
str r1, [sp, #0x4]
- ldr r0, _0200E41C ; =UNK_021C4740
+ ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
add r2, r1, #0x0
add r3, r1, #0x0
str r4, [sp, #0x8]
bl FUN_02011698
- ldr r0, _0200E41C ; =UNK_021C4740
+ ldr r0, _0200E41C ; =UNK_021C46B4 + 0x8C
mov r1, #0x20
mov r2, #0x0
add r3, r4, #0x0
@@ -365,7 +333,7 @@ _0200E3DA:
add sp, #0x10
bx r3
nop
-_0200E41C: .word UNK_021C4740
+_0200E41C: .word UNK_021C46B4 + 0x8C
thumb_func_start FUN_0200E420
FUN_0200E420: ; 0x0200E420
@@ -421,7 +389,7 @@ FUN_0200E460: ; 0x0200E460
ldr r0, [r4, #0x3c]
cmp r0, #0x0
bne _0200E490
- ldr r0, _0200E4B4 ; =UNK_021C47F4
+ ldr r0, _0200E4B4 ; =UNK_021C46B4 + 0x140
mov r1, #0x0
strb r1, [r0, #0xe]
_0200E490:
@@ -434,7 +402,7 @@ _0200E490:
ldr r0, [r4, #0x3c]
cmp r0, #0x0
bne _0200E4AA
- ldr r0, _0200E4B4 ; =UNK_021C47F4
+ ldr r0, _0200E4B4 ; =UNK_021C46B4 + 0x140
mov r1, #0x0
strb r1, [r0, #0xf]
_0200E4AA:
@@ -442,7 +410,7 @@ _0200E4AA:
bl FUN_0200E808
pop {r4, pc}
nop
-_0200E4B4: .word UNK_021C47F4
+_0200E4B4: .word UNK_021C46B4 + 0x140
thumb_func_start FUN_0200E4B8
FUN_0200E4B8: ; 0x0200E4B8
diff --git a/arm9/src/unk_0200E1D0.c b/arm9/src/unk_0200E1D0.c
new file mode 100644
index 00000000..32f35605
--- /dev/null
+++ b/arm9/src/unk_0200E1D0.c
@@ -0,0 +1,16 @@
+#include "global.h"
+
+struct UnkStruct_021C46B4
+{
+ u8 unk_000[0x14];
+ u8 unk_014[0x30];
+ u8 unk_044[0x30];
+ u8 unk_074[0x18];
+ u8 unk_08C[0xC0];
+ u16 unk_14C;
+ u8 unk_14E;
+ u8 unk_14F;
+ u32 unk_150;
+};
+
+struct UnkStruct_021C46B4 UNK_021C46B4;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 12:46:33 +0000