summaryrefslogtreecommitdiff
path: root/asm/party_menu.s
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2019-01-06 16:00:27 -0500
committerscnorton <scnorton@biociphers.org>2019-01-06 16:00:27 -0500
commitfdd7b1033cb32f02eb861ca87fa92b9886bdfe37 (patch)
tree9ac899b61e39aa12abbcdb5ae406337c458c25fb /asm/party_menu.s
parent2822d29c0bd7e579388f9d0772a7b5d1af430b31 (diff)
Through ScrCmd_pokemart
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r--asm/party_menu.s8
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 8d6da0894..c0e4a79f4 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -4298,7 +4298,7 @@ _08120B86:
lsls r0, 16
lsrs r1, r0, 16
adds r0, r5, 0
- bl pokemon_has_move
+ bl MonKnowsMove
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -14185,8 +14185,8 @@ _08125ABC:
bx r1
thumb_func_end sub_8125A90
- thumb_func_start pokemon_has_move
-pokemon_has_move: @ 8125AC0
+ thumb_func_start MonKnowsMove
+MonKnowsMove: @ 8125AC0
push {r4-r6,lr}
adds r6, r0, 0
lsls r1, 16
@@ -14212,7 +14212,7 @@ _08125AE8:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end pokemon_has_move
+ thumb_func_end MonKnowsMove
thumb_func_start sub_8125AF0
sub_8125AF0: @ 8125AF0