ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

berry blender is done

Browse Source
This commit is contained in:
DizzyEggg 2017-11-19 22:48:46 +01:00
parent 185402fe21
commit a3b5af17ea
24 changed files with 2055 additions and 6034 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
asm/battle_frontier_2.s
View File

@ -14280,7 +14280,7 @@ sub_81A1C4C: @ 81A1C4C
adds r3, r0, 0 adds r3, r0, 0
lsls r0, r5, 3 lsls r0, r5, 3
adds r5, r0, 0x1 adds r5, r0, 0x1
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
ldrb r0, [r0] ldrb r0, [r0]
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@ -14306,7 +14306,7 @@ sub_81A1C90: @ 81A1C90
push {r4,lr} push {r4,lr}
sub sp, 0x34 sub sp, 0x34
adds r2, r0, 0 adds r2, r0, 0
ldr r3, =gUnknown_0203AB74 ldr r3, =gResultsWindowId
movs r1, 0xAE movs r1, 0xAE
mov r0, sp mov r0, sp
adds r0, 0x2F adds r0, 0x2F
@ -14361,7 +14361,7 @@ sub_81A1CD8: @ 81A1CD8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r7, [sp] str r7, [sp]
@ -14580,7 +14580,7 @@ sub_81A1EA8: @ 81A1EA8
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -14621,7 +14621,7 @@ _081A1F28:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
movs r1, 0x2 movs r1, 0x2
bl sub_81A1C4C bl sub_81A1C4C
ldr r6, =gUnknown_0203AB74 ldr r6, =gResultsWindowId
ldrb r0, [r6] ldrb r0, [r6]
ldr r2, =gText_Lv502 ldr r2, =gText_Lv502
movs r1, 0x31 movs r1, 0x31
@ -14734,7 +14734,7 @@ sub_81A2008: @ 81A2008
lsrs r6, 24 lsrs r6, 24
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r5, [sp] str r5, [sp]
@ -14868,7 +14868,7 @@ sub_81A2134: @ 81A2134
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -14893,7 +14893,7 @@ _081A2184:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
movs r1, 0 movs r1, 0
bl sub_81A1C4C bl sub_81A1C4C
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
ldr r2, =gText_Lv502 ldr r2, =gText_Lv502
movs r6, 0x21 movs r6, 0x21
@ -14905,7 +14905,7 @@ _081A2184:
movs r1, 0x1 movs r1, 0x1
movs r3, 0x8 movs r3, 0x8
bl PrintTextOnWindow bl PrintTextOnWindow
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
ldr r2, =gText_OpenLv ldr r2, =gText_OpenLv
movs r1, 0x61 movs r1, 0x61
@ -14988,10 +14988,10 @@ _081A2184:
mov r1, r8 mov r1, r8
movs r3, 0x40 movs r3, 0x40
bl sub_81A2008 bl sub_81A2008
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
bl PutWindowTilemap bl PutWindowTilemap
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
movs r1, 0x3 movs r1, 0x3
bl CopyWindowToVram bl CopyWindowToVram
@ -15027,7 +15027,7 @@ sub_81A22B8: @ 81A22B8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r7, [sp] str r7, [sp]
@ -15221,7 +15221,7 @@ sub_81A2460: @ 81A2460
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -15246,7 +15246,7 @@ _081A24B0:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
movs r1, 0x2 movs r1, 0x2
bl sub_81A1C4C bl sub_81A1C4C
ldr r6, =gUnknown_0203AB74 ldr r6, =gResultsWindowId
ldrb r0, [r6] ldrb r0, [r6]
ldr r2, =gText_Lv502 ldr r2, =gText_Lv502
movs r1, 0x31 movs r1, 0x31
@ -15356,7 +15356,7 @@ sub_81A258C: @ 81A258C
lsrs r6, 24 lsrs r6, 24
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r5, [sp] str r5, [sp]
@ -15469,7 +15469,7 @@ sub_81A2698: @ 81A2698
mov r5, r8 mov r5, r8
push {r5-r7} push {r5-r7}
sub sp, 0xC sub sp, 0xC
ldr r6, =gUnknown_0203AB74 ldr r6, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r6] strb r0, [r6]
@ -15608,7 +15608,7 @@ sub_81A27E8: @ 81A27E8
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r7, [sp] str r7, [sp]
@ -15772,7 +15772,7 @@ _081A2956:
sub_81A2968: @ 81A2968 sub_81A2968: @ 81A2968
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
ldr r5, =gUnknown_0203AB74 ldr r5, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r5] strb r0, [r5]
@ -15871,7 +15871,7 @@ sub_81A2A28: @ 81A2A28
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r6, r0, 0 adds r6, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r6, [sp] str r6, [sp]
@ -16147,7 +16147,7 @@ sub_81A2C94: @ 81A2C94
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r7, r0, 24 lsrs r7, r0, 24
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -16172,7 +16172,7 @@ _081A2CE0:
ldr r0, =gStringVar4 ldr r0, =gStringVar4
movs r1, 0 movs r1, 0
bl sub_81A1C4C bl sub_81A1C4C
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, =gText_Lv502 ldr r2, =gText_Lv502
@ -16276,7 +16276,7 @@ sub_81A2DB4: @ 81A2DB4
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r7, r0, 0 adds r7, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r10, r0 mov r10, r0
ldrb r0, [r0] ldrb r0, [r0]
str r7, [sp] str r7, [sp]
@ -16442,7 +16442,7 @@ _081A2F26:
sub_81A2F38: @ 81A2F38 sub_81A2F38: @ 81A2F38
push {r4-r6,lr} push {r4-r6,lr}
sub sp, 0xC sub sp, 0xC
ldr r5, =gUnknown_0203AB74 ldr r5, =gResultsWindowId
ldr r0, =gUnknown_08611C74 ldr r0, =gUnknown_08611C74
bl AddWindow bl AddWindow
strb r0, [r5] strb r0, [r5]
@ -16520,7 +16520,7 @@ sub_81A2FF8: @ 81A2FF8
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
sub sp, 0xC sub sp, 0xC
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C7C ldr r0, =gUnknown_08611C7C
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -16686,7 +16686,7 @@ _081A315C:
movs r2, 0x1 movs r2, 0x1
movs r3, 0x4 movs r3, 0x4
bl ConvertIntToDecimalStringN bl ConvertIntToDecimalStringN
ldr r6, =gUnknown_0203AB74 ldr r6, =gResultsWindowId
ldrb r0, [r6] ldrb r0, [r6]
movs r1, 0x26 movs r1, 0x26
adds r3, r5, 0 adds r3, r5, 0
@ -18962,7 +18962,7 @@ sub_81A4594: @ 81A4594
sub sp, 0x2C sub sp, 0x2C
mov r8, r1 mov r8, r1
adds r6, r3, 0 adds r6, r3, 0
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r5, [r1] ldrb r5, [r1]
lsls r4, r0, 1 lsls r4, r0, 1
adds r4, r0 adds r4, r0
@ -18998,7 +18998,7 @@ sub_81A4594: @ 81A4594
ldrb r2, [r6, 0xE] ldrb r2, [r6, 0xE]
add r0, sp, 0xC add r0, sp, 0xC
bl TVShowConvertInternationalString bl TVShowConvertInternationalString
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
mov r3, r8 mov r3, r8
adds r3, 0x2 adds r3, 0x2
@ -19038,7 +19038,7 @@ _081A4618:
adds r3, r0, 0 adds r3, r0, 0
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
str r7, [sp] str r7, [sp]
mov r1, r10 mov r1, r10
@ -19072,7 +19072,7 @@ sub_81A4684: @ 81A4684
adds r7, r1, 0 adds r7, r1, 0
mov r10, r2 mov r10, r2
adds r5, r3, 0 adds r5, r3, 0
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
lsls r2, r6, 1 lsls r2, r6, 1
adds r2, r6 adds r2, r6
@ -19112,7 +19112,7 @@ sub_81A4684: @ 81A4684
ldrb r2, [r5, 0x1A] ldrb r2, [r5, 0x1A]
add r0, sp, 0xC add r0, sp, 0xC
bl TVShowConvertInternationalString bl TVShowConvertInternationalString
ldr r1, =gUnknown_0203AB74 ldr r1, =gResultsWindowId
ldrb r0, [r1] ldrb r0, [r1]
adds r3, r7, 0x2 adds r3, r7, 0x2
lsls r3, 27 lsls r3, 27
@ -19147,7 +19147,7 @@ _081A4734:
adds r1, r4, 0 adds r1, r4, 0
bl StringCopy bl StringCopy
_081A473C: _081A473C:
ldr r2, =gUnknown_0203AB74 ldr r2, =gResultsWindowId
mov r9, r2 mov r9, r2
ldrb r0, [r2] ldrb r0, [r2]
adds r3, r7, 0x4 adds r3, r7, 0x4
@ -19468,7 +19468,7 @@ sub_81A4998: @ 81A4998
ldr r1, [r5] ldr r1, [r5]
adds r0, r6, 0 adds r0, r6, 0
bl StringExpandPlaceholders bl StringExpandPlaceholders
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
movs r1, 0x1 movs r1, 0x1
@ -19567,7 +19567,7 @@ _081A4A90:
thumb_func_start sub_81A4AA0 thumb_func_start sub_81A4AA0
sub_81A4AA0: @ 81A4AA0 sub_81A4AA0: @ 81A4AA0
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldr r0, =gUnknown_08611C84 ldr r0, =gUnknown_08611C84
bl AddWindow bl AddWindow
strb r0, [r4] strb r0, [r4]
@ -19595,7 +19595,7 @@ sub_81A4AA0: @ 81A4AA0
thumb_func_start sub_81A4AE8 thumb_func_start sub_81A4AE8
sub_81A4AE8: @ 81A4AE8 sub_81A4AE8: @ 81A4AE8
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0x11 movs r1, 0x11
bl FillWindowPixelBuffer bl FillWindowPixelBuffer

