summaryrefslogtreecommitdiff
path: root/asm/rom3.s
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-05 13:09:52 -0700
committerYamaArashi <shadow962@live.com>2016-09-05 17:33:50 -0700
commit80b3dc30e6784c40791997dc6284c5069caeb27c (patch)
treebed2781d3a5f3a8cb7ca97f61578fdc96af2f370 /asm/rom3.s
parent110fc301e1fcc8ed132323bf10c9464e826af37e (diff)
rename text window functions
Diffstat (limited to 'asm/rom3.s')
-rw-r--r--asm/rom3.s14
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/rom3.s b/asm/rom3.s
index 9fe90ef87..1a7ddc229 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -4128,16 +4128,16 @@ _0800D748: .4byte 0x0000bf40
sub_800D74C: @ 800D74C
push {r4,lr}
movs r0, 0x12
- bl sub_8064EF4
+ bl SetTextWindowBaseTileNum
ldr r4, _0800D79C
adds r0, r4, 0
movs r1, 0x1
- bl sub_8064F38
+ bl LoadTextWindowGraphics_OverridePalSlot
movs r0, 0x22
- bl sub_8064EF4
+ bl SetTextWindowBaseTileNum
adds r0, r4, 0
movs r1, 0x1
- bl sub_8064F38
+ bl LoadTextWindowGraphics_OverridePalSlot
ldr r3, _0800D7A0
adds r0, r3, 0
adds r0, 0xB8
@@ -43018,8 +43018,8 @@ _0802157A:
bx r0
thumb_func_end sub_80214B4
- thumb_func_start sub_8021580
-sub_8021580: @ 8021580
+ thumb_func_start atk47
+atk47: @ 8021580
push {r4,lr}
movs r3, 0
ldr r0, _080215A0
@@ -43083,7 +43083,7 @@ _080215EC: .4byte 0x0001601e
_080215F0: .4byte 0x000160a4
_080215F4: .4byte 0x000160a5
_080215F8: .4byte 0x02024c10
- thumb_func_end sub_8021580
+ thumb_func_end atk47
thumb_func_start atk48_playstatchangeanimation
atk48_playstatchangeanimation: @ 80215FC