summaryrefslogtreecommitdiff
path: root/asm-de
diff options
context:
space:
mode:
Diffstat (limited to 'asm-de')
-rw-r--r--asm-de/berry_blender.s106
1 files changed, 53 insertions, 53 deletions
diff --git a/asm-de/berry_blender.s b/asm-de/berry_blender.s
index 59aa1894a..16c6784b7 100644
--- a/asm-de/berry_blender.s
+++ b/asm-de/berry_blender.s
@@ -1519,7 +1519,7 @@ _0804EF34:
movs r0, 0
str r0, [r1]
bl sub_804F238
- bl BuyMenuDrawFieldObjects
+ bl sub_804F2A8
_0804EFB8:
mov r1, r8
ldr r0, [r1]
@@ -1724,8 +1724,8 @@ _0804F164: .4byte 0x00004422
_0804F168: .4byte gUnknown_03004854
thumb_func_end sub_804F0F4
- thumb_func_start task_tutorial_oak_boy_girl
-task_tutorial_oak_boy_girl: @ 804F16C
+ thumb_func_start sub_804F16C
+sub_804F16C: @ 804F16C
push {lr}
lsls r0, 16
lsls r1, 24
@@ -1766,7 +1766,7 @@ _0804F1B4:
_0804F1B6:
pop {r1}
bx r1
- thumb_func_end task_tutorial_oak_boy_girl
+ thumb_func_end sub_804F16C
thumb_func_start sub_804F1BC
sub_804F1BC: @ 804F1BC
@@ -1826,7 +1826,7 @@ _0804F214:
adds r1, r7
ldrb r1, [r1]
adds r1, 0x85
- bl sub_80516C4
+ bl Blender_SetBankBerryData
lsls r4, 16
lsrs r3, r4, 16
cmp r3, r5
@@ -1902,8 +1902,8 @@ _0804F2A0: .4byte gUnknown_03004854
_0804F2A4: .4byte gUnknown_082162EC
thumb_func_end sub_804F238
- thumb_func_start BuyMenuDrawFieldObjects
-BuyMenuDrawFieldObjects: @ 804F2A8
+ thumb_func_start sub_804F2A8
+sub_804F2A8: @ 804F2A8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2000,7 +2000,7 @@ _0804F368: .4byte gStringVar1
_0804F36C: .4byte gSprites
_0804F370: .4byte gUnknown_082162C4
_0804F374: .4byte gLinkPlayers + 0x8
- thumb_func_end BuyMenuDrawFieldObjects
+ thumb_func_end sub_804F2A8
thumb_func_start sub_804F378
sub_804F378: @ 804F378
@@ -2053,7 +2053,7 @@ _0804F3F8:
ldr r4, _0804F46C @ =gScriptItemId
ldrh r1, [r4]
movs r0, 0
- bl sub_80516C4
+ bl Blender_SetBankBerryData
ldr r5, _0804F470 @ =gUnknown_03004854
ldr r0, [r5]
movs r6, 0xBE
@@ -2412,7 +2412,7 @@ _0804F650:
str r0, [r1]
movs r0, 0x34
bl PlaySE
- bl BuyMenuDrawFieldObjects
+ bl sub_804F2A8
_0804F6D6:
mov r1, r8
ldr r0, [r1]
@@ -2666,7 +2666,7 @@ sub_804F8C8: @ 804F8C8
adds r0, 0x54
ldrh r0, [r0]
movs r1, 0x1
- bl task_tutorial_oak_boy_girl
+ bl sub_804F16C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -3712,7 +3712,7 @@ _0805010A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl task_tutorial_oak_boy_girl
+ bl sub_804F16C
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -3872,8 +3872,8 @@ _0805029C: .4byte 0x000003e7
_080502A0: .4byte sub_8050954
thumb_func_end sub_80501FC
- thumb_func_start help_system_is_not_first_time
-help_system_is_not_first_time: @ 80502A4
+ thumb_func_start sub_80502A4
+sub_80502A4: @ 80502A4
push {r4,r5,lr}
lsls r1, 24
lsls r2, 24
@@ -3916,7 +3916,7 @@ _080502F2:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end help_system_is_not_first_time
+ thumb_func_end sub_80502A4
thumb_func_start sub_80502F8
sub_80502F8: @ 80502F8
@@ -3990,7 +3990,7 @@ _0805035C:
mov r7, r8
lsrs r1, r7, 24
str r3, [sp, 0xC]
- bl help_system_is_not_first_time
+ bl sub_80502A4
lsls r0, 24
ldr r3, [sp, 0xC]
cmp r0, 0
@@ -4979,7 +4979,7 @@ _08050AA0:
_08050AC8: .4byte gBlockRecvBuffer
_08050ACC: .4byte gUnknown_03004854
_08050AD0:
- bl sub_8052228
+ bl Blender_PrintBlendingRanking
lsls r0, 24
cmp r0, 0
bne _08050ADC
@@ -4987,7 +4987,7 @@ _08050AD0:
_08050ADC:
b _08050C82
_08050ADE:
- bl sub_8051C58
+ bl Blender_PrintBlendingResults
lsls r0, 24
cmp r0, 0
bne _08050AEA
@@ -6467,8 +6467,8 @@ _080516BC:
_080516C0: .4byte 0x0000fff4
thumb_func_end sub_8051684
- thumb_func_start sub_80516C4
-sub_80516C4: @ 80516C4
+ thumb_func_start Blender_SetBankBerryData
+Blender_SetBankBerryData: @ 80516C4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -6493,7 +6493,7 @@ sub_80516C4: @ 80516C4
bx r0
.align 2, 0
_080516F4: .4byte gUnknown_03004854
- thumb_func_end sub_80516C4
+ thumb_func_end Blender_SetBankBerryData
thumb_func_start unref_sub_80516F8
unref_sub_80516F8: @ 80516F8
@@ -7200,8 +7200,8 @@ sub_8051C04: @ 8051C04
_08051C20: .4byte gUnknown_03004854
thumb_func_end sub_8051C04
- thumb_func_start sub_8051C24
-sub_8051C24: @ 8051C24
+ thumb_func_start Blender_TrySettingRecord
+Blender_TrySettingRecord: @ 8051C24
push {lr}
ldr r2, _08051C4C @ =gSaveBlock1
ldr r0, _08051C50 @ =gUnknown_03004854
@@ -7227,10 +7227,10 @@ _08051C48:
_08051C4C: .4byte gSaveBlock1
_08051C50: .4byte gUnknown_03004854
_08051C54: .4byte 0x0000096c
- thumb_func_end sub_8051C24
+ thumb_func_end Blender_TrySettingRecord
- thumb_func_start sub_8051C58
-sub_8051C58: @ 8051C58
+ thumb_func_start Blender_PrintBlendingResults
+Blender_PrintBlendingResults: @ 8051C58
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7652,7 +7652,7 @@ _08051FF4:
lsls r0, 24
cmp r0, 0
beq _08052006
- bl sub_8051C24
+ bl Blender_TrySettingRecord
movs r0, 0x1
b _08052008
_08052006:
@@ -7666,7 +7666,7 @@ _08052008:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8051C58
+ thumb_func_end Blender_PrintBlendingResults
thumb_func_start sub_805201C
sub_805201C: @ 805201C
@@ -7741,8 +7741,8 @@ _080520C4: .4byte gOtherText_Period
_080520C8: .4byte gUnknown_08216249
thumb_func_end sub_805201C
- thumb_func_start sub_80520CC
-sub_80520CC: @ 80520CC
+ thumb_func_start Blender_SortBasedOnPoints
+Blender_SortBasedOnPoints: @ 80520CC
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -7792,10 +7792,10 @@ _08052118:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80520CC
+ thumb_func_end Blender_SortBasedOnPoints
- thumb_func_start sub_8052124
-sub_8052124: @ 8052124
+ thumb_func_start Blender_SortScores
+Blender_SortScores: @ 8052124
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7894,7 +7894,7 @@ _080521D6:
ldrb r1, [r0]
mov r0, sp
ldr r2, [sp, 0x14]
- bl sub_80520CC
+ bl Blender_SortBasedOnPoints
movs r5, 0
mov r4, r10
ldr r0, [r4]
@@ -7930,10 +7930,10 @@ _08052218:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8052124
+ thumb_func_end Blender_SortScores
- thumb_func_start sub_8052228
-sub_8052228: @ 8052228
+ thumb_func_start Blender_PrintBlendingRanking
+Blender_PrintBlendingRanking: @ 8052228
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -8084,7 +8084,7 @@ _080522B6:
add r0, r8
movs r1, 0x1
bl StartSpriteAnim
- bl sub_8052124
+ bl Blender_SortScores
movs r2, 0
mov r8, r2
b _0805243C
@@ -8248,7 +8248,7 @@ _080524B0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8052228
+ thumb_func_end Blender_PrintBlendingRanking
thumb_func_start unref_sub_80524BC
unref_sub_80524BC: @ 80524BC
@@ -8276,7 +8276,7 @@ unref_sub_80524BC: @ 80524BC
bl AnimateSprites
bl BuildOamBuffer
bl UpdatePaletteFade
- ldr r1, _08052528 @ =gUnknown_03000560
+ ldr r1, _08052528 @ =sBlenderDebug
movs r0, 0xFA
lsls r0, 5
strh r0, [r1, 0x1A]
@@ -8292,12 +8292,12 @@ unref_sub_80524BC: @ 80524BC
_0805251C: .4byte sub_804E2D8
_08052520: .4byte gWindowConfig_81E6CE4
_08052524: .4byte gMain
-_08052528: .4byte gUnknown_03000560
+_08052528: .4byte sBlenderDebug
_0805252C: .4byte sub_8052AF8
thumb_func_end unref_sub_80524BC
- thumb_func_start sub_8052530
-sub_8052530: @ 8052530
+ thumb_func_start BlenderDebug_PrintBerryData
+BlenderDebug_PrintBerryData: @ 8052530
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -8311,7 +8311,7 @@ sub_8052530: @ 8052530
movs r1, 0x2
movs r2, 0
bl MenuPrint
- ldr r4, _080525CC @ =gUnknown_03000560
+ ldr r4, _080525CC @ =sBlenderDebug
movs r1, 0x1A
ldrsh r0, [r4, r1]
movs r1, 0x64
@@ -8371,7 +8371,7 @@ _0805259E:
b _080525F8
.align 2, 0
_080525C8: .4byte gOtherText_BPMAndDash
-_080525CC: .4byte gUnknown_03000560
+_080525CC: .4byte sBlenderDebug
_080525D0: .4byte gBerries
_080525D4: .4byte gUnknown_082165F8
_080525D8:
@@ -8591,7 +8591,7 @@ _080527A4:
.align 2, 0
_080527B4: .4byte gPokeblockNames
_080527B8: .4byte gUnknown_082165F8
- thumb_func_end sub_8052530
+ thumb_func_end BlenderDebug_PrintBerryData
thumb_func_start sub_80527BC
sub_80527BC: @ 80527BC
@@ -8764,7 +8764,7 @@ sub_8052918: @ 8052918
movs r0, 0x80
lsls r0, 1
ands r0, r1
- ldr r4, _08052A8C @ =gUnknown_03000560
+ ldr r4, _08052A8C @ =sBlenderDebug
cmp r0, 0
beq _0805294C
movs r1, 0xFA
@@ -8874,7 +8874,7 @@ _080529E4:
ands r0, r1
cmp r0, 0
beq _08052A16
- ldr r3, _08052A8C @ =gUnknown_03000560
+ ldr r3, _08052A8C @ =sBlenderDebug
movs r1, 0
ldrsb r1, [r3, r1]
adds r4, r3, 0x1
@@ -8903,7 +8903,7 @@ _08052A16:
beq _08052AA0
movs r6, 0
movs r4, 0
- ldr r5, _08052A8C @ =gUnknown_03000560
+ ldr r5, _08052A8C @ =sBlenderDebug
_08052A26:
adds r0, r5, 0x1
adds r2, r4, r0
@@ -8954,7 +8954,7 @@ _08052A64:
b _08052AA0
.align 2, 0
_08052A88: .4byte gMain
-_08052A8C: .4byte gUnknown_03000560
+_08052A8C: .4byte sBlenderDebug
_08052A90: .4byte 0x75300000
_08052A94: .4byte 0xfffffc18
_08052A98: .4byte 0x00007530
@@ -8962,11 +8962,11 @@ _08052A9C:
movs r0, 0xFF
strb r0, [r5, 0x8]
_08052AA0:
- ldr r4, _08052AE8 @ =gUnknown_03000560
+ ldr r4, _08052AE8 @ =sBlenderDebug
ldrb r0, [r4, 0x10]
cmp r0, 0
beq _08052AB0
- bl sub_8052530
+ bl BlenderDebug_PrintBerryData
movs r0, 0
strb r0, [r4, 0x10]
_08052AB0:
@@ -9000,7 +9000,7 @@ _08052AE0:
pop {r0}
bx r0
.align 2, 0
-_08052AE8: .4byte gUnknown_03000560
+_08052AE8: .4byte sBlenderDebug
_08052AEC: .4byte gMain
_08052AF0: .4byte gUnknown_020297DC
_08052AF4: .4byte gUnknown_020297E0
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-07 20:04:03 +0000