12
asm/battle_records.s
View File

@ -496,7 +496,7 @@ sub_813C2F4: @ 813C2F4
movs r2, 0xD0 movs r2, 0xD0
bl GetStringCenterAlignXOffset bl GetStringCenterAlignXOffset
adds r3, r0, 0 adds r3, r0, 0
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
ldrb r0, [r0] ldrb r0, [r0]
lsls r3, 24 lsls r3, 24
lsrs r3, 24 lsrs r3, 24
@ -531,7 +531,7 @@ sub_813C384: @ 813C384
ldr r7, [r6, 0xC] ldr r7, [r6, 0xC]
cmp r7, 0 cmp r7, 0
bne _0813C40C bne _0813C40C
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
ldr r2, =gUnknown_085B3D84 ldr r2, =gUnknown_085B3D84
@ -587,7 +587,7 @@ _0813C40C:
lsrs r1, 24 lsrs r1, 24
ldr r0, =gStringVar1 ldr r0, =gStringVar1
bl ConvertInternationalString bl ConvertInternationalString
ldr r0, =gUnknown_0203AB74 ldr r0, =gResultsWindowId
mov r8, r0 mov r8, r0
ldrb r0, [r0] ldrb r0, [r0]
lsls r4, 3 lsls r4, 3
@ -661,7 +661,7 @@ sub_813C4BC: @ 813C4BC
mov r6, r8 mov r6, r8
push {r6,r7} push {r6,r7}
sub sp, 0xC sub sp, 0xC
ldr r6, =gUnknown_0203AB74 ldr r6, =gResultsWindowId
ldr r0, =gUnknown_085B3D7C ldr r0, =gUnknown_085B3D7C
bl AddWindow bl AddWindow
strb r0, [r6] strb r0, [r6]
@ -729,7 +729,7 @@ _0813C540:
adds r4, 0x1 adds r4, 0x1
cmp r4, 0x4 cmp r4, 0x4
ble _0813C540 ble _0813C540
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldrb r0, [r4] ldrb r0, [r4]
bl PutWindowTilemap bl PutWindowTilemap
ldrb r0, [r4] ldrb r0, [r4]
@ -748,7 +748,7 @@ _0813C540:
thumb_func_start sub_813C5A0 thumb_func_start sub_813C5A0
sub_813C5A0: @ 813C5A0 sub_813C5A0: @ 813C5A0
push {r4,lr} push {r4,lr}
ldr r4, =gUnknown_0203AB74 ldr r4, =gResultsWindowId
ldrb r0, [r4] ldrb r0, [r4]
movs r1, 0 movs r1, 0
bl sub_819746C bl sub_819746C

