summaryrefslogtreecommitdiff
path: root/arm9/asm
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-05-21 19:43:41 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-05-21 19:43:41 -0400
commit70b098f92d46c134388e02bd8c436649fe31e999 (patch)
treeb5da9769e665b58922cf0653a54cc205420a26a0 /arm9/asm
parentcdd1aae79156e0f7eaf1d2fd0056ef2af62a7f0e (diff)
Fix parameterization
Diffstat (limited to 'arm9/asm')
-rw-r--r--arm9/asm/unk_02001B80.s2
-rw-r--r--arm9/asm/unk_02016B94.s10
-rw-r--r--arm9/asm/unk_020484A8.s2
-rw-r--r--arm9/asm/unk_02050E48.s12
-rw-r--r--arm9/asm/unk_0206C700.s2
-rw-r--r--arm9/asm/unk_0207D5BC.s2
-rw-r--r--arm9/asm/unk_02086414.s4
-rw-r--r--arm9/asm/unk_0208A338.s12
8 files changed, 23 insertions, 23 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s
index f76e1b80..696f470c 100644
--- a/arm9/asm/unk_02001B80.s
+++ b/arm9/asm/unk_02001B80.s
@@ -781,7 +781,7 @@ CreateYesNoMenu: ; 0x020020EC
add r0, r5, #0x0
mov r1, #0x1
str r6, [sp, #0x14]
- bl FUN_02018FF4
+ bl AllocWindows
add r1, r0, #0x0
str r1, [sp, #0x18]
mov r0, #0x0
diff --git a/arm9/asm/unk_02016B94.s b/arm9/asm/unk_02016B94.s
index 73330a71..a6817b28 100644
--- a/arm9/asm/unk_02016B94.s
+++ b/arm9/asm/unk_02016B94.s
@@ -5022,8 +5022,8 @@ _02018FEA:
nop
_02018FF0: .word 0x00007FC0
- thumb_func_start FUN_02018FF4
-FUN_02018FF4: ; 0x02018FF4
+ thumb_func_start AllocWindows
+AllocWindows: ; 0x02018FF4
push {r4-r6, lr}
add r5, r1, #0x0
lsl r1, r5, #0x4
@@ -5035,7 +5035,7 @@ FUN_02018FF4: ; 0x02018FF4
_02019006:
lsl r0, r4, #0x4
add r0, r6, r0
- bl FUN_0201901C
+ bl InitWindow
add r0, r4, #0x1
lsl r0, r0, #0x10
lsr r4, r0, #0x10
@@ -5045,8 +5045,8 @@ _02019018:
add r0, r6, #0x0
pop {r4-r6, pc}
- thumb_func_start FUN_0201901C
-FUN_0201901C: ; 0x0201901C
+ thumb_func_start InitWindow
+InitWindow: ; 0x0201901C
mov r3, #0x0
str r3, [r0, #0x0]
mov r1, #0xff
diff --git a/arm9/asm/unk_020484A8.s b/arm9/asm/unk_020484A8.s
index 4750c7ea..929f1efa 100644
--- a/arm9/asm/unk_020484A8.s
+++ b/arm9/asm/unk_020484A8.s
@@ -343,7 +343,7 @@ FUN_02048764: ; 0x02048764
str r0, [r1, #0x30]
add r1, #0x1c
add r0, r1, #0x0
- bl FUN_0201901C
+ bl InitWindow
ldr r0, _020487D4 ; =UNK_020F46B0
bl GX_SetBanks
ldr r2, _020487D8 ; =0x04000304
diff --git a/arm9/asm/unk_02050E48.s b/arm9/asm/unk_02050E48.s
index d7eb4bc4..fbe0aed9 100644
--- a/arm9/asm/unk_02050E48.s
+++ b/arm9/asm/unk_02050E48.s
@@ -1255,7 +1255,7 @@ _02051836:
bl FUN_02019178
add r0, r5, #0x0
add r0, #0x14
- bl FUN_0201901C
+ bl InitWindow
_02051846:
add r0, r5, #0x0
add r0, #0x54
@@ -1267,7 +1267,7 @@ _02051846:
bl FUN_02019178
add r0, r5, #0x0
add r0, #0x54
- bl FUN_0201901C
+ bl InitWindow
_02051862:
add r0, r5, #0x0
add r0, #0x64
@@ -1279,7 +1279,7 @@ _02051862:
bl FUN_02019178
add r5, #0x64
add r0, r5, #0x0
- bl FUN_0201901C
+ bl InitWindow
_0205187E:
pop {r3-r5, pc}
@@ -1325,13 +1325,13 @@ _0205188E:
str r0, [r4, #0x10]
add r0, r4, #0x0
add r0, #0x14
- bl FUN_0201901C
+ bl InitWindow
add r0, r4, #0x0
add r0, #0x54
- bl FUN_0201901C
+ bl InitWindow
add r0, r4, #0x0
add r0, #0x64
- bl FUN_0201901C
+ bl InitWindow
mov r0, #0xb
bl ListMenuCursorNew
str r0, [r4, #0x78]
diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s
index 2c5a9ba6..3124976e 100644
--- a/arm9/asm/unk_0206C700.s
+++ b/arm9/asm/unk_0206C700.s
@@ -117,7 +117,7 @@ FUN_0206C700: ; 0x0206C700
str r0, [r4, #0x0]
add r0, r5, #0x0
mov r1, #0x1
- bl FUN_02018FF4
+ bl AllocWindows
str r0, [r4, #0x4]
ldr r0, [sp, #0x18]
str r0, [r4, #0x2c]
diff --git a/arm9/asm/unk_0207D5BC.s b/arm9/asm/unk_0207D5BC.s
index 0aa84bfc..5a814a79 100644
--- a/arm9/asm/unk_0207D5BC.s
+++ b/arm9/asm/unk_0207D5BC.s
@@ -190,7 +190,7 @@ _0207D692:
mov r0, #0x13
lsl r1, r1, #0x18
lsr r1, r1, #0x18
- bl FUN_02018FF4
+ bl AllocWindows
mov r1, #0x91
lsl r1, r1, #0x2
str r0, [r4, r1]
diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s
index 3cbdf2a8..94945259 100644
--- a/arm9/asm/unk_02086414.s
+++ b/arm9/asm/unk_02086414.s
@@ -517,7 +517,7 @@ FUN_02086784: ; 0x02086784
add r0, r5, #0x0
add r4, r2, #0x0
add r6, r3, #0x0
- bl FUN_0201901C
+ bl InitWindow
ldr r0, [sp, #0x28]
lsl r2, r4, #0x18
lsl r0, r0, #0x18
@@ -627,7 +627,7 @@ FUN_02086878: ; 0x02086878
add r6, r1, #0x0
str r2, [sp, #0x14]
add r4, r3, #0x0
- bl FUN_0201901C
+ bl InitWindow
ldr r0, [sp, #0x3c]
ldr r3, [sp, #0x38]
lsl r0, r0, #0x18
diff --git a/arm9/asm/unk_0208A338.s b/arm9/asm/unk_0208A338.s
index 2005be3e..bafa4c91 100644
--- a/arm9/asm/unk_0208A338.s
+++ b/arm9/asm/unk_0208A338.s
@@ -48,13 +48,13 @@ FUN_0208A338: ; 0x0208A338
bl FUN_020853DC
add r0, r4, #0x0
add r0, #0x18
- bl FUN_0201901C
+ bl InitWindow
add r0, r4, #0x0
add r0, #0x28
- bl FUN_0201901C
+ bl InitWindow
add r0, r4, #0x0
add r0, #0x38
- bl FUN_0201901C
+ bl InitWindow
mov r0, #0x0
str r0, [r4, #0x54]
ldr r1, _0208A3C4 ; =FUN_0208A458
@@ -102,7 +102,7 @@ FUN_0208A400: ; 0x0208A400
bl FUN_02019178
add r0, r4, #0x0
add r0, #0x18
- bl FUN_0201901C
+ bl InitWindow
_0208A41E:
add r0, r4, #0x0
add r0, #0x28
@@ -114,7 +114,7 @@ _0208A41E:
bl FUN_02019178
add r0, r4, #0x0
add r0, #0x28
- bl FUN_0201901C
+ bl InitWindow
_0208A43A:
add r0, r4, #0x0
add r0, #0x38
@@ -126,7 +126,7 @@ _0208A43A:
bl FUN_02019178
add r4, #0x38
add r0, r4, #0x0
- bl FUN_0201901C
+ bl InitWindow
_0208A456:
pop {r4, pc}