summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rwxr-xr-xasm/dodrio_berry_picking.s2
-rwxr-xr-xasm/mevent_server.s8
-rwxr-xr-xasm/mevent_server_ish.s56
-rwxr-xr-xasm/pokemon_jump.s12
-rw-r--r--asm/pokenav.s4
-rwxr-xr-xasm/union_room_player_avatar.s29
6 files changed, 43 insertions, 68 deletions
diff --git a/asm/dodrio_berry_picking.s b/asm/dodrio_berry_picking.s
index e52e7a347..505f305b9 100755
--- a/asm/dodrio_berry_picking.s
+++ b/asm/dodrio_berry_picking.s
@@ -6401,7 +6401,7 @@ sub_8027BEC: @ 8027BEC
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0xD
- bl sub_8098858
+ bl DrawTextBorderOuter
adds r0, r7, 0
movs r1, 0x11
bl FillWindowPixelBuffer
diff --git a/asm/mevent_server.s b/asm/mevent_server.s
index c89867474..8c76e2d0d 100755
--- a/asm/mevent_server.s
+++ b/asm/mevent_server.s
@@ -39,8 +39,8 @@ mevent_srv_new_wcard: @ 801D0A0
.pool
thumb_func_end mevent_srv_new_wcard
- thumb_func_start sub_801D0C4
-sub_801D0C4: @ 801D0C4
+ thumb_func_start mevent_srv_common_do_exec
+mevent_srv_common_do_exec: @ 801D0C4
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, =gUnknown_02022C7C
@@ -69,7 +69,7 @@ _0801D0F8:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_801D0C4
+ thumb_func_end mevent_srv_common_do_exec
thumb_func_start mevent_srv_init_common
mevent_srv_init_common: @ 801D100
@@ -493,7 +493,7 @@ _0801D422:
b _0801D464
_0801D43C:
ldr r4, [r5, 0x1C]
- bl sub_801B00C
+ bl sav1_get_mevent_buffer_0
adds r1, r0, 0
movs r2, 0xDE
lsls r2, 1
diff --git a/asm/mevent_server_ish.s b/asm/mevent_server_ish.s
index 0d2db68c2..f61666982 100755
--- a/asm/mevent_server_ish.s
+++ b/asm/mevent_server_ish.s
@@ -5,11 +5,11 @@
.text
- thumb_func_start sub_801D484
-sub_801D484: @ 801D484
+ thumb_func_start mevent_srv_ish_do_init
+mevent_srv_ish_do_init: @ 801D484
push {r4,r5,lr}
adds r5, r0, 0
- ldr r4, =gUnknown_02022C80
+ ldr r4, =s_mevent_srv_ish_ptr
movs r0, 0x50
bl AllocZeroed
str r0, [r4]
@@ -22,13 +22,13 @@ sub_801D484: @ 801D484
pop {r0}
bx r0
.pool
- thumb_func_end sub_801D484
+ thumb_func_end mevent_srv_ish_do_init
- thumb_func_start sub_801D4A8
-sub_801D4A8: @ 801D4A8
+ thumb_func_start mevent_srv_ish_do_exec
+mevent_srv_ish_do_exec: @ 801D4A8
push {r4-r6,lr}
adds r6, r0, 0
- ldr r4, =gUnknown_02022C80
+ ldr r4, =s_mevent_srv_ish_ptr
ldr r0, [r4]
cmp r0, 0
bne _0801D4BC
@@ -43,7 +43,7 @@ _0801D4BC:
ldr r0, [r4]
ldr r1, [r0, 0x4]
strh r1, [r6]
- bl sub_801D55C
+ bl mevent_srv_ish_free_resources
ldr r0, [r4]
bl Free
movs r0, 0
@@ -54,36 +54,36 @@ _0801D4DC:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_801D4A8
+ thumb_func_end mevent_srv_ish_do_exec
- thumb_func_start sub_801D4E4
-sub_801D4E4: @ 801D4E4
- ldr r0, =gUnknown_02022C80
+ thumb_func_start mevent_srv_ish_inc_flag
+mevent_srv_ish_inc_flag: @ 801D4E4
+ ldr r0, =s_mevent_srv_ish_ptr
ldr r1, [r0]
ldr r0, [r1, 0xC]
adds r0, 0x1
str r0, [r1, 0xC]
bx lr
.pool
- thumb_func_end sub_801D4E4
+ thumb_func_end mevent_srv_ish_inc_flag
- thumb_func_start sub_801D4F4
-sub_801D4F4: @ 801D4F4
- ldr r0, =gUnknown_02022C80
+ thumb_func_start mevent_srv_ish_get_buffer
+mevent_srv_ish_get_buffer: @ 801D4F4
+ ldr r0, =s_mevent_srv_ish_ptr
ldr r0, [r0]
ldr r0, [r0, 0x20]
bx lr
.pool
- thumb_func_end sub_801D4F4
+ thumb_func_end mevent_srv_ish_get_buffer
- thumb_func_start sub_801D500
-sub_801D500: @ 801D500
- ldr r1, =gUnknown_02022C80
+ thumb_func_start mevent_srv_ish_set_param
+mevent_srv_ish_set_param: @ 801D500
+ ldr r1, =s_mevent_srv_ish_ptr
ldr r1, [r1]
str r0, [r1, 0x4]
bx lr
.pool
- thumb_func_end sub_801D500
+ thumb_func_end mevent_srv_ish_set_param
thumb_func_start mevent_srv_ish_init
mevent_srv_ish_init: @ 801D50C
@@ -123,8 +123,8 @@ mevent_srv_ish_init: @ 801D50C
bx r0
thumb_func_end mevent_srv_ish_init
- thumb_func_start sub_801D55C
-sub_801D55C: @ 801D55C
+ thumb_func_start mevent_srv_ish_free_resources
+mevent_srv_ish_free_resources: @ 801D55C
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x14]
@@ -138,10 +138,10 @@ sub_801D55C: @ 801D55C
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_801D55C
+ thumb_func_end mevent_srv_ish_free_resources
- thumb_func_start sub_801D580
-sub_801D580: @ 801D580
+ thumb_func_start mevent_srv_ish_jmp_buffer
+mevent_srv_ish_jmp_buffer: @ 801D580
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x1C]
@@ -154,7 +154,7 @@ sub_801D580: @ 801D580
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_801D580
+ thumb_func_end mevent_srv_ish_jmp_buffer
thumb_func_start sub_801D59C
sub_801D59C: @ 801D59C
@@ -340,7 +340,7 @@ _0801D708:
bne _0801D804
_0801D70E:
adds r0, r4, 0
- bl sub_801D580
+ bl mevent_srv_ish_jmp_buffer
b _0801D804
_0801D716:
ldr r0, [r4, 0x20]
diff --git a/asm/pokemon_jump.s b/asm/pokemon_jump.s
index 19d6622a3..e9aa9089d 100755
--- a/asm/pokemon_jump.s
+++ b/asm/pokemon_jump.s
@@ -5491,7 +5491,7 @@ _0802D4A4:
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
- bl sub_8098858
+ bl DrawTextBorderOuter
movs r0, 0x17
movs r1, 0x7
movs r2, 0
@@ -5575,7 +5575,7 @@ _0802D550:
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
- bl sub_8098858
+ bl DrawTextBorderOuter
movs r0, 0
bl CopyBgTilemapBufferToVram
_0802D574:
@@ -5693,7 +5693,7 @@ _0802D640:
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
- bl sub_8098858
+ bl DrawTextBorderOuter
movs r0, 0
bl CopyBgTilemapBufferToVram
_0802D664:
@@ -5773,7 +5773,7 @@ _0802D6E4:
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
- bl sub_8098858
+ bl DrawTextBorderOuter
movs r0, 0
bl CopyBgTilemapBufferToVram
_0802D708:
@@ -6107,7 +6107,7 @@ _0802D99A:
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
- bl sub_8098858
+ bl DrawTextBorderOuter
movs r0, 0
bl CopyBgTilemapBufferToVram
ldr r1, [r4]
@@ -7596,7 +7596,7 @@ sub_802E500: @ 802E500
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0xD
- bl sub_8098858
+ bl DrawTextBorderOuter
adds r0, r4, 0
movs r1, 0x11
bl FillWindowPixelBuffer
diff --git a/asm/pokenav.s b/asm/pokenav.s
index f575c9aa8..8b082c2ae 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -8104,7 +8104,7 @@ sub_81CC09C: @ 81CC09C
ldrb r0, [r4, 0x14]
movs r1, 0x1
movs r2, 0x4
- bl sub_8098858
+ bl DrawTextBorderOuter
ldrb r0, [r4, 0x14]
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -9354,7 +9354,7 @@ sub_81CCA1C: @ 81CCA1C
ldrb r0, [r5, 0x8]
movs r1, 0x42
movs r2, 0x4
- bl sub_8098858
+ bl DrawTextBorderOuter
ldr r1, =gUnknown_08622888
str r4, [sp]
movs r0, 0x1
diff --git a/asm/union_room_player_avatar.s b/asm/union_room_player_avatar.s
index db75b6f45..aa9fa5e85 100755
--- a/asm/union_room_player_avatar.s
+++ b/asm/union_room_player_avatar.s
@@ -5,31 +5,6 @@
.text
- thumb_func_start sub_8019930
-sub_8019930: @ 8019930
- ldr r0, =0x000001a9
- bx lr
- .pool
- thumb_func_end sub_8019930
-
- thumb_func_start bgid_upload_textbox_1
-bgid_upload_textbox_1: @ 8019938
- push {lr}
- sub sp, 0x4
- lsls r0, 24
- lsrs r0, 24
- ldr r1, =gUnkTextboxBorderGfx
- movs r2, 0x80
- lsls r2, 1
- movs r3, 0
- str r3, [sp]
- bl DecompressAndLoadBgGfxUsingHeap
- add sp, 0x4
- pop {r0}
- bx r0
- .pool
- thumb_func_end bgid_upload_textbox_1
-
thumb_func_start is_walking_or_running
is_walking_or_running: @ 8019958
push {lr}
@@ -1550,7 +1525,7 @@ sub_801A43C: @ 801A43C
movs r2, 0x20
bl LoadPalette
movs r0, 0xF0
- bl sub_81978B0
+ bl Menu_LoadStdPalAt
bl DynamicPlaceholderTextUtil_Reset
movs r0, 0x20
str r0, [sp]
@@ -2393,7 +2368,7 @@ _0801ABF4:
movs r0, 0
movs r1, 0x1
movs r2, 0xD
- bl sub_8098858
+ bl DrawTextBorderOuter
str r5, [sp]
movs r0, 0
adds r1, r6, 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-17 18:08:27 +0000