5439
asm/berry_blender.s
View File

File diff suppressed because it is too large Load Diff

10
asm/link.s
View File

@ -646,7 +646,7 @@ _08009976:
orrs r1, r0 orrs r1, r0
_08009990: _08009990:
adds r0, r2, 0 adds r0, r2, 0
bl sub_800A994 bl SetLinkDebugValues
_08009996: _08009996:
add sp, 0x4 add sp, 0x4
pop {r4,r5} pop {r4,r5}
@ -2644,15 +2644,15 @@ _0800A94E:
.pool .pool
thumb_func_end task00_link_test thumb_func_end task00_link_test
thumb_func_start sub_800A994 thumb_func_start SetLinkDebugValues
sub_800A994: @ 800A994 SetLinkDebugValues: @ 800A994
ldr r2, =gUnknown_0300302C ldr r2, =gUnknown_0300302C
str r0, [r2] str r0, [r2]
ldr r0, =gUnknown_03003070 ldr r0, =gUnknown_03003070
str r1, [r0] str r1, [r0]
bx lr bx lr
.pool .pool
thumb_func_end sub_800A994 thumb_func_end SetLinkDebugValues
thumb_func_start sub_800A9A8 thumb_func_start sub_800A9A8
sub_800A9A8: @ 800A9A8 sub_800A9A8: @ 800A9A8
@ -12305,7 +12305,7 @@ sub_800F820: @ 800F820
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0800F83C bne _0800F83C
bl sub_8082D18 bl GetBlenderArrowPosition
ldr r1, =gSendCmd ldr r1, =gSendCmd
strh r0, [r1, 0xC] strh r0, [r1, 0xC]
_0800F83C: _0800F83C:

