summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/cable_car.s2
-rw-r--r--asm/contest.s2
-rw-r--r--asm/contest_painting.s6
-rw-r--r--asm/daycare.s2
-rw-r--r--asm/decoration.s8
-rw-r--r--asm/egg_hatch.s24
-rw-r--r--asm/evolution_scene.s36
-rw-r--r--asm/field_poison.s2
-rw-r--r--asm/fldeff_80C5CD4.s20
-rw-r--r--asm/player_pc.s22
-rw-r--r--asm/pokedex_area_screen.s6
-rw-r--r--asm/reset_rtc_screen.s22
-rw-r--r--asm/rom6.s8
-rw-r--r--asm/rom_813BA94.s6
-rw-r--r--asm/roulette.s4
-rw-r--r--asm/script_pokemon_util_80C4BF0.s6
-rw-r--r--asm/secret_base.s4
-rw-r--r--asm/sound_check_menu.s2
-rw-r--r--asm/title_screen.s10
19 files changed, 96 insertions, 96 deletions
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 8fa960638..083ae8aa6 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -563,7 +563,7 @@ _081236B0:
strh r2, [r3]
ldr r0, _081236EC @ =sub_8123C40
bl SetVBlankCallback
- ldr r0, _081236F0 @ =mainloop
+ ldr r0, _081236F0 @ =sub_8123724
bl SetMainCallback2
ldr r0, _081236F4 @ =sub_8123878
movs r1, 0
diff --git a/asm/contest.s b/asm/contest.s
index f3b176969..bab1bf067 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -10037,7 +10037,7 @@ unref_sub_80B01B0: @ 80B01B0
movs r2, 0
ldr r5, _080B01D4 @ =0x0201920d
ldr r4, _080B01D8 @ =gSprites + 0x1C
- ldr r3, _080B01DC @ =ObjectCB_SwitchPocketRotatingBallInit
+ ldr r3, _080B01DC @ =sub_80B0238
_080B01BA:
adds r0, r2, r5
ldrb r1, [r0]
diff --git a/asm/contest_painting.s b/asm/contest_painting.s
index 8edea71c1..91ee2d547 100644
--- a/asm/contest_painting.s
+++ b/asm/contest_painting.s
@@ -194,7 +194,7 @@ _0810678C:
ldr r0, [r0, 0x8]
movs r0, 0x2
bl BeginFastPaletteFade
- ldr r0, _081067FC @ =sub_8106AAC
+ ldr r0, _081067FC @ =VBlankCB_ContestPainting
bl SetVBlankCallback
ldr r0, _08106800 @ =gUnknown_03000750
strb r4, [r0]
@@ -204,7 +204,7 @@ _0810678C:
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _08106804 @ =sub_8106808
+ ldr r0, _08106804 @ =CB2_HoldContestPainting
bl SetMainCallback2
_081067E0:
add sp, 0x4
@@ -324,7 +324,7 @@ _081068C0:
ands r0, r1
cmp r0, 0
bne _081068D2
- ldr r0, _081068F0 @ =sub_8106818
+ ldr r0, _081068F0 @ =CB2_QuitContestPainting
bl SetMainCallback2
_081068D2:
ldr r0, _081068F4 @ =gUnknown_03000756
diff --git a/asm/daycare.s b/asm/daycare.s
index 17543a508..b846c4fe7 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -2872,7 +2872,7 @@ ShowDaycareLevelMenu: @ 8042824
movs r2, 0x7
movs r3, 0x3
bl InitMenu
- ldr r0, _08042884 @ =sub_804272C
+ ldr r0, _08042884 @ =DaycareLevelMenuProcessKeyInput
movs r1, 0x3
bl CreateTask
add sp, 0x6C
diff --git a/asm/decoration.s b/asm/decoration.s
index 057251070..064a93b06 100644
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -66,7 +66,7 @@ DecorationPC: @ 80FE23C
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _080FE260 @ =sub_80FE2EC
+ ldr r1, _080FE260 @ =Task_DecorationPCProcessMenuInput
str r1, [r0]
pop {r4}
pop {r0}
@@ -322,7 +322,7 @@ sub_80FE428: @ 80FE428
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _080FE46C @ =sub_80FE2EC
+ ldr r1, _080FE46C @ =Task_DecorationPCProcessMenuInput
str r1, [r0]
add sp, 0x8
pop {r4}
@@ -711,7 +711,7 @@ sub_80FE758: @ 80FE758
bl sub_80FE1DC
bl MenuDisplayMessageBox
bl sub_80FE394
- ldr r0, _080FE798 @ =sub_80FE2EC
+ ldr r0, _080FE798 @ =Task_DecorationPCProcessMenuInput
str r0, [r5]
b _080FE7A2
.align 2, 0
@@ -6799,7 +6799,7 @@ sub_8101648: @ 8101648
adds r1, r4
lsls r1, 3
adds r1, r0
- ldr r0, _08101674 @ =sub_80FE2EC
+ ldr r0, _08101674 @ =Task_DecorationPCProcessMenuInput
str r0, [r1]
_08101668:
pop {r4}
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index 505dc862c..5fcd5778b 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -477,7 +477,7 @@ EggHatch: @ 8042C80
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
- ldr r0, _08042CA8 @ =sub_8042CAC
+ ldr r0, _08042CA8 @ =Task_EggHatch
movs r1, 0xA
bl CreateTask
movs r0, 0x1
@@ -505,7 +505,7 @@ Task_EggHatch: @ 8042CAC
ands r0, r1
cmp r0, 0
bne _08042CD0
- ldr r0, _08042CDC @ =sub_8042CE8
+ ldr r0, _08042CDC @ =CB2_EggHatch_0
bl SetMainCallback2
ldr r1, _08042CE0 @ =gUnknown_0300485C
ldr r0, _08042CE4 @ =sub_8080990
@@ -570,7 +570,7 @@ _08042D34:
bl ResetTasks
bl ResetSpriteData
bl FreeAllSpritePalettes
- ldr r0, _08042D80 @ =sub_8042C6C
+ ldr r0, _08042D80 @ =VBlankCB_EggHatch
bl SetVBlankCallback
ldr r1, _08042D84 @ =gMain
ldr r2, _08042D88 @ =0x0000043c
@@ -789,7 +789,7 @@ _08042F40:
strh r4, [r0]
adds r0, 0x2
strh r4, [r0]
- ldr r0, _08042F80 @ =sub_804300C
+ ldr r0, _08042F80 @ =CB2_EggHatch_1
bl SetMainCallback2
ldr r0, _08042F84 @ =gUnknown_0300481C
ldr r0, [r0]
@@ -930,7 +930,7 @@ _08043068:
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
- ldr r0, _0804309C @ =c3_080472E4
+ ldr r0, _0804309C @ =Task_EggHatchPlayBGM
movs r1, 0x5
bl CreateTask
b _080432BA
@@ -977,7 +977,7 @@ _080430D2:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, _080430F4 @ =sub_80432E4
+ ldr r1, _080430F4 @ =SpriteCB_Egg_0
str r1, [r0]
b _080432BA
.align 2, 0
@@ -1148,7 +1148,7 @@ _080431DA:
movs r2, 0
bl GetMonData
str r0, [sp]
- ldr r0, _08043284 @ =sub_8042F88
+ ldr r0, _08043284 @ =EggHatchSetMonNickname
str r0, [sp, 0x4]
movs r0, 0x3
mov r1, r10
@@ -1217,7 +1217,7 @@ SpriteCB_Egg_0: @ 80432E4
asrs r0, 16
cmp r0, 0x14
ble _08043304
- ldr r0, _08043300 @ =sub_804333C
+ ldr r0, _08043300 @ =SpriteCB_Egg_1
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x2E]
@@ -1270,7 +1270,7 @@ SpriteCB_Egg_1: @ 804333C
asrs r0, 16
cmp r0, 0x14
ble _0804336C
- ldr r0, _08043368 @ =sub_80433A0
+ ldr r0, _08043368 @ =SpriteCB_Egg_2
str r0, [r4, 0x1C]
strh r1, [r4, 0x2E]
strh r1, [r4, 0x32]
@@ -1322,7 +1322,7 @@ SpriteCB_Egg_2: @ 80433A0
asrs r0, 16
cmp r0, 0x26
ble _08043418
- ldr r0, _08043404 @ =sub_8043460
+ ldr r0, _08043404 @ =SpriteCB_Egg_3
str r0, [r4, 0x1C]
strh r6, [r4, 0x2E]
ldr r5, _08043408 @ =gUnknown_0300481C
@@ -1406,7 +1406,7 @@ SpriteCB_Egg_3: @ 8043460
asrs r0, 16
cmp r0, 0x32
ble _0804347A
- ldr r0, _08043480 @ =sub_8043484
+ ldr r0, _08043480 @ =SpriteCB_Egg_4
str r0, [r1, 0x1C]
movs r0, 0
strh r0, [r1, 0x2E]
@@ -1469,7 +1469,7 @@ _080434C0:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, _08043500 @ =sub_8043504
+ ldr r0, _08043500 @ =SpriteCB_Egg_5
str r0, [r5, 0x1C]
strh r4, [r5, 0x2E]
_080434EE:
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index d411bb080..9d009f567 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -97,7 +97,7 @@ BeginEvolutionScene: @ 8111924
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
- ldr r0, _08111978 @ =sub_81118A4
+ ldr r0, _08111978 @ =Task_BeginEvolutionScene
movs r1, 0
bl CreateTask
lsls r0, 24
@@ -117,7 +117,7 @@ BeginEvolutionScene: @ 8111924
strh r4, [r1, 0x10]
strh r5, [r1, 0x12]
strh r6, [r1, 0x20]
- ldr r0, _08111980 @ =sub_8111894
+ ldr r0, _08111980 @ =CB2_BeginEvolutionScene
bl SetMainCallback2
pop {r3}
mov r8, r3
@@ -366,7 +366,7 @@ EvolutionScene: @ 8111984
orrs r0, r3
strb r0, [r1]
bl sub_8149954
- ldr r0, _08111C74 @ =sub_811240C
+ ldr r0, _08111C74 @ =Task_EvolutionScene
movs r1, 0
bl CreateTask
lsls r1, r0, 24
@@ -407,12 +407,12 @@ EvolutionScene: @ 8111984
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _08111C84 @ =nullsub_73
+ ldr r0, _08111C84 @ =HBlankCB_EvolutionScene
bl SetHBlankCallback
- ldr r0, _08111C88 @ =sub_8114FD4
+ ldr r0, _08111C88 @ =VBlankCB_EvolutionScene
bl SetVBlankCallback
bl m4aMPlayAllStop
- ldr r0, _08111C8C @ =sub_8112270
+ ldr r0, _08111C8C @ =CB2_EvolutionSceneUpdate_0
bl SetMainCallback2
add sp, 0x38
pop {r3-r5}
@@ -610,11 +610,11 @@ CB2_EvolutionSceneLoadGraphics: @ 8111C90
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _08111E74 @ =nullsub_73
+ ldr r0, _08111E74 @ =HBlankCB_EvolutionScene
bl SetHBlankCallback
- ldr r0, _08111E78 @ =sub_8114FD4
+ ldr r0, _08111E78 @ =VBlankCB_EvolutionScene
bl SetVBlankCallback
- ldr r0, _08111E7C @ =sub_8112270
+ ldr r0, _08111E7C @ =CB2_EvolutionSceneUpdate_0
bl SetMainCallback2
movs r0, 0x1
negs r0, r0
@@ -791,9 +791,9 @@ _08111F88:
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
- ldr r0, _08111FD4 @ =nullsub_73
+ ldr r0, _08111FD4 @ =HBlankCB_EvolutionScene
bl SetHBlankCallback
- ldr r0, _08111FD8 @ =sub_811505C
+ ldr r0, _08111FD8 @ =VBlankCB_TradeEvolutionScene
bl SetVBlankCallback
b _081120D6
.align 2, 0
@@ -904,7 +904,7 @@ _081120B4:
movs r2, 0x10
movs r3, 0
bl BeginNormalPaletteFade
- ldr r0, _081120E0 @ =sub_8112290
+ ldr r0, _081120E0 @ =CB2_EvolutionSceneUpdate_1
bl SetMainCallback2
movs r1, 0x80
lsls r1, 19
@@ -1036,7 +1036,7 @@ TradeEvolutionScene: @ 81120E4
orrs r0, r2
strb r0, [r1]
bl sub_8149954
- ldr r0, _08112264 @ =sub_8112FE8
+ ldr r0, _08112264 @ =Task_TradeEvolutionScene
movs r1, 0
bl CreateTask
lsls r1, r0, 24
@@ -1066,7 +1066,7 @@ TradeEvolutionScene: @ 81120E4
strh r1, [r0, 0x1E]
mov r2, r10
strh r2, [r0, 0x20]
- ldr r0, _0811226C @ =sub_8112290
+ ldr r0, _0811226C @ =CB2_EvolutionSceneUpdate_1
bl SetMainCallback2
add sp, 0x24
pop {r3-r5}
@@ -2354,7 +2354,7 @@ _08112D4A:
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, _08112D84 @ =sub_8111C90
+ ldr r3, _08112D84 @ =CB2_EvolutionSceneLoadGraphics
ldr r4, _08112D88 @ =word_2024E82
ldrh r4, [r4]
str r4, [sp]
@@ -2379,7 +2379,7 @@ _08112D8C:
b _08112FD0
_08112D9A:
ldr r1, [r4, 0x4]
- ldr r0, _08112DC4 @ =sub_8112270
+ ldr r0, _08112DC4 @ =CB2_EvolutionSceneUpdate_0
cmp r1, r0
beq _08112DA4
b _08112FD0
@@ -3645,7 +3645,7 @@ _0811388A:
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, _081138C4 @ =sub_8111E80
+ ldr r3, _081138C4 @ =CB2_TradeEvolutionSceneLoadGraphics
ldr r4, _081138C8 @ =word_2024E82
ldrh r4, [r4]
str r4, [sp]
@@ -3671,7 +3671,7 @@ _081138CC:
_081138DA:
ldr r0, _08113904 @ =gMain
ldr r1, [r0, 0x4]
- ldr r0, _08113908 @ =sub_8112290
+ ldr r0, _08113908 @ =CB2_EvolutionSceneUpdate_1
cmp r1, r0
beq _081138E6
b _08113B3A
diff --git a/asm/field_poison.s b/asm/field_poison.s
index 82209060e..c303ac5d1 100644
--- a/asm/field_poison.s
+++ b/asm/field_poison.s
@@ -232,7 +232,7 @@ _080C5820: .4byte gScriptResult
thumb_func_start DoWhiteOut
DoWhiteOut: @ 80C5824
push {lr}
- ldr r0, _080C5838 @ =sub_80C5770
+ ldr r0, _080C5838 @ =Task_WhiteOut
movs r1, 0x50
bl CreateTask
bl ScriptContext1_Stop
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 585718434..cab7524b2 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -1962,7 +1962,7 @@ DoDecorationSoundEffect: @ 80C6C30
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- ldr r0, _080C6C5C @ =sub_80C6AAC
+ ldr r0, _080C6C5C @ =Task_DecorationSoundEffect
movs r1, 0x5
bl CreateTask
lsls r0, 24
@@ -2076,7 +2076,7 @@ DoYellowCave4Sparkle: @ 80C6C90
strb r0, [r4, 0x5]
adds r3, 0x1C
adds r2, r3
- ldr r0, _080C6D38 @ =sub_80C6C64
+ ldr r0, _080C6D38 @ =SpriteCB_YellowCave4Sparkle
str r0, [r2]
movs r0, 0
strh r0, [r4, 0x2E]
@@ -2280,7 +2280,7 @@ _080C6EAA:
bl CurrentMapDrawMetatileAt
movs r0, 0
strh r0, [r5, 0x2E]
- ldr r0, _080C6EE0 @ =sub_80C6EE4
+ ldr r0, _080C6EE0 @ =SpriteCB_SandPillar_1
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
@@ -2314,7 +2314,7 @@ _080C6EF8:
bl CurrentMapDrawMetatileAt
movs r0, 0
strh r0, [r5, 0x2E]
- ldr r0, _080C6F24 @ =sub_80C6F28
+ ldr r0, _080C6F24 @ =SpriteCB_SandPillar_2
str r0, [r5, 0x1C]
_080C6F14:
pop {r4,r5}
@@ -2501,7 +2501,7 @@ DoFieldPoisonEffect: @ 80C7074
push {lr}
movs r0, 0x4F
bl PlaySE
- ldr r0, _080C7088 @ =task50_overworld_posion_effect
+ ldr r0, _080C7088 @ =Task_FieldPoisonEffect
movs r1, 0x50
bl CreateTask
pop {r0}
@@ -2513,7 +2513,7 @@ _080C7088: .4byte Task_FieldPoisonEffect
thumb_func_start FieldPoisonEffectIsRunning
FieldPoisonEffectIsRunning: @ 80C708C
push {lr}
- ldr r0, _080C709C @ =task50_overworld_posion_effect
+ ldr r0, _080C709C @ =Task_FieldPoisonEffect
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
@@ -2532,7 +2532,7 @@ Task_WateringBerryTreeAnim_0: @ 80C70A0
adds r1, r0
lsls r1, 3
adds r1, r2
- ldr r0, _080C70B8 @ =sub_80C70BC
+ ldr r0, _080C70B8 @ =Task_WateringBerryTreeAnim_1
str r0, [r1]
bx lr
.align 2, 0
@@ -2581,7 +2581,7 @@ _080C70E8:
adds r0, r5
lsls r0, 3
adds r0, r1
- ldr r1, _080C712C @ =sub_80C7130
+ ldr r1, _080C712C @ =Task_WateringBerryTreeAnim_2
str r1, [r0]
_080C711A:
pop {r4,r5}
@@ -2638,7 +2638,7 @@ _080C7184: .4byte gPlayerAvatar
_080C7188: .4byte gMapObjects
_080C718C: .4byte gTasks
_080C7190:
- ldr r0, _080C719C @ =sub_80C71A0
+ ldr r0, _080C719C @ =Task_WateringBerryTreeAnim_3
str r0, [r2]
_080C7194:
pop {r4,r5}
@@ -2669,7 +2669,7 @@ Task_WateringBerryTreeAnim_3: @ 80C71A0
thumb_func_start DoWateringBerryTreeAnim
DoWateringBerryTreeAnim: @ 80C71C4
push {lr}
- ldr r0, _080C71D4 @ =sub_80C70A0
+ ldr r0, _080C71D4 @ =Task_WateringBerryTreeAnim_0
movs r1, 0x50
bl CreateTask
pop {r0}
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 82d804bb3..da2792564 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -69,7 +69,7 @@ BedroomPC: @ 8139C74
lsls r0, 24
lsrs r0, 24
ldr r1, _08139CAC @ =gOtherText_WhatWillYouDo
- ldr r2, _08139CB0 @ =sub_8139CF4
+ ldr r2, _08139CB0 @ =InitPlayerPCMenu
movs r3, 0
bl DisplayItemMessageOnField
pop {r0}
@@ -98,7 +98,7 @@ PlayerPC: @ 8139CB4
lsls r0, 24
lsrs r0, 24
ldr r1, _08139CEC @ =gOtherText_WhatWillYouDo
- ldr r2, _08139CF0 @ =sub_8139CF4
+ ldr r2, _08139CF0 @ =InitPlayerPCMenu
movs r3, 0
bl DisplayItemMessageOnField
pop {r0}
@@ -151,7 +151,7 @@ InitPlayerPCMenu: @ 8139CF4
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _08139D60 @ =sub_8139D64
+ ldr r1, _08139D60 @ =PlayerPCProcessMenuInput
str r1, [r0]
add sp, 0x8
pop {r4,r5}
@@ -260,7 +260,7 @@ ReshowPlayerPC: @ 8139E24
lsls r0, 24
lsrs r0, 24
ldr r1, _08139E38 @ =gOtherText_WhatWillYouDo
- ldr r2, _08139E3C @ =sub_8139CF4
+ ldr r2, _08139E3C @ =InitPlayerPCMenu
movs r3, 0
bl DisplayItemMessageOnField
pop {r0}
@@ -283,7 +283,7 @@ PlayerPC_ItemStorage: @ 8139E40
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _08139E68 @ =sub_8139FD4
+ ldr r1, _08139E68 @ =ItemStorageMenuProcessInput
str r1, [r0]
pop {r4}
pop {r0}
@@ -311,7 +311,7 @@ PlayerPC_Mailbox: @ 8139E6C
cmp r0, 0
bne _08139EA8
ldr r1, _08139EA0 @ =gOtherText_NoMailHere
- ldr r2, _08139EA4 @ =sub_8139E24
+ ldr r2, _08139EA4 @ =ReshowPlayerPC
adds r0, r4, 0
movs r3, 0
bl DisplayItemMessageOnField
@@ -581,7 +581,7 @@ ItemStorage_Deposit: @ 813A0A0
adds r1, r0
lsls r1, 3
adds r1, r2
- ldr r0, _0813A0C4 @ =sub_813A078
+ ldr r0, _0813A0C4 @ =Task_ItemStorage_Deposit
str r0, [r1]
movs r0, 0x1
movs r1, 0
@@ -608,7 +608,7 @@ sub_813A0C8: @ 813A0C8
adds r1, r4
lsls r1, 3
adds r1, r0
- ldr r0, _0813A0F4 @ =sub_8139FD4
+ ldr r0, _0813A0F4 @ =ItemStorageMenuProcessInput
str r0, [r1]
_0813A0E8:
pop {r4}
@@ -682,7 +682,7 @@ _0813A174: .4byte gTasks + 0x8
_0813A178: .4byte sub_813A280
_0813A17C:
ldr r1, _0813A190 @ =gOtherText_NoItems
- ldr r2, _0813A194 @ =sub_8139E40
+ ldr r2, _0813A194 @ =PlayerPC_ItemStorage
adds r0, r5, 0
movs r3, 0
bl DisplayItemMessageOnField
@@ -743,7 +743,7 @@ _0813A1F8: .4byte gTasks + 0x8
_0813A1FC: .4byte sub_813A280
_0813A200:
ldr r1, _0813A214 @ =gOtherText_NoItems
- ldr r2, _0813A218 @ =sub_8139E40
+ ldr r2, _0813A218 @ =PlayerPC_ItemStorage
adds r0, r5, 0
movs r3, 0
bl DisplayItemMessageOnField
@@ -1077,7 +1077,7 @@ sub_813A468: @ 813A468
adds r4, r0
ldrb r0, [r4, 0x14]
bl InitItemStorageMenu
- ldr r0, _0813A4B0 @ =sub_8139FD4
+ ldr r0, _0813A4B0 @ =ItemStorageMenuProcessInput
str r0, [r4]
pop {r4,r5}
pop {r0}
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index ba9829dfe..bd8db8a2c 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -13,7 +13,7 @@ UnusedPokedexAreaScreen: @ 8110664
str r1, [r3, 0x4]
str r2, [r3, 0x8]
strh r0, [r3, 0xE]
- ldr r0, _0811067C @ =sub_8110680
+ ldr r0, _0811067C @ =CB2_UnusedPokedexAreaScreen
bl SetMainCallback2
pop {r0}
bx r0
@@ -1761,7 +1761,7 @@ ShowPokedexAreaScreen: @ 81113AC
adds r2, r0
str r1, [r2]
strb r3, [r1]
- ldr r0, _081113E4 @ =sub_81113EC
+ ldr r0, _081113E4 @ =Task_PokedexAreaScreen_0
movs r1, 0
bl CreateTask
lsls r0, 24
@@ -1927,7 +1927,7 @@ _08111528:
adds r0, r5
lsls r0, 3
adds r0, r2
- ldr r1, _0811153C @ =sub_811155C
+ ldr r1, _0811153C @ =Task_PokedexAreaScreen_1
str r1, [r0]
movs r1, 0
strh r1, [r0, 0x8]
diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s
index 950ca5b73..082ebf465 100644
--- a/asm/reset_rtc_screen.s
+++ b/asm/reset_rtc_screen.s
@@ -311,7 +311,7 @@ ResetRtcScreen_CreateCursor: @ 806A69C
adds r4, r6, 0
adds r4, 0x1C
adds r2, r0, r4
- ldr r1, _0806A718 @ =sub_806A480
+ ldr r1, _0806A718 @ =SpriteCB_ResetRtcCusor0
str r1, [r2]
adds r0, r6
strh r5, [r0, 0x2E]
@@ -328,7 +328,7 @@ ResetRtcScreen_CreateCursor: @ 806A69C
adds r0, r1
lsls r0, 2
adds r4, r0, r4
- ldr r1, _0806A720 @ =sub_806A59C
+ ldr r1, _0806A720 @ =SpriteCB_ResetRtcCusor1
str r1, [r4]
adds r0, r6
strh r5, [r0, 0x2E]
@@ -627,7 +627,7 @@ Task_ResetRtc_2: @ 806A92C
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _0806A954 @ =sub_806A914
+ ldr r1, _0806A954 @ =Task_ResetRtc_3
str r1, [r0]
pop {r4}
pop {r0}
@@ -667,7 +667,7 @@ Task_ResetRtc_1: @ 806A958
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
- ldr r1, _0806A9A8 @ =sub_806A92C
+ ldr r1, _0806A9A8 @ =Task_ResetRtc_2
str r1, [r0]
movs r0, 0
strh r0, [r5, 0x2]
@@ -727,7 +727,7 @@ _0806A9D6:
adds r0, r6
lsls r0, 3
adds r0, r1
- ldr r1, _0806AA20 @ =sub_806A92C
+ ldr r1, _0806AA20 @ =Task_ResetRtc_2
str r1, [r0]
strh r4, [r5, 0x2]
movs r0, 0x6
@@ -815,7 +815,7 @@ Task_ResetRtc_0: @ 806AA64
negs r0, r0
add r8, r0
add r6, r8
- ldr r0, _0806AAD4 @ =sub_806A958
+ ldr r0, _0806AAD4 @ =Task_ResetRtc_1
str r0, [r6]
pop {r3}
mov r8, r3
@@ -900,11 +900,11 @@ _0806AB16:
lsls r2, 5
adds r0, r2, 0
strh r0, [r1]
- ldr r0, _0806ABA4 @ =sub_806ABC8
+ ldr r0, _0806ABA4 @ =VBlankCB_ResetRtcScreen
bl SetVBlankCallback
- ldr r0, _0806ABA8 @ =sub_806ABB0
+ ldr r0, _0806ABA8 @ =CB2_ResetRtcScreen
bl SetMainCallback2
- ldr r0, _0806ABAC @ =sub_806ACCC
+ ldr r0, _0806ABAC @ =Task_ResetRtcScreen
movs r1, 0x50
bl CreateTask
add sp, 0x4
@@ -1131,7 +1131,7 @@ _0806AD60: .4byte gSaveFileStatus
_0806AD64: .4byte gSystemText_NoSaveFileNoTime
_0806AD68:
bl RtcCalcLocalTime
- ldr r0, _0806AD7C @ =sub_806ABF4
+ ldr r0, _0806AD7C @ =Task_ShowResetRtcPrompt
movs r1, 0x50
bl CreateTask
lsls r0, 24
@@ -1163,7 +1163,7 @@ _0806AD96:
ldr r0, [r0]
str r0, [r2]
str r1, [r2, 0x4]
- ldr r0, _0806ADD4 @ =sub_806AA64
+ ldr r0, _0806ADD4 @ =Task_ResetRtc_0
movs r1, 0x50
bl CreateTask
lsls r0, 24
diff --git a/asm/rom6.s b/asm/rom6.s
index fcbb69f76..91c92d971 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -4511,7 +4511,7 @@ ReturnFromHallOfFamePC: @ 810D62C
ldr r0, _0810D640 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2
ldr r1, _0810D644 @ =gUnknown_0300485C
- ldr r0, _0810D648 @ =mapldr_080CA5C0
+ ldr r0, _0810D648 @ =ReshowPCMenuAfterHallOfFamePC
str r0, [r1]
pop {r0}
bx r0
@@ -6281,7 +6281,7 @@ _0810E410: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_start FieldShowRegionMap
FieldShowRegionMap: @ 810E414
push {lr}
- ldr r0, _0810E420 @ =sub_810E404
+ ldr r0, _0810E420 @ =CB2_FieldShowRegionMap
bl SetMainCallback2
pop {r0}
bx r0
@@ -6292,7 +6292,7 @@ _0810E420: .4byte CB2_FieldShowRegionMap
thumb_func_start DoPCTurnOnEffect
DoPCTurnOnEffect: @ 810E424
push {r4,lr}
- ldr r4, _0810E460 @ =sub_810E468
+ ldr r4, _0810E460 @ =Task_PCTurnOnEffect
adds r0, r4, 0
bl FuncIsActiveTask
lsls r0, 24
@@ -6586,7 +6586,7 @@ _0810E634: .4byte gSaveBlock1
thumb_func_start DoLotteryCornerComputerEffect
DoLotteryCornerComputerEffect: @ 810E638
push {r4,lr}
- ldr r4, _0810E674 @ =sub_810E67C
+ ldr r4, _0810E674 @ =Task_LotteryCornerComputerEffect
adds r0, r4, 0
bl FuncIsActiveTask
lsls r0, 24
diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s
index 5c1f75667..e11d5fad9 100644
--- a/asm/rom_813BA94.s
+++ b/asm/rom_813BA94.s
@@ -6706,7 +6706,7 @@ FieldInitRegionMap: @ 813EEB4
movs r0, 0
strh r0, [r1]
str r4, [r2]
- ldr r0, _0813EEE0 @ =sub_813EEE4
+ ldr r0, _0813EEE0 @ =CB2_FieldInitRegionMap
bl SetMainCallback2
pop {r4}
pop {r0}
@@ -6779,9 +6779,9 @@ CB2_FieldInitRegionMap: @ 813EEE4
movs r3, 0x13
bl MenuDrawTextWindow
bl sub_813F0C8
- ldr r0, _0813EFA8 @ =sub_813EFC4
+ ldr r0, _0813EFA8 @ =CB2_FieldRegionMap
bl SetMainCallback2
- ldr r0, _0813EFAC @ =sub_813EFB0
+ ldr r0, _0813EFAC @ =VBlankCB_FieldRegionMap
bl SetVBlankCallback
movs r0, 0x1
negs r0, r0
diff --git a/asm/roulette.s b/asm/roulette.s
index 2551af009..c94d51157 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -4829,7 +4829,7 @@ _081177F8: .4byte sub_81175DC
PlayRoulette: @ 81177FC
push {lr}
bl ScriptContext2_Enable
- ldr r0, _08117828 @ =sub_81176A8
+ ldr r0, _08117828 @ =Task_Roulette_0
movs r1, 0
bl CreateTask
lsls r0, 24
@@ -7796,7 +7796,7 @@ _08118F64:
adds r1, 0x98
ldr r0, _08118F84 @ =0x3dae147b
str r0, [r1]
- ldr r0, _08118F88 @ =prev_quest_read_x24_hm_usage
+ ldr r0, _08118F88 @ =sub_8118D2C
str r0, [r7, 0x1C]
movs r0, 0x5
strh r0, [r7, 0x30]
diff --git a/asm/script_pokemon_util_80C4BF0.s b/asm/script_pokemon_util_80C4BF0.s
index ad598120c..b579877d6 100644
--- a/asm/script_pokemon_util_80C4BF0.s
+++ b/asm/script_pokemon_util_80C4BF0.s
@@ -464,10 +464,10 @@ ShowContestWinner: @ 80C4F10
bl sub_80B2A7C
strb r5, [r6]
_080C4F40:
- ldr r0, _080C4F64 @ =sub_8106668
+ ldr r0, _080C4F64 @ =CB2_ContestPainting
bl SetMainCallback2
ldr r1, _080C4F68 @ =gMain
- ldr r0, _080C4F6C @ =sub_80C4F00
+ ldr r0, _080C4F6C @ =ShowContestWinnerCleanup
str r0, [r1, 0x8]
pop {r4-r6}
pop {r0}
@@ -1294,7 +1294,7 @@ _080C55AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
ChooseBattleTowerPlayerParty: @ 80C55B0
push {lr}
ldr r1, _080C55C0 @ =gMain
- ldr r0, _080C55C4 @ =sub_80C55C8
+ ldr r0, _080C55C4 @ =SetBattleTowerPlayerParty
str r0, [r1, 0x8]
bl sub_8121E34
pop {r0}
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 474d0d531..bf00894ad 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -2276,7 +2276,7 @@ _080BC600: .4byte 0x00001a09
thumb_func_start SecretBasePC_Decoration
SecretBasePC_Decoration: @ 80BC604
push {lr}
- ldr r0, _080BC614 @ =sub_80FE264
+ ldr r0, _080BC614 @ =Task_SecretBasePC_Decoration
movs r1, 0
bl CreateTask
pop {r0}
@@ -2288,7 +2288,7 @@ _080BC614: .4byte Task_SecretBasePC_Decoration
thumb_func_start SecretBasePC_Registry
SecretBasePC_Registry: @ 80BC618
push {lr}
- ldr r0, _080BC628 @ =sub_80BC62C
+ ldr r0, _080BC628 @ =Task_SecretBasePC_Registry
movs r1, 0
bl CreateTask
pop {r0}
diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s
index 1e072ee64..b47229d2b 100644
--- a/asm/sound_check_menu.s
+++ b/asm/sound_check_menu.s
@@ -363,7 +363,7 @@ sub_80BA384: @ 80BA384
movs r1, 0xB
movs r2, 0xF
bl sub_80BA79C
- ldr r0, _080BA3FC @ =Task_HandleMainMenuInput
+ ldr r0, _080BA3FC @ =sub_80BA65C
str r0, [r4]
pop {r4}
pop {r0}
diff --git a/asm/title_screen.s b/asm/title_screen.s
index d8e7d8efd..2d233a47a 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -1060,7 +1060,7 @@ _0807C67A:
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- ldr r0, _0807C6B0 @ =sub_807C774
+ ldr r0, _0807C6B0 @ =CB2_GoToMainMenu
bl SetMainCallback2
b _0807C74E
.align 2, 0
@@ -1076,7 +1076,7 @@ _0807C6B4:
ands r0, r1
cmp r0, 0x46
bne _0807C6C4
- ldr r0, _0807C6F4 @ =sub_807C7AC
+ ldr r0, _0807C6F4 @ =CB2_GoToClearSaveDataScreen
bl SetMainCallback2
_0807C6C4:
ldrh r1, [r4, 0x2C]
@@ -1096,7 +1096,7 @@ _0807C6C4:
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- ldr r0, _0807C6F8 @ =sub_807C7C8
+ ldr r0, _0807C6F8 @ =CB2_GoToResetRtcScreen
bl SetMainCallback2
b _0807C74E
.align 2, 0
@@ -1196,7 +1196,7 @@ CB2_GoToClearSaveDataScreen: @ 807C7AC
lsls r0, 24
cmp r0, 0
bne _0807C7BE
- ldr r0, _0807C7C4 @ =c2_clear_save_data_screen_2
+ ldr r0, _0807C7C4 @ =CB2_InitClearSaveDataScreen
bl SetMainCallback2
_0807C7BE:
pop {r0}
@@ -1212,7 +1212,7 @@ CB2_GoToResetRtcScreen: @ 807C7C8
lsls r0, 24
cmp r0, 0
bne _0807C7DA
- ldr r0, _0807C7E0 @ =sub_806AAD8
+ ldr r0, _0807C7E0 @ =CB2_InitResetRtcScreen
bl SetMainCallback2
_0807C7DA:
pop {r0}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 17:36:41 +0000