summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/bike.s6
-rw-r--r--asm/contest.s2
-rw-r--r--asm/contest_link_80C2020.s2
-rw-r--r--asm/contest_painting.s4
-rw-r--r--asm/credits.s2
-rw-r--r--asm/egg_hatch.s2
-rw-r--r--asm/hall_of_fame.s2
-rw-r--r--asm/intro.s4
-rw-r--r--asm/item_menu.s46
-rw-r--r--asm/item_use.s96
-rw-r--r--asm/mystery_event_script.s6
-rw-r--r--asm/player_pc.s2
-rw-r--r--asm/pokeblock_feed.s2
-rw-r--r--asm/pokedex.s4
-rw-r--r--asm/pokenav.s2
-rw-r--r--asm/rom_800D42C.s8
-rw-r--r--asm/rom_8077ABC.s4
-rw-r--r--asm/rom_80859BC.s4
-rw-r--r--asm/rom_8094928.s4
-rw-r--r--asm/script_pokemon_util_80C4BF0.s2
-rw-r--r--asm/trade.s2
21 files changed, 103 insertions, 103 deletions
diff --git a/asm/bike.s b/asm/bike.s
index d73fa55dc..a7e3401ac 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -1947,8 +1947,8 @@ _080E5EEE:
bx r1
thumb_func_end sub_80E5EC0
- thumb_func_start sub_80E5EF4
-sub_80E5EF4: @ 80E5EF4
+ thumb_func_start IsBikingDisallowedByPlayer
+IsBikingDisallowedByPlayer: @ 80E5EF4
push {r4,lr}
sub sp, 0x4
ldr r0, _080E5F30 @ =gPlayerAvatar
@@ -1985,7 +1985,7 @@ _080E5F36:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80E5EF4
+ thumb_func_end IsBikingDisallowedByPlayer
thumb_func_start player_should_look_direction_be_enforced_upon_movement
player_should_look_direction_be_enforced_upon_movement: @ 80E5F40
diff --git a/asm/contest.s b/asm/contest.s
index acde6703a..ba5bbfc1c 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -6900,7 +6900,7 @@ sub_80AE9FC: @ 80AE9FC
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r5, 0
mov r1, r8
adds r2, r6, 0
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 3816f3637..99e7511c9 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1357,7 +1357,7 @@ _080C2B14:
str r6, [sp, 0x4]
str r4, [sp, 0x8]
ldr r3, _080C2BE4 @ =0x02000000
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r6, 0
ldr r1, [sp, 0xC]
adds r2, r4, 0
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 91ee2d547..ef4d35b8d 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -611,7 +611,7 @@ sub_8106AC4: @ 8106AC4
ldr r4, [r7]
ldr r4, [r4]
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
mov r2, r8
ldr r1, [r2]
ldr r0, _08106B3C @ =gUnknown_03005E10
@@ -644,7 +644,7 @@ _08106B40:
ldr r4, [r7]
ldr r4, [r4]
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
mov r0, r8
ldr r1, [r0]
ldr r0, _08106B8C @ =gUnknown_03005E10
diff --git a/asm/credits.s b/asm/credits.s
index 1d4747034..de59cb943 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -3752,7 +3752,7 @@ _081456FC:
str r7, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
ldr r2, _081457F8 @ =0x0000ffff
adds r0, r6, 0
movs r1, 0
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index b8dae1bba..dc80777ad 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -409,7 +409,7 @@ _08042BB4:
str r5, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r7, 0
bl sub_8040990
bl LoadCompressedObjectPalette
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 6876c6783..76846e9c3 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -3130,7 +3130,7 @@ sub_81436BC: @ 81436BC
str r7, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
adds r0, r6, 0
ldr r1, [sp, 0x30]
adds r2, r7, 0
diff --git a/asm/intro.s b/asm/intro.s
index 5c897a619..ee91e7660 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -517,7 +517,7 @@ sub_813CE88: @ 813CE88
str r4, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
b _0813CF1C
.align 2, 0
_0813CEE4: .4byte gMonFrontPicTable
@@ -544,7 +544,7 @@ _0813CEF0:
str r7, [sp, 0x4]
str r6, [sp, 0x8]
str r6, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
_0813CF1C:
ldr r2, _0813CF9C @ =0x0000ffff
adds r0, r7, 0
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 85375a87a..c091b3f82 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5261,7 +5261,7 @@ sub_80A5AAC: @ 80A5AAC
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _080A5AE0 @ =sub_80A5B00
+ ldr r1, _080A5AE0 @ =HandleItemMenuPaletteFade
str r1, [r0]
add sp, 0x4
pop {r4}
@@ -5269,7 +5269,7 @@ sub_80A5AAC: @ 80A5AAC
bx r0
.align 2, 0
_080A5ADC: .4byte gTasks
-_080A5AE0: .4byte sub_80A5B00
+_080A5AE0: .4byte HandleItemMenuPaletteFade
thumb_func_end sub_80A5AAC
thumb_func_start sub_80A5AE4
@@ -5287,8 +5287,8 @@ sub_80A5AE4: @ 80A5AE4
bx r0
thumb_func_end sub_80A5AE4
- thumb_func_start sub_80A5B00
-sub_80A5B00: @ 80A5B00
+ thumb_func_start HandleItemMenuPaletteFade
+HandleItemMenuPaletteFade: @ 80A5B00
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -5318,7 +5318,7 @@ _080A5B32:
.align 2, 0
_080A5B38: .4byte gTasks + 0x8
_080A5B3C: .4byte gPaletteFade
- thumb_func_end sub_80A5B00
+ thumb_func_end HandleItemMenuPaletteFade
thumb_func_start sub_80A5B40
sub_80A5B40: @ 80A5B40
@@ -5420,7 +5420,7 @@ sub_80A5BF8: @ 80A5BF8
bl sub_80A73FC
bl sub_80A7590
ldr r1, _080A5C1C @ =gOtherText_NoPokemon
- ldr r2, _080A5C20 @ =sub_80A5C48
+ ldr r2, _080A5C20 @ =CleanUpItemMenuMessage
adds r0, r4, 0
movs r3, 0x1
bl DisplayCannotUseItemMessage
@@ -5429,7 +5429,7 @@ sub_80A5BF8: @ 80A5BF8
bx r0
.align 2, 0
_080A5C1C: .4byte gOtherText_NoPokemon
-_080A5C20: .4byte sub_80A5C48
+_080A5C20: .4byte CleanUpItemMenuMessage
thumb_func_end sub_80A5BF8
thumb_func_start sub_80A5C24
@@ -5450,8 +5450,8 @@ sub_80A5C24: @ 80A5C24
bx r0
thumb_func_end sub_80A5C24
- thumb_func_start sub_80A5C48
-sub_80A5C48: @ 80A5C48
+ thumb_func_start CleanUpItemMenuMessage
+CleanUpItemMenuMessage: @ 80A5C48
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -5489,10 +5489,10 @@ sub_80A5C48: @ 80A5C48
_080A5C90: .4byte gBGTilemapBuffers + 0x800
_080A5C94: .4byte gTasks
_080A5C98: .4byte sub_80A5C24
- thumb_func_end sub_80A5C48
+ thumb_func_end CleanUpItemMenuMessage
- thumb_func_start sub_80A5C9C
-sub_80A5C9C: @ 80A5C9C
+ thumb_func_start CleanUpOverworldMessage
+CleanUpOverworldMessage: @ 80A5C9C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -5509,10 +5509,10 @@ sub_80A5C9C: @ 80A5C9C
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80A5C9C
+ thumb_func_end CleanUpOverworldMessage
- thumb_func_start sub_80A5CC4
-sub_80A5CC4: @ 80A5CC4
+ thumb_func_start ExecuteItemUseFromBlackPalette
+ExecuteItemUseFromBlackPalette: @ 80A5CC4
push {lr}
bl pal_fill_black
ldr r0, _080A5CD8 @ =Task_CallItemUseOnFieldCallback
@@ -5522,7 +5522,7 @@ sub_80A5CC4: @ 80A5CC4
bx r0
.align 2, 0
_080A5CD8: .4byte Task_CallItemUseOnFieldCallback
- thumb_func_end sub_80A5CC4
+ thumb_func_end ExecuteItemUseFromBlackPalette
thumb_func_start Task_CallItemUseOnFieldCallback
Task_CallItemUseOnFieldCallback: @ 80A5CDC
@@ -6064,7 +6064,7 @@ _080A6128:
lsrs r1, r2, 16
strh r1, [r0, 0x18]
strh r2, [r0, 0x1A]
- ldr r1, _080A6160 @ =sub_80A5B00
+ ldr r1, _080A6160 @ =HandleItemMenuPaletteFade
str r1, [r0]
ldr r1, _080A6164 @ =gUnknown_02038561
movs r0, 0x1
@@ -6080,7 +6080,7 @@ _080A6128:
.align 2, 0
_080A6158: .4byte gTasks
_080A615C: .4byte sub_808B020
-_080A6160: .4byte sub_80A5B00
+_080A6160: .4byte HandleItemMenuPaletteFade
_080A6164: .4byte gUnknown_02038561
_080A6168:
adds r0, r6, 0
@@ -7968,7 +7968,7 @@ sub_80A7094: @ 80A7094
movs r3, 0
strh r0, [r1, 0x18]
strh r2, [r1, 0x1A]
- ldr r0, _080A70D4 @ =sub_80A5B00
+ ldr r0, _080A70D4 @ =HandleItemMenuPaletteFade
str r0, [r1]
movs r0, 0x1
negs r0, r0
@@ -7983,7 +7983,7 @@ sub_80A7094: @ 80A7094
.align 2, 0
_080A70CC: .4byte gTasks
_080A70D0: .4byte sub_802E424
-_080A70D4: .4byte sub_80A5B00
+_080A70D4: .4byte HandleItemMenuPaletteFade
thumb_func_end sub_80A7094
thumb_func_start sub_80A70D8
@@ -8264,7 +8264,7 @@ _080A72F4:
mov r0, r8
subs r0, 0x8
adds r0, r6, r0
- ldr r1, _080A7354 @ =sub_80A5B00
+ ldr r1, _080A7354 @ =HandleItemMenuPaletteFade
str r1, [r0]
movs r0, 0x1
negs r0, r0
@@ -8279,7 +8279,7 @@ _080A7344: .4byte gBGTilemapBuffers + 0x800
_080A7348: .4byte gSaveBlock1 + 0x560
_080A734C: .4byte 0x0201e000
_080A7350: .4byte sub_802E424
-_080A7354: .4byte sub_80A5B00
+_080A7354: .4byte HandleItemMenuPaletteFade
_080A7358:
ldrh r0, [r7, 0x1E]
adds r0, 0x1
@@ -9682,7 +9682,7 @@ sub_80A7CF8: @ 80A7CF8
lsrs r4, r0, 24
cmp r4, 0x2A
bne _080A7D44
- bl sub_80B4940
+ bl IsEnigmaBerryValid
cmp r0, 0x1
bne _080A7D44
ldr r4, _080A7D34 @ =gSaveBlock1 + 0x317C
diff --git a/asm/item_use.s b/asm/item_use.s
index 0f6077bdc..5b0615d72 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -412,8 +412,8 @@ _080C98FA:
bx r0
thumb_func_end sub_80C9838
- thumb_func_start sub_80C9908
-sub_80C9908: @ 80C9908
+ thumb_func_start GetPlayerDirectionTowardsHiddenItem
+GetPlayerDirectionTowardsHiddenItem: @ 80C9908
push {r4,r5,lr}
lsls r0, 16
lsls r1, 16
@@ -484,10 +484,10 @@ _080C9976:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80C9908
+ thumb_func_end GetPlayerDirectionTowardsHiddenItem
- thumb_func_start sub_80C997C
-sub_80C997C: @ 80C997C
+ thumb_func_start SetPlayerDirectionTowardsItem
+SetPlayerDirectionTowardsItem: @ 80C997C
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
@@ -536,10 +536,10 @@ sub_80C997C: @ 80C997C
bx r0
.align 2, 0
_080C99E8: .4byte gMapObjects
- thumb_func_end sub_80C997C
+ thumb_func_end SetPlayerDirectionTowardsItem
- thumb_func_start sub_80C99EC
-sub_80C99EC: @ 80C99EC
+ thumb_func_start DisplayItemRespondingMessageAndExitItemfinder
+DisplayItemRespondingMessageAndExitItemfinder: @ 80C99EC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -561,7 +561,7 @@ sub_80C99EC: @ 80C99EC
cmp r0, 0x1
bne _080C9A24
ldr r1, _080C9A30 @ =gOtherText_ItemfinderResponding
- ldr r2, _080C9A34 @ =sub_80C9520
+ ldr r2, _080C9A34 @ =ExitItemfinder
adds r0, r4, 0
movs r3, 0
bl DisplayItemMessageOnField
@@ -572,11 +572,11 @@ _080C9A24:
.align 2, 0
_080C9A2C: .4byte gMapObjects
_080C9A30: .4byte gOtherText_ItemfinderResponding
-_080C9A34: .4byte sub_80C9520
- thumb_func_end sub_80C99EC
+_080C9A34: .4byte ExitItemfinder
+ thumb_func_end DisplayItemRespondingMessageAndExitItemfinder
- thumb_func_start sub_80C9A38
-sub_80C9A38: @ 80C9A38
+ thumb_func_start RotatePlayerAndExitItemfinder
+RotatePlayerAndExitItemfinder: @ 80C9A38
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -608,12 +608,12 @@ sub_80C9A38: @ 80C9A38
cmp r0, 0
bne _080C9AAE
_080C9A78:
- ldr r1, _080C9ABC @ =gUnknown_083D61F0
+ ldr r1, _080C9ABC @ =gItemFinderDirections
movs r2, 0xA
ldrsh r0, [r4, r2]
adds r0, r1
ldrb r0, [r0]
- bl sub_80C997C
+ bl SetPlayerDirectionTowardsItem
movs r0, 0x1
strh r0, [r4, 0x4]
ldrh r0, [r4, 0xA]
@@ -628,8 +628,8 @@ _080C9A78:
asrs r0, 16
cmp r0, 0x4
bne _080C9AAE
- ldr r1, _080C9AC0 @ =gOtherText_ItemfinderFoundItem
- ldr r2, _080C9AC4 @ =sub_80C9520
+ ldr r1, _080C9AC0 @ =gOtherText_ItemfinderItemUnderfoot
+ ldr r2, _080C9AC4 @ =ExitItemfinder
adds r0, r5, 0
movs r3, 0
bl DisplayItemMessageOnField
@@ -640,10 +640,10 @@ _080C9AAE:
.align 2, 0
_080C9AB4: .4byte gTasks + 0x8
_080C9AB8: .4byte gMapObjects
-_080C9ABC: .4byte gUnknown_083D61F0
-_080C9AC0: .4byte gOtherText_ItemfinderFoundItem
-_080C9AC4: .4byte sub_80C9520
- thumb_func_end sub_80C9A38
+_080C9ABC: .4byte gItemFinderDirections
+_080C9AC0: .4byte gOtherText_ItemfinderItemUnderfoot
+_080C9AC4: .4byte ExitItemfinder
+ thumb_func_end RotatePlayerAndExitItemfinder
thumb_func_start ItemUseOutOfBattle_PokeblockCase
ItemUseOutOfBattle_PokeblockCase: @ 80C9AC8
@@ -680,7 +680,7 @@ _080C9AF4:
movs r0, 0
bl sub_810BA7C
adds r0, r4, 0
- bl unknown_ItemMenu_Confirm
+ bl ItemMenu_ConfirmNormalFade
b _080C9B2A
.align 2, 0
_080C9B14: .4byte gTasks
@@ -691,7 +691,7 @@ _080C9B18:
movs r0, 0x1
bl sub_810BA7C
adds r0, r5, 0
- bl sub_80C9038
+ bl ItemMenu_ConfirmComplexFade
_080C9B2A:
pop {r4,r5}
pop {r0}
@@ -733,7 +733,7 @@ ItemUseOutOfBattle_CoinCase: @ 80C9B38
movs r2, 0xD
movs r3, 0x14
bl MenuZeroFillWindowRect
- ldr r2, _080C9B9C @ =sub_80A5C48
+ ldr r2, _080C9B9C @ =CleanUpItemMenuMessage
adds r0, r5, 0
adds r1, r4, 0
movs r3, 0x1
@@ -744,9 +744,9 @@ _080C9B8C: .4byte gStringVar1
_080C9B90: .4byte gStringVar4
_080C9B94: .4byte gOtherText_Coins3
_080C9B98: .4byte gTasks
-_080C9B9C: .4byte sub_80A5C48
+_080C9B9C: .4byte CleanUpItemMenuMessage
_080C9BA0:
- ldr r2, _080C9BB4 @ =sub_80A5C9C
+ ldr r2, _080C9BB4 @ =CleanUpOverworldMessage
adds r0, r5, 0
adds r1, r4, 0
movs r3, 0
@@ -756,7 +756,7 @@ _080C9BAC:
pop {r0}
bx r0
.align 2, 0
-_080C9BB4: .4byte sub_80A5C9C
+_080C9BB4: .4byte CleanUpOverworldMessage
thumb_func_end ItemUseOutOfBattle_CoinCase
thumb_func_start sub_80C9BB8
@@ -771,7 +771,7 @@ sub_80C9BB8: @ 80C9BB8
cmp r0, 0
beq _080C9BD0
adds r0, r2, 0
- bl sub_80A5C48
+ bl CleanUpItemMenuMessage
_080C9BD0:
pop {r0}
bx r0
@@ -791,7 +791,7 @@ sub_80C9BD8: @ 80C9BD8
cmp r0, 0
beq _080C9BF0
adds r0, r2, 0
- bl sub_80A5C9C
+ bl CleanUpOverworldMessage
_080C9BF0:
pop {r0}
bx r0
@@ -874,7 +874,7 @@ sub_80C9C7C: @ 80C9C7C
ldr r0, _080C9CCC @ =sub_80C9D00
str r0, [r1]
ldr r1, _080C9CD0 @ =gUnknown_0300485C
- ldr r0, _080C9CD4 @ =sub_80A5CC4
+ ldr r0, _080C9CD4 @ =ExecuteItemUseFromBlackPalette
str r0, [r1]
ldr r1, _080C9CD8 @ =gTasks
lsls r0, r4, 2
@@ -886,7 +886,7 @@ sub_80C9C7C: @ 80C9C7C
movs r3, 0
strh r1, [r0, 0x18]
strh r2, [r0, 0x1A]
- ldr r1, _080C9CE0 @ =sub_80A5B00
+ ldr r1, _080C9CE0 @ =HandleItemMenuPaletteFade
str r1, [r0]
movs r0, 0x1
negs r0, r0
@@ -900,10 +900,10 @@ sub_80C9C7C: @ 80C9C7C
_080C9CC8: .4byte gUnknown_03005D00
_080C9CCC: .4byte sub_80C9D00
_080C9CD0: .4byte gUnknown_0300485C
-_080C9CD4: .4byte sub_80A5CC4
+_080C9CD4: .4byte ExecuteItemUseFromBlackPalette
_080C9CD8: .4byte gTasks
_080C9CDC: .4byte c2_exit_to_overworld_2_switch
-_080C9CE0: .4byte sub_80A5B00
+_080C9CE0: .4byte HandleItemMenuPaletteFade
_080C9CE4:
ldr r0, _080C9CFC @ =gScriptItemId
ldrh r0, [r0]
@@ -948,7 +948,7 @@ ItemUseOutOfBattle_WailmerPail: @ 80C9D30
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl WaterBerryTree
+ bl TryToWaterBerryTree
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1005,7 +1005,7 @@ sub_80C9D98: @ 80C9D98
ldr r2, _080C9DAC @ =gUnknown_02038561
movs r1, 0
strb r1, [r2]
- bl unknown_ItemMenu_Confirm
+ bl ItemMenu_ConfirmNormalFade
pop {r0}
bx r0
.align 2, 0
@@ -1072,7 +1072,7 @@ _080C9E10:
movs r0, 0x4
strb r0, [r1]
adds r0, r6, 0
- bl unknown_ItemMenu_Confirm
+ bl ItemMenu_ConfirmNormalFade
pop {r4-r6}
pop {r0}
bx r0
@@ -1340,7 +1340,7 @@ ItemUseOutOfBattle_Repel: @ 80CA014
bl VarSet
bl sub_80C9FDC
ldr r1, _080CA058 @ =gStringVar4
- ldr r2, _080CA05C @ =sub_80A5C48
+ ldr r2, _080CA05C @ =CleanUpItemMenuMessage
adds r0, r4, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1349,10 +1349,10 @@ ItemUseOutOfBattle_Repel: @ 80CA014
_080CA050: .4byte 0x00004021
_080CA054: .4byte gScriptItemId
_080CA058: .4byte gStringVar4
-_080CA05C: .4byte sub_80A5C48
+_080CA05C: .4byte CleanUpItemMenuMessage
_080CA060:
ldr r1, _080CA074 @ =gOtherText_RepelLingers
- ldr r2, _080CA078 @ =sub_80A5C48
+ ldr r2, _080CA078 @ =CleanUpItemMenuMessage
adds r0, r4, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1362,7 +1362,7 @@ _080CA06C:
bx r0
.align 2, 0
_080CA074: .4byte gOtherText_RepelLingers
-_080CA078: .4byte sub_80A5C48
+_080CA078: .4byte CleanUpItemMenuMessage
thumb_func_end ItemUseOutOfBattle_Repel
thumb_func_start sub_80CA07C
@@ -1400,7 +1400,7 @@ sub_80CA098: @ 80CA098
movs r0, 0x75
bl PlaySE
ldr r1, _080CA0D4 @ =gStringVar4
- ldr r2, _080CA0D8 @ =sub_80A5C48
+ ldr r2, _080CA0D8 @ =CleanUpItemMenuMessage
adds r0, r4, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1411,7 +1411,7 @@ _080CA0C8:
.align 2, 0
_080CA0D0: .4byte gTasks
_080CA0D4: .4byte gStringVar4
-_080CA0D8: .4byte sub_80A5C48
+_080CA0D8: .4byte CleanUpItemMenuMessage
thumb_func_end sub_80CA098
thumb_func_start ItemUseOutOfBattle_BlackWhiteFlute
@@ -1616,7 +1616,7 @@ _080CA26C:
movs r3, 0x14
bl MenuZeroFillWindowRect
ldr r1, _080CA28C @ =gOtherText_BoxIsFull
- ldr r2, _080CA290 @ =sub_80A5C48
+ ldr r2, _080CA290 @ =CleanUpItemMenuMessage
adds r0, r4, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1626,7 +1626,7 @@ _080CA284:
bx r0
.align 2, 0
_080CA28C: .4byte gOtherText_BoxIsFull
-_080CA290: .4byte sub_80A5C48
+_080CA290: .4byte CleanUpItemMenuMessage
thumb_func_end ItemUseInBattle_PokeBall
thumb_func_start sub_80CA294
@@ -1726,7 +1726,7 @@ ItemUseInBattle_StatIncrease: @ 80CA310
cmp r2, 0
beq _080CA374
ldr r1, _080CA36C @ =gOtherText_WontHaveAnyEffect
- ldr r2, _080CA370 @ =sub_80A5C48
+ ldr r2, _080CA370 @ =CleanUpItemMenuMessage
adds r0, r5, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1737,7 +1737,7 @@ _080CA360: .4byte gUnknown_02024E6C
_080CA364: .4byte gPlayerParty
_080CA368: .4byte gScriptItemId
_080CA36C: .4byte gOtherText_WontHaveAnyEffect
-_080CA370: .4byte sub_80A5C48
+_080CA370: .4byte CleanUpItemMenuMessage
_080CA374:
ldr r0, _080CA38C @ =gTasks
lsls r1, r5, 2
@@ -1898,7 +1898,7 @@ _080CA4A4: .4byte gOtherText_SnapConfusion
_080CA4A8: .4byte sub_80A7094
_080CA4AC:
ldr r1, _080CA4C0 @ =gOtherText_WontHaveAnyEffect
- ldr r2, _080CA4C4 @ =sub_80A5C48
+ ldr r2, _080CA4C4 @ =CleanUpItemMenuMessage
adds r0, r5, 0
movs r3, 0x1
bl DisplayItemMessageOnField
@@ -1908,7 +1908,7 @@ _080CA4B8:
bx r0
.align 2, 0
_080CA4C0: .4byte gOtherText_WontHaveAnyEffect
-_080CA4C4: .4byte sub_80A5C48
+_080CA4C4: .4byte CleanUpItemMenuMessage
thumb_func_end unref_sub_80CA448
thumb_func_start ItemUseInBattle_Escape
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index f3ba5c831..f0e842626 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -369,7 +369,7 @@ sub_8126438: @ 8126438
mov r7, r8
push {r7}
adds r7, r0, 0
- bl sub_80B4940
+ bl IsEnigmaBerryValid
mov r8, r0
adds r0, r7, 0
bl ScriptReadWord
@@ -385,7 +385,7 @@ sub_8126438: @ 8126438
movs r2, 0x7
bl StringCopyN
adds r0, r4, 0
- bl sub_80B48A8
+ bl SetEnigmaBerry
ldr r4, _0812648C @ =gStringVar2
adds r0, r4, 0
adds r1, r5, 0
@@ -422,7 +422,7 @@ _081264B8:
bl StringExpandPlaceholders
movs r0, 0x2
str r0, [r7, 0x6C]
- bl sub_80B4940
+ bl IsEnigmaBerryValid
cmp r0, 0x1
bne _081264E0
ldr r0, _081264DC @ =0x0000402d
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 7bd8b6c28..3c83fa929 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -1900,7 +1900,7 @@ sub_813B454: @ 813B454
adds r0, r1
ldr r1, _0813B49C @ =sub_813B4F0
movs r2, 0x1
- bl sub_80F890C
+ bl HandleReadMail
adds r0, r4, 0
bl DestroyTask
_0813B488:
diff --git a/asm/pokeblock_feed.s b/asm/pokeblock_feed.s
index fafc452a3..7df634399 100644
--- a/asm/pokeblock_feed.s
+++ b/asm/pokeblock_feed.s
@@ -365,7 +365,7 @@ _08147B70:
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
b _08147C40
.align 2, 0
_08147BAC: .4byte gMonFrontPicTable
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 7d1056231..24488fe3f 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -2336,7 +2336,7 @@ _08091958:
str r4, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
b _080919CE
.align 2, 0
_0809198C: .4byte gMonFrontPicTable
@@ -2367,7 +2367,7 @@ _0809199C:
str r4, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
_080919CE:
ldr r0, _08091A40 @ =gMonPaletteTable
adds r0, r6, r0
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 968386bd1..ba1079dec 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -17783,7 +17783,7 @@ sub_80F4824: @ 80F4824
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r2, 0x1
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r5, 0
mov r1, r8
adds r2, r4, 0
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index 6c0ae19b4..1aefa4444 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -71369,7 +71369,7 @@ _080317DC:
str r6, [sp, 0x4]
str r7, [sp, 0x8]
adds r0, r5, 0
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
mov r1, r9
lsls r2, r1, 4
movs r0, 0x80
@@ -71533,7 +71533,7 @@ _08031944:
str r6, [sp, 0x4]
str r7, [sp, 0x8]
adds r0, r5, 0
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
mov r1, r9
lsls r2, r1, 4
movs r0, 0x80
@@ -72532,7 +72532,7 @@ _08032114:
ldr r4, [r4]
_08032184:
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
b _08032202
.align 2, 0
_0803218C: .4byte gUnknown_02024A6A
@@ -72585,7 +72585,7 @@ _080321A4:
add r4, r12
ldr r4, [r4]
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
_08032202:
ldr r1, _08032318 @ =gUnknown_081FAF4C
mov r2, r10
diff --git a/asm/rom_8077ABC.s b/asm/rom_8077ABC.s
index 9a59c265d..db413817a 100644
--- a/asm/rom_8077ABC.s
+++ b/asm/rom_8077ABC.s
@@ -5036,7 +5036,7 @@ sub_8079F44: @ 8079F44
str r4, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
b _0807A02E
.align 2, 0
_08079FE0: .4byte gUnknown_0837F5E0
@@ -5071,7 +5071,7 @@ _08079FF0:
str r4, [sp, 0x8]
movs r4, 0
str r4, [sp, 0xC]
- bl sub_800D378
+ bl LoadSpecialPokePic
_0807A02E:
movs r2, 0x80
lsls r2, 18
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index 56d991122..8de73e1d7 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -267,7 +267,7 @@ CreateMonSprite_FieldMove: @ 8085B88
str r3, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r5, 0
mov r1, r10
adds r2, r4, 0
@@ -10104,7 +10104,7 @@ sub_808A848: @ 808A848
adds r0, r1
ldr r1, _0808A8A4 @ =sub_808A8A8
movs r2, 0x1
- bl sub_80F890C
+ bl HandleReadMail
_0808A890:
pop {r4,r5}
pop {r0}
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index 2d58c43c2..3685e183d 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -7060,7 +7060,7 @@ sub_80981F0: @ 80981F0
str r4, [sp, 0x4]
str r7, [sp, 0x8]
movs r2, 0x1
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
ldr r1, _08098288 @ =0x000011e8
adds r0, r6, r1
ldr r0, [r0]
@@ -21994,7 +21994,7 @@ _0809F6D2:
str r4, [sp]
str r5, [sp, 0x4]
str r6, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
b _0809F74E
.align 2, 0
_0809F70C: .4byte gMonFrontPicTable
diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s
index b60c9444a..6ce5f0dc7 100644
--- a/asm/script_pokemon_util_80C4BF0.s
+++ b/asm/script_pokemon_util_80C4BF0.s
@@ -654,7 +654,7 @@ ShowContestEntryMonPic: @ 80C5050
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
adds r0, r6, 0
mov r1, r9
mov r2, r8
diff --git a/asm/trade.s b/asm/trade.s
index d49f81a62..0448609b7 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -6805,7 +6805,7 @@ _0804B330:
str r5, [sp, 0x4]
mov r4, r9
str r4, [sp, 0x8]
- bl sub_800D334
+ bl HandleLoadSpecialPokePic
mov r0, r10
bl sub_8040990
bl LoadCompressedObjectPalette
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-28 16:47:29 +0000