36
asm/rom6.s
View File

@ -1223,7 +1223,7 @@ sub_8135F04: @ 8135F04
adds r4, 0x1 adds r4, 0x1
ldr r6, =gStringVar1 ldr r6, =gStringVar1
adds r0, r5, 0 adds r0, r5, 0
bl sub_8136EA4 bl GetHighestPokeblocksFlavourLevel
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -1364,7 +1364,7 @@ _08136032:
bls _08136002 bls _08136002
ldr r4, =gStringVar1 ldr r4, =gStringVar1
mov r0, r8 mov r0, r8
bl sub_8136EDC bl GetPokeblocksFeel
adds r1, r0, 0 adds r1, r0, 0
lsls r1, 24 lsls r1, 24
lsrs r1, 24 lsrs r1, 24
@ -2995,8 +2995,8 @@ _08136E8C:
bx r0 bx r0
thumb_func_end ClearPokeblocks thumb_func_end ClearPokeblocks
thumb_func_start sub_8136EA4 thumb_func_start GetHighestPokeblocksFlavourLevel
sub_8136EA4: @ 8136EA4 GetHighestPokeblocksFlavourLevel: @ 8136EA4
push {r4-r6,lr} push {r4-r6,lr}
adds r6, r0, 0 adds r6, r0, 0
movs r1, 0x1 movs r1, 0x1
@ -3024,10 +3024,10 @@ _08136ECC:
pop {r4-r6} pop {r4-r6}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8136EA4 thumb_func_end GetHighestPokeblocksFlavourLevel
thumb_func_start sub_8136EDC thumb_func_start GetPokeblocksFeel
sub_8136EDC: @ 8136EDC GetPokeblocksFeel: @ 8136EDC
push {lr} push {lr}
movs r1, 0x6 movs r1, 0x6
bl sub_8136F9C bl sub_8136F9C
@ -3039,10 +3039,10 @@ sub_8136EDC: @ 8136EDC
_08136EEE: _08136EEE:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8136EDC thumb_func_end GetPokeblocksFeel
thumb_func_start sub_8136EF4 thumb_func_start GetFirstFreePokeblockSlot
sub_8136EF4: @ 8136EF4 GetFirstFreePokeblockSlot: @ 8136EF4
push {lr} push {lr}
movs r1, 0 movs r1, 0
ldr r0, =gSaveBlock1Ptr ldr r0, =gSaveBlock1Ptr
@ -3070,13 +3070,13 @@ _08136F18:
_08136F26: _08136F26:
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8136EF4 thumb_func_end GetFirstFreePokeblockSlot
thumb_func_start sub_8136F2C thumb_func_start AddPokeblock
sub_8136F2C: @ 8136F2C AddPokeblock: @ 8136F2C
push {r4,lr} push {r4,lr}
adds r4, r0, 0 adds r4, r0, 0
bl sub_8136EF4 bl GetFirstFreePokeblockSlot
lsls r0, 24 lsls r0, 24
asrs r1, r0, 24 asrs r1, r0, 24
movs r0, 0x1 movs r0, 0x1
@ -3102,7 +3102,7 @@ _08136F62:
pop {r4} pop {r4}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_8136F2C thumb_func_end AddPokeblock
thumb_func_start sub_8136F68 thumb_func_start sub_8136F68
sub_8136F68: @ 8136F68 sub_8136F68: @ 8136F68
@ -3287,8 +3287,8 @@ _081370AC:
bx r1 bx r1
thumb_func_end sub_8137068 thumb_func_end sub_8137068
thumb_func_start sub_81370B4 thumb_func_start GetPokeblocksFlavour
sub_81370B4: @ 81370B4 GetPokeblocksFlavour: @ 81370B4
push {r4-r7,lr} push {r4-r7,lr}
adds r5, r0, 0 adds r5, r0, 0
movs r7, 0 movs r7, 0
@ -3324,7 +3324,7 @@ _081370E2:
pop {r4-r7} pop {r4-r7}
pop {r1} pop {r1}
bx r1 bx r1
thumb_func_end sub_81370B4 thumb_func_end GetPokeblocksFlavour
thumb_func_start sub_81370FC thumb_func_start sub_81370FC
sub_81370FC: @ 81370FC sub_81370FC: @ 81370FC

