summaryrefslogtreecommitdiff
path: root/asm/code_800B540.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/code_800B540.s')
-rw-r--r--asm/code_800B540.s296
1 files changed, 148 insertions, 148 deletions
diff --git a/asm/code_800B540.s b/asm/code_800B540.s
index a84ae2a..0f75f46 100644
--- a/asm/code_800B540.s
+++ b/asm/code_800B540.s
@@ -10312,7 +10312,7 @@ sub_80101F8:
adds r2, 0x50
adds r1, r3, 0
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
b _08010220
.align 2, 0
_08010214: .4byte gUnknown_80D3EFC
@@ -11555,7 +11555,7 @@ sub_8010C10:
movs r3, 0
bl sub_8014248
_08010C2C:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
bl sub_8010960
add r0, sp, 0x14
bl sub_80144A4
@@ -15460,7 +15460,7 @@ _08012A14: .4byte gUnknown_203B194
sub_8012A18:
push {lr}
bl sub_8011860
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
ldr r0, _08012A60
ldr r0, [r0]
ldrb r0, [r0, 0xA]
@@ -15754,7 +15754,7 @@ _08012C18:
mov r1, r9
adds r2, r4, 0
ldr r3, [sp, 0x44]
- bl sub_800743C
+ bl xxx_call_draw_char
adds r5, 0x1
cmp r5, r7
bge _08012C50
@@ -15805,7 +15805,7 @@ _08012C92:
adds r1, r6, 0
adds r2, r4, 0
adds r3, r7, 0
- bl sub_800743C
+ bl xxx_call_draw_char
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -18764,7 +18764,7 @@ sub_8014248:
adds r2, r4, r3
adds r1, r4, 0
mov r3, r10
- bl sub_8014BC4
+ bl xxx_format_string
ldr r0, _080142C0
str r4, [r0]
ldr r0, _080142C4
@@ -19046,8 +19046,8 @@ _080144BC: .4byte gUnknown_202EC1C
_080144C0: .4byte gUnknown_202E744
thumb_func_end sub_80144A4
- thumb_func_start sub_80144C4
-sub_80144C4:
+ thumb_func_start xxx_draw_string_80144C4
+xxx_draw_string_80144C4:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -19207,7 +19207,7 @@ _08014608:
ldr r2, [sp, 0x4]
ldr r3, [r4, 0x10]
str r5, [sp]
- bl sub_800743C
+ bl xxx_call_draw_char
ldrh r1, [r4]
adds r1, r0
strh r1, [r4]
@@ -19753,7 +19753,7 @@ _08014A72:
bx r0
.align 2, 0
_08014A84: .4byte gUnknown_202E744
- thumb_func_end sub_80144C4
+ thumb_func_end xxx_draw_string_80144C4
thumb_func_start sub_8014A88
sub_8014A88:
@@ -19773,7 +19773,7 @@ _08014A9C:
add r1, sp, 0x8
add r2, sp, 0x88
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
add r0, sp, 0x8
bl sub_8008ED0
cmp r7, r0
@@ -19917,8 +19917,8 @@ nullsub_35:
bx lr
thumb_func_end nullsub_35
- thumb_func_start sub_8014BC4
-sub_8014BC4:
+ thumb_func_start xxx_format_string
+xxx_format_string:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -20356,7 +20356,7 @@ _08014F94:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8014BC4
+ thumb_func_end xxx_format_string
thumb_func_start sub_8014FA8
sub_8014FA8:
@@ -20416,7 +20416,7 @@ sub_8014FF0:
add r2, sp, 0x1F8
add r1, sp, 0x4
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
ldr r1, _08015030
add r1, sp
movs r0, 0
@@ -20453,7 +20453,7 @@ sub_8015034:
add r2, sp, 0x1FC
add r1, sp, 0x8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
ldr r1, _0801507C
add r1, sp
movs r0, 0
@@ -20547,7 +20547,7 @@ _080150AC:
adds r2, r6
mov r0, r8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
ldr r2, [r5]
adds r2, 0xB4
str r4, [sp]
@@ -37628,7 +37628,7 @@ _0801D8B2:
add r2, sp, 0x68
add r1, sp, 0x4
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
add r0, sp, 0x4
bl sub_8008ED0
movs r4, 0x80
@@ -59226,7 +59226,7 @@ _08028532:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_8023DA4
b _080288F6
.align 2, 0
@@ -59681,7 +59681,7 @@ _080288C6:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_803092C
_080288F6:
ldr r0, [r6]
@@ -64250,7 +64250,7 @@ _0802AD46:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_803092C
b _0802ADE0
.align 2, 0
@@ -64297,7 +64297,7 @@ _0802ADB0:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_801CCD8
_0802ADE0:
ldr r0, [r6]
@@ -80447,7 +80447,7 @@ _08032F16:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_8023DA4
bl _080336E2
.align 2, 0
@@ -80906,7 +80906,7 @@ _080332B8:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_801CCD8
b _080336E2
.align 2, 0
@@ -81404,7 +81404,7 @@ _080336CC:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_803092C
_080336E2:
ldr r0, [r6]
@@ -86113,8 +86113,8 @@ sub_8035C1C:
_08035C38: .4byte gUnknown_203B348
thumb_func_end sub_8035C1C
- thumb_func_start sub_8035C3C
-sub_8035C3C:
+ thumb_func_start SetMenuItems
+SetMenuItems:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -86179,7 +86179,7 @@ _08035CA8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8035C3C
+ thumb_func_end SetMenuItems
thumb_func_start sub_8035CC0
sub_8035CC0:
@@ -86864,7 +86864,7 @@ _080361E4:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x2
- bl sub_8035C3C
+ bl SetMenuItems
b _08036224
.align 2, 0
_080361F8: .4byte gUnknown_203B34C
@@ -86885,7 +86885,7 @@ _08036204:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x2
- bl sub_8035C3C
+ bl SetMenuItems
_08036224:
movs r0, 0x1
_08036226:
@@ -87057,7 +87057,7 @@ _0803637C:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _080363C8
.align 2, 0
_08036394: .4byte gUnknown_203B34C
@@ -87081,7 +87081,7 @@ _080363A4:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_080363C8:
add sp, 0x10
pop {r4}
@@ -88145,7 +88145,7 @@ _08036C14:
str r2, [sp, 0x8]
str r2, [sp, 0xC]
movs r2, 0x3
- bl sub_8035C3C
+ bl SetMenuItems
bl sub_801CCD8
ldr r0, [r5]
adds r0, 0x44
@@ -88679,7 +88679,7 @@ _08037054:
str r2, [sp, 0x8]
str r6, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r5]
adds r0, 0x1C
movs r1, 0
@@ -88857,7 +88857,7 @@ _080371E0:
str r2, [sp, 0x8]
str r6, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r7]
adds r0, 0x1C
movs r1, 0
@@ -89005,7 +89005,7 @@ _0803734C:
str r3, [sp, 0xC]
movs r2, 0
adds r3, r6, 0
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r4]
adds r0, 0x1C
movs r1, 0
@@ -89506,7 +89506,7 @@ sub_8037748:
movs r3, 0
bl AddSprite
_08037782:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
ldr r1, [r4]
ldr r0, [r1, 0x14]
adds r0, 0x1
@@ -89787,7 +89787,7 @@ _080379CE:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _08037A14
.align 2, 0
_080379E4: .4byte gUnknown_203B35C
@@ -89810,7 +89810,7 @@ _080379F0:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_08037A14:
ldr r4, _08037A38
ldr r0, [r4]
@@ -91038,7 +91038,7 @@ _0803831C:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_08038370:
ldr r0, [r5]
adds r0, 0x8
@@ -91315,7 +91315,7 @@ _08038544:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _080385CE
.align 2, 0
_0803859C: .4byte gUnknown_203B364
@@ -91338,7 +91338,7 @@ _080385AC:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_080385CE:
ldr r4, _08038600
ldr r0, [r4]
@@ -91442,7 +91442,7 @@ _0803864C:
str r2, [sp, 0x8]
str r5, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _0803876E
.align 2, 0
_080386A8: .4byte 0x0000ffdc
@@ -91473,7 +91473,7 @@ _080386B8:
str r2, [sp, 0x8]
str r5, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _08038716
.align 2, 0
_080386F0: .4byte gUnknown_80E6F38
@@ -91492,7 +91492,7 @@ _080386F8:
str r2, [sp, 0x8]
str r5, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_08038716:
ldr r4, _08038730
ldr r1, [r4]
@@ -91535,7 +91535,7 @@ _08038750:
str r2, [sp, 0x8]
str r5, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_0803876E:
ldr r4, _08038790
ldr r0, [r4]
@@ -92473,7 +92473,7 @@ _08038F2E:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
b _08038F74
.align 2, 0
_08038F44: .4byte gUnknown_203B370
@@ -92496,7 +92496,7 @@ _08038F50:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
_08038F74:
ldr r0, _08038F8C
ldr r0, [r0]
@@ -92545,7 +92545,7 @@ sub_8038F98:
str r2, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r5]
adds r0, 0x8
movs r1, 0
@@ -92860,7 +92860,7 @@ sub_80391F8:
movs r3, 0
bl AddSprite
_0803923C:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
ldr r1, [r6]
adds r1, r5
ldr r0, [r1]
@@ -92938,7 +92938,7 @@ _0803928E:
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0
- bl sub_8035C3C
+ bl SetMenuItems
ldr r1, [r6]
ldr r0, [r1]
cmp r0, 0x7
@@ -93003,7 +93003,7 @@ _08039354:
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0x1
- bl sub_8035C3C
+ bl SetMenuItems
b _08039382
.align 2, 0
_08039364: .4byte gUnknown_80E762C
@@ -93018,7 +93018,7 @@ _0803936C:
str r7, [sp, 0x8]
str r4, [sp, 0xC]
movs r2, 0x1
- bl sub_8035C3C
+ bl SetMenuItems
_08039382:
ldr r4, _080393E4
ldr r1, [r4]
@@ -93036,7 +93036,7 @@ _08039382:
movs r2, 0
str r2, [sp, 0xC]
movs r2, 0x2
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r4]
adds r0, 0x4
movs r1, 0
@@ -93352,7 +93352,7 @@ _08039624:
adds r2, r0, r3
add r0, sp, 0x4
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
b _08039696
_08039658:
ldr r0, _08039664
@@ -94873,7 +94873,7 @@ _0803A232:
movs r1, 0x1
movs r2, 0x1
bl sub_800641C
- bl sub_803A35C
+ bl SetDebugMenuItems
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -94999,8 +94999,8 @@ _0803A34E:
_0803A358: .4byte 0x0000ffdc
thumb_func_end sub_803A2A4
- thumb_func_start sub_803A35C
-sub_803A35C:
+ thumb_func_start SetDebugMenuItems
+SetDebugMenuItems:
push {r4,lr}
sub sp, 0x10
ldr r4, _0803A394
@@ -95017,7 +95017,7 @@ sub_803A35C:
str r2, [sp, 0x8]
movs r2, 0
str r2, [sp, 0xC]
- bl sub_8035C3C
+ bl SetMenuItems
ldr r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -95030,7 +95030,7 @@ sub_803A35C:
_0803A394: .4byte gUnknown_203B3EC
_0803A398: .4byte gUnknown_80E7D58
_0803A39C: .4byte gUnknown_80E7D70
- thumb_func_end sub_803A35C
+ thumb_func_end SetDebugMenuItems
thumb_func_start sub_803A3A0
sub_803A3A0:
@@ -103413,7 +103413,7 @@ sub_803E490:
ldr r0, [r1]
adds r0, 0x1
str r0, [r1]
- bl sub_80524F0
+ bl xxx_draw_string_80524F0
bl sub_8085F78
movs r0, 0x1
bl sub_803F580
@@ -113692,7 +113692,7 @@ _080431DC:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08043230
.align 2, 0
_08043208: .4byte 0x0000067c
@@ -113707,7 +113707,7 @@ _08043224:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08043230:
mov r3, r10
cmp r3, 0
@@ -113767,7 +113767,7 @@ _0804326A:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _080432F4
.align 2, 0
_080432B4: .4byte gUnknown_80FEC7C
@@ -113796,7 +113796,7 @@ _080432E8:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_080432F4:
movs r2, 0
mov r10, r2
@@ -114482,7 +114482,7 @@ _080438AC:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
ldr r0, [r5]
strb r7, [r0, 0x6]
ldr r0, _08043990
@@ -115221,7 +115221,7 @@ _08043EEA:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08043F20:
adds r0, r4, 0
bl sub_8042B0C
@@ -115276,7 +115276,7 @@ _08043F9A:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08043FA4:
adds r0, r4, 0
bl sub_8042B0C
@@ -121422,7 +121422,7 @@ _08046E1E:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0x3C
movs r1, 0x41
bl sub_803E708
@@ -121430,7 +121430,7 @@ _08046E1E:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
adds r0, r4, 0
movs r1, 0x4
movs r2, 0xA
@@ -121456,7 +121456,7 @@ _08046E1E:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0xA
movs r1, 0x41
bl sub_803E708
@@ -121466,7 +121466,7 @@ _08046E1E:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0xA
movs r1, 0x41
bl sub_803E708
@@ -124713,7 +124713,7 @@ _08048978:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08048A58
.align 2, 0
_08048984: .4byte gUnknown_80FE3E8
@@ -124848,7 +124848,7 @@ _08048A80:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08048B8C
.align 2, 0
_08048A8C: .4byte gUnknown_80FE3E8
@@ -125011,7 +125011,7 @@ sub_8048B9C:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0
b _08048D40
.align 2, 0
@@ -144817,7 +144817,7 @@ _0805240E:
mov r2, sp
adds r2, 0x3E
movs r3, 0x80
- bl sub_8014BC4
+ bl xxx_format_string
adds r4, r0, 0
ldrb r0, [r4]
cmp r0, 0xD
@@ -144904,8 +144904,8 @@ _080524E8: .4byte 0x0001c064
_080524EC: .4byte 0x0001c06c
thumb_func_end sub_80523A8
- thumb_func_start sub_80524F0
-sub_80524F0:
+ thumb_func_start xxx_draw_string_80524F0
+xxx_draw_string_80524F0:
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -145028,7 +145028,7 @@ _080525D0:
movs r2, 0
str r2, [sp]
adds r2, r4, 0
- bl sub_800743C
+ bl xxx_call_draw_char
add r2, sp, 0x4
adds r1, r2, 0
ldrh r1, [r1]
@@ -145143,7 +145143,7 @@ _080526B8:
_080526C4: .4byte 0x0001c068
_080526C8: .4byte gUnknown_203B08C
_080526CC: .4byte 0x0000028a
- thumb_func_end sub_80524F0
+ thumb_func_end xxx_draw_string_80524F0
thumb_func_start sub_80526D0
sub_80526D0:
@@ -145266,8 +145266,8 @@ _080527BC: .4byte gUnknown_20255F0
_080527C0: .4byte 0x0000030f
thumb_func_end sub_8052740
- thumb_func_start sub_80527C4
-sub_80527C4:
+ thumb_func_start PrintFieldMessage
+PrintFieldMessage:
push {r4-r7,lr}
sub sp, 0x28
adds r4, r0, 0
@@ -145362,7 +145362,7 @@ _0805286C:
strb r1, [r0]
add r4, sp, 0x24
_08052888:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
adds r0, r4, 0
@@ -145408,7 +145408,7 @@ _080528E4:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80527C4
+ thumb_func_end PrintFieldMessage
thumb_func_start sub_80528F4
sub_80528F4:
@@ -145417,7 +145417,7 @@ sub_80528F4:
adds r4, r1, 0
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
adds r0, r5, 0
adds r1, r4, 0
bl sub_80522E8
@@ -145688,7 +145688,7 @@ _08052B14:
mov r2, r9
bl sub_80141B4
_08052B3C:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
adds r0, r7, 0
@@ -145802,7 +145802,7 @@ _08052C1C:
_08052C28:
add r4, sp, 0x10
_08052C2A:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
adds r0, r4, 0
@@ -145907,7 +145907,7 @@ _08052CE6:
bl sub_8014248
add r4, sp, 0x24
_08052D02:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
adds r0, r4, 0
@@ -146067,7 +146067,7 @@ _08052E46:
movs r0, 0
adds r1, r4, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
adds r0, r5, 0
adds r1, r4, 0
bl sub_80522E8
@@ -146096,7 +146096,7 @@ _08052E88:
movs r0, 0
adds r1, r4, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
adds r0, r5, 0
adds r1, r4, 0
bl sub_80522E8
@@ -146176,7 +146176,7 @@ _08052F22:
ldr r1, [r5, 0x4]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08052F74
.align 2, 0
_08052F48: .4byte gUnknown_80FF57C
@@ -146196,7 +146196,7 @@ _08052F4C:
ldr r1, [r5, 0x4]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08052F74:
pop {r4,r5}
pop {r0}
@@ -146217,7 +146217,7 @@ sub_8052F80:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08052FB0
.align 2, 0
_08052F9C: .4byte gUnknown_203B418
@@ -146227,7 +146227,7 @@ _08052FA4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08052FB0:
pop {r0}
bx r0
@@ -146373,7 +146373,7 @@ _080530BE:
cmp r0, 0
bne _080530F4
_080530CA:
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
b _08053002
@@ -146410,7 +146410,7 @@ _0805310C:
adds r5, 0x1
cmp r5, 0x7
ble _0805310C
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0x9
bl sub_803E46C
mov r8, r7
@@ -168362,7 +168362,7 @@ _0805E238:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_805F1BC
+ bl ShowFieldMenu
bl sub_80048D0
bl sub_8004914
ldr r1, _0805E294
@@ -170337,8 +170337,8 @@ sub_805F1AC:
bx r1
thumb_func_end sub_805F1AC
- thumb_func_start sub_805F1BC
-sub_805F1BC:
+ thumb_func_start ShowFieldMenu
+ShowFieldMenu:
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -171156,7 +171156,7 @@ _0805F8B4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0805F8CE:
movs r3, 0x1
negs r3, r3
@@ -171212,7 +171212,7 @@ _0805F92A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_805F1BC
+ thumb_func_end ShowFieldMenu
thumb_func_start sub_805F94C
sub_805F94C:
@@ -171514,7 +171514,7 @@ sub_805FBE8:
_0805FBF4:
movs r0, 0xE
bl sub_803E46C
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
bl sub_8016080
adds r4, r0, 0
cmp r4, 0
@@ -171796,7 +171796,7 @@ _0805FE18:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0x1
b _080603BE
.align 2, 0
@@ -183966,7 +183966,7 @@ _08065FFE:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08066194
.align 2, 0
_0806600C: .4byte 0x0000065d
@@ -186789,14 +186789,14 @@ _08067708:
mov r1, sp
_08067716:
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _0806772A
_0806771E:
ldr r0, _08067738
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806772A:
add sp, 0x12C
pop {r3,r4}
@@ -186870,7 +186870,7 @@ sub_8067794:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _0806786C
.align 2, 0
_080677B0: .4byte gUnknown_80F8F08
@@ -186956,7 +186956,7 @@ _08067834:
movs r0, 0
adds r1, r6, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806786C:
add sp, 0x40
pop {r4-r7}
@@ -189383,7 +189383,7 @@ _08068BB2:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08068BD0
.align 2, 0
_08068BC0: .4byte gUnknown_80FE168
@@ -189392,7 +189392,7 @@ _08068BC4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08068BD0:
pop {r4-r7}
pop {r0}
@@ -189695,7 +189695,7 @@ _08068E1C:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
add r4, sp, 0x3C
_08068E34:
add r0, sp, 0x214
@@ -190121,7 +190121,7 @@ _08069104:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
ldr r0, [r5]
strb r4, [r0, 0x4]
ldr r0, [r5]
@@ -190149,7 +190149,7 @@ _080691B4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _080691E0
.align 2, 0
_080691C4: .4byte gUnknown_80FE2D0
@@ -203916,7 +203916,7 @@ _0806FC7C:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806FC88:
adds r0, r4, 0
bl sub_805FBE8
@@ -203950,7 +203950,7 @@ _0806FC94:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806FCD8:
movs r1, 0
ldrsh r0, [r6, r1]
@@ -204311,7 +204311,7 @@ _0806FFA0:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806FFAC:
adds r0, r4, 0
bl sub_805FBE8
@@ -204336,7 +204336,7 @@ _0806FFB8:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0806FFE6:
ldr r0, _08070018
adds r1, r5, 0
@@ -208968,7 +208968,7 @@ _0807220A:
movs r0, 0
mov r1, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
mov r0, sp
movs r1, 0
strb r1, [r0]
@@ -209079,7 +209079,7 @@ _080722E2:
movs r0, 0
mov r1, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_080722F4:
bl sub_8083600
movs r1, 0
@@ -209862,7 +209862,7 @@ _080728D4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_08072902:
movs r2, 0x1
str r2, [sp, 0xCC]
@@ -210047,7 +210047,7 @@ _08072A50:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
mov r0, r9
mov r1, sp
movs r2, 0x1
@@ -234506,7 +234506,7 @@ _0807ED3A:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _0807EF32
.align 2, 0
_0807ED48: .4byte gUnknown_203B418
@@ -234750,7 +234750,7 @@ _0807EF04:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0807EF32:
add sp, 0x1C
pop {r3-r5}
@@ -234830,7 +234830,7 @@ sub_807EF84:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _0807EFEE
.align 2, 0
_0807EFD0: .4byte 0xffff0000
@@ -234844,7 +234844,7 @@ _0807EFE2:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0807EFEE:
add sp, 0x4
pop {r4}
@@ -235028,7 +235028,7 @@ _0807F134:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0807F158:
add sp, 0x10
pop {r3-r5}
@@ -235116,7 +235116,7 @@ _0807F204:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
movs r0, 0x2
b _0807F31C
.align 2, 0
@@ -235238,7 +235238,7 @@ _0807F2F8:
ldr r1, [r0]
mov r0, sp
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
_0807F31A:
movs r0, 0
_0807F31C:
@@ -245575,7 +245575,7 @@ _080844F0:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _080845D4
.align 2, 0
_080844FC: .4byte gUnknown_203B418
@@ -245597,7 +245597,7 @@ _08084514:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
ldr r0, _0808453C
b _0808455E
.align 2, 0
@@ -245615,7 +245615,7 @@ _08084540:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
ldr r0, _080845B8
_0808455E:
ldr r4, [r0]
@@ -245784,7 +245784,7 @@ _080846B4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
b _08084768
.align 2, 0
_080846C0: .4byte gUnknown_80FA500
@@ -245793,7 +245793,7 @@ _080846C4:
ldr r1, [r0]
movs r0, 0
movs r2, 0x1
- bl sub_80527C4
+ bl PrintFieldMessage
mov r1, r8
movs r2, 0x2
ldrsh r0, [r1, r2]
@@ -268495,7 +268495,7 @@ _080903F2:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
b _08090430
.align 2, 0
_0809040C: .4byte gUnknown_8108F40
@@ -268511,7 +268511,7 @@ _0809041C:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
_08090430:
adds r0, r7, 0
mov r1, sp
@@ -268550,7 +268550,7 @@ _08090476:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
adds r0, r7, 0
mov r1, sp
bl sub_8090888
@@ -268581,7 +268581,7 @@ _080904BA:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
adds r0, r7, 0
mov r1, sp
bl sub_8090888
@@ -268642,7 +268642,7 @@ _08090536:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
adds r0, r7, 0
mov r1, sp
bl sub_8090888
@@ -268724,7 +268724,7 @@ _080905EA:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
adds r0, r7, 0
mov r1, sp
bl sub_8090888
@@ -268824,7 +268824,7 @@ _080906B6:
mov r1, sp
add r2, sp, 0xC8
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
adds r0, r7, 0
mov r1, sp
bl sub_8090888
@@ -273585,8 +273585,8 @@ _08092832:
bx r1
thumb_func_end sub_80927F4
- thumb_func_start sub_8092848
-sub_8092848:
+ thumb_func_start LoadWazaParameters
+LoadWazaParameters:
push {lr}
ldr r0, _08092868
ldr r1, _0809286C
@@ -273608,7 +273608,7 @@ _0809286C: .4byte gUnknown_8300500
_08092870: .4byte gUnknown_2038C64
_08092874: .4byte gUnknown_2038C68
_08092878: .4byte gUnknown_2038C6C
- thumb_func_end sub_8092848
+ thumb_func_end LoadWazaParameters
thumb_func_start sub_809287C
sub_809287C:
@@ -277700,7 +277700,7 @@ sub_80944BC:
adds r2, 0xC8
adds r1, r4, 0
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
b _08094516
.align 2, 0
_080944F4: .4byte 0x000001f3
@@ -277804,7 +277804,7 @@ sub_8094558:
add r2, sp, 0xCC
add r1, sp, 0x4
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
b _080945EA
.align 2, 0
_080945D0: .4byte gUnknown_202DF98
@@ -277816,7 +277816,7 @@ _080945DC:
add r2, sp, 0xCC
add r1, sp, 0x4
movs r3, 0
- bl sub_8014BC4
+ bl xxx_format_string
_080945EA:
add r0, sp, 0x4
bl sub_8008ED0
@@ -288472,7 +288472,7 @@ _0809959A:
_080995AE:
bl sub_809D25C
bl sub_80A59DC
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
movs r0, 0
movs r1, 0
bl sub_8005838
@@ -292645,7 +292645,7 @@ _0809B578: .4byte gUnknown_3001B64
sub_809B57C:
push {r4,r5,lr}
sub sp, 0x8
- bl sub_80144C4
+ bl xxx_draw_string_80144C4
ldr r5, _0809B5C8
ldr r0, [r5]
ldr r1, [r0]