summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_02006864.s12
-rw-r--r--arm9/asm/unk_02012CC8.s18
-rw-r--r--arm9/asm/unk_0201B4E8.s2
-rw-r--r--arm9/asm/unk_0201F06C.s4
-rw-r--r--arm9/asm/unk_020372D4.s8
-rw-r--r--arm9/asm/unk_02048904.s4
-rw-r--r--arm9/asm/unk_0204C1B4.s20
-rw-r--r--arm9/asm/unk_02057380.s8
-rw-r--r--arm9/asm/unk_0205C334.s4
-rw-r--r--arm9/asm/unk_020AF030.s5
10 files changed, 44 insertions, 41 deletions
diff --git a/arm9/asm/unk_02006864.s b/arm9/asm/unk_02006864.s
index 4f69acde..c3e46e9a 100644
--- a/arm9/asm/unk_02006864.s
+++ b/arm9/asm/unk_02006864.s
@@ -5,21 +5,21 @@
.global UNK_020ECB98
UNK_020ECB98: ; 0x020ECB98
- .word 0x020B1768
- .word 0x020B1528
+ .word FUN_020B1768
+ .word FUN_020B1528
.global UNK_020ECBA0
UNK_020ECBA0: ; 0x020ECBA0
- .byte 0xF4, 0x92, 0x0C, 0x02, 0x94, 0x92, 0x0C, 0x02
+ .word GX_LoadOBJ, GXS_LoadOBJ
.global UNK_020ECBA8
UNK_020ECBA8: ; 0x020ECBA8
- .byte 0x68, 0x17, 0x0B, 0x02, 0x28, 0x15, 0x0B, 0x02
+ .word FUN_020B1768, FUN_020B1528
.global UNK_020ECBB0
UNK_020ECBB0: ; 0x020ECBB0
- .byte 0x50, 0x95, 0x0C, 0x02, 0x80, 0x94, 0x0C, 0x02, 0x90, 0x8A, 0x0C, 0x02, 0x48, 0x89, 0x0C, 0x02
- .byte 0xE8, 0x94, 0x0C, 0x02, 0x18, 0x94, 0x0C, 0x02, 0x58, 0x88, 0x0C, 0x02, 0x74, 0x87, 0x0C, 0x02
+ .word GX_LoadBGPltt, GX_LoadOBJPltt, GX_LoadBGExtPltt, GX_LoadOBJExtPltt
+ .word GXS_LoadBGPltt, GXS_LoadOBJPltt, GXS_LoadBGExtPltt, GXS_LoadOBJExtPltt
.text
diff --git a/arm9/asm/unk_02012CC8.s b/arm9/asm/unk_02012CC8.s
index aabfd3e9..e4b695b1 100644
--- a/arm9/asm/unk_02012CC8.s
+++ b/arm9/asm/unk_02012CC8.s
@@ -972,7 +972,7 @@ FUN_0201333C: ; 0x0201333C
ldr r0, [r0, #0x0]
bx r3
nop
-_02013344: .word 0x0208AE48
+_02013344: .word FUN_0208AE48
thumb_func_start FUN_02013348
FUN_02013348: ; 0x02013348
@@ -1066,7 +1066,7 @@ FUN_020133D0: ; 0x020133D0
ldr r0, [r0, #0x0]
bx r3
nop
-_020133D8: .word 0x0208AC14
+_020133D8: .word FUN_0208AC14
thumb_func_start FUN_020133DC
FUN_020133DC: ; 0x020133DC
@@ -1074,7 +1074,7 @@ FUN_020133DC: ; 0x020133DC
ldr r0, [r0, #0x0]
bx r3
nop
-_020133E4: .word 0x0208AC58
+_020133E4: .word FUN_0208AC58
thumb_func_start FUN_020133E8
FUN_020133E8: ; 0x020133E8
@@ -1252,12 +1252,12 @@ _020134F4:
pop {r4-r7}
bx lr
nop
-_020134FC: .word 0x020908DC
-_02013500: .word 0x020909A4
-_02013504: .word 0x02090858
-_02013508: .word 0x02090780
-_0201350C: .word 0x02090664
-_02013510: .word 0x020905D0
+_020134FC: .word FUN_020908DC
+_02013500: .word FUN_020909A4
+_02013504: .word FUN_02090858
+_02013508: .word FUN_02090780
+_0201350C: .word FUN_02090664
+_02013510: .word FUN_020905D0
thumb_func_start FUN_02013514
FUN_02013514: ; 0x02013514
diff --git a/arm9/asm/unk_0201B4E8.s b/arm9/asm/unk_0201B4E8.s
index f99f647f..4309da51 100644
--- a/arm9/asm/unk_0201B4E8.s
+++ b/arm9/asm/unk_0201B4E8.s
@@ -286,7 +286,7 @@ _0201B6AE:
ldr r0, [r1, #0x0]
bx r3
.balign 4
-_0201B6C0: .word 0x0201B54D
+_0201B6C0: .word FUN_0201B54C
thumb_func_start FUN_0201B6C4
FUN_0201B6C4: ; 0x0201B6C4
diff --git a/arm9/asm/unk_0201F06C.s b/arm9/asm/unk_0201F06C.s
index ecb6aeb9..c6f59e94 100644
--- a/arm9/asm/unk_0201F06C.s
+++ b/arm9/asm/unk_0201F06C.s
@@ -2530,12 +2530,12 @@ _02020222:
thumb_func_start FUN_0202022C
FUN_0202022C: ; 0x0202022C
- ldr r3, _02020234 ; =0x020B04FC
+ ldr r3, _02020234 ; =FUN_020B04FC
add r0, #0x40
add r0, #0x8
bx r3
.balign 4
-_02020234: .word 0x020B04FC
+_02020234: .word FUN_020B04FC
thumb_func_start FUN_02020238
FUN_02020238: ; 0x02020238
diff --git a/arm9/asm/unk_020372D4.s b/arm9/asm/unk_020372D4.s
index e6365450..61ff665e 100644
--- a/arm9/asm/unk_020372D4.s
+++ b/arm9/asm/unk_020372D4.s
@@ -67,13 +67,13 @@ FUN_02037334: ; 0x02037334
push {r3, lr}
bl FUN_020374B0
ldr r0, _02037348 ; =SDK_OVERLAY_MODULE_63_ID
- ldr r1, _0203734C ; =0x021DBAB8
+ ldr r1, _0203734C ; =UNK63_021DBAB8
bl FUN_02000E7C
mov r0, #0x1
pop {r3, pc}
nop
_02037348: .word SDK_OVERLAY_MODULE_63_ID
-_0203734C: .word 0x021DBAB8
+_0203734C: .word UNK63_021DBAB8
thumb_func_start LoadOverlay_MODULE_05
LoadOverlay_MODULE_05: ; 0x02037350
@@ -99,7 +99,7 @@ _0203736C:
ldr r0, [r4, #0x0]
mov r2, #0xb
str r1, [r0, #0x8]
- ldr r0, _02037390 ; =0x021F64C8
+ ldr r0, _02037390 ; =UNK05_021F64C8
add r1, r4, #0x0
bl FUN_02006234
ldr r1, [r4, #0x0]
@@ -107,7 +107,7 @@ _0203736C:
pop {r4, pc}
.balign 4
_0203738C: .word SDK_OVERLAY_MODULE_05_ID
-_02037390: .word 0x021F64C8
+_02037390: .word UNK05_021F64C8
thumb_func_start FUN_02037394
FUN_02037394: ; 0x02037394
diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s
index 350e135d..3b3789fc 100644
--- a/arm9/asm/unk_02048904.s
+++ b/arm9/asm/unk_02048904.s
@@ -1690,12 +1690,12 @@ _0204963E:
mov r1, #0x4
bl MOD06_0224C8C8
add r2, r0, #0x0
- ldr r1, _02049654 ; =0x0224C8E9
+ ldr r1, _02049654 ; =MOD06_0224C8E8
add r0, r5, #0x0
bl FUN_0204640C
pop {r4-r6, pc}
.balign 4
-_02049654: .word 0x0224C8E9
+_02049654: .word MOD06_0224C8E8
thumb_func_start FUN_02049658
FUN_02049658: ; 0x02049658
diff --git a/arm9/asm/unk_0204C1B4.s b/arm9/asm/unk_0204C1B4.s
index dc2163df..ecfb8a01 100644
--- a/arm9/asm/unk_0204C1B4.s
+++ b/arm9/asm/unk_0204C1B4.s
@@ -616,7 +616,7 @@ FUN_0204C644: ; 0x0204C644
_0204C668:
bl MOD05_021DB030
add r2, r0, #0x0
- ldr r1, _0204C688 ; =0x021DB1D1
+ ldr r1, _0204C688 ; =MOD05_021DB1D0
add r0, r5, #0x0
bl FUN_0204640C
ldr r0, [r4, #0x4]
@@ -630,7 +630,7 @@ _0204C682:
mov r0, #0x0
pop {r4-r6, pc}
nop
-_0204C688: .word 0x021DB1D1
+_0204C688: .word MOD05_021DB1D0
thumb_func_start FUN_0204C68C
FUN_0204C68C: ; 0x0204C68C
@@ -652,7 +652,7 @@ FUN_0204C68C: ; 0x0204C68C
_0204C6B0:
bl MOD05_021DB030
add r2, r0, #0x0
- ldr r1, _0204C6D0 ; =0x021DB145
+ ldr r1, _0204C6D0 ; =MOD05_021DB144
add r0, r5, #0x0
bl FUN_0204640C
ldr r0, [r4, #0x4]
@@ -666,7 +666,7 @@ _0204C6CA:
mov r0, #0x0
pop {r4-r6, pc}
nop
-_0204C6D0: .word 0x021DB145
+_0204C6D0: .word MOD05_021DB144
thumb_func_start FUN_0204C6D4
FUN_0204C6D4: ; 0x0204C6D4
@@ -716,7 +716,7 @@ _0204C700:
_0204C736:
bl MOD05_021DB030
add r2, r0, #0x0
- ldr r1, _0204C79C ; =0x021DB251
+ ldr r1, _0204C79C ; =MOD05_021DB250
add r0, r6, #0x0
bl FUN_0204640C
mov r0, #0x3
@@ -760,7 +760,7 @@ _0204C798:
mov r0, #0x0
pop {r3-r7, pc}
.balign 4
-_0204C79C: .word 0x021DB251
+_0204C79C: .word MOD05_021DB250
thumb_func_start FUN_0204C7A0
FUN_0204C7A0: ; 0x0204C7A0
@@ -806,7 +806,7 @@ _0204C7BE:
_0204C7FE:
bl MOD05_021DB030
add r2, r0, #0x0
- ldr r1, _0204C820 ; =0x021DB381
+ ldr r1, _0204C820 ; =MOD05_021DB380
add r0, r6, #0x0
bl FUN_0204640C
ldr r0, [r4, #0x4]
@@ -821,7 +821,7 @@ _0204C818:
pop {r3-r7, pc}
.balign 4
_0204C81C: .word FUN_0204C6D4
-_0204C820: .word 0x021DB381
+_0204C820: .word MOD05_021DB380
thumb_func_start FUN_0204C824
FUN_0204C824: ; 0x0204C824
@@ -981,7 +981,7 @@ FUN_0204C93C: ; 0x0204C93C
_0204C960:
bl MOD05_021DB030
add r2, r0, #0x0
- ldr r1, _0204C980 ; =0x021DB041
+ ldr r1, _0204C980 ; =MOD05_021DB040
add r0, r5, #0x0
bl FUN_0204640C
ldr r0, [r4, #0x4]
@@ -995,7 +995,7 @@ _0204C97A:
mov r0, #0x0
pop {r4-r6, pc}
nop
-_0204C980: .word 0x021DB041
+_0204C980: .word MOD05_021DB040
thumb_func_start FUN_0204C984
FUN_0204C984: ; 0x0204C984
diff --git a/arm9/asm/unk_02057380.s b/arm9/asm/unk_02057380.s
index 6c84c507..bd919430 100644
--- a/arm9/asm/unk_02057380.s
+++ b/arm9/asm/unk_02057380.s
@@ -1355,7 +1355,7 @@ FUN_02057F18: ; 0x02057F18
lsl r1, r1, #0xc
cmp r0, r1
bne _02057F2C
- ldr r5, _02057F7C ; =0x021F9080
+ ldr r5, _02057F7C ; =UNK05_021F9080
b _02057F32
_02057F2C:
bl FUN_02058D4C
@@ -1388,7 +1388,7 @@ _02057F32:
bl FUN_020586D4
pop {r3-r5, pc}
nop
-_02057F7C: .word 0x021F9080
+_02057F7C: .word UNK05_021F9080
thumb_func_start FUN_02057F80
FUN_02057F80: ; 0x02057F80
@@ -3782,7 +3782,7 @@ FUN_02058D48: ; 0x02058D48
thumb_func_start FUN_02058D4C
FUN_02058D4C: ; 0x02058D4C
push {r3, lr}
- ldr r3, _02058D6C ; =0x021F9494
+ ldr r3, _02058D6C ; =UNK05_021F9494
ldr r1, _02058D70 ; =0x0000FFFF
_02058D52:
ldr r2, [r3, #0x0]
@@ -3799,7 +3799,7 @@ _02058D5C:
mov r0, #0x0
pop {r3, pc}
.balign 4
-_02058D6C: .word 0x021F9494
+_02058D6C: .word UNK05_021F9494
_02058D70: .word 0x0000FFFF
thumb_func_start FUN_02058D74
diff --git a/arm9/asm/unk_0205C334.s b/arm9/asm/unk_0205C334.s
index b23680af..b975a3f0 100644
--- a/arm9/asm/unk_0205C334.s
+++ b/arm9/asm/unk_0205C334.s
@@ -284,7 +284,7 @@ _0205C54C:
_0205C550:
sub r2, r0, #0x1
mov r0, #0xc
- ldr r3, _0205C594 ; =0x021F9194
+ ldr r3, _0205C594 ; =UNK05_021F9194
mul r0, r2
add r2, r3, r0
cmp r1, #0x5
@@ -321,4 +321,4 @@ _0205C588:
pop {r3, pc}
.balign 4
_0205C590: .word 0x0000FFFF
-_0205C594: .word 0x021F9194
+_0205C594: .word UNK05_021F9194
diff --git a/arm9/asm/unk_020AF030.s b/arm9/asm/unk_020AF030.s
index a6d15035..0c6087f2 100644
--- a/arm9/asm/unk_020AF030.s
+++ b/arm9/asm/unk_020AF030.s
@@ -3450,7 +3450,7 @@ FUN_020B04A8: ; 0x020B04A8
bx lr
arm_func_start FUN_020B04C0
-FUN_020B04C0:
+FUN_020B04C0: ; 0x020B04C0
stmdb sp!, {r4,lr}
mov r4, r0
add r0, r4, #0x1c
@@ -3466,6 +3466,9 @@ FUN_020B04C0:
str r1, [r4, #0x14]
str r1, [r4, #0x18]
ldmia sp!, {r4,pc}
+
+ arm_func_start FUN_020B04FC
+FUN_020B04FC: ; 0x020B04FC
ldr r1, [r0, #0x18]
ldr r2, [r0, #0x0]
ldr r0, [r1, #0xc]
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 09:46:22 +0000