12
data/scripts/pokeblocks.inc
View File

@ -290,7 +290,7 @@ LilycoveCity_ContestLobby_EventScript_293CEE:: @ 8293CEE
checkitem ITEM_POKEBLOCK_CASE, 1 checkitem ITEM_POKEBLOCK_CASE, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293D43 goto_eq LilycoveCity_ContestLobby_EventScript_293D43
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_eq LilycoveCity_ContestLobby_EventScript_293D39 goto_eq LilycoveCity_ContestLobby_EventScript_293D39
specialvar VAR_RESULT, PlayerHasBerries specialvar VAR_RESULT, PlayerHasBerries
@ -365,7 +365,7 @@ LilycoveCity_ContestLobby_EventScript_293DC6:: @ 8293DC6
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293E14 goto_eq LilycoveCity_ContestLobby_EventScript_293E14
msgbox LilycoveCity_ContestLobby_Text_293237, 4 msgbox LilycoveCity_ContestLobby_Text_293237, 4
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91 goto_if 5, LilycoveCity_ContestLobby_EventScript_293D91
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
@ -431,7 +431,7 @@ LilycoveCity_ContestLobby_EventScript_293EA3:: @ 8293EA3
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293EF1 goto_eq LilycoveCity_ContestLobby_EventScript_293EF1
msgbox LilycoveCity_ContestLobby_Text_29354E, 4 msgbox LilycoveCity_ContestLobby_Text_29354E, 4
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E goto_if 5, LilycoveCity_ContestLobby_EventScript_293E6E
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
@ -470,7 +470,7 @@ LilycoveCity_ContestLobby_EventScript_293F28:: @ 8293F28
specialvar VAR_RESULT, PlayerHasBerries specialvar VAR_RESULT, PlayerHasBerries
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_293F1E goto_eq LilycoveCity_ContestLobby_EventScript_293F1E
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64 goto_if 5, LilycoveCity_ContestLobby_EventScript_293F64
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
@ -536,7 +536,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8:: @ 8293FF8
checkitem ITEM_POKEBLOCK_CASE, 1 checkitem ITEM_POKEBLOCK_CASE, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_294028 goto_eq LilycoveCity_ContestLobby_EventScript_294028
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_eq LilycoveCity_ContestLobby_EventScript_294028 goto_eq LilycoveCity_ContestLobby_EventScript_294028
dodailyevents dodailyevents
@ -570,7 +570,7 @@ LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055
checkitem ITEM_POKEBLOCK_CASE, 1 checkitem ITEM_POKEBLOCK_CASE, 1
compare_var_to_value VAR_RESULT, 0 compare_var_to_value VAR_RESULT, 0
goto_eq LilycoveCity_ContestLobby_EventScript_29416C goto_eq LilycoveCity_ContestLobby_EventScript_29416C
specialvar VAR_RESULT, sub_8136EF4 specialvar VAR_RESULT, GetFirstFreePokeblockSlot
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535
goto_if 5, LilycoveCity_ContestLobby_EventScript_294092 goto_if 5, LilycoveCity_ContestLobby_EventScript_294092
compare_var_to_value VAR_RESULT, 65535 compare_var_to_value VAR_RESULT, 65535

