summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-10-25 20:11:00 -0700
committerYamaArashi <shadow962@live.com>2016-10-25 20:11:00 -0700
commit84037f37f22abb24b91a655461ce353ad4c1f22f (patch)
tree6a6f6ca44ccb3d4111de392c18d59e0f19d027e3
parentfb2f1c8bce95cbe584fbd674b8e7865d2bc84bc6 (diff)
rename functions
Diffstat
-rw-r--r--asm/battle_records.s42
-rw-r--r--asm/cable_car.s8
-rw-r--r--asm/coins.s28
-rw-r--r--asm/decoration.s16
-rw-r--r--asm/easy_chat.s4
-rw-r--r--asm/evolution_scene.s140
-rw-r--r--asm/landmark.s14
-rw-r--r--asm/menu_helpers.s6
-rw-r--r--asm/pokedex.s32
-rw-r--r--asm/pokedex_area_screen.s140
-rw-r--r--asm/pokedex_cry_screen.s12
-rw-r--r--asm/pokenav.s4
-rw-r--r--asm/region_map.s22
-rw-r--r--asm/rom3.s2
-rw-r--r--asm/rom6.s482
-rw-r--r--asm/rom_803D1FC.s20
-rw-r--r--asm/rom_8065394.s6
-rw-r--r--asm/rom_806936C.s2
-rw-r--r--asm/rom_806D7F8.s4
-rw-r--r--asm/rom_8094928.s4
-rw-r--r--asm/rom_81258BC.s22
-rw-r--r--asm/rom_813BA94.s32
-rw-r--r--asm/roulette.s8
-rw-r--r--asm/secret_base.s12
-rw-r--r--asm/sound_check_menu.s4
-rw-r--r--asm/trade.s4
-rw-r--r--asm/trader.s4
-rw-r--r--asm/tv.s16
-rw-r--r--data/specials.s102
-rw-r--r--src/new_game.c2
-rw-r--r--src/pokedex.c30
-rw-r--r--src/rom4.c6
-rw-r--r--src/save_menu_util.c6
-rw-r--r--src/scrcmd.c24
-rw-r--r--src/start_menu.c4
35 files changed, 632 insertions, 632 deletions
diff --git a/asm/battle_records.s b/asm/battle_records.s
index aaf7911b2..86f6f4ff0 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -33,8 +33,8 @@ sub_810FF78: @ 810FF78
_0810FFA4: .4byte 0x01000008
thumb_func_end sub_810FF78
- thumb_func_start sub_810FFA8
-sub_810FFA8: @ 810FFA8
+ thumb_func_start InitLinkBattleRecords_
+InitLinkBattleRecords_: @ 810FFA8
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0x4
@@ -57,7 +57,7 @@ _0810FFAE:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_810FFA8
+ thumb_func_end InitLinkBattleRecords_
thumb_func_start sub_810FFDC
sub_810FFDC: @ 810FFDC
@@ -350,16 +350,16 @@ _081101CC:
bx r0
thumb_func_end sub_8110158
- thumb_func_start GameFreakRTC_Reset
-GameFreakRTC_Reset: @ 81101EC
+ thumb_func_start InitLinkBattleRecords
+InitLinkBattleRecords: @ 81101EC
push {lr}
ldr r0, _081101F8 @ =gSaveBlock1 + 0x30B8
- bl sub_810FFA8
+ bl InitLinkBattleRecords_
pop {r0}
bx r0
.align 2, 0
_081101F8: .4byte gSaveBlock1 + 0x30B8
- thumb_func_end GameFreakRTC_Reset
+ thumb_func_end InitLinkBattleRecords
thumb_func_start sub_81101FC
sub_81101FC: @ 81101FC
@@ -483,8 +483,8 @@ _081102E0: .4byte gLinkPlayers
_081102E4: .4byte gUnknown_02029818
thumb_func_end sub_8110290
- thumb_func_start sub_81102E8
-sub_81102E8: @ 81102E8
+ thumb_func_start PrintLinkBattleWinsLossesDraws
+PrintLinkBattleWinsLossesDraws: @ 81102E8
push {r4,lr}
ldr r4, _08110338 @ =gStringVar1
movs r0, 0x17
@@ -522,10 +522,10 @@ _08110338: .4byte gStringVar1
_0811033C: .4byte gStringVar2
_08110340: .4byte gStringVar3
_08110344: .4byte gOtherText_WinRecord
- thumb_func_end sub_81102E8
+ thumb_func_end PrintLinkBattleWinsLossesDraws
- thumb_func_start sub_8110348
-sub_8110348: @ 8110348
+ thumb_func_start PrintLinkBattleRecord
+PrintLinkBattleRecord: @ 8110348
push {r4-r7,lr}
sub sp, 0x10
adds r7, r0, 0
@@ -633,10 +633,10 @@ _0811042E:
bx r0
.align 2, 0
_08110438: .4byte gStringVar1
- thumb_func_end sub_8110348
+ thumb_func_end PrintLinkBattleRecord
- thumb_func_start sub_811043C
-sub_811043C: @ 811043C
+ thumb_func_start ShowLinkBattleRecords
+ShowLinkBattleRecords: @ 811043C
push {r4,lr}
movs r0, 0x1
movs r1, 0
@@ -649,7 +649,7 @@ sub_811043C: @ 811043C
movs r3, 0xF0
bl sub_8072BD8
ldr r0, _0811048C @ =gSaveBlock1 + 0x30B8
- bl sub_81102E8
+ bl PrintLinkBattleWinsLossesDraws
ldr r0, _08110490 @ =gOtherText_WinLoseDraw
movs r1, 0xC
movs r2, 0x6
@@ -665,7 +665,7 @@ _08110468:
lsls r2, 19
adds r1, r2
lsrs r1, 24
- bl sub_8110348
+ bl PrintLinkBattleRecord
cmp r4, 0x4
ble _08110468
pop {r4}
@@ -675,7 +675,7 @@ _08110468:
_08110488: .4byte gOtherText_BattleResults
_0811048C: .4byte gSaveBlock1 + 0x30B8
_08110490: .4byte gOtherText_WinLoseDraw
- thumb_func_end sub_811043C
+ thumb_func_end ShowLinkBattleRecords
thumb_func_start sub_8110494
sub_8110494: @ 8110494
@@ -847,8 +847,8 @@ _081105D8:
_081105E0: .4byte gOtherText_Prev
thumb_func_end sub_8110594
- thumb_func_start sub_81105E4
-sub_81105E4: @ 81105E4
+ thumb_func_start ShowBattleTowerRecords
+ShowBattleTowerRecords: @ 81105E4
push {r4,lr}
movs r0, 0x3
movs r1, 0x1
@@ -903,6 +903,6 @@ _08110614:
_08110658: .4byte gOtherText_BattleTowerResults
_0811065C: .4byte gOtherText_Lv50
_08110660: .4byte gOtherText_Lv100
- thumb_func_end sub_81105E4
+ thumb_func_end ShowBattleTowerRecords
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/cable_car.s b/asm/cable_car.s
index 1d094ba8d..719f4f7b6 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -578,7 +578,7 @@ _081236B0:
_081236E4: .4byte 0x04000208
_081236E8: .4byte 0x04000200
_081236EC: .4byte sub_8123C40
-_081236F0: .4byte mainloop
+_081236F0: .4byte sub_8123724
_081236F4: .4byte sub_8123878
_081236F8: .4byte gUnknown_0202E8CC
_081236FC: .4byte sub_81239E4
@@ -604,8 +604,8 @@ _0812371C: .4byte sub_8123AF8
_08123720: .4byte gUnknown_02039274
thumb_func_end sub_8123244
- thumb_func_start mainloop
-mainloop: @ 8123724
+ thumb_func_start sub_8123724
+sub_8123724: @ 8123724
push {lr}
bl RunTasks
bl AnimateSprites
@@ -614,7 +614,7 @@ mainloop: @ 8123724
bl MapMusicMain
pop {r0}
bx r0
- thumb_func_end mainloop
+ thumb_func_end sub_8123724
thumb_func_start sub_8123740
sub_8123740: @ 8123740
diff --git a/asm/coins.s b/asm/coins.s
index 164e75007..5b9726fbb 100644
--- a/asm/coins.s
+++ b/asm/coins.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start sub_811A704
-sub_811A704: @ 811A704
+ thumb_func_start UpdateCoinsWindow
+UpdateCoinsWindow: @ 811A704
push {r4,lr}
adds r4, r1, 0
adds r3, r2, 0
@@ -23,14 +23,14 @@ sub_811A704: @ 811A704
lsrs r3, 24
movs r1, 0x4
adds r2, r4, 0
- bl sub_811A798
+ bl PrintCoins
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_811A704
+ thumb_func_end UpdateCoinsWindow
- thumb_func_start sub_811A72C
-sub_811A72C: @ 811A72C
+ thumb_func_start ShowCoinsWindow
+ShowCoinsWindow: @ 811A72C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -56,16 +56,16 @@ sub_811A72C: @ 811A72C
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
- bl sub_811A704
+ bl UpdateCoinsWindow
pop {r3}
mov r8, r3
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_811A72C
+ thumb_func_end ShowCoinsWindow
- thumb_func_start sub_811A770
-sub_811A770: @ 811A770
+ thumb_func_start HideCoinsWindow
+HideCoinsWindow: @ 811A770
push {r4,lr}
adds r2, r0, 0
adds r3, r1, 0
@@ -85,10 +85,10 @@ sub_811A770: @ 811A770
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_811A770
+ thumb_func_end HideCoinsWindow
- thumb_func_start sub_811A798
-sub_811A798: @ 811A798
+ thumb_func_start PrintCoins
+PrintCoins: @ 811A798
push {r4-r7,lr}
sub sp, 0x10
adds r4, r0, 0
@@ -158,7 +158,7 @@ _0811A7EA:
.align 2, 0
_0811A824: .4byte gStringVar1
_0811A828: .4byte gOtherText_Coins2
- thumb_func_end sub_811A798
+ thumb_func_end PrintCoins
thumb_func_start GetCoins
GetCoins: @ 811A82C
diff --git a/asm/decoration.s b/asm/decoration.s
index b241ba0a9..08b25c0db 100644
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -1118,7 +1118,7 @@ sub_80FEABC: @ 80FEABC
cmp r0, 0
bne _080FEADE
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
ldrb r0, [r4]
cmp r0, 0
beq _080FEAE8
@@ -1136,7 +1136,7 @@ _080FEAE8:
cmp r0, r1
bne _080FEAFC
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_080FEAFC:
ldrb r0, [r5]
adds r0, 0x7
@@ -1734,9 +1734,9 @@ sub_80FEF74: @ 80FEF74
movs r1, 0x8
bl sub_80F9520
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
bl sub_8072DEC
movs r0, 0
movs r1, 0
@@ -1856,9 +1856,9 @@ sub_80FF058: @ 80FF058
movs r1, 0x8
bl sub_80F9520
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
bl BuyMenuFreeMemory
ldr r1, _080FF090 @ =gTasks
lsls r0, r4, 2
@@ -2690,9 +2690,9 @@ _080FF6DA:
adds r0, r6, 0
bl sub_80FF0E0
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
ldr r0, _080FF710 @ =gUnknown_020388F7
movs r1, 0x8
bl sub_80F9520
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index 5a37c3185..5b80f2da5 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -10021,7 +10021,7 @@ sub_80EAE88: @ 80EAE88
b _080EAEC2
_080EAEA6:
movs r0, 0
- bl sub_8090F68
+ bl GetHoennPokedexCount
lsls r0, 16
lsrs r0, 16
b _080EAEC2
@@ -11563,7 +11563,7 @@ _080EB9C4: .4byte 0x0000ffff
thumb_func_start sub_80EB9C8
sub_80EB9C8: @ 80EB9C8
push {lr}
- bl sub_806912C
+ bl IsNationalPokedex
lsls r0, 24
lsrs r0, 24
pop {r1}
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 125f7d0e7..8453e277f 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -6,17 +6,17 @@
.text
- thumb_func_start sub_8111894
-sub_8111894: @ 8111894
+ thumb_func_start CB2_BeginEvolutionScene
+CB2_BeginEvolutionScene: @ 8111894
push {lr}
bl UpdatePaletteFade
bl RunTasks
pop {r0}
bx r0
- thumb_func_end sub_8111894
+ thumb_func_end CB2_BeginEvolutionScene
- thumb_func_start sub_81118A4
-sub_81118A4: @ 81118A4
+ thumb_func_start Task_BeginEvolutionScene
+Task_BeginEvolutionScene: @ 81118A4
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -72,7 +72,7 @@ _081118E4:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
- bl evolution_cutscene
+ bl EvolutionScene
_08111918:
add sp, 0x4
pop {r4-r7}
@@ -80,10 +80,10 @@ _08111918:
bx r0
.align 2, 0
_08111920: .4byte gPaletteFade
- thumb_func_end sub_81118A4
+ thumb_func_end Task_BeginEvolutionScene
- thumb_func_start sub_8111924
-sub_8111924: @ 8111924
+ thumb_func_start BeginEvolutionScene
+BeginEvolutionScene: @ 8111924
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -125,13 +125,13 @@ sub_8111924: @ 8111924
pop {r0}
bx r0
.align 2, 0
-_08111978: .4byte sub_81118A4
+_08111978: .4byte Task_BeginEvolutionScene
_0811197C: .4byte gTasks
-_08111980: .4byte sub_8111894
- thumb_func_end sub_8111924
+_08111980: .4byte CB2_BeginEvolutionScene
+ thumb_func_end BeginEvolutionScene
- thumb_func_start evolution_cutscene
-evolution_cutscene: @ 8111984
+ thumb_func_start EvolutionScene
+EvolutionScene: @ 8111984
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -448,17 +448,17 @@ _08111C64: .4byte gDummySpriteAffineAnimTable
_08111C68: .4byte 0x02014800
_08111C6C: .4byte gSprites
_08111C70: .4byte nullsub_37
-_08111C74: .4byte sub_811240C
+_08111C74: .4byte Task_EvolutionScene
_08111C78: .4byte gTasks
_08111C7C: .4byte 0x02009000
_08111C80: .4byte gPlttBufferUnfaded + 0x40
-_08111C84: .4byte nullsub_73
-_08111C88: .4byte sub_8114FD4
-_08111C8C: .4byte sub_8112270
- thumb_func_end evolution_cutscene
+_08111C84: .4byte HBlankCB_EvolutionScene
+_08111C88: .4byte VBlankCB_EvolutionScene
+_08111C8C: .4byte CB2_EvolutionSceneUpdate_0
+ thumb_func_end EvolutionScene
- thumb_func_start sub_8111C90
-sub_8111C90: @ 8111C90
+ thumb_func_start CB2_EvolutionSceneLoadGraphics
+CB2_EvolutionSceneLoadGraphics: @ 8111C90
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -656,13 +656,13 @@ _08111E64: .4byte gUnknown_02024E8C
_08111E68: .4byte gDummySpriteAffineAnimTable
_08111E6C: .4byte gSprites
_08111E70: .4byte nullsub_37
-_08111E74: .4byte nullsub_73
-_08111E78: .4byte sub_8114FD4
-_08111E7C: .4byte sub_8112270
- thumb_func_end sub_8111C90
+_08111E74: .4byte HBlankCB_EvolutionScene
+_08111E78: .4byte VBlankCB_EvolutionScene
+_08111E7C: .4byte CB2_EvolutionSceneUpdate_0
+ thumb_func_end CB2_EvolutionSceneLoadGraphics
- thumb_func_start sub_8111E80
-sub_8111E80: @ 8111E80
+ thumb_func_start CB2_TradeEvolutionSceneLoadGraphics
+CB2_TradeEvolutionSceneLoadGraphics: @ 8111E80
push {r4-r7,lr}
sub sp, 0x8
ldr r2, _08111EB8 @ =gTasks
@@ -800,8 +800,8 @@ _08111F88:
_08111FC8: .4byte gUnknown_03004828
_08111FCC: .4byte gMain
_08111FD0: .4byte 0x0000043c
-_08111FD4: .4byte nullsub_73
-_08111FD8: .4byte sub_811505C
+_08111FD4: .4byte HBlankCB_EvolutionScene
+_08111FD8: .4byte VBlankCB_TradeEvolutionScene
_08111FDC:
bl sub_804E22C
b _08112088
@@ -918,11 +918,11 @@ _081120D6:
pop {r0}
bx r0
.align 2, 0
-_081120E0: .4byte sub_8112290
- thumb_func_end sub_8111E80
+_081120E0: .4byte CB2_EvolutionSceneUpdate_1
+ thumb_func_end CB2_TradeEvolutionSceneLoadGraphics
- thumb_func_start sub_81120E4
-sub_81120E4: @ 81120E4
+ thumb_func_start TradeEvolutionScene
+TradeEvolutionScene: @ 81120E4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1089,13 +1089,13 @@ _08112254: .4byte gUnknown_02024E8C
_08112258: .4byte gDummySpriteAffineAnimTable
_0811225C: .4byte gSprites
_08112260: .4byte nullsub_37
-_08112264: .4byte sub_8112FE8
+_08112264: .4byte Task_TradeEvolutionScene
_08112268: .4byte gTasks
-_0811226C: .4byte sub_8112290
- thumb_func_end sub_81120E4
+_0811226C: .4byte CB2_EvolutionSceneUpdate_1
+ thumb_func_end TradeEvolutionScene
- thumb_func_start sub_8112270
-sub_8112270: @ 8112270
+ thumb_func_start CB2_EvolutionSceneUpdate_0
+CB2_EvolutionSceneUpdate_0: @ 8112270
push {lr}
bl AnimateSprites
bl BuildOamBuffer
@@ -1107,10 +1107,10 @@ sub_8112270: @ 8112270
bx r0
.align 2, 0
_0811228C: .4byte gUnknown_03004210
- thumb_func_end sub_8112270
+ thumb_func_end CB2_EvolutionSceneUpdate_0
- thumb_func_start sub_8112290
-sub_8112290: @ 8112290
+ thumb_func_start CB2_EvolutionSceneUpdate_1
+CB2_EvolutionSceneUpdate_1: @ 8112290
push {lr}
bl AnimateSprites
bl BuildOamBuffer
@@ -1124,10 +1124,10 @@ sub_8112290: @ 8112290
bx r0
.align 2, 0
_081122B0: .4byte gUnknown_03004828
- thumb_func_end sub_8112290
+ thumb_func_end CB2_EvolutionSceneUpdate_1
- thumb_func_start sub_81122B4
-sub_81122B4: @ 81122B4
+ thumb_func_start CreateShedinja
+CreateShedinja: @ 81122B4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1278,10 +1278,10 @@ _081123FC: .4byte gPlayerParty
_08112400: .4byte gSpeciesNames
_08112404: .4byte 0x0000012f
_08112408: .4byte gUnknown_083F868C
- thumb_func_end sub_81122B4
+ thumb_func_end CreateShedinja
- thumb_func_start sub_811240C
-sub_811240C: @ 811240C
+ thumb_func_start Task_EvolutionScene
+Task_EvolutionScene: @ 811240C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1856,7 +1856,7 @@ _0811290A:
bne _0811291A
ldrh r0, [r4, 0xE]
mov r1, r9
- bl sub_81122B4
+ bl CreateShedinja
_0811291A:
adds r0, r7, 0
bl DestroyTask
@@ -2367,7 +2367,7 @@ _08112D4A:
_08112D78: .4byte gPaletteFade
_08112D7C: .4byte gPlayerParty
_08112D80: .4byte gPlayerPartyCount
-_08112D84: .4byte sub_8111C90
+_08112D84: .4byte CB2_EvolutionSceneLoadGraphics
_08112D88: .4byte word_2024E82
_08112D8C:
ldr r0, _08112DC0 @ =gPaletteFade
@@ -2398,7 +2398,7 @@ _08112DA4:
b _08112FCE
.align 2, 0
_08112DC0: .4byte gPaletteFade
-_08112DC4: .4byte sub_8112270
+_08112DC4: .4byte CB2_EvolutionSceneUpdate_0
_08112DC8: .4byte gTasks
_08112DCC:
adds r1, r6, 0
@@ -2638,10 +2638,10 @@ _08112FD0:
.align 2, 0
_08112FE0: .4byte gUnknown_03004210
_08112FE4: .4byte gTasks
- thumb_func_end sub_811240C
+ thumb_func_end Task_EvolutionScene
- thumb_func_start sub_8112FE8
-sub_8112FE8: @ 8112FE8
+ thumb_func_start Task_TradeEvolutionScene
+Task_TradeEvolutionScene: @ 8112FE8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -3480,7 +3480,7 @@ _0811371C:
beq _08113742
movs r0, 0x5
bl PlaySE
- bl nullsub_24
+ bl HBlankCB_TradeEvolutionScene
movs r0, 0
strb r0, [r4, 0x1]
bl sub_81150D8
@@ -3497,7 +3497,7 @@ _08113742:
bne _08113768
movs r0, 0x5
bl PlaySE
- bl nullsub_24
+ bl HBlankCB_TradeEvolutionScene
movs r0, 0x1
strb r0, [r4, 0x1]
bl sub_81150D8
@@ -3658,7 +3658,7 @@ _0811388A:
_081138B8: .4byte gPaletteFade
_081138BC: .4byte gPlayerParty
_081138C0: .4byte gPlayerPartyCount
-_081138C4: .4byte sub_8111E80
+_081138C4: .4byte CB2_TradeEvolutionSceneLoadGraphics
_081138C8: .4byte word_2024E82
_081138CC:
ldr r0, _08113900 @ =gPaletteFade
@@ -3691,7 +3691,7 @@ _081138E6:
.align 2, 0
_08113900: .4byte gPaletteFade
_08113904: .4byte gMain
-_08113908: .4byte sub_8112290
+_08113908: .4byte CB2_EvolutionSceneUpdate_1
_0811390C: .4byte gTasks
_08113910:
adds r1, r6, 0
@@ -3948,7 +3948,7 @@ _08113B3A:
.align 2, 0
_08113B48: .4byte gUnknown_03004828
_08113B4C: .4byte gTasks
- thumb_func_end sub_8112FE8
+ thumb_func_end Task_TradeEvolutionScene
thumb_func_start unref_sub_8113B50
unref_sub_8113B50: @ 8113B50
@@ -6575,13 +6575,13 @@ _08114FCA:
bx r1
thumb_func_end sub_8114E48
- thumb_func_start nullsub_73
-nullsub_73: @ 8114FD0
+ thumb_func_start HBlankCB_EvolutionScene
+HBlankCB_EvolutionScene: @ 8114FD0
bx lr
- thumb_func_end nullsub_73
+ thumb_func_end HBlankCB_EvolutionScene
- thumb_func_start sub_8114FD4
-sub_8114FD4: @ 8114FD4
+ thumb_func_start VBlankCB_EvolutionScene
+VBlankCB_EvolutionScene: @ 8114FD4
push {lr}
ldr r1, _08115034 @ =REG_BG0CNT
ldr r2, _08115038 @ =0x00009803
@@ -6636,10 +6636,10 @@ _0811504C: .4byte gUnknown_03004288
_08115050: .4byte gUnknown_03004280
_08115054: .4byte gUnknown_030041B0
_08115058: .4byte gUnknown_030041B8
- thumb_func_end sub_8114FD4
+ thumb_func_end VBlankCB_EvolutionScene
- thumb_func_start sub_811505C
-sub_811505C: @ 811505C
+ thumb_func_start VBlankCB_TradeEvolutionScene
+VBlankCB_TradeEvolutionScene: @ 811505C
push {lr}
ldr r1, _081150B4 @ =REG_BG0HOFS
ldr r0, _081150B8 @ =gUnknown_030042A4
@@ -6689,7 +6689,7 @@ _081150C8: .4byte gUnknown_03004288
_081150CC: .4byte gUnknown_03004280
_081150D0: .4byte gUnknown_030041B0
_081150D4: .4byte gUnknown_030041B8
- thumb_func_end sub_811505C
+ thumb_func_end VBlankCB_TradeEvolutionScene
thumb_func_start sub_81150D8
sub_81150D8: @ 81150D8
@@ -6709,9 +6709,9 @@ sub_81150D8: @ 81150D8
_081150F4: .4byte gUnknown_02024D1E
thumb_func_end sub_81150D8
- thumb_func_start nullsub_24
-nullsub_24: @ 81150F8
+ thumb_func_start HBlankCB_TradeEvolutionScene
+HBlankCB_TradeEvolutionScene: @ 81150F8
bx lr
- thumb_func_end nullsub_24
+ thumb_func_end HBlankCB_TradeEvolutionScene
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/landmark.s b/asm/landmark.s
index 7eed817a4..05f509dfe 100644
--- a/asm/landmark.s
+++ b/asm/landmark.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start sub_811A8CC
-sub_811A8CC: @ 811A8CC
+ thumb_func_start GetLandmarkName
+GetLandmarkName: @ 811A8CC
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -15,7 +15,7 @@ sub_811A8CC: @ 811A8CC
lsrs r1, 24
lsls r2, 24
lsrs r5, r2, 24
- bl sub_811A920
+ bl GetLandmarkList
adds r4, r0, 0
cmp r4, 0
bne _0811A8E8
@@ -55,10 +55,10 @@ _0811A91A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_811A8CC
+ thumb_func_end GetLandmarkName
- thumb_func_start sub_811A920
-sub_811A920: @ 811A920
+ thumb_func_start GetLandmarkList
+GetLandmarkList: @ 811A920
push {r4-r6,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -127,6 +127,6 @@ _0811A992:
bx r1
.align 2, 0
_0811A998: .4byte gLandmarkLists
- thumb_func_end sub_811A920
+ thumb_func_end GetLandmarkList
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index d8d77ab07..28f8a2959 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -1059,8 +1059,8 @@ _080F97D8: .4byte gUnknown_020388C0
_080F97DC: .4byte gSprites
thumb_func_end sub_80F979C
- thumb_func_start SetBgTilemapBuffer
-SetBgTilemapBuffer: @ 80F97E0
+ thumb_func_start DestroyVerticalScrollIndicator
+DestroyVerticalScrollIndicator: @ 80F97E0
push {r4,lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -1087,7 +1087,7 @@ _080F9808:
.align 2, 0
_080F9810: .4byte gUnknown_020388C0
_080F9814: .4byte gSprites
- thumb_func_end SetBgTilemapBuffer
+ thumb_func_end DestroyVerticalScrollIndicator
thumb_func_start LoadScrollIndicatorPalette
LoadScrollIndicatorPalette: @ 80F9818
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 5b716383c..439ffd35d 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -2624,7 +2624,7 @@ _0808F970:
ldr r1, [r5]
ldr r4, _0808F9B8 @ =0x0000064f
adds r1, r4
- bl sub_81113AC
+ bl ShowPokedexAreaScreen
ldr r0, _0808F9BC @ =gUnknown_03005CEC
ldr r0, [r0]
bl SetVBlankCallback
@@ -3021,7 +3021,7 @@ _0808FCD4:
orrs r1, r2
str r1, [r0, 0x4]
movs r1, 0x1
- bl sub_811A3CC
+ bl ShowPokedexCryScreen
lsls r0, 24
cmp r0, 0
beq _0808FDDC
@@ -3337,7 +3337,7 @@ sub_808FFBC: @ 808FFBC
ands r0, r1
cmp r0, 0
bne _08090032
- bl sub_811A4F8
+ bl DestroyCryMeterNeedleSprite
ldr r0, _0808FFFC @ =gUnknown_0202FFB4
ldr r0, [r0]
ldr r1, _08090000 @ =0x0000064f
@@ -4403,7 +4403,7 @@ _080908A0:
movs r2, 0
movs r3, 0xD0
bl sub_8072BD8
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
bne _080908CC
adds r0, r6, 0
@@ -5198,8 +5198,8 @@ _08090F0A:
_08090F14: .4byte gSaveBlock2
thumb_func_end sub_8090D90
- thumb_func_start pokedex_count
-pokedex_count: @ 8090F18
+ thumb_func_start GetNationalPokedexCount
+GetNationalPokedexCount: @ 8090F18
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -5243,10 +5243,10 @@ _08090F56:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end pokedex_count
+ thumb_func_end GetNationalPokedexCount
- thumb_func_start sub_8090F68
-sub_8090F68: @ 8090F68
+ thumb_func_start GetHoennPokedexCount
+GetHoennPokedexCount: @ 8090F68
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -5293,7 +5293,7 @@ _08090FB0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8090F68
+ thumb_func_end GetHoennPokedexCount
thumb_func_start sub_8090FC0
sub_8090FC0: @ 8090FC0
@@ -7263,7 +7263,7 @@ _08091EA6:
movs r1, 0x1
movs r2, 0x7E
bl LoadPalette
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
bne _08091F10
movs r4, 0
@@ -7622,7 +7622,7 @@ sub_80921B0: @ 80921B0
ldrsh r0, [r0, r1]
cmp r0, 0
beq _080921E4
- bl sub_806912C
+ bl IsNationalPokedex
ldr r6, _080921DC @ =gUnknown_083B586C
cmp r0, 0
bne _080921F0
@@ -7633,7 +7633,7 @@ _080921D8: .4byte gTasks
_080921DC: .4byte gUnknown_083B586C
_080921E0: .4byte gUnknown_083B58A4
_080921E4:
- bl sub_806912C
+ bl IsNationalPokedex
ldr r6, _0809221C @ =gUnknown_083B5850
cmp r0, 0
bne _080921F0
@@ -7703,7 +7703,7 @@ _08092230:
bl sub_8092E10
ldr r4, _080922C8 @ =gSaveBlock2
strb r0, [r4, 0x19]
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
bne _08092288
movs r0, 0
@@ -8514,7 +8514,7 @@ _08092904:
.align 2, 0
_08092910: .4byte gUnknown_083B57FC
_08092914:
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
bne _08092940
ldr r2, _0809293C @ =gUnknown_083B57FC
@@ -8892,7 +8892,7 @@ sub_8092B68: @ 8092B68
movs r2, 0x40
movs r3, 0x1
bl MenuPrint_PixelCoords
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
beq _08092C5E
ldrh r0, [r6, 0xE]
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index 0c52c8580..7aba42bfd 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start unref_sub_8110664
-unref_sub_8110664: @ 8110664
+ thumb_func_start UnusedPokedexAreaScreen
+UnusedPokedexAreaScreen: @ 8110664
push {lr}
ldr r3, _08110678 @ =0x02000000
str r1, [r3, 0x4]
@@ -19,11 +19,11 @@ unref_sub_8110664: @ 8110664
bx r0
.align 2, 0
_08110678: .4byte 0x02000000
-_0811067C: .4byte sub_8110680
- thumb_func_end unref_sub_8110664
+_0811067C: .4byte CB2_UnusedPokedexAreaScreen
+ thumb_func_end UnusedPokedexAreaScreen
- thumb_func_start sub_8110680
-sub_8110680: @ 8110680
+ thumb_func_start CB2_UnusedPokedexAreaScreen
+CB2_UnusedPokedexAreaScreen: @ 8110680
push {r4,lr}
sub sp, 0x4
ldr r0, _0811069C @ =gMain
@@ -107,7 +107,7 @@ _08110740:
bl sub_8110824
b _081107C0
_08110746:
- bl sub_8110838
+ bl DrawAreaGlow
lsls r0, 24
cmp r0, 0
bne _081107CC
@@ -174,7 +174,7 @@ _081107CC:
.align 2, 0
_081107D4: .4byte gMain
_081107D8: .4byte 0x0000043c
- thumb_func_end sub_8110680
+ thumb_func_end CB2_UnusedPokedexAreaScreen
thumb_func_start sub_81107DC
sub_81107DC: @ 81107DC
@@ -226,8 +226,8 @@ sub_8110824: @ 8110824
_08110834: .4byte 0x02000000
thumb_func_end sub_8110824
- thumb_func_start sub_8110838
-sub_8110838: @ 8110838
+ thumb_func_start DrawAreaGlow
+DrawAreaGlow: @ 8110838
push {lr}
ldr r1, _08110854 @ =0x02000000
movs r2, 0x8A
@@ -256,12 +256,12 @@ _0811085C:
_08110874:
ldr r0, _08110880 @ =0x02000000
ldrh r0, [r0, 0xE]
- bl sub_8110908
+ bl FindMapsWithMon
b _081108F0
.align 2, 0
_08110880: .4byte 0x02000000
_08110884:
- bl sub_8110C34
+ bl BuildAreaGlowTilemap
b _081108F0
_0811088A:
ldr r0, _08110894 @ =gUnknown_083F8438
@@ -325,10 +325,10 @@ _08110900:
bx r1
.align 2, 0
_08110904: .4byte 0x02000000
- thumb_func_end sub_8110838
+ thumb_func_end DrawAreaGlow
- thumb_func_start sub_8110908
-sub_8110908: @ 8110908
+ thumb_func_start FindMapsWithMon
+FindMapsWithMon: @ 8110908
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -416,7 +416,7 @@ _0811099A:
adds r0, r2, r5
ldrh r1, [r0]
movs r0, 0
- bl sub_8110A98
+ bl SetAreaHasMon
b _081109BA
_081109A6:
adds r1, r3, r6
@@ -427,7 +427,7 @@ _081109A6:
ldrh r0, [r0]
adds r1, r5
ldrh r1, [r1]
- bl sub_8110AE4
+ bl SetSpecialMapHasMon
_081109BA:
adds r0, r6, 0x1
lsls r0, 16
@@ -453,7 +453,7 @@ _081109DA:
adds r5, r0, r1
adds r0, r5, 0
adds r1, r7, 0
- bl sub_8110BA4
+ bl MapHasMon
lsls r0, 24
cmp r0, 0
beq _08110A28
@@ -475,7 +475,7 @@ _08110A08:
_08110A0E:
ldrb r1, [r5, 0x1]
movs r0, 0
- bl sub_8110A98
+ bl SetAreaHasMon
b _08110A28
_08110A18:
ldr r0, _08110A40 @ =gWildMonHeaders
@@ -484,7 +484,7 @@ _08110A18:
adds r1, r0
ldrb r0, [r1]
ldrb r1, [r1, 0x1]
- bl sub_8110AE4
+ bl SetSpecialMapHasMon
_08110A28:
adds r0, r6, 0x1
lsls r0, 16
@@ -515,7 +515,7 @@ _08110A44:
adds r0, 0x10
adds r1, r4, 0
adds r1, 0x11
- bl sub_8134538
+ bl GetRoamerLocation
ldrb r0, [r4, 0x10]
ldrb r1, [r4, 0x11]
bl get_mapheader_by_bank_and_number
@@ -542,10 +542,10 @@ _08110A8C:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8110908
+ thumb_func_end FindMapsWithMon
- thumb_func_start sub_8110A98
-sub_8110A98: @ 8110A98
+ thumb_func_start SetAreaHasMon
+SetAreaHasMon: @ 8110A98
push {r4,r5,lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -582,10 +582,10 @@ _08110AD8:
bx r0
.align 2, 0
_08110AE0: .4byte 0x02000000
- thumb_func_end sub_8110A98
+ thumb_func_end SetAreaHasMon
- thumb_func_start sub_8110AE4
-sub_8110AE4: @ 8110AE4
+ thumb_func_start SetSpecialMapHasMon
+SetSpecialMapHasMon: @ 8110AE4
push {r4-r6,lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -685,10 +685,10 @@ _08110B96:
.align 2, 0
_08110B9C: .4byte 0x02000000
_08110BA0: .4byte gUnknown_083F857A
- thumb_func_end sub_8110AE4
+ thumb_func_end SetSpecialMapHasMon
- thumb_func_start sub_8110BA4
-sub_8110BA4: @ 8110BA4
+ thumb_func_start MapHasMon
+MapHasMon: @ 8110BA4
push {r4-r6,lr}
adds r5, r0, 0
lsls r1, 16
@@ -697,28 +697,28 @@ sub_8110BA4: @ 8110BA4
ldr r0, [r5, 0x4]
adds r1, r4, 0
movs r2, 0xC
- bl sub_8110BFC
+ bl MonListHasMon
lsls r0, 24
cmp r0, 0
bne _08110BF2
ldr r0, [r5, 0x8]
adds r1, r4, 0
movs r2, 0x5
- bl sub_8110BFC
+ bl MonListHasMon
lsls r0, 24
cmp r0, 0
bne _08110BF2
ldr r0, [r5, 0x10]
adds r1, r4, 0
movs r2, 0xC
- bl sub_8110BFC
+ bl MonListHasMon
lsls r0, 24
cmp r0, 0
bne _08110BF2
ldr r0, [r5, 0xC]
adds r1, r6, 0
movs r2, 0x5
- bl sub_8110BFC
+ bl MonListHasMon
lsls r0, 24
cmp r0, 0
bne _08110BF2
@@ -730,10 +730,10 @@ _08110BF4:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8110BA4
+ thumb_func_end MapHasMon
- thumb_func_start sub_8110BFC
-sub_8110BFC: @ 8110BFC
+ thumb_func_start MonListHasMon
+MonListHasMon: @ 8110BFC
push {r4,lr}
lsls r1, 16
lsrs r4, r1, 16
@@ -765,10 +765,10 @@ _08110C2C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8110BFC
+ thumb_func_end MonListHasMon
- thumb_func_start sub_8110C34
-sub_8110C34: @ 8110C34
+ thumb_func_start BuildAreaGlowTilemap
+BuildAreaGlowTilemap: @ 8110C34
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -832,7 +832,7 @@ _08110CA4:
ldrh r0, [r5]
ldrh r1, [r6]
str r2, [sp]
- bl sub_80FB9A8
+ bl GetRegionMapSectionAt_
ldrh r1, [r7]
lsls r1, 2
ldr r3, [sp, 0x8]
@@ -1336,7 +1336,7 @@ _08111070:
bx r0
.align 2, 0
_08111080: .4byte 0x027f0000
- thumb_func_end sub_8110C34
+ thumb_func_end BuildAreaGlowTilemap
thumb_func_start sub_8111084
sub_8111084: @ 8111084
@@ -1750,8 +1750,8 @@ _081113A4:
bx r0
thumb_func_end sub_8111360
- thumb_func_start sub_81113AC
-sub_81113AC: @ 81113AC
+ thumb_func_start ShowPokedexAreaScreen
+ShowPokedexAreaScreen: @ 81113AC
push {r4,lr}
ldr r2, _081113DC @ =0x02000000
movs r3, 0
@@ -1778,12 +1778,12 @@ sub_81113AC: @ 81113AC
.align 2, 0
_081113DC: .4byte 0x02000000
_081113E0: .4byte 0x000006e4
-_081113E4: .4byte sub_81113EC
+_081113E4: .4byte Task_PokedexAreaScreen_0
_081113E8: .4byte gTasks
- thumb_func_end sub_81113AC
+ thumb_func_end ShowPokedexAreaScreen
- thumb_func_start sub_81113EC
-sub_81113EC: @ 81113EC
+ thumb_func_start Task_PokedexAreaScreen_0
+Task_PokedexAreaScreen_0: @ 81113EC
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -1874,7 +1874,7 @@ _081114B8:
bl sub_8110824
b _08111540
_081114BE:
- bl sub_8110838
+ bl DrawAreaGlow
lsls r0, 24
cmp r0, 0
bne _08111550
@@ -1889,13 +1889,13 @@ _081114CA:
bl sub_80FB2A4
b _08111540
_081114DE:
- bl sub_8111658
+ bl CreateAreaMarkerSprites
b _08111540
_081114E4:
- bl sub_81117AC
+ bl LoadAreaUnknownGraphics
b _08111540
_081114EA:
- bl sub_81117E4
+ bl CreateAreaUnknownSprites
b _08111540
_081114F0:
movs r0, 0x15
@@ -1933,7 +1933,7 @@ _08111528:
strh r1, [r0, 0x8]
b _08111550
.align 2, 0
-_0811153C: .4byte sub_811155C
+_0811153C: .4byte Task_PokedexAreaScreen_1
_08111540:
ldr r0, _08111558 @ =gTasks
lsls r1, r5, 2
@@ -1950,10 +1950,10 @@ _08111550:
bx r0
.align 2, 0
_08111558: .4byte gTasks
- thumb_func_end sub_81113EC
+ thumb_func_end Task_PokedexAreaScreen_0
- thumb_func_start sub_811155C
-sub_811155C: @ 811155C
+ thumb_func_start Task_PokedexAreaScreen_1
+Task_PokedexAreaScreen_1: @ 811155C
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -2050,7 +2050,7 @@ _0811160A:
ands r0, r1
cmp r0, 0
bne _0811164C
- bl sub_8111738
+ bl DestroyAreaSprites
ldr r0, _08111634 @ =0x02000000
ldr r1, _08111638 @ =0x000006e4
adds r0, r1
@@ -2080,10 +2080,10 @@ _0811164C:
bx r0
.align 2, 0
_08111654: .4byte gTasks
- thumb_func_end sub_811155C
+ thumb_func_end Task_PokedexAreaScreen_1
- thumb_func_start sub_8111658
-sub_8111658: @ 8111658
+ thumb_func_start CreateAreaMarkerSprites
+CreateAreaMarkerSprites: @ 8111658
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2191,10 +2191,10 @@ _08111728: .4byte 0x02000000
_0811172C: .4byte gRegionMapLocations
_08111730: .4byte gSpriteTemplate_83F85A4
_08111734: .4byte gSprites
- thumb_func_end sub_8111658
+ thumb_func_end CreateAreaMarkerSprites
- thumb_func_start sub_8111738
-sub_8111738: @ 8111738
+ thumb_func_start DestroyAreaSprites
+DestroyAreaSprites: @ 8111738
push {r4-r6,lr}
movs r0, 0x2
bl FreeSpriteTilesByTag
@@ -2250,10 +2250,10 @@ _08111794:
.align 2, 0
_081117A4: .4byte 0x02000000
_081117A8: .4byte 0x02000fa8
- thumb_func_end sub_8111738
+ thumb_func_end DestroyAreaSprites
- thumb_func_start sub_81117AC
-sub_81117AC: @ 81117AC
+ thumb_func_start LoadAreaUnknownGraphics
+LoadAreaUnknownGraphics: @ 81117AC
push {lr}
sub sp, 0x8
ldr r0, _081117D4 @ =gUnknown_083F8664
@@ -2276,10 +2276,10 @@ _081117D4: .4byte gUnknown_083F8664
_081117D8: .4byte gAreaUnknownTiles
_081117DC: .4byte 0x02000fb4
_081117E0: .4byte gUnknown_083F865C
- thumb_func_end sub_81117AC
+ thumb_func_end LoadAreaUnknownGraphics
- thumb_func_start sub_81117E4
-sub_81117E4: @ 81117E4
+ thumb_func_start CreateAreaUnknownSprites
+CreateAreaUnknownSprites: @ 81117E4
push {r4-r7,lr}
ldr r1, _08111810 @ =0x02000000
movs r2, 0x88
@@ -2366,6 +2366,6 @@ _0811188E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_81117E4
+ thumb_func_end CreateAreaUnknownSprites
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s
index e14ca8f78..42c21c16c 100644
--- a/asm/pokedex_cry_screen.s
+++ b/asm/pokedex_cry_screen.s
@@ -737,8 +737,8 @@ _0811A3C4:
_0811A3C8: .4byte REG_BG3HOFS
thumb_func_end sub_811A350
- thumb_func_start sub_811A3CC
-sub_811A3CC: @ 811A3CC
+ thumb_func_start ShowPokedexCryScreen
+ShowPokedexCryScreen: @ 811A3CC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -884,10 +884,10 @@ _0811A4E8: .4byte gCryMeterNeedleSpriteSheets
_0811A4EC: .4byte gCryMeterNeedleSpritePalettes
_0811A4F0: .4byte gSpriteTemplate_83FB774
_0811A4F4: .4byte 0x0201c800
- thumb_func_end sub_811A3CC
+ thumb_func_end ShowPokedexCryScreen
- thumb_func_start sub_811A4F8
-sub_811A4F8: @ 811A4F8
+ thumb_func_start DestroyCryMeterNeedleSprite
+DestroyCryMeterNeedleSprite: @ 811A4F8
push {r4,r5,lr}
ldr r5, _0811A52C @ =gSprites
ldr r4, _0811A530 @ =0x0201c800
@@ -914,7 +914,7 @@ sub_811A4F8: @ 811A4F8
.align 2, 0
_0811A52C: .4byte gSprites
_0811A530: .4byte 0x0201c800
- thumb_func_end sub_811A4F8
+ thumb_func_end DestroyCryMeterNeedleSprite
thumb_func_start sub_811A534
sub_811A534: @ 811A534
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 3422efef5..c324201d5 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -7864,7 +7864,7 @@ _080EFA92:
ldrb r1, [r1]
lsls r2, r4, 24
lsrs r2, 24
- bl sub_811A8CC
+ bl GetLandmarkName
adds r1, r0, 0
cmp r1, 0
bne _080EFA74
@@ -11736,7 +11736,7 @@ sub_80F19FC: @ 80F19FC
adds r1, r2
ldrb r1, [r1]
ldrb r2, [r5, 0x1]
- bl sub_811A8CC
+ bl GetLandmarkName
cmp r0, 0
beq _080F1A46
ldrb r2, [r5, 0x1]
diff --git a/asm/region_map.s b/asm/region_map.s
index d56811e20..8f57f1b42 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -509,7 +509,7 @@ _080FACBE:
ldrh r0, [r0]
adds r1, 0x56
ldrh r1, [r1]
- bl sub_80FB2EC
+ bl GetRegionMapSectionAt
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -735,7 +735,7 @@ _080FAE72:
strh r3, [r4]
strh r1, [r0]
adds r0, r3, 0
- bl sub_80FB2EC
+ bl GetRegionMapSectionAt
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -1339,8 +1339,8 @@ _080FB2E0:
_080FB2E8: .4byte gUnknown_020388CC
thumb_func_end sub_80FB2A4
- thumb_func_start sub_80FB2EC
-sub_80FB2EC: @ 80FB2EC
+ thumb_func_start GetRegionMapSectionAt
+GetRegionMapSectionAt: @ 80FB2EC
push {lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -1375,7 +1375,7 @@ _080FB324:
bx r1
.align 2, 0
_080FB328: .4byte gRegionMapSections
- thumb_func_end sub_80FB2EC
+ thumb_func_end GetRegionMapSectionAt
thumb_func_start sub_80FB32C
sub_80FB32C: @ 80FB32C
@@ -2140,19 +2140,19 @@ _080FB9A2:
bx r1
thumb_func_end sub_80FB758
- thumb_func_start sub_80FB9A8
-sub_80FB9A8: @ 80FB9A8
+ thumb_func_start GetRegionMapSectionAt_
+GetRegionMapSectionAt_: @ 80FB9A8
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
- bl sub_80FB2EC
+ bl GetRegionMapSectionAt
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80FB9A8
+ thumb_func_end GetRegionMapSectionAt_
thumb_func_start sub_80FB9C0
sub_80FB9C0: @ 80FB9C0
@@ -2244,7 +2244,7 @@ _080FBA4E:
lsrs r4, r0, 16
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80FB2EC
+ bl GetRegionMapSectionAt
ldr r1, _080FBA8C @ =gUnknown_020388CC
ldr r1, [r1]
lsls r0, 16
@@ -2304,7 +2304,7 @@ _080FBAC0:
_080FBAC2:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80FB2EC
+ bl GetRegionMapSectionAt
ldr r1, _080FBAEC @ =gUnknown_020388CC
ldr r1, [r1]
lsls r0, 16
diff --git a/asm/rom3.s b/asm/rom3.s
index f21110baf..d6717f28e 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -16701,7 +16701,7 @@ _08013E06:
adds r0, r4, 0
adds r1, r2, 0
movs r2, 0x81
- bl evolution_cutscene
+ bl EvolutionScene
b _08013E74
.align 2, 0
_08013E4C: .4byte gUnknown_03004324
diff --git a/asm/rom6.s b/asm/rom6.s
index df363ab44..898686d41 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -1981,9 +1981,9 @@ _0810C2AC: .4byte gTasks
sub_810C2B0: @ 810C2B0
push {lr}
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
bl BuyMenuFreeMemory
pop {r0}
bx r0
@@ -4214,8 +4214,8 @@ sub_810D3FC: @ 810D3FC
_0810D40C: .4byte 0x00004049
thumb_func_end sub_810D3FC
- thumb_func_start sub_810D410
-sub_810D410: @ 810D410
+ thumb_func_start UpdateBirchState
+UpdateBirchState: @ 810D410
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 16
@@ -4235,36 +4235,36 @@ sub_810D410: @ 810D410
bx r0
.align 2, 0
_0810D438: .4byte 0x00004049
- thumb_func_end sub_810D410
+ thumb_func_end UpdateBirchState
- thumb_func_start sub_810D43C
-sub_810D43C: @ 810D43C
+ thumb_func_start ScriptGetPokedexInfo
+ScriptGetPokedexInfo: @ 810D43C
push {lr}
ldr r0, _0810D458 @ =gUnknown_0202E8CC
ldrh r0, [r0]
cmp r0, 0
bne _0810D460
movs r0, 0
- bl sub_8090F68
+ bl GetHoennPokedexCount
ldr r1, _0810D45C @ =gUnknown_0202E8CE
strh r0, [r1]
movs r0, 0x1
- bl sub_8090F68
+ bl GetHoennPokedexCount
b _0810D470
.align 2, 0
_0810D458: .4byte gUnknown_0202E8CC
_0810D45C: .4byte gUnknown_0202E8CE
_0810D460:
movs r0, 0
- bl pokedex_count
+ bl GetNationalPokedexCount
ldr r1, _0810D480 @ =gUnknown_0202E8CE
strh r0, [r1]
movs r0, 0x1
- bl pokedex_count
+ bl GetNationalPokedexCount
_0810D470:
ldr r1, _0810D484 @ =gUnknown_0202E8D0
strh r0, [r1]
- bl sub_806912C
+ bl IsNationalPokedex
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -4272,10 +4272,10 @@ _0810D470:
.align 2, 0
_0810D480: .4byte gUnknown_0202E8CE
_0810D484: .4byte gUnknown_0202E8D0
- thumb_func_end sub_810D43C
+ thumb_func_end ScriptGetPokedexInfo
- thumb_func_start sub_810D488
-sub_810D488: @ 810D488
+ thumb_func_start GetPokedexRatingText
+GetPokedexRatingText: @ 810D488
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -4478,23 +4478,23 @@ _0810D5F6:
bx r1
.align 2, 0
_0810D5FC: .4byte gUnknown_081C4ADA
- thumb_func_end sub_810D488
+ thumb_func_end GetPokedexRatingText
- thumb_func_start sub_810D600
-sub_810D600: @ 810D600
+ thumb_func_start ShowPokedexRatingMessage
+ShowPokedexRatingMessage: @ 810D600
push {lr}
ldr r0, _0810D614 @ =gUnknown_0202E8CC
ldrh r0, [r0]
- bl sub_810D488
+ bl GetPokedexRatingText
bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
_0810D614: .4byte gUnknown_0202E8CC
- thumb_func_end sub_810D600
+ thumb_func_end ShowPokedexRatingMessage
- thumb_func_start sub_810D618
-sub_810D618: @ 810D618
+ thumb_func_start AccessHallOfFamePC
+AccessHallOfFamePC: @ 810D618
push {lr}
ldr r0, _0810D628 @ =sub_81428CC
bl SetMainCallback2
@@ -4503,10 +4503,10 @@ sub_810D618: @ 810D618
bx r0
.align 2, 0
_0810D628: .4byte sub_81428CC
- thumb_func_end sub_810D618
+ thumb_func_end AccessHallOfFamePC
- thumb_func_start sub_810D62C
-sub_810D62C: @ 810D62C
+ thumb_func_start ReturnFromHallOfFamePC
+ReturnFromHallOfFamePC: @ 810D62C
push {lr}
ldr r0, _0810D640 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2
@@ -4518,11 +4518,11 @@ sub_810D62C: @ 810D62C
.align 2, 0
_0810D640: .4byte c2_exit_to_overworld_2_switch
_0810D644: .4byte gUnknown_0300485C
-_0810D648: .4byte mapldr_080CA5C0
- thumb_func_end sub_810D62C
+_0810D648: .4byte ReshowPCMenuAfterHallOfFamePC
+ thumb_func_end ReturnFromHallOfFamePC
- thumb_func_start mapldr_080CA5C0
-mapldr_080CA5C0: @ 810D64C
+ thumb_func_start ReshowPCMenuAfterHallOfFamePC
+ReshowPCMenuAfterHallOfFamePC: @ 810D64C
push {lr}
sub sp, 0x4
bl ScriptContext2_Enable
@@ -4544,7 +4544,7 @@ mapldr_080CA5C0: @ 810D64C
bx r0
.align 2, 0
_0810D680: .4byte sub_810D684
- thumb_func_end mapldr_080CA5C0
+ thumb_func_end ReshowPCMenuAfterHallOfFamePC
thumb_func_start sub_810D684
sub_810D684: @ 810D684
@@ -4595,8 +4595,8 @@ _0810D6D4: .4byte c2_exit_to_overworld_2_switch
_0810D6D8: .4byte Cb2_ViewWallClock
thumb_func_end sub_810D6B8
- thumb_func_start wild_pokemon_reroll
-wild_pokemon_reroll: @ 810D6DC
+ thumb_func_start ResetCyclingRoadChallengeData
+ResetCyclingRoadChallengeData: @ 810D6DC
ldr r0, _0810D6F0 @ =gUnknown_02039250
movs r1, 0
strb r1, [r0]
@@ -4610,10 +4610,10 @@ wild_pokemon_reroll: @ 810D6DC
_0810D6F0: .4byte gUnknown_02039250
_0810D6F4: .4byte gUnknown_02039251
_0810D6F8: .4byte gUnknown_02039254
- thumb_func_end wild_pokemon_reroll
+ thumb_func_end ResetCyclingRoadChallengeData
- thumb_func_start sub_810D6FC
-sub_810D6FC: @ 810D6FC
+ thumb_func_start BeginCyclingRoadChallenge
+BeginCyclingRoadChallenge: @ 810D6FC
ldr r1, _0810D714 @ =gUnknown_02039250
movs r0, 0x1
strb r0, [r1]
@@ -4630,10 +4630,10 @@ _0810D714: .4byte gUnknown_02039250
_0810D718: .4byte gUnknown_02039251
_0810D71C: .4byte gUnknown_02039254
_0810D720: .4byte gMain
- thumb_func_end sub_810D6FC
+ thumb_func_end BeginCyclingRoadChallenge
- thumb_func_start sp0E3_walkrun_bitfield_interpretation
-sp0E3_walkrun_bitfield_interpretation: @ 810D724
+ thumb_func_start GetPlayerAvatarBike
+GetPlayerAvatarBike: @ 810D724
push {lr}
movs r0, 0x4
bl TestPlayerAvatarFlags
@@ -4655,10 +4655,10 @@ _0810D746:
_0810D748:
pop {r1}
bx r1
- thumb_func_end sp0E3_walkrun_bitfield_interpretation
+ thumb_func_end GetPlayerAvatarBike
- thumb_func_start sub_810D74C
-sub_810D74C: @ 810D74C
+ thumb_func_start DetermineCyclingRoadResults
+DetermineCyclingRoadResults: @ 810D74C
push {r4-r7,lr}
adds r7, r0, 0
lsls r1, 24
@@ -4790,10 +4790,10 @@ _0810D84C:
bx r0
.align 2, 0
_0810D858: .4byte gScriptResult
- thumb_func_end sub_810D74C
+ thumb_func_end DetermineCyclingRoadResults
- thumb_func_start sub_810D85C
-sub_810D85C: @ 810D85C
+ thumb_func_start FinishCyclingRoadChallenge
+FinishCyclingRoadChallenge: @ 810D85C
push {r4,r5,lr}
ldr r0, _0810D880 @ =gMain
ldr r1, _0810D884 @ =gUnknown_02039254
@@ -4803,10 +4803,10 @@ sub_810D85C: @ 810D85C
ldr r5, _0810D888 @ =gUnknown_02039251
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_810D74C
+ bl DetermineCyclingRoadResults
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_810D88C
+ bl RecordCyclingRoadResults
pop {r4,r5}
pop {r0}
bx r0
@@ -4814,10 +4814,10 @@ sub_810D85C: @ 810D85C
_0810D880: .4byte gMain
_0810D884: .4byte gUnknown_02039254
_0810D888: .4byte gUnknown_02039251
- thumb_func_end sub_810D85C
+ thumb_func_end FinishCyclingRoadChallenge
- thumb_func_start sub_810D88C
-sub_810D88C: @ 810D88C
+ thumb_func_start RecordCyclingRoadResults
+RecordCyclingRoadResults: @ 810D88C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -4861,10 +4861,10 @@ _0810D8D6:
_0810D8E0: .4byte 0x00004028
_0810D8E4: .4byte 0x00004029
_0810D8E8: .4byte 0x00004027
- thumb_func_end sub_810D88C
+ thumb_func_end RecordCyclingRoadResults
- thumb_func_start sub_810D8EC
-sub_810D8EC: @ 810D8EC
+ thumb_func_start GetRecordedCyclingRoadResults
+GetRecordedCyclingRoadResults: @ 810D8EC
push {r4,lr}
ldr r0, _0810D920 @ =0x00004028
bl VarGet
@@ -4883,7 +4883,7 @@ sub_810D8EC: @ 810D8EC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_810D74C
+ bl DetermineCyclingRoadResults
movs r0, 0x1
b _0810D92E
.align 2, 0
@@ -4896,10 +4896,10 @@ _0810D92E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_810D8EC
+ thumb_func_end GetRecordedCyclingRoadResults
- thumb_func_start sub_810D934
-sub_810D934: @ 810D934
+ thumb_func_start UpdateCyclingRoadState
+UpdateCyclingRoadState: @ 810D934
push {r4,lr}
ldr r0, _0810D974 @ =gUnknown_020297F0
ldrh r1, [r0]
@@ -4933,10 +4933,10 @@ _0810D96C:
_0810D974: .4byte gUnknown_020297F0
_0810D978: .4byte 0x00000c1d
_0810D97C: .4byte 0x000040a9
- thumb_func_end sub_810D934
+ thumb_func_end UpdateCyclingRoadState
- thumb_func_start sub_810D980
-sub_810D980: @ 810D980
+ thumb_func_start SetSSTidalFlag
+SetSSTidalFlag: @ 810D980
push {lr}
ldr r0, _0810D998 @ =0x0000082d
bl FlagSet
@@ -4949,10 +4949,10 @@ sub_810D980: @ 810D980
.align 2, 0
_0810D998: .4byte 0x0000082d
_0810D99C: .4byte 0x0000404a
- thumb_func_end sub_810D980
+ thumb_func_end SetSSTidalFlag
- thumb_func_start sub_810D9A0
-sub_810D9A0: @ 810D9A0
+ thumb_func_start ResetSSTidalFlag
+ResetSSTidalFlag: @ 810D9A0
push {lr}
ldr r0, _0810D9AC @ =0x0000082d
bl FlagReset
@@ -4960,7 +4960,7 @@ sub_810D9A0: @ 810D9A0
bx r0
.align 2, 0
_0810D9AC: .4byte 0x0000082d
- thumb_func_end sub_810D9A0
+ thumb_func_end ResetSSTidalFlag
thumb_func_start sub_810D9B0
sub_810D9B0: @ 810D9B0
@@ -5110,8 +5110,8 @@ _0810DABE:
bx r1
thumb_func_end sub_810D9EC
- thumb_func_start sub_810DAC8
-sub_810DAC8: @ 810DAC8
+ thumb_func_start GetLinkPartnerNames
+GetLinkPartnerNames: @ 810DAC8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -5158,7 +5158,7 @@ _0810DB12:
.align 2, 0
_0810DB20: .4byte gUnknown_083D1464
_0810DB24: .4byte gLinkPlayers + 0x8
- thumb_func_end sub_810DAC8
+ thumb_func_end GetLinkPartnerNames
thumb_func_start sub_810DB28
sub_810DB28: @ 810DB28
@@ -6024,8 +6024,8 @@ _0810E244: .4byte gUnknown_0202E8CC
_0810E248: .4byte gUnknown_083F8376
thumb_func_end sub_810E230
- thumb_func_start sub_810E24C
-sub_810E24C: @ 810E24C
+ thumb_func_start ShowFieldMessageStringVar4
+ShowFieldMessageStringVar4: @ 810E24C
push {lr}
ldr r0, _0810E258 @ =gStringVar4
bl ShowFieldMessage
@@ -6033,10 +6033,10 @@ sub_810E24C: @ 810E24C
bx r0
.align 2, 0
_0810E258: .4byte gStringVar4
- thumb_func_end sub_810E24C
+ thumb_func_end ShowFieldMessageStringVar4
- thumb_func_start sub_810E25C
-sub_810E25C: @ 810E25C
+ thumb_func_start StorePlayerCoordsInVars
+StorePlayerCoordsInVars: @ 810E25C
ldr r1, _0810E26C @ =gUnknown_0202E8CC
ldr r2, _0810E270 @ =gSaveBlock1
ldrh r0, [r2]
@@ -6049,10 +6049,10 @@ sub_810E25C: @ 810E25C
_0810E26C: .4byte gUnknown_0202E8CC
_0810E270: .4byte gSaveBlock1
_0810E274: .4byte gUnknown_0202E8CE
- thumb_func_end sub_810E25C
+ thumb_func_end StorePlayerCoordsInVars
- thumb_func_start sub_810E278
-sub_810E278: @ 810E278
+ thumb_func_start GetPlayerTrainerIdOnesDigit
+GetPlayerTrainerIdOnesDigit: @ 810E278
push {lr}
ldr r0, _0810E294 @ =gSaveBlock2
ldrb r1, [r0, 0xB]
@@ -6067,10 +6067,10 @@ sub_810E278: @ 810E278
bx r1
.align 2, 0
_0810E294: .4byte gSaveBlock2
- thumb_func_end sub_810E278
+ thumb_func_end GetPlayerTrainerIdOnesDigit
- thumb_func_start sub_810E298
-sub_810E298: @ 810E298
+ thumb_func_start GetPlayerBigGuyGirlString
+GetPlayerBigGuyGirlString: @ 810E298
push {lr}
ldr r0, _0810E2AC @ =gSaveBlock2
ldrb r0, [r0, 0x8]
@@ -6094,10 +6094,10 @@ _0810E2C0:
.align 2, 0
_0810E2C4: .4byte gStringVar1
_0810E2C8: .4byte gOtherText_BigGirl
- thumb_func_end sub_810E298
+ thumb_func_end GetPlayerBigGuyGirlString
- thumb_func_start sub_810E2CC
-sub_810E2CC: @ 810E2CC
+ thumb_func_start GetRivalSonDaughterString
+GetRivalSonDaughterString: @ 810E2CC
push {lr}
ldr r0, _0810E2E0 @ =gSaveBlock2
ldrb r0, [r0, 0x8]
@@ -6121,7 +6121,7 @@ _0810E2F4:
.align 2, 0
_0810E2F8: .4byte gStringVar1
_0810E2FC: .4byte gOtherText_Son
- thumb_func_end sub_810E2CC
+ thumb_func_end GetRivalSonDaughterString
thumb_func_start sub_810E300
sub_810E300: @ 810E300
@@ -6132,8 +6132,8 @@ sub_810E300: @ 810E300
_0810E308: .4byte gUnknown_02024D26
thumb_func_end sub_810E300
- thumb_func_start sub_810E30C
-sub_810E30C: @ 810E30C
+ thumb_func_start CableCarWarp
+CableCarWarp: @ 810E30C
push {lr}
sub sp, 0x4
ldr r0, _0810E32C @ =gUnknown_0202E8CC
@@ -6164,10 +6164,10 @@ _0810E342:
add sp, 0x4
pop {r0}
bx r0
- thumb_func_end sub_810E30C
+ thumb_func_end CableCarWarp
- thumb_func_start sub_810E348
-sub_810E348: @ 810E348
+ thumb_func_start SetFlagInVar
+SetFlagInVar: @ 810E348
push {lr}
ldr r0, _0810E358 @ =gUnknown_0202E8CC
ldrh r0, [r0]
@@ -6176,10 +6176,10 @@ sub_810E348: @ 810E348
bx r0
.align 2, 0
_0810E358: .4byte gUnknown_0202E8CC
- thumb_func_end sub_810E348
+ thumb_func_end SetFlagInVar
- thumb_func_start sub_810E35C
-sub_810E35C: @ 810E35C
+ thumb_func_start GetWeekCount
+GetWeekCount: @ 810E35C
push {lr}
ldr r0, _0810E37C @ =gLocalTime
movs r1, 0
@@ -6198,12 +6198,12 @@ _0810E376:
.align 2, 0
_0810E37C: .4byte gLocalTime
_0810E380: .4byte 0x0000270f
- thumb_func_end sub_810E35C
+ thumb_func_end GetWeekCount
- thumb_func_start sub_810E384
-sub_810E384: @ 810E384
+ thumb_func_start GetLeadMonFriendshipScore
+GetLeadMonFriendshipScore: @ 810E384
push {r4,lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -6265,32 +6265,32 @@ _0810E3FE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_810E384
+ thumb_func_end GetLeadMonFriendshipScore
- thumb_func_start sub_810E404
-sub_810E404: @ 810E404
+ thumb_func_start CB2_FieldShowRegionMap
+CB2_FieldShowRegionMap: @ 810E404
push {lr}
ldr r0, _0810E410 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
- bl sub_813EEB4
+ bl FieldInitRegionMap
pop {r0}
bx r0
.align 2, 0
_0810E410: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
- thumb_func_end sub_810E404
+ thumb_func_end CB2_FieldShowRegionMap
- thumb_func_start sub_810E414
-sub_810E414: @ 810E414
+ thumb_func_start FieldShowRegionMap
+FieldShowRegionMap: @ 810E414
push {lr}
ldr r0, _0810E420 @ =sub_810E404
bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
-_0810E420: .4byte sub_810E404
- thumb_func_end sub_810E414
+_0810E420: .4byte CB2_FieldShowRegionMap
+ thumb_func_end FieldShowRegionMap
- thumb_func_start sub_810E424
-sub_810E424: @ 810E424
+ thumb_func_start DoPCTurnOnEffect
+DoPCTurnOnEffect: @ 810E424
push {r4,lr}
ldr r4, _0810E460 @ =sub_810E468
adds r0, r4, 0
@@ -6320,12 +6320,12 @@ _0810E458:
pop {r0}
bx r0
.align 2, 0
-_0810E460: .4byte sub_810E468
+_0810E460: .4byte Task_PCTurnOnEffect
_0810E464: .4byte gTasks
- thumb_func_end sub_810E424
+ thumb_func_end DoPCTurnOnEffect
- thumb_func_start sub_810E468
-sub_810E468: @ 810E468
+ thumb_func_start Task_PCTurnOnEffect
+Task_PCTurnOnEffect: @ 810E468
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -6339,16 +6339,16 @@ sub_810E468: @ 810E468
cmp r0, 0
bne _0810E486
adds r0, r1, 0
- bl sub_810E490
+ bl PCTurnOffEffect_0
_0810E486:
pop {r0}
bx r0
.align 2, 0
_0810E48C: .4byte gTasks
- thumb_func_end sub_810E468
+ thumb_func_end Task_PCTurnOnEffect
- thumb_func_start sub_810E490
-sub_810E490: @ 810E490
+ thumb_func_start PCTurnOffEffect_0
+PCTurnOffEffect_0: @ 810E490
push {r4-r6,lr}
adds r4, r0, 0
movs r6, 0
@@ -6390,7 +6390,7 @@ _0810E4CC:
asrs r1, 24
lsls r2, r5, 24
asrs r2, 24
- bl sub_810E508
+ bl PCTurnOffEffect_1
bl DrawWholeMapView
ldrh r0, [r4, 0x10]
movs r1, 0x1
@@ -6412,10 +6412,10 @@ _0810E4FC:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_810E490
+ thumb_func_end PCTurnOffEffect_0
- thumb_func_start sub_810E508
-sub_810E508: @ 810E508
+ thumb_func_start PCTurnOffEffect_1
+PCTurnOffEffect_1: @ 810E508
push {r4,r5,lr}
lsls r1, 24
lsrs r1, 24
@@ -6493,18 +6493,18 @@ _0810E566:
.align 2, 0
_0810E594: .4byte 0x0000027e
_0810E598: .4byte gSaveBlock1
- thumb_func_end sub_810E508
+ thumb_func_end PCTurnOffEffect_1
- thumb_func_start sub_810E59C
-sub_810E59C: @ 810E59C
+ thumb_func_start DoPCTurnOffEffect
+DoPCTurnOffEffect: @ 810E59C
push {lr}
- bl sub_810E5A8
+ bl PCTurnOffEffect
pop {r0}
bx r0
- thumb_func_end sub_810E59C
+ thumb_func_end DoPCTurnOffEffect
- thumb_func_start sub_810E5A8
-sub_810E5A8: @ 810E5A8
+ thumb_func_start PCTurnOffEffect
+PCTurnOffEffect: @ 810E5A8
push {r4-r6,lr}
movs r6, 0
movs r5, 0
@@ -6581,10 +6581,10 @@ _0810E5FE:
.align 2, 0
_0810E630: .4byte 0x00000259
_0810E634: .4byte gSaveBlock1
- thumb_func_end sub_810E5A8
+ thumb_func_end PCTurnOffEffect
- thumb_func_start sub_810E638
-sub_810E638: @ 810E638
+ thumb_func_start DoLotteryCornerComputerEffect
+DoLotteryCornerComputerEffect: @ 810E638
push {r4,lr}
ldr r4, _0810E674 @ =sub_810E67C
adds r0, r4, 0
@@ -6614,12 +6614,12 @@ _0810E66C:
pop {r0}
bx r0
.align 2, 0
-_0810E674: .4byte sub_810E67C
+_0810E674: .4byte Task_LotteryCornerComputerEffect
_0810E678: .4byte gTasks
- thumb_func_end sub_810E638
+ thumb_func_end DoLotteryCornerComputerEffect
- thumb_func_start sub_810E67C
-sub_810E67C: @ 810E67C
+ thumb_func_start Task_LotteryCornerComputerEffect
+Task_LotteryCornerComputerEffect: @ 810E67C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -6633,16 +6633,16 @@ sub_810E67C: @ 810E67C
cmp r0, 0
bne _0810E69A
adds r0, r1, 0
- bl sub_810E6A4
+ bl LotteryCornerComputerEffect
_0810E69A:
pop {r0}
bx r0
.align 2, 0
_0810E6A0: .4byte gTasks
- thumb_func_end sub_810E67C
+ thumb_func_end Task_LotteryCornerComputerEffect
- thumb_func_start sub_810E6A4
-sub_810E6A4: @ 810E6A4
+ thumb_func_start LotteryCornerComputerEffect
+LotteryCornerComputerEffect: @ 810E6A4
push {r4,lr}
adds r4, r0, 0
movs r1, 0xE
@@ -6701,10 +6701,10 @@ _0810E712:
bx r0
.align 2, 0
_0810E720: .4byte 0x00000e58
- thumb_func_end sub_810E6A4
+ thumb_func_end LotteryCornerComputerEffect
- thumb_func_start sub_810E724
-sub_810E724: @ 810E724
+ thumb_func_start EndLotteryCornerComputerEffect
+EndLotteryCornerComputerEffect: @ 810E724
push {lr}
ldr r2, _0810E744 @ =0x00000e9d
movs r0, 0x12
@@ -6720,10 +6720,10 @@ sub_810E724: @ 810E724
.align 2, 0
_0810E744: .4byte 0x00000e9d
_0810E748: .4byte 0x00000ea5
- thumb_func_end sub_810E724
+ thumb_func_end EndLotteryCornerComputerEffect
- thumb_func_start sub_810E74C
-sub_810E74C: @ 810E74C
+ thumb_func_start SetDepartmentStoreFloorVar
+SetDepartmentStoreFloorVar: @ 810E74C
push {lr}
ldr r0, _0810E768 @ =gSaveBlock1
ldrb r0, [r0, 0x15]
@@ -6772,10 +6772,10 @@ _0810E79E:
bx r0
.align 2, 0
_0810E7A8: .4byte 0x00004043
- thumb_func_end sub_810E74C
+ thumb_func_end SetDepartmentStoreFloorVar
- thumb_func_start sub_810E7AC
-sub_810E7AC: @ 810E7AC
+ thumb_func_start ScriptAddElevatorMenuItem
+ScriptAddElevatorMenuItem: @ 810E7AC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -6837,10 +6837,10 @@ _0810E7E8:
.align 2, 0
_0810E81C: .4byte gUnknown_0202E8CC
_0810E820: .4byte gUnknown_03000760
- thumb_func_end sub_810E7AC
+ thumb_func_end ScriptAddElevatorMenuItem
- thumb_func_start sub_810E824
-sub_810E824: @ 810E824
+ thumb_func_start ScriptShowElevatorMenu
+ScriptShowElevatorMenu: @ 810E824
push {r4,r5,lr}
movs r4, 0
ldr r5, _0810E868 @ =gUnknown_0203925A
@@ -6851,7 +6851,7 @@ sub_810E824: @ 810E824
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_810E7AC
+ bl ScriptAddElevatorMenuItem
ldr r2, _0810E870 @ =gUnknown_03000760
ldrb r0, [r2]
cmp r0, 0x10
@@ -6878,7 +6878,7 @@ _0810E85C:
_0810E868: .4byte gUnknown_0203925A
_0810E86C: .4byte gUnknown_0203925B
_0810E870: .4byte gUnknown_03000760
- thumb_func_end sub_810E824
+ thumb_func_end ScriptShowElevatorMenu
thumb_func_start sub_810E874
sub_810E874: @ 810E874
@@ -7271,7 +7271,7 @@ sub_810EB90: @ 810EB90
eors r1, r2
strb r1, [r0]
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
b _0810EBB8
.align 2, 0
_0810EBB0: .4byte gUnknown_0203925C
@@ -7296,7 +7296,7 @@ _0810EBCC:
eors r1, r2
strb r1, [r0]
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0810EBE0:
pop {r4,r5}
pop {r0}
@@ -7670,14 +7670,14 @@ sub_810EEDC: @ 810EEDC
cmp r0, 0
beq _0810EEF0
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0810EEF0:
ldrb r0, [r4]
lsrs r0, 1
cmp r0, 0x1
bne _0810EEFE
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0810EEFE:
bl BuyMenuFreeMemory
pop {r4}
@@ -7687,8 +7687,8 @@ _0810EEFE:
_0810EF08: .4byte gUnknown_0203925C
thumb_func_end sub_810EEDC
- thumb_func_start sub_810EF0C
-sub_810EF0C: @ 810EF0C
+ thumb_func_start SetTrickHouseEndRoomFlag
+SetTrickHouseEndRoomFlag: @ 810EF0C
push {lr}
ldr r1, _0810EF1C @ =gUnknown_0202E8CC
ldr r0, _0810EF20 @ =0x00000259
@@ -7699,10 +7699,10 @@ sub_810EF0C: @ 810EF0C
.align 2, 0
_0810EF1C: .4byte gUnknown_0202E8CC
_0810EF20: .4byte 0x00000259
- thumb_func_end sub_810EF0C
+ thumb_func_end SetTrickHouseEndRoomFlag
- thumb_func_start sub_810EF24
-sub_810EF24: @ 810EF24
+ thumb_func_start ResetTrickHouseEndRoomFlag
+ResetTrickHouseEndRoomFlag: @ 810EF24
push {lr}
ldr r1, _0810EF34 @ =gUnknown_0202E8CC
ldr r0, _0810EF38 @ =0x00000259
@@ -7713,12 +7713,12 @@ sub_810EF24: @ 810EF24
.align 2, 0
_0810EF34: .4byte gUnknown_0202E8CC
_0810EF38: .4byte 0x00000259
- thumb_func_end sub_810EF24
+ thumb_func_end ResetTrickHouseEndRoomFlag
- thumb_func_start sub_810EF3C
-sub_810EF3C: @ 810EF3C
+ thumb_func_start CheckLeadMonCool
+CheckLeadMonCool: @ 810EF3C
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7738,12 +7738,12 @@ _0810EF60:
_0810EF62:
pop {r1}
bx r1
- thumb_func_end sub_810EF3C
+ thumb_func_end CheckLeadMonCool
- thumb_func_start sub_810EF68
-sub_810EF68: @ 810EF68
+ thumb_func_start CheckLeadMonBeauty
+CheckLeadMonBeauty: @ 810EF68
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7763,12 +7763,12 @@ _0810EF8C:
_0810EF8E:
pop {r1}
bx r1
- thumb_func_end sub_810EF68
+ thumb_func_end CheckLeadMonBeauty
- thumb_func_start sub_810EF94
-sub_810EF94: @ 810EF94
+ thumb_func_start CheckLeadMonCute
+CheckLeadMonCute: @ 810EF94
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7788,12 +7788,12 @@ _0810EFB8:
_0810EFBA:
pop {r1}
bx r1
- thumb_func_end sub_810EF94
+ thumb_func_end CheckLeadMonCute
- thumb_func_start sub_810EFC0
-sub_810EFC0: @ 810EFC0
+ thumb_func_start CheckLeadMonSmart
+CheckLeadMonSmart: @ 810EFC0
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7813,12 +7813,12 @@ _0810EFE4:
_0810EFE6:
pop {r1}
bx r1
- thumb_func_end sub_810EFC0
+ thumb_func_end CheckLeadMonSmart
- thumb_func_start sub_810EFEC
-sub_810EFEC: @ 810EFEC
+ thumb_func_start CheckLeadMonTough
+CheckLeadMonTough: @ 810EFEC
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -7838,10 +7838,10 @@ _0810F010:
_0810F012:
pop {r1}
bx r1
- thumb_func_end sub_810EFEC
+ thumb_func_end CheckLeadMonTough
- thumb_func_start sub_810F018
-sub_810F018: @ 810F018
+ thumb_func_start IsGrassTypeInParty
+IsGrassTypeInParty: @ 810F018
push {r4-r6,lr}
movs r5, 0
ldr r6, _0810F068 @ =gBaseStats
@@ -7899,10 +7899,10 @@ _0810F082:
bx r0
.align 2, 0
_0810F08C: .4byte gScriptResult
- thumb_func_end sub_810F018
+ thumb_func_end IsGrassTypeInParty
- thumb_func_start sub_810F090
-sub_810F090: @ 810F090
+ thumb_func_start ShowGlassWorkshopMenu
+ShowGlassWorkshopMenu: @ 810F090
push {r4,r5,lr}
sub sp, 0x8
bl ScriptContext2_Enable
@@ -7960,7 +7960,7 @@ _0810F108: .4byte gUnknown_083F83C0
_0810F10C: .4byte gUnknown_0203925B
_0810F110: .4byte gUnknown_0203925A
_0810F114: .4byte sub_810F118
- thumb_func_end sub_810F090
+ thumb_func_end ShowGlassWorkshopMenu
thumb_func_start sub_810F118
sub_810F118: @ 810F118
@@ -8108,7 +8108,7 @@ _0810F240:
_0810F244:
adds r0, r4, 0
movs r1, 0x5
- bl sub_810F2DC
+ bl GlassWorkshopUpdateScrollIndicators
movs r0, 0x2
movs r1, 0x1
movs r2, 0x9
@@ -8190,8 +8190,8 @@ _0810F2D2:
_0810F2D8: .4byte gUnknown_0203925C
thumb_func_end sub_810F2B4
- thumb_func_start sub_810F2DC
-sub_810F2DC: @ 810F2DC
+ thumb_func_start GlassWorkshopUpdateScrollIndicators
+GlassWorkshopUpdateScrollIndicators: @ 810F2DC
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -8205,7 +8205,7 @@ sub_810F2DC: @ 810F2DC
eors r1, r2
strb r1, [r0]
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
b _0810F304
.align 2, 0
_0810F2FC: .4byte gUnknown_0203925C
@@ -8230,17 +8230,17 @@ _0810F318:
eors r1, r2
strb r1, [r0]
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0810F32C:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0810F334: .4byte gUnknown_0203925C
- thumb_func_end sub_810F2DC
+ thumb_func_end GlassWorkshopUpdateScrollIndicators
- thumb_func_start SpawnScriptFieldObject
-SpawnScriptFieldObject: @ 810F338
+ thumb_func_start SpawnCameraDummy
+SpawnCameraDummy: @ 810F338
push {lr}
sub sp, 0x8
ldr r0, _0810F380 @ =gSaveBlock1
@@ -8278,10 +8278,10 @@ SpawnScriptFieldObject: @ 810F338
.align 2, 0
_0810F380: .4byte gSaveBlock1
_0810F384: .4byte gMapObjects
- thumb_func_end SpawnScriptFieldObject
+ thumb_func_end SpawnCameraDummy
- thumb_func_start sub_810F388
-sub_810F388: @ 810F388
+ thumb_func_start RemoveCameraDummy
+RemoveCameraDummy: @ 810F388
push {lr}
bl GetPlayerAvatarObjectId
lsls r0, 24
@@ -8296,12 +8296,12 @@ sub_810F388: @ 810F388
bx r0
.align 2, 0
_0810F3A8: .4byte gSaveBlock1
- thumb_func_end sub_810F388
+ thumb_func_end RemoveCameraDummy
- thumb_func_start sub_810F3AC
-sub_810F3AC: @ 810F3AC
+ thumb_func_start GetPokeblockNameByMonNature
+GetPokeblockNameByMonNature: @ 810F3AC
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -8320,10 +8320,10 @@ sub_810F3AC: @ 810F3AC
.align 2, 0
_0810F3D4: .4byte gPlayerParty
_0810F3D8: .4byte gStringVar1
- thumb_func_end sub_810F3AC
+ thumb_func_end GetPokeblockNameByMonNature
- thumb_func_start sub_810F3DC
-sub_810F3DC: @ 810F3DC
+ thumb_func_start GetSecretBaseNearbyMapName
+GetSecretBaseNearbyMapName: @ 810F3DC
push {r4,lr}
ldr r4, _0810F3FC @ =gStringVar1
ldr r0, _0810F400 @ =0x00004026
@@ -8340,7 +8340,7 @@ sub_810F3DC: @ 810F3DC
.align 2, 0
_0810F3FC: .4byte gStringVar1
_0810F400: .4byte 0x00004026
- thumb_func_end sub_810F3DC
+ thumb_func_end GetSecretBaseNearbyMapName
thumb_func_start sub_810F404
sub_810F404: @ 810F404
@@ -8500,10 +8500,10 @@ _0810F51E:
bx r1
thumb_func_end sub_810F4FC
- thumb_func_start sub_810F524
-sub_810F524: @ 810F524
+ thumb_func_start LeadMonHasEffortRibbon
+LeadMonHasEffortRibbon: @ 810F524
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -8519,10 +8519,10 @@ sub_810F524: @ 810F524
bx r1
.align 2, 0
_0810F548: .4byte gPlayerParty
- thumb_func_end sub_810F524
+ thumb_func_end LeadMonHasEffortRibbon
- thumb_func_start sub_810F54C
-sub_810F54C: @ 810F54C
+ thumb_func_start GivLeadMonEffortRibbon
+GivLeadMonEffortRibbon: @ 810F54C
push {lr}
sub sp, 0x4
movs r0, 0x2A
@@ -8532,7 +8532,7 @@ sub_810F54C: @ 810F54C
movs r1, 0x1
mov r0, sp
strb r1, [r0]
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -8548,19 +8548,19 @@ sub_810F54C: @ 810F54C
.align 2, 0
_0810F580: .4byte 0x0000083b
_0810F584: .4byte gPlayerParty
- thumb_func_end sub_810F54C
+ thumb_func_end GivLeadMonEffortRibbon
- thumb_func_start sub_810F588
-sub_810F588: @ 810F588
+ thumb_func_start GetLeadMonEVCount
+GetLeadMonEVCount: @ 810F588
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
muls r0, r1
ldr r1, _0810F5AC @ =gPlayerParty
adds r0, r1
- bl sub_8040020
+ bl GetMonEVCount
lsls r0, 16
ldr r1, _0810F5B0 @ =0x01fd0000
cmp r0, r1
@@ -8575,7 +8575,7 @@ _0810F5B4:
_0810F5B6:
pop {r1}
bx r1
- thumb_func_end sub_810F588
+ thumb_func_end GetLeadMonEVCount
thumb_func_start sub_810F5BC
sub_810F5BC: @ 810F5BC
@@ -8635,8 +8635,8 @@ sub_810F618: @ 810F618
_0810F624: .4byte 0x0000085f
thumb_func_end sub_810F618
- thumb_func_start sub_810F628
-sub_810F628: @ 810F628
+ thumb_func_start PutZigzagoonInPlayerParty
+PutZigzagoonInPlayerParty: @ 810F628
push {r4,r5,lr}
sub sp, 0x14
ldr r5, _0810F690 @ =gPlayerParty
@@ -8685,10 +8685,10 @@ sub_810F628: @ 810F628
bx r0
.align 2, 0
_0810F690: .4byte gPlayerParty
- thumb_func_end sub_810F628
+ thumb_func_end PutZigzagoonInPlayerParty
- thumb_func_start sub_810F694
-sub_810F694: @ 810F694
+ thumb_func_start IsStarterInParty
+IsStarterInParty: @ 810F694
push {r4-r6,lr}
ldr r0, _0810F6D0 @ =0x00004023
bl VarGet
@@ -8730,10 +8730,10 @@ _0810F6E4:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_810F694
+ thumb_func_end IsStarterInParty
- thumb_func_start sub_810F6EC
-sub_810F6EC: @ 810F6EC
+ thumb_func_start CheckFreePokemonStorageSpace
+CheckFreePokemonStorageSpace: @ 810F6EC
push {r4-r6,lr}
movs r5, 0
_0810F6F0:
@@ -8775,14 +8775,14 @@ _0810F732:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_810F6EC
+ thumb_func_end CheckFreePokemonStorageSpace
- thumb_func_start sub_810F738
-sub_810F738: @ 810F738
+ thumb_func_start IsPokerusInParty
+IsPokerusInParty: @ 810F738
push {lr}
ldr r0, _0810F74C @ =gPlayerParty
movs r1, 0x3F
- bl sub_8040110
+ bl CheckPartyPokerus
lsls r0, 24
cmp r0, 0
beq _0810F750
@@ -8795,7 +8795,7 @@ _0810F750:
_0810F752:
pop {r1}
bx r1
- thumb_func_end sub_810F738
+ thumb_func_end IsPokerusInParty
thumb_func_start sub_810F758
sub_810F758: @ 810F758
@@ -8912,8 +8912,8 @@ sub_810F828: @ 810F828
bx r1
thumb_func_end sub_810F828
- thumb_func_start sub_810F83C
-sub_810F83C: @ 810F83C
+ thumb_func_start SetRoute119Weather
+SetRoute119Weather: @ 810F83C
push {lr}
bl get_map_light_from_warp0
lsls r0, 24
@@ -8928,10 +8928,10 @@ sub_810F83C: @ 810F83C
_0810F858:
pop {r0}
bx r0
- thumb_func_end sub_810F83C
+ thumb_func_end SetRoute119Weather
- thumb_func_start sub_810F85C
-sub_810F85C: @ 810F85C
+ thumb_func_start SetRoute123Weather
+SetRoute123Weather: @ 810F85C
push {lr}
bl get_map_light_from_warp0
lsls r0, 24
@@ -8946,10 +8946,10 @@ sub_810F85C: @ 810F85C
_0810F878:
pop {r0}
bx r0
- thumb_func_end sub_810F85C
+ thumb_func_end SetRoute123Weather
- thumb_func_start sub_810F87C
-sub_810F87C: @ 810F87C
+ thumb_func_start GetLeadMonIndex
+GetLeadMonIndex: @ 810F87C
push {r4-r6,lr}
bl CalculatePlayerPartyCount
lsls r0, 24
@@ -8993,10 +8993,10 @@ _0810F8CC:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_810F87C
+ thumb_func_end GetLeadMonIndex
- thumb_func_start sub_810F8D4
-sub_810F8D4: @ 810F8D4
+ thumb_func_start ScriptGetPartyMonSpecies
+ScriptGetPartyMonSpecies: @ 810F8D4
push {lr}
ldr r0, _0810F8F4 @ =gUnknown_0202E8CC
ldrh r1, [r0]
@@ -9014,7 +9014,7 @@ sub_810F8D4: @ 810F8D4
.align 2, 0
_0810F8F4: .4byte gUnknown_0202E8CC
_0810F8F8: .4byte gPlayerParty
- thumb_func_end sub_810F8D4
+ thumb_func_end ScriptGetPartyMonSpecies
thumb_func_start sub_810F8FC
sub_810F8FC: @ 810F8FC
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index 237a79dd9..a9b2a4aaa 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -234,7 +234,7 @@ _0803E35C:
mov r0, r8
movs r2, 0
ldr r3, [sp, 0xC]
- bl sub_8111924
+ bl BeginEvolutionScene
movs r0, 0
bl _0803F15C
_0803E36C:
@@ -888,7 +888,7 @@ _0803E88C:
.4byte _0803EDF4
_0803E8AC:
mov r0, r8
- bl sub_8040020
+ bl GetMonEVCount
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _0803E8EC @ =0x000001fd
@@ -1593,7 +1593,7 @@ _0803EE54:
.4byte _0803F07C
_0803EE74:
mov r0, r8
- bl sub_8040020
+ bl GetMonEVCount
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _0803EEBC @ =0x000001fd
@@ -4020,8 +4020,8 @@ _0804000E:
_0804001C: .4byte 0x000001fd
thumb_func_end sub_803FE70
- thumb_func_start sub_8040020
-sub_8040020: @ 8040020
+ thumb_func_start GetMonEVCount
+GetMonEVCount: @ 8040020
push {r4-r6,lr}
adds r6, r0, 0
movs r5, 0
@@ -4042,7 +4042,7 @@ _08040028:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8040020
+ thumb_func_end GetMonEVCount
thumb_func_start sub_8040048
sub_8040048: @ 8040048
@@ -4144,8 +4144,8 @@ _08040104:
_0804010C: .4byte gBitTable
thumb_func_end sub_8040048
- thumb_func_start sub_8040110
-sub_8040110: @ 8040110
+ thumb_func_start CheckPartyPokerus
+CheckPartyPokerus: @ 8040110
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
@@ -4199,7 +4199,7 @@ _0804016C:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8040110
+ thumb_func_end CheckPartyPokerus
thumb_func_start sub_8040178
sub_8040178: @ 8040178
@@ -4927,7 +4927,7 @@ sub_80406D8: @ 80406D8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl sub_806912C
+ bl IsNationalPokedex
cmp r0, 0
beq _080406F2
adds r0, r4, 0
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 19eed0e99..d3a9c1f02 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -2389,8 +2389,8 @@ _08069124: .4byte 0x00000302
_08069128: .4byte 0x00000836
thumb_func_end sub_80690F0
- thumb_func_start sub_806912C
-sub_806912C: @ 806912C
+ thumb_func_start IsNationalPokedex
+IsNationalPokedex: @ 806912C
push {lr}
ldr r0, _08069154 @ =gSaveBlock2
ldrb r0, [r0, 0x1A]
@@ -2419,7 +2419,7 @@ _08069164:
_08069166:
pop {r1}
bx r1
- thumb_func_end sub_806912C
+ thumb_func_end IsNationalPokedex
thumb_func_start unref_sub_806916C
unref_sub_806916C: @ 806916C
diff --git a/asm/rom_806936C.s b/asm/rom_806936C.s
index 35f73211b..068b70736 100644
--- a/asm/rom_806936C.s
+++ b/asm/rom_806936C.s
@@ -2196,7 +2196,7 @@ sub_806A390: @ 806A390
adds r0, r4, 0
bl sub_810D2F4
adds r0, r4, 0
- bl sub_810D410
+ bl UpdateBirchState
adds r0, r4, 0
bl sub_810F618
adds r0, r4, 0
diff --git a/asm/rom_806D7F8.s b/asm/rom_806D7F8.s
index 2cea0374e..7993c1aac 100644
--- a/asm/rom_806D7F8.s
+++ b/asm/rom_806D7F8.s
@@ -6379,7 +6379,7 @@ _08070B40:
ldrb r3, [r7, 0x5]
adds r1, r2, 0
movs r2, 0x1
- bl sub_8111924
+ bl BeginEvolutionScene
adds r0, r6, 0
bl DestroyTask
b _08070C2C
@@ -6525,7 +6525,7 @@ _08070C8C:
ldrb r3, [r7, 0x5]
adds r1, r2, 0
movs r2, 0x1
- bl sub_8111924
+ bl BeginEvolutionScene
adds r0, r6, 0
bl DestroyTask
b _08070D68
diff --git a/asm/rom_8094928.s b/asm/rom_8094928.s
index 161fb57f2..7274a255a 100644
--- a/asm/rom_8094928.s
+++ b/asm/rom_8094928.s
@@ -24895,7 +24895,7 @@ sub_80A0EA4: @ 80A0EA4
ldr r5, _080A0ECC @ =0x0600e444
ldr r6, _080A0ED0 @ =0x0600ec44
movs r1, 0
- bl sub_8040110
+ bl CheckPartyPokerus
lsls r0, 24
cmp r0, 0
bne _080A0ED4
@@ -26767,7 +26767,7 @@ _080A1CEA:
bne _080A1D12
adds r0, r4, 0
movs r1, 0
- bl sub_8040110
+ bl CheckPartyPokerus
lsls r0, 24
cmp r0, 0
bne _080A1D10
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 994f6a5c5..407e07162 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -19371,8 +19371,8 @@ sub_813452C: @ 813452C
_08134534: .4byte gSaveBlock1 + 0x3144
thumb_func_end sub_813452C
- thumb_func_start sub_8134538
-sub_8134538: @ 8134538
+ thumb_func_start GetRoamerLocation
+GetRoamerLocation: @ 8134538
ldr r3, _08134544 @ =gRoamerLocation
ldrb r2, [r3]
strb r2, [r0]
@@ -19381,7 +19381,7 @@ sub_8134538: @ 8134538
bx lr
.align 2, 0
_08134544: .4byte gRoamerLocation
- thumb_func_end sub_8134538
+ thumb_func_end GetRoamerLocation
thumb_func_start sub_8134548
sub_8134548: @ 8134548
@@ -31256,9 +31256,9 @@ sub_813A468: @ 813A468
lsrs r5, 24
bl BuyMenuFreeMemory
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0
movs r1, 0
movs r2, 0x1D
@@ -32342,7 +32342,7 @@ _0813AD04:
_0813AD1C: .4byte gOtherText_CancelNoTerminator
_0813AD20:
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0813AD26:
movs r1, 0x2
ldrsh r0, [r6, r1]
@@ -32360,7 +32360,7 @@ _0813AD26:
b _0813AD4A
_0813AD44:
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0813AD4A:
add sp, 0x4
pop {r3}
@@ -32818,7 +32818,7 @@ _0813B0C4:
_0813B0D0: .4byte gOtherText_CancelNoTerminator
_0813B0D4:
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0813B0DA:
ldr r0, _0813B0F4 @ =0x0201fe00
ldrb r1, [r0, 0x2]
@@ -32836,7 +32836,7 @@ _0813B0DA:
_0813B0F4: .4byte 0x0201fe00
_0813B0F8:
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
_0813B0FE:
pop {r3}
mov r8, r3
@@ -33025,9 +33025,9 @@ sub_813B27C: @ 813B27C
push {lr}
bl BuyMenuFreeMemory
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
pop {r0}
bx r0
thumb_func_end sub_813B27C
diff --git a/asm/rom_813BA94.s b/asm/rom_813BA94.s
index 3ef0309e3..d5ee794a0 100644
--- a/asm/rom_813BA94.s
+++ b/asm/rom_813BA94.s
@@ -6694,8 +6694,8 @@ _0813EE7A:
_0813EEB0: .4byte gSineTable
thumb_func_end sub_813EDFC
- thumb_func_start sub_813EEB4
-sub_813EEB4: @ 813EEB4
+ thumb_func_start FieldInitRegionMap
+FieldInitRegionMap: @ 813EEB4
push {r4,lr}
adds r4, r0, 0
movs r0, 0
@@ -6714,11 +6714,11 @@ sub_813EEB4: @ 813EEB4
.align 2, 0
_0813EED8: .4byte 0x02000000
_0813EEDC: .4byte 0x00000888
-_0813EEE0: .4byte sub_813EEE4
- thumb_func_end sub_813EEB4
+_0813EEE0: .4byte CB2_FieldInitRegionMap
+ thumb_func_end FieldInitRegionMap
- thumb_func_start sub_813EEE4
-sub_813EEE4: @ 813EEE4
+ thumb_func_start CB2_FieldInitRegionMap
+CB2_FieldInitRegionMap: @ 813EEE4
push {r4,lr}
sub sp, 0x4
movs r0, 0x80
@@ -6799,22 +6799,22 @@ _0813EF98: .4byte 0x02000008
_0813EF9C: .4byte gWindowConfig_81E709C
_0813EFA0: .4byte REG_BG0CNT
_0813EFA4: .4byte gOtherText_Hoenn
-_0813EFA8: .4byte sub_813EFC4
-_0813EFAC: .4byte sub_813EFB0
- thumb_func_end sub_813EEE4
+_0813EFA8: .4byte CB2_FieldRegionMap
+_0813EFAC: .4byte VBlankCB_FieldRegionMap
+ thumb_func_end CB2_FieldInitRegionMap
- thumb_func_start sub_813EFB0
-sub_813EFB0: @ 813EFB0
+ thumb_func_start VBlankCB_FieldRegionMap
+VBlankCB_FieldRegionMap: @ 813EFB0
push {lr}
bl LoadOam
bl ProcessSpriteCopyRequests
bl TransferPlttBuffer
pop {r0}
bx r0
- thumb_func_end sub_813EFB0
+ thumb_func_end VBlankCB_FieldRegionMap
- thumb_func_start sub_813EFC4
-sub_813EFC4: @ 813EFC4
+ thumb_func_start CB2_FieldRegionMap
+CB2_FieldRegionMap: @ 813EFC4
push {lr}
bl sub_813EFDC
bl AnimateSprites
@@ -6822,7 +6822,7 @@ sub_813EFC4: @ 813EFC4
bl UpdatePaletteFade
pop {r0}
bx r0
- thumb_func_end sub_813EFC4
+ thumb_func_end CB2_FieldRegionMap
thumb_func_start sub_813EFDC
sub_813EFDC: @ 813EFDC
@@ -14892,7 +14892,7 @@ sub_8142FCC: @ 8142FCC
beq _08142FE6
adds r0, r4, 0
bl DestroyTask
- bl sub_810D62C
+ bl ReturnFromHallOfFamePC
_08142FE6:
pop {r4}
pop {r0}
diff --git a/asm/roulette.s b/asm/roulette.s
index f26f66698..b7b97558a 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -7523,8 +7523,8 @@ _08118D20:
_08118D28: .4byte sub_8118CAC
thumb_func_end sub_8118CEC
- thumb_func_start prev_quest_read_x24_hm_usage
-prev_quest_read_x24_hm_usage: @ 8118D2C
+ thumb_func_start sub_8118D2C
+sub_8118D2C: @ 8118D2C
push {r4,r5,lr}
adds r5, r0, 0
bl sub_8118724
@@ -7608,7 +7608,7 @@ _08118DDC:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end prev_quest_read_x24_hm_usage
+ thumb_func_end sub_8118D2C
thumb_func_start sub_8118DE4
sub_8118DE4: @ 8118DE4
@@ -7810,7 +7810,7 @@ _08118F74:
.align 2, 0
_08118F80: .4byte 0xbfc00000
_08118F84: .4byte 0x3dae147b
-_08118F88: .4byte prev_quest_read_x24_hm_usage
+_08118F88: .4byte sub_8118D2C
thumb_func_end sub_8118DE4
thumb_func_start sub_8118F8C
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 15c629364..5d28e1455 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -2465,7 +2465,7 @@ _080BC75A:
adds r2, r4, 0
bl MenuPrint
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
cmp r6, 0x7
beq _080BC7B2
lsls r1, r6, 25
@@ -2493,7 +2493,7 @@ _080BC7B2:
cmp r0, 0
bne _080BC7C4
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
b _080BC7CE
_080BC7C4:
movs r0, 0
@@ -2854,9 +2854,9 @@ sub_80BCA84: @ 80BCA84
ldr r0, _080BCAD8 @ =gTasks + 0x8
adds r4, r0
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
bl sub_8072DEC
movs r0, 0
movs r1, 0
@@ -3080,9 +3080,9 @@ sub_80BCC54: @ 80BCC54
lsrs r4, 16
bl BuyMenuFreeMemory
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
cmp r4, 0
bne _080BCC8C
ldr r0, _080BCC88 @ =gUnknown_0815F399
diff --git a/asm/sound_check_menu.s b/asm/sound_check_menu.s
index 3c5335382..25a524258 100644
--- a/asm/sound_check_menu.s
+++ b/asm/sound_check_menu.s
@@ -2250,7 +2250,7 @@ _080BB2BE:
_080BB306:
adds r0, r4, 0
movs r1, 0x2
- bl sub_811A3CC
+ bl ShowPokedexCryScreen
lsls r0, 24
cmp r0, 0
beq _080BB306
@@ -2411,7 +2411,7 @@ _080BB42E:
adds r0, r1
ldr r1, _080BB490 @ =sub_80BA258
str r1, [r0]
- bl sub_811A4F8
+ bl DestroyCryMeterNeedleSprite
_080BB472:
pop {r4,r5}
pop {r0}
diff --git a/asm/trade.s b/asm/trade.s
index 1a7773594..7896289d7 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -10596,7 +10596,7 @@ _0804D4CC:
adds r1, 0xB9
ldrb r2, [r1]
adds r1, r4, 0
- bl sub_81120E4
+ bl TradeEvolutionScene
b _0804D538
.align 2, 0
_0804D510: .4byte gUnknown_0202E8CE
@@ -10708,7 +10708,7 @@ _0804D5B8:
adds r1, 0xB9
ldrb r2, [r1]
adds r1, r4, 0
- bl sub_81120E4
+ bl TradeEvolutionScene
b _0804D60E
.align 2, 0
_0804D5F4: .4byte gUnknown_03005E94
diff --git a/asm/trader.s b/asm/trader.s
index 34f41fbd5..3800588e3 100644
--- a/asm/trader.s
+++ b/asm/trader.s
@@ -516,9 +516,9 @@ sub_8109D04: @ 8109D04
movs r3, 0x13
bl MenuZeroFillWindowRect
movs r0, 0
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
movs r0, 0x1
- bl SetBgTilemapBuffer
+ bl DestroyVerticalScrollIndicator
ldr r0, _08109D6C @ =gUnknown_020388F7
movs r1, 0x8
bl sub_80F9520
diff --git a/asm/tv.s b/asm/tv.s
index 1544034b8..227710573 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -1854,7 +1854,7 @@ sub_80BE5FC: @ 80BE5FC
adds r0, 0x10
ldr r1, _080BE654 @ =gSaveBlock2
bl StringCopy
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -1931,7 +1931,7 @@ sub_80BE6A0: @ 80BE6A0
strb r0, [r4]
movs r0, 0x1
strb r0, [r4, 0x1]
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -1963,7 +1963,7 @@ sub_80BE6A0: @ 80BE6A0
adds r0, r4, 0x5
ldr r1, _080BE770 @ =gSaveBlock2
bl StringCopy
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -1975,7 +1975,7 @@ sub_80BE6A0: @ 80BE6A0
movs r1, 0x2
adds r2, r5, 0
bl GetMonData
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -3572,7 +3572,7 @@ sub_80BF334: @ 80BF334
cmp r0, 0
bne _080BF384
ldr r4, _080BF390 @ =gStringVar1
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -3651,7 +3651,7 @@ sub_80BF3DC: @ 80BF3DC
cmp r0, 0
bne _080BF448
ldr r6, _080BF454 @ =gStringVar1
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
movs r5, 0x64
@@ -3667,7 +3667,7 @@ sub_80BF3DC: @ 80BF3DC
adds r1, r0
adds r0, r6, 0
bl StringCopy
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
muls r0, r5
@@ -3824,7 +3824,7 @@ _080BF53E:
thumb_func_start sub_80BF544
sub_80BF544: @ 80BF544
push {lr}
- bl sub_810F87C
+ bl GetLeadMonIndex
lsls r0, 24
lsrs r0, 24
bl sub_80BF4F4
diff --git a/data/specials.s b/data/specials.s
index 33ac3f6e8..3b13fab37 100644
--- a/data/specials.s
+++ b/data/specials.s
@@ -37,7 +37,7 @@ gSpecials::
.4byte sub_8083B80
.4byte sub_8083820
.4byte sub_8083614
- .4byte sub_810DAC8
+ .4byte GetLinkPartnerNames
.4byte sub_810DB28
.4byte sub_8047A40
.4byte copy_player_party_from_sav1
@@ -141,17 +141,17 @@ gSpecials::
.4byte ShowContestWinner
.4byte sub_810DCCC
.4byte sub_810DC7C
- .4byte sub_810E24C
+ .4byte ShowFieldMessageStringVar4
.4byte DrawWholeMapView
- .4byte sub_810E25C
+ .4byte StorePlayerCoordsInVars
.4byte sub_810DEDC
.4byte sub_810E070
.4byte sub_810E230
- .4byte sub_810E278
- .4byte sub_810E298
- .4byte sub_810E2CC
- .4byte sub_810E348
- .4byte sub_810E30C
+ .4byte GetPlayerTrainerIdOnesDigit
+ .4byte GetPlayerBigGuyGirlString
+ .4byte GetRivalSonDaughterString
+ .4byte SetFlagInVar
+ .4byte CableCarWarp
.4byte sub_8123218
.4byte sub_8053E90
.4byte sub_806A460
@@ -196,15 +196,15 @@ gSpecials::
.4byte ScriptHatchMon
.4byte EggHatch
.4byte sub_8042B4C
- .4byte sub_811043C
+ .4byte ShowLinkBattleRecords
.4byte sub_80B7CE8
.4byte sub_80B7D0C
.4byte DoWhiteOut
.4byte sp0C8_whiteout_maybe
.4byte sub_80C8040
.4byte sub_80C8080
- .4byte sub_810D980
- .4byte sub_810D9A0
+ .4byte SetSSTidalFlag
+ .4byte ResetSSTidalFlag
.4byte sub_80C81B8
.4byte sub_80C81E4
.4byte sub_80C82EC
@@ -212,25 +212,25 @@ gSpecials::
.4byte sub_810D32C
.4byte sub_810D378
.4byte sub_810D3FC
- .4byte sub_810D43C
- .4byte sub_810D600
- .4byte sub_810E424
- .4byte sub_810E59C
- .4byte sub_810E74C
- .4byte sub_810E638
- .4byte sub_810E724
+ .4byte ScriptGetPokedexInfo
+ .4byte ShowPokedexRatingMessage
+ .4byte DoPCTurnOnEffect
+ .4byte DoPCTurnOffEffect
+ .4byte SetDepartmentStoreFloorVar
+ .4byte DoLotteryCornerComputerEffect
+ .4byte EndLotteryCornerComputerEffect
.4byte sub_80F9A4C
.4byte sub_80F9EEC
.4byte sub_80FA0DC
.4byte sub_80F9F84
.4byte sub_80F9F3C
.4byte sub_8132670
- .4byte sub_810D8EC
- .4byte sub_810D6FC
- .4byte sp0E3_walkrun_bitfield_interpretation
- .4byte sub_810D85C
- .4byte sub_810D934
- .4byte sub_810E384
+ .4byte GetRecordedCyclingRoadResults
+ .4byte BeginCyclingRoadChallenge
+ .4byte GetPlayerAvatarBike
+ .4byte FinishCyclingRoadChallenge
+ .4byte UpdateCyclingRoadState
+ .4byte GetLeadMonFriendshipScore
.4byte sub_8134548
.4byte sub_81347F8
.4byte sub_81352E4
@@ -251,39 +251,39 @@ gSpecials::
.4byte ReducePlayerPartyToThree
.4byte sub_8139C74
.4byte sub_8139CB4
- .4byte sub_810E414
+ .4byte FieldShowRegionMap
.4byte sub_804D89C
.4byte sub_804DB68
.4byte sub_804E174
.4byte sub_804DB2C
- .4byte sub_810E35C
+ .4byte GetWeekCount
.4byte sub_8145AEC
.4byte sub_8145B00
.4byte ShowBerryBlenderRecordWindow
- .4byte sub_810EF24
- .4byte sub_810EF0C
+ .4byte ResetTrickHouseEndRoomFlag
+ .4byte SetTrickHouseEndRoomFlag
.4byte sp109_CreatePCMenu
- .4byte sub_810D618
+ .4byte AccessHallOfFamePC
.4byte sub_810D6A4
- .4byte sub_810EF3C
- .4byte sub_810EF68
- .4byte sub_810EF94
- .4byte sub_810EFC0
- .4byte sub_810EFEC
+ .4byte CheckLeadMonCool
+ .4byte CheckLeadMonBeauty
+ .4byte CheckLeadMonCute
+ .4byte CheckLeadMonSmart
+ .4byte CheckLeadMonTough
.4byte sub_80C7958
.4byte DoSoftReset
.4byte sub_810D180
.4byte sub_810EBEC
- .4byte sub_810F090
- .4byte SpawnScriptFieldObject
- .4byte sub_810F388
- .4byte sub_810F3AC
- .4byte sub_810F3DC
+ .4byte ShowGlassWorkshopMenu
+ .4byte SpawnCameraDummy
+ .4byte RemoveCameraDummy
+ .4byte GetPokeblockNameByMonNature
+ .4byte GetSecretBaseNearbyMapName
.4byte sub_8147478
.4byte sub_814768C
.4byte sub_80818A4
.4byte sub_80818FC
- .4byte sub_81105E4
+ .4byte ShowBattleTowerRecords
.4byte sub_810D3E8
.4byte sub_810F414
.4byte sub_810F424
@@ -292,23 +292,23 @@ gSpecials::
.4byte sub_810F4B0
.4byte sub_810F4D4
.4byte sub_810F4FC
- .4byte sub_810F524
- .4byte sub_810F54C
- .4byte sub_810F588
+ .4byte LeadMonHasEffortRibbon
+ .4byte GivLeadMonEffortRibbon
+ .4byte GetLeadMonEVCount
.4byte sub_8064EAC
.4byte sub_8064ED4
.4byte sub_813430C
.4byte sub_810F5BC
- .4byte sub_810F018
+ .4byte IsGrassTypeInParty
.4byte sub_8081334
- .4byte sub_810F628
- .4byte sub_810F694
+ .4byte PutZigzagoonInPlayerParty
+ .4byte IsStarterInParty
.4byte sub_80BC224
- .4byte sub_810F6EC
+ .4byte CheckFreePokemonStorageSpace
.4byte sub_81477B4
.4byte sub_810E944
.4byte GetShieldToyTVDecorationInfo
- .4byte sub_810F738
+ .4byte IsPokerusInParty
.4byte sub_8069D78
.4byte sub_810F758
.4byte sub_8081BF8
@@ -324,10 +324,10 @@ gSpecials::
.4byte sub_80C5164
.4byte sub_8134AB4
.4byte sub_8081B78
- .4byte sub_810F83C
- .4byte sub_810F85C
+ .4byte SetRoute119Weather
+ .4byte SetRoute123Weather
.4byte ScriptGetMultiplayerId
- .4byte sub_810F8D4
+ .4byte ScriptGetPartyMonSpecies
.4byte sub_80FA148
.4byte sub_810F8FC
.4byte sub_80BC50C
diff --git a/src/new_game.c b/src/new_game.c
index 11449a7c7..3225ba2bd 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -109,7 +109,7 @@ void NewGameInitData(void)
sub_80AB1B0();
sub_80530AC();
sub_8052DA8();
- GameFreakRTC_Reset();
+ InitLinkBattleRecords();
InitShroomishSizeRecord();
InitBarboachSizeRecord();
gPlayerPartyCount = 0;
diff --git a/src/pokedex.c b/src/pokedex.c
index ae4aafbf2..b45a123d5 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -81,8 +81,8 @@ extern u8 gUnknown_0839F73C[];
extern void m4aMPlayVolumeControl(struct MusicPlayerInfo *mplayInfo, u16 trackBits, u16 volume);
extern bool8 BeginNormalPaletteFade(u32, s8, u8, u8, u16);
extern void remove_some_task(void);
-extern bool32 sub_806912C(void);
-extern u16 pokedex_count(u8);
+extern bool32 IsNationalPokedex(void);
+extern u16 GetNationalPokedexCount(u8);
extern u8 sub_8091E3C(void);
extern void sub_80690C8(void);
extern void sub_805469C(void);
@@ -120,7 +120,7 @@ void sub_808F284(struct PokedexListItem *, u8);
bool8 sub_808F250(u8);
bool8 sub_808E71C(void);
void sub_808CCC4(u8 taskId);
-u16 sub_8090F68(u8);
+u16 GetHoennPokedexCount(u8);
void sub_808D690(u8, u8);
void Task_PokedexResultsScreen(u8 taskId);
void sub_808D118(u8 taskId);
@@ -290,22 +290,22 @@ void CB2_InitPokedex(void)
ClearPokedexView(gUnknown_0202FFB4);
CreateTask(Task_PokedexShowMainScreen, 0);
gUnknown_0202FFB4->unk612 = gSaveBlock2.pokedex.unknown1;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
gUnknown_0202FFB4->unk612 = 0;
gUnknown_0202FFB4->unk616 = gSaveBlock2.pokedex.order;
gUnknown_0202FFB4->unk60E = gUnknown_0202FFB8;
gUnknown_0202FFB4->unk62C = gUnknown_0202FFBA;
gUnknown_0202FFB4->unk64D = 0;
gUnknown_0202FFB4->unk64E = 0;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
{
- gUnknown_0202FFB4->unk61A = sub_8090F68(0);
- gUnknown_0202FFB4->unk61C = sub_8090F68(1);
+ gUnknown_0202FFB4->unk61A = GetHoennPokedexCount(0);
+ gUnknown_0202FFB4->unk61C = GetHoennPokedexCount(1);
}
else
{
- gUnknown_0202FFB4->unk61A = pokedex_count(0);
- gUnknown_0202FFB4->unk61C = pokedex_count(1);
+ gUnknown_0202FFB4->unk61A = GetNationalPokedexCount(0);
+ gUnknown_0202FFB4->unk61C = GetNationalPokedexCount(1);
}
gUnknown_0202FFB4->unk62D = 8;
gMain.state++;
@@ -542,7 +542,7 @@ void sub_808CB8C(u8 taskId)
gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
gUnknown_0202FFB4->unk612 = 0;
gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -555,7 +555,7 @@ void Task_ClosePokedex(u8 taskId)
if(!gPaletteFade.active)
{
gSaveBlock2.pokedex.unknown1 = gUnknown_0202FFB4->unk612;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
gSaveBlock2.pokedex.unknown1 = 0;
gSaveBlock2.pokedex.order = gUnknown_0202FFB4->unk616;
DestroyTask(taskId);
@@ -726,7 +726,7 @@ void Task_PokedexResultsScreenReturnToMainScreen(u8 taskId)
gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
gUnknown_0202FFB4->unk612 = 0;
gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
gTasks[taskId].func = Task_PokedexShowMainScreen;
@@ -740,7 +740,7 @@ void Task_PokedexResultsScreenExitPokedex(u8 taskId)
gUnknown_0202FFB4->unk62C = gUnknown_0202FFB4->unk62A;
gUnknown_0202FFB4->unk60E = gUnknown_0202FFB4->unk610;
gUnknown_0202FFB4->unk612 = gUnknown_0202FFB4->unk614;
- if(!sub_806912C())
+ if(!IsNationalPokedex())
gUnknown_0202FFB4->unk612 = 0;
gUnknown_0202FFB4->unk616 = gUnknown_0202FFB4->unk618;
gTasks[taskId].func = Task_ClosePokedex;
@@ -837,7 +837,7 @@ void sub_808D640(void)
{
if(gUnknown_0202FFB4->unk64C_1)
LoadPalette(gUnknown_0839F67C + 0x2, 1, 0xBE);
- else if(!sub_806912C())
+ else if(!IsNationalPokedex())
LoadPalette(gPokedexMenu_Pal + 0x2, 1, 0xBE);
else
LoadPalette(gUnknown_0839F73C + 0x2, 1, 0xBE);
@@ -859,7 +859,7 @@ void sub_808D690(u8 a, u8 mode)
vars[1] = 1;
break;
case 1:
- if(sub_806912C())
+ if(IsNationalPokedex())
{
vars[0] = 386;
vars[1] = 0;
diff --git a/src/rom4.c b/src/rom4.c
index 3223c7680..ce067b104 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -283,7 +283,7 @@ void sub_805308C(void)
{
FlagReset(2092);
sub_8054164();
- wild_pokemon_reroll();
+ ResetCyclingRoadChallengeData();
mapnumbers_history_shift_sav1_0_2_4_out();
sub_8134348();
}
@@ -638,7 +638,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
set_current_map_header_from_sav1_save_old_name();
sub_8053154();
sub_806906C();
- wild_pokemon_reroll();
+ ResetCyclingRoadChallengeData();
prev_quest_postbuffer_cursor_backup_reset();
sub_8082BD0(mapGroup, mapNum);
DoTimeBasedEvents();
@@ -671,7 +671,7 @@ void sub_8053994(u32 a1)
v2 = is_light_level_1_2_3_5_or_6(gMapHeader.light);
v3 = is_light_level_8_or_9(gMapHeader.light);
sub_806906C();
- wild_pokemon_reroll();
+ ResetCyclingRoadChallengeData();
prev_quest_postbuffer_cursor_backup_reset();
sub_8082BD0(gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum);
if (a1 != 1)
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index d7c07673f..c5c00500e 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -127,10 +127,10 @@ u16 GetPokedexSeenCount()
{
u16 pokedexSeenCount;
- if ( sub_806912C() ) // national dex check?
- pokedexSeenCount = pokedex_count(1);
+ if ( IsNationalPokedex() ) // national dex check?
+ pokedexSeenCount = GetNationalPokedexCount(1);
else
- pokedexSeenCount = sub_8090F68(1);
+ pokedexSeenCount = GetHoennPokedexCount(1);
return pokedexSeenCount;
}
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 871e5cce2..d25ce88e0 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -90,7 +90,7 @@ extern bool8 sub_80B58C4(u16, u8, u8);
extern void *picbox_close(void);
extern void sub_8106630(u32);
extern void ShowContestWinner(void);
-extern u8 sub_810F87C(void);
+extern u8 GetLeadMonIndex(void);
extern void CopyItemName(u16, u8 *);
extern u8 sub_80BF0B8(u32);
extern void sub_80B79B8(u32 *, u32);
@@ -99,9 +99,9 @@ extern bool8 IsEnoughMoney(u32, u32);
extern void sub_80B7C14(u32, u8, u8);
extern void RemoveMoneyLabelObject(u8, u8);
extern void sub_80B7BEC(u32, u8, u8);
-extern void sub_811A72C(u32, u8, u8);
-extern void sub_811A770(u8, u8);
-extern void sub_811A704(u32, u8, u8);
+extern void ShowCoinsWindow(u32, u8, u8);
+extern void HideCoinsWindow(u8, u8);
+extern void UpdateCoinsWindow(u32, u8, u8);
extern void *TrainerBattleConfigure(u8 *);
extern void sub_80825E4(void);
extern u8 *sub_80826E8(void);
@@ -131,8 +131,8 @@ extern bool8 sub_805870C(u32, u32);
extern bool8 sub_805877C(void);
extern void sub_80586B4(u32, u32);
extern void sub_80586E0(u32, u32);
-extern void sub_810E7AC(u8, u8, u8, u8);
-extern void sub_810E824(void);
+extern void ScriptAddElevatorMenuItem(u8, u8, u8, u8);
+extern void ScriptShowElevatorMenu(void);
extern u16 GetCoins(void);
extern bool8 GiveCoins(u16);
extern bool8 TakeCoins(u16);
@@ -1451,7 +1451,7 @@ bool8 ScrCmd_bufferfirstpoke(struct ScriptContext *ctx)
{
u8 stringVarIndex = ScriptReadByte(ctx);
u8 *dest = gUnknown_083762F0[stringVarIndex];
- u8 partyIndex = sub_810F87C();
+ u8 partyIndex = GetLeadMonIndex();
u32 species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES, NULL);
StringCopy(dest, gSpeciesNames[species]);
return FALSE;
@@ -1640,7 +1640,7 @@ bool8 ScrCmd_showcoins(struct ScriptContext *ctx)
{
u8 v2 = ScriptReadByte(ctx);
u8 v3 = ScriptReadByte(ctx);
- sub_811A72C(gSaveBlock1.coins, v2, v3);
+ ShowCoinsWindow(gSaveBlock1.coins, v2, v3);
return FALSE;
}
@@ -1648,7 +1648,7 @@ bool8 ScrCmd_hidecoins(struct ScriptContext *ctx)
{
u8 v2 = ScriptReadByte(ctx);
u8 v3 = ScriptReadByte(ctx);
- sub_811A770(v2, v3);
+ HideCoinsWindow(v2, v3);
return FALSE;
}
@@ -1656,7 +1656,7 @@ bool8 ScrCmd_updatecoins(struct ScriptContext *ctx)
{
u8 v2 = ScriptReadByte(ctx);
u8 v3 = ScriptReadByte(ctx);
- sub_811A704(gSaveBlock1.coins, v2, v3);
+ UpdateCoinsWindow(gSaveBlock1.coins, v2, v3);
return FALSE;
}
@@ -1933,13 +1933,13 @@ bool8 ScrCmd_event_b1(struct ScriptContext *ctx)
u16 v5 = VarGet(ScriptReadHalfword(ctx));
u16 v7 = VarGet(ScriptReadHalfword(ctx));
u16 v9 = VarGet(ScriptReadHalfword(ctx));
- sub_810E7AC(v3, v5, v7, v9);
+ ScriptAddElevatorMenuItem(v3, v5, v7, v9);
return FALSE;
}
bool8 ScrCmd_event_b2(struct ScriptContext *ctx)
{
- sub_810E824();
+ ScriptShowElevatorMenu();
ScriptContext1_Stop();
return TRUE;
}
diff --git a/src/start_menu.c b/src/start_menu.c
index b3a0fe4c6..0c2acc5b7 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -33,7 +33,7 @@ extern void sub_80EBA5C(void);
extern void sub_80A53F8(void);
extern void sub_8089A70(void);
extern void CB2_InitPokedex(void);
-extern u16 pokedex_count(u8);
+extern u16 GetNationalPokedexCount(u8);
extern void fade_screen(u8, u8);
extern bool32 is_c1_link_related_active();
extern void sub_80594C0(void);
@@ -346,7 +346,7 @@ static u8 StartMenu_InputProcessCallback(void)
PlaySE(SE_SELECT);
if(gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback == StartMenu_PokedexCallback)
{
- if(pokedex_count(0) == 0)
+ if(GetNationalPokedexCount(0) == 0)
return 0;
}
gCallback_03004AE8 = gStartMenuItems[sCurrentStartMenuActions[sStartMenuCursorPos]].callback;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 13:29:51 +0000