summaryrefslogtreecommitdiff
path: root/asm/text_window.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/text_window.s')
-rw-r--r--asm/text_window.s108
1 files changed, 54 insertions, 54 deletions
diff --git a/asm/text_window.s b/asm/text_window.s
index c48d09d03..94e766306 100644
--- a/asm/text_window.s
+++ b/asm/text_window.s
@@ -19,12 +19,12 @@ sub_814FD04: @ 814FD04
ldr r1, _0814FD34 @ =gUnknown_84566A8
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -46,12 +46,12 @@ sub_814FD38: @ 814FD38
ldr r1, _0814FD68 @ =gUnknown_841F1C8
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -73,12 +73,12 @@ sub_814FD6C: @ 814FD6C
ldr r1, _0814FD9C @ =gUnknown_8470B0C
movs r2, 0x98
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x1
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -100,12 +100,12 @@ sub_814FDA0: @ 814FDA0
ldr r1, _0814FDD0 @ =gUnknown_8471A4C
movs r2, 0x90
lsls r2, 1
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -124,7 +124,7 @@ sub_814FDD4: @ 814FDD4
ldr r1, _0814FDF0 @ =gUnknown_8471B6C
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
pop {r0}
bx r0
.align 2, 0
@@ -155,13 +155,13 @@ sub_814FDF4: @ 814FDF4
movs r2, 0x90
lsls r2, 1
adds r3, r6, 0
- bl sub_80017D0
+ bl LoadBgTiles
adds r5, 0x4
adds r4, r5
ldr r0, [r4]
mov r1, r8
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -214,12 +214,12 @@ sub_814FE6C: @ 814FE6C
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -246,12 +246,12 @@ sub_814FEAC: @ 814FEAC
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -278,12 +278,12 @@ sub_814FEEC: @ 814FEEC
movs r2, 0x98
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x1
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -310,12 +310,12 @@ sub_814FF2C: @ 814FF2C
movs r2, 0x90
lsls r2, 1
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -339,7 +339,7 @@ sub_814FF6C: @ 814FF6C
movs r2, 0x90
lsls r2, 1
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
pop {r4}
pop {r0}
bx r0
@@ -363,7 +363,7 @@ sub_814FF98: @ 814FF98
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
pop {r4}
pop {r0}
bx r0
@@ -400,13 +400,13 @@ sub_814FFC4: @ 814FFC4
movs r2, 0x90
lsls r2, 1
adds r3, r6, 0
- bl sub_80017D0
+ bl LoadBgTiles
adds r5, 0x4
adds r4, r5
ldr r0, [r4]
mov r1, r8
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -507,7 +507,7 @@ sub_8150048: @ 8150048
adds r1, r5, 0
ldr r2, [sp, 0x14]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x1
lsls r1, 16
lsrs r1, 16
@@ -527,7 +527,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x2
lsls r1, 16
lsrs r1, 16
@@ -544,7 +544,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x3
lsls r1, 16
lsrs r1, 16
@@ -562,7 +562,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x14]
mov r3, r9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x5
lsls r1, 16
lsrs r1, 16
@@ -574,7 +574,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
mov r2, r8
mov r3, r9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x6
lsls r1, 16
lsrs r1, 16
@@ -590,7 +590,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x14]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x7
lsls r1, 16
lsrs r1, 16
@@ -603,7 +603,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r5, 0x8
lsls r5, 16
lsrs r5, 16
@@ -616,7 +616,7 @@ sub_8150048: @ 8150048
adds r1, r5, 0
mov r2, r8
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -690,7 +690,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r1, r9
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x1
lsls r1, 16
@@ -711,7 +711,7 @@ sub_81501D0: @ 81501D0
str r0, [sp, 0x8]
adds r0, r7, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x2
lsls r1, 16
@@ -732,7 +732,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x3
lsls r1, 16
@@ -752,7 +752,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x10]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x5
lsls r1, 16
@@ -765,7 +765,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x6
lsls r1, 16
@@ -783,7 +783,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x10]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x7
lsls r1, 16
@@ -797,7 +797,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x14]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x8
add r9, r0
mov r0, r9
@@ -813,7 +813,7 @@ sub_81501D0: @ 81501D0
mov r1, r9
mov r2, r8
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -824,8 +824,8 @@ sub_81501D0: @ 81501D0
bx r0
thumb_func_end sub_81501D0
- thumb_func_start sub_815036C
-sub_815036C: @ 815036C
+ thumb_func_start rbox_fill_rectangle
+rbox_fill_rectangle: @ 815036C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -890,7 +890,7 @@ sub_815036C: @ 815036C
movs r1, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -898,10 +898,10 @@ sub_815036C: @ 815036C
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_815036C
+ thumb_func_end rbox_fill_rectangle
- thumb_func_start sub_8150408
-sub_8150408: @ 8150408
+ thumb_func_start stdpal_get
+stdpal_get: @ 8150408
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -943,6 +943,6 @@ _08150446:
bx r1
.align 2, 0
_08150450: .4byte gUnknown_8471DEC
- thumb_func_end sub_8150408
+ thumb_func_end stdpal_get
.align 2, 0 @ Don't pad with nop.