2
data/specials.inc
View File

@ -170,7 +170,7 @@ gSpecials:: @ 81DBA64
def_special sub_80B086C def_special sub_80B086C
def_special ChangePokemonNickname def_special ChangePokemonNickname
def_special sub_81B94B0 def_special sub_81B94B0
def_special sub_8136EF4 def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending def_special DoBerryBlending
def_special sub_8142BC8 def_special sub_8142BC8
def_special sub_813BD60 def_special sub_813BD60

8
include/berry_blender.h Normal file
View File

@ -0,0 +1,8 @@
#ifndef GUARD_BERRY_BLENDER_H
#define GUARD_BERRY_BLENDER_H
void DoBerryBlending(void);
u16 GetBlenderArrowPosition(void);
void ShowBerryBlenderRecordWindow(void);
#endif // GUARD_BERRY_BLENDER_H

3
include/menu.h
View File

@ -1,6 +1,7 @@
#ifndef GUARD_MENU_H #ifndef GUARD_MENU_H
#define GUARD_MENU_H #define GUARD_MENU_H
#include "text.h"
#include "window.h" #include "window.h"
struct MenuAction struct MenuAction
@ -31,5 +32,7 @@ void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirs
s8 sub_8198C58(void); s8 sub_8198C58(void);
void do_scheduled_bg_tilemap_copies_to_vram(void); void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void); void clear_scheduled_bg_copies_to_vram(void);
void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, const u8 *str);
void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
#endif // GUARD_MENU_H #endif // GUARD_MENU_H

23
include/pokeblock.h
View File

@ -22,24 +22,13 @@ enum
PBLOCK_FEEL, PBLOCK_FEEL,
}; };
// rom6
void ClearPokeblocks(void); void ClearPokeblocks(void);
s8 GetFirstFreePokeblockSlot(void);
/* bool32 AddPokeblock(struct Pokeblock *pokeblock);
void sub_810B96C(void); u8 GetHighestPokeblocksFlavourLevel(const struct Pokeblock *pokeblock);
u8 sub_810BA50(s16, s16, u8); u8 GetPokeblocksFeel(const struct Pokeblock *pokeblock);
u8 sub_810C9B0(struct Pokeblock *); u8 GetPokeblocksFlavour(const struct Pokeblock *pokeblock);
s16 GetPokeblockData(const struct Pokeblock *, u8);
u8 sub_810C9E8(struct Pokeblock *);
void sub_810BA7C(u8);
bool8 PokeblockClearIfExists(u8);
s16 PokeblockGetGain(u8, const struct Pokeblock *);
u8 sub_810CB68(u8, u8*);
void PokeblockCopyName(struct Pokeblock *pokeblock, u8 *dest);
void CB2_PreparePokeblockFeedScene(void);
#include "main.h"
void sub_8136130(struct Pokeblock *, MainCallback);
*/
#endif // GUARD_POKEBLOCK_H #endif // GUARD_POKEBLOCK_H

2
include/text.h
View File

