dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

pokeblock.s is decompiled

Browse Source
This commit is contained in:
DizzyEggg
2017-12-16 15:10:29 +01:00
parent f4ab21ee67
commit 5b409d49ed
10 changed files with 408 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

923
asm/pokeblock.s
View File

@@ -6,928 +6,7 @@
.text
thumb_func_start PutPokeblockOptionsWindow
PutPokeblockOptionsWindow: @ 8136938
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r6, r0, r1
ldr r0, =sPokeblockMenu
ldr r0, [r0]
ldr r1, =0x00000808
adds r0, r1
ldrb r0, [r0]
cmp r0, 0x3
bne _08136968
movs r0, 0x8
b _0813696A
.pool
_08136968:
movs r0, 0x9
_0813696A:
strh r0, [r6, 0x2]
bl sub_8136418
ldrb r0, [r6, 0x2]
movs r1, 0
movs r2, 0x1
movs r3, 0xE
bl SetWindowBorderStyle
ldrb r0, [r6, 0x2]
ldr r5, =sPokeblockMenu
ldr r3, [r5]
ldr r4, =0x00000808
adds r1, r3, r4
ldrb r1, [r1]
ldr r2, =sPokeblockMenuActions
mov r12, r2
ldr r2, =0x00000804
adds r3, r2
ldr r3, [r3]
mov r2, r12
bl sub_81995E4
ldrb r0, [r6, 0x2]
ldr r1, [r5]
adds r1, r4
ldrb r1, [r1]
movs r2, 0
bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
ldrb r0, [r6, 0x2]
bl PutWindowTilemap
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
ldr r1, =gTasks
lsls r0, r7, 2
adds r0, r7
lsls r0, 3
adds r0, r1
ldr r1, =sub_81369E0
str r1, [r0]
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end PutPokeblockOptionsWindow
thumb_func_start sub_81369E0
sub_81369E0: @ 81369E0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
bl sub_81221EC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08136A3C
bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
negs r0, r0
cmp r4, r0
beq _08136A3C
adds r0, 0x1
cmp r4, r0
bne _08136A18
movs r0, 0x5
bl PlaySE
adds r0, r5, 0
bl PokeblockAction_Cancel
b _08136A3C
_08136A18:
movs r0, 0x5
bl PlaySE
ldr r1, =sPokeblockMenuActions
ldr r0, =sPokeblockMenu
ldr r0, [r0]
ldr r2, =0x00000804
adds r0, r2
ldr r0, [r0]
adds r0, r4
ldrb r0, [r0]
lsls r0, 3
adds r1, 0x4
adds r0, r1
ldr r1, [r0]
adds r0, r6, 0
bl _call_via_r1
_08136A3C:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81369E0
thumb_func_start PokeblockAction_UseOnField
PokeblockAction_UseOnField: @ 8136A50
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =sPokeblockMenu
ldr r1, [r1]
movs r2, 0x80
lsls r2, 4
adds r1, r2
ldr r2, =sub_8136A74
str r2, [r1]
bl FadePaletteAndSetTaskToClosePokeblockCase
pop {r0}
bx r0
.pool
thumb_func_end PokeblockAction_UseOnField
thumb_func_start sub_8136A74
sub_8136A74: @ 8136A74
push {lr}
ldr r2, =gSaveBlock1Ptr
ldr r0, =gSpecialVar_ItemId
ldrh r1, [r0]
lsls r1, 3
ldr r0, =0x00000848
adds r1, r0
ldr r0, [r2]
adds r0, r1
ldr r1, =sub_8136AA0
bl ChooseMonToGivePokeblock
pop {r0}
bx r0
.pool
thumb_func_end sub_8136A74
thumb_func_start sub_8136AA0
sub_8136AA0: @ 8136AA0
push {lr}
ldr r0, =sSavedPokeblockData
ldr r1, [r0]
movs r0, 0
bl OpenPokeblockCase
pop {r0}
bx r0
.pool
thumb_func_end sub_8136AA0
thumb_func_start PokeblockAction_Toss
PokeblockAction_Toss: @ 8136AB4
push {r4,r5,lr}
sub sp, 0x10
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
ldr r1, =gTasks + 0x8
adds r0, r1
ldrb r0, [r0, 0x2]
movs r1, 0
bl sub_8198070
ldr r0, =gStringVar1
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldr r1, =gSpecialVar_ItemId
ldrh r1, [r1]
lsls r1, 3
adds r2, r1
ldr r1, =0x00000848
adds r2, r1
ldrb r1, [r2]
lsls r1, 2
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldr r5, =gStringVar4
ldr r1, =gText_ThrowAwayVar1
adds r0, r5, 0
bl StringExpandPlaceholders
bl GetPlayerTextSpeed
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
str r1, [sp]
str r0, [sp, 0x4]
str r5, [sp, 0x8]
ldr r0, =sub_8136B48
str r0, [sp, 0xC]
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xA
movs r3, 0xD
bl DisplayMessageAndContinueTask
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end PokeblockAction_Toss
thumb_func_start sub_8136B48
sub_8136B48: @ 8136B48
push {lr}
sub sp, 0x10
lsls r0, 24
lsrs r0, 24
ldr r1, =gUnknown_085B27A8
movs r2, 0x2
str r2, [sp]
movs r2, 0x1
str r2, [sp, 0x4]
movs r2, 0xE
str r2, [sp, 0x8]
ldr r2, =sTossYesNoFuncTable
str r2, [sp, 0xC]
movs r2, 0x1
movs r3, 0
bl CreateYesNoMenuWithCallbacks
add sp, 0x10
pop {r0}
bx r0
.pool
thumb_func_end sub_8136B48
thumb_func_start TossPokeblockChoice_Yes
TossPokeblockChoice_Yes: @ 8136B78
push {r4,r5,lr}
sub sp, 0x10
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gStringVar4
ldr r1, =gText_Var1ThrownAway
adds r0, r5, 0
bl StringExpandPlaceholders
bl GetPlayerTextSpeed
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
str r1, [sp]
str r0, [sp, 0x4]
str r5, [sp, 0x8]
ldr r0, =sub_8136BC0
str r0, [sp, 0xC]
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xA
movs r3, 0xD
bl DisplayMessageAndContinueTask
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end TossPokeblockChoice_Yes
thumb_func_start sub_8136BC0
sub_8136BC0: @ 8136BC0
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, =gMain
ldrh r1, [r0, 0x2E]
movs r0, 0x3
ands r0, r1
cmp r0, 0
beq _08136C36
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
movs r0, 0x5
bl PlaySE
ldr r5, =sSavedPokeblockData + 6
subs r6, r5, 0x2
lsls r4, r7, 2
adds r4, r7
lsls r4, 3
ldr r0, =gTasks + 0x8
adds r4, r0
ldrb r0, [r4]
adds r1, r5, 0
adds r2, r6, 0
bl sub_81AE6C8
ldrh r0, [r6]
movs r1, 0x5
bl HandlePokeblockMenuCursor
bl SetMenuItemsCountAndMaxShowed
bl sub_81362E0
bl HandlePokeblockListMenuItems
ldr r0, =gMultiuseListMenuTemplate
ldrh r1, [r5]
ldrh r2, [r6]
bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
ldrh r0, [r6]
ldr r1, =0x00001005
bl HandlePokeblockMenuCursor
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
adds r0, r7, 0
bl TossPokeblockChoice_No
_08136C36:
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_8136BC0
thumb_func_start TossPokeblockChoice_No
TossPokeblockChoice_No: @ 8136C54
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0xA
movs r1, 0
bl sub_8197DF8
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
bl sub_81363BC
ldr r1, =gTasks
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
ldr r1, =Task_HandlePokeblockMenuInput
str r1, [r0]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end TossPokeblockChoice_No
thumb_func_start PokeblockAction_UseInBattle
PokeblockAction_UseInBattle: @ 8136C8C
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, =gEnemyParty
bl GetNature
lsls r0, 24
lsrs r0, 24
ldr r5, =gSaveBlock1Ptr
ldr r7, =gSpecialVar_ItemId
ldrh r2, [r7]
lsls r2, 3
ldr r6, =0x00000848
adds r2, r6
ldr r1, [r5]
adds r1, r2
bl PokeblockGetGain
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, =gBattleTextBuff1
ldr r3, =gPokeblockNames
ldr r2, [r5]
ldrh r1, [r7]
lsls r1, 3
adds r2, r1
adds r2, r6
ldrb r1, [r2]
lsls r1, 2
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldrb r0, [r7]
bl sub_8136F68
ldr r1, [r5]
ldrh r0, [r7]
lsls r0, 3
adds r1, r0
adds r1, r6
ldrb r0, [r1]
lsls r0, 8
strh r0, [r7]
lsls r4, 16
asrs r4, 16
cmp r4, 0
bne _08136D10
adds r0, 0x1
b _08136D1A
.pool
_08136D10:
cmp r4, 0
ble _08136D18
adds r0, 0x2
b _08136D1A
_08136D18:
adds r0, 0x3
_08136D1A:
strh r0, [r7]
mov r0, r8
bl FadePaletteAndSetTaskToClosePokeblockCase
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end PokeblockAction_UseInBattle
thumb_func_start PokeblockAction_UseOnPokeblockFeeder
PokeblockAction_UseOnPokeblockFeeder: @ 8136D2C
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, =gSpecialVar_ItemId
ldrb r0, [r5]
bl SafariZoneActivatePokeblockFeeder
ldr r0, =gStringVar1
ldr r3, =gPokeblockNames
ldr r1, =gSaveBlock1Ptr
ldr r2, [r1]
ldrh r1, [r5]
lsls r1, 3
adds r2, r1
ldr r1, =0x00000848
adds r2, r1
ldrb r1, [r2]
lsls r1, 2
adds r1, r3
ldr r1, [r1]
bl StringCopy
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
bl sub_8136F68
movs r0, 0
strh r0, [r5]
adds r0, r4, 0
bl FadePaletteAndSetTaskToClosePokeblockCase
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end PokeblockAction_UseOnPokeblockFeeder
thumb_func_start PokeblockAction_GiveToContestLady
PokeblockAction_GiveToContestLady: @ 8136D90
push {r4-r6,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r6, =gSpecialVar_0x8004
ldr r0, =gSaveBlock1Ptr
ldr r5, =gSpecialVar_ItemId
ldrh r1, [r5]
lsls r1, 3
ldr r2, =0x00000848
adds r1, r2
ldr r0, [r0]
adds r0, r1
bl sub_818E704
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
ldr r1, =gSpecialVar_Result
ldrh r0, [r5]
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
bl sub_8136F68
movs r0, 0
strh r0, [r5]
adds r0, r4, 0
bl FadePaletteAndSetTaskToClosePokeblockCase
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end PokeblockAction_GiveToContestLady
thumb_func_start PokeblockAction_Cancel
PokeblockAction_Cancel: @ 8136DE8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
adds r4, r0
lsls r4, 3
ldr r5, =gTasks + 0x8
adds r0, r4, r5
ldrb r0, [r0, 0x2]
movs r1, 0
bl sub_8198070
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
bl sub_81363BC
subs r5, 0x8
adds r4, r5
ldr r0, =Task_HandlePokeblockMenuInput
str r0, [r4]
pop {r4,r5}
pop {r0}
bx r0
.pool
thumb_func_end PokeblockAction_Cancel
thumb_func_start sub_8136E20
sub_8136E20: @ 8136E20
push {r4,lr}
lsls r0, 24
ldr r3, =gSaveBlock1Ptr
ldr r1, [r3]
lsrs r0, 21
adds r1, r0
ldr r2, =0x00000848
adds r1, r2
movs r2, 0
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
ldr r4, =0x00000849
adds r1, r4
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
adds r4, 0x1
adds r1, r4
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
adds r4, 0x1
adds r1, r4
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
adds r4, 0x1
adds r1, r4
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
adds r4, 0x1
adds r1, r4
strb r2, [r1]
ldr r1, [r3]
adds r1, r0
ldr r0, =0x0000084e
adds r1, r0
strb r2, [r1]
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_8136E20
thumb_func_start ClearPokeblocks
ClearPokeblocks: @ 8136E88
push {r4,lr}
movs r4, 0
_08136E8C:
adds r0, r4, 0
bl sub_8136E20
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x27
bls _08136E8C
pop {r4}
pop {r0}
bx r0
thumb_func_end ClearPokeblocks
thumb_func_start GetHighestPokeblocksFlavorLevel
GetHighestPokeblocksFlavorLevel: @ 8136EA4
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x1
bl GetPokeblockData
lsls r0, 24
lsrs r5, r0, 24
movs r1, 0x1
_08136EB4:
adds r0, r1, 0x1
lsls r0, 24
lsrs r4, r0, 24
adds r0, r6, 0
adds r1, r4, 0
bl GetPokeblockData
lsls r0, 24
lsrs r0, 24
cmp r5, r0
bcs _08136ECC
adds r5, r0, 0
_08136ECC:
adds r1, r4, 0
cmp r1, 0x4
bls _08136EB4
adds r0, r5, 0
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end GetHighestPokeblocksFlavorLevel
thumb_func_start GetPokeblocksFeel
GetPokeblocksFeel: @ 8136EDC
push {lr}
movs r1, 0x6
bl GetPokeblockData
lsls r0, 24
lsrs r0, 24
cmp r0, 0x63
bls _08136EEE
movs r0, 0x63
_08136EEE:
pop {r1}
bx r1
thumb_func_end GetPokeblocksFeel
thumb_func_start GetFirstFreePokeblockSlot
GetFirstFreePokeblockSlot: @ 8136EF4
push {lr}
movs r1, 0
ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
ldr r3, =0x00000848
_08136EFE:
lsls r0, r1, 3
adds r0, r2, r0
adds r0, r3
ldrb r0, [r0]
cmp r0, 0
bne _08136F18
lsls r0, r1, 24
asrs r0, 24
b _08136F26
.pool
_08136F18:
adds r0, r1, 0x1
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x27
bls _08136EFE
movs r0, 0x1
negs r0, r0
_08136F26:
pop {r1}
bx r1
thumb_func_end GetFirstFreePokeblockSlot
thumb_func_start AddPokeblock
AddPokeblock: @ 8136F2C
push {r4,lr}
adds r4, r0, 0
bl GetFirstFreePokeblockSlot
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x1
negs r0, r0
cmp r1, r0
beq _08136F60
ldr r0, =gSaveBlock1Ptr
ldr r2, [r0]
lsls r0, r1, 3
ldr r1, =0x00000848
adds r2, r1
adds r2, r0
ldr r0, [r4]
ldr r1, [r4, 0x4]
str r0, [r2]
str r1, [r2, 0x4]
movs r0, 0x1
b _08136F62
.pool
_08136F60:
movs r0, 0
_08136F62:
pop {r4}
pop {r1}
bx r1
thumb_func_end AddPokeblock
thumb_func_start sub_8136F68
sub_8136F68: @ 8136F68
push {lr}
lsls r0, 24
lsrs r2, r0, 24
ldr r0, =gSaveBlock1Ptr
ldr r0, [r0]
lsls r1, r2, 3
adds r0, r1
ldr r1, =0x00000848
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
beq _08136F94
adds r0, r2, 0
bl sub_8136E20
movs r0, 0x1
b _08136F96
.pool
_08136F94:
movs r0, 0
_08136F96:
pop {r1}
bx r1
thumb_func_end sub_8136F68
thumb_func_start GetPokeblockData
GetPokeblockData: @ 8136F9C
push {lr}
lsls r1, 24
lsrs r1, 24
adds r2, r1, 0
cmp r1, 0
bne _08136FAC
ldrb r0, [r0]
b _08136FDE
_08136FAC:
cmp r1, 0x1
bne _08136FB4
ldrb r0, [r0, 0x1]
b _08136FDE
_08136FB4:
cmp r1, 0x2
bne _08136FBC
ldrb r0, [r0, 0x2]
b _08136FDE
_08136FBC:
cmp r1, 0x3
bne _08136FC4
ldrb r0, [r0, 0x3]
b _08136FDE
_08136FC4:
cmp r1, 0x4
bne _08136FCC
ldrb r0, [r0, 0x4]
b _08136FDE
_08136FCC:
cmp r1, 0x5
bne _08136FD4
ldrb r0, [r0, 0x5]
b _08136FDE
_08136FD4:
cmp r2, 0x6
beq _08136FDC
movs r0, 0
b _08136FDE
_08136FDC:
ldrb r0, [r0, 0x6]
_08136FDE:
pop {r1}
bx r1
thumb_func_end GetPokeblockData
thumb_func_start PokeblockGetGain
PokeblockGetGain: @ 8136FE4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
mov r8, r1
lsls r0, 24
lsrs r0, 24
movs r6, 0
movs r4, 0
ldr r1, =gPokeblockFlavorCompatibilityTable
mov r9, r1
lsls r1, r0, 2
adds r7, r1, r0
_08136FFE:
adds r0, r4, 0x1
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
adds r1, r5, 0
bl GetPokeblockData
lsls r0, 16
asrs r1, r0, 16
cmp r1, 0
ble _0813702A
adds r0, r7, r4
add r0, r9
ldrb r0, [r0]
lsls r0, 24
asrs r0, 24
muls r1, r0
lsls r0, r6, 16
asrs r0, 16
adds r0, r1
lsls r0, 16
lsrs r6, r0, 16
_0813702A:
adds r4, r5, 0
cmp r4, 0x4
bls _08136FFE
lsls r0, r6, 16
asrs r0, 16
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r1}
bx r1
.pool
thumb_func_end PokeblockGetGain
thumb_func_start PokeblockCopyName
PokeblockCopyName: @ 8137044
push {r4,lr}
adds r4, r1, 0
movs r1, 0
bl GetPokeblockData
lsls r0, 24
ldr r1, =gPokeblockNames
lsrs r0, 22
adds r0, r1
ldr r1, [r0]
adds r0, r4, 0
bl StringCopy
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end PokeblockCopyName
thumb_func_start sub_8137068
sub_8137068: @ 8137068
push {r4-r7,lr}
adds r6, r1, 0
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
ldr r7, =gPokeblockNames
_08137074:
lsls r1, r4, 3
ldr r0, =sFavoritePokeblocksTable
adds r1, r0
adds r0, r5, 0
bl PokeblockGetGain
lsls r0, 16
cmp r0, 0
ble _081370A0
adds r0, r4, 0x1
lsls r0, 2
adds r0, r7
ldr r1, [r0]
adds r0, r6, 0
bl StringCopy
movs r0, 0x1
b _081370AC
.pool
_081370A0:
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x4
bls _08137074
movs r0, 0
_081370AC:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_8137068
thumb_func_start GetPokeblocksFlavor
GetPokeblocksFlavor: @ 81370B4
push {r4-r7,lr}
adds r5, r0, 0
movs r7, 0
movs r6, 0
_081370BC:
adds r1, r7, 0x1
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl GetPokeblockData
adds r4, r0, 0
adds r1, r6, 0x1
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
bl GetPokeblockData
lsls r4, 16
lsls r0, 16
lsls r1, r6, 16
cmp r4, r0
bge _081370E2
lsrs r7, r1, 16
_081370E2:
movs r2, 0x80
lsls r2, 9
adds r0, r1, r2
lsrs r6, r0, 16
asrs r0, 16
cmp r0, 0x4
ble _081370BC
lsls r0, r7, 24
lsrs r0, 24
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end GetPokeblocksFlavor
thumb_func_start sub_81370FC
sub_81370FC: @ 81370FC
@@ -4909,7 +3988,7 @@ sub_81391D0: @ 81391D0
lsls r0, 24
lsrs r0, 24
ldr r1, =gStringVar1
bl sub_8137068
bl CopyMonFavoritePokeblockName
lsls r0, 24
lsrs r0, 24
pop {r1}

2
asm/use_pokeblock.s
View File

@@ -678,7 +678,7 @@ _08166BB6:
bne _08166BDA
ldr r0, =gSpecialVar_ItemId
ldrb r0, [r0]
bl sub_8136F68
bl TryClearPokeblock
ldr r0, =sub_8166BEC
bl sub_816636C
_08166BDA: