summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2017-01-01 18:30:55 -0800
committerYamaArashi <shadow962@live.com>2017-01-01 18:30:55 -0800
commit530adda9554ba77e65a05f795e85432b008f9655 (patch)
treeb72054da2db0109a922a81b2dcf44a86be51bf5a
parent7de050c235adef3031c991bbf4520d785f0a31ad (diff)
name some functions
Diffstat
-rw-r--r--asm/battle_811DA74.s8
-rw-r--r--asm/battle_anim.s4
-rw-r--r--asm/battle_anim_80CA710.s20
-rw-r--r--asm/choose_party.s50
-rw-r--r--asm/contest_link_80C2020.s4
-rw-r--r--asm/intro.s18
-rw-r--r--asm/naming_screen.s2
-rw-r--r--asm/party_menu.s124
-rw-r--r--asm/pokeball.s8
-rw-r--r--asm/rom5.s2
-rw-r--r--asm/rom_800D42C.s50
-rw-r--r--asm/rom_804373C.s30
-rw-r--r--asm/rom_806D7F8.s362
-rw-r--r--asm/rom_8077ABC.s10
-rw-r--r--asm/rom_80859BC.s2
-rw-r--r--asm/rom_8094928.s88
-rw-r--r--asm/rom_81258BC.s6
-rw-r--r--asm/script_pokemon_util_80F99CC.s20
-rw-r--r--asm/trade.s20
-rw-r--r--data/data_83760F0.s4
-rw-r--r--include/asm.inc.h4
-rw-r--r--src/intro.c4
22 files changed, 420 insertions, 420 deletions
diff --git a/asm/battle_811DA74.s b/asm/battle_811DA74.s
index dc3cd456f..4ed333ed8 100644
--- a/asm/battle_811DA74.s
+++ b/asm/battle_811DA74.s
@@ -182,11 +182,11 @@ _0811DBBC: .4byte 0x02017810
sub_811DBC0: @ 811DBC0
push {r4-r6,lr}
movs r6, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0811DBE4
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0811DC18
@@ -330,7 +330,7 @@ sub_811DCA0: @ 811DCA0
lsls r1, 2
adds r1, r4
strb r2, [r1, 0x9]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0811DD56
@@ -5467,7 +5467,7 @@ _08120748:
mov r9, r0
ldrh r0, [r1, 0x8]
strb r0, [r7]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08120768
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index 587072df7..a64d0414a 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -4560,7 +4560,7 @@ sub_807794C: @ 807794C
lsls r0, 24
cmp r0, 0
bne _080779F6
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080779F6
@@ -4646,7 +4646,7 @@ sub_80779FC: @ 80779FC
lsls r0, 24
cmp r0, 0
bne _08077A88
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08077A88
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index 6a1ebf6e4..3a92f6674 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -761,7 +761,7 @@ sub_80CACEC: @ 80CACEC
lsls r0, 24
cmp r0, 0
bne _080CAD06
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080CAD0E
@@ -1333,7 +1333,7 @@ sub_80CB144: @ 80CB144
lsls r0, 24
cmp r0, 0
bne _080CB170
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5561,7 +5561,7 @@ _080CD1AC:
ldr r0, _080CD1F0 @ =gUnknown_0202F7C9
_080CD1AE:
ldrb r6, [r0]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080CD1F8
@@ -13722,7 +13722,7 @@ _080D1006:
movs r0, 0x1
adds r4, r0, 0
eors r4, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080D107E
@@ -28244,7 +28244,7 @@ _080D7FD0:
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080D7FE8
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080D7FF4
@@ -35489,7 +35489,7 @@ _080DB7DA:
lsls r0, 24
cmp r0, 0
bne _080DB810
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080DB810
@@ -35820,7 +35820,7 @@ _080DBA66:
lsls r0, 24
cmp r0, 0
bne _080DBAAE
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080DBAAE
@@ -46104,7 +46104,7 @@ sub_80E0A4C: @ 80E0A4C
orrs r1, r0
strb r1, [r5]
_080E0AC4:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080E0B40
@@ -50892,7 +50892,7 @@ sub_80E2F2C: @ 80E2F2C
orrs r1, r0
strb r1, [r4]
_080E2FAC:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080E3028
@@ -51432,7 +51432,7 @@ _080E33C0:
orrs r1, r0
strb r1, [r4]
_080E3432:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080E34A4
diff --git a/asm/choose_party.s b/asm/choose_party.s
index 21988162b..6be0375af 100644
--- a/asm/choose_party.s
+++ b/asm/choose_party.s
@@ -113,7 +113,7 @@ _08121EC0:
muls r2, r3
ldr r3, _08121EF0 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
b _08122020
.align 2, 0
_08121EE8: .4byte 0x00000266
@@ -127,7 +127,7 @@ _08121EF4:
adds r1, r4, r0
b _08121FE8
_08121F00:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
ldr r1, _08121F10 @ =0x0201b000
movs r2, 0x99
lsls r2, 2
@@ -140,7 +140,7 @@ _08121F14:
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
movs r2, 0x99
lsls r2, 2
adds r1, r4, r2
@@ -167,7 +167,7 @@ _08121F28:
.align 2, 0
_08121F50: .4byte 0x00000266
_08121F54:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
ldr r1, _08121F64 @ =0x0201b000
movs r2, 0x99
lsls r2, 2
@@ -176,7 +176,7 @@ _08121F54:
.align 2, 0
_08121F64: .4byte 0x0201b000
_08121F68:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
b _08121FE0
_08121F6E:
movs r5, 0
@@ -1348,7 +1348,7 @@ _08122890:
adds r1, r4, r2
b _081228CA
_081228A4:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
b _081228C2
_081228AA:
movs r1, 0x98
@@ -1407,7 +1407,7 @@ _081228F0:
adds r1, r5, 0
movs r2, 0x3
adds r3, r4, 0
- bl sub_806D880
+ bl CreatePartyMenuMonIcon
_08122912:
ldr r0, _0812294C @ =gUnknown_02023A00
lsls r1, r5, 5
@@ -1421,7 +1421,7 @@ _08122912:
adds r0, r6, 0
adds r1, r4, 0
movs r2, 0x3
- bl sub_806D99C
+ bl CreateMonIcon_806D99C
adds r0, r6, 0
adds r1, r4, 0
bl sub_806D50C
@@ -1464,7 +1464,7 @@ _08122958:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
- bl sub_806DCD4
+ bl CreateHeldItemIcon_806DCD4
_08122984:
ldr r0, _081229B4 @ =gUnknown_02023A00
lsls r1, r5, 5
@@ -1477,7 +1477,7 @@ _08122984:
lsrs r1, 24
ldrh r2, [r2, 0x2]
adds r0, r6, 0
- bl sub_806DCD4
+ bl CreateHeldItemIcon_806DCD4
_0812299E:
adds r0, r5, 0x1
lsls r0, 24
@@ -1510,9 +1510,9 @@ _081229C0:
adds r0, r5, 0
movs r1, 0x3
adds r2, r4, 0
- bl sub_806E4A4
+ bl PartyMenuPrintHP
adds r0, r4, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1524,7 +1524,7 @@ _081229C0:
lsrs r2, 24
adds r0, r5, 0
movs r1, 0x3
- bl sub_806E104
+ bl PartyMenuPutStatusTilemap
b _08122A12
.align 2, 0
_08122A00: .4byte gPlayerParty
@@ -1534,7 +1534,7 @@ _08122A04:
adds r2, r6
adds r0, r5, 0
movs r1, 0x3
- bl sub_806E294
+ bl PartyMenuPrintLevel
_08122A12:
adds r4, r5, 0
muls r4, r7
@@ -1542,11 +1542,11 @@ _08122A12:
adds r0, r5, 0
movs r1, 0x3
adds r2, r4, 0
- bl sub_806E3C0
+ bl PartyMenuPutNicknameTilemap
adds r0, r5, 0
movs r1, 0x3
adds r2, r4, 0
- bl sub_806E050
+ bl PrintPartyMenuMonNickname
adds r0, r5, 0
movs r1, 0x3
adds r2, r4, 0
@@ -1690,7 +1690,7 @@ _08122B2E:
ldrh r3, [r6, 0x12]
adds r0, r5, 0
movs r1, 0x3
- bl sub_806E420
+ bl PartyMenuDoPrintHP
ldrh r0, [r6, 0x10]
cmp r0, 0
bne _08122B64
@@ -1715,7 +1715,7 @@ _08122B76:
lsls r2, 24
lsrs r2, 24
movs r1, 0x3
- bl sub_806E104
+ bl PartyMenuPutStatusTilemap
b _08122B96
.align 2, 0
_08122B88: .4byte gUnknown_02023A14
@@ -1723,7 +1723,7 @@ _08122B8C:
ldrb r2, [r6, 0xF]
adds r0, r5, 0
movs r1, 0x3
- bl sub_806E1F4
+ bl PartyMenuDoPrintLevel
_08122B96:
mov r2, r10
adds r6, r7, r2
@@ -1736,7 +1736,7 @@ _08122B96:
str r5, [sp]
movs r2, 0x3
adds r3, r4, 0
- bl sub_806E35C
+ bl PartyMenuDoPutNicknameTilemap
mov r0, r9
adds r1, r5, 0
bl StringCopy
@@ -1873,7 +1873,7 @@ _08122CA8:
muls r2, r3
ldr r3, _08122CD8 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
b _08122D84
.align 2, 0
_08122CD0: .4byte 0x00000266
@@ -1887,14 +1887,14 @@ _08122CDC:
adds r1, r4, r0
b _08122D50
_08122CE8:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
b _08122D48
_08122CEE:
movs r1, 0x98
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
movs r2, 0x99
lsls r2, 2
adds r1, r4, r2
@@ -1921,10 +1921,10 @@ _08122D02:
.align 2, 0
_08122D28: .4byte 0x00000266
_08122D2C:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
b _08122D48
_08122D32:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
ldr r1, _08122D40 @ =0x0201b000
movs r0, 0x99
lsls r0, 2
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index af8d1742e..3816f3637 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1973,7 +1973,7 @@ sub_80C3024: @ 80C3024
cmp r3, 0
beq _080C30B0
adds r1, r6, 0
- bl sub_809D4F4
+ bl GetMonIconPtr
lsls r1, r5, 9
adds r0, r1
adds r0, 0x80
@@ -2031,7 +2031,7 @@ _080C30A8: .4byte 0x84000060
_080C30AC: .4byte 0x0600c000
_080C30B0:
adds r1, r6, 0
- bl sub_809D4F4
+ bl GetMonIconPtr
lsls r1, r5, 9
adds r0, r1
adds r0, 0x80
diff --git a/asm/intro.s b/asm/intro.s
index 21f3a236f..5c897a619 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -4021,8 +4021,8 @@ _0813E978: .4byte gSprites
_0813E97C: .4byte gSpriteTemplate_840B124
thumb_func_end sub_813E930
- thumb_func_start GetCurrentTrainerHillMapId
-GetCurrentTrainerHillMapId: @ 813E980
+ thumb_func_start sub_813E980
+sub_813E980: @ 813E980
push {r4,r5,lr}
adds r3, r0, 0
ldr r0, _0813E994 @ =gUnknown_0203931A
@@ -4137,7 +4137,7 @@ _0813EA50:
.align 2, 0
_0813EA58: .4byte gSprites
_0813EA5C: .4byte gSineTable
- thumb_func_end GetCurrentTrainerHillMapId
+ thumb_func_end sub_813E980
thumb_func_start sub_813EA60
sub_813EA60: @ 813EA60
@@ -4256,8 +4256,8 @@ _0813EB44: .4byte gSpriteTemplate_840B150
_0813EB48: .4byte gUnknown_0840B168
thumb_func_end sub_813EA60
- thumb_func_start sub_813EB4C
-sub_813EB4C: @ 813EB4C
+ thumb_func_start InitIntroTorchicAttackAnim
+InitIntroTorchicAttackAnim: @ 813EB4C
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -4311,7 +4311,7 @@ _0813EB84:
_0813EBB0: .4byte gSpriteTemplate_840B170
_0813EBB4: .4byte gSprites
_0813EBB8: .4byte gUnknown_0840B188
- thumb_func_end sub_813EB4C
+ thumb_func_end InitIntroTorchicAttackAnim
thumb_func_start sub_813EBBC
sub_813EBBC: @ 813EBBC
@@ -4575,8 +4575,8 @@ _0813EDB4: .4byte gSpriteTemplate_840B1B0
_0813EDB8: .4byte gSineTable
thumb_func_end sub_813EC90
- thumb_func_start sub_813EDBC
-sub_813EDBC: @ 813EDBC
+ thumb_func_start InitIntroMudkipAttackAnim
+InitIntroMudkipAttackAnim: @ 813EDBC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -4608,7 +4608,7 @@ _0813EDEE:
.align 2, 0
_0813EDF4: .4byte gSpriteTemplate_840B1C8
_0813EDF8: .4byte gSprites
- thumb_func_end sub_813EDBC
+ thumb_func_end InitIntroMudkipAttackAnim
thumb_func_start sub_813EDFC
sub_813EDFC: @ 813EDFC
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 121b44790..76ee536c7 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -2846,7 +2846,7 @@ sub_80B6EFC: @ 80B6EFC
str r2, [sp, 0x4]
movs r2, 0x34
movs r3, 0x18
- bl sub_809D2FC
+ bl CreateMonIcon
lsls r0, 24
lsrs r0, 24
ldr r2, _080B6F40 @ =gSprites
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 8f1d9d5b7..e05c6584d 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -185,7 +185,7 @@ _0806B020:
muls r2, r3
ldr r3, _0806B050 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
b _0806B114
.align 2, 0
_0806B048: .4byte 0x00000266
@@ -199,14 +199,14 @@ _0806B054:
adds r1, r4, r0
b _0806B0E0
_0806B060:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
b _0806B0D8
_0806B066:
movs r1, 0x98
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
movs r2, 0x99
lsls r2, 2
adds r1, r4, r2
@@ -233,10 +233,10 @@ _0806B07A:
.align 2, 0
_0806B0A0: .4byte 0x00000266
_0806B0A4:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
b _0806B0D8
_0806B0AA:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
ldr r1, _0806B0B8 @ =0x0201b000
movs r0, 0x99
lsls r0, 2
@@ -245,7 +245,7 @@ _0806B0AA:
.align 2, 0
_0806B0B8: .4byte 0x0201b000
_0806B0BC:
- bl sub_806E53C
+ bl PartyMenuTryPrintMonsHP
b _0806B0D8
_0806B0C2:
bl nullsub_13
@@ -774,8 +774,8 @@ _0806B520: .4byte REG_BG3VOFS
_0806B524: .4byte 0x0000ffff
thumb_func_end sub_806B4A8
- thumb_func_start sub_806B528
-sub_806B528: @ 806B528
+ thumb_func_start IsLinkDoubleBattle
+IsLinkDoubleBattle: @ 806B528
push {lr}
ldr r0, _0806B53C @ =gUnknown_020239F8
ldrh r1, [r0]
@@ -792,7 +792,7 @@ _0806B540:
_0806B542:
pop {r1}
bx r1
- thumb_func_end sub_806B528
+ thumb_func_end IsLinkDoubleBattle
thumb_func_start sub_806B548
sub_806B548: @ 806B548
@@ -833,7 +833,7 @@ sub_806B58C: @ 806B58C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -844,7 +844,7 @@ sub_806B58C: @ 806B58C
.align 2, 0
_0806B5A4: .4byte gUnknown_0202E8FA
_0806B5A8:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -909,7 +909,7 @@ _0806B628:
movs r1, 0
b _0806B8A8
_0806B638:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806B666
@@ -932,7 +932,7 @@ _0806B660:
ldrb r1, [r4, 0x3]
b _0806B8BC
_0806B666:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -954,7 +954,7 @@ _0806B684:
movs r1, 0x1
b _0806B8A8
_0806B694:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806B6C2
@@ -977,7 +977,7 @@ _0806B6BC:
ldrb r1, [r4, 0x5]
b _0806B8BC
_0806B6C2:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1021,7 +1021,7 @@ _0806B714:
ldrb r1, [r4, 0x5]
b _0806B8BC
_0806B71A:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806B74A
@@ -1044,7 +1044,7 @@ _0806B744:
ldrb r1, [r4, 0x7]
b _0806B8BC
_0806B74A:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1088,7 +1088,7 @@ _0806B79C:
ldrb r1, [r4, 0x7]
b _0806B8BC
_0806B7A2:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806B7D2
@@ -1112,7 +1112,7 @@ _0806B7CC:
ldrb r1, [r4, 0x9]
b _0806B8BC
_0806B7D2:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1159,7 +1159,7 @@ _0806B82C:
ldrb r1, [r4, 0x9]
b _0806B8BC
_0806B832:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806B84C
@@ -1171,7 +1171,7 @@ _0806B832:
.align 2, 0
_0806B848: .4byte gPlayerPartyCount
_0806B84C:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1714,7 +1714,7 @@ sub_806BC3C: @ 806BC3C
lsls r5, 24
lsrs r5, 24
ldr r6, _0806BCB0 @ =gUnknown_08376918
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r4, 2
lsls r0, 24
lsrs r0, 24
@@ -2176,8 +2176,8 @@ sub_806BF74: @ 806BF74
mov r0, r9
adds r1, r5, 0
movs r2, 0
- bl sub_806DA44
- bl sub_806B528
+ bl UpdateMonIconFrame_806DA44
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2328,7 +2328,7 @@ _0806C0CC: .4byte 0x0201b000
_0806C0D0: .4byte 0x00000261
_0806C0D4: .4byte gUnknown_083768B8
_0806C0D8:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r7, r0, 24
cmp r5, 0x5
@@ -2436,7 +2436,7 @@ _0806C1A4:
lsrs r1, 24
mov r0, r9
movs r2, 0x1
- bl sub_806DA44
+ bl UpdateMonIconFrame_806DA44
movs r2, 0x2E
ldrsh r0, [r4, r2]
cmp r5, r0
@@ -3082,7 +3082,7 @@ sub_806C658: @ 806C658
mov r0, r8
adds r1, r6, 0
movs r2, 0
- bl sub_806DA44
+ bl UpdateMonIconFrame_806DA44
cmp r6, 0x5
bhi _0806C6A8
lsls r0, r6, 1
@@ -3321,7 +3321,7 @@ _0806C84A:
lsrs r1, 24
mov r0, r8
movs r2, 0x1
- bl sub_806DA44
+ bl UpdateMonIconFrame_806DA44
movs r3, 0x2E
ldrsh r0, [r4, r3]
cmp r6, r0
@@ -3362,7 +3362,7 @@ sub_806C890: @ 806C890
adds r0, r6, 0
adds r1, r4, 0
movs r2, 0
- bl sub_806DA44
+ bl UpdateMonIconFrame_806DA44
cmp r4, 0x5
bhi _0806C8DC
lsls r0, r4, 1
@@ -3430,7 +3430,7 @@ sub_806C92C: @ 806C92C
ldrh r0, [r1, 0x30]
lsls r0, 24
lsrs r4, r0, 24
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0806C96A
@@ -4020,11 +4020,11 @@ _0806CDCC:
ldr r4, _0806CE1C @ =0x02001000
ldrb r0, [r4]
ldrb r1, [r4, 0x5]
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
strb r0, [r4, 0x3]
ldrb r0, [r4]
ldrb r1, [r4, 0x6]
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
strb r0, [r4, 0x4]
ldrb r3, [r4, 0x5]
cmp r3, 0
@@ -4515,12 +4515,12 @@ sub_806D198: @ 806D198
ldrb r0, [r4]
ldrb r1, [r4, 0x5]
ldrb r2, [r4, 0x4]
- bl sub_806DE50
+ bl SetMonIconSpriteId_maybe
ldrb r0, [r4]
ldrb r1, [r4, 0x6]
ldrb r2, [r4, 0x3]
- bl sub_806DE50
- bl battle_type_is_double
+ bl SetMonIconSpriteId_maybe
+ bl IsDoubleBattle
ldr r5, _0806D368 @ =gSprites
ldrb r1, [r4, 0x3]
lsls r3, r1, 4
@@ -4541,7 +4541,7 @@ sub_806D198: @ 806D198
movs r1, 0
mov r8, r1
strh r0, [r3, 0x20]
- bl battle_type_is_double
+ bl IsDoubleBattle
ldrb r1, [r4, 0x3]
lsls r3, r1, 4
adds r3, r1
@@ -4580,9 +4580,9 @@ sub_806D198: @ 806D198
adds r1, r5
mov r9, r1
add r0, r9
- ldr r7, _0806D370 @ =sub_806DA38
+ ldr r7, _0806D370 @ =UpdateMonIconFrame_806DA38
str r7, [r0]
- bl battle_type_is_double
+ bl IsDoubleBattle
ldrb r1, [r4, 0x4]
lsls r3, r1, 4
adds r3, r1
@@ -4599,7 +4599,7 @@ sub_806D198: @ 806D198
adds r2, r6
ldrb r0, [r2]
strh r0, [r3, 0x20]
- bl battle_type_is_double
+ bl IsDoubleBattle
ldrb r1, [r4, 0x4]
lsls r3, r1, 4
adds r3, r1
@@ -4645,14 +4645,14 @@ sub_806D198: @ 806D198
ldrh r1, [r1, 0x2E]
lsls r1, 24
lsrs r1, 24
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
adds r1, r0
lsls r1, 2
add r1, r9
- ldr r0, _0806D374 @ =sub_806DA0C
+ ldr r0, _0806D374 @ =UpdateMonIconFrame_806DA0C
str r0, [r1]
ldrb r0, [r4, 0x5]
movs r6, 0x64
@@ -4667,17 +4667,17 @@ sub_806D198: @ 806D198
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E2C0
+ bl PartyMenuPrintMonLevelOrStatus
ldrb r0, [r4, 0x5]
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E07C
+ bl TryPrintPartyMenuMonNickname
ldrb r0, [r4, 0x5]
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E4E8
+ bl PartyMenuTryPrintHP
ldrb r0, [r4, 0x5]
adds r1, r0, 0
muls r1, r6
@@ -4687,17 +4687,17 @@ sub_806D198: @ 806D198
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E2C0
+ bl PartyMenuPrintMonLevelOrStatus
ldrb r0, [r4, 0x6]
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E07C
+ bl TryPrintPartyMenuMonNickname
ldrb r0, [r4, 0x6]
adds r1, r0, 0
muls r1, r6
adds r1, r5
- bl sub_806E4E8
+ bl PartyMenuTryPrintHP
ldrb r0, [r4, 0x6]
adds r1, r0, 0
muls r1, r6
@@ -4717,8 +4717,8 @@ sub_806D198: @ 806D198
_0806D364: .4byte 0x02001000
_0806D368: .4byte gSprites
_0806D36C: .4byte gUnknown_08376678
-_0806D370: .4byte sub_806DA38
-_0806D374: .4byte sub_806DA0C
+_0806D370: .4byte UpdateMonIconFrame_806DA38
+_0806D374: .4byte UpdateMonIconFrame_806DA0C
_0806D378: .4byte gPlayerParty
thumb_func_end sub_806D198
@@ -4726,7 +4726,7 @@ _0806D378: .4byte gPlayerParty
sub_806D37C: @ 806D37C
push {r4,lr}
adds r4, r0, 0
- bl sub_809D638
+ bl UpdateMonIconFrame
ldrh r2, [r4, 0x24]
movs r0, 0x24
ldrsh r1, [r4, r0]
@@ -4740,11 +4740,11 @@ sub_806D37C: @ 806D37C
movs r1, 0
strh r0, [r4, 0x2E]
strh r1, [r4, 0x32]
- ldr r0, _0806D3A4 @ =sub_806DA38
+ ldr r0, _0806D3A4 @ =UpdateMonIconFrame_806DA38
str r0, [r4, 0x1C]
b _0806D3AE
.align 2, 0
-_0806D3A4: .4byte sub_806DA38
+_0806D3A4: .4byte UpdateMonIconFrame_806DA38
_0806D3A8:
ldrh r0, [r4, 0x2E]
adds r0, r2, r0
@@ -4890,7 +4890,7 @@ sub_806D4AC: @ 806D4AC
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
ldr r2, _0806D4FC @ =gSprites
@@ -4932,7 +4932,7 @@ sub_806D50C: @ 806D50C
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
ldr r2, _0806D534 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -5036,7 +5036,7 @@ sub_806D5B8: @ 806D5B8
lsls r5, 24
lsrs r5, 24
ldr r6, _0806D658 @ =gUnknown_08376948
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r4, r5, 2
lsls r0, 24
lsrs r0, 24
@@ -5047,7 +5047,7 @@ sub_806D5B8: @ 806D5B8
adds r1, r6
ldrb r1, [r1]
mov r10, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -5057,7 +5057,7 @@ sub_806D5B8: @ 806D5B8
adds r1, r6
ldrb r1, [r1, 0x1]
mov r9, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -5067,7 +5067,7 @@ sub_806D5B8: @ 806D5B8
adds r1, r6
ldrb r1, [r1, 0x2]
mov r8, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -5118,7 +5118,7 @@ sub_806D668: @ 806D668
lsls r5, 24
lsrs r5, 24
ldr r6, _0806D708 @ =gUnknown_08376978
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r4, r5, 2
lsls r0, 24
lsrs r0, 24
@@ -5129,7 +5129,7 @@ sub_806D668: @ 806D668
adds r1, r6
ldrb r1, [r1]
mov r10, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -5139,7 +5139,7 @@ sub_806D668: @ 806D668
adds r1, r6
ldrb r1, [r1, 0x1]
mov r9, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -5149,7 +5149,7 @@ sub_806D668: @ 806D668
adds r1, r6
ldrb r1, [r1, 0x2]
mov r8, r1
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
diff --git a/asm/pokeball.s b/asm/pokeball.s
index a3eb6dd16..45d0895ea 100644
--- a/asm/pokeball.s
+++ b/asm/pokeball.s
@@ -1174,7 +1174,7 @@ _08046D34:
cmp r5, r0
bne _08046DAE
_08046D5A:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08046DAE
@@ -1209,7 +1209,7 @@ _08046DA4:
movs r2, 0x80
bl m4aMPlayVolumeControl
_08046DAE:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08046DC4
@@ -1738,7 +1738,7 @@ _080471B8:
ldrb r0, [r5, 0x6]
strh r0, [r5, 0x3A]
strh r1, [r5, 0x2E]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08047214
@@ -1813,7 +1813,7 @@ sub_8047254: @ 8047254
ble _080472A4
movs r0, 0
strh r0, [r5, 0x2E]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080472A0
diff --git a/asm/rom5.s b/asm/rom5.s
index a228374e3..3879f6c91 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -279,7 +279,7 @@ _0807AF88:
lsrs r1, 16
adds r0, r4, 0
bl sub_8032984
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0807AFEC
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 1b0ef2731..d8760c47a 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -49567,7 +49567,7 @@ _08026832:
adds r1, r2
adds r1, r0
strb r5, [r1]
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08026850
@@ -62952,11 +62952,11 @@ _0802D318: .4byte 0x02017810
sub_802D31C: @ 802D31C
push {r4-r7,lr}
movs r6, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802D340
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802D374
@@ -63133,7 +63133,7 @@ _0802D488:
ldr r5, _0802D4F0 @ =gPlayerParty
adds r0, r5
bl sub_80324F8
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802D4BE
@@ -63247,7 +63247,7 @@ _0802D55E:
ands r0, r1
cmp r0, 0
bne _0802D64C
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0802D5EE
@@ -63699,7 +63699,7 @@ sub_802D924: @ 802D924
str r7, [sp, 0x8]
ldrh r2, [r1, 0xA]
str r2, [sp, 0xC]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -63776,7 +63776,7 @@ _0802D96A:
movs r1, 0xB
bl dp01_build_cmdbuf_x21_a_bb
strb r5, [r4]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -64117,7 +64117,7 @@ sub_802DCB0: @ 802DCB0
adds r0, r1
ldrb r4, [r0, 0xC]
ldrb r6, [r0, 0x8]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -64184,7 +64184,7 @@ sub_802DD10: @ 802DD10
adds r0, r7, 0
movs r1, 0x38
bl GetMonData
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -70181,7 +70181,7 @@ _08030ECC:
mov r9, r0
ldrh r0, [r1, 0x8]
strb r0, [r7]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08030EEC
@@ -71804,7 +71804,7 @@ unref_sub_8031BA0: @ 8031BA0
adds r4, 0x8
adds r0, r4, 0
bl LoadSpritePalette
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08031BD8
@@ -71883,7 +71883,7 @@ _08031C40:
.align 2, 0
_08031C58: .4byte gUnknown_0820A4D4
_08031C5C:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08031CC4
@@ -73010,7 +73010,7 @@ _08032568:
negs r0, r0
ands r0, r2
strb r0, [r1]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08032590
@@ -73020,7 +73020,7 @@ _08032568:
.align 2, 0
_0803258C: .4byte 0x02017800
_08032590:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080325B2
@@ -73057,7 +73057,7 @@ sub_80325B8: @ 80325B8
adds r0, r5, 0
ands r0, r2
strb r0, [r1]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080325F2
@@ -73160,7 +73160,7 @@ sub_8032638: @ 8032638
mov r1, r8
bl sub_80324F8
_080326AA:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080326CE
@@ -73349,7 +73349,7 @@ sub_80327CC: @ 80327CC
lsls r0, 2
adds r0, r7
strh r5, [r0, 0x2E]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0803288A
@@ -73931,11 +73931,11 @@ _08032C84: .4byte 0x02017810
sub_8032C88: @ 8032C88
push {r4-r7,lr}
movs r6, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08032CAC
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08032CE0
@@ -74206,7 +74206,7 @@ _08032EAE:
beq _08032EC6
b _08032FE0
_08032EC6:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08032F58
@@ -79743,7 +79743,7 @@ sub_8035C44: @ 8035C44
adds r0, r1
ldrh r0, [r0, 0x8]
strb r0, [r7]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08035C7E
@@ -83046,11 +83046,11 @@ _0803767C: .4byte 0x02017810
sub_8037680: @ 8037680
push {r4-r7,lr}
movs r6, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080376A4
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080376D8
@@ -83368,7 +83368,7 @@ _0803790E:
adds r0, r5
strb r4, [r0, 0x9]
_0803791A:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _080379B2
@@ -88441,7 +88441,7 @@ sub_803A2C4: @ 803A2C4
adds r0, r1
ldrh r0, [r0, 0x8]
strb r0, [r7]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0803A2FE
diff --git a/asm/rom_804373C.s b/asm/rom_804373C.s
index ab3a81e18..b3011de55 100644
--- a/asm/rom_804373C.s
+++ b/asm/rom_804373C.s
@@ -275,7 +275,7 @@ battle_make_oam_normal_battle: @ 8043914
mov r10, r0
movs r0, 0
str r0, [sp]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08043A28
@@ -1060,7 +1060,7 @@ sub_8043F44: @ 8043F44
lsrs r6, r0, 24
movs r5, 0
movs r4, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08043F70
@@ -1135,7 +1135,7 @@ sub_8043FC0: @ 8043FC0
mov r0, sp
movs r2, 0x1E
bl memcpy
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08044010
@@ -1291,7 +1291,7 @@ sub_80440EC: @ 80440EC
adds r4, r0, r1
movs r0, 0x3A
ldrsh r5, [r4, r0]
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1854,7 +1854,7 @@ _0804458E:
bne _080445A2
b _080447D4
_080445A2:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080445BA
@@ -1890,7 +1890,7 @@ _080445BA:
lsls r0, 24
cmp r0, 0
bne _080446DC
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080445FA
@@ -2178,7 +2178,7 @@ _08044854:
movs r7, 0x1
cmp r4, 0
beq _08044864
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _0804486A
@@ -3630,7 +3630,7 @@ _0804535A:
lsls r0, 24
cmp r0, 0
bne _080453D4
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _080453D4
@@ -3887,7 +3887,7 @@ draw_status_ailment_maybe: @ 8045540
movs r1, 0x37
bl GetMonData
adds r4, r0, 0
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
movs r3, 0x12
mov r8, r3
@@ -4092,7 +4092,7 @@ _080456FC:
ldr r2, _080457DC @ =REG_BG2HOFS
adds r0, r6, 0
bl CpuSet
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4556,7 +4556,7 @@ _08045AEE:
movs r3, 0
bl sub_8045C78
_08045B22:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -4767,7 +4767,7 @@ _08045CBC:
ldr r1, [r6, 0xC]
ldr r2, [r6, 0x4]
movs r3, 0x8
- bl sub_8046188
+ bl GetScaledExpFraction
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -5400,8 +5400,8 @@ _08046154:
bx r0
thumb_func_end sub_8046128
- thumb_func_start sub_8046188
-sub_8046188: @ 8046188
+ thumb_func_start GetScaledExpFraction
+GetScaledExpFraction: @ 8046188
push {r4-r7,lr}
adds r6, r2, 0
lsls r3, 27
@@ -5440,7 +5440,7 @@ _080461C8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8046188
+ thumb_func_end GetScaledExpFraction
thumb_func_start GetScaledHPFraction
GetScaledHPFraction: @ 80461D4
diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s
index d28aea9a8..97e866ad1 100644
--- a/asm/rom_806D7F8.s
+++ b/asm/rom_806D7F8.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start sub_806D7F8
-sub_806D7F8: @ 806D7F8
+ thumb_func_start SetMonIconAnimByHP
+SetMonIconAnimByHP: @ 806D7F8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -48,10 +48,10 @@ _0806D830:
bx r0
.align 2, 0
_0806D848: .4byte gSprites
- thumb_func_end sub_806D7F8
+ thumb_func_end SetMonIconAnimByHP
- thumb_func_start sub_806D84C
-sub_806D84C: @ 806D84C
+ thumb_func_start SetMonIconAnim
+SetMonIconAnim: @ 806D84C
push {r4-r6,lr}
adds r5, r0, 0
adds r6, r1, 0
@@ -71,14 +71,14 @@ sub_806D84C: @ 806D84C
lsrs r2, 16
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806D7F8
+ bl SetMonIconAnimByHP
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_806D84C
+ thumb_func_end SetMonIconAnim
- thumb_func_start sub_806D880
-sub_806D880: @ 806D880
+ thumb_func_start CreatePartyMenuMonIcon
+CreatePartyMenuMonIcon: @ 806D880
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -121,17 +121,17 @@ sub_806D880: @ 806D880
adds r0, r4, 0
mov r2, r9
mov r3, r10
- bl sub_809D2FC
+ bl CreateMonIcon
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_806DE50
+ bl SetMonIconSpriteId_maybe
adds r0, r4, 0
mov r1, r8
- bl sub_806D84C
+ bl SetMonIconAnim
add sp, 0x8
pop {r3-r5}
mov r8, r3
@@ -143,10 +143,10 @@ sub_806D880: @ 806D880
.align 2, 0
_0806D904: .4byte gUnknown_08376678
_0806D908: .4byte sub_809D62C
- thumb_func_end sub_806D880
+ thumb_func_end CreatePartyMenuMonIcon
- thumb_func_start sub_806D90C
-sub_806D90C: @ 806D90C
+ thumb_func_start TryCreatePartyMenuMonIcon
+TryCreatePartyMenuMonIcon: @ 806D90C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -162,7 +162,7 @@ sub_806D90C: @ 806D90C
bl GetMonData
cmp r0, 0
beq _0806D95A
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -171,24 +171,24 @@ sub_806D90C: @ 806D90C
adds r1, r5, 0
movs r2, 0x2
adds r3, r4, 0
- bl sub_806D880
+ bl CreatePartyMenuMonIcon
b _0806D95A
_0806D946:
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
mov r0, r8
adds r1, r7, 0
adds r3, r4, 0
- bl sub_806D880
+ bl CreatePartyMenuMonIcon
_0806D95A:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_806D90C
+ thumb_func_end TryCreatePartyMenuMonIcon
thumb_func_start unref_sub_806D964
unref_sub_806D964: @ 806D964
@@ -205,7 +205,7 @@ _0806D96E:
adds r2, r0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -222,8 +222,8 @@ _0806D994: .4byte gPlayerParty
_0806D998: .4byte gPlayerPartyCount
thumb_func_end unref_sub_806D964
- thumb_func_start sub_806D99C
-sub_806D99C: @ 806D99C
+ thumb_func_start CreateMonIcon_806D99C
+CreateMonIcon_806D99C: @ 806D99C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -254,18 +254,18 @@ sub_806D99C: @ 806D99C
mov r7, r8
ldr r4, [r7, 0x18]
str r4, [sp, 0x4]
- bl sub_809D2FC
+ bl CreateMonIcon
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_806DE50
+ bl SetMonIconSpriteId_maybe
ldrh r1, [r7, 0x10]
ldrh r2, [r7, 0x12]
adds r0, r4, 0
- bl sub_806D7F8
+ bl SetMonIconAnimByHP
add sp, 0x8
pop {r3}
mov r8, r3
@@ -275,13 +275,13 @@ sub_806D99C: @ 806D99C
.align 2, 0
_0806DA04: .4byte gUnknown_08376678
_0806DA08: .4byte sub_809D62C
- thumb_func_end sub_806D99C
+ thumb_func_end CreateMonIcon_806D99C
- thumb_func_start sub_806DA0C
-sub_806DA0C: @ 806DA0C
+ thumb_func_start UpdateMonIconFrame_806DA0C
+UpdateMonIconFrame_806DA0C: @ 806DA0C
push {r4,lr}
adds r4, r0, 0
- bl sub_809D638
+ bl UpdateMonIconFrame
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -301,18 +301,18 @@ _0806DA32:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_806DA0C
+ thumb_func_end UpdateMonIconFrame_806DA0C
- thumb_func_start sub_806DA38
-sub_806DA38: @ 806DA38
+ thumb_func_start UpdateMonIconFrame_806DA38
+UpdateMonIconFrame_806DA38: @ 806DA38
push {lr}
- bl sub_809D638
+ bl UpdateMonIconFrame
pop {r0}
bx r0
- thumb_func_end sub_806DA38
+ thumb_func_end UpdateMonIconFrame_806DA38
- thumb_func_start sub_806DA44
-sub_806DA44: @ 806DA44
+ thumb_func_start UpdateMonIconFrame_806DA44
+UpdateMonIconFrame_806DA44: @ 806DA44
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -322,7 +322,7 @@ sub_806DA44: @ 806DA44
lsrs r4, r2, 24
cmp r1, 0x5
bhi _0806DA8E
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
ldr r3, _0806DA7C @ =gSprites
@@ -338,16 +338,16 @@ sub_806DA44: @ 806DA44
adds r0, r3, 0
adds r0, 0x1C
adds r0, r2, r0
- ldr r1, _0806DA80 @ =sub_806DA38
+ ldr r1, _0806DA80 @ =UpdateMonIconFrame_806DA38
b _0806DA8C
.align 2, 0
_0806DA7C: .4byte gSprites
-_0806DA80: .4byte sub_806DA38
+_0806DA80: .4byte UpdateMonIconFrame_806DA38
_0806DA84:
adds r0, r3, 0
adds r0, 0x1C
adds r0, r2, r0
- ldr r1, _0806DA94 @ =sub_806DA0C
+ ldr r1, _0806DA94 @ =UpdateMonIconFrame_806DA0C
_0806DA8C:
str r1, [r0]
_0806DA8E:
@@ -355,11 +355,11 @@ _0806DA8E:
pop {r0}
bx r0
.align 2, 0
-_0806DA94: .4byte sub_806DA0C
- thumb_func_end sub_806DA44
+_0806DA94: .4byte UpdateMonIconFrame_806DA0C
+ thumb_func_end UpdateMonIconFrame_806DA44
- thumb_func_start sub_806DA98
-sub_806DA98: @ 806DA98
+ thumb_func_start LoadHeldItemIconGraphics
+LoadHeldItemIconGraphics: @ 806DA98
push {lr}
ldr r0, _0806DAAC @ =gUnknown_083765DC
bl LoadSpriteSheet
@@ -370,10 +370,10 @@ sub_806DA98: @ 806DA98
.align 2, 0
_0806DAAC: .4byte gUnknown_083765DC
_0806DAB0: .4byte gUnknown_083765E4
- thumb_func_end sub_806DA98
+ thumb_func_end LoadHeldItemIconGraphics
- thumb_func_start sub_806DAB4
-sub_806DAB4: @ 806DAB4
+ thumb_func_start SpriteCB_HeldItemIcon
+SpriteCB_HeldItemIcon: @ 806DAB4
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x3C]
@@ -419,10 +419,10 @@ _0806DB06:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_806DAB4
+ thumb_func_end SpriteCB_HeldItemIcon
- thumb_func_start sub_806DB0C
-sub_806DB0C: @ 806DB0C
+ thumb_func_start CreateHeldItemIcon
+CreateHeldItemIcon: @ 806DB0C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -464,7 +464,7 @@ sub_806DB0C: @ 806DB0C
movs r0, 0x1C
add r8, r0
add r4, r8
- ldr r0, _0806DB8C @ =sub_806DAB4
+ ldr r0, _0806DB8C @ =SpriteCB_HeldItemIcon
str r0, [r4]
strh r6, [r5, 0x3C]
adds r0, r5, 0
@@ -482,11 +482,11 @@ sub_806DB0C: @ 806DB0C
.align 2, 0
_0806DB84: .4byte gSprites
_0806DB88: .4byte gSpriteTemplate_837660C
-_0806DB8C: .4byte sub_806DAB4
- thumb_func_end sub_806DB0C
+_0806DB8C: .4byte SpriteCB_HeldItemIcon
+ thumb_func_end CreateHeldItemIcon
- thumb_func_start sub_806DB90
-sub_806DB90: @ 806DB90
+ thumb_func_start CreateHeldItemIcons
+CreateHeldItemIcons: @ 806DB90
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
@@ -521,7 +521,7 @@ _0806DBAC:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_806DB0C
+ bl CreateHeldItemIcon
_0806DBD8:
adds r0, r5, 0x1
lsls r0, 16
@@ -554,7 +554,7 @@ _0806DBF0:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_806DB0C
+ bl CreateHeldItemIcon
_0806DC1C:
adds r0, r5, 0x1
lsls r0, 16
@@ -569,10 +569,10 @@ _0806DC28:
bx r0
.align 2, 0
_0806DC30: .4byte gEnemyParty
- thumb_func_end sub_806DB90
+ thumb_func_end CreateHeldItemIcons
- thumb_func_start sub_806DC34
-sub_806DC34: @ 806DC34
+ thumb_func_start CreateHeldItemIcons_806DC34
+CreateHeldItemIcons_806DC34: @ 806DC34
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -598,7 +598,7 @@ _0806DC50:
beq _0806DCB0
mov r0, r8
adds r1, r7, 0
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -626,7 +626,7 @@ _0806DC50:
strh r0, [r1, 0x3C]
mov r0, r8
adds r1, r7, 0
- bl sub_806DF60
+ bl SetHeldItemIconVisibility
add r4, r10
ldr r1, [r4]
adds r0, r6, 0
@@ -648,10 +648,10 @@ _0806DCB0:
_0806DCC8: .4byte gSprites
_0806DCCC: .4byte gPlayerParty
_0806DCD0: .4byte gSpriteTemplate_837660C
- thumb_func_end sub_806DC34
+ thumb_func_end CreateHeldItemIcons_806DC34
- thumb_func_start sub_806DCD4
-sub_806DCD4: @ 806DCD4
+ thumb_func_start CreateHeldItemIcon_806DCD4
+CreateHeldItemIcon_806DCD4: @ 806DCD4
push {r4-r7,lr}
lsls r0, 24
lsrs r0, 24
@@ -659,7 +659,7 @@ sub_806DCD4: @ 806DCD4
lsrs r1, 24
lsls r2, 16
lsrs r7, r2, 16
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -734,10 +734,10 @@ _0806DD5C:
bx r0
.align 2, 0
_0806DD78: .4byte gSprites
- thumb_func_end sub_806DCD4
+ thumb_func_end CreateHeldItemIcon_806DCD4
- thumb_func_start sub_806DD7C
-sub_806DD7C: @ 806DD7C
+ thumb_func_start SpriteCB_HeldItemIcon_806DD7C
+SpriteCB_HeldItemIcon_806DD7C: @ 806DD7C
ldrh r2, [r0, 0x3C]
lsls r2, 24
lsrs r2, 24
@@ -755,10 +755,10 @@ sub_806DD7C: @ 806DD7C
bx lr
.align 2, 0
_0806DD9C: .4byte gSprites
- thumb_func_end sub_806DD7C
+ thumb_func_end SpriteCB_HeldItemIcon_806DD7C
- thumb_func_start sub_806DDA0
-sub_806DDA0: @ 806DDA0
+ thumb_func_start GetMonIconSpriteId_maybe
+GetMonIconSpriteId_maybe: @ 806DDA0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -845,10 +845,10 @@ _0806DE46:
bx r1
.align 2, 0
_0806DE4C: .4byte gTasks
- thumb_func_end sub_806DDA0
+ thumb_func_end GetMonIconSpriteId_maybe
- thumb_func_start sub_806DE50
-sub_806DE50: @ 806DE50
+ thumb_func_start SetMonIconSpriteId_maybe
+SetMonIconSpriteId_maybe: @ 806DE50
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -960,16 +960,16 @@ _0806DF24:
.align 2, 0
_0806DF2C: .4byte gTasks
_0806DF30: .4byte 0xffffff00
- thumb_func_end sub_806DE50
+ thumb_func_end SetMonIconSpriteId_maybe
- thumb_func_start sub_806DF34
-sub_806DF34: @ 806DF34
+ thumb_func_start GetHeldItemIconSpriteIdByMon_maybe
+GetHeldItemIconSpriteIdByMon_maybe: @ 806DF34
push {lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
ldr r2, _0806DF5C @ =gSprites
@@ -984,10 +984,10 @@ sub_806DF34: @ 806DF34
bx r1
.align 2, 0
_0806DF5C: .4byte gSprites
- thumb_func_end sub_806DF34
+ thumb_func_end GetHeldItemIconSpriteIdByMon_maybe
- thumb_func_start sub_806DF60
-sub_806DF60: @ 806DF60
+ thumb_func_start SetHeldItemIconVisibility
+SetHeldItemIconVisibility: @ 806DF60
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -995,7 +995,7 @@ sub_806DF60: @ 806DF60
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
- bl sub_806DF34
+ bl GetHeldItemIconSpriteIdByMon_maybe
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -1065,7 +1065,7 @@ _0806DFF6:
bx r0
.align 2, 0
_0806DFFC: .4byte gSprites
- thumb_func_end sub_806DF60
+ thumb_func_end SetHeldItemIconVisibility
thumb_func_start box_print
box_print: @ 806E000
@@ -1104,8 +1104,8 @@ _0806E048: .4byte gWindowConfig_81E6CAC
_0806E04C: .4byte 0x06014000
thumb_func_end box_print
- thumb_func_start sub_806E050
-sub_806E050: @ 806E050
+ thumb_func_start PrintPartyMenuMonNickname
+PrintPartyMenuMonNickname: @ 806E050
push {r4,r5,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -1125,10 +1125,10 @@ sub_806E050: @ 806E050
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_806E050
+ thumb_func_end PrintPartyMenuMonNickname
- thumb_func_start sub_806E07C
-sub_806E07C: @ 806E07C
+ thumb_func_start TryPrintPartyMenuMonNickname
+TryPrintPartyMenuMonNickname: @ 806E07C
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -1139,7 +1139,7 @@ sub_806E07C: @ 806E07C
bl GetMonData
cmp r0, 0
beq _0806E0BC
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1147,24 +1147,24 @@ sub_806E07C: @ 806E07C
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_806E050
+ bl PrintPartyMenuMonNickname
b _0806E0BC
_0806E0AA:
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
adds r2, r4, 0
- bl sub_806E050
+ bl PrintPartyMenuMonNickname
_0806E0BC:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_806E07C
+ thumb_func_end TryPrintPartyMenuMonNickname
- thumb_func_start sub_806E0C4
-sub_806E0C4: @ 806E0C4
+ thumb_func_start PrintPartyMenuMonNicknames
+PrintPartyMenuMonNicknames: @ 806E0C4
push {r4-r6,lr}
movs r4, 0
movs r6, 0x64
@@ -1174,7 +1174,7 @@ _0806E0CC:
muls r1, r6
adds r1, r5
adds r0, r4, 0
- bl sub_806E07C
+ bl TryPrintPartyMenuMonNickname
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1185,7 +1185,7 @@ _0806E0CC:
bx r0
.align 2, 0
_0806E0E8: .4byte gPlayerParty
- thumb_func_end sub_806E0C4
+ thumb_func_end PrintPartyMenuMonNicknames
thumb_func_start GetMonNickname
GetMonNickname: @ 806E0EC
@@ -1201,8 +1201,8 @@ GetMonNickname: @ 806E0EC
bx r1
thumb_func_end GetMonNickname
- thumb_func_start sub_806E104
-sub_806E104: @ 806E104
+ thumb_func_start PartyMenuPutStatusTilemap
+PartyMenuPutStatusTilemap: @ 806E104
push {r4,r5,lr}
lsls r0, 24
lsls r1, 24
@@ -1252,14 +1252,14 @@ _0806E142:
_0806E15C: .4byte gUnknown_08376738
_0806E160: .4byte 0x0600f000
_0806E164: .4byte 0xffffb000
- thumb_func_end sub_806E104
+ thumb_func_end PartyMenuPutStatusTilemap
thumb_func_start sub_806E168
sub_806E168: @ 806E168
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1267,7 +1267,7 @@ sub_806E168: @ 806E168
movs r3, 0x2
b _0806E186
_0806E17E:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r3, r0, 24
_0806E186:
@@ -1309,8 +1309,8 @@ _0806E1C8: .4byte gUnknown_08376738
_0806E1CC: .4byte 0x0600f000
thumb_func_end sub_806E168
- thumb_func_start sub_806E1D0
-sub_806E1D0: @ 806E1D0
+ thumb_func_start PartyMenuWriteTilemap
+PartyMenuWriteTilemap: @ 806E1D0
lsls r0, 24
lsrs r0, 24
lsls r1, 24
@@ -1328,10 +1328,10 @@ sub_806E1D0: @ 806E1D0
bx lr
.align 2, 0
_0806E1F0: .4byte 0x0600f000
- thumb_func_end sub_806E1D0
+ thumb_func_end PartyMenuWriteTilemap
- thumb_func_start sub_806E1F4
-sub_806E1F4: @ 806E1F4
+ thumb_func_start PartyMenuDoPrintLevel
+PartyMenuDoPrintLevel: @ 806E1F4
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1358,7 +1358,7 @@ sub_806E1F4: @ 806E1F4
lsls r2, 24
lsrs r2, 24
movs r0, 0x40
- bl sub_806E1D0
+ bl PartyMenuWriteTilemap
ldr r6, _0806E27C @ =gStringVar1
movs r0, 0xFC
strb r0, [r6]
@@ -1400,10 +1400,10 @@ _0806E284: .4byte 0x01000020
_0806E288: .4byte gWindowConfig_81E6CAC
_0806E28C: .4byte 0xffffff00
_0806E290: .4byte 0x06014200
- thumb_func_end sub_806E1F4
+ thumb_func_end PartyMenuDoPrintLevel
- thumb_func_start sub_806E294
-sub_806E294: @ 806E294
+ thumb_func_start PartyMenuPrintLevel
+PartyMenuPrintLevel: @ 806E294
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1419,14 +1419,14 @@ sub_806E294: @ 806E294
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806E1F4
+ bl PartyMenuDoPrintLevel
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_806E294
+ thumb_func_end PartyMenuPrintLevel
- thumb_func_start sub_806E2C0
-sub_806E2C0: @ 806E2C0
+ thumb_func_start PartyMenuPrintMonLevelOrStatus
+PartyMenuPrintMonLevelOrStatus: @ 806E2C0
push {r4-r7,lr}
adds r5, r1, 0
lsls r0, 24
@@ -1442,10 +1442,10 @@ sub_806E2C0: @ 806E2C0
cmp r0, 0
bne _0806E32E
adds r0, r5, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
lsrs r4, r0, 24
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1453,7 +1453,7 @@ sub_806E2C0: @ 806E2C0
movs r6, 0x2
b _0806E302
_0806E2FA:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r6, r0, 24
_0806E302:
@@ -1466,26 +1466,26 @@ _0806E302:
lsrs r2, 24
adds r0, r7, 0
adds r1, r6, 0
- bl sub_806E104
+ bl PartyMenuPutStatusTilemap
b _0806E324
_0806E31A:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_806E294
+ bl PartyMenuPrintLevel
_0806E324:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_806E3C0
+ bl PartyMenuPutNicknameTilemap
_0806E32E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_806E2C0
+ thumb_func_end PartyMenuPrintMonLevelOrStatus
- thumb_func_start sub_806E334
-sub_806E334: @ 806E334
+ thumb_func_start PartyMenuPrintMonsLevelOrStatus
+PartyMenuPrintMonsLevelOrStatus: @ 806E334
push {r4-r6,lr}
movs r4, 0
movs r6, 0x64
@@ -1495,7 +1495,7 @@ _0806E33C:
muls r1, r6
adds r1, r5
adds r0, r4, 0
- bl sub_806E2C0
+ bl PartyMenuPrintMonLevelOrStatus
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1506,10 +1506,10 @@ _0806E33C:
bx r0
.align 2, 0
_0806E358: .4byte gPlayerParty
- thumb_func_end sub_806E334
+ thumb_func_end PartyMenuPrintMonsLevelOrStatus
- thumb_func_start sub_806E35C
-sub_806E35C: @ 806E35C
+ thumb_func_start PartyMenuDoPutNicknameTilemap
+PartyMenuDoPutNicknameTilemap: @ 806E35C
push {r4-r7,lr}
ldr r4, [sp, 0x14]
lsls r0, 16
@@ -1549,20 +1549,20 @@ _0806E3A4: .4byte gUnknown_08376738
_0806E3A8:
movs r0, 0x42
adds r1, r3, 0
- bl sub_806E1D0
+ bl PartyMenuWriteTilemap
b _0806E3BA
_0806E3B2:
movs r0, 0x44
adds r1, r3, 0
- bl sub_806E1D0
+ bl PartyMenuWriteTilemap
_0806E3BA:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_806E35C
+ thumb_func_end PartyMenuDoPutNicknameTilemap
- thumb_func_start sub_806E3C0
-sub_806E3C0: @ 806E3C0
+ thumb_func_start PartyMenuPutNicknameTilemap
+PartyMenuPutNicknameTilemap: @ 806E3C0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1597,7 +1597,7 @@ sub_806E3C0: @ 806E3C0
adds r0, r4, 0
adds r2, r6, 0
mov r3, r8
- bl sub_806E35C
+ bl PartyMenuDoPutNicknameTilemap
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -1607,10 +1607,10 @@ sub_806E3C0: @ 806E3C0
bx r0
.align 2, 0
_0806E41C: .4byte gStringVar1
- thumb_func_end sub_806E3C0
+ thumb_func_end PartyMenuPutNicknameTilemap
- thumb_func_start sub_806E420
-sub_806E420: @ 806E420
+ thumb_func_start PartyMenuDoPrintHP
+PartyMenuDoPrintHP: @ 806E420
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1666,10 +1666,10 @@ _0806E494: .4byte 0x01000040
_0806E498: .4byte gWindowConfig_81E6CAC
_0806E49C: .4byte 0xffffff00
_0806E4A0: .4byte 0x06014300
- thumb_func_end sub_806E420
+ thumb_func_end PartyMenuDoPrintHP
- thumb_func_start sub_806E4A4
-sub_806E4A4: @ 806E4A4
+ thumb_func_start PartyMenuPrintHP
+PartyMenuPrintHP: @ 806E4A4
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1695,16 +1695,16 @@ sub_806E4A4: @ 806E4A4
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
- bl sub_806E420
+ bl PartyMenuDoPrintHP
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_806E4A4
+ thumb_func_end PartyMenuPrintHP
- thumb_func_start sub_806E4E8
-sub_806E4E8: @ 806E4E8
+ thumb_func_start PartyMenuTryPrintHP
+PartyMenuTryPrintHP: @ 806E4E8
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -1720,7 +1720,7 @@ sub_806E4E8: @ 806E4E8
bl GetMonData
cmp r0, 0
bne _0806E534
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1728,24 +1728,24 @@ sub_806E4E8: @ 806E4E8
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_806E4A4
+ bl PartyMenuPrintHP
b _0806E534
_0806E522:
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
adds r2, r4, 0
- bl sub_806E4A4
+ bl PartyMenuPrintHP
_0806E534:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_806E4E8
+ thumb_func_end PartyMenuTryPrintHP
- thumb_func_start sub_806E53C
-sub_806E53C: @ 806E53C
+ thumb_func_start PartyMenuTryPrintMonsHP
+PartyMenuTryPrintMonsHP: @ 806E53C
push {r4-r6,lr}
movs r4, 0
movs r6, 0x64
@@ -1755,7 +1755,7 @@ _0806E544:
muls r1, r6
adds r1, r5
adds r0, r4, 0
- bl sub_806E4E8
+ bl PartyMenuTryPrintHP
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1766,7 +1766,7 @@ _0806E544:
bx r0
.align 2, 0
_0806E560: .4byte gPlayerParty
- thumb_func_end sub_806E53C
+ thumb_func_end PartyMenuTryPrintMonsHP
thumb_func_start unref_sub_806E564
unref_sub_806E564: @ 806E564
@@ -1937,7 +1937,7 @@ sub_806E674: @ 806E674
bl GetMonData
cmp r0, 0
bne _0806E6C0
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1948,7 +1948,7 @@ sub_806E674: @ 806E674
bl sub_806E630
b _0806E6C0
_0806E6AE:
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2451,7 +2451,7 @@ party_menu_link_mon_held_item_object: @ 806EA8C
ldr r4, _0806EAC4 @ =0x0201c000
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
- bl sub_806DF60
+ bl SetHeldItemIconVisibility
ldr r2, _0806EAC8 @ =gTasks
ldrb r1, [r4, 0x4]
lsls r0, r1, 2
@@ -3428,7 +3428,7 @@ _0806F2B2:
ldr r4, _0806F2D4 @ =0x0201c000
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
- bl sub_806DF60
+ bl SetHeldItemIconVisibility
ldr r1, _0806F2D8 @ =0xfffff282
adds r0, r4, r1
movs r1, 0
@@ -3474,7 +3474,7 @@ sub_806F2FC: @ 806F2FC
ldr r4, _0806F330 @ =0x0201c000
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
- bl sub_806DF60
+ bl SetHeldItemIconVisibility
ldr r1, _0806F334 @ =0xfffff282
adds r0, r4, r1
movs r1, 0
@@ -4117,7 +4117,7 @@ _0806F850:
strb r1, [r5, 0xC]
_0806F862:
ldr r4, _0806F8A4 @ =gUnknown_08376858
- bl battle_type_is_double
+ bl IsDoubleBattle
movs r2, 0x80
lsls r2, 5
adds r1, r6, r2
@@ -4238,12 +4238,12 @@ _0806F964:
ldr r4, _0806F9DC @ =0x0201c000
ldrb r0, [r4, 0x4]
ldrb r1, [r4, 0x5]
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
- bl sub_806D84C
- bl battle_type_is_double
+ bl SetMonIconAnim
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4296,7 +4296,7 @@ _0806F9F0:
lsls r2, 5
adds r0, r1, r2
ldrb r4, [r0, 0x5]
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4305,7 +4305,7 @@ _0806F9F0:
lsls r3, 16
lsrs r3, 16
adds r0, r4, 0
- bl sub_806E420
+ bl PartyMenuDoPrintHP
_0806FA10:
add sp, 0x18
pop {r4-r7}
@@ -4358,11 +4358,11 @@ sub_806FA18: @ 806FA18
ldr r1, _0806FAD0 @ =0xfffe6000
adds r6, r1
ldrb r1, [r6, 0x1]
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
- bl sub_806D84C
+ bl SetMonIconAnim
ldr r2, _0806FAD4 @ =gSprites
ldrb r1, [r6, 0x2]
lsls r0, r1, 4
@@ -4407,7 +4407,7 @@ _0806FAE4:
lsls r1, 5
adds r0, r6, r1
ldrb r4, [r0, 0x5]
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4416,7 +4416,7 @@ _0806FAE4:
lsls r3, 16
lsrs r3, 16
adds r0, r4, 0
- bl sub_806E420
+ bl PartyMenuDoPrintHP
_0806FB04:
add sp, 0x14
pop {r4-r7}
@@ -4528,7 +4528,7 @@ sub_806FBB4: @ 806FBB4
bl sub_806E168
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806E2C0
+ bl PartyMenuPrintMonLevelOrStatus
pop {r4,r5}
pop {r0}
bx r0
@@ -4925,7 +4925,7 @@ _0806FF34:
_0806FF3A:
ldr r4, _0806FF88 @ =0x0201c000
ldr r0, [r4]
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -5007,7 +5007,7 @@ _0806FFE6:
bl GetMedicineItemEffectMessage
ldrb r0, [r4, 0x5]
ldr r1, [r4]
- bl sub_806E07C
+ bl TryPrintPartyMenuMonNickname
ldr r0, _08070020 @ =gStringVar4
movs r1, 0x1
bl sub_806E834
@@ -5179,7 +5179,7 @@ _08070134:
ldr r0, [r4]
ldrb r1, [r4, 0x5]
bl sub_806FBB4
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5268,7 +5268,7 @@ sub_80701DC: @ 80701DC
bl GetMonData
cmp r0, 0
beq _0807023A
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -6235,7 +6235,7 @@ sub_8070A20: @ 8070A20
lsls r0, 24
lsrs r7, r0, 24
adds r0, r6, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -6247,7 +6247,7 @@ _08070A3A:
adds r1, r7, 0
bl sub_806FBB4
_08070A42:
- bl battle_type_is_double
+ bl IsDoubleBattle
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -6266,19 +6266,19 @@ _08070A42:
adds r0, r7, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_806E420
+ bl PartyMenuDoPrintHP
adds r0, r7, 0
adds r1, r6, 0
bl sub_806E674
ldr r4, _08070ABC @ =0x0201c000
ldrb r0, [r4, 0x4]
adds r1, r7, 0
- bl sub_806DDA0
+ bl GetMonIconSpriteId_maybe
lsls r0, 24
lsrs r0, 24
adds r1, r6, 0
- bl sub_806D84C
- bl battle_type_is_double
+ bl SetMonIconAnim
+ bl IsDoubleBattle
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/rom_8077ABC.s b/asm/rom_8077ABC.s
index f3ae8a279..c05bb5aee 100644
--- a/asm/rom_8077ABC.s
+++ b/asm/rom_8077ABC.s
@@ -1266,7 +1266,7 @@ _08078400:
bl sub_8078104
_08078406:
adds r0, r4, 0
- bl sub_809D638
+ bl UpdateMonIconFrame
pop {r4}
pop {r0}
bx r0
@@ -1961,8 +1961,8 @@ _080788FE:
bx r1
thumb_func_end sub_8078874
- thumb_func_start battle_type_is_double
-battle_type_is_double: @ 8078904
+ thumb_func_start IsDoubleBattle
+IsDoubleBattle: @ 8078904
ldr r0, _08078910 @ =gUnknown_020239F8
ldrb r1, [r0]
movs r0, 0x1
@@ -1970,7 +1970,7 @@ battle_type_is_double: @ 8078904
bx lr
.align 2, 0
_08078910: .4byte gUnknown_020239F8
- thumb_func_end battle_type_is_double
+ thumb_func_end IsDoubleBattle
thumb_func_start sub_8078914
sub_8078914: @ 8078914
@@ -5594,7 +5594,7 @@ _0807A41E:
bl sub_8077ABC
lsls r0, 24
lsrs r7, r0, 24
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _0807A470
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 3a67bbf81..ef279348f 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -9300,7 +9300,7 @@ sub_808A1E0: @ 808A1E0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_806DF60
+ bl SetHeldItemIconVisibility
movs r0, 0
movs r1, 0
bl sub_806D538
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index 4acaddce5..2d35be406 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -76,7 +76,7 @@ sub_8094998: @ 8094998
adds r6, r0, 0
lsls r1, 24
lsrs r4, r1, 24
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -99,7 +99,7 @@ _080949C0:
strb r0, [r6, 0x2]
b _08094A68
_080949CE:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08094A0C
@@ -218,7 +218,7 @@ _08094AA8:
bl battle_get_side_with_given_state
lsls r0, 24
lsrs r6, r0, 24
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -241,7 +241,7 @@ _08094ACE:
strb r0, [r5, 0x2]
b _08094B5E
_08094ADC:
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
bne _08094B14
@@ -331,7 +331,7 @@ sub_8094B6C: @ 8094B6C
lsls r2, 24
lsrs r6, r2, 24
movs r7, 0
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08094C16
@@ -758,7 +758,7 @@ _08094E80:
.4byte _08094FD0
.4byte _08095000
_08094EAC:
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -802,7 +802,7 @@ _08094EEC:
muls r2, r3
ldr r3, _08094F18 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -819,7 +819,7 @@ _08094F1C:
adds r1, r3
b _08094FEC
_08094F28:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
ldr r1, _08094F38 @ =0x0201b000
movs r0, 0x99
lsls r0, 2
@@ -832,7 +832,7 @@ _08094F3C:
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
b _08094FE6
_08094F4A:
movs r3, 0x98
@@ -851,7 +851,7 @@ _08094F4A:
.align 2, 0
_08094F68: .4byte 0x00000266
_08094F6C:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
ldr r1, _08094F7C @ =0x0201b000
movs r3, 0x99
lsls r3, 2
@@ -860,7 +860,7 @@ _08094F6C:
.align 2, 0
_08094F7C: .4byte 0x0201b000
_08094F80:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
ldr r1, _08094F90 @ =0x0201b000
movs r0, 0x99
lsls r0, 2
@@ -869,7 +869,7 @@ _08094F80:
.align 2, 0
_08094F90: .4byte 0x0201b000
_08094F94:
- bl sub_806E53C
+ bl PartyMenuTryPrintMonsHP
ldr r1, _08094FA4 @ =0x0201b000
movs r2, 0x99
lsls r2, 2
@@ -1623,7 +1623,7 @@ sub_8095584: @ 8095584
bl sub_806CA38
lsls r0, 24
lsrs r5, r0, 24
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17424,7 +17424,7 @@ unref_sub_809D26C: @ 809D26C
mov r0, sp
adds r1, r2, 0
adds r2, r6, 0
- bl sub_809D710
+ bl CreateMonIconSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -17433,7 +17433,7 @@ unref_sub_809D26C: @ 809D26C
lsls r0, 2
ldr r1, _0809D2F8 @ =gSprites
adds r0, r1
- bl sub_809D638
+ bl UpdateMonIconFrame
adds r0, r4, 0
add sp, 0x18
pop {r3}
@@ -17451,8 +17451,8 @@ _0809D2F4: .4byte 0x0000dac0
_0809D2F8: .4byte gSprites
thumb_func_end unref_sub_809D26C
- thumb_func_start sub_809D2FC
-sub_809D2FC: @ 809D2FC
+ thumb_func_start CreateMonIcon
+CreateMonIcon: @ 809D2FC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -17473,7 +17473,7 @@ sub_809D2FC: @ 809D2FC
ldr r0, _0809D38C @ =gOamData_83BC5E8
str r0, [sp, 0x18]
adds r0, r4, 0
- bl sub_809D4F4
+ bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, _0809D390 @ =gSpriteAnimTable_83BC62C
str r0, [sp, 0x20]
@@ -17505,7 +17505,7 @@ _0809D35A:
asrs r2, 16
mov r0, sp
mov r3, r8
- bl sub_809D710
+ bl CreateMonIconSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -17514,7 +17514,7 @@ _0809D35A:
lsls r0, 2
ldr r1, _0809D3A0 @ =gSprites
adds r0, r1
- bl sub_809D638
+ bl UpdateMonIconFrame
adds r0, r4, 0
add sp, 0x30
pop {r3}
@@ -17529,7 +17529,7 @@ _0809D394: .4byte gSpriteAffineAnimTable_83BC660
_0809D398: .4byte gMonIconPaletteIndices
_0809D39C: .4byte 0x0000dac0
_0809D3A0: .4byte gSprites
- thumb_func_end sub_809D2FC
+ thumb_func_end CreateMonIcon
thumb_func_start sub_809D3A4
sub_809D3A4: @ 809D3A4
@@ -17571,7 +17571,7 @@ sub_809D3A4: @ 809D3A4
mov r0, sp
adds r1, r2, 0
adds r2, r6, 0
- bl sub_809D710
+ bl CreateMonIconSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -17580,7 +17580,7 @@ sub_809D3A4: @ 809D3A4
lsls r0, 2
ldr r1, _0809D430 @ =gSprites
adds r0, r1
- bl sub_809D638
+ bl UpdateMonIconFrame
adds r0, r4, 0
add sp, 0x18
pop {r3}
@@ -17708,8 +17708,8 @@ _0809D4EA:
bx r1
thumb_func_end sub_809D4A8
- thumb_func_start sub_809D4F4
-sub_809D4F4: @ 809D4F4
+ thumb_func_start GetMonIconPtr
+GetMonIconPtr: @ 809D4F4
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -17723,7 +17723,7 @@ sub_809D4F4: @ 809D4F4
bx r1
.align 2, 0
_0809D50C: .4byte gMonIconTable
- thumb_func_end sub_809D4F4
+ thumb_func_end GetMonIconPtr
thumb_func_start sub_809D510
sub_809D510: @ 809D510
@@ -17889,13 +17889,13 @@ _0809D628: .4byte gMonIconPaletteTable
thumb_func_start sub_809D62C
sub_809D62C: @ 809D62C
push {lr}
- bl sub_809D638
+ bl UpdateMonIconFrame
pop {r0}
bx r0
thumb_func_end sub_809D62C
- thumb_func_start sub_809D638
-sub_809D638: @ 809D638
+ thumb_func_start UpdateMonIconFrame
+UpdateMonIconFrame: @ 809D638
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -18004,10 +18004,10 @@ _0809D700:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_809D638
+ thumb_func_end UpdateMonIconFrame
- thumb_func_start sub_809D710
-sub_809D710: @ 809D710
+ thumb_func_start CreateMonIconSprite
+CreateMonIconSprite: @ 809D710
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -18110,7 +18110,7 @@ _0809D7D8: .4byte gSpriteImageSizes
_0809D7DC: .4byte 0xffff0000
_0809D7E0: .4byte 0x0000ffff
_0809D7E4: .4byte gSprites
- thumb_func_end sub_809D710
+ thumb_func_end CreateMonIconSprite
thumb_func_start sub_809D7E8
sub_809D7E8: @ 809D7E8
@@ -18658,7 +18658,7 @@ _0809DC5C:
adds r0, r4, 0
bl sub_809F678
adds r0, r4, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
cmp r0, 0
bne _0809DC7C
@@ -21338,7 +21338,7 @@ _0809F202:
lsrs r0, 24
cmp r0, 0x1
bne _0809F224
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -21364,7 +21364,7 @@ _0809F22C:
bl PlaySE
ldr r5, _0809F278 @ =0x02018010
adds r0, r5, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
cmp r0, 0
beq _0809F258
@@ -21730,7 +21730,7 @@ _0809F4F4:
adds r0, r4, 0
bl sub_809F678
adds r0, r4, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
cmp r0, 0
beq _0809F50E
@@ -24574,7 +24574,7 @@ sub_80A0BF4: @ 80A0BF4
lsrs r0, 24
cmp r0, 0x1
bne _080A0C48
- bl sub_806B528
+ bl IsLinkDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -25592,7 +25592,7 @@ _080A1410:
adds r0, r4, 0
bl sub_80A0958
adds r0, r4, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
cmp r0, 0
beq _080A1444
@@ -25822,7 +25822,7 @@ _080A15DC:
adds r0, r4, 0
bl sub_80A0958
adds r0, r4, 0
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
cmp r0, 0
beq _080A1610
@@ -26746,8 +26746,8 @@ _080A1CD2:
bx r1
thumb_func_end pokemon_ailments_get_primary
- thumb_func_start sub_80A1CD8
-sub_80A1CD8: @ 80A1CD8
+ thumb_func_start GetMonStatusAndPokerus
+GetMonStatusAndPokerus: @ 80A1CD8
push {r4,lr}
adds r4, r0, 0
movs r1, 0x39
@@ -26779,7 +26779,7 @@ _080A1D12:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80A1CD8
+ thumb_func_end GetMonStatusAndPokerus
thumb_func_start sub_80A1D18
sub_80A1D18: @ 80A1D18
@@ -26788,7 +26788,7 @@ sub_80A1D18: @ 80A1D18
mov r0, sp
bl sub_809F678
mov r0, sp
- bl sub_80A1CD8
+ bl GetMonStatusAndPokerus
lsls r0, 24
lsrs r0, 24
cmp r0, 0
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 92c37f1d1..20b36709b 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -6714,7 +6714,7 @@ _0812E260:
bl battle_get_per_side_status
lsls r0, 24
lsrs r4, r0, 24
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12284,7 +12284,7 @@ sub_8130D20: @ 8130D20
lsls r0, 24
cmp r0, 0
bne _08130DA8
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x1
@@ -25546,7 +25546,7 @@ _08137596:
ands r0, r1
cmp r0, 0
bne _08137684
- bl battle_type_is_double
+ bl IsDoubleBattle
lsls r0, 24
cmp r0, 0
beq _08137626
diff --git a/asm/script_pokemon_util_80F99CC.s b/asm/script_pokemon_util_80F99CC.s
index af550f47e..d107902ae 100644
--- a/asm/script_pokemon_util_80F99CC.s
+++ b/asm/script_pokemon_util_80F99CC.s
@@ -183,7 +183,7 @@ _080F9B14:
muls r2, r3
ldr r3, _080F9B44 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
b _080F9BF0
.align 2, 0
_080F9B3C: .4byte 0x00000266
@@ -197,14 +197,14 @@ _080F9B48:
adds r1, r4, r0
b _080F9BBC
_080F9B54:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
b _080F9BB4
_080F9B5A:
movs r1, 0x98
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
movs r2, 0x99
lsls r2, 2
adds r1, r4, r2
@@ -231,10 +231,10 @@ _080F9B6E:
.align 2, 0
_080F9B94: .4byte 0x00000266
_080F9B98:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
b _080F9BB4
_080F9B9E:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
ldr r1, _080F9BAC @ =0x0201b000
movs r0, 0x99
lsls r0, 2
@@ -450,7 +450,7 @@ _080F9D30:
muls r2, r3
ldr r3, _080F9D60 @ =gPlayerParty
adds r2, r3
- bl sub_806D90C
+ bl TryCreatePartyMenuMonIcon
b _080F9E0C
.align 2, 0
_080F9D58: .4byte 0x00000266
@@ -464,14 +464,14 @@ _080F9D64:
adds r1, r4, r0
b _080F9DD8
_080F9D70:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
b _080F9DD0
_080F9D76:
movs r1, 0x98
lsls r1, 2
adds r0, r4, r1
ldrb r0, [r0]
- bl sub_806DC34
+ bl CreateHeldItemIcons_806DC34
movs r2, 0x99
lsls r2, 2
adds r1, r4, r2
@@ -498,10 +498,10 @@ _080F9D8A:
.align 2, 0
_080F9DB0: .4byte 0x00000266
_080F9DB4:
- bl sub_806E334
+ bl PartyMenuPrintMonsLevelOrStatus
b _080F9DD0
_080F9DBA:
- bl sub_806E0C4
+ bl PrintPartyMenuMonNicknames
ldr r1, _080F9DC8 @ =0x0201b000
movs r0, 0x99
lsls r0, 2
diff --git a/asm/trade.s b/asm/trade.s
index 87ee96d21..9c3ab1e63 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -604,7 +604,7 @@ _080481BA:
str r0, [sp, 0x4]
adds r0, r5, 0
ldr r1, _080482AC @ =sub_809D62C
- bl sub_809D2FC
+ bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x34
@@ -661,7 +661,7 @@ _0804822C:
str r0, [sp, 0x4]
adds r0, r5, 0
ldr r1, _080482AC @ =sub_809D62C
- bl sub_809D2FC
+ bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x3A
@@ -689,14 +689,14 @@ _080482A8: .4byte 0xfff40000
_080482AC: .4byte sub_809D62C
_080482B0: .4byte gEnemyParty
_080482B4:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
ldr r0, _080482D0 @ =gUnknown_03004824
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x42
adds r1, 0x34
movs r2, 0
- bl sub_806DB90
+ bl CreateHeldItemIcons
ldr r1, _080482D4 @ =gMain
ldr r0, _080482D8 @ =0x0000043c
adds r1, r0
@@ -712,7 +712,7 @@ _080482DC:
adds r0, 0x42
adds r1, 0x34
movs r2, 0x1
- bl sub_806DB90
+ bl CreateHeldItemIcons
ldr r1, _080482F8 @ =gMain
ldr r2, _080482FC @ =0x0000043c
adds r1, r2
@@ -1176,7 +1176,7 @@ _080486DE:
str r0, [sp, 0x4]
adds r0, r5, 0
ldr r1, _080487D8 @ =sub_809D62C
- bl sub_809D2FC
+ bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x34
@@ -1233,7 +1233,7 @@ _08048752:
str r0, [sp, 0x4]
adds r0, r5, 0
ldr r1, _080487D8 @ =sub_809D62C
- bl sub_809D2FC
+ bl CreateMonIcon
mov r2, r8
ldr r1, [r2]
adds r1, 0x3A
@@ -1266,14 +1266,14 @@ _080487DC: .4byte gEnemyParty
_080487E0: .4byte gMain
_080487E4: .4byte 0x0000043c
_080487E8:
- bl sub_806DA98
+ bl LoadHeldItemIconGraphics
ldr r0, _08048804 @ =gUnknown_03004824
ldr r1, [r0]
adds r0, r1, 0
adds r0, 0x42
adds r1, 0x34
movs r2, 0
- bl sub_806DB90
+ bl CreateHeldItemIcons
ldr r1, _08048808 @ =gMain
ldr r5, _0804880C @ =0x0000043c
adds r1, r5
@@ -1289,7 +1289,7 @@ _08048810:
adds r0, 0x42
adds r1, 0x34
movs r2, 0x1
- bl sub_806DB90
+ bl CreateHeldItemIcons
ldr r1, _0804882C @ =gMain
ldr r0, _08048830 @ =0x0000043c
adds r1, r0
diff --git a/data/data_83760F0.s b/data/data_83760F0.s
index ed6711a09..1a9360983 100644
--- a/data/data_83760F0.s
+++ b/data/data_83760F0.s
@@ -337,7 +337,7 @@ gSpriteAnimTable_8376604:: @ 8376604
.align 2
gSpriteTemplate_837660C:: @ 837660C
- spr_template 55120, 55120, gOamData_83765EC, gSpriteAnimTable_8376604, NULL, gDummySpriteAffineAnimTable, sub_806DD7C
+ spr_template 55120, 55120, gOamData_83765EC, gSpriteAnimTable_8376604, NULL, gDummySpriteAffineAnimTable, SpriteCB_HeldItemIcon_806DD7C
.align 2
gUnknown_08376624:: @ 8376624
@@ -20620,7 +20620,7 @@ gSpriteAnimTable_840B14C:: @ 840B14C
.align 2
gSpriteTemplate_840B150:: @ 840B150
- spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, GetCurrentTrainerHillMapId
+ spr_template 2003, 2004, gOamData_840B13C, gSpriteAnimTable_840B14C, NULL, gDummySpriteAffineAnimTable, sub_813E980
gUnknown_0840B168:: @ 840B168
.incbin "baserom.gba", 0x0040b168, 0x8
diff --git a/include/asm.inc.h b/include/asm.inc.h
index bfa37e058..a4069baa6 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -444,8 +444,8 @@ void sub_813E10C(struct Sprite *);
void sub_813E210(struct Sprite *);
void sub_813E7C0(u8);
void sub_813E930(/*TODO: arg types*/);
-void sub_813EB4C(u8);
-void sub_813EDBC(/*TODO: arg types*/);
+void InitIntroTorchicAttackAnim(u8);
+void InitIntroMudkipAttackAnim(/*TODO: arg types*/);
// asm/rom_81473B8.o
bool8 sub_81474C8(void);
diff --git a/src/intro.c b/src/intro.c
index dfc1d6a4c..1b10cdbc7 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -637,14 +637,14 @@ static void Task_IntroPokemonBattle(u8 taskId)
spriteId = sub_813CE88(SPECIES_MUDKIP, 0x20, 0x98, 0, 0);
gSprites[spriteId].callback = sub_813E210;
gTasks[taskId].data[4] = spriteId;
- sub_813EDBC(spriteId);
+ InitIntroMudkipAttackAnim(spriteId);
}
if (gIntroFrameCounter == 700)
{
spriteId = sub_813CE88(SPECIES_TORCHIC, -8, 0x90, 1, 0);
gSprites[spriteId].callback = sub_813E210;
gTasks[taskId].data[5] = spriteId;
- sub_813EB4C(spriteId);
+ InitIntroTorchicAttackAnim(spriteId);
}
if (gIntroFrameCounter == 776)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 14:22:20 +0000