@ -85,6 +85,8 @@
#define NUM_TEXT_PRINTERS 32 #define NUM_TEXT_PRINTERS 32
#define TEXT_SPEED_FF 0xFF
struct TextPrinterSubStruct struct TextPrinterSubStruct
{ {
u8 font_type:4; // 0x14 u8 font_type:4; // 0x14

1
include/tv.h
View File

@ -13,5 +13,6 @@ void sub_80EE184(void);
void sub_80EEA70(void); void sub_80EEA70(void);
void sub_80F14F8(TVShow *shows); void sub_80F14F8(TVShow *shows);
size_t sub_80EF370(int value); size_t sub_80EF370(int value);
bool8 Put3CheersForPokeblocksOnTheAir(const u8 *partnersName, u8 flavor, u8 unused, u8 sheen, u8 language);
#endif //GUARD_TV_H #endif //GUARD_TV_H

1
ld_script.txt
View File

@ -86,7 +86,6 @@ SECTIONS {
asm/load_save.o(.text); asm/load_save.o(.text);
asm/trade.o(.text); asm/trade.o(.text);
src/berry_blender.o(.text); src/berry_blender.o(.text);
asm/berry_blender.o(.text);
src/play_time.o(.text); src/play_time.o(.text);
src/new_game.o(.text); src/new_game.o(.text);
asm/rom4.o(.text); asm/rom4.o(.text);

2431
src/berry_blender.c
View File

File diff suppressed because it is too large Load Diff

3
src/berry_fix_program.c
View File

@ -1,5 +1,3 @@
// Includes
#include "global.h" #include "global.h"
#include "gpu_regs.h" #include "gpu_regs.h"
#include "multiboot.h" #include "multiboot.h"
@ -10,6 +8,7 @@
#include "task.h" #include "task.h"
#include "unknown_task.h" #include "unknown_task.h"
#include "window.h" #include "window.h"
#include "text.h"
#include "menu.h" #include "menu.h"
#include "m4a.h" #include "m4a.h"

2
src/clear_save_data_screen.c
View File

@ -1,7 +1,7 @@
#include "global.h" #include "global.h"
#include "task.h" #include "task.h"
#include "menu.h"
#include "text.h" #include "text.h"
#include "menu.h"
#include "sound.h" #include "sound.h"
#include "main.h" #include "main.h"
#include "save.h" #include "save.h"

1
src/decoration.c
View File

@ -1,6 +1,7 @@
#include "global.h" #include "global.h"
#include "decompress.h" #include "decompress.h"
#include "malloc.h" #include "malloc.h"
#include "text.h"
#include "string_util.h" #include "string_util.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "script.h" #include "script.h"

3
src/egg_hatch.c
View File

@ -57,8 +57,6 @@ extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle
extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_HatchedFromEgg[];
extern const u8 gText_NickHatchPrompt[]; extern const u8 gText_NickHatchPrompt[];
extern u8* GetMonNick(struct Pokemon* mon, u8* dst);
extern u8* GetBoxMonNick(struct BoxPokemon* boxMon, u8* dst);
extern u8 sav1_map_get_name(void); extern u8 sav1_map_get_name(void);
extern s8 sub_8198C58(void); extern s8 sub_8198C58(void);
extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
@ -75,7 +73,6 @@ extern void play_some_sound(void);
extern void copy_decompressed_tile_data_to_vram_autofree(u8 bg_id, const void* src, u16 size, u16 offset, u8 mode); extern void copy_decompressed_tile_data_to_vram_autofree(u8 bg_id, const void* src, u16 size, u16 offset, u8 mode);
extern void CreateYesNoMenu(const struct WindowTemplate*, u16, u8, u8); extern void CreateYesNoMenu(const struct WindowTemplate*, u16, u8, u8);
extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback); extern void DoNamingScreen(u8, const u8*, u16, u8, u32, MainCallback);
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor* colors, s8 speed, u8 *str);
extern u16 sub_80D22D0(void); extern u16 sub_80D22D0(void);
extern u8 CountPartyAliveNonEggMonsExcept(u8); extern u8 CountPartyAliveNonEggMonsExcept(u8);

2
src/international_string_util.c
View File

@ -1,6 +1,6 @@
#include "global.h" #include "global.h"
#include "international_string_util.h"
#include "text.h" #include "text.h"
#include "international_string_util.h"
extern s32 convert_pixel_width_to_tile_width(s32 a0); // script menu extern s32 convert_pixel_width_to_tile_width(s32 a0); // script menu

4
src/mail.c
View File

@ -1,14 +1,12 @@
// Includes
#include "global.h" #include "global.h"
#include "main.h" #include "main.h"
#include "overworld.h" #include "overworld.h"
#include "task.h" #include "task.h"
#include "unknown_task.h" #include "unknown_task.h"
#include "palette.h" #include "palette.h"
#include "text.h"
#include "menu.h" #include "menu.h"
#include "menu_helpers.h" #include "menu_helpers.h"
#include "text.h"
#include "text_window.h" #include "text_window.h"
#include "string_util.h" #include "string_util.h"
#include "international_string_util.h" #include "international_string_util.h"

4
src/region_map.c
View File

@ -1,7 +1,6 @@
// Includes
#include "global.h" #include "global.h"
#include "main.h" #include "main.h"
#include "text.h"
#include "menu.h" #include "menu.h"
#include "malloc.h" #include "malloc.h"
#include "gpu_regs.h" #include "gpu_regs.h"
@ -17,7 +16,6 @@
#include "string_util.h" #include "string_util.h"
#include "international_string_util.h" #include "international_string_util.h"
#include "strings.h" #include "strings.h"
#include "text.h"
#include "text_window.h" #include "text_window.h"
#include "songs.h" #include "songs.h"
#include "m4a.h" #include "m4a.h"

2
src/save_failed_screen.c
View File

@ -13,8 +13,6 @@
#define MSG_WIN_TOP 12 #define MSG_WIN_TOP 12
#define CLOCK_WIN_TOP (MSG_WIN_TOP - 4) #define CLOCK_WIN_TOP (MSG_WIN_TOP - 4)
extern void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, struct TextColor *color, s8 speed, u8 *str);
extern void (*gGameContinueCallback)(void); extern void (*gGameContinueCallback)(void);
extern u32 gDamagedSaveSectors; extern u32 gDamagedSaveSectors;

