summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/berry_crush.s2
-rw-r--r--asm/berry_crush_3.s6
-rw-r--r--asm/macros/event.inc2
-rw-r--r--asm/naming_screen.s4
4 files changed, 7 insertions, 7 deletions
diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 42de36a1f..27d31829d 100644
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -432,7 +432,7 @@ _0814BA3C:
ldr r1, [r4]
ldr r0, [r1, 0x68]
str r0, [r1, 0x1C]
- bl sub_815EEE0
+ bl GiveBerryPowder
lsls r0, 24
cmp r0, 0
bne _0814BA5A
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s
index 71070a96e..9e3334a7f 100644
--- a/asm/berry_crush_3.s
+++ b/asm/berry_crush_3.s
@@ -2526,8 +2526,8 @@ _0814EA6C:
bx r0
thumb_func_end sub_814E830
- thumb_func_start sub_814EA7C
-sub_814EA7C: @ 814EA7C
+ thumb_func_start ShowBerryCrushRankings
+ShowBerryCrushRankings: @ 814EA7C
push {lr}
bl ScriptContext2_Enable
ldr r0, _0814EAC4 @ =sub_814E830
@@ -2566,7 +2566,7 @@ _0814EAC4: .4byte sub_814E830
_0814EAC8: .4byte gTasks
_0814EACC: .4byte gSaveBlock2Ptr
_0814EAD0: .4byte 0x00000af6
- thumb_func_end sub_814EA7C
+ thumb_func_end ShowBerryCrushRankings
thumb_func_start sub_814EAD4
sub_814EAD4: @ 814EAD4
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 5526b1e50..7b2952a97 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -461,7 +461,7 @@
.endm
@ Removes quantity of item index from the player's Bag.
- .macro removeitem index:req, quantity:req
+ .macro removeitem index:req, quantity=1
.byte 0x45
.2byte \index
.2byte \quantity
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 527c715d7..233c71d6d 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -887,7 +887,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
push {r4,r5,lr}
sub sp, 0x10
movs r5, 0
- bl sub_80CC7F8
+ bl IsDestinationBoxFull
lsls r0, 24
cmp r0, 0
bne _0809E104
@@ -932,7 +932,7 @@ _0809E104:
ldr r1, [r1]
bl StringCopy
ldr r4, _0809E1C0 @ =gStringVar3
- bl get_unknown_box_id
+ bl GetPCBoxToSendMon
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr