summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-17 02:56:44 -0800
committersceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-17 02:56:44 -0800
commitae3ef7fec619413ae6a997f0dca4cb08fbd8e8c1 (patch)
treeec75f97a5391dfde62600a8c7bb5b8e2d3dc82f8
parentb5d877603b9d9ef0d1964aceb1430fe6a540f1c5 (diff)
import more pokeemerald names
-rw-r--r--asm/bag.s8
-rw-r--r--asm/battle_1.s2
-rw-r--r--asm/battle_2.s34
-rw-r--r--asm/battle_ai_script_commands.s58
-rw-r--r--asm/battle_anim.s18
-rw-r--r--asm/battle_anim_8074480.s2
-rw-r--r--asm/battle_anim_80DE2C0.s6
-rw-r--r--asm/battle_anim_80EEC0C.s20
-rw-r--r--asm/battle_controller_link_opponent.s2
-rw-r--r--asm/battle_controller_link_partner.s2
-rw-r--r--asm/battle_controller_oak.s6
-rw-r--r--asm/battle_controller_opponent.s4
-rw-r--r--asm/battle_controller_player.s204
-rw-r--r--asm/battle_controller_pokedude.s6
-rw-r--r--asm/battle_controller_safari.s2
-rw-r--r--asm/battle_controllers.s134
-rw-r--r--asm/battle_dome_cards.s6
-rw-r--r--asm/battle_gfx_sfx_util.s12
-rw-r--r--asm/battle_interface.s40
-rw-r--r--asm/battle_message.s16
-rw-r--r--asm/battle_records.s16
-rw-r--r--asm/battle_script_commands.s48
-rw-r--r--asm/battle_setup.s52
-rw-r--r--asm/battle_tower.s30
-rw-r--r--asm/battle_util.s56
-rw-r--r--asm/berry.s18
-rw-r--r--asm/berry_fix_program.s2
-rw-r--r--asm/berry_pouch.s28
-rw-r--r--asm/bike.s2
-rw-r--r--asm/blit.s20
-rw-r--r--asm/braille_text.s28
-rw-r--r--asm/buy_menu_helpers.s4
-rw-r--r--asm/cable_club.s18
-rw-r--r--asm/calculate_base_damage.s8
-rw-r--r--asm/clear_save_data_screen.s8
-rw-r--r--asm/coins.s12
-rw-r--r--asm/credits.s18
-rw-r--r--asm/daycare.s68
-rw-r--r--asm/decompress.s26
-rw-r--r--asm/diploma.s16
-rw-r--r--asm/easy_chat.s36
-rw-r--r--asm/egg_hatch.s62
-rw-r--r--asm/event_data.s150
-rw-r--r--asm/evolution_scene.s40
-rw-r--r--asm/fame_checker.s20
-rw-r--r--asm/field_control_avatar.s108
-rw-r--r--asm/field_effect.s14
-rw-r--r--asm/field_fadetransition.s66
-rw-r--r--asm/field_map_obj.s206
-rw-r--r--asm/field_message_box.s26
-rw-r--r--asm/field_player_avatar.s102
-rw-r--r--asm/field_poison.s4
-rw-r--r--asm/field_screen_effect.s14
-rw-r--r--asm/field_specials.s180
-rw-r--r--asm/field_tasks.s16
-rw-r--r--asm/field_weather.s24
-rw-r--r--asm/fldeff_cut.s4
-rw-r--r--asm/fldeff_flash.s8
-rw-r--r--asm/fldeff_poison.s26
-rw-r--r--asm/fldeff_softboiled.s6
-rw-r--r--asm/fldeff_strength.s4
-rw-r--r--asm/fldeff_sweetscent.s20
-rw-r--r--asm/fldeff_teleport.s18
-rw-r--r--asm/gpu_regs.s6
-rw-r--r--asm/hall_of_fame.s40
-rw-r--r--asm/heal_location.s28
-rw-r--r--asm/help_system.s16
-rw-r--r--asm/help_system_812B1E0.s24
-rw-r--r--asm/hof_pc.s2
-rw-r--r--asm/intro.s6
-rw-r--r--asm/item.s4
-rw-r--r--asm/item_menu.s40
-rw-r--r--asm/item_menu_icons.s26
-rw-r--r--asm/item_pc.s30
-rw-r--r--asm/item_use.s20
-rw-r--r--asm/itemfinder.s4
-rw-r--r--asm/learn_move.s34
-rw-r--r--asm/link.s16
-rw-r--r--asm/link_rfu.s24
-rw-r--r--asm/link_rfu_2.s4
-rw-r--r--asm/link_rfu_3.s130
-rw-r--r--asm/link_rfu_4.s34
-rw-r--r--asm/list_menu.s32
-rw-r--r--asm/load_save.s28
-rw-r--r--asm/mail.s18
-rw-r--r--asm/mail_data.s22
-rw-r--r--asm/mailbox_pc.s4
-rw-r--r--asm/main.s2
-rw-r--r--asm/main_menu.s24
-rw-r--r--asm/map_name_popup.s12
-rw-r--r--asm/map_preview_screen.s10
-rw-r--r--asm/menews_jisan.s2
-rw-r--r--asm/menu.s128
-rw-r--r--asm/menu2.s18
-rw-r--r--asm/menu_helpers.s28
-rw-r--r--asm/metatile_behavior.s18
-rw-r--r--asm/mevent.s4
-rw-r--r--asm/mevent_8145654.s22
-rw-r--r--asm/mevent_server.s18
-rw-r--r--asm/money.s12
-rw-r--r--asm/mystery_event_script.s2
-rw-r--r--asm/mystery_gift_menu.s6
-rw-r--r--asm/naming_screen.s24
-rw-r--r--asm/new_game.s32
-rw-r--r--asm/new_menu_helpers.s58
-rw-r--r--asm/oak_speech.s118
-rw-r--r--asm/option_menu.s22
-rw-r--r--asm/overworld.s164
-rw-r--r--asm/party_menu.s124
-rw-r--r--asm/player_pc.s34
-rw-r--r--asm/pokeball.s6
-rw-r--r--asm/pokedex_screen.s56
-rw-r--r--asm/pokemon_1.s6
-rw-r--r--asm/pokemon_2.s38
-rw-r--r--asm/pokemon_3.s24
-rw-r--r--asm/pokemon_item_effect.s2
-rw-r--r--asm/pokemon_size_record.s6
-rw-r--r--asm/pokemon_special_anim.s32
-rw-r--r--asm/pokemon_storage_system.s74
-rw-r--r--asm/pokemon_summary_screen.s118
-rw-r--r--asm/post_battle_event_funcs.s10
-rw-r--r--asm/prof_pc.s2
-rw-r--r--asm/quest_log.s284
-rw-r--r--asm/quest_log_battle.s2
-rw-r--r--asm/region_map.s48
-rw-r--r--asm/reset_save_heap.s2
-rw-r--r--asm/roamer.s22
-rw-r--r--asm/rom6.s20
-rw-r--r--asm/safari_zone.s6
-rw-r--r--asm/save.s12
-rw-r--r--asm/save_location.s12
-rw-r--r--asm/save_menu_util.s2
-rw-r--r--asm/scrcmd.s304
-rw-r--r--asm/script.s4
-rw-r--r--asm/script_menu.s52
-rw-r--r--asm/script_pokemon_util_80A0058.s4
-rw-r--r--asm/seagallop.s2
-rw-r--r--asm/shop.s24
-rw-r--r--asm/slot_machine.s8
-rw-r--r--asm/start_menu.s44
-rw-r--r--asm/teachy_tv.s14
-rw-r--r--asm/text.s40
-rw-r--r--asm/text_printer.s30
-rw-r--r--asm/tileset_anims.s10
-rw-r--r--asm/title_screen.s2
-rw-r--r--asm/tm_case.s32
-rw-r--r--asm/trade.s56
-rw-r--r--asm/trainer_card.s50
-rw-r--r--asm/trainer_tower.s62
-rw-r--r--asm/union_room_chat.s86
-rw-r--r--asm/unk_810C3A4.s6
-rw-r--r--asm/unk_8147AA8.s62
-rw-r--r--asm/unk_814BB4C.s16
-rw-r--r--asm/unk_814D5C8.s20
-rw-r--r--asm/unk_81507FC.s110
-rw-r--r--asm/unk_8159F40.s2
-rw-r--r--asm/unk_815EDDC.s8
-rw-r--r--asm/unk_text_util.s24
-rw-r--r--asm/vs_seeker.s4
-rw-r--r--asm/wild_encounter.s52
-rw-r--r--asm/wild_pokemon_area.s2
-rw-r--r--asm/window.s26
-rw-r--r--asm/wireless_communication_status_screen.s12
163 files changed, 2820 insertions, 2820 deletions
diff --git a/asm/bag.s b/asm/bag.s
index 53af0595c..8e8690a2c 100644
--- a/asm/bag.s
+++ b/asm/bag.s
@@ -22,7 +22,7 @@ _0810B874:
ldr r0, _0810B8E4 @ =gUnknown_84530E4
bl sub_8003B24
_0810B87A:
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x64
movs r2, 0xE0
@@ -188,7 +188,7 @@ sub_810B994: @ 810B994
movs r0, 0x2
movs r1, 0
adds r2, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -260,7 +260,7 @@ sub_810BA3C: @ 810BA3C
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -312,7 +312,7 @@ sub_810BA9C: @ 810BA9C
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
diff --git a/asm/battle_1.s b/asm/battle_1.s
index 98a40cd81..e7d82740c 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -185,7 +185,7 @@ sub_800F324: @ 800F324
bl sub_8001658
ldr r0, _0800F348 @ =gUnknown_8248330
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/battle_2.s b/asm/battle_2.s
index 73433fc27..fc43a27a2 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -424,7 +424,7 @@ _0801012C: .4byte 0x00003108
_08010130: .4byte 0x0000311a
_08010134:
movs r0, 0xAF
- bl sub_809C8E4
+ bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
bl sub_809C8A0
@@ -568,7 +568,7 @@ _08010248: .4byte 0x0000311a
_0801024C: .4byte 0x0000311b
_08010250:
movs r0, 0xAF
- bl sub_809C8E4
+ bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
bl sub_809C8A0
@@ -1924,7 +1924,7 @@ _08010D9C:
subs r6, 0x1
cmp r6, 0
bge _08010D3A
- bl sub_803DA14
+ bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
ldr r1, _08010DD8 @ =gUnknown_2023E82
ldrb r0, [r1]
@@ -2446,7 +2446,7 @@ sub_80111BC: @ 80111BC
cmp r0, 0
bne _080111DE
bl sub_8011174
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080111E8 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
bl SetMainCallback2
@@ -6470,7 +6470,7 @@ _080130FA:
ldrh r0, [r1]
ldrb r1, [r1, 0x17]
lsrs r1, 7
- bl sub_8040D38
+ bl GetAbilityBySpecies
mov r2, r9
ldrb r1, [r2]
muls r1, r7
@@ -7787,13 +7787,13 @@ sub_8013BD4: @ 8013BD4
ldrb r0, [r0]
cmp r0, 0
bne _08013C04
- bl sub_8017B04
+ bl UpdateTurnCounters
lsls r0, 24
cmp r0, 0
beq _08013BF8
b _08013D20
_08013BF8:
- bl sub_8018258
+ bl TurnBasedEffects
lsls r0, 24
cmp r0, 0
beq _08013C04
@@ -9988,7 +9988,7 @@ _08014E08:
cmp r0, 0
bne _08014E3C
ldr r0, _08014EC8 @ =0x00000822
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08014E3C
@@ -10098,7 +10098,7 @@ _08014EF0:
cmp r0, 0
bne _08014F20
ldr r0, _08014F6C @ =0x00000822
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08014F20
@@ -11515,7 +11515,7 @@ _08015A6C:
ldr r0, _08015A98 @ =sub_8015AA0
_08015A70:
str r0, [r1]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _08015A9C @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x2
@@ -11576,7 +11576,7 @@ _08015AAE:
adds r0, r4, 0
adds r1, r2, 0
movs r2, 0x81
- bl sub_80CDDF4
+ bl EvolutionScene
b _08015B1C
.align 2, 0
_08015AF4: .4byte gUnknown_3004FD4
@@ -11880,7 +11880,7 @@ _08015CF8:
str r0, [r2]
movs r0, 0xA5
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015D88 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -11969,7 +11969,7 @@ _08015DE4:
strb r0, [r1]
ldrh r0, [r2]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015E44 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -12025,7 +12025,7 @@ _08015E48:
strb r0, [r1, 0xE]
ldrh r0, [r3]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldrb r1, [r6]
ldr r3, _08015EB8 @ =gUnknown_2023FE8
ldr r2, [r3]
@@ -12059,7 +12059,7 @@ _08015EBC:
strh r3, [r1]
ldrh r0, [r1]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldrb r1, [r4]
ldr r2, _08015F0C @ =gUnknown_2023FE8
ldr r2, [r2]
@@ -12696,7 +12696,7 @@ sub_8016418: @ 8016418
ldr r0, _08016488 @ =gUnknown_2022976
strh r1, [r0]
ldrb r0, [r4]
- bl sub_801CFE4
+ bl ClearFuryCutterDestinyBondGrudge
ldr r5, _0801648C @ =gUnknown_2023D68
ldr r2, _08016490 @ =gUnknown_20233C4
ldrb r1, [r4]
@@ -13321,7 +13321,7 @@ _0801694C:
cmp r0, 0
bne _080169D8
ldrb r0, [r4]
- bl sub_801CFE4
+ bl ClearFuryCutterDestinyBondGrudge
ldr r1, _0801697C @ =gUnknown_2023E82
movs r0, 0x3
strb r0, [r1, 0x5]
diff --git a/asm/battle_ai_script_commands.s b/asm/battle_ai_script_commands.s
index 77d495098..e7267a8df 100644
--- a/asm/battle_ai_script_commands.s
+++ b/asm/battle_ai_script_commands.s
@@ -3721,8 +3721,8 @@ _080C8878: .4byte gUnknown_2024284
_080C887C: .4byte gUnknown_2039A00
thumb_func_end sub_80C87BC
- thumb_func_start sub_80C8880
-sub_80C8880: @ 80C8880
+ thumb_func_start BattleAICmd_get_weather
+BattleAICmd_get_weather: @ 80C8880
push {lr}
ldr r2, _080C88E0 @ =gUnknown_2023F1C
ldrh r1, [r2]
@@ -3779,7 +3779,7 @@ _080C88D4:
_080C88E0: .4byte gUnknown_2023F1C
_080C88E4: .4byte gUnknown_2023FF4
_080C88E8: .4byte gUnknown_2039A00
- thumb_func_end sub_80C8880
+ thumb_func_end BattleAICmd_get_weather
thumb_func_start sub_80C88EC
sub_80C88EC: @ 80C88EC
@@ -4093,8 +4093,8 @@ _080C8B1E:
bx r0
thumb_func_end sub_80C8ABC
- thumb_func_start sub_80C8B24
-sub_80C8B24: @ 80C8B24
+ thumb_func_start BattleAICmd_if_can_faint
+BattleAICmd_if_can_faint: @ 80C8B24
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -4207,10 +4207,10 @@ _080C8C10:
bx r0
.align 2, 0
_080C8C1C: .4byte gUnknown_2039A00
- thumb_func_end sub_80C8B24
+ thumb_func_end BattleAICmd_if_can_faint
- thumb_func_start sub_80C8C20
-sub_80C8C20: @ 80C8C20
+ thumb_func_start BattleAICmd_if_cant_faint
+BattleAICmd_if_cant_faint: @ 80C8C20
push {r4-r7,lr}
ldr r2, _080C8CBC @ =gUnknown_8250C04
ldr r7, _080C8CC0 @ =gUnknown_2023FF4
@@ -4311,7 +4311,7 @@ _080C8CF8:
bx r0
.align 2, 0
_080C8D00: .4byte gUnknown_2039A00
- thumb_func_end sub_80C8C20
+ thumb_func_end BattleAICmd_if_cant_faint
thumb_func_start sub_80C8D04
sub_80C8D04: @ 80C8D04
@@ -4797,8 +4797,8 @@ _080C9080: .4byte gUnknown_2023D6C
_080C9084: .4byte gUnknown_8250C04
thumb_func_end sub_80C8FB0
- thumb_func_start sub_80C9088
-sub_80C9088: @ 80C9088
+ thumb_func_start BattleAICmd_if_any_move_disabled_or_encored
+BattleAICmd_if_any_move_disabled_or_encored: @ 80C9088
push {r4,r5,lr}
ldr r0, _080C909C @ =gUnknown_2039A00
ldr r1, [r0]
@@ -4870,10 +4870,10 @@ _080C9108:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80C9088
+ thumb_func_end BattleAICmd_if_any_move_disabled_or_encored
- thumb_func_start sub_80C9110
-sub_80C9110: @ 80C9110
+ thumb_func_start BattleAICmd_if_curr_move_disabled_or_encored
+BattleAICmd_if_curr_move_disabled_or_encored: @ 80C9110
push {r4,lr}
ldr r4, _080C9124 @ =gUnknown_2039A00
ldr r3, [r4]
@@ -4944,10 +4944,10 @@ _080C9198:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80C9110
+ thumb_func_end BattleAICmd_if_curr_move_disabled_or_encored
- thumb_func_start sub_80C91A0
-sub_80C91A0: @ 80C91A0
+ thumb_func_start BattleAICmd_flee
+BattleAICmd_flee: @ 80C91A0
ldr r0, _080C91B0 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x14]
@@ -4958,7 +4958,7 @@ sub_80C91A0: @ 80C91A0
bx lr
.align 2, 0
_080C91B0: .4byte gUnknown_2023FF4
- thumb_func_end sub_80C91A0
+ thumb_func_end BattleAICmd_flee
thumb_func_start sub_80C91B4
sub_80C91B4: @ 80C91B4
@@ -5455,7 +5455,7 @@ BattleAICmd_call: @ 80C9530
ldr r4, _080C955C @ =gUnknown_2039A00
ldr r0, [r4]
adds r0, 0x5
- bl sub_80C971C
+ bl AIStackPushVar
ldr r2, [r4]
ldrb r1, [r2, 0x1]
ldrb r0, [r2, 0x2]
@@ -5498,7 +5498,7 @@ _080C957C: .4byte gUnknown_2039A00
thumb_func_start BattleAICmd_end
BattleAICmd_end: @ 80C9580
push {lr}
- bl sub_80C9768
+ bl AIStackPop
lsls r0, 24
cmp r0, 0
bne _080C959A
@@ -5713,8 +5713,8 @@ _080C9714:
_080C9718: .4byte gUnknown_2039A00
thumb_func_end sub_80C96CC
- thumb_func_start sub_80C971C
-sub_80C971C: @ 80C971C
+ thumb_func_start AIStackPushVar
+AIStackPushVar: @ 80C971C
push {r4,lr}
ldr r1, _080C973C @ =gUnknown_2023FF4
ldr r1, [r1]
@@ -5733,10 +5733,10 @@ sub_80C971C: @ 80C971C
bx r0
.align 2, 0
_080C973C: .4byte gUnknown_2023FF4
- thumb_func_end sub_80C971C
+ thumb_func_end AIStackPushVar
- thumb_func_start sub_80C9740
-sub_80C9740: @ 80C9740
+ thumb_func_start AIStackPushVar_cursor
+AIStackPushVar_cursor: @ 80C9740
ldr r0, _080C9760 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x1C]
@@ -5755,10 +5755,10 @@ sub_80C9740: @ 80C9740
.align 2, 0
_080C9760: .4byte gUnknown_2023FF4
_080C9764: .4byte gUnknown_2039A00
- thumb_func_end sub_80C9740
+ thumb_func_end AIStackPushVar_cursor
- thumb_func_start sub_80C9768
-sub_80C9768: @ 80C9768
+ thumb_func_start AIStackPop
+AIStackPop: @ 80C9768
push {lr}
ldr r3, _080C9780 @ =gUnknown_2023FF4
ldr r0, [r3]
@@ -5791,6 +5791,6 @@ _080C979E:
bx r1
.align 2, 0
_080C97A4: .4byte gUnknown_2039A00
- thumb_func_end sub_80C9768
+ thumb_func_end AIStackPop
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index a4b8cb442..1b53a9e21 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -2658,8 +2658,8 @@ sub_807396C: @ 807396C
bx r0
thumb_func_end sub_807396C
- thumb_func_start sub_8073978
-sub_8073978: @ 8073978
+ thumb_func_start ScriptCmd_restorebg
+ScriptCmd_restorebg: @ 8073978
push {lr}
ldr r1, _080739A8 @ =gUnknown_2037ED4
ldr r0, [r1]
@@ -2688,10 +2688,10 @@ _080739AC: .4byte sub_8073850
_080739B0: .4byte gUnknown_3005090
_080739B4: .4byte 0x0000ffff
_080739B8: .4byte gUnknown_2037F17
- thumb_func_end sub_8073978
+ thumb_func_end ScriptCmd_restorebg
- thumb_func_start sub_80739BC
-sub_80739BC: @ 80739BC
+ thumb_func_start ScriptCmd_waitbgfadeout
+ScriptCmd_waitbgfadeout: @ 80739BC
push {lr}
ldr r0, _080739D4 @ =gUnknown_2037F17
ldrb r0, [r0]
@@ -2717,7 +2717,7 @@ _080739E4:
bx r0
.align 2, 0
_080739EC: .4byte gUnknown_2037EE0
- thumb_func_end sub_80739BC
+ thumb_func_end ScriptCmd_waitbgfadeout
thumb_func_start sub_80739F0
sub_80739F0: @ 80739F0
@@ -2748,8 +2748,8 @@ _08073A1A:
_08073A20: .4byte gUnknown_2037EE0
thumb_func_end sub_80739F0
- thumb_func_start sub_8073A24
-sub_8073A24: @ 8073A24
+ thumb_func_start ScriptCmd_changebg
+ScriptCmd_changebg: @ 8073A24
push {r4,lr}
ldr r4, _08073A40 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -2765,7 +2765,7 @@ sub_8073A24: @ 8073A24
bx r0
.align 2, 0
_08073A40: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073A24
+ thumb_func_end ScriptCmd_changebg
thumb_func_start sub_8073A44
sub_8073A44: @ 8073A44
diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s
index 3dfbd7036..4edbae993 100644
--- a/asm/battle_anim_8074480.s
+++ b/asm/battle_anim_8074480.s
@@ -5133,7 +5133,7 @@ _08076A46:
str r2, [sp]
adds r2, r6, 0
mov r3, r8
- bl sub_800F134
+ bl LoadSpecialPokePic_DontHandleDeoxys
b _08076A7C
.align 2, 0
_08076A54: .4byte gUnknown_2024018
diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s
index 2ca21e03e..31ad64420 100644
--- a/asm/battle_anim_80DE2C0.s
+++ b/asm/battle_anim_80DE2C0.s
@@ -3294,8 +3294,8 @@ _080DFBDC: .4byte gUnknown_3005090
_080DFBE0: .4byte gUnknown_2024018
thumb_func_end sub_80DF9BC
- thumb_func_start sub_80DFBE4
-sub_80DFBE4: @ 80DFBE4
+ thumb_func_start c3_80DFBE4
+c3_80DFBE4: @ 80DFBE4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3324,7 +3324,7 @@ _080DFC14: .4byte gUnknown_2037F02
_080DFC18: .4byte gUnknown_202063C
_080DFC1C: .4byte gUnknown_2023D44
_080DFC20: .4byte gUnknown_2037F1A
- thumb_func_end sub_80DFBE4
+ thumb_func_end c3_80DFBE4
thumb_func_start sub_80DFC24
sub_80DFC24: @ 80DFC24
diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s
index b30b7970a..b5bd5e1f4 100644
--- a/asm/battle_anim_80EEC0C.s
+++ b/asm/battle_anim_80EEC0C.s
@@ -939,7 +939,7 @@ _080EF39C:
bl GetMonData
lsls r0, 16
lsrs r0, 16
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1056,7 +1056,7 @@ sub_80EF490: @ 80EF490
lsrs r4, 24
ldr r0, _080EF4B4 @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
bl LoadBallGfx
@@ -1077,7 +1077,7 @@ sub_80EF4B8: @ 80EF4B8
lsrs r4, 24
ldr r0, _080EF4DC @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r0, 24
bl FreeBallGfx
@@ -1130,8 +1130,8 @@ _080EF524: .4byte gUnknown_2037F02
_080EF528: .4byte 0x0000fffe
thumb_func_end sub_80EF4E0
- thumb_func_start sub_80EF52C
-sub_80EF52C: @ 80EF52C
+ thumb_func_start ItemIdToBallId
+ItemIdToBallId: @ 80EF52C
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -1197,7 +1197,7 @@ _080EF5A4:
_080EF5A6:
pop {r1}
bx r1
- thumb_func_end sub_80EF52C
+ thumb_func_end ItemIdToBallId
thumb_func_start sub_80EF5AC
sub_80EF5AC: @ 80EF5AC
@@ -1212,7 +1212,7 @@ sub_80EF5AC: @ 80EF5AC
mov r10, r0
ldr r0, _080EF674 @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1371,7 +1371,7 @@ _080EF6F8:
_080EF708:
ldr r0, _080EF7C8 @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1656,7 +1656,7 @@ _080EF954:
str r0, [r4, 0x1C]
ldr r0, _080EF9AC @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xB
@@ -2875,7 +2875,7 @@ sub_80F02B0: @ 80F02B0
str r0, [r4, 0x1C]
ldr r0, _080F0368 @ =gUnknown_2023D68
ldrh r0, [r0]
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xB
diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s
index feba35fde..b8afc40ce 100644
--- a/asm/battle_controller_link_opponent.s
+++ b/asm/battle_controller_link_opponent.s
@@ -1356,7 +1356,7 @@ RecordedOpponentBufferExecCompleted: @ 803B124
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _0803B174 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s
index 11d2fa66f..2e7443f1c 100644
--- a/asm/battle_controller_link_partner.s
+++ b/asm/battle_controller_link_partner.s
@@ -1008,7 +1008,7 @@ sub_80D49E8: @ 80D49E8
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _080D4A38 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s
index e5a281ea6..3e6b1dba9 100644
--- a/asm/battle_controller_oak.s
+++ b/asm/battle_controller_oak.s
@@ -560,7 +560,7 @@ sub_80E79B8: @ 80E79B8
adds r1, r3
ldrb r4, [r1, 0x8]
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl sub_81278DC
_080E79F6:
@@ -636,7 +636,7 @@ sub_80E7A70: @ 80E7A70
ldr r1, _080E7AB4 @ =sub_80E7AC4
str r1, [r0]
bl nullsub_44
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080E7AB8 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x10
@@ -2623,7 +2623,7 @@ WallyBufferExecCompleted: @ 80E8A9C
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _080E8AEC @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index 76b32994f..a1a07c4c9 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -4176,7 +4176,7 @@ _08037D18:
ands r1, r0
cmp r1, 0
beq _08037D2C
- bl sub_80E7420
+ bl GetEreaderTrainerFrontSpriteId
_08037D26:
lsls r0, 24
lsrs r0, 24
@@ -4395,7 +4395,7 @@ _08037EEC:
ands r1, r0
cmp r1, 0
beq _08037F00
- bl sub_80E7420
+ bl GetEreaderTrainerFrontSpriteId
_08037EFA:
lsls r0, 24
lsrs r0, 24
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 642999210..6b3260d11 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -17,7 +17,7 @@ sub_802E314: @ 802E314
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _0802E334 @ =sub_802E3B4
+ ldr r1, _0802E334 @ =PlayerBufferRunCommand
str r1, [r0]
ldr r1, _0802E338 @ =gUnknown_2024005
movs r0, 0
@@ -26,12 +26,12 @@ sub_802E314: @ 802E314
.align 2, 0
_0802E32C: .4byte gUnknown_3004FE0
_0802E330: .4byte gUnknown_2023BC4
-_0802E334: .4byte sub_802E3B4
+_0802E334: .4byte PlayerBufferRunCommand
_0802E338: .4byte gUnknown_2024005
thumb_func_end sub_802E314
- thumb_func_start sub_802E33C
-sub_802E33C: @ 802E33C
+ thumb_func_start PlayerBufferExecCompleted
+PlayerBufferExecCompleted: @ 802E33C
push {r4,lr}
sub sp, 0x4
ldr r1, _0802E37C @ =gUnknown_3004FE0
@@ -39,7 +39,7 @@ sub_802E33C: @ 802E33C
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _0802E384 @ =sub_802E3B4
+ ldr r1, _0802E384 @ =PlayerBufferRunCommand
str r1, [r0]
ldr r0, _0802E388 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -53,7 +53,7 @@ sub_802E33C: @ 802E33C
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _0802E38C @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
@@ -64,7 +64,7 @@ sub_802E33C: @ 802E33C
.align 2, 0
_0802E37C: .4byte gUnknown_3004FE0
_0802E380: .4byte gUnknown_2023BC4
-_0802E384: .4byte sub_802E3B4
+_0802E384: .4byte PlayerBufferRunCommand
_0802E388: .4byte gUnknown_2022B4C
_0802E38C: .4byte gUnknown_2022BC4
_0802E390:
@@ -85,10 +85,10 @@ _0802E3A2:
.align 2, 0
_0802E3AC: .4byte gUnknown_2023BC8
_0802E3B0: .4byte gUnknown_825E45C
- thumb_func_end sub_802E33C
+ thumb_func_end PlayerBufferExecCompleted
- thumb_func_start sub_802E3B4
-sub_802E3B4: @ 802E3B4
+ thumb_func_start PlayerBufferRunCommand
+PlayerBufferRunCommand: @ 802E3B4
push {lr}
ldr r2, _0802E3E8 @ =gUnknown_2023BC8
ldr r1, _0802E3EC @ =gUnknown_825E45C
@@ -121,14 +121,14 @@ _0802E3F0: .4byte gUnknown_2023BC4
_0802E3F4: .4byte gUnknown_2022BC4
_0802E3F8: .4byte gUnknown_825089C
_0802E3FC:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802E400:
pop {r0}
bx r0
- thumb_func_end sub_802E3B4
+ thumb_func_end PlayerBufferRunCommand
- thumb_func_start sub_802E404
-sub_802E404: @ 802E404
+ thumb_func_start CompleteOnBankSpritePosX_0
+CompleteOnBankSpritePosX_0: @ 802E404
push {lr}
ldr r2, _0802E42C @ =gUnknown_202063C
ldr r1, _0802E430 @ =gUnknown_2023D44
@@ -144,7 +144,7 @@ sub_802E404: @ 802E404
ldrsh r0, [r0, r1]
cmp r0, 0
bne _0802E426
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802E426:
pop {r0}
bx r0
@@ -152,7 +152,7 @@ _0802E426:
_0802E42C: .4byte gUnknown_202063C
_0802E430: .4byte gUnknown_2023D44
_0802E434: .4byte gUnknown_2023BC4
- thumb_func_end sub_802E404
+ thumb_func_end CompleteOnBankSpritePosX_0
thumb_func_start sub_802E438
sub_802E438: @ 802E438
@@ -391,7 +391,7 @@ _0802E610:
movs r2, 0
bl EmitTwoReturnValues
_0802E616:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _0802E634
.align 2, 0
_0802E61C: .4byte gUnknown_2022B4C
@@ -506,7 +506,7 @@ _0802E6B6:
ldrb r0, [r4]
movs r1, 0x1
bl dp11b_obj_free
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _0802E9DC
.align 2, 0
_0802E708: .4byte gUnknown_8250980
@@ -1042,7 +1042,7 @@ _0802EB3A:
movs r0, 0x1
movs r1, 0xA
bl EmitTwoReturnValues
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _0802EDBA
.align 2, 0
_0802EB78: .4byte gUnknown_2023FFC
@@ -1124,7 +1124,7 @@ _0802EC10:
movs r0, 0x1
movs r1, 0xA
bl EmitTwoReturnValues
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
bl ResetPaletteFadeControl
b _0802ED2C
.align 2, 0
@@ -1248,8 +1248,8 @@ _0802ED10:
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
- bl sub_80308CC
- bl sub_8030940
+ bl MoveSelectionDisplayPpNumber
+ bl MoveSelectionDisplayMoveType
_0802ED2C:
movs r0, 0xF0
lsls r0, 12
@@ -2006,9 +2006,9 @@ _0802F324:
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
- bl sub_80308A8
- bl sub_80308CC
- bl sub_8030940
+ bl MoveSelectionDisplayPpString
+ bl MoveSelectionDisplayPpNumber
+ bl MoveSelectionDisplayMoveType
_0802F34C:
ldr r0, _0802F3A4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2057,9 +2057,9 @@ _0802F3B0:
ldr r0, _0802F3FC @ =sub_802EA10
_0802F3BA:
str r0, [r1]
- bl sub_80308A8
- bl sub_80308CC
- bl sub_8030940
+ bl MoveSelectionDisplayPpString
+ bl MoveSelectionDisplayPpNumber
+ bl MoveSelectionDisplayMoveType
_0802F3C8:
ldr r0, _0802F400 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2353,7 +2353,7 @@ sub_802F610: @ 802F610
str r0, [r3]
ldr r0, _0802F660 @ =sub_8011A1C
bl SetMainCallback2
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
b _0802F694
.align 2, 0
_0802F64C: .4byte gUnknown_3003F3C
@@ -2382,7 +2382,7 @@ _0802F664:
str r0, [r3]
ldr r0, _0802F6A4 @ =sub_8011A1C
bl SetMainCallback2
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
_0802F694:
pop {r0}
bx r0
@@ -2476,7 +2476,7 @@ sub_802F730: @ 802F730
ldr r0, _0802F764 @ =nullsub_8
cmp r1, r0
bne _0802F754
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802F754:
pop {r0}
bx r0
@@ -2505,7 +2505,7 @@ sub_802F768: @ 802F768
ldr r0, _0802F79C @ =nullsub_8
cmp r1, r0
bne _0802F78C
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802F78C:
pop {r0}
bx r0
@@ -2555,7 +2555,7 @@ sub_802F7A0: @ 802F7A0
lsls r0, 2
adds r0, r6
bl DestroySprite
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802F7F4:
pop {r4-r6}
pop {r0}
@@ -2596,7 +2596,7 @@ sub_802F810: @ 802F810
adds r0, r2
movs r1, 0
strb r1, [r0, 0x9]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802F848:
pop {r4}
pop {r0}
@@ -3168,7 +3168,7 @@ sub_802FCAC: @ 802FCAC
ldr r2, _0802FD14 @ =gUnknown_2024284
adds r0, r2
bl HandleLowHpMusicChange
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802FCFA:
pop {r4}
pop {r0}
@@ -3351,7 +3351,7 @@ _0802FE6C:
ldr r2, _0802FE90 @ =gUnknown_2024284
adds r0, r2
bl HandleLowHpMusicChange
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802FE86:
pop {r4-r6}
pop {r0}
@@ -3369,7 +3369,7 @@ sub_802FE94: @ 802FE94
lsls r0, 16
cmp r0, 0
bne _0802FEA6
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_0802FEA6:
pop {r0}
bx r0
@@ -4212,7 +4212,7 @@ sub_8030538: @ 8030538
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08030588:
pop {r4-r6}
pop {r0}
@@ -4263,7 +4263,7 @@ sub_80305A0: @ 80305A0
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_080305F4:
pop {r4-r6}
pop {r0}
@@ -4284,7 +4284,7 @@ sub_8030610: @ 8030610
lsls r0, 16
cmp r0, 0
bne _08030622
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08030622:
pop {r0}
bx r0
@@ -4317,7 +4317,7 @@ sub_8030628: @ 8030628
adds r1, r3
ldrb r4, [r1, 0x8]
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl sub_81278DC
_08030666:
@@ -4383,7 +4383,7 @@ _080306D6:
bne _080306F0
bl PrintLinkStandbyMsg
_080306F0:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_080306F4:
pop {r0}
bx r0
@@ -4409,7 +4409,7 @@ sub_8030700: @ 8030700
ldr r1, _08030738 @ =CompleteWhenChoseItem
str r1, [r0]
bl nullsub_44
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_8107ECC
_08030728:
pop {r0}
@@ -4439,7 +4439,7 @@ CompleteWhenChoseItem: @ 803073C
ldrh r1, [r0]
movs r0, 0x1
bl EmitOneReturnValue
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08030762:
pop {r0}
bx r0
@@ -4472,7 +4472,7 @@ CompleteOnSpecialAnimDone: @ 8030778
cmp r0, 0
bne _080307A2
_0803079E:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_080307A2:
pop {r0}
bx r0
@@ -4510,7 +4510,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
strb r0, [r2]
ldr r0, _080307FC @ =gUnknown_2024005
strb r3, [r0]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _0803082A
.align 2, 0
_080307F0: .4byte gUnknown_2023D44
@@ -4602,8 +4602,8 @@ _080308A0: .4byte gUnknown_83FE770
_080308A4: .4byte gUnknown_8247094
thumb_func_end sub_8030830
- thumb_func_start sub_80308A8
-sub_80308A8: @ 80308A8
+ thumb_func_start MoveSelectionDisplayPpString
+MoveSelectionDisplayPpString: @ 80308A8
push {r4,lr}
ldr r4, _080308C4 @ =gUnknown_202298C
ldr r1, _080308C8 @ =gUnknown_83FE766
@@ -4618,10 +4618,10 @@ sub_80308A8: @ 80308A8
.align 2, 0
_080308C4: .4byte gUnknown_202298C
_080308C8: .4byte gUnknown_83FE766
- thumb_func_end sub_80308A8
+ thumb_func_end MoveSelectionDisplayPpString
- thumb_func_start sub_80308CC
-sub_80308CC: @ 80308CC
+ thumb_func_start MoveSelectionDisplayPpNumber
+MoveSelectionDisplayPpNumber: @ 80308CC
push {r4-r7,lr}
ldr r5, _08030930 @ =gUnknown_2022BC4
ldr r7, _08030934 @ =gUnknown_2023BC4
@@ -4673,10 +4673,10 @@ _08030930: .4byte gUnknown_2022BC4
_08030934: .4byte gUnknown_2023BC4
_08030938: .4byte gUnknown_202298C
_0803093C: .4byte gUnknown_2023FFC
- thumb_func_end sub_80308CC
+ thumb_func_end MoveSelectionDisplayPpNumber
- thumb_func_start sub_8030940
-sub_8030940: @ 8030940
+ thumb_func_start MoveSelectionDisplayMoveType
+MoveSelectionDisplayMoveType: @ 8030940
push {r4-r6,lr}
ldr r5, _080309AC @ =gUnknown_2023BC4
ldrb r4, [r5]
@@ -4735,7 +4735,7 @@ _080309BC: .4byte gUnknown_83FE770
_080309C0: .4byte gUnknown_8250C04
_080309C4: .4byte gUnknown_2023FFC
_080309C8: .4byte gUnknown_824F1A0
- thumb_func_end sub_8030940
+ thumb_func_end MoveSelectionDisplayMoveType
thumb_func_start sub_80309CC
sub_80309CC: @ 80309CC
@@ -4920,7 +4920,7 @@ CompleteOnFinishedStatusAnimation: @ 8030AFC
ands r0, r1
cmp r0, 0
bne _08030B1E
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08030B1E:
pop {r0}
bx r0
@@ -4946,7 +4946,7 @@ CompleteOnFinishedBattleAnimation: @ 8030B2C
ands r0, r1
cmp r0, 0
bne _08030B4E
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08030B4E:
pop {r0}
bx r0
@@ -5033,7 +5033,7 @@ _08030BEA:
movs r0, 0x1
mov r2, sp
bl EmitDataTransfer
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
@@ -6030,7 +6030,7 @@ _08031406:
movs r0, 0x1
adds r2, r4, 0
bl EmitDataTransfer
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
add sp, 0x58
pop {r4-r7}
pop {r0}
@@ -6082,7 +6082,7 @@ _0803147A:
cmp r5, 0x5
bls _0803146C
_08031486:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -7273,7 +7273,7 @@ _08031EC2:
cmp r3, r0
bcc _08031EC2
_08031EE4:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4-r7}
pop {r0}
bx r0
@@ -7317,7 +7317,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _08031F64 @ =sub_802E404
+ ldr r1, _08031F64 @ =CompleteOnBankSpritePosX_0
str r1, [r0]
pop {r4}
pop {r0}
@@ -7329,7 +7329,7 @@ _08031F54: .4byte gUnknown_2024284
_08031F58: .4byte gUnknown_202063C
_08031F5C: .4byte gUnknown_2023D44
_08031F60: .4byte gUnknown_3004FE0
-_08031F64: .4byte sub_802E404
+_08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_end PlayerHandleLoadMonSprite
thumb_func_start PlayerHandleSwitchInAnim
@@ -7617,7 +7617,7 @@ _080321A8:
adds r0, r1
ldrb r0, [r0]
bl SetHealthboxSpriteInvisible
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_080321DE:
pop {r4-r6}
pop {r0}
@@ -8287,7 +8287,7 @@ PlayerHandlePaletteFade: @ 803273C
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
add sp, 0x4
pop {r0}
bx r0
@@ -8396,7 +8396,7 @@ _08032824:
cmp r0, 0
bne _08032824
_0803282E:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -8515,7 +8515,7 @@ _08032852:
lsrs r3, r0, 24
cmp r3, 0
beq _08032948
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _08032966
.align 2, 0
_08032924: .4byte gUnknown_2023BC4
@@ -8733,7 +8733,7 @@ _08032AB0:
lsls r0, 2
adds r0, r2
strb r4, [r0, 0x4]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08032AEC:
pop {r3-r5}
mov r8, r3
@@ -8810,7 +8810,7 @@ sub_8032B70: @ 8032B70
.align 2, 0
_08032B88: .4byte gUnknown_2023BC4
_08032B8C:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08032B90:
pop {r0}
bx r0
@@ -8968,9 +8968,9 @@ sub_8032CB4: @ 8032CB4
ldrb r0, [r0]
movs r1, 0
bl sub_80309CC
- bl sub_80308A8
- bl sub_80308CC
- bl sub_8030940
+ bl MoveSelectionDisplayPpString
+ bl MoveSelectionDisplayPpNumber
+ bl MoveSelectionDisplayMoveType
pop {r0}
bx r0
.align 2, 0
@@ -9142,7 +9142,7 @@ sub_8032E28: @ 8032E28
movs r2, 0
movs r3, 0x10
bl BeginNormalPaletteFade
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
add sp, 0x4
pop {r0}
bx r0
@@ -9283,7 +9283,7 @@ PlayerHandleExpUpdate: @ 8032F4C
bl GetMonData
cmp r0, 0x63
bls _08032F84
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _08032FD0
.align 2, 0
_08032F78: .4byte gUnknown_2022BC4
@@ -9480,7 +9480,7 @@ PlayerHandleStatusXor: @ 80330C8
movs r1, 0x37
mov r2, sp
bl sub_804037C
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
add sp, 0x4
pop {r3}
mov r8, r3
@@ -9497,7 +9497,7 @@ _08033130: .4byte gUnknown_2022BC4
thumb_func_start sub_8033134
sub_8033134: @ 8033134
push {lr}
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033134
@@ -9581,7 +9581,7 @@ _080331B0:
str r0, [r3, 0x8]
ldr r0, [r3, 0x8]
_080331DC:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
@@ -9607,7 +9607,7 @@ PlayerHandlePlayBGM: @ 80331F4
lsls r1, 8
orrs r0, r1
bl PlayBGM
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9618,7 +9618,7 @@ _08033220: .4byte gUnknown_2023BC4
thumb_func_start sub_8033224
sub_8033224: @ 8033224
push {lr}
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033224
@@ -9630,7 +9630,7 @@ PlayerHandleTwoReturnValues: @ 8033230
movs r1, 0
movs r2, 0
bl EmitTwoReturnValues
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleTwoReturnValues
@@ -9642,7 +9642,7 @@ PlayerHandleChosenMonReturnValue: @ 8033244
movs r1, 0
movs r2, 0
bl EmitChosenMonReturnValue
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleChosenMonReturnValue
@@ -9653,7 +9653,7 @@ PlayerHandleOneReturnValue: @ 8033258
movs r0, 0x1
movs r1, 0
bl EmitOneReturnValue
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleOneReturnValue
@@ -9664,7 +9664,7 @@ PlayerHandleOneReturnValue_Duplicate: @ 803326C
movs r0, 0x1
movs r1, 0
bl EmitOneReturnValue_Duplicate
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end PlayerHandleOneReturnValue_Duplicate
@@ -9678,7 +9678,7 @@ PlayerHandleCmd37: @ 8033280
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9704,7 +9704,7 @@ PlayerHandleCmd38: @ 803329C
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9721,7 +9721,7 @@ PlayerHandleCmd39: @ 80332D4
movs r0, 0x7F
ands r0, r1
strb r0, [r2]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9743,7 +9743,7 @@ PlayerHandleCmd40: @ 80332EC
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9768,7 +9768,7 @@ PlayerHandleHitAnimation: @ 8033314
lsls r0, 29
cmp r0, 0
bge _08033348
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _08033372
.align 2, 0
_0803333C: .4byte gUnknown_202063C
@@ -9808,7 +9808,7 @@ _08033380: .4byte DoHitAnimBlinkSpriteEffect
thumb_func_start sub_8033384
sub_8033384: @ 8033384
push {lr}
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_8033384
@@ -9839,7 +9839,7 @@ _080333A4:
lsls r1, r3, 24
asrs r1, 24
bl PlaySE12WithPanning
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -9864,7 +9864,7 @@ sub_80333D4: @ 80333D4
lsls r1, 8
orrs r0, r1
bl PlayFanfare
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9893,7 +9893,7 @@ PlayerHandleFaintingCry: @ 8033404
negs r1, r1
movs r2, 0x5
bl PlayCry3
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -9918,7 +9918,7 @@ PlayerHandleIntroSlide: @ 8033444
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -10294,7 +10294,7 @@ PlayerHandleDrawPartyStatusSummary: @ 803376C
lsls r0, 24
cmp r0, 0
bne _0803379C
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _08033810
.align 2, 0
_08033794: .4byte gUnknown_2022BC4
@@ -10399,7 +10399,7 @@ sub_8033830: @ 8033830
adds r0, r2
movs r1, 0
strb r1, [r0, 0x5]
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
_08033868:
pop {r4}
pop {r0}
@@ -10437,7 +10437,7 @@ PlayerHandleCmd49: @ 8033878
ldr r1, _080338C4 @ =sub_80491B0
str r1, [r0]
_080338AA:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -10458,7 +10458,7 @@ sub_80338C8: @ 80338C8
ldrb r0, [r4]
movs r1, 0
bl dp11b_obj_free
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10502,7 +10502,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
ldrb r0, [r4]
bl CopyBattleSpriteInvisibility
_08033932:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10544,7 +10544,7 @@ sub_803394C: @ 803394C
lsls r0, 24
cmp r0, 0
beq _08033998
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
b _080339A4
.align 2, 0
_08033990: .4byte gUnknown_2023BC4
@@ -10606,7 +10606,7 @@ _080339FC: .4byte gUnknown_2023BC4
_08033A00:
bl PrintLinkStandbyMsg
_08033A04:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10660,7 +10660,7 @@ _08033A62:
movs r1, 0
strb r1, [r0]
_08033A68:
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -10684,7 +10684,7 @@ sub_8033A78: @ 8033A78
bl FadeOutMapMusic
movs r0, 0x3
bl BeginFastPaletteFade
- bl sub_802E33C
+ bl PlayerBufferExecCompleted
ldr r1, _08033ABC @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s
index d418c214a..78aca5e46 100644
--- a/asm/battle_controller_pokedude.s
+++ b/asm/battle_controller_pokedude.s
@@ -568,7 +568,7 @@ sub_81564F0: @ 81564F0
adds r0, r1
ldrb r0, [r0]
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_8127968
_08156520:
pop {r0}
@@ -641,7 +641,7 @@ sub_8156594: @ 8156594
ldr r1, _081565D4 @ =sub_81565E8
str r1, [r0]
bl nullsub_44
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _081565D8 @ =gUnknown_20370C0
ldrh r0, [r0]
cmp r0, 0x1
@@ -1992,7 +1992,7 @@ sub_8157084: @ 8157084
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _081570D4 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index 33b1db8ca..50b090f7f 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -495,7 +495,7 @@ SafariBufferExecCompleted: @ 80DD8C8
movs r0, 0x2
movs r1, 0x4
mov r2, sp
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
ldr r1, _080DD918 @ =gUnknown_2022BC4
ldrb r0, [r4]
lsls r0, 9
diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s
index 2b64be0f5..e28119066 100644
--- a/asm/battle_controllers.s
+++ b/asm/battle_controllers.s
@@ -29,7 +29,7 @@ _0800D256:
ldr r0, _0800D274 @ =sub_8081A90
movs r1, 0
bl CreateTask
- bl sub_800D93C
+ bl CreateTasksForSendRecvLinkBuffers
_0800D262:
pop {r0}
bx r0
@@ -818,8 +818,8 @@ _0800D89C:
_0800D8AC: .4byte gUnknown_2023BCC
thumb_func_end sub_800D768
- thumb_func_start sub_800D8B0
-sub_800D8B0: @ 800D8B0
+ thumb_func_start PrepareBufferDataTransfer
+PrepareBufferDataTransfer: @ 800D8B0
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -836,7 +836,7 @@ sub_800D8B0: @ 800D8B0
adds r0, r3, 0
adds r1, r2, 0
adds r2, r4, 0
- bl sub_800D9EC
+ bl PrepareBufferDataTransferLink
b _0800D92E
.align 2, 0
_0800D8D8: .4byte gUnknown_2022B4C
@@ -891,10 +891,10 @@ _0800D92E:
.align 2, 0
_0800D934: .4byte gUnknown_20233C4
_0800D938: .4byte gUnknown_2023BC4
- thumb_func_end sub_800D8B0
+ thumb_func_end PrepareBufferDataTransfer
- thumb_func_start sub_800D93C
-sub_800D93C: @ 800D93C
+ thumb_func_start CreateTasksForSendRecvLinkBuffers
+CreateTasksForSendRecvLinkBuffers: @ 800D93C
push {r4-r6,lr}
ldr r0, _0800D9D4 @ =sub_800DB6C
movs r1, 0
@@ -975,10 +975,10 @@ _0800D9DC: .4byte gUnknown_3005090
_0800D9E0: .4byte Task_HandleCopyReceivedLinkBuffersData
_0800D9E4: .4byte gUnknown_202286D
_0800D9E8: .4byte gUnknown_202286E
- thumb_func_end sub_800D93C
+ thumb_func_end CreateTasksForSendRecvLinkBuffers
- thumb_func_start sub_800D9EC
-sub_800D9EC: @ 800D9EC
+ thumb_func_start PrepareBufferDataTransferLink
+PrepareBufferDataTransferLink: @ 800D9EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1167,7 +1167,7 @@ _0800DB5C: .4byte gUnknown_2023D6B
_0800DB60: .4byte gUnknown_2023D6C
_0800DB64: .4byte gUnknown_2023D70
_0800DB68: .4byte gUnknown_2023D6E
- thumb_func_end sub_800D9EC
+ thumb_func_end PrepareBufferDataTransferLink
thumb_func_start sub_800DB6C
sub_800DB6C: @ 800DB6C
@@ -1722,7 +1722,7 @@ EmitGetMonData: @ 800DFA4
strb r2, [r1, 0x2]
strb r3, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -1744,7 +1744,7 @@ EmitGetRawMonData: @ 800DFC8
strb r2, [r1, 0x2]
strb r4, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -1781,7 +1781,7 @@ _0800E010:
_0800E01E:
adds r2, r5, 0x3
adds r0, r6, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -1818,7 +1818,7 @@ _0800E05C:
adds r2, r4, 0x3
adds r0, r6, 0
adds r1, r5, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -1837,7 +1837,7 @@ EmitLoadMonSprite: @ 800E070
strb r2, [r1, 0x1]
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1857,7 +1857,7 @@ EmitSwitchInAnim: @ 800E090
strb r2, [r1, 0x2]
strb r3, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -1876,7 +1876,7 @@ EmitReturnMonToBall: @ 800E0B4
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1895,7 +1895,7 @@ EmitDrawTrainerPic: @ 800E0D4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1914,7 +1914,7 @@ EmitTrainerSlide: @ 800E0F4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1933,7 +1933,7 @@ EmitTrainerSlideBack: @ 800E114
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1952,7 +1952,7 @@ EmitFaintAnimation: @ 800E134
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1971,7 +1971,7 @@ EmitPaletteFade: @ 800E154
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -1990,7 +1990,7 @@ EmitSuccessBallThrowAnim: @ 800E174
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2008,7 +2008,7 @@ EmitBallThrowAnim: @ 800E194
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2047,7 +2047,7 @@ _0800E1E2:
adds r2, 0x2
adds r0, r6, 0
adds r1, r5, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2150,7 +2150,7 @@ _0800E2A6:
mov r0, r8
adds r1, r4, 0
movs r2, 0x2C
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
add sp, 0x4
pop {r3}
mov r8, r3
@@ -2267,7 +2267,7 @@ _0800E378:
mov r0, r10
mov r1, r9
movs r2, 0x44
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -2380,7 +2380,7 @@ _0800E46C:
mov r0, r10
mov r1, r9
movs r2, 0x44
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -2418,7 +2418,7 @@ EmitChooseAction: @ 800E4D4
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2437,7 +2437,7 @@ sub_800E500: @ 800E500
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2470,7 +2470,7 @@ _0800E53C:
bls _0800E53C
adds r0, r6, 0
movs r2, 0x18
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2499,7 +2499,7 @@ _0800E56E:
ble _0800E56E
adds r0, r5, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -2532,7 +2532,7 @@ _0800E5AA:
ble _0800E5AA
adds r0, r5, 0
movs r2, 0x8
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2552,7 +2552,7 @@ EmitCmd23: @ 800E5CC
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2581,7 +2581,7 @@ EmitHealthBarUpdate: @ 800E5EC
strb r1, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2610,7 +2610,7 @@ EmitExpUpdate: @ 800E624
asrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2654,7 +2654,7 @@ EmitStatusIconUpdate: @ 800E658
lsrs r2, 24
strb r2, [r1, 0x8]
movs r2, 0x9
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2686,7 +2686,7 @@ EmitStatusAnimation: @ 800E6AC
lsrs r2, 24
strb r2, [r1, 0x5]
movs r2, 0x6
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2705,7 +2705,7 @@ EmitStatusXor: @ 800E6E8
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -2745,7 +2745,7 @@ _0800E738:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2801,7 +2801,7 @@ _0800E7A0:
lsls r2, 16
lsrs r2, 16
adds r0, r6, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2841,7 +2841,7 @@ _0800E7E6:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2881,7 +2881,7 @@ _0800E82E:
lsrs r2, 16
adds r0, r6, 0
adds r1, r5, 0
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4-r6}
pop {r0}
bx r0
@@ -2905,7 +2905,7 @@ EmitTwoReturnValues: @ 800E848
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2936,7 +2936,7 @@ _0800E888:
adds r0, r5, 0
adds r1, r2, 0
movs r2, 0x5
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -2961,7 +2961,7 @@ EmitOneReturnValue: @ 800E8AC
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -2986,7 +2986,7 @@ EmitOneReturnValue_Duplicate: @ 800E8D8
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3006,7 +3006,7 @@ EmitCmd37: @ 800E904
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3024,7 +3024,7 @@ EmitCmd38: @ 800E924
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3043,7 +3043,7 @@ EmitCmd39: @ 800E944
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3062,7 +3062,7 @@ EmitCmd40: @ 800E964
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3081,7 +3081,7 @@ EmitHitAnimation: @ 800E984
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3100,7 +3100,7 @@ EmitCmd42: @ 800E9A4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3124,7 +3124,7 @@ EmitPlaySE: @ 800E9C4
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3149,7 +3149,7 @@ sub_800E9F0: @ 800E9F0
strb r4, [r3, 0x3]
adds r1, r3, 0
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3169,7 +3169,7 @@ EmitFaintingCry: @ 800EA1C
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3187,7 +3187,7 @@ EmitIntroSlide: @ 800EA3C
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3206,7 +3206,7 @@ EmitIntroTrainerBallThrow: @ 800EA5C
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3245,7 +3245,7 @@ _0800EAA4:
ble _0800EAA4
adds r0, r5, 0
movs r2, 0x34
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4,r5}
pop {r0}
bx r0
@@ -3265,7 +3265,7 @@ EmitCmd49: @ 800EAC4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3284,7 +3284,7 @@ EmitCmd50: @ 800EAE4
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3304,7 +3304,7 @@ EmitSpriteInvisibility: @ 800EB04
strb r2, [r1, 0x2]
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3327,7 +3327,7 @@ EmitBattleAnimation: @ 800EB28
lsrs r2, 8
strb r2, [r1, 0x3]
movs r2, 0x4
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r4}
pop {r0}
bx r0
@@ -3346,7 +3346,7 @@ sub_800EB54: @ 800EB54
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3364,7 +3364,7 @@ sub_800EB74: @ 800EB74
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
@@ -3382,7 +3382,7 @@ sub_800EB94: @ 800EB94
strb r2, [r1]
strb r3, [r1, 0x1]
movs r2, 0x2
- bl sub_800D8B0
+ bl PrepareBufferDataTransfer
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s
index ad8419b57..e14a88bb8 100644
--- a/asm/battle_dome_cards.s
+++ b/asm/battle_dome_cards.s
@@ -92,7 +92,7 @@ _0810BC14:
adds r1, r5, 0
adds r2, r4, 0
adds r3, r6, 0
- bl sub_800F134
+ bl LoadSpecialPokePic_DontHandleDeoxys
b _0810BC4E
.align 2, 0
_0810BC24: .4byte gUnknown_823654C
@@ -104,7 +104,7 @@ _0810BC28:
adds r0, r1
adds r1, r5, 0
adds r2, r4, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
b _0810BC4E
.align 2, 0
_0810BC3C: .4byte gUnknown_823957C
@@ -114,7 +114,7 @@ _0810BC40:
adds r0, r1
adds r1, r5, 0
adds r2, r7, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
_0810BC4E:
movs r0, 0
add sp, 0x4
diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s
index 3300d8c07..efd3ba104 100644
--- a/asm/battle_gfx_sfx_util.s
+++ b/asm/battle_gfx_sfx_util.s
@@ -767,7 +767,7 @@ _0803436C:
adds r0, r2, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
mov r3, r8
lsls r2, r3, 4
movs r0, 0x80
@@ -956,7 +956,7 @@ _0803451C:
ldr r1, [r1]
adds r2, r5, 0
adds r3, r4, 0
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
b _08034562
.align 2, 0
_08034538: .4byte gUnknown_2024008
@@ -1160,7 +1160,7 @@ sub_80346C4: @ 80346C4
ldr r1, [r0]
adds r0, r6, 0
movs r2, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
mov r1, r8
ldr r0, [r1]
adds r0, 0x4
@@ -1863,7 +1863,7 @@ _08034C16:
ldr r1, [r1]
mov r2, r8
ldr r3, [sp, 0x4]
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
ldr r0, [r4]
adds r0, 0x4
adds r0, r5
@@ -2137,7 +2137,7 @@ _08034E90:
adds r2, r4, r2
ldr r3, [r2]
mov r2, r8
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
b _08034F5E
.align 2, 0
_08034EFC: .4byte gUnknown_2023BCE
@@ -2181,7 +2181,7 @@ _08034F10:
adds r2, r4, r2
ldr r3, [r2]
mov r2, r8
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
_08034F5E:
str r4, [sp, 0x14]
ldr r0, _08035080 @ =gUnknown_202401C
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index b76447277..9a6b4f873 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -2108,7 +2108,7 @@ _08048B98: .4byte 0x05000040
_08048B9C: .4byte gUnknown_2024284
_08048BA0:
ldrb r0, [r6]
- bl sub_8049934
+ bl UpdateStatusIconInHealthbox
ldrb r0, [r6]
mov r2, r8
ldrh r1, [r2]
@@ -2218,7 +2218,7 @@ _08048C8C: .4byte 0x05000040
_08048C90: .4byte gUnknown_202402C
_08048C94:
ldrb r0, [r6]
- bl sub_8049934
+ bl UpdateStatusIconInHealthbox
ldrb r0, [r6]
mov r2, r8
ldrh r1, [r2]
@@ -3838,8 +3838,8 @@ _0804992C: .4byte 0x06010000
_08049930: .4byte 0x05000008
thumb_func_end sub_804981C
- thumb_func_start sub_8049934
-sub_8049934: @ 8049934
+ thumb_func_start UpdateStatusIconInHealthbox
+UpdateStatusIconInHealthbox: @ 8049934
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3911,7 +3911,7 @@ _080499C0:
beq _080499E8
movs r0, 0x1B
adds r1, r7, 0
- bl sub_8049BE4
+ bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3928,7 +3928,7 @@ _080499E8:
beq _08049A06
movs r0, 0x15
adds r1, r7, 0
- bl sub_8049BE4
+ bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3942,7 +3942,7 @@ _08049A06:
beq _08049A24
movs r0, 0x21
adds r1, r7, 0
- bl sub_8049BE4
+ bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3956,7 +3956,7 @@ _08049A24:
beq _08049A42
movs r0, 0x1E
adds r1, r7, 0
- bl sub_8049BE4
+ bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -3970,7 +3970,7 @@ _08049A42:
beq _08049A60
movs r0, 0x18
adds r1, r7, 0
- bl sub_8049BE4
+ bl GetStatusIconForBankId
lsls r0, 24
lsrs r0, 24
bl GetHealthboxElementGfxPtr
@@ -4151,10 +4151,10 @@ _08049BD4: .4byte 0x06010000
_08049BD8: .4byte 0x04000018
_08049BDC: .4byte gUnknown_2024018
_08049BE0: .4byte 0x04000008
- thumb_func_end sub_8049934
+ thumb_func_end UpdateStatusIconInHealthbox
- thumb_func_start sub_8049BE4
-sub_8049BE4: @ 8049BE4
+ thumb_func_start GetStatusIconForBankId
+GetStatusIconForBankId: @ 8049BE4
push {lr}
lsls r0, 24
lsls r1, 24
@@ -4249,10 +4249,10 @@ _08049CA4:
adds r0, r2, 0
pop {r1}
bx r1
- thumb_func_end sub_8049BE4
+ thumb_func_end GetStatusIconForBankId
- thumb_func_start sub_8049CAC
-sub_8049CAC: @ 8049CAC
+ thumb_func_start UpdateSafariBallsTextOnHealthbox
+UpdateSafariBallsTextOnHealthbox: @ 8049CAC
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -4295,7 +4295,7 @@ _08049D00: .4byte gUnknown_83FE80C
_08049D04: .4byte gUnknown_202063C
_08049D08: .4byte 0x06010040
_08049D0C: .4byte 0x06010800
- thumb_func_end sub_8049CAC
+ thumb_func_end UpdateSafariBallsTextOnHealthbox
thumb_func_start UpdateLeftNoOfBallsTextOnHealthbox
UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
@@ -4547,12 +4547,12 @@ _08049F16:
bne _08049F24
_08049F1E:
adds r0, r6, 0
- bl sub_8049934
+ bl UpdateStatusIconInHealthbox
_08049F24:
cmp r7, 0xA
bne _08049F2E
adds r0, r6, 0
- bl sub_8049CAC
+ bl UpdateSafariBallsTextOnHealthbox
_08049F2E:
adds r0, r7, 0
subs r0, 0xA
@@ -4624,7 +4624,7 @@ _08049FB8:
bne _08049FC6
_08049FC0:
adds r0, r6, 0
- bl sub_8049934
+ bl UpdateStatusIconInHealthbox
_08049FC6:
add sp, 0x4
pop {r3-r5}
@@ -5582,7 +5582,7 @@ sub_804A6D8: @ 804A6D8
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
pop {r0}
bx r0
thumb_func_end sub_804A6D8
diff --git a/asm/battle_message.s b/asm/battle_message.s
index df0d57614..9283c7b45 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -899,7 +899,7 @@ _080D79C2:
adds r0, r1, 0
_080D79C4:
adds r1, r4, 0
- bl sub_80D8418
+ bl ExpandBattleTextBuffPlaceholders
bl _080D8382
.align 2, 0
_080D79D0: .4byte gUnknown_2022AD8
@@ -1710,7 +1710,7 @@ _080D806E:
ands r1, r0
cmp r1, 0
beq _080D8084
- bl sub_80E7440
+ bl GetEreaderTrainerClassId
lsls r0, 24
lsrs r0, 24
movs r1, 0xD
@@ -2033,7 +2033,7 @@ _080D82F0: .4byte gUnknown_2023FE8
_080D82F4: .4byte gUnknown_2024284
_080D82F8:
ldr r0, _080D830C @ =0x00000834
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
ldr r4, _080D8310 @ =gUnknown_83FD81A
cmp r0, 0
@@ -2179,8 +2179,8 @@ _080D83FA:
bx r1
thumb_func_end sub_80D7868
- thumb_func_start sub_80D8418
-sub_80D8418: @ 80D8418
+ thumb_func_start ExpandBattleTextBuffPlaceholders
+ExpandBattleTextBuffPlaceholders: @ 80D8418
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2516,7 +2516,7 @@ _080D86BA:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80D8418
+ thumb_func_end ExpandBattleTextBuffPlaceholders
thumb_func_start sub_80D86C8
sub_80D86C8: @ 80D86C8
@@ -2889,7 +2889,7 @@ _080D8982:
mov r0, sp
adds r1, r3, 0
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
movs r0, 0x80
mov r1, r8
ands r1, r0
@@ -2899,7 +2899,7 @@ _080D8982:
bl PutWindowTilemap
adds r0, r7, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080D89A4:
add sp, 0x10
pop {r3}
diff --git a/asm/battle_records.s b/asm/battle_records.s
index f59d8d7e1..177e3630a 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -102,7 +102,7 @@ _080CD2E2:
_080CD302:
ldr r0, _080CD310 @ =gUnknown_83F6C68
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
b _080CD324
.align 2, 0
_080CD310: .4byte gUnknown_83F6C68
@@ -294,7 +294,7 @@ sub_80CD460: @ 80CD460
bl Free
movs r0, 0
bl sub_80CD4A4
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl DestroyTask
_080CD490:
@@ -320,9 +320,9 @@ sub_80CD4A4: @ 80CD4A4
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -856,8 +856,8 @@ _080CD8BE:
bx r0
thumb_func_end sub_80CD854
- thumb_func_start sub_80CD8DC
-sub_80CD8DC: @ 80CD8DC
+ thumb_func_start InitLinkBattleRecords
+InitLinkBattleRecords: @ 80CD8DC
push {lr}
ldr r0, _080CD8F0 @ =gUnknown_300500C
ldr r0, [r0]
@@ -869,7 +869,7 @@ sub_80CD8DC: @ 80CD8DC
.align 2, 0
_080CD8F0: .4byte gUnknown_300500C
_080CD8F4: .4byte 0x00000a98
- thumb_func_end sub_80CD8DC
+ thumb_func_end InitLinkBattleRecords
thumb_func_start sub_80CD8F8
sub_80CD8F8: @ 80CD8F8
@@ -1355,7 +1355,7 @@ sub_80CDCB4: @ 80CDCB4
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index ea8d73a36..6eb059846 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -13119,7 +13119,7 @@ _08023F84:
ldrh r0, [r1]
ldrb r1, [r1, 0x17]
lsrs r1, 7
- bl sub_8040D38
+ bl GetAbilityBySpecies
ldrb r1, [r7]
muls r1, r6
adds r1, r4
@@ -15662,7 +15662,7 @@ _080254A8:
beq _080254B6
b _080256D0
_080254B6:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080254E8 @ =gUnknown_2024284
ldr r1, _080254EC @ =gUnknown_2023FE8
ldr r1, [r1]
@@ -17430,7 +17430,7 @@ _08026304:
bl PutWindowTilemap
movs r0, 0xC
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0802636E
_08026318:
bl IsDma3ManagerBusyWithBgCopy
@@ -17453,7 +17453,7 @@ _08026330:
bl sub_8026448
movs r0, 0xC
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0802636E
.align 2, 0
_0802634C: .4byte gUnknown_30030F0
@@ -17489,12 +17489,12 @@ _08026380:
bl ClearWindowTilemap
movs r0, 0xD
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0xC
bl ClearWindowTilemap
movs r0, 0xC
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x7
movs r2, 0x2
@@ -17622,7 +17622,7 @@ sub_8026480: @ 8026480
bl PutWindowTilemap
movs r0, 0xD
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
bl PutMonIconOnLvlUpBox
pop {r0}
bx r0
@@ -17746,7 +17746,7 @@ PutLevelAndGenderOnLvlUpBox: @ 8026524
strb r5, [r0, 0xD]
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
movs r0, 0xF9
strb r0, [r6]
adds r6, 0x1
@@ -17808,10 +17808,10 @@ _08026624:
strb r1, [r0, 0x9]
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
movs r0, 0xD
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -18501,7 +18501,7 @@ _08026B9C:
ldr r0, _08026BAC @ =gUnknown_2023D4A
ldrh r0, [r0]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _08026BB0 @ =gUnknown_2023D6C
strb r0, [r1]
b _08026F4E
@@ -18832,7 +18832,7 @@ _08026DF6:
beq _08026E4E
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8040D38
+ bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2B
@@ -18907,7 +18907,7 @@ _08026E94:
beq _08026EEC
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8040D38
+ bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2B
@@ -19577,7 +19577,7 @@ _080273FC:
_08027426:
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _0802745C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r5, _08027460 @ =gUnknown_2023D74
@@ -24065,7 +24065,7 @@ _08029794:
str r0, [r1]
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _080297F8 @ =gUnknown_2023D6C
strb r0, [r1]
pop {r3}
@@ -25562,7 +25562,7 @@ _0802A334:
str r0, [r2]
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _0802A3C0 @ =gUnknown_2023D6C
strb r0, [r1]
ldr r3, _0802A3C4 @ =gUnknown_2023D74
@@ -26197,7 +26197,7 @@ _0802A88C: .4byte gUnknown_825E45C
_0802A890:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8040D38
+ bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
_0802A89C:
@@ -28930,7 +28930,7 @@ atkCC_callterrainattack: @ 802BE18
strh r0, [r4]
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _0802BE7C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r3, _0802BE80 @ =gUnknown_81D65A8
@@ -30510,7 +30510,7 @@ _0802CA3C:
strh r0, [r4]
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _0802CAAC @ =gUnknown_2023D6C
strb r0, [r1]
ldr r1, _0802CAB0 @ =gUnknown_2023D74
@@ -32221,7 +32221,7 @@ sub_802D800: @ 802D800
strb r1, [r0, 0x5]
ldr r4, _0802D880 @ =gUnknown_2021CD0
ldr r0, _0802D884 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -32250,7 +32250,7 @@ _0802D888: .4byte gUnknown_2021CF0
_0802D88C:
ldr r4, _0802D92C @ =gUnknown_2021CD0
ldr r0, _0802D930 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -32280,7 +32280,7 @@ _0802D88C:
strb r0, [r1, 0x5]
_0802D8D6:
ldr r0, _0802D940 @ =0x00000834
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0802D8EA
@@ -32451,7 +32451,7 @@ _0802DA3C:
beq _0802DA4A
b _0802DB6C
_0802DA4A:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r5, 0
bl sub_8106B60
ldr r1, _0802DA60 @ =gUnknown_2023E82
@@ -32976,7 +32976,7 @@ _0802DE4E:
adds r2, 0x6D
movs r1, 0x2
bl GetMonData
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
mov r2, r10
ldrb r0, [r2]
eors r0, r4
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index 010802d01..c783d8de7 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -25,7 +25,7 @@ sub_807F620: @ 807F620
.align 2, 0
_0807F640: .4byte gUnknown_3005098
_0807F644:
- bl sub_80A0E60
+ bl c3_80A0DD8_is_running
cmp r0, 0
bne _0807F686
bl sub_812B478
@@ -46,7 +46,7 @@ _0807F65E:
ldr r0, _0807F68C @ =sub_800FD9C
bl SetMainCallback2
bl sub_806D7E8
- bl sub_806D788
+ bl overworld_poison_timer_set
adds r0, r5, 0
bl DestroyTask
_0807F686:
@@ -628,13 +628,13 @@ sub_807FB40: @ 807FB40
bl sub_80800D0
cmp r0, 0x1
bne _0807FB80
- ldr r0, _0807FB7C @ =sub_80566A4
+ ldr r0, _0807FB7C @ =c2_whiteout
bl SetMainCallback2
b _0807FB8C
.align 2, 0
_0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
-_0807FB7C: .4byte sub_80566A4
+_0807FB7C: .4byte c2_whiteout
_0807FB80:
ldr r0, _0807FB94 @ =c2_exit_to_overworld_2_switch
bl SetMainCallback2
@@ -671,13 +671,13 @@ sub_807FBA0: @ 807FBA0
bl sub_80800D0
cmp r0, 0x1
bne _0807FBE0
- ldr r0, _0807FBDC @ =sub_80566A4
+ ldr r0, _0807FBDC @ =c2_whiteout
bl SetMainCallback2
b _0807FBE6
.align 2, 0
_0807FBD4: .4byte 0x01000100
_0807FBD8: .4byte gUnknown_2023E8A
-_0807FBDC: .4byte sub_80566A4
+_0807FBDC: .4byte c2_whiteout
_0807FBE0:
ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -710,13 +710,13 @@ sub_807FBF0: @ 807FBF0
adds r1, r0, 0
cmp r1, 0
beq _0807FC30
- ldr r0, _0807FC2C @ =sub_80566A4
+ ldr r0, _0807FC2C @ =c2_whiteout
bl SetMainCallback2
b _0807FC4C
.align 2, 0
_0807FC24: .4byte 0x01000100
_0807FC28: .4byte gUnknown_2023E8A
-_0807FC2C: .4byte sub_80566A4
+_0807FC2C: .4byte c2_whiteout
_0807FC30:
ldrb r0, [r4]
cmp r0, 0x1
@@ -910,7 +910,7 @@ sub_807FD90: @ 807FD90
bl sub_8058F78
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8055D30
+ bl sav1_get_flash_used_on_map
lsls r0, 24
cmp r0, 0
beq _0807FDC0
@@ -997,8 +997,8 @@ _0807FE48:
_0807FE50: .4byte gUnknown_2024284
thumb_func_end sub_807FDF4
- thumb_func_start sub_807FE54
-sub_807FE54: @ 807FE54
+ thumb_func_start reads_trainer_data_byte0
+reads_trainer_data_byte0: @ 807FE54
push {r4,r5,lr}
lsls r0, 16
lsrs r0, 16
@@ -1121,7 +1121,7 @@ _0807FF2C:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_807FE54
+ thumb_func_end reads_trainer_data_byte0
thumb_func_start sub_807FF34
sub_807FF34: @ 807FF34
@@ -1251,7 +1251,7 @@ _0808001A:
lsrs r6, r0, 24
ldrh r0, [r4]
adds r1, r5, 0
- bl sub_807FE54
+ bl reads_trainer_data_byte0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1683,7 +1683,7 @@ sub_8080378: @ 8080378
lsls r1, 19
adds r0, r1
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1741,7 +1741,7 @@ sub_80803E4: @ 80803E4
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1754,7 +1754,7 @@ sub_80803FC: @ 80803FC
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_80803FC
@@ -1765,7 +1765,7 @@ sub_8080410: @ 8080410
bl sub_80800B8
lsls r0, 16
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_8080410
@@ -1778,7 +1778,7 @@ HasTrainerAlreadyBeenFought: @ 8080424
lsls r1, 19
adds r0, r1
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1793,7 +1793,7 @@ trainer_flag_set: @ 808043C
lsls r1, 19
adds r0, r1
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
thumb_func_end trainer_flag_set
@@ -1806,7 +1806,7 @@ trainer_flag_clear: @ 8080450
lsls r1, 19
adds r0, r1
lsrs r0, 16
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
thumb_func_end trainer_flag_clear
@@ -1906,12 +1906,12 @@ _08080524:
cmp r0, 0x1
bne _08080540
_08080530:
- ldr r0, _0808053C @ =sub_80566A4
+ ldr r0, _0808053C @ =c2_whiteout
bl SetMainCallback2
b _0808054E
.align 2, 0
_08080538: .4byte gUnknown_2023E8A
-_0808053C: .4byte sub_80566A4
+_0808053C: .4byte c2_whiteout
_08080540:
ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -1945,12 +1945,12 @@ _08080578:
bl sub_80800D0
cmp r0, 0x1
bne _08080594
- ldr r0, _08080590 @ =sub_80566A4
+ ldr r0, _08080590 @ =c2_whiteout
bl SetMainCallback2
b _080805A6
.align 2, 0
_0808058C: .4byte gUnknown_2023E8A
-_08080590: .4byte sub_80566A4
+_08080590: .4byte c2_whiteout
_08080594:
ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl SetMainCallback2
@@ -1987,7 +1987,7 @@ _080805D4: .4byte sub_8080558
sub_80805D8: @ 80805D8
push {lr}
bl sub_80806D8
- bl sub_806943C
+ bl ShowFieldMessage
pop {r0}
bx r0
thumb_func_end sub_80805D8
@@ -2028,7 +2028,7 @@ _08080614: .4byte gUnknown_81C555B
sub_8080618: @ 8080618
push {lr}
bl sub_8080734
- bl sub_806943C
+ bl ShowFieldMessage
pop {r0}
bx r0
thumb_func_end sub_8080618
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 2f3bf45d5..c83d1ad65 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -46,7 +46,7 @@ _080E59B8:
movs r0, 0x80
lsls r0, 7
movs r1, 0x5
- bl sub_806E584
+ bl VarSet
b _080E5A00
_080E59D0:
lsls r0, r5, 24
@@ -71,7 +71,7 @@ _080E59F0:
lsls r0, 7
movs r1, 0x4
_080E59F6:
- bl sub_806E584
+ bl VarSet
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -90,7 +90,7 @@ _080E5A00:
movs r0, 0x80
lsls r0, 7
movs r1, 0x5
- bl sub_806E584
+ bl VarSet
_080E5A20:
bl sub_80E7064
pop {r4,r5}
@@ -644,7 +644,7 @@ sub_80E5E5C: @ 80E5E5C
push {lr}
ldr r0, _080E5E6C @ =0x00004010
movs r1, 0x12
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -1872,7 +1872,7 @@ sub_80E678C: @ 80E678C
adds r1, r4, 0
movs r2, 0x2
movs r3, 0x3
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
ldrb r0, [r5]
movs r1, 0x1
cmp r0, 0xFE
@@ -1909,7 +1909,7 @@ _080E67E4:
adds r1, r4, 0
movs r2, 0x3
movs r3, 0x2
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
_080E67F0:
pop {r4,r5}
pop {r0}
@@ -2799,7 +2799,7 @@ _080E6F0E:
ldr r4, _080E6FA4 @ =gUnknown_300500C
ldr r1, [r4]
adds r1, 0xA
- bl sub_805490C
+ bl CopyUnalignedWord
adds r0, r5, 0x4
ldr r1, [r4]
bl StringCopy7
@@ -2912,7 +2912,7 @@ _080E7016:
movs r0, 0x80
lsls r0, 7
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r1, [r4]
ldr r0, _080E7040 @ =0x0000055c
adds r1, r0
@@ -3369,7 +3369,7 @@ _080E7372:
adds r0, 0xC
ldr r1, [r5]
adds r1, 0xA
- bl sub_805490C
+ bl CopyUnalignedWord
adds r0, r7, 0x4
ldr r1, [r5]
bl StringCopy7
@@ -3435,8 +3435,8 @@ _080E7418: .4byte 0x00002cac
_080E741C: .4byte gUnknown_2024284
thumb_func_end sub_80E7348
- thumb_func_start sub_80E7420
-sub_80E7420: @ 80E7420
+ thumb_func_start GetEreaderTrainerFrontSpriteId
+GetEreaderTrainerFrontSpriteId: @ 80E7420
ldr r1, _080E7434 @ =gUnknown_82538A8
ldr r0, _080E7438 @ =gUnknown_300500C
ldr r0, [r0]
@@ -3450,10 +3450,10 @@ sub_80E7420: @ 80E7420
_080E7434: .4byte gUnknown_82538A8
_080E7438: .4byte gUnknown_300500C
_080E743C: .4byte 0x000004a1
- thumb_func_end sub_80E7420
+ thumb_func_end GetEreaderTrainerFrontSpriteId
- thumb_func_start sub_80E7440
-sub_80E7440: @ 80E7440
+ thumb_func_start GetEreaderTrainerClassId
+GetEreaderTrainerClassId: @ 80E7440
ldr r1, _080E7454 @ =gUnknown_825393E
ldr r0, _080E7458 @ =gUnknown_300500C
ldr r0, [r0]
@@ -3467,7 +3467,7 @@ sub_80E7440: @ 80E7440
_080E7454: .4byte gUnknown_825393E
_080E7458: .4byte gUnknown_300500C
_080E745C: .4byte 0x000004a1
- thumb_func_end sub_80E7440
+ thumb_func_end GetEreaderTrainerClassId
thumb_func_start sub_80E7460
sub_80E7460: @ 80E7460
diff --git a/asm/battle_util.s b/asm/battle_util.s
index acf3e8889..e04a269c0 100644
--- a/asm/battle_util.s
+++ b/asm/battle_util.s
@@ -1100,7 +1100,7 @@ _08017668:
ldr r5, _080176B4 @ =gUnknown_2023BC4
ldrb r0, [r5]
adds r1, r4, 0
- bl sub_8017A64
+ bl GetImprisonedMovesCount
lsls r0, 24
cmp r0, 0
beq _0801768E
@@ -1410,7 +1410,7 @@ _080178EC:
ldrh r1, [r5]
adds r0, r7, 0
str r3, [sp, 0x14]
- bl sub_8017A64
+ bl GetImprisonedMovesCount
lsls r0, 24
ldr r3, [sp, 0x14]
cmp r0, 0
@@ -1588,8 +1588,8 @@ _08017A5A:
_08017A60: .4byte gUnknown_2023E8C
thumb_func_end sub_8017998
- thumb_func_start sub_8017A64
-sub_8017A64: @ 8017A64
+ thumb_func_start GetImprisonedMovesCount
+GetImprisonedMovesCount: @ 8017A64
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1670,10 +1670,10 @@ _08017AE8:
_08017AF8: .4byte gUnknown_2023BCC
_08017AFC: .4byte gUnknown_2023BF0
_08017B00: .4byte gUnknown_2023DFC
- thumb_func_end sub_8017A64
+ thumb_func_end GetImprisonedMovesCount
- thumb_func_start sub_8017B04
-sub_8017B04: @ 8017B04
+ thumb_func_start UpdateTurnCounters
+UpdateTurnCounters: @ 8017B04
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2578,10 +2578,10 @@ _08018232:
.align 2, 0
_08018250: .4byte gUnknown_3004F84
_08018254: .4byte sub_8013BD4
- thumb_func_end sub_8017B04
+ thumb_func_end UpdateTurnCounters
- thumb_func_start sub_8018258
-sub_8018258: @ 8018258
+ thumb_func_start TurnBasedEffects
+TurnBasedEffects: @ 8018258
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3858,7 +3858,7 @@ _08018C88: .4byte gUnknown_2023FE8
_08018C8C: .4byte gUnknown_2023BCC
_08018C90: .4byte gUnknown_2023DD0
_08018C94: .4byte 0xfeffffdf
- thumb_func_end sub_8018258
+ thumb_func_end TurnBasedEffects
thumb_func_start sub_8018C98
sub_8018C98: @ 8018C98
@@ -5219,7 +5219,7 @@ _080197B8:
ldrb r0, [r4]
ldr r1, _08019800 @ =gUnknown_2023D4A
ldrh r1, [r1]
- bl sub_8017A64
+ bl GetImprisonedMovesCount
lsls r0, 24
cmp r0, 0
bne _080197CC
@@ -5595,7 +5595,7 @@ _08019AAC:
beq _08019AF6
movs r0, 0x75
movs r1, 0x1
- bl sub_801D05C
+ bl GetMoveTarget
strb r0, [r4]
_08019AF6:
ldr r1, _08019B1C @ =gUnknown_2023D74
@@ -11930,8 +11930,8 @@ _0801CFDC: .4byte gUnknown_2023D74
_0801CFE0: .4byte gUnknown_81D9622
thumb_func_end sub_801BC68
- thumb_func_start sub_801CFE4
-sub_801CFE4: @ 801CFE4
+ thumb_func_start ClearFuryCutterDestinyBondGrudge
+ClearFuryCutterDestinyBondGrudge: @ 801CFE4
lsls r0, 24
lsrs r0, 24
ldr r2, _0801D01C @ =gUnknown_2023E0C
@@ -11965,7 +11965,7 @@ _0801D020: .4byte gUnknown_2023BE4
_0801D024: .4byte 0xfdffffff
_0801D028: .4byte gUnknown_2023DFC
_0801D02C: .4byte 0xffffbfff
- thumb_func_end sub_801CFE4
+ thumb_func_end ClearFuryCutterDestinyBondGrudge
thumb_func_start sub_801D030
sub_801D030: @ 801D030
@@ -11991,8 +11991,8 @@ _0801D054: .4byte gUnknown_825011C
_0801D058: .4byte gUnknown_2023D74
thumb_func_end sub_801D030
- thumb_func_start sub_801D05C
-sub_801D05C: @ 801D05C
+ thumb_func_start GetMoveTarget
+GetMoveTarget: @ 801D05C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -12352,10 +12352,10 @@ _0801D39C:
.align 2, 0
_0801D3B8: .4byte gUnknown_2023D6B
_0801D3BC: .4byte gUnknown_2023FE8
- thumb_func_end sub_801D05C
+ thumb_func_end GetMoveTarget
- thumb_func_start sub_801D3C0
-sub_801D3C0: @ 801D3C0
+ thumb_func_start HasObedientBitSet
+HasObedientBitSet: @ 801D3C0
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -12412,7 +12412,7 @@ _0801D42A:
.align 2, 0
_0801D430: .4byte gUnknown_2023BCE
_0801D434: .4byte gUnknown_2024284
- thumb_func_end sub_801D3C0
+ thumb_func_end HasObedientBitSet
thumb_func_start sub_801D438
sub_801D438: @ 801D438
@@ -12435,7 +12435,7 @@ sub_801D438: @ 801D438
cmp r0, 0x1
beq _0801D4F4
ldrb r0, [r4]
- bl sub_801D3C0
+ bl HasObedientBitSet
cmp r0, 0
beq _0801D4BE
ldr r2, _0801D504 @ =gUnknown_2023BE4
@@ -12453,27 +12453,27 @@ sub_801D438: @ 801D438
cmp r0, 0
beq _0801D4F4
ldr r0, _0801D508 @ =0x00000827
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0801D4F4
movs r6, 0xA
ldr r0, _0801D50C @ =0x00000821
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4A2
movs r6, 0x1E
_0801D4A2:
ldr r0, _0801D510 @ =0x00000823
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4B0
movs r6, 0x32
_0801D4B0:
ldr r0, _0801D514 @ =0x00000825
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0801D4BE
@@ -12628,7 +12628,7 @@ _0801D5B6:
str r0, [r1]
ldrh r0, [r4]
movs r1, 0
- bl sub_801D05C
+ bl GetMoveTarget
ldr r1, _0801D62C @ =gUnknown_2023D6C
strb r0, [r1]
ldr r2, _0801D630 @ =gUnknown_2023DD0
diff --git a/asm/berry.s b/asm/berry.s
index ea5414836..7b1acb25f 100644
--- a/asm/berry.s
+++ b/asm/berry.s
@@ -242,8 +242,8 @@ _0809C8D8:
_0809C8E0: .4byte gUnknown_83DF7CC
thumb_func_end sub_809C8A0
- thumb_func_start sub_809C8E4
-sub_809C8E4: @ 809C8E4
+ thumb_func_start ItemIdToBerryType
+ItemIdToBerryType: @ 809C8E4
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -264,10 +264,10 @@ _0809C904:
_0809C906:
pop {r1}
bx r1
- thumb_func_end sub_809C8E4
+ thumb_func_end ItemIdToBerryType
- thumb_func_start sub_809C90C
-sub_809C90C: @ 809C90C
+ thumb_func_start BerryTypeToItemId
+BerryTypeToItemId: @ 809C90C
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -288,10 +288,10 @@ _0809C92C:
_0809C92E:
pop {r1}
bx r1
- thumb_func_end sub_809C90C
+ thumb_func_end BerryTypeToItemId
- thumb_func_start sub_809C934
-sub_809C934: @ 809C934
+ thumb_func_start GetBerryNameByBerryType
+GetBerryNameByBerryType: @ 809C934
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -306,6 +306,6 @@ sub_809C934: @ 809C934
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_809C934
+ thumb_func_end GetBerryNameByBerryType
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s
index 71529b7ff..0578cefb9 100644
--- a/asm/berry_fix_program.s
+++ b/asm/berry_fix_program.s
@@ -62,7 +62,7 @@ sub_815F74C: @ 815F74C
push {r4,lr}
sub sp, 0x4
ldr r0, _0815F7C4 @ =0x0000ffff
- bl sub_8000B94
+ bl DisableInterrupts
movs r0, 0x1
bl EnableInterrupts
bl m4aSoundVSyncOff
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 1438e3cc5..0ed2f6481 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -927,13 +927,13 @@ sub_813D4D0: @ 813D4D0
bne _0813D514
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -945,7 +945,7 @@ sub_813D4D0: @ 813D4D0
bl FillWindowPixelRect
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0813D52A
_0813D514:
ldr r2, _0813D534 @ =gUnknown_841623B
@@ -1349,7 +1349,7 @@ _0813D7E6:
beq _0813D7F2
bl Free
_0813D7F2:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -1874,7 +1874,7 @@ _0813DC24:
lsrs r0, 24
cmp r0, 0x1
beq _0813DC38
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0813DC7C
_0813DC38:
@@ -1926,19 +1926,19 @@ _0813DC86:
lsrs r6, 24
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1956,10 +1956,10 @@ _0813DC86:
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x2
- bl sub_810FCD0
+ bl AddItemMenuActionTextPrinters
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -3363,7 +3363,7 @@ sub_813E910: @ 813E910
push {r4,lr}
ldr r0, _0813E994 @ =gUnknown_84643B8
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -3566,7 +3566,7 @@ sub_813EA98: @ 813EA98
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
@@ -3593,7 +3593,7 @@ sub_813EACC: @ 813EACC
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0
@@ -3654,7 +3654,7 @@ _0813EB44:
adds r0, r6, 0
movs r2, 0x13
movs r3, 0xD
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
diff --git a/asm/bike.s b/asm/bike.s
index ba262d01e..ab29e21b1 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -487,7 +487,7 @@ sub_80BD40C: @ 80BD40C
cmp r4, 0x4
bhi _080BD456
adds r0, r5, 0
- bl sub_805A008
+ bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/blit.s b/asm/blit.s
index e8b8ff81e..483d05321 100644
--- a/asm/blit.s
+++ b/asm/blit.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8004A60
-sub_8004A60: @ 8004A60
+ thumb_func_start BlitBitmapRect4BitWithoutColorKey
+BlitBitmapRect4BitWithoutColorKey: @ 8004A60
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -33,17 +33,17 @@ sub_8004A60: @ 8004A60
str r7, [sp, 0xC]
movs r4, 0xFF
str r4, [sp, 0x10]
- bl sub_8004AA4
+ bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8004A60
+ thumb_func_end BlitBitmapRect4BitWithoutColorKey
- thumb_func_start sub_8004AA4
-sub_8004AA4: @ 8004AA4
+ thumb_func_start BlitBitmapRect4Bit
+BlitBitmapRect4Bit: @ 8004AA4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -294,10 +294,10 @@ _08004C72:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8004AA4
+ thumb_func_end BlitBitmapRect4Bit
- thumb_func_start sub_8004C84
-sub_8004C84: @ 8004C84
+ thumb_func_start FillBitmapRect4Bit
+FillBitmapRect4Bit: @ 8004C84
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -400,7 +400,7 @@ _08004D30:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8004C84
+ thumb_func_end FillBitmapRect4Bit
thumb_func_start sub_8004D40
sub_8004D40: @ 8004D40
diff --git a/asm/braille_text.s b/asm/braille_text.s
index 6d099e76d..4bf0e698b 100644
--- a/asm/braille_text.s
+++ b/asm/braille_text.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_814F884
-sub_814F884: @ 814F884
+ thumb_func_start Font6Func
+Font6Func: @ 814F884
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r6, 0
@@ -382,7 +382,7 @@ _0814FB58:
b _0814FC96
_0814FB62:
adds r0, r3, 0
- bl sub_814FC9C
+ bl DecompressGlyphFont6
adds r0, r6, 0
bl sub_8003014
ldr r0, _0814FB84 @ =gUnknown_3003DA0
@@ -399,7 +399,7 @@ _0814FB62:
_0814FB84: .4byte gUnknown_3003DA0
_0814FB88:
adds r0, r6, 0
- bl sub_8005680
+ bl TextPrinterWait
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -408,7 +408,7 @@ _0814FB88:
b _0814FB42
_0814FB9A:
adds r0, r6, 0
- bl sub_8005634
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -428,7 +428,7 @@ _0814FB9A:
b _0814FB42
_0814FBC4:
adds r0, r6, 0
- bl sub_8005634
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
beq _0814FB42
@@ -504,7 +504,7 @@ _0814FC38:
_0814FC62:
ldrb r0, [r6, 0x4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814FB42
_0814FC6C:
strb r2, [r6, 0x1C]
@@ -536,10 +536,10 @@ _0814FC96:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_814F884
+ thumb_func_end Font6Func
- thumb_func_start sub_814FC9C
-sub_814FC9C: @ 814FC9C
+ thumb_func_start DecompressGlyphFont6
+DecompressGlyphFont6: @ 814FC9C
push {r4,r5,lr}
lsls r0, 16
lsrs r2, r0, 19
@@ -584,12 +584,12 @@ sub_814FC9C: @ 814FC9C
.align 2, 0
_0814FCF8: .4byte gUnknown_846FB0C
_0814FCFC: .4byte gUnknown_3003DA0
- thumb_func_end sub_814FC9C
+ thumb_func_end DecompressGlyphFont6
- thumb_func_start sub_814FD00
-sub_814FD00: @ 814FD00
+ thumb_func_start GetGlyphWidthFont6
+GetGlyphWidthFont6: @ 814FD00
movs r0, 0x10
bx lr
- thumb_func_end sub_814FD00
+ thumb_func_end GetGlyphWidthFont6
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s
index 378c9311c..cb0e3935e 100644
--- a/asm/buy_menu_helpers.s
+++ b/asm/buy_menu_helpers.s
@@ -20,7 +20,7 @@ _0813F680:
ldr r0, _0813F6CC @ =gUnknown_846483C
bl sub_8003B24
_0813F686:
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
@@ -153,7 +153,7 @@ sub_813F75C: @ 813F75C
movs r1, 0x2
movs r2, 0x13
movs r3, 0xE
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
diff --git a/asm/cable_club.s b/asm/cable_club.s
index ccbffa12d..b658fd8d9 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -69,10 +69,10 @@ sub_808078C: @ 808078C
movs r1, 0x2
adds r2, r5, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -94,7 +94,7 @@ sub_80807E8: @ 80807E8
bl sub_80F6F9C
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1047,7 +1047,7 @@ sub_8080F78: @ 8080F78
bl sub_80807E8
bl EnableBothScriptContexts
ldrb r0, [r4, 0x12]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
_08080FA6:
@@ -1986,7 +1986,7 @@ _080816EC:
movs r0, 0x1
bl sub_8144714
_0808170A:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _08081724
ldr r1, _0808171C @ =gUnknown_30030F0
@@ -2073,7 +2073,7 @@ _080817A4:
b _08081820
_080817AE:
ldr r0, _080817BC @ =gUnknown_81BC4AC
- bl sub_806943C
+ bl ShowFieldMessage
movs r0, 0x1
strh r0, [r5, 0x8]
b _08081820
@@ -2382,8 +2382,8 @@ sub_8081A04: @ 8081A04
_08081A18: .4byte sub_808177C
thumb_func_end sub_8081A04
- thumb_func_start sub_8081A1C
-sub_8081A1C: @ 8081A1C
+ thumb_func_start sp02A_crash_sound
+sp02A_crash_sound: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gUnknown_20370C4
ldrb r0, [r0]
@@ -2394,7 +2394,7 @@ sub_8081A1C: @ 8081A1C
.align 2, 0
_08081A2C: .4byte gUnknown_20370C4
_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
- thumb_func_end sub_8081A1C
+ thumb_func_end sp02A_crash_sound
thumb_func_start sub_8081A34
sub_8081A34: @ 8081A34
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s
index 11dff8f6c..aaf44314c 100644
--- a/asm/calculate_base_damage.s
+++ b/asm/calculate_base_damage.s
@@ -163,7 +163,7 @@ _0803EE10:
bne _0803EEE8
movs r0, 0x82
lsls r0, 4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EE44
@@ -186,7 +186,7 @@ _0803EE44:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF30 @ =0x00000824
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EE7A
@@ -211,7 +211,7 @@ _0803EE7A:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF34 @ =0x00000826
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EEB2
@@ -237,7 +237,7 @@ _0803EEB2:
cmp r0, 0
bne _0803EEE8
ldr r0, _0803EF34 @ =0x00000826
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0803EEE8
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s
index abdbe8c44..4b976864a 100644
--- a/asm/clear_save_data_screen.s
+++ b/asm/clear_save_data_screen.s
@@ -137,7 +137,7 @@ _080F5660:
bl sub_812E5A4
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _080F56E2
.align 2, 0
_080F5694: .4byte gUnknown_841EE80
@@ -244,7 +244,7 @@ _080F5744:
bl sub_812E5A4
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
bl sub_80D972C
_080F577A:
ldr r1, [r5]
@@ -307,7 +307,7 @@ _080F57D4:
bl sub_81100E8
adds r0, r6, 0
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, [r5]
bl Free
str r4, [r5]
@@ -446,7 +446,7 @@ _080F5846:
bl ChangeBgY
ldr r0, _080F5948 @ =gUnknown_841EE68
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r1, 0x82
lsls r1, 5
movs r0, 0
diff --git a/asm/coins.s b/asm/coins.s
index 04af38a40..7edf85651 100644
--- a/asm/coins.s
+++ b/asm/coins.s
@@ -150,7 +150,7 @@ sub_80D060C: @ 80D060C
movs r1, 0
mov r2, r9
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -194,7 +194,7 @@ sub_80D0674: @ 80D0674
adds r0, r6, 0
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@@ -242,7 +242,7 @@ sub_80D06D0: @ 80D06D0
adds r0, r1, 0
movs r1, 0
adds r2, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -280,7 +280,7 @@ sub_80D072C: @ 80D072C
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -312,7 +312,7 @@ sub_80D072C: @ 80D072C
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x2
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r6, 0
bl sub_80D06D0
add sp, 0x20
@@ -335,7 +335,7 @@ sub_80D07C8: @ 80D07C8
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
diff --git a/asm/credits.s b/asm/credits.s
index efaf480a5..7b20b7f28 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -80,7 +80,7 @@ _080F3A48: .4byte gUnknown_203AB40
_080F3A4C:
movs r0, 0x80
lsls r0, 7
- bl sub_806E6A8
+ bl FlagClear
ldr r1, _080F3A6C @ =gUnknown_2031DD8
movs r0, 0
strb r0, [r1]
@@ -155,7 +155,7 @@ sub_80F3AC4: @ 80F3AC4
ldr r0, [r4]
ldrb r0, [r0, 0xA]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0xB]
@@ -176,7 +176,7 @@ sub_80F3B04: @ 80F3B04
cmp r0, 0
beq _080F3B20
ldrb r0, [r1, 0xA]
- bl sub_8003E3C
+ bl RemoveWindow
bl sub_80563F0
ldr r1, [r4]
movs r0, 0
@@ -207,7 +207,7 @@ _080F3B40: .4byte gUnknown_203AB40
_080F3B44:
movs r0, 0x80
lsls r0, 7
- bl sub_806E680
+ bl FlagSet
ldr r1, _080F3BB8 @ =gUnknown_2031DD8
movs r0, 0x2
strb r0, [r1]
@@ -708,7 +708,7 @@ _080F3F84:
ldr r0, [r7]
ldrb r0, [r0, 0xA]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r7]
ldr r2, _080F3FC0 @ =gUnknown_8410CF4
ldrh r0, [r1, 0x6]
@@ -1110,13 +1110,13 @@ _080F4288:
_080F42C2:
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4}
pop {r0}
@@ -1519,7 +1519,7 @@ _080F4638:
lsrs r4, r0, 24
cmp r4, 0
bne _080F4668
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0
bl GetBgTilemapBuffer
bl Free
diff --git a/asm/daycare.s b/asm/daycare.s
index 0ddeeeb8b..0456be9d7 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -162,7 +162,7 @@ StorePokemonInDaycare: @ 80454CC
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_8097D08
+ bl MonHasMail
lsls r0, 24
cmp r0, 0
beq _08045524
@@ -245,7 +245,7 @@ sub_804555C: @ 804555C
thumb_func_start sub_8045580
sub_8045580: @ 8045580
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -704,7 +704,7 @@ _08045906:
subs r1, 0x1
cmp r1, r2
bge _08045906
- bl sub_8097CB4
+ bl ClearMailStruct
pop {r0}
bx r0
thumb_func_end ClearDaycareMonMisc
@@ -845,7 +845,7 @@ sub_80459F0: @ 80459F0
adds r4, r1
strh r0, [r4]
ldr r0, _08045A1C @ =0x00000266
- bl sub_806E680
+ bl FlagSet
pop {r4}
pop {r0}
bx r0
@@ -868,7 +868,7 @@ sub_8045A20: @ 8045A20
orrs r1, r0
strh r1, [r4]
ldr r0, _08045A44 @ =0x00000266
- bl sub_806E680
+ bl FlagSet
pop {r4}
pop {r0}
bx r0
@@ -1274,7 +1274,7 @@ _08045D24:
lsls r0, 16
lsrs r0, 16
ldr r1, _08045DE4 @ =gUnknown_20244F8
- bl sub_8043DD4
+ bl GetLevelUpMovesBySpecies
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -2154,8 +2154,8 @@ sub_80463FC: @ 80463FC
bx lr
thumb_func_end sub_80463FC
- thumb_func_start sub_804640C
-sub_804640C: @ 804640C
+ thumb_func_start _GetDaycareMonNicknames
+_GetDaycareMonNicknames: @ 804640C
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -2192,12 +2192,12 @@ _0804644C:
_08046454: .4byte gUnknown_2021CD0
_08046458: .4byte gUnknown_2021D04
_0804645C: .4byte gUnknown_2021CF0
- thumb_func_end sub_804640C
+ thumb_func_end _GetDaycareMonNicknames
- thumb_func_start sub_8046460
-sub_8046460: @ 8046460
+ thumb_func_start GetSelectedMonNickAndSpecies
+GetSelectedMonNickAndSpecies: @ 8046460
push {r4,r5,lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r5, 0x64
@@ -2206,7 +2206,7 @@ sub_8046460: @ 8046460
adds r0, r4
ldr r1, _08046498 @ =gUnknown_2021CD0
bl GetBoxMonNick
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r5
@@ -2221,22 +2221,22 @@ sub_8046460: @ 8046460
.align 2, 0
_08046494: .4byte gUnknown_2024284
_08046498: .4byte gUnknown_2021CD0
- thumb_func_end sub_8046460
+ thumb_func_end GetSelectedMonNickAndSpecies
- thumb_func_start sub_804649C
-sub_804649C: @ 804649C
+ thumb_func_start GetDaycareMonNicknames
+GetDaycareMonNicknames: @ 804649C
push {lr}
ldr r0, _080464B0 @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
adds r0, r1
- bl sub_804640C
+ bl _GetDaycareMonNicknames
pop {r0}
bx r0
.align 2, 0
_080464B0: .4byte gUnknown_3005008
- thumb_func_end sub_804649C
+ thumb_func_end GetDaycareMonNicknames
thumb_func_start sub_80464B4
sub_80464B4: @ 80464B4
@@ -2830,7 +2830,7 @@ DaycareAddTextPrinter: @ 8046898
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -2961,8 +2961,8 @@ _080469EE:
_080469F8: .4byte gUnknown_3005008
thumb_func_end DaycarePrintMonInfo
- thumb_func_start sub_80469FC
-sub_80469FC: @ 80469FC
+ thumb_func_start Task_HandleDaycareLevelMenuInput
+Task_HandleDaycareLevelMenuInput: @ 80469FC
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -3013,7 +3013,7 @@ _08046A46:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4, 0xA]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3037,7 +3037,7 @@ _08046A7C:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4, 0xA]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3047,10 +3047,10 @@ _08046AAC:
bx r0
.align 2, 0
_08046AB4: .4byte gUnknown_20370D0
- thumb_func_end sub_80469FC
+ thumb_func_end Task_HandleDaycareLevelMenuInput
- thumb_func_start sub_8046AB8
-sub_8046AB8: @ 8046AB8
+ thumb_func_start ShowDaycareLevelMenu
+ShowDaycareLevelMenu: @ 8046AB8
push {r4,r5,lr}
sub sp, 0x18
ldr r0, _08046B18 @ =gUnknown_825F7F4
@@ -3077,8 +3077,8 @@ sub_8046AB8: @ 8046AB8
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
- ldr r0, _08046B20 @ =sub_80469FC
+ bl CopyWindowToVram
+ ldr r0, _08046B20 @ =Task_HandleDaycareLevelMenuInput
movs r1, 0x3
bl CreateTask
lsls r0, 24
@@ -3097,12 +3097,12 @@ sub_8046AB8: @ 8046AB8
.align 2, 0
_08046B18: .4byte gUnknown_825F7F4
_08046B1C: .4byte gUnknown_825F814
-_08046B20: .4byte sub_80469FC
+_08046B20: .4byte Task_HandleDaycareLevelMenuInput
_08046B24: .4byte gUnknown_3005090
- thumb_func_end sub_8046AB8
+ thumb_func_end ShowDaycareLevelMenu
- thumb_func_start sub_8046B28
-sub_8046B28: @ 8046B28
+ thumb_func_start ChooseSendDaycareMon
+ChooseSendDaycareMon: @ 8046B28
push {lr}
bl sub_8128370
ldr r1, _08046B38 @ =gUnknown_30030F0
@@ -3113,12 +3113,12 @@ sub_8046B28: @ 8046B28
.align 2, 0
_08046B38: .4byte gUnknown_30030F0
_08046B3C: .4byte c2_exit_to_overworld_2_switch
- thumb_func_end sub_8046B28
+ thumb_func_end ChooseSendDaycareMon
thumb_func_start sub_8046B40
sub_8046B40: @ 8046B40
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
diff --git a/asm/decompress.s b/asm/decompress.s
index fe0e82384..9cff25817 100644
--- a/asm/decompress.s
+++ b/asm/decompress.s
@@ -122,8 +122,8 @@ LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
_0800EC88: .4byte 0xffff0000
thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
- thumb_func_start sub_800EC8C
-sub_800EC8C: @ 800EC8C
+ thumb_func_start DecompressPicFromTable
+DecompressPicFromTable: @ 800EC8C
push {r4,r5,lr}
adds r3, r0, 0
adds r4, r1, 0
@@ -149,7 +149,7 @@ _0800ECB4:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_800EC8C
+ thumb_func_end DecompressPicFromTable
thumb_func_start sub_800ECC4
sub_800ECC4: @ 800ECC4
@@ -740,8 +740,8 @@ sub_800F0C4: @ 800F0C4
bx lr
thumb_func_end sub_800F0C4
- thumb_func_start sub_800F0E0
-sub_800F0E0: @ 800F0E0
+ thumb_func_start DecompressPicFromTable_DontHandleDeoxys
+DecompressPicFromTable_DontHandleDeoxys: @ 800F0E0
push {lr}
adds r3, r0, 0
movs r0, 0xCE
@@ -760,10 +760,10 @@ _0800F0FC:
_0800F102:
pop {r0}
bx r0
- thumb_func_end sub_800F0E0
+ thumb_func_end DecompressPicFromTable_DontHandleDeoxys
- thumb_func_start sub_800F108
-sub_800F108: @ 800F108
+ thumb_func_start HandleLoadSpecialPokePic_DontHandleDeoxys
+HandleLoadSpecialPokePic_DontHandleDeoxys: @ 800F108
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -779,17 +779,17 @@ _0800F11E:
str r1, [sp]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_800F134
+ bl LoadSpecialPokePic_DontHandleDeoxys
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800F130: .4byte gUnknown_82350AC
- thumb_func_end sub_800F108
+ thumb_func_end HandleLoadSpecialPokePic_DontHandleDeoxys
- thumb_func_start sub_800F134
-sub_800F134: @ 800F134
+ thumb_func_start LoadSpecialPokePic_DontHandleDeoxys
+LoadSpecialPokePic_DontHandleDeoxys: @ 800F134
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -882,6 +882,6 @@ _0800F1D0:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_800F134
+ thumb_func_end LoadSpecialPokePic_DontHandleDeoxys
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/diploma.s b/asm/diploma.s
index fa9b32e7f..0260a587d 100644
--- a/asm/diploma.s
+++ b/asm/diploma.s
@@ -255,7 +255,7 @@ sub_80F4DE0: @ 80F4DE0
bne _080F4E10
adds r0, r2, 0
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r4, _080F4E1C @ =gUnknown_203AB48
ldr r0, [r4]
bl Free
@@ -396,7 +396,7 @@ _080F4E66:
bl ChangeBgY
ldr r0, _080F4F94 @ =gUnknown_8415A10
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r1, 0x82
lsls r1, 5
movs r0, 0
@@ -513,18 +513,18 @@ _080F5014: .4byte gUnknown_203AB48
sub_80F5018: @ 80F5018
push {r4-r6,lr}
sub sp, 0xAC
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r0, _080F5040 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
bl sub_8088F84
lsls r0, 16
cmp r0, 0
beq _080F5048
ldr r1, _080F5044 @ =gUnknown_841B68F
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _080F5050
.align 2, 0
_080F5040: .4byte gUnknown_300500C
@@ -532,14 +532,14 @@ _080F5044: .4byte gUnknown_841B68F
_080F5048:
ldr r1, _080F50E0 @ =gUnknown_841B698
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_080F5050:
movs r0, 0
movs r1, 0
bl FillWindowPixelBuffer
ldr r1, _080F50E4 @ =gUnknown_841B60E
add r0, sp, 0xC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r5, 0x1
negs r5, r5
movs r0, 0x2
@@ -562,7 +562,7 @@ _080F5050:
bl sub_812E51C
ldr r1, _080F50EC @ =gUnknown_841B619
add r0, sp, 0xC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x2
add r1, sp, 0xC
adds r2, r5, 0
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index f9d937146..adf83de7e 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -18,7 +18,7 @@ sub_80BD718: @ 80BD718
cmp r0, 0x11
blt _080BD74C
ldr r0, _080BD734 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
b _080BD746
.align 2, 0
_080BD734: .4byte 0x0000082c
@@ -138,8 +138,8 @@ _080BD7F2:
bx r1
thumb_func_end sub_80BD78C
- thumb_func_start sub_80BD7F8
-sub_80BD7F8: @ 80BD7F8
+ thumb_func_start GetEasyChatWord
+GetEasyChatWord: @ 80BD7F8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -186,10 +186,10 @@ _080BD846:
bx r1
.align 2, 0
_080BD84C: .4byte gUnknown_83ECED4
- thumb_func_end sub_80BD7F8
+ thumb_func_end GetEasyChatWord
- thumb_func_start sub_80BD850
-sub_80BD850: @ 80BD850
+ thumb_func_start CopyEasyChatWord
+CopyEasyChatWord: @ 80BD850
push {r4-r6,lr}
adds r5, r0, 0
lsls r6, r1, 16
@@ -210,7 +210,7 @@ _080BD86C:
ldr r1, _080BD88C @ =0x000001ff
ands r1, r4
lsrs r0, r6, 25
- bl sub_80BD7F8
+ bl GetEasyChatWord
adds r1, r0, 0
_080BD87E:
adds r0, r5, 0
@@ -227,10 +227,10 @@ _080BD896:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80BD850
+ thumb_func_end CopyEasyChatWord
- thumb_func_start sub_80BD89C
-sub_80BD89C: @ 80BD89C
+ thumb_func_start ConvertEasyChatWordsToString
+ConvertEasyChatWordsToString: @ 80BD89C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -259,7 +259,7 @@ _080BD8CA:
ldrh r1, [r5]
adds r0, r4, 0
str r2, [sp]
- bl sub_80BD850
+ bl CopyEasyChatWord
adds r4, r0, 0
ldrh r0, [r5]
ldr r2, [sp]
@@ -279,7 +279,7 @@ _080BD8F0:
ldrh r1, [r5]
adds r5, 0x2
adds r0, r4, 0
- bl sub_80BD850
+ bl CopyEasyChatWord
adds r4, r0, 0
movs r0, 0xFE
strb r0, [r4]
@@ -304,7 +304,7 @@ _080BD90C:
.align 2, 0
_080BD924: .4byte 0xffff0000
_080BD928: .4byte 0x0000ffff
- thumb_func_end sub_80BD89C
+ thumb_func_end ConvertEasyChatWordsToString
thumb_func_start sub_80BD92C
sub_80BD92C: @ 80BD92C
@@ -328,7 +328,7 @@ _080BD944:
ldr r1, _080BD95C @ =0x000001ff
ands r1, r4
lsrs r0, r5, 25
- bl sub_80BD7F8
+ bl GetEasyChatWord
b _080BD962
.align 2, 0
_080BD95C: .4byte 0x000001ff
@@ -563,7 +563,7 @@ _080BDAF8:
ldr r4, _080BDB18 @ =gUnknown_2021D18
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
adds r0, r4, 0
bl ShowFieldAutoScrollMessage
_080BDB08:
@@ -592,7 +592,7 @@ _080BDB2E:
lsls r1, 16
lsrs r1, 16
ldr r0, _080BDB44 @ =gUnknown_2021CF0
- bl sub_80BD850
+ bl CopyEasyChatWord
pop {r0}
bx r0
.align 2, 0
@@ -1084,7 +1084,7 @@ _080BDEB2:
cmp r3, 0x10
ble _080BDEB2
ldr r0, _080BDF34 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080BDF0C
@@ -1232,7 +1232,7 @@ CopyEasyChatWordPadded: @ 80BDFC0
lsrs r1, 16
lsls r2, 16
lsrs r5, r2, 16
- bl sub_80BD850
+ bl CopyEasyChatWord
adds r1, r0, 0
subs r4, r1, r4
lsls r4, 16
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index e6ee9da8a..a1ae53f0f 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -173,8 +173,8 @@ _08046CE6:
bx r0
thumb_func_end sub_8046BFC
- thumb_func_start sub_8046D60
-sub_8046D60: @ 8046D60
+ thumb_func_start AddHatchedMonToParty
+AddHatchedMonToParty: @ 8046D60
push {r4,r5,lr}
sub sp, 0x14
lsls r0, 24
@@ -253,19 +253,19 @@ sub_8046D60: @ 8046D60
_08046E14: .4byte gUnknown_2024284
_08046E18: .4byte gUnknown_202402C
_08046E1C: .4byte gUnknown_2021CD0
- thumb_func_end sub_8046D60
+ thumb_func_end AddHatchedMonToParty
- thumb_func_start sub_8046E20
-sub_8046E20: @ 8046E20
+ thumb_func_start ScriptHatchMon
+ScriptHatchMon: @ 8046E20
push {lr}
ldr r0, _08046E30 @ =gUnknown_20370C0
ldrb r0, [r0]
- bl sub_8046D60
+ bl AddHatchedMonToParty
pop {r0}
bx r0
.align 2, 0
_08046E30: .4byte gUnknown_20370C0
- thumb_func_end sub_8046E20
+ thumb_func_end ScriptHatchMon
thumb_func_start sub_8046E34
sub_8046E34: @ 8046E34
@@ -616,7 +616,7 @@ _08047090:
adds r1, r0, 0
movs r0, 0
bl SetBgTilemapBuffer
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl ResetPaletteFade
bl FreeAllSpritePalettes
bl ResetSpriteData
@@ -680,7 +680,7 @@ _080471C8:
ldr r0, _080471DC @ =gUnknown_3000E74
ldr r0, [r0]
ldrb r0, [r0, 0x4]
- bl sub_8046D60
+ bl AddHatchedMonToParty
b _0804724A
.align 2, 0
_080471DC: .4byte gUnknown_3000E74
@@ -955,12 +955,12 @@ _0804741E:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, _08047440 @ =sub_80476B0
+ ldr r1, _08047440 @ =SpriteCB_Egg_0
str r1, [r0]
b _08047684
.align 2, 0
_0804743C: .4byte gUnknown_202063C
-_08047440: .4byte sub_80476B0
+_08047440: .4byte SpriteCB_Egg_0
_08047444:
ldr r2, _0804746C @ =gUnknown_202063C
ldr r3, [r5]
@@ -1012,7 +1012,7 @@ _08047482:
adds r1, r4, 0
movs r2, 0
movs r3, 0x3
- bl sub_8047A9C
+ bl EggHatchPrintMessage
ldr r0, _080474E4 @ =0x00000103
bl PlayFanfare
ldr r1, [r5]
@@ -1025,7 +1025,7 @@ _08047482:
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08047684
.align 2, 0
_080474D4: .4byte gUnknown_2024284
@@ -1069,7 +1069,7 @@ _08047504:
adds r1, r4, 0
movs r2, 0
movs r3, 0x2
- bl sub_8047A9C
+ bl EggHatchPrintMessage
ldr r1, [r5]
b _08047648
.align 2, 0
@@ -1213,7 +1213,7 @@ _08047654:
bne _08047684
ldr r0, [r5]
ldrb r0, [r0, 0x8]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
bl UnsetBgTilemapBuffer
movs r0, 0x1
@@ -1242,8 +1242,8 @@ _080476A8: .4byte gUnknown_2037AB8
_080476AC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8047338
- thumb_func_start sub_80476B0
-sub_80476B0: @ 80476B0
+ thumb_func_start SpriteCB_Egg_0
+SpriteCB_Egg_0: @ 80476B0
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x2E]
@@ -1253,13 +1253,13 @@ sub_80476B0: @ 80476B0
asrs r0, 16
cmp r0, 0x14
ble _080476D0
- ldr r0, _080476CC @ =sub_8047708
+ ldr r0, _080476CC @ =SpriteCB_Egg_1
str r0, [r4, 0x1C]
movs r0, 0
strh r0, [r4, 0x2E]
b _08047700
.align 2, 0
-_080476CC: .4byte sub_8047708
+_080476CC: .4byte SpriteCB_Egg_1
_080476D0:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -1285,10 +1285,10 @@ _08047700:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80476B0
+ thumb_func_end SpriteCB_Egg_0
- thumb_func_start sub_8047708
-sub_8047708: @ 8047708
+ thumb_func_start SpriteCB_Egg_1
+SpriteCB_Egg_1: @ 8047708
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1306,13 +1306,13 @@ sub_8047708: @ 8047708
asrs r0, 16
cmp r0, 0x14
ble _08047738
- ldr r0, _08047734 @ =sub_804776C
+ ldr r0, _08047734 @ =SpriteCB_Egg_2
str r0, [r4, 0x1C]
strh r1, [r4, 0x2E]
strh r1, [r4, 0x32]
b _08047764
.align 2, 0
-_08047734: .4byte sub_804776C
+_08047734: .4byte SpriteCB_Egg_2
_08047738:
ldrh r0, [r4, 0x30]
adds r0, 0x14
@@ -1337,10 +1337,10 @@ _08047764:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8047708
+ thumb_func_end SpriteCB_Egg_1
- thumb_func_start sub_804776C
-sub_804776C: @ 804776C
+ thumb_func_start SpriteCB_Egg_2
+SpriteCB_Egg_2: @ 804776C
push {r4-r6,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x32]
@@ -1429,7 +1429,7 @@ _08047826:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_804776C
+ thumb_func_end SpriteCB_Egg_2
thumb_func_start SpriteCB_Egg_3
SpriteCB_Egg_3: @ 804782C
@@ -1759,8 +1759,8 @@ _08047A94: .4byte gUnknown_8260184
_08047A98: .4byte gUnknown_202063C
thumb_func_end CreateEggShardSprite
- thumb_func_start sub_8047A9C
-sub_8047A9C: @ 8047A9C
+ thumb_func_start EggHatchPrintMessage
+EggHatchPrintMessage: @ 8047A9C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1815,6 +1815,6 @@ sub_8047A9C: @ 8047A9C
bx r0
.align 2, 0
_08047B08: .4byte gUnknown_3000E74
- thumb_func_end sub_8047A9C
+ thumb_func_end EggHatchPrintMessage
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/event_data.s b/asm/event_data.s
index 2de62371c..456df7644 100644
--- a/asm/event_data.s
+++ b/asm/event_data.s
@@ -54,15 +54,15 @@ sub_806E110: @ 806E110
movs r2, 0x20
bl memset
ldr r0, _0806E154 @ =0x00000803
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E158 @ =0x00000804
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E15C @ =0x00000805
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E160 @ =0x00000807
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E164 @ =0x00000842
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -85,7 +85,7 @@ sub_806E168: @ 806E168
strb r1, [r2, 0x1A]
strh r1, [r0]
ldr r0, _0806E18C @ =0x00000838
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -107,7 +107,7 @@ sub_806E190: @ 806E190
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0806E1BC @ =0x00000838
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -126,13 +126,13 @@ sub_806E1C0: @ 806E1C0
cmp r0, 0xDA
bne _0806E1FC
ldr r0, _0806E1F0 @ =0x0000403c
- bl sub_806E568
+ bl VarGet
lsls r0, 16
ldr r1, _0806E1F4 @ =0x03020000
cmp r0, r1
bne _0806E1FC
ldr r0, _0806E1F8 @ =0x00000838
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E1FC
@@ -162,7 +162,7 @@ sub_806E204: @ 806E204
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -184,7 +184,7 @@ sub_806E22C: @ 806E22C
strh r1, [r0]
movs r0, 0x84
lsls r0, 4
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -202,14 +202,14 @@ sub_806E25C: @ 806E25C
cmp r0, 0xB9
bne _0806E294
ldr r0, _0806E28C @ =0x0000404e
- bl sub_806E568
+ bl VarGet
lsls r0, 16
ldr r1, _0806E290 @ =0x62580000
cmp r0, r1
bne _0806E294
movs r0, 0x84
lsls r0, 4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E294
@@ -230,7 +230,7 @@ _0806E296:
sub_806E29C: @ 806E29C
push {lr}
ldr r0, _0806E2A8 @ =0x00000839
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -241,7 +241,7 @@ _0806E2A8: .4byte 0x00000839
sub_806E2AC: @ 806E2AC
push {lr}
ldr r0, _0806E2B8 @ =0x00000839
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -252,7 +252,7 @@ _0806E2B8: .4byte 0x00000839
sub_806E2BC: @ 806E2BC
push {lr}
ldr r0, _0806E2CC @ =0x00000839
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -266,40 +266,40 @@ sub_806E2D0: @ 806E2D0
push {lr}
movs r0, 0xF6
lsls r0, 2
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E340 @ =0x000003d9
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E344 @ =0x000003da
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E348 @ =0x000003db
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0xF7
lsls r0, 2
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E34C @ =0x000003dd
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E350 @ =0x000003de
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E354 @ =0x000003df
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0xF8
lsls r0, 2
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E358 @ =0x000003e1
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E35C @ =0x000003e2
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E360 @ =0x000003e3
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0xF9
lsls r0, 2
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E364 @ =0x000003e5
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E368 @ =0x000003e6
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _0806E36C @ =0x000003e7
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
@@ -322,31 +322,31 @@ sub_806E370: @ 806E370
push {lr}
ldr r0, _0806E3C0 @ =0x000040b5
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3C4 @ =0x000040b6
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3C8 @ =0x000040b7
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3CC @ =0x000040b8
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3D0 @ =0x000040b9
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3D4 @ =0x000040ba
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3D8 @ =0x000040bb
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3DC @ =0x000040bc
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3E0 @ =0x00004024
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -361,47 +361,47 @@ _0806E3DC: .4byte 0x000040bc
_0806E3E0: .4byte 0x00004024
thumb_func_end sub_806E370
- thumb_func_start sub_806E3E4
-sub_806E3E4: @ 806E3E4
+ thumb_func_start DisableResetRTC
+DisableResetRTC: @ 806E3E4
push {lr}
ldr r0, _0806E3F8 @ =0x00004032
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E3FC @ =0x00000837
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
.align 2, 0
_0806E3F8: .4byte 0x00004032
_0806E3FC: .4byte 0x00000837
- thumb_func_end sub_806E3E4
+ thumb_func_end DisableResetRTC
- thumb_func_start sub_806E400
-sub_806E400: @ 806E400
+ thumb_func_start EnableResetRTC
+EnableResetRTC: @ 806E400
push {lr}
ldr r0, _0806E418 @ =0x00004032
movs r1, 0x92
lsls r1, 4
- bl sub_806E584
+ bl VarSet
ldr r0, _0806E41C @ =0x00000837
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
_0806E418: .4byte 0x00004032
_0806E41C: .4byte 0x00000837
- thumb_func_end sub_806E400
+ thumb_func_end EnableResetRTC
- thumb_func_start sub_806E420
-sub_806E420: @ 806E420
+ thumb_func_start CanResetRTC
+CanResetRTC: @ 806E420
push {lr}
ldr r0, _0806E444 @ =0x00000837
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0806E44C
ldr r0, _0806E448 @ =0x00004032
- bl sub_806E568
+ bl VarGet
lsls r0, 16
movs r1, 0x92
lsls r1, 20
@@ -417,7 +417,7 @@ _0806E44C:
_0806E44E:
pop {r1}
bx r1
- thumb_func_end sub_806E420
+ thumb_func_end CanResetRTC
thumb_func_start sub_806E454
sub_806E454: @ 806E454
@@ -563,8 +563,8 @@ _0806E564:
bx r1
thumb_func_end sub_806E528
- thumb_func_start sub_806E568
-sub_806E568: @ 806E568
+ thumb_func_start VarGet
+VarGet: @ 806E568
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -580,10 +580,10 @@ _0806E57E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806E568
+ thumb_func_end VarGet
- thumb_func_start sub_806E584
-sub_806E584: @ 806E584
+ thumb_func_start VarSet
+VarSet: @ 806E584
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -601,24 +601,24 @@ _0806E59E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806E584
+ thumb_func_end VarSet
- thumb_func_start sub_806E5A4
-sub_806E5A4: @ 806E5A4
+ thumb_func_start VarGetFieldObjectGraphicsId
+VarGetFieldObjectGraphicsId: @ 806E5A4
push {lr}
lsls r0, 24
lsrs r0, 8
ldr r1, _0806E5BC @ =0x40100000
adds r0, r1
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0806E5BC: .4byte 0x40100000
- thumb_func_end sub_806E5A4
+ thumb_func_end VarGetFieldObjectGraphicsId
thumb_func_start sub_806E5C0
sub_806E5C0: @ 806E5C0
@@ -719,8 +719,8 @@ _0806E678: .4byte 0xffffc007
_0806E67C: .4byte gUnknown_20370E0
thumb_func_end sub_806E5C0
- thumb_func_start sub_806E680
-sub_806E680: @ 806E680
+ thumb_func_start FlagSet
+FlagSet: @ 806E680
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -741,10 +741,10 @@ _0806E6A0:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806E680
+ thumb_func_end FlagSet
- thumb_func_start sub_806E6A8
-sub_806E6A8: @ 806E6A8
+ thumb_func_start FlagClear
+FlagClear: @ 806E6A8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -765,10 +765,10 @@ _0806E6C8:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806E6A8
+ thumb_func_end FlagClear
- thumb_func_start sub_806E6D0
-sub_806E6D0: @ 806E6D0
+ thumb_func_start FlagGet
+FlagGet: @ 806E6D0
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -792,7 +792,7 @@ _0806E6F6:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806E6D0
+ thumb_func_end FlagGet
thumb_func_start sub_806E6FC
sub_806E6FC: @ 806E6FC
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index c2cf378bd..a93d52fc1 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -14,8 +14,8 @@ sub_80CDD18: @ 80CDD18
bx r0
thumb_func_end sub_80CDD18
- thumb_func_start sub_80CDD28
-sub_80CDD28: @ 80CDD28
+ thumb_func_start Task_BeginEvolutionScene
+Task_BeginEvolutionScene: @ 80CDD28
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -69,7 +69,7 @@ _080CDD68:
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80CDDF4
+ bl EvolutionScene
_080CDD98:
add sp, 0x4
pop {r4-r7}
@@ -78,10 +78,10 @@ _080CDD98:
.align 2, 0
_080CDDA0: .4byte gUnknown_2037AB8
_080CDDA4: .4byte gUnknown_2024284
- thumb_func_end sub_80CDD28
+ thumb_func_end Task_BeginEvolutionScene
- thumb_func_start sub_80CDDA8
-sub_80CDDA8: @ 80CDDA8
+ thumb_func_start BeginEvolutionScene
+BeginEvolutionScene: @ 80CDDA8
push {r4-r6,lr}
adds r4, r1, 0
adds r5, r2, 0
@@ -92,7 +92,7 @@ sub_80CDDA8: @ 80CDDA8
lsrs r5, 24
lsls r6, 24
lsrs r6, 24
- ldr r0, _080CDDE8 @ =sub_80CDD28
+ ldr r0, _080CDDE8 @ =Task_BeginEvolutionScene
movs r1, 0
bl CreateTask
lsls r0, 24
@@ -113,13 +113,13 @@ sub_80CDDA8: @ 80CDDA8
pop {r0}
bx r0
.align 2, 0
-_080CDDE8: .4byte sub_80CDD28
+_080CDDE8: .4byte Task_BeginEvolutionScene
_080CDDEC: .4byte gUnknown_3005090
_080CDDF0: .4byte sub_80CDD18
- thumb_func_end sub_80CDDA8
+ thumb_func_end BeginEvolutionScene
- thumb_func_start sub_80CDDF4
-sub_80CDDF4: @ 80CDDF4
+ thumb_func_start EvolutionScene
+EvolutionScene: @ 80CDDF4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -245,7 +245,7 @@ sub_80CDDF4: @ 80CDDF4
ldr r1, [r2]
ldr r1, [r1, 0x8]
adds r2, r5, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
adds r0, r5, 0
ldr r1, [sp, 0x20]
mov r2, r9
@@ -301,7 +301,7 @@ sub_80CDDF4: @ 80CDDF4
ldr r1, [r2]
ldr r1, [r1, 0x10]
mov r2, r10
- bl sub_800EC8C
+ bl DecompressPicFromTable
mov r0, r10
ldr r1, [sp, 0x20]
mov r2, r9
@@ -427,7 +427,7 @@ _080CE0D8: .4byte gUnknown_2037238
_080CE0DC: .4byte nullsub_76
_080CE0E0: .4byte sub_80D0050
_080CE0E4: .4byte sub_80CE710
- thumb_func_end sub_80CDDF4
+ thumb_func_end EvolutionScene
thumb_func_start CB2_EvolutionSceneLoadGraphics
CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
@@ -530,7 +530,7 @@ CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r5, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
adds r0, r5, 0
mov r1, r9
adds r2, r6, 0
@@ -776,7 +776,7 @@ _080CE414:
ldr r1, [r1]
ldr r1, [r1, 0x10]
adds r2, r6, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
@@ -957,7 +957,7 @@ TradeEvolutionScene: @ 80CE540
ldr r1, [r1]
ldr r1, [r1, 0x8]
adds r2, r5, 0
- bl sub_800EC8C
+ bl DecompressPicFromTable
adds r0, r5, 0
mov r1, r10
adds r2, r7, 0
@@ -1961,7 +1961,7 @@ _080CEEA0:
ldr r0, [r4]
bl Free
str r6, [r4]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080CEECC @ =gUnknown_300537C
ldr r0, [r0]
bl SetMainCallback2
@@ -2432,7 +2432,7 @@ _080CF2B4:
beq _080CF2C2
b _080CF528
_080CF2C2:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080CF2F8 @ =gUnknown_2024284
ldr r1, _080CF2FC @ =gUnknown_3005090
mov r3, r8
@@ -3702,7 +3702,7 @@ _080CFDC6:
movs r0, 0
bl GetBgTilemapBuffer
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080CFE1C @ =gUnknown_2024284
ldr r1, _080CFE20 @ =gUnknown_3005090
adds r5, r7, r6
diff --git a/asm/fame_checker.s b/asm/fame_checker.s
index 5ca20aa8f..56635f05e 100644
--- a/asm/fame_checker.s
+++ b/asm/fame_checker.s
@@ -221,7 +221,7 @@ _0812C540:
_0812C578:
ldr r0, _0812C598 @ =gUnknown_845FC04
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl sub_812CEC0
ldr r4, _0812C59C @ =gUnknown_203B100
movs r0, 0x88
@@ -721,7 +721,7 @@ sub_812C990: @ 812C990
movs r0, 0x2
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r0}
bx r0
@@ -1243,7 +1243,7 @@ _0812CDAC:
movs r0, 0x2
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
_0812CDEE:
@@ -1315,7 +1315,7 @@ sub_812CE04: @ 812CE04
movs r0, 0x2
movs r1, 0x2
adds r2, r6, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
add sp, 0x10
@@ -1374,7 +1374,7 @@ sub_812CEE0: @ 812CEE0
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1548,7 +1548,7 @@ _0812CFDA:
bl sub_812D094
movs r0, 0x3
bl sub_812D094
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
_0812D06C:
@@ -1579,9 +1579,9 @@ sub_812D094: @ 812D094
bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -3258,7 +3258,7 @@ sub_812DDAC: @ 812DDAC
movs r0, 0x2
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0x2
bl sub_812CEE0
add sp, 0x10
@@ -3525,7 +3525,7 @@ sub_812DFE4: @ 812DFE4
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 8e4b0e92c..e3b9145e3 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -50,7 +50,7 @@ sub_806C8BC: @ 806C8BC
ldrb r1, [r0, 0x2]
mov r8, r1
ldrb r6, [r0, 0x3]
- bl sub_806CE74
+ bl cur_mapdata_block_role_at_player_pos
lsls r0, 24
lsrs r0, 24
bl sub_8059D70
@@ -325,7 +325,7 @@ sub_806CAC8: @ 806CAC8
lsrs r6, r0, 24
mov r4, sp
mov r0, sp
- bl sub_806CE20
+ bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -400,7 +400,7 @@ _0806CB74:
_0806CB88:
mov r7, sp
mov r0, sp
- bl sub_806CE38
+ bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -425,7 +425,7 @@ _0806CB88:
_0806CBBC: .4byte gUnknown_3005078
_0806CBC0:
mov r0, sp
- bl sub_806CE20
+ bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -478,7 +478,7 @@ _0806CC28: .4byte gUnknown_3005078
_0806CC2C:
mov r4, sp
mov r0, sp
- bl sub_806CE38
+ bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -564,7 +564,7 @@ _0806CCCC:
orrs r0, r1
strb r0, [r2]
ldr r0, _0806CCF8 @ =0x0000083e
- bl sub_806E680
+ bl FlagSet
movs r0, 0x6
bl sub_80722CC
bl sub_806F258
@@ -717,8 +717,8 @@ _0806CE18:
bx r0
thumb_func_end sub_806CDF8
- thumb_func_start sub_806CE20
-sub_806CE20: @ 806CE20
+ thumb_func_start player_get_pos_to_and_height
+player_get_pos_to_and_height: @ 806CE20
push {r4,lr}
adds r4, r0, 0
adds r1, r4, 0x2
@@ -728,10 +728,10 @@ sub_806CE20: @ 806CE20
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_806CE20
+ thumb_func_end player_get_pos_to_and_height
- thumb_func_start sub_806CE38
-sub_806CE38: @ 806CE38
+ thumb_func_start player_get_next_pos_and_height
+player_get_next_pos_and_height: @ 806CE38
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -759,10 +759,10 @@ _0806CE6A:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_806CE38
+ thumb_func_end player_get_next_pos_and_height
- thumb_func_start sub_806CE74
-sub_806CE74: @ 806CE74
+ thumb_func_start cur_mapdata_block_role_at_player_pos
+cur_mapdata_block_role_at_player_pos: @ 806CE74
push {r4,lr}
sub sp, 0x4
mov r4, sp
@@ -782,7 +782,7 @@ sub_806CE74: @ 806CE74
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806CE74
+ thumb_func_end cur_mapdata_block_role_at_player_pos
thumb_func_start sub_806CEA0
sub_806CEA0: @ 806CEA0
@@ -1026,7 +1026,7 @@ _0806D02A:
cmp r0, 0xFF
beq _0806D092
_0806D078:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0806D0A0
adds r0, r6, r5
@@ -1173,7 +1173,7 @@ _0806D17A:
ldr r1, _0806D1CC @ =gUnknown_20370C4
strh r0, [r1]
ldrh r0, [r4]
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1615,7 +1615,7 @@ sub_806D548: @ 806D548
lsrs r0, 24
cmp r0, 0x1
bne _0806D570
- bl sub_805C83C
+ bl PartyHasMonWithSurf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1626,17 +1626,17 @@ sub_806D548: @ 806D548
_0806D56C: .4byte gUnknown_81A6B0D
_0806D570:
ldr r0, _0806D59C @ =0x00000824
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
- bl sub_805C83C
+ bl PartyHasMonWithSurf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5A4
- bl sub_805C8B0
+ bl IsPlayerFacingSurfableFishableWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1654,12 +1654,12 @@ _0806D5A4:
cmp r0, 0x1
bne _0806D5E0
ldr r0, _0806D5D0 @ =0x00000826
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _0806D5D8
- bl sub_805C88C
+ bl IsPlayerSurfingNorth
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1757,7 +1757,7 @@ sub_806D660: @ 806D660
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl sub_806DDC0
+ bl mapheader_trigger_activate_at
cmp r0, 0
beq _0806D68C
bl ScriptContext1_SetupScript
@@ -1784,14 +1784,14 @@ sub_806D698: @ 806D698
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _0806D72C
ldr r0, _0806D6E0 @ =gUnknown_203ADFA
ldrb r0, [r0]
cmp r0, 0x2
beq _0806D72C
- bl sub_806D74C
+ bl AdjustFriendship_step
ldr r0, _0806D6E4 @ =gUnknown_2037078
ldrb r1, [r0]
movs r0, 0x40
@@ -1817,7 +1817,7 @@ _0806D6E0: .4byte gUnknown_203ADFA
_0806D6E4: .4byte gUnknown_2037078
_0806D6E8: .4byte gUnknown_81A8CED
_0806D6EC:
- bl sub_806D79C
+ bl overworld_poison_step
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1861,15 +1861,15 @@ sub_806D738: @ 806D738
push {lr}
ldr r0, _0806D748 @ =0x00004021
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
_0806D748: .4byte 0x00004021
thumb_func_end sub_806D738
- thumb_func_start sub_806D74C
-sub_806D74C: @ 806D74C
+ thumb_func_start AdjustFriendship_step
+AdjustFriendship_step: @ 806D74C
push {r4,r5,lr}
ldr r0, _0806D780 @ =0x00004021
bl sub_806E454
@@ -1899,22 +1899,22 @@ _0806D77A:
.align 2, 0
_0806D780: .4byte 0x00004021
_0806D784: .4byte gUnknown_2024284
- thumb_func_end sub_806D74C
+ thumb_func_end AdjustFriendship_step
- thumb_func_start sub_806D788
-sub_806D788: @ 806D788
+ thumb_func_start overworld_poison_timer_set
+overworld_poison_timer_set: @ 806D788
push {lr}
ldr r0, _0806D798 @ =0x00004022
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
_0806D798: .4byte 0x00004022
- thumb_func_end sub_806D788
+ thumb_func_end overworld_poison_timer_set
- thumb_func_start sub_806D79C
-sub_806D79C: @ 806D79C
+ thumb_func_start overworld_poison_step
+overworld_poison_step: @ 806D79C
push {r4,lr}
ldr r0, _0806D7D8 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
@@ -1951,7 +1951,7 @@ _0806D7E2:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806D79C
+ thumb_func_end overworld_poison_step
thumb_func_start sub_806D7E8
sub_806D7E8: @ 806D7E8
@@ -2531,7 +2531,7 @@ sub_806DC30: @ 806DC30
lsls r2, 16
lsrs r2, 16
ldrb r3, [r3, 0x4]
- bl sub_806DD38
+ bl map_warp_check
lsls r0, 24
asrs r0, 24
pop {r1}
@@ -2651,8 +2651,8 @@ _0806DD32:
bx r1
thumb_func_end sub_806DCD0
- thumb_func_start sub_806DD38
-sub_806DD38: @ 806DD38
+ thumb_func_start map_warp_check
+map_warp_check: @ 806DD38
push {r4-r6,lr}
lsls r1, 16
lsrs r6, r1, 16
@@ -2694,10 +2694,10 @@ _0806DD7A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806DD38
+ thumb_func_end map_warp_check
- thumb_func_start sub_806DD80
-sub_806DD80: @ 806DD80
+ thumb_func_start trigger_activate
+trigger_activate: @ 806DD80
push {r4,lr}
adds r4, r0, 0
cmp r4, 0
@@ -2713,7 +2713,7 @@ _0806DD96:
cmp r0, 0
beq _0806DDB0
ldrh r0, [r4, 0x6]
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4, 0x8]
@@ -2730,10 +2730,10 @@ _0806DDB8:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806DD80
+ thumb_func_end trigger_activate
- thumb_func_start sub_806DDC0
-sub_806DDC0: @ 806DDC0
+ thumb_func_start mapheader_trigger_activate_at
+mapheader_trigger_activate_at: @ 806DDC0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2770,7 +2770,7 @@ _0806DDEC:
bne _0806DE0C
_0806DE02:
adds r0, r5, 0
- bl sub_806DD80
+ bl trigger_activate
cmp r0, 0
bne _0806DE18
_0806DE0C:
@@ -2789,7 +2789,7 @@ _0806DE18:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_806DDC0
+ thumb_func_end mapheader_trigger_activate_at
thumb_func_start sub_806DE28
sub_806DE28: @ 806DE28
@@ -2817,7 +2817,7 @@ sub_806DE28: @ 806DE28
bl sub_805FCD8
lsls r0, 16
lsrs r0, 16
- bl sub_806E6A8
+ bl FlagClear
_0806DE64:
pop {r4,r5}
pop {r0}
@@ -2884,7 +2884,7 @@ sub_806DEC4: @ 806DEC4
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl sub_806DDC0
+ bl mapheader_trigger_activate_at
pop {r4}
pop {r1}
bx r1
@@ -3089,7 +3089,7 @@ GetFieldObjectScriptPointerForComparison: @ 806E050
lsrs r4, 24
mov r5, sp
mov r0, sp
- bl sub_806CE38
+ bl player_get_next_pos_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -3115,7 +3115,7 @@ sub_806E08C: @ 806E08C
bl player_get_direction_upper_nybble
mov r4, sp
mov r0, sp
- bl sub_806CE20
+ bl player_get_pos_to_and_height
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 4b0ae5e20..9ef43005c 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -2018,7 +2018,7 @@ task00_8084310: @ 8084310
lsls r0, 24
cmp r0, 0
beq _08084376
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _08084380 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -2155,7 +2155,7 @@ _08084450: .4byte gUnknown_2037AB8
sub_8084454: @ 8084454
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -2538,7 +2538,7 @@ sub_8084708: @ 8084708
bne _08084760
ldr r0, _0808477C @ =0x00004001
movs r1, 0x1
- bl sub_806E584
+ bl VarSet
movs r0, 0x8
bl sub_805BDEC
movs r0, 0x16
@@ -2886,7 +2886,7 @@ _080849F0: .4byte sub_80847C0
sub_80849F4: @ 80849F4
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -3910,7 +3910,7 @@ _080851B8: .4byte sub_8084F44
mapldr_080851BC: @ 80851BC
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
ldr r0, _080851E0 @ =gUnknown_3005020
@@ -4966,7 +4966,7 @@ _080859C4:
sub_80859D4: @ 80859D4
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
@@ -5432,7 +5432,7 @@ _08085D84: .4byte sub_8085B78
sub_8085D88: @ 8085D88
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
bl ScriptContext2_Enable
bl player_bitmagic
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s
index 9a0cf4a96..f81cc0cd7 100644
--- a/asm/field_fadetransition.s
+++ b/asm/field_fadetransition.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_807DB14
-sub_807DB14: @ 807DB14
+ thumb_func_start palette_bg_faded_fill_white
+palette_bg_faded_fill_white: @ 807DB14
push {lr}
sub sp, 0x4
ldr r0, _0807DB2C @ =0x7fff7fff
@@ -22,10 +22,10 @@ sub_807DB14: @ 807DB14
_0807DB2C: .4byte 0x7fff7fff
_0807DB30: .4byte gUnknown_20375F8
_0807DB34: .4byte 0x01000100
- thumb_func_end sub_807DB14
+ thumb_func_end palette_bg_faded_fill_white
- thumb_func_start sub_807DB38
-sub_807DB38: @ 807DB38
+ thumb_func_start palette_bg_faded_fill_black
+palette_bg_faded_fill_black: @ 807DB38
push {lr}
sub sp, 0x4
movs r0, 0
@@ -40,10 +40,10 @@ sub_807DB38: @ 807DB38
.align 2, 0
_0807DB50: .4byte gUnknown_20375F8
_0807DB54: .4byte 0x01000100
- thumb_func_end sub_807DB38
+ thumb_func_end palette_bg_faded_fill_black
- thumb_func_start sub_807DB58
-sub_807DB58: @ 807DB58
+ thumb_func_start pal_fill_for_maplights
+pal_fill_for_maplights: @ 807DB58
push {r4,lr}
bl get_map_light_from_warp0
adds r4, r0, 0
@@ -63,23 +63,23 @@ sub_807DB58: @ 807DB58
beq _0807DB94
b _0807DBA4
_0807DB82:
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0
bl fade_screen
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
b _0807DBA4
_0807DB94:
- bl sub_807DB14
+ bl palette_bg_faded_fill_white
movs r0, 0x2
movs r1, 0
bl fade_screen
- bl sub_807DB14
+ bl palette_bg_faded_fill_white
_0807DBA4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_807DB58
+ thumb_func_end pal_fill_for_maplights
thumb_func_start sub_807DBAC
sub_807DBAC: @ 807DBAC
@@ -102,18 +102,18 @@ sub_807DBAC: @ 807DBAC
beq _0807DBE8
b _0807DBF8
_0807DBD6:
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0x3
bl fade_screen
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
b _0807DBF8
_0807DBE8:
- bl sub_807DB14
+ bl palette_bg_faded_fill_white
movs r0, 0x2
movs r1, 0x3
bl fade_screen
- bl sub_807DB14
+ bl palette_bg_faded_fill_white
_0807DBF8:
pop {r4}
pop {r0}
@@ -123,11 +123,11 @@ _0807DBF8:
thumb_func_start sub_807DC00
sub_807DC00: @ 807DC00
push {lr}
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
movs r0, 0
movs r1, 0
bl fade_screen
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
pop {r0}
bx r0
thumb_func_end sub_807DC00
@@ -343,7 +343,7 @@ _0807DD9A:
ldrb r0, [r1, 0x4]
cmp r0, 0x1
beq _0807DDCA
- bl sub_807DB58
+ bl pal_fill_for_maplights
_0807DDB0:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -367,7 +367,7 @@ sub_807DDD0: @ 807DDD0
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
ldr r0, _0807DDEC @ =task_mpl_807DD60
movs r1, 0xA
bl CreateTask
@@ -410,7 +410,7 @@ _0807DE24:
lsls r0, 24
cmp r0, 0
beq _0807DE50
- bl sub_807DB58
+ bl pal_fill_for_maplights
_0807DE32:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -435,7 +435,7 @@ sub_807DE58: @ 807DE58
push {lr}
bl ScriptContext2_Enable
bl sub_8055DC4
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
ldr r0, _0807DE74 @ =sub_807DDF0
movs r1, 0xA
bl CreateTask
@@ -491,10 +491,10 @@ sub_807DE78: @ 807DE78
.align 2, 0
_0807DED8: .4byte sub_807DFBC
_0807DEDC:
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
b _0807DF2E
_0807DEE2:
- bl sub_807DB14
+ bl palette_bg_faded_fill_white
b _0807DF2E
_0807DEE8:
adds r0, r5, 0
@@ -551,7 +551,7 @@ sub_807DF4C: @ 807DF4C
lsls r0, 24
cmp r0, 0
bne _0807DF5A
- bl sub_807DB58
+ bl pal_fill_for_maplights
b _0807DF5E
_0807DF5A:
bl sub_807DC00
@@ -588,7 +588,7 @@ sub_807DF7C: @ 807DF7C
sub_807DF94: @ 807DF94
push {lr}
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl sub_8111CF0
movs r0, 0x28
bl sub_80722CC
@@ -1090,8 +1090,8 @@ sub_807E3BC: @ 807E3BC
bx r1
thumb_func_end sub_807E3BC
- thumb_func_start sub_807E3C8
-sub_807E3C8: @ 807E3C8
+ thumb_func_start task_mpl_807E3C8
+task_mpl_807E3C8: @ 807E3C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1106,7 +1106,7 @@ _0807E3E4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_807E3C8
+ thumb_func_end task_mpl_807E3C8
thumb_func_start sub_807E3EC
sub_807E3EC: @ 807E3EC
@@ -1114,13 +1114,13 @@ sub_807E3EC: @ 807E3EC
bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DC00
- ldr r0, _0807E408 @ =sub_807E3C8
+ ldr r0, _0807E408 @ =task_mpl_807E3C8
movs r1, 0xA
bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807E408: .4byte sub_807E3C8
+_0807E408: .4byte task_mpl_807E3C8
thumb_func_end sub_807E3EC
thumb_func_start sub_807E40C
@@ -2189,7 +2189,7 @@ sub_807EC34: @ 807EC34
_0807EC6C: .4byte gUnknown_3005098
_0807EC70:
bl sub_8055DC4
- bl sub_807DB58
+ bl pal_fill_for_maplights
bl ScriptContext2_Enable
adds r0, r5, 0x2
adds r1, r5, 0x4
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 7009f5b1a..148f9e948 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -757,7 +757,7 @@ sub_805E384: @ 805E384
cmp r0, 0xE
bhi _0805E39A
ldrh r0, [r1, 0x14]
- bl sub_806E680
+ bl FlagSet
_0805E39A:
pop {r0}
bx r0
@@ -806,7 +806,7 @@ _0805E3D8:
cmp r0, r8
bne _0805E3FA
ldrh r0, [r4, 0x14]
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805E3BC
@@ -952,7 +952,7 @@ RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
bl GetFieldObjectFlagIdByFieldObjectId
lsls r0, 16
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1271,7 +1271,7 @@ SpawnFieldObject: @ 805E72C
add r2, sp, 0x20
mov r0, r9
add r1, sp, 0x8
- bl sub_805E960
+ bl MakeObjectTemplateFromFieldObjectTemplate
ldrh r3, [r7, 0x6]
ldr r2, _0805E7A4 @ =0xffff0000
add r1, sp, 0x24
@@ -1517,8 +1517,8 @@ _0805E936:
bx r0
thumb_func_end sub_805E8E8
- thumb_func_start sub_805E940
-sub_805E940: @ 805E940
+ thumb_func_start MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
+MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex: @ 805E940
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -1533,10 +1533,10 @@ sub_805E940: @ 805E940
bx r0
.align 2, 0
_0805E95C: .4byte gUnknown_839FBC8
- thumb_func_end sub_805E940
+ thumb_func_end MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
- thumb_func_start sub_805E960
-sub_805E960: @ 805E960
+ thumb_func_start MakeObjectTemplateFromFieldObjectTemplate
+MakeObjectTemplateFromFieldObjectTemplate: @ 805E960
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1544,14 +1544,14 @@ sub_805E960: @ 805E960
ldrb r0, [r4, 0x1]
ldrb r1, [r4, 0x9]
adds r2, r5, 0
- bl sub_805E940
+ bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_805E960
+ thumb_func_end MakeObjectTemplateFromFieldObjectTemplate
- thumb_func_start sub_805E978
-sub_805E978: @ 805E978
+ thumb_func_start AddPseudoFieldObject
+AddPseudoFieldObject: @ 805E978
push {r4-r6,lr}
sub sp, 0x1C
ldr r4, [sp, 0x2C]
@@ -1612,7 +1612,7 @@ _0805E9E4:
.align 2, 0
_0805E9F0: .4byte 0x0000ffff
_0805E9F4: .4byte gUnknown_202063C
- thumb_func_end sub_805E978
+ thumb_func_end AddPseudoFieldObject
thumb_func_start sub_805E9F8
sub_805E9F8: @ 805E9F8
@@ -1968,7 +1968,7 @@ _0805EC86:
cmp r0, r1
blt _0805ECEC
ldrh r0, [r4, 0x14]
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0805ECEC
@@ -2005,8 +2005,8 @@ _0805ED08: .4byte gUnknown_2036DFC
_0805ED0C: .4byte gUnknown_3005008
thumb_func_end sub_805EC30
- thumb_func_start sub_805ED10
-sub_805ED10: @ 805ED10
+ thumb_func_start RemoveFieldObjectsOutsideView
+RemoveFieldObjectsOutsideView: @ 805ED10
push {r4-r6,lr}
movs r3, 0
ldr r6, _0805ED64 @ =gUnknown_2031DEC
@@ -2043,7 +2043,7 @@ _0805ED2E:
cmp r0, 0x1
bne _0805ED56
adds r0, r2, 0
- bl sub_805ED70
+ bl RemoveFieldObjectIfOutsideView
_0805ED56:
lsls r0, r5, 24
lsrs r3, r0, 24
@@ -2056,10 +2056,10 @@ _0805ED56:
_0805ED64: .4byte gUnknown_2031DEC
_0805ED68: .4byte gUnknown_2036E38
_0805ED6C: .4byte 0x00010001
- thumb_func_end sub_805ED10
+ thumb_func_end RemoveFieldObjectsOutsideView
- thumb_func_start sub_805ED70
-sub_805ED70: @ 805ED70
+ thumb_func_start RemoveFieldObjectIfOutsideView
+RemoveFieldObjectIfOutsideView: @ 805ED70
push {r4-r7,lr}
adds r3, r0, 0
ldr r0, _0805EDEC @ =gUnknown_3005008
@@ -2125,7 +2125,7 @@ _0805EDE4:
bx r0
.align 2, 0
_0805EDEC: .4byte gUnknown_3005008
- thumb_func_end sub_805ED70
+ thumb_func_end RemoveFieldObjectIfOutsideView
thumb_func_start sub_805EDF0
sub_805EDF0: @ 805EDF0
@@ -2225,7 +2225,7 @@ _0805EE70:
ldrb r1, [r6, 0x6]
add r3, sp, 0x20
mov r2, sp
- bl sub_805E940
+ bl MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex
str r4, [sp, 0xC]
mov r0, sp
ldr r2, _0805EFEC @ =0x0000ffff
@@ -2767,7 +2767,7 @@ sub_805F2C8: @ 805F2C8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
- bl sub_806E5A4
+ bl VarGetFieldObjectGraphicsId
adds r1, r0, 0
_0805F2E0:
cmp r1, 0x97
@@ -2794,7 +2794,7 @@ FieldObjectHandleDynamicGraphicsId: @ 805F2F8
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
- bl sub_806E5A4
+ bl VarGetFieldObjectGraphicsId
strb r0, [r4, 0x5]
_0805F30E:
pop {r4}
@@ -3669,7 +3669,7 @@ UpdateFieldObjectsForCameraUpdate: @ 805F924
adds r0, r4, 0
adds r1, r5, 0
bl sub_805EC30
- bl sub_805ED10
+ bl RemoveFieldObjectsOutsideView
pop {r4,r5}
pop {r0}
bx r0
@@ -13278,8 +13278,8 @@ _08063D96:
bx r1
thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
- thumb_func_start sub_8063DA0
-sub_8063DA0: @ 8063DA0
+ thumb_func_start FieldObjectGetSpecialAnim
+FieldObjectGetSpecialAnim: @ 8063DA0
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13293,7 +13293,7 @@ _08063DB0:
_08063DB2:
pop {r1}
bx r1
- thumb_func_end sub_8063DA0
+ thumb_func_end FieldObjectGetSpecialAnim
thumb_func_start FieldObjectStep
FieldObjectStep: @ 8063DB8
@@ -13335,7 +13335,7 @@ _08063DF8:
bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80679AC
+ bl npc_obj_transfer_image_anim_pause_flag
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679F8
@@ -13404,7 +13404,7 @@ _08063E88:
bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80679AC
+ bl npc_obj_transfer_image_anim_pause_flag
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679F8
@@ -14609,8 +14609,8 @@ sub_8064678: @ 8064678
bx r0
thumb_func_end sub_8064678
- thumb_func_start sub_80646FC
-sub_80646FC: @ 80646FC
+ thumb_func_start do_go_anim
+do_go_anim: @ 80646FC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -14654,10 +14654,10 @@ sub_80646FC: @ 80646FC
bx r0
.align 2, 0
_08064754: .4byte gUnknown_83A6884
- thumb_func_end sub_80646FC
+ thumb_func_end do_go_anim
- thumb_func_start sub_8064758
-sub_8064758: @ 8064758
+ thumb_func_start do_run_anim
+do_run_anim: @ 8064758
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -14678,10 +14678,10 @@ sub_8064758: @ 8064758
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8064758
+ thumb_func_end do_run_anim
- thumb_func_start sub_8064788
-sub_8064788: @ 8064788
+ thumb_func_start npc_obj_ministep_stop_on_arrival
+npc_obj_ministep_stop_on_arrival: @ 8064788
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -14710,7 +14710,7 @@ _080647BA:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8064788
+ thumb_func_end npc_obj_ministep_stop_on_arrival
thumb_func_start sub_80647C0
sub_80647C0: @ 80647C0
@@ -15496,7 +15496,7 @@ sub_8064D3C: @ 8064D3C
adds r5, r1, 0
movs r2, 0x1
movs r3, 0
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064D5C
@@ -15511,7 +15511,7 @@ sub_8064D3C: @ 8064D3C
sub_8064D5C: @ 8064D5C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064D6E
@@ -15534,7 +15534,7 @@ sub_8064D7C: @ 8064D7C
adds r5, r1, 0
movs r2, 0x2
movs r3, 0
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064D9C
@@ -15549,7 +15549,7 @@ sub_8064D7C: @ 8064D7C
sub_8064D9C: @ 8064D9C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064DAE
@@ -15572,7 +15572,7 @@ sub_8064DBC: @ 8064DBC
adds r5, r1, 0
movs r2, 0x3
movs r3, 0
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064DDC
@@ -15587,7 +15587,7 @@ sub_8064DBC: @ 8064DBC
sub_8064DDC: @ 8064DDC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064DEE
@@ -15610,7 +15610,7 @@ sub_8064DFC: @ 8064DFC
adds r5, r1, 0
movs r2, 0x4
movs r3, 0
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8064E1C
@@ -15625,7 +15625,7 @@ sub_8064DFC: @ 8064DFC
sub_8064E1C: @ 8064E1C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08064E2E
@@ -16287,7 +16287,7 @@ sub_80652CC: @ 80652CC
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x1
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_80652EC
@@ -16302,7 +16302,7 @@ sub_80652CC: @ 80652CC
sub_80652EC: @ 80652EC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080652FE
@@ -16325,7 +16325,7 @@ sub_806530C: @ 806530C
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x1
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_806532C
@@ -16340,7 +16340,7 @@ sub_806530C: @ 806530C
sub_806532C: @ 806532C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806533E
@@ -16363,7 +16363,7 @@ sub_806534C: @ 806534C
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x1
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_806536C
@@ -16378,7 +16378,7 @@ sub_806534C: @ 806534C
sub_806536C: @ 806536C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806537E
@@ -16401,7 +16401,7 @@ sub_806538C: @ 806538C
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x1
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653AC
@@ -16416,7 +16416,7 @@ sub_806538C: @ 806538C
sub_80653AC: @ 80653AC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080653BE
@@ -17386,7 +17386,7 @@ sub_8065AF0: @ 8065AF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x2
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B10
@@ -17401,7 +17401,7 @@ sub_8065AF0: @ 8065AF0
sub_8065B10: @ 8065B10
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065B22
@@ -17424,7 +17424,7 @@ sub_8065B30: @ 8065B30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x2
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B50
@@ -17439,7 +17439,7 @@ sub_8065B30: @ 8065B30
sub_8065B50: @ 8065B50
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065B62
@@ -17462,7 +17462,7 @@ sub_8065B70: @ 8065B70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x2
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065B90
@@ -17477,7 +17477,7 @@ sub_8065B70: @ 8065B70
sub_8065B90: @ 8065B90
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065BA2
@@ -17500,7 +17500,7 @@ sub_8065BB0: @ 8065BB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x2
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065BD0
@@ -17515,7 +17515,7 @@ sub_8065BB0: @ 8065BB0
sub_8065BD0: @ 8065BD0
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065BE2
@@ -17538,7 +17538,7 @@ sub_8065BF0: @ 8065BF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x3
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C10
@@ -17553,7 +17553,7 @@ sub_8065BF0: @ 8065BF0
sub_8065C10: @ 8065C10
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065C22
@@ -17576,7 +17576,7 @@ sub_8065C30: @ 8065C30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x3
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C50
@@ -17591,7 +17591,7 @@ sub_8065C30: @ 8065C30
sub_8065C50: @ 8065C50
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065C62
@@ -17614,7 +17614,7 @@ sub_8065C70: @ 8065C70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x3
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065C90
@@ -17629,7 +17629,7 @@ sub_8065C70: @ 8065C70
sub_8065C90: @ 8065C90
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065CA2
@@ -17652,7 +17652,7 @@ sub_8065CB0: @ 8065CB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x3
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065CD0
@@ -17667,7 +17667,7 @@ sub_8065CB0: @ 8065CB0
sub_8065CD0: @ 8065CD0
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065CE2
@@ -17690,7 +17690,7 @@ sub_8065CF0: @ 8065CF0
adds r5, r1, 0
movs r2, 0x1
movs r3, 0x4
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D10
@@ -17705,7 +17705,7 @@ sub_8065CF0: @ 8065CF0
sub_8065D10: @ 8065D10
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065D22
@@ -17728,7 +17728,7 @@ sub_8065D30: @ 8065D30
adds r5, r1, 0
movs r2, 0x2
movs r3, 0x4
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D50
@@ -17743,7 +17743,7 @@ sub_8065D30: @ 8065D30
sub_8065D50: @ 8065D50
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065D62
@@ -17766,7 +17766,7 @@ sub_8065D70: @ 8065D70
adds r5, r1, 0
movs r2, 0x3
movs r3, 0x4
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065D90
@@ -17781,7 +17781,7 @@ sub_8065D70: @ 8065D70
sub_8065D90: @ 8065D90
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065DA2
@@ -17804,7 +17804,7 @@ sub_8065DB0: @ 8065DB0
adds r5, r1, 0
movs r2, 0x4
movs r3, 0x4
- bl sub_80646FC
+ bl do_go_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065DD0
@@ -17819,7 +17819,7 @@ sub_8065DB0: @ 8065DB0
sub_8065DD0: @ 8065DD0
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065DE2
@@ -17841,7 +17841,7 @@ sub_8065DF0: @ 8065DF0
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x1
- bl sub_8064758
+ bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E10
@@ -17856,7 +17856,7 @@ sub_8065DF0: @ 8065DF0
sub_8065E10: @ 8065E10
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065E22
@@ -17878,7 +17878,7 @@ sub_8065E30: @ 8065E30
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x2
- bl sub_8064758
+ bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E50
@@ -17893,7 +17893,7 @@ sub_8065E30: @ 8065E30
sub_8065E50: @ 8065E50
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065E62
@@ -17915,7 +17915,7 @@ sub_8065E70: @ 8065E70
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x3
- bl sub_8064758
+ bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065E90
@@ -17930,7 +17930,7 @@ sub_8065E70: @ 8065E70
sub_8065E90: @ 8065E90
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065EA2
@@ -17952,7 +17952,7 @@ sub_8065EB0: @ 8065EB0
adds r4, r0, 0
adds r5, r1, 0
movs r2, 0x4
- bl sub_8064758
+ bl do_run_anim
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065ED0
@@ -17967,7 +17967,7 @@ sub_8065EB0: @ 8065EB0
sub_8065ED0: @ 8065ED0
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08065EE2
@@ -21029,7 +21029,7 @@ sub_806741C: @ 806741C
sub_806743C: @ 806743C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806744E
@@ -21067,7 +21067,7 @@ sub_806745C: @ 806745C
sub_806747C: @ 806747C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806748E
@@ -21105,7 +21105,7 @@ sub_806749C: @ 806749C
sub_80674BC: @ 80674BC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080674CE
@@ -21143,7 +21143,7 @@ sub_80674DC: @ 80674DC
sub_80674FC: @ 80674FC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806750E
@@ -21206,7 +21206,7 @@ sub_806754C: @ 806754C
sub_806756C: @ 806756C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806757E
@@ -21244,7 +21244,7 @@ sub_806758C: @ 806758C
sub_80675AC: @ 80675AC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080675BE
@@ -21282,7 +21282,7 @@ sub_80675CC: @ 80675CC
sub_80675EC: @ 80675EC
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080675FE
@@ -21320,7 +21320,7 @@ sub_806760C: @ 806760C
sub_806762C: @ 806762C
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _0806763E
@@ -21386,7 +21386,7 @@ sub_8067684: @ 8067684
sub_80676A4: @ 80676A4
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080676B6
@@ -21424,7 +21424,7 @@ sub_80676C4: @ 80676C4
sub_80676E4: @ 80676E4
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _080676F6
@@ -21462,7 +21462,7 @@ sub_8067704: @ 8067704
sub_8067724: @ 8067724
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08067736
@@ -21500,7 +21500,7 @@ sub_8067744: @ 8067744
sub_8067764: @ 8067764
push {r4,lr}
adds r4, r1, 0
- bl sub_8064788
+ bl npc_obj_ministep_stop_on_arrival
lsls r0, 24
cmp r0, 0
bne _08067776
@@ -21842,8 +21842,8 @@ sub_80679A8: @ 80679A8
bx lr
thumb_func_end sub_80679A8
- thumb_func_start sub_80679AC
-sub_80679AC: @ 80679AC
+ thumb_func_start npc_obj_transfer_image_anim_pause_flag
+npc_obj_transfer_image_anim_pause_flag: @ 80679AC
push {lr}
ldrb r0, [r0, 0x1]
lsls r0, 29
@@ -21858,7 +21858,7 @@ sub_80679AC: @ 80679AC
_080679C2:
pop {r0}
bx r0
- thumb_func_end sub_80679AC
+ thumb_func_end npc_obj_transfer_image_anim_pause_flag
thumb_func_start sub_80679C8
sub_80679C8: @ 80679C8
diff --git a/asm/field_message_box.s b/asm/field_message_box.s
index 8cb967b3f..25fb681a4 100644
--- a/asm/field_message_box.s
+++ b/asm/field_message_box.s
@@ -108,8 +108,8 @@ _08069402:
_08069408: .4byte gUnknown_203709C
thumb_func_end sub_8069370
- thumb_func_start sub_806940C
-sub_806940C: @ 806940C
+ thumb_func_start task_add_textbox
+task_add_textbox: @ 806940C
push {lr}
ldr r0, _0806941C @ =sub_8069370
movs r1, 0x50
@@ -118,10 +118,10 @@ sub_806940C: @ 806940C
bx r0
.align 2, 0
_0806941C: .4byte sub_8069370
- thumb_func_end sub_806940C
+ thumb_func_end task_add_textbox
- thumb_func_start sub_8069420
-sub_8069420: @ 8069420
+ thumb_func_start task_del_textbox
+task_del_textbox: @ 8069420
push {lr}
ldr r0, _08069438 @ =sub_8069370
bl FindTaskIdByFunc
@@ -135,10 +135,10 @@ _08069434:
bx r0
.align 2, 0
_08069438: .4byte sub_8069370
- thumb_func_end sub_8069420
+ thumb_func_end task_del_textbox
- thumb_func_start sub_806943C
-sub_806943C: @ 806943C
+ thumb_func_start ShowFieldMessage
+ShowFieldMessage: @ 806943C
push {r4,lr}
adds r1, r0, 0
ldr r4, _08069458 @ =gUnknown_203709C
@@ -159,7 +159,7 @@ _0806945E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806943C
+ thumb_func_end ShowFieldMessage
thumb_func_start ShowFieldAutoScrollMessage
ShowFieldAutoScrollMessage: @ 8069464
@@ -227,7 +227,7 @@ textbox_fdecode_auto_and_task_add: @ 80694C8
bl sub_8008FCC
movs r0, 0x1
bl sub_80F6D5C
- bl sub_806940C
+ bl task_add_textbox
pop {r0}
bx r0
.align 2, 0
@@ -239,7 +239,7 @@ textbox_auto_and_task_add: @ 80694E4
push {lr}
movs r0, 0x1
bl sub_80F6D5C
- bl sub_806940C
+ bl task_add_textbox
pop {r0}
bx r0
thumb_func_end textbox_auto_and_task_add
@@ -247,7 +247,7 @@ textbox_auto_and_task_add: @ 80694E4
thumb_func_start HideFieldMessageBox
HideFieldMessageBox: @ 80694F4
push {lr}
- bl sub_8069420
+ bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
@@ -290,7 +290,7 @@ _08069532:
thumb_func_start sub_8069538
sub_8069538: @ 8069538
push {lr}
- bl sub_8069420
+ bl task_del_textbox
movs r0, 0
movs r1, 0x1
bl sub_80F6F1C
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index d48939a5a..7752b92a9 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -66,7 +66,7 @@ sub_805B3E0: @ 805B3E0
cmp r0, 0
bne _0805B448
adds r0, r5, 0
- bl sub_805B4B0
+ bl npc_clear_strange_bits
bl sub_805BE08
bl sub_805B5A0
lsls r0, 24
@@ -75,8 +75,8 @@ sub_805B3E0: @ 805B3E0
adds r0, r6, 0
mov r1, r8
adds r2, r7, 0
- bl sub_805B4D4
- bl sub_805B50C
+ bl MovePlayerAvatarUsingKeypadInput
+ bl PlayerAllowForcedMovementIfMovingSameDirection
_0805B448:
pop {r3}
mov r8, r3
@@ -104,7 +104,7 @@ sub_805B45C: @ 805B45C
cmp r0, 0
bne _0805B4A6
adds r0, r4, 0
- bl sub_8063DA0
+ bl FieldObjectGetSpecialAnim
lsls r0, 24
movs r1, 0xDF
lsls r1, 24
@@ -132,8 +132,8 @@ _0805B4A8:
bx r1
thumb_func_end sub_805B45C
- thumb_func_start sub_805B4B0
-sub_805B4B0: @ 805B4B0
+ thumb_func_start npc_clear_strange_bits
+npc_clear_strange_bits: @ 805B4B0
ldrb r2, [r0, 0x1]
movs r1, 0x11
negs r1, r1
@@ -152,10 +152,10 @@ sub_805B4B0: @ 805B4B0
bx lr
.align 2, 0
_0805B4D0: .4byte gUnknown_2037078
- thumb_func_end sub_805B4B0
+ thumb_func_end npc_clear_strange_bits
- thumb_func_start sub_805B4D4
-sub_805B4D4: @ 805B4D4
+ thumb_func_start MovePlayerAvatarUsingKeypadInput
+MovePlayerAvatarUsingKeypadInput: @ 805B4D4
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -178,15 +178,15 @@ _0805B4F8: .4byte gUnknown_2037078
_0805B4FC:
adds r0, r3, 0
adds r1, r2, 0
- bl sub_805B93C
+ bl MovePlayerNotOnBike
_0805B504:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805B4D4
+ thumb_func_end MovePlayerAvatarUsingKeypadInput
- thumb_func_start sub_805B50C
-sub_805B50C: @ 805B50C
+ thumb_func_start PlayerAllowForcedMovementIfMovingSameDirection
+PlayerAllowForcedMovementIfMovingSameDirection: @ 805B50C
push {lr}
ldr r2, _0805B524 @ =gUnknown_2037078
ldrb r0, [r2, 0x2]
@@ -201,7 +201,7 @@ _0805B51E:
bx r0
.align 2, 0
_0805B524: .4byte gUnknown_2037078
- thumb_func_end sub_805B50C
+ thumb_func_end PlayerAllowForcedMovementIfMovingSameDirection
thumb_func_start sub_805B528
sub_805B528: @ 805B528
@@ -776,8 +776,8 @@ sub_805B930: @ 805B930
bx r1
thumb_func_end sub_805B930
- thumb_func_start sub_805B93C
-sub_805B93C: @ 805B93C
+ thumb_func_start MovePlayerNotOnBike
+MovePlayerNotOnBike: @ 805B93C
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -787,7 +787,7 @@ sub_805B93C: @ 805B93C
lsrs r5, 16
ldr r6, _0805B968 @ =gUnknown_835B814
adds r0, r4, 0
- bl sub_805B96C
+ bl CheckMovementInputNotOnBike
lsls r0, 24
lsrs r0, 22
adds r0, r6
@@ -800,10 +800,10 @@ sub_805B93C: @ 805B93C
bx r0
.align 2, 0
_0805B968: .4byte gUnknown_835B814
- thumb_func_end sub_805B93C
+ thumb_func_end MovePlayerNotOnBike
- thumb_func_start sub_805B96C
-sub_805B96C: @ 805B96C
+ thumb_func_start CheckMovementInputNotOnBike
+CheckMovementInputNotOnBike: @ 805B96C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -840,10 +840,10 @@ _0805B9A6:
bx r1
.align 2, 0
_0805B9AC: .4byte gUnknown_2037078
- thumb_func_end sub_805B96C
+ thumb_func_end CheckMovementInputNotOnBike
- thumb_func_start sub_805B9B0
-sub_805B9B0: @ 805B9B0
+ thumb_func_start PlayerNotOnBikeNotMoving
+PlayerNotOnBikeNotMoving: @ 805B9B0
push {lr}
bl player_get_direction_lower_nybble
lsls r0, 24
@@ -851,7 +851,7 @@ sub_805B9B0: @ 805B9B0
bl sub_805C1F4
pop {r0}
bx r0
- thumb_func_end sub_805B9B0
+ thumb_func_end PlayerNotOnBikeNotMoving
thumb_func_start sub_805B9C4
sub_805B9C4: @ 805B9C4
@@ -915,7 +915,7 @@ _0805BA30:
cmp r5, 0
beq _0805BA8C
ldr r0, _0805BA6C @ =0x0000082f
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805BA8C
@@ -1277,7 +1277,7 @@ sub_805BCEC: @ 805BCEC
lsls r2, 24
lsrs r7, r2, 24
ldr r0, _0805BD98 @ =0x00000805
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0805BDA0
@@ -1342,7 +1342,7 @@ sub_805BCEC: @ 805BCEC
_0805BD8A:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_805CCD0
+ bl task_add_bump_boulder
movs r0, 0x1
b _0805BDA2
.align 2, 0
@@ -2707,7 +2707,7 @@ sub_805C780: @ 805C780
ldr r0, _0805C7C4 @ =gUnknown_2036E38
adds r4, r0
adds r0, r4, 0
- bl sub_805B4B0
+ bl npc_clear_strange_bits
ldrb r1, [r4, 0x18]
lsls r1, 28
lsrs r1, 28
@@ -2805,8 +2805,8 @@ _0805C838:
bx r1
thumb_func_end sub_805C824
- thumb_func_start sub_805C83C
-sub_805C83C: @ 805C83C
+ thumb_func_start PartyHasMonWithSurf
+PartyHasMonWithSurf: @ 805C83C
push {r4,r5,lr}
movs r0, 0x8
bl TestPlayerAvatarFlags
@@ -2849,10 +2849,10 @@ _0805C882:
bx r1
.align 2, 0
_0805C888: .4byte gUnknown_2024284
- thumb_func_end sub_805C83C
+ thumb_func_end PartyHasMonWithSurf
- thumb_func_start sub_805C88C
-sub_805C88C: @ 805C88C
+ thumb_func_start IsPlayerSurfingNorth
+IsPlayerSurfingNorth: @ 805C88C
push {lr}
bl player_get_direction_upper_nybble
lsls r0, 24
@@ -2871,10 +2871,10 @@ _0805C8AA:
_0805C8AC:
pop {r1}
bx r1
- thumb_func_end sub_805C88C
+ thumb_func_end IsPlayerSurfingNorth
- thumb_func_start sub_805C8B0
-sub_805C8B0: @ 805C8B0
+ thumb_func_start IsPlayerFacingSurfableFishableWater
+IsPlayerFacingSurfableFishableWater: @ 805C8B0
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _0805C924 @ =gUnknown_2037078
@@ -2938,7 +2938,7 @@ _0805C92E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805C8B0
+ thumb_func_end IsPlayerFacingSurfableFishableWater
thumb_func_start sub_805C938
sub_805C938: @ 805C938
@@ -3430,8 +3430,8 @@ _0805CCC2:
bx r0
thumb_func_end sub_805CC40
- thumb_func_start sub_805CCD0
-sub_805CCD0: @ 805CCD0
+ thumb_func_start task_add_bump_boulder
+task_add_bump_boulder: @ 805CCD0
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -3439,7 +3439,7 @@ sub_805CCD0: @ 805CCD0
lsrs r4, 24
lsls r5, 24
lsrs r5, 24
- ldr r6, _0805CD04 @ =sub_805CD0C
+ ldr r6, _0805CD04 @ =taskFF_bump_boulder
adds r0, r6, 0
movs r1, 0xFF
bl CreateTask
@@ -3457,12 +3457,12 @@ sub_805CCD0: @ 805CCD0
pop {r0}
bx r0
.align 2, 0
-_0805CD04: .4byte sub_805CD0C
+_0805CD04: .4byte taskFF_bump_boulder
_0805CD08: .4byte gUnknown_3005090
- thumb_func_end sub_805CCD0
+ thumb_func_end task_add_bump_boulder
- thumb_func_start sub_805CD0C
-sub_805CD0C: @ 805CD0C
+ thumb_func_start taskFF_bump_boulder
+taskFF_bump_boulder: @ 805CD0C
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -3504,7 +3504,7 @@ _0805CD54: .4byte gUnknown_835B8A0
_0805CD58: .4byte gUnknown_3005090
_0805CD5C: .4byte gUnknown_2036E38
_0805CD60: .4byte gUnknown_2037078
- thumb_func_end sub_805CD0C
+ thumb_func_end taskFF_bump_boulder
thumb_func_start sub_805CD64
sub_805CD64: @ 805CD64
@@ -3624,7 +3624,7 @@ sub_805CE20: @ 805CE20
movs r0, 0
strb r0, [r1, 0x6]
bl ScriptContext2_Disable
- ldr r0, _0805CE7C @ =sub_805CD0C
+ ldr r0, _0805CE7C @ =taskFF_bump_boulder
bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
@@ -3636,7 +3636,7 @@ _0805CE70:
bx r1
.align 2, 0
_0805CE78: .4byte gUnknown_2037078
-_0805CE7C: .4byte sub_805CD0C
+_0805CE7C: .4byte taskFF_bump_boulder
thumb_func_end sub_805CE20
thumb_func_start sub_805CE80
@@ -4452,7 +4452,7 @@ _0805D4D4:
str r5, [sp, 0x8]
movs r0, 0
movs r1, 0x2
- bl sub_8002C48
+ bl PrintTextOnWindow
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -4676,7 +4676,7 @@ sub_805D66C: @ 805D66C
movs r0, 0
movs r1, 0x2
movs r3, 0x1
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -4851,7 +4851,7 @@ sub_805D7C0: @ 805D7C0
movs r0, 0
movs r1, 0x2
movs r3, 0x1
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0xD
strh r0, [r6, 0x8]
movs r0, 0x1
@@ -4904,7 +4904,7 @@ sub_805D838: @ 805D838
movs r0, 0
movs r1, 0x2
movs r3, 0x1
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
diff --git a/asm/field_poison.s b/asm/field_poison.s
index 380103d68..dc5f74ec4 100644
--- a/asm/field_poison.s
+++ b/asm/field_poison.s
@@ -206,7 +206,7 @@ _080A05D0:
ldrb r0, [r4, 0x2]
bl sub_80A04B8
ldr r0, _080A05E4 @ =gUnknown_81A5476
- bl sub_806943C
+ bl ShowFieldMessage
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -291,7 +291,7 @@ _080A0668:
cmp r7, 0
beq _080A067C
_080A0678:
- bl sub_80A0E48
+ bl overworld_poison_effect
_080A067C:
cmp r6, 0
beq _080A0688
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s
index e05873c89..fcad6d755 100644
--- a/asm/field_screen_effect.s
+++ b/asm/field_screen_effect.s
@@ -306,7 +306,7 @@ sub_807F028: @ 807F028
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
- bl sub_8055D30
+ bl sav1_get_flash_used_on_map
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -877,9 +877,9 @@ _0807F4A8:
bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
- bl sub_80BFCB0
+ bl GetHealLocationPointer
adds r3, r0, 0
ldr r0, _0807F520 @ =gUnknown_3005008
ldr r2, [r0]
@@ -970,10 +970,10 @@ _0807F588:
bl ClearWindowTilemap
adds r0, r5, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r5, 0
- bl sub_8003E3C
- bl sub_807DB38
+ bl RemoveWindow
+ bl palette_bg_faded_fill_black
bl sub_807DC00
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -1010,7 +1010,7 @@ _0807F5EC: .4byte gUnknown_81A8DD8
sub_807F5F0: @ 807F5F0
push {lr}
bl ScriptContext2_Enable
- bl sub_807DB38
+ bl palette_bg_faded_fill_black
ldr r0, _0807F618 @ =sub_807F45C
movs r1, 0xA
bl CreateTask
diff --git a/asm/field_specials.s b/asm/field_specials.s
index 39be354b1..9f895a5ba 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -77,7 +77,7 @@ _080CA688:
sub_80CA68C: @ 80CA68C
push {lr}
ldr r0, _080CA698 @ =gUnknown_2021D18
- bl sub_806943C
+ bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
@@ -190,7 +190,7 @@ sub_80CA758: @ 80CA758
push {lr}
ldr r0, _080CA768 @ =gUnknown_20370C0
ldrh r0, [r0]
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
@@ -700,7 +700,7 @@ sub_80CAB08: @ 80CAB08
movs r0, 0x2A
bl sub_8054E90
ldr r0, _080CAB3C @ =0x0000083b
- bl sub_806E680
+ bl FlagSet
movs r1, 0x1
mov r0, sp
strb r1, [r0]
@@ -753,7 +753,7 @@ _080CAB72:
sub_80CAB78: @ 80CAB78
push {r4-r6,lr}
ldr r0, _080CABB4 @ =0x00004031
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
@@ -1074,7 +1074,7 @@ sub_80CADC4: @ 80CADC4
movs r1, 0x2
add r2, sp, 0xC
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
bl sub_809D424
add sp, 0x10
pop {r0}
@@ -1384,12 +1384,12 @@ sub_80CB054: @ 80CB054
push {r4-r6,lr}
ldr r5, _080CB08C @ =0x00004035
adds r0, r5, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r4, r0, 16
ldr r6, _080CB090 @ =0x00004036
adds r0, r6, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
cmp r0, 0
beq _080CB0A0
@@ -1400,10 +1400,10 @@ sub_80CB054: @ 80CB054
bls _080CB098
ldr r1, _080CB094 @ =0x0000ffff
adds r0, r6, 0
- bl sub_806E584
+ bl VarSet
adds r0, r5, 0
movs r1, 0
- bl sub_806E584
+ bl VarSet
b _080CB0A0
.align 2, 0
_080CB08C: .4byte 0x00004035
@@ -1412,7 +1412,7 @@ _080CB094: .4byte 0x0000ffff
_080CB098:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
_080CB0A0:
pop {r4-r6}
pop {r0}
@@ -1424,7 +1424,7 @@ sub_80CB0A8: @ 80CB0A8
push {r4,lr}
ldr r4, _080CB10C @ =0x00004036
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -1438,21 +1438,21 @@ _080CB0C0:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r4, _080CB114 @ =0x0000403b
bl sub_80CB198
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _080CB118 @ =0x00004035
movs r1, 0
- bl sub_806E584
+ bl VarSet
_080CB0EA:
ldr r4, _080CB11C @ =gUnknown_2021CD0
ldr r0, _080CB10C @ =0x00004036
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
movs r1, 0xB
@@ -1735,7 +1735,7 @@ _080CB312:
_080CB314:
ldr r0, _080CB324 @ =0x0000403a
adds r1, r3, 0
- bl sub_806E584
+ bl VarSet
pop {r4}
pop {r0}
bx r0
@@ -2088,7 +2088,7 @@ sub_80CB580: @ 80CB580
str r6, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r1, _080CB634 @ =gUnknown_83F5B44
ldr r0, _080CB638 @ =gUnknown_20370C2
ldrh r0, [r0]
@@ -2112,12 +2112,12 @@ sub_80CB580: @ 80CB580
adds r0, r1, 0
movs r1, 0x2
adds r2, r5, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldrb r0, [r4]
bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080CB614:
add sp, 0xC
pop {r3}
@@ -2143,7 +2143,7 @@ sub_80CB63C: @ 80CB63C
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -2620,7 +2620,7 @@ _080CB9D2:
str r0, [sp, 0xC]
add r0, sp, 0x10
movs r1, 0
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -2656,7 +2656,7 @@ _080CB9D2:
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _080CBA74 @ =gUnknown_3005090
mov r2, r10
adds r0, r2, r7
@@ -2876,11 +2876,11 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -3108,7 +3108,7 @@ _080CBDAC: .4byte gUnknown_83F5D2C
sub_80CBDB0: @ 80CBDB0
push {lr}
ldr r0, _080CBDC8 @ =0x00004031
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80CBD94
@@ -3179,7 +3179,7 @@ _080CBE20:
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
- bl sub_806E5A4
+ bl VarGetFieldObjectGraphicsId
lsls r0, 24
lsrs r0, 24
_080CBE40:
@@ -3669,7 +3669,7 @@ sub_80CC204: @ 80CC204
push {r4,lr}
movs r4, 0
ldr r0, _080CC2A4 @ =0x0000089b
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3677,7 +3677,7 @@ sub_80CC204: @ 80CC204
movs r4, 0x1
_080CC218:
ldr r0, _080CC2A8 @ =0x0000089c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3686,7 +3686,7 @@ _080CC218:
orrs r4, r0
_080CC22A:
ldr r0, _080CC2AC @ =0x0000089d
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3697,7 +3697,7 @@ _080CC22A:
lsrs r4, r0, 24
_080CC240:
ldr r0, _080CC2B0 @ =0x0000089e
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3708,7 +3708,7 @@ _080CC240:
lsrs r4, r0, 24
_080CC256:
ldr r0, _080CC2B4 @ =0x0000089f
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3719,7 +3719,7 @@ _080CC256:
lsrs r4, r0, 24
_080CC26C:
ldr r0, _080CC2B8 @ =0x000008a1
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3731,7 +3731,7 @@ _080CC26C:
_080CC282:
movs r0, 0x8A
lsls r0, 4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3811,7 +3811,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x2]
@@ -3821,7 +3821,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x4]
@@ -3831,7 +3831,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x6]
@@ -3841,7 +3841,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0x8]
@@ -3851,7 +3851,7 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
adds r4, 0x1
mov r0, sp
ldrh r0, [r0, 0xA]
@@ -3861,11 +3861,11 @@ _080CC318:
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _080CC3C4 @ =0x00004042
ldr r1, _080CC3C8 @ =gUnknown_20370C0
ldrh r1, [r1]
- bl sub_806E584
+ bl VarSet
add sp, 0x24
pop {r4-r7}
pop {r0}
@@ -4099,7 +4099,7 @@ _080CC53C:
bne _080CC58C
ldr r5, _080CC584 @ =0x0000404d
adds r0, r5, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x23
@@ -4109,9 +4109,9 @@ _080CC53C:
_080CC56A:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _080CC588 @ =0x00000808
- bl sub_806E680
+ bl FlagSet
b _080CC596
.align 2, 0
_080CC57C: .4byte gUnknown_3005008
@@ -4135,7 +4135,7 @@ sub_80CC59C: @ 80CC59C
push {r4-r7,lr}
sub sp, 0x8
ldr r0, _080CC5F8 @ =0x0000404d
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r5, r0, 16
ldr r6, _080CC5FC @ =0xffffff00
@@ -4145,7 +4145,7 @@ sub_80CC59C: @ 80CC59C
ands r0, r4
str r0, [sp, 0x4]
ldr r0, _080CC604 @ =0x00000808
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080CC5C4
@@ -4237,7 +4237,7 @@ _080CC668:
_080CC66C:
bl sub_8113550
ldr r0, _080CC678 @ =0x00000808
- bl sub_806E6A8
+ bl FlagClear
b _080CC71E
.align 2, 0
_080CC678: .4byte 0x00000808
@@ -4310,14 +4310,14 @@ _080CC6FC:
bl sub_8113550
ldr r4, _080CC728 @ =0x00000808
adds r0, r4, 0
- bl sub_806E6A8
+ bl FlagClear
cmp r5, 0x23
bne _080CC71E
ldr r0, _080CC72C @ =0x0000404d
movs r1, 0x20
- bl sub_806E584
+ bl VarSet
adds r0, r4, 0
- bl sub_806E680
+ bl FlagSet
_080CC71E:
add sp, 0x8
pop {r4-r7}
@@ -4408,7 +4408,7 @@ sub_80CC7B4: @ 80CC7B4
push {r4,r5,lr}
ldr r5, _080CC7E8 @ =0x00000843
adds r0, r5, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080CC7F0
@@ -4417,13 +4417,13 @@ sub_80CC7B4: @ 80CC7B4
lsls r4, 24
lsrs r4, 24
ldr r0, _080CC7EC @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _080CC7F0
adds r0, r5, 0
- bl sub_806E680
+ bl FlagSet
movs r0, 0x1
b _080CC7F2
.align 2, 0
@@ -4441,7 +4441,7 @@ _080CC7F2:
sub_80CC7F8: @ 80CC7F8
push {r4-r7,lr}
ldr r0, _080CC850 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl sub_80CC79C
@@ -4468,11 +4468,11 @@ _080CC816:
cmp r0, r4
beq _080CC83E
ldr r0, _080CC854 @ =0x00000843
- bl sub_806E6A8
+ bl FlagClear
_080CC83E:
ldr r0, _080CC850 @ =0x00004037
lsrs r1, r7, 16
- bl sub_806E584
+ bl VarSet
bl sub_80CC7B4
lsls r0, 24
lsrs r0, 24
@@ -4589,7 +4589,7 @@ sub_80CC918: @ 80CC918
push {r4,lr}
ldr r4, _080CC940 @ =0x00004025
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _080CC944 @ =0x000001f3
@@ -4599,7 +4599,7 @@ sub_80CC918: @ 80CC918
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
_080CC938:
pop {r4}
pop {r0}
@@ -4622,7 +4622,7 @@ sub_80CC948: @ 80CC948
bl sub_80436F8
ldr r0, _080CC970 @ =0x00004025
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -4645,7 +4645,7 @@ sub_80CC974: @ 80CC974
ldr r6, _080CC9AC @ =gUnknown_3005098
adds r4, r5, r6
movs r0, 0x3
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4724,12 +4724,12 @@ sub_80CCA18: @ 80CCA18
cmp r0, 0
bne _080CCAE6
movs r0, 0x2
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080CCAE6
movs r0, 0x5
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4819,7 +4819,7 @@ sub_80CCAF4: @ 80CCAF4
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080CCB5A
@@ -4991,7 +4991,7 @@ _080CCC5C:
movs r0, 0xB8
lsls r0, 2
_080CCC6E:
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5069,7 +5069,7 @@ sub_80CCCF8: @ 80CCCF8
cmp r0, 0xF
bne _080CCD14
ldr r0, _080CCD10 @ =0x000002de
- bl sub_806E680
+ bl FlagSet
b _080CCD2C
.align 2, 0
_080CCD0C: .4byte gUnknown_20370C2
@@ -5078,17 +5078,17 @@ _080CCD14:
cmp r0, 0x10
bne _080CCD24
ldr r0, _080CCD20 @ =0x000002df
- bl sub_806E680
+ bl FlagSet
b _080CCD2C
.align 2, 0
_080CCD20: .4byte 0x000002df
_080CCD24:
movs r0, 0xB8
lsls r0, 2
- bl sub_806E680
+ bl FlagSet
_080CCD2C:
ldr r0, _080CCD74 @ =0x000002de
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5098,7 +5098,7 @@ _080CCD2C:
lsrs r4, r0, 24
_080CCD40:
ldr r0, _080CCD78 @ =0x000002df
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5109,7 +5109,7 @@ _080CCD40:
_080CCD54:
movs r0, 0xB8
lsls r0, 2
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5137,7 +5137,7 @@ _080CCD7E:
sub_80CCD84: @ 80CCD84
push {lr}
ldr r0, _080CCDB8 @ =0x000002e3
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5183,7 +5183,7 @@ sub_80CCDD0: @ 80CCDD0
movs r0, 0x14
bl sub_80722CC
ldr r0, _080CCDF8 @ =0x000002e3
- bl sub_806E680
+ bl FlagSet
bl ScriptContext2_Disable
pop {r0}
bx r0
@@ -5211,7 +5211,7 @@ sub_80CCE10: @ 80CCE10
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _080CCE30 @ =0x00000848
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5225,17 +5225,17 @@ _080CCE34: .4byte gUnknown_20370D0
_080CCE38:
ldr r0, _080CCE80 @ =0x0000403e
mov r8, r0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r5, r0, 16
ldr r4, _080CCE84 @ =0x00004026
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0
- bl sub_806E584
+ bl VarSet
cmp r5, 0
beq _080CCE90
ldr r0, _080CCE88 @ =gUnknown_83F637C
@@ -5248,7 +5248,7 @@ _080CCE38:
bl sub_80CCEE8
mov r0, r8
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r1, _080CCE8C @ =gUnknown_20370D0
movs r0, 0
strh r0, [r1]
@@ -5262,7 +5262,7 @@ _080CCE90:
cmp r5, 0xA
bne _080CCEB4
ldr r0, _080CCEAC @ =0x00000848
- bl sub_806E680
+ bl FlagSet
ldr r1, _080CCEB0 @ =gUnknown_20370D0
movs r0, 0x2
_080CCE9E:
@@ -5284,7 +5284,7 @@ _080CCEB4:
bl sub_80CCEE8
ldr r0, _080CCEE0 @ =0x0000403e
adds r1, r5, 0
- bl sub_806E584
+ bl VarSet
ldr r1, _080CCEE4 @ =gUnknown_20370D0
movs r0, 0x1
strh r0, [r1]
@@ -5409,7 +5409,7 @@ sub_80CCFBC: @ 80CCFBC
push {r4,lr}
ldr r4, _080CCFEC @ =0x00004026
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r2, r0, 16
ldr r0, _080CCFF0 @ =gUnknown_3005008
@@ -5425,7 +5425,7 @@ sub_80CCFBC: @ 80CCFBC
bls _080CCFF8
adds r0, r4, 0
movs r1, 0
- bl sub_806E584
+ bl VarSet
b _080CD000
.align 2, 0
_080CCFEC: .4byte 0x00004026
@@ -5434,7 +5434,7 @@ _080CCFF4: .4byte 0x00003802
_080CCFF8:
adds r0, r4, 0
adds r1, r2, 0
- bl sub_806E584
+ bl VarSet
_080CD000:
pop {r4}
pop {r0}
@@ -5445,7 +5445,7 @@ _080CD000:
sub_80CD008: @ 80CD008
push {lr}
ldr r0, _080CD02C @ =0x0000403e
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 19
ldr r1, _080CD030 @ =gUnknown_83F6206
@@ -5623,41 +5623,41 @@ sub_80CD154: @ 80CD154
cmp r4, 0x18
bls _080CD1AE
movs r0, 0xA5
- bl sub_806E6A8
+ bl FlagClear
cmp r4, 0x31
bls _080CD172
movs r0, 0xA6
- bl sub_806E6A8
+ bl FlagClear
_080CD172:
cmp r4, 0x4A
bls _080CD17C
movs r0, 0xA7
- bl sub_806E6A8
+ bl FlagClear
_080CD17C:
cmp r4, 0x63
bls _080CD186
movs r0, 0xA8
- bl sub_806E6A8
+ bl FlagClear
_080CD186:
cmp r4, 0x7C
bls _080CD190
movs r0, 0xA9
- bl sub_806E6A8
+ bl FlagClear
_080CD190:
cmp r4, 0x95
bls _080CD19A
movs r0, 0xAA
- bl sub_806E6A8
+ bl FlagClear
_080CD19A:
cmp r4, 0xAE
bls _080CD1A4
movs r0, 0xAB
- bl sub_806E6A8
+ bl FlagClear
_080CD1A4:
cmp r4, 0xC7
bls _080CD1AE
movs r0, 0xAC
- bl sub_806E6A8
+ bl FlagClear
_080CD1AE:
pop {r4}
pop {r0}
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 9473e8b96..b7e1713af 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -201,7 +201,7 @@ _0806E966:
cmp r0, r1
bne _0806E98C
adds r0, r3, 0x1
- bl sub_806E680
+ bl FlagSet
b _0806E996
.align 2, 0
_0806E988: .4byte gUnknown_83A7330
@@ -226,7 +226,7 @@ sub_806E99C: @ 806E99C
_0806E9A4:
adds r5, r4, 0x1
adds r0, r5, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -326,7 +326,7 @@ _0806EA52:
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
- bl sub_8059FF4
+ bl MetatileBehavior_IsThinIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -343,7 +343,7 @@ _0806EA52:
b _0806EAA2
_0806EA8E:
adds r0, r6, 0
- bl sub_805A008
+ bl MetatileBehavior_IsCrackedIce
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -425,7 +425,7 @@ _0806EB04:
bl CurrentMapDrawMetatileAt
ldr r0, _0806EB50 @ =0x00004001
movs r1, 0x1
- bl sub_806E584
+ bl VarSet
_0806EB3E:
movs r0, 0x1
strh r0, [r5, 0x2]
@@ -644,7 +644,7 @@ _0806ECCE:
beq _0806ECF8
ldr r0, _0806ED14 @ =0x00004030
movs r1, 0
- bl sub_806E584
+ bl VarSet
_0806ECF8:
movs r1, 0x8
ldrsh r0, [r5, r1]
@@ -684,9 +684,9 @@ _0806ED2E:
sub_806ED38: @ 806ED38
push {lr}
ldr r0, _0806ED4C @ =0x00000829
- bl sub_806E680
+ bl FlagSet
ldr r0, _0806ED50 @ =0x00000828
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/field_weather.s b/asm/field_weather.s
index 41cd0101d..aa46120e1 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -2768,8 +2768,8 @@ _0807B0FA:
bx r0
thumb_func_end sub_807B0C4
- thumb_func_start sub_807B100
-sub_807B100: @ 807B100
+ thumb_func_start SetSav1Weather
+SetSav1Weather: @ 807B100
push {r4,r5,lr}
ldr r4, _0807B12C @ =gUnknown_3005008
ldr r1, [r4]
@@ -2791,10 +2791,10 @@ sub_807B100: @ 807B100
bx r0
.align 2, 0
_0807B12C: .4byte gUnknown_3005008
- thumb_func_end sub_807B100
+ thumb_func_end SetSav1Weather
- thumb_func_start sub_807B130
-sub_807B130: @ 807B130
+ thumb_func_start sav1_get_weather_probably
+sav1_get_weather_probably: @ 807B130
ldr r0, _0807B13C @ =gUnknown_3005008
ldr r0, [r0]
adds r0, 0x2E
@@ -2802,7 +2802,7 @@ sub_807B130: @ 807B130
bx lr
.align 2, 0
_0807B13C: .4byte gUnknown_3005008
- thumb_func_end sub_807B130
+ thumb_func_end sav1_get_weather_probably
thumb_func_start sub_807B140
sub_807B140: @ 807B140
@@ -2833,8 +2833,8 @@ _0807B170: .4byte gUnknown_2036DFC
thumb_func_start sub_807B174
sub_807B174: @ 807B174
push {lr}
- bl sub_807B100
- bl sub_807B130
+ bl SetSav1Weather
+ bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl weather_set
@@ -2845,8 +2845,8 @@ sub_807B174: @ 807B174
thumb_func_start sub_807B18C
sub_807B18C: @ 807B18C
push {lr}
- bl sub_807B100
- bl sub_807B130
+ bl SetSav1Weather
+ bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl sub_8079D60
@@ -2857,7 +2857,7 @@ sub_807B18C: @ 807B18C
thumb_func_start sub_807B1A4
sub_807B1A4: @ 807B1A4
push {lr}
- bl sub_807B130
+ bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl weather_set
@@ -2868,7 +2868,7 @@ sub_807B1A4: @ 807B1A4
thumb_func_start sub_807B1B8
sub_807B1B8: @ 807B1B8
push {lr}
- bl sub_807B130
+ bl sav1_get_weather_probably
lsls r0, 24
lsrs r0, 24
bl sub_8079D60
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index 17ce9ad6d..99048cfe0 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -145,7 +145,7 @@ sub_8097984: @ 8097984
push {lr}
movs r0, 0x1
bl FieldEffectStart
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _0809799C @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -184,7 +184,7 @@ _080979CC: .4byte sub_8097A20
thumb_func_start sub_80979D0
sub_80979D0: @ 80979D0
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080979E8 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s
index 272f9c173..fc53891b5 100644
--- a/asm/fldeff_flash.s
+++ b/asm/fldeff_flash.s
@@ -13,7 +13,7 @@ sub_80C9B2C: @ 80C9B2C
cmp r0, 0x1
bne _080C9B6C
ldr r0, _080C9B58 @ =0x00000806
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C9B6C
@@ -46,7 +46,7 @@ sub_80C9B74: @ 80C9B74
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080C9BA4 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -75,7 +75,7 @@ sub_80C9BB0: @ 80C9BB0
movs r0, 0xC8
bl sub_80722CC
ldr r0, _080C9BC8 @ =0x00000806
- bl sub_806E680
+ bl FlagSet
ldr r0, _080C9BCC @ =gUnknown_81BFB5F
bl ScriptContext1_SetupScript
pop {r0}
@@ -865,7 +865,7 @@ _080CA208:
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _080CA294
_080CA224:
bl IsDma3ManagerBusyWithBgCopy
diff --git a/asm/fldeff_poison.s b/asm/fldeff_poison.s
index 84ebdd730..d911b2db3 100644
--- a/asm/fldeff_poison.s
+++ b/asm/fldeff_poison.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80A0DD8
-sub_80A0DD8: @ 80A0DD8
+ thumb_func_start task50_overworld_poison_effect
+task50_overworld_poison_effect: @ 80A0DD8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -66,33 +66,33 @@ _080A0E32:
_080A0E42:
pop {r0}
bx r0
- thumb_func_end sub_80A0DD8
+ thumb_func_end task50_overworld_poison_effect
- thumb_func_start sub_80A0E48
-sub_80A0E48: @ 80A0E48
+ thumb_func_start overworld_poison_effect
+overworld_poison_effect: @ 80A0E48
push {lr}
movs r0, 0x48
bl sub_80722CC
- ldr r0, _080A0E5C @ =sub_80A0DD8
+ ldr r0, _080A0E5C @ =task50_overworld_poison_effect
movs r1, 0x50
bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_080A0E5C: .4byte sub_80A0DD8
- thumb_func_end sub_80A0E48
+_080A0E5C: .4byte task50_overworld_poison_effect
+ thumb_func_end overworld_poison_effect
- thumb_func_start sub_80A0E60
-sub_80A0E60: @ 80A0E60
+ thumb_func_start c3_80A0DD8_is_running
+c3_80A0DD8_is_running: @ 80A0E60
push {lr}
- ldr r0, _080A0E70 @ =sub_80A0DD8
+ ldr r0, _080A0E70 @ =task50_overworld_poison_effect
bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
-_080A0E70: .4byte sub_80A0DD8
- thumb_func_end sub_80A0E60
+_080A0E70: .4byte task50_overworld_poison_effect
+ thumb_func_end c3_80A0DD8_is_running
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s
index e7e05b1b4..d5da57a20 100644
--- a/asm/fldeff_softboiled.s
+++ b/asm/fldeff_softboiled.s
@@ -8,7 +8,7 @@
thumb_func_start hm_prepare_dive_probably
hm_prepare_dive_probably: @ 80E5684
push {r4-r6,lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r6, 0x64
@@ -20,7 +20,7 @@ hm_prepare_dive_probably: @ 80E5684
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
muls r0, r6
@@ -60,7 +60,7 @@ sub_80E56DC: @ 80E56DC
strb r1, [r0, 0xB]
ldrb r1, [r0, 0x9]
strb r1, [r0, 0xA]
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s
index 65fbba6fb..3ca91f0a9 100644
--- a/asm/fldeff_strength.s
+++ b/asm/fldeff_strength.s
@@ -24,7 +24,7 @@ _080D0808:
b _080D0826
_080D080C:
ldr r4, _080D082C @ =gUnknown_20370D0
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -50,7 +50,7 @@ _080D083C: .4byte sub_80D0840
thumb_func_start sub_80D0840
sub_80D0840: @ 80D0840
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080D0858 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s
index e2de82844..2c12c2548 100644
--- a/asm/fldeff_sweetscent.s
+++ b/asm/fldeff_sweetscent.s
@@ -11,7 +11,7 @@ sub_80DE0B4: @ 80DE0B4
ldr r1, _080DE0C4 @ =gUnknown_203B0A0
movs r0, 0
strb r0, [r1, 0x9]
- bl sub_80DE0E8
+ bl hm2_sweet_scent
pop {r0}
bx r0
.align 2, 0
@@ -24,7 +24,7 @@ sub_80DE0C8: @ 80DE0C8
ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080DE0E0 @ =gUnknown_203B0C4
- ldr r0, _080DE0E4 @ =sub_80DE0E8
+ ldr r0, _080DE0E4 @ =hm2_sweet_scent
str r0, [r1]
movs r0, 0x1
bx lr
@@ -32,15 +32,15 @@ sub_80DE0C8: @ 80DE0C8
_080DE0D8: .4byte gUnknown_3005024
_080DE0DC: .4byte hm_add_c3_launch_phase_2
_080DE0E0: .4byte gUnknown_203B0C4
-_080DE0E4: .4byte sub_80DE0E8
+_080DE0E4: .4byte hm2_sweet_scent
thumb_func_end sub_80DE0C8
- thumb_func_start sub_80DE0E8
-sub_80DE0E8: @ 80DE0E8
+ thumb_func_start hm2_sweet_scent
+hm2_sweet_scent: @ 80DE0E8
push {lr}
movs r0, 0x33
bl FieldEffectStart
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080DE100 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -49,10 +49,10 @@ sub_80DE0E8: @ 80DE0E8
bx r0
.align 2, 0
_080DE100: .4byte gUnknown_20386E0
- thumb_func_end sub_80DE0E8
+ thumb_func_end hm2_sweet_scent
- thumb_func_start sub_80DE104
-sub_80DE104: @ 80DE104
+ thumb_func_start FldEff_SweetScent
+FldEff_SweetScent: @ 80DE104
push {lr}
bl sub_807B05C
bl oei_task_add
@@ -73,7 +73,7 @@ sub_80DE104: @ 80DE104
.align 2, 0
_080DE12C: .4byte gUnknown_3005090
_080DE130: .4byte sub_80DE134
- thumb_func_end sub_80DE104
+ thumb_func_end FldEff_SweetScent
thumb_func_start sub_80DE134
sub_80DE134: @ 80DE134
diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s
index 017904b3c..78fbf71ab 100644
--- a/asm/fldeff_teleport.s
+++ b/asm/fldeff_teleport.s
@@ -24,7 +24,7 @@ _080F670C:
ldr r0, _080F6724 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080F6728 @ =gUnknown_203B0C4
- ldr r0, _080F672C @ =sub_80F6730
+ ldr r0, _080F672C @ =hm_teleport_run_dp02scr
str r0, [r1]
movs r0, 0x1
_080F671A:
@@ -34,16 +34,16 @@ _080F671A:
_080F6720: .4byte gUnknown_3005024
_080F6724: .4byte hm_add_c3_launch_phase_2
_080F6728: .4byte gUnknown_203B0C4
-_080F672C: .4byte sub_80F6730
+_080F672C: .4byte hm_teleport_run_dp02scr
thumb_func_end sub_80F66F0
- thumb_func_start sub_80F6730
-sub_80F6730: @ 80F6730
+ thumb_func_start hm_teleport_run_dp02scr
+hm_teleport_run_dp02scr: @ 80F6730
push {lr}
bl sub_8054D08
movs r0, 0x3F
bl FieldEffectStart
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080F674C @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -52,10 +52,10 @@ sub_80F6730: @ 80F6730
bx r0
.align 2, 0
_080F674C: .4byte gUnknown_20386E0
- thumb_func_end sub_80F6730
+ thumb_func_end hm_teleport_run_dp02scr
- thumb_func_start sub_80F6750
-sub_80F6750: @ 80F6750
+ thumb_func_start FldEff_UseTeleport
+FldEff_UseTeleport: @ 80F6750
push {lr}
bl oei_task_add
lsls r0, 24
@@ -77,7 +77,7 @@ sub_80F6750: @ 80F6750
.align 2, 0
_080F6778: .4byte gUnknown_3005090
_080F677C: .4byte sub_80F6780
- thumb_func_end sub_80F6750
+ thumb_func_end FldEff_UseTeleport
thumb_func_start sub_80F6780
sub_80F6780: @ 80F6780
diff --git a/asm/gpu_regs.s b/asm/gpu_regs.s
index 833b1ff91..999a6b9fc 100644
--- a/asm/gpu_regs.s
+++ b/asm/gpu_regs.s
@@ -313,8 +313,8 @@ _08000B8C: .4byte gUnknown_30000C2
_08000B90: .4byte gUnknown_30000C1
thumb_func_end EnableInterrupts
- thumb_func_start sub_8000B94
-sub_8000B94: @ 8000B94
+ thumb_func_start DisableInterrupts
+DisableInterrupts: @ 8000B94
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -334,7 +334,7 @@ sub_8000B94: @ 8000B94
.align 2, 0
_08000BB8: .4byte gUnknown_30000C2
_08000BBC: .4byte gUnknown_30000C1
- thumb_func_end sub_8000B94
+ thumb_func_end DisableInterrupts
thumb_func_start UpdateRegDispstatIntrBits
UpdateRegDispstatIntrBits: @ 8000BC0
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 9d0789136..a899cfbbb 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -27,8 +27,8 @@ sub_80F1DC0: @ 80F1DC0
bx r0
thumb_func_end sub_80F1DC0
- thumb_func_start sub_80F1DDC
-sub_80F1DDC: @ 80F1DDC
+ thumb_func_start InitHallOfFameScreen
+InitHallOfFameScreen: @ 80F1DDC
push {r4,lr}
sub sp, 0x4
ldr r0, _080F1DFC @ =gUnknown_30030F0
@@ -153,12 +153,12 @@ _080F1EF2:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80F1DDC
+ thumb_func_end InitHallOfFameScreen
thumb_func_start sub_80F1EFC
sub_80F1EFC: @ 80F1EFC
push {r4,lr}
- bl sub_80F1DDC
+ bl InitHallOfFameScreen
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -191,7 +191,7 @@ _080F1F3C: .4byte gUnknown_203AB38
thumb_func_start sub_80F1F40
sub_80F1F40: @ 80F1F40
push {lr}
- bl sub_80F1DDC
+ bl InitHallOfFameScreen
lsls r0, 24
cmp r0, 0
bne _080F1F66
@@ -521,10 +521,10 @@ _080F21B2:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _080F2218 @ =gUnknown_3005090
mov r0, r8
add r0, r9
@@ -1089,7 +1089,7 @@ _080F2630:
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _080F268C @ =gUnknown_3005090
mov r2, r9
adds r0, r2, r6
@@ -1277,10 +1277,10 @@ _080F27AC:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _080F2800 @ =Task_Hof_ExitOnKeyPressed
str r0, [r4]
_080F27F4:
@@ -1401,7 +1401,7 @@ _080F28B6:
bl HideBg
movs r0, 0x3
bl HideBg
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0x1
bl UnsetBgTilemapBuffer
movs r0, 0x3
@@ -1444,10 +1444,10 @@ sub_80F2934: @ 80F2934
sub sp, 0x4
ldr r0, _080F2970 @ =0x00004085
movs r1, 0x1
- bl sub_806E584
+ bl VarSet
movs r0, 0x80
lsls r0, 7
- bl sub_806E680
+ bl FlagSet
ldr r1, _080F2974 @ =gUnknown_2031DD8
movs r0, 0x2
strb r0, [r1]
@@ -2299,7 +2299,7 @@ sub_80F3030: @ 80F3030
movs r0, 0x3
bl HideBg
bl sub_810F740
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0x1
bl UnsetBgTilemapBuffer
movs r0, 0x3
@@ -2358,10 +2358,10 @@ sub_80F30A4: @ 80F30A4
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _080F3104 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2439,7 +2439,7 @@ sub_80F313C: @ 80F313C
bl sub_812E51C
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -2567,7 +2567,7 @@ _080F327C:
strb r0, [r1]
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2715,7 +2715,7 @@ _080F3348:
_080F33BA:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x34
pop {r3}
mov r8, r3
@@ -2960,7 +2960,7 @@ _080F3582:
bl sub_812E51C
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x2C
pop {r3-r5}
mov r8, r3
diff --git a/asm/heal_location.s b/asm/heal_location.s
index bce9752f8..eb87254e8 100644
--- a/asm/heal_location.s
+++ b/asm/heal_location.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80BFC50
-sub_80BFC50: @ 80BFC50
+ thumb_func_start GetHealLocationIndexFromMapGroupAndNum
+GetHealLocationIndexFromMapGroupAndNum: @ 80BFC50
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -37,16 +37,16 @@ _080BFC82:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80BFC50
+ thumb_func_end GetHealLocationIndexFromMapGroupAndNum
- thumb_func_start sub_80BFC88
-sub_80BFC88: @ 80BFC88
+ thumb_func_start GetHealLocationPointerFromMapGroupAndNum
+GetHealLocationPointerFromMapGroupAndNum: @ 80BFC88
push {lr}
lsls r0, 16
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
- bl sub_80BFC50
+ bl GetHealLocationIndexFromMapGroupAndNum
cmp r0, 0
beq _080BFCA8
lsls r0, 3
@@ -60,10 +60,10 @@ _080BFCA8:
_080BFCAA:
pop {r1}
bx r1
- thumb_func_end sub_80BFC88
+ thumb_func_end GetHealLocationPointerFromMapGroupAndNum
- thumb_func_start sub_80BFCB0
-sub_80BFCB0: @ 80BFCB0
+ thumb_func_start GetHealLocationPointer
+GetHealLocationPointer: @ 80BFCB0
push {lr}
cmp r0, 0
beq _080BFCC8
@@ -80,7 +80,7 @@ _080BFCC8:
_080BFCCA:
pop {r1}
bx r1
- thumb_func_end sub_80BFCB0
+ thumb_func_end GetHealLocationPointer
thumb_func_start sub_80BFCD0
sub_80BFCD0: @ 80BFCD0
@@ -88,7 +88,7 @@ sub_80BFCD0: @ 80BFCD0
adds r4, r0, 0
ldr r6, _080BFD24 @ =0x00004082
adds r0, r6, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0x1
@@ -110,7 +110,7 @@ sub_80BFCD0: @ 80BFCD0
blt _080BFD0A
adds r0, r6, 0
movs r1, 0
- bl sub_806E584
+ bl VarSet
_080BFD0A:
ldr r0, _080BFD34 @ =gUnknown_20370D2
strh r5, [r0]
@@ -143,7 +143,7 @@ _080BFD38:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_80BFC50
+ bl GetHealLocationIndexFromMapGroupAndNum
adds r6, r0, 0
ldr r2, _080BFD80 @ =gUnknown_83EEC98
subs r0, r6, 0x1
@@ -217,7 +217,7 @@ _080BFDC0:
strh r0, [r4, 0x6]
ldr r0, _080BFDE8 @ =0x00004082
movs r1, 0
- bl sub_806E584
+ bl VarSet
b _080BFDF4
.align 2, 0
_080BFDE8: .4byte 0x00004082
diff --git a/asm/help_system.s b/asm/help_system.s
index 2a25cb733..13f9d8ec0 100644
--- a/asm/help_system.s
+++ b/asm/help_system.s
@@ -1193,7 +1193,7 @@ _0813C1AC:
lsrs r4, r0, 24
_0813C1BC:
ldr r0, _0813C1DC @ =0x00000834
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1290,7 +1290,7 @@ _0813C282:
strh r0, [r4, 0x6]
ldr r0, [sp, 0x24]
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
lsls r3, r6, 16
@@ -1300,7 +1300,7 @@ _0813C282:
adds r0, r4, 0
adds r1, r7, 0
mov r2, r10
- bl sub_8004C84
+ bl FillBitmapRect4Bit
adds r0, r7, r6
lsls r0, 24
lsrs r7, r0, 24
@@ -1360,7 +1360,7 @@ _0813C2D4:
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl sub_8004AA4
+ bl BlitBitmapRect4Bit
adds r0, r6, 0
bl GetKeypadIconWidth
b _0813C38E
@@ -1496,7 +1496,7 @@ _0813C402:
adds r0, r7, 0
mov r1, r8
movs r3, 0
- bl sub_8004AA4
+ bl BlitBitmapRect4Bit
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -1978,7 +1978,7 @@ sub_813C7CC: @ 813C7CC
push {r7}
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -2026,7 +2026,7 @@ sub_813C828: @ 813C828
push {r4,lr}
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
@@ -2058,7 +2058,7 @@ sub_813C860: @ 813C860
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x1
lsls r0, 24
lsrs r0, 24
diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s
index 969643684..eff9cae2a 100644
--- a/asm/help_system_812B1E0.s
+++ b/asm/help_system_812B1E0.s
@@ -190,7 +190,7 @@ _0812B2EC:
cmp r5, 0xF
bne _0812B320
ldr r0, _0812B328 @ =0x00000849
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -328,7 +328,7 @@ sub_812B40C: @ 812B40C
cmp r0, 0x2
beq _0812B440
ldr r0, _0812B43C @ =0x0000083c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0812B440
@@ -341,7 +341,7 @@ _0812B438: .4byte gUnknown_30053A0
_0812B43C: .4byte 0x0000083c
_0812B440:
ldr r0, _0812B454 @ =0x0000083c
- bl sub_806E680
+ bl FlagSet
ldr r1, _0812B458 @ =gUnknown_203B0EE
movs r0, 0x1
strb r0, [r1]
@@ -753,7 +753,7 @@ sub_812B754: @ 812B754
push {lr}
movs r0, 0x96
lsls r0, 3
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1116,7 +1116,7 @@ _0812BAEA:
_0812BAF0:
ldr r0, _0812BAFC @ =0x00000821
_0812BAF2:
- bl sub_806E6D0
+ bl FlagGet
_0812BAF6:
lsls r0, 24
lsrs r0, 24
@@ -1141,44 +1141,44 @@ _0812BB0A:
sub_812BB10: @ 812BB10
push {lr}
ldr r0, _0812BB7C @ =0x00000237
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
movs r0, 0x8E
lsls r0, 2
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB80 @ =0x00000239
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB84 @ =0x0000023a
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB88 @ =0x0000023b
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB8C @ =0x000002ef
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812BB94
ldr r0, _0812BB90 @ =0x000001f1
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
diff --git a/asm/hof_pc.s b/asm/hof_pc.s
index 5abad92bd..3a24210db 100644
--- a/asm/hof_pc.s
+++ b/asm/hof_pc.s
@@ -16,7 +16,7 @@ sub_80CA53C: @ 80CA53C
ands r0, r1
cmp r0, 0
bne _080CA564
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0
bl sub_8001618
adds r0, r4, 0
diff --git a/asm/intro.s b/asm/intro.s
index af7c17a79..ce50cfa9e 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -680,7 +680,7 @@ _080ECB02:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5, 0x4]
adds r0, 0x1
strb r0, [r5, 0x4]
@@ -1018,7 +1018,7 @@ _080ECDCC:
bl BlitBitmapToWindow
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _080ECE70
.align 2, 0
_080ECE0C: .4byte 0x0000043c
@@ -2739,7 +2739,7 @@ _080EDC0C:
adds r0, r4, 0
bl Free
movs r0, 0x2
- bl sub_8000B94
+ bl DisableInterrupts
movs r0, 0
bl SetHBlankCallback
ldr r0, _080EDC3C @ =sub_8078914
diff --git a/asm/item.s b/asm/item.s
index 511b67413..ccb1e2fee 100644
--- a/asm/item.s
+++ b/asm/item.s
@@ -545,13 +545,13 @@ _0809A132:
movs r1, 0x1
bl sub_8099DBC
ldr r0, _0809A1B4 @ =0x00000847
- bl sub_806E680
+ bl FlagSet
_0809A174:
ldr r0, _0809A1B0 @ =0x0000016d
cmp r6, r0
bne _0809A180
ldr r0, _0809A1B4 @ =0x00000847
- bl sub_806E680
+ bl FlagSet
_0809A180:
adds r0, r7, 0
bl sub_8099ECC
diff --git a/asm/item_menu.s b/asm/item_menu.s
index 937f00820..c9de423ac 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -1239,13 +1239,13 @@ sub_810878C: @ 810878C
bne _081087C8
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -1729,7 +1729,7 @@ _08108B2A:
beq _08108B36
bl Free
_08108B36:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -2190,7 +2190,7 @@ sub_8108E70: @ 8108E70
adds r0, r5, 0
movs r2, 0x6D
movs r3, 0xD
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
@@ -2534,7 +2534,7 @@ sub_8109168: @ 8109168
ands r0, r1
cmp r0, 0
bne _081091C6
- bl sub_80BF630
+ bl GetLRKeysState
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _081091A8 @ =gUnknown_30030F0
@@ -3469,7 +3469,7 @@ _0810993C:
lsrs r0, 24
cmp r0, 0x1
beq _08109950
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _081099C4
_08109950:
@@ -3670,19 +3670,19 @@ _08109AD4:
lsrs r6, 24
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -3699,10 +3699,10 @@ _08109AD4:
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x2
- bl sub_810FCD0
+ bl AddItemMenuActionTextPrinters
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -4320,7 +4320,7 @@ _0810A052:
strh r0, [r7]
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
mov r0, r8
bl sub_810A2DC
pop {r3}
@@ -4366,7 +4366,7 @@ sub_810A0A8: @ 810A0A8
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r5, 0
bl itemid_80BF6D8_mail_related
lsls r0, 24
@@ -4649,7 +4649,7 @@ sub_810A324: @ 810A324
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r5]
bl ItemId_GetBattleFunc
adds r1, r0, 0
@@ -5820,7 +5820,7 @@ _0810AD0C: .4byte sub_810A1D0
thumb_func_start sub_810AD10
sub_810AD10: @ 810AD10
push {r4-r6,lr}
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0810AD1E
movs r0, 0
@@ -6208,7 +6208,7 @@ _0810B01C:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5]
movs r1, 0
movs r2, 0
@@ -6558,7 +6558,7 @@ _0810B29E:
bl sub_810876C
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
b _0810B36C
.align 2, 0
_0810B318: .4byte gUnknown_3005008
@@ -6734,7 +6734,7 @@ _0810B468:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
movs r1, 0
movs r2, 0
@@ -6850,7 +6850,7 @@ _0810B564:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5]
movs r1, 0
movs r2, 0
@@ -6985,7 +6985,7 @@ _0810B68C:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r6]
movs r1, 0
movs r2, 0
diff --git a/asm/item_menu_icons.s b/asm/item_menu_icons.s
index e1c50b7ce..9a09111cb 100644
--- a/asm/item_menu_icons.s
+++ b/asm/item_menu_icons.s
@@ -329,8 +329,8 @@ _08098724:
bx r1
thumb_func_end sub_80986EC
- thumb_func_start sub_809872C
-sub_809872C: @ 809872C
+ thumb_func_start CopyItemIconPicTo4x4Buffer
+CopyItemIconPicTo4x4Buffer: @ 809872C
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
@@ -352,10 +352,10 @@ _08098734:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_809872C
+ thumb_func_end CopyItemIconPicTo4x4Buffer
- thumb_func_start sub_8098758
-sub_8098758: @ 8098758
+ thumb_func_start AddItemIconObject
+AddItemIconObject: @ 8098758
push {r4-r7,lr}
sub sp, 0x28
lsls r0, 16
@@ -378,7 +378,7 @@ sub_8098758: @ 8098758
ldr r0, [r1]
ldr r2, _08098800 @ =gUnknown_2039888
ldr r1, [r2]
- bl sub_809872C
+ bl CopyItemIconPicTo4x4Buffer
ldr r1, _08098800 @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
@@ -440,10 +440,10 @@ _08098812:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8098758
+ thumb_func_end AddItemIconObject
- thumb_func_start sub_809881C
-sub_809881C: @ 809881C
+ thumb_func_start AddItemIconObjectWithCustomObjectTemplate
+AddItemIconObjectWithCustomObjectTemplate: @ 809881C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -469,7 +469,7 @@ sub_809881C: @ 809881C
ldr r0, [r1]
ldr r2, _080988CC @ =gUnknown_2039888
ldr r1, [r2]
- bl sub_809872C
+ bl CopyItemIconPicTo4x4Buffer
ldr r1, _080988CC @ =gUnknown_2039888
ldr r0, [r1]
str r0, [sp, 0x18]
@@ -532,7 +532,7 @@ _080988DA:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_809881C
+ thumb_func_end AddItemIconObjectWithCustomObjectTemplate
thumb_func_start sub_80988E8
sub_80988E8: @ 80988E8
@@ -555,7 +555,7 @@ sub_80988E8: @ 80988E8
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
- bl sub_8098758
+ bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -653,7 +653,7 @@ sub_80989A0: @ 80989A0
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
- bl sub_8098758
+ bl AddItemIconObject
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
diff --git a/asm/item_pc.s b/asm/item_pc.s
index c7a5c56f1..0ee39e021 100644
--- a/asm/item_pc.s
+++ b/asm/item_pc.s
@@ -861,13 +861,13 @@ sub_810DAD4: @ 810DAD4
bne _0810DB10
movs r0, 0x2
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -1076,7 +1076,7 @@ _0810DC66:
beq _0810DC72
bl Free
_0810DC72:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -1852,7 +1852,7 @@ sub_810E274: @ 810E274
mov r8, r0
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1868,7 +1868,7 @@ sub_810E274: @ 810E274
bl PrintTextArray
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -2072,7 +2072,7 @@ sub_810E418: @ 810E418
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2100,7 +2100,7 @@ _0810E4B8:
adds r0, r1, 0
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -2257,7 +2257,7 @@ sub_810E5E0: @ 810E5E0
str r4, [sp, 0x8]
adds r2, r5, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r6, 0
movs r1, 0x1
movs r2, 0x2
@@ -2590,7 +2590,7 @@ sub_810E8F0: @ 810E8F0
push {r4,lr}
ldr r0, _0810E974 @ =gUnknown_8453F98
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r1, 0xF0
lsls r1, 2
movs r0, 0
@@ -2706,7 +2706,7 @@ sub_810E984: @ 810E984
strb r0, [r1, 0xD]
movs r0, 0x3
movs r1, 0x4
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2715,13 +2715,13 @@ sub_810E984: @ 810E984
strb r4, [r1, 0xC]
movs r0, 0x3
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
adds r6, r0
strb r6, [r1, 0xA]
movs r0, 0x3
movs r1, 0x3
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
add r8, r0
mov r0, r8
@@ -2729,7 +2729,7 @@ sub_810E984: @ 810E984
mov r0, sp
mov r1, r9
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -2853,7 +2853,7 @@ sub_810EAF0: @ 810EAF0
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -2897,7 +2897,7 @@ sub_810EB30: @ 810EB30
adds r0, r4, 0
movs r1, 0x5
movs r3, 0xB
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
diff --git a/asm/item_use.s b/asm/item_use.s
index 78d7b28b1..f5a0f6541 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -353,7 +353,7 @@ sub_80A122C: @ 80A122C
lsrs r4, r0, 24
movs r0, 0x83
lsls r0, 4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -526,7 +526,7 @@ sub_80A137C: @ 80A137C
lsls r0, 24
cmp r0, 0
bne _080A13D4
- bl sub_805C8B0
+ bl IsPlayerFacingSurfableFishableWater
lsls r0, 24
cmp r0, 0
beq _080A1404
@@ -1281,7 +1281,7 @@ sub_80A1998: @ 80A1998
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080A19C0 @ =0x00004020
- bl sub_806E568
+ bl VarGet
lsls r0, 16
cmp r0, 0
bne _080A19CC
@@ -1336,7 +1336,7 @@ sub_80A19E8: @ 80A19E8
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_806E584
+ bl VarSet
bl sub_80A1A44
ldr r2, _080A1A3C @ =gUnknown_2021D18
ldr r3, _080A1A40 @ =sub_810A1F8
@@ -1404,9 +1404,9 @@ sub_80A1A94: @ 80A1A94
cmp r0, 0x2B
bne _080A1AF4
ldr r0, _080A1ADC @ =0x00000803
- bl sub_806E680
+ bl FlagSet
ldr r0, _080A1AE0 @ =0x00000804
- bl sub_806E6A8
+ bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1AE4 @ =gUnknown_2021CF0
bl sub_8099E90
@@ -1430,9 +1430,9 @@ _080A1AF4:
cmp r0, 0x2A
bne _080A1B26
ldr r0, _080A1B2C @ =0x00000804
- bl sub_806E680
+ bl FlagSet
ldr r0, _080A1B30 @ =0x00000803
- bl sub_806E6A8
+ bl FlagClear
ldrh r0, [r5]
ldr r1, _080A1B34 @ =gUnknown_2021CF0
bl sub_8099E90
@@ -2132,7 +2132,7 @@ sub_80A2068: @ 80A2068
lsrs r4, r0, 24
ldr r0, _080A208C @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_8126C68
+ bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
@@ -2261,7 +2261,7 @@ sub_80A2194: @ 80A2194
lsrs r4, r0, 24
ldr r0, _080A21B4 @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_8126C68
+ bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x15
diff --git a/asm/itemfinder.s b/asm/itemfinder.s
index 74d07792d..7ee3807d5 100644
--- a/asm/itemfinder.s
+++ b/asm/itemfinder.s
@@ -251,7 +251,7 @@ _0813EE4E:
bl sub_80CC44C
lsls r0, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0813EEF2
@@ -499,7 +499,7 @@ _0813F020:
cmp r0, 0x1
beq _0813F066
adds r0, r5, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0813F066
diff --git a/asm/learn_move.s b/asm/learn_move.s
index a9b5b5cb4..fcbfcef96 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -82,7 +82,7 @@ sub_80E469C: @ 80E469C
lsls r0, 16
cmp r0, 0
beq _080E476C
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r5, 0
_080E46C6:
lsls r4, r5, 24
@@ -737,7 +737,7 @@ _080E4C7E:
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
bl get_coro_args_x18_x1A
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080E4CD8 @ =gUnknown_2024284
ldr r5, [r7]
movs r2, 0x98
@@ -806,7 +806,7 @@ _080E4D18:
beq _080E4D26
b _080E4EDA
_080E4D26:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080E4D40 @ =gUnknown_203AAB4
ldr r0, [r0]
bl Free
@@ -1049,7 +1049,7 @@ sub_80E4F0C: @ 80E4F0C
bl PutWindowTilemap
movs r0, 0x7
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080E4F42:
add sp, 0x8
pop {r4,r5}
@@ -1267,7 +1267,7 @@ sub_80E50CC: @ 80E50CC
ldr r5, _080E51EC @ =gUnknown_2024284
adds r0, r5
adds r1, 0xE8
- bl sub_8043C84
+ bl GetMoveRelearnerMoves
ldr r1, [r7]
strb r0, [r1, 0x1A]
ldr r1, [r7]
@@ -1276,7 +1276,7 @@ sub_80E50CC: @ 80E50CC
muls r0, r6
adds r0, r5
adds r1, 0xE8
- bl sub_8043C84
+ bl GetMoveRelearnerMoves
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1539,7 +1539,7 @@ sub_80E5300: @ 80E5300
strb r0, [r1]
movs r0, 0x6
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1717,10 +1717,10 @@ sub_80E5444: @ 80E5444
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80E5444
@@ -1754,29 +1754,29 @@ _080E54EA:
bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r5, 0x1
cmp r5, 0x5
ble _080E54EA
_080E5504:
movs r0, 0x3
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x5
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x7
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -1825,7 +1825,7 @@ sub_80E5574: @ 80E5574
bl PutWindowTilemap
movs r0, 0x6
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
_080E5594:
adds r0, r4, 0
pop {r4}
diff --git a/asm/link.s b/asm/link.s
index b28c9a236..bb05ea0dd 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -346,7 +346,7 @@ sub_8009708: @ 8009708
bl sub_806E25C
strb r0, [r5, 0x10]
ldr r0, _08009788 @ =0x00000844
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0800976E
@@ -3287,7 +3287,7 @@ _0800AD30:
lsls r0, 16
cmp r0, 0
beq _0800ADD8
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl reset_temp_tile_data_buffers
movs r0, 0x52
movs r1, 0
@@ -3403,10 +3403,10 @@ sub_800AE1C: @ 800AE1C
bl PutWindowTilemap
movs r0, 0
movs r1, 0
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl ShowBg
movs r0, 0x1
@@ -3451,10 +3451,10 @@ sub_800AED0: @ 800AED0
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl ShowBg
add sp, 0xC
@@ -3936,7 +3936,7 @@ sub_800B29C: @ 800B29C
push {lr}
sub sp, 0x4
movs r0, 0xC0
- bl sub_8000B94
+ bl DisableInterrupts
ldr r1, _0800B2DC @ =0x04000128
movs r2, 0x80
lsls r2, 6
@@ -3977,7 +3977,7 @@ sub_800B2F4: @ 800B2F4
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0xC0
- bl sub_8000B94
+ bl DisableInterrupts
ldr r0, _0800B354 @ =0x04000134
movs r4, 0
strh r4, [r0]
diff --git a/asm/link_rfu.s b/asm/link_rfu.s
index f0d698203..29b9f559a 100644
--- a/asm/link_rfu.s
+++ b/asm/link_rfu.s
@@ -3389,7 +3389,7 @@ _080FED50:
cmp r0, 0
bne _080FED62
ldr r0, _080FED7C @ =0x0000082d
- bl sub_806E680
+ bl FlagSet
bl sub_80FEF2C
_080FED62:
adds r0, r4, 0
@@ -3493,7 +3493,7 @@ sub_80FEE24: @ 80FEE24
bl sub_80BDE70
bl sub_80FF010
bl sub_810011C
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl SetMainCallback2
pop {r4}
@@ -6056,7 +6056,7 @@ _080FFFD4:
bl SetBgTilemapBuffer
ldr r0, _08100030 @ =gUnknown_843F8B0
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl sub_8100CBC
bl sub_8100C5C
movs r0, 0
@@ -6412,7 +6412,7 @@ _0810030C: .4byte gUnknown_843F8D8
_08100310:
ldrh r1, [r4]
mov r0, sp
- bl sub_80BD850
+ bl CopyEasyChatWord
movs r0, 0x1
mov r1, sp
movs r2, 0
@@ -7729,7 +7729,7 @@ sub_8100D24: @ 8100D24
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_08100D7A:
add sp, 0x14
pop {r4,r5}
@@ -7766,7 +7766,7 @@ _08100DAC:
str r0, [sp, 0x8]
adds r0, r5, 0
adds r2, r6, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -7942,7 +7942,7 @@ _08100EEC:
_08100F08:
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x14
pop {r0}
bx r0
@@ -8098,7 +8098,7 @@ _08101046:
beq _08101068
adds r1, r0, 0
adds r0, r2, 0
- bl sub_80BD850
+ bl CopyEasyChatWord
adds r2, r0, 0
adds r4, 0x2
b _08101096
@@ -8170,7 +8170,7 @@ _081010D6:
ldr r0, [r0]
ldrb r0, [r0, 0x2]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -8454,7 +8454,7 @@ _0810130A:
_0810130E:
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -8747,7 +8747,7 @@ _0810152A:
_08101538:
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -8822,7 +8822,7 @@ sub_81015BC: @ 81015BC
bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_81015BC
diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s
index b9ab595d1..8c51f53b8 100644
--- a/asm/link_rfu_2.s
+++ b/asm/link_rfu_2.s
@@ -9178,7 +9178,7 @@ _080FCB88:
ands r1, r0
strb r1, [r7]
ldr r0, _080FCC34 @ =0x00000844
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 7
ldrb r1, [r7]
ands r4, r1
@@ -9191,7 +9191,7 @@ _080FCB88:
orrs r5, r0
strb r5, [r7, 0x1]
ldr r0, _080FCC38 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
ands r6, r0
lsls r6, 1
ldrb r1, [r7, 0x1]
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index 2c8aa84e8..eee64233b 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -93,7 +93,7 @@ _081158F0:
_0811590E:
adds r0, r6, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -398,7 +398,7 @@ _08115B5C:
bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5, 0xF]
movs r1, 0
bl sub_80F6F1C
@@ -422,7 +422,7 @@ _08115B5C:
bl PutWindowTilemap
ldrb r0, [r5, 0x11]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x1
@@ -1148,11 +1148,11 @@ sub_81161E4: @ 81161E4
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r4, 0x11]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r4, 0xF]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r4, 0x10]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r4, 0x17]
bl DestroyTask
ldr r0, [r4, 0x8]
@@ -1916,7 +1916,7 @@ _08116838:
bl PutWindowTilemap
ldrb r0, [r6, 0xC]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_80F6F1C
@@ -1942,7 +1942,7 @@ _08116838:
bl sub_8115924
ldrb r0, [r6, 0xD]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
strb r4, [r6, 0xF]
@@ -2331,11 +2331,11 @@ _08116C10:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r6, 0xD]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r6, 0xB]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r6, 0xC]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r6, 0x11]
bl DestroyTask
ldr r0, [r6]
@@ -3274,7 +3274,7 @@ sub_81173C0: @ 81173C0
lsrs r6, 16
bl sub_80A0058
bl copy_player_party_to_sav1
- bl sub_804C320
+ bl copy_bags_and_unk_data_from_save_blocks
ldr r5, _0811742C @ =gUnknown_202273C
ldr r0, _08117430 @ =0x00002211
str r0, [r5, 0x14]
@@ -3339,7 +3339,7 @@ sub_8117440: @ 8117440
lsrs r5, 16
ldr r0, _081174AC @ =0x0000406f
adds r1, r3, 0
- bl sub_806E584
+ bl VarSet
ldr r6, _081174B0 @ =gUnknown_3005008
ldr r1, [r6]
movs r0, 0x4
@@ -3399,7 +3399,7 @@ sub_81174B4: @ 81174B4
ldr r0, _08117524 @ =gUnknown_20370C0
strh r1, [r0]
ldr r0, _08117528 @ =0x0000406f
- bl sub_806E584
+ bl VarSet
bl sub_800A088
ldr r1, _0811752C @ =gUnknown_3005030
strb r0, [r1]
@@ -3662,7 +3662,7 @@ _081177A0:
bl sub_8117594
bl sub_80A0058
bl copy_player_party_to_sav1
- bl sub_804C320
+ bl copy_bags_and_unk_data_from_save_blocks
movs r0, 0x1
str r0, [sp]
movs r0, 0
@@ -3675,7 +3675,7 @@ _081177C8:
bl sub_80563F0
bl sub_80A0058
bl copy_player_party_to_sav1
- bl sub_804C320
+ bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _081177EC @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -3691,7 +3691,7 @@ _081177F0:
bl sub_80563F0
bl sub_80A0058
bl copy_player_party_to_sav1
- bl sub_804C320
+ bl copy_bags_and_unk_data_from_save_blocks
ldr r0, _08117814 @ =gUnknown_2022618
movs r1, 0x1
bl sub_8117594
@@ -3760,7 +3760,7 @@ _08117890:
movs r1, 0x5
movs r2, 0x1
bl sub_8117440
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178AC @ =sub_805671C
@@ -3783,7 +3783,7 @@ _081178C8:
movs r1, 0x5
movs r2, 0x1
bl sub_8117440
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
ldr r1, _081178F8 @ =sub_805671C
@@ -4402,7 +4402,7 @@ _08117DEE:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r5, 0x17]
bl DestroyTask
ldr r0, [r5, 0x8]
@@ -4461,7 +4461,7 @@ _08117E80:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r5, 0x17]
bl DestroyTask
ldr r0, [r5, 0x8]
@@ -4648,7 +4648,7 @@ _08117FC0:
bl sub_8115924
ldrb r0, [r5, 0xD]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
strb r4, [r5, 0xF]
@@ -4846,9 +4846,9 @@ _081181EC:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xD]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r5, 0xB]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r5, 0x11]
bl DestroyTask
ldr r0, [r5]
@@ -5246,7 +5246,7 @@ _08118564:
movs r0, 0
bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB]
- bl sub_8003E3C
+ bl RemoveWindow
_08118580:
ldrb r0, [r5, 0x11]
bl DestroyTask
@@ -5617,7 +5617,7 @@ _081188E4:
ldrh r0, [r4]
cmp r0, 0
beq _081189A4
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4]
@@ -5647,7 +5647,7 @@ _08118904:
.align 2, 0
_0811892C: .4byte gUnknown_8458D54
_08118930:
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -5683,7 +5683,7 @@ _08118970:
ldr r1, _0811899C @ =gUnknown_203B058
movs r0, 0x44
strb r0, [r1]
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -7460,7 +7460,7 @@ _081198E8: .4byte gUnknown_2021D18
thumb_func_start sub_81198EC
sub_81198EC: @ 81198EC
push {lr}
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _081198FC
ldr r1, _08119900 @ =gUnknown_20370D0
@@ -8641,7 +8641,7 @@ sub_811A1AC: @ 811A1AC
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r4, 0
add sp, 0x8
pop {r4}
@@ -8661,7 +8661,7 @@ sub_811A1FC: @ 811A1FC
movs r1, 0x1
bl sub_80F6F9C
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -8705,7 +8705,7 @@ _0811A234:
strb r0, [r1]
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r7]
adds r0, 0x1
strb r0, [r7]
@@ -8731,7 +8731,7 @@ _0811A274:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r5]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
strb r0, [r7]
mov r0, r8
@@ -8752,7 +8752,7 @@ _0811A2B0:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r5]
- bl sub_8003E3C
+ bl RemoveWindow
strb r4, [r7]
movs r0, 0x2
negs r0, r0
@@ -8810,7 +8810,7 @@ _0811A308:
strb r0, [r5]
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
mov r1, r9
ldrb r0, [r1]
adds r0, 0x1
@@ -8847,7 +8847,7 @@ _0811A37E:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r7]
bl sub_811A1FC
movs r0, 0
@@ -8872,7 +8872,7 @@ _0811A3AC:
movs r1, 0x1
bl sub_80F6F9C
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
ldrb r0, [r7]
bl sub_811A1FC
mov r0, r8
@@ -9145,7 +9145,7 @@ _0811A5D2:
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -10537,14 +10537,14 @@ _0811B056:
lsls r0, r4, 24
lsrs r0, 24
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
adds r5, 0xB
adds r4, 0x1
cmp r4, 0x3
ble _0811B056
ldr r1, _0811B074 @ =gUnknown_8457D44
adds r0, r7, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _0811B080
.align 2, 0
_0811B074: .4byte gUnknown_8457D44
@@ -10601,8 +10601,8 @@ _0811B0CA:
bx r1
thumb_func_end sub_811B0A4
- thumb_func_start sub_811B0D0
-sub_811B0D0: @ 811B0D0
+ thumb_func_start InUnionRoom
+InUnionRoom: @ 811B0D0
push {lr}
movs r2, 0
ldr r0, _0811B0EC @ =gUnknown_3005008
@@ -10619,7 +10619,7 @@ _0811B0E4:
bx r1
.align 2, 0
_0811B0EC: .4byte gUnknown_3005008
- thumb_func_end sub_811B0D0
+ thumb_func_end InUnionRoom
thumb_func_start sub_811B0F0
sub_811B0F0: @ 811B0F0
@@ -10952,7 +10952,7 @@ sub_811B31C: @ 811B31C
ldr r0, _0811B4B0 @ =gUnknown_2039624
adds r1, r0
mov r8, r1
- bl sub_813CC90
+ bl UnkTextUtil_Reset
mov r6, r9
adds r6, 0xAC
bl sub_80447F0
@@ -10966,11 +10966,11 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0
adds r1, r6, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
mov r1, r8
adds r1, 0x30
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r4, 0xB0
lsls r4, 1
add r4, r9
@@ -10984,7 +10984,7 @@ sub_811B31C: @ 811B31C
bl StringCopy
movs r0, 0x2
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
mov r5, r9
adds r5, 0xCA
mov r0, r8
@@ -10995,7 +10995,7 @@ sub_811B31C: @ 811B31C
bl sub_8008E78
movs r0, 0x3
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r2, 0xD9
add r2, r9
mov r10, r2
@@ -11015,16 +11015,16 @@ sub_811B31C: @ 811B31C
bl sub_8008E78
movs r0, 0x4
mov r1, r10
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x5
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r4, 0xC8
lsls r4, 1
add r4, r9
ldr r1, _0811B4BC @ =gUnknown_84594C4
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
ldr r0, _0811B4C0 @ =gUnknown_2021D18
adds r1, r4, 0
bl StringCopy
@@ -11041,7 +11041,7 @@ _0811B40A:
bl sub_8008E78
movs r0, 0
adds r1, r6, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
mov r2, r8
ldrh r1, [r2, 0x16]
cmp r1, r4
@@ -11056,7 +11056,7 @@ _0811B426:
bl sub_8008E78
movs r0, 0x2
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
mov r0, r8
ldrh r1, [r0, 0x20]
adds r0, r5, 0
@@ -11065,7 +11065,7 @@ _0811B426:
bl sub_8008E78
movs r0, 0x3
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r7, 0
movs r6, 0x80
lsls r6, 19
@@ -11075,10 +11075,10 @@ _0811B426:
_0811B45E:
ldrh r1, [r5]
adds r0, r4, 0
- bl sub_80BD850
+ bl CopyEasyChatWord
lsrs r0, r6, 24
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r2, 0x80
lsls r2, 17
adds r6, r2
@@ -11092,7 +11092,7 @@ _0811B45E:
add r4, r9
ldr r1, _0811B4C8 @ =gUnknown_8459504
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
ldr r5, _0811B4C0 @ =gUnknown_2021D18
adds r0, r5, 0
adds r1, r4, 0
@@ -11102,7 +11102,7 @@ _0811B45E:
bne _0811B4D0
ldr r1, _0811B4CC @ =gUnknown_8459588
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
@@ -11127,7 +11127,7 @@ _0811B4D0:
adds r1, r0
ldr r1, [r1]
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r0, r5, 0
adds r1, r4, 0
bl StringAppend
@@ -11275,7 +11275,7 @@ sub_811B5DC: @ 811B5DC
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -11288,7 +11288,7 @@ sub_811B5F0: @ 811B5F0
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_811B5F0
@@ -11299,7 +11299,7 @@ sub_811B600: @ 811B600
adds r0, 0x63
lsls r0, 16
lsrs r0, 16
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
thumb_func_end sub_811B600
@@ -11313,7 +11313,7 @@ sub_811B610: @ 811B610
lsrs r0, 16
lsls r1, 16
lsrs r1, 16
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -12808,7 +12808,7 @@ _0811C168:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -12943,7 +12943,7 @@ _0811C2C0:
bne _0811C300
b _0811C52A
_0811C300:
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
bl ClearWindowTilemap
movs r0, 0
diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s
index 4596850ce..8fcfe3f41 100644
--- a/asm/link_rfu_4.s
+++ b/asm/link_rfu_4.s
@@ -171,7 +171,7 @@ sub_8142504: @ 8142504
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x14
pop {r4}
pop {r0}
@@ -190,7 +190,7 @@ sub_8142560: @ 8142560
bl ClearWindowTilemap
movs r0, 0x1
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_8142560
@@ -229,7 +229,7 @@ _081425A4:
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl sub_80056C4
+ bl DrawDownArrow
ldr r0, _081425D4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x3
@@ -254,7 +254,7 @@ _081425D8:
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl sub_80056C4
+ bl DrawDownArrow
movs r0, 0
strb r0, [r4]
bl sub_8142560
@@ -289,7 +289,7 @@ sub_8142610: @ 8142610
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl sub_80056C4
+ bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -311,7 +311,7 @@ sub_8142638: @ 8142638
movs r1, 0xD0
movs r2, 0x14
movs r3, 0x1
- bl sub_80056C4
+ bl DrawDownArrow
add sp, 0xC
pop {r0}
bx r0
@@ -478,7 +478,7 @@ _0814273A:
bl ClearWindowTilemap
movs r0, 0x2
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
_0814278A:
adds r0, r4, 0
add sp, 0x24
@@ -553,7 +553,7 @@ _081427E2:
bl sub_8150048
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
bl PutWindowTilemap
b _0814287E
@@ -623,9 +623,9 @@ _0814288C:
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r6, 0
b _081428EA
_081428C2:
@@ -637,9 +637,9 @@ _081428C2:
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1
negs r0, r0
b _081428EA
@@ -714,7 +714,7 @@ _08142934:
bl sub_8150048
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5]
bl PutWindowTilemap
ldrb r0, [r6]
@@ -775,9 +775,9 @@ _081429D4:
bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r4, 0
b _08142A3C
.align 2, 0
@@ -792,9 +792,9 @@ _08142A14:
bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x2
negs r0, r0
b _08142A3C
diff --git a/asm/list_menu.s b/asm/list_menu.s
index c29c0a09c..e18b71d14 100644
--- a/asm/list_menu.s
+++ b/asm/list_menu.s
@@ -78,7 +78,7 @@ _08106F34:
strb r0, [r4, 0x6]
ldrb r0, [r4, 0x5]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
strb r0, [r4, 0x4]
b _08106FE4
@@ -131,7 +131,7 @@ _08106FBA:
ldr r0, _08106FC8 @ =gUnknown_203ACF4
ldrb r0, [r0, 0x5]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
b _08106FE4
.align 2, 0
_08106FC8: .4byte gUnknown_203ACF4
@@ -141,7 +141,7 @@ _08106FCC:
movs r2, 0
bl sub_810713C
ldrb r0, [r5, 0x5]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
strb r0, [r5, 0x4]
ldr r0, [r5]
@@ -176,7 +176,7 @@ ListMenuInit: @ 8106FF8
bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -219,7 +219,7 @@ _08107048:
_08107064:
ldrb r0, [r6, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r7, 0
add sp, 0x8
pop {r4-r7}
@@ -405,7 +405,7 @@ sub_8107180: @ 8107180
bl ListMenuDrawCursor
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -604,7 +604,7 @@ ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -850,7 +850,7 @@ ListMenuPrintEntries: @ 81074DC
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
ldrb r1, [r4, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -936,7 +936,7 @@ ListMenuDrawCursor: @ 8107594
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -1071,7 +1071,7 @@ ListMenuAddCursorObject: @ 810768C
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
lsls r0, 24
lsrs r0, 24
@@ -1114,7 +1114,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, r1, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
ldrb r0, [r7, 0x16]
lsls r0, 26
@@ -1126,7 +1126,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, 26
lsrs r0, 26
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1134,7 +1134,7 @@ ListMenuErasePrintedCursor: @ 81076EC
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
ldrb r6, [r7, 0x10]
@@ -1340,7 +1340,7 @@ _0810789E:
lsls r0, 26
lsrs r0, 26
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
ldrb r1, [r6, 0x16]
lsls r1, 26
lsrs r1, 29
@@ -1537,7 +1537,7 @@ _08107A1A:
bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08107A62
_08107A3A:
adds r0, r4, 0
@@ -1554,7 +1554,7 @@ _08107A3A:
bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_08107A62:
movs r0, 0
_08107A64:
diff --git a/asm/load_save.s b/asm/load_save.s
index e5370e2b7..2c829401b 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -68,8 +68,8 @@ _0804C050: .4byte gUnknown_202552C
_0804C054: .4byte 0x01001ef4
thumb_func_end ClearSav1
- thumb_func_start sub_804C058
-sub_804C058: @ 804C058
+ thumb_func_start SetSaveBlocksPointers
+SetSaveBlocksPointers: @ 804C058
push {r4,r5,lr}
ldr r4, _0804C08C @ =gUnknown_3005008
ldr r5, [r4]
@@ -100,7 +100,7 @@ _0804C094: .4byte gUnknown_2024588
_0804C098: .4byte gUnknown_202552C
_0804C09C: .4byte gUnknown_3005010
_0804C0A0: .4byte gUnknown_2029314
- thumb_func_end sub_804C058
+ thumb_func_end SetSaveBlocksPointers
thumb_func_start sub_804C0A4
sub_804C0A4: @ 804C0A4
@@ -141,7 +141,7 @@ sub_804C0A4: @ 804C0A4
ldr r0, _0804C184 @ =gHeap + 0x4c8c
mov r2, r8
bl memcpy
- bl sub_804C058
+ bl SetSaveBlocksPointers
ldr r1, _0804C168 @ =gUnknown_300500C
ldr r0, [r1]
adds r1, r5, 0
@@ -335,8 +335,8 @@ _0804C268: .4byte gUnknown_3005008
_0804C26C: .4byte gUnknown_2024284
thumb_func_end sub_804C230
- thumb_func_start sub_804C270
-sub_804C270: @ 804C270
+ thumb_func_start save_serialize_npcs
+save_serialize_npcs: @ 804C270
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -373,7 +373,7 @@ _0804C286:
.align 2, 0
_0804C2B0: .4byte gUnknown_3005008
_0804C2B4: .4byte gUnknown_2036E38
- thumb_func_end sub_804C270
+ thumb_func_end save_serialize_npcs
thumb_func_start sub_804C2B8
sub_804C2B8: @ 804C2B8
@@ -415,14 +415,14 @@ _0804C2F8: .4byte gUnknown_3005008
_0804C2FC: .4byte gUnknown_2036E38
thumb_func_end sub_804C2B8
- thumb_func_start sub_804C300
-sub_804C300: @ 804C300
+ thumb_func_start SaveSerializedGame
+SaveSerializedGame: @ 804C300
push {lr}
bl copy_player_party_to_sav1
- bl sub_804C270
+ bl save_serialize_npcs
pop {r0}
bx r0
- thumb_func_end sub_804C300
+ thumb_func_end SaveSerializedGame
thumb_func_start sub_804C310
sub_804C310: @ 804C310
@@ -433,8 +433,8 @@ sub_804C310: @ 804C310
bx r0
thumb_func_end sub_804C310
- thumb_func_start sub_804C320
-sub_804C320: @ 804C320
+ thumb_func_start copy_bags_and_unk_data_from_save_blocks
+copy_bags_and_unk_data_from_save_blocks: @ 804C320
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -578,7 +578,7 @@ _0804C430: .4byte gUnknown_2031764
_0804C434: .4byte 0x00000464
_0804C438: .4byte 0x0000054c
_0804C43C: .4byte 0x00002cd0
- thumb_func_end sub_804C320
+ thumb_func_end copy_bags_and_unk_data_from_save_blocks
thumb_func_start sub_804C440
sub_804C440: @ 804C440
diff --git a/asm/mail.s b/asm/mail.s
index 104eb2c16..aabaacc82 100644
--- a/asm/mail.s
+++ b/asm/mail.s
@@ -27,10 +27,10 @@ sub_80BEBEC: @ 80BEBEC
ldr r2, [r4]
adds r1, r2, 0
adds r1, 0xF0
- ldr r0, _080BEC40 @ =sub_80BD850
+ ldr r0, _080BEC40 @ =CopyEasyChatWord
str r0, [r1]
adds r1, 0x4
- ldr r0, _080BEC44 @ =sub_80BD89C
+ ldr r0, _080BEC44 @ =ConvertEasyChatWordsToString
str r0, [r1]
ldrh r1, [r5, 0x20]
adds r0, r1, 0
@@ -47,8 +47,8 @@ sub_80BEBEC: @ 80BEBEC
.align 2, 0
_080BEC38: .4byte gUnknown_20399C4
_080BEC3C: .4byte 0x000020fc
-_080BEC40: .4byte sub_80BD850
-_080BEC44: .4byte sub_80BD89C
+_080BEC40: .4byte CopyEasyChatWord
+_080BEC44: .4byte ConvertEasyChatWordsToString
_080BEC48:
adds r1, r2, 0
adds r1, 0xEA
@@ -297,7 +297,7 @@ _080BEE74: .4byte 0x000010fc
_080BEE78:
ldr r0, _080BEE84 @ =gUnknown_83EE9A4
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
b _080BF0F4
.align 2, 0
_080BEE84: .4byte gUnknown_83EE9A4
@@ -665,7 +665,7 @@ _080BF152:
lsls r2, 30
lsrs r2, 30
movs r3, 0x1
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
ldr r0, [r7]
adds r0, 0xF8
ldr r1, [r0]
@@ -878,10 +878,10 @@ _080BF2CE:
bl sub_812E51C
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1023,7 +1023,7 @@ _080BF442:
movs r1, 0
bl memset
bl ResetPaletteFade
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, [r4]
bl Free
movs r0, 0
diff --git a/asm/mail_data.s b/asm/mail_data.s
index 09f2f8d62..66ddc3656 100644
--- a/asm/mail_data.s
+++ b/asm/mail_data.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8097C84
-sub_8097C84: @ 8097C84
+ thumb_func_start ClearMailData
+ClearMailData: @ 8097C84
push {r4,r5,lr}
movs r4, 0
ldr r5, _08097CAC @ =gUnknown_3005008
@@ -18,7 +18,7 @@ _08097C8A:
adds r1, r0
ldr r0, [r5]
adds r0, r1
- bl sub_8097CB4
+ bl ClearMailStruct
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -30,10 +30,10 @@ _08097C8A:
.align 2, 0
_08097CAC: .4byte gUnknown_3005008
_08097CB0: .4byte 0x00002cd0
- thumb_func_end sub_8097C84
+ thumb_func_end ClearMailData
- thumb_func_start sub_8097CB4
-sub_8097CB4: @ 8097CB4
+ thumb_func_start ClearMailStruct
+ClearMailStruct: @ 8097CB4
push {r4-r6,lr}
adds r3, r0, 0
ldr r0, _08097D04 @ =0x0000ffff
@@ -79,10 +79,10 @@ _08097CEE:
bx r0
.align 2, 0
_08097D04: .4byte 0x0000ffff
- thumb_func_end sub_8097CB4
+ thumb_func_end ClearMailStruct
- thumb_func_start sub_8097D08
-sub_8097D08: @ 8097D08
+ thumb_func_start MonHasMail
+MonHasMail: @ 8097D08
push {r4,lr}
adds r4, r0, 0
movs r1, 0xC
@@ -106,7 +106,7 @@ _08097D32:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8097D08
+ thumb_func_end MonHasMail
thumb_func_start sub_8097D38
sub_8097D38: @ 8097D38
@@ -448,7 +448,7 @@ TakeMailFromMon: @ 8097FB8
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
- bl sub_8097D08
+ bl MonHasMail
lsls r0, 24
cmp r0, 0
beq _08098008
diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s
index 4008551eb..45c10f1ad 100644
--- a/asm/mailbox_pc.s
+++ b/asm/mailbox_pc.s
@@ -85,7 +85,7 @@ sub_810EBE0: @ 810EBE0
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -216,7 +216,7 @@ _0810ECCE:
strb r4, [r5, 0x11]
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
strb r0, [r5, 0x12]
strb r4, [r5, 0x13]
ldrb r0, [r5, 0x16]
diff --git a/asm/main.s b/asm/main.s
index b6151caf4..50aabd51d 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -36,7 +36,7 @@ AgbMain: @ 80003A4
movs r1, 0xE0
lsls r1, 9
bl InitHeap
- bl sub_80F79C8
+ bl SetDefaultFontsPointer
ldr r0, _08000468 @ =gUnknown_3003530
movs r4, 0
strb r4, [r0]
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 0d36b574f..06c979e19 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -150,7 +150,7 @@ sub_800C318: @ 800C318
bl ChangeBgY
ldr r0, _0800C4B8 @ =gUnknown_8234618
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
ldr r0, _0800C4BC @ =gUnknown_8234648
movs r1, 0
movs r2, 0x20
@@ -693,11 +693,11 @@ _0800C870:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
_0800C8D8:
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0800C994
.align 2, 0
_0800C8E0: .4byte gUnknown_8234688
@@ -764,13 +764,13 @@ _0800C8F0:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x3
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0800C994:
ldr r0, _0800C9C4 @ =gUnknown_3005090
mov r2, r8
@@ -980,7 +980,7 @@ _0800CB2E:
ldr r1, _0800CB44 @ =gUnknown_2031DE0
movs r0, 0
strb r0, [r1]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
bl sub_812EB2C
@@ -996,7 +996,7 @@ _0800CB48:
strh r1, [r0]
ldr r0, _0800CB6C @ =gUnknown_2031DE0
strb r2, [r0]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r6, 0
bl sub_8110F14
b _0800CB84
@@ -1008,7 +1008,7 @@ _0800CB70:
ldr r0, _0800CB8C @ =sub_81422AC
bl SetMainCallback2
bl sub_812B478
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r6, 0
bl DestroyTask
_0800CB84:
@@ -1360,7 +1360,7 @@ sub_800CDF8: @ 800CDF8
bl PutWindowTilemap
movs r0, 0x4
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _0800CE50 @ =0x000013dd
movs r0, 0x40
bl SetGpuReg
@@ -1495,7 +1495,7 @@ sub_800CF3C: @ 800CF3C
push {r4-r6,lr}
sub sp, 0x2C
ldr r0, _0800CF60 @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1563,7 +1563,7 @@ sub_800CFC4: @ 800CFC4
_0800CFCE:
lsls r0, r4, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0800CFE2
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index a914ff59d..905dd2004 100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -11,7 +11,7 @@ sub_8098110: @ 8098110
adds r6, r0, 0
movs r0, 0x80
lsls r0, 7
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -173,7 +173,7 @@ _0809824C:
bl sub_8098400
ldrb r0, [r4, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
strh r0, [r4, 0x8]
movs r0, 0
@@ -196,7 +196,7 @@ _0809827E:
bl rbox_fill_rectangle
ldrb r0, [r4, 0x10]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
strh r0, [r4, 0x14]
_080982A0:
@@ -214,7 +214,7 @@ _080982A6:
cmp r0, 0
beq _080982C6
ldrb r0, [r4, 0x10]
- bl sub_8003E3C
+ bl RemoveWindow
strh r5, [r4, 0x12]
movs r0, 0x1
strh r0, [r4, 0x16]
@@ -367,7 +367,7 @@ _080983C6:
bl sub_8098400
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r5, 0
add sp, 0x8
pop {r4-r6}
@@ -429,7 +429,7 @@ _08098434:
movs r1, 0x2
add r2, sp, 0xC
adds r3, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0x28
pop {r4-r6}
pop {r0}
diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s
index 2611298d4..40dad1826 100644
--- a/asm/map_preview_screen.s
+++ b/asm/map_preview_screen.s
@@ -188,7 +188,7 @@ sub_80F8234: @ 80F8234
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, _080F8254 @ =gUnknown_203ABED
ldrb r0, [r0]
cmp r0, 0
@@ -426,7 +426,7 @@ _080F8422:
_080F842E:
ldrb r0, [r4, 0x16]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _080F84EA
_080F8438:
bl IsDma3ManagerBusyWithBgCopy
@@ -601,7 +601,7 @@ _080F8582:
cmp r0, 0
bne _080F85A4
adds r0, r2, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080F85B4
@@ -631,7 +631,7 @@ sub_80F85BC: @ 80F85BC
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080F85D8
@@ -646,7 +646,7 @@ _080F85D8:
_080F85DC:
strb r0, [r1]
adds r0, r4, 0
- bl sub_806E680
+ bl FlagSet
pop {r4}
pop {r0}
bx r0
diff --git a/asm/menews_jisan.s b/asm/menews_jisan.s
index 4b3849cea..515143493 100644
--- a/asm/menews_jisan.s
+++ b/asm/menews_jisan.s
@@ -60,7 +60,7 @@ sub_8146C88: @ 8146C88
strb r1, [r0]
strb r1, [r0, 0x1]
ldr r0, _08146CA0 @ =0x00004028
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/menu.s b/asm/menu.s
index dbd43ea94..4f4478d73 100644
--- a/asm/menu.s
+++ b/asm/menu.s
@@ -29,7 +29,7 @@ sub_810EDC4: @ 810EDC4
bne _0810EDFA
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810EDFA:
pop {r4,r5}
pop {r0}
@@ -67,7 +67,7 @@ sub_810EE0C: @ 810EE0C
bne _0810EE4A
adds r0, r6, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810EE4A:
pop {r4-r6}
pop {r0}
@@ -576,7 +576,7 @@ sub_810F260: @ 810F260
bne _0810F28E
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F28E:
pop {r4,r5}
pop {r0}
@@ -651,7 +651,7 @@ SetWindowBorderStyle: @ 810F2E8
bne _0810F31E
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F31E:
pop {r4,r5}
pop {r0}
@@ -689,7 +689,7 @@ sub_810F330: @ 810F330
bne _0810F36E
adds r0, r6, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F36E:
pop {r4-r6}
pop {r0}
@@ -886,7 +886,7 @@ sub_810F4D8: @ 810F4D8
bne _0810F506
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F506:
pop {r4,r5}
pop {r0}
@@ -1046,7 +1046,7 @@ sub_810F5E8: @ 810F5E8
beq _0810F63E
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F63E:
add sp, 0xC
pop {r4-r6}
@@ -1137,7 +1137,7 @@ _0810F6CE:
beq _0810F6F6
ldrb r0, [r6]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F6F6:
add sp, 0x18
pop {r3}
@@ -1155,7 +1155,7 @@ sub_810F704: @ 810F704
cmp r0, 0xFF
beq _0810F714
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F714:
pop {r0}
bx r0
@@ -1174,7 +1174,7 @@ sub_810F71C: @ 810F71C
bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0810F734:
pop {r4}
pop {r0}
@@ -1196,9 +1196,9 @@ sub_810F740: @ 810F740
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
_0810F768:
@@ -1326,7 +1326,7 @@ sub_810F818: @ 810F818
movs r1, 0x1
str r2, [sp, 0xC]
str r3, [sp, 0x10]
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1365,13 +1365,13 @@ RedrawMenuCursor: @ 810F874
ldr r5, _0810F8FC @ =gUnknown_203ADE4
ldrb r0, [r5, 0x6]
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5, 0x6]
movs r1, 0x1
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
ldrb r1, [r5, 0x5]
@@ -1405,7 +1405,7 @@ RedrawMenuCursor: @ 810F874
movs r4, 0
str r4, [sp, 0x4]
str r4, [sp, 0x8]
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1496,14 +1496,14 @@ _0810F97A:
bx r1
thumb_func_end MoveMenuCursorNoWrapAround
- thumb_func_start sub_810F98C
-sub_810F98C: @ 810F98C
+ thumb_func_start GetMenuCursorPos
+GetMenuCursorPos: @ 810F98C
ldr r0, _0810F994 @ =gUnknown_203ADE4
ldrb r0, [r0, 0x2]
bx lr
.align 2, 0
_0810F994: .4byte gUnknown_203ADE4
- thumb_func_end sub_810F98C
+ thumb_func_end GetMenuCursorPos
thumb_func_start ProcessMenuInput
ProcessMenuInput: @ 810F998
@@ -1803,7 +1803,7 @@ _0810FBA0:
adds r0, r6, 0
mov r1, r10
mov r3, r9
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1812,7 +1812,7 @@ _0810FBA0:
_0810FBD0:
adds r0, r6, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -1892,7 +1892,7 @@ _0810FC30:
_0810FC68:
adds r0, r7, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -1925,7 +1925,7 @@ sub_810FC80: @ 810FC80
lsrs r5, 24
adds r0, r6, 0
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1944,8 +1944,8 @@ sub_810FC80: @ 810FC80
bx r0
thumb_func_end sub_810FC80
- thumb_func_start sub_810FCD0
-sub_810FCD0: @ 810FCD0
+ thumb_func_start AddItemMenuActionTextPrinters
+AddItemMenuActionTextPrinters: @ 810FCD0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1985,7 +1985,7 @@ sub_810FCD0: @ 810FCD0
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0x5
- bl sub_80F79D8
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -1996,7 +1996,7 @@ sub_810FCD0: @ 810FCD0
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl sub_80F79D8
+ bl GetFontAttribute
mov r3, sp
adds r1, r5, 0
ands r1, r0
@@ -2009,7 +2009,7 @@ sub_810FCD0: @ 810FCD0
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl sub_80F79D8
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -2019,7 +2019,7 @@ sub_810FCD0: @ 810FCD0
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2031,7 +2031,7 @@ sub_810FCD0: @ 810FCD0
strb r2, [r0, 0xA]
adds r0, r6, 0
movs r1, 0x3
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r0, sp
@@ -2060,7 +2060,7 @@ _0810FD9A:
mov r0, sp
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2069,7 +2069,7 @@ _0810FD9A:
_0810FDCA:
ldr r0, [sp, 0x10]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -2078,7 +2078,7 @@ _0810FDCA:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_810FCD0
+ thumb_func_end AddItemMenuActionTextPrinters
thumb_func_start sub_810FDE4
sub_810FDE4: @ 810FDE4
@@ -2105,13 +2105,13 @@ sub_810FDE4: @ 810FDE4
mov r8, r0
adds r0, r4, 0
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -2125,7 +2125,7 @@ sub_810FDE4: @ 810FDE4
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
- bl sub_810FCD0
+ bl AddItemMenuActionTextPrinters
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -2135,8 +2135,8 @@ sub_810FDE4: @ 810FDE4
bx r0
thumb_func_end sub_810FDE4
- thumb_func_start sub_810FE50
-sub_810FE50: @ 810FE50
+ thumb_func_start SetWindowTemplateFields
+SetWindowTemplateFields: @ 810FE50
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2223,7 +2223,7 @@ _0810FEF4: .4byte 0xffff00ff
_0810FEF8: .4byte 0xff00ffff
_0810FEFC: .4byte 0x00ffffff
_0810FF00: .4byte 0x0000ffff
- thumb_func_end sub_810FE50
+ thumb_func_end SetWindowTemplateFields
thumb_func_start sub_810FF04
sub_810FF04: @ 810FF04
@@ -2257,7 +2257,7 @@ sub_810FF04: @ 810FF04
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -2322,7 +2322,7 @@ sub_810FF60: @ 810FF60
strb r6, [r0, 0x5]
adds r0, r6, 0
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
add r1, sp, 0xC
add r0, r8
strb r0, [r1, 0x6]
@@ -2337,7 +2337,7 @@ sub_810FF60: @ 810FF60
strb r0, [r1, 0x9]
adds r0, r6, 0
movs r1, 0x5
- bl sub_80F79D8
+ bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -2348,7 +2348,7 @@ sub_810FF60: @ 810FF60
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl sub_80F79D8
+ bl GetFontAttribute
add r3, sp, 0xC
adds r1, r5, 0
ands r1, r0
@@ -2361,7 +2361,7 @@ sub_810FF60: @ 810FF60
strb r0, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl sub_80F79D8
+ bl GetFontAttribute
add r3, sp, 0xC
lsls r0, 4
ldrb r2, [r3, 0xD]
@@ -2371,7 +2371,7 @@ sub_810FF60: @ 810FF60
strb r1, [r3, 0xD]
adds r0, r6, 0
movs r1, 0x4
- bl sub_80F79D8
+ bl GetFontAttribute
add r1, sp, 0xC
ands r5, r0
ldrb r0, [r1, 0xC]
@@ -2380,21 +2380,21 @@ sub_810FF60: @ 810FF60
strb r4, [r1, 0xC]
adds r0, r6, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x3
- bl sub_80F79D8
+ bl GetFontAttribute
add r1, sp, 0xC
strb r0, [r1, 0xB]
adds r0, r1, 0
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
adds r0, r6, 0
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
add r1, sp, 0xC
ldrb r1, [r1, 0xB]
adds r0, r1
@@ -2471,7 +2471,7 @@ sub_81100E8: @ 81100E8
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -2508,13 +2508,13 @@ sub_8110104: @ 8110104
str r5, [sp, 0x18]
mov r0, r9
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
mov r0, r9
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
movs r1, 0x10
@@ -2561,7 +2561,7 @@ _0811017C:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r9
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2577,7 +2577,7 @@ _081101B8:
bcc _08110164
ldr r0, [sp, 0xC]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -2617,7 +2617,7 @@ sub_81101D8: @ 81101D8
str r5, [sp, 0x18]
mov r0, r10
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -2658,7 +2658,7 @@ _08110230:
str r0, [sp, 0x8]
ldr r0, [sp, 0xC]
mov r1, r10
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2674,7 +2674,7 @@ _08110272:
bcc _0811021C
ldr r0, [sp, 0xC]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -2829,7 +2829,7 @@ sub_811037C: @ 811037C
ldr r5, _08110448 @ =gUnknown_203ADE4
ldrb r0, [r5, 0x6]
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
mov r9, r0
mov r1, r9
lsls r1, 24
@@ -2837,7 +2837,7 @@ sub_811037C: @ 811037C
mov r9, r1
ldrb r0, [r5, 0x6]
movs r1, 0x1
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -2899,7 +2899,7 @@ sub_811037C: @ 811037C
str r3, [sp, 0x4]
str r3, [sp, 0x8]
adds r3, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -3145,7 +3145,7 @@ _08110600:
ands r0, r1
cmp r0, 0
bne _08110614
- bl sub_80BF630
+ bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3162,7 +3162,7 @@ _08110620:
ands r0, r1
cmp r0, 0
bne _08110636
- bl sub_80BF630
+ bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -3233,7 +3233,7 @@ _081106A4:
ands r0, r1
cmp r0, 0
bne _081106B8
- bl sub_80BF630
+ bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3248,7 +3248,7 @@ _081106BE:
ands r0, r1
cmp r0, 0
bne _081106D4
- bl sub_80BF630
+ bl GetLRKeysState
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
diff --git a/asm/menu2.s b/asm/menu2.s
index 4a5b1569b..1108eacc6 100644
--- a/asm/menu2.s
+++ b/asm/menu2.s
@@ -31,12 +31,12 @@ sub_812E51C: @ 812E51C
strb r0, [r1, 0x9]
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x3
- bl sub_80F79D8
+ bl GetFontAttribute
mov r1, sp
strb r0, [r1, 0xB]
mov r3, sp
@@ -67,7 +67,7 @@ sub_812E51C: @ 812E51C
mov r0, sp
adds r1, r5, 0
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -135,7 +135,7 @@ sub_812E5A4: @ 812E5A4
lsrs r1, 24
mov r0, sp
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -191,7 +191,7 @@ sub_812E62C: @ 812E62C
strb r0, [r2, 0xC]
adds r0, r6, 0
movs r1, 0x5
- bl sub_80F79D8
+ bl GetFontAttribute
mov r3, sp
lsls r0, 4
ldrb r2, [r3, 0xC]
@@ -202,7 +202,7 @@ sub_812E62C: @ 812E62C
strb r1, [r3, 0xC]
adds r0, r6, 0
movs r1, 0x6
- bl sub_80F79D8
+ bl GetFontAttribute
mov r2, sp
adds r1, r4, 0
ands r1, r0
@@ -212,7 +212,7 @@ sub_812E62C: @ 812E62C
strb r5, [r2, 0xD]
adds r0, r6, 0
movs r1, 0x7
- bl sub_80F79D8
+ bl GetFontAttribute
mov r2, sp
lsls r0, 4
ldrb r1, [r2, 0xD]
@@ -222,7 +222,7 @@ sub_812E62C: @ 812E62C
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl sub_8002CF4
+ bl AddTextPrinter
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -275,7 +275,7 @@ _0812E70A:
mov r0, r8
movs r1, 0x2
adds r2, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
b _0812E75C
.align 2, 0
_0812E734: .4byte gUnknown_300500C
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index 766c07491..830fabc3f 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80BF474
-sub_80BF474: @ 80BF474
+ thumb_func_start DisplayMessageAndContinueTask
+DisplayMessageAndContinueTask: @ 80BF474
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -57,7 +57,7 @@ _080BF4B8:
adds r1, r7, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
ldr r1, _080BF50C @ =gUnknown_20399CC
ldr r0, [sp, 0x34]
str r0, [r1]
@@ -67,7 +67,7 @@ _080BF4B8:
add r0, r8
lsls r0, 3
adds r0, r1
- ldr r1, _080BF514 @ =sub_80BF534
+ ldr r1, _080BF514 @ =Task_ContinueTaskAfterMessagePrints
str r1, [r0]
add sp, 0x10
pop {r3}
@@ -81,8 +81,8 @@ _080BF504: .4byte gUnknown_2021D18
_080BF508: .4byte gUnknown_3003E50
_080BF50C: .4byte gUnknown_20399CC
_080BF510: .4byte gUnknown_3005090
-_080BF514: .4byte sub_80BF534
- thumb_func_end sub_80BF474
+_080BF514: .4byte Task_ContinueTaskAfterMessagePrints
+ thumb_func_end DisplayMessageAndContinueTask
thumb_func_start sub_80BF518
sub_80BF518: @ 80BF518
@@ -100,8 +100,8 @@ sub_80BF518: @ 80BF518
bx r1
thumb_func_end sub_80BF518
- thumb_func_start sub_80BF534
-sub_80BF534: @ 80BF534
+ thumb_func_start Task_ContinueTaskAfterMessagePrints
+Task_ContinueTaskAfterMessagePrints: @ 80BF534
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -122,7 +122,7 @@ _080BF552:
.align 2, 0
_080BF558: .4byte gUnknown_20399D0
_080BF55C: .4byte gUnknown_20399CC
- thumb_func_end sub_80BF534
+ thumb_func_end Task_ContinueTaskAfterMessagePrints
thumb_func_start sub_80BF560
sub_80BF560: @ 80BF560
@@ -230,8 +230,8 @@ _080BF628: .4byte gUnknown_3005090
_080BF62C: .4byte sub_80BF560
thumb_func_end sub_80BF5D0
- thumb_func_start sub_80BF630
-sub_80BF630: @ 80BF630
+ thumb_func_start GetLRKeysState
+GetLRKeysState: @ 80BF630
push {lr}
ldr r0, _080BF650 @ =gUnknown_300500C
ldr r0, [r0]
@@ -263,7 +263,7 @@ _080BF666:
_080BF668:
pop {r1}
bx r1
- thumb_func_end sub_80BF630
+ thumb_func_end GetLRKeysState
thumb_func_start sub_80BF66C
sub_80BF66C: @ 80BF66C
@@ -314,7 +314,7 @@ sub_80BF6A8: @ 80BF6A8
lsls r0, 1
cmp r1, r0
beq _080BF6C8
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _080BF6D0
_080BF6C8:
@@ -337,7 +337,7 @@ itemid_80BF6D8_mail_related: @ 80BF6D8
bl sub_805642C
cmp r0, 0x1
beq _080BF6EE
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _080BF700
_080BF6EE:
diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s
index dc4c567ac..d92dbbcaf 100644
--- a/asm/metatile_behavior.s
+++ b/asm/metatile_behavior.s
@@ -997,8 +997,8 @@ _08059FF0:
bx r1
thumb_func_end sub_8059FE0
- thumb_func_start sub_8059FF4
-sub_8059FF4: @ 8059FF4
+ thumb_func_start MetatileBehavior_IsThinIce
+MetatileBehavior_IsThinIce: @ 8059FF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1011,10 +1011,10 @@ _0805A002:
_0805A004:
pop {r1}
bx r1
- thumb_func_end sub_8059FF4
+ thumb_func_end MetatileBehavior_IsThinIce
- thumb_func_start sub_805A008
-sub_805A008: @ 805A008
+ thumb_func_start MetatileBehavior_IsCrackedIce
+MetatileBehavior_IsCrackedIce: @ 805A008
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1027,7 +1027,7 @@ _0805A016:
_0805A018:
pop {r1}
bx r1
- thumb_func_end sub_805A008
+ thumb_func_end MetatileBehavior_IsCrackedIce
thumb_func_start sub_805A01C
sub_805A01C: @ 805A01C
@@ -1068,8 +1068,8 @@ _0805A04C:
bx r1
thumb_func_end sub_805A03C
- thumb_func_start sub_805A050
-sub_805A050: @ 805A050
+ thumb_func_start MetatileBehavior_IsSurfableAndNotWaterfall
+MetatileBehavior_IsSurfableAndNotWaterfall: @ 805A050
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1091,7 +1091,7 @@ _0805A074:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_805A050
+ thumb_func_end MetatileBehavior_IsSurfableAndNotWaterfall
thumb_func_start sub_805A07C
sub_805A07C: @ 805A07C
diff --git a/asm/mevent.s b/asm/mevent.s
index b4735a4c8..43540662c 100644
--- a/asm/mevent.s
+++ b/asm/mevent.s
@@ -1495,7 +1495,7 @@ sub_8144144: @ 8144144
lsls r0, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1784,7 +1784,7 @@ _0814435C:
ldr r1, [r0]
adds r1, 0xA
adds r0, r5, 0
- bl sub_805490C
+ bl CopyUnalignedWord
mov r2, r8
ldr r1, [r2]
adds r0, r6, 0
diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s
index d4e7f116c..1039e206b 100644
--- a/asm/mevent_8145654.s
+++ b/asm/mevent_8145654.s
@@ -459,19 +459,19 @@ _081459F2:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBC
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r4]
movs r1, 0xBB
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
b _08145A7A
.align 2, 0
_08145A2C: .4byte gUnknown_203F3C8
@@ -928,7 +928,7 @@ _08145D70:
add r4, r9
movs r0, 0x3
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1125,7 +1125,7 @@ _08145F38:
adds r4, 0x10
movs r0, 0x3
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r2, r0, 24
ldr r0, [r7]
@@ -1244,7 +1244,7 @@ _08146038:
mov r1, r9
lsrs r0, r1, 24
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -2072,13 +2072,13 @@ _0814670C:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r4]
movs r2, 0xE4
lsls r2, 1
adds r0, r2
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
b _081467C4
.align 2, 0
_08146738: .4byte gUnknown_203F3CC
@@ -2511,7 +2511,7 @@ sub_8146A30: @ 8146A30
add r4, r8
movs r0, 0x3
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -2596,14 +2596,14 @@ _08146AD0:
adds r0, r3
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r6]
movs r1, 0xE5
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
diff --git a/asm/mevent_server.s b/asm/mevent_server.s
index 056d683d2..c7cdbf5e1 100644
--- a/asm/mevent_server.s
+++ b/asm/mevent_server.s
@@ -953,7 +953,7 @@ sub_8144F1C: @ 8144F1C
ldr r1, _08144F3C @ =gUnknown_8468B6C
movs r2, 0
movs r3, 0x1
- bl sub_8144FA0
+ bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
@@ -972,7 +972,7 @@ sub_8144F40: @ 8144F40
ldr r1, _08144F60 @ =gUnknown_8468BCC
movs r2, 0
movs r3, 0x1
- bl sub_8144FA0
+ bl mevent_srv_init_common
pop {r4}
pop {r0}
bx r0
@@ -1001,7 +1001,7 @@ _08144F78:
ldr r0, [r4]
ldr r1, [r0, 0x4]
strh r1, [r6]
- bl sub_8144FF8
+ bl mevent_srv_free_resources
ldr r0, [r4]
bl Free
movs r0, 0
@@ -1014,8 +1014,8 @@ _08144F98:
bx r1
thumb_func_end sub_8144F64
- thumb_func_start sub_8144FA0
-sub_8144FA0: @ 8144FA0
+ thumb_func_start mevent_srv_init_common
+mevent_srv_init_common: @ 8144FA0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1055,10 +1055,10 @@ sub_8144FA0: @ 8144FA0
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8144FA0
+ thumb_func_end mevent_srv_init_common
- thumb_func_start sub_8144FF8
-sub_8144FF8: @ 8144FF8
+ thumb_func_start mevent_srv_free_resources
+mevent_srv_free_resources: @ 8144FF8
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x18]
@@ -1072,7 +1072,7 @@ sub_8144FF8: @ 8144FF8
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8144FF8
+ thumb_func_end mevent_srv_free_resources
thumb_func_start sub_814501C
sub_814501C: @ 814501C
diff --git a/asm/money.s b/asm/money.s
index 7a635c93b..64b3fcbb9 100644
--- a/asm/money.s
+++ b/asm/money.s
@@ -193,7 +193,7 @@ _0809FE7E:
adds r0, r6, 0
movs r1, 0
adds r2, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -257,7 +257,7 @@ _0809FF14:
adds r0, r7, 0
movs r1, 0
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r3}
mov r8, r3
@@ -300,7 +300,7 @@ sub_809FF48: @ 809FF48
adds r0, r6, 0
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r6, 0
mov r1, r8
movs r2, 0
@@ -354,7 +354,7 @@ sub_809FFB8: @ 809FFB8
add r0, sp, 0x10
movs r1, 0
adds r2, r4, 0
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -396,9 +396,9 @@ sub_80A0034: @ 80A0034
bl sub_810F4D8
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 9bda01efe..d6afb7743 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -329,7 +329,7 @@ _080DAA44:
bne _080DAA6C
ldr r0, _080DAA68 @ =0x00004033
movs r1, 0x1
- bl sub_806E584
+ bl VarSet
b _080DAA70
.align 2, 0
_080DAA60: .4byte gUnknown_2021D18
diff --git a/asm/mystery_gift_menu.s b/asm/mystery_gift_menu.s
index 442531a4d..feb50d231 100644
--- a/asm/mystery_gift_menu.s
+++ b/asm/mystery_gift_menu.s
@@ -142,7 +142,7 @@ _081420D6:
bl sub_80F696C
ldr r0, _081421E8 @ =gUnknown_8466D70
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r1, 0xC0
lsls r1, 7
movs r0, 0
@@ -292,7 +292,7 @@ sub_81422FC: @ 81422FC
ldr r1, _0814233C @ =gUnknown_203F3B8
movs r0, 0
strb r0, [r1]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0
bl GetBgTilemapBuffer
bl Free
@@ -394,7 +394,7 @@ _081423B4:
_081423E8:
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl PutWindowTilemap
add sp, 0x14
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 259dbc889..0fcce8d3e 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -864,7 +864,7 @@ _0809E06C:
lsls r0, 24
lsrs r0, 24
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, [r4]
bl Free
str r5, [r4]
@@ -893,7 +893,7 @@ pokemon_transfer_to_pc_with_message: @ 809E0B4
bne _0809E104
ldr r4, _0809E0F0 @ =gUnknown_2021CD0
ldr r0, _0809E0F4 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -917,7 +917,7 @@ _0809E100: .4byte 0x00001e30
_0809E104:
ldr r4, _0809E1AC @ =gUnknown_2021CD0
ldr r0, _0809E1B0 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl GetBoxNamePtr
@@ -942,7 +942,7 @@ _0809E104:
movs r5, 0x2
_0809E144:
ldr r0, _0809E1C4 @ =0x00000834
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0809E156
@@ -980,10 +980,10 @@ _0809E156:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -2789,7 +2789,7 @@ sub_809EF54: @ 809EF54
str r2, [sp]
movs r2, 0x38
movs r3, 0x25
- bl sub_805E978
+ bl AddPseudoFieldObject
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3498,7 +3498,7 @@ sub_809F49C: @ 809F49C
str r1, [sp, 0x8]
movs r1, 0x1
movs r3, 0x1
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -3553,7 +3553,7 @@ sub_809F4F0: @ 809F4F0
movs r1, 0x1
add r2, sp, 0xC
movs r3, 0x1
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4123,7 +4123,7 @@ _0809F97A:
str r1, [sp, 0x8]
movs r1, 0x2
add r2, sp, 0xC
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -4137,7 +4137,7 @@ _0809F9AA:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4326,7 +4326,7 @@ sub_809FAE4: @ 809FAE4
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
diff --git a/asm/new_game.s b/asm/new_game.s
index 383e0f208..9e1a05a67 100644
--- a/asm/new_game.s
+++ b/asm/new_game.s
@@ -17,8 +17,8 @@ WriteUnalignedWord: @ 80548FC
bx lr
thumb_func_end WriteUnalignedWord
- thumb_func_start sub_805490C
-sub_805490C: @ 805490C
+ thumb_func_start CopyUnalignedWord
+CopyUnalignedWord: @ 805490C
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
@@ -34,10 +34,10 @@ _08054914:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805490C
+ thumb_func_end CopyUnalignedWord
- thumb_func_start sub_8054928
-sub_8054928: @ 8054928
+ thumb_func_start InitPlayerTrainerId
+InitPlayerTrainerId: @ 8054928
push {r4,lr}
bl Random
adds r4, r0, 0
@@ -56,10 +56,10 @@ sub_8054928: @ 8054928
bx r0
.align 2, 0
_08054950: .4byte gUnknown_300500C
- thumb_func_end sub_8054928
+ thumb_func_end InitPlayerTrainerId
- thumb_func_start sub_8054954
-sub_8054954: @ 8054954
+ thumb_func_start SetDefaultOptions
+SetDefaultOptions: @ 8054954
ldr r3, _080549A8 @ =gUnknown_300500C
ldr r2, [r3]
ldrb r1, [r2, 0x14]
@@ -104,7 +104,7 @@ sub_8054954: @ 8054954
bx lr
.align 2, 0
_080549A8: .4byte gUnknown_300500C
- thumb_func_end sub_8054954
+ thumb_func_end SetDefaultOptions
thumb_func_start sub_80549AC
sub_80549AC: @ 80549AC
@@ -169,7 +169,7 @@ sub_80549F8: @ 80549F8
sub_8054A18: @ 8054A18
push {lr}
bl ClearSav2
- bl sub_8054954
+ bl SetDefaultOptions
pop {r0}
bx r0
thumb_func_end sub_8054A18
@@ -180,7 +180,7 @@ sub_8054A28: @ 8054A28
ldr r1, _08054A5C @ =gUnknown_2031DB0
movs r0, 0
strb r0, [r1]
- bl sub_803DA14
+ bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl sub_81089BC
bl sub_81320AC
@@ -220,11 +220,11 @@ sub_8054A60: @ 8054A60
adds r0, r1
movs r5, 0
str r5, [r0]
- bl sub_803DA14
+ bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
bl sub_80549D4
bl ClearSav1
- bl sub_8097C84
+ bl ClearMailData
ldr r0, [r4]
strb r5, [r0, 0x9]
ldr r0, [r4]
@@ -237,7 +237,7 @@ sub_8054A60: @ 8054A60
ldr r0, [r4]
adds r0, 0xAD
strb r5, [r0]
- bl sub_8054928
+ bl InitPlayerTrainerId
bl PlayTimeCounter_Reset
bl sub_80549AC
bl sub_806E0D0
@@ -249,13 +249,13 @@ sub_8054A60: @ 8054A60
ldr r1, _08054B60 @ =0x00000bb8
bl sub_809FD70
bl sub_8054E68
- bl sub_80CD8DC
+ bl InitLinkBattleRecords
bl sub_80A0904
bl sub_80A0958
bl sub_806E190
ldr r0, _08054B64 @ =gUnknown_2024029
strb r5, [r0]
- bl sub_803DA14
+ bl ZeroPlayerPartyMons
bl sub_808C7E0
bl sub_8141C54
ldr r0, [r6]
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s
index cd54c20dd..c63066b14 100644
--- a/asm/new_menu_helpers.s
+++ b/asm/new_menu_helpers.s
@@ -691,7 +691,7 @@ _080F6C88: .4byte gUnknown_203ABE0
thumb_func_start sub_80F6C8C
sub_80F6C8C: @ 80F6C8C
push {lr}
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
thumb_func_end sub_80F6C8C
@@ -707,7 +707,7 @@ sub_80F6C98: @ 80F6C98
movs r1, 0
movs r2, 0
bl ChangeBgY
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl sub_80F6E9C
pop {r0}
bx r0
@@ -725,8 +725,8 @@ sub_80F6CBC: @ 80F6CBC
bx r1
thumb_func_end sub_80F6CBC
- thumb_func_start sub_80F6CD0
-sub_80F6CD0: @ 80F6CD0
+ thumb_func_start AddTextPrinterParametrized
+AddTextPrinterParametrized: @ 80F6CD0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -785,7 +785,7 @@ sub_80F6CD0: @ 80F6CD0
mov r0, sp
adds r1, r3, 0
adds r2, r7, 0
- bl sub_8002CF4
+ bl AddTextPrinter
lsls r0, 16
lsrs r0, 16
add sp, 0x10
@@ -796,7 +796,7 @@ sub_80F6CD0: @ 80F6CD0
bx r1
.align 2, 0
_080F6D58: .4byte gUnknown_3003E50
- thumb_func_end sub_80F6CD0
+ thumb_func_end AddTextPrinterParametrized
thumb_func_start sub_80F6D5C
sub_80F6D5C: @ 80F6D5C
@@ -832,7 +832,7 @@ sub_80F6D5C: @ 80F6D5C
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _080F6DFC
.align 2, 0
_080F6DA8: .4byte gUnknown_3003E50
@@ -853,7 +853,7 @@ _080F6DB0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x5
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _080F6DFC
.align 2, 0
_080F6DD8: .4byte gUnknown_2021D18
@@ -871,7 +871,7 @@ _080F6DDC:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_080F6DFC:
add sp, 0x10
pop {r4,r5}
@@ -910,7 +910,7 @@ sub_80F6E08: @ 80F6E08
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r4}
pop {r0}
@@ -948,7 +948,7 @@ sub_80F6E54: @ 80F6E54
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -1015,7 +1015,7 @@ sub_80F6EE4: @ 80F6EE4
bne _080F6F12
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080F6F12:
pop {r4,r5}
pop {r0}
@@ -1044,7 +1044,7 @@ sub_80F6F1C: @ 80F6F1C
bne _080F6F4A
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080F6F4A:
pop {r4,r5}
pop {r0}
@@ -1073,7 +1073,7 @@ sub_80F6F54: @ 80F6F54
bne _080F6F82
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080F6F82:
ldr r0, _080F6F98 @ =gUnknown_203ADFA
ldrb r0, [r0]
@@ -1109,7 +1109,7 @@ sub_80F6F9C: @ 80F6F9C
bne _080F6FCA
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080F6FCA:
pop {r4,r5}
pop {r0}
@@ -2129,10 +2129,10 @@ DisplayItemMessageOnField: @ 80F7808
adds r0, r5, 0
movs r1, 0
movs r3, 0xF
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -2244,7 +2244,7 @@ sub_80F78E0: @ 80F78E0
movs r1, 0
movs r2, 0x16
movs r3, 0x1
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -2281,7 +2281,7 @@ sub_80F7948: @ 80F7948
ldrb r0, [r4]
cmp r0, 0xFF
beq _080F795A
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
_080F795A:
@@ -2352,19 +2352,19 @@ sub_80F79A4: @ 80F79A4
bx r0
thumb_func_end sub_80F79A4
- thumb_func_start sub_80F79C8
-sub_80F79C8: @ 80F79C8
+ thumb_func_start SetDefaultFontsPointer
+SetDefaultFontsPointer: @ 80F79C8
push {lr}
ldr r0, _080F79D4 @ =gUnknown_841F444
- bl sub_8002C1C
+ bl SetFontsPointer
pop {r0}
bx r0
.align 2, 0
_080F79D4: .4byte gUnknown_841F444
- thumb_func_end sub_80F79C8
+ thumb_func_end SetDefaultFontsPointer
- thumb_func_start sub_80F79D8
-sub_80F79D8: @ 80F79D8
+ thumb_func_start GetFontAttribute
+GetFontAttribute: @ 80F79D8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -2477,10 +2477,10 @@ _080F7AB6:
bx r1
.align 2, 0
_080F7ABC: .4byte gUnknown_841F444
- thumb_func_end sub_80F79D8
+ thumb_func_end GetFontAttribute
- thumb_func_start sub_80F7AC0
-sub_80F7AC0: @ 80F7AC0
+ thumb_func_start GetMenuCursorDimensionByFont
+GetMenuCursorDimensionByFont: @ 80F7AC0
lsls r0, 24
lsls r1, 24
lsrs r1, 24
@@ -2492,6 +2492,6 @@ sub_80F7AC0: @ 80F7AC0
bx lr
.align 2, 0
_080F7AD4: .4byte gUnknown_841F4A4
- thumb_func_end sub_80F7AC0
+ thumb_func_end GetMenuCursorDimensionByFont
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/oak_speech.s b/asm/oak_speech.s
index afd27e764..43c27e100 100644
--- a/asm/oak_speech.s
+++ b/asm/oak_speech.s
@@ -694,7 +694,7 @@ sub_812EEB0: @ 812EEB0
ldr r0, [r4]
ldrb r0, [r0, 0x14]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r1, 0xC0
lsls r1, 6
movs r0, 0x5
@@ -810,7 +810,7 @@ _0812EF9A:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -1055,12 +1055,12 @@ _0812F1EA:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
@@ -1140,12 +1140,12 @@ _0812F292:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
@@ -1271,7 +1271,7 @@ _0812F374:
bl FillWindowPixelBuffer
ldrb r0, [r5, 0x1C]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
movs r1, 0
strh r6, [r0, 0x12]
@@ -1697,9 +1697,9 @@ sub_812F72C: @ 812F72C
bl ClearWindowTilemap
ldrb r0, [r4, 0x1C]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4, 0x1C]
- bl sub_8003E3C
+ bl RemoveWindow
strh r6, [r4, 0x1C]
movs r0, 0x1E
str r0, [sp]
@@ -1875,7 +1875,7 @@ _0812F8B8:
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812F918
.align 2, 0
_0812F8F0: .4byte gUnknown_81C5C78
@@ -1894,11 +1894,11 @@ _0812F8FC:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812F918:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812F93C @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -1952,7 +1952,7 @@ sub_812F944: @ 812F944
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812F9BC
.align 2, 0
_0812F994: .4byte gUnknown_81C5D06
@@ -1971,11 +1971,11 @@ _0812F9A0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812F9BC:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _0812F9E4 @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -2129,7 +2129,7 @@ _0812FAA0:
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812FB30
.align 2, 0
_0812FAFC: .4byte gUnknown_3005090
@@ -2151,11 +2151,11 @@ _0812FB14:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812FB30:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1D
movs r1, 0
bl PlayCry1
@@ -2203,7 +2203,7 @@ sub_812FB4C: @ 812FB4C
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812FBC4
.align 2, 0
_0812FB9C: .4byte gUnknown_81C5D4B
@@ -2222,11 +2222,11 @@ _0812FBA8:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812FBC4:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812FBE8 @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -2393,7 +2393,7 @@ _0812FCEC:
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812FD4C
.align 2, 0
_0812FD24: .4byte gUnknown_81C5DBD
@@ -2412,11 +2412,11 @@ _0812FD30:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812FD4C:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812FD70 @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -2526,7 +2526,7 @@ _0812FDF0:
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0812FE5C
.align 2, 0
_0812FE34: .4byte gUnknown_81C59D5
@@ -2545,11 +2545,11 @@ _0812FE40:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0812FE5C:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812FE80 @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -2660,7 +2660,7 @@ sub_812FE88: @ 812FE88
bl sub_812E51C
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -2679,7 +2679,7 @@ sub_812FE88: @ 812FE88
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812FFA0 @ =sub_812FFA4
str r0, [r5]
_0812FF7E:
@@ -2756,7 +2756,7 @@ sub_812FFF0: @ 812FFF0
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4, 0x1A]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
strh r0, [r4, 0x1A]
movs r0, 0
@@ -2877,7 +2877,7 @@ _081300D0:
movs r0, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _08130134
.align 2, 0
_0813010C: .4byte gUnknown_81C5DEA
@@ -2896,11 +2896,11 @@ _08130118:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_08130134:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _08130158 @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -3054,7 +3054,7 @@ sub_8130228: @ 8130228
movs r1, 0x4
adds r2, r5, 0
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0813029C
.align 2, 0
_08130278: .4byte gUnknown_203B108
@@ -3071,11 +3071,11 @@ _08130284:
movs r0, 0
movs r1, 0x4
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0813029C:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08130306
_081302A6:
movs r0, 0
@@ -3100,7 +3100,7 @@ _081302A6:
movs r1, 0x4
adds r2, r4, 0
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _081302FE
.align 2, 0
_081302DC: .4byte gUnknown_81C5E91
@@ -3117,11 +3117,11 @@ _081302E4:
movs r0, 0
movs r1, 0x4
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_081302FE:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_08130306:
ldr r0, _0813031C @ =gUnknown_3005090
lsls r1, r6, 2
@@ -3165,7 +3165,7 @@ sub_8130324: @ 8130324
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r5, 0x1A]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, _08130380 @ =gUnknown_203B108
ldr r0, [r0]
ldrb r0, [r0, 0x10]
@@ -3261,7 +3261,7 @@ _08130408:
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, _08130458 @ =gUnknown_3005008
ldr r1, [r0]
ldr r0, _0813045C @ =0x00003a4c
@@ -3277,7 +3277,7 @@ _08130440:
adds r0, r6, 0
movs r1, 0x1
bl sub_8131168
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
_0813044C:
add sp, 0x8
pop {r4-r6}
@@ -3348,10 +3348,10 @@ _081304BC:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
strh r4, [r5, 0x1E]
movs r0, 0x19
strh r0, [r5, 0x6]
@@ -3473,10 +3473,10 @@ _081305BC:
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _08130600 @ =sub_8130694
str r0, [r6]
b _0813063E
@@ -3667,7 +3667,7 @@ sub_813071C: @ 813071C
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0813079E
.align 2, 0
_08130770: .4byte gUnknown_3005098
@@ -3688,11 +3688,11 @@ _08130780:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x4
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0813079E:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _081307C4 @ =gUnknown_203B108
ldr r1, [r0]
movs r0, 0x1
@@ -3820,10 +3820,10 @@ sub_8130858: @ 8130858
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1E
strh r0, [r5, 0xE]
ldr r0, _081308CC @ =sub_81308D0
@@ -4288,7 +4288,7 @@ sub_8130C20: @ 8130C20
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_8044D80
ldr r5, _08130C58 @ =gUnknown_203B108
ldr r0, [r5]
@@ -4300,7 +4300,7 @@ sub_8130C20: @ 8130C20
subs r0, 0x2
ands r0, r1
strb r0, [r2]
- ldr r0, _08130C60 @ =sub_8056644
+ ldr r0, _08130C60 @ =CB2_NewGame
bl SetMainCallback2
adds r0, r4, 0
bl DestroyTask
@@ -4310,7 +4310,7 @@ sub_8130C20: @ 8130C20
.align 2, 0
_08130C58: .4byte gUnknown_203B108
_08130C5C: .4byte gUnknown_3003E50
-_08130C60: .4byte sub_8056644
+_08130C60: .4byte CB2_NewGame
thumb_func_end sub_8130C20
thumb_func_start sub_8130C64
@@ -4453,7 +4453,7 @@ _08130D78:
bl SetGpuReg
b _08130F10
_08130DB2:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_80F6C6C
bl sub_80F6C98
ldr r0, _08130DCC @ =gUnknown_8460568
@@ -4631,7 +4631,7 @@ sub_8130F2C: @ 8130F2C
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1D
- bl sub_800EC8C
+ bl DecompressPicFromTable
ldr r0, _08130FA4 @ =gUnknown_82373F4
bl sub_800F078
movs r0, 0x1D
@@ -5571,7 +5571,7 @@ sub_8131660: @ 8131660
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r0, r8
cmp r0, 0
bne _081316F4
@@ -5610,7 +5610,7 @@ _081316FA:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
lsls r4, 24
lsrs r4, 24
cmp r4, 0x3
@@ -5628,7 +5628,7 @@ _081316FA:
bl sub_810F7D8
ldrb r0, [r7, 0x1A]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3}
mov r8, r3
diff --git a/asm/option_menu.s b/asm/option_menu.s
index bf3479a27..c405fcaa6 100644
--- a/asm/option_menu.s
+++ b/asm/option_menu.s
@@ -348,7 +348,7 @@ _08088556:
bl ChangeBgY
ldr r0, _0808867C @ =gUnknown_83CC2B8
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0x50
movs r1, 0xC1
bl SetGpuReg
@@ -414,7 +414,7 @@ sub_8088680: @ 8088680
bl PutWindowTilemap
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -810,7 +810,7 @@ sub_80889A8: @ 80889A8
mov r8, r0
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
@@ -820,7 +820,7 @@ sub_80889A8: @ 80889A8
lsrs r7, r0, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
movs r1, 0x46
@@ -946,7 +946,7 @@ _08088ADE:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x30
pop {r3}
mov r8, r3
@@ -973,7 +973,7 @@ sub_8088B00: @ 8088B00
ldr r0, _08088BC4 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
bl SetMainCallback2
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r3, _08088BC8 @ =gUnknown_300500C
ldr r5, [r3]
ldr r4, _08088BCC @ =gUnknown_2039620
@@ -1073,12 +1073,12 @@ sub_8088BD0: @ 8088BD0
str r0, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r0}
bx r0
@@ -1268,7 +1268,7 @@ sub_8088D8C: @ 8088D8C
_08088D9A:
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r1, r4, 0
muls r1, r0
adds r1, 0x2
@@ -1287,7 +1287,7 @@ _08088D9A:
movs r0, 0x1
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1309,7 +1309,7 @@ sub_8088DE0: @ 8088DE0
lsrs r4, 16
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
subs r1, r0, 0x1
diff --git a/asm/overworld.s b/asm/overworld.s
index 3a2a1d200..908794f94 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -95,7 +95,7 @@ sub_8054C70: @ 8054C70
ldr r4, _08054C9C @ =gUnknown_826D29E
_08054C78:
ldrh r0, [r4]
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08054C8A
@@ -121,27 +121,27 @@ sub_8054CA0: @ 8054CA0
bl sub_80559E4
movs r0, 0x83
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054CEC @ =0x0000405e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054CF0 @ =0x00000802
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054CF4 @ =0x0000406e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054CF8 @ =0x00000805
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054CFC @ =0x00000806
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D00 @ =0x00000808
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D04 @ =0x0000404d
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -160,27 +160,27 @@ sub_8054D08: @ 8054D08
bl sub_80559E4
movs r0, 0x83
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D54 @ =0x0000405e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054D58 @ =0x00000802
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D5C @ =0x0000406e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054D60 @ =0x00000805
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D64 @ =0x00000806
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D68 @ =0x00000808
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054D6C @ =0x0000404d
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -199,27 +199,27 @@ sub_8054D70: @ 8054D70
bl sub_80559E4
movs r0, 0x83
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054DBC @ =0x0000405e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054DC0 @ =0x00000802
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054DC4 @ =0x0000406e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054DC8 @ =0x00000805
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054DCC @ =0x00000806
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054DD0 @ =0x00000808
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054DD4 @ =0x0000404d
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -238,27 +238,27 @@ sub_8054DD8: @ 8054DD8
bl sub_80559E4
movs r0, 0x83
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E24 @ =0x0000405e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054E28 @ =0x00000802
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E2C @ =0x0000406e
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08054E30 @ =0x00000805
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E34 @ =0x00000806
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E38 @ =0x00000808
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E3C @ =0x0000404d
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -276,13 +276,13 @@ sub_8054E40: @ 8054E40
push {lr}
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08054E64 @ =0x0000406e
movs r1, 0
- bl sub_806E584
+ bl VarSet
bl sub_805610C
- bl sub_8141DAC
- bl sub_8141DD4
+ bl UpdateLocationHistoryForRoamer
+ bl RoamerMoveToOtherLocationSet
pop {r0}
bx r0
.align 2, 0
@@ -1135,7 +1135,7 @@ sub_805546C: @ 805546C
sub sp, 0x4
lsls r0, 24
lsrs r0, 24
- bl sub_80BFCB0
+ bl GetHealLocationPointer
adds r4, r0, 0
cmp r4, 0
beq _0805549A
@@ -1191,7 +1191,7 @@ sub_80554CC: @ 80554CC
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
- bl sub_80BFCB0
+ bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _08055500
@@ -1522,7 +1522,7 @@ sub_8055738: @ 8055738
sub sp, 0x8
lsls r0, 24
lsrs r0, 24
- bl sub_80BFCB0
+ bl GetHealLocationPointer
adds r5, r0, 0
cmp r5, 0
beq _0805576C
@@ -1733,8 +1733,8 @@ _080558D4:
cmp r4, 0xC
ble _080558D4
bl sub_806FFB0
- bl sub_8141DAC
- bl sub_8141E28
+ bl UpdateLocationHistoryForRoamer
+ bl RoamerMove
bl sub_8110920
bl sub_807B1A4
bl sub_806E918
@@ -1789,14 +1789,14 @@ sub_8055920: @ 8055920
cmp r4, 0
beq _08055974
ldr r0, _080559A4 @ =0x00000806
- bl sub_806E6A8
+ bl FlagClear
_08055974:
bl sub_8055CB8
bl sub_8055E84
bl mapheader_run_script_with_tag_x3
bl sub_815D8F8
- bl sub_8141DAC
- bl sub_8141DD4
+ bl UpdateLocationHistoryForRoamer
+ bl RoamerMoveToOtherLocationSet
bl sub_8110920
bl sub_80589D4
pop {r4}
@@ -1964,7 +1964,7 @@ sub_8055ACC: @ 8055ACC
cmp r4, 0x8
beq _08055AE8
ldr r0, _08055AF0 @ =0x00000802
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _08055B30
@@ -2057,7 +2057,7 @@ sub_8055B74: @ 8055B74
lsls r3, 24
lsrs r5, r3, 24
ldr r0, _08055BD4 @ =0x00000802
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08055B94
@@ -2232,7 +2232,7 @@ _08055CC8: .4byte gUnknown_2036DFC
_08055CCC: .4byte gUnknown_3005008
_08055CD0:
ldr r0, _08055CE8 @ =0x00000806
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08055CF0
@@ -2260,8 +2260,8 @@ _08055D00: .4byte gUnknown_3005008
_08055D04: .4byte gUnknown_83C68E0
thumb_func_end sub_8055CB8
- thumb_func_start sub_8055D08
-sub_8055D08: @ 8055D08
+ thumb_func_start Overworld_SetFlashLevel
+Overworld_SetFlashLevel: @ 8055D08
push {lr}
adds r1, r0, 0
cmp r1, 0
@@ -2282,10 +2282,10 @@ _08055D1A:
.align 2, 0
_08055D28: .4byte gUnknown_83C68E0
_08055D2C: .4byte gUnknown_3005008
- thumb_func_end sub_8055D08
+ thumb_func_end Overworld_SetFlashLevel
- thumb_func_start sub_8055D30
-sub_8055D30: @ 8055D30
+ thumb_func_start sav1_get_flash_used_on_map
+sav1_get_flash_used_on_map: @ 8055D30
ldr r0, _08055D3C @ =gUnknown_3005008
ldr r0, [r0]
adds r0, 0x30
@@ -2293,7 +2293,7 @@ sub_8055D30: @ 8055D30
bx lr
.align 2, 0
_08055D3C: .4byte gUnknown_3005008
- thumb_func_end sub_8055D30
+ thumb_func_end sav1_get_flash_used_on_map
thumb_func_start sub_8055D40
sub_8055D40: @ 8055D40
@@ -2500,7 +2500,7 @@ _08055EA8:
cmp r0, 0x2
beq _08055F14
ldr r0, _08055F04 @ =0x00004001
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2618,7 +2618,7 @@ sub_8055F88: @ 8055F88
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08055FC0 @ =0x00004001
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3439,8 +3439,8 @@ sub_80565E0: @ 80565E0
_080565E8: .4byte gUnknown_30030F0
thumb_func_end sub_80565E0
- thumb_func_start sub_80565EC
-sub_80565EC: @ 80565EC
+ thumb_func_start map_post_load_hook_exec
+map_post_load_hook_exec: @ 80565EC
push {r4,lr}
ldr r4, _08056604 @ =gUnknown_3005024
ldr r0, [r4]
@@ -3485,10 +3485,10 @@ _08056638:
bx r1
.align 2, 0
_08056640: .4byte gUnknown_3005020
- thumb_func_end sub_80565EC
+ thumb_func_end map_post_load_hook_exec
- thumb_func_start sub_8056644
-sub_8056644: @ 8056644
+ thumb_func_start CB2_NewGame
+CB2_NewGame: @ 8056644
push {lr}
bl sub_80569BC
bl StopMapMusic
@@ -3520,10 +3520,10 @@ _08056694: .4byte gUnknown_3005024
_08056698: .4byte gUnknown_3003528
_0805669C: .4byte sub_8056534
_080566A0: .4byte sub_80565B4
- thumb_func_end sub_8056644
+ thumb_func_end CB2_NewGame
- thumb_func_start sub_80566A4
-sub_80566A4: @ 80566A4
+ thumb_func_start c2_whiteout
+c2_whiteout: @ 80566A4
push {lr}
sub sp, 0x4
ldr r1, _08056708 @ =gUnknown_30030F0
@@ -3569,7 +3569,7 @@ _0805670C: .4byte gUnknown_3005020
_08056710: .4byte sub_807F5F0
_08056714: .4byte sub_8056534
_08056718: .4byte sub_80565B4
- thumb_func_end sub_80566A4
+ thumb_func_end c2_whiteout
thumb_func_start sub_805671C
sub_805671C: @ 805671C
@@ -3899,13 +3899,13 @@ _080569CE:
movs r0, 0xC5
bl EnableInterrupts
movs r0, 0x2
- bl sub_8000B94
+ bl DisableInterrupts
b _080569F4
.align 2, 0
_080569E4: .4byte gUnknown_3003F3C
_080569E8:
movs r0, 0x2
- bl sub_8000B94
+ bl DisableInterrupts
movs r0, 0x1
bl EnableInterrupts
_080569F4:
@@ -3944,7 +3944,7 @@ sub_8056A14: @ 8056A14
thumb_func_start sub_8056A34
sub_8056A34: @ 8056A34
push {lr}
- bl sub_8055D30
+ bl sav1_get_flash_used_on_map
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4066,7 +4066,7 @@ _08056B3C:
.align 2, 0
_08056B54: .4byte gUnknown_3003F3C
_08056B58:
- bl sub_80565EC
+ bl map_post_load_hook_exec
lsls r0, 24
cmp r0, 0
beq _08056B6E
@@ -4143,7 +4143,7 @@ _08056BFA:
movs r0, 0x1
b _08056CD2
_08056BFE:
- bl sub_805709C
+ bl mli4_mapscripts_and_other
bl sub_8057114
ldr r0, _08056C1C @ =gUnknown_203ADFA
ldrb r0, [r0]
@@ -4228,7 +4228,7 @@ _08056CA8:
.align 2, 0
_08056CBC: .4byte gUnknown_2036DFC
_08056CC0:
- bl sub_80565EC
+ bl map_post_load_hook_exec
lsls r0, 24
cmp r0, 0
beq _08056CD0
@@ -4278,7 +4278,7 @@ _08056D1C:
bl sub_812B35C
b _08056D30
_08056D26:
- bl sub_80565EC
+ bl map_post_load_hook_exec
lsls r0, 24
cmp r0, 0
beq _08056D3C
@@ -4397,7 +4397,7 @@ _08056E18:
.align 2, 0
_08056E30: .4byte gUnknown_3003F3C
_08056E34:
- bl sub_80565EC
+ bl map_post_load_hook_exec
lsls r0, 24
cmp r0, 0
beq _08056E54
@@ -4676,8 +4676,8 @@ _08057094: .4byte gUnknown_300506C
_08057098: .4byte gUnknown_3005068
thumb_func_end sub_8057074
- thumb_func_start sub_805709C
-sub_805709C: @ 805709C
+ thumb_func_start mli4_mapscripts_and_other
+mli4_mapscripts_and_other: @ 805709C
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _080570F4 @ =gUnknown_300506C
@@ -4718,7 +4718,7 @@ sub_805709C: @ 805709C
_080570F4: .4byte gUnknown_300506C
_080570F8: .4byte gUnknown_3005068
_080570FC: .4byte gUnknown_300500C
- thumb_func_end sub_805709C
+ thumb_func_end mli4_mapscripts_and_other
thumb_func_start sub_8057100
sub_8057100: @ 8057100
@@ -5101,7 +5101,7 @@ _08057412:
strb r0, [r4]
b _08057428
_0805741A:
- bl sub_80565EC
+ bl map_post_load_hook_exec
lsls r0, 24
cmp r0, 0
beq _08057428
@@ -7888,7 +7888,7 @@ _080588C6:
movs r2, 0
str r2, [sp]
movs r3, 0
- bl sub_805E978
+ bl AddPseudoFieldObject
strb r0, [r4, 0x4]
ldrb r1, [r4, 0x4]
lsls r0, r1, 4
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 0a4d6faf1..30e002835 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -788,7 +788,7 @@ _0811F096:
beq _0811F0A2
bl Free
_0811F0A2:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -877,7 +877,7 @@ sub_811F124: @ 811F124
adds r0, r4, r0
ldrb r0, [r0, 0x8]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
adds r4, r0
ldrb r0, [r4, 0x8]
@@ -907,7 +907,7 @@ _0811F174:
adds r0, r4, r0
ldrb r0, [r0, 0x8]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0811F218
.align 2, 0
_0811F1A4: .4byte gUnknown_2024284
@@ -2130,14 +2130,14 @@ _0811FB04:
bx r0
thumb_func_end sub_811FAB4
- thumb_func_start sub_811FB0C
-sub_811FB0C: @ 811FB0C
+ thumb_func_start GetCursorSelectionMonId
+GetCursorSelectionMonId: @ 811FB0C
ldr r0, _0811FB14 @ =gUnknown_203B0A0
ldrb r0, [r0, 0x9]
bx lr
.align 2, 0
_0811FB14: .4byte gUnknown_203B0A0
- thumb_func_end sub_811FB0C
+ thumb_func_end GetCursorSelectionMonId
thumb_func_start sub_811FB18
sub_811FB18: @ 811FB18
@@ -2381,7 +2381,7 @@ _0811FCE8:
muls r0, r1
ldr r1, _0811FD30 @ =gUnknown_2024284
adds r0, r1
- bl sub_8043E2C
+ bl GetNumberOfRelearnableMoves
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -5002,7 +5002,7 @@ _081210A0:
ldr r0, _081210F4 @ =gUnknown_845A0D0
bl sub_8003B24
_081210A6:
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r4, 0
_081210AC:
adds r0, r4, 0
@@ -5089,7 +5089,7 @@ _0812110E:
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _08121184 @ =gUnknown_845A110
bl sub_8003CE4
lsls r0, 24
@@ -5178,7 +5178,7 @@ _08121224:
bl PutWindowTilemap
adds r0, r6, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
_08121238:
@@ -6425,7 +6425,7 @@ _08121BCC:
_08121C50:
ldrb r0, [r6, 0x8]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -6509,7 +6509,7 @@ sub_8121CE4: @ 8121CE4
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
movs r0, 0x2
@@ -6625,7 +6625,7 @@ _08121DB0:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
_08121DE8:
@@ -6735,7 +6735,7 @@ _08121E7E:
add r0, sp, 0x14
movs r1, 0x2
movs r2, 0x13
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x14]
ldr r1, [sp, 0x18]
b _08121ED2
@@ -6781,13 +6781,13 @@ _08121EFC: .4byte gUnknown_203B09C
_08121F00:
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
mov r9, r0
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -6903,7 +6903,7 @@ sub_8121FC0: @ 8121FC0
movs r0, 0x6
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r4}
pop {r0}
@@ -7005,7 +7005,7 @@ sub_8122084: @ 8122084
adds r0, r4, 0
movs r1, 0x4
adds r2, r5, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -7056,7 +7056,7 @@ sub_8122110: @ 8122110
movs r1, 0
bl sub_810F260
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
pop {r4}
@@ -7080,7 +7080,7 @@ sub_8122138: @ 8122138
beq _081221C0
bl ClearWindowTilemap
ldrb r0, [r4, 0xE]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4, 0xE]
movs r0, 0x2
@@ -7100,7 +7100,7 @@ _0812217A:
bl sub_8112F18
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4, 0xE]
@@ -8563,14 +8563,14 @@ _08122CA4:
lsrs r5, r0, 24
movs r0, 0
ldrsh r4, [r7, r0]
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
cmp r4, r0
beq _08122CCE
ldr r0, _08122D14 @ =gUnknown_203B09C
ldr r4, [r0]
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
adds r4, 0xF
@@ -8578,7 +8578,7 @@ _08122CA4:
ldrb r0, [r4]
bl sub_8122138
_08122CCE:
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r7]
@@ -11600,7 +11600,7 @@ sub_81245A4: @ 81245A4
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
- bl sub_810F98C
+ bl GetMenuCursorPos
ldr r5, _08124610 @ =gUnknown_203B09C
ldr r1, [r5]
lsls r0, 24
@@ -11632,7 +11632,7 @@ _081245D6:
lsrs r0, 24
cmp r0, 0x1
beq _081245FA
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0812461C
_081245FA:
@@ -11657,7 +11657,7 @@ _0812461C:
movs r1, 0x82
lsls r1, 4
adds r0, r4, r1
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -11792,7 +11792,7 @@ _0812475C:
ldr r1, _08124780 @ =gUnknown_203B0A0
ldr r0, _08124784 @ =c2_exit_to_overworld_2_switch
str r0, [r1]
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -11917,7 +11917,7 @@ _0812484E:
ldr r1, _0812487C @ =gUnknown_203B0A0
ldr r0, _08124880 @ =c2_exit_to_overworld_2_switch
str r0, [r1]
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -12052,7 +12052,7 @@ _08124950: .4byte gUnknown_30030F0
sub_8124954: @ 8124954
push {lr}
ldr r0, _0812496C @ =0x00000806
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12073,7 +12073,7 @@ _08124976:
thumb_func_start hm_surf_run_dp02scr
hm_surf_run_dp02scr: @ 812497C
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _08124994 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -12108,12 +12108,12 @@ sub_8124998: @ 8124998
lsrs r0, 24
cmp r0, 0x1
beq _08124A00
- bl sub_805C83C
+ bl PartyHasMonWithSurf
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08124A00
- bl sub_805C8B0
+ bl IsPlayerFacingSurfableFishableWater
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12246,10 +12246,10 @@ _08124AD4: .4byte sub_811FB28
_08124AD8: .4byte sub_80568A8
thumb_func_end sub_8124AB0
- thumb_func_start sub_8124ADC
-sub_8124ADC: @ 8124ADC
+ thumb_func_start hm2_waterfall
+hm2_waterfall: @ 8124ADC
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _08124AF4 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -12260,10 +12260,10 @@ sub_8124ADC: @ 8124ADC
bx r0
.align 2, 0
_08124AF4: .4byte gUnknown_20386E0
- thumb_func_end sub_8124ADC
+ thumb_func_end hm2_waterfall
- thumb_func_start sub_8124AF8
-sub_8124AF8: @ 8124AF8
+ thumb_func_start hm_prepare_waterfall
+hm_prepare_waterfall: @ 8124AF8
push {r4,lr}
sub sp, 0x4
mov r4, sp
@@ -12284,7 +12284,7 @@ sub_8124AF8: @ 8124AF8
lsrs r0, 24
cmp r0, 0x1
bne _08124B54
- bl sub_805C88C
+ bl IsPlayerSurfingNorth
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12293,7 +12293,7 @@ sub_8124AF8: @ 8124AF8
ldr r0, _08124B48 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _08124B4C @ =gUnknown_203B0C4
- ldr r0, _08124B50 @ =sub_8124ADC
+ ldr r0, _08124B50 @ =hm2_waterfall
str r0, [r1]
movs r0, 0x1
b _08124B56
@@ -12301,7 +12301,7 @@ sub_8124AF8: @ 8124AF8
_08124B44: .4byte gUnknown_3005024
_08124B48: .4byte hm_add_c3_launch_phase_2
_08124B4C: .4byte gUnknown_203B0C4
-_08124B50: .4byte sub_8124ADC
+_08124B50: .4byte hm2_waterfall
_08124B54:
movs r0, 0
_08124B56:
@@ -12309,7 +12309,7 @@ _08124B56:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8124AF8
+ thumb_func_end hm_prepare_waterfall
thumb_func_start sub_8124B60
sub_8124B60: @ 8124B60
@@ -12433,7 +12433,7 @@ sub_8124C1C: @ 8124C1C
movs r0, 0x4
bl Alloc
adds r4, r0, 0
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r0, 24
movs r1, 0x64
@@ -12497,7 +12497,7 @@ _08124CCC:
_08124CD2:
ldr r4, _08124D30 @ =gUnknown_203AD30
ldrh r0, [r4]
- bl sub_8126C68
+ bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
cmp r0, 0xA
@@ -12947,7 +12947,7 @@ GetMedicineItemEffectMessage: @ 8125058
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_8126C68
+ bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
subs r0, 0x3
@@ -13130,7 +13130,7 @@ UsingHPEVItemOnShedinja: @ 8125218
adds r4, r0, 0
lsls r0, r1, 16
lsrs r0, 16
- bl sub_8126C68
+ bl GetItemEffectType
lsls r0, 24
lsrs r0, 24
cmp r0, 0xD
@@ -13636,11 +13636,11 @@ _08125620:
lsrs r5, 16
mov r0, r8
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
mov r0, r8
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0
lsls r4, 24
lsrs r4, 24
@@ -13661,7 +13661,7 @@ _08125620:
mov r0, r9
mov r1, r8
adds r3, r4, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
cmp r5, 0
beq _08125680
mov r0, r10
@@ -13813,7 +13813,7 @@ sub_8125790: @ 8125790
ldr r0, [r0]
adds r0, 0xC
bl sub_8121CE4
- bl sub_810F98C
+ bl GetMenuCursorPos
ldr r1, _081257C4 @ =gUnknown_203B0A0
lsls r0, 24
lsrs r0, 24
@@ -15500,7 +15500,7 @@ sub_8126570: @ 8126570
bl sub_811E7F0
ldrb r0, [r4, 0x18]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
@@ -15531,7 +15531,7 @@ sub_81265BC: @ 81265BC
bl sub_811E93C
ldrb r0, [r4, 0x18]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
@@ -15706,7 +15706,7 @@ sub_8126704: @ 8126704
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0x1
- bl sub_80CDDA8
+ bl BeginEvolutionScene
adds r0, r5, 0
bl DestroyTask
b _08126762
@@ -16315,8 +16315,8 @@ _08126C62:
bx r1
thumb_func_end sub_8126C24
- thumb_func_start sub_8126C68
-sub_8126C68: @ 8126C68
+ thumb_func_start GetItemEffectType
+GetItemEffectType: @ 8126C68
push {r4,r5,lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -16519,7 +16519,7 @@ _08126DC2:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8126C68
+ thumb_func_end GetItemEffectType
thumb_func_start sub_8126DC8
sub_8126DC8: @ 8126DC8
@@ -16626,8 +16626,8 @@ _08126EA8: .4byte gUnknown_3005090
_08126EAC: .4byte sub_8125D88
thumb_func_end sub_8126DC8
- thumb_func_start sub_8126EB0
-sub_8126EB0: @ 8126EB0
+ thumb_func_start CB2_PartyMenuFromStartMenu
+CB2_PartyMenuFromStartMenu: @ 8126EB0
push {lr}
sub sp, 0xC
movs r0, 0
@@ -16647,7 +16647,7 @@ sub_8126EB0: @ 8126EB0
.align 2, 0
_08126ED4: .4byte sub_811FB28
_08126ED8: .4byte sub_80568A8
- thumb_func_end sub_8126EB0
+ thumb_func_end CB2_PartyMenuFromStartMenu
thumb_func_start sub_8126EDC
sub_8126EDC: @ 8126EDC
@@ -17345,7 +17345,7 @@ _0812746C:
adds r1, r4, 0
bl GiveMailToMon2
adds r0, r4, 0
- bl sub_8097CB4
+ bl ClearMailStruct
ldr r0, _0812749C @ =gUnknown_8416D4F
movs r1, 0x1
bl sub_81202F8
@@ -18166,7 +18166,7 @@ sub_8127AC0: @ 8127AC0
push {r4-r7,lr}
mov r7, r8
push {r7}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
lsls r0, 24
lsrs r5, r0, 24
bl sub_811FA20
diff --git a/asm/player_pc.s b/asm/player_pc.s
index f890fb965..d6fd03d4a 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -152,13 +152,13 @@ _080EB77E:
bl sub_80F7750
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
ldrb r1, [r7, 0x14]
@@ -177,7 +177,7 @@ _080EB77E:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x2
- bl sub_810FCD0
+ bl AddItemMenuActionTextPrinters
ldrb r0, [r7, 0x14]
str r6, [sp]
ldrb r1, [r5]
@@ -241,7 +241,7 @@ sub_80EB81C: @ 80EB81C
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
adds r0, r7, 0
@@ -260,7 +260,7 @@ _080EB878:
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
adds r2, r7, 0
@@ -467,7 +467,7 @@ _080EBA1E:
bl sub_80F7750
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -522,7 +522,7 @@ sub_80EBA8C: @ 80EBA8C
movs r1, 0x2
adds r2, r4, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r4}
pop {r0}
@@ -541,7 +541,7 @@ sub_80EBAB8: @ 80EBAB8
ands r0, r1
cmp r0, 0
beq _080EBAE8
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
cmp r0, 0
beq _080EBB64
@@ -557,7 +557,7 @@ _080EBAE8:
ands r0, r1
cmp r0, 0
beq _080EBB20
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -568,7 +568,7 @@ _080EBAE8:
_080EBB04:
bl MoveMenuCursor
ldr r4, _080EBB1C @ =gUnknown_84021DC
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 22
adds r0, r4
@@ -586,7 +586,7 @@ _080EBB20:
movs r0, 0x5
bl sub_80722CC
ldr r4, _080EBB48 @ =gUnknown_8402208
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 21
adds r4, 0x4
@@ -756,7 +756,7 @@ _080EBC7C:
ldrb r0, [r4, 0x14]
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r2, _080EBCA4 @ =gUnknown_8417774
ldr r3, _080EBCA8 @ =sub_80EB8E4
adds r0, r5, 0
@@ -866,9 +866,9 @@ sub_80EBD48: @ 80EBD48
bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4, 0x14]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl sub_80EB8BC
pop {r4,r5}
@@ -1082,7 +1082,7 @@ sub_80EBEB0: @ 80EBEB0
adds r0, r4, 0
movs r1, 0x2
mov r2, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
ldr r4, _080EBF38 @ =gUnknown_203AAC4
@@ -1317,7 +1317,7 @@ sub_80EC0D8: @ 80EC0D8
lsrs r4, 24
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1672,7 +1672,7 @@ _080EC3B4:
movs r1, 0x2
bl DisplayItemMessageOnField
adds r0, r5, 0
- bl sub_8097CB4
+ bl ClearMailStruct
bl sub_80EBE04
ldrb r0, [r4, 0x5]
subs r0, 0x1
diff --git a/asm/pokeball.s b/asm/pokeball.s
index 6f3af5906..e54e50bd1 100644
--- a/asm/pokeball.s
+++ b/asm/pokeball.s
@@ -119,7 +119,7 @@ _0804AA12:
bl GetMonData
lsls r0, 16
lsrs r0, 16
- bl sub_80EF52C
+ bl ItemIdToBallId
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -366,7 +366,7 @@ SpriteCB_TestBallThrow: @ 804ABD4
bl GetBankPokeballItemId
lsls r0, 16
lsrs r0, 16
- bl sub_80EF52C
+ bl ItemIdToBallId
adds r4, r0, 0
ldrh r0, [r7, 0x20]
lsls r0, 24
@@ -1175,7 +1175,7 @@ sub_804B268: @ 804B268
bl GetBankPokeballItemId
lsls r0, 16
lsrs r0, 16
- bl sub_80EF52C
+ bl ItemIdToBallId
adds r4, r0, 0
ldrh r0, [r6, 0x20]
lsls r0, 24
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index c59e94d66..6ed6ca7fd 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -110,7 +110,7 @@ _081025A0:
_081025AE:
ldr r0, _081026A8 @ =gUnknown_8451ECC
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl m4aSoundVSyncOn
ldr r0, _081026AC @ =sub_81024C0
bl SetVBlankCallback
@@ -380,7 +380,7 @@ _08102800:
beq _0810280A
bl Free
_0810280A:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0
bl GetBgTilemapBuffer
cmp r0, 0
@@ -1126,12 +1126,12 @@ _08102E4A:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r4, _08102EBC @ =gUnknown_203ACF0
ldr r0, [r4]
ldrb r0, [r0, 0x16]
@@ -1139,7 +1139,7 @@ _08102E4A:
ldr r0, [r4]
ldrb r0, [r0, 0x16]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x24
pop {r3,r4}
mov r8, r3
@@ -1211,7 +1211,7 @@ _08102F24:
ldr r0, [r4]
ldrb r0, [r0, 0x15]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -1549,10 +1549,10 @@ sub_810317C: @ 810317C
bl sub_8104C2C
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x24
pop {r4,r5}
pop {r0}
@@ -1878,10 +1878,10 @@ sub_810345C: @ 810345C
bl sub_8104C2C
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x24
pop {r4,r5}
pop {r0}
@@ -4166,7 +4166,7 @@ sub_81047B0: @ 81047B0
ldrb r0, [r4]
cmp r0, 0xFF
beq _081047C2
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
_081047C2:
@@ -4908,7 +4908,7 @@ sub_8104C64: @ 8104C64
adds r0, r5
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08104D72
.align 2, 0
_08104D50: .4byte gUnknown_845228C
@@ -5031,7 +5031,7 @@ _08104E42:
adds r0, r5
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08104E7E
.align 2, 0
_08104E60: .4byte gUnknown_203ACF0
@@ -5210,7 +5210,7 @@ _08104F88:
_08104FD0:
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0xFF
bl FillWindowPixelBuffer
@@ -5221,7 +5221,7 @@ _08104FD0:
_08104FEA:
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r5, _08105050 @ =gUnknown_203ACF0
ldr r1, [r5]
ldrh r0, [r1, 0x18]
@@ -6887,7 +6887,7 @@ _08105D4A:
strb r7, [r0, 0x9]
movs r1, 0xFF
movs r2, 0
- bl sub_8002CF4
+ bl AddTextPrinter
_08105D5C:
add sp, 0x10
pop {r4-r7}
@@ -7066,7 +7066,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4A
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
adds r0, 0x4B
ldrb r0, [r0]
@@ -7143,7 +7143,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4B
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
adds r0, 0x4C
ldrb r0, [r0]
@@ -7166,7 +7166,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4C
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0xFF
bl FillWindowPixelBuffer
@@ -7200,7 +7200,7 @@ _08105FF2:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
add sp, 0x8
pop {r3}
@@ -7519,7 +7519,7 @@ _08106246:
adds r0, r6
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_081062B4:
adds r4, r6, 0
cmp r4, 0x6
@@ -7580,7 +7580,7 @@ _081062B4:
adds r0, 0x55
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r7]
adds r0, 0x53
ldrb r0, [r0]
@@ -7617,7 +7617,7 @@ _081062B4:
adds r0, 0x53
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r7]
adds r0, 0x54
ldrb r0, [r0]
@@ -7665,7 +7665,7 @@ _081062B4:
adds r0, 0x54
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r7]
adds r0, 0x52
ldrb r0, [r0]
@@ -7726,7 +7726,7 @@ _08106478:
adds r0, 0x52
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r7]
adds r0, 0x56
ldrb r0, [r0]
@@ -7776,7 +7776,7 @@ _08106504:
adds r0, 0x56
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
bl dp13_810BB8C
ldr r0, _081066BC @ =gUnknown_8452368
movs r1, 0x90
@@ -8052,7 +8052,7 @@ _0810675A:
adds r0, 0x4A
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0xFF
bl FillWindowPixelBuffer
@@ -8071,7 +8071,7 @@ _0810675A:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
add sp, 0x24
pop {r3-r5}
diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s
index fc13d1386..5fab87dc7 100644
--- a/asm/pokemon_1.s
+++ b/asm/pokemon_1.s
@@ -77,8 +77,8 @@ ZeroMonData: @ 803D994
bx r0
thumb_func_end ZeroMonData
- thumb_func_start sub_803DA14
-sub_803DA14: @ 803DA14
+ thumb_func_start ZeroPlayerPartyMons
+ZeroPlayerPartyMons: @ 803DA14
push {r4,r5,lr}
ldr r4, _0803DA30 @ =gUnknown_2024284
movs r0, 0xFA
@@ -95,7 +95,7 @@ _0803DA1E:
bx r0
.align 2, 0
_0803DA30: .4byte gUnknown_2024284
- thumb_func_end sub_803DA14
+ thumb_func_end ZeroPlayerPartyMons
thumb_func_start ZeroEnemyPartyMons
ZeroEnemyPartyMons: @ 803DA34
diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s
index 311d3797f..1833e7dd3 100644
--- a/asm/pokemon_2.s
+++ b/asm/pokemon_2.s
@@ -962,7 +962,7 @@ _0803FCA4:
_0803FCAC:
adds r0, r4, 0
movs r1, 0x1
- bl sub_8044674
+ bl GetDeoxysStat
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -971,7 +971,7 @@ _0803FCAC:
_0803FCBE:
adds r0, r4, 0
movs r1, 0x2
- bl sub_8044674
+ bl GetDeoxysStat
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -980,7 +980,7 @@ _0803FCBE:
_0803FCD0:
adds r0, r4, 0
movs r1, 0x3
- bl sub_8044674
+ bl GetDeoxysStat
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -989,7 +989,7 @@ _0803FCD0:
_0803FCE2:
adds r0, r4, 0
movs r1, 0x4
- bl sub_8044674
+ bl GetDeoxysStat
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -998,7 +998,7 @@ _0803FCE2:
_0803FCF4:
adds r0, r4, 0
movs r1, 0x5
- bl sub_8044674
+ bl GetDeoxysStat
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -2861,7 +2861,7 @@ SendMonToPC: @ 8040B90
push {r7}
mov r8, r0
ldr r0, _08040C04 @ =0x00004037
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl sub_80CC79C
@@ -2898,12 +2898,12 @@ _08040BB2:
cmp r0, r5
beq _08040BF4
ldr r0, _08040C10 @ =0x00000843
- bl sub_806E6A8
+ bl FlagClear
_08040BF4:
lsls r1, r5, 16
ldr r0, _08040C04 @ =0x00004037
lsrs r1, 16
- bl sub_806E584
+ bl VarSet
movs r0, 0x1
b _08040C30
.align 2, 0
@@ -3070,8 +3070,8 @@ _08040D30: .4byte gUnknown_2024029
_08040D34: .4byte gUnknown_2024284
thumb_func_end GetMonsStateToDoubles
- thumb_func_start sub_8040D38
-sub_8040D38: @ 8040D38
+ thumb_func_start GetAbilityBySpecies
+GetAbilityBySpecies: @ 8040D38
push {lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -3105,10 +3105,10 @@ _08040D6A:
.align 2, 0
_08040D74: .4byte gUnknown_2023D6A
_08040D78: .4byte gUnknown_8254784
- thumb_func_end sub_8040D38
+ thumb_func_end GetAbilityBySpecies
- thumb_func_start sub_8040D7C
-sub_8040D7C: @ 8040D7C
+ thumb_func_start GetMonAbility
+GetMonAbility: @ 8040D7C
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0xB
@@ -3125,16 +3125,16 @@ sub_8040D7C: @ 8040D7C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8040D38
+ bl GetAbilityBySpecies
lsls r0, 24
lsrs r0, 24
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8040D7C
+ thumb_func_end GetMonAbility
- thumb_func_start sub_8040DB0
-sub_8040DB0: @ 8040DB0
+ thumb_func_start CreateSecretBaseEnemyParty
+CreateSecretBaseEnemyParty: @ 8040DB0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3285,7 +3285,7 @@ _08040EDC: .4byte gUnknown_202402C
_08040EE0: .4byte gUnknown_8250C08
_08040EE4: .4byte gUnknown_2022B4C
_08040EE8: .4byte gUnknown_20386AE
- thumb_func_end sub_8040DB0
+ thumb_func_end CreateSecretBaseEnemyParty
thumb_func_start GetSecretBaseTrainerPicIndex
GetSecretBaseTrainerPicIndex: @ 8040EEC
@@ -3828,7 +3828,7 @@ _0804110A:
ldrh r0, [r7]
ldrb r1, [r7, 0x17]
lsrs r1, 7
- bl sub_8040D38
+ bl GetAbilityBySpecies
adds r1, r7, 0
adds r1, 0x20
strb r0, [r1]
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 57cafe4be..52556f941 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -3330,8 +3330,8 @@ _08043C7A:
_08043C80: .4byte gUnknown_8252BC8
thumb_func_end sub_8043C2C
- thumb_func_start sub_8043C84
-sub_8043C84: @ 8043C84
+ thumb_func_start GetMoveRelearnerMoves
+GetMoveRelearnerMoves: @ 8043C84
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3502,10 +3502,10 @@ _08043DB4:
_08043DC8: .4byte gUnknown_825D7B4
_08043DCC: .4byte 0x0000ffff
_08043DD0: .4byte 0x000001ff
- thumb_func_end sub_8043C84
+ thumb_func_end GetMoveRelearnerMoves
- thumb_func_start sub_8043DD4
-sub_8043DD4: @ 8043DD4
+ thumb_func_start GetLevelUpMovesBySpecies
+GetLevelUpMovesBySpecies: @ 8043DD4
push {r4-r7,lr}
adds r6, r1, 0
lsls r0, 16
@@ -3550,10 +3550,10 @@ _08043E18:
_08043E20: .4byte gUnknown_825D7B4
_08043E24: .4byte 0x0000ffff
_08043E28: .4byte 0x000001ff
- thumb_func_end sub_8043DD4
+ thumb_func_end GetLevelUpMovesBySpecies
- thumb_func_start sub_8043E2C
-sub_8043E2C: @ 8043E2C
+ thumb_func_start GetNumberOfRelearnableMoves
+GetNumberOfRelearnableMoves: @ 8043E2C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3736,7 +3736,7 @@ _08043F72:
_08043F84: .4byte gUnknown_825D7B4
_08043F88: .4byte 0x0000ffff
_08043F8C: .4byte 0x000001ff
- thumb_func_end sub_8043E2C
+ thumb_func_end GetNumberOfRelearnableMoves
thumb_func_start sub_8043F90
sub_8043F90: @ 8043F90
@@ -4662,8 +4662,8 @@ _0804466C: .4byte gUnknown_30030F0
_08044670: .4byte 0x00000439
thumb_func_end sub_804455C
- thumb_func_start sub_8044674
-sub_8044674: @ 8044674
+ thumb_func_start GetDeoxysStat
+GetDeoxysStat: @ 8044674
push {r4-r6,lr}
adds r5, r0, 0
adds r6, r1, 0
@@ -4736,7 +4736,7 @@ _080446FE:
bx r1
.align 2, 0
_08044704: .4byte gUnknown_825E026
- thumb_func_end sub_8044674
+ thumb_func_end GetDeoxysStat
thumb_func_start sub_8044708
sub_8044708: @ 8044708
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index c98f3ac7a..fa0b2ac5e 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -238,7 +238,7 @@ _08041598:
mov r0, r8
movs r2, 0
ldr r3, [sp, 0xC]
- bl sub_80CDDA8
+ bl BeginEvolutionScene
movs r0, 0
bl _08042394
_080415A8:
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index e26a80699..d639da8cf 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -316,7 +316,7 @@ sub_80A0904: @ 80A0904
push {lr}
ldr r0, _080A0914 @ =0x0000403d
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -362,7 +362,7 @@ sub_80A0958: @ 80A0958
push {lr}
ldr r0, _080A0968 @ =0x00004040
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -463,7 +463,7 @@ _080A0A18:
cmp r7, 0
beq _080A0A28
ldr r0, _080A0A44 @ =0x0000083b
- bl sub_806E680
+ bl FlagSet
_080A0A28:
add sp, 0xC
pop {r3}
diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s
index 3c27c6ea0..7a2b8650a 100644
--- a/asm/pokemon_special_anim.s
+++ b/asm/pokemon_special_anim.s
@@ -1557,7 +1557,7 @@ sub_811D184: @ 811D184
adds r4, r0, 0
lsls r5, r1, 16
lsrs r5, 16
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl reset_temp_tile_data_buffers
movs r0, 0
movs r1, 0
@@ -1620,7 +1620,7 @@ sub_811D184: @ 811D184
bl sub_815001C
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl ShowBg
movs r0, 0x3
@@ -1672,7 +1672,7 @@ _0811D298:
thumb_func_start sub_811D29C
sub_811D29C: @ 811D29C
push {lr}
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
thumb_func_end sub_811D29C
@@ -1691,7 +1691,7 @@ sub_811D2A8: @ 811D2A8
bl sub_8150048
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_811D2A8
@@ -1706,7 +1706,7 @@ sub_811D2D0: @ 811D2D0
bl sub_810F4D8
movs r0, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_811D2D0
@@ -1815,15 +1815,15 @@ _0811D3C0:
_0811D3D4: .4byte gUnknown_841B295
_0811D3D8: .4byte gUnknown_841B2A7
_0811D3DC:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
bl sub_811D0F4
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
bl sub_811D0D0
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
adds r4, 0x14
ldr r1, _0811D400 @ =gUnknown_841B32E
b _0811D470
@@ -1866,20 +1866,20 @@ _0811D444: .4byte gUnknown_841B2F1
_0811D448: .4byte gUnknown_841B2ED
_0811D44C: .4byte gUnknown_8459998
_0811D450:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
bl sub_811D0F4
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
bl sub_811D0C4
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
adds r4, 0x14
ldr r1, _0811D478 @ =gUnknown_841B306
_0811D470:
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _0811D4A2
.align 2, 0
_0811D478: .4byte gUnknown_841B306
@@ -1939,7 +1939,7 @@ sub_811D4D4: @ 811D4D4
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_811D4D4
@@ -2299,7 +2299,7 @@ sub_811D764: @ 811D764
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -2319,7 +2319,7 @@ sub_811D7A0: @ 811D7A0
bl sub_811E93C
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x4
pop {r0}
bx r0
@@ -3043,7 +3043,7 @@ sub_811DD20: @ 811DD20
lsrs r2, 16
movs r0, 0x1
movs r1, 0x1
- bl sub_8098758
+ bl AddItemIconObject
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index ef16da369..60f834cc8 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -857,7 +857,7 @@ _0808BFA4:
_0808BFC4:
mov r1, r10
lsrs r0, r1, 24
- bl sub_8003E3C
+ bl RemoveWindow
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -973,7 +973,7 @@ sub_808BFE0: @ 808BFE0
adds r2, r5, 0
bl CpuSet
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -1442,15 +1442,15 @@ _0808C3E0:
movs r0, 0
movs r1, 0x2
movs r3, 0xFF
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0808C454
.align 2, 0
_0808C444: .4byte gUnknown_83CDA20
@@ -1549,7 +1549,7 @@ _0808C4CE:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0808C69C
.align 2, 0
_0808C504: .4byte gUnknown_30030F0
@@ -1666,7 +1666,7 @@ _0808C5F4:
movs r0, 0x1
negs r0, r0
bl MoveMenuCursor
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
@@ -1700,7 +1700,7 @@ _0808C624:
_0808C63C:
movs r0, 0x1
bl MoveMenuCursor
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
@@ -1725,7 +1725,7 @@ _0808C66E:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
strh r4, [r5, 0x8]
b _0808C69C
.align 2, 0
@@ -1836,7 +1836,7 @@ sub_808C72C: @ 808C72C
bl sub_80F6F1C
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -6660,7 +6660,7 @@ sub_808EF68: @ 808EF68
bl Free
movs r0, 0
str r0, [r4]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r4}
pop {r0}
bx r0
@@ -6759,7 +6759,7 @@ sub_808F044: @ 808F044
lsls r0, 16
cmp r0, 0
beq _0808F060
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0x1
b _0808F062
.align 2, 0
@@ -7329,7 +7329,7 @@ _0808F4D4:
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x2
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -7352,7 +7352,7 @@ _0808F4D4:
movs r0, 0
movs r1, 0
movs r3, 0x6
- bl sub_8002C48
+ bl PrintTextOnWindow
b _0808F57E
.align 2, 0
_0808F51C: .4byte gUnknown_20397B0
@@ -7368,7 +7368,7 @@ _0808F528:
str r1, [sp, 0x8]
movs r0, 0
movs r3, 0x6
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r4, 0
movs r5, 0xF
_0808F542:
@@ -7392,7 +7392,7 @@ _0808F558:
movs r0, 0
str r0, [sp, 0x8]
movs r1, 0x2
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -7405,7 +7405,7 @@ _0808F558:
_0808F57E:
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r4, _0808F5C4 @ =gUnknown_20397B0
ldr r1, [r4]
movs r2, 0xCE
@@ -8190,7 +8190,7 @@ sub_808FBA4: @ 808FBA4
sub sp, 0xC
lsls r0, 24
lsrs r6, r0, 24
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r1, _0808FBC8 @ =gUnknown_83CEA88
lsls r0, r6, 3
adds r0, r1
@@ -8231,7 +8231,7 @@ _0808FC04:
adds r1, r2
_0808FC0C:
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _0808FC7C
.align 2, 0
_0808FC14: .4byte gUnknown_20397B0
@@ -8281,7 +8281,7 @@ _0808FC62:
ldr r0, _0808FCE0 @ =0x000021db
adds r1, r0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_0808FC7C:
ldr r5, _0808FCDC @ =gUnknown_20397B0
ldr r0, [r5]
@@ -8292,7 +8292,7 @@ _0808FC7C:
lsls r1, r6, 3
adds r1, r2
ldr r1, [r1]
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x1
movs r1, 0x11
bl FillWindowPixelBuffer
@@ -8307,7 +8307,7 @@ _0808FC7C:
movs r0, 0x1
movs r1, 0x1
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD
@@ -8316,7 +8316,7 @@ _0808FC7C:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
@@ -8667,14 +8667,14 @@ sub_808FF70: @ 808FF70
cmp r1, r0
beq _0808FF9A
ldr r0, _0808FFA4 @ =0x00000843
- bl sub_806E6A8
+ bl FlagClear
ldr r4, _0808FFA8 @ =0x00004037
bl StorageGetCurrentBox
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
_0808FF9A:
pop {r4}
pop {r0}
@@ -19038,7 +19038,7 @@ _08094FD4:
bl MoveMenuCursor
b _08094FF2
_08094FEA:
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r5, r0, 24
_08094FF2:
@@ -19081,7 +19081,7 @@ sub_8095024: @ 8095024
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4,r5}
pop {r0}
bx r0
@@ -20765,10 +20765,10 @@ _08095CF0:
cmp r4, 0
beq _08095D36
adds r0, r4, 0
- bl sub_8096674
+ bl GetItemIconPic
adds r6, r0, 0
adds r0, r4, 0
- bl sub_8096684
+ bl GetItemIconPalette
adds r5, r0, 0
bl sub_80961D8
adds r4, r0, 0
@@ -20920,10 +20920,10 @@ sub_8095E2C: @ 8095E2C
lsls r5, 16
lsrs r5, 16
adds r0, r5, 0
- bl sub_8096674
+ bl GetItemIconPic
mov r8, r0
adds r0, r5, 0
- bl sub_8096684
+ bl GetItemIconPalette
adds r6, r0, 0
bl sub_80961D8
adds r4, r0, 0
@@ -21995,8 +21995,8 @@ _0809666C: .4byte gUnknown_20397B0
_08096670: .4byte 0x000021f4
thumb_func_end sub_8096624
- thumb_func_start sub_8096674
-sub_8096674: @ 8096674
+ thumb_func_start GetItemIconPic
+GetItemIconPic: @ 8096674
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -22004,10 +22004,10 @@ sub_8096674: @ 8096674
bl sub_8098974
pop {r1}
bx r1
- thumb_func_end sub_8096674
+ thumb_func_end GetItemIconPic
- thumb_func_start sub_8096684
-sub_8096684: @ 8096684
+ thumb_func_start GetItemIconPalette
+GetItemIconPalette: @ 8096684
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -22015,7 +22015,7 @@ sub_8096684: @ 8096684
bl sub_8098974
pop {r1}
bx r1
- thumb_func_end sub_8096684
+ thumb_func_end GetItemIconPalette
thumb_func_start sub_8096694
sub_8096694: @ 8096694
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 5ce1fff9b..303f56a3a 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -974,13 +974,13 @@ _08134CF8:
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r3, _08134D24 @ =0x00003001
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08134D28 @ =0x00003002
adds r0, r1
@@ -1055,26 +1055,26 @@ _08134DB0:
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r3, _08134DF4 @ =0x00003004
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08134DF8 @ =0x00003005
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08134DFC @ =0x00003006
adds r0, r2
_08134DE2:
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08134E74
.align 2, 0
_08134DEC: .4byte gUnknown_203B140
@@ -1320,7 +1320,7 @@ _08135010:
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08135030 @ =0x00003001
adds r0, r1
@@ -1351,7 +1351,7 @@ _08135054:
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r3, _0813507C @ =0x00003005
adds r0, r3
@@ -1412,14 +1412,14 @@ _081350E4:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135110 @ =0x00003002
adds r0, r2
_081350FE:
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08135180
.align 2, 0
_08135108: .4byte gUnknown_203B140
@@ -1623,19 +1623,19 @@ _081352BE:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135308 @ =0x00003004
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r3, _0813530C @ =0x00003005
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
b _0813544C
@@ -1661,13 +1661,13 @@ _08135328:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135350 @ =0x00003001
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _081353D0
.align 2, 0
_0813534C: .4byte gUnknown_203B140
@@ -1714,13 +1714,13 @@ _081353AC:
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _081353E8 @ =0x00003002
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
_081353D0:
@@ -2992,43 +2992,43 @@ _08135DEC:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135E68 @ =0x00003001
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08135E6C @ =0x00003002
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135E70 @ =0x00003006
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08135E74 @ =0x00003003
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08135E78 @ =0x00003004
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08135E7C @ =0x00003005
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08135F00
.align 2, 0
_08135E64: .4byte gUnknown_203B140
@@ -4024,7 +4024,7 @@ _081366B8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8040D38
+ bl GetAbilityBySpecies
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -4682,7 +4682,7 @@ _08136BEA:
movs r1, 0
movs r2, 0
bl ChangeBgY
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
ldr r1, _08136D44 @ =0x00005040
movs r0, 0
bl SetGpuReg
@@ -5747,7 +5747,7 @@ _08137574:
sub_8137578: @ 8137578
push {r4-r7,lr}
sub sp, 0xD4
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r7, _081375E8 @ =gUnknown_203B140
ldr r0, [r7]
ldr r4, _081375EC @ =0x00003290
@@ -5760,7 +5760,7 @@ sub_8137578: @ 8137578
adds r0, r1
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r7]
adds r0, r4
movs r1, 0x24
@@ -5777,7 +5777,7 @@ _081375B2:
bl sub_8008E78
movs r0, 0x1
add r1, sp, 0x14
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r7]
adds r0, r4
movs r1, 0x23
@@ -5824,7 +5824,7 @@ _0813761C:
_08137626:
adds r1, r4, 0
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r4, _08137664 @ =gUnknown_203B140
ldr r0, [r4]
ldr r1, _08137668 @ =0x00003290
@@ -5901,7 +5901,7 @@ _081376C0:
ldr r1, _081376D8 @ =gUnknown_8419841
_081376CE:
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _081376E6
.align 2, 0
_081376D8: .4byte gUnknown_8419841
@@ -5909,7 +5909,7 @@ _081376DC:
add r4, sp, 0x3C
ldr r1, _08137714 @ =gUnknown_8419822
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_081376E6:
ldr r0, _08137718 @ =gUnknown_203B140
ldr r0, [r0]
@@ -5944,7 +5944,7 @@ _08137720: .4byte gUnknown_8463FA4
sub_8137724: @ 8137724
push {r4-r6,lr}
sub sp, 0xD4
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r5, _081377A0 @ =gUnknown_203B140
ldr r0, [r5]
ldr r4, _081377A4 @ =0x00003290
@@ -5957,7 +5957,7 @@ sub_8137724: @ 8137724
adds r0, r1
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r5]
adds r0, r4
movs r1, 0x24
@@ -5974,7 +5974,7 @@ _0813775E:
bl sub_8008E78
movs r0, 0x1
add r1, sp, 0x14
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r5]
adds r0, r4
movs r1, 0x23
@@ -6025,7 +6025,7 @@ _081377D0:
ldr r1, _081377E8 @ =gUnknown_841979D
_081377DE:
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _081377F6
.align 2, 0
_081377E8: .4byte gUnknown_841979D
@@ -6033,7 +6033,7 @@ _081377EC:
add r4, sp, 0x3C
ldr r1, _08137820 @ =gUnknown_8419782
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_081377F6:
ldr r0, _08137824 @ =gUnknown_203B140
ldr r0, [r0]
@@ -6077,7 +6077,7 @@ _08137846:
_08137850:
adds r1, r4, 0
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r4, _08137890 @ =gUnknown_203B140
ldr r0, [r4]
ldr r1, _08137894 @ =0x00003290
@@ -6149,7 +6149,7 @@ _081378EA:
ldr r1, _081378F8 @ =gUnknown_841988A
_081378EE:
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08137906
.align 2, 0
_081378F8: .4byte gUnknown_841988A
@@ -6157,7 +6157,7 @@ _081378FC:
add r4, sp, 0x3C
ldr r1, _08137934 @ =gUnknown_8419860
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_08137906:
ldr r0, _08137938 @ =gUnknown_203B140
ldr r0, [r0]
@@ -6831,7 +6831,7 @@ _08137E82:
adds r0, r1
ldrb r0, [r0]
bl sub_8138414
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r5, 0
bl DestroyTask
ldr r0, [r4]
@@ -7566,7 +7566,7 @@ _0813841A:
adds r0, r1
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -9093,25 +9093,25 @@ _08139034:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r6]
ldr r2, _081390A4 @ =0x00003004
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r6]
ldr r3, _081390A8 @ =0x00003005
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r6]
ldr r1, _081390AC @ =0x00003006
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x3
@@ -9818,25 +9818,25 @@ _08139640:
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r1, _08139698 @ =0x00003004
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _0813969C @ =0x00003005
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r3, _081396A0 @ =0x00003006
adds r0, r3
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x3
@@ -9880,7 +9880,7 @@ _081396A8:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x3
@@ -10631,7 +10631,7 @@ _08139CD4: .4byte gUnknown_203B140
_08139CD8:
movs r0, 0
_08139CDA:
- bl sub_80EF52C
+ bl ItemIdToBallId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -13849,43 +13849,43 @@ _0813B678:
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
ldr r1, _0813B6F8 @ =0x00003001
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
ldr r2, _0813B6FC @ =0x00003002
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
adds r4, 0x6
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
ldr r1, _0813B700 @ =0x00003003
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
ldr r2, _0813B704 @ =0x00003004
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r5]
subs r4, 0x1
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
bl CopyBgTilemapBufferToVram
movs r0, 0x2
diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s
index 572f77849..33f13b5eb 100644
--- a/asm/post_battle_event_funcs.s
+++ b/asm/post_battle_event_funcs.s
@@ -12,7 +12,7 @@ sub_80CA2E4: @ 80CA2E4
bl sub_80A0058
ldr r4, _080CA304 @ =0x0000082c
adds r0, r4, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -28,7 +28,7 @@ _080CA30C:
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
- bl sub_806E680
+ bl FlagSet
_080CA318:
movs r0, 0x1
bl sub_8054EC4
@@ -89,7 +89,7 @@ _080CA388:
movs r0, 0x2A
bl sub_8054E90
ldr r0, _080CA3BC @ =0x0000083b
- bl sub_806E680
+ bl FlagSet
_080CA39E:
ldr r0, _080CA3C0 @ =sub_80F1EFC
bl SetMainCallback2
@@ -109,13 +109,13 @@ _080CA3C0: .4byte sub_80F1EFC
thumb_func_start sub_80CA3C4
sub_80CA3C4: @ 80CA3C4
push {lr}
- ldr r0, _080CA3D4 @ =sub_80566A4
+ ldr r0, _080CA3D4 @ =c2_whiteout
bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
.align 2, 0
-_080CA3D4: .4byte sub_80566A4
+_080CA3D4: .4byte c2_whiteout
thumb_func_end sub_80CA3C4
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/prof_pc.s b/asm/prof_pc.s
index cc3821aa7..fe849abcf 100644
--- a/asm/prof_pc.s
+++ b/asm/prof_pc.s
@@ -194,7 +194,7 @@ sub_80CA524: @ 80CA524
ldr r0, _080CA538 @ =gUnknown_20370C0
ldrh r0, [r0]
bl sub_80CA424
- bl sub_806943C
+ bl ShowFieldMessage
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/quest_log.s b/asm/quest_log.s
index 1f41d153c..ae0203e96 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -760,7 +760,7 @@ _08110DDE:
mov r2, sp
adds r1, r2, r6
ldrh r1, [r1]
- bl sub_806E584
+ bl VarSet
ldr r7, [sp, 0x8]
lsls r0, r7, 16
lsrs r4, r0, 16
@@ -787,7 +787,7 @@ sub_8110E20: @ 8110E20
ldr r1, _08110E38 @ =gUnknown_3005008
ldr r1, [r1]
ldrh r1, [r1, 0x32]
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -1144,13 +1144,13 @@ _081110D2:
bl PutWindowTilemap
ldrb r0, [r6]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r6, 0x2]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r6, 0x1]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x14
pop {r4-r7}
pop {r0}
@@ -1172,7 +1172,7 @@ sub_8111134: @ 8111134
bl PutWindowTilemap
ldrb r0, [r4, 0x1]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -1553,7 +1553,7 @@ sub_8111438: @ 8111438
movs r3, 0x20
bl CreateMon
ldr r0, _081114BC @ =0x00004027
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 28
mov r6, r9
@@ -1763,7 +1763,7 @@ sub_81115E8: @ 81115E8
adds r1, r4
lsls r1, 16
lsrs r1, 16
- bl sub_806E584
+ bl VarSet
pop {r4}
pop {r0}
bx r0
@@ -1853,7 +1853,7 @@ _08111698:
adds r0, r5, r1
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r1, r5, 1
add r1, sp
strh r0, [r1]
@@ -1912,7 +1912,7 @@ sub_8111708: @ 8111708
push {r4,r5,lr}
sub sp, 0x1C
ldr r0, _08111754 @ =0x000040ae
- bl sub_806E568
+ bl VarGet
ldr r4, _08111758 @ =gUnknown_3005008
ldr r1, [r4]
strh r0, [r1, 0x32]
@@ -2202,7 +2202,7 @@ sub_8111984: @ 8111984
ldr r1, _081119B8 @ =gUnknown_3005024
ldr r0, _081119BC @ =sub_8111F60
str r0, [r1]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r1, _081119C0 @ =gUnknown_203ADFA
movs r0, 0x3
strb r0, [r1]
@@ -2824,12 +2824,12 @@ sub_8111E20: @ 8111E20
bl FillWindowPixelRect
ldrb r0, [r4, 0x2]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4, 0x1]
bl PutWindowTilemap
ldrb r0, [r4, 0x1]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4}
pop {r0}
@@ -3190,9 +3190,9 @@ _0811211E:
bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -3337,10 +3337,10 @@ sub_81121D8: @ 81121D8
bl FillWindowPixelRect
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r5, 0x1]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r7, 0x2]
adds r0, 0x1
strh r0, [r7, 0x2]
@@ -4981,10 +4981,10 @@ sub_8112EDC: @ 8112EDC
beq _08112F02
ldrb r0, [r4]
adds r1, r5, 0
- bl sub_8003F20
+ bl CopyWindowToVram
_08112F02:
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0xFF
strb r0, [r4]
_08112F0C:
@@ -5144,7 +5144,7 @@ sub_8113018: @ 8113018
ldr r0, _08113040 @ =gUnknown_203B020
ldrb r0, [r0]
adds r1, r5, 0
- bl sub_8003F20
+ bl CopyWindowToVram
_08113038:
pop {r4,r5}
pop {r0}
@@ -5158,10 +5158,10 @@ sub_8113044: @ 8113044
push {lr}
ldr r0, _0811305C @ =0x00004038
movs r1, 0
- bl sub_806E584
+ bl VarSet
ldr r0, _08113060 @ =0x00004039
movs r1, 0
- bl sub_806E584
+ bl VarSet
pop {r0}
bx r0
.align 2, 0
@@ -5195,7 +5195,7 @@ sub_8113078: @ 8113078
ldr r1, _081130A4 @ =gUnknown_300500C
ldr r1, [r1]
ldrh r1, [r1, 0xE]
- bl sub_806E584
+ bl VarSet
_08113098:
pop {r4}
pop {r0}
@@ -5234,18 +5234,18 @@ sub_81130BC: @ 81130BC
ldr r1, _0811310C @ =gUnknown_300500C
ldr r1, [r1]
ldrh r1, [r1, 0xE]
- bl sub_806E584
+ bl VarSet
movs r0, 0x6C
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x6D
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x6E
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0x6F
- bl sub_806E6A8
+ bl FlagClear
ldr r0, _08113110 @ =0x00004073
movs r1, 0x1
- bl sub_806E584
+ bl VarSet
_08113102:
pop {r4}
pop {r0}
@@ -5263,7 +5263,7 @@ sub_8113114: @ 8113114
lsls r1, 24
lsrs r5, r1, 24
ldr r0, _0811315C @ =0x00004073
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x2
@@ -5530,7 +5530,7 @@ _081132F8: .4byte gUnknown_300500C
_081132FC: .4byte 0x000003e6
_08113300:
ldr r0, _08113354 @ =0x00004039
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, [r6]
@@ -5541,7 +5541,7 @@ _08113300:
adds r0, r4, 0
bl sub_81131FC
ldr r0, _08113354 @ =0x00004039
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
movs r0, 0xC0
@@ -5549,7 +5549,7 @@ _08113300:
adds r1, r0
lsrs r1, 16
ldr r0, _08113354 @ =0x00004039
- bl sub_806E584
+ bl VarSet
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -5563,7 +5563,7 @@ _08113338:
ldr r0, [r6]
ldrh r1, [r0, 0xE]
ldr r0, _08113354 @ =0x00004039
- bl sub_806E584
+ bl VarSet
b _0811335C
.align 2, 0
_08113354: .4byte 0x00004039
@@ -5772,7 +5772,7 @@ sub_81134CC: @ 81134CC
push {r4,lr}
adds r4, r0, 0
ldr r0, _081134F4 @ =0x00004073
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x2
@@ -5898,7 +5898,7 @@ _081135AA:
bne _081135B8
b _081136BC
_081135B8:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _081135C2
b _081136BC
@@ -6126,7 +6126,7 @@ sub_8113778: @ 8113778
cmp r4, 0xB
beq _081137CE
ldr r0, _081137D4 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _081137AC
@@ -6143,7 +6143,7 @@ sub_8113778: @ 8113778
beq _081137CE
_081137AC:
ldr r0, _081137D8 @ =0x00000844
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _081137DC
@@ -6394,7 +6394,7 @@ _08113970:
cmp r0, 0
bne _08113998
ldr r0, _081139B4 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _08113998
@@ -7174,14 +7174,14 @@ _08113EE0:
ldr r0, _08113EFC @ =gUnknown_8245EE0
adds r1, r0
adds r0, r2, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _08113F08
.align 2, 0
_08113EFC: .4byte gUnknown_8245EE0
_08113F00:
ldr r1, _08113F10 @ =gUnknown_8415A62
adds r0, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_08113F08:
pop {r4,r5}
pop {r0}
@@ -7934,7 +7934,7 @@ _08114514: .4byte gUnknown_203AF98
sub_8114518: @ 8114518
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _08114568 @ =gUnknown_2021CD0
adds r0, r4, 0
movs r1, 0xFF
@@ -7948,17 +7948,17 @@ sub_8114518: @ 8114518
bl sub_8115834
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _0811456C @ =gUnknown_8456AE4
ldrb r0, [r5, 0x4]
lsls r0, 2
adds r0, r1
ldr r1, [r0]
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114570 @ =gUnknown_2021D18
ldr r1, _08114574 @ =gUnknown_841A422
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0xC
adds r0, r5, 0
pop {r4,r5}
@@ -7999,7 +7999,7 @@ _081145A0: .4byte gUnknown_203AF98
sub_81145A4: @ 81145A4
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _081145F4 @ =gUnknown_2021CD0
adds r0, r4, 0
movs r1, 0xFF
@@ -8013,17 +8013,17 @@ sub_81145A4: @ 81145A4
bl sub_8115834
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _081145F8 @ =gUnknown_8456AE4
ldrb r0, [r5, 0x4]
lsls r0, 2
adds r0, r1
ldr r1, [r0]
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _081145FC @ =gUnknown_2021D18
ldr r1, _08114600 @ =gUnknown_841A477
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0xC
adds r0, r5, 0
pop {r4,r5}
@@ -8079,7 +8079,7 @@ sub_811464C: @ 811464C
mov r6, r8
push {r6}
adds r4, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r0, _081146F4 @ =gUnknown_2021CD0
mov r8, r0
movs r1, 0xFF
@@ -8115,26 +8115,26 @@ sub_811464C: @ 811464C
ldr r0, _08114700 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x1
mov r1, r8
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x2
adds r1, r6, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x3
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _08114704 @ =gUnknown_8456AE4
ldrb r0, [r4, 0x4]
lsls r0, 2
adds r0, r1
ldr r1, [r0]
movs r0, 0x4
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114708 @ =gUnknown_2021D18
ldr r1, _0811470C @ =gUnknown_841A4C6
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x1A
adds r0, r4, 0
pop {r3}
@@ -8379,12 +8379,12 @@ sub_81148BC: @ 81148BC
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x4
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x4]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -8393,14 +8393,14 @@ sub_81148BC: @ 81148BC
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4, 0x2]
movs r1, 0
movs r2, 0x3
bl sub_8113EAC
ldr r0, _08114910 @ =gUnknown_2021D18
ldr r1, _08114914 @ =gUnknown_841A566
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x6
adds r0, r4, 0
pop {r4,r5}
@@ -8445,12 +8445,12 @@ sub_8114944: @ 8114944
movs r0, 0x15
bl sub_8113E88
adds r4, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x4]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -8461,7 +8461,7 @@ sub_8114944: @ 8114944
bl sub_8113EAC
ldr r0, _08114988 @ =gUnknown_2021D18
ldr r1, _0811498C @ =gUnknown_841A5D9
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x6
adds r0, r4, 0
pop {r4}
@@ -8518,12 +8518,12 @@ sub_81149D0: @ 81149D0
movs r0, 0x16
bl sub_8113E88
adds r4, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x4]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -8534,7 +8534,7 @@ sub_81149D0: @ 81149D0
bl sub_8113EAC
ldr r0, _08114A14 @ =gUnknown_2021D18
ldr r1, _08114A18 @ =gUnknown_841A60A
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x6
adds r0, r4, 0
pop {r4}
@@ -8581,12 +8581,12 @@ sub_8114A4C: @ 8114A4C
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x2
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x2]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -8595,10 +8595,10 @@ sub_8114A4C: @ 8114A4C
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114A98 @ =gUnknown_2021D18
ldr r1, _08114A9C @ =gUnknown_841A59C
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0x2
adds r0, r5, 0
pop {r4,r5}
@@ -8642,19 +8642,19 @@ sub_8114AC8: @ 8114AC8
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x2
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x2]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
bl sub_8113EAC
ldr r0, _08114B04 @ =gUnknown_2021D18
ldr r1, _08114B08 @ =gUnknown_841A5FA
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0x2
adds r0, r5, 0
pop {r4,r5}
@@ -8698,19 +8698,19 @@ sub_8114B34: @ 8114B34
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x2
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4, 0x2]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
bl sub_8113EAC
ldr r0, _08114B70 @ =gUnknown_2021D18
ldr r1, _08114B74 @ =gUnknown_841A632
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0x2
adds r0, r5, 0
pop {r4,r5}
@@ -8754,7 +8754,7 @@ sub_8114BA0: @ 8114BA0
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x2
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrh r0, [r4]
movs r1, 0
movs r2, 0
@@ -8763,10 +8763,10 @@ sub_8114BA0: @ 8114BA0
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114BDC @ =gUnknown_2021D18
ldr r1, _08114BE0 @ =gUnknown_841A64F
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r5, 0x2
adds r0, r5, 0
pop {r4,r5}
@@ -8809,19 +8809,19 @@ sub_8114C0C: @ 8114C0C
movs r0, 0x1B
bl sub_8113E88
adds r4, r0, 0
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrb r0, [r4]
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrb r0, [r4]
ldrb r1, [r4, 0x1]
cmp r0, r1
bne _08114C40
ldr r1, _08114C3C @ =gUnknown_841A694
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _08114C4E
.align 2, 0
_08114C3C: .4byte gUnknown_841A694
@@ -8830,11 +8830,11 @@ _08114C40:
bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_08114C4E:
ldr r0, _08114C60 @ =gUnknown_2021D18
ldr r1, _08114C64 @ =gUnknown_841A66E
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r0, r4, 0x2
pop {r4}
pop {r1}
@@ -8994,14 +8994,14 @@ sub_8114D68: @ 8114D68
bl sub_8113E88
adds r4, r0, 0
adds r6, r4, 0x6
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r5, _08114DD4 @ =gUnknown_2021CD0
ldrb r1, [r4, 0x6]
adds r0, r5, 0
bl sub_80C4DF8
movs r0, 0
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4, 0x4]
lsls r1, r0, 2
adds r1, r0
@@ -9009,7 +9009,7 @@ sub_8114D68: @ 8114D68
ldr r0, _08114DD8 @ =gUnknown_823EACC
adds r1, r0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x2
@@ -9024,10 +9024,10 @@ sub_8114D68: @ 8114D68
adds r0, r1
ldr r1, [r0]
movs r0, 0x4
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114DE0 @ =gUnknown_2021D18
ldr r1, _08114DE4 @ =gUnknown_841AF0C
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x8
adds r0, r4, 0
pop {r4-r6}
@@ -9132,14 +9132,14 @@ _08114E80: .4byte gUnknown_8456AA0
_08114E84:
adds r6, r5, 0
adds r6, 0x8
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _08114F00 @ =gUnknown_2021CD0
ldrb r1, [r6, 0x2]
adds r0, r4, 0
bl sub_80C4DF8
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r5, 0x4]
movs r1, 0
movs r2, 0x1
@@ -9152,7 +9152,7 @@ _08114E84:
bl sub_8008E78
movs r0, 0x2
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r5, 0x6]
movs r1, 0
movs r2, 0x3
@@ -9165,11 +9165,11 @@ _08114E84:
bl sub_8008E78
movs r0, 0x4
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08114F0C @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0x5
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrb r0, [r5, 0x8]
cmp r0, 0
bne _08114F2C
@@ -9178,7 +9178,7 @@ _08114E84:
bne _08114F18
ldr r0, _08114F10 @ =gUnknown_2021D18
ldr r1, _08114F14 @ =gUnknown_841AA01
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F00: .4byte gUnknown_2021CD0
@@ -9190,7 +9190,7 @@ _08114F14: .4byte gUnknown_841AA01
_08114F18:
ldr r0, _08114F24 @ =gUnknown_2021D18
ldr r1, _08114F28 @ =gUnknown_841AA2B
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F24: .4byte gUnknown_2021D18
@@ -9203,7 +9203,7 @@ _08114F2C:
bne _08114F48
ldr r0, _08114F40 @ =gUnknown_2021D18
ldr r1, _08114F44 @ =gUnknown_841A9A9
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F40: .4byte gUnknown_2021D18
@@ -9211,7 +9211,7 @@ _08114F44: .4byte gUnknown_841A9A9
_08114F48:
ldr r0, _08114F54 @ =gUnknown_2021D18
ldr r1, _08114F58 @ =gUnknown_841A9D4
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F54: .4byte gUnknown_2021D18
@@ -9223,7 +9223,7 @@ _08114F5C:
bne _08114F78
ldr r0, _08114F70 @ =gUnknown_2021D18
ldr r1, _08114F74 @ =gUnknown_841AA76
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F70: .4byte gUnknown_2021D18
@@ -9231,7 +9231,7 @@ _08114F74: .4byte gUnknown_841AA76
_08114F78:
ldr r0, _08114F84 @ =gUnknown_2021D18
ldr r1, _08114F88 @ =gUnknown_841AAAA
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F84: .4byte gUnknown_2021D18
@@ -9241,7 +9241,7 @@ _08114F8C:
bne _08114FA4
ldr r0, _08114F9C @ =gUnknown_2021D18
ldr r1, _08114FA0 @ =gUnknown_841AAEC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08114FAC
.align 2, 0
_08114F9C: .4byte gUnknown_2021D18
@@ -9249,7 +9249,7 @@ _08114FA0: .4byte gUnknown_841AAEC
_08114FA4:
ldr r0, _08114FB4 @ =gUnknown_2021D18
ldr r1, _08114FB8 @ =gUnknown_841AB29
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_08114FAC:
adds r0, r6, 0x4
_08114FAE:
@@ -9320,7 +9320,7 @@ sub_811500C: @ 811500C
bl sub_8113E88
adds r4, r0, 0
adds r5, r4, 0x6
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldrh r0, [r4, 0x4]
lsls r1, r0, 2
adds r1, r0
@@ -9328,7 +9328,7 @@ sub_811500C: @ 811500C
ldr r0, _08115068 @ =gUnknown_823EACC
adds r1, r0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
movs r1, 0
movs r2, 0x1
@@ -9343,10 +9343,10 @@ sub_811500C: @ 811500C
adds r0, r1
ldr r1, [r0]
movs r0, 0x3
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08115070 @ =gUnknown_2021D18
ldr r1, _08115074 @ =gUnknown_841AF3E
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r4, 0x8
adds r0, r4, 0
pop {r4,r5}
@@ -9422,7 +9422,7 @@ _081150E8: .4byte gUnknown_8456AA0
_081150EC:
adds r5, r4, 0
adds r5, 0x8
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r0, _08115108 @ =gUnknown_203B044
ldrh r0, [r0, 0x2]
cmp r0, 0x1
@@ -9442,16 +9442,16 @@ _08115112:
ldr r0, _08115134 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08115138 @ =gUnknown_3005008
ldr r1, [r0]
ldr r0, _0811513C @ =0x00003a4c
adds r1, r0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08115140 @ =gUnknown_2021D18
ldr r1, _08115144 @ =gUnknown_841A2E1
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _081151AC
.align 2, 0
_08115134: .4byte gUnknown_300500C
@@ -9465,7 +9465,7 @@ _08115148:
ldr r0, _08115184 @ =0x00003a4c
adds r1, r0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4, 0x4]
movs r1, 0
movs r2, 0x1
@@ -9473,14 +9473,14 @@ _08115148:
ldr r0, _08115188 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4, 0x6]
movs r1, 0
movs r2, 0x3
bl sub_8113EAC
ldr r0, _0811518C @ =gUnknown_2021D18
ldr r1, _08115190 @ =gUnknown_841A312
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _081151AC
.align 2, 0
_08115180: .4byte gUnknown_3005008
@@ -9495,10 +9495,10 @@ _08115194:
adds r0, r1
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _081151B8 @ =gUnknown_2021D18
ldr r1, _081151BC @ =gUnknown_841A349
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_081151AC:
adds r0, r5, 0x2
_081151AE:
@@ -9536,14 +9536,14 @@ sub_81151DC: @ 81151DC
bl sub_8113E88
adds r5, r0, 0
adds r6, r5, 0x6
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _0811522C @ =gUnknown_2021CD0
ldrb r1, [r5, 0x6]
adds r0, r4, 0
bl sub_80C4DF8
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r3, _08115230 @ =gUnknown_823EAC8
ldrh r1, [r5, 0x4]
lsls r0, r1, 2
@@ -9562,7 +9562,7 @@ _0811521A:
bl GetExpandedPlaceholder
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _0811523E
.align 2, 0
_0811522C: .4byte gUnknown_2021CD0
@@ -9571,7 +9571,7 @@ _08115234:
adds r1, r3, 0x4
adds r1, r2, r1
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_0811523E:
ldrh r0, [r5]
movs r1, 0
@@ -9587,10 +9587,10 @@ _0811523E:
adds r0, r1
ldr r1, [r0]
movs r0, 0x4
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _08115278 @ =gUnknown_2021D18
ldr r1, _0811527C @ =gUnknown_841AF6D
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
adds r0, r6, 0x2
pop {r4-r6}
pop {r1}
@@ -9670,7 +9670,7 @@ _081152F2:
movs r1, 0x82
lsls r1, 4
adds r0, r4, r1
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9959,25 +9959,25 @@ sub_8115518: @ 8115518
lsls r0, 16
ldrh r1, [r4, 0x6]
adds r6, r0, r1
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r5, _08115564 @ =gUnknown_2021CD0
ldrb r1, [r4, 0x8]
adds r0, r5, 0
bl sub_80C4DF8
movs r0, 0
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4]
bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r4, 0x2]
cmp r0, 0x1
bhi _08115570
ldr r0, _08115568 @ =gUnknown_2021D18
ldr r1, _0811556C @ =gUnknown_841A7DD
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _0811558E
.align 2, 0
_08115564: .4byte gUnknown_2021CD0
@@ -9992,10 +9992,10 @@ _08115570:
bl sub_8008E78
movs r0, 0x2
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _0811559C @ =gUnknown_2021D18
ldr r1, _081155A0 @ =gUnknown_841A810
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_0811558E:
adds r0, r7, 0x2
pop {r4-r7}
@@ -10054,7 +10054,7 @@ sub_81155E0: @ 81155E0
lsls r0, 16
ldrh r1, [r5, 0x6]
adds r6, r0, r1
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _0811563C @ =gUnknown_2021CD0
ldrb r1, [r5, 0x8]
adds r0, r4, 0
@@ -10065,21 +10065,21 @@ sub_81155E0: @ 81155E0
ldr r0, _08115640 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x1
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r5]
bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x2
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r5, 0x2]
cmp r0, 0x1
bne _08115648
ldr r1, _08115644 @ =gUnknown_841A8D4
movs r0, 0x3
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
b _08115670
.align 2, 0
_0811563C: .4byte gUnknown_2021CD0
@@ -10094,18 +10094,18 @@ _08115648:
bl sub_8008E78
movs r0, 0x4
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r4, _08115680 @ =gUnknown_2021D04
ldr r1, _08115684 @ =gUnknown_841A8DD
adds r0, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x3
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
_08115670:
ldr r0, _08115688 @ =gUnknown_2021D18
ldr r1, _0811568C @ =gUnknown_841A858
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _081156C4
.align 2, 0
_0811567C: .4byte gUnknown_2021CF0
@@ -10116,12 +10116,12 @@ _0811568C: .4byte gUnknown_841A858
_08115690:
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldrh r0, [r5]
bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r4, _081156CC @ =gUnknown_2021CF0
adds r0, r4, 0
adds r1, r6, 0
@@ -10130,10 +10130,10 @@ _08115690:
bl sub_8008E78
movs r0, 0x2
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _081156D0 @ =gUnknown_2021D18
ldr r1, _081156D4 @ =gUnknown_841A896
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_081156C4:
adds r0, r7, 0x2
pop {r4-r7}
@@ -10235,7 +10235,7 @@ _08115778:
cmp r2, r3
bne _08115774
adds r0, r2, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _08115770
diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s
index 3cab854af..6a608d0ef 100644
--- a/asm/quest_log_battle.s
+++ b/asm/quest_log_battle.s
@@ -378,7 +378,7 @@ _0812C2C4:
mov r8, r1
b _0812C2E2
_0812C2D2:
- bl sub_811B0D0
+ bl InUnionRoom
movs r1, 0xD
mov r8, r1
cmp r0, 0x1
diff --git a/asm/region_map.s b/asm/region_map.s
index 65fb554ce..b9b1e3db1 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -278,7 +278,7 @@ _080C0022:
cmp r3, 0x3
bls _080C0022
ldr r0, _080C00B4 @ =0x00000845
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1224,7 +1224,7 @@ _080C0838:
bl sub_80C4D30
adds r0, r4, 0
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080C086C @ =gUnknown_20399D4
ldr r0, [r0]
ldr r1, _080C0870 @ =0x000047bc
@@ -1431,7 +1431,7 @@ _080C092A:
bl ChangeBgY
ldr r0, _080C0A24 @ =gUnknown_83F1A60
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
ldr r1, _080C0A28 @ =0x00006040
movs r0, 0
bl SetGpuReg
@@ -1605,7 +1605,7 @@ _080C0B44:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, _080C0B98 @ =gUnknown_83F1B0C
movs r0, 0
bl sub_80C4CF0
@@ -1723,7 +1723,7 @@ sub_80C0BB0: @ 80C0BB0
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_080C0C7A:
add sp, 0xC
pop {r4-r6}
@@ -1747,13 +1747,13 @@ sub_80C0CA0: @ 80C0CA0
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
movs r1, 0
bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80C0CA0
@@ -1876,7 +1876,7 @@ _080C0DA6:
cmp r4, 0x2
bne _080C0DCC
ldr r0, _080C0DFC @ =0x000008b5
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C0DCC
@@ -1892,7 +1892,7 @@ _080C0DCC:
cmp r4, 0x3
bne _080C0DEC
ldr r0, _080C0E00 @ =0x000008c2
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C0DEC
@@ -1998,7 +1998,7 @@ sub_80C0E70: @ 80C0E70
bl AllocZeroed
str r0, [r4]
ldr r0, _080C0EA4 @ =0x00000846
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080C0EAC
@@ -2013,7 +2013,7 @@ _080C0EA4: .4byte 0x00000846
_080C0EA8: .4byte 0x00001ccc
_080C0EAC:
ldr r0, _080C0EC4 @ =0x00000845
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -3704,7 +3704,7 @@ _080C1C80:
bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x2
bl PutWindowTilemap
ldr r0, _080C1CA0 @ =gUnknown_20399DC
@@ -3753,7 +3753,7 @@ _080C1CA8:
bl sub_812E51C
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r7]
ldr r3, _080C1D20 @ =0x00003d49
adds r1, r3
@@ -3840,7 +3840,7 @@ _080C1DB4:
bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r2, _080C1DE4 @ =gUnknown_20399DC
ldr r1, [r2]
ldr r0, _080C1DE8 @ =0x00003d48
@@ -5665,10 +5665,10 @@ _080C2CCC:
bl sub_80C4ED0
movs r0, 0x3
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x4
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _080C2CEC @ =gUnknown_20399E0
ldr r1, [r0]
ldr r0, _080C2CF0 @ =0x00000ccf
@@ -6768,7 +6768,7 @@ _080C3540:
bne _080C3572
_080C3564:
ldr r0, _080C357C @ =0x000008b5
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C3572
@@ -6818,7 +6818,7 @@ _080C35A0:
cmp r4, 0x8D
bne _080C35CE
ldr r0, _080C35D8 @ =0x00000844
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080C35CE
@@ -7067,7 +7067,7 @@ _080C3854: .4byte 0x000008a2
_080C3858:
ldr r0, _080C386C @ =0x000008a3
_080C385A:
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
movs r1, 0x3
cmp r0, 0
@@ -7330,7 +7330,7 @@ _080C3AA4: .4byte 0x000008c1
_080C3AA8:
ldr r0, _080C3ABC @ =0x000008c2
_080C3AAA:
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
movs r1, 0x3
cmp r0, 0
@@ -8988,7 +8988,7 @@ _080C4816:
cmp r0, 0x8D
bne _080C4840
ldr r0, _080C48B4 @ =0x00000844
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080C4884
@@ -9818,7 +9818,7 @@ _080C4E48:
bl sub_812E51C
movs r0, 0x3
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -9863,7 +9863,7 @@ _080C4EA4:
bl sub_812E51C
movs r0, 0x4
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -10270,7 +10270,7 @@ _080C5220:
bl sub_80C0898
adds r0, r4, 0
bl DestroyTask
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _080C5250 @ =gUnknown_20399FC
ldr r0, [r0]
ldrb r0, [r0, 0x2]
diff --git a/asm/reset_save_heap.s b/asm/reset_save_heap.s
index a32375ba9..978d8707f 100644
--- a/asm/reset_save_heap.s
+++ b/asm/reset_save_heap.s
@@ -26,7 +26,7 @@ sub_8079B7C: @ 8079B7C
negs r0, r0
ands r0, r2
strb r0, [r1]
- bl sub_804C058
+ bl SetSaveBlocksPointers
bl sub_8054A28
bl ResetSaveCounters
movs r0, 0
diff --git a/asm/roamer.s b/asm/roamer.s
index f4d3d96e1..8e7d2bc28 100644
--- a/asm/roamer.s
+++ b/asm/roamer.s
@@ -169,8 +169,8 @@ sub_8141D9C: @ 8141D9C
bx r0
thumb_func_end sub_8141D9C
- thumb_func_start sub_8141DAC
-sub_8141DAC: @ 8141DAC
+ thumb_func_start UpdateLocationHistoryForRoamer
+UpdateLocationHistoryForRoamer: @ 8141DAC
ldr r0, _08141DCC @ =gUnknown_203F3A8
ldrb r1, [r0, 0x2]
strb r1, [r0, 0x4]
@@ -190,10 +190,10 @@ sub_8141DAC: @ 8141DAC
.align 2, 0
_08141DCC: .4byte gUnknown_203F3A8
_08141DD0: .4byte gUnknown_3005008
- thumb_func_end sub_8141DAC
+ thumb_func_end UpdateLocationHistoryForRoamer
- thumb_func_start sub_8141DD4
-sub_8141DD4: @ 8141DD4
+ thumb_func_start RoamerMoveToOtherLocationSet
+RoamerMoveToOtherLocationSet: @ 8141DD4
push {r4,r5,lr}
ldr r0, _08141E18 @ =gUnknown_3005008
ldr r0, [r0]
@@ -232,10 +232,10 @@ _08141E18: .4byte gUnknown_3005008
_08141E1C: .4byte 0x000030d0
_08141E20: .4byte gUnknown_203F3AE
_08141E24: .4byte gUnknown_8466C58
- thumb_func_end sub_8141DD4
+ thumb_func_end RoamerMoveToOtherLocationSet
- thumb_func_start sub_8141E28
-sub_8141E28: @ 8141E28
+ thumb_func_start RoamerMove
+RoamerMove: @ 8141E28
push {r4-r7,lr}
movs r4, 0
bl Random
@@ -245,7 +245,7 @@ sub_8141E28: @ 8141E28
ands r1, r0
cmp r1, 0
bne _08141E42
- bl sub_8141DD4
+ bl RoamerMoveToOtherLocationSet
b _08141EB2
_08141E42:
ldr r0, _08141E94 @ =gUnknown_3005008
@@ -306,7 +306,7 @@ _08141EB2:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8141E28
+ thumb_func_end RoamerMove
thumb_func_start IsRoamerAt
IsRoamerAt: @ 8141EB8
@@ -466,7 +466,7 @@ UpdateRoamerHPStatus: @ 8141FE8
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xD]
- bl sub_8141DD4
+ bl RoamerMoveToOtherLocationSet
pop {r4-r6}
pop {r0}
bx r0
diff --git a/asm/rom6.s b/asm/rom6.s
index 2f91bb9fd..3e518219b 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -311,7 +311,7 @@ _080C9A0C: .4byte sub_80C9A10
thumb_func_start sub_80C9A10
sub_80C9A10: @ 80C9A10
push {lr}
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080C9A28 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -325,8 +325,8 @@ _080C9A28: .4byte gUnknown_20386E0
_080C9A2C: .4byte gUnknown_81BE064
thumb_func_end sub_80C9A10
- thumb_func_start sub_80C9A30
-sub_80C9A30: @ 80C9A30
+ thumb_func_start oei_rocksmash
+oei_rocksmash: @ 80C9A30
push {lr}
bl oei_task_add
lsls r0, 24
@@ -348,7 +348,7 @@ sub_80C9A30: @ 80C9A30
.align 2, 0
_080C9A58: .4byte gUnknown_3005090
_080C9A5C: .4byte sub_80C9A60
- thumb_func_end sub_80C9A30
+ thumb_func_end oei_rocksmash
thumb_func_start sub_80C9A60
sub_80C9A60: @ 80C9A60
@@ -377,7 +377,7 @@ _080C9A8A:
ldr r0, _080C9AA0 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080C9AA4 @ =gUnknown_203B0C4
- ldr r0, _080C9AA8 @ =sub_80C9AAC
+ ldr r0, _080C9AA8 @ =hm2_dig
str r0, [r1]
movs r0, 0x1
_080C9A98:
@@ -387,16 +387,16 @@ _080C9A98:
_080C9A9C: .4byte gUnknown_3005024
_080C9AA0: .4byte hm_add_c3_launch_phase_2
_080C9AA4: .4byte gUnknown_203B0C4
-_080C9AA8: .4byte sub_80C9AAC
+_080C9AA8: .4byte hm2_dig
thumb_func_end sub_80C9A78
- thumb_func_start sub_80C9AAC
-sub_80C9AAC: @ 80C9AAC
+ thumb_func_start hm2_dig
+hm2_dig: @ 80C9AAC
push {lr}
bl sub_8054D70
movs r0, 0x26
bl FieldEffectStart
- bl sub_811FB0C
+ bl GetCursorSelectionMonId
ldr r1, _080C9AC8 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -405,7 +405,7 @@ sub_80C9AAC: @ 80C9AAC
bx r0
.align 2, 0
_080C9AC8: .4byte gUnknown_20386E0
- thumb_func_end sub_80C9AAC
+ thumb_func_end hm2_dig
thumb_func_start sub_80C9ACC
sub_80C9ACC: @ 80C9ACC
diff --git a/asm/safari_zone.s b/asm/safari_zone.s
index 7b3746ff3..da7faa603 100644
--- a/asm/safari_zone.s
+++ b/asm/safari_zone.s
@@ -10,7 +10,7 @@ sub_80A0E90: @ 80A0E90
push {lr}
movs r0, 0x80
lsls r0, 4
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -22,7 +22,7 @@ sub_80A0EA4: @ 80A0EA4
push {lr}
movs r0, 0x80
lsls r0, 4
- bl sub_806E680
+ bl FlagSet
pop {r0}
bx r0
thumb_func_end sub_80A0EA4
@@ -32,7 +32,7 @@ sub_80A0EB4: @ 80A0EB4
push {lr}
movs r0, 0x80
lsls r0, 4
- bl sub_806E6A8
+ bl FlagClear
pop {r0}
bx r0
thumb_func_end sub_80A0EB4
diff --git a/asm/save.s b/asm/save.s
index 0f58f4837..6aa983d1c 100644
--- a/asm/save.s
+++ b/asm/save.s
@@ -1487,7 +1487,7 @@ _080DA2B0:
adds r2, r5, 0
bl HandleWriteSectorNBytes
_080DA2CC:
- bl sub_804C300
+ bl SaveSerializedGame
ldr r0, _080DA2E8 @ =0x0000ffff
ldr r1, _080DA2EC @ =gUnknown_30053B0
bl save_write_to_flash
@@ -1499,7 +1499,7 @@ _080DA2E4: .4byte gUnknown_201C000
_080DA2E8: .4byte 0x0000ffff
_080DA2EC: .4byte gUnknown_30053B0
_080DA2F0:
- bl sub_804C300
+ bl SaveSerializedGame
movs r4, 0
_080DA2F6:
adds r0, r4, 0
@@ -1514,7 +1514,7 @@ _080DA2F6:
.align 2, 0
_080DA30C: .4byte gUnknown_30053B0
_080DA310:
- bl sub_804C300
+ bl SaveSerializedGame
ldr r1, _080DA320 @ =gUnknown_30053B0
movs r0, 0
bl save_write_to_flash
@@ -1533,7 +1533,7 @@ _080DA328:
lsrs r4, r0, 24
cmp r4, 0x1F
bls _080DA328
- bl sub_804C300
+ bl SaveSerializedGame
ldr r0, _080DA358 @ =0x0000ffff
ldr r1, _080DA35C @ =gUnknown_30053B0
bl save_write_to_flash
@@ -1598,7 +1598,7 @@ sub_80DA3AC: @ 80DA3AC
cmp r0, 0x1
bne _080DA3D0
bl UpdateSaveAddresses
- bl sub_804C300
+ bl SaveSerializedGame
ldr r0, _080DA3CC @ =gUnknown_30053B0
bl RestoreSaveBackupVarsAndIncrement
movs r0, 0
@@ -1693,7 +1693,7 @@ sub_80DA45C: @ 80DA45C
cmp r0, 0x1
bne _080DA498
bl UpdateSaveAddresses
- bl sub_804C300
+ bl SaveSerializedGame
ldr r4, _080DA490 @ =gUnknown_30053B0
adds r0, r4, 0
bl RestoreSaveBackupVars
diff --git a/asm/save_location.s b/asm/save_location.s
index ac7c71aa2..2f8d6b64c 100644
--- a/asm/save_location.s
+++ b/asm/save_location.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_810B6F4
-sub_810B6F4: @ 810B6F4
+ thumb_func_start IsCurMapInLocationList
+IsCurMapInLocationList: @ 810B6F4
push {r4,lr}
adds r2, r0, 0
ldr r0, _0810B724 @ =gUnknown_3005008
@@ -46,13 +46,13 @@ _0810B736:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_810B6F4
+ thumb_func_end IsCurMapInLocationList
thumb_func_start IsCurMapPokeCenter
IsCurMapPokeCenter: @ 810B73C
push {lr}
ldr r0, _0810B748 @ =gUnknown_845303C
- bl sub_810B6F4
+ bl IsCurMapInLocationList
pop {r1}
bx r1
.align 2, 0
@@ -63,7 +63,7 @@ _0810B748: .4byte gUnknown_845303C
IsCurMapReloadLocation: @ 810B74C
push {lr}
ldr r0, _0810B758 @ =gUnknown_8453092
- bl sub_810B6F4
+ bl IsCurMapInLocationList
pop {r1}
bx r1
.align 2, 0
@@ -74,7 +74,7 @@ _0810B758: .4byte gUnknown_8453092
sub_810B75C: @ 810B75C
push {lr}
ldr r0, _0810B768 @ =gUnknown_8453094
- bl sub_810B6F4
+ bl IsCurMapInLocationList
pop {r1}
bx r1
.align 2, 0
diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s
index 56f892a9c..4859f01ba 100644
--- a/asm/save_menu_util.s
+++ b/asm/save_menu_util.s
@@ -120,7 +120,7 @@ _080F80A8:
_080F80B0:
lsls r0, r4, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _080F80C0
diff --git a/asm/scrcmd.s b/asm/scrcmd.s
index 8606aa4da..1e97b5032 100644
--- a/asm/scrcmd.s
+++ b/asm/scrcmd.s
@@ -738,7 +738,7 @@ ScrCmd_setorcopyvar: @ 806A3E0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
strh r0, [r5]
movs r0, 0
pop {r4,r5}
@@ -983,7 +983,7 @@ ScrCmd_subvar: @ 806A5AC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldrh r1, [r5]
subs r1, r0
strh r1, [r5]
@@ -999,7 +999,7 @@ ScrCmd_random: @ 806A5DC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1025,7 +1025,7 @@ sub_806A610: @ 806A610
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1033,7 +1033,7 @@ sub_806A610: @ 806A610
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
ldr r5, _0806A658 @ =gUnknown_20370D0
lsls r1, 24
@@ -1060,7 +1060,7 @@ sub_806A65C: @ 806A65C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1068,7 +1068,7 @@ sub_806A65C: @ 806A65C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
ldr r5, _0806A69C @ =gUnknown_20370D0
lsls r1, 24
@@ -1093,7 +1093,7 @@ sub_806A6A0: @ 806A6A0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1101,7 +1101,7 @@ sub_806A6A0: @ 806A6A0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
ldr r5, _0806A6E0 @ =gUnknown_20370D0
lsls r1, 24
@@ -1126,7 +1126,7 @@ sub_806A6E4: @ 806A6E4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1134,7 +1134,7 @@ sub_806A6E4: @ 806A6E4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
ldr r5, _0806A724 @ =gUnknown_20370D0
lsls r1, 24
@@ -1152,13 +1152,13 @@ sub_806A6E4: @ 806A6E4
_0806A724: .4byte gUnknown_20370D0
thumb_func_end sub_806A6E4
- thumb_func_start sub_806A728
-sub_806A728: @ 806A728
+ thumb_func_start ScrCmd_checkitemtype
+ScrCmd_checkitemtype: @ 806A728
push {r4,lr}
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806A750 @ =gUnknown_20370D0
@@ -1172,16 +1172,16 @@ sub_806A728: @ 806A728
bx r1
.align 2, 0
_0806A750: .4byte gUnknown_20370D0
- thumb_func_end sub_806A728
+ thumb_func_end ScrCmd_checkitemtype
- thumb_func_start sub_806A754
-sub_806A754: @ 806A754
+ thumb_func_start ScrCmd_givepcitem
+ScrCmd_givepcitem: @ 806A754
push {r4,r5,lr}
adds r5, r0, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1189,7 +1189,7 @@ sub_806A754: @ 806A754
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1205,16 +1205,16 @@ sub_806A754: @ 806A754
bx r1
.align 2, 0
_0806A794: .4byte gUnknown_20370D0
- thumb_func_end sub_806A754
+ thumb_func_end ScrCmd_givepcitem
- thumb_func_start sub_806A798
-sub_806A798: @ 806A798
+ thumb_func_start ScrCmd_checkpcitem
+ScrCmd_checkpcitem: @ 806A798
push {r4,r5,lr}
adds r5, r0, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1222,7 +1222,7 @@ sub_806A798: @ 806A798
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1238,7 +1238,7 @@ sub_806A798: @ 806A798
bx r1
.align 2, 0
_0806A7D8: .4byte gUnknown_20370D0
- thumb_func_end sub_806A798
+ thumb_func_end ScrCmd_checkpcitem
thumb_func_start sub_806A7DC
sub_806A7DC: @ 806A7DC
@@ -1246,7 +1246,7 @@ sub_806A7DC: @ 806A7DC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
movs r0, 0
pop {r1}
bx r1
@@ -1258,7 +1258,7 @@ sub_806A7F0: @ 806A7F0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
movs r0, 0
pop {r1}
bx r1
@@ -1270,7 +1270,7 @@ sub_806A804: @ 806A804
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
movs r0, 0
pop {r1}
bx r1
@@ -1282,7 +1282,7 @@ sub_806A818: @ 806A818
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
movs r0, 0
pop {r1}
bx r1
@@ -1294,7 +1294,7 @@ ScrCmd_setflag: @ 806A82C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E680
+ bl FlagSet
movs r0, 0
pop {r1}
bx r1
@@ -1306,7 +1306,7 @@ ScrCmd_clearflag: @ 806A840
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E6A8
+ bl FlagClear
movs r0, 0
pop {r1}
bx r1
@@ -1319,7 +1319,7 @@ ScrCmd_checkflag: @ 806A854
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
@@ -1411,10 +1411,10 @@ ScrCmd_setflashradius: @ 806A8FC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
- bl sub_8055D08
+ bl Overworld_SetFlashLevel
movs r0, 0
pop {r1}
bx r1
@@ -1561,10 +1561,10 @@ ScrCmd_setweather: @ 806A9FC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
- bl sub_807B100
+ bl SetSav1Weather
movs r0, 0
pop {r1}
bx r1
@@ -1608,7 +1608,7 @@ ScrCmd_setmaplayoutindex: @ 806AA48
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8055D40
@@ -1641,7 +1641,7 @@ ScrCmd_warp: @ 806AA64
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1649,7 +1649,7 @@ ScrCmd_warp: @ 806AA64
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -1705,7 +1705,7 @@ ScrCmd_warpsilent: @ 806AAEC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1713,7 +1713,7 @@ ScrCmd_warpsilent: @ 806AAEC
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -1745,8 +1745,8 @@ ScrCmd_warpsilent: @ 806AAEC
bx r1
thumb_func_end ScrCmd_warpsilent
- thumb_func_start sub_806AB74
-sub_806AB74: @ 806AB74
+ thumb_func_start ScrCmd_warpdoor
+ScrCmd_warpdoor: @ 806AB74
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1769,7 +1769,7 @@ sub_806AB74: @ 806AB74
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1777,7 +1777,7 @@ sub_806AB74: @ 806AB74
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -1807,7 +1807,7 @@ sub_806AB74: @ 806AB74
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AB74
+ thumb_func_end ScrCmd_warpdoor
thumb_func_start ScrCmd_warphole
ScrCmd_warphole: @ 806ABFC
@@ -1892,7 +1892,7 @@ sub_806AC70: @ 806AC70
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1900,7 +1900,7 @@ sub_806AC70: @ 806AC70
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -1956,7 +1956,7 @@ sub_806ACF8: @ 806ACF8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1964,7 +1964,7 @@ sub_806ACF8: @ 806ACF8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2024,7 +2024,7 @@ ScrCmd_setwarp: @ 806AD8C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2032,7 +2032,7 @@ ScrCmd_setwarp: @ 806AD8C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2086,7 +2086,7 @@ ScrCmd_setdynamicwarp: @ 806AE0C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2094,7 +2094,7 @@ ScrCmd_setdynamicwarp: @ 806AE0C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2150,7 +2150,7 @@ sub_806AE90: @ 806AE90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2158,7 +2158,7 @@ sub_806AE90: @ 806AE90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2212,7 +2212,7 @@ sub_806AF10: @ 806AF10
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2220,7 +2220,7 @@ sub_806AF10: @ 806AF10
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2274,7 +2274,7 @@ ScrCmd_setescapewarp: @ 806AF90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2282,7 +2282,7 @@ ScrCmd_setescapewarp: @ 806AF90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
mov r1, r9
lsls r1, 24
asrs r1, 24
@@ -2357,8 +2357,8 @@ ScrCmd_getpartysize: @ 806B04C
_0806B064: .4byte gUnknown_20370D0
thumb_func_end ScrCmd_getpartysize
- thumb_func_start sub_806B068
-sub_806B068: @ 806B068
+ thumb_func_start ScrCmd_playse
+ScrCmd_playse: @ 806B068
push {lr}
bl ScriptReadHalfword
lsls r0, 16
@@ -2367,7 +2367,7 @@ sub_806B068: @ 806B068
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806B068
+ thumb_func_end ScrCmd_playse
thumb_func_start WaitForSoundEffectFinish
WaitForSoundEffectFinish: @ 806B07C
@@ -2600,7 +2600,7 @@ ScrCmd_applymovement: @ 806B200
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2632,7 +2632,7 @@ ScrCmd_applymovement_at: @ 806B244
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2686,7 +2686,7 @@ ScrCmd_waitmovement: @ 806B2B0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -2726,7 +2726,7 @@ ScrCmd_waitmovement_at: @ 806B304
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -2765,7 +2765,7 @@ ScrCmd_removeobject: @ 806B358
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
ldr r1, _0806B37C @ =gUnknown_3005008
@@ -2787,7 +2787,7 @@ ScrCmd_removeobject_at: @ 806B380
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r4, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -2810,7 +2810,7 @@ ScrCmd_addobject: @ 806B3B0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
ldr r1, _0806B3D4 @ =gUnknown_3005008
@@ -2832,7 +2832,7 @@ ScrCmd_addobject_at: @ 806B3D8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r4, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -2857,7 +2857,7 @@ ScrCmd_setobjectxy: @ 806B408
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -2865,7 +2865,7 @@ ScrCmd_setobjectxy: @ 806B408
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2873,7 +2873,7 @@ ScrCmd_setobjectxy: @ 806B408
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r5, 24
lsrs r5, 24
ldr r1, _0806B46C @ =gUnknown_3005008
@@ -2904,7 +2904,7 @@ ScrCmd_setobjectxyperm: @ 806B470
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -2912,7 +2912,7 @@ ScrCmd_setobjectxyperm: @ 806B470
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2920,7 +2920,7 @@ ScrCmd_setobjectxyperm: @ 806B470
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r2, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2943,7 +2943,7 @@ ScrCmd_moveobjectoffscreen: @ 806B4C8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
ldr r1, _0806B4EC @ =gUnknown_3005008
@@ -2965,7 +2965,7 @@ ScrCmd_showobject_at: @ 806B4F0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r4, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -2990,7 +2990,7 @@ ScrCmd_hideobject_at: @ 806B520
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r4, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -3015,7 +3015,7 @@ ScrCmd_setobjectpriority: @ 806B550
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r5, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -3045,7 +3045,7 @@ ScrCmd_resetobjectpriority: @ 806B58C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r3, [r4, 0x8]
ldrb r2, [r3]
adds r3, 0x1
@@ -3099,7 +3099,7 @@ ScrCmd_turnobject: @ 806B5F4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r1, [r4, 0x8]
ldrb r3, [r1]
adds r1, 0x1
@@ -3126,7 +3126,7 @@ ScrCmd_setobjectmovementtype: @ 806B628
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r2, [r4, 0x8]
ldrb r1, [r2]
adds r2, 0x1
@@ -3159,7 +3159,7 @@ ScrCmd_createvobject: @ 806B650
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3167,7 +3167,7 @@ ScrCmd_createvobject: @ 806B650
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r3, r0, 0
ldr r0, [r5, 0x8]
ldrb r2, [r0]
@@ -3374,7 +3374,7 @@ sub_806B80C: @ 806B80C
bne _0806B81A
ldr r0, [r4, 0x64]
_0806B81A:
- bl sub_806943C
+ bl ShowFieldMessage
movs r0, 0
pop {r4}
pop {r1}
@@ -3395,7 +3395,7 @@ _0806B836:
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0
pop {r4}
pop {r1}
@@ -3882,7 +3882,7 @@ sub_806BB9C: @ 806BB9C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3956,7 +3956,7 @@ _0806BC16:
movs r1, 0x6
adds r2, r4, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
add sp, 0xC
pop {r4,r5}
@@ -3995,7 +3995,7 @@ ScrCmd_vmessage: @ 806BC6C
ldr r1, _0806BC84 @ =gUnknown_20370A8
ldr r1, [r1]
subs r0, r1
- bl sub_806943C
+ bl ShowFieldMessage
movs r0, 0
pop {r1}
bx r1
@@ -4013,7 +4013,7 @@ ScrCmd_bufferspeciesname: @ 806BC88
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, _0806BCC0 @ =gUnknown_83A7294
@@ -4082,7 +4082,7 @@ ScrCmd_bufferpartymonnick: @ 806BD14
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -4117,7 +4117,7 @@ ScrCmd_bufferitemname: @ 806BD5C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, _0806BD8C @ =gUnknown_83A7294
@@ -4145,14 +4145,14 @@ sub_806BD90: @ 806BD90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r6, r0, 16
ldr r1, _0806BDE4 @ =gUnknown_83A7294
@@ -4218,14 +4218,14 @@ sub_806BE34: @ 806BE34
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
movs r0, 0
pop {r1}
bx r1
thumb_func_end sub_806BE34
- thumb_func_start sub_806BE50
-sub_806BE50: @ 806BE50
+ thumb_func_start ScrCmd_buffermovename
+ScrCmd_buffermovename: @ 806BE50
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
@@ -4234,7 +4234,7 @@ sub_806BE50: @ 806BE50
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, _0806BE88 @ =gUnknown_83A7294
@@ -4254,10 +4254,10 @@ sub_806BE50: @ 806BE50
.align 2, 0
_0806BE88: .4byte gUnknown_83A7294
_0806BE8C: .4byte gUnknown_8247094
- thumb_func_end sub_806BE50
+ thumb_func_end ScrCmd_buffermovename
- thumb_func_start sub_806BE90
-sub_806BE90: @ 806BE90
+ thumb_func_start ScrCmd_buffernumberstring
+ScrCmd_buffernumberstring: @ 806BE90
push {r4,r5,lr}
ldr r1, [r0, 0x8]
ldrb r5, [r1]
@@ -4266,7 +4266,7 @@ sub_806BE90: @ 806BE90
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -4288,10 +4288,10 @@ sub_806BE90: @ 806BE90
bx r1
.align 2, 0
_0806BED0: .4byte gUnknown_83A7294
- thumb_func_end sub_806BE90
+ thumb_func_end ScrCmd_buffernumberstring
- thumb_func_start sub_806BED4
-sub_806BED4: @ 806BED4
+ thumb_func_start ScrCmd_bufferstdstring
+ScrCmd_bufferstdstring: @ 806BED4
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
@@ -4300,7 +4300,7 @@ sub_806BED4: @ 806BED4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
ldr r1, _0806BF0C @ =gUnknown_83A7294
lsls r4, 2
@@ -4319,7 +4319,7 @@ sub_806BED4: @ 806BED4
.align 2, 0
_0806BF0C: .4byte gUnknown_83A7294
_0806BF10: .4byte gUnknown_83E06B8
- thumb_func_end sub_806BED4
+ thumb_func_end ScrCmd_bufferstdstring
thumb_func_start ScrCmd_bufferstring
ScrCmd_bufferstring: @ 806BF14
@@ -4397,7 +4397,7 @@ ScrCmd_bufferboxname: @ 806BF94
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r1, _0806BFCC @ =gUnknown_83A7294
lsls r4, 2
adds r4, r1
@@ -4427,7 +4427,7 @@ ScrCmd_givemon: @ 806BFD0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
@@ -4440,7 +4440,7 @@ ScrCmd_givemon: @ 806BFD0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -4482,7 +4482,7 @@ ScrCmd_giveegg: @ 806C050
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806C078 @ =gUnknown_20370D0
@@ -4860,7 +4860,7 @@ ScrCmd_checktrainerflag: @ 806C30C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl HasTrainerAlreadyBeenFought
@@ -4877,7 +4877,7 @@ ScrCmd_settrainerflag: @ 806C330
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl trainer_flag_set
@@ -4892,7 +4892,7 @@ ScrCmd_cleartrainerflag: @ 806C34C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl trainer_flag_clear
@@ -4976,7 +4976,7 @@ sub_806C3E8: @ 806C3E8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
ldr r1, _0806C40C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
@@ -5034,7 +5034,7 @@ ScrCmd_dofieldeffect: @ 806C430
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r1, _0806C454 @ =gUnknown_20370B6
@@ -5059,7 +5059,7 @@ ScrCmd_setfieldeffectarg: @ 806C458
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r1, _0806C484 @ =gUnknown_20386E0
lsls r4, 2
adds r4, r1
@@ -5101,7 +5101,7 @@ ScrCmd_waitfieldeffect: @ 806C4A8
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
ldr r1, _0806C4CC @ =gUnknown_20370B6
strh r0, [r1]
ldr r1, _0806C4D0 @ =WaitForFieldEffectFinish
@@ -5122,7 +5122,7 @@ ScrCmd_setrespawn: @ 806C4D4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 24
lsrs r0, 24
bl sub_80554CC
@@ -5152,7 +5152,7 @@ ScrCmd_playmoncry: @ 806C508
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -5160,7 +5160,7 @@ ScrCmd_playmoncry: @ 806C508
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5191,28 +5191,28 @@ ScrCmd_setmetatile: @ 806C554
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r7, r0, 16
adds r0, r4, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
adds r1, r6, 0x7
lsls r1, 16
@@ -5250,7 +5250,7 @@ ScrCmd_opendoor: @ 806C5D4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -5258,7 +5258,7 @@ ScrCmd_opendoor: @ 806C5D4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
adds r5, 0x7
@@ -5283,14 +5283,14 @@ ScrCmd_opendoor: @ 806C5D4
bx r1
thumb_func_end ScrCmd_opendoor
- thumb_func_start sub_806C62C
-sub_806C62C: @ 806C62C
+ thumb_func_start ScrCmd_closedoor
+ScrCmd_closedoor: @ 806C62C
push {r4,r5,lr}
adds r5, r0, 0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -5298,7 +5298,7 @@ sub_806C62C: @ 806C62C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
adds r4, 0x7
@@ -5314,7 +5314,7 @@ sub_806C62C: @ 806C62C
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806C62C
+ thumb_func_end ScrCmd_closedoor
thumb_func_start sub_806C670
sub_806C670: @ 806C670
@@ -5351,7 +5351,7 @@ sub_806C69C: @ 806C69C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -5359,7 +5359,7 @@ sub_806C69C: @ 806C69C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
adds r4, 0x7
@@ -5384,7 +5384,7 @@ sub_806C6E0: @ 806C6E0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -5392,7 +5392,7 @@ sub_806C6E0: @ 806C6E0
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
adds r1, r0, 0
lsls r1, 16
adds r4, 0x7
@@ -5422,8 +5422,8 @@ sub_806C728: @ 806C728
bx lr
thumb_func_end sub_806C728
- thumb_func_start sub_806C72C
-sub_806C72C: @ 806C72C
+ thumb_func_start ScrCmd_checkcoins
+ScrCmd_checkcoins: @ 806C72C
push {r4,lr}
bl ScriptReadHalfword
lsls r0, 16
@@ -5436,15 +5436,15 @@ sub_806C72C: @ 806C72C
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806C72C
+ thumb_func_end ScrCmd_checkcoins
- thumb_func_start sub_806C74C
-sub_806C74C: @ 806C74C
+ thumb_func_start ScrCmd_givecoins
+ScrCmd_givecoins: @ 806C74C
push {lr}
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80D05A4
@@ -5467,15 +5467,15 @@ _0806C778:
bx r1
.align 2, 0
_0806C780: .4byte gUnknown_20370D0
- thumb_func_end sub_806C74C
+ thumb_func_end ScrCmd_givecoins
- thumb_func_start sub_806C784
-sub_806C784: @ 806C784
+ thumb_func_start ScrCmd_takecoins
+ScrCmd_takecoins: @ 806C784
push {lr}
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_80D05E4
@@ -5498,7 +5498,7 @@ _0806C7B0:
bx r1
.align 2, 0
_0806C7B8: .4byte gUnknown_20370D0
- thumb_func_end sub_806C784
+ thumb_func_end ScrCmd_takecoins
thumb_func_start sub_806C7BC
sub_806C7BC: @ 806C7BC
@@ -5528,7 +5528,7 @@ sub_806C7D4: @ 806C7D4
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -5552,7 +5552,7 @@ sub_806C80C: @ 806C80C
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
ldr r4, _0806C83C @ =gUnknown_20370D0
@@ -5581,7 +5581,7 @@ sub_806C844: @ 806C844
bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r3, r0, 16
ldr r0, [r4, 0x8]
diff --git a/asm/script.s b/asm/script.s
index 0d4379e75..45f3f6b8d 100644
--- a/asm/script.s
+++ b/asm/script.s
@@ -705,10 +705,10 @@ _08069BF8:
orrs r5, r0
adds r6, 0x2
adds r0, r1, 0
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
adds r0, r5, 0
- bl sub_806E568
+ bl VarGet
lsls r4, 16
lsls r0, 16
cmp r4, r0
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 71a120e1c..73f6d5f76 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -562,7 +562,7 @@ _0809CD78:
bl FillWindowPixelBuffer
ldr r4, _0809CDAC @ =gUnknown_83E0738
_0809CD82:
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 22
adds r0, r4
@@ -578,7 +578,7 @@ _0809CD82:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0809CDE0
.align 2, 0
_0809CDAC: .4byte gUnknown_83E0738
@@ -587,7 +587,7 @@ _0809CDB0:
movs r1, 0x11
bl FillWindowPixelBuffer
ldr r4, _0809CDE8 @ =gUnknown_83E0748
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 22
adds r0, r4
@@ -603,7 +603,7 @@ _0809CDB0:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0809CDE0:
add sp, 0x10
pop {r4}
@@ -948,12 +948,12 @@ sub_809D070: @ 809D070
sub sp, 0xC
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
ldr r0, _0809D11C @ =gUnknown_8417BB6
bl sub_809C954
lsls r0, 16
@@ -964,7 +964,7 @@ sub_809D070: @ 809D070
bge _0809D0AE
_0809D0A0:
ldr r0, _0809D120 @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
movs r4, 0xD
cmp r0, 0
@@ -973,7 +973,7 @@ _0809D0AE:
movs r4, 0xE
_0809D0B0:
ldr r0, _0809D124 @ =0x0000082c
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -1000,7 +1000,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r2, _0809D12C @ =gUnknown_8417BBE
movs r0, 0x32
str r0, [sp]
@@ -1009,7 +1009,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r2, _0809D130 @ =gUnknown_8417BCB
movs r0, 0x42
str r0, [sp]
@@ -1018,7 +1018,7 @@ _0809D0B0:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
b _0809D1A8
.align 2, 0
_0809D11C: .4byte gUnknown_8417BB6
@@ -1031,7 +1031,7 @@ _0809D134:
ldr r1, _0809D1D0 @ =0x00000829
mov r8, r1
mov r0, r8
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
movs r1, 0x3
mov r9, r1
@@ -1052,7 +1052,7 @@ _0809D14C:
movs r1, 0
bl sub_80F7750
mov r0, r8
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _0809D188
@@ -1065,7 +1065,7 @@ _0809D14C:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
_0809D188:
ldr r2, _0809D1D8 @ =gUnknown_8417BCB
mov r0, r9
@@ -1081,10 +1081,10 @@ _0809D188:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
_0809D1A8:
ldr r0, _0809D1DC @ =0x00000834
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -1099,7 +1099,7 @@ _0809D1A8:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
b _0809D1FA
.align 2, 0
_0809D1D0: .4byte 0x00000829
@@ -1117,7 +1117,7 @@ _0809D1E4:
adds r0, r6, 0
movs r1, 0x2
adds r3, r7, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
_0809D1FA:
ldr r4, _0809D24C @ =gUnknown_2021D18
ldr r1, _0809D250 @ =gUnknown_8417BB6
@@ -1178,7 +1178,7 @@ sub_809D254: @ 809D254
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r0}
bx r0
@@ -1692,7 +1692,7 @@ sub_809D654: @ 809D654
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -1723,7 +1723,7 @@ sub_809D6B0: @ 809D6B0
movs r1, 0x1
bl sub_810F4D8
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -1842,13 +1842,13 @@ _0809D7B0:
_0809D7B8:
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
mov r0, r9
lsls r3, r0, 1
movs r0, 0x11
@@ -1886,7 +1886,7 @@ _0809D7F2:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
b _0809D82E
.align 2, 0
_0809D820: .4byte gUnknown_20370C0
@@ -1922,7 +1922,7 @@ _0809D844:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r6, 0x1
lsls r0, 24
ldr r2, _0809D8BC @ =gUnknown_84161C8
@@ -1936,7 +1936,7 @@ _0809D844:
adds r0, r7, 0
movs r1, 0x2
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0x10
str r0, [sp]
mov r0, r9
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s
index f4f68fdbe..f5372ab69 100644
--- a/asm/script_pokemon_util_80A0058.s
+++ b/asm/script_pokemon_util_80A0058.s
@@ -284,11 +284,11 @@ sub_80A026C: @ 80A026C
cmp r4, 0x1
bne _080A028E
movs r0, 0xAF
- bl sub_809C8E4
+ bl ItemIdToBerryType
lsls r0, 24
lsrs r0, 24
ldr r1, _080A0298 @ =gUnknown_2021CD0
- bl sub_809C934
+ bl GetBerryNameByBerryType
_080A028E:
adds r0, r4, 0
pop {r4}
diff --git a/asm/seagallop.s b/asm/seagallop.s
index b786cc1ca..74a71d4a7 100644
--- a/asm/seagallop.s
+++ b/asm/seagallop.s
@@ -376,7 +376,7 @@ _08147150:
ldr r0, _081471C0 @ =gUnknown_203F3D0
ldr r0, [r0]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
add sp, 0x4
pop {r4}
pop {r0}
diff --git a/asm/shop.s b/asm/shop.s
index 9d9a3d792..266422735 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -52,7 +52,7 @@ _0809AAF8:
bl sub_80F7750
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -79,7 +79,7 @@ _0809AAF8:
bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0809AB78 @ =sub_809AC10
movs r1, 0x8
bl CreateTask
@@ -211,7 +211,7 @@ sub_809AC10: @ 809AC10
b _0809AC52
_0809AC3C:
ldr r4, _0809AC58 @ =gUnknown_83DF09C
- bl sub_810F98C
+ bl GetMenuCursorPos
lsls r0, 24
lsrs r0, 21
adds r4, 0x4
@@ -334,7 +334,7 @@ sub_809AD24: @ 809AD24
movs r1, 0x2
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -357,7 +357,7 @@ sub_809AD40: @ 809AD40
movs r1, 0xE
bl GetWordTaskArg
bl SetMainCallback2
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
adds r0, r4, 0
bl DestroyTask
_0809AD68:
@@ -946,7 +946,7 @@ _0809B1F2:
strb r1, [r5, 0x15]
movs r0, 0x2
movs r1, 0x5
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 4
ldrb r2, [r5, 0x14]
movs r4, 0xF
@@ -956,7 +956,7 @@ _0809B1F2:
strb r1, [r5, 0x14]
movs r0, 0x2
movs r1, 0x7
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 4
ldrb r2, [r5, 0x15]
adds r1, r4, 0
@@ -1357,13 +1357,13 @@ sub_809B59C: @ 809B59C
bne _0809B5E0
movs r0, 0x2
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -1375,7 +1375,7 @@ sub_809B59C: @ 809B59C
bl FillWindowPixelRect
movs r0, 0x4
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0809B5F8
_0809B5E0:
ldr r2, _0809B600 @ =gUnknown_841623B
@@ -1437,7 +1437,7 @@ _0809B642:
beq _0809B64E
bl Free
_0809B64E:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -2017,7 +2017,7 @@ _0809BA56:
str r0, [sp]
adds r0, r4, 0
ldr r1, _0809BAF4 @ =nullsub_8
- bl sub_805E978
+ bl AddPseudoFieldObject
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 10af41ee9..4634d8b91 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -3293,7 +3293,7 @@ sub_8141094: @ 8141094
bl DestroyTask
_081410BA:
bl sub_8140C50
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r4}
pop {r0}
bx r0
@@ -3887,7 +3887,7 @@ _08141594:
bl sub_81417E4
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3926,7 +3926,7 @@ _081415D8:
bl sub_8141AD8
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3963,7 +3963,7 @@ _08141620:
bl sub_8141B18
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 0e22449c8..e9de595d3 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -19,7 +19,7 @@ sub_806ED54: @ 806ED54
.align 2, 0
_0806ED6C: .4byte gUnknown_20370F5
_0806ED70:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0806ED7E
bl sub_806EE58
@@ -57,7 +57,7 @@ _0806EDAC: .4byte gUnknown_20370F5
sub_806EDB0: @ 806EDB0
push {lr}
ldr r0, _0806EDFC @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -66,7 +66,7 @@ sub_806EDB0: @ 806EDB0
bl sub_806ED94
_0806EDC6:
ldr r0, _0806EE00 @ =0x00000828
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -191,10 +191,10 @@ sub_806EE7C: @ 806EE7C
movs r1, 0x2
adds r2, r5, 0
movs r3, 0x4
- bl sub_8002C48
+ bl PrintTextOnWindow
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -223,9 +223,9 @@ sub_806EF18: @ 806EF18
bl sub_810F4D8
ldrb r0, [r4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
_0806EF3A:
pop {r4}
pop {r0}
@@ -306,7 +306,7 @@ _0806EFA8:
movs r1, 0x2
mov r2, r9
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
_0806EFDA:
movs r0, 0x80
lsls r0, 9
@@ -444,7 +444,7 @@ _0806F0C4:
lsls r0, 24
cmp r0, 0
bne _0806F118
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _0806F118
ldr r0, _0806F134 @ =gUnknown_300500C
@@ -466,7 +466,7 @@ _0806F118:
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
b _0806F142
.align 2, 0
@@ -598,7 +598,7 @@ sub_806F1F0: @ 806F1F0
.align 2, 0
_0806F210: .4byte gUnknown_3005098
_0806F214:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0806F220
bl sub_81198EC
@@ -670,7 +670,7 @@ sub_806F280: @ 806F280
lsls r0, 24
cmp r0, 0
bne _0806F2D2
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _0806F2D2
ldr r0, _0806F364 @ =gUnknown_300500C
@@ -705,7 +705,7 @@ _0806F2D2:
lsls r0, 24
cmp r0, 0
bne _0806F320
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _0806F320
ldr r0, _0806F364 @ =gUnknown_300500C
@@ -884,14 +884,14 @@ _0806F464:
bl play_some_sound
bl sub_806EF18
bl sub_80563F0
- ldr r0, _0806F47C @ =sub_8126EB0
+ ldr r0, _0806F47C @ =CB2_PartyMenuFromStartMenu
bl SetMainCallback2
movs r0, 0x1
_0806F478:
pop {r1}
bx r1
.align 2, 0
-_0806F47C: .4byte sub_8126EB0
+_0806F47C: .4byte CB2_PartyMenuFromStartMenu
thumb_func_end sub_806F44C
thumb_func_start sub_806F480
@@ -1908,7 +1908,7 @@ _0806FC14:
movs r0, 0
movs r1, 0x2
movs r3, 0xFF
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x8
movs r2, 0xF
@@ -1917,7 +1917,7 @@ _0806FC14:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -1929,7 +1929,7 @@ _0806FC14:
ldrb r0, [r0]
cmp r0, 0
beq _0806FC7C
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0
beq _0806FC7C
movs r0, 0x5
@@ -1963,7 +1963,7 @@ _0806FC9C:
movs r0, 0x4
b _0806FCE6
_0806FCB0:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _0806FCC4 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
bl SetMainCallback2
@@ -2094,7 +2094,7 @@ sub_806FCF4: @ 806FCF4
bl sub_812E51C
movs r7, 0x2A
ldr r0, _0806FE78 @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2149,7 +2149,7 @@ _0806FE0A:
bl sub_812E51C
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -2180,7 +2180,7 @@ sub_806FE84: @ 806FE84
movs r1, 0
bl sub_80F6F9C
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index e31ed37f6..69a442baf 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -364,7 +364,7 @@ sub_815AEB8: @ 815AEB8
push {lr}
ldr r0, _0815AEE4 @ =gUnknown_84792F0
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0xCC
bl FillWindowPixelBuffer
@@ -374,7 +374,7 @@ sub_815AEB8: @ 815AEB8
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
.align 2, 0
@@ -544,7 +544,7 @@ sub_815B014: @ 815B014
movs r0, 0x5A
movs r2, 0
movs r3, 0
- bl sub_805E978
+ bl AddPseudoFieldObject
lsls r0, 24
lsrs r0, 24
ldr r1, _0815B058 @ =gUnknown_202063C
@@ -789,7 +789,7 @@ sub_815B1DC: @ 815B1DC
movs r0, 0
movs r1, 0x4
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
add sp, 0x10
pop {r4}
pop {r0}
@@ -806,7 +806,7 @@ sub_815B220: @ 815B220
bl Free
movs r0, 0
str r0, [r4]
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r4}
pop {r0}
bx r0
@@ -1190,7 +1190,7 @@ sub_815B4EC: @ 815B4EC
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
bl sub_815B908
strh r4, [r5, 0x4]
strh r4, [r5, 0x6]
@@ -1334,7 +1334,7 @@ sub_815B624: @ 815B624
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrh r0, [r4, 0x6]
adds r0, 0x1
strh r0, [r4, 0x6]
diff --git a/asm/text.s b/asm/text.s
index 9ea6a0c42..484167df3 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -301,7 +301,7 @@ _08005566:
bl BlitBitmapRectToWindow
ldrb r0, [r5, 0x4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r6, 0x1]
movs r1, 0x20
negs r1, r1
@@ -352,7 +352,7 @@ sub_80055D4: @ 80055D4
bl FillWindowPixelRect
ldrb r0, [r5, 0x4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -387,8 +387,8 @@ _0800562E:
bx r1
thumb_func_end sub_8005608
- thumb_func_start sub_8005634
-sub_8005634: @ 8005634
+ thumb_func_start TextPrinterWaitWithDownArrow
+TextPrinterWaitWithDownArrow: @ 8005634
push {r4,lr}
adds r2, r0, 0
movs r4, 0
@@ -424,10 +424,10 @@ _08005672:
bx r1
.align 2, 0
_0800567C: .4byte gUnknown_30030F0
- thumb_func_end sub_8005634
+ thumb_func_end TextPrinterWaitWithDownArrow
- thumb_func_start sub_8005680
-sub_8005680: @ 8005680
+ thumb_func_start TextPrinterWait
+TextPrinterWait: @ 8005680
push {r4,lr}
adds r2, r0, 0
movs r4, 0
@@ -461,10 +461,10 @@ _080056B8:
bx r1
.align 2, 0
_080056C0: .4byte gUnknown_30030F0
- thumb_func_end sub_8005680
+ thumb_func_end TextPrinterWait
- thumb_func_start sub_80056C4
-sub_80056C4: @ 80056C4
+ thumb_func_start DrawDownArrow
+DrawDownArrow: @ 80056C4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -547,7 +547,7 @@ _08005736:
bl BlitBitmapRectToWindow
adds r0, r5, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x8
mov r1, r8
strb r0, [r1]
@@ -566,7 +566,7 @@ _08005778:
.align 2, 0
_08005788: .4byte gUnknown_81EA24C
_0800578C: .4byte gUnknown_81EA64C
- thumb_func_end sub_80056C4
+ thumb_func_end DrawDownArrow
thumb_func_start sub_8005790
sub_8005790: @ 8005790
@@ -1188,7 +1188,7 @@ _08005C50:
_08005C54: .4byte gUnknown_3003DA0
_08005C58:
adds r0, r6, 0
- bl sub_8005680
+ bl TextPrinterWait
lsls r0, 16
cmp r0, 0
bne _08005C66
@@ -1199,7 +1199,7 @@ _08005C66:
b _08005B30
_08005C6C:
adds r0, r6, 0
- bl sub_8005634
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
bne _08005C7A
@@ -1221,7 +1221,7 @@ _08005C7A:
b _08005B30
_08005C98:
adds r0, r6, 0
- bl sub_8005634
+ bl TextPrinterWaitWithDownArrow
lsls r0, 16
cmp r0, 0
bne _08005CA6
@@ -1299,7 +1299,7 @@ _08005D0C:
_08005D36:
ldrb r0, [r6, 0x4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08005B30
_08005D40:
strb r2, [r6, 0x1C]
@@ -1460,7 +1460,7 @@ _08005E80:
ble _08005E74
adds r0, r7, 0
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
add r0, r8
lsls r0, 24
lsrs r0, 24
@@ -1538,7 +1538,7 @@ _08005F02:
bne _08005F20
ldr r0, [sp]
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1615,7 +1615,7 @@ _08005F9E:
bne _08005FD4
adds r4, 0x1
ldrb r0, [r4]
- bl sub_813CD14
+ bl UnkTextUtil_GetPtrI
adds r6, r0, 0
b _08005FD4
.align 2, 0
@@ -1707,7 +1707,7 @@ _08006068:
bne _080060FC
ldrb r0, [r4]
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
mov r10, r0
diff --git a/asm/text_printer.s b/asm/text_printer.s
index 10f46603d..3ccceebf1 100644
--- a/asm/text_printer.s
+++ b/asm/text_printer.s
@@ -5,17 +5,17 @@
.text
- thumb_func_start sub_8002C1C
-sub_8002C1C: @ 8002C1C
+ thumb_func_start SetFontsPointer
+SetFontsPointer: @ 8002C1C
ldr r1, _08002C24 @ =gUnknown_3003D90
str r0, [r1]
bx lr
.align 2, 0
_08002C24: .4byte gUnknown_3003D90
- thumb_func_end sub_8002C1C
+ thumb_func_end SetFontsPointer
- thumb_func_start sub_8002C28
-sub_8002C28: @ 8002C28
+ thumb_func_start DeactivateAllTextPrinters
+DeactivateAllTextPrinters: @ 8002C28
push {lr}
ldr r1, _08002C40 @ =gUnknown_2020034
movs r2, 0
@@ -31,10 +31,10 @@ _08002C32:
.align 2, 0
_08002C40: .4byte gUnknown_2020034
_08002C44: .4byte 0x0000045c
- thumb_func_end sub_8002C28
+ thumb_func_end DeactivateAllTextPrinters
- thumb_func_start sub_8002C48
-sub_8002C48: @ 8002C48
+ thumb_func_start PrintTextOnWindow
+PrintTextOnWindow: @ 8002C48
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -109,7 +109,7 @@ sub_8002C48: @ 8002C48
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl sub_8002CF4
+ bl AddTextPrinter
lsls r0, 16
lsrs r0, 16
add sp, 0x10
@@ -120,10 +120,10 @@ sub_8002C48: @ 8002C48
bx r1
.align 2, 0
_08002CF0: .4byte gUnknown_3003D90
- thumb_func_end sub_8002C48
+ thumb_func_end PrintTextOnWindow
- thumb_func_start sub_8002CF4
-sub_8002CF4: @ 8002CF4
+ thumb_func_start AddTextPrinter
+AddTextPrinter: @ 8002CF4
push {r4-r7,lr}
adds r6, r0, 0
mov r12, r2
@@ -227,7 +227,7 @@ _08002DB8:
ldr r0, _08002DE0 @ =gUnknown_2020010
ldrb r0, [r0, 0x4]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_08002DC6:
ldr r2, _08002DE4 @ =gUnknown_2020034
ldrb r1, [r6, 0x4]
@@ -246,7 +246,7 @@ _08002DD8:
.align 2, 0
_08002DE0: .4byte gUnknown_2020010
_08002DE4: .4byte gUnknown_2020034
- thumb_func_end sub_8002CF4
+ thumb_func_end AddTextPrinter
thumb_func_start sub_8002DE8
sub_8002DE8: @ 8002DE8
@@ -282,7 +282,7 @@ _08002E1C:
_08002E22:
ldrb r0, [r5]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_08002E2A:
ldr r1, _08002E44 @ =gUnknown_2020034
adds r0, r1, 0
diff --git a/asm/tileset_anims.s b/asm/tileset_anims.s
index ece311c92..c34a66793 100644
--- a/asm/tileset_anims.s
+++ b/asm/tileset_anims.s
@@ -115,7 +115,7 @@ cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 806FF9C
push {lr}
bl ResetTilesetAnimBuffer
bl sub_807002C
- bl sub_8070068
+ bl cur_mapheader_run_tileset2_func
pop {r0}
bx r0
thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
@@ -123,7 +123,7 @@ cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 806FF9C
thumb_func_start sub_806FFB0
sub_806FFB0: @ 806FFB0
push {lr}
- bl sub_8070068
+ bl cur_mapheader_run_tileset2_func
pop {r0}
bx r0
thumb_func_end sub_806FFB0
@@ -214,8 +214,8 @@ _08070060: .4byte gUnknown_3000FB8
_08070064: .4byte gUnknown_2036DFC
thumb_func_end sub_807002C
- thumb_func_start sub_8070068
-sub_8070068: @ 8070068
+ thumb_func_start cur_mapheader_run_tileset2_func
+cur_mapheader_run_tileset2_func: @ 8070068
push {lr}
ldr r0, _08070094 @ =gUnknown_3000FB2
movs r1, 0
@@ -242,7 +242,7 @@ _08070094: .4byte gUnknown_3000FB2
_08070098: .4byte gUnknown_3000FB4
_0807009C: .4byte gUnknown_3000FBC
_080700A0: .4byte gUnknown_2036DFC
- thumb_func_end sub_8070068
+ thumb_func_end cur_mapheader_run_tileset2_func
thumb_func_start sub_80700A4
sub_80700A4: @ 80700A4
diff --git a/asm/title_screen.s b/asm/title_screen.s
index 3f576a7bd..a507e4d80 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -1105,7 +1105,7 @@ _08079248:
cmp r0, 0
bne _080792A6
bl SeedRngAndSetTrainerId
- bl sub_804C058
+ bl SetSaveBlocksPointers
bl sub_8054A28
bl ResetSaveCounters
movs r0, 0
diff --git a/asm/tm_case.s b/asm/tm_case.s
index 9173042e6..55c112fe6 100644
--- a/asm/tm_case.s
+++ b/asm/tm_case.s
@@ -942,13 +942,13 @@ sub_8131FB0: @ 8131FB0
bne _08131FF4
movs r0, 0x2
movs r1, 0
- bl sub_80F79D8
+ bl GetFontAttribute
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
lsls r0, 24
lsrs r0, 24
str r4, [sp]
@@ -960,7 +960,7 @@ sub_8131FB0: @ 8131FB0
bl FillWindowPixelRect
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0813200A
_08131FF4:
ldr r2, _08132014 @ =gUnknown_841623B
@@ -1262,7 +1262,7 @@ _08132206:
beq _08132212
bl Free
_08132212:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
.align 2, 0
@@ -1513,7 +1513,7 @@ sub_8132414: @ 8132414
lsls r0, 24
cmp r0, 0
bne _08132454
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _08132454
ldr r4, _0813244C @ =gUnknown_203B118
@@ -1543,13 +1543,13 @@ _08132468:
strb r0, [r1, 0x10]
movs r0, 0x2
movs r1, 0
- bl sub_80F7AC0
+ bl GetMenuCursorDimensionByFont
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1569,10 +1569,10 @@ _08132468:
movs r1, 0x2
adds r2, r4, 0
movs r3, 0x2
- bl sub_810FCD0
+ bl AddItemMenuActionTextPrinters
movs r0, 0x2
movs r1, 0x1
- bl sub_80F79D8
+ bl GetFontAttribute
adds r0, 0x2
lsls r0, 24
lsrs r0, 24
@@ -1622,7 +1622,7 @@ _08132468:
bl sub_81335B0
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_08132528:
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
@@ -3131,7 +3131,7 @@ sub_8133244: @ 8133244
push {r4,lr}
ldr r0, _081332E0 @ =gUnknown_8463190
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
movs r0, 0
movs r1, 0x5B
movs r2, 0xE0
@@ -3303,7 +3303,7 @@ sub_813337C: @ 813337C
movs r1, 0x6
movs r2, 0x64
movs r3, 0xB
- bl sub_80BF474
+ bl DisplayMessageAndContinueTask
movs r0, 0x1
bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
@@ -3371,7 +3371,7 @@ sub_8133404: @ 8133404
bl sub_8107D68
movs r0, 0x4
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_8133404
@@ -3422,7 +3422,7 @@ _0813346E:
bls _0813346E
movs r0, 0x5
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0813359A
.align 2, 0
_081334A4: .4byte gUnknown_8416213
@@ -3538,7 +3538,7 @@ _08133540:
bl sub_81332EC
movs r0, 0x5
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
_0813359A:
add sp, 0x14
pop {r3,r4}
@@ -3661,7 +3661,7 @@ sub_8133664: @ 8133664
ldrb r0, [r4]
bl ClearWindowTilemap
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0
bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
diff --git a/asm/trade.s b/asm/trade.s
index c2cdeb215..df4987a0b 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -47,7 +47,7 @@ sub_804C600: @ 804C600
lsls r0, 16
cmp r0, 0
beq _0804C6F0
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
ldr r1, _0804C710 @ =gUnknown_3000E78
ldr r2, _0804C714 @ =0x0000024e
adds r0, r2, 0
@@ -1839,7 +1839,7 @@ sub_804D5A4: @ 804D5A4
ldr r0, _0804D5F0 @ =gUnknown_2031C90
ldr r0, [r0]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _0804D5F4 @ =gUnknown_2031DA8
ldr r0, [r0]
bl Free
@@ -1864,7 +1864,7 @@ _0804D5FC:
ldr r0, _0804D62C @ =gUnknown_2031C90
ldr r0, [r0]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _0804D630 @ =gUnknown_2031DA8
ldr r0, [r0]
bl Free
@@ -3395,7 +3395,7 @@ _0804E208:
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0x1
@@ -3714,7 +3714,7 @@ _0804E4DC:
str r4, [sp]
bl sub_81344F8
_0804E4F8:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
_0804E4FC:
add sp, 0x4
pop {r4}
@@ -3996,7 +3996,7 @@ _0804E712:
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x80
lsls r0, 17
adds r6, r0
@@ -4295,7 +4295,7 @@ sub_804E944: @ 804E944
ldr r0, _0804E980 @ =gUnknown_2031DA8
ldr r0, [r0]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_80FCE44
ldr r0, _0804E984 @ =c2_8056854
bl SetMainCallback2
@@ -4316,7 +4316,7 @@ _0804E988:
ldr r0, _0804E9B8 @ =gUnknown_2031DA8
ldr r0, [r0]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, _0804E9BC @ =c2_8056854
bl SetMainCallback2
_0804E9AA:
@@ -4852,12 +4852,12 @@ _0804ECEC:
bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r4, 0
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0804EE10 @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804EE4A
@@ -4944,7 +4944,7 @@ _0804EEA4:
bl StringCopy10
movs r0, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5091,7 +5091,7 @@ sub_804EFB4: @ 804EFB4
movs r5, 0
movs r0, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -5115,7 +5115,7 @@ sub_804EFB4: @ 804EFB4
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -5872,7 +5872,7 @@ sub_804F5BC: @ 804F5BC
str r0, [sp, 0x8]
movs r1, 0x3
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
movs r1, 0x14
movs r2, 0xC
@@ -5881,7 +5881,7 @@ sub_804F5BC: @ 804F5BC
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0xC
pop {r4}
pop {r0}
@@ -7312,7 +7312,7 @@ _0805007C:
ldr r1, [r2]
adds r2, r5, 0
adds r3, r7, 0
- bl sub_800F108
+ bl HandleLoadSpecialPokePic_DontHandleDeoxys
_0805009A:
mov r0, r8
bl sub_8044148
@@ -7793,7 +7793,7 @@ sub_80504B0: @ 80504B0
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_80504B0
@@ -7840,7 +7840,7 @@ sub_80504CC: @ 80504CC
adds r1, r0, 0
movs r0, 0x3
bl SetBgTilemapBuffer
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
ldr r0, _080505B8 @ =gUnknown_8D00000
mov r10, r0
movs r0, 0
@@ -8048,7 +8048,7 @@ _08050710:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08050764
_08050730:
bl sub_8050DE0
@@ -8195,7 +8195,7 @@ sub_805080C: @ 805080C
adds r1, r2
ldr r0, [r0]
adds r0, r1
- bl sub_8097CB4
+ bl ClearMailStruct
_08050866:
ldr r4, _080508E8 @ =gUnknown_2031DAC
ldr r0, [r4]
@@ -9534,7 +9534,7 @@ _080515CC:
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
bl _080522A8
.align 2, 0
_080515E8: .4byte gUnknown_2037AB8
@@ -11122,7 +11122,7 @@ _080522BC:
ldr r0, [r7]
cmp r0, 0
beq _0805230A
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl GetBgTilemapBuffer
bl Free
@@ -11710,7 +11710,7 @@ _080529BC:
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
bl _08053704
.align 2, 0
_080529D8: .4byte gUnknown_2037AB8
@@ -13347,7 +13347,7 @@ _08053718:
ldr r0, [r7]
cmp r0, 0
beq _08053766
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl GetBgTilemapBuffer
bl Free
@@ -14456,7 +14456,7 @@ _080540EA:
_080540FC: .4byte gUnknown_2021D18
_08054100: .4byte gUnknown_8419F54
_08054104:
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0
beq _08054120
ldr r0, _0805411C @ =gUnknown_2031DAC
@@ -14800,7 +14800,7 @@ sub_80543C4: @ 80543C4
lsrs r5, r0, 24
cmp r5, 0
bne _0805441A
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0x3
bl GetBgTilemapBuffer
bl Free
@@ -14921,7 +14921,7 @@ _080544B2:
cmp r5, 0
beq _080544EA
ldr r0, _080544F8 @ =0x0000083b
- bl sub_806E680
+ bl FlagSet
_080544EA:
pop {r4,r5}
pop {r0}
@@ -14992,7 +14992,7 @@ sub_8054508: @ 8054508
bl sub_812E5A4
adds r0, r5, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x14
pop {r3}
mov r8, r3
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 3d80b6564..4d91fe2c7 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -92,7 +92,7 @@ sub_8089088: @ 8089088
adds r0, r1
ldr r0, [r0]
bl SetMainCallback2
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r0, [r5]
bl Free
movs r0, 0
@@ -321,7 +321,7 @@ _0808928A:
ldrb r0, [r0, 0x5]
cmp r0, 0
beq _080892A4
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _08089364
_080892A4:
@@ -369,7 +369,7 @@ _080892E4:
ldrb r0, [r0, 0x5]
cmp r0, 0
beq _08089308
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _08089364
_08089308:
@@ -411,7 +411,7 @@ _08089344:
ldrb r0, [r0, 0x5]
cmp r0, 0
beq _08089370
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _08089370
_08089364:
@@ -441,10 +441,10 @@ _0808937A:
str r0, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _080893B4 @ =gUnknown_20397A4
ldr r1, [r0]
movs r0, 0x10
@@ -971,7 +971,7 @@ _080897D0:
strh r0, [r5, 0xA]
_080897EE:
ldr r0, _08089890 @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
strb r0, [r5, 0x2]
bl sub_8088F24
strb r0, [r5, 0x3]
@@ -1192,27 +1192,27 @@ _080899AE:
adds r1, 0x4F
strb r0, [r1]
ldr r0, _08089A6C @ =0x00004049
- bl sub_806E568
+ bl VarGet
adds r1, r5, 0
adds r1, 0x50
strb r0, [r1]
ldr r0, _08089A70 @ =0x0000404a
- bl sub_806E568
+ bl VarGet
adds r1, r5, 0
adds r1, 0x51
strb r0, [r1]
ldr r0, _08089A74 @ =0x0000404b
- bl sub_806E568
+ bl VarGet
adds r1, r5, 0
adds r1, 0x52
strb r0, [r1]
ldr r0, _08089A78 @ =0x00004042
- bl sub_806E568
+ bl VarGet
adds r1, r5, 0
adds r1, 0x4E
strb r0, [r1]
ldr r0, _08089A7C @ =0x00004043
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1220,7 +1220,7 @@ _080899AE:
adds r1, 0x54
strh r0, [r1]
ldr r0, _08089A80 @ =0x00004044
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1228,7 +1228,7 @@ _080899AE:
adds r1, 0x56
strh r0, [r1]
ldr r0, _08089A84 @ =0x00004045
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1236,7 +1236,7 @@ _080899AE:
adds r1, 0x58
strh r0, [r1]
ldr r0, _08089A88 @ =0x00004046
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1244,7 +1244,7 @@ _080899AE:
adds r1, 0x5A
strh r0, [r1]
ldr r0, _08089A8C @ =0x00004047
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1252,7 +1252,7 @@ _080899AE:
adds r1, 0x5C
strh r0, [r1]
ldr r0, _08089A90 @ =0x00004048
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
bl sub_8096FD4
@@ -1354,7 +1354,7 @@ _08089B16:
_08089B1C:
lsls r0, r4, 16
lsrs r0, 16
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
beq _08089B38
@@ -1633,7 +1633,7 @@ sub_8089D0C: @ 8089D0C
bl ChangeBgY
ldr r0, _08089D88 @ =gUnknown_83CD898
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
pop {r0}
bx r0
.align 2, 0
@@ -2060,7 +2060,7 @@ sub_808A100: @ 808A100
push {r4-r7,lr}
sub sp, 0x18
ldr r0, _0808A198 @ =0x00000829
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0808A112
@@ -2568,7 +2568,7 @@ _0808A550:
adds r4, 0x4D
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F79D8
+ bl GetFontAttribute
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -3467,7 +3467,7 @@ sub_808ACC8: @ 808ACC8
bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r4}
pop {r0}
bx r0
@@ -4735,7 +4735,7 @@ sub_808B698: @ 808B698
lsls r1, 3
adds r0, r1
str r4, [r0]
- bl sub_811B0D0
+ bl InUnionRoom
adds r1, r0, 0
cmp r1, 0x1
bne _0808B6C8
@@ -4878,7 +4878,7 @@ _0808B7CC:
adds r1, r3
adds r1, r2
ldrh r1, [r1]
- bl sub_80BD850
+ bl CopyEasyChatWord
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -4943,7 +4943,7 @@ sub_808B838: @ 808B838
adds r0, r1
adds r0, r2
ldrb r4, [r0]
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
bne _0808B8A4
ldr r0, _0808B898 @ =gUnknown_3003F64
diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s
index 58e7f9a77..5e1845443 100644
--- a/asm/trainer_tower.s
+++ b/asm/trainer_tower.s
@@ -107,7 +107,7 @@ _0815D86A:
beq _0815D87C
ldrb r1, [r1]
adds r0, r5, r1
- bl sub_806E680
+ bl FlagSet
_0815D87C:
adds r1, r7, r4
ldrb r0, [r1]
@@ -115,7 +115,7 @@ _0815D87C:
beq _0815D88C
ldrb r1, [r1]
adds r0, r5, r1
- bl sub_806E680
+ bl FlagSet
_0815D88C:
adds r1, r6, r4
ldrb r0, [r1]
@@ -123,7 +123,7 @@ _0815D88C:
beq _0815D89C
ldrb r1, [r1]
adds r0, r5, r1
- bl sub_806E680
+ bl FlagSet
_0815D89C:
adds r0, r4, 0x1
lsls r0, 24
@@ -152,7 +152,7 @@ sub_815D8C8: @ 815D8C8
push {r4,lr}
ldr r4, _0815D8F0 @ =0x00004023
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _0815D8F4 @ =0x000005db
@@ -162,7 +162,7 @@ sub_815D8C8: @ 815D8C8
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_806E584
+ bl VarSet
_0815D8E8:
pop {r4}
pop {r0}
@@ -209,14 +209,14 @@ _0815D928:
beq _0815D956
ldr r4, _0815D964 @ =0x00004023
adds r0, r4, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
ldr r1, _0815D968 @ =0x05db0000
cmp r0, r1
bls _0815D956
adds r0, r4, 0
movs r1, 0
- bl sub_806E584
+ bl VarSet
bl sub_815D838
bl sub_815D96C
_0815D956:
@@ -280,7 +280,7 @@ _0815D9B6:
adds r0, r2, 0
ldrb r1, [r1]
adds r0, r1
- bl sub_806E6A8
+ bl FlagClear
_0815D9CC:
adds r0, r4, 0x1
lsls r0, 24
@@ -374,7 +374,7 @@ sub_815DA54: @ 815DA54
bl AllocZeroed
str r0, [r5]
ldr r0, _0815DBC8 @ =0x00004001
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
mov r10, r0
@@ -573,7 +573,7 @@ sub_815DBF4: @ 815DBF4
lsrs r4, 24
ldr r0, _0815DC28 @ =0x00004003
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r5, _0815DC2C @ =gUnknown_203F45C
ldr r1, [r5]
adds r0, r1, 0
@@ -611,7 +611,7 @@ sub_815DC40: @ 815DC40
lsrs r4, 24
ldr r0, _0815DC74 @ =0x00004003
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
ldr r5, _0815DC78 @ =gUnknown_203F45C
ldr r1, [r5]
adds r0, r1, 0
@@ -836,7 +836,7 @@ _0815DE08:
movs r1, 0x12
_0815DE0A:
ldr r0, _0815DE14 @ =0x00004011
- bl sub_806E584
+ bl VarSet
b _0815DEF0
.align 2, 0
_0815DE14: .4byte 0x00004011
@@ -872,10 +872,10 @@ _0815DE48:
movs r4, 0x12
_0815DE4C:
ldr r0, _0815DE5C @ =0x00004010
- bl sub_806E584
+ bl VarSet
ldr r0, _0815DE60 @ =0x00004013
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
b _0815DEF0
.align 2, 0
_0815DE5C: .4byte 0x00004010
@@ -938,19 +938,19 @@ _0815DEC4:
b _0815DEEA
_0815DECA:
ldr r0, _0815DED4 @ =0x00004012
- bl sub_806E584
+ bl VarSet
b _0815DEEA
.align 2, 0
_0815DED4: .4byte 0x00004012
_0815DED8:
ldr r0, _0815DEE0 @ =0x00004010
- bl sub_806E584
+ bl VarSet
b _0815DEEA
.align 2, 0
_0815DEE0: .4byte 0x00004010
_0815DEE4:
ldr r0, _0815DEF8 @ =0x00004011
- bl sub_806E584
+ bl VarSet
_0815DEEA:
adds r4, r5, 0
cmp r4, 0x2
@@ -972,7 +972,7 @@ sub_815DEFC: @ 815DEFC
adds r1, r5, 0
movs r2, 0x3
movs r3, 0x2
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
movs r2, 0x1
negs r2, r2
movs r0, 0x2
@@ -984,7 +984,7 @@ sub_815DEFC: @ 815DEFC
adds r1, r5, 0
movs r2, 0x2
movs r3, 0x3
- bl sub_80BD89C
+ bl ConvertEasyChatWordsToString
ldrb r0, [r4]
movs r1, 0x1
cmp r0, 0xFE
@@ -1214,7 +1214,7 @@ _0815E0CE:
cmp r4, 0xA
beq _0815E0F8
ldr r0, _0815E0E8 @ =0x00004003
- bl sub_806E568
+ bl VarGet
lsls r0, 16
cmp r0, 0
beq _0815E0F0
@@ -2034,7 +2034,7 @@ sub_815E720: @ 815E720
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x4A
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
mov r8, r0
movs r1, 0xB8
@@ -2111,7 +2111,7 @@ _0815E76C:
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x18
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r1, r10
lsrs r0, r1, 24
str r0, [sp]
@@ -2123,7 +2123,7 @@ _0815E76C:
movs r1, 0x2
ldr r2, _0815E87C @ =gUnknown_2021D18
movs r3, 0x60
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0xA0
lsls r0, 21
add r10, r0
@@ -2137,10 +2137,10 @@ _0815E76C:
bl PutWindowTilemap
adds r0, r7, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0815E888 @ =0x00004001
adds r1, r7, 0
- bl sub_806E584
+ bl VarSet
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -2168,7 +2168,7 @@ _0815E888: .4byte 0x00004001
sub_815E88C: @ 815E88C
push {r4,lr}
ldr r0, _0815E8B0 @ =0x00004001
- bl sub_806E568
+ bl VarGet
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2176,7 +2176,7 @@ sub_815E88C: @ 815E88C
movs r1, 0x1
bl sub_810F4D8
adds r0, r4, 0
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
@@ -2240,7 +2240,7 @@ sub_815E908: @ 815E908
cmp r1, r0
bne _0815E938
ldr r0, _0815E930 @ =0x00004082
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -2268,7 +2268,7 @@ _0815E944: .4byte gUnknown_20370D0
sub_815E948: @ 815E948
push {r4,lr}
ldr r0, _0815E97C @ =0x00004001
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r2, r0, 16
ldr r0, _0815E980 @ =gUnknown_203F458
@@ -2365,7 +2365,7 @@ sub_815E9FC: @ 815E9FC
push {r5-r7}
sub sp, 0x4
ldr r0, _0815EABC @ =0x00004001
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r4, r0, 16
bl sub_815EBB8
@@ -2799,7 +2799,7 @@ _0815ECDC:
bl PutWindowTilemap
mov r0, r8
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
bl sub_815DD2C
add sp, 0xC
pop {r3-r5}
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index 45ac14af7..b80c25594 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -20,7 +20,7 @@ sub_8128420: @ 8128420
bl sub_812B4AC
movs r0, 0
bl SetVBlankCallback
- ldr r0, _08128458 @ =sub_81284E0
+ ldr r0, _08128458 @ =c2_081284E0
bl SetMainCallback2
pop {r4}
pop {r0}
@@ -28,7 +28,7 @@ sub_8128420: @ 8128420
.align 2, 0
_08128450: .4byte gUnknown_203B0E0
_08128454: .4byte gUnknown_30030E0
-_08128458: .4byte sub_81284E0
+_08128458: .4byte c2_081284E0
thumb_func_end sub_8128420
thumb_func_start sub_812845C
@@ -98,8 +98,8 @@ sub_81284BC: @ 81284BC
_081284DC: .4byte gUnknown_203B0E0
thumb_func_end sub_81284BC
- thumb_func_start sub_81284E0
-sub_81284E0: @ 81284E0
+ thumb_func_start c2_081284E0
+c2_081284E0: @ 81284E0
push {r4-r6,lr}
sub sp, 0x4
ldr r0, _081284FC @ =gUnknown_30030F0
@@ -192,7 +192,7 @@ _081285A4: .4byte sub_81285CC
_081285A8: .4byte sub_81285E8
_081285AC: .4byte gUnknown_203B0E0
_081285B0: .4byte sub_81298F8
- thumb_func_end sub_81284E0
+ thumb_func_end c2_081284E0
thumb_func_start sub_81285B4
sub_81285B4: @ 81285B4
@@ -2362,10 +2362,10 @@ _08129664:
ldrb r1, [r4, 0x8]
cmp r0, r1
beq _081296EC
- bl sub_813CC90
+ bl UnkTextUtil_Reset
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _08129684 @ =gUnknown_841B3AA
b _081296D8
.align 2, 0
@@ -2404,14 +2404,14 @@ _081296BE:
ldrb r5, [r5]
cmp r0, r5
beq _081296EC
- bl sub_813CC90
+ bl UnkTextUtil_Reset
movs r0, 0
adds r1, r4, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _081296E8 @ =gUnknown_841B3BE
_081296D8:
adds r0, r6, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x1
b _081296EE
.align 2, 0
@@ -3045,7 +3045,7 @@ sub_8129B88: @ 8129B88
movs r0, 0
str r0, [r4]
_08129B9E:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
ldr r1, _08129BB4 @ =gUnknown_2039600
movs r0, 0x3
strb r0, [r1, 0x15]
@@ -3283,7 +3283,7 @@ _08129D50:
bl sub_812AA10
movs r0, 0x3
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129D68
_08129D5E:
bl IsDma3ManagerBusyWithBgCopy
@@ -3315,7 +3315,7 @@ _08129D88:
bl sub_812AA64
movs r0, 0x3
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129DA0
_08129D96:
bl IsDma3ManagerBusyWithBgCopy
@@ -3358,7 +3358,7 @@ _08129DCA:
bl sub_812A804
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129E0C
_08129DE6:
bl IsDma3ManagerBusyWithBgCopy
@@ -3419,7 +3419,7 @@ _08129E38:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129E66
.align 2, 0
_08129E58: .4byte gUnknown_203B0E4
@@ -3509,7 +3509,7 @@ _08129ECA:
bl sub_812A778
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129F14
_08129F02:
bl IsDma3ManagerBusyWithBgCopy
@@ -3574,7 +3574,7 @@ _08129F44:
bl sub_812A778
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129FBA
_08129F80:
bl IsDma3ManagerBusyWithBgCopy
@@ -3588,7 +3588,7 @@ _08129F80:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _08129FBA
.align 2, 0
_08129FA0: .4byte gUnknown_203B0E4
@@ -3658,7 +3658,7 @@ _08129FEC:
bl sub_812A778
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0812A062
_0812A028:
bl IsDma3ManagerBusyWithBgCopy
@@ -3670,7 +3670,7 @@ _0812A028:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0812A062
.align 2, 0
_0812A044: .4byte gUnknown_203B0E4
@@ -3713,7 +3713,7 @@ _0812A084:
bl sub_812A804
movs r0, 0x2
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3769,7 +3769,7 @@ _0812A0DC:
bl sub_812AA78
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0812A17C
.align 2, 0
_0812A104: .4byte gUnknown_203B0E4
@@ -3806,7 +3806,7 @@ _0812A138:
bl ScrollWindow
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0812A178 @ =gUnknown_203B0E4
ldr r1, [r0]
ldrh r0, [r1, 0x1C]
@@ -3888,7 +3888,7 @@ _0812A1C8:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3926,7 +3926,7 @@ _0812A20C:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3957,11 +3957,11 @@ sub_812A240: @ 812A240
beq _0812A280
b _0812A28A
_0812A250:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
bl sub_8129814
adds r1, r0, 0
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x5
movs r1, 0
bl sub_812A578
@@ -3969,7 +3969,7 @@ _0812A250:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4011,7 +4011,7 @@ _0812A2A4:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4053,7 +4053,7 @@ _0812A2F4:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4091,7 +4091,7 @@ _0812A344:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4122,11 +4122,11 @@ sub_812A378: @ 812A378
beq _0812A3BC
b _0812A3C6
_0812A388:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r0, _0812A3B4 @ =gUnknown_300500C
ldr r1, [r0]
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
movs r0, 0x9
movs r1, 0
bl sub_812A578
@@ -4134,7 +4134,7 @@ _0812A388:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4177,7 +4177,7 @@ _0812A3E0:
ldr r0, [r0]
ldrb r0, [r0, 0x1E]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4273,7 +4273,7 @@ sub_812A424: @ 812A424
str r7, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r6]
ldrb r0, [r0, 0x18]
ldr r2, _0812A518 @ =gUnknown_841793C
@@ -4283,7 +4283,7 @@ sub_812A424: @ 812A424
str r7, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r6]
ldrb r0, [r0, 0x18]
movs r1, 0x1
@@ -4351,7 +4351,7 @@ sub_812A544: @ 812A544
beq _0812A55E
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x18]
@@ -4455,7 +4455,7 @@ _0812A5F8:
adds r0, r1, 0
adds r0, 0x22
ldr r1, [r4]
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
ldr r0, [r5]
adds r6, r0, 0
adds r6, 0x22
@@ -4594,7 +4594,7 @@ sub_812A728: @ 812A728
beq _0812A742
lsls r0, 24
lsrs r0, 24
- bl sub_8003E3C
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x1E]
@@ -5306,7 +5306,7 @@ sub_812ACC0: @ 812ACC0
bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
.align 2, 0
@@ -5321,7 +5321,7 @@ sub_812ACEC: @ 812ACEC
bl sub_812A804
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_812ACEC
@@ -5336,7 +5336,7 @@ sub_812AD04: @ 812AD04
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
pop {r0}
bx r0
thumb_func_end sub_812AD04
diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s
index d9dc8f4d7..cc01306f6 100644
--- a/asm/unk_810C3A4.s
+++ b/asm/unk_810C3A4.s
@@ -199,7 +199,7 @@ sub_810C4EC: @ 810C4EC
_0810C516:
ldr r7, _0810C56C @ =0x00000801
adds r0, r7, 0
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -230,7 +230,7 @@ _0810C548:
cmp r0, 0x64
bne _0810C570
adds r0, r7, 0
- bl sub_806E6A8
+ bl FlagClear
bl sub_810C640
bl sub_810D0D0
movs r0, 0x1
@@ -250,7 +250,7 @@ _0810C572:
sub_810C578: @ 810C578
push {lr}
ldr r0, _0810C590 @ =0x00000801
- bl sub_806E6A8
+ bl FlagClear
bl sub_810C640
bl sub_810D0D0
bl sub_810C594
diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s
index 16325b7a5..eb3d4fe59 100644
--- a/asm/unk_8147AA8.s
+++ b/asm/unk_8147AA8.s
@@ -4664,7 +4664,7 @@ _08149D20: .4byte sub_8149DC8
thumb_func_start sub_8149D24
sub_8149D24: @ 8149D24
push {lr}
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
bl sub_815C9F4
pop {r0}
bx r0
@@ -5104,7 +5104,7 @@ _0814A0A0:
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
adds r4, 0x1
cmp r4, r5
blt _0814A0A0
@@ -5159,11 +5159,11 @@ _0814A0EA:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814A152
.align 2, 0
_0814A120: .4byte gUnknown_841CBFD
@@ -5245,11 +5245,11 @@ _0814A196:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814A1F4
.align 2, 0
_0814A1CC: .4byte gUnknown_841CC42
@@ -5366,11 +5366,11 @@ _0814A286:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814A2E4
.align 2, 0
_0814A2BC: .4byte gUnknown_841CC11
@@ -5448,11 +5448,11 @@ _0814A32A:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814A388
.align 2, 0
_0814A360: .4byte gUnknown_841CC64
@@ -5644,20 +5644,20 @@ sub_814A468: @ 814A468
ldr r1, _0814A530 @ =gUnknown_846D94C
bl StringAppend
_0814A4C2:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r4, _0814A52C @ =gUnknown_203F3D8
ldr r1, [r4]
adds r1, 0x26
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, [r4]
adds r1, 0x66
movs r0, 0x1
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r4]
adds r0, 0xA6
ldr r1, _0814A534 @ =gUnknown_841CBA9
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x4
movs r1, 0x8
movs r2, 0x16
@@ -5676,11 +5676,11 @@ _0814A4C2:
str r1, [sp, 0x4]
str r3, [sp, 0x8]
movs r1, 0x2
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, _0814A538 @ =0x00000101
strh r0, [r1, 0x14]
@@ -5706,15 +5706,15 @@ sub_814A53C: @ 814A53C
ldr r1, [r4]
adds r1, 0x26
bl sub_8099E90
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r1, [r4]
adds r1, 0x26
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r4]
adds r0, 0xA6
ldr r1, _0814A5B0 @ =gUnknown_841CBCA
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x4
movs r1, 0x8
movs r2, 0x16
@@ -5734,11 +5734,11 @@ sub_814A53C: @ 814A53C
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
strh r5, [r0, 0x14]
strb r6, [r0, 0xD]
@@ -5761,15 +5761,15 @@ sub_814A5B4: @ 814A5B4
ldr r1, [r4]
adds r1, 0x26
bl sub_8099E90
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r1, [r4]
adds r1, 0x26
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, [r4]
adds r0, 0xA6
ldr r1, _0814A628 @ =gUnknown_841CBE4
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
movs r0, 0x4
movs r1, 0x9
movs r2, 0x16
@@ -5789,11 +5789,11 @@ sub_814A5B4: @ 814A5B4
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
strh r5, [r0, 0x14]
strb r6, [r0, 0xD]
@@ -5904,7 +5904,7 @@ sub_814A6CC: @ 814A6CC
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x1
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0xD]
@@ -5939,7 +5939,7 @@ _0814A710:
bne _0814A73A
ldr r0, [r4]
ldrb r0, [r0, 0x12]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r1, [r4]
movs r0, 0xFF
strh r0, [r1, 0x12]
@@ -6588,7 +6588,7 @@ sub_814AB98: @ 814AB98
add r0, r8
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -7881,7 +7881,7 @@ _0814B57C:
ldrb r0, [r4, 0x2]
movs r1, 0x1
_0814B592:
- bl sub_8003F20
+ bl CopyWindowToVram
_0814B596:
ldrh r0, [r4]
adds r0, 0x1
@@ -7895,7 +7895,7 @@ _0814B5A4:
cmp r0, 0
bne _0814B5BE
ldrb r0, [r4, 0x2]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s
index b75a18f7c..d217d322e 100644
--- a/asm/unk_814BB4C.s
+++ b/asm/unk_814BB4C.s
@@ -229,7 +229,7 @@ _0814BCA2:
movs r0, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0814BD12
.align 2, 0
_0814BCE8: .4byte gUnknown_2021D18
@@ -250,11 +250,11 @@ _0814BCF0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0814BD12:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814BD68
.align 2, 0
_0814BD1C: .4byte gUnknown_846E328
@@ -2868,10 +2868,10 @@ _0814D106:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _0814D14C @ =sub_80DA634
movs r1, 0
bl CreateTask
@@ -3232,7 +3232,7 @@ _0814D3C0:
str r1, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _0814D40C
.align 2, 0
_0814D3EC: .4byte gUnknown_846E328
@@ -3249,11 +3249,11 @@ _0814D3F0:
str r0, [sp, 0xC]
movs r0, 0
movs r1, 0x2
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
_0814D40C:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814D456
.align 2, 0
_0814D418: .4byte gUnknown_846E328
diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s
index b1f2246de..63f2ec759 100644
--- a/asm/unk_814D5C8.s
+++ b/asm/unk_814D5C8.s
@@ -401,7 +401,7 @@ _0814D906:
bl CopyBgTilemapBufferToVram
b _0814D9BA
_0814D962:
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r0, 0
bl HideBg
movs r0, 0
@@ -528,7 +528,7 @@ _0814DA42:
lsrs r3, 16
ldr r0, _0814DB74 @ =gUnknown_846F470
adds r1, r2, 0
- bl sub_809881C
+ bl AddItemIconObjectWithCustomObjectTemplate
lsls r0, 24
lsrs r0, 24
mov r2, r9
@@ -1265,7 +1265,7 @@ _0814DFE0:
adds r4, r2, r4
str r4, [sp, 0x2C]
_0814DFF0:
- bl sub_813CC90
+ bl UnkTextUtil_Reset
ldr r0, [sp, 0x10]
cmp r0, 0x1
beq _0814E0E4
@@ -1610,10 +1610,10 @@ _0814E2B8:
ldr r0, [sp, 0xC]
adds r1, r0, r1
movs r0, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r0, _0814E324 @ =gUnknown_2021D18
adds r1, r4, 0
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
ldr r1, [sp, 0x2C]
ldrb r0, [r1]
mov r2, r9
@@ -2215,7 +2215,7 @@ _0814E7E0:
adds r0, 0x82
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
adds r1, r6, 0
adds r1, 0x80
movs r0, 0
@@ -2248,7 +2248,7 @@ sub_814E80C: @ 814E80C
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r5]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r4, 0
bl sub_814EBB0
pop {r4,r5}
@@ -2471,7 +2471,7 @@ _0814E96E:
bls _0814E90E
ldrb r0, [r7, 0x2]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
b _0814EA66
.align 2, 0
_0814E9FC: .4byte gUnknown_841D118
@@ -2503,7 +2503,7 @@ _0814EA40:
ldrb r0, [r7, 0x2]
bl ClearWindowTilemap
ldrb r0, [r7, 0x2]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r4, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -2759,7 +2759,7 @@ _0814EC4C:
adds r0, r7
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s
index bba5d9765..6c50c3d95 100644
--- a/asm/unk_81507FC.s
+++ b/asm/unk_81507FC.s
@@ -1721,7 +1721,7 @@ _0815156C:
bl DestroyTask
ldr r0, [r4]
bl Free
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
_08151590:
add sp, 0x4
pop {r4}
@@ -6422,7 +6422,7 @@ _08153888:
ldrb r0, [r4, 0x2]
movs r1, 0x1
_0815389E:
- bl sub_8003F20
+ bl CopyWindowToVram
_081538A2:
ldrh r0, [r4]
adds r0, 0x1
@@ -6436,7 +6436,7 @@ _081538B0:
cmp r0, 0
bne _081538CA
ldrb r0, [r4, 0x2]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r5, 0
bl DestroyTask
bl EnableBothScriptContexts
@@ -6493,7 +6493,7 @@ sub_81538D0: @ 81538D0
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x1
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r4, 0
add r2, sp, 0x18
mov r8, r2
@@ -6536,7 +6536,7 @@ _08153946:
adds r0, r7, 0
movs r1, 0x2
movs r3, 0x1
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r3, 0xE0
subs r3, r5
lsls r3, 24
@@ -6552,7 +6552,7 @@ _08153946:
adds r0, r7, 0
movs r1, 0x2
mov r2, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r4, r6, 0
cmp r4, 0x2
ble _08153946
@@ -8680,7 +8680,7 @@ _081549C4: .4byte sub_8154A2C
thumb_func_start sub_81549C8
sub_81549C8: @ 81549C8
push {lr}
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
pop {r0}
bx r0
thumb_func_end sub_81549C8
@@ -9021,7 +9021,7 @@ _08154C4E:
adds r0, r6
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r3, [sp, 0x18]
ldrh r0, [r3, 0x6]
adds r0, 0xE
@@ -9102,7 +9102,7 @@ _08154D34:
adds r0, r4
adds r0, r6
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -9290,7 +9290,7 @@ _08154E70:
str r3, [sp, 0x8]
movs r1, 0
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
@@ -9342,7 +9342,7 @@ _08154EC8:
add r2, sp, 0xC
ldr r4, [sp, 0x6C]
lsrs r3, r4, 24
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r1, _08154F70 @ =gUnknown_203F440
ldr r0, [r1]
add r0, r10
@@ -9356,7 +9356,7 @@ _08154EC8:
str r1, [sp, 0x8]
ldr r2, _08154F68 @ =gUnknown_841CE1C
lsrs r3, 24
- bl sub_8002C48
+ bl PrintTextOnWindow
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -9512,7 +9512,7 @@ _08155060:
str r5, [sp, 0x8]
movs r1, 0
mov r2, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r4]
add r0, r9
ldrb r0, [r0]
@@ -9523,7 +9523,7 @@ _08155060:
str r5, [sp, 0x8]
movs r1, 0
movs r3, 0x44
- bl sub_8002C48
+ bl PrintTextOnWindow
movs r0, 0
mov r9, r0
ldr r1, [sp, 0x84]
@@ -9657,7 +9657,7 @@ _081551D0:
movs r1, 0
str r1, [sp, 0x8]
add r2, sp, 0xC
- bl sub_8002C48
+ bl PrintTextOnWindow
_081551FA:
adds r0, r7, 0x1
lsls r0, 24
@@ -9679,13 +9679,13 @@ _08155214:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08155240 @ =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, _08155248 @ =0x00003014
adds r1, r0
@@ -9795,7 +9795,7 @@ _081552DC:
movs r1, 0
str r1, [sp, 0x8]
adds r2, r6, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
b _08155658
.align 2, 0
_08155330: .4byte gUnknown_203F440
@@ -9811,13 +9811,13 @@ _08155340:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _08155374 @ =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, _08155378 @ =0x00003014
adds r1, r0
@@ -9921,7 +9921,7 @@ _0815542C:
ldr r4, _08155478 @ =0x00003009
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r6, _0815547C @ =gUnknown_8475684
adds r0, r6, 0
bl sub_8003CE4
@@ -9982,8 +9982,8 @@ _08155480:
str r6, [sp, 0x8]
movs r1, 0
adds r2, r5, 0
- bl sub_8002C48
- bl sub_813CC90
+ bl PrintTextOnWindow
+ bl UnkTextUtil_Reset
bl sub_8153390
lsls r0, 16
lsrs r0, 16
@@ -9992,10 +9992,10 @@ _08155480:
bl sub_8099E90
movs r0, 0
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
ldr r1, _0815556C @ =gUnknown_841CD7A
add r0, sp, 0xC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
ldr r0, [r4]
add r0, r10
ldrb r0, [r0]
@@ -10007,7 +10007,7 @@ _08155480:
movs r1, 0
add r2, sp, 0xC
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
bl sub_815372C
lsls r0, 24
lsrs r4, r0, 24
@@ -10016,7 +10016,7 @@ _08155480:
beq _0815559E
cmp r4, 0x3
beq _0815559E
- bl sub_813CC90
+ bl UnkTextUtil_Reset
bl sub_8153390
lsls r0, 16
lsrs r0, 16
@@ -10024,12 +10024,12 @@ _08155480:
bl sub_8099E90
movs r0, 0
adds r1, r5, 0
- bl sub_813CCAC
+ bl UnkTextUtil_SetPtrI
cmp r4, 0x2
bne _08155574
ldr r1, _08155570 @ =gUnknown_841CD9F
add r0, sp, 0xC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
b _08155580
.align 2, 0
_08155558: .4byte 0x00000101
@@ -10044,7 +10044,7 @@ _08155574:
bne _08155580
ldr r1, _081555C4 @ =gUnknown_841CDBA
add r0, sp, 0xC
- bl sub_813CCC8
+ bl UnkTextUtil_StringExpandPlaceholders
_08155580:
ldr r0, _081555C8 @ =gUnknown_203F440
ldr r0, [r0]
@@ -10059,7 +10059,7 @@ _08155580:
str r1, [sp, 0x8]
add r2, sp, 0xC
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
_0815559E:
ldr r4, _081555C8 @ =gUnknown_203F440
ldr r0, [r4]
@@ -10067,13 +10067,13 @@ _0815559E:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, [r4]
ldr r2, _081555CC @ =0x00003009
adds r0, r2
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r4]
ldr r0, _081555D4 @ =0x00003014
adds r1, r0
@@ -10168,11 +10168,11 @@ _08155678:
ldr r0, [r6]
adds r0, r5
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -10319,7 +10319,7 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r3, r10
ldr r0, [r3]
adds r0, r7
@@ -10331,7 +10331,7 @@ _0815579C:
str r5, [sp, 0x4]
str r4, [sp, 0x8]
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r2, r10
ldr r0, [r2]
adds r0, r7
@@ -10343,7 +10343,7 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r3, r10
ldr r0, [r3]
adds r0, r7
@@ -10355,19 +10355,19 @@ _0815579C:
str r4, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r2, r10
ldr r0, [r2]
add r0, r8
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
mov r3, r10
ldr r0, [r3]
adds r0, r7
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
mov r0, r10
ldr r1, [r0]
ldr r2, _08155864 @ =0x00003014
@@ -10435,7 +10435,7 @@ _081558B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r2, r10
ldr r0, [r2]
adds r0, r4
@@ -10448,7 +10448,7 @@ _081558B0:
str r5, [sp, 0x8]
movs r1, 0x2
movs r3, 0x8
- bl sub_8002C48
+ bl PrintTextOnWindow
mov r1, r10
ldr r0, [r1]
adds r0, r4
@@ -10475,14 +10475,14 @@ _08155922:
adds r0, r1, 0
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r4, _08155970 @ =gUnknown_203F440
ldr r0, [r4]
ldr r1, _08155974 @ =0x00003009
adds r0, r1
ldrb r0, [r0]
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r0, _08155978 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r5, 0x1
@@ -10589,12 +10589,12 @@ _081559EC:
ldr r0, [r3]
adds r0, r5
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
mov r1, r10
ldr r0, [r1]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -10669,14 +10669,14 @@ _08155AA6:
movs r0, 0
movs r1, 0x2
movs r3, 0
- bl sub_80F6CD0
+ bl AddTextPrinterParametrized
b _08155B08
.align 2, 0
_08155ACC: .4byte gUnknown_8419F54
_08155AD0:
movs r0, 0
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r5]
ldr r0, _08155AE0 @ =0x00003014
adds r1, r0
@@ -10798,12 +10798,12 @@ _08155BA4:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r5]
ldr r0, _08155BE8 @ =0x00003014
adds r1, r0
@@ -10862,7 +10862,7 @@ sub_8155C2C: @ 8155C2C
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -10970,12 +10970,12 @@ _08155D08:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
ldr r1, [r6]
ldr r2, _08155D4C @ =0x00003014
adds r1, r2
@@ -11036,7 +11036,7 @@ _08155D9C:
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003E3C
+ bl RemoveWindow
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s
index 7bffe196f..50845e870 100644
--- a/asm/unk_8159F40.s
+++ b/asm/unk_8159F40.s
@@ -20,7 +20,7 @@ sub_8159F40: @ 8159F40
movs r0, 0x80
lsls r0, 9
str r0, [r1]
- bl sub_803DA14
+ bl ZeroPlayerPartyMons
bl ZeroEnemyPartyMons
ldr r1, _08159F94 @ =gUnknown_84792D0
ldr r0, _08159F98 @ =gUnknown_20370C0
diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s
index 0cd5ec18f..5fcae020a 100644
--- a/asm/unk_815EDDC.s
+++ b/asm/unk_815EDDC.s
@@ -303,7 +303,7 @@ sub_815EFBC: @ 815EFBC
movs r1, 0
mov r2, r9
mov r3, r8
- bl sub_8002C48
+ bl PrintTextOnWindow
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -345,7 +345,7 @@ sub_815F014: @ 815F014
adds r0, r6, 0
movs r1, 0
movs r3, 0
- bl sub_8002C48
+ bl PrintTextOnWindow
str r4, [sp]
adds r0, r6, 0
mov r1, r8
@@ -404,7 +404,7 @@ sub_815F094: @ 815F094
movs r1, 0
movs r2, 0x1
movs r3, 0x1
- bl sub_810FE50
+ bl SetWindowTemplateFields
ldr r0, [sp, 0x10]
ldr r1, [sp, 0x14]
str r0, [sp, 0x18]
@@ -451,7 +451,7 @@ sub_815F114: @ 815F114
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_8003E3C
+ bl RemoveWindow
pop {r4}
pop {r0}
bx r0
diff --git a/asm/unk_text_util.s b/asm/unk_text_util.s
index 5c8b1c71b..15d21c95a 100644
--- a/asm/unk_text_util.s
+++ b/asm/unk_text_util.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_813CC90
-sub_813CC90: @ 813CC90
+ thumb_func_start UnkTextUtil_Reset
+UnkTextUtil_Reset: @ 813CC90
push {lr}
ldr r1, _0813CCA8 @ =gUnknown_203F34C
movs r2, 0
@@ -21,10 +21,10 @@ _0813CC9A:
bx r0
.align 2, 0
_0813CCA8: .4byte gUnknown_203F34C
- thumb_func_end sub_813CC90
+ thumb_func_end UnkTextUtil_Reset
- thumb_func_start sub_813CCAC
-sub_813CCAC: @ 813CCAC
+ thumb_func_start UnkTextUtil_SetPtrI
+UnkTextUtil_SetPtrI: @ 813CCAC
push {lr}
adds r2, r1, 0
lsls r0, 24
@@ -40,10 +40,10 @@ _0813CCC0:
bx r0
.align 2, 0
_0813CCC4: .4byte gUnknown_203F34C
- thumb_func_end sub_813CCAC
+ thumb_func_end UnkTextUtil_SetPtrI
- thumb_func_start sub_813CCC8
-sub_813CCC8: @ 813CCC8
+ thumb_func_start UnkTextUtil_StringExpandPlaceholders
+UnkTextUtil_StringExpandPlaceholders: @ 813CCC8
push {r4,r5,lr}
adds r2, r0, 0
adds r4, r1, 0
@@ -86,10 +86,10 @@ _0813CD08:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_813CCC8
+ thumb_func_end UnkTextUtil_StringExpandPlaceholders
- thumb_func_start sub_813CD14
-sub_813CD14: @ 813CD14
+ thumb_func_start UnkTextUtil_GetPtrI
+UnkTextUtil_GetPtrI: @ 813CD14
lsls r0, 24
ldr r1, _0813CD20 @ =gUnknown_203F34C
lsrs r0, 22
@@ -98,7 +98,7 @@ sub_813CD14: @ 813CD14
bx lr
.align 2, 0
_0813CD20: .4byte gUnknown_203F34C
- thumb_func_end sub_813CD14
+ thumb_func_end UnkTextUtil_GetPtrI
thumb_func_start sub_813CD24
sub_813CD24: @ 813CD24
diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s
index 276c71fb5..b7dcce10e 100644
--- a/asm/vs_seeker.s
+++ b/asm/vs_seeker.s
@@ -611,7 +611,7 @@ _0810CB2C:
movs r0, 0x15
bl sub_80722CC
ldr r0, _0810CB6C @ =0x00000801
- bl sub_806E680
+ bl FlagSet
bl sub_810C640
movs r0, 0x2
b _0810CB7E
@@ -820,7 +820,7 @@ _0810CCF0: .4byte 0x0000082c
_0810CCF4:
ldr r0, _0810CD10 @ =0x00000844
_0810CCF6:
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _0810CD0A
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s
index 8ea971d38..a2b7ffed7 100644
--- a/asm/wild_encounter.s
+++ b/asm/wild_encounter.s
@@ -14,8 +14,8 @@ sub_8082740: @ 8082740
_08082748: .4byte gUnknown_20386DC
thumb_func_end sub_8082740
- thumb_func_start sub_808274C
-sub_808274C: @ 808274C
+ thumb_func_start ChooseWildMonIndex_Land
+ChooseWildMonIndex_Land: @ 808274C
push {lr}
bl Random
lsls r0, 16
@@ -119,10 +119,10 @@ _08082800:
_08082802:
pop {r1}
bx r1
- thumb_func_end sub_808274C
+ thumb_func_end ChooseWildMonIndex_Land
- thumb_func_start sub_8082808
-sub_8082808: @ 8082808
+ thumb_func_start ChooseWildMonIndex_WaterRock
+ChooseWildMonIndex_WaterRock: @ 8082808
push {lr}
bl Random
lsls r0, 16
@@ -168,10 +168,10 @@ _08082856:
_08082858:
pop {r1}
bx r1
- thumb_func_end sub_8082808
+ thumb_func_end ChooseWildMonIndex_WaterRock
- thumb_func_start sub_808285C
-sub_808285C: @ 808285C
+ thumb_func_start ChooseWildMonIndex_Fishing
+ChooseWildMonIndex_Fishing: @ 808285C
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -259,7 +259,7 @@ _080828F0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_808285C
+ thumb_func_end ChooseWildMonIndex_Fishing
thumb_func_start sub_80828F8
sub_80828F8: @ 80828F8
@@ -325,7 +325,7 @@ _08082944:
cmp r0, r6
bne _08082980
ldr r0, _0808299C @ =0x00004024
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0x8
@@ -372,7 +372,7 @@ _080829BC: .4byte 0x0000ffff
sub_80829C0: @ 80829C0
push {lr}
ldr r0, _080829EC @ =0x00000849
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
cmp r0, 0
bne _080829F4
@@ -547,10 +547,10 @@ _08082B10:
beq _08082B1C
b _08082B24
_08082B16:
- bl sub_808274C
+ bl ChooseWildMonIndex_Land
b _08082B20
_08082B1C:
- bl sub_8082808
+ bl ChooseWildMonIndex_WaterRock
_08082B20:
lsls r0, 24
lsrs r6, r0, 24
@@ -593,7 +593,7 @@ sub_8082B64: @ 8082B64
adds r6, r0, 0
lsls r0, r1, 24
lsrs r0, 24
- bl sub_808285C
+ bl ChooseWildMonIndex_Fishing
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -729,7 +729,7 @@ sub_8082C58: @ 8082C58
cmp r0, 0
bne _08082C84
adds r0, r4, 0
- bl sub_8040D7C
+ bl GetMonAbility
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1207,7 +1207,7 @@ _08083028:
_0808302E:
movs r0, 0x1
strb r0, [r6]
- bl sub_8082808
+ bl ChooseWildMonIndex_WaterRock
lsls r0, 24
ldr r1, [r4, 0x4]
b _08083068
@@ -1223,12 +1223,12 @@ _0808303C:
bls _08083060
movs r0, 0x1
strb r0, [r6]
- bl sub_8082808
+ bl ChooseWildMonIndex_WaterRock
lsls r0, 24
ldr r1, [r4, 0x4]
b _08083068
_08083060:
- bl sub_808274C
+ bl ChooseWildMonIndex_Land
lsls r0, 24
ldr r1, [r5, 0x4]
_08083068:
@@ -1259,7 +1259,7 @@ sub_8083074: @ 8083074
ldr r4, [r0]
cmp r4, 0
beq _080830B0
- bl sub_8082808
+ bl ChooseWildMonIndex_WaterRock
lsls r0, 24
ldr r1, [r4, 0x4]
lsrs r0, 22
@@ -1280,7 +1280,7 @@ _080830B2:
thumb_func_start sub_80830B8
sub_80830B8: @ 80830B8
push {r4,r5,lr}
- bl sub_811B0D0
+ bl InUnionRoom
cmp r0, 0x1
beq _08083104
ldr r0, _080830F8 @ =gUnknown_203ADFA
@@ -1289,7 +1289,7 @@ sub_80830B8: @ 80830B8
beq _08083104
ldr r5, _080830FC @ =0x00004020
adds r0, r5, 0
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -1299,7 +1299,7 @@ sub_80830B8: @ 80830B8
lsrs r4, 16
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806E584
+ bl VarSet
cmp r4, 0
bne _08083104
ldr r0, _08083100 @ =gUnknown_81BFB65
@@ -1324,7 +1324,7 @@ sub_808310C: @ 808310C
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08083158 @ =0x00004020
- bl sub_806E568
+ bl VarGet
lsls r0, 16
cmp r0, 0
beq _08083152
@@ -1404,7 +1404,7 @@ _08083198:
sub_80831A0: @ 80831A0
push {lr}
ldr r0, _080831B4 @ =0x00000803
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1415,7 +1415,7 @@ sub_80831A0: @ 80831A0
_080831B4: .4byte 0x00000803
_080831B8:
ldr r0, _080831CC @ =0x00000804
- bl sub_806E6D0
+ bl FlagGet
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1747,7 +1747,7 @@ sub_8083410: @ 8083410
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0808342C @ =0x00004020
- bl sub_806E568
+ bl VarGet
lsls r0, 16
cmp r0, 0
bne _08083434
diff --git a/asm/wild_pokemon_area.s b/asm/wild_pokemon_area.s
index f4cf78c1d..26c908a14 100644
--- a/asm/wild_pokemon_area.s
+++ b/asm/wild_pokemon_area.s
@@ -32,7 +32,7 @@ _0813CA02:
movs r0, 0
str r0, [sp, 0x18]
ldr r0, _0813CA74 @ =0x00004024
- bl sub_806E568
+ bl VarGet
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x1C]
diff --git a/asm/window.s b/asm/window.s
index 94f629daa..61883168a 100644
--- a/asm/window.s
+++ b/asm/window.s
@@ -119,7 +119,7 @@ _08003BCC:
adds r4, r0, 0
cmp r4, 0
bne _08003C0C
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
b _08003BB4
.align 2, 0
_08003C04: .4byte gUnknown_3003E40
@@ -405,8 +405,8 @@ _08003E34: .4byte gUnknown_20204B4
_08003E38: .4byte gUnknown_3003D8C
thumb_func_end sub_8003CE4
- thumb_func_start sub_8003E3C
-sub_8003E3C: @ 8003E3C
+ thumb_func_start RemoveWindow
+RemoveWindow: @ 8003E3C
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -473,10 +473,10 @@ _08003EBC: .4byte gUnknown_3003D8C
_08003EC0: .4byte gUnknown_81EA144
_08003EC4: .4byte gUnknown_3003E40
_08003EC8: .4byte nullsub_6
- thumb_func_end sub_8003E3C
+ thumb_func_end RemoveWindow
- thumb_func_start sub_8003ECC
-sub_8003ECC: @ 8003ECC
+ thumb_func_start FreeAllWindowBuffers
+FreeAllWindowBuffers: @ 8003ECC
push {r4-r6,lr}
ldr r4, _08003F14 @ =gUnknown_3003E40
movs r5, 0x3
@@ -519,10 +519,10 @@ _08003F06:
_08003F14: .4byte gUnknown_3003E40
_08003F18: .4byte nullsub_6
_08003F1C: .4byte gUnknown_20204B4
- thumb_func_end sub_8003ECC
+ thumb_func_end FreeAllWindowBuffers
- thumb_func_start sub_8003F20
-sub_8003F20: @ 8003F20
+ thumb_func_start CopyWindowToVram
+CopyWindowToVram: @ 8003F20
push {r4-r6,lr}
sub sp, 0xC
lsls r0, 24
@@ -587,7 +587,7 @@ _08003F96:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8003F20
+ thumb_func_end CopyWindowToVram
thumb_func_start PutWindowTilemap
PutWindowTilemap: @ 8003FA0
@@ -978,7 +978,7 @@ BlitBitmapRectToWindow: @ 80041F0
movs r0, 0
str r0, [sp, 0x10]
add r0, sp, 0x14
- bl sub_8004AA4
+ bl BlitBitmapRect4Bit
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -1078,7 +1078,7 @@ BlitBitmapRectToWindowWithColorKey: @ 80042B0
ldr r6, [sp, 0x24]
str r6, [sp, 0x10]
add r0, sp, 0x14
- bl sub_8004AA4
+ bl BlitBitmapRect4Bit
add sp, 0x28
pop {r3-r5}
mov r8, r3
@@ -1149,7 +1149,7 @@ FillWindowPixelRect: @ 8004378
add r0, sp, 0x8
adds r1, r2, 0
mov r2, r9
- bl sub_8004C84
+ bl FillBitmapRect4Bit
add sp, 0x10
pop {r3,r4}
mov r8, r3
diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s
index fb6f90d04..9b7bf922a 100644
--- a/asm/wireless_communication_status_screen.s
+++ b/asm/wireless_communication_status_screen.s
@@ -88,7 +88,7 @@ sub_814F1E4: @ 814F1E4
bl CopyToBgTilemapBuffer
ldr r0, _0814F318 @ =gUnknown_846FA7C
bl sub_8003B24
- bl sub_8002C28
+ bl DeactivateAllTextPrinters
bl ResetPaletteFade
bl ResetSpriteData
bl ResetTasks
@@ -131,7 +131,7 @@ sub_814F1E4: @ 814F1E4
bl LoadPalette
movs r0, 0xF0
bl sub_80F77CC
- bl sub_813CC90
+ bl UnkTextUtil_Reset
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -170,7 +170,7 @@ _0814F328: .4byte sub_814F19C
thumb_func_start sub_814F32C
sub_814F32C: @ 814F32C
push {r4,lr}
- bl sub_8003ECC
+ bl FreeAllWindowBuffers
movs r4, 0
_0814F334:
lsls r0, r4, 24
@@ -309,12 +309,12 @@ _0814F3F0:
bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
movs r0, 0x1
bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
- bl sub_8003F20
+ bl CopyWindowToVram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -470,7 +470,7 @@ _0814F58A:
bl PutWindowTilemap
movs r0, 0x2
movs r1, 0x3
- bl sub_8003F20
+ bl CopyWindowToVram
_0814F5A4:
ldr r0, _0814F5F8 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]