4
src/text.c
View File

@ -190,7 +190,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
gTempTextPrinter.japanese = 0; gTempTextPrinter.japanese = 0;
GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor); GenerateFontHalfRowLookupTable(textSubPrinter->fontColor_h, textSubPrinter->bgColor, textSubPrinter->shadowColor);
if (speed != 0xFF && speed != 0x0) if (speed != TEXT_SPEED_FF && speed != 0x0)
{ {
--gTempTextPrinter.text_speed; --gTempTextPrinter.text_speed;
gTextPrinters[textSubPrinter->windowId] = gTempTextPrinter; gTextPrinters[textSubPrinter->windowId] = gTempTextPrinter;
@ -204,7 +204,7 @@ bool16 AddTextPrinter(struct TextSubPrinter *textSubPrinter, u8 speed, void (*ca
break; break;
} }
if (speed != 0xFF) if (speed != TEXT_SPEED_FF)
CopyWindowToVram(gTempTextPrinter.subPrinter.windowId, 2); CopyWindowToVram(gTempTextPrinter.subPrinter.windowId, 2);
gTextPrinters[textSubPrinter->windowId].sub_union.sub.active = 0; gTextPrinters[textSubPrinter->windowId].sub_union.sub.active = 0;
} }

16
sym_ewram.txt
View File

@ -570,18 +570,8 @@ gUnknown_0203229C: @ 203229C
gUnknown_020322A0: @ 20322A0 gUnknown_020322A0: @ 20322A0
.space 0x4 .space 0x4
sBerryBlenderData: @ 20322A4 .include "src/berry_blender.o"
.space 0x4
gUnknown_020322A8: @ 20322A8
.space 0x14
gUnknown_020322BC: @ 20322BC
.space 0x14
gUnknown_020322D0: @ 20322D0
.space 0x4
gDifferentSaveFile: @ 20322D4 gDifferentSaveFile: @ 20322D4
.space 0x1 .space 0x1
@ -1242,7 +1232,7 @@ gUnknown_0203AB6F: @ 203AB6F
gUnknown_0203AB70: @ 203AB70 gUnknown_0203AB70: @ 203AB70
.space 0x4 .space 0x4
gUnknown_0203AB74: @ 203AB74 gResultsWindowId: @ 203AB74
.space 0x4 .space 0x4
gUnknown_0203AB78: @ 203AB78 gUnknown_0203AB78: @ 203AB78