summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/cable_car.s4
-rw-r--r--asm/choose_party.s4
-rw-r--r--asm/contest.s4
-rw-r--r--asm/egg_hatch.s4
-rw-r--r--asm/field_effect.s56
-rw-r--r--asm/field_fadetransition.s28
-rw-r--r--asm/fldeff_80C5CD4.s12
-rw-r--r--asm/fldeff_flash.s4
-rw-r--r--asm/item_menu.s32
-rw-r--r--asm/learn_move.s4
-rw-r--r--asm/menu_helpers.s18
-rw-r--r--asm/pokeblock.s14
-rw-r--r--asm/pokemon_menu.s24
-rw-r--r--asm/pokemon_storage_system.s4
-rw-r--r--asm/roulette.s8
-rw-r--r--asm/secret_base.s10
-rw-r--r--asm/shop.s14
-rw-r--r--asm/trade.s4
18 files changed, 124 insertions, 124 deletions
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 47afb097f..e4d989844 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -742,7 +742,7 @@ _081237E0:
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
bl warp_in
- ldr r0, _08123870 @ =gUnknown_0300485C
+ ldr r0, _08123870 @ =gFieldCallback
str r4, [r0]
ldr r0, _08123874 @ =CB2_LoadMap
bl SetMainCallback2
@@ -760,7 +760,7 @@ _08123860: .4byte 0x040000d4
_08123864: .4byte 0x85000400
_08123868: .4byte gUnknown_02039274
_0812386C: .4byte 0x81000800
-_08123870: .4byte gUnknown_0300485C
+_08123870: .4byte gFieldCallback
_08123874: .4byte CB2_LoadMap
thumb_func_end sub_8123740
diff --git a/asm/choose_party.s b/asm/choose_party.s
index 09f00ac77..f1a03cda3 100644
--- a/asm/choose_party.s
+++ b/asm/choose_party.s
@@ -2455,7 +2455,7 @@ sub_8123170: @ 8123170
ands r0, r1
cmp r0, 0
bne _08123194
- ldr r0, _081231A0 @ =gUnknown_0300485C
+ ldr r0, _081231A0 @ =gFieldCallback
ldr r1, _081231A4 @ =sub_81231AC
str r1, [r0]
ldr r0, _081231A8 @ =c2_exit_to_overworld_2_switch
@@ -2468,7 +2468,7 @@ _08123194:
bx r0
.align 2, 0
_0812319C: .4byte gPaletteFade
-_081231A0: .4byte gUnknown_0300485C
+_081231A0: .4byte gFieldCallback
_081231A4: .4byte sub_81231AC
_081231A8: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8123170
diff --git a/asm/contest.s b/asm/contest.s
index 1f92f6fad..00c4013a3 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -5585,7 +5585,7 @@ sub_80ADFD8: @ 80ADFD8
bne _080ADFFC
adds r0, r2, 0
bl DestroyTask
- ldr r0, _080AE004 @ =gUnknown_0300485C
+ ldr r0, _080AE004 @ =gFieldCallback
ldr r1, _080AE008 @ =sub_80AE010
str r1, [r0]
ldr r0, _080AE00C @ =c2_exit_to_overworld_2_switch
@@ -5595,7 +5595,7 @@ _080ADFFC:
bx r0
.align 2, 0
_080AE000: .4byte gPaletteFade
-_080AE004: .4byte gUnknown_0300485C
+_080AE004: .4byte gFieldCallback
_080AE008: .4byte sub_80AE010
_080AE00C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80ADFD8
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index 101f9e5c3..7365f4da6 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -351,7 +351,7 @@ Task_EggHatch: @ 8042CAC
bne _08042CD0
ldr r0, _08042CDC @ =CB2_EggHatch_0
bl SetMainCallback2
- ldr r1, _08042CE0 @ =gUnknown_0300485C
+ ldr r1, _08042CE0 @ =gFieldCallback
ldr r0, _08042CE4 @ =sub_8080990
str r0, [r1]
adds r0, r4, 0
@@ -363,7 +363,7 @@ _08042CD0:
.align 2, 0
_08042CD8: .4byte gPaletteFade
_08042CDC: .4byte CB2_EggHatch_0
-_08042CE0: .4byte gUnknown_0300485C
+_08042CE0: .4byte gFieldCallback
_08042CE4: .4byte sub_8080990
thumb_func_end Task_EggHatch
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 2dfa491dc..a0a2c732f 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1571,14 +1571,14 @@ sub_80865BC: @ 80865BC
push {lr}
ldr r0, _080865D0 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2
- ldr r1, _080865D4 @ =gUnknown_0300485C
+ ldr r1, _080865D4 @ =gFieldCallback
ldr r0, _080865D8 @ =mapldr_080842E8
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080865D0: .4byte c2_exit_to_overworld_2_switch
-_080865D4: .4byte gUnknown_0300485C
+_080865D4: .4byte gFieldCallback
_080865D8: .4byte mapldr_080842E8
thumb_func_end sub_80865BC
@@ -1591,14 +1591,14 @@ mapldr_080842E8: @ 80865DC
bl CreateTask
bl ScriptContext2_Enable
bl FreezeMapObjects
- ldr r1, _08086600 @ =gUnknown_0300485C
+ ldr r1, _08086600 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_080865FC: .4byte task00_8084310
-_08086600: .4byte gUnknown_0300485C
+_08086600: .4byte gFieldCallback
thumb_func_end mapldr_080842E8
thumb_func_start task00_8084310
@@ -1642,7 +1642,7 @@ _08086640:
bl warp_in
ldr r0, _08086678 @ =CB2_LoadMap
bl SetMainCallback2
- ldr r1, _0808667C @ =gUnknown_0300485C
+ ldr r1, _0808667C @ =gFieldCallback
ldr r0, _08086680 @ =mapldr_08084390
str r0, [r1]
adds r0, r6, 0
@@ -1656,7 +1656,7 @@ _0808666C: .4byte gTasks
_08086670: .4byte gUnknown_0202FF84
_08086674: .4byte gLastFieldPokeMenuOpened
_08086678: .4byte CB2_LoadMap
-_0808667C: .4byte gUnknown_0300485C
+_0808667C: .4byte gFieldCallback
_08086680: .4byte mapldr_08084390
thumb_func_end task00_8084310
@@ -1694,7 +1694,7 @@ mapldr_08084390: @ 8086684
_080866C6:
bl ScriptContext2_Enable
bl FreezeMapObjects
- ldr r1, _080866E8 @ =gUnknown_0300485C
+ ldr r1, _080866E8 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r4}
@@ -1704,7 +1704,7 @@ _080866C6:
_080866DC: .4byte c3_080843F8
_080866E0: .4byte gMapObjects
_080866E4: .4byte gPlayerAvatar
-_080866E8: .4byte gUnknown_0300485C
+_080866E8: .4byte gFieldCallback
thumb_func_end mapldr_08084390
thumb_func_start c3_080843F8
@@ -1762,14 +1762,14 @@ sub_8086748: @ 8086748
ldr r0, _0808676C @ =sub_8086774
movs r1, 0
bl CreateTask
- ldr r1, _08086770 @ =gUnknown_0300485C
+ ldr r1, _08086770 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_0808676C: .4byte sub_8086774
-_08086770: .4byte gUnknown_0300485C
+_08086770: .4byte gFieldCallback
thumb_func_end sub_8086748
thumb_func_start sub_8086774
@@ -2429,7 +2429,7 @@ sub_8086C40: @ 8086C40
bne _08086C7C
bl sub_80B483C
bl warp_in
- ldr r1, _08086C84 @ =gUnknown_0300485C
+ ldr r1, _08086C84 @ =gFieldCallback
ldr r0, _08086C88 @ =sub_8086C94
str r0, [r1]
ldr r0, _08086C8C @ =CB2_LoadMap
@@ -2444,7 +2444,7 @@ _08086C7C:
bx r0
.align 2, 0
_08086C80: .4byte gPaletteFade
-_08086C84: .4byte gUnknown_0300485C
+_08086C84: .4byte gFieldCallback
_08086C88: .4byte sub_8086C94
_08086C8C: .4byte CB2_LoadMap
_08086C90: .4byte sub_8086A68
@@ -2459,14 +2459,14 @@ sub_8086C94: @ 8086C94
ldr r0, _08086CB4 @ =sub_8086CBC
movs r1, 0
bl CreateTask
- ldr r1, _08086CB8 @ =gUnknown_0300485C
+ ldr r1, _08086CB8 @ =gFieldCallback
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08086CB4: .4byte sub_8086CBC
-_08086CB8: .4byte gUnknown_0300485C
+_08086CB8: .4byte gFieldCallback
thumb_func_end sub_8086C94
thumb_func_start sub_8086CBC
@@ -3447,7 +3447,7 @@ sub_80873F4: @ 80873F4
cmp r0, 0x1
bne _0808742C
bl warp_in
- ldr r1, _08087438 @ =gUnknown_0300485C
+ ldr r1, _08087438 @ =gFieldCallback
ldr r0, _0808743C @ =mapldr_080851BC
str r0, [r1]
ldr r0, _08087440 @ =CB2_LoadMap
@@ -3463,7 +3463,7 @@ _0808742C:
bx r1
.align 2, 0
_08087434: .4byte gPaletteFade
-_08087438: .4byte gUnknown_0300485C
+_08087438: .4byte gFieldCallback
_0808743C: .4byte mapldr_080851BC
_08087440: .4byte CB2_LoadMap
_08087444: .4byte sub_80871D0
@@ -3475,7 +3475,7 @@ mapldr_080851BC: @ 8087448
bl sub_8053E90
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
- ldr r0, _08087468 @ =gUnknown_0300485C
+ ldr r0, _08087468 @ =gFieldCallback
movs r1, 0
str r1, [r0]
ldr r0, _0808746C @ =sub_8087470
@@ -3483,7 +3483,7 @@ mapldr_080851BC: @ 8087448
pop {r0}
bx r0
.align 2, 0
-_08087468: .4byte gUnknown_0300485C
+_08087468: .4byte gFieldCallback
_0808746C: .4byte sub_8087470
thumb_func_end mapldr_080851BC
@@ -3951,7 +3951,7 @@ sub_80877D4: @ 80877D4
cmp r0, 0x1
bne _0808780C
bl warp_in
- ldr r1, _08087818 @ =gUnknown_0300485C
+ ldr r1, _08087818 @ =gFieldCallback
ldr r0, _0808781C @ =sub_8086748
str r0, [r1]
ldr r0, _08087820 @ =CB2_LoadMap
@@ -3967,7 +3967,7 @@ _0808780C:
bx r1
.align 2, 0
_08087814: .4byte gPaletteFade
-_08087818: .4byte gUnknown_0300485C
+_08087818: .4byte gFieldCallback
_0808781C: .4byte sub_8086748
_08087820: .4byte CB2_LoadMap
_08087824: .4byte sub_808766C
@@ -4159,7 +4159,7 @@ _08087966:
bl FieldObjectSetDirection
bl sub_8053678
bl warp_in
- ldr r1, _080879C8 @ =gUnknown_0300485C
+ ldr r1, _080879C8 @ =gFieldCallback
ldr r0, _080879CC @ =mapldr_080859D4
str r0, [r1]
ldr r0, _080879D0 @ =CB2_LoadMap
@@ -4175,7 +4175,7 @@ _080879B8: .4byte gUnknown_0839F380
_080879BC: .4byte gPlayerAvatar
_080879C0: .4byte gMapObjects
_080879C4: .4byte gPaletteFade
-_080879C8: .4byte gUnknown_0300485C
+_080879C8: .4byte gFieldCallback
_080879CC: .4byte mapldr_080859D4
_080879D0: .4byte CB2_LoadMap
_080879D4: .4byte sub_80878C4
@@ -4230,7 +4230,7 @@ mapldr_080859D4: @ 8087A28
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
bl FreezeMapObjects
- ldr r1, _08087A64 @ =gUnknown_0300485C
+ ldr r1, _08087A64 @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08087A68 @ =gMapObjects
@@ -4250,7 +4250,7 @@ mapldr_080859D4: @ 8087A28
pop {r0}
bx r0
.align 2, 0
-_08087A64: .4byte gUnknown_0300485C
+_08087A64: .4byte gFieldCallback
_08087A68: .4byte gMapObjects
_08087A6C: .4byte gPlayerAvatar
_08087A70: .4byte sub_8087A74
@@ -4664,7 +4664,7 @@ sub_8087D78: @ 8087D78
bl warp_in
ldr r0, _08087DBC @ =CB2_LoadMap
bl SetMainCallback2
- ldr r1, _08087DC0 @ =gUnknown_0300485C
+ ldr r1, _08087DC0 @ =gFieldCallback
ldr r0, _08087DC4 @ =mapldr_08085D88
str r0, [r1]
ldr r0, _08087DC8 @ =sub_8087BBC
@@ -4678,7 +4678,7 @@ _08087DB4:
.align 2, 0
_08087DB8: .4byte gPaletteFade
_08087DBC: .4byte CB2_LoadMap
-_08087DC0: .4byte gUnknown_0300485C
+_08087DC0: .4byte gFieldCallback
_08087DC4: .4byte mapldr_08085D88
_08087DC8: .4byte sub_8087BBC
thumb_func_end sub_8087D78
@@ -4690,7 +4690,7 @@ mapldr_08085D88: @ 8087DCC
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
bl FreezeMapObjects
- ldr r1, _08087E0C @ =gUnknown_0300485C
+ ldr r1, _08087E0C @ =gFieldCallback
movs r0, 0
str r0, [r1]
ldr r2, _08087E10 @ =gMapObjects
@@ -4711,7 +4711,7 @@ mapldr_08085D88: @ 8087DCC
pop {r0}
bx r0
.align 2, 0
-_08087E0C: .4byte gUnknown_0300485C
+_08087E0C: .4byte gFieldCallback
_08087E10: .4byte gMapObjects
_08087E14: .4byte gPlayerAvatar
_08087E18: .4byte sub_8087E1C
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s
index 798285a45..e882e7030 100644
--- a/asm/field_fadetransition.s
+++ b/asm/field_fadetransition.s
@@ -617,7 +617,7 @@ sub_8080E88: @ 8080E88
bl PlayRainSoundEffect
movs r0, 0x9
bl PlaySE
- ldr r0, _08080EB4 @ =gUnknown_0300485C
+ ldr r0, _08080EB4 @ =gFieldCallback
ldr r1, _08080EB8 @ =mapldr_default
str r1, [r0]
ldr r0, _08080EBC @ =task0A_fade_n_map_maybe
@@ -626,7 +626,7 @@ sub_8080E88: @ 8080E88
pop {r0}
bx r0
.align 2, 0
-_08080EB4: .4byte gUnknown_0300485C
+_08080EB4: .4byte gFieldCallback
_08080EB8: .4byte mapldr_default
_08080EBC: .4byte task0A_fade_n_map_maybe
thumb_func_end sub_8080E88
@@ -638,7 +638,7 @@ sp13E_warp_to_last_warp: @ 8080EC0
bl sub_8053FF8
bl fade_8080918
bl PlayRainSoundEffect
- ldr r0, _08080EE4 @ =gUnknown_0300485C
+ ldr r0, _08080EE4 @ =gFieldCallback
ldr r1, _08080EE8 @ =mapldr_default
str r1, [r0]
ldr r0, _08080EEC @ =task0A_fade_n_map_maybe
@@ -647,7 +647,7 @@ sp13E_warp_to_last_warp: @ 8080EC0
pop {r0}
bx r0
.align 2, 0
-_08080EE4: .4byte gUnknown_0300485C
+_08080EE4: .4byte gFieldCallback
_08080EE8: .4byte mapldr_default
_08080EEC: .4byte task0A_fade_n_map_maybe
thumb_func_end sp13E_warp_to_last_warp
@@ -656,7 +656,7 @@ _08080EEC: .4byte task0A_fade_n_map_maybe
sub_8080EF0: @ 8080EF0
push {lr}
bl ScriptContext2_Enable
- ldr r0, _08080F08 @ =gUnknown_0300485C
+ ldr r0, _08080F08 @ =gFieldCallback
ldr r1, _08080F0C @ =mapldr_default
str r1, [r0]
ldr r0, _08080F10 @ =sub_808115C
@@ -665,7 +665,7 @@ sub_8080EF0: @ 8080EF0
pop {r0}
bx r0
.align 2, 0
-_08080F08: .4byte gUnknown_0300485C
+_08080F08: .4byte gFieldCallback
_08080F0C: .4byte mapldr_default
_08080F10: .4byte sub_808115C
thumb_func_end sub_8080EF0
@@ -674,13 +674,13 @@ _08080F10: .4byte sub_808115C
sp13F_fall_to_last_warp: @ 8080F14
push {lr}
bl sp13E_warp_to_last_warp
- ldr r1, _08080F24 @ =gUnknown_0300485C
+ ldr r1, _08080F24 @ =gFieldCallback
ldr r0, _08080F28 @ =sub_8086748
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
-_08080F24: .4byte gUnknown_0300485C
+_08080F24: .4byte gFieldCallback
_08080F28: .4byte sub_8086748
thumb_func_end sp13F_fall_to_last_warp
@@ -730,14 +730,14 @@ sub_8080F68: @ 8080F68
ldr r0, _08080F90 @ =task0A_fade_n_map_maybe
movs r1, 0xA
bl CreateTask
- ldr r1, _08080F94 @ =gUnknown_0300485C
+ ldr r1, _08080F94 @ =gFieldCallback
ldr r0, _08080F98 @ =sub_8080B78
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08080F90: .4byte task0A_fade_n_map_maybe
-_08080F94: .4byte gUnknown_0300485C
+_08080F94: .4byte gFieldCallback
_08080F98: .4byte sub_8080B78
thumb_func_end sub_8080F68
@@ -749,14 +749,14 @@ sub_8080F9C: @ 8080F9C
ldr r0, _08080FB8 @ =task0A_fade_n_map_maybe
movs r1, 0xA
bl CreateTask
- ldr r1, _08080FBC @ =gUnknown_0300485C
+ ldr r1, _08080FBC @ =gFieldCallback
ldr r0, _08080FC0 @ =sub_80C791C
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08080FB8: .4byte task0A_fade_n_map_maybe
-_08080FBC: .4byte gUnknown_0300485C
+_08080FBC: .4byte gFieldCallback
_08080FC0: .4byte sub_80C791C
thumb_func_end sub_8080F9C
@@ -1204,7 +1204,7 @@ sub_8081334: @ 8081334
bl PlayRainSoundEffect
movs r0, 0x9
bl PlaySE
- ldr r0, _08081360 @ =gUnknown_0300485C
+ ldr r0, _08081360 @ =gFieldCallback
ldr r1, _08081364 @ =sub_8080B60
str r1, [r0]
ldr r0, _08081368 @ =sub_80812C8
@@ -1213,7 +1213,7 @@ sub_8081334: @ 8081334
pop {r0}
bx r0
.align 2, 0
-_08081360: .4byte gUnknown_0300485C
+_08081360: .4byte gFieldCallback
_08081364: .4byte sub_8080B60
_08081368: .4byte sub_80812C8
thumb_func_end sub_8081334
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 25ede5738..33182fc6a 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -814,7 +814,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
cmp r0, 0x1
bne _080C6330
bl sub_80C6264
- ldr r1, _080C6320 @ =gUnknown_0300485C
+ ldr r1, _080C6320 @ =gFieldCallback
ldr r0, _080C6324 @ =sub_808AB90
str r0, [r1]
ldr r1, _080C6328 @ =gUnknown_03005CE4
@@ -823,7 +823,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
.align 2, 0
_080C6318: .4byte gScriptResult
_080C631C: .4byte gUnknown_0203923C
-_080C6320: .4byte gUnknown_0300485C
+_080C6320: .4byte gFieldCallback
_080C6324: .4byte sub_808AB90
_080C6328: .4byte gUnknown_03005CE4
_080C632C: .4byte sub_80C639C
@@ -835,14 +835,14 @@ _080C6330:
cmp r0, 0x1
bne _080C6360
bl sub_80C6264
- ldr r1, _080C6350 @ =gUnknown_0300485C
+ ldr r1, _080C6350 @ =gFieldCallback
ldr r0, _080C6354 @ =sub_808AB90
str r0, [r1]
ldr r1, _080C6358 @ =gUnknown_03005CE4
ldr r0, _080C635C @ =sub_80C64A8
b _080C6380
.align 2, 0
-_080C6350: .4byte gUnknown_0300485C
+_080C6350: .4byte gFieldCallback
_080C6354: .4byte sub_808AB90
_080C6358: .4byte gUnknown_03005CE4
_080C635C: .4byte sub_80C64A8
@@ -858,7 +858,7 @@ _080C636E:
b _080C6384
_080C6372:
bl sub_80C6264
- ldr r1, _080C638C @ =gUnknown_0300485C
+ ldr r1, _080C638C @ =gFieldCallback
ldr r0, _080C6390 @ =sub_808AB90
str r0, [r1]
ldr r1, _080C6394 @ =gUnknown_03005CE4
@@ -871,7 +871,7 @@ _080C6384:
pop {r1}
bx r1
.align 2, 0
-_080C638C: .4byte gUnknown_0300485C
+_080C638C: .4byte gFieldCallback
_080C6390: .4byte sub_808AB90
_080C6394: .4byte gUnknown_03005CE4
_080C6398: .4byte sub_80C660C
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s
index c14e9057d..dcd485d9f 100644
--- a/asm/fldeff_flash.s
+++ b/asm/fldeff_flash.s
@@ -18,7 +18,7 @@ SetUpFieldMove_Flash: @ 810CBB4
lsls r0, 24
cmp r0, 0
bne _0810CBF4
- ldr r1, _0810CBE4 @ =gUnknown_0300485C
+ ldr r1, _0810CBE4 @ =gFieldCallback
ldr r0, _0810CBE8 @ =sub_808AB90
str r0, [r1]
ldr r1, _0810CBEC @ =gUnknown_03005CE4
@@ -29,7 +29,7 @@ SetUpFieldMove_Flash: @ 810CBB4
.align 2, 0
_0810CBDC: .4byte gMapHeader
_0810CBE0: .4byte 0x00000828
-_0810CBE4: .4byte gUnknown_0300485C
+_0810CBE4: .4byte gFieldCallback
_0810CBE8: .4byte sub_808AB90
_0810CBEC: .4byte gUnknown_03005CE4
_0810CBF0: .4byte sub_810CBFC
diff --git a/asm/item_menu.s b/asm/item_menu.s
index bb6e59f54..b76f24ccf 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -812,13 +812,13 @@ sub_80A37C0: @ 80A37C0
ldr r0, _080A37F4 @ =sub_80A50C8
str r0, [r1]
movs r0, 0
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x1
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x2
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x3
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
pop {r0}
bx r0
.align 2, 0
@@ -3784,13 +3784,13 @@ sub_80A4E8C: @ 80A4E8C
movs r1, 0x1
bl sub_80F979C
movs r0, 0
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x1
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x2
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x3
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
ldr r5, _080A4F04 @ =gBGTilemapBuffers + 0x1000
lsls r4, 24
asrs r4, 24
@@ -5786,7 +5786,7 @@ sub_80A5EA0: @ 80A5EA0
bl sub_80A5DA0
ldr r1, _080A5EF4 @ =gUnknown_083C16F4
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
b _080A5F0C
.align 2, 0
_080A5EE8: .4byte gMain
@@ -6302,7 +6302,7 @@ sub_80A631C: @ 80A631C
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080A6344 @ =gUnknown_0300485C
+ ldr r2, _080A6344 @ =gFieldCallback
ldr r1, _080A6348 @ =sub_80B3050
str r1, [r2]
ldr r2, _080A634C @ =gTasks
@@ -6318,7 +6318,7 @@ sub_80A631C: @ 80A631C
pop {r0}
bx r0
.align 2, 0
-_080A6344: .4byte gUnknown_0300485C
+_080A6344: .4byte gFieldCallback
_080A6348: .4byte sub_80B3050
_080A634C: .4byte gTasks
_080A6350: .4byte c2_exit_to_overworld_2_switch
@@ -6695,7 +6695,7 @@ sub_80A6650: @ 80A6650
bl sub_80A5D78
ldr r1, _080A666C @ =gUnknown_083C16FC
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
pop {r4}
pop {r0}
bx r0
@@ -7202,8 +7202,8 @@ sub_80A6A4C: @ 80A6A4C
push {lr}
lsls r0, 24
lsrs r0, 24
- ldr r2, _080A6A74 @ =gUnknown_0300485C
- ldr r1, _080A6A78 @ =sub_813A0F8
+ ldr r2, _080A6A74 @ =gFieldCallback
+ ldr r1, _080A6A78 @ =ItemStorage_ReturnToMenuAfterDeposit
str r1, [r2]
ldr r2, _080A6A7C @ =gTasks
lsls r1, r0, 2
@@ -7218,8 +7218,8 @@ sub_80A6A4C: @ 80A6A4C
pop {r0}
bx r0
.align 2, 0
-_080A6A74: .4byte gUnknown_0300485C
-_080A6A78: .4byte sub_813A0F8
+_080A6A74: .4byte gFieldCallback
+_080A6A78: .4byte ItemStorage_ReturnToMenuAfterDeposit
_080A6A7C: .4byte gTasks
_080A6A80: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A6A4C
diff --git a/asm/learn_move.s b/asm/learn_move.s
index 84d244fe8..fdf650a08 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -51,7 +51,7 @@ sub_813269C: @ 813269C
bne _081326C0
ldr r0, _081326CC @ =sub_81326D8
bl SetMainCallback2
- ldr r1, _081326D0 @ =gUnknown_0300485C
+ ldr r1, _081326D0 @ =gFieldCallback
ldr r0, _081326D4 @ =sub_8080990
str r0, [r1]
adds r0, r4, 0
@@ -63,7 +63,7 @@ _081326C0:
.align 2, 0
_081326C8: .4byte gPaletteFade
_081326CC: .4byte sub_81326D8
-_081326D0: .4byte gUnknown_0300485C
+_081326D0: .4byte gFieldCallback
_081326D4: .4byte sub_8080990
thumb_func_end sub_813269C
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index f10070110..0f5caf3da 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -161,8 +161,8 @@ _080F9140:
_080F9148: .4byte gUnknown_020388C4
thumb_func_end Task_CallYesOrNoCallback
- thumb_func_start sub_80F914C
-sub_80F914C: @ 80F914C
+ thumb_func_start DoYesNoFuncWithChoice
+DoYesNoFuncWithChoice: @ 80F914C
lsls r0, 24
lsrs r0, 24
ldr r3, _080F916C @ =gUnknown_020388C4
@@ -182,7 +182,7 @@ sub_80F914C: @ 80F914C
_080F916C: .4byte gUnknown_020388C4
_080F9170: .4byte gTasks
_080F9174: .4byte Task_CallYesOrNoCallback
- thumb_func_end sub_80F914C
+ thumb_func_end DoYesNoFuncWithChoice
thumb_func_start brm_trade_1
brm_trade_1: @ 80F9178
@@ -1207,8 +1207,8 @@ _080F98D4: .4byte gSprites
_080F98D8: .4byte SpriteCallbackDummy
thumb_func_end sub_80F98A4
- thumb_func_start sub_80F98DC
-sub_80F98DC: @ 80F98DC
+ thumb_func_start StartVerticalScrollIndicators
+StartVerticalScrollIndicators: @ 80F98DC
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -1235,7 +1235,7 @@ _080F9902:
_080F9908: .4byte gUnknown_020388C0
_080F990C: .4byte gSprites
_080F9910: .4byte sub_80F9834
- thumb_func_end sub_80F98DC
+ thumb_func_end StartVerticalScrollIndicators
thumb_func_start sub_80F9914
sub_80F9914: @ 80F9914
@@ -1284,8 +1284,8 @@ _080F9964: .4byte gUnknown_020388C0
_080F9968: .4byte gSprites
thumb_func_end sub_80F9914
- thumb_func_start sub_80F996C
-sub_80F996C: @ 80F996C
+ thumb_func_start PauseVerticalScrollIndicator
+PauseVerticalScrollIndicator: @ 80F996C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -1297,7 +1297,7 @@ sub_80F996C: @ 80F996C
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80F996C
+ thumb_func_end PauseVerticalScrollIndicator
thumb_func_start sub_80F9988
sub_80F9988: @ 80F9988
diff --git a/asm/pokeblock.s b/asm/pokeblock.s
index 669811f53..74da210b0 100644
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -1539,7 +1539,7 @@ sub_810C2C8: @ 810C2C8
ldrb r0, [r4]
cmp r0, 0x3
bne _0810C2E8
- ldr r1, _0810C310 @ =gUnknown_0300485C
+ ldr r1, _0810C310 @ =gFieldCallback
ldr r0, _0810C314 @ =sub_8080990
str r0, [r1]
_0810C2E8:
@@ -1559,7 +1559,7 @@ _0810C300:
.align 2, 0
_0810C308: .4byte gPaletteFade
_0810C30C: .4byte gUnknown_02039244
-_0810C310: .4byte gUnknown_0300485C
+_0810C310: .4byte gFieldCallback
_0810C314: .4byte sub_8080990
_0810C318: .4byte gUnknown_083F7EA8
thumb_func_end sub_810C2C8
@@ -1912,7 +1912,7 @@ sub_810C5EC: @ 810C5EC
bl DisplayYesNoMenu
ldr r1, _0810C60C @ =gUnknown_083F7F24
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
pop {r4}
pop {r0}
bx r0
@@ -1965,9 +1965,9 @@ sub_810C668: @ 810C668
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x1
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
ldr r2, _0810C6CC @ =gUnknown_02039248
ldrb r0, [r2, 0x2]
ldrb r1, [r2, 0x3]
@@ -2075,9 +2075,9 @@ sub_810C748: @ 810C748
lsls r4, 24
lsrs r4, 24
movs r0, 0
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x1
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
bl HandleDestroyMenuCursors
movs r0, 0x7
movs r1, 0x4
diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s
index 110ccb6e4..3a1552f70 100644
--- a/asm/pokemon_menu.s
+++ b/asm/pokemon_menu.s
@@ -2215,7 +2215,7 @@ SetUpFieldMove_Surf: @ 808AC48
lsrs r0, 24
cmp r0, 0x1
bne _0808AC84
- ldr r1, _0808AC74 @ =gUnknown_0300485C
+ ldr r1, _0808AC74 @ =gFieldCallback
ldr r0, _0808AC78 @ =sub_808AB90
str r0, [r1]
ldr r1, _0808AC7C @ =gUnknown_03005CE4
@@ -2224,7 +2224,7 @@ SetUpFieldMove_Surf: @ 808AC48
movs r0, 0x1
b _0808AC86
.align 2, 0
-_0808AC74: .4byte gUnknown_0300485C
+_0808AC74: .4byte gFieldCallback
_0808AC78: .4byte sub_808AB90
_0808AC7C: .4byte gUnknown_03005CE4
_0808AC80: .4byte sub_808AC2C
@@ -2258,14 +2258,14 @@ SetUpFieldMove_Fly: @ 808ACA8
lsls r0, 24
cmp r0, 0
beq _0808ACD0
- ldr r1, _0808ACC0 @ =gUnknown_0300485C
+ ldr r1, _0808ACC0 @ =gFieldCallback
ldr r0, _0808ACC4 @ =sub_808AB90
str r0, [r1]
ldr r1, _0808ACC8 @ =gUnknown_03005CE4
ldr r0, _0808ACCC @ =DoBrailleFlyEffect
b _0808ACF2
.align 2, 0
-_0808ACC0: .4byte gUnknown_0300485C
+_0808ACC0: .4byte gFieldCallback
_0808ACC4: .4byte sub_808AB90
_0808ACC8: .4byte gUnknown_03005CE4
_0808ACCC: .4byte DoBrailleFlyEffect
@@ -2282,7 +2282,7 @@ _0808ACD0:
.align 2, 0
_0808ACE4: .4byte gMapHeader
_0808ACE8:
- ldr r1, _0808ACFC @ =gUnknown_0300485C
+ ldr r1, _0808ACFC @ =gFieldCallback
ldr r0, _0808AD00 @ =sub_808AB90
str r0, [r1]
ldr r1, _0808AD04 @ =gUnknown_03005CE4
@@ -2294,7 +2294,7 @@ _0808ACF6:
pop {r1}
bx r1
.align 2, 0
-_0808ACFC: .4byte gUnknown_0300485C
+_0808ACFC: .4byte gFieldCallback
_0808AD00: .4byte sub_808AB90
_0808AD04: .4byte gUnknown_03005CE4
_0808AD08: .4byte sub_808AC8C
@@ -2411,7 +2411,7 @@ SetUpFieldMove_Dive: @ 808ADC8
.align 2, 0
_0808ADE0: .4byte gUnknown_0202FF84
_0808ADE4:
- ldr r1, _0808ADF8 @ =gUnknown_0300485C
+ ldr r1, _0808ADF8 @ =gFieldCallback
ldr r0, _0808ADFC @ =sub_808AB90
str r0, [r1]
ldr r1, _0808AE00 @ =gUnknown_03005CE4
@@ -2422,7 +2422,7 @@ _0808ADF2:
pop {r1}
bx r1
.align 2, 0
-_0808ADF8: .4byte gUnknown_0300485C
+_0808ADF8: .4byte gFieldCallback
_0808ADFC: .4byte sub_808AB90
_0808AE00: .4byte gUnknown_03005CE4
_0808AE04: .4byte sub_808ADAC
@@ -2471,7 +2471,7 @@ SetUpFieldMove_Waterfall: @ 808AE24
lsrs r0, 24
cmp r0, 0x1
bne _0808AE80
- ldr r1, _0808AE70 @ =gUnknown_0300485C
+ ldr r1, _0808AE70 @ =gFieldCallback
ldr r0, _0808AE74 @ =sub_808AB90
str r0, [r1]
ldr r1, _0808AE78 @ =gUnknown_03005CE4
@@ -2480,7 +2480,7 @@ SetUpFieldMove_Waterfall: @ 808AE24
movs r0, 0x1
b _0808AE82
.align 2, 0
-_0808AE70: .4byte gUnknown_0300485C
+_0808AE70: .4byte gFieldCallback
_0808AE74: .4byte sub_808AB90
_0808AE78: .4byte gUnknown_03005CE4
_0808AE7C: .4byte sub_808AE08
@@ -2997,7 +2997,7 @@ sub_808B288: @ 808B288
ands r0, r1
cmp r0, 0
bne _0808B2A6
- ldr r0, _0808B2B0 @ =sub_813B6F8
+ ldr r0, _0808B2B0 @ =Mailbox_ReturnToMailListAfterDeposit
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
@@ -3007,7 +3007,7 @@ _0808B2A6:
bx r0
.align 2, 0
_0808B2AC: .4byte gPaletteFade
-_0808B2B0: .4byte sub_813B6F8
+_0808B2B0: .4byte Mailbox_ReturnToMailListAfterDeposit
thumb_func_end sub_808B288
thumb_func_start sub_808B2B4
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index b3ef00ecf..db16c2788 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1171,7 +1171,7 @@ sub_80961A8: @ 80961A8
ldr r0, [r0]
ldrb r0, [r0, 0x5]
strb r0, [r1]
- ldr r1, _080961CC @ =gUnknown_0300485C
+ ldr r1, _080961CC @ =gFieldCallback
ldr r0, _080961D0 @ =sub_8096130
str r0, [r1]
ldr r0, _080961D4 @ =c2_exit_to_overworld_2_switch
@@ -1181,7 +1181,7 @@ sub_80961A8: @ 80961A8
.align 2, 0
_080961C4: .4byte gUnknown_02038474
_080961C8: .4byte gUnknown_083B6DB4
-_080961CC: .4byte gUnknown_0300485C
+_080961CC: .4byte gFieldCallback
_080961D0: .4byte sub_8096130
_080961D4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80961A8
diff --git a/asm/roulette.s b/asm/roulette.s
index 6382ecf0b..fcfedbd80 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -733,7 +733,7 @@ sub_8115734: @ 8115734
bl MenuPrint
ldr r1, _08115778 @ =gUnknown_083F8EBC
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
pop {r4}
pop {r0}
bx r0
@@ -3245,7 +3245,7 @@ sub_8116B40: @ 8116B40
strh r4, [r0]
adds r0, 0x2
strh r4, [r0]
- ldr r1, _08116BB4 @ =gUnknown_0300485C
+ ldr r1, _08116BB4 @ =gFieldCallback
ldr r0, _08116BB8 @ =sub_8080990
str r0, [r1]
ldr r0, _08116BBC @ =c2_exit_to_overworld_2_switch
@@ -3261,7 +3261,7 @@ _08116BA4: .4byte 0x02019000
_08116BA8: .4byte gSpriteCoordOffsetX
_08116BAC: .4byte gSpriteCoordOffsetY
_08116BB0: .4byte REG_BLDCNT
-_08116BB4: .4byte gUnknown_0300485C
+_08116BB4: .4byte gFieldCallback
_08116BB8: .4byte sub_8080990
_08116BBC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8116B40
@@ -4483,7 +4483,7 @@ sub_81174F8: @ 81174F8
bl sub_814AAF8
ldr r1, _08117524 @ =gUnknown_083F8EB4
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
pop {r4}
pop {r0}
bx r0
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 020953dbe..9fd741aa0 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -671,9 +671,9 @@ sub_80BC980: @ 80BC980
lsls r4, 24
lsrs r4, 24
movs r0, 0
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x1
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x1
movs r1, 0
movs r2, 0xC
@@ -840,7 +840,7 @@ sub_80BCAEC: @ 80BCAEC
bl DisplayYesNoMenu
ldr r1, _080BCB0C @ =gUnknown_083D13E4
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
pop {r4}
pop {r0}
bx r0
@@ -994,9 +994,9 @@ sub_80BCBF8: @ 80BCBF8
movs r3, 0x5
bl MenuZeroFillWindowRect
movs r0, 0
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x1
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
subs r5, 0x8
adds r4, r5
ldr r0, _080BCC50 @ =sub_80BC824
diff --git a/asm/shop.s b/asm/shop.s
index ba4c53885..a341e90a1 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1222,7 +1222,7 @@ sub_80B3D38: @ 80B3D38
bl sub_80A3FA0
ldr r1, _080B3D78 @ =gUnknown_083CC708
adds r0, r4, 0
- bl sub_80F914C
+ bl DoYesNoFuncWithChoice
add sp, 0x8
pop {r4}
pop {r0}
@@ -1767,9 +1767,9 @@ _080B41B8:
b _080B4350
_080B41CE:
movs r0, 0
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x1
- bl sub_80F996C
+ bl PauseVerticalScrollIndicator
movs r0, 0x1
movs r1, 0x1
bl sub_80F979C
@@ -1978,9 +1978,9 @@ sub_80B4378: @ 80B4378
bl sub_80B3764
bl sub_80B37EC
movs r0, 0
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
movs r0, 0x1
- bl sub_80F98DC
+ bl StartVerticalScrollIndicators
bl sub_80B32A4
ldr r1, _080B43E8 @ =gTasks
lsls r0, r4, 2
@@ -2006,7 +2006,7 @@ sub_80B43F0: @ 80B43F0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r1, _080B4428 @ =gUnknown_0300485C
+ ldr r1, _080B4428 @ =gFieldCallback
ldr r0, _080B442C @ =sub_80B3050
str r0, [r1]
movs r0, 0x1
@@ -2028,7 +2028,7 @@ sub_80B43F0: @ 80B43F0
pop {r0}
bx r0
.align 2, 0
-_080B4428: .4byte gUnknown_0300485C
+_080B4428: .4byte gFieldCallback
_080B442C: .4byte sub_80B3050
_080B4430: .4byte gTasks
_080B4434: .4byte Task_ExitBuyMenu
diff --git a/asm/trade.s b/asm/trade.s
index a26afa254..e4d45ec73 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -12051,7 +12051,7 @@ sub_804E1A0: @ 804E1A0
bne _0804E1C4
ldr r0, _0804E1D0 @ =sub_804B790
bl SetMainCallback2
- ldr r1, _0804E1D4 @ =gUnknown_0300485C
+ ldr r1, _0804E1D4 @ =gFieldCallback
ldr r0, _0804E1D8 @ =sub_8080990
str r0, [r1]
adds r0, r4, 0
@@ -12063,7 +12063,7 @@ _0804E1C4:
.align 2, 0
_0804E1CC: .4byte gPaletteFade
_0804E1D0: .4byte sub_804B790
-_0804E1D4: .4byte gUnknown_0300485C
+_0804E1D4: .4byte gFieldCallback
_0804E1D8: .4byte sub_8080990
thumb_func_end sub_804E1A0
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 23:39:35 +0000