summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_party_menu.s58
-rw-r--r--asm/choose_party.s4
-rw-r--r--asm/field_map_obj.s2
-rw-r--r--asm/item_menu.s2
-rw-r--r--asm/item_use.s2
-rw-r--r--asm/party_menu.s4
-rw-r--r--asm/pokemon_menu.s2
-rw-r--r--asm/pokemon_storage_system.s76
-rw-r--r--asm/pokemon_summary_screen.s76
-rw-r--r--asm/rom_8080874.s18
-rw-r--r--asm/rom_80859BC.s36
-rw-r--r--asm/script_movement.s4
-rw-r--r--asm/trade.s4
13 files changed, 144 insertions, 144 deletions
diff --git a/asm/battle_party_menu.s b/asm/battle_party_menu.s
index b97f946e1..471c5ccc0 100644
--- a/asm/battle_party_menu.s
+++ b/asm/battle_party_menu.s
@@ -6,8 +6,8 @@
.text
- thumb_func_start sub_8094E58
-sub_8094E58: @ 8094E58
+ thumb_func_start SetUpBattlePartyMenu
+SetUpBattlePartyMenu: @ 8094E58
push {r4,r5,lr}
ldr r1, _08094E78 @ =0x0201b000
movs r2, 0x99
@@ -247,7 +247,7 @@ _0809504A:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8094E58
+ thumb_func_end SetUpBattlePartyMenu
thumb_func_start sub_8095050
sub_8095050: @ 8095050
@@ -347,8 +347,8 @@ _08095110: .4byte gUnknown_083B5FF4
_08095114: .4byte gUnknown_083B5FCC
thumb_func_end sub_8095050
- thumb_func_start sub_8095118
-sub_8095118: @ 8095118
+ thumb_func_start SetUpBattlePokemonMenu
+SetUpBattlePokemonMenu: @ 8095118
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -446,7 +446,7 @@ _080951C8:
adds r0, r4, 0
bl sub_8095050
ldr r1, _0809520C @ =sub_8095408
- ldr r2, _08095210 @ =sub_8095118
+ ldr r2, _08095210 @ =SetUpBattlePokemonMenu
adds r0, r4, 0
bl SetTaskFuncWithFollowupFunc
b _08095268
@@ -454,7 +454,7 @@ _080951C8:
_08095204: .4byte gPlayerParty
_08095208: .4byte gStringVar1
_0809520C: .4byte sub_8095408
-_08095210: .4byte sub_8095118
+_08095210: .4byte SetUpBattlePokemonMenu
_08095214:
ldr r5, _08095224 @ =gUnknown_02038473
ldrb r0, [r5]
@@ -506,7 +506,7 @@ _08095268:
_08095270: .4byte gUnknown_0202E8F4
_08095274: .4byte gTasks
_08095278: .4byte sub_809527C
- thumb_func_end sub_8095118
+ thumb_func_end SetUpBattlePokemonMenu
thumb_func_start sub_809527C
sub_809527C: @ 809527C
@@ -634,7 +634,7 @@ sub_809535C: @ 809535C
movs r1, 0x80
orrs r0, r1
strb r0, [r2, 0x8]
- ldr r2, _08095384 @ =sub_8095118
+ ldr r2, _08095384 @ =SetUpBattlePokemonMenu
movs r0, 0x1
movs r1, 0xFF
movs r3, 0x5
@@ -645,7 +645,7 @@ sub_809535C: @ 809535C
bx r0
.align 2, 0
_08095380: .4byte gPaletteFade
-_08095384: .4byte sub_8095118
+_08095384: .4byte SetUpBattlePokemonMenu
_08095388: .4byte sub_809538C
thumb_func_end sub_809535C
@@ -678,7 +678,7 @@ _08095392:
bl sub_8095050
ldrb r0, [r4]
ldr r1, _080953E8 @ =sub_8095408
- ldr r2, _080953EC @ =sub_8095118
+ ldr r2, _080953EC @ =SetUpBattlePokemonMenu
bl SetTaskFuncWithFollowupFunc
ldr r0, _080953F0 @ =sub_806AEDC
bl SetMainCallback2
@@ -689,7 +689,7 @@ _080953DC: .4byte gUnknown_020384F0
_080953E0: .4byte gPlayerParty
_080953E4: .4byte gStringVar1
_080953E8: .4byte sub_8095408
-_080953EC: .4byte sub_8095118
+_080953EC: .4byte SetUpBattlePokemonMenu
_080953F0: .4byte sub_806AEDC
_080953F4:
bl sub_80F9344
@@ -781,7 +781,7 @@ _080954A4:
movs r0, 0x5
bl PlaySE
adds r0, r4, 0
- bl sub_80958C4
+ bl BattlePokemonMenu_Cancel
_080954B8:
pop {r4-r7}
pop {r0}
@@ -798,7 +798,7 @@ sub_80954C0: @ 80954C0
cmp r0, 0
bne _080954D4
adds r0, r1, 0
- bl sub_80958C4
+ bl BattlePokemonMenu_Cancel
_080954D4:
pop {r0}
bx r0
@@ -806,8 +806,8 @@ _080954D4:
_080954D8: .4byte gUnknown_0202E8F6
thumb_func_end sub_80954C0
- thumb_func_start sub_80954DC
-sub_80954DC: @ 80954DC
+ thumb_func_start BattleShowPokemonSummaryScreen
+BattleShowPokemonSummaryScreen: @ 80954DC
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -839,7 +839,7 @@ sub_80954DC: @ 80954DC
movs r1, 0x4
str r1, [sp]
adds r1, r5, 0
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
_08095522:
add sp, 0x4
pop {r4,r5}
@@ -852,10 +852,10 @@ _08095534: .4byte 0x00000262
_08095538: .4byte gPlayerParty
_0809553C: .4byte gPlayerPartyCount
_08095540: .4byte sub_809535C
- thumb_func_end sub_80954DC
+ thumb_func_end BattleShowPokemonSummaryScreen
- thumb_func_start sub_8095544
-sub_8095544: @ 8095544
+ thumb_func_start BattlePokemonMenu_Summary
+BattlePokemonMenu_Summary: @ 8095544
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -868,7 +868,7 @@ sub_8095544: @ 8095544
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _08095580 @ =sub_80954DC
+ ldr r1, _08095580 @ =BattleShowPokemonSummaryScreen
str r1, [r0]
movs r0, 0x1
negs r0, r0
@@ -883,11 +883,11 @@ sub_8095544: @ 8095544
bx r0
.align 2, 0
_0809557C: .4byte gTasks
-_08095580: .4byte sub_80954DC
- thumb_func_end sub_8095544
+_08095580: .4byte BattleShowPokemonSummaryScreen
+ thumb_func_end BattlePokemonMenu_Summary
- thumb_func_start sub_8095584
-sub_8095584: @ 8095584
+ thumb_func_start BattlePokemonMenu_Shift
+BattlePokemonMenu_Shift: @ 8095584
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1228,10 +1228,10 @@ _080958B4: .4byte gUnknown_02024A6A
_080958B8: .4byte gUnknown_02024E6C
_080958BC: .4byte gTasks
_080958C0: .4byte sub_809527C
- thumb_func_end sub_8095584
+ thumb_func_end BattlePokemonMenu_Shift
- thumb_func_start sub_80958C4
-sub_80958C4: @ 80958C4
+ thumb_func_start BattlePokemonMenu_Cancel
+BattlePokemonMenu_Cancel: @ 80958C4
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
@@ -1258,6 +1258,6 @@ sub_80958C4: @ 80958C4
.align 2, 0
_080958FC: .4byte gTasks
_08095900: .4byte gUnknown_083B5FF4
- thumb_func_end sub_80958C4
+ thumb_func_end BattlePokemonMenu_Cancel
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/choose_party.s b/asm/choose_party.s
index 450aa930e..c895e71e0 100644
--- a/asm/choose_party.s
+++ b/asm/choose_party.s
@@ -1035,7 +1035,7 @@ sub_81225D4: @ 81225D4
ldr r3, _08122658 @ =sub_81225A4
str r5, [sp]
adds r1, r4, 0
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
_08122632:
add sp, 0x4
pop {r4,r5}
@@ -2335,7 +2335,7 @@ sub_8123034: @ 8123034
ldr r3, _081230B8 @ =sub_8123004
str r5, [sp]
adds r1, r4, 0
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
_08123092:
add sp, 0x4
pop {r4,r5}
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index b884252be..0ab1e117c 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -12654,7 +12654,7 @@ FieldObjectSetSpecialAnim: @ 8060550
cmp r6, 0
bne _08060590
adds r0, r4, 0
- bl npc_sync_anim_pause_bits
+ bl UnfreezeMapObject
strb r5, [r4, 0x1C]
ldrb r0, [r4]
movs r1, 0x40
diff --git a/asm/item_menu.s b/asm/item_menu.s
index c091b3f82..4270b4954 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -7553,7 +7553,7 @@ sub_80A6D1C: @ 80A6D1C
cmp r5, 0x1
bne _080A6D80
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
bl sub_80594C0
bl sub_80597F4
ldr r1, _080A6D78 @ =gScriptItemId
diff --git a/asm/item_use.s b/asm/item_use.s
index 5b0615d72..c4f6fb74a 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -528,7 +528,7 @@ SetPlayerDirectionTowardsItem: @ 80C997C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl npc_sync_anim_pause_bits
+ bl UnfreezeMapObject
adds r0, r5, 0
bl PlayerTurnInPlace
pop {r4,r5}
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 7e2011df3..1d51711f1 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -10936,14 +10936,14 @@ ItemUseMoveMenu_HandleCancel: @ 80704F0
adds r0, r1
lsls r0, 3
adds r0, r2
- ldr r1, _08070538 @ =sub_8095118
+ ldr r1, _08070538 @ =SetUpBattlePokemonMenu
b _0807054C
.align 2, 0
_08070528: .4byte gMain
_0807052C: .4byte 0x0000043d
_08070530: .4byte gTasks
_08070534: .4byte 0x0201c000
-_08070538: .4byte sub_8095118
+_08070538: .4byte SetUpBattlePokemonMenu
_0807053C:
ldr r2, _08070564 @ =gTasks
ldr r0, _08070568 @ =0x0201c000
diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s
index ca31c534d..6a3fbb170 100644
--- a/asm/pokemon_menu.s
+++ b/asm/pokemon_menu.s
@@ -645,7 +645,7 @@ sub_8089F44: @ 8089F44
ldr r3, _08089FC8 @ =sub_8089F14
str r5, [sp]
adds r1, r4, 0
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
_08089FA2:
add sp, 0x4
pop {r4,r5}
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 22abca2c3..c24d18711 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -375,8 +375,8 @@ _08095B9A:
_08095BB0: .4byte gPlayerParty
thumb_func_end sub_8095B6C
- thumb_func_start sub_8095BB4
-sub_8095BB4: @ 8095BB4
+ thumb_func_start CountAlivePartyMonsExceptOne
+CountAlivePartyMonsExceptOne: @ 8095BB4
push {r4-r7,lr}
lsls r0, 24
movs r5, 0
@@ -421,14 +421,14 @@ _08095BF6:
bx r1
.align 2, 0
_08095C0C: .4byte gPlayerParty
- thumb_func_end sub_8095BB4
+ thumb_func_end CountAlivePartyMonsExceptOne
thumb_func_start sub_8095C10
sub_8095C10: @ 8095C10
push {lr}
ldr r0, _08095C24 @ =gSpecialVar_0x8004
ldrb r0, [r0]
- bl sub_8095BB4
+ bl CountAlivePartyMonsExceptOne
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -437,8 +437,8 @@ sub_8095C10: @ 8095C10
_08095C24: .4byte gSpecialVar_0x8004
thumb_func_end sub_8095C10
- thumb_func_start sub_8095C28
-sub_8095C28: @ 8095C28
+ thumb_func_start StorageSystemGetPartySize
+StorageSystemGetPartySize: @ 8095C28
push {r4,r5,lr}
movs r4, 0
movs r5, 0
@@ -467,7 +467,7 @@ _08095C46:
bx r1
.align 2, 0
_08095C5C: .4byte gPlayerParty
- thumb_func_end sub_8095C28
+ thumb_func_end StorageSystemGetPartySize
thumb_func_start unref_sub_8095C60
unref_sub_8095C60: @ 8095C60
@@ -665,8 +665,8 @@ _08095DC4: .4byte 0x040000d4
_08095DC8: .4byte 0x81000800
thumb_func_end unref_sub_8095D08
- thumb_func_start sub_8095DCC
-sub_8095DCC: @ 8095DCC
+ thumb_func_start StorageSystemGetNextMonIndex
+StorageSystemGetNextMonIndex: @ 8095DCC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -779,10 +779,10 @@ _08095E94:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8095DCC
+ thumb_func_end StorageSystemGetNextMonIndex
- thumb_func_start sub_8095EA0
-sub_8095EA0: @ 8095EA0
+ thumb_func_start StorageSystemClearMessageWindow
+StorageSystemClearMessageWindow: @ 8095EA0
push {lr}
movs r0, 0x2
movs r1, 0xF
@@ -791,10 +791,10 @@ sub_8095EA0: @ 8095EA0
bl MenuFillWindowRectWithBlankTile
pop {r0}
bx r0
- thumb_func_end sub_8095EA0
+ thumb_func_end StorageSystemClearMessageWindow
- thumb_func_start sub_8095EB4
-sub_8095EB4: @ 8095EB4
+ thumb_func_start Task_PokemonStorageSystem
+Task_PokemonStorageSystem: @ 8095EB4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -826,7 +826,7 @@ _08095EE0:
.4byte _080960DC
_08095EF4:
ldrb r0, [r4, 0xA]
- bl sub_8096168
+ bl StorageSystemCreatePrimaryMenu
bl MenuDisplayMessageBox
ldr r1, _08095F18 @ =gUnknown_083B600C
movs r2, 0xA
@@ -915,7 +915,7 @@ _08095F92:
b _080960F4
_08095FA2:
strh r2, [r4, 0xA]
- bl sub_8095EA0
+ bl StorageSystemClearMessageWindow
ldr r0, _08095FC4 @ =gUnknown_083B600C
movs r2, 0xA
ldrsh r1, [r4, r2]
@@ -947,12 +947,12 @@ _08095FE8:
ldrsh r0, [r4, r3]
cmp r0, 0
bne _08096008
- bl sub_8095C28
+ bl StorageSystemGetPartySize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
bne _08096008
- bl sub_8095EA0
+ bl StorageSystemClearMessageWindow
ldr r0, _08096004 @ =gPCText_PartyFull2
b _08096022
.align 2, 0
@@ -962,12 +962,12 @@ _08096008:
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _08096034
- bl sub_8095C28
+ bl StorageSystemGetPartySize
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08096034
- bl sub_8095EA0
+ bl StorageSystemClearMessageWindow
ldr r0, _08096030 @ =gPCText_OnlyOne
_08096022:
movs r1, 0x2
@@ -1014,7 +1014,7 @@ _0809606A:
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
- bl sub_8095EA0
+ bl StorageSystemClearMessageWindow
ldr r1, _0809608C @ =gUnknown_083B600C
movs r3, 0xA
ldrsh r0, [r4, r3]
@@ -1043,7 +1043,7 @@ _080960A8:
lsrs r0, 24
strh r0, [r4, 0xA]
_080960B8:
- bl sub_8095EA0
+ bl StorageSystemClearMessageWindow
ldr r1, _080960D8 @ =gUnknown_083B600C
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -1077,12 +1077,12 @@ _080960F4:
bx r0
.align 2, 0
_080960FC: .4byte gPaletteFade
- thumb_func_end sub_8095EB4
+ thumb_func_end Task_PokemonStorageSystem
- thumb_func_start sub_8096100
-sub_8096100: @ 8096100
+ thumb_func_start ShowPokemonStorageSystem
+ShowPokemonStorageSystem: @ 8096100
push {lr}
- ldr r0, _08096128 @ =sub_8095EB4
+ ldr r0, _08096128 @ =Task_PokemonStorageSystem
movs r1, 0x50
bl CreateTask
lsls r0, 24
@@ -1099,14 +1099,14 @@ sub_8096100: @ 8096100
pop {r0}
bx r0
.align 2, 0
-_08096128: .4byte sub_8095EB4
+_08096128: .4byte Task_PokemonStorageSystem
_0809612C: .4byte gTasks
- thumb_func_end sub_8096100
+ thumb_func_end ShowPokemonStorageSystem
thumb_func_start sub_8096130
sub_8096130: @ 8096130
push {lr}
- ldr r0, _0809615C @ =sub_8095EB4
+ ldr r0, _0809615C @ =Task_PokemonStorageSystem
movs r1, 0x50
bl CreateTask
lsls r0, 24
@@ -1125,13 +1125,13 @@ sub_8096130: @ 8096130
pop {r0}
bx r0
.align 2, 0
-_0809615C: .4byte sub_8095EB4
+_0809615C: .4byte Task_PokemonStorageSystem
_08096160: .4byte gTasks
_08096164: .4byte gUnknown_02038474
thumb_func_end sub_8096130
- thumb_func_start sub_8096168
-sub_8096168: @ 8096168
+ thumb_func_start StorageSystemCreatePrimaryMenu
+StorageSystemCreatePrimaryMenu: @ 8096168
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -1161,7 +1161,7 @@ sub_8096168: @ 8096168
bx r0
.align 2, 0
_080961A4: .4byte gUnknown_083B600C
- thumb_func_end sub_8096168
+ thumb_func_end StorageSystemCreatePrimaryMenu
thumb_func_start sub_80961A8
sub_80961A8: @ 80961A8
@@ -2393,7 +2393,7 @@ _08096B74:
adds r4, r5
ldrb r4, [r4]
str r4, [sp]
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
b _08096BCC
.align 2, 0
_08096B98: .4byte 0x00002690
@@ -12587,7 +12587,7 @@ _0809BC64:
ldr r3, _0809BCB0 @ =0x0000268d
adds r0, r4, r3
strb r1, [r0]
- bl sub_8095C28
+ bl StorageSystemGetPartySize
subs r0, 0x1
ldr r2, _0809BCB4 @ =0x0000268c
adds r1, r4, r2
@@ -12850,7 +12850,7 @@ sub_809BE80: @ 809BE80
bne _0809BEB4
ldr r0, _0809BEB0 @ =gUnknown_020384E5
ldrb r0, [r0]
- bl sub_8095BB4
+ bl CountAlivePartyMonsExceptOne
lsls r0, 24
cmp r0, 0
bne _0809BEB4
@@ -12882,7 +12882,7 @@ sub_809BEBC: @ 809BEBC
bne _0809BEFC
ldr r0, _0809BF08 @ =gUnknown_020384E5
ldrb r0, [r0]
- bl sub_8095BB4
+ bl CountAlivePartyMonsExceptOne
lsls r0, 24
cmp r0, 0
bne _0809BEFC
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 91c685619..1ce717645 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -59,8 +59,8 @@ _0809D8B4: .4byte gUnknown_030041B0
_0809D8B8: .4byte gUnknown_030041B8
thumb_func_end sub_809D85C
- thumb_func_start sub_809D8BC
-sub_809D8BC: @ 809D8BC
+ thumb_func_start ShowPokemonSummaryScreen
+ShowPokemonSummaryScreen: @ 809D8BC
push {r4-r7,lr}
ldr r4, [sp, 0x14]
lsls r4, 24
@@ -215,7 +215,7 @@ _0809D9D6:
bx r0
.align 2, 0
_0809D9EC: .4byte sub_809DE44
- thumb_func_end sub_809D8BC
+ thumb_func_end ShowPokemonSummaryScreen
thumb_func_start sub_809D9F0
sub_809D9F0: @ 809D9F0
@@ -230,7 +230,7 @@ sub_809D9F0: @ 809D9F0
lsrs r5, 16
movs r4, 0x2
str r4, [sp]
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
ldr r0, _0809DA18 @ =0x02018000
adds r0, 0x7C
strh r5, [r0]
@@ -267,15 +267,15 @@ _0809DA38:
.4byte _0809DA54
.4byte _0809DA6C
_0809DA54:
- ldr r0, _0809DA58 @ =sub_809E19C
+ ldr r0, _0809DA58 @ =SummaryScreenHandleKeyInput
b _0809DA6E
.align 2, 0
-_0809DA58: .4byte sub_809E19C
+_0809DA58: .4byte SummaryScreenHandleKeyInput
_0809DA5C:
- ldr r0, _0809DA60 @ =sub_809E19C
+ ldr r0, _0809DA60 @ =SummaryScreenHandleKeyInput
b _0809DA6E
.align 2, 0
-_0809DA60: .4byte sub_809E19C
+_0809DA60: .4byte SummaryScreenHandleKeyInput
_0809DA64:
ldr r0, _0809DA68 @ =sub_809EB40
b _0809DA6E
@@ -1035,8 +1035,8 @@ _0809E0F4: .4byte gUnknownPalette_81E6692+0x1C
_0809E0F8: .4byte gFontDefaultPalette
thumb_func_end sub_809E044
- thumb_func_start sub_809E0FC
-sub_809E0FC: @ 809E0FC
+ thumb_func_start SummaryScreenExit
+SummaryScreenExit: @ 809E0FC
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1065,7 +1065,7 @@ sub_809E0FC: @ 809E0FC
.align 2, 0
_0809E134: .4byte gTasks
_0809E138: .4byte sub_809E13C
- thumb_func_end sub_809E0FC
+ thumb_func_end SummaryScreenExit
thumb_func_start sub_809E13C
sub_809E13C: @ 809E13C
@@ -1109,8 +1109,8 @@ _0809E194: .4byte gMPlay_BGM
_0809E198: .4byte 0x0000ffff
thumb_func_end sub_809E13C
- thumb_func_start sub_809E19C
-sub_809E19C: @ 809E19C
+ thumb_func_start SummaryScreenHandleKeyInput
+SummaryScreenHandleKeyInput: @ 809E19C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1130,7 +1130,7 @@ sub_809E19C: @ 809E19C
movs r1, 0x1
negs r1, r1
adds r0, r4, 0
- bl sub_809F1B8
+ bl SummaryScreenHandleUpDownInput
b _0809E25A
.align 2, 0
_0809E1C8: .4byte gPaletteFade
@@ -1142,7 +1142,7 @@ _0809E1D0:
beq _0809E1E2
adds r0, r4, 0
movs r1, 0x1
- bl sub_809F1B8
+ bl SummaryScreenHandleUpDownInput
b _0809E25A
_0809E1E2:
movs r0, 0x20
@@ -1158,7 +1158,7 @@ _0809E1F6:
movs r1, 0x1
negs r1, r1
adds r0, r4, 0
- bl sub_809F134
+ bl SummaryScreenHandleLeftRightInput
b _0809E25A
_0809E202:
ldrh r1, [r5, 0x2E]
@@ -1174,7 +1174,7 @@ _0809E202:
_0809E218:
adds r0, r4, 0
movs r1, 0x1
- bl sub_809F134
+ bl SummaryScreenHandleLeftRightInput
b _0809E25A
_0809E222:
ldrh r1, [r5, 0x2E]
@@ -1187,13 +1187,13 @@ _0809E222:
cmp r0, 0x1
bls _0809E23A
adds r0, r4, 0
- bl sub_809EA50
+ bl SummaryScreenHandleAButton
_0809E23A:
ldrb r0, [r5, 0xB]
cmp r0, 0
bne _0809E25A
adds r0, r4, 0
- bl sub_809E0FC
+ bl SummaryScreenExit
b _0809E25A
.align 2, 0
_0809E248: .4byte 0x02018000
@@ -1203,12 +1203,12 @@ _0809E24C:
cmp r0, 0
beq _0809E25A
adds r0, r4, 0
- bl sub_809E0FC
+ bl SummaryScreenExit
_0809E25A:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_809E19C
+ thumb_func_end SummaryScreenHandleKeyInput
thumb_func_start sub_809E260
sub_809E260: @ 809E260
@@ -1302,7 +1302,7 @@ _0809E314:
movs r1, 0x1
negs r1, r1
adds r0, r4, 0
- bl sub_809F134
+ bl SummaryScreenHandleLeftRightInput
b _0809E3EE
.align 2, 0
_0809E320: .4byte 0x02018000
@@ -1346,7 +1346,7 @@ _0809E360:
_0809E36C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_809F134
+ bl SummaryScreenHandleLeftRightInput
b _0809E3EE
.align 2, 0
_0809E378: .4byte 0x02018000
@@ -1379,7 +1379,7 @@ _0809E3A0:
ldrb r0, [r0]
strh r0, [r1]
adds r0, r4, 0
- bl sub_809E0FC
+ bl SummaryScreenExit
b _0809E3EE
.align 2, 0
_0809E3BC: .4byte 0x02018000
@@ -1403,7 +1403,7 @@ _0809E3D4:
ldr r0, _0809E3F8 @ =gSpecialVar_0x8005
strh r1, [r0]
adds r0, r4, 0
- bl sub_809E0FC
+ bl SummaryScreenExit
_0809E3EE:
pop {r4,r5}
pop {r0}
@@ -2200,8 +2200,8 @@ _0809EA34:
_0809EA4C: .4byte 0x02018010
thumb_func_end sub_809E8F0
- thumb_func_start sub_809EA50
-sub_809EA50: @ 809EA50
+ thumb_func_start SummaryScreenHandleAButton
+SummaryScreenHandleAButton: @ 809EA50
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -2252,7 +2252,7 @@ _0809EA8C:
_0809EABC: .4byte 0x02018000
_0809EAC0: .4byte gTasks
_0809EAC4: .4byte sub_809E3FC
- thumb_func_end sub_809EA50
+ thumb_func_end SummaryScreenHandleAButton
thumb_func_start sub_809EAC8
sub_809EAC8: @ 809EAC8
@@ -2298,7 +2298,7 @@ _0809EAEE:
adds r0, r5
lsls r0, 3
adds r0, r1
- ldr r1, _0809EB3C @ =sub_809E19C
+ ldr r1, _0809EB3C @ =SummaryScreenHandleKeyInput
str r1, [r0]
pop {r4-r6}
pop {r0}
@@ -2306,7 +2306,7 @@ _0809EAEE:
.align 2, 0
_0809EB34: .4byte 0x02018000
_0809EB38: .4byte gTasks
-_0809EB3C: .4byte sub_809E19C
+_0809EB3C: .4byte SummaryScreenHandleKeyInput
thumb_func_end sub_809EAC8
thumb_func_start sub_809EB40
@@ -3070,8 +3070,8 @@ _0809F12A:
_0809F130: .4byte sub_809EE74
thumb_func_end sub_809F0D0
- thumb_func_start sub_809F134
-sub_809F134: @ 809F134
+ thumb_func_start SummaryScreenHandleLeftRightInput
+SummaryScreenHandleLeftRightInput: @ 809F134
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -3134,10 +3134,10 @@ _0809F1A6:
_0809F1AC: .4byte 0x02018010
_0809F1B0: .4byte sub_80A1334
_0809F1B4: .4byte sub_80A1500
- thumb_func_end sub_809F134
+ thumb_func_end SummaryScreenHandleLeftRightInput
- thumb_func_start sub_809F1B8
-sub_809F1B8: @ 809F1B8
+ thumb_func_start SummaryScreenHandleUpDownInput
+SummaryScreenHandleUpDownInput: @ 809F1B8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -3173,7 +3173,7 @@ _0809F1F4:
ldrb r1, [r2, 0x9]
ldrb r2, [r2, 0xA]
adds r3, r4, 0
- bl sub_8095DCC
+ bl StorageSystemGetNextMonIndex
b _0809F22C
_0809F202:
bl sub_80F9344
@@ -3235,7 +3235,7 @@ _0809F270:
_0809F278: .4byte 0x02018010
_0809F27C: .4byte gTasks
_0809F280: .4byte sub_809F43C
- thumb_func_end sub_809F1B8
+ thumb_func_end SummaryScreenHandleUpDownInput
thumb_func_start sub_809F284
sub_809F284: @ 809F284
@@ -4158,7 +4158,7 @@ _0809F960:
adds r0, r5, 0
movs r1, 0x1
_0809F972:
- bl sub_809F134
+ bl SummaryScreenHandleLeftRightInput
ldrb r1, [r4, 0x1E]
movs r0, 0x1
bl sub_80A1488
diff --git a/asm/rom_8080874.s b/asm/rom_8080874.s
index ac50b3fc5..de7dce157 100644
--- a/asm/rom_8080874.s
+++ b/asm/rom_8080874.s
@@ -453,7 +453,7 @@ _08080BD0:
_08080BE4:
movs r0, 0
bl sub_8080958
- bl player_bitmagic
+ bl FreezeMapObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -534,7 +534,7 @@ _08080C84:
cmp r0, 0x1
beq _08080CAE
_08080C9A:
- bl sub_806451C
+ bl UnfreezeMapObjects
movs r0, 0x4
strh r0, [r5, 0x8]
b _08080CAE
@@ -582,7 +582,7 @@ _08080CE4:
_08080CEE:
movs r0, 0
bl sub_8080958
- bl player_bitmagic
+ bl FreezeMapObjects
adds r0, r6, 0
adds r1, r7, 0
bl PlayerGetDestCoords
@@ -625,7 +625,7 @@ _08080D50:
lsls r0, 24
cmp r0, 0
beq _08080D6E
- bl sub_806451C
+ bl UnfreezeMapObjects
movs r0, 0x3
strh r0, [r5, 0x8]
b _08080D6E
@@ -659,7 +659,7 @@ task_map_chg_seq_0807E2CC: @ 8080D74
.align 2, 0
_08080D94: .4byte gTasks
_08080D98:
- bl player_bitmagic
+ bl FreezeMapObjects
bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -669,7 +669,7 @@ _08080DA8:
bl sub_8080E70
cmp r0, 0
beq _08080DBE
- bl sub_806451C
+ bl UnfreezeMapObjects
bl ScriptContext2_Disable
adds r0, r5, 0
bl DestroyTask
@@ -1116,7 +1116,7 @@ _08081118:
beq _08081142
b _08081152
_0808111E:
- bl player_bitmagic
+ bl FreezeMapObjects
bl ScriptContext2_Enable
b _0808113A
_08081128:
@@ -1183,7 +1183,7 @@ _08081194:
.4byte _0808128C
.4byte _080812A8
_080811A8:
- bl player_bitmagic
+ bl FreezeMapObjects
adds r0, r4, 0
adds r1, r6, 0
bl PlayerGetDestCoords
@@ -1344,7 +1344,7 @@ _080812F0:
beq _0808131A
b _0808132A
_080812F6:
- bl player_bitmagic
+ bl FreezeMapObjects
bl ScriptContext2_Enable
b _08081312
_08081300:
diff --git a/asm/rom_80859BC.s b/asm/rom_80859BC.s
index fc28d1473..4bcba42ce 100644
--- a/asm/rom_80859BC.s
+++ b/asm/rom_80859BC.s
@@ -1590,7 +1590,7 @@ mapldr_080842E8: @ 80865DC
movs r1, 0
bl CreateTask
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r1, _08086600 @ =gUnknown_0300485C
movs r0, 0
str r0, [r1]
@@ -1693,7 +1693,7 @@ mapldr_08084390: @ 8086684
bl FieldObjectTurn
_080866C6:
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r1, _080866E8 @ =gUnknown_0300485C
movs r0, 0
str r0, [r1]
@@ -1740,7 +1740,7 @@ _0808671E:
cmp r0, 0
bne _08086738
bl ScriptContext2_Disable
- bl sub_806451C
+ bl UnfreezeMapObjects
adds r0, r5, 0
bl DestroyTask
_08086738:
@@ -1758,7 +1758,7 @@ sub_8086748: @ 8086748
bl sub_8053E90
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r0, _0808676C @ =sub_8086774
movs r1, 0
bl CreateTask
@@ -2115,7 +2115,7 @@ sub_80869F8: @ 80869F8
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
bl CameraObjectReset1
- bl sub_806451C
+ bl UnfreezeMapObjects
bl InstallCameraPanAheadCallback
ldr r0, _08086A28 @ =sub_8086774
bl FindTaskIdByFunc
@@ -2196,7 +2196,7 @@ _08086A9C: .4byte gUnknown_0839F2E8
sub_8086AA0: @ 8086AA0
push {r4,lr}
adds r4, r0, 0
- bl player_bitmagic
+ bl FreezeMapObjects
bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_80B4824
@@ -3193,7 +3193,7 @@ sub_808722C: @ 808722C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl player_bitmagic
+ bl FreezeMapObjects
bl CameraObjectReset2
movs r0, 0
bl SetCameraPanningCallback
@@ -3539,7 +3539,7 @@ sub_80874CC: @ 80874CC
adds r5, r0, 0
adds r4, r1, 0
bl CameraObjectReset2
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r1, _080874F8 @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -3654,7 +3654,7 @@ sub_808759C: @ 808759C
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
- bl sub_806451C
+ bl UnfreezeMapObjects
ldr r0, _080875D0 @ =sub_8087470
bl FindTaskIdByFunc
lsls r0, 24
@@ -3801,7 +3801,7 @@ sub_80876C8: @ 80876C8
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl player_bitmagic
+ bl FreezeMapObjects
bl CameraObjectReset2
ldr r1, _080876F4 @ =gPlayerAvatar
movs r0, 0x1
@@ -4044,7 +4044,7 @@ _080878A4:
sub_80878A8: @ 80878A8
push {lr}
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r0, _080878C0 @ =sub_80878C4
movs r1, 0x50
bl CreateTask
@@ -4229,7 +4229,7 @@ mapldr_080859D4: @ 8087A28
bl sub_8053E90
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r1, _08087A64 @ =gUnknown_0300485C
movs r0, 0
str r0, [r1]
@@ -4357,7 +4357,7 @@ _08087B12:
ands r0, r1
strb r0, [r6, 0x1]
bl ScriptContext2_Disable
- bl sub_806451C
+ bl UnfreezeMapObjects
ldr r0, _08087B58 @ =sub_8087A74
bl FindTaskIdByFunc
lsls r0, 24
@@ -4453,7 +4453,7 @@ sub_8087BEC: @ 8087BEC
push {r4,lr}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
bl CameraObjectReset2
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -4689,7 +4689,7 @@ mapldr_08085D88: @ 8087DCC
bl sub_8053E90
bl pal_fill_for_map_transition
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r1, _08087E0C @ =gUnknown_0300485C
movs r0, 0
str r0, [r1]
@@ -4991,7 +4991,7 @@ sub_8087FDC: @ 8087FDC
bne _08088050
bl ScriptContext2_Disable
bl CameraObjectReset1
- bl sub_806451C
+ bl UnfreezeMapObjects
ldr r0, _08088064 @ =sub_8087E1C
bl FindTaskIdByFunc
lsls r0, 24
@@ -6207,7 +6207,7 @@ sub_8088984: @ 8088984
push {r6}
adds r4, r0, 0
bl ScriptContext2_Enable
- bl player_bitmagic
+ bl FreezeMapObjects
ldr r5, _080889DC @ =gPlayerAvatar
movs r0, 0x1
strb r0, [r5, 0x6]
@@ -6410,7 +6410,7 @@ sub_8088AF4: @ 8088AF4
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_8127ED0
- bl sub_806451C
+ bl UnfreezeMapObjects
bl ScriptContext2_Disable
movs r0, 0x9
bl FieldEffectActiveListRemove
diff --git a/asm/script_movement.s b/asm/script_movement.s
index 78ecdb71d..72523c639 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -483,7 +483,7 @@ _080A241C:
lsls r0, 2
ldr r1, _080A2448 @ =gMapObjects
adds r0, r1
- bl npc_sync_anim_pause_bits
+ bl UnfreezeMapObject
_080A2432:
adds r0, r5, 0x1
lsls r0, 24
@@ -571,7 +571,7 @@ _080A24C8:
adds r1, r6, 0
bl sub_80A2348
adds r0, r4, 0
- bl sub_80643A4
+ bl FreezeMapObject
b _080A24FA
.align 2, 0
_080A24E0: .4byte gMapObjects
diff --git a/asm/trade.s b/asm/trade.s
index 0448609b7..5586db4c8 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -3475,7 +3475,7 @@ sub_804997C: @ 804997C
ldr r3, _080499C0 @ =sub_80484F4
movs r4, 0x4
str r4, [sp]
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
b _080499E0
.align 2, 0
_080499B4: .4byte gPaletteFade
@@ -3495,7 +3495,7 @@ _080499C4:
ldr r3, _080499EC @ =sub_80484F4
movs r4, 0x4
str r4, [sp]
- bl sub_809D8BC
+ bl ShowPokemonSummaryScreen
_080499E0:
add sp, 0x4
pop {r4}
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-04 23:57:41 +0000