summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-17 02:41:13 -0800
committersceptillion <33798691+sceptillion@users.noreply.github.com>2017-12-17 02:41:13 -0800
commitb5d877603b9d9ef0d1964aceb1430fe6a540f1c5 (patch)
treed8579e53ef26f0824e8caf93bb9fed1b24ca24b6
parent670fef77ac4d9116d5fdc28c0da40622919a062b (diff)
import function names from pokeemerald
-rw-r--r--asm/bag.s26
-rw-r--r--asm/battle_1.s106
-rw-r--r--asm/battle_2.s818
-rw-r--r--asm/battle_ai_script_commands.s232
-rw-r--r--asm/battle_ai_switch_items.s182
-rw-r--r--asm/battle_anim.s454
-rw-r--r--asm/battle_anim_8074480.s364
-rw-r--r--asm/battle_anim_8078178.s66
-rw-r--r--asm/battle_anim_80989F8.s124
-rw-r--r--asm/battle_anim_80A22E8.s3414
-rw-r--r--asm/battle_anim_80DE2C0.s654
-rw-r--r--asm/battle_anim_80EEC0C.s440
-rw-r--r--asm/battle_anim_sound_tasks.s80
-rw-r--r--asm/battle_controller_link_opponent.s600
-rw-r--r--asm/battle_controller_link_partner.s288
-rw-r--r--asm/battle_controller_oak.s656
-rw-r--r--asm/battle_controller_opponent.s336
-rw-r--r--asm/battle_controller_player.s838
-rw-r--r--asm/battle_controller_pokedude.s424
-rw-r--r--asm/battle_controller_safari.s282
-rw-r--r--asm/battle_controllers.s350
-rw-r--r--asm/battle_dome_cards.s74
-rw-r--r--asm/battle_gfx_sfx_util.s526
-rw-r--r--asm/battle_interface.s408
-rw-r--r--asm/battle_message.s122
-rw-r--r--asm/battle_records.s152
-rw-r--r--asm/battle_script_commands.s2656
-rw-r--r--asm/battle_setup.s166
-rw-r--r--asm/battle_tower.s80
-rw-r--r--asm/battle_transition.s358
-rw-r--r--asm/battle_util.s484
-rw-r--r--asm/battle_util2.s70
-rw-r--r--asm/berry_fix_program.s28
-rw-r--r--asm/berry_pouch.s310
-rw-r--r--asm/bg.s534
-rw-r--r--asm/bike.s16
-rw-r--r--asm/blend_palette.s6
-rw-r--r--asm/box_party_pokemon_dropdown.s12
-rw-r--r--asm/braille_text.s10
-rw-r--r--asm/buy_menu_helpers.s14
-rw-r--r--asm/cable_club.s158
-rw-r--r--asm/calculate_base_damage.s16
-rw-r--r--asm/cereader_tool.s8
-rw-r--r--asm/clear_save_data_screen.s70
-rw-r--r--asm/coins.s10
-rw-r--r--asm/credits.s256
-rw-r--r--asm/daycare.s554
-rw-r--r--asm/decompress.s60
-rw-r--r--asm/diploma.s98
-rw-r--r--asm/dma3_manager.s30
-rw-r--r--asm/easy_chat.s34
-rw-r--r--asm/egg_hatch.s304
-rw-r--r--asm/evolution_graphics.s260
-rw-r--r--asm/evolution_scene.s598
-rw-r--r--asm/fame_checker.s366
-rw-r--r--asm/field_camera.s222
-rw-r--r--asm/field_control_avatar.s120
-rw-r--r--asm/field_door.s14
-rw-r--r--asm/field_effect.s1062
-rw-r--r--asm/field_effect_helpers.s300
-rw-r--r--asm/field_fadetransition.s346
-rw-r--r--asm/field_ground_effect.s490
-rw-r--r--asm/field_map_obj.s1946
-rw-r--r--asm/field_message_box.s52
-rw-r--r--asm/field_player_avatar.s494
-rw-r--r--asm/field_poison.s48
-rw-r--r--asm/field_screen_effect.s130
-rw-r--r--asm/field_specials.s360
-rw-r--r--asm/field_tasks.s34
-rw-r--r--asm/field_weather.s68
-rw-r--r--asm/field_weather_effects.s172
-rw-r--r--asm/fieldmap.s118
-rw-r--r--asm/fldeff_cut.s52
-rw-r--r--asm/fldeff_flash.s142
-rw-r--r--asm/fldeff_poison.s8
-rw-r--r--asm/fldeff_softboiled.s26
-rw-r--r--asm/fldeff_strength.s18
-rw-r--r--asm/fldeff_sweetscent.s32
-rw-r--r--asm/fldeff_teleport.s12
-rw-r--r--asm/gpu_regs.s80
-rw-r--r--asm/hall_of_fame.s334
-rw-r--r--asm/help_system.s54
-rw-r--r--asm/help_system_812B1E0.s6
-rw-r--r--asm/hof_pc.s24
-rw-r--r--asm/intro.s564
-rw-r--r--asm/item.s186
-rw-r--r--asm/item_menu.s450
-rw-r--r--asm/item_menu_icons.s54
-rw-r--r--asm/item_pc.s230
-rw-r--r--asm/item_use.s126
-rw-r--r--asm/itemfinder.s52
-rw-r--r--asm/learn_move.s190
-rw-r--r--asm/librfu.s664
-rw-r--r--asm/link.s304
-rw-r--r--asm/link_rfu.s332
-rw-r--r--asm/link_rfu_2.s284
-rw-r--r--asm/link_rfu_3.s758
-rw-r--r--asm/link_rfu_4.s148
-rw-r--r--asm/list_menu.s194
-rw-r--r--asm/load_save.s52
-rw-r--r--asm/m4a_1.s30
-rw-r--r--asm/mail.s122
-rw-r--r--asm/mail_data.s26
-rw-r--r--asm/mailbox_pc.s16
-rw-r--r--asm/main.s116
-rw-r--r--asm/main_menu.s232
-rw-r--r--asm/malloc.s54
-rw-r--r--asm/map_name_popup.s36
-rw-r--r--asm/map_obj_80688E4.s134
-rw-r--r--asm/map_obj_lock.s54
-rw-r--r--asm/map_preview_screen.s82
-rw-r--r--asm/math_util.s6
-rw-r--r--asm/menews_jisan.s4
-rw-r--r--asm/menu.s222
-rw-r--r--asm/menu_helpers.s36
-rw-r--r--asm/menu_indicators.s182
-rw-r--r--asm/metatile_behavior.s114
-rw-r--r--asm/mevent.s60
-rw-r--r--asm/mevent_8145654.s226
-rw-r--r--asm/mevent_server.s76
-rw-r--r--asm/mon_markings.s46
-rw-r--r--asm/money.s38
-rw-r--r--asm/multiboot.s94
-rw-r--r--asm/mystery_event_script.s74
-rw-r--r--asm/mystery_gift_menu.s122
-rw-r--r--asm/naming_screen.s332
-rw-r--r--asm/new_game.s38
-rw-r--r--asm/new_menu_helpers.s260
-rw-r--r--asm/oak_speech.s452
-rw-r--r--asm/option_menu.s150
-rw-r--r--asm/overworld.s978
-rw-r--r--asm/palette.s282
-rw-r--r--asm/party_menu.s1248
-rw-r--r--asm/pc_screen_effect.s68
-rw-r--r--asm/play_time.s28
-rw-r--r--asm/player_pc.s134
-rw-r--r--asm/pokeball.s330
-rw-r--r--asm/pokedex.s2
-rw-r--r--asm/pokedex_area_markers.s64
-rw-r--r--asm/pokedex_screen.s810
-rw-r--r--asm/pokemon_1.s386
-rw-r--r--asm/pokemon_2.s310
-rw-r--r--asm/pokemon_3.s434
-rw-r--r--asm/pokemon_icon.s42
-rw-r--r--asm/pokemon_item_effect.s156
-rw-r--r--asm/pokemon_size_record.s62
-rw-r--r--asm/pokemon_special_anim.s396
-rw-r--r--asm/pokemon_storage_system.s1264
-rw-r--r--asm/pokemon_summary_screen.s970
-rw-r--r--asm/post_battle_event_funcs.s10
-rw-r--r--asm/prof_pc.s2
-rw-r--r--asm/quest_log.s266
-rw-r--r--asm/quest_log_8150454.s46
-rw-r--r--asm/quest_log_battle.s40
-rw-r--r--asm/random.s6
-rw-r--r--asm/region_map.s498
-rw-r--r--asm/reset_save_heap.s8
-rw-r--r--asm/reshow_battle_screen.s154
-rw-r--r--asm/roamer.s78
-rw-r--r--asm/rom6.s82
-rw-r--r--asm/roulette_util.s8
-rw-r--r--asm/safari_zone.s26
-rw-r--r--asm/save.s164
-rw-r--r--asm/save_failed_screen.s22
-rw-r--r--asm/save_location.s38
-rw-r--r--asm/save_menu_util.s2
-rw-r--r--asm/scrcmd.s1388
-rw-r--r--asm/script.s234
-rw-r--r--asm/script_menu.s102
-rw-r--r--asm/script_movement.s40
-rw-r--r--asm/script_pokemon_util_80A0058.s66
-rw-r--r--asm/script_pokemon_util_80BF8FC.s42
-rw-r--r--asm/seagallop.s172
-rw-r--r--asm/shop.s318
-rw-r--r--asm/slot_machine.s294
-rw-r--r--asm/smokescreen.s34
-rw-r--r--asm/sound.s324
-rw-r--r--asm/sprite.s814
-rw-r--r--asm/ss_anne.s28
-rw-r--r--asm/start_menu.s116
-rw-r--r--asm/string_util.s154
-rw-r--r--asm/task.s84
-rw-r--r--asm/teachy_tv.s254
-rw-r--r--asm/text.s108
-rw-r--r--asm/text_window.s108
-rw-r--r--asm/tileset_anims.s44
-rw-r--r--asm/title_screen.s280
-rw-r--r--asm/tm_case.s368
-rw-r--r--asm/trade.s1170
-rw-r--r--asm/trainer_card.s314
-rw-r--r--asm/trainer_see.s160
-rw-r--r--asm/trainer_tower.s50
-rw-r--r--asm/trig.s26
-rw-r--r--asm/union_room_chat.s372
-rw-r--r--asm/unk_810C3A4.s14
-rw-r--r--asm/unk_8147500.s30
-rw-r--r--asm/unk_8147AA8.s308
-rw-r--r--asm/unk_814B6F0.s50
-rw-r--r--asm/unk_814BB4C.s100
-rw-r--r--asm/unk_814D5C8.s234
-rw-r--r--asm/unk_81507FC.s526
-rw-r--r--asm/unk_8159F40.s12
-rw-r--r--asm/unk_815C980.s24
-rw-r--r--asm/unk_815EDDC.s8
-rw-r--r--asm/unk_815F138.s36
-rw-r--r--asm/unk_text_util.s2
-rw-r--r--asm/unknown_task.s30
-rw-r--r--asm/util.s58
-rw-r--r--asm/vs_seeker.s50
-rw-r--r--asm/wild_encounter.s52
-rw-r--r--asm/wild_pokemon_area.s2
-rw-r--r--asm/window.s126
-rw-r--r--asm/window_8bpp.s56
-rw-r--r--asm/wireless_communication_status_screen.s112
214 files changed, 26538 insertions, 26538 deletions
diff --git a/asm/bag.s b/asm/bag.s
index ee29b1e58..53af0595c 100644
--- a/asm/bag.s
+++ b/asm/bag.s
@@ -38,21 +38,21 @@ _0810B87A:
ldr r0, _0810B8E8 @ =gUnknown_8453098
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0
_0810B8A8:
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _0810B8A8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r4, 0
ldr r3, _0810B8EC @ =gUnknown_203AD34
movs r2, 0xFF
@@ -169,7 +169,7 @@ sub_810B994: @ 810B994
movs r1, 0
movs r2, 0x81
movs r3, 0xC
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r4, _0810B9D8 @ =gUnknown_84162E8
movs r0, 0
adds r1, r4, 0
@@ -221,7 +221,7 @@ sub_810B9DC: @ 810B9DC
movs r1, 0
movs r2, 0x64
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
b _0810BA24
.align 2, 0
_0810BA10: .4byte gUnknown_203AD34
@@ -231,10 +231,10 @@ _0810BA18:
movs r1, 0
movs r2, 0x81
movs r3, 0xC
- bl sub_810F2E8
+ bl SetWindowBorderStyle
_0810BA24:
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0810BA2A:
ldr r0, _0810BA38 @ =gUnknown_203AD34
adds r0, r5, r0
@@ -258,11 +258,11 @@ sub_810BA3C: @ 810BA3C
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -310,13 +310,13 @@ sub_810BA9C: @ 810BA9C
movs r1, 0
bl sub_810F260
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
_0810BACE:
diff --git a/asm/battle_1.s b/asm/battle_1.s
index 704f6c0ef..98a40cd81 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -8,12 +8,12 @@
thumb_func_start sub_800F1E8
sub_800F1E8: @ 800F1E8
push {lr}
- bl sub_8006B10
+ bl ResetSpriteData
ldr r0, _0800F21C @ =gUnknown_824EFF0
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _0800F220 @ =gUnknown_202063C
@@ -27,7 +27,7 @@ sub_800F1E8: @ 800F1E8
orrs r0, r2
strb r0, [r1]
ldr r0, _0800F224 @ =sub_800F228
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -39,8 +39,8 @@ _0800F224: .4byte sub_800F228
thumb_func_start sub_800F228
sub_800F228: @ 800F228
push {lr}
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r0}
bx r0
thumb_func_end sub_800F228
@@ -87,18 +87,18 @@ _0800F26C:
adds r0, r4, r5
ldr r0, [r0]
ldr r1, _0800F2A4 @ =0x06008000
- bl sub_800EBC0
+ bl LZDecompressVram
adds r0, r5, 0x4
adds r0, r4, r0
ldr r0, [r0]
ldr r1, _0800F2A8 @ =0x0600d000
- bl sub_800EBC0
+ bl LZDecompressVram
adds r5, 0x10
adds r4, r5
ldr r0, [r4]
movs r1, 0x20
movs r2, 0x60
- bl sub_80703A8
+ bl LoadCompressedPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -126,12 +126,12 @@ _0800F2B8:
adds r0, r4, r0
ldr r0, [r0]
ldr r1, _0800F2E4 @ =0x06004000
- bl sub_800EBC0
+ bl LZDecompressVram
adds r5, 0xC
adds r4, r5
ldr r0, [r4]
ldr r1, _0800F2E8 @ =0x0600e000
- bl sub_800EBC0
+ bl LZDecompressVram
pop {r4,r5}
pop {r0}
bx r0
@@ -197,20 +197,20 @@ _0800F348: .4byte gUnknown_8248330
sub_800F34C: @ 800F34C
push {lr}
movs r0, 0xC5
- bl sub_8000B68
+ bl EnableInterrupts
bl sub_800F324
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0800F37C @ =0x0000b040
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -297,18 +297,18 @@ sub_800F420: @ 800F420
ldr r0, _0800F454 @ =gUnknown_8D00000
movs r1, 0xC0
lsls r1, 19
- bl sub_800EBC0
+ bl LZDecompressVram
ldr r1, _0800F458 @ =gUnknown_8D0051C
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0800F45C @ =gUnknown_8D004D8
movs r1, 0
movs r2, 0x40
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_800F380
bl sub_800F40C
pop {r0}
@@ -440,9 +440,9 @@ _0800F50E:
add r1, sp, 0xC
mov r2, r12
mov r3, r9
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
mov r0, r8
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0800F5B6
.align 2, 0
_0800F544: .4byte 0x00006001
@@ -498,9 +498,9 @@ _0800F582:
add r1, sp, 0xC
mov r2, r12
mov r3, r9
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
mov r0, r8
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0800F5B6:
add sp, 0x18
pop {r3,r4}
@@ -836,7 +836,7 @@ _0800F848: .4byte gUnknown_202273C
_0800F84C: .4byte gUnknown_3005090
_0800F850:
ldr r0, _0800F8CC @ =0x00002710
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
ldr r2, _0800F8D0 @ =gUnknown_20371F8
lsrs r0, 19
@@ -852,7 +852,7 @@ _0800F850:
movs r1, 0x6C
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _0800F8E4 @ =gUnknown_2023FE8
ldr r1, [r4]
adds r1, 0x7D
@@ -861,7 +861,7 @@ _0800F850:
movs r1, 0x84
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x7E
strb r0, [r1]
@@ -910,7 +910,7 @@ _0800F8F0:
beq _0800F958
ldr r4, _0800F944 @ =gUnknown_2022978
ldrh r0, [r5, 0xA]
- bl sub_8044E6C
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -925,7 +925,7 @@ _0800F90A:
strh r0, [r4]
ldr r4, _0800F948 @ =gUnknown_202297C
ldrh r0, [r5, 0xC]
- bl sub_8044E6C
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -954,7 +954,7 @@ _0800F954: .4byte gUnknown_202297E
_0800F958:
ldr r4, _0800F9E8 @ =gUnknown_2022978
ldrh r0, [r5, 0xA]
- bl sub_8044E6C
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -969,7 +969,7 @@ _0800F96A:
strh r0, [r4]
ldr r4, _0800F9EC @ =gUnknown_202297A
ldrh r0, [r5, 0xA]
- bl sub_8044EB0
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -981,7 +981,7 @@ _0800F988:
strh r0, [r4]
ldr r4, _0800F9F0 @ =gUnknown_202297C
ldrh r0, [r5, 0xC]
- bl sub_8044E6C
+ bl Sin2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -996,7 +996,7 @@ _0800F9A0:
strh r0, [r4]
ldr r4, _0800F9F4 @ =gUnknown_202297E
ldrh r0, [r5, 0xC]
- bl sub_8044EB0
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -1040,7 +1040,7 @@ _0800FA08:
movs r0, 0x71
bl sub_80722CC
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
ldr r4, _0800FAD0 @ =gUnknown_202063C
ldr r5, _0800FAD4 @ =gUnknown_2023FE8
ldr r0, [r5]
@@ -1154,42 +1154,42 @@ sub_800FAE0: @ 800FAE0
beq _0800FB94
ldr r0, _0800FB68 @ =gUnknown_8E7737C
ldr r1, _0800FB6C @ =0x06004000
- bl sub_800EBC0
+ bl LZDecompressVram
ldr r0, _0800FB70 @ =gUnknown_8E77598
ldr r1, _0800FB74 @ =0x06010000
- bl sub_800EBC0
+ bl LZDecompressVram
ldr r0, _0800FB78 @ =gUnknown_8E77570
movs r1, 0x60
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
ldr r1, _0800FB7C @ =0x00005c04
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _0800FB80 @ =gUnknown_8E77464
movs r0, 0x1
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x2
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x48
movs r1, 0x36
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x36
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800FB84 @ =gUnknown_202297A
ldr r2, _0800FB88 @ =0x0000ff5c
adds r1, r2, 0
@@ -1270,7 +1270,7 @@ _0800FBF8:
_0800FC00: .4byte gUnknown_823EAC8
_0800FC04: .4byte gUnknown_20386AE
_0800FC08:
- bl sub_8056288
+ bl sav1_map_get_battletype
lsls r0, 24
cmp r0, 0
bne _0800FC20
@@ -1341,7 +1341,7 @@ _0800FC88:
movs r0, 0x13
b _0800FCAA
_0800FC90:
- bl sub_8056288
+ bl sav1_map_get_battletype
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1388,7 +1388,7 @@ _0800FCEC:
ldr r0, _0800FCF8 @ =gUnknown_8D00000
movs r1, 0xC0
lsls r1, 19
- bl sub_800EBC0
+ bl LZDecompressVram
b _0800FD94
.align 2, 0
_0800FCF8: .4byte gUnknown_8D00000
@@ -1397,9 +1397,9 @@ _0800FCFC:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0800FD94
.align 2, 0
_0800FD10: .4byte gUnknown_8D0051C
@@ -1407,7 +1407,7 @@ _0800FD14:
ldr r0, _0800FD20 @ =gUnknown_8D004D8
movs r1, 0
movs r2, 0x40
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0800FD94
.align 2, 0
_0800FD20: .4byte gUnknown_8D004D8
@@ -1422,7 +1422,7 @@ _0800FD24:
adds r0, r1
ldr r0, [r0]
ldr r1, _0800FD60 @ =0x06008000
- bl sub_800EBC0
+ bl LZDecompressVram
_0800FD3E:
bl sub_800FC2C
lsls r0, 24
@@ -1435,7 +1435,7 @@ _0800FD3E:
adds r0, r1
ldr r0, [r0]
ldr r1, _0800FD64 @ =0x0600d000
- bl sub_800EBC0
+ bl LZDecompressVram
b _0800FD94
.align 2, 0
_0800FD5C: .4byte gUnknown_824EE34
@@ -1454,7 +1454,7 @@ _0800FD68:
ldr r0, [r0]
movs r1, 0x20
movs r2, 0x60
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0800FD94
.align 2, 0
_0800FD88: .4byte gUnknown_824EE34
diff --git a/asm/battle_2.s b/asm/battle_2.s
index dfaf2f25a..73433fc27 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -11,7 +11,7 @@ sub_800FD9C: @ 800FD9C
bl sub_804C0A4
bl sub_802E03C
bl sub_8033DB8
- bl sub_80358D4
+ bl AllocateMonSpritesGfx
ldr r4, _0800FDCC @ =gUnknown_2022B4C
ldr r0, [r4]
movs r1, 0x40
@@ -20,7 +20,7 @@ sub_800FD9C: @ 800FD9C
beq _0800FDD8
bl sub_800D230
ldr r0, _0800FDD0 @ =sub_80109C8
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _0800FDD4 @ =gUnknown_2023E82
movs r0, 0
strb r0, [r1]
@@ -73,9 +73,9 @@ sub_800FE24: @ 800FE24
push {r4,r5,lr}
sub sp, 0x4
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
str r0, [sp]
movs r1, 0xC0
@@ -85,26 +85,26 @@ sub_800FE24: @ 800FE24
bl CpuSet
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _0800FF2C @ =0x00005051
movs r0, 0x44
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0800FF30 @ =gUnknown_2022984
movs r0, 0xF0
strh r0, [r1]
ldr r0, _0800FF34 @ =gUnknown_2022986
strh r4, [r0]
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _0800FF38 @ =gUnknown_2038700
movs r3, 0xF0
movs r1, 0xF0
@@ -139,7 +139,7 @@ _0800FEA6:
ldr r1, [r4, 0x4]
ldr r2, [r4, 0x8]
bl sub_8087EE4
- bl sub_8070528
+ bl ResetPaletteFade
ldr r0, _0800FF44 @ =gUnknown_2022974
movs r1, 0
strh r1, [r0]
@@ -162,15 +162,15 @@ _0800FEA6:
strb r0, [r1]
bl sub_800F34C
bl sub_800F420
- bl sub_8006B10
- bl sub_80773BC
+ bl ResetSpriteData
+ bl ResetTasks
bl sub_800FAE0
- bl sub_80088F0
+ bl FreeAllSpritePalettes
ldr r1, _0800FF68 @ =gUnknown_3003E58
movs r0, 0x4
strb r0, [r1]
ldr r0, _0800FF6C @ =sub_80116F4
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_800D278
ldr r0, _0800FF70 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -179,7 +179,7 @@ _0800FEA6:
cmp r0, 0
beq _0800FF78
ldr r0, _0800FF74 @ =sub_8010BA0
- bl sub_8000544
+ bl SetMainCallback2
b _0800FF7E
.align 2, 0
_0800FF28: .4byte 0x05006000
@@ -204,7 +204,7 @@ _0800FF70: .4byte gUnknown_2022B4C
_0800FF74: .4byte sub_8010BA0
_0800FF78:
ldr r0, _0800FFCC @ =sub_8010508
- bl sub_8000544
+ bl SetMainCallback2
_0800FF7E:
ldr r0, _0800FFD0 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -275,17 +275,17 @@ _08010002:
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r5, 0
beq _0801007E
@@ -939,10 +939,10 @@ _080104FC:
thumb_func_start sub_8010508
sub_8010508: @ 8010508
push {r4-r6,lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_800A404
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl GetMultiplayerId
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08010540 @ =gUnknown_2023FE8
@@ -987,18 +987,18 @@ _0801054C:
.4byte _08010834
.4byte _0801084C
_08010590:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080105BC
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
bl sub_80357C8
ldr r1, _080105CC @ =gUnknown_2023E82
movs r0, 0x1
@@ -1046,13 +1046,13 @@ _080105EC:
strb r6, [r0]
bl sub_800FFEC
bl sub_80100B8
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, r5
movs r2, 0x20
- bl sub_800A448
+ bl SendBlock
ldr r0, _08010650 @ =gUnknown_2023E82
strb r6, [r0]
_0801062A:
@@ -1085,21 +1085,21 @@ _08010658:
.align 2, 0
_0801066C: .4byte gUnknown_2023E82
_08010670:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x3
ands r1, r0
cmp r1, 0x3
beq _0801067E
b _080108B8
_0801067E:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r0, 0x2
adds r1, r4, 0
bl sub_8010414
bl sub_801017C
ldr r0, _080106E0 @ =sub_800F6FC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080106E4 @ =gUnknown_3005090
@@ -1148,26 +1148,26 @@ _080106F4:
bne _08010700
b _080108B8
_08010700:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _08010714 @ =gUnknown_2024284
movs r2, 0xC8
- bl sub_800A448
+ bl SendBlock
ldr r1, _08010718 @ =gUnknown_2023E82
b _080108B2
.align 2, 0
_08010714: .4byte gUnknown_2024284
_08010718: .4byte gUnknown_2023E82
_0801071C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x3
ands r1, r0
cmp r1, 0x3
beq _0801072A
b _080108B8
_0801072A:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _08010740 @ =gUnknown_202402C
lsls r1, r5, 8
ldr r2, _08010744 @ =gUnknown_2022118
@@ -1187,26 +1187,26 @@ _0801074C:
bne _08010758
b _080108B8
_08010758:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _0801076C @ =gUnknown_202434C
movs r2, 0xC8
- bl sub_800A448
+ bl SendBlock
ldr r1, _08010770 @ =gUnknown_2023E82
b _080108B2
.align 2, 0
_0801076C: .4byte gUnknown_202434C
_08010770: .4byte gUnknown_2023E82
_08010774:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x3
ands r1, r0
cmp r1, 0x3
beq _08010782
b _080108B8
_08010782:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _08010798 @ =gUnknown_20240F4
lsls r1, r5, 8
ldr r2, _0801079C @ =gUnknown_2022118
@@ -1226,24 +1226,24 @@ _080107A4:
bne _080107B0
b _080108B8
_080107B0:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _080107C4 @ =gUnknown_2024414
movs r2, 0xC8
- bl sub_800A448
+ bl SendBlock
ldr r1, _080107C8 @ =gUnknown_2023E82
b _080108B2
.align 2, 0
_080107C4: .4byte gUnknown_2024414
_080107C8: .4byte gUnknown_2023E82
_080107CC:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x3
ands r1, r0
cmp r1, 0x3
bne _080108B8
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r4, _08010820 @ =gUnknown_20241BC
lsls r1, r5, 8
ldr r0, _08010824 @ =gUnknown_2022118
@@ -1291,7 +1291,7 @@ _08010848: .4byte gUnknown_2023E82
_0801084C:
ldr r0, _08010880 @ =gUnknown_2023E83
adds r1, r0, 0x1
- bl sub_8034984
+ bl BattleInitAllSprites
lsls r0, 24
cmp r0, 0
beq _080108B8
@@ -1302,7 +1302,7 @@ _0801084C:
ldr r0, _0801088C @ =sub_80123E4
str r0, [r1]
ldr r0, _08010890 @ =sub_8011100
- bl sub_8000544
+ bl SetMainCallback2
ldr r2, _08010894 @ =gUnknown_2022B4C
ldr r1, [r2]
movs r0, 0x2
@@ -1369,7 +1369,7 @@ _080108DC:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
lsls r5, r1, 5
mov r1, r9
@@ -1377,7 +1377,7 @@ _080108DC:
strh r0, [r6]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6, 0x2]
mov r0, r9
adds r0, 0x4
@@ -1385,39 +1385,39 @@ _080108DC:
adds r0, r4, 0
movs r1, 0x2
adds r2, r7, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0xF]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6, 0x10]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6, 0x12]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
adds r1, 0x14
adds r1, r5, r1
str r0, [r1]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
add r5, r10
str r0, [r5]
adds r0, r4, 0
- bl sub_803F720
+ bl GetMonGender
strb r0, [r6, 0x1C]
adds r0, r7, 0
- bl sub_8009424
+ bl StripExtCtrlCodes
adds r0, r4, 0
movs r1, 0x3
- bl sub_803FBE8
+ bl GetMonData
mov r4, r8
adds r4, 0x1
cmp r0, 0x1
@@ -1478,7 +1478,7 @@ sub_80109C8: @ 80109C8
mov r7, r9
mov r6, r8
push {r6,r7}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r6, r0, 24
ldr r4, _08010A0C @ =gUnknown_2023FE8
@@ -1491,9 +1491,9 @@ sub_80109C8: @ 80109C8
mov r9, r1
adds r0, 0xAE
mov r8, r0
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
ldr r5, _08010A10 @ =gUnknown_2023E82
ldrb r0, [r5]
cmp r0, 0x1
@@ -1528,7 +1528,7 @@ _08010A2A:
b _08010B82
_08010A36:
bl sub_80108C4
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
@@ -1536,7 +1536,7 @@ _08010A36:
lsls r2, 1
adds r1, r2
movs r2, 0x60
- bl sub_800A448
+ bl SendBlock
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -1544,14 +1544,14 @@ _08010A36:
.align 2, 0
_08010A58: .4byte gUnknown_3003F64
_08010A5C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0xF
ands r1, r0
cmp r1, 0xF
beq _08010A6A
b _08010B82
_08010A6A:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r4, 0
lsls r0, r6, 3
subs r0, r6
@@ -1658,7 +1658,7 @@ _08010B2A:
ldr r0, [r2]
str r0, [r1, 0x8]
ldr r0, _08010B60 @ =sub_800FE24
- bl sub_8000544
+ bl SetMainCallback2
b _08010B82
.align 2, 0
_08010B54: .4byte gUnknown_3003F3C
@@ -1679,7 +1679,7 @@ _08010B64:
ldr r0, [r2]
str r0, [r1, 0x8]
ldr r0, _08010B9C @ =sub_800FE24
- bl sub_8000544
+ bl SetMainCallback2
_08010B82:
pop {r3,r4}
mov r8, r3
@@ -1699,16 +1699,16 @@ sub_8010BA0: @ 8010BA0
push {r4-r7,lr}
mov r7, r8
push {r7}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08010BD8 @ =gUnknown_2023FE8
ldr r0, [r0]
adds r0, 0xB5
strb r7, [r0]
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
ldr r0, _08010BDC @ =gUnknown_2023E82
ldrb r0, [r0]
cmp r0, 0xC
@@ -1740,18 +1740,18 @@ _08010BE4:
.4byte _0801106C
.4byte _08011084
_08010C18:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08010C44
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
bl sub_80357C8
ldr r1, _08010C54 @ =gUnknown_2023E82
movs r0, 0x1
@@ -1793,13 +1793,13 @@ _08010C66:
strb r0, [r1]
bl sub_800FFEC
bl sub_80100B8
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, r5
movs r2, 0x20
- bl sub_800A448
+ bl SendBlock
ldr r1, _08010CCC @ =gUnknown_2023E82
ldrb r0, [r1]
adds r0, 0x1
@@ -1822,14 +1822,14 @@ _08010CC8: .4byte 0x00000185
_08010CCC: .4byte gUnknown_2023E82
_08010CD0: .4byte gUnknown_3003F3C
_08010CD4:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0xF
ands r1, r0
cmp r1, 0xF
beq _08010CE2
b _080110F0
_08010CE2:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r0, 0x4
adds r1, r7, 0
bl sub_8010414
@@ -1842,7 +1842,7 @@ _08010CE2:
bl memcpy
ldr r0, _08010D54 @ =sub_800F6FC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08010D58 @ =gUnknown_3005090
@@ -1925,7 +1925,7 @@ _08010D9C:
cmp r6, 0
bge _08010D3A
bl sub_803DA14
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r1, _08010DD8 @ =gUnknown_2023E82
ldrb r0, [r1]
adds r0, 0x1
@@ -1937,26 +1937,26 @@ _08010DB6:
bne _08010DC2
b _080110F0
_08010DC2:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _08010DDC @ =gUnknown_201C000
movs r2, 0xC8
- bl sub_800A448
+ bl SendBlock
ldr r1, _08010DD8 @ =gUnknown_2023E82
b _080110EA
.align 2, 0
_08010DD8: .4byte gUnknown_2023E82
_08010DDC: .4byte gUnknown_201C000
_08010DE0:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0xF
ands r1, r0
cmp r1, 0xF
beq _08010DEE
b _080110F0
_08010DEE:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r6, 0
lsls r0, r7, 3
subs r0, r7
@@ -2090,26 +2090,26 @@ _08010ED8:
bne _08010EE4
b _080110F0
_08010EE4:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _08010EF8 @ =gUnknown_201C0C8
movs r2, 0x64
- bl sub_800A448
+ bl SendBlock
ldr r1, _08010EFC @ =gUnknown_2023E82
b _080110EA
.align 2, 0
_08010EF8: .4byte gUnknown_201C0C8
_08010EFC: .4byte gUnknown_2023E82
_08010F00:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0xF
ands r1, r0
cmp r1, 0xF
beq _08010F0E
b _080110F0
_08010F0E:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r6, 0
lsls r0, r7, 3
subs r0, r7
@@ -2295,7 +2295,7 @@ _08011080: .4byte gUnknown_2023E82
_08011084:
ldr r0, _080110B8 @ =gUnknown_2023E83
adds r1, r0, 0x1
- bl sub_8034984
+ bl BattleInitAllSprites
lsls r0, 24
cmp r0, 0
beq _080110F0
@@ -2306,7 +2306,7 @@ _08011084:
ldr r0, _080110C4 @ =sub_80123E4
str r0, [r1]
ldr r0, _080110C8 @ =sub_8011100
- bl sub_8000544
+ bl SetMainCallback2
ldr r2, _080110CC @ =gUnknown_2022B4C
ldr r1, [r2]
movs r0, 0x2
@@ -2357,11 +2357,11 @@ _080110FC: .4byte gUnknown_2023E82
sub_8011100: @ 8011100
push {lr}
sub sp, 0x4
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
bl sub_8002DE8
- bl sub_80704D0
- bl sub_8077578
+ bl UpdatePaletteFade
+ bl RunTasks
ldr r0, _08011160 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2C]
movs r0, 0x2
@@ -2381,16 +2381,16 @@ sub_8011100: @ 8011100
strb r0, [r1]
movs r0, 0x3
strh r0, [r2]
- bl sub_8070A84
+ bl ResetPaletteFadeControl
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08011170 @ =sub_80111BC
- bl sub_8000544
+ bl SetMainCallback2
_08011158:
add sp, 0x4
pop {r0}
@@ -2420,10 +2420,10 @@ sub_8011174: @ 8011174
negs r0, r0
ands r0, r2
strb r0, [r1]
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
movs r0, 0x53
bl m4aSongNumStop
- bl sub_80359AC
+ bl FreeMonSpritesGfx
bl sub_8033DF8
bl sub_802E138
pop {r0}
@@ -2438,7 +2438,7 @@ _080111B8: .4byte 0x00000439
thumb_func_start sub_80111BC
sub_80111BC: @ 80111BC
push {lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _080111E4 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -2449,7 +2449,7 @@ sub_80111BC: @ 80111BC
bl sub_8003ECC
ldr r0, _080111E8 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080111DE:
pop {r0}
bx r0
@@ -2490,7 +2490,7 @@ _08011218:
ldr r4, _08011298 @ =gUnknown_2022BC0
movs r0, 0x80
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -2571,12 +2571,12 @@ _080112A0:
movs r1, 0
bl memset
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080112CA:
ldr r0, _080112DC @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
_080112D0:
pop {r4-r7}
pop {r0}
@@ -2618,7 +2618,7 @@ _08011304:
beq _08011318
b _0801169C
_08011318:
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
movs r2, 0
str r2, [sp, 0x18]
ldr r2, _0801133C @ =gUnknown_823EAC8
@@ -2776,7 +2776,7 @@ _08011410:
movs r3, 0
str r3, [sp, 0xC]
adds r3, r6, 0
- bl sub_803DA54
+ bl CreateMon
b _0801166C
.align 2, 0
_08011450: .4byte gUnknown_8245EE0
@@ -2846,7 +2846,7 @@ _08011496:
str r0, [sp, 0xC]
adds r0, r5, 0
adds r3, r6, 0
- bl sub_803DA54
+ bl CreateMon
movs r6, 0
mov r0, r8
adds r0, 0x6
@@ -2940,7 +2940,7 @@ _08011556:
str r0, [sp, 0xC]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_803DA54
+ bl CreateMon
adds r5, 0x6
adds r0, r4, 0
movs r1, 0xC
@@ -3015,7 +3015,7 @@ _080115EA:
str r0, [sp, 0xC]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_803DA54
+ bl CreateMon
adds r5, 0x6
adds r0, r4, 0
movs r1, 0xC
@@ -3124,58 +3124,58 @@ _080116F0: .4byte 0x04000008
thumb_func_start sub_80116F4
sub_80116F4: @ 80116F4
push {lr}
- bl sub_8044EC8
+ bl Random
ldr r0, _08011788 @ =gUnknown_2022974
ldrh r1, [r0]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0801178C @ =gUnknown_2022976
ldrh r1, [r0]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08011790 @ =gUnknown_2022978
ldrh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08011794 @ =gUnknown_202297A
ldrh r1, [r0]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08011798 @ =gUnknown_202297C
ldrh r1, [r0]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0801179C @ =gUnknown_202297E
ldrh r1, [r0]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117A0 @ =gUnknown_2022980
ldrh r1, [r0]
movs r0, 0x1C
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117A4 @ =gUnknown_2022982
ldrh r1, [r0]
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117A8 @ =gUnknown_2022984
ldrh r1, [r0]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117AC @ =gUnknown_2022986
ldrh r1, [r0]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117B0 @ =gUnknown_2022988
ldrh r1, [r0]
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080117B4 @ =gUnknown_202298A
ldrh r1, [r0]
movs r0, 0x46
- bl sub_8000A38
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl SetGpuReg
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
bl sub_8087F54
pop {r0}
bx r0
@@ -3243,13 +3243,13 @@ _080117EE:
beq _08011822
ldr r4, _08011828 @ =0x00002710
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r5, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_08011822:
pop {r4,r5}
pop {r0}
@@ -3263,7 +3263,7 @@ sub_801182C: @ 801182C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _08011848 @ =sub_80117BC
str r0, [r4, 0x1C]
movs r0, 0x61
@@ -3355,17 +3355,17 @@ _080118D8:
adds r4, r3, r4
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r5, 0
beq _08011948
@@ -3434,17 +3434,17 @@ _08011972:
adds r4, r2, r4
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r5, 0
beq _080119E2
@@ -3517,9 +3517,9 @@ sub_8011A1C: @ 8011A1C
push {r4,lr}
sub sp, 0x4
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
str r0, [sp]
movs r1, 0xC0
@@ -3529,26 +3529,26 @@ sub_8011A1C: @ 8011A1C
bl CpuSet
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08011B44 @ =0x00005051
movs r0, 0x44
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08011B48 @ =gUnknown_2022984
movs r0, 0xF0
strh r0, [r1]
ldr r0, _08011B4C @ =gUnknown_2022986
strh r4, [r0]
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _08011B50 @ =gUnknown_2038700
movs r3, 0xF0
movs r1, 0xF0
@@ -3578,7 +3578,7 @@ _08011A9C:
adds r1, 0x1
cmp r1, 0x9F
ble _08011A9C
- bl sub_8070528
+ bl ResetPaletteFade
ldr r0, _08011B58 @ =gUnknown_2022974
movs r4, 0
strh r4, [r0]
@@ -3600,23 +3600,23 @@ _08011A9C:
ldr r0, _08011B78 @ =gUnknown_8D004D8
movs r1, 0
movs r2, 0x40
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_800F380
- bl sub_8006B10
- bl sub_80773BC
+ bl ResetSpriteData
+ bl ResetTasks
bl sub_800FAE0
movs r0, 0x4A
movs r1, 0x37
- bl sub_8000A38
- bl sub_80088F0
+ bl SetGpuReg
+ bl FreeAllSpritePalettes
ldr r1, _08011B7C @ =gUnknown_3003E58
movs r0, 0x4
strb r0, [r1]
ldr r0, _08011B80 @ =sub_80116F4
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08011B84 @ =sub_800F6FC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08011B88 @ =gUnknown_3005090
@@ -3633,7 +3633,7 @@ _08011A9C:
strh r2, [r1, 0x12]
bl sub_801184C
ldr r0, _08011B8C @ =sub_8011B94
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _08011B90 @ =gUnknown_2023E82
strb r4, [r0]
add sp, 0x4
@@ -3668,10 +3668,10 @@ _08011B90: .4byte gUnknown_2023E82
sub_8011B94: @ 8011B94
push {lr}
bl sub_8011BB0
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
- bl sub_8077578
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_8011B94
@@ -3697,11 +3697,11 @@ _08011BCC:
b _08011C34
_08011BD2:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0xFF
strb r0, [r4, 0x1]
b _08011C08
@@ -3719,7 +3719,7 @@ _08011BEA:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08011C08:
ldrb r0, [r4]
adds r0, 0x1
@@ -3734,9 +3734,9 @@ _08011C10:
bne _08011C34
ldr r0, _08011C40 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_812C224
- bl sub_80359AC
+ bl FreeMonSpritesGfx
bl sub_8033DF8
bl sub_802E138
_08011C34:
@@ -3859,23 +3859,23 @@ sub_8011D0C: @ 8011D0C
strb r0, [r5]
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08011D5C @ =0x0000012f
cmp r0, r1
bne _08011D54
adds r0, r4, 0
movs r1, 0x3
- bl sub_803FBE8
+ bl GetMonData
ldrb r1, [r5]
cmp r0, r1
beq _08011D54
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08011D60 @ =gUnknown_824F008
mov r0, sp
- bl sub_8009370
+ bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _08011D54
adds r0, r4, 0
@@ -3899,7 +3899,7 @@ sub_8011D64: @ 8011D64
ldr r1, _08011D8C @ =sub_8011D94
str r1, [r0, 0x1C]
movs r1, 0
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
movs r0, 0x80
lsls r0, 10
ldr r1, _08011D90 @ =0x00002108
@@ -3907,7 +3907,7 @@ sub_8011D64: @ 8011D64
movs r1, 0
movs r2, 0xA
movs r3, 0xA
- bl sub_8070588
+ bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
@@ -3936,7 +3936,7 @@ sub_8011D94: @ 8011D94
str r0, [r2, 0x1C]
ldrh r0, [r2, 0x32]
movs r1, 0x19
- bl sub_8071DF0
+ bl PlayCry1
_08011DBC:
pop {r0}
bx r0
@@ -3965,12 +3965,12 @@ sub_8011DC8: @ 8011DC8
ldrsh r0, [r4, r2]
adds r0, r1
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r0, _08011E1C @ =nullsub_10
str r0, [r4, 0x1C]
adds r0, r4, 0
movs r1, 0
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
movs r0, 0x80
lsls r0, 10
ldr r1, _08011E20 @ =0x00002108
@@ -3978,7 +3978,7 @@ sub_8011DC8: @ 8011DC8
movs r1, 0
movs r2, 0xA
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08011E10:
add sp, 0x4
pop {r4}
@@ -4099,7 +4099,7 @@ _08011ECC:
ldr r7, _08011F38 @ =gUnknown_202402C
adds r0, r7
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, 0xC9
bne _08011F50
ldrh r0, [r5]
@@ -4108,7 +4108,7 @@ _08011ECC:
adds r0, r1, 0
adds r0, r7
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
movs r0, 0xC0
lsls r0, 18
@@ -4225,15 +4225,15 @@ sub_8011FB4: @ 8011FB4
cmp r0, 0
bge _08011FE8
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _08012034
_08011FE8:
ldrh r0, [r4, 0x2E]
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
ldr r1, _0801203C @ =gUnknown_202401C
ldr r1, [r1]
lsls r0, 24
@@ -4266,7 +4266,7 @@ _0801201A:
adds r1, r0
ldrb r1, [r1]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08012034:
pop {r4}
pop {r0}
@@ -4353,15 +4353,15 @@ _080120C0: .4byte nullsub_10
thumb_func_start sub_80120C4
sub_80120C4: @ 80120C4
- ldr r1, _080120CC @ =sub_80120D0
+ ldr r1, _080120CC @ =oac_poke_ally_
str r1, [r0, 0x1C]
bx lr
.align 2, 0
-_080120CC: .4byte sub_80120D0
+_080120CC: .4byte oac_poke_ally_
thumb_func_end sub_80120C4
- thumb_func_start sub_80120D0
-sub_80120D0: @ 80120D0
+ thumb_func_start oac_poke_ally_
+oac_poke_ally_: @ 80120D0
push {lr}
adds r2, r0, 0
ldr r0, _080120F8 @ =gUnknown_2023F4C
@@ -4386,7 +4386,7 @@ _080120F4:
.align 2, 0
_080120F8: .4byte gUnknown_2023F4C
_080120FC: .4byte nullsub_11
- thumb_func_end sub_80120D0
+ thumb_func_end oac_poke_ally_
thumb_func_start sub_8012100
sub_8012100: @ 8012100
@@ -4427,8 +4427,8 @@ _08012130:
_08012134: .4byte gUnknown_2023F4C
thumb_func_end sub_8012110
- thumb_func_start sub_8012138
-sub_8012138: @ 8012138
+ thumb_func_start dp11b_obj_instanciate
+dp11b_obj_instanciate: @ 8012138
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4474,8 +4474,8 @@ _08012186:
adds r6, r2, 0
cmp r0, 0
bne _0801223C
- ldr r0, _080121D4 @ =sub_8012308
- bl sub_8044EF8
+ ldr r0, _080121D4 @ =SpriteCB_HealthBoxBounce
+ bl CreateInvisibleSpriteWithCallback
lsls r0, 24
lsrs r5, r0, 24
mov r0, r8
@@ -4507,7 +4507,7 @@ _08012186:
b _0801220E
.align 2, 0
_080121D0: .4byte gUnknown_2024018
-_080121D4: .4byte sub_8012308
+_080121D4: .4byte SpriteCB_HealthBoxBounce
_080121D8: .4byte gUnknown_3004FF0
_080121DC: .4byte gUnknown_202063C
_080121E0:
@@ -4570,10 +4570,10 @@ _0801223C:
_0801224C: .4byte gUnknown_2023D44
_08012250: .4byte gUnknown_2024018
_08012254: .4byte gUnknown_202063C
- thumb_func_end sub_8012138
+ thumb_func_end dp11b_obj_instanciate
- thumb_func_start sub_8012258
-sub_8012258: @ 8012258
+ thumb_func_start dp11b_obj_free
+dp11b_obj_free: @ 8012258
push {r4-r6,lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -4602,7 +4602,7 @@ sub_8012258: @ 8012258
ldrh r1, [r0, 0x34]
lsls r1, 24
lsrs r4, r1, 24
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
ldr r1, [r0, 0x4]
adds r1, r5, r1
@@ -4635,7 +4635,7 @@ _080122AC:
ldrh r1, [r0, 0x34]
lsls r1, 24
lsrs r4, r1, 24
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
ldr r1, [r0, 0x4]
adds r1, r5, r1
@@ -4660,10 +4660,10 @@ _080122FA:
.align 2, 0
_08012300: .4byte gUnknown_2024018
_08012304: .4byte gUnknown_202063C
- thumb_func_end sub_8012258
+ thumb_func_end dp11b_obj_free
- thumb_func_start sub_8012308
-sub_8012308: @ 8012308
+ thumb_func_start SpriteCB_HealthBoxBounce
+SpriteCB_HealthBoxBounce: @ 8012308
push {r4,r5,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x34]
@@ -4682,7 +4682,7 @@ _08012320:
_08012324:
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldr r2, _08012350 @ =gUnknown_202063C
lsls r1, r5, 4
adds r1, r5
@@ -4702,14 +4702,14 @@ _08012324:
bx r0
.align 2, 0
_08012350: .4byte gUnknown_202063C
- thumb_func_end sub_8012308
+ thumb_func_end SpriteCB_HealthBoxBounce
thumb_func_start sub_8012354
sub_8012354: @ 8012354
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _08012368 @ =sub_8012398
str r0, [r4, 0x1C]
pop {r4}
@@ -4839,8 +4839,8 @@ sub_8012434: @ 8012434
mov r5, r8
push {r5-r7}
movs r0, 0
- bl sub_8015330
- bl sub_8015450
+ bl TurnValuesCleanUp
+ bl SpecialStatusesClear
movs r2, 0
movs r3, 0
ldr r0, _080126CC @ =gUnknown_2023DB0
@@ -5019,7 +5019,7 @@ _0801255C:
strb r1, [r0]
ldr r0, _08012750 @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r4, [r7]
adds r4, 0x7C
ldr r1, _08012754 @ =gUnknown_8254784
@@ -5037,7 +5037,7 @@ _0801255C:
strb r0, [r4]
ldr r0, _08012750 @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r4, [r7]
adds r4, 0x7B
lsls r1, r0, 3
@@ -5354,11 +5354,11 @@ _08012838:
movs r6, 0
_0801286C:
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -6278,9 +6278,9 @@ _08012FC0:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_800DFA4
+ bl EmitGetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -6326,15 +6326,15 @@ sub_8013020: @ 8013020
cmp r5, 0
bne _08013050
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _0801305C @ =gUnknown_2023BC4
strb r0, [r4]
ldr r0, _08013060 @ =gUnknown_2022B50
ldrb r1, [r0]
movs r0, 0
- bl sub_800EA3C
+ bl EmitIntroSlide
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08013064 @ =gUnknown_3004F84
ldr r0, _08013068 @ =sub_8013070
str r0, [r1]
@@ -6391,7 +6391,7 @@ _080130A0:
beq _080130E8
ldr r4, _080130D8 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080130E8
@@ -6478,7 +6478,7 @@ _080130FA:
adds r1, 0x20
strb r0, [r1]
ldrb r0, [r2]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _0801323C @ =gUnknown_2023FE8
lsls r0, 24
lsrs r0, 23
@@ -6521,14 +6521,14 @@ _08013196:
_080131B6:
ldr r4, _08013238 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _080131D0
movs r0, 0
- bl sub_800E0D4
+ bl EmitDrawTrainerPic
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080131D0:
ldr r5, _08013244 @ =gUnknown_2022B4C
ldr r0, [r5]
@@ -6537,18 +6537,18 @@ _080131D0:
cmp r0, 0
beq _0801324C
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080131F6
movs r0, 0
- bl sub_800E0D4
+ bl EmitDrawTrainerPic
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080131F6:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6562,7 +6562,7 @@ _080131F6:
muls r0, r7
add r0, r8
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4]
@@ -6582,7 +6582,7 @@ _08013244: .4byte gUnknown_2022B4C
_08013248: .4byte 0x0001aa02
_0801324C:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6601,7 +6601,7 @@ _0801324C:
muls r0, r7
add r0, r8
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4]
@@ -6620,7 +6620,7 @@ _0801328E:
muls r0, r7
add r0, r8
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4]
@@ -6631,10 +6631,10 @@ _0801328E:
bl sub_8044898
_080132B4:
movs r0, 0
- bl sub_800E070
+ bl EmitLoadMonSprite
mov r1, r9
ldrb r0, [r1]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080132C2:
ldr r0, _08013328 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -6644,22 +6644,22 @@ _080132C2:
beq _080132F8
ldr r4, _0801332C @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
beq _080132EC
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _080132F8
_080132EC:
movs r0, 0
- bl sub_800E0D4
+ bl EmitDrawTrainerPic
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080132F8:
mov r2, r9
ldrb r0, [r2]
@@ -6726,12 +6726,12 @@ _08013366:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0801338C
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -6749,11 +6749,11 @@ _080133A0: .4byte 0x0000ffff
_080133A4:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
_080133B6:
str r0, [r6]
adds r6, 0x8
@@ -6762,15 +6762,15 @@ _080133B6:
cmp r7, 0x5
ble _08013366
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _08013410 @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
mov r1, sp
movs r2, 0x80
- bl sub_800EA7C
+ bl EmitDrawPartyStatusSummary
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
movs r7, 0
mov r6, r8
mov r5, sp
@@ -6782,12 +6782,12 @@ _080133E2:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08013408
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -6804,11 +6804,11 @@ _08013418: .4byte 0x0000ffff
_0801341C:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
_0801342E:
str r0, [r6]
adds r6, 0x8
@@ -6817,15 +6817,15 @@ _0801342E:
cmp r7, 0x5
ble _080133E2
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _0801345C @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
mov r1, sp
movs r2, 0x80
- bl sub_800EA7C
+ bl EmitDrawPartyStatusSummary
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08013460 @ =gUnknown_3004F84
ldr r0, _08013464 @ =sub_80134DC
b _080134C6
@@ -6845,12 +6845,12 @@ _0801346E:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08013494
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -6866,11 +6866,11 @@ _080134A0: .4byte 0x0000ffff
_080134A4:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
_080134B6:
str r0, [r6]
adds r6, 0x8
@@ -6902,12 +6902,12 @@ sub_80134DC: @ 80134DC
cmp r0, 0
bne _080134FE
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08013508 @ =gUnknown_2023BC4
strb r0, [r1]
ldrb r1, [r1]
movs r0, 0
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r1, _0801350C @ =gUnknown_3004F84
ldr r0, _08013510 @ =sub_8013568
str r0, [r1]
@@ -6933,7 +6933,7 @@ sub_8013514: @ 8013514
str r0, [r1]
movs r0, 0
movs r1, 0
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r0, _0801355C @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0xA0
@@ -6942,7 +6942,7 @@ sub_8013514: @ 8013514
cmp r0, r1
bne _0801354A
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08013560 @ =gUnknown_2023FC4
strb r0, [r1, 0x17]
ldr r0, _08013564 @ =gUnknown_81D91A1
@@ -6967,12 +6967,12 @@ sub_8013568: @ 8013568
cmp r0, 0
bne _0801358A
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
movs r0, 0x1
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r1, _08013594 @ =gUnknown_3004F84
ldr r0, _08013598 @ =sub_801359C
str r0, [r1]
@@ -7001,15 +7001,15 @@ sub_801359C: @ 801359C
adds r4, r2, 0
_080135B4:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080135CE
movs r0, 0
- bl sub_800EA5C
+ bl EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080135CE:
ldr r0, _08013620 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -7018,15 +7018,15 @@ _080135CE:
cmp r0, 0
beq _080135F4
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _080135F4
movs r0, 0
- bl sub_800EA5C
+ bl EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080135F4:
ldrb r0, [r4]
adds r0, 0x1
@@ -7074,7 +7074,7 @@ sub_801362C: @ 801362C
adds r7, 0x48
_0801364C:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -7089,7 +7089,7 @@ _0801364C:
muls r0, r5
adds r0, r6
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
ldrb r1, [r4]
@@ -7160,12 +7160,12 @@ sub_80136E4: @ 80136E4
cmp r0, 0
bne _0801370C
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
movs r0, 0x1
- bl sub_80173AC
+ bl PrepareStringBattle
_0801370C:
ldr r1, _08013720 @ =gUnknown_3004F84
ldr r0, _08013724 @ =sub_8013728
@@ -7196,14 +7196,14 @@ sub_8013728: @ 8013728
adds r4, r2, 0
_08013740:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _08013758
movs r0, 0
- bl sub_800EA5C
+ bl EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08013758:
ldr r0, _080137C0 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -7212,15 +7212,15 @@ _08013758:
cmp r0, 0
beq _0801377E
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _0801377E
movs r0, 0
- bl sub_800EA5C
+ bl EmitIntroTrainerBallThrow
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0801377E:
ldrb r0, [r4]
adds r0, 0x1
@@ -7277,7 +7277,7 @@ sub_80137D0: @ 80137D0
ldr r5, _0801384C @ =gUnknown_2023BCE
_080137EA:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801380C
@@ -7287,9 +7287,9 @@ _080137EA:
ldrb r1, [r0]
movs r0, 0
movs r2, 0
- bl sub_800E090
+ bl EmitSwitchInAnim
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0801380C:
ldrb r0, [r4]
adds r0, 0x1
@@ -7590,8 +7590,8 @@ _08013A32:
cmp r5, 0x3
ble _08013A32
movs r0, 0
- bl sub_8015330
- bl sub_8015450
+ bl TurnValuesCleanUp
+ bl SpecialStatusesClear
ldr r0, _08013AE8 @ =gUnknown_2023FE8
ldr r0, [r0]
adds r0, 0x91
@@ -7601,7 +7601,7 @@ _08013A32:
ldr r1, _08013B00 @ =gUnknown_3004F84
ldr r0, _08013B04 @ =sub_8014040
str r0, [r1]
- bl sub_80173D0
+ bl ResetSentPokesToOpponentValue
ldr r1, _08013B08 @ =gUnknown_2023E82
movs r2, 0
adds r0, r1, 0x7
@@ -7655,7 +7655,7 @@ _08013AA6:
ldr r0, [r2]
strb r1, [r0, 0x3]
strb r1, [r7]
- bl sub_8044EC8
+ bl Random
ldr r1, _08013B18 @ =gUnknown_2023E80
strh r0, [r1]
_08013ADA:
@@ -7732,7 +7732,7 @@ _08013B4A:
beq _08013B7C
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80172E8
+ bl CancelMultiTurnMoves
_08013B7C:
adds r4, 0x1
ldr r0, _08013BC0 @ =gUnknown_2023BCC
@@ -7782,7 +7782,7 @@ sub_8013BD4: @ 8013BD4
mov r5, r8
push {r5-r7}
movs r0, 0x1
- bl sub_8015330
+ bl TurnValuesCleanUp
ldr r0, _08013C78 @ =gUnknown_2023E8A
ldrb r0, [r0]
cmp r0, 0
@@ -7816,7 +7816,7 @@ _08013C12:
cmp r4, 0
bne _08013D20
movs r0, 0
- bl sub_8015330
+ bl TurnValuesCleanUp
ldr r2, _08013C80 @ =gUnknown_2023DD0
ldr r0, [r2]
ldr r1, _08013C84 @ =0xfffffdff
@@ -7852,7 +7852,7 @@ _08013C58:
movs r0, 0xC
strb r0, [r1]
ldr r1, _08013CA8 @ =gUnknown_3004F84
- ldr r0, _08013CAC @ =sub_80155C8
+ ldr r0, _08013CAC @ =RunTurnActionsFunctions
str r0, [r1]
b _08013D20
.align 2, 0
@@ -7869,7 +7869,7 @@ _08013C9C: .4byte gUnknown_2023DCC
_08013CA0: .4byte gUnknown_2023E82
_08013CA4: .4byte gUnknown_2023BE3
_08013CA8: .4byte gUnknown_3004F84
-_08013CAC: .4byte sub_80155C8
+_08013CAC: .4byte RunTurnActionsFunctions
_08013CB0:
ldr r1, _08013D30 @ =gUnknown_3004F90
ldrb r0, [r1, 0x13]
@@ -7927,7 +7927,7 @@ _08013CF8:
mov r0, r9
mov r1, r10
str r0, [r1]
- bl sub_8044EC8
+ bl Random
ldr r1, _08013D50 @ =gUnknown_2023E80
strh r0, [r1]
_08013D20:
@@ -7976,7 +7976,7 @@ _08013D7C: .4byte gUnknown_2023BC4
_08013D80: .4byte gUnknown_2023F54
_08013D84:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r2, r0, 24
_08013D8E:
@@ -8008,7 +8008,7 @@ _08013DAA:
b _08013F18
_08013DBE:
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -8020,7 +8020,7 @@ _08013DBE:
_08013DD4:
lsrs r4, r7, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -8037,7 +8037,7 @@ _08013DD4:
b _08013F20
_08013DF8:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -8249,7 +8249,7 @@ _08013F88:
mov r1, r8
adds r0, r6, r1
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -8258,7 +8258,7 @@ _08013F88:
adds r0, r5, r0
adds r0, 0x5C
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8349,7 +8349,7 @@ sub_8014040: @ 8014040
_08014064:
ldr r4, _08014090 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _0801408C @ =gUnknown_2023E82
@@ -8401,7 +8401,7 @@ _080140B8:
beq _08014114
eors r5, r1
adds r0, r5, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, [r4]
adds r1, 0x91
ldrb r1, [r1]
@@ -8415,7 +8415,7 @@ _080140B8:
bne _08014114
ldr r4, _08014160 @ =gUnknown_2023E82
adds r0, r5, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -8509,7 +8509,7 @@ _080141BC:
lsls r0, 8
orrs r2, r0
movs r0, 0
- bl sub_800E4D4
+ bl EmitChooseAction
bl _08014B26
.align 2, 0
_080141D4: .4byte gUnknown_2023D7C
@@ -8721,7 +8721,7 @@ _0801436E:
ldrb r1, [r1]
lsls r2, r4, 24
lsrs r2, 24
- bl sub_804101C
+ bl CalculatePPWithBonus
mov r2, r10
adds r1, r2, r4
strb r0, [r1]
@@ -8736,7 +8736,7 @@ _0801436E:
movs r0, 0
movs r2, 0
add r3, sp, 0x4
- bl sub_800E520
+ bl EmitChooseMove
b _0801460E
.align 2, 0
_080143CC: .4byte gUnknown_2023BE4
@@ -8788,9 +8788,9 @@ _08014428:
ldr r1, [r2]
adds r1, r0
movs r0, 0
- bl sub_800E55C
+ bl EmitChooseItem
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080146AC
.align 2, 0
_08014448: .4byte gUnknown_2023FE8
@@ -8934,7 +8934,7 @@ _08014548:
str r0, [sp]
movs r0, 0
movs r2, 0x6
- bl sub_800E590
+ bl EmitChoosePokemon
b _0801460E
.align 2, 0
_08014574: .4byte gUnknown_2023BC4
@@ -8988,7 +8988,7 @@ _080145D0:
movs r1, 0
_080145DE:
movs r3, 0
- bl sub_800E590
+ bl EmitChoosePokemon
b _0801460E
.align 2, 0
_080145E8: .4byte gUnknown_2023D7C
@@ -9007,17 +9007,17 @@ _080145F0:
movs r1, 0
movs r2, 0x6
movs r3, 0
- bl sub_800E590
+ bl EmitChoosePokemon
_0801460E:
ldr r0, _0801461C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080146AC
.align 2, 0
_08014618: .4byte gUnknown_2023FE8
_0801461C: .4byte gUnknown_2023BC4
_08014620:
- bl sub_8040F6C
+ bl IsPlayerPartyAndPokemonStorageFull
lsls r0, 24
cmp r0, 0
beq _080146AC
@@ -9061,21 +9061,21 @@ _08014670:
movs r0, 0x6
strb r0, [r1]
ldrb r0, [r2]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
strb r5, [r0]
movs r0, 0
- bl sub_800EAE4
+ bl EmitCmd50
mov r3, r8
ldrb r0, [r3]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _08014C78
.align 2, 0
_080146A8: .4byte gUnknown_2023E82
@@ -9587,7 +9587,7 @@ _08014ACA:
bne _08014AFE
adds r0, r5, 0
eors r0, r1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08014B18 @ =gUnknown_2023FE8
ldr r1, [r1]
adds r1, 0x91
@@ -9618,7 +9618,7 @@ _08014B24:
ldr r4, _08014B3C @ =gUnknown_2023BC4
_08014B26:
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, _08014B40 @ =gUnknown_2023E82
ldrb r1, [r4]
_08014B30:
@@ -9973,11 +9973,11 @@ _08014DEC: .4byte gUnknown_825DEAD
_08014DF0: .4byte gUnknown_2023F54
_08014DF4:
ldrh r0, [r4, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r6, r0, 24
ldrh r0, [r4, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r5, r0, 24
_08014E08:
@@ -9993,7 +9993,7 @@ _08014E08:
cmp r0, 0
beq _08014E3C
mov r0, r9
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08014E3C
@@ -10083,11 +10083,11 @@ _08014ED4: .4byte gUnknown_825DEAD
_08014ED8: .4byte gUnknown_2023F54
_08014EDC:
ldrh r0, [r4, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r6, r0, 24
ldrh r0, [r4, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r5, r0, 24
_08014EF0:
@@ -10103,7 +10103,7 @@ _08014EF0:
cmp r0, 0
beq _08014F20
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08014F20
@@ -10266,7 +10266,7 @@ _0801503A:
bne _0801506E
cmp r8, r7
bne _08015064
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -10290,7 +10290,7 @@ _0801506E:
_08015078:
cmp r8, r7
bne _0801508E
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -10436,7 +10436,7 @@ _08015174:
adds r4, r1, 0
ldr r7, _080151E8 @ =gUnknown_3004F84
mov r10, r7
- ldr r0, _080151EC @ =sub_80154A0
+ ldr r0, _080151EC @ =CheckFocusPunch_ClearVarsBeforeTurnStarts
mov r12, r0
ldr r1, _080151F0 @ =gUnknown_2023FE8
mov r9, r1
@@ -10478,7 +10478,7 @@ _080151DC: .4byte gUnknown_2023BC4
_080151E0: .4byte gUnknown_2023BDA
_080151E4: .4byte gUnknown_2023BDE
_080151E8: .4byte gUnknown_3004F84
-_080151EC: .4byte sub_80154A0
+_080151EC: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts
_080151F0: .4byte gUnknown_2023FE8
_080151F4: .4byte gUnknown_2023BCC
_080151F8:
@@ -10618,7 +10618,7 @@ _080152F0:
blt _08015298
_080152FA:
ldr r1, _08015324 @ =gUnknown_3004F84
- ldr r0, _08015328 @ =sub_80154A0
+ ldr r0, _08015328 @ =CheckFocusPunch_ClearVarsBeforeTurnStarts
str r0, [r1]
ldr r0, _0801532C @ =gUnknown_2023FE8
ldr r0, [r0]
@@ -10638,12 +10638,12 @@ _08015318: .4byte gUnknown_2023BDA
_0801531C: .4byte gUnknown_2023BDE
_08015320: .4byte gUnknown_2023BCC
_08015324: .4byte gUnknown_3004F84
-_08015328: .4byte sub_80154A0
+_08015328: .4byte CheckFocusPunch_ClearVarsBeforeTurnStarts
_0801532C: .4byte gUnknown_2023FE8
thumb_func_end sub_80150A8
- thumb_func_start sub_8015330
-sub_8015330: @ 8015330
+ thumb_func_start TurnValuesCleanUp
+TurnValuesCleanUp: @ 8015330
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -10786,10 +10786,10 @@ _08015440: .4byte 0xffbfffff
_08015444: .4byte 0xfeffffff
_08015448: .4byte gUnknown_2023BCC
_0801544C: .4byte gUnknown_2023DE4
- thumb_func_end sub_8015330
+ thumb_func_end TurnValuesCleanUp
- thumb_func_start sub_8015450
-sub_8015450: @ 8015450
+ thumb_func_start SpecialStatusesClear
+SpecialStatusesClear: @ 8015450
push {r4-r6,lr}
ldr r2, _08015494 @ =gUnknown_2023BC4
movs r0, 0
@@ -10831,10 +10831,10 @@ _0801548E:
_08015494: .4byte gUnknown_2023BC4
_08015498: .4byte gUnknown_2023BCC
_0801549C: .4byte gUnknown_2023ECC
- thumb_func_end sub_8015450
+ thumb_func_end SpecialStatusesClear
- thumb_func_start sub_80154A0
-sub_80154A0: @ 80154A0
+ thumb_func_start CheckFocusPunch_ClearVarsBeforeTurnStarts
+CheckFocusPunch_ClearVarsBeforeTurnStarts: @ 80154A0
push {r4-r7,lr}
ldr r0, _08015528 @ =gUnknown_2023DD0
ldr r0, [r0]
@@ -10939,7 +10939,7 @@ _0801555E:
ldr r0, [r0]
strb r2, [r0, 0x13]
ldr r1, _080155B4 @ =gUnknown_3004F84
- ldr r0, _080155B8 @ =sub_80155C8
+ ldr r0, _080155B8 @ =RunTurnActionsFunctions
str r0, [r1]
ldr r0, _080155BC @ =gUnknown_2023E82
strb r2, [r0, 0x3]
@@ -10962,14 +10962,14 @@ _080155A8: .4byte gUnknown_2023BDA
_080155AC: .4byte gUnknown_2023F50
_080155B0: .4byte gUnknown_2023FE8
_080155B4: .4byte gUnknown_3004F84
-_080155B8: .4byte sub_80155C8
+_080155B8: .4byte RunTurnActionsFunctions
_080155BC: .4byte gUnknown_2023E82
_080155C0: .4byte gUnknown_2023FC4
_080155C4: .4byte gUnknown_2023FF4
- thumb_func_end sub_80154A0
+ thumb_func_end CheckFocusPunch_ClearVarsBeforeTurnStarts
- thumb_func_start sub_80155C8
-sub_80155C8: @ 80155C8
+ thumb_func_start RunTurnActionsFunctions
+RunTurnActionsFunctions: @ 80155C8
push {r4-r6,lr}
ldr r6, _0801561C @ =gUnknown_2023E8A
ldrb r0, [r6]
@@ -11043,7 +11043,7 @@ _0801565C:
_08015664: .4byte gUnknown_2023DD0
_08015668: .4byte 0xfffffdff
_0801566C: .4byte 0xfff7ffff
- thumb_func_end sub_80155C8
+ thumb_func_end RunTurnActionsFunctions
thumb_func_start sub_8015670
sub_8015670: @ 8015670
@@ -11062,7 +11062,7 @@ sub_8015670: @ 8015670
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080156B8 @ =gUnknown_2023D6B
strb r0, [r1]
ldr r1, _080156BC @ =gUnknown_2023D74
@@ -11086,10 +11086,10 @@ _080156C4:
ands r0, r1
cmp r0, 0
beq _080156EC
- bl sub_8035314
+ bl BattleStopLowHpSound
movs r0, 0x9B
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
ldr r1, _080156E4 @ =gUnknown_2023D74
ldr r0, _080156E8 @ =gUnknown_81D88D7
b _0801576C
@@ -11102,7 +11102,7 @@ _080156EC:
ands r1, r0
cmp r1, 0x8
bne _08015768
- bl sub_8035314
+ bl BattleStopLowHpSound
ldr r1, _08015720 @ =gUnknown_2023D74
ldr r0, _08015724 @ =gUnknown_81D87EF
str r0, [r1]
@@ -11141,12 +11141,12 @@ _08015734:
_08015754:
movs r0, 0x9C
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
b _0801576E
_0801575E:
movs r0, 0x9B
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
b _0801576E
_08015768:
ldr r1, _0801577C @ =gUnknown_2023D74
@@ -11185,7 +11185,7 @@ sub_801578C: @ 801578C
ldrb r0, [r4]
strb r0, [r1]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080157D4 @ =gUnknown_2023D6B
strb r0, [r1]
ldr r1, _080157D8 @ =gUnknown_2023D74
@@ -11230,7 +11230,7 @@ _0801580C:
strb r4, [r0, 0x5]
_08015810:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08015820 @ =gUnknown_2023D6B
strb r0, [r1]
b _0801582A
@@ -11379,7 +11379,7 @@ sub_8015910: @ 8015910
adds r7, 0x30
_08015942:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080159AA
@@ -11398,7 +11398,7 @@ _08015942:
adds r1, r7
adds r0, r2, 0
adds r0, 0x8
- bl sub_8008D84
+ bl StringCopy
b _080159AA
.align 2, 0
_08015974: .4byte gUnknown_2023BE3
@@ -11420,7 +11420,7 @@ _08015990:
adds r1, r7
adds r0, r2, 0
adds r0, 0x14
- bl sub_8008D84
+ bl StringCopy
_080159AA:
ldrb r0, [r4]
adds r0, 0x1
@@ -11442,9 +11442,9 @@ _080159BC:
bl sub_810CB90
_080159D0:
movs r0, 0x3
- bl sub_8070E44
+ bl BeginFastPaletteFade
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
ldr r1, _080159F4 @ =gUnknown_3004F84
ldr r0, _080159F8 @ =sub_8015A30
str r0, [r1]
@@ -11491,7 +11491,7 @@ sub_8015A30: @ 8015A30
ands r0, r1
cmp r0, 0
bne _08015A8E
- bl sub_8006B10
+ bl ResetSpriteData
ldr r0, _08015A5C @ =gUnknown_3004FD4
ldrb r0, [r0]
cmp r0, 0
@@ -11522,7 +11522,7 @@ _08015A70:
ands r0, r1
cmp r0, 0
bne _08015A8E
- bl sub_80359AC
+ bl FreeMonSpritesGfx
bl sub_8033DF8
bl sub_802E138
_08015A8E:
@@ -11673,7 +11673,7 @@ _08015B86:
cmp r4, 0
beq _08015BC6
ldr r0, _08015BFC @ =gUnknown_202402C
- bl sub_8141FE8
+ bl UpdateRoamerHPStatus
ldrb r1, [r5]
movs r0, 0x1
ands r0, r1
@@ -11682,13 +11682,13 @@ _08015B86:
cmp r1, 0x7
bne _08015BC6
_08015BC2:
- bl sub_814201C
+ bl SetRoamerInactive
_08015BC6:
movs r0, 0x53
bl m4aSongNumStop
ldr r0, _08015BF0 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_08015BD4:
pop {r4-r6}
pop {r0}
@@ -12081,7 +12081,7 @@ _08015F10:
_08015F18:
ldr r0, _08015F38 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08015F40
@@ -12103,7 +12103,7 @@ _08015F40:
_08015F48:
ldr r4, _08015FB4 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -12128,10 +12128,10 @@ _08015F48:
cmp r0, 0
bne _08015FC8
ldrb r0, [r3]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r5, 0x9]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -12214,7 +12214,7 @@ _08016028:
b _080161F8
_08016030:
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _08016100 @ =gUnknown_2023BC4
@@ -12226,7 +12226,7 @@ _08016030:
adds r4, r1, 0
_08016048:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -12250,14 +12250,14 @@ _08016048:
cmp r0, 0x1F
bne _08016096
adds r0, r2, 0
- bl sub_801FEE8
+ bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
ldr r3, [sp]
cmp r0, r3
bcs _08016096
ldrb r0, [r4]
- bl sub_801FEE8
+ bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -12290,11 +12290,11 @@ _080160B0:
beq _08016130
ldr r0, _080160E8 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08016110
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -12316,7 +12316,7 @@ _0801610C:
movs r0, 0x3
b _08016122
_08016110:
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -12326,7 +12326,7 @@ _08016110:
_08016120:
movs r0, 0x2
_08016122:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0801612C @ =gUnknown_2023D6C
strb r0, [r1]
b _08016140
@@ -12358,10 +12358,10 @@ _08016140:
_0801615A:
ldr r6, _0801617C @ =gUnknown_2023D6B
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -12376,12 +12376,12 @@ _08016184: .4byte gUnknown_2023D70
_08016188: .4byte gUnknown_825E45C
_0801618C:
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r7]
ldrb r2, [r5]
@@ -12442,11 +12442,11 @@ _080161F8:
cmp r0, 0
beq _080162A0
ldrb r0, [r3]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08016244
- bl sub_8044EC8
+ bl Random
adds r1, r4, 0
ands r1, r0
cmp r1, 0
@@ -12460,7 +12460,7 @@ _08016240:
movs r0, 0x3
b _08016256
_08016244:
- bl sub_8044EC8
+ bl Random
adds r1, r4, 0
ands r1, r0
cmp r1, 0
@@ -12470,7 +12470,7 @@ _08016244:
_08016254:
movs r0, 0x2
_08016256:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08016290 @ =gUnknown_2023D6C
strb r0, [r1]
ldr r0, _08016294 @ =gUnknown_2023D70
@@ -12486,10 +12486,10 @@ _08016256:
beq _0801632C
ldr r0, _0801629C @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -12522,10 +12522,10 @@ _080162A0:
beq _0801632C
ldrb r0, [r2]
str r3, [sp, 0x4]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
ldr r3, [sp, 0x4]
@@ -12540,12 +12540,12 @@ _080162EC: .4byte gUnknown_2023D70
_080162F0: .4byte gUnknown_825E45C
_080162F4:
ldrb r0, [r3]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
ldrb r1, [r6]
ldrb r2, [r5]
@@ -12558,12 +12558,12 @@ _08016310:
beq _0801632C
adds r0, r2, 0
_0801631A:
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
_0801632C:
ldr r4, _08016360 @ =gUnknown_2023D74
@@ -12768,7 +12768,7 @@ _080164E0: .4byte gUnknown_81D99FC
_080164E4: .4byte gUnknown_2023BE3
_080164E8:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08016510
@@ -13080,7 +13080,7 @@ _0801676C: .4byte gUnknown_2023BE4
_08016770: .4byte gUnknown_2023F54
_08016774:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r1, r0, 24
_0801677E:
@@ -13150,7 +13150,7 @@ _080167F8:
cmp r0, r1
bne _08016824
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801687A
@@ -13189,7 +13189,7 @@ _08016824:
adds r4, r0
lsls r4, 24
lsrs r4, 24
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
cmp r4, r1
@@ -13257,7 +13257,7 @@ sub_80168A4: @ 80168A4
ldr r5, _08016910 @ =gUnknown_2023E8A
_080168D8:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08016914
@@ -13311,7 +13311,7 @@ _08016944: .4byte gUnknown_2023BCC
_08016948: .4byte gUnknown_2023E8A
_0801694C:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801698C
@@ -13412,7 +13412,7 @@ sub_80169E8: @ 80169E8
bne _08016A68
ldr r0, _08016A5C @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r4, [r4]
adds r4, 0x7C
ldr r2, _08016A60 @ =gUnknown_8254784
@@ -13540,7 +13540,7 @@ sub_8016B20: @ 8016B20
strh r7, [r0]
ldr r0, _08016BAC @ =gUnknown_2022976
strh r7, [r0]
- bl sub_8044EC8
+ bl Random
ldr r6, _08016BB0 @ =gUnknown_2023FE8
ldr r5, [r6]
adds r5, 0x7A
@@ -13615,7 +13615,7 @@ sub_8016BC0: @ 8016BC0
strh r7, [r0]
ldr r0, _08016C4C @ =gUnknown_2022976
strh r7, [r0]
- bl sub_8044EC8
+ bl Random
ldr r6, _08016C50 @ =gUnknown_2023FE8
ldr r5, [r6]
adds r5, 0x79
@@ -13675,8 +13675,8 @@ _08016C58: .4byte gUnknown_81D9A04
_08016C5C: .4byte gUnknown_2023BE3
thumb_func_end sub_8016BC0
- thumb_func_start sub_8016C60
-sub_8016C60: @ 8016C60
+ thumb_func_start HandleAction_SafriZoneRun
+HandleAction_SafriZoneRun: @ 8016C60
push {r4,lr}
ldr r2, _08016C88 @ =gUnknown_2023D6B
ldr r1, _08016C8C @ =gUnknown_2023BDE
@@ -13702,10 +13702,10 @@ _08016C8C: .4byte gUnknown_2023BDE
_08016C90: .4byte gUnknown_2023BE2
_08016C94: .4byte gUnknown_2023BCC
_08016C98: .4byte gUnknown_2023E8A
- thumb_func_end sub_8016C60
+ thumb_func_end HandleAction_SafriZoneRun
- thumb_func_start sub_8016C9C
-sub_8016C9C: @ 8016C9C
+ thumb_func_start HandleAction_Action9
+HandleAction_Action9: @ 8016C9C
ldr r3, _08016CE8 @ =gUnknown_2023D6B
ldr r1, _08016CEC @ =gUnknown_2023BDE
ldr r0, _08016CF0 @ =gUnknown_2023BE2
@@ -13755,10 +13755,10 @@ _08016D04: .4byte gUnknown_2023D74
_08016D08: .4byte gUnknown_81D9A04
_08016D0C: .4byte gUnknown_2023BE3
_08016D10: .4byte gUnknown_2023BDA
- thumb_func_end sub_8016C9C
+ thumb_func_end HandleAction_Action9
- thumb_func_start sub_8016D14
-sub_8016D14: @ 8016D14
+ thumb_func_start HandleAction_Action11
+HandleAction_Action11: @ 8016D14
push {lr}
bl sub_8018F90
lsls r0, 24
@@ -13778,10 +13778,10 @@ _08016D30:
.align 2, 0
_08016D34: .4byte gUnknown_2023FE8
_08016D38: .4byte gUnknown_2023BE3
- thumb_func_end sub_8016D14
+ thumb_func_end HandleAction_Action11
- thumb_func_start sub_8016D3C
-sub_8016D3C: @ 8016D3C
+ thumb_func_start HandleAction_NothingIsFainted
+HandleAction_NothingIsFainted: @ 8016D3C
ldr r1, _08016D5C @ =gUnknown_2023BE2
ldrb r0, [r1]
adds r0, 0x1
@@ -13804,10 +13804,10 @@ _08016D60: .4byte gUnknown_2023BE3
_08016D64: .4byte gUnknown_2023BDA
_08016D68: .4byte gUnknown_2023DD0
_08016D6C: .4byte 0xf1e892af
- thumb_func_end sub_8016D3C
+ thumb_func_end HandleAction_NothingIsFainted
- thumb_func_start sub_8016D70
-sub_8016D70: @ 8016D70
+ thumb_func_start HandleAction_ActionFinished
+HandleAction_ActionFinished: @ 8016D70
push {r4,r5,lr}
ldr r1, _08016DE4 @ =gUnknown_2023BE2
ldrb r0, [r1]
@@ -13819,7 +13819,7 @@ sub_8016D70: @ 8016D70
adds r0, r2
ldrb r0, [r0]
strb r0, [r3]
- bl sub_8015450
+ bl SpecialStatusesClear
ldr r2, _08016DF0 @ =gUnknown_2023DD0
ldr r0, [r2]
ldr r1, _08016DF4 @ =0xf1e892af
@@ -13882,6 +13882,6 @@ _08016E14: .4byte gUnknown_2023FE8
_08016E18: .4byte gUnknown_2023F50
_08016E1C: .4byte gUnknown_2023E82
_08016E20: .4byte gUnknown_2023FF4
- thumb_func_end sub_8016D70
+ thumb_func_end HandleAction_ActionFinished
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_ai_script_commands.s b/asm/battle_ai_script_commands.s
index 8f9605a12..77d495098 100644
--- a/asm/battle_ai_script_commands.s
+++ b/asm/battle_ai_script_commands.s
@@ -131,7 +131,7 @@ _080C6DE0:
movs r1, 0
strb r1, [r0]
_080C6DFA:
- bl sub_8044EC8
+ bl Random
ldr r1, [r5]
ldr r2, [r1, 0x14]
adds r2, 0x18
@@ -163,7 +163,7 @@ _080C6DFA:
cmp r0, 0
beq _080C6E7C
ldr r4, _080C6E74 @ =gUnknown_2023D6C
- bl sub_8044EC8
+ bl Random
movs r3, 0x2
ands r0, r3
strb r0, [r4]
@@ -401,7 +401,7 @@ _080C7012:
adds r3, 0x1
cmp r3, 0x3
ble _080C6FD2
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
@@ -644,12 +644,12 @@ sub_80C71D0: @ 80C71D0
lsls r1, 24
lsrs r5, r1, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080C71FC
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
ldr r1, _080C7204 @ =gUnknown_2023FF4
ldr r1, [r1]
ldr r2, [r1, 0x18]
@@ -674,12 +674,12 @@ sub_80C7208: @ 80C7208
lsls r1, 24
lsrs r5, r1, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080C7234
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
ldr r1, _080C723C @ =gUnknown_2023FF4
ldr r1, [r1]
ldr r2, [r1, 0x18]
@@ -699,7 +699,7 @@ _080C723C: .4byte gUnknown_2023FF4
thumb_func_start sub_80C7240
sub_80C7240: @ 80C7240
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -735,7 +735,7 @@ _080C727C:
thumb_func_start sub_80C7280
sub_80C7280: @ 80C7280
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -771,7 +771,7 @@ _080C72BC:
thumb_func_start sub_80C72C0
sub_80C72C0: @ 80C72C0
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -807,7 +807,7 @@ _080C72FC:
thumb_func_start sub_80C7300
sub_80C7300: @ 80C7300
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xFF
lsls r1, 16
@@ -840,8 +840,8 @@ _080C733C:
bx r0
thumb_func_end sub_80C7300
- thumb_func_start sub_80C7340
-sub_80C7340: @ 80C7340
+ thumb_func_start BattleAICmd_score
+BattleAICmd_score: @ 80C7340
push {r4,lr}
ldr r2, _080C737C @ =gUnknown_2023FF4
ldr r0, [r2]
@@ -876,7 +876,7 @@ _080C7370:
.align 2, 0
_080C737C: .4byte gUnknown_2023FF4
_080C7380: .4byte gUnknown_2039A00
- thumb_func_end sub_80C7340
+ thumb_func_end BattleAICmd_score
thumb_func_start sub_80C7384
sub_80C7384: @ 80C7384
@@ -1489,7 +1489,7 @@ _080C77EC:
ldr r0, _080C7838 @ =gUnknown_2023D6C
_080C77EE:
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r2, 0x1
ands r2, r0
ldr r4, _080C783C @ =gUnknown_2039A00
@@ -1554,7 +1554,7 @@ _080C7868:
ldr r0, _080C78B4 @ =gUnknown_2023D6C
_080C786A:
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r2, 0x1
ands r2, r0
ldr r4, _080C78B8 @ =gUnknown_2039A00
@@ -2002,8 +2002,8 @@ _080C7B90:
bx r0
thumb_func_end sub_80C7B50
- thumb_func_start sub_80C7B94
-sub_80C7B94: @ 80C7B94
+ thumb_func_start BattleAICmd_if_in_bytes
+BattleAICmd_if_in_bytes: @ 80C7B94
push {r4,lr}
ldr r2, _080C7BE0 @ =gUnknown_2039A00
ldr r1, [r2]
@@ -2058,10 +2058,10 @@ _080C7BF6:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80C7B94
+ thumb_func_end BattleAICmd_if_in_bytes
- thumb_func_start sub_80C7BFC
-sub_80C7BFC: @ 80C7BFC
+ thumb_func_start BattleAICmd_if_not_in_bytes
+BattleAICmd_if_not_in_bytes: @ 80C7BFC
push {r4,lr}
ldr r2, _080C7C38 @ =gUnknown_2039A00
ldr r1, [r2]
@@ -2117,10 +2117,10 @@ _080C7C60:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80C7BFC
+ thumb_func_end BattleAICmd_if_not_in_bytes
- thumb_func_start sub_80C7C68
-sub_80C7C68: @ 80C7C68
+ thumb_func_start BattleAICmd_if_in_hwords
+BattleAICmd_if_in_hwords: @ 80C7C68
push {r4,r5,lr}
ldr r2, _080C7CB4 @ =gUnknown_2039A00
ldr r1, [r2]
@@ -2177,10 +2177,10 @@ _080C7CCE:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80C7C68
+ thumb_func_end BattleAICmd_if_in_hwords
- thumb_func_start sub_80C7CD4
-sub_80C7CD4: @ 80C7CD4
+ thumb_func_start BattleAICmd_if_not_in_hwords
+BattleAICmd_if_not_in_hwords: @ 80C7CD4
push {r4,r5,lr}
ldr r2, _080C7D10 @ =gUnknown_2039A00
ldr r1, [r2]
@@ -2238,7 +2238,7 @@ _080C7D3C:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80C7CD4
+ thumb_func_end BattleAICmd_if_not_in_hwords
thumb_func_start sub_80C7D44
sub_80C7D44: @ 80C7D44
@@ -2360,8 +2360,8 @@ _080C7E1C:
bx r0
thumb_func_end sub_80C7DB4
- thumb_func_start sub_80C7E24
-sub_80C7E24: @ 80C7E24
+ thumb_func_start BattleAICmd_get_turn_count
+BattleAICmd_get_turn_count: @ 80C7E24
ldr r0, _080C7E3C @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r1, [r0, 0x14]
@@ -2377,10 +2377,10 @@ sub_80C7E24: @ 80C7E24
_080C7E3C: .4byte gUnknown_2023FF4
_080C7E40: .4byte gUnknown_3004F90
_080C7E44: .4byte gUnknown_2039A00
- thumb_func_end sub_80C7E24
+ thumb_func_end BattleAICmd_get_turn_count
- thumb_func_start sub_80C7E48
-sub_80C7E48: @ 80C7E48
+ thumb_func_start BattleAICmd_get_type
+BattleAICmd_get_type: @ 80C7E48
push {r4,lr}
ldr r1, _080C7E60 @ =gUnknown_2039A00
ldr r0, [r1]
@@ -2494,10 +2494,10 @@ _080C7F22:
.align 2, 0
_080C7F30: .4byte gUnknown_2023FF4
_080C7F34: .4byte gUnknown_8250C04
- thumb_func_end sub_80C7E48
+ thumb_func_end BattleAICmd_get_type
- thumb_func_start sub_80C7F38
-sub_80C7F38: @ 80C7F38
+ thumb_func_start BattleAICmd_get_last_used_bank_move_power
+BattleAICmd_get_last_used_bank_move_power: @ 80C7F38
ldr r0, _080C7F58 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r3, [r0, 0x14]
@@ -2518,10 +2518,10 @@ sub_80C7F38: @ 80C7F38
_080C7F58: .4byte gUnknown_2023FF4
_080C7F5C: .4byte gUnknown_8250C04
_080C7F60: .4byte gUnknown_2039A00
- thumb_func_end sub_80C7F38
+ thumb_func_end BattleAICmd_get_last_used_bank_move_power
- thumb_func_start sub_80C7F64
-sub_80C7F64: @ 80C7F64
+ thumb_func_start BattleAICmd_is_most_powerful_move
+BattleAICmd_is_most_powerful_move: @ 80C7F64
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2661,11 +2661,11 @@ _080C8030:
ldrb r0, [r7]
ldr r4, _080C80D4 @ =gUnknown_2023D6C
ldrb r1, [r4]
- bl sub_801E68C
+ bl AI_CalcDmg
ldrh r0, [r5]
ldrb r1, [r7]
ldrb r2, [r4]
- bl sub_801EDF4
+ bl TypeCalc
mov r4, sp
add r4, r8
ldr r2, _080C80D8 @ =gUnknown_2023D50
@@ -2776,10 +2776,10 @@ _080C814C:
bx r0
.align 2, 0
_080C8164: .4byte gUnknown_2039A00
- thumb_func_end sub_80C7F64
+ thumb_func_end BattleAICmd_is_most_powerful_move
- thumb_func_start sub_80C8168
-sub_80C8168: @ 80C8168
+ thumb_func_start BattleAICmd_get_last_used_bank_move
+BattleAICmd_get_last_used_bank_move: @ 80C8168
push {lr}
ldr r0, _080C8184 @ =gUnknown_2039A00
ldr r1, [r0]
@@ -2819,7 +2819,7 @@ _080C819E:
_080C81B4: .4byte gUnknown_2023FF4
_080C81B8: .4byte gUnknown_2023D98
_080C81BC: .4byte gUnknown_2023D6C
- thumb_func_end sub_80C8168
+ thumb_func_end BattleAICmd_get_last_used_bank_move
thumb_func_start sub_80C81C0
sub_80C81C0: @ 80C81C0
@@ -2981,8 +2981,8 @@ nullsub_65: @ 80C82D4
bx lr
thumb_func_end nullsub_65
- thumb_func_start sub_80C82D8
-sub_80C82D8: @ 80C82D8
+ thumb_func_start BattleAICmd_count_alive_pokemon
+BattleAICmd_count_alive_pokemon: @ 80C82D8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3007,7 +3007,7 @@ _080C8304:
_080C8306:
ldrb r5, [r0]
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _080C8350 @ =gUnknown_202402C
mov r8, r1
@@ -3027,12 +3027,12 @@ _080C831C:
adds r0, r4
ldrb r7, [r0]
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -3063,17 +3063,17 @@ _080C836C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080C83B0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080C83B0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -3101,10 +3101,10 @@ _080C83B0:
_080C83C8: .4byte gUnknown_2023BCE
_080C83CC: .4byte gUnknown_2023FF4
_080C83D0: .4byte gUnknown_2039A00
- thumb_func_end sub_80C82D8
+ thumb_func_end BattleAICmd_count_alive_pokemon
- thumb_func_start sub_80C83D4
-sub_80C83D4: @ 80C83D4
+ thumb_func_start BattleAICmd_get_considered_move
+BattleAICmd_get_considered_move: @ 80C83D4
ldr r0, _080C83E8 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r1, [r0, 0x14]
@@ -3118,10 +3118,10 @@ sub_80C83D4: @ 80C83D4
.align 2, 0
_080C83E8: .4byte gUnknown_2023FF4
_080C83EC: .4byte gUnknown_2039A00
- thumb_func_end sub_80C83D4
+ thumb_func_end BattleAICmd_get_considered_move
- thumb_func_start sub_80C83F0
-sub_80C83F0: @ 80C83F0
+ thumb_func_start BattleAICmd_get_considered_move_effect
+BattleAICmd_get_considered_move_effect: @ 80C83F0
ldr r0, _080C8410 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r3, [r0, 0x14]
@@ -3142,7 +3142,7 @@ sub_80C83F0: @ 80C83F0
_080C8410: .4byte gUnknown_2023FF4
_080C8414: .4byte gUnknown_8250C04
_080C8418: .4byte gUnknown_2039A00
- thumb_func_end sub_80C83F0
+ thumb_func_end BattleAICmd_get_considered_move_effect
thumb_func_start sub_80C841C
sub_80C841C: @ 80C841C
@@ -3162,12 +3162,12 @@ _080C8434:
_080C8436:
ldrb r4, [r0]
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080C8506
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r7, 0x1
adds r1, r7, 0
ands r1, r0
@@ -3227,7 +3227,7 @@ _080C84A8:
ldrb r0, [r2, 0x17]
cmp r0, 0
beq _080C84F6
- bl sub_8044EC8
+ bl Random
adds r1, r7, 0
ands r1, r0
cmp r1, 0
@@ -3336,7 +3336,7 @@ _080C856A:
ldrb r1, [r6]
ldr r2, _080C8618 @ =gUnknown_2023D6C
ldrb r2, [r2]
- bl sub_801EDF4
+ bl TypeCalc
ldr r0, [r4]
cmp r0, 0x78
bne _080C859A
@@ -3436,7 +3436,7 @@ sub_80C8620: @ 80C8620
ldrb r1, [r1]
ldr r2, _080C86DC @ =gUnknown_2023D6C
ldrb r2, [r2]
- bl sub_801EDF4
+ bl TypeCalc
ldr r0, [r4]
cmp r0, 0x78
bne _080C8666
@@ -3579,17 +3579,17 @@ _080C875C:
add r4, r9
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
cmp r5, 0
beq _080C8794
cmp r5, r10
@@ -3665,17 +3665,17 @@ _080C8800:
add r4, r10
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
cmp r5, 0
beq _080C8844
movs r1, 0xCE
@@ -4134,11 +4134,11 @@ sub_80C8B24: @ 80C8B24
ldrb r0, [r4]
ldr r6, _080C8BF8 @ =gUnknown_2023D6C
ldrb r1, [r6]
- bl sub_801E68C
+ bl AI_CalcDmg
ldrh r0, [r5]
ldrb r1, [r4]
ldrb r2, [r6]
- bl sub_801EDF4
+ bl TypeCalc
ldr r4, _080C8BFC @ =gUnknown_2023D50
mov r1, r8
ldr r0, [r1]
@@ -4246,11 +4246,11 @@ sub_80C8C20: @ 80C8C20
ldrb r0, [r4]
ldr r5, _080C8CE0 @ =gUnknown_2023D6C
ldrb r1, [r5]
- bl sub_801E68C
+ bl AI_CalcDmg
ldrh r0, [r6]
ldrb r1, [r4]
ldrb r2, [r5]
- bl sub_801EDF4
+ bl TypeCalc
ldr r4, _080C8CE4 @ =gUnknown_2023D50
ldr r0, [r7]
ldr r1, [r0, 0x14]
@@ -5004,7 +5004,7 @@ _080C91FC:
adds r0, r4
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -5074,12 +5074,12 @@ _080C927C:
_080C927E:
ldrb r4, [r0]
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080C92B0
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
ldr r0, _080C92AC @ =gUnknown_2023FF4
@@ -5100,7 +5100,7 @@ _080C92B0:
muls r0, r4
adds r0, r1
ldrh r0, [r0, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
ldr r1, _080C92DC @ =gUnknown_2023FF4
ldr r1, [r1]
ldr r1, [r1, 0x14]
@@ -5121,8 +5121,8 @@ _080C92DC: .4byte gUnknown_2023FF4
_080C92E0: .4byte gUnknown_2039A00
thumb_func_end sub_80C9264
- thumb_func_start sub_80C92E4
-sub_80C92E4: @ 80C92E4
+ thumb_func_start BattleAICmd_get_gender
+BattleAICmd_get_gender: @ 80C92E4
push {lr}
ldr r0, _080C92F4 @ =gUnknown_2039A00
ldr r0, [r0]
@@ -5146,7 +5146,7 @@ _080C92FE:
adds r2, 0x48
adds r1, r2
ldr r1, [r1]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
ldr r1, _080C9334 @ =gUnknown_2023FF4
ldr r1, [r1]
ldr r1, [r1, 0x14]
@@ -5164,10 +5164,10 @@ _080C932C: .4byte gUnknown_2023D6C
_080C9330: .4byte gUnknown_2023BE4
_080C9334: .4byte gUnknown_2023FF4
_080C9338: .4byte gUnknown_2039A00
- thumb_func_end sub_80C92E4
+ thumb_func_end BattleAICmd_get_gender
- thumb_func_start sub_80C933C
-sub_80C933C: @ 80C933C
+ thumb_func_start BattleAICmd_is_first_turn
+BattleAICmd_is_first_turn: @ 80C933C
push {r4,lr}
ldr r0, _080C9350 @ =gUnknown_2039A00
ldr r1, [r0]
@@ -5204,10 +5204,10 @@ _080C935A:
_080C937C: .4byte gUnknown_2023D6C
_080C9380: .4byte gUnknown_2023FF4
_080C9384: .4byte gUnknown_2023E0C
- thumb_func_end sub_80C933C
+ thumb_func_end BattleAICmd_is_first_turn
- thumb_func_start sub_80C9388
-sub_80C9388: @ 80C9388
+ thumb_func_start BattleAICmd_get_stockpile_count
+BattleAICmd_get_stockpile_count: @ 80C9388
push {r4,lr}
ldr r0, _080C939C @ =gUnknown_2039A00
ldr r1, [r0]
@@ -5244,10 +5244,10 @@ _080C93A6:
_080C93C8: .4byte gUnknown_2023D6C
_080C93CC: .4byte gUnknown_2023FF4
_080C93D0: .4byte gUnknown_2023E0C
- thumb_func_end sub_80C9388
+ thumb_func_end BattleAICmd_get_stockpile_count
- thumb_func_start sub_80C93D4
-sub_80C93D4: @ 80C93D4
+ thumb_func_start BattleAICmd_is_double_battle
+BattleAICmd_is_double_battle: @ 80C93D4
ldr r0, _080C93F0 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x14]
@@ -5265,10 +5265,10 @@ sub_80C93D4: @ 80C93D4
_080C93F0: .4byte gUnknown_2023FF4
_080C93F4: .4byte gUnknown_2022B4C
_080C93F8: .4byte gUnknown_2039A00
- thumb_func_end sub_80C93D4
+ thumb_func_end BattleAICmd_is_double_battle
- thumb_func_start sub_80C93FC
-sub_80C93FC: @ 80C93FC
+ thumb_func_start BattleAICmd_get_used_held_item
+BattleAICmd_get_used_held_item: @ 80C93FC
push {r4,lr}
ldr r0, _080C9410 @ =gUnknown_2039A00
ldr r1, [r0]
@@ -5305,10 +5305,10 @@ _080C941A:
_080C943C: .4byte gUnknown_2023D6C
_080C9440: .4byte gUnknown_2023FF4
_080C9444: .4byte gUnknown_2023FE8
- thumb_func_end sub_80C93FC
+ thumb_func_end BattleAICmd_get_used_held_item
- thumb_func_start sub_80C9448
-sub_80C9448: @ 80C9448
+ thumb_func_start BattleAICmd_get_move_type_from_result
+BattleAICmd_get_move_type_from_result: @ 80C9448
ldr r0, _080C9468 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r3, [r0, 0x14]
@@ -5329,10 +5329,10 @@ sub_80C9448: @ 80C9448
_080C9468: .4byte gUnknown_2023FF4
_080C946C: .4byte gUnknown_8250C04
_080C9470: .4byte gUnknown_2039A00
- thumb_func_end sub_80C9448
+ thumb_func_end BattleAICmd_get_move_type_from_result
- thumb_func_start sub_80C9474
-sub_80C9474: @ 80C9474
+ thumb_func_start BattleAICmd_get_move_power_from_result
+BattleAICmd_get_move_power_from_result: @ 80C9474
ldr r0, _080C9494 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r3, [r0, 0x14]
@@ -5353,10 +5353,10 @@ sub_80C9474: @ 80C9474
_080C9494: .4byte gUnknown_2023FF4
_080C9498: .4byte gUnknown_8250C04
_080C949C: .4byte gUnknown_2039A00
- thumb_func_end sub_80C9474
+ thumb_func_end BattleAICmd_get_move_power_from_result
- thumb_func_start sub_80C94A0
-sub_80C94A0: @ 80C94A0
+ thumb_func_start BattleAICmd_get_move_effect_from_result
+BattleAICmd_get_move_effect_from_result: @ 80C94A0
ldr r0, _080C94C0 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r3, [r0, 0x14]
@@ -5377,10 +5377,10 @@ sub_80C94A0: @ 80C94A0
_080C94C0: .4byte gUnknown_2023FF4
_080C94C4: .4byte gUnknown_8250C04
_080C94C8: .4byte gUnknown_2039A00
- thumb_func_end sub_80C94A0
+ thumb_func_end BattleAICmd_get_move_effect_from_result
- thumb_func_start sub_80C94CC
-sub_80C94CC: @ 80C94CC
+ thumb_func_start BattleAICmd_get_protect_count
+BattleAICmd_get_protect_count: @ 80C94CC
push {r4,lr}
ldr r0, _080C94E0 @ =gUnknown_2039A00
ldr r1, [r0]
@@ -5417,7 +5417,7 @@ _080C94EA:
_080C950C: .4byte gUnknown_2023D6C
_080C9510: .4byte gUnknown_2023FF4
_080C9514: .4byte gUnknown_2023E0C
- thumb_func_end sub_80C94CC
+ thumb_func_end BattleAICmd_get_protect_count
thumb_func_start nullsub_68
nullsub_68: @ 80C9518
@@ -5449,8 +5449,8 @@ nullsub_73: @ 80C952C
bx lr
thumb_func_end nullsub_73
- thumb_func_start sub_80C9530
-sub_80C9530: @ 80C9530
+ thumb_func_start BattleAICmd_call
+BattleAICmd_call: @ 80C9530
push {r4,lr}
ldr r4, _080C955C @ =gUnknown_2039A00
ldr r0, [r4]
@@ -5473,7 +5473,7 @@ sub_80C9530: @ 80C9530
bx r0
.align 2, 0
_080C955C: .4byte gUnknown_2039A00
- thumb_func_end sub_80C9530
+ thumb_func_end BattleAICmd_call
thumb_func_start sub_80C9560
sub_80C9560: @ 80C9560
@@ -5495,8 +5495,8 @@ sub_80C9560: @ 80C9560
_080C957C: .4byte gUnknown_2039A00
thumb_func_end sub_80C9560
- thumb_func_start sub_80C9580
-sub_80C9580: @ 80C9580
+ thumb_func_start BattleAICmd_end
+BattleAICmd_end: @ 80C9580
push {lr}
bl sub_80C9768
lsls r0, 24
@@ -5514,10 +5514,10 @@ _080C959A:
bx r0
.align 2, 0
_080C95A0: .4byte gUnknown_2023FF4
- thumb_func_end sub_80C9580
+ thumb_func_end BattleAICmd_end
- thumb_func_start sub_80C95A4
-sub_80C95A4: @ 80C95A4
+ thumb_func_start BattleAICmd_if_level_cond
+BattleAICmd_if_level_cond: @ 80C95A4
push {r4,r5,lr}
ldr r5, _080C95BC @ =gUnknown_2039A00
ldr r4, [r5]
@@ -5623,7 +5623,7 @@ _080C9674:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80C95A4
+ thumb_func_end BattleAICmd_if_level_cond
thumb_func_start sub_80C967C
sub_80C967C: @ 80C967C
diff --git a/asm/battle_ai_switch_items.s b/asm/battle_ai_switch_items.s
index f0ac1b0ed..85eb2ded9 100644
--- a/asm/battle_ai_switch_items.s
+++ b/asm/battle_ai_switch_items.s
@@ -28,7 +28,7 @@ sub_8039188: @ 8039188
cmp r0, 0
bne _080391E4
adds r0, r2, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _080391E0 @ =gUnknown_2023FE8
@@ -40,7 +40,7 @@ sub_8039188: @ 8039188
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
movs r0, 0x1
b _080391E6
.align 2, 0
@@ -73,7 +73,7 @@ _08039204: .4byte gUnknown_2022B4C
_08039208:
ldr r0, _0803922C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _08039230 @ =gUnknown_2023FE8
@@ -84,7 +84,7 @@ _08039208:
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
movs r0, 0x1
b _0803935E
.align 2, 0
@@ -93,7 +93,7 @@ _08039230: .4byte gUnknown_2023FE8
_08039234:
ldr r4, _0803936C @ =gUnknown_2023BE4
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x58
@@ -106,7 +106,7 @@ _08039234:
b _0803935C
_08039250:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r6, 0
@@ -133,7 +133,7 @@ _0803926C:
ldrh r1, [r4]
mov r3, r8
ldrb r2, [r3]
- bl sub_801EFCC
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -155,17 +155,17 @@ _080392A4:
adds r4, r5, r3
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039356
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039356
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -180,12 +180,12 @@ _080392A4:
beq _08039356
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
movs r4, 0
@@ -201,21 +201,21 @@ _08039310:
adds r1, 0xD
mov r0, r8
add r0, r9
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
beq _08039350
ldrh r1, [r5]
ldrb r2, [r7]
- bl sub_801EFCC
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
ands r1, r0
cmp r1, 0
beq _08039350
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -261,7 +261,7 @@ sub_803937C: @ 803937C
lsls r0, 24
cmp r0, 0
beq _080393A8
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -305,12 +305,12 @@ _080393D6:
beq _08039442
mov r8, r3
mov r0, r8
- bl sub_80751D8
+ bl GetBankIdentity
movs r4, 0x2
eors r0, r4
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08039424 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _08039428 @ =gUnknown_825E45C
@@ -333,11 +333,11 @@ _08039424: .4byte gUnknown_2023D70
_08039428: .4byte gUnknown_825E45C
_0803942C:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
eors r0, r4
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
b _08039446
@@ -396,7 +396,7 @@ _0803949C: .4byte gUnknown_2023BE4
_080394A0:
ldr r0, _080394C4 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _080394C8 @ =gUnknown_2023FE8
@@ -407,7 +407,7 @@ _080394A0:
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
movs r0, 0x1
b _0803958A
.align 2, 0
@@ -425,17 +425,17 @@ _080394D2:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039582
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039582
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -466,12 +466,12 @@ _080394D2:
beq _08039582
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r5, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039568
lsls r0, r4, 3
@@ -494,7 +494,7 @@ _08039568:
_08039572:
cmp r10, r0
bne _08039582
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -553,7 +553,7 @@ sub_8039598: @ 8039598
cmp r1, r0
bne _08039600
_080395DE:
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -580,7 +580,7 @@ _08039600:
ldrb r0, [r0, 0x1]
cmp r0, 0
bne _08039638
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -604,7 +604,7 @@ _08039638:
lsls r0, 24
cmp r0, 0
bne _08039686
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -616,7 +616,7 @@ _08039664:
ldr r0, _08039690 @ =gUnknown_2023BC4
ldrb r0, [r0]
_08039668:
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _08039694 @ =gUnknown_2023FE8
@@ -628,7 +628,7 @@ _08039668:
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_08039686:
movs r0, 0x1
_08039688:
@@ -650,7 +650,7 @@ sub_8039698: @ 8039698
lsrs r0, 24
mov r8, r0
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, _08039730 @ =gUnknown_2023D70
@@ -686,7 +686,7 @@ _080396D4:
ldrh r1, [r5]
mov r3, r9
ldrb r2, [r3]
- bl sub_801EFCC
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -696,7 +696,7 @@ _080396D4:
mov r0, r8
cmp r0, 0
bne _08039744
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -727,7 +727,7 @@ _08039744:
b _080397C4
_08039748:
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r0, _080397D0 @ =gUnknown_2023D70
@@ -763,7 +763,7 @@ _08039776:
ldrh r1, [r5]
mov r3, r9
ldrb r2, [r3]
- bl sub_801EFCC
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -773,7 +773,7 @@ _08039776:
mov r0, r8
cmp r0, 0
bne _08039744
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -898,12 +898,12 @@ _0803987A:
beq _08039918
mov r9, r3
mov r0, r9
- bl sub_80751D8
+ bl GetBankIdentity
movs r4, 0x2
eors r0, r4
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080398CC @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _080398D0 @ =gUnknown_825E45C
@@ -928,11 +928,11 @@ _080398CC: .4byte gUnknown_2023D70
_080398D0: .4byte gUnknown_825E45C
_080398D4:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
eors r0, r4
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -940,7 +940,7 @@ _080398D4:
_080398EC:
ldr r0, _08039910 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _08039914 @ =gUnknown_2023FE8
@@ -951,7 +951,7 @@ _080398EC:
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
movs r0, 0x1
b _08039A56
.align 2, 0
@@ -970,21 +970,21 @@ _0803991E:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08039936
b _08039A4C
_08039936:
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08039944
b _08039A4C
_08039944:
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -1018,12 +1018,12 @@ _08039944:
beq _08039A4C
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r5, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080399C0
lsls r0, r4, 3
@@ -1053,7 +1053,7 @@ _080399CC:
adds r0, r1
ldrh r0, [r0]
adds r1, r4, 0
- bl sub_801EFCC
+ bl AI_TypeCalc
ldr r1, [sp]
ands r1, r0
cmp r1, 0
@@ -1081,21 +1081,21 @@ _08039A0A:
adds r1, r4, 0
adds r1, 0xD
add r0, r8
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
beq _08039A46
ldrh r1, [r5]
ldrb r2, [r6]
- bl sub_801EFCC
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
ands r1, r0
cmp r1, 0
beq _08039A46
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, [sp, 0x4]
@@ -1226,12 +1226,12 @@ _08039B1C:
ldr r4, _08039B60 @ =gUnknown_2023BC4
ldrb r7, [r4]
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r5, 0x2
eors r0, r5
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08039B70 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _08039B74 @ =gUnknown_825E45C
@@ -1254,11 +1254,11 @@ _08039B70: .4byte gUnknown_2023D70
_08039B74: .4byte gUnknown_825E45C
_08039B78:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
eors r0, r5
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
b _08039B94
@@ -1276,17 +1276,17 @@ _08039B96:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039BFA
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039BFA
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -1396,7 +1396,7 @@ _08039C94:
beq _08039D8C
ldr r0, _08039CE0 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _08039CE4 @ =gUnknown_2023FE8
@@ -1417,7 +1417,7 @@ _08039C94:
cmp r0, 0
bne _08039CE8
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -1428,11 +1428,11 @@ _08039CE0: .4byte gUnknown_2023BC4
_08039CE4: .4byte gUnknown_2023FE8
_08039CE8:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_08039CFC:
@@ -1443,7 +1443,7 @@ _08039CFE:
ldr r1, _08039D7C @ =gUnknown_202402C
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039D3E
ldr r1, _08039D80 @ =gUnknown_2023BCE
@@ -1476,7 +1476,7 @@ _08039D3E:
_08039D44:
ldr r0, _08039D88 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, _08039D84 @ =gUnknown_2023FE8
@@ -1487,7 +1487,7 @@ _08039D44:
_08039D5A:
ldr r4, _08039D88 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
ldrb r2, [r4]
ldr r1, _08039D84 @ =gUnknown_2023FE8
ldr r1, [r1]
@@ -1518,7 +1518,7 @@ _08039D96:
lsls r2, 8
movs r0, 0x1
movs r1, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_08039DA8:
pop {r4-r6}
pop {r0}
@@ -1628,12 +1628,12 @@ _08039E5E:
beq _08039EF8
str r2, [sp, 0xC]
adds r0, r2, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r5, 0x2
eors r0, r5
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08039EA4 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _08039EA8 @ =gUnknown_825E45C
@@ -1655,16 +1655,16 @@ _08039EA4: .4byte gUnknown_2023D70
_08039EA8: .4byte gUnknown_825E45C
_08039EAC:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
eors r0, r5
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x10]
_08039EC2:
- bl sub_8044EC8
+ bl Random
movs r3, 0x2
ands r0, r3
lsls r0, 24
@@ -1690,7 +1690,7 @@ _08039EF0: .4byte gUnknown_2023D70
_08039EF4: .4byte gUnknown_825E45C
_08039EF8:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1718,14 +1718,14 @@ _08039F20:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _08039FF0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08039FF0
mov r1, r8
@@ -1832,7 +1832,7 @@ _0803A018:
adds r1, r7, 0
adds r1, 0xD
adds r0, r5, r6
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -1841,7 +1841,7 @@ _0803A018:
ldrb r1, [r0]
adds r0, r4, 0
mov r2, r10
- bl sub_801EDF4
+ bl TypeCalc
movs r1, 0x2
ands r1, r0
cmp r1, 0
@@ -1904,7 +1904,7 @@ _0803A09C:
adds r4, r6, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
adds r1, r7, 0x1
str r1, [sp, 0x18]
@@ -1912,7 +1912,7 @@ _0803A09C:
beq _0803A158
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0803A158
ldr r1, _0803A188 @ =gUnknown_2023BCE
@@ -1950,7 +1950,7 @@ _0803A100:
adds r1, 0xD
ldr r0, _0803A184 @ =gUnknown_202402C
add r0, r9
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0
@@ -1968,11 +1968,11 @@ _0803A100:
beq _0803A13C
ldrb r0, [r6]
mov r1, r10
- bl sub_801E68C
+ bl AI_CalcDmg
ldrb r1, [r6]
adds r0, r4, 0
mov r2, r10
- bl sub_801EDF4
+ bl TypeCalc
_0803A13C:
mov r2, r8
ldr r0, [r2]
@@ -2095,17 +2095,17 @@ _0803A20A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0803A246
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0803A246
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -2245,7 +2245,7 @@ _0803A348:
mov r0, r9
movs r1, 0x4
movs r2, 0x4
- bl sub_8042C08
+ bl GetItemEffectParamOffset
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -2576,7 +2576,7 @@ _0803A5C4: .4byte gUnknown_2023E0C
_0803A5C8:
ldr r4, _0803A630 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0803A634 @ =gUnknown_2023E0C
@@ -2604,7 +2604,7 @@ _0803A5FC:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
ldr r0, _0803A630 @ =gUnknown_2023BC4
ldrb r0, [r0]
lsrs r0, 1
diff --git a/asm/battle_anim.s b/asm/battle_anim.s
index 54284ed8c..a4b8cb442 100644
--- a/asm/battle_anim.s
+++ b/asm/battle_anim.s
@@ -148,7 +148,7 @@ sub_80725D4: @ 80725D4
mov r9, r2
bl sub_80767F0
movs r0, 0
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
movs r4, 0
ldr r6, _08072618 @ =gUnknown_2023BCE
movs r7, 0x64
@@ -156,7 +156,7 @@ sub_80725D4: @ 80725D4
_08072600:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08072624
@@ -175,7 +175,7 @@ _08072624:
_0807262A:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r6, 0x2
adds r5, 0x2
@@ -205,7 +205,7 @@ _08072658:
mov r12, r1
ldr r0, _080726D4 @ =gUnknown_2037EDC
mov r10, r0
- ldr r7, _080726D8 @ =sub_8072828
+ ldr r7, _080726D8 @ =RunAnimScriptCommand
ldr r1, _080726DC @ =gUnknown_2037F02
movs r2, 0
adds r0, r1, 0
@@ -256,7 +256,7 @@ _080726C8: .4byte gUnknown_2037ED4
_080726CC: .4byte gUnknown_2037EE1
_080726D0: .4byte gUnknown_2037EE0
_080726D4: .4byte gUnknown_2037EDC
-_080726D8: .4byte sub_8072828
+_080726D8: .4byte RunAnimScriptCommand
_080726DC: .4byte gUnknown_2037F02
_080726E0: .4byte 0x0000ffff
_080726E4: .4byte gUnknown_2037EEE
@@ -302,13 +302,13 @@ _08072738: .4byte gUnknown_2022988
_0807273C: .4byte gUnknown_202298A
thumb_func_end sub_80725D4
- thumb_func_start sub_8072740
-sub_8072740: @ 8072740
+ thumb_func_start DestroyAnimSprite
+DestroyAnimSprite: @ 8072740
push {r4,lr}
adds r4, r0, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
ldr r1, _0807275C @ =gUnknown_2037EE2
ldrb r0, [r1]
subs r0, 0x1
@@ -318,14 +318,14 @@ sub_8072740: @ 8072740
bx r0
.align 2, 0
_0807275C: .4byte gUnknown_2037EE2
- thumb_func_end sub_8072740
+ thumb_func_end DestroyAnimSprite
- thumb_func_start sub_8072760
-sub_8072760: @ 8072760
+ thumb_func_start DestroyAnimVisualTask
+DestroyAnimVisualTask: @ 8072760
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08072778 @ =gUnknown_2037EE2
ldrb r0, [r1]
subs r0, 0x1
@@ -334,14 +334,14 @@ sub_8072760: @ 8072760
bx r0
.align 2, 0
_08072778: .4byte gUnknown_2037EE2
- thumb_func_end sub_8072760
+ thumb_func_end DestroyAnimVisualTask
- thumb_func_start sub_807277C
-sub_807277C: @ 807277C
+ thumb_func_start DestroyAnimSoundTask
+DestroyAnimSoundTask: @ 807277C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08072794 @ =gUnknown_2037EE3
ldrb r0, [r1]
subs r0, 0x1
@@ -350,10 +350,10 @@ sub_807277C: @ 807277C
bx r0
.align 2, 0
_08072794: .4byte gUnknown_2037EE3
- thumb_func_end sub_807277C
+ thumb_func_end DestroyAnimSoundTask
- thumb_func_start sub_8072798
-sub_8072798: @ 8072798
+ thumb_func_start AddSpriteIndex
+AddSpriteIndex: @ 8072798
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -378,10 +378,10 @@ _080727C0:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8072798
+ thumb_func_end AddSpriteIndex
- thumb_func_start sub_80727C8
-sub_80727C8: @ 80727C8
+ thumb_func_start ClearSpriteIndex
+ClearSpriteIndex: @ 80727C8
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -408,10 +408,10 @@ _080727F4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80727C8
+ thumb_func_end ClearSpriteIndex
- thumb_func_start sub_80727FC
-sub_80727FC: @ 80727FC
+ thumb_func_start WaitAnimFrameCount
+WaitAnimFrameCount: @ 80727FC
push {lr}
ldr r2, _08072814 @ =gUnknown_2037EE0
ldrb r1, [r2]
@@ -420,24 +420,24 @@ sub_80727FC: @ 80727FC
cmp r0, 0
bgt _08072820
ldr r0, _08072818 @ =gUnknown_2037EDC
- ldr r1, _0807281C @ =sub_8072828
+ ldr r1, _0807281C @ =RunAnimScriptCommand
str r1, [r0]
movs r0, 0
b _08072822
.align 2, 0
_08072814: .4byte gUnknown_2037EE0
_08072818: .4byte gUnknown_2037EDC
-_0807281C: .4byte sub_8072828
+_0807281C: .4byte RunAnimScriptCommand
_08072820:
subs r0, r1, 0x1
_08072822:
strb r0, [r2]
pop {r0}
bx r0
- thumb_func_end sub_80727FC
+ thumb_func_end WaitAnimFrameCount
- thumb_func_start sub_8072828
-sub_8072828: @ 8072828
+ thumb_func_start RunAnimScriptCommand
+RunAnimScriptCommand: @ 8072828
push {r4,lr}
ldr r4, _08072858 @ =gUnknown_83ADF5C
_0807282C:
@@ -467,10 +467,10 @@ _08072858: .4byte gUnknown_83ADF5C
_0807285C: .4byte gUnknown_2037ED4
_08072860: .4byte gUnknown_2037EE0
_08072864: .4byte gUnknown_2037EE1
- thumb_func_end sub_8072828
+ thumb_func_end RunAnimScriptCommand
- thumb_func_start sub_8072868
-sub_8072868: @ 8072868
+ thumb_func_start ScriptCmd_loadspritegfx
+ScriptCmd_loadspritegfx: @ 8072868
push {r4-r6,lr}
ldr r6, _080728B4 @ =gUnknown_2037ED4
ldr r0, [r6]
@@ -496,12 +496,12 @@ sub_8072868: @ 8072868
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
- bl sub_8072798
+ bl AddSpriteIndex
ldr r1, _080728C4 @ =gUnknown_2037EE0
movs r0, 0x1
strb r0, [r1]
ldr r1, _080728C8 @ =gUnknown_2037EDC
- ldr r0, _080728CC @ =sub_80727FC
+ ldr r0, _080728CC @ =WaitAnimFrameCount
str r0, [r1]
pop {r4-r6}
pop {r0}
@@ -513,11 +513,11 @@ _080728BC: .4byte gUnknown_8399C90
_080728C0: .4byte 0xffffd8f0
_080728C4: .4byte gUnknown_2037EE0
_080728C8: .4byte gUnknown_2037EDC
-_080728CC: .4byte sub_80727FC
- thumb_func_end sub_8072868
+_080728CC: .4byte WaitAnimFrameCount
+ thumb_func_end ScriptCmd_loadspritegfx
- thumb_func_start sub_80728D0
-sub_80728D0: @ 80728D0
+ thumb_func_start ScriptCmd_unloadspritegfx
+ScriptCmd_unloadspritegfx: @ 80728D0
push {r4-r6,lr}
ldr r6, _08072910 @ =gUnknown_2037ED4
ldr r0, [r6]
@@ -534,16 +534,16 @@ sub_80728D0: @ 80728D0
adds r0, r1
ldrh r5, [r0, 0x6]
adds r0, r5, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r5, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, [r6]
adds r0, 0x2
str r0, [r6]
lsls r4, 16
lsrs r4, 16
adds r0, r4, 0
- bl sub_80727C8
+ bl ClearSpriteIndex
pop {r4-r6}
pop {r0}
bx r0
@@ -551,10 +551,10 @@ sub_80728D0: @ 80728D0
_08072910: .4byte gUnknown_2037ED4
_08072914: .4byte gUnknown_83ACC08
_08072918: .4byte 0xffffd8f0
- thumb_func_end sub_80728D0
+ thumb_func_end ScriptCmd_unloadspritegfx
- thumb_func_start sub_807291C
-sub_807291C: @ 807291C
+ thumb_func_start ScriptCmd_createsprite
+ScriptCmd_createsprite: @ 807291C
push {r4-r7,lr}
ldr r5, _08072984 @ =gUnknown_2037ED4
ldr r1, [r5]
@@ -665,7 +665,7 @@ _080729CC:
lsrs r3, 24
adds r0, r7, 0
adds r1, r4, 0
- bl sub_80071EC
+ bl CreateSpriteAndAnimate
ldr r1, _08072A0C @ =gUnknown_2037EE2
ldrb r0, [r1]
adds r0, 0x1
@@ -677,10 +677,10 @@ _080729CC:
_08072A04: .4byte gUnknown_2037F1A
_08072A08: .4byte gUnknown_2037F1B
_08072A0C: .4byte gUnknown_2037EE2
- thumb_func_end sub_807291C
+ thumb_func_end ScriptCmd_createsprite
- thumb_func_start sub_8072A10
-sub_8072A10: @ 8072A10
+ thumb_func_start ScriptCmd_createvisualtask
+ScriptCmd_createvisualtask: @ 8072A10
push {r4-r7,lr}
ldr r4, _08072A80 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -725,7 +725,7 @@ _08072A48:
_08072A60:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
@@ -740,10 +740,10 @@ _08072A60:
_08072A80: .4byte gUnknown_2037ED4
_08072A84: .4byte gUnknown_2037F02
_08072A88: .4byte gUnknown_2037EE2
- thumb_func_end sub_8072A10
+ thumb_func_end ScriptCmd_createvisualtask
- thumb_func_start sub_8072A8C
-sub_8072A8C: @ 8072A8C
+ thumb_func_start ScriptCmd_delay
+ScriptCmd_delay: @ 8072A8C
push {r4,lr}
ldr r1, _08072ABC @ =gUnknown_2037ED4
ldr r0, [r1]
@@ -763,7 +763,7 @@ _08072AAA:
adds r0, r2, 0x1
str r0, [r1]
ldr r1, _08072AC4 @ =gUnknown_2037EDC
- ldr r0, _08072AC8 @ =sub_80727FC
+ ldr r0, _08072AC8 @ =WaitAnimFrameCount
str r0, [r1]
pop {r4}
pop {r0}
@@ -772,8 +772,8 @@ _08072AAA:
_08072ABC: .4byte gUnknown_2037ED4
_08072AC0: .4byte gUnknown_2037EE0
_08072AC4: .4byte gUnknown_2037EDC
-_08072AC8: .4byte sub_80727FC
- thumb_func_end sub_8072A8C
+_08072AC8: .4byte WaitAnimFrameCount
+ thumb_func_end ScriptCmd_delay
thumb_func_start sub_8072ACC
sub_8072ACC: @ 8072ACC
@@ -847,7 +847,7 @@ _08072B3C: .4byte gUnknown_2037EE3
_08072B40: .4byte gUnknown_2037F14
_08072B44: .4byte gUnknown_2037F12
_08072B48:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08072B80
@@ -887,12 +887,12 @@ _08072B8E:
lsls r0, 3
adds r0, r6
ldrh r0, [r0, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrh r0, [r4]
lsls r0, 3
adds r0, r6
ldrh r0, [r0, 0x6]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldrh r1, [r4]
adds r0, r7, 0
orrs r0, r1
@@ -912,7 +912,7 @@ _08072BB2:
bl m4aMPlayVolumeControl
bl sub_80767F0
movs r0, 0x1
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
ldr r0, _08072C04 @ =gUnknown_2037EE1
mov r1, r8
strb r1, [r0]
@@ -994,7 +994,7 @@ _08072C62:
cmp r0, 0
beq _08072D12
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1013,7 +1013,7 @@ _08072C88:
ldrb r4, [r0]
ldr r0, _08072CE0 @ =sub_8073174
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08072CE4 @ =gUnknown_3005090
@@ -1078,7 +1078,7 @@ _08072D12:
cmp r0, 0
beq _08072DCE
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1097,7 +1097,7 @@ _08072D3E:
ldrb r4, [r0]
ldr r0, _08072DA0 @ =sub_8073174
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _08072D94 @ =gUnknown_3005090
@@ -1236,13 +1236,13 @@ _08072E5E:
lsls r2, 6
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
ldr r1, _08072F60 @ =0x0600e000
movs r2, 0x80
lsls r2, 5
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
add r0, sp, 0x10
bl sub_80752A0
add r0, sp, 0x20
@@ -1259,15 +1259,15 @@ _08072E5E:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r2, _08072F6C @ =gUnknown_2023D44
adds r2, r7, r2
ldrb r0, [r2]
@@ -1302,10 +1302,10 @@ _08072E5E:
strb r1, [r0]
ldrh r1, [r5]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
lsls r4, r7, 5
ldr r0, _08072F7C @ =gUnknown_20373F8
adds r4, r0
@@ -1314,7 +1314,7 @@ _08072E5E:
lsls r1, 4
adds r0, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
add r0, sp, 0x10
ldrb r1, [r0, 0x8]
lsls r1, 5
@@ -1325,7 +1325,7 @@ _08072E5E:
adds r0, r4, 0
bl CpuSet
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -1361,14 +1361,14 @@ _08072F84:
lsls r2, 6
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
ldr r1, _08073098 @ =0x0600f000
movs r6, 0x80
lsls r6, 5
movs r0, 0
adds r2, r6, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
add r0, sp, 0x10
movs r1, 0x2
bl sub_80752C8
@@ -1392,15 +1392,15 @@ _08072F84:
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r2, _080730A4 @ =gUnknown_2023D44
adds r2, r7, r2
ldrb r0, [r2]
@@ -1435,23 +1435,23 @@ _08072F84:
strb r1, [r0]
ldrh r1, [r5]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
lsls r4, r7, 5
ldr r0, _080730B4 @ =gUnknown_20373F8
adds r4, r0
adds r0, r4, 0
movs r1, 0x90
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080730B8 @ =0x05000120
ldr r2, _080730BC @ =0x04000008
adds r0, r4, 0
bl CpuSet
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -1775,7 +1775,7 @@ _080732E4:
_080732E6:
ldr r0, _08073310 @ =sub_807331C
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073314 @ =gUnknown_3005090
@@ -1817,7 +1817,7 @@ sub_807331C: @ 807331C
cmp r0, 0x1
beq _0807338E
ldrb r0, [r4, 0xC]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1835,7 +1835,7 @@ _08073354:
adds r0, r5, 0
bl sub_8073128
ldrb r0, [r6]
- bl sub_8077508
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r6]
_0807336C:
@@ -1848,12 +1848,12 @@ _0807336C:
adds r0, r5, 0
bl sub_8073128
ldrb r0, [r6, 0x1]
- bl sub_8077508
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r6, 0x1]
_08073388:
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
_0807338E:
pop {r4-r7}
pop {r0}
@@ -1902,7 +1902,7 @@ _080733CE:
cmp r0, 0
beq _08073416
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -1940,7 +1940,7 @@ _08073416:
cmp r0, 0
beq _08073464
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2069,7 +2069,7 @@ _08073520:
_08073522:
ldr r0, _0807354C @ =sub_8073558
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073550 @ =gUnknown_3005090
@@ -2115,7 +2115,7 @@ sub_8073558: @ 8073558
ldrb r4, [r5, 0xC]
adds r6, r4, 0
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
movs r1, 0xFF
lsls r1, 24
@@ -2151,7 +2151,7 @@ _080735AA:
bl sub_8073128
_080735CC:
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080735D2:
pop {r3}
mov r8, r3
@@ -2162,8 +2162,8 @@ _080735D2:
_080735DC: .4byte gUnknown_3005090
thumb_func_end sub_8073558
- thumb_func_start sub_80735E0
-sub_80735E0: @ 80735E0
+ thumb_func_start ScriptCmd_setalpha
+ScriptCmd_setalpha: @ 80735E0
push {r4,r5,lr}
ldr r2, _08073614 @ =gUnknown_2037ED4
ldr r0, [r2]
@@ -2179,20 +2179,20 @@ sub_80735E0: @ 80735E0
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
orrs r5, r4
movs r0, 0x52
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08073614: .4byte gUnknown_2037ED4
- thumb_func_end sub_80735E0
+ thumb_func_end ScriptCmd_setalpha
- thumb_func_start sub_8073618
-sub_8073618: @ 8073618
+ thumb_func_start ScriptCmd_setbldcnt
+ScriptCmd_setbldcnt: @ 8073618
push {lr}
ldr r3, _0807363C @ =gUnknown_2037ED4
ldr r0, [r3]
@@ -2207,15 +2207,15 @@ sub_8073618: @ 8073618
str r0, [r3]
orrs r1, r2
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_0807363C: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073618
+ thumb_func_end ScriptCmd_setbldcnt
- thumb_func_start sub_8073640
-sub_8073640: @ 8073640
+ thumb_func_start ScriptCmd_blendoff
+ScriptCmd_blendoff: @ 8073640
push {lr}
ldr r1, _08073660 @ =gUnknown_2037ED4
ldr r0, [r1]
@@ -2223,18 +2223,18 @@ sub_8073640: @ 8073640
str r0, [r1]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_08073660: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073640
+ thumb_func_end ScriptCmd_blendoff
- thumb_func_start sub_8073664
-sub_8073664: @ 8073664
+ thumb_func_start ScriptCmd_call
+ScriptCmd_call: @ 8073664
push {r4,lr}
ldr r4, _08073690 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -2260,7 +2260,7 @@ sub_8073664: @ 8073664
.align 2, 0
_08073690: .4byte gUnknown_2037ED4
_08073694: .4byte gUnknown_2037ED8
- thumb_func_end sub_8073664
+ thumb_func_end ScriptCmd_call
thumb_func_start sub_8073698
sub_8073698: @ 8073698
@@ -2274,8 +2274,8 @@ _080736A4: .4byte gUnknown_2037ED4
_080736A8: .4byte gUnknown_2037ED8
thumb_func_end sub_8073698
- thumb_func_start sub_80736AC
-sub_80736AC: @ 80736AC
+ thumb_func_start ScriptCmd_setarg
+ScriptCmd_setarg: @ 80736AC
push {r4,r5,lr}
ldr r5, _080736D8 @ =gUnknown_2037ED4
ldr r1, [r5]
@@ -2300,10 +2300,10 @@ sub_80736AC: @ 80736AC
.align 2, 0
_080736D8: .4byte gUnknown_2037ED4
_080736DC: .4byte gUnknown_2037F02
- thumb_func_end sub_80736AC
+ thumb_func_end ScriptCmd_setarg
- thumb_func_start sub_80736E0
-sub_80736E0: @ 80736E0
+ thumb_func_start ScriptCmd_choosetwoturnanim
+ScriptCmd_choosetwoturnanim: @ 80736E0
push {lr}
ldr r3, _08073718 @ =gUnknown_2037ED4
ldr r2, [r3]
@@ -2335,10 +2335,10 @@ _080736FA:
.align 2, 0
_08073718: .4byte gUnknown_2037ED4
_0807371C: .4byte gUnknown_2037F16
- thumb_func_end sub_80736E0
+ thumb_func_end ScriptCmd_choosetwoturnanim
- thumb_func_start sub_8073720
-sub_8073720: @ 8073720
+ thumb_func_start ScriptCmd_jumpifmoveturn
+ScriptCmd_jumpifmoveturn: @ 8073720
push {r4,r5,lr}
ldr r5, _08073750 @ =gUnknown_2037ED4
ldr r4, [r5]
@@ -2373,10 +2373,10 @@ _0807375C:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8073720
+ thumb_func_end ScriptCmd_jumpifmoveturn
- thumb_func_start sub_8073764
-sub_8073764: @ 8073764
+ thumb_func_start ScriptCmd_jump
+ScriptCmd_jump: @ 8073764
ldr r3, _08073784 @ =gUnknown_2037ED4
ldr r0, [r3]
adds r2, r0, 0x1
@@ -2395,7 +2395,7 @@ sub_8073764: @ 8073764
bx lr
.align 2, 0
_08073784: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073764
+ thumb_func_end ScriptCmd_jump
thumb_func_start sub_8073788
sub_8073788: @ 8073788
@@ -2431,7 +2431,7 @@ sub_80737A0: @ 80737A0
str r0, [r1]
ldr r0, _080737D8 @ =sub_8073850
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080737DC @ =gUnknown_3005090
@@ -2466,12 +2466,12 @@ sub_80737E4: @ 80737E4
str r0, [r1]
ldr r0, _08073824 @ =sub_8073850
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _08073828 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08073830
@@ -2528,7 +2528,7 @@ sub_8073850: @ 8073850
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8071264
+ bl BeginHardwarePaletteFade
ldrh r0, [r4, 0x1C]
adds r0, 0x1
strh r0, [r4, 0x1C]
@@ -2575,7 +2575,7 @@ _080738CA:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8071264
+ bl BeginHardwarePaletteFade
ldr r1, _080738EC @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -2604,7 +2604,7 @@ _080738F0:
cmp r0, 0x3
bne _08073918
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _08073920 @ =gUnknown_2037F17
strb r4, [r0]
_08073918:
@@ -2630,17 +2630,17 @@ sub_8073924: @ 8073924
adds r0, r4, r0
ldr r0, [r0]
ldr r1, _08073964 @ =0x0600d000
- bl sub_800EBC0
+ bl LZDecompressVram
adds r0, r4, r5
ldr r0, [r0]
ldr r1, _08073968 @ =0x06008000
- bl sub_800EBC0
+ bl LZDecompressVram
adds r5, 0x4
adds r4, r5
ldr r0, [r4]
movs r1, 0x20
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -2667,7 +2667,7 @@ sub_8073978: @ 8073978
str r0, [r1]
ldr r0, _080739AC @ =sub_8073850
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080739B0 @ =gUnknown_3005090
@@ -2787,7 +2787,7 @@ sub_8073A44: @ 8073A44
cmp r0, 0
beq _08073A80
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -2799,13 +2799,13 @@ _08073A78: .4byte gUnknown_2024018
_08073A7C: .4byte gUnknown_2037F1A
_08073A80:
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08073ABA
ldr r0, _08073AA8 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08073AE6
@@ -2828,7 +2828,7 @@ _08073AAC:
_08073ABA:
ldr r0, _08073ADC @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2889,7 +2889,7 @@ sub_8073B08: @ 8073B08
cmp r0, 0
beq _08073B44
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r4, 0xC0
cmp r0, 0
@@ -2901,7 +2901,7 @@ _08073B3C: .4byte gUnknown_2024018
_08073B40: .4byte gUnknown_2037F1A
_08073B44:
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08073B56
@@ -2941,8 +2941,8 @@ _08073B7A:
_08073B84: .4byte 0x0000ffc0
thumb_func_end sub_8073B60
- thumb_func_start sub_8073B88
-sub_8073B88: @ 8073B88
+ thumb_func_start CalculatePanIncrement
+CalculatePanIncrement: @ 8073B88
push {lr}
lsls r2, 16
lsrs r2, 16
@@ -2979,10 +2979,10 @@ _08073BBE:
asrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8073B88
+ thumb_func_end CalculatePanIncrement
- thumb_func_start sub_8073BC8
-sub_8073BC8: @ 8073BC8
+ thumb_func_start ScriptCmd_playsewithpan
+ScriptCmd_playsewithpan: @ 8073BC8
push {r4,r5,lr}
ldr r5, _08073BFC @ =gUnknown_2037ED4
ldr r0, [r5]
@@ -2999,7 +2999,7 @@ sub_8073BC8: @ 8073BC8
lsls r1, 24
asrs r1, 24
adds r0, r4, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r0, [r5]
adds r0, 0x3
str r0, [r5]
@@ -3008,10 +3008,10 @@ sub_8073BC8: @ 8073BC8
bx r0
.align 2, 0
_08073BFC: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073BC8
+ thumb_func_end ScriptCmd_playsewithpan
- thumb_func_start sub_8073C00
-sub_8073C00: @ 8073C00
+ thumb_func_start ScriptCmd_setpan
+ScriptCmd_setpan: @ 8073C00
push {r4,lr}
ldr r4, _08073C28 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -3022,7 +3022,7 @@ sub_8073C00: @ 8073C00
bl sub_8073A44
lsls r0, 24
asrs r0, 24
- bl sub_80723B0
+ bl SE12PanpotControl
ldr r0, [r4]
adds r0, 0x1
str r0, [r4]
@@ -3031,10 +3031,10 @@ sub_8073C00: @ 8073C00
bx r0
.align 2, 0
_08073C28: .4byte gUnknown_2037ED4
- thumb_func_end sub_8073C00
+ thumb_func_end ScriptCmd_setpan
- thumb_func_start sub_8073C2C
-sub_8073C2C: @ 8073C2C
+ thumb_func_start ScriptCmd_panse_1B
+ScriptCmd_panse_1B: @ 8073C2C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3078,13 +3078,13 @@ sub_8073C2C: @ 8073C2C
adds r0, r5, 0
mov r1, r8
adds r2, r6, 0
- bl sub_8073B88
+ bl CalculatePanIncrement
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _08073CE0 @ =sub_8073CEC
+ ldr r0, _08073CE0 @ =Task_PanFromInitialToTarget
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073CE4 @ =gUnknown_3005090
@@ -3102,7 +3102,7 @@ sub_8073C2C: @ 8073C2C
strh r5, [r1, 0x10]
mov r0, r9
adds r1, r5, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r1, _08073CE8 @ =gUnknown_2037EE3
ldrb r0, [r1]
adds r0, 0x1
@@ -3120,13 +3120,13 @@ sub_8073C2C: @ 8073C2C
bx r0
.align 2, 0
_08073CDC: .4byte gUnknown_2037ED4
-_08073CE0: .4byte sub_8073CEC
+_08073CE0: .4byte Task_PanFromInitialToTarget
_08073CE4: .4byte gUnknown_3005090
_08073CE8: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073C2C
+ thumb_func_end ScriptCmd_panse_1B
- thumb_func_start sub_8073CEC
-sub_8073CEC: @ 8073CEC
+ thumb_func_start Task_PanFromInitialToTarget
+Task_PanFromInitialToTarget: @ 8073CEC
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3186,7 +3186,7 @@ _08073D54:
_08073D58:
lsrs r4, r2, 16
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08073D78 @ =gUnknown_2037EE3
ldrb r0, [r1]
subs r0, 0x1
@@ -3194,17 +3194,17 @@ _08073D58:
_08073D68:
lsls r0, r4, 24
asrs r0, 24
- bl sub_80723B0
+ bl SE12PanpotControl
_08073D70:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08073D78: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073CEC
+ thumb_func_end Task_PanFromInitialToTarget
- thumb_func_start sub_8073D7C
-sub_8073D7C: @ 8073D7C
+ thumb_func_start ScriptCmd_panse_26
+ScriptCmd_panse_26: @ 8073D7C
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -3228,9 +3228,9 @@ sub_8073D7C: @ 8073D7C
ldrb r6, [r1, 0x4]
ldrb r1, [r1, 0x5]
mov r10, r1
- ldr r0, _08073E04 @ =sub_8073CEC
+ ldr r0, _08073E04 @ =Task_PanFromInitialToTarget
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073E08 @ =gUnknown_3005090
@@ -3252,7 +3252,7 @@ sub_8073D7C: @ 8073D7C
strh r4, [r1, 0x10]
mov r0, r8
adds r1, r4, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r1, _08073E0C @ =gUnknown_2037EE3
ldrb r0, [r1]
adds r0, 0x1
@@ -3270,13 +3270,13 @@ sub_8073D7C: @ 8073D7C
bx r0
.align 2, 0
_08073E00: .4byte gUnknown_2037ED4
-_08073E04: .4byte sub_8073CEC
+_08073E04: .4byte Task_PanFromInitialToTarget
_08073E08: .4byte gUnknown_3005090
_08073E0C: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073D7C
+ thumb_func_end ScriptCmd_panse_26
- thumb_func_start sub_8073E10
-sub_8073E10: @ 8073E10
+ thumb_func_start ScriptCmd_panse_27
+ScriptCmd_panse_27: @ 8073E10
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3321,9 +3321,9 @@ sub_8073E10: @ 8073E10
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _08073EC4 @ =sub_8073CEC
+ ldr r0, _08073EC4 @ =Task_PanFromInitialToTarget
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073EC8 @ =gUnknown_3005090
@@ -3344,7 +3344,7 @@ sub_8073E10: @ 8073E10
strh r6, [r1, 0x10]
mov r0, r9
adds r1, r6, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r1, _08073ECC @ =gUnknown_2037EE3
ldrb r0, [r1]
adds r0, 0x1
@@ -3362,13 +3362,13 @@ sub_8073E10: @ 8073E10
bx r0
.align 2, 0
_08073EC0: .4byte gUnknown_2037ED4
-_08073EC4: .4byte sub_8073CEC
+_08073EC4: .4byte Task_PanFromInitialToTarget
_08073EC8: .4byte gUnknown_3005090
_08073ECC: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073E10
+ thumb_func_end ScriptCmd_panse_27
- thumb_func_start sub_8073ED0
-sub_8073ED0: @ 8073ED0
+ thumb_func_start ScriptCmd_loopsewithpan
+ScriptCmd_loopsewithpan: @ 8073ED0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -3391,9 +3391,9 @@ sub_8073ED0: @ 8073ED0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _08073F4C @ =sub_8073F58
+ ldr r0, _08073F4C @ =Task_LoopAndPlaySE
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08073F50 @ =gUnknown_3005090
@@ -3428,13 +3428,13 @@ sub_8073ED0: @ 8073ED0
bx r0
.align 2, 0
_08073F48: .4byte gUnknown_2037ED4
-_08073F4C: .4byte sub_8073F58
+_08073F4C: .4byte Task_LoopAndPlaySE
_08073F50: .4byte gUnknown_3005090
_08073F54: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073ED0
+ thumb_func_end ScriptCmd_loopsewithpan
- thumb_func_start sub_8073F58
-sub_8073F58: @ 8073F58
+ thumb_func_start Task_LoopAndPlaySE
+Task_LoopAndPlaySE: @ 8073F58
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3463,11 +3463,11 @@ sub_8073F58: @ 8073F58
lsrs r4, 24
lsls r1, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
cmp r4, 0
bne _08073FA6
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08073FB0 @ =gUnknown_2037EE3
ldrb r0, [r1]
subs r0, 0x1
@@ -3479,10 +3479,10 @@ _08073FA6:
.align 2, 0
_08073FAC: .4byte gUnknown_3005090
_08073FB0: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073F58
+ thumb_func_end Task_LoopAndPlaySE
- thumb_func_start sub_8073FB4
-sub_8073FB4: @ 8073FB4
+ thumb_func_start ScriptCmd_waitplaysewithpan
+ScriptCmd_waitplaysewithpan: @ 8073FB4
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3502,9 +3502,9 @@ sub_8073FB4: @ 8073FB4
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r0, _0807401C @ =sub_8074028
+ ldr r0, _0807401C @ =Task_WaitAndPlaySE
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08074020 @ =gUnknown_3005090
@@ -3532,13 +3532,13 @@ sub_8073FB4: @ 8073FB4
bx r0
.align 2, 0
_08074018: .4byte gUnknown_2037ED4
-_0807401C: .4byte sub_8074028
+_0807401C: .4byte Task_WaitAndPlaySE
_08074020: .4byte gUnknown_3005090
_08074024: .4byte gUnknown_2037EE3
- thumb_func_end sub_8073FB4
+ thumb_func_end ScriptCmd_waitplaysewithpan
- thumb_func_start sub_8074028
-sub_8074028: @ 8074028
+ thumb_func_start Task_WaitAndPlaySE
+Task_WaitAndPlaySE: @ 8074028
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3556,9 +3556,9 @@ sub_8074028: @ 8074028
ldrh r0, [r2, 0x8]
movs r1, 0xA
ldrsb r1, [r2, r1]
- bl sub_80722F4
+ bl PlaySE12WithPanning
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08074068 @ =gUnknown_2037EE3
ldrb r0, [r1]
subs r0, 0x1
@@ -3570,10 +3570,10 @@ _0807405C:
.align 2, 0
_08074064: .4byte gUnknown_3005090
_08074068: .4byte gUnknown_2037EE3
- thumb_func_end sub_8074028
+ thumb_func_end Task_WaitAndPlaySE
- thumb_func_start sub_807406C
-sub_807406C: @ 807406C
+ thumb_func_start ScriptCmd_createsoundtask
+ScriptCmd_createsoundtask: @ 807406C
push {r4-r6,lr}
ldr r4, _080740D4 @ =gUnknown_2037ED4
ldr r1, [r4]
@@ -3615,7 +3615,7 @@ _0807409E:
_080740B6:
adds r0, r6, 0
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
@@ -3630,16 +3630,16 @@ _080740B6:
_080740D4: .4byte gUnknown_2037ED4
_080740D8: .4byte gUnknown_2037F02
_080740DC: .4byte gUnknown_2037EE3
- thumb_func_end sub_807406C
+ thumb_func_end ScriptCmd_createsoundtask
- thumb_func_start sub_80740E0
-sub_80740E0: @ 80740E0
+ thumb_func_start ScriptCmd_waitsound
+ScriptCmd_waitsound: @ 80740E0
push {r4,r5,lr}
ldr r0, _08074118 @ =gUnknown_2037EE3
ldrb r5, [r0]
cmp r5, 0
bne _08074128
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -3693,10 +3693,10 @@ _08074152:
_08074158: .4byte gUnknown_2037F12
_0807415C: .4byte gUnknown_2037ED4
_08074160: .4byte gUnknown_2037EE0
- thumb_func_end sub_80740E0
+ thumb_func_end ScriptCmd_waitsound
- thumb_func_start sub_8074164
-sub_8074164: @ 8074164
+ thumb_func_start ScriptCmd_jumpargeq
+ScriptCmd_jumpargeq: @ 8074164
push {r4-r6,lr}
ldr r5, _080741A4 @ =gUnknown_2037ED4
ldr r4, [r5]
@@ -3739,7 +3739,7 @@ _080741B2:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8074164
+ thumb_func_end ScriptCmd_jumpargeq
thumb_func_start sub_80741B8
sub_80741B8: @ 80741B8
@@ -3771,7 +3771,7 @@ _080741E4:
ldr r0, _08074210 @ =gUnknown_2037F1A
_080741E6:
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -3782,11 +3782,11 @@ _080741F8:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_0807420C:
pop {r0}
bx r0
@@ -3804,11 +3804,11 @@ sub_8074214: @ 8074214
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
pop {r0}
bx r0
.align 2, 0
@@ -3825,11 +3825,11 @@ sub_807423C: @ 807423C
str r0, [r1]
ldr r7, _08074270 @ =gUnknown_2037F1A
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r5, _08074274 @ =gUnknown_2037F1B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -3845,7 +3845,7 @@ _08074274: .4byte gUnknown_2037F1B
_08074278:
ldrb r0, [r7]
_0807427A:
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -3856,11 +3856,11 @@ _0807428A:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_0807429E:
pop {r4-r7}
pop {r0}
@@ -3873,7 +3873,7 @@ sub_80742A4: @ 80742A4
ldr r4, _080742D8 @ =gUnknown_2037ED4
ldr r0, [r4]
ldrb r0, [r0, 0x1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3906,7 +3906,7 @@ sub_80742E0: @ 80742E0
ldr r4, _08074318 @ =gUnknown_2037ED4
ldr r0, [r4]
ldrb r0, [r0, 0x1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3948,11 +3948,11 @@ sub_8074320: @ 8074320
beq _080743C2
ldr r6, _08074368 @ =gUnknown_2037F1A
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r5, _0807436C @ =gUnknown_2037F1B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -3976,7 +3976,7 @@ _08074370:
lsrs r4, r0, 24
movs r0, 0x1
_0807437C:
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4030,11 +4030,11 @@ sub_80743C8: @ 80743C8
beq _0807444C
ldr r6, _08074410 @ =gUnknown_2037F1A
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r5, _08074414 @ =gUnknown_2037F1B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -4058,7 +4058,7 @@ _08074418:
lsrs r4, r0, 24
movs r0, 0x1
_08074424:
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
diff --git a/asm/battle_anim_8074480.s b/asm/battle_anim_8074480.s
index 7d11d789b..3dfbd7036 100644
--- a/asm/battle_anim_8074480.s
+++ b/asm/battle_anim_8074480.s
@@ -31,7 +31,7 @@ _0807449C:
_080744B0:
ldr r4, _080744D0 @ =gUnknown_83AE01C
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 22
ldr r1, _080744D4 @ =gUnknown_2022B4C
@@ -49,7 +49,7 @@ _080744D4: .4byte gUnknown_2022B4C
_080744D8:
ldr r4, _080744F8 @ =gUnknown_83AE01C
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 22
ldr r1, _080744FC @ =gUnknown_2022B4C
@@ -66,7 +66,7 @@ _080744F8: .4byte gUnknown_83AE01C
_080744FC: .4byte gUnknown_2022B4C
_08074500:
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08074538
@@ -109,7 +109,7 @@ _08074538:
_08074556:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
b _08074572
@@ -148,7 +148,7 @@ sub_8074590: @ 8074590
lsrs r4, r1, 16
adds r7, r4, 0
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08074674
@@ -171,7 +171,7 @@ sub_8074590: @ 8074590
ldr r1, _080745E0 @ =gUnknown_2024284
adds r0, r1
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
b _080745EA
.align 2, 0
@@ -272,7 +272,7 @@ _08074674:
ldr r1, _080746AC @ =gUnknown_202402C
adds r0, r1
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
b _080746B6
.align 2, 0
@@ -373,7 +373,7 @@ sub_807474C: @ 807474C
adds r7, r4, 0
movs r5, 0
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -425,7 +425,7 @@ sub_80747AC: @ 80747AC
lsls r2, 24
lsrs r7, r2, 24
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080747D4
@@ -451,7 +451,7 @@ _080747D4:
lsrs r5, r0, 16
_080747F2:
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
ldr r3, _0807483C @ =gUnknown_83AE01C
lsls r0, 24
lsrs r0, 22
@@ -469,7 +469,7 @@ _080747F2:
cmp r7, 0
beq _08074832
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0807482C
@@ -564,7 +564,7 @@ sub_80748BC: @ 80748BC
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080748E0
@@ -600,7 +600,7 @@ sub_8074900: @ 8074900
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -631,7 +631,7 @@ sub_807492C: @ 807492C
lsls r0, 24
lsrs r6, r0, 24
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08074978
@@ -674,7 +674,7 @@ _08074978:
_08074996:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
b _080749B2
@@ -686,7 +686,7 @@ _080749B0:
ldrh r4, [r1, 0x2]
_080749B2:
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080749CC
@@ -703,8 +703,8 @@ _080749CC:
bx r1
thumb_func_end sub_807492C
- thumb_func_start sub_80749D4
-sub_80749D4: @ 80749D4
+ thumb_func_start GetAnimBankSpriteId
+GetAnimBankSpriteId: @ 80749D4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -779,15 +779,15 @@ _08074A5E:
bx r1
.align 2, 0
_08074A64: .4byte gUnknown_2023D44
- thumb_func_end sub_80749D4
+ thumb_func_end GetAnimBankSpriteId
- thumb_func_start sub_8074A68
-sub_8074A68: @ 8074A68
+ thumb_func_start StoreSpriteCallbackInData6
+StoreSpriteCallbackInData6: @ 8074A68
strh r1, [r0, 0x3A]
lsrs r1, 16
strh r1, [r0, 0x3C]
bx lr
- thumb_func_end sub_8074A68
+ thumb_func_end StoreSpriteCallbackInData6
thumb_func_start sub_8074A70
sub_8074A70: @ 8074A70
@@ -812,13 +812,13 @@ sub_8074A80: @ 8074A80
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -871,7 +871,7 @@ sub_8074AE0: @ 8074AE0
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -882,7 +882,7 @@ sub_8074AE0: @ 8074AE0
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -934,13 +934,13 @@ sub_8074B5C: @ 8074B5C
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x36
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -1010,13 +1010,13 @@ sub_8074BE4: @ 8074BE4
ldrsh r0, [r4, r2]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -1419,17 +1419,17 @@ _08074ED8:
bx r0
thumb_func_end sub_8074E70
- thumb_func_start sub_8074EE0
-sub_8074EE0: @ 8074EE0
+ thumb_func_start move_anim_8074EE0
+move_anim_8074EE0: @ 8074EE0
push {r4,lr}
adds r4, r0, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8074EE0
+ thumb_func_end move_anim_8074EE0
thumb_func_start sub_8074EF4
sub_8074EF4: @ 8074EF4
@@ -1471,9 +1471,9 @@ sub_8074F38: @ 8074F38
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x38]
- bl sub_8070A0C
+ bl ResetPaletteStructByUid
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
pop {r4}
pop {r0}
bx r0
@@ -1519,12 +1519,12 @@ sub_8074F88: @ 8074F88
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -1538,12 +1538,12 @@ sub_8074FA8: @ 8074FA8
lsrs r4, 24
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1605,7 +1605,7 @@ _08075030: .4byte gUnknown_2037F1A
_08075034: .4byte gUnknown_2037F1B
_08075038:
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08075050
@@ -1642,7 +1642,7 @@ sub_8075068: @ 8075068
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
movs r0, 0x2E
ldrsh r1, [r4, r0]
movs r0, 0x80
@@ -1655,8 +1655,8 @@ sub_8075068: @ 8075068
bx r0
thumb_func_end sub_8075068
- thumb_func_start sub_8075094
-sub_8075094: @ 8075094
+ thumb_func_start AnimateBallThrow
+AnimateBallThrow: @ 8075094
push {r4,lr}
adds r4, r0, 0
bl sub_80755E0
@@ -1671,7 +1671,7 @@ sub_8075094: @ 8075094
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -1683,7 +1683,7 @@ _080750C2:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8075094
+ thumb_func_end AnimateBallThrow
thumb_func_start sub_80750C8
sub_80750C8: @ 80750C8
@@ -1701,7 +1701,7 @@ sub_80750C8: @ 80750C8
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -1715,8 +1715,8 @@ _080750F6:
bx r1
thumb_func_end sub_80750C8
- thumb_func_start sub_80750FC
-sub_80750FC: @ 80750FC
+ thumb_func_start oamt_add_pos2_onto_pos1
+oamt_add_pos2_onto_pos1: @ 80750FC
ldrh r1, [r0, 0x24]
ldrh r2, [r0, 0x20]
adds r1, r2
@@ -1729,7 +1729,7 @@ sub_80750FC: @ 80750FC
strh r2, [r0, 0x24]
strh r2, [r0, 0x26]
bx lr
- thumb_func_end sub_80750FC
+ thumb_func_end oamt_add_pos2_onto_pos1
thumb_func_start sub_8075114
sub_8075114: @ 8075114
@@ -1820,8 +1820,8 @@ _080751BC: .4byte gUnknown_2037F1A
_080751C0: .4byte gUnknown_2037F02
thumb_func_end sub_8075160
- thumb_func_start sub_80751C4
-sub_80751C4: @ 80751C4
+ thumb_func_start GetBankSide
+GetBankSide: @ 80751C4
lsls r0, 24
lsrs r0, 24
ldr r1, _080751D4 @ =gUnknown_2023BD6
@@ -1832,10 +1832,10 @@ sub_80751C4: @ 80751C4
bx lr
.align 2, 0
_080751D4: .4byte gUnknown_2023BD6
- thumb_func_end sub_80751C4
+ thumb_func_end GetBankSide
- thumb_func_start sub_80751D8
-sub_80751D8: @ 80751D8
+ thumb_func_start GetBankIdentity
+GetBankIdentity: @ 80751D8
lsls r0, 24
lsrs r0, 24
ldr r1, _080751E4 @ =gUnknown_2023BD6
@@ -1844,10 +1844,10 @@ sub_80751D8: @ 80751D8
bx lr
.align 2, 0
_080751E4: .4byte gUnknown_2023BD6
- thumb_func_end sub_80751D8
+ thumb_func_end GetBankIdentity
- thumb_func_start sub_80751E8
-sub_80751E8: @ 80751E8
+ thumb_func_start GetBankByIdentity
+GetBankByIdentity: @ 80751E8
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -1878,7 +1878,7 @@ _08075212:
.align 2, 0
_0807521C: .4byte gUnknown_2023BCC
_08075220: .4byte gUnknown_2023BD6
- thumb_func_end sub_80751E8
+ thumb_func_end GetBankByIdentity
thumb_func_start sub_8075224
sub_8075224: @ 8075224
@@ -1892,7 +1892,7 @@ sub_8075224: @ 8075224
cmp r0, 0xFF
beq _08075288
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08075260
@@ -1919,7 +1919,7 @@ _08075260:
_0807526E:
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08075288
movs r0, 0x1
@@ -2069,7 +2069,7 @@ sub_8075358: @ 8075358
add r0, sp, 0xC
ldrh r3, [r0, 0xA]
adds r0, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x20
str r0, [sp]
movs r0, 0x40
@@ -2080,9 +2080,9 @@ sub_8075358: @ 8075358
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r0, r4, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x20
pop {r4}
pop {r0}
@@ -2109,7 +2109,7 @@ sub_80753B4: @ 80753B4
bl CpuSet
ldr r1, [r4]
mov r0, r8
- bl sub_800EBB4
+ bl LZDecompressWram
lsls r5, 24
lsrs r5, 24
ldr r1, [r4]
@@ -2119,7 +2119,7 @@ sub_80753B4: @ 80753B4
lsrs r6, 16
adds r0, r5, 0
adds r3, r6, 0
- bl sub_80017D0
+ bl LoadBgTiles
add sp, 0x4
pop {r3}
mov r8, r3
@@ -2149,12 +2149,12 @@ sub_8075404: @ 8075404
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -2169,7 +2169,7 @@ sub_807543C: @ 807543C
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r4}
pop {r0}
bx r0
@@ -2190,21 +2190,21 @@ sub_8075458: @ 8075458
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x3
movs r1, 0x1
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _0807548A
_08075476:
movs r0, 0x3
movs r1, 0
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x3
movs r1, 0x1
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_0807548A:
pop {r0}
bx r0
@@ -2264,8 +2264,8 @@ sub_80754B8: @ 80754B8
bx r0
thumb_func_end sub_80754B8
- thumb_func_start sub_80754F8
-sub_80754F8: @ 80754F8
+ thumb_func_start obj_translate_based_on_private_1_2_3_4
+obj_translate_based_on_private_1_2_3_4: @ 80754F8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2345,7 +2345,7 @@ _08075574:
bx r0
.align 2, 0
_0807558C: .4byte 0x0000fffe
- thumb_func_end sub_80754F8
+ thumb_func_end obj_translate_based_on_private_1_2_3_4
thumb_func_start sub_8075590
sub_8075590: @ 8075590
@@ -2356,7 +2356,7 @@ sub_8075590: @ 8075590
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r1, _080755B4 @ =sub_807563C
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -2377,7 +2377,7 @@ sub_80755B8: @ 80755B8
ldrh r0, [r4, 0x22]
strh r0, [r4, 0x34]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r1, _080755DC @ =sub_8075658
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -2497,7 +2497,7 @@ _0807568C:
bl __divsi3
strh r0, [r4, 0x2E]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
pop {r4}
pop {r0}
bx r0
@@ -2745,8 +2745,8 @@ sub_8075830: @ 8075830
_08075854: .4byte sub_80757E8
thumb_func_end sub_8075830
- thumb_func_start sub_8075858
-sub_8075858: @ 8075858
+ thumb_func_start obj_id_set_rotscale
+obj_id_set_rotscale: @ 8075858
push {r4,r5,lr}
sub sp, 0x10
lsls r0, 24
@@ -2810,7 +2810,7 @@ _08075894:
_080758D0: .4byte 0xffff0000
_080758D4: .4byte gUnknown_202063C
_080758D8: .4byte gUnknown_2021BCC
- thumb_func_end sub_8075858
+ thumb_func_end obj_id_set_rotscale
thumb_func_start sub_80758DC
sub_80758DC: @ 80758DC
@@ -2892,7 +2892,7 @@ _0807595C:
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
pop {r4-r7}
pop {r0}
bx r0
@@ -2912,7 +2912,7 @@ sub_8075980: @ 8075980
adds r0, r4, 0
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldr r1, _080759D8 @ =gUnknown_202063C
lsls r0, r4, 4
adds r0, r4
@@ -2940,7 +2940,7 @@ sub_8075980: @ 8075980
lsrs r2, 6
lsls r3, 30
lsrs r3, 30
- bl sub_80073F0
+ bl CalcCenterToCornerVec
pop {r4}
pop {r0}
bx r0
@@ -3022,7 +3022,7 @@ sub_8075A1C: @ 8075A1C
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
_08075A6A:
ldr r6, _08075AD0 @ =0xffff0000
lsls r0, r7, 16
@@ -3105,7 +3105,7 @@ sub_8075AD8: @ 8075AD8
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
add sp, 0x4
pop {r4}
pop {r0}
@@ -3346,7 +3346,7 @@ sub_8075CB8: @ 8075CB8
cmp r0, 0
beq _08075CF2
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3354,7 +3354,7 @@ sub_8075CB8: @ 8075CB8
cmp r0, 0
beq _08075CF2
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -3364,7 +3364,7 @@ _08075CF2:
cmp r5, 0
beq _08075D1E
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3372,7 +3372,7 @@ _08075CF2:
cmp r0, 0
beq _08075D1E
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3384,7 +3384,7 @@ _08075D1E:
cmp r6, 0
beq _08075D4A
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3392,7 +3392,7 @@ _08075D1E:
cmp r0, 0
beq _08075D4A
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3404,7 +3404,7 @@ _08075D4A:
cmp r7, 0
beq _08075D76
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_8072DF0
@@ -3412,7 +3412,7 @@ _08075D4A:
cmp r0, 0
beq _08075D76
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -3439,7 +3439,7 @@ sub_8075D88: @ 8075D88
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3488,7 +3488,7 @@ _08075DDA:
cmp r0, 0
beq _08075DEE
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_08075DEE:
pop {r4}
pop {r0}
@@ -3520,7 +3520,7 @@ _08075E16:
bl sub_8075160
ldr r0, _08075E70 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08075E30
@@ -3549,9 +3549,9 @@ _08075E30:
strh r0, [r5, 0x36]
ldr r0, _08075E78 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _08075E7C @ =sub_8072740
+ ldr r1, _08075E7C @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@@ -3560,7 +3560,7 @@ _08075E6C: .4byte gUnknown_2037F02
_08075E70: .4byte gUnknown_2037F1A
_08075E74: .4byte gUnknown_2037F1B
_08075E78: .4byte sub_8075590
-_08075E7C: .4byte sub_8072740
+_08075E7C: .4byte DestroyAnimSprite
thumb_func_end sub_8075DF4
thumb_func_start sub_8075E80
@@ -3571,7 +3571,7 @@ sub_8075E80: @ 8075E80
bl sub_8075160
ldr r0, _08075EE0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08075EA0
@@ -3620,12 +3620,12 @@ _08075EEC: .4byte sub_8075EF0
sub_8075EF0: @ 8075EF0
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _08075F04
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_08075F04:
pop {r4}
pop {r0}
@@ -3670,7 +3670,7 @@ _08075F4A:
ldrb r6, [r0]
ldr r0, _08075FAC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08075F62
@@ -3703,9 +3703,9 @@ _08075F62:
strh r0, [r5, 0x36]
ldr r0, _08075FB4 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _08075FB8 @ =sub_8072740
+ ldr r1, _08075FB8 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@@ -3714,15 +3714,15 @@ _08075FA8: .4byte gUnknown_2037F1B
_08075FAC: .4byte gUnknown_2037F1A
_08075FB0: .4byte gUnknown_2037F02
_08075FB4: .4byte sub_8075590
-_08075FB8: .4byte sub_8072740
+_08075FB8: .4byte DestroyAnimSprite
thumb_func_end sub_8075F0C
- thumb_func_start sub_8075FBC
-sub_8075FBC: @ 8075FBC
+ thumb_func_start duplicate_obj_of_side_rel2move_in_transparent_mode
+duplicate_obj_of_side_rel2move_in_transparent_mode: @ 8075FBC
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -3778,10 +3778,10 @@ _0807602A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8075FBC
+ thumb_func_end duplicate_obj_of_side_rel2move_in_transparent_mode
- thumb_func_start sub_8076030
-sub_8076030: @ 8076030
+ thumb_func_start obj_delete_but_dont_free_vram
+obj_delete_but_dont_free_vram: @ 8076030
push {lr}
adds r3, r0, 0
adds r3, 0x3F
@@ -3789,10 +3789,10 @@ sub_8076030: @ 8076030
movs r2, 0x40
orrs r1, r2
strb r1, [r3]
- bl sub_8007280
+ bl DestroySprite
pop {r0}
bx r0
- thumb_func_end sub_8076030
+ thumb_func_end obj_delete_but_dont_free_vram
thumb_func_start sub_8076048
sub_8076048: @ 8076048
@@ -3853,7 +3853,7 @@ _0807607C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080760CC @ =sub_80760D0
str r0, [r4]
pop {r4-r6}
@@ -3926,7 +3926,7 @@ _08076134:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
ldrsh r1, [r4, r0]
movs r2, 0x16
@@ -3940,7 +3940,7 @@ _08076134:
cmp r1, r0
bne _08076164
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_08076164:
pop {r4,r5}
pop {r0}
@@ -3954,13 +3954,13 @@ sub_807616C: @ 807616C
lsrs r4, r0, 24
ldr r0, _0807618C @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
bne _08076190
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080761B6
.align 2, 0
_0807618C: .4byte gUnknown_2037F02
@@ -4050,7 +4050,7 @@ sub_80761F0: @ 80761F0
lsrs r2, 24
ldrh r3, [r4, 0xA]
movs r1, 0xF
- bl sub_8045274
+ bl BlendPalette
movs r2, 0xC
ldrsh r1, [r4, r2]
movs r2, 0xE
@@ -4071,7 +4071,7 @@ _0807624C:
lsrs r2, 24
ldrh r3, [r4, 0xA]
movs r1, 0xF
- bl sub_8045274
+ bl BlendPalette
movs r0, 0xC
ldrsh r1, [r4, r0]
cmp r1, 0
@@ -4087,7 +4087,7 @@ _0807624C:
b _08076280
_0807627A:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_08076280:
pop {r4,r5}
pop {r0}
@@ -4101,13 +4101,13 @@ sub_8076288: @ 8076288
lsrs r4, r0, 24
ldr r0, _080762A8 @ =gUnknown_2037F02
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _080762AC
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080762C2
.align 2, 0
_080762A8: .4byte gUnknown_2037F02
@@ -4223,7 +4223,7 @@ _08076356:
movs r3, 0x1E
ldrsh r2, [r4, r3]
ldrh r3, [r4, 0x20]
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4437,7 +4437,7 @@ _08076508:
bne _080765AC
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08076568
@@ -4457,7 +4457,7 @@ _08076508:
ldr r1, _08076558 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
b _0807655E
@@ -4491,7 +4491,7 @@ _08076568:
ldr r1, _08076598 @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
b _0807659E
@@ -4633,7 +4633,7 @@ _08076672:
movs r3, 0x1C
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
movs r0, 0x18
ldrsh r3, [r4, r0]
cmp r3, 0
@@ -4683,7 +4683,7 @@ _080766D6:
ldr r0, _080766E8 @ =gUnknown_2037F02
strh r1, [r0, 0xE]
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -4883,7 +4883,7 @@ sub_807685C: @ 807685C
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1E
@@ -4907,7 +4907,7 @@ sub_8076884: @ 8076884
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4933,7 +4933,7 @@ sub_80768B0: @ 80768B0
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4981,7 +4981,7 @@ sub_80768D0: @ 80768D0
lsls r0, r7, 3
ldr r1, _080769B0 @ =gUnknown_83AE084
adds r0, r1
- bl sub_80086DC
+ bl LoadSpriteSheet
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
@@ -4991,7 +4991,7 @@ sub_80768D0: @ 80768D0
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x2]
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080769B8 @ =gUnknown_202401C
@@ -5006,7 +5006,7 @@ sub_80768D0: @ 80768D0
bne _0807694E
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
movs r2, 0xBE
lsls r2, 1
@@ -5019,14 +5019,14 @@ _0807694E:
adds r0, r6, 0
ldr r1, [sp, 0x3C]
mov r2, r8
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20
movs r2, 0x80
lsls r2, 17
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r3, [sp, 0x44]
cmp r3, 0x1
beq _0807699A
@@ -5089,14 +5089,14 @@ _080769EC:
adds r0, r6, 0
ldr r1, [sp, 0x3C]
mov r2, r8
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20
movs r3, 0x80
lsls r3, 17
adds r1, r3
lsrs r1, 16
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r0, [sp, 0x44]
cmp r0, 0x1
beq _08076A32
@@ -5167,11 +5167,11 @@ _08076A7C:
movs r2, 0x80
lsls r2, 4
movs r3, 0x1
- bl sub_8000EAC
+ bl RequestDma3Copy
ldr r0, [r5]
adds r0, r4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
adds r0, r4
movs r1, 0
@@ -5214,7 +5214,7 @@ _08076AEE:
lsls r2, 16
asrs r2, 16
ldr r3, [sp, 0x8]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
add sp, 0x10
@@ -5233,7 +5233,7 @@ _08076B1C: .4byte gUnknown_8235E6C
thumb_func_start sub_8076B20
sub_8076B20: @ 8076B20
push {lr}
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
pop {r0}
bx r0
thumb_func_end sub_8076B20
@@ -5250,7 +5250,7 @@ sub_8076B2C: @ 8076B2C
lsls r1, 24
lsrs r1, 24
mov r9, r1
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08076C08
@@ -5273,14 +5273,14 @@ sub_8076B2C: @ 8076B2C
ldr r5, _08076B90 @ =gUnknown_2024284
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldrh r0, [r4]
muls r0, r6
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
b _08076B9C
.align 2, 0
@@ -5369,14 +5369,14 @@ _08076C08:
ldr r5, _08076C50 @ =gUnknown_202402C
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldrh r0, [r4]
muls r0, r6
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
b _08076C5C
.align 2, 0
@@ -5645,7 +5645,7 @@ sub_8076E34: @ 8076E34
lsrs r6, 24
ldr r0, _08076ECC @ =nullsub_8
mov r10, r0
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -5721,7 +5721,7 @@ sub_8076ED8: @ 8076ED8
bl sub_8074FCC
ldr r0, _08076F10 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08076F18
@@ -5763,9 +5763,9 @@ _08076F22:
strh r0, [r4, 0x34]
ldrh r0, [r1, 0xA]
strh r0, [r4, 0x38]
- ldr r1, _08076F50 @ =sub_8074EE0
+ ldr r1, _08076F50 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _08076F54 @ =sub_8074E70
str r0, [r4, 0x1C]
pop {r4}
@@ -5773,7 +5773,7 @@ _08076F22:
bx r0
.align 2, 0
_08076F4C: .4byte gUnknown_2037F02
-_08076F50: .4byte sub_8074EE0
+_08076F50: .4byte move_anim_8074EE0
_08076F54: .4byte sub_8074E70
thumb_func_end sub_8076ED8
@@ -5783,7 +5783,7 @@ sub_8076F58: @ 8076F58
adds r4, r0, 0
ldr r0, _08076F80 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08076F88
@@ -5822,10 +5822,10 @@ _08076F92:
strh r0, [r4, 0x38]
ldrb r1, [r1, 0xC]
adds r0, r4, 0
- bl sub_800838C
- ldr r1, _08076FC8 @ =sub_8074EE0
+ bl StartSpriteAnim
+ ldr r1, _08076FC8 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _08076FCC @ =sub_8074E70
str r0, [r4, 0x1C]
pop {r4}
@@ -5833,7 +5833,7 @@ _08076F92:
bx r0
.align 2, 0
_08076FC4: .4byte gUnknown_2037F02
-_08076FC8: .4byte sub_8074EE0
+_08076FC8: .4byte move_anim_8074EE0
_08076FCC: .4byte sub_8074E70
thumb_func_end sub_8076F58
@@ -5844,7 +5844,7 @@ sub_8076FD0: @ 8076FD0
bl sub_8074FCC
ldr r0, _08076FF4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08076FFC
@@ -5871,16 +5871,16 @@ _08077008:
strh r0, [r4, 0x22]
ldr r0, _08077028 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _0807702C @ =sub_8072740
+ ldr r1, _0807702C @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08077024: .4byte gUnknown_2037F02
_08077028: .4byte sub_8074F6C
-_0807702C: .4byte sub_8072740
+_0807702C: .4byte DestroyAnimSprite
thumb_func_end sub_8076FD0
thumb_func_start sub_8077030
@@ -5894,14 +5894,14 @@ sub_8077030: @ 8077030
ldr r0, _080770C4 @ =gUnknown_3005090
adds r5, r1, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
strh r0, [r5, 0x8]
ldr r7, _080770C8 @ =gUnknown_2037F1A
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -5925,7 +5925,7 @@ _08077064:
subs r1, r2
strh r1, [r0, 0x24]
ldr r0, _080770D0 @ =0x00002771
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x10]
@@ -5979,7 +5979,7 @@ _080770D6:
ldrh r3, [r0]
adds r0, r6, 0
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldr r0, _08077114 @ =sub_8077118
str r0, [r5]
pop {r4-r7}
@@ -6086,9 +6086,9 @@ _080771C4:
cmp r0, 0
bne _080771D8
ldr r0, _080771E0 @ =0x00002771
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080771D8:
pop {r4,r5}
pop {r0}
@@ -6107,7 +6107,7 @@ sub_80771E4: @ 80771E4
lsrs r1, 24
mov r8, r1
movs r0, 0
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
lsrs r7, r0, 16
asrs r0, 16
@@ -6186,7 +6186,7 @@ sub_8077268: @ 8077268
subs r1, 0x1
strh r1, [r0, 0x12]
adds r0, r3, 0
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_08077292:
pop {r0}
bx r0
@@ -6212,7 +6212,7 @@ sub_807729C: @ 807729C
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080772D4
@@ -6278,7 +6278,7 @@ _08077330:
cmp r0, r1
bge _08077348
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_08077348:
pop {r4,r5}
pop {r0}
@@ -6302,7 +6302,7 @@ sub_8077350: @ 8077350
strh r0, [r4, 0x36]
ldr r0, _0807738C @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08077390
@@ -6329,15 +6329,15 @@ _0807739E:
strh r0, [r4, 0x22]
ldr r0, _080773B4 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080773B8 @ =sub_8072740
+ ldr r1, _080773B8 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080773B4: .4byte sub_8075590
-_080773B8: .4byte sub_8072740
+_080773B8: .4byte DestroyAnimSprite
thumb_func_end sub_8077350
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_anim_8078178.s b/asm/battle_anim_8078178.s
index 9836536c8..e67c77dd0 100644
--- a/asm/battle_anim_8078178.s
+++ b/asm/battle_anim_8078178.s
@@ -21,7 +21,7 @@ sub_8078178: @ 8078178
ldrb r6, [r0]
ldr r0, _08078220 @ =sub_80782BC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -55,7 +55,7 @@ _080781CC:
asrs r2, 16
ldr r0, _08078234 @ =gUnknown_83BF574
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 4
@@ -114,7 +114,7 @@ _0807824A:
asrs r2, 16
ldr r0, _080782B8 @ =gUnknown_83BF574
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 4
@@ -191,7 +191,7 @@ sub_80782BC: @ 80782BC
ldrb r2, [r4, 0x10]
ldrh r3, [r4, 0xA]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldrh r2, [r4, 0x12]
movs r1, 0x12
ldrsh r0, [r4, r1]
@@ -229,7 +229,7 @@ _08078318:
cmp r0, 0x2
bne _08078346
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08078346
_08078342:
adds r0, r1, 0x1
@@ -278,12 +278,12 @@ sub_8078380: @ 8078380
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -325,11 +325,11 @@ _080783B2:
cmp r0, 0
beq _080783EE
adds r0, r4, 0
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
b _080783F4
_080783EE:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080783F4:
pop {r4}
pop {r0}
@@ -370,22 +370,22 @@ _0807843A:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080784BC @ =gUnknown_83BF55C
lsls r1, r5, 16
asrs r1, 16
lsls r2, r4, 16
asrs r2, 16
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080784C0 @ =0x0000271a
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _080784C4 @ =0xffff0000
cmp r0, r1
@@ -407,7 +407,7 @@ _08078484:
ldr r1, _080784C8 @ =gUnknown_202063C
adds r0, r1
ldr r1, _080784CC @ =gUnknown_83BF554
- bl sub_8008A58
+ bl SetSubspriteTables
ldr r1, _080784D0 @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -469,7 +469,7 @@ _0807850C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_08078522:
pop {r0}
bx r0
@@ -482,7 +482,7 @@ sub_8078528: @ 8078528
lsls r4, 24
lsrs r4, 24
ldr r0, _080785C0 @ =0x0000271a
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080785C4 @ =gUnknown_3005090
@@ -599,7 +599,7 @@ _08078610:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_08078626:
pop {r0}
bx r0
@@ -632,9 +632,9 @@ sub_807862C: @ 807862C
ldr r0, _08078670 @ =gUnknown_202063C
adds r4, r0
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _0807868E
.align 2, 0
_0807866C: .4byte gUnknown_3005090
@@ -644,12 +644,12 @@ _08078674:
bne _0807868E
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_0807868E:
pop {r4}
pop {r0}
@@ -864,7 +864,7 @@ _0807882A:
b _08078838
_08078830:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _0807885A
_08078838:
ldr r0, _08078860 @ =gUnknown_2037F02
@@ -893,8 +893,8 @@ _08078864: .4byte gUnknown_3005090
_08078868: .4byte sub_80BB088
thumb_func_end sub_8078694
- thumb_func_start sub_807886C
-sub_807886C: @ 807886C
+ thumb_func_start LaunchStatusAnimation
+LaunchStatusAnimation: @ 807886C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -908,9 +908,9 @@ sub_807886C: @ 807886C
ldr r0, _080788B0 @ =gUnknown_81C6E84
movs r2, 0
bl sub_80725D4
- ldr r0, _080788B4 @ =sub_80788BC
+ ldr r0, _080788B4 @ =task0A_80788BC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080788B8 @ =gUnknown_3005090
@@ -926,12 +926,12 @@ sub_807886C: @ 807886C
_080788A8: .4byte gUnknown_2037F1A
_080788AC: .4byte gUnknown_2037F1B
_080788B0: .4byte gUnknown_81C6E84
-_080788B4: .4byte sub_80788BC
+_080788B4: .4byte task0A_80788BC
_080788B8: .4byte gUnknown_3005090
- thumb_func_end sub_807886C
+ thumb_func_end LaunchStatusAnimation
- thumb_func_start sub_80788BC
-sub_80788BC: @ 80788BC
+ thumb_func_start task0A_80788BC
+task0A_80788BC: @ 80788BC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -962,7 +962,7 @@ sub_80788BC: @ 80788BC
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080788FE:
pop {r4}
pop {r0}
@@ -972,6 +972,6 @@ _08078904: .4byte gUnknown_2037EDC
_08078908: .4byte gUnknown_2037EE1
_0807890C: .4byte gUnknown_2024018
_08078910: .4byte gUnknown_3005090
- thumb_func_end sub_80788BC
+ thumb_func_end task0A_80788BC
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_anim_80989F8.s b/asm/battle_anim_80989F8.s
index 40b1c9300..2128e322f 100644
--- a/asm/battle_anim_80989F8.s
+++ b/asm/battle_anim_80989F8.s
@@ -12,13 +12,13 @@ sub_80989F8: @ 80989F8
lsrs r5, r0, 24
ldr r4, _08098A18 @ =gUnknown_2037F02
ldrb r0, [r4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _08098A1C
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098A58
.align 2, 0
_08098A18: .4byte gUnknown_2037F02
@@ -146,7 +146,7 @@ _08098AD4:
adds r0, r6
strh r3, [r0, 0x26]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098B16
_08098B12:
subs r0, 0x1
@@ -171,7 +171,7 @@ sub_8098B1C: @ 8098B1C
bgt _08098B48
lsls r0, 24
lsrs r0, 24
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -207,7 +207,7 @@ _08098B6C:
_08098B70:
movs r0, 0x3
_08098B72:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -234,7 +234,7 @@ _08098B9E:
beq _08098BB4
_08098BA2:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098BF2
.align 2, 0
_08098BAC: .4byte gUnknown_2023D44
@@ -375,7 +375,7 @@ _08098C82:
adds r0, r7
strh r2, [r0, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098CC4
_08098CC0:
subs r0, r2, 0x1
@@ -395,13 +395,13 @@ sub_8098CD0: @ 8098CD0
lsrs r5, r0, 24
ldr r4, _08098CF0 @ =gUnknown_2037F02
ldrb r0, [r4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
bne _08098CF4
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098D42
.align 2, 0
_08098CF0: .4byte gUnknown_2037F02
@@ -607,7 +607,7 @@ _08098E44:
strh r0, [r2, 0x26]
_08098E7C:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08098E88
_08098E84:
subs r0, r2, 0x1
@@ -626,7 +626,7 @@ sub_8098E90: @ 8098E90
lsrs r4, 24
ldr r5, _08098EE0 @ =gUnknown_2037F02
ldrb r0, [r5]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _08098EE4 @ =gUnknown_202063C
@@ -732,7 +732,7 @@ _08098F42:
cmp r0, 0
bne _08098F74
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_08098F74:
pop {r4-r7}
pop {r0}
@@ -752,7 +752,7 @@ sub_8098F84: @ 8098F84
movs r6, 0x1
ldr r4, _08098FF8 @ =gUnknown_2037F02
ldrb r0, [r4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r7, r0, 24
movs r1, 0x8
@@ -825,7 +825,7 @@ sub_8099004: @ 8099004
ldrsh r0, [r5, r1]
movs r2, 0xA
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
ldr r2, _08099078 @ =gUnknown_202063C
lsls r1, r4, 4
adds r1, r4
@@ -836,7 +836,7 @@ sub_8099004: @ 8099004
ldrsh r0, [r5, r1]
movs r2, 0xC
ldrsh r1, [r5, r2]
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r5, 0xC]
@@ -861,7 +861,7 @@ _0809905C:
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_0809906E:
pop {r4-r6}
pop {r0}
@@ -878,7 +878,7 @@ sub_809907C: @ 809907C
lsrs r4, r0, 24
ldr r0, _080990A4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08099098
@@ -909,7 +909,7 @@ sub_80990AC: @ 80990AC
strb r0, [r2]
ldr r0, _080990D4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080990DC
@@ -938,7 +938,7 @@ _080990E0:
strh r2, [r4, 0x36]
ldr r1, _08099118 @ =sub_8099120
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _0809911C @ =sub_8074DC4
str r0, [r4, 0x1C]
pop {r4}
@@ -962,13 +962,13 @@ sub_8099120: @ 8099120
strh r1, [r0, 0x30]
ldr r1, _0809913C @ =sub_8074DC4
str r1, [r0, 0x1C]
- ldr r1, _08099140 @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _08099140 @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_0809913C: .4byte sub_8074DC4
-_08099140: .4byte sub_8072740
+_08099140: .4byte DestroyAnimSprite
thumb_func_end sub_8099120
thumb_func_start sub_8099144
@@ -983,7 +983,7 @@ sub_8099144: @ 8099144
strb r0, [r2]
ldr r5, _08099184 @ =gUnknown_2037F02
ldrb r0, [r5, 0x4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldrh r2, [r5]
@@ -996,7 +996,7 @@ sub_8099144: @ 8099144
strh r2, [r4, 0x36]
ldr r1, _08099188 @ =sub_8099190
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _0809918C @ =sub_8074DC4
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -1018,13 +1018,13 @@ sub_8099190: @ 8099190
strh r1, [r0, 0x32]
ldr r1, _080991AC @ =sub_8074DC4
str r1, [r0, 0x1C]
- ldr r1, _080991B0 @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _080991B0 @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080991AC: .4byte sub_8074DC4
-_080991B0: .4byte sub_8072740
+_080991B0: .4byte DestroyAnimSprite
thumb_func_end sub_8099190
thumb_func_start sub_80991B4
@@ -1152,7 +1152,7 @@ _080992A2:
strh r1, [r3, 0x26]
_080992A4:
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080992DA
.align 2, 0
_080992AC: .4byte gUnknown_202063C
@@ -1206,7 +1206,7 @@ _080992FE:
adds r0, r2, r0
ldrb r6, [r0]
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08099328
@@ -1254,9 +1254,9 @@ _08099328:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r1, _0809938C @ =sub_8072740
+ ldr r1, _0809938C @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _08099390 @ =sub_8074E14
str r0, [r5, 0x1C]
pop {r4-r6}
@@ -1267,7 +1267,7 @@ _0809937C: .4byte gUnknown_2037F1B
_08099380: .4byte gUnknown_2023D44
_08099384: .4byte gUnknown_2037F02
_08099388: .4byte gUnknown_202063C
-_0809938C: .4byte sub_8072740
+_0809938C: .4byte DestroyAnimSprite
_08099390: .4byte sub_8074E14
thumb_func_end sub_80992E0
@@ -1299,7 +1299,7 @@ _080993BE:
adds r0, r1, r0
ldrb r7, [r0]
adds r0, r1, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080993E8
@@ -1351,20 +1351,20 @@ _080993E8:
lsls r0, 16
cmp r0, 0
bne _08099450
- ldr r1, _0809944C @ =sub_8072740
+ ldr r1, _0809944C @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _08099458
.align 2, 0
_0809943C: .4byte gUnknown_2037F1B
_08099440: .4byte gUnknown_2023D44
_08099444: .4byte gUnknown_2037F02
_08099448: .4byte gUnknown_202063C
-_0809944C: .4byte sub_8072740
+_0809944C: .4byte DestroyAnimSprite
_08099450:
ldr r1, _08099464 @ =sub_809946C
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_08099458:
ldr r0, _08099468 @ =sub_8074E14
str r0, [r6, 0x1C]
@@ -1395,7 +1395,7 @@ sub_809946C: @ 809946C
lsls r1, 2
adds r1, r4
strh r3, [r1, 0x26]
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -1418,7 +1418,7 @@ sub_809949C: @ 809949C
lsrs r7, r0, 16
ldr r0, _08099524 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080994CE
@@ -1430,7 +1430,7 @@ sub_809949C: @ 809949C
strh r0, [r5, 0xA]
_080994CE:
ldrb r0, [r5]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r1, _08099528 @ =gUnknown_3005090
lsls r4, r6, 2
adds r4, r6
@@ -1501,7 +1501,7 @@ sub_8099530: @ 8099530
lsrs r0, 8
movs r2, 0xC
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x16]
ldrh r1, [r5, 0x1C]
@@ -1571,7 +1571,7 @@ _080995BC:
cmp r0, 0
bne _080995F0
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080995F0:
pop {r4,r5}
pop {r0}
@@ -1595,7 +1595,7 @@ sub_80995FC: @ 80995FC
cmp r0, 0
blt _0809965C
ldrb r0, [r1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _08099664
@@ -1631,7 +1631,7 @@ _08099654: .4byte gUnknown_2037F1B
_08099658: .4byte gUnknown_2023D44
_0809965C:
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080996A4
_08099664:
ldr r1, _08099684 @ =gUnknown_3005090
@@ -1642,7 +1642,7 @@ _08099664:
strh r2, [r5, 0x8]
ldr r0, _08099688 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08099690
@@ -1706,7 +1706,7 @@ sub_80996B8: @ 80996B8
cmp r1, r0
bls _080996F6
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080996F6:
pop {r4}
pop {r0}
@@ -1723,7 +1723,7 @@ sub_8099704: @ 8099704
lsrs r5, r0, 24
ldr r6, _08099754 @ =gUnknown_2037F1A
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08099720
@@ -1734,7 +1734,7 @@ sub_8099704: @ 8099704
_08099720:
ldr r4, _08099758 @ =gUnknown_2037F02
ldrb r0, [r4, 0x8]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _0809975C @ =gUnknown_3005090
@@ -1807,7 +1807,7 @@ sub_8099788: @ 8099788
mov r0, r8
movs r2, 0xA
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
lsls r0, 16
lsrs r5, r0, 16
mov r9, r5
@@ -1829,7 +1829,7 @@ _080997D8: .4byte gUnknown_3005090
_080997DC: .4byte gUnknown_202063C
_080997E0:
ldrb r0, [r4, 0x12]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08099808
@@ -1925,7 +1925,7 @@ _0809986A:
strh r3, [r0, 0x24]
strh r3, [r0, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_0809989C:
pop {r3,r4}
mov r8, r3
@@ -1946,7 +1946,7 @@ sub_80998B0: @ 80998B0
lsrs r4, 24
ldr r6, _080998FC @ =gUnknown_2037F02
ldrb r0, [r6, 0x6]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2009,7 +2009,7 @@ sub_8099908: @ 8099908
ldrsh r2, [r4, r3]
adds r0, r6, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -2037,7 +2037,7 @@ _0809996C:
adds r0, r6, 0
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_08099978:
pop {r4-r6}
pop {r0}
@@ -2053,7 +2053,7 @@ sub_8099980: @ 8099980
lsrs r7, r0, 24
ldr r4, _080999BC @ =gUnknown_2037F02
ldrb r0, [r4, 0x4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -2121,7 +2121,7 @@ _08099A14:
ldr r0, _08099A6C @ =gUnknown_2037F1B
_08099A16:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -2179,7 +2179,7 @@ sub_8099A78: @ 8099A78
lsrs r5, r0, 24
ldr r4, _08099AB4 @ =gUnknown_2037F02
ldrb r0, [r4, 0x4]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -2208,7 +2208,7 @@ _08099AC0:
ldr r0, _08099AF0 @ =gUnknown_2037F1B
_08099AC2:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08099AD4
@@ -2299,7 +2299,7 @@ sub_8099B54: @ 8099B54
lsls r2, 1
ldrh r3, [r4, 0xE]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
movs r2, 0x16
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -2332,7 +2332,7 @@ _08099BB0:
bl sub_8075980
_08099BB6:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _08099BCE
_08099BBE:
movs r0, 0
@@ -2424,7 +2424,7 @@ _08099C3A:
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x1E]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x16]
@@ -2576,7 +2576,7 @@ _08099D64:
adds r0, r2
strh r4, [r0, 0x26]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_08099D96:
pop {r4,r5}
pop {r0}
diff --git a/asm/battle_anim_80A22E8.s b/asm/battle_anim_80A22E8.s
index 19fbaa81b..53ac8b1fd 100644
--- a/asm/battle_anim_80A22E8.s
+++ b/asm/battle_anim_80A22E8.s
@@ -24,7 +24,7 @@ sub_80A22E8: @ 80A22E8
strh r0, [r4, 0x30]
ldr r0, _080A2320 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2324
@@ -73,7 +73,7 @@ sub_80A2340: @ 80A2340
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x36]
ldrh r1, [r4, 0x38]
@@ -84,7 +84,7 @@ sub_80A2340: @ 80A2340
b _080A2382
_080A237C:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2382:
pop {r4}
pop {r0}
@@ -115,9 +115,9 @@ sub_80A2388: @ 80A2388
strh r0, [r4, 0x36]
ldr r0, _080A23D0 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080A23D4 @ =sub_8074EE0
+ ldr r1, _080A23D4 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -125,7 +125,7 @@ sub_80A2388: @ 80A2388
_080A23C8: .4byte gUnknown_2037F02
_080A23CC: .4byte gUnknown_2037F1A
_080A23D0: .4byte sub_8075590
-_080A23D4: .4byte sub_8074EE0
+_080A23D4: .4byte move_anim_8074EE0
thumb_func_end sub_80A2388
thumb_func_start sub_80A23D8
@@ -137,7 +137,7 @@ sub_80A23D8: @ 80A23D8
ldr r5, _080A2420 @ =gUnknown_2037F02
ldrb r1, [r5, 0x6]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x2E]
ldr r5, _080A2424 @ =gUnknown_2037F1B
@@ -155,9 +155,9 @@ sub_80A23D8: @ 80A23D8
strh r0, [r4, 0x36]
ldr r0, _080A2428 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080A242C @ =sub_8072740
+ ldr r1, _080A242C @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -165,7 +165,7 @@ sub_80A23D8: @ 80A23D8
_080A2420: .4byte gUnknown_2037F02
_080A2424: .4byte gUnknown_2037F1B
_080A2428: .4byte sub_8075590
-_080A242C: .4byte sub_8072740
+_080A242C: .4byte DestroyAnimSprite
thumb_func_end sub_80A23D8
thumb_func_start sub_80A2430
@@ -195,7 +195,7 @@ sub_80A2430: @ 80A2430
lsrs r0, 24
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldrh r0, [r6, 0x6]
strh r0, [r4, 0x38]
ldr r1, _080A2488 @ =sub_80A248C
@@ -220,7 +220,7 @@ sub_80A248C: @ 80A248C
cmp r0, 0
beq _080A24A2
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _080A24F6
_080A24A2:
movs r1, 0x38
@@ -246,14 +246,14 @@ _080A24C6:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x5
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xE
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -314,14 +314,14 @@ sub_80A2500: @ 80A2500
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_80071EC
+ bl CreateSpriteAndAnimate
_080A255A:
movs r1, 0xA
ldrsh r0, [r5, r1]
cmp r0, 0xF
bne _080A2568
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A2568:
pop {r4-r6}
pop {r0}
@@ -374,12 +374,12 @@ _080A25CC: .4byte sub_80A25D0
sub_80A25D0: @ 80A25D0
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080A25E4
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A25E4:
pop {r4}
pop {r0}
@@ -390,14 +390,14 @@ _080A25E4:
sub_80A25EC: @ 80A25EC
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8044EC8
+ bl Random
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
movs r0, 0x7
ands r1, r0
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, _080A2634 @ =gUnknown_2037F1A
ldrb r0, [r4]
movs r1, 0x2
@@ -412,7 +412,7 @@ sub_80A25EC: @ 80A25EC
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2638
@@ -426,7 +426,7 @@ _080A2638:
adds r0, 0x14
_080A263C:
strh r0, [r5, 0x20]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1F
@@ -452,7 +452,7 @@ _080A263C:
strh r0, [r5, 0x36]
adds r0, r5, 0
bl sub_8075804
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
strh r1, [r5, 0x38]
@@ -481,13 +481,13 @@ sub_80A26A4: @ 80A26A4
cmp r0, 0
beq _080A26BA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080A26EA
_080A26BA:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xC
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -523,7 +523,7 @@ sub_80A26F0: @ 80A26F0
bl sub_8075160
ldr r0, _080A2750 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2710
@@ -572,7 +572,7 @@ _080A275C: .4byte sub_80A2760
sub_80A2760: @ 80A2760
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080A278A
@@ -588,7 +588,7 @@ sub_80A2760: @ 80A2760
str r0, [r4, 0x1C]
ldr r1, _080A2794 @ =sub_80A2798
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080A278A:
pop {r4}
pop {r0}
@@ -611,20 +611,20 @@ sub_80A2798: @ 80A2798
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x3C
strh r0, [r4, 0x2E]
ldr r0, _080A27C8 @ =sub_8074C44
str r0, [r4, 0x1C]
- ldr r1, _080A27CC @ =sub_8072740
+ ldr r1, _080A27CC @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A27C8: .4byte sub_8074C44
-_080A27CC: .4byte sub_8072740
+_080A27CC: .4byte DestroyAnimSprite
thumb_func_end sub_80A2798
thumb_func_start sub_80A27D0
@@ -636,7 +636,7 @@ sub_80A27D0: @ 80A27D0
ldr r5, _080A2814 @ =gUnknown_2037F02
ldrb r1, [r5, 0x8]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r1, 0x8
ldrsh r0, [r5, r1]
cmp r0, 0x1
@@ -672,13 +672,13 @@ sub_80A281C: @ 80A281C
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x3
negs r1, r1
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x32]
adds r1, 0x18
strh r1, [r4, 0x32]
@@ -742,7 +742,7 @@ _080A2894:
cmp r0, r1
bne _080A28B8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A28B8:
pop {r4}
pop {r0}
@@ -766,7 +766,7 @@ sub_80A28C4: @ 80A28C4
bne _080A28E6
_080A28DE:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A2918
_080A28E6:
ldr r0, _080A2904 @ =gUnknown_2037F1B
@@ -779,7 +779,7 @@ _080A28E6:
movs r0, 0x2
movs r1, 0x4
movs r2, 0x3
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _080A2912
.align 2, 0
_080A2904: .4byte gUnknown_2037F1B
@@ -787,10 +787,10 @@ _080A2908:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080A2912:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A2918:
pop {r4}
pop {r0}
@@ -821,7 +821,7 @@ sub_80A2920: @ 80A2920
adds r0, r5
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
movs r0, 0x40
strh r0, [r4, 0x38]
ldr r1, _080A2970 @ =sub_80A2974
@@ -848,7 +848,7 @@ sub_80A2974: @ 80A2974
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -856,7 +856,7 @@ sub_80A2974: @ 80A2974
ldrsh r0, [r4, r1]
movs r1, 0x5
negs r1, r1
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -892,7 +892,7 @@ _080A29CA:
_080A29DC: .4byte gUnknown_2037F1A
_080A29E0:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A29E6:
pop {r4}
pop {r0}
@@ -923,7 +923,7 @@ sub_80A29EC: @ 80A29EC
adds r0, r5
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
movs r0, 0x40
strh r0, [r4, 0x38]
ldr r1, _080A2A3C @ =sub_80A2A40
@@ -950,7 +950,7 @@ sub_80A2A40: @ 80A2A40
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -987,7 +987,7 @@ _080A2A8C:
b _080A2A9E
_080A2A98:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2A9E:
pop {r4}
pop {r0}
@@ -1080,14 +1080,14 @@ sub_80A2B38: @ 80A2B38
adds r4, r0, 0
ldr r0, _080A2B58 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2B5C
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x19
- bl sub_8044E30
+ bl Sin
negs r0, r0
b _080A2B66
.align 2, 0
@@ -1096,7 +1096,7 @@ _080A2B5C:
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x19
- bl sub_8044E30
+ bl Sin
_080A2B66:
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x2E]
@@ -1120,7 +1120,7 @@ _080A2B86:
cmp r0, 0x50
ble _080A2B94
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2B94:
pop {r4}
pop {r0}
@@ -1135,7 +1135,7 @@ sub_80A2B9C: @ 80A2B9C
bl sub_8075160
ldr r0, _080A2BF0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2BBC
@@ -1197,11 +1197,11 @@ _080A2C1C:
bl sub_8075068
ldr r0, _080A2C50 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _080A2C48 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -1235,7 +1235,7 @@ sub_80A2C68: @ 80A2C68
movs r0, 0x1
strh r0, [r6, 0x2E]
adds r0, r6, 0
- bl sub_8075094
+ bl AnimateBallThrow
ldrh r0, [r6, 0x3C]
strh r5, [r6, 0x2E]
lsls r4, 16
@@ -1309,7 +1309,7 @@ _080A2CFE:
cmp r7, 0
beq _080A2D08
adds r0, r6, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2D08:
pop {r4-r7}
pop {r0}
@@ -1406,12 +1406,12 @@ _080A2DAC:
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r5, 0x38
ldrsh r0, [r4, r5]
movs r1, 0x5
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x38
ldrsh r0, [r4, r1]
@@ -1450,7 +1450,7 @@ _080A2DFA:
cmp r0, 0
bne _080A2E1E
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2E1E:
pop {r4,r5}
pop {r0}
@@ -1474,7 +1474,7 @@ sub_80A2E28: @ 80A2E28
ldr r4, _080A2E5C @ =gUnknown_2037F02
ldrb r1, [r4, 0x4]
adds r0, r5, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x3A]
ldrh r0, [r4, 0x6]
@@ -1505,7 +1505,7 @@ sub_80A2E64: @ 80A2E64
ands r0, r1
strb r0, [r2]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
movs r0, 0x80
lsls r0, 1
strh r0, [r4, 0x2E]
@@ -1526,7 +1526,7 @@ sub_80A2EA0: @ 80A2EA0
push {r4,lr}
adds r4, r0, 0
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
movs r1, 0x32
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -1570,11 +1570,11 @@ _080A2ED8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080A2F06
_080A2F00:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A2F06:
pop {r4}
pop {r0}
@@ -1587,7 +1587,7 @@ sub_80A2F0C: @ 80A2F0C
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080A2F38 @ =gUnknown_202063C
@@ -1601,7 +1601,7 @@ sub_80A2F0C: @ 80A2F0C
cmp r0, 0
bge _080A2F3C
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A2F62
.align 2, 0
_080A2F38: .4byte gUnknown_202063C
@@ -1641,7 +1641,7 @@ sub_80A2F74: @ 80A2F74
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1664,7 +1664,7 @@ sub_80A2F74: @ 80A2F74
strh r1, [r5, 0x24]
ldr r0, _080A2FFC @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A2FBE
@@ -1680,7 +1680,7 @@ _080A2FBE:
adds r0, r6, 0
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
adds r0, r6, 0
bl sub_8076440
ldrh r0, [r4, 0xA]
@@ -1725,7 +1725,7 @@ sub_80A3004: @ 80A3004
cmp r5, 0
bne _080A3074
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1770,7 +1770,7 @@ _080A3074:
cmp r0, 0x3
bne _080A308E
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A308E:
pop {r4-r6}
pop {r0}
@@ -1793,7 +1793,7 @@ sub_80A3098: @ 80A3098
_080A30AA:
ldr r6, _080A30FC @ =gUnknown_2037F1B
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A30C2
@@ -1850,7 +1850,7 @@ _080A3104:
beq _080A3156
adds r0, r5, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
movs r0, 0x19
strh r0, [r5, 0x2E]
ldr r4, _080A315C @ =gUnknown_2037F1A
@@ -1868,9 +1868,9 @@ _080A3104:
strh r0, [r5, 0x36]
ldr r0, _080A3160 @ =sub_8075764
str r0, [r5, 0x1C]
- ldr r1, _080A3164 @ =sub_8072740
+ ldr r1, _080A3164 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080A3156:
pop {r4-r6}
pop {r0}
@@ -1878,7 +1878,7 @@ _080A3156:
.align 2, 0
_080A315C: .4byte gUnknown_2037F1A
_080A3160: .4byte sub_8075764
-_080A3164: .4byte sub_8072740
+_080A3164: .4byte DestroyAnimSprite
thumb_func_end sub_80A3098
thumb_func_start sub_80A3168
@@ -1914,7 +1914,7 @@ sub_80A3168: @ 80A3168
strb r0, [r1]
ldrb r1, [r4, 0x6]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x8]
strh r0, [r5, 0x32]
ldrh r0, [r5, 0x2E]
@@ -2026,7 +2026,7 @@ sub_80A31EC: @ 80A31EC
strb r0, [r1]
ldrb r1, [r6, 0x8]
mov r0, r9
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r6, 0xA]
mov r1, r9
strh r0, [r1, 0x32]
@@ -2100,7 +2100,7 @@ _080A331C:
cmp r1, r0
ble _080A332E
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A332E:
pop {r0}
bx r0
@@ -2154,7 +2154,7 @@ _080A3374:
ands r0, r1
movs r2, 0x32
ldrsh r1, [r6, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r6, 0x26]
movs r0, 0x2E
ldrsh r1, [r6, r0]
@@ -2163,7 +2163,7 @@ _080A3374:
cmp r1, r0
ble _080A33AA
adds r0, r6, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A33AA:
pop {r4-r6}
pop {r0}
@@ -2295,7 +2295,7 @@ sub_80A3484: @ 80A3484
bne _080A3498
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080A3498:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -2305,7 +2305,7 @@ _080A3498:
cmp r0, 0x32
ble _080A34AC
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A34AC:
pop {r4}
pop {r0}
@@ -2346,7 +2346,7 @@ _080A34DE:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
bl sub_80A33E0
@@ -2457,7 +2457,7 @@ _080A35BA:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
bl sub_80A33E0
@@ -2467,7 +2467,7 @@ _080A35BA:
strh r5, [r4, 0x26]
strh r5, [r4, 0x2E]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A35EC:
pop {r4,r5}
pop {r0}
@@ -2485,7 +2485,7 @@ sub_80A35F4: @ 80A35F4
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2565,7 +2565,7 @@ _080A368A:
cmp r0, 0
beq _080A36AA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A36AA:
pop {r4}
pop {r0}
@@ -2666,7 +2666,7 @@ _080A3756:
subs r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
lsls r0, 16
cmp r0, 0
@@ -2677,7 +2677,7 @@ _080A3756:
lsls r1, 24
asrs r1, 24
movs r0, 0x76
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080A378A:
adds r0, r4, 0
bl sub_80A33E0
@@ -2695,7 +2695,7 @@ _080A378A:
lsls r1, 24
asrs r1, 24
movs r0, 0x76
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080A37B2:
pop {r4,r5}
pop {r0}
@@ -2753,12 +2753,12 @@ _080A3806:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x3C
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldr r0, _080A3844 @ =sub_80A3858
str r0, [r4, 0x1C]
@@ -2808,7 +2808,7 @@ _080A386A:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080A38BA
_080A3882:
movs r1, 0x36
@@ -2932,12 +2932,12 @@ _080A395E:
movs r6, 0x30
ldrsh r0, [r4, r6]
movs r1, 0x3C
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
_080A3976:
pop {r4-r6}
@@ -2954,7 +2954,7 @@ sub_80A397C: @ 80A397C
cmp r0, 0x14
ble _080A398E
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A398E:
movs r0, 0x2E
ldrsh r1, [r4, r0]
@@ -3021,7 +3021,7 @@ sub_80A39C0: @ 80A39C0
bl sub_8076B2C
strh r0, [r5, 0x1E]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
movs r2, 0x1
@@ -3049,14 +3049,14 @@ _080A3A28:
movs r3, 0x1A
ldrsh r2, [r5, r3]
ldrb r3, [r5, 0x10]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xC]
cmp r0, 0x40
bne _080A3A60
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A3A60:
ldr r4, _080A3B20 @ =gUnknown_202063C
movs r0, 0xC
@@ -3207,7 +3207,7 @@ _080A3B80:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080A3B96
@@ -3236,7 +3236,7 @@ _080A3BB4:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080A3BCA
@@ -3265,7 +3265,7 @@ _080A3BE6:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080A3BFC
@@ -3307,7 +3307,7 @@ _080A3C04:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3318,7 +3318,7 @@ _080A3C54:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080A3C6A
@@ -3379,7 +3379,7 @@ _080A3C72:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3438,7 +3438,7 @@ _080A3CE8:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3449,7 +3449,7 @@ _080A3D62:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080A3D78
@@ -3492,7 +3492,7 @@ _080A3D80:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3549,7 +3549,7 @@ _080A3DD2:
strb r0, [r1]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3560,7 +3560,7 @@ _080A3E48:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080A3EFC
@@ -3601,7 +3601,7 @@ _080A3E64:
strb r1, [r0]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
bl sub_8075068
ldrh r0, [r6, 0x8]
@@ -3612,12 +3612,12 @@ _080A3EB6:
adds r1, r2, 0
bl sub_80A3F24
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080A3EFC
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
ldrh r0, [r6, 0x8]
adds r0, 0x1
b _080A3EFA
@@ -3627,7 +3627,7 @@ _080A3ED6:
cmp r0, 0
bne _080A3EFC
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A3EFC
_080A3EE6:
ldrh r0, [r6, 0xA]
@@ -3704,7 +3704,7 @@ sub_80A3F24: @ 80A3F24
lsls r2, 16
asrs r2, 16
ldrb r3, [r6, 0x10]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3734,7 +3734,7 @@ sub_80A3F24: @ 80A3F24
strh r0, [r1, 0x22]
ldrb r1, [r6, 0xE]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r6, 0x10]
adds r4, 0x43
strb r0, [r4]
@@ -3805,7 +3805,7 @@ sub_80A3FD4: @ 80A3FD4
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080A4036:
pop {r4}
pop {r0}
@@ -3833,7 +3833,7 @@ _080A405C:
_080A405E:
ldrb r6, [r0]
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A4088
@@ -3924,7 +3924,7 @@ _080A4100:
adds r0, r7
strh r0, [r4, 0x22]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
_080A411A:
adds r0, r6, 0
bl sub_8076884
@@ -4008,7 +4008,7 @@ _080A41A4:
bgt _080A41BC
_080A41B6:
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080A41BC:
pop {r4,r5}
pop {r0}
@@ -4036,7 +4036,7 @@ sub_80A41C4: @ 80A41C4
_080A41E4: .4byte gUnknown_3005090
_080A41E8:
ldr r0, _080A4214 @ =0x0000274f
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r2, 0x80
@@ -4045,7 +4045,7 @@ _080A41E8:
adds r0, r4
strh r0, [r5, 0x18]
ldr r0, _080A4218 @ =0x000027b0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
adds r0, r4
@@ -4075,7 +4075,7 @@ _080A421C:
adds r1, r4
ldrh r3, [r1]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r5, 0x20]
ldrb r2, [r5, 0x1C]
movs r3, 0x1E
@@ -4084,7 +4084,7 @@ _080A421C:
adds r1, r4
ldrh r3, [r1]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r5, 0x1C]
adds r0, 0x1
strh r0, [r5, 0x1C]
@@ -4110,7 +4110,7 @@ _080A4276:
cmp r1, r0
bne _080A428A
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A428A:
pop {r4-r7}
pop {r0}
@@ -4131,7 +4131,7 @@ sub_80A4298: @ 80A4298
cmp r0, 0
bne _080A42B4
adds r0, r6, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080A438E
.align 2, 0
_080A42B0: .4byte gUnknown_2037F02
@@ -4280,7 +4280,7 @@ sub_80A43A0: @ 80A43A0
b _080A43D6
_080A43D0:
adds r0, r2, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080A43D6:
pop {r4}
pop {r0}
@@ -4298,7 +4298,7 @@ sub_80A43DC: @ 80A43DC
cmp r0, 0
beq _080A43F2
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A43F2:
pop {r0}
bx r0
@@ -4310,7 +4310,7 @@ sub_80A43F8: @ 80A43F8
adds r4, r0, 0
ldr r0, _080A4418 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A4420
@@ -4337,16 +4337,16 @@ _080A442C:
strh r0, [r4, 0x22]
ldr r0, _080A4448 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080A444C @ =sub_8072740
+ ldr r1, _080A444C @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A4444: .4byte gUnknown_2037F02
_080A4448: .4byte sub_8074F6C
-_080A444C: .4byte sub_8072740
+_080A444C: .4byte DestroyAnimSprite
thumb_func_end sub_80A43F8
thumb_func_start sub_80A4450
@@ -4355,13 +4355,13 @@ sub_80A4450: @ 80A4450
adds r5, r0, 0
ldr r0, _080A4488 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A446A
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080A446A:
ldr r0, _080A448C @ =sub_80A43DC
str r0, [r5, 0x1C]
@@ -4406,10 +4406,10 @@ sub_80A4494: @ 80A4494
strh r0, [r4, 0x38]
ldrb r1, [r1, 0xC]
adds r0, r4, 0
- bl sub_800843C
- ldr r1, _080A44D8 @ =sub_8074EE0
+ bl StartSpriteAffineAnim
+ ldr r1, _080A44D8 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A44DC @ =sub_8074E70
str r0, [r4, 0x1C]
pop {r4}
@@ -4417,7 +4417,7 @@ sub_80A4494: @ 80A4494
bx r0
.align 2, 0
_080A44D4: .4byte gUnknown_2037F02
-_080A44D8: .4byte sub_8074EE0
+_080A44D8: .4byte move_anim_8074EE0
_080A44DC: .4byte sub_8074E70
thumb_func_end sub_80A4494
@@ -4439,7 +4439,7 @@ sub_80A44E0: @ 80A44E0
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A4514
@@ -4600,7 +4600,7 @@ _080A463E:
strh r4, [r6, 0x22]
ldr r0, _080A4670 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A4656
@@ -4712,9 +4712,9 @@ _080A46F2:
asrs r0, 16
cmp r0, 0x14
bne _080A4728
- ldr r1, _080A4730 @ =sub_8072740
+ ldr r1, _080A4730 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
movs r0, 0x3
strh r0, [r4, 0x2E]
ldr r0, _080A4734 @ =sub_8074C44
@@ -4724,7 +4724,7 @@ _080A4728:
pop {r0}
bx r0
.align 2, 0
-_080A4730: .4byte sub_8072740
+_080A4730: .4byte DestroyAnimSprite
_080A4734: .4byte sub_8074C44
thumb_func_end sub_80A46CC
@@ -4827,16 +4827,16 @@ _080A47E0:
lsls r0, 2
ldr r4, _080A4818 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x30
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A4810:
pop {r4,r5}
pop {r0}
@@ -4854,7 +4854,7 @@ sub_80A481C: @ 80A481C
strh r0, [r5, 0x2E]
ldr r0, _080A4840 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A4844
@@ -4874,7 +4874,7 @@ _080A484A:
ldr r4, _080A4878 @ =gUnknown_2037F02
ldrb r1, [r4, 0xA]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x6]
negs r0, r0
strh r0, [r5, 0x30]
@@ -4903,12 +4903,12 @@ sub_80A4880: @ 80A4880
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x64
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x2E
ldrsh r0, [r4, r2]
movs r1, 0x14
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -4948,7 +4948,7 @@ _080A48B2:
cmp r0, r1
bne _080A48E8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A48E8:
pop {r4}
pop {r0}
@@ -4987,7 +4987,7 @@ _080A4906:
adds r0, r4
strh r0, [r5, 0x22]
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A4944
@@ -5031,7 +5031,7 @@ _080A4984:
ldrh r0, [r0, 0x4]
strh r0, [r5, 0x2E]
ldr r0, _080A49CC @ =0x00002828
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x80
@@ -5044,7 +5044,7 @@ _080A4984:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r5, 0x3C]
lsls r1, r0, 8
subs r4, r0
@@ -5052,7 +5052,7 @@ _080A4984:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080A49D0 @ =sub_80A49D4
str r0, [r5, 0x1C]
pop {r4-r6}
@@ -5142,7 +5142,7 @@ _080A4A32:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_080A4A6C:
ldrh r1, [r4, 0x2E]
movs r2, 0x2E
@@ -5174,7 +5174,7 @@ _080A4A80:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x3C
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -5226,7 +5226,7 @@ sub_80A4ACC: @ 80A4ACC
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x3C]
lsls r1, 8
ldrh r0, [r4, 0x3A]
@@ -5234,7 +5234,7 @@ sub_80A4ACC: @ 80A4ACC
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080A4B34 @ =sub_80A4B38
str r0, [r4, 0x1C]
pop {r4-r6}
@@ -5312,7 +5312,7 @@ _080A4BA6:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x3A
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -5335,7 +5335,7 @@ _080A4BCC:
strh r0, [r4, 0x30]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080A4C72
_080A4BE8:
adds r0, r4, 0
@@ -5390,7 +5390,7 @@ _080A4C3E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x3A
ldrsh r1, [r4, r0]
cmp r1, 0
@@ -5417,12 +5417,12 @@ _080A4C72:
_080A4C7A:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A4C90:
pop {r4}
pop {r0}
@@ -5519,9 +5519,9 @@ _080A4D20:
strh r0, [r4, 0x30]
ldrh r0, [r5, 0x8]
strh r0, [r4, 0x32]
- ldr r1, _080A4D54 @ =sub_8072740
+ ldr r1, _080A4D54 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A4D58 @ =sub_8074D00
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -5529,7 +5529,7 @@ _080A4D20:
bx r0
.align 2, 0
_080A4D50: .4byte gUnknown_2037F02
-_080A4D54: .4byte sub_8072740
+_080A4D54: .4byte DestroyAnimSprite
_080A4D58: .4byte sub_8074D00
thumb_func_end sub_80A4D0C
@@ -5628,9 +5628,9 @@ _080A4E14:
strh r0, [r5, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r5, 0x32]
- ldr r1, _080A4E38 @ =sub_8072740
+ ldr r1, _080A4E38 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A4E3C @ =sub_8074D00
str r0, [r5, 0x1C]
pop {r4-r6}
@@ -5638,7 +5638,7 @@ _080A4E14:
bx r0
.align 2, 0
_080A4E34: .4byte gUnknown_2037F02
-_080A4E38: .4byte sub_8072740
+_080A4E38: .4byte DestroyAnimSprite
_080A4E3C: .4byte sub_8074D00
thumb_func_end sub_80A4D5C
@@ -5649,7 +5649,7 @@ sub_80A4E40: @ 80A4E40
bl sub_8074FCC
ldr r0, _080A4E6C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A4E74
@@ -5678,7 +5678,7 @@ _080A4E74:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080A4E8E:
ldr r0, _080A4E9C @ =sub_80A4EA0
str r0, [r4, 0x1C]
@@ -5713,7 +5713,7 @@ sub_80A4EA0: @ 80A4EA0
lsls r0, 18
asrs r0, 16
movs r1, 0x3
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -5727,7 +5727,7 @@ _080A4ED8:
cmp r0, 0
beq _080A4EEC
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A4EEC:
pop {r4}
pop {r0}
@@ -5741,7 +5741,7 @@ sub_80A4EF4: @ 80A4EF4
bl sub_8074FCC
ldr r0, _080A4F24 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A4F2C
@@ -5774,7 +5774,7 @@ _080A4F2C:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080A4F4A:
ldr r0, _080A4F5C @ =sub_80A4F60
str r0, [r4, 0x1C]
@@ -5819,7 +5819,7 @@ sub_80A4F60: @ 80A4F60
cmp r0, 0x3C
ble _080A4FA4
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080A4FA4:
pop {r4}
pop {r0}
@@ -5840,7 +5840,7 @@ sub_80A4FAC: @ 80A4FAC
ldr r1, _080A4FCC @ =sub_8074C44
str r1, [r0, 0x1C]
ldr r1, _080A4FD0 @ =sub_80A4FD4
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
@@ -5867,7 +5867,7 @@ _080A4FEA:
str r0, [r5, 0x1C]
ldr r1, _080A5000 @ =sub_80A4FD4
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _080A506A
.align 2, 0
_080A4FFC: .4byte sub_8074C44
@@ -5907,7 +5907,7 @@ _080A5004:
str r0, [r5, 0x1C]
ldr r1, _080A5080 @ =sub_80A5084
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
movs r1, 0x80
lsls r1, 1
adds r0, r1, 0
@@ -5920,7 +5920,7 @@ _080A5004:
lsls r1, 24
asrs r1, 24
movs r0, 0xCB
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080A506A:
ldrh r0, [r5, 0x38]
movs r1, 0x1
@@ -5950,7 +5950,7 @@ sub_80A5084: @ 80A5084
str r0, [r2, 0x1C]
ldr r1, _080A50A8 @ =sub_80A50B8
adds r0, r2, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _080A50B0
.align 2, 0
_080A50A4: .4byte sub_8074C44
@@ -5980,7 +5980,7 @@ sub_80A50B8: @ 80A50B8
str r0, [r5, 0x1C]
ldr r1, _080A50DC @ =sub_80A5174
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _080A5160
.align 2, 0
_080A50D8: .4byte sub_8074C44
@@ -6052,7 +6052,7 @@ _080A5118:
str r0, [r5, 0x1C]
ldr r1, _080A5170 @ =sub_80A5220
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080A5160:
pop {r4-r7}
pop {r0}
@@ -6106,7 +6106,7 @@ _080A51A4:
lsls r1, 24
lsrs r1, 24
ldr r2, _080A5200 @ =0x00007fff
- bl sub_80714D4
+ bl BlendPalettes
movs r3, 0x30
ldrsh r0, [r4, r3]
cmp r0, 0x10
@@ -6124,14 +6124,14 @@ _080A51A4:
adds r2, r3, 0
orrs r1, r2
movs r2, 0x4
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x3F
bl sub_8073A44
adds r1, r0, 0
lsls r1, 24
asrs r1, 24
movs r0, 0xB9
- bl sub_80722F4
+ bl PlaySE12WithPanning
b _080A5214
.align 2, 0
_080A5200: .4byte 0x00007fff
@@ -6210,7 +6210,7 @@ _080A527C:
cmp r0, 0x8
bne _080A5290
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5290:
pop {r4}
pop {r0}
@@ -6368,7 +6368,7 @@ sub_80A5398: @ 80A5398
strh r0, [r4, 0x2E]
ldr r5, _080A53D8 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r2, 0x2
negs r2, r2
@@ -6387,7 +6387,7 @@ _080A53B6:
strh r0, [r4, 0x34]
ldr r1, _080A53E0 @ =sub_80A53E8
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A53E4 @ =sub_8074DC4
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -6417,7 +6417,7 @@ sub_80A53E8: @ 80A53E8
movs r1, 0
bl sub_80758E0
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -6443,7 +6443,7 @@ _080A5424:
lsls r2, 1
ldrh r3, [r5, 0x38]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r5, 0x34]
lsls r0, 24
lsrs r0, 24
@@ -6478,7 +6478,7 @@ sub_80A5474: @ 80A5474
strh r0, [r4, 0x2E]
ldr r5, _080A54B4 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0x3
cmp r0, 0
@@ -6497,7 +6497,7 @@ _080A5492:
strh r0, [r4, 0x34]
ldr r1, _080A54BC @ =sub_80A5584
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A54C0 @ =sub_8074DC4
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -6547,12 +6547,12 @@ sub_80A54E8: @ 80A54E8
ldrb r0, [r0]
strh r0, [r5, 0x34]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A552C
@@ -6585,7 +6585,7 @@ _080A5538:
lsls r2, 1
ldrh r3, [r5, 0x38]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r5, 0x34]
lsls r0, 24
lsrs r0, 24
@@ -6614,7 +6614,7 @@ _080A5580: .4byte sub_80A5584
thumb_func_start sub_80A5584
sub_80A5584: @ 80A5584
push {lr}
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r0}
bx r0
thumb_func_end sub_80A5584
@@ -6656,7 +6656,7 @@ _080A55BC:
ldrb r0, [r0]
strh r0, [r4, 0x32]
ldrb r0, [r2]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x34]
@@ -6690,7 +6690,7 @@ _080A55FA:
lsls r2, 1
ldrh r3, [r4, 0x38]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x32]
lsls r0, 24
lsrs r0, 24
@@ -6728,7 +6728,7 @@ _080A564C:
lsls r2, 1
ldrh r3, [r4, 0x38]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x32]
lsls r0, 24
lsrs r0, 24
@@ -6745,7 +6745,7 @@ _080A564C:
lsrs r0, 24
bl sub_8075980
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A568E:
pop {r4,r5}
pop {r0}
@@ -6770,7 +6770,7 @@ sub_80A5694: @ 80A5694
movs r4, 0
strh r0, [r5, 0x8]
ldrb r0, [r2]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
strh r2, [r5, 0xA]
@@ -6783,7 +6783,7 @@ sub_80A5694: @ 80A5694
cmp r1, 0x1
beq _080A5704
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A5722
.align 2, 0
_080A56D8: .4byte gUnknown_3005090
@@ -6904,7 +6904,7 @@ _080A579E:
lsls r2, 1
ldrh r3, [r4, 0x10]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x8]
bl sub_80759DC
b _080A58D4
@@ -7065,7 +7065,7 @@ _080A58D4:
_080A58DC: .4byte gUnknown_202063C
_080A58E0:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A58E6:
pop {r4}
pop {r0}
@@ -7095,7 +7095,7 @@ sub_80A58EC: @ 80A58EC
lsls r2, 1
ldrh r3, [r4, 0x10]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x8]
bl sub_80759DC
ldrh r0, [r4, 0xE]
@@ -7108,7 +7108,7 @@ _080A592C:
ldrb r0, [r4, 0x8]
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A5938:
pop {r4,r5}
pop {r0}
@@ -7153,7 +7153,7 @@ _080A595E:
strh r0, [r5, 0x30]
ldr r1, _080A59A0 @ =sub_80A5A8C
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A59A4 @ =sub_8074F6C
str r0, [r5, 0x1C]
pop {r4-r6}
@@ -7186,7 +7186,7 @@ sub_80A59A8: @ 80A59A8
strh r0, [r4, 0x22]
ldr r1, _080A59E8 @ =sub_80A5A44
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A59EC @ =sub_8074F6C
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -7224,7 +7224,7 @@ sub_80A59F0: @ 80A59F0
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
strh r6, [r4, 0x2E]
strh r6, [r4, 0x30]
ldr r0, _080A5A40 @ =sub_80A5A8C
@@ -7258,7 +7258,7 @@ sub_80A5A44: @ 80A5A44
strh r0, [r4, 0x32]
ldr r1, _080A5A74 @ =sub_80A5A7C
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A5A78 @ =sub_8074CD0
str r0, [r4, 0x1C]
_080A5A6E:
@@ -7318,7 +7318,7 @@ sub_80A5A8C: @ 80A5A8C
cmp r0, 0x8
ble _080A5AD4
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5AD4:
pop {r0}
bx r0
@@ -7404,7 +7404,7 @@ _080A5B5C:
cmp r0, 0
beq _080A5B78
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5B78:
pop {r0}
bx r0
@@ -7491,7 +7491,7 @@ sub_80A5BCC: @ 80A5BCC
lsls r1, 24
asrs r1, 24
movs r0, 0xBB
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080A5C1E:
movs r1, 0
strh r1, [r4, 0x2E]
@@ -7526,7 +7526,7 @@ _080A5C38:
cmp r0, 0
beq _080A5C62
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5C62:
pop {r4}
pop {r0}
@@ -7577,7 +7577,7 @@ _080A5CB2:
cmp r1, r0
bne _080A5CC2
adds r0, r6, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5CC2:
pop {r4-r6}
pop {r0}
@@ -7614,7 +7614,7 @@ _080A5D00:
cmp r0, 0x2
bne _080A5D0C
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A5D44
_080A5D0C:
ldrh r0, [r4, 0x8]
@@ -7636,7 +7636,7 @@ _080A5D0C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -7713,9 +7713,9 @@ _080A5D90:
strh r0, [r5, 0x36]
ldr r0, _080A5DD8 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080A5DDC @ =sub_8072740
+ ldr r1, _080A5DDC @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080A5DCC:
pop {r4,r5}
pop {r0}
@@ -7723,7 +7723,7 @@ _080A5DCC:
.align 2, 0
_080A5DD4: .4byte gUnknown_2037F1A
_080A5DD8: .4byte sub_8075590
-_080A5DDC: .4byte sub_8072740
+_080A5DDC: .4byte DestroyAnimSprite
thumb_func_end sub_80A5D7C
thumb_func_start sub_80A5DE0
@@ -7755,13 +7755,13 @@ sub_80A5DE0: @ 80A5DE0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0x10
bne _080A5E28
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A5E28:
pop {r4,r5}
pop {r0}
@@ -7788,27 +7788,27 @@ _080A5E48:
cmp r0, 0x1
bne _080A5E64
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A5E64
adds r0, r4, r5
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
_080A5E64:
movs r1, 0x2
ldrsh r0, [r6, r1]
cmp r0, 0x1
bne _080A5E82
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080A5E82
adds r0, r4, r5
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
_080A5E82:
adds r0, r4, 0x1
lsls r0, 24
@@ -7819,7 +7819,7 @@ _080A5E82:
bcc _080A5E48
_080A5E90:
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
@@ -7840,7 +7840,7 @@ _080A5EB2:
ldr r0, _080A5ED8 @ =gUnknown_3004FF0
adds r0, r4, r0
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -7850,7 +7850,7 @@ _080A5EC2:
cmp r4, r0
bcc _080A5EB2
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -7907,7 +7907,7 @@ sub_80A5F28: @ 80A5F28
cmp r0, 0
beq _080A5F3A
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5F3A:
pop {r0}
bx r0
@@ -7976,7 +7976,7 @@ _080A5FAE:
cmp r0, 0
beq _080A5FBC
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A5FBC:
pop {r0}
bx r0
@@ -8044,7 +8044,7 @@ sub_80A5FC0: @ 80A5FC0
mov r2, r8
bl sub_80765C0
ldr r0, _080A6098 @ =0x000027d2
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
movs r4, 0x80
@@ -8055,7 +8055,7 @@ sub_80A5FC0: @ 80A5FC0
orrs r0, r1
mov r10, r0
ldr r0, _080A609C @ =0x000027d3
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
lsls r4, r0
@@ -8067,7 +8067,7 @@ sub_80A5FC0: @ 80A5FC0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080A60A4 @ =sub_80A60A8
str r1, [r6]
adds r0, r7, 0
@@ -8279,7 +8279,7 @@ _080A61EC:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080A6214:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -8295,7 +8295,7 @@ _080A6220:
cmp r0, 0
bne _080A6232
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A6232:
add sp, 0x4
pop {r3}
@@ -8380,7 +8380,7 @@ _080A62D0: .4byte 0xffffec00
_080A62D4:
ldr r0, _080A6314 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A631C
@@ -8485,7 +8485,7 @@ _080A63A2:
cmp r0, 0
bne _080A63B0
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A63B0:
pop {r0}
bx r0
@@ -8506,12 +8506,12 @@ sub_80A63B4: @ 80A63B4
ldr r1, _080A6444 @ =gUnknown_3005090
adds r6, r0, r1
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x8]
ldr r0, _080A6448 @ =0x00002771
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0xA]
@@ -8553,7 +8553,7 @@ _080A640C:
movs r1, 0x10
movs r2, 0xB
movs r3, 0
- bl sub_8045274
+ bl BlendPalette
movs r0, 0
strh r0, [r6, 0xE]
movs r5, 0
@@ -8598,7 +8598,7 @@ _080A6488:
cmp r5, 0x1
bhi _080A649A
movs r0, 0
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -8616,7 +8616,7 @@ _080A649A:
movs r1, 0x80
lsls r1, 2
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _080A64D2
.align 2, 0
_080A64BC: .4byte sub_80A653C
@@ -8626,7 +8626,7 @@ _080A64C8:
movs r1, 0x80
lsls r1, 3
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
_080A64D2:
pop {r3,r4}
mov r8, r3
@@ -8660,7 +8660,7 @@ sub_80A64E0: @ 80A64E0
movs r1, 0x80
lsls r1, 2
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _080A6526
.align 2, 0
_080A6514: .4byte gUnknown_3005090
@@ -8669,12 +8669,12 @@ _080A651C:
movs r1, 0x80
lsls r1, 3
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
_080A6526:
ldr r0, _080A6538 @ =0x00002771
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A6532:
pop {r4}
pop {r0}
@@ -8715,7 +8715,7 @@ _080A6558:
subs r1, 0x1
strh r1, [r0, 0xE]
adds r0, r5, 0
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
b _080A65C2
.align 2, 0
_080A657C: .4byte gUnknown_3005090
@@ -8748,7 +8748,7 @@ _080A6580:
ldrsh r0, [r5, r1]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
_080A65C2:
pop {r4,r5}
@@ -8762,15 +8762,15 @@ _080A65C8: .4byte gUnknown_825E074
sub_80A65CC: @ 80A65CC
push {r4,lr}
adds r4, r0, 0
- ldr r1, _080A65E0 @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _080A65E0 @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
ldr r0, _080A65E4 @ =sub_8074F6C
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_080A65E0: .4byte sub_8072740
+_080A65E0: .4byte DestroyAnimSprite
_080A65E4: .4byte sub_8074F6C
thumb_func_end sub_80A65CC
@@ -8785,7 +8785,7 @@ sub_80A65E8: @ 80A65E8
mov r9, r0
ldr r4, _080A6698 @ =gUnknown_83E3898
ldrh r0, [r4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -8821,7 +8821,7 @@ _080A6632:
mov r1, r8
adds r0, r5, r1
ldrh r0, [r0]
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r3, r0, 24
adds r4, 0x1
@@ -8858,7 +8858,7 @@ _080A667A:
cmp r4, 0x3
bls _080A6632
mov r0, r9
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -8883,14 +8883,14 @@ _080A66AA:
lsls r0, 2
adds r0, r6
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0x3
bls _080A66AA
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -8907,7 +8907,7 @@ sub_80A66D4: @ 80A66D4
ldr r4, _080A672C @ =gUnknown_2037F02
ldrb r1, [r4]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, _080A6730 @ =gUnknown_83E3898
movs r0, 0x2
ldrsh r1, [r4, r0]
@@ -8916,7 +8916,7 @@ sub_80A66D4: @ 80A66D4
lsls r0, 2
adds r0, r2
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -9071,7 +9071,7 @@ _080A6800:
lsls r0, 16
asrs r0, 16
movs r1, 0xF
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x22]
ldrh r0, [r4, 0x20]
@@ -9091,7 +9091,7 @@ _080A6800:
ble _080A6856
_080A684E:
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
b _080A68A6
_080A6856:
movs r0, 0x34
@@ -9123,7 +9123,7 @@ _080A687E:
lsls r0, 2
adds r0, r2
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -9148,7 +9148,7 @@ sub_80A68B0: @ 80A68B0
adds r6, r0, 0
ldr r7, _080A6934 @ =gUnknown_2037F1A
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -9179,7 +9179,7 @@ _080A68CE:
strh r0, [r6, 0x22]
ldrb r1, [r4]
adds r0, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r6, 0x32]
strh r5, [r6, 0x34]
ldrh r0, [r6, 0x20]
@@ -9245,12 +9245,12 @@ sub_80A6940: @ 80A6940
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x12
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x12
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
movs r1, 0x32
ldrsh r0, [r4, r1]
@@ -9267,7 +9267,7 @@ _080A699E:
cmp r0, 0x30
bne _080A69B2
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080A69B2:
pop {r4}
pop {r0}
@@ -9316,9 +9316,9 @@ _080A69DE:
strh r0, [r5, 0x2E]
ldr r0, _080A6A20 @ =sub_8074C44
str r0, [r5, 0x1C]
- ldr r1, _080A6A24 @ =sub_8072740
+ ldr r1, _080A6A24 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
@@ -9326,7 +9326,7 @@ _080A69DE:
_080A6A18: .4byte 0x0000fff0
_080A6A1C: .4byte gUnknown_2037F1A
_080A6A20: .4byte sub_8074C44
-_080A6A24: .4byte sub_8072740
+_080A6A24: .4byte DestroyAnimSprite
thumb_func_end sub_80A69B8
thumb_func_start sub_80A6A28
@@ -9340,7 +9340,7 @@ sub_80A6A28: @ 80A6A28
ldr r5, _080A6AA0 @ =gUnknown_2037F02
ldrb r1, [r5, 0x2]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, _080A6AA4 @ =gUnknown_83E3898
movs r0, 0x4
ldrsh r1, [r5, r0]
@@ -9349,7 +9349,7 @@ sub_80A6A28: @ 80A6A28
lsls r0, 2
adds r0, r2
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -9381,7 +9381,7 @@ _080A6A74:
subs r0, 0x28
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x38]
ldr r0, _080A6AAC @ =sub_80A6AB0
@@ -9407,7 +9407,7 @@ sub_80A6AB0: @ 80A6AB0
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E30
+ bl Sin
lsls r0, 16
lsrs r1, r0, 16
ldrh r2, [r4, 0x24]
@@ -9426,7 +9426,7 @@ _080A6ADC:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
ldrh r3, [r4, 0x26]
adds r0, r3
strh r0, [r4, 0x26]
@@ -9438,7 +9438,7 @@ _080A6ADC:
b _080A6B06
_080A6B00:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A6B06:
pop {r4}
pop {r0}
@@ -9452,7 +9452,7 @@ sub_80A6B0C: @ 80A6B0C
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A6B2C
@@ -9513,7 +9513,7 @@ _080A6B82:
adds r1, r5, 0
bl sub_80A6B0C
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -9525,10 +9525,10 @@ _080A6B82:
adds r0, r1, 0x2
strh r0, [r5, 0x30]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _080A6BC8 @ =sub_80A6BD0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A6BCC @ =sub_8074F6C
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -9551,14 +9551,14 @@ sub_80A6BD0: @ 80A6BD0
lsls r0, 16
cmp r0, 0
bne _080A6BF8
- ldr r1, _080A6C00 @ =sub_8072740
+ ldr r1, _080A6C00 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrh r1, [r4, 0x30]
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080A6C04 @ =sub_8074F6C
str r0, [r4, 0x1C]
_080A6BF8:
@@ -9566,7 +9566,7 @@ _080A6BF8:
pop {r0}
bx r0
.align 2, 0
-_080A6C00: .4byte sub_8072740
+_080A6C00: .4byte DestroyAnimSprite
_080A6C04: .4byte sub_8074F6C
thumb_func_end sub_80A6BD0
@@ -9594,7 +9594,7 @@ _080A6C26:
strh r0, [r4, 0x2E]
ldr r1, _080A6C48 @ =sub_80A6C50
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A6C4C @ =sub_8074F50
str r0, [r4, 0x1C]
pop {r4}
@@ -9619,10 +9619,10 @@ sub_80A6C50: @ 80A6C50
ble _080A6C76
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
- ldr r1, _080A6C7C @ =sub_8074EE0
+ bl StartSpriteAffineAnim
+ ldr r1, _080A6C7C @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A6C80 @ =sub_8074F50
str r0, [r4, 0x1C]
_080A6C76:
@@ -9630,7 +9630,7 @@ _080A6C76:
pop {r0}
bx r0
.align 2, 0
-_080A6C7C: .4byte sub_8074EE0
+_080A6C7C: .4byte move_anim_8074EE0
_080A6C80: .4byte sub_8074F50
thumb_func_end sub_80A6C50
@@ -9683,7 +9683,7 @@ _080A6CCA:
strh r6, [r4, 0x36]
ldr r1, _080A6CF8 @ =sub_80A6D00
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A6CFC @ =sub_8074F50
str r0, [r4, 0x1C]
pop {r4-r6}
@@ -9802,13 +9802,13 @@ _080A6DAE:
adds r1, r5, 0
bl sub_80A6B0C
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A6DD4
adds r0, r5, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x2
b _080A6DDE
.align 2, 0
@@ -9816,7 +9816,7 @@ _080A6DD0: .4byte gUnknown_2037F1B
_080A6DD4:
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x3
_080A6DDE:
strh r0, [r5, 0x2E]
@@ -9846,10 +9846,10 @@ sub_80A6DF0: @ 80A6DF0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _080A6E24 @ =sub_80A6E2C
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A6E28 @ =sub_8074F6C
str r0, [r4, 0x1C]
_080A6E1E:
@@ -9873,7 +9873,7 @@ sub_80A6E2C: @ 80A6E2C
cmp r0, 0x5
ble _080A6E44
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A6E44:
pop {r0}
bx r0
@@ -9901,9 +9901,9 @@ sub_80A6E48: @ 80A6E48
strh r0, [r4, 0x34]
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x36]
- ldr r1, _080A6E90 @ =sub_8074EE0
+ ldr r1, _080A6E90 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080A6E94 @ =sub_8074BE4
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -9913,7 +9913,7 @@ sub_80A6E48: @ 80A6E48
bx r0
.align 2, 0
_080A6E8C: .4byte gUnknown_2037F02
-_080A6E90: .4byte sub_8074EE0
+_080A6E90: .4byte move_anim_8074EE0
_080A6E94: .4byte sub_8074BE4
thumb_func_end sub_80A6E48
@@ -10003,7 +10003,7 @@ _080A6F24:
cmp r0, 0x40
bne _080A6F38
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A6F38:
pop {r0}
bx r0
@@ -10040,7 +10040,7 @@ sub_80A6F3C: @ 80A6F3C
adds r0, r3
strh r2, [r0, 0x24]
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080A6F7A:
ldrh r0, [r4, 0x2E]
subs r0, 0x1
@@ -10075,7 +10075,7 @@ sub_80A6F8C: @ 80A6F8C
adds r0, r1
ldrb r6, [r0]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A6FE4
@@ -10140,7 +10140,7 @@ sub_80A7020: @ 80A7020
str r0, [r4, 0x1C]
ldr r1, _080A7054 @ =sub_80A7058
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -10163,7 +10163,7 @@ sub_80A7058: @ 80A7058
ldr r1, _080A7078 @ =sub_8075590
str r1, [r0, 0x1C]
ldr r1, _080A707C @ =sub_80A7080
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
@@ -10181,7 +10181,7 @@ sub_80A7080: @ 80A7080
cmp r0, 0
bne _080A7096
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080A709A
_080A7096:
subs r0, r2, 0x1
@@ -10231,7 +10231,7 @@ sub_80A70DC: @ 80A70DC
ldrb r0, [r0]
adds r1, r0, r1
ldrb r4, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A7118
@@ -10263,7 +10263,7 @@ _080A7126:
lsls r2, 1
adds r0, r4, 0
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldr r1, _080A7158 @ =gUnknown_3005090
adds r0, r6, r5
lsls r0, 3
@@ -10334,7 +10334,7 @@ _080A71AA:
adds r0, r4, 0
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A71D0
.align 2, 0
_080A71C4: .4byte gUnknown_202063C
@@ -10356,7 +10356,7 @@ sub_80A71D8: @ 80A71D8
bl sub_8074FCC
ldr r0, _080A71FC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A7204
@@ -10384,7 +10384,7 @@ _080A7210:
strh r0, [r4, 0x22]
ldr r0, _080A7248 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A724C
@@ -10420,15 +10420,15 @@ _080A724C:
_080A7260:
ldr r0, _080A7274 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080A7278 @ =sub_8072740
+ ldr r1, _080A7278 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080A7274: .4byte sub_8074F6C
-_080A7278: .4byte sub_8072740
+_080A7278: .4byte DestroyAnimSprite
thumb_func_end sub_80A71D8
thumb_func_start sub_80A727C
@@ -10441,7 +10441,7 @@ sub_80A727C: @ 80A727C
str r0, [r4, 0x1C]
ldr r1, _080A729C @ =sub_80A72A0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -10462,13 +10462,13 @@ sub_80A72A0: @ 80A72A0
strh r1, [r0, 0x36]
ldr r1, _080A72C0 @ =sub_8075590
str r1, [r0, 0x1C]
- ldr r1, _080A72C4 @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _080A72C4 @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080A72C0: .4byte sub_8075590
-_080A72C4: .4byte sub_8072740
+_080A72C4: .4byte DestroyAnimSprite
thumb_func_end sub_80A72A0
thumb_func_start sub_80A72C8
@@ -10492,7 +10492,7 @@ _080A72E8: .4byte gUnknown_2037F02
_080A72EC:
ldr r0, _080A73B4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A730E
@@ -10574,9 +10574,9 @@ _080A7380:
strh r7, [r5, 0x36]
ldr r0, _080A73C4 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080A73C8 @ =sub_8072740
+ ldr r1, _080A73C8 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r3}
mov r8, r3
@@ -10589,7 +10589,7 @@ _080A73B8: .4byte gUnknown_2037F02
_080A73BC: .4byte gUnknown_2037F1B
_080A73C0: .4byte 0xffffa000
_080A73C4: .4byte sub_8075590
-_080A73C8: .4byte sub_8072740
+_080A73C8: .4byte DestroyAnimSprite
thumb_func_end sub_80A72C8
thumb_func_start sub_80A73CC
@@ -10613,7 +10613,7 @@ sub_80A73CC: @ 80A73CC
subs r1, 0x1
strh r1, [r0, 0xA]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080A73F6:
pop {r0}
bx r0
@@ -10834,7 +10834,7 @@ _080A756E:
lsls r5, 16
asrs r5, 16
adds r1, r5, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
adds r4, r0, 0
lsls r4, 16
asrs r4, 16
@@ -10846,13 +10846,13 @@ _080A756E:
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
strh r0, [r7, 0x34]
mov r1, r8
lsls r0, r1, 16
asrs r0, 16
adds r1, r5, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
adds r4, r0, 0
lsls r4, 16
asrs r4, 16
@@ -10862,7 +10862,7 @@ _080A756E:
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
strh r0, [r7, 0x36]
ldr r0, _080A75E0 @ =sub_80A7400
str r0, [r7, 0x1C]
@@ -10891,7 +10891,7 @@ sub_80A75E4: @ 80A75E4
cmp r0, 0
bne _080A7602
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A7602:
pop {r0}
bx r0
@@ -10925,7 +10925,7 @@ sub_80A760C: @ 80A760C
subs r3, r4
lsls r3, 24
lsrs r3, 24
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r12, r0
@@ -10997,7 +10997,7 @@ _080A7690:
lsls r1, 24
asrs r1, 24
movs r0, 0x93
- bl sub_80722F4
+ bl PlaySE12WithPanning
movs r3, 0xA
ldrsh r0, [r4, r3]
cmp r0, 0x2
@@ -11226,7 +11226,7 @@ _080A788A:
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
ldr r2, _080A7904 @ =gUnknown_3005090
mov r3, r8
adds r1, r3, r7
@@ -11236,7 +11236,7 @@ _080A788A:
movs r1, 0x12
ldrsh r0, [r6, r1]
movs r1, 0x80
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
strh r0, [r6, 0x14]
ldrh r0, [r5, 0x4]
strh r0, [r6, 0x16]
@@ -11257,7 +11257,7 @@ _080A788A:
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
movs r1, 0x2
negs r1, r1
ands r1, r0
@@ -11277,7 +11277,7 @@ _080A7908:
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
movs r1, 0x1
orrs r0, r1
strh r0, [r6, 0x18]
@@ -11383,7 +11383,7 @@ sub_80A79E8: @ 80A79E8
bl sub_8075160
ldr r0, _080A7A10 @ =gUnknown_83E3D18
ldrh r0, [r0, 0x2]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x80
@@ -11451,7 +11451,7 @@ _080A7A50:
cmp r0, 0x18
bne _080A7A7C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A7A7C:
pop {r4-r7}
pop {r0}
@@ -11485,7 +11485,7 @@ sub_80A7A88: @ 80A7A88
lsrs r7, r0, 16
ldr r0, _080A7B30 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A7ACC
@@ -11529,9 +11529,9 @@ _080A7ACC:
strh r7, [r5, 0x36]
ldr r0, _080A7B34 @ =sub_80756A4
str r0, [r5, 0x1C]
- ldr r1, _080A7B38 @ =sub_8072740
+ ldr r1, _080A7B38 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -11541,7 +11541,7 @@ _080A7B28: .4byte gUnknown_2037F1B
_080A7B2C: .4byte gUnknown_2037F02
_080A7B30: .4byte gUnknown_2037F1A
_080A7B34: .4byte sub_80756A4
-_080A7B38: .4byte sub_8072740
+_080A7B38: .4byte DestroyAnimSprite
thumb_func_end sub_80A7A88
thumb_func_start sub_80A7B3C
@@ -11571,7 +11571,7 @@ sub_80A7B54: @ 80A7B54
strh r0, [r4, 0x24]
ldr r0, _080A7BC0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A7B78
@@ -11583,7 +11583,7 @@ _080A7B78:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x5
@@ -11608,7 +11608,7 @@ _080A7B78:
cmp r0, 0x2
bne _080A7BB8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A7BB8:
pop {r4}
pop {r0}
@@ -11648,7 +11648,7 @@ sub_80A7BC4: @ 80A7BC4
strb r0, [r2]
ldr r1, _080A7C18 @ =sub_80A7C1C
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -11668,7 +11668,7 @@ sub_80A7C1C: @ 80A7C1C
lsls r1, 24
asrs r1, 24
movs r0, 0x9F
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
@@ -11690,7 +11690,7 @@ _080A7C50:
subs r1, 0x1
cmp r1, 0
bge _080A7C50
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x7
@@ -11699,7 +11699,7 @@ _080A7C50:
adds r1, r2, 0
subs r1, r0
strh r1, [r4, 0x3A]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA0
@@ -11744,7 +11744,7 @@ _080A7CBE:
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x8
@@ -11769,7 +11769,7 @@ _080A7CBE:
cmp r0, 0x1
bne _080A7CFE
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A7CFE:
pop {r4}
pop {r0}
@@ -11784,7 +11784,7 @@ sub_80A7D04: @ 80A7D04
bl sub_8075160
ldr r0, _080A7D54 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A7D22
@@ -11805,9 +11805,9 @@ _080A7D22:
strh r0, [r4, 0x36]
ldr r0, _080A7D5C @ =sub_8074A80
str r0, [r4, 0x1C]
- ldr r1, _080A7D60 @ =sub_8072740
+ ldr r1, _080A7D60 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, [r4, 0x1C]
adds r0, r4, 0
bl _call_via_r1
@@ -11818,7 +11818,7 @@ _080A7D22:
_080A7D54: .4byte gUnknown_2037F1A
_080A7D58: .4byte gUnknown_2037F02
_080A7D5C: .4byte sub_8074A80
-_080A7D60: .4byte sub_8072740
+_080A7D60: .4byte DestroyAnimSprite
thumb_func_end sub_80A7D04
thumb_func_start sub_80A7D64
@@ -11843,7 +11843,7 @@ sub_80A7D64: @ 80A7D64
movs r6, 0x10
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080A7D90:
lsls r0, r7, 16
asrs r0, 16
@@ -11876,7 +11876,7 @@ _080A7D90:
str r0, [r5, 0x1C]
ldr r1, _080A7DF4 @ =sub_80A7DF8
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -11902,7 +11902,7 @@ sub_80A7DF8: @ 80A7DF8
cmp r0, 0
beq _080A7E0E
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A7E0E:
pop {r0}
bx r0
@@ -11934,7 +11934,7 @@ sub_80A7E14: @ 80A7E14
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080A7E48:
mov r0, r8
lsls r1, r0, 16
@@ -11968,7 +11968,7 @@ _080A7E48:
adds r0, r6
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldrh r0, [r7]
strh r0, [r5, 0x38]
ldrh r0, [r5, 0x2E]
@@ -12006,7 +12006,7 @@ sub_80A7EBC: @ 80A7EBC
beq _080A7F20
adds r0, r4, 0
movs r1, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -12092,7 +12092,7 @@ _080A7F48:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080A7F90 @ =sub_80A7F94
str r0, [r4, 0x1C]
_080A7F8A:
@@ -12112,7 +12112,7 @@ sub_80A7F94: @ 80A7F94
cmp r0, 0
beq _080A7FA8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A7FA8:
pop {r4}
pop {r0}
@@ -12126,7 +12126,7 @@ sub_80A7FB0: @ 80A7FB0
lsls r5, 24
lsrs r5, 24
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -12137,7 +12137,7 @@ sub_80A7FB0: @ 80A7FB0
movs r1, 0xD0
movs r2, 0xD0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldr r1, _080A8008 @ =gUnknown_202063C
lsls r0, r4, 4
adds r0, r4
@@ -12186,7 +12186,7 @@ sub_80A8014: @ 80A8014
cmp r1, r0
bne _080A8064
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -12203,7 +12203,7 @@ sub_80A8014: @ 80A8014
movs r1, 0x1
bl sub_8075B48
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A8064:
pop {r4,r5}
pop {r0}
@@ -12224,7 +12224,7 @@ sub_80A8074: @ 80A8074
ldr r0, _080A80C0 @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -12313,7 +12313,7 @@ _080A8128:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r2, 0xC
@@ -12345,7 +12345,7 @@ _080A816E:
ldrb r0, [r4, 0x8]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r0, 0x2
@@ -12376,7 +12376,7 @@ _080A81A4:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x8]
bl sub_8076440
movs r2, 0xC
@@ -12404,7 +12404,7 @@ _080A81D8:
movs r1, 0
strh r1, [r0, 0x26]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A81F6:
pop {r4,r5}
pop {r0}
@@ -12424,7 +12424,7 @@ sub_80A8200: @ 80A8200
lsrs r1, 24
mov r9, r1
movs r0, 0
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -12432,7 +12432,7 @@ sub_80A8200: @ 80A8200
asrs r4, r0, 16
cmp r4, 0
blt _080A82DA
- bl sub_8008594
+ bl AllocOamMatrix
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0xFF
@@ -12442,7 +12442,7 @@ sub_80A8200: @ 80A8200
lsls r0, 2
ldr r1, _080A8240 @ =gUnknown_202063C
adds r0, r1
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
b _080A82DA
.align 2, 0
_080A8240: .4byte gUnknown_202063C
@@ -12505,7 +12505,7 @@ _080A8244:
ldrsh r2, [r7, r1]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r0, [r4, 0x1]
movs r3, 0x4
negs r3, r3
@@ -12519,7 +12519,7 @@ _080A8244:
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
_080A82DA:
pop {r3,r4}
mov r8, r3
@@ -12560,9 +12560,9 @@ sub_80A82F0: @ 80A82F0
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_080A832E:
pop {r4}
pop {r0}
@@ -12587,14 +12587,14 @@ sub_80A8338: @ 80A8338
cmp r0, 0
bne _080A8364
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A838A
.align 2, 0
_080A835C: .4byte gUnknown_3005090
_080A8360: .4byte gUnknown_2037F02
_080A8364:
ldrb r0, [r5]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -12747,7 +12747,7 @@ _080A8464:
adds r0, r2
strh r5, [r0, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080A84A8
.align 2, 0
_080A8498: .4byte gUnknown_202063C
@@ -12776,7 +12776,7 @@ sub_80A84B4: @ 80A84B4
ldr r0, _080A84E4 @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -12809,7 +12809,7 @@ sub_80A84F0: @ 80A84F0
cmp r0, 0
bne _080A8510
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A8510:
pop {r4}
pop {r0}
@@ -12824,13 +12824,13 @@ sub_80A851C: @ 80A851C
adds r4, r0, 0
ldr r5, _080A854C @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A8550
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -12845,7 +12845,7 @@ _080A854C: .4byte gUnknown_2037F1A
_080A8550:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r0, [r5]
movs r1, 0x2
bl sub_8074480
@@ -12869,9 +12869,9 @@ _080A856A:
strh r1, [r4, 0x32]
strh r1, [r4, 0x34]
strh r1, [r4, 0x36]
- ldr r1, _080A85A4 @ =sub_8072740
+ ldr r1, _080A85A4 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A85A8 @ =sub_8074D00
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -12880,7 +12880,7 @@ _080A856A:
.align 2, 0
_080A859C: .4byte 0x0000ffc0
_080A85A0: .4byte gUnknown_2037F1A
-_080A85A4: .4byte sub_8072740
+_080A85A4: .4byte DestroyAnimSprite
_080A85A8: .4byte sub_8074D00
thumb_func_end sub_80A851C
@@ -12903,7 +12903,7 @@ _080A85C8:
_080A85CA:
ldrb r5, [r0]
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12938,9 +12938,9 @@ _080A85E4:
movs r0, 0x8
strh r0, [r6, 0x22]
_080A8616:
- ldr r1, _080A8630 @ =sub_8074EE0
+ ldr r1, _080A8630 @ =move_anim_8074EE0
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080A8634 @ =sub_8074F50
str r0, [r6, 0x1C]
pop {r4-r6}
@@ -12949,7 +12949,7 @@ _080A8616:
.align 2, 0
_080A8628: .4byte gUnknown_2037F1B
_080A862C: .4byte gUnknown_2037F02
-_080A8630: .4byte sub_8074EE0
+_080A8630: .4byte move_anim_8074EE0
_080A8634: .4byte sub_8074F50
thumb_func_end sub_80A85AC
@@ -12964,7 +12964,7 @@ sub_80A8638: @ 80A8638
ldr r0, _080A866C @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -13000,7 +13000,7 @@ sub_80A8678: @ 80A8678
cmp r0, 0
bne _080A8698
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A8698:
pop {r4}
pop {r0}
@@ -13020,7 +13020,7 @@ sub_80A86A4: @ 80A86A4
ldr r0, _080A8718 @ =gUnknown_3005090
adds r4, r1, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r2, 0
@@ -13053,7 +13053,7 @@ sub_80A86A4: @ 80A86A4
strh r0, [r4, 0x1A]
ldr r0, _080A8720 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13243,7 +13243,7 @@ _080A8848:
strh r1, [r0, 0x22]
_080A8866:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A886C:
pop {r4,r5}
pop {r0}
@@ -13459,7 +13459,7 @@ _080A89F0:
movs r0, 0x3
strb r0, [r1, 0x15]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A8A0E:
pop {r4}
pop {r0}
@@ -13602,7 +13602,7 @@ _080A8ADC:
lsls r1, 24
asrs r1, 24
movs r0, 0xC6
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080A8B22:
ldrh r0, [r4, 0x34]
ldrh r2, [r4, 0x36]
@@ -13685,7 +13685,7 @@ _080A8B9A:
ands r0, r1
strb r0, [r2]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A8BBC:
pop {r4}
pop {r0}
@@ -13754,7 +13754,7 @@ _080A8C34:
lsls r0, 24
lsrs r4, r0, 24
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8C60
@@ -13798,9 +13798,9 @@ sub_80A8C84: @ 80A8C84
cmp r0, 0
beq _080A8C9E
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A8C9E:
pop {r4}
pop {r0}
@@ -13863,7 +13863,7 @@ _080A8D08:
str r3, [sp, 0x4]
_080A8D10:
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8D6C
@@ -14025,7 +14025,7 @@ _080A8E4C:
strh r0, [r2, 0x2]
_080A8E6C:
mov r0, r8
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A8E90
@@ -14066,7 +14066,7 @@ _080A8E9E:
ldrh r0, [r2]
strh r0, [r5, 0x2E]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r1, _080A8EE4 @ =sub_80A8C84
str r1, [r5, 0x1C]
adds r0, r5, 0
@@ -14089,7 +14089,7 @@ sub_80A8EE8: @ 80A8EE8
push {r4,lr}
adds r4, r0, 0
ldr r0, _080A8F28 @ =0x000027db
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -14102,11 +14102,11 @@ sub_80A8EE8: @ 80A8EE8
ldrb r2, [r1, 0xA]
ldrh r3, [r1, 0x8]
movs r1, 0xF
- bl sub_8045274
+ bl BlendPalette
_080A8F0E:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r1, _080A8F34 @ =sub_8075D9C
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -14129,7 +14129,7 @@ sub_80A8F38: @ 80A8F38
bl sub_8075160
ldr r0, _080A8F6C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0xA0
cmp r0, 0
@@ -14174,7 +14174,7 @@ sub_80A8F7C: @ 80A8F7C
strh r2, [r4, 0x2E]
ldr r0, _080A8FE8 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0xA0
cmp r0, 0
@@ -14203,7 +14203,7 @@ _080A8FAC:
strh r5, [r4, 0x2E]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080A8FF0 @ =sub_80A8FF4
str r0, [r4, 0x1C]
_080A8FE0:
@@ -14229,7 +14229,7 @@ sub_80A8FF4: @ 80A8FF4
ble _080A9012
adds r0, r4, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080A9018 @ =sub_80A901C
str r0, [r4, 0x1C]
_080A9012:
@@ -14252,7 +14252,7 @@ sub_80A901C: @ 80A901C
beq _080A9082
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r0, 0
strh r0, [r4, 0x2E]
movs r1, 0x3C
@@ -14322,10 +14322,10 @@ sub_80A9094: @ 80A9094
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2E]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080A90D0 @ =sub_80A90D4
str r0, [r4, 0x1C]
_080A90CA:
@@ -14360,7 +14360,7 @@ sub_80A90D4: @ 80A90D4
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -14401,14 +14401,14 @@ _080A9144: .4byte gUnknown_2037F02
_080A9148: .4byte 0x0000ffff
_080A914C: .4byte sub_80A915C
_080A9150:
- ldr r0, _080A9158 @ =sub_8072740
+ ldr r0, _080A9158 @ =DestroyAnimSprite
_080A9152:
str r0, [r3, 0x1C]
_080A9154:
pop {r0}
bx r0
.align 2, 0
-_080A9158: .4byte sub_8072740
+_080A9158: .4byte DestroyAnimSprite
thumb_func_end sub_80A911C
thumb_func_start sub_80A915C
@@ -14417,12 +14417,12 @@ sub_80A915C: @ 80A915C
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -14439,7 +14439,7 @@ sub_80A917C: @ 80A917C
ldr r0, _080A91AC @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -14494,7 +14494,7 @@ sub_80A91B8: @ 80A91B8
orrs r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9202:
pop {r4,r5}
pop {r0}
@@ -14523,7 +14523,7 @@ sub_80A9210: @ 80A9210
strh r0, [r4, 0x20]
ldr r0, _080A9248 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080A9250
@@ -14542,7 +14542,7 @@ _080A9250:
_080A9256:
strh r0, [r4, 0x24]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -14704,7 +14704,7 @@ _080A9362:
cmp r0, 0
bne _080A9392
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9392:
pop {r4,r5}
pop {r0}
@@ -14735,7 +14735,7 @@ sub_80A939C: @ 80A939C
movs r0, 0x2
strh r0, [r4, 0x24]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -14849,7 +14849,7 @@ _080A9488:
ands r1, r2
strb r1, [r0]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A94A6:
pop {r4-r6}
pop {r0}
@@ -14999,7 +14999,7 @@ _080A959E:
movs r3, 0x26
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -15062,7 +15062,7 @@ _080A9634:
cmp r0, 0
bne _080A9642
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9642:
pop {r4-r6}
pop {r0}
@@ -15118,7 +15118,7 @@ sub_80A9648: @ 80A9648
subs r0, 0x1
strh r0, [r1]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080A96AA:
pop {r4}
pop {r0}
@@ -15134,7 +15134,7 @@ sub_80A96B4: @ 80A96B4
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _080A9750 @ =0x000027de
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
mov r1, sp
strb r0, [r1]
movs r4, 0x1
@@ -15144,7 +15144,7 @@ _080A96CC:
subs r0, r5, r4
lsls r0, 16
lsrs r0, 16
- bl sub_80089B8
+ bl AllocSpritePalette
mov r2, sp
adds r1, r2, r4
strb r0, [r1]
@@ -15153,7 +15153,7 @@ _080A96CC:
ble _080A96CC
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
adds r1, r0, 0
ldr r0, _080A9758 @ =gUnknown_202401C
ldr r0, [r0]
@@ -15162,7 +15162,7 @@ _080A96CC:
adds r0, r2
str r1, [r0]
ldr r0, _080A975C @ =gUnknown_8D227E4
- bl sub_800EBB4
+ bl LZDecompressWram
movs r4, 0
_080A9700:
ldr r5, _080A9758 @ =gUnknown_202401C
@@ -15182,7 +15182,7 @@ _080A9700:
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x1
cmp r4, 0x2
ble _080A9700
@@ -15191,13 +15191,13 @@ _080A9700:
lsls r4, 1
adds r0, r4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
adds r0, r4
movs r1, 0
str r1, [r0]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -15218,13 +15218,13 @@ sub_80A9760: @ 80A9760
movs r4, 0x2
_080A976A:
ldrh r0, [r5]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r5, 0x2
subs r4, 0x1
cmp r4, 0
bge _080A976A
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -15264,7 +15264,7 @@ sub_80A9788: @ 80A9788
lsls r2, 1
adds r2, r0
ldrh r0, [r2]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r2, [r5, 0x5]
movs r1, 0xF
@@ -15288,7 +15288,7 @@ sub_80A97E8: @ 80A97E8
bl sub_8075160
ldr r6, _080A9850 @ =gUnknown_2037F1A
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080A9808
@@ -15318,9 +15318,9 @@ _080A9808:
strh r0, [r5, 0x36]
ldr r0, _080A9858 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080A985C @ =sub_8072740
+ ldr r1, _080A985C @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r1, [r4, 0xA]
ldrb r2, [r4, 0xC]
adds r0, r5, 0
@@ -15332,7 +15332,7 @@ _080A9808:
_080A9850: .4byte gUnknown_2037F1A
_080A9854: .4byte gUnknown_2037F02
_080A9858: .4byte sub_8075590
-_080A985C: .4byte sub_8072740
+_080A985C: .4byte DestroyAnimSprite
thumb_func_end sub_80A97E8
thumb_func_start sub_80A9860
@@ -15353,7 +15353,7 @@ _080A987A:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r2, [r4, 0x32]
lsls r0, r2, 16
@@ -15371,7 +15371,7 @@ _080A987A:
cmp r0, 0x3C
bne _080A98AA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A98AA:
pop {r4}
pop {r0}
@@ -15398,22 +15398,22 @@ _080A98C4:
strh r0, [r4]
ldrh r1, [r1]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080A9920 @ =0x00003f1f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080A9924 @ =0x00003f3f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xC8
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080A9928 @ =gUnknown_3005090
lsls r0, r7, 2
adds r0, r7
@@ -15504,7 +15504,7 @@ sub_80A9984: @ 80A9984
strh r0, [r1, 0x1E]
movs r0, 0x50
movs r1, 0x88
- bl sub_8000A38
+ bl SetGpuReg
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -15515,7 +15515,7 @@ sub_80A9984: @ 80A9984
bl sub_8075BE8
ldr r2, _080A99D4 @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
b _080A9A0C
.align 2, 0
_080A99D0: .4byte gUnknown_3005090
@@ -15530,18 +15530,18 @@ _080A99D8:
ldr r4, _080A9A1C @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9A0C:
add sp, 0xC
pop {r4,r5}
@@ -15560,7 +15560,7 @@ sub_80A9A20: @ 80A9A20
lsrs r0, 24
adds r6, r0, 0
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A9A70 @ =gUnknown_3005090
@@ -15576,7 +15576,7 @@ sub_80A9A20: @ 80A9A20
cmp r0, 0x1
bne _080A9A7C
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -15613,7 +15613,7 @@ _080A9A7C:
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9AA4:
pop {r4-r6}
pop {r0}
@@ -15629,7 +15629,7 @@ sub_80A9AB0: @ 80A9AB0
lsrs r0, 24
adds r6, r0, 0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A9B00 @ =gUnknown_3005090
@@ -15645,7 +15645,7 @@ sub_80A9AB0: @ 80A9AB0
cmp r0, 0x1
bne _080A9B0C
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -15682,7 +15682,7 @@ _080A9B0C:
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9B34:
pop {r4-r6}
pop {r0}
@@ -15717,7 +15717,7 @@ sub_80A9B40: @ 80A9B40
lsrs r0, 24
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080A9B88 @ =sub_80A9B8C
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -15739,7 +15739,7 @@ sub_80A9B8C: @ 80A9B8C
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xE
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -15751,7 +15751,7 @@ sub_80A9B8C: @ 80A9B8C
b _080A9BBC
_080A9BB6:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A9BBC:
pop {r4}
pop {r0}
@@ -15789,7 +15789,7 @@ _080A9BE8:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -15822,7 +15822,7 @@ _080A9C36:
cmp r0, 0x78
ble _080A9C44
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A9C44:
pop {r4}
pop {r0}
@@ -15844,7 +15844,7 @@ sub_80A9C4C: @ 80A9C4C
ldr r1, _080A9C74 @ =sub_8074C44
str r1, [r0, 0x1C]
ldr r1, _080A9C78 @ =sub_80A9C7C
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
@@ -15868,7 +15868,7 @@ sub_80A9C7C: @ 80A9C7C
movs r1, 0x34
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -15903,7 +15903,7 @@ sub_80A9C7C: @ 80A9C7C
cmp r5, 0x40
bgt _080A9CE2
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080A9CE2:
pop {r4,r5}
pop {r0}
@@ -15918,19 +15918,19 @@ sub_80A9CE8: @ 80A9CE8
lsrs r5, r0, 24
ldr r1, _080A9DA0 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x3
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -15938,7 +15938,7 @@ sub_80A9CE8: @ 80A9CE8
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080A9D2A:
ldr r0, _080A9DA4 @ =gUnknown_2022978
movs r1, 0
@@ -15947,10 +15947,10 @@ _080A9D2A:
strh r1, [r4]
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -15968,7 +15968,7 @@ _080A9D2A:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -16059,7 +16059,7 @@ _080A9E04:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -16111,7 +16111,7 @@ _080A9E6A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x1E
ldrsh r1, [r4, r2]
cmp r1, 0
@@ -16146,20 +16146,20 @@ _080A9ED4:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080A9EE8:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080A9F08:
add sp, 0x10
pop {r4,r5}
@@ -16175,19 +16175,19 @@ sub_80A9F10: @ 80A9F10
lsrs r5, r0, 24
ldr r1, _080A9F88 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -16195,7 +16195,7 @@ sub_80A9F10: @ 80A9F10
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080A9F52:
ldr r0, _080A9F8C @ =gUnknown_2022978
movs r1, 0
@@ -16204,10 +16204,10 @@ _080A9F52:
strh r1, [r4]
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
mov r0, sp
bl sub_80752A0
bl sub_8073788
@@ -16216,7 +16216,7 @@ _080A9F52:
beq _080A9F98
ldr r0, _080A9F94 @ =gUnknown_8E7F874
ldr r1, [sp, 0x4]
- bl sub_800EBC0
+ bl LZDecompressVram
b _080A9FC6
.align 2, 0
_080A9F88: .4byte 0x00003f42
@@ -16226,7 +16226,7 @@ _080A9F94: .4byte gUnknown_8E7F874
_080A9F98:
ldr r0, _080A9FB4 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -16256,7 +16256,7 @@ _080A9FC6:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -16344,7 +16344,7 @@ _080AA068:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0xE
@@ -16396,7 +16396,7 @@ _080AA0CE:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x1E
ldrsh r1, [r4, r2]
cmp r1, 0
@@ -16429,20 +16429,20 @@ _080AA134:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AA148:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AA168:
add sp, 0x10
pop {r4,r5}
@@ -16523,14 +16523,14 @@ _080AA1EE:
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r2, 0x30
ldrsh r0, [r4, r2]
ldrh r1, [r4, 0x34]
lsls r1, 16
asrs r1, 24
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x9
@@ -16600,7 +16600,7 @@ _080AA290:
cmp r1, r0
bne _080AA2A0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA2A0:
pop {r4}
pop {r0}
@@ -16631,12 +16631,12 @@ sub_80AA2B0: @ 80AA2B0
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x2E]
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x7
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x30]
ldr r0, _080AA300 @ =sub_80AA304
str r0, [r5, 0x1C]
@@ -16684,7 +16684,7 @@ sub_80AA304: @ 80AA304
bge _080AA348
_080AA342:
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA348:
pop {r0}
bx r0
@@ -16712,7 +16712,7 @@ sub_80AA34C: @ 80AA34C
cmp r0, r1
blt _080AA378
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA378:
pop {r0}
bx r0
@@ -16739,12 +16739,12 @@ sub_80AA37C: @ 80AA37C
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x2E]
movs r1, 0
ldrsh r0, [r4, r1]
movs r1, 0x7
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x30]
ldrh r0, [r4, 0x2]
strh r0, [r5, 0x32]
@@ -16770,7 +16770,7 @@ sub_80AA3D4: @ 80AA3D4
cmp r0, 0
beq _080AA3EA
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA3EA:
pop {r0}
bx r0
@@ -16821,7 +16821,7 @@ _080AA426:
ands r5, r0
adds r0, r5, 0
movs r1, 0x50
- bl sub_8044E30
+ bl Sin
lsls r0, 16
asrs r0, 24
strh r0, [r4, 0x24]
@@ -16831,7 +16831,7 @@ _080AA426:
bgt _080AA46A
adds r0, r5, 0
movs r1, 0x50
- bl sub_8044E4C
+ bl Cos
movs r2, 0x2E
ldrsh r1, [r4, r2]
lsrs r2, r1, 31
@@ -16861,7 +16861,7 @@ _080AA488:
cmp r2, 0x64
ble _080AA492
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA492:
pop {r4,r5}
pop {r0}
@@ -16880,7 +16880,7 @@ sub_80AA49C: @ 80AA49C
movs r1, 0x34
ldrsh r0, [r4, r1]
movs r1, 0x5
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
@@ -16920,7 +16920,7 @@ _080AA4F2:
cmp r0, 0x1E
ble _080AA500
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA500:
pop {r4}
pop {r0}
@@ -16959,7 +16959,7 @@ _080AA52C:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
adds r2, r0, 0
strh r2, [r4, 0x26]
ldrh r0, [r4, 0x34]
@@ -16980,7 +16980,7 @@ _080AA52C:
strh r0, [r4, 0x22]
strh r5, [r4, 0x24]
strh r5, [r4, 0x26]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xB4
@@ -17013,7 +17013,7 @@ sub_80AA58C: @ 80AA58C
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080AA68C @ =gUnknown_2037F1B
ldrb r0, [r0]
bl sub_807685C
@@ -17058,7 +17058,7 @@ _080AA5FC:
movs r1, 0x1E
subs r1, r0
adds r0, r2, 0
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0x30
ldrsh r2, [r4, r0]
@@ -17072,7 +17072,7 @@ _080AA618:
movs r1, 0xA
subs r1, r0
adds r0, r2, 0
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
movs r2, 0x30
ldrsh r0, [r4, r2]
@@ -17142,7 +17142,7 @@ _080AA6A2:
cmp r0, 0x5A
ble _080AA6B0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA6B0:
pop {r4}
pop {r0}
@@ -17168,7 +17168,7 @@ sub_80AA6B8: @ 80AA6B8
strh r0, [r4, 0x22]
ldrb r1, [r1, 0x4]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -17184,7 +17184,7 @@ _080AA6EC:
cmp r0, 0
beq _080AA700
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA700:
pop {r4}
pop {r0}
@@ -17201,7 +17201,7 @@ sub_80AA708: @ 80AA708
cmp r0, 0
bne _080AA724
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080AA788
.align 2, 0
_080AA720: .4byte gUnknown_2037F02
@@ -17253,7 +17253,7 @@ _080AA770:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080AA790 @ =sub_80AA794
str r0, [r5, 0x1C]
_080AA788:
@@ -17284,11 +17284,11 @@ sub_80AA794: @ 80AA794
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _080AA7C4
_080AA7BE:
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA7C4:
pop {r0}
bx r0
@@ -17302,7 +17302,7 @@ sub_80AA7C8: @ 80AA7C8
lsrs r5, 24
ldr r0, _080AA7FC @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -17341,7 +17341,7 @@ sub_80AA80C: @ 80AA80C
cmp r0, 0
bne _080AA82C
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AA82C:
pop {r4}
pop {r0}
@@ -17369,7 +17369,7 @@ _080AA854:
_080AA856:
ldrb r6, [r0]
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -17475,7 +17475,7 @@ sub_80AA900: @ 80AA900
cmp r0, 0x10
ble _080AA934
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA934:
pop {r0}
bx r0
@@ -17524,7 +17524,7 @@ _080AA978:
cmp r1, r0
bne _080AA98C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AA98C:
pop {r4}
pop {r0}
@@ -17553,7 +17553,7 @@ sub_80AA998: @ 80AA998
strh r0, [r6, 0x22]
ldrb r1, [r4, 0x2]
adds r0, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r6, 0x38]
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x34]
@@ -17583,16 +17583,16 @@ _080AA9C6:
ands r4, r2
adds r0, r4, 0
movs r1, 0x64
- bl sub_8044E4C
+ bl Cos
strh r0, [r6, 0x24]
adds r0, r4, 0
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
adds r4, r0, 0
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r1, 0x4
- bl sub_8044E4C
+ bl Cos
ldrh r2, [r6, 0x30]
adds r4, r2
adds r0, r4
@@ -17607,14 +17607,14 @@ _080AA9C6:
str r0, [r6, 0x1C]
strh r5, [r6, 0x2E]
adds r0, r6, 0
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
movs r0, 0x5
strh r0, [r6, 0x32]
strh r5, [r6, 0x36]
strh r5, [r6, 0x34]
adds r0, r6, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080AAA42:
pop {r4-r6}
pop {r0}
@@ -17693,14 +17693,14 @@ _080AAA9E:
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AAAD0:
movs r1, 0x36
ldrsh r0, [r4, r1]
cmp r0, 0x4
bne _080AAADE
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AAADE:
pop {r4}
pop {r0}
@@ -17737,7 +17737,7 @@ sub_80AAAE4: @ 80AAAE4
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080AAB50
.align 2, 0
_080AAB28: .4byte gUnknown_2022B4C
@@ -17767,16 +17767,16 @@ _080AAB50:
strh r0, [r5, 0x36]
ldr r0, _080AAB74 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080AAB78 @ =sub_8072740
+ ldr r1, _080AAB78 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080AAB70: .4byte gUnknown_2037F1A
_080AAB74: .4byte sub_8075590
-_080AAB78: .4byte sub_8072740
+_080AAB78: .4byte DestroyAnimSprite
thumb_func_end sub_80AAAE4
thumb_func_start sub_80AAB7C
@@ -17791,7 +17791,7 @@ sub_80AAB7C: @ 80AAB7C
movs r1, 0x1
ands r1, r2
strh r1, [r3, 0xE]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -17799,8 +17799,8 @@ _080AAB98: .4byte gUnknown_2037F02
_080AAB9C: .4byte gUnknown_2037EE4
thumb_func_end sub_80AAB7C
- thumb_func_start sub_80AABA0
-sub_80AABA0: @ 80AABA0
+ thumb_func_start update_fury_cutter_counter_copy
+update_fury_cutter_counter_copy: @ 80AABA0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -17809,13 +17809,13 @@ sub_80AABA0: @ 80AABA0
ldr r1, [r1]
ldrb r1, [r1, 0x10]
strh r1, [r2, 0xE]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
_080AABB8: .4byte gUnknown_2037F02
_080AABBC: .4byte gUnknown_2037EE4
- thumb_func_end sub_80AABA0
+ thumb_func_end update_fury_cutter_counter_copy
thumb_func_start sub_80AABC0
sub_80AABC0: @ 80AABC0
@@ -17850,7 +17850,7 @@ _080AABE8:
bl __modsi3
cmp r0, 0x1
bne _080AAC30
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -17858,7 +17858,7 @@ _080AABE8:
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x50
@@ -17869,7 +17869,7 @@ _080AABE8:
ldr r0, _080AAC50 @ =gUnknown_83E5898
adds r1, r4, 0
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
_080AAC30:
movs r0, 0x8
ldrsh r1, [r5, r0]
@@ -17878,7 +17878,7 @@ _080AAC30:
cmp r1, r0
bne _080AAC42
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AAC42:
pop {r4-r6}
pop {r0}
@@ -17924,7 +17924,7 @@ _080AAC7E:
cmp r0, 0
beq _080AAC92
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_080AAC92:
pop {r0}
bx r0
@@ -17936,7 +17936,7 @@ sub_80AAC98: @ 80AAC98
adds r6, r0, 0
ldr r5, _080AACC0 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AACC8
@@ -17979,7 +17979,7 @@ _080AACDA:
strb r0, [r2]
ldr r0, _080AADA4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AAD10
@@ -18009,9 +18009,9 @@ _080AAD10:
lsrs r0, 24
strh r0, [r6, 0x36]
adds r0, r6, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080AADAC @ =nullsub_8
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -18019,14 +18019,14 @@ _080AAD10:
ldrb r0, [r5, 0x8]
movs r2, 0x4
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r6, 0x20]
subs r1, r0
strh r1, [r6, 0x20]
ldrb r0, [r5, 0x8]
movs r2, 0x6
ldrsh r1, [r5, r2]
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r6, 0x22]
subs r1, r0
strh r1, [r6, 0x22]
@@ -18091,14 +18091,14 @@ sub_80AADB8: @ 80AADB8
movs r0, 0x2E
ldrsh r1, [r7, r0]
adds r0, r6, 0
- bl sub_8044E30
+ bl Sin
ldrh r1, [r5, 0x24]
adds r0, r1
strh r0, [r5, 0x24]
movs r0, 0x30
ldrsh r1, [r7, r0]
adds r0, r6, 0
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r5, 0x26]
adds r0, r1
strh r0, [r5, 0x26]
@@ -18119,7 +18119,7 @@ _080AAE24:
ldr r0, _080AAE3C @ =sub_80AAE40
str r0, [r5, 0x1C]
adds r0, r7, 0
- bl sub_8007280
+ bl DestroySprite
_080AAE2E:
add sp, 0x4
pop {r3}
@@ -18144,7 +18144,7 @@ sub_80AAE40: @ 80AAE40
ldr r1, _080AAE60 @ =sub_8074F6C
str r1, [r0, 0x1C]
ldr r1, _080AAE64 @ =sub_80AAE68
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
@@ -18159,13 +18159,13 @@ sub_80AAE68: @ 80AAE68
strh r1, [r0, 0x2E]
ldr r1, _080AAE7C @ =sub_8074C44
str r1, [r0, 0x1C]
- ldr r1, _080AAE80 @ =sub_8074EE0
- bl sub_8074A68
+ ldr r1, _080AAE80 @ =move_anim_8074EE0
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080AAE7C: .4byte sub_8074C44
-_080AAE80: .4byte sub_8074EE0
+_080AAE80: .4byte move_anim_8074EE0
thumb_func_end sub_80AAE68
thumb_func_start sub_80AAE84
@@ -18176,7 +18176,7 @@ sub_80AAE84: @ 80AAE84
bl sub_8075160
ldr r0, _080AAEAC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AAEB4
@@ -18218,7 +18218,7 @@ _080AAEBA:
adds r0, r7
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080AAF18 @ =sub_80AAF1C
str r0, [r5, 0x1C]
adds r2, r5, 0
@@ -18250,7 +18250,7 @@ sub_80AAF1C: @ 80AAF1C
bne _080AAF3E
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -18264,7 +18264,7 @@ _080AAF3E:
cmp r0, 0
beq _080AAF50
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AAF50:
pop {r4}
pop {r0}
@@ -18288,7 +18288,7 @@ sub_80AAF60: @ 80AAF60
ldrh r0, [r0]
strh r0, [r4, 0x8]
ldr r0, _080AAF9C @ =0x0000279c
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x80
@@ -18366,7 +18366,7 @@ _080AAFF6:
cmp r1, r0
bne _080AB016
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AB016:
pop {r4-r7}
pop {r0}
@@ -18402,7 +18402,7 @@ sub_80AB024: @ 80AB024
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
movs r0, 0x2E
ldrsh r1, [r5, r0]
movs r0, 0xD2
@@ -18451,14 +18451,14 @@ sub_80AB0AC: @ 80AB0AC
cmp r0, 0
beq _080AB0C0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AB0C0:
ldrh r0, [r4, 0x3A]
lsls r0, 16
asrs r0, 24
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -18533,7 +18533,7 @@ sub_80AB12C: @ 80AB12C
cmp r1, 0
bne _080AB15A
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AB15A:
pop {r0}
bx r0
@@ -18570,7 +18570,7 @@ sub_80AB168: @ 80AB168
cmp r0, 0
bne _080AB1C2
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AB1BC
@@ -18612,7 +18612,7 @@ sub_80AB1DC: @ 80AB1DC
cmp r0, 0
beq _080AB1F2
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AB1F2:
pop {r0}
bx r0
@@ -18624,11 +18624,11 @@ sub_80AB1F8: @ 80AB1F8
adds r6, r0, 0
ldr r5, _080AB2B8 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _080AB2BC @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -18639,12 +18639,12 @@ sub_80AB1F8: @ 80AB1F8
negs r0, r0
strh r0, [r4]
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
beq _080AB23A
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18676,7 +18676,7 @@ _080AB260:
bl sub_8075160
ldr r0, _080AB2B8 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AB27A
@@ -18705,9 +18705,9 @@ _080AB27A:
strh r0, [r6, 0x36]
ldr r0, _080AB2C4 @ =sub_8075590
str r0, [r6, 0x1C]
- ldr r1, _080AB2C8 @ =sub_8072740
+ ldr r1, _080AB2C8 @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r7}
pop {r0}
bx r0
@@ -18716,7 +18716,7 @@ _080AB2B8: .4byte gUnknown_2037F1A
_080AB2BC: .4byte gUnknown_2037F1B
_080AB2C0: .4byte gUnknown_2037F02
_080AB2C4: .4byte sub_8075590
-_080AB2C8: .4byte sub_8072740
+_080AB2C8: .4byte DestroyAnimSprite
thumb_func_end sub_80AB1F8
thumb_func_start sub_80AB2CC
@@ -18737,16 +18737,16 @@ sub_80AB2CC: @ 80AB2CC
strh r1, [r4, 0x36]
ldr r0, _080AB300 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080AB304 @ =sub_8072740
+ ldr r1, _080AB304 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080AB2FC: .4byte gUnknown_2037F02
_080AB300: .4byte sub_8075590
-_080AB304: .4byte sub_8072740
+_080AB304: .4byte DestroyAnimSprite
thumb_func_end sub_80AB2CC
thumb_func_start sub_80AB308
@@ -18794,7 +18794,7 @@ sub_80AB344: @ 80AB344
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x30
@@ -18813,7 +18813,7 @@ sub_80AB344: @ 80AB344
cmp r0, r1
bne _080AB384
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AB384:
pop {r4}
pop {r0}
@@ -18833,19 +18833,19 @@ sub_80AB38C: @ 80AB38C
mov r10, r0
ldr r1, _080AB3FC @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
mov r0, sp
bl sub_80752A0
bl sub_8073788
@@ -18855,10 +18855,10 @@ sub_80AB38C: @ 80AB38C
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080AB400 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -18883,7 +18883,7 @@ _080AB414: .4byte gUnknown_8E81FE4
_080AB418:
ldr r0, _080AB458 @ =gUnknown_8E822B8
ldr r1, [sp, 0x4]
- bl sub_800EBC0
+ bl LZDecompressVram
mov r0, sp
ldrb r0, [r0, 0x8]
ldr r1, [sp, 0x4]
@@ -18907,7 +18907,7 @@ _080AB42E:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _080AB476
.align 2, 0
_080AB458: .4byte gUnknown_8E822B8
@@ -18920,7 +18920,7 @@ _080AB468:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
_080AB476:
ldr r0, _080AB4E4 @ =sub_80AB79C
ldr r4, _080AB4E8 @ =gUnknown_3005090
@@ -18933,7 +18933,7 @@ _080AB476:
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -18982,7 +18982,7 @@ _080AB4F4: .4byte gUnknown_202297A
_080AB4F8:
ldr r0, _080AB528 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -19024,11 +19024,11 @@ _080AB552:
ldr r0, _080AB584 @ =gUnknown_2022978
ldrh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, _080AB58C @ =gUnknown_202297A
ldrh r1, [r2]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080AB594 @ =gUnknown_3005090
mov r2, r8
lsls r0, r2, 2
@@ -19280,7 +19280,7 @@ _080AB74C:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AB760:
movs r0, 0
strh r0, [r7]
@@ -19288,10 +19288,10 @@ _080AB760:
strh r0, [r1]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 2
@@ -19301,7 +19301,7 @@ _080AB760:
ldr r1, _080AB798 @ =0x0000ffff
strh r1, [r0, 0x26]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AB78E:
pop {r3}
mov r8, r3
@@ -19686,9 +19686,9 @@ _080ABA50:
negs r0, r0
cmp r1, r0
bne _080ABA66
- bl sub_8087E64
+ bl remove_some_task
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
_080ABA66:
add sp, 0xC
pop {r4-r7}
@@ -19717,14 +19717,14 @@ sub_80ABA78: @ 80ABA78
adds r0, r4, 0
movs r1, 0x1
bl sub_8075114
- bl sub_8044EC8
+ bl Random
movs r5, 0xFF
ands r5, r0
movs r0, 0x80
lsls r0, 1
adds r6, r0, 0
orrs r5, r6
- bl sub_8044EC8
+ bl Random
ldr r1, _080ABAD4 @ =0x000001ff
ands r1, r0
adds r0, r1, 0
@@ -19785,7 +19785,7 @@ _080ABB04:
cmp r0, 0x15
bne _080ABB22
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ABB22:
pop {r4}
pop {r0}
@@ -19803,7 +19803,7 @@ sub_80ABB28: @ 80ABB28
ldr r0, _080ABB78 @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -20118,7 +20118,7 @@ _080ABDB0:
cmp r0, 0
bne _080ABDBE
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080ABDBE:
add sp, 0xC
pop {r4-r6}
@@ -20131,7 +20131,7 @@ sub_80ABDC8: @ 80ABDC8
push {r4,r5,lr}
ldr r4, _080ABDEC @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080ABDFC
@@ -20164,12 +20164,12 @@ _080ABE0C:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
lsrs r4, 18
@@ -20252,7 +20252,7 @@ _080ABEB6:
mov r1, r10
mov r2, r9
ldr r3, [sp, 0x8]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
lsls r6, r5, 16
@@ -20275,11 +20275,11 @@ _080ABEB6:
asrs r4, r6, 16
adds r0, r4, 0
movs r1, 0x40
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x36]
adds r0, r4, 0
movs r1, 0x40
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x38]
mov r1, sp
ldrh r1, [r1]
@@ -20413,7 +20413,7 @@ _080ABFDE:
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AC002:
pop {r4}
pop {r0}
@@ -20438,7 +20438,7 @@ sub_80AC00C: @ 80AC00C
strh r0, [r4, 0xA]
ldr r0, _080AC040 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AC044
@@ -20527,7 +20527,7 @@ _080AC0AE:
ldr r6, _080AC140 @ =sub_80B94B4
adds r0, r6, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -20548,7 +20548,7 @@ _080AC0F8:
strh r0, [r5]
adds r0, r6, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -20588,7 +20588,7 @@ _080AC148:
cmp r0, 0
bne _080AC156
adds r0, r1, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AC156:
pop {r3}
mov r8, r3
@@ -20621,7 +20621,7 @@ sub_80AC160: @ 80AC160
ldrsh r1, [r4, r2]
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -20708,7 +20708,7 @@ sub_80AC204: @ 80AC204
movs r3, 0x22
ldrsh r2, [r5, r3]
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x30]
@@ -20722,7 +20722,7 @@ sub_80AC204: @ 80AC204
ldr r4, _080AC2A8 @ =gUnknown_202063C
adds r0, r4
movs r1, 0x3
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r2, 0x30
ldrsh r1, [r5, r2]
lsls r0, r1, 4
@@ -20750,7 +20750,7 @@ sub_80AC204: @ 80AC204
str r1, [r0]
_080AC294:
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_080AC29A:
pop {r4,r5}
pop {r0}
@@ -20813,9 +20813,9 @@ sub_80AC2B0: @ 80AC2B0
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AC31C:
pop {r4}
pop {r0}
@@ -20849,7 +20849,7 @@ sub_80AC328: @ 80AC328
lsrs r0, 24
strh r0, [r5, 0x10]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -21055,7 +21055,7 @@ _080AC4EE:
b _080AC4FC
_080AC4F6:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AC4FC:
pop {r4}
pop {r0}
@@ -21081,7 +21081,7 @@ sub_80AC504: @ 80AC504
movs r3, 0x10
ldrsh r2, [r6, r3]
movs r3, 0xA
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -21121,7 +21121,7 @@ _080AC56C: .4byte sub_80AC570
sub_80AC570: @ 80AC570
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080AC5CA
@@ -21135,7 +21135,7 @@ sub_80AC570: @ 80AC570
strh r0, [r6, 0x22]
movs r0, 0x6
strh r0, [r6, 0x2E]
- bl sub_8044EC8
+ bl Random
movs r4, 0x1F
adds r1, r4, 0
ands r1, r0
@@ -21144,13 +21144,13 @@ sub_80AC570: @ 80AC570
ldrh r0, [r6, 0x20]
adds r1, r0
strh r1, [r6, 0x32]
- bl sub_8044EC8
+ bl Random
ands r4, r0
adds r4, r5
ldrh r1, [r6, 0x22]
adds r4, r1
strh r4, [r6, 0x36]
- bl sub_8044EC8
+ bl Random
movs r1, 0x7
ands r1, r0
mvns r1, r1
@@ -21172,7 +21172,7 @@ _080AC5D4: .4byte sub_80AC5D8
sub_80AC5D8: @ 80AC5D8
push {r4-r6,lr}
adds r5, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080AC614
@@ -21193,7 +21193,7 @@ _080AC5EA:
subs r0, 0x1
strh r0, [r2, 0x18]
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_080AC60A:
adds r0, r4, 0x1
lsls r0, 16
@@ -21255,7 +21255,7 @@ sub_80AC64C: @ 80AC64C
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x34]
subs r0, 0x1
@@ -21264,7 +21264,7 @@ sub_80AC64C: @ 80AC64C
cmp r0, 0
bne _080AC690
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AC690:
pop {r4}
pop {r0}
@@ -21296,9 +21296,9 @@ sub_80AC698: @ 80AC698
cmp r0, 0
bne _080AC6D0
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AC6D0:
pop {r4}
pop {r0}
@@ -21391,7 +21391,7 @@ _080AC778:
cmp r1, r0
bne _080AC78A
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AC78A:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -21430,7 +21430,7 @@ sub_80AC798: @ 80AC798
lsls r1, 16
lsrs r1, 16
mov r10, r1
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -21440,7 +21440,7 @@ sub_80AC798: @ 80AC798
lsls r0, 16
lsrs r0, 16
mov r9, r0
- bl sub_8044EC8
+ bl Random
negs r4, r4
lsls r0, 16
lsrs r0, 16
@@ -21477,7 +21477,7 @@ _080AC826:
mov r3, r10
asrs r2, r3, 16
movs r3, 0x82
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080AC86C @ =gUnknown_202063C
@@ -21535,7 +21535,7 @@ _080AC89C:
mov r3, r10
asrs r2, r3, 16
movs r3, 0x82
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080AC8E4 @ =gUnknown_202063C
@@ -21600,9 +21600,9 @@ sub_80AC90C: @ 80AC90C
movs r0, 0xFE
lsls r0, 8
strh r0, [r4, 0x36]
- ldr r1, _080AC944 @ =sub_8072740
+ ldr r1, _080AC944 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080AC948 @ =sub_8074AE0
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -21612,7 +21612,7 @@ sub_80AC90C: @ 80AC90C
bx r0
.align 2, 0
_080AC940: .4byte gUnknown_2037F02
-_080AC944: .4byte sub_8072740
+_080AC944: .4byte DestroyAnimSprite
_080AC948: .4byte sub_8074AE0
thumb_func_end sub_80AC90C
@@ -21637,16 +21637,16 @@ sub_80AC94C: @ 80AC94C
strh r0, [r4, 0x32]
ldr r0, _080AC988 @ =sub_8074D00
str r0, [r4, 0x1C]
- ldr r1, _080AC98C @ =sub_8072740
+ ldr r1, _080AC98C @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080AC984: .4byte gUnknown_2037F02
_080AC988: .4byte sub_8074D00
-_080AC98C: .4byte sub_8072740
+_080AC98C: .4byte DestroyAnimSprite
thumb_func_end sub_80AC94C
thumb_func_start sub_80AC990
@@ -21656,7 +21656,7 @@ sub_80AC990: @ 80AC990
bl sub_8074FCC
ldr r0, _080AC9C4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AC9CC
@@ -21712,7 +21712,7 @@ sub_80ACA00: @ 80ACA00
adds r4, r0, 0
ldr r0, _080ACA2C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080ACA34
@@ -21791,7 +21791,7 @@ _080ACA92:
cmp r1, r0
bne _080ACAA4
adds r0, r2, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080ACAA4:
pop {r0}
bx r0
@@ -21804,7 +21804,7 @@ sub_80ACAA8: @ 80ACAA8
bl sub_8074FCC
ldr r0, _080ACACC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080ACAD4
@@ -21882,7 +21882,7 @@ _080ACB3A:
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -21893,7 +21893,7 @@ _080ACB3A:
adds r1, r2
lsls r1, 16
asrs r1, 16
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
ldrh r2, [r4, 0x2E]
@@ -21927,7 +21927,7 @@ _080ACB9C:
b _080ACBAA
_080ACBA4:
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080ACBAA:
pop {r4}
pop {r0}
@@ -21948,13 +21948,13 @@ sub_80ACBB0: @ 80ACBB0
strh r1, [r0, 0x36]
ldr r1, _080ACBD4 @ =sub_8075590
str r1, [r0, 0x1C]
- ldr r1, _080ACBD8 @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _080ACBD8 @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080ACBD4: .4byte sub_8075590
-_080ACBD8: .4byte sub_8072740
+_080ACBD8: .4byte DestroyAnimSprite
thumb_func_end sub_80ACBB0
thumb_func_start sub_80ACBDC
@@ -21963,24 +21963,24 @@ sub_80ACBDC: @ 80ACBDC
adds r6, r0, 0
ldr r5, _080ACC34 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _080ACC38 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _080ACC22
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
cmp r1, r0
beq _080ACC1A
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
ldrb r1, [r5]
lsls r0, 24
lsrs r0, 24
@@ -22076,7 +22076,7 @@ sub_80ACC88: @ 80ACC88
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080ACCDC @ =sub_80ACCE0
str r0, [r5, 0x1C]
_080ACCD2:
@@ -22125,14 +22125,14 @@ _080ACD28:
movs r1, 0x3C
ldrsh r0, [r6, r1]
movs r1, 0x1C
- bl sub_8044E30
+ bl Sin
ldrh r1, [r6, 0x24]
adds r0, r1
strh r0, [r6, 0x24]
movs r1, 0x3C
ldrsh r0, [r6, r1]
movs r1, 0x1C
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r6, 0x26]
adds r0, r1
strh r0, [r6, 0x26]
@@ -22160,7 +22160,7 @@ sub_80ACD58: @ 80ACD58
cmp r0, 0x1F
bne _080ACD74
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ACD74:
pop {r4}
pop {r0}
@@ -22174,12 +22174,12 @@ sub_80ACD7C: @ 80ACD7C
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r1, 0x1C
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r1, 0x1C
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3C]
adds r0, 0x14
@@ -22210,9 +22210,9 @@ sub_80ACDA8: @ 80ACDA8
strh r0, [r4, 0x30]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x32]
- ldr r1, _080ACDE0 @ =sub_8072740
+ ldr r1, _080ACDE0 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080ACDE4 @ =sub_8074CD0
str r0, [r4, 0x1C]
pop {r4}
@@ -22220,7 +22220,7 @@ sub_80ACDA8: @ 80ACDA8
bx r0
.align 2, 0
_080ACDDC: .4byte gUnknown_2037F02
-_080ACDE0: .4byte sub_8072740
+_080ACDE0: .4byte DestroyAnimSprite
_080ACDE4: .4byte sub_8074CD0
thumb_func_end sub_80ACDA8
@@ -22245,7 +22245,7 @@ sub_80ACDE8: @ 80ACDE8
str r0, [r4, 0x1C]
ldr r1, _080ACE24 @ =sub_80ACE28
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -22287,14 +22287,14 @@ sub_80ACE50: @ 80ACE50
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0xA
@@ -22314,7 +22314,7 @@ sub_80ACE50: @ 80ACE50
cmp r0, r1
bne _080ACE9C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ACE9C:
pop {r4}
pop {r0}
@@ -22332,7 +22332,7 @@ sub_80ACEA4: @ 80ACEA4
ldr r0, _080ACF04 @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -22352,7 +22352,7 @@ sub_80ACEA4: @ 80ACEA4
strh r0, [r4, 0x10]
ldr r0, _080ACF0C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x12]
@@ -22741,7 +22741,7 @@ _080AD1E0:
cmp r0, 0
bne _080AD1EE
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AD1EE:
add sp, 0xC
pop {r4,r5}
@@ -22778,7 +22778,7 @@ sub_80AD1F8: @ 80AD1F8
ldrh r4, [r0, 0x20]
ldr r0, _080AD24C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AD250
@@ -22820,7 +22820,7 @@ _080AD278:
ldr r3, [sp, 0x4]
asrs r2, r3, 16
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -22930,7 +22930,7 @@ sub_80AD330: @ 80AD330
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AD36A:
pop {r4}
pop {r0}
@@ -22960,7 +22960,7 @@ sub_80AD374: @ 80AD374
lsrs r4, r0, 16
ldr r0, _080AD3B0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AD3B4
@@ -23187,7 +23187,7 @@ _080AD524:
cmp r0, 0x10
ble _080AD538
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AD538:
pop {r4}
pop {r0}
@@ -23218,12 +23218,12 @@ _080AD55C:
ldr r4, _080AD584 @ =gUnknown_2037F02
ldrb r1, [r4, 0x4]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x4]
strh r0, [r5, 0x3C]
ldr r0, _080AD588 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AD58C
@@ -23258,7 +23258,7 @@ _080AD5B4:
strh r0, [r5, 0x30]
ldr r0, _080AD5D4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AD5D8
@@ -23279,7 +23279,7 @@ _080AD5DE:
ldrsh r0, [r5, r2]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
ldrh r0, [r5, 0x32]
adds r0, 0x4
@@ -23305,7 +23305,7 @@ _080AD612:
ldrsh r0, [r5, r1]
movs r2, 0x36
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
adds r2, r0, 0
movs r3, 0
strh r2, [r5, 0x24]
@@ -23373,7 +23373,7 @@ sub_80AD690: @ 80AD690
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0x10
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -23401,13 +23401,13 @@ _080AD6C6:
movs r1, 0
ldrsb r1, [r0, r1]
movs r0, 0x89
- bl sub_80722F4
+ bl PlaySE12WithPanning
b _080AD6EE
.align 2, 0
_080AD6E4: .4byte gUnknown_2037F24
_080AD6E8:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AD6EE:
pop {r4}
pop {r0}
@@ -23442,14 +23442,14 @@ _080AD70C:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 24
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
ldrh r1, [r4, 0x36]
lsls r1, 16
asrs r1, 24
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x7
@@ -23545,7 +23545,7 @@ _080AD7EC:
cmp r0, 0x1E
bne _080AD7FA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AD7FA:
pop {r4}
pop {r0}
@@ -23564,7 +23564,7 @@ sub_80AD800: @ 80AD800
adds r4, r1, r0
ldr r0, _080AD864 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -23584,12 +23584,12 @@ _080AD826:
adds r0, 0x1
strh r0, [r4, 0x22]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
movs r0, 0x3
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -23901,7 +23901,7 @@ _080ADA68:
blt _080ADA68
_080ADA92:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080ADA98:
pop {r4-r7}
pop {r0}
@@ -23926,9 +23926,9 @@ sub_80ADAA4: @ 80ADAA4
ldrb r2, [r1]
ldrh r3, [r1, 0x2]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0x10
pop {r4}
pop {r0}
@@ -24063,7 +24063,7 @@ _080ADBB2:
strh r1, [r0, 0x24]
strh r1, [r0, 0x26]
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080ADBD8:
pop {r3-r5}
mov r8, r3
@@ -24082,7 +24082,7 @@ sub_80ADBEC: @ 80ADBEC
adds r4, r0, 0
ldr r0, _080ADC0C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080ADC14
@@ -24128,7 +24128,7 @@ sub_80ADC3C: @ 80ADC3C
cmp r0, 0
beq _080ADC52
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ADC52:
pop {r0}
bx r0
@@ -24140,7 +24140,7 @@ sub_80ADC58: @ 80ADC58
adds r4, r0, 0
ldr r0, _080ADC78 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080ADC80
@@ -24181,7 +24181,7 @@ sub_80ADC9C: @ 80ADC9C
cmp r0, 0
beq _080ADCB2
adds r0, r2, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080ADCB2:
pop {r0}
bx r0
@@ -24206,7 +24206,7 @@ sub_80ADCB8: @ 80ADCB8
strh r0, [r5, 0x22]
ldr r0, _080ADD00 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080ADD08
@@ -24244,9 +24244,9 @@ _080ADD1C:
strh r0, [r5, 0x32]
ldrh r0, [r2, 0x8]
strh r0, [r5, 0x34]
- ldr r1, _080ADD44 @ =sub_8074EE0
+ ldr r1, _080ADD44 @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080ADD48 @ =sub_8074A80
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -24254,7 +24254,7 @@ _080ADD1C:
bx r0
.align 2, 0
_080ADD40: .4byte gUnknown_2037F02
-_080ADD44: .4byte sub_8074EE0
+_080ADD44: .4byte move_anim_8074EE0
_080ADD48: .4byte sub_8074A80
thumb_func_end sub_80ADCB8
@@ -24463,7 +24463,7 @@ sub_80ADEB0: @ 80ADEB0
lsrs r0, 24
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldrh r0, [r5, 0x4]
strh r0, [r4, 0x38]
ldrh r0, [r5, 0xA]
@@ -24511,7 +24511,7 @@ sub_80ADF38: @ 80ADF38
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -24519,7 +24519,7 @@ sub_80ADF38: @ 80ADF38
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -24552,7 +24552,7 @@ sub_80ADF38: @ 80ADF38
b _080ADFA8
_080ADFA2:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ADFA8:
pop {r4}
pop {r0}
@@ -24597,7 +24597,7 @@ _080ADFE8:
cmp r0, 0
bgt _080ADFFA
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080ADFFA:
pop {r0}
bx r0
@@ -24613,7 +24613,7 @@ sub_80AE000: @ 80AE000
bne _080AE01C
ldr r0, _080AE060 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AE024
@@ -24685,7 +24685,7 @@ _080AE092:
cmp r0, 0
bne _080AE0AA
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AE0B2
@@ -24760,13 +24760,13 @@ sub_80AE130: @ 80AE130
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3A]
ldrh r1, [r4, 0x3C]
@@ -24802,7 +24802,7 @@ _080AE186:
cmp r0, 0
bgt _080AE198
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AE198:
pop {r4}
pop {r0}
@@ -24861,16 +24861,16 @@ _080AE1FA:
strh r0, [r4, 0x2E]
ldr r0, _080AE218 @ =sub_8074C44
str r0, [r4, 0x1C]
- ldr r1, _080AE21C @ =sub_8072740
+ ldr r1, _080AE21C @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080AE214: .4byte gUnknown_2037F02
_080AE218: .4byte sub_8074C44
-_080AE21C: .4byte sub_8072740
+_080AE21C: .4byte DestroyAnimSprite
thumb_func_end sub_80AE1A0
thumb_func_start sub_80AE220
@@ -25063,7 +25063,7 @@ _080AE396:
lsls r2, 16
asrs r2, 16
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
adds r0, r7, 0x1
@@ -25074,7 +25074,7 @@ _080AE396:
_080AE3B0: .4byte gUnknown_83E60A0
_080AE3B4:
mov r0, r9
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080AE400
_080AE3BC:
cmp r7, 0
@@ -25166,7 +25166,7 @@ _080AE456:
cmp r0, 0xF
bne _080AE46A
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080AE46A:
pop {r0}
bx r0
@@ -25194,7 +25194,7 @@ sub_80AE470: @ 80AE470
adds r3, r4, 0
adds r3, 0x43
ldrb r3, [r3]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r3, _080AE4E0 @ =gUnknown_202063C
@@ -25272,7 +25272,7 @@ _080AE528:
cmp r0, 0x33
bne _080AE53C
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AE53C:
pop {r0}
bx r0
@@ -25370,7 +25370,7 @@ sub_80AE5BC: @ 80AE5BC
movs r3, 0x26
ldrsh r2, [r5, r3]
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -25415,10 +25415,10 @@ sub_80AE5BC: @ 80AE5BC
strh r0, [r4, 0x36]
strh r6, [r4, 0x38]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r1, _080AE6B4 @ =sub_80AE704
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080AE6B8 @ =sub_8074F6C
str r0, [r4, 0x1C]
ldrh r0, [r5, 0x1A]
@@ -25468,7 +25468,7 @@ _080AE6BC:
cmp r0, 0
bne _080AE6CA
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AE6CA:
pop {r4-r7}
pop {r0}
@@ -25494,7 +25494,7 @@ sub_80AE6D0: @ 80AE6D0
subs r1, 0x1
strh r1, [r0, 0x16]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AE6F8:
pop {r4}
pop {r0}
@@ -25508,7 +25508,7 @@ sub_80AE704: @ 80AE704
push {r4,lr}
adds r4, r0, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080AE718 @ =sub_80AE6D0
str r0, [r4, 0x1C]
pop {r4}
@@ -25547,9 +25547,9 @@ _080AE73A:
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
- ldr r1, _080AE76C @ =sub_8074EE0
+ ldr r1, _080AE76C @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080AE770 @ =sub_8074F50
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -25557,7 +25557,7 @@ _080AE73A:
bx r0
.align 2, 0
_080AE768: .4byte gUnknown_2037F1B
-_080AE76C: .4byte sub_8074EE0
+_080AE76C: .4byte move_anim_8074EE0
_080AE770: .4byte sub_8074F50
thumb_func_end sub_80AE71C
@@ -25595,9 +25595,9 @@ _080AE792:
strh r0, [r5, 0x24]
ldrh r0, [r1, 0x4]
strh r0, [r5, 0x26]
- ldr r1, _080AE7D4 @ =sub_8072740
+ ldr r1, _080AE7D4 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080AE7D8 @ =sub_8074F6C
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -25606,7 +25606,7 @@ _080AE792:
.align 2, 0
_080AE7CC: .4byte gUnknown_2037F1B
_080AE7D0: .4byte gUnknown_2037F02
-_080AE7D4: .4byte sub_8072740
+_080AE7D4: .4byte DestroyAnimSprite
_080AE7D8: .4byte sub_8074F6C
thumb_func_end sub_80AE774
@@ -25615,7 +25615,7 @@ sub_80AE7DC: @ 80AE7DC
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r4, _080AE834 @ =gUnknown_2037F1A
ldrb r0, [r4]
movs r1, 0x2
@@ -25630,14 +25630,14 @@ sub_80AE7DC: @ 80AE7DC
lsrs r0, 24
strh r0, [r5, 0x22]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
movs r0, 0x10
strh r0, [r5, 0x3C]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -25703,7 +25703,7 @@ _080AE864:
cmp r0, r1
bls _080AE894
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080AE894:
pop {r4}
pop {r0}
@@ -25743,7 +25743,7 @@ _080AE8D2:
b _080AEA04
_080AE8D4:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -25756,7 +25756,7 @@ _080AE8D4:
lsrs r0, 24
strh r0, [r5, 0x24]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AE910
@@ -25891,7 +25891,7 @@ _080AE9E4:
ands r1, r2
strb r1, [r0]
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AEA04:
pop {r4-r6}
pop {r0}
@@ -25932,7 +25932,7 @@ _080AEA3E:
_080AEA40:
ldr r4, _080AEA80 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -26097,7 +26097,7 @@ _080AEB84:
cmp r0, 0
bne _080AEB92
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AEB92:
pop {r4-r6}
pop {r0}
@@ -26116,7 +26116,7 @@ sub_80AEB98: @ 80AEB98
movs r3, 0x12
ldrsh r2, [r4, r3]
movs r3, 0x23
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -26220,9 +26220,9 @@ sub_80AEC34: @ 80AEC34
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AEC74:
pop {r4}
pop {r0}
@@ -26258,7 +26258,7 @@ _080AEC92:
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldrh r0, [r5, 0x2E]
adds r0, 0x1
strh r0, [r5, 0x2E]
@@ -26274,7 +26274,7 @@ _080AECC4:
cmp r0, 0
beq _080AECD8
adds r0, r5, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080AECD8:
pop {r4,r5}
pop {r0}
@@ -26464,7 +26464,7 @@ _080AEE48:
cmp r0, 0
bne _080AEE6C
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080AEE6C
_080AEE58:
ldrh r1, [r5, 0x1E]
@@ -26498,7 +26498,7 @@ sub_80AEE74: @ 80AEE74
movs r3, 0x16
ldrsh r2, [r4, r3]
movs r3, 0x23
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -26559,7 +26559,7 @@ _080AEEE0:
lsls r1, 24
asrs r1, 24
movs r0, 0x6F
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080AEF02:
movs r0, 0x12
ldrsh r3, [r4, r0]
@@ -26636,7 +26636,7 @@ sub_80AEF60: @ 80AEF60
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AEF96:
pop {r4}
pop {r0}
@@ -26736,7 +26736,7 @@ _080AF044:
cmp r0, 0
bne _080AF052
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AF052:
pop {r4,r5}
pop {r0}
@@ -26757,7 +26757,7 @@ sub_80AF058: @ 80AF058
ldrh r3, [r4, 0x20]
lsls r3, 24
lsrs r3, 24
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -26829,7 +26829,7 @@ sub_80AF0C8: @ 80AF0C8
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080AF0FC:
pop {r4}
pop {r0}
@@ -27053,7 +27053,7 @@ sub_80AF28C: @ 80AF28C
ldrsh r0, [r4, r1]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -27061,7 +27061,7 @@ sub_80AF28C: @ 80AF28C
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -27077,7 +27077,7 @@ sub_80AF28C: @ 80AF28C
b _080AF2EA
_080AF2E4:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AF2EA:
pop {r4}
pop {r0}
@@ -27100,9 +27100,9 @@ sub_80AF2F0: @ 80AF2F0
movs r0, 0xFE
lsls r0, 8
strh r0, [r4, 0x36]
- ldr r1, _080AF328 @ =sub_8072740
+ ldr r1, _080AF328 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080AF32C @ =sub_8074AE0
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -27112,7 +27112,7 @@ sub_80AF2F0: @ 80AF2F0
bx r0
.align 2, 0
_080AF324: .4byte gUnknown_2037F02
-_080AF328: .4byte sub_8072740
+_080AF328: .4byte DestroyAnimSprite
_080AF32C: .4byte sub_8074AE0
thumb_func_end sub_80AF2F0
@@ -27131,7 +27131,7 @@ sub_80AF330: @ 80AF330
strh r0, [r4, 0x32]
ldr r0, _080AF368 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF370
@@ -27164,9 +27164,9 @@ _080AF37A:
strh r0, [r4, 0x36]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x2E]
- ldr r1, _080AF3B0 @ =sub_8072740
+ ldr r1, _080AF3B0 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080AF3B4 @ =sub_8075590
str r0, [r4, 0x1C]
pop {r4}
@@ -27175,7 +27175,7 @@ _080AF37A:
.align 2, 0
_080AF3A8: .4byte gUnknown_2037F02
_080AF3AC: .4byte gUnknown_2037F1B
-_080AF3B0: .4byte sub_8072740
+_080AF3B0: .4byte DestroyAnimSprite
_080AF3B4: .4byte sub_8075590
thumb_func_end sub_80AF330
@@ -27205,7 +27205,7 @@ _080AF3D4:
bl sub_8076D9C
ldr r0, _080AF420 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF3FA
@@ -27224,7 +27224,7 @@ _080AF3FA:
_080AF40A:
ldr r1, _080AF424 @ =sub_80AF42C
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080AF428 @ =sub_8074F50
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -27264,7 +27264,7 @@ sub_80AF42C: @ 80AF42C
cmp r0, 0x14
bne _080AF462
adds r0, r3, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080AF462:
pop {r0}
bx r0
@@ -27319,7 +27319,7 @@ _080AF4B8:
_080AF4CA:
ldr r0, _080AF4E8 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF4F0
@@ -27415,7 +27415,7 @@ _080AF57A:
bge _080AF57A
str r6, [r5, 0x1C]
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
add sp, 0x10
pop {r4-r7}
pop {r0}
@@ -27445,7 +27445,7 @@ sub_80AF5A4: @ 80AF5A4
strh r0, [r4, 0x2E]
ldr r0, _080AF600 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _080AF604 @ =0x0000ffec
cmp r0, 0
@@ -27456,12 +27456,12 @@ _080AF5D4:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x34]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x36]
strh r5, [r4, 0x38]
ldr r1, _080AF608 @ =sub_80AF60C
@@ -27483,7 +27483,7 @@ sub_80AF60C: @ 80AF60C
adds r4, r0, 0
ldr r0, _080AF660 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _080AF664 @ =0x0000ffec
cmp r0, 0
@@ -27498,14 +27498,14 @@ _080AF622:
ldrsh r0, [r4, r2]
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x34]
subs r0, r1
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x36]
subs r0, r1
strh r0, [r4, 0x26]
@@ -27578,7 +27578,7 @@ sub_80AF690: @ 80AF690
bge _080AF6D2
_080AF6CC:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AF6D2:
pop {r4}
pop {r0}
@@ -27632,7 +27632,7 @@ _080AF724:
_080AF736:
ldr r0, _080AF758 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF760
@@ -27761,7 +27761,7 @@ _080AF830:
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -27798,7 +27798,7 @@ _080AF830:
bge _080AF886
_080AF880:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AF886:
pop {r4}
pop {r0}
@@ -27835,7 +27835,7 @@ _080AF8B0:
bl sub_8076D9C
ldr r0, _080AF8F4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF8D6
@@ -27868,7 +27868,7 @@ _080AF8F8:
cmp r0, 0
beq _080AF90C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AF90C:
pop {r4,r5}
pop {r0}
@@ -27904,7 +27904,7 @@ _080AF938:
movs r1, 0
bl sub_8076D9C
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF964
@@ -27950,7 +27950,7 @@ _080AF996:
movs r1, 0
bl sub_8076D9C
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080AF9C0
@@ -27997,7 +27997,7 @@ _080AF9FA:
strh r0, [r5, 0x3A]
ldr r0, _080AFA40 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080AFA10
@@ -28017,7 +28017,7 @@ _080AFA10:
adds r0, r1
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
movs r0, 0x40
strh r0, [r5, 0x38]
ldr r1, _080AFA48 @ =sub_80AFA4C
@@ -28045,7 +28045,7 @@ sub_80AFA4C: @ 80AFA4C
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -28053,7 +28053,7 @@ sub_80AFA4C: @ 80AFA4C
ldrsh r0, [r4, r2]
movs r1, 0x6
negs r1, r1
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -28103,7 +28103,7 @@ _080AFACA:
b _080AFADC
_080AFAD6:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080AFADC:
pop {r4}
pop {r0}
@@ -28118,19 +28118,19 @@ sub_80AFAE4: @ 80AFAE4
lsrs r5, r0, 24
ldr r1, _080AFBA0 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -28138,7 +28138,7 @@ sub_80AFAE4: @ 80AFAE4
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AFB26:
ldr r0, _080AFBA4 @ =gUnknown_2022978
movs r1, 0
@@ -28147,10 +28147,10 @@ _080AFB26:
strh r1, [r4]
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -28160,7 +28160,7 @@ _080AFB26:
lsls r2, 4
mov r3, sp
ldrh r3, [r3, 0xA]
- bl sub_80017D0
+ bl LoadBgTiles
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AFBB0 @ =gUnknown_8E7F1F4
@@ -28170,7 +28170,7 @@ _080AFB26:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -28277,7 +28277,7 @@ _080AFC32:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0x9
@@ -28331,7 +28331,7 @@ _080AFC92:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x1E
ldrsh r1, [r4, r2]
cmp r1, 0
@@ -28364,7 +28364,7 @@ _080AFCF8:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AFD0C:
ldr r0, _080AFD44 @ =gUnknown_2022978
movs r1, 0
@@ -28373,16 +28373,16 @@ _080AFD0C:
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AFD36:
add sp, 0x10
pop {r4,r5}
@@ -28429,19 +28429,19 @@ sub_80AFD80: @ 80AFD80
lsrs r5, r0, 24
ldr r1, _080AFE40 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -28449,7 +28449,7 @@ sub_80AFD80: @ 80AFD80
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AFDC2:
ldr r0, _080AFE44 @ =gUnknown_2022978
movs r1, 0
@@ -28458,10 +28458,10 @@ _080AFDC2:
strh r1, [r4]
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -28471,7 +28471,7 @@ _080AFDC2:
lsls r2, 4
mov r3, sp
ldrh r3, [r3, 0xA]
- bl sub_80017D0
+ bl LoadBgTiles
mov r0, sp
ldrb r0, [r0, 0x9]
ldr r1, _080AFE50 @ =gUnknown_8E7F1F4
@@ -28481,7 +28481,7 @@ _080AFDC2:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -28577,7 +28577,7 @@ _080AFEB4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0x5
@@ -28632,7 +28632,7 @@ _080AFF1A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x1E
ldrsh r1, [r4, r2]
cmp r1, 0
@@ -28665,7 +28665,7 @@ _080AFF80:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080AFF94:
ldr r0, _080AFFCC @ =gUnknown_2022978
movs r1, 0
@@ -28674,16 +28674,16 @@ _080AFF94:
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080AFFBE:
add sp, 0x10
pop {r4,r5}
@@ -28753,7 +28753,7 @@ _080B0008:
cmp r0, 0
bne _080B0064
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B00CC @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -28861,7 +28861,7 @@ _080B00F8:
strb r0, [r1]
_080B012C:
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080B0144 @ =sub_80B0148
str r0, [r5, 0x1C]
pop {r3}
@@ -28989,7 +28989,7 @@ _080B0202:
ands r0, r1
strh r0, [r4, 0x38]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
b _080B0380
.align 2, 0
_080B022C: .4byte gUnknown_825E074
@@ -29149,7 +29149,7 @@ _080B0344:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
movs r0, 0x4
negs r0, r0
@@ -29157,7 +29157,7 @@ _080B0344:
strb r0, [r4, 0x1]
_080B0372:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080B0388 @ =gUnknown_2037EE2
ldrb r0, [r1]
subs r0, 0x1
@@ -29278,7 +29278,7 @@ _080B0442:
cmp r0, 0
bne _080B0450
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B0450:
pop {r4,r5}
pop {r0}
@@ -29317,7 +29317,7 @@ sub_80B0458: @ 80B0458
ldrh r0, [r4, 0x2]
lsls r0, 20
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -29422,7 +29422,7 @@ _080B0556:
movs r2, 0x8
negs r2, r2
movs r3, 0x12
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -29434,7 +29434,7 @@ _080B0556:
adds r4, r0
adds r0, r4, 0
mov r1, r9
- bl sub_800843C
+ bl StartSpriteAffineAnim
mov r0, sp
ldrh r0, [r0, 0x4]
strh r0, [r4, 0x2E]
@@ -29505,7 +29505,7 @@ _080B05F6:
adds r3, r4, 0
adds r3, 0x43
ldrb r3, [r3]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
@@ -29542,9 +29542,9 @@ _080B065A:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _080B06A6
.align 2, 0
_080B066C: .4byte gUnknown_83E63E0
@@ -29569,9 +29569,9 @@ _080B0678:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080B06A6:
pop {r4}
pop {r0}
@@ -29609,9 +29609,9 @@ sub_80B06B0: @ 80B06B0
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080B06F0:
pop {r4}
pop {r0}
@@ -29620,8 +29620,8 @@ _080B06F0:
_080B06F8: .4byte gUnknown_3005090
thumb_func_end sub_80B06B0
- thumb_func_start sub_80B06FC
-sub_80B06FC: @ 80B06FC
+ thumb_func_start unc_080B06FC
+unc_080B06FC: @ 80B06FC
push {r4-r6,lr}
adds r5, r0, 0
ldr r0, _080B077C @ =gUnknown_2037EE4
@@ -29639,7 +29639,7 @@ sub_80B06FC: @ 80B06FC
movs r1, 0x4
_080B071A:
adds r0, r5, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r0, r5, 0
movs r1, 0x1
bl sub_8075160
@@ -29648,7 +29648,7 @@ _080B071A:
strh r0, [r5, 0x2E]
ldr r0, _080B0784 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B0742
@@ -29688,31 +29688,31 @@ _080B0780: .4byte gUnknown_2037F02
_080B0784: .4byte gUnknown_2037F1A
_080B0788: .4byte gUnknown_2037F1B
_080B078C: .4byte sub_80B0790
- thumb_func_end sub_80B06FC
+ thumb_func_end unc_080B06FC
thumb_func_start sub_80B0790
sub_80B0790: @ 80B0790
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B07B2
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080B07B8 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080B07BC @ =sub_8072740
+ ldr r1, _080B07BC @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080B07B2:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B07B8: .4byte sub_8074F6C
-_080B07BC: .4byte sub_8072740
+_080B07BC: .4byte DestroyAnimSprite
thumb_func_end sub_80B0790
thumb_func_start sub_80B07C0
@@ -29733,14 +29733,14 @@ sub_80B07C0: @ 80B07C0
adds r0, r4, 0
movs r1, 0x1
bl sub_8075114
- bl sub_8044EC8
+ bl Random
movs r5, 0xFF
ands r5, r0
movs r0, 0x80
lsls r0, 1
adds r6, r0, 0
orrs r5, r6
- bl sub_8044EC8
+ bl Random
ldr r1, _080B081C @ =0x000001ff
ands r1, r0
adds r0, r1, 0
@@ -29801,7 +29801,7 @@ _080B084C:
cmp r0, 0x15
bne _080B086A
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B086A:
pop {r4}
pop {r0}
@@ -29826,7 +29826,7 @@ sub_80B0870: @ 80B0870
subs r2, r1
subs r2, 0x1
strh r2, [r3]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -29834,8 +29834,8 @@ _080B0898: .4byte gUnknown_2037F02
_080B089C: .4byte gUnknown_2037EE4
thumb_func_end sub_80B0870
- thumb_func_start sub_80B08A0
-sub_80B08A0: @ 80B08A0
+ thumb_func_start unc_080B08A0
+unc_080B08A0: @ 80B08A0
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _080B08D0 @ =gUnknown_2037F02
@@ -29851,17 +29851,17 @@ sub_80B08A0: @ 80B08A0
strh r0, [r4, 0x2E]
ldr r0, _080B08D4 @ =sub_8074C44
str r0, [r4, 0x1C]
- ldr r1, _080B08D8 @ =sub_8072740
+ ldr r1, _080B08D8 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B08D0: .4byte gUnknown_2037F02
_080B08D4: .4byte sub_8074C44
-_080B08D8: .4byte sub_8072740
- thumb_func_end sub_80B08A0
+_080B08D8: .4byte DestroyAnimSprite
+ thumb_func_end unc_080B08A0
thumb_func_start sub_80B08DC
sub_80B08DC: @ 80B08DC
@@ -29874,7 +29874,7 @@ sub_80B08DC: @ 80B08DC
bne _080B0904
ldr r0, _080B0924 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B0904
@@ -29888,7 +29888,7 @@ _080B0904:
ldr r4, _080B0920 @ =gUnknown_2037F02
ldrb r1, [r4, 0xC]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0xC]
adds r0, r5, 0
@@ -29932,7 +29932,7 @@ sub_80B0954: @ 80B0954
adds r5, r0, 0
ldr r4, _080B0974 @ =gUnknown_2037F02
ldrb r1, [r4, 0x8]
- bl sub_800838C
+ bl StartSpriteAnim
movs r1, 0x6
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -29953,16 +29953,16 @@ _080B0980:
strh r0, [r5, 0x2E]
ldr r0, _080B099C @ =sub_8074C44
str r0, [r5, 0x1C]
- ldr r1, _080B09A0 @ =sub_8072740
+ ldr r1, _080B09A0 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B0998: .4byte gUnknown_2037F02
_080B099C: .4byte sub_8074C44
-_080B09A0: .4byte sub_8072740
+_080B09A0: .4byte DestroyAnimSprite
thumb_func_end sub_80B0954
thumb_func_start sub_80B09A4
@@ -29993,7 +29993,7 @@ _080B09CA:
ldrsh r0, [r4, r3]
cmp r0, 0
bge _080B09E8
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -30002,7 +30002,7 @@ _080B09CA:
_080B09E8:
ldrb r1, [r4, 0x4]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
movs r1, 0x2
bl sub_8074480
@@ -30035,7 +30035,7 @@ _080B09E8:
_080B0A32:
lsls r4, r0, 14
lsrs r4, 16
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
lsls r1, r6, 16
@@ -30043,7 +30043,7 @@ _080B0A32:
bl __modsi3
lsls r0, 16
lsrs r6, r0, 16
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
lsls r4, 16
@@ -30052,7 +30052,7 @@ _080B0A32:
bl __modsi3
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8044EC8
+ bl Random
movs r7, 0x1
adds r1, r7, 0
ands r1, r0
@@ -30062,7 +30062,7 @@ _080B0A32:
negs r0, r0
lsrs r6, r0, 16
_080B0A74:
- bl sub_8044EC8
+ bl Random
adds r1, r7, 0
ands r1, r0
cmp r1, 0
@@ -30107,7 +30107,7 @@ _080B0A9C:
adds r3, 0x1
lsls r3, 24
lsrs r3, 24
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3C]
@@ -30121,7 +30121,7 @@ _080B0A9C:
ldr r4, _080B0B20 @ =gUnknown_202063C
adds r0, r4
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r2, 0x3C
ldrsh r1, [r5, r2]
lsls r0, r1, 4
@@ -30172,17 +30172,17 @@ sub_80B0B2C: @ 80B0B2C
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
movs r0, 0x3C
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
_080B0B68:
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B0B78
.align 2, 0
_080B0B70: .4byte gUnknown_202063C
@@ -30232,7 +30232,7 @@ _080B0BB6:
str r0, [r4, 0x1C]
ldr r1, _080B0BD4 @ =sub_80B0BD8
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -30271,16 +30271,16 @@ sub_80B0BD8: @ 80B0BD8
strh r6, [r5, 0x24]
ldr r0, _080B0C20 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080B0C24 @ =sub_8072740
+ ldr r1, _080B0C24 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080B0C18:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080B0C20: .4byte sub_8075590
-_080B0C24: .4byte sub_8072740
+_080B0C24: .4byte DestroyAnimSprite
thumb_func_end sub_80B0BD8
thumb_func_start sub_80B0C28
@@ -30296,7 +30296,7 @@ sub_80B0C28: @ 80B0C28
cmp r0, r1
bne _080B0C54
ldrb r0, [r2]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -30312,7 +30312,7 @@ _080B0C54:
bl sub_8075114
ldr r0, _080B0CA4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B0C72
@@ -30334,7 +30334,7 @@ _080B0C72:
strh r0, [r6, 0x34]
strh r0, [r6, 0x36]
adds r0, r6, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldrh r0, [r4, 0xA]
strh r0, [r6, 0x38]
ldrh r0, [r4, 0x8]
@@ -30365,7 +30365,7 @@ sub_80B0CB4: @ 80B0CB4
asrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -30376,7 +30376,7 @@ sub_80B0CB4: @ 80B0CB4
b _080B0CE6
_080B0CE0:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B0CE6:
pop {r4}
pop {r0}
@@ -30392,14 +30392,14 @@ sub_80B0CEC: @ 80B0CEC
ldr r5, _080B0D18 @ =gUnknown_2037F02
ldrb r1, [r5, 0x4]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
ldr r0, _080B0D1C @ =sub_8074C44
str r0, [r4, 0x1C]
ldr r1, _080B0D20 @ =sub_80B0D24
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -30414,7 +30414,7 @@ sub_80B0D24: @ 80B0D24
push {r4,lr}
adds r4, r0, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -30425,15 +30425,15 @@ sub_80B0D24: @ 80B0D24
strh r0, [r4, 0x2E]
ldr r0, _080B0D50 @ =sub_8074C44
str r0, [r4, 0x1C]
- ldr r1, _080B0D54 @ =sub_8072740
+ ldr r1, _080B0D54 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B0D50: .4byte sub_8074C44
-_080B0D54: .4byte sub_8072740
+_080B0D54: .4byte DestroyAnimSprite
thumb_func_end sub_80B0D24
thumb_func_start sub_80B0D58
@@ -30487,7 +30487,7 @@ sub_80B0D7C: @ 80B0D7C
str r0, [r5, 0x1C]
ldr r1, _080B0DD0 @ =sub_80B0DD4
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080B0DC0:
pop {r4,r5}
pop {r0}
@@ -30505,13 +30505,13 @@ sub_80B0DD4: @ 80B0DD4
strh r1, [r0, 0x2E]
ldr r1, _080B0DE8 @ =sub_8074C44
str r1, [r0, 0x1C]
- ldr r1, _080B0DEC @ =sub_8072740
- bl sub_8074A68
+ ldr r1, _080B0DEC @ =DestroyAnimSprite
+ bl StoreSpriteCallbackInData6
pop {r0}
bx r0
.align 2, 0
_080B0DE8: .4byte sub_8074C44
-_080B0DEC: .4byte sub_8072740
+_080B0DEC: .4byte DestroyAnimSprite
thumb_func_end sub_80B0DD4
thumb_func_start sub_80B0DF0
@@ -30548,7 +30548,7 @@ _080B0E1C:
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x34]
adds r0, 0x3
@@ -30581,7 +30581,7 @@ _080B0E6A:
cmp r0, 0x78
ble _080B0E78
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B0E78:
pop {r4}
pop {r0}
@@ -30667,7 +30667,7 @@ _080B0F02:
cmp r0, 0
bne _080B0F1E
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B0F60
_080B0F1E:
ldrh r0, [r1, 0x2E]
@@ -30705,7 +30705,7 @@ _080B0F4E:
cmp r0, 0
bne _080B0F60
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B0F60:
pop {r0}
bx r0
@@ -30818,7 +30818,7 @@ _080B1034:
b _080B1042
_080B103A:
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B1046
_080B1042:
ldr r0, _080B104C @ =sub_80B1050
@@ -30851,7 +30851,7 @@ sub_80B1050: @ 80B1050
cmp r0, 0x28
ble _080B1078
adds r0, r1, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1078:
pop {r0}
bx r0
@@ -30945,7 +30945,7 @@ sub_80B111C: @ 80B111C
bne _080B1178
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
strh r0, [r4, 0x2E]
ldrh r0, [r4, 0x20]
@@ -30969,10 +30969,10 @@ sub_80B111C: @ 80B111C
lsrs r0, 24
strh r0, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
- ldr r1, _080B1180 @ =sub_8074EE0
+ bl obj_translate_based_on_private_1_2_3_4
+ ldr r1, _080B1180 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B1184 @ =sub_807563C
str r0, [r4, 0x1C]
_080B1178:
@@ -30980,7 +30980,7 @@ _080B1178:
pop {r0}
bx r0
.align 2, 0
-_080B1180: .4byte sub_8074EE0
+_080B1180: .4byte move_anim_8074EE0
_080B1184: .4byte sub_807563C
thumb_func_end sub_80B111C
@@ -31063,7 +31063,7 @@ sub_80B11E4: @ 80B11E4
cmp r4, r0
bge _080B122E
adds r0, r7, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B128C
_080B122E:
ldrh r0, [r7, 0x2E]
@@ -31155,7 +31155,7 @@ sub_80B12A4: @ 80B12A4
ble _080B12E4
_080B12DE:
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B12E4:
pop {r0}
bx r0
@@ -31225,7 +31225,7 @@ _080B1364: .4byte gUnknown_2037F1A
_080B1368: .4byte gUnknown_2037F1B
_080B136C:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B138C
@@ -31260,17 +31260,17 @@ _080B138C:
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
- ldr r1, _080B13CC @ =sub_8072740
+ bl obj_translate_based_on_private_1_2_3_4
+ ldr r1, _080B13CC @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B13D0 @ =sub_807563C
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_080B13CC: .4byte sub_8072740
+_080B13CC: .4byte DestroyAnimSprite
_080B13D0: .4byte sub_807563C
thumb_func_end sub_80B12E8
@@ -31285,7 +31285,7 @@ sub_80B13D4: @ 80B13D4
cmp r1, r0
bne _080B13EA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B13EA:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -31324,7 +31324,7 @@ sub_80B13F8: @ 80B13F8
ldr r0, _080B147C @ =gUnknown_2037F16
ldrb r6, [r0]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B1442
@@ -31347,7 +31347,7 @@ _080B1456:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5, 0x32]
strh r0, [r5, 0x24]
ldrh r0, [r5, 0x34]
@@ -31390,31 +31390,31 @@ _080B14A8:
beq _080B14BC
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
b _080B14D2
_080B14BC:
ldr r0, _080B14E4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B14D2
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080B14D2:
ldr r0, _080B14E8 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080B14EC @ =sub_8072740
+ ldr r1, _080B14EC @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B14E4: .4byte gUnknown_2037F1A
_080B14E8: .4byte sub_8074F6C
-_080B14EC: .4byte sub_8072740
+_080B14EC: .4byte DestroyAnimSprite
thumb_func_end sub_80B1484
thumb_func_start sub_80B14F0
@@ -31435,7 +31435,7 @@ sub_80B14F0: @ 80B14F0
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -31445,7 +31445,7 @@ sub_80B14F0: @ 80B14F0
cmp r0, 0x28
ble _080B152A
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B152A:
pop {r4}
pop {r0}
@@ -31510,7 +31510,7 @@ _080B158E:
strh r0, [r4, 0x1C]
ldr r0, _080B15BC @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B15C4
@@ -31561,7 +31561,7 @@ _080B15D4:
movs r0, 0x1
bl sub_8075458
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B160C:
pop {r4-r7}
pop {r0}
@@ -31583,7 +31583,7 @@ sub_80B1620: @ 80B1620
bne _080B1636
adds r0, r5, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
_080B1636:
adds r0, r5, 0
movs r1, 0x1
@@ -31623,12 +31623,12 @@ _080B1680: .4byte sub_80B1684
sub_80B1684: @ 80B1684
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B1698
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1698:
pop {r4}
pop {r0}
@@ -31647,7 +31647,7 @@ sub_80B16A0: @ 80B16A0
bne _080B16B8
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
_080B16B8:
adds r0, r4, 0
movs r1, 0x1
@@ -31662,7 +31662,7 @@ _080B16B8:
bl sub_8076D9C
ldr r0, _080B171C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B16E6
@@ -31703,12 +31703,12 @@ _080B1724: .4byte sub_80B1728
sub_80B1728: @ 80B1728
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B173C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B173C:
pop {r4}
pop {r0}
@@ -31774,7 +31774,7 @@ sub_80B1798: @ 80B1798
cmp r0, 0
bne _080B17BE
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B17BE:
pop {r4}
pop {r0}
@@ -31795,7 +31795,7 @@ sub_80B17C4: @ 80B17C4
bl sub_8076D9C
ldr r0, _080B1828 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B17F0
@@ -31822,9 +31822,9 @@ _080B17F0:
strh r1, [r4, 0x36]
ldr r0, _080B1830 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080B1834 @ =sub_8072740
+ ldr r1, _080B1834 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
@@ -31833,7 +31833,7 @@ _080B1824: .4byte gUnknown_2037F1B
_080B1828: .4byte gUnknown_2037F1A
_080B182C: .4byte gUnknown_2037F02
_080B1830: .4byte sub_8075590
-_080B1834: .4byte sub_8072740
+_080B1834: .4byte DestroyAnimSprite
thumb_func_end sub_80B17C4
thumb_func_start sub_80B1838
@@ -31862,7 +31862,7 @@ _080B1854:
bl sub_8076D9C
ldr r0, _080B1898 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B187A
@@ -31902,7 +31902,7 @@ sub_80B18A0: @ 80B18A0
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x30]
adds r0, 0x30
@@ -31919,7 +31919,7 @@ sub_80B18A0: @ 80B18A0
cmp r0, 0
beq _080B18DC
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B18DC:
pop {r4}
pop {r0}
@@ -31955,12 +31955,12 @@ sub_80B190C: @ 80B190C
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x5
@@ -31975,7 +31975,7 @@ sub_80B190C: @ 80B190C
cmp r0, 0x47
bne _080B1946
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1946:
pop {r4}
pop {r0}
@@ -31998,7 +31998,7 @@ sub_80B194C: @ 80B194C
ldrh r0, [r1]
strh r0, [r4, 0xA]
ldr r0, _080B1984 @ =0x00002719
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xC]
@@ -32076,7 +32076,7 @@ _080B19EA:
cmp r1, 0
bne _080B1A04
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B1A04:
pop {r4-r7}
pop {r0}
@@ -32096,7 +32096,7 @@ sub_80B1A1C: @ 80B1A1C
bl sub_8075160
ldr r0, _080B1A88 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B1A3C
@@ -32130,12 +32130,12 @@ _080B1A3C:
adds r0, r4
strh r0, [r6, 0x36]
adds r0, r6, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080B1A94 @ =sub_8074F50
str r0, [r6, 0x1C]
ldr r1, _080B1A98 @ =sub_80B1A9C
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
@@ -32156,7 +32156,7 @@ sub_80B1A9C: @ 80B1A9C
cmp r0, 0
beq _080B1AB0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1AB0:
pop {r4}
pop {r0}
@@ -32169,7 +32169,7 @@ sub_80B1AB8: @ 80B1AB8
adds r5, r0, 0
ldr r4, _080B1B54 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B1AE4
@@ -32263,12 +32263,12 @@ _080B1B72:
strh r0, [r5, 0x36]
ldr r0, _080B1BA8 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080B1BAC @ =sub_8072740
+ ldr r1, _080B1BAC @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r1, [r4, 0xA]
adds r0, r5, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -32276,7 +32276,7 @@ _080B1B72:
_080B1BA0: .4byte gUnknown_2037F1B
_080B1BA4: .4byte gUnknown_2037F02
_080B1BA8: .4byte sub_8075590
-_080B1BAC: .4byte sub_8072740
+_080B1BAC: .4byte DestroyAnimSprite
thumb_func_end sub_80B1AB8
thumb_func_start sub_80B1BB0
@@ -32293,7 +32293,7 @@ sub_80B1BB0: @ 80B1BB0
ldr r0, _080B1BF0 @ =sub_80B1BF8
str r0, [r4, 0x1C]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B1BF4 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -32348,7 +32348,7 @@ _080B1C1E:
cmp r0, r1
bge _080B1C36
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1C36:
pop {r0}
bx r0
@@ -32360,7 +32360,7 @@ sub_80B1C3C: @ 80B1C3C
adds r5, r0, 0
ldr r0, _080B1C64 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B1C6C
@@ -32371,7 +32371,7 @@ sub_80B1C3C: @ 80B1C3C
strh r0, [r5, 0x22]
adds r0, r5, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080B1C72
.align 2, 0
_080B1C64: .4byte gUnknown_2037F1A
@@ -32402,7 +32402,7 @@ _080B1C72:
lsrs r0, 24
strh r0, [r5, 0x36]
adds r0, r5, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
ldr r0, _080B1CBC @ =sub_80B1CC0
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -32456,7 +32456,7 @@ _080B1CE8:
ble _080B1D30
_080B1D0A:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B1D38 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -32471,7 +32471,7 @@ _080B1D0A:
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B1D30:
pop {r4}
pop {r0}
@@ -32500,7 +32500,7 @@ sub_80B1D3C: @ 80B1D3C
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
movs r0, 0x4
negs r0, r0
@@ -32508,7 +32508,7 @@ sub_80B1D3C: @ 80B1D3C
strb r0, [r4, 0x1]
_080B1D6E:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080B1D84 @ =gUnknown_2037EE2
ldrb r0, [r1]
subs r0, 0x1
@@ -32546,7 +32546,7 @@ _080B1DB0:
_080B1DB2:
ldrb r6, [r0]
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B1DC8
@@ -33653,7 +33653,7 @@ _080B25D8:
lsls r3, 16
lsrs r3, 24
strh r3, [r4, 0x30]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
asrs r7, r0, 16
movs r0, 0x80
@@ -33875,7 +33875,7 @@ _080B27A4:
bne _080B27BC
ldr r0, _080B2810 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B27D2
@@ -33886,7 +33886,7 @@ _080B27BC:
bne _080B27D8
ldr r0, _080B2814 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B27D8
@@ -33898,7 +33898,7 @@ _080B27D8:
ldr r4, _080B280C @ =gUnknown_2037F02
ldrb r1, [r4, 0x8]
adds r0, r5, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
ldrh r0, [r5, 0x20]
subs r0, 0x20
strh r0, [r5, 0x20]
@@ -33949,7 +33949,7 @@ sub_80B2820: @ 80B2820
strh r1, [r4, 0x2E]
strh r1, [r4, 0x24]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080B284A:
ldrh r0, [r4, 0x3C]
subs r0, 0x1
@@ -33961,7 +33961,7 @@ _080B284A:
cmp r0, r1
bne _080B2862
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B2862:
pop {r4}
pop {r0}
@@ -33995,13 +33995,13 @@ sub_80B2868: @ 80B2868
movs r5, 0xD
negs r5, r5
adds r1, r5, 0
- bl sub_8044E30
+ bl Sin
ldr r4, _080B2908 @ =gUnknown_2037F02
strh r0, [r4]
movs r1, 0x8
ldrsh r0, [r7, r1]
adds r1, r5, 0
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x2]
movs r0, 0x1
strh r0, [r4, 0x4]
@@ -34025,7 +34025,7 @@ sub_80B2868: @ 80B2868
mov r0, r8
adds r1, r4, 0
movs r3, 0x3
- bl sub_80071EC
+ bl CreateSpriteAndAnimate
_080B28E2:
ldrh r0, [r7, 0x8]
adds r0, 0x8
@@ -34035,7 +34035,7 @@ _080B28E2:
cmp r0, 0xFF
ble _080B28F6
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B28F6:
pop {r3}
mov r8, r3
@@ -34066,7 +34066,7 @@ _080B2926:
movs r1, 0x1
bl sub_8075160
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B2954 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -34094,7 +34094,7 @@ _080B2958:
cmp r0, 0
beq _080B296C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B296C:
pop {r4}
pop {r0}
@@ -34158,7 +34158,7 @@ _080B29C0:
cmp r0, r1
bge _080B29FE
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B2A04 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -34173,7 +34173,7 @@ _080B29C0:
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B29FE:
pop {r4}
pop {r0}
@@ -34196,7 +34196,7 @@ sub_80B2A08: @ 80B2A08
ldr r0, _080B2A48 @ =sub_80B2A50
str r0, [r4, 0x1C]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080B2A4C @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -34305,7 +34305,7 @@ _080B2AE0:
cmp r0, 0
ble _080B2AEE
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B2AEE:
pop {r0}
bx r0
@@ -34418,7 +34418,7 @@ _080B2BAC:
adds r0, r5, 0
bl sub_8075AD8
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B2BCC:
add sp, 0x4
pop {r4,r5}
@@ -34432,10 +34432,10 @@ _080B2BD4: .4byte gUnknown_2021BCC
sub_80B2BD8: @ 80B2BD8
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8044EC8
+ bl Random
ldr r4, _080B2BFC @ =0x000001ff
ands r4, r0
- bl sub_8044EC8
+ bl Random
movs r1, 0x7F
ands r1, r0
movs r0, 0x1
@@ -34566,7 +34566,7 @@ _080B2CCA:
cmp r0, 0x1F
bne _080B2CDE
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B2CDE:
pop {r4}
pop {r0}
@@ -34639,7 +34639,7 @@ _080B2D0A:
b _080B2D5E
_080B2D58:
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B2D5E:
pop {r0}
bx r0
@@ -34768,7 +34768,7 @@ sub_80B2E20: @ 80B2E20
bge _080B2E60
_080B2E5A:
adds r0, r2, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080B2E60:
pop {r0}
bx r0
@@ -34785,7 +34785,7 @@ sub_80B2E64: @ 80B2E64
cmp r0, 0
bne _080B2E9C
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B2E98 @ =gUnknown_202063C
@@ -34803,7 +34803,7 @@ _080B2E94: .4byte gUnknown_2037F02
_080B2E98: .4byte gUnknown_202063C
_080B2E9C:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B2EC8 @ =gUnknown_202063C
@@ -34819,7 +34819,7 @@ _080B2E9C:
_080B2EBA:
strb r0, [r1]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -34833,7 +34833,7 @@ sub_80B2ECC: @ 80B2ECC
adds r6, r0, 0
ldr r0, _080B2F84 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B2EE8
@@ -34859,7 +34859,7 @@ _080B2EFE:
cmp r0, 0
bne _080B2F5A
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r7, r4, 0
@@ -34905,7 +34905,7 @@ _080B2F5A:
beq _080B2F90
ldr r0, _080B2F84 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B2F88
@@ -34923,7 +34923,7 @@ _080B2F88:
_080B2F90:
ldr r5, _080B3000 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B2FA6
@@ -34960,7 +34960,7 @@ _080B2FCA:
_080B2FDC:
ldr r0, _080B3004 @ =gUnknown_2037F02
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x80
@@ -34992,7 +34992,7 @@ sub_80B300C: @ 80B300C
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x34]
movs r2, 0x34
ldrsh r0, [r4, r2]
@@ -35083,7 +35083,7 @@ sub_80B30B0: @ 80B30B0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r5, 0x34]
subs r0, 0x1
strh r0, [r5, 0x34]
@@ -35098,7 +35098,7 @@ sub_80B30B0: @ 80B30B0
cmp r0, 0
bne _080B3146
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r6, r4, 0
@@ -35172,7 +35172,7 @@ sub_80B3168: @ 80B3168
cmp r0, 0
bne _080B31C0
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -35204,13 +35204,13 @@ _080B31A6:
adds r0, r5, 0
bl sub_8073128
_080B31C0:
- ldr r0, _080B31CC @ =sub_8072740
+ ldr r0, _080B31CC @ =DestroyAnimSprite
str r0, [r6, 0x1C]
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080B31CC: .4byte sub_8072740
+_080B31CC: .4byte DestroyAnimSprite
thumb_func_end sub_80B3168
thumb_func_start sub_80B31D0
@@ -35239,7 +35239,7 @@ _080B31EA:
beq _080B3232
ldr r0, _080B3220 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B3224
@@ -35292,7 +35292,7 @@ _080B325C:
cmp r0, 0
beq _080B3270
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080B3270:
pop {r4-r6}
pop {r0}
@@ -35317,13 +35317,13 @@ sub_80B3278: @ 80B3278
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B32C8
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5, 0x20]
subs r0, 0x28
strh r0, [r5, 0x20]
@@ -35345,16 +35345,16 @@ _080B32C8:
movs r0, 0x1
_080B32D6:
strh r0, [r5, 0x30]
- ldr r1, _080B32EC @ =sub_8072740
+ ldr r1, _080B32EC @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B32F0 @ =sub_8074F6C
str r0, [r5, 0x1C]
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_080B32EC: .4byte sub_8072740
+_080B32EC: .4byte DestroyAnimSprite
_080B32F0: .4byte sub_8074F6C
thumb_func_end sub_80B3278
@@ -35384,7 +35384,7 @@ sub_80B32F4: @ 80B32F4
lsls r1, 16
lsrs r7, r1, 16
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -35416,7 +35416,7 @@ _080B333A:
_080B3366:
ldr r1, _080B337C @ =sub_80B3384
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B3380 @ =sub_8074F6C
str r0, [r5, 0x1C]
pop {r4-r7}
@@ -35444,7 +35444,7 @@ sub_80B3384: @ 80B3384
movs r0, 0
strh r0, [r4, 0x2E]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
ldr r0, _080B33B4 @ =sub_80B33B8
str r0, [r4, 0x1C]
pop {r4}
@@ -35477,7 +35477,7 @@ _080B33CA:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
movs r0, 0x4
negs r0, r0
@@ -35500,7 +35500,7 @@ _080B33F8:
cmp r0, r1
bne _080B3410
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B3410:
pop {r4}
pop {r0}
@@ -35518,7 +35518,7 @@ sub_80B3418: @ 80B3418
ldr r0, _080B3448 @ =gUnknown_3005090
adds r4, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -35552,7 +35552,7 @@ sub_80B3454: @ 80B3454
cmp r0, 0
bne _080B3474
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B3474:
pop {r4}
pop {r0}
@@ -35572,7 +35572,7 @@ sub_80B3480: @ 80B3480
ldr r0, _080B34CC @ =gUnknown_3005090
adds r4, r1, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -35581,7 +35581,7 @@ sub_80B3480: @ 80B3480
strh r1, [r4, 0xC]
ldr r0, _080B34D0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0x8
cmp r0, 0
@@ -35684,7 +35684,7 @@ _080B3544:
ldrb r0, [r4, 0x8]
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B357A:
pop {r4,r5}
pop {r0}
@@ -35747,10 +35747,10 @@ _080B35EE:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080B3614 @ =sub_80B3618
str r0, [r5]
pop {r4-r6}
@@ -35810,7 +35810,7 @@ _080B365E:
movs r3, 0x24
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
movs r0, 0xC
@@ -35922,7 +35922,7 @@ _080B372E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0xA]
adds r0, 0x1
strh r0, [r4, 0xA]
@@ -35946,7 +35946,7 @@ _080B3754:
lsls r0, 2
ldr r1, _080B3784 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
_080B3770:
adds r0, r5, 0x1
lsls r0, 16
@@ -35963,12 +35963,12 @@ _080B3784: .4byte gUnknown_202063C
_080B3788:
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B379E:
pop {r4-r6}
pop {r0}
@@ -36006,7 +36006,7 @@ _080B37CE:
cmp r1, r0
bne _080B37E0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B37E0:
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -36233,7 +36233,7 @@ _080B39A4:
movs r3, 0x20
ldrsh r2, [r5, r3]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -36257,7 +36257,7 @@ _080B39A4:
movs r1, 0x3
ands r1, r0
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080B39F8:
ldrh r0, [r5, 0xC]
adds r0, 0x1
@@ -36282,7 +36282,7 @@ _080B3A18:
cmp r0, 0x11
ble _080B3A2C
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B3A2C:
pop {r4,r5}
pop {r0}
@@ -36293,16 +36293,16 @@ _080B3A2C:
sub_80B3A34: @ 80B3A34
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B3A52
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080B3A52:
pop {r4}
pop {r0}
@@ -36586,7 +36586,7 @@ _080B3C58:
_080B3C60: .4byte gUnknown_2039600
_080B3C64:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B3C6A:
pop {r3,r4}
mov r8, r3
@@ -36611,7 +36611,7 @@ sub_80B3C78: @ 80B3C78
lsls r0, 3
ldr r1, _080B3CAC @ =gUnknown_3005090
adds r7, r0, r1
- bl sub_8008594
+ bl AllocOamMatrix
lsls r0, 24
lsrs r5, r0, 24
mov r10, r5
@@ -36619,14 +36619,14 @@ sub_80B3C78: @ 80B3C78
cmp r6, 0xFF
bne _080B3CB0
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B3D5A
.align 2, 0
_080B3CAC: .4byte gUnknown_3005090
_080B3CB0:
ldr r1, _080B3CD4 @ =gUnknown_2037F02
ldrb r0, [r1]
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
lsrs r1, r0, 16
mov r9, r1
@@ -36634,9 +36634,9 @@ _080B3CB0:
cmp r0, 0
bge _080B3CD8
adds r0, r5, 0
- bl sub_80085CC
+ bl FreeOamMatrix
mov r0, r8
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B3D5A
.align 2, 0
_080B3CD4: .4byte gUnknown_2037F02
@@ -36682,7 +36682,7 @@ _080B3CD8:
lsls r2, 1
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrb r3, [r4, 0x1]
lsrs r1, r3, 6
ldrb r2, [r4, 0x3]
@@ -36690,10 +36690,10 @@ _080B3CD8:
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
ldr r1, _080B3D70 @ =gUnknown_2037F02
ldrb r0, [r1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
@@ -36769,7 +36769,7 @@ _080B3DAA:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -36808,7 +36808,7 @@ _080B3DFC:
ldrsh r2, [r4, r1]
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -36831,7 +36831,7 @@ _080B3E4C:
lsls r0, 2
ldr r1, _080B3E68 @ =gUnknown_202063C
adds r0, r1
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_080B3E5E:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -36843,9 +36843,9 @@ _080B3E6C:
ldrh r0, [r4, 0x24]
lsls r0, 24
lsrs r0, 24
- bl sub_80085CC
+ bl FreeOamMatrix
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B3E7C:
pop {r4,r5}
pop {r0}
@@ -36898,7 +36898,7 @@ _080B3ED2:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r5, 0x30]
movs r1, 0x10
subs r1, r0
@@ -36907,7 +36907,7 @@ _080B3ED2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B3F26
.align 2, 0
_080B3EF8: .4byte gUnknown_2037F1A
@@ -36926,10 +36926,10 @@ _080B3EFC:
lsls r1, 24
asrs r1, 24
movs r0, 0xC4
- bl sub_80722F4
+ bl PlaySE12WithPanning
adds r0, r5, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
_080B3F26:
ldrh r0, [r5, 0x2E]
adds r0, 0x1
@@ -36955,7 +36955,7 @@ _080B3F2E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x30
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -36987,12 +36987,12 @@ _080B3F72:
_080B3F8E:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B3FA4:
pop {r4,r5}
pop {r0}
@@ -37009,7 +37009,7 @@ sub_80B3FAC: @ 80B3FAC
beq _080B3FD8
adds r0, r6, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080B3FD4 @ =gUnknown_2037F02
ldrh r1, [r0, 0x4]
negs r1, r1
@@ -37023,13 +37023,13 @@ _080B3FD4: .4byte gUnknown_2037F02
_080B3FD8:
ldr r0, _080B406C @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B4008
adds r0, r6, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r1, _080B4070 @ =gUnknown_2037F02
ldrh r0, [r1, 0x2]
negs r0, r0
@@ -37082,9 +37082,9 @@ _080B4008:
strh r0, [r6, 0x36]
ldr r0, _080B4074 @ =sub_8075590
str r0, [r6, 0x1C]
- ldr r1, _080B4078 @ =sub_8072740
+ ldr r1, _080B4078 @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
@@ -37092,7 +37092,7 @@ _080B4008:
_080B406C: .4byte gUnknown_2037F1B
_080B4070: .4byte gUnknown_2037F02
_080B4074: .4byte sub_8075590
-_080B4078: .4byte sub_8072740
+_080B4078: .4byte DestroyAnimSprite
thumb_func_end sub_80B3FAC
thumb_func_start sub_80B407C
@@ -37109,14 +37109,14 @@ sub_80B407C: @ 80B407C
strh r0, [r1]
adds r0, r6, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080B40BC
.align 2, 0
_080B409C: .4byte gUnknown_2037F02
_080B40A0:
ldr r0, _080B4118 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B40BC
@@ -37162,9 +37162,9 @@ _080B40BC:
strh r0, [r6, 0x36]
ldr r0, _080B4120 @ =sub_8075590
str r0, [r6, 0x1C]
- ldr r1, _080B4124 @ =sub_8072740
+ ldr r1, _080B4124 @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
@@ -37172,7 +37172,7 @@ _080B40BC:
_080B4118: .4byte gUnknown_2037F1B
_080B411C: .4byte gUnknown_2037F02
_080B4120: .4byte sub_8075590
-_080B4124: .4byte sub_8072740
+_080B4124: .4byte DestroyAnimSprite
thumb_func_end sub_80B407C
thumb_func_start sub_80B4128
@@ -37257,14 +37257,14 @@ sub_80B41C0: @ 80B41C0
cmp r0, 0
beq _080B41D6
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B41F2
_080B41D6:
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
@@ -37293,7 +37293,7 @@ sub_80B41F8: @ 80B41F8
bl sub_8076D9C
ldr r0, _080B422C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B4234
@@ -37321,7 +37321,7 @@ _080B4240:
strh r0, [r4, 0x22]
ldr r0, _080B426C @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B425C
@@ -37377,7 +37377,7 @@ _080B42A8:
cmp r0, 0x33
bne _080B42BC
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B42BC:
pop {r0}
bx r0
@@ -37390,10 +37390,10 @@ sub_80B42C0: @ 80B42C0
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
strh r0, [r4, 0x2E]
ldr r0, _080B42E4 @ =sub_80B42E8
@@ -37435,7 +37435,7 @@ _080B42FC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -37462,12 +37462,12 @@ sub_80B4344: @ 80B4344
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -37492,7 +37492,7 @@ _080B4380: .4byte gUnknown_2037F02
_080B4384:
ldr r0, _080B4480 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B43A6
@@ -37513,22 +37513,22 @@ _080B43A6:
bne _080B43F6
ldr r0, _080B4480 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r5, _080B4488 @ =gUnknown_2037F1B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
bne _080B43F6
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
beq _080B43E4
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -37599,9 +37599,9 @@ _080B43F6:
strh r5, [r7, 0x36]
ldr r0, _080B448C @ =sub_8075590
str r0, [r7, 0x1C]
- ldr r1, _080B4490 @ =sub_8072740
+ ldr r1, _080B4490 @ =DestroyAnimSprite
adds r0, r7, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -37611,7 +37611,7 @@ _080B4480: .4byte gUnknown_2037F1A
_080B4484: .4byte gUnknown_2037F02
_080B4488: .4byte gUnknown_2037F1B
_080B448C: .4byte sub_8075590
-_080B4490: .4byte sub_8072740
+_080B4490: .4byte DestroyAnimSprite
thumb_func_end sub_80B4364
thumb_func_start sub_80B4494
@@ -37622,7 +37622,7 @@ sub_80B4494: @ 80B4494
bl sub_8075160
ldr r0, _080B4500 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B44B4
@@ -37688,12 +37688,12 @@ sub_80B4510: @ 80B4510
ands r1, r0
strb r1, [r2]
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B453C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B45CC
_080B453C:
movs r0, 0x2E
@@ -37723,7 +37723,7 @@ _080B4552:
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
bne _080B45CC
@@ -37806,9 +37806,9 @@ _080B45F6:
lsrs r0, 24
adds r0, 0x12
strh r0, [r5, 0x22]
- ldr r1, _080B462C @ =sub_8074EE0
+ ldr r1, _080B462C @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B4630 @ =sub_8074F50
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -37816,7 +37816,7 @@ _080B45F6:
bx r0
.align 2, 0
_080B4628: .4byte gUnknown_2037F1B
-_080B462C: .4byte sub_8074EE0
+_080B462C: .4byte move_anim_8074EE0
_080B4630: .4byte sub_8074F50
thumb_func_end sub_80B45D8
@@ -37848,9 +37848,9 @@ _080B4654:
strh r0, [r5, 0x22]
ldrb r1, [r6, 0x2]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
strh r4, [r5, 0x2E]
strh r4, [r5, 0x30]
movs r0, 0x4
@@ -37863,7 +37863,7 @@ _080B4654:
strh r0, [r5, 0x38]
ldr r1, _080B46AC @ =sub_80B46B4
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080B46B0 @ =sub_8074BE4
str r1, [r5, 0x1C]
adds r0, r5, 0
@@ -37896,9 +37896,9 @@ sub_80B46B4: @ 80B46B4
strh r0, [r4, 0x34]
ldr r0, _080B46EC @ =0x0000ffe8
strh r0, [r4, 0x36]
- ldr r1, _080B46F0 @ =sub_8074EE0
+ ldr r1, _080B46F0 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080B46F4 @ =sub_8074BE4
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -37908,7 +37908,7 @@ sub_80B46B4: @ 80B46B4
bx r0
.align 2, 0
_080B46EC: .4byte 0x0000ffe8
-_080B46F0: .4byte sub_8074EE0
+_080B46F0: .4byte move_anim_8074EE0
_080B46F4: .4byte sub_8074BE4
thumb_func_end sub_80B46B4
@@ -37918,12 +37918,12 @@ sub_80B46F8: @ 80B46F8
adds r5, r0, 0
ldr r4, _080B4720 @ =gUnknown_2037F02
ldrb r1, [r4, 0xA]
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
ldr r0, _080B4724 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B4728
@@ -37963,16 +37963,16 @@ _080B472E:
strh r4, [r5, 0x36]
ldr r0, _080B4774 @ =sub_8074D00
str r0, [r5, 0x1C]
- ldr r1, _080B4778 @ =sub_8074EE0
+ ldr r1, _080B4778 @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B4770: .4byte gUnknown_2037F02
_080B4774: .4byte sub_8074D00
-_080B4778: .4byte sub_8074EE0
+_080B4778: .4byte move_anim_8074EE0
thumb_func_end sub_80B46F8
thumb_func_start sub_80B477C
@@ -38030,7 +38030,7 @@ sub_80B47C4: @ 80B47C4
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
ldrh r1, [r4, 0x38]
@@ -38048,7 +38048,7 @@ sub_80B47C4: @ 80B47C4
cmp r0, r1
bne _080B480A
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B480A:
pop {r4}
pop {r0}
@@ -38064,19 +38064,19 @@ sub_80B4810: @ 80B4810
movs r5, 0
ldr r1, _080B48E4 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -38084,7 +38084,7 @@ sub_80B4810: @ 80B4810
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080B4854:
ldr r0, _080B48E8 @ =gUnknown_2022978
strh r5, [r0]
@@ -38092,10 +38092,10 @@ _080B4854:
strh r5, [r4]
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -38113,7 +38113,7 @@ _080B4854:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -38132,7 +38132,7 @@ _080B48B0:
beq _080B48CA
ldr r0, _080B4900 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B48CA
@@ -38252,7 +38252,7 @@ _080B4998:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0x7
@@ -38299,7 +38299,7 @@ _080B49F4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x1E
ldrsh r1, [r4, r2]
cmp r1, 0
@@ -38334,7 +38334,7 @@ _080B4A58:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080B4A6C:
ldr r0, _080B4AA0 @ =gUnknown_2022978
movs r1, 0
@@ -38343,16 +38343,16 @@ _080B4A6C:
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B4A96:
add sp, 0x10
pop {r4,r5}
@@ -38378,7 +38378,7 @@ sub_80B4AA8: @ 80B4AA8
beq _080B4AF4
ldr r0, _080B4AF0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B4AF4
@@ -38409,7 +38409,7 @@ _080B4AF8:
strh r0, [r5, 0x22]
ldr r1, _080B4B20 @ =gUnknown_83E7470
adds r0, r5, 0
- bl sub_8008A58
+ bl SetSubspriteTables
ldrh r0, [r4, 0x2]
strh r0, [r5, 0x30]
ldrh r0, [r4, 0x4]
@@ -38469,14 +38469,14 @@ _080B4B6A:
cmp r0, r1
bge _080B4B80
_080B4B7C:
- ldr r0, _080B4B88 @ =sub_8072740
+ ldr r0, _080B4B88 @ =DestroyAnimSprite
str r0, [r5, 0x1C]
_080B4B80:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
-_080B4B88: .4byte sub_8072740
+_080B4B88: .4byte DestroyAnimSprite
thumb_func_end sub_80B4AA8
thumb_func_start sub_80B4B8C
@@ -38485,7 +38485,7 @@ sub_80B4B8C: @ 80B4B8C
adds r4, r0, 0
ldr r5, _080B4BC4 @ =gUnknown_2037F02
ldrb r1, [r5, 0x8]
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
bl sub_8075160
@@ -38499,16 +38499,16 @@ sub_80B4B8C: @ 80B4B8C
strh r0, [r4, 0x36]
ldr r0, _080B4BC8 @ =sub_8075590
str r0, [r4, 0x1C]
- ldr r1, _080B4BCC @ =sub_8072740
+ ldr r1, _080B4BCC @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B4BC4: .4byte gUnknown_2037F02
_080B4BC8: .4byte sub_8075590
-_080B4BCC: .4byte sub_8072740
+_080B4BCC: .4byte DestroyAnimSprite
thumb_func_end sub_80B4B8C
thumb_func_start sub_80B4BD0
@@ -38640,7 +38640,7 @@ _080B4C7A:
strh r0, [r6, 0x24]
strh r5, [r6, 0xA]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -38734,7 +38734,7 @@ _080B4D90:
lsls r1, 24
asrs r1, 24
movs r0, 0x9B
- bl sub_80722F4
+ bl PlaySE12WithPanning
b _080B4E68
.align 2, 0
_080B4DA0: .4byte gUnknown_202063C
@@ -38820,7 +38820,7 @@ _080B4E08:
lsls r1, 24
asrs r1, 24
movs r0, 0xA8
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080B4E46:
ldrh r0, [r4, 0x18]
subs r0, 0x1
@@ -38839,7 +38839,7 @@ _080B4E5A:
cmp r0, 0
bne _080B4E68
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B4E68:
pop {r4}
pop {r0}
@@ -38912,7 +38912,7 @@ _080B4ECC:
asrs r2, 16
adds r0, r3, 0
movs r3, 0x23
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -38980,12 +38980,12 @@ _080B4F74: .4byte 0xfffffc00
sub_80B4F78: @ 80B4F78
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B4FAA
ldr r0, _080B4FB0 @ =sub_80B4D00
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -39000,7 +39000,7 @@ sub_80B4F78: @ 80B4F78
strh r0, [r1, 0x1E]
_080B4FA4:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080B4FAA:
pop {r4}
pop {r0}
@@ -39043,7 +39043,7 @@ sub_80B4FE4: @ 80B4FE4
adds r4, r0, 0
ldr r5, _080B501C @ =gUnknown_2037F02
ldrb r1, [r5, 0x8]
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5]
strh r0, [r4, 0x24]
ldrh r0, [r5, 0x2]
@@ -39109,7 +39109,7 @@ _080B505C:
cmp r0, 0
bne _080B506E
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B506E:
pop {r0}
bx r0
@@ -39121,14 +39121,14 @@ sub_80B5074: @ 80B5074
adds r4, r0, 0
ldr r0, _080B509C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080B5090
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080B5090:
adds r0, r4, 0
bl sub_8075DF4
@@ -39169,7 +39169,7 @@ sub_80B50A0: @ 80B50A0
strh r0, [r4, 0x38]
ldrb r1, [r2, 0x6]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080B50F4 @ =sub_80B50F8
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -39207,7 +39207,7 @@ sub_80B50F8: @ 80B50F8
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x26]
subs r1, r0
strh r1, [r4, 0x26]
@@ -39216,7 +39216,7 @@ sub_80B50F8: @ 80B50F8
cmp r0, 0x8C
ble _080B5142
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B5142:
pop {r4}
pop {r0}
@@ -39252,7 +39252,7 @@ _080B516C:
strh r0, [r1, 0xE]
_080B5176:
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -39297,7 +39297,7 @@ _080B51AA:
movs r0, 0x1
bl sub_8075458
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B51D6:
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -39343,7 +39343,7 @@ _080B5218:
movs r2, 0xA
ldrsh r1, [r4, r2]
movs r0, 0x4
- bl sub_8044E4C
+ bl Cos
ldrh r4, [r4, 0xC]
adds r0, r4
strh r0, [r6]
@@ -39358,7 +39358,7 @@ _080B5218:
movs r0, 0x1
bl sub_8075458
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B5250:
pop {r4-r6}
pop {r0}
@@ -39405,10 +39405,10 @@ sub_80B5268: @ 80B5268
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x3A]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
@@ -39437,14 +39437,14 @@ _080B52F0:
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -39468,7 +39468,7 @@ _080B5328:
movs r1, 0
ldrsb r1, [r0, r1]
movs r0, 0xBD
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080B533A:
pop {r4}
pop {r0}
@@ -39488,14 +39488,14 @@ sub_80B5344: @ 80B5344
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
movs r1, 0x38
ldrsh r0, [r4, r1]
movs r1, 0xF
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
@@ -39593,7 +39593,7 @@ _080B540E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x3A
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -39646,12 +39646,12 @@ sub_80B5470: @ 80B5470
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x20
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x8
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
subs r0, 0x41
@@ -39695,7 +39695,7 @@ _080B54AE:
cmp r0, 0x3D
bne _080B54E0
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B54E0:
pop {r4}
pop {r0}
@@ -39711,13 +39711,13 @@ sub_80B54E8: @ 80B54E8
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -39728,7 +39728,7 @@ sub_80B54E8: @ 80B54E8
movs r1, 0x80
movs r2, 0x80
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldr r1, _080B5560 @ =gUnknown_202063C
lsls r0, r4, 4
adds r0, r4
@@ -39796,7 +39796,7 @@ sub_80B5570: @ 80B5570
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xC
ldrsh r0, [r4, r1]
cmp r0, 0x9
@@ -39835,7 +39835,7 @@ sub_80B55C8: @ 80B55C8
_080B55EC: .4byte gUnknown_3005090
_080B55F0:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r1, r0, 24
ldrh r0, [r4, 0x8]
@@ -39850,19 +39850,19 @@ _080B55F0:
adds r0, r1, 0
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
b _080B5634
_080B5618:
adds r0, r1, 0
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
_080B5634:
pop {r4,r5}
pop {r0}
@@ -40084,7 +40084,7 @@ _080B57DE:
_080B57E8: .4byte gUnknown_2037F1B
_080B57EC:
adds r0, r5, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080B57F2:
pop {r4,r5}
pop {r0}
@@ -40183,7 +40183,7 @@ _080B5894:
cmp r6, 0
beq _080B58A0
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080B58A6
_080B58A0:
ldrh r0, [r3, 0x30]
@@ -40206,7 +40206,7 @@ sub_80B58AC: @ 80B58AC
ldr r1, _080B58D8 @ =gUnknown_3005090
adds r5, r0, r1
movs r0, 0x1
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
movs r6, 0
movs r1, 0
strh r0, [r5, 0x8]
@@ -40214,7 +40214,7 @@ sub_80B58AC: @ 80B58AC
cmp r0, 0
bge _080B58DC
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B59B8
.align 2, 0
_080B58D8: .4byte gUnknown_3005090
@@ -40228,7 +40228,7 @@ _080B58DC:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r5, 0xE]
lsls r1, 8
ldrh r0, [r5, 0xC]
@@ -40236,7 +40236,7 @@ _080B58DC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080B5944 @ =gUnknown_202063C
movs r0, 0x8
ldrsh r1, [r5, r0]
@@ -40248,7 +40248,7 @@ _080B58DC:
strh r1, [r0, 0x2E]
ldr r0, _080B5948 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B5950
@@ -40313,7 +40313,7 @@ _080B596E:
lsls r0, 2
adds r0, r4
ldr r1, _080B59C8 @ =nullsub_8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
movs r0, 0x8
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -40398,7 +40398,7 @@ _080B5A36:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r4, 0xC]
movs r0, 0x80
lsls r0, 13
@@ -40415,7 +40415,7 @@ _080B5A36:
lsls r0, 2
ldr r1, _080B5A74 @ =gUnknown_202063C
adds r0, r1
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
movs r0, 0x1
strh r0, [r4, 0x10]
b _080B5AA4
@@ -40431,17 +40431,17 @@ _080B5A78:
ble _080B5AA4
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x10]
adds r0, 0x1
strh r0, [r4, 0x10]
b _080B5AA4
_080B5A9E:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B5AA4:
pop {r4}
pop {r0}
@@ -40513,7 +40513,7 @@ _080B5B18:
_080B5B2C:
ldr r7, _080B5B64 @ =0x00002771
adds r0, r7, 0
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r0, 24
movs r2, 0
@@ -40524,16 +40524,16 @@ _080B5B2C:
cmp r0, 0xF
beq _080B5B5A
movs r0, 0x1
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
strh r0, [r5, 0x8]
lsls r0, 16
cmp r0, 0
bge _080B5B68
adds r0, r7, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080B5B5A:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B5D28
.align 2, 0
_080B5B64: .4byte 0x00002771
@@ -40603,7 +40603,7 @@ _080B5B68:
movs r0, 0x10
strh r0, [r5, 0xE]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -40632,7 +40632,7 @@ _080B5C20:
lsls r1, 3
_080B5C24:
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _080B5D22
_080B5C2C:
movs r1, 0x24
@@ -40656,7 +40656,7 @@ _080B5C2C:
ldr r3, _080B5C6C @ =0x00003c0d
movs r1, 0x10
movs r2, 0xA
- bl sub_8045274
+ bl BlendPalette
b _080B5D22
.align 2, 0
_080B5C60: .4byte gUnknown_20371F8
@@ -40723,19 +40723,19 @@ _080B5CD8:
bne _080B5CEC
ldr r1, _080B5CE8 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
b _080B5CF4
.align 2, 0
_080B5CE8: .4byte 0x00003f42
_080B5CEC:
ldr r1, _080B5D00 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
_080B5CF4:
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B5D22
.align 2, 0
_080B5D00: .4byte 0x00003f44
@@ -40745,13 +40745,13 @@ _080B5D04:
movs r1, 0x80
lsls r1, 2
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _080B5D1E
_080B5D14:
movs r1, 0x80
lsls r1, 3
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
_080B5D1E:
ldr r0, _080B5D34 @ =sub_80B5D38
str r0, [r5]
@@ -40824,7 +40824,7 @@ _080B5D92:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0xA
ldrsh r0, [r4, r2]
cmp r0, 0x80
@@ -40881,7 +40881,7 @@ _080B5E0A:
movs r0, 0x3
strb r0, [r1, 0x15]
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -40897,14 +40897,14 @@ _080B5E2C:
lsls r1, 3
_080B5E30:
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _080B5EB4
_080B5E38:
ldrh r0, [r4, 0x10]
ldr r3, _080B5E48 @ =0x00003c0d
movs r1, 0x10
movs r2, 0
- bl sub_8045274
+ bl BlendPalette
b _080B5EB4
.align 2, 0
_080B5E48: .4byte 0x00003c0d
@@ -40927,21 +40927,21 @@ _080B5E4C:
adds r0, r1
lsls r0, 2
adds r0, r3
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
ldr r0, _080B5EA0 @ =0x00002771
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
cmp r6, 0x1
bne _080B5EA4
movs r1, 0x80
lsls r1, 2
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _080B5EAE
.align 2, 0
_080B5E9C: .4byte gUnknown_202063C
@@ -40950,10 +40950,10 @@ _080B5EA4:
movs r1, 0x80
lsls r1, 3
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
_080B5EAE:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B5EB4:
ldrh r0, [r4, 0x26]
adds r0, 0x1
@@ -41154,11 +41154,11 @@ sub_80B6020: @ 80B6020
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
ldr r1, [sp]
strh r0, [r1, 0x12]
@@ -41217,7 +41217,7 @@ _080B6092:
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x37
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -41315,7 +41315,7 @@ _080B618C:
adds r1, r7, 0
ldr r2, [sp, 0xC]
movs r3, 0x37
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -41464,7 +41464,7 @@ _080B62B6:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x16
ldrsh r0, [r4, r1]
cmp r0, 0x17
@@ -41529,7 +41529,7 @@ _080B6330:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r4, 0x18]
movs r0, 0x80
lsls r0, 13
@@ -41551,7 +41551,7 @@ _080B6350:
lsls r0, 2
ldr r1, _080B6380 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -41578,12 +41578,12 @@ _080B6390:
_080B6398:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B63AE:
pop {r4,r5}
pop {r0}
@@ -41602,19 +41602,19 @@ sub_80B63B4: @ 80B63B4
strh r1, [r0]
ldr r1, _080B6408 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B640C @ =0x00003f1f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xC8
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080B6410 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B63FC
@@ -41819,7 +41819,7 @@ _080B6594:
movs r1, 0
movs r2, 0x10
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080B65E4 @ =sub_80B65F0
str r0, [r4]
_080B65C2:
@@ -41866,18 +41866,18 @@ sub_80B65F0: @ 80B65F0
ldr r4, _080B6648 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B6636:
pop {r4,r5}
pop {r0}
@@ -41897,7 +41897,7 @@ sub_80B664C: @ 80B664C
bl sub_8075160
ldr r0, _080B6678 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B6680
@@ -41986,7 +41986,7 @@ _080B66BA:
str r0, [r3, 0x1C]
ldr r1, _080B6718 @ =sub_80B6728
adds r0, r3, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _080B6720
.align 2, 0
_080B670C: .4byte 0x000003ff
@@ -42014,10 +42014,10 @@ sub_80B6728: @ 80B6728
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -42046,7 +42046,7 @@ _080B6762:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x32
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -42073,17 +42073,17 @@ sub_80B67A0: @ 80B67A0
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080B67CC @ =gUnknown_2022984
movs r1, 0
strh r1, [r0]
ldr r0, _080B67D0 @ =gUnknown_2022986
strh r1, [r0]
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -42099,11 +42099,11 @@ sub_80B67D4: @ 80B67D4
movs r1, 0x2E
ldrsh r0, [r5, r1]
movs r1, 0xC
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
ldr r0, _080B683C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B67F8
@@ -42138,10 +42138,10 @@ _080B67F8:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r5, 0x3A]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B689C
.align 2, 0
_080B683C: .4byte gUnknown_2037F1A
@@ -42178,7 +42178,7 @@ _080B6874:
lsls r1, r4, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
strh r4, [r5, 0x3A]
cmp r7, 0x10
bne _080B689C
@@ -42206,12 +42206,12 @@ sub_80B68A8: @ 80B68A8
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -42275,11 +42275,11 @@ sub_80B68C8: @ 80B68C8
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
strh r6, [r4, 0x18]
ldr r0, _080B6968 @ =sub_80B696C
str r0, [r4]
@@ -42335,7 +42335,7 @@ _080B69B2:
ldrsh r2, [r4, r0]
ldrb r3, [r4, 0x14]
ldr r0, _080B6A14 @ =gUnknown_83E76E0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -42348,7 +42348,7 @@ _080B69B2:
strh r7, [r5, 0x2E]
ldr r0, _080B6A1C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -42473,7 +42473,7 @@ _080B6ABC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B6AF2
_080B6ACC:
movs r2, 0x16
@@ -42488,12 +42488,12 @@ _080B6AD4:
_080B6ADC:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B6AF2:
pop {r4-r7}
pop {r0}
@@ -42524,7 +42524,7 @@ _080B6B0E:
ldrsh r0, [r4, r2]
movs r2, 0x34
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x32]
subs r0, 0x41
@@ -42577,7 +42577,7 @@ _080B6B64:
movs r2, 0x3A
ldrsh r0, [r4, r2]
movs r1, 0x7
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldr r2, _080B6BB8 @ =gUnknown_3005090
movs r0, 0x2E
@@ -42594,7 +42594,7 @@ _080B6B64:
subs r0, 0x1
strh r0, [r1, 0x16]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080B6BB2:
pop {r4}
pop {r0}
@@ -42670,18 +42670,18 @@ _080B6C44:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0
strh r0, [r6, 0xA]
strh r0, [r6, 0xC]
movs r0, 0x10
strh r0, [r6, 0xE]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x10]
@@ -42746,12 +42746,12 @@ _080B6CDC:
ldr r4, _080B6D08 @ =0x000066e0
movs r1, 0x10
adds r3, r4, 0
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r6, 0x16]
ldrb r2, [r6, 0xC]
movs r1, 0x10
adds r3, r4, 0
- bl sub_8045274
+ bl BlendPalette
ldrh r1, [r6, 0xC]
movs r2, 0xC
ldrsh r0, [r6, r2]
@@ -42767,11 +42767,11 @@ _080B6D0C:
strh r5, [r6, 0xC]
ldr r1, _080B6D24 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B6F1E
.align 2, 0
_080B6D24: .4byte 0x00003f44
@@ -42779,11 +42779,11 @@ _080B6D28:
movs r0, 0x2
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080B6D7C @ =gUnknown_202297C
movs r1, 0
strh r1, [r0]
@@ -42791,10 +42791,10 @@ _080B6D28:
strh r1, [r4]
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
add r0, sp, 0xC
movs r1, 0x2
bl sub_80752C8
@@ -42809,7 +42809,7 @@ _080B6D28:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _080B6F1E
.align 2, 0
_080B6D7C: .4byte gUnknown_202297C
@@ -42822,7 +42822,7 @@ _080B6D8C:
bl sub_80752C8
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
adds r1, r0, 0
ldr r5, _080B6DFC @ =gUnknown_202401C
ldr r0, [r5]
@@ -42831,7 +42831,7 @@ _080B6D8C:
adds r0, r4
str r1, [r0]
ldr r0, _080B6E00 @ =gUnknown_8E7F4AC
- bl sub_800EBB4
+ bl LZDecompressWram
add r0, sp, 0xC
ldrb r0, [r0, 0x8]
ldr r1, [r5]
@@ -42853,13 +42853,13 @@ _080B6D8C:
str r2, [sp, 0x8]
movs r2, 0
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r5]
adds r0, r4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
adds r0, r4
movs r1, 0
@@ -42889,7 +42889,7 @@ _080B6E14:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r6, r1]
cmp r0, 0
@@ -42900,19 +42900,19 @@ _080B6E14:
strh r0, [r6, 0xE]
ldr r1, _080B6E68 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _080B6F1E
.align 2, 0
_080B6E68: .4byte 0x00003f42
@@ -42927,7 +42927,7 @@ _080B6E76:
lsls r1, 3
_080B6E7A:
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _080B6F1E
_080B6E82:
ldr r2, _080B6EC0 @ =gUnknown_202063C
@@ -42989,13 +42989,13 @@ _080B6EEC:
ldr r3, _080B6F08 @ =0x000077ff
movs r1, 0x10
movs r2, 0xC
- bl sub_8045274
+ bl BlendPalette
cmp r4, 0x1
bne _080B6F0C
movs r1, 0x80
lsls r1, 2
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _080B6F16
.align 2, 0
_080B6F08: .4byte 0x000077ff
@@ -43003,7 +43003,7 @@ _080B6F0C:
movs r1, 0x80
lsls r1, 3
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
_080B6F16:
ldr r0, _080B6F2C @ =sub_80B6F30
str r0, [r6]
@@ -43076,7 +43076,7 @@ _080B6F8A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0xA
ldrsh r0, [r4, r2]
cmp r0, 0x80
@@ -43137,7 +43137,7 @@ _080B7008:
ldr r3, _080B7020 @ =0x000066e0
movs r1, 0x10
movs r2, 0xC
- bl sub_8045274
+ bl BlendPalette
b _080B7148
.align 2, 0
_080B701C: .4byte gUnknown_2039600
@@ -43145,10 +43145,10 @@ _080B7020: .4byte 0x000066e0
_080B7024:
ldr r1, _080B7040 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0
movs r0, 0x10
strh r0, [r6, 0xC]
@@ -43168,7 +43168,7 @@ _080B7044:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0xE
ldrsh r0, [r6, r2]
cmp r0, 0xF
@@ -43176,11 +43176,11 @@ _080B7044:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x2
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _080B7148
_080B707C:
movs r0, 0x2
@@ -43188,11 +43188,11 @@ _080B707C:
movs r0, 0
movs r1, 0x90
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
movs r0, 0x2
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0xC
strh r0, [r6, 0xA]
b _080B7148
@@ -43202,12 +43202,12 @@ _080B709C:
ldr r4, _080B70C8 @ =0x000066e0
movs r1, 0x10
adds r3, r4, 0
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r6, 0x16]
ldrb r2, [r6, 0xA]
movs r1, 0x10
adds r3, r4, 0
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r6, 0xA]
movs r2, 0xA
ldrsh r1, [r6, r2]
@@ -43222,11 +43222,11 @@ _080B70CC:
strh r1, [r6, 0xA]
ldr r1, _080B70E4 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _080B7148
.align 2, 0
_080B70E4: .4byte 0x00003f44
@@ -43261,19 +43261,19 @@ _080B70E8:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x2
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B7148:
ldrh r0, [r6, 0x26]
adds r0, 0x1
@@ -43345,7 +43345,7 @@ sub_80B71B0: @ 80B71B0
ldrsh r0, [r5, r2]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
ldr r4, _080B7210 @ =gUnknown_202063C
movs r1, 0x38
ldrsh r2, [r5, r1]
@@ -43358,7 +43358,7 @@ sub_80B71B0: @ 80B71B0
ldrsh r0, [r5, r2]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sub_8044E4C
+ bl Cos
movs r1, 0x38
ldrsh r2, [r5, r1]
lsls r1, r2, 4
@@ -43406,7 +43406,7 @@ _080B7218:
ldrh r1, [r0, 0x22]
subs r1, 0x8
strh r1, [r0, 0x22]
- ldr r0, _080B7258 @ =sub_8074EE0
+ ldr r0, _080B7258 @ =move_anim_8074EE0
str r0, [r5, 0x1C]
_080B724C:
pop {r4,r5}
@@ -43414,7 +43414,7 @@ _080B724C:
bx r0
.align 2, 0
_080B7254: .4byte gUnknown_202063C
-_080B7258: .4byte sub_8074EE0
+_080B7258: .4byte move_anim_8074EE0
thumb_func_end sub_80B71B0
thumb_func_start sub_80B725C
@@ -43435,7 +43435,7 @@ sub_80B725C: @ 80B725C
lsrs r0, 24
strh r0, [r5, 0x22]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B72AC
@@ -43480,9 +43480,9 @@ _080B72B6:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r1, _080B72F0 @ =sub_8074EE0
+ ldr r1, _080B72F0 @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080B72F4 @ =sub_8074E70
str r0, [r5, 0x1C]
pop {r4,r5}
@@ -43490,7 +43490,7 @@ _080B72B6:
bx r0
.align 2, 0
_080B72EC: .4byte gUnknown_2037F02
-_080B72F0: .4byte sub_8074EE0
+_080B72F0: .4byte move_anim_8074EE0
_080B72F4: .4byte sub_8074E70
thumb_func_end sub_80B725C
@@ -43514,7 +43514,7 @@ sub_80B72F8: @ 80B72F8
strh r0, [r5, 0x36]
ldr r0, _080B7354 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B735C
@@ -43559,23 +43559,23 @@ _080B735C:
strh r0, [r5, 0x36]
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080B7386:
ldr r0, _080B73A0 @ =gUnknown_2037F02
ldrh r0, [r0, 0x8]
strh r0, [r5, 0x2E]
ldr r0, _080B73A4 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080B73A8 @ =sub_8074EE0
+ ldr r1, _080B73A8 @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080B73A0: .4byte gUnknown_2037F02
_080B73A4: .4byte sub_8075590
-_080B73A8: .4byte sub_8074EE0
+_080B73A8: .4byte move_anim_8074EE0
thumb_func_end sub_80B72F8
thumb_func_start sub_80B73AC
@@ -43618,9 +43618,9 @@ _080B73CA:
strh r0, [r5, 0x22]
ldr r0, _080B7414 @ =sub_8074F6C
str r0, [r5, 0x1C]
- ldr r1, _080B7418 @ =sub_8074EE0
+ ldr r1, _080B7418 @ =move_anim_8074EE0
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -43628,7 +43628,7 @@ _080B73CA:
_080B740C: .4byte gUnknown_2037F1B
_080B7410: .4byte gUnknown_2037F02
_080B7414: .4byte sub_8074F6C
-_080B7418: .4byte sub_8074EE0
+_080B7418: .4byte move_anim_8074EE0
thumb_func_end sub_80B73AC
thumb_func_start sub_80B741C
@@ -43637,13 +43637,13 @@ sub_80B741C: @ 80B741C
adds r4, r0, 0
ldr r0, _080B7444 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B7436
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080B7436:
adds r0, r4, 0
bl sub_80B72F8
@@ -43705,13 +43705,13 @@ _080B74AA:
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r6, 0x24]
movs r1, 0x3A
ldrsh r0, [r6, r1]
movs r2, 0x3C
ldrsh r1, [r6, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r6, 0x26]
ldr r0, _080B74D4 @ =sub_80B74D8
str r0, [r6, 0x1C]
@@ -43744,13 +43744,13 @@ _080B74EA:
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -43813,13 +43813,13 @@ _080B757E:
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3A
ldrsh r0, [r4, r1]
movs r2, 0x3C
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
adds r0, 0x1
@@ -43852,7 +43852,7 @@ _080B75C6:
cmp r0, 0x14
ble _080B75DA
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B75DA:
pop {r4,r5}
pop {r0}
@@ -44051,7 +44051,7 @@ _080B774E:
_080B775C: .4byte gUnknown_2039600
_080B7760:
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B7766:
pop {r0}
bx r0
@@ -44155,14 +44155,14 @@ sub_80B77E4: @ 80B77E4
ldrsh r0, [r5, r1]
movs r2, 0x4
ldrsh r1, [r5, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x30]
movs r3, 0x2
ldrsh r0, [r5, r3]
lsls r6, 16
asrs r6, 16
adds r1, r6, 0
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x32]
ldrh r1, [r4, 0x30]
ldrh r2, [r5]
@@ -44237,7 +44237,7 @@ sub_80B7894: @ 80B7894
cmp r0, r1
ble _080B78D8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B78D8:
pop {r4}
pop {r0}
@@ -44262,7 +44262,7 @@ sub_80B78E0: @ 80B78E0
movs r1, 0x10
strh r1, [r0, 0xA]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
bl sub_80768B0
lsls r0, 24
@@ -44271,7 +44271,7 @@ sub_80B78E0: @ 80B78E0
bne _080B792C
ldr r1, _080B7928 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
b _080B7934
.align 2, 0
_080B791C: .4byte gUnknown_3005090
@@ -44281,7 +44281,7 @@ _080B7928: .4byte 0x00003f42
_080B792C:
ldr r1, _080B7948 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
_080B7934:
ldr r0, _080B794C @ =gUnknown_3005090
lsls r1, r5, 2
@@ -44330,7 +44330,7 @@ sub_80B7954: @ 80B7954
strh r1, [r6, 0xA]
ldrh r1, [r6, 0xA]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
strh r5, [r6, 0xC]
cmp r4, 0x10
bne _080B79D6
@@ -44350,7 +44350,7 @@ sub_80B7954: @ 80B7954
orrs r1, r2
strb r1, [r0]
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B79D6
.align 2, 0
_080B79C0: .4byte gUnknown_3005090
@@ -44386,7 +44386,7 @@ sub_80B79DC: @ 80B79DC
ldr r0, _080B7A10 @ =sub_80B7A14
str r0, [r2]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -44426,18 +44426,18 @@ sub_80B7A14: @ 80B7A14
strh r1, [r6, 0xA]
ldrh r1, [r6, 0xA]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
strh r5, [r6, 0xC]
cmp r4, 0
bne _080B7A7A
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B7A7A
.align 2, 0
_080B7A70: .4byte gUnknown_3005090
@@ -44459,7 +44459,7 @@ sub_80B7A80: @ 80B7A80
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080B7AAC @ =gUnknown_2037F1A
ldrb r0, [r0]
bl sub_80768B0
@@ -44469,7 +44469,7 @@ sub_80B7A80: @ 80B7A80
bne _080B7AB4
ldr r1, _080B7AB0 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
b _080B7ABC
.align 2, 0
_080B7AAC: .4byte gUnknown_2037F1A
@@ -44477,10 +44477,10 @@ _080B7AB0: .4byte 0x00003f42
_080B7AB4:
ldr r1, _080B7AC8 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
_080B7ABC:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -44584,7 +44584,7 @@ _080B7B8A:
ldrsh r0, [r4, r1]
movs r2, 0x3A
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
ldrh r6, [r4, 0x26]
adds r0, r6
strh r0, [r4, 0x26]
@@ -44611,7 +44611,7 @@ _080B7BBA:
cmp r0, 0
bne _080B7BCC
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B7BCC:
pop {r4-r6}
pop {r0}
@@ -44633,7 +44633,7 @@ sub_80B7BD4: @ 80B7BD4
strh r0, [r4, 0x22]
ldrb r1, [r5, 0x4]
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldrh r0, [r5, 0x6]
strh r0, [r4, 0x2E]
ldrh r0, [r5, 0x8]
@@ -44711,7 +44711,7 @@ sub_80B7C50: @ 80B7C50
cmp r0, 0
bne _080B7C82
adds r0, r3, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080B7C82:
pop {r0}
bx r0
@@ -44816,7 +44816,7 @@ _080B7D4C:
strh r0, [r4, 0x22]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r6, 0xEC
_080B7D58:
movs r0, 0x20
@@ -44847,12 +44847,12 @@ _080B7D84: .4byte sub_80B7D88
sub_80B7D88: @ 80B7D88
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B7D9C
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080B7D9C:
pop {r4}
pop {r0}
@@ -44901,7 +44901,7 @@ sub_80B7DA4: @ 80B7DA4
adds r0, 0x20
strh r0, [r5, 0x26]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B7E14
@@ -44931,12 +44931,12 @@ _080B7E16:
strh r0, [r5, 0x1C]
ldr r1, _080B7E6C @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrb r1, [r4, 0x8]
lsls r1, 4
movs r0, 0
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
ldr r0, _080B7E70 @ =0x04000016
str r0, [sp]
movs r7, 0x2
@@ -44959,11 +44959,11 @@ _080B7E78:
strh r0, [r5, 0x1C]
ldr r1, _080B7F34 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
movs r1, 0x90
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
ldr r0, _080B7F38 @ =0x0400001a
str r0, [sp]
movs r7, 0x4
@@ -45023,10 +45023,10 @@ _080B7ED4:
orrs r7, r0
movs r0, 0x4A
adds r1, r7, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B7F48 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, _080B7F4C @ =gUnknown_2022984
ldrh r0, [r5, 0x24]
lsls r0, 8
@@ -45127,7 +45127,7 @@ _080B7FD6:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0xC
@@ -45194,7 +45194,7 @@ _080B8056:
_080B8060: .4byte gUnknown_2039600
_080B8064:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B806A:
pop {r4}
pop {r0}
@@ -45247,12 +45247,12 @@ _080B80B4:
ldr r4, _080B80EC @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B829E
.align 2, 0
_080B80E4: .4byte gUnknown_2022984
@@ -45269,7 +45269,7 @@ _080B80F0:
bne _080B811C
ldr r1, _080B8114 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B8118 @ =gUnknown_202297C
b _080B8126
.align 2, 0
@@ -45279,7 +45279,7 @@ _080B8118: .4byte gUnknown_202297C
_080B811C:
ldr r1, _080B8130 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B8134 @ =gUnknown_2022978
_080B8126:
ldrh r0, [r1]
@@ -45304,7 +45304,7 @@ _080B8138:
lsls r1, 4
movs r0, 0
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
b _080B8170
.align 2, 0
_080B815C: .4byte gUnknown_202297A
@@ -45315,7 +45315,7 @@ _080B8160:
movs r0, 0
movs r1, 0x90
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
_080B8170:
movs r0, 0x3
bl sub_80B856C
@@ -45351,7 +45351,7 @@ _080B817C:
adds r0, 0x4
strh r0, [r5, 0x26]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080B81D0
@@ -45435,18 +45435,18 @@ _080B8250:
bne _080B8268
ldr r1, _080B8264 @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
b _080B8270
.align 2, 0
_080B8264: .4byte 0x00003f3d
_080B8268:
ldr r1, _080B82A8 @ =0x00003f3b
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
_080B8270:
ldr r1, _080B82AC @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, _080B82B0 @ =gUnknown_2022984
ldrh r0, [r5, 0x24]
lsls r0, 8
@@ -45462,7 +45462,7 @@ _080B8270:
strh r0, [r5, 0xC]
ldr r1, _080B82B8 @ =0x0000080c
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080B82BC @ =sub_80B82C0
str r0, [r5]
_080B829E:
@@ -45629,7 +45629,7 @@ _080B83D2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -45659,12 +45659,12 @@ _080B8408:
ldr r4, _080B8438 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B842A:
pop {r4,r5}
pop {r0}
@@ -45854,7 +45854,7 @@ sub_80B856C: @ 80B856C
_080B8582:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -45949,7 +45949,7 @@ sub_80B85B8: @ 80B85B8
strb r1, [r0]
_080B8642:
mov r0, r10
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -45993,7 +45993,7 @@ sub_80B8664: @ 80B8664
bl sub_8073128
_080B86A0:
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -46016,19 +46016,19 @@ sub_80B86B0: @ 80B86B0
strh r0, [r4, 0x22]
ldrb r1, [r1, 0x4]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080B86E4 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080B86E8 @ =sub_8072740
+ ldr r1, _080B86E8 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080B86E0: .4byte gUnknown_2037F02
_080B86E4: .4byte sub_8074F6C
-_080B86E8: .4byte sub_8072740
+_080B86E8: .4byte DestroyAnimSprite
thumb_func_end sub_80B86B0
thumb_func_start sub_80B86EC
@@ -46044,28 +46044,28 @@ sub_80B86EC: @ 80B86EC
strh r6, [r0]
ldr r1, _080B87F4 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B87F8 @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080B87FC @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080B8800 @ =0x00000c08
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -46073,7 +46073,7 @@ sub_80B86EC: @ 80B86EC
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080B8750:
bl sub_8075290
lsls r0, 24
@@ -46085,13 +46085,13 @@ _080B8750:
bne _080B87CA
ldr r4, _080B8804 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080B8780
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _080B87CA
@@ -46129,12 +46129,12 @@ _080B8780:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r6, 0x1
_080B87CA:
ldr r4, _080B8804 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B8818
@@ -46171,11 +46171,11 @@ _080B8818:
_080B8828:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -46203,7 +46203,7 @@ _080B8828:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r2, _080B88D0 @ =gUnknown_2022978
ldr r0, _080B88D4 @ =gUnknown_202063C
lsls r1, r4, 4
@@ -46248,7 +46248,7 @@ _080B88E0:
ldrh r3, [r2, 0x4]
movs r1, 0x10
movs r2, 0xB
- bl sub_8045274
+ bl BlendPalette
_080B88EC:
ldr r1, _080B8914 @ =gUnknown_3005090
lsls r0, r7, 2
@@ -46314,7 +46314,7 @@ _080B894E:
cmp r0, 0x2
bne _080B89FC
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r5, _080B89F0 @ =gUnknown_202063C
@@ -46340,7 +46340,7 @@ _080B8990:
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -46390,10 +46390,10 @@ _080B89FC:
ldr r4, _080B8A70 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -46401,10 +46401,10 @@ _080B89FC:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080B8A2E:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -46413,15 +46413,15 @@ _080B8A2E:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B8A5E:
add sp, 0x10
pop {r4-r6}
@@ -46465,7 +46465,7 @@ _080B8A9C:
.4byte _080B8AD4
_080B8ABC:
ldrb r0, [r2]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _080B8ADA
@@ -46489,7 +46489,7 @@ _080B8ADA:
beq _080B8B06
_080B8AE0:
adds r0, r4, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
@@ -46521,7 +46521,7 @@ _080B8B06:
bl sub_8075B48
_080B8B22:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -46551,7 +46551,7 @@ _080B8B4C:
strh r0, [r1, 0xE]
_080B8B58:
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -46611,7 +46611,7 @@ _080B8BD0: .4byte sub_80B8BD4
sub_80B8BD4: @ 80B8BD4
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B8C28
@@ -46660,12 +46660,12 @@ _080B8C34: .4byte sub_80B8C38
sub_80B8C38: @ 80B8C38
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B8C4C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B8C4C:
pop {r4}
pop {r0}
@@ -46680,7 +46680,7 @@ sub_80B8C54: @ 80B8C54
bl sub_8075114
ldr r0, _080B8CB4 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080B8C74
@@ -46711,9 +46711,9 @@ _080B8C74:
strh r0, [r6, 0x36]
ldr r0, _080B8CC0 @ =sub_8075590
str r0, [r6, 0x1C]
- ldr r1, _080B8CC4 @ =sub_8072740
+ ldr r1, _080B8CC4 @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4-r6}
pop {r0}
bx r0
@@ -46722,7 +46722,7 @@ _080B8CB4: .4byte gUnknown_2037F1A
_080B8CB8: .4byte gUnknown_2037F02
_080B8CBC: .4byte gUnknown_2037F1B
_080B8CC0: .4byte sub_8075590
-_080B8CC4: .4byte sub_8072740
+_080B8CC4: .4byte DestroyAnimSprite
thumb_func_end sub_80B8C54
thumb_func_start sub_80B8CC8
@@ -46745,11 +46745,11 @@ sub_80B8CC8: @ 80B8CC8
bl sub_8074844
lsls r0, 24
lsrs r7, r0, 24
- bl sub_8044EC8
+ bl Random
movs r4, 0x1F
adds r5, r4, 0
ands r5, r0
- bl sub_8044EC8
+ bl Random
ands r4, r0
adds r1, r5, 0
cmp r1, 0x10
@@ -46778,9 +46778,9 @@ _080B8D20:
strh r0, [r6, 0x36]
ldr r0, _080B8D50 @ =sub_8075590
str r0, [r6, 0x1C]
- ldr r1, _080B8D54 @ =sub_8074EE0
+ ldr r1, _080B8D54 @ =move_anim_8074EE0
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -46790,7 +46790,7 @@ _080B8D20:
_080B8D48: .4byte gUnknown_2037F1B
_080B8D4C: .4byte gUnknown_2037F02
_080B8D50: .4byte sub_8075590
-_080B8D54: .4byte sub_8074EE0
+_080B8D54: .4byte move_anim_8074EE0
thumb_func_end sub_80B8CC8
thumb_func_start sub_80B8D58
@@ -46893,7 +46893,7 @@ _080B8E06:
cmp r0, r1
bge _080B8E1E
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B8E1E:
pop {r0}
bx r0
@@ -46954,7 +46954,7 @@ _080B8E4C:
cmp r0, 0xA
bne _080B8E8E
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B8E8E:
pop {r0}
bx r0
@@ -47027,7 +47027,7 @@ _080B8F00:
.4byte _080B9064
_080B8F14:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -47195,7 +47195,7 @@ _080B9056:
_080B9060: .4byte gUnknown_2039600
_080B9064:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
ldr r2, _080B9088 @ =gUnknown_202063C
movs r0, 0x1C
ldrsh r1, [r4, r0]
@@ -47222,7 +47222,7 @@ sub_80B908C: @ 80B908C
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B90CC @ =gUnknown_202063C
@@ -47257,7 +47257,7 @@ _080B90D8:
_080B90DA:
strh r4, [r0]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -47320,7 +47320,7 @@ sub_80B912C: @ 80B912C
_080B914C: .4byte gUnknown_3005090
_080B9150:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -47362,7 +47362,7 @@ _080B9150:
_080B91A0: .4byte gUnknown_202063C
_080B91A4:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B91AA:
pop {r4,r5}
pop {r0}
@@ -47400,7 +47400,7 @@ _080B91DC:
.4byte _080B92AC
_080B91F0:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -47490,7 +47490,7 @@ _080B92A4: .4byte gUnknown_202063C
_080B92A8: .4byte gUnknown_2039600
_080B92AC:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B92B2:
pop {r4}
pop {r0}
@@ -47672,12 +47672,12 @@ _080B93FC: .4byte sub_80B9400
sub_80B9400: @ 80B9400
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080B9414
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B9414:
pop {r4}
pop {r0}
@@ -47735,9 +47735,9 @@ _080B943A:
ands r0, r2
orrs r0, r1
strh r0, [r6, 0x4]
- ldr r1, _080B94AC @ =sub_8072740
+ ldr r1, _080B94AC @ =DestroyAnimSprite
adds r0, r6, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrh r0, [r4, 0x4]
strh r0, [r6, 0x2E]
ldr r0, _080B94B0 @ =sub_8074C44
@@ -47751,7 +47751,7 @@ _080B949C: .4byte 0x0000fff0
_080B94A0: .4byte gUnknown_2037F02
_080B94A4: .4byte 0x000003ff
_080B94A8: .4byte 0xfffffc00
-_080B94AC: .4byte sub_8072740
+_080B94AC: .4byte DestroyAnimSprite
_080B94B0: .4byte sub_8074C44
thumb_func_end sub_80B941C
@@ -47840,14 +47840,14 @@ _080B9548:
_080B9554: .4byte gUnknown_2023D44
_080B9558:
ldrb r0, [r6]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
cmp r0, 0xFF
bne _080B9570
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080B9578
_080B9570:
movs r0, 0x1
@@ -47991,7 +47991,7 @@ _080B9668:
ldrh r0, [r3, 0x22]
strh r0, [r1]
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B9674:
pop {r0}
bx r0
@@ -48112,7 +48112,7 @@ _080B972C:
blt _080B972C
_080B9750:
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B9756:
pop {r4-r7}
pop {r0}
@@ -48203,7 +48203,7 @@ sub_80B97D8: @ 80B97D8
_080B97EC:
strh r2, [r3, 0x1E]
adds r0, r1, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -48242,7 +48242,7 @@ _080B9822:
_080B9832:
ldr r0, _080B9894 @ =sub_80B98A8
ldrb r1, [r6, 0x2]
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -48279,7 +48279,7 @@ _080B9832:
ldrh r0, [r6, 0x4]
strh r0, [r4, 0xE]
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
@@ -48315,7 +48315,7 @@ sub_80B98A8: @ 80B98A8
ldr r0, _080B98E4 @ =gUnknown_2022982
strh r1, [r0]
adds r0, r3, 0
- bl sub_8077508
+ bl DestroyTask
b _080B98F4
.align 2, 0
_080B98D8: .4byte gUnknown_3005090
@@ -48355,7 +48355,7 @@ sub_80B9904: @ 80B9904
strh r0, [r4, 0x2E]
ldr r0, _080B9940 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -48375,7 +48375,7 @@ _080B9944:
strh r1, [r4, 0x36]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080B9952:
ldr r0, _080B9968 @ =gUnknown_2037F02
ldrh r0, [r0, 0x8]
@@ -48399,12 +48399,12 @@ sub_80B9970: @ 80B9970
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r1, 0x1E
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r2, 0x2E
ldrsh r0, [r4, r2]
movs r1, 0xA
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x2E]
cmp r0, 0x7F
@@ -48439,7 +48439,7 @@ _080B99AA:
cmp r0, r1
bne _080B99CE
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B99CE:
pop {r4}
pop {r0}
@@ -48461,7 +48461,7 @@ sub_80B99D4: @ 80B99D4
ldrb r3, [r4, 0x6]
ldrh r4, [r4, 0x8]
str r4, [sp]
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -48529,7 +48529,7 @@ sub_80B9A5C: @ 80B9A5C
cmp r0, 0
bne _080B9A72
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B9A72:
pop {r0}
bx r0
@@ -48562,7 +48562,7 @@ sub_80B9A7C: @ 80B9A7C
bl sub_80B9A14
ldrb r1, [r4, 0x8]
ldrh r2, [r4, 0x6]
- bl sub_80714D4
+ bl BlendPalettes
adds r2, r5, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -48624,7 +48624,7 @@ _080B9B08:
lsrs r1, 24
ldrh r2, [r4, 0x34]
adds r0, r3, 0
- bl sub_80714D4
+ bl BlendPalettes
b _080B9B3C
_080B9B2E:
ldrh r1, [r4, 0x3A]
@@ -48632,7 +48632,7 @@ _080B9B2E:
lsrs r1, 24
ldrh r2, [r4, 0x38]
adds r0, r3, 0
- bl sub_80714D4
+ bl BlendPalettes
_080B9B3C:
ldrh r0, [r4, 0x30]
movs r2, 0x80
@@ -48667,9 +48667,9 @@ sub_80B9B5C: @ 80B9B5C
bl sub_80B9A14
movs r1, 0
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080B9B82:
pop {r4}
pop {r0}
@@ -48702,9 +48702,9 @@ sub_80B9B8C: @ 80B9B8C
movs r0, 0x70
strh r0, [r4, 0x36]
strh r2, [r4, 0x38]
- ldr r1, _080B9BD4 @ =sub_8074EE0
+ ldr r1, _080B9BD4 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080B9BD8 @ =sub_8074AE0
str r1, [r4, 0x1C]
adds r0, r4, 0
@@ -48714,7 +48714,7 @@ sub_80B9B8C: @ 80B9B8C
bx r0
.align 2, 0
_080B9BD0: .4byte gUnknown_2037F02
-_080B9BD4: .4byte sub_8074EE0
+_080B9BD4: .4byte move_anim_8074EE0
_080B9BD8: .4byte sub_8074AE0
thumb_func_end sub_80B9B8C
@@ -48784,7 +48784,7 @@ sub_80B9C2C: @ 80B9C2C
str r2, [sp]
adds r2, r5, 0
adds r3, r6, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -48851,7 +48851,7 @@ _080B9CD0:
b _080B9CDE
_080B9CD8:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B9CDE:
pop {r4-r6}
pop {r0}
@@ -48979,7 +48979,7 @@ sub_80B9DA0: @ 80B9DA0
ldrh r2, [r4, 0x12]
str r2, [sp]
adds r2, r5, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -49046,7 +49046,7 @@ _080B9E44:
b _080B9E52
_080B9E4C:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B9E52:
pop {r4-r6}
pop {r0}
@@ -49111,7 +49111,7 @@ sub_80B9EA8: @ 80B9EA8
lsls r4, 3
adds r4, r1
ldrh r0, [r4, 0x8]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -49124,7 +49124,7 @@ sub_80B9EA8: @ 80B9EA8
adds r0, r2, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4, 0xC]
subs r0, 0x1
strh r0, [r4, 0xC]
@@ -49191,7 +49191,7 @@ _080B9F58:
b _080B9F66
_080B9F60:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080B9F66:
pop {r4-r6}
pop {r0}
@@ -49227,7 +49227,7 @@ sub_80B9F6C: @ 80B9F6C
ldrh r0, [r5]
strh r0, [r4, 0x16]
ldrh r0, [r5]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -49239,7 +49239,7 @@ sub_80B9F6C: @ 80B9F6C
adds r0, r1, 0
movs r1, 0
adds r2, r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080B9FD4 @ =sub_80B9FD8
str r0, [r4]
add sp, 0x4
@@ -49292,7 +49292,7 @@ _080BA01C: .4byte gUnknown_2037AB8
_080BA020: .4byte sub_80BA090
_080BA024:
ldrh r0, [r4, 0x16]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -49310,7 +49310,7 @@ _080BA024:
adds r0, r2, 0
movs r1, 0
adds r2, r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080BA062
_080BA052:
ldrb r3, [r4, 0x14]
@@ -49319,7 +49319,7 @@ _080BA052:
adds r0, r2, 0
movs r1, 0
adds r2, r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080BA062:
ldr r0, _080BA08C @ =gUnknown_3005090
lsls r1, r5, 2
@@ -49367,7 +49367,7 @@ sub_80BA090: @ 80BA090
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x16]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -49378,9 +49378,9 @@ sub_80BA090: @ 80BA090
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BA0D6:
add sp, 0x4
pop {r4,r5}
@@ -49443,9 +49443,9 @@ _080BA134:
orrs r2, r0
_080BA146:
adds r0, r2, 0
- bl sub_8070CCC
+ bl InvertPlttBuffer
mov r0, r8
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r3}
mov r8, r3
@@ -49528,7 +49528,7 @@ _080BA1D0:
adds r0, r2
ldr r0, [r0]
ldrh r0, [r0, 0x2]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r1, r6, 0
@@ -49565,7 +49565,7 @@ _080BA228:
movs r3, 0x16
ldrsb r3, [r4, r3]
adds r0, r5, 0
- bl sub_8070D14
+ bl TintPlttBuffer
movs r2, 0x8
ldrsh r1, [r4, r2]
movs r2, 0xA
@@ -49573,9 +49573,9 @@ _080BA228:
cmp r1, r0
bne _080BA252
adds r0, r5, 0
- bl sub_8070DE8
+ bl UnfadePlttBuffer
mov r0, r8
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BA252:
pop {r3-r5}
mov r8, r3
@@ -49642,14 +49642,14 @@ _080BA2CC:
ldr r1, _080BA2D8 @ =gUnknown_2021BC8
_080BA2CE:
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
b _080BA2E4
.align 2, 0
_080BA2D8: .4byte gUnknown_2021BC8
_080BA2DC:
ldr r1, _080BA314 @ =gUnknown_2021BCA
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080BA2E4:
movs r0, 0x3A
ldrsh r1, [r4, r0]
@@ -49761,7 +49761,7 @@ _080BA392:
bcc _080BA392
_080BA3B4:
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080BA3BA:
pop {r4-r7}
pop {r0}
@@ -49971,7 +49971,7 @@ _080BA530:
strh r1, [r6]
strh r1, [r2]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080BA55A
_080BA556:
subs r0, r2, 0x1
@@ -49988,7 +49988,7 @@ sub_80BA560: @ 80BA560
adds r5, r0, 0
ldr r4, _080BA580 @ =gUnknown_2037F02
ldrb r1, [r4, 0x6]
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -50006,15 +50006,15 @@ _080BA584:
_080BA58C:
ldr r0, _080BA5A0 @ =sub_8074F50
str r0, [r5, 0x1C]
- ldr r1, _080BA5A4 @ =sub_8072740
+ ldr r1, _080BA5A4 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080BA5A0: .4byte sub_8074F50
-_080BA5A4: .4byte sub_8072740
+_080BA5A4: .4byte DestroyAnimSprite
thumb_func_end sub_80BA560
thumb_func_start sub_80BA5A8
@@ -50023,7 +50023,7 @@ sub_80BA5A8: @ 80BA5A8
adds r5, r0, 0
ldr r4, _080BA5C8 @ =gUnknown_2037F02
ldrb r1, [r4, 0x6]
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -50046,7 +50046,7 @@ _080BA5D4:
str r0, [r5, 0x1C]
ldr r1, _080BA5F4 @ =sub_80B1D3C
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
@@ -50062,7 +50062,7 @@ sub_80BA5F8: @ 80BA5F8
adds r4, r0, 0
ldr r0, _080BA628 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080BA61C
@@ -50096,14 +50096,14 @@ sub_80BA630: @ 80BA630
negs r0, r0
cmp r1, r0
bne _080BA64C
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
strh r1, [r5, 0x2]
_080BA64C:
ldrb r1, [r5, 0x2]
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -50119,7 +50119,7 @@ _080BA66C:
movs r1, 0
bl sub_8075114
_080BA674:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x30
@@ -50129,7 +50129,7 @@ _080BA674:
ldrh r1, [r4, 0x24]
adds r0, r1
strh r0, [r4, 0x24]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x18
@@ -50139,9 +50139,9 @@ _080BA674:
ldrh r1, [r4, 0x26]
adds r0, r1
strh r0, [r4, 0x26]
- ldr r1, _080BA6C0 @ =sub_8074EE0
+ ldr r1, _080BA6C0 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080BA6C4 @ =sub_8074F50
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -50150,7 +50150,7 @@ _080BA674:
.align 2, 0
_080BA6B8: .4byte 0x0000ffe8
_080BA6BC: .4byte 0x0000fff4
-_080BA6C0: .4byte sub_8074EE0
+_080BA6C0: .4byte move_anim_8074EE0
_080BA6C4: .4byte sub_8074F50
thumb_func_end sub_80BA630
@@ -50160,7 +50160,7 @@ sub_80BA6C8: @ 80BA6C8
adds r4, r0, 0
ldr r5, _080BA728 @ =gUnknown_2037F02
ldrb r0, [r5]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
@@ -50191,10 +50191,10 @@ sub_80BA6C8: @ 80BA6C8
strh r0, [r4, 0x26]
ldrb r1, [r5, 0x6]
adds r0, r4, 0
- bl sub_800843C
- ldr r1, _080BA730 @ =sub_8074EE0
+ bl StartSpriteAffineAnim
+ ldr r1, _080BA730 @ =move_anim_8074EE0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080BA734 @ =sub_8074F50
str r0, [r4, 0x1C]
pop {r4,r5}
@@ -50203,7 +50203,7 @@ sub_80BA6C8: @ 80BA6C8
.align 2, 0
_080BA728: .4byte gUnknown_2037F02
_080BA72C: .4byte gUnknown_202063C
-_080BA730: .4byte sub_8074EE0
+_080BA730: .4byte move_anim_8074EE0
_080BA734: .4byte sub_8074F50
thumb_func_end sub_80BA6C8
@@ -50230,9 +50230,9 @@ _080BA75C:
ldr r0, _080BA774 @ =gUnknown_2037F02
ldrh r0, [r0, 0x6]
strh r0, [r4, 0x2E]
- ldr r1, _080BA778 @ =sub_8072740
+ ldr r1, _080BA778 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080BA77C @ =sub_8074C44
str r0, [r4, 0x1C]
pop {r4}
@@ -50240,7 +50240,7 @@ _080BA75C:
bx r0
.align 2, 0
_080BA774: .4byte gUnknown_2037F02
-_080BA778: .4byte sub_8072740
+_080BA778: .4byte DestroyAnimSprite
_080BA77C: .4byte sub_8074C44
thumb_func_end sub_80BA738
@@ -50250,7 +50250,7 @@ sub_80BA780: @ 80BA780
adds r5, r0, 0
ldr r4, _080BA7A0 @ =gUnknown_2037F02
ldrb r1, [r4, 0x6]
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -50302,7 +50302,7 @@ sub_80BA7BC: @ 80BA7BC
cmp r0, 0xC
ble _080BA7F2
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080BA7F2:
pop {r0}
bx r0
@@ -50585,7 +50585,7 @@ sub_80BAA20: @ 80BAA20
lsrs r4, 24
ldr r0, _080BAA48 @ =gUnknown_2037F02
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -50678,7 +50678,7 @@ _080BAAD0:
ldrh r3, [r5, 0x12]
adds r0, r6, 0
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
_080BAAE4:
adds r0, r6, 0
adds r0, 0x10
@@ -50713,7 +50713,7 @@ _080BAB14:
b _080BAB2C
_080BAB1E:
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080BAB2C
_080BAB26:
mov r0, r8
@@ -50742,7 +50742,7 @@ sub_80BAB38: @ 80BAB38
ldrb r3, [r4, 0x6]
ldrb r4, [r4, 0x8]
str r4, [sp]
- bl sub_8071264
+ bl BeginHardwarePaletteFade
ldr r1, _080BAB70 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -50772,7 +50772,7 @@ sub_80BAB78: @ 80BAB78
cmp r0, 0
bne _080BAB90
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BAB90:
pop {r0}
bx r0
@@ -50837,7 +50837,7 @@ sub_80BABD0: @ 80BABD0
_080BABFC: .4byte gUnknown_3005090
_080BAC00:
ldrb r0, [r4, 0x8]
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
strh r0, [r4, 0x14]
lsls r0, 16
cmp r0, 0
@@ -50915,7 +50915,7 @@ _080BAC94:
cmp r0, 0
bne _080BACA2
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BACA2:
pop {r4-r6}
pop {r0}
@@ -50951,7 +50951,7 @@ _080BACBC:
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_080BACE0:
pop {r4}
pop {r0}
@@ -50977,22 +50977,22 @@ sub_80BACEC: @ 80BACEC
strh r7, [r0]
ldr r1, _080BAE28 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BAE2C @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080BAE30 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BAE34 @ =0x00000c08
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
add r4, sp, 0x10
strh r0, [r4]
ldrb r1, [r4]
@@ -51009,7 +51009,7 @@ sub_80BACEC: @ 80BACEC
strb r0, [r2]
ldrh r1, [r4]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -51023,7 +51023,7 @@ sub_80BACEC: @ 80BACEC
strb r0, [r4]
ldrh r1, [r4]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
_080BAD7A:
bl sub_8075290
lsls r0, 24
@@ -51035,13 +51035,13 @@ _080BAD7A:
bne _080BADFE
ldr r5, _080BAE38 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080BADAA
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _080BADFE
@@ -51084,12 +51084,12 @@ _080BADAA:
strb r0, [r4]
ldrh r1, [r4]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r7, 0x1
_080BADFE:
ldr r4, _080BAE38 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080BAE4C
@@ -51126,11 +51126,11 @@ _080BAE4C:
_080BAE5C:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
@@ -51170,7 +51170,7 @@ _080BAEAC:
lsls r1, 4
adds r1, 0x1
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r2, _080BAF24 @ =gUnknown_2022978
ldr r0, _080BAF28 @ =gUnknown_202063C
lsls r1, r5, 4
@@ -51266,16 +51266,16 @@ sub_80BAF38: @ 80BAF38
ldr r4, _080BB078 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
bne _080BAFCA
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
add r1, sp, 0x10
strh r0, [r1]
ldrb r2, [r1]
@@ -51285,10 +51285,10 @@ sub_80BAF38: @ 80BAF38
strb r0, [r1]
ldrh r1, [r1]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
_080BAFCA:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -51297,15 +51297,15 @@ _080BAFCA:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r4, _080BB07C @ =gUnknown_202063C
movs r0, 0x8
ldrsh r1, [r5, r0]
@@ -51313,7 +51313,7 @@ _080BAFCA:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
mov r0, sp
bl sub_80752A0
mov r0, sp
@@ -51350,7 +51350,7 @@ _080BB050:
mov r2, r8
strh r2, [r7]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BB05A:
add sp, 0x14
pop {r3}
@@ -51376,7 +51376,7 @@ sub_80BB088: @ 80BB088
lsrs r5, r0, 24
ldr r4, _080BB0C8 @ =gUnknown_20399B4
movs r0, 0x18
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r2, 0
ldr r3, _080BB0CC @ =gUnknown_2037F02
@@ -51463,29 +51463,29 @@ _080BB130:
strh r1, [r0]
ldr r1, _080BB240 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BB244 @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080BB248 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -51493,7 +51493,7 @@ _080BB130:
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080BB18E:
bl sub_8075290
lsls r0, 24
@@ -51506,14 +51506,14 @@ _080BB18E:
cmp r0, 0
bne _080BB20A
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080BB1C0
ldr r0, [r4]
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _080BB20A
@@ -51550,14 +51550,14 @@ _080BB1C0:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, [r4]
strb r5, [r0, 0x2]
_080BB20A:
ldr r4, _080BB234 @ =gUnknown_20399B4
ldr r0, [r4]
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080BB25C
@@ -51596,7 +51596,7 @@ _080BB25C:
_080BB26E:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
strh r0, [r1, 0x14]
ldr r0, _080BB298 @ =gUnknown_3005090
@@ -51751,7 +51751,7 @@ _080BB3B2:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _080BB3D2
.align 2, 0
_080BB3C0: .4byte gUnknown_8D2DE1C
@@ -51761,7 +51761,7 @@ _080BB3C4:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
_080BB3D2:
ldr r3, _080BB400 @ =gUnknown_2022978
movs r2, 0
@@ -51852,7 +51852,7 @@ _080BB44C:
lsls r1, 24
asrs r1, 24
movs r0, 0xE8
- bl sub_80722F4
+ bl PlaySE12WithPanning
b _080BB4AC
.align 2, 0
_080BB490: .4byte gUnknown_2023D44
@@ -51865,7 +51865,7 @@ _080BB498:
lsls r1, 24
asrs r1, 24
movs r0, 0xEE
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080BB4AC:
add sp, 0x10
pop {r3}
@@ -51928,7 +51928,7 @@ _080BB504:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x20
ldrsh r1, [r5, r2]
movs r2, 0x10
@@ -51970,7 +51970,7 @@ _080BB544:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x20
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -51991,10 +51991,10 @@ _080BB582:
ldr r4, _080BB654 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -52002,10 +52002,10 @@ _080BB582:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080BB5B2:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -52014,13 +52014,13 @@ _080BB5B2:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -52028,7 +52028,7 @@ _080BB5B2:
lsls r0, 2
ldr r4, _080BB658 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r1, 0xC
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -52039,7 +52039,7 @@ _080BB5B2:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
_080BB606:
movs r1, 0x14
ldrsh r0, [r5, r1]
@@ -52066,11 +52066,11 @@ _080BB606:
_080BB632:
ldr r4, _080BB65C @ =gUnknown_20399B4
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BB644:
pop {r4-r6}
pop {r0}
@@ -52198,7 +52198,7 @@ _080BB72C:
ldrb r2, [r4, 0xC]
movs r1, 0x10
ldr r3, _080BB780 @ =0x0000ffff
- bl sub_8045274
+ bl BlendPalette
_080BB746:
movs r1, 0x24
ldrsh r0, [r4, r1]
@@ -52214,7 +52214,7 @@ _080BB746:
ldrb r2, [r4, 0xC]
movs r1, 0x10
movs r3, 0
- bl sub_8045274
+ bl BlendPalette
_080BB766:
adds r0, r5, 0x1
lsls r0, 16
@@ -52234,7 +52234,7 @@ _080BB778:
_080BB780: .4byte 0x0000ffff
_080BB784:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BB78A:
pop {r4-r6}
pop {r0}
@@ -52338,7 +52338,7 @@ sub_80BB82C: @ 80BB82C
bl sub_8075458
ldr r0, _080BB894 @ =sub_80BB8A4
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _080BB898 @ =gUnknown_2037F02
@@ -52348,7 +52348,7 @@ sub_80BB82C: @ 80BB82C
beq _080BB868
ldr r0, _080BB89C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080BB868
@@ -52375,7 +52375,7 @@ _080BB868:
adds r0, 0x1
strh r0, [r1, 0x8]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -52436,7 +52436,7 @@ sub_80BB8A4: @ 80BB8A4
movs r0, 0x1
bl sub_8075458
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080BB90A:
pop {r4-r7}
pop {r0}
@@ -52456,13 +52456,13 @@ sub_80BB920: @ 80BB920
lsrs r4, 24
ldr r0, _080BB944 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _080BB948 @ =gUnknown_2037F02
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -52479,13 +52479,13 @@ sub_80BB94C: @ 80BB94C
lsrs r4, 24
ldr r0, _080BB970 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _080BB974 @ =gUnknown_2037F02
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -52513,7 +52513,7 @@ sub_80BB978: @ 80BB978
_080BB994:
strh r4, [r5, 0xE]
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -52568,7 +52568,7 @@ _080BB9F8:
cmp r4, 0x3
bls _080BB9BA
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r7}
pop {r0}
bx r0
@@ -52639,23 +52639,23 @@ _080BBA86:
strh r1, [r0]
ldr r1, _080BBB28 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BBB2C @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080BBB30 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
add r4, sp, 0x10
strh r0, [r4]
ldrb r1, [r4]
@@ -52687,9 +52687,9 @@ _080BBA86:
_080BBAFC:
ldrh r1, [r4]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080BBB3C
@@ -52720,7 +52720,7 @@ _080BBB3C:
_080BBB4A:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r5, _080BBC18 @ =gUnknown_2023D44
@@ -52771,7 +52771,7 @@ _080BBBA8:
lsls r1, 4
ldr r0, [sp, 0x5C]
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r0, _080BBC1C @ =gUnknown_2022978
movs r1, 0
strh r1, [r0]
@@ -52910,7 +52910,7 @@ _080BBCBE:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x20
ldrsh r1, [r5, r0]
movs r2, 0x10
@@ -52954,7 +52954,7 @@ _080BBD00:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x20
ldrsh r4, [r5, r0]
cmp r4, 0
@@ -52968,16 +52968,16 @@ _080BBD00:
ldr r4, _080BBDE8 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
bne _080BBD7E
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
mov r1, sp
strh r0, [r1]
mov r2, sp
@@ -52989,10 +52989,10 @@ _080BBD00:
mov r0, sp
ldrh r1, [r0]
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
_080BBD7E:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -53001,13 +53001,13 @@ _080BBD7E:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r3, 0x8
ldrsh r1, [r5, r3]
lsls r0, r1, 4
@@ -53015,7 +53015,7 @@ _080BBD7E:
lsls r0, 2
ldr r4, _080BBDEC @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r1, 0xC
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -53026,10 +53026,10 @@ _080BBD7E:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
_080BBDD2:
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080BBDD8:
add sp, 0x4
pop {r4-r6}
@@ -53051,7 +53051,7 @@ sub_80BBDF0: @ 80BBDF0
ldr r1, _080BBE0C @ =gUnknown_2022B50
ldrb r1, [r1]
strh r1, [r2]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -53067,7 +53067,7 @@ sub_80BBE10: @ 80BBE10
lsrs r4, 24
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, _080BBE38 @ =gUnknown_202401C
ldr r1, [r1]
movs r2, 0xBE
@@ -53075,7 +53075,7 @@ sub_80BBE10: @ 80BBE10
adds r1, r2
str r0, [r1]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -53095,13 +53095,13 @@ sub_80BBE3C: @ 80BBE3C
lsls r5, 1
adds r0, r5
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
adds r0, r5
movs r1, 0
str r1, [r0]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -53178,7 +53178,7 @@ _080BBEC8:
movs r2, 0x20
bl memcpy
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -53259,7 +53259,7 @@ _080BBF64:
movs r2, 0x20
bl memcpy
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -53331,7 +53331,7 @@ _080BC000:
movs r2, 0x20
bl memcpy
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -53363,7 +53363,7 @@ _080BC04C:
strh r1, [r0, 0xE]
_080BC050:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -53384,7 +53384,7 @@ sub_80BC060: @ 80BC060
ldr r1, _080BC08C @ =gUnknown_2023D6E
ldrb r1, [r1]
strb r1, [r2]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -53401,11 +53401,11 @@ sub_80BC090: @ 80BC090
lsrs r5, r0, 24
ldr r0, _080BC0B8 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _080BC0BC @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -53423,7 +53423,7 @@ _080BC0C4:
_080BC0C8:
strh r0, [r1, 0xE]
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -53440,7 +53440,7 @@ sub_80BC0DC: @ 80BC0DC
ldr r1, _080BC0F8 @ =gUnknown_2023D6C
ldrb r1, [r1]
strb r1, [r2]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -53461,7 +53461,7 @@ sub_80BC0FC: @ 80BC0FC
ldr r1, _080BC128 @ =gUnknown_2023D6E
ldrb r1, [r1]
strb r1, [r2]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -53481,7 +53481,7 @@ sub_80BC12C: @ 80BC12C
cmp r0, 0
beq _080BC144
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080BC180
_080BC144:
ldr r0, _080BC188 @ =gUnknown_3005090
@@ -53560,7 +53560,7 @@ sub_80BC19C: @ 80BC19C
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080BC1E0:
pop {r4}
pop {r0}
@@ -53572,8 +53572,8 @@ _080BC1F0: .4byte gUnknown_2037F1A
_080BC1F4: .4byte gUnknown_3005090
thumb_func_end sub_80BC19C
- thumb_func_start sub_80BC1F8
-sub_80BC1F8: @ 80BC1F8
+ thumb_func_start SetAnimBgAttribute
+SetAnimBgAttribute: @ 80BC1F8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -53588,7 +53588,7 @@ _080BC20C:
ldr r0, _080BC228 @ =gUnknown_83E7CCA
adds r0, r6, r0
ldrb r0, [r0]
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, _080BC22C @ =gUnknown_20399B8
strh r0, [r1]
cmp r5, 0x6
@@ -53702,7 +53702,7 @@ _080BC2F0:
ldrb r0, [r0]
ldr r1, _080BC304 @ =gUnknown_20399B8
ldrh r1, [r1]
- bl sub_8000A38
+ bl SetGpuReg
_080BC2FE:
pop {r4-r6}
pop {r0}
@@ -53710,7 +53710,7 @@ _080BC2FE:
.align 2, 0
_080BC304: .4byte gUnknown_20399B8
_080BC308: .4byte gUnknown_83E7CCA
- thumb_func_end sub_80BC1F8
+ thumb_func_end SetAnimBgAttribute
thumb_func_start sub_80BC30C
sub_80BC30C: @ 80BC30C
@@ -53725,7 +53725,7 @@ sub_80BC30C: @ 80BC30C
ldr r0, _080BC338 @ =gUnknown_83E7CCE
adds r0, r2, r0
ldrb r0, [r0]
- bl sub_8000AC4
+ bl GetGpuReg
mov r1, sp
strh r0, [r1]
cmp r4, 0x6
@@ -53818,11 +53818,11 @@ _080BC3C0:
cmp r0, 0x2
beq _080BC3E0
movs r4, 0x3
- ldr r0, _080BC3DC @ =sub_80BC6C8
+ ldr r0, _080BC3DC @ =task00_battle_intro_80BC6C8
b _080BC3E8
.align 2, 0
_080BC3D8: .4byte gUnknown_81E9F10
-_080BC3DC: .4byte sub_80BC6C8
+_080BC3DC: .4byte task00_battle_intro_80BC6C8
_080BC3E0:
ldr r1, _080BC414 @ =gUnknown_83E7CD4
lsls r0, r4, 2
@@ -53830,7 +53830,7 @@ _080BC3E0:
ldr r0, [r0]
_080BC3E8:
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080BC418 @ =gUnknown_3005090
@@ -53859,7 +53859,7 @@ sub_80BC41C: @ 80BC41C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080BC468 @ =gUnknown_2022978
movs r1, 0
strh r1, [r0]
@@ -53871,20 +53871,20 @@ sub_80BC41C: @ 80BC41C
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080BC478 @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -53896,8 +53896,8 @@ _080BC474: .4byte gUnknown_202297E
_080BC478: .4byte 0x00003f3f
thumb_func_end sub_80BC41C
- thumb_func_start sub_80BC47C
-sub_80BC47C: @ 80BC47C
+ thumb_func_start task_battle_intro_80BC47C
+task_battle_intro_80BC47C: @ 80BC47C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -53983,7 +53983,7 @@ _080BC51C:
strh r0, [r1, 0x8]
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
b _080BC6BA
_080BC52C:
ldr r1, _080BC568 @ =gUnknown_2022986
@@ -54150,19 +54150,19 @@ _080BC63A:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0x9C
lsls r1, 8
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBC
lsls r1, 7
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _080BC6BA
.align 2, 0
_080BC690: .4byte gUnknown_202297A
@@ -54185,10 +54185,10 @@ _080BC6BA:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80BC47C
+ thumb_func_end task_battle_intro_80BC47C
- thumb_func_start sub_80BC6C8
-sub_80BC6C8: @ 80BC6C8
+ thumb_func_start task00_battle_intro_80BC6C8
+task00_battle_intro_80BC6C8: @ 80BC6C8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -54240,7 +54240,7 @@ _080BC710:
bne _080BC774
ldr r7, _080BC750 @ =gUnknown_202297A
ldrh r0, [r4, 0x14]
- bl sub_8044EB0
+ bl Cos2
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -54347,7 +54347,7 @@ _080BC7F2:
strh r0, [r1, 0x8]
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
b _080BC9AA
.align 2, 0
_080BC804: .4byte gUnknown_3005090
@@ -54406,13 +54406,13 @@ _080BC858:
bne _080BC8B8
ldr r1, _080BC894 @ =0x00001842
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0xF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080BC8B8
.align 2, 0
_080BC890: .4byte gUnknown_3005090
@@ -54524,19 +54524,19 @@ _080BC934:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0x9C
lsls r1, 8
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBC
lsls r1, 7
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _080BC9AA
.align 2, 0
_080BC988: .4byte gUnknown_2022986
@@ -54560,7 +54560,7 @@ _080BC9AA:
beq _080BC9C2
ldrh r1, [r1, 0x10]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_080BC9C2:
add sp, 0x4
pop {r3}
@@ -54570,10 +54570,10 @@ _080BC9C2:
bx r0
.align 2, 0
_080BC9D0: .4byte gUnknown_3005090
- thumb_func_end sub_80BC6C8
+ thumb_func_end task00_battle_intro_80BC6C8
- thumb_func_start sub_80BC9D4
-sub_80BC9D4: @ 80BC9D4
+ thumb_func_start task_battle_intro_anim
+task_battle_intro_anim: @ 80BC9D4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -54615,14 +54615,14 @@ _080BCA14:
_080BCA28:
ldr r1, _080BCA60 @ =0x00001842
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080BCA64 @ =0x00000808
movs r0, 0x52
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BCA68 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -54669,7 +54669,7 @@ _080BCA94:
strh r0, [r1, 0x8]
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
b _080BCC22
.align 2, 0
_080BCAA4: .4byte gUnknown_3005090
@@ -54832,19 +54832,19 @@ _080BCBAA:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0x9C
lsls r1, 8
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBC
lsls r1, 7
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _080BCC22
.align 2, 0
_080BCC00: .4byte gUnknown_2022986
@@ -54869,7 +54869,7 @@ _080BCC22:
beq _080BCC3C
ldrh r1, [r1, 0x10]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_080BCC3C:
add sp, 0x4
pop {r3}
@@ -54879,7 +54879,7 @@ _080BCC3C:
bx r0
.align 2, 0
_080BCC48: .4byte gUnknown_3005090
- thumb_func_end sub_80BC9D4
+ thumb_func_end task_battle_intro_anim
thumb_func_start sub_80BCC4C
sub_80BCC4C: @ 80BCC4C
@@ -55051,10 +55051,10 @@ _080BCD34:
str r6, [r0]
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080BCDC0 @ =0x00003f06
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
b _080BCEE6
.align 2, 0
_080BCDB4: .4byte gUnknown_202063C
@@ -55180,19 +55180,19 @@ _080BCE84:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0x9C
lsls r1, 8
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBC
lsls r1, 7
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _080BCEE6
.align 2, 0
_080BCECC: .4byte gUnknown_2022986
@@ -55242,7 +55242,7 @@ sub_80BCEF4: @ 80BCEF4
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
ldr r1, _080BCFC4 @ =gUnknown_202401C
@@ -55267,7 +55267,7 @@ sub_80BCEF4: @ 80BCEF4
lsls r2, 5
adds r1, r7, 0
adds r3, r5, 0
- bl sub_80017D0
+ bl LoadBgTiles
adds r0, r6, 0
adds r0, 0x8
cmp r6, r0
@@ -55309,7 +55309,7 @@ _080BCFA0:
lsls r2, 4
mov r1, r9
movs r3, 0
- bl sub_8001888
+ bl LoadBgTilemap
add sp, 0x4
pop {r3-r5}
mov r8, r3
diff --git a/asm/battle_anim_80DE2C0.s b/asm/battle_anim_80DE2C0.s
index d079d0327..2ca21e03e 100644
--- a/asm/battle_anim_80DE2C0.s
+++ b/asm/battle_anim_80DE2C0.s
@@ -77,7 +77,7 @@ sub_80DE300: @ 80DE300
b _080DE346
_080DE340:
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DE346:
pop {r0}
bx r0
@@ -114,7 +114,7 @@ sub_80DE34C: @ 80DE34C
movs r2, 0
bl sub_804A76C
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4-r6}
pop {r0}
bx r0
@@ -134,11 +134,11 @@ sub_80DE39C: @ 80DE39C
strh r0, [r4, 0x30]
ldr r1, _080DE3DC @ =sub_80DE3E0
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x30]
movs r1, 0x10
subs r1, r0
@@ -147,7 +147,7 @@ sub_80DE39C: @ 80DE39C
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -168,7 +168,7 @@ sub_80DE3E0: @ 80DE3E0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x30]
subs r0, 0x1
strh r0, [r4, 0x30]
@@ -197,12 +197,12 @@ sub_80DE420: @ 80DE420
adds r4, r0, 0
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -267,9 +267,9 @@ _080DE49E:
strh r6, [r5, 0x36]
ldr r0, _080DE4D4 @ =sub_8075590
str r0, [r5, 0x1C]
- ldr r1, _080DE4D8 @ =sub_8072740
+ ldr r1, _080DE4D8 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -278,7 +278,7 @@ _080DE49E:
_080DE4CC: .4byte gUnknown_2037F1B
_080DE4D0: .4byte gUnknown_2037F02
_080DE4D4: .4byte sub_8075590
-_080DE4D8: .4byte sub_8072740
+_080DE4D8: .4byte DestroyAnimSprite
thumb_func_end sub_80DE440
thumb_func_start sub_80DE4DC
@@ -288,11 +288,11 @@ sub_80DE4DC: @ 80DE4DC
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4
strh r0, [r4, 0x2E]
ldr r0, _080DE504 @ =sub_80DE508
@@ -316,7 +316,7 @@ sub_80DE508: @ 80DE508
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x30
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -350,13 +350,13 @@ _080DE548:
ble _080DE58C
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r0, 0
strh r0, [r4, 0x32]
adds r2, r4, 0
@@ -491,10 +491,10 @@ _080DE64E:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2E]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080DE684 @ =sub_80DE688
str r0, [r4, 0x1C]
_080DE678:
@@ -518,7 +518,7 @@ sub_80DE688: @ 80DE688
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x30]
adds r1, r0, 0x1
strh r1, [r4, 0x30]
@@ -549,12 +549,12 @@ _080DE6CC:
bge _080DE6EA
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DE6EA:
pop {r4}
pop {r0}
@@ -648,7 +648,7 @@ _080DE788:
cmp r1, r0
bne _080DE798
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080DE798:
pop {r3,r4}
mov r8, r3
@@ -776,7 +776,7 @@ _080DE87E:
cmp r1, r0
bne _080DE88E
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080DE88E:
pop {r3-r5}
mov r8, r3
@@ -810,7 +810,7 @@ sub_80DE8B0: @ 80DE8B0
bl sub_8076D9C
ldr r0, _080DE918 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DE8E4
@@ -853,7 +853,7 @@ _080DE924: .4byte sub_80DE928
sub_80DE928: @ 80DE928
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080DE94A
@@ -865,7 +865,7 @@ sub_80DE928: @ 80DE928
str r0, [r4, 0x1C]
ldr r1, _080DE954 @ =sub_80DE958
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
_080DE94A:
pop {r4}
pop {r0}
@@ -908,7 +908,7 @@ _080DE984:
cmp r0, 0x10
bne _080DE998
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DE998:
pop {r0}
bx r0
@@ -930,16 +930,16 @@ sub_80DE99C: @ 80DE99C
strh r0, [r4, 0x22]
ldr r0, _080DE9D0 @ =sub_8074F6C
str r0, [r4, 0x1C]
- ldr r1, _080DE9D4 @ =sub_8072740
+ ldr r1, _080DE9D4 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080DE9CC: .4byte gUnknown_2037F02
_080DE9D0: .4byte sub_8074F6C
-_080DE9D4: .4byte sub_8072740
+_080DE9D4: .4byte DestroyAnimSprite
thumb_func_end sub_80DE99C
thumb_func_start sub_80DE9D8
@@ -963,7 +963,7 @@ sub_80DE9D8: @ 80DE9D8
bne _080DEA2C
ldr r0, _080DEA18 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080DEA1C
@@ -1016,7 +1016,7 @@ _080DEA38:
strh r1, [r4, 0x24]
ands r0, r3
movs r1, 0x5
- bl sub_8044E30
+ bl Sin
movs r2, 0x36
ldrsh r1, [r4, r2]
lsrs r2, r1, 31
@@ -1032,7 +1032,7 @@ _080DEA38:
cmp r0, 0xF0
bls _080DEA90
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DEA90:
pop {r4,r5}
pop {r0}
@@ -1050,7 +1050,7 @@ sub_80DEA98: @ 80DEA98
cmp r0, 0
beq _080DEAAE
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DEAAE:
pop {r0}
bx r0
@@ -1063,7 +1063,7 @@ sub_80DEAB4: @ 80DEAB4
lsrs r4, r0, 24
ldr r0, _080DEAD0 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1080,7 +1080,7 @@ _080DEAD8:
_080DEADC:
strh r0, [r1, 0xE]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1109,7 +1109,7 @@ _080DEB0C:
_080DEB10:
strh r0, [r1, 0xE]
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -1122,11 +1122,11 @@ sub_80DEB20: @ 80DEB20
adds r5, r0, 0
ldr r1, _080DEB7C @ =0x00001f3f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r0, _080DEB80 @ =gUnknown_2022984
movs r1, 0
strh r1, [r0]
@@ -1134,10 +1134,10 @@ sub_80DEB20: @ 80DEB20
strh r1, [r4]
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
movs r1, 0
bl sub_8075114
@@ -1242,7 +1242,7 @@ _080DEBFE:
_080DEC1E:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
_080DEC26:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -1278,9 +1278,9 @@ sub_80DEC58: @ 80DEC58
adds r4, r0, 0
ldr r1, _080DEC8C @ =0x00003f3f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -1289,9 +1289,9 @@ sub_80DEC58: @ 80DEC58
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
pop {r4}
pop {r0}
bx r0
@@ -1419,7 +1419,7 @@ sub_80DED48: @ 80DED48
lsls r1, 24
asrs r1, 24
movs r0, 0xD7
- bl sub_8072348
+ bl PlaySE1WithPanning
b _080DEDA6
_080DED86:
ldrh r0, [r4, 0x24]
@@ -1445,7 +1445,7 @@ _080DEDA6:
cmp r0, 0
bne _080DEDB4
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DEDB4:
pop {r4}
pop {r0}
@@ -1480,7 +1480,7 @@ sub_80DEDD8: @ 80DEDD8
beq _080DEE2C
ldr r1, _080DEE14 @ =0x00001f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080DEE18 @ =gUnknown_2022988
ldr r2, _080DEE1C @ =0x000098f0
adds r0, r2, 0
@@ -1491,11 +1491,11 @@ sub_80DEDD8: @ 80DEDD8
ldr r0, _080DEE24 @ =gUnknown_2022984
ldrh r1, [r0]
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080DEE28 @ =gUnknown_2022986
ldrh r1, [r0]
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
b _080DEE5C
.align 2, 0
_080DEE14: .4byte 0x00001f3f
@@ -1507,7 +1507,7 @@ _080DEE28: .4byte gUnknown_2022986
_080DEE2C:
ldr r1, _080DEE68 @ =0x00001f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080DEE6C @ =gUnknown_2022988
movs r0, 0xF0
strh r0, [r1]
@@ -1517,17 +1517,17 @@ _080DEE2C:
strh r0, [r4]
movs r0, 0x42
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 7
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
_080DEE5C:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -1545,7 +1545,7 @@ sub_80DEE78: @ 80DEE78
lsrs r4, r0, 24
ldr r1, _080DEEB0 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080DEEB4 @ =gUnknown_2022988
movs r1, 0
strh r1, [r0]
@@ -1558,10 +1558,10 @@ sub_80DEE78: @ 80DEE78
movs r1, 0x80
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
_080DEEA4:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1668,7 +1668,7 @@ sub_80DEF38: @ 80DEF38
cmp r0, r1
bge _080DEF96
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
b _080DEF96
.align 2, 0
_080DEF80: .4byte gUnknown_825E074
@@ -1680,7 +1680,7 @@ _080DEF84:
cmp r0, r1
ble _080DEF96
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DEF96:
pop {r0}
bx r0
@@ -1979,7 +1979,7 @@ _080DF1B0:
strb r0, [r1, 0x15]
_080DF1C6:
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF1CC:
pop {r4-r7}
pop {r0}
@@ -2021,7 +2021,7 @@ sub_80DF1DC: @ 80DF1DC
strh r0, [r4, 0x12]
strh r5, [r4, 0x14]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -2104,7 +2104,7 @@ _080DF2A8:
subs r3, r4
lsls r3, 24
lsrs r3, 24
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x40
@@ -2114,7 +2114,7 @@ _080DF2A8:
lsls r1, 24
asrs r1, 24
movs r0, 0xB3
- bl sub_80722F4
+ bl PlaySE12WithPanning
cmp r4, 0x40
beq _080DF30C
ldr r5, _080DF340 @ =gUnknown_202063C
@@ -2241,7 +2241,7 @@ _080DF3B0:
movs r1, 0x2
str r2, [sp]
str r3, [sp, 0x4]
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
adds r1, r4, r0
ldr r0, _080DF408 @ =sub_80DF428
@@ -2274,7 +2274,7 @@ _080DF40C:
cmp r0, 0
bne _080DF41A
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF41A:
add sp, 0x8
pop {r3}
@@ -2310,7 +2310,7 @@ sub_80DF428: @ 80DF428
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080DF45C:
pop {r4}
pop {r0}
@@ -2375,9 +2375,9 @@ _080DF4C4:
ldrsh r0, [r5, r1]
cmp r0, 0x3D
bne _080DF510
- ldr r1, _080DF518 @ =sub_8072740
+ ldr r1, _080DF518 @ =DestroyAnimSprite
adds r0, r5, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrh r0, [r5, 0x24]
ldrh r2, [r5, 0x20]
adds r0, r2
@@ -2411,7 +2411,7 @@ _080DF510:
pop {r0}
bx r0
.align 2, 0
-_080DF518: .4byte sub_8072740
+_080DF518: .4byte DestroyAnimSprite
_080DF51C: .4byte gUnknown_2037F1B
_080DF520: .4byte sub_8075590
thumb_func_end sub_80DF468
@@ -2437,7 +2437,7 @@ sub_80DF524: @ 80DF524
_080DF544: .4byte gUnknown_3005090
_080DF548:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2457,7 +2457,7 @@ _080DF568:
cmp r0, 0
bne _080DF57A
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF57A:
pop {r4,r5}
pop {r0}
@@ -2469,7 +2469,7 @@ sub_80DF580: @ 80DF580
push {r4-r6,lr}
adds r5, r0, 0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x2E
@@ -2524,7 +2524,7 @@ _080DF5E0:
ldrsh r2, [r5, r0]
adds r0, r6, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r5, 0x34]
adds r0, 0x1
strh r0, [r5, 0x34]
@@ -2548,7 +2548,7 @@ _080DF610:
ldrsh r2, [r5, r0]
adds r0, r6, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r5, 0x34]
adds r0, 0x1
strh r0, [r5, 0x34]
@@ -2591,7 +2591,7 @@ _080DF664:
cmp r0, r1
bge _080DF682
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DF682:
pop {r4-r6}
pop {r0}
@@ -2604,7 +2604,7 @@ sub_80DF688: @ 80DF688
adds r4, r0, 0
ldr r0, _080DF6A0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DF6A8
@@ -2638,7 +2638,7 @@ sub_80DF6C0: @ 80DF6C0
strh r0, [r4, 0x2E]
ldr r0, _080DF6E0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DF6E4
@@ -2689,7 +2689,7 @@ _080DF6EC:
adds r3, 0x1
lsls r3, 24
lsrs r3, 24
- bl sub_80071EC
+ bl CreateSpriteAndAnimate
_080DF738:
movs r1, 0x20
ldrsh r0, [r4, r1]
@@ -2702,7 +2702,7 @@ _080DF738:
cmp r0, r1
bls _080DF752
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DF752:
pop {r4,r5}
pop {r0}
@@ -2715,7 +2715,7 @@ _080DF758: .4byte gUnknown_83FF180
sub_80DF75C: @ 80DF75C
push {r4,lr}
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r0, r1
cmp r0, 0
@@ -2738,7 +2738,7 @@ _080DF77E:
ands r0, r2
orrs r0, r1
strh r0, [r4, 0x4]
- bl sub_8044EC8
+ bl Random
movs r1, 0x7
ands r0, r1
adds r1, r0, 0
@@ -2833,7 +2833,7 @@ _080DF832:
cmp r0, 0x3C
ble _080DF840
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080DF840:
pop {r0}
bx r0
@@ -2857,7 +2857,7 @@ sub_80DF848: @ 80DF848
cmp r0, 0
bne _080DF888
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2878,7 +2878,7 @@ _080DF888:
cmp r0, 0
bne _080DF89A
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF89A:
pop {r4,r5}
pop {r0}
@@ -2901,7 +2901,7 @@ sub_80DF8A0: @ 80DF8A0
cmp r0, 0
bne _080DF8E0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2922,7 +2922,7 @@ _080DF8E0:
cmp r0, 0
bne _080DF8F2
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF8F2:
pop {r4,r5}
pop {r0}
@@ -2979,7 +2979,7 @@ _080DF934:
cmp r0, r1
ble _080DF95C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080DF95C:
pop {r4}
pop {r0}
@@ -3002,7 +3002,7 @@ sub_80DF964: @ 80DF964
cmp r0, 0
bne _080DF9A4
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3023,7 +3023,7 @@ _080DF9A4:
cmp r0, 0
bne _080DF9B6
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DF9B6:
pop {r4,r5}
pop {r0}
@@ -3066,7 +3066,7 @@ _080DF9EC:
_080DFA00:
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080DFA24 @ =gUnknown_2037F1A
ldrb r0, [r0]
bl sub_80768B0
@@ -3077,7 +3077,7 @@ _080DFA00:
movs r0, 0x1
movs r1, 0x2
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _080DFA32
.align 2, 0
_080DFA24: .4byte gUnknown_2037F1A
@@ -3085,7 +3085,7 @@ _080DFA28:
movs r0, 0x2
movs r1, 0x2
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080DFA32:
ldr r0, _080DFA44 @ =gUnknown_3005090
lsls r1, r5, 2
@@ -3124,7 +3124,7 @@ _080DFA64:
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
- bl sub_8000A38
+ bl SetGpuReg
cmp r4, 0xF
beq _080DFA84
b _080DFBCE
@@ -3155,7 +3155,7 @@ _080DFAB4: .4byte gUnknown_2037F1A
_080DFAB8: .4byte gUnknown_2037F1B
_080DFABC:
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r1, r0, 24
_080DFAC6:
@@ -3181,7 +3181,7 @@ _080DFAC6:
mov r0, sp
ldrh r3, [r0, 0xA]
movs r0, 0x1
- bl sub_80017D0
+ bl LoadBgTiles
ldr r0, _080DFB18 @ =gUnknown_3005090
adds r1, r4, r5
lsls r1, 3
@@ -3220,7 +3220,7 @@ _080DFB1C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
- bl sub_8000A38
+ bl SetGpuReg
cmp r4, 0
bne _080DFBCE
_080DFB50:
@@ -3231,7 +3231,7 @@ _080DFB50:
_080DFB58:
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080DFB7C @ =gUnknown_2037F1A
ldrb r0, [r0]
bl sub_80768B0
@@ -3242,7 +3242,7 @@ _080DFB58:
movs r0, 0x1
movs r1, 0x2
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
b _080DFB8A
.align 2, 0
_080DFB7C: .4byte gUnknown_2037F1A
@@ -3250,7 +3250,7 @@ _080DFB80:
movs r0, 0x2
movs r1, 0x2
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080DFB8A:
bl sub_8073788
lsls r0, 24
@@ -3258,7 +3258,7 @@ _080DFB8A:
bne _080DFBC8
ldr r4, _080DFBD8 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3279,10 +3279,10 @@ _080DFB8A:
lsls r1, r0, 2
adds r1, r2
ldrh r1, [r1, 0x2]
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
_080DFBC8:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DFBCE:
add sp, 0x10
pop {r4-r6}
@@ -3315,7 +3315,7 @@ sub_80DFBE4: @ 80DFBE4
lsls r1, 29
lsrs r1, 31
strh r1, [r4, 0xE]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -3339,7 +3339,7 @@ sub_80DFC24: @ 80DFC24
movs r2, 0x1
bl sub_8034BF4
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -3384,19 +3384,19 @@ _080DFC80:
_080DFC94:
ldr r1, _080DFD18 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -3404,7 +3404,7 @@ _080DFC94:
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080DFCCE:
mov r0, sp
bl sub_80752A0
@@ -3423,7 +3423,7 @@ _080DFCCE:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -3447,7 +3447,7 @@ _080DFD2C: .4byte 0x0000ffc8
_080DFD30:
ldr r0, _080DFD48 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DFD54
@@ -3521,7 +3521,7 @@ _080DFDBC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0xC
@@ -3552,7 +3552,7 @@ _080DFDF8:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0xA
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -3608,7 +3608,7 @@ _080DFE66:
lsls r1, 24
asrs r1, 24
movs r0, 0xDD
- bl sub_80722F4
+ bl PlaySE12WithPanning
b _080DFECA
_080DFE7E:
mov r0, sp
@@ -3623,12 +3623,12 @@ _080DFE7E:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080DFEA0:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080DFED4 @ =gUnknown_2022978
movs r1, 0
strh r1, [r0]
@@ -3636,12 +3636,12 @@ _080DFEA0:
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DFECA:
add sp, 0x10
pop {r4}
@@ -3661,7 +3661,7 @@ sub_80DFEDC: @ 80DFEDC
push {r5-r7}
sub sp, 0x4
adds r7, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xFC
lsls r1, 14
@@ -3707,7 +3707,7 @@ _080DFF06:
lsls r3, 24
lsrs r3, 24
adds r0, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
mov r9, r0
mov r1, r9
lsls r1, 24
@@ -3722,7 +3722,7 @@ _080DFF06:
lsls r3, 24
lsrs r3, 24
adds r0, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
mov r8, r0
mov r1, r8
lsls r1, 24
@@ -3738,7 +3738,7 @@ _080DFF06:
adds r0, r5, 0
movs r1, 0x1
str r2, [sp]
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
lsls r6, r0, 4
add r6, r8
@@ -3747,7 +3747,7 @@ _080DFF06:
adds r4, r6, r1
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _080E0004 @ =gUnknown_2037F02
ldrh r0, [r1]
strh r0, [r5, 0x30]
@@ -3924,16 +3924,16 @@ sub_80E00CC: @ 80E00CC
cmp r0, r2
bne _080E0118
adds r0, r3, r5
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x3C
ldrsh r1, [r4, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0118:
pop {r4-r6}
pop {r0}
@@ -4027,18 +4027,18 @@ _080E01AC:
_080E01C4:
ldr r1, _080E0248 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080E024C @ =0x00000d03
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -4046,7 +4046,7 @@ _080E01C4:
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080E01FC:
mov r0, sp
bl sub_80752A0
@@ -4065,7 +4065,7 @@ _080E01FC:
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -4091,7 +4091,7 @@ _080E0260: .4byte 0x0000ffc8
_080E0264:
ldr r0, _080E02A4 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r4, r0, 24
bl sub_8075290
@@ -4176,7 +4176,7 @@ _080E0304:
strh r0, [r5, 0xE]
ldr r0, _080E033C @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4253,7 +4253,7 @@ _080E03A6:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0x5
@@ -4305,7 +4305,7 @@ _080E040A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0xD
@@ -4326,12 +4326,12 @@ _080E042A:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080E044C:
movs r0, 0x1
movs r1, 0x4
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080E0480 @ =gUnknown_2022978
movs r1, 0
strh r1, [r0]
@@ -4339,12 +4339,12 @@ _080E044C:
strh r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E0476:
add sp, 0x10
pop {r4-r6}
@@ -4371,7 +4371,7 @@ sub_80E0488: @ 80E0488
cmp r0, 0
bne _080E04C8
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4392,7 +4392,7 @@ _080E04C8:
cmp r0, 0
bne _080E04DA
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E04DA:
pop {r4,r5}
pop {r0}
@@ -4428,7 +4428,7 @@ _080E04FE:
strh r0, [r4, 0x32]
ldr r0, _080E052C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E0530
@@ -4456,7 +4456,7 @@ _080E0536:
cmp r0, 0x40
ble _080E0552
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0552:
pop {r4}
pop {r0}
@@ -4479,7 +4479,7 @@ sub_80E0558: @ 80E0558
cmp r0, 0
bne _080E0584
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080E0618
.align 2, 0
_080E057C: .4byte gUnknown_3005090
@@ -4523,7 +4523,7 @@ _080E059C:
subs r0, 0x1
strh r0, [r4, 0x14]
ldrb r0, [r5]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -4539,7 +4539,7 @@ _080E05E8:
ldr r0, _080E0620 @ =gUnknown_2037F1B
_080E05EA:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4621,7 +4621,7 @@ _080E065C:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4662,7 +4662,7 @@ _080E06B0:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4706,7 +4706,7 @@ _080E0708:
lsls r2, 1
ldrh r3, [r4, 0xC]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -4743,7 +4743,7 @@ _080E0778:
lsrs r0, 24
bl sub_8075980
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E0788:
pop {r4-r6}
pop {r0}
@@ -4756,7 +4756,7 @@ sub_80E0790: @ 80E0790
adds r4, r0, 0
ldr r0, _080E07AC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4780,7 +4780,7 @@ _080E07BE:
strh r0, [r4, 0x32]
ldrb r1, [r1, 0x2]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080E07DC @ =sub_80E07E0
str r0, [r4, 0x1C]
pop {r4}
@@ -4800,7 +4800,7 @@ sub_80E07E0: @ 80E07E0
strh r0, [r4, 0x2E]
ldr r0, _080E0820 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E0824
@@ -4815,13 +4815,13 @@ sub_80E07E0: @ 80E07E0
cmp r1, 0xF0
ble _080E0812
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0812:
ldrh r1, [r4, 0x2E]
movs r0, 0xFF
ands r0, r1
movs r1, 0x10
- bl sub_8044E30
+ bl Sin
b _080E0848
.align 2, 0
_080E0820: .4byte gUnknown_2037F1A
@@ -4836,13 +4836,13 @@ _080E0824:
cmp r1, 0
bge _080E083C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E083C:
ldrh r1, [r4, 0x2E]
movs r0, 0xFF
ands r0, r1
movs r1, 0x10
- bl sub_8044E4C
+ bl Cos
_080E0848:
strh r0, [r4, 0x26]
pop {r4}
@@ -4874,7 +4874,7 @@ sub_80E0850: @ 80E0850
strh r0, [r4, 0x24]
ldr r0, _080E089C @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5030,7 +5030,7 @@ _080E09A8:
lsrs r0, 24
bl sub_8075980
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080E0A30
_080E09BA:
ldrh r0, [r7, 0x26]
@@ -5040,7 +5040,7 @@ _080E09BA:
lsls r2, 1
ldrh r3, [r7, 0xC]
adds r1, r2, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r7, 0x26]
lsls r0, 24
lsrs r0, 24
@@ -5194,7 +5194,7 @@ _080E0ADA:
cmp r0, 0
beq _080E0AFA
adds r0, r5, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0AFA:
pop {r4-r6}
pop {r0}
@@ -5237,7 +5237,7 @@ _080E0B3E:
strh r0, [r2, 0x1E]
mov r1, r8
ldrb r0, [r1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080E0B7C @ =gUnknown_3005090
@@ -5274,7 +5274,7 @@ _080E0B88:
adds r0, r5, 0
movs r1, 0xE0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8076440
lsls r2, r5, 4
@@ -5293,7 +5293,7 @@ _080E0BAA:
_080E0BB2:
adds r0, r5, 0
movs r1, 0xD0
- bl sub_8075858
+ bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8076440
bl sub_8073788
@@ -5301,7 +5301,7 @@ _080E0BB2:
cmp r0, 0
bne _080E0BD8
ldrb r0, [r6, 0x1E]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsls r2, r5, 4
cmp r0, 0
@@ -5370,7 +5370,7 @@ _080E0C30:
strh r4, [r0, 0x24]
strh r4, [r0, 0x26]
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E0C58:
pop {r3}
mov r8, r3
@@ -5385,7 +5385,7 @@ _080E0C64: .4byte gUnknown_202063C
sub_80E0C68: @ 80E0C68
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xC
@@ -5403,10 +5403,10 @@ sub_80E0C68: @ 80E0C68
ands r0, r2
orrs r0, r1
strh r0, [r4, 0x4]
- bl sub_8044EC8
+ bl Random
ldr r5, _080E0CBC @ =0x000001ff
ands r5, r0
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
movs r0, 0x1
@@ -5517,7 +5517,7 @@ _080E0D5A:
cmp r0, 0x1F
bne _080E0D6E
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0D6E:
pop {r4}
pop {r0}
@@ -5530,11 +5530,11 @@ sub_80E0D74: @ 80E0D74
adds r5, r0, 0
ldr r1, _080E0DD8 @ =0x00001f3f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r0, _080E0DDC @ =gUnknown_2022984
movs r1, 0
strh r1, [r0]
@@ -5542,10 +5542,10 @@ sub_80E0D74: @ 80E0D74
strh r1, [r4]
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080E0DE4 @ =gUnknown_2037F02
ldrh r0, [r0, 0x4]
strh r0, [r5, 0x2E]
@@ -5622,7 +5622,7 @@ _080E0E2A:
bne _080E0E8A
adds r0, r4, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _080E0E5A
_080E0E40:
adds r0, r4, 0
@@ -5646,9 +5646,9 @@ _080E0E5A:
_080E0E62:
ldr r1, _080E0E90 @ =0x00003f3f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -5657,9 +5657,9 @@ _080E0E62:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0E8A:
pop {r4}
pop {r0}
@@ -5712,14 +5712,14 @@ sub_80E0EDC: @ 80E0EDC
ldrh r1, [r4, 0x32]
lsls r1, 16
asrs r1, 24
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r2, 0x30
ldrsh r0, [r4, r2]
ldrh r1, [r4, 0x34]
lsls r1, 16
asrs r1, 24
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x9
@@ -5803,7 +5803,7 @@ _080E0F78:
cmp r0, r1
bne _080E0FA8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E0FA8:
pop {r4}
pop {r0}
@@ -5825,10 +5825,10 @@ sub_80E0FB8: @ 80E0FB8
lsrs r0, 24
str r0, [sp, 0x18]
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r0, _080E1040 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E107C
@@ -5845,7 +5845,7 @@ sub_80E0FB8: @ 80E0FB8
ldr r7, _080E104C @ =gUnknown_2024284
adds r0, r7
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -5854,7 +5854,7 @@ sub_80E0FB8: @ 80E0FB8
muls r0, r5
adds r0, r7
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
ldr r0, _080E1050 @ =gUnknown_2024018
ldr r0, [r0]
@@ -5866,7 +5866,7 @@ sub_80E0FB8: @ 80E0FB8
cmp r0, 0
bne _080E1074
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E1054
@@ -5893,7 +5893,7 @@ _080E1054:
adds r0, r1
_080E1062:
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
b _080E1076
@@ -5919,7 +5919,7 @@ _080E107C:
ldr r7, _080E10E8 @ =gUnknown_202402C
adds r0, r7
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -5928,7 +5928,7 @@ _080E107C:
muls r0, r5
adds r0, r7
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
ldr r0, _080E10EC @ =gUnknown_2024018
ldr r0, [r0]
@@ -5940,7 +5940,7 @@ _080E107C:
cmp r0, 0
bne _080E110C
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E10F4
@@ -5967,7 +5967,7 @@ _080E10F4:
adds r0, r7
_080E1100:
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
b _080E110E
@@ -6051,7 +6051,7 @@ _080E1112:
adds r2, r3, 0
orrs r1, r2
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
ldrb r0, [r5, 0x5]
ands r4, r0
mov r0, r8
@@ -6060,7 +6060,7 @@ _080E1112:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080E1210 @ =gUnknown_3005090
ldr r1, [sp, 0x18]
lsls r4, r1, 2
@@ -6075,7 +6075,7 @@ _080E1112:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
strh r6, [r4, 0x8]
ldr r0, _080E1214 @ =sub_80E1218
str r0, [r4]
@@ -6126,7 +6126,7 @@ sub_80E1218: @ 80E1218
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0xA
@@ -6251,7 +6251,7 @@ _080E1326:
movs r0, 0x18
strh r0, [r4, 0x18]
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6276,7 +6276,7 @@ _080E136C:
strh r0, [r4, 0x24]
ldr r0, _080E13A8 @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -6290,7 +6290,7 @@ _080E136C:
str r0, [sp]
ldr r1, _080E13B0 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080E13B4 @ =gUnknown_2022978
ldrh r5, [r0]
ldr r0, _080E13B8 @ =gUnknown_202297A
@@ -6307,7 +6307,7 @@ _080E13BC:
str r0, [sp]
ldr r1, _080E1438 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080E143C @ =gUnknown_202297C
ldrh r5, [r0]
ldr r0, _080E1440 @ =gUnknown_202297E
@@ -6641,7 +6641,7 @@ _080E1652:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0xE
ldrsh r1, [r6, r2]
cmp r1, 0
@@ -6699,7 +6699,7 @@ _080E16C0:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r6, r1]
cmp r0, 0x10
@@ -6717,7 +6717,7 @@ _080E16E6:
b _080E16F4
_080E16EE:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E16F4:
add sp, 0x14
pop {r3-r5}
@@ -6743,7 +6743,7 @@ sub_80E1704: @ 80E1704
strh r0, [r4, 0x8]
ldr r0, _080E1740 @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -6831,7 +6831,7 @@ _080E17C0:
cmp r0, 0
bne _080E17D8
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E17D8:
pop {r4-r6}
pop {r0}
@@ -6924,7 +6924,7 @@ sub_80E186C: @ 80E186C
ldr r0, _080E18B4 @ =gUnknown_2037F02
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r0, 0x20
ldrsh r1, [r4, r0]
movs r0, 0x22
@@ -6968,7 +6968,7 @@ sub_80E18BC: @ 80E18BC
bl sub_80E184C
adds r0, r4, 0
movs r1, 0x8
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x26]
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -7001,7 +7001,7 @@ sub_80E18BC: @ 80E18BC
cmp r0, 0x3
ble _080E1922
adds r0, r5, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080E1922:
pop {r4,r5}
pop {r0}
@@ -7017,10 +7017,10 @@ sub_80E1928: @ 80E1928
strh r0, [r5, 0x2E]
ldrb r1, [r6]
adds r0, r5, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080E1984 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E194E
@@ -7217,7 +7217,7 @@ _080E1AAA:
cmp r0, 0
bgt _080E1ACA
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _080E1AD4 @ =gUnknown_2037EE2
ldrb r0, [r1]
subs r0, 0x1
@@ -7465,7 +7465,7 @@ sub_80E1C48: @ 80E1C48
strh r0, [r4, 0x14]
_080E1C8C:
ldrb r0, [r2]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E1CBC
@@ -7578,7 +7578,7 @@ sub_80E1D5C: @ 80E1D5C
cmp r0, 0
bne _080E1D7C
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E1D7C:
movs r0, 0
strh r0, [r5, 0x8]
@@ -7619,7 +7619,7 @@ _080E1DA2:
strh r0, [r5, 0x14]
ldr r0, _080E1DF4 @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7711,7 +7711,7 @@ _080E1E84:
cmp r0, 0
bne _080E1E92
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E1E92:
pop {r4,r5}
pop {r0}
@@ -7787,7 +7787,7 @@ _080E1EFC:
lsls r3, 24
lsrs r3, 24
ldr r0, _080E1F6C @ =gUnknown_83FF54C
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -7867,7 +7867,7 @@ sub_80E1F74: @ 80E1F74
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080E1FBA:
pop {r4}
pop {r0}
@@ -7892,7 +7892,7 @@ sub_80E1FC4: @ 80E1FC4
ldrh r0, [r1, 0x2]
strh r0, [r4, 0xA]
ldrb r0, [r1]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080E2014 @ =gUnknown_202063C
@@ -7943,7 +7943,7 @@ sub_80E201C: @ 80E201C
ldrh r3, [r1]
movs r1, 0x10
movs r2, 0x8
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -7966,9 +7966,9 @@ _080E206C:
movs r1, 0x10
movs r2, 0
movs r3, 0
- bl sub_8045274
+ bl BlendPalette
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E207E:
pop {r4,r5}
pop {r0}
@@ -8019,7 +8019,7 @@ sub_80E20D4: @ 80E20D4
adds r5, r0, 0
ldr r6, _080E212C @ =gUnknown_2037F1A
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8077,14 +8077,14 @@ _080E2138:
_080E2152:
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0xA0
lsls r0, 2
strh r0, [r5, 0x2E]
_080E2160:
ldr r0, _080E218C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080E2180
@@ -8134,7 +8134,7 @@ sub_80E2194: @ 80E2194
cmp r0, 0xE
bne _080E21C8
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E21C8:
pop {r0}
bx r0
@@ -8158,7 +8158,7 @@ sub_80E21CC: @ 80E21CC
strh r1, [r6, 0x16]
ldr r5, _080E2220 @ =gUnknown_2037F1A
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E2224
@@ -8308,7 +8308,7 @@ _080E230E:
ldrsh r2, [r3, r0]
ldr r0, _080E234C @ =gUnknown_83FF5CC
movs r3, 0x23
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -8405,7 +8405,7 @@ _080E23CC:
cmp r0, 0
bne _080E23DA
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E23DA:
add sp, 0x14
pop {r3}
@@ -8538,7 +8538,7 @@ sub_80E24A0: @ 80E24A0
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080E24D6:
pop {r4}
pop {r0}
@@ -8562,9 +8562,9 @@ sub_80E24E0: @ 80E24E0
strh r0, [r4, 0x36]
ldrh r0, [r1, 0x8]
strh r0, [r4, 0x2E]
- ldr r1, _080E2510 @ =sub_8072740
+ ldr r1, _080E2510 @ =DestroyAnimSprite
adds r0, r4, 0
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _080E2514 @ =sub_8075764
str r0, [r4, 0x1C]
pop {r4}
@@ -8572,7 +8572,7 @@ sub_80E24E0: @ 80E24E0
bx r0
.align 2, 0
_080E250C: .4byte gUnknown_2037F02
-_080E2510: .4byte sub_8072740
+_080E2510: .4byte DestroyAnimSprite
_080E2514: .4byte sub_8075764
thumb_func_end sub_80E24E0
@@ -8649,7 +8649,7 @@ _080E258A:
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x26]
@@ -8697,7 +8697,7 @@ _080E258A:
bl sub_8075068
mov r1, r10
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8709,7 +8709,7 @@ _080E258A:
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080E2632:
ldr r0, _080E2650 @ =sub_80E2668
str r0, [r7]
@@ -8724,7 +8724,7 @@ _080E264C: .4byte 0x0000ffe0
_080E2650: .4byte sub_80E2668
_080E2654:
mov r0, r9
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E265A:
pop {r3-r5}
mov r8, r3
@@ -8778,7 +8778,7 @@ _080E269A:
lsls r0, 2
ldr r1, _080E26CC @ =gUnknown_202063C
adds r0, r1
- bl sub_8075094
+ bl AnimateBallThrow
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -8797,7 +8797,7 @@ _080E26D0:
lsls r0, 2
ldr r1, _080E26F0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080E276E
@@ -8849,14 +8849,14 @@ _080E26F4:
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
movs r0, 0x26
ldrsh r1, [r4, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
_080E275A:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -8866,7 +8866,7 @@ _080E275A:
_080E2764: .4byte gUnknown_202063C
_080E2768:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E276E:
pop {r4,r5}
pop {r0}
@@ -9061,7 +9061,7 @@ _080E289E:
b _080E28D8
_080E28D2:
adds r0, r2, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E28D8:
pop {r0}
bx r0
@@ -9078,7 +9078,7 @@ sub_80E28DC: @ 80E28DC
cmp r0, 0
bne _080E28F8
adds r0, r1, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080E2920
.align 2, 0
_080E28F4: .4byte gUnknown_2037F02
@@ -9091,7 +9091,7 @@ _080E28F8:
ldrh r0, [r2, 0x2]
strh r0, [r4, 0x8]
ldrb r0, [r2]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9199,7 +9199,7 @@ _080E29DC: .4byte gUnknown_3005090
_080E29E0: .4byte gUnknown_83FF65C
_080E29E4:
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E29EA:
pop {r4-r6}
pop {r0}
@@ -9301,7 +9301,7 @@ sub_80E2A58: @ 80E2A58
cmp r0, 0
bne _080E2AAC
adds r0, r3, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E2AAC:
pop {r0}
bx r0
@@ -9595,7 +9595,7 @@ _080E2CBA:
cmp r0, 0x5
bne _080E2CDC
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E2CDC:
pop {r4}
pop {r0}
@@ -9613,7 +9613,7 @@ sub_80E2CE4: @ 80E2CE4
ldr r0, _080E2D34 @ =gUnknown_3005090
adds r6, r1, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -9651,7 +9651,7 @@ _080E2D40: .4byte 0x0000ffff
_080E2D44:
ldr r0, _080E2D58 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E2D60
@@ -9882,7 +9882,7 @@ _080E2EF0:
movs r1, 0
strh r1, [r0, 0x24]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E2F08:
pop {r4}
pop {r0}
@@ -9916,7 +9916,7 @@ _080E2F3A:
ldrh r0, [r4, 0x3C]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -10107,7 +10107,7 @@ _080E30B2:
strh r0, [r4, 0x34]
strh r1, [r4, 0x36]
adds r0, r4, 0
- bl sub_80754F8
+ bl obj_translate_based_on_private_1_2_3_4
b _080E3188
_080E30C8:
adds r0, r4, 0
@@ -10197,7 +10197,7 @@ _080E315C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -10218,7 +10218,7 @@ _080E3188:
b _080E3196
_080E3190:
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E3196:
pop {r4,r5}
pop {r0}
@@ -10270,7 +10270,7 @@ sub_80E319C: @ 80E319C
lsls r2, 16
asrs r2, 16
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
_080E31FA:
movs r0, 0x38
ldrsh r1, [r4, r0]
@@ -10279,7 +10279,7 @@ _080E31FA:
cmp r1, r0
bne _080E320C
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E320C:
ldrh r0, [r4, 0x38]
adds r0, 0x1
@@ -10303,7 +10303,7 @@ sub_80E321C: @ 80E321C
movs r1, 0x3
bl sub_8074480
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E3258
@@ -10360,7 +10360,7 @@ sub_80E3294: @ 80E3294
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
@@ -10401,7 +10401,7 @@ _080E32DC:
ldrsh r2, [r4, r0]
adds r0, r5, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r4, 0xE]
adds r0, 0x1
strh r0, [r4, 0xE]
@@ -10434,7 +10434,7 @@ _080E3334:
ldr r0, _080E336C @ =gUnknown_2037F1A
ldrb r0, [r0]
movs r1, 0
- bl sub_80351A8
+ bl LoadBattleMonGfxAndAnimate
adds r3, r7, 0
mov r4, r9
movs r1, 0xF
@@ -10471,7 +10471,7 @@ sub_80E3374: @ 80E3374
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _080E33A0 @ =gUnknown_3005090
@@ -10559,7 +10559,7 @@ _080E3412:
lsls r1, 24
asrs r1, 24
movs r0, 0x76
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r1, _080E3440 @ =0xfffff800
adds r0, r1, 0
ldrh r2, [r4, 0x1C]
@@ -10632,9 +10632,9 @@ _080E34A4:
lsls r1, 24
asrs r1, 24
movs r0, 0x76
- bl sub_80722F4
+ bl PlaySE12WithPanning
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E34C6:
pop {r4-r6}
pop {r0}
@@ -10649,7 +10649,7 @@ sub_80E34D0: @ 80E34D0
adds r5, r0, 0
ldr r4, _080E34F4 @ =gUnknown_2037F1B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E34FC
@@ -10729,7 +10729,7 @@ _080E3564:
lsls r1, 24
asrs r1, 24
movs r0, 0xC6
- bl sub_80722F4
+ bl PlaySE12WithPanning
movs r0, 0
strh r0, [r4, 0x26]
b _080E361C
@@ -10758,7 +10758,7 @@ _080E3588:
lsls r1, 24
asrs r1, 24
movs r0, 0xC6
- bl sub_80722F4
+ bl PlaySE12WithPanning
strh r5, [r4, 0x30]
strh r5, [r4, 0x26]
b _080E361C
@@ -10802,7 +10802,7 @@ _080E35F8:
lsls r1, 24
asrs r1, 24
movs r0, 0xB9
- bl sub_80722F4
+ bl PlaySE12WithPanning
movs r0, 0
strh r0, [r4, 0x30]
_080E361C:
@@ -10838,7 +10838,7 @@ _080E3624:
cmp r0, 0x7
bne _080E365E
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E365E:
pop {r4,r5}
pop {r0}
@@ -10856,7 +10856,7 @@ sub_80E3664: @ 80E3664
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x1
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
lsrs r1, r0, 16
str r1, [sp]
@@ -10864,7 +10864,7 @@ sub_80E3664: @ 80E3664
cmp r6, 0
blt _080E36A6
movs r0, 0x1
- bl sub_8075FBC
+ bl duplicate_obj_of_side_rel2move_in_transparent_mode
lsls r0, 16
lsrs r1, r0, 16
mov r9, r1
@@ -10876,10 +10876,10 @@ sub_80E3664: @ 80E3664
lsls r0, 2
ldr r1, _080E36B0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_080E36A6:
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080E37BA
.align 2, 0
_080E36B0: .4byte gUnknown_202063C
@@ -11042,7 +11042,7 @@ sub_80E37D4: @ 80E37D4
cmp r0, 0
bne _080E37F2
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E37F2:
pop {r0}
bx r0
@@ -11101,7 +11101,7 @@ _080E3846:
ldrsh r0, [r4, r2]
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -11156,7 +11156,7 @@ _080E3890:
subs r0, 0x1
strh r0, [r1]
adds r0, r4, 0
- bl sub_8076030
+ bl obj_delete_but_dont_free_vram
_080E38CE:
pop {r4,r5}
pop {r0}
@@ -11203,7 +11203,7 @@ _080E390C:
strh r0, [r3, 0xE]
_080E3918:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -11251,7 +11251,7 @@ _080E3964:
.4byte _080E3D90
_080E3978:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E39C4 @ =gUnknown_3005090
@@ -11268,7 +11268,7 @@ _080E3978:
strh r0, [r6, 0xA]
ldr r0, _080E39C8 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11339,7 +11339,7 @@ _080E3A28: .4byte gUnknown_3005090
_080E3A2C:
ldr r4, _080E3A90 @ =gUnknown_2037F1A
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E3ACC
@@ -11353,7 +11353,7 @@ _080E3A2C:
ldr r5, _080E3A98 @ =gUnknown_2024284
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -11362,7 +11362,7 @@ _080E3A2C:
muls r0, r6
adds r0, r5
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
ldr r0, _080E3A9C @ =gUnknown_2024018
ldr r0, [r0]
@@ -11379,7 +11379,7 @@ _080E3A2C:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
b _080E3AA2
@@ -11392,7 +11392,7 @@ _080E3AA0:
ldrh r5, [r1, 0x2]
_080E3AA2:
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080E3AC8 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -11422,7 +11422,7 @@ _080E3ACC:
ldr r5, _080E3B28 @ =gUnknown_202402C
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ldrb r0, [r4]
lsls r0, 1
@@ -11431,7 +11431,7 @@ _080E3ACC:
muls r0, r6
adds r0, r5
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
ldr r0, _080E3B2C @ =gUnknown_2024018
ldr r0, [r0]
@@ -11448,7 +11448,7 @@ _080E3ACC:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
b _080E3B32
@@ -11460,7 +11460,7 @@ _080E3B30:
ldrh r5, [r1, 0x2]
_080E3B32:
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080E3BD0 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -11525,7 +11525,7 @@ _080E3B54:
ldr r3, _080E3BE4 @ =0x00007fff
movs r1, 0x10
movs r2, 0x6
- bl sub_8045274
+ bl BlendPalette
_080E3BBE:
ldr r0, _080E3BE8 @ =gUnknown_3005090
mov r3, r8
@@ -11561,7 +11561,7 @@ _080E3BEC:
strh r0, [r6, 0xA]
ldr r0, _080E3C3C @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11618,7 +11618,7 @@ _080E3C5A:
bne _080E3CDA
ldr r0, _080E3CB0 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E3CB8
@@ -11682,7 +11682,7 @@ _080E3D04: .4byte 0x0000ffff
_080E3D08: .4byte gUnknown_3005090
_080E3D0C:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E3D58 @ =gUnknown_3005090
@@ -11702,7 +11702,7 @@ _080E3D0C:
bl sub_8076B20
ldr r0, _080E3D60 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
mov r9, r4
cmp r0, 0
@@ -11746,7 +11746,7 @@ _080E3D82:
_080E3D8C: .4byte gUnknown_3005090
_080E3D90:
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E3E04 @ =gUnknown_3005090
@@ -11765,7 +11765,7 @@ _080E3D90:
mov r10, r0
ldrb r0, [r0]
str r2, [sp, 0x18]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
mov r9, r4
ldr r2, [sp, 0x18]
@@ -11848,7 +11848,7 @@ _080E3E48:
cmp r0, 0
bne _080E3E6C
mov r0, r8
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E3E6C:
add sp, 0x1C
pop {r3-r5}
@@ -11888,7 +11888,7 @@ _080E3E96:
lsls r1, 24
asrs r1, 24
movs r0, 0x73
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r0, _080E3F18 @ =gUnknown_2037F1B
ldrb r0, [r0]
movs r1, 0x1
@@ -11911,13 +11911,13 @@ _080E3E96:
strb r0, [r2]
ldr r0, _080E3F20 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080E3FB8
movs r0, 0x1
- bl sub_80749D4
+ bl GetAnimBankSpriteId
ldr r2, _080E3F24 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -11951,7 +11951,7 @@ _080E3F36:
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x30]
adds r0, r2, 0x5
@@ -11981,7 +11981,7 @@ _080E3F6A:
strh r0, [r4, 0x32]
ldr r0, _080E3F94 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E3F98
@@ -12011,7 +12011,7 @@ _080E3FA4:
cmp r0, 0x2
bne _080E3FB8
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E3FB8:
pop {r4}
pop {r0}
@@ -12213,7 +12213,7 @@ _080E412E:
movs r1, 0
strh r1, [r0, 0x24]
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E414C:
pop {r4,r5}
pop {r0}
@@ -12235,14 +12235,14 @@ sub_80E4160: @ 80E4160
ldr r0, _080E41C8 @ =gUnknown_3005090
adds r4, r1, r0
movs r0, 0
- bl sub_80749D4
+ bl GetAnimBankSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
strh r0, [r4, 0xE]
ldr r0, _080E41CC @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r2, 0x1
negs r2, r2
@@ -12412,7 +12412,7 @@ _080E42C8: .4byte gUnknown_202063C
_080E42CC: .4byte gUnknown_825E074
_080E42D0:
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E42D6:
pop {r4-r6}
pop {r0}
@@ -12425,7 +12425,7 @@ sub_80E42DC: @ 80E42DC
adds r4, r0, 0
ldr r0, _080E4330 @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldrh r0, [r4, 0x2E]
ldrh r1, [r4, 0x30]
@@ -12436,12 +12436,12 @@ sub_80E42DC: @ 80E42DC
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x14
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
adds r0, r4, 0
adds r0, 0x3F
@@ -12451,7 +12451,7 @@ sub_80E42DC: @ 80E42DC
cmp r0, 0
beq _080E4322
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080E4322:
ldrh r0, [r4, 0x32]
adds r0, 0x1
@@ -12469,7 +12469,7 @@ sub_80E4334: @ 80E4334
adds r4, r0, 0
ldr r0, _080E436C @ =gUnknown_2037F1B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E4378
@@ -12488,7 +12488,7 @@ sub_80E4334: @ 80E4334
strh r0, [r4, 0x30]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080E4392
.align 2, 0
_080E436C: .4byte gUnknown_2037F1B
@@ -12549,7 +12549,7 @@ _080E43CE:
str r0, [r5, 0x1C]
lsls r1, 8
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
@@ -12617,7 +12617,7 @@ _080E4448:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x3C
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -12676,7 +12676,7 @@ _080E44B8:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x3C
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -12688,7 +12688,7 @@ _080E44D6:
b _080E44E4
_080E44DE:
adds r0, r4, 0
- bl sub_8074EE0
+ bl move_anim_8074EE0
_080E44E4:
pop {r4}
pop {r0}
@@ -12738,7 +12738,7 @@ _080E4532:
strh r0, [r2, 0xE]
_080E4534:
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
thumb_func_end sub_80E44EC
@@ -12757,7 +12757,7 @@ sub_80E4540: @ 80E4540
strh r0, [r4, 0x8]
ldr r0, _080E457C @ =gUnknown_2037F02
ldrb r0, [r0]
- bl sub_80749D4
+ bl GetAnimBankSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -12845,7 +12845,7 @@ _080E45FC:
cmp r0, 0
bne _080E4614
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080E4614:
pop {r4-r6}
pop {r0}
diff --git a/asm/battle_anim_80EEC0C.s b/asm/battle_anim_80EEC0C.s
index 6d609b65c..b30b7970a 100644
--- a/asm/battle_anim_80EEC0C.s
+++ b/asm/battle_anim_80EEC0C.s
@@ -25,37 +25,37 @@ sub_80EEC0C: @ 80EEC0C
strh r1, [r0]
ldr r1, _080EEDC0 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080EEDC4 @ =0x00003f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080EEDC8 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x4
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0x1
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
movs r0, 0x1
movs r1, 0x3
movs r2, 0x1
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080EEDCC @ =gUnknown_3004FF0
adds r4, r0
ldrb r0, [r4]
@@ -70,12 +70,12 @@ sub_80EEC0C: @ 80EEC0C
lsls r6, 24
lsrs r6, 24
ldr r0, _080EEDD4 @ =nullsub_8
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x14]
ldr r0, _080EEDD4 @ =nullsub_8
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
mov r10, r0
mov r2, r10
lsls r2, 24
@@ -167,7 +167,7 @@ sub_80EEC0C: @ 80EEC0C
ldrb r1, [r1, 0x8]
lsls r1, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r1, _080EEDE4 @ =gUnknown_2022978
ldrh r0, [r7, 0x20]
negs r0, r0
@@ -288,7 +288,7 @@ _080EEE5E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r2, 0x20
ldrsh r0, [r5, r2]
cmp r0, 0x8
@@ -329,7 +329,7 @@ _080EEE9C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x20
ldrsh r4, [r5, r0]
cmp r4, 0
@@ -343,10 +343,10 @@ _080EEE9C:
ldr r4, _080EEFBC @ =0x00003f3f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8073788
lsls r0, 24
cmp r0, 0
@@ -354,10 +354,10 @@ _080EEE9C:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
_080EEF00:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 8
@@ -366,13 +366,13 @@ _080EEF00:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r4, 0x8
ldrsh r1, [r5, r4]
lsls r0, r1, 4
@@ -380,18 +380,18 @@ _080EEF00:
lsls r0, 2
ldr r6, _080EEFC0 @ =gUnknown_202063C
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
movs r0, 0xC
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80BC1F8
+ bl SetAnimBgAttribute
ldr r0, _080EEFC4 @ =gUnknown_3004FF0
add r0, r8
ldrb r0, [r0]
@@ -431,7 +431,7 @@ _080EEF00:
orrs r2, r5
strb r2, [r0, 0x5]
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080EEFA8:
pop {r3}
mov r8, r3
@@ -472,11 +472,11 @@ sub_80EEFC8: @ 80EEFC8
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF0A8 @ =0x0000d709
- bl sub_80089B8
+ bl AllocSpritePalette
mov r2, r9
strb r0, [r2]
ldr r0, _080EF0AC @ =0x0000d70a
- bl sub_80089B8
+ bl AllocSpritePalette
strb r0, [r7]
ldrb r0, [r5, 0x5]
lsrs r0, 4
@@ -504,7 +504,7 @@ sub_80EEFC8: @ 80EEFC8
adds r1, r3, r1
movs r2, 0x20
str r3, [sp]
- bl sub_80703EC
+ bl LoadPalette
lsls r4, 1
add r4, r8
ldrb r0, [r7]
@@ -514,7 +514,7 @@ sub_80EEFC8: @ 80EEFC8
adds r0, r4, 0
adds r1, r3, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r0, r9
ldrb r1, [r0]
lsls r1, 4
@@ -574,7 +574,7 @@ sub_80EF0B4: @ 80EF0B4
mov r0, sp
bl sub_80EEFC8
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -606,16 +606,16 @@ sub_80EF0E0: @ 80EF0E0
lsls r6, 24
lsrs r6, 24
ldr r0, _080EF170 @ =0x0000d709
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _080EF174 @ =0x0000d70a
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _080EF178 @ =0x0000d6ff
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _080EF17C @ =0x0000d704
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsls r4, 4
ldrb r2, [r5, 0x5]
@@ -668,7 +668,7 @@ sub_80EF180: @ 80EF180
ldrb r0, [r0]
bl sub_80EF0E0
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -722,7 +722,7 @@ sub_80EF1CC: @ 80EF1CC
blt _080EF28C
strh r6, [r4, 0x8]
ldr r0, _080EF21C @ =0x0000d709
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r2, r0, 24
movs r3, 0x1C
@@ -761,7 +761,7 @@ _080EF232:
ldrb r2, [r4, 0xC]
ldr r3, _080EF258 @ =0x00007f74
movs r1, 0x1
- bl sub_8045274
+ bl BlendPalette
movs r3, 0xC
ldrsh r0, [r4, r3]
cmp r0, 0x10
@@ -789,13 +789,13 @@ _080EF26A:
ldrb r2, [r4, 0xC]
ldr r3, _080EF294 @ =0x00007f74
movs r1, 0x1
- bl sub_8045274
+ bl BlendPalette
movs r3, 0xC
ldrsh r0, [r4, r3]
cmp r0, 0
bne _080EF28C
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080EF28C:
pop {r4-r6}
pop {r0}
@@ -853,7 +853,7 @@ _080EF2E6:
adds r0, r5, 0
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
adds r0, r5, 0
bl sub_8076440
movs r0, 0x1C
@@ -882,7 +882,7 @@ _080EF318:
orrs r1, r2
strb r1, [r0]
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080EF338:
pop {r4-r6}
pop {r0}
@@ -906,7 +906,7 @@ sub_80EF344: @ 80EF344
adds r1, r0, r1
ldrb r1, [r1]
mov r9, r1
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080EF38C
@@ -936,7 +936,7 @@ _080EF38C:
_080EF39C:
adds r0, r1
movs r1, 0x26
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80EF52C
@@ -990,7 +990,7 @@ _080EF3D8:
mov r0, r8
str r0, [sp]
adds r0, r4, 0
- bl sub_80F05EC
+ bl LaunchBallStarsTask
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x1C]
@@ -1006,7 +1006,7 @@ _080EF3D8:
ldrb r1, [r5]
movs r0, 0
mov r3, r8
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x1E]
@@ -1037,7 +1037,7 @@ _080EF458:
cmp r0, 0
bne _080EF482
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080EF482:
add sp, 0xC
pop {r3,r4}
@@ -1059,9 +1059,9 @@ sub_80EF490: @ 80EF490
bl sub_80EF52C
lsls r0, 24
lsrs r0, 24
- bl sub_804BEF4
+ bl LoadBallGfx
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1080,9 +1080,9 @@ sub_80EF4B8: @ 80EF4B8
bl sub_80EF52C
lsls r0, 24
lsrs r0, 24
- bl sub_804BF64
+ bl FreeBallGfx
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -1122,7 +1122,7 @@ _080EF514:
_080EF518:
strh r0, [r1, 0xE]
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -1224,7 +1224,7 @@ sub_80EF5AC: @ 80EF5AC
movs r1, 0x20
movs r2, 0x50
movs r3, 0x1D
- bl sub_8006F8C
+ bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1329,7 +1329,7 @@ sub_80EF698: @ 80EF698
cmp r1, r0
bne _080EF6C2
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080EF6C2:
pop {r0}
bx r0
@@ -1376,7 +1376,7 @@ _080EF708:
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_807685C
@@ -1395,7 +1395,7 @@ _080EF708:
orrs r6, r1
adds r1, r5, 0
adds r2, r6, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1429,7 +1429,7 @@ _080EF708:
ldr r0, _080EF7D8 @ =nullsub_8
str r0, [r4]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080EF7DC @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1475,7 +1475,7 @@ sub_80EF7EC: @ 80EF7EC
lsrs r5, r0, 24
ldr r6, _080EF84C @ =gUnknown_202063C
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080EF850 @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1491,7 +1491,7 @@ sub_80EF7EC: @ 80EF7EC
bne _080EF846
movs r0, 0x36
movs r1, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r0, _080EF854 @ =gUnknown_3005090
lsls r4, r5, 2
adds r4, r5
@@ -1509,7 +1509,7 @@ sub_80EF7EC: @ 80EF7EC
str r1, [r0]
ldr r0, _080EF85C @ =sub_80EF864
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r0, _080EF860 @ =sub_80EF698
str r0, [r4]
_080EF846:
@@ -1532,7 +1532,7 @@ sub_80EF864: @ 80EF864
lsrs r5, r0, 24
ldr r6, _080EF8B8 @ =gUnknown_202063C
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _080EF8BC @ =gUnknown_2023D44
lsls r0, 24
lsrs r0, 24
@@ -1548,7 +1548,7 @@ sub_80EF864: @ 80EF864
cmp r0, 0
bge _080EF8B0
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -1558,9 +1558,9 @@ sub_80EF864: @ 80EF864
lsls r0, 2
adds r0, r6
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080EF8B0:
pop {r4-r6}
pop {r0}
@@ -1601,7 +1601,7 @@ sub_80EF8F0: @ 80EF8F0
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080EF99E
@@ -1628,7 +1628,7 @@ _080EF928: .4byte sub_80F052C
_080EF92C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x24]
ldrh r1, [r4, 0x20]
adds r0, r1
@@ -1673,13 +1673,13 @@ _080EF954:
str r5, [sp]
movs r2, 0x1
movs r3, 0x1C
- bl sub_80F05EC
+ bl LaunchBallStarsTask
ldr r0, _080EF9B0 @ =gUnknown_2037F1B
ldrb r1, [r0]
movs r0, 0
movs r2, 0xE
adds r3, r5, 0
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
_080EF99E:
add sp, 0x4
pop {r4,r5}
@@ -1704,7 +1704,7 @@ sub_80EF9B4: @ 80EF9B4
bne _080EF9F0
ldr r0, _080EF9F8 @ =nullsub_43
movs r1, 0x32
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x38]
@@ -1824,7 +1824,7 @@ _080EFAB4:
adds r0, r4, 0
adds r1, r2, 0
movs r3, 0
- bl sub_8075858
+ bl obj_id_set_rotscale
ldrh r0, [r5, 0xC]
ldrh r1, [r5, 0xE]
adds r0, r1
@@ -1879,10 +1879,10 @@ _080EFB20:
cmp r0, 0xA
ble _080EFB48
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
adds r0, r7, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r7, 0x38]
ldr r0, _080EFB54 @ =sub_80EFB58
@@ -1913,14 +1913,14 @@ sub_80EFB58: @ 80EFB58
strh r1, [r4, 0x38]
movs r0, 0
movs r1, 0x28
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
movs r0, 0x36
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldr r0, _080EFB98 @ =sub_80EFB9C
@@ -1951,7 +1951,7 @@ _080EFBB2:
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -2011,7 +2011,7 @@ _080EFC26:
ldrsh r0, [r4, r2]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -2035,7 +2035,7 @@ _080EFC52:
strh r5, [r4, 0x34]
movs r0, 0x40
movs r1, 0x28
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
@@ -2089,7 +2089,7 @@ sub_80EFCA0: @ 80EFCA0
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080EFCE4 @ =gUnknown_2024018
ldr r0, [r0]
ldr r0, [r0, 0x8]
@@ -2206,12 +2206,12 @@ _080EFD7A:
bge _080EFDB6
adds r0, r4, 0
movs r1, 0x2
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _080EFF7A
_080EFDB6:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _080EFF7A
_080EFDC0:
ldr r1, _080EFDE4 @ =gUnknown_2024018
@@ -2300,12 +2300,12 @@ _080EFE3A:
bge _080EFE68
adds r0, r4, 0
movs r1, 0x2
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _080EFE70
_080EFE68:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
_080EFE70:
ldr r1, _080EFE94 @ =gUnknown_2024018
ldr r5, [r1]
@@ -2423,21 +2423,21 @@ _080EFF34:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x3
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r6, 0x36
ldrsh r0, [r4, r6]
cmp r0, 0
bge _080EFF6C
adds r0, r4, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _080EFF74
.align 2, 0
_080EFF68: .4byte 0xffffff00
_080EFF6C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080EFF74:
movs r0, 0x17
bl sub_80722CC
@@ -2514,7 +2514,7 @@ sub_80EFFC4: @ 80EFFC4
lsls r0, r1
movs r1, 0x6
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
adds r0, r6, 0
bl sub_80F01B8
b _080F0088
@@ -2533,7 +2533,7 @@ _080F0008:
movs r1, 0x2
movs r2, 0x6
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F0088
_080F0026:
cmp r1, 0x5F
@@ -2542,7 +2542,7 @@ _080F0026:
movs r1, 0
strb r1, [r0]
movs r0, 0x1
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
bl m4aMPlayAllStop
ldr r0, _080F0048 @ =0x0000013f
bl sub_80722CC
@@ -2566,7 +2566,7 @@ _080F004C:
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r7]
adds r0, r4
ldrb r1, [r0]
@@ -2574,7 +2574,7 @@ _080F004C:
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
mov r0, r8
strh r0, [r6, 0x2E]
ldr r0, _080F00A0 @ =sub_80F00A4
@@ -2624,13 +2624,13 @@ _080F00C2:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4, 0x14]
ldrh r0, [r0, 0x2]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
adds r0, 0x10
@@ -2642,7 +2642,7 @@ _080F00C2:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F014E
.align 2, 0
_080F010C: .4byte 0x00007fff
@@ -2665,7 +2665,7 @@ _080F0110:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x32
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -2694,10 +2694,10 @@ _080F0156:
bne _080F017C
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
strh r5, [r4, 0x2E]
ldr r0, _080F0188 @ =sub_80F018C
str r0, [r4, 0x1C]
@@ -2727,9 +2727,9 @@ sub_80F018C: @ 80F018C
_080F01A0: .4byte 0x0000ffff
_080F01A4:
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F01B0:
pop {r4}
pop {r0}
@@ -2775,7 +2775,7 @@ _080F01F2:
ldrsh r2, [r6, r0]
ldr r0, _080F0268 @ =gUnknown_840C104
mov r3, r8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2811,7 +2811,7 @@ _080F01F2:
ldr r0, _080F0274 @ =gUnknown_840C068
ldrb r1, [r0, 0x4]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080F024E:
adds r7, 0x1
cmp r7, 0x2
@@ -2849,12 +2849,12 @@ sub_80F0278: @ 80F0278
orrs r0, r1
strb r0, [r3]
adds r0, r4, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080F02A8
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F02A8:
pop {r4}
pop {r0}
@@ -2867,10 +2867,10 @@ sub_80F02B0: @ 80F02B0
sub sp, 0x4
adds r4, r0, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080F0364 @ =sub_80F0378
str r0, [r4, 0x1C]
ldr r0, _080F0368 @ =gUnknown_2023D68
@@ -2892,13 +2892,13 @@ sub_80F02B0: @ 80F02B0
str r5, [sp]
movs r2, 0x1
movs r3, 0x1C
- bl sub_80F05EC
+ bl LaunchBallStarsTask
ldr r0, _080F036C @ =gUnknown_2037F1B
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0xE
adds r3, r5, 0
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
_080F0302:
ldr r6, _080F0370 @ =gUnknown_202063C
ldr r5, _080F0374 @ =gUnknown_2023D44
@@ -2924,7 +2924,7 @@ _080F0302:
lsls r0, 2
adds r0, r6
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2932,7 +2932,7 @@ _080F0302:
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007824
+ bl AnimateSprite
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2991,7 +2991,7 @@ _080F0396:
bge _080F03D0
adds r0, r1, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r5, 0x1
b _080F03F0
.align 2, 0
@@ -3065,7 +3065,7 @@ _080F03F0:
ldr r0, _080F0474 @ =gUnknown_2024005
strb r6, [r0]
movs r0, 0x1
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
_080F0456:
pop {r4-r7}
pop {r0}
@@ -3168,7 +3168,7 @@ _080F050A:
movs r0, 0
strb r0, [r1]
movs r0, 0x1
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
_080F051E:
pop {r4}
pop {r0}
@@ -3240,7 +3240,7 @@ _080F0590:
ldr r0, _080F05B0 @ =gUnknown_2024005
strb r1, [r0]
movs r0, 0x1
- bl sub_804828C
+ bl UpdateOamPriorityInAllHealthboxes
_080F05A4:
pop {r4}
pop {r0}
@@ -3258,7 +3258,7 @@ sub_80F05B4: @ 80F05B4
lsrs r5, r0, 21
adds r4, r5, r1
ldrh r0, [r4, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _080F05E4 @ =0xffff0000
cmp r0, r1
@@ -3278,8 +3278,8 @@ _080F05E4: .4byte 0xffff0000
_080F05E8: .4byte gUnknown_840BFA8
thumb_func_end sub_80F05B4
- thumb_func_start sub_80F05EC
-sub_80F05EC: @ 80F05EC
+ thumb_func_start LaunchBallStarsTask
+LaunchBallStarsTask: @ 80F05EC
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -3313,7 +3313,7 @@ sub_80F05EC: @ 80F05EC
adds r0, r1
ldr r0, [r0]
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3343,7 +3343,7 @@ sub_80F05EC: @ 80F05EC
.align 2, 0
_080F066C: .4byte gUnknown_840C074
_080F0670: .4byte gUnknown_3005090
- thumb_func_end sub_80F05EC
+ thumb_func_end LaunchBallStarsTask
thumb_func_start sub_80F0674
sub_80F0674: @ 80F0674
@@ -3407,7 +3407,7 @@ sub_80F06A4: @ 80F06A4
lsls r0, 3
ldr r4, _080F0784 @ =gUnknown_840C0A4
adds r0, r4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -3425,7 +3425,7 @@ sub_80F06A4: @ 80F06A4
adds r0, r1, r0
ldrb r1, [r0]
adds r0, r7, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, _080F0790 @ =sub_80F07BC
@@ -3479,7 +3479,7 @@ _080F0740:
strh r0, [r1, 0x3C]
_080F0776:
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
b _080F07AC
.align 2, 0
_080F0780: .4byte gUnknown_3005090
@@ -3539,13 +3539,13 @@ sub_80F07DC: @ 80F07DC
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0x2
@@ -3606,7 +3606,7 @@ _080F085E:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -3621,7 +3621,7 @@ _080F085E:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F090C @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0910 @ =sub_80F0D5C
@@ -3668,7 +3668,7 @@ _080F08BE:
strh r0, [r1, 0x3C]
_080F08E6:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -3732,7 +3732,7 @@ _080F0962:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -3747,7 +3747,7 @@ _080F0962:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F0A10 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0A14 @ =sub_80F0D5C
@@ -3794,7 +3794,7 @@ _080F09C2:
strh r0, [r1, 0x3C]
_080F09EA:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -3858,7 +3858,7 @@ _080F0A66:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -3872,7 +3872,7 @@ _080F0A66:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F0B10 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0B14 @ =sub_80F0D5C
@@ -3918,7 +3918,7 @@ _080F0AC2:
strh r0, [r1, 0x3C]
_080F0AEA:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -3982,7 +3982,7 @@ _080F0B66:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -3997,7 +3997,7 @@ _080F0B66:
add r0, r8
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F0C18 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0C1C @ =sub_80F0D5C
@@ -4046,7 +4046,7 @@ _080F0BCA:
strh r0, [r1, 0x3C]
_080F0BF2:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -4122,7 +4122,7 @@ _080F0C84:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -4136,7 +4136,7 @@ _080F0C84:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F0D48 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0D4C @ =sub_80F0D5C
@@ -4196,7 +4196,7 @@ _080F0CE0:
strh r0, [r1, 0x3C]
_080F0D24:
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080F0D2A:
add sp, 0x18
pop {r3-r5}
@@ -4225,13 +4225,13 @@ sub_80F0D5C: @ 80F0D5C
ldrsh r0, [r4, r1]
movs r2, 0x30
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x36]
ldrh r1, [r4, 0x2E]
@@ -4306,7 +4306,7 @@ _080F0DFA:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -4320,7 +4320,7 @@ _080F0DFA:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F0EA0 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F0EA4 @ =sub_80F0EB0
@@ -4364,7 +4364,7 @@ _080F0E52:
strh r0, [r1, 0x3C]
_080F0E7A:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -4392,19 +4392,19 @@ sub_80F0EB0: @ 80F0EB0
ldrsh r0, [r5, r1]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
movs r0, 0x2E
ldrsh r4, [r5, r0]
movs r2, 0x32
ldrsh r1, [r5, r2]
adds r0, r4, 0
- bl sub_8044E30
+ bl Sin
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x26]
ldrh r0, [r5, 0x2E]
adds r0, 0x6
@@ -4480,7 +4480,7 @@ _080F0F5C:
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
ldr r3, [sp, 0x10]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -4495,7 +4495,7 @@ _080F0F5C:
add r0, r9
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _080F0FD4 @ =gUnknown_2020658
adds r4, r1
ldr r0, _080F0FD8 @ =sub_80F0D5C
@@ -4564,7 +4564,7 @@ _080F0FE4:
strh r0, [r1, 0x3C]
_080F1018:
ldr r0, [sp]
- bl sub_8077508
+ bl DestroyTask
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -4623,7 +4623,7 @@ _080F1082:
ldr r1, [sp]
ldr r2, [sp, 0x4]
ldr r3, [sp, 0xC]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -4637,7 +4637,7 @@ _080F1082:
mov r3, r10
ldrb r1, [r3]
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080F1124 @ =gUnknown_2020658
adds r4, r0
ldr r0, _080F1128 @ =sub_80F1134
@@ -4678,7 +4678,7 @@ _080F10D4:
strh r0, [r1, 0x3C]
_080F10FC:
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -4706,7 +4706,7 @@ sub_80F1134: @ 80F1134
ldrsh r0, [r5, r1]
movs r2, 0x30
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
movs r0, 0x2E
ldrsh r4, [r5, r0]
@@ -4715,12 +4715,12 @@ sub_80F1134: @ 80F1134
ands r0, r1
movs r2, 0x32
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x26]
ldrh r0, [r5, 0x2E]
adds r0, 0xA
@@ -4765,7 +4765,7 @@ sub_80F1198: @ 80F1198
cmp r0, 0x1
bne _080F11F6
adds r0, r7, 0
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
b _080F1212
.align 2, 0
_080F11BC: .4byte gUnknown_30030F0
@@ -4787,9 +4787,9 @@ _080F11C4:
ldr r4, _080F1208 @ =gUnknown_840BFA8
_080F11E0:
ldrh r0, [r5, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrh r0, [r4, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r5, 0x8
adds r4, 0x8
adds r6, 0x1
@@ -4797,7 +4797,7 @@ _080F11E0:
ble _080F11E0
_080F11F6:
adds r0, r7, 0
- bl sub_8007280
+ bl DestroySprite
b _080F1212
.align 2, 0
_080F1200: .4byte gUnknown_2024018
@@ -4805,15 +4805,15 @@ _080F1204: .4byte gUnknown_840BF48
_080F1208: .4byte gUnknown_840BFA8
_080F120C:
adds r0, r7, 0
- bl sub_8007280
+ bl DestroySprite
_080F1212:
pop {r4-r7}
pop {r0}
bx r0
thumb_func_end sub_80F1198
- thumb_func_start sub_80F1218
-sub_80F1218: @ 80F1218
+ thumb_func_start LaunchBallFadeMonTask
+LaunchBallFadeMonTask: @ 80F1218
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -4829,7 +4829,7 @@ sub_80F1218: @ 80F1218
lsrs r7, r3, 24
ldr r0, _080F127C @ =sub_80F12E0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -4858,7 +4858,7 @@ sub_80F1218: @ 80F1218
ldrh r3, [r1]
movs r1, 0x10
movs r2, 0
- bl sub_8045274
+ bl BlendPalette
movs r0, 0x1
strh r0, [r5, 0xA]
b _080F12AE
@@ -4878,7 +4878,7 @@ _080F1288:
ldrh r3, [r1]
movs r1, 0x10
movs r2, 0x10
- bl sub_8045274
+ bl BlendPalette
movs r0, 0x10
strh r0, [r5, 0x8]
ldr r0, _080F12D4 @ =0x0000ffff
@@ -4892,7 +4892,7 @@ _080F12AE:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
mov r0, r8
add sp, 0x4
pop {r3,r4}
@@ -4906,7 +4906,7 @@ _080F12D0: .4byte gUnknown_840C1C4
_080F12D4: .4byte 0x0000ffff
_080F12D8: .4byte sub_80F1370
_080F12DC: .4byte 0x00007fff
- thumb_func_end sub_80F1218
+ thumb_func_end LaunchBallFadeMonTask
thumb_func_start sub_80F12E0
sub_80F12E0: @ 80F12E0
@@ -4940,7 +4940,7 @@ sub_80F12E0: @ 80F12E0
adds r1, r3
ldrh r3, [r1]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r4, 0xA]
ldrh r1, [r4, 0x8]
adds r0, r1
@@ -4968,9 +4968,9 @@ _080F1338:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080F1360:
add sp, 0x4
pop {r4,r5}
@@ -5007,7 +5007,7 @@ sub_80F1370: @ 80F1370
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F13BC @ =sub_80F13C0
str r0, [r4]
_080F13A8:
@@ -5052,7 +5052,7 @@ sub_80F13C0: @ 80F13C0
adds r1, r3
ldrh r3, [r1]
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
ldrh r0, [r4, 0xA]
ldrh r1, [r4, 0x8]
adds r0, r1
@@ -5066,7 +5066,7 @@ _080F140C: .4byte gUnknown_3005090
_080F1410: .4byte gUnknown_840C1C4
_080F1414:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_080F141A:
pop {r4}
pop {r0}
@@ -5120,7 +5120,7 @@ _080F1466:
adds r0, r4
strh r0, [r5, 0x8]
ldrb r0, [r3]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080F14A8
@@ -5185,7 +5185,7 @@ _080F14F8:
ldrb r1, [r5, 0x1E]
adds r0, r2, 0
adds r2, r6, 0
- bl sub_80351A8
+ bl LoadBattleMonGfxAndAnimate
ldrh r0, [r5, 0x1C]
adds r0, 0x1
strh r0, [r5, 0x1C]
@@ -5198,7 +5198,7 @@ _080F150A:
adds r0, r2
strh r0, [r5, 0x8]
ldrb r0, [r3]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080F1540
@@ -5240,7 +5240,7 @@ _080F1558:
strh r1, [r0, 0x8]
ldr r0, _080F1594 @ =gUnknown_2037F1A
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -5278,7 +5278,7 @@ _080F15AE:
beq _080F15BA
_080F15B4:
adds r0, r7, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080F15BA:
pop {r3}
mov r8, r3
@@ -5324,7 +5324,7 @@ _080F15F6:
bne _080F1618
ldr r1, _080F1614 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
b _080F1620
.align 2, 0
_080F1610: .4byte gUnknown_2037F1A
@@ -5332,11 +5332,11 @@ _080F1614: .4byte 0x00003f42
_080F1618:
ldr r1, _080F163C @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
_080F1620:
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080F1640 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -5369,7 +5369,7 @@ _080F1644:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0x10
@@ -5398,11 +5398,11 @@ _080F167E:
lsls r2, 4
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
ldrb r0, [r4]
- bl sub_8035228
+ bl ClearBehindSubstituteBit
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080F16B4:
pop {r4,r5}
pop {r0}
@@ -5431,7 +5431,7 @@ sub_80F16CC: @ 80F16CC
lsls r1, 29
lsrs r1, 31
strh r1, [r3, 0xE]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -5449,7 +5449,7 @@ sub_80F1700: @ 80F1700
ldr r1, _080F171C @ =gUnknown_2023D6E
ldrb r1, [r1]
strb r1, [r2]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -5480,11 +5480,11 @@ sub_80F1720: @ 80F1720
strb r1, [r0]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r0, r6, 0
bl sub_8072DF0
@@ -5508,7 +5508,7 @@ _080F177E:
cmp r0, 0
beq _080F17F8
ldr r0, _080F17E4 @ =0x000027f9
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
lsrs r0, 16
cmp r0, r7
@@ -5521,13 +5521,13 @@ _080F179E:
ldr r5, _080F17F0 @ =sub_80F181C
adds r0, r5, 0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r3, _080F17F4 @ =gUnknown_3005090
@@ -5637,7 +5637,7 @@ _080F186A:
ldr r0, _080F18A0 @ =gUnknown_83FF168
adds r1, r5, 0
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
b _080F1906
@@ -5652,7 +5652,7 @@ _080F18A4:
ldr r0, _080F18D0 @ =gUnknown_83FF180
adds r1, r5, 0
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080F18D4 @ =gUnknown_202063C
@@ -5672,7 +5672,7 @@ _080F18D8:
ldr r0, _080F1930 @ =gUnknown_83FF180
adds r1, r5, 0
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080F1934 @ =gUnknown_202063C
@@ -5745,7 +5745,7 @@ _080F1948:
cmp r0, 0
bne _080F1990
mov r0, r8
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r1, 0x3F
cmp r0, 0
@@ -5755,7 +5755,7 @@ _080F1986:
lsls r1, 24
asrs r1, 24
movs r0, 0x5F
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080F1990:
ldr r1, _080F19CC @ =gUnknown_202063C
adds r0, r4, r5
@@ -5830,7 +5830,7 @@ sub_80F19E0: @ 80F19E0
strb r1, [r0, 0x1]
_080F1A1A:
adds r0, r3, 0
- bl sub_8077508
+ bl DestroyTask
_080F1A20:
pop {r0}
bx r0
@@ -5846,12 +5846,12 @@ sub_80F1A2C: @ 80F1A2C
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x18
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x18
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x30]
adds r0, 0xC
@@ -5871,9 +5871,9 @@ sub_80F1A2C: @ 80F1A2C
subs r1, 0x1
strh r1, [r0, 0x20]
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F1A76:
pop {r4}
pop {r0}
@@ -5923,9 +5923,9 @@ _080F1A94:
subs r1, 0x1
strh r1, [r0, 0x20]
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F1AD6:
pop {r4}
pop {r0}
@@ -5945,9 +5945,9 @@ sub_80F1AE0: @ 80F1AE0
ldr r0, _080F1B0C @ =gUnknown_83ADD78
bl sub_800F078
ldr r0, _080F1B10 @ =0x0000281d
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -5965,11 +5965,11 @@ sub_80F1B14: @ 80F1B14
lsrs r4, 24
ldr r5, _080F1B38 @ =0x0000281d
adds r0, r5, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r5, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -5986,7 +5986,7 @@ sub_80F1B3C: @ 80F1B3C
movs r0, 0x1E
strh r0, [r4, 0x2E]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -5998,7 +5998,7 @@ sub_80F1B3C: @ 80F1B3C
adds r0, r1
strh r0, [r4, 0x32]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -6074,7 +6074,7 @@ _080F1C00: .4byte sub_80F1C04
sub_80F1C04: @ 80F1C04
push {r4,lr}
adds r4, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _080F1C26
@@ -6129,9 +6129,9 @@ sub_80F1C30: @ 80F1C30
lsls r0, 2
adds r0, r5
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
- bl sub_8072740
+ bl DestroyAnimSprite
_080F1C78:
pop {r4,r5}
pop {r0}
@@ -6159,7 +6159,7 @@ sub_80F1C8C: @ 80F1C8C
_080F1CA4: .4byte gUnknown_2037F02
_080F1CA8:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080F1CB8 @ =gUnknown_2037F1A
strb r0, [r1]
movs r0, 0x1
@@ -6168,17 +6168,17 @@ _080F1CA8:
_080F1CB8: .4byte gUnknown_2037F1A
_080F1CBC:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080F1CDC @ =gUnknown_2037F1A
strb r0, [r1]
movs r0, 0
_080F1CC8:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080F1CE0 @ =gUnknown_2037F1B
strb r0, [r1]
_080F1CD0:
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4}
pop {r0}
bx r0
@@ -6208,7 +6208,7 @@ _080F1D00:
_080F1D04:
strh r0, [r1, 0xE]
adds r0, r3, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -6264,7 +6264,7 @@ _080F1D68:
_080F1D6C:
strh r0, [r1]
adds r0, r2, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
@@ -6287,7 +6287,7 @@ sub_80F1D7C: @ 80F1D7C
ldrh r1, [r1]
lsrs r1, 8
strb r1, [r3]
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/battle_anim_sound_tasks.s b/asm/battle_anim_sound_tasks.s
index 0af245c09..66750777a 100644
--- a/asm/battle_anim_sound_tasks.s
+++ b/asm/battle_anim_sound_tasks.s
@@ -36,7 +36,7 @@ sub_80DCE10: @ 80DCE10
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_8073B88
+ bl CalculatePanIncrement
strh r4, [r6, 0xC]
strh r5, [r6, 0xE]
lsls r0, 24
@@ -96,7 +96,7 @@ _080DCEB0:
ldrh r0, [r4, 0x8]
lsls r1, r5, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
_080DCECA:
lsls r1, r6, 24
asrs r1, 24
@@ -138,7 +138,7 @@ sub_80DCEE4: @ 80DCEE4
ldrh r0, [r4, 0xA]
lsls r1, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x1E]
adds r0, 0x1
strh r0, [r4, 0x1E]
@@ -147,7 +147,7 @@ sub_80DCEE4: @ 80DCEE4
cmp r0, 0x2
bne _080DCF2C
adds r0, r5, 0
- bl sub_807277C
+ bl DestroyAnimSoundTask
_080DCF2C:
pop {r4,r5}
pop {r0}
@@ -156,8 +156,8 @@ _080DCF2C:
_080DCF34: .4byte gUnknown_3005090
thumb_func_end sub_80DCEE4
- thumb_func_start sub_80DCF38
-sub_80DCF38: @ 80DCF38
+ thumb_func_start mas_80DCF38
+mas_80DCF38: @ 80DCF38
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -199,7 +199,7 @@ sub_80DCF38: @ 80DCF38
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_8073B88
+ bl CalculatePanIncrement
ldr r2, _080DCFE0 @ =gUnknown_3005090
mov r3, r8
lsls r1, r3, 2
@@ -239,7 +239,7 @@ sub_80DCF38: @ 80DCF38
_080DCFDC: .4byte gUnknown_2037F02
_080DCFE0: .4byte gUnknown_3005090
_080DCFE4: .4byte sub_80DCFE8
- thumb_func_end sub_80DCF38
+ thumb_func_end mas_80DCF38
thumb_func_start sub_80DCFE8
sub_80DCFE8: @ 80DCFE8
@@ -265,7 +265,7 @@ sub_80DCFE8: @ 80DCFE8
ldrh r0, [r4, 0x8]
movs r1, 0x1E
ldrsb r1, [r4, r1]
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldrh r0, [r4, 0x10]
subs r0, 0x1
strh r0, [r4, 0x10]
@@ -273,7 +273,7 @@ sub_80DCFE8: @ 80DCFE8
cmp r0, 0
bne _080DD030
adds r0, r5, 0
- bl sub_807277C
+ bl DestroyAnimSoundTask
b _080DD062
.align 2, 0
_080DD02C: .4byte gUnknown_3005090
@@ -368,14 +368,14 @@ _080DD0CC:
cmp r0, 0
bne _080DD0E8
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080DD13A
.align 2, 0
_080DD0E0: .4byte gUnknown_2037F1B
_080DD0E4: .4byte gUnknown_2037F02
_080DD0E8:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DD10C
@@ -401,7 +401,7 @@ _080DD10C:
_080DD11A:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -409,10 +409,10 @@ _080DD11A:
lsls r1, r6, 24
asrs r1, 24
movs r2, 0x3
- bl sub_8071E60
+ bl PlayCry3
_080DD134:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD13A:
pop {r4-r6}
pop {r0}
@@ -480,14 +480,14 @@ _080DD1A8:
cmp r0, 0
bne _080DD1C4
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080DD26A
.align 2, 0
_080DD1BC: .4byte gUnknown_2037F1B
_080DD1C0: .4byte gUnknown_2037F02
_080DD1C4:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080DD1E8
@@ -513,7 +513,7 @@ _080DD1E8:
_080DD1F6:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
ldr r1, _080DD23C @ =gUnknown_3005090
@@ -537,7 +537,7 @@ _080DD1F6:
bne _080DD244
adds r0, r3, 0
movs r2, 0x9
- bl sub_8071E60
+ bl PlayCry3
b _080DD24C
.align 2, 0
_080DD234: .4byte gUnknown_2023BCE
@@ -547,7 +547,7 @@ _080DD240: .4byte gUnknown_2037F02
_080DD244:
adds r0, r3, 0
movs r2, 0x7
- bl sub_8071E60
+ bl PlayCry3
_080DD24C:
ldr r0, _080DD25C @ =gUnknown_3005090
adds r1, r5, r6
@@ -561,7 +561,7 @@ _080DD25C: .4byte gUnknown_3005090
_080DD260: .4byte sub_80DD270
_080DD264:
adds r0, r6, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD26A:
pop {r4-r6}
pop {r0}
@@ -601,7 +601,7 @@ _080DD2A4:
ldrsh r0, [r1, r2]
cmp r0, 0xFF
bne _080DD2CA
- bl sub_8072214
+ bl IsCryPlaying
lsls r0, 24
cmp r0, 0
bne _080DD2E6
@@ -609,12 +609,12 @@ _080DD2A4:
asrs r1, 24
adds r0, r6, 0
movs r2, 0xA
- bl sub_8071E60
+ bl PlayCry3
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
b _080DD2E6
_080DD2CA:
- bl sub_8072214
+ bl IsCryPlaying
lsls r0, 24
cmp r0, 0
bne _080DD2E6
@@ -622,9 +622,9 @@ _080DD2CA:
asrs r1, 24
mov r0, r8
movs r2, 0x8
- bl sub_8071E60
+ bl PlayCry3
mov r0, r9
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD2E6:
pop {r3,r4}
mov r8, r3
@@ -656,12 +656,12 @@ sub_80DD2F4: @ 80DD2F4
.align 2, 0
_080DD318: .4byte gUnknown_3005090
_080DD31C:
- bl sub_8072214
+ bl IsCryPlaying
lsls r0, 24
cmp r0, 0
bne _080DD32C
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD32C:
pop {r4}
pop {r0}
@@ -695,7 +695,7 @@ sub_80DD334: @ 80DD334
beq _080DD384
adds r0, r3, 0
movs r2, 0x4
- bl sub_8071E60
+ bl PlayCry3
ldr r0, _080DD380 @ =sub_80DD390
str r0, [r4]
b _080DD38A
@@ -706,7 +706,7 @@ _080DD37C: .4byte gUnknown_3005090
_080DD380: .4byte sub_80DD390
_080DD384:
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD38A:
pop {r4,r5}
pop {r0}
@@ -735,7 +735,7 @@ sub_80DD390: @ 80DD390
.align 2, 0
_080DD3B4: .4byte gUnknown_3005090
_080DD3B8:
- bl sub_8072214
+ bl IsCryPlaying
lsls r0, 24
cmp r0, 0
bne _080DD3D4
@@ -743,9 +743,9 @@ _080DD3B8:
movs r1, 0xC
ldrsb r1, [r4, r1]
movs r2, 0x6
- bl sub_8071E60
+ bl PlayCry3
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD3D4:
pop {r4,r5}
pop {r0}
@@ -768,9 +768,9 @@ sub_80DD3DC: @ 80DD3DC
lsls r1, 24
asrs r1, 24
adds r0, r5, 0
- bl sub_8072348
+ bl PlaySE1WithPanning
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -794,9 +794,9 @@ sub_80DD410: @ 80DD410
lsls r1, 24
asrs r1, 24
adds r0, r5, 0
- bl sub_807237C
+ bl PlaySE2WithPanning
adds r0, r4, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
pop {r4,r5}
pop {r0}
bx r0
@@ -840,7 +840,7 @@ sub_80DD444: @ 80DD444
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_8073B88
+ bl CalculatePanIncrement
ldr r2, _080DD4CC @ =gUnknown_3005090
mov r3, r8
lsls r1, r3, 2
@@ -914,7 +914,7 @@ _080DD50E:
cmp r1, r0
bne _080DD526
adds r0, r5, 0
- bl sub_8072760
+ bl DestroyAnimVisualTask
_080DD526:
pop {r4,r5}
pop {r0}
diff --git a/asm/battle_controller_link_opponent.s b/asm/battle_controller_link_opponent.s
index 82221a1a0..feba35fde 100644
--- a/asm/battle_controller_link_opponent.s
+++ b/asm/battle_controller_link_opponent.s
@@ -60,7 +60,7 @@ _0803A6C0: .4byte gUnknown_2023BC4
_0803A6C4: .4byte gUnknown_2022BC4
_0803A6C8: .4byte gUnknown_8250B20
_0803A6CC:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803A6D0:
pop {r0}
bx r0
@@ -84,7 +84,7 @@ sub_803A6D4: @ 803A6D4
ldr r0, _0803A708 @ =nullsub_8
cmp r1, r0
bne _0803A6F8
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803A6F8:
pop {r0}
bx r0
@@ -139,7 +139,7 @@ sub_803A70C: @ 803A70C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r5]
adds r0, r6
ldrb r1, [r0]
@@ -147,8 +147,8 @@ sub_803A70C: @ 803A70C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
- bl sub_803B124
+ bl DestroySprite
+ bl RecordedOpponentBufferExecCompleted
_0803A77C:
pop {r4-r6}
pop {r0}
@@ -190,7 +190,7 @@ sub_803A79C: @ 803A79C
adds r0, r2
movs r1, 0
strb r1, [r0, 0x9]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803A7D4:
pop {r4}
pop {r0}
@@ -273,7 +273,7 @@ _0803A840:
_0803A874:
movs r6, 0x1
_0803A876:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _0803A882
@@ -286,7 +286,7 @@ _0803A888:
ldr r0, _0803A964 @ =gUnknown_2023BC4
mov r8, r0
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x1
@@ -364,9 +364,9 @@ _0803A888:
strb r4, [r0, 0x1]
ldr r4, _0803A970 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0803A936:
ldr r0, _0803A974 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -376,7 +376,7 @@ _0803A936:
beq _0803A97C
mov r1, r8
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -523,7 +523,7 @@ _0803AA6C:
cmp r0, 0
beq _0803AABA
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -578,7 +578,7 @@ _0803AABA:
lsls r0, 2
ldr r1, _0803AC04 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r2, _0803AC08 @ =gUnknown_3004FF0
mov r8, r2
ldrb r0, [r5]
@@ -599,7 +599,7 @@ _0803AABA:
ldr r6, _0803ABF8 @ =gUnknown_202402C
adds r1, r6
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
eors r0, r4
bl sub_804BD94
@@ -607,7 +607,7 @@ _0803AABA:
eors r0, r4
add r0, r8
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r5]
eors r4, r0
lsls r0, r4, 1
@@ -618,12 +618,12 @@ _0803AABA:
adds r0, r1, 0
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
_0803AB50:
ldr r1, _0803AC00 @ =gUnknown_3004FFC
ldr r5, _0803ABF0 @ =gUnknown_2023BC4
@@ -635,7 +635,7 @@ _0803AB50:
lsls r0, 2
ldr r1, _0803AC04 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _0803AC08 @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -653,13 +653,13 @@ _0803AB50:
ldr r6, _0803ABF8 @ =gUnknown_202402C
adds r1, r6
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r4, [r5]
lsls r0, r4, 1
add r0, r9
@@ -669,12 +669,12 @@ _0803AB50:
adds r0, r1, 0
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r0, _0803ABEC @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -785,10 +785,10 @@ _0803AC88:
strb r0, [r1, 0x1]
ldr r4, _0803ACC8 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
- bl sub_803B124
+ bl FreeSpritePaletteByTag
+ bl RecordedOpponentBufferExecCompleted
_0803ACC0:
pop {r4-r7}
pop {r0}
@@ -797,8 +797,8 @@ _0803ACC0:
_0803ACC8: .4byte 0x000027f9
thumb_func_end sub_803AC14
- thumb_func_start sub_803ACCC
-sub_803ACCC: @ 803ACCC
+ thumb_func_start CompleteOnHealthbarDone_4
+CompleteOnHealthbarDone_4: @ 803ACCC
push {r4-r6,lr}
ldr r6, _0803AD0C @ =gUnknown_2023BC4
ldrb r0, [r6]
@@ -814,7 +814,7 @@ sub_803ACCC: @ 803ACCC
ldrb r0, [r6]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -831,12 +831,12 @@ sub_803ACCC: @ 803ACCC
_0803AD0C: .4byte gUnknown_2023BC4
_0803AD10: .4byte gUnknown_3004FF0
_0803AD14:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803AD18:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_803ACCC
+ thumb_func_end CompleteOnHealthbarDone_4
thumb_func_start sub_803AD20
sub_803AD20: @ 803AD20
@@ -859,8 +859,8 @@ sub_803AD20: @ 803AD20
ldr r0, _0803AD60 @ =gUnknown_3004FF0
adds r0, r3, r0
ldrb r0, [r0]
- bl sub_8048188
- bl sub_803B124
+ bl SetHealthboxSpriteInvisible
+ bl RecordedOpponentBufferExecCompleted
_0803AD4E:
pop {r0}
bx r0
@@ -896,7 +896,7 @@ sub_803AD64: @ 803AD64
lsls r0, 2
ldr r4, _0803ADD0 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -904,15 +904,15 @@ sub_803AD64: @ 803AD64
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r0, [r6]
- bl sub_8035794
+ bl EnemyShadowCallbackToSetInvisible
ldr r1, _0803ADD4 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
- bl sub_803B124
+ bl SetHealthboxSpriteInvisible
+ bl RecordedOpponentBufferExecCompleted
_0803ADBE:
pop {r4-r6}
pop {r0}
@@ -925,22 +925,22 @@ _0803ADD0: .4byte gUnknown_202063C
_0803ADD4: .4byte gUnknown_3004FF0
thumb_func_end sub_803AD64
- thumb_func_start sub_803ADD8
-sub_803ADD8: @ 803ADD8
+ thumb_func_start CompleteOnInactiveTextPrinter_5
+CompleteOnInactiveTextPrinter_5: @ 803ADD8
push {lr}
movs r0, 0
bl sub_8002E64
lsls r0, 16
cmp r0, 0
bne _0803ADEA
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803ADEA:
pop {r0}
bx r0
- thumb_func_end sub_803ADD8
+ thumb_func_end CompleteOnInactiveTextPrinter_5
- thumb_func_start sub_803ADF0
-sub_803ADF0: @ 803ADF0
+ thumb_func_start DoHitAnimBlinkSpriteEffect_4
+DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
push {r4,lr}
ldr r1, _0803AE2C @ =gUnknown_2023D44
ldr r0, _0803AE30 @ =gUnknown_2023BC4
@@ -967,7 +967,7 @@ sub_803ADF0: @ 803ADF0
strb r0, [r2]
ldr r0, _0803AE38 @ =gUnknown_2024005
strb r3, [r0]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
b _0803AE66
.align 2, 0
_0803AE2C: .4byte gUnknown_2023D44
@@ -1001,7 +1001,7 @@ _0803AE66:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803ADF0
+ thumb_func_end DoHitAnimBlinkSpriteEffect_4
thumb_func_start sub_803AE6C
sub_803AE6C: @ 803AE6C
@@ -1035,7 +1035,7 @@ sub_803AE6C: @ 803AE6C
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_0803AEAC:
ldr r0, _0803AED4 @ =gUnknown_3004FE0
ldrb r1, [r4]
@@ -1074,7 +1074,7 @@ sub_803AEDC: @ 803AEDC
ands r0, r1
cmp r0, 0
bne _0803AF14
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0803AF14
@@ -1083,7 +1083,7 @@ sub_803AEDC: @ 803AEDC
movs r2, 0x80
lsls r2, 1
bl m4aMPlayVolumeControl
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803AF14:
pop {r0}
bx r0
@@ -1129,9 +1129,9 @@ sub_803AF28: @ 803AF28
strb r0, [r1, 0x1]
ldr r4, _0803AFDC @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r1, _0803AFE0 @ =gUnknown_2023D44
ldrb r0, [r5]
adds r0, r1
@@ -1142,7 +1142,7 @@ sub_803AF28: @ 803AF28
ldr r1, _0803AFE4 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, _0803AFE8 @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -1156,15 +1156,15 @@ sub_803AF28: @ 803AF28
ldr r2, _0803AFF0 @ =gUnknown_202402C
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r5]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
ldr r1, _0803AFF4 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -1242,7 +1242,7 @@ _0803B02E:
cmp r0, 0
bne _0803B098
adds r0, r3, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r4, [r5]
ldr r1, _0803B0A8 @ =gUnknown_2023BCE
lsls r0, r4, 1
@@ -1253,12 +1253,12 @@ _0803B02E:
ldr r1, _0803B0AC @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r1, _0803B0BC @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -1281,8 +1281,8 @@ _0803B0BC: .4byte gUnknown_3004FE0
_0803B0C0: .4byte sub_803AF28
thumb_func_end sub_803AFFC
- thumb_func_start sub_803B0C4
-sub_803B0C4: @ 803B0C4
+ thumb_func_start CompleteOnFinishedStatusAnimation_5
+CompleteOnFinishedStatusAnimation_5: @ 803B0C4
push {lr}
ldr r0, _0803B0EC @ =gUnknown_2024018
ldr r2, [r0]
@@ -1298,17 +1298,17 @@ sub_803B0C4: @ 803B0C4
ands r0, r1
cmp r0, 0
bne _0803B0E6
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803B0E6:
pop {r0}
bx r0
.align 2, 0
_0803B0EC: .4byte gUnknown_2024018
_0803B0F0: .4byte gUnknown_2023BC4
- thumb_func_end sub_803B0C4
+ thumb_func_end CompleteOnFinishedStatusAnimation_5
- thumb_func_start sub_803B0F4
-sub_803B0F4: @ 803B0F4
+ thumb_func_start CompleteOnFinishedBattleAnimation_5
+CompleteOnFinishedBattleAnimation_5: @ 803B0F4
push {lr}
ldr r0, _0803B11C @ =gUnknown_2024018
ldr r2, [r0]
@@ -1324,17 +1324,17 @@ sub_803B0F4: @ 803B0F4
ands r0, r1
cmp r0, 0
bne _0803B116
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803B116:
pop {r0}
bx r0
.align 2, 0
_0803B11C: .4byte gUnknown_2024018
_0803B120: .4byte gUnknown_2023BC4
- thumb_func_end sub_803B0F4
+ thumb_func_end CompleteOnFinishedBattleAnimation_5
- thumb_func_start sub_803B124
-sub_803B124: @ 803B124
+ thumb_func_start RecordedOpponentBufferExecCompleted
+RecordedOpponentBufferExecCompleted: @ 803B124
push {r4,lr}
sub sp, 0x4
ldr r1, _0803B164 @ =gUnknown_3004FE0
@@ -1350,7 +1350,7 @@ sub_803B124: @ 803B124
ands r0, r1
cmp r0, 0
beq _0803B178
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -1388,10 +1388,10 @@ _0803B18A:
.align 2, 0
_0803B194: .4byte gUnknown_2023BC8
_0803B198: .4byte gUnknown_825E45C
- thumb_func_end sub_803B124
+ thumb_func_end RecordedOpponentBufferExecCompleted
- thumb_func_start sub_803B19C
-sub_803B19C: @ 803B19C
+ thumb_func_start RecordedOpponentHandleGetMonData
+RecordedOpponentHandleGetMonData: @ 803B19C
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
@@ -1409,7 +1409,7 @@ sub_803B19C: @ 803B19C
adds r1, r0
ldrb r0, [r1]
mov r1, sp
- bl sub_803B210
+ bl CopyRecordedOpponentMonData
adds r6, r0, 0
b _0803B1F6
.align 2, 0
@@ -1428,7 +1428,7 @@ _0803B1D8:
lsrs r0, 24
mov r2, sp
adds r1, r2, r6
- bl sub_803B210
+ bl CopyRecordedOpponentMonData
adds r6, r0
_0803B1EE:
lsrs r4, 1
@@ -1440,16 +1440,16 @@ _0803B1F6:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
- bl sub_803B124
+ bl EmitDataTransfer
+ bl RecordedOpponentBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_803B19C
+ thumb_func_end RecordedOpponentHandleGetMonData
- thumb_func_start sub_803B210
-sub_803B210: @ 803B210
+ thumb_func_start CopyRecordedOpponentMonData
+CopyRecordedOpponentMonData: @ 803B210
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1550,12 +1550,12 @@ _0803B340:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -1583,12 +1583,12 @@ _0803B38C:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -1603,21 +1603,21 @@ _0803B38C:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -1629,7 +1629,7 @@ _0803B38C:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -1641,7 +1641,7 @@ _0803B38C:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -1653,7 +1653,7 @@ _0803B38C:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1664,7 +1664,7 @@ _0803B38C:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -1675,7 +1675,7 @@ _0803B38C:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -1687,55 +1687,55 @@ _0803B38C:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -1748,7 +1748,7 @@ _0803B38C:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -1758,19 +1758,19 @@ _0803B38C:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r6, 0
_0803B544:
@@ -1821,13 +1821,13 @@ _0803B59A:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -1841,7 +1841,7 @@ _0803B59A:
ldr r1, _0803B5E8 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -1883,7 +1883,7 @@ _0803B614:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1894,7 +1894,7 @@ _0803B614:
ldr r1, _0803B640 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1931,7 +1931,7 @@ _0803B670:
adds r0, r1
movs r1, 0x19
_0803B67A:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2064,27 +2064,27 @@ _0803B760:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _0803B9A6
@@ -2169,7 +2169,7 @@ _0803B830:
adds r0, r1
movs r1, 0x37
_0803B83A:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2258,7 +2258,7 @@ _0803B8D4:
adds r0, r1
movs r1, 0x3F
_0803B8DE:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -2365,7 +2365,7 @@ _0803B994:
adds r0, r1
movs r1, 0x36
_0803B99E:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_0803B9A6:
@@ -2380,18 +2380,18 @@ _0803B9A6:
bx r1
.align 2, 0
_0803B9B8: .4byte gUnknown_202402C
- thumb_func_end sub_803B210
+ thumb_func_end CopyRecordedOpponentMonData
thumb_func_start sub_803B9BC
sub_803B9BC: @ 803B9BC
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803B9BC
- thumb_func_start sub_803B9C8
-sub_803B9C8: @ 803B9C8
+ thumb_func_start RecordedOpponentHandleSetMonData
+RecordedOpponentHandleSetMonData: @ 803B9C8
push {r4,r5,lr}
ldr r1, _0803B9EC @ =gUnknown_2022BC4
ldr r0, _0803B9F0 @ =gUnknown_2023BC4
@@ -2406,7 +2406,7 @@ sub_803B9C8: @ 803B9C8
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
- bl sub_803BA20
+ bl SetRecordedOpponentMonData
b _0803BA16
.align 2, 0
_0803B9EC: .4byte gUnknown_2022BC4
@@ -2421,7 +2421,7 @@ _0803B9FC:
cmp r0, 0
beq _0803BA0A
adds r0, r5, 0
- bl sub_803BA20
+ bl SetRecordedOpponentMonData
_0803BA0A:
lsrs r4, 1
adds r0, r5, 0x1
@@ -2430,14 +2430,14 @@ _0803BA0A:
cmp r5, 0x5
bls _0803B9FC
_0803BA16:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_803B9C8
+ thumb_func_end RecordedOpponentHandleSetMonData
- thumb_func_start sub_803BA20
-sub_803BA20: @ 803BA20
+ thumb_func_start SetRecordedOpponentMonData
+SetRecordedOpponentMonData: @ 803BA20
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3474,10 +3474,10 @@ _0803C32C:
bx r0
.align 2, 0
_0803C33C: .4byte gUnknown_202402C
- thumb_func_end sub_803BA20
+ thumb_func_end SetRecordedOpponentMonData
- thumb_func_start sub_803C340
-sub_803C340: @ 803C340
+ thumb_func_start RecordedOpponentHandleSetRawMonData
+RecordedOpponentHandleSetRawMonData: @ 803C340
push {r4-r7,lr}
ldr r1, _0803C3A4 @ =gUnknown_2023BCE
ldr r7, _0803C3A8 @ =gUnknown_2023BC4
@@ -3524,7 +3524,7 @@ _0803C376:
cmp r3, r0
bcc _0803C376
_0803C398:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r4-r7}
pop {r0}
bx r0
@@ -3533,7 +3533,7 @@ _0803C3A4: .4byte gUnknown_2023BCE
_0803C3A8: .4byte gUnknown_2023BC4
_0803C3AC: .4byte gUnknown_2022BC4
_0803C3B0: .4byte gUnknown_202402C
- thumb_func_end sub_803C340
+ thumb_func_end RecordedOpponentHandleSetRawMonData
thumb_func_start sub_803C3B4
sub_803C3B4: @ 803C3B4
@@ -3557,7 +3557,7 @@ sub_803C3B4: @ 803C3B4
mov r9, r1
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -3569,9 +3569,9 @@ sub_803C3B4: @ 803C3B4
muls r2, r0
adds r0, r2, 0
add r0, r9
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3598,7 +3598,7 @@ sub_803C3B4: @ 803C3B4
mov r0, r8
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _0803C4EC @ =gUnknown_2023D44
ldrb r1, [r6]
adds r1, r4
@@ -3644,7 +3644,7 @@ sub_803C3B4: @ 803C3B4
ldr r1, _0803C4F8 @ =gUnknown_2024024
adds r2, r1
ldrb r1, [r2]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
adds r0, r7
@@ -3654,12 +3654,12 @@ sub_803C3B4: @ 803C3B4
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r1, _0803C4FC @ =gUnknown_3004FE0
ldrb r0, [r6]
lsls r0, 2
@@ -3736,7 +3736,7 @@ sub_803C550: @ 803C550
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r0, _0803C6AC @ =gUnknown_2023BCE
lsls r4, r6, 1
adds r4, r0
@@ -3755,13 +3755,13 @@ sub_803C550: @ 803C550
ldr r5, _0803C6B4 @ =gUnknown_202402C
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _0803C6B8 @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _0803C6BC @ =gUnknown_3004FFC
mov r10, r1
add r10, r6
@@ -3773,9 +3773,9 @@ sub_803C550: @ 803C550
adds r0, r1, 0
adds r0, r5
adds r1, r6, 0
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3802,7 +3802,7 @@ sub_803C550: @ 803C550
mov r0, r9
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _0803C6C4 @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -3847,7 +3847,7 @@ sub_803C550: @ 803C550
ldr r1, _0803C6CC @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -3869,7 +3869,7 @@ sub_803C550: @ 803C550
str r1, [r0]
movs r0, 0
movs r1, 0xFE
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r10
ldrb r2, [r1]
lsls r1, r2, 4
@@ -3941,7 +3941,7 @@ _0803C71C:
lsls r0, 2
ldr r4, _0803C764 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -3949,15 +3949,15 @@ _0803C71C:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r0, [r6]
- bl sub_8035794
+ bl EnemyShadowCallbackToSetInvisible
ldr r1, _0803C768 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
- bl sub_803B124
+ bl SetHealthboxSpriteInvisible
+ bl RecordedOpponentBufferExecCompleted
_0803C758:
pop {r4-r6}
pop {r0}
@@ -4001,7 +4001,7 @@ _0803C794:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_0803C7AE:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4026,7 +4026,7 @@ _0803C7C2:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x2
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _0803C7F0 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -4056,7 +4056,7 @@ sub_803C7F8: @ 803C7F8
beq _0803C8C0
ldr r6, _0803C888 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
ands r1, r0
movs r7, 0xC8
@@ -4065,7 +4065,7 @@ sub_803C7F8: @ 803C7F8
movs r7, 0x98
_0803C820:
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
ldr r5, _0803C88C @ =gUnknown_202273C
lsls r1, r0, 3
subs r1, r0
@@ -4076,7 +4076,7 @@ _0803C820:
cmp r0, 0x2
beq _0803C866
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4087,7 +4087,7 @@ _0803C820:
cmp r0, 0x1
beq _0803C866
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4100,7 +4100,7 @@ _0803C866:
ldr r4, _0803C88C @ =gUnknown_202273C
ldr r0, _0803C888 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4124,7 +4124,7 @@ _0803C894:
_0803C89C: .4byte gUnknown_82538A8
_0803C8A0:
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -4152,7 +4152,7 @@ _0803C8C0:
.align 2, 0
_0803C8D8: .4byte gUnknown_20386AE
_0803C8DC:
- bl sub_800A404
+ bl GetMultiplayerId
ldr r6, _0803C954 @ =gUnknown_202273C
movs r5, 0x1
eors r0, r5
@@ -4166,7 +4166,7 @@ _0803C8DC:
ldrb r0, [r1]
cmp r0, 0x2
beq _0803C930
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4179,7 +4179,7 @@ _0803C8DC:
ands r0, r1
cmp r0, 0x1
beq _0803C930
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4193,7 +4193,7 @@ _0803C8DC:
bne _0803C968
_0803C930:
ldr r4, _0803C954 @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -4218,7 +4218,7 @@ _0803C95C:
.align 2, 0
_0803C964: .4byte gUnknown_82538A8
_0803C968:
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -4248,7 +4248,7 @@ _0803C992:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4277,7 +4277,7 @@ _0803C992:
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _0803CAD8 @ =gUnknown_2023D44
mov r2, r8
ldrb r1, [r2]
@@ -4307,7 +4307,7 @@ _0803C992:
lsls r6, r1, 3
adds r0, r6, r0
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4337,7 +4337,7 @@ _0803C992:
ldr r0, _0803CAE8 @ =gUnknown_823957C
adds r6, r0
ldrh r0, [r6, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4407,7 +4407,7 @@ _0803CAFC: .4byte sub_803A6D4
thumb_func_start sub_803CB00
sub_803CB00: @ 803CB00
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CB00
@@ -4425,7 +4425,7 @@ sub_803CB0C: @ 803CB0C
lsls r0, 2
ldr r5, _0803CBA4 @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4473,7 +4473,7 @@ sub_803CB0C: @ 803CB0C
lsls r0, 2
adds r0, r5
ldr r1, _0803CBAC @ =nullsub_8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _0803CBB0 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -4519,7 +4519,7 @@ sub_803CBB8: @ 803CBB8
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_0803CBEC:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4546,7 +4546,7 @@ _0803CC0C:
strb r0, [r3, 0x4]
movs r0, 0x10
movs r1, 0x3F
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _0803CC50 @ =gUnknown_202063C
ldr r1, _0803CC54 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -4580,7 +4580,7 @@ _0803CC60: .4byte sub_803AD20
thumb_func_start sub_803CC64
sub_803CC64: @ 803CC64
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CC64
@@ -4588,7 +4588,7 @@ sub_803CC64: @ 803CC64
thumb_func_start sub_803CC70
sub_803CC70: @ 803CC70
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CC70
@@ -4596,7 +4596,7 @@ sub_803CC70: @ 803CC70
thumb_func_start sub_803CC7C
sub_803CC7C: @ 803CC7C
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CC7C
@@ -4604,7 +4604,7 @@ sub_803CC7C: @ 803CC7C
thumb_func_start sub_803CC88
sub_803CC88: @ 803CC88
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CC88
@@ -4614,7 +4614,7 @@ sub_803CC94: @ 803CC94
push {r4-r6,lr}
ldr r6, _0803CD78 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
beq _0803CCA6
@@ -4715,12 +4715,12 @@ _0803CCA6:
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
beq _0803CD9C
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
b _0803CDBA
.align 2, 0
_0803CD78: .4byte gUnknown_2023BC4
@@ -4824,7 +4824,7 @@ _0803CE2E:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_0803CE50:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4882,7 +4882,7 @@ _0803CE8E:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -4919,7 +4919,7 @@ _0803CF04:
lsrs r4, r0, 24
cmp r4, 0
bne _0803CF40
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r10
@@ -4929,7 +4929,7 @@ _0803CF04:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4938,7 +4938,7 @@ _0803CF04:
lsls r0, 2
adds r0, r2
strb r4, [r0, 0x4]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803CF40:
pop {r3-r5}
mov r8, r3
@@ -4989,7 +4989,7 @@ _0803CFA0:
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _0803CFC0 @ =sub_803ADD8
+ ldr r1, _0803CFC0 @ =CompleteOnInactiveTextPrinter_5
str r1, [r0]
pop {r4}
pop {r0}
@@ -4998,13 +4998,13 @@ _0803CFA0:
_0803CFB4: .4byte gUnknown_202298C
_0803CFB8: .4byte gUnknown_3004FE0
_0803CFBC: .4byte gUnknown_2023BC4
-_0803CFC0: .4byte sub_803ADD8
+_0803CFC0: .4byte CompleteOnInactiveTextPrinter_5
thumb_func_end sub_803CF50
thumb_func_start sub_803CFC4
sub_803CFC4: @ 803CFC4
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CFC4
@@ -5012,7 +5012,7 @@ sub_803CFC4: @ 803CFC4
thumb_func_start sub_803CFD0
sub_803CFD0: @ 803CFD0
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CFD0
@@ -5020,7 +5020,7 @@ sub_803CFD0: @ 803CFD0
thumb_func_start sub_803CFDC
sub_803CFDC: @ 803CFDC
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CFDC
@@ -5028,7 +5028,7 @@ sub_803CFDC: @ 803CFDC
thumb_func_start sub_803CFE8
sub_803CFE8: @ 803CFE8
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CFE8
@@ -5036,7 +5036,7 @@ sub_803CFE8: @ 803CFE8
thumb_func_start sub_803CFF4
sub_803CFF4: @ 803CFF4
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803CFF4
@@ -5044,7 +5044,7 @@ sub_803CFF4: @ 803CFF4
thumb_func_start sub_803D000
sub_803D000: @ 803D000
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D000
@@ -5052,7 +5052,7 @@ sub_803D000: @ 803D000
thumb_func_start sub_803D00C
sub_803D00C: @ 803D00C
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D00C
@@ -5065,7 +5065,7 @@ sub_803D018: @ 803D018
push {r6,r7}
sub sp, 0x4
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _0803D090 @ =gUnknown_2022BC4
ldr r0, _0803D094 @ =gUnknown_2023BC4
mov r9, r0
@@ -5093,7 +5093,7 @@ sub_803D018: @ 803D018
ldr r4, _0803D0A0 @ =gUnknown_202402C
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -5103,7 +5103,7 @@ sub_803D018: @ 803D018
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5112,7 +5112,7 @@ sub_803D018: @ 803D018
ldrb r1, [r1]
str r7, [sp]
mov r2, r8
- bl sub_8048150
+ bl SetBattleBarStruct
b _0803D0D2
.align 2, 0
_0803D090: .4byte gUnknown_2022BC4
@@ -5131,7 +5131,7 @@ _0803D0A8:
ldr r1, _0803D0F4 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5140,14 +5140,14 @@ _0803D0A8:
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
_0803D0D2:
ldr r1, _0803D0FC @ =gUnknown_3004FE0
ldr r0, _0803D100 @ =gUnknown_2023BC4
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _0803D104 @ =sub_803ACCC
+ ldr r1, _0803D104 @ =CompleteOnHealthbarDone_4
str r1, [r0]
add sp, 0x4
pop {r3,r4}
@@ -5162,13 +5162,13 @@ _0803D0F4: .4byte gUnknown_202402C
_0803D0F8: .4byte gUnknown_3004FF0
_0803D0FC: .4byte gUnknown_3004FE0
_0803D100: .4byte gUnknown_2023BC4
-_0803D104: .4byte sub_803ACCC
+_0803D104: .4byte CompleteOnHealthbarDone_4
thumb_func_end sub_803D018
thumb_func_start sub_803D108
sub_803D108: @ 803D108
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D108
@@ -5178,7 +5178,7 @@ sub_803D114: @ 803D114
push {r4,lr}
ldr r4, _0803D170 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _0803D168
@@ -5195,7 +5195,7 @@ sub_803D114: @ 803D114
ldr r2, _0803D17C @ =gUnknown_202402C
adds r1, r2
movs r2, 0x9
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r2, [r4]
ldr r0, _0803D180 @ =gUnknown_2024018
ldr r0, [r0]
@@ -5213,7 +5213,7 @@ sub_803D114: @ 803D114
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _0803D188 @ =sub_803B0C4
+ ldr r1, _0803D188 @ =CompleteOnFinishedStatusAnimation_5
str r1, [r0]
_0803D168:
pop {r4}
@@ -5226,7 +5226,7 @@ _0803D178: .4byte gUnknown_2023BCE
_0803D17C: .4byte gUnknown_202402C
_0803D180: .4byte gUnknown_2024018
_0803D184: .4byte gUnknown_3004FE0
-_0803D188: .4byte sub_803B0C4
+_0803D188: .4byte CompleteOnFinishedStatusAnimation_5
thumb_func_end sub_803D114
thumb_func_start sub_803D18C
@@ -5234,7 +5234,7 @@ sub_803D18C: @ 803D18C
push {r4,r5,lr}
ldr r5, _0803D1E4 @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _0803D1DC
@@ -5262,12 +5262,12 @@ sub_803D18C: @ 803D18C
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
- bl sub_8033F1C
+ bl InitAndLaunchChosenStatusAnimation
ldr r1, _0803D1EC @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _0803D1F0 @ =sub_803B0C4
+ ldr r1, _0803D1F0 @ =CompleteOnFinishedStatusAnimation_5
str r1, [r0]
_0803D1DC:
pop {r4,r5}
@@ -5277,13 +5277,13 @@ _0803D1DC:
_0803D1E4: .4byte gUnknown_2023BC4
_0803D1E8: .4byte gUnknown_2022BC4
_0803D1EC: .4byte gUnknown_3004FE0
-_0803D1F0: .4byte sub_803B0C4
+_0803D1F0: .4byte CompleteOnFinishedStatusAnimation_5
thumb_func_end sub_803D18C
thumb_func_start sub_803D1F4
sub_803D1F4: @ 803D1F4
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D1F4
@@ -5291,7 +5291,7 @@ sub_803D1F4: @ 803D1F4
thumb_func_start sub_803D200
sub_803D200: @ 803D200
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D200
@@ -5299,7 +5299,7 @@ sub_803D200: @ 803D200
thumb_func_start sub_803D20C
sub_803D20C: @ 803D20C
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D20C
@@ -5307,7 +5307,7 @@ sub_803D20C: @ 803D20C
thumb_func_start sub_803D218
sub_803D218: @ 803D218
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D218
@@ -5315,7 +5315,7 @@ sub_803D218: @ 803D218
thumb_func_start sub_803D224
sub_803D224: @ 803D224
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D224
@@ -5323,7 +5323,7 @@ sub_803D224: @ 803D224
thumb_func_start sub_803D230
sub_803D230: @ 803D230
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D230
@@ -5331,7 +5331,7 @@ sub_803D230: @ 803D230
thumb_func_start sub_803D23C
sub_803D23C: @ 803D23C
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D23C
@@ -5339,7 +5339,7 @@ sub_803D23C: @ 803D23C
thumb_func_start sub_803D248
sub_803D248: @ 803D248
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D248
@@ -5347,13 +5347,13 @@ sub_803D248: @ 803D248
thumb_func_start sub_803D254
sub_803D254: @ 803D254
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D254
- thumb_func_start sub_803D260
-sub_803D260: @ 803D260
+ thumb_func_start RecordedOpponentHandleCmd37
+RecordedOpponentHandleCmd37: @ 803D260
push {lr}
ldr r2, _0803D278 @ =gUnknown_2022870
ldrb r1, [r2]
@@ -5361,15 +5361,15 @@ sub_803D260: @ 803D260
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_0803D278: .4byte gUnknown_2022870
- thumb_func_end sub_803D260
+ thumb_func_end RecordedOpponentHandleCmd37
- thumb_func_start sub_803D27C
-sub_803D27C: @ 803D27C
+ thumb_func_start RecordedOpponentHandleCmd38
+RecordedOpponentHandleCmd38: @ 803D27C
push {lr}
ldr r3, _0803D2A8 @ =gUnknown_2022870
ldr r1, _0803D2AC @ =gUnknown_2022BC4
@@ -5387,32 +5387,32 @@ sub_803D27C: @ 803D27C
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_0803D2A8: .4byte gUnknown_2022870
_0803D2AC: .4byte gUnknown_2022BC4
_0803D2B0: .4byte gUnknown_2023BC4
- thumb_func_end sub_803D27C
+ thumb_func_end RecordedOpponentHandleCmd38
- thumb_func_start sub_803D2B4
-sub_803D2B4: @ 803D2B4
+ thumb_func_start RecordedOpponentHandleCmd39
+RecordedOpponentHandleCmd39: @ 803D2B4
push {lr}
ldr r2, _0803D2C8 @ =gUnknown_2022870
ldrb r1, [r2]
movs r0, 0x7F
ands r0, r1
strb r0, [r2]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_0803D2C8: .4byte gUnknown_2022870
- thumb_func_end sub_803D2B4
+ thumb_func_end RecordedOpponentHandleCmd39
- thumb_func_start sub_803D2CC
-sub_803D2CC: @ 803D2CC
+ thumb_func_start RecordedOpponentHandleCmd40
+RecordedOpponentHandleCmd40: @ 803D2CC
push {lr}
ldr r3, _0803D2F0 @ =gUnknown_2022870
ldr r1, [r3]
@@ -5426,15 +5426,15 @@ sub_803D2CC: @ 803D2CC
ands r0, r2
orrs r0, r1
strb r0, [r3]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_0803D2F0: .4byte gUnknown_2022870
- thumb_func_end sub_803D2CC
+ thumb_func_end RecordedOpponentHandleCmd40
- thumb_func_start sub_803D2F4
-sub_803D2F4: @ 803D2F4
+ thumb_func_start RecordedOpponentHandleHitAnimation
+RecordedOpponentHandleHitAnimation: @ 803D2F4
push {r4,lr}
ldr r3, _0803D31C @ =gUnknown_202063C
ldr r2, _0803D320 @ =gUnknown_2023D44
@@ -5451,7 +5451,7 @@ sub_803D2F4: @ 803D2F4
lsls r0, 29
cmp r0, 0
bge _0803D328
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
b _0803D352
.align 2, 0
_0803D31C: .4byte gUnknown_202063C
@@ -5471,12 +5471,12 @@ _0803D328:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _0803D35C @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _0803D360 @ =sub_803ADF0
+ ldr r1, _0803D360 @ =DoHitAnimBlinkSpriteEffect_4
str r1, [r0]
_0803D352:
pop {r4}
@@ -5485,23 +5485,23 @@ _0803D352:
.align 2, 0
_0803D358: .4byte gUnknown_2024005
_0803D35C: .4byte gUnknown_3004FE0
-_0803D360: .4byte sub_803ADF0
- thumb_func_end sub_803D2F4
+_0803D360: .4byte DoHitAnimBlinkSpriteEffect_4
+ thumb_func_end RecordedOpponentHandleHitAnimation
thumb_func_start sub_803D364
sub_803D364: @ 803D364
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D364
- thumb_func_start sub_803D370
-sub_803D370: @ 803D370
+ thumb_func_start RecordedOpponentHandlePlaySE
+RecordedOpponentHandlePlaySE: @ 803D370
push {r4,lr}
ldr r4, _0803D3AC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -5521,15 +5521,15 @@ _0803D384:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl sub_80722F4
- bl sub_803B124
+ bl PlaySE12WithPanning
+ bl RecordedOpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0803D3AC: .4byte gUnknown_2023BC4
_0803D3B0: .4byte gUnknown_2022BC4
- thumb_func_end sub_803D370
+ thumb_func_end RecordedOpponentHandlePlaySE
thumb_func_start sub_803D3B4
sub_803D3B4: @ 803D3B4
@@ -5546,8 +5546,8 @@ sub_803D3B4: @ 803D3B4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
- bl sub_803B124
+ bl PlayFanfare
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -5569,13 +5569,13 @@ sub_803D3E4: @ 803D3E4
ldr r1, _0803D41C @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
movs r2, 0x5
- bl sub_8071E60
- bl sub_803B124
+ bl PlayCry3
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -5600,7 +5600,7 @@ sub_803D420: @ 803D420
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -5622,7 +5622,7 @@ sub_803D454: @ 803D454
lsls r0, 2
ldr r4, _0803D53C @ =gUnknown_202063C
adds r0, r4
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5670,10 +5670,10 @@ sub_803D454: @ 803D454
lsls r0, 2
adds r0, r4
ldr r1, _0803D544 @ =sub_803D648
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _0803D548 @ =sub_803D564
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _0803D54C @ =gUnknown_3005090
@@ -5829,7 +5829,7 @@ _0803D610:
mov r0, r9
strb r0, [r2]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -5859,9 +5859,9 @@ sub_803D648: @ 803D648
orrs r0, r1
strh r0, [r4, 0x4]
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
@@ -5870,8 +5870,8 @@ _0803D674: .4byte 0x000003ff
_0803D678: .4byte 0xfffffc00
thumb_func_end sub_803D648
- thumb_func_start sub_803D67C
-sub_803D67C: @ 803D67C
+ thumb_func_start RecordedOpponentHandleDrawPartyStatusSummary
+RecordedOpponentHandleDrawPartyStatusSummary: @ 803D67C
push {r4-r7,lr}
ldr r1, _0803D6A4 @ =gUnknown_2022BC4
ldr r0, _0803D6A8 @ =gUnknown_2023BC4
@@ -5883,11 +5883,11 @@ sub_803D67C: @ 803D67C
cmp r0, 0
beq _0803D6AC
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803D6AC
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
b _0803D776
.align 2, 0
_0803D6A4: .4byte gUnknown_2022BC4
@@ -6003,7 +6003,7 @@ _0803D780: .4byte gUnknown_2024000
_0803D784: .4byte gUnknown_2024018
_0803D788: .4byte gUnknown_3004FE0
_0803D78C: .4byte sub_803D790
- thumb_func_end sub_803D67C
+ thumb_func_end RecordedOpponentHandleDrawPartyStatusSummary
thumb_func_start sub_803D790
sub_803D790: @ 803D790
@@ -6033,7 +6033,7 @@ sub_803D790: @ 803D790
adds r0, r2
movs r1, 0
strb r1, [r0, 0x5]
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
_0803D7C8:
pop {r4}
pop {r0}
@@ -6043,8 +6043,8 @@ _0803D7D0: .4byte gUnknown_2024018
_0803D7D4: .4byte gUnknown_2023BC4
thumb_func_end sub_803D790
- thumb_func_start sub_803D7D8
-sub_803D7D8: @ 803D7D8
+ thumb_func_start RecordedOpponentHandleCmd49
+RecordedOpponentHandleCmd49: @ 803D7D8
push {lr}
ldr r0, _0803D814 @ =gUnknown_2024018
ldr r1, [r0]
@@ -6071,7 +6071,7 @@ sub_803D7D8: @ 803D7D8
ldr r1, _0803D824 @ =sub_80491B0
str r1, [r0]
_0803D80A:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -6080,18 +6080,18 @@ _0803D818: .4byte gUnknown_2023BC4
_0803D81C: .4byte gUnknown_3005090
_0803D820: .4byte gUnknown_2024000
_0803D824: .4byte sub_80491B0
- thumb_func_end sub_803D7D8
+ thumb_func_end RecordedOpponentHandleCmd49
thumb_func_start sub_803D828
sub_803D828: @ 803D828
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D828
- thumb_func_start sub_803D834
-sub_803D834: @ 803D834
+ thumb_func_start RecordedOpponentHandleSpriteInvisibility
+RecordedOpponentHandleSpriteInvisibility: @ 803D834
push {r4,lr}
ldr r4, _0803D884 @ =gUnknown_2023BC4
ldrb r0, [r4]
@@ -6124,9 +6124,9 @@ sub_803D834: @ 803D834
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
_0803D87A:
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -6135,15 +6135,15 @@ _0803D884: .4byte gUnknown_2023BC4
_0803D888: .4byte gUnknown_202063C
_0803D88C: .4byte gUnknown_2023D44
_0803D890: .4byte gUnknown_2022BC4
- thumb_func_end sub_803D834
+ thumb_func_end RecordedOpponentHandleSpriteInvisibility
- thumb_func_start sub_803D894
-sub_803D894: @ 803D894
+ thumb_func_start RecordedOpponentHandleBattleAnimation
+RecordedOpponentHandleBattleAnimation: @ 803D894
push {r4-r6,lr}
sub sp, 0x4
ldr r6, _0803D8D8 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _0803D8EC
@@ -6164,11 +6164,11 @@ sub_803D894: @ 803D894
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _0803D8E0
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
b _0803D8EC
.align 2, 0
_0803D8D8: .4byte gUnknown_2023BC4
@@ -6178,7 +6178,7 @@ _0803D8E0:
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
- ldr r0, _0803D8F8 @ =sub_803B0F4
+ ldr r0, _0803D8F8 @ =CompleteOnFinishedBattleAnimation_5
str r0, [r1]
_0803D8EC:
add sp, 0x4
@@ -6187,13 +6187,13 @@ _0803D8EC:
bx r0
.align 2, 0
_0803D8F4: .4byte gUnknown_3004FE0
-_0803D8F8: .4byte sub_803B0F4
- thumb_func_end sub_803D894
+_0803D8F8: .4byte CompleteOnFinishedBattleAnimation_5
+ thumb_func_end RecordedOpponentHandleBattleAnimation
thumb_func_start sub_803D8FC
sub_803D8FC: @ 803D8FC
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D8FC
@@ -6201,13 +6201,13 @@ sub_803D8FC: @ 803D8FC
thumb_func_start sub_803D908
sub_803D908: @ 803D908
push {lr}
- bl sub_803B124
+ bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_803D908
- thumb_func_start sub_803D914
-sub_803D914: @ 803D914
+ thumb_func_start RecordedOpponentHandleCmd55
+RecordedOpponentHandleCmd55: @ 803D914
push {lr}
ldr r1, _0803D930 @ =gUnknown_2022BC4
ldr r0, _0803D934 @ =gUnknown_2023BC4
@@ -6232,10 +6232,10 @@ _0803D93C:
strb r1, [r0]
_0803D944:
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
- bl sub_803B124
+ bl BeginFastPaletteFade
+ bl RecordedOpponentBufferExecCompleted
ldr r1, _0803D96C @ =gUnknown_3004FE0
ldr r0, _0803D970 @ =gUnknown_2023BC4
ldrb r0, [r0]
@@ -6250,7 +6250,7 @@ _0803D968: .4byte gUnknown_2023E8A
_0803D96C: .4byte gUnknown_3004FE0
_0803D970: .4byte gUnknown_2023BC4
_0803D974: .4byte sub_802F6A8
- thumb_func_end sub_803D914
+ thumb_func_end RecordedOpponentHandleCmd55
thumb_func_start nullsub_20
nullsub_20: @ 803D978
diff --git a/asm/battle_controller_link_partner.s b/asm/battle_controller_link_partner.s
index 04beb1afd..11d2fa66f 100644
--- a/asm/battle_controller_link_partner.s
+++ b/asm/battle_controller_link_partner.s
@@ -123,7 +123,7 @@ sub_80D42A8: @ 80D42A8
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -131,7 +131,7 @@ sub_80D42A8: @ 80D42A8
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
bl sub_80D49E8
_080D42F8:
pop {r4-r6}
@@ -254,7 +254,7 @@ _080D43B0:
_080D43E6:
movs r6, 0x1
_080D43E8:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _080D43F4
@@ -364,7 +364,7 @@ _080D4460:
lsls r0, 2
ldr r1, _080D4578 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _080D457C @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r1, r7, 0
@@ -380,7 +380,7 @@ _080D4460:
ldr r2, _080D4584 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r6]
eors r0, r7
bl sub_804BD94
@@ -388,7 +388,7 @@ _080D4460:
eors r0, r7
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
_080D4500:
ldr r1, _080D4574 @ =gUnknown_3004FFC
ldr r4, _080D456C @ =gUnknown_2023BC4
@@ -400,7 +400,7 @@ _080D4500:
lsls r0, 2
ldr r1, _080D4578 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r5, _080D457C @ =gUnknown_3004FF0
ldrb r1, [r4]
adds r0, r1, r5
@@ -414,13 +414,13 @@ _080D4500:
ldr r2, _080D4584 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r4]
bl sub_804BD94
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r0, _080D4568 @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -502,7 +502,7 @@ sub_80D45D0: @ 80D45D0
ldrb r0, [r5]
adds r0, r6
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -528,7 +528,7 @@ _080D4618:
muls r0, r2
ldr r2, _080D463C @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_80D49E8
_080D4632:
pop {r4-r6}
@@ -562,7 +562,7 @@ sub_80D4640: @ 80D4640
ldrb r0, [r2, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -570,12 +570,12 @@ sub_80D4640: @ 80D4640
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080D46A4 @ =gUnknown_3004FF0
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_80D49E8
_080D4690:
pop {r4-r6}
@@ -613,7 +613,7 @@ sub_80D46A8: @ 80D46A8
lsls r0, 2
ldr r4, _080D4710 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -621,12 +621,12 @@ sub_80D46A8: @ 80D46A8
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080D4714 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_80D49E8
_080D46FC:
pop {r4-r6}
@@ -750,7 +750,7 @@ sub_80D47AC: @ 80D47AC
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080D47EC:
ldr r0, _080D4814 @ =gUnknown_3004FE0
ldrb r1, [r4]
@@ -835,12 +835,12 @@ sub_80D484C: @ 80D484C
strb r0, [r1, 0x1]
ldr r4, _080D4920 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _080D4924 @ =sub_802FDF4
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r0, _080D4928 @ =gUnknown_2023BCE
mov r8, r0
ldrb r1, [r7]
@@ -851,7 +851,7 @@ sub_80D484C: @ 80D484C
muls r0, r6
ldr r5, _080D492C @ =gUnknown_2024284
adds r0, r5
- bl sub_8035244
+ bl HandleLowHpMusicChange
ldr r1, _080D4930 @ =gUnknown_2023D44
ldrb r0, [r7]
adds r0, r1
@@ -862,7 +862,7 @@ sub_80D484C: @ 80D484C
ldr r1, _080D4934 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, _080D4938 @ =gUnknown_3004FF0
ldrb r1, [r7]
adds r0, r1, r4
@@ -873,15 +873,15 @@ sub_80D484C: @ 80D484C
muls r1, r6
adds r1, r5
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r7]
bl sub_804BD94
ldrb r0, [r7]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r7]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
ldr r1, _080D493C @ =gUnknown_3004FE0
ldrb r0, [r7]
lsls r0, 2
@@ -962,7 +962,7 @@ _080D4976:
cmp r0, 0
bne _080D49BC
adds r0, r3, r5
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080D49E0 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -1002,7 +1002,7 @@ sub_80D49E8: @ 80D49E8
ands r0, r1
cmp r0, 0
beq _080D4A3C
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -1144,7 +1144,7 @@ _080D4B1A:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_80D49E8
add sp, 0x100
pop {r4-r6}
@@ -1254,12 +1254,12 @@ _080D4C64:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -1287,12 +1287,12 @@ _080D4CB0:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -1307,21 +1307,21 @@ _080D4CB0:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -1333,7 +1333,7 @@ _080D4CB0:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -1345,7 +1345,7 @@ _080D4CB0:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -1357,7 +1357,7 @@ _080D4CB0:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1368,7 +1368,7 @@ _080D4CB0:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -1379,7 +1379,7 @@ _080D4CB0:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -1391,55 +1391,55 @@ _080D4CB0:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -1452,7 +1452,7 @@ _080D4CB0:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -1462,19 +1462,19 @@ _080D4CB0:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r6, 0
_080D4E68:
@@ -1525,13 +1525,13 @@ _080D4EBE:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -1545,7 +1545,7 @@ _080D4EBE:
ldr r1, _080D4F0C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -1587,7 +1587,7 @@ _080D4F38:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1598,7 +1598,7 @@ _080D4F38:
ldr r1, _080D4F64 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1635,7 +1635,7 @@ _080D4F94:
adds r0, r1
movs r1, 0x19
_080D4F9E:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -1768,27 +1768,27 @@ _080D5084:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _080D52CA
@@ -1873,7 +1873,7 @@ _080D5154:
adds r0, r1
movs r1, 0x37
_080D515E:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -1962,7 +1962,7 @@ _080D51F8:
adds r0, r1
movs r1, 0x3F
_080D5202:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -2069,7 +2069,7 @@ _080D52B8:
adds r0, r1
movs r1, 0x36
_080D52C2:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_080D52CA:
@@ -3262,7 +3262,7 @@ _080D5D0A:
muls r0, r2
ldr r2, _080D5D34 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
add sp, 0x34
pop {r3-r5}
mov r8, r3
@@ -3360,12 +3360,12 @@ sub_80D5DB4: @ 80D5DB4
muls r0, r5
adds r0, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3392,7 +3392,7 @@ sub_80D5DB4: @ 80D5DB4
mov r0, r8
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080D5EB8 @ =gUnknown_2023D44
ldrb r1, [r6]
adds r1, r4
@@ -3438,7 +3438,7 @@ sub_80D5DB4: @ 80D5DB4
ldr r1, _080D5EC4 @ =gUnknown_2024024
adds r2, r1
ldrb r1, [r2]
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _080D5EC8 @ =gUnknown_3004FE0
ldrb r0, [r6]
lsls r0, 2
@@ -3473,7 +3473,7 @@ sub_80D5ED0: @ 80D5ED0
adds r6, r4, 0x2
adds r1, r6
ldrb r1, [r1]
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r2, _080D5F30 @ =gUnknown_2023BCE
ldrb r0, [r5]
lsls r1, r0, 1
@@ -3528,7 +3528,7 @@ sub_80D5F40: @ 80D5F40
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r0, _080D6084 @ =gUnknown_2023BCE
lsls r2, r6, 1
adds r2, r0
@@ -3544,20 +3544,20 @@ sub_80D5F40: @ 80D5F40
ldr r1, _080D608C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _080D6090 @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _080D6094 @ =gUnknown_3004FFC
mov r9, r1
add r9, r6
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3584,7 +3584,7 @@ sub_80D5F40: @ 80D5F40
mov r0, r10
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080D609C @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -3629,7 +3629,7 @@ sub_80D5F40: @ 80D5F40
ldr r1, _080D60A4 @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -3651,7 +3651,7 @@ sub_80D5F40: @ 80D5F40
str r1, [r0]
movs r0, 0
movs r1, 0xFF
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r9
ldrb r2, [r1]
lsls r1, r2, 4
@@ -3723,7 +3723,7 @@ _080D60F4:
lsls r0, 2
ldr r4, _080D6134 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -3731,12 +3731,12 @@ _080D60F4:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080D6138 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_80D49E8
_080D612A:
pop {r4-r6}
@@ -3781,7 +3781,7 @@ _080D6164:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080D617E:
ldr r0, [r6]
ldrb r1, [r5]
@@ -3806,7 +3806,7 @@ _080D6192:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080D61C0 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -3829,7 +3829,7 @@ sub_80D61C8: @ 80D61C8
push {r7}
ldr r6, _080D6240 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
ands r1, r0
movs r7, 0x20
@@ -3838,7 +3838,7 @@ sub_80D61C8: @ 80D61C8
movs r7, 0x5A
_080D61E2:
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
ldr r5, _080D6244 @ =gUnknown_202273C
lsls r1, r0, 3
subs r1, r0
@@ -3849,7 +3849,7 @@ _080D61E2:
cmp r0, 0x2
beq _080D6228
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3860,7 +3860,7 @@ _080D61E2:
cmp r0, 0x1
beq _080D6228
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3872,7 +3872,7 @@ _080D61E2:
_080D6228:
ldr r0, _080D6240 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8043658
+ bl GetBankMultiplayerId
ldr r2, _080D6244 @ =gUnknown_202273C
lsls r1, r0, 3
subs r1, r0
@@ -3886,7 +3886,7 @@ _080D6240: .4byte gUnknown_2023BC4
_080D6244: .4byte gUnknown_202273C
_080D6248:
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -3898,7 +3898,7 @@ _080D6258:
adds r0, r4, 0
bl sub_8034750
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3925,7 +3925,7 @@ _080D6258:
adds r0, r6, 0
mov r1, r8
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _080D6324 @ =gUnknown_2023D44
ldrb r1, [r5]
adds r1, r6
@@ -4016,7 +4016,7 @@ sub_80D6348: @ 80D6348
lsls r0, 2
ldr r5, _080D63DC @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4063,7 +4063,7 @@ sub_80D6348: @ 80D6348
lsls r0, 2
adds r0, r5
ldr r1, _080D63E8 @ =nullsub_8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _080D63EC @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -4110,7 +4110,7 @@ sub_80D63F4: @ 80D63F4
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080D6428:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4144,11 +4144,11 @@ _080D6448:
muls r0, r2
ldr r2, _080D64C8 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _080D64CC @ =gUnknown_202063C
ldr r3, _080D64D0 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -4235,7 +4235,7 @@ sub_80D6510: @ 80D6510
push {r4-r6,lr}
ldr r6, _080D65F4 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
beq _080D6522
@@ -4336,7 +4336,7 @@ _080D6522:
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4445,7 +4445,7 @@ _080D66AA:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080D66CC:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4503,7 +4503,7 @@ _080D670A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -4540,7 +4540,7 @@ _080D6780:
lsrs r4, r0, 24
cmp r4, 0
bne _080D67BC
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r10
@@ -4550,7 +4550,7 @@ _080D6780:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -4686,7 +4686,7 @@ sub_80D6894: @ 80D6894
push {r6,r7}
sub sp, 0x4
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _080D690C @ =gUnknown_2022BC4
ldr r0, _080D6910 @ =gUnknown_2023BC4
mov r9, r0
@@ -4714,7 +4714,7 @@ sub_80D6894: @ 80D6894
ldr r4, _080D691C @ =gUnknown_2024284
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -4724,7 +4724,7 @@ sub_80D6894: @ 80D6894
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -4733,7 +4733,7 @@ sub_80D6894: @ 80D6894
ldrb r1, [r1]
str r7, [sp]
mov r2, r8
- bl sub_8048150
+ bl SetBattleBarStruct
b _080D694E
.align 2, 0
_080D690C: .4byte gUnknown_2022BC4
@@ -4752,7 +4752,7 @@ _080D6924:
ldr r1, _080D6970 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -4761,7 +4761,7 @@ _080D6924:
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
_080D694E:
ldr r1, _080D6978 @ =gUnknown_3004FE0
ldr r0, _080D697C @ =gUnknown_2023BC4
@@ -4799,7 +4799,7 @@ sub_80D6990: @ 80D6990
push {r4,lr}
ldr r4, _080D69EC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _080D69E4
@@ -4816,7 +4816,7 @@ sub_80D6990: @ 80D6990
ldr r2, _080D69F8 @ =gUnknown_2024284
adds r1, r2
movs r2, 0x9
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r2, [r4]
ldr r0, _080D69FC @ =gUnknown_2024018
ldr r0, [r0]
@@ -4855,7 +4855,7 @@ sub_80D6A08: @ 80D6A08
push {r4,r5,lr}
ldr r5, _080D6A60 @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _080D6A58
@@ -4883,7 +4883,7 @@ sub_80D6A08: @ 80D6A08
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
- bl sub_8033F1C
+ bl InitAndLaunchChosenStatusAnimation
ldr r1, _080D6A68 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -5092,7 +5092,7 @@ _080D6BA4:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _080D6BD8 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -5122,7 +5122,7 @@ sub_80D6BEC: @ 80D6BEC
push {r4,lr}
ldr r4, _080D6C28 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -5142,7 +5142,7 @@ _080D6C00:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
bl sub_80D49E8
pop {r4}
pop {r0}
@@ -5167,7 +5167,7 @@ sub_80D6C30: @ 80D6C30
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
+ bl PlayFanfare
bl sub_80D49E8
pop {r0}
bx r0
@@ -5190,13 +5190,13 @@ sub_80D6C60: @ 80D6C60
ldr r1, _080D6C9C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
negs r1, r1
movs r2, 0x5
- bl sub_8071E60
+ bl PlayCry3
bl sub_80D49E8
pop {r0}
bx r0
@@ -5244,7 +5244,7 @@ sub_80D6CD4: @ 80D6CD4
lsls r0, 2
ldr r4, _080D6DE4 @ =gUnknown_202063C
adds r0, r4
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5299,7 +5299,7 @@ sub_80D6CD4: @ 80D6CD4
lsls r0, 2
adds r0, r4
ldr r1, _080D6DF0 @ =sub_80335F8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -5308,13 +5308,13 @@ sub_80D6CD4: @ 80D6CD4
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080D6DF4 @ =0x0000d6f9
- bl sub_80089B8
+ bl AllocSpritePalette
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
ldr r4, _080D6DF8 @ =gUnknown_202273C
lsls r1, r0, 3
subs r1, r0
@@ -5325,7 +5325,7 @@ sub_80D6CD4: @ 80D6CD4
cmp r0, 0x2
beq _080D6DC2
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5336,7 +5336,7 @@ sub_80D6CD4: @ 80D6CD4
cmp r0, 0x1
beq _080D6DC2
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5348,7 +5348,7 @@ sub_80D6CD4: @ 80D6CD4
_080D6DC2:
ldr r0, _080D6DE0 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8043658
+ bl GetBankMultiplayerId
ldr r2, _080D6DF8 @ =gUnknown_202273C
lsls r1, r0, 3
subs r1, r0
@@ -5368,7 +5368,7 @@ _080D6DF4: .4byte 0x0000d6f9
_080D6DF8: .4byte gUnknown_202273C
_080D6DFC:
ldrb r0, [r6]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -5384,7 +5384,7 @@ _080D6E0C:
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r2, _080D6EA8 @ =gUnknown_202063C
ldr r1, _080D6EAC @ =gUnknown_2023D44
ldr r5, _080D6EB0 @ =gUnknown_2023BC4
@@ -5402,7 +5402,7 @@ _080D6E0C:
strb r0, [r1, 0x5]
ldr r0, _080D6EB4 @ =sub_80D6ED0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _080D6EB8 @ =gUnknown_3005090
@@ -5575,7 +5575,7 @@ _080D6FA0:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080D6FB8:
pop {r3,r4}
mov r8, r3
@@ -5605,7 +5605,7 @@ sub_80D6FDC: @ 80D6FDC
cmp r0, 0
beq _080D700C
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D700C
@@ -5805,7 +5805,7 @@ sub_80D7144: @ 80D7144
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
_080D718A:
bl sub_80D49E8
pop {r4}
@@ -5824,7 +5824,7 @@ sub_80D71A4: @ 80D71A4
sub sp, 0x4
ldr r6, _080D71E8 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _080D71FC
@@ -5845,7 +5845,7 @@ sub_80D71A4: @ 80D71A4
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _080D71F0
@@ -5900,9 +5900,9 @@ sub_80D7224: @ 80D7224
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
+ bl BeginFastPaletteFade
bl sub_80D49E8
ldr r1, _080D7268 @ =gUnknown_3004FE0
ldrb r0, [r4]
diff --git a/asm/battle_controller_oak.s b/asm/battle_controller_oak.s
index bd2682218..e5a281ea6 100644
--- a/asm/battle_controller_oak.s
+++ b/asm/battle_controller_oak.s
@@ -75,7 +75,7 @@ _080E7628: .4byte gUnknown_2023BC4
_080E762C: .4byte gUnknown_2022BC4
_080E7630: .4byte gUnknown_84020F8
_080E7634:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E7638:
pop {r0}
bx r0
@@ -101,12 +101,12 @@ sub_80E763C: @ 80E763C
movs r1, 0x1
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldrb r0, [r4]
movs r1, 0
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldr r0, _080E76A4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r2, 0x1
@@ -154,7 +154,7 @@ _080E76C8:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _080E781A
_080E76D4:
movs r0, 0x20
@@ -275,13 +275,13 @@ _080E77AC:
cmp r0, 0
beq _080E7838
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _080E7838
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080E7824 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _080E7828 @ =gUnknown_825E45C
@@ -316,9 +316,9 @@ _080E780A:
movs r1, 0xC
_080E7814:
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_080E781A:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080E7838
.align 2, 0
_080E7820: .4byte gUnknown_2022B4C
@@ -410,8 +410,8 @@ _080E78B4:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_800E848
- bl sub_80E8A9C
+ bl EmitTwoReturnValues
+ bl WallyBufferExecCompleted
_080E78D8:
pop {r4}
pop {r0}
@@ -436,7 +436,7 @@ sub_80E78E0: @ 80E78E0
ldr r0, _080E7914 @ =nullsub_8
cmp r1, r0
bne _080E7904
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E7904:
pop {r0}
bx r0
@@ -455,7 +455,7 @@ sub_80E7918: @ 80E7918
lsls r0, 16
cmp r0, 0
bne _080E792A
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E792A:
pop {r0}
bx r0
@@ -482,7 +482,7 @@ sub_80E7930: @ 80E7930
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080E795A:
pop {r0}
bx r0
@@ -500,7 +500,7 @@ sub_80E7970: @ 80E7970
ldrb r0, [r0]
cmp r0, 0
bne _080E797E
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E797E:
pop {r0}
bx r0
@@ -523,7 +523,7 @@ sub_80E7988: @ 80E7988
ands r1, r0
cmp r1, 0
bne _080E79A8
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E79A8:
pop {r0}
bx r0
@@ -559,7 +559,7 @@ sub_80E79B8: @ 80E79B8
lsls r1, 3
adds r1, r3
ldrb r4, [r1, 0x8]
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
adds r0, r4, 0
bl sub_81278DC
@@ -598,7 +598,7 @@ sub_80E7A14: @ 80E7A14
ldrb r1, [r0]
ldr r2, _080E7A58 @ =gUnknown_203B0DC
movs r0, 0x1
- bl sub_800E874
+ bl EmitChosenMonReturnValue
b _080E7A66
.align 2, 0
_080E7A44: .4byte gUnknown_30030F0
@@ -611,9 +611,9 @@ _080E7A5C:
movs r0, 0x1
movs r1, 0x6
movs r2, 0
- bl sub_800E874
+ bl EmitChosenMonReturnValue
_080E7A66:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E7A6A:
pop {r0}
bx r0
@@ -710,8 +710,8 @@ _080E7B34:
ldr r0, _080E7B48 @ =gUnknown_203AD30
ldrh r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
- bl sub_80E8A9C
+ bl EmitOneReturnValue
+ bl WallyBufferExecCompleted
_080E7B42:
pop {r0}
bx r0
@@ -816,7 +816,7 @@ _080E7BB2:
lsls r0, 2
ldr r1, _080E7CC8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _080E7CCC @ =gUnknown_3004FF0
ldrb r0, [r5]
adds r1, r6, 0
@@ -832,7 +832,7 @@ _080E7BB2:
ldr r2, _080E7CBC @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
eors r0, r6
bl sub_804BD94
@@ -840,7 +840,7 @@ _080E7BB2:
eors r0, r6
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
_080E7C46:
ldr r1, _080E7CC4 @ =gUnknown_3004FFC
ldr r4, _080E7CB4 @ =gUnknown_2023BC4
@@ -852,7 +852,7 @@ _080E7C46:
lsls r0, 2
ldr r1, _080E7CC8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r5, _080E7CCC @ =gUnknown_3004FF0
ldrb r1, [r4]
adds r0, r1, r5
@@ -866,13 +866,13 @@ _080E7C46:
ldr r2, _080E7CBC @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r4]
bl sub_804BD94
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r0, _080E7CB0 @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -1002,12 +1002,12 @@ _080E7D02:
strb r4, [r0, 0x1]
ldr r4, _080E7DEC @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _080E7DF0 @ =sub_802FDF4
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r2, _080E7DF4 @ =gUnknown_2023BCE
mov r0, r8
ldrb r1, [r0]
@@ -1018,7 +1018,7 @@ _080E7D02:
muls r0, r2
ldr r2, _080E7DF8 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
ldr r1, _080E7DFC @ =gUnknown_3004FE0
mov r2, r8
ldrb r0, [r2]
@@ -1090,19 +1090,19 @@ _080E7E4A:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldr r3, _080E7F10 @ =gUnknown_8253AE4
adds r4, 0x1
@@ -1131,7 +1131,7 @@ _080E7E4A:
mov r2, sp
bl sub_804037C
adds r0, r6, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -1145,7 +1145,7 @@ _080E7E4A:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
bl sub_8075290
lsls r0, 24
@@ -1202,7 +1202,7 @@ _080E7F38:
ldr r1, _080E7F5C @ =sub_80E8930
str r1, [r0]
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
b _080E7F66
.align 2, 0
_080E7F58: .4byte gUnknown_3004FE0
@@ -1259,19 +1259,19 @@ sub_80E7F7C: @ 80E7F7C
adds r6, r0
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
ldr r6, _080E803C @ =gUnknown_8253AE4
lsls r1, r4, 2
@@ -1301,7 +1301,7 @@ sub_80E7F7C: @ 80E7F7C
negs r0, r0
str r0, [sp]
mov r0, r10
- bl sub_8048150
+ bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
ldr r0, _080E8048 @ =sub_80E804C
@@ -1367,7 +1367,7 @@ _080E807C:
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r4, 16
movs r0, 0x1
@@ -1383,17 +1383,17 @@ _080E807C:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r3, _080E814C @ =gUnknown_8253AE4
@@ -1424,7 +1424,7 @@ _080E807C:
mov r2, sp
bl sub_804037C
adds r0, r5, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -1437,7 +1437,7 @@ _080E807C:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
ldr r0, _080E8158 @ =sub_80E8190
str r0, [r6]
@@ -1461,7 +1461,7 @@ _080E815C:
ldr r1, _080E818C @ =sub_80E8930
str r1, [r0]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080E8178:
add sp, 0x8
pop {r3-r5}
@@ -1508,7 +1508,7 @@ _080E81C4:
adds r1, r4, 0
adds r2, r4, 0
movs r3, 0
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, _080E81E4 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -1556,7 +1556,7 @@ sub_80E81F0: @ 80E81F0
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
bl sub_8075290
lsls r0, 24
lsrs r0, 24
@@ -1576,7 +1576,7 @@ sub_80E81F0: @ 80E81F0
ldrb r0, [r0]
adds r1, r7, 0
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _080E8284
.align 2, 0
_080E825C: .4byte gUnknown_3005090
@@ -1593,7 +1593,7 @@ _080E8270:
ldr r2, _080E829C @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_080E8284:
ldr r0, _080E82A0 @ =gUnknown_3005090
lsls r1, r6, 2
@@ -1630,7 +1630,7 @@ sub_80E82A8: @ 80E82A8
ldr r1, _080E82E8 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldrb r0, [r4, 0xC]
ldr r1, _080E82EC @ =gUnknown_3004FE0
lsls r0, 2
@@ -1638,7 +1638,7 @@ sub_80E82A8: @ 80E82A8
ldr r1, _080E82F0 @ =sub_80E8930
str r1, [r0]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -1672,7 +1672,7 @@ sub_80E82F4: @ 80E82F4
ldrb r0, [r2, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -1680,13 +1680,13 @@ sub_80E82F4: @ 80E82F4
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080E8358 @ =gUnknown_3004FF0
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
- bl sub_80E8A9C
+ bl SetHealthboxSpriteInvisible
+ bl WallyBufferExecCompleted
_080E8344:
pop {r4-r6}
pop {r0}
@@ -1746,7 +1746,7 @@ _080E83BA:
adds r5, 0x95
adds r4, 0x97
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -1759,7 +1759,7 @@ _080E83BA:
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
b _080E8522
.align 2, 0
@@ -1816,7 +1816,7 @@ _080E8430:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
b _080E8522
.align 2, 0
@@ -1866,7 +1866,7 @@ _080E8490:
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
b _080E8522
.align 2, 0
@@ -1902,7 +1902,7 @@ _080E8500:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080E851E:
ldr r0, _080E852C @ =gUnknown_2023FE8
ldr r1, [r0]
@@ -1924,7 +1924,7 @@ _080E8530:
cmp r4, 0
bne _080E855E
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_80EF0E0
@@ -1933,7 +1933,7 @@ _080E8530:
ldr r0, [r0]
adds r0, 0x94
strb r4, [r0]
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E855E:
add sp, 0x4
pop {r4-r7}
@@ -2066,7 +2066,7 @@ _080E8634:
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
b _080E86A6
_080E865A:
@@ -2102,7 +2102,7 @@ _080E8684:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080E86A2:
ldr r0, _080E86B0 @ =gUnknown_2023FE8
ldr r1, [r0]
@@ -2124,11 +2124,11 @@ _080E86B4:
bl sub_80EB524
ldr r0, _080E86DC @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080E86E0
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080E86E4
.align 2, 0
_080E86D8: .4byte gUnknown_2037AB8
@@ -2207,7 +2207,7 @@ _080E875A:
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
b _080E886C
.align 2, 0
@@ -2243,7 +2243,7 @@ _080E879A:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
b _080E886C
.align 2, 0
@@ -2297,7 +2297,7 @@ _080E8800:
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
b _080E886C
.align 2, 0
@@ -2318,7 +2318,7 @@ _080E8848:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080E8868:
ldr r0, _080E887C @ =gUnknown_2023FE8
ldr r1, [r0]
@@ -2344,8 +2344,8 @@ _080E8880:
ldr r0, _080E88B8 @ =gUnknown_203AD30
ldrh r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
- bl sub_80E8A9C
+ bl EmitOneReturnValue
+ bl WallyBufferExecCompleted
ldr r0, _080E88BC @ =gUnknown_2023FE8
ldr r0, [r0]
adds r0, 0x94
@@ -2378,7 +2378,7 @@ sub_80E88C0: @ 80E88C0
ldrb r0, [r5]
adds r0, r6
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -2404,8 +2404,8 @@ _080E8908:
muls r0, r2
ldr r2, _080E892C @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
- bl sub_80E8A9C
+ bl HandleLowHpMusicChange
+ bl WallyBufferExecCompleted
_080E8922:
pop {r4-r6}
pop {r0}
@@ -2423,14 +2423,14 @@ sub_80E8930: @ 80E8930
lsls r0, 16
cmp r0, 0
bne _080E8942
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E8942:
pop {r0}
bx r0
thumb_func_end sub_80E8930
- thumb_func_start sub_80E8948
-sub_80E8948: @ 80E8948
+ thumb_func_start DoHitAnimBlinkSpriteEffect_3
+DoHitAnimBlinkSpriteEffect_3: @ 80E8948
push {r4,lr}
ldr r1, _080E8984 @ =gUnknown_2023D44
ldr r0, _080E8988 @ =gUnknown_2023BC4
@@ -2457,7 +2457,7 @@ sub_80E8948: @ 80E8948
strb r0, [r2]
ldr r0, _080E8990 @ =gUnknown_2024005
strb r3, [r0]
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080E89BE
.align 2, 0
_080E8984: .4byte gUnknown_2023D44
@@ -2491,7 +2491,7 @@ _080E89BE:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80E8948
+ thumb_func_end DoHitAnimBlinkSpriteEffect_3
thumb_func_start sub_80E89C4
sub_80E89C4: @ 80E89C4
@@ -2518,7 +2518,7 @@ sub_80E89C4: @ 80E89C4
lsls r0, 2
ldr r4, _080E8A2C @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -2526,13 +2526,13 @@ sub_80E89C4: @ 80E89C4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080E8A30 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
- bl sub_80E8A9C
+ bl SetHealthboxSpriteInvisible
+ bl WallyBufferExecCompleted
_080E8A18:
pop {r4-r6}
pop {r0}
@@ -2563,7 +2563,7 @@ sub_80E8A34: @ 80E8A34
ldr r0, _080E8A68 @ =nullsub_8
cmp r1, r0
bne _080E8A58
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E8A58:
pop {r0}
bx r0
@@ -2574,8 +2574,8 @@ _080E8A64: .4byte gUnknown_2023BC4
_080E8A68: .4byte nullsub_8
thumb_func_end sub_80E8A34
- thumb_func_start sub_80E8A6C
-sub_80E8A6C: @ 80E8A6C
+ thumb_func_start CompleteOnFinishedBattleAnimation_4
+CompleteOnFinishedBattleAnimation_4: @ 80E8A6C
push {lr}
ldr r0, _080E8A94 @ =gUnknown_2024018
ldr r2, [r0]
@@ -2591,17 +2591,17 @@ sub_80E8A6C: @ 80E8A6C
ands r0, r1
cmp r0, 0
bne _080E8A8E
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E8A8E:
pop {r0}
bx r0
.align 2, 0
_080E8A94: .4byte gUnknown_2024018
_080E8A98: .4byte gUnknown_2023BC4
- thumb_func_end sub_80E8A6C
+ thumb_func_end CompleteOnFinishedBattleAnimation_4
- thumb_func_start sub_80E8A9C
-sub_80E8A9C: @ 80E8A9C
+ thumb_func_start WallyBufferExecCompleted
+WallyBufferExecCompleted: @ 80E8A9C
push {r4,lr}
sub sp, 0x4
ldr r1, _080E8ADC @ =gUnknown_3004FE0
@@ -2617,7 +2617,7 @@ sub_80E8A9C: @ 80E8A9C
ands r0, r1
cmp r0, 0
beq _080E8AF0
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2655,10 +2655,10 @@ _080E8B02:
.align 2, 0
_080E8B0C: .4byte gUnknown_2023BC8
_080E8B10: .4byte gUnknown_825E45C
- thumb_func_end sub_80E8A9C
+ thumb_func_end WallyBufferExecCompleted
- thumb_func_start sub_80E8B14
-sub_80E8B14: @ 80E8B14
+ thumb_func_start CompleteOnFinishedStatusAnimation_4
+CompleteOnFinishedStatusAnimation_4: @ 80E8B14
push {lr}
ldr r0, _080E8B3C @ =gUnknown_2024018
ldr r2, [r0]
@@ -2674,17 +2674,17 @@ sub_80E8B14: @ 80E8B14
ands r0, r1
cmp r0, 0
bne _080E8B36
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080E8B36:
pop {r0}
bx r0
.align 2, 0
_080E8B3C: .4byte gUnknown_2024018
_080E8B40: .4byte gUnknown_2023BC4
- thumb_func_end sub_80E8B14
+ thumb_func_end CompleteOnFinishedStatusAnimation_4
- thumb_func_start sub_80E8B44
-sub_80E8B44: @ 80E8B44
+ thumb_func_start WallyHandleGetMonData
+WallyHandleGetMonData: @ 80E8B44
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
@@ -2702,7 +2702,7 @@ sub_80E8B44: @ 80E8B44
adds r1, r0
ldrb r0, [r1]
mov r1, sp
- bl sub_80E8BB8
+ bl CopyWallyMonData
adds r6, r0, 0
b _080E8B9E
.align 2, 0
@@ -2721,7 +2721,7 @@ _080E8B80:
lsrs r0, 24
mov r2, sp
adds r1, r2, r6
- bl sub_80E8BB8
+ bl CopyWallyMonData
adds r6, r0
_080E8B96:
lsrs r4, 1
@@ -2733,16 +2733,16 @@ _080E8B9E:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
- bl sub_80E8A9C
+ bl EmitDataTransfer
+ bl WallyBufferExecCompleted
add sp, 0x100
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80E8B44
+ thumb_func_end WallyHandleGetMonData
- thumb_func_start sub_80E8BB8
-sub_80E8BB8: @ 80E8BB8
+ thumb_func_start CopyWallyMonData
+CopyWallyMonData: @ 80E8BB8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2843,12 +2843,12 @@ _080E8CE8:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -2876,12 +2876,12 @@ _080E8D34:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -2896,21 +2896,21 @@ _080E8D34:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -2922,7 +2922,7 @@ _080E8D34:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -2934,7 +2934,7 @@ _080E8D34:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -2946,7 +2946,7 @@ _080E8D34:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -2957,7 +2957,7 @@ _080E8D34:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -2968,7 +2968,7 @@ _080E8D34:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -2980,55 +2980,55 @@ _080E8D34:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -3041,7 +3041,7 @@ _080E8D34:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -3051,19 +3051,19 @@ _080E8D34:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r6, 0
_080E8EEC:
@@ -3114,13 +3114,13 @@ _080E8F42:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -3134,7 +3134,7 @@ _080E8F42:
ldr r1, _080E8F90 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -3176,7 +3176,7 @@ _080E8FBC:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -3187,7 +3187,7 @@ _080E8FBC:
ldr r1, _080E8FE8 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -3224,7 +3224,7 @@ _080E9018:
adds r0, r1
movs r1, 0x19
_080E9022:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -3357,27 +3357,27 @@ _080E9108:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _080E934E
@@ -3462,7 +3462,7 @@ _080E91D8:
adds r0, r1
movs r1, 0x37
_080E91E2:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -3551,7 +3551,7 @@ _080E927C:
adds r0, r1
movs r1, 0x3F
_080E9286:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -3658,7 +3658,7 @@ _080E933C:
adds r0, r1
movs r1, 0x36
_080E9346:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_080E934E:
@@ -3673,18 +3673,18 @@ _080E934E:
bx r1
.align 2, 0
_080E9360: .4byte gUnknown_2024284
- thumb_func_end sub_80E8BB8
+ thumb_func_end CopyWallyMonData
- thumb_func_start sub_80E9364
-sub_80E9364: @ 80E9364
+ thumb_func_start WallyHandleGetRawMonData
+WallyHandleGetRawMonData: @ 80E9364
push {lr}
- bl sub_80313B0
+ bl PlayerHandleGetRawMonData
pop {r0}
bx r0
- thumb_func_end sub_80E9364
+ thumb_func_end WallyHandleGetRawMonData
- thumb_func_start sub_80E9370
-sub_80E9370: @ 80E9370
+ thumb_func_start WallyHandleSetMonData
+WallyHandleSetMonData: @ 80E9370
push {r4,r5,lr}
ldr r1, _080E9394 @ =gUnknown_2022BC4
ldr r0, _080E9398 @ =gUnknown_2023BC4
@@ -3699,7 +3699,7 @@ sub_80E9370: @ 80E9370
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
- bl sub_80E93C8
+ bl SetWallyMonData
b _080E93BE
.align 2, 0
_080E9394: .4byte gUnknown_2022BC4
@@ -3714,7 +3714,7 @@ _080E93A4:
cmp r0, 0
beq _080E93B2
adds r0, r5, 0
- bl sub_80E93C8
+ bl SetWallyMonData
_080E93B2:
lsrs r4, 1
adds r0, r5, 0x1
@@ -3723,14 +3723,14 @@ _080E93B2:
cmp r5, 0x5
bls _080E93A4
_080E93BE:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80E9370
+ thumb_func_end WallyHandleSetMonData
- thumb_func_start sub_80E93C8
-sub_80E93C8: @ 80E93C8
+ thumb_func_start SetWallyMonData
+SetWallyMonData: @ 80E93C8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4851,7 +4851,7 @@ _080E9D8E:
muls r0, r2
ldr r2, _080E9DB8 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
add sp, 0x34
pop {r3-r5}
mov r8, r3
@@ -4864,12 +4864,12 @@ _080E9D8E:
_080E9DB8: .4byte gUnknown_2024284
_080E9DBC: .4byte gUnknown_2023BC4
_080E9DC0: .4byte gUnknown_2023BCE
- thumb_func_end sub_80E93C8
+ thumb_func_end SetWallyMonData
thumb_func_start sub_80E9DC4
sub_80E9DC4: @ 80E9DC4
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80E9DC4
@@ -4877,7 +4877,7 @@ sub_80E9DC4: @ 80E9DC4
thumb_func_start sub_80E9DD0
sub_80E9DD0: @ 80E9DD0
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80E9DD0
@@ -4885,13 +4885,13 @@ sub_80E9DD0: @ 80E9DD0
thumb_func_start sub_80E9DDC
sub_80E9DDC: @ 80E9DDC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80E9DDC
- thumb_func_start sub_80E9DE8
-sub_80E9DE8: @ 80E9DE8
+ thumb_func_start WallyHandleReturnMonToBall
+WallyHandleReturnMonToBall: @ 80E9DE8
push {r4-r6,lr}
ldr r0, _080E9E14 @ =gUnknown_2022BC4
ldr r6, _080E9E18 @ =gUnknown_2023BC4
@@ -4905,7 +4905,7 @@ sub_80E9DE8: @ 80E9DE8
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, _080E9E1C @ =gUnknown_3004FE0
ldrb r1, [r6]
lsls r1, 2
@@ -4927,7 +4927,7 @@ _080E9E24:
lsls r0, 2
ldr r4, _080E9E64 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -4935,13 +4935,13 @@ _080E9E24:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080E9E68 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
- bl sub_80E8A9C
+ bl SetHealthboxSpriteInvisible
+ bl WallyBufferExecCompleted
_080E9E5A:
pop {r4-r6}
pop {r0}
@@ -4950,7 +4950,7 @@ _080E9E5A:
_080E9E60: .4byte gUnknown_2023D44
_080E9E64: .4byte gUnknown_202063C
_080E9E68: .4byte gUnknown_3004FF0
- thumb_func_end sub_80E9DE8
+ thumb_func_end WallyHandleReturnMonToBall
thumb_func_start sub_80E9E6C
sub_80E9E6C: @ 80E9E6C
@@ -4970,7 +4970,7 @@ sub_80E9E6C: @ 80E9E6C
ldr r0, [r4]
ldrb r5, [r0, 0x8]
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4992,7 +4992,7 @@ sub_80E9E6C: @ 80E9E6C
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _080E9EDC @ =gUnknown_2023D44
ldrb r1, [r6]
b _080E9F1C
@@ -5009,7 +5009,7 @@ _080E9EE0:
movs r0, 0x5
bl sub_8034750
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5027,7 +5027,7 @@ _080E9EE0:
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _080E9F98 @ =gUnknown_2023D44
ldrb r1, [r4]
_080E9F1C:
@@ -5116,7 +5116,7 @@ sub_80E9FB0: @ 80E9FB0
ldr r0, [r4]
ldrb r5, [r0, 0x8]
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5138,7 +5138,7 @@ sub_80E9FB0: @ 80E9FB0
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _080EA020 @ =gUnknown_2023D44
ldrb r1, [r6]
b _080EA060
@@ -5155,7 +5155,7 @@ _080EA024:
movs r0, 0x5
bl sub_8034750
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5173,7 +5173,7 @@ _080EA024:
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _080EA0DC @ =gUnknown_2023D44
ldrb r1, [r4]
_080EA060:
@@ -5247,7 +5247,7 @@ _080EA0F0: .4byte sub_80E8A34
thumb_func_start sub_80EA0F4
sub_80EA0F4: @ 80EA0F4
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EA0F4
@@ -5278,7 +5278,7 @@ sub_80EA100: @ 80EA100
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080EA134:
ldr r0, [r6]
ldrb r1, [r5]
@@ -5312,11 +5312,11 @@ _080EA154:
muls r0, r2
ldr r2, _080EA1D4 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _080EA1D8 @ =gUnknown_202063C
ldr r3, _080EA1DC @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -5369,7 +5369,7 @@ _080EA1E8: .4byte sub_80E82F4
thumb_func_start sub_80EA1EC
sub_80EA1EC: @ 80EA1EC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EA1EC
@@ -5388,14 +5388,14 @@ sub_80EA1F8: @ 80EA1F8
ldr r5, _080EA240 @ =gUnknown_2023BC4
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080EA244 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -5432,14 +5432,14 @@ sub_80EA24C: @ 80EA24C
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080EA2A4 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -5461,7 +5461,7 @@ _080EA2A8: .4byte sub_80E7970
thumb_func_start sub_80EA2AC
sub_80EA2AC: @ 80EA2AC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EA2AC
@@ -5565,12 +5565,12 @@ sub_80EA2B8: @ 80EA2B8
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
beq _080EA3B0
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EA3CE
.align 2, 0
_080EA38C: .4byte gUnknown_2022BC4
@@ -5666,7 +5666,7 @@ _080EA43A:
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080EA456:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5721,7 +5721,7 @@ _080EA494:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080EA4C8:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5744,7 +5744,7 @@ _080EA4E4:
lsrs r4, r0, 24
cmp r4, 0
bne _080EA520
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r9
@@ -5754,7 +5754,7 @@ _080EA4E4:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -5763,7 +5763,7 @@ _080EA4E4:
lsls r0, 2
adds r0, r2
strb r4, [r0, 0x4]
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080EA520:
pop {r3,r4}
mov r8, r3
@@ -5796,7 +5796,7 @@ sub_80EA52C: @ 80EA52C
ldrh r0, [r4]
cmp r0, 0x1
bne _080EA570
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EA65A
.align 2, 0
_080EA55C: .4byte gUnknown_2022974
@@ -5928,7 +5928,7 @@ sub_80EA66C: @ 80EA66C
push {lr}
ldr r0, _080EA684 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080EA688
@@ -5937,7 +5937,7 @@ sub_80EA66C: @ 80EA66C
.align 2, 0
_080EA684: .4byte gUnknown_2023BC4
_080EA688:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080EA68C:
pop {r0}
bx r0
@@ -5946,7 +5946,7 @@ _080EA68C:
thumb_func_start sub_80EA690
sub_80EA690: @ 80EA690
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -6061,7 +6061,7 @@ _080EA788: .4byte gUnknown_202298C
thumb_func_start sub_80EA78C
sub_80EA78C: @ 80EA78C
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EA78C
@@ -6069,7 +6069,7 @@ sub_80EA78C: @ 80EA78C
thumb_func_start sub_80EA798
sub_80EA798: @ 80EA798
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -6161,8 +6161,8 @@ _080EA83E:
lsls r2, 1
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
- bl sub_80E8A9C
+ bl EmitTwoReturnValues
+ bl WallyBufferExecCompleted
_080EA866:
pop {r4}
pop {r0}
@@ -6181,7 +6181,7 @@ sub_80EA870: @ 80EA870
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080EA8BC @ =gUnknown_3004FE0
ldr r2, _080EA8C0 @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -6226,7 +6226,7 @@ sub_80EA8D4: @ 80EA8D4
sub sp, 0x4
ldr r0, _080EA984 @ =nullsub_43
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
ldr r3, _080EA988 @ =gUnknown_3004FFC
ldr r4, _080EA98C @ =gUnknown_2023BC4
ldrb r1, [r4]
@@ -6293,7 +6293,7 @@ _080EA940:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080EA9A0 @ =gUnknown_3004FE0
ldr r2, _080EA98C @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -6324,7 +6324,7 @@ _080EA9A8: .4byte gUnknown_2024004
thumb_func_start sub_80EA9AC
sub_80EA9AC: @ 80EA9AC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EA9AC
@@ -6337,7 +6337,7 @@ sub_80EA9B8: @ 80EA9B8
push {r6,r7}
sub sp, 0x4
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _080EAA30 @ =gUnknown_2022BC4
ldr r0, _080EAA34 @ =gUnknown_2023BC4
mov r9, r0
@@ -6365,7 +6365,7 @@ sub_80EA9B8: @ 80EA9B8
ldr r4, _080EAA40 @ =gUnknown_2024284
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -6375,7 +6375,7 @@ sub_80EA9B8: @ 80EA9B8
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -6384,7 +6384,7 @@ sub_80EA9B8: @ 80EA9B8
ldrb r1, [r1]
str r7, [sp]
mov r2, r8
- bl sub_8048150
+ bl SetBattleBarStruct
b _080EAA82
.align 2, 0
_080EAA30: .4byte gUnknown_2022BC4
@@ -6403,7 +6403,7 @@ _080EAA48:
ldr r1, _080EAAA4 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -6412,7 +6412,7 @@ _080EAA48:
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
mov r1, r9
ldrb r0, [r1]
adds r0, r4
@@ -6461,10 +6461,10 @@ sub_80EAAB8: @ 80EAAB8
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _080EAAF0
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EAB3C
.align 2, 0
_080EAAE4: .4byte gUnknown_2022BC4
@@ -6472,10 +6472,10 @@ _080EAAE8: .4byte gUnknown_2023BC4
_080EAAEC: .4byte gUnknown_2024284
_080EAAF0:
movs r0, 0x1
- bl sub_8034964
+ bl LoadBattleBarGfx
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldrb r1, [r6]
lsls r1, 9
adds r0, r5, 0x2
@@ -6488,7 +6488,7 @@ _080EAAF0:
orrs r4, r0
ldr r0, _080EAB44 @ =sub_80E7E04
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080EAB48 @ =gUnknown_3005090
@@ -6520,7 +6520,7 @@ _080EAB50: .4byte nullsub_81
thumb_func_start sub_80EAB54
sub_80EAB54: @ 80EAB54
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB54
@@ -6528,7 +6528,7 @@ sub_80EAB54: @ 80EAB54
thumb_func_start sub_80EAB60
sub_80EAB60: @ 80EAB60
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB60
@@ -6536,7 +6536,7 @@ sub_80EAB60: @ 80EAB60
thumb_func_start sub_80EAB6C
sub_80EAB6C: @ 80EAB6C
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB6C
@@ -6544,7 +6544,7 @@ sub_80EAB6C: @ 80EAB6C
thumb_func_start sub_80EAB78
sub_80EAB78: @ 80EAB78
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB78
@@ -6552,7 +6552,7 @@ sub_80EAB78: @ 80EAB78
thumb_func_start sub_80EAB84
sub_80EAB84: @ 80EAB84
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB84
@@ -6560,7 +6560,7 @@ sub_80EAB84: @ 80EAB84
thumb_func_start sub_80EAB90
sub_80EAB90: @ 80EAB90
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB90
@@ -6568,7 +6568,7 @@ sub_80EAB90: @ 80EAB90
thumb_func_start sub_80EAB9C
sub_80EAB9C: @ 80EAB9C
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAB9C
@@ -6576,7 +6576,7 @@ sub_80EAB9C: @ 80EAB9C
thumb_func_start sub_80EABA8
sub_80EABA8: @ 80EABA8
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABA8
@@ -6584,7 +6584,7 @@ sub_80EABA8: @ 80EABA8
thumb_func_start sub_80EABB4
sub_80EABB4: @ 80EABB4
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABB4
@@ -6592,7 +6592,7 @@ sub_80EABB4: @ 80EABB4
thumb_func_start sub_80EABC0
sub_80EABC0: @ 80EABC0
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABC0
@@ -6600,7 +6600,7 @@ sub_80EABC0: @ 80EABC0
thumb_func_start sub_80EABCC
sub_80EABCC: @ 80EABCC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABCC
@@ -6608,7 +6608,7 @@ sub_80EABCC: @ 80EABCC
thumb_func_start sub_80EABD8
sub_80EABD8: @ 80EABD8
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABD8
@@ -6616,7 +6616,7 @@ sub_80EABD8: @ 80EABD8
thumb_func_start sub_80EABE4
sub_80EABE4: @ 80EABE4
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABE4
@@ -6624,7 +6624,7 @@ sub_80EABE4: @ 80EABE4
thumb_func_start sub_80EABF0
sub_80EABF0: @ 80EABF0
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABF0
@@ -6632,7 +6632,7 @@ sub_80EABF0: @ 80EABF0
thumb_func_start sub_80EABFC
sub_80EABFC: @ 80EABFC
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EABFC
@@ -6655,7 +6655,7 @@ sub_80EAC08: @ 80EAC08
lsls r0, 29
cmp r0, 0
bge _080EAC3C
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EAC66
.align 2, 0
_080EAC30: .4byte gUnknown_202063C
@@ -6675,12 +6675,12 @@ _080EAC3C:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _080EAC70 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _080EAC74 @ =sub_80E8948
+ ldr r1, _080EAC74 @ =DoHitAnimBlinkSpriteEffect_3
str r1, [r0]
_080EAC66:
pop {r4}
@@ -6689,13 +6689,13 @@ _080EAC66:
.align 2, 0
_080EAC6C: .4byte gUnknown_2024005
_080EAC70: .4byte gUnknown_3004FE0
-_080EAC74: .4byte sub_80E8948
+_080EAC74: .4byte DoHitAnimBlinkSpriteEffect_3
thumb_func_end sub_80EAC08
thumb_func_start sub_80EAC78
sub_80EAC78: @ 80EAC78
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EAC78
@@ -6716,7 +6716,7 @@ sub_80EAC84: @ 80EAC84
lsls r1, 8
orrs r0, r1
bl sub_80722CC
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -6739,8 +6739,8 @@ sub_80EACB4: @ 80EACB4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
- bl sub_80E8A9C
+ bl PlayFanfare
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -6762,12 +6762,12 @@ sub_80EACE4: @ 80EACE4
ldr r1, _080EAD1C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
- bl sub_8071DF0
- bl sub_80E8A9C
+ bl PlayCry1
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -6792,7 +6792,7 @@ sub_80EAD20: @ 80EAD20
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -6822,7 +6822,7 @@ _080EAD64:
lsls r0, 2
ldr r5, _080EAEAC @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6877,7 +6877,7 @@ _080EAD64:
lsls r0, 2
adds r0, r5
ldr r1, _080EAEB8 @ =sub_80335F8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6886,9 +6886,9 @@ _080EAD64:
lsls r0, 2
adds r0, r5
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080EAEBC @ =0x0000d6f8
- bl sub_80089B8
+ bl AllocSpritePalette
adds r4, r0, 0
lsls r4, 24
ldr r1, _080EAEC0 @ =gUnknown_8239FD4
@@ -6903,7 +6903,7 @@ _080EAD64:
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -6918,7 +6918,7 @@ _080EAD64:
strb r0, [r1, 0x5]
ldr r0, _080EAEC8 @ =sub_80EB0A8
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _080EAECC @ =gUnknown_3005090
@@ -7008,7 +7008,7 @@ _080EAEE4:
ldr r1, _080EAF30 @ =sub_80491B0
str r1, [r0]
_080EAF14:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080EAF18:
pop {r4-r7}
pop {r0}
@@ -7053,20 +7053,20 @@ sub_80EAF34: @ 80EAF34
ldr r1, _080EB088 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _080EB08C @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _080EB090 @ =gUnknown_3004FFC
mov r9, r1
add r9, r6
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7093,7 +7093,7 @@ sub_80EAF34: @ 80EAF34
mov r0, r10
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080EB098 @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -7138,7 +7138,7 @@ sub_80EAF34: @ 80EAF34
ldr r1, _080EB0A0 @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -7160,7 +7160,7 @@ sub_80EAF34: @ 80EAF34
str r1, [r0]
movs r0, 0
movs r1, 0xFF
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r9
ldrb r2, [r1]
lsls r1, r2, 4
@@ -7236,7 +7236,7 @@ _080EB0CC:
str r1, [r0]
strb r5, [r4]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080EB102:
pop {r4-r6}
pop {r0}
@@ -7262,11 +7262,11 @@ sub_80EB11C: @ 80EB11C
cmp r0, 0
beq _080EB14C
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080EB14C
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EB18A
.align 2, 0
_080EB144: .4byte gUnknown_2022BC4
@@ -7300,7 +7300,7 @@ _080EB14C:
ldrb r1, [r5]
adds r1, r2
strb r0, [r1]
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
_080EB18A:
pop {r4,r5}
pop {r0}
@@ -7315,7 +7315,7 @@ _080EB19C: .4byte gUnknown_2024000
thumb_func_start sub_80EB1A0
sub_80EB1A0: @ 80EB1A0
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EB1A0
@@ -7326,11 +7326,11 @@ sub_80EB1AC: @ 80EB1AC
ldr r4, _080EB1CC @ =gUnknown_2023BC4
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
- bl sub_80E8A9C
+ bl dp11b_obj_free
+ bl WallyBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -7341,7 +7341,7 @@ _080EB1CC: .4byte gUnknown_2023BC4
thumb_func_start sub_80EB1D0
sub_80EB1D0: @ 80EB1D0
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EB1D0
@@ -7368,11 +7368,11 @@ sub_80EB1DC: @ 80EB1DC
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _080EB21C
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
b _080EB228
.align 2, 0
_080EB214: .4byte gUnknown_2022BC4
@@ -7382,7 +7382,7 @@ _080EB21C:
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
- ldr r0, _080EB234 @ =sub_80E8A6C
+ ldr r0, _080EB234 @ =CompleteOnFinishedBattleAnimation_4
str r0, [r1]
_080EB228:
add sp, 0x4
@@ -7391,7 +7391,7 @@ _080EB228:
bx r0
.align 2, 0
_080EB230: .4byte gUnknown_3004FE0
-_080EB234: .4byte sub_80E8A6C
+_080EB234: .4byte CompleteOnFinishedBattleAnimation_4
thumb_func_end sub_80EB1DC
thumb_func_start sub_80EB238
@@ -7410,12 +7410,12 @@ sub_80EB238: @ 80EB238
bgt _080EB260
adds r0, r2, 0
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
_080EB260:
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -7427,7 +7427,7 @@ _080EB270: .4byte gUnknown_2023BC4
thumb_func_start sub_80EB274
sub_80EB274: @ 80EB274
push {lr}
- bl sub_80E8A9C
+ bl WallyBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80EB274
@@ -7445,10 +7445,10 @@ sub_80EB280: @ 80EB280
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
- bl sub_80E8A9C
+ bl BeginFastPaletteFade
+ bl WallyBufferExecCompleted
ldr r0, _080EB2D0 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x6
@@ -7521,7 +7521,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x30
movs r2, 0
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7529,7 +7529,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x31
movs r2, 0x1
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r6, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7537,7 +7537,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x32
movs r2, 0x2
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7545,7 +7545,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x33
movs r2, 0x1C
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7553,7 +7553,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x34
movs r2, 0x1D
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7561,7 +7561,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x35
movs r2, 0
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7569,7 +7569,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x36
movs r2, 0x1
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7577,7 +7577,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x38
movs r2, 0x1C
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7585,7 +7585,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x39
movs r2, 0x1D
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7593,7 +7593,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x3A
movs r2, 0
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7601,7 +7601,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x3B
movs r2, 0x1
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7609,7 +7609,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x3C
movs r2, 0x1C
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7617,7 +7617,7 @@ sub_80EB30C: @ 80EB30C
movs r1, 0x3D
movs r2, 0x1D
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB4F4 @ =0x0000083a
str r4, [sp]
str r4, [sp, 0x4]
@@ -7625,7 +7625,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB4F8 @ =0x0000083b
str r4, [sp]
str r4, [sp, 0x4]
@@ -7633,7 +7633,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB4FC @ =0x0000083c
str r4, [sp]
str r4, [sp, 0x4]
@@ -7641,7 +7641,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1C
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB500 @ =0x0000083d
str r4, [sp]
str r4, [sp, 0x4]
@@ -7649,7 +7649,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1D
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB504 @ =0x00000835
str r4, [sp]
str r4, [sp, 0x4]
@@ -7657,7 +7657,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0
movs r3, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB508 @ =0x00000836
str r4, [sp]
str r4, [sp, 0x4]
@@ -7665,7 +7665,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1
movs r3, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB50C @ =0x00000838
str r4, [sp]
str r4, [sp, 0x4]
@@ -7673,7 +7673,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1C
movs r3, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB510 @ =0x00000839
str r4, [sp]
str r4, [sp, 0x4]
@@ -7681,7 +7681,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1D
movs r3, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x83
lsls r1, 4
str r4, [sp]
@@ -7690,7 +7690,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB514 @ =0x00000831
str r4, [sp]
str r4, [sp, 0x4]
@@ -7698,7 +7698,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB518 @ =0x00000832
str r6, [sp]
str r4, [sp, 0x4]
@@ -7706,7 +7706,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x2
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB51C @ =0x00000833
str r4, [sp]
str r4, [sp, 0x4]
@@ -7714,7 +7714,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1C
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080EB520 @ =0x00000834
str r4, [sp]
str r4, [sp, 0x4]
@@ -7722,7 +7722,7 @@ sub_80EB30C: @ 80EB30C
movs r0, 0
movs r2, 0x1D
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -7759,7 +7759,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x3
movs r2, 0
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r6, 0x4
str r4, [sp]
str r4, [sp, 0x4]
@@ -7768,7 +7768,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x4
movs r2, 0x1
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r0, r8
str r0, [sp]
str r4, [sp, 0x4]
@@ -7777,7 +7777,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x5
movs r2, 0x2
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7785,7 +7785,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x6
movs r2, 0x1C
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7793,7 +7793,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x7
movs r2, 0x1D
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r6, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7801,7 +7801,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x8
movs r2, 0
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r6, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7809,7 +7809,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x9
movs r2, 0x1
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r0, r8
str r0, [sp]
str r6, [sp, 0x4]
@@ -7818,7 +7818,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xA
movs r2, 0x2
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r6, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7826,7 +7826,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xB
movs r2, 0x1C
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r6, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7834,7 +7834,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xC
movs r2, 0x1D
movs r3, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7842,7 +7842,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xD
movs r2, 0
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7850,7 +7850,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xE
movs r2, 0x1
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r0, r8
str r0, [sp]
str r4, [sp, 0x4]
@@ -7859,7 +7859,7 @@ sub_80EB524: @ 80EB524
movs r1, 0xF
movs r2, 0x2
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7867,7 +7867,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x10
movs r2, 0x1C
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -7875,7 +7875,7 @@ sub_80EB524: @ 80EB524
movs r1, 0x11
movs r2, 0x1D
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r3}
mov r8, r3
diff --git a/asm/battle_controller_opponent.s b/asm/battle_controller_opponent.s
index e422eedf8..76b32994f 100644
--- a/asm/battle_controller_opponent.s
+++ b/asm/battle_controller_opponent.s
@@ -168,7 +168,7 @@ sub_8035B58: @ 8035B58
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r5]
adds r0, r6
ldrb r1, [r0]
@@ -176,7 +176,7 @@ sub_8035B58: @ 8035B58
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
bl sub_8036530
_08035BC8:
pop {r4-r6}
@@ -300,7 +300,7 @@ _08035C88:
_08035CBC:
movs r6, 0x1
_08035CBE:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _08035CCA
@@ -385,9 +385,9 @@ _08035CD0:
strb r4, [r0, 0x1]
ldr r4, _08035D98 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _08035D9C @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x40
@@ -551,7 +551,7 @@ _08035E96:
lsls r0, 2
ldr r1, _08035FD8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _08035FDC @ =gUnknown_3004FF0
mov r1, r9
ldrb r0, [r1]
@@ -569,7 +569,7 @@ _08035E96:
ldr r5, _08035FCC @ =gUnknown_202402C
adds r1, r5
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
mov r1, r9
ldrb r0, [r1]
eors r0, r7
@@ -579,7 +579,7 @@ _08035E96:
eors r0, r7
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
mov r1, r9
ldrb r0, [r1]
adds r4, r7, 0
@@ -590,12 +590,12 @@ _08035E96:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
_08035F28:
ldr r1, _08035FD4 @ =gUnknown_3004FFC
ldr r5, _08035FC4 @ =gUnknown_2023BC4
@@ -607,7 +607,7 @@ _08035F28:
lsls r0, 2
ldr r1, _08035FD8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _08035FDC @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -625,13 +625,13 @@ _08035F28:
ldr r6, _08035FCC @ =gUnknown_202402C
adds r1, r6
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r4, [r5]
lsls r0, r4, 1
add r0, r9
@@ -641,12 +641,12 @@ _08035F28:
adds r0, r1, 0
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r0, _08035FC0 @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -756,9 +756,9 @@ _0803605C:
strb r0, [r1, 0x1]
ldr r4, _0803609C @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
bl sub_8036530
_08036094:
pop {r4-r7}
@@ -785,7 +785,7 @@ sub_80360A0: @ 80360A0
ldrb r0, [r6]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -855,7 +855,7 @@ sub_803612C: @ 803612C
ldr r0, _0803616C @ =gUnknown_3004FF0
adds r0, r3, r0
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8036530
_0803615A:
pop {r0}
@@ -892,7 +892,7 @@ sub_8036170: @ 8036170
lsls r0, 2
ldr r4, _080361DC @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -900,14 +900,14 @@ sub_8036170: @ 8036170
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r0, [r6]
- bl sub_8035794
+ bl EnemyShadowCallbackToSetInvisible
ldr r1, _080361E0 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8036530
_080361CA:
pop {r4-r6}
@@ -1031,7 +1031,7 @@ sub_8036278: @ 8036278
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080362B8:
ldr r0, _080362E0 @ =gUnknown_3004FE0
ldrb r1, [r4]
@@ -1070,7 +1070,7 @@ sub_80362E8: @ 80362E8
ands r0, r1
cmp r0, 0
bne _08036320
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _08036320
@@ -1125,9 +1125,9 @@ sub_8036334: @ 8036334
strb r0, [r1, 0x1]
ldr r4, _080363E8 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r1, _080363EC @ =gUnknown_2023D44
ldrb r0, [r5]
adds r0, r1
@@ -1138,7 +1138,7 @@ sub_8036334: @ 8036334
ldr r1, _080363F0 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, _080363F4 @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -1152,15 +1152,15 @@ sub_8036334: @ 8036334
ldr r2, _080363FC @ =gUnknown_202402C
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r5]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
ldr r1, _08036400 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -1238,7 +1238,7 @@ _0803643A:
cmp r0, 0
bne _080364A4
adds r0, r3, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r4, [r5]
ldr r1, _080364B4 @ =gUnknown_2023BCE
lsls r0, r4, 1
@@ -1249,12 +1249,12 @@ _0803643A:
ldr r1, _080364B8 @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r1, _080364C8 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -1406,7 +1406,7 @@ _080365C2:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_8036530
add sp, 0x100
pop {r4-r6}
@@ -1516,12 +1516,12 @@ _0803670C:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -1549,12 +1549,12 @@ _08036758:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -1569,21 +1569,21 @@ _08036758:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -1595,7 +1595,7 @@ _08036758:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -1607,7 +1607,7 @@ _08036758:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -1619,7 +1619,7 @@ _08036758:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1630,7 +1630,7 @@ _08036758:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -1641,7 +1641,7 @@ _08036758:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -1653,55 +1653,55 @@ _08036758:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -1714,7 +1714,7 @@ _08036758:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -1724,19 +1724,19 @@ _08036758:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r6, 0
_08036910:
@@ -1787,13 +1787,13 @@ _08036966:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -1807,7 +1807,7 @@ _08036966:
ldr r1, _080369B4 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -1849,7 +1849,7 @@ _080369E0:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1860,7 +1860,7 @@ _080369E0:
ldr r1, _08036A0C @ =gUnknown_202402C
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -1897,7 +1897,7 @@ _08036A3C:
adds r0, r1
movs r1, 0x19
_08036A46:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2030,27 +2030,27 @@ _08036B2C:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _08036D72
@@ -2135,7 +2135,7 @@ _08036BFC:
adds r0, r1
movs r1, 0x37
_08036C06:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2224,7 +2224,7 @@ _08036CA0:
adds r0, r1
movs r1, 0x3F
_08036CAA:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -2331,7 +2331,7 @@ _08036D60:
adds r0, r1
movs r1, 0x36
_08036D6A:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_08036D72:
@@ -2403,7 +2403,7 @@ _08036DDE:
ldrb r1, [r0]
movs r0, 0x1
adds r2, r4, 0
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_8036530
add sp, 0x58
pop {r4-r7}
@@ -3577,7 +3577,7 @@ sub_80377FC: @ 80377FC
ldr r6, _08037884 @ =gUnknown_202402C
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -3636,7 +3636,7 @@ _08037890:
ldrh r0, [r0]
muls r0, r5
adds r0, r6
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r4]
bl sub_80748A8
lsls r0, 24
@@ -3644,7 +3644,7 @@ _08037890:
_080378AA:
ldr r7, _0803799C @ =gUnknown_2023BC4
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3665,7 +3665,7 @@ _080378AA:
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080379A4 @ =gUnknown_2023D44
ldrb r1, [r7]
adds r1, r4
@@ -3720,7 +3720,7 @@ _080378AA:
ldr r1, _080379B0 @ =gUnknown_2024024
adds r2, r1
ldrb r1, [r2]
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080379B4 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x80
@@ -3738,12 +3738,12 @@ _080378AA:
ldr r1, _080379BC @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
_08037986:
ldr r0, _080379C0 @ =gUnknown_3004FE0
ldrb r1, [r7]
@@ -3828,7 +3828,7 @@ sub_8037A28: @ 8037A28
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r0, _08037B84 @ =gUnknown_2023BCE
lsls r4, r6, 1
adds r4, r0
@@ -3847,13 +3847,13 @@ sub_8037A28: @ 8037A28
ldr r5, _08037B8C @ =gUnknown_202402C
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _08037B90 @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _08037B94 @ =gUnknown_3004FFC
mov r10, r1
add r10, r6
@@ -3865,9 +3865,9 @@ sub_8037A28: @ 8037A28
adds r0, r1, 0
adds r0, r5
adds r1, r6, 0
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3894,7 +3894,7 @@ sub_8037A28: @ 8037A28
mov r0, r9
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08037B9C @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -3939,7 +3939,7 @@ sub_8037A28: @ 8037A28
ldr r1, _08037BA4 @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -3961,7 +3961,7 @@ sub_8037A28: @ 8037A28
str r1, [r0]
movs r0, 0
movs r1, 0xFE
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r10
ldrb r2, [r1]
lsls r1, r2, 4
@@ -4033,7 +4033,7 @@ _08037BF4:
lsls r0, 2
ldr r4, _08037C3C @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -4041,14 +4041,14 @@ _08037BF4:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r0, [r6]
- bl sub_8035794
+ bl EnemyShadowCallbackToSetInvisible
ldr r1, _08037C40 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8036530
_08037C30:
pop {r4-r6}
@@ -4093,7 +4093,7 @@ _08037C6C:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08037C86:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4118,7 +4118,7 @@ _08037C9A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x2
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _08037CC8 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -4146,7 +4146,7 @@ sub_8037CD0: @ 8037CD0
lsls r0, 3
cmp r1, r0
bne _08037CF0
- bl sub_8040EEC
+ bl GetSecretBaseTrainerPicIndex
b _08037D26
.align 2, 0
_08037CEC: .4byte gUnknown_20386AE
@@ -4198,7 +4198,7 @@ _08037D3A:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4226,7 +4226,7 @@ _08037D3A:
adds r0, r5, 0
movs r1, 0xB0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _08037E7C @ =gUnknown_2023D44
mov r2, r8
ldrb r1, [r2]
@@ -4256,7 +4256,7 @@ _08037D3A:
lsls r6, r1, 3
adds r0, r6, r0
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4286,7 +4286,7 @@ _08037D3A:
ldr r0, _08037E8C @ =gUnknown_823957C
adds r6, r0
ldrh r0, [r6, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4365,7 +4365,7 @@ sub_8037EA4: @ 8037EA4
lsls r0, 3
cmp r1, r0
bne _08037EC4
- bl sub_8040EEC
+ bl GetSecretBaseTrainerPicIndex
b _08037EFA
.align 2, 0
_08037EC0: .4byte gUnknown_20386AE
@@ -4417,7 +4417,7 @@ _08037F0E:
bl sub_80346C4
mov r1, r8
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4438,7 +4438,7 @@ _08037F0E:
asrs r2, 16
movs r1, 0xB0
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _08038050 @ =gUnknown_2023D44
mov r2, r8
ldrb r1, [r2]
@@ -4478,7 +4478,7 @@ _08037F0E:
lsls r6, r3, 3
adds r0, r6, r0
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4508,7 +4508,7 @@ _08037F0E:
ldr r0, _08038060 @ =gUnknown_823957C
adds r6, r0
ldrh r0, [r6, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
mov r2, r8
ldrb r1, [r2]
adds r1, r5
@@ -4586,7 +4586,7 @@ sub_8038078: @ 8038078
lsls r0, 2
ldr r5, _08038110 @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r4]
adds r0, r6
ldrb r1, [r0]
@@ -4634,7 +4634,7 @@ sub_8038078: @ 8038078
lsls r0, 2
adds r0, r5
ldr r1, _08038118 @ =nullsub_8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r1, _0803811C @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -4680,7 +4680,7 @@ sub_8038124: @ 8038124
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08038158:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4707,7 +4707,7 @@ _08038178:
strb r0, [r3, 0x4]
movs r0, 0x10
movs r1, 0x3F
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _080381BC @ =gUnknown_202063C
ldr r1, _080381C0 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -4775,7 +4775,7 @@ sub_8038200: @ 8038200
push {r4-r6,lr}
ldr r6, _080382E4 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
beq _08038212
@@ -4876,7 +4876,7 @@ _08038212:
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4985,7 +4985,7 @@ _0803839A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080383BC:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5043,7 +5043,7 @@ _080383FA:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -5080,7 +5080,7 @@ _08038470:
lsrs r4, r0, 24
cmp r4, 0
bne _080384AC
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r10
@@ -5090,7 +5090,7 @@ _08038470:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -5261,7 +5261,7 @@ _080385F0:
movs r1, 0x3
_080385F4:
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _08038668
_080385FC:
ldr r3, _08038670 @ =gUnknown_8250C04
@@ -5292,7 +5292,7 @@ _0803861C:
cmp r0, 0
beq _08038656
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r5, _08038674 @ =gUnknown_2023D6C
strb r0, [r5]
ldr r0, _08038678 @ =gUnknown_2023D70
@@ -5306,7 +5306,7 @@ _0803861C:
cmp r1, 0
beq _08038656
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
_08038656:
ldr r0, _08038674 @ =gUnknown_2023D6C
@@ -5316,7 +5316,7 @@ _08038656:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_08038668:
bl sub_8036530
b _08038712
@@ -5328,7 +5328,7 @@ _0803867C: .4byte gUnknown_825E45C
_08038680:
movs r6, 0x3
_08038682:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
ands r4, r6
lsls r0, r4, 1
@@ -5353,7 +5353,7 @@ _08038682:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _0803870E
.align 2, 0
_080386BC: .4byte gUnknown_8250C04
@@ -5365,33 +5365,33 @@ _080386C4:
ands r0, r1
cmp r0, 0
beq _080386F8
- bl sub_8044EC8
+ bl Random
movs r1, 0x2
ands r1, r0
lsls r1, 24
lsrs r1, 24
adds r0, r1, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
b _0803870E
.align 2, 0
_080386F4: .4byte gUnknown_2022B4C
_080386F8:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 16
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
_0803870E:
bl sub_8036530
_08038712:
@@ -5413,7 +5413,7 @@ sub_8038718: @ 8038718
adds r0, 0xC0
ldrb r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
+ bl EmitOneReturnValue
bl sub_8036530
pop {r0}
bx r0
@@ -5427,7 +5427,7 @@ sub_8038744: @ 8038744
push {r4-r6,lr}
ldr r6, _08038788 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r5, _0803878C @ =gUnknown_2023FE8
@@ -5449,7 +5449,7 @@ sub_8038744: @ 8038744
cmp r0, 0
bne _08038794
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
@@ -5460,11 +5460,11 @@ _0803878C: .4byte gUnknown_2023FE8
_08038790: .4byte gUnknown_2022B4C
_08038794:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
_080387A8:
@@ -5480,7 +5480,7 @@ _080387AE:
ldr r1, _080387DC @ =gUnknown_202402C
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080387AC
ldr r1, _080387E0 @ =gUnknown_2023BCE
@@ -5500,7 +5500,7 @@ _080387DC: .4byte gUnknown_202402C
_080387E0: .4byte gUnknown_2023BCE
_080387E4:
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, [r5]
@@ -5508,7 +5508,7 @@ _080387E4:
adds r0, 0x92
ldrb r4, [r0]
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 25
ldr r1, [r5]
@@ -5528,7 +5528,7 @@ _0803880A:
lsrs r1, 24
movs r0, 0x1
movs r2, 0
- bl sub_800E874
+ bl EmitChosenMonReturnValue
bl sub_8036530
pop {r4-r6}
pop {r0}
@@ -5554,7 +5554,7 @@ sub_8038844: @ 8038844
push {r6,r7}
sub sp, 0x4
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _080388BC @ =gUnknown_2022BC4
ldr r0, _080388C0 @ =gUnknown_2023BC4
mov r9, r0
@@ -5582,7 +5582,7 @@ sub_8038844: @ 8038844
ldr r4, _080388CC @ =gUnknown_202402C
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -5592,7 +5592,7 @@ sub_8038844: @ 8038844
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5601,7 +5601,7 @@ sub_8038844: @ 8038844
ldrb r1, [r1]
str r7, [sp]
mov r2, r8
- bl sub_8048150
+ bl SetBattleBarStruct
b _080388FE
.align 2, 0
_080388BC: .4byte gUnknown_2022BC4
@@ -5620,7 +5620,7 @@ _080388D4:
ldr r1, _08038920 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -5629,7 +5629,7 @@ _080388D4:
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
_080388FE:
ldr r1, _08038928 @ =gUnknown_3004FE0
ldr r0, _0803892C @ =gUnknown_2023BC4
@@ -5667,7 +5667,7 @@ sub_8038940: @ 8038940
push {r4,lr}
ldr r4, _0803899C @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08038994
@@ -5684,7 +5684,7 @@ sub_8038940: @ 8038940
ldr r2, _080389A8 @ =gUnknown_202402C
adds r1, r2
movs r2, 0x9
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r2, [r4]
ldr r0, _080389AC @ =gUnknown_2024018
ldr r0, [r0]
@@ -5723,7 +5723,7 @@ sub_80389B8: @ 80389B8
push {r4,r5,lr}
ldr r5, _08038A10 @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08038A08
@@ -5751,7 +5751,7 @@ sub_80389B8: @ 80389B8
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
- bl sub_8033F1C
+ bl InitAndLaunchChosenStatusAnimation
ldr r1, _08038A18 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -5960,7 +5960,7 @@ _08038B54:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _08038B88 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -5990,7 +5990,7 @@ sub_8038B9C: @ 8038B9C
push {r4,lr}
ldr r4, _08038BD8 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -6010,7 +6010,7 @@ _08038BB0:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
bl sub_8036530
pop {r4}
pop {r0}
@@ -6035,7 +6035,7 @@ sub_8038BE0: @ 8038BE0
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
+ bl PlayFanfare
bl sub_8036530
pop {r0}
bx r0
@@ -6058,12 +6058,12 @@ sub_8038C10: @ 8038C10
ldr r1, _08038C48 @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
movs r2, 0x5
- bl sub_8071E60
+ bl PlayCry3
bl sub_8036530
pop {r0}
bx r0
@@ -6111,7 +6111,7 @@ sub_8038C80: @ 8038C80
lsls r0, 2
ldr r4, _08038D68 @ =gUnknown_202063C
adds r0, r4
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -6159,10 +6159,10 @@ sub_8038C80: @ 8038C80
lsls r0, 2
adds r0, r4
ldr r1, _08038D70 @ =sub_8038D90
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r0, _08038D74 @ =sub_8038DC4
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _08038D78 @ =gUnknown_3005090
@@ -6240,9 +6240,9 @@ sub_8038D90: @ 8038D90
orrs r0, r1
strh r0, [r4, 0x4]
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
@@ -6344,7 +6344,7 @@ _08038E70:
mov r0, r9
strb r0, [r2]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -6372,7 +6372,7 @@ sub_8038EA8: @ 8038EA8
cmp r0, 0
beq _08038ED8
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08038ED8
@@ -6613,7 +6613,7 @@ sub_8039060: @ 8039060
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
_080390A6:
bl sub_8036530
pop {r4}
@@ -6632,7 +6632,7 @@ sub_80390C0: @ 80390C0
sub sp, 0x4
ldr r6, _08039104 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08039118
@@ -6653,7 +6653,7 @@ sub_80390C0: @ 80390C0
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _0803910C
@@ -6716,7 +6716,7 @@ sub_8039140: @ 8039140
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_0803916A:
bl sub_8036530
pop {r0}
diff --git a/asm/battle_controller_player.s b/asm/battle_controller_player.s
index 3e97fc6e4..642999210 100644
--- a/asm/battle_controller_player.s
+++ b/asm/battle_controller_player.s
@@ -47,7 +47,7 @@ sub_802E33C: @ 802E33C
ands r0, r1
cmp r0, 0
beq _0802E390
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -174,12 +174,12 @@ sub_802E438: @ 802E438
movs r1, 0x1
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldrb r0, [r4]
movs r1, 0
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldr r0, _0802E4A0 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r2, 0x1
@@ -227,7 +227,7 @@ _0802E4C4:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _0802E616
_0802E4D0:
movs r0, 0x20
@@ -348,13 +348,13 @@ _0802E5A8:
cmp r0, 0
beq _0802E634
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _0802E634
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802E620 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _0802E624 @ =gUnknown_825E45C
@@ -389,7 +389,7 @@ _0802E606:
movs r1, 0xC
_0802E610:
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_0802E616:
bl sub_802E33C
b _0802E634
@@ -417,10 +417,10 @@ sub_802E640: @ 802E640
ldr r4, _0802E668 @ =gUnknown_2023BC4
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
ldr r1, _0802E66C @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -449,7 +449,7 @@ sub_802E674: @ 802E674
movs r1, 0x1
movs r2, 0xF
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
movs r4, 0
ldr r0, _0802E710 @ =gUnknown_2023BCC
ldrb r0, [r0]
@@ -463,7 +463,7 @@ _0802E69A:
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
_0802E6AC:
adds r4, 0x1
ldr r0, _0802E710 @ =gUnknown_2023BCC
@@ -502,10 +502,10 @@ _0802E6B6:
orrs r2, r0
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
bl sub_802E33C
b _0802E9DC
.align 2, 0
@@ -549,15 +549,15 @@ _0802E72C:
movs r1, 0x1
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldrb r0, [r4]
movs r1, 0
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldrb r0, [r5]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
b _0802E9DC
.align 2, 0
_0802E784: .4byte gUnknown_202063C
@@ -592,7 +592,7 @@ _0802E7AA:
adds r5, r3, 0
_0802E7CC:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r1, r0, 24
movs r4, 0
@@ -622,7 +622,7 @@ _0802E804:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
ldr r1, _0802E838 @ =gUnknown_2023BCC
lsls r0, 24
@@ -632,7 +632,7 @@ _0802E804:
beq _0802E7FC
movs r4, 0
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -669,7 +669,7 @@ _0802E846:
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _0802E8B4 @ =gUnknown_8250C04
lsls r1, r0, 1
adds r1, r0
@@ -733,7 +733,7 @@ _0802E8CE:
adds r5, r3, 0
_0802E8F0:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r1, r0, 24
movs r4, 0
@@ -763,7 +763,7 @@ _0802E928:
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r5]
ldr r1, _0802E95C @ =gUnknown_2023BCC
lsls r0, 24
@@ -773,7 +773,7 @@ _0802E928:
beq _0802E920
movs r4, 0
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -810,7 +810,7 @@ _0802E96A:
adds r2, r1
ldrb r1, [r2]
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _0802E9F4 @ =gUnknown_8250C04
lsls r1, r0, 1
adds r1, r0
@@ -948,13 +948,13 @@ _0802EAA4: .4byte gUnknown_2023BC4
_0802EAA8:
ldr r0, _0802EAEC @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r2, 0x1
movs r0, 0x1
ands r0, r1
eors r0, r2
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802EAF0 @ =gUnknown_3004FF4
strb r0, [r1]
_0802EAC2:
@@ -1011,14 +1011,14 @@ _0802EB04:
cmp r0, 0x1
bhi _0802EB3A
ldrb r0, [r5]
- bl sub_803F6A0
+ bl GetDefaultMoveTarget
ldr r1, _0802EB7C @ =gUnknown_3004FF4
strb r0, [r1]
_0802EB36:
movs r0, 0
mov r8, r0
_0802EB3A:
- bl sub_8070A84
+ bl ResetPaletteFadeControl
movs r0, 0xF0
lsls r0, 12
ldr r1, _0802EB80 @ =0x00007fff
@@ -1026,7 +1026,7 @@ _0802EB3A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
mov r0, r8
cmp r0, 0
bne _0802EB88
@@ -1041,7 +1041,7 @@ _0802EB3A:
orrs r2, r0
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
bl sub_802E33C
b _0802EDBA
.align 2, 0
@@ -1071,7 +1071,7 @@ _0802EBAC: .4byte sub_802E674
_0802EBB0: .4byte gUnknown_3004FF4
_0802EBB4:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802EBD4 @ =gUnknown_2023D70
ldrb r1, [r1]
ldr r2, _0802EBD8 @ =gUnknown_825E45C
@@ -1090,7 +1090,7 @@ _0802EBD8: .4byte gUnknown_825E45C
_0802EBDC:
movs r0, 0x1
_0802EBDE:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802EC00 @ =gUnknown_3004FF4
_0802EBE4:
strb r0, [r1]
@@ -1123,9 +1123,9 @@ _0802EC10:
ldr r2, _0802EC34 @ =0x0000ffff
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
bl sub_802E33C
- bl sub_8070A84
+ bl ResetPaletteFadeControl
b _0802ED2C
.align 2, 0
_0802EC34: .4byte 0x0000ffff
@@ -1258,7 +1258,7 @@ _0802ED2C:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0802EDBA
.align 2, 0
_0802ED40: .4byte gUnknown_2023FFC
@@ -1782,7 +1782,7 @@ _0802F152:
adds r0, r5
adds r1, r6, 0
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
mov r2, r8
ldrb r0, [r2]
@@ -1793,7 +1793,7 @@ _0802F152:
adds r0, r5
adds r1, r6, 0
adds r1, 0x11
- bl sub_803FBE8
+ bl GetMonData
mov r3, r10
adds r1, r3, r6
strb r0, [r1]
@@ -1812,7 +1812,7 @@ _0802F152:
ldr r1, _0802F308 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
ldr r5, [sp, 0x1C]
strb r0, [r5]
movs r6, 0
@@ -2352,7 +2352,7 @@ sub_802F610: @ 802F610
ldr r0, [r0]
str r0, [r3]
ldr r0, _0802F660 @ =sub_8011A1C
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8003ECC
b _0802F694
.align 2, 0
@@ -2381,7 +2381,7 @@ _0802F664:
ldr r0, [r0]
str r0, [r3]
ldr r0, _0802F6A4 @ =sub_8011A1C
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8003ECC
_0802F694:
pop {r0}
@@ -2448,7 +2448,7 @@ _0802F6FC:
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_0802F71E:
pop {r0}
bx r0
@@ -2546,7 +2546,7 @@ sub_802F7A0: @ 802F7A0
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -2554,7 +2554,7 @@ sub_802F7A0: @ 802F7A0
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
bl sub_802E33C
_0802F7F4:
pop {r4-r6}
@@ -2677,7 +2677,7 @@ _0802F8B0:
_0802F8E4:
movs r6, 0x1
_0802F8E6:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _0802F8F2
@@ -2766,9 +2766,9 @@ _0802F934:
strb r4, [r0, 0x1]
ldr r4, _0802F9C4 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _0802F9C8 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x40
@@ -2804,7 +2804,7 @@ _0802F9DC:
muls r0, r6
ldr r5, _0802FA48 @ =gUnknown_2024284
adds r0, r5
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_8075290
lsls r0, 24
cmp r0, 0
@@ -2817,7 +2817,7 @@ _0802F9DC:
ldrh r0, [r0]
muls r0, r6
adds r0, r5
- bl sub_8035244
+ bl HandleLowHpMusicChange
_0802FA12:
ldr r0, _0802FA4C @ =gUnknown_2024018
ldr r0, [r0]
@@ -2951,7 +2951,7 @@ _0802FAF0:
lsls r0, 2
ldr r1, _0802FBE4 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _0802FBE8 @ =gUnknown_3004FF0
mov r1, r8
ldrb r0, [r1]
@@ -2968,7 +2968,7 @@ _0802FAF0:
ldr r2, _0802FBD8 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
mov r2, r8
ldrb r0, [r2]
eors r0, r7
@@ -2978,7 +2978,7 @@ _0802FAF0:
eors r0, r7
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
_0802FB5C:
ldr r1, _0802FBE0 @ =gUnknown_3004FFC
ldr r4, _0802FBD0 @ =gUnknown_2023BC4
@@ -2990,7 +2990,7 @@ _0802FB5C:
lsls r0, 2
ldr r1, _0802FBE4 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r5, _0802FBE8 @ =gUnknown_3004FF0
ldrb r1, [r4]
adds r0, r1, r5
@@ -3004,13 +3004,13 @@ _0802FB5C:
ldr r2, _0802FBD8 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r4]
bl sub_804BD94
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r0, _0802FBCC @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -3093,9 +3093,9 @@ sub_802FBF4: @ 802FBF4
strb r0, [r1, 0x1]
ldr r4, _0802FCA0 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, [r5]
ldrb r2, [r6]
ldr r1, [r0]
@@ -3109,7 +3109,7 @@ sub_802FBF4: @ 802FBF4
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_0802FC78:
ldr r0, _0802FCA4 @ =gUnknown_3004FE0
ldrb r1, [r6]
@@ -3149,7 +3149,7 @@ sub_802FCAC: @ 802FCAC
ands r0, r1
cmp r0, 0
bne _0802FCFA
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0802FCFA
@@ -3167,7 +3167,7 @@ sub_802FCAC: @ 802FCAC
muls r0, r2
ldr r2, _0802FD14 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_802E33C
_0802FCFA:
pop {r4}
@@ -3236,7 +3236,7 @@ _0802FD4A:
cmp r0, 0
bne _0802FDC4
adds r0, r3, r4
- bl sub_8007280
+ bl DestroySprite
ldr r4, _0802FDE8 @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -3250,15 +3250,15 @@ _0802FD4A:
ldr r2, _0802FDD8 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r5]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
ldr r1, _0802FDEC @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -3287,7 +3287,7 @@ sub_802FDF4: @ 802FDF4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0802FE16
@@ -3297,7 +3297,7 @@ sub_802FDF4: @ 802FDF4
lsls r2, 1
bl m4aMPlayVolumeControl
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0802FE16:
pop {r4}
pop {r0}
@@ -3324,7 +3324,7 @@ sub_802FE24: @ 802FE24
ldrb r0, [r5]
adds r0, r6
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -3350,7 +3350,7 @@ _0802FE6C:
muls r0, r2
ldr r2, _0802FE90 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_802E33C
_0802FE86:
pop {r4-r6}
@@ -3419,19 +3419,19 @@ _0802FEF2:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldr r3, _0802FFB8 @ =gUnknown_8253AE4
adds r4, 0x1
@@ -3460,7 +3460,7 @@ _0802FEF2:
mov r2, sp
bl sub_804037C
adds r0, r6, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -3474,7 +3474,7 @@ _0802FEF2:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
bl sub_8075290
lsls r0, 24
@@ -3531,7 +3531,7 @@ _0802FFE0:
ldr r1, _08030004 @ =sub_802FE94
str r1, [r0]
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
b _0803000E
.align 2, 0
_08030000: .4byte gUnknown_3004FE0
@@ -3588,19 +3588,19 @@ sub_8030024: @ 8030024
adds r6, r0
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
ldr r6, _080300E4 @ =gUnknown_8253AE4
lsls r1, r4, 2
@@ -3630,7 +3630,7 @@ sub_8030024: @ 8030024
negs r0, r0
str r0, [sp]
mov r0, r10
- bl sub_8048150
+ bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
ldr r0, _080300F0 @ =sub_80300F4
@@ -3696,7 +3696,7 @@ _08030124:
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r4, 16
movs r0, 0x1
@@ -3712,17 +3712,17 @@ _08030124:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r3, _080301F4 @ =gUnknown_8253AE4
@@ -3753,7 +3753,7 @@ _08030124:
mov r2, sp
bl sub_804037C
adds r0, r5, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -3766,7 +3766,7 @@ _08030124:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
ldr r0, _08030200 @ =sub_8030238
str r0, [r6]
@@ -3790,7 +3790,7 @@ _08030204:
ldr r1, _08030234 @ =sub_802FE94
str r1, [r0]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_08030220:
add sp, 0x8
pop {r3-r5}
@@ -3837,7 +3837,7 @@ _0803026C:
adds r1, r4, 0
adds r2, r4, 0
movs r3, 0
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, _0803028C @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -3885,7 +3885,7 @@ sub_8030298: @ 8030298
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
bl sub_8075290
lsls r0, 24
lsrs r0, 24
@@ -3905,7 +3905,7 @@ sub_8030298: @ 8030298
ldrb r0, [r0]
adds r1, r7, 0
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _0803032C
.align 2, 0
_08030304: .4byte gUnknown_3005090
@@ -3922,7 +3922,7 @@ _08030318:
ldr r2, _08030344 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_0803032C:
ldr r0, _08030348 @ =gUnknown_3005090
lsls r1, r6, 2
@@ -3976,7 +3976,7 @@ _08030388:
ldr r0, _080303A4 @ =sub_802FE94
str r0, [r1]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08030398:
pop {r4-r6}
pop {r0}
@@ -4091,7 +4091,7 @@ _0803047C:
_08030486:
movs r0, 0x58
bl sub_80722CC
- bl sub_802679C
+ bl IsMonGettingExpSentOut
cmp r0, 0
beq _080304E0
ldrh r0, [r4, 0x24]
@@ -4160,7 +4160,7 @@ _08030508:
ldr r0, _08030534 @ =sub_802FE94
str r0, [r1]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_0803051C:
add sp, 0x8
pop {r3}
@@ -4198,7 +4198,7 @@ sub_8030538: @ 8030538
ldrb r0, [r2, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -4206,12 +4206,12 @@ sub_8030538: @ 8030538
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
ldr r1, _0803059C @ =gUnknown_3004FF0
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_802E33C
_08030588:
pop {r4-r6}
@@ -4249,7 +4249,7 @@ sub_80305A0: @ 80305A0
lsls r0, 2
ldr r4, _08030608 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -4257,12 +4257,12 @@ sub_80305A0: @ 80305A0
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _0803060C @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_802E33C
_080305F4:
pop {r4-r6}
@@ -4316,7 +4316,7 @@ sub_8030628: @ 8030628
lsls r1, 3
adds r1, r3
ldrb r4, [r1, 0x8]
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
adds r0, r4, 0
bl sub_81278DC
@@ -4355,7 +4355,7 @@ sub_8030684: @ 8030684
ldrb r1, [r0]
ldr r2, _080306C8 @ =gUnknown_203B0DC
movs r0, 0x1
- bl sub_800E874
+ bl EmitChosenMonReturnValue
b _080306D6
.align 2, 0
_080306B4: .4byte gUnknown_30030F0
@@ -4368,7 +4368,7 @@ _080306CC:
movs r0, 0x1
movs r1, 0x6
movs r2, 0
- bl sub_800E874
+ bl EmitChosenMonReturnValue
_080306D6:
ldr r1, _080306F8 @ =gUnknown_2022BC4
ldr r0, _080306FC @ =gUnknown_2023BC4
@@ -4381,7 +4381,7 @@ _080306D6:
ands r0, r1
cmp r0, 0x1
bne _080306F0
- bl sub_8030B5C
+ bl PrintLinkStandbyMsg
_080306F0:
bl sub_802E33C
_080306F4:
@@ -4406,7 +4406,7 @@ sub_8030700: @ 8030700
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _08030738 @ =sub_803073C
+ ldr r1, _08030738 @ =CompleteWhenChoseItem
str r1, [r0]
bl nullsub_44
bl sub_8003ECC
@@ -4418,11 +4418,11 @@ _08030728:
_0803072C: .4byte gUnknown_2037AB8
_08030730: .4byte gUnknown_3004FE0
_08030734: .4byte gUnknown_2023BC4
-_08030738: .4byte sub_803073C
+_08030738: .4byte CompleteWhenChoseItem
thumb_func_end sub_8030700
- thumb_func_start sub_803073C
-sub_803073C: @ 803073C
+ thumb_func_start CompleteWhenChoseItem
+CompleteWhenChoseItem: @ 803073C
push {lr}
ldr r0, _08030768 @ =gUnknown_30030F0
ldr r1, [r0, 0x4]
@@ -4438,7 +4438,7 @@ sub_803073C: @ 803073C
ldr r0, _08030774 @ =gUnknown_203AD30
ldrh r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
+ bl EmitOneReturnValue
bl sub_802E33C
_08030762:
pop {r0}
@@ -4448,10 +4448,10 @@ _08030768: .4byte gUnknown_30030F0
_0803076C: .4byte sub_8011100
_08030770: .4byte gUnknown_2037AB8
_08030774: .4byte gUnknown_203AD30
- thumb_func_end sub_803073C
+ thumb_func_end CompleteWhenChoseItem
- thumb_func_start sub_8030778
-sub_8030778: @ 8030778
+ thumb_func_start CompleteOnSpecialAnimDone
+CompleteOnSpecialAnimDone: @ 8030778
push {lr}
ldr r0, _080307A8 @ =gUnknown_2024005
ldrb r0, [r0]
@@ -4480,10 +4480,10 @@ _080307A2:
_080307A8: .4byte gUnknown_2024005
_080307AC: .4byte gUnknown_2024018
_080307B0: .4byte gUnknown_2023BC4
- thumb_func_end sub_8030778
+ thumb_func_end CompleteOnSpecialAnimDone
- thumb_func_start sub_80307B4
-sub_80307B4: @ 80307B4
+ thumb_func_start DoHitAnimBlinkSpriteEffect
+DoHitAnimBlinkSpriteEffect: @ 80307B4
push {r4,lr}
ldr r1, _080307F0 @ =gUnknown_2023D44
ldr r0, _080307F4 @ =gUnknown_2023BC4
@@ -4544,7 +4544,7 @@ _0803082A:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80307B4
+ thumb_func_end DoHitAnimBlinkSpriteEffect
thumb_func_start sub_8030830
sub_8030830: @ 8030830
@@ -4566,14 +4566,14 @@ _08030848:
bl sub_8030A14
adds r0, r6, 0
ldr r1, _080308A0 @ =gUnknown_83FE770
- bl sub_8008D84
+ bl StringCopy
ldrh r1, [r4]
movs r0, 0xD
muls r1, r0
ldr r0, _080308A4 @ =gUnknown_8247094
adds r1, r0
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
adds r1, r5, 0x3
lsls r1, 24
lsrs r1, 24
@@ -4608,7 +4608,7 @@ sub_80308A8: @ 80308A8
ldr r4, _080308C4 @ =gUnknown_202298C
ldr r1, _080308C8 @ =gUnknown_83FE766
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
movs r1, 0x7
bl sub_80D87BC
@@ -4686,7 +4686,7 @@ sub_8030940: @ 8030940
ldr r6, _080309B4 @ =gUnknown_202298C
ldr r1, _080309B8 @ =gUnknown_83FE76A
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
adds r3, r0, 0
movs r0, 0xFC
strb r0, [r3]
@@ -4699,7 +4699,7 @@ sub_8030940: @ 8030940
adds r3, 0x1
ldr r1, _080309BC @ =gUnknown_83FE770
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
adds r3, r0, 0
ldr r2, _080309C0 @ =gUnknown_8250C04
ldr r1, _080309C4 @ =gUnknown_2023FFC
@@ -4719,7 +4719,7 @@ sub_8030940: @ 8030940
ldr r0, _080309C8 @ =gUnknown_824F1A0
adds r1, r0
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r6, 0
movs r1, 0x8
bl sub_80D87BC
@@ -4767,9 +4767,9 @@ sub_80309CC: @ 80309CC
str r0, [sp, 0x8]
movs r0, 0
add r1, sp, 0xC
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r0}
bx r0
@@ -4801,9 +4801,9 @@ sub_8030A14: @ 8030A14
str r0, [sp, 0x8]
movs r0, 0
add r1, sp, 0xC
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r0}
bx r0
@@ -4836,9 +4836,9 @@ sub_8030A54: @ 8030A54
str r0, [sp, 0x8]
movs r0, 0
add r1, sp, 0xC
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r4}
pop {r0}
@@ -4873,9 +4873,9 @@ sub_8030A98: @ 8030A98
str r0, [sp, 0x8]
movs r0, 0
add r1, sp, 0xC
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r0}
bx r0
@@ -4885,7 +4885,7 @@ sub_8030A98: @ 8030A98
sub_8030ADC: @ 8030ADC
push {lr}
ldr r0, _08030AE8 @ =sub_8077764
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -4896,15 +4896,15 @@ _08030AE8: .4byte sub_8077764
sub_8030AEC: @ 8030AEC
push {lr}
ldr r0, _08030AF8 @ =sub_8077764
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_08030AF8: .4byte sub_8077764
thumb_func_end sub_8030AEC
- thumb_func_start sub_8030AFC
-sub_8030AFC: @ 8030AFC
+ thumb_func_start CompleteOnFinishedStatusAnimation
+CompleteOnFinishedStatusAnimation: @ 8030AFC
push {lr}
ldr r0, _08030B24 @ =gUnknown_2024018
ldr r2, [r0]
@@ -4927,10 +4927,10 @@ _08030B1E:
.align 2, 0
_08030B24: .4byte gUnknown_2024018
_08030B28: .4byte gUnknown_2023BC4
- thumb_func_end sub_8030AFC
+ thumb_func_end CompleteOnFinishedStatusAnimation
- thumb_func_start sub_8030B2C
-sub_8030B2C: @ 8030B2C
+ thumb_func_start CompleteOnFinishedBattleAnimation
+CompleteOnFinishedBattleAnimation: @ 8030B2C
push {lr}
ldr r0, _08030B54 @ =gUnknown_2024018
ldr r2, [r0]
@@ -4953,10 +4953,10 @@ _08030B4E:
.align 2, 0
_08030B54: .4byte gUnknown_2024018
_08030B58: .4byte gUnknown_2023BC4
- thumb_func_end sub_8030B2C
+ thumb_func_end CompleteOnFinishedBattleAnimation
- thumb_func_start sub_8030B5C
-sub_8030B5C: @ 8030B5C
+ thumb_func_start PrintLinkStandbyMsg
+PrintLinkStandbyMsg: @ 8030B5C
push {lr}
ldr r0, _08030B80 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -4980,10 +4980,10 @@ _08030B80: .4byte gUnknown_2022B4C
_08030B84: .4byte gUnknown_2022974
_08030B88: .4byte gUnknown_2022976
_08030B8C: .4byte gUnknown_83FE714
- thumb_func_end sub_8030B5C
+ thumb_func_end PrintLinkStandbyMsg
- thumb_func_start sub_8030B90
-sub_8030B90: @ 8030B90
+ thumb_func_start PlayerHandleGetMonData
+PlayerHandleGetMonData: @ 8030B90
push {r4-r6,lr}
sub sp, 0x100
movs r6, 0
@@ -5001,7 +5001,7 @@ sub_8030B90: @ 8030B90
adds r1, r0
ldrb r0, [r1]
mov r1, sp
- bl sub_8030C04
+ bl CopyPlayerMonData
adds r6, r0, 0
b _08030BEA
.align 2, 0
@@ -5020,7 +5020,7 @@ _08030BCC:
lsrs r0, 24
mov r2, sp
adds r1, r2, r6
- bl sub_8030C04
+ bl CopyPlayerMonData
adds r6, r0
_08030BE2:
lsrs r4, 1
@@ -5032,16 +5032,16 @@ _08030BEA:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_802E33C
add sp, 0x100
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8030B90
+ thumb_func_end PlayerHandleGetMonData
- thumb_func_start sub_8030C04
-sub_8030C04: @ 8030C04
+ thumb_func_start CopyPlayerMonData
+CopyPlayerMonData: @ 8030C04
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -5142,12 +5142,12 @@ _08030D34:
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r6, 0
@@ -5175,12 +5175,12 @@ _08030D80:
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r1, r6, 0
adds r1, 0x11
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r6
strb r0, [r1]
@@ -5195,21 +5195,21 @@ _08030D80:
adds r4, r0
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [sp, 0x80]
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -5221,7 +5221,7 @@ _08030D80:
strb r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r6, 0x1F
ands r0, r6
@@ -5233,7 +5233,7 @@ _08030D80:
strh r1, [r3, 0x14]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 2
@@ -5245,7 +5245,7 @@ _08030D80:
strb r1, [r3, 0x15]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -5256,7 +5256,7 @@ _08030D80:
str r0, [sp, 0x14]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r6
lsls r0, 4
@@ -5267,7 +5267,7 @@ _08030D80:
strh r1, [r3, 0x16]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 1
@@ -5279,55 +5279,55 @@ _08030D80:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -5340,7 +5340,7 @@ _08030D80:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -5350,19 +5350,19 @@ _08030D80:
strb r1, [r3, 0x17]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r4, 0
movs r1, 0x2
ldr r2, [sp, 0x8C]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x84]
ldr r1, [sp, 0x8C]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r4, 0
movs r1, 0x7
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r6, 0
_08030F38:
@@ -5413,13 +5413,13 @@ _08030F8E:
adds r1, r6, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
adds r1, r6, 0
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
adds r1, r2, r6
strb r0, [r1]
@@ -5433,7 +5433,7 @@ _08030F8E:
ldr r1, _08030FDC @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1, 0xC]
mov r2, r9
@@ -5475,7 +5475,7 @@ _08031008:
adds r1, 0x11
mov r2, r8
adds r0, r4, r2
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -5486,7 +5486,7 @@ _08031008:
ldr r1, _08031034 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r6
strb r0, [r1]
adds r6, 0x1
@@ -5523,7 +5523,7 @@ _08031064:
adds r0, r1
movs r1, 0x19
_0803106E:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -5656,27 +5656,27 @@ _08031154:
adds r4, r0
adds r0, r4, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r4, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r4, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r4, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r6, 0x6
b _0803139A
@@ -5761,7 +5761,7 @@ _08031224:
adds r0, r1
movs r1, 0x37
_0803122E:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -5850,7 +5850,7 @@ _080312C8:
adds r0, r1
movs r1, 0x3F
_080312D2:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -5957,7 +5957,7 @@ _08031388:
adds r0, r1
movs r1, 0x36
_08031392:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r6, 0x1
_0803139A:
@@ -5972,10 +5972,10 @@ _0803139A:
bx r1
.align 2, 0
_080313AC: .4byte gUnknown_2024284
- thumb_func_end sub_8030C04
+ thumb_func_end CopyPlayerMonData
- thumb_func_start sub_80313B0
-sub_80313B0: @ 80313B0
+ thumb_func_start PlayerHandleGetRawMonData
+PlayerHandleGetRawMonData: @ 80313B0
push {r4-r7,lr}
sub sp, 0x58
ldr r2, _08031428 @ =gUnknown_2023BCE
@@ -6029,7 +6029,7 @@ _08031406:
ldrb r1, [r0]
movs r0, 0x1
adds r2, r4, 0
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_802E33C
add sp, 0x58
pop {r4-r7}
@@ -6040,10 +6040,10 @@ _08031428: .4byte gUnknown_2023BCE
_0803142C: .4byte gUnknown_2023BC4
_08031430: .4byte gUnknown_2022BC4
_08031434: .4byte gUnknown_2024284
- thumb_func_end sub_80313B0
+ thumb_func_end PlayerHandleGetRawMonData
- thumb_func_start sub_8031438
-sub_8031438: @ 8031438
+ thumb_func_start PlayerHandleSetMonData
+PlayerHandleSetMonData: @ 8031438
push {r4,r5,lr}
ldr r1, _0803145C @ =gUnknown_2022BC4
ldr r0, _08031460 @ =gUnknown_2023BC4
@@ -6058,7 +6058,7 @@ sub_8031438: @ 8031438
lsls r1, r2, 1
adds r1, r0
ldrb r0, [r1]
- bl sub_8031490
+ bl SetPlayerMonData
b _08031486
.align 2, 0
_0803145C: .4byte gUnknown_2022BC4
@@ -6073,7 +6073,7 @@ _0803146C:
cmp r0, 0
beq _0803147A
adds r0, r5, 0
- bl sub_8031490
+ bl SetPlayerMonData
_0803147A:
lsrs r4, 1
adds r0, r5, 0x1
@@ -6086,10 +6086,10 @@ _08031486:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8031438
+ thumb_func_end PlayerHandleSetMonData
- thumb_func_start sub_8031490
-sub_8031490: @ 8031490
+ thumb_func_start SetPlayerMonData
+SetPlayerMonData: @ 8031490
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7210,7 +7210,7 @@ _08031E56:
muls r0, r2
ldr r2, _08031E80 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
add sp, 0x34
pop {r3-r5}
mov r8, r3
@@ -7223,10 +7223,10 @@ _08031E56:
_08031E80: .4byte gUnknown_2024284
_08031E84: .4byte gUnknown_2023BC4
_08031E88: .4byte gUnknown_2023BCE
- thumb_func_end sub_8031490
+ thumb_func_end SetPlayerMonData
- thumb_func_start sub_8031E8C
-sub_8031E8C: @ 8031E8C
+ thumb_func_start PlayerHandleSetRawMonData
+PlayerHandleSetRawMonData: @ 8031E8C
push {r4-r7,lr}
ldr r1, _08031EF0 @ =gUnknown_2023BCE
ldr r7, _08031EF4 @ =gUnknown_2023BC4
@@ -7282,10 +7282,10 @@ _08031EF0: .4byte gUnknown_2023BCE
_08031EF4: .4byte gUnknown_2023BC4
_08031EF8: .4byte gUnknown_2022BC4
_08031EFC: .4byte gUnknown_2024284
- thumb_func_end sub_8031E8C
+ thumb_func_end PlayerHandleSetRawMonData
- thumb_func_start sub_8031F00
-sub_8031F00: @ 8031F00
+ thumb_func_start PlayerHandleLoadMonSprite
+PlayerHandleLoadMonSprite: @ 8031F00
push {r4,lr}
ldr r2, _08031F4C @ =gUnknown_2023BCE
ldr r4, _08031F50 @ =gUnknown_2023BC4
@@ -7330,10 +7330,10 @@ _08031F58: .4byte gUnknown_202063C
_08031F5C: .4byte gUnknown_2023D44
_08031F60: .4byte gUnknown_3004FE0
_08031F64: .4byte sub_802E404
- thumb_func_end sub_8031F00
+ thumb_func_end PlayerHandleLoadMonSprite
- thumb_func_start sub_8031F68
-sub_8031F68: @ 8031F68
+ thumb_func_start PlayerHandleSwitchInAnim
+PlayerHandleSwitchInAnim: @ 8031F68
push {r4-r6,lr}
ldr r5, _08031FD4 @ =gUnknown_2023BC4
ldrb r0, [r5]
@@ -7342,7 +7342,7 @@ sub_8031F68: @ 8031F68
adds r6, r4, 0x2
adds r1, r6
ldrb r1, [r1]
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r2, _08031FDC @ =gUnknown_2023BCE
ldrb r0, [r5]
lsls r1, r0, 1
@@ -7393,7 +7393,7 @@ _08031FE4: .4byte gUnknown_2023FF8
_08031FE8: .4byte gUnknown_2023FFC
_08031FEC: .4byte gUnknown_3004FE0
_08031FF0: .4byte sub_802FD18
- thumb_func_end sub_8031F68
+ thumb_func_end PlayerHandleSwitchInAnim
thumb_func_start sub_8031FF4
sub_8031FF4: @ 8031FF4
@@ -7408,7 +7408,7 @@ sub_8031FF4: @ 8031FF4
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r0, _08032138 @ =gUnknown_2023BCE
lsls r2, r6, 1
adds r2, r0
@@ -7424,20 +7424,20 @@ sub_8031FF4: @ 8031FF4
ldr r1, _08032140 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _08032144 @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _08032148 @ =gUnknown_3004FFC
mov r9, r1
add r9, r6
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7464,7 +7464,7 @@ sub_8031FF4: @ 8031FF4
mov r0, r10
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08032150 @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -7509,7 +7509,7 @@ sub_8031FF4: @ 8031FF4
ldr r1, _08032158 @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -7531,7 +7531,7 @@ sub_8031FF4: @ 8031FF4
str r1, [r0]
movs r0, 0
movs r1, 0xFF
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r9
ldrb r2, [r1]
lsls r1, r2, 4
@@ -7603,7 +7603,7 @@ _080321A8:
lsls r0, 2
ldr r4, _080321E8 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -7611,12 +7611,12 @@ _080321A8:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _080321EC @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_802E33C
_080321DE:
pop {r4-r6}
@@ -7661,7 +7661,7 @@ _08032218:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08032232:
ldr r0, [r6]
ldrb r1, [r5]
@@ -7686,7 +7686,7 @@ _08032246:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _08032274 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -7715,7 +7715,7 @@ sub_803227C: @ 803227C
beq _080322AC
ldr r0, _080322A8 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
ands r1, r0
movs r7, 0x20
@@ -7735,7 +7735,7 @@ _080322AE:
ands r0, r1
cmp r0, 0
beq _0803233C
- bl sub_800A404
+ bl GetMultiplayerId
ldr r5, _08032324 @ =gUnknown_202273C
lsls r0, 24
lsrs r0, 24
@@ -7747,7 +7747,7 @@ _080322AE:
ldrb r0, [r1]
cmp r0, 0x2
beq _08032306
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7759,7 +7759,7 @@ _080322AE:
ands r0, r1
cmp r0, 0x1
beq _08032306
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7771,7 +7771,7 @@ _080322AE:
cmp r4, 0x3
bne _08032328
_08032306:
- bl sub_800A404
+ bl GetMultiplayerId
ldr r2, _08032324 @ =gUnknown_202273C
lsls r0, 24
lsrs r0, 24
@@ -7786,7 +7786,7 @@ _08032306:
_08032320: .4byte gUnknown_2022B4C
_08032324: .4byte gUnknown_202273C
_08032328:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7805,7 +7805,7 @@ _08032342:
adds r0, r4, 0
bl sub_8034750
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7832,7 +7832,7 @@ _08032342:
adds r0, r6, 0
mov r1, r8
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _08032410 @ =gUnknown_2023D44
ldrb r1, [r5]
adds r1, r6
@@ -7912,7 +7912,7 @@ sub_8032428: @ 8032428
ands r0, r1
cmp r0, 0
beq _080324B8
- bl sub_800A404
+ bl GetMultiplayerId
ldr r5, _080324A0 @ =gUnknown_202273C
lsls r0, 24
lsrs r0, 24
@@ -7924,7 +7924,7 @@ sub_8032428: @ 8032428
ldrb r0, [r1]
cmp r0, 0x2
beq _08032482
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7936,7 +7936,7 @@ sub_8032428: @ 8032428
ands r0, r1
cmp r0, 0x1
beq _08032482
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7948,7 +7948,7 @@ sub_8032428: @ 8032428
cmp r4, 0x3
bne _080324A4
_08032482:
- bl sub_800A404
+ bl GetMultiplayerId
ldr r2, _080324A0 @ =gUnknown_202273C
lsls r0, 24
lsrs r0, 24
@@ -7963,7 +7963,7 @@ _08032482:
_0803249C: .4byte gUnknown_2022B4C
_080324A0: .4byte gUnknown_202273C
_080324A4:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -7982,7 +7982,7 @@ _080324BE:
adds r0, r4, 0
bl sub_8034750
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8002,7 +8002,7 @@ _080324BE:
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _08032578 @ =gUnknown_2023D44
ldrb r1, [r5]
adds r1, r6
@@ -8071,8 +8071,8 @@ _08032588: .4byte gUnknown_3004FE0
_0803258C: .4byte sub_802F768
thumb_func_end sub_8032428
- thumb_func_start sub_8032590
-sub_8032590: @ 8032590
+ thumb_func_start PlayerHandleTrainerSlideBack
+PlayerHandleTrainerSlideBack: @ 8032590
push {r4-r6,lr}
ldr r5, _08032630 @ =gUnknown_2023D44
ldr r6, _08032634 @ =gUnknown_2023BC4
@@ -8084,7 +8084,7 @@ sub_8032590: @ 8032590
lsls r0, 2
ldr r4, _08032638 @ =gUnknown_202063C
adds r0, r4
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8131,7 +8131,7 @@ sub_8032590: @ 8032590
lsls r0, 2
adds r0, r4
ldr r1, _08032644 @ =nullsub_8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -8140,7 +8140,7 @@ sub_8032590: @ 8032590
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, _08032648 @ =gUnknown_3004FE0
ldrb r0, [r6]
lsls r0, 2
@@ -8159,7 +8159,7 @@ _08032640: .4byte sub_8075590
_08032644: .4byte nullsub_8
_08032648: .4byte gUnknown_3004FE0
_0803264C: .4byte sub_802F7A0
- thumb_func_end sub_8032590
+ thumb_func_end PlayerHandleTrainerSlideBack
thumb_func_start sub_8032650
sub_8032650: @ 8032650
@@ -8187,7 +8187,7 @@ sub_8032650: @ 8032650
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08032684:
ldr r0, [r6]
ldrb r1, [r5]
@@ -8221,11 +8221,11 @@ _080326A4:
muls r0, r2
ldr r2, _08032724 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _08032728 @ =gUnknown_202063C
ldr r3, _0803272C @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -8275,8 +8275,8 @@ _08032734: .4byte gUnknown_3004FE0
_08032738: .4byte sub_8030538
thumb_func_end sub_8032650
- thumb_func_start sub_803273C
-sub_803273C: @ 803273C
+ thumb_func_start PlayerHandlePaletteFade
+PlayerHandlePaletteFade: @ 803273C
push {lr}
sub sp, 0x4
movs r0, 0x1
@@ -8286,12 +8286,12 @@ sub_803273C: @ 803273C
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_802E33C
add sp, 0x4
pop {r0}
bx r0
- thumb_func_end sub_803273C
+ thumb_func_end PlayerHandlePaletteFade
thumb_func_start sub_803275C
sub_803275C: @ 803275C
@@ -8307,19 +8307,19 @@ sub_803275C: @ 803275C
ldr r5, _080327A4 @ =gUnknown_2023BC4
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x3
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080327A8 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _080327AC @ =sub_8030778
+ ldr r1, _080327AC @ =CompleteOnSpecialAnimDone
str r1, [r0]
pop {r4,r5}
pop {r0}
@@ -8329,11 +8329,11 @@ _0803279C: .4byte gUnknown_2024018
_080327A0: .4byte gUnknown_2024005
_080327A4: .4byte gUnknown_2023BC4
_080327A8: .4byte gUnknown_3004FE0
-_080327AC: .4byte sub_8030778
+_080327AC: .4byte CompleteOnSpecialAnimDone
thumb_func_end sub_803275C
- thumb_func_start sub_80327B0
-sub_80327B0: @ 80327B0
+ thumb_func_start PlayerHandleBallThrowAnim
+PlayerHandleBallThrowAnim: @ 80327B0
push {r4,r5,lr}
ldr r1, _080327F8 @ =gUnknown_2022BC4
ldr r5, _080327FC @ =gUnknown_2023BC4
@@ -8351,19 +8351,19 @@ sub_80327B0: @ 80327B0
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x3
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _08032808 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _0803280C @ =sub_8030778
+ ldr r1, _0803280C @ =CompleteOnSpecialAnimDone
str r1, [r0]
pop {r4,r5}
pop {r0}
@@ -8374,11 +8374,11 @@ _080327FC: .4byte gUnknown_2023BC4
_08032800: .4byte gUnknown_2024018
_08032804: .4byte gUnknown_2024005
_08032808: .4byte gUnknown_3004FE0
-_0803280C: .4byte sub_8030778
- thumb_func_end sub_80327B0
+_0803280C: .4byte CompleteOnSpecialAnimDone
+ thumb_func_end PlayerHandleBallThrowAnim
- thumb_func_start sub_8032810
-sub_8032810: @ 8032810
+ thumb_func_start PlayerHandlePause
+PlayerHandlePause: @ 8032810
push {lr}
ldr r1, _08032838 @ =gUnknown_2022BC4
ldr r0, _0803283C @ =gUnknown_2023BC4
@@ -8402,14 +8402,14 @@ _0803282E:
.align 2, 0
_08032838: .4byte gUnknown_2022BC4
_0803283C: .4byte gUnknown_2023BC4
- thumb_func_end sub_8032810
+ thumb_func_end PlayerHandlePause
- thumb_func_start sub_8032840
-sub_8032840: @ 8032840
+ thumb_func_start PlayerHandleMoveAnimation
+PlayerHandleMoveAnimation: @ 8032840
push {r4-r6,lr}
ldr r6, _08032924 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
beq _08032852
@@ -8510,7 +8510,7 @@ _08032852:
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -8551,7 +8551,7 @@ _08032966:
_0803296C: .4byte gUnknown_2024018
_08032970: .4byte gUnknown_3004FE0
_08032974: .4byte sub_8032978
- thumb_func_end sub_8032840
+ thumb_func_end PlayerHandleMoveAnimation
thumb_func_start sub_8032978
sub_8032978: @ 8032978
@@ -8619,7 +8619,7 @@ _080329DA:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_080329FC:
ldr r0, [r7]
ldrb r1, [r6]
@@ -8677,7 +8677,7 @@ _08032A3A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -8714,7 +8714,7 @@ _08032AB0:
lsrs r4, r0, 24
cmp r4, 0
bne _08032AEC
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r10
@@ -8724,7 +8724,7 @@ _08032AB0:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -8801,7 +8801,7 @@ sub_8032B70: @ 8032B70
push {lr}
ldr r0, _08032B88 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08032B8C
@@ -8819,7 +8819,7 @@ _08032B90:
thumb_func_start sub_8032B94
sub_8032B94: @ 8032B94
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -8905,7 +8905,7 @@ nullsub_14: @ 8032C48
thumb_func_start sub_8032C4C
sub_8032C4C: @ 8032C4C
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -8989,7 +8989,7 @@ sub_8032CEC: @ 8032CEC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08032D38 @ =gUnknown_3004FE0
ldr r2, _08032D3C @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -9034,7 +9034,7 @@ sub_8032D50: @ 8032D50
sub sp, 0x4
ldr r0, _08032E00 @ =nullsub_43
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
ldr r3, _08032E04 @ =gUnknown_3004FFC
ldr r4, _08032E08 @ =gUnknown_2023BC4
ldrb r1, [r4]
@@ -9101,7 +9101,7 @@ _08032DBC:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08032E1C @ =gUnknown_3004FE0
ldr r2, _08032E08 @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -9133,7 +9133,7 @@ _08032E24: .4byte gUnknown_2024004
sub_8032E28: @ 8032E28
push {lr}
sub sp, 0x4
- bl sub_8035314
+ bl BattleStopLowHpSound
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -9141,7 +9141,7 @@ sub_8032E28: @ 8032E28
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_802E33C
add sp, 0x4
pop {r0}
@@ -9156,7 +9156,7 @@ sub_8032E4C: @ 8032E4C
push {r6,r7}
sub sp, 0x4
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _08032EC4 @ =gUnknown_2022BC4
ldr r0, _08032EC8 @ =gUnknown_2023BC4
mov r9, r0
@@ -9184,7 +9184,7 @@ sub_8032E4C: @ 8032E4C
ldr r4, _08032ED4 @ =gUnknown_2024284
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r9
ldrb r0, [r1]
@@ -9194,7 +9194,7 @@ sub_8032E4C: @ 8032E4C
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -9203,7 +9203,7 @@ sub_8032E4C: @ 8032E4C
ldrb r1, [r1]
str r7, [sp]
mov r2, r8
- bl sub_8048150
+ bl SetBattleBarStruct
b _08032F16
.align 2, 0
_08032EC4: .4byte gUnknown_2022BC4
@@ -9222,7 +9222,7 @@ _08032EDC:
ldr r1, _08032F38 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
mov r1, r9
ldrb r0, [r1]
@@ -9231,7 +9231,7 @@ _08032EDC:
ldrb r1, [r1]
str r7, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
mov r1, r9
ldrb r0, [r1]
adds r0, r4
@@ -9263,8 +9263,8 @@ _08032F44: .4byte gUnknown_2023BC4
_08032F48: .4byte sub_802FE24
thumb_func_end sub_8032E4C
- thumb_func_start sub_8032F4C
-sub_8032F4C: @ 8032F4C
+ thumb_func_start PlayerHandleExpUpdate
+PlayerHandleExpUpdate: @ 8032F4C
push {r4-r7,lr}
ldr r5, _08032F78 @ =gUnknown_2022BC4
ldr r6, _08032F7C @ =gUnknown_2023BC4
@@ -9280,7 +9280,7 @@ sub_8032F4C: @ 8032F4C
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _08032F84
bl sub_802E33C
@@ -9291,10 +9291,10 @@ _08032F7C: .4byte gUnknown_2023BC4
_08032F80: .4byte gUnknown_2024284
_08032F84:
movs r0, 0x1
- bl sub_8034964
+ bl LoadBattleBarGfx
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldrb r1, [r6]
lsls r1, 9
adds r0, r5, 0x2
@@ -9307,7 +9307,7 @@ _08032F84:
orrs r4, r0
ldr r0, _08032FD8 @ =sub_802FEAC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08032FDC @ =gUnknown_3005090
@@ -9334,14 +9334,14 @@ _08032FD8: .4byte sub_802FEAC
_08032FDC: .4byte gUnknown_3005090
_08032FE0: .4byte gUnknown_3004FE0
_08032FE4: .4byte nullsub_13
- thumb_func_end sub_8032F4C
+ thumb_func_end PlayerHandleExpUpdate
thumb_func_start sub_8032FE8
sub_8032FE8: @ 8032FE8
push {r4,lr}
ldr r4, _08033044 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _0803303C
@@ -9358,7 +9358,7 @@ sub_8032FE8: @ 8032FE8
ldr r2, _08033050 @ =gUnknown_2024284
adds r1, r2
movs r2, 0x9
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r2, [r4]
ldr r0, _08033054 @ =gUnknown_2024018
ldr r0, [r0]
@@ -9376,7 +9376,7 @@ sub_8032FE8: @ 8032FE8
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _0803305C @ =sub_8030AFC
+ ldr r1, _0803305C @ =CompleteOnFinishedStatusAnimation
str r1, [r0]
_0803303C:
pop {r4}
@@ -9389,7 +9389,7 @@ _0803304C: .4byte gUnknown_2023BCE
_08033050: .4byte gUnknown_2024284
_08033054: .4byte gUnknown_2024018
_08033058: .4byte gUnknown_3004FE0
-_0803305C: .4byte sub_8030AFC
+_0803305C: .4byte CompleteOnFinishedStatusAnimation
thumb_func_end sub_8032FE8
thumb_func_start sub_8033060
@@ -9397,7 +9397,7 @@ sub_8033060: @ 8033060
push {r4,r5,lr}
ldr r5, _080330B8 @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _080330B0
@@ -9425,12 +9425,12 @@ sub_8033060: @ 8033060
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
- bl sub_8033F1C
+ bl InitAndLaunchChosenStatusAnimation
ldr r1, _080330C0 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _080330C4 @ =sub_8030AFC
+ ldr r1, _080330C4 @ =CompleteOnFinishedStatusAnimation
str r1, [r0]
_080330B0:
pop {r4,r5}
@@ -9440,11 +9440,11 @@ _080330B0:
_080330B8: .4byte gUnknown_2023BC4
_080330BC: .4byte gUnknown_2022BC4
_080330C0: .4byte gUnknown_3004FE0
-_080330C4: .4byte sub_8030AFC
+_080330C4: .4byte CompleteOnFinishedStatusAnimation
thumb_func_end sub_8033060
- thumb_func_start sub_80330C8
-sub_80330C8: @ 80330C8
+ thumb_func_start PlayerHandleStatusXor
+PlayerHandleStatusXor: @ 80330C8
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -9461,7 +9461,7 @@ sub_80330C8: @ 80330C8
ldr r5, _0803312C @ =gUnknown_2024284
adds r0, r5
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _08033130 @ =gUnknown_2022BC4
ldrb r1, [r4]
lsls r1, 9
@@ -9492,7 +9492,7 @@ _08033124: .4byte gUnknown_2023BCE
_08033128: .4byte gUnknown_2023BC4
_0803312C: .4byte gUnknown_2024284
_08033130: .4byte gUnknown_2022BC4
- thumb_func_end sub_80330C8
+ thumb_func_end PlayerHandleStatusXor
thumb_func_start sub_8033134
sub_8033134: @ 8033134
@@ -9502,8 +9502,8 @@ sub_8033134: @ 8033134
bx r0
thumb_func_end sub_8033134
- thumb_func_start sub_8033140
-sub_8033140: @ 8033140
+ thumb_func_start PlayerHandleDMA3Transfer
+PlayerHandleDMA3Transfer: @ 8033140
push {r4,r5,lr}
ldr r3, _080331A4 @ =gUnknown_2022BC4
ldr r0, _080331A8 @ =gUnknown_2023BC4
@@ -9589,10 +9589,10 @@ _080331DC:
_080331E8: .4byte 0x040000d4
_080331EC: .4byte 0x80000800
_080331F0: .4byte 0xfffff000
- thumb_func_end sub_8033140
+ thumb_func_end PlayerHandleDMA3Transfer
- thumb_func_start sub_80331F4
-sub_80331F4: @ 80331F4
+ thumb_func_start PlayerHandlePlayBGM
+PlayerHandlePlayBGM: @ 80331F4
push {lr}
ldr r2, _0803321C @ =gUnknown_2022BC4
ldr r0, _08033220 @ =gUnknown_2023BC4
@@ -9606,14 +9606,14 @@ sub_80331F4: @ 80331F4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_80722A0
+ bl PlayBGM
bl sub_802E33C
pop {r0}
bx r0
.align 2, 0
_0803321C: .4byte gUnknown_2022BC4
_08033220: .4byte gUnknown_2023BC4
- thumb_func_end sub_80331F4
+ thumb_func_end PlayerHandlePlayBGM
thumb_func_start sub_8033224
sub_8033224: @ 8033224
@@ -9623,54 +9623,54 @@ sub_8033224: @ 8033224
bx r0
thumb_func_end sub_8033224
- thumb_func_start sub_8033230
-sub_8033230: @ 8033230
+ thumb_func_start PlayerHandleTwoReturnValues
+PlayerHandleTwoReturnValues: @ 8033230
push {lr}
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
bl sub_802E33C
pop {r0}
bx r0
- thumb_func_end sub_8033230
+ thumb_func_end PlayerHandleTwoReturnValues
- thumb_func_start sub_8033244
-sub_8033244: @ 8033244
+ thumb_func_start PlayerHandleChosenMonReturnValue
+PlayerHandleChosenMonReturnValue: @ 8033244
push {lr}
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_800E874
+ bl EmitChosenMonReturnValue
bl sub_802E33C
pop {r0}
bx r0
- thumb_func_end sub_8033244
+ thumb_func_end PlayerHandleChosenMonReturnValue
- thumb_func_start sub_8033258
-sub_8033258: @ 8033258
+ thumb_func_start PlayerHandleOneReturnValue
+PlayerHandleOneReturnValue: @ 8033258
push {lr}
movs r0, 0x1
movs r1, 0
- bl sub_800E8AC
+ bl EmitOneReturnValue
bl sub_802E33C
pop {r0}
bx r0
- thumb_func_end sub_8033258
+ thumb_func_end PlayerHandleOneReturnValue
- thumb_func_start sub_803326C
-sub_803326C: @ 803326C
+ thumb_func_start PlayerHandleOneReturnValue_Duplicate
+PlayerHandleOneReturnValue_Duplicate: @ 803326C
push {lr}
movs r0, 0x1
movs r1, 0
- bl sub_800E8D8
+ bl EmitOneReturnValue_Duplicate
bl sub_802E33C
pop {r0}
bx r0
- thumb_func_end sub_803326C
+ thumb_func_end PlayerHandleOneReturnValue_Duplicate
- thumb_func_start sub_8033280
-sub_8033280: @ 8033280
+ thumb_func_start PlayerHandleCmd37
+PlayerHandleCmd37: @ 8033280
push {lr}
ldr r2, _08033298 @ =gUnknown_2022870
ldrb r1, [r2]
@@ -9683,10 +9683,10 @@ sub_8033280: @ 8033280
bx r0
.align 2, 0
_08033298: .4byte gUnknown_2022870
- thumb_func_end sub_8033280
+ thumb_func_end PlayerHandleCmd37
- thumb_func_start sub_803329C
-sub_803329C: @ 803329C
+ thumb_func_start PlayerHandleCmd38
+PlayerHandleCmd38: @ 803329C
push {lr}
ldr r3, _080332C8 @ =gUnknown_2022870
ldr r1, _080332CC @ =gUnknown_2022BC4
@@ -9711,10 +9711,10 @@ sub_803329C: @ 803329C
_080332C8: .4byte gUnknown_2022870
_080332CC: .4byte gUnknown_2022BC4
_080332D0: .4byte gUnknown_2023BC4
- thumb_func_end sub_803329C
+ thumb_func_end PlayerHandleCmd38
- thumb_func_start sub_80332D4
-sub_80332D4: @ 80332D4
+ thumb_func_start PlayerHandleCmd39
+PlayerHandleCmd39: @ 80332D4
push {lr}
ldr r2, _080332E8 @ =gUnknown_2022870
ldrb r1, [r2]
@@ -9726,10 +9726,10 @@ sub_80332D4: @ 80332D4
bx r0
.align 2, 0
_080332E8: .4byte gUnknown_2022870
- thumb_func_end sub_80332D4
+ thumb_func_end PlayerHandleCmd39
- thumb_func_start sub_80332EC
-sub_80332EC: @ 80332EC
+ thumb_func_start PlayerHandleCmd40
+PlayerHandleCmd40: @ 80332EC
push {lr}
ldr r3, _08033310 @ =gUnknown_2022870
ldr r1, [r3]
@@ -9748,10 +9748,10 @@ sub_80332EC: @ 80332EC
bx r0
.align 2, 0
_08033310: .4byte gUnknown_2022870
- thumb_func_end sub_80332EC
+ thumb_func_end PlayerHandleCmd40
- thumb_func_start sub_8033314
-sub_8033314: @ 8033314
+ thumb_func_start PlayerHandleHitAnimation
+PlayerHandleHitAnimation: @ 8033314
push {r4,lr}
ldr r3, _0803333C @ =gUnknown_202063C
ldr r2, _08033340 @ =gUnknown_2023D44
@@ -9788,12 +9788,12 @@ _08033348:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _0803337C @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _08033380 @ =sub_80307B4
+ ldr r1, _08033380 @ =DoHitAnimBlinkSpriteEffect
str r1, [r0]
_08033372:
pop {r4}
@@ -9802,8 +9802,8 @@ _08033372:
.align 2, 0
_08033378: .4byte gUnknown_2024005
_0803337C: .4byte gUnknown_3004FE0
-_08033380: .4byte sub_80307B4
- thumb_func_end sub_8033314
+_08033380: .4byte DoHitAnimBlinkSpriteEffect
+ thumb_func_end PlayerHandleHitAnimation
thumb_func_start sub_8033384
sub_8033384: @ 8033384
@@ -9813,12 +9813,12 @@ sub_8033384: @ 8033384
bx r0
thumb_func_end sub_8033384
- thumb_func_start sub_8033390
-sub_8033390: @ 8033390
+ thumb_func_start PlayerHandlePlaySE
+PlayerHandlePlaySE: @ 8033390
push {r4,lr}
ldr r4, _080333CC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -9838,7 +9838,7 @@ _080333A4:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl sub_80722F4
+ bl PlaySE12WithPanning
bl sub_802E33C
pop {r4}
pop {r0}
@@ -9846,7 +9846,7 @@ _080333A4:
.align 2, 0
_080333CC: .4byte gUnknown_2023BC4
_080333D0: .4byte gUnknown_2022BC4
- thumb_func_end sub_8033390
+ thumb_func_end PlayerHandlePlaySE
thumb_func_start sub_80333D4
sub_80333D4: @ 80333D4
@@ -9863,7 +9863,7 @@ sub_80333D4: @ 80333D4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
+ bl PlayFanfare
bl sub_802E33C
pop {r0}
bx r0
@@ -9872,8 +9872,8 @@ _080333FC: .4byte gUnknown_2022BC4
_08033400: .4byte gUnknown_2023BC4
thumb_func_end sub_80333D4
- thumb_func_start sub_8033404
-sub_8033404: @ 8033404
+ thumb_func_start PlayerHandleFaintingCry
+PlayerHandleFaintingCry: @ 8033404
push {lr}
ldr r1, _08033438 @ =gUnknown_2023BCE
ldr r0, _0803343C @ =gUnknown_2023BC4
@@ -9886,13 +9886,13 @@ sub_8033404: @ 8033404
ldr r1, _08033440 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
negs r1, r1
movs r2, 0x5
- bl sub_8071E60
+ bl PlayCry3
bl sub_802E33C
pop {r0}
bx r0
@@ -9900,10 +9900,10 @@ sub_8033404: @ 8033404
_08033438: .4byte gUnknown_2023BCE
_0803343C: .4byte gUnknown_2023BC4
_08033440: .4byte gUnknown_2024284
- thumb_func_end sub_8033404
+ thumb_func_end PlayerHandleFaintingCry
- thumb_func_start sub_8033444
-sub_8033444: @ 8033444
+ thumb_func_start PlayerHandleIntroSlide
+PlayerHandleIntroSlide: @ 8033444
push {lr}
ldr r1, _0803346C @ =gUnknown_2022BC4
ldr r0, _08033470 @ =gUnknown_2023BC4
@@ -9925,10 +9925,10 @@ sub_8033444: @ 8033444
_0803346C: .4byte gUnknown_2022BC4
_08033470: .4byte gUnknown_2023BC4
_08033474: .4byte gUnknown_2023F4C
- thumb_func_end sub_8033444
+ thumb_func_end PlayerHandleIntroSlide
- thumb_func_start sub_8033478
-sub_8033478: @ 8033478
+ thumb_func_start PlayerHandleIntroTrainerBallThrow
+PlayerHandleIntroTrainerBallThrow: @ 8033478
push {r4-r7,lr}
ldr r6, _080335B8 @ =gUnknown_2023D44
ldr r7, _080335BC @ =gUnknown_2023BC4
@@ -9940,7 +9940,7 @@ sub_8033478: @ 8033478
lsls r0, 2
ldr r5, _080335C0 @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -9995,7 +9995,7 @@ sub_8033478: @ 8033478
lsls r0, 2
adds r0, r5
ldr r1, _080335CC @ =sub_80335F8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -10004,9 +10004,9 @@ sub_8033478: @ 8033478
lsls r0, 2
adds r0, r5
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080335D0 @ =0x0000d6f8
- bl sub_80089B8
+ bl AllocSpritePalette
adds r4, r0, 0
lsls r4, 24
ldr r1, _080335D4 @ =gUnknown_8239FD4
@@ -10021,7 +10021,7 @@ sub_8033478: @ 8033478
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -10034,9 +10034,9 @@ sub_8033478: @ 8033478
ands r0, r2
orrs r0, r4
strb r0, [r1, 0x5]
- ldr r0, _080335DC @ =sub_8033660
+ ldr r0, _080335DC @ =task05_08033660
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _080335E0 @ =gUnknown_3005090
@@ -10094,14 +10094,14 @@ _080335CC: .4byte sub_80335F8
_080335D0: .4byte 0x0000d6f8
_080335D4: .4byte gUnknown_8239FD4
_080335D8: .4byte gUnknown_300500C
-_080335DC: .4byte sub_8033660
+_080335DC: .4byte task05_08033660
_080335E0: .4byte gUnknown_3005090
_080335E4: .4byte gUnknown_2024018
_080335E8: .4byte gUnknown_2024000
_080335EC: .4byte sub_80491B0
_080335F0: .4byte gUnknown_3004FE0
_080335F4: .4byte nullsub_13
- thumb_func_end sub_8033478
+ thumb_func_end PlayerHandleIntroTrainerBallThrow
thumb_func_start sub_80335F8
sub_80335F8: @ 80335F8
@@ -10110,15 +10110,15 @@ sub_80335F8: @ 80335F8
ldrh r4, [r5, 0x38]
lsls r4, 24
lsrs r4, 24
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r5, 0x5]
lsrs r0, 4
- bl sub_8008A20
+ bl GetSpritePaletteTagByPaletteNum
lsls r0, 16
lsrs r0, 16
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
ldr r1, _08033650 @ =gUnknown_2023BCE
lsls r0, r4, 1
adds r0, r1
@@ -10138,7 +10138,7 @@ sub_80335F8: @ 80335F8
ldr r1, _0803365C @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -10149,8 +10149,8 @@ _08033658: .4byte gUnknown_2023D44
_0803365C: .4byte gUnknown_202063C
thumb_func_end sub_80335F8
- thumb_func_start sub_8033660
-sub_8033660: @ 8033660
+ thumb_func_start task05_08033660
+task05_08033660: @ 8033660
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -10260,7 +10260,7 @@ _08033730:
mov r3, r9
strb r3, [r2]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_08033748:
pop {r3,r4}
mov r8, r3
@@ -10275,10 +10275,10 @@ _0803375C: .4byte gUnknown_2024284
_08033760: .4byte gUnknown_3004FE0
_08033764: .4byte gUnknown_2023BC4
_08033768: .4byte sub_802FA58
- thumb_func_end sub_8033660
+ thumb_func_end task05_08033660
- thumb_func_start sub_803376C
-sub_803376C: @ 803376C
+ thumb_func_start PlayerHandleDrawPartyStatusSummary
+PlayerHandleDrawPartyStatusSummary: @ 803376C
push {r4-r6,lr}
ldr r1, _08033794 @ =gUnknown_2022BC4
ldr r0, _08033798 @ =gUnknown_2023BC4
@@ -10290,7 +10290,7 @@ sub_803376C: @ 803376C
cmp r0, 0
beq _0803379C
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803379C
@@ -10369,7 +10369,7 @@ _08033820: .4byte gUnknown_2022BC8
_08033824: .4byte gUnknown_2024000
_08033828: .4byte gUnknown_3004FE0
_0803382C: .4byte sub_8033830
- thumb_func_end sub_803376C
+ thumb_func_end PlayerHandleDrawPartyStatusSummary
thumb_func_start sub_8033830
sub_8033830: @ 8033830
@@ -10409,8 +10409,8 @@ _08033870: .4byte gUnknown_2024018
_08033874: .4byte gUnknown_2023BC4
thumb_func_end sub_8033830
- thumb_func_start sub_8033878
-sub_8033878: @ 8033878
+ thumb_func_start PlayerHandleCmd49
+PlayerHandleCmd49: @ 8033878
push {lr}
ldr r0, _080338B4 @ =gUnknown_2024018
ldr r1, [r0]
@@ -10446,7 +10446,7 @@ _080338B8: .4byte gUnknown_2023BC4
_080338BC: .4byte gUnknown_3005090
_080338C0: .4byte gUnknown_2024000
_080338C4: .4byte sub_80491B0
- thumb_func_end sub_8033878
+ thumb_func_end PlayerHandleCmd49
thumb_func_start sub_80338C8
sub_80338C8: @ 80338C8
@@ -10454,10 +10454,10 @@ sub_80338C8: @ 80338C8
ldr r4, _080338E8 @ =gUnknown_2023BC4
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
bl sub_802E33C
pop {r4}
pop {r0}
@@ -10466,8 +10466,8 @@ sub_80338C8: @ 80338C8
_080338E8: .4byte gUnknown_2023BC4
thumb_func_end sub_80338C8
- thumb_func_start sub_80338EC
-sub_80338EC: @ 80338EC
+ thumb_func_start PlayerHandleSpriteInvisibility
+PlayerHandleSpriteInvisibility: @ 80338EC
push {r4,lr}
ldr r4, _0803393C @ =gUnknown_2023BC4
ldrb r0, [r4]
@@ -10500,7 +10500,7 @@ sub_80338EC: @ 80338EC
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
_08033932:
bl sub_802E33C
pop {r4}
@@ -10511,7 +10511,7 @@ _0803393C: .4byte gUnknown_2023BC4
_08033940: .4byte gUnknown_202063C
_08033944: .4byte gUnknown_2023D44
_08033948: .4byte gUnknown_2022BC4
- thumb_func_end sub_80338EC
+ thumb_func_end PlayerHandleSpriteInvisibility
thumb_func_start sub_803394C
sub_803394C: @ 803394C
@@ -10519,7 +10519,7 @@ sub_803394C: @ 803394C
sub sp, 0x4
ldr r6, _08033990 @ =gUnknown_2023BC4
ldrb r0, [r6]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _080339A4
@@ -10540,7 +10540,7 @@ sub_803394C: @ 803394C
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _08033998
@@ -10554,7 +10554,7 @@ _08033998:
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
- ldr r0, _080339B0 @ =sub_8030B2C
+ ldr r0, _080339B0 @ =CompleteOnFinishedBattleAnimation
str r0, [r1]
_080339A4:
add sp, 0x4
@@ -10563,7 +10563,7 @@ _080339A4:
bx r0
.align 2, 0
_080339AC: .4byte gUnknown_3004FE0
-_080339B0: .4byte sub_8030B2C
+_080339B0: .4byte CompleteOnFinishedBattleAnimation
thumb_func_end sub_803394C
thumb_func_start sub_80339B4
@@ -10591,20 +10591,20 @@ _080339DC:
beq _08033A00
b _08033A04
_080339E2:
- bl sub_8030B5C
+ bl PrintLinkStandbyMsg
_080339E6:
ldr r4, _080339FC @ =gUnknown_2023BC4
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
b _08033A04
.align 2, 0
_080339FC: .4byte gUnknown_2023BC4
_08033A00:
- bl sub_8030B5C
+ bl PrintLinkStandbyMsg
_08033A04:
bl sub_802E33C
pop {r4}
@@ -10681,9 +10681,9 @@ sub_8033A78: @ 8033A78
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
+ bl BeginFastPaletteFade
bl sub_802E33C
ldr r1, _08033ABC @ =gUnknown_3004FE0
ldrb r0, [r4]
@@ -10846,10 +10846,10 @@ _08033C4C:
b _08033D92
_08033C54:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08033C7C @ =gUnknown_825E45C
lsls r4, 24
lsrs r4, 22
@@ -10927,10 +10927,10 @@ _08033CE4:
b _08033D90
_08033CEA:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08033D10 @ =gUnknown_825E45C
lsls r4, 24
lsrs r4, 22
@@ -10947,12 +10947,12 @@ _08033CEA:
_08033D10: .4byte gUnknown_825E45C
_08033D14:
ldrb r0, [r3]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08033D34 @ =gUnknown_825E45C
lsls r0, 24
lsrs r0, 22
@@ -10974,19 +10974,19 @@ _08033D42:
_08033D48: .4byte gUnknown_825E45C
_08033D4C:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r5, r0, 0
ldr r0, _08033DAC @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r3, _08033DB0 @ =gUnknown_825E45C
lsls r5, 24
lsrs r5, 22
@@ -11012,7 +11012,7 @@ _08033D92:
movs r1, 0x8
adds r2, r6, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08033DA2:
add sp, 0x4
pop {r4-r6}
diff --git a/asm/battle_controller_pokedude.s b/asm/battle_controller_pokedude.s
index 101b232ba..d418c214a 100644
--- a/asm/battle_controller_pokedude.s
+++ b/asm/battle_controller_pokedude.s
@@ -198,9 +198,9 @@ _081561F8:
strb r0, [r1, 0x1]
ldr r4, _08156238 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
bl sub_8157084
_08156230:
pop {r4-r7}
@@ -245,7 +245,7 @@ sub_8156254: @ 8156254
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_0815627E:
pop {r0}
bx r0
@@ -275,7 +275,7 @@ sub_8156294: @ 8156294
bne _081562D4
ldr r0, _081562E4 @ =sub_802FDF4
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r2, _081562E8 @ =gUnknown_2023BCE
ldrb r1, [r4]
lsls r0, r1, 1
@@ -285,7 +285,7 @@ sub_8156294: @ 8156294
muls r0, r2
ldr r2, _081562EC @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_8157084
_081562D4:
pop {r4}
@@ -347,9 +347,9 @@ sub_81562F0: @ 81562F0
strb r0, [r1, 0x1]
ldr r4, _0815639C @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, [r5]
ldrb r2, [r6]
ldr r1, [r0]
@@ -363,7 +363,7 @@ sub_81562F0: @ 81562F0
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08156374:
ldr r0, _081563A0 @ =gUnknown_3004FE0
ldrb r1, [r6]
@@ -440,7 +440,7 @@ _081563DA:
cmp r0, 0
bne _08156454
adds r0, r3, r4
- bl sub_8007280
+ bl DestroySprite
ldr r4, _08156478 @ =gUnknown_3004FF0
ldrb r1, [r5]
adds r0, r1, r4
@@ -454,15 +454,15 @@ _081563DA:
ldr r2, _08156468 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
bl sub_804BD94
ldrb r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldrb r0, [r5]
- bl sub_8034BB4
+ bl CopyBattleSpriteInvisibility
ldr r1, _0815647C @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -567,7 +567,7 @@ sub_81564F0: @ 81564F0
ldrb r0, [r2]
adds r0, r1
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
bl sub_8127968
_08156520:
@@ -603,7 +603,7 @@ sub_8156538: @ 8156538
ldrb r1, [r0]
ldr r2, _0815657C @ =gUnknown_203B0DC
movs r0, 0x1
- bl sub_800E874
+ bl EmitChosenMonReturnValue
b _0815658A
.align 2, 0
_08156568: .4byte gUnknown_30030F0
@@ -616,7 +616,7 @@ _08156580:
movs r0, 0x1
movs r1, 0x6
movs r2, 0
- bl sub_800E874
+ bl EmitChosenMonReturnValue
_0815658A:
bl sub_8157084
_0815658E:
@@ -683,7 +683,7 @@ sub_81565E8: @ 81565E8
ldr r0, _08156620 @ =gUnknown_203AD30
ldrh r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
+ bl EmitOneReturnValue
bl sub_8157084
_0815660E:
pop {r0}
@@ -792,7 +792,7 @@ _0815668A:
lsls r0, 2
ldr r1, _081567A0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r4, _081567A4 @ =gUnknown_3004FF0
ldrb r0, [r5]
adds r1, r6, 0
@@ -808,7 +808,7 @@ _0815668A:
ldr r2, _08156794 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r5]
eors r0, r6
bl sub_804BD94
@@ -816,7 +816,7 @@ _0815668A:
eors r0, r6
adds r0, r4
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
_0815671E:
ldr r1, _0815679C @ =gUnknown_3004FFC
ldr r4, _0815678C @ =gUnknown_2023BC4
@@ -828,7 +828,7 @@ _0815671E:
lsls r0, 2
ldr r1, _081567A0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r5, _081567A4 @ =gUnknown_3004FF0
ldrb r1, [r4]
adds r0, r1, r5
@@ -842,13 +842,13 @@ _0815671E:
ldr r2, _08156794 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r4]
bl sub_804BD94
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r0, _08156788 @ =gUnknown_2024018
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -978,12 +978,12 @@ _081567DA:
strb r4, [r0, 0x1]
ldr r4, _081568C4 @ =0x000027f9
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _081568C8 @ =sub_802FDF4
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r2, _081568CC @ =gUnknown_2023BCE
mov r0, r8
ldrb r1, [r0]
@@ -994,7 +994,7 @@ _081567DA:
muls r0, r2
ldr r2, _081568D0 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
ldr r1, _081568D4 @ =gUnknown_3004FE0
mov r2, r8
ldrb r0, [r2]
@@ -1066,19 +1066,19 @@ _08156922:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldr r3, _081569E8 @ =gUnknown_8253AE4
adds r4, 0x1
@@ -1107,7 +1107,7 @@ _08156922:
mov r2, sp
bl sub_804037C
adds r0, r6, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -1121,7 +1121,7 @@ _08156922:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
bl sub_8075290
lsls r0, 24
@@ -1178,7 +1178,7 @@ _08156A10:
ldr r1, _08156A34 @ =sub_8156EE8
str r1, [r0]
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
b _08156A3E
.align 2, 0
_08156A30: .4byte gUnknown_3004FE0
@@ -1235,19 +1235,19 @@ sub_8156A54: @ 8156A54
adds r6, r0
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
ldr r6, _08156B14 @ =gUnknown_8253AE4
lsls r1, r4, 2
@@ -1277,7 +1277,7 @@ sub_8156A54: @ 8156A54
negs r0, r0
str r0, [sp]
mov r0, r10
- bl sub_8048150
+ bl SetBattleBarStruct
movs r0, 0x1B
bl sub_80722CC
ldr r0, _08156B20 @ =sub_8156B24
@@ -1343,7 +1343,7 @@ _08156B54:
lsls r4, 16
lsrs r4, 16
ldrb r0, [r5]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r4, 16
movs r0, 0x1
@@ -1359,17 +1359,17 @@ _08156B54:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r3, _08156C24 @ =gUnknown_8253AE4
@@ -1400,7 +1400,7 @@ _08156B54:
mov r2, sp
bl sub_804037C
adds r0, r5, 0
- bl sub_803E47C
+ bl CalculateMonStats
ldr r2, [sp]
add r0, sp, 0x4
ldrh r0, [r0]
@@ -1413,7 +1413,7 @@ _08156B54:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
- bl sub_800E848
+ bl EmitTwoReturnValues
strb r5, [r4]
ldr r0, _08156C30 @ =sub_8156C68
str r0, [r6]
@@ -1437,7 +1437,7 @@ _08156C34:
ldr r1, _08156C64 @ =sub_8156EE8
str r1, [r0]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_08156C50:
add sp, 0x8
pop {r3-r5}
@@ -1484,7 +1484,7 @@ _08156C9C:
adds r1, r4, 0
adds r2, r4, 0
movs r3, 0
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, _08156CBC @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -1532,7 +1532,7 @@ sub_8156CC8: @ 8156CC8
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
bl sub_8075290
lsls r0, 24
lsrs r0, 24
@@ -1552,7 +1552,7 @@ sub_8156CC8: @ 8156CC8
ldrb r0, [r0]
adds r1, r7, 0
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _08156D5C
.align 2, 0
_08156D34: .4byte gUnknown_3005090
@@ -1569,7 +1569,7 @@ _08156D48:
ldr r2, _08156D74 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_08156D5C:
ldr r0, _08156D78 @ =gUnknown_3005090
lsls r1, r6, 2
@@ -1606,7 +1606,7 @@ sub_8156D80: @ 8156D80
ldr r1, _08156DC0 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldrb r0, [r4, 0xC]
ldr r1, _08156DC4 @ =gUnknown_3004FE0
lsls r0, 2
@@ -1614,7 +1614,7 @@ sub_8156D80: @ 8156D80
ldr r1, _08156DC8 @ =sub_8156EE8
str r1, [r0]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -1630,7 +1630,7 @@ sub_8156DCC: @ 8156DCC
push {r4-r6,lr}
ldr r4, _08156E2C @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08156E3C
@@ -1653,7 +1653,7 @@ sub_8156DCC: @ 8156DCC
ldrb r0, [r2, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r4]
adds r0, r5
ldrb r1, [r0]
@@ -1661,12 +1661,12 @@ sub_8156DCC: @ 8156DCC
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
ldr r1, _08156E38 @ =gUnknown_3004FF0
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8157084
b _08156E66
.align 2, 0
@@ -1692,7 +1692,7 @@ _08156E3C:
ldr r0, _08156E74 @ =gUnknown_3004FF0
adds r0, r3, r0
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8157084
_08156E66:
pop {r4-r6}
@@ -1721,7 +1721,7 @@ sub_8156E78: @ 8156E78
ldrb r0, [r5]
adds r0, r6
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
lsls r4, 16
asrs r1, r4, 16
movs r0, 0x1
@@ -1747,7 +1747,7 @@ _08156EC0:
muls r0, r2
ldr r2, _08156EE4 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
bl sub_8157084
_08156EDA:
pop {r4-r6}
@@ -1861,7 +1861,7 @@ sub_8156F7C: @ 8156F7C
lsls r0, 2
ldr r4, _08156FE4 @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -1869,12 +1869,12 @@ sub_8156F7C: @ 8156F7C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _08156FE8 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8157084
_08156FD0:
pop {r4-r6}
@@ -1986,7 +1986,7 @@ sub_8157084: @ 8157084
ands r0, r1
cmp r0, 0
beq _081570D8
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -2102,7 +2102,7 @@ _08157186:
lsrs r1, 16
movs r0, 0x1
mov r2, sp
- bl sub_800E708
+ bl EmitDataTransfer
bl sub_8157084
add sp, 0x100
pop {r4-r6}
@@ -2124,7 +2124,7 @@ sub_81571A0: @ 81571A0
movs r4, 0
ldr r0, _081571CC @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _081571D4
@@ -2229,12 +2229,12 @@ _0815720C:
_081572FC:
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r0, r6, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2E]
movs r4, 0
@@ -2262,12 +2262,12 @@ _0815733E:
adds r1, r4, 0
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r1, r4, 0
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r8
adds r1, r2, r4
strb r0, [r1]
@@ -2277,21 +2277,21 @@ _0815733E:
ble _0815733E
adds r0, r6, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
mov r2, r10
strb r0, [r2]
adds r0, r6, 0
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x44]
adds r0, r6, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r4, 0x1F
ands r0, r4
@@ -2303,7 +2303,7 @@ _0815733E:
strb r1, [r3, 0x14]
adds r0, r6, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r5, 0x1F
ands r0, r5
@@ -2315,7 +2315,7 @@ _0815733E:
strh r1, [r3, 0x14]
adds r0, r6, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r4
lsls r0, 2
@@ -2327,7 +2327,7 @@ _0815733E:
strb r1, [r3, 0x15]
adds r0, r6, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -2338,7 +2338,7 @@ _0815733E:
str r0, [sp, 0x14]
adds r0, r6, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r5
lsls r0, 4
@@ -2349,7 +2349,7 @@ _0815733E:
strh r1, [r3, 0x16]
adds r0, r6, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
ands r0, r4
lsls r0, 1
@@ -2361,55 +2361,55 @@ _0815733E:
strb r1, [r3, 0x17]
adds r0, r6, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x48]
adds r0, r6, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4C]
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x7C]
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x28]
adds r0, r6, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2C]
adds r0, r6, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x2]
adds r0, r6, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x4]
adds r0, r6, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x6]
adds r0, r6, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0x8]
adds r0, r6, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
movs r1, 0x1
ands r0, r1
@@ -2422,7 +2422,7 @@ _0815733E:
strb r1, [r3, 0x17]
adds r0, r6, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
mov r3, sp
lsls r0, 7
ldrb r2, [r3, 0x17]
@@ -2432,19 +2432,19 @@ _0815733E:
strb r1, [r3, 0x17]
adds r0, r6, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x54]
adds r0, r6, 0
movs r1, 0x2
ldr r2, [sp, 0x88]
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x80]
ldr r1, [sp, 0x88]
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r6, 0
movs r1, 0x7
ldr r2, [sp, 0x84]
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
movs r4, 0
_081574EC:
@@ -2479,12 +2479,12 @@ _08157520:
adds r1, r4, 0
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r1, r4, 0
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
adds r1, r2, r4
strb r0, [r1]
@@ -2494,7 +2494,7 @@ _08157520:
ble _08157520
adds r0, r6, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strb r0, [r1, 0xC]
mov r2, r8
@@ -2523,7 +2523,7 @@ _08157576:
adds r1, r4, 0
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r4
strb r0, [r1]
adds r4, 0x1
@@ -2531,7 +2531,7 @@ _08157576:
ble _08157576
adds r0, r6, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r4
strb r0, [r1]
adds r4, 0x1
@@ -2553,7 +2553,7 @@ _081575B0:
adds r0, r6, 0
movs r1, 0x19
_081575B4:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2619,27 +2619,27 @@ _08157616:
_0815761C:
adds r0, r6, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r0, r6, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x1]
adds r0, r6, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x2]
adds r0, r6, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x3]
adds r0, r6, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x4]
adds r0, r6, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7, 0x5]
movs r4, 0x6
b _0815773C
@@ -2679,7 +2679,7 @@ _0815768C:
adds r0, r6, 0
movs r1, 0x37
_08157690:
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
strb r1, [r7]
movs r0, 0xFF
@@ -2728,7 +2728,7 @@ _081576DE:
adds r0, r6, 0
movs r1, 0x3F
_081576E2:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
strb r0, [r7]
@@ -2780,7 +2780,7 @@ _08157730:
adds r0, r6, 0
movs r1, 0x36
_08157734:
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
movs r4, 0x1
_0815773C:
@@ -2798,7 +2798,7 @@ _0815773C:
thumb_func_start sub_8157750
sub_8157750: @ 8157750
push {lr}
- bl sub_80313B0
+ bl PlayerHandleGetRawMonData
pop {r0}
bx r0
thumb_func_end sub_8157750
@@ -2865,7 +2865,7 @@ sub_81577B4: @ 81577B4
ldr r1, _081577E8 @ =gUnknown_2022BC7
adds r5, r2, r1
mov r8, r5
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _081577F0
@@ -3865,7 +3865,7 @@ _0815809A:
muls r0, r2
ldr r2, _081580D0 @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
add sp, 0x30
pop {r3-r5}
mov r8, r3
@@ -3908,7 +3908,7 @@ sub_81580E0: @ 81580E0
mov r10, r2
add r0, r10
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
@@ -3920,14 +3920,14 @@ sub_81580E0: @ 81580E0
ldrh r0, [r0]
muls r0, r7
add r0, r10
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
ldrb r0, [r6]
bl sub_80748A8
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3949,7 +3949,7 @@ sub_81580E0: @ 81580E0
mov r0, r9
adds r1, r4, 0
adds r2, r5, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08158224 @ =gUnknown_2023D44
ldrb r1, [r6]
adds r1, r4
@@ -4004,7 +4004,7 @@ sub_81580E0: @ 81580E0
ldr r1, _08158230 @ =gUnknown_2024024
adds r2, r1
ldrb r1, [r2]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r4, [r6]
lsls r0, r4, 1
ldr r2, _08158218 @ =gUnknown_2023BCE
@@ -4013,12 +4013,12 @@ sub_81580E0: @ 81580E0
muls r0, r7
add r0, r10
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
ldr r1, _08158234 @ =gUnknown_3004FE0
ldrb r0, [r6]
lsls r0, 2
@@ -4056,7 +4056,7 @@ sub_815823C: @ 815823C
adds r2, r4, 0x2
adds r1, r2
ldrb r1, [r1]
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
ldr r2, _081582A8 @ =gUnknown_2023BCE
ldrb r0, [r5]
lsls r1, r0, 1
@@ -4121,7 +4121,7 @@ sub_81582C0: @ 81582C0
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r0, _081582F4 @ =gUnknown_3004FE0
ldrb r1, [r6]
lsls r1, 2
@@ -4143,7 +4143,7 @@ _081582FC:
lsls r0, 2
ldr r4, _0815833C @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldrb r0, [r6]
adds r0, r5
ldrb r1, [r0]
@@ -4151,12 +4151,12 @@ _081582FC:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, _08158340 @ =gUnknown_3004FF0
ldrb r0, [r6]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
bl sub_8157084
_08158332:
pop {r4-r6}
@@ -4175,7 +4175,7 @@ sub_8158344: @ 8158344
push {r7}
ldr r7, _081583D8 @ =gUnknown_2023BC4
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _081583F0
@@ -4183,7 +4183,7 @@ sub_8158344: @ 8158344
movs r0, 0x4
bl sub_8034750
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4201,7 +4201,7 @@ sub_8158344: @ 8158344
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _081583E4 @ =gUnknown_2023D44
ldrb r1, [r7]
adds r1, r5
@@ -4251,7 +4251,7 @@ _081583F0:
movs r0, 0x84
bl sub_80346C4
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4280,7 +4280,7 @@ _081583F0:
adds r0, r5, 0
movs r1, 0xB0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _08158518 @ =gUnknown_2023D44
ldrb r1, [r7]
adds r1, r5
@@ -4309,7 +4309,7 @@ _081583F0:
lsls r6, r1, 3
adds r0, r6
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
ldrb r1, [r7]
adds r1, r5
ldrb r1, [r1]
@@ -4337,7 +4337,7 @@ _081583F0:
ldr r0, _08158528 @ =gUnknown_823957C
adds r0, r6
ldrh r0, [r0, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
ldrb r1, [r7]
adds r1, r5
ldrb r2, [r1]
@@ -4408,7 +4408,7 @@ sub_8158544: @ 8158544
movs r0, 0x4
bl sub_8034750
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4426,7 +4426,7 @@ sub_8158544: @ 8158544
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _081585F8 @ =gUnknown_2023D44
ldrb r1, [r4]
adds r1, r6
@@ -4528,7 +4528,7 @@ sub_815861C: @ 815861C
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08158650:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4554,7 +4554,7 @@ _08158670:
bne _0815872A
strb r0, [r3, 0x4]
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -4568,11 +4568,11 @@ _08158670:
muls r0, r2
ldr r2, _081586EC @ =gUnknown_2024284
adds r0, r2
- bl sub_8035244
+ bl HandleLowHpMusicChange
movs r1, 0x40
negs r1, r1
movs r0, 0x10
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _081586F0 @ =gUnknown_202063C
ldr r3, _081586F4 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -4611,7 +4611,7 @@ _081586F8: .4byte sub_8012110
_081586FC:
movs r0, 0x10
movs r1, 0x3F
- bl sub_80722F4
+ bl PlaySE12WithPanning
ldr r2, _08158730 @ =gUnknown_202063C
ldr r1, _08158734 @ =gUnknown_2023D44
ldrb r0, [r5]
@@ -4667,14 +4667,14 @@ sub_8158754: @ 8158754
ldr r5, _0815879C @ =gUnknown_2023BC4
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x3
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _081587A0 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -4711,14 +4711,14 @@ sub_81587A8: @ 81587A8
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x3
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _08158800 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -4844,7 +4844,7 @@ sub_8158814: @ 8158814
ldr r2, [r2]
str r2, [r1]
ldrb r1, [r5]
- bl sub_80342A0
+ bl IsMoveWithoutAnimation
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -4945,7 +4945,7 @@ _08158996:
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x5
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_081589B2:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5000,7 +5000,7 @@ _081589F0:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
_08158A24:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5023,7 +5023,7 @@ _08158A40:
lsrs r4, r0, 24
cmp r4, 0
bne _08158A7C
- bl sub_8034B40
+ bl CopyAllBattleSpritesInvisibilities
ldrb r0, [r6]
lsls r2, r0, 9
mov r3, r9
@@ -5033,7 +5033,7 @@ _08158A40:
ldrb r2, [r2]
lsls r2, 8
orrs r1, r2
- bl sub_8035200
+ bl TrySetBehindSubstituteSpriteBit
ldr r0, [r7]
ldrb r1, [r6]
ldr r2, [r0, 0x4]
@@ -5109,7 +5109,7 @@ sub_8158AFC: @ 8158AFC
push {lr}
ldr r0, _08158B14 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08158B18
@@ -5127,7 +5127,7 @@ _08158B1C:
thumb_func_start sub_8158B20
sub_8158B20: @ 8158B20
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -5160,7 +5160,7 @@ sub_8158B60: @ 8158B60
push {r4,lr}
ldr r4, _08158BBC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08158BDC
@@ -5233,7 +5233,7 @@ sub_8158BF8: @ 8158BF8
thumb_func_start sub_8158C04
sub_8158C04: @ 8158C04
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -5268,7 +5268,7 @@ sub_8158C48: @ 8158C48
push {r4,lr}
ldr r4, _08158C68 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08158C74
@@ -5309,7 +5309,7 @@ sub_8158C90: @ 8158C90
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08158CDC @ =gUnknown_3004FE0
ldr r2, _08158CE0 @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -5354,7 +5354,7 @@ sub_8158CF4: @ 8158CF4
sub sp, 0x4
ldr r0, _08158DA4 @ =nullsub_43
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
ldr r3, _08158DA8 @ =gUnknown_3004FFC
ldr r4, _08158DAC @ =gUnknown_2023BC4
ldrb r1, [r4]
@@ -5421,7 +5421,7 @@ _08158D60:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08158DC0 @ =gUnknown_3004FE0
ldr r2, _08158DAC @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -5463,7 +5463,7 @@ sub_8158DD8: @ 8158DD8
sub sp, 0x4
ldr r4, _08158DFC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08158E08
@@ -5492,7 +5492,7 @@ _08158E08:
_08158E18:
adds r5, r1, r0
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
ldr r3, _08158E70 @ =gUnknown_2022BC4
ldr r7, _08158E74 @ =gUnknown_2023BC4
ldrb r1, [r7]
@@ -5512,11 +5512,11 @@ _08158E18:
beq _08158E80
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
ldrb r0, [r7]
ldr r1, _08158E7C @ =gUnknown_3004FF0
@@ -5524,7 +5524,7 @@ _08158E18:
ldrb r1, [r1]
str r6, [sp]
adds r2, r4, 0
- bl sub_8048150
+ bl SetBattleBarStruct
b _08158EA8
.align 2, 0
_08158E68: .4byte gUnknown_2023BCE
@@ -5536,7 +5536,7 @@ _08158E7C: .4byte gUnknown_3004FF0
_08158E80:
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
ldrb r0, [r7]
ldr r4, _08158EC0 @ =gUnknown_3004FF0
@@ -5544,7 +5544,7 @@ _08158E80:
ldrb r1, [r1]
str r6, [sp]
movs r3, 0
- bl sub_8048150
+ bl SetBattleBarStruct
ldrb r0, [r7]
adds r0, r4
ldrb r0, [r0]
@@ -5587,7 +5587,7 @@ sub_8158ED0: @ 8158ED0
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _08158F08
bl sub_8157084
@@ -5598,10 +5598,10 @@ _08158F00: .4byte gUnknown_2023BC4
_08158F04: .4byte gUnknown_2024284
_08158F08:
movs r0, 0x1
- bl sub_8034964
+ bl LoadBattleBarGfx
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldrb r1, [r6]
lsls r1, 9
adds r0, r5, 0x2
@@ -5614,7 +5614,7 @@ _08158F08:
orrs r4, r0
ldr r0, _08158F5C @ =sub_81568DC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08158F60 @ =gUnknown_3005090
@@ -5648,12 +5648,12 @@ sub_8158F6C: @ 8158F6C
push {r4,lr}
ldr r4, _08158F9C @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08158FF2
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08158FA8
@@ -5688,7 +5688,7 @@ _08158FB8:
ldrb r0, [r0]
adds r1, r2, 0
movs r2, 0x9
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r2, [r4]
ldr r0, _08159008 @ =gUnknown_2024018
ldr r0, [r0]
@@ -5727,7 +5727,7 @@ sub_8159014: @ 8159014
push {r4,r5,lr}
ldr r5, _0815906C @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80342A4
+ bl mplay_80342A4
lsls r0, 24
cmp r0, 0
bne _08159064
@@ -5755,7 +5755,7 @@ sub_8159014: @ 8159014
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
- bl sub_8033F1C
+ bl InitAndLaunchChosenStatusAnimation
ldr r1, _08159074 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
@@ -5779,7 +5779,7 @@ sub_815907C: @ 815907C
sub sp, 0x4
ldr r4, _081590A0 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _081590AC
@@ -5809,7 +5809,7 @@ _081590BC:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _081590F8 @ =gUnknown_2022BC4
ldr r1, _081590FC @ =gUnknown_2023BC4
ldrb r1, [r1]
@@ -5970,7 +5970,7 @@ _081591C4:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
- bl sub_804BE70
+ bl DoHitAnimHealthboxEffect
ldr r1, _081591F8 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -6034,7 +6034,7 @@ sub_815923C: @ 815923C
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
+ bl PlayFanfare
bl sub_8157084
pop {r0}
bx r0
@@ -6048,7 +6048,7 @@ sub_815926C: @ 815926C
push {r4,lr}
ldr r4, _08159290 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0815929C
@@ -6077,11 +6077,11 @@ _0815929C:
_081592AC:
adds r0, r1, r0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
- bl sub_8071DF0
+ bl PlayCry1
bl sub_8157084
pop {r4}
pop {r0}
@@ -6129,7 +6129,7 @@ sub_8159304: @ 8159304
lsls r0, 2
ldr r5, _08159444 @ =gUnknown_202063C
adds r0, r5
- bl sub_80750FC
+ bl oamt_add_pos2_onto_pos1
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6184,7 +6184,7 @@ sub_8159304: @ 8159304
lsls r0, 2
adds r0, r5
ldr r1, _08159450 @ =sub_80335F8
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldrb r0, [r7]
adds r0, r6
ldrb r1, [r0]
@@ -6193,9 +6193,9 @@ sub_8159304: @ 8159304
lsls r0, 2
adds r0, r5
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _08159454 @ =0x0000d6f8
- bl sub_80089B8
+ bl AllocSpritePalette
adds r4, r0, 0
lsls r4, 24
ldr r0, _08159458 @ =gUnknown_8239FD4
@@ -6205,7 +6205,7 @@ sub_8159304: @ 8159304
lsls r2, 1
adds r1, r4, r2
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldrb r0, [r7]
adds r0, r6
ldrb r0, [r0]
@@ -6220,7 +6220,7 @@ sub_8159304: @ 8159304
strb r0, [r1, 0x5]
ldr r0, _0815945C @ =sub_81595EC
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r4, _08159460 @ =gUnknown_3005090
@@ -6318,20 +6318,20 @@ sub_8159478: @ 8159478
ldr r1, _081595CC @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
ldr r0, _081595D0 @ =sub_8033E3C
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
ldr r1, _081595D4 @ =gUnknown_3004FFC
mov r9, r1
add r9, r6
mov r1, r9
strb r0, [r1]
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -6358,7 +6358,7 @@ sub_8159478: @ 8159478
mov r0, r10
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _081595DC @ =gUnknown_2023D44
adds r4, r6, r4
strb r0, [r4]
@@ -6403,7 +6403,7 @@ sub_8159478: @ 8159478
ldr r1, _081595E4 @ =gUnknown_2024024
adds r6, r1
ldrb r1, [r6]
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r4]
lsls r0, r1, 4
adds r0, r1
@@ -6425,7 +6425,7 @@ sub_8159478: @ 8159478
str r1, [r0]
movs r0, 0
movs r1, 0xFF
- bl sub_804A938
+ bl DoPokeballSendOutAnimation
mov r1, r9
ldrb r2, [r1]
lsls r1, r2, 4
@@ -6501,7 +6501,7 @@ _08159610:
str r1, [r0]
strb r5, [r4]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_08159646:
pop {r4-r6}
pop {r0}
@@ -6527,7 +6527,7 @@ sub_8159660: @ 8159660
cmp r0, 0
beq _08159690
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08159690
@@ -6591,10 +6591,10 @@ sub_81596F0: @ 81596F0
ldr r4, _08159710 @ =gUnknown_2023BC4
ldrb r0, [r4]
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
bl sub_8157084
pop {r4}
pop {r0}
@@ -6633,7 +6633,7 @@ sub_8159720: @ 8159720
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _08159760
@@ -6675,10 +6675,10 @@ sub_815977C: @ 815977C
bgt _081597A4
adds r0, r2, 0
movs r1, 0x1
- bl sub_8012258
+ bl dp11b_obj_free
ldrb r0, [r4]
movs r1, 0
- bl sub_8012258
+ bl dp11b_obj_free
_081597A4:
bl sub_8157084
pop {r4}
@@ -6710,9 +6710,9 @@ sub_81597C4: @ 81597C4
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
+ bl BeginFastPaletteFade
bl sub_8157084
ldr r0, _08159814 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -6757,7 +6757,7 @@ sub_8159824: @ 8159824
ldr r7, [r0]
ldr r4, _081598BC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0815985C
@@ -6765,12 +6765,12 @@ sub_8159824: @ 8159824
movs r1, 0x1
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
ldrb r0, [r4]
movs r1, 0
movs r2, 0x7
movs r3, 0x1
- bl sub_8012138
+ bl dp11b_obj_instanciate
_0815985C:
ldr r6, _081598C0 @ =gUnknown_3005EE0
ldrb r2, [r4]
@@ -6786,7 +6786,7 @@ _0815985C:
cmp r0, r1
bne _0815992C
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08159888
@@ -6839,13 +6839,13 @@ _081598DA:
movs r1, 0x2
_081598DE:
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _081598F0
_081598E6:
movs r0, 0x1
movs r1, 0x3
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_081598F0:
bl sub_8157084
ldr r3, _08159924 @ =gUnknown_3005EE0
@@ -6956,7 +6956,7 @@ sub_8159998: @ 8159998
cmp r0, r4
bne _08159A48
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _081599DE
@@ -6984,7 +6984,7 @@ _081599DE:
orrs r2, r1
movs r0, 0x1
movs r1, 0xA
- bl sub_800E848
+ bl EmitTwoReturnValues
bl sub_8157084
ldrb r0, [r6]
lsls r0, 2
@@ -7296,7 +7296,7 @@ _08159C64:
movs r2, 0x8
movs r3, 0
_08159C90:
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08159C94:
ldr r1, _08159CAC @ =gUnknown_3005EE0
ldr r0, _08159CB0 @ =gUnknown_2023BC4
@@ -7327,9 +7327,9 @@ _08159CB4:
ldrb r0, [r0, 0x3]
cmp r0, 0xD
bne _08159CD8
- bl sub_8035314
+ bl BattleStopLowHpSound
ldr r0, _08159CFC @ =0x00000137
- bl sub_80722A0
+ bl PlayBGM
_08159CD8:
ldr r1, _08159D00 @ =gUnknown_2022976
ldrb r0, [r4]
@@ -7402,7 +7402,7 @@ _08159D62:
adds r5, 0x95
adds r4, 0x94
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -7531,7 +7531,7 @@ _08159E7A:
movs r2, 0x8
movs r3, 0
_08159E80:
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08159E84:
ldr r1, _08159E9C @ =gUnknown_3005EE0
ldr r0, _08159EA0 @ =gUnknown_2023BC4
@@ -7561,12 +7561,12 @@ _08159EA4:
ldrb r0, [r0, 0x3]
cmp r0, 0xD
bne _08159EC8
- bl sub_8035314
+ bl BattleStopLowHpSound
ldr r0, _08159EEC @ =0x00000137
- bl sub_80722A0
+ bl PlayBGM
_08159EC8:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
bl sub_80EF0E0
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index 8d88e7000..33b1db8ca 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -17,17 +17,17 @@ sub_80DD538: @ 80DD538
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _080DD550 @ =sub_80DD554
+ ldr r1, _080DD550 @ =SafariBufferRunCommand
str r1, [r0]
bx lr
.align 2, 0
_080DD548: .4byte gUnknown_3004FE0
_080DD54C: .4byte gUnknown_2023BC4
-_080DD550: .4byte sub_80DD554
+_080DD550: .4byte SafariBufferRunCommand
thumb_func_end sub_80DD538
- thumb_func_start sub_80DD554
-sub_80DD554: @ 80DD554
+ thumb_func_start SafariBufferRunCommand
+SafariBufferRunCommand: @ 80DD554
push {lr}
ldr r2, _080DD588 @ =gUnknown_2023BC8
ldr r1, _080DD58C @ =gUnknown_825E45C
@@ -60,14 +60,14 @@ _080DD590: .4byte gUnknown_2023BC4
_080DD594: .4byte gUnknown_2022BC4
_080DD598: .4byte gUnknown_83FED00
_080DD59C:
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD5A0:
pop {r0}
bx r0
- thumb_func_end sub_80DD554
+ thumb_func_end SafariBufferRunCommand
- thumb_func_start sub_80DD5A4
-sub_80DD5A4: @ 80DD5A4
+ thumb_func_start HandleInputChooseAction_0
+HandleInputChooseAction_0: @ 80DD5A4
push {r4,r5,lr}
ldr r0, _080DD5D4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -113,15 +113,15 @@ _080DD5F6:
movs r1, 0x7
_080DD5FA:
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
b _080DD60C
_080DD602:
movs r0, 0x1
movs r1, 0x8
movs r2, 0
- bl sub_800E848
+ bl EmitTwoReturnValues
_080DD60C:
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
b _080DD71A
_080DD612:
movs r0, 0x20
@@ -253,7 +253,7 @@ _080DD71A:
.align 2, 0
_080DD720: .4byte gUnknown_2023FF8
_080DD724: .4byte gUnknown_2023BC4
- thumb_func_end sub_80DD5A4
+ thumb_func_end HandleInputChooseAction_0
thumb_func_start sub_80DD728
sub_80DD728: @ 80DD728
@@ -273,7 +273,7 @@ sub_80DD728: @ 80DD728
ldr r0, _080DD75C @ =nullsub_8
cmp r1, r0
bne _080DD74C
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD74C:
pop {r0}
bx r0
@@ -284,19 +284,19 @@ _080DD758: .4byte gUnknown_2023BC4
_080DD75C: .4byte nullsub_8
thumb_func_end sub_80DD728
- thumb_func_start sub_80DD760
-sub_80DD760: @ 80DD760
+ thumb_func_start CompleteOnInactiveTextPrinter_3
+CompleteOnInactiveTextPrinter_3: @ 80DD760
push {lr}
movs r0, 0
bl sub_8002E64
lsls r0, 16
cmp r0, 0
bne _080DD772
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD772:
pop {r0}
bx r0
- thumb_func_end sub_80DD760
+ thumb_func_end CompleteOnInactiveTextPrinter_3
thumb_func_start sub_80DD778
sub_80DD778: @ 80DD778
@@ -316,7 +316,7 @@ sub_80DD778: @ 80DD778
ldr r0, _080DD7AC @ =nullsub_8
cmp r1, r0
bne _080DD79C
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD79C:
pop {r0}
bx r0
@@ -348,7 +348,7 @@ sub_80DD7B0: @ 80DD7B0
ldr r0, [r0]
str r0, [r2]
ldr r0, [r2, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080DD7DA:
pop {r0}
bx r0
@@ -359,8 +359,8 @@ _080DD7E8: .4byte 0x00000439
_080DD7EC: .4byte gUnknown_3004F80
thumb_func_end sub_80DD7B0
- thumb_func_start sub_80DD7F0
-sub_80DD7F0: @ 80DD7F0
+ thumb_func_start CompleteOnSpecialAnimDone_0
+CompleteOnSpecialAnimDone_0: @ 80DD7F0
push {lr}
ldr r0, _080DD820 @ =gUnknown_2024005
ldrb r0, [r0]
@@ -381,7 +381,7 @@ sub_80DD7F0: @ 80DD7F0
cmp r0, 0
bne _080DD81A
_080DD816:
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD81A:
pop {r0}
bx r0
@@ -389,7 +389,7 @@ _080DD81A:
_080DD820: .4byte gUnknown_2024005
_080DD824: .4byte gUnknown_2024018
_080DD828: .4byte gUnknown_2023BC4
- thumb_func_end sub_80DD7F0
+ thumb_func_end CompleteOnSpecialAnimDone_0
thumb_func_start sub_80DD82C
sub_80DD82C: @ 80DD82C
@@ -405,7 +405,7 @@ sub_80DD82C: @ 80DD82C
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _080DD858 @ =sub_80DD85C
+ ldr r1, _080DD858 @ =CompleteWhenChosePokeblock
str r1, [r0]
_080DD848:
pop {r0}
@@ -414,11 +414,11 @@ _080DD848:
_080DD84C: .4byte gUnknown_2037AB8
_080DD850: .4byte gUnknown_3004FE0
_080DD854: .4byte gUnknown_2023BC4
-_080DD858: .4byte sub_80DD85C
+_080DD858: .4byte CompleteWhenChosePokeblock
thumb_func_end sub_80DD82C
- thumb_func_start sub_80DD85C
-sub_80DD85C: @ 80DD85C
+ thumb_func_start CompleteWhenChosePokeblock
+CompleteWhenChosePokeblock: @ 80DD85C
push {lr}
ldr r0, _080DD888 @ =gUnknown_30030F0
ldr r1, [r0, 0x4]
@@ -434,8 +434,8 @@ sub_80DD85C: @ 80DD85C
ldr r0, _080DD894 @ =gUnknown_203AD30
ldrh r1, [r0]
movs r0, 0x1
- bl sub_800E8AC
- bl sub_80DD8C8
+ bl EmitOneReturnValue
+ bl SafariBufferExecCompleted
_080DD882:
pop {r0}
bx r0
@@ -444,10 +444,10 @@ _080DD888: .4byte gUnknown_30030F0
_080DD88C: .4byte sub_8011100
_080DD890: .4byte gUnknown_2037AB8
_080DD894: .4byte gUnknown_203AD30
- thumb_func_end sub_80DD85C
+ thumb_func_end CompleteWhenChosePokeblock
- thumb_func_start sub_80DD898
-sub_80DD898: @ 80DD898
+ thumb_func_start CompleteOnFinishedBattleAnimation_3
+CompleteOnFinishedBattleAnimation_3: @ 80DD898
push {lr}
ldr r0, _080DD8C0 @ =gUnknown_2024018
ldr r2, [r0]
@@ -463,17 +463,17 @@ sub_80DD898: @ 80DD898
ands r0, r1
cmp r0, 0
bne _080DD8BA
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD8BA:
pop {r0}
bx r0
.align 2, 0
_080DD8C0: .4byte gUnknown_2024018
_080DD8C4: .4byte gUnknown_2023BC4
- thumb_func_end sub_80DD898
+ thumb_func_end CompleteOnFinishedBattleAnimation_3
- thumb_func_start sub_80DD8C8
-sub_80DD8C8: @ 80DD8C8
+ thumb_func_start SafariBufferExecCompleted
+SafariBufferExecCompleted: @ 80DD8C8
push {r4,lr}
sub sp, 0x4
ldr r1, _080DD908 @ =gUnknown_3004FE0
@@ -481,7 +481,7 @@ sub_80DD8C8: @ 80DD8C8
ldrb r0, [r4]
lsls r0, 2
adds r0, r1
- ldr r1, _080DD910 @ =sub_80DD554
+ ldr r1, _080DD910 @ =SafariBufferRunCommand
str r1, [r0]
ldr r0, _080DD914 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -489,7 +489,7 @@ sub_80DD8C8: @ 80DD8C8
ands r0, r1
cmp r0, 0
beq _080DD91C
- bl sub_800A404
+ bl GetMultiplayerId
mov r1, sp
strb r0, [r1]
movs r0, 0x2
@@ -506,7 +506,7 @@ sub_80DD8C8: @ 80DD8C8
.align 2, 0
_080DD908: .4byte gUnknown_3004FE0
_080DD90C: .4byte gUnknown_2023BC4
-_080DD910: .4byte sub_80DD554
+_080DD910: .4byte SafariBufferRunCommand
_080DD914: .4byte gUnknown_2022B4C
_080DD918: .4byte gUnknown_2022BC4
_080DD91C:
@@ -527,10 +527,10 @@ _080DD92E:
.align 2, 0
_080DD938: .4byte gUnknown_2023BC8
_080DD93C: .4byte gUnknown_825E45C
- thumb_func_end sub_80DD8C8
+ thumb_func_end SafariBufferExecCompleted
- thumb_func_start sub_80DD940
-sub_80DD940: @ 80DD940
+ thumb_func_start CompleteOnFinishedStatusAnimation_3
+CompleteOnFinishedStatusAnimation_3: @ 80DD940
push {lr}
ldr r0, _080DD968 @ =gUnknown_2024018
ldr r2, [r0]
@@ -546,19 +546,19 @@ sub_80DD940: @ 80DD940
ands r0, r1
cmp r0, 0
bne _080DD962
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DD962:
pop {r0}
bx r0
.align 2, 0
_080DD968: .4byte gUnknown_2024018
_080DD96C: .4byte gUnknown_2023BC4
- thumb_func_end sub_80DD940
+ thumb_func_end CompleteOnFinishedStatusAnimation_3
thumb_func_start sub_80DD970
sub_80DD970: @ 80DD970
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD970
@@ -566,7 +566,7 @@ sub_80DD970: @ 80DD970
thumb_func_start sub_80DD97C
sub_80DD97C: @ 80DD97C
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD97C
@@ -574,7 +574,7 @@ sub_80DD97C: @ 80DD97C
thumb_func_start sub_80DD988
sub_80DD988: @ 80DD988
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD988
@@ -582,7 +582,7 @@ sub_80DD988: @ 80DD988
thumb_func_start sub_80DD994
sub_80DD994: @ 80DD994
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD994
@@ -590,7 +590,7 @@ sub_80DD994: @ 80DD994
thumb_func_start sub_80DD9A0
sub_80DD9A0: @ 80DD9A0
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD9A0
@@ -598,7 +598,7 @@ sub_80DD9A0: @ 80DD9A0
thumb_func_start sub_80DD9AC
sub_80DD9AC: @ 80DD9AC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD9AC
@@ -606,13 +606,13 @@ sub_80DD9AC: @ 80DD9AC
thumb_func_start sub_80DD9B8
sub_80DD9B8: @ 80DD9B8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DD9B8
- thumb_func_start sub_80DD9C4
-sub_80DD9C4: @ 80DD9C4
+ thumb_func_start SafariHandleDrawTrainerPic
+SafariHandleDrawTrainerPic: @ 80DD9C4
push {r4-r6,lr}
ldr r4, _080DDA7C @ =gUnknown_300500C
ldr r0, [r4]
@@ -623,7 +623,7 @@ sub_80DD9C4: @ 80DD9C4
ldr r0, [r4]
ldrb r6, [r0, 0x8]
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -645,7 +645,7 @@ sub_80DD9C4: @ 80DD9C4
asrs r2, 16
movs r1, 0x50
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _080DDA8C @ =gUnknown_2023D44
ldrb r1, [r5]
adds r1, r6
@@ -712,12 +712,12 @@ _080DDA94: .4byte 0x0000fffe
_080DDA98: .4byte sub_8033EEC
_080DDA9C: .4byte gUnknown_3004FE0
_080DDAA0: .4byte sub_80DD728
- thumb_func_end sub_80DD9C4
+ thumb_func_end SafariHandleDrawTrainerPic
thumb_func_start sub_80DDAA4
sub_80DDAA4: @ 80DDAA4
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDAA4
@@ -725,7 +725,7 @@ sub_80DDAA4: @ 80DDAA4
thumb_func_start sub_80DDAB0
sub_80DDAB0: @ 80DDAB0
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDAB0
@@ -733,7 +733,7 @@ sub_80DDAB0: @ 80DDAB0
thumb_func_start sub_80DDABC
sub_80DDABC: @ 80DDABC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDABC
@@ -741,7 +741,7 @@ sub_80DDABC: @ 80DDABC
thumb_func_start sub_80DDAC8
sub_80DDAC8: @ 80DDAC8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDAC8
@@ -760,19 +760,19 @@ sub_80DDAD4: @ 80DDAD4
ldr r5, _080DDB1C @ =gUnknown_2023BC4
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080DDB20 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _080DDB24 @ =sub_80DD7F0
+ ldr r1, _080DDB24 @ =CompleteOnSpecialAnimDone_0
str r1, [r0]
pop {r4,r5}
pop {r0}
@@ -782,7 +782,7 @@ _080DDB14: .4byte gUnknown_2024018
_080DDB18: .4byte gUnknown_2024005
_080DDB1C: .4byte gUnknown_2023BC4
_080DDB20: .4byte gUnknown_3004FE0
-_080DDB24: .4byte sub_80DD7F0
+_080DDB24: .4byte CompleteOnSpecialAnimDone_0
thumb_func_end sub_80DDAD4
thumb_func_start sub_80DDB28
@@ -804,19 +804,19 @@ sub_80DDB28: @ 80DDB28
strb r0, [r1]
ldrb r4, [r5]
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
- bl sub_80341D8
+ bl InitAndLaunchSpecialAnimation
ldr r1, _080DDB80 @ =gUnknown_3004FE0
ldrb r0, [r5]
lsls r0, 2
adds r0, r1
- ldr r1, _080DDB84 @ =sub_80DD7F0
+ ldr r1, _080DDB84 @ =CompleteOnSpecialAnimDone_0
str r1, [r0]
pop {r4,r5}
pop {r0}
@@ -827,13 +827,13 @@ _080DDB74: .4byte gUnknown_2023BC4
_080DDB78: .4byte gUnknown_2024018
_080DDB7C: .4byte gUnknown_2024005
_080DDB80: .4byte gUnknown_3004FE0
-_080DDB84: .4byte sub_80DD7F0
+_080DDB84: .4byte CompleteOnSpecialAnimDone_0
thumb_func_end sub_80DDB28
thumb_func_start sub_80DDB88
sub_80DDB88: @ 80DDB88
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDB88
@@ -841,7 +841,7 @@ sub_80DDB88: @ 80DDB88
thumb_func_start sub_80DDB94
sub_80DDB94: @ 80DDB94
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDB94
@@ -886,7 +886,7 @@ _080DDBF0:
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _080DDC10 @ =sub_80DD760
+ ldr r1, _080DDC10 @ =CompleteOnInactiveTextPrinter_3
str r1, [r0]
pop {r4}
pop {r0}
@@ -895,7 +895,7 @@ _080DDBF0:
_080DDC04: .4byte gUnknown_202298C
_080DDC08: .4byte gUnknown_3004FE0
_080DDC0C: .4byte gUnknown_2023BC4
-_080DDC10: .4byte sub_80DD760
+_080DDC10: .4byte CompleteOnInactiveTextPrinter_3
thumb_func_end sub_80DDBA0
thumb_func_start sub_80DDC14
@@ -903,7 +903,7 @@ sub_80DDC14: @ 80DDC14
push {lr}
ldr r0, _080DDC2C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080DDC30
@@ -912,7 +912,7 @@ sub_80DDC14: @ 80DDC14
.align 2, 0
_080DDC2C: .4byte gUnknown_2023BC4
_080DDC30:
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
_080DDC34:
pop {r0}
bx r0
@@ -921,7 +921,7 @@ _080DDC34:
thumb_func_start sub_80DDC38
sub_80DDC38: @ 80DDC38
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -936,7 +936,7 @@ sub_80DDC38: @ 80DDC38
ldrb r0, [r0]
lsls r0, 2
adds r0, r1
- ldr r1, _080DDC74 @ =sub_80DD5A4
+ ldr r1, _080DDC74 @ =HandleInputChooseAction_0
str r1, [r0]
_080DDC5E:
pop {r0}
@@ -946,7 +946,7 @@ _080DDC64: .4byte gUnknown_2022974
_080DDC68: .4byte gUnknown_2022976
_080DDC6C: .4byte gUnknown_3004FE0
_080DDC70: .4byte gUnknown_2023BC4
-_080DDC74: .4byte sub_80DD5A4
+_080DDC74: .4byte HandleInputChooseAction_0
thumb_func_end sub_80DDC38
thumb_func_start sub_80DDC78
@@ -1002,7 +1002,7 @@ _080DDCE8: .4byte gUnknown_202298C
thumb_func_start sub_80DDCEC
sub_80DDCEC: @ 80DDCEC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDCEC
@@ -1010,7 +1010,7 @@ sub_80DDCEC: @ 80DDCEC
thumb_func_start sub_80DDCF8
sub_80DDCF8: @ 80DDCF8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDCF8
@@ -1025,7 +1025,7 @@ sub_80DDD04: @ 80DDD04
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080DDD34 @ =gUnknown_3004FE0
ldr r2, _080DDD38 @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -1049,7 +1049,7 @@ _080DDD40: .4byte gUnknown_2024004
thumb_func_start sub_80DDD44
sub_80DDD44: @ 80DDD44
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDD44
@@ -1057,7 +1057,7 @@ sub_80DDD44: @ 80DDD44
thumb_func_start sub_80DDD50
sub_80DDD50: @ 80DDD50
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDD50
@@ -1065,7 +1065,7 @@ sub_80DDD50: @ 80DDD50
thumb_func_start sub_80DDD5C
sub_80DDD5C: @ 80DDD5C
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDD5C
@@ -1073,7 +1073,7 @@ sub_80DDD5C: @ 80DDD5C
thumb_func_start sub_80DDD68
sub_80DDD68: @ 80DDD68
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDD68
@@ -1095,8 +1095,8 @@ sub_80DDD74: @ 80DDD74
ldr r2, _080DDDAC @ =gUnknown_2024284
adds r1, r2
movs r2, 0xB
- bl sub_8049D98
- bl sub_80DD8C8
+ bl UpdateHealthboxAttribute
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -1109,7 +1109,7 @@ _080DDDAC: .4byte gUnknown_2024284
thumb_func_start sub_80DDDB0
sub_80DDDB0: @ 80DDDB0
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDB0
@@ -1117,7 +1117,7 @@ sub_80DDDB0: @ 80DDDB0
thumb_func_start sub_80DDDBC
sub_80DDDBC: @ 80DDDBC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDBC
@@ -1125,7 +1125,7 @@ sub_80DDDBC: @ 80DDDBC
thumb_func_start sub_80DDDC8
sub_80DDDC8: @ 80DDDC8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDC8
@@ -1133,7 +1133,7 @@ sub_80DDDC8: @ 80DDDC8
thumb_func_start sub_80DDDD4
sub_80DDDD4: @ 80DDDD4
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDD4
@@ -1141,7 +1141,7 @@ sub_80DDDD4: @ 80DDDD4
thumb_func_start sub_80DDDE0
sub_80DDDE0: @ 80DDDE0
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDE0
@@ -1149,7 +1149,7 @@ sub_80DDDE0: @ 80DDDE0
thumb_func_start sub_80DDDEC
sub_80DDDEC: @ 80DDDEC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDEC
@@ -1157,7 +1157,7 @@ sub_80DDDEC: @ 80DDDEC
thumb_func_start sub_80DDDF8
sub_80DDDF8: @ 80DDDF8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDDF8
@@ -1165,7 +1165,7 @@ sub_80DDDF8: @ 80DDDF8
thumb_func_start sub_80DDE04
sub_80DDE04: @ 80DDE04
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE04
@@ -1173,7 +1173,7 @@ sub_80DDE04: @ 80DDE04
thumb_func_start sub_80DDE10
sub_80DDE10: @ 80DDE10
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE10
@@ -1181,7 +1181,7 @@ sub_80DDE10: @ 80DDE10
thumb_func_start sub_80DDE1C
sub_80DDE1C: @ 80DDE1C
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE1C
@@ -1189,7 +1189,7 @@ sub_80DDE1C: @ 80DDE1C
thumb_func_start sub_80DDE28
sub_80DDE28: @ 80DDE28
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE28
@@ -1197,7 +1197,7 @@ sub_80DDE28: @ 80DDE28
thumb_func_start sub_80DDE34
sub_80DDE34: @ 80DDE34
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE34
@@ -1205,7 +1205,7 @@ sub_80DDE34: @ 80DDE34
thumb_func_start sub_80DDE40
sub_80DDE40: @ 80DDE40
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE40
@@ -1213,7 +1213,7 @@ sub_80DDE40: @ 80DDE40
thumb_func_start sub_80DDE4C
sub_80DDE4C: @ 80DDE4C
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE4C
@@ -1221,7 +1221,7 @@ sub_80DDE4C: @ 80DDE4C
thumb_func_start sub_80DDE58
sub_80DDE58: @ 80DDE58
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE58
@@ -1229,7 +1229,7 @@ sub_80DDE58: @ 80DDE58
thumb_func_start sub_80DDE64
sub_80DDE64: @ 80DDE64
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDE64
@@ -1239,7 +1239,7 @@ sub_80DDE70: @ 80DDE70
push {r4,lr}
ldr r4, _080DDEAC @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
movs r3, 0x3F
cmp r0, 0
@@ -1259,8 +1259,8 @@ _080DDE84:
orrs r0, r1
lsls r1, r3, 24
asrs r1, 24
- bl sub_80722F4
- bl sub_80DD8C8
+ bl PlaySE12WithPanning
+ bl SafariBufferExecCompleted
pop {r4}
pop {r0}
bx r0
@@ -1284,8 +1284,8 @@ sub_80DDEB4: @ 80DDEB4
ldrb r1, [r1]
lsls r1, 8
orrs r0, r1
- bl sub_8071C60
- bl sub_80DD8C8
+ bl PlayFanfare
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
@@ -1293,8 +1293,8 @@ _080DDEDC: .4byte gUnknown_2022BC4
_080DDEE0: .4byte gUnknown_2023BC4
thumb_func_end sub_80DDEB4
- thumb_func_start sub_80DDEE4
-sub_80DDEE4: @ 80DDEE4
+ thumb_func_start SafariHandleFaintingCry
+SafariHandleFaintingCry: @ 80DDEE4
push {lr}
ldr r1, _080DDF14 @ =gUnknown_2023BCE
ldr r0, _080DDF18 @ =gUnknown_2023BC4
@@ -1307,22 +1307,22 @@ sub_80DDEE4: @ 80DDEE4
ldr r1, _080DDF1C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
- bl sub_8071DF0
- bl sub_80DD8C8
+ bl PlayCry1
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_080DDF14: .4byte gUnknown_2023BCE
_080DDF18: .4byte gUnknown_2023BC4
_080DDF1C: .4byte gUnknown_2024284
- thumb_func_end sub_80DDEE4
+ thumb_func_end SafariHandleFaintingCry
- thumb_func_start sub_80DDF20
-sub_80DDF20: @ 80DDF20
+ thumb_func_start SafariHandleIntroSlide
+SafariHandleIntroSlide: @ 80DDF20
push {lr}
ldr r1, _080DDF48 @ =gUnknown_2022BC4
ldr r0, _080DDF4C @ =gUnknown_2023BC4
@@ -1337,17 +1337,17 @@ sub_80DDF20: @ 80DDF20
movs r1, 0x1
orrs r0, r1
strh r0, [r2]
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
.align 2, 0
_080DDF48: .4byte gUnknown_2022BC4
_080DDF4C: .4byte gUnknown_2023BC4
_080DDF50: .4byte gUnknown_2023F4C
- thumb_func_end sub_80DDF20
+ thumb_func_end SafariHandleIntroSlide
- thumb_func_start sub_80DDF54
-sub_80DDF54: @ 80DDF54
+ thumb_func_start SafariHandleIntroTrainerBallThrow
+SafariHandleIntroTrainerBallThrow: @ 80DDF54
push {r4,r5,lr}
ldr r5, _080DDF98 @ =gUnknown_3004FF0
ldr r4, _080DDF9C @ =gUnknown_2023BC4
@@ -1363,13 +1363,13 @@ sub_80DDF54: @ 80DDF54
ldr r2, _080DDFA4 @ =gUnknown_2024284
adds r1, r2
movs r2, 0xA
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldrb r0, [r4]
bl sub_804BD94
ldrb r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
ldr r1, _080DDFA8 @ =gUnknown_3004FE0
ldrb r0, [r4]
lsls r0, 2
@@ -1386,12 +1386,12 @@ _080DDFA0: .4byte gUnknown_2023BCE
_080DDFA4: .4byte gUnknown_2024284
_080DDFA8: .4byte gUnknown_3004FE0
_080DDFAC: .4byte sub_80DD778
- thumb_func_end sub_80DDF54
+ thumb_func_end SafariHandleIntroTrainerBallThrow
thumb_func_start sub_80DDFB0
sub_80DDFB0: @ 80DDFB0
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDFB0
@@ -1399,7 +1399,7 @@ sub_80DDFB0: @ 80DDFB0
thumb_func_start sub_80DDFBC
sub_80DDFBC: @ 80DDFBC
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDFBC
@@ -1407,7 +1407,7 @@ sub_80DDFBC: @ 80DDFBC
thumb_func_start sub_80DDFC8
sub_80DDFC8: @ 80DDFC8
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDFC8
@@ -1415,13 +1415,13 @@ sub_80DDFC8: @ 80DDFC8
thumb_func_start sub_80DDFD4
sub_80DDFD4: @ 80DDFD4
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DDFD4
- thumb_func_start sub_80DDFE0
-sub_80DDFE0: @ 80DDFE0
+ thumb_func_start SafariHandleBattleAnimation
+SafariHandleBattleAnimation: @ 80DDFE0
push {r4-r6,lr}
sub sp, 0x4
ldr r5, _080DE018 @ =gUnknown_2022BC4
@@ -1442,11 +1442,11 @@ sub_80DDFE0: @ 80DDFE0
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
- bl sub_803401C
+ bl TryHandleLaunchBattleTableAnimation
lsls r0, 24
cmp r0, 0
beq _080DE020
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
b _080DE02C
.align 2, 0
_080DE018: .4byte gUnknown_2022BC4
@@ -1456,7 +1456,7 @@ _080DE020:
ldrb r1, [r6]
lsls r1, 2
adds r1, r0
- ldr r0, _080DE038 @ =sub_80DD898
+ ldr r0, _080DE038 @ =CompleteOnFinishedBattleAnimation_3
str r0, [r1]
_080DE02C:
add sp, 0x4
@@ -1465,13 +1465,13 @@ _080DE02C:
bx r0
.align 2, 0
_080DE034: .4byte gUnknown_3004FE0
-_080DE038: .4byte sub_80DD898
- thumb_func_end sub_80DDFE0
+_080DE038: .4byte CompleteOnFinishedBattleAnimation_3
+ thumb_func_end SafariHandleBattleAnimation
thumb_func_start sub_80DE03C
sub_80DE03C: @ 80DE03C
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DE03C
@@ -1479,13 +1479,13 @@ sub_80DE03C: @ 80DE03C
thumb_func_start sub_80DE048
sub_80DE048: @ 80DE048
push {lr}
- bl sub_80DD8C8
+ bl SafariBufferExecCompleted
pop {r0}
bx r0
thumb_func_end sub_80DE048
- thumb_func_start sub_80DE054
-sub_80DE054: @ 80DE054
+ thumb_func_start SafariHandleCmd55
+SafariHandleCmd55: @ 80DE054
push {r4,lr}
ldr r2, _080DE098 @ =gUnknown_2023E8A
ldr r1, _080DE09C @ =gUnknown_2022BC4
@@ -1497,10 +1497,10 @@ sub_80DE054: @ 80DE054
ldrb r0, [r0]
strb r0, [r2]
movs r0, 0x5
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x3
- bl sub_8070E44
- bl sub_80DD8C8
+ bl BeginFastPaletteFade
+ bl SafariBufferExecCompleted
ldr r0, _080DE0A4 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x6
@@ -1524,7 +1524,7 @@ _080DE0A0: .4byte gUnknown_2023BC4
_080DE0A4: .4byte gUnknown_2022B4C
_080DE0A8: .4byte gUnknown_3004FE0
_080DE0AC: .4byte sub_80DD7B0
- thumb_func_end sub_80DE054
+ thumb_func_end SafariHandleCmd55
thumb_func_start nullsub_80
nullsub_80: @ 80DE0B0
diff --git a/asm/battle_controllers.s b/asm/battle_controllers.s
index 265fcb37a..2b64be0f5 100644
--- a/asm/battle_controllers.s
+++ b/asm/battle_controllers.s
@@ -28,7 +28,7 @@ _0800D24A:
_0800D256:
ldr r0, _0800D274 @ =sub_8081A90
movs r1, 0
- bl sub_807741C
+ bl CreateTask
bl sub_800D93C
_0800D262:
pop {r0}
@@ -415,7 +415,7 @@ _0800D598: .4byte gUnknown_2023BD6
_0800D59C: .4byte sub_803A668
_0800D5A0: .4byte gUnknown_2023BCC
_0800D5A4:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r5, r0, 24
ldr r0, [r4]
@@ -707,24 +707,24 @@ _0800D7C2:
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0800D888
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0800D888
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
beq _0800D888
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0800D888
ldr r0, _0800D804 @ =gUnknown_2023BCE
@@ -745,7 +745,7 @@ _0800D808:
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0800D888
adds r0, r4, 0
@@ -758,25 +758,25 @@ _0800D830:
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0800D888
adds r0, r4, 0
movs r1, 0x41
_0800D844:
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0800D888
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
beq _0800D888
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0800D888
ldr r1, _0800D884 @ =gUnknown_2023BCE
@@ -898,7 +898,7 @@ sub_800D93C: @ 800D93C
push {r4-r6,lr}
ldr r0, _0800D9D4 @ =sub_800DB6C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r2, _0800D9D8 @ =gUnknown_202286C
strb r0, [r2]
ldr r5, _0800D9DC @ =gUnknown_3005090
@@ -934,9 +934,9 @@ sub_800D93C: @ 800D93C
lsls r0, 3
adds r0, r5
strh r4, [r0, 0x26]
- ldr r0, _0800D9E0 @ =sub_800DE4C
+ ldr r0, _0800D9E0 @ =Task_HandleCopyReceivedLinkBuffersData
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r2, _0800D9E4 @ =gUnknown_202286D
strb r0, [r2]
ldrb r1, [r2]
@@ -972,7 +972,7 @@ sub_800D93C: @ 800D93C
_0800D9D4: .4byte sub_800DB6C
_0800D9D8: .4byte gUnknown_202286C
_0800D9DC: .4byte gUnknown_3005090
-_0800D9E0: .4byte sub_800DE4C
+_0800D9E0: .4byte Task_HandleCopyReceivedLinkBuffersData
_0800D9E4: .4byte gUnknown_202286D
_0800D9E8: .4byte gUnknown_202286E
thumb_func_end sub_800D93C
@@ -1325,7 +1325,7 @@ _0800DC80:
adds r0, 0x8
lsls r0, 16
lsrs r6, r0, 16
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
movs r1, 0x26
@@ -1333,7 +1333,7 @@ _0800DC80:
ldr r1, [r5]
adds r1, r2
adds r2, r6, 0
- bl sub_800A448
+ bl SendBlock
ldrh r0, [r4, 0x1E]
adds r0, 0x1
strh r0, [r4, 0x1E]
@@ -1430,7 +1430,7 @@ _0800DD64: .4byte gUnknown_202273C
_0800DD68: .4byte 0x00002211
_0800DD6C: .4byte gUnknown_2022118
_0800DD70:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
ldr r2, _0800DE38 @ =gUnknown_825E45C
@@ -1443,7 +1443,7 @@ _0800DD70:
cmp r0, 0
beq _0800DE16
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
lsls r0, r4, 8
mov r4, r10
adds r3, r0, r4
@@ -1540,8 +1540,8 @@ _0800DE44: .4byte gUnknown_202286D
_0800DE48: .4byte gUnknown_2023FF0
thumb_func_end sub_800DD28
- thumb_func_start sub_800DE4C
-sub_800DE4C: @ 800DE4C
+ thumb_func_start Task_HandleCopyReceivedLinkBuffersData
+Task_HandleCopyReceivedLinkBuffersData: @ 800DE4C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1707,10 +1707,10 @@ _0800DF8C:
_0800DF98: .4byte gUnknown_2023BC8
_0800DF9C: .4byte gUnknown_825E45C
_0800DFA0: .4byte gUnknown_3005090
- thumb_func_end sub_800DE4C
+ thumb_func_end Task_HandleCopyReceivedLinkBuffersData
- thumb_func_start sub_800DFA4
-sub_800DFA4: @ 800DFA4
+ thumb_func_start EmitGetMonData
+EmitGetMonData: @ 800DFA4
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -1728,10 +1728,10 @@ sub_800DFA4: @ 800DFA4
bx r0
.align 2, 0
_0800DFC4: .4byte gUnknown_2022874
- thumb_func_end sub_800DFA4
+ thumb_func_end EmitGetMonData
- thumb_func_start sub_800DFC8
-sub_800DFC8: @ 800DFC8
+ thumb_func_start EmitGetRawMonData
+EmitGetRawMonData: @ 800DFC8
push {r4,r5,lr}
adds r5, r1, 0
lsls r0, 24
@@ -1750,10 +1750,10 @@ sub_800DFC8: @ 800DFC8
bx r0
.align 2, 0
_0800DFEC: .4byte gUnknown_2022874
- thumb_func_end sub_800DFC8
+ thumb_func_end EmitGetRawMonData
- thumb_func_start sub_800DFF0
-sub_800DFF0: @ 800DFF0
+ thumb_func_start EmitSetMonData
+EmitSetMonData: @ 800DFF0
push {r4-r6,lr}
ldr r4, [sp, 0x10]
lsls r0, 24
@@ -1787,10 +1787,10 @@ _0800E01E:
bx r0
.align 2, 0
_0800E02C: .4byte gUnknown_2022874
- thumb_func_end sub_800DFF0
+ thumb_func_end EmitSetMonData
- thumb_func_start sub_800E030
-sub_800E030: @ 800E030
+ thumb_func_start EmitSetRawMonData
+EmitSetRawMonData: @ 800E030
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -1824,10 +1824,10 @@ _0800E05C:
bx r0
.align 2, 0
_0800E06C: .4byte gUnknown_2022874
- thumb_func_end sub_800E030
+ thumb_func_end EmitSetRawMonData
- thumb_func_start sub_800E070
-sub_800E070: @ 800E070
+ thumb_func_start EmitLoadMonSprite
+EmitLoadMonSprite: @ 800E070
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1842,10 +1842,10 @@ sub_800E070: @ 800E070
bx r0
.align 2, 0
_0800E08C: .4byte gUnknown_2022874
- thumb_func_end sub_800E070
+ thumb_func_end EmitLoadMonSprite
- thumb_func_start sub_800E090
-sub_800E090: @ 800E090
+ thumb_func_start EmitSwitchInAnim
+EmitSwitchInAnim: @ 800E090
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -1863,10 +1863,10 @@ sub_800E090: @ 800E090
bx r0
.align 2, 0
_0800E0B0: .4byte gUnknown_2022874
- thumb_func_end sub_800E090
+ thumb_func_end EmitSwitchInAnim
- thumb_func_start sub_800E0B4
-sub_800E0B4: @ 800E0B4
+ thumb_func_start EmitReturnMonToBall
+EmitReturnMonToBall: @ 800E0B4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -1881,10 +1881,10 @@ sub_800E0B4: @ 800E0B4
bx r0
.align 2, 0
_0800E0D0: .4byte gUnknown_2022874
- thumb_func_end sub_800E0B4
+ thumb_func_end EmitReturnMonToBall
- thumb_func_start sub_800E0D4
-sub_800E0D4: @ 800E0D4
+ thumb_func_start EmitDrawTrainerPic
+EmitDrawTrainerPic: @ 800E0D4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1900,10 +1900,10 @@ sub_800E0D4: @ 800E0D4
bx r0
.align 2, 0
_0800E0F0: .4byte gUnknown_2022874
- thumb_func_end sub_800E0D4
+ thumb_func_end EmitDrawTrainerPic
- thumb_func_start sub_800E0F4
-sub_800E0F4: @ 800E0F4
+ thumb_func_start EmitTrainerSlide
+EmitTrainerSlide: @ 800E0F4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1919,10 +1919,10 @@ sub_800E0F4: @ 800E0F4
bx r0
.align 2, 0
_0800E110: .4byte gUnknown_2022874
- thumb_func_end sub_800E0F4
+ thumb_func_end EmitTrainerSlide
- thumb_func_start sub_800E114
-sub_800E114: @ 800E114
+ thumb_func_start EmitTrainerSlideBack
+EmitTrainerSlideBack: @ 800E114
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1938,10 +1938,10 @@ sub_800E114: @ 800E114
bx r0
.align 2, 0
_0800E130: .4byte gUnknown_2022874
- thumb_func_end sub_800E114
+ thumb_func_end EmitTrainerSlideBack
- thumb_func_start sub_800E134
-sub_800E134: @ 800E134
+ thumb_func_start EmitFaintAnimation
+EmitFaintAnimation: @ 800E134
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1957,10 +1957,10 @@ sub_800E134: @ 800E134
bx r0
.align 2, 0
_0800E150: .4byte gUnknown_2022874
- thumb_func_end sub_800E134
+ thumb_func_end EmitFaintAnimation
- thumb_func_start sub_800E154
-sub_800E154: @ 800E154
+ thumb_func_start EmitPaletteFade
+EmitPaletteFade: @ 800E154
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1976,10 +1976,10 @@ sub_800E154: @ 800E154
bx r0
.align 2, 0
_0800E170: .4byte gUnknown_2022874
- thumb_func_end sub_800E154
+ thumb_func_end EmitPaletteFade
- thumb_func_start sub_800E174
-sub_800E174: @ 800E174
+ thumb_func_start EmitSuccessBallThrowAnim
+EmitSuccessBallThrowAnim: @ 800E174
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1995,10 +1995,10 @@ sub_800E174: @ 800E174
bx r0
.align 2, 0
_0800E190: .4byte gUnknown_2022874
- thumb_func_end sub_800E174
+ thumb_func_end EmitSuccessBallThrowAnim
- thumb_func_start sub_800E194
-sub_800E194: @ 800E194
+ thumb_func_start EmitBallThrowAnim
+EmitBallThrowAnim: @ 800E194
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -2013,10 +2013,10 @@ sub_800E194: @ 800E194
bx r0
.align 2, 0
_0800E1B0: .4byte gUnknown_2022874
- thumb_func_end sub_800E194
+ thumb_func_end EmitBallThrowAnim
- thumb_func_start sub_800E1B4
-sub_800E1B4: @ 800E1B4
+ thumb_func_start EmitPause
+EmitPause: @ 800E1B4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -2053,10 +2053,10 @@ _0800E1E2:
bx r0
.align 2, 0
_0800E1F8: .4byte gUnknown_2022874
- thumb_func_end sub_800E1B4
+ thumb_func_end EmitPause
- thumb_func_start sub_800E1FC
-sub_800E1FC: @ 800E1FC
+ thumb_func_start EmitMoveAnimation
+EmitMoveAnimation: @ 800E1FC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2159,10 +2159,10 @@ _0800E2A6:
bx r0
.align 2, 0
_0800E2D0: .4byte gUnknown_2022874
- thumb_func_end sub_800E1FC
+ thumb_func_end EmitMoveAnimation
- thumb_func_start sub_800E2D4
-sub_800E2D4: @ 800E2D4
+ thumb_func_start EmitPrintString
+EmitPrintString: @ 800E2D4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2290,10 +2290,10 @@ _0800E3DC: .4byte gUnknown_2022AD8
_0800E3E0: .4byte gUnknown_2023BE4
_0800E3E4: .4byte gUnknown_2022AC8
_0800E3E8: .4byte gUnknown_2022AB8
- thumb_func_end sub_800E2D4
+ thumb_func_end EmitPrintString
- thumb_func_start sub_800E3EC
-sub_800E3EC: @ 800E3EC
+ thumb_func_start EmitPrintSelectionString
+EmitPrintSelectionString: @ 800E3EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2400,10 +2400,10 @@ _0800E4C4: .4byte gUnknown_2022AD8
_0800E4C8: .4byte gUnknown_2023BE4
_0800E4CC: .4byte gUnknown_2022AC8
_0800E4D0: .4byte gUnknown_2022AB8
- thumb_func_end sub_800E3EC
+ thumb_func_end EmitPrintSelectionString
- thumb_func_start sub_800E4D4
-sub_800E4D4: @ 800E4D4
+ thumb_func_start EmitChooseAction
+EmitChooseAction: @ 800E4D4
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2424,7 +2424,7 @@ sub_800E4D4: @ 800E4D4
bx r0
.align 2, 0
_0800E4FC: .4byte gUnknown_2022874
- thumb_func_end sub_800E4D4
+ thumb_func_end EmitChooseAction
thumb_func_start sub_800E500
sub_800E500: @ 800E500
@@ -2444,8 +2444,8 @@ sub_800E500: @ 800E500
_0800E51C: .4byte gUnknown_2022874
thumb_func_end sub_800E500
- thumb_func_start sub_800E520
-sub_800E520: @ 800E520
+ thumb_func_start EmitChooseMove
+EmitChooseMove: @ 800E520
push {r4-r6,lr}
adds r5, r3, 0
lsls r0, 24
@@ -2476,10 +2476,10 @@ _0800E53C:
bx r0
.align 2, 0
_0800E558: .4byte gUnknown_2022874
- thumb_func_end sub_800E520
+ thumb_func_end EmitChooseMove
- thumb_func_start sub_800E55C
-sub_800E55C: @ 800E55C
+ thumb_func_start EmitChooseItem
+EmitChooseItem: @ 800E55C
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2505,10 +2505,10 @@ _0800E56E:
bx r0
.align 2, 0
_0800E58C: .4byte gUnknown_2022874
- thumb_func_end sub_800E55C
+ thumb_func_end EmitChooseItem
- thumb_func_start sub_800E590
-sub_800E590: @ 800E590
+ thumb_func_start EmitChoosePokemon
+EmitChoosePokemon: @ 800E590
push {r4-r6,lr}
ldr r6, [sp, 0x10]
lsls r0, 24
@@ -2538,10 +2538,10 @@ _0800E5AA:
bx r0
.align 2, 0
_0800E5C8: .4byte gUnknown_2022874
- thumb_func_end sub_800E590
+ thumb_func_end EmitChoosePokemon
- thumb_func_start sub_800E5CC
-sub_800E5CC: @ 800E5CC
+ thumb_func_start EmitCmd23
+EmitCmd23: @ 800E5CC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2557,10 +2557,10 @@ sub_800E5CC: @ 800E5CC
bx r0
.align 2, 0
_0800E5E8: .4byte gUnknown_2022874
- thumb_func_end sub_800E5CC
+ thumb_func_end EmitCmd23
- thumb_func_start sub_800E5EC
-sub_800E5EC: @ 800E5EC
+ thumb_func_start EmitHealthBarUpdate
+EmitHealthBarUpdate: @ 800E5EC
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -2587,10 +2587,10 @@ sub_800E5EC: @ 800E5EC
bx r0
.align 2, 0
_0800E620: .4byte gUnknown_2022874
- thumb_func_end sub_800E5EC
+ thumb_func_end EmitHealthBarUpdate
- thumb_func_start sub_800E624
-sub_800E624: @ 800E624
+ thumb_func_start EmitExpUpdate
+EmitExpUpdate: @ 800E624
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2616,10 +2616,10 @@ sub_800E624: @ 800E624
bx r0
.align 2, 0
_0800E654: .4byte gUnknown_2022874
- thumb_func_end sub_800E624
+ thumb_func_end EmitExpUpdate
- thumb_func_start sub_800E658
-sub_800E658: @ 800E658
+ thumb_func_start EmitStatusIconUpdate
+EmitStatusIconUpdate: @ 800E658
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2660,10 +2660,10 @@ sub_800E658: @ 800E658
bx r0
.align 2, 0
_0800E6A8: .4byte gUnknown_2022874
- thumb_func_end sub_800E658
+ thumb_func_end EmitStatusIconUpdate
- thumb_func_start sub_800E6AC
-sub_800E6AC: @ 800E6AC
+ thumb_func_start EmitStatusAnimation
+EmitStatusAnimation: @ 800E6AC
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2692,10 +2692,10 @@ sub_800E6AC: @ 800E6AC
bx r0
.align 2, 0
_0800E6E4: .4byte gUnknown_2022874
- thumb_func_end sub_800E6AC
+ thumb_func_end EmitStatusAnimation
- thumb_func_start sub_800E6E8
-sub_800E6E8: @ 800E6E8
+ thumb_func_start EmitStatusXor
+EmitStatusXor: @ 800E6E8
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -2710,10 +2710,10 @@ sub_800E6E8: @ 800E6E8
bx r0
.align 2, 0
_0800E704: .4byte gUnknown_2022874
- thumb_func_end sub_800E6E8
+ thumb_func_end EmitStatusXor
- thumb_func_start sub_800E708
-sub_800E708: @ 800E708
+ thumb_func_start EmitDataTransfer
+EmitDataTransfer: @ 800E708
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -2751,10 +2751,10 @@ _0800E738:
bx r0
.align 2, 0
_0800E74C: .4byte gUnknown_2022874
- thumb_func_end sub_800E708
+ thumb_func_end EmitDataTransfer
- thumb_func_start sub_800E750
-sub_800E750: @ 800E750
+ thumb_func_start EmitDMA3Transfer
+EmitDMA3Transfer: @ 800E750
push {r4-r6,lr}
adds r4, r3, 0
lsls r0, 24
@@ -2807,10 +2807,10 @@ _0800E7A0:
bx r0
.align 2, 0
_0800E7B4: .4byte gUnknown_2022874
- thumb_func_end sub_800E750
+ thumb_func_end EmitDMA3Transfer
- thumb_func_start sub_800E7B8
-sub_800E7B8: @ 800E7B8
+ thumb_func_start EmitPlayBGM
+EmitPlayBGM: @ 800E7B8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -2847,10 +2847,10 @@ _0800E7E6:
bx r0
.align 2, 0
_0800E7FC: .4byte gUnknown_2022874
- thumb_func_end sub_800E7B8
+ thumb_func_end EmitPlayBGM
- thumb_func_start sub_800E800
-sub_800E800: @ 800E800
+ thumb_func_start EmitCmd32
+EmitCmd32: @ 800E800
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -2887,10 +2887,10 @@ _0800E82E:
bx r0
.align 2, 0
_0800E844: .4byte gUnknown_2022874
- thumb_func_end sub_800E800
+ thumb_func_end EmitCmd32
- thumb_func_start sub_800E848
-sub_800E848: @ 800E848
+ thumb_func_start EmitTwoReturnValues
+EmitTwoReturnValues: @ 800E848
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2911,10 +2911,10 @@ sub_800E848: @ 800E848
bx r0
.align 2, 0
_0800E870: .4byte gUnknown_2022874
- thumb_func_end sub_800E848
+ thumb_func_end EmitTwoReturnValues
- thumb_func_start sub_800E874
-sub_800E874: @ 800E874
+ thumb_func_start EmitChosenMonReturnValue
+EmitChosenMonReturnValue: @ 800E874
push {r4,r5,lr}
adds r4, r2, 0
lsls r0, 24
@@ -2942,10 +2942,10 @@ _0800E888:
bx r0
.align 2, 0
_0800E8A8: .4byte gUnknown_2022874
- thumb_func_end sub_800E874
+ thumb_func_end EmitChosenMonReturnValue
- thumb_func_start sub_800E8AC
-sub_800E8AC: @ 800E8AC
+ thumb_func_start EmitOneReturnValue
+EmitOneReturnValue: @ 800E8AC
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -2967,10 +2967,10 @@ sub_800E8AC: @ 800E8AC
bx r0
.align 2, 0
_0800E8D4: .4byte gUnknown_2022874
- thumb_func_end sub_800E8AC
+ thumb_func_end EmitOneReturnValue
- thumb_func_start sub_800E8D8
-sub_800E8D8: @ 800E8D8
+ thumb_func_start EmitOneReturnValue_Duplicate
+EmitOneReturnValue_Duplicate: @ 800E8D8
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -2992,10 +2992,10 @@ sub_800E8D8: @ 800E8D8
bx r0
.align 2, 0
_0800E900: .4byte gUnknown_2022874
- thumb_func_end sub_800E8D8
+ thumb_func_end EmitOneReturnValue_Duplicate
- thumb_func_start sub_800E904
-sub_800E904: @ 800E904
+ thumb_func_start EmitCmd37
+EmitCmd37: @ 800E904
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3011,10 +3011,10 @@ sub_800E904: @ 800E904
bx r0
.align 2, 0
_0800E920: .4byte gUnknown_2022874
- thumb_func_end sub_800E904
+ thumb_func_end EmitCmd37
- thumb_func_start sub_800E924
-sub_800E924: @ 800E924
+ thumb_func_start EmitCmd38
+EmitCmd38: @ 800E924
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -3029,10 +3029,10 @@ sub_800E924: @ 800E924
bx r0
.align 2, 0
_0800E940: .4byte gUnknown_2022874
- thumb_func_end sub_800E924
+ thumb_func_end EmitCmd38
- thumb_func_start sub_800E944
-sub_800E944: @ 800E944
+ thumb_func_start EmitCmd39
+EmitCmd39: @ 800E944
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3048,10 +3048,10 @@ sub_800E944: @ 800E944
bx r0
.align 2, 0
_0800E960: .4byte gUnknown_2022874
- thumb_func_end sub_800E944
+ thumb_func_end EmitCmd39
- thumb_func_start sub_800E964
-sub_800E964: @ 800E964
+ thumb_func_start EmitCmd40
+EmitCmd40: @ 800E964
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3067,10 +3067,10 @@ sub_800E964: @ 800E964
bx r0
.align 2, 0
_0800E980: .4byte gUnknown_2022874
- thumb_func_end sub_800E964
+ thumb_func_end EmitCmd40
- thumb_func_start sub_800E984
-sub_800E984: @ 800E984
+ thumb_func_start EmitHitAnimation
+EmitHitAnimation: @ 800E984
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3086,10 +3086,10 @@ sub_800E984: @ 800E984
bx r0
.align 2, 0
_0800E9A0: .4byte gUnknown_2022874
- thumb_func_end sub_800E984
+ thumb_func_end EmitHitAnimation
- thumb_func_start sub_800E9A4
-sub_800E9A4: @ 800E9A4
+ thumb_func_start EmitCmd42
+EmitCmd42: @ 800E9A4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3105,10 +3105,10 @@ sub_800E9A4: @ 800E9A4
bx r0
.align 2, 0
_0800E9C0: .4byte gUnknown_2022874
- thumb_func_end sub_800E9A4
+ thumb_func_end EmitCmd42
- thumb_func_start sub_800E9C4
-sub_800E9C4: @ 800E9C4
+ thumb_func_start EmitPlaySE
+EmitPlaySE: @ 800E9C4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3130,7 +3130,7 @@ sub_800E9C4: @ 800E9C4
bx r0
.align 2, 0
_0800E9EC: .4byte gUnknown_2022874
- thumb_func_end sub_800E9C4
+ thumb_func_end EmitPlaySE
thumb_func_start sub_800E9F0
sub_800E9F0: @ 800E9F0
@@ -3157,8 +3157,8 @@ sub_800E9F0: @ 800E9F0
_0800EA18: .4byte gUnknown_2022874
thumb_func_end sub_800E9F0
- thumb_func_start sub_800EA1C
-sub_800EA1C: @ 800EA1C
+ thumb_func_start EmitFaintingCry
+EmitFaintingCry: @ 800EA1C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3174,10 +3174,10 @@ sub_800EA1C: @ 800EA1C
bx r0
.align 2, 0
_0800EA38: .4byte gUnknown_2022874
- thumb_func_end sub_800EA1C
+ thumb_func_end EmitFaintingCry
- thumb_func_start sub_800EA3C
-sub_800EA3C: @ 800EA3C
+ thumb_func_start EmitIntroSlide
+EmitIntroSlide: @ 800EA3C
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -3192,10 +3192,10 @@ sub_800EA3C: @ 800EA3C
bx r0
.align 2, 0
_0800EA58: .4byte gUnknown_2022874
- thumb_func_end sub_800EA3C
+ thumb_func_end EmitIntroSlide
- thumb_func_start sub_800EA5C
-sub_800EA5C: @ 800EA5C
+ thumb_func_start EmitIntroTrainerBallThrow
+EmitIntroTrainerBallThrow: @ 800EA5C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3211,10 +3211,10 @@ sub_800EA5C: @ 800EA5C
bx r0
.align 2, 0
_0800EA78: .4byte gUnknown_2022874
- thumb_func_end sub_800EA5C
+ thumb_func_end EmitIntroTrainerBallThrow
- thumb_func_start sub_800EA7C
-sub_800EA7C: @ 800EA7C
+ thumb_func_start EmitDrawPartyStatusSummary
+EmitDrawPartyStatusSummary: @ 800EA7C
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3251,10 +3251,10 @@ _0800EAA4:
bx r0
.align 2, 0
_0800EAC0: .4byte gUnknown_2022874
- thumb_func_end sub_800EA7C
+ thumb_func_end EmitDrawPartyStatusSummary
- thumb_func_start sub_800EAC4
-sub_800EAC4: @ 800EAC4
+ thumb_func_start EmitCmd49
+EmitCmd49: @ 800EAC4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3270,10 +3270,10 @@ sub_800EAC4: @ 800EAC4
bx r0
.align 2, 0
_0800EAE0: .4byte gUnknown_2022874
- thumb_func_end sub_800EAC4
+ thumb_func_end EmitCmd49
- thumb_func_start sub_800EAE4
-sub_800EAE4: @ 800EAE4
+ thumb_func_start EmitCmd50
+EmitCmd50: @ 800EAE4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3289,10 +3289,10 @@ sub_800EAE4: @ 800EAE4
bx r0
.align 2, 0
_0800EB00: .4byte gUnknown_2022874
- thumb_func_end sub_800EAE4
+ thumb_func_end EmitCmd50
- thumb_func_start sub_800EB04
-sub_800EB04: @ 800EB04
+ thumb_func_start EmitSpriteInvisibility
+EmitSpriteInvisibility: @ 800EB04
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -3309,10 +3309,10 @@ sub_800EB04: @ 800EB04
bx r0
.align 2, 0
_0800EB24: .4byte gUnknown_2022874
- thumb_func_end sub_800EB04
+ thumb_func_end EmitSpriteInvisibility
- thumb_func_start sub_800EB28
-sub_800EB28: @ 800EB28
+ thumb_func_start EmitBattleAnimation
+EmitBattleAnimation: @ 800EB28
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3333,7 +3333,7 @@ sub_800EB28: @ 800EB28
bx r0
.align 2, 0
_0800EB50: .4byte gUnknown_2022874
- thumb_func_end sub_800EB28
+ thumb_func_end EmitBattleAnimation
thumb_func_start sub_800EB54
sub_800EB54: @ 800EB54
diff --git a/asm/battle_dome_cards.s b/asm/battle_dome_cards.s
index 82b4eddb3..ad8419b57 100644
--- a/asm/battle_dome_cards.s
+++ b/asm/battle_dome_cards.s
@@ -10,8 +10,8 @@ nullsub_91: @ 810BB88
bx lr
thumb_func_end nullsub_91
- thumb_func_start sub_810BB8C
-sub_810BB8C: @ 810BB8C
+ thumb_func_start dp13_810BB8C
+dp13_810BB8C: @ 810BB8C
push {r4-r7,lr}
ldr r4, _0810BBAC @ =gUnknown_8453178
ldr r3, _0810BBB0 @ =gUnknown_203AD58
@@ -32,10 +32,10 @@ _0810BB94:
.align 2, 0
_0810BBAC: .4byte gUnknown_8453178
_0810BBB0: .4byte gUnknown_203AD58
- thumb_func_end sub_810BB8C
+ thumb_func_end dp13_810BB8C
- thumb_func_start sub_810BBB4
-sub_810BBB4: @ 810BBB4
+ thumb_func_start load_pokemon_image_TODO
+load_pokemon_image_TODO: @ 810BBB4
push {r4-r7,lr}
sub sp, 0x4
adds r6, r1, 0
@@ -123,7 +123,7 @@ _0810BC4E:
bx r1
.align 2, 0
_0810BC58: .4byte gUnknown_8239FA4
- thumb_func_end sub_810BBB4
+ thumb_func_end load_pokemon_image_TODO
thumb_func_start sub_810BC5C
sub_810BC5C: @ 810BC5C
@@ -139,7 +139,7 @@ sub_810BC5C: @ 810BC5C
str r4, [sp]
movs r4, 0
str r4, [sp, 0x4]
- bl sub_810BBB4
+ bl load_pokemon_image_TODO
lsls r0, 16
lsrs r0, 16
add sp, 0x8
@@ -180,7 +180,7 @@ sub_810BC84: @ 810BC84
adds r0, r4, 0
adds r1, r7, 0
mov r2, r8
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r5, 20
b _0810BD04
.align 2, 0
@@ -192,8 +192,8 @@ _0810BCD0:
adds r0, r4, 0
adds r1, r7, 0
mov r2, r8
- bl sub_8044180
- bl sub_800EC28
+ bl GetMonSpritePalStructFromOtIdPersonality
+ bl LoadCompressedObjectPalette
b _0810BD2E
.align 2, 0
_0810BCE4: .4byte gUnknown_203AD40
@@ -218,7 +218,7 @@ _0810BD04:
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0810BD2E
.align 2, 0
_0810BD14: .4byte 0x0000ffff
@@ -230,7 +230,7 @@ _0810BD20:
lsls r0, r6, 3
ldr r1, _0810BD3C @ =gUnknown_8239A1C
adds r0, r1
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
_0810BD2E:
pop {r3}
mov r8, r3
@@ -255,10 +255,10 @@ sub_810BD40: @ 810BD40
cmp r1, 0
bne _0810BD64
adds r1, r5, 0
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
lsls r1, r4, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0810BD74
_0810BD64:
ldr r1, _0810BD7C @ =gUnknown_8239A1C
@@ -267,7 +267,7 @@ _0810BD64:
ldr r0, [r0]
lsls r1, r4, 4
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
_0810BD74:
pop {r4,r5}
pop {r0}
@@ -276,8 +276,8 @@ _0810BD74:
_0810BD7C: .4byte gUnknown_8239A1C
thumb_func_end sub_810BD40
- thumb_func_start sub_810BD80
-sub_810BD80: @ 810BD80
+ thumb_func_start uns_builder_assign_animtable1
+uns_builder_assign_animtable1: @ 810BD80
push {lr}
lsls r0, 24
cmp r0, 0
@@ -300,10 +300,10 @@ _0810BDA0:
.align 2, 0
_0810BDA4: .4byte gUnknown_203AD40
_0810BDA8: .4byte gUnknown_82390DC
- thumb_func_end sub_810BD80
+ thumb_func_end uns_builder_assign_animtable1
- thumb_func_start sub_810BDAC
-sub_810BDAC: @ 810BDAC
+ thumb_func_start oamt_spawn_poke_or_trainer_picture
+oamt_spawn_poke_or_trainer_picture: @ 810BDAC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -366,17 +366,17 @@ _0810BE1C:
beq _0810BE40
movs r0, 0x80
lsls r0, 6
- bl sub_8002B9C
+ bl Alloc
adds r7, r0, 0
cmp r7, 0
beq _0810BE40
movs r0, 0x20
- bl sub_8002B9C
+ bl Alloc
mov r8, r0
cmp r0, 0
bne _0810BE4C
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
_0810BE40:
ldr r0, _0810BE48 @ =0x0000ffff
b _0810BF16
@@ -391,7 +391,7 @@ _0810BE4C:
ldr r1, [sp, 0x10]
ldr r2, [sp, 0x14]
adds r3, r7, 0
- bl sub_810BBB4
+ bl load_pokemon_image_TODO
lsls r0, 16
cmp r0, 0
bne _0810BE40
@@ -425,7 +425,7 @@ _0810BE86:
mov r0, r12
str r0, [r5, 0x4]
mov r0, r9
- bl sub_810BD80
+ bl uns_builder_assign_animtable1
mov r1, r8
str r1, [r5, 0xC]
ldr r0, _0810BF34 @ =gUnknown_8231CFC
@@ -447,7 +447,7 @@ _0810BE86:
asrs r2, r0, 16
adds r0, r5, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
adds r6, r2, 0
@@ -500,7 +500,7 @@ _0810BF34: .4byte gUnknown_8231CFC
_0810BF38: .4byte nullsub_91
_0810BF3C: .4byte gUnknown_202063C
_0810BF40: .4byte gUnknown_203AD58
- thumb_func_end sub_810BDAC
+ thumb_func_end oamt_spawn_poke_or_trainer_picture
thumb_func_start sub_810BF44
sub_810BF44: @ 810BF44
@@ -541,7 +541,7 @@ sub_810BF44: @ 810BF44
str r7, [sp, 0x10]
movs r4, 0
str r4, [sp, 0x14]
- bl sub_810BDAC
+ bl oamt_spawn_poke_or_trainer_picture
lsls r0, 16
lsrs r0, 16
add sp, 0x18
@@ -609,20 +609,20 @@ _0810BFE4:
adds r0, r1
ldrb r0, [r0, 0x5]
lsrs r0, 4
- bl sub_8008A20
+ bl GetSpritePaletteTagByPaletteNum
lsls r0, 16
lsrs r0, 16
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0810C018:
adds r0, r6, r4
lsls r0, 2
ldr r1, _0810C048 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
mov r0, r8
- bl sub_8002BC4
+ bl Free
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
adds r1, r5, 0
ldr r0, _0810C04C @ =gUnknown_8453178
ldm r0!, {r2-r4}
@@ -734,7 +734,7 @@ sub_810C0C0: @ 810C0C0
lsrs r6, 24
movs r0, 0x80
lsls r0, 6
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
beq _0810C156
@@ -760,7 +760,7 @@ sub_810C0C0: @ 810C0C0
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
str r6, [sp]
mov r0, r9
ldr r1, [sp, 0x18]
@@ -768,7 +768,7 @@ sub_810C0C0: @ 810C0C0
ldr r3, [sp, 0x20]
bl sub_810BD40
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0
b _0810C158
_0810C156:
@@ -825,7 +825,7 @@ sub_810C16C: @ 810C16C
movs r4, 0
str r4, [sp, 0x10]
str r7, [sp, 0x14]
- bl sub_810BDAC
+ bl oamt_spawn_poke_or_trainer_picture
lsls r0, 16
lsrs r0, 16
add sp, 0x18
diff --git a/asm/battle_gfx_sfx_util.s b/asm/battle_gfx_sfx_util.s
index 6c2a427ae..3300d8c07 100644
--- a/asm/battle_gfx_sfx_util.s
+++ b/asm/battle_gfx_sfx_util.s
@@ -10,22 +10,22 @@ sub_8033DB8: @ 8033DB8
push {r4,lr}
ldr r4, _08033DF4 @ =gUnknown_2024018
movs r0, 0x10
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0x10
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1]
movs r0, 0x30
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x4]
movs r0, 0x10
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x8]
movs r0, 0x50
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0xC]
pop {r4}
@@ -43,23 +43,23 @@ sub_8033DF8: @ 8033DF8
cmp r0, 0
beq _08033E32
ldr r0, [r0, 0xC]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
movs r4, 0
str r4, [r0, 0xC]
ldr r0, [r0, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
str r4, [r0, 0x8]
ldr r0, [r0, 0x4]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
str r4, [r0, 0x4]
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
str r4, [r0]
- bl sub_8002BC4
+ bl Free
str r4, [r5]
_08033E32:
pop {r4,r5}
@@ -117,7 +117,7 @@ _08033E84:
str r1, [r0]
adds r0, r3, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _08033EAC @ =nullsub_8
str r0, [r6, 0x1C]
_08033EA0:
@@ -146,17 +146,17 @@ sub_8033EB0: @ 8033EB0
bne _08033ED8
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _08033EE0
.align 2, 0
_08033ED4: .4byte nullsub_8
_08033ED8:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08033EE0:
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
pop {r4}
pop {r0}
bx r0
@@ -189,8 +189,8 @@ _08033F14: .4byte gUnknown_2023F4C
_08033F18: .4byte nullsub_8
thumb_func_end sub_8033EEC
- thumb_func_start sub_8033F1C
-sub_8033F1C: @ 8033F1C
+ thumb_func_start InitAndLaunchChosenStatusAnimation
+InitAndLaunchChosenStatusAnimation: @ 8033F1C
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -213,7 +213,7 @@ sub_8033F1C: @ 8033F1C
bne _08033F58
ldrb r0, [r5]
movs r1, 0x6
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
.align 2, 0
_08033F50: .4byte gUnknown_2024018
@@ -228,14 +228,14 @@ _08033F58:
_08033F64:
ldrb r0, [r5]
movs r1, 0
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033F6E:
cmp r4, 0x10
bne _08033F7C
ldrb r0, [r5]
movs r1, 0x2
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033F7C:
movs r0, 0x7
@@ -244,14 +244,14 @@ _08033F7C:
beq _08033F8E
ldrb r0, [r5]
movs r1, 0x4
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033F8E:
cmp r4, 0x40
bne _08033FFE
ldrb r0, [r5]
movs r1, 0x5
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033F9C:
movs r0, 0xF0
@@ -261,7 +261,7 @@ _08033F9C:
beq _08033FB0
ldrb r0, [r5]
movs r1, 0x3
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033FB0:
movs r0, 0x7
@@ -270,7 +270,7 @@ _08033FB0:
beq _08033FC2
ldrb r0, [r5]
movs r1, 0x1
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033FC2:
movs r0, 0x80
@@ -280,7 +280,7 @@ _08033FC2:
beq _08033FD6
ldrb r0, [r5]
movs r1, 0x7
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033FD6:
movs r0, 0x80
@@ -290,7 +290,7 @@ _08033FD6:
beq _08033FEA
ldrb r0, [r5]
movs r1, 0x8
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033FEA:
movs r0, 0xE0
@@ -300,7 +300,7 @@ _08033FEA:
beq _08033FFE
ldrb r0, [r5]
movs r1, 0x9
- bl sub_807886C
+ bl LaunchStatusAnimation
b _08034016
_08033FFE:
ldr r0, [r6]
@@ -319,10 +319,10 @@ _08034016:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8033F1C
+ thumb_func_end InitAndLaunchChosenStatusAnimation
- thumb_func_start sub_803401C
-sub_803401C: @ 803401C
+ thumb_func_start TryHandleLaunchBattleTableAnimation
+TryHandleLaunchBattleTableAnimation: @ 803401C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -373,7 +373,7 @@ _08034064:
cmp r0, 0
beq _080340E0
adds r0, r5, 0
- bl sub_80341B4
+ bl ShouldAnimBeDoneRegardlessOfSubsitute
lsls r0, 24
cmp r0, 0
bne _08034094
@@ -408,9 +408,9 @@ _08034094:
bge _080340E0
adds r0, r6, 0
movs r1, 0x1
- bl sub_80351A8
+ bl LoadBattleMonGfxAndAnimate
adds r0, r6, 0
- bl sub_8035228
+ bl ClearBehindSubstituteBit
movs r0, 0x1
b _08034132
.align 2, 0
@@ -432,9 +432,9 @@ _080340E0:
adds r1, r5, 0
movs r2, 0
bl sub_80725D4
- ldr r0, _08034154 @ =sub_803415C
+ ldr r0, _08034154 @ =Task_ClearBitWhenBattleTableAnimDone
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08034158 @ =gUnknown_3005090
@@ -470,12 +470,12 @@ _08034144: .4byte gUnknown_2037F1A
_08034148: .4byte gUnknown_2037F1B
_0803414C: .4byte gUnknown_2024018
_08034150: .4byte gUnknown_81C6EA8
-_08034154: .4byte sub_803415C
+_08034154: .4byte Task_ClearBitWhenBattleTableAnimDone
_08034158: .4byte gUnknown_3005090
- thumb_func_end sub_803401C
+ thumb_func_end TryHandleLaunchBattleTableAnimation
- thumb_func_start sub_803415C
-sub_803415C: @ 803415C
+ thumb_func_start Task_ClearBitWhenBattleTableAnimDone
+Task_ClearBitWhenBattleTableAnimDone: @ 803415C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -506,7 +506,7 @@ sub_803415C: @ 803415C
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0803419E:
pop {r4}
pop {r0}
@@ -516,10 +516,10 @@ _080341A4: .4byte gUnknown_2037EDC
_080341A8: .4byte gUnknown_2037EE1
_080341AC: .4byte gUnknown_2024018
_080341B0: .4byte gUnknown_3005090
- thumb_func_end sub_803415C
+ thumb_func_end Task_ClearBitWhenBattleTableAnimDone
- thumb_func_start sub_80341B4
-sub_80341B4: @ 80341B4
+ thumb_func_start ShouldAnimBeDoneRegardlessOfSubsitute
+ShouldAnimBeDoneRegardlessOfSubsitute: @ 80341B4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -541,10 +541,10 @@ _080341D0:
_080341D2:
pop {r1}
bx r1
- thumb_func_end sub_80341B4
+ thumb_func_end ShouldAnimBeDoneRegardlessOfSubsitute
- thumb_func_start sub_80341D8
-sub_80341D8: @ 80341D8
+ thumb_func_start InitAndLaunchSpecialAnimation
+InitAndLaunchSpecialAnimation: @ 80341D8
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -559,9 +559,9 @@ sub_80341D8: @ 80341D8
adds r1, r3, 0
movs r2, 0
bl sub_80725D4
- ldr r0, _0803423C @ =sub_8034248
+ ldr r0, _0803423C @ =Task_ClearBitWhenSpecialAnimDone
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08034240 @ =gUnknown_3005090
@@ -590,13 +590,13 @@ sub_80341D8: @ 80341D8
_08034230: .4byte gUnknown_2037F1A
_08034234: .4byte gUnknown_2037F1B
_08034238: .4byte gUnknown_81C6F18
-_0803423C: .4byte sub_8034248
+_0803423C: .4byte Task_ClearBitWhenSpecialAnimDone
_08034240: .4byte gUnknown_3005090
_08034244: .4byte gUnknown_2024018
- thumb_func_end sub_80341D8
+ thumb_func_end InitAndLaunchSpecialAnimation
- thumb_func_start sub_8034248
-sub_8034248: @ 8034248
+ thumb_func_start Task_ClearBitWhenSpecialAnimDone
+Task_ClearBitWhenSpecialAnimDone: @ 8034248
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -627,7 +627,7 @@ sub_8034248: @ 8034248
ands r0, r2
strb r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0803428A:
pop {r4}
pop {r0}
@@ -637,21 +637,21 @@ _08034290: .4byte gUnknown_2037EDC
_08034294: .4byte gUnknown_2037EE1
_08034298: .4byte gUnknown_2024018
_0803429C: .4byte gUnknown_3005090
- thumb_func_end sub_8034248
+ thumb_func_end Task_ClearBitWhenSpecialAnimDone
- thumb_func_start sub_80342A0
-sub_80342A0: @ 80342A0
+ thumb_func_start IsMoveWithoutAnimation
+IsMoveWithoutAnimation: @ 80342A0
movs r0, 0
bx lr
- thumb_func_end sub_80342A0
+ thumb_func_end IsMoveWithoutAnimation
- thumb_func_start sub_80342A4
-sub_80342A4: @ 80342A4
+ thumb_func_start mplay_80342A4
+mplay_80342A4: @ 80342A4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
movs r5, 0
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080342EC
@@ -707,10 +707,10 @@ _08034316:
bx r1
.align 2, 0
_0803431C: .4byte gUnknown_2024018
- thumb_func_end sub_80342A4
+ thumb_func_end mplay_80342A4
- thumb_func_start sub_8034320
-sub_8034320: @ 8034320
+ thumb_func_start BattleLoadOpponentMonSpriteGfx
+BattleLoadOpponentMonSpriteGfx: @ 8034320
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -722,7 +722,7 @@ sub_8034320: @ 8034320
lsrs r1, 24
mov r8, r1
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r0, _08034360 @ =gUnknown_2024018
ldr r0, [r0]
@@ -735,7 +735,7 @@ sub_8034320: @ 8034320
bne _08034364
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
ldr r6, [sp]
@@ -750,10 +750,10 @@ _08034364:
_0803436C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
mov r0, r8
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsls r2, r5, 3
ldr r1, _080343C4 @ =gUnknown_82350AC
@@ -784,7 +784,7 @@ _0803436C:
cmp r0, 0
bne _080343D0
adds r0, r4, 0
- bl sub_80440BC
+ bl GetMonFrontSpritePal
b _080343DA
.align 2, 0
_080343C0: .4byte gUnknown_2024008
@@ -795,27 +795,27 @@ _080343D0:
adds r0, r5, 0
mov r1, r10
ldr r2, [sp]
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
_080343DA:
adds r6, r0, 0
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
adds r4, r0, 0
adds r0, r6, 0
adds r1, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r1, r9
adds r1, 0x80
adds r0, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
ldr r0, _08034478 @ =0x00000181
cmp r5, r0
bne _0803443C
@@ -828,7 +828,7 @@ _080343DA:
lsls r4, 1
adds r1, r4
adds r0, r6, 0
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _08034480 @ =gUnknown_2024024
add r0, r8
ldrb r1, [r0]
@@ -838,7 +838,7 @@ _080343DA:
adds r0, r1
adds r1, r7, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0803443C:
ldr r0, _08034484 @ =gUnknown_2024018
ldr r0, [r0]
@@ -852,7 +852,7 @@ _0803443C:
adds r0, r7, 0
movs r1, 0x10
movs r2, 0x6
- bl sub_8045274
+ bl BlendPalette
lsls r1, r7, 1
ldr r0, _0803448C @ =gUnknown_20375F8
adds r0, r1, r0
@@ -878,7 +878,7 @@ _08034488: .4byte 0x00007fff
_0803448C: .4byte gUnknown_20375F8
_08034490: .4byte gUnknown_20371F8
_08034494: .4byte 0x04000008
- thumb_func_end sub_8034320
+ thumb_func_end BattleLoadOpponentMonSpriteGfx
thumb_func_start sub_8034498
sub_8034498: @ 8034498
@@ -893,7 +893,7 @@ sub_8034498: @ 8034498
lsrs r1, 24
mov r8, r1
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r0, _080344D8 @ =gUnknown_2024018
ldr r0, [r0]
@@ -906,7 +906,7 @@ sub_8034498: @ 8034498
bne _080344DC
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
ldr r4, [sp]
@@ -921,10 +921,10 @@ _080344DC:
_080344E4:
adds r0, r6, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
mov r0, r8
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x1
@@ -991,7 +991,7 @@ _08034562:
cmp r0, 0
bne _08034590
adds r0, r6, 0
- bl sub_80440BC
+ bl GetMonFrontSpritePal
b _0803459A
.align 2, 0
_08034584: .4byte gUnknown_823654C
@@ -1001,27 +1001,27 @@ _08034590:
adds r0, r5, 0
ldr r1, [sp, 0x4]
ldr r2, [sp]
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
_0803459A:
adds r6, r0, 0
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
adds r4, r0, 0
adds r0, r6, 0
adds r1, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r1, r9
adds r1, 0x80
adds r0, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
ldr r0, _08034638 @ =0x00000181
cmp r5, r0
bne _080345FC
@@ -1034,7 +1034,7 @@ _0803459A:
lsls r4, 1
adds r1, r4
adds r0, r6, 0
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _08034640 @ =gUnknown_2024024
add r0, r8
ldrb r1, [r0]
@@ -1044,7 +1044,7 @@ _0803459A:
adds r0, r1
adds r1, r7, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080345FC:
ldr r0, _08034644 @ =gUnknown_2024018
ldr r0, [r0]
@@ -1057,7 +1057,7 @@ _080345FC:
adds r0, r7, 0
movs r1, 0x10
movs r2, 0x6
- bl sub_8045274
+ bl BlendPalette
lsls r1, r7, 1
ldr r0, _0803464C @ =gUnknown_20375F8
adds r0, r1, r0
@@ -1091,7 +1091,7 @@ sub_8034658: @ 8034658
lsls r4, r1, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
ldr r2, _080346B8 @ =gUnknown_8E93B38
ldr r1, _080346BC @ =gUnknown_202401C
@@ -1108,22 +1108,22 @@ sub_8034658: @ 8034658
adds r6, r4, r0
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r0, _080346C0 @ =gUnknown_8E93B14
adds r1, r5, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r5, 0
adds r1, r6, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x80
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
@@ -1145,7 +1145,7 @@ sub_80346C4: @ 80346C4
lsrs r5, 16
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
adds r4, r0, 0
lsls r4, 24
lsls r5, 3
@@ -1180,7 +1180,7 @@ sub_80346C4: @ 80346C4
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _0803474C @ =gUnknown_8239A1C
adds r5, r0
adds r0, r5, 0
@@ -1214,7 +1214,7 @@ sub_8034750: @ 8034750
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
pop {r0}
bx r0
.align 2, 0
@@ -1235,11 +1235,11 @@ sub_803477C: @ 803477C
lsrs r4, 13
adds r0, r4, r0
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, _080347A4 @ =gUnknown_823957C
adds r4, r0
ldrh r0, [r4, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r4}
pop {r0}
bx r0
@@ -1253,10 +1253,10 @@ sub_80347A8: @ 80347A8
push {r4-r7,lr}
ldr r4, _080347D4 @ =gUnknown_8260260
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
adds r4, 0x8
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
bl sub_8075290
lsls r0, 24
cmp r0, 0
@@ -1313,8 +1313,8 @@ _08034830: .4byte gUnknown_2023BD6
_08034834: .4byte gUnknown_8260240
thumb_func_end sub_80347A8
- thumb_func_start sub_8034838
-sub_8034838: @ 8034838
+ thumb_func_start BattleLoadAllHealthBoxesGfx
+BattleLoadAllHealthBoxesGfx: @ 8034838
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1328,10 +1328,10 @@ _08034848:
bne _08034864
ldr r4, _08034860 @ =gUnknown_8260260
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
adds r4, 0x8
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
b _0803495A
.align 2, 0
_08034860: .4byte gUnknown_8260260
@@ -1461,10 +1461,10 @@ _0803495A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8034838
+ thumb_func_end BattleLoadAllHealthBoxesGfx
- thumb_func_start sub_8034964
-sub_8034964: @ 8034964
+ thumb_func_start LoadBattleBarGfx
+LoadBattleBarGfx: @ 8034964
push {lr}
ldr r0, _0803497C @ =gUnknown_8D093D8
ldr r1, _08034980 @ =gUnknown_202401C
@@ -1473,16 +1473,16 @@ sub_8034964: @ 8034964
lsls r2, 1
adds r1, r2
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
pop {r0}
bx r0
.align 2, 0
_0803497C: .4byte gUnknown_8D093D8
_08034980: .4byte gUnknown_202401C
- thumb_func_end sub_8034964
+ thumb_func_end LoadBattleBarGfx
- thumb_func_start sub_8034984
-sub_8034984: @ 8034984
+ thumb_func_start BattleInitAllSprites
+BattleInitAllSprites: @ 8034984
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -1509,11 +1509,11 @@ _080349A4:
.4byte _08034A48
.4byte _08034AE8
_080349C0:
- bl sub_8034B24
+ bl ClearSpritesBankHealthboxAnimData
b _08034AD0
_080349C6:
ldrb r0, [r4]
- bl sub_8034838
+ bl BattleLoadAllHealthBoxesGfx
lsls r0, 24
cmp r0, 0
beq _080349D4
@@ -1533,13 +1533,13 @@ _080349DC:
ldrb r0, [r4]
cmp r0, 0
bne _080349F8
- bl sub_8048008
+ bl CreateSafariPlayerHealthboxSprites
b _080349FE
.align 2, 0
_080349F4: .4byte gUnknown_2022B4C
_080349F8:
ldrb r0, [r4]
- bl sub_8047CE0
+ bl CreateBankHealthboxSprites
_080349FE:
ldr r2, _08034A08 @ =gUnknown_3004FF0
ldrb r1, [r4]
@@ -1550,7 +1550,7 @@ _080349FE:
_08034A08: .4byte gUnknown_3004FF0
_08034A0C:
ldrb r0, [r4]
- bl sub_804831C
+ bl SetBankHealthboxSpritePos
ldr r0, _08034A2C @ =gUnknown_2023BD6
ldrb r1, [r4]
adds r0, r1, r0
@@ -1577,7 +1577,7 @@ _08034A34:
_08034A44: .4byte gUnknown_3004FF0
_08034A48:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08034A90
@@ -1600,7 +1600,7 @@ _08034A48:
ldr r2, _08034A8C @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _08034AAE
.align 2, 0
_08034A80: .4byte gUnknown_2022B4C
@@ -1621,13 +1621,13 @@ _08034A90:
ldr r2, _08034AE0 @ =gUnknown_202402C
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_08034AAE:
ldr r1, _08034AD8 @ =gUnknown_3004FF0
ldrb r0, [r4]
adds r0, r1
ldrb r0, [r0]
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
_08034ABA:
ldrb r0, [r4]
adds r0, 0x1
@@ -1652,7 +1652,7 @@ _08034ADC: .4byte gUnknown_2023BCE
_08034AE0: .4byte gUnknown_202402C
_08034AE4: .4byte gUnknown_2023BCC
_08034AE8:
- bl sub_8035538
+ bl LoadAndCreateEnemyShadowSprites
bl sub_8127CAC
movs r6, 0x1
_08034AF2:
@@ -1660,10 +1660,10 @@ _08034AF2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8034984
+ thumb_func_end BattleInitAllSprites
- thumb_func_start sub_8034AFC
-sub_8034AFC: @ 8034AFC
+ thumb_func_start ClearSpritesHealthboxAnimData
+ClearSpritesHealthboxAnimData: @ 8034AFC
push {r4,lr}
ldr r4, _08034B20 @ =gUnknown_2024018
ldr r0, [r4]
@@ -1681,12 +1681,12 @@ sub_8034AFC: @ 8034AFC
bx r0
.align 2, 0
_08034B20: .4byte gUnknown_2024018
- thumb_func_end sub_8034AFC
+ thumb_func_end ClearSpritesHealthboxAnimData
- thumb_func_start sub_8034B24
-sub_8034B24: @ 8034B24
+ thumb_func_start ClearSpritesBankHealthboxAnimData
+ClearSpritesBankHealthboxAnimData: @ 8034B24
push {lr}
- bl sub_8034AFC
+ bl ClearSpritesHealthboxAnimData
ldr r0, _08034B3C @ =gUnknown_2024018
ldr r0, [r0]
ldr r0, [r0]
@@ -1697,10 +1697,10 @@ sub_8034B24: @ 8034B24
bx r0
.align 2, 0
_08034B3C: .4byte gUnknown_2024018
- thumb_func_end sub_8034B24
+ thumb_func_end ClearSpritesBankHealthboxAnimData
- thumb_func_start sub_8034B40
-sub_8034B40: @ 8034B40
+ thumb_func_start CopyAllBattleSpritesInvisibilities
+CopyAllBattleSpritesInvisibilities: @ 8034B40
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1757,10 +1757,10 @@ _08034BA4: .4byte gUnknown_2023BCC
_08034BA8: .4byte gUnknown_202063C
_08034BAC: .4byte gUnknown_2024018
_08034BB0: .4byte gUnknown_2023D44
- thumb_func_end sub_8034B40
+ thumb_func_end CopyAllBattleSpritesInvisibilities
- thumb_func_start sub_8034BB4
-sub_8034BB4: @ 8034BB4
+ thumb_func_start CopyBattleSpriteInvisibility
+CopyBattleSpriteInvisibility: @ 8034BB4
lsls r0, 24
lsrs r0, 24
ldr r1, _08034BE8 @ =gUnknown_2024018
@@ -1791,7 +1791,7 @@ sub_8034BB4: @ 8034BB4
_08034BE8: .4byte gUnknown_2024018
_08034BEC: .4byte gUnknown_202063C
_08034BF0: .4byte gUnknown_2023D44
- thumb_func_end sub_8034BB4
+ thumb_func_end CopyBattleSpriteInvisibility
thumb_func_start sub_8034BF4
sub_8034BF4: @ 8034BF4
@@ -1813,7 +1813,7 @@ sub_8034BF4: @ 8034BF4
beq _08034C16
b _08034D88
_08034C16:
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -1828,7 +1828,7 @@ _08034C16:
ldr r3, _08034D5C @ =gUnknown_202402C
adds r0, r3
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -1839,7 +1839,7 @@ _08034C16:
ldr r3, _08034D5C @ =gUnknown_202402C
adds r0, r3
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldr r1, [sp, 0xC]
ldrh r0, [r1]
@@ -1848,7 +1848,7 @@ _08034C16:
ldr r3, _08034D5C @ =gUnknown_202402C
adds r0, r3
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
mov r1, r8
lsls r0, r1, 3
@@ -1897,21 +1897,21 @@ _08034C16:
mov r0, r8
adds r1, r7, 0
ldr r2, [sp, 0x4]
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
adds r6, r0, 0
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
adds r7, r0, 0
adds r0, r6, 0
adds r1, r7, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r7, 0
mov r1, r10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
mov r0, r9
bl sub_80748A8
ldrb r2, [r4]
@@ -1930,7 +1930,7 @@ _08034C16:
ldr r1, _08034D7C @ =gUnknown_2024024
add r1, r9
ldrb r1, [r1]
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, [sp, 0xC]
ldrh r0, [r2]
movs r3, 0x64
@@ -1987,7 +1987,7 @@ _08034D88:
ldr r1, [r4]
ldr r1, [r1, 0x8]
ldrb r1, [r1]
- bl sub_800838C
+ bl StartSpriteAnim
mov r1, r9
lsls r0, r1, 20
movs r2, 0x80
@@ -2007,7 +2007,7 @@ _08034D88:
adds r0, r1
mov r1, r10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08034E38 @ =gUnknown_2024024
add r1, r9
ldr r0, [r4]
@@ -2026,7 +2026,7 @@ _08034D88:
mov r0, r10
movs r1, 0x10
movs r2, 0x6
- bl sub_8045274
+ bl BlendPalette
mov r3, r10
lsls r1, r3, 1
ldr r0, _08034E40 @ =gUnknown_20375F8
@@ -2059,12 +2059,12 @@ _08034E44: .4byte gUnknown_20371F8
_08034E48: .4byte 0x04000008
_08034E4C:
mov r0, r9
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldr r0, [sp]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2093,12 +2093,12 @@ _08034E80:
_08034E90:
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
mov r0, r9
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08034F10
@@ -2112,13 +2112,13 @@ _08034E90:
ldr r5, _08034F00 @ =gUnknown_2024284
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldrh r0, [r4]
muls r0, r7
adds r0, r5
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
mov r2, r8
lsls r0, r2, 3
@@ -2156,13 +2156,13 @@ _08034F10:
ldr r5, _08035078 @ =gUnknown_202402C
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x4]
ldrh r0, [r4]
muls r0, r7
adds r0, r5
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
mov r2, r8
lsls r0, r2, 3
@@ -2219,21 +2219,21 @@ _08034F5E:
mov r0, r8
adds r1, r7, 0
ldr r2, [sp, 0x4]
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
adds r6, r0, 0
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
adds r7, r0, 0
adds r0, r6, 0
adds r1, r7, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r7, 0
mov r1, r10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
ldr r0, _0803509C @ =0x00000181
cmp r8, r0
bne _08034FFC
@@ -2243,7 +2243,7 @@ _08034F5E:
lsls r4, 1
adds r1, r4
adds r0, r6, 0
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _080350A4 @ =gUnknown_2024024
ldr r1, [sp]
adds r0, r1, r0
@@ -2254,13 +2254,13 @@ _08034F5E:
adds r0, r1
mov r1, r10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_08034FFC:
ldr r3, _080350A8 @ =0x00007fff
mov r0, r10
movs r1, 0x10
movs r2, 0x6
- bl sub_8045274
+ bl BlendPalette
mov r2, r10
lsls r1, r2, 1
ldr r0, _080350AC @ =gUnknown_20375F8
@@ -2302,7 +2302,7 @@ _08034FFC:
lsls r0, 2
adds r0, r2
ldrb r1, [r4]
- bl sub_800838C
+ bl StartSpriteAnim
_08035062:
add sp, 0x18
pop {r3-r5}
@@ -2343,11 +2343,11 @@ sub_80350BC: @ 80350BC
cmp r1, 0
bne _08035158
adds r0, r4, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080350FC
@@ -2358,7 +2358,7 @@ sub_80350BC: @ 80350BC
adds r1, 0x4
adds r1, r4
ldr r1, [r1]
- bl sub_800EBC0
+ bl LZDecompressVram
b _0803510E
.align 2, 0
_080350F4: .4byte gUnknown_8D2D0B4
@@ -2371,7 +2371,7 @@ _080350FC:
adds r1, 0x4
adds r1, r4
ldr r1, [r1]
- bl sub_800EBC0
+ bl LZDecompressVram
_0803510E:
movs r3, 0x1
lsls r6, 4
@@ -2398,7 +2398,7 @@ _08035120:
adds r1, r6, r0
adds r0, r7, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0803519A
.align 2, 0
_08035144: .4byte gUnknown_8D2D2F4
@@ -2408,7 +2408,7 @@ _08035150: .4byte 0x040000d4
_08035154: .4byte 0x84000200
_08035158:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08035184
@@ -2421,7 +2421,7 @@ _08035158:
ldr r1, _08035180 @ =gUnknown_202402C
adds r0, r1
adds r1, r4, 0
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
b _0803519A
.align 2, 0
_0803517C: .4byte gUnknown_2023BCE
@@ -2446,8 +2446,8 @@ _080351A0: .4byte gUnknown_2023BCE
_080351A4: .4byte gUnknown_2024284
thumb_func_end sub_80350BC
- thumb_func_start sub_80351A8
-sub_80351A8: @ 80351A8
+ thumb_func_start LoadBattleMonGfxAndAnimate
+LoadBattleMonGfxAndAnimate: @ 80351A8
push {r4-r6,lr}
adds r5, r1, 0
adds r4, r2, 0
@@ -2469,7 +2469,7 @@ sub_80351A8: @ 80351A8
adds r0, r6, r0
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
cmp r5, 0
bne _080351EC
adds r0, r6, 0
@@ -2488,10 +2488,10 @@ _080351F2:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80351A8
+ thumb_func_end LoadBattleMonGfxAndAnimate
- thumb_func_start sub_8035200
-sub_8035200: @ 8035200
+ thumb_func_start TrySetBehindSubstituteSpriteBit
+TrySetBehindSubstituteSpriteBit: @ 8035200
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -2513,10 +2513,10 @@ _08035220:
bx r0
.align 2, 0
_08035224: .4byte gUnknown_2024018
- thumb_func_end sub_8035200
+ thumb_func_end TrySetBehindSubstituteSpriteBit
- thumb_func_start sub_8035228
-sub_8035228: @ 8035228
+ thumb_func_start ClearBehindSubstituteBit
+ClearBehindSubstituteBit: @ 8035228
lsls r0, 24
ldr r1, _08035240 @ =gUnknown_2024018
ldr r1, [r1]
@@ -2531,30 +2531,30 @@ sub_8035228: @ 8035228
bx lr
.align 2, 0
_08035240: .4byte gUnknown_2024018
- thumb_func_end sub_8035228
+ thumb_func_end ClearBehindSubstituteBit
- thumb_func_start sub_8035244
-sub_8035244: @ 8035244
+ thumb_func_start HandleLowHpMusicChange
+HandleLowHpMusicChange: @ 8035244
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 24
lsrs r6, r1, 24
adds r7, r6, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r4, 16
asrs r4, 16
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2634,13 +2634,13 @@ _0803530E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8035244
+ thumb_func_end HandleLowHpMusicChange
- thumb_func_start sub_8035314
-sub_8035314: @ 8035314
+ thumb_func_start BattleStopLowHpSound
+BattleStopLowHpSound: @ 8035314
push {r4-r6,lr}
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
ldr r5, _08035364 @ =gUnknown_2024018
@@ -2677,33 +2677,33 @@ _08035356:
bx r0
.align 2, 0
_08035364: .4byte gUnknown_2024018
- thumb_func_end sub_8035314
+ thumb_func_end BattleStopLowHpSound
- thumb_func_start sub_8035368
-sub_8035368: @ 8035368
+ thumb_func_start GetMonHPBarLevel
+GetMonHPBarLevel: @ 8035368
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r4, 16
asrs r4, 16
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8035368
+ thumb_func_end GetMonHPBarLevel
thumb_func_start sub_803539C
sub_803539C: @ 803539C
@@ -2720,12 +2720,12 @@ sub_803539C: @ 803539C
cmp r0, 0
beq _08035432
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r8, r0
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -2734,7 +2734,7 @@ sub_803539C: @ 803539C
lsls r0, r1, 1
adds r0, r5
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2742,7 +2742,7 @@ sub_803539C: @ 803539C
lsls r0, r1, 1
adds r0, r5
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
lsls r0, 24
lsrs r5, r0, 24
movs r7, 0x64
@@ -2752,12 +2752,12 @@ sub_803539C: @ 803539C
adds r4, r0, r6
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0803540E
adds r0, r4, 0
mov r1, r8
- bl sub_8035244
+ bl HandleLowHpMusicChange
_0803540E:
bl sub_8075290
lsls r0, 24
@@ -2768,12 +2768,12 @@ _0803540E:
adds r4, r0, r6
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08035432
adds r0, r4, 0
mov r1, r9
- bl sub_8035244
+ bl HandleLowHpMusicChange
_08035432:
pop {r3,r4}
mov r8, r3
@@ -2905,15 +2905,15 @@ _08035530: .4byte gUnknown_2024018
_08035534: .4byte gUnknown_2023BCC
thumb_func_end sub_8035450
- thumb_func_start sub_8035538
-sub_8035538: @ 8035538
+ thumb_func_start LoadAndCreateEnemyShadowSprites
+LoadAndCreateEnemyShadowSprites: @ 8035538
push {r4-r7,lr}
mov r7, r8
push {r7}
ldr r0, _08035614 @ =gUnknown_8250A0C
bl sub_800F034
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2938,7 +2938,7 @@ sub_8035538: @ 8035538
mov r0, r8
adds r1, r4, 0
movs r3, 0xC8
- bl sub_8006F8C
+ bl CreateSprite
ldr r6, _0803561C @ =gUnknown_2024018
ldr r1, [r6]
ldr r2, [r1, 0x4]
@@ -2962,7 +2962,7 @@ sub_8035538: @ 8035538
cmp r0, 0
beq _0803560A
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2985,7 +2985,7 @@ sub_8035538: @ 8035538
mov r0, r8
adds r1, r4, 0
movs r3, 0xC8
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r6]
ldr r2, [r1, 0x4]
lsls r1, r5, 1
@@ -3013,10 +3013,10 @@ _08035614: .4byte gUnknown_8250A0C
_08035618: .4byte gUnknown_8250A1C
_0803561C: .4byte gUnknown_2024018
_08035620: .4byte gUnknown_202063C
- thumb_func_end sub_8035538
+ thumb_func_end LoadAndCreateEnemyShadowSprites
- thumb_func_start sub_8035624
-sub_8035624: @ 8035624
+ thumb_func_start SpriteCB_EnemyShadow
+SpriteCB_EnemyShadow: @ 8035624
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3047,13 +3047,13 @@ sub_8035624: @ 8035624
cmp r0, 0
bne _08035674
_08035660:
- ldr r0, _08035670 @ =sub_80356FC
+ ldr r0, _08035670 @ =SpriteCB_SetInvisible
str r0, [r5, 0x1C]
b _080356EA
.align 2, 0
_08035668: .4byte gUnknown_2023D44
_0803566C: .4byte gUnknown_202063C
-_08035670: .4byte sub_80356FC
+_08035670: .4byte SpriteCB_SetInvisible
_08035674:
ldr r0, _08035690 @ =gUnknown_2037EE1
ldrb r0, [r0]
@@ -3126,20 +3126,20 @@ _080356EA:
.align 2, 0
_080356F4: .4byte gUnknown_2024018
_080356F8: .4byte gUnknown_823A004
- thumb_func_end sub_8035624
+ thumb_func_end SpriteCB_EnemyShadow
- thumb_func_start sub_80356FC
-sub_80356FC: @ 80356FC
+ thumb_func_start SpriteCB_SetInvisible
+SpriteCB_SetInvisible: @ 80356FC
adds r0, 0x3E
ldrb r1, [r0]
movs r2, 0x4
orrs r1, r2
strb r1, [r0]
bx lr
- thumb_func_end sub_80356FC
+ thumb_func_end SpriteCB_SetInvisible
- thumb_func_start sub_8035708
-sub_8035708: @ 8035708
+ thumb_func_start SetBankEnemyShadowSpriteCallback
+SetBankEnemyShadowSpriteCallback: @ 8035708
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3147,7 +3147,7 @@ sub_8035708: @ 8035708
lsls r1, 16
lsrs r5, r1, 16
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08035784
@@ -3178,13 +3178,13 @@ _08035732:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, _08035764 @ =sub_8035624
+ ldr r1, _08035764 @ =SpriteCB_EnemyShadow
b _08035782
.align 2, 0
_08035758: .4byte gUnknown_2024018
_0803575C: .4byte gUnknown_823A004
_08035760: .4byte gUnknown_202063C
-_08035764: .4byte sub_8035624
+_08035764: .4byte SpriteCB_EnemyShadow
_08035768:
ldr r2, _0803578C @ =gUnknown_202063C
ldr r1, [r3, 0x4]
@@ -3198,7 +3198,7 @@ _08035768:
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, _08035790 @ =sub_80356FC
+ ldr r1, _08035790 @ =SpriteCB_SetInvisible
_08035782:
str r1, [r0]
_08035784:
@@ -3207,11 +3207,11 @@ _08035784:
bx r0
.align 2, 0
_0803578C: .4byte gUnknown_202063C
-_08035790: .4byte sub_80356FC
- thumb_func_end sub_8035708
+_08035790: .4byte SpriteCB_SetInvisible
+ thumb_func_end SetBankEnemyShadowSpriteCallback
- thumb_func_start sub_8035794
-sub_8035794: @ 8035794
+ thumb_func_start EnemyShadowCallbackToSetInvisible
+EnemyShadowCallbackToSetInvisible: @ 8035794
lsls r0, 24
lsrs r0, 24
ldr r2, _080357BC @ =gUnknown_202063C
@@ -3228,14 +3228,14 @@ sub_8035794: @ 8035794
lsls r0, 2
adds r2, 0x1C
adds r0, r2
- ldr r1, _080357C4 @ =sub_80356FC
+ ldr r1, _080357C4 @ =SpriteCB_SetInvisible
str r1, [r0]
bx lr
.align 2, 0
_080357BC: .4byte gUnknown_202063C
_080357C0: .4byte gUnknown_2024018
-_080357C4: .4byte sub_80356FC
- thumb_func_end sub_8035794
+_080357C4: .4byte SpriteCB_SetInvisible
+ thumb_func_end EnemyShadowCallbackToSetInvisible
thumb_func_start sub_80357C8
sub_80357C8: @ 80357C8
@@ -3357,8 +3357,8 @@ _08035894: .4byte 0x06000240
_08035898: .4byte 0x06000600
thumb_func_end sub_80357C8
- thumb_func_start sub_803589C
-sub_803589C: @ 803589C
+ thumb_func_start ClearTemporarySpeciesSpriteData
+ClearTemporarySpeciesSpriteData: @ 803589C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3377,7 +3377,7 @@ sub_803589C: @ 803589C
cmp r1, 0
bne _080358C4
adds r0, r4, 0
- bl sub_8035228
+ bl ClearBehindSubstituteBit
_080358C4:
pop {r4}
pop {r0}
@@ -3385,10 +3385,10 @@ _080358C4:
.align 2, 0
_080358CC: .4byte gUnknown_2024018
_080358D0: .4byte gUnknown_2024024
- thumb_func_end sub_803589C
+ thumb_func_end ClearTemporarySpeciesSpriteData
- thumb_func_start sub_80358D4
-sub_80358D4: @ 80358D4
+ thumb_func_start AllocateMonSpritesGfx
+AllocateMonSpritesGfx: @ 80358D4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3399,11 +3399,11 @@ sub_80358D4: @ 80358D4
str r6, [r4]
movs r0, 0xC0
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0x80
lsls r0, 8
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1]
_080358FA:
@@ -3478,7 +3478,7 @@ _08035932:
bls _080358FA
movs r0, 0x80
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, _080359A4 @ =gUnknown_202401C
ldr r1, [r1]
movs r2, 0xBA
@@ -3495,10 +3495,10 @@ _08035932:
.align 2, 0
_080359A4: .4byte gUnknown_202401C
_080359A8: .4byte gUnknown_825DEF0
- thumb_func_end sub_80358D4
+ thumb_func_end AllocateMonSpritesGfx
- thumb_func_start sub_80359AC
-sub_80359AC: @ 80359AC
+ thumb_func_start FreeMonSpritesGfx
+FreeMonSpritesGfx: @ 80359AC
push {r4-r6,lr}
ldr r6, _08035A24 @ =gUnknown_202401C
ldr r0, [r6]
@@ -3510,7 +3510,7 @@ sub_80359AC: @ 80359AC
ldr r0, [r0]
cmp r0, 0
beq _080359D2
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
movs r1, 0xBE
lsls r1, 1
@@ -3525,7 +3525,7 @@ _080359D2:
ldr r0, [r0]
cmp r0, 0
beq _080359F0
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
movs r1, 0xBC
lsls r1, 1
@@ -3538,20 +3538,20 @@ _080359F0:
lsls r5, 1
adds r0, r5
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
adds r5, r0, r5
movs r4, 0
str r4, [r5]
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r4, [r0]
str r4, [r0, 0x4]
str r4, [r0, 0x8]
str r4, [r0, 0xC]
str r4, [r0, 0x10]
- bl sub_8002BC4
+ bl Free
str r4, [r6]
_08035A1E:
pop {r4-r6}
@@ -3559,34 +3559,34 @@ _08035A1E:
bx r0
.align 2, 0
_08035A24: .4byte gUnknown_202401C
- thumb_func_end sub_80359AC
+ thumb_func_end FreeMonSpritesGfx
- thumb_func_start sub_8035A28
-sub_8035A28: @ 8035A28
+ thumb_func_start ShouldPlayNormalPokeCry
+ShouldPlayNormalPokeCry: @ 8035A28
push {r4,r5,lr}
adds r5, r0, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08035A6C @ =0x00000fff
ands r1, r0
cmp r1, 0
bne _08035A70
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r4, 16
asrs r4, 16
lsls r1, 16
asrs r1, 16
adds r0, r4, 0
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -3601,6 +3601,6 @@ _08035A72:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8035A28
+ thumb_func_end ShouldPlayNormalPokeCry
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_interface.s b/asm/battle_interface.s
index cfd0ca01a..b76447277 100644
--- a/asm/battle_interface.s
+++ b/asm/battle_interface.s
@@ -255,8 +255,8 @@ sub_8047CAC: @ 8047CAC
bx r0
thumb_func_end sub_8047CAC
- thumb_func_start sub_8047CE0
-sub_8047CE0: @ 8047CE0
+ thumb_func_start CreateBankHealthboxSprites
+CreateBankHealthboxSprites: @ 8047CE0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -273,7 +273,7 @@ sub_8047CE0: @ 8047CE0
cmp r0, 0
bne _08047DF4
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08047D78
@@ -282,14 +282,14 @@ sub_8047CE0: @ 8047CE0
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r7, r0, 24
ldr r4, _08047D6C @ =gUnknown_202063C
@@ -332,14 +332,14 @@ _08047D78:
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08047DE4 @ =gUnknown_202063C
@@ -385,12 +385,12 @@ _08047DEC: .4byte 0xfffffc00
_08047DF0: .4byte sub_8048128
_08047DF4:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08047E98
mov r0, r10
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -402,11 +402,11 @@ _08047DF4:
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
mov r0, r10
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -417,7 +417,7 @@ _08047DF4:
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r7, r0, 24
ldr r4, _08047E88 @ =gUnknown_202063C
@@ -459,7 +459,7 @@ _08047E90: .4byte 0xfffffc00
_08047E94: .4byte sub_8048128
_08047E98:
mov r0, r10
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -471,11 +471,11 @@ _08047E98:
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
mov r0, r10
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 25
@@ -486,7 +486,7 @@ _08047E98:
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r7, r0, 24
ldr r4, _08047FE4 @ =gUnknown_202063C
@@ -533,7 +533,7 @@ _08047F1C:
movs r1, 0x8C
movs r2, 0x3C
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -544,14 +544,14 @@ _08047F1C:
mov r8, r1
add r4, r8
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
adds r1, r0, 0
lsls r1, 24
lsrs r1, 21
ldr r0, _08047FFC @ =gUnknown_82603C4
adds r1, r0
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r2, r4, 0
adds r2, 0x42
ldrb r1, [r2]
@@ -570,7 +570,7 @@ _08047F1C:
orrs r0, r1
strb r0, [r4, 0x5]
movs r0, 0x1
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
ldrh r1, [r4, 0x4]
lsls r1, 22
lsrs r1, 17
@@ -626,10 +626,10 @@ _08047FF8: .4byte gUnknown_82602F8
_08047FFC: .4byte gUnknown_82603C4
_08048000: .4byte 0x06010000
_08048004: .4byte 0x04000010
- thumb_func_end sub_8047CE0
+ thumb_func_end CreateBankHealthboxSprites
- thumb_func_start sub_8048008
-sub_8048008: @ 8048008
+ thumb_func_start CreateSafariPlayerHealthboxSprites
+CreateSafariPlayerHealthboxSprites: @ 8048008
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -639,7 +639,7 @@ sub_8048008: @ 8048008
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
@@ -647,7 +647,7 @@ sub_8048008: @ 8048008
movs r1, 0xF0
movs r2, 0xA0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, _08048098 @ =gUnknown_202063C
@@ -703,10 +703,10 @@ _08048098: .4byte gUnknown_202063C
_0804809C: .4byte 0x000003ff
_080480A0: .4byte 0xfffffc00
_080480A4: .4byte sub_8048128
- thumb_func_end sub_8048008
+ thumb_func_end CreateSafariPlayerHealthboxSprites
- thumb_func_start sub_80480A8
-sub_80480A8: @ 80480A8
+ thumb_func_start GetHealthboxElementGfxPtr
+GetHealthboxElementGfxPtr: @ 80480A8
lsls r0, 24
lsrs r0, 19
ldr r1, _080480B4 @ =gUnknown_8D11BC4
@@ -714,7 +714,7 @@ sub_80480A8: @ 80480A8
bx lr
.align 2, 0
_080480B4: .4byte gUnknown_8D11BC4
- thumb_func_end sub_80480A8
+ thumb_func_end GetHealthboxElementGfxPtr
thumb_func_start sub_80480B8
sub_80480B8: @ 80480B8
@@ -802,8 +802,8 @@ sub_8048128: @ 8048128
_0804814C: .4byte gUnknown_202063C
thumb_func_end sub_8048128
- thumb_func_start sub_8048150
-sub_8048150: @ 8048150
+ thumb_func_start SetBattleBarStruct
+SetBattleBarStruct: @ 8048150
push {r4-r7,lr}
ldr r7, [sp, 0x14]
lsls r0, 24
@@ -830,10 +830,10 @@ sub_8048150: @ 8048150
.align 2, 0
_08048180: .4byte gUnknown_2024018
_08048184: .4byte 0xffff8000
- thumb_func_end sub_8048150
+ thumb_func_end SetBattleBarStruct
- thumb_func_start sub_8048188
-sub_8048188: @ 8048188
+ thumb_func_start SetHealthboxSpriteInvisible
+SetHealthboxSpriteInvisible: @ 8048188
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -872,10 +872,10 @@ sub_8048188: @ 8048188
bx r0
.align 2, 0
_080481D0: .4byte gUnknown_202063C
- thumb_func_end sub_8048188
+ thumb_func_end SetHealthboxSpriteInvisible
- thumb_func_start sub_80481D4
-sub_80481D4: @ 80481D4
+ thumb_func_start SetHealthboxSpriteVisible
+SetHealthboxSpriteVisible: @ 80481D4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -917,10 +917,10 @@ sub_80481D4: @ 80481D4
bx r0
.align 2, 0
_08048224: .4byte gUnknown_202063C
- thumb_func_end sub_80481D4
+ thumb_func_end SetHealthboxSpriteVisible
- thumb_func_start sub_8048228
-sub_8048228: @ 8048228
+ thumb_func_start UpdateSpritePos
+UpdateSpritePos: @ 8048228
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -936,10 +936,10 @@ sub_8048228: @ 8048228
bx r0
.align 2, 0
_08048244: .4byte gUnknown_202063C
- thumb_func_end sub_8048228
+ thumb_func_end UpdateSpritePos
- thumb_func_start sub_8048248
-sub_8048248: @ 8048248
+ thumb_func_start DestoryHealthboxSprite
+DestoryHealthboxSprite: @ 8048248
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -953,30 +953,30 @@ sub_8048248: @ 8048248
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x38
ldrsh r1, [r4, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08048284: .4byte gUnknown_202063C
- thumb_func_end sub_8048248
+ thumb_func_end DestoryHealthboxSprite
thumb_func_start nullsub_21
nullsub_21: @ 8048288
bx lr
thumb_func_end nullsub_21
- thumb_func_start sub_804828C
-sub_804828C: @ 804828C
+ thumb_func_start UpdateOamPriorityInAllHealthboxes
+UpdateOamPriorityInAllHealthboxes: @ 804828C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1049,10 +1049,10 @@ _08048304:
_08048310: .4byte gUnknown_2023BCC
_08048314: .4byte gUnknown_202063C
_08048318: .4byte gUnknown_3004FF0
- thumb_func_end sub_804828C
+ thumb_func_end UpdateOamPriorityInAllHealthboxes
- thumb_func_start sub_804831C
-sub_804831C: @ 804831C
+ thumb_func_start SetBankHealthboxSpritePos
+SetBankHealthboxSpritePos: @ 804831C
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -1063,7 +1063,7 @@ sub_804831C: @ 804831C
cmp r0, 0
bne _08048348
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08048342
@@ -1076,7 +1076,7 @@ _08048342:
b _08048380
_08048348:
adds r0, r6, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1113,16 +1113,16 @@ _08048380:
ldrb r0, [r0]
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8048228
+ bl UpdateSpritePos
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_08048394: .4byte gUnknown_3004FF0
- thumb_func_end sub_804831C
+ thumb_func_end SetBankHealthboxSpritePos
- thumb_func_start sub_8048398
-sub_8048398: @ 8048398
+ thumb_func_start UpdateLvlInHealthbox
+UpdateLvlInHealthbox: @ 8048398
push {r4-r6,lr}
sub sp, 0x14
adds r5, r0, 0
@@ -1152,7 +1152,7 @@ sub_8048398: @ 8048398
add r3, sp, 0x10
mov r0, sp
movs r2, 0x3
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r6, r0, 0
ldr r0, _08048414 @ =gUnknown_202063C
lsls r1, r5, 4
@@ -1165,7 +1165,7 @@ sub_8048398: @ 8048398
ldrh r0, [r1, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048420
@@ -1199,7 +1199,7 @@ _08048424:
bx r0
.align 2, 0
_0804843C: .4byte 0x06010400
- thumb_func_end sub_8048398
+ thumb_func_end UpdateLvlInHealthbox
thumb_func_start sub_8048440
sub_8048440: @ 8048440
@@ -1226,7 +1226,7 @@ sub_8048440: @ 8048440
ldrh r0, [r4, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048514
@@ -1248,7 +1248,7 @@ sub_8048440: @ 8048440
add r0, sp, 0x10
movs r1, 0
movs r2, 0x5
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r5, r0, 0
ldrh r0, [r4, 0x4]
lsls r0, 22
@@ -1276,7 +1276,7 @@ _080484BC:
add r0, sp, 0x10
movs r1, 0x4
movs r2, 0x5
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r5, r0, 0
ldrh r4, [r4, 0x4]
lsls r4, 22
@@ -1321,7 +1321,7 @@ _08048514:
cmp r0, 0x1
beq _0804854C
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1341,7 +1341,7 @@ _08048564:
ldrh r0, [r7, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048580
@@ -1490,7 +1490,7 @@ _0804866A:
cmp r2, 0
bne _08048698
ldr r1, _08048704 @ =gUnknown_8260540
- bl sub_8008D84
+ bl StringCopy
_08048698:
ldr r0, _08048708 @ =gUnknown_202401C
ldr r0, [r0]
@@ -1616,12 +1616,12 @@ _080487A0: .4byte 0x06010000
_080487A4: .4byte 0x05000008
_080487A8:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080487DC
movs r0, 0x74
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
ldr r2, _080487EC @ =gUnknown_202063C
mov r3, r9
lsls r1, r3, 4
@@ -1678,7 +1678,7 @@ sub_80487F8: @ 80487F8
ldrh r0, [r0, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
ldr r1, _080488B4 @ =gUnknown_202401C
ldr r2, [r1]
movs r3, 0xBA
@@ -1697,7 +1697,7 @@ sub_80487F8: @ 80487F8
movs r1, 0x5
mov r8, r1
adds r0, r4, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
mov r4, sp
adds r4, 0x16
@@ -1706,7 +1706,7 @@ sub_80487F8: @ 80487F8
adds r0, r1
ldr r1, [r0]
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -1766,7 +1766,7 @@ _080488D4:
_080488D8:
movs r0, 0x2B
_080488DA:
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
lsls r1, r5, 6
adds r1, r6, r1
ldr r2, _080489F8 @ =0x04000008
@@ -1986,7 +1986,7 @@ _08048A8C:
lsls r0, r2, 24
lsrs r7, r0, 24
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1998,7 +1998,7 @@ _08048AA2:
cmp r0, 0
bne _08048ABA
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048ABA
@@ -2032,7 +2032,7 @@ _08048ABA:
lsls r0, 27
lsrs r4, r0, 31
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048BE8
@@ -2081,7 +2081,7 @@ _08048B16:
ldr r1, _08048B9C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2117,9 +2117,9 @@ _08048BA0:
ldr r2, _08048BDC @ =gUnknown_2024284
adds r1, r2
movs r2, 0x5
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
movs r0, 0x75
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
ldrb r2, [r6]
lsls r1, r2, 4
adds r1, r2
@@ -2188,7 +2188,7 @@ _08048C14:
ldr r1, _08048C90 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2204,7 +2204,7 @@ _08048C14:
_08048C6E:
adds r0, r2
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -2227,7 +2227,7 @@ _08048C94:
ldr r4, _08048D04 @ =gUnknown_202402C
adds r1, r4
movs r2, 0x5
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
ldr r0, _08048D08 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x80
@@ -2240,7 +2240,7 @@ _08048C94:
muls r1, r5
adds r1, r4
movs r2, 0x4
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_08048CCA:
ldr r0, _08048D0C @ =gUnknown_3004FF0
add r0, r9
@@ -2299,14 +2299,14 @@ sub_8048D14: @ 8048D14
str r3, [sp, 0x10]
cmp r4, 0
beq _08048D44
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _08048D88
_08048D44:
ldr r0, [sp, 0x8]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08048D64
@@ -2384,13 +2384,13 @@ _08048DC4:
bl sub_800F034
ldr r0, _08048E4C @ =gUnknown_826049C
adds r0, r4, r0
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08048E50 @ =gUnknown_826047C
adds r0, r4, r0
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _08048E54 @ =gUnknown_826048C
adds r0, r4, r0
- bl sub_8008928
+ bl LoadSpritePalette
mov r1, r9
adds r0, r1, r7
lsls r0, 3
@@ -2401,7 +2401,7 @@ _08048DC4:
ldr r3, [sp, 0x24]
asrs r2, r3, 16
movs r3, 0xA
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x18]
@@ -2413,7 +2413,7 @@ _08048DC4:
adds r4, r0, r1
ldr r1, _08048E60 @ =gUnknown_82603FC
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
mov r0, r8
strh r0, [r4, 0x24]
strh r5, [r4, 0x2E]
@@ -2467,7 +2467,7 @@ _08048E80:
asrs r1, r5, 16
asrs r2, 16
movs r3, 0x9
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
strb r0, [r4]
ldr r0, [sp, 0x10]
cmp r0, 0
@@ -2478,7 +2478,7 @@ _08048E80:
lsls r1, 2
ldr r2, _08048F20 @ =gUnknown_2020658
adds r1, r2
- ldr r0, _08048F24 @ =sub_80496A0
+ ldr r0, _08048F24 @ =SpriteCB_StatusSummaryBallsOnSwitchout
str r0, [r1]
_08048EB0:
ldr r5, _08048F14 @ =gUnknown_202063C
@@ -2536,7 +2536,7 @@ _08048F14: .4byte gUnknown_202063C
_08048F18: .4byte gUnknown_82604EC
_08048F1C: .4byte 0xfffc0000
_08048F20: .4byte gUnknown_2020658
-_08048F24: .4byte sub_80496A0
+_08048F24: .4byte SpriteCB_StatusSummaryBallsOnSwitchout
_08048F28:
ldrb r0, [r4]
lsls r2, r0, 4
@@ -2588,7 +2588,7 @@ _08048F66:
b _08048E80
_08048F86:
ldr r0, [sp, 0x8]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0804906E
@@ -2819,7 +2819,7 @@ _0804913E:
_08049148:
ldr r0, _080491A8 @ =nullsub_43
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _080491AC @ =gUnknown_3005090
@@ -2853,7 +2853,7 @@ _08049172:
strh r6, [r0, 0x1C]
movs r0, 0x6B
movs r1, 0
- bl sub_80722F4
+ bl PlaySE12WithPanning
adds r0, r4, 0
add sp, 0x28
pop {r3-r5}
@@ -2905,10 +2905,10 @@ _080491DE:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080492C0 @ =gUnknown_3005090
ldr r0, [sp, 0xC]
add r0, r8
@@ -2966,7 +2966,7 @@ _0804925A:
_08049268:
ldr r0, [sp, 0x8]
str r3, [sp, 0x14]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
ldr r3, [sp, 0x14]
@@ -3063,7 +3063,7 @@ _08049302:
ldr r1, _08049350 @ =sub_8049568
str r1, [r3]
ldr r1, _08049354 @ =gUnknown_8260404
- bl sub_8008A58
+ bl SetSubspriteTables
ldr r1, _08049358 @ =gUnknown_3005090
ldr r0, [sp, 0xC]
add r0, r8
@@ -3133,7 +3133,7 @@ sub_8049388: @ 8049388
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_080493C8:
movs r1, 0x26
ldrsh r0, [r4, r1]
@@ -3189,14 +3189,14 @@ _08049412:
lsls r0, 2
ldr r4, _08049460 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
movs r5, 0x1
_08049442:
mov r1, sp
@@ -3206,7 +3206,7 @@ _08049442:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
adds r5, 0x1
cmp r5, 0x5
ble _08049442
@@ -3221,12 +3221,12 @@ _08049464:
bne _08049482
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08049482:
add sp, 0x8
pop {r4-r7}
@@ -3260,7 +3260,7 @@ sub_804948C: @ 804948C
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _08049546
.align 2, 0
_080494C4: .4byte gUnknown_3005090
@@ -3288,14 +3288,14 @@ _080494DA:
lsls r0, 2
ldr r4, _08049524 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
movs r5, 0x1
_0804950A:
mov r1, sp
@@ -3305,7 +3305,7 @@ _0804950A:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
adds r5, 0x1
cmp r5, 0x5
ble _0804950A
@@ -3319,12 +3319,12 @@ _08049528:
bne _08049546
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08049546:
add sp, 0x8
pop {r4-r7}
@@ -3332,8 +3332,8 @@ _08049546:
bx r0
thumb_func_end sub_804948C
- thumb_func_start sub_8049550
-sub_8049550: @ 8049550
+ thumb_func_start SpriteCB_StatusSummaryBar
+SpriteCB_StatusSummaryBar: @ 8049550
push {lr}
adds r1, r0, 0
ldrh r2, [r1, 0x24]
@@ -3347,7 +3347,7 @@ sub_8049550: @ 8049550
_08049564:
pop {r0}
bx r0
- thumb_func_end sub_8049550
+ thumb_func_end SpriteCB_StatusSummaryBar
thumb_func_start sub_8049568
sub_8049568: @ 8049568
@@ -3381,8 +3381,8 @@ _0804958E:
bx r0
thumb_func_end sub_8049568
- thumb_func_start sub_804959C
-sub_804959C: @ 804959C
+ thumb_func_start SpriteCB_StatusSummaryBallsOnBattleStart
+SpriteCB_StatusSummaryBallsOnBattleStart: @ 804959C
push {r4,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x30]
@@ -3445,13 +3445,13 @@ _08049604:
lsls r1, 24
asrs r1, 24
movs r0, 0x6D
- bl sub_807237C
+ bl PlaySE2WithPanning
b _08049622
_08049618:
lsls r1, 24
asrs r1, 24
movs r0, 0x6C
- bl sub_8072348
+ bl PlaySE1WithPanning
_08049622:
ldr r0, _0804962C @ =nullsub_8
str r0, [r4, 0x1C]
@@ -3461,7 +3461,7 @@ _08049626:
bx r0
.align 2, 0
_0804962C: .4byte nullsub_8
- thumb_func_end sub_804959C
+ thumb_func_end SpriteCB_StatusSummaryBallsOnBattleStart
thumb_func_start sub_8049630
sub_8049630: @ 8049630
@@ -3526,8 +3526,8 @@ _08049694:
_0804969C: .4byte nullsub_8
thumb_func_end sub_8049630
- thumb_func_start sub_80496A0
-sub_80496A0: @ 80496A0
+ thumb_func_start SpriteCB_StatusSummaryBallsOnSwitchout
+SpriteCB_StatusSummaryBallsOnSwitchout: @ 80496A0
ldrh r2, [r0, 0x2E]
lsls r2, 24
lsrs r2, 24
@@ -3543,7 +3543,7 @@ sub_80496A0: @ 80496A0
bx lr
.align 2, 0
_080496BC: .4byte gUnknown_202063C
- thumb_func_end sub_80496A0
+ thumb_func_end SpriteCB_StatusSummaryBallsOnSwitchout
thumb_func_start sub_80496C0
sub_80496C0: @ 80496C0
@@ -3557,17 +3557,17 @@ sub_80496C0: @ 80496C0
mov r8, r0
ldr r0, _08049760 @ =gUnknown_202298C
ldr r1, _08049764 @ =gUnknown_8260556
- bl sub_8008D84
+ bl StringCopy
adds r5, r0, 0
adds r0, r7, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
mov r0, sp
- bl sub_8008D28
+ bl StringGetEnd10
adds r0, r5, 0
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
adds r5, r0, 0
movs r0, 0xFC
strb r0, [r5]
@@ -3576,12 +3576,12 @@ sub_80496C0: @ 80496C0
strb r0, [r5]
adds r5, 0x1
adds r0, r7, 0
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r6, r0, 24
adds r0, r7, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r0, 0
@@ -3595,7 +3595,7 @@ _08049720:
ldr r0, _08049768 @ =gUnknown_8245EE0
adds r1, r0
mov r0, sp
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _08049734
movs r6, 0x64
@@ -3646,7 +3646,7 @@ _08049782:
add r3, sp, 0xC
movs r1, 0
movs r2, 0x3
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r6, r0, 0
ldr r0, _080497E8 @ =gUnknown_202063C
mov r2, r8
@@ -3659,7 +3659,7 @@ _08049782:
ldrh r0, [r1, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080497F8
@@ -3742,7 +3742,7 @@ sub_804981C: @ 804981C
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0804991C
@@ -3763,10 +3763,10 @@ sub_804981C: @ 804981C
muls r0, r7
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -3782,7 +3782,7 @@ sub_804981C: @ 804981C
cmp r2, 0
beq _080498F8
movs r0, 0x46
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
lsls r1, r4, 4
adds r1, r4
lsls r1, 2
@@ -3862,7 +3862,7 @@ sub_8049934: @ 8049934
lsrs r0, 24
mov r10, r0
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080499A4
@@ -3875,7 +3875,7 @@ sub_8049934: @ 8049934
ldr r1, _080499A0 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
bl sub_8075290
lsls r0, 24
@@ -3900,7 +3900,7 @@ _080499A4:
ldr r1, _080499E4 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
movs r1, 0x11
mov r8, r1
@@ -3914,7 +3914,7 @@ _080499C0:
bl sub_8049BE4
lsls r0, 24
lsrs r0, 24
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r0, 0x2
b _08049AF4
@@ -3931,7 +3931,7 @@ _080499E8:
bl sub_8049BE4
lsls r0, 24
lsrs r0, 24
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r0, 0
b _08049AF4
@@ -3945,7 +3945,7 @@ _08049A06:
bl sub_8049BE4
lsls r0, 24
lsrs r0, 24
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r0, 0x4
b _08049AF4
@@ -3959,7 +3959,7 @@ _08049A24:
bl sub_8049BE4
lsls r0, 24
lsrs r0, 24
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r0, 0x3
b _08049AF4
@@ -3973,13 +3973,13 @@ _08049A42:
bl sub_8049BE4
lsls r0, 24
lsrs r0, 24
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r0, 0x1
b _08049AF4
_08049A60:
movs r0, 0x27
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
adds r6, r0, 0
movs r4, 0
mov r2, r9
@@ -4019,7 +4019,7 @@ _08049A7E:
cmp r0, 0
bne _08049AD4
movs r0, 0x1
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
ldr r2, _08049AE0 @ =gUnknown_202063C
mov r3, r10
lsls r1, r3, 4
@@ -4064,7 +4064,7 @@ _08049AF4:
lsls r3, 1
adds r1, r4, r3
movs r2, 0x2
- bl sub_8070424
+ bl FillPalette
lsls r4, 1
ldr r0, _08049BCC @ =gUnknown_20373F8
adds r0, r4, r0
@@ -4090,7 +4090,7 @@ _08049AF4:
cmp r0, 0x1
beq _08049B62
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4107,7 +4107,7 @@ _08049B62:
cmp r0, 0
bne _08049BAE
movs r0, 0
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
mov r3, r10
lsls r4, r3, 4
add r4, r10
@@ -4122,7 +4122,7 @@ _08049B62:
adds r2, r5, 0
bl CpuSet
movs r0, 0x41
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
ldrh r1, [r4, 0x4]
lsls r1, 22
lsrs r1, 17
@@ -4262,7 +4262,7 @@ sub_8049CAC: @ 8049CAC
movs r1, 0
movs r2, 0x3
mov r3, sp
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r5, r0, 0
ldr r1, _08049D04 @ =gUnknown_202063C
lsls r0, r4, 4
@@ -4297,8 +4297,8 @@ _08049D08: .4byte 0x06010040
_08049D0C: .4byte 0x06010800
thumb_func_end sub_8049CAC
- thumb_func_start sub_8049D10
-sub_8049D10: @ 8049D10
+ thumb_func_start UpdateLeftNoOfBallsTextOnHealthbox
+UpdateLeftNoOfBallsTextOnHealthbox: @ 8049D10
push {r4,r5,lr}
sub sp, 0x14
adds r4, r0, 0
@@ -4306,7 +4306,7 @@ sub_8049D10: @ 8049D10
lsrs r4, 24
ldr r1, _08049D84 @ =gUnknown_83FE81C
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08049D88 @ =gUnknown_2039994
ldrb r1, [r1]
movs r2, 0
@@ -4321,7 +4321,7 @@ sub_8049D10: @ 8049D10
add r3, sp, 0x10
mov r0, sp
movs r2, 0x3
- bl sub_804A648
+ bl AddTextPrinterAndCreateWindowOnHealthbox
adds r5, r0, 0
ldr r1, _08049D8C @ =gUnknown_202063C
lsls r0, r4, 4
@@ -4355,10 +4355,10 @@ _08049D88: .4byte gUnknown_2039994
_08049D8C: .4byte gUnknown_202063C
_08049D90: .4byte 0x060102c0
_08049D94: .4byte 0x06010a00
- thumb_func_end sub_8049D10
+ thumb_func_end UpdateLeftNoOfBallsTextOnHealthbox
- thumb_func_start sub_8049D98
-sub_8049D98: @ 8049D98
+ thumb_func_start UpdateHealthboxAttribute
+UpdateHealthboxAttribute: @ 8049D98
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4386,7 +4386,7 @@ sub_8049D98: @ 8049D98
cmp r0, 0
bne _08049DD4
mov r0, r9
- bl sub_80751C4
+ bl GetBankSide
_08049DD4:
ldr r1, _08049F44 @ =gUnknown_202063C
lsls r0, r6, 4
@@ -4396,7 +4396,7 @@ _08049DD4:
ldrh r0, [r0, 0x3A]
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08049DF0
@@ -4409,18 +4409,18 @@ _08049DF0:
_08049DF8:
mov r0, r8
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_8048398
+ bl UpdateLvlInHealthbox
_08049E0C:
cmp r7, 0x1
bhi _08049E26
mov r0, r8
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -4435,7 +4435,7 @@ _08049E26:
_08049E2E:
mov r0, r8
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
asrs r1, 16
@@ -4449,21 +4449,21 @@ _08049E44:
bne _08049E80
_08049E4C:
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
mov r0, r8
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
movs r0, 0
str r0, [sp]
mov r0, r9
adds r1, r6, 0
adds r2, r4, 0
- bl sub_8048150
+ bl SetBattleBarStruct
mov r0, r9
adds r1, r6, 0
movs r2, 0
@@ -4482,22 +4482,22 @@ _08049E80:
bne _08049F06
_08049E96:
movs r0, 0x3
- bl sub_8034964
+ bl LoadBattleBarGfx
mov r0, r8
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
mov r0, r8
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
mov r0, r8
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
ldr r0, _08049F48 @ =gUnknown_8253AE4
mov r12, r0
@@ -4525,7 +4525,7 @@ _08049E96:
str r0, [sp]
mov r0, r9
adds r1, r6, 0
- bl sub_8048150
+ bl SetBattleBarStruct
mov r0, r9
adds r1, r6, 0
movs r2, 0x1
@@ -4561,7 +4561,7 @@ _08049F2E:
cmp r0, 0x1
bhi _08049FC6
adds r0, r6, 0
- bl sub_8049D10
+ bl UpdateLeftNoOfBallsTextOnHealthbox
b _08049FC6
.align 2, 0
_08049F44: .4byte gUnknown_202063C
@@ -4575,12 +4575,12 @@ _08049F50:
_08049F58:
mov r0, r8
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_8048398
+ bl UpdateLvlInHealthbox
_08049F6C:
cmp r7, 0x5
beq _08049F74
@@ -4588,21 +4588,21 @@ _08049F6C:
bne _08049FA8
_08049F74:
movs r0, 0
- bl sub_8034964
+ bl LoadBattleBarGfx
mov r0, r8
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
movs r0, 0
str r0, [sp]
mov r0, r9
adds r1, r6, 0
adds r2, r4, 0
- bl sub_8048150
+ bl SetBattleBarStruct
mov r0, r9
adds r1, r6, 0
movs r2, 0
@@ -4634,7 +4634,7 @@ _08049FC6:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8049D98
+ thumb_func_end UpdateHealthboxAttribute
thumb_func_start sub_8049FD8
sub_8049FD8: @ 8049FD8
@@ -4688,7 +4688,7 @@ _0804A024:
ldr r1, [r2, 0xC]
ldr r2, [r2, 0x4]
movs r3, 0x8
- bl sub_804A59C
+ bl GetScaledExpFraction
lsls r0, 24
lsrs r5, r0, 24
adds r7, r4, 0
@@ -4835,7 +4835,7 @@ _0804A132:
cmp r5, 0x1
bhi _0804A194
mov r0, r9
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
mov r1, sp
adds r1, r5
adds r1, 0x8
@@ -4864,7 +4864,7 @@ _0804A18C: .4byte 0x06010000
_0804A190: .4byte 0x04000008
_0804A194:
mov r0, r9
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
mov r1, sp
adds r1, r5
adds r1, 0x8
@@ -4920,7 +4920,7 @@ _0804A1D8:
ldr r1, _0804A284 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
adds r7, r5, 0
@@ -4948,7 +4948,7 @@ _0804A23A:
cmp r5, 0x3
bhi _0804A294
movs r0, 0xC
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
mov r1, sp
adds r1, r5
adds r1, 0x8
@@ -4985,7 +4985,7 @@ _0804A28C: .4byte 0x06010000
_0804A290: .4byte 0x04000008
_0804A294:
movs r0, 0xC
- bl sub_80480A8
+ bl GetHealthboxElementGfxPtr
mov r1, sp
adds r1, r5
adds r1, 0x8
@@ -5398,7 +5398,7 @@ _0804A554:
adds r1, r6, 0
mov r2, r10
mov r3, r8
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -5409,8 +5409,8 @@ _0804A554:
bx r0
thumb_func_end sub_804A510
- thumb_func_start sub_804A59C
-sub_804A59C: @ 804A59C
+ thumb_func_start GetScaledExpFraction
+GetScaledExpFraction: @ 804A59C
push {r4-r7,lr}
adds r6, r2, 0
lsls r3, 27
@@ -5449,10 +5449,10 @@ _0804A5DC:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_804A59C
+ thumb_func_end GetScaledExpFraction
- thumb_func_start sub_804A5E8
-sub_804A5E8: @ 804A5E8
+ thumb_func_start GetScaledHPFraction
+GetScaledHPFraction: @ 804A5E8
push {r4,lr}
lsls r2, 24
lsrs r2, 24
@@ -5474,10 +5474,10 @@ _0804A60C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_804A5E8
+ thumb_func_end GetScaledHPFraction
- thumb_func_start sub_804A614
-sub_804A614: @ 804A614
+ thumb_func_start GetHPBarLevel
+GetHPBarLevel: @ 804A614
push {lr}
lsls r0, 16
asrs r0, 16
@@ -5489,7 +5489,7 @@ sub_804A614: @ 804A614
b _0804A642
_0804A626:
movs r2, 0x30
- bl sub_804A5E8
+ bl GetScaledHPFraction
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x3
@@ -5504,10 +5504,10 @@ _0804A626:
_0804A642:
pop {r1}
bx r1
- thumb_func_end sub_804A614
+ thumb_func_end GetHPBarLevel
- thumb_func_start sub_804A648
-sub_804A648: @ 804A648
+ thumb_func_start AddTextPrinterAndCreateWindowOnHealthbox
+AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -5532,7 +5532,7 @@ sub_804A648: @ 804A648
lsrs r5, 24
adds r0, r5, 0
movs r1, 0x22
- bl sub_800445C
+ bl FillWindowPixelBuffer
add r1, sp, 0x14
movs r2, 0
movs r0, 0x2
@@ -5575,7 +5575,7 @@ sub_804A648: @ 804A648
bx r1
.align 2, 0
_0804A6D4: .4byte gUnknown_8260564
- thumb_func_end sub_804A648
+ thumb_func_end AddTextPrinterAndCreateWindowOnHealthbox
thumb_func_start sub_804A6D8
sub_804A6D8: @ 804A6D8
diff --git a/asm/battle_message.s b/asm/battle_message.s
index 8a0314044..df0d57614 100644
--- a/asm/battle_message.s
+++ b/asm/battle_message.s
@@ -217,7 +217,7 @@ _080D7424: .4byte gUnknown_83FD2AA
_080D7428:
mov r1, r12
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D7468
@@ -297,7 +297,7 @@ _080D74C4: .4byte gUnknown_83FD3B1
_080D74C8:
mov r1, r12
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D7520
@@ -369,7 +369,7 @@ _080D7554: .4byte gUnknown_83FD522
_080D7558:
mov r1, r10
ldrb r0, [r1, 0x17]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D75B0
@@ -461,7 +461,7 @@ _080D75F0:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
b _080D763C
.align 2, 0
_080D761C: .4byte gUnknown_2039A34
@@ -475,7 +475,7 @@ _080D762C:
muls r1, r2
ldr r2, _080D764C @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
_080D763C:
ldr r0, _080D7648 @ =gUnknown_2022AC8
bl sub_80D8720
@@ -497,7 +497,7 @@ _080D7654:
strb r0, [r4]
mov r1, r12
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -552,7 +552,7 @@ _080D76D0: .4byte gUnknown_83FE9D4
_080D76D4:
mov r1, r12
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -781,7 +781,7 @@ sub_80D7868: @ 80D7868
mov r8, r1
movs r6, 0
movs r4, 0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
mov r0, r9
@@ -924,7 +924,7 @@ _080D79F4:
_080D79FC: .4byte gUnknown_2021D04
_080D7A00:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7A1C @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -940,7 +940,7 @@ _080D7A1C: .4byte gUnknown_2023BCE
_080D7A20: .4byte gUnknown_2024284
_080D7A24:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7A40 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -956,7 +956,7 @@ _080D7A40: .4byte gUnknown_2023BCE
_080D7A44: .4byte gUnknown_202402C
_080D7A48:
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7A64 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -972,7 +972,7 @@ _080D7A64: .4byte gUnknown_2023BCE
_080D7A68: .4byte gUnknown_2024284
_080D7A6C:
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7A88 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -1075,7 +1075,7 @@ _080D7B48: .4byte gUnknown_202402C
_080D7B4C:
ldr r4, _080D7B70 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
adds r2, r4, 0
cmp r0, 0
@@ -1106,11 +1106,11 @@ _080D7B8A:
cmp r0, 0xFF
bne _080D7B80
ldrb r0, [r2]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7BB8 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -1126,11 +1126,11 @@ _080D7BB8: .4byte gUnknown_2023BCE
_080D7BBC: .4byte gUnknown_202402C
_080D7BC0:
ldrb r0, [r2]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7BDC @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -1142,16 +1142,16 @@ _080D7BDC: .4byte gUnknown_2023BCE
_080D7BE0:
ldr r4, _080D7C14 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D7C20
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7C18 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -1169,11 +1169,11 @@ _080D7C18: .4byte gUnknown_2023BCE
_080D7C1C: .4byte gUnknown_2024284
_080D7C20:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r0, 0x1
ands r0, r1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _080D7C44 @ =gUnknown_2023BCE
lsls r0, 24
lsrs r0, 23
@@ -1190,7 +1190,7 @@ _080D7C48: .4byte gUnknown_202402C
_080D7C4C:
ldr r5, _080D7C98 @ =gUnknown_2023D6B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D7CB0
@@ -1246,7 +1246,7 @@ _080D7CBC: .4byte gUnknown_2023BCE
_080D7CC0:
ldr r5, _080D7D0C @ =gUnknown_2023D6C
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D7D24
@@ -1302,7 +1302,7 @@ _080D7D30: .4byte gUnknown_2023BCE
_080D7D34:
ldr r5, _080D7D80 @ =gUnknown_2023D6E
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D7D98
@@ -1358,7 +1358,7 @@ _080D7DA4: .4byte gUnknown_2023BCE
_080D7DA8:
ldr r5, _080D7DF4 @ =gUnknown_2023BC4
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D7E0C
@@ -1414,7 +1414,7 @@ _080D7E18: .4byte gUnknown_2023BCE
_080D7E1C:
ldr r5, _080D7E68 @ =gUnknown_2023FC4
ldrb r0, [r5, 0x17]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D7E80
@@ -1579,10 +1579,10 @@ _080D7F64:
ldr r0, _080D7F88 @ =gUnknown_2023F54
adds r1, r0
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080D7F8C @ =gUnknown_83FD8AF
mov r0, sp
- bl sub_8008DA4
+ bl StringAppend
mov r4, sp
b _080D8382
.align 2, 0
@@ -1661,7 +1661,7 @@ _080D8008:
lsls r0, 3
cmp r1, r0
bne _080D8024
- bl sub_8040F2C
+ bl GetSecretBaseTrainerNameIndex
lsls r0, 24
lsrs r0, 24
movs r1, 0xD
@@ -1821,7 +1821,7 @@ _080D8134:
bne _080D815C
_080D814E:
movs r0, 0x6
- bl sub_80091E0
+ bl GetExpandedPlaceholder
adds r4, r0, 0
b _080D8382
.align 2, 0
@@ -1871,7 +1871,7 @@ _080D819C:
movs r0, 0x3
_080D81AA:
eors r0, r1
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -1883,7 +1883,7 @@ _080D81BC: .4byte gUnknown_202273C
_080D81C0:
ldr r0, _080D81D4 @ =gUnknown_2023FC4
ldrb r0, [r0, 0x17]
- bl sub_8043658
+ bl GetBankMultiplayerId
_080D81C8:
lsls r1, r0, 3
subs r1, r0
@@ -1959,7 +1959,7 @@ _080D825C: .4byte gUnknown_2021D18
_080D8260:
ldr r0, _080D82B4 @ =gUnknown_2023FC4
ldrb r0, [r0, 0x17]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _080D82CC
@@ -2000,7 +2000,7 @@ _080D82A4:
_080D82AA:
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
b _080D82E4
.align 2, 0
_080D82B4: .4byte gUnknown_2023FC4
@@ -2022,10 +2022,10 @@ _080D82DA:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
_080D82E4:
mov r0, sp
- bl sub_8008D28
+ bl StringGetEnd10
mov r4, sp
b _080D8382
.align 2, 0
@@ -2053,7 +2053,7 @@ _080D8320:
ldr r0, _080D8334 @ =gUnknown_2023D6C
_080D8322:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r4, _080D8338 @ =gUnknown_83FD569
cmp r0, 0
@@ -2073,7 +2073,7 @@ _080D8348:
ldr r0, _080D835C @ =gUnknown_2023D6C
_080D834A:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r4, _080D8360 @ =gUnknown_83FD560
cmp r0, 0
@@ -2093,7 +2093,7 @@ _080D8370:
ldr r0, _080D83D4 @ =gUnknown_2023D6C
_080D8372:
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r4, _080D83D8 @ =gUnknown_83FD572
cmp r0, 0
@@ -2310,7 +2310,7 @@ _080D8504:
_080D8510: .4byte gUnknown_824F1A0
_080D8514:
ldrb r0, [r4, 0x1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D8538
@@ -2321,7 +2321,7 @@ _080D8514:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
b _080D8574
.align 2, 0
_080D8534: .4byte gUnknown_2024284
@@ -2334,7 +2334,7 @@ _080D8538:
beq _080D8558
ldr r1, _080D8554 @ =gUnknown_83FD55B
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
b _080D8560
.align 2, 0
_080D8550: .4byte gUnknown_2022B4C
@@ -2342,7 +2342,7 @@ _080D8554: .4byte gUnknown_83FD55B
_080D8558:
ldr r1, _080D8584 @ =gUnknown_83FD555
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
_080D8560:
adds r0, r5, r7
ldrb r1, [r0, 0x2]
@@ -2352,13 +2352,13 @@ _080D8560:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
_080D8574:
mov r0, sp
- bl sub_8008D28
+ bl StringGetEnd10
adds r0, r6, 0
mov r1, sp
- bl sub_8008DA4
+ bl StringAppend
b _080D86AE
.align 2, 0
_080D8584: .4byte gUnknown_83FD555
@@ -2380,12 +2380,12 @@ _080D85A0:
lsls r0, 8
orrs r1, r0
adds r0, r6, 0
- bl sub_8040FD0
+ bl GetSpeciesName
b _080D86AE
_080D85B2:
adds r4, r5, r7
ldrb r0, [r4, 0x1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080D85D8
@@ -2396,7 +2396,7 @@ _080D85B2:
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
- bl sub_803FBE8
+ bl GetMonData
b _080D85EA
.align 2, 0
_080D85D4: .4byte gUnknown_2024284
@@ -2408,10 +2408,10 @@ _080D85D8:
adds r0, r1
movs r1, 0x2
adds r2, r6, 0
- bl sub_803FBE8
+ bl GetMonData
_080D85EA:
adds r0, r6, 0
- bl sub_8008D28
+ bl StringGetEnd10
b _080D86AE
.align 2, 0
_080D85F4: .4byte gUnknown_202402C
@@ -2435,7 +2435,7 @@ _080D8616:
adds r1, r0
_080D8618:
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
adds r5, 0x2
b _080D86B0
.align 2, 0
@@ -2474,7 +2474,7 @@ _080D8628:
ldr r0, _080D8684 @ =gUnknown_2023F54
adds r1, r0
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080D8688 @ =gUnknown_83FD8AF
b _080D868E
.align 2, 0
@@ -2488,7 +2488,7 @@ _080D868C:
ldr r1, _080D8698 @ =gUnknown_83FD8A2
_080D868E:
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
b _080D86AE
.align 2, 0
_080D8698: .4byte gUnknown_83FD8A2
@@ -2545,7 +2545,7 @@ _080D86E8:
bgt _080D8708
ldr r1, _080D8704 @ =gUnknown_83FE88B
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
b _080D8714
.align 2, 0
_080D86FC: .4byte gUnknown_2039A34
@@ -2556,7 +2556,7 @@ _080D8708:
bgt _080D8714
ldr r1, _080D871C @ =gUnknown_83FE88F
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_080D8714:
pop {r4,r5}
pop {r0}
@@ -2633,14 +2633,14 @@ _080D8798:
ldr r1, _080D87A4 @ =gUnknown_83FD58C
_080D879A:
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
b _080D87B0
.align 2, 0
_080D87A4: .4byte gUnknown_83FD58C
_080D87A8:
ldr r1, _080D87B8 @ =gUnknown_83FD58E
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
_080D87B0:
pop {r4,r5}
pop {r0}
@@ -2676,7 +2676,7 @@ sub_80D87BC: @ 80D87BC
adds r1, r0
ldrb r1, [r1]
adds r0, r7, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
_080D87F2:
movs r0, 0x40
mov r1, r8
@@ -2896,7 +2896,7 @@ _080D8982:
cmp r1, 0
bne _080D89A4
adds r0, r7, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r7, 0
movs r1, 0x3
bl sub_8003F20
diff --git a/asm/battle_records.s b/asm/battle_records.s
index c87b60bc1..f59d8d7e1 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -9,9 +9,9 @@
sub_80CD228: @ 80CD228
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080CD23C @ =sub_80CD240
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -51,7 +51,7 @@ _080CD268:
.4byte _080CD338
_080CD288:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80CD4D0
b _080CD324
_080CD294:
@@ -61,7 +61,7 @@ _080CD29A:
ldr r4, _080CD2C4 @ =gUnknown_2039A1C
movs r0, 0x80
lsls r0, 4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0
bl sub_8001618
@@ -71,7 +71,7 @@ _080CD29A:
bl sub_8001658
ldr r1, [r4]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_80CD638
b _080CD324
.align 2, 0
@@ -81,23 +81,23 @@ _080CD2CC:
movs r0, 0x3
bl sub_80CDCD0
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080CD324
_080CD2E2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080CD376
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080CD324
_080CD302:
ldr r0, _080CD310 @ =gUnknown_83F6C68
@@ -113,7 +113,7 @@ _080CD314:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080CD324:
ldr r1, _080CD334 @ =gUnknown_30030F0
movs r0, 0x87
@@ -128,7 +128,7 @@ _080CD334: .4byte gUnknown_30030F0
_080CD338:
bl sub_80CD628
ldr r0, _080CD350 @ =sub_80CD38C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080CD354 @ =gUnknown_20370C0
ldrh r0, [r0]
cmp r0, 0
@@ -143,9 +143,9 @@ _080CD358:
_080CD35C:
ldr r0, _080CD380 @ =sub_80CD3B8
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r0, _080CD384 @ =sub_80CD3A0
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080CD388 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -166,9 +166,9 @@ _080CD388: .4byte gUnknown_30030F0
thumb_func_start sub_80CD38C
sub_80CD38C: @ 80CD38C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80CD38C
@@ -176,10 +176,10 @@ sub_80CD38C: @ 80CD38C
thumb_func_start sub_80CD3A0
sub_80CD3A0: @ 80CD3A0
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80CD3A0
@@ -259,7 +259,7 @@ sub_80CD428: @ 80CD428
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080CD458 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -287,23 +287,23 @@ sub_80CD460: @ 80CD460
ands r0, r1
cmp r0, 0
bne _080CD490
- ldr r0, _080CD49C @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _080CD49C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
ldr r0, _080CD4A0 @ =gUnknown_2039A1C
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
movs r0, 0
bl sub_80CD4A4
bl sub_8003ECC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080CD490:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080CD498: .4byte gUnknown_2037AB8
-_080CD49C: .4byte sub_80568E0
+_080CD49C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_080CD4A0: .4byte gUnknown_2039A1C
thumb_func_end sub_80CD460
@@ -315,9 +315,9 @@ sub_80CD4A4: @ 80CD4A4
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
@@ -399,64 +399,64 @@ _080CD4F6:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x8
pop {r3}
mov r8, r3
@@ -471,12 +471,12 @@ _080CD604: .4byte 0x81000800
thumb_func_start sub_80CD608
sub_80CD608: @ 80CD608
push {lr}
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_810BB8C
- bl sub_8070528
- bl sub_80088F0
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl dp13_810BB8C
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
pop {r0}
bx r0
thumb_func_end sub_80CD608
@@ -487,7 +487,7 @@ sub_80CD628: @ 80CD628
movs r1, 0x94
lsls r1, 4
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80CD628
@@ -498,35 +498,35 @@ sub_80CD638: @ 80CD638
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_80CD638
@@ -607,7 +607,7 @@ _080CD710:
adds r0, r4, 0
adds r1, r7, 0
movs r2, 0x7
- bl sub_8008E4C
+ bl StringCompareN
cmp r0, 0
bne _080CD728
ldrh r0, [r4, 0x8]
@@ -813,12 +813,12 @@ sub_80CD854: @ 80CD854
mov r0, sp
adds r0, 0x2
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
b _080CD88A
_080CD882:
mov r0, sp
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
_080CD88A:
mov r0, r8
bl sub_80CD818
@@ -839,7 +839,7 @@ _080CD88A:
adds r0, r4, 0
mov r1, sp
movs r2, 0x7
- bl sub_8008DBC
+ bl StringCopyN
strh r7, [r4, 0x8]
_080CD8BE:
lsls r0, r5, 4
@@ -1182,11 +1182,11 @@ _080CDB56:
movs r4, 0
adds r0, r7, 0
movs r1, 0x8
- bl sub_8009284
+ bl StringFillWithTerminator
adds r0, r7, 0
adds r1, r6, 0
movs r2, 0x7
- bl sub_8008DBC
+ bl StringCopyN
b _080CDBA6
.align 2, 0
_080CDB70: .4byte gUnknown_2021CD0
@@ -1264,7 +1264,7 @@ sub_80CDBE4: @ 80CDBE4
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r5, _080CDC9C @ =gUnknown_2021D18
ldr r1, _080CDCA0 @ =gUnknown_8418174
adds r0, r5, 0
@@ -1352,7 +1352,7 @@ sub_80CDCB4: @ 80CDCB4
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -1372,7 +1372,7 @@ sub_80CDCD0: @ 80CDCD0
adds r0, r4, 0
movs r2, 0xC0
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, _080CDD10 @ =gUnknown_83F6468
movs r0, 0x20
str r0, [sp]
@@ -1380,11 +1380,11 @@ sub_80CDCD0: @ 80CDCD0
adds r0, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
ldr r0, _080CDD14 @ =gUnknown_83F6448
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
add sp, 0x8
pop {r4}
pop {r0}
diff --git a/asm/battle_script_commands.s b/asm/battle_script_commands.s
index 831a93b4e..ea8d73a36 100644
--- a/asm/battle_script_commands.s
+++ b/asm/battle_script_commands.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_801D760
-sub_801D760: @ 801D760
+ thumb_func_start atk00_attackcanceler
+atk00_attackcanceler: @ 801D760
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -204,7 +204,7 @@ _0801D8C4:
ldrb r0, [r0]
ldr r2, _0801D940 @ =0x00000115
adds r1, r3, 0
- bl sub_8016EC8
+ bl PressurePPLose
mov r0, r8
ldrb r1, [r0]
lsls r1, 4
@@ -214,7 +214,7 @@ _0801D8C4:
negs r0, r0
ands r0, r2
strb r0, [r1]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801D944 @ =gUnknown_2023D74
ldr r0, _0801D948 @ =gUnknown_81D8FAA
b _0801DAFA
@@ -283,7 +283,7 @@ _0801D98E:
ldr r4, _0801D9E0 @ =gUnknown_2023D6A
movs r0, 0x1F
strb r0, [r4]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801D9E4 @ =gUnknown_2023D74
ldr r0, _0801D9E8 @ =gUnknown_81D938D
str r0, [r1]
@@ -344,7 +344,7 @@ _0801D9FA:
bne _0801DAF4
_0801DA38:
ldrh r0, [r4]
- bl sub_802A1C0
+ bl IsTwoTurnsMove
lsls r0, 24
cmp r0, 0
beq _0801DA5E
@@ -364,7 +364,7 @@ _0801DA38:
_0801DA5E:
ldr r0, _0801DA9C @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r2, _0801DAA0 @ =gUnknown_2023DCC
ldrb r0, [r2]
movs r1, 0x1
@@ -401,7 +401,7 @@ _0801DAB4:
ldrb r0, [r0]
ldr r2, _0801DAE4 @ =0x00000121
adds r1, r3, 0
- bl sub_8016EC8
+ bl PressurePPLose
ldrb r1, [r4]
lsls r1, 4
adds r1, r6
@@ -413,7 +413,7 @@ _0801DAB4:
ldr r1, _0801DAE8 @ =gUnknown_2023FC4
ldrb r0, [r4]
strb r0, [r1, 0x17]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801DAEC @ =gUnknown_2023D74
ldr r0, _0801DAF0 @ =gUnknown_81D8FC2
b _0801DAFA
@@ -439,10 +439,10 @@ _0801DAFC:
bx r0
.align 2, 0
_0801DB0C: .4byte gUnknown_2023D74
- thumb_func_end sub_801D760
+ thumb_func_end atk00_attackcanceler
- thumb_func_start sub_801DB10
-sub_801DB10: @ 801DB10
+ thumb_func_start JumpIfMoveFailed
+JumpIfMoveFailed: @ 801DB10
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
@@ -488,7 +488,7 @@ _0801DB64: .4byte gUnknown_2023DA0
_0801DB68: .4byte gUnknown_2023D6C
_0801DB6C: .4byte gUnknown_2023DA8
_0801DB70:
- bl sub_802A3F8
+ bl TrySetDestinyBondToHappen
ldr r0, _0801DB98 @ =gUnknown_2023D6C
ldrb r1, [r0]
str r6, [sp]
@@ -510,10 +510,10 @@ _0801DB8E:
.align 2, 0
_0801DB98: .4byte gUnknown_2023D6C
_0801DB9C: .4byte gUnknown_2023D74
- thumb_func_end sub_801DB10
+ thumb_func_end JumpIfMoveFailed
- thumb_func_start sub_801DBA0
-sub_801DBA0: @ 801DBA0
+ thumb_func_start atk40_jumpifaffectedbyprotect
+atk40_jumpifaffectedbyprotect: @ 801DBA0
push {lr}
ldr r1, _0801DBE8 @ =gUnknown_2023E8C
ldr r0, _0801DBEC @ =gUnknown_2023D6C
@@ -543,7 +543,7 @@ sub_801DBA0: @ 801DBA0
strb r0, [r2]
movs r0, 0x5
movs r1, 0
- bl sub_801DB10
+ bl JumpIfMoveFailed
ldr r1, _0801DBFC @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -565,10 +565,10 @@ _0801DC08:
bx r0
.align 2, 0
_0801DC0C: .4byte gUnknown_2023D74
- thumb_func_end sub_801DBA0
+ thumb_func_end atk40_jumpifaffectedbyprotect
- thumb_func_start sub_801DC10
-sub_801DC10: @ 801DC10
+ thumb_func_start JumpIfMoveAffectedByProtect
+JumpIfMoveAffectedByProtect: @ 801DC10
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -601,7 +601,7 @@ sub_801DC10: @ 801DC10
strb r0, [r2]
movs r0, 0x7
adds r1, r3, 0
- bl sub_801DB10
+ bl JumpIfMoveFailed
ldr r1, _0801DC78 @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -618,10 +618,10 @@ _0801DC6C: .4byte gUnknown_8250C04
_0801DC70: .4byte gUnknown_2023D4A
_0801DC74: .4byte gUnknown_2023DCC
_0801DC78: .4byte gUnknown_2023E82
- thumb_func_end sub_801DC10
+ thumb_func_end JumpIfMoveAffectedByProtect
- thumb_func_start sub_801DC7C
-sub_801DC7C: @ 801DC7C
+ thumb_func_start AccuracyCalcHelper
+AccuracyCalcHelper: @ 801DC7C
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 16
@@ -765,7 +765,7 @@ _0801DD86:
_0801DD98:
movs r0, 0x7
adds r1, r5, 0
- bl sub_801DB10
+ bl JumpIfMoveFailed
movs r0, 0x1
b _0801DDBA
.align 2, 0
@@ -781,7 +781,7 @@ _0801DDBA:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_801DC7C
+ thumb_func_end AccuracyCalcHelper
thumb_func_start sub_801DDC4
sub_801DDC4: @ 801DDC4
@@ -818,7 +818,7 @@ sub_801DDC4: @ 801DDC4
beq _0801DE12
ldr r0, _0801DE6C @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0801DE56
@@ -844,7 +844,7 @@ _0801DE12:
bne _0801DE48
ldr r0, _0801DE6C @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0801DE56
@@ -859,7 +859,7 @@ _0801DE48:
_0801DE56:
movs r0, 0x7
adds r1, r6, 0
- bl sub_801DB10
+ bl JumpIfMoveFailed
b _0801E1C2
.align 2, 0
_0801DE60: .4byte gUnknown_2023D74
@@ -928,7 +928,7 @@ _0801DEE8: .4byte 0x000400c0
_0801DEEC: .4byte gUnknown_2023D74
_0801DEF0:
movs r0, 0
- bl sub_801DC10
+ bl JumpIfMoveAffectedByProtect
lsls r0, 24
cmp r0, 0
beq _0801DEFE
@@ -971,14 +971,14 @@ _0801DF34:
mov r10, r0
_0801DF42:
adds r0, r6, 0
- bl sub_801DC10
+ bl JumpIfMoveAffectedByProtect
lsls r0, 24
cmp r0, 0
beq _0801DF50
b _0801E1C2
_0801DF50:
adds r0, r6, 0
- bl sub_801DC7C
+ bl AccuracyCalcHelper
lsls r0, 24
cmp r0, 0
beq _0801DF5E
@@ -1197,7 +1197,7 @@ _0801E110: .4byte gUnknown_2023D6C
_0801E114: .4byte gUnknown_2023F54
_0801E118:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r5, r0, 24
mov r1, r8
@@ -1205,7 +1205,7 @@ _0801E118:
muls r0, r7
add r0, r9
ldrh r0, [r0, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r2, r0, 24
_0801E134:
@@ -1223,7 +1223,7 @@ _0801E134:
lsls r0, 16
lsrs r4, r0, 16
_0801E150:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -1270,11 +1270,11 @@ _0801E1B0:
movs r0, 0
_0801E1B4:
strb r0, [r1, 0x6]
- bl sub_801EAB8
+ bl CheckWonderGuardAndLevitate
_0801E1BA:
movs r0, 0x7
adds r1, r6, 0
- bl sub_801DB10
+ bl JumpIfMoveFailed
_0801E1C2:
add sp, 0x8
pop {r3-r5}
@@ -1305,7 +1305,7 @@ sub_801E1D8: @ 801E1D8
ldr r0, _0801E220 @ =gUnknown_2023D6B
ldrb r1, [r0]
movs r0, 0x4
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r0, [r4]
movs r1, 0x80
lsls r1, 3
@@ -1531,10 +1531,10 @@ _0801E362:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
mov r7, r9
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0801E3CC:
ldr r2, _0801E3FC @ =gUnknown_2023DD0
ldr r0, [r2]
@@ -1587,7 +1587,7 @@ _0801E42C: .4byte gUnknown_2023BE4
_0801E430: .4byte gUnknown_2023D6B
_0801E434: .4byte gUnknown_2023F54
_0801E438:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r6, r0, 24
_0801E440:
@@ -1713,7 +1713,7 @@ _0801E4F0:
ands r0, r1
cmp r0, 0
bne _0801E580
- bl sub_8044EC8
+ bl Random
ldr r2, _0801E578 @ =gUnknown_8250530
lsls r1, r5, 1
adds r1, r2
@@ -1767,14 +1767,14 @@ _0801E594: .4byte gUnknown_2023D71
_0801E598: .4byte gUnknown_2023D74
thumb_func_end sub_801E408
- thumb_func_start sub_801E59C
-sub_801E59C: @ 801E59C
+ thumb_func_start atk05_damagecalc
+atk05_damagecalc: @ 801E59C
push {r4-r7,lr}
sub sp, 0x10
ldr r4, _0801E654 @ =gUnknown_2023DDE
ldr r5, _0801E658 @ =gUnknown_2023D6C
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
lsls r1, 1
@@ -1874,10 +1874,10 @@ _0801E67C: .4byte gUnknown_2023DFC
_0801E680: .4byte gUnknown_8250C04
_0801E684: .4byte gUnknown_2023E8C
_0801E688: .4byte gUnknown_2023D74
- thumb_func_end sub_801E59C
+ thumb_func_end atk05_damagecalc
- thumb_func_start sub_801E68C
-sub_801E68C: @ 801E68C
+ thumb_func_start AI_CalcDmg
+AI_CalcDmg: @ 801E68C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1889,7 +1889,7 @@ sub_801E68C: @ 801E68C
lsrs r5, 24
ldr r4, _0801E744 @ =gUnknown_2023DDE
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
lsls r1, 1
@@ -1981,10 +1981,10 @@ _0801E760: .4byte gUnknown_2023FC4
_0801E764: .4byte gUnknown_2023DFC
_0801E768: .4byte gUnknown_8250C04
_0801E76C: .4byte gUnknown_2023E8C
- thumb_func_end sub_801E68C
+ thumb_func_end AI_CalcDmg
- thumb_func_start sub_801E770
-sub_801E770: @ 801E770
+ thumb_func_start ModulateDmgByType
+ModulateDmgByType: @ 801E770
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2095,10 +2095,10 @@ _0801E842:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_801E770
+ thumb_func_end ModulateDmgByType
- thumb_func_start sub_801E848
-sub_801E848: @ 801E848
+ thumb_func_start atk06_typecalc
+atk06_typecalc: @ 801E848
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2246,7 +2246,7 @@ _0801E94C:
ldrb r0, [r0]
str r2, [sp]
str r3, [sp, 0x4]
- bl sub_801E770
+ bl ModulateDmgByType
ldr r3, [sp, 0x4]
ldr r2, [sp]
_0801E982:
@@ -2266,7 +2266,7 @@ _0801E982:
adds r0, r5
ldrb r0, [r0]
str r3, [sp, 0x4]
- bl sub_801E770
+ bl ModulateDmgByType
ldr r3, [sp, 0x4]
_0801E9A8:
adds r3, 0x3
@@ -2308,7 +2308,7 @@ _0801E9D4:
ldrb r0, [r0]
ldr r7, _0801EA94 @ =gUnknown_2023D4A
ldrh r1, [r7]
- bl sub_802A224
+ bl AttacksThisTurn
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2397,10 +2397,10 @@ _0801EAA8: .4byte gUnknown_2023DA8
_0801EAAC: .4byte gUnknown_2023E82
_0801EAB0: .4byte gUnknown_2023E8C
_0801EAB4: .4byte gUnknown_2023D74
- thumb_func_end sub_801E848
+ thumb_func_end atk06_typecalc
- thumb_func_start sub_801EAB8
-sub_801EAB8: @ 801EAB8
+ thumb_func_start CheckWonderGuardAndLevitate
+CheckWonderGuardAndLevitate: @ 801EAB8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2683,7 +2683,7 @@ _0801ECC2:
ldrb r0, [r0]
mov r2, r9
ldrh r1, [r2]
- bl sub_802A224
+ bl AttacksThisTurn
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2725,10 +2725,10 @@ _0801ED2C: .4byte gUnknown_2023D6B
_0801ED30: .4byte gUnknown_8250C04
_0801ED34: .4byte gUnknown_2023D6A
_0801ED38: .4byte gUnknown_2023E82
- thumb_func_end sub_801EAB8
+ thumb_func_end CheckWonderGuardAndLevitate
- thumb_func_start sub_801ED3C
-sub_801ED3C: @ 801ED3C
+ thumb_func_start ModulateDmgByType2
+ModulateDmgByType2: @ 801ED3C
push {r4-r7,lr}
adds r6, r2, 0
lsls r0, 24
@@ -2829,10 +2829,10 @@ _0801EDEE:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_801ED3C
+ thumb_func_end ModulateDmgByType2
- thumb_func_start sub_801EDF4
-sub_801EDF4: @ 801EDF4
+ thumb_func_start TypeCalc
+TypeCalc: @ 801EDF4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2967,7 +2967,7 @@ _0801EEC6:
ldrb r0, [r0]
mov r1, r10
mov r2, sp
- bl sub_801ED3C
+ bl ModulateDmgByType2
_0801EF00:
adds r0, r5, 0
adds r0, 0x22
@@ -2983,7 +2983,7 @@ _0801EF00:
ldrb r0, [r0]
mov r1, r10
mov r2, sp
- bl sub_801ED3C
+ bl ModulateDmgByType2
_0801EF20:
movs r1, 0x3
add r8, r1
@@ -3029,7 +3029,7 @@ _0801EF50:
bne _0801EFAA
ldr r0, [sp, 0x4]
mov r1, r10
- bl sub_802A224
+ bl AttacksThisTurn
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x2
@@ -3073,10 +3073,10 @@ _0801EFAE:
_0801EFC0: .4byte gUnknown_824F050
_0801EFC4: .4byte gUnknown_2023BE4
_0801EFC8: .4byte gUnknown_8250C04
- thumb_func_end sub_801EDF4
+ thumb_func_end TypeCalc
- thumb_func_start sub_801EFCC
-sub_801EFCC: @ 801EFCC
+ thumb_func_start AI_TypeCalc
+AI_TypeCalc: @ 801EFCC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3147,7 +3147,7 @@ _0801F040:
ldrb r0, [r4, 0x2]
adds r1, r6, 0
mov r2, sp
- bl sub_801ED3C
+ bl ModulateDmgByType2
_0801F05A:
cmp r5, r8
bne _0801F06C
@@ -3156,7 +3156,7 @@ _0801F05A:
ldrb r0, [r4, 0x2]
adds r1, r6, 0
mov r2, sp
- bl sub_801ED3C
+ bl ModulateDmgByType2
_0801F06C:
adds r4, 0x3
adds r7, 0x3
@@ -3207,12 +3207,12 @@ _0801F0B0:
.align 2, 0
_0801F0C0: .4byte gUnknown_824F050
_0801F0C4: .4byte gUnknown_8250C04
- thumb_func_end sub_801EFCC
+ thumb_func_end AI_TypeCalc
- thumb_func_start sub_801F0C8
-sub_801F0C8: @ 801F0C8
+ thumb_func_start Unused_ApplyRandomDmgMultiplier
+Unused_ApplyRandomDmgMultiplier: @ 801F0C8
push {r4,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -3240,12 +3240,12 @@ _0801F0FA:
bx r0
.align 2, 0
_0801F100: .4byte gUnknown_2023D50
- thumb_func_end sub_801F0C8
+ thumb_func_end Unused_ApplyRandomDmgMultiplier
- thumb_func_start sub_801F104
-sub_801F104: @ 801F104
+ thumb_func_start atk07_adjustnormaldamage
+atk07_adjustnormaldamage: @ 801F104
push {r4-r7,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -3293,14 +3293,14 @@ _0801F164: .4byte gUnknown_2023D6C
_0801F168: .4byte gUnknown_2023F54
_0801F16C:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
ldrb r0, [r6]
muls r0, r5
adds r0, r7
ldrh r0, [r0, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r6, r0, 24
_0801F186:
@@ -3310,7 +3310,7 @@ _0801F186:
strb r0, [r1]
cmp r4, 0x27
bne _0801F1C4
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -3444,12 +3444,12 @@ _0801F2A4: .4byte gUnknown_2023ECC
_0801F2A8: .4byte gUnknown_2023DCC
_0801F2AC: .4byte gUnknown_2023D68
_0801F2B0: .4byte gUnknown_2023D74
- thumb_func_end sub_801F104
+ thumb_func_end atk07_adjustnormaldamage
- thumb_func_start sub_801F2B4
-sub_801F2B4: @ 801F2B4
+ thumb_func_start atk08_adjustnormaldamage2
+atk08_adjustnormaldamage2: @ 801F2B4
push {r4-r7,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -3497,14 +3497,14 @@ _0801F314: .4byte gUnknown_2023D6C
_0801F318: .4byte gUnknown_2023F54
_0801F31C:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
ldrb r0, [r6]
muls r0, r5
adds r0, r7
ldrh r0, [r0, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r6, r0, 24
_0801F336:
@@ -3514,7 +3514,7 @@ _0801F336:
strb r0, [r1]
cmp r4, 0x27
bne _0801F374
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -3632,7 +3632,7 @@ _0801F430: .4byte gUnknown_2023ECC
_0801F434: .4byte gUnknown_2023DCC
_0801F438: .4byte gUnknown_2023D68
_0801F43C: .4byte gUnknown_2023D74
- thumb_func_end sub_801F2B4
+ thumb_func_end atk08_adjustnormaldamage2
thumb_func_start sub_801F440
sub_801F440: @ 801F440
@@ -3661,7 +3661,7 @@ _0801F452:
ldr r4, _0801F494 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _0801F498 @ =gUnknown_81D89F1
str r0, [r4]
ldr r1, _0801F49C @ =gUnknown_2023FC4
@@ -3742,7 +3742,7 @@ _0801F4CE:
adds r0, r4
str r0, [sp, 0x8]
movs r0, 0
- bl sub_800E1FC
+ bl EmitMoveAnimation
ldrb r0, [r6, 0x18]
adds r0, 0x1
strb r0, [r6, 0x18]
@@ -3751,7 +3751,7 @@ _0801F4CE:
strb r0, [r6, 0x19]
mov r1, r8
ldrb r0, [r1]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0801F530:
ldr r1, _0801F560 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -3773,7 +3773,7 @@ _0801F564:
ldr r4, _0801F580 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _0801F584 @ =gUnknown_81D89F1
str r0, [r4]
_0801F572:
@@ -3807,8 +3807,8 @@ _0801F5A0: .4byte gUnknown_2023BC8
_0801F5A4: .4byte gUnknown_2023D74
thumb_func_end sub_801F588
- thumb_func_start sub_801F5A8
-sub_801F5A8: @ 801F5A8
+ thumb_func_start atk0B_healthbarupdate
+atk0B_healthbarupdate: @ 801F5A8
push {r4,lr}
ldr r0, _0801F60C @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -3855,7 +3855,7 @@ sub_801F5A8: @ 801F5A8
bne _0801F628
movs r0, 0x80
adds r1, r2, 0
- bl sub_80173AC
+ bl PrepareStringBattle
b _0801F662
.align 2, 0
_0801F60C: .4byte gUnknown_2023BC8
@@ -3875,12 +3875,12 @@ _0801F628:
lsrs r1, r0, 16
_0801F636:
movs r0, 0
- bl sub_800E5EC
+ bl EmitHealthBarUpdate
ldr r4, _0801F678 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801F662
@@ -3908,10 +3908,10 @@ _0801F674: .4byte 0x00002710
_0801F678: .4byte gUnknown_2023BC4
_0801F67C: .4byte gUnknown_3004F90
_0801F680: .4byte gUnknown_2023D74
- thumb_func_end sub_801F5A8
+ thumb_func_end atk0B_healthbarupdate
- thumb_func_start sub_801F684
-sub_801F684: @ 801F684
+ thumb_func_start atk0C_datahpupdate
+atk0C_datahpupdate: @ 801F684
push {r4-r7,lr}
sub sp, 0x4
ldr r0, _0801F6AC @ =gUnknown_2023BC8
@@ -4070,7 +4070,7 @@ _0801F7C0:
ldr r0, [r4]
adds r0, 0x2
str r0, [r4]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r0, _0801F7E4 @ =gUnknown_81D9526
str r0, [r4]
b _0801FA62
@@ -4356,9 +4356,9 @@ _0801F9FA:
movs r1, 0x2A
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0801FA5A
.align 2, 0
_0801FA28: .4byte gUnknown_2023D6C
@@ -4398,10 +4398,10 @@ _0801FA6C: .4byte gUnknown_2023D74
_0801FA70: .4byte gUnknown_2023BC4
_0801FA74: .4byte gUnknown_2023ECC
_0801FA78: .4byte 0x0000ffff
- thumb_func_end sub_801F684
+ thumb_func_end atk0C_datahpupdate
- thumb_func_start sub_801FA7C
-sub_801FA7C: @ 801FA7C
+ thumb_func_start atk0D_critmessage
+atk0D_critmessage: @ 801FA7C
push {lr}
ldr r0, _0801FAB8 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -4420,7 +4420,7 @@ sub_801FA7C: @ 801FA7C
ldr r0, _0801FAC4 @ =gUnknown_2023D6B
ldrb r1, [r0]
movs r0, 0xD9
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r1, _0801FAC8 @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x7]
@@ -4439,10 +4439,10 @@ _0801FAC0: .4byte gUnknown_2023DCC
_0801FAC4: .4byte gUnknown_2023D6B
_0801FAC8: .4byte gUnknown_2023E82
_0801FACC: .4byte gUnknown_2023D74
- thumb_func_end sub_801FA7C
+ thumb_func_end atk0D_critmessage
- thumb_func_start sub_801FAD0
-sub_801FAD0: @ 801FAD0
+ thumb_func_start atk0E_effectivenesssound
+atk0E_effectivenesssound: @ 801FAD0
push {r4,lr}
ldr r0, _0801FB08 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -4496,9 +4496,9 @@ _0801FB32:
movs r0, 0
movs r1, 0xC
_0801FB36:
- bl sub_800E9C4
+ bl EmitPlaySE
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0801FB88
_0801FB42:
ldrb r1, [r1]
@@ -4517,10 +4517,10 @@ _0801FB52:
movs r0, 0
movs r1, 0xC
_0801FB5E:
- bl sub_800E9C4
+ bl EmitPlaySE
ldr r0, _0801FB6C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0801FB88
.align 2, 0
_0801FB6C: .4byte gUnknown_2023BC4
@@ -4531,10 +4531,10 @@ _0801FB70:
bne _0801FB88
movs r0, 0
movs r1, 0xD
- bl sub_800E9C4
+ bl EmitPlaySE
ldr r0, _0801FB98 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0801FB88:
ldr r1, _0801FB9C @ =gUnknown_2023D74
ldr r0, [r1]
@@ -4547,10 +4547,10 @@ _0801FB90:
.align 2, 0
_0801FB98: .4byte gUnknown_2023BC4
_0801FB9C: .4byte gUnknown_2023D74
- thumb_func_end sub_801FAD0
+ thumb_func_end atk0E_effectivenesssound
- thumb_func_start sub_801FBA0
-sub_801FBA0: @ 801FBA0
+ thumb_func_start atk0F_resultmessage
+atk0F_resultmessage: @ 801FBA0
push {r4-r7,lr}
movs r3, 0
ldr r0, _0801FBDC @ =gUnknown_2023BC8
@@ -4651,7 +4651,7 @@ _0801FC38:
movs r0, 0x3F
ands r0, r5
strb r0, [r6]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801FC70 @ =gUnknown_2023D74
ldr r0, _0801FC74 @ =gUnknown_81D9641
b _0801FD3E
@@ -4684,7 +4684,7 @@ _0801FC88:
movs r1, 0xFB
ands r0, r1
strb r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801FCA8 @ =gUnknown_2023D74
ldr r0, _0801FCAC @ =gUnknown_81D8FE4
b _0801FD3E
@@ -4699,7 +4699,7 @@ _0801FCB0:
movs r0, 0x3F
ands r0, r5
strb r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801FCC8 @ =gUnknown_2023D74
ldr r0, _0801FCCC @ =gUnknown_81D8FDD
b _0801FD3E
@@ -4726,7 +4726,7 @@ _0801FCD0:
movs r0, 0x3F
ands r0, r5
strb r0, [r6]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801FD10 @ =gUnknown_2023D74
ldr r0, _0801FD14 @ =gUnknown_81D9641
b _0801FD3E
@@ -4756,7 +4756,7 @@ _0801FD2E:
adds r0, r3, 0
ldr r1, _0801FD48 @ =gUnknown_2023D6B
ldrb r1, [r1]
- bl sub_80173AC
+ bl PrepareStringBattle
_0801FD38:
ldr r1, _0801FD4C @ =gUnknown_2023D74
ldr r0, [r1]
@@ -4770,10 +4770,10 @@ _0801FD40:
.align 2, 0
_0801FD48: .4byte gUnknown_2023D6B
_0801FD4C: .4byte gUnknown_2023D74
- thumb_func_end sub_801FBA0
+ thumb_func_end atk0F_resultmessage
- thumb_func_start sub_801FD50
-sub_801FD50: @ 801FD50
+ thumb_func_start atk10_printstring
+atk10_printstring: @ 801FD50
push {r4,lr}
ldr r0, _0801FD80 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -4787,7 +4787,7 @@ sub_801FD50: @ 801FD50
orrs r0, r1
ldr r1, _0801FD88 @ =gUnknown_2023D6B
ldrb r1, [r1]
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r0, [r4]
adds r0, 0x3
str r0, [r4]
@@ -4803,10 +4803,10 @@ _0801FD80: .4byte gUnknown_2023BC8
_0801FD84: .4byte gUnknown_2023D74
_0801FD88: .4byte gUnknown_2023D6B
_0801FD8C: .4byte gUnknown_2023E82
- thumb_func_end sub_801FD50
+ thumb_func_end atk10_printstring
- thumb_func_start sub_801FD90
-sub_801FD90: @ 801FD90
+ thumb_func_start atk11_printselectionstring
+atk11_printselectionstring: @ 801FD90
push {r4,r5,lr}
ldr r5, _0801FDC4 @ =gUnknown_2023BC4
ldr r0, _0801FDC8 @ =gUnknown_2023D6B
@@ -4819,9 +4819,9 @@ sub_801FD90: @ 801FD90
lsls r0, 8
orrs r1, r0
movs r0, 0
- bl sub_800E3EC
+ bl EmitPrintSelectionString
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r4]
adds r0, 0x3
str r0, [r4]
@@ -4836,10 +4836,10 @@ _0801FDC4: .4byte gUnknown_2023BC4
_0801FDC8: .4byte gUnknown_2023D6B
_0801FDCC: .4byte gUnknown_2023D74
_0801FDD0: .4byte gUnknown_2023E82
- thumb_func_end sub_801FD90
+ thumb_func_end atk11_printselectionstring
- thumb_func_start sub_801FDD4
-sub_801FDD4: @ 801FDD4
+ thumb_func_start atk12_waitmessage
+atk12_waitmessage: @ 801FDD4
push {r4-r6,lr}
ldr r0, _0801FDF0 @ =gUnknown_2023BC8
ldr r4, [r0]
@@ -4885,10 +4885,10 @@ _0801FE22:
.align 2, 0
_0801FE28: .4byte gUnknown_2023D74
_0801FE2C: .4byte gUnknown_2023E7C
- thumb_func_end sub_801FDD4
+ thumb_func_end atk12_waitmessage
- thumb_func_start sub_801FE30
-sub_801FE30: @ 801FE30
+ thumb_func_start atk13_printfromtable
+atk13_printfromtable: @ 801FE30
push {r4,r5,lr}
ldr r0, _0801FE74 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -4913,7 +4913,7 @@ sub_801FE30: @ 801FE30
ldrh r0, [r1]
ldr r1, _0801FE80 @ =gUnknown_2023D6B
ldrb r1, [r1]
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r0, [r4]
adds r0, 0x5
str r0, [r4]
@@ -4928,10 +4928,10 @@ _0801FE74: .4byte gUnknown_2023BC8
_0801FE78: .4byte gUnknown_2023D74
_0801FE7C: .4byte gUnknown_2023E82
_0801FE80: .4byte gUnknown_2023D6B
- thumb_func_end sub_801FE30
+ thumb_func_end atk13_printfromtable
- thumb_func_start sub_801FE84
-sub_801FE84: @ 801FE84
+ thumb_func_start atk14_printselectionstringfromtable
+atk14_printselectionstringfromtable: @ 801FE84
push {r4-r6,lr}
ldr r0, _0801FED4 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -4959,9 +4959,9 @@ sub_801FE84: @ 801FE84
strb r0, [r4]
ldrh r1, [r1]
movs r0, 0
- bl sub_800E3EC
+ bl EmitPrintSelectionString
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x5
str r0, [r5]
@@ -4977,10 +4977,10 @@ _0801FED8: .4byte gUnknown_2023D74
_0801FEDC: .4byte gUnknown_2023E82
_0801FEE0: .4byte gUnknown_2023BC4
_0801FEE4: .4byte gUnknown_2023D6B
- thumb_func_end sub_801FE84
+ thumb_func_end atk14_printselectionstringfromtable
- thumb_func_start sub_801FEE8
-sub_801FEE8: @ 801FEE8
+ thumb_func_start BankGetTurnOrder
+BankGetTurnOrder: @ 801FEE8
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -5010,7 +5010,7 @@ _0801FF0E:
.align 2, 0
_0801FF18: .4byte gUnknown_2023BCC
_0801FF1C: .4byte gUnknown_2023BDE
- thumb_func_end sub_801FEE8
+ thumb_func_end BankGetTurnOrder
thumb_func_start sub_801FF20
sub_801FF20: @ 801FF20
@@ -5076,7 +5076,7 @@ _0801FF84:
beq _0801FFB2
mov r2, r9
ldrb r0, [r2]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5111,7 +5111,7 @@ _0801FFB2:
_0801FFE6:
mov r3, r9
ldrb r0, [r3]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r2, _080200B4 @ =gUnknown_2023DDE
movs r1, 0x1
ands r1, r0
@@ -5317,7 +5317,7 @@ _08020176:
b _08020570
_0802017C:
adds r0, r2, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
b _08020560
.align 2, 0
_08020184: .4byte gUnknown_2023BC4
@@ -5346,7 +5346,7 @@ _080201A6:
ldr r4, _080201D8 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _080201DC @ =gUnknown_81D9438
_080201C0:
str r0, [r4]
@@ -5469,7 +5469,7 @@ _0802028A:
ldr r4, _080202AC @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _080202B0 @ =gUnknown_81D9420
b _080201C0
.align 2, 0
@@ -5509,7 +5509,7 @@ _080202EA:
ldr r4, _080202FC @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020300 @ =gUnknown_81D9420
b _080204F4
.align 2, 0
@@ -5626,7 +5626,7 @@ _080203BE:
b _08020570
_080203CA:
adds r0, r3, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
movs r3, 0x1
mov r10, r3
b _08020570
@@ -5660,7 +5660,7 @@ _08020402:
ldr r4, _08020424 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020428 @ =gUnknown_81D942C
b _080201C0
.align 2, 0
@@ -5703,7 +5703,7 @@ _0802045A:
ldr r4, _08020498 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _0802049C @ =gUnknown_81D9438
str r0, [r4]
ldr r2, _080204A0 @ =gUnknown_2023DD0
@@ -5764,7 +5764,7 @@ _080204E8:
ldr r4, _08020504 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020508 @ =gUnknown_81D9438
_080204F4:
str r0, [r4]
@@ -5837,7 +5837,7 @@ _08020578:
ldr r0, _080205B8 @ =gUnknown_2023D74
ldr r0, [r0]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _080205BC @ =gUnknown_825053C
ldr r0, _080205C0 @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -5846,7 +5846,7 @@ _08020578:
ldr r3, [r0]
cmp r3, 0x7
bne _080205CC
- bl sub_8044EC8
+ bl Random
ldr r2, _080205C4 @ =gUnknown_2023BE4
ldr r1, _080205C8 @ =gUnknown_2023D6E
ldrb r3, [r1]
@@ -5902,9 +5902,9 @@ _080205E0:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r2, _0802064C @ =gUnknown_2023DD0
ldr r1, [r2]
movs r0, 0x80
@@ -6076,7 +6076,7 @@ _080207D2:
beq _080207E6
bl _080210EC
_080207E6:
- bl sub_8044EC8
+ bl Random
mov r3, r9
ldrb r1, [r3]
adds r2, r1, 0
@@ -6094,7 +6094,7 @@ _080207E6:
ldr r4, _08020820 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08020824 @ =gUnknown_825062C
ldr r0, _08020828 @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -6139,7 +6139,7 @@ _08020868: .4byte gUnknown_2023D74
_0802086C: .4byte gUnknown_81D9452
_08020870:
adds r0, r2, 0
- bl sub_801FEE8
+ bl BankGetTurnOrder
ldr r1, _080208AC @ =gUnknown_2023BE2
lsls r0, 24
lsrs r0, 24
@@ -6195,7 +6195,7 @@ _080208D4:
ldr r1, _08020924 @ =gUnknown_2023D4A
ldrh r1, [r1]
strh r1, [r0]
- bl sub_8044EC8
+ bl Random
mov r2, r9
ldrb r1, [r2]
adds r2, r1, 0
@@ -6211,7 +6211,7 @@ _080208D4:
ldr r4, _08020928 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _0802092C @ =gUnknown_825062C
ldr r0, _08020930 @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -6228,7 +6228,7 @@ _08020930: .4byte gUnknown_2023E82
_08020934:
ldr r5, _08020984 @ =gUnknown_2023D6B
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -6257,7 +6257,7 @@ _0802096C:
ldr r4, _08020994 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08020998 @ =gUnknown_825062C
ldr r0, _0802099C @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -6286,7 +6286,7 @@ _080209A0:
beq _080209B6
b _080210EC
_080209B6:
- bl sub_8044EC8
+ bl Random
ldr r4, _080209D4 @ =gUnknown_2023E82
lsls r0, 16
lsrs r0, 16
@@ -6351,7 +6351,7 @@ _08020A20:
beq _08020A3C
b _080210EC
_08020A3C:
- bl sub_8044EC8
+ bl Random
mov r2, r9
ldrb r1, [r2]
adds r2, r1, 0
@@ -6389,7 +6389,7 @@ _08020A3C:
ldr r4, _08020ADC @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08020AE0 @ =gUnknown_825062C
ldr r2, _08020AE4 @ =gUnknown_2023E82
ldrb r0, [r2, 0x3]
@@ -6451,7 +6451,7 @@ _08020B04:
ldr r4, _08020B24 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08020B28 @ =gUnknown_825062C
ldr r0, _08020B2C @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -6473,7 +6473,7 @@ _08020B30:
movs r0, 0x10
adds r2, r7, 0
movs r3, 0
- bl sub_8027BFC
+ bl ChangeStatBuffs
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -6489,7 +6489,7 @@ _08020B4C:
ldr r4, _08020B6C @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020B70 @ =gUnknown_81D6BD1
b _08021108
.align 2, 0
@@ -6505,7 +6505,7 @@ _08020B74:
lsrs r1, 24
adds r2, r7, 0
movs r3, 0
- bl sub_8027BFC
+ bl ChangeStatBuffs
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -6521,7 +6521,7 @@ _08020B92:
ldr r4, _08020BB0 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020BB4 @ =gUnknown_81D6C62
b _08021108
.align 2, 0
@@ -6536,7 +6536,7 @@ _08020BB8:
movs r0, 0x20
adds r2, r7, 0
movs r3, 0
- bl sub_8027BFC
+ bl ChangeStatBuffs
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -6552,7 +6552,7 @@ _08020BD4:
ldr r4, _08020BF4 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020BF8 @ =gUnknown_81D6BD1
b _08021108
.align 2, 0
@@ -6568,7 +6568,7 @@ _08020BFC:
lsrs r1, 24
adds r2, r7, 0
movs r3, 0
- bl sub_8027BFC
+ bl ChangeStatBuffs
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -6584,7 +6584,7 @@ _08020C1A:
ldr r4, _08020C38 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020C3C @ =gUnknown_81D6C62
b _08021108
.align 2, 0
@@ -6656,11 +6656,11 @@ _08020CA8:
_08020CB8:
ldr r4, _08020D68 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6813,10 +6813,10 @@ _08020DD4:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
mov r2, r10
ldrb r0, [r2]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r7]
strb r0, [r4]
ldrb r0, [r7]
@@ -6831,13 +6831,13 @@ _08020DD4:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r4, _08020E70 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020E74 @ =gUnknown_81D9271
str r0, [r4]
ldrb r0, [r7]
@@ -6907,7 +6907,7 @@ _08020ED0:
ldr r4, _08020EE0 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020EE4 @ =gUnknown_81D8D55
b _08021108
.align 2, 0
@@ -6917,7 +6917,7 @@ _08020EE8:
ldr r4, _08020EF8 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020EFC @ =gUnknown_81D8DF1
b _08021108
.align 2, 0
@@ -6953,13 +6953,13 @@ _08020F1A:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r4, _08020F58 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020F5C @ =gUnknown_81D9177
b _08021108
.align 2, 0
@@ -6971,7 +6971,7 @@ _08020F60:
ldr r4, _08020F70 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08020F74 @ =gUnknown_81D8F35
b _08021108
.align 2, 0
@@ -6992,7 +6992,7 @@ _08020F8E:
ldr r4, _08020FB0 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08020FB4 @ =gUnknown_825062C
ldr r0, _08020FB8 @ =gUnknown_2023E82
ldrb r0, [r0, 0x3]
@@ -7034,7 +7034,7 @@ _08020FD8:
ldr r1, _08021014 @ =gUnknown_2023D4A
ldrh r1, [r1]
strh r1, [r0]
- bl sub_8044EC8
+ bl Random
mov r3, r9
ldrb r1, [r3]
adds r2, r1, 0
@@ -7086,7 +7086,7 @@ _08021058:
cmp r0, 0
beq _080210EC
adds r0, r3, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _080210D0 @ =gUnknown_2023D68
@@ -7121,7 +7121,7 @@ _08021058:
ldr r4, _080210E0 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _080210E4 @ =gUnknown_81D8F86
str r0, [r4]
mov r1, r9
@@ -7160,7 +7160,7 @@ _080210FC:
ldr r4, _0802111C @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08021120 @ =gUnknown_81D8FEB
_08021108:
str r0, [r4]
@@ -7178,8 +7178,8 @@ _0802111C: .4byte gUnknown_2023D74
_08021120: .4byte gUnknown_81D8FEB
thumb_func_end sub_801FF20
- thumb_func_start sub_8021124
-sub_8021124: @ 8021124
+ thumb_func_start atk15_seteffectwithchance
+atk15_seteffectwithchance: @ 8021124
push {r4,lr}
ldr r2, _08021150 @ =gUnknown_2023BE4
ldr r0, _08021154 @ =gUnknown_2023D6B
@@ -7238,7 +7238,7 @@ _08021194: .4byte gUnknown_2023D4A
_08021198: .4byte gUnknown_2023E82
_0802119C: .4byte gUnknown_2023DCC
_080211A0:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -7290,30 +7290,30 @@ _080211F2:
_08021204: .4byte gUnknown_2023D74
_08021208: .4byte gUnknown_2023E82
_0802120C: .4byte gUnknown_2023FC4
- thumb_func_end sub_8021124
+ thumb_func_end atk15_seteffectwithchance
- thumb_func_start sub_8021210
-sub_8021210: @ 8021210
+ thumb_func_start atk16_seteffectprimary
+atk16_seteffectprimary: @ 8021210
push {lr}
movs r0, 0x1
movs r1, 0
bl sub_801FF20
pop {r0}
bx r0
- thumb_func_end sub_8021210
+ thumb_func_end atk16_seteffectprimary
- thumb_func_start sub_8021220
-sub_8021220: @ 8021220
+ thumb_func_start atk17_seteffectsecondary
+atk17_seteffectsecondary: @ 8021220
push {lr}
movs r0, 0
movs r1, 0
bl sub_801FF20
pop {r0}
bx r0
- thumb_func_end sub_8021220
+ thumb_func_end atk17_seteffectsecondary
- thumb_func_start sub_8021230
-sub_8021230: @ 8021230
+ thumb_func_start atk18_clearstatusfromeffect
+atk18_clearstatusfromeffect: @ 8021230
push {lr}
ldr r0, _08021254 @ =gUnknown_2023D74
ldr r0, [r0]
@@ -7369,10 +7369,10 @@ _0802129C: .4byte gUnknown_825053C
_080212A0: .4byte gUnknown_2023E82
_080212A4: .4byte gUnknown_2023D74
_080212A8: .4byte gUnknown_2023FC4
- thumb_func_end sub_8021230
+ thumb_func_end atk18_clearstatusfromeffect
- thumb_func_start sub_80212AC
-sub_80212AC: @ 80212AC
+ thumb_func_start atk19_tryfaintmon
+atk19_tryfaintmon: @ 80212AC
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -7412,10 +7412,10 @@ _080212E4:
ldrb r0, [r1, 0x6]
lsls r0, 24
orrs r4, r0
- bl sub_801756C
+ bl BattleScriptPop
str r4, [r6]
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _08021328 @ =gUnknown_2023DDE
lsls r0, 24
lsrs r0, 23
@@ -7490,10 +7490,10 @@ _08021392:
str r0, [r5]
ldr r0, [r6]
adds r0, 0x7
- bl sub_8017520
+ bl BattleScriptPush
str r4, [r6]
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080213F4
@@ -7541,7 +7541,7 @@ _08021400:
ldr r1, _08021554 @ =gUnknown_202402C
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x20]
ldr r0, _08021558 @ =gUnknown_2023FE8
ldr r0, [r0]
@@ -7573,7 +7573,7 @@ _0802142C:
str r1, [r2]
ldr r4, _08021568 @ =gUnknown_2023D74
ldr r0, [r4]
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _0802156C @ =gUnknown_2023D50
mov r0, r9
muls r0, r5
@@ -7608,10 +7608,10 @@ _08021492:
ldr r0, _0802155C @ =gUnknown_2023D6B
mov r8, r0
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -7644,7 +7644,7 @@ _08021492:
strb r5, [r0]
ldr r5, _08021568 @ =gUnknown_2023D74
ldr r0, [r5]
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08021580 @ =gUnknown_81D8FA3
str r0, [r5]
ldr r5, _08021584 @ =gUnknown_2023BC4
@@ -7663,9 +7663,9 @@ _08021492:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08021588 @ =gUnknown_2022AB8
movs r0, 0xFD
strb r0, [r1]
@@ -7721,7 +7721,7 @@ _08021592:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80212AC
+ thumb_func_end atk19_tryfaintmon
thumb_func_start sub_80215A0
sub_80215A0: @ 80215A0
@@ -7737,9 +7737,9 @@ sub_80215A0: @ 80215A0
ldr r4, _080215D8 @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
- bl sub_800E134
+ bl EmitFaintAnimation
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -7782,9 +7782,9 @@ sub_80215DC: @ 80215DC
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
bl sub_8012BC8
ldr r0, [r5]
adds r0, 0x2
@@ -7801,8 +7801,8 @@ _08021638: .4byte gUnknown_2023BC4
_0802163C: .4byte gUnknown_2023BE4
thumb_func_end sub_80215DC
- thumb_func_start sub_8021640
-sub_8021640: @ 8021640
+ thumb_func_start atk1C_jumpifstatus
+atk1C_jumpifstatus: @ 8021640
push {r4,r5,lr}
ldr r5, _0802169C @ =gUnknown_2023D74
ldr r0, [r5]
@@ -7861,10 +7861,10 @@ _080216AC:
bx r0
.align 2, 0
_080216B4: .4byte gUnknown_2023D74
- thumb_func_end sub_8021640
+ thumb_func_end atk1C_jumpifstatus
- thumb_func_start sub_80216B8
-sub_80216B8: @ 80216B8
+ thumb_func_start atk1D_jumpifstatus2
+atk1D_jumpifstatus2: @ 80216B8
push {r4,r5,lr}
ldr r5, _08021714 @ =gUnknown_2023D74
ldr r0, [r5]
@@ -7923,10 +7923,10 @@ _08021724:
bx r0
.align 2, 0
_0802172C: .4byte gUnknown_2023D74
- thumb_func_end sub_80216B8
+ thumb_func_end atk1D_jumpifstatus2
- thumb_func_start sub_8021730
-sub_8021730: @ 8021730
+ thumb_func_start atk1E_jumpifability
+atk1E_jumpifability: @ 8021730
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -8036,10 +8036,10 @@ _0802180A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8021730
+ thumb_func_end atk1E_jumpifability
- thumb_func_start sub_8021818
-sub_8021818: @ 8021818
+ thumb_func_start atk1F_jumpifsideaffecting
+atk1F_jumpifsideaffecting: @ 8021818
push {r4-r6,lr}
ldr r0, _08021830 @ =gUnknown_2023D74
ldr r0, [r0]
@@ -8048,7 +8048,7 @@ sub_8021818: @ 8021818
bne _08021838
ldr r0, _08021834 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
b _08021842
.align 2, 0
_08021830: .4byte gUnknown_2023D74
@@ -8056,7 +8056,7 @@ _08021834: .4byte gUnknown_2023D6B
_08021838:
ldr r0, _08021878 @ =gUnknown_2023D6C
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r4, 0x1
_08021842:
ands r4, r0
@@ -8097,10 +8097,10 @@ _0802188A:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8021818
+ thumb_func_end atk1F_jumpifsideaffecting
- thumb_func_start sub_8021890
-sub_8021890: @ 8021890
+ thumb_func_start atk20_jumpifstat
+atk20_jumpifstat: @ 8021890
push {r4,r5,lr}
movs r5, 0
ldr r4, _080218C4 @ =gUnknown_2023D74
@@ -8225,10 +8225,10 @@ _0802197C:
bx r0
.align 2, 0
_08021984: .4byte gUnknown_2023D74
- thumb_func_end sub_8021890
+ thumb_func_end atk20_jumpifstat
- thumb_func_start sub_8021988
-sub_8021988: @ 8021988
+ thumb_func_start atk21_jumpifstatus3condition
+atk21_jumpifstatus3condition: @ 8021988
push {r4-r6,lr}
ldr r4, _080219DC @ =gUnknown_2023D74
ldr r0, [r4]
@@ -8295,10 +8295,10 @@ _08021A06:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8021988
+ thumb_func_end atk21_jumpifstatus3condition
- thumb_func_start sub_8021A0C
-sub_8021A0C: @ 8021A0C
+ thumb_func_start atk22_jumpiftype
+atk22_jumpiftype: @ 8021A0C
push {r4-r6,lr}
ldr r4, _08021A54 @ =gUnknown_2023D74
ldr r0, [r4]
@@ -8345,7 +8345,7 @@ _08021A60:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8021A0C
+ thumb_func_end atk22_jumpiftype
thumb_func_start sub_8021A68
sub_8021A68: @ 8021A68
@@ -8402,7 +8402,7 @@ _08021AC8:
_08021AE4:
ldr r4, _08021B34 @ =gUnknown_2023D6D
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8456,12 +8456,12 @@ _08021B54:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08021BC2
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08021BC2
ldr r0, _08021BA8 @ =gUnknown_825E45C
@@ -8476,7 +8476,7 @@ _08021B54:
_08021B88:
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -8493,7 +8493,7 @@ _08021BA8: .4byte gUnknown_825E45C
_08021BAC: .4byte gUnknown_3005008
_08021BB0: .4byte 0x0000311a
_08021BB4:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
_08021BBC:
@@ -8596,7 +8596,7 @@ _08021C74:
ldr r1, _08021CAC @ =gUnknown_2024284
adds r0, r1
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -8616,7 +8616,7 @@ _08021CAC: .4byte gUnknown_2024284
_08021CB0: .4byte gUnknown_3005008
_08021CB4: .4byte 0x0000311a
_08021CB8:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
_08021CC0:
@@ -8646,7 +8646,7 @@ _08021CE8:
ldr r1, _08021D18 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
bne _08021D24
ldr r1, [r5]
@@ -8681,9 +8681,9 @@ _08021D24:
ldrb r0, [r0, 0x12]
cmp r0, 0
bne _08021D52
- bl sub_8035314
+ bl BattleStopLowHpSound
ldr r0, _08021D94 @ =0x00000137
- bl sub_80722A0
+ bl PlayBGM
ldr r1, [r5]
ldrb r0, [r1, 0x12]
adds r0, 0x1
@@ -8697,7 +8697,7 @@ _08021D52:
ldr r1, _08021D9C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08021D6C
b _08021F4C
@@ -8768,7 +8768,7 @@ _08021DEA:
muls r0, r1
ldr r1, _08021E38 @ =gUnknown_2024284
adds r0, r1
- bl sub_804425C
+ bl IsTradedMon
lsls r0, 24
cmp r0, 0
beq _08021E3C
@@ -8914,7 +8914,7 @@ _08021EB6:
mov r2, r8
ldrb r1, [r2]
movs r0, 0xD
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r0, [r6]
ldrb r1, [r0, 0x10]
movs r0, 0x64
@@ -8967,7 +8967,7 @@ _08021F82:
ldr r5, _08022068 @ =gUnknown_2024284
adds r0, r5
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08022052
ldr r0, [r7]
@@ -8975,7 +8975,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
beq _08022052
ldr r0, [r7]
@@ -8983,7 +8983,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
ldr r4, _0802206C @ =gUnknown_2023FF4
ldr r1, [r4]
ldr r1, [r1, 0x10]
@@ -8993,7 +8993,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r1, [r1, 0x10]
strh r0, [r1, 0x2]
@@ -9002,7 +9002,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r1, [r1, 0x10]
strh r0, [r1, 0x4]
@@ -9011,7 +9011,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r1, [r1, 0x10]
strh r0, [r1, 0x6]
@@ -9020,7 +9020,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r1, [r1, 0x10]
strh r0, [r1, 0x8]
@@ -9029,7 +9029,7 @@ _08021F82:
muls r0, r6
adds r0, r5
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r1, [r1, 0x10]
strh r0, [r1, 0xA]
@@ -9043,9 +9043,9 @@ _08021F82:
ldr r0, _08022074 @ =gUnknown_2023D50
ldrh r2, [r0]
movs r0, 0
- bl sub_800E624
+ bl EmitExpUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08022052:
ldr r1, _08022078 @ =gUnknown_2023FC4
ldrb r0, [r1, 0x1C]
@@ -9110,7 +9110,7 @@ _080220B0:
ldr r1, _0802232C @ =gUnknown_2024284
adds r0, r1
adds r1, r2, 0
- bl sub_8035244
+ bl HandleLowHpMusicChange
_080220DA:
ldr r1, _08022330 @ =gUnknown_2022AB8
movs r3, 0xFD
@@ -9143,12 +9143,12 @@ _080220DA:
ldr r7, _0802232C @ =gUnknown_2024284
adds r0, r7
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r4, 0x4]
movs r0, 0x1
negs r0, r0
strb r0, [r4, 0x5]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r2, _08022338 @ =gUnknown_3004FD4
ldr r1, _0802233C @ =gUnknown_825E45C
mov r4, r9
@@ -9198,7 +9198,7 @@ _080220DA:
muls r0, r2
adds r0, r7
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r4, 0
adds r1, 0x2A
strb r0, [r1]
@@ -9210,7 +9210,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x28]
mov r1, r9
ldr r0, [r1]
@@ -9220,7 +9220,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x2C]
mov r1, r9
ldr r0, [r1]
@@ -9230,7 +9230,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x2]
mov r1, r9
ldr r0, [r1]
@@ -9240,7 +9240,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x4]
mov r1, r9
ldr r0, [r1]
@@ -9250,7 +9250,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x6]
mov r1, r9
ldr r0, [r1]
@@ -9260,7 +9260,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x6]
mov r1, r9
ldr r0, [r1]
@@ -9270,7 +9270,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x8]
mov r1, r9
ldr r0, [r1]
@@ -9280,7 +9280,7 @@ _080220DA:
adds r0, r2, 0
adds r0, r7
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0xA]
_08022246:
ldr r0, _08022328 @ =gUnknown_2023BCE
@@ -9311,7 +9311,7 @@ _08022256:
ldr r4, _0802232C @ =gUnknown_2024284
adds r0, r4
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r6, 0
adds r1, 0xDA
strb r0, [r1]
@@ -9320,7 +9320,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
ldr r0, [r7]
@@ -9328,7 +9328,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r6, 0
adds r1, 0xDC
strh r0, [r1]
@@ -9337,7 +9337,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
adds r1, r6, 0
adds r1, 0xB2
strh r0, [r1]
@@ -9346,7 +9346,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
adds r1, r6, 0
adds r1, 0xB4
strh r0, [r1]
@@ -9355,7 +9355,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
movs r2, 0xB6
adds r2, r6
mov r8, r2
@@ -9365,7 +9365,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strh r0, [r1]
ldr r0, [r7]
@@ -9373,7 +9373,7 @@ _08022256:
muls r0, r5
adds r0, r4
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
adds r1, r6, 0
adds r1, 0xB8
strh r0, [r1]
@@ -9499,17 +9499,17 @@ _0802240C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802243C
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0802243C
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r0, r6, r0
lsls r0, 16
lsrs r6, r0, 16
@@ -9535,17 +9535,17 @@ _08022454:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08022484
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08022484
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r0, r6, r0
lsls r0, 16
lsrs r6, r0, 16
@@ -9693,8 +9693,8 @@ _0802258A:
_08022594: .4byte gUnknown_2023D74
thumb_func_end sub_80223F8
- thumb_func_start sub_8022598
-sub_8022598: @ 8022598
+ thumb_func_start MoveValuesCleanUp
+MoveValuesCleanUp: @ 8022598
ldr r1, _080225C0 @ =gUnknown_2023DCC
movs r0, 0
strb r0, [r1]
@@ -9722,12 +9722,12 @@ _080225C8: .4byte gUnknown_2023D71
_080225CC: .4byte gUnknown_2023E82
_080225D0: .4byte gUnknown_2023DD0
_080225D4: .4byte 0xffffbfff
- thumb_func_end sub_8022598
+ thumb_func_end MoveValuesCleanUp
- thumb_func_start sub_80225D8
-sub_80225D8: @ 80225D8
+ thumb_func_start atk25_movevaluescleanup
+atk25_movevaluescleanup: @ 80225D8
push {lr}
- bl sub_8022598
+ bl MoveValuesCleanUp
ldr r1, _080225EC @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -9736,10 +9736,10 @@ sub_80225D8: @ 80225D8
bx r0
.align 2, 0
_080225EC: .4byte gUnknown_2023D74
- thumb_func_end sub_80225D8
+ thumb_func_end atk25_movevaluescleanup
- thumb_func_start sub_80225F0
-sub_80225F0: @ 80225F0
+ thumb_func_start atk26_setmultihit
+atk26_setmultihit: @ 80225F0
ldr r3, _08022600 @ =gUnknown_2023D72
ldr r2, _08022604 @ =gUnknown_2023D74
ldr r0, [r2]
@@ -9751,10 +9751,10 @@ sub_80225F0: @ 80225F0
.align 2, 0
_08022600: .4byte gUnknown_2023D72
_08022604: .4byte gUnknown_2023D74
- thumb_func_end sub_80225F0
+ thumb_func_end atk26_setmultihit
- thumb_func_start sub_8022608
-sub_8022608: @ 8022608
+ thumb_func_start atk27_decrementmultihit
+atk27_decrementmultihit: @ 8022608
push {lr}
ldr r1, _08022624 @ =gUnknown_2023D72
ldrb r0, [r1]
@@ -9790,10 +9790,10 @@ _08022646:
bx r0
.align 2, 0
_0802264C: .4byte gUnknown_2023D74
- thumb_func_end sub_8022608
+ thumb_func_end atk27_decrementmultihit
- thumb_func_start sub_8022650
-sub_8022650: @ 8022650
+ thumb_func_start atk28_goto
+atk28_goto: @ 8022650
ldr r3, _0802266C @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -9810,10 +9810,10 @@ sub_8022650: @ 8022650
bx lr
.align 2, 0
_0802266C: .4byte gUnknown_2023D74
- thumb_func_end sub_8022650
+ thumb_func_end atk28_goto
- thumb_func_start sub_8022670
-sub_8022670: @ 8022670
+ thumb_func_start atk29_jumpifbyte
+atk29_jumpifbyte: @ 8022670
push {r4-r6,lr}
ldr r3, _080226B4 @ =gUnknown_2023D74
ldr r1, [r3]
@@ -9896,10 +9896,10 @@ _08022708:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8022670
+ thumb_func_end atk29_jumpifbyte
- thumb_func_start sub_8022710
-sub_8022710: @ 8022710
+ thumb_func_start atk2A_jumpifhalfword
+atk2A_jumpifhalfword: @ 8022710
push {r4-r6,lr}
ldr r3, _0802275C @ =gUnknown_2023D74
ldr r1, [r3]
@@ -9985,10 +9985,10 @@ _080227B0:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8022710
+ thumb_func_end atk2A_jumpifhalfword
- thumb_func_start sub_80227B8
-sub_80227B8: @ 80227B8
+ thumb_func_start atk2B_jumpifword
+atk2B_jumpifword: @ 80227B8
push {r4-r6,lr}
ldr r3, _08022810 @ =gUnknown_2023D74
ldr r1, [r3]
@@ -10080,10 +10080,10 @@ _08022864:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80227B8
+ thumb_func_end atk2B_jumpifword
- thumb_func_start sub_802286C
-sub_802286C: @ 802286C
+ thumb_func_start atk2C_jumpifarrayequal
+atk2C_jumpifarrayequal: @ 802286C
push {r4-r7,lr}
ldr r2, _080228C4 @ =gUnknown_2023D74
ldr r3, [r2]
@@ -10155,10 +10155,10 @@ _080228EC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802286C
+ thumb_func_end atk2C_jumpifarrayequal
- thumb_func_start sub_80228F4
-sub_80228F4: @ 80228F4
+ thumb_func_start atk2D_jumpifarraynotequal
+atk2D_jumpifarraynotequal: @ 80228F4
push {r4-r7,lr}
movs r7, 0
ldr r3, _08022968 @ =gUnknown_2023D74
@@ -10229,10 +10229,10 @@ _08022970:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80228F4
+ thumb_func_end atk2D_jumpifarraynotequal
- thumb_func_start sub_8022978
-sub_8022978: @ 8022978
+ thumb_func_start atk2E_setbyte
+atk2E_setbyte: @ 8022978
ldr r3, _0802299C @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -10253,10 +10253,10 @@ sub_8022978: @ 8022978
bx lr
.align 2, 0
_0802299C: .4byte gUnknown_2023D74
- thumb_func_end sub_8022978
+ thumb_func_end atk2E_setbyte
- thumb_func_start sub_80229A0
-sub_80229A0: @ 80229A0
+ thumb_func_start atk2F_addbyte
+atk2F_addbyte: @ 80229A0
ldr r3, _080229C8 @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -10279,10 +10279,10 @@ sub_80229A0: @ 80229A0
bx lr
.align 2, 0
_080229C8: .4byte gUnknown_2023D74
- thumb_func_end sub_80229A0
+ thumb_func_end atk2F_addbyte
- thumb_func_start sub_80229CC
-sub_80229CC: @ 80229CC
+ thumb_func_start atk30_subbyte
+atk30_subbyte: @ 80229CC
ldr r3, _080229F4 @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -10305,10 +10305,10 @@ sub_80229CC: @ 80229CC
bx lr
.align 2, 0
_080229F4: .4byte gUnknown_2023D74
- thumb_func_end sub_80229CC
+ thumb_func_end atk30_subbyte
- thumb_func_start sub_80229F8
-sub_80229F8: @ 80229F8
+ thumb_func_start atk31_copyarray
+atk31_copyarray: @ 80229F8
push {r4-r6,lr}
ldr r3, _08022A48 @ =gUnknown_2023D74
ldr r1, [r3]
@@ -10353,10 +10353,10 @@ _08022A3C:
bx r0
.align 2, 0
_08022A48: .4byte gUnknown_2023D74
- thumb_func_end sub_80229F8
+ thumb_func_end atk31_copyarray
- thumb_func_start sub_8022A4C
-sub_8022A4C: @ 8022A4C
+ thumb_func_start atk32_copyarraywithindex
+atk32_copyarraywithindex: @ 8022A4C
push {r4-r7,lr}
ldr r3, _08022AB4 @ =gUnknown_2023D74
ldr r1, [r3]
@@ -10413,10 +10413,10 @@ _08022AA8:
bx r0
.align 2, 0
_08022AB4: .4byte gUnknown_2023D74
- thumb_func_end sub_8022A4C
+ thumb_func_end atk32_copyarraywithindex
- thumb_func_start sub_8022AB8
-sub_8022AB8: @ 8022AB8
+ thumb_func_start atk33_orbyte
+atk33_orbyte: @ 8022AB8
ldr r3, _08022AE0 @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -10439,10 +10439,10 @@ sub_8022AB8: @ 8022AB8
bx lr
.align 2, 0
_08022AE0: .4byte gUnknown_2023D74
- thumb_func_end sub_8022AB8
+ thumb_func_end atk33_orbyte
- thumb_func_start sub_8022AE4
-sub_8022AE4: @ 8022AE4
+ thumb_func_start atk34_orhalfword
+atk34_orhalfword: @ 8022AE4
push {r4,lr}
ldr r4, _08022B18 @ =gUnknown_2023D74
ldr r3, [r4]
@@ -10471,10 +10471,10 @@ sub_8022AE4: @ 8022AE4
bx r0
.align 2, 0
_08022B18: .4byte gUnknown_2023D74
- thumb_func_end sub_8022AE4
+ thumb_func_end atk34_orhalfword
- thumb_func_start sub_8022B1C
-sub_8022B1C: @ 8022B1C
+ thumb_func_start atk35_orword
+atk35_orword: @ 8022B1C
push {r4,lr}
ldr r4, _08022B5C @ =gUnknown_2023D74
ldr r2, [r4]
@@ -10509,10 +10509,10 @@ sub_8022B1C: @ 8022B1C
bx r0
.align 2, 0
_08022B5C: .4byte gUnknown_2023D74
- thumb_func_end sub_8022B1C
+ thumb_func_end atk35_orword
- thumb_func_start sub_8022B60
-sub_8022B60: @ 8022B60
+ thumb_func_start atk36_bicbyte
+atk36_bicbyte: @ 8022B60
ldr r3, _08022B88 @ =gUnknown_2023D74
ldr r2, [r3]
ldrb r1, [r2, 0x1]
@@ -10535,10 +10535,10 @@ sub_8022B60: @ 8022B60
bx lr
.align 2, 0
_08022B88: .4byte gUnknown_2023D74
- thumb_func_end sub_8022B60
+ thumb_func_end atk36_bicbyte
- thumb_func_start sub_8022B8C
-sub_8022B8C: @ 8022B8C
+ thumb_func_start atk37_bichalfword
+atk37_bichalfword: @ 8022B8C
push {r4,lr}
ldr r4, _08022BC0 @ =gUnknown_2023D74
ldr r3, [r4]
@@ -10567,10 +10567,10 @@ sub_8022B8C: @ 8022B8C
bx r0
.align 2, 0
_08022BC0: .4byte gUnknown_2023D74
- thumb_func_end sub_8022B8C
+ thumb_func_end atk37_bichalfword
- thumb_func_start sub_8022BC4
-sub_8022BC4: @ 8022BC4
+ thumb_func_start atk38_bicword
+atk38_bicword: @ 8022BC4
push {r4,lr}
ldr r4, _08022C04 @ =gUnknown_2023D74
ldr r2, [r4]
@@ -10605,10 +10605,10 @@ sub_8022BC4: @ 8022BC4
bx r0
.align 2, 0
_08022C04: .4byte gUnknown_2023D74
- thumb_func_end sub_8022BC4
+ thumb_func_end atk38_bicword
- thumb_func_start sub_8022C08
-sub_8022C08: @ 8022C08
+ thumb_func_start atk39_pause
+atk39_pause: @ 8022C08
push {r4,r5,lr}
ldr r0, _08022C3C @ =gUnknown_2023BC8
ldr r4, [r0]
@@ -10639,7 +10639,7 @@ _08022C34:
_08022C3C: .4byte gUnknown_2023BC8
_08022C40: .4byte gUnknown_2023D74
_08022C44: .4byte gUnknown_2023E7C
- thumb_func_end sub_8022C08
+ thumb_func_end atk39_pause
thumb_func_start sub_8022C48
sub_8022C48: @ 8022C48
@@ -10660,8 +10660,8 @@ _08022C60: .4byte gUnknown_2023BC8
_08022C64: .4byte gUnknown_2023D74
thumb_func_end sub_8022C48
- thumb_func_start sub_8022C68
-sub_8022C68: @ 8022C68
+ thumb_func_start atk3B_healthbar_update
+atk3B_healthbar_update: @ 8022C68
push {lr}
ldr r0, _08022C7C @ =gUnknown_2023D74
ldr r0, [r0]
@@ -10684,10 +10684,10 @@ _08022C8C:
ldr r0, _08022CB8 @ =gUnknown_2023D50
ldrh r1, [r0]
movs r0, 0
- bl sub_800E5EC
+ bl EmitHealthBarUpdate
ldr r0, _08022CB0 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08022CBC @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x2
@@ -10699,15 +10699,15 @@ _08022CB0: .4byte gUnknown_2023BC4
_08022CB4: .4byte gUnknown_2023D6B
_08022CB8: .4byte gUnknown_2023D50
_08022CBC: .4byte gUnknown_2023D74
- thumb_func_end sub_8022C68
+ thumb_func_end atk3B_healthbar_update
- thumb_func_start sub_8022CC0
-sub_8022CC0: @ 8022CC0
+ thumb_func_start atk3C_return
+atk3C_return: @ 8022CC0
push {lr}
- bl sub_801756C
+ bl BattleScriptPop
pop {r0}
bx r0
- thumb_func_end sub_8022CC0
+ thumb_func_end atk3C_return
thumb_func_start sub_8022CCC
sub_8022CCC: @ 8022CCC
@@ -10726,8 +10726,8 @@ _08022CE4: .4byte gUnknown_2023BC4
_08022CE8: .4byte gUnknown_2023BE3
thumb_func_end sub_8022CCC
- thumb_func_start sub_8022CEC
-sub_8022CEC: @ 8022CEC
+ thumb_func_start atk3E_end2
+atk3E_end2: @ 8022CEC
ldr r1, _08022CFC @ =gUnknown_2023BC4
movs r0, 0
strb r0, [r1]
@@ -10738,12 +10738,12 @@ sub_8022CEC: @ 8022CEC
.align 2, 0
_08022CFC: .4byte gUnknown_2023BC4
_08022D00: .4byte gUnknown_2023BE3
- thumb_func_end sub_8022CEC
+ thumb_func_end atk3E_end2
- thumb_func_start sub_8022D04
-sub_8022D04: @ 8022D04
+ thumb_func_start atk3F_end3
+atk3F_end3: @ 8022D04
push {lr}
- bl sub_801756C
+ bl BattleScriptPop
ldr r3, _08022D38 @ =gUnknown_2023FF4
ldr r0, [r3]
ldr r0, [r0, 0xC]
@@ -10770,15 +10770,15 @@ _08022D1E:
.align 2, 0
_08022D38: .4byte gUnknown_2023FF4
_08022D3C: .4byte gUnknown_3004F84
- thumb_func_end sub_8022D04
+ thumb_func_end atk3F_end3
- thumb_func_start sub_8022D40
-sub_8022D40: @ 8022D40
+ thumb_func_start atk41_call
+atk41_call: @ 8022D40
push {r4,lr}
ldr r4, _08022D6C @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x5
- bl sub_8017520
+ bl BattleScriptPush
ldr r2, [r4]
ldrb r1, [r2, 0x1]
ldrb r0, [r2, 0x2]
@@ -10796,10 +10796,10 @@ sub_8022D40: @ 8022D40
bx r0
.align 2, 0
_08022D6C: .4byte gUnknown_2023D74
- thumb_func_end sub_8022D40
+ thumb_func_end atk41_call
- thumb_func_start sub_8022D70
-sub_8022D70: @ 8022D70
+ thumb_func_start atk42_jumpiftype2
+atk42_jumpiftype2: @ 8022D70
push {r4,lr}
ldr r4, _08022DB8 @ =gUnknown_2023D74
ldr r0, [r4]
@@ -10845,10 +10845,10 @@ _08022DC4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8022D70
+ thumb_func_end atk42_jumpiftype2
- thumb_func_start sub_8022DCC
-sub_8022DCC: @ 8022DCC
+ thumb_func_start atk43_jumpifabilitypresent
+atk43_jumpifabilitypresent: @ 8022DCC
push {r4,lr}
sub sp, 0x4
ldr r4, _08022E04 @ =gUnknown_2023D74
@@ -10887,10 +10887,10 @@ _08022E0E:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8022DCC
+ thumb_func_end atk43_jumpifabilitypresent
- thumb_func_start sub_8022E18
-sub_8022E18: @ 8022E18
+ thumb_func_start atk44_endselectionscript
+atk44_endselectionscript: @ 8022E18
ldr r0, _08022E2C @ =gUnknown_2023D6B
ldrb r0, [r0]
ldr r1, _08022E30 @ =gUnknown_2023FE8
@@ -10903,7 +10903,7 @@ sub_8022E18: @ 8022E18
.align 2, 0
_08022E2C: .4byte gUnknown_2023D6B
_08022E30: .4byte gUnknown_2023FE8
- thumb_func_end sub_8022E18
+ thumb_func_end atk44_endselectionscript
thumb_func_start sub_8022E34
sub_8022E34: @ 8022E34
@@ -10941,7 +10941,7 @@ _08022E6E:
ldrb r1, [r0, 0x2]
ldrh r2, [r3]
movs r0, 0
- bl sub_800EB28
+ bl EmitBattleAnimation
ldr r0, _08022E88 @ =gUnknown_2023BC4
ldrb r0, [r0]
b _08022EE4
@@ -10956,7 +10956,7 @@ _08022E8C:
cmp r0, 0
beq _08022EAC
adds r0, r2, 0x7
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08022EA8 @ =gUnknown_81D89F1
b _08022EEC
.align 2, 0
@@ -10987,10 +10987,10 @@ _08022ED8:
ldrb r1, [r2, 0x2]
ldrh r2, [r3]
movs r0, 0
- bl sub_800EB28
+ bl EmitBattleAnimation
ldrb r0, [r6]
_08022EE4:
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r4]
adds r0, 0x7
_08022EEC:
@@ -11000,8 +11000,8 @@ _08022EEC:
bx r0
thumb_func_end sub_8022E34
- thumb_func_start sub_8022EF4
-sub_8022EF4: @ 8022EF4
+ thumb_func_start atk46_playanimation2
+atk46_playanimation2: @ 8022EF4
push {r4-r7,lr}
ldr r6, _08022F5C @ =gUnknown_2023D74
ldr r0, [r6]
@@ -11042,10 +11042,10 @@ _08022F3E:
ldrb r1, [r3]
ldrh r2, [r4]
movs r0, 0
- bl sub_800EB28
+ bl EmitBattleAnimation
ldr r0, _08022F60 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08022F5C @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0xA
@@ -11090,9 +11090,9 @@ _08022FA4:
ldrb r1, [r3]
ldrh r2, [r4]
movs r0, 0
- bl sub_800EB28
+ bl EmitBattleAnimation
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r6]
_08022FB6:
adds r0, 0xA
@@ -11101,10 +11101,10 @@ _08022FBA:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8022EF4
+ thumb_func_end atk46_playanimation2
- thumb_func_start sub_8022FC0
-sub_8022FC0: @ 8022FC0
+ thumb_func_start atk47_setgraphicalstatchangevalues
+atk47_setgraphicalstatchangevalues: @ 8022FC0
push {r4,lr}
movs r3, 0
ldr r1, _08022FDC @ =gUnknown_2023FC4
@@ -11156,10 +11156,10 @@ _08022FF8:
bx r0
.align 2, 0
_08023018: .4byte gUnknown_2023D74
- thumb_func_end sub_8022FC0
+ thumb_func_end atk47_setgraphicalstatchangevalues
- thumb_func_start sub_802301C
-sub_802301C: @ 802301C
+ thumb_func_start atk48_playstatchangeanimation
+atk48_playstatchangeanimation: @ 802301C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -11226,7 +11226,7 @@ _0802309C:
ldr r6, _08023120 @ =gUnknown_2023BC4
ldrb r0, [r6]
str r3, [sp]
- bl sub_80751D8
+ bl GetBankIdentity
mov r1, r10
ands r1, r0
lsls r0, r1, 1
@@ -11379,10 +11379,10 @@ _080231B0:
movs r1, 0x1
mov r2, r8
str r3, [sp]
- bl sub_800EB28
+ bl EmitBattleAnimation
ldr r0, _080231F0 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, _080231F4 @ =gUnknown_2023D74
ldr r0, [r0]
ldrb r1, [r0, 0x3]
@@ -11417,10 +11417,10 @@ _080231FE:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802301C
+ thumb_func_end atk48_playstatchangeanimation
- thumb_func_start sub_8023210
-sub_8023210: @ 8023210
+ thumb_func_start atk49_moveend
+atk49_moveend: @ 8023210
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -11470,7 +11470,7 @@ _08023270: .4byte gUnknown_2023D6B
_08023274: .4byte gUnknown_2023F54
_08023278:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_08023282:
@@ -11498,9 +11498,9 @@ _080232AC:
strb r2, [r4]
movs r0, 0
movs r1, 0x1
- bl sub_800EB04
+ bl EmitSpriteInvisibility
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0802379E
.align 2, 0
_080232C0: .4byte gUnknown_2023BC4
@@ -11509,9 +11509,9 @@ _080232C4:
strb r2, [r4]
movs r0, 0
movs r1, 0
- bl sub_800EB04
+ bl EmitSpriteInvisibility
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r1, [r6]
lsls r1, 2
adds r1, r5
@@ -11530,7 +11530,7 @@ _080232F0:
str r0, [r5]
ldr r0, _08023324 @ =gUnknown_2023FC4
strb r4, [r0, 0x14]
- bl sub_8022598
+ bl MoveValuesCleanUp
ldr r2, _08023328 @ =gUnknown_81D65A8
mov r0, r8
ldrh r1, [r0]
@@ -11542,7 +11542,7 @@ _080232F0:
lsls r0, 2
adds r0, r2
ldr r0, [r0]
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _0802332C @ =gUnknown_2023D74
ldr r0, _08023330 @ =gUnknown_81D96A8
bl _08023BFC
@@ -11639,10 +11639,10 @@ _080233EE:
b _080237C8
_080233F8:
adds r0, r1, 0
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -11700,7 +11700,7 @@ _08023458:
_0802346A:
adds r0, r2, 0x1
strb r0, [r1, 0x19]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _08023498 @ =gUnknown_2023D74
ldr r0, _0802349C @ =gUnknown_81D8C48
str r0, [r1]
@@ -11786,10 +11786,10 @@ _080234FE:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
- bl sub_8017544
+ bl MarkBufferBankForExecution
+ bl BattleScriptPushCursor
ldr r1, _08023554 @ =gUnknown_2023D74
ldr r0, _08023558 @ =gUnknown_81D9098
str r0, [r1]
@@ -12067,7 +12067,7 @@ _08023738:
cmp r0, 0
beq _08023764
adds r0, r2, 0
- bl sub_8017354
+ bl WasUnableToUseMove
lsls r0, 24
cmp r0, 0
beq _080237C8
@@ -12078,9 +12078,9 @@ _08023764:
strb r0, [r4]
movs r0, 0
movs r1, 0
- bl sub_800EB04
+ bl EmitSpriteInvisibility
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, _080237AC @ =gUnknown_2023DFC
ldrb r2, [r5]
lsls r2, 2
@@ -12571,12 +12571,12 @@ _08023B28:
bne _08023BAC
ldr r7, _08023C28 @ =gUnknown_2023D6C
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _08023C2C @ =gUnknown_2023BE4
@@ -12659,10 +12659,10 @@ _08023C28: .4byte gUnknown_2023D6C
_08023C2C: .4byte gUnknown_2023BE4
_08023C30: .4byte gUnknown_2023FC4
_08023C34: .4byte gUnknown_2023D74
- thumb_func_end sub_8023210
+ thumb_func_end atk49_moveend
- thumb_func_start sub_8023C38
-sub_8023C38: @ 8023C38
+ thumb_func_start atk4A_typecalc2
+atk4A_typecalc2: @ 8023C38
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -12869,7 +12869,7 @@ _08023DAE:
ldrb r0, [r0]
ldr r7, _08023E68 @ =gUnknown_2023D4A
ldrh r1, [r7]
- bl sub_802A224
+ bl AttacksThisTurn
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x2
@@ -12949,10 +12949,10 @@ _08023E78: .4byte gUnknown_2023DA0
_08023E7C: .4byte gUnknown_2023E82
_08023E80: .4byte gUnknown_2023E8C
_08023E84: .4byte gUnknown_2023D74
- thumb_func_end sub_8023C38
+ thumb_func_end atk4A_typecalc2
- thumb_func_start sub_8023E88
-sub_8023E88: @ 8023E88
+ thumb_func_start atk4B_returnatktoball
+atk4B_returnatktoball: @ 8023E88
push {r4,lr}
ldr r4, _08023EC4 @ =gUnknown_2023BC4
ldr r0, _08023EC8 @ =gUnknown_2023D6B
@@ -12971,9 +12971,9 @@ sub_8023E88: @ 8023E88
bne _08023EB6
movs r0, 0
movs r1, 0
- bl sub_800E0B4
+ bl EmitReturnMonToBall
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08023EB6:
ldr r1, _08023ED4 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -12988,10 +12988,10 @@ _08023EC8: .4byte gUnknown_2023D6B
_08023ECC: .4byte gUnknown_2023DD0
_08023ED0: .4byte gUnknown_825E45C
_08023ED4: .4byte gUnknown_2023D74
- thumb_func_end sub_8023E88
+ thumb_func_end atk4B_returnatktoball
- thumb_func_start sub_8023ED8
-sub_8023ED8: @ 8023ED8
+ thumb_func_start atk4C_getswitchedmondata
+atk4C_getswitchedmondata: @ 8023ED8
push {r4,r5,lr}
ldr r0, _08023F30 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -13023,9 +13023,9 @@ sub_8023ED8: @ 8023ED8
ldrb r2, [r0]
movs r0, 0
movs r1, 0
- bl sub_800DFA4
+ bl EmitGetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -13040,7 +13040,7 @@ _08023F38: .4byte gUnknown_2023BC4
_08023F3C: .4byte gUnknown_2023BCE
_08023F40: .4byte gUnknown_2023FE8
_08023F44: .4byte gUnknown_825E45C
- thumb_func_end sub_8023ED8
+ thumb_func_end atk4C_getswitchedmondata
thumb_func_start sub_8023F48
sub_8023F48: @ 8023F48
@@ -13126,7 +13126,7 @@ _08023F84:
adds r1, 0x20
strb r0, [r1]
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _080240B8 @ =gUnknown_2023F20
@@ -13247,7 +13247,7 @@ sub_80240D4: @ 80240D4
ldr r6, _08024170 @ =gUnknown_2023BC4
strb r0, [r6]
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -13264,7 +13264,7 @@ sub_80240D4: @ 80240D4
muls r0, r5
adds r0, r4
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
ldrb r1, [r6]
@@ -13294,9 +13294,9 @@ _0802412A:
ldr r0, [r4]
ldrb r2, [r0, 0x2]
movs r0, 0
- bl sub_800E090
+ bl EmitSwitchInAnim
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r4]
adds r0, 0x3
str r0, [r4]
@@ -13383,7 +13383,7 @@ _08024204:
beq _080242A4
ldr r4, _08024294 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
ldr r1, _08024298 @ =gUnknown_2024284
@@ -13395,7 +13395,7 @@ _08024204:
_08024228:
movs r5, 0
ldrb r0, [r4]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
@@ -13416,17 +13416,17 @@ _0802424A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08024284
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08024284
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08024284
ldr r0, _08024294 @ =gUnknown_2023BC4
@@ -13453,13 +13453,13 @@ _080242A0: .4byte gUnknown_2023BCE
_080242A4:
ldr r0, _080242D4 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
bne _080242E4
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
ldr r0, [r5]
@@ -13467,7 +13467,7 @@ _080242A4:
cmp r0, 0
beq _080242D8
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
b _080242DA
@@ -13483,7 +13483,7 @@ _080242DA:
_080242E0: .4byte gUnknown_202402C
_080242E4:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
ldr r0, [r5]
@@ -13492,7 +13492,7 @@ _080242E4:
cmp r0, 0
beq _08024304
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
b _08024306
@@ -13510,17 +13510,17 @@ _0802430C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802434E
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802434E
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0802434E
ldr r1, _08024378 @ =gUnknown_2023BCE
@@ -13603,9 +13603,9 @@ sub_8024398: @ 8024398
movs r0, 0
movs r1, 0x1
movs r3, 0
- bl sub_800E590
+ bl EmitChoosePokemon
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -13702,7 +13702,7 @@ _08024446:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080244F6
.align 2, 0
_08024498: .4byte gUnknown_2023D74
@@ -13742,7 +13742,7 @@ _080244E8:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080244F6:
ldrb r0, [r4]
adds r0, 0x1
@@ -13798,9 +13798,9 @@ _08024518:
bics r0, r1
str r0, [r2]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080245CE
.align 2, 0
_08024570: .4byte gUnknown_2023DD0
@@ -13841,7 +13841,7 @@ _080245BC:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
movs r0, 0x1
mov r9, r0
_080245CE:
@@ -13882,9 +13882,9 @@ _080245CE:
bics r0, r1
str r0, [r2]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0802468C
.align 2, 0
_08024628: .4byte gUnknown_825E45C
@@ -13930,7 +13930,7 @@ _08024674:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0802468C:
ldr r6, _080246DC @ =gUnknown_825E45C
ldr r0, [r6, 0x4]
@@ -13965,9 +13965,9 @@ _0802468C:
bics r0, r1
str r0, [r2]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0802473E
.align 2, 0
_080246DC: .4byte gUnknown_825E45C
@@ -14008,7 +14008,7 @@ _08024728:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
movs r0, 0x2
mov r2, r9
orrs r2, r0
@@ -14051,9 +14051,9 @@ _0802473E:
bics r0, r1
str r0, [r2]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080247FC
.align 2, 0
_08024798: .4byte gUnknown_825E45C
@@ -14099,7 +14099,7 @@ _080247E4:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080247FC:
ldr r1, _0802482C @ =gUnknown_2023ECC
ldrb r0, [r1]
@@ -14139,7 +14139,7 @@ _08024840:
bl sub_800EB54
ldr r0, _08024880 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08024850:
ldr r1, _08024884 @ =gUnknown_2023ECC
ldrb r0, [r1, 0x14]
@@ -14179,7 +14179,7 @@ _08024894:
bl sub_800EB54
ldr r0, _080248B0 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080248A6:
ldr r1, _080248B4 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -14248,9 +14248,9 @@ _080248D6:
bics r0, r1
str r0, [r7]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r6]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0802497E
.align 2, 0
_08024934: .4byte gUnknown_2022B4C
@@ -14325,9 +14325,9 @@ _0802497E:
bics r0, r1
str r0, [r2]
movs r0, 0
- bl sub_800E9A4
+ bl EmitCmd42
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _08024A2E
.align 2, 0
_080249DC: .4byte gUnknown_2023ECC
@@ -14518,14 +14518,14 @@ _08024B34:
movs r0, 0
adds r1, r5, 0
movs r3, 0
- bl sub_800E590
+ bl EmitChoosePokemon
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r6]
adds r0, 0x6
str r0, [r6]
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
cmp r0, 0
bne _08024B94
@@ -14558,7 +14558,7 @@ _08024BB0:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08024BC4:
ldrb r0, [r4]
adds r0, 0x1
@@ -14579,12 +14579,12 @@ _08024BE8: .4byte gUnknown_2022B4C
_08024BEC: .4byte gUnknown_2023BCC
_08024BF0:
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _08024C3C @ =gUnknown_2023BC4
strb r0, [r4]
ldr r0, _08024C40 @ =gUnknown_2023D70
@@ -14605,7 +14605,7 @@ _08024C20:
movs r1, 0x2
bl sub_800EB54
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08024C2E:
add sp, 0x4
pop {r3,r4}
@@ -14905,7 +14905,7 @@ sub_8024E38: @ 8024E38
ands r0, r2
strb r0, [r1]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
ldr r5, _08024F54 @ =gUnknown_2023DDE
lsls r0, 24
lsrs r0, 23
@@ -14918,7 +14918,7 @@ sub_8024E38: @ 8024E38
cmp r0, 0
bne _08024F88
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 23
adds r0, r5
@@ -14950,7 +14950,7 @@ sub_8024E38: @ 8024E38
cmp r0, 0x1A
beq _08024F88
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 23
adds r0, r5
@@ -14959,7 +14959,7 @@ sub_8024E38: @ 8024E38
orrs r1, r2
strh r1, [r0]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
ldr r2, _08024F5C @ =gUnknown_2023DE4
lsls r0, 24
lsrs r0, 24
@@ -14987,7 +14987,7 @@ _08024F28:
ldr r0, _08024F64 @ =gUnknown_2023FC4
ldrb r1, [r4]
strb r1, [r0, 0x17]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r0, [r6]
ldrb r0, [r0, 0x1]
cmp r0, 0
@@ -15061,7 +15061,7 @@ _08024FC4:
cmp r0, 0
bne _080250C6
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _08025070 @ =gUnknown_2023DDE
lsls r0, 24
lsrs r0, 23
@@ -15103,7 +15103,7 @@ _08025012:
_08025020:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 23
adds r0, 0xA8
@@ -15203,14 +15203,14 @@ _080250EC: .4byte gUnknown_2023D74
_080250F0:
movs r0, 0x1
_080250F2:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08025114 @ =gUnknown_2023BC4
strb r0, [r1]
movs r0, 0
- bl sub_800E0F4
+ bl EmitTrainerSlide
ldr r0, _08025114 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08025118 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x2
@@ -15222,8 +15222,8 @@ _08025114: .4byte gUnknown_2023BC4
_08025118: .4byte gUnknown_2023D74
thumb_func_end sub_80250DC
- thumb_func_start sub_802511C
-sub_802511C: @ 802511C
+ thumb_func_start atk54_playse
+atk54_playse: @ 802511C
push {r4,r5,lr}
ldr r5, _0802514C @ =gUnknown_2023BC4
ldr r0, _08025150 @ =gUnknown_2023D6B
@@ -15236,9 +15236,9 @@ sub_802511C: @ 802511C
lsls r0, 8
orrs r1, r0
movs r0, 0
- bl sub_800E9C4
+ bl EmitPlaySE
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r4]
adds r0, 0x3
str r0, [r4]
@@ -15249,7 +15249,7 @@ sub_802511C: @ 802511C
_0802514C: .4byte gUnknown_2023BC4
_08025150: .4byte gUnknown_2023D6B
_08025154: .4byte gUnknown_2023D74
- thumb_func_end sub_802511C
+ thumb_func_end atk54_playse
thumb_func_start sub_8025158
sub_8025158: @ 8025158
@@ -15267,7 +15267,7 @@ sub_8025158: @ 8025158
movs r0, 0
bl sub_800E9F0
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r4]
adds r0, 0x3
str r0, [r4]
@@ -15280,8 +15280,8 @@ _0802518C: .4byte gUnknown_2023D6B
_08025190: .4byte gUnknown_2023D74
thumb_func_end sub_8025158
- thumb_func_start sub_8025194
-sub_8025194: @ 8025194
+ thumb_func_start atk56_playfaintcry
+atk56_playfaintcry: @ 8025194
push {r4,r5,lr}
ldr r5, _080251BC @ =gUnknown_2023D74
ldr r0, [r5]
@@ -15290,9 +15290,9 @@ sub_8025194: @ 8025194
ldr r4, _080251C0 @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
- bl sub_800EA1C
+ bl EmitFaintingCry
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -15302,13 +15302,13 @@ sub_8025194: @ 8025194
.align 2, 0
_080251BC: .4byte gUnknown_2023D74
_080251C0: .4byte gUnknown_2023BC4
- thumb_func_end sub_8025194
+ thumb_func_end atk56_playfaintcry
- thumb_func_start sub_80251C4
-sub_80251C4: @ 80251C4
+ thumb_func_start atk57
+atk57: @ 80251C4
push {r4,lr}
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _080251F0 @ =gUnknown_2023BC4
strb r0, [r4]
ldr r0, _080251F4 @ =gUnknown_2023E8A
@@ -15316,7 +15316,7 @@ sub_80251C4: @ 80251C4
movs r0, 0
bl sub_800EB94
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _080251F8 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -15328,10 +15328,10 @@ sub_80251C4: @ 80251C4
_080251F0: .4byte gUnknown_2023BC4
_080251F4: .4byte gUnknown_2023E8A
_080251F8: .4byte gUnknown_2023D74
- thumb_func_end sub_80251C4
+ thumb_func_end atk57
- thumb_func_start sub_80251FC
-sub_80251FC: @ 80251FC
+ thumb_func_start atk58_returntoball
+atk58_returntoball: @ 80251FC
push {r4,r5,lr}
ldr r5, _08025228 @ =gUnknown_2023D74
ldr r0, [r5]
@@ -15341,9 +15341,9 @@ sub_80251FC: @ 80251FC
strb r0, [r4]
movs r0, 0
movs r1, 0x1
- bl sub_800E0B4
+ bl EmitReturnMonToBall
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -15353,10 +15353,10 @@ sub_80251FC: @ 80251FC
.align 2, 0
_08025228: .4byte gUnknown_2023D74
_0802522C: .4byte gUnknown_2023BC4
- thumb_func_end sub_80251FC
+ thumb_func_end atk58_returntoball
- thumb_func_start sub_8025230
-sub_8025230: @ 8025230
+ thumb_func_start atk59_handlelearnnewmove
+atk59_handlelearnnewmove: @ 8025230
push {r4-r7,lr}
ldr r0, _080252A4 @ =gUnknown_2023D74
ldr r2, [r0]
@@ -15388,7 +15388,7 @@ sub_8025230: @ 8025230
ldr r1, _080252AC @ =gUnknown_2024284
adds r0, r1
ldrb r1, [r2, 0x9]
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _080252B0 @ =0x0000fffe
@@ -15404,7 +15404,7 @@ _0802527E:
ldr r1, _080252AC @ =gUnknown_2024284
adds r0, r1
movs r1, 0
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r5, r0, 16
cmp r5, r7
@@ -15434,7 +15434,7 @@ _080252C4: .4byte 0x0000ffff
_080252C8: .4byte gUnknown_2023D74
_080252CC:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08025364 @ =gUnknown_2023BC4
strb r0, [r1]
ldr r2, _08025368 @ =gUnknown_2023BCE
@@ -15462,7 +15462,7 @@ _080252CC:
bne _0802530C
adds r0, r2, r4
adds r1, r5, 0
- bl sub_803E920
+ bl GiveMoveToBattleMon
_0802530C:
ldr r0, _08025374 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -15471,7 +15471,7 @@ _0802530C:
cmp r0, 0
beq _08025358
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08025364 @ =gUnknown_2023BC4
strb r0, [r1]
ldr r2, _08025368 @ =gUnknown_2023BCE
@@ -15499,7 +15499,7 @@ _0802530C:
bne _08025358
adds r0, r2, r4
adds r1, r5, 0
- bl sub_803E920
+ bl GiveMoveToBattleMon
_08025358:
ldr r0, _08025378 @ =gUnknown_2023D74
str r6, [r0]
@@ -15514,7 +15514,7 @@ _0802536C: .4byte gUnknown_2023FE8
_08025370: .4byte gUnknown_2023BE4
_08025374: .4byte gUnknown_2022B4C
_08025378: .4byte gUnknown_2023D74
- thumb_func_end sub_8025230
+ thumb_func_end atk59_handlelearnnewmove
thumb_func_start sub_802537C
sub_802537C: @ 802537C
@@ -15632,7 +15632,7 @@ _08025448:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080254D8
.align 2, 0
_08025484: .4byte gUnknown_30030F0
@@ -15733,17 +15733,17 @@ _0802553C:
adds r0, r7
adds r1, r5, 0
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_80441B8
+ bl IsHMMove2
cmp r0, 0
beq _0802558C
ldr r0, _08025580 @ =0x0000013f
ldr r1, _08025584 @ =gUnknown_2023BC4
ldrb r1, [r1]
- bl sub_80173AC
+ bl PrepareStringBattle
ldr r1, _08025588 @ =gUnknown_2023FC4
movs r0, 0x5
strb r0, [r1, 0x1F]
@@ -15785,7 +15785,7 @@ _0802558C:
adds r0, r1, 0
adds r0, r7
adds r1, r5, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
ldr r0, [r6]
ldrb r0, [r0, 0x10]
mov r1, r8
@@ -15795,7 +15795,7 @@ _0802558C:
ldr r7, _08025688 @ =gUnknown_2024022
ldrh r1, [r7]
adds r2, r5, 0
- bl sub_803E964
+ bl SetMonMoveSlot
ldr r0, _0802568C @ =gUnknown_2023BCE
ldr r1, [r6]
ldrh r0, [r0]
@@ -15821,11 +15821,11 @@ _0802558C:
bne _08025622
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80410A0
+ bl RemoveBattleMonPPBonus
ldrh r1, [r7]
adds r0, r4, 0
adds r2, r5, 0
- bl sub_803E9A4
+ bl SetBattleMonMoveSlot
_08025622:
ldr r0, _0802569C @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -15864,12 +15864,12 @@ _08025622:
adds r4, 0xB0
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80410A0
+ bl RemoveBattleMonPPBonus
ldr r0, _08025688 @ =gUnknown_2024022
ldrh r1, [r0]
adds r0, r4, 0
adds r2, r5, 0
- bl sub_803E9A4
+ bl SetBattleMonMoveSlot
b _080256D0
.align 2, 0
_08025680: .4byte gUnknown_2023D74
@@ -16108,10 +16108,10 @@ sub_802581C: @ 802581C
bne _080258A0
_0802586E:
movs r0, 0
- bl sub_800E984
+ bl EmitHitAnimation
ldr r0, _0802588C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08025888 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x2
@@ -16302,7 +16302,7 @@ _080259E8:
lsls r1, 2
adds r0, r1
adds r1, r4, 0
- bl sub_809FDA0
+ bl AddMoney
b _08025A00
_080259FA:
bl sub_8054C04
@@ -16366,8 +16366,8 @@ _08025A62:
_08025A6C: .4byte gUnknown_2023D74
thumb_func_end sub_80258AC
- thumb_func_start sub_8025A70
-sub_8025A70: @ 8025A70
+ thumb_func_start atk5E
+atk5E: @ 8025A70
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -16393,9 +16393,9 @@ _08025AA0:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_800DFA4
+ bl EmitGetMonData
ldrb r0, [r6]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -16454,10 +16454,10 @@ _08025B0C:
_08025B18: .4byte gUnknown_2023BC8
_08025B1C: .4byte gUnknown_20233C8
_08025B20: .4byte gUnknown_2023C08
- thumb_func_end sub_8025A70
+ thumb_func_end atk5E
- thumb_func_start sub_8025B24
-sub_8025B24: @ 8025B24
+ thumb_func_start atk5F
+atk5F: @ 8025B24
push {lr}
ldr r0, _08025B4C @ =gUnknown_2023BC4
ldr r2, _08025B50 @ =gUnknown_2023D6B
@@ -16496,14 +16496,14 @@ _08025B62:
bx r0
.align 2, 0
_08025B70: .4byte gUnknown_2023D74
- thumb_func_end sub_8025B24
+ thumb_func_end atk5F
- thumb_func_start sub_8025B74
-sub_8025B74: @ 8025B74
+ thumb_func_start atk60_incrementgamestat
+atk60_incrementgamestat: @ 8025B74
push {lr}
ldr r0, _08025B9C @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08025B8E
@@ -16521,10 +16521,10 @@ _08025B8E:
.align 2, 0
_08025B9C: .4byte gUnknown_2023D6B
_08025BA0: .4byte gUnknown_2023D74
- thumb_func_end sub_8025B74
+ thumb_func_end atk60_incrementgamestat
- thumb_func_start sub_8025BA4
-sub_8025BA4: @ 8025BA4
+ thumb_func_start atk61_drawpartystatussummary
+atk61_drawpartystatussummary: @ 8025BA4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -16540,7 +16540,7 @@ sub_8025BA4: @ 8025BA4
ldr r1, _08025C10 @ =gUnknown_2023BC4
strb r0, [r1]
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _08025C14 @ =gUnknown_202402C
mov r8, r1
@@ -16559,12 +16559,12 @@ _08025BDC:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08025C00
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -16584,11 +16584,11 @@ _08025C1C: .4byte 0x0000ffff
_08025C20:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
_08025C32:
str r0, [r6]
adds r6, 0x8
@@ -16599,10 +16599,10 @@ _08025C32:
movs r0, 0
mov r1, sp
movs r2, 0x1
- bl sub_800EA7C
+ bl EmitDrawPartyStatusSummary
ldr r0, _08025C64 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08025C68 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x2
@@ -16617,10 +16617,10 @@ _08025C58:
.align 2, 0
_08025C64: .4byte gUnknown_2023BC4
_08025C68: .4byte gUnknown_2023D74
- thumb_func_end sub_8025BA4
+ thumb_func_end atk61_drawpartystatussummary
- thumb_func_start sub_8025C6C
-sub_8025C6C: @ 8025C6C
+ thumb_func_start atk62
+atk62: @ 8025C6C
push {r4,r5,lr}
ldr r5, _08025C94 @ =gUnknown_2023D74
ldr r0, [r5]
@@ -16629,9 +16629,9 @@ sub_8025C6C: @ 8025C6C
ldr r4, _08025C98 @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
- bl sub_800EAC4
+ bl EmitCmd49
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -16641,10 +16641,10 @@ sub_8025C6C: @ 8025C6C
.align 2, 0
_08025C94: .4byte gUnknown_2023D74
_08025C98: .4byte gUnknown_2023BC4
- thumb_func_end sub_8025C6C
+ thumb_func_end atk62
- thumb_func_start sub_8025C9C
-sub_8025C9C: @ 8025C9C
+ thumb_func_start atk63_jumptorandomattack
+atk63_jumptorandomattack: @ 8025C9C
push {r4,lr}
ldr r0, _08025CB4 @ =gUnknown_2023D74
ldr r1, [r0]
@@ -16691,10 +16691,10 @@ _08025CF0: .4byte gUnknown_2023D4A
_08025CF4: .4byte gUnknown_2023D4E
_08025CF8: .4byte gUnknown_81D65A8
_08025CFC: .4byte gUnknown_8250C04
- thumb_func_end sub_8025C9C
+ thumb_func_end atk63_jumptorandomattack
- thumb_func_start sub_8025D00
-sub_8025D00: @ 8025D00
+ thumb_func_start atk64_statusanimation
+atk64_statusanimation: @ 8025D00
push {r4,lr}
ldr r0, _08025D70 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -16737,9 +16737,9 @@ sub_8025D00: @ 8025D00
ldr r2, [r0]
movs r0, 0
movs r1, 0
- bl sub_800E6AC
+ bl EmitStatusAnimation
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08025D60:
ldr r1, _08025D74 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -16758,10 +16758,10 @@ _08025D80: .4byte 0x000400c0
_08025D84: .4byte gUnknown_2023E0C
_08025D88: .4byte gUnknown_2023DD0
_08025D8C: .4byte gUnknown_2023BE4
- thumb_func_end sub_8025D00
+ thumb_func_end atk64_statusanimation
- thumb_func_start sub_8025D90
-sub_8025D90: @ 8025D90
+ thumb_func_start atk65_status2animation
+atk65_status2animation: @ 8025D90
push {r4,r5,lr}
ldr r0, _08025E18 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -16816,9 +16816,9 @@ sub_8025D90: @ 8025D90
ands r2, r3
movs r0, 0
movs r1, 0x1
- bl sub_800E6AC
+ bl EmitStatusAnimation
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08025E08:
ldr r1, _08025E1C @ =gUnknown_2023D74
ldr r0, [r1]
@@ -16837,10 +16837,10 @@ _08025E28: .4byte 0x000400c0
_08025E2C: .4byte gUnknown_2023E0C
_08025E30: .4byte gUnknown_2023DD0
_08025E34: .4byte gUnknown_2023BE4
- thumb_func_end sub_8025D90
+ thumb_func_end atk65_status2animation
- thumb_func_start sub_8025E38
-sub_8025E38: @ 8025E38
+ thumb_func_start atk66_chosenstatusanimation
+atk66_chosenstatusanimation: @ 8025E38
push {r4,r5,lr}
ldr r0, _08025EB0 @ =gUnknown_2023BC8
ldr r0, [r0]
@@ -16888,9 +16888,9 @@ sub_8025E38: @ 8025E38
bne _08025EA2
ldrb r1, [r4, 0x2]
movs r0, 0
- bl sub_800E6AC
+ bl EmitStatusAnimation
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08025EA2:
ldr r1, _08025EB4 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -16908,10 +16908,10 @@ _08025EBC: .4byte gUnknown_2023DFC
_08025EC0: .4byte 0x000400c0
_08025EC4: .4byte gUnknown_2023E0C
_08025EC8: .4byte gUnknown_2023DD0
- thumb_func_end sub_8025E38
+ thumb_func_end atk66_chosenstatusanimation
- thumb_func_start sub_8025ECC
-sub_8025ECC: @ 8025ECC
+ thumb_func_start atk67_yesnobox
+atk67_yesnobox: @ 8025ECC
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _08025EE0 @ =gUnknown_2023E82
@@ -17014,10 +17014,10 @@ _08025F9A:
bx r0
.align 2, 0
_08025FA4: .4byte gUnknown_2023D74
- thumb_func_end sub_8025ECC
+ thumb_func_end atk67_yesnobox
- thumb_func_start sub_8025FA8
-sub_8025FA8: @ 8025FA8
+ thumb_func_start atk68_cancelallactions
+atk68_cancelallactions: @ 8025FA8
push {r4,r5,lr}
movs r1, 0
ldr r2, _08025FD4 @ =gUnknown_2023BCC
@@ -17045,10 +17045,10 @@ _08025FC6:
_08025FD4: .4byte gUnknown_2023BCC
_08025FD8: .4byte gUnknown_2023D74
_08025FDC: .4byte gUnknown_2023BDA
- thumb_func_end sub_8025FA8
+ thumb_func_end atk68_cancelallactions
- thumb_func_start sub_8025FE0
-sub_8025FE0: @ 8025FE0
+ thumb_func_start atk69_adjustsetdamage
+atk69_adjustsetdamage: @ 8025FE0
push {r4-r7,lr}
ldr r7, _08026008 @ =gUnknown_2023BE4
ldr r6, _0802600C @ =gUnknown_2023D6C
@@ -17074,14 +17074,14 @@ _0802600C: .4byte gUnknown_2023D6C
_08026010: .4byte gUnknown_2023F54
_08026014:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
ldrb r0, [r6]
muls r0, r5
adds r0, r7
ldrh r0, [r0, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r6, r0, 24
_0802602E:
@@ -17091,7 +17091,7 @@ _0802602E:
strb r0, [r1]
cmp r4, 0x27
bne _0802606C
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -17225,10 +17225,10 @@ _0802614C: .4byte gUnknown_2023ECC
_08026150: .4byte gUnknown_2023DCC
_08026154: .4byte gUnknown_2023D68
_08026158: .4byte gUnknown_2023D74
- thumb_func_end sub_8025FE0
+ thumb_func_end atk69_adjustsetdamage
- thumb_func_start sub_802615C
-sub_802615C: @ 802615C
+ thumb_func_start atk6A_removeitem
+atk6A_removeitem: @ 802615C
push {r4-r6,lr}
sub sp, 0x4
ldr r6, _080261BC @ =gUnknown_2023D74
@@ -17264,9 +17264,9 @@ sub_802615C: @ 802615C
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r6]
adds r0, 0x2
str r0, [r6]
@@ -17279,10 +17279,10 @@ _080261BC: .4byte gUnknown_2023D74
_080261C0: .4byte gUnknown_2023BC4
_080261C4: .4byte gUnknown_2023FE8
_080261C8: .4byte gUnknown_2023BE4
- thumb_func_end sub_802615C
+ thumb_func_end atk6A_removeitem
- thumb_func_start sub_80261CC
-sub_80261CC: @ 80261CC
+ thumb_func_start atk6B_atknameinbuff1
+atk6B_atknameinbuff1: @ 80261CC
ldr r1, _080261F8 @ =gUnknown_2022AB8
movs r0, 0xFD
strb r0, [r1]
@@ -17309,10 +17309,10 @@ _080261F8: .4byte gUnknown_2022AB8
_080261FC: .4byte gUnknown_2023D6B
_08026200: .4byte gUnknown_2023BCE
_08026204: .4byte gUnknown_2023D74
- thumb_func_end sub_80261CC
+ thumb_func_end atk6B_atknameinbuff1
- thumb_func_start sub_8026208
-sub_8026208: @ 8026208
+ thumb_func_start atk6C_drawlvlupbox
+atk6C_drawlvlupbox: @ 8026208
push {r4,lr}
sub sp, 0x4
ldr r0, _08026224 @ =gUnknown_2023FC4
@@ -17320,7 +17320,7 @@ sub_8026208: @ 8026208
adds r4, r0, 0
cmp r1, 0
bne _0802622C
- bl sub_802679C
+ bl IsMonGettingExpSentOut
cmp r0, 0
beq _08026228
movs r0, 0x3
@@ -17364,9 +17364,9 @@ _0802626C:
movs r0, 0x2
movs r1, 0x7
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
bl sub_8026480
ldr r1, _08026294 @ =gUnknown_2023FC4
movs r0, 0x2
@@ -17400,15 +17400,15 @@ _080262B0:
movs r0, 0
movs r1, 0x7
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x1
movs r1, 0x7
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x80
str r0, [sp]
movs r0, 0x12
@@ -17427,13 +17427,13 @@ _08026300: .4byte gUnknown_2023FC4
_08026304:
bl sub_8026404
movs r0, 0xC
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0xC
movs r1, 0x3
bl sub_8003F20
b _0802636E
_08026318:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -17486,21 +17486,21 @@ _08026380:
cmp r0, 0
bne _080263F6
movs r0, 0xD
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0xD
movs r1, 0x1
bl sub_8003F20
movs r0, 0xC
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0xC
movs r1, 0x1
bl sub_8003F20
movs r0, 0x2
movs r1, 0x7
movs r2, 0x2
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
ldr r1, _080263C0 @ =gUnknown_2023FC4
movs r0, 0xA
strb r0, [r1, 0x1E]
@@ -17508,22 +17508,22 @@ _08026380:
.align 2, 0
_080263C0: .4byte gUnknown_2023FC4
_080263C4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080263F6
movs r0, 0
movs r1, 0x7
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x1
movs r1, 0x7
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r1, _08026400 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -17535,7 +17535,7 @@ _080263F6:
bx r0
.align 2, 0
_08026400: .4byte gUnknown_2023D74
- thumb_func_end sub_8026208
+ thumb_func_end atk6C_drawlvlupbox
thumb_func_start sub_8026404
sub_8026404: @ 8026404
@@ -17612,18 +17612,18 @@ sub_8026480: @ 8026480
ldr r0, _080264C8 @ =gUnknown_82506D0
movs r1, 0x60
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080264CC @ =gUnknown_82506F0
movs r0, 0xD
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
movs r0, 0xD
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0xD
movs r1, 0x3
bl sub_8003F20
- bl sub_8026688
+ bl PutMonIconOnLvlUpBox
pop {r0}
bx r0
.align 2, 0
@@ -17636,7 +17636,7 @@ _080264CC: .4byte gUnknown_82506F0
thumb_func_start sub_80264D0
sub_80264D0: @ 80264D0
push {r4,r5,lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _080264E0
@@ -17658,7 +17658,7 @@ _080264F4:
lsls r0, 1
cmp r1, r0
bne _08026500
- bl sub_8026524
+ bl PutLevelAndGenderOnLvlUpBox
_08026500:
ldrh r0, [r4]
adds r0, 0x8
@@ -17682,8 +17682,8 @@ _0802651A:
_08026520: .4byte 0x01ff0000
thumb_func_end sub_80264D0
- thumb_func_start sub_8026524
-sub_8026524: @ 8026524
+ thumb_func_start PutLevelAndGenderOnLvlUpBox
+PutLevelAndGenderOnLvlUpBox: @ 8026524
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -17696,7 +17696,7 @@ sub_8026524: @ 8026524
ldr r4, _080265FC @ =gUnknown_2024284
adds r0, r4
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
@@ -17705,7 +17705,7 @@ sub_8026524: @ 8026524
ldrb r0, [r0, 0x10]
muls r0, r5
adds r0, r4
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r7, r0, 24
ldr r0, [r6]
@@ -17714,7 +17714,7 @@ sub_8026524: @ 8026524
adds r0, r4
ldr r6, _08026600 @ =gUnknown_2021D18
adds r1, r6, 0
- bl sub_81202E0
+ bl GetMonNickname
str r6, [sp]
mov r1, sp
movs r4, 0
@@ -17764,7 +17764,7 @@ sub_8026524: @ 8026524
adds r6, r0, 0
movs r1, 0
movs r2, 0x5
- bl sub_8009204
+ bl StringFill
adds r6, r4, 0x4
cmp r7, 0xFF
beq _08026624
@@ -17773,11 +17773,11 @@ sub_8026524: @ 8026524
adds r0, r6, 0
movs r1, 0
movs r2, 0xC
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r6, r0, 0
movs r1, 0x1
movs r2, 0xD
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r6, r0, 0
movs r0, 0xB5
b _0802661C
@@ -17789,11 +17789,11 @@ _08026604:
adds r0, r6, 0
movs r1, 0
movs r2, 0xE
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r6, r0, 0
movs r1, 0x1
movs r2, 0xF
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r6, r0, 0
movs r0, 0xB6
_0802661C:
@@ -17818,7 +17818,7 @@ _08026624:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8026524
+ thumb_func_end PutLevelAndGenderOnLvlUpBox
thumb_func_start sub_8026648
sub_8026648: @ 8026648
@@ -17860,8 +17860,8 @@ _08026684:
bx r1
thumb_func_end sub_8026648
- thumb_func_start sub_8026688
-sub_8026688: @ 8026688
+ thumb_func_start PutMonIconOnLvlUpBox
+PutMonIconOnLvlUpBox: @ 8026688
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -17875,7 +17875,7 @@ sub_8026688: @ 8026688
ldr r5, _08026734 @ =gUnknown_2024284
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -17885,11 +17885,11 @@ sub_8026688: @ 8026688
muls r0, r6
adds r0, r5
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0x1
- bl sub_8097054
+ bl GetMonIconPtr
str r0, [sp]
ldr r5, _08026738 @ =0xffff0000
ldr r0, [sp, 0x4]
@@ -17912,15 +17912,15 @@ sub_8026688: @ 8026688
orrs r0, r1
str r0, [r4, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _08026748 @ =gUnknown_82507C8
movs r1, 0x80
lsls r1, 1
movs r2, 0xA
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _0802674C @ =gUnknown_202063C
@@ -17949,10 +17949,10 @@ _08026744: .4byte 0x0000d75a
_08026748: .4byte gUnknown_82507C8
_0802674C: .4byte gUnknown_202063C
_08026750: .4byte gUnknown_202297C
- thumb_func_end sub_8026688
+ thumb_func_end PutMonIconOnLvlUpBox
- thumb_func_start sub_8026754
-sub_8026754: @ 8026754
+ thumb_func_start SpriteCB_MonIconOnLvlUpBox
+SpriteCB_MonIconOnLvlUpBox: @ 8026754
push {r4,lr}
adds r2, r0, 0
ldr r0, _08026770 @ =gUnknown_202297C
@@ -17974,22 +17974,22 @@ _08026774:
cmp r0, 0
beq _08026790
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
ldr r4, _08026798 @ =0x0000d75a
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_08026790:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08026798: .4byte 0x0000d75a
- thumb_func_end sub_8026754
+ thumb_func_end SpriteCB_MonIconOnLvlUpBox
- thumb_func_start sub_802679C
-sub_802679C: @ 802679C
+ thumb_func_start IsMonGettingExpSentOut
+IsMonGettingExpSentOut: @ 802679C
push {lr}
ldr r3, _080267C4 @ =gUnknown_2023BCE
ldr r0, _080267C8 @ =gUnknown_2023FE8
@@ -18019,12 +18019,12 @@ _080267D0:
_080267D2:
pop {r1}
bx r1
- thumb_func_end sub_802679C
+ thumb_func_end IsMonGettingExpSentOut
- thumb_func_start sub_80267D8
-sub_80267D8: @ 80267D8
+ thumb_func_start atk6D_resetsentmonsvalue
+atk6D_resetsentmonsvalue: @ 80267D8
push {lr}
- bl sub_80173D0
+ bl ResetSentPokesToOpponentValue
ldr r1, _080267EC @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -18033,13 +18033,13 @@ sub_80267D8: @ 80267D8
bx r0
.align 2, 0
_080267EC: .4byte gUnknown_2023D74
- thumb_func_end sub_80267D8
+ thumb_func_end atk6D_resetsentmonsvalue
- thumb_func_start sub_80267F0
-sub_80267F0: @ 80267F0
+ thumb_func_start atk6E_setatktoplayer0
+atk6E_setatktoplayer0: @ 80267F0
push {lr}
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _08026808 @ =gUnknown_2023D6B
strb r0, [r1]
ldr r1, _0802680C @ =gUnknown_2023D74
@@ -18051,10 +18051,10 @@ sub_80267F0: @ 80267F0
.align 2, 0
_08026808: .4byte gUnknown_2023D6B
_0802680C: .4byte gUnknown_2023D74
- thumb_func_end sub_80267F0
+ thumb_func_end atk6E_setatktoplayer0
- thumb_func_start sub_8026810
-sub_8026810: @ 8026810
+ thumb_func_start atk6F_makevisible
+atk6F_makevisible: @ 8026810
push {r4,r5,lr}
ldr r5, _0802683C @ =gUnknown_2023D74
ldr r0, [r5]
@@ -18064,9 +18064,9 @@ sub_8026810: @ 8026810
strb r0, [r4]
movs r0, 0
movs r1, 0
- bl sub_800EB04
+ bl EmitSpriteInvisibility
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -18076,10 +18076,10 @@ sub_8026810: @ 8026810
.align 2, 0
_0802683C: .4byte gUnknown_2023D74
_08026840: .4byte gUnknown_2023BC4
- thumb_func_end sub_8026810
+ thumb_func_end atk6F_makevisible
- thumb_func_start sub_8026844
-sub_8026844: @ 8026844
+ thumb_func_start atk70_recordlastability
+atk70_recordlastability: @ 8026844
push {r4,lr}
ldr r4, _0802686C @ =gUnknown_2023D74
ldr r0, [r4]
@@ -18101,10 +18101,10 @@ sub_8026844: @ 8026844
_0802686C: .4byte gUnknown_2023D74
_08026870: .4byte gUnknown_2023BC4
_08026874: .4byte gUnknown_2023D6A
- thumb_func_end sub_8026844
+ thumb_func_end atk70_recordlastability
- thumb_func_start sub_8026878
-sub_8026878: @ 8026878
+ thumb_func_start BufferMoveToLearnIntoBattleTextBuff2
+BufferMoveToLearnIntoBattleTextBuff2: @ 8026878
ldr r2, _08026898 @ =gUnknown_2022AC8
movs r0, 0xFD
strb r0, [r2]
@@ -18124,12 +18124,12 @@ sub_8026878: @ 8026878
.align 2, 0
_08026898: .4byte gUnknown_2022AC8
_0802689C: .4byte gUnknown_2024022
- thumb_func_end sub_8026878
+ thumb_func_end BufferMoveToLearnIntoBattleTextBuff2
- thumb_func_start sub_80268A0
-sub_80268A0: @ 80268A0
+ thumb_func_start atk71_buffermovetolearn
+atk71_buffermovetolearn: @ 80268A0
push {lr}
- bl sub_8026878
+ bl BufferMoveToLearnIntoBattleTextBuff2
ldr r1, _080268B4 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -18138,10 +18138,10 @@ sub_80268A0: @ 80268A0
bx r0
.align 2, 0
_080268B4: .4byte gUnknown_2023D74
- thumb_func_end sub_80268A0
+ thumb_func_end atk71_buffermovetolearn
- thumb_func_start sub_80268B8
-sub_80268B8: @ 80268B8
+ thumb_func_start atk72_jumpifplayerran
+atk72_jumpifplayerran: @ 80268B8
push {lr}
ldr r0, _080268E4 @ =gUnknown_2023D6D
ldrb r0, [r0]
@@ -18176,10 +18176,10 @@ _080268F4:
bx r0
.align 2, 0
_080268F8: .4byte gUnknown_2023D74
- thumb_func_end sub_80268B8
+ thumb_func_end atk72_jumpifplayerran
- thumb_func_start sub_80268FC
-sub_80268FC: @ 80268FC
+ thumb_func_start atk73_hpthresholds
+atk73_hpthresholds: @ 80268FC
push {r4-r6,lr}
ldr r0, _0802694C @ =gUnknown_2022B4C
ldr r4, [r0]
@@ -18264,10 +18264,10 @@ _08026992:
.align 2, 0
_080269A0: .4byte gUnknown_2023FE8
_080269A4: .4byte gUnknown_2023D74
- thumb_func_end sub_80268FC
+ thumb_func_end atk73_hpthresholds
- thumb_func_start sub_80269A8
-sub_80269A8: @ 80269A8
+ thumb_func_start atk74_hpthresholds2
+atk74_hpthresholds2: @ 80269A8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -18290,7 +18290,7 @@ sub_80269A8: @ 80269A8
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _08026A18 @ =gUnknown_2023FE8
ldr r6, [r1]
@@ -18354,10 +18354,10 @@ _08026A42:
bx r0
.align 2, 0
_08026A54: .4byte gUnknown_2023D74
- thumb_func_end sub_80269A8
+ thumb_func_end atk74_hpthresholds2
- thumb_func_start sub_8026A58
-sub_8026A58: @ 8026A58
+ thumb_func_start atk75_useitemonopponent
+atk75_useitemonopponent: @ 8026A58
push {lr}
sub sp, 0x4
ldr r2, _08026A98 @ =gUnknown_2024004
@@ -18395,7 +18395,7 @@ _08026AA0: .4byte gUnknown_2023BCE
_08026AA4: .4byte gUnknown_202402C
_08026AA8: .4byte gUnknown_2023D68
_08026AAC: .4byte gUnknown_2023D74
- thumb_func_end sub_8026A58
+ thumb_func_end atk75_useitemonopponent
thumb_func_start sub_8026AB0
sub_8026AB0: @ 8026AB0
@@ -18443,7 +18443,7 @@ _08026AE8:
_08026B1C:
ldr r0, _08026B28 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
b _08026F4E
.align 2, 0
_08026B28: .4byte gUnknown_2023BC4
@@ -18453,7 +18453,7 @@ _08026B2C:
ldrb r0, [r4]
strb r0, [r1]
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -18746,9 +18746,9 @@ _08026D7C:
_08026D84:
movs r0, 0
movs r1, 0
- bl sub_800E0B4
+ bl EmitReturnMonToBall
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _08026F4E
.align 2, 0
_08026D94: .4byte gUnknown_2023BCC
@@ -18809,17 +18809,17 @@ _08026DF6:
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r1, [sp, 0x4]
cmp r5, 0
@@ -18850,7 +18850,7 @@ _08026E4E:
cmp r0, 0
beq _08026E88
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _08026F3C @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
@@ -18863,9 +18863,9 @@ _08026E4E:
movs r0, 0
movs r1, 0x28
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08026F28 @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x5]
@@ -18884,17 +18884,17 @@ _08026E94:
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r1, [sp, 0x4]
cmp r5, 0
@@ -18925,7 +18925,7 @@ _08026EEC:
cmp r2, 0
beq _08026F4E
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _08026F3C @ =gUnknown_2023BC4
strb r0, [r4]
movs r0, 0
@@ -18938,9 +18938,9 @@ _08026EEC:
movs r0, 0
movs r1, 0x28
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08026F28 @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x5]
@@ -18954,7 +18954,7 @@ _08026F38: .4byte gUnknown_2024284
_08026F3C: .4byte gUnknown_2023BC4
_08026F40: .4byte gUnknown_202402C
_08026F44:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08026F56
@@ -18975,8 +18975,8 @@ _08026F56:
_08026F64: .4byte gUnknown_2023D74
thumb_func_end sub_8026AB0
- thumb_func_start sub_8026F68
-sub_8026F68: @ 8026F68
+ thumb_func_start atk77_setprotectlike
+atk77_setprotectlike: @ 8026F68
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -19021,7 +19021,7 @@ _08026FA8:
ldrb r4, [r0, 0x8]
lsls r4, 1
adds r4, r2
- bl sub_8044EC8
+ bl Random
ldrh r1, [r4]
lsls r0, 16
lsrs r0, 16
@@ -19126,10 +19126,10 @@ _08027094: .4byte gUnknown_2023D6B
_08027098: .4byte gUnknown_2023E82
_0802709C: .4byte gUnknown_2023DCC
_080270A0: .4byte gUnknown_2023D74
- thumb_func_end sub_8026F68
+ thumb_func_end atk77_setprotectlike
- thumb_func_start sub_80270A4
-sub_80270A4: @ 80270A4
+ thumb_func_start atk78_faintifabilitynotdamp
+atk78_faintifabilitynotdamp: @ 80270A4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -19188,9 +19188,9 @@ _080270F0:
str r0, [r2]
ldr r1, _0802717C @ =0x00007fff
movs r0, 0
- bl sub_800E5EC
+ bl EmitHealthBarUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08027180 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -19262,10 +19262,10 @@ _080271A8:
_080271B4: .4byte gUnknown_2023D6A
_080271B8: .4byte gUnknown_2023D74
_080271BC: .4byte gUnknown_81D93AF
- thumb_func_end sub_80270A4
+ thumb_func_end atk78_faintifabilitynotdamp
- thumb_func_start sub_80271C0
-sub_80271C0: @ 80271C0
+ thumb_func_start atk79_setatkhptozero
+atk79_setatkhptozero: @ 80271C0
push {r4,lr}
sub sp, 0x4
ldr r0, _0802720C @ =gUnknown_2023BC8
@@ -19291,9 +19291,9 @@ sub_80271C0: @ 80271C0
movs r1, 0x2A
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802721C @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -19309,10 +19309,10 @@ _08027210: .4byte gUnknown_2023BC4
_08027214: .4byte gUnknown_2023D6B
_08027218: .4byte gUnknown_2023BE4
_0802721C: .4byte gUnknown_2023D74
- thumb_func_end sub_80271C0
+ thumb_func_end atk79_setatkhptozero
- thumb_func_start sub_8027220
-sub_8027220: @ 8027220
+ thumb_func_start atk7A_jumpifnexttargetvalid
+atk7A_jumpifnexttargetvalid: @ 8027220
push {r4-r7,lr}
ldr r3, _08027298 @ =gUnknown_2023D74
ldr r2, [r3]
@@ -19393,10 +19393,10 @@ _080272BC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8027220
+ thumb_func_end atk7A_jumpifnexttargetvalid
- thumb_func_start sub_80272C4
-sub_80272C4: @ 80272C4
+ thumb_func_start atk7B_tryhealhalfhealth
+atk7B_tryhealhalfhealth: @ 80272C4
push {r4-r6,lr}
ldr r4, _08027320 @ =gUnknown_2023D74
ldr r1, [r4]
@@ -19458,10 +19458,10 @@ _0802733A:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80272C4
+ thumb_func_end atk7B_tryhealhalfhealth
- thumb_func_start sub_8027340
-sub_8027340: @ 8027340
+ thumb_func_start atk7C_trymirrormove
+atk7C_trymirrormove: @ 8027340
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -19563,7 +19563,7 @@ _080273FC:
ldr r1, _08027454 @ =0xfffffbff
ands r0, r1
str r0, [r2]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r8
@@ -19631,10 +19631,10 @@ _0802748A:
_0802749C: .4byte gUnknown_2023ECC
_080274A0: .4byte gUnknown_2023D6B
_080274A4: .4byte gUnknown_2023D74
- thumb_func_end sub_8027340
+ thumb_func_end atk7C_trymirrormove
- thumb_func_start sub_80274A8
-sub_80274A8: @ 80274A8
+ thumb_func_start atk7D_setrain
+atk7D_setrain: @ 80274A8
push {lr}
ldr r2, _080274C8 @ =gUnknown_2023F1C
ldrh r0, [r2]
@@ -19675,14 +19675,14 @@ _080274E4:
_080274F0: .4byte gUnknown_2023E82
_080274F4: .4byte gUnknown_2023F20
_080274F8: .4byte gUnknown_2023D74
- thumb_func_end sub_80274A8
+ thumb_func_end atk7D_setrain
- thumb_func_start sub_80274FC
-sub_80274FC: @ 80274FC
+ thumb_func_start atk7E_setreflect
+atk7E_setreflect: @ 80274FC
push {r4-r6,lr}
ldr r6, _0802752C @ =gUnknown_2023D6B
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r4, _08027530 @ =gUnknown_2023DDE
movs r5, 0x1
adds r1, r5, 0
@@ -19709,7 +19709,7 @@ _08027534: .4byte gUnknown_2023DCC
_08027538: .4byte gUnknown_2023E82
_0802753C:
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r5, 0
ands r1, r0
lsls r1, 1
@@ -19719,7 +19719,7 @@ _0802753C:
orrs r0, r2
strh r0, [r1]
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r4, _080275A0 @ =gUnknown_2023DE4
adds r1, r5, 0
ands r1, r0
@@ -19730,7 +19730,7 @@ _0802753C:
movs r1, 0x5
strb r1, [r0]
ldrb r0, [r6]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r5, 0
ands r1, r0
lsls r0, r1, 1
@@ -19773,10 +19773,10 @@ _080275B2:
.align 2, 0
_080275C0: .4byte gUnknown_2023E82
_080275C4: .4byte gUnknown_2023D74
- thumb_func_end sub_80274FC
+ thumb_func_end atk7E_setreflect
- thumb_func_start sub_80275C8
-sub_80275C8: @ 80275C8
+ thumb_func_start atk7F_setseeded
+atk7F_setseeded: @ 80275C8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -19871,10 +19871,10 @@ _08027668:
_0802767C: .4byte gUnknown_2023D6B
_08027680: .4byte gUnknown_2023E82
_08027684: .4byte gUnknown_2023D74
- thumb_func_end sub_80275C8
+ thumb_func_end atk7F_setseeded
- thumb_func_start sub_8027688
-sub_8027688: @ 8027688
+ thumb_func_start atk80_manipulatedamage
+atk80_manipulatedamage: @ 8027688
push {r4,lr}
ldr r1, _080276A0 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -19943,10 +19943,10 @@ _080276F8:
bx r0
.align 2, 0
_08027704: .4byte gUnknown_2023D50
- thumb_func_end sub_8027688
+ thumb_func_end atk80_manipulatedamage
- thumb_func_start sub_8027708
-sub_8027708: @ 8027708
+ thumb_func_start atk81_trysetrest
+atk81_trysetrest: @ 8027708
push {r4-r7,lr}
sub sp, 0x4
ldr r0, _08027760 @ =gUnknown_2023D74
@@ -20032,9 +20032,9 @@ _08027798:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _080277D4 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x5
@@ -20047,10 +20047,10 @@ _080277C8:
.align 2, 0
_080277D0: .4byte gUnknown_2023E82
_080277D4: .4byte gUnknown_2023D74
- thumb_func_end sub_8027708
+ thumb_func_end atk81_trysetrest
- thumb_func_start sub_80277D8
-sub_80277D8: @ 80277D8
+ thumb_func_start atk82_jumpifnotfirstturn
+atk82_jumpifnotfirstturn: @ 80277D8
push {r4,r5,lr}
ldr r5, _0802780C @ =gUnknown_2023D74
ldr r4, [r5]
@@ -20087,10 +20087,10 @@ _0802781A:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80277D8
+ thumb_func_end atk82_jumpifnotfirstturn
- thumb_func_start sub_8027820
-sub_8027820: @ 8027820
+ thumb_func_start atk83_nop
+atk83_nop: @ 8027820
ldr r1, _0802782C @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -20098,10 +20098,10 @@ sub_8027820: @ 8027820
bx lr
.align 2, 0
_0802782C: .4byte gUnknown_2023D74
- thumb_func_end sub_8027820
+ thumb_func_end atk83_nop
- thumb_func_start sub_8027830
-sub_8027830: @ 8027830
+ thumb_func_start UproarWakeUpCheck
+UproarWakeUpCheck: @ 8027830
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -20182,10 +20182,10 @@ _080278C2:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8027830
+ thumb_func_end UproarWakeUpCheck
- thumb_func_start sub_80278CC
-sub_80278CC: @ 80278CC
+ thumb_func_start atk84_jumpifcantmakeasleep
+atk84_jumpifcantmakeasleep: @ 80278CC
push {r4-r6,lr}
ldr r5, _080278F8 @ =gUnknown_2023D74
ldr r1, [r5]
@@ -20201,7 +20201,7 @@ sub_80278CC: @ 80278CC
orrs r4, r0
ldr r6, _080278FC @ =gUnknown_2023D6C
ldrb r0, [r6]
- bl sub_8027830
+ bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
beq _08027900
@@ -20246,10 +20246,10 @@ _08027942:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80278CC
+ thumb_func_end atk84_jumpifcantmakeasleep
- thumb_func_start sub_8027948
-sub_8027948: @ 8027948
+ thumb_func_start atk85_stockpile
+atk85_stockpile: @ 8027948
push {r4,r5,lr}
ldr r5, _08027970 @ =gUnknown_2023E0C
ldr r4, _08027974 @ =gUnknown_2023D6B
@@ -20309,10 +20309,10 @@ _080279AA:
_080279B8: .4byte gUnknown_2022AB8
_080279BC: .4byte gUnknown_2023E82
_080279C0: .4byte gUnknown_2023D74
- thumb_func_end sub_8027948
+ thumb_func_end atk85_stockpile
- thumb_func_start sub_80279C4
-sub_80279C4: @ 80279C4
+ thumb_func_start atk86_stockpiletobasedamage
+atk86_stockpiletobasedamage: @ 80279C4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -20355,7 +20355,7 @@ _08027A08:
ldr r4, _08027AC0 @ =gUnknown_2023DDE
ldr r5, _08027AC4 @ =gUnknown_2023D6C
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
lsls r1, 1
@@ -20444,10 +20444,10 @@ _08027AD4: .4byte gUnknown_2023E8C
_08027AD8: .4byte gUnknown_2023E0C
_08027ADC: .4byte gUnknown_2023D6B
_08027AE0: .4byte gUnknown_2023D74
- thumb_func_end sub_80279C4
+ thumb_func_end atk86_stockpiletobasedamage
- thumb_func_start sub_8027AE4
-sub_8027AE4: @ 8027AE4
+ thumb_func_start atk87_stockpiletohpheal
+atk87_stockpiletohpheal: @ 8027AE4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -20556,10 +20556,10 @@ _08027BB0:
_08027BBC: .4byte gUnknown_2023D50
_08027BC0: .4byte gUnknown_2023FC4
_08027BC4: .4byte gUnknown_2023D6C
- thumb_func_end sub_8027AE4
+ thumb_func_end atk87_stockpiletohpheal
- thumb_func_start sub_8027BC8
-sub_8027BC8: @ 8027BC8
+ thumb_func_start atk88_negativedamage
+atk88_negativedamage: @ 8027BC8
push {lr}
ldr r2, _08027BF0 @ =gUnknown_2023D50
ldr r0, _08027BF4 @ =gUnknown_2023D54
@@ -20585,10 +20585,10 @@ _08027BE4:
_08027BF0: .4byte gUnknown_2023D50
_08027BF4: .4byte gUnknown_2023D54
_08027BF8: .4byte gUnknown_2023D74
- thumb_func_end sub_8027BC8
+ thumb_func_end atk88_negativedamage
- thumb_func_start sub_8027BFC
-sub_8027BFC: @ 8027BFC
+ thumb_func_start ChangeStatBuffs
+ChangeStatBuffs: @ 8027BFC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -20666,7 +20666,7 @@ _08027C88:
ldr r4, _08027CE0 @ =gUnknown_2023DE4
ldr r1, _08027CD4 @ =gUnknown_2023BC4
ldrb r0, [r1]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
lsls r0, r1, 1
@@ -20710,7 +20710,7 @@ _08027CE8: .4byte gUnknown_2023ECC
_08027CEC: .4byte gUnknown_2023D74
_08027CF0:
mov r0, r8
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08027D18 @ =gUnknown_2023FC4
ldr r6, _08027D1C @ =gUnknown_2023BC4
ldrb r0, [r6]
@@ -20742,7 +20742,7 @@ _08027D28:
cmp r0, 0x1
beq _08027D58
movs r0, 0
- bl sub_801DC10
+ bl JumpIfMoveAffectedByProtect
lsls r0, 24
cmp r0, 0
beq _08027D58
@@ -20802,7 +20802,7 @@ _08027DAC: .4byte gUnknown_2023ECC
_08027DB0: .4byte gUnknown_2023D74
_08027DB4:
mov r0, r8
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08027DF8 @ =gUnknown_2023FC4
ldr r2, _08027DFC @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -20856,7 +20856,7 @@ _08027E0C:
cmp r5, 0x1
bne _08027D48
mov r0, r8
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08027E5C @ =gUnknown_2023FC4
ldr r3, _08027E58 @ =gUnknown_2023BC4
ldrb r0, [r3]
@@ -20901,7 +20901,7 @@ _08027E6C:
b _08027D48
_08027E8E:
mov r0, r8
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _08027EC0 @ =gUnknown_2023FC4
ldr r2, _08027EBC @ =gUnknown_2023BC4
ldrb r0, [r2]
@@ -21147,10 +21147,10 @@ _08028070: .4byte gUnknown_2023D6C
_08028074: .4byte gUnknown_2023E82
_08028078: .4byte gUnknown_2023BC4
_0802807C: .4byte gUnknown_2023DCC
- thumb_func_end sub_8027BFC
+ thumb_func_end ChangeStatBuffs
- thumb_func_start sub_8028080
-sub_8028080: @ 8028080
+ thumb_func_start atk89_statbuffchange
+atk89_statbuffchange: @ 8028080
push {r4,r5,lr}
ldr r5, _080280C4 @ =gUnknown_2023D74
ldr r2, [r5]
@@ -21173,7 +21173,7 @@ sub_8028080: @ 8028080
movs r1, 0xF
ands r1, r4
ldrb r2, [r2, 0x1]
- bl sub_8027BFC
+ bl ChangeStatBuffs
lsls r0, 24
cmp r0, 0
bne _080280BC
@@ -21187,10 +21187,10 @@ _080280BC:
.align 2, 0
_080280C4: .4byte gUnknown_2023D74
_080280C8: .4byte gUnknown_2023FC4
- thumb_func_end sub_8028080
+ thumb_func_end atk89_statbuffchange
- thumb_func_start sub_80280CC
-sub_80280CC: @ 80280CC
+ thumb_func_start atk8A_normalisebuffs
+atk8A_normalisebuffs: @ 80280CC
push {r4-r7,lr}
movs r2, 0
ldr r0, _08028114 @ =gUnknown_2023BCC
@@ -21233,10 +21233,10 @@ _08028104:
_08028114: .4byte gUnknown_2023BCC
_08028118: .4byte gUnknown_2023D74
_0802811C: .4byte gUnknown_2023BE4
- thumb_func_end sub_80280CC
+ thumb_func_end atk8A_normalisebuffs
- thumb_func_start sub_8028120
-sub_8028120: @ 8028120
+ thumb_func_start atk8B_setbide
+atk8B_setbide: @ 8028120
push {r4,r5,lr}
ldr r4, _08028178 @ =gUnknown_2023BE4
ldr r3, _0802817C @ =gUnknown_2023D6B
@@ -21287,10 +21287,10 @@ _08028180: .4byte gUnknown_2023DB8
_08028184: .4byte gUnknown_2023D4A
_08028188: .4byte gUnknown_2023D58
_0802818C: .4byte gUnknown_2023D74
- thumb_func_end sub_8028120
+ thumb_func_end atk8B_setbide
- thumb_func_start sub_8028190
-sub_8028190: @ 8028190
+ thumb_func_start atk8C_confuseifrepeatingattackends
+atk8C_confuseifrepeatingattackends: @ 8028190
push {lr}
ldr r1, _080281C0 @ =gUnknown_2023BE4
ldr r0, _080281C4 @ =gUnknown_2023D6B
@@ -21320,10 +21320,10 @@ _080281C0: .4byte gUnknown_2023BE4
_080281C4: .4byte gUnknown_2023D6B
_080281C8: .4byte gUnknown_2023E82
_080281CC: .4byte gUnknown_2023D74
- thumb_func_end sub_8028190
+ thumb_func_end atk8C_confuseifrepeatingattackends
- thumb_func_start sub_80281D0
-sub_80281D0: @ 80281D0
+ thumb_func_start atk8D_setmultihitcounter
+atk8D_setmultihitcounter: @ 80281D0
push {r4,r5,lr}
ldr r0, _080281E4 @ =gUnknown_2023D74
ldr r0, [r0]
@@ -21338,13 +21338,13 @@ _080281E4: .4byte gUnknown_2023D74
_080281E8: .4byte gUnknown_2023D72
_080281EC:
ldr r4, _08028214 @ =gUnknown_2023D72
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
ands r0, r5
strb r0, [r4]
cmp r0, 0x1
bls _08028202
- bl sub_8044EC8
+ bl Random
ands r0, r5
_08028202:
adds r0, 0x2
@@ -21360,10 +21360,10 @@ _08028206:
.align 2, 0
_08028214: .4byte gUnknown_2023D72
_08028218: .4byte gUnknown_2023D74
- thumb_func_end sub_80281D0
+ thumb_func_end atk8D_setmultihitcounter
- thumb_func_start sub_802821C
-sub_802821C: @ 802821C
+ thumb_func_start atk8E_initmultihitstring
+atk8E_initmultihitstring: @ 802821C
ldr r1, _0802823C @ =gUnknown_2023FC4
movs r2, 0
movs r0, 0xFD
@@ -21383,10 +21383,10 @@ sub_802821C: @ 802821C
.align 2, 0
_0802823C: .4byte gUnknown_2023FC4
_08028240: .4byte gUnknown_2023D74
- thumb_func_end sub_802821C
+ thumb_func_end atk8E_initmultihitstring
- thumb_func_start sub_8028244
-sub_8028244: @ 8028244
+ thumb_func_start TryDoForceSwitchOut
+TryDoForceSwitchOut: @ 8028244
push {r4-r7,lr}
ldr r6, _08028278 @ =gUnknown_2023BE4
ldr r7, _0802827C @ =gUnknown_2023D6B
@@ -21420,7 +21420,7 @@ _08028280: .4byte gUnknown_2023D6C
_08028284: .4byte gUnknown_2023FE8
_08028288: .4byte gUnknown_2023BCE
_0802828C:
- bl sub_8044EC8
+ bl Random
movs r3, 0xFF
ands r3, r0
ldrb r0, [r7]
@@ -21483,7 +21483,7 @@ _080282FC: .4byte gUnknown_2023FE8
_08028300: .4byte gUnknown_2023BCE
_08028304: .4byte gUnknown_2023D74
_08028308: .4byte gUnknown_81D8C10
- thumb_func_end sub_8028244
+ thumb_func_end TryDoForceSwitchOut
thumb_func_start sub_802830C
sub_802830C: @ 802830C
@@ -21500,7 +21500,7 @@ sub_802830C: @ 802830C
_08028320:
ldr r5, _080283A8 @ =gUnknown_2023D6C
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _080283AC @ =gUnknown_202402C
mov r8, r1
@@ -21517,7 +21517,7 @@ _08028336:
movs r7, 0
movs r6, 0
ldrb r0, [r5]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
@@ -21538,17 +21538,17 @@ _08028364:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028396
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08028396
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028396
adds r0, r7, 0x1
@@ -21577,17 +21577,17 @@ _080283B8:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080283EA
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080283EA
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080283EA
adds r0, r7, 0x1
@@ -21640,7 +21640,7 @@ _0802841C:
_08028438: .4byte gUnknown_2022B4C
_0802843C: .4byte gUnknown_2023D74
_08028440:
- bl sub_8028244
+ bl TryDoForceSwitchOut
lsls r0, 24
cmp r0, 0
bne _0802844C
@@ -21653,7 +21653,7 @@ _0802844C:
cmp r0, 0
beq _080284F0
_08028458:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -21662,7 +21662,7 @@ _08028458:
lsrs r6, r0, 24
ldr r0, _08028490 @ =gUnknown_2023D6C
ldrb r0, [r0]
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r0, 24
lsrs r0, 24
bl sub_8043620
@@ -21703,17 +21703,17 @@ _08028496:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028458
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _08028458
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028458
b _080285AE
@@ -21727,7 +21727,7 @@ _080284F0:
beq _08028560
ldr r6, _08028558 @ =gUnknown_2023BCE
_080284FA:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -21755,17 +21755,17 @@ _080284FA:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080284FA
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _080284FA
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080284FA
b _080285AE
@@ -21775,7 +21775,7 @@ _0802855C: .4byte gUnknown_2023D6C
_08028560:
ldr r6, _080285E8 @ =gUnknown_2023BCE
_08028562:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -21795,17 +21795,17 @@ _08028562:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028562
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _08028562
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08028562
_080285AE:
@@ -21839,7 +21839,7 @@ _080285E8: .4byte gUnknown_2023BCE
_080285EC: .4byte gUnknown_2023D6C
_080285F0: .4byte gUnknown_2023FE8
_080285F4:
- bl sub_8028244
+ bl TryDoForceSwitchOut
_080285F8:
pop {r3}
mov r8, r3
@@ -21848,8 +21848,8 @@ _080285F8:
bx r0
thumb_func_end sub_802830C
- thumb_func_start sub_8028604
-sub_8028604: @ 8028604
+ thumb_func_start atk90_tryconversiontypechange
+atk90_tryconversiontypechange: @ 8028604
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -21976,7 +21976,7 @@ _080286EC:
ldr r5, _08028744 @ =gUnknown_8250C04
mov r9, r5
_080286F2:
- bl sub_8044EC8
+ bl Random
adds r3, r0, 0
ands r3, r7
cmp r3, r6
@@ -22066,10 +22066,10 @@ _08028790:
.align 2, 0
_080287A0: .4byte gUnknown_2022AB8
_080287A4: .4byte gUnknown_2023D74
- thumb_func_end sub_8028604
+ thumb_func_end atk90_tryconversiontypechange
- thumb_func_start sub_80287A8
-sub_80287A8: @ 80287A8
+ thumb_func_start atk91_givepaydaymoney
+atk91_givepaydaymoney: @ 80287A8
push {r4,r5,lr}
ldr r0, _0802880C @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -22094,7 +22094,7 @@ sub_80287A8: @ 80287A8
lsls r1, 2
adds r0, r1
adds r1, r4, 0
- bl sub_809FDA0
+ bl AddMoney
ldr r1, _0802881C @ =gUnknown_2022AB8
movs r0, 0xFD
strb r0, [r1]
@@ -22114,7 +22114,7 @@ sub_80287A8: @ 80287A8
ldr r4, _08028820 @ =gUnknown_2023D74
ldr r0, [r4]
adds r0, 0x1
- bl sub_8017520
+ bl BattleScriptPush
ldr r0, _08028824 @ =gUnknown_81D911D
str r0, [r4]
b _08028830
@@ -22137,14 +22137,14 @@ _08028830:
bx r0
.align 2, 0
_08028838: .4byte gUnknown_2023D74
- thumb_func_end sub_80287A8
+ thumb_func_end atk91_givepaydaymoney
- thumb_func_start sub_802883C
-sub_802883C: @ 802883C
+ thumb_func_start atk92_setlightscreen
+atk92_setlightscreen: @ 802883C
push {r4-r6,lr}
ldr r5, _0802886C @ =gUnknown_2023D6B
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r4, _08028870 @ =gUnknown_2023DDE
movs r6, 0x1
adds r1, r6, 0
@@ -22171,7 +22171,7 @@ _08028874: .4byte gUnknown_2023DCC
_08028878: .4byte gUnknown_2023E82
_0802887C:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r6, 0
ands r1, r0
lsls r1, 1
@@ -22181,7 +22181,7 @@ _0802887C:
orrs r0, r2
strh r0, [r1]
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r4, _080288E0 @ =gUnknown_2023DE4
adds r1, r6, 0
ands r1, r0
@@ -22192,7 +22192,7 @@ _0802887C:
movs r1, 0x5
strb r1, [r0, 0x2]
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r6, 0
ands r1, r0
lsls r0, r1, 1
@@ -22234,10 +22234,10 @@ _080288F0:
.align 2, 0
_08028900: .4byte gUnknown_2023E82
_08028904: .4byte gUnknown_2023D74
- thumb_func_end sub_802883C
+ thumb_func_end atk92_setlightscreen
- thumb_func_start sub_8028908
-sub_8028908: @ 8028908
+ thumb_func_start atk93_tryKO
+atk93_tryKO: @ 8028908
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -22266,14 +22266,14 @@ _08028938: .4byte gUnknown_2023D6C
_0802893C: .4byte gUnknown_2023F54
_08028940:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
ldrb r0, [r6]
muls r0, r5
adds r0, r7
ldrh r0, [r0, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r6, r0, 24
_0802895A:
@@ -22283,7 +22283,7 @@ _0802895A:
strb r0, [r1]
cmp r4, 0x27
bne _08028998
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -22374,7 +22374,7 @@ _080289F4:
adds r0, r2
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -22456,7 +22456,7 @@ _08028AA2:
adds r1, r2
lsls r1, 16
lsrs r4, r1, 16
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -22640,10 +22640,10 @@ _08028C48:
.align 2, 0
_08028C54: .4byte gUnknown_2023E82
_08028C58: .4byte gUnknown_2023D74
- thumb_func_end sub_8028908
+ thumb_func_end atk93_tryKO
- thumb_func_start sub_8028C5C
-sub_8028C5C: @ 8028C5C
+ thumb_func_start atk94_damagetohalftargethp
+atk94_damagetohalftargethp: @ 8028C5C
push {lr}
ldr r3, _08028C88 @ =gUnknown_2023D50
ldr r2, _08028C8C @ =gUnknown_2023BE4
@@ -22671,10 +22671,10 @@ _08028C88: .4byte gUnknown_2023D50
_08028C8C: .4byte gUnknown_2023BE4
_08028C90: .4byte gUnknown_2023D6C
_08028C94: .4byte gUnknown_2023D74
- thumb_func_end sub_8028C5C
+ thumb_func_end atk94_damagetohalftargethp
- thumb_func_start sub_8028C98
-sub_8028C98: @ 8028C98
+ thumb_func_start atk95_setsandstorm
+atk95_setsandstorm: @ 8028C98
push {lr}
ldr r2, _08028CB8 @ =gUnknown_2023F1C
ldrh r1, [r2]
@@ -22716,7 +22716,7 @@ _08028CD6:
_08028CE4: .4byte gUnknown_2023E82
_08028CE8: .4byte gUnknown_2023F20
_08028CEC: .4byte gUnknown_2023D74
- thumb_func_end sub_8028C98
+ thumb_func_end atk95_setsandstorm
thumb_func_start sub_8028CF0
sub_8028CF0: @ 8028CF0
@@ -22733,7 +22733,7 @@ sub_8028CF0: @ 8028CF0
bne _08028D18
ldr r0, _08028DC0 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -22934,7 +22934,7 @@ sub_8028E90: @ 8028E90
push {r5-r7}
ldr r4, _08028EBC @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08028EC8
@@ -22964,7 +22964,7 @@ _08028ED8:
adds r5, r1, r0
ldr r4, _08028F04 @ =gUnknown_2023D6C
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08028F0C
@@ -22995,23 +22995,23 @@ _08028F1C:
adds r4, r1, r0
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r10, r0
adds r0, r5, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
ldr r5, _08028F80 @ =gUnknown_2023D6C
ldrb r0, [r5]
@@ -23043,11 +23043,11 @@ _08028F90: .4byte gUnknown_2023D6A
_08028F94:
mov r0, r10
mov r1, r9
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
adds r4, r0, 0
mov r0, r8
adds r1, r7, 0
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -23065,14 +23065,14 @@ _08028F94:
bne _08028FE4
mov r0, r10
mov r1, r9
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _08028FE4
mov r0, r8
adds r1, r7, 0
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -23172,9 +23172,9 @@ _08029074:
adds r2, r6
ldr r2, [r2]
movs r0, 0
- bl sub_800E658
+ bl EmitStatusIconUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080290A2:
ldrb r0, [r4]
adds r0, 0x1
@@ -23222,9 +23222,9 @@ _080290D4:
adds r2, r3
ldr r2, [r2]
movs r0, 0
- bl sub_800E658
+ bl EmitStatusIconUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08029114:
ldr r0, _08029184 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -23233,12 +23233,12 @@ _08029114:
cmp r0, 0
beq _08029164
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
strb r0, [r4]
ldrb r1, [r6]
ldrb r2, [r4]
@@ -23259,9 +23259,9 @@ _08029114:
adds r2, r3
ldr r2, [r2]
movs r0, 0
- bl sub_800E658
+ bl EmitStatusIconUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08029164:
ldr r1, _08029188 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -23294,9 +23294,9 @@ _0802918C:
adds r2, r3
ldr r2, [r2]
movs r0, 0
- bl sub_800E658
+ bl EmitStatusIconUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r0, [r5]
adds r0, 0x2
str r0, [r5]
@@ -23309,13 +23309,13 @@ _080291C8: .4byte gUnknown_2023BC4
_080291CC: .4byte gUnknown_2023BE4
thumb_func_end sub_8029048
- thumb_func_start sub_80291D0
-sub_80291D0: @ 80291D0
+ thumb_func_start atk99_setmist
+atk99_setmist: @ 80291D0
push {r4-r6,lr}
ldr r6, _08029200 @ =gUnknown_2023DE4
ldr r4, _08029204 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
movs r5, 0x1
adds r1, r5, 0
ands r1, r0
@@ -23341,7 +23341,7 @@ _08029208: .4byte gUnknown_2023DCC
_0802920C: .4byte gUnknown_2023E82
_08029210:
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r5, 0
ands r1, r0
lsls r0, r1, 1
@@ -23351,7 +23351,7 @@ _08029210:
movs r1, 0x5
strb r1, [r0, 0x4]
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r5, 0
ands r1, r0
lsls r0, r1, 1
@@ -23361,7 +23361,7 @@ _08029210:
ldrb r1, [r4]
strb r1, [r0, 0x5]
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r2, _0802926C @ =gUnknown_2023DDE
adds r1, r5, 0
ands r1, r0
@@ -23388,10 +23388,10 @@ _0802925E:
_0802926C: .4byte gUnknown_2023DDE
_08029270: .4byte gUnknown_2023E82
_08029274: .4byte gUnknown_2023D74
- thumb_func_end sub_80291D0
+ thumb_func_end atk99_setmist
- thumb_func_start sub_8029278
-sub_8029278: @ 8029278
+ thumb_func_start atk9A_setfocusenergy
+atk9A_setfocusenergy: @ 8029278
push {lr}
ldr r1, _080292A8 @ =gUnknown_2023BE4
ldr r0, _080292AC @ =gUnknown_2023D6B
@@ -23436,10 +23436,10 @@ _080292C0:
.align 2, 0
_080292CC: .4byte gUnknown_2023E82
_080292D0: .4byte gUnknown_2023D74
- thumb_func_end sub_8029278
+ thumb_func_end atk9A_setfocusenergy
- thumb_func_start sub_80292D4
-sub_80292D4: @ 80292D4
+ thumb_func_start atk9B_transformdataexecution
+atk9B_transformdataexecution: @ 80292D4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -23626,7 +23626,7 @@ _08029442:
bl sub_800EB74
mov r2, r8
ldrb r0, [r2]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08029470 @ =gUnknown_2023E82
movs r0, 0
_08029464:
@@ -23638,10 +23638,10 @@ _08029464:
bx r0
.align 2, 0
_08029470: .4byte gUnknown_2023E82
- thumb_func_end sub_80292D4
+ thumb_func_end atk9B_transformdataexecution
- thumb_func_start sub_8029474
-sub_8029474: @ 8029474
+ thumb_func_start atk9C_setsubstitute
+atk9C_setsubstitute: @ 8029474
push {r4-r7,lr}
ldr r7, _080294A4 @ =gUnknown_2023BE4
ldr r6, _080294A8 @ =gUnknown_2023D6B
@@ -23730,10 +23730,10 @@ _08029520: .4byte gUnknown_2023E0C
_08029524: .4byte gUnknown_2023E82
_08029528: .4byte gUnknown_2023DD0
_0802952C: .4byte gUnknown_2023D74
- thumb_func_end sub_8029474
+ thumb_func_end atk9C_setsubstitute
- thumb_func_start sub_8029530
-sub_8029530: @ 8029530
+ thumb_func_start IsMoveUncopyableByMimic
+IsMoveUncopyableByMimic: @ 8029530
push {r4,r5,lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -23770,10 +23770,10 @@ _08029558:
.align 2, 0
_08029570: .4byte gUnknown_82507E8
_08029574: .4byte 0x0000fffe
- thumb_func_end sub_8029530
+ thumb_func_end IsMoveUncopyableByMimic
- thumb_func_start sub_8029578
-sub_8029578: @ 8029578
+ thumb_func_start atk9D_mimicattackcopy
+atk9D_mimicattackcopy: @ 8029578
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -23789,7 +23789,7 @@ sub_8029578: @ 8029578
lsls r0, 1
adds r0, r5
ldrh r0, [r0]
- bl sub_8029530
+ bl IsMoveUncopyableByMimic
lsls r0, 24
cmp r0, 0
bne _080295D2
@@ -24003,10 +24003,10 @@ _08029744:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8029578
+ thumb_func_end atk9D_mimicattackcopy
- thumb_func_start sub_8029754
-sub_8029754: @ 8029754
+ thumb_func_start atk9E_metronome
+atk9E_metronome: @ 8029754
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -24017,7 +24017,7 @@ sub_8029754: @ 8029754
ldr r0, _080297DC @ =gUnknown_2023D74
mov r8, r0
_08029766:
- bl sub_8044EC8
+ bl Random
ldr r2, _080297E0 @ =0x000001ff
adds r1, r2, 0
ands r0, r1
@@ -24084,10 +24084,10 @@ _080297EC: .4byte 0xfffffbff
_080297F0: .4byte gUnknown_81D65A8
_080297F4: .4byte gUnknown_8250C04
_080297F8: .4byte gUnknown_2023D6C
- thumb_func_end sub_8029754
+ thumb_func_end atk9E_metronome
- thumb_func_start sub_80297FC
-sub_80297FC: @ 80297FC
+ thumb_func_start atk9F_dmgtolevel
+atk9F_dmgtolevel: @ 80297FC
ldr r3, _0802981C @ =gUnknown_2023D50
ldr r2, _08029820 @ =gUnknown_2023BE4
ldr r0, _08029824 @ =gUnknown_2023D6B
@@ -24108,14 +24108,14 @@ _0802981C: .4byte gUnknown_2023D50
_08029820: .4byte gUnknown_2023BE4
_08029824: .4byte gUnknown_2023D6B
_08029828: .4byte gUnknown_2023D74
- thumb_func_end sub_80297FC
+ thumb_func_end atk9F_dmgtolevel
- thumb_func_start sub_802982C
-sub_802982C: @ 802982C
+ thumb_func_start atkA0_psywavedamageeffect
+atkA0_psywavedamageeffect: @ 802982C
push {r4,lr}
movs r4, 0xF
_08029830:
- bl sub_8044EC8
+ bl Random
adds r3, r4, 0
ands r3, r0
cmp r3, 0xA
@@ -24150,14 +24150,14 @@ _08029870: .4byte gUnknown_2023D50
_08029874: .4byte gUnknown_2023BE4
_08029878: .4byte gUnknown_2023D6B
_0802987C: .4byte gUnknown_2023D74
- thumb_func_end sub_802982C
+ thumb_func_end atkA0_psywavedamageeffect
- thumb_func_start sub_8029880
-sub_8029880: @ 8029880
+ thumb_func_start atkA1_counterdamagecalculator
+atkA1_counterdamagecalculator: @ 8029880
push {r4-r6,lr}
ldr r4, _080298F0 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r5, _080298F4 @ =gUnknown_2023E8C
@@ -24165,7 +24165,7 @@ sub_8029880: @ 8029880
lsls r0, 4
adds r0, r5
ldrb r0, [r0, 0xC]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
ldrb r0, [r4]
@@ -24267,14 +24267,14 @@ _08029964:
_0802996C: .4byte gUnknown_2023ECC
_08029970: .4byte gUnknown_2023D6B
_08029974: .4byte gUnknown_2023D74
- thumb_func_end sub_8029880
+ thumb_func_end atkA1_counterdamagecalculator
- thumb_func_start sub_8029978
-sub_8029978: @ 8029978
+ thumb_func_start atkA2_mirrorcoatdamagecalculator
+atkA2_mirrorcoatdamagecalculator: @ 8029978
push {r4-r6,lr}
ldr r4, _080299E8 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
ldr r5, _080299EC @ =gUnknown_2023E8C
@@ -24282,7 +24282,7 @@ sub_8029978: @ 8029978
lsls r0, 4
adds r0, r5
ldrb r0, [r0, 0xD]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r2, r0, 24
ldrb r0, [r4]
@@ -24385,10 +24385,10 @@ _08029A5C:
_08029A64: .4byte gUnknown_2023ECC
_08029A68: .4byte gUnknown_2023D6B
_08029A6C: .4byte gUnknown_2023D74
- thumb_func_end sub_8029978
+ thumb_func_end atkA2_mirrorcoatdamagecalculator
- thumb_func_start sub_8029A70
-sub_8029A70: @ 8029A70
+ thumb_func_start atkA3_disablelastusedattack
+atkA3_disablelastusedattack: @ 8029A70
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -24486,7 +24486,7 @@ _08029AC4:
adds r2, r3
ldrh r1, [r2]
strh r1, [r0, 0x4]
- bl sub_8044EC8
+ bl Random
ldrb r2, [r6]
lsls r1, r2, 3
subs r1, r2
@@ -24548,10 +24548,10 @@ _08029BA2:
bx r0
.align 2, 0
_08029BB0: .4byte gUnknown_2023D74
- thumb_func_end sub_8029A70
+ thumb_func_end atkA3_disablelastusedattack
- thumb_func_start sub_8029BB4
-sub_8029BB4: @ 8029BB4
+ thumb_func_start atkA4_trysetencore
+atkA4_trysetencore: @ 8029BB4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -24645,7 +24645,7 @@ _08029C24:
lsls r0, 2
add r0, r9
strb r5, [r0, 0xC]
- bl sub_8044EC8
+ bl Random
ldrb r2, [r4]
lsls r1, r2, 3
subs r1, r2
@@ -24707,10 +24707,10 @@ _08029CD6:
bx r0
.align 2, 0
_08029CE4: .4byte gUnknown_2023D74
- thumb_func_end sub_8029BB4
+ thumb_func_end atkA4_trysetencore
- thumb_func_start sub_8029CE8
-sub_8029CE8: @ 8029CE8
+ thumb_func_start atkA5_painsplitdmgcalc
+atkA5_painsplitdmgcalc: @ 8029CE8
push {r4-r7,lr}
ldr r6, _08029D68 @ =gUnknown_2023BE4
ldr r0, _08029D6C @ =gUnknown_2023D6C
@@ -24804,10 +24804,10 @@ _08029DA2:
bx r0
.align 2, 0
_08029DA8: .4byte gUnknown_2023D74
- thumb_func_end sub_8029CE8
+ thumb_func_end atkA5_painsplitdmgcalc
- thumb_func_start sub_8029DAC
-sub_8029DAC: @ 8029DAC
+ thumb_func_start atkA6_settypetorandomresistance
+atkA6_settypetorandomresistance: @ 8029DAC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -24825,7 +24825,7 @@ sub_8029DAC: @ 8029DAC
cmp r1, r0
beq _08029DF6
ldrh r0, [r2]
- bl sub_802A1C0
+ bl IsTwoTurnsMove
lsls r0, 24
cmp r0, 0
beq _08029E94
@@ -24924,7 +24924,7 @@ _08029E94:
movs r7, 0x7F
mov r9, r7
_08029E9C:
- bl sub_8044EC8
+ bl Random
mov r4, r9
ands r4, r0
cmp r4, 0x70
@@ -25057,10 +25057,10 @@ _08029F9C: .4byte gUnknown_2023BE4
_08029FA0: .4byte 0x000003e7
_08029FA4: .4byte gUnknown_2023D74
_08029FA8: .4byte 0x0000014f
- thumb_func_end sub_8029DAC
+ thumb_func_end atkA6_settypetorandomresistance
- thumb_func_start sub_8029FAC
-sub_8029FAC: @ 8029FAC
+ thumb_func_start atkA7_setalwayshitflag
+atkA7_setalwayshitflag: @ 8029FAC
push {r4,lr}
ldr r4, _08029FF0 @ =gUnknown_2023DFC
ldr r3, _08029FF4 @ =gUnknown_2023D6C
@@ -25101,10 +25101,10 @@ _08029FF4: .4byte gUnknown_2023D6C
_08029FF8: .4byte gUnknown_2023E0C
_08029FFC: .4byte gUnknown_2023D6B
_0802A000: .4byte gUnknown_2023D74
- thumb_func_end sub_8029FAC
+ thumb_func_end atkA7_setalwayshitflag
- thumb_func_start sub_802A004
-sub_802A004: @ 802A004
+ thumb_func_start atkA8_copymovepermanently
+atkA8_copymovepermanently: @ 802A004
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -25260,10 +25260,10 @@ _0802A0F2:
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_800DFF0
+ bl EmitSetMonData
ldr r0, _0802A184 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802A188 @ =gUnknown_2022AB8
movs r0, 0xFD
strb r0, [r1]
@@ -25326,10 +25326,10 @@ _0802A1AA:
bx r0
.align 2, 0
_0802A1BC: .4byte gUnknown_2023D74
- thumb_func_end sub_802A004
+ thumb_func_end atkA8_copymovepermanently
- thumb_func_start sub_802A1C0
-sub_802A1C0: @ 802A1C0
+ thumb_func_start IsTwoTurnsMove
+IsTwoTurnsMove: @ 802A1C0
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -25361,10 +25361,10 @@ _0802A1F4:
_0802A1F6:
pop {r1}
bx r1
- thumb_func_end sub_802A1C0
+ thumb_func_end IsTwoTurnsMove
- thumb_func_start sub_802A1FC
-sub_802A1FC: @ 802A1FC
+ thumb_func_start IsInvalidForSleepTalkOrAssist
+IsInvalidForSleepTalkOrAssist: @ 802A1FC
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -25388,10 +25388,10 @@ _0802A21E:
_0802A220:
pop {r1}
bx r1
- thumb_func_end sub_802A1FC
+ thumb_func_end IsInvalidForSleepTalkOrAssist
- thumb_func_start sub_802A224
-sub_802A224: @ 802A224
+ thumb_func_start AttacksThisTurn
+AttacksThisTurn: @ 802A224
push {lr}
lsls r1, 16
lsrs r2, r1, 16
@@ -25447,10 +25447,10 @@ _0802A288:
_0802A28A:
pop {r1}
bx r1
- thumb_func_end sub_802A224
+ thumb_func_end AttacksThisTurn
- thumb_func_start sub_802A290
-sub_802A290: @ 802A290
+ thumb_func_start atkA9_trychoosesleeptalkmove
+atkA9_trychoosesleeptalkmove: @ 802A290
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -25476,7 +25476,7 @@ _0802A2AE:
adds r0, r4, r0
adds r0, r7
ldrh r0, [r0]
- bl sub_802A1FC
+ bl IsInvalidForSleepTalkOrAssist
lsls r0, 24
cmp r0, 0
bne _0802A2EE
@@ -25493,7 +25493,7 @@ _0802A2AE:
cmp r1, 0xFD
beq _0802A2EE
adds r0, r1, 0
- bl sub_802A1C0
+ bl IsTwoTurnsMove
lsls r0, 24
cmp r0, 0
beq _0802A2FC
@@ -25532,7 +25532,7 @@ _0802A330:
movs r7, 0x3
ldr r4, _0802A3A4 @ =gUnknown_825E45C
_0802A334:
- bl sub_8044EC8
+ bl Random
adds r5, r7, 0
ands r5, r0
lsls r0, r5, 2
@@ -25596,10 +25596,10 @@ _0802A3B8: .4byte gUnknown_2023DD0
_0802A3BC: .4byte 0xfffffbff
_0802A3C0: .4byte gUnknown_2023D6C
_0802A3C4: .4byte gUnknown_2023D74
- thumb_func_end sub_802A290
+ thumb_func_end atkA9_trychoosesleeptalkmove
- thumb_func_start sub_802A3C8
-sub_802A3C8: @ 802A3C8
+ thumb_func_start atkAA_setdestinybond
+atkAA_setdestinybond: @ 802A3C8
ldr r1, _0802A3EC @ =gUnknown_2023BE4
ldr r0, _0802A3F0 @ =gUnknown_2023D6B
ldrb r2, [r0]
@@ -25621,19 +25621,19 @@ sub_802A3C8: @ 802A3C8
_0802A3EC: .4byte gUnknown_2023BE4
_0802A3F0: .4byte gUnknown_2023D6B
_0802A3F4: .4byte gUnknown_2023D74
- thumb_func_end sub_802A3C8
+ thumb_func_end atkAA_setdestinybond
- thumb_func_start sub_802A3F8
-sub_802A3F8: @ 802A3F8
+ thumb_func_start TrySetDestinyBondToHappen
+TrySetDestinyBondToHappen: @ 802A3F8
push {r4,r5,lr}
ldr r0, _0802A448 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r5, r0, 24
ldr r4, _0802A44C @ =gUnknown_2023D6C
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _0802A450 @ =gUnknown_2023BE4
@@ -25669,12 +25669,12 @@ _0802A448: .4byte gUnknown_2023D6B
_0802A44C: .4byte gUnknown_2023D6C
_0802A450: .4byte gUnknown_2023BE4
_0802A454: .4byte gUnknown_2023DD0
- thumb_func_end sub_802A3F8
+ thumb_func_end TrySetDestinyBondToHappen
- thumb_func_start sub_802A458
-sub_802A458: @ 802A458
+ thumb_func_start atkAB_trysetdestinybondtohappen
+atkAB_trysetdestinybondtohappen: @ 802A458
push {lr}
- bl sub_802A3F8
+ bl TrySetDestinyBondToHappen
ldr r1, _0802A46C @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -25683,10 +25683,10 @@ sub_802A458: @ 802A458
bx r0
.align 2, 0
_0802A46C: .4byte gUnknown_2023D74
- thumb_func_end sub_802A458
+ thumb_func_end atkAB_trysetdestinybondtohappen
- thumb_func_start sub_802A470
-sub_802A470: @ 802A470
+ thumb_func_start atkAC_remaininghptopower
+atkAC_remaininghptopower: @ 802A470
push {lr}
ldr r2, _0802A4C4 @ =gUnknown_2023BE4
ldr r0, _0802A4C8 @ =gUnknown_2023D6B
@@ -25699,7 +25699,7 @@ sub_802A470: @ 802A470
movs r2, 0x2C
ldrsh r1, [r1, r2]
movs r2, 0x30
- bl sub_804A5E8
+ bl GetScaledHPFraction
lsls r0, 24
lsrs r1, r0, 24
movs r3, 0
@@ -25735,10 +25735,10 @@ _0802A4C8: .4byte gUnknown_2023D6B
_0802A4CC: .4byte gUnknown_8250810
_0802A4D0: .4byte gUnknown_2023F50
_0802A4D4: .4byte gUnknown_2023D74
- thumb_func_end sub_802A470
+ thumb_func_end atkAC_remaininghptopower
- thumb_func_start sub_802A4D8
-sub_802A4D8: @ 802A4D8
+ thumb_func_start atkAD_tryspiteppreduce
+atkAD_tryspiteppreduce: @ 802A4D8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -25812,7 +25812,7 @@ _0802A53E:
bhi _0802A55E
b _0802A680
_0802A55E:
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
adds r6, r1, 0x2
@@ -25911,9 +25911,9 @@ _0802A57C:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0802A630:
ldr r1, _0802A67C @ =gUnknown_2023D74
ldr r0, [r1]
@@ -25931,7 +25931,7 @@ _0802A630:
cmp r0, 0
bne _0802A69A
adds r0, r2, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
b _0802A69A
.align 2, 0
_0802A658: .4byte gUnknown_2023D98
@@ -25969,10 +25969,10 @@ _0802A69A:
bx r0
.align 2, 0
_0802A6AC: .4byte gUnknown_2023D74
- thumb_func_end sub_802A4D8
+ thumb_func_end atkAD_tryspiteppreduce
- thumb_func_start sub_802A6B0
-sub_802A6B0: @ 802A6B0
+ thumb_func_start atkAE_healpartystatus
+atkAE_healpartystatus: @ 802A6B0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -25993,7 +25993,7 @@ _0802A6CC:
strb r0, [r6, 0x5]
ldr r5, _0802A728 @ =gUnknown_2023D6B
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _0802A72C @ =gUnknown_202402C
mov r10, r1
@@ -26049,14 +26049,14 @@ _0802A74C:
ldr r7, _0802A7C0 @ =gUnknown_2023BC4
ldr r0, _0802A7C4 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r2, 0x2
mov r9, r2
mov r1, r9
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802A7C8 @ =gUnknown_2023FC4
strb r0, [r1, 0x17]
strb r0, [r7]
@@ -26129,12 +26129,12 @@ _0802A7F6:
add r4, r10
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r4, r0, 24
cmp r5, 0
@@ -26242,12 +26242,12 @@ _0802A8B6:
ands r0, r6
str r0, [r1]
ldrb r0, [r2]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _0802A980 @ =gUnknown_2023BC4
strb r0, [r4]
ldr r0, _0802A984 @ =gUnknown_2022B4C
@@ -26290,9 +26290,9 @@ _0802A934:
movs r0, 0
movs r1, 0x28
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0802A956:
ldr r1, _0802A990 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -26316,10 +26316,10 @@ _0802A984: .4byte gUnknown_2022B4C
_0802A988: .4byte gUnknown_2023D70
_0802A98C: .4byte gUnknown_825E45C
_0802A990: .4byte gUnknown_2023D74
- thumb_func_end sub_802A6B0
+ thumb_func_end atkAE_healpartystatus
- thumb_func_start sub_802A994
-sub_802A994: @ 802A994
+ thumb_func_start atkAF_cursetarget
+atkAF_cursetarget: @ 802A994
push {r4,r5,lr}
ldr r5, _0802A9D4 @ =gUnknown_2023BE4
ldr r0, _0802A9D8 @ =gUnknown_2023D6C
@@ -26383,14 +26383,14 @@ _0802AA04:
_0802AA0C: .4byte gUnknown_2023D50
_0802AA10: .4byte gUnknown_2023D6B
_0802AA14: .4byte gUnknown_2023D74
- thumb_func_end sub_802A994
+ thumb_func_end atkAF_cursetarget
- thumb_func_start sub_802AA18
-sub_802AA18: @ 802AA18
+ thumb_func_start atkB0_trysetspikes
+atkB0_trysetspikes: @ 802AA18
push {r4,lr}
ldr r4, _0802AA6C @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -26453,10 +26453,10 @@ _0802AA96:
.align 2, 0
_0802AA9C: .4byte gUnknown_2023DDE
_0802AAA0: .4byte gUnknown_2023D74
- thumb_func_end sub_802AA18
+ thumb_func_end atkB0_trysetspikes
- thumb_func_start sub_802AAA4
-sub_802AAA4: @ 802AAA4
+ thumb_func_start atkB1_setforesight
+atkB1_setforesight: @ 802AAA4
ldr r1, _0802AAC8 @ =gUnknown_2023BE4
ldr r0, _0802AACC @ =gUnknown_2023D6C
ldrb r2, [r0]
@@ -26478,10 +26478,10 @@ sub_802AAA4: @ 802AAA4
_0802AAC8: .4byte gUnknown_2023BE4
_0802AACC: .4byte gUnknown_2023D6C
_0802AAD0: .4byte gUnknown_2023D74
- thumb_func_end sub_802AAA4
+ thumb_func_end atkB1_setforesight
- thumb_func_start sub_802AAD4
-sub_802AAD4: @ 802AAD4
+ thumb_func_start atkB2_trysetperishsong
+atkB2_trysetperishsong: @ 802AAD4
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -26539,7 +26539,7 @@ _0802AB34:
_0802AB40:
mov r1, r8
ldrb r0, [r1]
- bl sub_80170C4
+ bl PressurePPLoseOnUsingPerishSong
ldr r0, _0802AB6C @ =gUnknown_2023BCC
ldrb r0, [r0]
cmp r6, r0
@@ -26575,10 +26575,10 @@ _0802AB7C:
bx r0
.align 2, 0
_0802AB88: .4byte gUnknown_2023D74
- thumb_func_end sub_802AAD4
+ thumb_func_end atkB2_trysetperishsong
- thumb_func_start sub_802AB8C
-sub_802AB8C: @ 802AB8C
+ thumb_func_start atkB3_rolloutdamagecalculation
+atkB3_rolloutdamagecalculation: @ 802AB8C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -26591,7 +26591,7 @@ sub_802AB8C: @ 802AB8C
beq _0802ABC0
ldr r0, _0802ABB4 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _0802ABB8 @ =gUnknown_2023D74
ldr r0, _0802ABBC @ =gUnknown_81D6960
str r0, [r1]
@@ -26764,10 +26764,10 @@ _0802ACF8: .4byte 0xffffefff
_0802ACFC: .4byte gUnknown_2023F50
_0802AD00: .4byte gUnknown_8250C04
_0802AD04: .4byte gUnknown_2023D74
- thumb_func_end sub_802AB8C
+ thumb_func_end atkB3_rolloutdamagecalculation
- thumb_func_start sub_802AD08
-sub_802AD08: @ 802AD08
+ thumb_func_start atkB4_jumpifconfusedandstatmaxed
+atkB4_jumpifconfusedandstatmaxed: @ 802AD08
push {r4,r5,lr}
ldr r5, _0802AD58 @ =gUnknown_2023BE4
ldr r0, _0802AD5C @ =gUnknown_2023D6C
@@ -26819,10 +26819,10 @@ _0802AD6A:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_802AD08
+ thumb_func_end atkB4_jumpifconfusedandstatmaxed
- thumb_func_start sub_802AD70
-sub_802AD70: @ 802AD70
+ thumb_func_start atkB5_furycuttercalc
+atkB5_furycuttercalc: @ 802AD70
push {r4,r5,lr}
ldr r0, _0802AD98 @ =gUnknown_2023DCC
ldrb r1, [r0]
@@ -26908,10 +26908,10 @@ _0802AE14: .4byte gUnknown_2023F50
_0802AE18: .4byte gUnknown_8250C04
_0802AE1C: .4byte gUnknown_2023D4A
_0802AE20: .4byte gUnknown_2023D74
- thumb_func_end sub_802AD70
+ thumb_func_end atkB5_furycuttercalc
- thumb_func_start sub_802AE24
-sub_802AE24: @ 802AE24
+ thumb_func_start atkB6_happinesstodamagecalculation
+atkB6_happinesstodamagecalculation: @ 802AE24
push {r4,lr}
ldr r2, _0802AE50 @ =gUnknown_8250C04
ldr r0, _0802AE54 @ =gUnknown_2023D4A
@@ -26970,12 +26970,12 @@ _0802AE98: .4byte gUnknown_2023F50
_0802AE9C: .4byte gUnknown_2023BE4
_0802AEA0: .4byte gUnknown_2023D6B
_0802AEA4: .4byte gUnknown_2023D74
- thumb_func_end sub_802AE24
+ thumb_func_end atkB6_happinesstodamagecalculation
- thumb_func_start sub_802AEA8
-sub_802AEA8: @ 802AEA8
+ thumb_func_start atkB7_presentdamagecalculation
+atkB7_presentdamagecalculation: @ 802AEA8
push {r4,lr}
- bl sub_8044EC8
+ bl Random
movs r4, 0xFF
ands r4, r0
cmp r4, 0x65
@@ -27071,14 +27071,14 @@ _0802AF5E:
_0802AF68: .4byte gUnknown_2023DCC
_0802AF6C: .4byte gUnknown_2023D74
_0802AF70: .4byte gUnknown_81D7DB7
- thumb_func_end sub_802AEA8
+ thumb_func_end atkB7_presentdamagecalculation
- thumb_func_start sub_802AF74
-sub_802AF74: @ 802AF74
+ thumb_func_start atkB8_setsafeguard
+atkB8_setsafeguard: @ 802AF74
push {r4-r7,lr}
ldr r7, _0802AFA8 @ =gUnknown_2023D6B
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r4, _0802AFAC @ =gUnknown_2023DDE
movs r6, 0x1
adds r1, r6, 0
@@ -27106,7 +27106,7 @@ _0802AFB0: .4byte gUnknown_2023DCC
_0802AFB4: .4byte gUnknown_2023E82
_0802AFB8:
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r6, 0
ands r1, r0
lsls r1, 1
@@ -27116,7 +27116,7 @@ _0802AFB8:
orrs r0, r2
strh r0, [r1]
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
ldr r5, _0802B010 @ =gUnknown_2023DE4
adds r1, r6, 0
ands r1, r0
@@ -27127,7 +27127,7 @@ _0802AFB8:
movs r4, 0x5
strb r4, [r0, 0x6]
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r6, 0
ands r1, r0
lsls r0, r1, 1
@@ -27150,14 +27150,14 @@ _0802B000:
_0802B010: .4byte gUnknown_2023DE4
_0802B014: .4byte gUnknown_2023E82
_0802B018: .4byte gUnknown_2023D74
- thumb_func_end sub_802AF74
+ thumb_func_end atkB8_setsafeguard
- thumb_func_start sub_802B01C
-sub_802B01C: @ 802B01C
+ thumb_func_start atkB9_magnitudedamagecalculation
+atkB9_magnitudedamagecalculation: @ 802B01C
push {r4-r7,lr}
mov r7, r8
push {r7}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -27294,10 +27294,10 @@ _0802B130: .4byte gUnknown_2023D74
_0802B134: .4byte gUnknown_2023D6B
_0802B138: .4byte gUnknown_825E45C
_0802B13C: .4byte gUnknown_2023D70
- thumb_func_end sub_802B01C
+ thumb_func_end atkB9_magnitudedamagecalculation
- thumb_func_start sub_802B140
-sub_802B140: @ 802B140
+ thumb_func_start atkBA_jumpifnopursuitswitchdmg
+atkBA_jumpifnopursuitswitchdmg: @ 802B140
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -27309,7 +27309,7 @@ sub_802B140: @ 802B140
bne _0802B170
ldr r0, _0802B168 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0802B16C
@@ -27324,7 +27324,7 @@ _0802B16C:
_0802B170:
ldr r0, _0802B184 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0802B188
@@ -27335,7 +27335,7 @@ _0802B184: .4byte gUnknown_2023D6B
_0802B188:
movs r0, 0x2
_0802B18A:
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0802B264 @ =gUnknown_2023D6C
strb r0, [r1]
ldr r0, _0802B268 @ =gUnknown_2023D7C
@@ -27489,10 +27489,10 @@ _0802B2C2:
bx r0
.align 2, 0
_0802B2D0: .4byte gUnknown_2023D74
- thumb_func_end sub_802B140
+ thumb_func_end atkBA_jumpifnopursuitswitchdmg
- thumb_func_start sub_802B2D4
-sub_802B2D4: @ 802B2D4
+ thumb_func_start atkBB_setsunny
+atkBB_setsunny: @ 802B2D4
push {lr}
ldr r2, _0802B2F4 @ =gUnknown_2023F1C
ldrh r1, [r2]
@@ -27534,10 +27534,10 @@ _0802B312:
_0802B320: .4byte gUnknown_2023E82
_0802B324: .4byte gUnknown_2023F20
_0802B328: .4byte gUnknown_2023D74
- thumb_func_end sub_802B2D4
+ thumb_func_end atkBB_setsunny
- thumb_func_start sub_802B32C
-sub_802B32C: @ 802B32C
+ thumb_func_start atkBC_maxattackhalvehp
+atkBC_maxattackhalvehp: @ 802B32C
push {r4,r5,lr}
ldr r5, _0802B378 @ =gUnknown_2023BE4
ldr r4, _0802B37C @ =gUnknown_2023D6B
@@ -27602,10 +27602,10 @@ _0802B3A2:
bx r0
.align 2, 0
_0802B3A8: .4byte gUnknown_2023D74
- thumb_func_end sub_802B32C
+ thumb_func_end atkBC_maxattackhalvehp
- thumb_func_start sub_802B3AC
-sub_802B3AC: @ 802B3AC
+ thumb_func_start atkBD_copyfoestats
+atkBD_copyfoestats: @ 802B3AC
push {r4-r7,lr}
movs r2, 0
ldr r7, _0802B3E4 @ =gUnknown_2023D74
@@ -27639,10 +27639,10 @@ _0802B3E4: .4byte gUnknown_2023D74
_0802B3E8: .4byte gUnknown_2023D6B
_0802B3EC: .4byte gUnknown_2023BFC
_0802B3F0: .4byte gUnknown_2023D6C
- thumb_func_end sub_802B3AC
+ thumb_func_end atkBD_copyfoestats
- thumb_func_start sub_802B3F4
-sub_802B3F4: @ 802B3F4
+ thumb_func_start atkBE_rapidspinfree
+atkBE_rapidspinfree: @ 802B3F4
push {r4-r6,lr}
ldr r1, _0802B464 @ =gUnknown_2023BE4
ldr r5, _0802B468 @ =gUnknown_2023D6B
@@ -27694,7 +27694,7 @@ sub_802B3F4: @ 802B3F4
strb r0, [r1, 0x3]
movs r0, 0xFF
strb r0, [r1, 0x4]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0802B480 @ =gUnknown_2023D74
ldr r0, _0802B484 @ =gUnknown_81D8DF3
b _0802B532
@@ -27729,7 +27729,7 @@ _0802B488:
negs r2, r2
ands r0, r2
str r0, [r1]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0802B4C0 @ =gUnknown_2023D74
ldr r0, _0802B4C4 @ =gUnknown_81D8E04
b _0802B532
@@ -27739,7 +27739,7 @@ _0802B4C0: .4byte gUnknown_2023D74
_0802B4C4: .4byte gUnknown_81D8E04
_0802B4C8:
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
ldr r4, _0802B518 @ =gUnknown_2023DDE
lsls r0, 24
lsrs r0, 23
@@ -27750,7 +27750,7 @@ _0802B4C8:
cmp r0, 0
beq _0802B52C
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 23
adds r0, r4
@@ -27760,7 +27760,7 @@ _0802B4C8:
movs r4, 0
strh r1, [r0]
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
ldr r2, _0802B520 @ =gUnknown_2023DE4
lsls r0, 24
lsrs r0, 24
@@ -27769,7 +27769,7 @@ _0802B4C8:
lsls r1, 2
adds r1, r2
strb r4, [r1, 0xA]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0802B524 @ =gUnknown_2023D74
ldr r0, _0802B528 @ =gUnknown_81D8E0B
b _0802B532
@@ -27790,10 +27790,10 @@ _0802B532:
bx r0
.align 2, 0
_0802B53C: .4byte gUnknown_2023D74
- thumb_func_end sub_802B3F4
+ thumb_func_end atkBE_rapidspinfree
- thumb_func_start sub_802B540
-sub_802B540: @ 802B540
+ thumb_func_start atkBF_setdefensecurlbit
+atkBF_setdefensecurlbit: @ 802B540
ldr r1, _0802B564 @ =gUnknown_2023BE4
ldr r0, _0802B568 @ =gUnknown_2023D6B
ldrb r2, [r0]
@@ -27815,10 +27815,10 @@ sub_802B540: @ 802B540
_0802B564: .4byte gUnknown_2023BE4
_0802B568: .4byte gUnknown_2023D6B
_0802B56C: .4byte gUnknown_2023D74
- thumb_func_end sub_802B540
+ thumb_func_end atkBF_setdefensecurlbit
- thumb_func_start sub_802B570
-sub_802B570: @ 802B570
+ thumb_func_start atkC0_recoverbasedonsunlight
+atkC0_recoverbasedonsunlight: @ 802B570
push {r4-r7,lr}
sub sp, 0x4
ldr r1, _0802B5DC @ =gUnknown_2023D6C
@@ -27946,7 +27946,7 @@ _0802B66A:
bx r0
.align 2, 0
_0802B674: .4byte gUnknown_2023D74
- thumb_func_end sub_802B570
+ thumb_func_end atkC0_recoverbasedonsunlight
thumb_func_start sub_802B678
sub_802B678: @ 802B678
@@ -28189,7 +28189,7 @@ _0802B82C:
strb r1, [r0]
ldr r4, _0802B8D4 @ =gUnknown_2023DDE
ldrb r0, [r7]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
mov r10, r1
ands r1, r0
@@ -28277,15 +28277,15 @@ _0802B908: .4byte gUnknown_2023E82
_0802B90C: .4byte gUnknown_2023D74
thumb_func_end sub_802B7E8
- thumb_func_start sub_802B910
-sub_802B910: @ 802B910
+ thumb_func_start atkC4_trydobeatup
+atkC4_trydobeatup: @ 802B910
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
ldr r0, _0802B954 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r7, _0802B958 @ =gUnknown_202402C
cmp r0, 0
@@ -28334,21 +28334,21 @@ _0802B97C:
muls r0, r5
adds r0, r7, r0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802B9C0
ldrb r0, [r6]
muls r0, r5
adds r0, r7, r0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802B9C0
ldrb r0, [r4]
muls r0, r5
adds r0, r7, r0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -28357,7 +28357,7 @@ _0802B97C:
muls r0, r5
adds r0, r7, r0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802B9D0
_0802B9C0:
@@ -28399,7 +28399,7 @@ _0802B9D0:
muls r0, r4
adds r0, r7, r0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -28423,7 +28423,7 @@ _0802B9D0:
muls r0, r4
adds r0, r7, r0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 1
movs r1, 0x5
bl __udivsi3
@@ -28525,10 +28525,10 @@ _0802BB0E:
bx r0
.align 2, 0
_0802BB1C: .4byte gUnknown_2023D74
- thumb_func_end sub_802B910
+ thumb_func_end atkC4_trydobeatup
- thumb_func_start sub_802BB20
-sub_802BB20: @ 802BB20
+ thumb_func_start atkC5_setsemiinvulnerablebit
+atkC5_setsemiinvulnerablebit: @ 802BB20
push {lr}
ldr r0, _0802BB34 @ =gUnknown_2023D4A
ldrh r1, [r0]
@@ -28596,10 +28596,10 @@ _0802BB8C:
_0802BB98: .4byte gUnknown_2023DFC
_0802BB9C: .4byte gUnknown_2023D6B
_0802BBA0: .4byte gUnknown_2023D74
- thumb_func_end sub_802BB20
+ thumb_func_end atkC5_setsemiinvulnerablebit
- thumb_func_start sub_802BBA4
-sub_802BBA4: @ 802BBA4
+ thumb_func_start atkC6_clearsemiinvulnerablebit
+atkC6_clearsemiinvulnerablebit: @ 802BBA4
push {lr}
ldr r0, _0802BBB8 @ =gUnknown_2023D4A
ldrh r1, [r0]
@@ -28669,10 +28669,10 @@ _0802BC24: .4byte gUnknown_2023DFC
_0802BC28: .4byte gUnknown_2023D6B
_0802BC2C: .4byte 0xfffbffff
_0802BC30: .4byte gUnknown_2023D74
- thumb_func_end sub_802BBA4
+ thumb_func_end atkC6_clearsemiinvulnerablebit
- thumb_func_start sub_802BC34
-sub_802BC34: @ 802BC34
+ thumb_func_start atkC7_setminimize
+atkC7_setminimize: @ 802BC34
push {lr}
ldr r0, _0802BC64 @ =gUnknown_2023DD0
ldr r0, [r0]
@@ -28703,10 +28703,10 @@ _0802BC64: .4byte gUnknown_2023DD0
_0802BC68: .4byte gUnknown_2023DFC
_0802BC6C: .4byte gUnknown_2023D6B
_0802BC70: .4byte gUnknown_2023D74
- thumb_func_end sub_802BC34
+ thumb_func_end atkC7_setminimize
- thumb_func_start sub_802BC74
-sub_802BC74: @ 802BC74
+ thumb_func_start atkC8_sethail
+atkC8_sethail: @ 802BC74
push {lr}
ldr r3, _0802BC98 @ =gUnknown_2023F1C
ldrh r1, [r3]
@@ -28747,10 +28747,10 @@ _0802BCB2:
_0802BCC0: .4byte gUnknown_2023E82
_0802BCC4: .4byte gUnknown_2023F20
_0802BCC8: .4byte gUnknown_2023D74
- thumb_func_end sub_802BC74
+ thumb_func_end atkC8_sethail
- thumb_func_start sub_802BCCC
-sub_802BCCC: @ 802BCCC
+ thumb_func_start atkC9_jumpifattackandspecialattackcannotfall
+atkC9_jumpifattackandspecialattackcannotfall: @ 802BCCC
push {r4,lr}
ldr r2, _0802BD10 @ =gUnknown_2023BE4
ldr r0, _0802BD14 @ =gUnknown_2023D6C
@@ -28804,9 +28804,9 @@ _0802BD20:
str r0, [r2]
ldr r1, _0802BD60 @ =0x00007fff
movs r0, 0
- bl sub_800E5EC
+ bl EmitHealthBarUpdate
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802BD64 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x5
@@ -28821,14 +28821,14 @@ _0802BD58: .4byte gUnknown_2023D6B
_0802BD5C: .4byte gUnknown_2023D50
_0802BD60: .4byte 0x00007fff
_0802BD64: .4byte gUnknown_2023D74
- thumb_func_end sub_802BCCC
+ thumb_func_end atkC9_jumpifattackandspecialattackcannotfall
- thumb_func_start sub_802BD68
-sub_802BD68: @ 802BD68
+ thumb_func_start atkCA_setforcedtarget
+atkCA_setforcedtarget: @ 802BD68
push {r4,r5,lr}
ldr r4, _0802BDA8 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
ldr r5, _0802BDAC @ =gUnknown_2023DE4
lsls r0, 24
lsrs r0, 24
@@ -28839,7 +28839,7 @@ sub_802BD68: @ 802BD68
movs r0, 0x1
strb r0, [r1, 0x8]
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -28859,10 +28859,10 @@ sub_802BD68: @ 802BD68
_0802BDA8: .4byte gUnknown_2023D6B
_0802BDAC: .4byte gUnknown_2023DE4
_0802BDB0: .4byte gUnknown_2023D74
- thumb_func_end sub_802BD68
+ thumb_func_end atkCA_setforcedtarget
- thumb_func_start sub_802BDB4
-sub_802BDB4: @ 802BDB4
+ thumb_func_start atkCB_setcharge
+atkCB_setcharge: @ 802BDB4
push {r4,lr}
ldr r0, _0802BE08 @ =gUnknown_2023DFC
ldr r3, _0802BE0C @ =gUnknown_2023D6B
@@ -28910,10 +28910,10 @@ _0802BE08: .4byte gUnknown_2023DFC
_0802BE0C: .4byte gUnknown_2023D6B
_0802BE10: .4byte gUnknown_2023E0C
_0802BE14: .4byte gUnknown_2023D74
- thumb_func_end sub_802BDB4
+ thumb_func_end atkCB_setcharge
- thumb_func_start sub_802BE18
-sub_802BE18: @ 802BE18
+ thumb_func_start atkCC_callterrainattack
+atkCC_callterrainattack: @ 802BE18
push {r4,lr}
ldr r2, _0802BE68 @ =gUnknown_2023DD0
ldr r0, [r2]
@@ -28944,7 +28944,7 @@ sub_802BE18: @ 802BE18
lsls r0, 2
adds r0, r3
ldr r0, [r0]
- bl sub_8017520
+ bl BattleScriptPush
ldr r1, _0802BE88 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -28962,10 +28962,10 @@ _0802BE7C: .4byte gUnknown_2023D6C
_0802BE80: .4byte gUnknown_81D65A8
_0802BE84: .4byte gUnknown_8250C04
_0802BE88: .4byte gUnknown_2023D74
- thumb_func_end sub_802BE18
+ thumb_func_end atkCC_callterrainattack
- thumb_func_start sub_802BE8C
-sub_802BE8C: @ 802BE8C
+ thumb_func_start atkCD_cureifburnedparalysedorpoisoned
+atkCD_cureifburnedparalysedorpoisoned: @ 802BE8C
push {r4-r6,lr}
sub sp, 0x4
ldr r1, _0802BED8 @ =gUnknown_2023BE4
@@ -28998,9 +28998,9 @@ sub_802BE8C: @ 802BE8C
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0802BF02
.align 2, 0
_0802BED8: .4byte gUnknown_2023BE4
@@ -29028,10 +29028,10 @@ _0802BF02:
bx r0
.align 2, 0
_0802BF0C: .4byte gUnknown_2023D74
- thumb_func_end sub_802BE8C
+ thumb_func_end atkCD_cureifburnedparalysedorpoisoned
- thumb_func_start sub_802BF10
-sub_802BF10: @ 802BF10
+ thumb_func_start atkCE_settorment
+atkCE_settorment: @ 802BF10
push {lr}
ldr r1, _0802BF48 @ =gUnknown_2023BE4
ldr r0, _0802BF4C @ =gUnknown_2023D6C
@@ -29075,10 +29075,10 @@ _0802BF60:
bx r0
.align 2, 0
_0802BF64: .4byte gUnknown_2023D74
- thumb_func_end sub_802BF10
+ thumb_func_end atkCE_settorment
- thumb_func_start sub_802BF68
-sub_802BF68: @ 802BF68
+ thumb_func_start atkCF_jumpifnodamage
+atkCF_jumpifnodamage: @ 802BF68
push {lr}
ldr r2, _0802BF94 @ =gUnknown_2023E8C
ldr r0, _0802BF98 @ =gUnknown_2023D6B
@@ -29124,10 +29124,10 @@ _0802BFBA:
bx r0
.align 2, 0
_0802BFC0: .4byte gUnknown_2023D74
- thumb_func_end sub_802BF68
+ thumb_func_end atkCF_jumpifnodamage
- thumb_func_start sub_802BFC4
-sub_802BFC4: @ 802BFC4
+ thumb_func_start atkD0_settaunt
+atkD0_settaunt: @ 802BFC4
push {r4,lr}
ldr r4, _0802C008 @ =gUnknown_2023E0C
ldr r3, _0802C00C @ =gUnknown_2023D6C
@@ -29186,19 +29186,19 @@ _0802C02E:
bx r0
.align 2, 0
_0802C034: .4byte gUnknown_2023D74
- thumb_func_end sub_802BFC4
+ thumb_func_end atkD0_settaunt
- thumb_func_start sub_802C038
-sub_802C038: @ 802C038
+ thumb_func_start atkD1_trysethelpinghand
+atkD1_trysethelpinghand: @ 802C038
push {r4,lr}
ldr r4, _0802C0A0 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r3, _0802C0A4 @ =gUnknown_2023D6C
strb r0, [r3]
ldr r0, _0802C0A8 @ =gUnknown_2022B4C
@@ -29267,7 +29267,7 @@ _0802C0D6:
bx r0
.align 2, 0
_0802C0DC: .4byte gUnknown_2023D74
- thumb_func_end sub_802C038
+ thumb_func_end atkD1_trysethelpinghand
thumb_func_start sub_802C0E0
sub_802C0E0: @ 802C0E0
@@ -29286,7 +29286,7 @@ sub_802C0E0: @ 802C0E0
bne _0802C1DE
ldr r0, _0802C200 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -29305,12 +29305,12 @@ sub_802C0E0: @ 802C0E0
_0802C120:
ldr r6, _0802C200 @ =gUnknown_2023D6B
ldrb r0, [r6]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
ldr r7, _0802C20C @ =gUnknown_2023D6C
ldrb r0, [r7]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0802C1FC @ =gUnknown_2022B4C
@@ -29479,10 +29479,10 @@ _0802C258:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldr r1, _0802C348 @ =gUnknown_2023D6B
ldrb r0, [r1]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r7]
strb r0, [r4]
ldrb r0, [r7]
@@ -29495,9 +29495,9 @@ _0802C258:
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldrb r0, [r7]
mov r2, r10
ldr r1, [r2]
@@ -29599,8 +29599,8 @@ _0802C37A:
_0802C38C: .4byte gUnknown_2023E82
thumb_func_end sub_802C0E0
- thumb_func_start sub_802C390
-sub_802C390: @ 802C390
+ thumb_func_start atkD3_trycopyability
+atkD3_trycopyability: @ 802C390
push {r4,lr}
ldr r3, _0802C3D0 @ =gUnknown_2023BE4
ldr r4, _0802C3D4 @ =gUnknown_2023D6C
@@ -29659,10 +29659,10 @@ _0802C3FE:
bx r0
.align 2, 0
_0802C404: .4byte gUnknown_2023D74
- thumb_func_end sub_802C390
+ thumb_func_end atkD3_trycopyability
- thumb_func_start sub_802C408
-sub_802C408: @ 802C408
+ thumb_func_start atkD4_trywish
+atkD4_trywish: @ 802C408
push {r4-r7,lr}
ldr r7, _0802C41C @ =gUnknown_2023D74
ldr r2, [r7]
@@ -29768,10 +29768,10 @@ _0802C4D4:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_802C408
+ thumb_func_end atkD4_trywish
- thumb_func_start sub_802C4DC
-sub_802C4DC: @ 802C4DC
+ thumb_func_start atkD5_trysetroots
+atkD5_trysetroots: @ 802C4DC
push {lr}
ldr r1, _0802C514 @ =gUnknown_2023DFC
ldr r0, _0802C518 @ =gUnknown_2023D6B
@@ -29815,10 +29815,10 @@ _0802C52C:
bx r0
.align 2, 0
_0802C530: .4byte gUnknown_2023D74
- thumb_func_end sub_802C4DC
+ thumb_func_end atkD5_trysetroots
- thumb_func_start sub_802C534
-sub_802C534: @ 802C534
+ thumb_func_start atkD6_doubledamagedealtifdamaged
+atkD6_doubledamagedealtifdamaged: @ 802C534
push {lr}
ldr r3, _0802C580 @ =gUnknown_2023E8C
ldr r0, _0802C584 @ =gUnknown_2023D6B
@@ -29865,10 +29865,10 @@ _0802C584: .4byte gUnknown_2023D6B
_0802C588: .4byte gUnknown_2023D6C
_0802C58C: .4byte gUnknown_2023FC4
_0802C590: .4byte gUnknown_2023D74
- thumb_func_end sub_802C534
+ thumb_func_end atkD6_doubledamagedealtifdamaged
- thumb_func_start sub_802C594
-sub_802C594: @ 802C594
+ thumb_func_start atkD7_setyawn
+atkD7_setyawn: @ 802C594
push {r4,lr}
ldr r1, _0802C5D8 @ =gUnknown_2023DFC
ldr r0, _0802C5DC @ =gUnknown_2023D6C
@@ -29924,10 +29924,10 @@ _0802C5F8:
bx r0
.align 2, 0
_0802C600: .4byte gUnknown_2023D74
- thumb_func_end sub_802C594
+ thumb_func_end atkD7_setyawn
- thumb_func_start sub_802C604
-sub_802C604: @ 802C604
+ thumb_func_start atkD8_setdamagetohealthdifference
+atkD8_setdamagetohealthdifference: @ 802C604
push {lr}
ldr r2, _0802C640 @ =gUnknown_2023BE4
ldr r0, _0802C644 @ =gUnknown_2023D6C
@@ -29978,10 +29978,10 @@ _0802C662:
.align 2, 0
_0802C668: .4byte gUnknown_2023D50
_0802C66C: .4byte gUnknown_2023D74
- thumb_func_end sub_802C604
+ thumb_func_end atkD8_setdamagetohealthdifference
- thumb_func_start sub_802C670
-sub_802C670: @ 802C670
+ thumb_func_start atkD9_scaledamagebyhealthratio
+atkD9_scaledamagebyhealthratio: @ 802C670
push {r4,lr}
ldr r4, _0802C6BC @ =gUnknown_2023F50
ldrh r0, [r4]
@@ -30026,10 +30026,10 @@ _0802C6C4: .4byte gUnknown_2023D4A
_0802C6C8: .4byte gUnknown_2023BE4
_0802C6CC: .4byte gUnknown_2023D6B
_0802C6D0: .4byte gUnknown_2023D74
- thumb_func_end sub_802C670
+ thumb_func_end atkD9_scaledamagebyhealthratio
- thumb_func_start sub_802C6D4
-sub_802C6D4: @ 802C6D4
+ thumb_func_start atkDA_tryswapabilities
+atkDA_tryswapabilities: @ 802C6D4
push {r4-r6,lr}
ldr r5, _0802C738 @ =gUnknown_2023BE4
ldr r0, _0802C73C @ =gUnknown_2023D6B
@@ -30106,10 +30106,10 @@ _0802C762:
bx r0
.align 2, 0
_0802C768: .4byte gUnknown_2023D74
- thumb_func_end sub_802C6D4
+ thumb_func_end atkDA_tryswapabilities
- thumb_func_start sub_802C76C
-sub_802C76C: @ 802C76C
+ thumb_func_start atkDB_tryimprision
+atkDB_tryimprision: @ 802C76C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -30150,17 +30150,17 @@ _0802C7B4: .4byte gUnknown_2023DFC
_0802C7B8: .4byte gUnknown_2023D74
_0802C7BC:
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldrb r0, [r4]
- bl sub_8016F90
+ bl PressurePPLoseOnUsingImprision
movs r6, 0
b _0802C82E
_0802C7D2:
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r8, r0
@@ -30246,10 +30246,10 @@ _0802C864: .4byte gUnknown_2023D6B
_0802C868: .4byte gUnknown_2023BE4
_0802C86C: .4byte gUnknown_2023BCC
_0802C870: .4byte gUnknown_2023D74
- thumb_func_end sub_802C76C
+ thumb_func_end atkDB_tryimprision
- thumb_func_start sub_802C874
-sub_802C874: @ 802C874
+ thumb_func_start atkDC_trysetgrudge
+atkDC_trysetgrudge: @ 802C874
push {lr}
ldr r1, _0802C8AC @ =gUnknown_2023DFC
ldr r0, _0802C8B0 @ =gUnknown_2023D6B
@@ -30293,10 +30293,10 @@ _0802C8C4:
bx r0
.align 2, 0
_0802C8C8: .4byte gUnknown_2023D74
- thumb_func_end sub_802C874
+ thumb_func_end atkDC_trysetgrudge
- thumb_func_start sub_802C8CC
-sub_802C8CC: @ 802C8CC
+ thumb_func_start atkDD_weightdamagecalculation
+atkDD_weightdamagecalculation: @ 802C8CC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -30318,7 +30318,7 @@ _0802C8E8:
muls r0, r1
add r0, r8
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -30370,10 +30370,10 @@ _0802C94A:
.align 2, 0
_0802C95C: .4byte gUnknown_2023F50
_0802C960: .4byte gUnknown_2023D74
- thumb_func_end sub_802C8CC
+ thumb_func_end atkDD_weightdamagecalculation
- thumb_func_start sub_802C964
-sub_802C964: @ 802C964
+ thumb_func_start atkDE_asistattackselect
+atkDE_asistattackselect: @ 802C964
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -30388,7 +30388,7 @@ sub_802C964: @ 802C964
str r0, [sp, 0x4]
ldr r0, _0802CA88 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
ands r1, r0
ldr r0, _0802CA8C @ =gUnknown_2024284
@@ -30417,12 +30417,12 @@ _0802C996:
adds r4, r0, r6
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802CA3C
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -30441,11 +30441,11 @@ _0802C9E0:
adds r1, 0xD
ldr r0, [sp]
add r0, r9
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_802A1FC
+ bl IsInvalidForSleepTalkOrAssist
lsls r0, 24
adds r1, r5, 0x1
cmp r0, 0
@@ -30497,7 +30497,7 @@ _0802CA3C:
ands r0, r1
str r0, [r2]
ldr r4, _0802CAA8 @ =gUnknown_2023D4E
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
mov r0, r10
@@ -30556,10 +30556,10 @@ _0802CACE:
bx r0
.align 2, 0
_0802CAE0: .4byte gUnknown_2023D74
- thumb_func_end sub_802C964
+ thumb_func_end atkDE_asistattackselect
- thumb_func_start sub_802CAE4
-sub_802CAE4: @ 802CAE4
+ thumb_func_start atkDF_trysetmagiccoat
+atkDF_trysetmagiccoat: @ 802CAE4
push {lr}
ldr r1, _0802CB2C @ =gUnknown_2023D6C
ldr r3, _0802CB30 @ =gUnknown_2023D6B
@@ -30622,10 +30622,10 @@ _0802CB5C:
.align 2, 0
_0802CB60: .4byte gUnknown_2023E8C
_0802CB64: .4byte gUnknown_2023D74
- thumb_func_end sub_802CAE4
+ thumb_func_end atkDF_trysetmagiccoat
- thumb_func_start sub_802CB68
-sub_802CB68: @ 802CB68
+ thumb_func_start atkE0_trysetsnatch
+atkE0_trysetsnatch: @ 802CB68
push {lr}
ldr r2, _0802CBAC @ =gUnknown_2023ECC
ldr r3, _0802CBB0 @ =gUnknown_2023D6B
@@ -30683,10 +30683,10 @@ _0802CBD6:
.align 2, 0
_0802CBDC: .4byte gUnknown_2023E8C
_0802CBE0: .4byte gUnknown_2023D74
- thumb_func_end sub_802CB68
+ thumb_func_end atkE0_trysetsnatch
- thumb_func_start sub_802CBE4
-sub_802CBE4: @ 802CBE4
+ thumb_func_start atkE1_trygetintimidatetarget
+atkE1_trygetintimidatetarget: @ 802CBE4
push {r4-r6,lr}
ldr r4, _0802CC88 @ =gUnknown_2023FC4
ldr r0, _0802CC8C @ =gUnknown_2023FE8
@@ -30695,7 +30695,7 @@ sub_802CBE4: @ 802CBE4
ldrb r0, [r0]
strb r0, [r4, 0x17]
ldrb r0, [r4, 0x17]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _0802CC90 @ =gUnknown_2022AB8
@@ -30723,7 +30723,7 @@ sub_802CBE4: @ 802CBE4
ldr r6, _0802CCA0 @ =gUnknown_825E45C
_0802CC2A:
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, r5
@@ -30791,10 +30791,10 @@ _0802CCB4:
bx r0
.align 2, 0
_0802CCBC: .4byte gUnknown_2023D74
- thumb_func_end sub_802CBE4
+ thumb_func_end atkE1_trygetintimidatetarget
- thumb_func_start sub_802CCC0
-sub_802CCC0: @ 802CCC0
+ thumb_func_start atkE2_switchoutabilities
+atkE2_switchoutabilities: @ 802CCC0
push {r4-r6,lr}
sub sp, 0x4
ldr r5, _0802CD28 @ =gUnknown_2023D74
@@ -30834,9 +30834,9 @@ sub_802CCC0: @ 802CCC0
movs r0, 0
movs r1, 0x28
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_0802CD1A:
ldr r0, [r5]
adds r0, 0x2
@@ -30851,10 +30851,10 @@ _0802CD2C: .4byte gUnknown_2023BC4
_0802CD30: .4byte gUnknown_2023BE4
_0802CD34: .4byte gUnknown_825E45C
_0802CD38: .4byte gUnknown_2023FE8
- thumb_func_end sub_802CCC0
+ thumb_func_end atkE2_switchoutabilities
- thumb_func_start sub_802CD3C
-sub_802CD3C: @ 802CD3C
+ thumb_func_start atkE3_jumpifhasnohp
+atkE3_jumpifhasnohp: @ 802CD3C
push {r4,lr}
ldr r4, _0802CD78 @ =gUnknown_2023D74
ldr r0, [r4]
@@ -30895,10 +30895,10 @@ _0802CD8A:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_802CD3C
+ thumb_func_end atkE3_jumpifhasnohp
- thumb_func_start sub_802CD90
-sub_802CD90: @ 802CD90
+ thumb_func_start atkE4_getsecretpowereffect
+atkE4_getsecretpowereffect: @ 802CD90
push {lr}
ldr r0, _0802CDA4 @ =gUnknown_2022B50
ldrb r0, [r0]
@@ -30984,7 +30984,7 @@ _0802CE30:
.align 2, 0
_0802CE40: .4byte gUnknown_2023E82
_0802CE44: .4byte gUnknown_2023D74
- thumb_func_end sub_802CD90
+ thumb_func_end atkE4_getsecretpowereffect
thumb_func_start sub_802CE48
sub_802CE48: @ 802CE48
@@ -31002,17 +31002,17 @@ _0802CE54:
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0802CE98
lsls r0, r5, 3
@@ -31042,7 +31042,7 @@ _0802CEA2:
beq _0802CF0A
cmp r6, 0
bne _0802CF0A
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -31050,7 +31050,7 @@ _0802CEA2:
lsls r0, 16
cmp r0, 0
bne _0802CF0A
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -31100,8 +31100,8 @@ _0802CF28: .4byte gUnknown_8250848
_0802CF2C: .4byte gUnknown_2023D74
thumb_func_end sub_802CE48
- thumb_func_start sub_802CF30
-sub_802CF30: @ 802CF30
+ thumb_func_start atkE6_docastformchangeanimation
+atkE6_docastformchangeanimation: @ 802CF30
push {r4,lr}
ldr r4, _0802CF84 @ =gUnknown_2023BC4
ldr r0, _0802CF88 @ =gUnknown_2023FC4
@@ -31132,9 +31132,9 @@ _0802CF60:
ldrb r2, [r0]
movs r0, 0
movs r1, 0
- bl sub_800EB28
+ bl EmitBattleAnimation
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802CF94 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -31148,10 +31148,10 @@ _0802CF88: .4byte gUnknown_2023FC4
_0802CF8C: .4byte gUnknown_2023BE4
_0802CF90: .4byte gUnknown_2023FE8
_0802CF94: .4byte gUnknown_2023D74
- thumb_func_end sub_802CF30
+ thumb_func_end atkE6_docastformchangeanimation
- thumb_func_start sub_802CF98
-sub_802CF98: @ 802CF98
+ thumb_func_start atkE7_trycastformdatachange
+atkE7_trycastformdatachange: @ 802CF98
push {r4,lr}
ldr r1, _0802CFC8 @ =gUnknown_2023D74
ldr r0, [r1]
@@ -31180,10 +31180,10 @@ _0802CFC8: .4byte gUnknown_2023D74
_0802CFCC: .4byte gUnknown_2023FC4
_0802CFD0: .4byte gUnknown_81D92F8
_0802CFD4: .4byte gUnknown_2023FE8
- thumb_func_end sub_802CF98
+ thumb_func_end atkE7_trycastformdatachange
- thumb_func_start sub_802CFD8
-sub_802CFD8: @ 802CFD8
+ thumb_func_start atkE8_settypebasedhalvers
+atkE8_settypebasedhalvers: @ 802CFD8
push {r4,lr}
movs r4, 0
ldr r2, _0802D014 @ =gUnknown_8250C04
@@ -31272,10 +31272,10 @@ _0802D086:
bx r0
.align 2, 0
_0802D08C: .4byte gUnknown_2023D74
- thumb_func_end sub_802CFD8
+ thumb_func_end atkE8_settypebasedhalvers
- thumb_func_start sub_802D090
-sub_802D090: @ 802D090
+ thumb_func_start atkE9_setweatherballtype
+atkE9_setweatherballtype: @ 802D090
push {lr}
sub sp, 0x4
movs r0, 0
@@ -31369,10 +31369,10 @@ _0802D130:
.align 2, 0
_0802D140: .4byte gUnknown_2023FE8
_0802D144: .4byte gUnknown_2023D74
- thumb_func_end sub_802D090
+ thumb_func_end atkE9_setweatherballtype
- thumb_func_start sub_802D148
-sub_802D148: @ 802D148
+ thumb_func_start atkEA_tryrecycleitem
+atkEA_tryrecycleitem: @ 802D148
push {r4-r7,lr}
sub sp, 0x4
ldr r7, _0802D1B0 @ =gUnknown_2023BC4
@@ -31414,9 +31414,9 @@ sub_802D148: @ 802D148
movs r1, 0x2
movs r2, 0
movs r3, 0x2
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r7]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802D1C4 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x5
@@ -31450,10 +31450,10 @@ _0802D1E2:
bx r0
.align 2, 0
_0802D1EC: .4byte gUnknown_2023D74
- thumb_func_end sub_802D148
+ thumb_func_end atkEA_tryrecycleitem
- thumb_func_start sub_802D1F0
-sub_802D1F0: @ 802D1F0
+ thumb_func_start atkEB_settypetoterrain
+atkEB_settypetoterrain: @ 802D1F0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -31539,19 +31539,19 @@ _0802D292:
bx r0
.align 2, 0
_0802D29C: .4byte gUnknown_2023D74
- thumb_func_end sub_802D1F0
+ thumb_func_end atkEB_settypetoterrain
- thumb_func_start sub_802D2A0
-sub_802D2A0: @ 802D2A0
+ thumb_func_start atkEC_pursuitrelated
+atkEC_pursuitrelated: @ 802D2A0
push {r4-r6,lr}
ldr r5, _0802D314 @ =gUnknown_2023D6B
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x2
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r4, _0802D318 @ =gUnknown_2023BC4
strb r0, [r4]
ldr r0, _0802D31C @ =gUnknown_2022B4C
@@ -31631,10 +31631,10 @@ _0802D35A:
bx r0
.align 2, 0
_0802D360: .4byte gUnknown_2023D74
- thumb_func_end sub_802D2A0
+ thumb_func_end atkEC_pursuitrelated
- thumb_func_start sub_802D364
-sub_802D364: @ 802D364
+ thumb_func_start atkEF_snatchsetbanks
+atkEF_snatchsetbanks: @ 802D364
push {r4,lr}
ldr r1, _0802D388 @ =gUnknown_2023D6E
ldr r3, _0802D38C @ =gUnknown_2023D6B
@@ -31674,14 +31674,14 @@ _0802D39E:
.align 2, 0
_0802D3B0: .4byte gUnknown_2023FC4
_0802D3B4: .4byte gUnknown_2023D74
- thumb_func_end sub_802D364
+ thumb_func_end atkEF_snatchsetbanks
- thumb_func_start sub_802D3B8
-sub_802D3B8: @ 802D3B8
+ thumb_func_start atkEE_removelightscreenreflect
+atkEE_removelightscreenreflect: @ 802D3B8
push {r4,lr}
ldr r0, _0802D400 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -31736,7 +31736,7 @@ _0802D41E:
.align 2, 0
_0802D42C: .4byte gUnknown_2023FC4
_0802D430: .4byte gUnknown_2023D74
- thumb_func_end sub_802D3B8
+ thumb_func_end atkEE_removelightscreenreflect
thumb_func_start sub_802D434
sub_802D434: @ 802D434
@@ -31765,9 +31765,9 @@ _0802D442:
beq _0802D490
movs r0, 0
movs r1, 0x6
- bl sub_800E194
+ bl EmitBallThrowAnim
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802D488 @ =gUnknown_2023D74
ldr r0, _0802D48C @ =gUnknown_81D9AD1
b _0802D7EC
@@ -31786,9 +31786,9 @@ _0802D490:
beq _0802D4B4
movs r0, 0
movs r1, 0x5
- bl sub_800E194
+ bl EmitBallThrowAnim
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802D4AC @ =gUnknown_2023D74
ldr r0, _0802D4B0 @ =gUnknown_81D9AC1
b _0802D7EC
@@ -31803,9 +31803,9 @@ _0802D4B4:
beq _0802D4DC
movs r0, 0
movs r1, 0x4
- bl sub_800E194
+ bl EmitBallThrowAnim
ldrb r0, [r5]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802D4D4 @ =gUnknown_2023D74
ldr r0, _0802D4D8 @ =gUnknown_81D9A88
b _0802D7EC
@@ -31902,7 +31902,7 @@ _0802D568:
_0802D590: .4byte gUnknown_2023BE4
_0802D594: .4byte gUnknown_2023D6C
_0802D598:
- bl sub_8056188
+ bl sav1_map_get_light_level
lsls r0, 24
lsrs r0, 24
movs r4, 0xA
@@ -31941,7 +31941,7 @@ _0802D5D8:
muls r0, r1
adds r0, r2
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -32048,10 +32048,10 @@ _0802D6BC:
bls _0802D720
movs r0, 0
movs r1, 0x4
- bl sub_800E194
+ bl EmitBallThrowAnim
ldr r0, _0802D704 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _0802D708 @ =gUnknown_2023D74
ldr r0, _0802D70C @ =gUnknown_81D9A42
str r0, [r1]
@@ -32068,7 +32068,7 @@ _0802D6BC:
ldr r2, _0802D71C @ =gUnknown_2023D68
movs r1, 0x26
bl sub_804037C
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -32109,7 +32109,7 @@ _0802D74C:
_0802D752:
cmp r4, 0x3
bhi _0802D762
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
cmp r0, r6
@@ -32123,10 +32123,10 @@ _0802D762:
_0802D76C:
movs r0, 0
adds r1, r4, 0
- bl sub_800E194
+ bl EmitBallThrowAnim
ldr r0, _0802D7BC @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
cmp r4, 0x4
bne _0802D7E4
ldr r1, _0802D7C0 @ =gUnknown_2023D74
@@ -32145,7 +32145,7 @@ _0802D76C:
movs r1, 0x26
adds r2, r5, 0
bl sub_804037C
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -32208,7 +32208,7 @@ sub_802D800: @ 802D800
ldr r1, _0802D878 @ =gUnknown_202402C
mov r8, r1
add r0, r8
- bl sub_8040B14
+ bl GiveMonToPlayer
lsls r0, 24
cmp r0, 0
beq _0802D8EA
@@ -32224,10 +32224,10 @@ sub_802D800: @ 802D800
bl sub_806E568
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r0, [r5]
eors r0, r6
lsls r0, 1
@@ -32237,7 +32237,7 @@ sub_802D800: @ 802D800
add r0, r8
ldr r2, _0802D888 @ =gUnknown_2021CF0
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
b _0802D8D6
.align 2, 0
_0802D870: .4byte gUnknown_2023BCE
@@ -32253,10 +32253,10 @@ _0802D88C:
bl sub_806E568
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r0, [r5]
eors r0, r6
lsls r0, 1
@@ -32266,15 +32266,15 @@ _0802D88C:
add r0, r8
ldr r2, _0802D934 @ =gUnknown_2021CF0
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
ldr r4, _0802D938 @ =gUnknown_2021D04
bl sub_80CC7A8
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, _0802D93C @ =gUnknown_2023E82
movs r0, 0x2
strb r0, [r1, 0x5]
@@ -32310,7 +32310,7 @@ _0802D8EA:
adds r0, r1
adds r2, 0x2A
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _0802D958 @ =gUnknown_2023D74
ldr r0, [r1]
adds r0, 0x1
@@ -32343,16 +32343,16 @@ sub_802D95C: @ 802D95C
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r0, r5, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -32379,7 +32379,7 @@ _0802D9AC: .4byte gUnknown_202402C
_0802D9B0: .4byte gUnknown_2023D74
_0802D9B4:
adds r0, r5, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -32404,7 +32404,7 @@ sub_802D9D8: @ 802D9D8
ldr r0, _0802DA00 @ =gUnknown_202402C
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _0802DA04 @ =gUnknown_2023E82
@@ -32438,7 +32438,7 @@ _0802DA24:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0802DB34
.align 2, 0
_0802DA38: .4byte 0x00007fff
@@ -32491,7 +32491,7 @@ _0802DA72:
add r0, sp, 0x10
bl CpuSet
ldr r0, _0802DAC4 @ =sub_80116F4
- bl sub_80006F4
+ bl SetVBlankCallback
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -32516,7 +32516,7 @@ _0802DAC8:
.align 2, 0
_0802DADC: .4byte gUnknown_2022980
_0802DAE0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -32547,11 +32547,11 @@ _0802DAE0:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
_0802DB34:
ldr r1, _0802DB54 @ =gUnknown_2023E82
_0802DB36:
@@ -32716,7 +32716,7 @@ _0802DC4E:
add r1, sp, 0xC
mov r7, r9
lsrs r3, r7, 24
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
b _0802DC90
.align 2, 0
_0802DC74: .4byte 0x00001026
@@ -32731,7 +32731,7 @@ _0802DC78:
add r1, sp, 0xC
mov r7, r9
lsrs r3, r7, 24
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
_0802DC90:
adds r4, 0x1
ldr r0, [sp, 0x1C]
@@ -32745,7 +32745,7 @@ _0802DC98:
b _0802DBB6
_0802DCA2:
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -32779,9 +32779,9 @@ sub_802DCB8: @ 802DCB8
movs r0, 0
add r1, sp, 0xC
movs r2, 0x18
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r0}
bx r0
@@ -32813,9 +32813,9 @@ sub_802DCF8: @ 802DCF8
movs r0, 0
add r1, sp, 0xC
movs r2, 0x18
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x10
pop {r0}
bx r0
@@ -32924,7 +32924,7 @@ _0802DDF2:
adds r0, 0x1
strb r0, [r1]
movs r0, 0x3
- bl sub_8070E44
+ bl BeginFastPaletteFade
b _0802DFA6
.align 2, 0
_0802DE1C: .4byte gUnknown_30030F0
@@ -32975,7 +32975,7 @@ _0802DE4E:
ldr r2, [r1]
adds r2, 0x6D
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
bl sub_8003ECC
mov r2, r10
ldrb r0, [r2]
@@ -32988,7 +32988,7 @@ _0802DE4E:
adds r0, r1, 0
add r0, r8
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
@@ -33002,7 +33002,7 @@ _0802DE4E:
muls r1, r0
adds r0, r1, 0
add r0, r8
- bl sub_803F720
+ bl GetMonGender
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -33018,7 +33018,7 @@ _0802DE4E:
add r0, r8
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _0802DF0C @ =gUnknown_2023FE8
ldr r1, [r2]
adds r1, 0x6D
@@ -33081,7 +33081,7 @@ _0802DF64: .4byte gUnknown_2023D6B
_0802DF68: .4byte gUnknown_202402C
_0802DF6C: .4byte gUnknown_2023FE8
_0802DF70:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
diff --git a/asm/battle_setup.s b/asm/battle_setup.s
index 65a21ef76..010802d01 100644
--- a/asm/battle_setup.s
+++ b/asm/battle_setup.s
@@ -44,11 +44,11 @@ _0807F65E:
bl sub_812B484
bl sub_80563F0
ldr r0, _0807F68C @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
bl sub_806D7E8
bl sub_806D788
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807F686:
pop {r4,r5}
pop {r0}
@@ -68,7 +68,7 @@ sub_807F690: @ 807F690
lsrs r5, 16
ldr r0, _0807F6C4 @ =sub_807F620
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807F6C8 @ =gUnknown_3005090
@@ -157,8 +157,8 @@ _0807F744:
thumb_func_start sub_807F748
sub_807F748: @ 807F748
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C780
ldr r1, _0807F780 @ =gUnknown_30030F0
ldr r0, _0807F784 @ =sub_807FB40
@@ -186,8 +186,8 @@ _0807F788: .4byte gUnknown_2022B4C
thumb_func_start sub_807F78C
sub_807F78C: @ 807F78C
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C780
ldr r1, _0807F7C8 @ =gUnknown_30030F0
ldr r0, _0807F7CC @ =sub_807FB40
@@ -217,8 +217,8 @@ _0807F7D4: .4byte 0x00000155
thumb_func_start sub_807F7D8
sub_807F7D8: @ 807F7D8
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C780
ldr r1, _0807F804 @ =gUnknown_30030F0
ldr r0, _0807F808 @ =sub_80A0F4C
@@ -242,8 +242,8 @@ _0807F80C: .4byte gUnknown_2022B4C
thumb_func_start sub_807F810
sub_807F810: @ 807F810
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C780
ldr r1, _0807F854 @ =gUnknown_30030F0
ldr r0, _0807F858 @ =sub_807FB40
@@ -297,10 +297,10 @@ sub_807F888: @ 807F888
ldr r0, _0807F8B4 @ =gUnknown_202402C
movs r1, 0xD
movs r2, 0x5
- bl sub_803DF00
- bl sub_8069940
+ bl CreateMaleMon
+ bl ScriptContext2_Enable
ldr r1, _0807F8B8 @ =gUnknown_30030F0
- ldr r0, _0807F8BC @ =sub_80568E0
+ ldr r0, _0807F8BC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [r1, 0x8]
ldr r1, _0807F8C0 @ =gUnknown_2022B4C
movs r0, 0x80
@@ -314,14 +314,14 @@ sub_807F888: @ 807F888
.align 2, 0
_0807F8B4: .4byte gUnknown_202402C
_0807F8B8: .4byte gUnknown_30030F0
-_0807F8BC: .4byte sub_80568E0
+_0807F8BC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0807F8C0: .4byte gUnknown_2022B4C
thumb_func_end sub_807F888
thumb_func_start sub_807F8C4
sub_807F8C4: @ 807F8C4
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807F8F8 @ =gUnknown_30030F0
ldr r0, _0807F8FC @ =sub_807FBA0
str r0, [r1, 0x8]
@@ -350,7 +350,7 @@ _0807F900: .4byte gUnknown_2022B4C
sub_807F904: @ 807F904
push {lr}
sub sp, 0xC
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807F944 @ =gUnknown_30030F0
ldr r0, _0807F948 @ =sub_807FBF0
str r0, [r1, 0x8]
@@ -374,7 +374,7 @@ sub_807F904: @ 807F904
movs r1, 0x69
movs r2, 0x1E
movs r3, 0x1F
- bl sub_803DE00
+ bl CreateMonWithGenderNatureLetter
b _0807F960
.align 2, 0
_0807F944: .4byte gUnknown_30030F0
@@ -413,7 +413,7 @@ _0807F994: .4byte gUnknown_841D148
thumb_func_start sub_807F998
sub_807F998: @ 807F998
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807F9CC @ =gUnknown_30030F0
ldr r0, _0807F9D0 @ =sub_807FBA0
str r0, [r1, 0x8]
@@ -441,7 +441,7 @@ _0807F9D4: .4byte gUnknown_2022B4C
thumb_func_start sub_807F9D8
sub_807F9D8: @ 807F9D8
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807FA0C @ =gUnknown_30030F0
ldr r0, _0807FA10 @ =sub_807FBA0
str r0, [r1, 0x8]
@@ -451,7 +451,7 @@ sub_807F9D8: @ 807F9D8
str r0, [r1]
ldr r0, _0807FA18 @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r0, 0
@@ -513,7 +513,7 @@ _0807FA56:
thumb_func_start sub_807FA68
sub_807FA68: @ 807FA68
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807FA90 @ =gUnknown_30030F0
ldr r0, _0807FA94 @ =sub_807FBA0
str r0, [r1, 0x8]
@@ -552,7 +552,7 @@ _0807FAAA:
thumb_func_start sub_807FABC
sub_807FABC: @ 807FABC
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0807FAEC @ =gUnknown_30030F0
ldr r0, _0807FAF0 @ =sub_807FBA0
str r0, [r1, 0x8]
@@ -588,13 +588,13 @@ sub_807FAF8: @ 807FAF8
thumb_func_start sub_807FB08
sub_807FB08: @ 807FB08
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C780
ldr r1, _0807FB38 @ =gUnknown_30030F0
ldr r0, _0807FB3C @ =sub_807FAF8
str r0, [r1, 0x8]
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_8159F40
bl sub_807FF34
lsls r0, 24
@@ -622,22 +622,22 @@ sub_807FB40: @ 807FB40
bl CpuSet
movs r0, 0
movs r1, 0x80
- bl sub_80072E8
+ bl ResetOamRange
ldr r0, _0807FB78 @ =gUnknown_2023E8A
ldrb r0, [r0]
bl sub_80800D0
cmp r0, 0x1
bne _0807FB80
ldr r0, _0807FB7C @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
b _0807FB8C
.align 2, 0
_0807FB74: .4byte 0x01000100
_0807FB78: .4byte gUnknown_2023E8A
_0807FB7C: .4byte sub_80566A4
_0807FB80:
- ldr r0, _0807FB94 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0807FB94 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
ldr r1, _0807FB98 @ =gUnknown_3005020
ldr r0, _0807FB9C @ =sub_807E3EC
str r0, [r1]
@@ -646,7 +646,7 @@ _0807FB8C:
pop {r0}
bx r0
.align 2, 0
-_0807FB94: .4byte sub_80567DC
+_0807FB94: .4byte c2_exit_to_overworld_2_switch
_0807FB98: .4byte gUnknown_3005020
_0807FB9C: .4byte sub_807E3EC
thumb_func_end sub_807FB40
@@ -665,28 +665,28 @@ sub_807FBA0: @ 807FBA0
bl CpuSet
movs r0, 0
movs r1, 0x80
- bl sub_80072E8
+ bl ResetOamRange
ldr r0, _0807FBD8 @ =gUnknown_2023E8A
ldrb r0, [r0]
bl sub_80800D0
cmp r0, 0x1
bne _0807FBE0
ldr r0, _0807FBDC @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
b _0807FBE6
.align 2, 0
_0807FBD4: .4byte 0x01000100
_0807FBD8: .4byte gUnknown_2023E8A
_0807FBDC: .4byte sub_80566A4
_0807FBE0:
- ldr r0, _0807FBEC @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _0807FBEC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
_0807FBE6:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
-_0807FBEC: .4byte sub_80568E0
+_0807FBEC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_807FBA0
thumb_func_start sub_807FBF0
@@ -703,7 +703,7 @@ sub_807FBF0: @ 807FBF0
bl CpuSet
movs r0, 0
movs r1, 0x80
- bl sub_80072E8
+ bl ResetOamRange
ldr r4, _0807FC28 @ =gUnknown_2023E8A
ldrb r0, [r4]
bl sub_80800D0
@@ -711,7 +711,7 @@ sub_807FBF0: @ 807FBF0
cmp r1, 0
beq _0807FC30
ldr r0, _0807FC2C @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
b _0807FC4C
.align 2, 0
_0807FC24: .4byte 0x01000100
@@ -731,8 +731,8 @@ _0807FC40:
movs r0, 0x1
strh r0, [r1]
_0807FC46:
- ldr r0, _0807FC58 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _0807FC58 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
_0807FC4C:
add sp, 0x4
pop {r4}
@@ -740,7 +740,7 @@ _0807FC4C:
bx r0
.align 2, 0
_0807FC54: .4byte gUnknown_20370D0
-_0807FC58: .4byte sub_80568E0
+_0807FC58: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_807FBF0
thumb_func_start sub_807FC5C
@@ -751,7 +751,7 @@ sub_807FC5C: @ 807FC5C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -862,7 +862,7 @@ _0807FD2C:
b _0807FD88
_0807FD58:
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0807FD86
@@ -901,7 +901,7 @@ sub_807FD90: @ 807FD90
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -960,7 +960,7 @@ _0807FDFE:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -970,12 +970,12 @@ _0807FDFE:
beq _0807FE42
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0807FE42
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r0, r7, r0
lsls r0, 24
lsrs r7, r0, 24
@@ -1131,7 +1131,7 @@ sub_807FF34: @ 807FF34
lsrs r5, r0, 24
ldr r0, _0807FF64 @ =gUnknown_202402C
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1286,7 +1286,7 @@ sub_8080060: @ 8080060
push {r4,lr}
ldr r0, _08080084 @ =gUnknown_202402C
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1511,7 +1511,7 @@ sub_80801F0: @ 80801F0
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
ldr r1, _08080224 @ =gUnknown_3005074
strb r0, [r1]
_08080212:
@@ -1661,8 +1661,8 @@ sub_8080334: @ 8080334
adds r0, r1, 0
bl sub_8080228
ldr r0, _08080374 @ =gUnknown_81A4EB4
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -1703,12 +1703,12 @@ sub_8080398: @ 8080398
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806365C
+ bl npc_running_behaviour_by_direction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
pop {r4}
pop {r0}
bx r0
@@ -1770,8 +1770,8 @@ sub_8080410: @ 8080410
bx r0
thumb_func_end sub_8080410
- thumb_func_start sub_8080424
-sub_8080424: @ 8080424
+ thumb_func_start HasTrainerAlreadyBeenFought
+HasTrainerAlreadyBeenFought: @ 8080424
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -1783,10 +1783,10 @@ sub_8080424: @ 8080424
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8080424
+ thumb_func_end HasTrainerAlreadyBeenFought
- thumb_func_start sub_808043C
-sub_808043C: @ 808043C
+ thumb_func_start trainer_flag_set
+trainer_flag_set: @ 808043C
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -1796,10 +1796,10 @@ sub_808043C: @ 808043C
bl sub_806E680
pop {r0}
bx r0
- thumb_func_end sub_808043C
+ thumb_func_end trainer_flag_set
- thumb_func_start sub_8080450
-sub_8080450: @ 8080450
+ thumb_func_start trainer_flag_clear
+trainer_flag_clear: @ 8080450
push {lr}
lsls r0, 16
movs r1, 0xA0
@@ -1809,7 +1809,7 @@ sub_8080450: @ 8080450
bl sub_806E6A8
pop {r0}
bx r0
- thumb_func_end sub_8080450
+ thumb_func_end trainer_flag_clear
thumb_func_start sub_8080464
sub_8080464: @ 8080464
@@ -1836,7 +1836,7 @@ _0808048C:
ldr r0, _080804A8 @ =sub_80804AC
str r0, [r1, 0x8]
bl sub_807F868
- bl sub_8069B28
+ bl ScriptContext1_Stop
pop {r4}
pop {r0}
bx r0
@@ -1878,14 +1878,14 @@ _080804E8:
movs r1, 0
strh r1, [r0]
_080804EE:
- ldr r0, _08080504 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _08080504 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
bl sub_80803FC
bl sub_81139BC
b _0808054E
.align 2, 0
_08080500: .4byte gUnknown_20370D0
-_08080504: .4byte sub_80568E0
+_08080504: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080508:
ldr r0, _0808051C @ =gUnknown_20386AE
ldrh r1, [r0]
@@ -1893,12 +1893,12 @@ _08080508:
lsls r0, 3
cmp r1, r0
bne _08080524
- ldr r0, _08080520 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _08080520 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
b _0808054E
.align 2, 0
_0808051C: .4byte gUnknown_20386AE
-_08080520: .4byte sub_80568E0
+_08080520: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080524:
ldr r0, _08080538 @ =gUnknown_2023E8A
ldrb r0, [r0]
@@ -1907,21 +1907,21 @@ _08080524:
bne _08080540
_08080530:
ldr r0, _0808053C @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
b _0808054E
.align 2, 0
_08080538: .4byte gUnknown_2023E8A
_0808053C: .4byte sub_80566A4
_08080540:
- ldr r0, _08080554 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _08080554 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
bl sub_80803FC
bl sub_81139BC
_0808054E:
pop {r0}
bx r0
.align 2, 0
-_08080554: .4byte sub_80568E0
+_08080554: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80804AC
thumb_func_start sub_8080558
@@ -1933,12 +1933,12 @@ sub_8080558: @ 8080558
lsls r0, 3
cmp r1, r0
bne _08080578
- ldr r0, _08080574 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _08080574 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
b _080805A6
.align 2, 0
_08080570: .4byte gUnknown_20386AE
-_08080574: .4byte sub_80568E0
+_08080574: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08080578:
ldr r0, _0808058C @ =gUnknown_2023E8A
ldrb r0, [r0]
@@ -1946,14 +1946,14 @@ _08080578:
cmp r0, 0x1
bne _08080594
ldr r0, _08080590 @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
b _080805A6
.align 2, 0
_0808058C: .4byte gUnknown_2023E8A
_08080590: .4byte sub_80566A4
_08080594:
- ldr r0, _080805AC @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _080805AC @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
bl sub_80803FC
bl sub_810CDE8
bl sub_81138F8
@@ -1961,7 +1961,7 @@ _080805A6:
pop {r0}
bx r0
.align 2, 0
-_080805AC: .4byte sub_80568E0
+_080805AC: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_8080558
thumb_func_start sub_80805B0
@@ -1974,7 +1974,7 @@ sub_80805B0: @ 80805B0
ldr r0, _080805D4 @ =sub_8080558
str r0, [r1, 0x8]
bl sub_807F868
- bl sub_8069B28
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -2094,7 +2094,7 @@ _080806B4: .4byte 0x0000011d
_080806B8:
ldr r0, _080806C4 @ =0x0000011b
_080806BA:
- bl sub_8071A74
+ bl PlayNewMapMusic
_080806BE:
pop {r0}
bx r0
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 852934e2e..2f3bf45d5 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -328,7 +328,7 @@ _080E5BD8:
.align 2, 0
_080E5BE8: .4byte gUnknown_300500C
_080E5BEC:
- bl sub_8044EC8
+ bl Random
ldr r1, _080E5C20 @ =gUnknown_300500C
ldr r4, [r1]
lsls r0, 16
@@ -418,7 +418,7 @@ _080E5C90:
adds r7, r6, 0
mov r8, r5
_080E5CA2:
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r2, r1, 2
@@ -488,7 +488,7 @@ _080E5D2C:
adds r7, r6, 0
mov r8, r5
_080E5D30:
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r0, r1, 2
@@ -556,7 +556,7 @@ _080E5DB4: .4byte 0x0000056c
_080E5DB8:
adds r7, r5, 0
_080E5DBA:
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
lsls r0, r1, 4
@@ -895,7 +895,7 @@ _080E602C:
adds r5, r7, 0
cmp r5, 0x4
ble _080E5FC2
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r8
@@ -1133,7 +1133,7 @@ sub_80E61DC: @ 80E61DC
add r4, sp, 0xC
movs r0, 0xFF
strb r0, [r4]
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r1, _080E6210 @ =gUnknown_300500C
ldr r0, [r1]
ldr r2, _080E6214 @ =0x0000056c
@@ -1300,7 +1300,7 @@ _080E6328:
str r0, [sp, 0x20]
movs r6, 0
_080E6340:
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
ldr r2, [sp, 0x1C]
@@ -1342,7 +1342,7 @@ _080E6388:
movs r1, 0xB
movs r2, 0
str r3, [sp, 0x24]
- bl sub_803FBE8
+ bl GetMonData
ldr r3, [sp, 0x24]
ldrh r2, [r3]
cmp r0, r2
@@ -1366,14 +1366,14 @@ _080E63B8:
movs r1, 0xC
movs r2, 0
str r3, [sp, 0x24]
- bl sub_803FBE8
+ bl GetMonData
ldr r3, [sp, 0x24]
cmp r0, 0
beq _080E63E8
adds r0, r4, 0
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, r8
ldrb r1, [r2, 0x2]
lsls r1, 1
@@ -1426,7 +1426,7 @@ _080E6412:
str r2, [sp]
ldr r2, [sp, 0x10]
ldr r3, [sp, 0x14]
- bl sub_803E01C
+ bl CreateMonWithEVSpread
movs r5, 0
adds r0, r6, 0x1
mov r9, r0
@@ -1444,7 +1444,7 @@ _080E6452:
lsrs r2, 24
adds r0, r7, r3
str r3, [sp, 0x24]
- bl sub_803E964
+ bl SetMonMoveSlot
ldrh r0, [r4]
ldr r3, [sp, 0x24]
cmp r0, 0xDA
@@ -1502,7 +1502,7 @@ sub_80E64C0: @ 80E64C0
adds r5, r0, 0
lsls r1, 24
lsrs r4, r1, 24
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -1514,7 +1514,7 @@ sub_80E64C0: @ 80E64C0
bne _080E64EC
ldr r0, _080E6514 @ =gUnknown_2021CD0
ldr r1, _080E6518 @ =gUnknown_83FE859
- bl sub_8008DA4
+ bl StringAppend
_080E64EC:
adds r0, r4, 0x1
lsls r0, 24
@@ -1526,7 +1526,7 @@ _080E64EC:
ldr r0, _080E651C @ =gUnknown_8245EE0
adds r1, r0
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
cmp r4, 0x5
beq _080E6538
cmp r4, 0x5
@@ -1547,14 +1547,14 @@ _080E6520:
_080E652A:
ldr r1, _080E6534 @ =gUnknown_83FE85E
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
b _080E6554
.align 2, 0
_080E6534: .4byte gUnknown_83FE85E
_080E6538:
ldr r0, _080E6544 @ =gUnknown_2021CD0
ldr r1, _080E6548 @ =gUnknown_83FE85C
- bl sub_8008DA4
+ bl StringAppend
b _080E6554
.align 2, 0
_080E6544: .4byte gUnknown_2021CD0
@@ -1562,7 +1562,7 @@ _080E6548: .4byte gUnknown_83FE85C
_080E654C:
ldr r0, _080E655C @ =gUnknown_2021CD0
ldr r1, _080E6560 @ =gUnknown_83FE859
- bl sub_8008DA4
+ bl StringAppend
_080E6554:
adds r0, r4, 0
pop {r4-r6}
@@ -1723,7 +1723,7 @@ _080E6662:
adds r5, r0
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r8
lsls r1, 16
@@ -1731,19 +1731,19 @@ _080E6662:
mov r8, r1
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
adds r0, r5, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -1795,7 +1795,7 @@ _080E66F2:
_080E6704:
ldr r4, _080E672C @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r7, r0, 16
subs r0, r7, 0x1
@@ -1820,7 +1820,7 @@ _080E6740:
ldr r1, _080E674C @ =gUnknown_83FE864
_080E6742:
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _080E6770
.align 2, 0
_080E674C: .4byte gUnknown_83FE864
@@ -1991,7 +1991,7 @@ _080E6874:
ldr r0, [r6]
adds r0, r1
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
ldr r0, _080E68A8 @ =gUnknown_2024284
@@ -2010,14 +2010,14 @@ _080E68A8: .4byte gUnknown_2024284
_080E68AC:
bl sub_80E7550
_080E68B0:
- ldr r0, _080E68C0 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _080E68C0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
add sp, 0x4
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
-_080E68C0: .4byte sub_80568E0
+_080E68C0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80E6854
thumb_func_start sub_80E68C4
@@ -2035,9 +2035,9 @@ sub_80E68C4: @ 80E68C4
str r1, [r0, 0x8]
bl sub_80563F0
ldr r0, _080E68FC @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080E68EC:
pop {r4}
pop {r0}
@@ -2093,7 +2093,7 @@ _080E6948:
ldr r0, _080E6990 @ =gUnknown_2024284
adds r0, r4, r0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r4, 0x38
@@ -2108,7 +2108,7 @@ _080E6948:
_080E6970:
ldr r0, _080E6994 @ =sub_80E68C4
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
movs r0, 0
bl sub_8044090
bl sub_8080060
@@ -2121,7 +2121,7 @@ _080E698C: .4byte gUnknown_3005008
_080E6990: .4byte gUnknown_2024284
_080E6994: .4byte sub_80E68C4
_080E6998:
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
movs r5, 0
ldr r4, _080E69F0 @ =gUnknown_300500C
_080E69A0:
@@ -2148,7 +2148,7 @@ _080E69A0:
strh r0, [r1]
ldr r0, _080E6A08 @ =sub_80E68C4
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
movs r0, 0
bl sub_8044090
bl sub_8080060
@@ -2802,7 +2802,7 @@ _080E6F0E:
bl sub_805490C
adds r0, r5, 0x4
ldr r1, [r4]
- bl sub_8008D54
+ bl StringCopy7
adds r0, r6, 0
bl sub_80E7188
strh r0, [r5, 0x2]
@@ -2921,7 +2921,7 @@ _080E7016:
orrs r0, r2
strb r0, [r1]
movs r0, 0x2
- bl sub_80DA364
+ bl TrySavingData
pop {r4,r5}
pop {r0}
bx r0
@@ -3160,7 +3160,7 @@ sub_80E71D0: @ 80E71D0
subs r0, 0x1
cmp r0, 0x5
ble _080E7220
- bl sub_8044EC8
+ bl Random
ldr r4, [r4]
ldr r5, _080E721C @ =gUnknown_84020E6
lsls r0, 16
@@ -3180,7 +3180,7 @@ _080E7214: .4byte gUnknown_300500C
_080E7218: .4byte 0x0000055c
_080E721C: .4byte gUnknown_84020E6
_080E7220:
- bl sub_8044EC8
+ bl Random
ldr r4, [r4]
ldr r5, _080E7248 @ =gUnknown_84020DA
lsls r0, 16
@@ -3298,7 +3298,7 @@ _080E72EA:
adds r4, r1, r0
adds r0, r4, 0
adds r1, r7, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080E731A
movs r0, 0x1
@@ -3372,7 +3372,7 @@ _080E7372:
bl sub_805490C
adds r0, r7, 0x4
ldr r1, [r5]
- bl sub_8008D54
+ bl StringCopy7
movs r0, 0x1
strh r0, [r7, 0x2]
movs r6, 0x7
diff --git a/asm/battle_transition.s b/asm/battle_transition.s
index e1efd07cb..1d8f0275e 100644
--- a/asm/battle_transition.s
+++ b/asm/battle_transition.s
@@ -13,7 +13,7 @@ sub_80D08B8: @ 80D08B8
lsrs r4, 24
ldr r5, _080D08DC @ =gUnknown_2039A2C
movs r0, 0x3C
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
ldr r1, _080D08E0 @ =gUnknown_30030F0
ldr r0, _080D08E4 @ =sub_80565A8
@@ -43,7 +43,7 @@ sub_80D08E8: @ 80D08E8
sub_80D08F8: @ 80D08F8
push {r4,r5,lr}
ldr r0, _080D091C @ =sub_80D0978
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080D0920 @ =gUnknown_3005090
@@ -64,11 +64,11 @@ _080D0924:
bl sub_80D3DD0
ldr r4, _080D0944 @ =gUnknown_2039A2C
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x1
_080D093C:
pop {r4,r5}
@@ -86,7 +86,7 @@ sub_80D0948: @ 80D0948
lsrs r4, 24
ldr r0, _080D0970 @ =sub_80D0978
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080D0974 @ =gUnknown_3005090
@@ -161,7 +161,7 @@ _080D09E4: .4byte 0x04000100
_080D09E8: .4byte gUnknown_83FA320
_080D09EC:
movs r1, 0x4
- bl sub_807741C
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -182,7 +182,7 @@ sub_80D0A00: @ 80D0A00
lsls r0, 2
adds r0, r1
ldr r0, [r0]
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -213,7 +213,7 @@ sub_80D0A34: @ 80D0A34
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -237,7 +237,7 @@ sub_80D0A5C: @ 80D0A5C
lsls r0, 2
adds r0, r1
ldr r0, [r0]
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -288,7 +288,7 @@ _080D0AC4:
cmp r0, 0
beq _080D0AD4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080D0AD4:
add sp, 0x4
pop {r4}
@@ -332,16 +332,16 @@ sub_80D0B14: @ 80D0B14
adds r4, r0, 0
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0x40
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0xC
movs r1, 0x40
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0xE
movs r1, 0x40
- bl sub_8000AF4
+ bl SetGpuRegBits
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -380,7 +380,7 @@ _080D0B5E:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080D0B80:
ldrh r1, [r4, 0xC]
movs r0, 0xF
@@ -388,7 +388,7 @@ _080D0B80:
lsls r1, r0, 4
orrs r1, r0
movs r0, 0x4C
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xC
ldrsh r0, [r4, r1]
cmp r0, 0xE
@@ -414,10 +414,10 @@ sub_80D0BA8: @ 80D0BA8
cmp r0, 0
bne _080D0BC4
ldr r0, _080D0BD0 @ =sub_80D0ADC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D0BC4:
movs r0, 0
pop {r1}
@@ -463,7 +463,7 @@ sub_80D0C0C: @ 80D0C0C
sub sp, 0x8
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
movs r0, 0x1
negs r0, r0
movs r4, 0
@@ -471,7 +471,7 @@ sub_80D0C0C: @ 80D0C0C
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080D0C68 @ =gUnknown_2038E80
ldr r1, _080D0C6C @ =gUnknown_2039A2C
ldr r1, [r1]
@@ -484,11 +484,11 @@ sub_80D0C0C: @ 80D0C0C
movs r3, 0x2
bl sub_80D3E74
ldr r0, _080D0C70 @ =sub_80D0CF0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080D0C74 @ =sub_80D0D28
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0x3
- bl sub_8000B68
+ bl EnableInterrupts
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -540,10 +540,10 @@ sub_80D0C78: @ 80D0C78
cmp r0, 0
bne _080D0CCA
ldr r0, _080D0CEC @ =sub_80D0BD4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D0CCA:
ldr r0, [r4]
ldrb r1, [r0]
@@ -651,7 +651,7 @@ sub_80D0D8C: @ 80D0D8C
sub sp, 0x4
adds r4, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -659,7 +659,7 @@ sub_80D0D8C: @ 80D0D8C
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080D0DE0 @ =gUnknown_2039A2C
ldr r1, [r0]
ldr r0, _080D0DE4 @ =gUnknown_2038E80
@@ -669,11 +669,11 @@ sub_80D0D8C: @ 80D0D8C
lsls r2, 1
bl memset
ldr r0, _080D0DE8 @ =sub_80D0E80
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080D0DEC @ =sub_80D0EB8
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0x3
- bl sub_8000B68
+ bl EnableInterrupts
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -714,7 +714,7 @@ sub_80D0DF0: @ 80D0DF0
_080D0E18:
lsrs r0, r4, 8
asrs r1, r7, 16
- bl sub_8044E30
+ bl Sin
ldr r1, _080D0E74 @ =gUnknown_2038700
lsls r2, r5, 1
adds r2, r1
@@ -740,10 +740,10 @@ _080D0E18:
cmp r0, 0
bne _080D0E5E
ldr r0, _080D0E7C @ =sub_80D0D54
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D0E5E:
ldr r0, [r6]
ldrb r1, [r0]
@@ -850,7 +850,7 @@ sub_80D0F1C: @ 80D0F1C
sub sp, 0xC
adds r4, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
movs r1, 0
movs r0, 0x10
strh r0, [r4, 0xA]
@@ -890,7 +890,7 @@ _080D0F64:
cmp r1, 0x9F
bls _080D0F64
ldr r0, _080D0FC4 @ =sub_80D1370
- bl sub_80006F4
+ bl SetVBlankCallback
adds r0, r5, 0
adds r1, r6, 0
bl sub_80D3E28
@@ -909,7 +909,7 @@ _080D0F64:
ldr r0, _080D0FD0 @ =gUnknown_83FA638
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -1294,10 +1294,10 @@ _080D125E:
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, _080D12DC @ =sub_80D0EE4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D129A:
ldrh r1, [r4, 0xE]
movs r2, 0xE
@@ -1307,7 +1307,7 @@ _080D129A:
adds r0, r1, 0x1
strh r0, [r4, 0xE]
ldr r0, _080D12E0 @ =sub_80D139C
- bl sub_80006F4
+ bl SetVBlankCallback
_080D12AE:
ldr r0, _080D12C4 @ =gUnknown_2039A2C
ldr r1, [r0]
@@ -1363,23 +1363,23 @@ _080D131C:
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xE]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x10]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -1486,7 +1486,7 @@ sub_80D1400: @ 80D1400
ldr r0, _080D1448 @ =gUnknown_83FA638
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -1517,7 +1517,7 @@ sub_80D144C: @ 80D144C
adds r0, r4, 0
movs r2, 0xA
bl memcpy
- bl sub_8044EC8
+ bl Random
movs r5, 0x1
ands r5, r0
movs r1, 0
@@ -1543,7 +1543,7 @@ _080D147A:
ldrsh r0, [r0, r1]
str r0, [r6, 0xC]
movs r0, 0x2D
- bl sub_8083444
+ bl FieldEffectStart
adds r4, 0x1
lsls r4, 16
movs r0, 0x1
@@ -1574,16 +1574,16 @@ _080D14D4: .4byte gUnknown_20386E0
sub_80D14D8: @ 80D14D8
push {lr}
movs r0, 0x2D
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _080D14F8
bl sub_80D3E60
ldr r0, _080D1500 @ =sub_80D13C8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D14F8:
movs r0, 0
pop {r1}
@@ -1602,7 +1602,7 @@ sub_80D1504: @ 80D1504
movs r3, 0x4
ldrsh r2, [r5, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, _080D1568 @ =gUnknown_202063C
@@ -1629,10 +1629,10 @@ sub_80D1504: @ 80D1504
ldr r0, _080D156C @ =0x0000ffff
strh r0, [r4, 0x32]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
ldrb r1, [r5, 0x8]
adds r0, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -1684,7 +1684,7 @@ _080D1594:
beq _080D1606
strh r1, [r4, 0x32]
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
lsls r0, 16
lsrs r0, 24
movs r1, 0x1F
@@ -1737,7 +1737,7 @@ _080D1606:
bls _080D162A
adds r0, r4, 0
movs r1, 0x2D
- bl sub_80836D8
+ bl FieldEffectStop
_080D162A:
add sp, 0x4
pop {r4-r6}
@@ -1782,7 +1782,7 @@ sub_80D1670: @ 80D1670
push {r4,lr}
adds r4, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _080D16C4 @ =gUnknown_2039A2C
ldr r1, [r0]
movs r0, 0
@@ -1806,7 +1806,7 @@ _080D1696:
cmp r1, 0x9F
bls _080D1696
ldr r0, _080D16D4 @ =sub_80D1ABC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080D16C4 @ =gUnknown_2039A2C
ldr r1, [r0]
movs r0, 0x78
@@ -2326,10 +2326,10 @@ sub_80D1A7C: @ 80D1A7C
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, _080D1AB8 @ =sub_80D1638
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -2373,22 +2373,22 @@ _080D1AF4:
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080D1B48 @ =gUnknown_2038700
movs r0, 0xF0
lsls r0, 3
adds r4, r0
ldrh r1, [r4]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
str r4, [r5]
ldr r0, _080D1B50 @ =0x04000040
str r0, [r5, 0x4]
@@ -2445,7 +2445,7 @@ sub_80D1B90: @ 80D1B90
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
movs r2, 0
ldr r4, _080D1BD8 @ =gUnknown_2038E80
ldr r3, _080D1BDC @ =gUnknown_2039A2C
@@ -2461,11 +2461,11 @@ _080D1BA2:
cmp r2, 0x9F
bls _080D1BA2
ldr r0, _080D1BE0 @ =sub_80D1CC8
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080D1BE4 @ =sub_80D1D00
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0x2
- bl sub_8000B68
+ bl EnableInterrupts
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -2518,7 +2518,7 @@ _080D1C24:
_080D1C28:
lsrs r0, r4, 8
asrs r1, r7, 16
- bl sub_8044E30
+ bl Sin
ldr r1, _080D1CBC @ =gUnknown_2038700
lsls r2, r5, 1
adds r2, r1
@@ -2553,7 +2553,7 @@ _080D1C28:
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080D1C78:
movs r5, 0x10
ldrsh r0, [r6, r5]
@@ -2566,10 +2566,10 @@ _080D1C78:
cmp r0, 0
bne _080D1C9A
ldr r0, _080D1CC4 @ =sub_80D1B58
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D1C9A:
ldr r0, _080D1CB4 @ =gUnknown_2039A2C
ldr r1, [r0]
@@ -2680,7 +2680,7 @@ sub_80D1D64: @ 80D1D64
push {r4,lr}
adds r4, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _080D1DB0 @ =gUnknown_2039A2C
ldr r1, [r0]
movs r2, 0
@@ -2704,7 +2704,7 @@ _080D1D8A:
cmp r1, 0x9F
bls _080D1D8A
ldr r0, _080D1DB8 @ =sub_80D1E98
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -2743,7 +2743,7 @@ sub_80D1DBC: @ 80D1DBC
_080D1DE4:
adds r0, r5, 0
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0xA]
adds r0, r1
lsls r0, 16
@@ -2817,10 +2817,10 @@ sub_80D1E58: @ 80D1E58
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, _080D1E94 @ =sub_80D1D2C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -2864,15 +2864,15 @@ _080D1ED0:
ldr r0, [r5]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D1F20 @ =gUnknown_2038E80
str r0, [r4]
ldr r0, _080D1F24 @ =0x04000040
@@ -2998,7 +2998,7 @@ _080D1FE6:
asrs r4, r0, 16
mov r0, r10
adds r1, r4, 0
- bl sub_8044E30
+ bl Sin
movs r5, 0x50
subs r0, r5, r0
lsls r0, 16
@@ -3006,7 +3006,7 @@ _080D1FE6:
mov r0, r10
adds r1, r4, 0
str r2, [sp, 0x10]
- bl sub_8044E4C
+ bl Cos
adds r0, 0x78
lsls r0, 16
lsrs r7, r0, 16
@@ -3016,13 +3016,13 @@ _080D1FE6:
asrs r4, 16
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8044E30
+ bl Sin
subs r5, r0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8044E4C
+ bl Cos
adds r0, 0x78
lsls r0, 16
lsrs r3, r0, 16
@@ -3354,7 +3354,7 @@ _080D2274:
adds r1, r5
lsls r1, 16
asrs r1, 16
- bl sub_8044E30
+ bl Sin
lsls r0, 16
lsrs r2, r0, 16
cmp r4, 0
@@ -3718,7 +3718,7 @@ sub_80D253C: @ 80D253C
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _080D25A0 @ =gUnknown_2039A2C
ldr r1, [r0]
movs r4, 0
@@ -3750,7 +3750,7 @@ sub_80D253C: @ 80D253C
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
ldr r0, _080D25C0 @ =sub_80D2698
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -3903,10 +3903,10 @@ sub_80D2698: @ 80D2698
cmp r3, 0
beq _080D26E4
ldr r0, _080D26E0 @ =sub_80D1F2C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
b _080D2746
.align 2, 0
_080D26D0: .4byte 0x040000b0
@@ -3933,26 +3933,26 @@ _080D2700:
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xC]
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080D275C @ =gUnknown_2038700
ldrh r1, [r4]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2]
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
str r4, [r5]
ldr r0, _080D2760 @ =0x04000040
str r0, [r5, 0x4]
@@ -4103,7 +4103,7 @@ sub_80D2840: @ 80D2840
push {r4,lr}
adds r4, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
adds r0, r4, 0
bl sub_80D2EA4
movs r0, 0
@@ -4133,7 +4133,7 @@ _080D2874:
cmp r1, 0x9F
bls _080D2874
ldr r0, _080D28A4 @ =sub_80D2D50
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -4172,7 +4172,7 @@ sub_80D28A8: @ 80D28A8
ldr r0, [r0]
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080D295C @ =gUnknown_83FA754
ldr r0, _080D2960 @ =gUnknown_300500C
ldr r0, [r0]
@@ -4182,7 +4182,7 @@ sub_80D28A8: @ 80D28A8
ldr r0, [r0]
movs r1, 0xFA
movs r2, 0xC
- bl sub_80703EC
+ bl LoadPalette
movs r1, 0
ldr r5, [sp]
movs r0, 0xF0
@@ -4216,9 +4216,9 @@ _080D2902:
cmp r0, 0x13
ble _080D28FC
movs r0, 0x2
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _080D2964 @ =sub_80D2E6C
- bl sub_8000700
+ bl SetHBlankCallback
mov r2, r8
ldrh r0, [r2, 0x8]
adds r0, 0x1
@@ -4257,7 +4257,7 @@ sub_80D2968: @ 80D2968
_080D2982:
adds r0, r5, 0
movs r1, 0x10
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0xC]
adds r0, r1
lsls r0, 16
@@ -4288,7 +4288,7 @@ _080D29A2:
_080D29BC:
adds r0, r5, 0
movs r1, 0x10
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0xE]
subs r1, r0
lsls r1, 16
@@ -4488,7 +4488,7 @@ sub_80D2B0C: @ 80D2B0C
movs r0, 0
strb r0, [r1]
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r1, _080D2BB0 @ =0x040000b0
ldrh r2, [r1, 0xA]
ldr r0, _080D2BB4 @ =0x0000c5ff
@@ -4515,10 +4515,10 @@ sub_80D2B0C: @ 80D2B0C
bl memset
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -4529,7 +4529,7 @@ sub_80D2B0C: @ 80D2B0C
movs r0, 0xBF
strh r0, [r1, 0xE]
ldr r0, _080D2BC0 @ =sub_80D2DEC
- bl sub_80006F4
+ bl SetVBlankCallback
_080D2BA0:
movs r0, 0
pop {r3}
@@ -4668,7 +4668,7 @@ sub_80D2C8C: @ 80D2C8C
negs r0, r0
ldr r2, _080D2CC0 @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, [r5]
movs r0, 0xFF
strh r0, [r1, 0xE]
@@ -4741,10 +4741,10 @@ sub_80D2D10: @ 80D2D10
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, [r4]
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r4}
pop {r1}
@@ -4788,19 +4788,19 @@ _080D2D88:
ldr r0, [r5]
ldrh r1, [r0, 0x1C]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D2DE0 @ =gUnknown_2038E80
str r0, [r4]
ldr r0, _080D2DE4 @ =0x04000040
@@ -4857,7 +4857,7 @@ _080D2E24:
ldr r0, [r2]
ldrh r1, [r0, 0xE]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D2E60 @ =gUnknown_2038E80
str r0, [r4]
ldr r0, _080D2E64 @ =0x04000054
@@ -4990,7 +4990,7 @@ sub_80D2EA4: @ 80D2EA4
ldrb r0, [r6, 0x1]
orrs r0, r1
strb r0, [r6, 0x1]
- bl sub_8008594
+ bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
movs r3, 0x1F
@@ -5005,7 +5005,7 @@ sub_80D2EA4: @ 80D2EA4
ands r1, r2
orrs r1, r0
strb r1, [r5, 0x3]
- bl sub_8008594
+ bl AllocOamMatrix
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -5037,12 +5037,12 @@ sub_80D2EA4: @ 80D2EA4
movs r1, 0x1
movs r2, 0x3
movs r3, 0x3
- bl sub_80073F0
+ bl CalcCenterToCornerVec
adds r0, r6, 0
movs r1, 0x1
movs r2, 0x3
movs r3, 0x3
- bl sub_80073F0
+ bl CalcCenterToCornerVec
ldrb r0, [r5, 0x3]
lsls r0, 26
lsrs r0, 27
@@ -5057,7 +5057,7 @@ sub_80D2EA4: @ 80D2EA4
movs r4, 0
ldrsh r2, [r3, r4]
movs r3, 0
- bl sub_800865C
+ bl SetOamMatrixRotationScaling
ldrb r0, [r6, 0x3]
lsls r0, 26
lsrs r0, 27
@@ -5065,7 +5065,7 @@ sub_80D2EA4: @ 80D2EA4
movs r2, 0x80
lsls r2, 2
movs r3, 0
- bl sub_800865C
+ bl SetOamMatrixRotationScaling
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -5321,7 +5321,7 @@ sub_80D31A4: @ 80D31A4
push {r4-r6,lr}
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
movs r3, 0
movs r0, 0x80
lsls r0, 1
@@ -5355,11 +5355,11 @@ _080D31D0:
cmp r3, 0x9F
bls _080D31D0
movs r0, 0x2
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _080D3218 @ =sub_80D332C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080D321C @ =sub_80D33C0
- bl sub_8000700
+ bl SetHBlankCallback
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -5499,10 +5499,10 @@ sub_80D32EC: @ 80D32EC
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, _080D3328 @ =sub_80D316C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -5531,15 +5531,15 @@ sub_80D332C: @ 80D332C
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrb r0, [r0]
cmp r0, 0
@@ -5637,7 +5637,7 @@ sub_80D3424: @ 80D3424
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _080D348C @ =gUnknown_2039A2C
ldr r1, [r0]
movs r2, 0
@@ -5669,11 +5669,11 @@ _080D3450:
cmp r1, 0x9F
bls _080D3450
movs r0, 0x2
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _080D3494 @ =sub_80D36E0
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _080D3498 @ =sub_80D35F4
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -5701,7 +5701,7 @@ sub_80D349C: @ 80D349C
movs r4, 0
_080D34B0:
ldr r0, _080D3508 @ =sub_80D3720
- bl sub_800704C
+ bl CreateInvisibleSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -5764,7 +5764,7 @@ sub_80D3510: @ 80D3510
negs r0, r0
ldr r2, _080D3548 @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -5798,9 +5798,9 @@ sub_80D354C: @ 80D354C
strh r0, [r1, 0xA]
ldrh r0, [r1, 0xA]
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
ldr r1, [r5]
movs r0, 0xF0
strh r0, [r1, 0x6]
@@ -5811,7 +5811,7 @@ sub_80D354C: @ 80D354C
strh r0, [r1, 0x2]
strh r4, [r1, 0x20]
ldr r0, _080D35B0 @ =sub_80D3690
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -5847,10 +5847,10 @@ sub_80D35B4: @ 80D35B4
bls _080D35E6
bl sub_80D3E60
ldr r0, _080D35F0 @ =sub_80D33EC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D35E6:
movs r0, 0
pop {r1}
@@ -5878,19 +5878,19 @@ sub_80D35F4: @ 80D35F4
ldr r0, [r4]
ldrh r1, [r0, 0xE]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x6]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrb r0, [r0]
cmp r0, 0
@@ -5937,27 +5937,27 @@ sub_80D3690: @ 80D3690
ldr r0, [r4]
ldrh r1, [r0, 0x12]
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xE]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x6]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -6125,7 +6125,7 @@ _080D37FC:
adds r0, 0x1
strh r0, [r1, 0x20]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080D380A:
pop {r4-r7}
pop {r0}
@@ -6189,7 +6189,7 @@ sub_80D3850: @ 80D3850
ldr r0, _080D38A0 @ =gUnknown_83FA638
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -6261,10 +6261,10 @@ sub_80D38FC: @ 80D38FC
bne _080D391C
bl sub_80D3E60
ldr r0, _080D3924 @ =sub_80D3818
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080D391C:
movs r0, 0
pop {r1}
@@ -6308,7 +6308,7 @@ sub_80D3960: @ 80D3960
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80D3DD0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _080D39B8 @ =gUnknown_2039A2C
ldr r1, [r0]
movs r2, 0
@@ -6337,7 +6337,7 @@ _080D3984:
movs r2, 0xA0
bl CpuSet
ldr r0, _080D39C0 @ =sub_80D3BA4
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -6555,10 +6555,10 @@ sub_80D3B1C: @ 80D3B1C
ldrh r0, [r1, 0xA]
bl sub_80D3E60
ldr r0, _080D3B64 @ =sub_80D3928
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
b _080D3B80
.align 2, 0
@@ -6639,22 +6639,22 @@ _080D3BDC:
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080D3C30 @ =gUnknown_2038700
movs r0, 0xF0
lsls r0, 3
adds r4, r0
ldrh r1, [r4]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
str r4, [r5]
ldr r0, _080D3C38 @ =0x04000040
str r0, [r5, 0x4]
@@ -6701,7 +6701,7 @@ sub_80D3C40: @ 80D3C40
ldr r0, _080D3C9C @ =sub_80D3CC4
movs r1, 0x3
str r3, [sp]
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080D3CA0 @ =gUnknown_3005090
@@ -6732,7 +6732,7 @@ _080D3CA0: .4byte gUnknown_3005090
sub_80D3CA4: @ 80D3CA4
push {lr}
ldr r0, _080D3CB8 @ =sub_80D3CC4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -6810,7 +6810,7 @@ _080D3D2C:
negs r0, r0
ldrb r1, [r4, 0x16]
ldr r2, _080D3D54 @ =0x00002d6b
- bl sub_80714D4
+ bl BlendPalettes
_080D3D38:
movs r2, 0x16
ldrsh r0, [r4, r2]
@@ -6861,7 +6861,7 @@ _080D3D86:
negs r0, r0
ldrb r1, [r4, 0x16]
ldr r2, _080D3DB8 @ =0x00002d6b
- bl sub_80714D4
+ bl BlendPalettes
_080D3D92:
movs r0, 0x16
ldrsh r1, [r4, r0]
@@ -6874,10 +6874,10 @@ _080D3D92:
cmp r0, 0
bne _080D3DC0
ldr r0, _080D3DBC @ =sub_80D3CC4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
b _080D3DC6
.align 2, 0
_080D3DB8: .4byte 0x00002d6b
@@ -6916,9 +6916,9 @@ _080D3DF0: .4byte gUnknown_2039A2C
thumb_func_start sub_80D3DF4
sub_80D3DF4: @ 80D3DF4
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80D3DF4
@@ -6928,7 +6928,7 @@ sub_80D3E08: @ 80D3E08
push {r4,lr}
adds r4, r0, 0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
lsls r0, 16
lsrs r0, 18
lsls r0, 30
@@ -6948,14 +6948,14 @@ sub_80D3E28: @ 80D3E28
adds r5, r0, 0
adds r6, r1, 0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r4, r0, 0
lsls r4, 16
lsrs r4, 24
movs r0, 0x1F
ands r4, r0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
lsls r0, 16
lsrs r0, 18
lsls r4, 11
@@ -6979,7 +6979,7 @@ sub_80D3E60: @ 80D3E60
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
pop {r0}
bx r0
thumb_func_end sub_80D3E60
@@ -7021,7 +7021,7 @@ _080D3EAC:
ands r0, r4
mov r2, r8
asrs r1, r2, 16
- bl sub_8044E30
+ bl Sin
lsls r1, r6, 1
add r1, r10
add r0, r9
@@ -7084,13 +7084,13 @@ _080D3F28:
asrs r0, r5, 16
mov r10, r0
ldr r1, [sp, 0x4]
- bl sub_8044E30
+ bl Sin
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r10
ldr r1, [sp, 0x4]
- bl sub_8044E4C
+ bl Cos
ldr r2, [sp]
lsls r1, r2, 16
asrs r1, 16
@@ -7155,7 +7155,7 @@ _080D3F94:
lsls r0, 16
asrs r0, 16
ldr r1, [sp, 0x4]
- bl sub_8044E4C
+ bl Cos
lsls r0, 16
asrs r0, 16
ldr r2, [sp, 0x8]
diff --git a/asm/battle_util.s b/asm/battle_util.s
index 89255c1e5..acf3e8889 100644
--- a/asm/battle_util.s
+++ b/asm/battle_util.s
@@ -74,7 +74,7 @@ _08016EB4:
_08016EB8:
movs r0, 0x1
_08016EBA:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r2, r0, 24
_08016EC2:
@@ -83,8 +83,8 @@ _08016EC2:
bx r1
thumb_func_end sub_8016E24
- thumb_func_start sub_8016EC8
-sub_8016EC8: @ 8016EC8
+ thumb_func_start PressurePPLose
+PressurePPLose: @ 8016EC8
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -172,9 +172,9 @@ _08016F26:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08016F7A:
add sp, 0x4
pop {r4-r7}
@@ -184,10 +184,10 @@ _08016F7A:
_08016F84: .4byte gUnknown_2023E0C
_08016F88: .4byte gUnknown_825E45C
_08016F8C: .4byte gUnknown_2023BC4
- thumb_func_end sub_8016EC8
+ thumb_func_end PressurePPLose
- thumb_func_start sub_8016F90
-sub_8016F90: @ 8016F90
+ thumb_func_start PressurePPLoseOnUsingImprision
+PressurePPLoseOnUsingImprision: @ 8016F90
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -199,7 +199,7 @@ sub_8016F90: @ 8016F90
movs r0, 0x4
mov r8, r0
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -217,7 +217,7 @@ sub_8016F90: @ 8016F90
_08016FC6:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
adds r6, r4, 0x1
@@ -322,9 +322,9 @@ _08017038:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080170A0:
add sp, 0x4
pop {r3-r5}
@@ -340,10 +340,10 @@ _080170B4: .4byte gUnknown_2023BE4
_080170B8: .4byte gUnknown_2023E0C
_080170BC: .4byte gUnknown_825E45C
_080170C0: .4byte gUnknown_2023BC4
- thumb_func_end sub_8016F90
+ thumb_func_end PressurePPLoseOnUsingImprision
- thumb_func_start sub_80170C4
-sub_80170C4: @ 80170C4
+ thumb_func_start PressurePPLoseOnUsingPerishSong
+PressurePPLoseOnUsingPerishSong: @ 80170C4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -459,9 +459,9 @@ _08017146:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_080171AA:
add sp, 0x4
pop {r3-r5}
@@ -479,10 +479,10 @@ _080171C8: .4byte gUnknown_2023C08
_080171CC: .4byte gUnknown_2023E0C
_080171D0: .4byte gUnknown_825E45C
_080171D4: .4byte gUnknown_2023BC4
- thumb_func_end sub_80170C4
+ thumb_func_end PressurePPLoseOnUsingPerishSong
- thumb_func_start sub_80171D8
-sub_80171D8: @ 80171D8
+ thumb_func_start MarkAllBufferBanksForExecution
+MarkAllBufferBanksForExecution: @ 80171D8
push {r4,r5,lr}
ldr r0, _08017208 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -538,10 +538,10 @@ _08017236:
_0801723C: .4byte gUnknown_2023BCC
_08017240: .4byte gUnknown_2023BC8
_08017244: .4byte gUnknown_825E45C
- thumb_func_end sub_80171D8
+ thumb_func_end MarkAllBufferBanksForExecution
- thumb_func_start sub_8017248
-sub_8017248: @ 8017248
+ thumb_func_start MarkBufferBankForExecution
+MarkBufferBankForExecution: @ 8017248
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -580,7 +580,7 @@ _0801728C:
.align 2, 0
_08017290: .4byte gUnknown_2023BC8
_08017294: .4byte gUnknown_825E45C
- thumb_func_end sub_8017248
+ thumb_func_end MarkBufferBankForExecution
thumb_func_start sub_8017298
sub_8017298: @ 8017298
@@ -624,8 +624,8 @@ _080172C2:
_080172E4: .4byte gUnknown_2023BC8
thumb_func_end sub_8017298
- thumb_func_start sub_80172E8
-sub_80172E8: @ 80172E8
+ thumb_func_start CancelMultiTurnMoves
+CancelMultiTurnMoves: @ 80172E8
lsls r0, 24
lsrs r0, 24
ldr r1, _08017338 @ =gUnknown_2023BE4
@@ -673,10 +673,10 @@ _08017344: .4byte 0xfffffcff
_08017348: .4byte gUnknown_2023DFC
_0801734C: .4byte 0xfffbff3f
_08017350: .4byte gUnknown_2023E0C
- thumb_func_end sub_80172E8
+ thumb_func_end CancelMultiTurnMoves
- thumb_func_start sub_8017354
-sub_8017354: @ 8017354
+ thumb_func_start WasUnableToUseMove
+WasUnableToUseMove: @ 8017354
push {lr}
lsls r0, 24
ldr r1, _080173A0 @ =gUnknown_2023E8C
@@ -722,10 +722,10 @@ _080173A4:
_080173A6:
pop {r1}
bx r1
- thumb_func_end sub_8017354
+ thumb_func_end WasUnableToUseMove
- thumb_func_start sub_80173AC
-sub_80173AC: @ 80173AC
+ thumb_func_start PrepareStringBattle
+PrepareStringBattle: @ 80173AC
push {r4,lr}
adds r2, r0, 0
lsls r2, 16
@@ -734,18 +734,18 @@ sub_80173AC: @ 80173AC
strb r1, [r4]
movs r0, 0
adds r1, r2, 0
- bl sub_800E2D4
+ bl EmitPrintString
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080173CC: .4byte gUnknown_2023BC4
- thumb_func_end sub_80173AC
+ thumb_func_end PrepareStringBattle
- thumb_func_start sub_80173D0
-sub_80173D0: @ 80173D0
+ thumb_func_start ResetSentPokesToOpponentValue
+ResetSentPokesToOpponentValue: @ 80173D0
push {r4-r6,lr}
movs r3, 0
ldr r0, _08017424 @ =gUnknown_2023F4E
@@ -797,7 +797,7 @@ _08017424: .4byte gUnknown_2023F4E
_08017428: .4byte gUnknown_2023BCC
_0801742C: .4byte gUnknown_825E45C
_08017430: .4byte gUnknown_2023BCE
- thumb_func_end sub_80173D0
+ thumb_func_end ResetSentPokesToOpponentValue
thumb_func_start sub_8017434
sub_8017434: @ 8017434
@@ -808,7 +808,7 @@ sub_8017434: @ 8017434
lsrs r5, r0, 24
movs r4, 0
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -873,7 +873,7 @@ sub_80174B8: @ 80174B8
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -921,8 +921,8 @@ _08017518: .4byte gUnknown_825E45C
_0801751C: .4byte gUnknown_2023BCE
thumb_func_end sub_80174B8
- thumb_func_start sub_8017520
-sub_8017520: @ 8017520
+ thumb_func_start BattleScriptPush
+BattleScriptPush: @ 8017520
push {r4,lr}
ldr r1, _08017540 @ =gUnknown_2023FF4
ldr r1, [r1]
@@ -941,10 +941,10 @@ sub_8017520: @ 8017520
bx r0
.align 2, 0
_08017540: .4byte gUnknown_2023FF4
- thumb_func_end sub_8017520
+ thumb_func_end BattleScriptPush
- thumb_func_start sub_8017544
-sub_8017544: @ 8017544
+ thumb_func_start BattleScriptPushCursor
+BattleScriptPushCursor: @ 8017544
ldr r0, _08017564 @ =gUnknown_2023FF4
ldr r0, [r0]
ldr r2, [r0, 0x8]
@@ -963,10 +963,10 @@ sub_8017544: @ 8017544
.align 2, 0
_08017564: .4byte gUnknown_2023FF4
_08017568: .4byte gUnknown_2023D74
- thumb_func_end sub_8017544
+ thumb_func_end BattleScriptPushCursor
- thumb_func_start sub_801756C
-sub_801756C: @ 801756C
+ thumb_func_start BattleScriptPop
+BattleScriptPop: @ 801756C
ldr r3, _0801758C @ =gUnknown_2023D74
ldr r0, _08017590 @ =gUnknown_2023FF4
ldr r0, [r0]
@@ -985,7 +985,7 @@ sub_801756C: @ 801756C
.align 2, 0
_0801758C: .4byte gUnknown_2023D74
_08017590: .4byte gUnknown_2023FF4
- thumb_func_end sub_801756C
+ thumb_func_end BattleScriptPop
thumb_func_start sub_8017594
sub_8017594: @ 8017594
@@ -1055,7 +1055,7 @@ _080175F0:
cmp r0, 0
bge _0801762C
adds r0, r2, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _080176C8 @ =gUnknown_2023D80
ldrb r0, [r5]
lsls r0, 2
@@ -1149,7 +1149,7 @@ _080176E0: .4byte gUnknown_81D8F9F
_080176E4: .4byte gUnknown_2023F54
_080176E8:
ldrh r0, [r1, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r3, r0, 24
_080176F2:
@@ -1275,7 +1275,7 @@ _080177E8: .4byte gUnknown_2023F54
_080177EC:
ldrh r0, [r1, 0x2E]
str r3, [sp, 0x14]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1524,9 +1524,9 @@ sub_8017998: @ 8017998
cmp r0, 0
beq _08017A1C
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
eors r4, r1
movs r1, 0x2
@@ -1535,7 +1535,7 @@ sub_8017998: @ 8017998
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r2, _08017A18 @ =gUnknown_20233C4
ldrb r1, [r5]
lsls r1, 9
@@ -1551,12 +1551,12 @@ _08017A14: .4byte gUnknown_2022B4C
_08017A18: .4byte gUnknown_20233C4
_08017A1C:
ldrb r0, [r5]
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
eors r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r2, _08017A3C @ =gUnknown_20233C4
ldrb r1, [r5]
lsls r1, 9
@@ -1599,7 +1599,7 @@ sub_8017A64: @ 8017A64
lsls r1, 16
lsrs r5, r1, 16
movs r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
mov r9, r0
@@ -1613,7 +1613,7 @@ sub_8017A64: @ 8017A64
_08017A8E:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
adds r3, r4, 0x1
@@ -3204,9 +3204,9 @@ _08018734:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _080187FC
.align 2, 0
_08018784: .4byte 0xf7ffffff
@@ -3298,13 +3298,13 @@ _0801881C:
subs r0, 0x10
str r0, [r1]
ldrb r0, [r5]
- bl sub_8017354
+ bl WasUnableToUseMove
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
beq _08018860
ldrb r0, [r5]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _0801885C @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x5]
@@ -3338,7 +3338,7 @@ _08018888:
movs r0, 0x1
strb r0, [r1, 0x5]
adds r0, r3, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
_08018894:
ldr r0, _080188AC @ =gUnknown_81D90BC
bl sub_801BBE4
@@ -3375,12 +3375,12 @@ _080188CE:
adds r0, r1, r3
str r0, [r2]
ldrb r0, [r6]
- bl sub_8017354
+ bl WasUnableToUseMove
lsls r0, 24
cmp r0, 0
beq _080188F0
ldrb r0, [r6]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
b _08018C12
.align 2, 0
_080188E8: .4byte gUnknown_2023BE4
@@ -3752,13 +3752,13 @@ _08018B6C:
cmp r0, 0xF
beq _08018C12
adds r0, r2, 0
- bl sub_8027830
+ bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
bne _08018C12
ldrb r0, [r6]
- bl sub_80172E8
- bl sub_8044EC8
+ bl CancelMultiTurnMoves
+ bl Random
ldrb r1, [r6]
adds r2, r1, 0
muls r2, r5
@@ -3777,9 +3777,9 @@ _08018B6C:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r6]
- bl sub_8017248
+ bl MarkBufferBankForExecution
ldr r1, _08018C2C @ =gUnknown_2023D6E
ldrb r0, [r6]
strb r0, [r1]
@@ -4752,7 +4752,7 @@ _080193A4:
b _08019946
_080193C4:
adds r0, r1, 0
- bl sub_8027830
+ bl UproarWakeUpCheck
lsls r0, 24
cmp r0, 0
beq _08019424
@@ -4775,7 +4775,7 @@ _080193C4:
ldr r1, _08019414 @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _08019418 @ =gUnknown_2023E82
movs r0, 0x1
strb r0, [r1, 0x5]
@@ -4869,7 +4869,7 @@ _080194B0:
ldr r1, _080194D0 @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r0, _080194D4 @ =gUnknown_2023E82
strb r4, [r0, 0x5]
ldr r1, _080194D8 @ =gUnknown_2023D74
@@ -4897,7 +4897,7 @@ _080194E0:
ands r0, r1
cmp r0, 0
beq _08019580
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -4946,7 +4946,7 @@ _08019558:
negs r1, r1
ands r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _08019588 @ =gUnknown_2023D74
ldr r0, _0801958C @ =gUnknown_81D908D
str r0, [r1]
@@ -4991,7 +4991,7 @@ _080195AE:
b _08019946
_080195C2:
adds r0, r2, 0
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r2, _080195F8 @ =gUnknown_2023DD0
ldr r0, [r2]
movs r1, 0x80
@@ -5047,7 +5047,7 @@ _08019628:
movs r1, 0
strb r1, [r0, 0x19]
ldrb r0, [r3]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _0801966C @ =gUnknown_2023D74
ldr r0, _08019670 @ =gUnknown_81D7342
str r0, [r1]
@@ -5096,7 +5096,7 @@ _08019692:
orrs r0, r1
strb r0, [r2, 0x2]
ldrb r0, [r3]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _080196D4 @ =gUnknown_2023D74
ldr r0, _080196D8 @ =gUnknown_81D90B1
str r0, [r1]
@@ -5146,7 +5146,7 @@ _08019700:
ldrb r0, [r3]
strb r0, [r1, 0x17]
ldrb r0, [r3]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _08019748 @ =gUnknown_2023D74
ldr r0, _0801974C @ =gUnknown_81D8C4F
str r0, [r1]
@@ -5202,7 +5202,7 @@ _08019782:
orrs r0, r1
strb r0, [r2, 0x2]
ldrb r0, [r4]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _080197B0 @ =gUnknown_2023D74
ldr r0, _080197B4 @ =gUnknown_81D8ECA
b _08019934
@@ -5234,7 +5234,7 @@ _080197CC:
orrs r0, r1
strb r0, [r2, 0x1]
ldrb r0, [r4]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
ldr r1, _08019808 @ =gUnknown_2023D74
ldr r0, _0801980C @ =gUnknown_81D8F94
str r0, [r1]
@@ -5279,7 +5279,7 @@ _08019814:
ands r0, r3
cmp r0, 0
beq _080198D4
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
movs r2, 0x1
ands r2, r0
@@ -5288,7 +5288,7 @@ _08019814:
ldr r1, _08019864 @ =gUnknown_2023E82
movs r0, 0
strb r0, [r1, 0x5]
- bl sub_8017544
+ bl BattleScriptPushCursor
b _080198B2
.align 2, 0
_0801985C: .4byte gUnknown_2023BE4
@@ -5344,7 +5344,7 @@ _080198C8: .4byte gUnknown_2023DD0
_080198CC: .4byte gUnknown_2023D74
_080198D0: .4byte gUnknown_81D90D3
_080198D4:
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _080198EC @ =gUnknown_2023D74
ldr r0, _080198F0 @ =gUnknown_81D9116
_080198DC:
@@ -5374,7 +5374,7 @@ _080198F8:
ands r0, r1
cmp r0, 0
beq _08019946
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -5432,7 +5432,7 @@ _08019974:
_08019988:
ldr r0, _080199A0 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _080199AC
@@ -5473,15 +5473,15 @@ _080199C8:
cmp r1, 0
beq _08019A42
lsrs r0, r1, 16
- bl sub_8045190
+ bl CountTrailingZeroBits
ldr r1, _08019A08 @ =gUnknown_2023FC4
strb r0, [r1, 0x17]
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
beq _08019A0C
- bl sub_8017544
+ bl BattleScriptPushCursor
b _08019A34
.align 2, 0
_08019A00: .4byte gUnknown_2023BE4
@@ -5489,7 +5489,7 @@ _08019A04: .4byte gUnknown_2023D6B
_08019A08: .4byte gUnknown_2023FC4
_08019A0C:
ldr r0, _08019A48 @ =gUnknown_81D914A
- bl sub_8017520
+ bl BattleScriptPush
ldr r2, _08019A4C @ =gUnknown_2023DD0
ldr r0, [r2]
movs r1, 0x80
@@ -5505,7 +5505,7 @@ _08019A0C:
orrs r0, r1
strb r0, [r2, 0x1]
ldrb r0, [r4]
- bl sub_80172E8
+ bl CancelMultiTurnMoves
_08019A34:
ldr r1, _08019A54 @ =gUnknown_2023D74
ldr r0, _08019A58 @ =gUnknown_81D913D
@@ -5656,7 +5656,7 @@ _08019B40:
negs r0, r0
ands r3, r0
str r3, [r4]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _08019BF8 @ =gUnknown_2023D74
ldr r0, _08019BFC @ =gUnknown_81D908D
str r0, [r1]
@@ -5703,9 +5703,9 @@ _08019BA8:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
_08019BD4:
mov r0, r9
add sp, 0x10
@@ -5761,11 +5761,11 @@ _08019C40:
cmp r1, 0
beq _08019CCC
adds r0, r4, 0
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
ldr r1, _08019CC4 @ =gUnknown_202402C
mov r8, r1
@@ -5791,17 +5791,17 @@ _08019C7C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08019CAC
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08019CAC
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -5826,17 +5826,17 @@ _08019CC4: .4byte gUnknown_202402C
_08019CC8: .4byte gUnknown_2024284
_08019CCC:
adds r0, r3, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08019CF8
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _08019CF4 @ =gUnknown_202402C
@@ -5846,11 +5846,11 @@ _08019CCC:
_08019CF4: .4byte gUnknown_202402C
_08019CF8:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _08019DA0 @ =gUnknown_2024284
@@ -5882,17 +5882,17 @@ _08019D32:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08019D82
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08019D82
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -6158,7 +6158,7 @@ sub_8019F18: @ 8019F18
strb r1, [r5]
_08019F54:
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08019F84
@@ -6197,7 +6197,7 @@ _08019F94:
strb r2, [r5]
_08019FA6:
ldrb r0, [r5]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08019FD8
@@ -6229,23 +6229,23 @@ _08019FE8:
adds r5, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
adds r0, r6, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x10]
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0xC]
adds r0, r5, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x14]
ldr r0, _0801A040 @ =gUnknown_2022B4C
ldr r0, [r0]
@@ -6426,7 +6426,7 @@ _0801A192:
beq _0801A19A
bl _0801BBAA
_0801A19A:
- bl sub_807AF98
+ bl weather_get_current
lsls r0, 24
lsrs r0, 24
subs r0, 0x3
@@ -6514,7 +6514,7 @@ _0801A250:
bne _0801A25A
bl _0801BBC6
_0801A25A:
- bl sub_807AF98
+ bl weather_get_current
ldr r1, _0801A274 @ =gUnknown_2023E82
strb r0, [r1, 0x5]
ldr r0, _0801A278 @ =gUnknown_81D8B1F
@@ -6793,7 +6793,7 @@ _0801A4A8:
bne _0801A4B8
bl _0801BBAA
_0801A4B8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -6811,7 +6811,7 @@ _0801A4D2:
beq _0801A4E4
ldr r0, _0801A564 @ =gUnknown_2022AB8
ldr r1, _0801A568 @ =gUnknown_8250094
- bl sub_8008D84
+ bl StringCopy
_0801A4E4:
ldr r0, [r5]
movs r1, 0x7
@@ -6820,7 +6820,7 @@ _0801A4E4:
beq _0801A4F6
ldr r0, _0801A564 @ =gUnknown_2022AB8
ldr r1, _0801A56C @ =gUnknown_825009C
- bl sub_8008D84
+ bl StringCopy
_0801A4F6:
ldr r0, [r5]
movs r1, 0x40
@@ -6829,7 +6829,7 @@ _0801A4F6:
beq _0801A508
ldr r0, _0801A564 @ =gUnknown_2022AB8
ldr r1, _0801A570 @ =gUnknown_82500A4
- bl sub_8008D84
+ bl StringCopy
_0801A508:
ldr r0, [r5]
movs r1, 0x10
@@ -6838,7 +6838,7 @@ _0801A508:
beq _0801A51A
ldr r0, _0801A564 @ =gUnknown_2022AB8
ldr r1, _0801A574 @ =gUnknown_82500AC
- bl sub_8008D84
+ bl StringCopy
_0801A51A:
ldr r0, [r5]
movs r1, 0x20
@@ -6847,7 +6847,7 @@ _0801A51A:
beq _0801A52C
ldr r0, _0801A564 @ =gUnknown_2022AB8
ldr r1, _0801A578 @ =gUnknown_82500B4
- bl sub_8008D84
+ bl StringCopy
_0801A52C:
str r4, [r5]
adds r1, r7, 0
@@ -6869,9 +6869,9 @@ _0801A52C:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
bl _0801BB5A
.align 2, 0
_0801A564: .4byte gUnknown_2022AB8
@@ -7415,7 +7415,7 @@ _0801AA1A:
strb r5, [r1, 0x2]
movs r0, 0xFF
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801AA54 @ =gUnknown_2023D74
ldr r0, _0801AA58 @ =gUnknown_81D949C
str r0, [r1]
@@ -7499,7 +7499,7 @@ _0801AAD6:
bne _0801AAE4
str r2, [r1]
_0801AAE4:
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801AB14 @ =gUnknown_2023D74
ldr r0, _0801AB18 @ =gUnknown_81D94A3
str r0, [r1]
@@ -7576,7 +7576,7 @@ _0801AB7C:
bne _0801AB94
bl _0801BBAA
_0801AB94:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -7589,7 +7589,7 @@ _0801ABAC:
ldr r5, _0801AC04 @ =gUnknown_2023E82
movs r4, 0x3
_0801ABB0:
- bl sub_8044EC8
+ bl Random
ands r0, r4
strb r0, [r5, 0x3]
cmp r0, 0
@@ -7604,7 +7604,7 @@ _0801ABC8:
ldrb r0, [r1, 0x3]
adds r0, 0x40
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801AC08 @ =gUnknown_2023D74
ldr r0, _0801AC0C @ =gUnknown_81D94CB
str r0, [r1]
@@ -7688,7 +7688,7 @@ _0801AC74:
bne _0801AC8C
bl _0801BBAA
_0801AC8C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -7701,7 +7701,7 @@ _0801ACA4:
ldr r1, _0801ACE0 @ =gUnknown_2023E82
movs r0, 0x42
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801ACE4 @ =gUnknown_2023D74
ldr r0, _0801ACE8 @ =gUnknown_81D94CB
str r0, [r1]
@@ -7785,7 +7785,7 @@ _0801AD50:
bne _0801AD68
bl _0801BBAA
_0801AD68:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -7798,7 +7798,7 @@ _0801AD80:
ldr r1, _0801ADBC @ =gUnknown_2023E82
movs r0, 0x45
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801ADC0 @ =gUnknown_2023D74
ldr r0, _0801ADC4 @ =gUnknown_81D94CB
str r0, [r1]
@@ -7882,7 +7882,7 @@ _0801AE1C:
bne _0801AE44
bl _0801BBAA
_0801AE44:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -7895,7 +7895,7 @@ _0801AE5C:
ldr r1, _0801AE98 @ =gUnknown_2023E82
movs r0, 0x43
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801AE9C @ =gUnknown_2023D74
ldr r0, _0801AEA0 @ =gUnknown_81D94CB
str r0, [r1]
@@ -7989,7 +7989,7 @@ _0801AF24:
bne _0801AF34
bl _0801BBAA
_0801AF34:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -8010,11 +8010,11 @@ _0801AF4C:
_0801AF5E:
ldr r0, [sp, 0x8]
ldr r1, [sp, 0x10]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
adds r4, r0, 0
ldr r0, [sp, 0xC]
ldr r1, [sp, 0x14]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -8036,7 +8036,7 @@ _0801AF7C:
_0801AF96:
ldr r0, [sp, 0x8]
ldr r1, [sp, 0x10]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -8045,7 +8045,7 @@ _0801AF96:
_0801AFAA:
ldr r0, [sp, 0xC]
ldr r1, [sp, 0x14]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -8066,7 +8066,7 @@ _0801AFBE:
ldr r0, [r2]
orrs r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801B008 @ =gUnknown_2023D74
ldr r0, _0801B00C @ =gUnknown_81D94BE
str r0, [r1]
@@ -8221,7 +8221,7 @@ _0801B184:
_0801B19E:
ldr r0, _0801B1AC @ =gUnknown_2022AB8
ldr r1, _0801B1B0 @ =gUnknown_82500BC
- bl sub_8008D84
+ bl StringCopy
movs r2, 0x2
mov r9, r2
b _0801B2A4
@@ -8267,7 +8267,7 @@ _0801B1DC:
str r0, [r2]
ldr r0, _0801B210 @ =gUnknown_2022AB8
ldr r1, _0801B214 @ =gUnknown_825009C
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
mov r9, r0
b _0801B2A4
@@ -8290,7 +8290,7 @@ _0801B218:
beq _0801B29E
ldr r0, _0801B240 @ =gUnknown_2022AB8
ldr r1, _0801B244 @ =gUnknown_82500AC
- bl sub_8008D84
+ bl StringCopy
movs r2, 0x1
mov r9, r2
b _0801B2A4
@@ -8313,7 +8313,7 @@ _0801B248:
ldr r0, _0801B270 @ =gUnknown_2022AB8
ldr r1, _0801B274 @ =gUnknown_82500B4
_0801B264:
- bl sub_8008D84
+ bl StringCopy
movs r4, 0x1
mov r9, r4
b _0801B2A4
@@ -8336,7 +8336,7 @@ _0801B278:
beq _0801B29E
ldr r0, _0801B2B4 @ =gUnknown_2022AB8
ldr r1, _0801B2B8 @ =gUnknown_82500C4
- bl sub_8008D84
+ bl StringCopy
movs r2, 0x3
mov r9, r2
_0801B29E:
@@ -8398,7 +8398,7 @@ _0801B300:
_0801B302:
str r0, [r2]
_0801B304:
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801B344 @ =gUnknown_2023D74
ldr r0, _0801B348 @ =gUnknown_81D94D1
str r0, [r1]
@@ -8417,9 +8417,9 @@ _0801B304:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
bl _0801BBC6
.align 2, 0
_0801B33C: .4byte gUnknown_2023BE4
@@ -8530,7 +8530,7 @@ _0801B408:
ldr r0, _0801B444 @ =gUnknown_2023D6C
ldrb r0, [r0]
strb r0, [r1, 0x17]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801B448 @ =gUnknown_2023D74
ldr r0, _0801B44C @ =gUnknown_81D94CE
str r0, [r1]
@@ -8592,7 +8592,7 @@ _0801B48E:
ldr r0, _0801B4C8 @ =gUnknown_2023D6B
ldrb r0, [r0]
strb r0, [r1, 0x17]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801B4CC @ =gUnknown_2023D74
ldr r0, _0801B4D0 @ =gUnknown_81D94CE
str r0, [r1]
@@ -8681,17 +8681,17 @@ _0801B53C:
_0801B552:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
adds r6, r0, 0
eors r6, r1
ands r6, r1
adds r0, r6, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
adds r0, r6, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _0801B604 @ =gUnknown_2022B4C
@@ -8728,14 +8728,14 @@ _0801B584:
cmp r0, 0
beq _0801B60C
str r2, [sp, 0x24]
- bl sub_8044EC8
+ bl Random
ldr r2, [sp, 0x24]
adds r1, r2, 0
ands r1, r0
lsls r1, 1
orrs r6, r1
adds r0, r6, 0
- bl sub_80751E8
+ bl GetBankByIdentity
mov r2, r8
strb r0, [r2]
ldrb r0, [r2]
@@ -8923,7 +8923,7 @@ _0801B738: .4byte gUnknown_2023BE4
_0801B73C: .4byte gUnknown_2023DFC
_0801B740:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -8938,7 +8938,7 @@ _0801B756:
_0801B75A:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
adds r4, r5, 0x1
@@ -8969,7 +8969,7 @@ _0801B794: .4byte gUnknown_2023BE4
_0801B798: .4byte gUnknown_2023D6A
_0801B79C:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -8984,7 +8984,7 @@ _0801B7B2:
_0801B7B6:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
adds r4, r5, 0x1
@@ -9164,7 +9164,7 @@ _0801B8F8:
_0801B908: .4byte gUnknown_2023D6A
_0801B90C:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -9176,7 +9176,7 @@ _0801B90C:
_0801B922:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, r6
@@ -9220,7 +9220,7 @@ _0801B962:
bne _0801B990
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, r6
@@ -9245,7 +9245,7 @@ _0801B9A0: .4byte gUnknown_2023BE4
_0801B9A4: .4byte gUnknown_2023D6A
_0801B9A8:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -9259,7 +9259,7 @@ _0801B9BE:
_0801B9C0:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, r6
@@ -9291,7 +9291,7 @@ _0801B9FC: .4byte gUnknown_2023BE4
_0801BA00: .4byte gUnknown_2023D6A
_0801BA04:
mov r0, r10
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -9305,7 +9305,7 @@ _0801BA1A:
_0801BA1C:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, r6
@@ -9438,7 +9438,7 @@ _0801BB3C:
ldr r1, _0801BB68 @ =0xfff7ffff
ands r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801BB6C @ =gUnknown_2023D74
ldr r0, _0801BB70 @ =gUnknown_81D9310
str r0, [r1]
@@ -9554,7 +9554,7 @@ _0801BC20: .4byte gUnknown_2023BE3
sub_801BC24: @ 801BC24
push {r4,lr}
adds r4, r0, 0
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r0, _0801BC58 @ =gUnknown_2023D74
str r4, [r0]
ldr r0, _0801BC5C @ =gUnknown_2023FF4
@@ -9629,11 +9629,11 @@ _0801BCB8: .4byte gUnknown_2023BE4
_0801BCBC: .4byte gUnknown_2023F54
_0801BCC0:
ldrh r0, [r4]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r0, 24
_0801BCD4:
@@ -9663,12 +9663,12 @@ _0801BD00: .4byte gUnknown_2023D6B
_0801BD04: .4byte gUnknown_2023F54
_0801BD08:
ldr r0, [sp, 0x14]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
mov r8, r0
ldr r0, [sp, 0x14]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r0, 24
_0801BD1E:
@@ -9683,9 +9683,9 @@ _0801BD1E:
cmp r4, 0xAF
beq _0801BD3E
adds r0, r4, 0
- bl sub_809A924
+ bl ItemId_GetHoldEffect
adds r0, r4, 0
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
_0801BD3E:
ldr r0, [sp, 0x8]
cmp r0, 0x4
@@ -9886,7 +9886,7 @@ _0801BF2C:
bl _0801C952
_0801BF34:
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801BF58
@@ -9918,17 +9918,17 @@ _0801BF6E:
mov r1, r10
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
mov r1, r10
adds r1, 0x11
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r5]
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
cmp r6, 0
@@ -9951,7 +9951,7 @@ _0801BFB2:
lsls r2, r5, 24
lsrs r2, 24
adds r0, r6, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r2, r0, 24
add r0, sp, 0x4
@@ -9991,10 +9991,10 @@ _0801BFE0:
movs r0, 0
movs r2, 0
movs r3, 0x1
- bl sub_800DFF0
+ bl EmitSetMonData
ldr r0, _0801C028 @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_8017248
+ bl MarkBufferBankForExecution
movs r0, 0x3
str r0, [sp, 0xC]
bl _0801C95A
@@ -10153,7 +10153,7 @@ _0801C14E:
adds r0, r2, r0
ldr r0, [r0]
movs r1, 0
- bl sub_8044234
+ bl GetFlavorRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _0801C16C
@@ -10216,7 +10216,7 @@ _0801C1CC:
adds r0, r1, r0
ldr r0, [r0]
movs r1, 0x1
- bl sub_8044234
+ bl GetFlavorRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _0801C1EA
@@ -10281,7 +10281,7 @@ _0801C248:
adds r0, r5, r0
ldr r0, [r0]
movs r1, 0x2
- bl sub_8044234
+ bl GetFlavorRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _0801C278
@@ -10356,7 +10356,7 @@ _0801C2DC:
adds r0, r2, r0
ldr r0, [r0]
movs r1, 0x3
- bl sub_8044234
+ bl GetFlavorRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _0801C30C
@@ -10431,7 +10431,7 @@ _0801C36E:
adds r0, r1, r0
ldr r0, [r0]
movs r1, 0x4
- bl sub_8044234
+ bl GetFlavorRelationByPersonality
lsls r0, 24
cmp r0, 0
bge _0801C3A0
@@ -10784,7 +10784,7 @@ _0801C630:
adds r4, r0, 0x1
ldr r5, _0801C6A8 @ =gUnknown_2023BFC
_0801C638:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -11027,7 +11027,7 @@ _0801C816:
beq _0801C82E
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8C0 @ =gUnknown_8250094
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
mov r10, r0
_0801C82E:
@@ -11046,7 +11046,7 @@ _0801C82E:
str r0, [r2]
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8C8 @ =gUnknown_825009C
- bl sub_8008D84
+ bl StringCopy
movs r2, 0x1
add r10, r2
_0801C854:
@@ -11057,7 +11057,7 @@ _0801C854:
beq _0801C86A
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8CC @ =gUnknown_82500A4
- bl sub_8008D84
+ bl StringCopy
movs r3, 0x1
add r10, r3
_0801C86A:
@@ -11068,7 +11068,7 @@ _0801C86A:
beq _0801C880
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8D0 @ =gUnknown_82500AC
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
add r10, r0
_0801C880:
@@ -11079,7 +11079,7 @@ _0801C880:
beq _0801C896
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8D4 @ =gUnknown_82500B4
- bl sub_8008D84
+ bl StringCopy
movs r1, 0x1
add r10, r1
_0801C896:
@@ -11091,7 +11091,7 @@ _0801C896:
beq _0801C8AE
ldr r0, _0801C8BC @ =gUnknown_2022AB8
ldr r1, _0801C8D8 @ =gUnknown_82500BC
- bl sub_8008D84
+ bl StringCopy
movs r3, 0x1
add r10, r3
_0801C8AE:
@@ -11159,7 +11159,7 @@ _0801C91C:
str r2, [r1]
ldr r0, _0801C97C @ =gUnknown_2022AB8
ldr r1, _0801C980 @ =gUnknown_82500C4
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0801C984 @ =gUnknown_81D95BF
bl sub_801BBE4
ldr r1, _0801C988 @ =gUnknown_2023E82
@@ -11279,11 +11279,11 @@ _0801CA34: .4byte gUnknown_2023BE4
_0801CA38: .4byte gUnknown_2023F54
_0801CA3C:
ldrh r0, [r4]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r5, r0, 24
ldrh r0, [r4]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
_0801CA4C:
subs r0, r5, 0x2
cmp r0, 0x1A
@@ -11343,7 +11343,7 @@ _0801CAE6:
negs r0, r0
ands r1, r0
str r1, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CB04 @ =gUnknown_2023D74
ldr r0, _0801CB08 @ =gUnknown_81D9537
str r0, [r1]
@@ -11370,7 +11370,7 @@ _0801CB22:
ldr r0, _0801CB3C @ =0xfffff077
ands r1, r0
str r1, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CB40 @ =gUnknown_2023D74
ldr r0, _0801CB44 @ =gUnknown_81D954F
str r0, [r1]
@@ -11399,7 +11399,7 @@ _0801CB5E:
negs r0, r0
ands r1, r0
str r1, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CB7C @ =gUnknown_2023D74
ldr r0, _0801CB80 @ =gUnknown_81D9567
str r0, [r1]
@@ -11427,7 +11427,7 @@ _0801CB9A:
negs r0, r0
ands r1, r0
str r1, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CBB8 @ =gUnknown_2023D74
ldr r0, _0801CBBC @ =gUnknown_81D957F
str r0, [r1]
@@ -11463,7 +11463,7 @@ _0801CBDA:
ldr r1, _0801CBFC @ =0xf7ffffff
ands r0, r1
str r0, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CC00 @ =gUnknown_2023D74
ldr r0, _0801CC04 @ =gUnknown_81D9597
b _0801CD58
@@ -11489,7 +11489,7 @@ _0801CC1E:
negs r0, r0
ands r1, r0
str r1, [r2]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CC3C @ =gUnknown_2023D74
ldr r0, _0801CC40 @ =gUnknown_81D95AF
str r0, [r1]
@@ -11519,8 +11519,8 @@ _0801CC5C:
str r1, [r2]
ldr r0, _0801CC88 @ =gUnknown_2022AB8
ldr r1, _0801CC8C @ =gUnknown_82500C4
- bl sub_8008D84
- bl sub_8017544
+ bl StringCopy
+ bl BattleScriptPushCursor
ldr r1, _0801CC90 @ =gUnknown_2023E82
movs r0, 0
strb r0, [r1, 0x5]
@@ -11566,7 +11566,7 @@ _0801CCC4:
beq _0801CCD4
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD68 @ =gUnknown_8250094
- bl sub_8008D84
+ bl StringCopy
_0801CCD4:
ldr r0, [r6]
movs r2, 0x7
@@ -11582,7 +11582,7 @@ _0801CCD4:
str r0, [r2]
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD70 @ =gUnknown_825009C
- bl sub_8008D84
+ bl StringCopy
_0801CCF4:
ldr r0, [r6]
movs r1, 0x40
@@ -11591,7 +11591,7 @@ _0801CCF4:
beq _0801CD06
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD74 @ =gUnknown_82500A4
- bl sub_8008D84
+ bl StringCopy
_0801CD06:
ldr r0, [r6]
movs r1, 0x10
@@ -11600,7 +11600,7 @@ _0801CD06:
beq _0801CD18
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD78 @ =gUnknown_82500AC
- bl sub_8008D84
+ bl StringCopy
_0801CD18:
ldr r0, [r6]
movs r1, 0x20
@@ -11609,7 +11609,7 @@ _0801CD18:
beq _0801CD2A
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD7C @ =gUnknown_82500B4
- bl sub_8008D84
+ bl StringCopy
_0801CD2A:
adds r5, r4
ldr r0, [r5]
@@ -11619,7 +11619,7 @@ _0801CD2A:
beq _0801CD3E
ldr r0, _0801CD64 @ =gUnknown_2022AB8
ldr r1, _0801CD80 @ =gUnknown_82500BC
- bl sub_8008D84
+ bl StringCopy
_0801CD3E:
movs r4, 0
str r4, [r6]
@@ -11628,7 +11628,7 @@ _0801CD3E:
negs r1, r1
ands r0, r1
str r0, [r5]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r0, _0801CD84 @ =gUnknown_2023E82
strb r4, [r0, 0x5]
ldr r1, _0801CD88 @ =gUnknown_2023D74
@@ -11686,7 +11686,7 @@ _0801CDB4:
strb r7, [r0, 0x17]
ldr r0, _0801CDE4 @ =gUnknown_2023D6F
strb r7, [r0]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CDE8 @ =gUnknown_2023D74
ldr r0, _0801CDEC @ =gUnknown_81D95DF
str r0, [r1]
@@ -11719,9 +11719,9 @@ _0801CE08:
movs r1, 0x28
movs r2, 0
movs r3, 0x4
- bl sub_800DFF0
+ bl EmitSetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
b _0801CFA6
.align 2, 0
_0801CE24: .4byte gUnknown_2023FC4
@@ -11785,7 +11785,7 @@ _0801CE76:
bne _0801CE9C
b _0801CFA6
_0801CE9C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -11817,11 +11817,11 @@ _0801CE9C:
ldr r1, _0801CF0C @ =gUnknown_2023E82
movs r0, 0x8
strb r0, [r1, 0x3]
- bl sub_8017544
+ bl BattleScriptPushCursor
movs r0, 0
movs r1, 0
bl sub_801FF20
- bl sub_801756C
+ bl BattleScriptPop
b _0801CFA6
.align 2, 0
_0801CEF4: .4byte gUnknown_2023DCC
@@ -11897,7 +11897,7 @@ _0801CF88:
lsls r0, 2
adds r0, r6
str r5, [r0]
- bl sub_8017544
+ bl BattleScriptPushCursor
ldr r1, _0801CFDC @ =gUnknown_2023D74
ldr r0, _0801CFE0 @ =gUnknown_81D9622
str r0, [r1]
@@ -12098,7 +12098,7 @@ _0801D0A0:
_0801D1A4:
ldr r0, _0801D284 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -12123,13 +12123,13 @@ _0801D1A4:
_0801D1D6:
ldr r0, _0801D284 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r7, 1
mov r8, r0
_0801D1E6:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, _0801D290 @ =gUnknown_2023BCC
@@ -12142,7 +12142,7 @@ _0801D1E6:
cmp r5, r3
beq _0801D1E6
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -12218,7 +12218,7 @@ _0801D2A0: .4byte gUnknown_2023ECC
_0801D2A4:
ldr r0, _0801D2B8 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r2, 0x1
movs r0, 0x1
@@ -12230,7 +12230,7 @@ _0801D2B8: .4byte gUnknown_2023D6B
_0801D2BC:
ldr r0, _0801D2F0 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -12271,11 +12271,11 @@ _0801D2FC:
beq _0801D378
ldr r0, _0801D334 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0801D33C
- bl sub_8044EC8
+ bl Random
adds r1, r4, 0
ands r1, r0
cmp r1, 0
@@ -12289,7 +12289,7 @@ _0801D338:
movs r0, 0x3
b _0801D34E
_0801D33C:
- bl sub_8044EC8
+ bl Random
adds r1, r4, 0
ands r1, r0
cmp r1, 0
@@ -12299,7 +12299,7 @@ _0801D33C:
_0801D34C:
movs r0, 0x2
_0801D34E:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0801D370 @ =gUnknown_2023D70
@@ -12320,13 +12320,13 @@ _0801D374: .4byte gUnknown_825E45C
_0801D378:
ldr r0, _0801D394 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
movs r2, 0x1
movs r0, 0x1
ands r0, r1
eors r0, r2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r5, r0, 24
b _0801D39C
@@ -12360,7 +12360,7 @@ sub_801D3C0: @ 801D3C0
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12375,7 +12375,7 @@ sub_801D3C0: @ 801D3C0
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
@@ -12385,7 +12385,7 @@ sub_801D3C0: @ 801D3C0
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x97
beq _0801D414
_0801D406:
@@ -12404,7 +12404,7 @@ _0801D414:
adds r0, r1
movs r1, 0x50
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
_0801D42A:
pop {r4-r7}
pop {r1}
@@ -12429,7 +12429,7 @@ sub_801D438: @ 801D438
bne _0801D4F4
ldr r4, _0801D500 @ =gUnknown_2023D6B
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12448,7 +12448,7 @@ sub_801D438: @ 801D438
ldr r0, [r0]
adds r2, 0x3C
adds r1, r2
- bl sub_8044288
+ bl IsOtherTrainer
lsls r0, 24
cmp r0, 0
beq _0801D4F4
@@ -12490,7 +12490,7 @@ _0801D4BE:
ldrb r0, [r0]
cmp r0, r6
bls _0801D4F4
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
mov r2, r8
@@ -12556,7 +12556,7 @@ _0801D558: .4byte 0xff7fffff
_0801D55C: .4byte gUnknown_2023D74
_0801D560: .4byte gUnknown_81D94DA
_0801D564:
- bl sub_8044EC8
+ bl Random
movs r1, 0xFF
ands r1, r0
ldr r2, _0801D608 @ =gUnknown_2023BE4
@@ -12597,7 +12597,7 @@ _0801D5B0:
mov r8, r2
movs r7, 0x3
_0801D5B6:
- bl sub_8044EC8
+ bl Random
ands r0, r7
mov r1, r8
strb r0, [r1]
@@ -12661,7 +12661,7 @@ _0801D634:
subs r0, r6
lsls r0, 24
lsrs r6, r0, 24
- bl sub_8044EC8
+ bl Random
movs r2, 0xFF
adds r4, r2, 0
ands r4, r0
@@ -12726,7 +12726,7 @@ _0801D6CC:
cmp r4, r6
blt _0801D6F4
_0801D6D2:
- bl sub_8044EC8
+ bl Random
ldr r2, _0801D6E8 @ =gUnknown_2023E82
movs r1, 0x3
ands r1, r0
diff --git a/asm/battle_util2.s b/asm/battle_util2.s
index 5e1fb8c3b..d1b755d4c 100644
--- a/asm/battle_util2.s
+++ b/asm/battle_util2.s
@@ -27,7 +27,7 @@ _0802E050:
movs r4, 0x3
_0802E060:
movs r0, 0x8
- bl sub_8002BB0
+ bl AllocZeroed
stm r5!, {r0}
subs r4, 0x1
cmp r4, 0
@@ -36,69 +36,69 @@ _0802E06E:
ldr r4, _0802E120 @ =gUnknown_2023FE8
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r4, _0802E124 @ =gUnknown_2023FF4
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0xA0
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1]
movs r0, 0x10
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x4]
movs r0, 0x24
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x8]
movs r0, 0x24
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0xC]
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x10]
movs r0, 0x1C
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x14]
movs r0, 0x30
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x18]
movs r0, 0x24
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r4]
str r0, [r1, 0x1C]
ldr r4, _0802E128 @ =gUnknown_2023FEC
movs r5, 0x80
lsls r5, 5
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r4, _0802E12C @ =gUnknown_2023FF0
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r4, _0802E130 @ =gUnknown_2022BB8
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r4, _0802E134 @ =gUnknown_2022BBC
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r1, r0, 0
str r1, [r4]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
pop {r4,r5}
pop {r0}
bx r0
@@ -136,7 +136,7 @@ _0802E14C:
movs r4, 0x3
_0802E15E:
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
stm r5!, {r6}
subs r4, 0x1
cmp r4, 0
@@ -148,59 +148,59 @@ _0802E16C:
beq _0802E200
ldr r4, _0802E214 @ =gUnknown_2023FE8
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r5, 0
str r5, [r4]
ldr r0, [r6]
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0]
ldr r0, [r0, 0x4]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x4]
ldr r0, [r0, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x8]
ldr r0, [r0, 0xC]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0xC]
ldr r0, [r0, 0x10]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x10]
ldr r0, [r0, 0x14]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x14]
ldr r0, [r0, 0x18]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x18]
ldr r0, [r0, 0x1C]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
str r5, [r0, 0x1C]
- bl sub_8002BC4
+ bl Free
str r5, [r6]
ldr r4, _0802E218 @ =gUnknown_2023FEC
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r4, _0802E21C @ =gUnknown_2023FF0
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r4, _0802E220 @ =gUnknown_2022BB8
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r4, _0802E224 @ =gUnknown_2022BBC
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
_0802E200:
pop {r4-r6}
@@ -229,11 +229,11 @@ sub_802E228: @ 802E228
cmp r0, 0
beq _0802E274
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0802E270 @ =gUnknown_2023BE4
@@ -256,7 +256,7 @@ _0802E26C: .4byte gUnknown_2022B4C
_0802E270: .4byte gUnknown_2023BE4
_0802E274:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
_0802E27E:
diff --git a/asm/berry_fix_program.s b/asm/berry_fix_program.s
index c0bb99e39..71529b7ff 100644
--- a/asm/berry_fix_program.s
+++ b/asm/berry_fix_program.s
@@ -64,10 +64,10 @@ sub_815F74C: @ 815F74C
ldr r0, _0815F7C4 @ =0x0000ffff
bl sub_8000B94
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
bl m4aSoundVSyncOff
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r4, 0
str r4, [sp]
ldr r0, _0815F7C8 @ =0x040000d4
@@ -88,14 +88,14 @@ sub_815F74C: @ 815F74C
ldr r1, _0815F7D0 @ =0x85000100
str r1, [r0, 0x8]
ldr r0, [r0, 0x8]
- bl sub_8006B10
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetSpriteData
+ bl ResetTasks
+ bl remove_some_task
ldr r0, _0815F7D4 @ =gUnknown_3005ECC
strb r4, [r0]
ldr r0, _0815F7D8 @ =sub_815F7F0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0815F7DC @ =gUnknown_3005090
@@ -105,7 +105,7 @@ sub_815F74C: @ 815F74C
adds r1, r2
strh r4, [r1, 0x8]
ldr r0, _0815F7E0 @ =sub_815F7E4
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r4}
pop {r0}
@@ -124,7 +124,7 @@ _0815F7E0: .4byte sub_815F7E4
thumb_func_start sub_815F7E4
sub_815F7E4: @ 815F7E4
push {lr}
- bl sub_8077578
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_815F7E4
@@ -216,7 +216,7 @@ _0815F890:
adds r1, 0x4B
movs r4, 0
strb r4, [r1]
- bl sub_800BC20
+ bl MultiBootInit
strh r4, [r5, 0x2]
movs r0, 0x5
b _0815F9A4
@@ -256,7 +256,7 @@ _0815F8C8:
str r0, [sp]
adds r0, r4, 0
movs r3, 0x4
- bl sub_800C0BC
+ bl MultiBootStartMaster
strh r6, [r5, 0x2]
movs r0, 0x6
b _0815F9A4
@@ -270,7 +270,7 @@ _0815F920:
strh r0, [r5, 0x2]
_0815F924:
adds r0, r4, 0
- bl sub_800BC5C
+ bl MultiBootMain
ldr r1, _0815F930 @ =gUnknown_3005EF4
str r0, [r1]
b _0815F9A6
@@ -279,11 +279,11 @@ _0815F930: .4byte gUnknown_3005EF4
_0815F934:
ldr r4, _0815F954 @ =gUnknown_3005F00
adds r0, r4, 0
- bl sub_800BC5C
+ bl MultiBootMain
ldr r1, _0815F958 @ =gUnknown_3005EF4
str r0, [r1]
adds r0, r4, 0
- bl sub_800C180
+ bl MultiBootCheckComplete
cmp r0, 0
beq _0815F95C
movs r0, 0x3
@@ -312,7 +312,7 @@ _0815F96E:
cmp r0, 0
beq _0815F9A6
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_80008D8
b _0815F9A6
.align 2, 0
diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s
index 42f1cf835..1438e3cc5 100644
--- a/asm/berry_pouch.s
+++ b/asm/berry_pouch.s
@@ -17,12 +17,12 @@ sub_813CD50: @ 813CD50
lsrs r6, r2, 24
ldr r7, _0813CD78 @ =gUnknown_203F36C
ldr r0, _0813CD7C @ =0x00000814
- bl sub_8002B9C
+ bl Alloc
str r0, [r7]
cmp r0, 0
bne _0813CD80
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0813CDE2
.align 2, 0
_0813CD78: .4byte gUnknown_203F36C
@@ -79,7 +79,7 @@ _0813CDB8:
mov r1, r12
strh r0, [r1]
mov r0, r8
- bl sub_8000544
+ bl SetMainCallback2
_0813CDE2:
pop {r3}
mov r8, r3
@@ -97,11 +97,11 @@ _0813CDFC: .4byte 0x0000080c
thumb_func_start sub_813CE00
sub_813CE00: @ 813CE00
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_813CE00
@@ -109,9 +109,9 @@ sub_813CE00: @ 813CE00
thumb_func_start sub_813CE1C
sub_813CE1C: @ 813CE1C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_813CE1C
@@ -184,19 +184,19 @@ _0813CE84:
.4byte _0813CFBE
_0813CED0:
bl sub_80BF768
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
b _0813CFD2
_0813CEDA:
- bl sub_8087E64
+ bl remove_some_task
b _0813CFD2
_0813CEE0:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
b _0813CFD2
_0813CEE6:
- bl sub_8070528
+ bl ResetPaletteFade
b _0813CFD2
_0813CEEC:
- bl sub_8006B10
+ bl ResetSpriteData
b _0813CFD2
_0813CEF2:
bl sub_80984D8
@@ -206,7 +206,7 @@ _0813CEF8:
lsls r0, 24
cmp r0, 0
bne _0813CFD2
- bl sub_80773BC
+ bl ResetTasks
b _0813CFD2
_0813CF08:
bl sub_813D07C
@@ -251,7 +251,7 @@ _0813CF5C:
_0813CF62:
ldr r0, _0813CF94 @ =sub_813DA68
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -259,7 +259,7 @@ _0813CF62:
ldr r2, _0813CF9C @ =gUnknown_203F370
ldrh r1, [r2, 0xA]
ldrh r2, [r2, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
ldr r2, _0813CFA0 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -287,7 +287,7 @@ _0813CFB0:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0813CFD2
_0813CFBE:
movs r0, 0x1
@@ -298,7 +298,7 @@ _0813CFBE:
str r2, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0813CFD2:
ldr r1, _0813CFE4 @ =gUnknown_30030F0
movs r0, 0x87
@@ -312,9 +312,9 @@ _0813CFD2:
_0813CFE4: .4byte gUnknown_30030F0
_0813CFE8:
ldr r0, _0813CFF8 @ =sub_813CE1C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0813CFFC @ =sub_813CE00
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
b _0813D002
.align 2, 0
@@ -340,14 +340,14 @@ sub_813D00C: @ 813D00C
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0813D03C @ =sub_813D048
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _0813D040 @ =sub_813CE1C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0813D044 @ =sub_813CE00
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r0}
bx r0
@@ -370,10 +370,10 @@ sub_813D048: @ 813D048
bne _0813D06C
ldr r0, _0813D078 @ =gUnknown_203F370
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_813D7CC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0813D06C:
pop {r4}
pop {r0}
@@ -403,22 +403,22 @@ sub_813D07C: @ 813D07C
ldr r1, [r4]
adds r1, 0xC
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
pop {r4}
pop {r0}
bx r0
@@ -454,18 +454,18 @@ _0813D10C:
beq _0813D178
b _0813D190
_0813D116:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r1, _0813D12C @ =gUnknown_8E859D0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _0813D17E
.align 2, 0
_0813D12C: .4byte gUnknown_8E859D0
_0813D130:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -473,7 +473,7 @@ _0813D130:
ldr r0, _0813D148 @ =gUnknown_8E85C44
ldr r1, [r5]
adds r1, 0xC
- bl sub_800EBB4
+ bl LZDecompressWram
b _0813D17E
.align 2, 0
_0813D148: .4byte gUnknown_8E85C44
@@ -481,7 +481,7 @@ _0813D14C:
ldr r0, _0813D16C @ =gUnknown_8E85BA4
movs r1, 0
movs r2, 0x60
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r0, _0813D170 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -490,7 +490,7 @@ _0813D14C:
ldr r0, _0813D174 @ =gUnknown_8E85BF4
movs r1, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0813D17E
.align 2, 0
_0813D16C: .4byte gUnknown_8E85BA4
@@ -498,7 +498,7 @@ _0813D170: .4byte gUnknown_300500C
_0813D174: .4byte gUnknown_8E85BF4
_0813D178:
ldr r0, _0813D18C @ =gUnknown_84644A8
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_0813D17E:
ldr r1, [r5]
adds r1, r6
@@ -510,7 +510,7 @@ _0813D17E:
_0813D18C: .4byte gUnknown_84644A8
_0813D190:
ldr r0, _0813D1A8 @ =gUnknown_84644B0
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
ldr r0, _0813D1AC @ =gUnknown_203F36C
ldr r0, [r0]
ldr r1, _0813D1B0 @ =0x0000080c
@@ -538,7 +538,7 @@ sub_813D1C0: @ 813D1C0
ldr r4, _0813D1F0 @ =gUnknown_203F37C
movs r0, 0xB0
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0813D1FC
@@ -550,7 +550,7 @@ sub_813D1C0: @ 813D1C0
subs r0, r1
lsls r0, 2
subs r0, r1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0813D1FC
@@ -717,10 +717,10 @@ sub_813D31C: @ 813D31C
ldr r4, _0813D384 @ =gUnknown_2021D18
ldr r1, _0813D388 @ =gUnknown_84166FF
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, _0813D38C @ =gUnknown_8416226
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r6, _0813D390 @ =gUnknown_2021CD0
adds r1, r5, 0
subs r1, 0x84
@@ -730,22 +730,22 @@ sub_813D31C: @ 813D31C
bl sub_8008E78
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r5, 0
adds r1, r6, 0
bl sub_8099E90
ldr r1, _0813D394 @ =gUnknown_84643B4
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r1, _0813D398 @ =gUnknown_8416703
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8008DA4
+ bl StringAppend
mov r0, r8
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -774,7 +774,7 @@ sub_813D39C: @ 813D39C
ldr r1, [r1]
adds r1, r2
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
pop {r0}
bx r0
.align 2, 0
@@ -905,7 +905,7 @@ sub_813D4B0: @ 813D4B0
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -942,7 +942,7 @@ sub_813D4D0: @ 813D4D0
movs r1, 0
movs r2, 0x1
adds r3, r5, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -983,7 +983,7 @@ sub_813D538: @ 813D538
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r4, r0, 0
b _0813D566
.align 2, 0
@@ -993,7 +993,7 @@ _0813D564:
_0813D566:
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
str r0, [sp]
str r0, [sp, 0x4]
@@ -1030,7 +1030,7 @@ sub_813D594: @ 813D594
movs r3, 0x1E
bl sub_80F6B08
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -1072,7 +1072,7 @@ _0813D5EA:
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x78
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1102,7 +1102,7 @@ sub_813D614: @ 813D614
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1132,7 +1132,7 @@ sub_813D64C: @ 813D64C
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x6]
add sp, 0x10
@@ -1151,7 +1151,7 @@ sub_813D684: @ 813D684
ldrb r0, [r1, 0x6]
cmp r0, 0xFF
beq _0813D69A
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x6]
@@ -1335,19 +1335,19 @@ sub_813D7CC: @ 813D7CC
ldr r0, [r0]
cmp r0, 0
beq _0813D7DA
- bl sub_8002BC4
+ bl Free
_0813D7DA:
ldr r0, _0813D800 @ =gUnknown_203F37C
ldr r0, [r0]
cmp r0, 0
beq _0813D7E6
- bl sub_8002BC4
+ bl Free
_0813D7E6:
ldr r0, _0813D804 @ =gUnknown_203F380
ldr r0, [r0]
cmp r0, 0
beq _0813D7F2
- bl sub_8002BC4
+ bl Free
_0813D7F2:
bl sub_8003ECC
pop {r0}
@@ -1372,7 +1372,7 @@ sub_813D808: @ 813D808
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0813D83C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1415,7 +1415,7 @@ sub_813D844: @ 813D844
ldr r0, [r0]
cmp r0, 0
beq _0813D88C
- bl sub_8000544
+ bl SetMainCallback2
b _0813D896
.align 2, 0
_0813D87C: .4byte gUnknown_3005098
@@ -1426,12 +1426,12 @@ _0813D88C:
adds r0, r4, 0
subs r0, 0xA
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
_0813D896:
bl sub_813D684
bl sub_813D7CC
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0813D8A4:
pop {r4,r5}
pop {r0}
@@ -1622,7 +1622,7 @@ sub_813D9F8: @ 813D9F8
lsrs r6, 24
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0813DA5C @ =gUnknown_2021CD0
lsls r4, 16
asrs r4, 16
@@ -1688,13 +1688,13 @@ _0813DA90:
b _0813DB9E
_0813DA9E:
ldrb r0, [r7]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r5, r0, 0
ldrb r0, [r7]
ldr r4, _0813DAE0 @ =gUnknown_203F37A
subs r2, r4, 0x2
adds r1, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _0813DAE4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -2051,7 +2051,7 @@ sub_813DDA0: @ 813DDA0
lsrs r0, 24
cmp r0, 0x1
beq _0813DDFE
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -2107,20 +2107,20 @@ sub_813DE0C: @ 813DE0C
movs r0, 0x6
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813DE60 @ =gUnknown_203F370
ldrb r0, [r0, 0x4]
cmp r0, 0x4
bne _0813DE78
ldr r4, _0813DE64 @ =gUnknown_203AD30
ldrh r0, [r4]
- bl sub_809AA68
+ bl ItemId_GetBattleFunc
cmp r0, 0
bne _0813DE68
adds r0, r5, 0
@@ -2132,19 +2132,19 @@ _0813DE60: .4byte gUnknown_203F370
_0813DE64: .4byte gUnknown_203AD30
_0813DE68:
ldrh r0, [r4]
- bl sub_809AA68
+ bl ItemId_GetBattleFunc
adds r1, r0, 0
adds r0, r5, 0
bl _call_via_r1
b _0813DEB0
_0813DE78:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _0813DEA0
ldr r0, _0813DE9C @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_809A9FC
+ bl ItemId_GetType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2157,7 +2157,7 @@ _0813DE9C: .4byte gUnknown_203AD30
_0813DEA0:
ldr r0, _0813DEB8 @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_809AA20
+ bl ItemId_GetFieldFunc
adds r1, r0, 0
adds r0, r5, 0
bl _call_via_r1
@@ -2190,12 +2190,12 @@ sub_813DEBC: @ 813DEBC
bl sub_813EB10
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x6
bl sub_813EB10
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
adds r0, 0x9
lsls r0, 24
@@ -2204,7 +2204,7 @@ sub_813DEBC: @ 813DEBC
movs r0, 0x6
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
strh r0, [r5, 0x10]
movs r1, 0x4
@@ -2305,13 +2305,13 @@ sub_813DFC8: @ 813DFC8
movs r0, 0x7
bl sub_813EA98
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2364,15 +2364,15 @@ _0813E048:
bl sub_813EB10
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x8
bl sub_813EA98
movs r0, 0
bl sub_813EA98
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_813D684
adds r0, r5, 0
bl sub_813DF54
@@ -2391,13 +2391,13 @@ _0813E090:
movs r0, 0
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -2512,14 +2512,14 @@ _0813E18A:
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2551,14 +2551,14 @@ sub_813E200: @ 813E200
movs r0, 0x6
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
- bl sub_8040C3C
+ bl schedule_bg_copy_tilemap_to_vram
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _0813E248
@@ -2654,12 +2654,12 @@ sub_813E2B8: @ 813E2B8
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r5]
movs r1, 0x1
bl sub_813D4B0
@@ -2689,13 +2689,13 @@ sub_813E320: @ 813E320
movs r0, 0x6
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _0813E378 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2756,7 +2756,7 @@ _0813E3D4: .4byte sub_813E290
_0813E3D8:
ldr r0, _0813E3F0 @ =gUnknown_203F36C
ldr r1, [r0]
- ldr r0, _0813E3F4 @ =sub_8123744
+ ldr r0, _0813E3F4 @ =c2_8123744
str r0, [r1]
adds r0, r7, 0
subs r0, 0x8
@@ -2769,7 +2769,7 @@ _0813E3EA:
bx r0
.align 2, 0
_0813E3F0: .4byte gUnknown_203F36C
-_0813E3F4: .4byte sub_8123744
+_0813E3F4: .4byte c2_8123744
_0813E3F8: .4byte sub_813D808
thumb_func_end sub_813E37C
@@ -2809,7 +2809,7 @@ sub_813E428: @ 813E428
adds r4, r0, r1
ldr r6, _0813E474 @ =gUnknown_203AD30
ldrh r0, [r6]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
cmp r0, 0
bne _0813E488
@@ -2896,7 +2896,7 @@ sub_813E4E4: @ 813E4E4
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -2958,13 +2958,13 @@ sub_813E568: @ 813E568
movs r0, 0x5
bl sub_813EACC
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_813D4B0
@@ -3027,7 +3027,7 @@ sub_813E5B8: @ 813E5B8
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r9
@@ -3106,7 +3106,7 @@ sub_813E690: @ 813E690
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -3128,9 +3128,9 @@ _0813E6E4:
movs r0, 0x1
bl sub_813EA98
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_813D684
adds r0, r4, 0
bl sub_813E4E4
@@ -3151,13 +3151,13 @@ _0813E718:
movs r0, 0x5
bl sub_813EACC
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_813D684
ldrb r0, [r5]
movs r1, 0x1
@@ -3182,9 +3182,9 @@ sub_813E768: @ 813E768
ldr r0, _0813E7D4 @ =gUnknown_3005098
adds r4, r0
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813E7D8 @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _0813E7DC @ =gUnknown_2021CD0
@@ -3195,7 +3195,7 @@ sub_813E768: @ 813E768
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -3258,7 +3258,7 @@ sub_813E7F0: @ 813E7F0
mov r10, r3
add r4, r10
ldrh r0, [r5]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r8
@@ -3266,7 +3266,7 @@ sub_813E7F0: @ 813E7F0
ldrsh r1, [r2, r3]
muls r1, r0
adds r0, r4, 0
- bl sub_809FDA0
+ bl AddMoney
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -3285,7 +3285,7 @@ sub_813E7F0: @ 813E7F0
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -3347,7 +3347,7 @@ _0813E8EE:
movs r0, 0x2
bl sub_813EA98
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
bl sub_813E2B8
_0813E906:
@@ -3379,27 +3379,27 @@ sub_813E910: @ 813E910
ldr r0, _0813E998 @ =gUnknown_841F408
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0
_0813E946:
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _0813E946
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r4, 0
ldr r3, _0813E99C @ =gUnknown_203F38C
movs r2, 0xFF
@@ -3509,7 +3509,7 @@ _0813EA38:
movs r1, 0
movs r2, 0xA
movs r3, 0xC
- bl sub_810F2E8
+ bl SetWindowBorderStyle
b _0813EA60
.align 2, 0
_0813EA4C: .4byte gUnknown_203F38C
@@ -3519,10 +3519,10 @@ _0813EA54:
movs r1, 0
movs r2, 0x1
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
_0813EA60:
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0813EA74 @ =gUnknown_203F38C
adds r0, r4, r0
ldrb r0, [r0]
@@ -3545,7 +3545,7 @@ sub_813EA78: @ 813EA78
movs r1, 0
movs r2, 0x1
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
.align 2, 0
@@ -3564,11 +3564,11 @@ sub_813EA98: @ 813EA98
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -3591,15 +3591,15 @@ sub_813EACC: @ 813EACC
movs r1, 0
bl sub_810F260
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
_0813EB04:
@@ -3656,7 +3656,7 @@ _0813EB44:
movs r3, 0xD
bl sub_80BF474
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -3751,7 +3751,7 @@ sub_813EC08: @ 813EC08
movs r1, 0x28
movs r2, 0x4C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _0813EC24 @ =gUnknown_203F39C
strb r0, [r1]
pop {r0}
@@ -3780,7 +3780,7 @@ sub_813EC28: @ 813EC28
beq _0813EC52
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _0813EC60 @ =sub_813EC64
str r0, [r4, 0x1C]
_0813EC52:
@@ -3805,7 +3805,7 @@ sub_813EC64: @ 813EC64
beq _0813EC80
adds r0, r4, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _0813EC88 @ =nullsub_8
str r0, [r4, 0x1C]
_0813EC80:
diff --git a/asm/bg.s b/asm/bg.s
index 654286ae1..93bb880e2 100644
--- a/asm/bg.s
+++ b/asm/bg.s
@@ -5,22 +5,22 @@
.text
- thumb_func_start sub_8001028
-sub_8001028: @ 8001028
+ thumb_func_start ResetBgs
+ResetBgs: @ 8001028
push {lr}
- bl sub_800106C
+ bl ResetBgControlStructs
ldr r1, _0800103C @ =gUnknown_30008D0
movs r0, 0
strh r0, [r1, 0x10]
- bl sub_80013F4
+ bl SetTextModeAndHideBgs
pop {r0}
bx r0
.align 2, 0
_0800103C: .4byte gUnknown_30008D0
- thumb_func_end sub_8001028
+ thumb_func_end ResetBgs
- thumb_func_start sub_8001040
-sub_8001040: @ 8001040
+ thumb_func_start SetBgModeInternal
+SetBgModeInternal: @ 8001040
lsls r0, 24
lsrs r0, 24
ldr r3, _08001054 @ =gUnknown_30008D0
@@ -33,10 +33,10 @@ sub_8001040: @ 8001040
.align 2, 0
_08001054: .4byte gUnknown_30008D0
_08001058: .4byte 0x0000fff8
- thumb_func_end sub_8001040
+ thumb_func_end SetBgModeInternal
- thumb_func_start sub_800105C
-sub_800105C: @ 800105C
+ thumb_func_start GetBgMode
+GetBgMode: @ 800105C
ldr r0, _08001068 @ =gUnknown_30008D0
ldrb r1, [r0, 0x10]
movs r0, 0x7
@@ -44,10 +44,10 @@ sub_800105C: @ 800105C
bx lr
.align 2, 0
_08001068: .4byte gUnknown_30008D0
- thumb_func_end sub_800105C
+ thumb_func_end GetBgMode
- thumb_func_start sub_800106C
-sub_800106C: @ 800106C
+ thumb_func_start ResetBgControlStructs
+ResetBgControlStructs: @ 800106C
push {lr}
ldr r2, _08001084 @ =gUnknown_30008D0
ldr r0, _08001088 @ =gUnknown_81E9F64
@@ -64,15 +64,15 @@ _08001078:
.align 2, 0
_08001084: .4byte gUnknown_30008D0
_08001088: .4byte gUnknown_81E9F64
- thumb_func_end sub_800106C
+ thumb_func_end ResetBgControlStructs
- thumb_func_start sub_800108C
-sub_800108C: @ 800108C
+ thumb_func_start Unused_ResetBgControlStruct
+Unused_ResetBgControlStruct: @ 800108C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
cmp r0, 0
bne _080010AA
@@ -89,10 +89,10 @@ _080010AA:
.align 2, 0
_080010B0: .4byte gUnknown_30008D0
_080010B4: .4byte gUnknown_81E9F64
- thumb_func_end sub_800108C
+ thumb_func_end Unused_ResetBgControlStruct
- thumb_func_start sub_80010B8
-sub_80010B8: @ 80010B8
+ thumb_func_start SetBgControlAttributes
+SetBgControlAttributes: @ 80010B8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -129,7 +129,7 @@ sub_80010B8: @ 80010B8
lsrs r1, 24
str r1, [sp, 0xC]
adds r0, r7, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
lsrs r0, 24
mov r12, r0
@@ -250,17 +250,17 @@ _080011D0:
bx r0
.align 2, 0
_080011E0: .4byte gUnknown_30008D0
- thumb_func_end sub_80010B8
+ thumb_func_end SetBgControlAttributes
- thumb_func_start sub_80011E4
-sub_80011E4: @ 80011E4
+ thumb_func_start GetBgControlAttribute
+GetBgControlAttribute: @ 80011E4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r5, r1, 24
adds r0, r4, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
cmp r0, 0
bne _08001290
@@ -345,10 +345,10 @@ _08001292:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80011E4
+ thumb_func_end GetBgControlAttribute
- thumb_func_start sub_8001298
-sub_8001298: @ 8001298
+ thumb_func_start LoadBgVram
+LoadBgVram: @ 8001298
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -363,7 +363,7 @@ sub_8001298: @ 8001298
lsls r1, 24
lsrs r5, r1, 24
adds r0, r4, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
cmp r0, 0
bne _08001310
@@ -402,7 +402,7 @@ _080012EC:
mov r0, r8
adds r2, r7, 0
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
lsls r0, 24
lsrs r2, r0, 24
asrs r0, 24
@@ -421,15 +421,15 @@ _08001316:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8001298
+ thumb_func_end LoadBgVram
- thumb_func_start sub_8001320
-sub_8001320: @ 8001320
+ thumb_func_start ShowBgInternal
+ShowBgInternal: @ 8001320
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
cmp r0, 0
bne _0800138E
@@ -468,7 +468,7 @@ sub_8001320: @ 8001320
lsls r2, 20
adds r0, r2
lsrs r0, 24
- bl sub_8000A38
+ bl SetGpuReg
adds r1, r4, 0
adds r1, 0x8
movs r0, 0x1
@@ -485,15 +485,15 @@ _0800138E:
.align 2, 0
_08001394: .4byte gUnknown_30008D0
_08001398: .4byte 0x00000f07
- thumb_func_end sub_8001320
+ thumb_func_end ShowBgInternal
- thumb_func_start sub_800139C
-sub_800139C: @ 800139C
+ thumb_func_start HideBgInternal
+HideBgInternal: @ 800139C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80014DC
+ bl IsInvalidBg
lsls r0, 24
cmp r0, 0
bne _080013C2
@@ -514,44 +514,44 @@ _080013C2:
.align 2, 0
_080013C8: .4byte gUnknown_30008D0
_080013CC: .4byte 0x00000f07
- thumb_func_end sub_800139C
+ thumb_func_end HideBgInternal
- thumb_func_start sub_80013D0
-sub_80013D0: @ 80013D0
+ thumb_func_start SyncBgVisibilityAndMode
+SyncBgVisibilityAndMode: @ 80013D0
push {lr}
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, _080013EC @ =0x0000f0f8
ands r1, r0
ldr r0, _080013F0 @ =gUnknown_30008D0
ldrh r0, [r0, 0x10]
orrs r1, r0
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_080013EC: .4byte 0x0000f0f8
_080013F0: .4byte gUnknown_30008D0
- thumb_func_end sub_80013D0
+ thumb_func_end SyncBgVisibilityAndMode
- thumb_func_start sub_80013F4
-sub_80013F4: @ 80013F4
+ thumb_func_start SetTextModeAndHideBgs
+SetTextModeAndHideBgs: @ 80013F4
push {lr}
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, _0800140C @ =0x0000f0f8
ands r1, r0
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_0800140C: .4byte 0x0000f0f8
- thumb_func_end sub_80013F4
+ thumb_func_end SetTextModeAndHideBgs
- thumb_func_start sub_8001410
-sub_8001410: @ 8001410
+ thumb_func_start SetBgAffineInternal
+SetBgAffineInternal: @ 8001410
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -614,31 +614,31 @@ _08001468:
bl BgAffineSet
ldrh r1, [r4]
movs r0, 0x20
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2]
movs r0, 0x22
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x4]
movs r0, 0x24
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x6]
movs r0, 0x26
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4]
movs r0, 0x20
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x8]
movs r0, 0x28
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xA]
movs r0, 0x2A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x2C
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x2E
- bl sub_8000A38
+ bl SetGpuReg
_080014CE:
add sp, 0x24
pop {r3}
@@ -646,10 +646,10 @@ _080014CE:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8001410
+ thumb_func_end SetBgAffineInternal
- thumb_func_start sub_80014DC
-sub_80014DC: @ 80014DC
+ thumb_func_start IsInvalidBg
+IsInvalidBg: @ 80014DC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -662,7 +662,7 @@ _080014EA:
_080014EC:
pop {r1}
bx r1
- thumb_func_end sub_80014DC
+ thumb_func_end IsInvalidBg
thumb_func_start sub_80014F0
sub_80014F0: @ 80014F0
@@ -686,7 +686,7 @@ _0800150E:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
lsrs r0, 7
movs r1, 0x80
@@ -751,7 +751,7 @@ _08001582:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
lsrs r0, 7
adds r0, r5
@@ -787,7 +787,7 @@ _080015C8:
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
lsrs r0, 7
adds r0, r5
@@ -832,7 +832,7 @@ _08001614: .4byte gUnknown_3000938
sub_8001618: @ 8001618
push {r4,lr}
adds r4, r0, 0
- bl sub_8001028
+ bl ResetBgs
ldr r1, _0800164C @ =gUnknown_3000928
movs r2, 0
adds r0, r1, 0
@@ -875,8 +875,8 @@ sub_8001658: @ 8001658
lsrs r0, 24
lsls r2, 24
lsrs r4, r2, 24
- bl sub_8001040
- bl sub_800106C
+ bl SetBgModeInternal
+ bl ResetBgControlStructs
cmp r4, 0
beq _08001712
movs r7, 0
@@ -907,7 +907,7 @@ _08001688:
str r7, [sp, 0x8]
str r7, [sp, 0xC]
adds r0, r5, 0
- bl sub_80010B8
+ bl SetBgControlAttributes
lsls r4, r5, 4
mov r5, r9
adds r3, r4, r5
@@ -999,7 +999,7 @@ sub_8001738: @ 8001738
str r6, [sp, 0x8]
str r6, [sp, 0xC]
adds r0, r5, 0
- bl sub_80010B8
+ bl SetBgControlAttributes
ldr r4, _080017C0 @ =gUnknown_30008E8
lsls r5, 4
adds r3, r5, r4
@@ -1050,8 +1050,8 @@ _080017C8: .4byte 0x00003fff
_080017CC: .4byte gUnknown_3000938
thumb_func_end sub_8001738
- thumb_func_start sub_80017D0
-sub_80017D0: @ 80017D0
+ thumb_func_start LoadBgTiles
+LoadBgTiles: @ 80017D0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1066,7 +1066,7 @@ sub_80017D0: @ 80017D0
lsrs r4, r3, 16
adds r0, r5, 0
movs r1, 0x5
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
bne _0800180C
@@ -1098,7 +1098,7 @@ _0800181C:
adds r1, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8001298
+ bl LoadBgVram
lsls r2, r0, 24
lsrs r1, r2, 24
adds r7, r1, 0
@@ -1143,10 +1143,10 @@ _08001872:
.align 2, 0
_08001880: .4byte gUnknown_3000928
_08001884: .4byte gUnknown_3003D8C
- thumb_func_end sub_80017D0
+ thumb_func_end LoadBgTiles
- thumb_func_start sub_8001888
-sub_8001888: @ 8001888
+ thumb_func_start LoadBgTilemap
+LoadBgTilemap: @ 8001888
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -1157,7 +1157,7 @@ sub_8001888: @ 8001888
lsrs r3, 16
movs r4, 0x2
str r4, [sp]
- bl sub_8001298
+ bl LoadBgVram
lsls r2, r0, 24
lsrs r3, r2, 24
cmp r3, 0xFF
@@ -1186,10 +1186,10 @@ _080018CA:
bx r1
.align 2, 0
_080018D4: .4byte 0x0000ffff
- thumb_func_end sub_8001888
+ thumb_func_end LoadBgTilemap
- thumb_func_start sub_80018D8
-sub_80018D8: @ 80018D8
+ thumb_func_start Unused_LoadBgPalette
+Unused_LoadBgPalette: @ 80018D8
push {r4-r7,lr}
adds r7, r1, 0
lsls r0, 24
@@ -1199,7 +1199,7 @@ sub_80018D8: @ 80018D8
lsls r3, 16
lsrs r5, r3, 16
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001924
ldr r1, _08001928 @ =gUnknown_30008E8
@@ -1219,7 +1219,7 @@ sub_80018D8: @ 80018D8
adds r0, r7, 0
adds r2, r6, 0
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
lsls r3, r0, 24
asrs r1, r3, 24
movs r0, 0x1
@@ -1258,10 +1258,10 @@ _08001954:
bx r1
.align 2, 0
_0800195C: .4byte gUnknown_3000928
- thumb_func_end sub_80018D8
+ thumb_func_end Unused_LoadBgPalette
- thumb_func_start sub_8001960
-sub_8001960: @ 8001960
+ thumb_func_start IsDma3ManagerBusyWithBgCopy
+IsDma3ManagerBusyWithBgCopy: @ 8001960
push {r4-r7,lr}
movs r5, 0
movs r7, 0x1
@@ -1289,7 +1289,7 @@ _08001970:
beq _080019AE
lsls r0, r5, 16
asrs r0, 16
- bl sub_8000FE8
+ bl CheckForSpaceForDma3Request
lsls r0, 24
asrs r0, 24
cmp r0, r7
@@ -1311,32 +1311,32 @@ _080019B6:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8001960
+ thumb_func_end IsDma3ManagerBusyWithBgCopy
- thumb_func_start sub_80019BC
-sub_80019BC: @ 80019BC
+ thumb_func_start ShowBg
+ShowBg: @ 80019BC
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8001320
- bl sub_80013D0
+ bl ShowBgInternal
+ bl SyncBgVisibilityAndMode
pop {r0}
bx r0
- thumb_func_end sub_80019BC
+ thumb_func_end ShowBg
- thumb_func_start sub_80019D0
-sub_80019D0: @ 80019D0
+ thumb_func_start HideBg
+HideBg: @ 80019D0
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_800139C
- bl sub_80013D0
+ bl HideBgInternal
+ bl SyncBgVisibilityAndMode
pop {r0}
bx r0
- thumb_func_end sub_80019D0
+ thumb_func_end HideBg
- thumb_func_start sub_80019E4
-sub_80019E4: @ 80019E4
+ thumb_func_start SetBgAttribute
+SetBgAttribute: @ 80019E4
push {r4,lr}
sub sp, 0x10
lsls r0, 24
@@ -1392,7 +1392,7 @@ _08001A46:
adds r0, r4, 0
movs r1, 0xFF
movs r2, 0xFF
- bl sub_80010B8
+ bl SetBgControlAttributes
b _08001A9E
_08001A5C:
str r3, [sp]
@@ -1419,7 +1419,7 @@ _08001A7E:
movs r2, 0xFF
_08001A80:
movs r3, 0xFF
- bl sub_80010B8
+ bl SetBgControlAttributes
b _08001A9E
_08001A88:
movs r0, 0xFF
@@ -1431,16 +1431,16 @@ _08001A88:
movs r1, 0xFF
movs r2, 0xFF
movs r3, 0xFF
- bl sub_80010B8
+ bl SetBgControlAttributes
_08001A9E:
add sp, 0x10
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80019E4
+ thumb_func_end SetBgAttribute
- thumb_func_start sub_8001AA8
-sub_8001AA8: @ 8001AA8
+ thumb_func_start GetBgAttribute
+GetBgAttribute: @ 8001AA8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1471,41 +1471,41 @@ _08001AC8:
_08001AF0:
adds r0, r4, 0
movs r1, 0x2
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001AFA:
adds r0, r4, 0
movs r1, 0x3
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B04:
adds r0, r4, 0
movs r1, 0x4
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B0E:
adds r0, r4, 0
movs r1, 0x5
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B18:
adds r0, r4, 0
movs r1, 0x6
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B22:
adds r0, r4, 0
movs r1, 0x7
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B2C:
adds r0, r4, 0
movs r1, 0x8
- bl sub_80011E4
+ bl GetBgControlAttribute
b _08001B6A
_08001B36:
adds r0, r4, 0
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _08001B48
cmp r0, 0x1
@@ -1515,20 +1515,20 @@ _08001B36:
_08001B48:
adds r0, r4, 0
movs r1, 0
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 27
lsrs r0, 16
b _08001B86
_08001B56:
adds r0, r4, 0
movs r1, 0
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 24
lsrs r0, 16
b _08001B86
_08001B64:
adds r0, r4, 0
- bl sub_8002898
+ bl GetBgType
_08001B6A:
lsls r0, 16
lsrs r0, 16
@@ -1551,10 +1551,10 @@ _08001B86:
bx r1
.align 2, 0
_08001B8C: .4byte 0x0000ffff
- thumb_func_end sub_8001AA8
+ thumb_func_end GetBgAttribute
- thumb_func_start sub_8001B90
-sub_8001B90: @ 8001B90
+ thumb_func_start ChangeBgX
+ChangeBgX: @ 8001B90
push {r4-r6,lr}
adds r6, r1, 0
lsls r0, 24
@@ -1562,12 +1562,12 @@ sub_8001B90: @ 8001B90
lsls r2, 24
lsrs r5, r2, 24
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001BB4
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
bne _08001BBA
@@ -1613,7 +1613,7 @@ _08001BF8:
str r1, [r0]
adds r5, r2, 0
_08001BFC:
- bl sub_800105C
+ bl GetBgMode
lsls r0, 24
lsrs r0, 24
cmp r4, 0x1
@@ -1637,7 +1637,7 @@ _08001C22:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
b _08001CB8
.align 2, 0
_08001C34: .4byte gUnknown_30008E8
@@ -1647,7 +1647,7 @@ _08001C38:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
b _08001CB8
.align 2, 0
_08001C48: .4byte gUnknown_30008E8
@@ -1659,7 +1659,7 @@ _08001C4C:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
b _08001CB8
.align 2, 0
_08001C60: .4byte gUnknown_30008E8
@@ -1670,10 +1670,10 @@ _08001C64:
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x2A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x28
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08001CB8
.align 2, 0
_08001C80: .4byte gUnknown_30008E8
@@ -1685,7 +1685,7 @@ _08001C84:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x1C
- bl sub_8000A38
+ bl SetGpuReg
b _08001CB8
.align 2, 0
_08001C98: .4byte gUnknown_30008E8
@@ -1698,10 +1698,10 @@ _08001C9C:
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x3A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x38
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
_08001CB8:
ldr r0, _08001CC8 @ =gUnknown_30008E8
adds r0, 0x8
@@ -1713,20 +1713,20 @@ _08001CC0:
bx r1
.align 2, 0
_08001CC8: .4byte gUnknown_30008E8
- thumb_func_end sub_8001B90
+ thumb_func_end ChangeBgX
- thumb_func_start sub_8001CCC
-sub_8001CCC: @ 8001CCC
+ thumb_func_start GetBgX
+GetBgX: @ 8001CCC
push {r4,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001CFC
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
beq _08001CFC
@@ -1745,10 +1745,10 @@ _08001D00:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8001CCC
+ thumb_func_end GetBgX
- thumb_func_start sub_8001D08
-sub_8001D08: @ 8001D08
+ thumb_func_start ChangeBgY
+ChangeBgY: @ 8001D08
push {r4-r6,lr}
adds r6, r1, 0
lsls r0, 24
@@ -1756,12 +1756,12 @@ sub_8001D08: @ 8001D08
lsls r2, 24
lsrs r5, r2, 24
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001D2C
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
bne _08001D32
@@ -1807,7 +1807,7 @@ _08001D70:
str r1, [r0]
adds r5, r2, 0
_08001D74:
- bl sub_800105C
+ bl GetBgMode
lsls r0, 24
lsrs r0, 24
cmp r4, 0x1
@@ -1831,7 +1831,7 @@ _08001D9A:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
b _08001E30
.align 2, 0
_08001DAC: .4byte gUnknown_30008E8
@@ -1841,7 +1841,7 @@ _08001DB0:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
b _08001E30
.align 2, 0
_08001DC0: .4byte gUnknown_30008E8
@@ -1853,7 +1853,7 @@ _08001DC4:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
b _08001E30
.align 2, 0
_08001DD8: .4byte gUnknown_30008E8
@@ -1864,10 +1864,10 @@ _08001DDC:
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x2E
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x2C
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08001E30
.align 2, 0
_08001DF8: .4byte gUnknown_30008E8
@@ -1879,7 +1879,7 @@ _08001DFC:
lsls r0, 8
lsrs r1, r0, 16
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
b _08001E30
.align 2, 0
_08001E10: .4byte gUnknown_30008E8
@@ -1892,10 +1892,10 @@ _08001E14:
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x3E
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x3C
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
_08001E30:
ldr r0, _08001E40 @ =gUnknown_30008E8
adds r0, 0xC
@@ -1907,20 +1907,20 @@ _08001E38:
bx r1
.align 2, 0
_08001E40: .4byte gUnknown_30008E8
- thumb_func_end sub_8001D08
+ thumb_func_end ChangeBgY
- thumb_func_start sub_8001E44
-sub_8001E44: @ 8001E44
+ thumb_func_start GetBgY
+GetBgY: @ 8001E44
push {r4,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001E74
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
beq _08001E74
@@ -1939,10 +1939,10 @@ _08001E78:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8001E44
+ thumb_func_end GetBgY
- thumb_func_start sub_8001E80
-sub_8001E80: @ 8001E80
+ thumb_func_start SetBgAffine
+SetBgAffine: @ 8001E80
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1967,24 +1967,24 @@ sub_8001E80: @ 8001E80
asrs r6, 16
str r6, [sp, 0x8]
str r7, [sp, 0xC]
- bl sub_8001410
+ bl SetBgAffineInternal
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8001E80
+ thumb_func_end SetBgAffine
- thumb_func_start sub_8001EC0
-sub_8001EC0: @ 8001EC0
+ thumb_func_start Unused_AdjustBgMosaic
+Unused_AdjustBgMosaic: @ 8001EC0
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r1, 24
lsrs r6, r1, 24
movs r0, 0x4C
- bl sub_8000AC4
+ bl GetGpuReg
lsls r0, 16
lsrs r5, r0, 16
movs r1, 0xF
@@ -2090,27 +2090,27 @@ _08001F76:
lsrs r5, r0, 16
movs r0, 0x4C
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
lsls r0, r5, 24
lsrs r0, 24
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8001EC0
+ thumb_func_end Unused_AdjustBgMosaic
- thumb_func_start sub_8001FA0
-sub_8001FA0: @ 8001FA0
+ thumb_func_start SetBgTilemapBuffer
+SetBgTilemapBuffer: @ 8001FA0
push {r4,r5,lr}
adds r5, r1, 0
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08001FCA
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
beq _08001FCA
@@ -2125,21 +2125,21 @@ _08001FCA:
bx r0
.align 2, 0
_08001FD0: .4byte gUnknown_30008E8
- thumb_func_end sub_8001FA0
+ thumb_func_end SetBgTilemapBuffer
- thumb_func_start sub_8001FD4
-sub_8001FD4: @ 8001FD4
+ thumb_func_start UnsetBgTilemapBuffer
+UnsetBgTilemapBuffer: @ 8001FD4
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
adds r5, r0, 0
cmp r5, 0
bne _08001FFE
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
beq _08001FFE
@@ -2154,20 +2154,20 @@ _08001FFE:
bx r0
.align 2, 0
_08002004: .4byte gUnknown_30008E8
- thumb_func_end sub_8001FD4
+ thumb_func_end UnsetBgTilemapBuffer
- thumb_func_start sub_8002008
-sub_8002008: @ 8002008
+ thumb_func_start GetBgTilemapBuffer
+GetBgTilemapBuffer: @ 8002008
push {r4,lr}
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08002038
adds r0, r4, 0
movs r1, 0x1
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
cmp r0, 0
beq _08002038
@@ -2185,10 +2185,10 @@ _0800203A:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8002008
+ thumb_func_end GetBgTilemapBuffer
- thumb_func_start sub_8002040
-sub_8002040: @ 8002040
+ thumb_func_start CopyToBgTilemapBuffer
+CopyToBgTilemapBuffer: @ 8002040
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2204,11 +2204,11 @@ sub_8002040: @ 8002040
lsrs r5, r3, 16
mov r8, r5
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _080020A8
adds r0, r4, 0
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
bne _080020A8
cmp r6, 0
@@ -2248,24 +2248,24 @@ _080020A8:
bx r0
.align 2, 0
_080020B8: .4byte gUnknown_30008E8
- thumb_func_end sub_8002040
+ thumb_func_end CopyToBgTilemapBuffer
- thumb_func_start sub_80020BC
-sub_80020BC: @ 80020BC
+ thumb_func_start CopyBgTilemapBufferToVram
+CopyBgTilemapBufferToVram: @ 80020BC
push {r4,lr}
sub sp, 0x4
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08002118
adds r0, r4, 0
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
bne _08002118
adds r0, r4, 0
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _080020EA
cmp r0, 0x1
@@ -2275,13 +2275,13 @@ sub_80020BC: @ 80020BC
_080020EA:
adds r0, r4, 0
movs r1, 0
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 27
b _08002100
_080020F6:
adds r0, r4, 0
movs r1, 0
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 24
_08002100:
lsrs r2, r0, 16
@@ -2295,7 +2295,7 @@ _08002102:
str r0, [sp]
adds r0, r4, 0
movs r3, 0
- bl sub_8001298
+ bl LoadBgVram
_08002118:
add sp, 0x4
pop {r4}
@@ -2303,10 +2303,10 @@ _08002118:
bx r0
.align 2, 0
_08002120: .4byte gUnknown_30008E8
- thumb_func_end sub_80020BC
+ thumb_func_end CopyBgTilemapBufferToVram
- thumb_func_start sub_8002124
-sub_8002124: @ 8002124
+ thumb_func_start CopyToBgTilemapBufferRect
+CopyToBgTilemapBufferRect: @ 8002124
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2329,15 +2329,15 @@ sub_8002124: @ 8002124
lsls r4, 24
lsrs r6, r4, 24
adds r0, r5, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08002214
adds r0, r5, 0
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
bne _08002214
adds r0, r5, 0
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _08002172
cmp r0, 0x1
@@ -2389,7 +2389,7 @@ _080021C0:
mov r4, r8
adds r0, r5, 0
movs r1, 0x1
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 16
lsrs r0, 16
str r0, [sp]
@@ -2441,10 +2441,10 @@ _08002214:
bx r0
.align 2, 0
_08002224: .4byte gUnknown_30008EC
- thumb_func_end sub_8002124
+ thumb_func_end CopyToBgTilemapBufferRect
- thumb_func_start sub_8002228
-sub_8002228: @ 8002228
+ thumb_func_start CopyToBgTilemapBufferRect_ChangePalette
+CopyToBgTilemapBufferRect_ChangePalette: @ 8002228
push {r4-r6,lr}
sub sp, 0x24
ldr r4, [sp, 0x34]
@@ -2473,15 +2473,15 @@ sub_8002228: @ 8002228
str r2, [sp, 0x1C]
str r2, [sp, 0x20]
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
add sp, 0x24
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8002228
+ thumb_func_end CopyToBgTilemapBufferRect_ChangePalette
- thumb_func_start sub_800226C
-sub_800226C: @ 800226C
+ thumb_func_start CopyRectToBgTilemapBufferRect
+CopyRectToBgTilemapBufferRect: @ 800226C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2536,37 +2536,37 @@ sub_800226C: @ 800226C
lsrs r0, 16
str r0, [sp, 0x24]
ldr r0, [sp, 0x4]
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
beq _080022E2
b _0800243E
_080022E2:
ldr r0, [sp, 0x4]
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
beq _080022EE
b _0800243E
_080022EE:
ldr r0, [sp, 0x4]
movs r1, 0x4
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x30]
ldr r0, [sp, 0x4]
movs r1, 0x1
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 21
lsrs r0, 16
str r0, [sp, 0x28]
ldr r0, [sp, 0x4]
movs r1, 0x2
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 21
lsrs r0, 16
str r0, [sp, 0x2C]
ldr r0, [sp, 0x4]
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _08002328
cmp r0, 0x1
@@ -2617,7 +2617,7 @@ _0800236E:
adds r1, r5, 0
ldr r2, [sp, 0x30]
ldr r3, [sp, 0x28]
- bl sub_8002804
+ bl GetTileMapIndexFromCoords
lsls r0, 16
lsrs r0, 15
mov r7, r10
@@ -2629,7 +2629,7 @@ _0800236E:
ldr r2, [sp, 0x1C]
mov r7, r9
asrs r3, r7, 16
- bl sub_800283C
+ bl CopyTileMapEntry
adds r6, 0x2
adds r0, r4, 0x1
lsls r0, 16
@@ -2662,7 +2662,7 @@ _080023C4:
adds r6, r1, r0
ldr r0, [sp, 0x4]
movs r1, 0x1
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 16
lsrs r0, 16
mov r9, r0
@@ -2727,10 +2727,10 @@ _0800243E:
bx r0
.align 2, 0
_08002450: .4byte gUnknown_30008EC
- thumb_func_end sub_800226C
+ thumb_func_end CopyRectToBgTilemapBufferRect
- thumb_func_start sub_8002454
-sub_8002454: @ 8002454
+ thumb_func_start FillBgTilemapBufferRect_Palette0
+FillBgTilemapBufferRect_Palette0: @ 8002454
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2755,15 +2755,15 @@ sub_8002454: @ 8002454
lsls r5, 24
lsrs r5, 24
adds r0, r6, 0
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
bne _08002540
adds r0, r6, 0
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
bne _08002540
adds r0, r6, 0
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _080024A6
cmp r0, 0x1
@@ -2812,7 +2812,7 @@ _080024EC: .4byte gUnknown_30008EC
_080024F0:
adds r0, r6, 0
movs r1, 0x1
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 16
lsrs r0, 16
str r0, [sp]
@@ -2863,10 +2863,10 @@ _08002540:
bx r0
.align 2, 0
_08002550: .4byte gUnknown_30008EC
- thumb_func_end sub_8002454
+ thumb_func_end FillBgTilemapBufferRect_Palette0
- thumb_func_start sub_8002554
-sub_8002554: @ 8002554
+ thumb_func_start FillBgTilemapBufferRect
+FillBgTilemapBufferRect: @ 8002554
push {r4-r6,lr}
sub sp, 0x10
ldr r4, [sp, 0x20]
@@ -2891,15 +2891,15 @@ sub_8002554: @ 8002554
str r6, [sp, 0x8]
movs r4, 0
str r4, [sp, 0xC]
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
add sp, 0x10
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8002554
+ thumb_func_end FillBgTilemapBufferRect
- thumb_func_start sub_8002590
-sub_8002590: @ 8002590
+ thumb_func_start WriteSequenceToBgTilemapBuffer
+WriteSequenceToBgTilemapBuffer: @ 8002590
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2934,37 +2934,37 @@ sub_8002590: @ 8002590
lsrs r0, 16
str r0, [sp, 0x10]
mov r0, r9
- bl sub_80028EC
+ bl IsInvalidBg32
cmp r0, 0
beq _080025DE
b _08002724
_080025DE:
mov r0, r9
- bl sub_8002900
+ bl IsTileMapOutsideWram
cmp r0, 0
beq _080025EA
b _08002724
_080025EA:
mov r0, r9
movs r1, 0x4
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x1C]
mov r0, r9
movs r1, 0x1
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 21
lsrs r0, 16
str r0, [sp, 0x14]
mov r0, r9
movs r1, 0x2
- bl sub_800273C
+ bl GetBgMetricTextMode
lsls r0, 21
lsrs r0, 16
str r0, [sp, 0x18]
mov r0, r9
- bl sub_8002898
+ bl GetBgType
cmp r0, 0
beq _08002624
cmp r0, 0x1
@@ -2996,7 +2996,7 @@ _08002646:
adds r1, r5, 0
ldr r2, [sp, 0x1C]
ldr r3, [sp, 0x14]
- bl sub_8002804
+ bl GetTileMapIndexFromCoords
lsls r0, 16
lsrs r0, 15
ldr r1, [r6]
@@ -3006,7 +3006,7 @@ _08002646:
add r0, sp, 0x4
ldr r2, [sp, 0xC]
movs r3, 0
- bl sub_800283C
+ bl CopyTileMapEntry
ldrh r0, [r7]
movs r2, 0xFC
lsls r2, 8
@@ -3041,7 +3041,7 @@ _080026A8: .4byte 0x000003ff
_080026AC:
mov r0, r9
movs r1, 0x1
- bl sub_80027AC
+ bl GetBgMetricAffineMode
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x20]
@@ -3113,10 +3113,10 @@ _08002724:
.align 2, 0
_08002734: .4byte gUnknown_30008EC
_08002738: .4byte 0x000003ff
- thumb_func_end sub_8002590
+ thumb_func_end WriteSequenceToBgTilemapBuffer
- thumb_func_start sub_800273C
-sub_800273C: @ 800273C
+ thumb_func_start GetBgMetricTextMode
+GetBgMetricTextMode: @ 800273C
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -3124,7 +3124,7 @@ sub_800273C: @ 800273C
lsrs r4, r1, 24
adds r5, r4, 0
movs r1, 0x4
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 24
lsrs r0, 24
cmp r4, 0x1
@@ -3182,17 +3182,17 @@ _080027A4:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_800273C
+ thumb_func_end GetBgMetricTextMode
- thumb_func_start sub_80027AC
-sub_80027AC: @ 80027AC
+ thumb_func_start GetBgMetricAffineMode
+GetBgMetricAffineMode: @ 80027AC
push {r4,lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r4, r1, 24
movs r1, 0x4
- bl sub_80011E4
+ bl GetBgControlAttribute
lsls r0, 24
lsrs r1, r0, 24
adds r0, r1, 0
@@ -3237,10 +3237,10 @@ _080027FE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80027AC
+ thumb_func_end GetBgMetricAffineMode
- thumb_func_start sub_8002804
-sub_8002804: @ 8002804
+ thumb_func_start GetTileMapIndexFromCoords
+GetTileMapIndexFromCoords: @ 8002804
push {r4,lr}
adds r4, r0, 0
ldr r0, [sp, 0x8]
@@ -3270,10 +3270,10 @@ _08002830:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8002804
+ thumb_func_end GetTileMapIndexFromCoords
- thumb_func_start sub_800283C
-sub_800283C: @ 800283C
+ thumb_func_start CopyTileMapEntry
+CopyTileMapEntry: @ 800283C
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
@@ -3323,15 +3323,15 @@ _0800288C:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_800283C
+ thumb_func_end CopyTileMapEntry
- thumb_func_start sub_8002898
-sub_8002898: @ 8002898
+ thumb_func_start GetBgType
+GetBgType: @ 8002898
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl sub_800105C
+ bl GetBgMode
lsls r0, 24
lsrs r0, 24
cmp r4, 0x2
@@ -3374,10 +3374,10 @@ _080028E0:
bx r1
.align 2, 0
_080028E8: .4byte 0x0000ffff
- thumb_func_end sub_8002898
+ thumb_func_end GetBgType
- thumb_func_start sub_80028EC
-sub_80028EC: @ 80028EC
+ thumb_func_start IsInvalidBg32
+IsInvalidBg32: @ 80028EC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -3390,10 +3390,10 @@ _080028FA:
_080028FC:
pop {r1}
bx r1
- thumb_func_end sub_80028EC
+ thumb_func_end IsInvalidBg32
- thumb_func_start sub_8002900
-sub_8002900: @ 8002900
+ thumb_func_start IsTileMapOutsideWram
+IsTileMapOutsideWram: @ 8002900
push {lr}
lsls r0, 24
ldr r1, _0800291C @ =gUnknown_30008E8
@@ -3416,6 +3416,6 @@ _08002924:
_08002926:
pop {r1}
bx r1
- thumb_func_end sub_8002900
+ thumb_func_end IsTileMapOutsideWram
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/bike.s b/asm/bike.s
index 141da61eb..ba262d01e 100644
--- a/asm/bike.s
+++ b/asm/bike.s
@@ -79,7 +79,7 @@ sub_80BD100: @ 80BD100
lsls r4, 2
ldr r0, _080BD160 @ =gUnknown_2036E38
adds r4, r0
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0
@@ -195,7 +195,7 @@ sub_80BD1E8: @ 80BD1E8
lsls r2, 16
lsrs r2, 16
mov r8, r2
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r5, r0, 24
adds r7, r5, 0
@@ -437,7 +437,7 @@ sub_80BD3A0: @ 80BD3A0
adds r0, r6, 0
add r1, sp, 0x4
adds r2, r5, 0
- bl sub_8063A20
+ bl MoveCoords
add r0, sp, 0x4
movs r1, 0
ldrsh r0, [r0, r1]
@@ -581,7 +581,7 @@ sub_80BD4B8: @ 80BD4B8
lsls r0, 24
cmp r0, 0
beq _080BD4E6
- bl sub_805C700
+ bl PlayerGetZCoord
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -655,7 +655,7 @@ sub_80BD540: @ 80BD540
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -685,7 +685,7 @@ _080BD582:
sub_80BD58C: @ 80BD58C
push {lr}
movs r0, 0x4
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _080BD5C0
@@ -866,7 +866,7 @@ sub_80BD6C4: @ 80BD6C4
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -881,7 +881,7 @@ sub_80BD6C4: @ 80BD6C4
beq _080BD70C
movs r0, 0x2
strb r0, [r5, 0x8]
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r0, 24
bl nullsub_24
diff --git a/asm/blend_palette.s b/asm/blend_palette.s
index d80e9b5ed..5ef3cf070 100644
--- a/asm/blend_palette.s
+++ b/asm/blend_palette.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8045274
-sub_8045274: @ 8045274
+ thumb_func_start BlendPalette
+BlendPalette: @ 8045274
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -87,7 +87,7 @@ _080452FA:
.align 2, 0
_0804530C: .4byte gUnknown_20371F8
_08045310: .4byte gUnknown_20375F8
- thumb_func_end sub_8045274
+ thumb_func_end BlendPalette
thumb_func_start sub_8045314
sub_8045314: @ 8045314
diff --git a/asm/box_party_pokemon_dropdown.s b/asm/box_party_pokemon_dropdown.s
index 0222195c2..86ebbae85 100644
--- a/asm/box_party_pokemon_dropdown.s
+++ b/asm/box_party_pokemon_dropdown.s
@@ -14,7 +14,7 @@ sub_80F7AD8: @ 80F7AD8
lsls r0, r4, 1
adds r0, r4
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
str r0, [r6]
ldr r5, _080F7B28 @ =gUnknown_203ABE8
movs r1, 0
@@ -57,7 +57,7 @@ sub_80F7B2C: @ 80F7B2C
push {lr}
ldr r0, _080F7B3C @ =gUnknown_203ABE4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
pop {r0}
bx r0
.align 2, 0
@@ -147,13 +147,13 @@ sub_80F7B80: @ 80F7B80
strh r1, [r0, 0x26]
adds r0, r7, 0
movs r1, 0x3
- bl sub_8001AA8
+ bl GetBgAttribute
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
movs r1, 0x9
- bl sub_8001AA8
+ bl GetBgAttribute
lsls r0, 16
lsrs r0, 16
mov r2, r9
@@ -584,7 +584,7 @@ _080F7EE6:
movs r1, 0x1
str r1, [sp, 0x4]
adds r1, r7, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
add r7, r9
adds r6, 0x1
mov r1, r10
@@ -665,7 +665,7 @@ _080F7F7E:
movs r1, 0x1
str r1, [sp, 0x4]
adds r1, r7, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
add r7, r9
adds r6, 0x1
mov r1, r10
diff --git a/asm/braille_text.s b/asm/braille_text.s
index e9b1244f1..6d099e76d 100644
--- a/asm/braille_text.s
+++ b/asm/braille_text.s
@@ -350,7 +350,7 @@ _0814FB22:
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _0814F992
_0814FB34:
movs r0, 0x2
@@ -418,7 +418,7 @@ _0814FB9A:
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
movs r1, 0
strb r0, [r6, 0x8]
@@ -473,7 +473,7 @@ _0814FBFC:
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl sub_80044A8
+ bl ScrollWindow
movs r0, 0
strb r0, [r6, 0x1F]
b _0814FC62
@@ -491,7 +491,7 @@ _0814FC38:
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl sub_80044A8
+ bl ScrollWindow
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r0, 29
@@ -510,7 +510,7 @@ _0814FC6C:
strb r2, [r6, 0x1C]
b _0814FB42
_0814FC70:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0
diff --git a/asm/buy_menu_helpers.s b/asm/buy_menu_helpers.s
index 8614d7d51..378c9311c 100644
--- a/asm/buy_menu_helpers.s
+++ b/asm/buy_menu_helpers.s
@@ -34,15 +34,15 @@ _0813F686:
movs r2, 0xF0
bl sub_814FF2C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _0813F6C4
movs r0, 0x6
- bl sub_8003FA0
+ bl PutWindowTilemap
_0813F6C4:
pop {r4}
pop {r0}
@@ -155,7 +155,7 @@ sub_813F75C: @ 813F75C
movs r3, 0xE
bl sub_80BF474
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -173,7 +173,7 @@ sub_813F7A8: @ 813F7A8
lsrs r1, 24
movs r2, 0x1
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_813F7A8
@@ -187,7 +187,7 @@ sub_813F7C0: @ 813F7C0
lsrs r1, 24
movs r2, 0xA
movs r3, 0xF
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_813F7C0
diff --git a/asm/cable_club.s b/asm/cable_club.s
index c3fa3292d..ccbffa12d 100644
--- a/asm/cable_club.s
+++ b/asm/cable_club.s
@@ -14,14 +14,14 @@ sub_8080748: @ 8080748
lsrs r5, r1, 24
ldr r4, _08080784 @ =sub_80809F8
adds r0, r4, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _0808077C
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08080788 @ =gUnknown_3005090
@@ -361,7 +361,7 @@ sub_80809C4: @ 80809C4
movs r0, 0x2
bl sub_800A474
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080809EE:
pop {r4}
pop {r0}
@@ -447,7 +447,7 @@ sub_8080A4C: @ 8080A4C
movs r0, 0x15
bl sub_80722CC
ldr r0, _08080AA8 @ =gUnknown_81BC4CE
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
ldr r0, _08080AAC @ =sub_8080AD0
b _08080ABE
.align 2, 0
@@ -458,7 +458,7 @@ _08080AB0:
movs r0, 0x16
bl sub_80722CC
ldr r0, _08080AC8 @ =gUnknown_81BC54C
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
ldr r0, _08080ACC @ =sub_8080CDC
_08080ABE:
str r0, [r4]
@@ -488,7 +488,7 @@ sub_8080AD0: @ 8080AD0
bl sub_80808BC
cmp r0, 0x1
beq _08080B10
- bl sub_8069510
+ bl textbox_any_visible
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -565,7 +565,7 @@ sub_8080B20: @ 8080B20
movs r3, 0x1
bl sub_8008E78
ldr r0, _08080BC0 @ =gUnknown_81BC50D
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
mov r0, r9
subs r0, 0x8
add r0, r8
@@ -604,7 +604,7 @@ sub_8080BC8: @ 8080BC8
bl sub_80808BC
cmp r0, 0x1
beq _08080C5C
- bl sub_8069510
+ bl textbox_any_visible
lsls r0, 24
cmp r0, 0
bne _08080C5C
@@ -623,7 +623,7 @@ sub_8080BC8: @ 8080BC8
beq _08080C3C
_08080C16:
ldr r0, _08080C30 @ =gUnknown_81BC4CE
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
ldr r1, _08080C34 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -752,7 +752,7 @@ sub_8080CDC: @ 8080CDC
cmp r0, 0x1
bhi _08080D3C
bl sub_800AAC0
- bl sub_80694F4
+ bl HideFieldMessageBox
ldr r0, _08080D38 @ =sub_8080F78
b _08080D72
.align 2, 0
@@ -766,7 +766,7 @@ _08080D3C:
bne _08080D54
_08080D44:
bl sub_80098B8
- bl sub_80694F4
+ bl HideFieldMessageBox
ldr r0, _08080D50 @ =sub_8080F78
b _08080D72
.align 2, 0
@@ -775,7 +775,7 @@ _08080D54:
bl sub_800AA38
ldr r4, _08080D7C @ =gUnknown_3005030
strb r0, [r4]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _08080D80 @ =gUnknown_300502C
strb r0, [r1]
ldrb r0, [r4]
@@ -862,7 +862,7 @@ _08080DF6:
_08080DFE:
bl sub_80098B8
_08080E02:
- bl sub_80694F4
+ bl HideFieldMessageBox
ldr r0, _08080E18 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -878,7 +878,7 @@ _08080E20:
bl sub_800AA38
ldr r4, _08080E58 @ =gUnknown_3005030
strb r0, [r4]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _08080E5C @ =gUnknown_300502C
strb r0, [r1]
ldrb r0, [r4]
@@ -917,7 +917,7 @@ sub_8080E6C: @ 8080E6C
bl sub_80808BC
cmp r0, 0x1
beq _08080F66
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
adds r4, r0, 0
bl sub_800A8A4
lsls r4, 24
@@ -982,8 +982,8 @@ _08080EF8:
bcc _08080E9A
movs r0, 0
bl sub_800B09C
- bl sub_800A550
- bl sub_80694F4
+ bl ResetBlockReceivedFlags
+ bl HideFieldMessageBox
ldr r0, _08080F44 @ =gUnknown_20370D0
ldrh r0, [r0]
cmp r0, 0x1
@@ -998,9 +998,9 @@ _08080EF8:
adds r1, r0
ldrh r0, [r1, 0x12]
bl sub_80807E8
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
b _08080F66
.align 2, 0
_08080F3C: .4byte gUnknown_2022118
@@ -1045,11 +1045,11 @@ sub_8080F78: @ 8080F78
adds r4, r0
ldrh r0, [r4, 0x12]
bl sub_80807E8
- bl sub_8069B34
+ bl EnableBothScriptContexts
ldrb r0, [r4, 0x12]
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08080FA6:
pop {r4,r5}
pop {r0}
@@ -1075,10 +1075,10 @@ sub_8080FB4: @ 8080FB4
adds r0, r1
ldrh r0, [r0, 0x12]
bl sub_80807E8
- bl sub_80694F4
- bl sub_8069B34
+ bl HideFieldMessageBox
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -1103,10 +1103,10 @@ sub_8080FF0: @ 8080FF0
adds r0, r1
ldrh r0, [r0, 0x12]
bl sub_80807E8
- bl sub_80694F4
- bl sub_8069B34
+ bl HideFieldMessageBox
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -1275,7 +1275,7 @@ _0808114C: .4byte gUnknown_2022B4C
sub_8081150: @ 8081150
push {lr}
ldr r0, _08081164 @ =sub_80811FC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08081168
@@ -1341,7 +1341,7 @@ _080811DC:
_080811E0:
ldr r0, _080811F8 @ =sub_80811FC
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
_080811EC:
@@ -1371,7 +1371,7 @@ sub_80811FC: @ 80811FC
bl sub_800A270
ldr r0, _0808122C @ =sub_8081A90
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
b _0808123C
.align 2, 0
_08081228: .4byte gUnknown_3005098
@@ -1484,7 +1484,7 @@ sub_80812D8: @ 80812D8
bl sub_800A9A4
bl sub_8009FE8
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08081300:
pop {r4}
pop {r0}
@@ -1536,7 +1536,7 @@ _08081344:
_0808135C:
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r1, _08081374 @ =gUnknown_202271A
ldr r2, _08081378 @ =0x00002211
adds r0, r2, 0
@@ -1638,12 +1638,12 @@ _0808141A:
adds r0, r2, 0
strh r0, [r1]
ldr r0, _08081448 @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _0808144C @ =gUnknown_30030F0
ldr r0, _08081450 @ =sub_8081668
str r0, [r1, 0x8]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0808143A:
pop {r4,r5}
pop {r0}
@@ -1693,7 +1693,7 @@ _08081480:
_080814A0:
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080814BC @ =gUnknown_202271A
ldr r2, _080814C0 @ =0x00002211
adds r1, r2, 0
@@ -1723,14 +1723,14 @@ _080814DC:
ldr r1, _080814EC @ =gUnknown_2022720
movs r0, 0
movs r2, 0x1C
- bl sub_800A448
+ bl SendBlock
movs r0, 0x3
strh r0, [r6]
b _0808160A
.align 2, 0
_080814EC: .4byte gUnknown_2022720
_080814F0:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
adds r4, r0, 0
bl sub_800A8D4
lsls r4, 24
@@ -1759,7 +1759,7 @@ _08081510:
bl sub_800B284
lsls r0, r4, 24
lsrs r0, 24
- bl sub_800A588
+ bl ResetBlockReceivedFlag
adds r5, 0x1C
adds r4, 0x1
_08081536:
@@ -1861,12 +1861,12 @@ _080815EA:
adds r0, r3, 0
strh r0, [r1]
ldr r0, _08081618 @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _0808161C @ =gUnknown_30030F0
ldr r0, _08081620 @ =sub_8081668
str r0, [r1, 0x8]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0808160A:
pop {r4-r7}
pop {r0}
@@ -1905,14 +1905,14 @@ _0808164C:
lsls r0, 24
cmp r0, 0
beq _0808165C
- ldr r0, _08081664 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _08081664 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
_0808165C:
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08081664: .4byte sub_80567DC
+_08081664: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8081624
thumb_func_start sub_8081668
@@ -1956,7 +1956,7 @@ _080816C0: .4byte gUnknown_3003F3C
_080816C4: .4byte gUnknown_2023E8A
_080816C8:
ldr r4, _080816E8 @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -1973,7 +1973,7 @@ _080816C8:
_080816E8: .4byte gUnknown_202273C
_080816EC:
ldr r4, _08081718 @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r5
lsls r0, 24
lsrs r0, 24
@@ -1998,17 +1998,17 @@ _0808171C: .4byte gUnknown_30030F0
_08081720: .4byte sub_8081624
_08081724:
ldr r1, _08081738 @ =gUnknown_30030F0
- ldr r0, _0808173C @ =sub_8056854
+ ldr r0, _0808173C @ =c2_8056854
_08081728:
str r0, [r1, 0x8]
ldr r0, _08081740 @ =sub_806FB7C
- bl sub_8000544
+ bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08081738: .4byte gUnknown_30030F0
-_0808173C: .4byte sub_8056854
+_0808173C: .4byte c2_8056854
_08081740: .4byte sub_806FB7C
thumb_func_end sub_8081668
@@ -2029,7 +2029,7 @@ _08081758:
bl sub_804C440
_08081760:
movs r0, 0x7F
- bl sub_8055454
+ bl copy_saved_warp2_bank_and_enter_x_to_warp1
pop {r0}
bx r0
.align 2, 0
@@ -2080,7 +2080,7 @@ _080817AE:
.align 2, 0
_080817BC: .4byte gUnknown_81BC4AC
_080817C0:
- bl sub_806951C
+ bl IsFieldMessageBoxHidden
lsls r0, 24
cmp r0, 0
beq _08081820
@@ -2103,12 +2103,12 @@ _080817E0:
beq _08081806
b _08081820
_080817F2:
- bl sub_80694F4
+ bl HideFieldMessageBox
movs r0, 0
strh r0, [r5, 0x8]
bl sub_8057F70
adds r0, r4, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
b _08081820
_08081806:
movs r0, 0x3
@@ -2119,8 +2119,8 @@ _0808180C:
movs r0, 0x1
bl sub_80F771C
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_08081820:
pop {r4,r5}
pop {r0}
@@ -2134,13 +2134,13 @@ sub_8081828: @ 8081828
ldr r4, _0808184C @ =sub_808177C
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
adds r2, r5, 0
- bl sub_80775E8
- bl sub_8069B28
+ bl SetTaskFuncWithFollowupFunc
+ bl ScriptContext1_Stop
pop {r4,r5}
pop {r0}
bx r0
@@ -2176,10 +2176,10 @@ _08081878:
beq _080818C4
b _080818D8
_08081882:
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_800A068
b _080818B8
_08081894:
@@ -2212,9 +2212,9 @@ _080818C4:
cmp r0, 0
bne _080818D8
ldr r0, _080818E4 @ =sub_804C718
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080818D8:
pop {r4,r5}
pop {r0}
@@ -2252,10 +2252,10 @@ _08081910:
beq _0808195C
b _08081970
_0808191A:
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_80F985C
b _08081950
_0808192C:
@@ -2289,7 +2289,7 @@ _0808195C:
beq _08081970
bl sub_8117118
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08081970:
pop {r4,r5}
pop {r0}
@@ -2324,7 +2324,7 @@ sub_80819A4: @ 80819A4
push {lr}
ldr r0, _080819B4 @ =sub_8081850
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -2335,7 +2335,7 @@ _080819B4: .4byte sub_8081850
sub_80819B8: @ 80819B8
push {lr}
bl sub_80819A4
- bl sub_8069B28
+ bl ScriptContext1_Stop
pop {r0}
bx r0
thumb_func_end sub_80819B8
@@ -2374,8 +2374,8 @@ sub_8081A04: @ 8081A04
push {lr}
ldr r0, _08081A18 @ =sub_808177C
movs r1, 0x50
- bl sub_807741C
- bl sub_8069B28
+ bl CreateTask
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
@@ -2387,13 +2387,13 @@ sub_8081A1C: @ 8081A1C
push {lr}
ldr r0, _08081A2C @ =gUnknown_20370C4
ldrb r0, [r0]
- ldr r1, _08081A30 @ =sub_80568E0
+ ldr r1, _08081A30 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl sub_808B700
pop {r0}
bx r0
.align 2, 0
_08081A2C: .4byte gUnknown_20370C4
-_08081A30: .4byte sub_80568E0
+_08081A30: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_8081A1C
thumb_func_start sub_8081A34
@@ -2410,7 +2410,7 @@ sub_8081A34: @ 8081A34
lsls r1, 2
ldr r2, _08081A7C @ =gUnknown_2022744
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
bl sub_808B1BC
lsls r0, 24
@@ -2423,7 +2423,7 @@ sub_8081A34: @ 8081A34
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
b _08081A8A
.align 2, 0
@@ -2460,24 +2460,24 @@ sub_8081A90: @ 8081A90
cmp r1, r0
ble _08081AC2
bl sub_80098B8
- ldr r0, _08081ADC @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _08081ADC @ =c2_800ACD4
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08081AC2:
ldr r0, _08081AE0 @ =gUnknown_3003F64
ldrb r0, [r0]
cmp r0, 0
beq _08081AD0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08081AD0:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08081AD8: .4byte gUnknown_3005090
-_08081ADC: .4byte sub_800ACD4
+_08081ADC: .4byte c2_800ACD4
_08081AE0: .4byte gUnknown_3003F64
thumb_func_end sub_8081A90
@@ -2490,9 +2490,9 @@ sub_8081AE4: @ 8081AE4
ldrb r0, [r0]
cmp r0, 0
bne _08081AFC
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08081AFC:
pop {r4}
pop {r0}
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s
index bfbf9df3f..11dff8f6c 100644
--- a/asm/calculate_base_damage.s
+++ b/asm/calculate_base_damage.s
@@ -99,12 +99,12 @@ _0803ED6E:
_0803ED9C: .4byte gUnknown_2023F54
_0803EDA0:
ldrh r0, [r6, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
mov r10, r0
ldrh r0, [r6, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
lsls r0, 24
lsrs r0, 24
_0803EDB6:
@@ -135,13 +135,13 @@ _0803EDD4:
_0803EDE6:
ldr r2, [sp, 0x4]
ldrh r0, [r2, 0x2E]
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x1C]
ldr r3, [sp, 0x4]
ldrh r0, [r3, 0x2E]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
_0803EDFC:
adds r0, r6, 0
adds r0, 0x20
@@ -168,7 +168,7 @@ _0803EE10:
cmp r0, 0
beq _0803EE44
ldr r0, [sp, 0x10]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803EE44
@@ -191,7 +191,7 @@ _0803EE44:
cmp r0, 0
beq _0803EE7A
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803EE7A
@@ -216,7 +216,7 @@ _0803EE7A:
cmp r0, 0
beq _0803EEB2
ldr r0, [sp, 0x10]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803EEB2
@@ -242,7 +242,7 @@ _0803EEB2:
cmp r0, 0
beq _0803EEE8
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0803EEE8
diff --git a/asm/cereader_tool.s b/asm/cereader_tool.s
index 2c0042933..5e677c3f6 100644
--- a/asm/cereader_tool.s
+++ b/asm/cereader_tool.s
@@ -44,7 +44,7 @@ sub_815D67C: @ 815D67C
lsls r4, 2
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8045254
+ bl CalcByteArraySum
adds r4, r5, r4
ldr r1, [r4]
cmp r0, r1
@@ -89,7 +89,7 @@ _0815D6E0:
lsls r1, r6, 5
subs r1, r6
lsls r1, 5
- bl sub_8045254
+ bl CalcByteArraySum
ldr r1, [r7, 0x4]
cmp r0, r1
bne _0815D6F8
@@ -179,14 +179,14 @@ sub_815D794: @ 815D794
adds r4, r0, 0
movs r0, 0x80
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
adds r0, r4, 0
adds r1, r5, 0
bl sub_815D700
adds r4, r0, 0
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
pop {r4,r5}
pop {r1}
diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s
index 34005c5c1..abdbe8c44 100644
--- a/asm/clear_save_data_screen.s
+++ b/asm/clear_save_data_screen.s
@@ -8,10 +8,10 @@
thumb_func_start sub_80F5574
sub_80F5574: @ 80F5574
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80F5574
@@ -19,9 +19,9 @@ sub_80F5574: @ 80F5574
thumb_func_start sub_80F558C
sub_80F558C: @ 80F558C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80F558C
@@ -31,7 +31,7 @@ sub_80F55A0: @ 80F55A0
push {r4,lr}
ldr r4, _080F55D0 @ =gUnknown_203AB54
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r1, 0
strb r1, [r0, 0x1]
@@ -42,9 +42,9 @@ sub_80F55A0: @ 80F55A0
bl sub_80F580C
ldr r0, _080F55D4 @ =sub_80F55DC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _080F55D8 @ =sub_80F5574
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -88,7 +88,7 @@ _080F5618:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F56E2
_080F562A:
ldr r0, _080F5640 @ =gUnknown_2037AB8
@@ -98,7 +98,7 @@ _080F562A:
cmp r0, 0
bne _080F56EC
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
b _080F56E2
.align 2, 0
_080F5640: .4byte gUnknown_2037AB8
@@ -120,7 +120,7 @@ _080F5660:
movs r1, 0x1
movs r2, 0x1
movs r3, 0xF
- bl sub_810F2E8
+ bl SetWindowBorderStyle
movs r0, 0x1
str r0, [sp]
str r0, [sp, 0x4]
@@ -154,7 +154,7 @@ _080F569C:
movs r3, 0x2
bl sub_810FF60
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080F56E2
.align 2, 0
_080F56BC: .4byte gUnknown_841EE68
@@ -164,9 +164,9 @@ _080F56C0:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F56F8 @ =sub_80F558C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r1, _080F56FC @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -228,7 +228,7 @@ _080F5744:
bl sub_80722CC
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
str r0, [sp]
str r0, [sp, 0x4]
@@ -287,7 +287,7 @@ _080F57B8:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
ldrb r0, [r1, 0x2]
adds r0, 0x1
@@ -306,10 +306,10 @@ _080F57D4:
bne _080F57FE
bl sub_81100E8
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
str r4, [r5]
bl sub_80008D8
_080F57FE:
@@ -324,9 +324,9 @@ _080F5808: .4byte gUnknown_2037AB8
thumb_func_start sub_80F580C
sub_80F580C: @ 80F580C
push {lr}
- bl sub_8006B10
- bl sub_8070528
- bl sub_80773BC
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl ResetTasks
pop {r0}
bx r0
thumb_func_end sub_80F580C
@@ -402,10 +402,10 @@ _080F5846:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _080F5944 @ =gUnknown_841EE64
@@ -415,44 +415,44 @@ _080F5846:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _080F5948 @ =gUnknown_841EE68
bl sub_8003B24
bl sub_8002C28
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
add sp, 0x8
pop {r3}
mov r8, r3
diff --git a/asm/coins.s b/asm/coins.s
index 35cff05ea..04af38a40 100644
--- a/asm/coins.s
+++ b/asm/coins.s
@@ -184,7 +184,7 @@ sub_80D0674: @ 80D0674
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r2, _080D06CC @ =gUnknown_8417C2D
movs r4, 0
str r4, [sp]
@@ -291,9 +291,9 @@ sub_80D072C: @ 80D072C
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
ldr r5, _080D07C0 @ =0x0000021d
adds r1, r5, 0
@@ -303,7 +303,7 @@ sub_80D072C: @ 80D072C
movs r1, 0
adds r2, r5, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldrb r0, [r4]
ldr r2, _080D07C4 @ =gUnknown_8417C2D
movs r3, 0
@@ -330,7 +330,7 @@ sub_80D07C8: @ 80D07C8
push {r4,lr}
ldr r4, _080D07E8 @ =gUnknown_2039A28
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
diff --git a/asm/credits.s b/asm/credits.s
index 62ea02002..efaf480a5 100644
--- a/asm/credits.s
+++ b/asm/credits.s
@@ -10,18 +10,18 @@ sub_80F39B4: @ 80F39B4
push {r4,lr}
ldr r4, _080F39E0 @ =gUnknown_203AB40
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
- bl sub_80773BC
+ bl ResetTasks
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x2]
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0x1D]
- bl sub_8006B10
+ bl ResetSpriteData
ldr r0, _080F39E4 @ =sub_80F39E8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -47,10 +47,10 @@ _080F39FE:
beq _080F3A4C
b _080F3A68
_080F3A04:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
b _080F3A68
_080F3A16:
ldr r0, _080F3A28 @ =gUnknown_203AB40
@@ -64,10 +64,10 @@ _080F3A16:
.align 2, 0
_080F3A28: .4byte gUnknown_203AB40
_080F3A2C:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
_080F3A3C:
ldr r0, _080F3A48 @ =gUnknown_203AB40
ldr r1, [r0]
@@ -86,7 +86,7 @@ _080F3A4C:
strb r0, [r1]
ldr r0, _080F3A70 @ =gUnknown_203AB40
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
movs r0, 0xFF
bl SoftReset
_080F3A68:
@@ -103,17 +103,17 @@ sub_80F3A74: @ 80F3A74
movs r1, 0x80
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080F3AA0 @ =0x00001f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0xE
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -125,14 +125,14 @@ sub_80F3AA4: @ 80F3AA4
push {lr}
movs r0, 0x50
movs r1, 0xCE
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x82
lsls r1, 3
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0xA
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80F3AA4
@@ -148,10 +148,10 @@ sub_80F3AC4: @ 80F3AC4
ldr r0, [r4]
ldrb r0, [r0, 0xA]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldrb r0, [r0, 0xA]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldrb r0, [r0, 0xA]
movs r1, 0x3
@@ -234,10 +234,10 @@ _080F3B5E:
bl sub_80F3AC4
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F3BC4 @ =0x0000247c
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80F3A74
bl sub_80F3AA4
movs r0, 0xF0
@@ -310,10 +310,10 @@ _080F3C40:
bl sub_80F3A74
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F3C5C @ =0x00004f51
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080F3C60 @ =gUnknown_203AB40
ldr r1, [r0]
movs r0, 0x1
@@ -345,13 +345,13 @@ _080F3C90: .4byte gUnknown_20375F8
_080F3C94: .4byte gUnknown_203AB40
_080F3C98:
movs r0, 0x44
- bl sub_8000AC4
+ bl GetGpuReg
add r1, sp, 0x14
lsls r0, 16
lsrs r0, 24
strh r0, [r1]
movs r0, 0x44
- bl sub_8000AC4
+ bl GetGpuReg
add r2, sp, 0x14
movs r1, 0xFF
ands r1, r0
@@ -383,7 +383,7 @@ _080F3CCC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
b _080F3D06
_080F3CEE:
ldr r1, [r7]
@@ -490,7 +490,7 @@ _080F3DB4:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r4, _080F3DDC @ =gUnknown_203AB40
ldr r1, [r4]
movs r0, 0x7
@@ -498,7 +498,7 @@ _080F3DB4:
ldr r0, [r4]
ldrb r0, [r0, 0xA]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldrb r0, [r0, 0x8]
b _080F4182
@@ -555,7 +555,7 @@ _080F3E30:
strb r0, [r2, 0x9]
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
b _080F3E94
.align 2, 0
_080F3E50: .4byte gUnknown_203AB40
@@ -579,7 +579,7 @@ _080F3E58:
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F3E94
.align 2, 0
_080F3E84: .4byte gUnknown_203AB40
@@ -726,7 +726,7 @@ _080F3F84:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
movs r0, 0x6
_080F3FB8:
@@ -922,7 +922,7 @@ _080F4118:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F4148 @ =gUnknown_203AB40
ldr r1, [r0]
movs r0, 0x12
@@ -948,7 +948,7 @@ _080F4156:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F3D06
.align 2, 0
_080F416C: .4byte 0x00007fff
@@ -974,9 +974,9 @@ _080F418C: .4byte gUnknown_2037AB8
thumb_func_start sub_80F4190
sub_80F4190: @ 80F4190
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80F4190
@@ -1005,7 +1005,7 @@ _080F41C4:
bl sub_8003B24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xA
str r0, [sp]
str r4, [sp, 0x4]
@@ -1018,7 +1018,7 @@ _080F41C4:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r1, _080F41FC @ =gUnknown_840D228
b _080F4270
.align 2, 0
@@ -1030,7 +1030,7 @@ _080F4200:
bl sub_8003B24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xA
str r0, [sp]
movs r0, 0
@@ -1044,7 +1044,7 @@ _080F4200:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r1, _080F423C @ =gUnknown_840E904
b _080F4270
.align 2, 0
@@ -1056,7 +1056,7 @@ _080F4240:
bl sub_8003B24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xA
str r0, [sp]
movs r0, 0
@@ -1070,13 +1070,13 @@ _080F4240:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r1, _080F4284 @ =gUnknown_840F944
_080F4270:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
b _080F42C2
.align 2, 0
_080F427C: .4byte gUnknown_840C5F0
@@ -1087,7 +1087,7 @@ _080F4288:
bl sub_8003B24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xA
str r0, [sp]
movs r0, 0
@@ -1101,12 +1101,12 @@ _080F4288:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r1, _080F42EC @ =gUnknown_84105B4
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
_080F42C2:
movs r0, 0
movs r1, 0x2
@@ -1199,31 +1199,31 @@ _080F434C:
.4byte _080F4638
_080F4374:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r1, 0xC0
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
+ bl SetGpuReg
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
movs r0, 0x1
bl sub_8001618
ldr r1, _080F44A8 @ =gUnknown_840C5A4
@@ -1232,26 +1232,26 @@ _080F4374:
bl sub_8001658
movs r0, 0x80
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r6, _080F44AC @ =gUnknown_203AB40
ldr r1, [r6]
movs r4, 0
@@ -1271,7 +1271,7 @@ _080F4374:
movs r0, 0x2
adds r1, r2, 0
movs r3, 0x78
- bl sub_8001E80
+ bl SetBgAffine
ldr r1, _080F44B0 @ =gUnknown_8EAAB98
movs r5, 0x80
lsls r5, 6
@@ -1308,18 +1308,18 @@ _080F4374:
adds r0, r1
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080F44C4 @ =gUnknown_840C630
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, [r6]
ldrb r0, [r0, 0x9]
bl sub_80F41A4
ldr r0, _080F44C8 @ =sub_80F4190
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r1, [r6]
b _080F4630
.align 2, 0
@@ -1342,15 +1342,15 @@ _080F44CC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _080F4500 @ =gUnknown_203AB40
ldr r1, [r0]
b _080F4630
@@ -1358,16 +1358,16 @@ _080F44CC:
_080F4500: .4byte gUnknown_203AB40
_080F4504:
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F452C @ =gUnknown_203AB40
ldr r1, [r0]
movs r0, 0x28
@@ -1408,9 +1408,9 @@ _080F4558:
bhi _080F4630
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
movs r0, 0x4
strh r0, [r1, 0xC]
@@ -1440,7 +1440,7 @@ _080F4582:
movs r0, 0x2
adds r1, r2, 0
movs r3, 0x78
- bl sub_8001E80
+ bl SetBgAffine
b _080F4668
_080F45B2:
movs r2, 0x80
@@ -1455,7 +1455,7 @@ _080F45B2:
movs r0, 0x2
adds r1, r2, 0
movs r3, 0x78
- bl sub_8001E80
+ bl SetBgAffine
ldr r1, [r4]
movs r0, 0x20
strh r0, [r1, 0xC]
@@ -1471,9 +1471,9 @@ _080F45DE:
b _080F4668
_080F45E4:
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, [r4]
ldrb r0, [r0, 0x9]
bl sub_80F42F0
@@ -1482,7 +1482,7 @@ _080F45E4:
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
ldr r1, [r4]
movs r0, 0x80
strh r0, [r1, 0xC]
@@ -1503,7 +1503,7 @@ _080F461E:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
_080F4630:
ldrb r0, [r1, 0x1]
@@ -1521,8 +1521,8 @@ _080F4638:
bne _080F4668
bl sub_8003ECC
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
ldr r0, _080F4664 @ =gUnknown_203AB40
ldr r0, [r0]
strb r4, [r0, 0x1]
@@ -1568,31 +1568,31 @@ _080F469E:
b _080F47EC
_080F46A0:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r1, 0xC0
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
+ bl SetGpuReg
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
movs r0, 0x1
bl sub_8001618
ldr r1, _080F4778 @ =gUnknown_840C5A4
@@ -1602,11 +1602,11 @@ _080F46A0:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r4, _080F477C @ =gUnknown_8410CDC
ldr r0, [r6]
ldrb r1, [r0, 0x9]
@@ -1647,11 +1647,11 @@ _080F46A0:
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080F4780 @ =sub_80F4190
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r1, [r6]
b _080F47C2
.align 2, 0
@@ -1660,12 +1660,12 @@ _080F477C: .4byte gUnknown_8410CDC
_080F4780: .4byte sub_80F4190
_080F4784:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r6]
b _080F47C2
_080F478E:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, [r6]
ldrb r1, [r0, 0x9]
cmp r1, 0
@@ -1676,7 +1676,7 @@ _080F478E:
str r1, [sp]
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F47BE
_080F47AE:
movs r0, 0x1
@@ -1685,7 +1685,7 @@ _080F47AE:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080F47BE:
ldr r0, _080F47CC @ =gUnknown_203AB40
ldr r1, [r0]
@@ -1847,25 +1847,25 @@ sub_80F48D0: @ 80F48D0
ldr r0, _080F4928 @ =gUnknown_3005098
adds r4, r0
ldrh r0, [r4, 0x2]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrb r1, [r4, 0x1]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r5, _080F492C @ =gUnknown_202063C
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
ldrh r0, [r4, 0x8]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrb r1, [r4, 0x6]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
ldrb r0, [r0, 0x2]
- bl sub_8077508
+ bl DestroyTask
ldr r1, [r6]
movs r0, 0xFF
strb r0, [r1, 0x2]
@@ -1897,7 +1897,7 @@ sub_80F4930: @ 80F4930
_080F494A:
ldr r0, _080F498C @ =sub_80F47F8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -1987,7 +1987,7 @@ _080F49D8:
ands r1, r3
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4A1C @ =gUnknown_8410E10
b _080F4A36
.align 2, 0
@@ -2005,13 +2005,13 @@ _080F4A20:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x2]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4A48 @ =gUnknown_8411BF8
_080F4A36:
movs r1, 0xF8
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080F4A6C
.align 2, 0
_080F4A44: .4byte gUnknown_8411C18
@@ -2025,12 +2025,12 @@ _080F4A4C:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x2]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4ADC @ =gUnknown_84129A0
movs r1, 0xF8
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080F4A6C:
mov r1, sp
ldr r0, _080F4AE0 @ =gUnknown_8414364
@@ -2047,7 +2047,7 @@ _080F4A6C:
mov r2, r9
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r6, 0x1]
ldr r3, _080F4AE4 @ =gUnknown_202063C
ldrb r1, [r6, 0x1]
@@ -2107,7 +2107,7 @@ _080F4AFE:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4B1C @ =gUnknown_8413318
b _080F4B8A
.align 2, 0
@@ -2122,12 +2122,12 @@ _080F4B20:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4B4C @ =gUnknown_8413318
movs r1, 0xF0
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r1, sp
ldr r0, _080F4B50 @ =gUnknown_84143D0
b _080F4B98
@@ -2144,7 +2144,7 @@ _080F4B54:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4B70 @ =gUnknown_8413854
b _080F4B8A
.align 2, 0
@@ -2159,13 +2159,13 @@ _080F4B74:
strh r1, [r0, 0x4]
ldrh r1, [r6, 0x8]
strh r1, [r0, 0x6]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F4BF0 @ =gUnknown_8413D98
_080F4B8A:
movs r1, 0xF0
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r1, sp
ldr r0, _080F4BF4 @ =gUnknown_84143B8
_080F4B98:
@@ -2182,7 +2182,7 @@ _080F4BA0:
adds r2, 0x26
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r6, 0x6]
ldr r3, _080F4BF8 @ =gUnknown_202063C
ldrb r1, [r6, 0x6]
diff --git a/asm/daycare.s b/asm/daycare.s
index 5ba9669c9..0ddeeeb8b 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -5,42 +5,42 @@
.text
- thumb_func_start sub_80453C0
-sub_80453C0: @ 80453C0
+ thumb_func_start GetMonNick
+GetMonNick: @ 80453C0
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
add sp, 0x14
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80453C0
+ thumb_func_end GetMonNick
- thumb_func_start sub_80453E0
-sub_80453E0: @ 80453E0
+ thumb_func_start GetBoxMonNick
+GetBoxMonNick: @ 80453E0
push {r4,lr}
sub sp, 0x14
adds r4, r1, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FD44
+ bl GetBoxMonData
adds r0, r4, 0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
add sp, 0x14
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80453E0
+ thumb_func_end GetBoxMonNick
- thumb_func_start sub_8045400
-sub_8045400: @ 8045400
+ thumb_func_start CountPokemonInDaycare
+CountPokemonInDaycare: @ 8045400
push {r4-r6,lr}
adds r6, r0, 0
movs r5, 0
@@ -50,7 +50,7 @@ _08045408:
muls r0, r4
adds r0, r6, r0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _0804541E
adds r0, r5, 0x1
@@ -66,10 +66,10 @@ _0804541E:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8045400
+ thumb_func_end CountPokemonInDaycare
- thumb_func_start sub_8045430
-sub_8045430: @ 8045430
+ thumb_func_start InitDaycareMailRecordMixing
+InitDaycareMailRecordMixing: @ 8045430
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -90,7 +90,7 @@ _0804544A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08045478
adds r0, r7, 0x1
@@ -98,7 +98,7 @@ _0804544A:
lsrs r7, r0, 24
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FD44
+ bl GetBoxMonData
adds r1, r0, 0
cmp r1, 0
bne _08045478
@@ -125,10 +125,10 @@ _0804547E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8045430
+ thumb_func_end InitDaycareMailRecordMixing
- thumb_func_start sub_804549C
-sub_804549C: @ 804549C
+ thumb_func_start Daycare_FindEmptySpot
+Daycare_FindEmptySpot: @ 804549C
push {r4,r5,lr}
adds r5, r0, 0
movs r4, 0
@@ -137,7 +137,7 @@ _080454A2:
muls r0, r4
adds r0, r5, r0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _080454B8
lsls r0, r4, 24
@@ -155,10 +155,10 @@ _080454C6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_804549C
+ thumb_func_end Daycare_FindEmptySpot
- thumb_func_start sub_80454CC
-sub_80454CC: @ 80454CC
+ thumb_func_start StorePokemonInDaycare
+StorePokemonInDaycare: @ 80454CC
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -170,14 +170,14 @@ sub_80454CC: @ 80454CC
adds r0, 0x74
ldr r1, _08045550 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
adds r1, r4, 0
adds r1, 0x7C
adds r0, r5, 0
- bl sub_80453C0
+ bl GetMonNick
adds r0, r5, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08045554 @ =gUnknown_3005008
@@ -197,22 +197,22 @@ sub_80454CC: @ 80454CC
ldm r1!, {r2,r3,r6}
stm r0!, {r2,r3,r6}
adds r0, r5, 0
- bl sub_8097FB8
+ bl TakeMailFromMon
_08045524:
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x50
bl memcpy
adds r0, r4, 0
- bl sub_80442E4
+ bl BoxMonRestorePP
adds r1, r4, 0
adds r1, 0x88
movs r0, 0
str r0, [r1]
adds r0, r5, 0
- bl sub_803D994
- bl sub_80937DC
- bl sub_8040C3C
+ bl ZeroMonData
+ bl CompactPartySlots
+ bl CalculatePlayerPartyCount
pop {r4-r6}
pop {r0}
bx r0
@@ -220,7 +220,7 @@ _08045524:
_08045550: .4byte gUnknown_300500C
_08045554: .4byte gUnknown_3005008
_08045558: .4byte 0x00002cd0
- thumb_func_end sub_80454CC
+ thumb_func_end StorePokemonInDaycare
thumb_func_start sub_804555C
sub_804555C: @ 804555C
@@ -228,7 +228,7 @@ sub_804555C: @ 804555C
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
- bl sub_804549C
+ bl Daycare_FindEmptySpot
lsls r0, 24
asrs r0, 24
movs r1, 0x8C
@@ -236,7 +236,7 @@ sub_804555C: @ 804555C
adds r4, r0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_80454CC
+ bl StorePokemonInDaycare
pop {r4,r5}
pop {r0}
bx r0
@@ -265,20 +265,20 @@ _080455A4: .4byte gUnknown_2024284
_080455A8: .4byte gUnknown_3005008
thumb_func_end sub_8045580
- thumb_func_start sub_80455AC
-sub_80455AC: @ 80455AC
+ thumb_func_start ShiftDaycareSlots
+ShiftDaycareSlots: @ 80455AC
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r5, 0
adds r4, 0x8C
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08045602
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
adds r6, r0, 0
cmp r6, 0
bne _08045602
@@ -287,7 +287,7 @@ sub_80455AC: @ 80455AC
movs r2, 0x50
bl memcpy
adds r0, r4, 0
- bl sub_803D97C
+ bl ZeroBoxMonData
adds r4, 0x50
adds r0, r5, 0
adds r0, 0x50
@@ -303,15 +303,15 @@ sub_80455AC: @ 80455AC
str r0, [r2]
str r6, [r1]
adds r0, r4, 0
- bl sub_80458E8
+ bl ClearDaycareMonMisc
_08045602:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80455AC
+ thumb_func_end ShiftDaycareSlots
- thumb_func_start sub_8045608
-sub_8045608: @ 8045608
+ thumb_func_start ApplyDaycareExperience
+ApplyDaycareExperience: @ 8045608
push {r4-r7,lr}
adds r4, r0, 0
movs r5, 0
@@ -334,11 +334,11 @@ _08045628:
ldr r0, _08045658 @ =gUnknown_2024022
ldrh r1, [r0]
adds r0, r4, 0
- bl sub_803EB94
+ bl DeleteFirstMoveAndGiveMoveToMon
_08045638:
adds r0, r4, 0
adds r1, r6, 0
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -347,37 +347,37 @@ _08045638:
ble _08045610
_0804564C:
adds r0, r4, 0
- bl sub_803E47C
+ bl CalculateMonStats
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_08045658: .4byte gUnknown_2024022
- thumb_func_end sub_8045608
+ thumb_func_end ApplyDaycareExperience
- thumb_func_start sub_804565C
-sub_804565C: @ 804565C
+ thumb_func_start TakeSelectedPokemonFromDaycare
+TakeSelectedPokemonFromDaycare: @ 804565C
push {r4-r7,lr}
sub sp, 0x68
adds r5, r0, 0
ldr r1, _080456F8 @ =gUnknown_2021CD0
- bl sub_80453E0
+ bl GetBoxMonNick
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r5, 0
mov r1, sp
- bl sub_803E774
+ bl BoxMonToMon
mov r0, sp
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
beq _080456AA
mov r0, sp
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r1, r5, 0
adds r1, 0x88
ldr r1, [r1]
@@ -388,7 +388,7 @@ sub_804565C: @ 804565C
movs r1, 0x19
bl sub_804037C
mov r0, sp
- bl sub_8045608
+ bl ApplyDaycareExperience
_080456AA:
ldr r0, _080456FC @ =gUnknown_2024284
movs r1, 0xFA
@@ -407,18 +407,18 @@ _080456AA:
adds r4, 0x50
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8097F44
+ bl GiveMailToMon2
adds r0, r4, 0
- bl sub_80458E8
+ bl ClearDaycareMonMisc
_080456D8:
adds r0, r5, 0
- bl sub_803D97C
+ bl ZeroBoxMonData
adds r1, r5, 0
adds r1, 0x88
movs r0, 0
str r0, [r1]
- bl sub_80937DC
- bl sub_8040C3C
+ bl CompactPartySlots
+ bl CalculatePlayerPartyCount
adds r0, r7, 0
add sp, 0x68
pop {r4-r7}
@@ -427,10 +427,10 @@ _080456D8:
.align 2, 0
_080456F8: .4byte gUnknown_2021CD0
_080456FC: .4byte gUnknown_2024284
- thumb_func_end sub_804565C
+ thumb_func_end TakeSelectedPokemonFromDaycare
- thumb_func_start sub_8045700
-sub_8045700: @ 8045700
+ thumb_func_start TakeSelectedPokemonMonFromDaycareShiftSlots
+TakeSelectedPokemonMonFromDaycareShiftSlots: @ 8045700
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 24
@@ -438,20 +438,20 @@ sub_8045700: @ 8045700
movs r0, 0x8C
muls r0, r1
adds r0, r5, r0
- bl sub_804565C
+ bl TakeSelectedPokemonFromDaycare
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80455AC
+ bl ShiftDaycareSlots
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8045700
+ thumb_func_end TakeSelectedPokemonMonFromDaycareShiftSlots
- thumb_func_start sub_8045728
-sub_8045728: @ 8045728
+ thumb_func_start TakePokemonFromDaycare
+TakePokemonFromDaycare: @ 8045728
push {lr}
ldr r0, _08045744 @ =gUnknown_3005008
ldr r0, [r0]
@@ -460,7 +460,7 @@ sub_8045728: @ 8045728
adds r0, r1
ldr r1, _08045748 @ =gUnknown_20370C0
ldrb r1, [r1]
- bl sub_8045700
+ bl TakeSelectedPokemonMonFromDaycareShiftSlots
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -468,10 +468,10 @@ sub_8045728: @ 8045728
.align 2, 0
_08045744: .4byte gUnknown_3005008
_08045748: .4byte gUnknown_20370C0
- thumb_func_end sub_8045728
+ thumb_func_end TakePokemonFromDaycare
- thumb_func_start sub_804574C
-sub_804574C: @ 804574C
+ thumb_func_start GetLevelAfterDaycareSteps
+GetLevelAfterDaycareSteps: @ 804574C
push {r4,r5,lr}
sub sp, 0x54
adds r4, r0, 0
@@ -482,7 +482,7 @@ sub_804574C: @ 804574C
bl memcpy
adds r0, r4, 0
movs r1, 0x19
- bl sub_803FD44
+ bl GetBoxMonData
adds r0, r5
str r0, [sp, 0x50]
add r2, sp, 0x50
@@ -490,20 +490,20 @@ sub_804574C: @ 804574C
movs r1, 0x19
bl sub_80404D0
mov r0, sp
- bl sub_803E830
+ bl GetLevelFromBoxMonExp
lsls r0, 24
lsrs r0, 24
add sp, 0x54
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_804574C
+ thumb_func_end GetLevelAfterDaycareSteps
- thumb_func_start sub_8045788
-sub_8045788: @ 8045788
+ thumb_func_start GetNumLevelsGainedFromSteps
+GetNumLevelsGainedFromSteps: @ 8045788
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_803E830
+ bl GetLevelFromBoxMonExp
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -511,7 +511,7 @@ sub_8045788: @ 8045788
adds r0, 0x88
ldr r1, [r0]
adds r0, r5, 0
- bl sub_804574C
+ bl GetLevelAfterDaycareSteps
lsls r0, 24
lsrs r0, 24
subs r0, r4
@@ -520,13 +520,13 @@ sub_8045788: @ 8045788
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8045788
+ thumb_func_end GetNumLevelsGainedFromSteps
- thumb_func_start sub_80457B4
-sub_80457B4: @ 80457B4
+ thumb_func_start GetNumLevelsGainedForDaycareMon
+GetNumLevelsGainedForDaycareMon: @ 80457B4
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8045788
+ bl GetNumLevelsGainedFromSteps
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -537,7 +537,7 @@ sub_80457B4: @ 80457B4
bl sub_8008E78
ldr r1, _080457E4 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_80453E0
+ bl GetBoxMonNick
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -545,19 +545,19 @@ sub_80457B4: @ 80457B4
.align 2, 0
_080457E0: .4byte gUnknown_2021CF0
_080457E4: .4byte gUnknown_2021CD0
- thumb_func_end sub_80457B4
+ thumb_func_end GetNumLevelsGainedForDaycareMon
- thumb_func_start sub_80457E8
-sub_80457E8: @ 80457E8
+ thumb_func_start GetDaycareCostForSelectedMon
+GetDaycareCostForSelectedMon: @ 80457E8
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8045788
+ bl GetNumLevelsGainedFromSteps
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r1, _08045818 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_80453E0
+ bl GetBoxMonNick
movs r0, 0x64
muls r4, r0
adds r4, 0x64
@@ -573,25 +573,25 @@ sub_80457E8: @ 80457E8
.align 2, 0
_08045818: .4byte gUnknown_2021CD0
_0804581C: .4byte gUnknown_2021CF0
- thumb_func_end sub_80457E8
+ thumb_func_end GetDaycareCostForSelectedMon
- thumb_func_start sub_8045820
-sub_8045820: @ 8045820
+ thumb_func_start GetDaycareCostForMon
+GetDaycareCostForMon: @ 8045820
push {lr}
lsls r1, 24
lsrs r1, 24
movs r2, 0x8C
muls r1, r2
adds r0, r1
- bl sub_80457E8
+ bl GetDaycareCostForSelectedMon
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8045820
+ thumb_func_end GetDaycareCostForMon
- thumb_func_start sub_8045838
-sub_8045838: @ 8045838
+ thumb_func_start GetDaycareCost
+GetDaycareCost: @ 8045838
push {lr}
ldr r0, _08045854 @ =gUnknown_3005008
ldr r0, [r0]
@@ -600,7 +600,7 @@ sub_8045838: @ 8045838
adds r0, r1
ldr r1, _08045858 @ =gUnknown_20370C0
ldrb r1, [r1]
- bl sub_8045820
+ bl GetDaycareCostForMon
ldr r1, _0804585C @ =gUnknown_20370C2
strh r0, [r1]
pop {r0}
@@ -609,7 +609,7 @@ sub_8045838: @ 8045838
_08045854: .4byte gUnknown_3005008
_08045858: .4byte gUnknown_20370C0
_0804585C: .4byte gUnknown_20370C2
- thumb_func_end sub_8045838
+ thumb_func_end GetDaycareCost
thumb_func_start sub_8045860
sub_8045860: @ 8045860
@@ -640,8 +640,8 @@ _08045890: .4byte 0x00003094
_08045894: .4byte 0x00003d20
thumb_func_end sub_8045860
- thumb_func_start sub_8045898
-sub_8045898: @ 8045898
+ thumb_func_start GetNumLevelsGainedFromDaycare
+GetNumLevelsGainedFromDaycare: @ 8045898
push {r4-r6,lr}
ldr r6, _080458C0 @ =gUnknown_3005008
ldr r5, _080458C4 @ =gUnknown_20370C0
@@ -655,7 +655,7 @@ sub_8045898: @ 8045898
ldr r0, [r6]
adds r0, r1
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _080458C8
movs r0, 0
@@ -672,17 +672,17 @@ _080458C8:
adds r1, r0
ldr r0, [r6]
adds r0, r1
- bl sub_80457B4
+ bl GetNumLevelsGainedForDaycareMon
lsls r0, 24
lsrs r0, 24
_080458E0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8045898
+ thumb_func_end GetNumLevelsGainedFromDaycare
- thumb_func_start sub_80458E8
-sub_80458E8: @ 80458E8
+ thumb_func_start ClearDaycareMonMisc
+ClearDaycareMonMisc: @ 80458E8
push {lr}
movs r3, 0
movs r2, 0x7
@@ -707,27 +707,27 @@ _08045906:
bl sub_8097CB4
pop {r0}
bx r0
- thumb_func_end sub_80458E8
+ thumb_func_end ClearDaycareMonMisc
- thumb_func_start sub_8045918
-sub_8045918: @ 8045918
+ thumb_func_start ClearDaycareMon
+ClearDaycareMon: @ 8045918
push {r4,lr}
adds r4, r0, 0
- bl sub_803D97C
+ bl ZeroBoxMonData
adds r1, r4, 0
adds r1, 0x88
movs r0, 0
str r0, [r1]
adds r4, 0x50
adds r0, r4, 0
- bl sub_80458E8
+ bl ClearDaycareMonMisc
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8045918
+ thumb_func_end ClearDaycareMon
- thumb_func_start sub_8045938
-sub_8045938: @ 8045938
+ thumb_func_start ClearAllDaycareData
+ClearAllDaycareData: @ 8045938
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
@@ -736,7 +736,7 @@ _08045940:
adds r0, r4, 0
muls r0, r6
adds r0, r5, r0
- bl sub_8045918
+ bl ClearDaycareMon
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -755,7 +755,7 @@ _08045940:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8045938
+ thumb_func_end ClearAllDaycareData
thumb_func_start sub_8045970
sub_8045970: @ 8045970
@@ -834,7 +834,7 @@ _080459EC: .4byte 0x0000019b
sub_80459F0: @ 80459F0
push {r4,lr}
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, _08045A18 @ =0x0000fffe
@@ -858,7 +858,7 @@ _08045A1C: .4byte 0x00000266
sub_8045A20: @ 8045A20
push {r4,lr}
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
movs r2, 0x80
lsls r2, 8
adds r1, r2, 0
@@ -906,8 +906,8 @@ sub_8045A60: @ 8045A60
_08045A74: .4byte gUnknown_3005008
thumb_func_end sub_8045A60
- thumb_func_start sub_8045A78
-sub_8045A78: @ 8045A78
+ thumb_func_start RemoveIVIndexFromList
+RemoveIVIndexFromList: @ 8045A78
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -946,10 +946,10 @@ _08045AB0:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8045A78
+ thumb_func_end RemoveIVIndexFromList
- thumb_func_start sub_8045AC0
-sub_8045AC0: @ 8045AC0
+ thumb_func_start InheritIVs
+InheritIVs: @ 8045AC0
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -972,7 +972,7 @@ _08045AD6:
movs r5, 0
adds r6, r1, 0
_08045AE8:
- bl sub_8044EC8
+ bl Random
mov r1, sp
adds r4, r1, r5
lsls r0, 16
@@ -985,7 +985,7 @@ _08045AE8:
strb r0, [r4]
ldrb r1, [r4]
adds r0, r6, 0
- bl sub_8045A78
+ bl RemoveIVIndexFromList
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -994,7 +994,7 @@ _08045AE8:
movs r5, 0
movs r4, 0x1
_08045B18:
- bl sub_8044EC8
+ bl Random
adds r1, r7, r5
lsls r0, 16
lsrs r0, 16
@@ -1034,7 +1034,7 @@ _08045B64:
muls r0, r1
add r0, r8
movs r1, 0x27
- bl sub_803FD44
+ bl GetBoxMonData
add r2, sp, 0x10
strb r0, [r2]
mov r0, r9
@@ -1049,7 +1049,7 @@ _08045B82:
muls r0, r1
add r0, r8
movs r1, 0x28
- bl sub_803FD44
+ bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x28
@@ -1062,7 +1062,7 @@ _08045B9C:
muls r0, r1
add r0, r8
movs r1, 0x29
- bl sub_803FD44
+ bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x29
@@ -1075,7 +1075,7 @@ _08045BB6:
muls r0, r1
add r0, r8
movs r1, 0x2A
- bl sub_803FD44
+ bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2A
@@ -1088,7 +1088,7 @@ _08045BD0:
muls r0, r1
add r0, r8
movs r1, 0x2B
- bl sub_803FD44
+ bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2B
@@ -1104,7 +1104,7 @@ _08045BF0:
muls r0, r1
add r0, r8
movs r1, 0x2C
- bl sub_803FD44
+ bl GetBoxMonData
strb r0, [r4]
mov r0, r9
movs r1, 0x2C
@@ -1123,10 +1123,10 @@ _08045C0E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8045AC0
+ thumb_func_end InheritIVs
- thumb_func_start sub_8045C28
-sub_8045C28: @ 8045C28
+ thumb_func_start GetEggMoves
+GetEggMoves: @ 8045C28
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1134,7 +1134,7 @@ sub_8045C28: @ 8045C28
movs r6, 0
movs r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
movs r2, 0
@@ -1211,10 +1211,10 @@ _08045CB6:
_08045CC4: .4byte 0x00000471
_08045CC8: .4byte gUnknown_825EF0C
_08045CCC: .4byte 0x00004e20
- thumb_func_end sub_8045C28
+ thumb_func_end GetEggMoves
- thumb_func_start sub_8045CD0
-sub_8045CD0: @ 8045CD0
+ thumb_func_start BuildEggMoveset
+BuildEggMoveset: @ 8045CD0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1270,7 +1270,7 @@ _08045D24:
bls _08045D24
adds r0, r7, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, _08045DE4 @ =gUnknown_20244F8
@@ -1286,14 +1286,14 @@ _08045D52:
adds r5, 0xD
mov r0, r10
adds r1, r5, 0
- bl sub_803FD44
+ bl GetBoxMonData
lsls r4, r6, 1
mov r2, r8
adds r1, r4, r2
strh r0, [r1]
mov r0, r9
adds r1, r5, 0
- bl sub_803FD44
+ bl GetBoxMonData
ldr r1, _08045DD4 @ =gUnknown_2024580
adds r4, r1
strh r0, [r4]
@@ -1304,7 +1304,7 @@ _08045D52:
bls _08045D52
ldr r1, _08045DE0 @ =gUnknown_202456C
adds r0, r7, 0
- bl sub_8045C28
+ bl GetEggMoves
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -1333,7 +1333,7 @@ _08045DA6:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1341,7 +1341,7 @@ _08045DA6:
bne _08045DF6
ldrh r1, [r4]
adds r0, r7, 0
- bl sub_803EB94
+ bl DeleteFirstMoveAndGiveMoveToMon
b _08045DF6
.align 2, 0
_08045DD4: .4byte gUnknown_2024580
@@ -1386,7 +1386,7 @@ _08045E22:
adds r0, r5, r3
lsls r0, 16
lsrs r0, 16
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
ldrh r1, [r4]
lsls r0, 16
lsrs r0, 16
@@ -1400,14 +1400,14 @@ _08045E22:
beq _08045E5E
ldrh r1, [r4]
adds r0, r7, 0
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
cmp r0, r6
bne _08045E5E
ldrh r1, [r4]
adds r0, r7, 0
- bl sub_803EB94
+ bl DeleteFirstMoveAndGiveMoveToMon
_08045E5E:
adds r0, r5, 0x1
lsls r0, 16
@@ -1501,7 +1501,7 @@ _08045EEA:
adds r1, r0, 0
adds r0, r7, 0
str r2, [sp, 0x8]
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r2, [sp, 0x8]
@@ -1509,7 +1509,7 @@ _08045EEA:
bne _08045F44
ldrh r1, [r4]
adds r0, r7, 0
- bl sub_803EB94
+ bl DeleteFirstMoveAndGiveMoveToMon
b _08045F44
.align 2, 0
_08045F20: .4byte gUnknown_202455C
@@ -1549,10 +1549,10 @@ _08045F5C:
bx r0
.align 2, 0
_08045F6C: .4byte gUnknown_2024564
- thumb_func_end sub_8045CD0
+ thumb_func_end BuildEggMoveset
- thumb_func_start sub_8045F70
-sub_8045F70: @ 8045F70
+ thumb_func_start RemoveEggFromDayCare
+RemoveEggFromDayCare: @ 8045F70
adds r3, r0, 0
movs r1, 0x8C
lsls r1, 1
@@ -1565,22 +1565,22 @@ sub_8045F70: @ 8045F70
adds r0, r3, r1
strb r2, [r0]
bx lr
- thumb_func_end sub_8045F70
+ thumb_func_end RemoveEggFromDayCare
- thumb_func_start sub_8045F88
-sub_8045F88: @ 8045F88
+ thumb_func_start RejectEggFromDayCare
+RejectEggFromDayCare: @ 8045F88
push {lr}
ldr r0, _08045F9C @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
adds r0, r1
- bl sub_8045F70
+ bl RemoveEggFromDayCare
pop {r0}
bx r0
.align 2, 0
_08045F9C: .4byte gUnknown_3005008
- thumb_func_end sub_8045F88
+ thumb_func_end RejectEggFromDayCare
thumb_func_start sub_8045FA0
sub_8045FA0: @ 8045FA0
@@ -1599,13 +1599,13 @@ sub_8045FA0: @ 8045FA0
_08045FB8:
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r5, 0
adds r0, 0x8C
movs r1, 0xC
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r2, r0, 16
ldrh r0, [r4]
@@ -1652,7 +1652,7 @@ _08046010:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
lsls r1, r4, 1
add r1, sp
strh r0, [r1]
@@ -1667,7 +1667,7 @@ _08046010:
b _0804604E
_08046038:
adds r0, r5, 0
- bl sub_803F730
+ bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -1726,7 +1726,7 @@ _0804609A:
movs r0, 0x8C
muls r0, r1
add r0, r8
- bl sub_803F730
+ bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -1766,7 +1766,7 @@ sub_80460D4: @ 80460D4
bl sub_8046208
mov r0, sp
adds r1, r5, 0
- bl sub_8045AC0
+ bl InheritIVs
ldrb r0, [r6, 0x1]
movs r2, 0x8C
adds r1, r0, 0
@@ -1776,7 +1776,7 @@ sub_80460D4: @ 80460D4
muls r2, r0
adds r2, r5, r2
mov r0, sp
- bl sub_8045CD0
+ bl BuildEggMoveset
mov r2, sp
adds r2, 0x6A
movs r0, 0x1
@@ -1791,10 +1791,10 @@ sub_80460D4: @ 80460D4
mov r1, sp
movs r2, 0x64
bl memcpy
- bl sub_80937DC
- bl sub_8040C3C
+ bl CompactPartySlots
+ bl CalculatePlayerPartyCount
adds r0, r5, 0
- bl sub_8045F70
+ bl RemoveEggFromDayCare
add sp, 0x6C
pop {r4-r6}
pop {r0}
@@ -1825,7 +1825,7 @@ sub_8046150: @ 8046150
adds r1, r5, 0
movs r2, 0x5
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
movs r0, 0x12
add r0, sp
mov r8, r0
@@ -1903,7 +1903,7 @@ sub_8046208: @ 8046208
adds r4, r2, 0
lsls r5, 16
lsrs r5, 16
- bl sub_8044EC8
+ bl Random
movs r1, 0x8C
lsls r1, 1
adds r4, r1
@@ -1921,7 +1921,7 @@ sub_8046208: @ 8046208
adds r1, r5, 0
movs r2, 0x5
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
movs r1, 0x12
add r1, sp
mov r9, r1
@@ -1997,7 +1997,7 @@ _080462CE:
muls r4, r0
adds r0, r6, r4
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _080462EE
adds r1, r6, 0
@@ -2025,11 +2025,11 @@ _080462EE:
cmp r0, 0xFF
bne _08046334
adds r0, r6, 0
- bl sub_804654C
+ bl GetDaycareCompatibilityScore
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -2062,17 +2062,17 @@ _08046350:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0804639E
adds r0, r4, 0
movs r1, 0x4
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0804639E
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
cmp r0, 0
bne _08046390
@@ -2116,7 +2116,7 @@ sub_80463B8: @ 80463B8
ldr r1, _080463F4 @ =0x00003c98
adds r0, r1
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _080463D8
ldr r1, [r4]
@@ -2160,29 +2160,29 @@ sub_804640C: @ 804640C
sub sp, 0xC
adds r4, r0, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08046436
ldr r1, _08046454 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_80453E0
+ bl GetBoxMonNick
adds r0, r4, 0
movs r1, 0x7
mov r2, sp
- bl sub_803FD44
+ bl GetBoxMonData
ldr r0, _08046458 @ =gUnknown_2021D04
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
_08046436:
adds r4, 0x8C
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _0804644C
ldr r1, _0804645C @ =gUnknown_2021CF0
adds r0, r4, 0
- bl sub_80453E0
+ bl GetBoxMonNick
_0804644C:
add sp, 0xC
pop {r4}
@@ -2205,14 +2205,14 @@ sub_8046460: @ 8046460
ldr r4, _08046494 @ =gUnknown_2024284
adds r0, r4
ldr r1, _08046498 @ =gUnknown_2021CD0
- bl sub_80453E0
+ bl GetBoxMonNick
bl sub_811FB0C
lsls r0, 24
lsrs r0, 24
muls r0, r5
adds r0, r4
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r0, 16
pop {r4,r5}
@@ -2259,7 +2259,7 @@ _080464D4:
movs r1, 0xBE
lsls r1, 6
adds r0, r1
- bl sub_8045400
+ bl CountPokemonInDaycare
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2276,15 +2276,15 @@ _080464F2:
bx r1
thumb_func_end sub_80464B4
- thumb_func_start sub_80464F8
-sub_80464F8: @ 80464F8
+ thumb_func_start GetDaycarePokemonCount
+GetDaycarePokemonCount: @ 80464F8
push {lr}
ldr r0, _08046518 @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
adds r0, r1
- bl sub_8045400
+ bl CountPokemonInDaycare
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2295,10 +2295,10 @@ _08046512:
bx r1
.align 2, 0
_08046518: .4byte gUnknown_3005008
- thumb_func_end sub_80464F8
+ thumb_func_end GetDaycarePokemonCount
- thumb_func_start sub_804651C
-sub_804651C: @ 804651C
+ thumb_func_start EggGroupsOverlap
+EggGroupsOverlap: @ 804651C
push {r4-r6,lr}
adds r5, r1, 0
movs r4, 0
@@ -2327,10 +2327,10 @@ _08046546:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_804651C
+ thumb_func_end EggGroupsOverlap
- thumb_func_start sub_804654C
-sub_804654C: @ 804654C
+ thumb_func_start GetDaycareCompatibilityScore
+GetDaycareCompatibilityScore: @ 804654C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2364,20 +2364,20 @@ _0804657E:
adds r4, r0, r4
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FD44
+ bl GetBoxMonData
ldr r1, [sp, 0x2C]
stm r1!, {r0}
str r1, [sp, 0x2C]
adds r0, r4, 0
movs r1, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r1, r0, 0
ldrh r0, [r5]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
ldr r2, [sp, 0x28]
@@ -2443,7 +2443,7 @@ _08046614:
beq _080465FC
add r1, sp, 0x4
mov r0, sp
- bl sub_804651C
+ bl EggGroupsOverlap
lsls r0, 24
cmp r0, 0
beq _080465FC
@@ -2479,29 +2479,29 @@ _0804665C:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_804654C
+ thumb_func_end GetDaycareCompatibilityScore
- thumb_func_start sub_804666C
-sub_804666C: @ 804666C
+ thumb_func_start GetDaycareCompatibilityScoreFromSave
+GetDaycareCompatibilityScoreFromSave: @ 804666C
push {lr}
ldr r0, _08046684 @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xBE
lsls r1, 6
adds r0, r1
- bl sub_804654C
+ bl GetDaycareCompatibilityScore
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_08046684: .4byte gUnknown_3005008
- thumb_func_end sub_804666C
+ thumb_func_end GetDaycareCompatibilityScoreFromSave
- thumb_func_start sub_8046688
-sub_8046688: @ 8046688
+ thumb_func_start SetDaycareCompatibilityString
+SetDaycareCompatibilityString: @ 8046688
push {lr}
- bl sub_804666C
+ bl GetDaycareCompatibilityScoreFromSave
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -2527,16 +2527,16 @@ _080466AE:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
pop {r0}
bx r0
.align 2, 0
_080466C0: .4byte gUnknown_2021D18
_080466C4: .4byte gUnknown_825F82C
- thumb_func_end sub_8046688
+ thumb_func_end SetDaycareCompatibilityString
- thumb_func_start sub_80466C8
-sub_80466C8: @ 80466C8
+ thumb_func_start NameHasGenderSymbol
+NameHasGenderSymbol: @ 80466C8
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -2606,10 +2606,10 @@ _0804673A:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80466C8
+ thumb_func_end NameHasGenderSymbol
- thumb_func_start sub_8046744
-sub_8046744: @ 8046744
+ thumb_func_start AppendGenderSymbol
+AppendGenderSymbol: @ 8046744
push {r4,lr}
adds r4, r0, 0
lsls r1, 24
@@ -2617,7 +2617,7 @@ sub_8046744: @ 8046744
cmp r1, 0
bne _08046764
movs r1, 0
- bl sub_80466C8
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _08046780
@@ -2630,7 +2630,7 @@ _08046764:
bne _08046780
adds r0, r4, 0
movs r1, 0xFE
- bl sub_80466C8
+ bl NameHasGenderSymbol
lsls r0, 24
cmp r0, 0
bne _08046780
@@ -2642,32 +2642,32 @@ _08046780:
ldr r1, _08046790 @ =gUnknown_8261EC5
_08046782:
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
pop {r4}
pop {r1}
bx r1
.align 2, 0
_08046790: .4byte gUnknown_8261EC5
- thumb_func_end sub_8046744
+ thumb_func_end AppendGenderSymbol
- thumb_func_start sub_8046794
-sub_8046794: @ 8046794
+ thumb_func_start AppendMonGenderSymbol
+AppendMonGenderSymbol: @ 8046794
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
- bl sub_803F730
+ bl GetBoxMonGender
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8046744
+ bl AppendGenderSymbol
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8046794
+ thumb_func_end AppendMonGenderSymbol
- thumb_func_start sub_80467B0
-sub_80467B0: @ 80467B0
+ thumb_func_start GetDaycareLevelMenuText
+GetDaycareLevelMenuText: @ 80467B0
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2692,10 +2692,10 @@ _080467C8:
adds r5, r1, r0
adds r0, r4, 0
adds r1, r5, 0
- bl sub_80453E0
+ bl GetBoxMonNick
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8046794
+ bl AppendMonGenderSymbol
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -2703,20 +2703,20 @@ _080467C8:
bls _080467C8
adds r0, r7, 0
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0804682C @ =gUnknown_825F83C
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r7, 0
mov r1, r9
- bl sub_8008DA4
+ bl StringAppend
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r1, _08046830 @ =gUnknown_84161C8
adds r0, r7, 0
- bl sub_8008DA4
+ bl StringAppend
add sp, 0x28
pop {r3,r4}
mov r8, r3
@@ -2727,10 +2727,10 @@ _080467C8:
.align 2, 0
_0804682C: .4byte gUnknown_825F83C
_08046830: .4byte gUnknown_84161C8
- thumb_func_end sub_80467B0
+ thumb_func_end GetDaycareLevelMenuText
- thumb_func_start sub_8046834
-sub_8046834: @ 8046834
+ thumb_func_start GetDaycareLevelMenuLevelText
+GetDaycareLevelMenuLevelText: @ 8046834
push {r4-r6,lr}
sub sp, 0x14
adds r6, r0, 0
@@ -2741,7 +2741,7 @@ sub_8046834: @ 8046834
_08046842:
adds r0, r4, 0
ldr r1, _08046890 @ =gUnknown_8416223
- bl sub_8008DA4
+ bl StringAppend
movs r0, 0x8C
adds r2, r5, 0
muls r2, r0
@@ -2750,7 +2750,7 @@ _08046842:
adds r1, 0x88
adds r1, r2
ldr r1, [r1]
- bl sub_804574C
+ bl GetLevelAfterDaycareSteps
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2760,10 +2760,10 @@ _08046842:
bl sub_8008E78
adds r0, r4, 0
mov r1, sp
- bl sub_8008DA4
+ bl StringAppend
adds r0, r4, 0
ldr r1, _08046894 @ =gUnknown_825F83C
- bl sub_8008DA4
+ bl StringAppend
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -2776,10 +2776,10 @@ _08046842:
.align 2, 0
_08046890: .4byte gUnknown_8416223
_08046894: .4byte gUnknown_825F83C
- thumb_func_end sub_8046834
+ thumb_func_end GetDaycareLevelMenuLevelText
- thumb_func_start sub_8046898
-sub_8046898: @ 8046898
+ thumb_func_start DaycareAddTextPrinter
+DaycareAddTextPrinter: @ 8046898
push {r4,r5,lr}
sub sp, 0x10
str r1, [sp]
@@ -2837,10 +2837,10 @@ sub_8046898: @ 8046898
bx r0
.align 2, 0
_08046908: .4byte gUnknown_3003E50
- thumb_func_end sub_8046898
+ thumb_func_end DaycareAddTextPrinter
- thumb_func_start sub_804690C
-sub_804690C: @ 804690C
+ thumb_func_start DaycarePrintMonNick
+DaycarePrintMonNick: @ 804690C
push {r4-r6,lr}
sub sp, 0x14
adds r5, r0, 0
@@ -2853,23 +2853,23 @@ sub_804690C: @ 804690C
adds r5, r0
adds r0, r5, 0
mov r1, sp
- bl sub_80453E0
+ bl GetBoxMonNick
mov r0, sp
adds r1, r5, 0
- bl sub_8046794
+ bl AppendMonGenderSymbol
adds r0, r4, 0
mov r1, sp
movs r2, 0x8
adds r3, r6, 0
- bl sub_8046898
+ bl DaycareAddTextPrinter
add sp, 0x14
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_804690C
+ thumb_func_end DaycarePrintMonNick
- thumb_func_start sub_8046944
-sub_8046944: @ 8046944
+ thumb_func_start DaycarePrintMonLvl
+DaycarePrintMonLvl: @ 8046944
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -2890,7 +2890,7 @@ sub_8046944: @ 8046944
adds r4, 0x88
adds r4, r1
ldr r1, [r4]
- bl sub_804574C
+ bl GetLevelAfterDaycareSteps
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2901,7 +2901,7 @@ sub_8046944: @ 8046944
bl sub_8008E78
mov r0, sp
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
movs r0, 0x3
mov r1, sp
movs r2, 0
@@ -2911,7 +2911,7 @@ sub_8046944: @ 8046944
adds r0, r5, 0
mov r1, sp
mov r3, r8
- bl sub_8046898
+ bl DaycareAddTextPrinter
add sp, 0x14
pop {r3}
mov r8, r3
@@ -2920,10 +2920,10 @@ sub_8046944: @ 8046944
bx r0
.align 2, 0
_080469B0: .4byte gUnknown_8416223
- thumb_func_end sub_8046944
+ thumb_func_end DaycarePrintMonLvl
- thumb_func_start sub_80469B4
-sub_80469B4: @ 80469B4
+ thumb_func_start DaycarePrintMonInfo
+DaycarePrintMonInfo: @ 80469B4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2943,14 +2943,14 @@ sub_80469B4: @ 80469B4
adds r1, r7, 0
adds r2, r6, 0
adds r3, r5, 0
- bl sub_804690C
+ bl DaycarePrintMonNick
mov r1, r8
ldr r0, [r1]
adds r0, r4
adds r1, r7, 0
adds r2, r6, 0
adds r3, r5, 0
- bl sub_8046944
+ bl DaycarePrintMonLvl
_080469EE:
pop {r3}
mov r8, r3
@@ -2959,7 +2959,7 @@ _080469EE:
bx r0
.align 2, 0
_080469F8: .4byte gUnknown_3005008
- thumb_func_end sub_80469B4
+ thumb_func_end DaycarePrintMonInfo
thumb_func_start sub_80469FC
sub_80469FC: @ 80469FC
@@ -2973,7 +2973,7 @@ sub_80469FC: @ 80469FC
lsls r0, 3
adds r4, r0, r1
ldrb r0, [r4, 0x8]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r1, r0, 0
ldr r0, _08046A30 @ =gUnknown_30030F0
ldrh r2, [r0, 0x2E]
@@ -3015,8 +3015,8 @@ _08046A46:
ldrb r0, [r4, 0xA]
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
b _08046AAC
.align 2, 0
_08046A74: .4byte gUnknown_20370D0
@@ -3039,8 +3039,8 @@ _08046A7C:
ldrb r0, [r4, 0xA]
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_08046AAC:
pop {r4,r5}
pop {r0}
@@ -3071,7 +3071,7 @@ sub_8046AB8: @ 8046AB8
strb r4, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -3080,7 +3080,7 @@ sub_8046AB8: @ 8046AB8
bl sub_8003F20
ldr r0, _08046B20 @ =sub_80469FC
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08046B24 @ =gUnknown_3005090
@@ -3106,13 +3106,13 @@ sub_8046B28: @ 8046B28
push {lr}
bl sub_8128370
ldr r1, _08046B38 @ =gUnknown_30030F0
- ldr r0, _08046B3C @ =sub_80567DC
+ ldr r0, _08046B3C @ =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
pop {r0}
bx r0
.align 2, 0
_08046B38: .4byte gUnknown_30030F0
-_08046B3C: .4byte sub_80567DC
+_08046B3C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8046B28
thumb_func_start sub_8046B40
@@ -3129,7 +3129,7 @@ sub_8046B40: @ 8046B40
ldr r1, [r1]
ldr r2, _08046B6C @ =0x00003c98
adds r1, r2
- bl sub_80454CC
+ bl StorePokemonInDaycare
pop {r0}
bx r0
.align 2, 0
@@ -3145,7 +3145,7 @@ sub_8046B70: @ 8046B70
ldr r0, [r0]
ldr r1, _08046B8C @ =0x00003c98
adds r0, r1
- bl sub_80457E8
+ bl GetDaycareCostForSelectedMon
ldr r1, _08046B90 @ =gUnknown_20370C2
strh r0, [r1]
pop {r0}
@@ -3164,7 +3164,7 @@ sub_8046B94: @ 8046B94
ldr r1, _08046BB0 @ =0x00003c98
adds r0, r1
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _08046BB4
movs r0, 0
@@ -3186,7 +3186,7 @@ sub_8046BBC: @ 8046BBC
ldr r0, [r0]
ldr r1, _08046BD8 @ =0x00003c98
adds r0, r1
- bl sub_80457B4
+ bl GetNumLevelsGainedForDaycareMon
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3203,7 +3203,7 @@ sub_8046BDC: @ 8046BDC
ldr r0, [r0]
ldr r1, _08046BF8 @ =0x00003c98
adds r0, r1
- bl sub_804565C
+ bl TakeSelectedPokemonFromDaycare
lsls r0, 16
lsrs r0, 16
pop {r1}
diff --git a/asm/decompress.s b/asm/decompress.s
index 69de99179..fe0e82384 100644
--- a/asm/decompress.s
+++ b/asm/decompress.s
@@ -5,24 +5,24 @@
.text
- thumb_func_start sub_800EBB4
-sub_800EBB4: @ 800EBB4
+ thumb_func_start LZDecompressWram
+LZDecompressWram: @ 800EBB4
push {lr}
bl LZ77UnCompWram
pop {r0}
bx r0
- thumb_func_end sub_800EBB4
+ thumb_func_end LZDecompressWram
- thumb_func_start sub_800EBC0
-sub_800EBC0: @ 800EBC0
+ thumb_func_start LZDecompressVram
+LZDecompressVram: @ 800EBC0
push {lr}
bl LZ77UnCompVram
pop {r0}
bx r0
- thumb_func_end sub_800EBC0
+ thumb_func_end LZDecompressVram
- thumb_func_start sub_800EBCC
-sub_800EBCC: @ 800EBCC
+ thumb_func_start LoadCompressedObjectPic
+LoadCompressedObjectPic: @ 800EBCC
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -37,7 +37,7 @@ sub_800EBCC: @ 800EBCC
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
lsls r0, 16
lsrs r0, 16
add sp, 0x8
@@ -46,10 +46,10 @@ sub_800EBCC: @ 800EBCC
bx r1
.align 2, 0
_0800EBFC: .4byte gUnknown_201C000
- thumb_func_end sub_800EBCC
+ thumb_func_end LoadCompressedObjectPic
- thumb_func_start sub_800EC00
-sub_800EC00: @ 800EC00
+ thumb_func_start LoadCompressedObjectPicOverrideBuffer
+LoadCompressedObjectPicOverrideBuffer: @ 800EC00
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -63,15 +63,15 @@ sub_800EC00: @ 800EC00
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_800EC00
+ thumb_func_end LoadCompressedObjectPicOverrideBuffer
- thumb_func_start sub_800EC28
-sub_800EC28: @ 800EC28
+ thumb_func_start LoadCompressedObjectPalette
+LoadCompressedObjectPalette: @ 800EC28
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -87,7 +87,7 @@ sub_800EC28: @ 800EC28
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -95,10 +95,10 @@ sub_800EC28: @ 800EC28
.align 2, 0
_0800EC54: .4byte gUnknown_201C000
_0800EC58: .4byte 0xffff0000
- thumb_func_end sub_800EC28
+ thumb_func_end LoadCompressedObjectPalette
- thumb_func_start sub_800EC5C
-sub_800EC5C: @ 800EC5C
+ thumb_func_start LoadCompressedObjectPaletteOverrideBuffer
+LoadCompressedObjectPaletteOverrideBuffer: @ 800EC5C
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -113,14 +113,14 @@ sub_800EC5C: @ 800EC5C
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800EC88: .4byte 0xffff0000
- thumb_func_end sub_800EC5C
+ thumb_func_end LoadCompressedObjectPaletteOverrideBuffer
thumb_func_start sub_800EC8C
sub_800EC8C: @ 800EC8C
@@ -268,7 +268,7 @@ _0800ED8C:
adds r1, r5, 0
adds r2, r4, 0
mov r3, r8
- bl sub_8043458
+ bl DrawSpindaSpots
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -655,7 +655,7 @@ sub_800F034: @ 800F034
ldr r0, [r4]
ldr r0, [r0]
lsrs r0, 8
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
cmp r5, 0
beq _0800F06E
@@ -669,9 +669,9 @@ sub_800F034: @ 800F034
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0
b _0800F070
_0800F06E:
@@ -691,7 +691,7 @@ sub_800F078: @ 800F078
ldr r0, [r4]
ldr r0, [r0]
lsrs r0, 8
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
cmp r5, 0
beq _0800F0B8
@@ -706,9 +706,9 @@ sub_800F078: @ 800F078
orrs r0, r2
str r0, [sp, 0x4]
mov r0, sp
- bl sub_8008928
+ bl LoadSpritePalette
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0
b _0800F0BA
.align 2, 0
@@ -876,7 +876,7 @@ _0800F1D0:
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
- bl sub_8043458
+ bl DrawSpindaSpots
pop {r3}
mov r8, r3
pop {r4-r7}
diff --git a/asm/diploma.s b/asm/diploma.s
index d014cd4ca..fa9b32e7f 100644
--- a/asm/diploma.s
+++ b/asm/diploma.s
@@ -8,9 +8,9 @@
thumb_func_start sub_80F4BFC
sub_80F4BFC: @ 80F4BFC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80F4BFC
@@ -20,7 +20,7 @@ sub_80F4C10: @ 80F4C10
push {r4,lr}
ldr r4, _080F4C40 @ =gUnknown_203AB48
ldr r0, _080F4C44 @ =0x00001004
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r1, 0
strb r1, [r0]
@@ -31,9 +31,9 @@ sub_80F4C10: @ 80F4C10
bl sub_80F4E24
ldr r0, _080F4C48 @ =sub_80F4C68
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _080F4C4C @ =sub_80F4C50
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -47,10 +47,10 @@ _080F4C4C: .4byte sub_80F4C50
thumb_func_start sub_80F4C50
sub_80F4C50: @ 80F4C50
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80F4C50
@@ -87,7 +87,7 @@ _080F4C8C:
.4byte _080F4D22
_080F4CB0:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
b _080F4D50
_080F4CB8:
bl sub_80F4E40
@@ -103,7 +103,7 @@ _080F4CCA:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _080F4D50
.align 2, 0
_080F4CD8: .4byte gUnknown_84154E8
@@ -115,21 +115,21 @@ _080F4CDC:
movs r1, 0x80
lsls r1, 1
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
b _080F4D50
_080F4CF2:
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080F4D50
_080F4CFC:
bl sub_80F5018
b _080F4D50
_080F4D02:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080F4D50
_080F4D10:
movs r0, 0x1
@@ -138,11 +138,11 @@ _080F4D10:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080F4D50
_080F4D22:
ldr r0, _080F4D2C @ =sub_80F4BFC
- bl sub_80006F4
+ bl SetVBlankCallback
b _080F4D50
.align 2, 0
_080F4D2C: .4byte sub_80F4BFC
@@ -204,7 +204,7 @@ _080F4D94:
b _080F4DD6
_080F4D9A:
movs r0, 0
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _080F4DD6
@@ -221,7 +221,7 @@ _080F4DA8:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080F4DC2:
ldr r1, [r4]
ldrb r0, [r1]
@@ -254,14 +254,14 @@ sub_80F4DE0: @ 80F4DE0
cmp r5, 0
bne _080F4E10
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
ldr r4, _080F4E1C @ =gUnknown_203AB48
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r0, _080F4E20 @ =sub_80568FC
- bl sub_8000544
+ bl SetMainCallback2
_080F4E10:
pop {r4,r5}
pop {r0}
@@ -275,11 +275,11 @@ _080F4E20: .4byte sub_80568FC
thumb_func_start sub_80F4E24
sub_80F4E24: @ 80F4E24
push {lr}
- bl sub_8006B10
- bl sub_8070528
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl remove_some_task
pop {r0}
bx r0
thumb_func_end sub_80F4E24
@@ -355,7 +355,7 @@ _080F4E66:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _080F4F90 @ =gUnknown_8415A08
@@ -365,51 +365,51 @@ _080F4E66:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _080F4F94 @ =gUnknown_8415A10
bl sub_8003B24
bl sub_8002C28
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080F4F98 @ =gUnknown_203AB48
ldr r1, [r0]
adds r1, 0x4
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r5, 0x1E
str r5, [sp]
movs r4, 0x14
@@ -418,14 +418,14 @@ _080F4E66:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
add sp, 0x10
pop {r3}
mov r8, r3
@@ -463,7 +463,7 @@ _080F4FB8:
beq _080F4FEE
b _080F4FF8
_080F4FC2:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
b _080F5000
_080F4FC8:
ldr r1, _080F4FDC @ =gUnknown_84147C0
@@ -472,12 +472,12 @@ _080F4FC8:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _080F5000
.align 2, 0
_080F4FDC: .4byte gUnknown_84147C0
_080F4FE0:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -487,7 +487,7 @@ _080F4FEE:
ldr r0, _080F4FFC @ =gUnknown_8415954
movs r1, 0
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
_080F4FF8:
movs r0, 0x1
b _080F500C
@@ -536,7 +536,7 @@ _080F5048:
_080F5050:
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _080F50E4 @ =gUnknown_841B60E
add r0, sp, 0xC
bl sub_813CCC8
@@ -591,7 +591,7 @@ _080F5050:
movs r3, 0x69
bl sub_812E51C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xAC
pop {r4-r6}
pop {r0}
diff --git a/asm/dma3_manager.s b/asm/dma3_manager.s
index 46f711d79..3d08f98de 100644
--- a/asm/dma3_manager.s
+++ b/asm/dma3_manager.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8000BFC
-sub_8000BFC: @ 8000BFC
+ thumb_func_start ClearDma3Requests
+ClearDma3Requests: @ 8000BFC
push {lr}
ldr r2, _08000C28 @ =gUnknown_30008C8
movs r0, 0x1
@@ -33,10 +33,10 @@ _08000C10:
_08000C28: .4byte gUnknown_30008C8
_08000C2C: .4byte gUnknown_30008C9
_08000C30: .4byte gUnknown_30000C8
- thumb_func_end sub_8000BFC
+ thumb_func_end ClearDma3Requests
- thumb_func_start sub_8000C34
-sub_8000C34: @ 8000C34
+ thumb_func_start ProcessDma3Requests
+ProcessDma3Requests: @ 8000C34
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -360,10 +360,10 @@ _08000E9C: .4byte gUnknown_30000D4
_08000EA0: .4byte 0x040000d4
_08000EA4: .4byte 0x81000800
_08000EA8: .4byte gUnknown_30000C8
- thumb_func_end sub_8000C34
+ thumb_func_end ProcessDma3Requests
- thumb_func_start sub_8000EAC
-sub_8000EAC: @ 8000EAC
+ thumb_func_start RequestDma3Copy
+RequestDma3Copy: @ 8000EAC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -443,10 +443,10 @@ _08000F34:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8000EAC
+ thumb_func_end RequestDma3Copy
- thumb_func_start sub_8000F44
-sub_8000F44: @ 8000F44
+ thumb_func_start RequestDma3Fill
+RequestDma3Fill: @ 8000F44
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -532,10 +532,10 @@ _08000FDA:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8000F44
+ thumb_func_end RequestDma3Fill
- thumb_func_start sub_8000FE8
-sub_8000FE8: @ 8000FE8
+ thumb_func_start CheckForSpaceForDma3Request
+CheckForSpaceForDma3Request: @ 8000FE8
push {lr}
movs r2, 0
lsls r0, 16
@@ -573,6 +573,6 @@ _08001020:
bx r1
.align 2, 0
_08001024: .4byte gUnknown_30000C8
- thumb_func_end sub_8000FE8
+ thumb_func_end CheckForSpaceForDma3Request
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index a267c6b61..f9d937146 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -214,7 +214,7 @@ _080BD86C:
adds r1, r0, 0
_080BD87E:
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
b _080BD896
.align 2, 0
_080BD888: .4byte 0x0000ffff
@@ -335,7 +335,7 @@ _080BD95C: .4byte 0x000001ff
_080BD960:
ldr r0, _080BD970 @ =gUnknown_841E093
_080BD962:
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
_080BD96A:
@@ -418,7 +418,7 @@ sub_80BD9E8: @ 80BD9E8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8044EC8
+ bl Random
ldr r2, _080BDA38 @ =gUnknown_83ECED4
lsls r1, r4, 3
adds r1, r2
@@ -565,7 +565,7 @@ _080BDAF8:
adds r1, r5, 0
bl sub_80BD89C
adds r0, r4, 0
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
_080BDB08:
pop {r4,r5}
pop {r0}
@@ -579,7 +579,7 @@ _080BDB18: .4byte gUnknown_2021D18
thumb_func_start sub_80BDB1C
sub_80BDB1C: @ 80BDB1C
push {lr}
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
movs r0, 0xC
@@ -699,7 +699,7 @@ _080BDBDC:
.align 2, 0
_080BDBF4: .4byte 0x000001ff
_080BDBF8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x21
@@ -758,7 +758,7 @@ _080BDC50:
.align 2, 0
_080BDC60: .4byte 0x000001ff
_080BDC64:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r5, 0
@@ -822,7 +822,7 @@ _080BDCCA:
.align 2, 0
_080BDCD4: .4byte 0x000001ff
_080BDCD8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -837,7 +837,7 @@ _080BDCD8:
bcs _080BDD22
_080BDCF6:
ldrh r0, [r5]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -1013,7 +1013,7 @@ sub_80BDE44: @ 80BDE44
push {r4,lr}
ldr r4, _080BDE60 @ =gUnknown_20399BC
ldr r0, _080BDE64 @ =0x00003ba4
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _080BDE68
@@ -1039,7 +1039,7 @@ sub_80BDE70: @ 80BDE70
ldr r0, [r0]
cmp r0, 0
beq _080BDE7E
- bl sub_8002BC4
+ bl Free
_080BDE7E:
pop {r0}
bx r0
@@ -1185,7 +1185,7 @@ sub_80BDF6C: @ 80BDF6C
adds r1, r0
ldr r1, [r1]
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r1, r0, 0
subs r4, r1, r4
lsls r4, 16
@@ -1224,8 +1224,8 @@ sub_80BDFB0: @ 80BDFB0
_080BDFBC: .4byte gUnknown_83EDF98
thumb_func_end sub_80BDFB0
- thumb_func_start sub_80BDFC0
-sub_80BDFC0: @ 80BDFC0
+ thumb_func_start CopyEasyChatWordPadded
+CopyEasyChatWordPadded: @ 80BDFC0
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 16
@@ -1255,7 +1255,7 @@ _080BDFEC:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80BDFC0
+ thumb_func_end CopyEasyChatWordPadded
thumb_func_start sub_80BDFF8
sub_80BDFF8: @ 80BDFF8
@@ -1765,7 +1765,7 @@ _080BE3BC:
cmp r0, 0x15
bne _080BE3FA
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -1779,7 +1779,7 @@ _080BE3D6:
cmp r0, 0
beq _080BE3F6
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s
index 2e1a8341b..e6ee9da8a 100644
--- a/asm/egg_hatch.s
+++ b/asm/egg_hatch.s
@@ -16,7 +16,7 @@ sub_8046BFC: @ 8046BFC
adds r6, r0, 0
adds r5, r1, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x3C]
@@ -42,7 +42,7 @@ _08046C3C:
adds r1, r4, 0
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r4, 1
add r1, sp
adds r1, 0x10
@@ -54,14 +54,14 @@ _08046C3C:
bls _08046C3C
adds r0, r6, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
movs r4, 0
_08046C64:
adds r1, r4, 0
adds r1, 0x27
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r4, 2
adds r1, r7, r1
str r0, [r1]
@@ -72,21 +72,21 @@ _08046C64:
bls _08046C64
adds r0, r6, 0
movs r1, 0x25
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x8
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x40]
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x22
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x38]
adds r0, r6, 0
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp, 0x48]
strb r0, [r1]
movs r0, 0x1
@@ -100,7 +100,7 @@ _08046C64:
ldr r1, [sp, 0x3C]
movs r2, 0x5
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
movs r4, 0
_08046CC8:
adds r1, r4, 0
@@ -196,19 +196,19 @@ sub_8046D60: @ 8046D60
bl sub_804037C
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, sp
adds r1, r4, 0
- bl sub_8040FD0
+ bl GetSpeciesName
adds r0, r5, 0
movs r1, 0x2
mov r2, sp
bl sub_804037C
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -220,7 +220,7 @@ sub_8046D60: @ 8046D60
bl sub_8088E74
ldr r1, _08046E1C @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_80453C0
+ bl GetMonNick
mov r2, sp
adds r2, 0xE
movs r0, 0x4
@@ -234,7 +234,7 @@ sub_8046D60: @ 8046D60
adds r0, r5, 0
movs r1, 0x24
bl sub_804037C
- bl sub_8056260
+ bl sav1_map_get_name
mov r2, sp
adds r2, 0x12
strb r0, [r2]
@@ -242,9 +242,9 @@ sub_8046D60: @ 8046D60
movs r1, 0x23
bl sub_804037C
adds r0, r5, 0
- bl sub_80442D8
+ bl MonRestorePP
adds r0, r5, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x14
pop {r4,r5}
pop {r0}
@@ -278,7 +278,7 @@ sub_8046E34: @ 8046E34
adds r4, r0, r1
adds r0, r4, 0
mov r1, sp
- bl sub_80453E0
+ bl GetBoxMonNick
adds r0, r4, 0
adds r0, 0x70
ldrh r0, [r0]
@@ -288,26 +288,26 @@ sub_8046E34: @ 8046E34
adds r5, 0x7C
mov r0, sp
adds r1, r5, 0
- bl sub_8008E28
+ bl StringCompare
adds r4, 0x74
cmp r0, 0
bne _08046E74
ldr r0, _08046E90 @ =gUnknown_300500C
ldr r0, [r0]
adds r1, r4, 0
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _08046EA0
_08046E74:
ldr r0, _08046E94 @ =gUnknown_2021CD0
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08046E98 @ =gUnknown_2021CF0
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08046E9C @ =gUnknown_2021D04
adds r1, r5, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
b _08046EA2
.align 2, 0
@@ -389,13 +389,13 @@ _08046F18: .4byte gUnknown_2024284
_08046F1C:
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
lsls r0, r4, 3
ldr r1, _08046F64 @ =gUnknown_82350AC
@@ -413,7 +413,7 @@ _08046F1C:
bl sub_800ECC4
adds r0, r5, 0
bl sub_8044148
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
mov r0, r9
strh r4, [r0]
b _08046FA6
@@ -430,7 +430,7 @@ _08046F6C:
movs r1, 0x78
movs r2, 0x46
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r4, _08046FB8 @ =gUnknown_202063C
@@ -464,9 +464,9 @@ _08046FBC: .4byte nullsub_8
thumb_func_start sub_8046FC0
sub_8046FC0: @ 8046FC0
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8046FC0
@@ -475,17 +475,17 @@ sub_8046FC0: @ 8046FC0
sub_8046FD4: @ 8046FD4
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _08047000 @ =sub_8047004
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_812B478
add sp, 0x4
pop {r0}
@@ -507,12 +507,12 @@ sub_8047004: @ 8047004
bne _0804702C
bl sub_80563F0
ldr r0, _08047038 @ =sub_8047044
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _0804703C @ =gUnknown_3005020
ldr r0, _08047040 @ =sub_807DD24
str r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0804702C:
pop {r4}
pop {r0}
@@ -559,12 +559,12 @@ _0804706C:
_08047090:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08047148 @ =gUnknown_3000E74
movs r0, 0x14
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
- bl sub_80358D4
+ bl AllocateMonSpritesGfx
ldr r2, [r4]
ldr r0, _0804714C @ =gUnknown_20370C0
ldrh r0, [r0]
@@ -573,11 +573,11 @@ _08047090:
ldr r0, [r4]
strb r1, [r0, 0x7]
ldr r0, _08047150 @ =sub_8046FC0
- bl sub_80006F4
- bl sub_8071A68
+ bl SetVBlankCallback
+ bl GetCurrentMapMusic
ldr r1, _08047154 @ =gUnknown_20370C2
strh r0, [r1]
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
movs r0, 0
bl sub_8001618
ldr r1, _08047158 @ =gUnknown_826019C
@@ -587,41 +587,41 @@ _08047090:
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0x7
movs r2, 0x2
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x80
lsls r0, 5
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x80
lsls r0, 6
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_8002C28
- bl sub_8070528
- bl sub_80088F0
- bl sub_8006B10
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
+ bl ResetSpriteData
+ bl ResetTasks
+ bl remove_some_task
bl m4aSoundVSyncOn
b _0804724A
.align 2, 0
@@ -652,11 +652,11 @@ _08047174:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, _080471A4 @ =gUnknown_8D004D8
movs r1, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0804724A
.align 2, 0
_0804719C: .4byte gUnknown_8D00000
@@ -664,11 +664,11 @@ _080471A0: .4byte gUnknown_8D0051C
_080471A4: .4byte gUnknown_8D004D8
_080471A8:
ldr r0, _080471BC @ =gUnknown_826011C
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _080471C0 @ =gUnknown_8260124
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _080471C4 @ =gUnknown_826012C
- bl sub_8008928
+ bl LoadSpritePalette
b _0804724A
.align 2, 0
_080471BC: .4byte gUnknown_826011C
@@ -676,7 +676,7 @@ _080471C0: .4byte gUnknown_8260124
_080471C4: .4byte gUnknown_826012C
_080471C8:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _080471DC @ =gUnknown_3000E74
ldr r0, [r0]
ldrb r0, [r0, 0x4]
@@ -712,25 +712,25 @@ _08047214:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0804725C @ =gUnknown_8EAEA20
movs r1, 0x10
movs r2, 0xA0
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08047260 @ =gUnknown_8EAEA80
movs r2, 0xA1
lsls r2, 5
movs r0, 0x1
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, _08047264 @ =gUnknown_826601C
movs r2, 0x80
lsls r2, 5
movs r0, 0x1
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0804724A:
ldr r1, _08047268 @ =gUnknown_30030F0
movs r0, 0x87
@@ -747,17 +747,17 @@ _08047264: .4byte gUnknown_826601C
_08047268: .4byte gUnknown_30030F0
_0804726C:
ldr r0, _08047298 @ =sub_8047338
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0804729C @ =gUnknown_3000E74
ldr r1, [r0]
movs r0, 0
strb r0, [r1, 0x2]
_0804727A:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0x4
pop {r4}
pop {r0}
@@ -779,13 +779,13 @@ sub_80472A0: @ 80472A0
ldr r2, _080472D8 @ =gUnknown_2021D04
movs r1, 0x2
bl sub_804037C
- bl sub_80359AC
+ bl FreeMonSpritesGfx
ldr r0, _080472DC @ =gUnknown_3000E74
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_812B484
- ldr r0, _080472E0 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080472E0 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -793,7 +793,7 @@ _080472D0: .4byte gUnknown_20370C0
_080472D4: .4byte gUnknown_2024284
_080472D8: .4byte gUnknown_2021D04
_080472DC: .4byte gUnknown_3000E74
-_080472E0: .4byte sub_80567DC
+_080472E0: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80472A0
thumb_func_start sub_80472E4
@@ -810,14 +810,14 @@ sub_80472E4: @ 80472E4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08047300
- bl sub_8071A94
+ bl StopMapMusic
_08047300:
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0x1
bne _0804730E
ldr r0, _08047334 @ =0x00000107
- bl sub_80722A0
+ bl PlayBGM
_0804730E:
movs r1, 0x8
ldrsh r0, [r4, r1]
@@ -825,9 +825,9 @@ _0804730E:
ble _08047324
movs r0, 0x84
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08047324:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -886,26 +886,26 @@ _08047398:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080473D8 @ =gUnknown_8260134
movs r1, 0x78
movs r2, 0x4B
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080473DC @ =gUnknown_3000E74
ldr r1, [r4]
strb r0, [r1]
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r1, [r4]
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
ldr r0, _080473E0 @ =sub_80472E4
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
b _08047684
.align 2, 0
_080473D8: .4byte gUnknown_8260134
@@ -925,7 +925,7 @@ _080473F6:
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
strb r4, [r0, 0x3]
ldr r1, [r5]
@@ -978,14 +978,14 @@ _08047444:
_0804745E:
ldrh r0, [r3, 0xC]
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
ldr r1, [r5]
b _08047648
.align 2, 0
_0804746C: .4byte gUnknown_202063C
_08047470: .4byte nullsub_8
_08047474:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _08047480
@@ -1000,7 +1000,7 @@ _08047482:
ldr r1, _080474D4 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080474D8 @ =gUnknown_2021CD0
- bl sub_80453C0
+ bl GetMonNick
ldr r4, _080474DC @ =gUnknown_2021D18
ldr r1, _080474E0 @ =gUnknown_841B6FD
adds r0, r4, 0
@@ -1014,14 +1014,14 @@ _08047482:
movs r3, 0x3
bl sub_8047A9C
ldr r0, _080474E4 @ =0x00000103
- bl sub_8071C60
+ bl PlayFanfare
ldr r1, [r5]
ldrb r0, [r1, 0x2]
adds r0, 0x1
strb r0, [r1, 0x2]
ldr r0, [r5]
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0x3
@@ -1034,7 +1034,7 @@ _080474DC: .4byte gUnknown_2021D18
_080474E0: .4byte gUnknown_841B6FD
_080474E4: .4byte 0x00000103
_080474E8:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _080474F4
@@ -1042,7 +1042,7 @@ _080474E8:
_080474F4:
b _08047644
_080474F6:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
bne _08047502
@@ -1057,7 +1057,7 @@ _08047504:
ldr r1, _08047538 @ =gUnknown_2024284
adds r0, r1
ldr r1, _0804753C @ =gUnknown_2021CD0
- bl sub_80453C0
+ bl GetMonNick
ldr r4, _08047540 @ =gUnknown_2021D18
ldr r1, _08047544 @ =gUnknown_841B716
adds r0, r4, 0
@@ -1138,7 +1138,7 @@ _080475A8:
adds r0, r6
ldr r1, _0804762C @ =gUnknown_2021D04
mov r10, r1
- bl sub_80453C0
+ bl GetMonNick
mov r1, r9
ldr r0, [r1]
ldrb r0, [r0, 0x4]
@@ -1147,7 +1147,7 @@ _080475A8:
adds r0, r1, 0
adds r0, r6
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -1158,7 +1158,7 @@ _080475A8:
muls r1, r0
adds r0, r1, 0
adds r0, r6
- bl sub_803F720
+ bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1171,7 +1171,7 @@ _080475A8:
adds r0, r6
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r0, _08047630 @ =sub_80472A0
str r0, [sp, 0x4]
@@ -1193,7 +1193,7 @@ _08047634:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08047644:
ldr r0, _08047650 @ =gUnknown_3000E74
ldr r1, [r0]
@@ -1215,20 +1215,20 @@ _08047654:
ldrb r0, [r0, 0x8]
bl sub_8003E3C
movs r0, 0
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x1
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
ldr r0, [r5]
- bl sub_8002BC4
- ldr r0, _080476AC @ =sub_80567DC
- bl sub_8000544
+ bl Free
+ ldr r0, _080476AC @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
bl sub_812B484
_08047684:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -1239,7 +1239,7 @@ _08047684:
bx r0
.align 2, 0
_080476A8: .4byte gUnknown_2037AB8
-_080476AC: .4byte sub_80567DC
+_080476AC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8047338
thumb_func_start sub_80476B0
@@ -1269,7 +1269,7 @@ _080476D0:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x1
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1279,8 +1279,8 @@ _080476D0:
bl sub_80722CC
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
- bl sub_80479C8
+ bl StartSpriteAnim
+ bl CreateRandomEggShardSprite
_08047700:
pop {r4}
pop {r0}
@@ -1322,7 +1322,7 @@ _08047738:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1332,7 +1332,7 @@ _08047738:
bl sub_80722CC
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
_08047764:
pop {r4}
pop {r0}
@@ -1358,7 +1358,7 @@ sub_804776C: @ 804776C
asrs r0, 16
cmp r0, 0x26
ble _080477E4
- ldr r0, _080477D0 @ =sub_804782C
+ ldr r0, _080477D0 @ =SpriteCB_Egg_3
str r0, [r4, 0x1C]
strh r6, [r4, 0x2E]
ldr r5, _080477D4 @ =gUnknown_3000E74
@@ -1369,7 +1369,7 @@ sub_804776C: @ 804776C
ldr r1, _080477D8 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
ldr r4, _080477DC @ =gUnknown_202063C
ldr r3, [r5]
@@ -1391,7 +1391,7 @@ sub_804776C: @ 804776C
strh r0, [r1, 0x26]
b _08047826
.align 2, 0
-_080477D0: .4byte sub_804782C
+_080477D0: .4byte SpriteCB_Egg_3
_080477D4: .4byte gUnknown_3000E74
_080477D8: .4byte gUnknown_2024284
_080477DC: .4byte gUnknown_202063C
@@ -1405,7 +1405,7 @@ _080477E4:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x2
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1415,9 +1415,9 @@ _080477E4:
bl sub_80722CC
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
- bl sub_80479C8
- bl sub_80479C8
+ bl StartSpriteAnim
+ bl CreateRandomEggShardSprite
+ bl CreateRandomEggShardSprite
_08047818:
movs r1, 0x2E
ldrsh r0, [r4, r1]
@@ -1431,8 +1431,8 @@ _08047826:
bx r0
thumb_func_end sub_804776C
- thumb_func_start sub_804782C
-sub_804782C: @ 804782C
+ thumb_func_start SpriteCB_Egg_3
+SpriteCB_Egg_3: @ 804782C
push {lr}
adds r1, r0, 0
ldrh r0, [r1, 0x2E]
@@ -1442,7 +1442,7 @@ sub_804782C: @ 804782C
asrs r0, 16
cmp r0, 0x32
ble _08047846
- ldr r0, _0804784C @ =sub_8047850
+ ldr r0, _0804784C @ =SpriteCB_Egg_4
str r0, [r1, 0x1C]
movs r0, 0
strh r0, [r1, 0x2E]
@@ -1450,11 +1450,11 @@ _08047846:
pop {r0}
bx r0
.align 2, 0
-_0804784C: .4byte sub_8047850
- thumb_func_end sub_804782C
+_0804784C: .4byte SpriteCB_Egg_4
+ thumb_func_end SpriteCB_Egg_3
- thumb_func_start sub_8047850
-sub_8047850: @ 8047850
+ thumb_func_start SpriteCB_Egg_4
+SpriteCB_Egg_4: @ 8047850
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1469,14 +1469,14 @@ sub_8047850: @ 8047850
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08047870:
ldrh r0, [r5, 0x2E]
cmp r0, 0x3
bhi _0804788C
movs r4, 0
_08047878:
- bl sub_80479C8
+ bl CreateRandomEggShardSprite
lsls r0, r4, 16
movs r1, 0x80
lsls r1, 9
@@ -1505,7 +1505,7 @@ _0804788C:
movs r1, 0x4
orrs r0, r1
strb r0, [r2]
- ldr r0, _080478CC @ =sub_80478D0
+ ldr r0, _080478CC @ =SpriteCB_Egg_5
str r0, [r5, 0x1C]
strh r4, [r5, 0x2E]
_080478BA:
@@ -1516,11 +1516,11 @@ _080478BA:
.align 2, 0
_080478C4: .4byte 0x0000ffff
_080478C8: .4byte gUnknown_2037AB8
-_080478CC: .4byte sub_80478D0
- thumb_func_end sub_8047850
+_080478CC: .4byte SpriteCB_Egg_5
+ thumb_func_end SpriteCB_Egg_4
- thumb_func_start sub_80478D0
-sub_80478D0: @ 80478D0
+ thumb_func_start SpriteCB_Egg_5
+SpriteCB_Egg_5: @ 80478D0
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1549,7 +1549,7 @@ sub_80478D0: @ 80478D0
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0804790C:
movs r2, 0x2E
ldrsh r0, [r5, r2]
@@ -1562,7 +1562,7 @@ _0804790C:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08047926:
movs r1, 0x2E
ldrsh r0, [r5, r1]
@@ -1599,10 +1599,10 @@ _08047960: .4byte gUnknown_202063C
_08047964: .4byte gUnknown_3000E74
_08047968: .4byte 0x0000ffff
_0804796C: .4byte nullsub_8
- thumb_func_end sub_80478D0
+ thumb_func_end SpriteCB_Egg_5
- thumb_func_start sub_8047970
-sub_8047970: @ 8047970
+ thumb_func_start SpriteCB_EggShard
+SpriteCB_EggShard: @ 8047970
push {r4,lr}
adds r2, r0, 0
ldrh r0, [r2, 0x30]
@@ -1644,15 +1644,15 @@ _0804799C:
cmp r0, 0
ble _080479C2
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_080479C2:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8047970
+ thumb_func_end SpriteCB_EggShard
- thumb_func_start sub_80479C8
-sub_80479C8: @ 80479C8
+ thumb_func_start CreateRandomEggShardSprite
+CreateRandomEggShardSprite: @ 80479C8
push {r4-r6,lr}
sub sp, 0x8
ldr r2, _08047A14 @ =gUnknown_82601BC
@@ -1667,7 +1667,7 @@ sub_80479C8: @ 80479C8
ldrh r4, [r0]
adds r3, 0x1
strb r3, [r6, 0x7]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -1684,7 +1684,7 @@ sub_80479C8: @ 80479C8
movs r1, 0x3C
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8047A1C
+ bl CreateEggShardSprite
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1692,10 +1692,10 @@ sub_80479C8: @ 80479C8
.align 2, 0
_08047A14: .4byte gUnknown_82601BC
_08047A18: .4byte gUnknown_3000E74
- thumb_func_end sub_80479C8
+ thumb_func_end CreateRandomEggShardSprite
- thumb_func_start sub_8047A1C
-sub_8047A1C: @ 8047A1C
+ thumb_func_start CreateEggShardSprite
+CreateEggShardSprite: @ 8047A1C
push {r4-r6,lr}
mov r6, r10
mov r5, r9
@@ -1731,7 +1731,7 @@ sub_8047A1C: @ 8047A1C
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1746,7 +1746,7 @@ sub_8047A1C: @ 8047A1C
mov r1, r9
strh r1, [r0, 0x34]
mov r1, r10
- bl sub_800838C
+ bl StartSpriteAnim
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -1757,7 +1757,7 @@ sub_8047A1C: @ 8047A1C
.align 2, 0
_08047A94: .4byte gUnknown_8260184
_08047A98: .4byte gUnknown_202063C
- thumb_func_end sub_8047A1C
+ thumb_func_end CreateEggShardSprite
thumb_func_start sub_8047A9C
sub_8047A9C: @ 8047A9C
@@ -1780,7 +1780,7 @@ sub_8047A9C: @ 8047A9C
adds r0, r5, 0
movs r1, 0xFF
str r3, [sp, 0x14]
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _08047B08 @ =gUnknown_3000E74
ldr r1, [r2]
movs r0, 0
diff --git a/asm/evolution_graphics.s b/asm/evolution_graphics.s
index 4ad9b08b6..86fda2a88 100644
--- a/asm/evolution_graphics.s
+++ b/asm/evolution_graphics.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80F5950
-sub_80F5950: @ 80F5950
+ thumb_func_start SetEvoSparklesMatrices
+SetEvoSparklesMatrices: @ 80F5950
push {r4,r5,lr}
sub sp, 0x4
movs r4, 0
@@ -22,7 +22,7 @@ _080F5958:
str r1, [sp]
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -34,10 +34,10 @@ _080F5958:
bx r0
.align 2, 0
_080F5984: .4byte gUnknown_841EF10
- thumb_func_end sub_80F5950
+ thumb_func_end SetEvoSparklesMatrices
- thumb_func_start sub_80F5988
-sub_80F5988: @ 80F5988
+ thumb_func_start SpriteCB_PreEvoSparkleSet1
+SpriteCB_PreEvoSparkleSet1: @ 80F5988
push {r4,lr}
adds r4, r0, 0
movs r1, 0x22
@@ -59,7 +59,7 @@ sub_80F5988: @ 80F5988
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -73,7 +73,7 @@ _080F59C2:
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x3A]
adds r0, 0x4
@@ -130,15 +130,15 @@ _080F5A22:
b _080F5A3C
_080F5A36:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F5A3C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80F5988
+ thumb_func_end SpriteCB_PreEvoSparkleSet1
- thumb_func_start sub_80F5A44
-sub_80F5A44: @ 80F5A44
+ thumb_func_start CreatePreEvoSparkleSet1
+CreatePreEvoSparkleSet1: @ 80F5A44
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -146,7 +146,7 @@ sub_80F5A44: @ 80F5A44
movs r1, 0x78
movs r2, 0x58
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -173,7 +173,7 @@ sub_80F5A44: @ 80F5A44
strb r0, [r2, 0x3]
adds r4, 0x1C
adds r3, r4
- ldr r0, _080F5A9C @ =sub_80F5988
+ ldr r0, _080F5A9C @ =SpriteCB_PreEvoSparkleSet1
str r0, [r3]
_080F5A8E:
pop {r4,r5}
@@ -182,11 +182,11 @@ _080F5A8E:
.align 2, 0
_080F5A94: .4byte gUnknown_841EEF8
_080F5A98: .4byte gUnknown_202063C
-_080F5A9C: .4byte sub_80F5988
- thumb_func_end sub_80F5A44
+_080F5A9C: .4byte SpriteCB_PreEvoSparkleSet1
+ thumb_func_end CreatePreEvoSparkleSet1
- thumb_func_start sub_80F5AA0
-sub_80F5AA0: @ 80F5AA0
+ thumb_func_start SpriteCB_PreEvoSparkleSet2
+SpriteCB_PreEvoSparkleSet2: @ 80F5AA0
push {r4,lr}
adds r4, r0, 0
movs r1, 0x22
@@ -207,7 +207,7 @@ sub_80F5AA0: @ 80F5AA0
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
lsls r0, 16
asrs r0, 16
cmp r0, 0
@@ -221,14 +221,14 @@ _080F5AD8:
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x3C
ldrsh r0, [r4, r1]
lsls r0, 26
lsrs r0, 24
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
adds r0, 0x8
strh r0, [r4, 0x38]
ldrh r0, [r4, 0x3C]
@@ -237,15 +237,15 @@ _080F5AD8:
b _080F5B0C
_080F5B06:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F5B0C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80F5AA0
+ thumb_func_end SpriteCB_PreEvoSparkleSet2
- thumb_func_start sub_80F5B14
-sub_80F5B14: @ 80F5B14
+ thumb_func_start CreatePreEvoSparkleSet2
+CreatePreEvoSparkleSet2: @ 80F5B14
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -253,7 +253,7 @@ sub_80F5B14: @ 80F5B14
movs r1, 0x78
movs r2, 0x8
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -286,7 +286,7 @@ sub_80F5B14: @ 80F5B14
strb r0, [r2]
adds r4, 0x1C
adds r3, r4
- ldr r0, _080F5B78 @ =sub_80F5AA0
+ ldr r0, _080F5B78 @ =SpriteCB_PreEvoSparkleSet2
str r0, [r3]
_080F5B6A:
pop {r4,r5}
@@ -295,11 +295,11 @@ _080F5B6A:
.align 2, 0
_080F5B70: .4byte gUnknown_841EEF8
_080F5B74: .4byte gUnknown_202063C
-_080F5B78: .4byte sub_80F5AA0
- thumb_func_end sub_80F5B14
+_080F5B78: .4byte SpriteCB_PreEvoSparkleSet2
+ thumb_func_end CreatePreEvoSparkleSet2
- thumb_func_start sub_80F5B7C
-sub_80F5B7C: @ 80F5B7C
+ thumb_func_start SpriteCB_PostEvoSparkleSet1
+SpriteCB_PostEvoSparkleSet1: @ 80F5B7C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x38
@@ -311,14 +311,14 @@ sub_80F5B7C: @ 80F5B7C
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x3A]
lsls r0, 24
lsrs r0, 24
movs r2, 0x38
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
ldrh r0, [r4, 0x38]
ldrh r1, [r4, 0x34]
@@ -330,15 +330,15 @@ sub_80F5B7C: @ 80F5B7C
b _080F5BBE
_080F5BB8:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F5BBE:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80F5B7C
+ thumb_func_end SpriteCB_PostEvoSparkleSet1
- thumb_func_start sub_80F5BC4
-sub_80F5BC4: @ 80F5BC4
+ thumb_func_start CreatePostEvoSparkleSet1
+CreatePostEvoSparkleSet1: @ 80F5BC4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -348,7 +348,7 @@ sub_80F5BC4: @ 80F5BC4
movs r1, 0x78
movs r2, 0x38
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -379,7 +379,7 @@ sub_80F5BC4: @ 80F5BC4
strb r0, [r2]
adds r4, 0x1C
adds r3, r4
- ldr r0, _080F5C28 @ =sub_80F5B7C
+ ldr r0, _080F5C28 @ =SpriteCB_PostEvoSparkleSet1
str r0, [r3]
_080F5C1A:
pop {r4-r6}
@@ -388,11 +388,11 @@ _080F5C1A:
.align 2, 0
_080F5C20: .4byte gUnknown_841EEF8
_080F5C24: .4byte gUnknown_202063C
-_080F5C28: .4byte sub_80F5B7C
- thumb_func_end sub_80F5BC4
+_080F5C28: .4byte SpriteCB_PostEvoSparkleSet1
+ thumb_func_end CreatePostEvoSparkleSet1
- thumb_func_start sub_80F5C2C
-sub_80F5C2C: @ 80F5C2C
+ thumb_func_start SpriteCB_PostEvoSparkleSet2
+SpriteCB_PostEvoSparkleSet2: @ 80F5C2C
push {r4,r5,lr}
adds r4, r0, 0
ldrh r1, [r4, 0x3C]
@@ -413,7 +413,7 @@ _080F5C40:
lsrs r0, 24
movs r5, 0x38
ldrsh r1, [r4, r5]
- bl sub_8044E30
+ bl Sin
negs r0, r0
strh r0, [r4, 0x26]
movs r0, 0x34
@@ -496,15 +496,15 @@ _080F5CD6:
b _080F5CF6
_080F5CF0:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080F5CF6:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80F5C2C
+ thumb_func_end SpriteCB_PostEvoSparkleSet2
- thumb_func_start sub_80F5CFC
-sub_80F5CFC: @ 80F5CFC
+ thumb_func_start CreatePostEvoSparkleSet2
+CreatePostEvoSparkleSet2: @ 80F5CFC
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -512,12 +512,12 @@ sub_80F5CFC: @ 80F5CFC
movs r1, 0x78
movs r2, 0x38
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
beq _080F5D6C
- bl sub_8044EC8
+ bl Random
ldr r6, _080F5D7C @ =gUnknown_202063C
lsls r5, r4, 4
adds r5, r4
@@ -532,7 +532,7 @@ sub_80F5CFC: @ 80F5CFC
movs r0, 0
mov r8, r0
strh r1, [r4, 0x34]
- bl sub_8044EC8
+ bl Random
movs r1, 0x3F
ands r1, r0
adds r1, 0x30
@@ -555,7 +555,7 @@ sub_80F5CFC: @ 80F5CFC
strb r0, [r4]
adds r6, 0x1C
adds r5, r6
- ldr r0, _080F5D80 @ =sub_80F5C2C
+ ldr r0, _080F5D80 @ =SpriteCB_PostEvoSparkleSet2
str r0, [r5]
_080F5D6C:
pop {r3}
@@ -566,32 +566,32 @@ _080F5D6C:
.align 2, 0
_080F5D78: .4byte gUnknown_841EEF8
_080F5D7C: .4byte gUnknown_202063C
-_080F5D80: .4byte sub_80F5C2C
- thumb_func_end sub_80F5CFC
+_080F5D80: .4byte SpriteCB_PostEvoSparkleSet2
+ thumb_func_end CreatePostEvoSparkleSet2
- thumb_func_start sub_80F5D84
-sub_80F5D84: @ 80F5D84
+ thumb_func_start LoadEvoSparkleSpriteAndPal
+LoadEvoSparkleSpriteAndPal: @ 80F5D84
push {lr}
ldr r0, _080F5D98 @ =gUnknown_841EEC4
bl sub_800F034
ldr r0, _080F5D9C @ =gUnknown_841EED4
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r0}
bx r0
.align 2, 0
_080F5D98: .4byte gUnknown_841EEC4
_080F5D9C: .4byte gUnknown_841EED4
- thumb_func_end sub_80F5D84
+ thumb_func_end LoadEvoSparkleSpriteAndPal
- thumb_func_start sub_80F5DA0
-sub_80F5DA0: @ 80F5DA0
+ thumb_func_start LaunchTask_PreEvoSparklesSet1
+LaunchTask_PreEvoSparklesSet1: @ 80F5DA0
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, _080F5DC8 @ =sub_80F5DD0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F5DCC @ =gUnknown_3005090
@@ -606,7 +606,7 @@ sub_80F5DA0: @ 80F5DA0
.align 2, 0
_080F5DC8: .4byte sub_80F5DD0
_080F5DCC: .4byte gUnknown_3005090
- thumb_func_end sub_80F5DA0
+ thumb_func_end LaunchTask_PreEvoSparklesSet1
thumb_func_start sub_80F5DD0
sub_80F5DD0: @ 80F5DD0
@@ -615,7 +615,7 @@ sub_80F5DD0: @ 80F5DD0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_80F5950
+ bl SetEvoSparklesMatrices
ldr r0, _080F5E14 @ =gUnknown_3005090
lsls r5, r4, 2
adds r5, r4
@@ -632,8 +632,8 @@ sub_80F5DD0: @ 80F5DD0
movs r1, 0xA
movs r2, 0
movs r3, 0x10
- bl sub_8070588
- ldr r0, _080F5E1C @ =sub_80F5E20
+ bl BeginNormalPaletteFade
+ ldr r0, _080F5E1C @ =EvoTask_CreatePreEvoSparkleSet1
str r0, [r5]
movs r0, 0x85
bl sub_80722CC
@@ -644,11 +644,11 @@ sub_80F5DD0: @ 80F5DD0
.align 2, 0
_080F5E14: .4byte gUnknown_3005090
_080F5E18: .4byte 0x00007fff
-_080F5E1C: .4byte sub_80F5E20
+_080F5E1C: .4byte EvoTask_CreatePreEvoSparkleSet1
thumb_func_end sub_80F5DD0
- thumb_func_start sub_80F5E20
-sub_80F5E20: @ 80F5E20
+ thumb_func_start EvoTask_CreatePreEvoSparkleSet1
+EvoTask_CreatePreEvoSparkleSet1: @ 80F5E20
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -678,7 +678,7 @@ _080F5E48:
adds r0, r1
lsls r0, 24
lsrs r0, 24
- bl sub_80F5A44
+ bl CreatePreEvoSparkleSet1
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -698,18 +698,18 @@ _080F5E78: .4byte gUnknown_3005090
_080F5E7C:
movs r0, 0x60
strh r0, [r1, 0x26]
- ldr r0, _080F5E8C @ =sub_80F5E90
+ ldr r0, _080F5E8C @ =EvoTask_WaitForPre1SparklesToGoUp
str r0, [r1]
_080F5E84:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
-_080F5E8C: .4byte sub_80F5E90
- thumb_func_end sub_80F5E20
+_080F5E8C: .4byte EvoTask_WaitForPre1SparklesToGoUp
+ thumb_func_end EvoTask_CreatePreEvoSparkleSet1
- thumb_func_start sub_80F5E90
-sub_80F5E90: @ 80F5E90
+ thumb_func_start EvoTask_WaitForPre1SparklesToGoUp
+EvoTask_WaitForPre1SparklesToGoUp: @ 80F5E90
push {r4,lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -730,19 +730,19 @@ sub_80F5E90: @ 80F5E90
_080F5EB0: .4byte gUnknown_3005090
_080F5EB4:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_080F5EBA:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80F5E90
+ thumb_func_end EvoTask_WaitForPre1SparklesToGoUp
thumb_func_start sub_80F5EC0
sub_80F5EC0: @ 80F5EC0
push {lr}
ldr r0, _080F5ED4 @ =sub_80F5ED8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -757,7 +757,7 @@ sub_80F5ED8: @ 80F5ED8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_80F5950
+ bl SetEvoSparklesMatrices
ldr r1, _080F5F04 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -765,7 +765,7 @@ sub_80F5ED8: @ 80F5ED8
adds r0, r1
movs r1, 0
strh r1, [r0, 0x26]
- ldr r1, _080F5F08 @ =sub_80F5F0C
+ ldr r1, _080F5F08 @ =EvoTask_CreatePreEvoSparklesSet2
str r1, [r0]
movs r0, 0xB0
bl sub_80722CC
@@ -774,11 +774,11 @@ sub_80F5ED8: @ 80F5ED8
bx r0
.align 2, 0
_080F5F04: .4byte gUnknown_3005090
-_080F5F08: .4byte sub_80F5F0C
+_080F5F08: .4byte EvoTask_CreatePreEvoSparklesSet2
thumb_func_end sub_80F5ED8
- thumb_func_start sub_80F5F0C
-sub_80F5F0C: @ 80F5F0C
+ thumb_func_start EvoTask_CreatePreEvoSparklesSet2
+EvoTask_CreatePreEvoSparklesSet2: @ 80F5F0C
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -798,7 +798,7 @@ sub_80F5F0C: @ 80F5F0C
_080F5F2C:
lsls r0, r4, 28
lsrs r0, 24
- bl sub_80F5B14
+ bl CreatePreEvoSparkleSet2
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -824,14 +824,14 @@ _080F5F58:
bx r0
.align 2, 0
_080F5F60: .4byte sub_80F5F64
- thumb_func_end sub_80F5F0C
+ thumb_func_end EvoTask_CreatePreEvoSparklesSet2
thumb_func_start sub_80F5F64
sub_80F5F64: @ 80F5F64
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_80F5F64
@@ -841,7 +841,7 @@ sub_80F5F74: @ 80F5F74
push {lr}
ldr r0, _080F5F88 @ =sub_80F5F8C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -856,7 +856,7 @@ sub_80F5F8C: @ 80F5F8C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_80F5950
+ bl SetEvoSparklesMatrices
ldr r1, _080F5FB8 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -864,7 +864,7 @@ sub_80F5F8C: @ 80F5F8C
adds r0, r1
movs r1, 0
strh r1, [r0, 0x26]
- ldr r1, _080F5FBC @ =sub_80F5FC0
+ ldr r1, _080F5FBC @ =EvoTask_CreatePostEvoSparklesSet1
str r1, [r0]
movs r0, 0x5F
bl sub_80722CC
@@ -873,11 +873,11 @@ sub_80F5F8C: @ 80F5F8C
bx r0
.align 2, 0
_080F5FB8: .4byte gUnknown_3005090
-_080F5FBC: .4byte sub_80F5FC0
+_080F5FBC: .4byte EvoTask_CreatePostEvoSparklesSet1
thumb_func_end sub_80F5F8C
- thumb_func_start sub_80F5FC0
-sub_80F5FC0: @ 80F5FC0
+ thumb_func_start EvoTask_CreatePostEvoSparklesSet1
+EvoTask_CreatePostEvoSparklesSet1: @ 80F5FC0
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -898,7 +898,7 @@ _080F5FE0:
lsls r0, r4, 28
lsrs r0, 24
movs r1, 0x4
- bl sub_80F5BC4
+ bl CreatePostEvoSparkleSet1
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -918,7 +918,7 @@ _080F6006:
lsls r0, r4, 28
lsrs r0, 24
movs r1, 0x8
- bl sub_80F5BC4
+ bl CreatePostEvoSparkleSet1
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -944,27 +944,27 @@ _080F6034:
bx r0
.align 2, 0
_080F603C: .4byte sub_80F6040
- thumb_func_end sub_80F5FC0
+ thumb_func_end EvoTask_CreatePostEvoSparklesSet1
thumb_func_start sub_80F6040
sub_80F6040: @ 80F6040
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_80F6040
- thumb_func_start sub_80F6050
-sub_80F6050: @ 80F6050
+ thumb_func_start LaunchTask_PostEvoSparklesSet2AndFlash
+LaunchTask_PostEvoSparklesSet2AndFlash: @ 80F6050
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, _080F6078 @ =sub_80F6080
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F607C @ =gUnknown_3005090
@@ -979,7 +979,7 @@ sub_80F6050: @ 80F6050
.align 2, 0
_080F6078: .4byte sub_80F6080
_080F607C: .4byte gUnknown_3005090
- thumb_func_end sub_80F6050
+ thumb_func_end LaunchTask_PostEvoSparklesSet2AndFlash
thumb_func_start sub_80F6080
sub_80F6080: @ 80F6080
@@ -988,7 +988,7 @@ sub_80F6080: @ 80F6080
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_80F5950
+ bl SetEvoSparklesMatrices
ldr r0, _080F60CC @ =gUnknown_3005090
lsls r5, r4, 2
adds r5, r4
@@ -1007,7 +1007,7 @@ sub_80F6080: @ 80F6080
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F60E0 @ =sub_80F60E4
str r0, [r5]
movs r0, 0xC3
@@ -1047,10 +1047,10 @@ sub_80F60E4: @ 80F60E4
beq _080F6134
cmp r2, 0x31
bgt _080F6144
- bl sub_8044EC8
+ bl Random
movs r1, 0x7
ands r0, r1
- bl sub_80F5CFC
+ bl CreatePostEvoSparkleSet2
b _080F6144
.align 2, 0
_080F611C: .4byte gUnknown_3005090
@@ -1058,7 +1058,7 @@ _080F6120:
movs r4, 0
_080F6122:
adds r0, r4, 0
- bl sub_80F5CFC
+ bl CreatePostEvoSparkleSet2
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1072,7 +1072,7 @@ _080F6134:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080F6144:
ldr r0, _080F615C @ =gUnknown_3005090
adds r1, r5, r6
@@ -1110,7 +1110,7 @@ sub_80F6170: @ 80F6170
cmp r0, 0
bne _080F6188
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_080F6188:
pop {r0}
bx r0
@@ -1126,7 +1126,7 @@ sub_80F6190: @ 80F6190
lsrs r4, 16
ldr r0, _080F61B8 @ =sub_80F61C0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F61BC @ =gUnknown_3005090
@@ -1150,7 +1150,7 @@ sub_80F61C0: @ 80F61C0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_80F5950
+ bl SetEvoSparklesMatrices
ldr r0, _080F620C @ =gUnknown_3005090
lsls r5, r4, 2
adds r5, r4
@@ -1169,7 +1169,7 @@ sub_80F61C0: @ 80F61C0
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080F6220 @ =sub_80F6224
str r0, [r5]
movs r0, 0xC3
@@ -1209,10 +1209,10 @@ sub_80F6224: @ 80F6224
beq _080F6274
cmp r2, 0x31
bgt _080F6284
- bl sub_8044EC8
+ bl Random
movs r1, 0x7
ands r0, r1
- bl sub_80F5CFC
+ bl CreatePostEvoSparkleSet2
b _080F6284
.align 2, 0
_080F625C: .4byte gUnknown_3005090
@@ -1220,7 +1220,7 @@ _080F6260:
movs r4, 0
_080F6262:
adds r0, r4, 0
- bl sub_80F5CFC
+ bl CreatePostEvoSparkleSet2
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1234,7 +1234,7 @@ _080F6274:
movs r1, 0x10
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080F6284:
ldr r0, _080F629C @ =gUnknown_3005090
adds r1, r5, r6
@@ -1292,7 +1292,7 @@ _080F62CE:
bls _080F62CE
adds r0, r3, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -1317,7 +1317,7 @@ _080F62CE:
movs r0, 0x1E
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
movs r0, 0x10
ldrsh r1, [r6, r0]
adds r0, r4, 0
@@ -1329,7 +1329,7 @@ _080F62CE:
movs r0, 0x1F
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
ldr r1, _080F63F4 @ =gUnknown_202063C
mov r9, r1
lsls r2, r5, 4
@@ -1461,7 +1461,7 @@ sub_80F6424: @ 80F6424
cmp r0, 0
beq _080F6448
adds r0, r3, 0
- bl sub_80F6640
+ bl PreEvoVisible_PostEvoInvisible_KillTask
b _080F646A
.align 2, 0
_080F6444: .4byte gUnknown_3005090
@@ -1472,7 +1472,7 @@ _080F6448:
cmp r0, 0x80
bne _080F645A
adds r0, r3, 0
- bl sub_80F6590
+ bl PreEvoInvisible_PostEvoVisible_KillTask
b _080F646A
_080F645A:
adds r0, r1, 0x2
@@ -1507,12 +1507,12 @@ sub_80F6474: @ 80F6474
adds r5, r1, 0
cmp r0, 0
beq _080F64A0
- ldr r0, _080F649C @ =sub_80F6640
+ ldr r0, _080F649C @ =PreEvoVisible_PostEvoInvisible_KillTask
str r0, [r2]
b _080F6584
.align 2, 0
_080F6498: .4byte gUnknown_3005090
-_080F649C: .4byte sub_80F6640
+_080F649C: .4byte PreEvoVisible_PostEvoInvisible_KillTask
_080F64A0:
movs r6, 0
movs r7, 0x12
@@ -1616,7 +1616,7 @@ _080F653A:
movs r0, 0x1E
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
movs r3, 0x10
ldrsh r1, [r5, r3]
adds r0, r4, 0
@@ -1628,7 +1628,7 @@ _080F653A:
movs r0, 0x1F
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
cmp r6, 0x2
bne _080F6584
ldr r0, _080F658C @ =sub_80F6424
@@ -1642,8 +1642,8 @@ _080F6584:
_080F658C: .4byte sub_80F6424
thumb_func_end sub_80F6474
- thumb_func_start sub_80F6590
-sub_80F6590: @ 80F6590
+ thumb_func_start PreEvoInvisible_PostEvoVisible_KillTask
+PreEvoInvisible_PostEvoVisible_KillTask: @ 80F6590
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1721,7 +1721,7 @@ sub_80F6590: @ 80F6590
negs r2, r2
ands r2, r3
strb r2, [r1]
- bl sub_8077508
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -1730,10 +1730,10 @@ sub_80F6590: @ 80F6590
.align 2, 0
_080F6638: .4byte gUnknown_202063C
_080F663C: .4byte gUnknown_3005090
- thumb_func_end sub_80F6590
+ thumb_func_end PreEvoInvisible_PostEvoVisible_KillTask
- thumb_func_start sub_80F6640
-sub_80F6640: @ 80F6640
+ thumb_func_start PreEvoVisible_PostEvoInvisible_KillTask
+PreEvoVisible_PostEvoInvisible_KillTask: @ 80F6640
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1811,7 +1811,7 @@ sub_80F6640: @ 80F6640
movs r3, 0x4
orrs r2, r3
strb r2, [r1]
- bl sub_8077508
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -1820,6 +1820,6 @@ sub_80F6640: @ 80F6640
.align 2, 0
_080F66E8: .4byte gUnknown_202063C
_080F66EC: .4byte gUnknown_3005090
- thumb_func_end sub_80F6640
+ thumb_func_end PreEvoVisible_PostEvoInvisible_KillTask
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 47c964994..c2cf378bd 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -8,8 +8,8 @@
thumb_func_start sub_80CDD18
sub_80CDD18: @ 80CDD18
push {lr}
- bl sub_80704D0
- bl sub_8077578
+ bl UpdatePaletteFade
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_80CDD18
@@ -42,7 +42,7 @@ _080CDD50:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -64,7 +64,7 @@ _080CDD68:
ldrb r5, [r6, 0xE]
ldrb r6, [r6, 0x1C]
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
adds r0, r7, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -94,7 +94,7 @@ sub_80CDDA8: @ 80CDDA8
lsrs r6, 24
ldr r0, _080CDDE8 @ =sub_80CDD28
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080CDDEC @ =gUnknown_3005090
@@ -108,7 +108,7 @@ sub_80CDDA8: @ 80CDDA8
strh r5, [r1, 0xE]
strh r6, [r1, 0x1C]
ldr r0, _080CDDF0 @ =sub_80CDD18
- bl sub_8000544
+ bl SetMainCallback2
pop {r4-r6}
pop {r0}
bx r0
@@ -139,9 +139,9 @@ sub_80CDDF4: @ 80CDDF4
lsrs r3, 24
str r3, [sp, 0x1C]
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r1, 0
str r1, [sp, 0x14]
add r0, sp, 0x14
@@ -151,26 +151,26 @@ sub_80CDDF4: @ 80CDDF4
bl CpuSet
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
- bl sub_8070528
+ bl SetGpuReg
+ bl ResetPaletteFade
ldr r0, _080CE080 @ =gUnknown_2022974
movs r2, 0
strh r2, [r0]
@@ -197,25 +197,25 @@ sub_80CDDF4: @ 80CDDF4
strb r0, [r1]
bl sub_800F34C
bl sub_800F420
- bl sub_8006B10
- bl sub_8087E64
- bl sub_80773BC
- bl sub_80088F0
+ bl ResetSpriteData
+ bl remove_some_task
+ bl ResetTasks
+ bl FreeAllSpritePalettes
ldr r0, _080CE0A4 @ =gUnknown_3003E58
movs r2, 0x4
strb r2, [r0]
movs r0, 0x64
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, _080CE0A8 @ =gUnknown_2039A20
str r0, [r1]
- bl sub_80358D4
+ bl AllocateMonSpritesGfx
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CE0AC @ =gUnknown_2021CD0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _080CE0B0 @ =gUnknown_2021CF0
movs r1, 0xB
mov r2, r10
@@ -223,20 +223,20 @@ sub_80CDDF4: @ 80CDDF4
adds r1, r2, 0
ldr r2, _080CE0B4 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x20]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
lsls r0, r5, 3
ldr r1, _080CE0B8 @ =gUnknown_82350AC
@@ -249,12 +249,12 @@ sub_80CDDF4: @ 80CDDF4
adds r0, r5, 0
ldr r1, [sp, 0x20]
mov r2, r9
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
ldr r0, [r0]
movs r1, 0x88
lsls r1, 1
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
@@ -265,7 +265,7 @@ sub_80CDDF4: @ 80CDDF4
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _080CE0A8 @ =gUnknown_2039A20
ldr r2, [r1]
lsls r1, r0, 24
@@ -305,12 +305,12 @@ sub_80CDDF4: @ 80CDDF4
mov r0, r10
ldr r1, [sp, 0x20]
mov r2, r9
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
ldr r0, [r0]
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
mov r0, r10
movs r1, 0x3
bl sub_803F7D4
@@ -321,7 +321,7 @@ sub_80CDDF4: @ 80CDDF4
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _080CE0A8 @ =gUnknown_2039A20
ldr r2, [r1]
lsls r1, r0, 24
@@ -344,10 +344,10 @@ sub_80CDDF4: @ 80CDDF4
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
- bl sub_80F5D84
+ bl LoadEvoSparkleSpriteAndPal
ldr r0, _080CE0D0 @ =sub_80CE8DC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, _080CE0A8 @ =gUnknown_2039A20
ldr r2, [r1]
lsls r1, r0, 24
@@ -382,15 +382,15 @@ sub_80CDDF4: @ 80CDDF4
movs r1, 0xFA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080CE0DC @ =nullsub_76
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _080CE0E0 @ =sub_80D0050
- bl sub_80006F4
+ bl SetVBlankCallback
bl m4aMPlayAllStop
bl sub_812B478
ldr r0, _080CE0E4 @ =sub_80CE710
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -429,8 +429,8 @@ _080CE0E0: .4byte sub_80D0050
_080CE0E4: .4byte sub_80CE710
thumb_func_end sub_80CDDF4
- thumb_func_start sub_80CE0E8
-sub_80CE0E8: @ 80CE0E8
+ thumb_func_start CB2_EvolutionSceneLoadGraphics
+CB2_EvolutionSceneLoadGraphics: @ 80CE0E8
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -455,16 +455,16 @@ sub_80CE0E8: @ 80CE0E8
ldrh r5, [r0, 0xC]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r4, 0
str r4, [sp, 0x4]
movs r1, 0xC0
@@ -474,26 +474,26 @@ sub_80CE0E8: @ 80CE0E8
bl CpuSet
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
- bl sub_8070528
+ bl SetGpuReg
+ bl ResetPaletteFade
ldr r0, _080CE290 @ =gUnknown_2022974
strh r4, [r0]
ldr r0, _080CE294 @ =gUnknown_2022976
@@ -518,8 +518,8 @@ sub_80CE0E8: @ 80CE0E8
strb r0, [r1]
bl sub_800F34C
bl sub_800F420
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r1, _080CE2B4 @ =gUnknown_3003E58
movs r0, 0x4
strb r0, [r1]
@@ -534,12 +534,12 @@ sub_80CE0E8: @ 80CE0E8
adds r0, r5, 0
mov r1, r9
adds r2, r6, 0
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
ldr r0, [r0]
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x3
bl sub_803F7D4
@@ -549,7 +549,7 @@ sub_80CE0E8: @ 80CE0E8
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
mov r2, r8
ldr r1, [r2]
lsls r2, r0, 24
@@ -574,28 +574,28 @@ sub_80CE0E8: @ 80CE0E8
movs r1, 0xFA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080CE2D0 @ =nullsub_76
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _080CE2D4 @ =sub_80D0050
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080CE2D8 @ =sub_80CE710
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
negs r0, r0
str r4, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
add sp, 0x8
pop {r3,r4}
mov r8, r3
@@ -627,10 +627,10 @@ _080CE2CC: .4byte nullsub_10
_080CE2D0: .4byte nullsub_76
_080CE2D4: .4byte sub_80D0050
_080CE2D8: .4byte sub_80CE710
- thumb_func_end sub_80CE0E8
+ thumb_func_end CB2_EvolutionSceneLoadGraphics
- thumb_func_start sub_80CE2DC
-sub_80CE2DC: @ 80CE2DC
+ thumb_func_start CB2_TradeEvolutionSceneLoadGraphics
+CB2_TradeEvolutionSceneLoadGraphics: @ 80CE2DC
push {r4-r6,lr}
sub sp, 0xC
ldr r2, _080CE318 @ =gUnknown_3005090
@@ -681,13 +681,13 @@ _080CE32C:
_080CE34C:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
- bl sub_80006F4
- bl sub_8006B10
- bl sub_80088F0
+ bl SetVBlankCallback
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r1, _080CE398 @ =gUnknown_3003E58
movs r0, 0x4
strb r0, [r1]
@@ -723,11 +723,11 @@ _080CE3B0: .4byte gUnknown_202297E
_080CE3B4: .4byte gUnknown_2022980
_080CE3B8: .4byte gUnknown_2022982
_080CE3BC:
- bl sub_8070528
+ bl ResetPaletteFade
ldr r0, _080CE3D8 @ =nullsub_76
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _080CE3DC @ =sub_80D00D8
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r1, _080CE3E0 @ =gUnknown_30030F0
movs r3, 0x87
lsls r3, 3
@@ -750,9 +750,9 @@ _080CE3EA:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, _080CE410 @ =gUnknown_30030F0
movs r3, 0x87
lsls r3, 3
@@ -763,11 +763,11 @@ _080CE410: .4byte gUnknown_30030F0
_080CE414:
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r0, r6, 3
ldr r1, _080CE454 @ =gUnknown_82350AC
@@ -780,12 +780,12 @@ _080CE414:
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
ldr r0, [r0]
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _080CE4EC
.align 2, 0
_080CE454: .4byte gUnknown_82350AC
@@ -800,7 +800,7 @@ _080CE45C:
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _080CE4BC @ =gUnknown_2039A20
ldr r1, [r1]
lsls r2, r0, 24
@@ -852,7 +852,7 @@ _080CE4E0:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
_080CE4EC:
ldr r1, _080CE500 @ =gUnknown_30030F0
movs r0, 0x87
@@ -873,18 +873,18 @@ _080CE504:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_805049C
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080CE53C @ =sub_80CE72C
- bl sub_8000544
+ bl SetMainCallback2
movs r1, 0x9A
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
_080CE534:
add sp, 0xC
pop {r4-r6}
@@ -892,10 +892,10 @@ _080CE534:
bx r0
.align 2, 0
_080CE53C: .4byte sub_80CE72C
- thumb_func_end sub_80CE2DC
+ thumb_func_end CB2_TradeEvolutionSceneLoadGraphics
- thumb_func_start sub_80CE540
-sub_80CE540: @ 80CE540
+ thumb_func_start TradeEvolutionScene
+TradeEvolutionScene: @ 80CE540
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -914,38 +914,38 @@ sub_80CE540: @ 80CE540
str r3, [sp, 0x14]
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CE6B0 @ =gUnknown_2021CD0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _080CE6B4 @ =gUnknown_2021CF0
movs r1, 0xB
muls r1, r5
ldr r2, _080CE6B8 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080CE6BC @ =gUnknown_2021CCC
movs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
lsls r0, 16
lsrs r0, 16
mov r8, r0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ldr r1, _080CE6C0 @ =gUnknown_2039A20
mov r9, r1
movs r0, 0x64
- bl sub_8002BB0
+ bl AllocZeroed
mov r2, r9
str r0, [r2]
movs r4, 0
@@ -961,12 +961,12 @@ sub_80CE540: @ 80CE540
adds r0, r5, 0
mov r1, r10
adds r2, r7, 0
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
ldr r0, [r0]
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
adds r0, r5, 0
movs r1, 0x1
bl sub_803F7D4
@@ -976,7 +976,7 @@ sub_80CE540: @ 80CE540
movs r1, 0x78
movs r2, 0x40
movs r3, 0x1E
- bl sub_8006F8C
+ bl CreateSprite
mov r1, r9
ldr r2, [r1]
lsls r1, r0, 24
@@ -1003,10 +1003,10 @@ sub_80CE540: @ 80CE540
movs r2, 0x4
orrs r0, r2
strb r0, [r1]
- bl sub_80F5D84
+ bl LoadEvoSparkleSpriteAndPal
ldr r0, _080CE6DC @ =sub_80CF53C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
mov r1, r9
ldr r2, [r1]
lsls r1, r0, 24
@@ -1052,9 +1052,9 @@ sub_80CE540: @ 80CE540
orrs r0, r1
strb r0, [r2]
ldr r0, _080CE708 @ =sub_80D00D8
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080CE70C @ =sub_80CE72C
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -1088,16 +1088,16 @@ _080CE700: .4byte gUnknown_2022982
_080CE704: .4byte gUnknown_3003E50
_080CE708: .4byte sub_80D00D8
_080CE70C: .4byte sub_80CE72C
- thumb_func_end sub_80CE540
+ thumb_func_end TradeEvolutionScene
thumb_func_start sub_80CE710
sub_80CE710: @ 80CE710
push {lr}
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
bl sub_8002DE8
- bl sub_80704D0
- bl sub_8077578
+ bl UpdatePaletteFade
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_80CE710
@@ -1105,17 +1105,17 @@ sub_80CE710: @ 80CE710
thumb_func_start sub_80CE72C
sub_80CE72C: @ 80CE72C
push {lr}
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
bl sub_8002DE8
- bl sub_80704D0
- bl sub_8077578
+ bl UpdatePaletteFade
+ bl RunTasks
pop {r0}
bx r0
thumb_func_end sub_80CE72C
- thumb_func_start sub_80CE748
-sub_80CE748: @ 80CE748
+ thumb_func_start CreateShedinja
+CreateShedinja: @ 80CE748
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1154,7 +1154,7 @@ _080CE782:
mov r9, r0
ldr r1, [sp, 0x4]
movs r2, 0x64
- bl sub_8040B08
+ bl CopyMon
ldrb r0, [r6]
muls r0, r5
adds r0, r4
@@ -1240,39 +1240,39 @@ _080CE80C:
ldrb r0, [r4]
muls r0, r6
adds r0, r5
- bl sub_803E47C
- bl sub_8040C3C
+ bl CalculateMonStats
+ bl CalculatePlayerPartyCount
ldr r0, _080CE8C4 @ =gUnknown_8259754
mov r4, r8
add r4, r10
lsls r4, 3
adds r4, r0
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
bl sub_8088E74
mov r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080CE8D4 @ =0x0000012f
cmp r0, r1
bne _080CE8B2
mov r0, r9
movs r1, 0x3
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _080CE8B2
ldr r0, [sp, 0x4]
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x97
lsls r1, 1
cmp r0, r1
@@ -1297,7 +1297,7 @@ _080CE8CC: .4byte gUnknown_2024284
_080CE8D0: .4byte gUnknown_8245EE0
_080CE8D4: .4byte 0x0000012f
_080CE8D8: .4byte gUnknown_83F8440
- thumb_func_end sub_80CE748
+ thumb_func_end CreateShedinja
thumb_func_start sub_80CE8DC
sub_80CE8DC: @ 80CE8DC
@@ -1446,7 +1446,7 @@ _080CEA2C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r2, _080CEA84 @ =gUnknown_202063C
ldr r0, _080CEA88 @ =gUnknown_2039A20
ldr r0, [r0]
@@ -1470,13 +1470,13 @@ _080CEA2C:
adds r0, 0x1
strh r0, [r1, 0x8]
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
bl _080CF528
.align 2, 0
_080CEA84: .4byte gUnknown_202063C
@@ -1526,7 +1526,7 @@ _080CEAE0:
.align 2, 0
_080CEAEC: .4byte gUnknown_3005090
_080CEAF0:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CEAFE
@@ -1544,7 +1544,7 @@ _080CEAFE:
_080CEB10: .4byte 0x00000107
_080CEB14: .4byte gUnknown_3005090
_080CEB18:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1553,7 +1553,7 @@ _080CEB18:
_080CEB28:
movs r0, 0x84
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
ldr r0, _080CEB54 @ =gUnknown_3005090
mov r3, r8
adds r1, r3, r7
@@ -1567,7 +1567,7 @@ _080CEB28:
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl _080CF528
.align 2, 0
_080CEB54: .4byte gUnknown_3005090
@@ -1581,9 +1581,9 @@ _080CEB58:
bl _080CF528
_080CEB68:
movs r0, 0
- bl sub_80D0374
+ bl InitMovingBackgroundTask
movs r0, 0x11
- bl sub_80F5DA0
+ bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CEB88 @ =gUnknown_2023E82
strb r0, [r1, 0x2]
ldr r0, _080CEB8C @ =gUnknown_3005090
@@ -1714,7 +1714,7 @@ _080CEC7E:
lsls r4, 3
add r4, r10
ldrh r0, [r4, 0xC]
- bl sub_80F6050
+ bl LaunchTask_PostEvoSparklesSet2AndFlash
strb r0, [r6, 0x2]
b _080CEF2E
.align 2, 0
@@ -1741,7 +1741,7 @@ _080CECAA:
.align 2, 0
_080CECBC: .4byte gUnknown_2023E82
_080CECC0:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CECCE
@@ -1761,7 +1761,7 @@ _080CECCE:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080CED08 @ =gUnknown_3005090
mov r3, r8
adds r1, r3, r7
@@ -1790,7 +1790,7 @@ _080CED1C:
.align 2, 0
_080CED28: .4byte gUnknown_2037AB8
_080CED2C:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CED3A
@@ -1804,7 +1804,7 @@ _080CED3A:
movs r1, 0
bl sub_80D87BC
ldr r0, _080CEDB0 @ =0x00000103
- bl sub_80722A0
+ bl PlayBGM
ldr r2, _080CEDB4 @ =gUnknown_3005090
mov r3, r8
adds r1, r3, r7
@@ -1819,19 +1819,19 @@ _080CED3A:
movs r1, 0xB
bl sub_804037C
mov r0, r9
- bl sub_803E47C
+ bl CalculateMonStats
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0xC]
mov r0, r9
- bl sub_804356C
+ bl EvolutionRenameMon
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -1860,7 +1860,7 @@ _080CEDC6:
adds r5, r0, r1
ldrb r1, [r5, 0x10]
mov r0, r9
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r6, r0, 16
cmp r6, 0
@@ -1869,7 +1869,7 @@ _080CEDC6:
ldrsh r4, [r5, r3]
cmp r4, 0
bne _080CEE40
- bl sub_8071A94
+ bl StopMapMusic
bl sub_8055DC4
ldrh r1, [r5, 0xE]
movs r0, 0x80
@@ -1880,10 +1880,10 @@ _080CEDC6:
mov r0, r9
movs r1, 0x2
add r2, sp, 0x4
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CEE24 @ =gUnknown_2022AB8
add r1, sp, 0x4
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _080CEE28 @ =0x0000ffff
cmp r6, r0
bne _080CEE2C
@@ -1912,7 +1912,7 @@ _080CEE40:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080CEE5C @ =gUnknown_3005090
mov r2, r8
adds r1, r2, r7
@@ -1943,7 +1943,7 @@ _080CEE74:
ands r0, r1
cmp r0, 0
bne _080CEE90
- bl sub_8071A94
+ bl StopMapMusic
bl sub_8055DC4
_080CEE90:
movs r2, 0x1A
@@ -1952,19 +1952,19 @@ _080CEE90:
bne _080CEEA0
ldrh r0, [r4, 0xA]
mov r1, r9
- bl sub_80CE748
+ bl CreateShedinja
_080CEEA0:
adds r0, r7, 0
- bl sub_8077508
- bl sub_80359AC
+ bl DestroyTask
+ bl FreeMonSpritesGfx
ldr r4, _080CEEC8 @ =gUnknown_2039A20
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r6, [r4]
bl sub_8003ECC
ldr r0, _080CEECC @ =gUnknown_300537C
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
b _080CF528
.align 2, 0
_080CEEC4: .4byte gUnknown_2037AB8
@@ -1989,7 +1989,7 @@ _080CEEE4:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
mov r3, r8
adds r1, r3, r7
lsls r1, 3
@@ -2016,7 +2016,7 @@ _080CEF26:
ldrh r0, [r4, 0xA]
_080CEF28:
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_080CEF2E:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -2025,7 +2025,7 @@ _080CEF2E:
.align 2, 0
_080CEF38: .4byte gUnknown_2037AB8
_080CEF3C:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CEF48
@@ -2076,15 +2076,15 @@ _080CEF9C:
beq _080CEFAA
b _080CF528
_080CEFAA:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CEFB6
b _080CF528
_080CEFB6:
- bl sub_8026878
+ bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CEFE8 @ =0x00000101
- bl sub_8071C60
+ bl PlayFanfare
ldr r0, _080CEFEC @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl sub_80D77F4
@@ -2116,7 +2116,7 @@ _080CEFF8:
beq _080CF006
b _080CF528
_080CF006:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CF012
@@ -2181,13 +2181,13 @@ _080CF088:
beq _080CF096
b _080CF528
_080CF096:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CF0A2
b _080CF528
_080CF0A2:
- bl sub_8026878
+ bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CF0C8 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl sub_80D77F4
@@ -2214,7 +2214,7 @@ _080CF0D4:
beq _080CF0E2
b _080CF528
_080CF0E2:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CF0EE
@@ -2244,7 +2244,7 @@ _080CF11C:
lsls r0, 16
cmp r0, 0
bne _080CF15A
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CF15A
@@ -2274,7 +2274,7 @@ _080CF15A:
beq _080CF168
b _080CF528
_080CF168:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2393,7 +2393,7 @@ _080CF250:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080CF276:
ldr r0, _080CF2B0 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2445,7 +2445,7 @@ _080CF2C2:
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, _080CF304 @ =sub_80CE0E8
+ ldr r3, _080CF304 @ =CB2_EvolutionSceneLoadGraphics
ldr r4, _080CF308 @ =gUnknown_2024022
ldrh r4, [r4]
str r4, [sp]
@@ -2459,7 +2459,7 @@ _080CF2F4: .4byte gUnknown_2037AB8
_080CF2F8: .4byte gUnknown_2024284
_080CF2FC: .4byte gUnknown_3005090
_080CF300: .4byte gUnknown_2024029
-_080CF304: .4byte sub_80CE0E8
+_080CF304: .4byte CB2_EvolutionSceneLoadGraphics
_080CF308: .4byte gUnknown_2024022
_080CF30C:
ldr r0, _080CF340 @ =gUnknown_2037AB8
@@ -2496,11 +2496,11 @@ _080CF34C:
adds r1, r6, 0
adds r1, 0xD
mov r0, r9
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_80441B8
+ bl IsHMMove2
cmp r0, 0
beq _080CF398
ldr r0, _080CF388 @ =gUnknown_83FDF3C
@@ -2539,12 +2539,12 @@ _080CF398:
lsrs r4, 24
mov r0, r9
adds r1, r4, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
ldr r0, _080CF3D8 @ =gUnknown_2024022
ldrh r1, [r0]
mov r0, r9
adds r2, r4, 0
- bl sub_803E964
+ bl SetMonMoveSlot
ldr r0, _080CF3DC @ =gUnknown_3005090
mov r3, r8
adds r1, r3, r7
@@ -2587,7 +2587,7 @@ _080CF414:
beq _080CF422
b _080CF528
_080CF422:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CF42E
@@ -2617,7 +2617,7 @@ _080CF45C:
lsls r0, 16
cmp r0, 0
bne _080CF528
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CF528
@@ -2691,7 +2691,7 @@ _080CF504:
lsls r0, 16
cmp r0, 0
bne _080CF528
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CF528
@@ -2843,7 +2843,7 @@ _080CF65C:
.align 2, 0
_080CF668: .4byte gUnknown_3005090
_080CF66C:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CF67A
@@ -2863,7 +2863,7 @@ _080CF67A:
_080CF694: .4byte 0x00000107
_080CF698: .4byte gUnknown_3005090
_080CF69C:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -2872,7 +2872,7 @@ _080CF69C:
_080CF6AC:
movs r0, 0x84
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
ldr r0, _080CF6CC @ =gUnknown_3005090
adds r1, r7, r6
lsls r1, 3
@@ -2896,7 +2896,7 @@ _080CF6D0:
bl _080D003A
_080CF6E0:
movs r0, 0x1
- bl sub_80D0374
+ bl InitMovingBackgroundTask
ldr r2, _080CF728 @ =gUnknown_202063C
ldr r0, _080CF72C @ =gUnknown_2039A20
ldr r0, [r0]
@@ -2910,7 +2910,7 @@ _080CF6E0:
adds r5, r0, 0
adds r5, 0x10
adds r0, r5, 0
- bl sub_80F5DA0
+ bl LaunchTask_PreEvoSparklesSet1
ldr r1, _080CF730 @ =gUnknown_2023E82
strb r0, [r1, 0x2]
ldr r0, _080CF734 @ =gUnknown_3005090
@@ -2922,7 +2922,7 @@ _080CF6E0:
strh r0, [r1, 0x8]
ldr r1, _080CF738 @ =0x00000603
movs r0, 0xE
- bl sub_8000A38
+ bl SetGpuReg
bl _080D003A
.align 2, 0
_080CF724: .4byte gUnknown_2037AB8
@@ -3072,7 +3072,7 @@ _080CF84E:
.align 2, 0
_080CF85C: .4byte gUnknown_2023E82
_080CF860:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CF86E
@@ -3084,7 +3084,7 @@ _080CF86E:
adds r4, r0
ldrh r0, [r4, 0xC]
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
ldr r0, _080CF894 @ =gUnknown_2037238
ldr r1, _080CF898 @ =gUnknown_2039A20
ldr r1, [r1]
@@ -3097,7 +3097,7 @@ _080CF890: .4byte gUnknown_3005090
_080CF894: .4byte gUnknown_2037238
_080CF898: .4byte gUnknown_2039A20
_080CF89C:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CF8A8
@@ -3112,7 +3112,7 @@ _080CF8A8:
movs r2, 0x1
bl sub_8054508
ldr r0, _080CF91C @ =0x00000103
- bl sub_8071C60
+ bl PlayFanfare
ldr r2, _080CF920 @ =gUnknown_3005090
adds r1, r7, r6
lsls r1, 3
@@ -3126,19 +3126,19 @@ _080CF8A8:
movs r1, 0xB
bl sub_804037C
mov r0, r8
- bl sub_803E47C
+ bl CalculateMonStats
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0xC]
mov r0, r8
- bl sub_804356C
+ bl EvolutionRenameMon
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
bl sub_8088E74
ldrh r0, [r4, 0xC]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -3159,7 +3159,7 @@ _080CF924:
beq _080CF932
b _080D003A
_080CF932:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3172,7 +3172,7 @@ _080CF940:
adds r4, r0, r1
ldrb r1, [r4, 0x10]
mov r0, r8
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@@ -3190,10 +3190,10 @@ _080CF940:
mov r0, r8
movs r1, 0x2
add r2, sp, 0xC
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CF990 @ =gUnknown_2022AB8
add r1, sp, 0xC
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _080CF994 @ =0x0000ffff
cmp r5, r0
bne _080CF998
@@ -3218,7 +3218,7 @@ _080CF9A8: .4byte 0x0000fffe
_080CF9AC:
movs r0, 0x84
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
ldr r1, _080CF9C8 @ =gUnknown_841E325
movs r0, 0
movs r2, 0x1
@@ -3241,10 +3241,10 @@ _080CF9D0:
b _080D003A
_080CF9E0:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r4, _080CFA08 @ =gUnknown_2039A20
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r2, _080CFA0C @ =gUnknown_3003E50
ldrb r1, [r2]
@@ -3254,7 +3254,7 @@ _080CF9E0:
strb r0, [r2]
ldr r0, _080CFA10 @ =gUnknown_300537C
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
b _080D003A
.align 2, 0
_080CFA08: .4byte gUnknown_2039A20
@@ -3293,7 +3293,7 @@ _080CFA28:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r1, r7, r6
lsls r1, 3
adds r1, r5
@@ -3319,7 +3319,7 @@ _080CFA82:
_080CFA88:
ldrh r0, [r4, 0xA]
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_080CFA90:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -3328,7 +3328,7 @@ _080CFA90:
.align 2, 0
_080CFA98: .4byte gUnknown_2037AB8
_080CFA9C:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080CFAA8
@@ -3361,15 +3361,15 @@ _080CFAD8:
beq _080CFAE6
b _080D003A
_080CFAE6:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CFAF2
b _080D003A
_080CFAF2:
- bl sub_8026878
+ bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CFB24 @ =0x00000101
- bl sub_8071C60
+ bl PlayFanfare
ldr r0, _080CFB28 @ =gUnknown_83FDF3C
ldr r0, [r0, 0xC]
bl sub_80D77F4
@@ -3401,7 +3401,7 @@ _080CFB34:
beq _080CFB42
b _080D003A
_080CFB42:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3464,13 +3464,13 @@ _080CFBC0:
beq _080CFBCE
b _080D003A
_080CFBCE:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CFBDA
b _080D003A
_080CFBDA:
- bl sub_8026878
+ bl BufferMoveToLearnIntoBattleTextBuff2
ldr r0, _080CFC00 @ =gUnknown_83FDF3C
ldr r0, [r0, 0x10]
bl sub_80D77F4
@@ -3497,7 +3497,7 @@ _080CFC0C:
beq _080CFC1A
b _080D003A
_080CFC1A:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CFC26
@@ -3527,7 +3527,7 @@ _080CFC54:
lsls r0, 16
cmp r0, 0
bne _080CFC92
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080CFC92
@@ -3557,7 +3557,7 @@ _080CFC92:
beq _080CFCA0
b _080D003A
_080CFCA0:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -3645,7 +3645,7 @@ _080CFD4E:
_080CFD56:
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080D003A
.align 2, 0
_080CFD60: .4byte gUnknown_2023E82
@@ -3694,14 +3694,14 @@ _080CFDBA:
bl sub_80FCE44
_080CFDC6:
movs r0, 0x3
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x1
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
bl sub_8003ECC
ldr r0, _080CFE1C @ =gUnknown_2024284
ldr r1, _080CFE20 @ =gUnknown_3005090
@@ -3714,7 +3714,7 @@ _080CFDC6:
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, _080CFE28 @ =sub_80CE2DC
+ ldr r3, _080CFE28 @ =CB2_TradeEvolutionSceneLoadGraphics
ldr r4, _080CFE2C @ =gUnknown_2024022
ldrh r4, [r4]
str r4, [sp]
@@ -3729,7 +3729,7 @@ _080CFE18: .4byte gUnknown_3003F3C
_080CFE1C: .4byte gUnknown_2024284
_080CFE20: .4byte gUnknown_3005090
_080CFE24: .4byte gUnknown_2024029
-_080CFE28: .4byte sub_80CE2DC
+_080CFE28: .4byte CB2_TradeEvolutionSceneLoadGraphics
_080CFE2C: .4byte gUnknown_2024022
_080CFE30:
ldr r0, _080CFE64 @ =gUnknown_2037AB8
@@ -3767,11 +3767,11 @@ _080CFE74:
adds r1, r5, 0
adds r1, 0xD
mov r0, r8
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_80441B8
+ bl IsHMMove2
cmp r0, 0
beq _080CFEC0
ldr r0, _080CFEB0 @ =gUnknown_83FDF3C
@@ -3810,12 +3810,12 @@ _080CFEC0:
lsrs r4, 24
mov r0, r8
adds r1, r4, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
ldr r0, _080CFF18 @ =gUnknown_2024022
ldrh r1, [r0]
mov r0, r8
adds r2, r4, 0
- bl sub_803E964
+ bl SetMonMoveSlot
ldr r0, _080CFF1C @ =gUnknown_83FDF3C
movs r1, 0xCF
lsls r1, 2
@@ -3847,7 +3847,7 @@ _080CFF28:
beq _080CFF36
b _080D003A
_080CFF36:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _080CFF42
@@ -3877,7 +3877,7 @@ _080CFF70:
lsls r0, 16
cmp r0, 0
bne _080D003A
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080D003A
@@ -3951,7 +3951,7 @@ _080D0018:
lsls r0, 16
cmp r0, 0
bne _080D003A
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080D003A
@@ -3984,38 +3984,38 @@ sub_80D0050: @ 80D0050
ldr r0, _080D00B8 @ =gUnknown_2022974
ldrh r1, [r0]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00BC @ =gUnknown_2022976
ldrh r1, [r0]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00C0 @ =gUnknown_2022978
ldrh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00C4 @ =gUnknown_202297A
ldrh r1, [r0]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00C8 @ =gUnknown_202297C
ldrh r1, [r0]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00CC @ =gUnknown_202297E
ldrh r1, [r0]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00D0 @ =gUnknown_2022980
ldrh r1, [r0]
movs r0, 0x1C
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D00D4 @ =gUnknown_2022982
ldrh r1, [r0]
movs r0, 0x1E
- bl sub_8000A38
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl SetGpuReg
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
bl sub_8087F54
pop {r0}
bx r0
@@ -4036,38 +4036,38 @@ sub_80D00D8: @ 80D00D8
ldr r0, _080D0140 @ =gUnknown_2022974
ldrh r1, [r0]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0144 @ =gUnknown_2022976
ldrh r1, [r0]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0148 @ =gUnknown_2022978
ldrh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D014C @ =gUnknown_202297A
ldrh r1, [r0]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0150 @ =gUnknown_202297C
ldrh r1, [r0]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0154 @ =gUnknown_202297E
ldrh r1, [r0]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0158 @ =gUnknown_2022980
ldrh r1, [r0]
movs r0, 0x1C
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D015C @ =gUnknown_2022982
ldrh r1, [r0]
movs r0, 0x1E
- bl sub_8000A38
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl SetGpuReg
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
bl sub_8087F54
pop {r0}
bx r0
@@ -4158,7 +4158,7 @@ _080D01E8:
adds r0, r1
movs r1, 0xA0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
strh r5, [r4]
ldrh r0, [r4, 0x2]
adds r0, 0x1
@@ -4170,7 +4170,7 @@ _080D0200:
cmp r0, 0x4
bne _080D020E
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080D020E:
pop {r4-r6}
pop {r0}
@@ -4186,7 +4186,7 @@ sub_80D0218: @ 80D0218
lsrs r4, r0, 24
ldr r0, _080D023C @ =sub_80D025C
movs r1, 0x7
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
cmp r4, 0
@@ -4266,37 +4266,37 @@ _080D02A0:
movs r1, 0x8
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E4C
+ bl Cos
adds r0, 0x8
mov r2, r8
strh r0, [r2]
movs r1, 0x8
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
adds r0, 0x10
mov r2, r9
strh r0, [r2]
movs r1, 0xA
ldrsh r0, [r4, r1]
movs r1, 0x4
- bl sub_8044E4C
+ bl Cos
adds r0, 0x8
strh r0, [r7]
movs r2, 0xA
ldrsh r0, [r4, r2]
movs r1, 0x4
- bl sub_8044E30
+ bl Sin
adds r0, 0x10
strh r0, [r6]
ldr r0, _080D0330 @ =sub_80D0160
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _080D031A
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
mov r0, r8
strh r4, [r0]
mov r1, r9
@@ -4319,8 +4319,8 @@ _080D032C: .4byte gUnknown_2022982
_080D0330: .4byte sub_80D0160
thumb_func_end sub_80D025C
- thumb_func_start sub_80D0334
-sub_80D0334: @ 80D0334
+ thumb_func_start InitMovingBgValues
+InitMovingBgValues: @ 80D0334
push {r4-r7,lr}
adds r6, r0, 0
movs r1, 0
@@ -4353,10 +4353,10 @@ _080D034A:
.align 2, 0
_080D036C: .4byte gUnknown_83F8400
_080D0370: .4byte gUnknown_83F847D
- thumb_func_end sub_80D0334
+ thumb_func_end InitMovingBgValues
- thumb_func_start sub_80D0374
-sub_80D0374: @ 80D0374
+ thumb_func_start InitMovingBackgroundTask
+InitMovingBackgroundTask: @ 80D0374
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 24
@@ -4364,9 +4364,9 @@ sub_80D0374: @ 80D0374
ldr r4, _080D0398 @ =gUnknown_2039A24
movs r0, 0xC8
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
- bl sub_80D0334
+ bl InitMovingBgValues
cmp r5, 0
bne _080D039C
movs r6, 0x1
@@ -4381,7 +4381,7 @@ _080D03A0:
ldr r0, _080D0420 @ =gUnknown_83F7D60
movs r1, 0xA0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080D0424 @ =gUnknown_83F6CB0
movs r0, 0
str r0, [sp]
@@ -4393,40 +4393,40 @@ _080D03A0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _080D042C @ =gUnknown_83F788C
adds r0, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
adds r0, r4, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
cmp r5, 0
bne _080D0438
ldr r1, _080D0430 @ =0x00000442
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080D0434 @ =0x00000808
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r6, 0
movs r1, 0x7
movs r2, 0x2
- bl sub_80019E4
+ bl SetBgAttribute
adds r0, r4, 0
movs r1, 0x7
movs r2, 0x2
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _080D0452
.align 2, 0
_080D0420: .4byte gUnknown_83F7D60
@@ -4438,18 +4438,18 @@ _080D0434: .4byte 0x00000808
_080D0438:
ldr r1, _080D0468 @ =0x00000842
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080D046C @ =0x00000808
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xDA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
_080D0452:
ldr r0, _080D0470 @ =sub_80D0160
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
adds r0, r5, 0
bl sub_80D0218
add sp, 0x4
@@ -4460,13 +4460,13 @@ _080D0452:
_080D0468: .4byte 0x00000842
_080D046C: .4byte 0x00000808
_080D0470: .4byte sub_80D0160
- thumb_func_end sub_80D0374
+ thumb_func_end InitMovingBackgroundTask
thumb_func_start sub_80D0474
sub_80D0474: @ 80D0474
push {lr}
ldr r0, _080D04A0 @ =sub_80D0160
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4482,7 +4482,7 @@ _080D0492:
movs r0, 0
movs r1, 0xA0
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
pop {r0}
bx r0
.align 2, 0
@@ -4494,25 +4494,25 @@ _080D04A4: .4byte gUnknown_3005090
sub_80D04A8: @ 80D04A8
push {lr}
ldr r0, _080D04E0 @ =sub_80D0160
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _080D04BC
- bl sub_8077508
+ bl DestroyTask
_080D04BC:
ldr r0, _080D04E4 @ =sub_80D025C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _080D04CE
- bl sub_8077508
+ bl DestroyTask
_080D04CE:
movs r0, 0
movs r1, 0xA0
movs r2, 0x20
- bl sub_8070424
+ bl FillPalette
bl sub_80D04E8
pop {r0}
bx r0
@@ -4526,7 +4526,7 @@ sub_80D04E8: @ 80D04E8
push {lr}
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0544 @ =gUnknown_2022978
movs r1, 0
strh r1, [r0]
@@ -4542,7 +4542,7 @@ sub_80D04E8: @ 80D04E8
lsrs r2, 24
movs r0, 0x1
movs r1, 0x7
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x5
bl sub_8011C44
@@ -4551,14 +4551,14 @@ sub_80D04E8: @ 80D04E8
lsrs r2, 24
movs r0, 0x2
movs r1, 0x7
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0xCA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080D0550 @ =gUnknown_2039A24
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/fame_checker.s b/asm/fame_checker.s
index 0424e487c..5ca20aa8f 100644
--- a/asm/fame_checker.s
+++ b/asm/fame_checker.s
@@ -8,9 +8,9 @@
thumb_func_start sub_812C380
sub_812C380: @ 812C380
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_812C380
@@ -18,10 +18,10 @@ sub_812C380: @ 812C380
thumb_func_start sub_812C394
sub_812C394: @ 812C394
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_812C394
@@ -31,10 +31,10 @@ sub_812C3AC: @ 812C3AC
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r4, _0812C3F0 @ =gUnknown_203B0FC
movs r0, 0x24
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
str r5, [r0]
movs r1, 0
@@ -53,7 +53,7 @@ sub_812C3AC: @ 812C3AC
movs r0, 0xC7
bl sub_80722CC
ldr r0, _0812C3F4 @ =sub_812C3F8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
@@ -97,7 +97,7 @@ _0812C424:
.4byte _0812C5D4
_0812C444:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_812D420
b _0812C5BE
_0812C450:
@@ -108,18 +108,18 @@ _0812C456:
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6]
ldr r1, _0812C4B4 @ =gUnknown_203B0F4
mov r8, r1
movs r0, 0x80
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
ldr r5, _0812C4B8 @ =gUnknown_203B0F8
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0
bl sub_8001618
@@ -129,14 +129,14 @@ _0812C456:
bl sub_8001658
ldr r1, [r6]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r5]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
mov r0, r8
ldr r1, [r0]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_812D594
b _0812C5BE
.align 2, 0
@@ -150,7 +150,7 @@ _0812C4C0:
lsls r2, 5
movs r0, 0x3
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, _0812C530 @ =gUnknown_8EA0700
movs r5, 0x20
str r5, [sp]
@@ -158,24 +158,24 @@ _0812C4C0:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
ldr r4, _0812C534 @ =gUnknown_8E9F220
adds r0, r4, 0
movs r1, 0
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x20
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0812C538 @ =gUnknown_8EA0F00
str r5, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
ldr r1, _0812C53C @ =gUnknown_845C600
str r5, [sp]
str r5, [sp, 0x4]
@@ -184,12 +184,12 @@ _0812C4C0:
movs r0, 0x1
movs r2, 0x1E
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0812C5BE
.align 2, 0
_0812C52C: .4byte gUnknown_8E9F260
@@ -198,25 +198,25 @@ _0812C534: .4byte gUnknown_8E9F220
_0812C538: .4byte gUnknown_8EA0F00
_0812C53C: .4byte gUnknown_845C600
_0812C540:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0812C626
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0812C5BE
_0812C578:
ldr r0, _0812C598 @ =gUnknown_845FC04
@@ -225,7 +225,7 @@ _0812C578:
bl sub_812CEC0
ldr r4, _0812C59C @ =gUnknown_203B100
movs r0, 0x88
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
bl sub_812DB28
b _0812C5BE
@@ -243,7 +243,7 @@ _0812C5A0:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0812C5BE:
ldr r1, _0812C5D0 @ =gUnknown_30030F0
movs r0, 0x87
@@ -260,15 +260,15 @@ _0812C5D4:
movs r1, 0xFD
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x7
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x8
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0812C634 @ =sub_812C380
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0812C638 @ =gUnknown_203B0FC
ldr r1, [r0]
movs r4, 0
@@ -280,9 +280,9 @@ _0812C5D4:
bl sub_812E178
ldr r0, _0812C63C @ =sub_812C664
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r0, _0812C640 @ =sub_812C394
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0812C644 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -307,9 +307,9 @@ _0812C644: .4byte gUnknown_30030F0
sub_812C648: @ 812C648
push {lr}
ldr r0, _0812C65C @ =gUnknown_845FB9C
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0812C660 @ =gUnknown_845FBDC
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r0}
bx r0
.align 2, 0
@@ -361,7 +361,7 @@ sub_812C694: @ 812C694
adds r1, r0
mov r8, r1
ldr r0, _0812C718 @ =sub_812E110
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -432,7 +432,7 @@ _0812C738:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0x3
bl sub_812CEE0
movs r0, 0x2
@@ -500,7 +500,7 @@ _0812C7DC:
cmp r0, 0
beq _0812C8C4
movs r0, 0
- bl sub_8107078
+ bl ListMenuHandleInput
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _0812C824 @ =gUnknown_203B0FC
@@ -617,7 +617,7 @@ _0812C8DA:
_0812C8E0: .4byte sub_812CF3C
_0812C8E4:
movs r0, 0
- bl sub_8107078
+ bl ListMenuHandleInput
_0812C8EA:
add sp, 0x8
pop {r3}
@@ -770,7 +770,7 @@ _0812CA08:
lsls r1, 4
movs r0, 0x1
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
_0812CA14:
pop {r4}
pop {r0}
@@ -788,14 +788,14 @@ sub_812CA1C: @ 812CA1C
ldr r1, _0812CA44 @ =gUnknown_3005090
adds r5, r0, r1
movs r0, 0x1
- bl sub_8001CCC
+ bl GetBgX
cmp r0, 0
beq _0812CA48
movs r1, 0xA0
lsls r1, 4
movs r0, 0x1
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
b _0812CA52
.align 2, 0
_0812CA44: .4byte gUnknown_3005090
@@ -803,7 +803,7 @@ _0812CA48:
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
_0812CA52:
ldr r7, _0812CAC8 @ =gUnknown_202063C
movs r1, 0xC
@@ -1125,7 +1125,7 @@ _0812CCBE:
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
bl sub_812C990
ldr r0, _0812CD20 @ =gUnknown_203B0FC
ldr r0, [r0]
@@ -1208,7 +1208,7 @@ _0812CD88:
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
bl sub_812D6B4
lsls r0, 24
lsrs r0, 24
@@ -1281,7 +1281,7 @@ sub_812CE04: @ 812CE04
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r6, _0812CE90 @ =gUnknown_2021D18
ldr r2, _0812CE94 @ =gUnknown_845F6BC
ldr r0, _0812CE98 @ =gUnknown_203B0FC
@@ -1341,7 +1341,7 @@ sub_812CE9C: @ 812CE9C
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0x2
bl sub_812CEE0
add sp, 0x8
@@ -1371,7 +1371,7 @@ sub_812CEE0: @ 812CEE0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -1433,7 +1433,7 @@ sub_812CF3C: @ 812CF3C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0812CF74 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1486,14 +1486,14 @@ sub_812CF7C: @ 812CF7C
lsls r0, 2
ldr r5, _0812D080 @ =gUnknown_202063C
adds r0, r5
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
movs r0, 0xE
ldrsh r1, [r4, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
_0812CFD8:
movs r4, 0
_0812CFDA:
@@ -1507,7 +1507,7 @@ _0812CFDA:
lsls r0, 2
ldr r1, _0812D080 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1520,7 +1520,7 @@ _0812CFDA:
bl sub_812E048
ldr r0, [r5]
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, [r5]
ldrb r0, [r0, 0x8]
movs r1, 0
@@ -1528,18 +1528,18 @@ _0812CFDA:
bl sub_810713C
ldr r0, _0812D084 @ =gUnknown_203B0F0
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _0812D088 @ =gUnknown_203B0F4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _0812D08C @ =gUnknown_203B0F8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, _0812D090 @ =gUnknown_203B100
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
movs r0, 0
bl sub_812D094
movs r0, 0x1
@@ -1550,7 +1550,7 @@ _0812CFDA:
bl sub_812D094
bl sub_8003ECC
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0812D06C:
pop {r4-r6}
pop {r0}
@@ -1574,9 +1574,9 @@ sub_812D094: @ 812D094
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
@@ -1594,7 +1594,7 @@ sub_812D0C0: @ 812D0C0
lsrs r4, r0, 24
movs r0, 0xAF
lsls r0, 1
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1645,7 +1645,7 @@ _0812D10A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0x44
negs r0, r0
adds r2, r0, 0
@@ -1694,7 +1694,7 @@ _0812D178:
lsls r0, 2
ldr r1, _0812D1A4 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -2094,64 +2094,64 @@ _0812D446:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x8
pop {r3}
mov r8, r3
@@ -2166,11 +2166,11 @@ _0812D554: .4byte 0x81000800
thumb_func_start sub_812D558
sub_812D558: @ 812D558
push {lr}
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_810BB8C
- bl sub_8070528
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl dp13_810BB8C
+ bl ResetPaletteFade
movs r0, 0
bl sub_805FECC
ldr r1, _0812D580 @ =gUnknown_3003E58
@@ -2188,7 +2188,7 @@ sub_812D584: @ 812D584
movs r1, 0xFA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_812D584
@@ -2199,35 +2199,35 @@ sub_812D594: @ 812D594
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_812D594
@@ -2386,9 +2386,9 @@ sub_812D70C: @ 812D70C
movs r4, 0xFA
lsls r4, 2
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
@@ -2418,7 +2418,7 @@ _0812D732:
asrs r1, 16
adds r2, r4, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r4}
@@ -2431,7 +2431,7 @@ _0812D760: .4byte gUnknown_845FC44
thumb_func_start sub_812D764
sub_812D764: @ 812D764
push {lr}
- bl sub_8007280
+ bl DestroySprite
pop {r0}
bx r0
thumb_func_end sub_812D764
@@ -2440,7 +2440,7 @@ sub_812D764: @ 812D764
sub_812D770: @ 812D770
push {lr}
ldr r0, _0812D77C @ =0x000003e9
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r0}
bx r0
.align 2, 0
@@ -2459,7 +2459,7 @@ sub_812D780: @ 812D780
ldr r0, _0812D7C0 @ =gUnknown_845FC78
adds r1, r3, 0
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _0812D7C4 @ =gUnknown_202063C
@@ -2490,9 +2490,9 @@ sub_812D7C8: @ 812D7C8
push {r4,lr}
ldr r4, _0812D7E0 @ =0x000003ea
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
@@ -2507,7 +2507,7 @@ sub_812D7E4: @ 812D7E4
movs r1, 0xE2
movs r2, 0x42
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2520,9 +2520,9 @@ _0812D7FC: .4byte gUnknown_845FCB8
sub_812D800: @ 812D800
push {r4,lr}
adds r4, r0, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
@@ -2532,14 +2532,14 @@ sub_812D800: @ 812D800
sub_812D814: @ 812D814
push {lr}
ldr r0, _0812D834 @ =0x000003ee
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0812D838 @ =0x000003ef
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0xFC
lsls r0, 2
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0812D83C @ =0x000003f1
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r0}
bx r0
.align 2, 0
@@ -2604,7 +2604,7 @@ sub_812D888: @ 812D888
movs r1, 0x94
movs r2, 0x42
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0812D8AC @ =gUnknown_845ED60
@@ -2619,7 +2619,7 @@ _0812D8B0:
movs r1, 0x94
movs r2, 0x42
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0812D8CC @ =gUnknown_845DD20
@@ -2634,7 +2634,7 @@ _0812D8D0:
movs r1, 0x94
movs r2, 0x42
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0812D8EC @ =gUnknown_845F580
@@ -2649,7 +2649,7 @@ _0812D8F0:
movs r1, 0x94
movs r2, 0x42
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0812D92C @ =gUnknown_845E540
@@ -2657,7 +2657,7 @@ _0812D906:
movs r1, 0xB0
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0812D930 @ =gUnknown_202063C
lsls r0, r4, 4
adds r0, r4
@@ -2712,7 +2712,7 @@ _0812D950:
movs r1, 0xB0
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0812D982:
adds r0, r4, 0
add sp, 0x8
@@ -2772,7 +2772,7 @@ _0812D9E8:
lsls r0, 2
ldr r1, _0812DA04 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
b _0812DA0E
.align 2, 0
_0812D9FC: .4byte gUnknown_3005098
@@ -2823,7 +2823,7 @@ sub_812DA14: @ 812DA14
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r0, _0812DB00 @ =gUnknown_845F89C
lsls r5, 2
adds r0, r5, r0
@@ -2933,7 +2933,7 @@ sub_812DB28: @ 812DB28
ldr r0, _0812DB60 @ =gUnknown_3005EB0
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
ldr r1, [r4]
strb r0, [r1, 0x8]
movs r0, 0
@@ -3019,7 +3019,7 @@ sub_812DBC0: @ 812DBC0
adds r0, r7, 0
bl sub_812DDF0
ldr r0, _0812DC70 @ =sub_812C694
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
@@ -3039,7 +3039,7 @@ _0812DBFE:
ldrb r0, [r0, 0x8]
add r1, sp, 0x8
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r1, [r6]
add r0, sp, 0x8
ldrh r0, [r0]
@@ -3121,7 +3121,7 @@ _0812DCBC:
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0x2
bl sub_812CEE0
b _0812DD3A
@@ -3245,7 +3245,7 @@ sub_812DDAC: @ 812DDAC
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r2, _0812DDEC @ =gUnknown_84181C3
movs r0, 0
str r0, [sp]
@@ -3284,7 +3284,7 @@ sub_812DDF0: @ 812DDF0
adds r4, 0x16
add r1, sp, 0x14
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
add r1, sp, 0x14
ldrh r0, [r4]
ldrh r1, [r1]
@@ -3522,7 +3522,7 @@ sub_812DFE4: @ 812DFE4
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -3556,7 +3556,7 @@ sub_812E000: @ 812E000
strh r0, [r1, 0x8]
adds r1, r2, 0x4
mov r0, sp
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, [r4]
strb r0, [r1, 0x6]
_0812E036:
@@ -3579,7 +3579,7 @@ sub_812E048: @ 812E048
cmp r0, 0x5
bls _0812E05C
ldrb r0, [r1, 0x6]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
_0812E05C:
pop {r0}
bx r0
@@ -3598,7 +3598,7 @@ sub_812E064: @ 812E064
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r1, sp
ldrh r0, [r4]
ldrh r1, [r1]
@@ -3629,14 +3629,14 @@ sub_812E094: @ 812E094
beq _0812E108
ldr r5, _0812E0F0 @ =sub_812E110
adds r0, r5, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _0812E0C8
adds r0, r5, 0
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
_0812E0C8:
@@ -3725,7 +3725,7 @@ _0812E154:
movs r0, 0x1
bl sub_812E178
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0812E170:
pop {r4,r5}
pop {r0}
@@ -3753,7 +3753,7 @@ _0812E18C:
movs r1, 0x8C
movs r2, 0xE
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r5, 0xA
str r5, [sp]
str r4, [sp, 0x4]
@@ -3762,7 +3762,7 @@ _0812E18C:
movs r1, 0xA1
movs r2, 0xF
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3770,7 +3770,7 @@ _0812E18C:
movs r1, 0x8D
movs r2, 0x19
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3778,7 +3778,7 @@ _0812E18C:
movs r1, 0x8E
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3786,7 +3786,7 @@ _0812E18C:
movs r1, 0x8F
movs r2, 0xE
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0xB
str r0, [sp]
str r4, [sp, 0x4]
@@ -3795,7 +3795,7 @@ _0812E18C:
movs r1, 0
movs r2, 0xF
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3803,7 +3803,7 @@ _0812E18C:
movs r1, 0x90
movs r2, 0x1A
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3811,7 +3811,7 @@ _0812E18C:
movs r1, 0x91
movs r2, 0xE
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3819,7 +3819,7 @@ _0812E18C:
movs r1, 0xA3
movs r2, 0xF
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3827,7 +3827,7 @@ _0812E18C:
movs r1, 0x92
movs r2, 0x19
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3844,7 +3844,7 @@ _0812E252:
movs r1, 0x9B
movs r2, 0xE
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r4, 0xB
str r4, [sp]
str r5, [sp, 0x4]
@@ -3853,7 +3853,7 @@ _0812E252:
movs r1, 0x9C
movs r2, 0xF
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3861,7 +3861,7 @@ _0812E252:
movs r1, 0x96
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3869,7 +3869,7 @@ _0812E252:
movs r1, 0x9D
movs r2, 0xE
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3877,7 +3877,7 @@ _0812E252:
movs r1, 0
movs r2, 0xF
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3885,7 +3885,7 @@ _0812E252:
movs r1, 0x90
movs r2, 0x1A
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3893,7 +3893,7 @@ _0812E252:
movs r1, 0x9E
movs r2, 0xE
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3901,7 +3901,7 @@ _0812E252:
movs r1, 0x9F
movs r2, 0xF
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r5, [sp, 0x8]
@@ -3919,7 +3919,7 @@ _0812E2F4:
movs r1, 0x94
movs r2, 0xE
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r5, 0xB
str r5, [sp]
str r4, [sp, 0x4]
@@ -3928,7 +3928,7 @@ _0812E2F4:
movs r1, 0x95
movs r2, 0xF
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3936,7 +3936,7 @@ _0812E2F4:
movs r1, 0x96
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3944,7 +3944,7 @@ _0812E2F4:
movs r1, 0x8F
movs r2, 0xE
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3952,7 +3952,7 @@ _0812E2F4:
movs r1, 0x9A
movs r2, 0xF
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3960,7 +3960,7 @@ _0812E2F4:
movs r1, 0x90
movs r2, 0x1A
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3968,7 +3968,7 @@ _0812E2F4:
movs r1, 0x97
movs r2, 0xE
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3976,7 +3976,7 @@ _0812E2F4:
movs r1, 0x98
movs r2, 0xF
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3994,7 +3994,7 @@ _0812E398:
movs r1, 0x83
movs r2, 0xE
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r5, 0xA
str r5, [sp]
str r4, [sp, 0x4]
@@ -4003,7 +4003,7 @@ _0812E398:
movs r1, 0xA0
movs r2, 0xF
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4011,7 +4011,7 @@ _0812E398:
movs r1, 0x84
movs r2, 0x19
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4019,7 +4019,7 @@ _0812E398:
movs r1, 0x85
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4027,7 +4027,7 @@ _0812E398:
movs r1, 0x86
movs r2, 0xE
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4035,7 +4035,7 @@ _0812E398:
movs r1, 0xA2
movs r2, 0xF
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4043,7 +4043,7 @@ _0812E398:
movs r1, 0x87
movs r2, 0x19
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4051,7 +4051,7 @@ _0812E398:
movs r1, 0x88
movs r2, 0x1A
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4059,7 +4059,7 @@ _0812E398:
movs r1, 0x83
movs r2, 0xE
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4067,7 +4067,7 @@ _0812E398:
movs r1, 0xA0
movs r2, 0xF
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4075,7 +4075,7 @@ _0812E398:
movs r1, 0x84
movs r2, 0x19
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4084,7 +4084,7 @@ _0812E398:
_0812E470:
movs r2, 0x1A
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _0812E496
_0812E47A:
cmp r5, 0x5
@@ -4099,10 +4099,10 @@ _0812E47A:
movs r1, 0
movs r2, 0xE
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_0812E496:
adds r0, r6, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -4119,7 +4119,7 @@ sub_812E4A4: @ 812E4A4
ldr r0, _0812E4E0 @ =gUnknown_203B0FC
ldr r0, [r0]
ldrb r0, [r0, 0x8]
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 16
lsrs r0, 16
cmp r4, 0x1
diff --git a/asm/field_camera.s b/asm/field_camera.s
index f30d0a0db..255027bbc 100644
--- a/asm/field_camera.s
+++ b/asm/field_camera.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_805A5A8
-sub_805A5A8: @ 805A5A8
+ thumb_func_start move_tilemap_camera_to_upper_left_corner_
+move_tilemap_camera_to_upper_left_corner_: @ 805A5A8
movs r1, 0
strb r1, [r0, 0x2]
strb r1, [r0, 0x3]
@@ -15,10 +15,10 @@ sub_805A5A8: @ 805A5A8
movs r1, 0x1
strb r1, [r0, 0x4]
bx lr
- thumb_func_end sub_805A5A8
+ thumb_func_end move_tilemap_camera_to_upper_left_corner_
- thumb_func_start sub_805A5B8
-sub_805A5B8: @ 805A5B8
+ thumb_func_start tilemap_move_something
+tilemap_move_something: @ 805A5B8
ldrb r3, [r0, 0x2]
adds r3, r1
strb r3, [r0, 0x2]
@@ -33,10 +33,10 @@ sub_805A5B8: @ 805A5B8
ands r1, r3
strb r1, [r0, 0x3]
bx lr
- thumb_func_end sub_805A5B8
+ thumb_func_end tilemap_move_something
- thumb_func_start sub_805A5D4
-sub_805A5D4: @ 805A5D4
+ thumb_func_start coords8_add
+coords8_add: @ 805A5D4
ldrb r3, [r0]
adds r3, r1
strb r3, [r0]
@@ -44,21 +44,21 @@ sub_805A5D4: @ 805A5D4
adds r1, r2
strb r1, [r0, 0x1]
bx lr
- thumb_func_end sub_805A5D4
+ thumb_func_end coords8_add
- thumb_func_start sub_805A5E4
-sub_805A5E4: @ 805A5E4
+ thumb_func_start move_tilemap_camera_to_upper_left_corner
+move_tilemap_camera_to_upper_left_corner: @ 805A5E4
push {lr}
ldr r0, _0805A5F0 @ =gUnknown_3000E90
- bl sub_805A5A8
+ bl move_tilemap_camera_to_upper_left_corner_
pop {r0}
bx r0
.align 2, 0
_0805A5F0: .4byte gUnknown_3000E90
- thumb_func_end sub_805A5E4
+ thumb_func_end move_tilemap_camera_to_upper_left_corner
- thumb_func_start sub_805A5F4
-sub_805A5F4: @ 805A5F4
+ thumb_func_start FieldUpdateBgTilemapScroll
+FieldUpdateBgTilemapScroll: @ 805A5F4
push {r4,r5,lr}
ldr r1, _0805A64C @ =gUnknown_3000E90
ldr r0, _0805A650 @ =gUnknown_3000E98
@@ -76,24 +76,24 @@ sub_805A5F4: @ 805A5F4
lsrs r5, 16
movs r0, 0x14
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
lsls r4, 16
lsrs r4, 16
movs r0, 0x16
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
@@ -101,7 +101,7 @@ sub_805A5F4: @ 805A5F4
_0805A64C: .4byte gUnknown_3000E90
_0805A650: .4byte gUnknown_3000E98
_0805A654: .4byte gUnknown_3000E9A
- thumb_func_end sub_805A5F4
+ thumb_func_end FieldUpdateBgTilemapScroll
thumb_func_start sub_805A658
sub_805A658: @ 805A658
@@ -127,8 +127,8 @@ _0805A67C: .4byte gUnknown_3000E98
_0805A680: .4byte gUnknown_3000E9A
thumb_func_end sub_805A658
- thumb_func_start sub_805A684
-sub_805A684: @ 805A684
+ thumb_func_start DrawWholeMapView
+DrawWholeMapView: @ 805A684
push {lr}
ldr r0, _0805A6A0 @ =gUnknown_3005008
ldr r1, [r0]
@@ -138,16 +138,16 @@ sub_805A684: @ 805A684
ldrsh r1, [r1, r2]
ldr r2, _0805A6A4 @ =gUnknown_2036DFC
ldr r2, [r2]
- bl sub_805A6A8
+ bl DrawWholeMapViewInternal
pop {r0}
bx r0
.align 2, 0
_0805A6A0: .4byte gUnknown_3005008
_0805A6A4: .4byte gUnknown_2036DFC
- thumb_func_end sub_805A684
+ thumb_func_end DrawWholeMapView
- thumb_func_start sub_805A6A8
-sub_805A6A8: @ 805A6A8
+ thumb_func_start DrawWholeMapViewInternal
+DrawWholeMapViewInternal: @ 805A6A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -216,10 +216,10 @@ _0805A6EE:
bx r0
.align 2, 0
_0805A728: .4byte gUnknown_3000E90
- thumb_func_end sub_805A6A8
+ thumb_func_end DrawWholeMapViewInternal
- thumb_func_start sub_805A72C
-sub_805A72C: @ 805A72C
+ thumb_func_start RedrawMapSlicesForCameraUpdate
+RedrawMapSlicesForCameraUpdate: @ 805A72C
push {r4-r7,lr}
adds r5, r0, 0
adds r6, r1, 0
@@ -230,25 +230,25 @@ sub_805A72C: @ 805A72C
ble _0805A744
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A87C
+ bl RedrawMapSliceWest
_0805A744:
cmp r6, 0
bge _0805A750
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A824
+ bl RedrawMapSliceEast
_0805A750:
cmp r7, 0
ble _0805A75C
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A778
+ bl RedrawMapSliceNorth
_0805A75C:
cmp r7, 0
bge _0805A768
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A7D8
+ bl RedrawMapSliceSouth
_0805A768:
movs r0, 0x1
strb r0, [r5, 0x4]
@@ -257,10 +257,10 @@ _0805A768:
bx r0
.align 2, 0
_0805A774: .4byte gUnknown_2036DFC
- thumb_func_end sub_805A72C
+ thumb_func_end RedrawMapSlicesForCameraUpdate
- thumb_func_start sub_805A778
-sub_805A778: @ 805A778
+ thumb_func_start RedrawMapSliceNorth
+RedrawMapSliceNorth: @ 805A778
push {r4-r7,lr}
adds r5, r0, 0
adds r7, r1, 0
@@ -311,10 +311,10 @@ _0805A7A6:
bx r0
.align 2, 0
_0805A7D4: .4byte gUnknown_3005008
- thumb_func_end sub_805A778
+ thumb_func_end RedrawMapSliceNorth
- thumb_func_start sub_805A7D8
-sub_805A7D8: @ 805A7D8
+ thumb_func_start RedrawMapSliceSouth
+RedrawMapSliceSouth: @ 805A7D8
push {r4-r7,lr}
adds r5, r0, 0
adds r7, r1, 0
@@ -353,10 +353,10 @@ _0805A7F6:
bx r0
.align 2, 0
_0805A820: .4byte gUnknown_3005008
- thumb_func_end sub_805A7D8
+ thumb_func_end RedrawMapSliceSouth
- thumb_func_start sub_805A824
-sub_805A824: @ 805A824
+ thumb_func_start RedrawMapSliceEast
+RedrawMapSliceEast: @ 805A824
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -401,10 +401,10 @@ _0805A844:
bx r0
.align 2, 0
_0805A878: .4byte gUnknown_3005008
- thumb_func_end sub_805A824
+ thumb_func_end RedrawMapSliceEast
- thumb_func_start sub_805A87C
-sub_805A87C: @ 805A87C
+ thumb_func_start RedrawMapSliceWest
+RedrawMapSliceWest: @ 805A87C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -460,17 +460,17 @@ _0805A8AE:
bx r0
.align 2, 0
_0805A8E4: .4byte gUnknown_3005008
- thumb_func_end sub_805A87C
+ thumb_func_end RedrawMapSliceWest
- thumb_func_start sub_805A8E8
-sub_805A8E8: @ 805A8E8
+ thumb_func_start CurrentMapDrawMetatileAt
+CurrentMapDrawMetatileAt: @ 805A8E8
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r0, _0805A914 @ =gUnknown_3000E90
adds r1, r4, 0
adds r2, r5, 0
- bl sub_805AAE8
+ bl MapPosToBgTilemapOffset
adds r1, r0, 0
cmp r1, 0
blt _0805A90E
@@ -488,7 +488,7 @@ _0805A90E:
.align 2, 0
_0805A914: .4byte gUnknown_3000E90
_0805A918: .4byte gUnknown_2036DFC
- thumb_func_end sub_805A8E8
+ thumb_func_end CurrentMapDrawMetatileAt
thumb_func_start sub_805A91C
sub_805A91C: @ 805A91C
@@ -499,14 +499,14 @@ sub_805A91C: @ 805A91C
ldr r0, _0805A944 @ =gUnknown_3000E90
adds r1, r3, 0
adds r2, r4, 0
- bl sub_805AAE8
+ bl MapPosToBgTilemapOffset
cmp r0, 0
blt _0805A93E
lsls r2, r0, 16
lsrs r2, 16
movs r0, 0x1
adds r1, r5, 0
- bl sub_805A9B4
+ bl DrawMetatile
_0805A93E:
pop {r4,r5}
pop {r0}
@@ -563,7 +563,7 @@ _0805A98C:
lsls r1, r4, 4
adds r1, r5, r1
mov r2, r8
- bl sub_805A9B4
+ bl DrawMetatile
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -573,8 +573,8 @@ _0805A98C:
_0805A9B0: .4byte 0xfffffd80
thumb_func_end sub_805A948
- thumb_func_start sub_805A9B4
-sub_805A9B4: @ 805A9B4
+ thumb_func_start DrawMetatile
+DrawMetatile: @ 805A9B4
push {r4,lr}
adds r4, r1, 0
lsls r2, 16
@@ -710,11 +710,11 @@ _0805AAA2:
strh r0, [r3]
_0805AABE:
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
@@ -723,10 +723,10 @@ _0805AAD8: .4byte gUnknown_300501C
_0805AADC: .4byte 0x00003014
_0805AAE0: .4byte gUnknown_3005014
_0805AAE4: .4byte gUnknown_3005018
- thumb_func_end sub_805A9B4
+ thumb_func_end DrawMetatile
- thumb_func_start sub_805AAE8
-sub_805AAE8: @ 805AAE8
+ thumb_func_start MapPosToBgTilemapOffset
+MapPosToBgTilemapOffset: @ 805AAE8
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _0805AB18 @ =gUnknown_3005008
@@ -768,10 +768,10 @@ _0805AB2A:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805AAE8
+ thumb_func_end MapPosToBgTilemapOffset
- thumb_func_start sub_805AB30
-sub_805AB30: @ 805AB30
+ thumb_func_start CameraUpdateCallback
+CameraUpdateCallback: @ 805AB30
push {lr}
adds r3, r0, 0
ldr r2, [r3, 0x4]
@@ -793,10 +793,10 @@ _0805AB50:
bx r0
.align 2, 0
_0805AB54: .4byte gUnknown_202063C
- thumb_func_end sub_805AB30
+ thumb_func_end CameraUpdateCallback
- thumb_func_start sub_805AB58
-sub_805AB58: @ 805AB58
+ thumb_func_start ResetCameraUpdateInfo
+ResetCameraUpdateInfo: @ 805AB58
ldr r1, _0805AB6C @ =gUnknown_3005050
movs r0, 0
str r0, [r1, 0x8]
@@ -808,10 +808,10 @@ sub_805AB58: @ 805AB58
bx lr
.align 2, 0
_0805AB6C: .4byte gUnknown_3005050
- thumb_func_end sub_805AB58
+ thumb_func_end ResetCameraUpdateInfo
- thumb_func_start sub_805AB70
-sub_805AB70: @ 805AB70
+ thumb_func_start InitCameraUpdateCallback
+InitCameraUpdateCallback: @ 805AB70
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -824,14 +824,14 @@ sub_805AB70: @ 805AB70
lsls r0, 2
ldr r1, _0805ABA8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
_0805AB8C:
adds r0, r5, 0
- bl sub_805F950
+ bl AddCameraObject
lsls r0, 24
lsrs r0, 24
str r0, [r4, 0x4]
- ldr r0, _0805ABAC @ =sub_805AB30
+ ldr r0, _0805ABAC @ =CameraUpdateCallback
str r0, [r4]
movs r0, 0
pop {r4,r5}
@@ -840,11 +840,11 @@ _0805AB8C:
.align 2, 0
_0805ABA4: .4byte gUnknown_3005050
_0805ABA8: .4byte gUnknown_202063C
-_0805ABAC: .4byte sub_805AB30
- thumb_func_end sub_805AB70
+_0805ABAC: .4byte CameraUpdateCallback
+ thumb_func_end InitCameraUpdateCallback
- thumb_func_start sub_805ABB0
-sub_805ABB0: @ 805ABB0
+ thumb_func_start CameraUpdate
+CameraUpdate: @ 805ABB0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -936,26 +936,26 @@ _0805AC44:
_0805AC54:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8059530
+ bl CameraMove
adds r0, r4, 0
adds r1, r5, 0
- bl sub_805F924
+ bl UpdateFieldObjectsForCameraUpdate
ldr r6, _0805ACA8 @ =gUnknown_3000E90
lsls r4, 1
lsls r5, 1
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
- bl sub_805A5B8
+ bl tilemap_move_something
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
- bl sub_805A72C
+ bl RedrawMapSlicesForCameraUpdate
_0805AC7E:
ldr r0, _0805ACA8 @ =gUnknown_3000E90
adds r1, r7, 0
mov r2, r8
- bl sub_805A5D4
+ bl coords8_add
ldr r1, _0805ACAC @ =gUnknown_300506C
ldrh r0, [r1]
subs r0, r7
@@ -975,20 +975,20 @@ _0805ACA4: .4byte gUnknown_3005050
_0805ACA8: .4byte gUnknown_3000E90
_0805ACAC: .4byte gUnknown_300506C
_0805ACB0: .4byte gUnknown_3005068
- thumb_func_end sub_805ABB0
+ thumb_func_end CameraUpdate
thumb_func_start sub_805ACB4
sub_805ACB4: @ 805ACB4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8059530
+ bl CameraMove
lsls r0, r4, 16
asrs r0, 16
lsls r1, r5, 16
asrs r1, 16
- bl sub_805F924
- bl sub_805A684
+ bl UpdateFieldObjectsForCameraUpdate
+ bl DrawWholeMapView
ldr r1, _0805ACE8 @ =gUnknown_300506C
lsls r4, 4
ldrh r0, [r1]
@@ -1100,23 +1100,23 @@ _0805AD84:
_0805AD94:
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8059530
+ bl CameraMove
ldr r4, _0805ADD0 @ =gUnknown_3000E90
lsls r5, 1
lsls r6, 1
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_805A5B8
+ bl tilemap_move_something
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_805A72C
+ bl RedrawMapSlicesForCameraUpdate
_0805ADB6:
ldr r0, _0805ADD0 @ =gUnknown_3000E90
adds r1, r7, 0
mov r2, r8
- bl sub_805A5D4
+ bl coords8_add
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -1127,17 +1127,17 @@ _0805ADCC: .4byte gUnknown_3005050
_0805ADD0: .4byte gUnknown_3000E90
thumb_func_end sub_805ACF0
- thumb_func_start sub_805ADD4
-sub_805ADD4: @ 805ADD4
+ thumb_func_start SetCameraPanningCallback
+SetCameraPanningCallback: @ 805ADD4
ldr r1, _0805ADDC @ =gUnknown_3000EA0
str r0, [r1]
bx lr
.align 2, 0
_0805ADDC: .4byte gUnknown_3000EA0
- thumb_func_end sub_805ADD4
+ thumb_func_end SetCameraPanningCallback
- thumb_func_start sub_805ADE0
-sub_805ADE0: @ 805ADE0
+ thumb_func_start SetCameraPanning
+SetCameraPanning: @ 805ADE0
ldr r2, _0805ADF0 @ =gUnknown_3000E98
strh r0, [r2]
ldr r0, _0805ADF4 @ =gUnknown_3000E9A
@@ -1149,12 +1149,12 @@ sub_805ADE0: @ 805ADE0
.align 2, 0
_0805ADF0: .4byte gUnknown_3000E98
_0805ADF4: .4byte gUnknown_3000E9A
- thumb_func_end sub_805ADE0
+ thumb_func_end SetCameraPanning
- thumb_func_start sub_805ADF8
-sub_805ADF8: @ 805ADF8
+ thumb_func_start InstallCameraPanAheadCallback
+InstallCameraPanAheadCallback: @ 805ADF8
ldr r1, _0805AE14 @ =gUnknown_3000EA0
- ldr r0, _0805AE18 @ =sub_805AE74
+ ldr r0, _0805AE18 @ =CameraPanningCB_PanAhead
str r0, [r1]
ldr r1, _0805AE1C @ =gUnknown_3000E9C
movs r0, 0
@@ -1168,14 +1168,14 @@ sub_805ADF8: @ 805ADF8
bx lr
.align 2, 0
_0805AE14: .4byte gUnknown_3000EA0
-_0805AE18: .4byte sub_805AE74
+_0805AE18: .4byte CameraPanningCB_PanAhead
_0805AE1C: .4byte gUnknown_3000E9C
_0805AE20: .4byte gUnknown_3000E98
_0805AE24: .4byte gUnknown_3000E9A
- thumb_func_end sub_805ADF8
+ thumb_func_end InstallCameraPanAheadCallback
- thumb_func_start sub_805AE28
-sub_805AE28: @ 805AE28
+ thumb_func_start UpdateCameraPanning
+UpdateCameraPanning: @ 805AE28
push {lr}
ldr r0, _0805AE58 @ =gUnknown_3000EA0
ldr r0, [r0]
@@ -1208,16 +1208,16 @@ _0805AE64: .4byte gUnknown_3000E98
_0805AE68: .4byte gUnknown_2021BCA
_0805AE6C: .4byte gUnknown_3005068
_0805AE70: .4byte gUnknown_3000E9A
- thumb_func_end sub_805AE28
+ thumb_func_end UpdateCameraPanning
- thumb_func_start sub_805AE74
-sub_805AE74: @ 805AE74
+ thumb_func_start CameraPanningCB_PanAhead
+CameraPanningCB_PanAhead: @ 805AE74
push {lr}
ldr r0, _0805AE84 @ =gUnknown_2036E2C
ldrb r0, [r0]
cmp r0, 0
bne _0805AE88
- bl sub_805ADF8
+ bl InstallCameraPanAheadCallback
b _0805AF10
.align 2, 0
_0805AE84: .4byte gUnknown_2036E2C
@@ -1242,7 +1242,7 @@ _0805AEA8:
movs r0, 0
strb r0, [r1]
_0805AEAE:
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1294,6 +1294,6 @@ _0805AF0E:
_0805AF10:
pop {r0}
bx r0
- thumb_func_end sub_805AE74
+ thumb_func_end CameraPanningCB_PanAhead
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index a544e5473..8e4b0e92c 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -56,7 +56,7 @@ sub_806C8BC: @ 806C8BC
bl sub_8059D70
lsls r0, 24
lsrs r7, r0, 24
- bl sub_8069A64
+ bl ScriptContext1_IsScriptSetUp
lsls r0, 24
cmp r0, 0
bne _0806C908
@@ -320,7 +320,7 @@ sub_806CAC8: @ 806CAC8
sub sp, 0x8
adds r5, r0, 0
bl sub_8069A54
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r6, r0, 24
mov r4, sp
@@ -606,7 +606,7 @@ _0806CD22:
sub_806CD30: @ 806CD30
push {r4,lr}
adds r4, r0, 0
- bl sub_8069A64
+ bl ScriptContext1_IsScriptSetUp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -629,7 +629,7 @@ _0806CD54:
ldrb r0, [r4, 0x2]
cmp r0, 0
beq _0806CDC0
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4, 0x2]
@@ -665,8 +665,8 @@ _0806CDA6:
bl sub_8069998
_0806CDB0:
ldr r0, _0806CDBC @ =gUnknown_81A7ADB
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
b _0806CDEA
.align 2, 0
_0806CDBC: .4byte gUnknown_81A7ADB
@@ -677,17 +677,17 @@ _0806CDC0:
cmp r0, 0
beq _0806CDEA
ldr r0, _0806CDF0 @ =gUnknown_81A7ADB
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
ldr r4, _0806CDF4 @ =sub_806CDF8
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0806CDEA
adds r0, r4, 0
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
_0806CDEA:
pop {r4}
pop {r0}
@@ -702,7 +702,7 @@ sub_806CDF8: @ 806CDF8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _0806CE18
@@ -710,7 +710,7 @@ sub_806CDF8: @ 806CDF8
bl sub_80722CC
bl sub_806F258
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0806CE18:
pop {r4}
pop {r0}
@@ -722,8 +722,8 @@ sub_806CE20: @ 806CE20
push {r4,lr}
adds r4, r0, 0
adds r1, r4, 0x2
- bl sub_805C538
- bl sub_805C700
+ bl PlayerGetDestCoords
+ bl PlayerGetZCoord
strb r0, [r4, 0x4]
pop {r4}
pop {r0}
@@ -736,23 +736,23 @@ sub_806CE38: @ 806CE38
sub sp, 0x4
adds r5, r0, 0
adds r1, r5, 0x2
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r4, r2]
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0
beq _0806CE6A
- bl sub_805C700
+ bl PlayerGetZCoord
_0806CE6A:
strb r0, [r5, 0x4]
add sp, 0x4
@@ -769,7 +769,7 @@ sub_806CE74: @ 806CE74
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -808,7 +808,7 @@ _0806CEB8:
bl sub_80722CC
_0806CECA:
adds r0, r4, 0
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
_0806CED2:
pop {r4}
@@ -876,7 +876,7 @@ sub_806CF38: @ 806CF38
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_8059EC4
+ bl MetatileBehavior_IsCounter
lsls r0, 24
cmp r0, 0
bne _0806CF60
@@ -901,7 +901,7 @@ _0806CF60:
lsrs r1, 16
_0806CF7E:
ldrb r2, [r4, 0x4]
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
@@ -947,7 +947,7 @@ _0806CFBC:
ldr r0, _0806CFF0 @ =gUnknown_20370D4
strh r6, [r0]
adds r0, r3, 0
- bl sub_805FC38
+ bl GetFieldObjectScriptPointerByFieldObjectId
_0806CFDE:
pop {r4-r6}
pop {r1}
@@ -973,7 +973,7 @@ sub_806CFF4: @ 806CFF4
ldrh r0, [r4]
ldrh r1, [r4, 0x2]
ldrb r2, [r4, 0x4]
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x10
@@ -989,7 +989,7 @@ sub_806CFF4: @ 806CFF4
bne _0806D078
_0806D02A:
adds r0, r7, 0
- bl sub_8059EC4
+ bl MetatileBehavior_IsCounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1011,7 +1011,7 @@ _0806D02A:
lsls r1, 16
lsrs r1, 16
ldrb r2, [r4, 0x4]
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x10
@@ -1033,7 +1033,7 @@ _0806D078:
lsls r0, 2
ldr r1, _0806D098 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
bne _0806D0A0
@@ -1057,10 +1057,10 @@ _0806D0A0:
mov r1, r8
strh r1, [r0]
adds r0, r5, 0
- bl sub_805FC38
+ bl GetFieldObjectScriptPointerByFieldObjectId
adds r1, r0, 0
ldrb r0, [r4]
- bl sub_8069D8C
+ bl GetRamScript
adds r1, r0, 0
_0806D0C8:
pop {r3}
@@ -1093,7 +1093,7 @@ sub_806D0E4: @ 806D0E4
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl sub_806DEEC
+ bl FindInvisibleMapObjectByPosition
adds r5, r0, 0
cmp r5, 0
beq _0806D164
@@ -1214,7 +1214,7 @@ sub_806D1F0: @ 806D1F0
ldr r0, _0806D210 @ =gUnknown_20370D4
strh r5, [r0]
adds r0, r4, 0
- bl sub_8059EF4
+ bl MetatileBehavior_IsPC
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1337,7 +1337,7 @@ _0806D304: .4byte gUnknown_81C549C
_0806D308:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8059ED8
+ bl MetatileBehavior_IsPlayerFacingTVScreen
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1760,7 +1760,7 @@ sub_806D660: @ 806D660
bl sub_806DDC0
cmp r0, 0
beq _0806D68C
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806D68E
.align 2, 0
@@ -1810,7 +1810,7 @@ sub_806D698: @ 806D698
cmp r0, 0x1
bne _0806D6EC
ldr r0, _0806D6E8 @ =gUnknown_81A8CED
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D6E0: .4byte gUnknown_203ADFA
@@ -1823,7 +1823,7 @@ _0806D6EC:
cmp r0, 0x1
bne _0806D704
ldr r0, _0806D700 @ =gUnknown_81A8DFD
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D700: .4byte gUnknown_81A8DFD
@@ -1835,7 +1835,7 @@ _0806D704:
movs r0, 0xD
bl sub_8054E90
ldr r0, _0806D71C @ =gUnknown_81BF546
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
b _0806D730
.align 2, 0
_0806D71C: .4byte gUnknown_81BF546
@@ -1933,7 +1933,7 @@ sub_806D79C: @ 806D79C
lsls r0, 16
cmp r0, 0
bne _0806D7E0
- bl sub_80A0618
+ bl overworld_poison
cmp r0, 0x1
beq _0806D7E0
cmp r0, 0x1
@@ -2116,7 +2116,7 @@ sub_806D908: @ 806D908
lsrs r1, 24
ldr r2, _0806D924 @ =gUnknown_20370D4
strh r1, [r2]
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
bl sub_80699E0
bl sub_8069A20
pop {r0}
@@ -2139,7 +2139,7 @@ sub_806D928: @ 806D928
lsrs r2, 16
ldrb r3, [r0, 0x4]
adds r0, r4, 0
- bl sub_806DEEC
+ bl FindInvisibleMapObjectByPosition
cmp r0, 0
bne _0806D950
movs r0, 0
@@ -2333,7 +2333,7 @@ _0806DAC4:
bne _0806DAE4
bl sub_80559E4
ldr r0, _0806DAE0 @ =gUnknown_81C1361
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _0806DAEE
.align 2, 0
@@ -2553,7 +2553,7 @@ sub_806DC54: @ 806DC54
cmp r0, 0x7F
bne _0806DC78
ldrb r0, [r4, 0x5]
- bl sub_8055454
+ bl copy_saved_warp2_bank_and_enter_x_to_warp1
b _0806DCC4
.align 2, 0
_0806DC74: .4byte gUnknown_2036DFC
@@ -2564,7 +2564,7 @@ _0806DC78:
ldrsb r1, [r4, r1]
movs r2, 0x5
ldrsb r2, [r4, r2]
- bl sub_80553C8
+ bl warp1_set_2
movs r1, 0
ldrsh r0, [r5, r1]
movs r2, 0x2
@@ -2572,7 +2572,7 @@ _0806DC78:
bl sub_805550C
ldrb r0, [r4, 0x7]
ldrb r1, [r4, 0x6]
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldr r1, [r0, 0x4]
ldrb r0, [r4, 0x5]
ldr r1, [r1, 0x8]
@@ -2591,7 +2591,7 @@ _0806DC78:
lsls r2, 24
asrs r2, 24
adds r3, r7, 0
- bl sub_80553E8
+ bl saved_warp2_set
_0806DCC4:
pop {r4-r7}
pop {r0}
@@ -2723,7 +2723,7 @@ _0806DD96:
b _0806DDB8
_0806DDB0:
adds r0, r1, 0
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
_0806DDB6:
movs r0, 0
_0806DDB8:
@@ -2809,7 +2809,7 @@ sub_806DE28: @ 806DE28
ldr r2, [r4]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
ldrb r0, [r5, 0x8]
ldr r2, [r4]
ldrb r1, [r2, 0x5]
@@ -2855,8 +2855,8 @@ _0806DE92:
bne _0806DEB0
bl sub_8112364
ldr r0, [r4, 0xC]
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
_0806DEB0:
adds r4, 0x10
subs r5, 0x1
@@ -2892,8 +2892,8 @@ sub_806DEC4: @ 806DEC4
_0806DEE8: .4byte gUnknown_2036DFC
thumb_func_end sub_806DEC4
- thumb_func_start sub_806DEEC
-sub_806DEEC: @ 806DEEC
+ thumb_func_start FindInvisibleMapObjectByPosition
+FindInvisibleMapObjectByPosition: @ 806DEEC
push {r4-r7,lr}
lsls r1, 16
lsrs r7, r1, 16
@@ -2938,10 +2938,10 @@ _0806DF34:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_806DEEC
+ thumb_func_end FindInvisibleMapObjectByPosition
- thumb_func_start sub_806DF3C
-sub_806DF3C: @ 806DF3C
+ thumb_func_start dive_warp
+dive_warp: @ 806DF3C
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 16
@@ -3001,7 +3001,7 @@ _0806DFB2:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806DF3C
+ thumb_func_end dive_warp
thumb_func_start sub_806DFB8
sub_806DFB8: @ 806DFB8
@@ -3011,7 +3011,7 @@ sub_806DFB8: @ 806DFB8
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -3079,11 +3079,11 @@ _0806E046:
bx r1
thumb_func_end sub_806DFB8
- thumb_func_start sub_806E050
-sub_806E050: @ 806E050
+ thumb_func_start GetFieldObjectScriptPointerForComparison
+GetFieldObjectScriptPointerForComparison: @ 806E050
push {r4,r5,lr}
sub sp, 0x8
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3106,13 +3106,13 @@ sub_806E050: @ 806E050
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806E050
+ thumb_func_end GetFieldObjectScriptPointerForComparison
thumb_func_start sub_806E08C
sub_806E08C: @ 806E08C
push {r4,lr}
sub sp, 0x8
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
mov r4, sp
mov r0, sp
bl sub_806CE20
diff --git a/asm/field_door.s b/asm/field_door.s
index 425cb0086..a29876ebc 100644
--- a/asm/field_door.s
+++ b/asm/field_door.s
@@ -49,15 +49,15 @@ sub_805AF54: @ 805AF54
bne _0805AF6A
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
b _0805AF7A
_0805AF6A:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
subs r1, r4, 0x1
adds r0, r5, 0
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
_0805AF7A:
pop {r4,r5}
pop {r0}
@@ -179,7 +179,7 @@ sub_805B028: @ 805B028
cmp r0, 0
bne _0805B056
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0805B056:
pop {r4}
pop {r0}
@@ -280,14 +280,14 @@ sub_805B0E8: @ 805B0E8
mov r8, r3
ldr r4, _0805B134 @ =sub_805B028
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0805B13C
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -606,7 +606,7 @@ _0805B348:
sub_805B350: @ 805B350
push {lr}
ldr r0, _0805B360 @ =sub_805B028
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
diff --git a/asm/field_effect.s b/asm/field_effect.s
index fe2e67112..4b0ae5e20 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -5,15 +5,15 @@
.text
- thumb_func_start sub_8083444
-sub_8083444: @ 8083444
+ thumb_func_start FieldEffectStart
+FieldEffectStart: @ 8083444
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80837D0
+ bl FieldEffectActiveListAdd
ldr r0, _08083484 @ =gUnknown_81D96AC
lsls r4, 2
adds r4, r0
@@ -41,22 +41,22 @@ _08083462:
.align 2, 0
_08083484: .4byte gUnknown_81D96AC
_08083488: .4byte gUnknown_83CBE30
- thumb_func_end sub_8083444
+ thumb_func_end FieldEffectStart
- thumb_func_start sub_808348C
-sub_808348C: @ 808348C
+ thumb_func_start FieldEffectCmd_loadtiles
+FieldEffectCmd_loadtiles: @ 808348C
push {lr}
ldr r1, [r0]
adds r1, 0x1
str r1, [r0]
- bl sub_8083568
+ bl FieldEffectScript_LoadTiles
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_808348C
+ thumb_func_end FieldEffectCmd_loadtiles
- thumb_func_start sub_80834A0
-sub_80834A0: @ 80834A0
+ thumb_func_start FieldEffectCmd_loadfadedpal
+FieldEffectCmd_loadfadedpal: @ 80834A0
push {lr}
ldr r1, [r0]
adds r1, 0x1
@@ -65,10 +65,10 @@ sub_80834A0: @ 80834A0
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80834A0
+ thumb_func_end FieldEffectCmd_loadfadedpal
- thumb_func_start sub_80834B4
-sub_80834B4: @ 80834B4
+ thumb_func_start FieldEffectCmd_loadpal
+FieldEffectCmd_loadpal: @ 80834B4
push {lr}
ldr r1, [r0]
adds r1, 0x1
@@ -77,19 +77,19 @@ sub_80834B4: @ 80834B4
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80834B4
+ thumb_func_end FieldEffectCmd_loadpal
- thumb_func_start sub_80834C8
-sub_80834C8: @ 80834C8
+ thumb_func_start FieldEffectCmd_callnative
+FieldEffectCmd_callnative: @ 80834C8
push {lr}
ldr r2, [r0]
adds r2, 0x1
str r2, [r0]
- bl sub_8083698
+ bl FieldEffectScript_CallNative
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80834C8
+ thumb_func_end FieldEffectCmd_callnative
thumb_func_start sub_80834DC
sub_80834DC: @ 80834DC
@@ -97,8 +97,8 @@ sub_80834DC: @ 80834DC
bx lr
thumb_func_end sub_80834DC
- thumb_func_start sub_80834E0
-sub_80834E0: @ 80834E0
+ thumb_func_start FieldEffectCmd_loadgfx_callnative
+FieldEffectCmd_loadgfx_callnative: @ 80834E0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -106,20 +106,20 @@ sub_80834E0: @ 80834E0
adds r0, 0x1
str r0, [r4]
adds r0, r4, 0
- bl sub_8083568
+ bl FieldEffectScript_LoadTiles
adds r0, r4, 0
bl sub_8083614
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8083698
+ bl FieldEffectScript_CallNative
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80834E0
+ thumb_func_end FieldEffectCmd_loadgfx_callnative
- thumb_func_start sub_8083508
-sub_8083508: @ 8083508
+ thumb_func_start FieldEffectCmd_loadtiles_callnative
+FieldEffectCmd_loadtiles_callnative: @ 8083508
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -127,18 +127,18 @@ sub_8083508: @ 8083508
adds r0, 0x1
str r0, [r4]
adds r0, r4, 0
- bl sub_8083568
+ bl FieldEffectScript_LoadTiles
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8083698
+ bl FieldEffectScript_CallNative
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8083508
+ thumb_func_end FieldEffectCmd_loadtiles_callnative
- thumb_func_start sub_808352C
-sub_808352C: @ 808352C
+ thumb_func_start FieldEffectCmd_loadfadedpal_callnative
+FieldEffectCmd_loadfadedpal_callnative: @ 808352C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -149,15 +149,15 @@ sub_808352C: @ 808352C
bl sub_8083614
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8083698
+ bl FieldEffectScript_CallNative
movs r0, 0x1
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_808352C
+ thumb_func_end FieldEffectCmd_loadfadedpal_callnative
- thumb_func_start sub_8083550
-sub_8083550: @ 8083550
+ thumb_func_start FieldEffectScript_ReadWord
+FieldEffectScript_ReadWord: @ 8083550
ldr r2, [r0]
ldrb r0, [r2]
ldrb r1, [r2, 0x1]
@@ -170,22 +170,22 @@ sub_8083550: @ 8083550
lsls r1, 24
adds r0, r1
bx lr
- thumb_func_end sub_8083550
+ thumb_func_end FieldEffectScript_ReadWord
- thumb_func_start sub_8083568
-sub_8083568: @ 8083568
+ thumb_func_start FieldEffectScript_LoadTiles
+FieldEffectScript_LoadTiles: @ 8083568
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8083550
+ bl FieldEffectScript_ReadWord
adds r5, r0, 0
ldrh r0, [r5, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _08083594 @ =0xffff0000
cmp r0, r1
bne _08083586
adds r0, r5, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
_08083586:
ldr r0, [r4]
adds r0, 0x4
@@ -195,7 +195,7 @@ _08083586:
bx r0
.align 2, 0
_08083594: .4byte 0xffff0000
- thumb_func_end sub_8083568
+ thumb_func_end FieldEffectScript_LoadTiles
thumb_func_start sub_8083598
sub_8083598: @ 8083598
@@ -221,7 +221,7 @@ _080835B8:
ldr r1, _080835C8 @ =gUnknown_20371F8
adds r0, r1
movs r1, 0x10
- bl sub_8071544
+ bl TintPalette_GrayScale
b _080835F6
.align 2, 0
_080835C8: .4byte gUnknown_20371F8
@@ -231,7 +231,7 @@ _080835CC:
ldr r1, _080835DC @ =gUnknown_20371F8
adds r0, r1
movs r1, 0x10
- bl sub_80715F4
+ bl TintPalette_SepiaTone
b _080835F6
.align 2, 0
_080835DC: .4byte gUnknown_20371F8
@@ -244,7 +244,7 @@ _080835E0:
ldr r1, _0808360C @ =gUnknown_20371F8
adds r0, r1
movs r1, 0x10
- bl sub_8071544
+ bl TintPalette_GrayScale
_080835F6:
lsls r1, r4, 5
ldr r0, _0808360C @ =gUnknown_20371F8
@@ -266,25 +266,25 @@ _08083610: .4byte gUnknown_20375F8
sub_8083614: @ 8083614
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8083550
+ bl FieldEffectScript_ReadWord
adds r5, r0, 0
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl sub_8008928
+ bl LoadSpritePalette
cmp r4, 0xFF
bne _08083642
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
bl sub_8083598
_08083642:
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
bl sub_807AA8C
@@ -300,19 +300,19 @@ _08083642:
sub_808365C: @ 808365C
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8083550
+ bl FieldEffectScript_ReadWord
adds r5, r0, 0
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl sub_8008928
+ bl LoadSpritePalette
cmp r4, 0xFF
beq _0808368A
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
bl sub_8083598
@@ -325,12 +325,12 @@ _0808368A:
bx r0
thumb_func_end sub_808365C
- thumb_func_start sub_8083698
-sub_8083698: @ 8083698
+ thumb_func_start FieldEffectScript_CallNative
+FieldEffectScript_CallNative: @ 8083698
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8083550
+ bl FieldEffectScript_ReadWord
bl _call_via_r0
str r0, [r5]
ldr r0, [r4]
@@ -339,46 +339,46 @@ sub_8083698: @ 8083698
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8083698
+ thumb_func_end FieldEffectScript_CallNative
- thumb_func_start sub_80836B4
-sub_80836B4: @ 80836B4
+ thumb_func_start FieldEffectFreeGraphicsResources
+FieldEffectFreeGraphicsResources: @ 80836B4
push {r4,r5,lr}
adds r1, r0, 0
adds r1, 0x40
ldrh r5, [r1]
ldrb r4, [r0, 0x5]
lsrs r4, 4
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0
- bl sub_80836F0
+ bl FieldEffectFreeTilesIfUnused
adds r0, r4, 0
- bl sub_8083754
+ bl FieldEffectFreePaletteIfUnused
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80836B4
+ thumb_func_end FieldEffectFreeGraphicsResources
- thumb_func_start sub_80836D8
-sub_80836D8: @ 80836D8
+ thumb_func_start FieldEffectStop
+FieldEffectStop: @ 80836D8
push {r4,lr}
lsls r4, r1, 24
lsrs r4, 24
- bl sub_80836B4
+ bl FieldEffectFreeGraphicsResources
adds r0, r4, 0
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80836D8
+ thumb_func_end FieldEffectStop
- thumb_func_start sub_80836F0
-sub_80836F0: @ 80836F0
+ thumb_func_start FieldEffectFreeTilesIfUnused
+FieldEffectFreeTilesIfUnused: @ 80836F0
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_800885C
+ bl GetSpriteTileTagByTileStart
lsls r0, 16
lsrs r3, r0, 16
ldr r0, _0808374C @ =0x0000ffff
@@ -415,7 +415,7 @@ _08083734:
cmp r2, 0x3F
bls _0808370A
adds r0, r3, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_08083744:
pop {r4,r5}
pop {r0}
@@ -423,15 +423,15 @@ _08083744:
.align 2, 0
_0808374C: .4byte 0x0000ffff
_08083750: .4byte gUnknown_202063C
- thumb_func_end sub_80836F0
+ thumb_func_end FieldEffectFreeTilesIfUnused
- thumb_func_start sub_8083754
-sub_8083754: @ 8083754
+ thumb_func_start FieldEffectFreePaletteIfUnused
+FieldEffectFreePaletteIfUnused: @ 8083754
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_8008A20
+ bl GetSpritePaletteTagByPaletteNum
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _080837A4 @ =0x0000ffff
@@ -462,7 +462,7 @@ _0808378C:
cmp r2, 0x3F
bls _08083770
adds r0, r5, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0808379C:
pop {r4-r6}
pop {r0}
@@ -470,10 +470,10 @@ _0808379C:
.align 2, 0
_080837A4: .4byte 0x0000ffff
_080837A8: .4byte gUnknown_202063C
- thumb_func_end sub_8083754
+ thumb_func_end FieldEffectFreePaletteIfUnused
- thumb_func_start sub_80837AC
-sub_80837AC: @ 80837AC
+ thumb_func_start FieldEffectActiveListClear
+FieldEffectActiveListClear: @ 80837AC
push {r4,lr}
movs r2, 0
ldr r4, _080837CC @ =gUnknown_3000FC8
@@ -493,10 +493,10 @@ _080837B4:
bx r0
.align 2, 0
_080837CC: .4byte gUnknown_3000FC8
- thumb_func_end sub_80837AC
+ thumb_func_end FieldEffectActiveListClear
- thumb_func_start sub_80837D0
-sub_80837D0: @ 80837D0
+ thumb_func_start FieldEffectActiveListAdd
+FieldEffectActiveListAdd: @ 80837D0
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -521,10 +521,10 @@ _080837F6:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80837D0
+ thumb_func_end FieldEffectActiveListAdd
- thumb_func_start sub_80837FC
-sub_80837FC: @ 80837FC
+ thumb_func_start FieldEffectActiveListRemove
+FieldEffectActiveListRemove: @ 80837FC
push {r4,r5,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -551,10 +551,10 @@ _08083826:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80837FC
+ thumb_func_end FieldEffectActiveListRemove
- thumb_func_start sub_808382C
-sub_808382C: @ 808382C
+ thumb_func_start FieldEffectActiveListContains
+FieldEffectActiveListContains: @ 808382C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -579,7 +579,7 @@ _08083848:
_08083854:
pop {r1}
bx r1
- thumb_func_end sub_808382C
+ thumb_func_end FieldEffectActiveListContains
thumb_func_start sub_8083858
sub_8083858: @ 8083858
@@ -608,12 +608,12 @@ sub_8083858: @ 8083858
add r8, r4
mov r0, r8
adds r1, r7, 0
- bl sub_800EC5C
+ bl LoadCompressedObjectPaletteOverrideBuffer
ldr r0, _080838E4 @ =gUnknown_823957C
adds r4, r0
adds r0, r4, 0
adds r1, r7, 0
- bl sub_800EC00
+ bl LoadCompressedObjectPicOverrideBuffer
mov r1, sp
ldrh r0, [r4, 0x6]
movs r2, 0
@@ -638,7 +638,7 @@ sub_8083858: @ 8083858
adds r1, r5, 0
adds r2, r6, 0
mov r3, r9
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
add sp, 0x18
@@ -670,13 +670,13 @@ sub_80838F8: @ 80838F8
lsrs r4, 21
adds r0, r4, r0
ldr r0, [r0]
- bl sub_800EBC0
+ bl LZDecompressVram
ldr r0, _0808392C @ =gUnknown_8239A1C
adds r4, r0
ldr r0, [r4]
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -685,8 +685,8 @@ _08083928: .4byte gUnknown_823957C
_0808392C: .4byte gUnknown_8239A1C
thumb_func_end sub_80838F8
- thumb_func_start sub_8083930
-sub_8083930: @ 8083930
+ thumb_func_start AddNewGameBirchObject
+AddNewGameBirchObject: @ 8083930
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -698,7 +698,7 @@ sub_8083930: @ 8083930
lsls r6, 24
lsrs r6, 24
ldr r0, _08083968 @ =gUnknown_83CBE70
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _0808396C @ =gUnknown_83CBE84
lsls r4, 16
asrs r4, 16
@@ -707,7 +707,7 @@ sub_8083930: @ 8083930
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r4-r6}
@@ -716,7 +716,7 @@ sub_8083930: @ 8083930
.align 2, 0
_08083968: .4byte gUnknown_83CBE70
_0808396C: .4byte gUnknown_83CBE84
- thumb_func_end sub_8083930
+ thumb_func_end AddNewGameBirchObject
thumb_func_start sub_8083970
sub_8083970: @ 8083970
@@ -746,7 +746,7 @@ sub_8083970: @ 8083970
lsls r0, 16
lsrs r5, r0, 16
ldrh r0, [r4, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
@@ -789,7 +789,7 @@ sub_80839D4: @ 80839D4
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
mov r8, r0
lsls r4, 16
asrs r4, 16
@@ -811,7 +811,7 @@ sub_80839D4: @ 80839D4
lsrs r4, r0, 16
mov r1, r8
ldrh r0, [r1, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r0, 0x10
lsls r0, 24
lsrs r0, 24
@@ -851,7 +851,7 @@ sub_8083A5C: @ 8083A5C
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
_08083A7A:
adds r0, r5, 0
bl sub_810C214
@@ -997,13 +997,13 @@ _08083B88: .4byte gUnknown_20375F8
thumb_func_start sub_8083B8C
sub_8083B8C: @ 8083B8C
push {r4,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08083BC8 @ =sub_8083BD0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -1160,14 +1160,14 @@ sub_8083CA0: @ 8083CA0
cmp r0, 0x6
ble _08083CD2
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x19
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08083CDC @ =sub_8083BD0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08083CD2:
pop {r0}
bx r0
@@ -1179,13 +1179,13 @@ _08083CDC: .4byte sub_8083BD0
thumb_func_start sub_8083CE0
sub_8083CE0: @ 8083CE0
push {r4,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _08083D14 @ =sub_8083D1C
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -1327,14 +1327,14 @@ sub_8083DD4: @ 8083DD4
cmp r0, 0x6
ble _08083E06
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x3E
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08083E10 @ =sub_8083D1C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08083E06:
pop {r0}
bx r0
@@ -1362,7 +1362,7 @@ sub_8083E14: @ 8083E14
lsls r6, 16
lsrs r6, 16
ldr r0, _08083E68 @ =sub_8083E70
- bl sub_800704C
+ bl CreateInvisibleSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -1440,7 +1440,7 @@ _08083EA4:
lsls r2, 16
asrs r2, 16
movs r3, 0xFF
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r2, _08083F20 @ =gUnknown_202063C
@@ -1509,7 +1509,7 @@ sub_8083F24: @ 8083F24
beq _08083F54
movs r0, 0x80
lsls r0, 1
- bl sub_8071C60
+ bl PlayFanfare
_08083F54:
pop {r0}
bx r0
@@ -1551,7 +1551,7 @@ _08083F88:
ldr r3, _08084080 @ =0x00001007
mov r10, r3
mov r0, r10
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x84
@@ -1574,7 +1574,7 @@ _08083F88:
mov r0, r8
ands r4, r0
mov r0, r10
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x83
@@ -1593,7 +1593,7 @@ _08083F88:
mov r3, r8
ands r4, r3
mov r0, r10
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x81
@@ -1611,7 +1611,7 @@ _08083F88:
lsls r4, 24
lsrs r4, 24
mov r0, r10
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r3, _08084090 @ =0x01050000
@@ -1628,7 +1628,7 @@ _08083F88:
adds r3, r4, 0
bl sub_8083A88
mov r0, r10
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r1, _08084094 @ =0x01030000
@@ -1698,7 +1698,7 @@ _080840C8:
lsrs r4, 24
ldr r0, _08084174 @ =0x00001007
mov r8, r0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x84
@@ -1719,7 +1719,7 @@ _080840C8:
adds r3, r4, 0
bl sub_8083A88
mov r0, r8
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x83
@@ -1731,7 +1731,7 @@ _080840C8:
adds r3, r4, 0
bl sub_8083A88
mov r0, r8
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
movs r1, 0x81
@@ -1743,7 +1743,7 @@ _080840C8:
adds r3, r4, 0
bl sub_8083A88
mov r0, r8
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r1, _08084184 @ =0x01050000
@@ -1754,7 +1754,7 @@ _080840C8:
adds r3, r4, 0
bl sub_8083A88
mov r0, r8
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r1, _08084188 @ =0x01030000
@@ -1812,7 +1812,7 @@ sub_80841B0: @ 80841B0
ldrsh r0, [r4, r1]
cmp r0, 0
beq _080841C6
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _080841CC
@@ -1847,7 +1847,7 @@ sub_80841D8: @ 80841D8
cmp r0, 0x4
ble _080841F8
adds r0, r3, 0
- bl sub_80836B4
+ bl FieldEffectFreeGraphicsResources
_080841F8:
pop {r0}
bx r0
@@ -1867,7 +1867,7 @@ sub_8084200: @ 8084200
asrs r2, 16
adds r1, r3, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -1912,7 +1912,7 @@ sub_808424C: @ 808424C
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_08084270:
adds r0, r4, 0
adds r0, 0x3F
@@ -1922,7 +1922,7 @@ _08084270:
cmp r0, 0
beq _08084284
adds r0, r4, 0
- bl sub_80836B4
+ bl FieldEffectFreeGraphicsResources
_08084284:
pop {r4}
pop {r0}
@@ -1941,7 +1941,7 @@ sub_808428C: @ 808428C
asrs r2, 16
adds r1, r3, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
pop {r0}
bx r0
.align 2, 0
@@ -1959,7 +1959,7 @@ sub_80842AC: @ 80842AC
cmp r0, 0
beq _080842C2
adds r0, r2, 0
- bl sub_80836B4
+ bl FieldEffectFreeGraphicsResources
_080842C2:
pop {r0}
bx r0
@@ -1968,40 +1968,40 @@ _080842C2:
thumb_func_start sub_80842C8
sub_80842C8: @ 80842C8
push {lr}
- ldr r0, _080842DC @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080842DC @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
ldr r1, _080842E0 @ =gUnknown_3005020
- ldr r0, _080842E4 @ =sub_80842E8
+ ldr r0, _080842E4 @ =mapldr_080842E8
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
-_080842DC: .4byte sub_80567DC
+_080842DC: .4byte c2_exit_to_overworld_2_switch
_080842E0: .4byte gUnknown_3005020
-_080842E4: .4byte sub_80842E8
+_080842E4: .4byte mapldr_080842E8
thumb_func_end sub_80842C8
- thumb_func_start sub_80842E8
-sub_80842E8: @ 80842E8
+ thumb_func_start mapldr_080842E8
+mapldr_080842E8: @ 80842E8
push {lr}
bl sub_807DC00
- ldr r0, _08084308 @ =sub_8084310
+ ldr r0, _08084308 @ =task00_8084310
movs r1, 0
- bl sub_807741C
- bl sub_8069940
- bl sub_8068974
+ bl CreateTask
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r1, _0808430C @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
-_08084308: .4byte sub_8084310
+_08084308: .4byte task00_8084310
_0808430C: .4byte gUnknown_3005020
- thumb_func_end sub_80842E8
+ thumb_func_end mapldr_080842E8
- thumb_func_start sub_8084310
-sub_8084310: @ 8084310
+ thumb_func_start task00_8084310
+task00_8084310: @ 8084310
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -2028,25 +2028,25 @@ sub_8084310: @ 8084310
str r6, [r1]
_08084344:
movs r0, 0x1F
- bl sub_8083444
+ bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_08084350:
movs r0, 0x1F
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08084376
bl sub_8054CA0
- bl sub_8055378
+ bl warp_in
ldr r0, _08084384 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _08084388 @ =gUnknown_3005020
- ldr r0, _0808438C @ =sub_8084390
+ ldr r0, _0808438C @ =mapldr_08084390
str r0, [r1]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08084376:
pop {r4-r6}
pop {r0}
@@ -2056,17 +2056,17 @@ _0808437C: .4byte gUnknown_3005090
_08084380: .4byte gUnknown_20386E0
_08084384: .4byte sub_805671C
_08084388: .4byte gUnknown_3005020
-_0808438C: .4byte sub_8084390
- thumb_func_end sub_8084310
+_0808438C: .4byte mapldr_08084390
+ thumb_func_end task00_8084310
- thumb_func_start sub_8084390
-sub_8084390: @ 8084390
+ thumb_func_start mapldr_08084390
+mapldr_08084390: @ 8084390
push {r4,lr}
bl sub_8055DC4
bl sub_807DC00
- ldr r0, _080843E8 @ =sub_80843F8
+ ldr r0, _080843E8 @ =c3_080843F8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r4, _080843EC @ =gUnknown_2036E38
ldr r3, _080843F0 @ =gUnknown_2037078
ldrb r1, [r3, 0x5]
@@ -2089,10 +2089,10 @@ sub_8084390: @ 8084390
lsls r0, 2
adds r0, r4
movs r1, 0x3
- bl sub_805F218
+ bl FieldObjectTurn
_080843D2:
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r1, _080843F4 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
@@ -2100,14 +2100,14 @@ _080843D2:
pop {r0}
bx r0
.align 2, 0
-_080843E8: .4byte sub_80843F8
+_080843E8: .4byte c3_080843F8
_080843EC: .4byte gUnknown_2036E38
_080843F0: .4byte gUnknown_2037078
_080843F4: .4byte gUnknown_3005020
- thumb_func_end sub_8084390
+ thumb_func_end mapldr_08084390
- thumb_func_start sub_80843F8
-sub_80843F8: @ 80843F8
+ thumb_func_start c3_080843F8
+c3_080843F8: @ 80843F8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -2128,20 +2128,20 @@ sub_80843F8: @ 80843F8
cmp r0, 0
bne _08084444
movs r0, 0x20
- bl sub_8083444
+ bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
_0808442A:
movs r0, 0x20
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08084444
- bl sub_806994C
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08084444:
pop {r4,r5}
pop {r0}
@@ -2149,7 +2149,7 @@ _08084444:
.align 2, 0
_0808444C: .4byte gUnknown_3005090
_08084450: .4byte gUnknown_2037AB8
- thumb_func_end sub_80843F8
+ thumb_func_end c3_080843F8
thumb_func_start sub_8084454
sub_8084454: @ 8084454
@@ -2157,11 +2157,11 @@ sub_8084454: @ 8084454
bl sub_8055DC4
bl sub_807DB58
bl sub_8111CF0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r0, _0808447C @ =sub_8084484
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, _08084480 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
@@ -2223,7 +2223,7 @@ sub_80844BC: @ 80844BC
lsls r4, 2
ldr r0, _08084560 @ =gUnknown_202063C
adds r4, r0
- bl sub_805FAF8
+ bl CameraObjectReset2
ldrb r1, [r6, 0x5]
lsls r0, r1, 3
adds r0, r1
@@ -2235,7 +2235,7 @@ sub_80844BC: @ 80844BC
strb r1, [r0, 0x1]
movs r0, 0x1
strb r0, [r6, 0x6]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
@@ -2465,7 +2465,7 @@ sub_80846AC: @ 80846AC
strh r1, [r0, 0xA]
strh r2, [r0, 0xC]
movs r0, 0
- bl sub_805ADD4
+ bl SetCameraPanningCallback
movs r0, 0x1
pop {r1}
bx r1
@@ -2478,7 +2478,7 @@ sub_80846C8: @ 80846C8
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
ldrh r0, [r4, 0xA]
negs r2, r0
strh r2, [r4, 0xA]
@@ -2514,15 +2514,15 @@ sub_8084708: @ 8084708
ldr r1, _08084778 @ =gUnknown_2037078
movs r0, 0
strb r0, [r1, 0x6]
- bl sub_806994C
- bl sub_805FAA8
- bl sub_8068A5C
- bl sub_805ADF8
+ bl ScriptContext2_Disable
+ bl CameraObjectReset1
+ bl UnfreezeMapObjects
+ bl InstallCameraPanAheadCallback
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -2545,10 +2545,10 @@ sub_8084708: @ 8084708
bl sub_812B1F0
_08084760:
ldr r0, _08084780 @ =sub_8084484
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
add sp, 0x4
pop {r4}
@@ -2569,7 +2569,7 @@ sub_8084784: @ 8084784
lsls r1, 24
lsrs r1, 24
ldr r0, _080847B8 @ =sub_80847C0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080847BC @ =gUnknown_3005090
@@ -2626,8 +2626,8 @@ _080847F4: .4byte gUnknown_83CC050
sub_80847F8: @ 80847F8
push {r4,lr}
adds r4, r0, 0
- bl sub_8068974
- bl sub_805FAF8
+ bl player_bitmagic
+ bl CameraObjectReset2
ldrb r0, [r4, 0xA]
bl sub_809C448
movs r0, 0x1
@@ -2653,17 +2653,17 @@ sub_8084820: @ 8084820
ldr r1, _0808488C @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808484A
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808487E
_0808484A:
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
@@ -2770,12 +2770,12 @@ sub_80848F8: @ 80848F8
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x84
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x94
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0xE]
adds r0, 0x1
@@ -2810,12 +2810,12 @@ sub_8084944: @ 8084944
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x7C
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xC
ldrsh r1, [r5, r0]
movs r0, 0x76
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0xE]
adds r0, 0x1
@@ -2860,17 +2860,17 @@ sub_80849A0: @ 80849A0
cmp r0, 0x1
bne _080849DC
bl sub_809C460
- bl sub_8055378
+ bl warp_in
ldr r1, _080849E4 @ =gUnknown_3005020
ldr r0, _080849E8 @ =sub_80849F4
str r0, [r1]
ldr r0, _080849EC @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080849F0 @ =sub_80847C0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080849DC:
pop {r0}
bx r0
@@ -2888,11 +2888,11 @@ sub_80849F4: @ 80849F4
bl sub_8055DC4
bl sub_807DB58
bl sub_8111CF0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r0, _08084A1C @ =sub_8084A24
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, _08084A20 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
@@ -2938,7 +2938,7 @@ sub_8084A5C: @ 8084A5C
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
- bl sub_805FAF8
+ bl CameraObjectReset2
ldr r0, _08084ABC @ =gUnknown_2037078
ldrb r0, [r0, 0x5]
lsls r4, r0, 3
@@ -2957,7 +2957,7 @@ sub_8084A5C: @ 8084A5C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -3006,12 +3006,12 @@ sub_8084AD8: @ 8084AD8
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x84
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x94
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -3039,12 +3039,12 @@ sub_8084B18: @ 8084B18
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x84
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x24]
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x94
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x26]
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -3089,12 +3089,12 @@ sub_8084B78: @ 8084B78
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x7C
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r0, 0xA
ldrsh r1, [r5, r0]
movs r0, 0x76
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -3122,12 +3122,12 @@ sub_8084BB8: @ 8084BB8
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x7C
- bl sub_8044E4C
+ bl Cos
strh r0, [r5, 0x24]
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0x76
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x26]
ldrh r0, [r4, 0xC]
adds r0, 0x1
@@ -3192,13 +3192,13 @@ sub_8084C3C: @ 8084C3C
ldr r1, _08084C98 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08084C8A
- bl sub_805FAA8
- bl sub_806994C
- bl sub_8068A5C
+ bl CameraObjectReset1
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
movs r0, 0x4
bl sub_8063F84
adds r1, r0, 0
@@ -3207,10 +3207,10 @@ sub_8084C3C: @ 8084C3C
adds r0, r4, 0
bl sub_8063CA4
ldr r0, _08084C9C @ =sub_8084A24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x2
bl sub_81128BC
_08084C8A:
@@ -3224,13 +3224,13 @@ _08084C98: .4byte gUnknown_2036E38
_08084C9C: .4byte sub_8084A24
thumb_func_end sub_8084C3C
- thumb_func_start sub_8084CA0
-sub_8084CA0: @ 8084CA0
+ thumb_func_start oei_waterfall
+oei_waterfall: @ 8084CA0
push {r4,lr}
ldr r4, _08084CCC @ =sub_8084CD8
adds r0, r4, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08084CD0 @ =gUnknown_3005090
@@ -3250,7 +3250,7 @@ sub_8084CA0: @ 8084CA0
_08084CCC: .4byte sub_8084CD8
_08084CD0: .4byte gUnknown_3005090
_08084CD4: .4byte gUnknown_20386E0
- thumb_func_end sub_8084CA0
+ thumb_func_end oei_waterfall
thumb_func_start sub_8084CD8
sub_8084CD8: @ 8084CD8
@@ -3295,7 +3295,7 @@ _08084D20: .4byte gUnknown_2036E38
sub_8084D24: @ 8084D24
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _08084D40 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -3310,25 +3310,25 @@ sub_8084D24: @ 8084D24
_08084D40: .4byte gUnknown_2037078
thumb_func_end sub_8084D24
- thumb_func_start sub_8084D44
-sub_8084D44: @ 8084D44
+ thumb_func_start waterfall_1_do_anim_probably
+waterfall_1_do_anim_probably: @ 8084D44
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
adds r0, r5, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _08084D74
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
ldr r1, _08084D7C @ =gUnknown_20386E0
movs r2, 0xA
ldrsh r0, [r4, r2]
str r0, [r1]
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -3339,14 +3339,14 @@ _08084D74:
bx r1
.align 2, 0
_08084D7C: .4byte gUnknown_20386E0
- thumb_func_end sub_8084D44
+ thumb_func_end waterfall_1_do_anim_probably
- thumb_func_start sub_8084D80
-sub_8084D80: @ 8084D80
+ thumb_func_start waterfall_2_wait_anim_finish_probably
+waterfall_2_wait_anim_finish_probably: @ 8084D80
push {r4,lr}
adds r4, r0, 0
movs r0, 0x6
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08084D9A
@@ -3361,7 +3361,7 @@ _08084D9C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8084D80
+ thumb_func_end waterfall_2_wait_anim_finish_probably
thumb_func_start sub_8084DA4
sub_8084DA4: @ 8084DA4
@@ -3390,7 +3390,7 @@ sub_8084DCC: @ 8084DCC
adds r5, r0, 0
adds r4, r1, 0
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
bne _08084DE2
@@ -3403,16 +3403,16 @@ _08084DE2:
lsrs r4, r0, 24
cmp r4, 0
bne _08084E18
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r0, _08084E10 @ =gUnknown_2037078
strb r4, [r0, 0x6]
ldr r0, _08084E14 @ =sub_8084CD8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x2B
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
movs r0, 0
b _08084E1E
.align 2, 0
@@ -3434,7 +3434,7 @@ sub_8084E24: @ 8084E24
ldr r4, _08084E54 @ =sub_8084E60
adds r0, r4, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08084E58 @ =gUnknown_3005090
@@ -3488,8 +3488,8 @@ _08084E90: .4byte gUnknown_83CC098
_08084E94: .4byte gUnknown_3005090
thumb_func_end sub_8084E60
- thumb_func_start sub_8084E98
-sub_8084E98: @ 8084E98
+ thumb_func_start dive_1_lock
+dive_1_lock: @ 8084E98
ldr r2, _08084EA8 @ =gUnknown_2037078
movs r1, 0x1
strb r1, [r2, 0x6]
@@ -3500,19 +3500,19 @@ sub_8084E98: @ 8084E98
bx lr
.align 2, 0
_08084EA8: .4byte gUnknown_2037078
- thumb_func_end sub_8084E98
+ thumb_func_end dive_1_lock
- thumb_func_start sub_8084EAC
-sub_8084EAC: @ 8084EAC
+ thumb_func_start dive_2_unknown
+dive_2_unknown: @ 8084EAC
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _08084ED0 @ =gUnknown_20386E0
movs r2, 0x26
ldrsh r0, [r4, r2]
str r0, [r1]
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -3522,18 +3522,18 @@ sub_8084EAC: @ 8084EAC
bx r1
.align 2, 0
_08084ED0: .4byte gUnknown_20386E0
- thumb_func_end sub_8084EAC
+ thumb_func_end dive_2_unknown
- thumb_func_start sub_8084ED4
-sub_8084ED4: @ 8084ED4
+ thumb_func_start dive_3_unknown
+dive_3_unknown: @ 8084ED4
push {lr}
sub sp, 0x8
mov r1, sp
adds r1, 0x2
mov r0, sp
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r0, 0x6
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08084F18
@@ -3546,14 +3546,14 @@ sub_8084ED4: @ 8084ED4
adds r0, r2
ldrb r1, [r0, 0x1E]
mov r0, sp
- bl sub_806DF3C
+ bl dive_warp
ldr r0, _08084F28 @ =sub_8084E60
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x2C
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
_08084F18:
movs r0, 0
add sp, 0x8
@@ -3563,7 +3563,7 @@ _08084F18:
_08084F20: .4byte gUnknown_2036E38
_08084F24: .4byte gUnknown_2037078
_08084F28: .4byte sub_8084E60
- thumb_func_end sub_8084ED4
+ thumb_func_end dive_3_unknown
thumb_func_start sub_8084F2C
sub_8084F2C: @ 8084F2C
@@ -3572,7 +3572,7 @@ sub_8084F2C: @ 8084F2C
lsls r1, 24
lsrs r1, 24
ldr r0, _08084F40 @ =sub_8084F44
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -3630,10 +3630,10 @@ sub_8084FA0: @ 8084FA0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8068974
- bl sub_805FAF8
+ bl player_bitmagic
+ bl CameraObjectReset2
movs r0, 0
- bl sub_805ADD4
+ bl SetCameraPanningCallback
ldr r0, _08084FD4 @ =gUnknown_2037078
movs r2, 0x1
strb r2, [r0, 0x6]
@@ -3660,7 +3660,7 @@ sub_8084FD8: @ 8084FD8
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
ldrh r0, [r4, 0xA]
negs r0, r0
strh r0, [r4, 0xA]
@@ -3708,7 +3708,7 @@ sub_808500C: @ 808500C
lsrs r0, 30
str r0, [r3, 0xC]
movs r0, 0x32
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0xAB
bl sub_80722CC
ldrh r0, [r4, 0x8]
@@ -3731,7 +3731,7 @@ sub_8085058: @ 8085058
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
ldrh r0, [r4, 0xA]
negs r2, r0
strh r2, [r4, 0xA]
@@ -3883,17 +3883,17 @@ sub_8085168: @ 8085168
lsrs r0, 24
cmp r0, 0x1
bne _080851A0
- bl sub_8055378
+ bl warp_in
ldr r1, _080851AC @ =gUnknown_3005020
- ldr r0, _080851B0 @ =sub_80851BC
+ ldr r0, _080851B0 @ =mapldr_080851BC
str r0, [r1]
ldr r0, _080851B4 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080851B8 @ =sub_8084F44
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080851A0:
movs r0, 0
pop {r1}
@@ -3901,29 +3901,29 @@ _080851A0:
.align 2, 0
_080851A8: .4byte gUnknown_2037AB8
_080851AC: .4byte gUnknown_3005020
-_080851B0: .4byte sub_80851BC
+_080851B0: .4byte mapldr_080851BC
_080851B4: .4byte sub_805671C
_080851B8: .4byte sub_8084F44
thumb_func_end sub_8085168
- thumb_func_start sub_80851BC
-sub_80851BC: @ 80851BC
+ thumb_func_start mapldr_080851BC
+mapldr_080851BC: @ 80851BC
push {lr}
bl sub_8055DC4
bl sub_807DB58
bl sub_8111CF0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _080851E0 @ =gUnknown_3005020
movs r1, 0
str r1, [r0]
ldr r0, _080851E4 @ =sub_80851E8
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
_080851E0: .4byte gUnknown_3005020
_080851E4: .4byte sub_80851E8
- thumb_func_end sub_80851BC
+ thumb_func_end mapldr_080851BC
thumb_func_start sub_80851E8
sub_80851E8: @ 80851E8
@@ -3976,8 +3976,8 @@ sub_8085244: @ 8085244
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_805FAF8
- bl sub_8068974
+ bl CameraObjectReset2
+ bl player_bitmagic
ldr r1, _08085270 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4023,7 +4023,7 @@ sub_8085274: @ 8085274
lsrs r0, 30
str r0, [r1, 0xC]
movs r0, 0x31
- bl sub_8083444
+ bl FieldEffectStart
strh r0, [r4, 0xA]
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -4061,7 +4061,7 @@ sub_80852C0: @ 80852C0
negs r0, r0
ands r0, r1
strb r0, [r4, 0x1]
- bl sub_805FAA8
+ bl CameraObjectReset1
movs r0, 0xA8
bl sub_80722CC
movs r0, 0x4
@@ -4084,20 +4084,20 @@ _08085310: .4byte gUnknown_202063C
sub_8085314: @ 8085314
push {lr}
adds r0, r1, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808533E
ldr r1, _08085344 @ =gUnknown_2037078
movs r0, 0
strb r0, [r1, 0x6]
- bl sub_806994C
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
ldr r0, _08085348 @ =sub_80851E8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0808533E:
movs r0, 0
pop {r1}
@@ -4124,7 +4124,7 @@ sub_808534C: @ 808534C
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, _080853AC @ =gUnknown_202063C
@@ -4168,7 +4168,7 @@ sub_80853B0: @ 80853B0
beq _080853C8
adds r0, r2, 0
movs r1, 0x32
- bl sub_80836D8
+ bl FieldEffectStop
_080853C8:
pop {r0}
bx r0
@@ -4181,7 +4181,7 @@ sub_80853CC: @ 80853CC
lsls r1, 24
lsrs r1, 24
ldr r0, _080853E0 @ =sub_80853E4
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -4239,8 +4239,8 @@ sub_8085440: @ 8085440
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_8068974
- bl sub_805FAF8
+ bl player_bitmagic
+ bl CameraObjectReset2
ldr r1, _0808546C @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4266,7 +4266,7 @@ sub_8085470: @ 8085470
adds r4, r1, 0
adds r6, r2, 0
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080854E4
@@ -4292,7 +4292,7 @@ sub_8085470: @ 8085470
lsrs r0, 30
str r0, [r1, 0xC]
movs r0, 0x31
- bl sub_8083444
+ bl FieldEffectStart
strh r0, [r5, 0xA]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -4306,7 +4306,7 @@ _080854C4:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806429C
+ bl GetStepInPlaceDelay4AnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4358,7 +4358,7 @@ sub_8085524: @ 8085524
push {r4,lr}
adds r4, r0, 0
movs r0, 0x31
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08085542
@@ -4388,17 +4388,17 @@ sub_808554C: @ 808554C
lsrs r0, 24
cmp r0, 0x1
bne _08085584
- bl sub_8055378
+ bl warp_in
ldr r1, _08085590 @ =gUnknown_3005020
ldr r0, _08085594 @ =sub_8084454
str r0, [r1]
ldr r0, _08085598 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0808559C @ =sub_80853E4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08085584:
movs r0, 0
pop {r1}
@@ -4428,7 +4428,7 @@ sub_80855A0: @ 80855A0
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, _08085600 @ =gUnknown_202063C
@@ -4472,7 +4472,7 @@ sub_8085604: @ 8085604
beq _0808561C
adds r0, r2, 0
movs r1, 0x31
- bl sub_80836D8
+ bl FieldEffectStop
_0808561C:
pop {r0}
bx r0
@@ -4481,11 +4481,11 @@ _0808561C:
thumb_func_start sub_8085620
sub_8085620: @ 8085620
push {lr}
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r0, _08085638 @ =sub_808563C
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -4527,7 +4527,7 @@ sub_808566C: @ 808566C
strh r0, [r4, 0x8]
movs r0, 0x40
strh r0, [r4, 0x22]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -4610,19 +4610,19 @@ _08085702:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
bl sub_80555E0
- bl sub_8055378
+ bl warp_in
ldr r1, _0808575C @ =gUnknown_3005020
ldr r0, _08085760 @ =sub_80859D4
str r0, [r1]
ldr r0, _08085764 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _08085768 @ =sub_808563C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08085750:
pop {r4-r6}
pop {r0}
@@ -4641,12 +4641,12 @@ sub_808576C: @ 808576C
adds r4, r0, 0
adds r6, r1, 0
adds r5, r2, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808578A
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080857E4
@@ -4735,7 +4735,7 @@ _0808581C:
beq _08085896
b _0808589A
_08085826:
- bl sub_805FAF8
+ bl CameraObjectReset2
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -4840,7 +4840,7 @@ _080858DC:
beq _080859BE
b _080859C2
_080858E6:
- bl sub_805FAF8
+ bl CameraObjectReset2
movs r2, 0x58
negs r2, r2
adds r0, r2, 0
@@ -4943,7 +4943,7 @@ _0808599C:
blt _080859C2
movs r0, 0x1E
bl sub_80722CC
- bl sub_805FAA8
+ bl CameraObjectReset1
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -4968,8 +4968,8 @@ sub_80859D4: @ 80859D4
bl sub_8055DC4
bl sub_807DB58
bl sub_8111CF0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r1, _08085A14 @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
@@ -4986,7 +4986,7 @@ sub_80859D4: @ 80859D4
strb r1, [r0, 0x1]
ldr r0, _08085A20 @ =sub_8085A24
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -5031,7 +5031,7 @@ sub_8085A54: @ 8085A54
beq _08085A78
movs r0, 0x28
bl sub_80722CC
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5125,7 +5125,7 @@ _08085B10:
cmp r1, r0
bne _08085B58
adds r0, r6, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5140,13 +5140,13 @@ _08085B10:
negs r0, r0
ands r0, r1
strb r0, [r6, 0x3]
- bl sub_806994C
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
ldr r0, _08085B60 @ =sub_8085A24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08085B58:
add sp, 0x8
pop {r4-r7}
@@ -5161,7 +5161,7 @@ sub_8085B64: @ 8085B64
push {lr}
ldr r0, _08085B74 @ =sub_8085B78
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -5197,10 +5197,10 @@ _08085BA4: .4byte gUnknown_3005090
sub_8085BA8: @ 8085BA8
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
- bl sub_8068974
- bl sub_805FAF8
- bl sub_805C6C4
+ bl ScriptContext2_Enable
+ bl player_bitmagic
+ bl CameraObjectReset2
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5245,7 +5245,7 @@ _08085C02:
add r0, sp
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0x8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xC]
@@ -5321,7 +5321,7 @@ sub_8085C60: @ 8085C60
add r0, sp
ldrb r1, [r0]
adds r0, r3, 0
- bl sub_805F218
+ bl FieldObjectTurn
_08085CAA:
ldrh r0, [r5, 0x22]
ldrh r1, [r4, 0xE]
@@ -5405,18 +5405,18 @@ sub_8085D34: @ 8085D34
lsrs r0, 24
cmp r0, 0x1
bne _08085D70
- bl sub_80554A4
- bl sub_8055378
+ bl copy_saved_warp3_bank_and_enter_x_to_warp1
+ bl warp_in
ldr r0, _08085D78 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _08085D7C @ =gUnknown_3005020
ldr r0, _08085D80 @ =sub_8085D88
str r0, [r1]
ldr r0, _08085D84 @ =sub_8085B78
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08085D70:
pop {r0}
bx r0
@@ -5434,8 +5434,8 @@ sub_8085D88: @ 8085D88
bl sub_8055DC4
bl sub_807DB58
bl sub_8111CF0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r1, _08085DCC @ =gUnknown_3005020
movs r0, 0
str r0, [r1]
@@ -5450,10 +5450,10 @@ sub_8085D88: @ 8085D88
movs r2, 0x20
orrs r1, r2
strb r1, [r0, 0x1]
- bl sub_805FAF8
+ bl CameraObjectReset2
ldr r0, _08085DD8 @ =sub_8085DDC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -5540,7 +5540,7 @@ sub_8085E0C: @ 8085E0C
ldrb r0, [r2]
lsrs r0, 6
strh r0, [r6, 0x24]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -5670,7 +5670,7 @@ _08085F5A:
add r0, sp
ldrb r1, [r0]
adds r0, r6, 0
- bl sub_805F218
+ bl FieldObjectTurn
_08085F7C:
movs r1, 0x26
ldrsh r0, [r5, r1]
@@ -5718,7 +5718,7 @@ sub_8085F9C: @ 8085F9C
add r0, sp
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0x8
strh r0, [r4, 0xA]
ldrh r0, [r4, 0xC]
@@ -5735,14 +5735,14 @@ sub_8085F9C: @ 8085F9C
lsrs r0, 28
cmp r1, r0
bne _08086010
- bl sub_806994C
- bl sub_805FAA8
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl CameraObjectReset1
+ bl UnfreezeMapObjects
ldr r0, _08086024 @ =sub_8085DDC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08086010:
add sp, 0x8
pop {r4,r5}
@@ -5758,10 +5758,10 @@ _08086024: .4byte sub_8085DDC
thumb_func_start sub_8086028
sub_8086028: @ 8086028
push {r4,lr}
- bl sub_8056188
+ bl sav1_map_get_light_level
lsls r0, 24
lsrs r0, 24
- bl sub_80561D8
+ bl is_light_level_1_2_3_5_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5774,7 +5774,7 @@ _08086048:
ldr r0, _08086078 @ =sub_8086468
_0808604A:
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r2, _0808607C @ =gUnknown_20386E0
@@ -5817,23 +5817,23 @@ sub_8086084: @ 8086084
adds r4, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x8]
ldr r0, [r5]
orrs r0, r6
str r0, [r5]
movs r0, 0x6
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x3B
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
movs r0, 0
pop {r4-r6}
pop {r1}
@@ -5873,16 +5873,16 @@ sub_8086110: @ 8086110
push {r4,lr}
adds r4, r0, 0
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x1E]
movs r0, 0x4A
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x20]
adds r0, r4, 0
adds r0, 0x22
ldr r1, _08086170 @ =gUnknown_30030F0
ldr r1, [r1, 0xC]
- bl sub_8044F34
+ bl StoreWordInTwoHalfwords
ldr r1, _08086174 @ =0x0000f0f1
strh r1, [r4, 0xA]
ldr r0, _08086178 @ =0x00005051
@@ -5892,18 +5892,18 @@ sub_8086110: @ 8086110
movs r0, 0x3E
strh r0, [r4, 0x10]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x10]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0808617C @ =sub_80863C0
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -5925,14 +5925,14 @@ sub_8086180: @ 8086180
sub sp, 0x4
mov r8, r0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r4, r0, 0
lsls r4, 16
lsrs r4, 18
lsls r4, 30
lsrs r4, 16
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r5, r0, 0
lsls r5, 16
lsrs r5, 24
@@ -5956,7 +5956,7 @@ sub_8086180: @ 8086180
ldr r0, _080861F8 @ =gUnknown_83CB7F0
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r5, 0
bl sub_8086428
mov r1, r8
@@ -6134,7 +6134,7 @@ sub_808630C: @ 808630C
sub sp, 0x4
adds r4, r0, 0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
lsls r1, 16
lsrs r1, 24
@@ -6174,17 +6174,17 @@ sub_8086358: @ 8086358
adds r4, r0, 0
adds r0, 0x22
mov r1, sp
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
ldr r0, [sp]
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_80F77B8
movs r0, 0x26
ldrsh r1, [r4, r0]
@@ -6198,12 +6198,12 @@ sub_8086358: @ 8086358
lsrs r1, 24
bl sub_8083A5C
movs r0, 0x6
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _080863BC @ =sub_80860E0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
add sp, 0x4
pop {r4}
pop {r0}
@@ -6218,7 +6218,7 @@ sub_80863C0: @ 80863C0
push {r4,lr}
sub sp, 0x4
ldr r0, _08086420 @ =sub_80860E0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -6229,27 +6229,27 @@ sub_80863C0: @ 80863C0
adds r0, r4, 0
adds r0, 0x22
mov r1, sp
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
ldr r0, [sp]
bl _call_via_r0
ldrh r1, [r4, 0xA]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x10]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x12]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x14]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x4
pop {r4}
pop {r0}
@@ -6324,17 +6324,17 @@ sub_8086498: @ 8086498
adds r4, r0, 0
ldrh r1, [r4, 0xA]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
adds r0, 0x22
ldr r1, _080864CC @ =gUnknown_30030F0
ldr r1, [r1, 0xC]
- bl sub_8044F34
+ bl StoreWordInTwoHalfwords
ldr r0, _080864D0 @ =sub_80866E0
- bl sub_80006F4
+ bl SetVBlankCallback
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -6355,14 +6355,14 @@ sub_80864D4: @ 80864D4
sub sp, 0x4
mov r9, r0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r5, r0, 0
lsls r5, 16
lsrs r5, 18
lsls r5, 30
lsrs r5, 16
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r4, r0, 0
lsls r4, 16
lsrs r4, 24
@@ -6389,7 +6389,7 @@ sub_80864D4: @ 80864D4
ldr r0, _08086550 @ =gUnknown_83CBB10
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r1, r9
ldrh r0, [r1, 0x8]
adds r0, 0x1
@@ -6416,7 +6416,7 @@ sub_8086554: @ 8086554
cmp r0, 0
beq _080865A6
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x12]
movs r1, 0xFF
ands r1, r0
@@ -6425,13 +6425,13 @@ sub_8086554: @ 8086554
adds r0, r2, 0
orrs r1, r0
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080865B4 @ =0x00002878
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, _080865B8 @ =gUnknown_202063C
movs r0, 0x26
ldrsh r1, [r4, r0]
@@ -6498,13 +6498,13 @@ sub_80865F0: @ 80865F0
ldr r5, _0808662C @ =0x0000ffff
movs r0, 0x42
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x12]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -6540,7 +6540,7 @@ sub_8086650: @ 8086650
sub sp, 0x8
adds r4, r0, 0
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
lsls r1, 16
lsrs r1, 24
@@ -6557,17 +6557,17 @@ sub_8086650: @ 8086650
adds r0, r4, 0
adds r0, 0x22
add r1, sp, 0x4
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
ldr r0, [sp, 0x4]
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_80F77B8
movs r0, 0x26
ldrsh r1, [r4, r0]
@@ -6581,12 +6581,12 @@ sub_8086650: @ 8086650
lsrs r1, 24
bl sub_8083A5C
movs r0, 0x6
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _080866DC @ =sub_8086468
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
add sp, 0x8
pop {r4}
pop {r0}
@@ -6602,7 +6602,7 @@ sub_80866E0: @ 80866E0
push {r4,lr}
sub sp, 0x4
ldr r0, _08086720 @ =sub_8086468
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -6613,15 +6613,15 @@ sub_80866E0: @ 80866E0
adds r0, r4, 0
adds r0, 0x22
mov r1, sp
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
ldr r0, [sp]
bl _call_via_r0
ldrh r1, [r4, 0xA]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x4
pop {r4}
pop {r0}
@@ -6877,14 +6877,14 @@ sub_80868C0: @ 80868C0
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
b _08086900
.align 2, 0
_080868F4: .4byte sub_8086904
_080868F8:
ldrh r0, [r1, 0x2E]
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_08086900:
pop {r0}
bx r0
@@ -6937,7 +6937,7 @@ sub_8086944: @ 8086944
push {r4,lr}
ldr r0, _08086980 @ =sub_8086990
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08086984 @ =gUnknown_3005090
@@ -6999,13 +6999,13 @@ sub_80869C0: @ 80869C0
mov r6, r8
push {r6}
adds r4, r0, 0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r5, _08086A18 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r5, 0x6]
movs r0, 0x8
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
adds r6, r4, 0
adds r6, 0xA
movs r0, 0xC
@@ -7013,7 +7013,7 @@ sub_80869C0: @ 80869C0
mov r8, r0
adds r0, r6, 0
mov r1, r8
- bl sub_805C538
+ bl PlayerGetDestCoords
ldr r2, _08086A1C @ =gUnknown_2036E38
ldrb r1, [r5, 0x5]
lsls r0, r1, 3
@@ -7024,7 +7024,7 @@ sub_80869C0: @ 80869C0
lsrs r0, 4
adds r1, r6, 0
mov r2, r8
- bl sub_8063A20
+ bl MoveCoords
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -7050,12 +7050,12 @@ sub_8086A20: @ 8086A20
ldr r1, _08086A68 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08086A4A
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086A5C
@@ -7087,7 +7087,7 @@ sub_8086A6C: @ 8086A6C
lsls r0, 2
ldr r1, _08086AAC @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _08086AA2
@@ -7099,7 +7099,7 @@ sub_8086A6C: @ 8086A6C
orrs r0, r1
str r0, [r2]
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -7118,7 +7118,7 @@ sub_8086AB4: @ 8086AB4
push {r4-r6,lr}
adds r6, r0, 0
movs r0, 0x6
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08086B1E
@@ -7137,7 +7137,7 @@ sub_8086AB4: @ 8086AB4
adds r0, r4, 0
bl sub_805F060
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_80641C0
@@ -7156,7 +7156,7 @@ sub_8086AB4: @ 8086AB4
ldrb r0, [r5, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
- bl sub_8083444
+ bl FieldEffectStart
strb r0, [r4, 0x1A]
ldrh r0, [r6, 0x8]
adds r0, 0x1
@@ -7182,7 +7182,7 @@ sub_8086B30: @ 8086B30
ldr r1, _08086BA0 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086B96
@@ -7203,15 +7203,15 @@ sub_8086B30: @ 8086B30
ldrb r0, [r4, 0x1A]
movs r1, 0x1
bl sub_80DC44C
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
movs r0, 0x9
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08086BA4 @ =sub_8086990
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x16
bl sub_812B1F0
_08086B96:
@@ -7237,7 +7237,7 @@ sub_8086BA8: @ 8086BA8
_08086BBA:
ldr r0, _08086BCC @ =sub_8086BD0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
movs r0, 0
pop {r1}
bx r1
@@ -7275,8 +7275,8 @@ _08086BFC: .4byte gUnknown_3005090
sub_8086C00: @ 8086C00
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r1, _08086C20 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -7302,12 +7302,12 @@ sub_8086C24: @ 8086C24
ldr r1, _08086C6C @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08086C4E
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086C60
@@ -7340,7 +7340,7 @@ sub_8086C70: @ 8086C70
ldr r1, _08086CA0 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086CEE
@@ -7385,7 +7385,7 @@ _08086CD2:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
ldrh r0, [r6, 0x8]
adds r0, 0x1
strh r0, [r6, 0x8]
@@ -7405,19 +7405,19 @@ sub_8086CF4: @ 8086CF4
lsls r0, 2
ldr r1, _08086D30 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086D26
movs r0, 0
strb r0, [r4, 0x6]
movs r0, 0x41
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08086D34 @ =sub_8086BD0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_08086D26:
pop {r4}
pop {r0}
@@ -7436,7 +7436,7 @@ sub_8086D38: @ 8086D38
movs r1, 0x78
movs r2, 0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -7479,13 +7479,13 @@ sub_8086D94: @ 8086D94
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x8C
- bl sub_8044E4C
+ bl Cos
movs r5, 0
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x48
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x4
@@ -7528,7 +7528,7 @@ _08086DF6:
ble _08086E06
adds r0, r4, 0
movs r1, 0x1E
- bl sub_80836D8
+ bl FieldEffectStop
_08086E06:
pop {r4,r5}
pop {r0}
@@ -7542,7 +7542,7 @@ sub_8086E10: @ 8086E10
push {lr}
ldr r0, _08086E34 @ =sub_8086E40
movs r1, 0xFE
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08086E38 @ =gUnknown_3005090
@@ -7599,12 +7599,12 @@ sub_8086E70: @ 8086E70
ldr r1, _08086EC4 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08086E9A
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086EB8
@@ -7613,7 +7613,7 @@ _08086E9A:
strh r0, [r5, 0x26]
movs r0, 0x1
strb r0, [r6, 0x6]
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
bl sub_805CB70
adds r0, r4, 0
movs r1, 0x45
@@ -7641,7 +7641,7 @@ sub_8086EC8: @ 8086EC8
lsls r0, 2
ldr r1, _08086F04 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086EF8
@@ -7653,7 +7653,7 @@ sub_8086EC8: @ 8086EC8
ldrsh r0, [r4, r2]
str r0, [r1]
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
_08086EF8:
pop {r4}
pop {r0}
@@ -7669,7 +7669,7 @@ sub_8086F0C: @ 8086F0C
push {r4,r5,lr}
adds r4, r0, 0
movs r0, 0x6
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08086F54
@@ -7765,7 +7765,7 @@ sub_8086FA8: @ 8086FA8
bne _08086FEC
_08086FCE:
adds r0, r2, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08086FEC
@@ -7817,7 +7817,7 @@ sub_8086FFC: @ 8086FFC
ldr r1, _08087068 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x16
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r0, [r4, 0x1]
movs r1, 0x10
orrs r0, r1
@@ -7859,7 +7859,7 @@ sub_808706C: @ 808706C
ldr r0, _08087108 @ =gUnknown_2036E38
adds r4, r0
adds r0, r4, 0
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
ldrb r1, [r4, 0x1]
movs r0, 0x11
negs r0, r0
@@ -7887,7 +7887,7 @@ sub_808706C: @ 808706C
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0xA
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -7905,7 +7905,7 @@ sub_808706C: @ 808706C
adds r0, r4
ldr r1, _08087114 @ =sub_8087828
str r1, [r0]
- bl sub_805FAF8
+ bl CameraObjectReset2
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
@@ -7950,12 +7950,12 @@ sub_8087138: @ 8087138
cmp r0, 0
bne _0808715A
movs r0, 0x1F
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08087164 @ =sub_8086E40
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0808715A:
pop {r0}
bx r0
@@ -7972,7 +7972,7 @@ sub_8087168: @ 8087168
movs r1, 0xFF
movs r2, 0xB4
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -8084,10 +8084,10 @@ sub_8087220: @ 8087220
ldr r0, _0808725C @ =gUnknown_83CC1CC
str r0, [r4, 0x10]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _08087260 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -8121,12 +8121,12 @@ _0808727A:
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r2, [r4, 0x32]
movs r0, 0x32
@@ -8153,14 +8153,14 @@ _080872B0:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
lsrs r1, 6
ldrb r2, [r4, 0x3]
lsrs r2, 6
adds r0, r4, 0
movs r3, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
_080872E2:
pop {r4}
pop {r0}
@@ -8177,13 +8177,13 @@ sub_80872F0: @ 80872F0
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0x8C
- bl sub_8044E4C
+ bl Cos
movs r5, 0
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x48
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x4
@@ -8251,10 +8251,10 @@ sub_8087364: @ 8087364
ldr r0, _080873A0 @ =gUnknown_83CC1CC
str r0, [r4, 0x10]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080873A4 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -8296,12 +8296,12 @@ _080873C4:
movs r3, 0x30
ldrsh r0, [r4, r3]
movs r1, 0x20
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x24]
movs r1, 0x30
ldrsh r0, [r4, r1]
movs r1, 0x78
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x32]
movs r2, 0x32
@@ -8344,7 +8344,7 @@ _08087420:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -8388,7 +8388,7 @@ sub_8087484: @ 8087484
push {lr}
ldr r0, _08087494 @ =sub_8087498
movs r1, 0xFE
- bl sub_807741C
+ bl CreateTask
movs r0, 0
pop {r1}
bx r1
@@ -8433,12 +8433,12 @@ sub_80874C8: @ 80874C8
ldr r1, _080875B8 @ =gUnknown_2036E38
adds r5, r0, r1
adds r0, r5, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080874F2
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080875AE
@@ -8452,7 +8452,7 @@ _080874F2:
strh r0, [r6, 0x26]
movs r0, 0x1
strb r0, [r4, 0x6]
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
ldrh r1, [r6, 0x26]
movs r0, 0x8
ands r0, r1
@@ -8469,10 +8469,10 @@ _0808751A:
lsrs r1, 24
adds r0, r5, 0
bl sub_805F060
- bl sub_805FAF8
+ bl CameraObjectReset2
adds r0, r5, 0
movs r1, 0x3
- bl sub_805F218
+ bl FieldObjectTurn
ldrb r1, [r5, 0x4]
lsls r0, r1, 4
adds r0, r1
@@ -8480,7 +8480,7 @@ _0808751A:
ldr r4, _080875BC @ =gUnknown_202063C
adds r0, r4
movs r1, 0x16
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r5, 0x1]
movs r0, 0x21
negs r0, r0
@@ -8508,7 +8508,7 @@ _0808751A:
lsls r2, 18
adds r1, r2
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0xA
ldrsh r1, [r6, r0]
lsls r0, r1, 4
@@ -8713,7 +8713,7 @@ sub_8087710: @ 8087710
lsls r0, 2
ldr r1, _08087744 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08087738
@@ -8747,7 +8747,7 @@ sub_8087748: @ 8087748
lsls r0, 2
ldr r1, _0808777C @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -8798,18 +8798,18 @@ _080877B4:
bl sub_805F060
adds r0, r4, 0
movs r1, 0x1
- bl sub_805F218
+ bl FieldObjectTurn
ldrh r0, [r5, 0x26]
strb r0, [r6]
movs r0, 0
strb r0, [r6, 0x6]
movs r0, 0x20
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _080877F8 @ =sub_8087498
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080877EA:
pop {r4-r7}
pop {r0}
@@ -8833,10 +8833,10 @@ sub_80877FC: @ 80877FC
ldr r0, _08087824 @ =gUnknown_83CC23C
str r0, [r4, 0x10]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
adds r1, r5, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -8851,13 +8851,13 @@ sub_8087828: @ 8087828
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r1, 0xB4
- bl sub_8044E4C
+ bl Cos
movs r5, 0
strh r0, [r4, 0x24]
movs r2, 0x32
ldrsh r0, [r4, r2]
movs r1, 0x48
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x2
@@ -8905,14 +8905,14 @@ _08087886:
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
lsrs r1, 6
ldrb r2, [r4, 0x3]
lsrs r2, 6
adds r0, r4, 0
movs r3, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
_080878B4:
pop {r4,r5}
pop {r0}
@@ -8951,17 +8951,17 @@ _080878EC:
ands r0, r5
strb r0, [r4, 0x1]
adds r0, r3, 0
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
lsrs r1, 6
ldrb r2, [r4, 0x3]
lsrs r2, 6
adds r0, r4, 0
movs r3, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _08087920 @ =sub_80872F0
str r0, [r4, 0x1C]
_08087916:
@@ -8982,7 +8982,7 @@ sub_8087924: @ 8087924
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080879BA
@@ -9012,10 +9012,10 @@ sub_8087924: @ 8087924
lsls r2, 16
asrs r2, 16
adds r0, r4, 0
- bl sub_805F700
+ bl npc_coords_shift
ldr r0, _080879CC @ =sub_80879D8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _080879D0 @ =gUnknown_3005090
@@ -9155,15 +9155,15 @@ _08087A78:
ldrh r0, [r5, 0x6]
strh r0, [r6, 0x22]
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
strb r0, [r4]
movs r0, 0x43
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
_08087AA8:
pop {r4-r7}
pop {r0}
@@ -9181,13 +9181,13 @@ sub_8087AB4: @ 8087AB4
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x8]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08087B04
ldr r0, _08087AFC @ =sub_8087BC0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08087B00 @ =gUnknown_3005090
@@ -9211,7 +9211,7 @@ _08087AFC: .4byte sub_8087BC0
_08087B00: .4byte gUnknown_3005090
_08087B04:
movs r0, 0x44
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
_08087B0A:
movs r0, 0
add sp, 0x4
@@ -9278,21 +9278,21 @@ _08087B54:
lsls r1, 16
asrs r1, 16
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
b _08087B8E
_08087B84:
movs r0, 0xA
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
_08087B8E:
- bl sub_805AE28
+ bl UpdateCameraPanning
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0
bne _08087BA0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08087BA0:
pop {r4,r5}
pop {r0}
@@ -9326,9 +9326,9 @@ sub_8087BC0: @ 8087BC0
lsls r4, 3
ldr r0, _08087BF8 @ =gUnknown_3005098
adds r4, r0
- bl sub_805ADF8
+ bl InstallCameraPanAheadCallback
movs r0, 0
- bl sub_805ADD4
+ bl SetCameraPanningCallback
ldr r1, _08087BFC @ =gUnknown_83CC244
movs r2, 0x2
ldrsh r0, [r4, r2]
@@ -9352,7 +9352,7 @@ sub_8087C00: @ 8087C00
adds r5, r0, 0
ldr r0, _08087C28 @ =sub_8087B14
movs r1, 0x5A
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -9403,13 +9403,13 @@ sub_8087C2C: @ 8087C2C
adds r0, r6, 0
movs r1, 0x10
adds r2, r5, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r6, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r4, 0
bl sub_8087CFC
movs r0, 0x50
@@ -9446,19 +9446,19 @@ sub_8087CB4: @ 8087CB4
cmp r0, 0
bne _08087CEE
ldr r0, _08087CF8 @ =sub_8087B14
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08087CEE
- bl sub_805ADF8
+ bl InstallCameraPanAheadCallback
ldrb r0, [r4, 0xC]
ldrb r1, [r4, 0xE]
ldrb r2, [r4, 0x10]
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
movs r0, 0x44
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08087CEE:
pop {r4,r5}
pop {r0}
@@ -9503,7 +9503,7 @@ _08087D32:
asrs r1, r2, 16
asrs r2, r7, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -9516,7 +9516,7 @@ _08087D32:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r4, 0x2E]
ldrb r1, [r6, 0x5]
lsrs r1, 4
@@ -9605,7 +9605,7 @@ _08087DDA:
ble _08087DFC
_08087DF6:
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
_08087DFC:
pop {r0}
bx r0
@@ -9623,9 +9623,9 @@ sub_8087E00: @ 8087E00
cmp r0, 0
bne _08087E1E
movs r0, 0x45
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08087E1E:
pop {r4}
pop {r0}
@@ -9644,16 +9644,16 @@ sub_8087E28: @ 8087E28
adds r0, r4, 0
movs r1, 0x10
adds r2, r5, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
adds r1, r4, 0
movs r2, 0xF
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08087E60 @ =sub_8087E00
movs r1, 0x5A
- bl sub_807741C
+ bl CreateTask
add sp, 0x4
pop {r4,r5}
pop {r0}
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 5ad3273a6..def6fcea3 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80DAD7C
-sub_80DAD7C: @ 80DAD7C
+ thumb_func_start SetUpReflection
+SetUpReflection: @ 80DAD7C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -20,7 +20,7 @@ sub_80DAD7C: @ 80DAD7C
ldrsh r2, [r4, r0]
adds r0, r4, 0
movs r3, 0x98
- bl sub_805FB6C
+ bl obj_unfreeze
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -55,7 +55,7 @@ sub_80DAD7C: @ 80DAD7C
str r0, [r7, 0x8]
adds r0, r7, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080DAE3C @ =gUnknown_8231CFC
str r0, [r7, 0x10]
mov r1, r8
@@ -77,7 +77,7 @@ sub_80DAD7C: @ 80DAD7C
strh r5, [r7, 0x3C]
adds r0, r6, 0
adds r1, r7, 0
- bl sub_80DAE54
+ bl npc_pal_op
cmp r5, 0
bne _080DAE22
ldrb r0, [r7, 0x1]
@@ -99,7 +99,7 @@ _080DAE30: .4byte sub_80DAF50
_080DAE34: .4byte gUnknown_835B934
_080DAE38: .4byte gUnknown_8231CF0
_080DAE3C: .4byte gUnknown_8231CFC
- thumb_func_end sub_80DAD7C
+ thumb_func_end SetUpReflection
thumb_func_start sub_80DAE40
sub_80DAE40: @ 80DAE40
@@ -114,8 +114,8 @@ sub_80DAE40: @ 80DAE40
bx r1
thumb_func_end sub_80DAE40
- thumb_func_start sub_80DAE54
-sub_80DAE54: @ 80DAE54
+ thumb_func_start npc_pal_op
+npc_pal_op: @ 80DAE54
push {r4,r5,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -154,7 +154,7 @@ _080DAE96:
ldrb r1, [r4, 0x5]
lsrs r1, 4
adds r0, r5, 0
- bl sub_80DAF20
+ bl npc_pal_op_A
b _080DAEBA
.align 2, 0
_080DAEAC: .4byte gUnknown_83FECCC
@@ -162,16 +162,16 @@ _080DAEB0:
ldrb r1, [r4, 0x5]
lsrs r1, 4
adds r0, r5, 0
- bl sub_80DAEC4
+ bl npc_pal_op_B
_080DAEBA:
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80DAE54
+ thumb_func_end npc_pal_op
- thumb_func_start sub_80DAEC4
-sub_80DAEC4: @ 80DAEC4
+ thumb_func_start npc_pal_op_B
+npc_pal_op_B: @ 80DAEC4
push {r4,lr}
lsls r1, 24
lsrs r4, r1, 24
@@ -189,7 +189,7 @@ sub_80DAEC4: @ 80DAEC4
bne _080DAEF4
ldrh r0, [r2, 0x2]
adds r1, r4, 0
- bl sub_805F5E8
+ bl npc_load_two_palettes__no_record
b _080DAF12
.align 2, 0
_080DAEF0: .4byte 0x000011ff
@@ -198,7 +198,7 @@ _080DAEF4:
bne _080DAF02
ldrh r0, [r2, 0x2]
adds r1, r4, 0
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
b _080DAF12
_080DAF02:
adds r0, r4, 0
@@ -206,7 +206,7 @@ _080DAF02:
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
- bl sub_805F538
+ bl pal_patch_for_npc
_080DAF12:
adds r0, r4, 0
bl sub_807AA8C
@@ -214,10 +214,10 @@ _080DAF18:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80DAEC4
+ thumb_func_end npc_pal_op_B
- thumb_func_start sub_80DAF20
-sub_80DAF20: @ 80DAF20
+ thumb_func_start npc_pal_op_A
+npc_pal_op_A: @ 80DAF20
push {r4,lr}
lsls r1, 24
lsrs r4, r1, 24
@@ -230,7 +230,7 @@ sub_80DAF20: @ 80DAF20
beq _080DAF44
adds r0, r1, 0
adds r1, r4, 0
- bl sub_805F538
+ bl pal_patch_for_npc
adds r0, r4, 0
bl sub_807AA8C
_080DAF44:
@@ -239,7 +239,7 @@ _080DAF44:
bx r0
.align 2, 0
_080DAF4C: .4byte 0x000011ff
- thumb_func_end sub_80DAF20
+ thumb_func_end npc_pal_op_A
thumb_func_start sub_80DAF50
sub_80DAF50: @ 80DAF50
@@ -437,7 +437,7 @@ sub_80DB0C4: @ 80DB0C4
movs r1, 0
movs r2, 0
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -471,8 +471,8 @@ _080DB10C: .4byte gUnknown_83A0010
_080DB110: .4byte gUnknown_202063C
thumb_func_end sub_80DB0C4
- thumb_func_start sub_80DB114
-sub_80DB114: @ 80DB114
+ thumb_func_start objid_set_invisible
+objid_set_invisible: @ 80DB114
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB130 @ =gUnknown_202063C
@@ -488,7 +488,7 @@ sub_80DB114: @ 80DB114
bx lr
.align 2, 0
_080DB130: .4byte gUnknown_202063C
- thumb_func_end sub_80DB114
+ thumb_func_end objid_set_invisible
thumb_func_start sub_80DB134
sub_80DB134: @ 80DB134
@@ -565,7 +565,7 @@ _080DB17E:
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080DB1CA:
add sp, 0x4
pop {r3}
@@ -577,14 +577,14 @@ _080DB1CA:
_080DB1D8: .4byte gUnknown_202063C
thumb_func_end sub_80DB134
- thumb_func_start sub_80DB1DC
-sub_80DB1DC: @ 80DB1DC
+ thumb_func_start oei_shadow
+oei_shadow: @ 80DB1DC
push {r4,r5,lr}
ldr r5, _080DB268 @ =gUnknown_20386E0
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
ldr r2, _080DB26C @ =gUnknown_2036E38
@@ -608,7 +608,7 @@ sub_80DB1DC: @ 80DB1DC
movs r1, 0
movs r2, 0
movs r3, 0x94
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -654,10 +654,10 @@ _080DB270: .4byte gUnknown_83A0010
_080DB274: .4byte gUnknown_83FECD2
_080DB278: .4byte gUnknown_202063C
_080DB27C: .4byte gUnknown_83FECD6
- thumb_func_end sub_80DB1DC
+ thumb_func_end oei_shadow
- thumb_func_start sub_80DB280
-sub_80DB280: @ 80DB280
+ thumb_func_start oamc_shadow
+oamc_shadow: @ 80DB280
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -671,13 +671,13 @@ sub_80DB280: @ 80DB280
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _080DB2AE
adds r0, r5, 0
movs r1, 0x3
- bl sub_80836D8
+ bl FieldEffectStop
b _080DB334
_080DB2AE:
mov r0, sp
@@ -741,7 +741,7 @@ _080DB2AE:
_080DB32C:
adds r0, r5, 0
movs r1, 0x3
- bl sub_80836D8
+ bl FieldEffectStop
_080DB334:
add sp, 0x4
pop {r4,r5}
@@ -751,10 +751,10 @@ _080DB334:
_080DB33C: .4byte gUnknown_2036E38
_080DB340: .4byte gUnknown_202063C
_080DB344: .4byte 0x00400001
- thumb_func_end sub_80DB280
+ thumb_func_end oamc_shadow
- thumb_func_start sub_80DB348
-sub_80DB348: @ 80DB348
+ thumb_func_start oei_grass_normal
+oei_grass_normal: @ 80DB348
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DB3E0 @ =gUnknown_20386E0
@@ -778,7 +778,7 @@ sub_80DB348: @ 80DB348
movs r3, 0
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -821,7 +821,7 @@ sub_80DB348: @ 80DB348
beq _080DB3D4
adds r0, r3, 0
movs r1, 0x4
- bl sub_80083C0
+ bl SeekSpriteAnim
_080DB3D4:
movs r0, 0
add sp, 0x4
@@ -832,10 +832,10 @@ _080DB3D4:
_080DB3E0: .4byte gUnknown_20386E0
_080DB3E4: .4byte gUnknown_83A0010
_080DB3E8: .4byte gUnknown_202063C
- thumb_func_end sub_80DB348
+ thumb_func_end oei_grass_normal
- thumb_func_start sub_80DB3EC
-sub_80DB3EC: @ 80DB3EC
+ thumb_func_start unc_grass_normal
+unc_grass_normal: @ 80DB3EC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -895,7 +895,7 @@ _080DB438:
adds r1, r4, 0
adds r2, r7, 0
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DB48C
@@ -918,7 +918,7 @@ _080DB438:
_080DB48C:
adds r0, r5, 0
movs r1, 0x4
- bl sub_80836D8
+ bl FieldEffectStop
b _080DB4E4
.align 2, 0
_080DB498: .4byte gUnknown_2036E18
@@ -967,7 +967,7 @@ _080DB4E4:
bx r0
.align 2, 0
_080DB4F0: .4byte gUnknown_2036E38
- thumb_func_end sub_80DB3EC
+ thumb_func_end unc_grass_normal
thumb_func_start sub_80DB4F4
sub_80DB4F4: @ 80DB4F4
@@ -985,7 +985,7 @@ sub_80DB4F4: @ 80DB4F4
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -1059,7 +1059,7 @@ _080DB588:
cmp r0, 0
beq _080DB5DC
ldr r1, [r2, 0x1C]
- ldr r0, _080DB5D8 @ =sub_80DB3EC
+ ldr r0, _080DB5D8 @ =unc_grass_normal
cmp r1, r0
bne _080DB5DC
movs r1, 0x30
@@ -1087,7 +1087,7 @@ _080DB588:
b _080DB5E8
.align 2, 0
_080DB5D4: .4byte gUnknown_202063C
-_080DB5D8: .4byte sub_80DB3EC
+_080DB5D8: .4byte unc_grass_normal
_080DB5DC:
adds r0, r5, 0x1
lsls r0, 24
@@ -1128,7 +1128,7 @@ sub_80DB5F4: @ 80DB5F4
movs r3, 0
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1145,7 +1145,7 @@ sub_80DB5F4: @ 80DB5F4
orrs r0, r1
strb r0, [r2]
ldrb r0, [r5, 0x8]
- bl sub_8068294
+ bl ZCoordToPriority
movs r1, 0x3
ands r1, r0
lsls r1, 2
@@ -1172,7 +1172,7 @@ sub_80DB5F4: @ 80DB5F4
beq _080DB684
adds r0, r4, 0
movs r1, 0x6
- bl sub_80083C0
+ bl SeekSpriteAnim
_080DB684:
movs r0, 0
add sp, 0x4
@@ -1185,8 +1185,8 @@ _080DB694: .4byte gUnknown_83A0010
_080DB698: .4byte gUnknown_202063C
thumb_func_end sub_80DB5F4
- thumb_func_start sub_80DB69C
-sub_80DB69C: @ 80DB69C
+ thumb_func_start unc_grass_tall
+unc_grass_tall: @ 80DB69C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1246,7 +1246,7 @@ _080DB6E8:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DB73C
@@ -1269,7 +1269,7 @@ _080DB6E8:
_080DB73C:
adds r0, r5, 0
movs r1, 0x11
- bl sub_80836D8
+ bl FieldEffectStop
b _080DB786
.align 2, 0
_080DB748: .4byte gUnknown_2036E18
@@ -1310,7 +1310,7 @@ _080DB786:
bx r0
.align 2, 0
_080DB794: .4byte gUnknown_2036E38
- thumb_func_end sub_80DB69C
+ thumb_func_end unc_grass_tall
thumb_func_start sub_80DB798
sub_80DB798: @ 80DB798
@@ -1328,7 +1328,7 @@ sub_80DB798: @ 80DB798
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -1376,7 +1376,7 @@ sub_80DB808: @ 80DB808
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -1389,7 +1389,7 @@ sub_80DB808: @ 80DB808
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -1468,7 +1468,7 @@ sub_80DB8AC: @ 80DB8AC
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DB8EA
@@ -1486,7 +1486,7 @@ sub_80DB8AC: @ 80DB8AC
_080DB8EA:
adds r0, r4, 0
movs r1, 0x29
- bl sub_80836D8
+ bl FieldEffectStop
b _080DB98E
.align 2, 0
_080DB8F4: .4byte gUnknown_2036E38
@@ -1532,7 +1532,7 @@ _080DB934:
beq _080DB94E
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080DB94E:
strh r7, [r4, 0x20]
strh r5, [r4, 0x22]
@@ -1592,7 +1592,7 @@ sub_80DB9A0: @ 80DB9A0
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1621,7 +1621,7 @@ sub_80DB9A0: @ 80DB9A0
movs r1, 0xD
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
- bl sub_800838C
+ bl StartSpriteAnim
_080DB9FE:
movs r0, 0
pop {r4}
@@ -1649,7 +1649,7 @@ sub_80DBA14: @ 80DBA14
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
adds r5, r1, 0
@@ -1679,7 +1679,7 @@ sub_80DBA14: @ 80DBA14
movs r1, 0x18
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
- bl sub_800838C
+ bl StartSpriteAnim
_080DBA74:
adds r0, r5, 0
pop {r4,r5}
@@ -1707,7 +1707,7 @@ sub_80DBA88: @ 80DBA88
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
adds r5, r1, 0
@@ -1737,7 +1737,7 @@ sub_80DBA88: @ 80DBA88
movs r1, 0x23
strh r1, [r0, 0x3C]
ldrb r1, [r4, 0x10]
- bl sub_800838C
+ bl StartSpriteAnim
_080DBAE8:
adds r0, r5, 0
pop {r4,r5}
@@ -1819,7 +1819,7 @@ sub_80DBB3C: @ 80DBB3C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80836D8
+ bl FieldEffectStop
_080DBB80:
pop {r4}
pop {r0}
@@ -1833,7 +1833,7 @@ sub_80DBB88: @ 80DBB88
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -1846,7 +1846,7 @@ sub_80DBB88: @ 80DBB88
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
@@ -1926,14 +1926,14 @@ sub_80DBC2C: @ 80DBC2C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _080DBC66
_080DBC5C:
adds r0, r4, 0
movs r1, 0xF
- bl sub_80836D8
+ bl FieldEffectStop
b _080DBCA6
_080DBC66:
ldr r3, _080DBCB0 @ =gUnknown_202063C
@@ -1993,7 +1993,7 @@ sub_80DBCB8: @ 80DBCB8
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2034,8 +2034,8 @@ _080DBD20: .4byte gUnknown_83A0010
_080DBD24: .4byte gUnknown_202063C
thumb_func_end sub_80DBCB8
- thumb_func_start sub_80DBD28
-sub_80DBD28: @ 80DBD28
+ thumb_func_start oei_water_drop_tall
+oei_water_drop_tall: @ 80DBD28
push {r4,lr}
ldr r4, _080DBD8C @ =gUnknown_20386E0
adds r1, r4, 0x4
@@ -2050,7 +2050,7 @@ sub_80DBD28: @ 80DBD28
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2089,7 +2089,7 @@ _080DBD84:
_080DBD8C: .4byte gUnknown_20386E0
_080DBD90: .4byte gUnknown_83A0010
_080DBD94: .4byte gUnknown_202063C
- thumb_func_end sub_80DBD28
+ thumb_func_end oei_water_drop_tall
thumb_func_start sub_80DBD98
sub_80DBD98: @ 80DBD98
@@ -2098,7 +2098,7 @@ sub_80DBD98: @ 80DBD98
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -2111,7 +2111,7 @@ sub_80DBD98: @ 80DBD98
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -2163,7 +2163,7 @@ sub_80DBD98: @ 80DBD98
subs r1, 0x4
strh r1, [r0, 0x26]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080DBE2E:
movs r0, 0
pop {r4-r7}
@@ -2193,7 +2193,7 @@ sub_80DBE50: @ 80DBE50
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DBE8A
@@ -2211,7 +2211,7 @@ sub_80DBE50: @ 80DBE50
_080DBE8A:
adds r0, r4, 0
movs r1, 0x22
- bl sub_80836D8
+ bl FieldEffectStop
b _080DBEE2
.align 2, 0
_080DBE94: .4byte gUnknown_2036E38
@@ -2260,8 +2260,8 @@ _080DBEE2:
_080DBEEC: .4byte gUnknown_202063C
thumb_func_end sub_80DBE50
- thumb_func_start sub_80DBEF0
-sub_80DBEF0: @ 80DBEF0
+ thumb_func_start oei_ripples
+oei_ripples: @ 80DBEF0
push {r4,lr}
ldr r0, _080DBF44 @ =gUnknown_83A0010
ldr r0, [r0, 0x14]
@@ -2271,7 +2271,7 @@ sub_80DBEF0: @ 80DBEF0
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2308,7 +2308,7 @@ _080DBF3C:
_080DBF44: .4byte gUnknown_83A0010
_080DBF48: .4byte gUnknown_20386E0
_080DBF4C: .4byte gUnknown_202063C
- thumb_func_end sub_80DBEF0
+ thumb_func_end oei_ripples
thumb_func_start sub_80DBF50
sub_80DBF50: @ 80DBF50
@@ -2317,7 +2317,7 @@ sub_80DBF50: @ 80DBF50
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -2330,7 +2330,7 @@ sub_80DBF50: @ 80DBF50
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2407,7 +2407,7 @@ sub_80DBFF4: @ 80DBFF4
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DC02E
@@ -2425,7 +2425,7 @@ sub_80DBFF4: @ 80DBFF4
_080DC02E:
adds r0, r4, 0
movs r1, 0x2A
- bl sub_80836D8
+ bl FieldEffectStop
b _080DC080
.align 2, 0
_080DC038: .4byte gUnknown_2036E38
@@ -2487,7 +2487,7 @@ sub_80DC08C: @ 80DC08C
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2542,7 +2542,7 @@ sub_80DC0F8: @ 80DC0F8
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2597,7 +2597,7 @@ sub_80DC164: @ 80DC164
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2652,7 +2652,7 @@ sub_80DC1D0: @ 80DC1D0
movs r3, 0x4
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2691,8 +2691,8 @@ _080DC234: .4byte gUnknown_83A0010
_080DC238: .4byte gUnknown_202063C
thumb_func_end sub_80DC1D0
- thumb_func_start sub_80DC23C
-sub_80DC23C: @ 80DC23C
+ thumb_func_start ash
+ash: @ 80DC23C
push {r4,lr}
lsls r2, 16
lsrs r2, 16
@@ -2712,16 +2712,16 @@ sub_80DC23C: @ 80DC23C
asrs r3, 16
str r3, [r4, 0x14]
movs r0, 0x7
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080DC26C: .4byte gUnknown_20386E0
- thumb_func_end sub_80DC23C
+ thumb_func_end ash
- thumb_func_start sub_80DC270
-sub_80DC270: @ 80DC270
+ thumb_func_start oei_ash
+oei_ash: @ 80DC270
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _080DC2F0 @ =gUnknown_20386E0
@@ -2745,7 +2745,7 @@ sub_80DC270: @ 80DC270
movs r3, 0
ldrsh r2, [r4, r3]
ldrb r3, [r5, 0x8]
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -2789,7 +2789,7 @@ _080DC2E6:
_080DC2F0: .4byte gUnknown_20386E0
_080DC2F4: .4byte gUnknown_83A0010
_080DC2F8: .4byte gUnknown_202063C
- thumb_func_end sub_80DC270
+ thumb_func_end oei_ash
thumb_func_start sub_80DC2FC
sub_80DC2FC: @ 80DC2FC
@@ -2862,7 +2862,7 @@ sub_80DC348: @ 80DC348
ldrsh r0, [r4, r1]
movs r2, 0x32
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
ldr r2, _080DC3A0 @ =gUnknown_2036E38
ldr r0, _080DC3A4 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -2899,7 +2899,7 @@ sub_80DC3A8: @ 80DC3A8
beq _080DC3C8
adds r0, r4, 0
movs r1, 0x7
- bl sub_80836D8
+ bl FieldEffectStop
_080DC3C8:
pop {r4}
pop {r0}
@@ -2922,7 +2922,7 @@ sub_80DC3D0: @ 80DC3D0
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x96
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
@@ -2954,7 +2954,7 @@ sub_80DC3D0: @ 80DC3D0
strh r0, [r1, 0x3C]
_080DC42C:
movs r0, 0x8
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
adds r0, r5, 0
pop {r4,r5}
pop {r1}
@@ -3136,7 +3136,7 @@ sub_80DC550: @ 80DC550
add r0, sp
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
_080DC57C:
add sp, 0x8
pop {r4,r5}
@@ -3192,12 +3192,12 @@ _080DC5D6:
adds r0, r5, 0
mov r1, sp
adds r2, r7, 0
- bl sub_8063A20
+ bl MoveCoords
movs r1, 0
ldrsh r0, [r6, r1]
movs r2, 0
ldrsh r1, [r7, r2]
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -3316,7 +3316,7 @@ sub_80DC6B0: @ 80DC6B0
movs r1, 0
movs r2, 0
movs r3, 0xFF
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -3400,7 +3400,7 @@ sub_80DC740: @ 80DC740
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3448,7 +3448,7 @@ sub_80DC7B0: @ 80DC7B0
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -3461,7 +3461,7 @@ sub_80DC7B0: @ 80DC7B0
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
@@ -3520,7 +3520,7 @@ sub_80DC7B0: @ 80DC7B0
subs r1, 0x2
strh r1, [r0, 0x26]
movs r1, 0x2
- bl sub_80083C0
+ bl SeekSpriteAnim
_080DC854:
movs r0, 0
pop {r4-r7}
@@ -3548,7 +3548,7 @@ sub_80DC86C: @ 80DC86C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080DC8A6
@@ -3566,7 +3566,7 @@ sub_80DC86C: @ 80DC86C
_080DC8A6:
adds r0, r4, 0
movs r1, 0x27
- bl sub_80836D8
+ bl FieldEffectStop
b _080DC926
.align 2, 0
_080DC8B0: .4byte gUnknown_2036E38
@@ -3603,7 +3603,7 @@ _080DC8DC:
beq _080DC8F6
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080DC8F6:
strh r6, [r4, 0x20]
strh r5, [r4, 0x22]
@@ -3655,7 +3655,7 @@ sub_80DC938: @ 80DC938
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3714,7 +3714,7 @@ sub_80DC99C: @ 80DC99C
beq _080DC9D0
adds r0, r4, 0
movs r1, 0x35
- bl sub_80836D8
+ bl FieldEffectStop
_080DC9D0:
pop {r4}
pop {r0}
@@ -3729,41 +3729,41 @@ sub_80DC9DC: @ 80DC9DC
bx lr
thumb_func_end sub_80DC9DC
- thumb_func_start sub_80DC9E0
-sub_80DC9E0: @ 80DC9E0
+ thumb_func_start ShowTreeDisguiseFieldEffect
+ShowTreeDisguiseFieldEffect: @ 80DC9E0
push {lr}
movs r0, 0x1C
movs r1, 0x18
movs r2, 0x4
- bl sub_80DCA10
+ bl ShowDisguiseFieldEffect
pop {r1}
bx r1
- thumb_func_end sub_80DC9E0
+ thumb_func_end ShowTreeDisguiseFieldEffect
- thumb_func_start sub_80DC9F0
-sub_80DC9F0: @ 80DC9F0
+ thumb_func_start ShowMountainDisguiseFieldEffect
+ShowMountainDisguiseFieldEffect: @ 80DC9F0
push {lr}
movs r0, 0x1D
movs r1, 0x19
movs r2, 0x3
- bl sub_80DCA10
+ bl ShowDisguiseFieldEffect
pop {r1}
bx r1
- thumb_func_end sub_80DC9F0
+ thumb_func_end ShowMountainDisguiseFieldEffect
- thumb_func_start sub_80DCA00
-sub_80DCA00: @ 80DCA00
+ thumb_func_start ShowSandDisguiseFieldEffect
+ShowSandDisguiseFieldEffect: @ 80DCA00
push {lr}
movs r0, 0x24
movs r1, 0x1C
movs r2, 0x2
- bl sub_80DCA10
+ bl ShowDisguiseFieldEffect
pop {r1}
bx r1
- thumb_func_end sub_80DCA00
+ thumb_func_end ShowSandDisguiseFieldEffect
- thumb_func_start sub_80DCA10
-sub_80DCA10: @ 80DCA10
+ thumb_func_start ShowDisguiseFieldEffect
+ShowDisguiseFieldEffect: @ 80DCA10
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3780,12 +3780,12 @@ sub_80DCA10: @ 80DCA10
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _080DCA48
adds r0, r4, 0
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
movs r0, 0x40
b _080DCAB4
.align 2, 0
@@ -3798,7 +3798,7 @@ _080DCA48:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
mov r1, sp
strb r0, [r1]
lsls r0, 24
@@ -3855,7 +3855,7 @@ _080DCAB4:
.align 2, 0
_080DCAC0: .4byte gUnknown_83A0010
_080DCAC4: .4byte gUnknown_202063C
- thumb_func_end sub_80DCA10
+ thumb_func_end ShowDisguiseFieldEffect
thumb_func_start sub_80DCAC8
sub_80DCAC8: @ 80DCAC8
@@ -3872,7 +3872,7 @@ sub_80DCAC8: @ 80DCAC8
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _080DCAF8
@@ -3880,7 +3880,7 @@ sub_80DCAC8: @ 80DCAC8
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_80836D8
+ bl FieldEffectStop
_080DCAF8:
ldr r4, _080DCBB0 @ =gUnknown_2036E38
mov r0, sp
@@ -3943,7 +3943,7 @@ _080DCAF8:
strh r0, [r5, 0x2E]
adds r0, r5, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080DCB78:
movs r3, 0x2E
ldrsh r0, [r5, r3]
@@ -3968,7 +3968,7 @@ _080DCB94:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_80836D8
+ bl FieldEffectStop
_080DCBA8:
add sp, 0x4
pop {r4,r5}
@@ -4063,7 +4063,7 @@ sub_80DCC1C: @ 80DCC1C
movs r3, 0x4
ldrsh r2, [r4, r3]
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -4138,7 +4138,7 @@ _080DCCC4:
ble _080DCCDA
adds r0, r2, 0
movs r1, 0x36
- bl sub_80836D8
+ bl FieldEffectStop
_080DCCDA:
pop {r0}
bx r0
@@ -4158,7 +4158,7 @@ sub_80DCCE0: @ 80DCCE0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80836D8
+ bl FieldEffectStop
b _080DCD14
_080DCCFE:
adds r0, r4, 0
@@ -4169,7 +4169,7 @@ _080DCCFE:
lsrs r0, 24
adds r1, r4, 0
movs r2, 0
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
_080DCD14:
pop {r4}
pop {r0}
@@ -4190,7 +4190,7 @@ sub_80DCD1C: @ 80DCD1C
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_80836D8
+ bl FieldEffectStop
b _080DCD42
_080DCD3A:
adds r0, r2, 0
@@ -4211,7 +4211,7 @@ sub_80DCD48: @ 80DCD48
lsls r2, 24
lsrs r2, 24
adds r1, r6, 0
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
movs r7, 0
_080DCD5E:
lsls r0, r7, 3
diff --git a/asm/field_fadetransition.s b/asm/field_fadetransition.s
index 65bf1aa9c..9a0cf4a96 100644
--- a/asm/field_fadetransition.s
+++ b/asm/field_fadetransition.s
@@ -45,11 +45,11 @@ _0807DB54: .4byte 0x01000100
thumb_func_start sub_807DB58
sub_807DB58: @ 807DB58
push {r4,lr}
- bl sub_80561A0
+ bl get_map_light_from_warp0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -66,14 +66,14 @@ _0807DB82:
bl sub_807DB38
movs r0, 0
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_807DB38
b _0807DBA4
_0807DB94:
bl sub_807DB14
movs r0, 0x2
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_807DB14
_0807DBA4:
pop {r4}
@@ -84,11 +84,11 @@ _0807DBA4:
thumb_func_start sub_807DBAC
sub_807DBAC: @ 807DBAC
push {r4,lr}
- bl sub_80561A0
+ bl get_map_light_from_warp0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -105,14 +105,14 @@ _0807DBD6:
bl sub_807DB38
movs r0, 0
movs r1, 0x3
- bl sub_807A818
+ bl fade_screen
bl sub_807DB38
b _0807DBF8
_0807DBE8:
bl sub_807DB14
movs r0, 0x2
movs r1, 0x3
- bl sub_807A818
+ bl fade_screen
bl sub_807DB14
_0807DBF8:
pop {r4}
@@ -126,7 +126,7 @@ sub_807DC00: @ 807DC00
bl sub_807DB38
movs r0, 0
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_807DB38
pop {r0}
bx r0
@@ -135,7 +135,7 @@ sub_807DC00: @ 807DC00
thumb_func_start sub_807DC18
sub_807DC18: @ 807DC18
push {r4,lr}
- bl sub_8055250
+ bl warp1_get_mapheader
adds r4, r0, 0
ldr r1, _0807DC54 @ =gUnknown_2036DFC
ldrb r0, [r4, 0x14]
@@ -148,7 +148,7 @@ sub_807DC18: @ 807DC18
cmp r0, 0
bne _0807DC58
_0807DC36:
- bl sub_8056188
+ bl sav1_map_get_light_level
lsls r0, 24
lsrs r0, 24
ldrb r1, [r4, 0x17]
@@ -165,12 +165,12 @@ _0807DC54: .4byte gUnknown_2036DFC
_0807DC58:
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
b _0807DC6A
_0807DC62:
movs r0, 0x3
movs r1, 0
- bl sub_807A818
+ bl fade_screen
_0807DC6A:
pop {r4}
pop {r0}
@@ -180,11 +180,11 @@ _0807DC6A:
thumb_func_start sub_807DC70
sub_807DC70: @ 807DC70
push {r4,lr}
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8055250
+ bl warp1_get_mapheader
ldrb r1, [r0, 0x17]
adds r0, r4, 0
bl sub_80C9D7C
@@ -198,12 +198,12 @@ sub_807DC70: @ 807DC70
_0807DC96:
movs r0, 0x1
movs r1, 0x3
- bl sub_807A818
+ bl fade_screen
b _0807DCA8
_0807DCA0:
movs r0, 0x3
movs r1, 0x3
- bl sub_807A818
+ bl fade_screen
_0807DCA8:
pop {r4}
pop {r0}
@@ -225,8 +225,8 @@ _0807DCBC:
bx r0
thumb_func_end sub_807DCB0
- thumb_func_start sub_807DCC8
-sub_807DCC8: @ 807DCC8
+ thumb_func_start task0A_nop_for_a_while
+task0A_nop_for_a_while: @ 807DCC8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -234,30 +234,30 @@ sub_807DCC8: @ 807DCC8
cmp r0, 0x1
bne _0807DCDC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807DCDC:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_807DCC8
+ thumb_func_end task0A_nop_for_a_while
thumb_func_start sub_807DCE4
sub_807DCE4: @ 807DCE4
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DC00
- ldr r0, _0807DD00 @ =sub_807DCC8
+ ldr r0, _0807DD00 @ =task0A_nop_for_a_while
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807DD00: .4byte sub_807DCC8
+_0807DD00: .4byte task0A_nop_for_a_while
thumb_func_end sub_807DCE4
- thumb_func_start sub_807DD04
-sub_807DD04: @ 807DD04
+ thumb_func_start task0A_asap_script_env_2_enable_and_set_ctx_running
+task0A_asap_script_env_2_enable_and_set_ctx_running: @ 807DD04
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -265,45 +265,45 @@ sub_807DD04: @ 807DD04
cmp r0, 0x1
bne _0807DD1C
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0807DD1C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_807DD04
+ thumb_func_end task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_start sub_807DD24
sub_807DD24: @ 807DD24
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DC00
- ldr r0, _0807DD40 @ =sub_807DD04
+ ldr r0, _0807DD40 @ =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807DD40: .4byte sub_807DD04
+_0807DD40: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_end sub_807DD24
thumb_func_start sub_807DD44
sub_807DD44: @ 807DD44
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_807DC00
- ldr r0, _0807DD5C @ =sub_807DD04
+ ldr r0, _0807DD5C @ =task0A_asap_script_env_2_enable_and_set_ctx_running
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807DD5C: .4byte sub_807DD04
+_0807DD5C: .4byte task0A_asap_script_env_2_enable_and_set_ctx_running
thumb_func_end sub_807DD44
- thumb_func_start sub_807DD60
-sub_807DD60: @ 807DD60
+ thumb_func_start task_mpl_807DD60
+task_mpl_807DD60: @ 807DD60
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -353,28 +353,28 @@ _0807DDB8:
bl sub_807E418
cmp r0, 0x1
bne _0807DDCA
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807DDCA:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_807DD60
+ thumb_func_end task_mpl_807DD60
thumb_func_start sub_807DDD0
sub_807DDD0: @ 807DDD0
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DB38
- ldr r0, _0807DDEC @ =sub_807DD60
+ ldr r0, _0807DDEC @ =task_mpl_807DD60
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807DDEC: .4byte sub_807DD60
+_0807DDEC: .4byte task_mpl_807DD60
thumb_func_end sub_807DDD0
thumb_func_start sub_807DDF0
@@ -421,9 +421,9 @@ _0807DE3A:
cmp r0, 0x1
bne _0807DE50
bl sub_8009FE8
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807DE50:
pop {r4,r5}
pop {r0}
@@ -433,12 +433,12 @@ _0807DE50:
thumb_func_start sub_807DE58
sub_807DE58: @ 807DE58
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DB38
ldr r0, _0807DE74 @ =sub_807DDF0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -455,7 +455,7 @@ sub_807DE78: @ 807DE78
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -471,11 +471,11 @@ sub_807DE78: @ 807DE78
cmp r0, 0x1
bne _0807DEE8
ldr r5, _0807DED8 @ =sub_807DFBC
- bl sub_80561A0
+ bl get_map_light_from_warp0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -535,7 +535,7 @@ _0807DF2E:
strb r0, [r1]
adds r0, r5, 0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -567,7 +567,7 @@ sub_807DF64: @ 807DF64
bl sub_8111CF0
movs r0, 0
bl sub_807DE78
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_807DF64
@@ -579,7 +579,7 @@ sub_807DF7C: @ 807DF7C
bl sub_8111CF0
movs r0, 0x1
bl sub_807DE78
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_807DF7C
@@ -594,8 +594,8 @@ sub_807DF94: @ 807DF94
bl sub_80722CC
ldr r0, _0807DFB8 @ =sub_807E31C
movs r1, 0xA
- bl sub_807741C
- bl sub_8069940
+ bl CreateTask
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -653,10 +653,10 @@ _0807E000:
_0807E028:
movs r0, 0
bl sub_807DCB0
- bl sub_8068974
+ bl player_bitmagic
adds r0, r6, 0
adds r1, r7, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r2, 0
ldrsh r0, [r6, r2]
movs r2, 0
@@ -668,7 +668,7 @@ _0807E028:
_0807E04C:
movs r0, 0
bl sub_807DCB0
- bl sub_8068974
+ bl player_bitmagic
bl sub_807F114
bl sub_807DBAC
movs r0, 0x6
@@ -686,7 +686,7 @@ _0807E064:
_0807E074:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r1, 0
ldrsh r0, [r6, r1]
movs r2, 0
@@ -714,13 +714,13 @@ _0807E0AE:
adds r0, 0x20
adds r1, r4, 0
adds r1, 0x22
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r0, 0x1
bl sub_807DCB0
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -758,7 +758,7 @@ _0807E10E:
bl sub_807E418
cmp r0, 0
beq _0807E206
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
cmp r0, 0
beq _0807E206
@@ -767,14 +767,14 @@ _0807E10E:
cmp r0, 0
bne _0807E206
ldr r0, _0807E158 @ =sub_807F204
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0807E206
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -783,7 +783,7 @@ _0807E10E:
lsls r0, 2
ldr r1, _0807E15C @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
b _0807E1F2
.align 2, 0
_0807E158: .4byte sub_807F204
@@ -797,7 +797,7 @@ _0807E160:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -814,7 +814,7 @@ _0807E160:
.align 2, 0
_0807E194: .4byte gUnknown_2036E38
_0807E198:
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
cmp r0, 0
beq _0807E206
@@ -829,7 +829,7 @@ _0807E198:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -838,7 +838,7 @@ _0807E198:
lsls r0, 2
ldr r1, _0807E1D8 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0x3
strh r0, [r4, 0x8]
b _0807E206
@@ -861,10 +861,10 @@ _0807E1F2:
strh r0, [r4, 0x8]
b _0807E206
_0807E1F8:
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E206:
pop {r4-r7}
pop {r0}
@@ -905,10 +905,10 @@ _0807E23C:
_0807E246:
movs r0, 0
bl sub_807DCB0
- bl sub_8068974
+ bl player_bitmagic
adds r0, r6, 0
adds r1, r7, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r0, 0x1
strh r0, [r5, 0x8]
b _0807E2C6
@@ -921,7 +921,7 @@ _0807E25E:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 3
@@ -929,7 +929,7 @@ _0807E25E:
lsls r4, 2
ldr r0, _0807E2A4 @ =gUnknown_2036E38
adds r4, r0
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063F84
@@ -944,7 +944,7 @@ _0807E25E:
.align 2, 0
_0807E2A4: .4byte gUnknown_2036E38
_0807E2A8:
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
cmp r0, 0
beq _0807E2C6
@@ -952,10 +952,10 @@ _0807E2A8:
strh r0, [r5, 0x8]
b _0807E2C6
_0807E2B8:
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807E2C6:
pop {r4-r7}
pop {r0}
@@ -982,8 +982,8 @@ sub_807E2CC: @ 807E2CC
.align 2, 0
_0807E2EC: .4byte gUnknown_3005090
_0807E2F0:
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -992,10 +992,10 @@ _0807E300:
bl sub_807E418
cmp r0, 0
beq _0807E316
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E316:
pop {r4,r5}
pop {r0}
@@ -1022,8 +1022,8 @@ sub_807E31C: @ 807E31C
.align 2, 0
_0807E33C: .4byte gUnknown_3005090
_0807E340:
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
bl sub_805DC04
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -1036,10 +1036,10 @@ _0807E354:
bl sub_805DC24
cmp r0, 0x1
beq _0807E372
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E372:
pop {r4,r5}
pop {r0}
@@ -1055,10 +1055,10 @@ sub_807E378: @ 807E378
cmp r0, 0x1
bne _0807E394
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0807E39C @ =sub_806F1F0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_0807E394:
pop {r4}
pop {r0}
@@ -1073,8 +1073,8 @@ sub_807E3A0: @ 807E3A0
bl sub_807DC00
ldr r0, _0807E3B8 @ =sub_807E378
movs r1, 0x50
- bl sub_807741C
- bl sub_8069940
+ bl CreateTask
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -1098,9 +1098,9 @@ sub_807E3C8: @ 807E3C8
bl sub_807E418
cmp r0, 0x1
bne _0807E3E4
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_80696C0
_0807E3E4:
pop {r4}
@@ -1111,12 +1111,12 @@ _0807E3E4:
thumb_func_start sub_807E3EC
sub_807E3EC: @ 807E3EC
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_807DC00
ldr r0, _0807E408 @ =sub_807E3C8
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1156,10 +1156,10 @@ _0807E434:
thumb_func_start sub_807E438
sub_807E438: @ 807E438
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055F88
bl sub_807DC18
- bl sub_807B004
+ bl play_some_sound
movs r0, 0x9
bl sub_80722CC
ldr r0, _0807E464 @ =gUnknown_3005020
@@ -1167,7 +1167,7 @@ sub_807E438: @ 807E438
str r1, [r0]
ldr r0, _0807E46C @ =sub_807E718
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1179,16 +1179,16 @@ _0807E46C: .4byte sub_807E718
thumb_func_start sub_807E470
sub_807E470: @ 807E470
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055F88
bl sub_807DC18
- bl sub_807B004
+ bl play_some_sound
ldr r0, _0807E494 @ =gUnknown_3005020
ldr r1, _0807E498 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E49C @ =sub_807E718
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1209,7 +1209,7 @@ sub_807E4A0: @ 807E4A0
ldr r6, _0807E4D4 @ =sub_807E980
adds r0, r6, 0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807E4D8 @ =gUnknown_3005090
@@ -1231,13 +1231,13 @@ _0807E4D8: .4byte gUnknown_3005090
thumb_func_start sub_807E4DC
sub_807E4DC: @ 807E4DC
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _0807E4F4 @ =gUnknown_3005020
ldr r1, _0807E4F8 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E4FC @ =sub_807E80C
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1249,10 +1249,10 @@ _0807E4FC: .4byte sub_807E80C
thumb_func_start sub_807E500
sub_807E500: @ 807E500
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _0807E518 @ =sub_807E718
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r1, _0807E51C @ =gUnknown_3005020
ldr r0, _0807E520 @ =sub_807DF94
str r0, [r1]
@@ -1267,13 +1267,13 @@ _0807E520: .4byte sub_807DF94
thumb_func_start sub_807E524
sub_807E524: @ 807E524
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _0807E53C @ =gUnknown_3005020
ldr r1, _0807E540 @ =sub_807DF64
str r1, [r0]
ldr r0, _0807E544 @ =sub_807E784
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1302,7 +1302,7 @@ sub_807E560: @ 807E560
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8069940
+ bl ScriptContext2_Enable
adds r0, r4, 0
movs r1, 0xA
bl sub_8084784
@@ -1314,7 +1314,7 @@ sub_807E560: @ 807E560
thumb_func_start sub_807E57C
sub_807E57C: @ 807E57C
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0xA
bl sub_8084F2C
pop {r0}
@@ -1324,7 +1324,7 @@ sub_807E57C: @ 807E57C
thumb_func_start sub_807E58C
sub_807E58C: @ 807E58C
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0xA
bl sub_80853CC
pop {r0}
@@ -1334,11 +1334,11 @@ sub_807E58C: @ 807E58C
thumb_func_start sub_807E59C
sub_807E59C: @ 807E59C
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055F88
ldr r0, _0807E5B8 @ =sub_807E784
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r1, _0807E5BC @ =gUnknown_3005020
ldr r0, _0807E5C0 @ =sub_807DF94
str r0, [r1]
@@ -1353,11 +1353,11 @@ _0807E5C0: .4byte sub_807DF94
thumb_func_start sub_807E5C4
sub_807E5C4: @ 807E5C4
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_807DC18
ldr r0, _0807E5E0 @ =sub_807E718
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r1, _0807E5E4 @ =gUnknown_3005020
ldr r0, _0807E5E8 @ =nullsub_60
str r0, [r1]
@@ -1395,7 +1395,7 @@ _0807E614:
beq _0807E63A
b _0807E64A
_0807E61A:
- bl sub_8069940
+ bl ScriptContext2_Enable
b _0807E632
_0807E620:
bl sub_807E40C
@@ -1411,11 +1411,11 @@ _0807E632:
strh r0, [r4, 0x8]
b _0807E64A
_0807E63A:
- bl sub_8055378
+ bl warp_in
ldr r0, _0807E650 @ =sub_8056788
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E64A:
pop {r4,r5}
pop {r0}
@@ -1427,14 +1427,14 @@ _0807E650: .4byte sub_8056788
thumb_func_start sub_807E654
sub_807E654: @ 807E654
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055F88
bl sub_807DC18
movs r0, 0x9
bl sub_80722CC
ldr r0, _0807E674 @ =sub_807E5EC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1470,7 +1470,7 @@ _0807E6A6:
bl sub_800A068
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
bl sub_8055F88
movs r0, 0x9
bl sub_80722CC
@@ -1494,11 +1494,11 @@ _0807E6DC:
ldrb r0, [r0]
cmp r0, 0
bne _0807E6F4
- bl sub_8055378
+ bl warp_in
ldr r0, _0807E700 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E6F4:
pop {r4,r5}
pop {r0}
@@ -1513,7 +1513,7 @@ sub_807E704: @ 807E704
push {lr}
ldr r0, _0807E714 @ =sub_807E678
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1546,8 +1546,8 @@ _0807E740:
beq _0807E76A
b _0807E77A
_0807E746:
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
b _0807E762
_0807E750:
bl sub_807E40C
@@ -1563,11 +1563,11 @@ _0807E762:
strh r0, [r4, 0x8]
b _0807E77A
_0807E76A:
- bl sub_8055378
+ bl warp_in
ldr r0, _0807E780 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E77A:
pop {r4,r5}
pop {r0}
@@ -1604,8 +1604,8 @@ _0807E7AC:
beq _0807E7F2
b _0807E802
_0807E7B6:
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
movs r0, 0x27
bl sub_80722CC
bl sub_805DAB0
@@ -1630,11 +1630,11 @@ _0807E7EA:
strh r0, [r4, 0x8]
b _0807E802
_0807E7F2:
- bl sub_8055378
+ bl warp_in
ldr r0, _0807E808 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807E802:
pop {r4,r5}
pop {r0}
@@ -1681,10 +1681,10 @@ _0807E844:
.4byte _0807E95C
.4byte _0807E966
_0807E85C:
- bl sub_8068974
+ bl player_bitmagic
adds r0, r4, 0
adds r1, r6, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r1, 0
ldrsh r0, [r4, r1]
movs r2, 0
@@ -1722,7 +1722,7 @@ _0807E8AE:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1731,11 +1731,11 @@ _0807E8AE:
lsls r0, 2
ldr r4, _0807E8F0 @ =gUnknown_2036E38
adds r0, r4
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1751,7 +1751,7 @@ _0807E8AE:
.align 2, 0
_0807E8F0: .4byte gUnknown_2036E38
_0807E8F4:
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
cmp r0, 0
beq _0807E976
@@ -1767,7 +1767,7 @@ _0807E8F4:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1776,7 +1776,7 @@ _0807E8F4:
lsls r0, 2
ldr r1, _0807E93C @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
movs r0, 0
bl sub_807DCB0
movs r0, 0x3
@@ -1807,7 +1807,7 @@ _0807E95C:
_0807E966:
bl sub_8055F88
_0807E96A:
- bl sub_807B004
+ bl play_some_sound
movs r0, 0
strh r0, [r5, 0x8]
ldr r0, _0807E97C @ =sub_807E718
@@ -1865,18 +1865,18 @@ _0807E9D0:
beq _0807EA66
b _0807EA9A
_0807E9DA:
- bl sub_8069940
- bl sub_8068974
- bl sub_805FAF8
+ bl ScriptContext2_Enable
+ bl player_bitmagic
+ bl CameraObjectReset2
b _0807EA92
_0807E9E8:
adds r0, r6, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0807EA00
adds r0, r6, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0807EAB0
@@ -1891,7 +1891,7 @@ _0807EA00:
b _0807EAB0
_0807EA10:
bl sub_8055F88
- bl sub_807B004
+ bl play_some_sound
ldrb r1, [r7, 0x5]
movs r0, 0xD
negs r0, r0
@@ -1957,11 +1957,11 @@ _0807EA9A:
ldr r0, _0807EAB8 @ =gUnknown_3005020
ldr r1, _0807EABC @ =sub_807DF64
str r1, [r0]
- bl sub_8055378
+ bl warp_in
ldr r0, _0807EAC0 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807EAB0:
add sp, 0x4
pop {r4-r7}
@@ -2033,15 +2033,15 @@ _0807EB08:
lsrs r0, 7
cmp r0, 0
beq _0807EB4C
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
mov r0, r8
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
_0807EB4C:
pop {r3}
mov r8, r3
@@ -2071,15 +2071,15 @@ sub_807EB64: @ 807EB64
lsls r4, 2
ldr r0, _0807EBB8 @ =gUnknown_2036E38
adds r4, r0
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
@@ -2180,17 +2180,17 @@ sub_807EC34: @ 807EC34
bl sub_807E418
cmp r0, 0x1
bne _0807ECB2
- bl sub_805FAA8
- bl sub_806994C
+ bl CameraObjectReset1
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _0807ECB2
.align 2, 0
_0807EC6C: .4byte gUnknown_3005098
_0807EC70:
bl sub_8055DC4
bl sub_807DB58
- bl sub_8069940
+ bl ScriptContext2_Enable
adds r0, r5, 0x2
adds r1, r5, 0x4
adds r2, r5, 0x6
@@ -2241,7 +2241,7 @@ sub_807ECBC: @ 807ECBC
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -2280,7 +2280,7 @@ _0807ED0C:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
adds r0, r6, 0
adds r1, r7, 0
adds r2, r5, 0
diff --git a/asm/field_ground_effect.s b/asm/field_ground_effect.s
index b6cc748ff..bdc089b8e 100644
--- a/asm/field_ground_effect.s
+++ b/asm/field_ground_effect.s
@@ -5,113 +5,113 @@
.text
- thumb_func_start sub_8067B34
-sub_8067B34: @ 8067B34
+ thumb_func_start GetAllGroundEffectFlags_OnSpawn
+GetAllGroundEffectFlags_OnSpawn: @ 8067B34
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8067C24
+ bl FieldObjectUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067C4C
+ bl GetGroundEffectFlags_Reflection
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067CA8
+ bl GetGroundEffectFlags_TallGrassOnSpawn
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067CE8
+ bl GetGroundEffectFlags_LongGrassOnSpawn
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067D68
+ bl GetGroundEffectFlags_SandHeap
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067DB8
+ bl GetGroundEffectFlags_ShallowFlowingWater
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E6C
+ bl GetGroundEffectFlags_ShortGrass
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067EBC
+ bl GetGroundEffectFlags_HotSprings
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067B34
+ thumb_func_end GetAllGroundEffectFlags_OnSpawn
- thumb_func_start sub_8067B7C
-sub_8067B7C: @ 8067B7C
+ thumb_func_start GetAllGroundEffectFlags_OnBeginStep
+GetAllGroundEffectFlags_OnBeginStep: @ 8067B7C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8067C24
+ bl FieldObjectUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067C4C
+ bl GetGroundEffectFlags_Reflection
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067CC8
+ bl GetGroundEffectFlags_TallGrassOnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067D08
+ bl GetGroundEffectFlags_LongGrassOnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067D28
+ bl GetGroundEffectFlags_Tracks
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067D68
+ bl GetGroundEffectFlags_SandHeap
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067DB8
+ bl GetGroundEffectFlags_ShallowFlowingWater
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E1C
+ bl GetGroundEffectFlags_Puddle
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E6C
+ bl GetGroundEffectFlags_ShortGrass
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067EBC
+ bl GetGroundEffectFlags_HotSprings
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067B7C
+ thumb_func_end GetAllGroundEffectFlags_OnBeginStep
- thumb_func_start sub_8067BD4
-sub_8067BD4: @ 8067BD4
+ thumb_func_start GetAllGroundEffectFlags_OnFinishStep
+GetAllGroundEffectFlags_OnFinishStep: @ 8067BD4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8067C24
+ bl FieldObjectUpdateMetatileBehaviors
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067DB8
+ bl GetGroundEffectFlags_ShallowFlowingWater
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067D68
+ bl GetGroundEffectFlags_SandHeap
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E1C
+ bl GetGroundEffectFlags_Puddle
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E4C
+ bl GetGroundEffectFlags_Ripple
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067E6C
+ bl GetGroundEffectFlags_ShortGrass
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067EBC
+ bl GetGroundEffectFlags_HotSprings
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067F0C
+ bl GetGroundEffectFlags_Seaweed
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067F2C
+ bl GetGroundEffectFlags_JumpLanding
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067BD4
+ thumb_func_end GetAllGroundEffectFlags_OnFinishStep
- thumb_func_start sub_8067C24
-sub_8067C24: @ 8067C24
+ thumb_func_start FieldObjectUpdateMetatileBehaviors
+FieldObjectUpdateMetatileBehaviors: @ 8067C24
push {r4,lr}
adds r4, r0, 0
movs r1, 0x14
@@ -129,10 +129,10 @@ sub_8067C24: @ 8067C24
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067C24
+ thumb_func_end FieldObjectUpdateMetatileBehaviors
- thumb_func_start sub_8067C4C
-sub_8067C4C: @ 8067C4C
+ thumb_func_start GetGroundEffectFlags_Reflection
+GetGroundEffectFlags_Reflection: @ 8067C4C
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -179,10 +179,10 @@ _08067C9E:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067C4C
+ thumb_func_end GetGroundEffectFlags_Reflection
- thumb_func_start sub_8067CA8
-sub_8067CA8: @ 8067CA8
+ thumb_func_start GetGroundEffectFlags_TallGrassOnSpawn
+GetGroundEffectFlags_TallGrassOnSpawn: @ 8067CA8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -198,10 +198,10 @@ _08067CC0:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067CA8
+ thumb_func_end GetGroundEffectFlags_TallGrassOnSpawn
- thumb_func_start sub_8067CC8
-sub_8067CC8: @ 8067CC8
+ thumb_func_start GetGroundEffectFlags_TallGrassOnBeginStep
+GetGroundEffectFlags_TallGrassOnBeginStep: @ 8067CC8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -217,10 +217,10 @@ _08067CE0:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067CC8
+ thumb_func_end GetGroundEffectFlags_TallGrassOnBeginStep
- thumb_func_start sub_8067CE8
-sub_8067CE8: @ 8067CE8
+ thumb_func_start GetGroundEffectFlags_LongGrassOnSpawn
+GetGroundEffectFlags_LongGrassOnSpawn: @ 8067CE8
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -236,10 +236,10 @@ _08067D00:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067CE8
+ thumb_func_end GetGroundEffectFlags_LongGrassOnSpawn
- thumb_func_start sub_8067D08
-sub_8067D08: @ 8067D08
+ thumb_func_start GetGroundEffectFlags_LongGrassOnBeginStep
+GetGroundEffectFlags_LongGrassOnBeginStep: @ 8067D08
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -255,10 +255,10 @@ _08067D20:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067D08
+ thumb_func_end GetGroundEffectFlags_LongGrassOnBeginStep
- thumb_func_start sub_8067D28
-sub_8067D28: @ 8067D28
+ thumb_func_start GetGroundEffectFlags_Tracks
+GetGroundEffectFlags_Tracks: @ 8067D28
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -292,10 +292,10 @@ _08067D62:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067D28
+ thumb_func_end GetGroundEffectFlags_Tracks
- thumb_func_start sub_8067D68
-sub_8067D68: @ 8067D68
+ thumb_func_start GetGroundEffectFlags_SandHeap
+GetGroundEffectFlags_SandHeap: @ 8067D68
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -335,10 +335,10 @@ _08067DB0:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067D68
+ thumb_func_end GetGroundEffectFlags_SandHeap
- thumb_func_start sub_8067DB8
-sub_8067DB8: @ 8067DB8
+ thumb_func_start GetGroundEffectFlags_ShallowFlowingWater
+GetGroundEffectFlags_ShallowFlowingWater: @ 8067DB8
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -389,10 +389,10 @@ _08067E16:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067DB8
+ thumb_func_end GetGroundEffectFlags_ShallowFlowingWater
- thumb_func_start sub_8067E1C
-sub_8067E1C: @ 8067E1C
+ thumb_func_start GetGroundEffectFlags_Puddle
+GetGroundEffectFlags_Puddle: @ 8067E1C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -415,10 +415,10 @@ _08067E44:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067E1C
+ thumb_func_end GetGroundEffectFlags_Puddle
- thumb_func_start sub_8067E4C
-sub_8067E4C: @ 8067E4C
+ thumb_func_start GetGroundEffectFlags_Ripple
+GetGroundEffectFlags_Ripple: @ 8067E4C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -435,10 +435,10 @@ _08067E66:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067E4C
+ thumb_func_end GetGroundEffectFlags_Ripple
- thumb_func_start sub_8067E6C
-sub_8067E6C: @ 8067E6C
+ thumb_func_start GetGroundEffectFlags_ShortGrass
+GetGroundEffectFlags_ShortGrass: @ 8067E6C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -478,10 +478,10 @@ _08067EB4:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067E6C
+ thumb_func_end GetGroundEffectFlags_ShortGrass
- thumb_func_start sub_8067EBC
-sub_8067EBC: @ 8067EBC
+ thumb_func_start GetGroundEffectFlags_HotSprings
+GetGroundEffectFlags_HotSprings: @ 8067EBC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -521,10 +521,10 @@ _08067F04:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8067EBC
+ thumb_func_end GetGroundEffectFlags_HotSprings
- thumb_func_start sub_8067F0C
-sub_8067F0C: @ 8067F0C
+ thumb_func_start GetGroundEffectFlags_Seaweed
+GetGroundEffectFlags_Seaweed: @ 8067F0C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x1E]
@@ -541,10 +541,10 @@ _08067F26:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8067F0C
+ thumb_func_end GetGroundEffectFlags_Seaweed
- thumb_func_start sub_8067F2C
-sub_8067F2C: @ 8067F2C
+ thumb_func_start GetGroundEffectFlags_JumpLanding
+GetGroundEffectFlags_JumpLanding: @ 8067F2C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -591,7 +591,7 @@ _08067F7E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8067F2C
+ thumb_func_end GetGroundEffectFlags_JumpLanding
thumb_func_start sub_8067F88
sub_8067F88: @ 8067F88
@@ -619,7 +619,7 @@ _08067FA0:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
mov r9, r4
@@ -635,7 +635,7 @@ _08067FA0:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -664,7 +664,7 @@ _08067FFC:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -681,7 +681,7 @@ _08067FFC:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -698,7 +698,7 @@ _08067FFC:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -715,7 +715,7 @@ _08067FFC:
bl sub_8058F78
lsls r0, 24
lsrs r0, 24
- bl sub_80680C8
+ bl GetReflectionTypeByMetatileBehavior
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -749,8 +749,8 @@ _080680BA:
bx r1
thumb_func_end sub_8067F88
- thumb_func_start sub_80680C8
-sub_80680C8: @ 80680C8
+ thumb_func_start GetReflectionTypeByMetatileBehavior
+GetReflectionTypeByMetatileBehavior: @ 80680C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -775,10 +775,10 @@ _080680F0:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80680C8
+ thumb_func_end GetReflectionTypeByMetatileBehavior
- thumb_func_start sub_80680F8
-sub_80680F8: @ 80680F8
+ thumb_func_start GetLedgeJumpDirection
+GetLedgeJumpDirection: @ 80680F8
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -826,10 +826,10 @@ _0806814E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80680F8
+ thumb_func_end GetLedgeJumpDirection
- thumb_func_start sub_8068154
-sub_8068154: @ 8068154
+ thumb_func_start FieldObjectSetSpriteOamTableForLongGrass
+FieldObjectSetSpriteOamTableForLongGrass: @ 8068154
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -858,7 +858,7 @@ sub_8068154: @ 8068154
strb r0, [r4]
ldrb r0, [r5, 0xB]
lsrs r0, 4
- bl sub_8068294
+ bl ZCoordToPriority
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -873,10 +873,10 @@ _080681A8:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8068154
+ thumb_func_end FieldObjectSetSpriteOamTableForLongGrass
- thumb_func_start sub_80681B0
-sub_80681B0: @ 80681B0
+ thumb_func_start IsZCoordMismatchAt
+IsZCoordMismatchAt: @ 80681B0
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -890,7 +890,7 @@ sub_80681B0: @ 80681B0
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -908,10 +908,10 @@ _080681E4:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80681B0
+ thumb_func_end IsZCoordMismatchAt
- thumb_func_start sub_80681EC
-sub_80681EC: @ 80681EC
+ thumb_func_start FieldObjectUpdateZCoordAndPriority
+FieldObjectUpdateZCoordAndPriority: @ 80681EC
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -920,7 +920,7 @@ sub_80681EC: @ 80681EC
cmp r0, 0
blt _0806823A
adds r0, r4, 0
- bl sub_80682A4
+ bl FieldObjectUpdateZCoord
ldr r1, _08068240 @ =gUnknown_83A708C
ldrb r2, [r4, 0xB]
lsls r2, 24
@@ -957,10 +957,10 @@ _0806823A:
.align 2, 0
_08068240: .4byte gUnknown_83A708C
_08068244: .4byte gUnknown_83A707C
- thumb_func_end sub_80681EC
+ thumb_func_end FieldObjectUpdateZCoordAndPriority
- thumb_func_start sub_8068248
-sub_8068248: @ 8068248
+ thumb_func_start InitObjectPriorityByZCoord
+InitObjectPriorityByZCoord: @ 8068248
push {r4,lr}
lsls r1, 24
lsrs r1, 24
@@ -998,10 +998,10 @@ sub_8068248: @ 8068248
.align 2, 0
_0806828C: .4byte gUnknown_83A708C
_08068290: .4byte gUnknown_83A707C
- thumb_func_end sub_8068248
+ thumb_func_end InitObjectPriorityByZCoord
- thumb_func_start sub_8068294
-sub_8068294: @ 8068294
+ thumb_func_start ZCoordToPriority
+ZCoordToPriority: @ 8068294
lsls r0, 24
lsrs r0, 24
ldr r1, _080682A0 @ =gUnknown_83A707C
@@ -1010,24 +1010,24 @@ sub_8068294: @ 8068294
bx lr
.align 2, 0
_080682A0: .4byte gUnknown_83A707C
- thumb_func_end sub_8068294
+ thumb_func_end ZCoordToPriority
- thumb_func_start sub_80682A4
-sub_80682A4: @ 80682A4
+ thumb_func_start FieldObjectUpdateZCoord
+FieldObjectUpdateZCoord: @ 80682A4
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0x10
ldrsh r0, [r4, r1]
movs r2, 0x12
ldrsh r1, [r4, r2]
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r5, r0, 24
movs r1, 0x14
ldrsh r0, [r4, r1]
movs r2, 0x16
ldrsh r1, [r4, r2]
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
cmp r5, 0xF
@@ -1055,10 +1055,10 @@ _080682F2:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80682A4
+ thumb_func_end FieldObjectUpdateZCoord
- thumb_func_start sub_80682F8
-sub_80682F8: @ 80682F8
+ thumb_func_start SetObjectSubpriorityByZCoord
+SetObjectSubpriorityByZCoord: @ 80682F8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -1094,10 +1094,10 @@ sub_80682F8: @ 80682F8
.align 2, 0
_08068338: .4byte gUnknown_2021BCA
_0806833C: .4byte gUnknown_83A706C
- thumb_func_end sub_80682F8
+ thumb_func_end SetObjectSubpriorityByZCoord
- thumb_func_start sub_8068340
-sub_8068340: @ 8068340
+ thumb_func_start FieldObjectUpdateSubpriority
+FieldObjectUpdateSubpriority: @ 8068340
push {lr}
adds r2, r0, 0
ldrb r0, [r2, 0x3]
@@ -1107,14 +1107,14 @@ sub_8068340: @ 8068340
ldrb r0, [r2, 0xB]
lsrs r0, 4
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
_08068356:
pop {r0}
bx r0
- thumb_func_end sub_8068340
+ thumb_func_end FieldObjectUpdateSubpriority
- thumb_func_start sub_806835C
-sub_806835C: @ 806835C
+ thumb_func_start AreZCoordsCompatible
+AreZCoordsCompatible: @ 806835C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1134,10 +1134,10 @@ _08068376:
_08068378:
pop {r1}
bx r1
- thumb_func_end sub_806835C
+ thumb_func_end AreZCoordsCompatible
- thumb_func_start sub_806837C
-sub_806837C: @ 806837C
+ thumb_func_start GroundEffect_SpawnOnTallGrass
+GroundEffect_SpawnOnTallGrass: @ 806837C
push {lr}
ldr r3, _080683C0 @ =gUnknown_20386E0
movs r2, 0x10
@@ -1168,16 +1168,16 @@ sub_806837C: @ 806837C
movs r0, 0x1
str r0, [r3, 0x1C]
movs r0, 0x4
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_080683C0: .4byte gUnknown_20386E0
_080683C4: .4byte gUnknown_3005008
- thumb_func_end sub_806837C
+ thumb_func_end GroundEffect_SpawnOnTallGrass
- thumb_func_start sub_80683C8
-sub_80683C8: @ 80683C8
+ thumb_func_start GroundEffect_StepOnTallGrass
+GroundEffect_StepOnTallGrass: @ 80683C8
push {lr}
ldr r3, _0806840C @ =gUnknown_20386E0
movs r2, 0x10
@@ -1208,16 +1208,16 @@ sub_80683C8: @ 80683C8
movs r0, 0
str r0, [r3, 0x1C]
movs r0, 0x4
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_0806840C: .4byte gUnknown_20386E0
_08068410: .4byte gUnknown_3005008
- thumb_func_end sub_80683C8
+ thumb_func_end GroundEffect_StepOnTallGrass
- thumb_func_start sub_8068414
-sub_8068414: @ 8068414
+ thumb_func_start GroundEffect_SpawnOnLongGrass
+GroundEffect_SpawnOnLongGrass: @ 8068414
push {lr}
ldr r3, _08068458 @ =gUnknown_20386E0
movs r2, 0x10
@@ -1248,16 +1248,16 @@ sub_8068414: @ 8068414
movs r0, 0x1
str r0, [r3, 0x1C]
movs r0, 0x11
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_08068458: .4byte gUnknown_20386E0
_0806845C: .4byte gUnknown_3005008
- thumb_func_end sub_8068414
+ thumb_func_end GroundEffect_SpawnOnLongGrass
- thumb_func_start sub_8068460
-sub_8068460: @ 8068460
+ thumb_func_start GroundEffect_StepOnLongGrass
+GroundEffect_StepOnLongGrass: @ 8068460
push {lr}
ldr r3, _080684A4 @ =gUnknown_20386E0
movs r2, 0x10
@@ -1288,44 +1288,44 @@ sub_8068460: @ 8068460
movs r0, 0
str r0, [r3, 0x1C]
movs r0, 0x11
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_080684A4: .4byte gUnknown_20386E0
_080684A8: .4byte gUnknown_3005008
- thumb_func_end sub_8068460
+ thumb_func_end GroundEffect_StepOnLongGrass
- thumb_func_start sub_80684AC
-sub_80684AC: @ 80684AC
+ thumb_func_start GroundEffect_WaterReflection
+GroundEffect_WaterReflection: @ 80684AC
push {lr}
movs r2, 0
- bl sub_80DAD7C
+ bl SetUpReflection
pop {r0}
bx r0
- thumb_func_end sub_80684AC
+ thumb_func_end GroundEffect_WaterReflection
- thumb_func_start sub_80684B8
-sub_80684B8: @ 80684B8
+ thumb_func_start GroundEffect_IceReflection
+GroundEffect_IceReflection: @ 80684B8
push {lr}
movs r2, 0x1
- bl sub_80DAD7C
+ bl SetUpReflection
pop {r0}
bx r0
- thumb_func_end sub_80684B8
+ thumb_func_end GroundEffect_IceReflection
- thumb_func_start sub_80684C4
-sub_80684C4: @ 80684C4
+ thumb_func_start GroundEffect_FlowingWater
+GroundEffect_FlowingWater: @ 80684C4
push {lr}
adds r1, r0, 0
movs r0, 0x22
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
pop {r0}
bx r0
- thumb_func_end sub_80684C4
+ thumb_func_end GroundEffect_FlowingWater
- thumb_func_start sub_80684D4
-sub_80684D4: @ 80684D4
+ thumb_func_start GroundEffect_SandTracks
+GroundEffect_SandTracks: @ 80684D4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1345,10 +1345,10 @@ sub_80684D4: @ 80684D4
bx r0
.align 2, 0
_080684FC: .4byte gUnknown_83A709C
- thumb_func_end sub_80684D4
+ thumb_func_end GroundEffect_SandTracks
- thumb_func_start sub_8068500
-sub_8068500: @ 8068500
+ thumb_func_start GroundEffect_DeepSandTracks
+GroundEffect_DeepSandTracks: @ 8068500
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1368,15 +1368,15 @@ sub_8068500: @ 8068500
bx r0
.align 2, 0
_08068528: .4byte gUnknown_83A709C
- thumb_func_end sub_8068500
+ thumb_func_end GroundEffect_DeepSandTracks
thumb_func_start nullsub_26
nullsub_26: @ 806852C
bx lr
thumb_func_end nullsub_26
- thumb_func_start sub_8068530
-sub_8068530: @ 8068530
+ thumb_func_start DoTracksGroundEffect_Footprints
+DoTracksGroundEffect_Footprints: @ 8068530
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1405,7 +1405,7 @@ sub_8068530: @ 8068530
mov r1, sp
adds r0, r1, r4
ldrb r0, [r0]
- bl sub_8083444
+ bl FieldEffectStart
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -1413,10 +1413,10 @@ sub_8068530: @ 8068530
.align 2, 0
_08068578: .4byte gUnknown_83A70A8
_0806857C: .4byte gUnknown_20386E0
- thumb_func_end sub_8068530
+ thumb_func_end DoTracksGroundEffect_Footprints
- thumb_func_start sub_8068580
-sub_8068580: @ 8068580
+ thumb_func_start DoTracksGroundEffect_BikeTireTracks
+DoTracksGroundEffect_BikeTireTracks: @ 8068580
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x10]
@@ -1448,7 +1448,7 @@ sub_8068580: @ 8068580
ldrb r0, [r1]
str r0, [r2, 0x10]
movs r0, 0x23
- bl sub_8083444
+ bl FieldEffectStart
_080685C2:
pop {r4}
pop {r0}
@@ -1456,38 +1456,38 @@ _080685C2:
.align 2, 0
_080685C8: .4byte gUnknown_20386E0
_080685CC: .4byte gUnknown_83A70AC
- thumb_func_end sub_8068580
+ thumb_func_end DoTracksGroundEffect_BikeTireTracks
- thumb_func_start sub_80685D0
-sub_80685D0: @ 80685D0
+ thumb_func_start GroundEffect_Ripple
+GroundEffect_Ripple: @ 80685D0
push {lr}
- bl sub_806930C
+ bl DoRippleFieldEffect
pop {r0}
bx r0
- thumb_func_end sub_80685D0
+ thumb_func_end GroundEffect_Ripple
- thumb_func_start sub_80685DC
-sub_80685DC: @ 80685DC
+ thumb_func_start GroundEffect_StepOnPuddle
+GroundEffect_StepOnPuddle: @ 80685DC
push {lr}
adds r1, r0, 0
movs r0, 0xF
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
pop {r0}
bx r0
- thumb_func_end sub_80685DC
+ thumb_func_end GroundEffect_StepOnPuddle
- thumb_func_start sub_80685EC
-sub_80685EC: @ 80685EC
+ thumb_func_start GroundEffect_SandHeap
+GroundEffect_SandHeap: @ 80685EC
push {lr}
adds r1, r0, 0
movs r0, 0x27
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
pop {r0}
bx r0
- thumb_func_end sub_80685EC
+ thumb_func_end GroundEffect_SandHeap
- thumb_func_start sub_80685FC
-sub_80685FC: @ 80685FC
+ thumb_func_start GroundEffect_JumpOnTallGrass
+GroundEffect_JumpOnTallGrass: @ 80685FC
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1505,7 +1505,7 @@ sub_80685FC: @ 80685FC
movs r0, 0x2
str r0, [r1, 0xC]
movs r0, 0xC
- bl sub_8083444
+ bl FieldEffectStart
ldrb r0, [r5, 0x8]
ldrb r1, [r5, 0x9]
ldrb r2, [r5, 0xA]
@@ -1521,7 +1521,7 @@ sub_80685FC: @ 80685FC
bne _08068646
adds r0, r5, 0
adds r1, r6, 0
- bl sub_806837C
+ bl GroundEffect_SpawnOnTallGrass
_08068646:
add sp, 0x4
pop {r4-r7}
@@ -1529,10 +1529,10 @@ _08068646:
bx r0
.align 2, 0
_08068650: .4byte gUnknown_20386E0
- thumb_func_end sub_80685FC
+ thumb_func_end GroundEffect_JumpOnTallGrass
- thumb_func_start sub_8068654
-sub_8068654: @ 8068654
+ thumb_func_start GroundEffect_JumpOnLongGrass
+GroundEffect_JumpOnLongGrass: @ 8068654
push {lr}
ldr r2, _08068678 @ =gUnknown_20386E0
movs r3, 0x10
@@ -1547,15 +1547,15 @@ sub_8068654: @ 8068654
movs r0, 0x2
str r0, [r2, 0xC]
movs r0, 0x12
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_08068678: .4byte gUnknown_20386E0
- thumb_func_end sub_8068654
+ thumb_func_end GroundEffect_JumpOnLongGrass
- thumb_func_start sub_806867C
-sub_806867C: @ 806867C
+ thumb_func_start GroundEffect_JumpOnShallowWater
+GroundEffect_JumpOnShallowWater: @ 806867C
push {r4,lr}
ldr r3, _080686A8 @ =gUnknown_20386E0
movs r4, 0x10
@@ -1572,16 +1572,16 @@ sub_806867C: @ 806867C
lsrs r0, 30
str r0, [r3, 0xC]
movs r0, 0x10
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080686A8: .4byte gUnknown_20386E0
- thumb_func_end sub_806867C
+ thumb_func_end GroundEffect_JumpOnShallowWater
- thumb_func_start sub_80686AC
-sub_80686AC: @ 80686AC
+ thumb_func_start GroundEffect_JumpOnWater
+GroundEffect_JumpOnWater: @ 80686AC
push {r4,lr}
ldr r3, _080686D8 @ =gUnknown_20386E0
movs r4, 0x10
@@ -1598,16 +1598,16 @@ sub_80686AC: @ 80686AC
lsrs r0, 30
str r0, [r3, 0xC]
movs r0, 0xE
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080686D8: .4byte gUnknown_20386E0
- thumb_func_end sub_80686AC
+ thumb_func_end GroundEffect_JumpOnWater
- thumb_func_start sub_80686DC
-sub_80686DC: @ 80686DC
+ thumb_func_start GroundEffect_JumpLandingDust
+GroundEffect_JumpLandingDust: @ 80686DC
push {r4,lr}
ldr r3, _08068708 @ =gUnknown_20386E0
movs r4, 0x10
@@ -1624,36 +1624,36 @@ sub_80686DC: @ 80686DC
lsrs r0, 30
str r0, [r3, 0xC]
movs r0, 0xA
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08068708: .4byte gUnknown_20386E0
- thumb_func_end sub_80686DC
+ thumb_func_end GroundEffect_JumpLandingDust
- thumb_func_start sub_806870C
-sub_806870C: @ 806870C
+ thumb_func_start GroundEffect_ShortGrass
+GroundEffect_ShortGrass: @ 806870C
push {lr}
adds r1, r0, 0
movs r0, 0x29
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
pop {r0}
bx r0
- thumb_func_end sub_806870C
+ thumb_func_end GroundEffect_ShortGrass
- thumb_func_start sub_806871C
-sub_806871C: @ 806871C
+ thumb_func_start GroundEffect_HotSprings
+GroundEffect_HotSprings: @ 806871C
push {lr}
adds r1, r0, 0
movs r0, 0x2A
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
pop {r0}
bx r0
- thumb_func_end sub_806871C
+ thumb_func_end GroundEffect_HotSprings
- thumb_func_start sub_806872C
-sub_806872C: @ 806872C
+ thumb_func_start GroundEffect_Seaweed
+GroundEffect_Seaweed: @ 806872C
push {lr}
ldr r2, _08068748 @ =gUnknown_20386E0
movs r3, 0x10
@@ -1663,15 +1663,15 @@ sub_806872C: @ 806872C
ldrsh r0, [r0, r1]
str r0, [r2, 0x4]
movs r0, 0x35
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_08068748: .4byte gUnknown_20386E0
- thumb_func_end sub_806872C
+ thumb_func_end GroundEffect_Seaweed
- thumb_func_start sub_806874C
-sub_806874C: @ 806874C
+ thumb_func_start DoFlaggedGroundEffects
+DoFlaggedGroundEffects: @ 806874C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1715,10 +1715,10 @@ _0806878E:
bx r0
.align 2, 0
_08068798: .4byte gUnknown_83A70BC
- thumb_func_end sub_806874C
+ thumb_func_end DoFlaggedGroundEffects
- thumb_func_start sub_806879C
-sub_806879C: @ 806879C
+ thumb_func_start filters_out_some_ground_effects
+filters_out_some_ground_effects: @ 806879C
push {lr}
adds r2, r0, 0
adds r3, r1, 0
@@ -1747,10 +1747,10 @@ _080687CA:
bx r0
.align 2, 0
_080687D0: .4byte 0xfff9f7bd
- thumb_func_end sub_806879C
+ thumb_func_end filters_out_some_ground_effects
- thumb_func_start sub_80687D4
-sub_80687D4: @ 80687D4
+ thumb_func_start FilterOutStepOnPuddleGroundEffectIfJumping
+FilterOutStepOnPuddleGroundEffectIfJumping: @ 80687D4
push {lr}
adds r2, r1, 0
ldrb r0, [r0]
@@ -1766,10 +1766,10 @@ _080687E8:
bx r0
.align 2, 0
_080687EC: .4byte 0xfffffbff
- thumb_func_end sub_80687D4
+ thumb_func_end FilterOutStepOnPuddleGroundEffectIfJumping
- thumb_func_start sub_80687F0
-sub_80687F0: @ 80687F0
+ thumb_func_start DoGroundEffects_OnSpawn
+DoGroundEffects_OnSpawn: @ 80687F0
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1781,17 +1781,17 @@ sub_80687F0: @ 80687F0
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl sub_80681EC
+ bl FieldObjectUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
- bl sub_8067B34
+ bl GetAllGroundEffectFlags_OnSpawn
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068154
+ bl FieldObjectSetSpriteOamTableForLongGrass
ldr r2, [sp]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806874C
+ bl DoFlaggedGroundEffects
ldrb r1, [r4]
movs r0, 0x5
negs r0, r0
@@ -1805,10 +1805,10 @@ _08068834:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80687F0
+ thumb_func_end DoGroundEffects_OnSpawn
- thumb_func_start sub_806883C
-sub_806883C: @ 806883C
+ thumb_func_start DoGroundEffects_OnBeginStep
+DoGroundEffects_OnBeginStep: @ 806883C
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1820,20 +1820,20 @@ sub_806883C: @ 806883C
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl sub_80681EC
+ bl FieldObjectUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
- bl sub_8067B7C
+ bl GetAllGroundEffectFlags_OnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068154
+ bl FieldObjectSetSpriteOamTableForLongGrass
adds r0, r4, 0
mov r1, sp
- bl sub_806879C
+ bl filters_out_some_ground_effects
ldr r2, [sp]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806874C
+ bl DoFlaggedGroundEffects
ldrb r1, [r4]
movs r0, 0x5
negs r0, r0
@@ -1847,10 +1847,10 @@ _08068888:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_806883C
+ thumb_func_end DoGroundEffects_OnBeginStep
- thumb_func_start sub_8068890
-sub_8068890: @ 8068890
+ thumb_func_start DoGroundEffects_OnFinishStep
+DoGroundEffects_OnFinishStep: @ 8068890
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1862,20 +1862,20 @@ sub_8068890: @ 8068890
movs r0, 0
str r0, [sp]
adds r0, r4, 0
- bl sub_80681EC
+ bl FieldObjectUpdateZCoordAndPriority
adds r0, r4, 0
mov r1, sp
- bl sub_8067BD4
+ bl GetAllGroundEffectFlags_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068154
+ bl FieldObjectSetSpriteOamTableForLongGrass
adds r0, r4, 0
mov r1, sp
- bl sub_80687D4
+ bl FilterOutStepOnPuddleGroundEffectIfJumping
ldr r2, [sp]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806874C
+ bl DoFlaggedGroundEffects
ldrb r1, [r4]
movs r0, 0x9
negs r0, r0
@@ -1889,6 +1889,6 @@ _080688DC:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8068890
+ thumb_func_end DoGroundEffects_OnFinishStep
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s
index 99febe96f..7009f5b1a 100644
--- a/asm/field_map_obj.s
+++ b/asm/field_map_obj.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_805DE2C
-sub_805DE2C: @ 805DE2C
+ thumb_func_start npc_clear_ids_and_state
+npc_clear_ids_and_state: @ 805DE2C
push {r4,lr}
adds r4, r0, 0
movs r1, 0
@@ -22,10 +22,10 @@ sub_805DE2C: @ 805DE2C
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805DE2C
+ thumb_func_end npc_clear_ids_and_state
- thumb_func_start sub_805DE4C
-sub_805DE4C: @ 805DE4C
+ thumb_func_start npcs_clear_ids_and_state
+npcs_clear_ids_and_state: @ 805DE4C
push {r4,r5,lr}
movs r4, 0
ldr r5, _0805DE70 @ =gUnknown_2036E38
@@ -34,7 +34,7 @@ _0805DE52:
adds r0, r4
lsls r0, 2
adds r0, r5
- bl sub_805DE2C
+ bl npc_clear_ids_and_state
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -45,14 +45,14 @@ _0805DE52:
bx r0
.align 2, 0
_0805DE70: .4byte gUnknown_2036E38
- thumb_func_end sub_805DE4C
+ thumb_func_end npcs_clear_ids_and_state
thumb_func_start sub_805DE74
sub_805DE74: @ 805DE74
push {lr}
- bl sub_8058378
- bl sub_805DE4C
- bl sub_805C95C
+ bl strange_npc_table_clear
+ bl npcs_clear_ids_and_state
+ bl ClearPlayerAvatarInfo
bl sub_805DE8C
pop {r0}
bx r0
@@ -71,7 +71,7 @@ sub_805DE8C: @ 805DE8C
movs r1, 0
movs r2, 0
movs r3, 0x1F
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
ldr r1, _0805DF2C @ =gUnknown_202063C
@@ -91,10 +91,10 @@ sub_805DE8C: @ 805DE8C
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
movs r6, 0x4
@@ -104,7 +104,7 @@ sub_805DE8C: @ 805DE8C
movs r1, 0
movs r2, 0
movs r3, 0x1F
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -117,10 +117,10 @@ sub_805DE8C: @ 805DE8C
orrs r5, r0
strb r5, [r4, 0x1]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r6
@@ -167,8 +167,8 @@ _0805DF5A:
bx r1
thumb_func_end sub_805DF30
- thumb_func_start sub_805DF60
-sub_805DF60: @ 805DF60
+ thumb_func_start GetFieldObjectIdByLocalIdAndMap
+GetFieldObjectIdByLocalIdAndMap: @ 805DF60
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -178,19 +178,19 @@ sub_805DF60: @ 805DF60
lsrs r2, 24
cmp r0, 0xFE
bls _0805DF78
- bl sub_805E044
+ bl GetFieldObjectIdByLocalId
b _0805DF7C
_0805DF78:
- bl sub_805DFF4
+ bl GetFieldObjectIdByLocalIdAndMapInternal
_0805DF7C:
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_805DF60
+ thumb_func_end GetFieldObjectIdByLocalIdAndMap
- thumb_func_start sub_805DF84
-sub_805DF84: @ 805DF84
+ thumb_func_start TryGetFieldObjectIdByLocalIdAndMap
+TryGetFieldObjectIdByLocalIdAndMap: @ 805DF84
push {r4,lr}
adds r4, r3, 0
lsls r0, 24
@@ -199,7 +199,7 @@ sub_805DF84: @ 805DF84
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -213,10 +213,10 @@ _0805DFA8:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_805DF84
+ thumb_func_end TryGetFieldObjectIdByLocalIdAndMap
- thumb_func_start sub_805DFB0
-sub_805DFB0: @ 805DFB0
+ thumb_func_start GetFieldObjectIdByXY
+GetFieldObjectIdByXY: @ 805DFB0
push {r4-r6,lr}
movs r3, 0
ldr r5, _0805DFF0 @ =gUnknown_2036E38
@@ -254,10 +254,10 @@ _0805DFE8:
bx r1
.align 2, 0
_0805DFF0: .4byte gUnknown_2036E38
- thumb_func_end sub_805DFB0
+ thumb_func_end GetFieldObjectIdByXY
- thumb_func_start sub_805DFF4
-sub_805DFF4: @ 805DFF4
+ thumb_func_start GetFieldObjectIdByLocalIdAndMapInternal
+GetFieldObjectIdByLocalIdAndMapInternal: @ 805DFF4
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -300,10 +300,10 @@ _0805E03C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805DFF4
+ thumb_func_end GetFieldObjectIdByLocalIdAndMapInternal
- thumb_func_start sub_805E044
-sub_805E044: @ 805E044
+ thumb_func_start GetFieldObjectIdByLocalId
+GetFieldObjectIdByLocalId: @ 805E044
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -336,7 +336,7 @@ _0805E078:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_805E044
+ thumb_func_end GetFieldObjectIdByLocalId
thumb_func_start sub_805E080
sub_805E080: @ 805E080
@@ -376,7 +376,7 @@ sub_805E080: @ 805E080
str r0, [sp, 0x8]
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldr r1, [r0, 0x4]
lsls r0, r4, 1
adds r0, r4
@@ -389,7 +389,7 @@ _0805E0DA:
adds r1, r7, 0
adds r2, r6, 0
mov r3, sp
- bl sub_805E414
+ bl GetAvailableFieldObjectSlot
lsls r0, 24
cmp r0, 0
bne _0805E106
@@ -417,7 +417,7 @@ _0805E10A:
ldr r1, _0805E13C @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_805DE2C
+ bl npc_clear_ids_and_state
mov r1, r10
cmp r1, 0
beq _0805E140
@@ -510,9 +510,9 @@ _0805E14E:
strb r1, [r0]
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r4, 0
- bl sub_805F2F8
+ bl FieldObjectHandleDynamicGraphicsId
ldr r1, _0805E234 @ =gUnknown_839FD0C
ldrb r0, [r4, 0x6]
adds r0, r1
@@ -666,10 +666,10 @@ _0805E2E0:
sub_805E2E8: @ 805E2E8
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8056188
+ bl sav1_map_get_light_level
lsls r0, 24
lsrs r0, 24
- bl sub_80561D8
+ bl is_light_level_1_2_3_5_or_6
lsls r0, 24
cmp r0, 0
beq _0805E37C
@@ -828,8 +828,8 @@ _0805E406:
_0805E410: .4byte gUnknown_3005008
thumb_func_end sub_805E3A0
- thumb_func_start sub_805E414
-sub_805E414: @ 805E414
+ thumb_func_start GetAvailableFieldObjectSlot
+GetAvailableFieldObjectSlot: @ 805E414
push {r4-r7,lr}
mov r12, r3
lsls r0, 16
@@ -917,23 +917,23 @@ _0805E4A8:
bx r1
.align 2, 0
_0805E4B0: .4byte gUnknown_2036E38
- thumb_func_end sub_805E414
+ thumb_func_end GetAvailableFieldObjectSlot
- thumb_func_start sub_805E4B4
-sub_805E4B4: @ 805E4B4
+ thumb_func_start RemoveFieldObject
+RemoveFieldObject: @ 805E4B4
push {lr}
ldrb r2, [r0]
movs r1, 0x2
negs r1, r1
ands r1, r2
strb r1, [r0]
- bl sub_805E510
+ bl RemoveFieldObjectInternal
pop {r0}
bx r0
- thumb_func_end sub_805E4B4
+ thumb_func_end RemoveFieldObject
- thumb_func_start sub_805E4C8
-sub_805E4C8: @ 805E4C8
+ thumb_func_start RemoveFieldObjectByLocalIdAndMap
+RemoveFieldObjectByLocalIdAndMap: @ 805E4C8
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -943,13 +943,13 @@ sub_805E4C8: @ 805E4C8
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805E506
mov r0, sp
ldrb r0, [r0]
- bl sub_805FC74
+ bl GetFieldObjectFlagIdByFieldObjectId
lsls r0, 16
lsrs r0, 16
bl sub_806E680
@@ -960,17 +960,17 @@ sub_805E4C8: @ 805E4C8
lsls r0, 2
ldr r1, _0805E50C @ =gUnknown_2036E38
adds r0, r1
- bl sub_805E4B4
+ bl RemoveFieldObject
_0805E506:
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_0805E50C: .4byte gUnknown_2036E38
- thumb_func_end sub_805E4C8
+ thumb_func_end RemoveFieldObjectByLocalIdAndMap
- thumb_func_start sub_805E510
-sub_805E510: @ 805E510
+ thumb_func_start RemoveFieldObjectInternal
+RemoveFieldObjectInternal: @ 805E510
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -997,7 +997,7 @@ sub_805E510: @ 805E510
adds r0, r1
lsls r0, 2
adds r0, r2
- bl sub_8007280
+ bl DestroySprite
add sp, 0x8
pop {r4}
pop {r0}
@@ -1005,10 +1005,10 @@ sub_805E510: @ 805E510
.align 2, 0
_0805E554: .4byte 0xffff0000
_0805E558: .4byte gUnknown_202063C
- thumb_func_end sub_805E510
+ thumb_func_end RemoveFieldObjectInternal
- thumb_func_start sub_805E55C
-sub_805E55C: @ 805E55C
+ thumb_func_start unref_sub_808D958
+unref_sub_808D958: @ 805E55C
push {r4,lr}
movs r4, 0
_0805E560:
@@ -1021,7 +1021,7 @@ _0805E560:
lsls r0, 2
ldr r1, _0805E58C @ =gUnknown_2036E38
adds r0, r1
- bl sub_805E4B4
+ bl RemoveFieldObject
_0805E576:
adds r0, r4, 0x1
lsls r0, 24
@@ -1034,7 +1034,7 @@ _0805E576:
.align 2, 0
_0805E588: .4byte gUnknown_2037078
_0805E58C: .4byte gUnknown_2036E38
- thumb_func_end sub_805E55C
+ thumb_func_end unref_sub_808D958
thumb_func_start sub_805E590
sub_805E590: @ 805E590
@@ -1084,7 +1084,7 @@ _0805E5CA:
ldrh r0, [r6, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F5E8
+ bl npc_load_two_palettes__no_record
b _0805E606
.align 2, 0
_0805E5F4: .4byte gUnknown_2036E38
@@ -1094,7 +1094,7 @@ _0805E5F8:
ldrh r0, [r6, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
_0805E606:
ldrb r0, [r5, 0x6]
cmp r0, 0x4C
@@ -1111,7 +1111,7 @@ _0805E614:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x40
@@ -1212,18 +1212,18 @@ _0805E650:
ldrb r0, [r5, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0805E702:
ldrb r0, [r5, 0xB]
lsrs r0, 4
adds r1, r4, 0
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
adds r0, r5, 0
adds r1, r4, 0
bl sub_80679F8
@@ -1240,8 +1240,8 @@ _0805E718:
_0805E728: .4byte gUnknown_202063C
thumb_func_end sub_805E590
- thumb_func_start sub_805E72C
-sub_805E72C: @ 805E72C
+ thumb_func_start SpawnFieldObject
+SpawnFieldObject: @ 805E72C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1325,7 +1325,7 @@ _0805E7A8:
lsls r0, 2
adds r0, r4
adds r1, r2, 0
- bl sub_8008A58
+ bl SetSubspriteTables
_0805E7DC:
adds r0, r5, 0
_0805E7DE:
@@ -1339,10 +1339,10 @@ _0805E7DE:
.align 2, 0
_0805E7EC: .4byte gUnknown_202063C
_0805E7F0: .4byte gUnknown_2036E38
- thumb_func_end sub_805E72C
+ thumb_func_end SpawnFieldObject
- thumb_func_start sub_805E7F4
-sub_805E7F4: @ 805E7F4
+ thumb_func_start SpawnSpecialFieldObject
+SpawnSpecialFieldObject: @ 805E7F4
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -1350,7 +1350,7 @@ sub_805E7F4: @ 805E7F4
adds r4, 0x6
add r0, sp, 0x4
adds r1, r4, 0
- bl sub_8063C10
+ bl GetFieldObjectMovingCameraOffset
ldr r0, _0805E82C @ =gUnknown_3005008
ldr r0, [r0]
ldrb r1, [r0, 0x5]
@@ -1362,7 +1362,7 @@ sub_805E7F4: @ 805E7F4
ldrsh r0, [r4, r6]
str r0, [sp]
adds r0, r5, 0
- bl sub_805E72C
+ bl SpawnFieldObject
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -1371,10 +1371,10 @@ sub_805E7F4: @ 805E7F4
bx r1
.align 2, 0
_0805E82C: .4byte gUnknown_3005008
- thumb_func_end sub_805E7F4
+ thumb_func_end SpawnSpecialFieldObject
- thumb_func_start sub_805E830
-sub_805E830: @ 805E830
+ thumb_func_start SpawnSpecialFieldObjectParametrized
+SpawnSpecialFieldObjectParametrized: @ 805E830
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1414,7 +1414,7 @@ sub_805E830: @ 805E830
strb r5, [r0, 0xA]
strh r6, [r0, 0xC]
strh r6, [r0, 0xE]
- bl sub_805E7F4
+ bl SpawnSpecialFieldObject
lsls r0, 24
lsrs r0, 24
add sp, 0x18
@@ -1425,10 +1425,10 @@ sub_805E830: @ 805E830
bx r1
.align 2, 0
_0805E894: .4byte 0xfff90000
- thumb_func_end sub_805E830
+ thumb_func_end SpawnSpecialFieldObjectParametrized
- thumb_func_start sub_805E898
-sub_805E898: @ 805E898
+ thumb_func_start show_sprite
+show_sprite: @ 805E898
push {r4-r7,lr}
sub sp, 0x8
lsls r0, 24
@@ -1439,7 +1439,7 @@ sub_805E898: @ 805E898
lsrs r6, r2, 24
adds r1, r7, 0
adds r2, r6, 0
- bl sub_805FD5C
+ bl GetFieldObjectTemplateByLocalIdAndMap
adds r5, r0, 0
cmp r5, 0
beq _0805E8DE
@@ -1447,7 +1447,7 @@ sub_805E898: @ 805E898
adds r4, 0x6
add r0, sp, 0x4
adds r1, r4, 0
- bl sub_8063C10
+ bl GetFieldObjectMovingCameraOffset
add r0, sp, 0x4
movs r1, 0
ldrsh r3, [r0, r1]
@@ -1457,7 +1457,7 @@ sub_805E898: @ 805E898
adds r0, r5, 0
adds r1, r7, 0
adds r2, r6, 0
- bl sub_805E72C
+ bl SpawnFieldObject
lsls r0, 24
lsrs r0, 24
b _0805E8E0
@@ -1468,7 +1468,7 @@ _0805E8E0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805E898
+ thumb_func_end show_sprite
thumb_func_start sub_805E8E8
sub_805E8E8: @ 805E8E8
@@ -1492,7 +1492,7 @@ sub_805E8E8: @ 805E8E8
str r0, [r4, 0xC]
ldr r0, [r5, 0x20]
str r0, [r4, 0x10]
- bl sub_8069A64
+ bl ScriptContext1_IsScriptSetUp
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1581,7 +1581,7 @@ _0805E9A8:
asrs r2, 16
mov r0, sp
adds r3, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -1595,7 +1595,7 @@ _0805E9A8:
ldr r0, _0805E9F4 @ =gUnknown_202063C
adds r4, r0
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r4, 0x42
ldrb r1, [r4]
movs r0, 0x3F
@@ -1675,7 +1675,7 @@ sub_805E9F8: @ 805E9F8
ldrsh r2, [r6, r0]
mov r0, sp
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x40
@@ -1728,13 +1728,13 @@ sub_805E9F8: @ 805E9F8
ldrh r0, [r4, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
_0805EAE4:
ldr r1, [sp, 0x1C]
cmp r1, 0
beq _0805EB00
adds r0, r5, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r2, r5, 0
adds r2, 0x42
ldrb r0, [r2]
@@ -1746,18 +1746,18 @@ _0805EAE4:
_0805EB00:
adds r0, r5, 0
mov r1, r9
- bl sub_8068248
+ bl InitObjectPriorityByZCoord
mov r0, r9
adds r1, r5, 0
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
ldr r0, [sp, 0x20]
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0805EB24:
adds r0, r6, 0
add sp, 0x24
@@ -1812,7 +1812,7 @@ sub_805EB44: @ 805EB44
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -1852,13 +1852,13 @@ sub_805EB44: @ 805EB44
ldrh r0, [r7, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
_0805EBE6:
ldr r1, [sp, 0x18]
cmp r1, 0
beq _0805EC02
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r2, r4, 0
adds r2, 0x42
ldrb r0, [r2]
@@ -1869,12 +1869,12 @@ _0805EBE6:
strb r1, [r2]
_0805EC02:
movs r0, 0x1
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0805EC14:
adds r0, r5, 0
add sp, 0x1C
@@ -1983,7 +1983,7 @@ _0805EC86:
str r0, [sp]
adds r0, r4, 0
asrs r3, 16
- bl sub_805E72C
+ bl SpawnFieldObject
_0805ECEC:
adds r0, r5, 0x1
lsls r0, 24
@@ -2118,7 +2118,7 @@ _0805EDB6:
ble _0805EDE4
_0805EDDE:
adds r0, r3, 0
- bl sub_805E4B4
+ bl RemoveFieldObject
_0805EDE4:
pop {r4-r7}
pop {r0}
@@ -2136,7 +2136,7 @@ sub_805EDF0: @ 805EDF0
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
- bl sub_805C95C
+ bl ClearPlayerAvatarInfo
movs r6, 0
ldr r7, _0805EE38 @ =gUnknown_2036E38
lsls r4, 16
@@ -2239,7 +2239,7 @@ _0805EE70:
ldrh r0, [r5, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F5E8
+ bl npc_load_two_palettes__no_record
_0805EECA:
ldrb r0, [r5, 0xC]
lsls r1, r0, 28
@@ -2248,14 +2248,14 @@ _0805EECA:
bls _0805EEDC
ldrh r0, [r5, 0x2]
lsrs r1, 28
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
_0805EEDC:
mov r0, sp
strh r4, [r0, 0x2]
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x40
@@ -2322,7 +2322,7 @@ _0805EF6A:
cmp r1, 0
beq _0805EF76
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
_0805EF76:
ldrb r1, [r5, 0xC]
lsls r1, 28
@@ -2351,12 +2351,12 @@ _0805EF76:
ldrb r0, [r6, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0805EFBC:
adds r0, r6, 0
bl sub_805EFF4
@@ -2364,7 +2364,7 @@ _0805EFBC:
lsrs r0, 4
adds r1, r4, 0
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
_0805EFCE:
add sp, 0x24
pop {r3-r5}
@@ -2408,7 +2408,7 @@ sub_805EFF4: @ 805EFF4
subs r2, 0x10
ands r1, r2
strb r1, [r0, 0x2]
- bl sub_8063D34
+ bl FieldObjectClearAnim
pop {r0}
bx r0
thumb_func_end sub_805EFF4
@@ -2431,7 +2431,7 @@ sub_805F02C: @ 805F02C
strb r0, [r5, 0x7]
ldrb r0, [r4, 0x5]
movs r1, 0x20
- bl sub_805CA0C
+ bl SetPlayerAvatarExtraStateTransition
pop {r4,r5}
pop {r0}
bx r0
@@ -2470,7 +2470,7 @@ sub_805F060: @ 805F060
ldrh r0, [r5, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F538
+ bl pal_patch_for_npc
_0805F09E:
ldrb r1, [r5, 0xC]
mov r0, r8
@@ -2480,7 +2480,7 @@ _0805F09E:
ldrh r0, [r5, 0x2]
lsls r1, 28
lsrs r1, 28
- bl sub_805F658
+ bl npc_load_two_palettes__and_record
_0805F0B2:
ldr r0, [r4, 0xC]
ldrh r0, [r0, 0x4]
@@ -2541,7 +2541,7 @@ _0805F0D6:
lsrs r0, 5
lsls r0, 24
lsrs r0, 24
- bl sub_8007434
+ bl AllocSpriteTiles
lsls r0, 16
asrs r2, r0, 16
movs r0, 0x1
@@ -2549,7 +2549,7 @@ _0805F0D6:
cmp r2, r0
bne _0805F142
mov r0, r10
- bl sub_8007434
+ bl AllocSpriteTiles
lsls r0, 16
asrs r2, r0, 16
_0805F142:
@@ -2611,7 +2611,7 @@ _0805F152:
lsrs r0, 7
cmp r0, 0
beq _0805F1BA
- bl sub_805FAA8
+ bl CameraObjectReset1
_0805F1BA:
add sp, 0x4
pop {r3-r5}
@@ -2627,8 +2627,8 @@ _0805F1D0: .4byte 0x000003ff
_0805F1D4: .4byte 0xfffffc00
thumb_func_end sub_805F060
- thumb_func_start sub_805F1D8
-sub_805F1D8: @ 805F1D8
+ thumb_func_start FieldObjectSetGraphicsIdByLocalIdAndMap
+FieldObjectSetGraphicsIdByLocalIdAndMap: @ 805F1D8
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -2640,7 +2640,7 @@ sub_805F1D8: @ 805F1D8
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F20C
@@ -2660,15 +2660,15 @@ _0805F20C:
bx r0
.align 2, 0
_0805F214: .4byte gUnknown_2036E38
- thumb_func_end sub_805F1D8
+ thumb_func_end FieldObjectSetGraphicsIdByLocalIdAndMap
- thumb_func_start sub_805F218
-sub_805F218: @ 805F218
+ thumb_func_start FieldObjectTurn
+FieldObjectTurn: @ 805F218
push {r4-r6,lr}
adds r6, r0, 0
lsls r1, 24
lsrs r1, 24
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r0, [r6, 0x1]
lsls r0, 27
cmp r0, 0
@@ -2682,29 +2682,29 @@ sub_805F218: @ 805F218
ldrb r0, [r6, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r6, 0x4]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r5
movs r1, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
_0805F25E:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0805F264: .4byte gUnknown_202063C
- thumb_func_end sub_805F218
+ thumb_func_end FieldObjectTurn
- thumb_func_start sub_805F268
-sub_805F268: @ 805F268
+ thumb_func_start FieldObjectTurnByLocalIdAndMap
+FieldObjectTurnByLocalIdAndMap: @ 805F268
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -2716,7 +2716,7 @@ sub_805F268: @ 805F268
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F29C
@@ -2728,7 +2728,7 @@ sub_805F268: @ 805F268
ldr r1, _0805F2A4 @ =gUnknown_2036E38
adds r0, r1
adds r1, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
_0805F29C:
add sp, 0x4
pop {r4}
@@ -2736,10 +2736,10 @@ _0805F29C:
bx r0
.align 2, 0
_0805F2A4: .4byte gUnknown_2036E38
- thumb_func_end sub_805F268
+ thumb_func_end FieldObjectTurnByLocalIdAndMap
- thumb_func_start sub_805F2A8
-sub_805F2A8: @ 805F2A8
+ thumb_func_start PlayerObjectTurn
+PlayerObjectTurn: @ 805F2A8
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -2749,12 +2749,12 @@ sub_805F2A8: @ 805F2A8
lsls r0, 2
ldr r2, _0805F2C4 @ =gUnknown_2036E38
adds r0, r2
- bl sub_805F218
+ bl FieldObjectTurn
pop {r0}
bx r0
.align 2, 0
_0805F2C4: .4byte gUnknown_2036E38
- thumb_func_end sub_805F2A8
+ thumb_func_end PlayerObjectTurn
thumb_func_start sub_805F2C8
sub_805F2C8: @ 805F2C8
@@ -2784,8 +2784,8 @@ _0805F2E6:
_0805F2F4: .4byte gUnknown_839FDB0
thumb_func_end sub_805F2C8
- thumb_func_start sub_805F2F8
-sub_805F2F8: @ 805F2F8
+ thumb_func_start FieldObjectHandleDynamicGraphicsId
+FieldObjectHandleDynamicGraphicsId: @ 805F2F8
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x5]
@@ -2800,10 +2800,10 @@ _0805F30E:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805F2F8
+ thumb_func_end FieldObjectHandleDynamicGraphicsId
- thumb_func_start sub_805F314
-sub_805F314: @ 805F314
+ thumb_func_start npc_by_local_id_and_map_set_field_1_bit_x20
+npc_by_local_id_and_map_set_field_1_bit_x20: @ 805F314
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -2815,7 +2815,7 @@ sub_805F314: @ 805F314
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F356
@@ -2843,10 +2843,10 @@ _0805F356:
bx r0
.align 2, 0
_0805F360: .4byte gUnknown_2036E38
- thumb_func_end sub_805F314
+ thumb_func_end npc_by_local_id_and_map_set_field_1_bit_x20
- thumb_func_start sub_805F364
-sub_805F364: @ 805F364
+ thumb_func_start FieldObjectGetLocalIdAndMap
+FieldObjectGetLocalIdAndMap: @ 805F364
push {r4,lr}
ldrb r4, [r0, 0x8]
strb r4, [r1]
@@ -2857,7 +2857,7 @@ sub_805F364: @ 805F364
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805F364
+ thumb_func_end FieldObjectGetLocalIdAndMap
thumb_func_start sub_805F378
sub_805F378: @ 805F378
@@ -2866,7 +2866,7 @@ sub_805F378: @ 805F378
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_805DFB0
+ bl GetFieldObjectIdByXY
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x10
@@ -2900,7 +2900,7 @@ sub_805F3A8: @ 805F3A8
lsls r3, 24
lsrs r4, r3, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F3EE
@@ -2944,7 +2944,7 @@ sub_805F400: @ 805F400
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F43C
@@ -2988,7 +2988,7 @@ sub_805F448: @ 805F448
lsls r4, 16
lsrs r4, 16
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F48C
@@ -3017,10 +3017,10 @@ _0805F494: .4byte gUnknown_2036E38
_0805F498: .4byte gUnknown_202063C
thumb_func_end sub_805F448
- thumb_func_start sub_805F49C
-sub_805F49C: @ 805F49C
+ thumb_func_start gpu_pal_allocator_reset__manage_upper_four
+gpu_pal_allocator_reset__manage_upper_four: @ 805F49C
push {lr}
- bl sub_80088F0
+ bl FreeAllSpritePalettes
ldr r1, _0805F4AC @ =gUnknown_3003E58
movs r0, 0xC
strb r0, [r1]
@@ -3028,14 +3028,14 @@ sub_805F49C: @ 805F49C
bx r0
.align 2, 0
_0805F4AC: .4byte gUnknown_3003E58
- thumb_func_end sub_805F49C
+ thumb_func_end gpu_pal_allocator_reset__manage_upper_four
thumb_func_start sub_805F4B0
sub_805F4B0: @ 805F4B0
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_805F5A0
+ bl FindFieldObjectPaletteIndexByTag
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0805F4D4 @ =0x000011ff
@@ -3089,13 +3089,13 @@ sub_805F510: @ 805F510
push {r4,lr}
adds r4, r0, 0
ldrh r0, [r4, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _0805F52E
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
lsls r0, 24
lsrs r0, 24
b _0805F530
@@ -3107,15 +3107,15 @@ _0805F530:
bx r1
thumb_func_end sub_805F510
- thumb_func_start sub_805F538
-sub_805F538: @ 805F538
+ thumb_func_start pal_patch_for_npc
+pal_patch_for_npc: @ 805F538
push {r4,lr}
adds r4, r1, 0
lsls r0, 16
lsrs r0, 16
lsls r4, 24
lsrs r4, 24
- bl sub_805F5A0
+ bl FindFieldObjectPaletteIndexByTag
lsls r0, 24
ldr r1, _0805F570 @ =gUnknown_83A5158
lsrs r0, 21
@@ -3127,7 +3127,7 @@ sub_805F538: @ 805F538
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
bl sub_8083598
pop {r4}
@@ -3135,10 +3135,10 @@ sub_805F538: @ 805F538
bx r0
.align 2, 0
_0805F570: .4byte gUnknown_83A5158
- thumb_func_end sub_805F538
+ thumb_func_end pal_patch_for_npc
- thumb_func_start sub_805F574
-sub_805F574: @ 805F574
+ thumb_func_start pal_patch_for_npc_range
+pal_patch_for_npc_range: @ 805F574
push {r4-r6,lr}
adds r5, r0, 0
lsls r1, 24
@@ -3150,7 +3150,7 @@ sub_805F574: @ 805F574
_0805F584:
ldrh r0, [r5]
adds r1, r4, 0
- bl sub_805F538
+ bl pal_patch_for_npc
adds r5, 0x2
adds r0, r4, 0x1
lsls r0, 24
@@ -3161,10 +3161,10 @@ _0805F598:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_805F574
+ thumb_func_end pal_patch_for_npc_range
- thumb_func_start sub_805F5A0
-sub_805F5A0: @ 805F5A0
+ thumb_func_start FindFieldObjectPaletteIndexByTag
+FindFieldObjectPaletteIndexByTag: @ 805F5A0
push {r4-r6,lr}
lsls r0, 16
lsrs r5, r0, 16
@@ -3203,10 +3203,10 @@ _0805F5E2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805F5A0
+ thumb_func_end FindFieldObjectPaletteIndexByTag
- thumb_func_start sub_805F5E8
-sub_805F5E8: @ 805F5E8
+ thumb_func_start npc_load_two_palettes__no_record
+npc_load_two_palettes__no_record: @ 805F5E8
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -3214,7 +3214,7 @@ sub_805F5E8: @ 805F5E8
lsrs r5, r1, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_805F538
+ bl pal_patch_for_npc
movs r3, 0
ldr r1, _0805F630 @ =gUnknown_83A5208
ldrh r0, [r1]
@@ -3239,7 +3239,7 @@ _0805F60C:
adds r0, r1
ldrh r0, [r0]
ldrb r1, [r5]
- bl sub_805F538
+ bl pal_patch_for_npc
b _0805F650
.align 2, 0
_0805F630: .4byte gUnknown_83A5208
@@ -3259,10 +3259,10 @@ _0805F650:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_805F5E8
+ thumb_func_end npc_load_two_palettes__no_record
- thumb_func_start sub_805F658
-sub_805F658: @ 805F658
+ thumb_func_start npc_load_two_palettes__and_record
+npc_load_two_palettes__and_record: @ 805F658
push {r4-r6,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -3272,7 +3272,7 @@ sub_805F658: @ 805F658
strh r4, [r0]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_805F538
+ bl pal_patch_for_npc
movs r3, 0
ldr r1, _0805F6A8 @ =gUnknown_83A5278
ldrh r0, [r1]
@@ -3297,7 +3297,7 @@ _0805F680:
adds r0, r1
ldrh r0, [r0]
ldrb r1, [r5]
- bl sub_805F538
+ bl pal_patch_for_npc
b _0805F6C8
.align 2, 0
_0805F6A4: .4byte gUnknown_203709A
@@ -3318,7 +3318,7 @@ _0805F6C8:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_805F658
+ thumb_func_end npc_load_two_palettes__and_record
thumb_func_start sub_805F6D0
sub_805F6D0: @ 805F6D0
@@ -3332,8 +3332,8 @@ sub_805F6D0: @ 805F6D0
_0805F6DC: .4byte gUnknown_835B934
thumb_func_end sub_805F6D0
- thumb_func_start sub_805F6E0
-sub_805F6E0: @ 805F6E0
+ thumb_func_start unref_sub_808EAC4
+unref_sub_808EAC4: @ 805F6E0
push {r4,lr}
ldrh r3, [r0, 0x10]
strh r3, [r0, 0x14]
@@ -3350,10 +3350,10 @@ sub_805F6E0: @ 805F6E0
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805F6E0
+ thumb_func_end unref_sub_808EAC4
- thumb_func_start sub_805F700
-sub_805F700: @ 805F700
+ thumb_func_start npc_coords_shift
+npc_coords_shift: @ 805F700
ldrh r3, [r0, 0x10]
strh r3, [r0, 0x14]
ldrh r3, [r0, 0x12]
@@ -3361,10 +3361,10 @@ sub_805F700: @ 805F700
strh r1, [r0, 0x10]
strh r2, [r0, 0x12]
bx lr
- thumb_func_end sub_805F700
+ thumb_func_end npc_coords_shift
- thumb_func_start sub_805F710
-sub_805F710: @ 805F710
+ thumb_func_start npc_coords_set
+npc_coords_set: @ 805F710
lsls r1, 16
lsrs r1, 16
lsls r2, 16
@@ -3374,7 +3374,7 @@ sub_805F710: @ 805F710
strh r1, [r0, 0x10]
strh r2, [r0, 0x12]
bx lr
- thumb_func_end sub_805F710
+ thumb_func_end npc_coords_set
thumb_func_start sub_805F724
sub_805F724: @ 805F724
@@ -3404,7 +3404,7 @@ sub_805F724: @ 805F724
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
- bl sub_805F710
+ bl npc_coords_set
movs r1, 0x10
ldrsh r0, [r6, r1]
movs r2, 0x12
@@ -3445,7 +3445,7 @@ sub_805F724: @ 805F724
lsrs r0, 7
cmp r0, 0
beq _0805F7B6
- bl sub_805FAA8
+ bl CameraObjectReset1
_0805F7B6:
pop {r3}
mov r8, r3
@@ -3472,7 +3472,7 @@ sub_805F7C4: @ 805F7C4
lsls r4, 16
lsrs r4, 16
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805F80C
@@ -3501,20 +3501,20 @@ _0805F80C:
_0805F814: .4byte gUnknown_2036E38
thumb_func_end sub_805F7C4
- thumb_func_start sub_805F818
-sub_805F818: @ 805F818
+ thumb_func_start npc_coords_shift_still
+npc_coords_shift_still: @ 805F818
push {lr}
movs r2, 0x10
ldrsh r1, [r0, r2]
movs r3, 0x12
ldrsh r2, [r0, r3]
- bl sub_805F700
+ bl npc_coords_shift
pop {r0}
bx r0
- thumb_func_end sub_805F818
+ thumb_func_end npc_coords_shift_still
- thumb_func_start sub_805F82C
-sub_805F82C: @ 805F82C
+ thumb_func_start UpdateFieldObjectCoordsForCameraUpdate
+UpdateFieldObjectCoordsForCameraUpdate: @ 805F82C
push {r4,r5,lr}
ldr r2, _0805F88C @ =gUnknown_2036E18
ldrb r1, [r2]
@@ -3568,10 +3568,10 @@ _0805F884:
.align 2, 0
_0805F88C: .4byte gUnknown_2036E18
_0805F890: .4byte gUnknown_2036E38
- thumb_func_end sub_805F82C
+ thumb_func_end UpdateFieldObjectCoordsForCameraUpdate
- thumb_func_start sub_805F894
-sub_805F894: @ 805F894
+ thumb_func_start GetFieldObjectIdByXYZ
+GetFieldObjectIdByXYZ: @ 805F894
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3604,7 +3604,7 @@ _0805F8AC:
bne _0805F8E4
adds r0, r1, 0
adds r1, r5, 0
- bl sub_805F8FC
+ bl FieldObjectDoesZCoordMatch
lsls r0, 24
cmp r0, 0
beq _0805F8E4
@@ -3625,10 +3625,10 @@ _0805F8F0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805F894
+ thumb_func_end GetFieldObjectIdByXYZ
- thumb_func_start sub_805F8FC
-sub_805F8FC: @ 805F8FC
+ thumb_func_start FieldObjectDoesZCoordMatch
+FieldObjectDoesZCoordMatch: @ 805F8FC
push {lr}
lsls r1, 24
lsrs r1, 24
@@ -3650,10 +3650,10 @@ _0805F91C:
_0805F91E:
pop {r1}
bx r1
- thumb_func_end sub_805F8FC
+ thumb_func_end FieldObjectDoesZCoordMatch
- thumb_func_start sub_805F924
-sub_805F924: @ 805F924
+ thumb_func_start UpdateFieldObjectsForCameraUpdate
+UpdateFieldObjectsForCameraUpdate: @ 805F924
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -3661,7 +3661,7 @@ sub_805F924: @ 805F924
lsrs r4, 16
lsls r5, 16
lsrs r5, 16
- bl sub_805F82C
+ bl UpdateFieldObjectCoordsForCameraUpdate
lsls r4, 16
asrs r4, 16
lsls r5, 16
@@ -3673,10 +3673,10 @@ sub_805F924: @ 805F924
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_805F924
+ thumb_func_end UpdateFieldObjectsForCameraUpdate
- thumb_func_start sub_805F950
-sub_805F950: @ 805F950
+ thumb_func_start AddCameraObject
+AddCameraObject: @ 805F950
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -3685,7 +3685,7 @@ sub_805F950: @ 805F950
movs r1, 0
movs r2, 0
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _0805F990 @ =gUnknown_202063C
@@ -3708,10 +3708,10 @@ sub_805F950: @ 805F950
.align 2, 0
_0805F98C: .4byte gUnknown_835B944
_0805F990: .4byte gUnknown_202063C
- thumb_func_end sub_805F950
+ thumb_func_end AddCameraObject
- thumb_func_start sub_805F994
-sub_805F994: @ 805F994
+ thumb_func_start ObjectCB_CameraObject
+ObjectCB_CameraObject: @ 805F994
push {r4,r5,lr}
sub sp, 0xC
mov r2, sp
@@ -3730,10 +3730,10 @@ sub_805F994: @ 805F994
bx r0
.align 2, 0
_0805F9B8: .4byte gUnknown_835B95C
- thumb_func_end sub_805F994
+ thumb_func_end ObjectCB_CameraObject
- thumb_func_start sub_805F9BC
-sub_805F9BC: @ 805F9BC
+ thumb_func_start CameraObject_0
+CameraObject_0: @ 805F9BC
push {lr}
ldr r3, _0805F9F4 @ =gUnknown_202063C
movs r1, 0x2E
@@ -3758,15 +3758,15 @@ sub_805F9BC: @ 805F9BC
strb r1, [r3]
movs r1, 0x1
strh r1, [r0, 0x30]
- bl sub_805F9F8
+ bl CameraObject_1
pop {r0}
bx r0
.align 2, 0
_0805F9F4: .4byte gUnknown_202063C
- thumb_func_end sub_805F9BC
+ thumb_func_end CameraObject_0
- thumb_func_start sub_805F9F8
-sub_805F9F8: @ 805F9F8
+ thumb_func_start CameraObject_1
+CameraObject_1: @ 805F9F8
push {r4,r5,lr}
ldr r3, _0805FA2C @ =gUnknown_202063C
movs r1, 0x2E
@@ -3794,10 +3794,10 @@ sub_805F9F8: @ 805F9F8
bx r0
.align 2, 0
_0805FA2C: .4byte gUnknown_202063C
- thumb_func_end sub_805F9F8
+ thumb_func_end CameraObject_1
- thumb_func_start sub_805FA30
-sub_805FA30: @ 805FA30
+ thumb_func_start CameraObject_2
+CameraObject_2: @ 805FA30
push {r4,lr}
ldr r4, _0805FA5C @ =gUnknown_202063C
movs r1, 0x2E
@@ -3822,10 +3822,10 @@ sub_805FA30: @ 805FA30
bx r0
.align 2, 0
_0805FA5C: .4byte gUnknown_202063C
- thumb_func_end sub_805FA30
+ thumb_func_end CameraObject_2
- thumb_func_start sub_805FA60
-sub_805FA60: @ 805FA60
+ thumb_func_start FindCameraObject
+FindCameraObject: @ 805FA60
push {r4,r5,lr}
movs r3, 0
ldr r4, _0805FA8C @ =gUnknown_202063C
@@ -3844,14 +3844,14 @@ _0805FA6A:
beq _0805FA94
adds r0, r1, r5
ldr r1, [r0]
- ldr r0, _0805FA90 @ =sub_805F994
+ ldr r0, _0805FA90 @ =ObjectCB_CameraObject
cmp r1, r0
bne _0805FA94
adds r0, r2, 0
b _0805FAA0
.align 2, 0
_0805FA8C: .4byte gUnknown_202063C
-_0805FA90: .4byte sub_805F994
+_0805FA90: .4byte ObjectCB_CameraObject
_0805FA94:
adds r0, r3, 0x1
lsls r0, 24
@@ -3863,12 +3863,12 @@ _0805FAA0:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805FA60
+ thumb_func_end FindCameraObject
- thumb_func_start sub_805FAA8
-sub_805FAA8: @ 805FAA8
+ thumb_func_start CameraObjectReset1
+CameraObjectReset1: @ 805FAA8
push {lr}
- bl sub_805FA60
+ bl FindCameraObject
adds r2, r0, 0
cmp r2, 0
beq _0805FAC0
@@ -3880,28 +3880,28 @@ sub_805FAA8: @ 805FAA8
_0805FAC0:
pop {r0}
bx r0
- thumb_func_end sub_805FAA8
+ thumb_func_end CameraObjectReset1
- thumb_func_start sub_805FAC4
-sub_805FAC4: @ 805FAC4
+ thumb_func_start CameraObjectSetFollowedObjectId
+CameraObjectSetFollowedObjectId: @ 805FAC4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_805FA60
+ bl FindCameraObject
cmp r0, 0
beq _0805FAD8
strh r4, [r0, 0x2E]
- bl sub_805FAA8
+ bl CameraObjectReset1
_0805FAD8:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805FAC4
+ thumb_func_end CameraObjectSetFollowedObjectId
- thumb_func_start sub_805FAE0
-sub_805FAE0: @ 805FAE0
+ thumb_func_start CameraObjectGetFollowedObjectId
+CameraObjectGetFollowedObjectId: @ 805FAE0
push {lr}
- bl sub_805FA60
+ bl FindCameraObject
cmp r0, 0
beq _0805FAF2
ldrh r0, [r0, 0x2E]
@@ -3913,20 +3913,20 @@ _0805FAF2:
_0805FAF4:
pop {r1}
bx r1
- thumb_func_end sub_805FAE0
+ thumb_func_end CameraObjectGetFollowedObjectId
- thumb_func_start sub_805FAF8
-sub_805FAF8: @ 805FAF8
+ thumb_func_start CameraObjectReset2
+CameraObjectReset2: @ 805FAF8
push {lr}
- bl sub_805FA60
+ bl FindCameraObject
movs r1, 0x2
strh r1, [r0, 0x30]
pop {r0}
bx r0
- thumb_func_end sub_805FAF8
+ thumb_func_end CameraObjectReset2
- thumb_func_start sub_805FB08
-sub_805FB08: @ 805FB08
+ thumb_func_start CopySprite
+CopySprite: @ 805FB08
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3977,10 +3977,10 @@ _0805FB5E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805FB08
+ thumb_func_end CopySprite
- thumb_func_start sub_805FB6C
-sub_805FB6C: @ 805FB6C
+ thumb_func_start obj_unfreeze
+obj_unfreeze: @ 805FB6C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -4038,10 +4038,10 @@ _0805FBD2:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805FB6C
+ thumb_func_end obj_unfreeze
- thumb_func_start sub_805FBDC
-sub_805FBDC: @ 805FBDC
+ thumb_func_start FieldObjectSetDirection
+FieldObjectSetDirection: @ 805FBDC
push {r4,lr}
adds r3, r0, 0
lsls r1, 24
@@ -4076,10 +4076,10 @@ _0805FC0C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_805FBDC
+ thumb_func_end FieldObjectSetDirection
- thumb_func_start sub_805FC20
-sub_805FC20: @ 805FC20
+ thumb_func_start GetFieldObjectScriptPointerByLocalIdAndMap
+GetFieldObjectScriptPointerByLocalIdAndMap: @ 805FC20
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4087,14 +4087,14 @@ sub_805FC20: @ 805FC20
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl sub_805FD5C
+ bl GetFieldObjectTemplateByLocalIdAndMap
ldr r0, [r0, 0x10]
pop {r1}
bx r1
- thumb_func_end sub_805FC20
+ thumb_func_end GetFieldObjectScriptPointerByLocalIdAndMap
- thumb_func_start sub_805FC38
-sub_805FC38: @ 805FC38
+ thumb_func_start GetFieldObjectScriptPointerByFieldObjectId
+GetFieldObjectScriptPointerByFieldObjectId: @ 805FC38
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4106,15 +4106,15 @@ sub_805FC38: @ 805FC38
ldrb r0, [r2, 0x8]
ldrb r1, [r2, 0x9]
ldrb r2, [r2, 0xA]
- bl sub_805FC20
+ bl GetFieldObjectScriptPointerByLocalIdAndMap
pop {r1}
bx r1
.align 2, 0
_0805FC58: .4byte gUnknown_2036E38
- thumb_func_end sub_805FC38
+ thumb_func_end GetFieldObjectScriptPointerByFieldObjectId
- thumb_func_start sub_805FC5C
-sub_805FC5C: @ 805FC5C
+ thumb_func_start GetFieldObjectFlagIdByLocalIdAndMap
+GetFieldObjectFlagIdByLocalIdAndMap: @ 805FC5C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4122,14 +4122,14 @@ sub_805FC5C: @ 805FC5C
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl sub_805FD5C
+ bl GetFieldObjectTemplateByLocalIdAndMap
ldrh r0, [r0, 0x14]
pop {r1}
bx r1
- thumb_func_end sub_805FC5C
+ thumb_func_end GetFieldObjectFlagIdByLocalIdAndMap
- thumb_func_start sub_805FC74
-sub_805FC74: @ 805FC74
+ thumb_func_start GetFieldObjectFlagIdByFieldObjectId
+GetFieldObjectFlagIdByFieldObjectId: @ 805FC74
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -4141,14 +4141,14 @@ sub_805FC74: @ 805FC74
ldrb r0, [r2, 0x8]
ldrb r1, [r2, 0x9]
ldrb r2, [r2, 0xA]
- bl sub_805FC5C
+ bl GetFieldObjectFlagIdByLocalIdAndMap
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
.align 2, 0
_0805FC98: .4byte gUnknown_2036E38
- thumb_func_end sub_805FC74
+ thumb_func_end GetFieldObjectFlagIdByFieldObjectId
thumb_func_start sub_805FC9C
sub_805FC9C: @ 805FC9C
@@ -4161,7 +4161,7 @@ sub_805FC9C: @ 805FC9C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FCD0
@@ -4193,7 +4193,7 @@ sub_805FCD8: @ 805FCD8
lsrs r1, 24
lsls r2, 24
lsrs r2, 24
- bl sub_805FD5C
+ bl GetFieldObjectTemplateByLocalIdAndMap
ldrh r0, [r0, 0xC]
pop {r1}
bx r1
@@ -4225,7 +4225,7 @@ sub_805FD08: @ 805FD08
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FD3C
@@ -4248,8 +4248,8 @@ _0805FD3E:
bx r1
thumb_func_end sub_805FD08
- thumb_func_start sub_805FD44
-sub_805FD44: @ 805FD44
+ thumb_func_start FieldObjectGetBerryTreeId
+FieldObjectGetBerryTreeId: @ 805FD44
lsls r0, 24
lsrs r0, 24
ldr r2, _0805FD58 @ =gUnknown_2036E38
@@ -4261,10 +4261,10 @@ sub_805FD44: @ 805FD44
bx lr
.align 2, 0
_0805FD58: .4byte gUnknown_2036E38
- thumb_func_end sub_805FD44
+ thumb_func_end FieldObjectGetBerryTreeId
- thumb_func_start sub_805FD5C
-sub_805FD5C: @ 805FD5C
+ thumb_func_start GetFieldObjectTemplateByLocalIdAndMap
+GetFieldObjectTemplateByLocalIdAndMap: @ 805FD5C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -4294,20 +4294,20 @@ _0805FD90: .4byte gUnknown_2036DFC
_0805FD94:
adds r0, r2, 0
adds r1, r3, 0
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldr r0, [r0, 0x4]
ldr r1, [r0, 0x4]
_0805FDA0:
ldrb r2, [r0]
adds r0, r4, 0
- bl sub_805FDB0
+ bl FindFieldObjectTemplateInArrayByLocalId
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_805FD5C
+ thumb_func_end GetFieldObjectTemplateByLocalIdAndMap
- thumb_func_start sub_805FDB0
-sub_805FDB0: @ 805FDB0
+ thumb_func_start FindFieldObjectTemplateInArrayByLocalId
+FindFieldObjectTemplateInArrayByLocalId: @ 805FDB0
push {r4,r5,lr}
adds r5, r1, 0
lsls r0, 24
@@ -4339,7 +4339,7 @@ _0805FDE0:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805FDB0
+ thumb_func_end FindFieldObjectTemplateInArrayByLocalId
thumb_func_start sub_805FDE8
sub_805FDE8: @ 805FDE8
@@ -4454,7 +4454,7 @@ sub_805FE94: @ 805FE94
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0805FEC2
@@ -4480,7 +4480,7 @@ sub_805FECC: @ 805FECC
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_805F49C
+ bl gpu_pal_allocator_reset__manage_upper_four
ldr r1, _0805FF04 @ =gUnknown_203709A
ldr r2, _0805FF08 @ =0x000011ff
adds r0, r2, 0
@@ -4496,7 +4496,7 @@ sub_805FECC: @ 805FECC
ldr r0, [r0]
movs r1, 0
movs r2, 0x6
- bl sub_805F574
+ bl pal_patch_for_npc_range
ldr r1, _0805FF14 @ =gUnknown_3003E58
movs r0, 0x8
strb r0, [r1]
@@ -4515,7 +4515,7 @@ _0805FF18:
ldr r0, [r1]
movs r1, 0
movs r2, 0xA
- bl sub_805F574
+ bl pal_patch_for_npc_range
_0805FF2A:
pop {r4}
pop {r0}
@@ -4605,7 +4605,7 @@ sub_805FFB4: @ 805FFB4
ldr r2, _0805FFD0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0805FFD4 @ =sub_805FFD8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -4631,7 +4631,7 @@ sub_805FFDC: @ 805FFDC
ldr r2, _0805FFF8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0805FFFC @ =sub_8060000
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -4670,7 +4670,7 @@ sub_8060020: @ 8060020
ldr r2, _0806003C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060040 @ =sub_8060044
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -4701,7 +4701,7 @@ _08060060: .4byte gUnknown_83A6034
sub_8060064: @ 8060064
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -4741,7 +4741,7 @@ sub_80600A4: @ 80600A4
cmp r0, 0
beq _080600D8
ldr r5, _080600D4 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r4, 0x3
adds r1, r4, 0
ands r1, r0
@@ -4750,7 +4750,7 @@ sub_80600A4: @ 80600A4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _080600DA
@@ -4769,7 +4769,7 @@ sub_80600E0: @ 80600E0
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080600F4
@@ -4795,7 +4795,7 @@ sub_8060100: @ 8060100
mov r0, sp
movs r2, 0x4
bl memcpy
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -4803,12 +4803,12 @@ sub_8060100: @ 8060100
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
cmp r0, 0
beq _0806013E
@@ -4899,13 +4899,13 @@ _080601CA:
bx r1
thumb_func_end sub_80601AC
- thumb_func_start sub_80601D4
-sub_80601D4: @ 80601D4
+ thumb_func_start FieldObjectIsTrainerAndCloseToPlayer
+FieldObjectIsTrainerAndCloseToPlayer: @ 80601D4
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
movs r0, 0x80
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08060240
@@ -4919,7 +4919,7 @@ _080601F0:
adds r7, 0x2
mov r0, sp
adds r1, r7, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
ldrh r2, [r5, 0x10]
ldrh r4, [r5, 0x12]
ldrb r1, [r5, 0x1D]
@@ -4964,10 +4964,10 @@ _08060246:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80601D4
+ thumb_func_end FieldObjectIsTrainerAndCloseToPlayer
- thumb_func_start sub_8060250
-sub_8060250: @ 8060250
+ thumb_func_start GetRegularRunningPastFacingDirection
+GetRegularRunningPastFacingDirection: @ 8060250
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -4994,10 +4994,10 @@ _08060278:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8060250
+ thumb_func_end GetRegularRunningPastFacingDirection
- thumb_func_start sub_8060280
-sub_8060280: @ 8060280
+ thumb_func_start GetNorthSouthRunningPastFacingDirection
+GetNorthSouthRunningPastFacingDirection: @ 8060280
push {lr}
movs r0, 0x1
lsls r1, 16
@@ -5007,10 +5007,10 @@ sub_8060280: @ 8060280
_0806028C:
pop {r1}
bx r1
- thumb_func_end sub_8060280
+ thumb_func_end GetNorthSouthRunningPastFacingDirection
- thumb_func_start sub_8060290
-sub_8060290: @ 8060290
+ thumb_func_start GetEastWestRunningPastFacingDirection
+GetEastWestRunningPastFacingDirection: @ 8060290
push {lr}
movs r1, 0x4
lsls r0, 16
@@ -5021,10 +5021,10 @@ _0806029C:
adds r0, r1, 0
pop {r1}
bx r1
- thumb_func_end sub_8060290
+ thumb_func_end GetEastWestRunningPastFacingDirection
- thumb_func_start sub_80602A4
-sub_80602A4: @ 80602A4
+ thumb_func_start GetNorthEastRunningPastFacingDirection
+GetNorthEastRunningPastFacingDirection: @ 80602A4
push {r4-r7,lr}
lsls r0, 16
asrs r4, r0, 16
@@ -5038,7 +5038,7 @@ sub_80602A4: @ 80602A4
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5047,7 +5047,7 @@ sub_80602A4: @ 80602A4
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -5060,7 +5060,7 @@ _080602E0:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5071,10 +5071,10 @@ _080602FA:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80602A4
+ thumb_func_end GetNorthEastRunningPastFacingDirection
- thumb_func_start sub_8060300
-sub_8060300: @ 8060300
+ thumb_func_start GetNorthWestRunningPastFacingDirection
+GetNorthWestRunningPastFacingDirection: @ 8060300
push {r4-r7,lr}
lsls r0, 16
asrs r4, r0, 16
@@ -5088,7 +5088,7 @@ sub_8060300: @ 8060300
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5097,7 +5097,7 @@ sub_8060300: @ 8060300
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -5110,7 +5110,7 @@ _0806033C:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5121,10 +5121,10 @@ _08060356:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8060300
+ thumb_func_end GetNorthWestRunningPastFacingDirection
- thumb_func_start sub_806035C
-sub_806035C: @ 806035C
+ thumb_func_start GetSouthEastRunningPastFacingDirection
+GetSouthEastRunningPastFacingDirection: @ 806035C
push {r4-r7,lr}
lsls r0, 16
asrs r4, r0, 16
@@ -5138,7 +5138,7 @@ sub_806035C: @ 806035C
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5147,7 +5147,7 @@ sub_806035C: @ 806035C
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -5160,7 +5160,7 @@ _08060398:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5171,10 +5171,10 @@ _080603B2:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_806035C
+ thumb_func_end GetSouthEastRunningPastFacingDirection
- thumb_func_start sub_80603B8
-sub_80603B8: @ 80603B8
+ thumb_func_start GetSouthWestRunningPastFacingDirection
+GetSouthWestRunningPastFacingDirection: @ 80603B8
push {r4-r7,lr}
lsls r0, 16
asrs r4, r0, 16
@@ -5188,7 +5188,7 @@ sub_80603B8: @ 80603B8
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5197,7 +5197,7 @@ sub_80603B8: @ 80603B8
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -5210,7 +5210,7 @@ _080603F4:
adds r1, r5, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5221,10 +5221,10 @@ _0806040E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80603B8
+ thumb_func_end GetSouthWestRunningPastFacingDirection
- thumb_func_start sub_8060414
-sub_8060414: @ 8060414
+ thumb_func_start GetNonEastRunningPastFacingDirection
+GetNonEastRunningPastFacingDirection: @ 8060414
push {r4-r7,lr}
lsls r0, 16
asrs r7, r0, 16
@@ -5238,7 +5238,7 @@ sub_8060414: @ 8060414
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -5247,17 +5247,17 @@ sub_8060414: @ 8060414
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_0806044A:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8060414
+ thumb_func_end GetNonEastRunningPastFacingDirection
- thumb_func_start sub_8060450
-sub_8060450: @ 8060450
+ thumb_func_start GetNonWestRunningPastFacingDirection
+GetNonWestRunningPastFacingDirection: @ 8060450
push {r4-r7,lr}
lsls r0, 16
asrs r7, r0, 16
@@ -5271,7 +5271,7 @@ sub_8060450: @ 8060450
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -5280,17 +5280,17 @@ sub_8060450: @ 8060450
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060280
+ bl GetNorthSouthRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_08060486:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8060450
+ thumb_func_end GetNonWestRunningPastFacingDirection
- thumb_func_start sub_806048C
-sub_806048C: @ 806048C
+ thumb_func_start GetNonSouthRunningPastFacingDirection
+GetNonSouthRunningPastFacingDirection: @ 806048C
push {r4-r7,lr}
lsls r0, 16
asrs r7, r0, 16
@@ -5304,7 +5304,7 @@ sub_806048C: @ 806048C
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5313,17 +5313,17 @@ sub_806048C: @ 806048C
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_080604C2:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_806048C
+ thumb_func_end GetNonSouthRunningPastFacingDirection
- thumb_func_start sub_80604C8
-sub_80604C8: @ 80604C8
+ thumb_func_start GetNonNorthRunningPastFacingDirection
+GetNonNorthRunningPastFacingDirection: @ 80604C8
push {r4-r7,lr}
lsls r0, 16
asrs r7, r0, 16
@@ -5337,7 +5337,7 @@ sub_80604C8: @ 80604C8
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060250
+ bl GetRegularRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5346,23 +5346,23 @@ sub_80604C8: @ 80604C8
adds r1, r6, 0
adds r2, r5, 0
adds r3, r4, 0
- bl sub_8060290
+ bl GetEastWestRunningPastFacingDirection
lsls r0, 24
lsrs r0, 24
_080604FE:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80604C8
+ thumb_func_end GetNonNorthRunningPastFacingDirection
- thumb_func_start sub_8060504
-sub_8060504: @ 8060504
+ thumb_func_start GetRunningPastFacingDirection
+GetRunningPastFacingDirection: @ 8060504
push {r4-r6,lr}
sub sp, 0x4
adds r4, r0, 0
lsls r1, 24
lsrs r6, r1, 24
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
bne _0806051C
@@ -5373,7 +5373,7 @@ _0806051C:
adds r5, 0x2
mov r0, sp
adds r1, r5, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r2, sp
mov r0, sp
ldrh r0, [r0]
@@ -5426,7 +5426,7 @@ _08060580:
bx r1
.align 2, 0
_08060588: .4byte gUnknown_83A6054
- thumb_func_end sub_8060504
+ thumb_func_end GetRunningPastFacingDirection
thumb_func_start sub_806058C
sub_806058C: @ 806058C
@@ -5440,7 +5440,7 @@ sub_806058C: @ 806058C
ldr r2, _080605A8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080605AC @ =sub_80605B0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -5471,7 +5471,7 @@ _080605CC: .4byte gUnknown_83A6080
sub_80605D0: @ 80605D0
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -5512,7 +5512,7 @@ sub_8060610: @ 8060610
cmp r0, 0
beq _08060646
ldr r4, _08060650 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -5521,7 +5521,7 @@ sub_8060610: @ 8060610
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -5543,12 +5543,12 @@ sub_8060654: @ 8060654
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060672
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _0806067A
@@ -5577,12 +5577,12 @@ sub_8060684: @ 8060684
bl memcpy
adds r0, r4, 0
movs r1, 0
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _080606B4
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -5590,7 +5590,7 @@ sub_8060684: @ 8060684
ldrb r1, [r0]
_080606B4:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -5613,7 +5613,7 @@ sub_80606CC: @ 80606CC
ldr r2, _080606E8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080606EC @ =sub_80606F0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -5644,7 +5644,7 @@ _0806070C: .4byte gUnknown_83A6094
sub_8060710: @ 8060710
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -5684,7 +5684,7 @@ sub_8060750: @ 8060750
cmp r0, 0
beq _08060784
ldr r5, _08060780 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r4, 0x3
adds r1, r4, 0
ands r1, r0
@@ -5693,7 +5693,7 @@ sub_8060750: @ 8060750
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _08060786
@@ -5712,7 +5712,7 @@ sub_806078C: @ 806078C
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080607A0
@@ -5738,7 +5738,7 @@ sub_80607AC: @ 80607AC
mov r0, sp
movs r2, 0x2
bl memcpy
- bl sub_8044EC8
+ bl Random
movs r7, 0x1
adds r1, r7, 0
ands r1, r0
@@ -5747,12 +5747,12 @@ sub_80607AC: @ 80607AC
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
cmp r0, 0
beq _080607EA
@@ -5828,7 +5828,7 @@ sub_8060850: @ 8060850
ldr r2, _0806086C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060870 @ =sub_8060874
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -5859,7 +5859,7 @@ _08060890: .4byte gUnknown_83A60B4
sub_8060894: @ 8060894
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -5899,7 +5899,7 @@ sub_80608D4: @ 80608D4
cmp r0, 0
beq _08060908
ldr r5, _08060904 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r4, 0x3
adds r1, r4, 0
ands r1, r0
@@ -5908,7 +5908,7 @@ sub_80608D4: @ 80608D4
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r6, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
strh r4, [r6, 0x30]
movs r0, 0x1
b _0806090A
@@ -5927,7 +5927,7 @@ sub_8060910: @ 8060910
push {r4,lr}
adds r4, r1, 0
adds r0, r4, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060924
@@ -5953,7 +5953,7 @@ sub_8060930: @ 8060930
mov r0, sp
movs r2, 0x2
bl memcpy
- bl sub_8044EC8
+ bl Random
movs r7, 0x1
adds r1, r7, 0
ands r1, r0
@@ -5962,12 +5962,12 @@ sub_8060930: @ 8060930
ldrb r4, [r0]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x5
strh r0, [r6, 0x30]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
cmp r0, 0
beq _0806096E
@@ -6043,7 +6043,7 @@ sub_80609D4: @ 80609D4
ldr r2, _080609F0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080609F4 @ =sub_80609F8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6075,7 +6075,7 @@ sub_8060A18: @ 8060A18
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -6136,7 +6136,7 @@ sub_8060A74: @ 8060A74
ldr r2, _08060A90 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060A94 @ =sub_8060A98
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6167,7 +6167,7 @@ _08060AB4: .4byte gUnknown_83A60E0
sub_8060AB8: @ 8060AB8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -6208,7 +6208,7 @@ sub_8060AF8: @ 8060AF8
cmp r0, 0
beq _08060B2E
ldr r4, _08060B38 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -6217,7 +6217,7 @@ sub_8060AF8: @ 8060AF8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6239,12 +6239,12 @@ sub_8060B3C: @ 8060B3C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060B5A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060B62
@@ -6273,12 +6273,12 @@ sub_8060B6C: @ 8060B6C
bl memcpy
adds r0, r4, 0
movs r1, 0x1
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _08060B9C
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -6286,7 +6286,7 @@ sub_8060B6C: @ 8060B6C
ldrb r1, [r0]
_08060B9C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6309,7 +6309,7 @@ sub_8060BB4: @ 8060BB4
ldr r2, _08060BD0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060BD4 @ =sub_8060BD8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6340,7 +6340,7 @@ _08060BF4: .4byte gUnknown_83A60F4
sub_8060BF8: @ 8060BF8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -6381,7 +6381,7 @@ sub_8060C38: @ 8060C38
cmp r0, 0
beq _08060C6E
ldr r4, _08060C78 @ =gUnknown_83A6000
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -6390,7 +6390,7 @@ sub_8060C38: @ 8060C38
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6412,12 +6412,12 @@ sub_8060C7C: @ 8060C7C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060C9A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060CA2
@@ -6446,12 +6446,12 @@ sub_8060CAC: @ 8060CAC
bl memcpy
adds r0, r4, 0
movs r1, 0x2
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _08060CDC
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -6459,7 +6459,7 @@ sub_8060CAC: @ 8060CAC
ldrb r1, [r0]
_08060CDC:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6482,7 +6482,7 @@ sub_8060CF4: @ 8060CF4
ldr r2, _08060D10 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060D14 @ =sub_8060D18
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6513,7 +6513,7 @@ _08060D34: .4byte gUnknown_83A6108
sub_8060D38: @ 8060D38
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -6554,7 +6554,7 @@ sub_8060D78: @ 8060D78
cmp r0, 0
beq _08060DAE
ldr r4, _08060DB8 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -6563,7 +6563,7 @@ sub_8060D78: @ 8060D78
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6585,12 +6585,12 @@ sub_8060DBC: @ 8060DBC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060DDA
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060DE2
@@ -6619,12 +6619,12 @@ sub_8060DEC: @ 8060DEC
bl memcpy
adds r0, r4, 0
movs r1, 0x3
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _08060E1C
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -6632,7 +6632,7 @@ sub_8060DEC: @ 8060DEC
ldrb r1, [r0]
_08060E1C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6655,7 +6655,7 @@ sub_8060E34: @ 8060E34
ldr r2, _08060E50 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060E54 @ =sub_8060E58
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6686,7 +6686,7 @@ _08060E74: .4byte gUnknown_83A6120
sub_8060E78: @ 8060E78
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -6727,7 +6727,7 @@ sub_8060EB8: @ 8060EB8
cmp r0, 0
beq _08060EEE
ldr r4, _08060EF8 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -6736,7 +6736,7 @@ sub_8060EB8: @ 8060EB8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6758,12 +6758,12 @@ sub_8060EFC: @ 8060EFC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _08060F1A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08060F22
@@ -6792,12 +6792,12 @@ sub_8060F2C: @ 8060F2C
bl memcpy
adds r0, r4, 0
movs r1, 0x4
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _08060F5C
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -6805,7 +6805,7 @@ sub_8060F2C: @ 8060F2C
ldrb r1, [r0]
_08060F5C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -6828,7 +6828,7 @@ sub_8060F74: @ 8060F74
ldr r2, _08060F90 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08060F94 @ =sub_8060F98
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -6859,7 +6859,7 @@ _08060FB4: .4byte gUnknown_83A6138
sub_8060FB8: @ 8060FB8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -6900,7 +6900,7 @@ sub_8060FF8: @ 8060FF8
cmp r0, 0
beq _0806102E
ldr r4, _08061038 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -6909,7 +6909,7 @@ sub_8060FF8: @ 8060FF8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -6931,12 +6931,12 @@ sub_806103C: @ 806103C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0806105A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061062
@@ -6965,12 +6965,12 @@ sub_806106C: @ 806106C
bl memcpy
adds r0, r4, 0
movs r1, 0x5
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _0806109C
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -6978,7 +6978,7 @@ sub_806106C: @ 806106C
ldrb r1, [r0]
_0806109C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7001,7 +7001,7 @@ sub_80610B4: @ 80610B4
ldr r2, _080610D0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080610D4 @ =sub_80610D8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7032,7 +7032,7 @@ _080610F4: .4byte gUnknown_83A6150
sub_80610F8: @ 80610F8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -7073,7 +7073,7 @@ sub_8061138: @ 8061138
cmp r0, 0
beq _0806116E
ldr r4, _08061178 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -7082,7 +7082,7 @@ sub_8061138: @ 8061138
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7104,12 +7104,12 @@ sub_806117C: @ 806117C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0806119A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080611A2
@@ -7138,12 +7138,12 @@ sub_80611AC: @ 80611AC
bl memcpy
adds r0, r4, 0
movs r1, 0x6
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _080611DC
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
mov r2, sp
@@ -7151,7 +7151,7 @@ sub_80611AC: @ 80611AC
ldrb r1, [r0]
_080611DC:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7174,7 +7174,7 @@ sub_80611F4: @ 80611F4
ldr r2, _08061210 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061214 @ =sub_8061218
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7205,7 +7205,7 @@ _08061234: .4byte gUnknown_83A6168
sub_8061238: @ 8061238
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -7246,7 +7246,7 @@ sub_8061278: @ 8061278
cmp r0, 0
beq _080612AE
ldr r4, _080612B8 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -7255,7 +7255,7 @@ sub_8061278: @ 8061278
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7277,12 +7277,12 @@ sub_80612BC: @ 80612BC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080612DA
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080612E2
@@ -7311,12 +7311,12 @@ sub_80612EC: @ 80612EC
bl memcpy
adds r0, r4, 0
movs r1, 0x7
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _0806131C
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -7324,7 +7324,7 @@ sub_80612EC: @ 80612EC
ldrb r1, [r0]
_0806131C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7347,7 +7347,7 @@ sub_8061334: @ 8061334
ldr r2, _08061350 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061354 @ =sub_8061358
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7378,7 +7378,7 @@ _08061374: .4byte gUnknown_83A6180
sub_8061378: @ 8061378
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -7419,7 +7419,7 @@ sub_80613B8: @ 80613B8
cmp r0, 0
beq _080613EE
ldr r4, _080613F8 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -7428,7 +7428,7 @@ sub_80613B8: @ 80613B8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7450,12 +7450,12 @@ sub_80613FC: @ 80613FC
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0806141A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061422
@@ -7484,12 +7484,12 @@ sub_806142C: @ 806142C
bl memcpy
adds r0, r4, 0
movs r1, 0x8
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _0806145C
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -7497,7 +7497,7 @@ sub_806142C: @ 806142C
ldrb r1, [r0]
_0806145C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7520,7 +7520,7 @@ sub_8061474: @ 8061474
ldr r2, _08061490 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061494 @ =sub_8061498
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7551,7 +7551,7 @@ _080614B4: .4byte gUnknown_83A6198
sub_80614B8: @ 80614B8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -7592,7 +7592,7 @@ sub_80614F8: @ 80614F8
cmp r0, 0
beq _0806152E
ldr r4, _08061538 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -7601,7 +7601,7 @@ sub_80614F8: @ 80614F8
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7623,12 +7623,12 @@ sub_806153C: @ 806153C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0806155A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _08061562
@@ -7657,12 +7657,12 @@ sub_806156C: @ 806156C
bl memcpy
adds r0, r4, 0
movs r1, 0x9
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _0806159C
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -7670,7 +7670,7 @@ sub_806156C: @ 806156C
ldrb r1, [r0]
_0806159C:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7693,7 +7693,7 @@ sub_80615B4: @ 80615B4
ldr r2, _080615D0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080615D4 @ =sub_80615D8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7724,7 +7724,7 @@ _080615F4: .4byte gUnknown_83A61B0
sub_80615F8: @ 80615F8
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -7765,7 +7765,7 @@ sub_8061638: @ 8061638
cmp r0, 0
beq _0806166E
ldr r4, _08061678 @ =gUnknown_83A6010
- bl sub_8044EC8
+ bl Random
movs r5, 0x3
adds r1, r5, 0
ands r1, r0
@@ -7774,7 +7774,7 @@ sub_8061638: @ 8061638
movs r0, 0
ldrsh r1, [r1, r0]
adds r0, r7, 0
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
ldrb r1, [r6]
movs r0, 0x3
negs r0, r0
@@ -7796,12 +7796,12 @@ sub_806167C: @ 806167C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _0806169A
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080616A2
@@ -7830,12 +7830,12 @@ sub_80616AC: @ 80616AC
bl memcpy
adds r0, r4, 0
movs r1, 0xA
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
bne _080616DC
- bl sub_8044EC8
+ bl Random
movs r1, 0x3
ands r1, r0
mov r2, sp
@@ -7843,7 +7843,7 @@ sub_80616AC: @ 80616AC
ldrb r1, [r0]
_080616DC:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x30]
add sp, 0x4
@@ -7866,7 +7866,7 @@ sub_80616F4: @ 80616F4
ldr r2, _08061710 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061714 @ =sub_8061718
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -7898,7 +7898,7 @@ sub_8061738: @ 8061738
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -7926,7 +7926,7 @@ sub_8061764: @ 8061764
beq _0806177E
adds r0, r4, 0
movs r1, 0x30
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_0806177E:
@@ -7942,12 +7942,12 @@ sub_8061788: @ 8061788
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080617A6
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080617AA
@@ -7973,7 +7973,7 @@ sub_80617B4: @ 80617B4
bl memcpy
adds r0, r4, 0
movs r1, 0
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -7985,7 +7985,7 @@ sub_80617B4: @ 80617B4
ldrb r1, [r0]
_080617E0:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8009,7 +8009,7 @@ sub_80617F8: @ 80617F8
ldr r2, _08061814 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061818 @ =sub_806181C
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8041,7 +8041,7 @@ sub_806183C: @ 806183C
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -8069,7 +8069,7 @@ sub_8061868: @ 8061868
beq _08061882
adds r0, r4, 0
movs r1, 0x30
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x30]
_08061882:
@@ -8085,12 +8085,12 @@ sub_806188C: @ 806188C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
bne _080618AA
adds r0, r4, 0
- bl sub_80601D4
+ bl FieldObjectIsTrainerAndCloseToPlayer
lsls r0, 24
cmp r0, 0
beq _080618AE
@@ -8116,7 +8116,7 @@ sub_80618B8: @ 80618B8
bl memcpy
adds r0, r4, 0
movs r1, 0
- bl sub_8060504
+ bl GetRunningPastFacingDirection
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -8128,7 +8128,7 @@ sub_80618B8: @ 80618B8
ldrb r1, [r0]
_080618E4:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8152,7 +8152,7 @@ sub_80618FC: @ 80618FC
ldr r2, _08061918 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0806191C @ =sub_8061920
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8183,7 +8183,7 @@ _0806193C: .4byte gUnknown_83A61F8
sub_8061940: @ 8061940
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -8206,12 +8206,12 @@ sub_8061954: @ 8061954
cmp r0, 0
beq _08061976
adds r0, r1, 0
- bl sub_8064480
+ bl GetOppositeDirection
lsls r0, 24
lsrs r1, r0, 24
_08061976:
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x2
strh r0, [r5, 0x30]
movs r0, 0x1
@@ -8240,17 +8240,17 @@ sub_806198C: @ 806198C
strb r0, [r2]
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8064480
+ bl GetOppositeDirection
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
_080619BC:
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
lsrs r5, r0, 24
ldrb r0, [r4, 0x18]
@@ -8267,12 +8267,12 @@ _080619BC:
strb r0, [r1]
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8064480
+ bl GetOppositeDirection
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8281,7 +8281,7 @@ _080619BC:
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
lsrs r5, r0, 24
_08061A12:
@@ -8290,7 +8290,7 @@ _08061A12:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
lsls r0, 24
lsrs r6, r0, 24
_08061A24:
@@ -8337,7 +8337,7 @@ _08061A62:
sub_8061A6C: @ 8061A6C
push {r4,lr}
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
movs r0, 0x1
strh r0, [r4, 0x30]
pop {r4}
@@ -8345,8 +8345,8 @@ sub_8061A6C: @ 8061A6C
bx r1
thumb_func_end sub_8061A6C
- thumb_func_start sub_8061A80
-sub_8061A80: @ 8061A80
+ thumb_func_start MoveFieldObjectInNextDirectionInSequence
+MoveFieldObjectInNextDirectionInSequence: @ 8061A80
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -8371,7 +8371,7 @@ _08061AA2:
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8380,7 +8380,7 @@ _08061AA2:
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -8392,7 +8392,7 @@ _08061AA2:
adds r0, r7, r0
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsrs r0, 4
bl sub_8063F84
@@ -8401,7 +8401,7 @@ _08061AA2:
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_806366C
+ bl npc_block_way__next_tile
lsls r0, 24
lsrs r0, 24
_08061AFC:
@@ -8410,7 +8410,7 @@ _08061AFC:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
lsls r0, 24
lsrs r6, r0, 24
_08061B0E:
@@ -8431,7 +8431,7 @@ _08061B0E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8061A80
+ thumb_func_end MoveFieldObjectInNextDirectionInSequence
thumb_func_start sub_8061B34
sub_8061B34: @ 8061B34
@@ -8468,7 +8468,7 @@ sub_8061B5C: @ 8061B5C
ldr r2, _08061B78 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061B7C @ =sub_8061B80
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8522,7 +8522,7 @@ _08061BCC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8545,7 +8545,7 @@ sub_8061BE8: @ 8061BE8
ldr r2, _08061C04 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061C08 @ =sub_8061C0C
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8599,7 +8599,7 @@ _08061C58:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8622,7 +8622,7 @@ sub_8061C74: @ 8061C74
ldr r2, _08061C90 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061C94 @ =sub_8061C98
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8676,7 +8676,7 @@ _08061CE4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8699,7 +8699,7 @@ sub_8061D00: @ 8061D00
ldr r2, _08061D1C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061D20 @ =sub_8061D24
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8753,7 +8753,7 @@ _08061D70:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8776,7 +8776,7 @@ sub_8061D8C: @ 8061D8C
ldr r2, _08061DA8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061DAC @ =sub_8061DB0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8830,7 +8830,7 @@ _08061DFC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8853,7 +8853,7 @@ sub_8061E18: @ 8061E18
ldr r2, _08061E34 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061E38 @ =sub_8061E3C
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8907,7 +8907,7 @@ _08061E88:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -8930,7 +8930,7 @@ sub_8061EA4: @ 8061EA4
ldr r2, _08061EC0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061EC4 @ =sub_8061EC8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -8984,7 +8984,7 @@ _08061F14:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9007,7 +9007,7 @@ sub_8061F30: @ 8061F30
ldr r2, _08061F4C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061F50 @ =sub_8061F54
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9061,7 +9061,7 @@ _08061FA0:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9084,7 +9084,7 @@ sub_8061FBC: @ 8061FBC
ldr r2, _08061FD8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08061FDC @ =sub_8061FE0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9138,7 +9138,7 @@ _0806202C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9161,7 +9161,7 @@ sub_8062048: @ 8062048
ldr r2, _08062064 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062068 @ =sub_806206C
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9215,7 +9215,7 @@ _080620B8:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9238,7 +9238,7 @@ sub_80620D4: @ 80620D4
ldr r2, _080620F0 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080620F4 @ =sub_80620F8
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9292,7 +9292,7 @@ _08062144:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9315,7 +9315,7 @@ sub_8062160: @ 8062160
ldr r2, _0806217C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062180 @ =sub_8062184
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9369,7 +9369,7 @@ _080621D0:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9392,7 +9392,7 @@ sub_80621EC: @ 80621EC
ldr r2, _08062208 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0806220C @ =sub_8062210
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9446,7 +9446,7 @@ _0806225C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9469,7 +9469,7 @@ sub_8062278: @ 8062278
ldr r2, _08062294 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062298 @ =sub_806229C
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9523,7 +9523,7 @@ _080622E8:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9546,7 +9546,7 @@ sub_8062304: @ 8062304
ldr r2, _08062320 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062324 @ =sub_8062328
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9600,7 +9600,7 @@ _08062374:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9623,7 +9623,7 @@ sub_8062390: @ 8062390
ldr r2, _080623AC @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080623B0 @ =sub_80623B4
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9677,7 +9677,7 @@ _08062400:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9700,7 +9700,7 @@ sub_806241C: @ 806241C
ldr r2, _08062438 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0806243C @ =sub_8062440
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9754,7 +9754,7 @@ _0806248C:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9777,7 +9777,7 @@ sub_80624A8: @ 80624A8
ldr r2, _080624C4 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080624C8 @ =sub_80624CC
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9831,7 +9831,7 @@ _08062518:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9854,7 +9854,7 @@ sub_8062534: @ 8062534
ldr r2, _08062550 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062554 @ =sub_8062558
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9908,7 +9908,7 @@ _080625A4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -9931,7 +9931,7 @@ sub_80625C0: @ 80625C0
ldr r2, _080625DC @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080625E0 @ =sub_80625E4
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -9985,7 +9985,7 @@ _08062630:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10008,7 +10008,7 @@ sub_806264C: @ 806264C
ldr r2, _08062668 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0806266C @ =sub_8062670
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -10062,7 +10062,7 @@ _080626BC:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10085,7 +10085,7 @@ sub_80626D8: @ 80626D8
ldr r2, _080626F4 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080626F8 @ =sub_80626FC
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -10139,7 +10139,7 @@ _08062748:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10162,7 +10162,7 @@ sub_8062764: @ 8062764
ldr r2, _08062780 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062784 @ =sub_8062788
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -10216,7 +10216,7 @@ _080627D4:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10239,7 +10239,7 @@ sub_80627F0: @ 80627F0
ldr r2, _0806280C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062810 @ =sub_8062814
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -10293,7 +10293,7 @@ _08062860:
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_8061A80
+ bl MoveFieldObjectInNextDirectionInSequence
lsls r0, 24
lsrs r0, 24
add sp, 0x4
@@ -10316,7 +10316,7 @@ sub_806287C: @ 806287C
ldr r2, _08062898 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0806289C @ =sub_80628A0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -10343,17 +10343,17 @@ sub_80628A0: @ 80628A0
_080628BC: .4byte gUnknown_83A6384
thumb_func_end sub_80628A0
- thumb_func_start sub_80628C0
-sub_80628C0: @ 80628C0
+ thumb_func_start mss_npc_reset_oampriv3_1_unk2_unk3
+mss_npc_reset_oampriv3_1_unk2_unk3: @ 80628C0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
adds r4, 0x21
ldrb r0, [r4]
cmp r0, 0
bne _080628D8
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
strb r0, [r4]
_080628D8:
movs r0, 0x1
@@ -10361,7 +10361,7 @@ _080628D8:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80628C0
+ thumb_func_end mss_npc_reset_oampriv3_1_unk2_unk3
thumb_func_start sub_80628E4
sub_80628E4: @ 80628E4
@@ -10389,12 +10389,12 @@ _08062908: .4byte gUnknown_2036E38
_0806290C: .4byte gUnknown_2037078
_08062910:
ldr r5, _08062940 @ =gUnknown_83A6390
- bl sub_805BFE0
+ bl player_get_x22
adds r4, r0, 0
lsls r4, 24
lsrs r4, 22
adds r4, r5
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -10456,7 +10456,7 @@ sub_8062970: @ 8062970
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
- bl sub_80644CC
+ bl state_to_direction
bl sub_8063EB8
adds r2, r0, 0
lsls r2, 24
@@ -10497,7 +10497,7 @@ sub_80629B8: @ 80629B8
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
@@ -10505,7 +10505,7 @@ sub_80629B8: @ 80629B8
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8063F84
adds r2, r0, 0
@@ -10521,7 +10521,7 @@ sub_80629B8: @ 80629B8
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062A3E
@@ -10586,7 +10586,7 @@ sub_8062A70: @ 8062A70
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
@@ -10594,7 +10594,7 @@ sub_8062A70: @ 8062A70
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8063FB0
adds r2, r0, 0
@@ -10610,7 +10610,7 @@ sub_8062A70: @ 8062A70
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062AF6
@@ -10675,7 +10675,7 @@ sub_8062B28: @ 8062B28
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
@@ -10683,7 +10683,7 @@ sub_8062B28: @ 8062B28
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8064034
adds r2, r0, 0
@@ -10699,7 +10699,7 @@ sub_8062B28: @ 8062B28
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062BAE
@@ -10764,7 +10764,7 @@ sub_8062BE0: @ 8062BE0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
@@ -10772,7 +10772,7 @@ sub_8062BE0: @ 8062BE0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8064060
adds r2, r0, 0
@@ -10788,7 +10788,7 @@ sub_8062BE0: @ 8062BE0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062C66
@@ -10834,8 +10834,8 @@ _08062C7A:
_08062C94: .4byte gUnknown_839FD5D
thumb_func_end sub_8062BE0
- thumb_func_start sub_8062C98
-sub_8062C98: @ 8062C98
+ thumb_func_start cph_IM_DIFFERENT
+cph_IM_DIFFERENT: @ 8062C98
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -10848,7 +10848,7 @@ sub_8062C98: @ 8062C98
adds r1, r4, 0
adds r1, 0x21
ldrb r1, [r1]
- bl sub_80644CC
+ bl state_to_direction
bl sub_806413C
adds r2, r0, 0
lsls r2, 24
@@ -10868,7 +10868,7 @@ sub_8062C98: @ 8062C98
bx r1
.align 2, 0
_08062CDC: .4byte gUnknown_839FD5D
- thumb_func_end sub_8062C98
+ thumb_func_end cph_IM_DIFFERENT
thumb_func_start sub_8062CE0
sub_8062CE0: @ 8062CE0
@@ -10889,7 +10889,7 @@ sub_8062CE0: @ 8062CE0
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
mov r5, sp
adds r5, 0x2
@@ -10897,7 +10897,7 @@ sub_8062CE0: @ 8062CE0
adds r1, r6, 0
mov r2, sp
adds r3, r5, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
adds r0, r6, 0
bl sub_8064194
adds r2, r0, 0
@@ -10913,7 +10913,7 @@ sub_8062CE0: @ 8062CE0
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062D66
@@ -10959,8 +10959,8 @@ _08062D7A:
_08062D94: .4byte gUnknown_839FD5D
thumb_func_end sub_8062CE0
- thumb_func_start sub_8062D98
-sub_8062D98: @ 8062D98
+ thumb_func_start oac_hopping
+oac_hopping: @ 8062D98
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -10978,7 +10978,7 @@ sub_8062D98: @ 8062D98
adds r1, 0x21
ldrb r1, [r1]
adds r2, r6, 0
- bl sub_80644CC
+ bl state_to_direction
adds r6, r0, 0
ldrh r1, [r4, 0x10]
add r0, sp, 0x4
@@ -11009,7 +11009,7 @@ sub_8062D98: @ 8062D98
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _08062E2C
@@ -11053,7 +11053,7 @@ _08062E40:
bx r1
.align 2, 0
_08062E5C: .4byte gUnknown_839FD5D
- thumb_func_end sub_8062D98
+ thumb_func_end oac_hopping
thumb_func_start sub_8062E60
sub_8062E60: @ 8062E60
@@ -11067,7 +11067,7 @@ sub_8062E60: @ 8062E60
ldr r2, _08062E7C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08062E80 @ =sub_8062E84
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11094,8 +11094,8 @@ sub_8062E84: @ 8062E84
_08062EA0: .4byte gUnknown_83A63BC
thumb_func_end sub_8062E84
- thumb_func_start sub_8062EA4
-sub_8062EA4: @ 8062EA4
+ thumb_func_start mss_08062EA4
+mss_08062EA4: @ 8062EA4
push {r4-r7,lr}
adds r6, r0, 0
adds r7, r1, 0
@@ -11120,12 +11120,12 @@ _08062EC8: .4byte gUnknown_2036E38
_08062ECC: .4byte gUnknown_2037078
_08062ED0:
ldr r5, _08062F00 @ =gUnknown_83A6390
- bl sub_805BFE0
+ bl player_get_x22
adds r4, r0, 0
lsls r4, 24
lsrs r4, 22
adds r4, r5
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -11143,10 +11143,10 @@ _08062EF8:
.align 2, 0
_08062F00: .4byte gUnknown_83A6390
_08062F04: .4byte sub_8059B44
- thumb_func_end sub_8062EA4
+ thumb_func_end mss_08062EA4
- thumb_func_start sub_8062F08
-sub_8062F08: @ 8062F08
+ thumb_func_start FieldObjectCB_TreeDisguise
+FieldObjectCB_TreeDisguise: @ 8062F08
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x2E
@@ -11173,9 +11173,9 @@ _08062F30:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x1C
- bl sub_8083444
+ bl FieldEffectStart
strb r0, [r4, 0x1A]
movs r0, 0x1
strb r0, [r6]
@@ -11192,7 +11192,7 @@ _08062F50:
adds r0, r1
ldr r2, _08062F74 @ =sub_8062F78
adds r1, r5, 0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r4-r6}
pop {r0}
bx r0
@@ -11200,19 +11200,19 @@ _08062F50:
_08062F6C: .4byte gUnknown_2036E38
_08062F70: .4byte gUnknown_20386E0
_08062F74: .4byte sub_8062F78
- thumb_func_end sub_8062F08
+ thumb_func_end FieldObjectCB_TreeDisguise
thumb_func_start sub_8062F78
sub_8062F78: @ 8062F78
push {lr}
- bl sub_8063410
+ bl npc_reset
movs r0, 0
pop {r1}
bx r1
thumb_func_end sub_8062F78
- thumb_func_start sub_8062F84
-sub_8062F84: @ 8062F84
+ thumb_func_start FieldObjectCB_MountainDisguise
+FieldObjectCB_MountainDisguise: @ 8062F84
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x2E
@@ -11239,9 +11239,9 @@ _08062FAC:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x1D
- bl sub_8083444
+ bl FieldEffectStart
strb r0, [r4, 0x1A]
movs r0, 0x1
strb r0, [r6]
@@ -11258,7 +11258,7 @@ _08062FCC:
adds r0, r1
ldr r2, _08062FF0 @ =sub_8062F78
adds r1, r5, 0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r4-r6}
pop {r0}
bx r0
@@ -11266,10 +11266,10 @@ _08062FCC:
_08062FE8: .4byte gUnknown_2036E38
_08062FEC: .4byte gUnknown_20386E0
_08062FF0: .4byte sub_8062F78
- thumb_func_end sub_8062F84
+ thumb_func_end FieldObjectCB_MountainDisguise
- thumb_func_start sub_8062FF4
-sub_8062FF4: @ 8062FF4
+ thumb_func_start FieldObjectCB_Hidden1
+FieldObjectCB_Hidden1: @ 8062FF4
push {r4,lr}
adds r3, r0, 0
movs r1, 0x3C
@@ -11311,14 +11311,14 @@ _08063034:
adds r0, r4
ldr r2, _08063054 @ =sub_8063058
adds r1, r3, 0
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08063050: .4byte gUnknown_2036E38
_08063054: .4byte sub_8063058
- thumb_func_end sub_8062FF4
+ thumb_func_end FieldObjectCB_Hidden1
thumb_func_start sub_8063058
sub_8063058: @ 8063058
@@ -11342,7 +11342,7 @@ _08063074: .4byte gUnknown_83A63C8
thumb_func_start sub_8063078
sub_8063078: @ 8063078
push {lr}
- bl sub_8063410
+ bl npc_reset
movs r0, 0
pop {r1}
bx r1
@@ -11377,7 +11377,7 @@ sub_80630A0: @ 80630A0
ldr r2, _080630BC @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080630C0 @ =sub_80630C4
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11409,11 +11409,11 @@ sub_80630E4: @ 80630E4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -11439,7 +11439,7 @@ sub_8063110: @ 8063110
ldr r2, _0806312C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08063130 @ =sub_8063134
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11471,7 +11471,7 @@ sub_8063154: @ 8063154
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -11501,7 +11501,7 @@ sub_8063180: @ 8063180
ldr r2, _0806319C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080631A0 @ =sub_80631A4
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11533,11 +11533,11 @@ sub_80631C4: @ 80631C4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806429C
+ bl GetStepInPlaceDelay4AnimId
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -11563,7 +11563,7 @@ sub_80631F0: @ 80631F0
ldr r2, _0806320C @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08063210 @ =sub_8063214
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11595,7 +11595,7 @@ sub_8063234: @ 8063234
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_8063410
+ bl npc_reset
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -11660,7 +11660,7 @@ sub_8063298: @ 8063298
ldr r2, _080632B4 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080632B8 @ =sub_8063304
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11680,7 +11680,7 @@ sub_80632BC: @ 80632BC
ldr r2, _080632D8 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _080632DC @ =sub_8063324
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11700,7 +11700,7 @@ sub_80632E0: @ 80632E0
ldr r2, _080632FC @ =gUnknown_2036E38
adds r0, r2
ldr r2, _08063300 @ =sub_8063344
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -11770,7 +11770,7 @@ sub_8063364: @ 8063364
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x98
@@ -11818,7 +11818,7 @@ sub_80633B4: @ 80633B4
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x99
@@ -11836,7 +11836,7 @@ sub_80633D4: @ 80633D4
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
- bl sub_8063410
+ bl npc_reset
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x9A
@@ -11866,8 +11866,8 @@ _08063406:
bx r1
thumb_func_end sub_80633F4
- thumb_func_start sub_8063410
-sub_8063410: @ 8063410
+ thumb_func_start npc_reset
+npc_reset: @ 8063410
ldrb r3, [r0]
movs r2, 0x3
negs r2, r2
@@ -11883,10 +11883,10 @@ sub_8063410: @ 8063410
movs r0, 0
strh r0, [r1, 0x30]
bx lr
- thumb_func_end sub_8063410
+ thumb_func_end npc_reset
- thumb_func_start sub_8063430
-sub_8063430: @ 8063430
+ thumb_func_start FieldObjectDirectionToImageAnimId
+FieldObjectDirectionToImageAnimId: @ 8063430
lsls r0, 24
lsrs r0, 24
ldr r1, _0806343C @ =gUnknown_83A640C
@@ -11895,10 +11895,10 @@ sub_8063430: @ 8063430
bx lr
.align 2, 0
_0806343C: .4byte gUnknown_83A640C
- thumb_func_end sub_8063430
+ thumb_func_end FieldObjectDirectionToImageAnimId
- thumb_func_start sub_8063440
-sub_8063440: @ 8063440
+ thumb_func_start get_go_image_anim_num
+get_go_image_anim_num: @ 8063440
lsls r0, 24
lsrs r0, 24
ldr r1, _0806344C @ =gUnknown_83A6415
@@ -11907,10 +11907,10 @@ sub_8063440: @ 8063440
bx lr
.align 2, 0
_0806344C: .4byte gUnknown_83A6415
- thumb_func_end sub_8063440
+ thumb_func_end get_go_image_anim_num
- thumb_func_start sub_8063450
-sub_8063450: @ 8063450
+ thumb_func_start get_go_fast_image_anim_num
+get_go_fast_image_anim_num: @ 8063450
lsls r0, 24
lsrs r0, 24
ldr r1, _0806345C @ =gUnknown_83A641E
@@ -11919,10 +11919,10 @@ sub_8063450: @ 8063450
bx lr
.align 2, 0
_0806345C: .4byte gUnknown_83A641E
- thumb_func_end sub_8063450
+ thumb_func_end get_go_fast_image_anim_num
- thumb_func_start sub_8063460
-sub_8063460: @ 8063460
+ thumb_func_start get_go_faster_image_anim_num
+get_go_faster_image_anim_num: @ 8063460
lsls r0, 24
lsrs r0, 24
ldr r1, _0806346C @ =gUnknown_83A6427
@@ -11931,7 +11931,7 @@ sub_8063460: @ 8063460
bx lr
.align 2, 0
_0806346C: .4byte gUnknown_83A6427
- thumb_func_end sub_8063460
+ thumb_func_end get_go_faster_image_anim_num
thumb_func_start sub_8063470
sub_8063470: @ 8063470
@@ -12065,8 +12065,8 @@ sub_8063510: @ 8063510
_0806351C: .4byte gUnknown_83A648A
thumb_func_end sub_8063510
- thumb_func_start sub_8063520
-sub_8063520: @ 8063520
+ thumb_func_start get_run_image_anim_num
+get_run_image_anim_num: @ 8063520
lsls r0, 24
lsrs r0, 24
ldr r1, _0806352C @ =gUnknown_83A6493
@@ -12075,7 +12075,7 @@ sub_8063520: @ 8063520
bx lr
.align 2, 0
_0806352C: .4byte gUnknown_83A6493
- thumb_func_end sub_8063520
+ thumb_func_end get_run_image_anim_num
thumb_func_start sub_8063530
sub_8063530: @ 8063530
@@ -12103,8 +12103,8 @@ _08063550:
bx r1
thumb_func_end sub_8063530
- thumb_func_start sub_8063554
-sub_8063554: @ 8063554
+ thumb_func_start npc_apply_anim_looping
+npc_apply_anim_looping: @ 8063554
push {r4,lr}
adds r4, r1, 0
lsls r2, 24
@@ -12138,15 +12138,15 @@ _0806358C:
_0806358E:
ldrb r1, [r1]
adds r0, r4, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
_08063596:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8063554
+ thumb_func_end npc_apply_anim_looping
- thumb_func_start sub_806359C
-sub_806359C: @ 806359C
+ thumb_func_start obj_npc_animation_step
+obj_npc_animation_step: @ 806359C
push {r4,lr}
adds r4, r1, 0
lsls r2, 24
@@ -12173,12 +12173,12 @@ sub_806359C: @ 806359C
ldrb r1, [r2, 0x4]
_080635CE:
adds r0, r4, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
_080635D4:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_806359C
+ thumb_func_end obj_npc_animation_step
thumb_func_start sub_80635DC
sub_80635DC: @ 80635DC
@@ -12214,8 +12214,8 @@ _0806360C:
bx r1
thumb_func_end sub_80635DC
- thumb_func_start sub_8063610
-sub_8063610: @ 8063610
+ thumb_func_start npc_set_running_behaviour_etc
+npc_set_running_behaviour_etc: @ 8063610
push {r4,lr}
mov r12, r0
lsls r1, 24
@@ -12253,10 +12253,10 @@ sub_8063610: @ 8063610
.align 2, 0
_08063654: .4byte gUnknown_202063C
_08063658: .4byte gUnknown_839FBC8
- thumb_func_end sub_8063610
+ thumb_func_end npc_set_running_behaviour_etc
- thumb_func_start sub_806365C
-sub_806365C: @ 806365C
+ thumb_func_start npc_running_behaviour_by_direction
+npc_running_behaviour_by_direction: @ 806365C
lsls r0, 24
lsrs r0, 24
ldr r1, _08063668 @ =gUnknown_83A649C
@@ -12265,10 +12265,10 @@ sub_806365C: @ 806365C
bx lr
.align 2, 0
_08063668: .4byte gUnknown_83A649C
- thumb_func_end sub_806365C
+ thumb_func_end npc_running_behaviour_by_direction
- thumb_func_start sub_806366C
-sub_806366C: @ 806366C
+ thumb_func_start npc_block_way__next_tile
+npc_block_way__next_tile: @ 806366C
push {r4-r6,lr}
sub sp, 0x4
adds r6, r0, 0
@@ -12284,7 +12284,7 @@ sub_806366C: @ 806366C
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
@@ -12292,17 +12292,17 @@ sub_806366C: @ 806366C
ldrsh r2, [r4, r0]
adds r0, r6, 0
adds r3, r5, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
lsrs r0, 24
add sp, 0x4
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806366C
+ thumb_func_end npc_block_way__next_tile
- thumb_func_start sub_80636AC
-sub_80636AC: @ 80636AC
+ thumb_func_start npc_block_way
+npc_block_way: @ 80636AC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -12323,7 +12323,7 @@ sub_80636AC: @ 80636AC
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_806383C
+ bl IsCoordOutsideFieldObjectMovementRect
lsls r0, 24
cmp r0, 0
beq _080636E2
@@ -12347,7 +12347,7 @@ _080636E2:
adds r1, r5, 0
adds r2, r4, 0
adds r3, r7, 0
- bl sub_80638AC
+ bl IsMetatileDirectionallyImpassable
lsls r0, 24
cmp r0, 0
bne _08063724
@@ -12356,7 +12356,7 @@ _080636E2:
cmp r0, 0
beq _08063728
mov r0, r8
- bl sub_8059464
+ bl CanCameraMoveInDirection
cmp r0, 0
bne _08063728
_08063724:
@@ -12374,7 +12374,7 @@ _08063728:
asrs r4, r1, 16
adds r1, r5, 0
adds r2, r4, 0
- bl sub_80681B0
+ bl IsZCoordMismatchAt
lsls r0, 24
cmp r0, 0
beq _0806374C
@@ -12384,7 +12384,7 @@ _0806374C:
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8063904
+ bl CheckForCollisionBetweenFieldObjects
lsls r0, 24
cmp r0, 0
bne _08063760
@@ -12400,7 +12400,7 @@ _08063762:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80636AC
+ thumb_func_end npc_block_way
thumb_func_start sub_8063770
sub_8063770: @ 8063770
@@ -12424,7 +12424,7 @@ sub_8063770: @ 8063770
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_806383C
+ bl IsCoordOutsideFieldObjectMovementRect
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -12447,7 +12447,7 @@ sub_8063770: @ 8063770
adds r1, r6, 0
adds r2, r5, 0
mov r3, r8
- bl sub_80638AC
+ bl IsMetatileDirectionallyImpassable
lsls r0, 24
cmp r0, 0
bne _080637E8
@@ -12456,7 +12456,7 @@ sub_8063770: @ 8063770
cmp r0, 0
beq _080637EC
mov r0, r8
- bl sub_8059464
+ bl CanCameraMoveInDirection
cmp r0, 0
bne _080637EC
_080637E8:
@@ -12474,7 +12474,7 @@ _080637EC:
asrs r5, r1, 16
adds r1, r6, 0
adds r2, r5, 0
- bl sub_80681B0
+ bl IsZCoordMismatchAt
lsls r0, 24
cmp r0, 0
beq _08063814
@@ -12486,7 +12486,7 @@ _08063814:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_8063904
+ bl CheckForCollisionBetweenFieldObjects
lsls r0, 24
cmp r0, 0
beq _0806382C
@@ -12505,8 +12505,8 @@ _0806382C:
bx r1
thumb_func_end sub_8063770
- thumb_func_start sub_806383C
-sub_806383C: @ 806383C
+ thumb_func_start IsCoordOutsideFieldObjectMovementRect
+IsCoordOutsideFieldObjectMovementRect: @ 806383C
push {r4,r5,lr}
adds r4, r0, 0
lsls r1, 16
@@ -12567,10 +12567,10 @@ _080638A6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806383C
+ thumb_func_end IsCoordOutsideFieldObjectMovementRect
- thumb_func_start sub_80638AC
-sub_80638AC: @ 80638AC
+ thumb_func_start IsMetatileDirectionallyImpassable
+IsMetatileDirectionallyImpassable: @ 80638AC
push {r4-r7,lr}
lsls r1, 16
lsrs r6, r1, 16
@@ -12613,10 +12613,10 @@ _080638FE:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80638AC
+ thumb_func_end IsMetatileDirectionallyImpassable
- thumb_func_start sub_8063904
-sub_8063904: @ 8063904
+ thumb_func_start CheckForCollisionBetweenFieldObjects
+CheckForCollisionBetweenFieldObjects: @ 8063904
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -12662,7 +12662,7 @@ _0806394C:
ldrb r1, [r2, 0xB]
lsls r1, 28
lsrs r1, 28
- bl sub_806835C
+ bl AreZCoordsCompatible
lsls r0, 24
cmp r0, 0
beq _0806396C
@@ -12681,7 +12681,7 @@ _08063978:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8063904
+ thumb_func_end CheckForCollisionBetweenFieldObjects
thumb_func_start sub_8063980
sub_8063980: @ 8063980
@@ -12694,7 +12694,7 @@ sub_8063980: @ 8063980
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080639CC
@@ -12740,7 +12740,7 @@ sub_80639D4: @ 80639D4
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _08063A12
@@ -12770,8 +12770,8 @@ _08063A18: .4byte gUnknown_202063C
_08063A1C: .4byte gUnknown_2036E38
thumb_func_end sub_80639D4
- thumb_func_start sub_8063A20
-sub_8063A20: @ 8063A20
+ thumb_func_start MoveCoords
+MoveCoords: @ 8063A20
push {r4,lr}
lsls r0, 24
ldr r3, _08063A40 @ =gUnknown_83A64C8
@@ -12790,7 +12790,7 @@ sub_8063A20: @ 8063A20
bx r0
.align 2, 0
_08063A40: .4byte gUnknown_83A64C8
- thumb_func_end sub_8063A20
+ thumb_func_end MoveCoords
thumb_func_start sub_8063A44
sub_8063A44: @ 8063A44
@@ -13039,8 +13039,8 @@ sub_8063BC4: @ 8063BC4
bx r0
thumb_func_end sub_8063BC4
- thumb_func_start sub_8063C10
-sub_8063C10: @ 8063C10
+ thumb_func_start GetFieldObjectMovingCameraOffset
+GetFieldObjectMovingCameraOffset: @ 8063C10
push {lr}
adds r2, r0, 0
movs r0, 0
@@ -13077,10 +13077,10 @@ _08063C48:
bx r0
.align 2, 0
_08063C4C: .4byte gUnknown_3005050
- thumb_func_end sub_8063C10
+ thumb_func_end GetFieldObjectMovingCameraOffset
- thumb_func_start sub_8063C50
-sub_8063C50: @ 8063C50
+ thumb_func_start FieldObjectMoveDestCoords
+FieldObjectMoveDestCoords: @ 8063C50
push {r4,lr}
lsls r1, 24
lsrs r1, 24
@@ -13091,14 +13091,14 @@ sub_8063C50: @ 8063C50
adds r0, r1, 0
adds r1, r2, 0
adds r2, r3, 0
- bl sub_8063A20
+ bl MoveCoords
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8063C50
+ thumb_func_end FieldObjectMoveDestCoords
- thumb_func_start sub_8063C70
-sub_8063C70: @ 8063C70
+ thumb_func_start FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
+FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive: @ 8063C70
push {lr}
ldrb r1, [r0]
movs r0, 0x42
@@ -13112,10 +13112,10 @@ _08063C80:
_08063C82:
pop {r1}
bx r1
- thumb_func_end sub_8063C70
+ thumb_func_end FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
- thumb_func_start sub_8063C88
-sub_8063C88: @ 8063C88
+ thumb_func_start FieldObjectIsSpecialAnimActive
+FieldObjectIsSpecialAnimActive: @ 8063C88
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13132,7 +13132,7 @@ _08063C9E:
_08063CA0:
pop {r1}
bx r1
- thumb_func_end sub_8063C88
+ thumb_func_end FieldObjectIsSpecialAnimActive
thumb_func_start sub_8063CA4
sub_8063CA4: @ 8063CA4
@@ -13146,7 +13146,7 @@ sub_8063CA4: @ 8063CA4
cmp r0, 0x1
beq _08063CC8
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08063CCE
@@ -13154,10 +13154,10 @@ sub_8063CA4: @ 8063CA4
b _08063CF4
_08063CC8:
adds r0, r4, 0
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
_08063CCE:
adds r0, r4, 0
- bl sub_80689F4
+ bl npc_sync_anim_pause_bits
movs r3, 0
strb r5, [r4, 0x1C]
ldrb r0, [r4]
@@ -13182,23 +13182,23 @@ _08063CF4:
_08063CFC: .4byte gUnknown_202063C
thumb_func_end sub_8063CA4
- thumb_func_start sub_8063D00
-sub_8063D00: @ 8063D00
+ thumb_func_start FieldObjectForceSetSpecialAnim
+FieldObjectForceSetSpecialAnim: @ 8063D00
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
adds r0, r5, 0
adds r1, r4, 0
bl sub_8063CA4
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8063D00
+ thumb_func_end FieldObjectForceSetSpecialAnim
- thumb_func_start sub_8063D1C
-sub_8063D1C: @ 8063D1C
+ thumb_func_start FieldObjectClearAnimIfSpecialAnimActive
+FieldObjectClearAnimIfSpecialAnimActive: @ 8063D1C
push {lr}
adds r1, r0, 0
ldrb r0, [r1]
@@ -13206,14 +13206,14 @@ sub_8063D1C: @ 8063D1C
cmp r0, 0
bge _08063D2E
adds r0, r1, 0
- bl sub_8063D34
+ bl FieldObjectClearAnim
_08063D2E:
pop {r0}
bx r0
- thumb_func_end sub_8063D1C
+ thumb_func_end FieldObjectClearAnimIfSpecialAnimActive
- thumb_func_start sub_8063D34
-sub_8063D34: @ 8063D34
+ thumb_func_start FieldObjectClearAnim
+FieldObjectClearAnim: @ 8063D34
movs r1, 0xFF
strb r1, [r0, 0x1C]
ldrb r2, [r0]
@@ -13240,10 +13240,10 @@ sub_8063D34: @ 8063D34
bx lr
.align 2, 0
_08063D64: .4byte gUnknown_202063C
- thumb_func_end sub_8063D34
+ thumb_func_end FieldObjectClearAnim
- thumb_func_start sub_8063D68
-sub_8063D68: @ 8063D68
+ thumb_func_start FieldObjectCheckIfSpecialAnimFinishedOrInactive
+FieldObjectCheckIfSpecialAnimFinishedOrInactive: @ 8063D68
push {lr}
ldrb r1, [r0]
lsls r0, r1, 25
@@ -13256,13 +13256,13 @@ _08063D76:
_08063D78:
pop {r1}
bx r1
- thumb_func_end sub_8063D68
+ thumb_func_end FieldObjectCheckIfSpecialAnimFinishedOrInactive
- thumb_func_start sub_8063D7C
-sub_8063D7C: @ 8063D7C
+ thumb_func_start FieldObjectClearAnimIfSpecialAnimFinished
+FieldObjectClearAnimIfSpecialAnimFinished: @ 8063D7C
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -13270,13 +13270,13 @@ sub_8063D7C: @ 8063D7C
cmp r4, 0x10
beq _08063D96
adds r0, r5, 0
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
_08063D96:
adds r0, r4, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8063D7C
+ thumb_func_end FieldObjectClearAnimIfSpecialAnimFinished
thumb_func_start sub_8063DA0
sub_8063DA0: @ 8063DA0
@@ -13295,24 +13295,24 @@ _08063DB2:
bx r1
thumb_func_end sub_8063DA0
- thumb_func_start sub_8063DB8
-sub_8063DB8: @ 8063DB8
+ thumb_func_start FieldObjectStep
+FieldObjectStep: @ 8063DB8
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
adds r6, r2, 0
- bl sub_80687F0
+ bl DoGroundEffects_OnSpawn
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679C8
adds r0, r4, 0
- bl sub_8063C88
+ bl FieldObjectIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08063DE2
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806450C
+ bl FieldObjectExecSpecialAnim
b _08063DF8
_08063DE2:
ldrb r0, [r4, 0x1]
@@ -13329,10 +13329,10 @@ _08063DEA:
_08063DF8:
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806883C
+ bl DoGroundEffects_OnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068890
+ bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679AC
@@ -13341,23 +13341,23 @@ _08063DF8:
bl sub_80679F8
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068340
+ bl FieldObjectUpdateSubpriority
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8063DB8
+ thumb_func_end FieldObjectStep
thumb_func_start sub_8063E28
sub_8063E28: @ 8063E28
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
- bl sub_80687F0
+ bl DoGroundEffects_OnSpawn
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679C8
adds r0, r4, 0
- bl sub_8063C88
+ bl FieldObjectIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08063E5C
@@ -13398,10 +13398,10 @@ _08063E88:
strb r0, [r4, 0x1]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806883C
+ bl DoGroundEffects_OnBeginStep
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068890
+ bl DoGroundEffects_OnFinishStep
adds r0, r4, 0
adds r1, r5, 0
bl sub_80679AC
@@ -13410,7 +13410,7 @@ _08063E88:
bl sub_80679F8
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8068340
+ bl FieldObjectUpdateSubpriority
pop {r4,r5}
pop {r0}
bx r0
@@ -13909,8 +13909,8 @@ _08064204:
_08064214: .4byte gUnknown_83A654B
thumb_func_end sub_80641EC
- thumb_func_start sub_8064218
-sub_8064218: @ 8064218
+ thumb_func_start GetStepInPlaceDelay32AnimId
+GetStepInPlaceDelay32AnimId: @ 8064218
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -13932,10 +13932,10 @@ _08064230:
bx r1
.align 2, 0
_08064240: .4byte gUnknown_83A6550
- thumb_func_end sub_8064218
+ thumb_func_end GetStepInPlaceDelay32AnimId
- thumb_func_start sub_8064244
-sub_8064244: @ 8064244
+ thumb_func_start GetStepInPlaceDelay16AnimId
+GetStepInPlaceDelay16AnimId: @ 8064244
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -13957,7 +13957,7 @@ _0806425C:
bx r1
.align 2, 0
_0806426C: .4byte gUnknown_83A6555
- thumb_func_end sub_8064244
+ thumb_func_end GetStepInPlaceDelay16AnimId
thumb_func_start sub_8064270
sub_8064270: @ 8064270
@@ -13984,8 +13984,8 @@ _08064288:
_08064298: .4byte gUnknown_83A655A
thumb_func_end sub_8064270
- thumb_func_start sub_806429C
-sub_806429C: @ 806429C
+ thumb_func_start GetStepInPlaceDelay4AnimId
+GetStepInPlaceDelay4AnimId: @ 806429C
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -14007,15 +14007,15 @@ _080642B4:
bx r1
.align 2, 0
_080642C4: .4byte gUnknown_83A655F
- thumb_func_end sub_806429C
+ thumb_func_end GetStepInPlaceDelay4AnimId
- thumb_func_start sub_80642C8
-sub_80642C8: @ 80642C8
+ thumb_func_start FieldObjectFaceOppositeDirection
+FieldObjectFaceOppositeDirection: @ 80642C8
push {r4,lr}
adds r4, r0, 0
lsls r0, r1, 24
lsrs r0, 24
- bl sub_8064480
+ bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063EB8
@@ -14029,7 +14029,7 @@ sub_80642C8: @ 80642C8
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80642C8
+ thumb_func_end FieldObjectFaceOppositeDirection
thumb_func_start sub_80642F4
sub_80642F4: @ 80642F4
@@ -14256,8 +14256,8 @@ _0806446C:
_0806447C: .4byte gUnknown_83A658C
thumb_func_end sub_8064454
- thumb_func_start sub_8064480
-sub_8064480: @ 8064480
+ thumb_func_start GetOppositeDirection
+GetOppositeDirection: @ 8064480
push {r4,lr}
sub sp, 0x8
lsls r0, 24
@@ -14284,10 +14284,10 @@ _080644AA:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8064480
+ thumb_func_end GetOppositeDirection
- thumb_func_start sub_80644B4
-sub_80644B4: @ 80644B4
+ thumb_func_start zffu_offset_calc
+zffu_offset_calc: @ 80644B4
lsls r0, 24
lsls r1, 24
lsrs r1, 24
@@ -14300,10 +14300,10 @@ sub_80644B4: @ 80644B4
bx lr
.align 2, 0
_080644C8: .4byte gUnknown_83A6599
- thumb_func_end sub_80644B4
+ thumb_func_end zffu_offset_calc
- thumb_func_start sub_80644CC
-sub_80644CC: @ 80644CC
+ thumb_func_start state_to_direction
+state_to_direction: @ 80644CC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -14325,7 +14325,7 @@ _080644EC:
b _08064502
_080644F0:
adds r1, r2, 0
- bl sub_80644B4
+ bl zffu_offset_calc
ldr r2, _08064508 @ =gUnknown_83A65A9
lsls r1, r4, 2
subs r1, 0x5
@@ -14338,10 +14338,10 @@ _08064502:
bx r1
.align 2, 0
_08064508: .4byte gUnknown_83A65A9
- thumb_func_end sub_80644CC
+ thumb_func_end state_to_direction
- thumb_func_start sub_806450C
-sub_806450C: @ 806450C
+ thumb_func_start FieldObjectExecSpecialAnim
+FieldObjectExecSpecialAnim: @ 806450C
push {r4,lr}
adds r4, r0, 0
ldr r2, _08064540 @ =gUnknown_83A65BC
@@ -14369,7 +14369,7 @@ _08064538:
bx r0
.align 2, 0
_08064540: .4byte gUnknown_83A65BC
- thumb_func_end sub_806450C
+ thumb_func_end FieldObjectExecSpecialAnim
thumb_func_start sub_8064544
sub_8064544: @ 8064544
@@ -14470,26 +14470,26 @@ _080645EA:
_080645F0: .4byte gUnknown_3005E88
thumb_func_end sub_80645C8
- thumb_func_start sub_80645F4
-sub_80645F4: @ 80645F4
+ thumb_func_start an_look_any
+an_look_any: @ 80645F4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
lsls r1, r2, 24
lsrs r1, 24
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806359C
+ bl obj_npc_animation_step
adds r2, r5, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -14501,13 +14501,13 @@ sub_80645F4: @ 80645F4
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80645F4
+ thumb_func_end an_look_any
thumb_func_start sub_8064638
sub_8064638: @ 8064638
push {lr}
movs r2, 0x1
- bl sub_80645F4
+ bl an_look_any
movs r0, 0x1
pop {r1}
bx r1
@@ -14517,7 +14517,7 @@ sub_8064638: @ 8064638
sub_8064648: @ 8064648
push {lr}
movs r2, 0x2
- bl sub_80645F4
+ bl an_look_any
movs r0, 0x1
pop {r1}
bx r1
@@ -14527,7 +14527,7 @@ sub_8064648: @ 8064648
sub_8064658: @ 8064658
push {lr}
movs r2, 0x3
- bl sub_80645F4
+ bl an_look_any
movs r0, 0x1
pop {r1}
bx r1
@@ -14537,7 +14537,7 @@ sub_8064658: @ 8064658
sub_8064668: @ 8064668
push {lr}
movs r2, 0x4
- bl sub_80645F4
+ bl an_look_any
movs r0, 0x1
pop {r1}
bx r1
@@ -14568,22 +14568,22 @@ sub_8064678: @ 8064678
strh r0, [r5]
mov r0, r8
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r4, 0
mov r1, sp
adds r2, r5, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r5, r0]
mov r0, r8
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r9
adds r1, r4, 0
adds r2, r6, 0
- bl sub_8068B40
+ bl oamt_npc_ministep_reset
mov r2, r9
adds r2, 0x2C
ldrb r1, [r2]
@@ -14645,7 +14645,7 @@ sub_80646FC: @ 80646FC
lsrs r2, 24
adds r0, r5, 0
mov r1, r8
- bl sub_8063554
+ bl npc_apply_anim_looping
add sp, 0x14
pop {r3}
mov r8, r3
@@ -14668,13 +14668,13 @@ sub_8064758: @ 8064758
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063520
+ bl get_run_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -14686,7 +14686,7 @@ sub_8064788: @ 8064788
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8068B54
+ bl obj_npc_ministep
lsls r0, 24
cmp r0, 0
bne _0806479E
@@ -14694,7 +14694,7 @@ sub_8064788: @ 8064788
b _080647BA
_0806479E:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -14731,18 +14731,18 @@ sub_80647C0: @ 80647C0
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r4, r0]
adds r0, r6, 0
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r8
adds r1, r5, 0
bl sub_8068BBC
@@ -14779,13 +14779,13 @@ sub_8064830: @ 8064830
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -14805,7 +14805,7 @@ sub_806485C: @ 806485C
b _0806488E
_08064872:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -14842,18 +14842,18 @@ sub_8064894: @ 8064894
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r4, r0]
adds r0, r6, 0
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r8
adds r1, r5, 0
bl sub_8068C58
@@ -14890,13 +14890,13 @@ sub_8064904: @ 8064904
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -14916,7 +14916,7 @@ sub_8064930: @ 8064930
b _08064962
_08064946:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -15249,18 +15249,18 @@ sub_8064B68: @ 8064B68
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r4, r0]
adds r0, r6, 0
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r8
adds r1, r5, 0
bl sub_8068C08
@@ -15297,13 +15297,13 @@ sub_8064BD8: @ 8064BD8
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -15323,7 +15323,7 @@ sub_8064C04: @ 8064C04
b _08064C36
_08064C1A:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -15675,7 +15675,7 @@ sub_8064E3C: @ 8064E3C
strh r0, [r6]
adds r0, r7, 0
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
mov r1, r8
lsls r0, r1, 1
add r0, sp
@@ -15698,7 +15698,7 @@ sub_8064E3C: @ 8064E3C
lsls r2, 16
asrs r2, 16
adds r0, r7, 0
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r10
adds r1, r4, 0
mov r2, r8
@@ -15734,8 +15734,8 @@ sub_8064E3C: @ 8064E3C
_08064EF4: .4byte gUnknown_83A6958
thumb_func_end sub_8064E3C
- thumb_func_start sub_8064EF8
-sub_8064EF8: @ 8064EF8
+ thumb_func_start maybe_shadow_1
+maybe_shadow_1: @ 8064EF8
push {r4,r5,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -15753,20 +15753,20 @@ sub_8064EF8: @ 8064EF8
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
adds r0, r4, 0
- bl sub_80692F0
+ bl DoShadowFieldEffect
add sp, 0x4
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8064EF8
+ thumb_func_end maybe_shadow_1
thumb_func_start sub_8064F3C
sub_8064F3C: @ 8064F3C
@@ -15827,7 +15827,7 @@ sub_8064F3C: @ 8064F3C
lsls r2, 16
asrs r2, 16
adds r0, r6, 0
- bl sub_805F700
+ bl npc_coords_shift
ldrb r0, [r6]
movs r1, 0x4
orrs r0, r1
@@ -15842,7 +15842,7 @@ _08064FCC:
cmp r1, 0xFF
bne _08064FF0
adds r0, r6, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r6]
movs r1, 0x8
orrs r0, r1
@@ -15942,22 +15942,22 @@ sub_8065058: @ 8065058
_08065072:
ldrb r0, [r4, 0x18]
lsrs r0, 4
- bl sub_8064480
+ bl GetOppositeDirection
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063440
+ bl get_go_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_806359C
+ bl obj_npc_animation_step
_0806509E:
movs r0, 0
_080650A0:
@@ -15977,7 +15977,7 @@ sub_80650A8: @ 80650A8
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x2
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80650D4
@@ -16026,7 +16026,7 @@ sub_8065100: @ 8065100
adds r0, r4, 0
movs r2, 0x2
movs r3, 0x2
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_806512C
@@ -16075,7 +16075,7 @@ sub_8065158: @ 8065158
adds r0, r4, 0
movs r2, 0x3
movs r3, 0x2
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8065184
@@ -16124,7 +16124,7 @@ sub_80651B0: @ 80651B0
adds r0, r4, 0
movs r2, 0x4
movs r3, 0x2
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80651DC
@@ -16437,7 +16437,7 @@ sub_80653CC: @ 80653CC
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
- bl sub_8068B54
+ bl obj_npc_ministep
lsls r0, 24
cmp r0, 0
bne _080653E0
@@ -16445,7 +16445,7 @@ sub_80653CC: @ 80653CC
b _080653F0
_080653E0:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -16468,12 +16468,12 @@ sub_80653F8: @ 80653F8
cmp r0, 0x1
beq _0806541A
movs r0, 0x1
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0806541A:
adds r0, r4, 0
adds r1, r5, 0
@@ -16496,7 +16496,7 @@ sub_8065438: @ 8065438
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653CC
@@ -16526,12 +16526,12 @@ sub_8065464: @ 8065464
cmp r0, 0x2
beq _08065486
movs r0, 0x2
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08065486:
adds r0, r4, 0
adds r1, r5, 0
@@ -16554,7 +16554,7 @@ sub_80654A4: @ 80654A4
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653CC
@@ -16584,12 +16584,12 @@ sub_80654D0: @ 80654D0
cmp r0, 0x3
beq _080654F2
movs r0, 0x3
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080654F2:
adds r0, r4, 0
adds r1, r5, 0
@@ -16612,7 +16612,7 @@ sub_8065510: @ 8065510
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653CC
@@ -16642,12 +16642,12 @@ sub_806553C: @ 806553C
cmp r0, 0x4
beq _0806555E
movs r0, 0x4
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0806555E:
adds r0, r4, 0
adds r1, r5, 0
@@ -16670,7 +16670,7 @@ sub_806557C: @ 806557C
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r4, 0
adds r1, r5, 0
bl sub_80653CC
@@ -16696,9 +16696,9 @@ sub_80655A8: @ 80655A8
adds r5, r1, 0
lsls r1, r2, 24
lsrs r1, 24
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
adds r2, r5, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -16724,15 +16724,15 @@ sub_80655D4: @ 80655D4
cmp r0, 0x1
beq _080655F6
movs r0, 0x1
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080655F6:
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
@@ -16754,15 +16754,15 @@ sub_8065610: @ 8065610
cmp r0, 0x2
beq _08065632
movs r0, 0x2
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08065632:
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x2
@@ -16784,15 +16784,15 @@ sub_806564C: @ 806564C
cmp r0, 0x3
beq _0806566E
movs r0, 0x3
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0806566E:
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x3
@@ -16814,15 +16814,15 @@ sub_8065688: @ 8065688
cmp r0, 0x4
beq _080656AA
movs r0, 0x4
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080656AA:
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x4
@@ -16849,11 +16849,11 @@ sub_80656C4: @ 80656C4
lsrs r4, 24
lsls r5, 16
lsrs r5, 16
- bl sub_805FBDC
+ bl FieldObjectSetDirection
mov r0, r8
adds r1, r6, 0
adds r2, r4, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
adds r2, r6, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -16938,7 +16938,7 @@ sub_8065770: @ 8065770
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x1
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -16966,7 +16966,7 @@ sub_80657A8: @ 80657A8
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x2
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -16994,7 +16994,7 @@ sub_80657E0: @ 80657E0
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x3
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17022,7 +17022,7 @@ sub_8065818: @ 8065818
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x4
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17050,7 +17050,7 @@ sub_8065850: @ 8065850
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x1
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17078,7 +17078,7 @@ sub_8065888: @ 8065888
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x2
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17106,7 +17106,7 @@ sub_80658C0: @ 80658C0
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x3
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17134,7 +17134,7 @@ sub_80658F8: @ 80658F8
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x4
- bl sub_8063440
+ bl get_go_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17162,7 +17162,7 @@ sub_8065930: @ 8065930
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x1
- bl sub_8063450
+ bl get_go_fast_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17190,7 +17190,7 @@ sub_8065968: @ 8065968
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x2
- bl sub_8063450
+ bl get_go_fast_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17218,7 +17218,7 @@ sub_80659A0: @ 80659A0
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x3
- bl sub_8063450
+ bl get_go_fast_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17246,7 +17246,7 @@ sub_80659D8: @ 80659D8
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x4
- bl sub_8063450
+ bl get_go_fast_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17274,7 +17274,7 @@ sub_8065A10: @ 8065A10
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x1
- bl sub_8063460
+ bl get_go_faster_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17302,7 +17302,7 @@ sub_8065A48: @ 8065A48
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x2
- bl sub_8063460
+ bl get_go_faster_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17330,7 +17330,7 @@ sub_8065A80: @ 8065A80
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x3
- bl sub_8063460
+ bl get_go_faster_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -17358,7 +17358,7 @@ sub_8065AB8: @ 8065AB8
adds r4, r0, 0
adds r5, r1, 0
movs r0, 0x4
- bl sub_8063460
+ bl get_go_faster_image_anim_num
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
@@ -18002,18 +18002,18 @@ sub_8065EF0: @ 8065EF0
strh r0, [r4]
adds r0, r6, 0
adds r1, r5, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r5, 0
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
movs r0, 0
ldrsh r2, [r4, r0]
adds r0, r6, 0
- bl sub_805F700
+ bl npc_coords_shift
mov r0, r8
adds r1, r5, 0
bl sub_8068CA4
@@ -18050,13 +18050,13 @@ sub_8065F60: @ 8065F60
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_8063520
+ bl get_run_image_anim_num
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -18076,7 +18076,7 @@ sub_8065F8C: @ 8065F8C
b _08065FBE
_08065FA2:
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
ldrb r0, [r4]
movs r1, 0x8
orrs r0, r1
@@ -18242,8 +18242,8 @@ _080660BC:
bx r1
thumb_func_end sub_80660A4
- thumb_func_start sub_80660C4
-sub_80660C4: @ 80660C4
+ thumb_func_start npc_set_direction_and_anim__an_proceed
+npc_set_direction_and_anim__an_proceed: @ 80660C4
push {r4-r6,lr}
adds r6, r0, 0
adds r5, r1, 0
@@ -18255,16 +18255,16 @@ sub_80660C4: @ 80660C4
lsrs r1, 24
adds r0, r5, 0
movs r2, 0
- bl sub_8068E74
+ bl obj_anim_image_set_and_seek
adds r0, r6, 0
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x1
strh r0, [r5, 0x32]
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80660C4
+ thumb_func_end npc_set_direction_and_anim__an_proceed
thumb_func_start sub_80660F0
sub_80660F0: @ 80660F0
@@ -18274,7 +18274,7 @@ sub_80660F0: @ 80660F0
adds r3, r1, 0
adds r3, 0x2A
ldrb r3, [r3]
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r1}
bx r1
@@ -18320,7 +18320,7 @@ sub_8066128: @ 8066128
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -18653,7 +18653,7 @@ sub_806637C: @ 806637C
movs r1, 0
movs r2, 0
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080663C6
@@ -18678,7 +18678,7 @@ sub_806637C: @ 806637C
lsrs r2, 24
adds r0, r5, 0
adds r1, r6, 0
- bl sub_80645F4
+ bl an_look_any
_080663C6:
movs r0, 0x1
strh r0, [r6, 0x32]
@@ -18700,7 +18700,7 @@ sub_80663D8: @ 80663D8
movs r1, 0
movs r2, 0
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0806642A
@@ -18722,13 +18722,13 @@ sub_80663D8: @ 80663D8
bl sub_80635DC
lsls r0, 24
lsrs r0, 24
- bl sub_8064480
+ bl GetOppositeDirection
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
adds r0, r5, 0
adds r1, r6, 0
- bl sub_80645F4
+ bl an_look_any
_0806642A:
movs r0, 0x1
strh r0, [r6, 0x32]
@@ -18774,7 +18774,7 @@ sub_806645C: @ 806645C
adds r0, r4, 0
movs r2, 0x1
movs r3, 0x1
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066488
@@ -18823,7 +18823,7 @@ sub_80664B4: @ 80664B4
adds r0, r4, 0
movs r2, 0x2
movs r3, 0x1
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80664E0
@@ -18872,7 +18872,7 @@ sub_806650C: @ 806650C
adds r0, r4, 0
movs r2, 0x3
movs r3, 0x1
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066538
@@ -18921,7 +18921,7 @@ sub_8066564: @ 8066564
adds r0, r4, 0
movs r2, 0x4
movs r3, 0x1
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066590
@@ -18970,7 +18970,7 @@ sub_80665BC: @ 80665BC
adds r0, r4, 0
movs r2, 0x1
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80665E8
@@ -19019,7 +19019,7 @@ sub_8066614: @ 8066614
adds r0, r4, 0
movs r2, 0x2
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066640
@@ -19068,7 +19068,7 @@ sub_806666C: @ 806666C
adds r0, r4, 0
movs r2, 0x3
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066698
@@ -19117,7 +19117,7 @@ sub_80666C4: @ 80666C4
adds r0, r4, 0
movs r2, 0x4
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80666F0
@@ -19166,7 +19166,7 @@ sub_806671C: @ 806671C
adds r0, r4, 0
movs r2, 0x1
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066748
@@ -19215,7 +19215,7 @@ sub_8066774: @ 8066774
adds r0, r4, 0
movs r2, 0x2
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80667A0
@@ -19264,7 +19264,7 @@ sub_80667CC: @ 80667CC
adds r0, r4, 0
movs r2, 0x3
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_80667F8
@@ -19313,7 +19313,7 @@ sub_8066824: @ 8066824
adds r0, r4, 0
movs r2, 0x4
movs r3, 0
- bl sub_8064EF8
+ bl maybe_shadow_1
adds r0, r4, 0
adds r1, r5, 0
bl sub_8066850
@@ -19358,7 +19358,7 @@ sub_806687C: @ 806687C
ldrb r2, [r0, 0x6]
adds r2, r3
ldrb r2, [r2]
- bl sub_80645F4
+ bl an_look_any
movs r0, 0x1
pop {r1}
bx r1
@@ -19371,7 +19371,7 @@ sub_8066894: @ 8066894
push {lr}
movs r2, 0x1
movs r3, 0x14
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r1}
bx r1
@@ -19458,17 +19458,17 @@ sub_8066910: @ 8066910
bx lr
thumb_func_end sub_8066910
- thumb_func_start sub_8066920
-sub_8066920: @ 8066920
+ thumb_func_start do_exclamation_mark_bubble_1
+do_exclamation_mark_bubble_1: @ 8066920
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066940 @ =gUnknown_20386E0
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x1
strh r0, [r4, 0x32]
pop {r4}
@@ -19476,19 +19476,19 @@ sub_8066920: @ 8066920
bx r1
.align 2, 0
_08066940: .4byte gUnknown_20386E0
- thumb_func_end sub_8066920
+ thumb_func_end do_exclamation_mark_bubble_1
- thumb_func_start sub_8066944
-sub_8066944: @ 8066944
+ thumb_func_start do_exclamation_mark_bubble_2
+do_exclamation_mark_bubble_2: @ 8066944
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066964 @ =gUnknown_20386E0
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x21
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x1
strh r0, [r4, 0x32]
pop {r4}
@@ -19496,19 +19496,19 @@ sub_8066944: @ 8066944
bx r1
.align 2, 0
_08066964: .4byte gUnknown_20386E0
- thumb_func_end sub_8066944
+ thumb_func_end do_exclamation_mark_bubble_2
- thumb_func_start sub_8066968
-sub_8066968: @ 8066968
+ thumb_func_start do_heart_bubble
+do_heart_bubble: @ 8066968
push {r4,lr}
adds r4, r1, 0
ldr r1, _08066988 @ =gUnknown_20386E0
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x2E
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x1
strh r0, [r4, 0x32]
pop {r4}
@@ -19516,7 +19516,7 @@ sub_8066968: @ 8066968
bx r1
.align 2, 0
_08066988: .4byte gUnknown_20386E0
- thumb_func_end sub_8066968
+ thumb_func_end do_heart_bubble
thumb_func_start sub_806698C
sub_806698C: @ 806698C
@@ -19526,9 +19526,9 @@ sub_806698C: @ 806698C
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x42
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x1
strh r0, [r4, 0x32]
pop {r4}
@@ -19546,9 +19546,9 @@ sub_80669B0: @ 80669B0
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0x40
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0x1
strh r0, [r4, 0x32]
pop {r4}
@@ -19623,7 +19623,7 @@ sub_8066A38: @ 8066A38
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
- bl sub_8068E74
+ bl obj_anim_image_set_and_seek
movs r0, 0x1
strh r0, [r4, 0x32]
movs r0, 0
@@ -19643,7 +19643,7 @@ sub_8066A54: @ 8066A54
beq _08066A70
adds r0, r4, 0
movs r1, 0x20
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_08066A70:
@@ -19669,7 +19669,7 @@ sub_8066A78: @ 8066A78
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
beq _08066AAA
@@ -19693,7 +19693,7 @@ sub_8066AB4: @ 8066AB4
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
- bl sub_8068E74
+ bl obj_anim_image_set_and_seek
movs r0, 0x1
strh r0, [r4, 0x32]
movs r0, 0
@@ -19713,7 +19713,7 @@ sub_8066AD0: @ 8066AD0
beq _08066AEC
adds r0, r4, 0
movs r1, 0x20
- bl sub_8068E58
+ bl SetFieldObjectStepTimer
movs r0, 0x2
strh r0, [r4, 0x32]
_08066AEC:
@@ -19739,7 +19739,7 @@ sub_8066AF4: @ 8066AF4
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r5, 0
- bl sub_8068E5C
+ bl RunFieldObjectStepTimer
lsls r0, 24
cmp r0, 0
beq _08066B26
@@ -19788,7 +19788,7 @@ sub_8066B50: @ 8066B50
orrs r0, r1
strb r0, [r4, 0x1]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -19813,7 +19813,7 @@ sub_8066B80: @ 8066B80
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r0, [r4, 0x1]
movs r1, 0x4
negs r1, r1
@@ -19824,7 +19824,7 @@ sub_8066B80: @ 8066B80
lsrs r2, 6
movs r3, 0
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
movs r0, 0x1
pop {r4}
pop {r1}
@@ -19846,7 +19846,7 @@ sub_8066BB0: @ 8066BB0
strb r0, [r2]
adds r0, r4, 0
movs r1, 0
- bl sub_8008468
+ bl StartSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8066BE4
@@ -19898,7 +19898,7 @@ sub_8066C10: @ 8066C10
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_80084D4
+ bl ChangeSpriteAffineAnimIfDifferent
adds r0, r5, 0
adds r1, r4, 0
bl sub_8066C44
@@ -19943,9 +19943,9 @@ sub_8066C70: @ 8066C70
lsls r4, r2, 24
lsrs r4, 24
adds r1, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
adds r0, r5, 0
- bl sub_805F818
+ bl npc_coords_shift_still
adds r0, r4, 0
bl sub_80634E0
adds r2, r0, 0
@@ -19953,7 +19953,7 @@ sub_8066C70: @ 8066C70
lsrs r2, 24
adds r0, r5, 0
adds r1, r6, 0
- bl sub_806359C
+ bl obj_npc_animation_step
adds r2, r6, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -20020,7 +20020,7 @@ sub_8066CF0: @ 8066CF0
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x1
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20040,7 +20040,7 @@ sub_8066D14: @ 8066D14
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20060,7 +20060,7 @@ sub_8066D38: @ 8066D38
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x3
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20080,7 +20080,7 @@ sub_8066D5C: @ 8066D5C
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x4
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20100,7 +20100,7 @@ sub_8066D80: @ 8066D80
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x1
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20120,7 +20120,7 @@ sub_8066DA4: @ 8066DA4
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20140,7 +20140,7 @@ sub_8066DC8: @ 8066DC8
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x3
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20160,7 +20160,7 @@ sub_8066DEC: @ 8066DEC
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x4
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20180,7 +20180,7 @@ sub_8066E10: @ 8066E10
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x1
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20200,7 +20200,7 @@ sub_8066E34: @ 8066E34
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20220,7 +20220,7 @@ sub_8066E58: @ 8066E58
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x3
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20240,7 +20240,7 @@ sub_8066E7C: @ 8066E7C
adds r0, r4, 0
adds r1, r5, 0
movs r2, 0x4
- bl sub_80660C4
+ bl npc_set_direction_and_anim__an_proceed
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -20271,9 +20271,9 @@ sub_8066EA0: @ 8066EA0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
adds r0, r6, 0
- bl sub_80692F0
+ bl DoShadowFieldEffect
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -20998,10 +20998,10 @@ sub_80673E4: @ 80673E4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
movs r1, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -21178,7 +21178,7 @@ sub_806751C: @ 806751C
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
pop {r4,r5}
pop {r0}
bx r0
@@ -21355,10 +21355,10 @@ sub_806764C: @ 806764C
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8063554
+ bl npc_apply_anim_looping
adds r0, r5, 0
movs r1, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -21523,7 +21523,7 @@ sub_8067784: @ 8067784
adds r4, r1, 0
adds r0, r4, 0
movs r1, 0x14
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -21591,7 +21591,7 @@ _080677EA:
strh r0, [r4, 0x3C]
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -21642,7 +21642,7 @@ _08067854:
strh r6, [r4, 0x36]
adds r0, r4, 0
movs r1, 0x14
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -21725,7 +21725,7 @@ sub_80678F0: @ 80678F0
adds r4, r1, 0
adds r0, r4, 0
movs r1, 0x1C
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x2C
ldrb r1, [r2]
@@ -21896,7 +21896,7 @@ sub_80679F8: @ 80679F8
bl sub_8067A10
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8067B0C
+ bl npc_update_obj_anim_flag
pop {r4,r5}
pop {r0}
bx r0
@@ -22035,8 +22035,8 @@ _08067B04: .4byte 0x00000401
_08067B08: .4byte 0x0000fff0
thumb_func_end sub_8067A10
- thumb_func_start sub_8067B0C
-sub_8067B0C: @ 8067B0C
+ thumb_func_start npc_update_obj_anim_flag
+npc_update_obj_anim_flag: @ 8067B0C
push {lr}
adds r2, r1, 0
adds r2, 0x3E
@@ -22057,6 +22057,6 @@ sub_8067B0C: @ 8067B0C
_08067B2E:
pop {r0}
bx r0
- thumb_func_end sub_8067B0C
+ thumb_func_end npc_update_obj_anim_flag
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_message_box.s b/asm/field_message_box.s
index fa93c1fc7..8cb967b3f 100644
--- a/asm/field_message_box.s
+++ b/asm/field_message_box.s
@@ -99,7 +99,7 @@ _080693EA:
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08069402:
pop {r4,r5}
pop {r0}
@@ -113,7 +113,7 @@ sub_806940C: @ 806940C
push {lr}
ldr r0, _0806941C @ =sub_8069370
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -124,12 +124,12 @@ _0806941C: .4byte sub_8069370
sub_8069420: @ 8069420
push {lr}
ldr r0, _08069438 @ =sub_8069370
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _08069434
- bl sub_8077508
+ bl DestroyTask
_08069434:
pop {r0}
bx r0
@@ -146,7 +146,7 @@ sub_806943C: @ 806943C
cmp r0, 0
bne _0806945C
adds r0, r1, 0
- bl sub_80694C8
+ bl textbox_fdecode_auto_and_task_add
movs r0, 0x2
strb r0, [r4]
movs r0, 0x1
@@ -161,8 +161,8 @@ _0806945E:
bx r1
thumb_func_end sub_806943C
- thumb_func_start sub_8069464
-sub_8069464: @ 8069464
+ thumb_func_start ShowFieldAutoScrollMessage
+ShowFieldAutoScrollMessage: @ 8069464
push {lr}
adds r1, r0, 0
ldr r2, _08069480 @ =gUnknown_203709C
@@ -172,7 +172,7 @@ sub_8069464: @ 8069464
movs r0, 0x3
strb r0, [r2]
adds r0, r1, 0
- bl sub_80694C8
+ bl textbox_fdecode_auto_and_task_add
movs r0, 0x1
b _08069486
.align 2, 0
@@ -182,7 +182,7 @@ _08069484:
_08069486:
pop {r1}
bx r1
- thumb_func_end sub_8069464
+ thumb_func_end ShowFieldAutoScrollMessage
thumb_func_start sub_806948C
sub_806948C: @ 806948C
@@ -190,7 +190,7 @@ sub_806948C: @ 806948C
ldr r2, _080694A0 @ =gUnknown_203709C
movs r1, 0x3
strb r1, [r2]
- bl sub_80694C8
+ bl textbox_fdecode_auto_and_task_add
movs r0, 0x1
pop {r1}
bx r1
@@ -207,7 +207,7 @@ sub_80694A4: @ 80694A4
bne _080694C0
movs r0, 0x2
strb r0, [r1]
- bl sub_80694E4
+ bl textbox_auto_and_task_add
movs r0, 0x1
b _080694C2
.align 2, 0
@@ -219,8 +219,8 @@ _080694C2:
bx r1
thumb_func_end sub_80694A4
- thumb_func_start sub_80694C8
-sub_80694C8: @ 80694C8
+ thumb_func_start textbox_fdecode_auto_and_task_add
+textbox_fdecode_auto_and_task_add: @ 80694C8
push {lr}
adds r1, r0, 0
ldr r0, _080694E0 @ =gUnknown_2021D18
@@ -232,20 +232,20 @@ sub_80694C8: @ 80694C8
bx r0
.align 2, 0
_080694E0: .4byte gUnknown_2021D18
- thumb_func_end sub_80694C8
+ thumb_func_end textbox_fdecode_auto_and_task_add
- thumb_func_start sub_80694E4
-sub_80694E4: @ 80694E4
+ thumb_func_start textbox_auto_and_task_add
+textbox_auto_and_task_add: @ 80694E4
push {lr}
movs r0, 0x1
bl sub_80F6D5C
bl sub_806940C
pop {r0}
bx r0
- thumb_func_end sub_80694E4
+ thumb_func_end textbox_auto_and_task_add
- thumb_func_start sub_80694F4
-sub_80694F4: @ 80694F4
+ thumb_func_start HideFieldMessageBox
+HideFieldMessageBox: @ 80694F4
push {lr}
bl sub_8069420
movs r0, 0
@@ -258,19 +258,19 @@ sub_80694F4: @ 80694F4
bx r0
.align 2, 0
_0806950C: .4byte gUnknown_203709C
- thumb_func_end sub_80694F4
+ thumb_func_end HideFieldMessageBox
- thumb_func_start sub_8069510
-sub_8069510: @ 8069510
+ thumb_func_start textbox_any_visible
+textbox_any_visible: @ 8069510
ldr r0, _08069518 @ =gUnknown_203709C
ldrb r0, [r0]
bx lr
.align 2, 0
_08069518: .4byte gUnknown_203709C
- thumb_func_end sub_8069510
+ thumb_func_end textbox_any_visible
- thumb_func_start sub_806951C
-sub_806951C: @ 806951C
+ thumb_func_start IsFieldMessageBoxHidden
+IsFieldMessageBoxHidden: @ 806951C
push {lr}
ldr r0, _0806952C @ =gUnknown_203709C
ldrb r0, [r0]
@@ -285,7 +285,7 @@ _08069530:
_08069532:
pop {r1}
bx r1
- thumb_func_end sub_806951C
+ thumb_func_end IsFieldMessageBoxHidden
thumb_func_start sub_8069538
sub_8069538: @ 8069538
diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s
index 2748b13dd..d48939a5a 100644
--- a/asm/field_player_avatar.s
+++ b/asm/field_player_avatar.s
@@ -17,7 +17,7 @@ sub_805B3B8: @ 805B3B8
ldr r2, _0805B3D4 @ =gUnknown_2036E38
adds r0, r2
ldr r2, _0805B3D8 @ =sub_805B3DC
- bl sub_8063DB8
+ bl FieldObjectStep
pop {r0}
bx r0
.align 2, 0
@@ -94,12 +94,12 @@ sub_805B45C: @ 805B45C
adds r4, r0, 0
lsls r1, 24
lsrs r5, r1, 24
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0805B4A6
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
bne _0805B4A6
@@ -119,7 +119,7 @@ sub_805B45C: @ 805B45C
cmp r0, r5
beq _0805B4A2
adds r0, r4, 0
- bl sub_8063D34
+ bl FieldObjectClearAnim
b _0805B4A6
_0805B4A2:
movs r0, 0x1
@@ -245,7 +245,7 @@ sub_805B528: @ 805B528
strh r0, [r5, 0x1C]
_0805B57A:
ldr r0, [r4]
- bl sub_8063D34
+ bl FieldObjectClearAnim
ldrb r0, [r5, 0x1C]
bl sub_805C2CC
_0805B586:
@@ -349,8 +349,8 @@ _0805B62E:
_0805B640: .4byte gUnknown_835B764
thumb_func_end sub_805B5A0
- thumb_func_start sub_805B644
-sub_805B644: @ 805B644
+ thumb_func_start ForcedMovement_None
+ForcedMovement_None: @ 805B644
push {r4,lr}
ldr r4, _0805B688 @ =gUnknown_2037078
ldrb r1, [r4]
@@ -374,7 +374,7 @@ sub_805B644: @ 805B644
ldrb r1, [r0, 0x18]
lsls r1, 28
lsrs r1, 28
- bl sub_805FBDC
+ bl FieldObjectSetDirection
ldrb r1, [r4]
movs r0, 0xBF
ands r0, r1
@@ -387,10 +387,10 @@ _0805B67E:
.align 2, 0
_0805B688: .4byte gUnknown_2037078
_0805B68C: .4byte gUnknown_2036E38
- thumb_func_end sub_805B644
+ thumb_func_end ForcedMovement_None
- thumb_func_start sub_805B690
-sub_805B690: @ 805B690
+ thumb_func_start DoForcedMovement
+DoForcedMovement: @ 805B690
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -415,7 +415,7 @@ sub_805B690: @ 805B690
strb r0, [r6]
cmp r4, 0
beq _0805B6EC
- bl sub_805B644
+ bl ForcedMovement_None
cmp r4, 0x4
bhi _0805B6D4
movs r0, 0
@@ -450,10 +450,10 @@ _0805B6F8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_805B690
+ thumb_func_end DoForcedMovement
- thumb_func_start sub_805B708
-sub_805B708: @ 805B708
+ thumb_func_start DoForcedMovementInCurrentDirection
+DoForcedMovementInCurrentDirection: @ 805B708
push {lr}
adds r1, r0, 0
ldr r0, _0805B734 @ =gUnknown_2037078
@@ -469,7 +469,7 @@ sub_805B708: @ 805B708
strb r2, [r0, 0x1]
ldrb r0, [r0, 0x18]
lsrs r0, 4
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -477,27 +477,27 @@ sub_805B708: @ 805B708
.align 2, 0
_0805B734: .4byte gUnknown_2037078
_0805B738: .4byte gUnknown_2036E38
- thumb_func_end sub_805B708
+ thumb_func_end DoForcedMovementInCurrentDirection
- thumb_func_start sub_805B73C
-sub_805B73C: @ 805B73C
+ thumb_func_start ForcedMovement_Slip
+ForcedMovement_Slip: @ 805B73C
push {lr}
ldr r0, _0805B74C @ =sub_805C11C
- bl sub_805B708
+ bl DoForcedMovementInCurrentDirection
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805B74C: .4byte sub_805C11C
- thumb_func_end sub_805B73C
+ thumb_func_end ForcedMovement_Slip
thumb_func_start sub_805B750
sub_805B750: @ 805B750
push {lr}
ldr r1, _0805B764 @ =sub_805C104
movs r0, 0x1
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -511,7 +511,7 @@ sub_805B768: @ 805B768
push {lr}
ldr r1, _0805B77C @ =sub_805C104
movs r0, 0x2
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -525,7 +525,7 @@ sub_805B780: @ 805B780
push {lr}
ldr r1, _0805B794 @ =sub_805C104
movs r0, 0x3
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -539,7 +539,7 @@ sub_805B798: @ 805B798
push {lr}
ldr r1, _0805B7AC @ =sub_805C104
movs r0, 0x4
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -554,7 +554,7 @@ sub_805B7B0: @ 805B7B0
bl sub_805B820
ldr r1, _0805B7C8 @ =sub_805C2B4
movs r0, 0x4
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -569,7 +569,7 @@ sub_805B7CC: @ 805B7CC
bl sub_805B820
ldr r1, _0805B7E4 @ =sub_805C2B4
movs r0, 0x3
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -584,7 +584,7 @@ sub_805B7E8: @ 805B7E8
bl sub_805B820
ldr r1, _0805B800 @ =sub_805C2B4
movs r0, 0x2
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -599,7 +599,7 @@ sub_805B804: @ 805B804
bl sub_805B820
ldr r1, _0805B81C @ =sub_805C2B4
movs r0, 0x1
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -622,7 +622,7 @@ sub_805B82C: @ 805B82C
push {lr}
ldr r1, _0805B840 @ =sub_805C14C
movs r0, 0x1
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -636,7 +636,7 @@ sub_805B844: @ 805B844
push {lr}
ldr r1, _0805B858 @ =sub_805C14C
movs r0, 0x2
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -650,7 +650,7 @@ sub_805B85C: @ 805B85C
push {lr}
ldr r1, _0805B870 @ =sub_805C14C
movs r0, 0x3
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -664,7 +664,7 @@ sub_805B874: @ 805B874
push {lr}
ldr r1, _0805B888 @ =sub_805C14C
movs r0, 0x4
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -673,8 +673,8 @@ sub_805B874: @ 805B874
_0805B888: .4byte sub_805C14C
thumb_func_end sub_805B874
- thumb_func_start sub_805B88C
-sub_805B88C: @ 805B88C
+ thumb_func_start ForcedMovement_Slide
+ForcedMovement_Slide: @ 805B88C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -691,7 +691,7 @@ sub_805B88C: @ 805B88C
movs r4, 0x2
orrs r3, r4
strb r3, [r2, 0x1]
- bl sub_805B690
+ bl DoForcedMovement
lsls r0, 24
lsrs r0, 24
pop {r4}
@@ -700,63 +700,63 @@ sub_805B88C: @ 805B88C
.align 2, 0
_0805B8BC: .4byte gUnknown_2037078
_0805B8C0: .4byte gUnknown_2036E38
- thumb_func_end sub_805B88C
+ thumb_func_end ForcedMovement_Slide
- thumb_func_start sub_805B8C4
-sub_805B8C4: @ 805B8C4
+ thumb_func_start ForcedMovement_SlideSouth
+ForcedMovement_SlideSouth: @ 805B8C4
push {lr}
ldr r1, _0805B8D8 @ =sub_805C11C
movs r0, 0x1
- bl sub_805B88C
+ bl ForcedMovement_Slide
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805B8D8: .4byte sub_805C11C
- thumb_func_end sub_805B8C4
+ thumb_func_end ForcedMovement_SlideSouth
- thumb_func_start sub_805B8DC
-sub_805B8DC: @ 805B8DC
+ thumb_func_start ForcedMovement_SlideNorth
+ForcedMovement_SlideNorth: @ 805B8DC
push {lr}
ldr r1, _0805B8F0 @ =sub_805C11C
movs r0, 0x2
- bl sub_805B88C
+ bl ForcedMovement_Slide
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805B8F0: .4byte sub_805C11C
- thumb_func_end sub_805B8DC
+ thumb_func_end ForcedMovement_SlideNorth
- thumb_func_start sub_805B8F4
-sub_805B8F4: @ 805B8F4
+ thumb_func_start ForcedMovement_SlideWest
+ForcedMovement_SlideWest: @ 805B8F4
push {lr}
ldr r1, _0805B908 @ =sub_805C11C
movs r0, 0x3
- bl sub_805B88C
+ bl ForcedMovement_Slide
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805B908: .4byte sub_805C11C
- thumb_func_end sub_805B8F4
+ thumb_func_end ForcedMovement_SlideWest
- thumb_func_start sub_805B90C
-sub_805B90C: @ 805B90C
+ thumb_func_start ForcedMovement_SlideEast
+ForcedMovement_SlideEast: @ 805B90C
push {lr}
ldr r1, _0805B920 @ =sub_805C11C
movs r0, 0x4
- bl sub_805B88C
+ bl ForcedMovement_Slide
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805B920: .4byte sub_805C11C
- thumb_func_end sub_805B90C
+ thumb_func_end ForcedMovement_SlideEast
thumb_func_start sub_805B924
sub_805B924: @ 805B924
@@ -816,7 +816,7 @@ sub_805B96C: @ 805B96C
.align 2, 0
_0805B980: .4byte gUnknown_2037078
_0805B984:
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -845,7 +845,7 @@ _0805B9AC: .4byte gUnknown_2037078
thumb_func_start sub_805B9B0
sub_805B9B0: @ 805B9B0
push {lr}
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_805C1F4
@@ -1005,7 +1005,7 @@ _0805BAEC:
movs r0, 0x1
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -1063,7 +1063,7 @@ sub_805BB1C: @ 805BB1C
adds r0, r6, 0
add r1, sp, 0x4
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
add r0, sp, 0x4
movs r3, 0
ldrsh r0, [r0, r3]
@@ -1120,7 +1120,7 @@ sub_805BBA8: @ 805BBA8
adds r1, r5, 0
adds r2, r4, 0
adds r3, r6, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -1210,7 +1210,7 @@ sub_805BC60: @ 805BC60
asrs r0, r5, 16
lsls r4, 16
asrs r1, r4, 16
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -1218,7 +1218,7 @@ sub_805BC60: @ 805BC60
lsrs r0, r5, 16
lsrs r1, r4, 16
movs r2, 0x3
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -1252,7 +1252,7 @@ sub_805BCC8: @ 805BCC8
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_80680F8
+ bl GetLedgeJumpDirection
lsls r0, 24
cmp r0, 0
bne _0805BCE4
@@ -1286,7 +1286,7 @@ sub_805BCEC: @ 805BCEC
ldrsh r0, [r0, r1]
movs r2, 0
ldrsh r1, [r5, r2]
- bl sub_805DFB0
+ bl GetFieldObjectIdByXY
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x10
@@ -1307,7 +1307,7 @@ sub_805BCEC: @ 805BCEC
adds r0, r7, 0
mov r1, sp
adds r2, r5, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -1323,7 +1323,7 @@ sub_805BCEC: @ 805BCEC
ldrsh r2, [r5, r0]
adds r0, r4, 0
adds r3, r7, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
cmp r0, 0
bne _0805BDA0
@@ -1501,8 +1501,8 @@ nullsub_23: @ 805BEA4
bx lr
thumb_func_end nullsub_23
- thumb_func_start sub_805BEA8
-sub_805BEA8: @ 805BEA8
+ thumb_func_start PlayerAvatarTransition_ReturnToField
+PlayerAvatarTransition_ReturnToField: @ 805BEA8
ldr r2, _0805BEB4 @ =gUnknown_2037078
ldrb r1, [r2]
movs r0, 0x20
@@ -1511,7 +1511,7 @@ sub_805BEA8: @ 805BEA8
bx lr
.align 2, 0
_0805BEB4: .4byte gUnknown_2037078
- thumb_func_end sub_805BEA8
+ thumb_func_end PlayerAvatarTransition_ReturnToField
thumb_func_start sub_805BEB8
sub_805BEB8: @ 805BEB8
@@ -1519,15 +1519,15 @@ sub_805BEB8: @ 805BEB8
ldr r4, _0805BEE4 @ =gUnknown_2037078
movs r0, 0
strb r0, [r4, 0x3]
- bl sub_805BF7C
+ bl PlayerIsAnimActive
lsls r0, 24
cmp r0, 0
beq _0805BEF6
- bl sub_805BFA0
+ bl PlayerCheckIfAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
bne _0805BEE8
- bl sub_805BEFC
+ bl player_is_anim_in_certain_ranges
lsls r0, 24
cmp r0, 0
bne _0805BEF6
@@ -1549,8 +1549,8 @@ _0805BEF6:
bx r0
thumb_func_end sub_805BEB8
- thumb_func_start sub_805BEFC
-sub_805BEFC: @ 805BEFC
+ thumb_func_start player_is_anim_in_certain_ranges
+player_is_anim_in_certain_ranges: @ 805BEFC
push {lr}
ldr r2, _0805BF48 @ =gUnknown_2036E38
ldr r0, _0805BF4C @ =gUnknown_2037078
@@ -1597,12 +1597,12 @@ _0805BF50:
_0805BF52:
pop {r1}
bx r1
- thumb_func_end sub_805BEFC
+ thumb_func_end player_is_anim_in_certain_ranges
thumb_func_start sub_805BF58
sub_805BF58: @ 805BF58
push {lr}
- bl sub_805BEFC
+ bl player_is_anim_in_certain_ranges
lsls r0, 24
cmp r0, 0
beq _0805BF74
@@ -1621,8 +1621,8 @@ _0805BF76:
bx r1
thumb_func_end sub_805BF58
- thumb_func_start sub_805BF7C
-sub_805BF7C: @ 805BF7C
+ thumb_func_start PlayerIsAnimActive
+PlayerIsAnimActive: @ 805BF7C
push {lr}
ldr r0, _0805BF98 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -1631,7 +1631,7 @@ sub_805BF7C: @ 805BF7C
lsls r0, 2
ldr r1, _0805BF9C @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1639,10 +1639,10 @@ sub_805BF7C: @ 805BF7C
.align 2, 0
_0805BF98: .4byte gUnknown_2037078
_0805BF9C: .4byte gUnknown_2036E38
- thumb_func_end sub_805BF7C
+ thumb_func_end PlayerIsAnimActive
- thumb_func_start sub_805BFA0
-sub_805BFA0: @ 805BFA0
+ thumb_func_start PlayerCheckIfAnimFinishedOrInactive
+PlayerCheckIfAnimFinishedOrInactive: @ 805BFA0
push {lr}
ldr r0, _0805BFBC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -1651,7 +1651,7 @@ sub_805BFA0: @ 805BFA0
lsls r0, 2
ldr r1, _0805BFC0 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1659,10 +1659,10 @@ sub_805BFA0: @ 805BFA0
.align 2, 0
_0805BFBC: .4byte gUnknown_2037078
_0805BFC0: .4byte gUnknown_2036E38
- thumb_func_end sub_805BFA0
+ thumb_func_end PlayerCheckIfAnimFinishedOrInactive
- thumb_func_start sub_805BFC4
-sub_805BFC4: @ 805BFC4
+ thumb_func_start player_set_x22
+player_set_x22: @ 805BFC4
ldr r3, _0805BFD8 @ =gUnknown_2036E38
ldr r1, _0805BFDC @ =gUnknown_2037078
ldrb r2, [r1, 0x5]
@@ -1676,10 +1676,10 @@ sub_805BFC4: @ 805BFC4
.align 2, 0
_0805BFD8: .4byte gUnknown_2036E38
_0805BFDC: .4byte gUnknown_2037078
- thumb_func_end sub_805BFC4
+ thumb_func_end player_set_x22
- thumb_func_start sub_805BFE0
-sub_805BFE0: @ 805BFE0
+ thumb_func_start player_get_x22
+player_get_x22: @ 805BFE0
ldr r2, _0805BFF4 @ =gUnknown_2036E38
ldr r0, _0805BFF8 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -1693,7 +1693,7 @@ sub_805BFE0: @ 805BFE0
.align 2, 0
_0805BFF4: .4byte gUnknown_2036E38
_0805BFF8: .4byte gUnknown_2037078
- thumb_func_end sub_805BFE0
+ thumb_func_end player_get_x22
thumb_func_start sub_805BFFC
sub_805BFFC: @ 805BFFC
@@ -1708,7 +1708,7 @@ sub_805BFFC: @ 805BFFC
lsls r0, 2
ldr r2, _0805C020 @ =gUnknown_2036E38
adds r0, r2
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
pop {r0}
bx r0
.align 2, 0
@@ -1723,12 +1723,12 @@ sub_805C024: @ 805C024
lsrs r5, r0, 24
lsls r1, 24
lsrs r4, r1, 24
- bl sub_805BF7C
+ bl PlayerIsAnimActive
lsls r0, 24
cmp r0, 0
bne _0805C05E
adds r0, r4, 0
- bl sub_805BFC4
+ bl player_set_x22
ldr r0, _0805C064 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
lsls r0, r1, 3
@@ -1942,7 +1942,7 @@ sub_805C1AC: @ 805C1AC
adds r0, r4, 0
bl sub_805C438
adds r0, r4, 0
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -1961,7 +1961,7 @@ sub_805C1D0: @ 805C1D0
adds r0, r4, 0
bl sub_805C438
adds r0, r4, 0
- bl sub_8064218
+ bl GetStepInPlaceDelay32AnimId
lsls r0, 24
lsrs r0, 24
movs r1, 0x2
@@ -2351,11 +2351,11 @@ _0805C4A0:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r0, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -2383,8 +2383,8 @@ _0805C4EC: .4byte gUnknown_2037078
_0805C4F0: .4byte gUnknown_835B864
thumb_func_end sub_805C438
- thumb_func_start sub_805C4F4
-sub_805C4F4: @ 805C4F4
+ thumb_func_start GetXYCoordsOneStepInFrontOfPlayer
+GetXYCoordsOneStepInFrontOfPlayer: @ 805C4F4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -2404,22 +2404,22 @@ sub_805C4F4: @ 805C4F4
adds r0, r3
ldrh r0, [r0, 0x12]
strh r0, [r5]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
adds r2, r5, 0
- bl sub_8063A20
+ bl MoveCoords
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0805C530: .4byte gUnknown_2036E38
_0805C534: .4byte gUnknown_2037078
- thumb_func_end sub_805C4F4
+ thumb_func_end GetXYCoordsOneStepInFrontOfPlayer
- thumb_func_start sub_805C538
-sub_805C538: @ 805C538
+ thumb_func_start PlayerGetDestCoords
+PlayerGetDestCoords: @ 805C538
push {r4,r5,lr}
ldr r5, _0805C560 @ =gUnknown_2036E38
ldr r4, _0805C564 @ =gUnknown_2037078
@@ -2443,10 +2443,10 @@ sub_805C538: @ 805C538
.align 2, 0
_0805C560: .4byte gUnknown_2036E38
_0805C564: .4byte gUnknown_2037078
- thumb_func_end sub_805C538
+ thumb_func_end PlayerGetDestCoords
- thumb_func_start sub_805C568
-sub_805C568: @ 805C568
+ thumb_func_start plaer_get_pos_including_state_based_drift
+plaer_get_pos_including_state_based_drift: @ 805C568
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -2580,10 +2580,10 @@ _0805C6BC:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_805C568
+ thumb_func_end plaer_get_pos_including_state_based_drift
- thumb_func_start sub_805C6C4
-sub_805C6C4: @ 805C6C4
+ thumb_func_start player_get_direction_lower_nybble
+player_get_direction_lower_nybble: @ 805C6C4
ldr r2, _0805C6DC @ =gUnknown_2036E38
ldr r0, _0805C6E0 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -2598,10 +2598,10 @@ sub_805C6C4: @ 805C6C4
.align 2, 0
_0805C6DC: .4byte gUnknown_2036E38
_0805C6E0: .4byte gUnknown_2037078
- thumb_func_end sub_805C6C4
+ thumb_func_end player_get_direction_lower_nybble
- thumb_func_start sub_805C6E4
-sub_805C6E4: @ 805C6E4
+ thumb_func_start player_get_direction_upper_nybble
+player_get_direction_upper_nybble: @ 805C6E4
ldr r2, _0805C6F8 @ =gUnknown_2036E38
ldr r0, _0805C6FC @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -2615,10 +2615,10 @@ sub_805C6E4: @ 805C6E4
.align 2, 0
_0805C6F8: .4byte gUnknown_2036E38
_0805C6FC: .4byte gUnknown_2037078
- thumb_func_end sub_805C6E4
+ thumb_func_end player_get_direction_upper_nybble
- thumb_func_start sub_805C700
-sub_805C700: @ 805C700
+ thumb_func_start PlayerGetZCoord
+PlayerGetZCoord: @ 805C700
ldr r2, _0805C714 @ =gUnknown_2036E38
ldr r0, _0805C718 @ =gUnknown_2037078
ldrb r1, [r0, 0x5]
@@ -2632,7 +2632,7 @@ sub_805C700: @ 805C700
.align 2, 0
_0805C714: .4byte gUnknown_2036E38
_0805C718: .4byte gUnknown_2037078
- thumb_func_end sub_805C700
+ thumb_func_end PlayerGetZCoord
thumb_func_start sub_805C71C
sub_805C71C: @ 805C71C
@@ -2659,8 +2659,8 @@ _0805C744: .4byte gUnknown_2037078
_0805C748: .4byte gUnknown_2036E38
thumb_func_end sub_805C71C
- thumb_func_start sub_805C74C
-sub_805C74C: @ 805C74C
+ thumb_func_start TestPlayerAvatarFlags
+TestPlayerAvatarFlags: @ 805C74C
ldr r1, _0805C758 @ =gUnknown_2037078
ldrb r1, [r1]
ands r1, r0
@@ -2668,7 +2668,7 @@ sub_805C74C: @ 805C74C
bx lr
.align 2, 0
_0805C758: .4byte gUnknown_2037078
- thumb_func_end sub_805C74C
+ thumb_func_end TestPlayerAvatarFlags
thumb_func_start sub_805C75C
sub_805C75C: @ 805C75C
@@ -2679,19 +2679,19 @@ sub_805C75C: @ 805C75C
_0805C764: .4byte gUnknown_2037078
thumb_func_end sub_805C75C
- thumb_func_start sub_805C768
-sub_805C768: @ 805C768
+ thumb_func_start GetPlayerAvatarObjectId
+GetPlayerAvatarObjectId: @ 805C768
ldr r0, _0805C770 @ =gUnknown_2037078
ldrb r0, [r0, 0x4]
bx lr
.align 2, 0
_0805C770: .4byte gUnknown_2037078
- thumb_func_end sub_805C768
+ thumb_func_end GetPlayerAvatarObjectId
thumb_func_start sub_805C774
sub_805C774: @ 805C774
push {lr}
- bl sub_805B644
+ bl ForcedMovement_None
pop {r0}
bx r0
thumb_func_end sub_805C774
@@ -2712,9 +2712,9 @@ sub_805C780: @ 805C780
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_805FBDC
+ bl FieldObjectSetDirection
movs r0, 0x6
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0805C7B8
@@ -2737,15 +2737,15 @@ sub_805C7C8: @ 805C7C8
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
- bl sub_805C7E0
+ bl GetPlayerAvatarGraphicsIdByStateIdAndGender
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
thumb_func_end sub_805C7C8
- thumb_func_start sub_805C7E0
-sub_805C7E0: @ 805C7E0
+ thumb_func_start GetPlayerAvatarGraphicsIdByStateIdAndGender
+GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 805C7E0
lsls r0, 24
lsls r1, 24
lsrs r1, 24
@@ -2757,7 +2757,7 @@ sub_805C7E0: @ 805C7E0
bx lr
.align 2, 0
_0805C7F4: .4byte gUnknown_835B874
- thumb_func_end sub_805C7E0
+ thumb_func_end GetPlayerAvatarGraphicsIdByStateIdAndGender
thumb_func_start sub_805C7F8
sub_805C7F8: @ 805C7F8
@@ -2778,7 +2778,7 @@ sub_805C808: @ 805C808
lsrs r0, 24
ldr r1, _0805C820 @ =gUnknown_2037078
ldrb r1, [r1, 0x7]
- bl sub_805C7E0
+ bl GetPlayerAvatarGraphicsIdByStateIdAndGender
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2809,7 +2809,7 @@ _0805C838:
sub_805C83C: @ 805C83C
push {r4,r5,lr}
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _0805C880
@@ -2818,7 +2818,7 @@ sub_805C83C: @ 805C83C
_0805C84E:
adds r0, r4, 0
movs r1, 0x39
- bl sub_8125AC0
+ bl pokemon_has_move
lsls r0, 24
cmp r0, 0
beq _0805C860
@@ -2838,7 +2838,7 @@ _0805C866:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0805C84E
_0805C880:
@@ -2854,13 +2854,13 @@ _0805C888: .4byte gUnknown_2024284
thumb_func_start sub_805C88C
sub_805C88C: @ 805C88C
push {lr}
- bl sub_805C6E4
+ bl player_get_direction_upper_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
bne _0805C8AA
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0805C8AA
@@ -2896,7 +2896,7 @@ sub_805C8B0: @ 805C8B0
lsrs r0, 28
mov r1, sp
adds r2, r5, 0
- bl sub_8063A20
+ bl MoveCoords
mov r0, sp
movs r2, 0
ldrsh r1, [r0, r2]
@@ -2906,12 +2906,12 @@ sub_805C8B0: @ 805C8B0
lsls r3, 28
lsrs r3, 28
adds r0, r4, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _0805C92C
- bl sub_805C700
+ bl PlayerGetZCoord
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2959,8 +2959,8 @@ sub_805C938: @ 805C938
bx r1
thumb_func_end sub_805C938
- thumb_func_start sub_805C95C
-sub_805C95C: @ 805C95C
+ thumb_func_start ClearPlayerAvatarInfo
+ClearPlayerAvatarInfo: @ 805C95C
push {lr}
ldr r0, _0805C96C @ =gUnknown_2037078
movs r1, 0
@@ -2970,10 +2970,10 @@ sub_805C95C: @ 805C95C
bx r0
.align 2, 0
_0805C96C: .4byte gUnknown_2037078
- thumb_func_end sub_805C95C
+ thumb_func_end ClearPlayerAvatarInfo
- thumb_func_start sub_805C970
-sub_805C970: @ 805C970
+ thumb_func_start SetPlayerAvatarStateMask
+SetPlayerAvatarStateMask: @ 805C970
lsls r0, 24
lsrs r0, 24
ldr r3, _0805C984 @ =gUnknown_2037078
@@ -2985,10 +2985,10 @@ sub_805C970: @ 805C970
bx lr
.align 2, 0
_0805C984: .4byte gUnknown_2037078
- thumb_func_end sub_805C970
+ thumb_func_end SetPlayerAvatarStateMask
- thumb_func_start sub_805C988
-sub_805C988: @ 805C988
+ thumb_func_start GetPlayerAvatarStateTransitionByGraphicsId
+GetPlayerAvatarStateTransitionByGraphicsId: @ 805C988
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3023,10 +3023,10 @@ _0805C9C0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805C988
+ thumb_func_end GetPlayerAvatarStateTransitionByGraphicsId
- thumb_func_start sub_805C9C8
-sub_805C9C8: @ 805C9C8
+ thumb_func_start GetPlayerAvatarGraphicsIdByCurrentState
+GetPlayerAvatarGraphicsIdByCurrentState: @ 805C9C8
push {r4-r6,lr}
ldr r0, _0805C9F0 @ =gUnknown_2037078
ldrb r5, [r0]
@@ -3062,10 +3062,10 @@ _0805CA04:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_805C9C8
+ thumb_func_end GetPlayerAvatarGraphicsIdByCurrentState
- thumb_func_start sub_805CA0C
-sub_805CA0C: @ 805CA0C
+ thumb_func_start SetPlayerAvatarExtraStateTransition
+SetPlayerAvatarExtraStateTransition: @ 805CA0C
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -3074,7 +3074,7 @@ sub_805CA0C: @ 805CA0C
lsrs r4, 24
ldr r5, _0805CA38 @ =gUnknown_2037078
ldrb r1, [r5, 0x7]
- bl sub_805C988
+ bl GetPlayerAvatarStateTransitionByGraphicsId
lsls r0, 24
lsrs r0, 24
orrs r0, r4
@@ -3087,10 +3087,10 @@ sub_805CA0C: @ 805CA0C
bx r0
.align 2, 0
_0805CA38: .4byte gUnknown_2037078
- thumb_func_end sub_805CA0C
+ thumb_func_end SetPlayerAvatarExtraStateTransition
- thumb_func_start sub_805CA3C
-sub_805CA3C: @ 805CA3C
+ thumb_func_start InitPlayerAvatar
+InitPlayerAvatar: @ 805CA3C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -3117,7 +3117,7 @@ sub_805CA3C: @ 805CA3C
strb r0, [r1]
movs r0, 0
mov r1, r8
- bl sub_805C7E0
+ bl GetPlayerAvatarGraphicsIdByStateIdAndGender
mov r1, sp
movs r3, 0
strb r0, [r1, 0x1]
@@ -3145,7 +3145,7 @@ sub_805CA3C: @ 805CA3C
strh r3, [r0, 0xE]
str r3, [sp, 0x10]
strh r3, [r0, 0x14]
- bl sub_805E7F4
+ bl SpawnSpecialFieldObject
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -3162,8 +3162,8 @@ sub_805CA3C: @ 805CA3C
strb r0, [r4, 0x1B]
adds r0, r4, 0
mov r1, r9
- bl sub_805F218
- bl sub_805C95C
+ bl FieldObjectTurn
+ bl ClearPlayerAvatarInfo
ldr r0, _0805CB00 @ =gUnknown_2037078
strb r6, [r0, 0x2]
strb r6, [r0, 0x3]
@@ -3173,7 +3173,7 @@ sub_805CA3C: @ 805CA3C
mov r1, r8
strb r1, [r0, 0x7]
movs r0, 0x21
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
add sp, 0x18
pop {r3,r4}
mov r8, r3
@@ -3184,7 +3184,7 @@ sub_805CA3C: @ 805CA3C
.align 2, 0
_0805CAFC: .4byte gUnknown_2036E38
_0805CB00: .4byte gUnknown_2037078
- thumb_func_end sub_805CA3C
+ thumb_func_end InitPlayerAvatar
thumb_func_start sub_805CB04
sub_805CB04: @ 805CB04
@@ -3208,7 +3208,7 @@ sub_805CB04: @ 805CB04
orrs r0, r3
strb r0, [r1, 0x1]
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0805CB5C
@@ -3265,7 +3265,7 @@ sub_805CB70: @ 805CB70
ldr r1, _0805CBB4 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -3326,7 +3326,7 @@ sub_805CBE8: @ 805CBE8
ldr r1, _0805CC28 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -3396,7 +3396,7 @@ _0805CC62:
adds r0, r6, 0
mov r1, sp
adds r2, r7, 0
- bl sub_8063A20
+ bl MoveCoords
ldrb r0, [r5, 0x1B]
movs r1, 0
ldrsh r2, [r4, r1]
@@ -3419,7 +3419,7 @@ _0805CCA8:
cmp r1, 0x3
ble _0805CC62
ldrb r0, [r5, 0x1B]
- bl sub_80DB114
+ bl objid_set_invisible
_0805CCC2:
add sp, 0x4
pop {r3,r4}
@@ -3442,7 +3442,7 @@ sub_805CCD0: @ 805CCD0
ldr r6, _0805CD04 @ =sub_805CD0C
adds r0, r6, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805CD08 @ =gUnknown_3005090
@@ -3510,7 +3510,7 @@ _0805CD60: .4byte gUnknown_2037078
sub_805CD64: @ 805CD64
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0805CD80 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -3532,21 +3532,21 @@ sub_805CD84: @ 805CD84
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _0805CE0E
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
ldrb r0, [r6, 0xC]
- bl sub_8064244
+ bl GetStepInPlaceDelay16AnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3580,7 +3580,7 @@ sub_805CD84: @ 805CD84
lsrs r0, 30
str r0, [r2, 0xC]
movs r0, 0xA
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0xCF
bl sub_80722CC
ldrh r0, [r6, 0x8]
@@ -3602,19 +3602,19 @@ sub_805CE20: @ 805CE20
adds r5, r1, 0
adds r4, r2, 0
adds r0, r5, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r4, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0805CE70
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
adds r0, r4, 0
bl sub_806DE28
ldrh r0, [r4, 0x10]
@@ -3623,12 +3623,12 @@ sub_805CE20: @ 805CE20
ldr r1, _0805CE78 @ =gUnknown_2037078
movs r0, 0
strb r0, [r1, 0x6]
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r0, _0805CE7C @ =sub_805CD0C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0805CE70:
movs r0, 0
pop {r4,r5}
@@ -3645,7 +3645,7 @@ sub_805CE80: @ 805CE80
ldr r4, _0805CE9C @ =sub_805CEA0
adds r0, r4, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -3704,7 +3704,7 @@ sub_805CEEC: @ 805CEEC
movs r0, 0x1
strb r0, [r5, 0x6]
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805CF48
@@ -3733,10 +3733,10 @@ sub_805CEEC: @ 805CEEC
orrs r0, r1
strb r0, [r5, 0x1]
ldr r0, _0805CF54 @ =sub_805CEA0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0805CF48:
movs r0, 0
pop {r4-r6}
@@ -3753,7 +3753,7 @@ sub_805CF58: @ 805CF58
ldr r4, _0805CF74 @ =sub_805CF78
adds r0, r4, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -3815,7 +3815,7 @@ sub_805CFC4: @ 805CFC4
ldr r1, _0805CFE8 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0x27
bl sub_80722CC
movs r0, 0x1
@@ -3836,7 +3836,7 @@ sub_805CFEC: @ 805CFEC
movs r2, 0x4
bl memcpy
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805D054
@@ -3867,7 +3867,7 @@ _0805D032:
cmp r0, 0x3
ble _0805D054
ldrb r0, [r4, 0xA]
- bl sub_8064480
+ bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -3896,7 +3896,7 @@ sub_805D064: @ 805D064
movs r2, 0x5
bl memcpy
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805D094
@@ -3924,12 +3924,12 @@ sub_805D0A4: @ 805D0A4
adds r4, r0, 0
adds r5, r1, 0
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805D0E8
ldrb r0, [r4, 0xA]
- bl sub_8064480
+ bl GetOppositeDirection
lsls r0, 24
lsrs r0, 24
bl sub_8063F2C
@@ -3938,15 +3938,15 @@ sub_805D0A4: @ 805D0A4
lsrs r1, 24
adds r0, r5, 0
bl sub_805C06C
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r1, _0805D0F0 @ =gUnknown_2037078
movs r0, 0
strb r0, [r1, 0x6]
ldr r0, _0805D0F4 @ =sub_805CF78
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0805D0E8:
movs r0, 0
pop {r4,r5}
@@ -3963,8 +3963,8 @@ sub_805D0F8: @ 805D0F8
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_8055E84
bl sub_8055F1C
ldr r2, _0805D148 @ =gUnknown_2037078
@@ -3979,7 +3979,7 @@ sub_805D0F8: @ 805D0F8
ldr r5, _0805D14C @ =sub_805D1D4
adds r0, r5, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805D150 @ =gUnknown_3005090
@@ -4004,8 +4004,8 @@ sub_805D154: @ 805D154
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
ldr r2, _0805D19C @ =gUnknown_2037078
ldrb r1, [r2]
movs r0, 0xF7
@@ -4018,7 +4018,7 @@ sub_805D154: @ 805D154
ldr r5, _0805D1A0 @ =sub_805D1D4
adds r0, r5, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805D1A4 @ =gUnknown_3005090
@@ -4073,12 +4073,12 @@ sub_805D1D4: @ 805D1D4
ldr r1, _0805D234 @ =gUnknown_2036E38
adds r5, r0, r1
adds r0, r5, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0805D200
adds r0, r5, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805D228
@@ -4124,7 +4124,7 @@ sub_805D240: @ 805D240
ldr r1, _0805D2B8 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805D2AE
@@ -4146,17 +4146,17 @@ sub_805D240: @ 805D240
bl sub_805C06C
movs r0, 0
strb r0, [r6, 0x6]
- bl sub_806994C
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
ldrb r1, [r4, 0x1A]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _0805D2BC @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_812B35C
_0805D2AE:
pop {r4-r6}
@@ -4177,7 +4177,7 @@ sub_805D2C0: @ 805D2C0
ldr r5, _0805D2FC @ =sub_805D304
adds r0, r5, 0
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0805D300 @ =gUnknown_3005090
@@ -4235,7 +4235,7 @@ _0805D338: .4byte gUnknown_3005090
sub_805D33C: @ 805D33C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _0805D358 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -4266,7 +4266,7 @@ sub_805D35C: @ 805D35C
bl memcpy
movs r0, 0
strh r0, [r5, 0x20]
- bl sub_8044EC8
+ bl Random
movs r2, 0x26
ldrsh r1, [r5, r2]
lsls r1, 1
@@ -4296,7 +4296,7 @@ sub_805D35C: @ 805D35C
lsls r4, 2
adds r4, r3
adds r0, r4, 0
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
ldrb r0, [r4, 0x1]
movs r1, 0x8
orrs r0, r1
@@ -4365,7 +4365,7 @@ sub_805D430: @ 805D430
strh r0, [r4, 0x8]
strh r1, [r4, 0xA]
strh r1, [r4, 0xC]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -4485,7 +4485,7 @@ sub_805D508: @ 805D508
lsls r0, 24
cmp r0, 0
beq _0805D53A
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -4503,7 +4503,7 @@ _0805D548:
adds r4, r0
lsls r4, 2
adds r4, r5
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063510
@@ -4511,7 +4511,7 @@ _0805D548:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0805D56A:
movs r0, 0x1
pop {r4-r6}
@@ -4613,7 +4613,7 @@ sub_805D5EC: @ 805D5EC
blt _0805D650
cmp r1, 0x1
bgt _0805D654
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -4663,7 +4663,7 @@ sub_805D66C: @ 805D66C
bl sub_805D9C4
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0805D6C4 @ =gUnknown_841D14E
movs r5, 0
str r5, [sp]
@@ -4738,7 +4738,7 @@ _0805D6EA:
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
ldrb r1, [r7]
movs r0, 0x8
ands r0, r1
@@ -4787,16 +4787,16 @@ _0805D788:
ldr r1, _0805D7B8 @ =gUnknown_2037078
movs r0, 0
strb r0, [r1, 0x6]
- bl sub_806994C
+ bl ScriptContext2_Disable
ldrh r0, [r5, 0x26]
lsls r0, 24
lsrs r0, 24
bl sub_8082FB0
ldr r0, _0805D7BC @ =sub_805D304
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0805D7AA:
movs r0, 0
pop {r3}
@@ -4827,7 +4827,7 @@ sub_805D7C0: @ 805D7C0
adds r4, r0
lsls r4, 2
adds r4, r5
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063500
@@ -4835,10 +4835,10 @@ sub_805D7C0: @ 805D7C0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0805D834 @ =gUnknown_841D169
movs r0, 0
str r0, [sp]
@@ -4883,7 +4883,7 @@ sub_805D838: @ 805D838
adds r4, r0
lsls r4, 2
adds r4, r5
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063500
@@ -4891,7 +4891,7 @@ sub_805D838: @ 805D838
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, _0805D8A8 @ =gUnknown_841D17E
movs r0, 0
str r0, [sp]
@@ -4982,7 +4982,7 @@ sub_805D8D8: @ 805D8D8
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
ldrb r1, [r5]
movs r0, 0x8
ands r0, r1
@@ -5039,16 +5039,16 @@ sub_805D980: @ 805D980
bne _0805D9B6
ldr r0, _0805D9BC @ =gUnknown_2037078
strb r1, [r0, 0x6]
- bl sub_806994C
- bl sub_8068A5C
+ bl ScriptContext2_Disable
+ bl UnfreezeMapObjects
movs r0, 0
movs r1, 0x1
bl sub_80F6F54
ldr r0, _0805D9C0 @ =sub_805D304
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0805D9B6:
movs r0, 0
pop {r1}
@@ -5062,7 +5062,7 @@ _0805D9C0: .4byte sub_805D304
sub_805D9C4: @ 805D9C4
push {r4-r7,lr}
adds r4, r0, 0
- bl sub_8007824
+ bl AnimateSprite
movs r0, 0
strh r0, [r4, 0x24]
strh r0, [r4, 0x26]
@@ -5131,7 +5131,7 @@ _0805DA2E:
bhi _0805DA60
movs r0, 0x8
strh r0, [r4, 0x24]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -5186,7 +5186,7 @@ sub_805DAB0: @ 805DAB0
ldr r4, _0805DACC @ =sub_805DB04
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -5201,7 +5201,7 @@ _0805DACC: .4byte sub_805DB04
sub_805DAD0: @ 805DAD0
push {lr}
ldr r0, _0805DAE0 @ =sub_805DB04
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -5280,7 +5280,7 @@ _0805DB58:
b _0805DBFA
_0805DB5E:
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0805DBFA
@@ -5299,7 +5299,7 @@ _0805DB5E:
lsls r0, 4
strh r0, [r5, 0x6]
strh r6, [r7, 0x26]
- bl sub_805FAF8
+ bl CameraObjectReset2
ldrb r0, [r4, 0x3]
movs r1, 0x4
orrs r0, r1
@@ -5353,7 +5353,7 @@ _0805DBBA:
_0805DBF0: .4byte gUnknown_3005068
_0805DBF4:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_0805DBFA:
pop {r3}
mov r8, r3
@@ -5368,7 +5368,7 @@ sub_805DC04: @ 805DC04
ldr r4, _0805DC20 @ =sub_805DC38
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -5383,7 +5383,7 @@ _0805DC20: .4byte sub_805DC38
sub_805DC24: @ 805DC24
push {lr}
ldr r0, _0805DC34 @ =sub_805DC38
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -5455,7 +5455,7 @@ _0805DC9A:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
movs r0, 0
mov r9, r0
strh r6, [r5, 0x2]
@@ -5478,7 +5478,7 @@ _0805DC9A:
lsls r0, 4
strh r0, [r5, 0x6]
strh r6, [r7, 0x26]
- bl sub_805FAF8
+ bl CameraObjectReset2
ldrb r0, [r4, 0x3]
movs r2, 0x4
orrs r0, r2
@@ -5578,9 +5578,9 @@ _0805DD76:
adds r0, r7, 0
adds r0, 0x43
strb r1, [r0]
- bl sub_805FAA8
+ bl CameraObjectReset1
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_0805DDBA:
pop {r3,r4}
mov r8, r3
@@ -5608,7 +5608,7 @@ sub_805DDC8: @ 805DDC8
ble _0805DE20
_0805DDE4:
adds r0, r5, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _0805DE20
@@ -5623,7 +5623,7 @@ _0805DDE4:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_8063D00
+ bl FieldObjectForceSetSpecialAnim
movs r0, 0
strh r0, [r6]
ldrb r0, [r5, 0x18]
diff --git a/asm/field_poison.s b/asm/field_poison.s
index cb785d89e..380103d68 100644
--- a/asm/field_poison.s
+++ b/asm/field_poison.s
@@ -5,11 +5,11 @@
.text
- thumb_func_start sub_80A0460
-sub_80A0460: @ 80A0460
+ thumb_func_start .gcc2_compiled._0
+.gcc2_compiled._0: @ 80A0460
push {lr}
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -26,7 +26,7 @@ _080A047C:
_080A047E:
pop {r1}
bx r1
- thumb_func_end sub_80A0460
+ thumb_func_end .gcc2_compiled._0
thumb_func_start sub_80A0484
sub_80A0484: @ 80A0484
@@ -35,12 +35,12 @@ sub_80A0484: @ 80A0484
movs r5, 0
_080A048A:
adds r0, r4, 0
- bl sub_80A0460
+ bl .gcc2_compiled._0
cmp r0, 0
beq _080A04A8
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080A04A8
movs r0, 0
@@ -83,9 +83,9 @@ sub_80A04B8: @ 80A04B8
adds r0, r4, 0
movs r1, 0x2
adds r2, r5, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r5, 0
- bl sub_8008D28
+ bl StringGetEnd10
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -105,18 +105,18 @@ sub_80A0504: @ 80A0504
ldr r0, _080A0540 @ =gUnknown_2024284
adds r4, r1, r0
adds r0, r4, 0
- bl sub_80A0460
+ bl .gcc2_compiled._0
cmp r0, 0
beq _080A0544
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080A0544
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
- bl sub_812085C
+ bl GetMonData
+ bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -183,7 +183,7 @@ _080A05A0:
strh r0, [r4]
b _080A05F6
_080A05A6:
- bl sub_806951C
+ bl IsFieldMessageBoxHidden
lsls r0, 24
cmp r0, 0
beq _080A05F6
@@ -217,9 +217,9 @@ _080A05E8:
ldr r0, _080A05FC @ =gUnknown_20370D0
strh r1, [r0]
_080A05EC:
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080A05F6:
pop {r4,r5}
pop {r0}
@@ -233,16 +233,16 @@ sub_80A0600: @ 80A0600
push {lr}
ldr r0, _080A0614 @ =sub_80A054C
movs r1, 0x50
- bl sub_807741C
- bl sub_8069B28
+ bl CreateTask
+ bl ScriptContext1_Stop
pop {r0}
bx r0
.align 2, 0
_080A0614: .4byte sub_80A054C
thumb_func_end sub_80A0600
- thumb_func_start sub_80A0618
-sub_80A0618: @ 80A0618
+ thumb_func_start overworld_poison
+overworld_poison: @ 80A0618
push {r4-r7,lr}
sub sp, 0x4
ldr r4, _080A0684 @ =gUnknown_2024284
@@ -252,20 +252,20 @@ sub_80A0618: @ 80A0618
_080A0624:
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080A0668
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
- bl sub_812085C
+ bl GetMonData
+ bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080A0668
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
cmp r0, 0
beq _080A065A
@@ -311,6 +311,6 @@ _080A0692:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80A0618
+ thumb_func_end overworld_poison
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/field_screen_effect.s b/asm/field_screen_effect.s
index 82551fa78..e05873c89 100644
--- a/asm/field_screen_effect.s
+++ b/asm/field_screen_effect.s
@@ -186,7 +186,7 @@ _0807EF14:
ldrsh r0, [r4, r3]
cmp r0, 0x1
bne _0807EF64
- bl sub_8087E64
+ bl remove_some_task
movs r0, 0x2
strh r0, [r4]
b _0807EF76
@@ -195,12 +195,12 @@ _0807EF5C: .4byte gUnknown_2039600
_0807EF60: .4byte gUnknown_2038700
_0807EF64:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _0807EF76
_0807EF6C:
- bl sub_8087EA4
+ bl dp12_8087EA4
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807EF76:
pop {r4-r6}
pop {r0}
@@ -213,13 +213,13 @@ sub_807EF7C: @ 807EF7C
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0807EFA0 @ =sub_807EEB8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0807EF98
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807EF98:
pop {r4}
pop {r0}
@@ -233,13 +233,13 @@ sub_807EFA4: @ 807EFA4
push {r4,lr}
ldr r4, _0807EFC4 @ =sub_807EF7C
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0807EFBC
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_0807EFBC:
pop {r4}
pop {r0}
@@ -264,7 +264,7 @@ sub_807EFC8: @ 807EFC8
lsrs r7, r0, 24
ldr r0, _0807F00C @ =sub_807EEB8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r2, 2
@@ -328,7 +328,7 @@ _0807F042:
movs r1, 0x50
bl sub_807EFC8
bl sub_807EFA4
- bl sub_8069940
+ bl ScriptContext2_Enable
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -375,7 +375,7 @@ sub_807F0B0: @ 807F0B0
bl sub_8055FD4
ldr r0, _0807F0C4 @ =sub_807F0C8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -393,8 +393,8 @@ sub_807F0C8: @ 807F0C8
cmp r0, 0x1
bne _0807F0E4
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0807F0E4:
pop {r4}
pop {r0}
@@ -406,7 +406,7 @@ sub_807F0EC: @ 807F0EC
push {lr}
ldr r0, _0807F10C @ =sub_807F204
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807F110 @ =gUnknown_3005090
@@ -428,7 +428,7 @@ sub_807F114: @ 807F114
push {lr}
ldr r0, _0807F134 @ =sub_807F204
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807F138 @ =gUnknown_3005090
@@ -456,31 +456,31 @@ sub_807F13C: @ 807F13C
ldr r0, _0807F19C @ =gUnknown_3005098
adds r4, r0
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4]
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x2]
movs r0, 0x4A
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x4]
movs r0, 0x50
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x6]
movs r0, 0x52
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x8]
movs r0, 0x40
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xA]
movs r0, 0x44
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xC]
movs r0, 0x42
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xE]
movs r0, 0x46
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x10]
pop {r4}
pop {r0}
@@ -501,31 +501,31 @@ sub_807F1A0: @ 807F1A0
adds r4, r0
ldrh r1, [r4]
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x4]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x6]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x8]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xA]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x10]
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -566,50 +566,50 @@ _0807F236:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r1, 0x80
lsls r1, 7
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r1, 0x14
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0807F280
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0807F27C @ =0x0000f0ff
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
b _0807F2A0
.align 2, 0
_0807F27C: .4byte 0x0000f0ff
_0807F280:
movs r0, 0x40
movs r1, 0x78
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0807F2B8 @ =0x000078ff
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
_0807F2A0:
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
strh r0, [r5, 0x12]
b _0807F2F4
@@ -618,7 +618,7 @@ _0807F2B8: .4byte 0x000078ff
_0807F2BC:
ldr r0, _0807F2CC @ =sub_807F2FC
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
movs r0, 0x2
strh r0, [r5, 0x12]
b _0807F2F4
@@ -626,7 +626,7 @@ _0807F2BC:
_0807F2CC: .4byte sub_807F2FC
_0807F2D0:
ldr r0, _0807F2E4 @ =sub_807F2FC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0807F2F4
@@ -639,7 +639,7 @@ _0807F2E8:
adds r0, r4, 0
bl sub_807F1A0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807F2F4:
pop {r4,r5}
pop {r0}
@@ -660,7 +660,7 @@ sub_807F2FC: @ 807F2FC
ldr r4, _0807F348 @ =gUnknown_3005098
adds r6, r0, r4
ldr r0, _0807F34C @ =sub_807F204
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -681,7 +681,7 @@ sub_807F2FC: @ 807F2FC
cmp r0, 0x78
ble _0807F36C
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _0807F39A
.align 2, 0
_0807F348: .4byte gUnknown_3005098
@@ -698,13 +698,13 @@ _0807F350:
cmp r1, 0
bge _0807F36C
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
b _0807F39A
_0807F36C:
lsls r4, 16
lsrs r1, r4, 16
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
lsls r1, r7, 16
asrs r1, 8
movs r0, 0xF0
@@ -712,7 +712,7 @@ _0807F36C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
asrs r4, 16
cmp r4, 0x59
bgt _0807F394
@@ -767,7 +767,7 @@ _0807F3DC: .4byte gUnknown_3005090
_0807F3E0:
adds r0, r7, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _0807F424 @ =gUnknown_2021D18
adds r0, r5, 0
mov r1, r8
@@ -872,9 +872,9 @@ _0807F4A8:
bl sub_80F77CC
adds r0, r5, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
@@ -945,7 +945,7 @@ _0807F542:
ldr r1, _0807F580 @ =gUnknown_2036E38
adds r0, r1
movs r1, 0x2
- bl sub_805F218
+ bl FieldObjectTurn
ldr r1, _0807F584 @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -967,7 +967,7 @@ _0807F588:
adds r4, r2
ldrb r5, [r4, 0xA]
adds r0, r5, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r5, 0
movs r1, 0x1
bl sub_8003F20
@@ -984,9 +984,9 @@ _0807F5B6:
cmp r0, 0x1
bne _0807F5E4
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0807F5CC @ =gUnknown_81A8D97
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
b _0807F5E4
.align 2, 0
_0807F5CC: .4byte gUnknown_81A8D97
@@ -995,9 +995,9 @@ _0807F5D0:
cmp r0, 0x1
bne _0807F5E4
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0807F5EC @ =gUnknown_81A8DD8
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
_0807F5E4:
pop {r4-r7}
pop {r0}
@@ -1009,11 +1009,11 @@ _0807F5EC: .4byte gUnknown_81A8DD8
thumb_func_start sub_807F5F0
sub_807F5F0: @ 807F5F0
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_807DB38
ldr r0, _0807F618 @ =sub_807F45C
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0807F61C @ =gUnknown_3005090
diff --git a/asm/field_specials.s b/asm/field_specials.s
index e9b70c4b1..39be354b1 100644
--- a/asm/field_specials.s
+++ b/asm/field_specials.s
@@ -10,8 +10,8 @@ sub_80CA618: @ 80CA618
push {lr}
bl sub_8112364
ldr r0, _080CA62C @ =sub_80F4C10
- bl sub_8000544
- bl sub_8069940
+ bl SetMainCallback2
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -52,7 +52,7 @@ nullsub_74: @ 80CA660
sub_80CA664: @ 80CA664
push {lr}
movs r0, 0x4
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _080CA676
@@ -60,7 +60,7 @@ sub_80CA664: @ 80CA664
b _080CA688
_080CA676:
movs r0, 0x2
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080CA686
@@ -130,7 +130,7 @@ sub_80CA6DC: @ 80CA6DC
bne _080CA700
ldr r0, _080CA6F8 @ =gUnknown_2021CD0
ldr r1, _080CA6FC @ =gUnknown_8417FBB
- bl sub_8008D84
+ bl StringCopy
b _080CA708
.align 2, 0
_080CA6F4: .4byte gUnknown_300500C
@@ -139,7 +139,7 @@ _080CA6FC: .4byte gUnknown_8417FBB
_080CA700:
ldr r0, _080CA70C @ =gUnknown_2021CD0
ldr r1, _080CA710 @ =gUnknown_8417FC3
- bl sub_8008D84
+ bl StringCopy
_080CA708:
pop {r0}
bx r0
@@ -158,7 +158,7 @@ sub_80CA714: @ 80CA714
bne _080CA738
ldr r0, _080CA730 @ =gUnknown_2021CD0
ldr r1, _080CA734 @ =gUnknown_8417FD0
- bl sub_8008D84
+ bl StringCopy
b _080CA740
.align 2, 0
_080CA72C: .4byte gUnknown_300500C
@@ -167,7 +167,7 @@ _080CA734: .4byte gUnknown_8417FD0
_080CA738:
ldr r0, _080CA744 @ =gUnknown_2021CD0
ldr r1, _080CA748 @ =gUnknown_8417FCC
- bl sub_8008D84
+ bl StringCopy
_080CA740:
pop {r0}
bx r0
@@ -209,7 +209,7 @@ sub_80CA76C: @ 80CA76C
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xFF
bne _080CA794
movs r0, 0x6
@@ -219,7 +219,7 @@ _080CA790: .4byte gUnknown_2024284
_080CA794:
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xC7
bls _080CA7A4
movs r0, 0x5
@@ -227,7 +227,7 @@ _080CA794:
_080CA7A4:
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x95
bls _080CA7B4
movs r0, 0x4
@@ -235,7 +235,7 @@ _080CA7A4:
_080CA7B4:
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _080CA7C4
movs r0, 0x3
@@ -243,7 +243,7 @@ _080CA7B4:
_080CA7C4:
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x31
bls _080CA7D4
movs r0, 0x2
@@ -251,7 +251,7 @@ _080CA7C4:
_080CA7D4:
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080CA7E4
movs r0, 0
@@ -268,13 +268,13 @@ _080CA7E6:
sub_80CA7EC: @ 80CA7EC
push {lr}
bl sub_8112364
- ldr r1, _080CA800 @ =sub_80568E0
+ ldr r1, _080CA800 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
movs r0, 0x1
bl sub_80BFF50
pop {r0}
bx r0
.align 2, 0
-_080CA800: .4byte sub_80568E0
+_080CA800: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80CA7EC
thumb_func_start sub_80CA804
@@ -290,17 +290,17 @@ _080CA80A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CA858
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080CA858
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 3
@@ -337,14 +337,14 @@ sub_80CA86C: @ 80CA86C
push {r4,lr}
ldr r4, _080CA8A0 @ =sub_80CA8A8
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080CA89A
adds r0, r4, 0
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080CA8A4 @ =gUnknown_3005090
@@ -382,7 +382,7 @@ sub_80CA8A8: @ 80CA8A8
movs r0, 0x1
ands r0, r1
bl sub_80CA8F8
- bl sub_805A684
+ bl DrawWholeMapView
movs r0, 0
strh r0, [r4, 0x2]
ldrh r0, [r4]
@@ -393,7 +393,7 @@ sub_80CA8A8: @ 80CA8A8
cmp r0, 0x5
bne _080CA8E6
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080CA8E6:
ldrh r0, [r4, 0x2]
adds r0, 0x1
@@ -413,7 +413,7 @@ sub_80CA8F8: @ 80CA8F8
movs r4, 0
movs r7, 0
movs r5, 0
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -510,7 +510,7 @@ sub_80CA9A8: @ 80CA9A8
movs r4, 0
movs r6, 0
movs r5, 0
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -572,7 +572,7 @@ _080CA9F6:
orrs r4, r2
adds r2, r4, 0
bl sub_8058FA4
- bl sub_805A684
+ bl DrawWholeMapView
pop {r4-r6}
pop {r0}
bx r0
@@ -601,7 +601,7 @@ sub_80CAA34: @ 80CAA34
movs r0, 0x12
movs r1, 0x8
movs r2, 0x7F
- bl sub_805E830
+ bl SpawnSpecialFieldObjectParametrized
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAA84 @ =gUnknown_2036E38
@@ -614,7 +614,7 @@ sub_80CAA34: @ 80CAA34
orrs r0, r2
strb r0, [r1, 0x1]
ldrb r0, [r1, 0x4]
- bl sub_805FAC4
+ bl CameraObjectSetFollowedObjectId
add sp, 0x8
pop {r0}
bx r0
@@ -626,16 +626,16 @@ _080CAA84: .4byte gUnknown_2036E38
thumb_func_start sub_80CAA88
sub_80CAA88: @ 80CAA88
push {lr}
- bl sub_805C768
+ bl GetPlayerAvatarObjectId
lsls r0, 24
lsrs r0, 24
- bl sub_805FAC4
+ bl CameraObjectSetFollowedObjectId
ldr r0, _080CAAA8 @ =gUnknown_3005008
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
pop {r0}
bx r0
.align 2, 0
@@ -656,7 +656,7 @@ _080CAAB8: .4byte gUnknown_2021CD0
thumb_func_start sub_80CAABC
sub_80CAABC: @ 80CAABC
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x16
@@ -684,7 +684,7 @@ sub_80CAAE0: @ 80CAAE0
adds r0, r1
movs r1, 0x47
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -759,7 +759,7 @@ sub_80CAB78: @ 80CAB78
bl sub_80CBD94
lsls r0, 16
lsrs r6, r0, 16
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -772,7 +772,7 @@ _080CAB9A:
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r6
bne _080CABBC
movs r0, 0x1
@@ -806,7 +806,7 @@ _080CABD8:
lsrs r1, 24
lsrs r0, r5, 24
movs r2, 0xB
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _080CABEC
movs r0, 0x1
@@ -854,7 +854,7 @@ sub_80CAC28: @ 80CAC28
push {lr}
ldr r0, _080CAC6C @ =sub_80CAC84
movs r1, 0x9
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080CAC70 @ =gUnknown_3005090
@@ -877,7 +877,7 @@ sub_80CAC28: @ 80CAC28
ldrh r0, [r0]
strh r0, [r1, 0x10]
movs r0, 0
- bl sub_805ADD4
+ bl SetCameraPanningCallback
movs r0, 0xCF
bl sub_80722CC
pop {r0}
@@ -925,14 +925,14 @@ sub_80CAC84: @ 80CAC84
ldrsh r0, [r4, r1]
movs r2, 0x8
ldrsh r1, [r4, r2]
- bl sub_805ADE0
+ bl SetCameraPanning
movs r1, 0x4
ldrsh r0, [r4, r1]
cmp r0, 0
bne _080CACDC
adds r0, r5, 0
bl sub_80CACE8
- bl sub_805ADF8
+ bl InstallCameraPanAheadCallback
_080CACDC:
pop {r4,r5}
pop {r0}
@@ -946,8 +946,8 @@ sub_80CACE8: @ 80CACE8
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80CACE8
@@ -955,7 +955,7 @@ sub_80CACE8: @ 80CACE8
thumb_func_start sub_80CACFC
sub_80CACFC: @ 80CACFC
push {r4-r6,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -970,7 +970,7 @@ _080CAD0C:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -978,7 +978,7 @@ _080CAD0C:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CAD40
adds r0, r5, 0
@@ -1010,7 +1010,7 @@ sub_80CAD54: @ 80CAD54
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1032,11 +1032,11 @@ sub_80CAD7C: @ 80CAD7C
ldr r4, _080CADB0 @ =gUnknown_2021CD0
movs r1, 0x7
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CADB4 @ =gUnknown_300500C
ldr r0, [r0]
adds r1, r4, 0
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _080CADB8
movs r0, 0x1
@@ -1084,7 +1084,7 @@ sub_80CADC4: @ 80CADC4
thumb_func_start sub_80CADEC
sub_80CADEC: @ 80CADEC
push {r4,r5,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -1129,7 +1129,7 @@ _080CAE2C:
.4byte _080CAFC4
.4byte _080CAFF8
_080CAE68:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -1150,7 +1150,7 @@ _080CAE84:
.align 2, 0
_080CAE8C: .4byte gUnknown_20370C2
_080CAE90:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -1177,7 +1177,7 @@ _080CAEBA:
.align 2, 0
_080CAEC4: .4byte gUnknown_20370C2
_080CAEC8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -1193,7 +1193,7 @@ _080CAEDA:
.align 2, 0
_080CAEE4: .4byte gUnknown_20370C2
_080CAEE8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -1225,7 +1225,7 @@ _080CAF1C:
.align 2, 0
_080CAF24: .4byte gUnknown_20370C2
_080CAF28:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -1258,7 +1258,7 @@ _080CAF58:
.align 2, 0
_080CAF64: .4byte gUnknown_20370C2
_080CAF68:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -1283,7 +1283,7 @@ _080CAF8C:
.align 2, 0
_080CAF98: .4byte gUnknown_20370C2
_080CAF9C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -1304,7 +1304,7 @@ _080CAFB8:
.align 2, 0
_080CAFC0: .4byte gUnknown_20370C2
_080CAFC4:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -1329,7 +1329,7 @@ _080CAFE8:
.align 2, 0
_080CAFF4: .4byte gUnknown_20370C2
_080CAFF8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -1460,7 +1460,7 @@ _080CB0EA:
ldr r0, _080CB120 @ =gUnknown_8245EE0
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
pop {r4}
pop {r0}
bx r0
@@ -1478,7 +1478,7 @@ sub_80CB124: @ 80CB124
push {r4,r5,lr}
movs r5, 0
_080CB128:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
ldr r1, _080CB160 @ =0x0000019b
@@ -1487,7 +1487,7 @@ _080CB128:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -1517,7 +1517,7 @@ _080CB170:
lsrs r4, r0, 16
_080CB176:
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -1536,7 +1536,7 @@ _080CB18E:
thumb_func_start sub_80CB198
sub_80CB198: @ 80CB198
push {r4,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -1546,7 +1546,7 @@ sub_80CB198: @ 80CB198
cmp r0, 0x1D
bhi _080CB1D0
ldr r4, _080CB1CC @ =gUnknown_83F5B30
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -1942,7 +1942,7 @@ sub_80CB498: @ 80CB498
push {r4-r6,lr}
ldr r0, _080CB4D0 @ =sub_80CB514
movs r1, 0x9
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -1986,7 +1986,7 @@ _080CB4EE:
ldrb r0, [r0]
strh r0, [r4, 0xA]
movs r0, 0
- bl sub_805ADD4
+ bl SetCameraPanningCallback
ldrb r1, [r4, 0xC]
adds r0, r5, 0
bl sub_80CB658
@@ -2030,7 +2030,7 @@ sub_80CB514: @ 80CB514
movs r2, 0x8
ldrsh r1, [r4, r2]
movs r0, 0
- bl sub_805ADE0
+ bl SetCameraPanning
movs r0, 0x4
ldrsh r1, [r4, r0]
movs r2, 0xA
@@ -2040,9 +2040,9 @@ sub_80CB514: @ 80CB514
movs r0, 0x42
bl sub_80722CC
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
- bl sub_805ADF8
+ bl DestroyTask
+ bl EnableBothScriptContexts
+ bl InstallCameraPanAheadCallback
_080CB574:
pop {r4,r5}
pop {r0}
@@ -2076,7 +2076,7 @@ sub_80CB580: @ 80CB580
movs r1, 0
adds r2, r5, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldrb r0, [r4]
ldr r2, _080CB630 @ =gUnknown_8418075
movs r1, 0x2
@@ -2114,7 +2114,7 @@ sub_80CB580: @ 80CB580
adds r2, r5, 0
bl sub_8002C48
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
@@ -2160,14 +2160,14 @@ sub_80CB658: @ 80CB658
lsrs r5, r1, 24
ldr r4, _080CB6A0 @ =sub_80CB6AC
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _080CB698
adds r0, r4, 0
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080CB6A4 @ =gUnknown_3005090
@@ -2309,7 +2309,7 @@ _080CB752:
cmp r1, 0x2
bls _080CB742
_080CB78E:
- bl sub_805A684
+ bl DrawWholeMapView
movs r0, 0
strh r0, [r6, 0x2]
movs r0, 0
@@ -2319,7 +2319,7 @@ _080CB78E:
cmp r1, r0
bne _080CB7A8
ldr r0, [sp]
- bl sub_8077508
+ bl DestroyTask
_080CB7A8:
ldrh r0, [r6, 0x2]
adds r0, 0x1
@@ -2349,7 +2349,7 @@ sub_80CB7C4: @ 80CB7C4
_080CB7D6:
ldr r0, _080CB80C @ =sub_80CB904
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
lsls r0, r5, 2
@@ -2494,7 +2494,7 @@ _080CB8EC:
movs r0, 0x7F
strh r0, [r1]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080CB8F8:
pop {r4,r5}
pop {r0}
@@ -2518,7 +2518,7 @@ sub_80CB904: @ 80CB904
lsls r0, 3
ldr r1, _080CB934 @ =gUnknown_3005090
adds r5, r0, r1
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _080CB938 @ =gUnknown_20370C0
ldrh r0, [r0]
cmp r0, 0x1
@@ -2542,7 +2542,7 @@ _080CB94A:
movs r1, 0xA
ldrsh r0, [r5, r1]
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
bl sub_80CBA7C
movs r6, 0
@@ -2644,14 +2644,14 @@ _080CB9D2:
ldrh r1, [r5, 0x16]
ldrh r2, [r5, 0x18]
adds r0, r4, 0
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x24]
ldrh r0, [r5, 0x22]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r0, [r5, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -2737,7 +2737,7 @@ sub_80CBADC: @ 80CBADC
movs r0, 0x5
bl sub_80722CC
ldr r0, _080CBB18 @ =sub_80CBB28
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -2753,7 +2753,7 @@ sub_80CBADC: @ 80CBADC
ldr r4, _080CBB20 @ =gUnknown_3005378
adds r1, r4, 0
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r1, _080CBB24 @ =gUnknown_2039A18
ldrh r0, [r4]
strh r0, [r1]
@@ -2781,7 +2781,7 @@ sub_80CBB28: @ 80CBB28
ldrh r0, [r6, 0x24]
lsls r0, 24
lsrs r0, 24
- bl sub_8107078
+ bl ListMenuHandleInput
adds r4, r0, 0
movs r0, 0x2
negs r0, r0
@@ -2827,7 +2827,7 @@ _080CBB94:
bl sub_80CBD50
ldr r0, _080CBBA8 @ =sub_80CBC2C
str r0, [r6]
- bl sub_8069B34
+ bl EnableBothScriptContexts
_080CBBA2:
pop {r4-r6}
pop {r0}
@@ -2857,7 +2857,7 @@ sub_80CBBAC: @ 80CBBAC
bl sub_810713C
ldr r0, _080CBC28 @ =gUnknown_2039A14
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -2867,11 +2867,11 @@ sub_80CBBAC: @ 80CBBAC
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrh r0, [r4, 0x22]
lsls r0, 24
lsrs r0, 24
@@ -2882,8 +2882,8 @@ sub_80CBBAC: @ 80CBBAC
lsrs r0, 24
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
pop {r4,r5}
pop {r0}
bx r0
@@ -2924,12 +2924,12 @@ _080CBC58: .4byte sub_80CBC90
sub_80CBC5C: @ 80CBC5C
push {lr}
ldr r0, _080CBC74 @ =sub_80CBC2C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _080CBC78
- bl sub_8069B34
+ bl EnableBothScriptContexts
b _080CBC88
.align 2, 0
_080CBC74: .4byte sub_80CBC2C
@@ -2955,7 +2955,7 @@ sub_80CBC90: @ 80CBC90
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8069940
+ bl ScriptContext2_Enable
adds r0, r4, 0
bl sub_80CBCC0
ldr r1, _080CBCB8 @ =gUnknown_3005090
@@ -3032,7 +3032,7 @@ sub_80CBCC0: @ 80CBCC0
strh r0, [r2, 0x8]
ldr r1, _080CBD4C @ =gUnknown_2039A18
mov r0, sp
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x20]
@@ -3066,7 +3066,7 @@ sub_80CBD50: @ 80CBD50
ldrh r0, [r2, 0x20]
lsls r0, 24
lsrs r0, 24
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
_080CBD76:
pop {r0}
bx r0
@@ -3125,7 +3125,7 @@ sub_80CBDCC: @ 80CBDCC
push {lr}
ldr r0, _080CBDE4 @ =gUnknown_20370C0
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x2
@@ -3208,12 +3208,12 @@ sub_80CBE50: @ 80CBE50
adds r0, r5, 0
movs r1, 0x2
adds r2, r6, 0
- bl sub_803FBE8
+ bl GetMonData
mov r4, sp
adds r0, r5, 0
movs r1, 0x3
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -3222,13 +3222,13 @@ sub_80CBE50: @ 80CBE50
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xB
muls r0, r1
ldr r1, _080CBEAC @ =gUnknown_8245EE0
adds r0, r1
adds r1, r6, 0
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _080CBEB0
movs r0, 0
@@ -3380,10 +3380,10 @@ sub_80CBFA0: @ 80CBFA0
ldr r4, _080CBFD0 @ =gUnknown_2021CD0
movs r1, 0x2
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080CBFD4 @ =gUnknown_2021D04
adds r1, r4, 0
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _080CBFD8
movs r0, 0x1
@@ -3411,33 +3411,33 @@ sub_80CBFE0: @ 80CBFE0
ldrb r0, [r0]
ldr r1, _080CC054 @ =gUnknown_20370D8
ldrb r1, [r1]
- bl sub_808BD30
+ bl GetBoxedMonPtr
adds r6, r0, 0
ldr r2, _080CC058 @ =gUnknown_2021D04
movs r1, 0x2
- bl sub_803FD44
+ bl GetBoxMonData
ldr r0, _080CC05C @ =gUnknown_2021CF0
mov r8, r0
adds r0, r6, 0
movs r1, 0x2
mov r2, r8
- bl sub_803FD44
+ bl GetBoxMonData
adds r0, r6, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
- bl sub_803F730
+ bl GetBoxMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
str r0, [sp]
ldr r0, _080CC060 @ =sub_80CC064
str r0, [sp, 0x4]
@@ -3468,8 +3468,8 @@ sub_80CC064: @ 80CC064
ldr r1, _080CC080 @ =gUnknown_20370D8
ldrb r1, [r1]
ldr r2, _080CC084 @ =gUnknown_2021CF0
- bl sub_808BB2C
- bl sub_80568E0
+ bl SetBoxMonNickFromAnyBox
+ bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
bx r0
.align 2, 0
@@ -3498,7 +3498,7 @@ sub_80CC088: @ 80CC088
adds r0, r6
ldr r2, _080CC138 @ =gUnknown_2021D04
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -3509,7 +3509,7 @@ sub_80CC088: @ 80CC088
mov r10, r1
movs r1, 0x2
mov r2, r10
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
ldrh r0, [r1]
mov r1, r8
@@ -3518,7 +3518,7 @@ sub_80CC088: @ 80CC088
adds r0, r6
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -3528,7 +3528,7 @@ sub_80CC088: @ 80CC088
muls r1, r0
adds r0, r1, 0
adds r0, r6
- bl sub_803F720
+ bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3540,7 +3540,7 @@ sub_80CC088: @ 80CC088
adds r0, r6
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r0, _080CC140 @ =sub_80CC144
str r0, [sp, 0x4]
@@ -3577,7 +3577,7 @@ sub_80CC144: @ 80CC144
ldr r2, _080CC16C @ =gUnknown_2021CF0
movs r1, 0x2
bl sub_804037C
- bl sub_80568E0
+ bl c2_exit_to_overworld_1_continue_scripts_restart_music
pop {r0}
bx r0
.align 2, 0
@@ -3598,9 +3598,9 @@ sub_80CC170: @ 80CC170
ldr r4, _080CC19C @ =gUnknown_2021CD0
movs r1, 0x2
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
- bl sub_8008D28
+ bl StringGetEnd10
pop {r4}
pop {r0}
bx r0
@@ -3623,7 +3623,7 @@ sub_80CC1A0: @ 80CC1A0
adds r0, r1
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
bne _080CC1D4
ldr r1, _080CC1D0 @ =gUnknown_20370D0
@@ -3770,7 +3770,7 @@ _080CC2C6:
lsrs r5, r0, 24
cmp r5, 0x5
bls _080CC2C6
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r6, r0, 24
movs r5, 0
@@ -3785,14 +3785,14 @@ _080CC2E4:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r5, 1
add r1, sp
strh r0, [r1]
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r5, 2
adds r1, r7, r1
str r0, [r1]
@@ -3985,7 +3985,7 @@ _080CC486:
thumb_func_start sub_80CC48C
sub_80CC48C: @ 80CC48C
push {r4,r5,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -3998,7 +3998,7 @@ _080CC49C:
adds r0, r1
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080CC4BC @ =gUnknown_20370C0
ldrh r1, [r1]
cmp r0, r1
@@ -4212,7 +4212,7 @@ _080CC61C:
ldr r1, _080CC660 @ =gUnknown_83F5D58
ldrh r0, [r1, 0x18]
ldrh r1, [r1, 0x1A]
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
add r1, sp, 0x4
strb r0, [r1]
@@ -4258,7 +4258,7 @@ _080CC67C:
bne _080CC71E
ldrh r0, [r1]
ldrh r1, [r1, 0x2]
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r1, [r0, 0x14]
add r0, sp, 0x4
strb r1, [r0]
@@ -4270,7 +4270,7 @@ _080CC67C:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -4290,7 +4290,7 @@ _080CC6D4:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -4412,7 +4412,7 @@ sub_80CC7B4: @ 80CC7B4
lsls r0, 24
cmp r0, 0
bne _080CC7F0
- bl sub_808B9F4
+ bl StorageGetCurrentBox
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -4445,7 +4445,7 @@ sub_80CC7F8: @ 80CC7F8
lsls r0, 24
lsrs r0, 24
bl sub_80CC79C
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r4, r0, 24
_080CC810:
@@ -4456,10 +4456,10 @@ _080CC816:
lsls r1, r5, 24
lsrs r1, 24
lsrs r0, r6, 24
- bl sub_808BD30
+ bl GetBoxedMonPtr
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _080CC858
bl sub_80CC7A8
@@ -4489,7 +4489,7 @@ _080CC858:
bne _080CC866
movs r4, 0
_080CC866:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -4565,7 +4565,7 @@ _080CC8E8: .4byte 0xfffffedf
_080CC8EC:
ldr r4, _080CC910 @ =gUnknown_2021CD0
ldrh r0, [r1]
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
movs r1, 0xD
@@ -4573,7 +4573,7 @@ _080CC8EC:
ldr r0, _080CC914 @ =gUnknown_8247094
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
_080CC908:
pop {r4}
@@ -4636,7 +4636,7 @@ sub_80CC974: @ 80CC974
push {r4-r6,lr}
ldr r0, _080CC9A8 @ =sub_80CCA18
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -4675,7 +4675,7 @@ _080CC9B4:
ldr r0, _080CC9E4 @ =gUnknown_83F60D0
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080CC9FC
.align 2, 0
_080CC9D8: .4byte gUnknown_3005008
@@ -4691,7 +4691,7 @@ _080CC9E8:
ldr r0, _080CCA14 @ =gUnknown_83F5F50
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080CC9FC:
movs r0, 0
strh r0, [r4, 0x2]
@@ -4775,7 +4775,7 @@ _080CCA78:
adds r0, r1
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080CCADE
.align 2, 0
_080CCAA4: .4byte gUnknown_3005098
@@ -4799,7 +4799,7 @@ _080CCAC0:
adds r0, r1
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080CCADE:
movs r0, 0x7
movs r1, 0x1
@@ -4832,7 +4832,7 @@ sub_80CCAF4: @ 80CCAF4
ldr r0, _080CCB28 @ =gUnknown_83F61D0
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080CCB36
.align 2, 0
_080CCB20: .4byte gUnknown_3005008
@@ -4842,7 +4842,7 @@ _080CCB2C:
ldr r0, _080CCB60 @ =gUnknown_83F60B0
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080CCB36:
movs r0, 0x7
movs r1, 0x1
@@ -4856,10 +4856,10 @@ _080CCB36:
movs r0, 0x80
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
_080CCB54:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080CCB5A:
pop {r4}
pop {r0}
@@ -4874,16 +4874,16 @@ sub_80CCB68: @ 80CCB68
push {r4,lr}
ldr r4, _080CCB90 @ =sub_80CCA18
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080CCB88
adds r0, r4, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080CCB88:
pop {r4}
pop {r0}
@@ -4928,7 +4928,7 @@ _080CCBCE:
adds r0, r5, r1
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080CCC1C @ =gUnknown_83F6203
adds r1, r4, r1
ldrb r1, [r1]
@@ -4945,14 +4945,14 @@ _080CCBEA:
ldr r1, _080CCC20 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xFF
bne _080CCC7A
cmp r7, 0
bne _080CCC34
ldr r0, _080CCC24 @ =gUnknown_2021CF0
ldr r1, _080CCC28 @ =gUnknown_82481BE
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080CCC2C @ =gUnknown_20370C2
movs r0, 0xF
strh r0, [r1]
@@ -4970,7 +4970,7 @@ _080CCC34:
bne _080CCC5C
ldr r0, _080CCC4C @ =gUnknown_2021CF0
ldr r1, _080CCC50 @ =gUnknown_824802B
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080CCC54 @ =gUnknown_20370C2
movs r0, 0x10
strh r0, [r1]
@@ -4984,7 +4984,7 @@ _080CCC58: .4byte 0x000002df
_080CCC5C:
ldr r0, _080CCC80 @ =gUnknown_2021CF0
ldr r1, _080CCC84 @ =gUnknown_8248038
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080CCC88 @ =gUnknown_20370C2
movs r0, 0x11
strh r0, [r1]
@@ -5011,7 +5011,7 @@ _080CCC8C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CCCA8
adds r0, r6, 0x1
@@ -5020,7 +5020,7 @@ _080CCC8C:
_080CCCA8:
adds r0, r4, 0
movs r1, 0xE
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CCCBA
adds r0, r6, 0x1
@@ -5029,7 +5029,7 @@ _080CCCA8:
_080CCCBA:
adds r0, r4, 0
movs r1, 0xF
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CCCCC
adds r0, r6, 0x1
@@ -5038,7 +5038,7 @@ _080CCCBA:
_080CCCCC:
adds r0, r4, 0
movs r1, 0x10
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CCCDE
adds r0, r6, 0x1
@@ -5152,7 +5152,7 @@ sub_80CCD84: @ 80CCD84
ldr r0, _080CCDC4 @ =0x00190018
cmp r1, r0
bne _080CCDC8
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -5179,12 +5179,12 @@ sub_80CCDD0: @ 80CCDD0
movs r0, 0x1F
movs r1, 0x1F
bl sub_8058FA4
- bl sub_805A684
+ bl DrawWholeMapView
movs r0, 0x14
bl sub_80722CC
ldr r0, _080CCDF8 @ =0x000002e3
bl sub_806E680
- bl sub_806994C
+ bl ScriptContext2_Disable
pop {r0}
bx r0
.align 2, 0
@@ -5196,7 +5196,7 @@ sub_80CCDFC: @ 80CCDFC
push {lr}
ldr r0, _080CCE0C @ =sub_80CCE10
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -5267,10 +5267,10 @@ _080CCE90:
movs r0, 0x2
_080CCE9E:
strh r0, [r1]
- bl sub_8069B34
+ bl EnableBothScriptContexts
_080CCEA4:
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
b _080CCED6
.align 2, 0
_080CCEAC: .4byte 0x00000848
@@ -5289,7 +5289,7 @@ _080CCEB4:
movs r0, 0x1
strh r0, [r1]
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
_080CCED6:
pop {r3}
mov r8, r3
@@ -5313,7 +5313,7 @@ sub_80CCEE8: @ 80CCEE8
movs r1, 0xD0
lsls r1, 1
movs r2, 0x8
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0xA
bl sub_8083598
ldr r0, _080CCF28 @ =gUnknown_3005008
@@ -5322,7 +5322,7 @@ sub_80CCEE8: @ 80CCEE8
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
cmp r4, 0
bne _080CCF2C
movs r0, 0xBD
@@ -5337,7 +5337,7 @@ _080CCF2C:
_080CCF32:
ldr r0, _080CCF64 @ =sub_80CCF98
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r3, _080CCF68 @ =gUnknown_20386E0
movs r0, 0x1
str r0, [r3]
@@ -5368,7 +5368,7 @@ _080CCF70:
_080CCF72:
str r0, [r3, 0x14]
movs r0, 0x43
- bl sub_8083444
+ bl FieldEffectStart
ldr r0, _080CCF94 @ =gUnknown_83F6366
adds r1, r5, r0
ldrb r1, [r1]
@@ -5376,7 +5376,7 @@ _080CCF72:
adds r0, r5, r0
ldrb r2, [r0]
movs r0, 0x1
- bl sub_80550D8
+ bl Overworld_SetMapObjTemplateCoords
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -5391,13 +5391,13 @@ sub_80CCF98: @ 80CCF98
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x43
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _080CCFB4
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080CCFB4:
pop {r4}
pop {r0}
@@ -5453,7 +5453,7 @@ sub_80CD008: @ 80CD008
movs r1, 0xD0
lsls r1, 1
movs r2, 0x8
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0xA
bl sub_8083598
pop {r0}
@@ -5466,7 +5466,7 @@ _080CD030: .4byte gUnknown_83F6206
thumb_func_start sub_80CD034
sub_80CD034: @ 80CD034
push {r4,r5,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -5478,7 +5478,7 @@ _080CD044:
ldr r1, _080CD05C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x4
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _080CD060
movs r0, 0x1
@@ -5567,7 +5567,7 @@ _080CD0F0: .4byte gUnknown_2039A1B
thumb_func_start sub_80CD0F4
sub_80CD0F4: @ 80CD0F4
push {r4-r7,lr}
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r7, r0, 24
movs r6, 0
@@ -5582,7 +5582,7 @@ _080CD104:
adds r0, r5, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080CD13C @ =gUnknown_20370C0
ldrh r1, [r1]
cmp r0, r1
@@ -5592,7 +5592,7 @@ _080CD104:
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
bne _080CD140
movs r0, 0x1
@@ -5669,7 +5669,7 @@ sub_80CD1B4: @ 80CD1B4
push {lr}
ldr r0, _080CD1C8 @ =sub_80CD1CC
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
movs r0, 0x96
bl sub_80722CC
pop {r0}
@@ -5714,7 +5714,7 @@ _080CD200:
cmp r1, r0
bne _080CD214
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080CD214:
pop {r4,r5}
pop {r0}
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 91470b6a6..9473e8b96 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -39,7 +39,7 @@ sub_806E83C: @ 806E83C
lsls r1, 3
ldr r0, _0806E874 @ =gUnknown_3005098
adds r4, r1, r0
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _0806E86C
@@ -67,14 +67,14 @@ sub_806E87C: @ 806E87C
push {r4,r5,lr}
ldr r5, _0806E8C4 @ =sub_806E810
adds r0, r5, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _0806E8A6
adds r0, r5, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0806E8C8 @ =gUnknown_3005090
@@ -86,13 +86,13 @@ sub_806E87C: @ 806E87C
_0806E8A6:
ldr r4, _0806E8CC @ =sub_806E83C
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0806E8BC
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_0806E8BC:
pop {r4,r5}
pop {r0}
@@ -109,7 +109,7 @@ sub_806E8D0: @ 806E8D0
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _0806E908 @ =sub_806E810
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -147,11 +147,11 @@ _0806E912:
sub_806E918: @ 806E918
push {lr}
ldr r0, _0806E948 @ =sub_806E810
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
ldr r0, _0806E94C @ =sub_806E83C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -286,7 +286,7 @@ _0806EA12:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
ldrh r0, [r0]
strh r0, [r5, 0x4]
@@ -298,7 +298,7 @@ _0806EA2A:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
ldrh r2, [r0]
movs r3, 0
@@ -386,7 +386,7 @@ _0806EAB0:
ldrsh r0, [r0, r3]
movs r2, 0
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
b _0806EB3E
.align 2, 0
_0806EAF0: .4byte 0x0000035a
@@ -422,7 +422,7 @@ _0806EB04:
ldrsh r0, [r0, r3]
movs r2, 0
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
ldr r0, _0806EB50 @ =0x00004001
movs r1, 0x1
bl sub_806E584
@@ -454,7 +454,7 @@ sub_806EB54: @ 806EB54
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
ldrh r2, [r0]
movs r3, 0
@@ -501,7 +501,7 @@ _0806EB8E:
ldrsh r1, [r4, r2]
ldr r2, _0806EBE0 @ =0x00000212
movs r3, 0x4
- bl sub_80DC23C
+ bl ash
b _0806EBF6
.align 2, 0
_0806EBD8: .4byte gUnknown_3005098
@@ -515,7 +515,7 @@ _0806EBE4:
ldrsh r1, [r4, r2]
ldr r2, _0806EC00 @ =0x00000206
movs r3, 0x4
- bl sub_80DC23C
+ bl ash
_0806EBF6:
add sp, 0x4
pop {r4,r5}
@@ -546,7 +546,7 @@ _0806EC20:
bl sub_8058FA4
adds r0, r5, 0
adds r1, r4, 0
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
pop {r4,r5}
pop {r0}
bx r0
@@ -570,7 +570,7 @@ sub_806EC40: @ 806EC40
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
diff --git a/asm/field_weather.s b/asm/field_weather.s
index 726413dbe..41cd0101d 100644
--- a/asm/field_weather.s
+++ b/asm/field_weather.s
@@ -9,14 +9,14 @@
sub_8079C08: @ 8079C08
push {r4-r6,lr}
ldr r0, _08079CCC @ =sub_8079E0C
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
bne _08079CC4
movs r0, 0x90
lsls r0, 5
- bl sub_80089B8
+ bl AllocSpritePalette
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -90,7 +90,7 @@ sub_8079C08: @ 8079C08
strb r0, [r1]
ldr r0, _08079CEC @ =sub_8079DBC
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
ldr r1, _08079CF0 @ =0x000006c9
adds r4, r1
strb r0, [r4]
@@ -111,8 +111,8 @@ _08079CEC: .4byte sub_8079DBC
_08079CF0: .4byte 0x000006c9
thumb_func_end sub_8079C08
- thumb_func_start sub_8079CF4
-sub_8079CF4: @ 8079CF4
+ thumb_func_start weather_set
+weather_set: @ 8079CF4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -122,7 +122,7 @@ sub_8079CF4: @ 8079CF4
beq _08079D0A
cmp r4, 0xD
beq _08079D0A
- bl sub_807B004
+ bl play_some_sound
_08079D0A:
ldr r1, _08079D4C @ =gUnknown_2037F34
ldr r2, _08079D50 @ =0x000006d1
@@ -162,7 +162,7 @@ _08079D50: .4byte 0x000006d1
_08079D54: .4byte gUnknown_83C2BC0
_08079D58: .4byte 0x000006d3
_08079D5C: .4byte 0x000006ce
- thumb_func_end sub_8079CF4
+ thumb_func_end weather_set
thumb_func_start sub_8079D60
sub_8079D60: @ 8079D60
@@ -170,7 +170,7 @@ sub_8079D60: @ 8079D60
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_807B004
+ bl play_some_sound
ldr r0, _08079D84 @ =gUnknown_2037F34
movs r2, 0xDA
lsls r2, 3
@@ -193,7 +193,7 @@ sub_8079D8C: @ 8079D8C
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_807B004
+ bl play_some_sound
ldr r1, _08079DB8 @ =gUnknown_2037F34
movs r2, 0xDA
lsls r2, 3
@@ -1068,7 +1068,7 @@ _0807A428:
adds r0, r6, 0
movs r1, 0x10
mov r2, r8
- bl sub_8045274
+ bl BlendPalette
adds r0, r6, 0
adds r0, 0x10
lsls r0, 16
@@ -1217,7 +1217,7 @@ _0807A544:
adds r0, r5, 0
movs r1, 0x10
adds r2, r6, 0
- bl sub_8045274
+ bl BlendPalette
adds r0, r5, 0
adds r0, 0x10
lsls r0, 16
@@ -1317,7 +1317,7 @@ sub_807A5F8: @ 807A5F8
lsls r1, 1
movs r0, 0
adds r2, r7, 0
- bl sub_8045274
+ bl BlendPalette
ldr r0, [sp]
lsls r1, r0, 27
lsrs r1, 27
@@ -1424,7 +1424,7 @@ _0807A6E4:
ldrh r3, [r1]
movs r1, 0x10
adds r2, r7, 0
- bl sub_8045274
+ bl BlendPalette
adds r4, 0x1
mov r9, r4
_0807A6F8:
@@ -1584,8 +1584,8 @@ _0807A810: .4byte 0x000006c6
_0807A814: .4byte 0x000006c2
thumb_func_end sub_807A7C4
- thumb_func_start sub_807A818
-sub_807A818: @ 807A818
+ thumb_func_start fade_screen
+fade_screen: @ 807A818
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -1663,7 +1663,7 @@ _0807A896:
str r4, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0807A8BC @ =gUnknown_2037F34
ldr r3, _0807A8C0 @ =0x000006c6
adds r0, r3
@@ -1699,7 +1699,7 @@ _0807A8E8:
str r4, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0807A8FA:
ldr r4, _0807A934 @ =gUnknown_2037F34
ldr r1, _0807A938 @ =0x000006c6
@@ -1735,7 +1735,7 @@ _0807A934: .4byte gUnknown_2037F34
_0807A938: .4byte 0x000006c6
_0807A93C: .4byte 0x000006ca
_0807A940: .4byte 0x000006cb
- thumb_func_end sub_807A818
+ thumb_func_end fade_screen
thumb_func_start sub_807A944
sub_807A944: @ 807A944
@@ -1816,7 +1816,7 @@ _0807A9C2:
adds r0, r6, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0807A9E8 @ =gUnknown_2037F34
ldr r3, _0807A9EC @ =0x000006c6
adds r0, r3
@@ -1851,7 +1851,7 @@ _0807AA14:
adds r0, r6, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0807AA24:
ldr r4, _0807AA60 @ =gUnknown_2037F34
ldr r1, _0807AA64 @ =0x000006c6
@@ -1997,7 +1997,7 @@ _0807AB20:
lsrs r3, 17
adds r0, r4, 0
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
b _0807AB68
.align 2, 0
_0807AB4C: .4byte gUnknown_20375F8
@@ -2010,7 +2010,7 @@ _0807AB58:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0xC
- bl sub_8045274
+ bl BlendPalette
_0807AB68:
pop {r4-r6}
pop {r0}
@@ -2076,7 +2076,7 @@ sub_807ABC0: @ 807ABC0
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r4]
bl sub_807AA8C
pop {r4}
@@ -2342,7 +2342,7 @@ sub_807ADB0: @ 807ADB0
lsls r1, 8
orrs r1, r0
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -2470,7 +2470,7 @@ _0807AEC4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r4]
ldr r2, _0807AEF4 @ =0x00000734
adds r0, r5, r2
@@ -2561,8 +2561,8 @@ _0807AF92:
bx r0
thumb_func_end sub_807AF00
- thumb_func_start sub_807AF98
-sub_807AF98: @ 807AF98
+ thumb_func_start weather_get_current
+weather_get_current: @ 807AF98
ldr r0, _0807AFA4 @ =gUnknown_2037F34
movs r1, 0xDA
lsls r1, 3
@@ -2571,7 +2571,7 @@ sub_807AF98: @ 807AF98
bx lr
.align 2, 0
_0807AFA4: .4byte gUnknown_2037F34
- thumb_func_end sub_807AF98
+ thumb_func_end weather_get_current
thumb_func_start sub_807AFA8
sub_807AFA8: @ 807AFA8
@@ -2625,10 +2625,10 @@ _0807AFFA:
_0807B000: .4byte 0x000006dd
thumb_func_end sub_807AFA8
- thumb_func_start sub_807B004
-sub_807B004: @ 807B004
+ thumb_func_start play_some_sound
+play_some_sound: @ 807B004
push {lr}
- bl sub_807244C
+ bl IsSpecialSEPlaying
lsls r0, 24
cmp r0, 0
beq _0807B042
@@ -2658,7 +2658,7 @@ _0807B03C:
_0807B042:
pop {r0}
bx r0
- thumb_func_end sub_807B004
+ thumb_func_end play_some_sound
thumb_func_start sub_807B048
sub_807B048: @ 807B048
@@ -2837,7 +2837,7 @@ sub_807B174: @ 807B174
bl sub_807B130
lsls r0, 24
lsrs r0, 24
- bl sub_8079CF4
+ bl weather_set
pop {r0}
bx r0
thumb_func_end sub_807B174
@@ -2860,7 +2860,7 @@ sub_807B1A4: @ 807B1A4
bl sub_807B130
lsls r0, 24
lsrs r0, 24
- bl sub_8079CF4
+ bl weather_set
pop {r0}
bx r0
thumb_func_end sub_807B1A4
diff --git a/asm/field_weather_effects.s b/asm/field_weather_effects.s
index fd63d855b..4c0caabe3 100644
--- a/asm/field_weather_effects.s
+++ b/asm/field_weather_effects.s
@@ -211,7 +211,7 @@ sub_807B438: @ 807B438
cmp r0, 0x1
beq _0807B4F4
ldr r0, _0807B4B8 @ =gUnknown_83C65D4
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _0807B4BC @ =gUnknown_83C2D00
bl sub_807ABC0
movs r5, 0
@@ -220,7 +220,7 @@ _0807B456:
movs r1, 0
movs r2, 0
movs r3, 0xFF
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -318,7 +318,7 @@ _0807B51C:
ldr r0, [r0]
cmp r0, 0
beq _0807B52A
- bl sub_8007280
+ bl DestroySprite
_0807B52A:
adds r0, r4, 0x1
lsls r0, 16
@@ -327,7 +327,7 @@ _0807B52A:
bls _0807B51C
movs r0, 0x90
lsls r0, 5
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0807B550 @ =gUnknown_83C2BBC
ldr r0, [r0]
ldr r1, _0807B554 @ =0x000006de
@@ -529,17 +529,17 @@ sub_807B6BC: @ 807B6BC
thumb_func_start sub_807B6C0
sub_807B6C0: @ 807B6C0
push {lr}
- ldr r0, _0807B6D0 @ =sub_807B6D4
+ ldr r0, _0807B6D0 @ =task50_0807B6D4
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
-_0807B6D0: .4byte sub_807B6D4
+_0807B6D0: .4byte task50_0807B6D4
thumb_func_end sub_807B6C0
- thumb_func_start sub_807B6D4
-sub_807B6D4: @ 807B6D4
+ thumb_func_start task50_0807B6D4
+task50_0807B6D4: @ 807B6D4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -572,17 +572,17 @@ _0807B714:
strh r0, [r4, 0xA]
strh r0, [r4, 0xC]
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xE]
ldr r1, _0807B764 @ =0x00003f3f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0x9E
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -599,7 +599,7 @@ _0807B740:
_0807B752:
ldrh r1, [r4, 0xA]
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA
ldrsh r0, [r4, r1]
cmp r0, 0xF
@@ -630,32 +630,32 @@ _0807B768:
_0807B78E:
ldrh r1, [r4, 0xA]
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
b _0807B7C2
_0807B798:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
_0807B7B0:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _0807B7C2
_0807B7B8:
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0807B7C2:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_807B6D4
+ thumb_func_end task50_0807B6D4
thumb_func_start sub_807B7C8
sub_807B7C8: @ 807B7C8
@@ -932,7 +932,7 @@ _0807B964:
strh r0, [r7, 0x34]
adds r0, r7, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r3, r8
strh r3, [r7, 0x36]
adds r2, r7, 0
@@ -1045,7 +1045,7 @@ _0807BAAE:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x1
strh r0, [r5, 0x36]
ldr r1, _0807BAF8 @ =gUnknown_2021BC8
@@ -1211,7 +1211,7 @@ _0807BBFC:
sub_807BC08: @ 807BC08
push {lr}
ldr r0, _0807BC14 @ =gUnknown_83C66CC
- bl sub_80086DC
+ bl LoadSpriteSheet
pop {r0}
bx r0
.align 2, 0
@@ -1244,7 +1244,7 @@ _0807BC32:
movs r3, 0x2
ldrsh r2, [r2, r3]
movs r3, 0x4E
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -1469,7 +1469,7 @@ _0807BDF0:
ldr r0, [r0]
cmp r0, 0
beq _0807BDFE
- bl sub_8007280
+ bl DestroySprite
_0807BDFE:
adds r0, r4, 0x1
lsls r0, 16
@@ -1484,7 +1484,7 @@ _0807BE0A:
movs r1, 0
strb r1, [r0]
ldr r0, _0807BE28 @ =0x00001206
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r4-r7}
pop {r0}
bx r0
@@ -1550,7 +1550,7 @@ sub_807BE7C: @ 807BE7C
mov r8, r2
adds r7, r1, r3
_0807BE98:
- bl sub_807BEE8
+ bl snowflakes_progress2
movs r4, 0
mov r1, r8
ldr r0, [r1]
@@ -1591,8 +1591,8 @@ _0807BEE0: .4byte 0x000006d2
_0807BEE4: .4byte 0x000006e4
thumb_func_end sub_807BE7C
- thumb_func_start sub_807BEE8
-sub_807BEE8: @ 807BEE8
+ thumb_func_start snowflakes_progress2
+snowflakes_progress2: @ 807BEE8
push {r4,r5,lr}
ldr r0, _0807BF18 @ =gUnknown_83C2BBC
ldr r5, [r0]
@@ -1601,7 +1601,7 @@ sub_807BEE8: @ 807BEE8
ldrh r0, [r4]
cmp r0, 0
bne _0807BF10
- bl sub_807BF88
+ bl snowflakes_progress
lsls r0, 24
cmp r0, 0
bne _0807BF10
@@ -1620,7 +1620,7 @@ _0807BF10:
_0807BF18: .4byte gUnknown_83C2BBC
_0807BF1C: .4byte 0x000006cc
_0807BF20: .4byte 0x000006d2
- thumb_func_end sub_807BEE8
+ thumb_func_end snowflakes_progress2
thumb_func_start sub_807BF24
sub_807BF24: @ 807BF24
@@ -1650,7 +1650,7 @@ _0807BF44:
adds r0, 0x1
strh r0, [r3]
_0807BF56:
- bl sub_807BF88
+ bl snowflakes_progress
lsls r0, 24
cmp r0, 0
bne _0807BF80
@@ -1675,8 +1675,8 @@ _0807BF82:
bx r1
thumb_func_end sub_807BF24
- thumb_func_start sub_807BF88
-sub_807BF88: @ 807BF88
+ thumb_func_start snowflakes_progress
+snowflakes_progress: @ 807BF88
push {r4,lr}
ldr r0, _0807BFA4 @ =gUnknown_83C2BBC
ldr r1, [r0]
@@ -1711,10 +1711,10 @@ _0807BFB0:
ldrb r2, [r2]
cmp r0, r2
bcs _0807BFD6
- bl sub_807C004
+ bl snowflake_add
b _0807BFDA
_0807BFD6:
- bl sub_807C070
+ bl snowflake_remove
_0807BFDA:
ldr r0, _0807BFF8 @ =gUnknown_83C2BBC
ldr r0, [r0]
@@ -1736,16 +1736,16 @@ _0807BFF2:
_0807BFF8: .4byte gUnknown_83C2BBC
_0807BFFC: .4byte 0x000006e4
_0807C000: .4byte 0x000006e5
- thumb_func_end sub_807BF88
+ thumb_func_end snowflakes_progress
- thumb_func_start sub_807C004
-sub_807C004: @ 807C004
+ thumb_func_start snowflake_add
+snowflake_add: @ 807C004
push {r4-r6,lr}
ldr r0, _0807C058 @ =gUnknown_83C6704
movs r1, 0
movs r2, 0
movs r3, 0x4E
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1790,10 +1790,10 @@ _0807C06A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_807C004
+ thumb_func_end snowflake_add
- thumb_func_start sub_807C070
-sub_807C070: @ 807C070
+ thumb_func_start snowflake_remove
+snowflake_remove: @ 807C070
push {lr}
ldr r0, _0807C084 @ =gUnknown_83C2BBC
ldr r1, [r0]
@@ -1815,18 +1815,18 @@ _0807C08C:
adds r1, 0x60
adds r1, r0
ldr r0, [r1]
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x1
_0807C0A0:
pop {r1}
bx r1
- thumb_func_end sub_807C070
+ thumb_func_end snowflake_remove
thumb_func_start sub_807C0A4
sub_807C0A4: @ 807C0A4
push {r4-r7,lr}
adds r5, r0, 0
- bl sub_8044EC8
+ bl Random
movs r1, 0x36
ldrsh r2, [r5, r1]
lsls r1, r2, 2
@@ -1872,7 +1872,7 @@ sub_807C0A4: @ 807C0A4
lsls r0, 7
strh r0, [r5, 0x2E]
strh r7, [r5, 0x24]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r6, r0, 0
@@ -1886,7 +1886,7 @@ sub_807C0A4: @ 807C0A4
movs r1, 0x1
bics r1, r6
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
strh r7, [r5, 0x34]
movs r0, 0x1
cmp r4, 0
@@ -2389,7 +2389,7 @@ _0807C520:
adds r1, r4, r2
movs r0, 0x1
strb r0, [r1]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r5, 0xB4
@@ -2435,7 +2435,7 @@ _0807C580:
adds r0, r4, r1
movs r5, 0x1
strb r5, [r0]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
ands r0, r5
@@ -2448,7 +2448,7 @@ _0807C5A0: .4byte gUnknown_83C2BBC
_0807C5A4: .4byte 0x000006ea
_0807C5A8: .4byte 0x000006eb
_0807C5AC:
- bl sub_8044EC8
+ bl Random
ldr r1, _0807C614 @ =gUnknown_83C2BBC
ldr r2, [r1]
movs r1, 0x1
@@ -2480,7 +2480,7 @@ _0807C5CA:
movs r0, 0x14
bl sub_807C85C
_0807C5EE:
- bl sub_8044EC8
+ bl Random
ldr r1, _0807C614 @ =gUnknown_83C2BBC
ldr r4, [r1]
lsls r0, 16
@@ -2531,7 +2531,7 @@ _0807C63E:
lsls r0, 24
cmp r0, 0
beq _0807C688
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -2587,7 +2587,7 @@ _0807C6C8: .4byte gUnknown_83C2BBC
_0807C6CC: .4byte 0x000006e6
_0807C6D0: .4byte 0x000006cc
_0807C6D4:
- bl sub_8044EC8
+ bl Random
ldr r1, _0807C6F8 @ =gUnknown_83C2BBC
ldr r2, [r1]
lsls r0, 16
@@ -2623,7 +2623,7 @@ _0807C704:
bl sub_807C85C
movs r0, 0x13
bl sub_807A790
- bl sub_8044EC8
+ bl Random
movs r1, 0xF
ands r1, r0
adds r1, 0x1E
@@ -2790,7 +2790,7 @@ sub_807C85C: @ 807C85C
ldrb r0, [r5]
cmp r0, 0
bne _0807C88A
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -2826,11 +2826,11 @@ sub_807C898: @ 807C898
ldrh r0, [r1]
cmp r0, 0
bne _0807C8F4
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0807C8F8
- bl sub_8044EC8
+ bl Random
ands r4, r0
cmp r4, 0
beq _0807C8D8
@@ -3179,14 +3179,14 @@ sub_807CB4C: @ 807CB4C
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
movs r5, 0
_0807CB70:
ldr r0, _0807CBCC @ =gUnknown_83C6790
movs r1, 0
movs r2, 0
movs r3, 0xFF
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3272,7 +3272,7 @@ _0807CC1E:
ldr r0, [r0]
cmp r0, 0
beq _0807CC2C
- bl sub_8007280
+ bl DestroySprite
_0807CC2C:
adds r0, r4, 0x1
lsls r0, 16
@@ -3280,7 +3280,7 @@ _0807CC2C:
cmp r4, 0x13
bls _0807CC1E
ldr r0, _0807CC58 @ =0x00001201
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0807CC50 @ =gUnknown_83C2BBC
ldr r0, [r0]
ldr r1, _0807CC54 @ =0x000006fb
@@ -3332,7 +3332,7 @@ sub_807CC5C: @ 807CC5C
movs r1, 0xFD
lsls r1, 6
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_0807CCA4:
pop {r0}
bx r0
@@ -3499,7 +3499,7 @@ _0807CDD8:
_0807CDE0:
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -3518,7 +3518,7 @@ _0807CDF4:
sub_807CDFC: @ 807CDFC
push {lr}
ldr r0, _0807CE08 @ =gUnknown_83C67B0
- bl sub_80086DC
+ bl LoadSpriteSheet
pop {r0}
bx r0
.align 2, 0
@@ -3542,7 +3542,7 @@ _0807CE20:
movs r1, 0
movs r2, 0
movs r3, 0x4E
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3630,7 +3630,7 @@ _0807CECC:
ldr r0, [r0]
cmp r0, 0
beq _0807CEDA
- bl sub_8007280
+ bl DestroySprite
_0807CEDA:
adds r0, r4, 0x1
lsls r0, 16
@@ -3638,7 +3638,7 @@ _0807CEDA:
cmp r4, 0x13
bls _0807CECC
ldr r0, _0807CF04 @ =0x00001202
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0807CF00 @ =gUnknown_83C2BBC
ldr r0, [r0]
movs r1, 0xE0
@@ -4007,7 +4007,7 @@ sub_807D190: @ 807D190
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
movs r6, 0
_0807D1B4:
adds r0, r6, 0
@@ -4019,7 +4019,7 @@ _0807D1B4:
ldr r0, _0807D208 @ =gUnknown_83C6804
movs r1, 0
movs r3, 0xFF
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -4100,7 +4100,7 @@ _0807D260:
ldr r0, [r0]
cmp r0, 0
beq _0807D26E
- bl sub_8007280
+ bl DestroySprite
_0807D26E:
adds r0, r4, 0x1
lsls r0, 16
@@ -4108,7 +4108,7 @@ _0807D26E:
cmp r4, 0x13
bls _0807D260
ldr r0, _0807D298 @ =0x00001203
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0807D290 @ =gUnknown_83C2BBC
ldr r0, [r0]
ldr r1, _0807D294 @ =0x00000724
@@ -4492,7 +4492,7 @@ _0807D55C:
ldr r0, [r0]
cmp r0, 0
beq _0807D56A
- bl sub_8007280
+ bl DestroySprite
_0807D56A:
adds r0, r4, 0x1
lsls r0, 16
@@ -4506,7 +4506,7 @@ _0807D56A:
movs r1, 0
strb r1, [r0]
ldr r0, _0807D5D0 @ =0x00001204
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_0807D586:
ldr r0, _0807D5C8 @ =gUnknown_83C2BBC
ldr r1, [r0]
@@ -4525,7 +4525,7 @@ _0807D59C:
ldr r0, [r0]
cmp r0, 0
beq _0807D5AA
- bl sub_8007280
+ bl DestroySprite
_0807D5AA:
adds r0, r4, 0x1
lsls r0, 16
@@ -4561,7 +4561,7 @@ sub_807D5D8: @ 807D5D8
cmp r0, 0
bne _0807D686
ldr r0, _0807D650 @ =gUnknown_83C6854
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _0807D654 @ =gUnknown_83C2D20
bl sub_807ABC0
movs r7, 0
@@ -4575,7 +4575,7 @@ _0807D5F8:
ldr r0, _0807D658 @ =gUnknown_83C683C
movs r1, 0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -4670,7 +4670,7 @@ _0807D6B8:
ldr r0, _0807D748 @ =gUnknown_83C683C
movs r2, 0xD0
movs r3, 0x1
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -4713,12 +4713,12 @@ _0807D6B8:
strh r0, [r1, 0x34]
ldr r0, [r4]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
movs r1, 0
movs r2, 0x2
movs r3, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
ldr r1, [r4]
ldr r0, _0807D758 @ =sub_807D7F8
str r0, [r1, 0x1C]
@@ -4955,7 +4955,7 @@ sub_807D8D4: @ 807D8D4
cmp r5, 0
bne _0807D90C
ldr r0, _0807D91C @ =gUnknown_83C6870
- bl sub_80086DC
+ bl LoadSpriteSheet
movs r2, 0xE5
lsls r2, 3
adds r0, r4, r2
@@ -5102,7 +5102,7 @@ sub_807D9E8: @ 807D9E8
lsls r2, 16
asrs r2, 16
movs r3, 0
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -5166,7 +5166,7 @@ _0807DA76:
cmp r1, r0
bne _0807DA90
adds r0, r2, r5
- bl sub_8007280
+ bl DestroySprite
_0807DA90:
adds r0, r4, 0x1
lsls r0, 16
@@ -5174,7 +5174,7 @@ _0807DA90:
cmp r4, 0x3F
bls _0807DA76
ldr r0, _0807DAB0 @ =0x00001205
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r4,r5}
pop {r0}
bx r0
@@ -5231,7 +5231,7 @@ _0807DAF4:
cmp r0, 0x77
ble _0807DB0E
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
_0807DB0E:
pop {r0}
bx r0
diff --git a/asm/fieldmap.s b/asm/fieldmap.s
index cb96948e3..d0339c4d2 100644
--- a/asm/fieldmap.s
+++ b/asm/fieldmap.s
@@ -11,7 +11,7 @@ sub_80589C4: @ 80589C4
ldrb r2, [r0, 0x8]
ldrb r1, [r0, 0x9]
adds r0, r2, 0
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
pop {r1}
bx r1
thumb_func_end sub_80589C4
@@ -21,7 +21,7 @@ sub_80589D4: @ 80589D4
push {lr}
ldr r0, _080589E4 @ =gUnknown_2036DFC
bl sub_8058A00
- bl sub_8069C38
+ bl mapheader_run_script_with_tag_x1
pop {r0}
bx r0
.align 2, 0
@@ -34,7 +34,7 @@ sub_80589E8: @ 80589E8
ldr r0, _080589FC @ =gUnknown_2036DFC
bl sub_8058A00
bl sub_80591C4
- bl sub_8069C38
+ bl mapheader_run_script_with_tag_x1
pop {r0}
bx r0
.align 2, 0
@@ -76,9 +76,9 @@ _08058A3E:
ldr r0, [r5, 0xC]
ldrh r1, [r5]
ldrh r2, [r5, 0x4]
- bl sub_8058A70
+ bl map_copy_with_padding
adds r0, r6, 0
- bl sub_8058AC8
+ bl mapheader_copy_mapdata_of_adjacent_maps
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -92,8 +92,8 @@ _08058A68: .4byte gUnknown_8352F18
_08058A6C: .4byte gUnknown_8352F4C
thumb_func_end sub_8058A00
- thumb_func_start sub_8058A70
-sub_8058A70: @ 8058A70
+ thumb_func_start map_copy_with_padding
+map_copy_with_padding: @ 8058A70
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -139,10 +139,10 @@ _08058AB8:
bx r0
.align 2, 0
_08058AC4: .4byte gUnknown_3005040
- thumb_func_end sub_8058A70
+ thumb_func_end map_copy_with_padding
- thumb_func_start sub_8058AC8
-sub_8058AC8: @ 8058AC8
+ thumb_func_start mapheader_copy_mapdata_of_adjacent_maps
+mapheader_copy_mapdata_of_adjacent_maps: @ 8058AC8
push {r4-r7,lr}
adds r6, r0, 0
ldr r2, _08058B00 @ =gUnknown_2036E24
@@ -215,7 +215,7 @@ _08058B4C:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8058AC8
+ thumb_func_end mapheader_copy_mapdata_of_adjacent_maps
thumb_func_start sub_8058B54
sub_8058B54: @ 8058B54
@@ -492,8 +492,8 @@ _08058D38:
_08058D40: .4byte gUnknown_3005040
thumb_func_end sub_8058CE0
- thumb_func_start sub_8058D44
-sub_8058D44: @ 8058D44
+ thumb_func_start MapGridGetZCoordAt
+MapGridGetZCoordAt: @ 8058D44
push {r4-r7,lr}
adds r2, r0, 0
adds r7, r1, 0
@@ -558,7 +558,7 @@ _08058DBE:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8058D44
+ thumb_func_end MapGridGetZCoordAt
thumb_func_start sub_8058DC4
sub_8058DC4: @ 8058DC4
@@ -1450,8 +1450,8 @@ _08059432:
bx r1
thumb_func_end sub_8059334
- thumb_func_start sub_805943C
-sub_805943C: @ 805943C
+ thumb_func_start GetPostCameraMoveMapBorderId
+GetPostCameraMoveMapBorderId: @ 805943C
push {r4,lr}
adds r3, r1, 0
ldr r1, _08059460 @ =gUnknown_3005008
@@ -1471,10 +1471,10 @@ sub_805943C: @ 805943C
bx r1
.align 2, 0
_08059460: .4byte gUnknown_3005008
- thumb_func_end sub_805943C
+ thumb_func_end GetPostCameraMoveMapBorderId
- thumb_func_start sub_8059464
-sub_8059464: @ 8059464
+ thumb_func_start CanCameraMoveInDirection
+CanCameraMoveInDirection: @ 8059464
push {r4,r5,lr}
ldr r1, _0805949C @ =gUnknown_3005008
ldr r4, [r1]
@@ -1510,7 +1510,7 @@ _080594A6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8059464
+ thumb_func_end CanCameraMoveInDirection
thumb_func_start sub_80594AC
sub_80594AC: @ 80594AC
@@ -1585,8 +1585,8 @@ _08059526:
_0805952C: .4byte gUnknown_3005008
thumb_func_end sub_80594AC
- thumb_func_start sub_8059530
-sub_8059530: @ 8059530
+ thumb_func_start CameraMove
+CameraMove: @ 8059530
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1603,7 +1603,7 @@ sub_8059530: @ 8059530
strb r1, [r2]
mov r0, r10
mov r1, r9
- bl sub_805943C
+ bl GetPostCameraMoveMapBorderId
adds r7, r0, 0
adds r0, r7, 0x1
cmp r0, 0x1
@@ -1684,7 +1684,7 @@ _080595E2:
.align 2, 0
_080595F8: .4byte gUnknown_3005008
_080595FC: .4byte gUnknown_2036E18
- thumb_func_end sub_8059530
+ thumb_func_end CameraMove
thumb_func_start sub_8059600
sub_8059600: @ 8059600
@@ -1988,8 +1988,8 @@ sub_80597EC: @ 80597EC
_08059804: .4byte gUnknown_3005008
thumb_func_end sub_80597EC
- thumb_func_start sub_8059808
-sub_8059808: @ 8059808
+ thumb_func_start sav1_camera_get_focus_coords
+sav1_camera_get_focus_coords: @ 8059808
ldr r2, _0805981C @ =gUnknown_3005008
ldr r3, [r2]
ldrh r2, [r3]
@@ -2001,10 +2001,10 @@ sub_8059808: @ 8059808
bx lr
.align 2, 0
_0805981C: .4byte gUnknown_3005008
- thumb_func_end sub_8059808
+ thumb_func_end sav1_camera_get_focus_coords
- thumb_func_start sub_8059820
-sub_8059820: @ 8059820
+ thumb_func_start SetCameraCoords
+SetCameraCoords: @ 8059820
ldr r2, _0805982C @ =gUnknown_3005008
ldr r2, [r2]
strh r0, [r2]
@@ -2012,10 +2012,10 @@ sub_8059820: @ 8059820
bx lr
.align 2, 0
_0805982C: .4byte gUnknown_3005008
- thumb_func_end sub_8059820
+ thumb_func_end SetCameraCoords
- thumb_func_start sub_8059830
-sub_8059830: @ 8059830
+ thumb_func_start GetCameraCoords
+GetCameraCoords: @ 8059830
ldr r2, _08059840 @ =gUnknown_3005008
ldr r3, [r2]
ldrh r2, [r3]
@@ -2025,7 +2025,7 @@ sub_8059830: @ 8059830
bx lr
.align 2, 0
_08059840: .4byte gUnknown_3005008
- thumb_func_end sub_8059830
+ thumb_func_end GetCameraCoords
thumb_func_start sub_8059844
sub_8059844: @ 8059844
@@ -2048,7 +2048,7 @@ sub_8059844: @ 8059844
lsrs r2, 16
movs r0, 0x2
adds r3, r5, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _08059880
_08059870:
ldr r1, [r3, 0x4]
@@ -2086,7 +2086,7 @@ sub_8059888: @ 8059888
lsrs r2, 16
movs r0, 0x2
adds r3, r5, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _080598C4
_080598B4:
ldr r1, [r3, 0x4]
@@ -2128,7 +2128,7 @@ _080598F0:
ldr r0, _08059900 @ =gUnknown_20371F8
adds r0, r4, r0
adds r1, r5, 0
- bl sub_8071544
+ bl TintPalette_GrayScale
b _0805992C
.align 2, 0
_08059900: .4byte gUnknown_20371F8
@@ -2137,7 +2137,7 @@ _08059904:
ldr r0, _08059914 @ =gUnknown_20371F8
adds r0, r4, r0
adds r1, r5, 0
- bl sub_80715F4
+ bl TintPalette_SepiaTone
b _0805992C
.align 2, 0
_08059914: .4byte gUnknown_20371F8
@@ -2149,7 +2149,7 @@ _08059918:
ldr r0, _08059940 @ =gUnknown_20371F8
adds r0, r4, r0
adds r1, r5, 0
- bl sub_8071544
+ bl TintPalette_GrayScale
_0805992C:
ldr r0, _08059940 @ =gUnknown_20371F8
adds r0, r4, r0
@@ -2191,7 +2191,7 @@ _0805996C:
ldr r0, _0805997C @ =gUnknown_20371F8
adds r0, r4, r0
lsls r1, r6, 4
- bl sub_8071544
+ bl TintPalette_GrayScale
b _080599AA
.align 2, 0
_0805997C: .4byte gUnknown_20371F8
@@ -2200,7 +2200,7 @@ _08059980:
ldr r0, _08059990 @ =gUnknown_20371F8
adds r0, r4, r0
lsls r1, r6, 4
- bl sub_80715F4
+ bl TintPalette_SepiaTone
b _080599AA
.align 2, 0
_08059990: .4byte gUnknown_20371F8
@@ -2213,7 +2213,7 @@ _08059994:
ldr r0, _080599C0 @ =gUnknown_20371F8
adds r0, r4, r0
adds r1, r5, 0
- bl sub_8071544
+ bl TintPalette_GrayScale
_080599AA:
ldr r0, _080599C0 @ =gUnknown_20371F8
adds r0, r4, r0
@@ -2230,8 +2230,8 @@ _080599C0: .4byte gUnknown_20371F8
_080599C4: .4byte gUnknown_20375F8
thumb_func_end sub_8059948
- thumb_func_start sub_80599C8
-sub_80599C8: @ 80599C8
+ thumb_func_start apply_map_tileset_palette
+apply_map_tileset_palette: @ 80599C8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2254,7 +2254,7 @@ sub_80599C8: @ 80599C8
mov r0, sp
adds r1, r5, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r0, [r4, 0x8]
adds r0, 0x2
adds r5, 0x1
@@ -2264,7 +2264,7 @@ sub_80599C8: @ 80599C8
lsls r2, r4, 16
lsrs r2, 16
adds r1, r5, 0
- bl sub_80703EC
+ bl LoadPalette
lsls r4, 15
lsrs r4, 16
adds r0, r5, 0
@@ -2278,7 +2278,7 @@ _08059A1C:
adds r0, 0xE0
adds r1, r5, 0
adds r2, r7, 0
- bl sub_80703EC
+ bl LoadPalette
lsrs r1, r6, 17
adds r0, r5, 0
bl sub_80598CC
@@ -2286,7 +2286,7 @@ _08059A1C:
_08059A36:
ldr r0, [r4, 0x8]
mov r1, r8
- bl sub_80703A8
+ bl LoadCompressedPalette
lsrs r1, r6, 17
mov r0, r8
bl sub_80598CC
@@ -2297,7 +2297,7 @@ _08059A46:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80599C8
+ thumb_func_end apply_map_tileset_palette
thumb_func_start sub_8059A54
sub_8059A54: @ 8059A54
@@ -2324,8 +2324,8 @@ sub_8059A68: @ 8059A68
bx r0
thumb_func_end sub_8059A68
- thumb_func_start sub_8059A7C
-sub_8059A7C: @ 8059A7C
+ thumb_func_start copy_map_tileset2_to_vram_2
+copy_map_tileset2_to_vram_2: @ 8059A7C
push {lr}
ldr r0, [r0, 0x14]
movs r1, 0xC0
@@ -2335,7 +2335,7 @@ sub_8059A7C: @ 8059A7C
bl sub_8059888
pop {r0}
bx r0
- thumb_func_end sub_8059A7C
+ thumb_func_end copy_map_tileset2_to_vram_2
thumb_func_start sub_8059A90
sub_8059A90: @ 8059A90
@@ -2343,7 +2343,7 @@ sub_8059A90: @ 8059A90
ldr r0, [r0, 0x10]
movs r1, 0
movs r2, 0xE0
- bl sub_80599C8
+ bl apply_map_tileset_palette
pop {r0}
bx r0
thumb_func_end sub_8059A90
@@ -2354,13 +2354,13 @@ sub_8059AA0: @ 8059AA0
ldr r0, [r0, 0x14]
movs r1, 0x70
movs r2, 0xC0
- bl sub_80599C8
+ bl apply_map_tileset_palette
pop {r0}
bx r0
thumb_func_end sub_8059AA0
- thumb_func_start sub_8059AB0
-sub_8059AB0: @ 8059AB0
+ thumb_func_start copy_map_tileset1_tileset2_to_vram
+copy_map_tileset1_tileset2_to_vram: @ 8059AB0
push {r4,r5,lr}
adds r5, r0, 0
cmp r5, 0
@@ -2380,10 +2380,10 @@ _08059AD2:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8059AB0
+ thumb_func_end copy_map_tileset1_tileset2_to_vram
- thumb_func_start sub_8059AD8
-sub_8059AD8: @ 8059AD8
+ thumb_func_start apply_map_tileset1_tileset2_palette
+apply_map_tileset1_tileset2_palette: @ 8059AD8
push {r4,lr}
adds r4, r0, 0
cmp r4, 0
@@ -2395,6 +2395,6 @@ _08059AEA:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8059AD8
+ thumb_func_end apply_map_tileset1_tileset2_palette
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index a5dc8c9c6..17ce9ad6d 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -39,13 +39,13 @@ sub_8097898: @ 8097898
cmp r0, 0x1
beq _080978E0
movs r0, 0x5F
- bl sub_80C97A8
+ bl npc_before_player_of_type
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08097904
ldr r1, _080978D0 @ =gUnknown_3005024
- ldr r0, _080978D4 @ =sub_81248B0
+ ldr r0, _080978D4 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080978D8 @ =gUnknown_203B0C4
ldr r0, _080978DC @ =sub_80979D0
@@ -53,14 +53,14 @@ sub_8097898: @ 8097898
.align 2, 0
_080978CC: .4byte gUnknown_2039874
_080978D0: .4byte gUnknown_3005024
-_080978D4: .4byte sub_81248B0
+_080978D4: .4byte hm_add_c3_launch_phase_2
_080978D8: .4byte gUnknown_203B0C4
_080978DC: .4byte sub_80979D0
_080978E0:
strb r0, [r4]
_080978E2:
ldr r1, _080978F4 @ =gUnknown_3005024
- ldr r0, _080978F8 @ =sub_81248B0
+ ldr r0, _080978F8 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080978FC @ =gUnknown_203B0C4
ldr r0, _08097900 @ =sub_8097984
@@ -70,14 +70,14 @@ _080978EC:
b _08097970
.align 2, 0
_080978F4: .4byte gUnknown_3005024
-_080978F8: .4byte sub_81248B0
+_080978F8: .4byte hm_add_c3_launch_phase_2
_080978FC: .4byte gUnknown_203B0C4
_08097900: .4byte sub_8097984
_08097904:
ldr r4, _0809797C @ =gUnknown_2039A04
adds r1, r4, 0x2
adds r0, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r7, 0
adds r2, r4, 0
ldr r0, _08097980 @ =0x0000ffff
@@ -100,7 +100,7 @@ _08097924:
adds r0, r4, 0
adds r1, r5, 0
str r2, [sp]
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
ldr r2, [sp]
@@ -144,7 +144,7 @@ _08097980: .4byte 0x0000ffff
sub_8097984: @ 8097984
push {lr}
movs r0, 0x1
- bl sub_8083444
+ bl FieldEffectStart
bl sub_811FB0C
ldr r1, _0809799C @ =gUnknown_20386E0
lsls r0, 24
@@ -159,7 +159,7 @@ _0809799C: .4byte gUnknown_20386E0
thumb_func_start sub_80979A0
sub_80979A0: @ 80979A0
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080979C8 @ =gUnknown_3005090
@@ -190,7 +190,7 @@ sub_80979D0: @ 80979D0
lsrs r0, 24
str r0, [r1]
ldr r0, _080979EC @ =gUnknown_81BDF6B
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -201,7 +201,7 @@ _080979EC: .4byte gUnknown_81BDF6B
thumb_func_start sub_80979F0
sub_80979F0: @ 80979F0
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _08097A18 @ =gUnknown_3005090
@@ -227,7 +227,7 @@ _08097A1C: .4byte sub_8097C6C
sub_8097A20: @ 8097A20
push {lr}
movs r0, 0x1
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _08097A38 @ =gUnknown_2039874
ldrb r0, [r0]
cmp r0, 0x1
@@ -238,7 +238,7 @@ sub_8097A20: @ 8097A20
_08097A38: .4byte gUnknown_2039874
_08097A3C:
movs r0, 0x3A
- bl sub_8083444
+ bl FieldEffectStart
_08097A42:
pop {r0}
bx r0
@@ -256,7 +256,7 @@ sub_8097A48: @ 8097A48
ldr r4, _08097B38 @ =gUnknown_2039A04
adds r1, r4, 0x2
adds r0, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r8, r4
ldr r0, _08097B3C @ =0x0000ffff
mov r9, r0
@@ -279,7 +279,7 @@ _08097A78:
asrs r4, r0, 16
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8058D44
+ bl MapGridGetZCoordAt
lsls r0, 24
lsrs r0, 24
mov r2, r8
@@ -311,10 +311,10 @@ _08097ABC:
lsrs r7, r0, 24
cmp r7, 0x2
bls _08097A68
- bl sub_805A684
+ bl DrawWholeMapView
ldr r4, _08097B40 @ =gUnknown_2039870
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
movs r7, 0
ldr r5, _08097B44 @ =gUnknown_202063C
@@ -336,7 +336,7 @@ _08097AE2:
adds r2, 0x14
ldr r0, _08097B4C @ =gUnknown_83D414C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, r7
strb r0, [r1]
@@ -439,13 +439,13 @@ sub_8097BBC: @ 8097BBC
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r4, 0x24]
movs r1, 0x32
ldrsh r0, [r4, r1]
movs r2, 0x2E
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
strh r0, [r4, 0x26]
ldrh r0, [r4, 0x32]
adds r0, 0x8
@@ -494,7 +494,7 @@ _08097C1C:
lsls r0, 2
ldr r5, _08097C68 @ =gUnknown_202063C
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -507,11 +507,11 @@ _08097C1C:
lsls r0, 2
adds r0, r5
movs r1, 0x3A
- bl sub_80836D8
+ bl FieldEffectStop
ldr r0, [r6]
- bl sub_8002BC4
+ bl Free
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
pop {r4-r6}
pop {r0}
bx r0
@@ -526,8 +526,8 @@ sub_8097C6C: @ 8097C6C
movs r0, 0x79
bl sub_80722CC
movs r0, 0x2
- bl sub_80837FC
- bl sub_8069B34
+ bl FieldEffectActiveListRemove
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_8097C6C
diff --git a/asm/fldeff_flash.s b/asm/fldeff_flash.s
index f0e3451eb..272f9c173 100644
--- a/asm/fldeff_flash.s
+++ b/asm/fldeff_flash.s
@@ -18,7 +18,7 @@ sub_80C9B2C: @ 80C9B2C
cmp r0, 0
bne _080C9B6C
ldr r1, _080C9B5C @ =gUnknown_3005024
- ldr r0, _080C9B60 @ =sub_81248B0
+ ldr r0, _080C9B60 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080C9B64 @ =gUnknown_203B0C4
ldr r0, _080C9B68 @ =sub_80C9B74
@@ -29,7 +29,7 @@ sub_80C9B2C: @ 80C9B2C
_080C9B54: .4byte gUnknown_2036DFC
_080C9B58: .4byte 0x00000806
_080C9B5C: .4byte gUnknown_3005024
-_080C9B60: .4byte sub_81248B0
+_080C9B60: .4byte hm_add_c3_launch_phase_2
_080C9B64: .4byte gUnknown_203B0C4
_080C9B68: .4byte sub_80C9B74
_080C9B6C:
@@ -42,7 +42,7 @@ _080C9B6E:
thumb_func_start sub_80C9B74
sub_80C9B74: @ 80C9B74
push {r4,lr}
- bl sub_80C97FC
+ bl oei_task_add
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -77,7 +77,7 @@ sub_80C9BB0: @ 80C9BB0
ldr r0, _080C9BC8 @ =0x00000806
bl sub_806E680
ldr r0, _080C9BCC @ =gUnknown_81BFB5F
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -88,10 +88,10 @@ _080C9BCC: .4byte gUnknown_81BFB5F
thumb_func_start sub_80C9BD0
sub_80C9BD0: @ 80C9BD0
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80C9BD0
@@ -99,9 +99,9 @@ sub_80C9BD0: @ 80C9BD0
thumb_func_start sub_80C9BE8
sub_80C9BE8: @ 80C9BE8
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80C9BE8
@@ -111,37 +111,37 @@ sub_80C9BFC: @ 80C9BFC
push {lr}
sub sp, 0x8
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
mov r1, sp
movs r0, 0
strh r0, [r1]
@@ -172,22 +172,22 @@ sub_80C9BFC: @ 80C9BFC
ldr r0, _080C9CD8 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8070528
- bl sub_80773BC
- bl sub_8006B10
+ bl ResetPaletteFade
+ bl ResetTasks
+ bl ResetSpriteData
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _080C9CDC @ =sub_80C9BE8
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080C9CE0 @ =sub_80C9BD0
- bl sub_8000544
+ bl SetMainCallback2
bl sub_80C9CE8
lsls r0, 24
cmp r0, 0
bne _080C9CC2
ldr r0, _080C9CE4 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080C9CC2:
add sp, 0x8
pop {r0}
@@ -206,10 +206,10 @@ _080C9CE4: .4byte gUnknown_30030F0
thumb_func_start sub_80C9CE8
sub_80C9CE8: @ 80C9CE8
push {r4-r7,lr}
- bl sub_80561A0
+ bl get_map_light_from_warp0
lsls r0, 24
lsrs r7, r0, 24
- bl sub_8056188
+ bl sav1_map_get_light_level
lsls r0, 24
lsrs r6, r0, 24
movs r4, 0
@@ -378,7 +378,7 @@ sub_80C9E1C: @ 80C9E1C
push {lr}
ldr r0, _080C9E2C @ =sub_80C9E30
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -410,7 +410,7 @@ sub_80C9E4C: @ 80C9E4C
lsrs r4, 24
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080C9EC8 @ =gUnknown_83F5A44
ldr r1, _080C9ECC @ =0x0600c000
bl LZ77UnCompVram
@@ -420,27 +420,27 @@ sub_80C9E4C: @ 80C9E4C
ldr r0, _080C9ED8 @ =gUnknown_83F5804
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080C9EDC @ =gUnknown_83F5854
movs r1, 0xE0
movs r2, 0x10
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080C9EE0 @ =0x00003e41
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080C9EE4 @ =0x00001f0c
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080C9EE8 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -485,7 +485,7 @@ sub_80C9EF0: @ 80C9EF0
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
cmp r4, 0x10
bhi _080C9F24
ldrh r0, [r5, 0xA]
@@ -515,7 +515,7 @@ sub_80C9F38: @ 80C9F38
lsrs r4, 24
ldr r1, _080C9F74 @ =0x00001010
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080C9F78 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -534,7 +534,7 @@ sub_80C9F38: @ 80C9F38
lsls r2, 16
lsrs r2, 16
movs r1, 0xE0
- bl sub_80703EC
+ bl LoadPalette
b _080C9F92
.align 2, 0
_080C9F74: .4byte 0x00001010
@@ -544,7 +544,7 @@ _080C9F80:
ldr r0, _080C9F98 @ =gUnknown_83F5804
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080C9F9C @ =sub_80C9FA0
str r0, [r4]
movs r0, 0x8
@@ -581,7 +581,7 @@ _080C9FC0: .4byte gUnknown_3005090
_080C9FC4:
ldr r0, _080C9FD0 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080C9FCC:
pop {r0}
bx r0
@@ -594,7 +594,7 @@ sub_80C9FD4: @ 80C9FD4
push {lr}
ldr r0, _080C9FE4 @ =sub_80C9FE8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -626,7 +626,7 @@ sub_80CA004: @ 80CA004
lsrs r4, 24
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080CA080 @ =gUnknown_83F5A44
ldr r1, _080CA084 @ =0x0600c000
bl LZ77UnCompVram
@@ -635,28 +635,28 @@ sub_80CA004: @ 80CA004
bl LZ77UnCompVram
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080CA090 @ =0x00001f0c
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x8A
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080CA094 @ =gUnknown_83F5804
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080CA098 @ =gUnknown_83F5824
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080CA09C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -708,7 +708,7 @@ sub_80CA0A4: @ 80CA0A4
lsls r2, 17
lsrs r2, 16
movs r1, 0xE0
- bl sub_80703EC
+ bl LoadPalette
b _080CA0F4
.align 2, 0
_080CA0D8: .4byte gUnknown_3005090
@@ -716,10 +716,10 @@ _080CA0DC: .4byte gUnknown_83F5844
_080CA0E0:
ldr r1, _080CA0FC @ =0x00001010
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080CA100 @ =0x00003e41
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080CA104 @ =sub_80CA108
str r0, [r4]
_080CA0F4:
@@ -752,7 +752,7 @@ sub_80CA108: @ 80CA108
adds r1, r0
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
cmp r4, 0
beq _080CA140
ldrh r0, [r5, 0xA]
@@ -765,10 +765,10 @@ _080CA140:
ldr r0, _080CA158 @ =gUnknown_83F5824
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080CA15C @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_080CA152:
pop {r4,r5}
pop {r0}
@@ -786,7 +786,7 @@ sub_80CA160: @ 80CA160
lsrs r4, 24
ldr r0, _080CA188 @ =sub_80CA190
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080CA18C @ =gUnknown_3005090
@@ -841,9 +841,9 @@ _080CA1D8:
ldr r2, [r0, 0xC]
adds r0, r5, 0
movs r1, 0x5
- bl sub_80776E8
+ bl SetWordTaskArg
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80F8180
ldrb r0, [r4, 0x6]
bl sub_80F819C
@@ -851,7 +851,7 @@ _080CA1D8:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _080CA294
.align 2, 0
_080CA204: .4byte gUnknown_30030F0
@@ -868,7 +868,7 @@ _080CA208:
bl sub_8003F20
b _080CA294
_080CA224:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -879,14 +879,14 @@ _080CA224:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r5, 0
movs r1, 0x5
- bl sub_8077720
- bl sub_80006F4
+ bl GetWordTaskArg
+ bl SetVBlankCallback
b _080CA294
_080CA24E:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080CA2D2
@@ -919,7 +919,7 @@ _080CA280:
str r2, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080CA294:
ldrh r0, [r4]
adds r0, 0x1
@@ -929,7 +929,7 @@ _080CA294:
_080CA29C: .4byte gUnknown_30030F0
_080CA2A0: .4byte 0x00007fff
_080CA2A4:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080CA2D2
diff --git a/asm/fldeff_poison.s b/asm/fldeff_poison.s
index dcd683f2e..84ebdd730 100644
--- a/asm/fldeff_poison.s
+++ b/asm/fldeff_poison.s
@@ -53,7 +53,7 @@ _080A0E22:
b _080A0E32
_080A0E2A:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
b _080A0E42
_080A0E32:
ldrb r1, [r1, 0x2]
@@ -62,7 +62,7 @@ _080A0E32:
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8001EC0
+ bl Unused_AdjustBgMosaic
_080A0E42:
pop {r0}
bx r0
@@ -75,7 +75,7 @@ sub_80A0E48: @ 80A0E48
bl sub_80722CC
ldr r0, _080A0E5C @ =sub_80A0DD8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -86,7 +86,7 @@ _080A0E5C: .4byte sub_80A0DD8
sub_80A0E60: @ 80A0E60
push {lr}
ldr r0, _080A0E70 @ =sub_80A0DD8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
diff --git a/asm/fldeff_softboiled.s b/asm/fldeff_softboiled.s
index d9b75cf57..e7e05b1b4 100644
--- a/asm/fldeff_softboiled.s
+++ b/asm/fldeff_softboiled.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80E5684
-sub_80E5684: @ 80E5684
+ thumb_func_start hm_prepare_dive_probably
+hm_prepare_dive_probably: @ 80E5684
push {r4-r6,lr}
bl sub_811FB0C
lsls r0, 24
@@ -16,7 +16,7 @@ sub_80E5684: @ 80E5684
ldr r4, _080E56D0 @ =gUnknown_2024284
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -26,7 +26,7 @@ sub_80E5684: @ 80E5684
muls r0, r6
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -47,7 +47,7 @@ _080E56D6:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80E5684
+ thumb_func_end hm_prepare_dive_probably
thumb_func_start sub_80E56DC
sub_80E56DC: @ 80E56DC
@@ -126,7 +126,7 @@ _080E5768:
adds r6, r0, r1
adds r0, r6, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -135,7 +135,7 @@ _080E5768:
beq _080E5796
adds r0, r6, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r4
bne _080E57A4
_080E5796:
@@ -152,7 +152,7 @@ _080E57A4:
muls r0, r1
add r0, r9
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
@@ -195,7 +195,7 @@ sub_80E57E8: @ 80E57E8
ldr r1, _080E5834 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x5
bl __udivsi3
adds r3, r0, 0
@@ -231,7 +231,7 @@ sub_80E583C: @ 80E583C
ldr r1, _080E5888 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080E588C @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r4, _080E5890 @ =gUnknown_2021D18
ldr r1, _080E5894 @ =gUnknown_8416F27
adds r0, r4, 0
@@ -240,7 +240,7 @@ sub_80E583C: @ 80E583C
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080E5898 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -286,7 +286,7 @@ sub_80E58A0: @ 80E58A0
movs r1, 0
bl sub_810F4D8
movs r0, 0x6
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
bl sub_8121D0C
ldr r1, _080E58F8 @ =gUnknown_3005090
@@ -346,7 +346,7 @@ sub_80E5934: @ 80E5934
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080E5968 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s
index 167218788..65fbba6fb 100644
--- a/asm/fldeff_strength.s
+++ b/asm/fldeff_strength.s
@@ -9,12 +9,12 @@
sub_80D07EC: @ 80D07EC
push {r4,lr}
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080D0808
movs r0, 0x61
- bl sub_80C97A8
+ bl npc_before_player_of_type
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -29,7 +29,7 @@ _080D080C:
lsrs r0, 24
strh r0, [r4]
ldr r1, _080D0830 @ =gUnknown_3005024
- ldr r0, _080D0834 @ =sub_81248B0
+ ldr r0, _080D0834 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080D0838 @ =gUnknown_203B0C4
ldr r0, _080D083C @ =sub_80D0840
@@ -42,7 +42,7 @@ _080D0826:
.align 2, 0
_080D082C: .4byte gUnknown_20370D0
_080D0830: .4byte gUnknown_3005024
-_080D0834: .4byte sub_81248B0
+_080D0834: .4byte hm_add_c3_launch_phase_2
_080D0838: .4byte gUnknown_203B0C4
_080D083C: .4byte sub_80D0840
thumb_func_end sub_80D07EC
@@ -56,7 +56,7 @@ sub_80D0840: @ 80D0840
lsrs r0, 24
str r0, [r1]
ldr r0, _080D085C @ =gUnknown_81BE16E
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -67,7 +67,7 @@ _080D085C: .4byte gUnknown_81BE16E
thumb_func_start sub_80D0860
sub_80D0860: @ 80D0860
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080D0894 @ =gUnknown_3005090
@@ -86,7 +86,7 @@ sub_80D0860: @ 80D0860
ldr r1, _080D08A0 @ =gUnknown_2024284
adds r0, r1
ldr r1, _080D08A4 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
movs r0, 0
pop {r1}
bx r1
@@ -102,8 +102,8 @@ _080D08A4: .4byte gUnknown_2021CD0
sub_80D08A8: @ 80D08A8
push {lr}
movs r0, 0x28
- bl sub_80837FC
- bl sub_8069B34
+ bl FieldEffectActiveListRemove
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80D08A8
diff --git a/asm/fldeff_sweetscent.s b/asm/fldeff_sweetscent.s
index 9eeda9550..e2de82844 100644
--- a/asm/fldeff_sweetscent.s
+++ b/asm/fldeff_sweetscent.s
@@ -21,7 +21,7 @@ _080DE0C4: .4byte gUnknown_203B0A0
thumb_func_start sub_80DE0C8
sub_80DE0C8: @ 80DE0C8
ldr r1, _080DE0D8 @ =gUnknown_3005024
- ldr r0, _080DE0DC @ =sub_81248B0
+ ldr r0, _080DE0DC @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080DE0E0 @ =gUnknown_203B0C4
ldr r0, _080DE0E4 @ =sub_80DE0E8
@@ -30,7 +30,7 @@ sub_80DE0C8: @ 80DE0C8
bx lr
.align 2, 0
_080DE0D8: .4byte gUnknown_3005024
-_080DE0DC: .4byte sub_81248B0
+_080DE0DC: .4byte hm_add_c3_launch_phase_2
_080DE0E0: .4byte gUnknown_203B0C4
_080DE0E4: .4byte sub_80DE0E8
thumb_func_end sub_80DE0C8
@@ -39,7 +39,7 @@ _080DE0E4: .4byte sub_80DE0E8
sub_80DE0E8: @ 80DE0E8
push {lr}
movs r0, 0x33
- bl sub_8083444
+ bl FieldEffectStart
bl sub_811FB0C
ldr r1, _080DE100 @ =gUnknown_20386E0
lsls r0, 24
@@ -55,7 +55,7 @@ _080DE100: .4byte gUnknown_20386E0
sub_80DE104: @ 80DE104
push {lr}
bl sub_807B05C
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080DE12C @ =gUnknown_3005090
@@ -84,7 +84,7 @@ sub_80DE134: @ 80DE134
ldr r4, _080DE1B8 @ =gUnknown_203AAB0
movs r0, 0x80
lsls r0, 3
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r4, _080DE1BC @ =gUnknown_20371F8
@@ -97,7 +97,7 @@ sub_80DE134: @ 80DE134
adds r1, r4, 0
adds r2, r5, 0
bl CpuFastSet
- bl sub_805C768
+ bl GetPlayerAvatarObjectId
ldr r2, _080DE1C4 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -116,10 +116,10 @@ sub_80DE134: @ 80DE134
movs r1, 0x4
movs r2, 0
movs r3, 0x8
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080DE1C8 @ =sub_80DE1D0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080DE1CC @ =gUnknown_3005090
@@ -130,7 +130,7 @@ sub_80DE134: @ 80DE134
movs r0, 0
strh r0, [r1, 0x8]
movs r0, 0x33
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -176,9 +176,9 @@ sub_80DE1D0: @ 80DE1D0
bne _080DE228
ldr r0, _080DE224 @ =gUnknown_203AAB0
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _080DE26C
.align 2, 0
_080DE21C: .4byte gUnknown_3005098
@@ -190,7 +190,7 @@ _080DE228:
adds r0, r5, r0
ldr r1, _080DE260 @ =sub_80DE274
str r1, [r0]
- bl sub_805C768
+ bl GetPlayerAvatarObjectId
ldr r2, _080DE264 @ =gUnknown_202063C
lsls r0, 24
lsrs r0, 24
@@ -209,7 +209,7 @@ _080DE228:
movs r1, 0x4
movs r2, 0x8
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080DE26C
.align 2, 0
_080DE260: .4byte sub_80DE274
@@ -243,11 +243,11 @@ sub_80DE274: @ 80DE274
bl CpuFastSet
bl sub_807B070
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
ldr r0, _080DE2BC @ =gUnknown_81BE564
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080DE2AA:
pop {r4,r5}
pop {r0}
diff --git a/asm/fldeff_teleport.s b/asm/fldeff_teleport.s
index 4d2577ce1..017904b3c 100644
--- a/asm/fldeff_teleport.s
+++ b/asm/fldeff_teleport.s
@@ -10,7 +10,7 @@ sub_80F66F0: @ 80F66F0
push {lr}
ldr r0, _080F6708 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
- bl sub_80561FC
+ bl is_light_level_1_2_3_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -21,7 +21,7 @@ sub_80F66F0: @ 80F66F0
_080F6708: .4byte gUnknown_2036DFC
_080F670C:
ldr r1, _080F6720 @ =gUnknown_3005024
- ldr r0, _080F6724 @ =sub_81248B0
+ ldr r0, _080F6724 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080F6728 @ =gUnknown_203B0C4
ldr r0, _080F672C @ =sub_80F6730
@@ -32,7 +32,7 @@ _080F671A:
bx r1
.align 2, 0
_080F6720: .4byte gUnknown_3005024
-_080F6724: .4byte sub_81248B0
+_080F6724: .4byte hm_add_c3_launch_phase_2
_080F6728: .4byte gUnknown_203B0C4
_080F672C: .4byte sub_80F6730
thumb_func_end sub_80F66F0
@@ -42,7 +42,7 @@ sub_80F6730: @ 80F6730
push {lr}
bl sub_8054D08
movs r0, 0x3F
- bl sub_8083444
+ bl FieldEffectStart
bl sub_811FB0C
ldr r1, _080F674C @ =gUnknown_20386E0
lsls r0, 24
@@ -57,7 +57,7 @@ _080F674C: .4byte gUnknown_20386E0
thumb_func_start sub_80F6750
sub_80F6750: @ 80F6750
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080F6778 @ =gUnknown_3005090
@@ -83,7 +83,7 @@ _080F677C: .4byte sub_80F6780
sub_80F6780: @ 80F6780
push {lr}
movs r0, 0x3F
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
bl sub_8085B64
pop {r0}
bx r0
diff --git a/asm/gpu_regs.s b/asm/gpu_regs.s
index f92db44f0..833b1ff91 100644
--- a/asm/gpu_regs.s
+++ b/asm/gpu_regs.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8000968
-sub_8000968: @ 8000968
+ thumb_func_start InitGpuRegManager
+InitGpuRegManager: @ 8000968
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -48,10 +48,10 @@ _080009B0: .4byte gUnknown_30000C1
_080009B4: .4byte gUnknown_30000C2
_080009B8: .4byte gUnknown_3000000
_080009BC: .4byte gUnknown_3000060
- thumb_func_end sub_8000968
+ thumb_func_end InitGpuRegManager
- thumb_func_start sub_80009C0
-sub_80009C0: @ 80009C0
+ thumb_func_start CopyBufferedValueToGpuReg
+CopyBufferedValueToGpuReg: @ 80009C0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -85,10 +85,10 @@ _080009FA:
bx r0
.align 2, 0
_08000A00: .4byte gUnknown_3000000
- thumb_func_end sub_80009C0
+ thumb_func_end CopyBufferedValueToGpuReg
- thumb_func_start sub_8000A04
-sub_8000A04: @ 8000A04
+ thumb_func_start CopyBufferedValuesToGpuRegs
+CopyBufferedValuesToGpuRegs: @ 8000A04
push {r4,r5,lr}
ldr r0, _08000A30 @ =gUnknown_30000C0
ldrb r0, [r0]
@@ -101,7 +101,7 @@ _08000A10:
ldrb r0, [r4]
cmp r0, 0xFF
beq _08000A28
- bl sub_80009C0
+ bl CopyBufferedValueToGpuReg
movs r0, 0xFF
strb r0, [r4]
adds r5, 0x1
@@ -114,10 +114,10 @@ _08000A28:
.align 2, 0
_08000A30: .4byte gUnknown_30000C0
_08000A34: .4byte gUnknown_3000060
- thumb_func_end sub_8000A04
+ thumb_func_end CopyBufferedValuesToGpuRegs
- thumb_func_start sub_8000A38
-sub_8000A38: @ 8000A38
+ thumb_func_start SetGpuReg
+SetGpuReg: @ 8000A38
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -146,7 +146,7 @@ sub_8000A38: @ 8000A38
beq _08000A82
_08000A6C:
adds r0, r4, 0
- bl sub_80009C0
+ bl CopyBufferedValueToGpuReg
b _08000AB4
.align 2, 0
_08000A74: .4byte gUnknown_3000000
@@ -190,10 +190,10 @@ _08000AB4:
.align 2, 0
_08000ABC: .4byte gUnknown_30000C0
_08000AC0: .4byte gUnknown_3000060
- thumb_func_end sub_8000A38
+ thumb_func_end SetGpuReg
- thumb_func_start sub_8000AC4
-sub_8000AC4: @ 8000AC4
+ thumb_func_start GetGpuReg
+GetGpuReg: @ 8000AC4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -222,10 +222,10 @@ _08000AEC:
bx r1
.align 2, 0
_08000AF0: .4byte 0x04000006
- thumb_func_end sub_8000AC4
+ thumb_func_end GetGpuReg
- thumb_func_start sub_8000AF4
-sub_8000AF4: @ 8000AF4
+ thumb_func_start SetGpuRegBits
+SetGpuRegBits: @ 8000AF4
push {lr}
adds r2, r1, 0
lsls r0, 24
@@ -236,15 +236,15 @@ sub_8000AF4: @ 8000AF4
orrs r1, r2
lsls r1, 16
lsrs r1, 16
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_08000B10: .4byte gUnknown_3000000
- thumb_func_end sub_8000AF4
+ thumb_func_end SetGpuRegBits
- thumb_func_start sub_8000B14
-sub_8000B14: @ 8000B14
+ thumb_func_start ClearGpuRegBits
+ClearGpuRegBits: @ 8000B14
push {lr}
adds r2, r1, 0
lsls r0, 24
@@ -255,15 +255,15 @@ sub_8000B14: @ 8000B14
ldrh r1, [r1]
lsrs r2, 16
bics r1, r2
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_08000B30: .4byte gUnknown_3000000
- thumb_func_end sub_8000B14
+ thumb_func_end ClearGpuRegBits
- thumb_func_start sub_8000B34
-sub_8000B34: @ 8000B34
+ thumb_func_start SyncRegIE
+SyncRegIE: @ 8000B34
push {r4,r5,lr}
ldr r5, _08000B58 @ =gUnknown_30000C1
ldrb r0, [r5]
@@ -288,10 +288,10 @@ _08000B58: .4byte gUnknown_30000C1
_08000B5C: .4byte 0x04000208
_08000B60: .4byte 0x04000200
_08000B64: .4byte gUnknown_30000C2
- thumb_func_end sub_8000B34
+ thumb_func_end SyncRegIE
- thumb_func_start sub_8000B68
-sub_8000B68: @ 8000B68
+ thumb_func_start EnableInterrupts
+EnableInterrupts: @ 8000B68
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -302,16 +302,16 @@ sub_8000B68: @ 8000B68
ldr r1, _08000B90 @ =gUnknown_30000C1
movs r0, 0x1
strb r0, [r1]
- bl sub_8000B34
+ bl SyncRegIE
ldrh r0, [r4]
- bl sub_8000BC0
+ bl UpdateRegDispstatIntrBits
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08000B8C: .4byte gUnknown_30000C2
_08000B90: .4byte gUnknown_30000C1
- thumb_func_end sub_8000B68
+ thumb_func_end EnableInterrupts
thumb_func_start sub_8000B94
sub_8000B94: @ 8000B94
@@ -325,9 +325,9 @@ sub_8000B94: @ 8000B94
ldr r1, _08000BBC @ =gUnknown_30000C1
movs r0, 0x1
strb r0, [r1]
- bl sub_8000B34
+ bl SyncRegIE
ldrh r0, [r4]
- bl sub_8000BC0
+ bl UpdateRegDispstatIntrBits
pop {r4}
pop {r0}
bx r0
@@ -336,14 +336,14 @@ _08000BB8: .4byte gUnknown_30000C2
_08000BBC: .4byte gUnknown_30000C1
thumb_func_end sub_8000B94
- thumb_func_start sub_8000BC0
-sub_8000BC0: @ 8000BC0
+ thumb_func_start UpdateRegDispstatIntrBits
+UpdateRegDispstatIntrBits: @ 8000BC0
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
movs r0, 0x4
- bl sub_8000AC4
+ bl GetGpuReg
movs r2, 0x18
ands r2, r0
movs r1, 0x1
@@ -363,11 +363,11 @@ _08000BEC:
cmp r2, r1
beq _08000BF6
movs r0, 0x4
- bl sub_8000A38
+ bl SetGpuReg
_08000BF6:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8000BC0
+ thumb_func_end UpdateRegDispstatIntrBits
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index ba09db8df..9d0789136 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -8,9 +8,9 @@
thumb_func_start sub_80F1DAC
sub_80F1DAC: @ 80F1DAC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80F1DAC
@@ -18,11 +18,11 @@ sub_80F1DAC: @ 80F1DAC
thumb_func_start sub_80F1DC0
sub_80F1DC0: @ 80F1DC0
push {lr}
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80F1DC0
@@ -60,11 +60,11 @@ _080F1E18:
movs r0, 0
strb r0, [r1]
movs r0, 0
- bl sub_80006F4
- bl sub_80F3610
+ bl SetVBlankCallback
+ bl ClearVramOamPltt_LoadHofPal
ldr r4, _080F1E44 @ =gUnknown_203AB3C
ldr r0, _080F1E48 @ =0x00002008
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r0, _080F1E4C @ =gUnknown_30030F0
movs r1, 0x87
@@ -84,14 +84,14 @@ _080F1E50:
_080F1E56:
ldr r1, _080F1E80 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE2
lsls r1, 3
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80F36F8
ldr r0, _080F1E84 @ =gUnknown_203AB3C
ldr r1, [r0]
@@ -108,14 +108,14 @@ _080F1E88:
cmp r4, 0
bne _080F1EF0
ldr r0, _080F1EBC @ =sub_80F1DAC
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
negs r0, r0
str r4, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080F1EAA:
ldr r1, _080F1EC0 @ =gUnknown_30030F0
movs r0, 0x87
@@ -129,7 +129,7 @@ _080F1EAA:
_080F1EBC: .4byte sub_80F1DAC
_080F1EC0: .4byte gUnknown_30030F0
_080F1EC4:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _080F1EE8 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -137,10 +137,10 @@ _080F1EC4:
cmp r0, 0
bne _080F1EF0
ldr r0, _080F1EEC @ =sub_80F1DC0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x8F
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
movs r0, 0
b _080F1EF2
.align 2, 0
@@ -165,7 +165,7 @@ sub_80F1EFC: @ 80F1EFC
bne _080F1F2C
ldr r0, _080F1F34 @ =sub_80F1F74
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F1F38 @ =gUnknown_3005090
@@ -176,7 +176,7 @@ sub_80F1EFC: @ 80F1EFC
strh r4, [r1, 0x8]
ldr r4, _080F1F3C @ =gUnknown_203AB38
movs r0, 0x78
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
_080F1F2C:
pop {r4}
@@ -197,7 +197,7 @@ sub_80F1F40: @ 80F1F40
bne _080F1F66
ldr r0, _080F1F6C @ =sub_80F1F74
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080F1F70 @ =gUnknown_3005090
@@ -243,13 +243,13 @@ _080F1F98:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
cmp r5, 0
beq _080F2064
adds r0, r6, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
ldr r3, [r1]
lsls r4, r7, 2
@@ -267,14 +267,14 @@ _080F1F98:
strh r1, [r3, 0x8]
adds r0, r6, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
mov r2, r9
ldr r1, [r2]
adds r1, r4
str r0, [r1]
adds r0, r6, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r5, r9
ldr r1, [r5]
adds r1, 0x4
@@ -282,7 +282,7 @@ _080F1F98:
str r0, [r1]
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r2, [r5]
adds r2, r4
lsls r0, 1
@@ -294,7 +294,7 @@ _080F1F98:
adds r0, r6, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
movs r2, 0
mov r6, r8
lsls r5, r6, 2
@@ -558,7 +558,7 @@ sub_80F2220: @ 80F2220
ldr r0, _080F2258 @ =sub_80F1F40
str r0, [r1]
movs r0, 0x3
- bl sub_80DA364
+ bl TrySavingData
movs r0, 0x30
bl sub_80722CC
ldr r1, _080F225C @ =gUnknown_3005090
@@ -786,7 +786,7 @@ sub_80F23A0: @ 80F23A0
lsls r0, r2, 23
lsrs r0, 23
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_080F23F6:
adds r0, r6, 0
movs r1, 0
@@ -794,7 +794,7 @@ _080F23F6:
bl sub_80F3194
movs r0, 0x78
strh r0, [r5, 0xE]
- ldr r0, _080F2420 @ =sub_80F2424
+ ldr r0, _080F2420 @ =Task_Hof_TryDisplayAnotherMon
str r0, [r5]
_080F2408:
pop {r4-r6}
@@ -805,11 +805,11 @@ _080F2410: .4byte gUnknown_3005090
_080F2414: .4byte gUnknown_203AB38
_080F2418: .4byte gUnknown_202063C
_080F241C: .4byte 0x000001ff
-_080F2420: .4byte sub_80F2424
+_080F2420: .4byte Task_Hof_TryDisplayAnotherMon
thumb_func_end sub_80F23A0
- thumb_func_start sub_80F2424
-sub_80F2424: @ 80F2424
+ thumb_func_start Task_Hof_TryDisplayAnotherMon
+Task_Hof_TryDisplayAnotherMon: @ 80F2424
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -885,7 +885,7 @@ _080F2468:
movs r1, 0
movs r2, 0xC
movs r3, 0xC
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
ldrsh r1, [r6, r0]
lsls r0, r1, 4
@@ -913,7 +913,7 @@ _080F24F4:
adds r0, r5
lsls r0, 3
add r0, r12
- ldr r1, _080F2510 @ =sub_80F2514
+ ldr r1, _080F2510 @ =Task_Hof_PaletteFadeAndPrintWelcomeText
str r1, [r0]
_080F2500:
add sp, 0x4
@@ -924,11 +924,11 @@ _080F2500:
pop {r0}
bx r0
.align 2, 0
-_080F2510: .4byte sub_80F2514
- thumb_func_end sub_80F2424
+_080F2510: .4byte Task_Hof_PaletteFadeAndPrintWelcomeText
+ thumb_func_end Task_Hof_TryDisplayAnotherMon
- thumb_func_start sub_80F2514
-sub_80F2514: @ 80F2514
+ thumb_func_start Task_Hof_PaletteFadeAndPrintWelcomeText
+Task_Hof_PaletteFadeAndPrintWelcomeText: @ 80F2514
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -940,7 +940,7 @@ sub_80F2514: @ 80F2514
str r1, [sp]
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r3, 0
lsls r1, r4, 2
adds r0, r1, r4
@@ -1002,7 +1002,7 @@ _080F25A0: .4byte gUnknown_3005098
_080F25A4: .4byte gUnknown_202063C
_080F25A8: .4byte gUnknown_3005090
_080F25AC: .4byte sub_80F25B0
- thumb_func_end sub_80F2514
+ thumb_func_end Task_Hof_PaletteFadeAndPrintWelcomeText
thumb_func_start sub_80F25B0
sub_80F25B0: @ 80F25B0
@@ -1083,10 +1083,10 @@ _080F2630:
movs r1, 0
movs r2, 0xC
movs r3, 0xC
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -1145,7 +1145,7 @@ _080F26BC:
lsls r1, 24
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_080F26CE:
pop {r0}
bx r0
@@ -1161,13 +1161,13 @@ sub_80F26D4: @ 80F26D4
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080F2748 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -1197,7 +1197,7 @@ sub_80F26D4: @ 80F26D4
bl sub_814FF2C
movs r0, 0x78
strh r0, [r4, 0xE]
- ldr r0, _080F275C @ =sub_80F2760
+ ldr r0, _080F275C @ =Task_Hof_WaitAndPrintPlayerInfo
str r0, [r4]
add sp, 0x8
pop {r4,r5}
@@ -1209,11 +1209,11 @@ _080F274C: .4byte 0x0000ffff
_080F2750: .4byte gUnknown_3005090
_080F2754: .4byte gUnknown_840C234
_080F2758: .4byte 0x0000021d
-_080F275C: .4byte sub_80F2760
+_080F275C: .4byte Task_Hof_WaitAndPrintPlayerInfo
thumb_func_end sub_80F26D4
- thumb_func_start sub_80F2760
-sub_80F2760: @ 80F2760
+ thumb_func_start Task_Hof_WaitAndPrintPlayerInfo
+Task_Hof_WaitAndPrintPlayerInfo: @ 80F2760
push {r4,r5,lr}
sub sp, 0x10
lsls r0, 24
@@ -1259,7 +1259,7 @@ _080F27AC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
movs r1, 0x2
bl sub_80F33DC
@@ -1281,7 +1281,7 @@ _080F27AC:
movs r0, 0
movs r1, 0x3
bl sub_8003F20
- ldr r0, _080F2800 @ =sub_80F2804
+ ldr r0, _080F2800 @ =Task_Hof_ExitOnKeyPressed
str r0, [r4]
_080F27F4:
add sp, 0x10
@@ -1290,11 +1290,11 @@ _080F27F4:
bx r0
.align 2, 0
_080F27FC: .4byte gUnknown_84160C8
-_080F2800: .4byte sub_80F2804
- thumb_func_end sub_80F2760
+_080F2800: .4byte Task_Hof_ExitOnKeyPressed
+ thumb_func_end Task_Hof_WaitAndPrintPlayerInfo
- thumb_func_start sub_80F2804
-sub_80F2804: @ 80F2804
+ thumb_func_start Task_Hof_ExitOnKeyPressed
+Task_Hof_ExitOnKeyPressed: @ 80F2804
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1305,13 +1305,13 @@ sub_80F2804: @ 80F2804
cmp r0, 0
beq _080F282A
movs r0, 0x4
- bl sub_8071DBC
+ bl FadeOutBGM
ldr r0, _080F2834 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
lsls r1, 3
adds r1, r0
- ldr r0, _080F2838 @ =sub_80F283C
+ ldr r0, _080F2838 @ =Task_Hof_HandlePaletteOnExit
str r0, [r1]
_080F282A:
pop {r4}
@@ -1320,11 +1320,11 @@ _080F282A:
.align 2, 0
_080F2830: .4byte gUnknown_30030F0
_080F2834: .4byte gUnknown_3005090
-_080F2838: .4byte sub_80F283C
- thumb_func_end sub_80F2804
+_080F2838: .4byte Task_Hof_HandlePaletteOnExit
+ thumb_func_end Task_Hof_ExitOnKeyPressed
- thumb_func_start sub_80F283C
-sub_80F283C: @ 80F283C
+ thumb_func_start Task_Hof_HandlePaletteOnExit
+Task_Hof_HandlePaletteOnExit: @ 80F283C
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
@@ -1342,13 +1342,13 @@ sub_80F283C: @ 80F283C
movs r1, 0x8
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _080F2884 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
lsls r0, 3
adds r0, r1
- ldr r1, _080F2888 @ =sub_80F288C
+ ldr r1, _080F2888 @ =Task_Hof_HandleExit
str r1, [r0]
add sp, 0x4
pop {r4}
@@ -1358,11 +1358,11 @@ sub_80F283C: @ 80F283C
_080F287C: .4byte gUnknown_20375F8
_080F2880: .4byte gUnknown_20371F8
_080F2884: .4byte gUnknown_3005090
-_080F2888: .4byte sub_80F288C
- thumb_func_end sub_80F283C
+_080F2888: .4byte Task_Hof_HandleExit
+ thumb_func_end Task_Hof_HandlePaletteOnExit
- thumb_func_start sub_80F288C
-sub_80F288C: @ 80F288C
+ thumb_func_start Task_Hof_HandleExit
+Task_Hof_HandleExit: @ 80F288C
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -1396,25 +1396,25 @@ _080F28B6:
ldrh r0, [r1, 0x10]
bl sub_810C2E8
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
bl sub_8003ECC
movs r0, 0x1
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x3
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0
bl sub_8001618
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r4, _080F292C @ =gUnknown_203AB3C
ldr r0, [r4]
cmp r0, 0
beq _080F290A
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080F290A:
@@ -1422,7 +1422,7 @@ _080F290A:
ldr r0, [r4]
cmp r0, 0
beq _080F291A
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080F291A:
@@ -1436,7 +1436,7 @@ _080F2924: .4byte gUnknown_2037AB8
_080F2928: .4byte gUnknown_3005090
_080F292C: .4byte gUnknown_203AB3C
_080F2930: .4byte gUnknown_203AB38
- thumb_func_end sub_80F288C
+ thumb_func_end Task_Hof_HandleExit
thumb_func_start sub_80F2934
sub_80F2934: @ 80F2934
@@ -1458,7 +1458,7 @@ sub_80F2934: @ 80F2934
movs r0, 0x3
movs r1, 0x9
movs r3, 0xB
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_807E438
bl sub_80559E4
add sp, 0x4
@@ -1497,11 +1497,11 @@ _080F299C:
.4byte _080F2A58
_080F29B4:
movs r0, 0
- bl sub_80006F4
- bl sub_80F3610
+ bl SetVBlankCallback
+ bl ClearVramOamPltt_LoadHofPal
ldr r4, _080F29D8 @ =gUnknown_203AB3C
ldr r0, _080F29DC @ =0x00002008
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r0, _080F29E0 @ =gUnknown_30030F0
movs r1, 0x87
@@ -1520,13 +1520,13 @@ _080F29E4:
_080F29EA:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80F36F8
b _080F2A42
_080F2A08:
@@ -1539,15 +1539,15 @@ _080F2A08:
movs r2, 0
bl sub_80A0A48
ldr r0, _080F2A24 @ =sub_80F1DAC
- bl sub_80006F4
+ bl SetVBlankCallback
b _080F2A42
.align 2, 0
_080F2A24: .4byte sub_80F1DAC
_080F2A28:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
bl sub_80A0A98
lsls r0, 24
cmp r0, 0
@@ -1566,24 +1566,24 @@ _080F2A54: .4byte gUnknown_30030F0
_080F2A58:
ldr r1, _080F2A94 @ =0x00003f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE2
lsls r1, 3
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080F2A98 @ =sub_80F2AA4
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r4, _080F2A9C @ =gUnknown_203AB38
movs r0, 0x80
lsls r0, 6
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r0, _080F2AA0 @ =sub_80F1DC0
- bl sub_8000544
+ bl SetMainCallback2
_080F2A8C:
pop {r4}
pop {r0}
@@ -1868,7 +1868,7 @@ _080F2CB4:
ldr r0, _080F2D08 @ =0xffff0000
ldr r2, _080F2D0C @ =0x00007716
movs r1, 0xC
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _080F2D10 @ =gUnknown_2021CD0
ldr r1, _080F2D14 @ =gUnknown_3005090
ldr r4, [sp, 0x14]
@@ -2034,7 +2034,7 @@ _080F2DD0:
str r0, [r2]
ldr r2, _080F2E80 @ =0x00007716
movs r1, 0xC
- bl sub_8071510
+ bl BlendPalettesUnfaded
movs r0, 0xC
ldrsh r1, [r6, r0]
lsls r0, r1, 2
@@ -2048,12 +2048,12 @@ _080F2DD0:
lsls r1, 1
cmp r0, r1
beq _080F2E4A
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldrh r0, [r4, 0x8]
lsls r0, 23
lsrs r0, 23
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_080F2E4A:
adds r0, r4, 0
movs r1, 0
@@ -2146,11 +2146,11 @@ _080F2F00: .4byte gUnknown_30030F0
_080F2F04: .4byte gUnknown_3005090
_080F2F08: .4byte sub_80F2B6C
_080F2F0C:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _080F2F26
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldr r0, _080F2F2C @ =gMPlay_BGM
ldr r1, _080F2F30 @ =0x0000ffff
movs r2, 0x80
@@ -2169,11 +2169,11 @@ _080F2F38:
ands r0, r2
cmp r0, 0
beq _080F2F7C
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
beq _080F2F5A
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldr r0, _080F2F6C @ =gMPlay_BGM
ldr r1, _080F2F70 @ =0x0000ffff
movs r2, 0x80
@@ -2293,33 +2293,33 @@ sub_80F3030: @ 80F3030
cmp r4, 0
bne _080F3094
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
bl sub_810F740
bl sub_8003ECC
movs r0, 0x1
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x3
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0
bl sub_8001618
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r5, _080F309C @ =gUnknown_203AB3C
ldr r0, [r5]
cmp r0, 0
beq _080F3082
- bl sub_8002BC4
+ bl Free
str r4, [r5]
_080F3082:
ldr r5, _080F30A0 @ =gUnknown_203AB38
ldr r0, [r5]
cmp r0, 0
beq _080F3090
- bl sub_8002BC4
+ bl Free
str r4, [r5]
_080F3090:
bl sub_80CA5A0
@@ -2425,9 +2425,9 @@ sub_80F313C: @ 80F313C
lsrs r4, 24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _080F3190 @ =gUnknown_840C23C
str r0, [sp]
movs r0, 0
@@ -2458,9 +2458,9 @@ sub_80F3194: @ 80F3194
adds r7, r0, 0
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r0, [r7, 0x8]
ldr r1, _080F3214 @ =0x000001ff
ands r1, r0
@@ -2471,7 +2471,7 @@ sub_80F3194: @ 80F3194
add r4, sp, 0x1C
ldr r1, _080F3218 @ =gUnknown_84160EC
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrh r0, [r7, 0x8]
lsls r0, 23
lsrs r0, 23
@@ -2524,7 +2524,7 @@ _080F322E:
movs r0, 0xFF
strb r0, [r1, 0x3]
mov r0, r8
- bl sub_8008DA4
+ bl StringAppend
ldr r0, _080F32B8 @ =gUnknown_840C23C
str r0, [sp]
movs r0, 0
@@ -2626,7 +2626,7 @@ _080F32C4:
muls r1, r2
ldr r2, _080F3324 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r6, r0, 0
ldrh r1, [r7, 0x8]
adds r0, r4, 0
@@ -2646,7 +2646,7 @@ _080F3328:
lsls r0, r1, 23
lsrs r0, 23
ldr r1, [r7, 0x4]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -2679,7 +2679,7 @@ _080F3348:
bl sub_812E51C
ldr r1, _080F33D4 @ =gUnknown_84160F4
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
adds r6, r0, 0
ldrb r1, [r7, 0x9]
lsrs r1, 1
@@ -2697,7 +2697,7 @@ _080F3348:
bl sub_812E51C
ldr r1, _080F33D8 @ =gUnknown_8416104
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
adds r6, r0, 0
ldrh r1, [r7]
movs r2, 0x2
@@ -2743,14 +2743,14 @@ sub_80F33DC: @ 80F33DC
str r0, [sp, 0x28]
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r2, _080F35F0 @ =0x0000021d
movs r0, 0x1
movs r1, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
movs r7, 0
str r7, [sp]
str r7, [sp, 0x4]
@@ -2981,8 +2981,8 @@ _080F3608: .4byte 0x00002710
_080F360C: .4byte gUnknown_8415CE8
thumb_func_end sub_80F33DC
- thumb_func_start sub_80F3610
-sub_80F3610: @ 80F3610
+ thumb_func_start ClearVramOamPltt_LoadHofPal
+ClearVramOamPltt_LoadHofPal: @ 80F3610
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3050,11 +3050,11 @@ _080F3636:
orrs r3, r0
str r3, [r2, 0x8]
ldr r0, [r2, 0x8]
- bl sub_8070528
+ bl ResetPaletteFade
ldr r0, _080F36B8 @ =gUnknown_840C39C
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
add sp, 0x8
pop {r3}
mov r8, r3
@@ -3065,24 +3065,24 @@ _080F3636:
_080F36B0: .4byte 0x040000d4
_080F36B4: .4byte 0x81000800
_080F36B8: .4byte gUnknown_840C39C
- thumb_func_end sub_80F3610
+ thumb_func_end ClearVramOamPltt_LoadHofPal
thumb_func_start sub_80F36BC
sub_80F36BC: @ 80F36BC
push {lr}
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80F6808
- bl sub_810BB8C
- bl sub_80088F0
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl reset_temp_tile_data_buffers
+ bl dp13_810BB8C
+ bl FreeAllSpritePalettes
ldr r1, _080F36EC @ =gUnknown_3003E58
movs r0, 0x8
strb r0, [r1]
ldr r0, _080F36F0 @ =gUnknown_840C248
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _080F36F4 @ =gUnknown_840C258
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
pop {r0}
bx r0
.align 2, 0
@@ -3104,36 +3104,36 @@ sub_80F36F8: @ 80F36F8
ldr r1, [r4]
adds r1, 0x6
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _080F376C @ =0x00001006
adds r1, r0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r4}
pop {r0}
bx r0
@@ -3174,12 +3174,12 @@ _080F37A4:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _080F3854
.align 2, 0
_080F37B8: .4byte gUnknown_840C3BC
_080F37BC:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
beq _080F3854
@@ -3193,7 +3193,7 @@ _080F37C8:
movs r1, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
movs r0, 0xB
str r0, [sp, 0x4]
@@ -3201,7 +3201,7 @@ _080F37C8:
movs r1, 0
movs r2, 0
movs r3, 0x3
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
movs r0, 0x6
str r0, [sp, 0x4]
@@ -3209,18 +3209,18 @@ _080F37C8:
movs r1, 0x1
movs r2, 0
movs r3, 0xE
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080F3854
_080F381E:
bl sub_80F6C6C
@@ -3230,13 +3230,13 @@ _080F3828:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080F3850 @ =gUnknown_203AB3C
ldr r1, [r0]
movs r0, 0
@@ -3337,7 +3337,7 @@ sub_80F38D8: @ 80F38D8
cmp r0, 0x78
ble _080F38EE
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
b _080F3926
_080F38EE:
adds r0, r1, 0x1
@@ -3347,7 +3347,7 @@ _080F38EE:
ldrh r4, [r5, 0x2E]
lsls r4, 24
lsrs r4, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -3379,7 +3379,7 @@ _080F392C: .4byte gUnknown_825E074
thumb_func_start sub_80F3930
sub_80F3930: @ 80F3930
push {r4,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF0
@@ -3387,7 +3387,7 @@ sub_80F3930: @ 80F3930
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
- bl sub_8044EC8
+ bl Random
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -3401,7 +3401,7 @@ sub_80F3930: @ 80F3930
asrs r2, 16
adds r1, r4, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -3409,7 +3409,7 @@ sub_80F3930: @ 80F3930
lsls r1, 2
ldr r0, _080F39A4 @ =gUnknown_202063C
adds r4, r1, r0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x11
@@ -3418,8 +3418,8 @@ sub_80F3930: @ 80F3930
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
- bl sub_8044EC8
+ bl StartSpriteAnim
+ bl Random
movs r1, 0x3
ands r1, r0
cmp r1, 0
diff --git a/asm/help_system.s b/asm/help_system.s
index 9eba9e037..2a25cb733 100644
--- a/asm/help_system.s
+++ b/asm/help_system.s
@@ -124,7 +124,7 @@ _0813B968:
strh r0, [r1]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0813B990 @ =gUnknown_203F178
movs r0, 0x2
b _0813BB22
@@ -137,19 +137,19 @@ _0813B994:
lsls r2, 7
movs r0, 0
movs r3, 0
- bl sub_8000F44
+ bl RequestDma3Fill
ldr r0, _0813B9C8 @ =gUnknown_8464128
movs r1, 0xA0
lsls r1, 19
movs r2, 0x20
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
ldr r0, _0813B9CC @ =gUnknown_8464008
ldr r1, _0813B9D0 @ =gUnknown_201FEE0
movs r2, 0x90
lsls r2, 1
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
ldr r1, _0813B9D4 @ =gUnknown_203F178
movs r0, 0x3
b _0813BB22
@@ -200,20 +200,20 @@ _0813BA3C: .4byte gUnknown_203F178
_0813BA40:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0813BA70 @ =0x00001f0c
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 1
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0813BA74 @ =gUnknown_203F178
movs r0, 0x5
b _0813BB22
@@ -239,7 +239,7 @@ _0813BA9C: .4byte gUnknown_203F178
_0813BAA0:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_813BC2C
movs r1, 0
ldr r5, _0813BAD0 @ =0x000001ff
@@ -340,20 +340,20 @@ _0813BB70: .4byte 0x00007fff
sub_813BB74: @ 813BB74
push {r4,lr}
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
ldr r4, _0813BBA8 @ =gUnknown_203F178
strh r0, [r4, 0x8]
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xA]
movs r0, 0x10
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xC]
movs r0, 0x12
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0xE]
movs r0, 0x50
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x10]
pop {r4}
pop {r0}
@@ -370,7 +370,7 @@ sub_813BBAC: @ 813BBAC
movs r2, 0x80
lsls r2, 7
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
@@ -411,19 +411,19 @@ sub_813BBF4: @ 813BBF4
ldr r4, _0813BC28 @ =gUnknown_203F178
ldrh r1, [r4, 0x10]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xA]
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x8]
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -439,7 +439,7 @@ sub_813BC2C: @ 813BC2C
movs r2, 0x80
lsls r2, 7
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
@@ -468,7 +468,7 @@ sub_813BC5C: @ 813BC5C
movs r2, 0x80
lsls r2, 7
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
@@ -1319,7 +1319,7 @@ _0813C2D4:
add r9, r0
adds r6, r1, 0
adds r0, r6, 0
- bl sub_8006418
+ bl GetKeypadIconTileOffset
lsls r0, 24
lsrs r0, 19
ldr r1, _0813C344 @ =gUnknown_81EA700
@@ -1341,12 +1341,12 @@ _0813C2D4:
lsls r0, r2, 3
strh r0, [r5, 0x6]
adds r0, r6, 0
- bl sub_8006428
+ bl GetKeypadIconWidth
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
- bl sub_8006438
+ bl GetKeypadIconHeight
lsls r0, 24
lsrs r0, 24
str r7, [sp]
@@ -1362,7 +1362,7 @@ _0813C2D4:
movs r3, 0
bl sub_8004AA4
adds r0, r6, 0
- bl sub_8006428
+ bl GetKeypadIconWidth
b _0813C38E
.align 2, 0
_0813C344: .4byte gUnknown_81EA700
diff --git a/asm/help_system_812B1E0.s b/asm/help_system_812B1E0.s
index b94da10b1..969643684 100644
--- a/asm/help_system_812B1E0.s
+++ b/asm/help_system_812B1E0.s
@@ -235,7 +235,7 @@ sub_812B35C: @ 812B35C
push {lr}
bl sub_812B4B8
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0812B376
@@ -253,7 +253,7 @@ _0812B376:
_0812B388:
ldr r0, _0812B3B0 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
- bl sub_805621C
+ bl is_light_level_8_or_9
lsls r0, 24
cmp r0, 0
beq _0812B400
@@ -282,7 +282,7 @@ _0812B3B8:
bl sub_812B1F0
b _0812B406
_0812B3C8:
- bl sub_810B73C
+ bl IsCurMapPokeCenter
cmp r0, 0x1
bne _0812B3D8
movs r0, 0x10
diff --git a/asm/hof_pc.s b/asm/hof_pc.s
index 1bfe69b51..5abad92bd 100644
--- a/asm/hof_pc.s
+++ b/asm/hof_pc.s
@@ -20,9 +20,9 @@ sub_80CA53C: @ 80CA53C
movs r0, 0
bl sub_8001618
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080CA570 @ =sub_80F2978
- bl sub_8000544
+ bl SetMainCallback2
_080CA564:
pop {r4}
pop {r0}
@@ -42,11 +42,11 @@ sub_80CA574: @ 80CA574
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
- bl sub_8069940
+ bl BeginNormalPaletteFade
+ bl ScriptContext2_Enable
ldr r0, _080CA59C @ =sub_80CA53C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -57,15 +57,15 @@ _080CA59C: .4byte sub_80CA53C
thumb_func_start sub_80CA5A0
sub_80CA5A0: @ 80CA5A0
push {lr}
- ldr r0, _080CA5B4 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080CA5B4 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
ldr r1, _080CA5B8 @ =gUnknown_3005020
ldr r0, _080CA5BC @ =sub_80CA5C0
str r0, [r1]
pop {r0}
bx r0
.align 2, 0
-_080CA5B4: .4byte sub_80567DC
+_080CA5B4: .4byte c2_exit_to_overworld_2_switch
_080CA5B8: .4byte gUnknown_3005020
_080CA5BC: .4byte sub_80CA5C0
thumb_func_end sub_80CA5A0
@@ -74,7 +74,7 @@ _080CA5BC: .4byte sub_80CA5C0
sub_80CA5C0: @ 80CA5C0
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_8055DC4
bl sub_809D040
bl sub_809D254
@@ -84,10 +84,10 @@ sub_80CA5C0: @ 80CA5C0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080CA5F4 @ =sub_80CA5F8
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
add sp, 0x4
pop {r0}
bx r0
@@ -107,7 +107,7 @@ sub_80CA5F8: @ 80CA5F8
cmp r0, 0
bne _080CA610
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_080CA610:
pop {r0}
bx r0
diff --git a/asm/intro.s b/asm/intro.s
index e1b2fd4b7..af7c17a79 100644
--- a/asm/intro.s
+++ b/asm/intro.s
@@ -8,9 +8,9 @@
thumb_func_start sub_80EC5A4
sub_80EC5A4: @ 80EC5A4
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80EC5A4
@@ -18,12 +18,12 @@ sub_80EC5A4: @ 80EC5A4
thumb_func_start sub_80EC5B8
sub_80EC5B8: @ 80EC5B8
push {lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080EC5CA
ldr r0, _080EC5D0 @ =sub_80EC870
- bl sub_8000544
+ bl SetMainCallback2
_080EC5CA:
pop {r0}
bx r0
@@ -56,7 +56,7 @@ sub_80EC5D4: @ 80EC5D4
ldr r0, _080EC618 @ =gUnknown_8402260
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4-r6}
pop {r0}
bx r0
@@ -109,16 +109,16 @@ _080EC65C:
b _080EC732
_080EC65E:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xA0
lsls r1, 19
ldr r2, _080EC74C @ =0x00007fff
@@ -126,13 +126,13 @@ _080EC65E:
strh r0, [r1]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
add r0, sp, 0x4
strh r4, [r0]
ldr r1, _080EC750 @ =0x040000d4
@@ -160,16 +160,16 @@ _080EC65E:
ldr r0, _080EC760 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8070528
+ bl ResetPaletteFade
movs r1, 0xE0
lsls r1, 6
movs r0, 0
movs r2, 0
bl sub_80EC5D4
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
movs r0, 0x1
negs r0, r0
ldr r1, _080EC764 @ =0x0000ffff
@@ -177,25 +177,25 @@ _080EC65E:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r1, 0xE0
lsls r1, 3
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _080EC768 @ =sub_80EC5A4
- bl sub_80006F4
+ bl SetVBlankCallback
movs r1, 0xA0
lsls r1, 1
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080EC76C @ =sub_80EC61C
bl sub_8000718
ldr r0, _080EC770 @ =gUnknown_203AAD4
bl GameCubeMultiBoot_Init
_080EC732:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _080EC774 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -231,7 +231,7 @@ _080EC778:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -239,7 +239,7 @@ _080EC778:
.align 2, 0
_080EC7A0: .4byte gUnknown_203AAD4
_080EC7A4:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080EC812
@@ -286,7 +286,7 @@ _080EC804: .4byte sub_800B798
_080EC808:
bl sub_800B388
ldr r0, _080EC81C @ =sub_80EC5B8
- bl sub_8000544
+ bl SetMainCallback2
_080EC812:
movs r0, 0x1
_080EC814:
@@ -306,7 +306,7 @@ sub_80EC820: @ 80EC820
cmp r0, 0
bne _080EC858
bl sub_8054A28
- bl sub_80D9750
+ bl ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _080EC85C @ =gUnknown_30053A0
@@ -370,18 +370,18 @@ _080EC894:
strb r1, [r0]
_080EC8A0:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080EC92C @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
- bl sub_80773BC
- bl sub_8006B10
- bl sub_8070528
- bl sub_80F6808
+ bl InitHeap
+ bl ResetTasks
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl reset_temp_tile_data_buffers
bl sub_80ECA00
add r1, sp, 0x4
movs r0, 0
@@ -418,7 +418,7 @@ _080EC8A0:
lsls r2, 3
movs r0, 0
movs r1, 0
- bl sub_8070424
+ bl FillPalette
movs r0, 0
bl sub_8001618
ldr r1, _080EC940 @ =gUnknown_840BB80
@@ -438,24 +438,24 @@ _080EC944:
ldr r0, _080EC978 @ =gUnknown_8402630
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080EC97C @ =gUnknown_8402650
movs r0, 0
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080EC980 @ =gUnknown_8402668
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _080EC984 @ =gUnknown_840270C
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080EC9B8
.align 2, 0
_080EC978: .4byte gUnknown_8402630
@@ -463,7 +463,7 @@ _080EC97C: .4byte gUnknown_8402650
_080EC980: .4byte gUnknown_8402668
_080EC984: .4byte gUnknown_840270C
_080EC988:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _080EC9C6
@@ -472,11 +472,11 @@ _080EC988:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _080EC9B0 @ =sub_80EC9D4
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080EC9B4 @ =sub_80EC9EC
- bl sub_80006F4
+ bl SetVBlankCallback
b _080EC9C6
.align 2, 0
_080EC9B0: .4byte sub_80EC9D4
@@ -501,10 +501,10 @@ _080EC9D0: .4byte gUnknown_30030F0
thumb_func_start sub_80EC9D4
sub_80EC9D4: @ 80EC9D4
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80EC9D4
@@ -512,9 +512,9 @@ sub_80EC9D4: @ 80EC9D4
thumb_func_start sub_80EC9EC
sub_80EC9EC: @ 80EC9EC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80EC9EC
@@ -524,44 +524,44 @@ sub_80ECA00: @ 80ECA00
push {lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
pop {r0}
bx r0
thumb_func_end sub_80ECA00
@@ -570,18 +570,18 @@ sub_80ECA00: @ 80ECA00
sub_80ECA70: @ 80ECA70
push {r4,lr}
ldr r0, _080ECA9C @ =0x000028bc
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
ldr r1, _080ECAA0 @ =sub_80ECAF0
bl sub_80ECAA8
ldr r0, _080ECAA4 @ =sub_80ECAB0
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
strb r0, [r4, 0x5]
ldrb r0, [r4, 0x5]
movs r1, 0
adds r2, r4, 0
- bl sub_80776E8
+ bl SetWordTaskArg
pop {r4}
pop {r0}
bx r0
@@ -605,7 +605,7 @@ sub_80ECAB0: @ 80ECAB0
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r4, r0, 0
ldr r0, _080ECAE8 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -663,10 +663,10 @@ _080ECB02:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x90
str r0, [sp]
movs r0, 0x10
@@ -675,9 +675,9 @@ _080ECB02:
adds r1, r4, 0
movs r2, 0
movs r3, 0x28
- bl sub_80041B8
+ bl BlitBitmapToWindow
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -691,7 +691,7 @@ _080ECB6C: .4byte gUnknown_840272C
_080ECB70: .4byte 0x0000043c
_080ECB74: .4byte gUnknown_84028F8
_080ECB78:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080ECB8A
@@ -727,30 +727,30 @@ _080ECBB2:
movs r1, 0x80
lsls r1, 7
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r1, 0xFC
lsls r1, 6
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
strh r5, [r4, 0x12]
b _080ECBF4
_080ECBE2:
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
negs r0, r0
movs r1, 0
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
_080ECBF4:
ldrb r0, [r4, 0x4]
adds r0, 0x1
@@ -776,7 +776,7 @@ _080ECC0E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x12]
cmp r0, 0x30
bne _080ECC32
@@ -890,7 +890,7 @@ _080ECCE6:
_080ECCF6:
ldr r1, _080ECD14 @ =0x00003f44
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x30
str r0, [sp]
movs r0, 0
@@ -904,7 +904,7 @@ _080ECCF6:
_080ECD14: .4byte 0x00003f44
_080ECD18:
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _080ECD36
_080ECD20:
bl sub_812E9E4
@@ -914,7 +914,7 @@ _080ECD20:
bne _080ECD54
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
strh r5, [r4, 0x12]
_080ECD36:
ldrb r0, [r4, 0x4]
@@ -971,7 +971,7 @@ _080ECD7C:
_080ECD9C:
ldr r1, _080ECDC0 @ =0x00003f50
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r5, 0x10
str r5, [sp]
movs r4, 0
@@ -1005,7 +1005,7 @@ _080ECDCC:
movs r0, 0
movs r2, 0x38
movs r3, 0x6
- bl sub_80041B8
+ bl BlitBitmapToWindow
ldr r0, _080ECE0C @ =0x0000043c
adds r1, r6, r0
movs r0, 0x90
@@ -1015,7 +1015,7 @@ _080ECDCC:
movs r0, 0
movs r2, 0
movs r3, 0x28
- bl sub_80041B8
+ bl BlitBitmapToWindow
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1023,13 +1023,13 @@ _080ECDCC:
.align 2, 0
_080ECE0C: .4byte 0x0000043c
_080ECE10:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _080ECE96
ldr r0, [r6, 0x14]
- bl sub_8007280
+ bl DestroySprite
strh r4, [r6, 0x12]
b _080ECE70
_080ECE26:
@@ -1042,7 +1042,7 @@ _080ECE26:
bls _080ECE96
movs r0, 0x50
movs r1, 0x4
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x14
str r0, [sp]
movs r0, 0
@@ -1059,11 +1059,11 @@ _080ECE52:
cmp r0, 0
bne _080ECE96
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
b _080ECE70
_080ECE64:
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
movs r0, 0
strh r0, [r6, 0x12]
_080ECE70:
@@ -1081,7 +1081,7 @@ _080ECE78:
bls _080ECE96
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080ECEA0 @ =sub_80ECEA4
adds r0, r6, 0
bl sub_80ECAA8
@@ -1121,19 +1121,19 @@ _080ECEC0:
.4byte _080ED064
_080ECED8:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080ECF48 @ =gUnknown_8402D34
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080ECF4C @ =gUnknown_84048CC
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r2, _080ECF50 @ =0x00007fff
movs r0, 0x6
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, _080ECF54 @ =gUnknown_840BB88
movs r0, 0
movs r2, 0x2
@@ -1144,24 +1144,24 @@ _080ECED8:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ECF5C @ =gUnknown_8404F7C
movs r0, 0x1
str r0, [sp]
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
bl sub_80EEBE4
ldr r0, _080ECF60 @ =sub_80EC9EC
- bl sub_80006F4
+ bl SetVBlankCallback
b _080ECFF0
.align 2, 0
_080ECF48: .4byte gUnknown_8402D34
@@ -1172,7 +1172,7 @@ _080ECF58: .4byte gUnknown_84048EC
_080ECF5C: .4byte gUnknown_8404F7C
_080ECF60: .4byte sub_80EC9EC
_080ECF64:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1184,31 +1184,31 @@ _080ECF72:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ECFA0 @ =gUnknown_8403FE8
movs r0, 0x1
str r0, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
bl sub_80F6C14
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
b _080ECFF0
.align 2, 0
_080ECF9C: .4byte gUnknown_8402D54
_080ECFA0: .4byte gUnknown_8403FE8
_080ECFA4:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _080ED094
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080ECFD0 @ =sub_80ED0AC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
movs r1, 0x2
negs r1, r1
ldr r0, _080ECFD4 @ =0x00007fff
@@ -1216,7 +1216,7 @@ _080ECFA4:
movs r0, 0x6
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080ECFF0
.align 2, 0
_080ECFD0: .4byte sub_80ED0AC
@@ -1251,7 +1251,7 @@ _080ED000:
bne _080ED01A
ldr r0, _080ED054 @ =sub_80ED140
movs r1, 0
- bl sub_807741C
+ bl CreateTask
bl sub_80ED118
_080ED01A:
ldrh r0, [r5, 0x12]
@@ -1261,17 +1261,17 @@ _080ED01A:
negs r0, r0
ldr r2, _080ED058 @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _080ED05C @ =sub_80ED0AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080ED054 @ =sub_80ED140
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r1, _080ED060 @ =sub_80ED188
adds r0, r5, 0
bl sub_80ECAA8
@@ -1289,15 +1289,15 @@ _080ED064:
cmp r0, 0
bne _080ED094
ldr r0, _080ED0A0 @ =sub_80ED0AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080ED0A4 @ =sub_80ED140
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r1, _080ED0A8 @ =sub_80ED188
adds r0, r5, 0
bl sub_80ECAA8
@@ -1346,7 +1346,7 @@ _080ED0DE:
lsls r1, 15
movs r0, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
_080ED0EC:
movs r1, 0x4
ldrsh r0, [r4, r1]
@@ -1362,7 +1362,7 @@ _080ED0EC:
ldrsh r1, [r4, r0]
movs r0, 0
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
_080ED10C:
pop {r4}
pop {r0}
@@ -1375,7 +1375,7 @@ _080ED114: .4byte gUnknown_3005098
sub_80ED118: @ 80ED118
push {lr}
ldr r0, _080ED138 @ =sub_80ED0AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080ED13C @ =gUnknown_3005090
@@ -1424,7 +1424,7 @@ _080ED170:
lsls r1, 15
movs r0, 0x1
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
_080ED17E:
pop {r0}
bx r0
@@ -1465,7 +1465,7 @@ _080ED1C4:
negs r0, r0
ldr r2, _080ED204 @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, _080ED208 @ =gUnknown_840BB90
movs r0, 0
movs r2, 0x4
@@ -1476,16 +1476,16 @@ _080ED1C4:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED210 @ =gUnknown_8405890
movs r0, 0x1
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
b _080ED3CA
.align 2, 0
_080ED204: .4byte 0x00007fff
@@ -1493,7 +1493,7 @@ _080ED208: .4byte gUnknown_840BB90
_080ED20C: .4byte gUnknown_8405414
_080ED210: .4byte gUnknown_8405890
_080ED214:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -1501,19 +1501,19 @@ _080ED214:
b _080ED3F6
_080ED222:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _080ED2FC @ =gUnknown_84053B4
movs r1, 0x10
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080ED300 @ =gUnknown_8405DA4
movs r1, 0x50
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080ED304 @ =gUnknown_8406634
movs r1, 0x60
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r5, 0x2
negs r5, r5
ldr r0, _080ED308 @ =0x00007fff
@@ -1521,72 +1521,72 @@ _080ED222:
adds r0, r5, 0
movs r1, 0x10
mov r2, r8
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, _080ED30C @ =gUnknown_8405B28
str r6, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED310 @ =gUnknown_8405CDC
movs r4, 0x1
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED314 @ =gUnknown_8406654
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED318 @ =gUnknown_84071D0
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED31C @ =gUnknown_8405DC4
str r6, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED320 @ =gUnknown_840644C
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
bl sub_80F6C14
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r1, 0xE7
lsls r1, 9
movs r0, 0x2
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r1, 0xA0
lsls r1, 6
movs r0, 0x1
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _080ED324 @ =sub_80ED40C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r0, r7, 0
bl sub_80ED444
adds r0, r5, 0
movs r1, 0x10
mov r2, r8
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _080ED328 @ =sub_80EC9EC
- bl sub_80006F4
+ bl SetVBlankCallback
b _080ED3CA
.align 2, 0
_080ED2FC: .4byte gUnknown_84053B4
@@ -1602,7 +1602,7 @@ _080ED320: .4byte gUnknown_840644C
_080ED324: .4byte sub_80ED40C
_080ED328: .4byte sub_80EC9EC
_080ED32C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _080ED3F6
@@ -1613,7 +1613,7 @@ _080ED32C:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080ED3CA
.align 2, 0
_080ED34C: .4byte 0x00007fff
@@ -1636,34 +1636,34 @@ _080ED360:
movs r0, 0
strh r0, [r7, 0x12]
ldr r0, _080ED3B4 @ =sub_80ED40C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
adds r0, r7, 0
bl sub_80ED4A0
ldr r0, _080ED3B8 @ =sub_80ED428
movs r1, 0
- bl sub_807741C
+ bl CreateTask
movs r1, 0x80
lsls r1, 9
movs r0, 0x3
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _080ED3CA
.align 2, 0
_080ED3B4: .4byte sub_80ED40C
_080ED3B8: .4byte sub_80ED428
_080ED3BC:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
_080ED3C0:
lsls r0, 24
lsrs r0, 24
@@ -1684,10 +1684,10 @@ _080ED3D2:
cmp r0, 0x3B
bls _080ED3F6
ldr r0, _080ED404 @ =sub_80ED428
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r1, _080ED408 @ =sub_80ED4C0
adds r0, r7, 0
bl sub_80ECAA8
@@ -1709,12 +1709,12 @@ sub_80ED40C: @ 80ED40C
movs r0, 0x3
movs r1, 0xE0
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
movs r1, 0x88
lsls r1, 1
movs r0, 0
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
pop {r0}
bx r0
thumb_func_end sub_80ED40C
@@ -1725,11 +1725,11 @@ sub_80ED428: @ 80ED428
movs r0, 0x2
movs r1, 0x20
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0x24
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_80ED428
@@ -1745,7 +1745,7 @@ sub_80ED444: @ 80ED444
movs r1, 0xA8
movs r2, 0x50
movs r3, 0xB
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1761,7 +1761,7 @@ _080ED46E:
movs r1, 0x48
movs r2, 0x50
movs r3, 0xC
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1789,12 +1789,12 @@ sub_80ED4A0: @ 80ED4A0
ldr r0, [r4, 0x1C]
cmp r0, 0
beq _080ED4AE
- bl sub_8007280
+ bl DestroySprite
_080ED4AE:
ldr r0, [r4, 0x20]
cmp r0, 0
beq _080ED4B8
- bl sub_8007280
+ bl DestroySprite
_080ED4B8:
pop {r4}
pop {r0}
@@ -1828,16 +1828,16 @@ _080ED4E4:
ldr r0, _080ED584 @ =gUnknown_8407430
movs r1, 0x10
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080ED588 @ =gUnknown_8405DA4
movs r1, 0x50
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
negs r0, r0
ldr r2, _080ED58C @ =0x00007fff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, _080ED590 @ =gUnknown_840BBA0
movs r0, 0
movs r2, 0x2
@@ -1847,21 +1847,21 @@ _080ED4E4:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED598 @ =gUnknown_8407A50
movs r0, 0x1
str r0, [sp]
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
bl sub_80F6C14
ldrb r0, [r5, 0x4]
adds r0, 0x1
@@ -1869,23 +1869,23 @@ _080ED4E4:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x48
movs r1, 0x12
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x48
movs r1, 0x1
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x4A
movs r1, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r1, 0x82
lsls r1, 6
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0x78
- bl sub_8000A38
+ bl SetGpuReg
b _080ED68A
.align 2, 0
_080ED584: .4byte gUnknown_8407430
@@ -1895,7 +1895,7 @@ _080ED590: .4byte gUnknown_840BBA0
_080ED594: .4byte gUnknown_8407470
_080ED598: .4byte gUnknown_8407A50
_080ED59C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1905,13 +1905,13 @@ _080ED59C:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED5F0 @ =gUnknown_8408D98
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _080ED5F4 @ =gUnknown_203AB00
movs r0, 0x4
strh r0, [r1]
@@ -1922,12 +1922,12 @@ _080ED59C:
lsls r1, 5
movs r0, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r1, 0xF8
lsls r1, 9
movs r0, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
b _080ED642
.align 2, 0
_080ED5EC: .4byte gUnknown_8407B9C
@@ -1935,7 +1935,7 @@ _080ED5F0: .4byte gUnknown_8408D98
_080ED5F4: .4byte gUnknown_203AB00
_080ED5F8: .4byte gUnknown_203AB02
_080ED5FC:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -1944,12 +1944,12 @@ _080ED5FC:
negs r0, r0
ldr r2, _080ED64C @ =0x00007fff
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080ED650 @ =sub_80ED714
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r0, r5, 0
bl sub_80EE4F8
ldr r0, [r5, 0x18]
@@ -1959,7 +1959,7 @@ _080ED5FC:
bl sub_80EE528
ldr r0, _080ED654 @ =sub_80EE200
movs r1, 0
- bl sub_807741C
+ bl CreateTask
bl sub_80ED6D8
strh r4, [r5, 0x12]
_080ED642:
@@ -1987,7 +1987,7 @@ _080ED66C:
cmp r0, 0
bne _080ED68A
ldr r0, _080ED694 @ =sub_80EE200
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080ED68A
@@ -2022,7 +2022,7 @@ sub_80ED69C: @ 80ED69C
lsls r1, 3
movs r0, 0x1
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
b _080ED6D2
.align 2, 0
_080ED6C4: .4byte gUnknown_3005090
@@ -2030,7 +2030,7 @@ _080ED6C8:
movs r0, 0x1
movs r1, 0x20
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
_080ED6D2:
pop {r0}
bx r0
@@ -2041,7 +2041,7 @@ sub_80ED6D8: @ 80ED6D8
push {lr}
ldr r0, _080ED6E8 @ =sub_80ED69C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -2052,7 +2052,7 @@ _080ED6E8: .4byte sub_80ED69C
sub_80ED6EC: @ 80ED6EC
push {lr}
ldr r0, _080ED70C @ =sub_80ED69C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080ED710 @ =gUnknown_3005090
@@ -2103,7 +2103,7 @@ sub_80ED714: @ 80ED714
adds r1, r0
movs r0, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
_080ED758:
pop {r0}
bx r0
@@ -2115,7 +2115,7 @@ _080ED75C: .4byte gUnknown_3005098
sub_80ED760: @ 80ED760
push {lr}
ldr r0, _080ED780 @ =sub_80ED714
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080ED784 @ =gUnknown_3005090
@@ -2136,7 +2136,7 @@ _080ED784: .4byte gUnknown_3005090
sub_80ED788: @ 80ED788
push {lr}
ldr r0, _080ED7A8 @ =sub_80ED714
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080ED7AC @ =gUnknown_3005090
@@ -2157,7 +2157,7 @@ _080ED7AC: .4byte gUnknown_3005090
sub_80ED7B0: @ 80ED7B0
push {lr}
ldr r0, _080ED7CC @ =sub_80ED714
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _080ED7D0 @ =gUnknown_3005090
@@ -2182,7 +2182,7 @@ sub_80ED7D4: @ 80ED7D4
lsls r1, 1
movs r2, 0x70
movs r3, 0x7
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -2273,7 +2273,7 @@ _080ED866:
adds r0, 0x1
strh r0, [r2, 0x2E]
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_080ED892:
pop {r4}
pop {r0}
@@ -2432,7 +2432,7 @@ _080ED9C6:
b _080EDA6E
_080ED9D2:
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0
b _080EDA6C
_080ED9DC:
@@ -2449,7 +2449,7 @@ _080ED9DC:
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080ED9FA:
ldrh r0, [r4, 0x12]
cmp r0, 0x78
@@ -2488,7 +2488,7 @@ _080EDA1C:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080EDA6E
.align 2, 0
_080EDA50: .4byte 0x00007fff
@@ -2538,7 +2538,7 @@ _080EDA98:
ldr r0, _080EDAD0 @ =0xffff0064
ldr r2, _080EDAD4 @ =0x00007fff
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, [r4, 0x18]
movs r0, 0
strh r0, [r1, 0x24]
@@ -2570,7 +2570,7 @@ sub_80EDAD8: @ 80EDAD8
lsrs r2, 6
lsls r3, 30
lsrs r3, 30
- bl sub_80073F0
+ bl CalcCenterToCornerVec
pop {r0}
bx r0
thumb_func_end sub_80EDAD8
@@ -2600,7 +2600,7 @@ _080EDAF6:
asrs r2, 16
ldr r0, _080EDB68 @ =gUnknown_840BE4C
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -2613,7 +2613,7 @@ _080EDAF6:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
lsls r1, r5, 2
adds r0, r7, 0
adds r0, 0x28
@@ -2664,7 +2664,7 @@ sub_80EDB70: @ 80EDB70
ldr r1, _080EDBA4 @ =nullsub_8
str r1, [r0, 0x1C]
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
pop {r4}
pop {r0}
bx r0
@@ -2690,7 +2690,7 @@ _080EDBB4:
adds r4, r0
ldr r0, [r4]
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, [r4]
ldr r1, _080EDBE4 @ =nullsub_83
str r1, [r0, 0x1C]
@@ -2724,26 +2724,26 @@ _080EDBF8:
lsls r2, 3
movs r0, 0
movs r1, 0
- bl sub_8070424
+ bl FillPalette
ldrb r0, [r4, 0x4]
adds r0, 0x1
strb r0, [r4, 0x4]
b _080EDC34
_080EDC0C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _080EDC34
ldrb r0, [r4, 0x5]
- bl sub_8077508
+ bl DestroyTask
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0x2
bl sub_8000B94
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _080EDC3C @ =sub_8078914
- bl sub_8000544
+ bl SetMainCallback2
_080EDC34:
pop {r4}
pop {r0}
@@ -2759,13 +2759,13 @@ sub_80EDC40: @ 80EDC40
ldr r4, _080EDCE4 @ =gUnknown_840BBC0
_080EDC46:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x4
bls _080EDC46
ldr r0, _080EDCE8 @ =gUnknown_840BBE8
- bl sub_8008974
+ bl LoadSpritePalettes
ldr r6, _080EDCEC @ =gUnknown_203AB0E
movs r0, 0x60
strh r0, [r6]
@@ -2807,7 +2807,7 @@ _080EDCA2:
movs r1, 0xF8
movs r2, 0x37
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -2830,7 +2830,7 @@ _080EDCA2:
adds r0, r3
adds r0, 0x3A
ldr r1, [r4]
- bl sub_8044F34
+ bl StoreWordInTwoHalfwords
_080EDCDE:
pop {r4-r6}
pop {r0}
@@ -2909,7 +2909,7 @@ _080EDD5C:
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -2957,7 +2957,7 @@ sub_80EDDF0: @ 80EDDF0
push {lr}
ldr r0, _080EDE00 @ =sub_80EDE04
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -3002,7 +3002,7 @@ sub_80EDE04: @ 80EDE04
movs r3, 0x2
ldrsh r2, [r6, r3]
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -3012,7 +3012,7 @@ sub_80EDE04: @ 80EDE04
adds r7, r4, r5
adds r0, r7, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r5, 0x1C
adds r4, r5
ldr r0, _080EDEC0 @ =sub_80EE40C
@@ -3047,7 +3047,7 @@ _080EDE88:
cmp r0, 0x1
ble _080EDEC4
mov r0, r9
- bl sub_8077508
+ bl DestroyTask
b _080EDECA
.align 2, 0
_080EDEB0: .4byte gUnknown_3005098
@@ -3073,7 +3073,7 @@ sub_80EDED8: @ 80EDED8
push {lr}
ldr r0, _080EDEE8 @ =sub_80EDEEC
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -3115,7 +3115,7 @@ _080EDF1A:
movs r3, 0x2
ldrsh r2, [r2, r3]
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldrh r0, [r4, 0x4]
adds r0, 0x1
strh r0, [r4, 0x4]
@@ -3124,7 +3124,7 @@ _080EDF1A:
cmp r0, 0x8
ble _080EDF44
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080EDF44:
ldrh r0, [r4]
adds r0, 0x1
@@ -3152,7 +3152,7 @@ sub_80EDF68: @ 80EDF68
movs r1, 0x78
movs r2, 0x46
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3176,14 +3176,14 @@ sub_80EDF94: @ 80EDF94
strb r0, [r4, 0x6]
ldr r0, _080EDFD0 @ =sub_80EE024
movs r1, 0x4
- bl sub_807741C
+ bl CreateTask
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
movs r1, 0x5
adds r2, r4, 0
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _080EDFD4 @ =gUnknown_3005090
lsls r4, r5, 2
adds r4, r5
@@ -3192,7 +3192,7 @@ sub_80EDF94: @ 80EDF94
movs r0, 0x40
strh r0, [r4, 0xE]
movs r0, 0
- bl sub_8001CCC
+ bl GetBgX
strh r0, [r4, 0x10]
pop {r4,r5}
pop {r0}
@@ -3218,21 +3218,21 @@ sub_80EDFD8: @ 80EDFD8
movs r0, 0
adds r1, r4, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
mov r1, r8
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
lsls r5, 8
movs r0, 0
adds r1, r5, 0
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
lsls r6, 8
movs r0, 0
adds r1, r6, 0
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -3304,7 +3304,7 @@ _080EE094:
bne _080EE0AE
adds r0, r2, 0
movs r1, 0x5
- bl sub_8077720
+ bl GetWordTaskArg
movs r1, 0x1
strb r1, [r0, 0x6]
_080EE0AE:
@@ -3364,7 +3364,7 @@ _080EE10C:
b _080EE11C
_080EE114:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
b _080EE156
_080EE11C:
movs r4, 0x6
@@ -3411,12 +3411,12 @@ sub_80EE160: @ 80EE160
movs r1, 0x84
movs r2, 0x4E
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
adds r0, r4, 0
movs r1, 0x84
movs r2, 0x76
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -3442,7 +3442,7 @@ sub_80EE160: @ 80EE160
bl sub_80EDAD8
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080EE1B4:
pop {r4}
pop {r0}
@@ -3479,7 +3479,7 @@ sub_80EE1C4: @ 80EE1C4
cmp r0, 0
beq _080EE1FA
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_080EE1FA:
pop {r0}
bx r0
@@ -3533,7 +3533,7 @@ _080EE250:
ldrsh r1, [r1, r0]
movs r0, 0
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
ldr r5, _080EE290 @ =gUnknown_203AB30
str r0, [r5]
ldr r1, _080EE294 @ =0x00007fff
@@ -3542,7 +3542,7 @@ _080EE250:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
_080EE270:
ldr r1, [r5]
ldr r0, _080EE298 @ =0x0000eeff
@@ -3552,9 +3552,9 @@ _080EE270:
lsls r1, 8
movs r0, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EE28A:
pop {r4,r5}
pop {r0}
@@ -3611,7 +3611,7 @@ sub_80EE29C: @ 80EE29C
adds r4, 0x3A
adds r0, r4, 0
mov r1, sp
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
ldr r1, [sp]
ldr r0, _080EE348 @ =0x41c64e6d
muls r1, r0
@@ -3619,7 +3619,7 @@ sub_80EE29C: @ 80EE29C
adds r1, r3
str r1, [sp]
adds r0, r4, 0
- bl sub_8044F34
+ bl StoreWordInTwoHalfwords
ldr r2, [sp]
lsrs r2, 16
str r2, [sp]
@@ -3639,7 +3639,7 @@ _080EE324:
cmp r1, r0
bge _080EE336
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_080EE336:
add sp, 0x4
pop {r4,r5}
@@ -3723,7 +3723,7 @@ _080EE3A4:
cmp r1, r0
ble _080EE3DC
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080EE3DC:
movs r1, 0x22
ldrsh r0, [r4, r1]
@@ -3733,7 +3733,7 @@ _080EE3DC:
cmp r0, 0xA0
bls _080EE3F0
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080EE3F0:
pop {r4}
pop {r0}
@@ -3815,7 +3815,7 @@ _080EE484:
_080EE486:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _080EE4D4
_080EE490:
movs r1, 0x34
@@ -3823,7 +3823,7 @@ _080EE490:
cmp r0, 0
beq _080EE49E
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080EE49E:
adds r0, r4, 0
adds r0, 0x3F
@@ -3834,7 +3834,7 @@ _080EE49E:
beq _080EE4B4
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080EE4B4:
ldrh r0, [r4, 0x30]
adds r0, 0x4
@@ -3850,7 +3850,7 @@ _080EE4B4:
cmp r0, 0x32
ble _080EE4D4
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_080EE4D4:
pop {r4}
pop {r0}
@@ -3868,7 +3868,7 @@ sub_80EE4DC: @ 80EE4DC
cmp r0, 0
beq _080EE4F2
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_080EE4F2:
pop {r0}
bx r0
@@ -3882,7 +3882,7 @@ sub_80EE4F8: @ 80EE4F8
movs r1, 0
movs r2, 0
movs r3, 0x9
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -4012,7 +4012,7 @@ sub_80EE5E4: @ 80EE5E4
adds r4, r0, 0
ldr r0, [r4, 0x18]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4, 0x18]
movs r1, 0
strh r1, [r0, 0x2E]
@@ -4058,14 +4058,14 @@ _080EE62C:
ble _080EE69A
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r4, 0x26]
b _080EE654
_080EE646:
movs r0, 0x21
movs r1, 0x3F
movs r2, 0x1
- bl sub_8071E60
+ bl PlayCry3
movs r0, 0
strh r0, [r4, 0x30]
_080EE654:
@@ -4101,7 +4101,7 @@ _080EE67C:
ble _080EE69A
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0x26]
ldr r0, _080EE6A0 @ =nullsub_8
@@ -4132,7 +4132,7 @@ sub_80EE6A4: @ 80EE6A4
strh r0, [r1]
ldr r0, [r4, 0x18]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4, 0x18]
movs r1, 0
strh r1, [r0, 0x2E]
@@ -4194,7 +4194,7 @@ _080EE726:
_080EE736:
adds r0, r4, 0
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
b _080EE818
_080EE740:
ldrh r2, [r4, 0x3C]
@@ -4245,7 +4245,7 @@ _080EE78C:
ble _080EE846
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r4, 0x30]
ldr r0, _080EE7C0 @ =0x00004757
strh r0, [r4, 0x3A]
@@ -4297,7 +4297,7 @@ _080EE804:
ble _080EE846
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0x30]
_080EE818:
@@ -4368,7 +4368,7 @@ _080EE880:
asrs r1, r2, 16
asrs r2, r7, 16
movs r3, 0xA
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -4457,7 +4457,7 @@ _080EE90C:
cmp r0, 0
beq _080EE93E
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_080EE93E:
ldrh r0, [r4, 0xE]
adds r0, 0x1
@@ -4525,7 +4525,7 @@ sub_80EE970: @ 80EE970
strh r6, [r4, 0x3C]
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _080EE9D0 @ =sub_80EE9D4
str r0, [r4, 0x1C]
pop {r3}
@@ -4564,7 +4564,7 @@ _080EE9F0:
ble _080EEA88
adds r0, r4, 0
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
b _080EEA64
_080EEA08:
ldrh r0, [r4, 0x30]
@@ -4607,7 +4607,7 @@ _080EEA4C:
strh r5, [r4, 0x26]
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
movs r1, 0x3C
ldrsh r0, [r4, r1]
cmp r0, 0x5
@@ -4628,7 +4628,7 @@ _080EEA6E:
ble _080EEA88
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080EEA84:
ldr r0, _080EEA90 @ =nullsub_8
str r0, [r4, 0x1C]
@@ -4681,7 +4681,7 @@ sub_80EEA94: @ 80EEA94
strh r0, [r1, 0x3C]
ldr r0, [r4, 0x18]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r4, 0x18]
ldr r0, _080EEB04 @ =sub_80EEB08
str r0, [r1, 0x1C]
@@ -4756,7 +4756,7 @@ _080EEB58:
blt _080EEBCE
adds r0, r4, 0
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
strh r5, [r4, 0x30]
strh r5, [r4, 0x32]
_080EEB78:
@@ -4823,13 +4823,13 @@ sub_80EEBE4: @ 80EEBE4
ldr r4, _080EEC04 @ =gUnknown_840BEDC
_080EEBEA:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x6
bls _080EEBEA
ldr r0, _080EEC08 @ =gUnknown_840BF14
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r4,r5}
pop {r0}
bx r0
diff --git a/asm/item.s b/asm/item.s
index b3539c02d..511b67413 100644
--- a/asm/item.s
+++ b/asm/item.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8099DA0
-sub_8099DA0: @ 8099DA0
+ thumb_func_start GetBagItemQuantity
+GetBagItemQuantity: @ 8099DA0
adds r1, r0, 0
ldr r0, _08099DB8 @ =gUnknown_300500C
ldr r0, [r0]
@@ -21,7 +21,7 @@ sub_8099DA0: @ 8099DA0
bx lr
.align 2, 0
_08099DB8: .4byte gUnknown_300500C
- thumb_func_end sub_8099DA0
+ thumb_func_end GetBagItemQuantity
thumb_func_start sub_8099DBC
sub_8099DBC: @ 8099DBC
@@ -161,18 +161,18 @@ sub_8099E90: @ 8099E90
bl sub_809C8A0
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08099EB4 @ =gUnknown_84162BD
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _08099EC4
.align 2, 0
_08099EB4: .4byte gUnknown_84162BD
_08099EB8:
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_08099EC4:
pop {r4}
pop {r0}
@@ -260,7 +260,7 @@ sub_8099F40: @ 8099F40
lsls r1, 16
lsrs r5, r1, 16
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
bne _08099F5C
@@ -270,7 +270,7 @@ _08099F58:
b _08099FA6
_08099F5C:
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
movs r2, 0
@@ -289,7 +289,7 @@ _08099F76:
cmp r0, r4
bne _08099F98
adds r0, r1, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
cmp r0, r5
@@ -368,12 +368,12 @@ sub_809A000: @ 809A000
lsls r1, 16
lsrs r6, r1, 16
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
beq _0809A050
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -393,7 +393,7 @@ _0809A032:
cmp r0, r4
bne _0809A05C
adds r0, r1, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
adds r0, r6
@@ -441,14 +441,14 @@ sub_809A084: @ 809A084
lsrs r1, 16
mov r8, r1
adds r0, r6, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
bne _0809A0A2
b _0809A1CA
_0809A0A2:
adds r0, r6, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -468,7 +468,7 @@ _0809A0BE:
cmp r0, r6
bne _0809A0E8
adds r0, r1, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
mov r2, r8
@@ -605,14 +605,14 @@ sub_809A1D8: @ 809A1D8
lsls r1, 16
lsrs r7, r1, 16
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
cmp r0, 0
beq _0809A258
cmp r4, 0
beq _0809A258
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
subs r0, 0x1
lsls r0, 24
movs r2, 0
@@ -631,7 +631,7 @@ _0809A20C:
cmp r0, r4
bne _0809A24C
adds r0, r1, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
cmp r0, r7
@@ -674,7 +674,7 @@ sub_809A260: @ 809A260
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -1149,7 +1149,7 @@ _0809A59E:
adds r5, r1, r0
_0809A5B0:
adds r0, r5, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
cmp r0, 0
bne _0809A5C6
@@ -1204,7 +1204,7 @@ _0809A604:
bne _0809A622
adds r0, r2, 0x2
str r3, [sp]
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
ldr r3, [sp]
cmp r0, 0
@@ -1217,7 +1217,7 @@ _0809A622:
bls _0809A66A
adds r0, r1, 0x2
str r3, [sp]
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
ldr r3, [sp]
cmp r0, 0
@@ -1240,7 +1240,7 @@ _0809A642:
bne _0809A640
adds r0, r1, 0x2
str r3, [sp]
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
ldr r3, [sp]
cmp r0, 0
@@ -1268,7 +1268,7 @@ _0809A688:
ldr r0, [r5]
adds r0, r4
adds r0, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
ldr r1, [r5]
adds r4, r1
strh r0, [r4, 0x2]
@@ -1281,7 +1281,7 @@ _0809A688:
_0809A6A6:
ldrb r0, [r5, 0x4]
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
mov r8, r0
ldr r0, [r5]
adds r0, r7
@@ -1324,7 +1324,7 @@ _0809A6EA:
bcc _0809A6EA
_0809A704:
mov r0, r8
- bl sub_8002BC4
+ bl Free
_0809A70A:
add sp, 0x4
pop {r3-r5}
@@ -1358,7 +1358,7 @@ _0809A73A:
ldr r0, [r6]
adds r0, r7
adds r0, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsls r4, r5, 2
cmp r0, 0
@@ -1366,7 +1366,7 @@ _0809A73A:
ldr r0, [r6]
adds r0, r4
adds r0, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
cmp r0, 0
beq _0809A774
@@ -1434,7 +1434,7 @@ sub_809A7B4: @ 809A7B4
ldr r0, [r0]
adds r0, r1
adds r0, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -1449,7 +1449,7 @@ sub_809A7DC: @ 809A7DC
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 21
ldr r1, _0809A7F4 @ =gUnknown_2039884
@@ -1466,7 +1466,7 @@ _0809A7F8:
cmp r0, r4
bne _0809A810
adds r0, r1, 0x2
- bl sub_8099DA0
+ bl GetBagItemQuantity
lsls r0, 16
lsrs r0, 16
b _0809A81E
@@ -1527,7 +1527,7 @@ _0809A85A:
bne _0809A88C
_0809A86E:
movs r0, 0x4
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
strh r5, [r4]
ldr r0, _0809A8A0 @ =gUnknown_2036DFC
@@ -1537,7 +1537,7 @@ _0809A86E:
adds r1, r4, 0
bl sub_8113550
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
_0809A88C:
pop {r4,r5}
pop {r0}
@@ -1549,8 +1549,8 @@ _0809A89C: .4byte gUnknown_3005008
_0809A8A0: .4byte gUnknown_2036DFC
thumb_func_end sub_809A824
- thumb_func_start sub_809A8A4
-sub_809A8A4: @ 809A8A4
+ thumb_func_start SanitizeItemId
+SanitizeItemId: @ 809A8A4
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -1565,14 +1565,14 @@ _0809A8B6:
_0809A8B8:
pop {r1}
bx r1
- thumb_func_end sub_809A8A4
+ thumb_func_end SanitizeItemId
- thumb_func_start sub_809A8BC
-sub_809A8BC: @ 809A8BC
+ thumb_func_start ItemId_GetItem
+ItemId_GetItem: @ 809A8BC
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1583,15 +1583,15 @@ sub_809A8BC: @ 809A8BC
bx r1
.align 2, 0
_0809A8D8: .4byte gUnknown_83DB028
- thumb_func_end sub_809A8BC
+ thumb_func_end ItemId_GetItem
- thumb_func_start sub_809A8DC
-sub_809A8DC: @ 809A8DC
+ thumb_func_start itemid_get_number
+itemid_get_number: @ 809A8DC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A8FC @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1603,15 +1603,15 @@ sub_809A8DC: @ 809A8DC
bx r1
.align 2, 0
_0809A8FC: .4byte gUnknown_83DB028
- thumb_func_end sub_809A8DC
+ thumb_func_end itemid_get_number
- thumb_func_start sub_809A900
-sub_809A900: @ 809A900
+ thumb_func_start itemid_get_market_price
+itemid_get_market_price: @ 809A900
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A920 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1623,15 +1623,15 @@ sub_809A900: @ 809A900
bx r1
.align 2, 0
_0809A920: .4byte gUnknown_83DB028
- thumb_func_end sub_809A900
+ thumb_func_end itemid_get_market_price
- thumb_func_start sub_809A924
-sub_809A924: @ 809A924
+ thumb_func_start ItemId_GetHoldEffect
+ItemId_GetHoldEffect: @ 809A924
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A944 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1643,15 +1643,15 @@ sub_809A924: @ 809A924
bx r1
.align 2, 0
_0809A944: .4byte gUnknown_83DB028
- thumb_func_end sub_809A924
+ thumb_func_end ItemId_GetHoldEffect
- thumb_func_start sub_809A948
-sub_809A948: @ 809A948
+ thumb_func_start ItemId_GetHoldEffectParam
+ItemId_GetHoldEffectParam: @ 809A948
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A968 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1663,15 +1663,15 @@ sub_809A948: @ 809A948
bx r1
.align 2, 0
_0809A968: .4byte gUnknown_83DB028
- thumb_func_end sub_809A948
+ thumb_func_end ItemId_GetHoldEffectParam
- thumb_func_start sub_809A96C
-sub_809A96C: @ 809A96C
+ thumb_func_start ItemId_GetDescription
+ItemId_GetDescription: @ 809A96C
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A98C @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1684,15 +1684,15 @@ sub_809A96C: @ 809A96C
bx r1
.align 2, 0
_0809A98C: .4byte gUnknown_83DB028
- thumb_func_end sub_809A96C
+ thumb_func_end ItemId_GetDescription
- thumb_func_start sub_809A990
-sub_809A990: @ 809A990
+ thumb_func_start itemid_is_unique
+itemid_is_unique: @ 809A990
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A9B0 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1704,15 +1704,15 @@ sub_809A990: @ 809A990
bx r1
.align 2, 0
_0809A9B0: .4byte gUnknown_83DB028
- thumb_func_end sub_809A990
+ thumb_func_end itemid_is_unique
- thumb_func_start sub_809A9B4
-sub_809A9B4: @ 809A9B4
+ thumb_func_start itemid_get_x19
+itemid_get_x19: @ 809A9B4
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A9D4 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1724,15 +1724,15 @@ sub_809A9B4: @ 809A9B4
bx r1
.align 2, 0
_0809A9D4: .4byte gUnknown_83DB028
- thumb_func_end sub_809A9B4
+ thumb_func_end itemid_get_x19
- thumb_func_start sub_809A9D8
-sub_809A9D8: @ 809A9D8
+ thumb_func_start ItemId_GetPocket
+ItemId_GetPocket: @ 809A9D8
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809A9F8 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1744,15 +1744,15 @@ sub_809A9D8: @ 809A9D8
bx r1
.align 2, 0
_0809A9F8: .4byte gUnknown_83DB028
- thumb_func_end sub_809A9D8
+ thumb_func_end ItemId_GetPocket
- thumb_func_start sub_809A9FC
-sub_809A9FC: @ 809A9FC
+ thumb_func_start ItemId_GetType
+ItemId_GetType: @ 809A9FC
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809AA1C @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1764,15 +1764,15 @@ sub_809A9FC: @ 809A9FC
bx r1
.align 2, 0
_0809AA1C: .4byte gUnknown_83DB028
- thumb_func_end sub_809A9FC
+ thumb_func_end ItemId_GetType
- thumb_func_start sub_809AA20
-sub_809AA20: @ 809AA20
+ thumb_func_start ItemId_GetFieldFunc
+ItemId_GetFieldFunc: @ 809AA20
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809AA40 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1785,15 +1785,15 @@ sub_809AA20: @ 809AA20
bx r1
.align 2, 0
_0809AA40: .4byte gUnknown_83DB028
- thumb_func_end sub_809AA20
+ thumb_func_end ItemId_GetFieldFunc
- thumb_func_start sub_809AA44
-sub_809AA44: @ 809AA44
+ thumb_func_start ItemId_GetBattleUsage
+ItemId_GetBattleUsage: @ 809AA44
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809AA64 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1806,15 +1806,15 @@ sub_809AA44: @ 809AA44
bx r1
.align 2, 0
_0809AA64: .4byte gUnknown_83DB028
- thumb_func_end sub_809AA44
+ thumb_func_end ItemId_GetBattleUsage
- thumb_func_start sub_809AA68
-sub_809AA68: @ 809AA68
+ thumb_func_start ItemId_GetBattleFunc
+ItemId_GetBattleFunc: @ 809AA68
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809AA88 @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1827,15 +1827,15 @@ sub_809AA68: @ 809AA68
bx r1
.align 2, 0
_0809AA88: .4byte gUnknown_83DB028
- thumb_func_end sub_809AA68
+ thumb_func_end ItemId_GetBattleFunc
- thumb_func_start sub_809AA8C
-sub_809AA8C: @ 809AA8C
+ thumb_func_start ItemId_GetSecondaryId
+ItemId_GetSecondaryId: @ 809AA8C
push {r4,lr}
lsls r0, 16
lsrs r0, 16
ldr r4, _0809AAAC @ =gUnknown_83DB028
- bl sub_809A8A4
+ bl SanitizeItemId
lsls r0, 16
lsrs r0, 16
movs r1, 0x2C
@@ -1848,6 +1848,6 @@ sub_809AA8C: @ 809AA8C
bx r1
.align 2, 0
_0809AAAC: .4byte gUnknown_83DB028
- thumb_func_end sub_809AA8C
+ thumb_func_end ItemId_GetSecondaryId
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/item_menu.s b/asm/item_menu.s
index cd0fe099d..937f00820 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -20,12 +20,12 @@ sub_8107DB4: @ 8107DB4
bl sub_81081AC
ldr r5, _08107DE4 @ =gUnknown_203AD10
movs r0, 0x14
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
bne _08107DE8
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
b _08107E9A
.align 2, 0
_08107DE4: .4byte gUnknown_203AD10
@@ -123,7 +123,7 @@ _08107E86:
movs r0, 0
strh r0, [r5]
adds r0, r6, 0
- bl sub_8000544
+ bl SetMainCallback2
_08107E9A:
pop {r3}
mov r8, r3
@@ -167,11 +167,11 @@ _08107EDC: .4byte sub_8030AEC
thumb_func_start sub_8107EE0
sub_8107EE0: @ 8107EE0
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8107EE0
@@ -179,9 +179,9 @@ sub_8107EE0: @ 8107EE0
thumb_func_start sub_8107EFC
sub_8107EFC: @ 8107EFC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8107EFC
@@ -254,16 +254,16 @@ _08107F60:
.4byte _081080DE
_08107FB0:
bl sub_80BF768
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
b _08108104
_08107FBA:
- bl sub_8087E64
+ bl remove_some_task
b _08108104
_08107FC0:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
b _08108104
_08107FC6:
- bl sub_8070528
+ bl ResetPaletteFade
ldr r2, _08107FD4 @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
@@ -272,7 +272,7 @@ _08107FC6:
.align 2, 0
_08107FD4: .4byte gUnknown_2037AB8
_08107FD8:
- bl sub_8006B10
+ bl ResetSpriteData
b _08108104
_08107FDE:
bl sub_80984D8
@@ -284,7 +284,7 @@ _08107FE4:
beq _08107FF0
b _08108104
_08107FF0:
- bl sub_80773BC
+ bl ResetTasks
b _08108104
_08107FF6:
bl sub_81081D0
@@ -360,7 +360,7 @@ _0810806E:
adds r4, 0x8
adds r2, r4
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
ldr r2, _081080B4 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -428,9 +428,9 @@ _08108114: .4byte gUnknown_2037AB8
_08108118: .4byte gUnknown_30030F0
_0810811C:
ldr r0, _0810812C @ =sub_8107EFC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08108130 @ =sub_8107EE0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
b _08108136
.align 2, 0
@@ -455,14 +455,14 @@ sub_810813C: @ 810813C
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0810816C @ =sub_8108178
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _08108170 @ =sub_8107EFC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08108174 @ =sub_8107EE0
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r0}
bx r0
@@ -485,10 +485,10 @@ sub_8108178: @ 8108178
bne _0810819C
ldr r0, _081081A8 @ =gUnknown_203ACFC
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8108B04
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0810819C:
pop {r4}
pop {r0}
@@ -525,7 +525,7 @@ sub_81081D0: @ 81081D0
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
beq _08108238
@@ -540,20 +540,20 @@ sub_81081D0: @ 81081D0
bl sub_8001658
ldr r1, [r5]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r1, 0xC1
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
b _0810823A
.align 2, 0
@@ -595,19 +595,19 @@ _08108264:
.4byte _08108340
.4byte _0810834C
_0810827C:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r1, _08108294 @ =gUnknown_8E830CC
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _08108352
.align 2, 0
_08108294: .4byte gUnknown_8E830CC
_08108298:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -619,7 +619,7 @@ _08108298:
ldr r0, _081082BC @ =gUnknown_8E832C0
ldr r1, _081082C0 @ =gUnknown_203AD14
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _08108352
.align 2, 0
_081082B8: .4byte gUnknown_203ACFC
@@ -629,7 +629,7 @@ _081082C4:
ldr r0, _081082D0 @ =gUnknown_8E83444
ldr r1, _081082D4 @ =gUnknown_203AD14
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _08108352
.align 2, 0
_081082D0: .4byte gUnknown_8E83444
@@ -638,7 +638,7 @@ _081082D8:
ldr r0, _08108304 @ =gUnknown_8E835B4
movs r1, 0
movs r2, 0x60
- bl sub_80703A8
+ bl LoadCompressedPalette
bl sub_810ADAC
lsls r0, 24
cmp r0, 0
@@ -651,7 +651,7 @@ _081082D8:
ldr r0, _0810830C @ =gUnknown_8E83604
movs r1, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
b _08108352
.align 2, 0
_08108304: .4byte gUnknown_8E835B4
@@ -676,20 +676,20 @@ _0810832C: .4byte gUnknown_300500C
_08108330: .4byte gUnknown_83D41E4
_08108334:
ldr r0, _0810833C @ =gUnknown_83D41EC
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
b _08108352
.align 2, 0
_0810833C: .4byte gUnknown_83D41EC
_08108340:
ldr r0, _08108348 @ =gUnknown_83D41F4
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
b _08108352
.align 2, 0
_08108348: .4byte gUnknown_83D41F4
_0810834C:
ldr r0, _08108360 @ =gUnknown_83D4240
_0810834E:
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_08108352:
ldr r0, _08108364 @ =gUnknown_203AD10
ldr r1, [r0]
@@ -702,7 +702,7 @@ _08108360: .4byte gUnknown_83D4240
_08108364: .4byte gUnknown_203AD10
_08108368:
ldr r0, _08108378 @ =gUnknown_83D4248
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0x10]
@@ -770,7 +770,7 @@ _081083E0:
ldr r0, _081083F0 @ =sub_8108F0C
_081083E2:
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -785,13 +785,13 @@ sub_81083F4: @ 81083F4
ldr r4, _08108418 @ =gUnknown_203AD18
movs r0, 0xAC
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _08108424
ldr r4, _0810841C @ =gUnknown_203AD1C
ldr r0, _08108420 @ =0x00000331
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _08108424
@@ -868,11 +868,11 @@ _0810848C:
ldr r0, [r5]
adds r0, r4
ldr r1, _0810854C @ =gUnknown_8452F60
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r5]
adds r0, r4
ldr r1, _08108550 @ =gUnknown_84161C1
- bl sub_8008DA4
+ bl StringAppend
ldr r0, _08108548 @ =gUnknown_203AD18
ldr r2, [r0]
lsls r1, r6, 3
@@ -970,7 +970,7 @@ sub_8108560: @ 8108560
bhi _08108584
ldr r1, _08108580 @ =gUnknown_8452F66
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
b _0810858C
.align 2, 0
_0810857C: .4byte 0xfe940000
@@ -978,13 +978,13 @@ _08108580: .4byte gUnknown_8452F66
_08108584:
ldr r1, _081085A0 @ =gUnknown_8452F60
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_0810858C:
adds r0, r5, 0
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
pop {r4,r5}
pop {r0}
bx r0
@@ -1144,7 +1144,7 @@ _08108690:
cmp r0, 0x1
beq _0810872C
adds r0, r7, 0
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -1195,7 +1195,7 @@ _0810872C:
mov r0, r8
movs r2, 0x70
adds r3, r6, 0
- bl sub_80041B8
+ bl BlitBitmapToWindow
_08108752:
add sp, 0x14
pop {r3}
@@ -1217,7 +1217,7 @@ sub_810876C: @ 810876C
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -1254,7 +1254,7 @@ sub_810878C: @ 810878C
movs r1, 0
movs r2, 0x1
adds r3, r5, 0
- bl sub_8004378
+ bl FillWindowPixelRect
b _081087DE
_081087C8:
ldr r2, _081087E8 @ =gUnknown_841623B
@@ -1281,7 +1281,7 @@ sub_81087EC: @ 81087EC
push {lr}
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _08108810 @ =gUnknown_8452CFC
ldr r0, _08108814 @ =gUnknown_203ACFC
ldrh r1, [r0, 0x6]
@@ -1320,7 +1320,7 @@ sub_8108818: @ 8108818
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r4, r0, 0
b _08108856
.align 2, 0
@@ -1331,7 +1331,7 @@ _08108854:
_08108856:
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
str r0, [sp]
movs r0, 0x2
@@ -1383,7 +1383,7 @@ sub_8108888: @ 8108888
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -1407,7 +1407,7 @@ sub_81088D8: @ 81088D8
beq _081088F4
ldr r0, _08108900 @ =gUnknown_8452F6C
ldr r1, _08108904 @ =gUnknown_203AD02
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, [r4]
strb r0, [r1, 0x9]
_081088F4:
@@ -1439,7 +1439,7 @@ sub_8108908: @ 8108908
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -1469,7 +1469,7 @@ sub_8108940: @ 8108940
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -1488,7 +1488,7 @@ sub_8108978: @ 8108978
ldrb r0, [r1, 0x8]
cmp r0, 0xFF
beq _0810898E
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x8]
@@ -1509,7 +1509,7 @@ sub_810899C: @ 810899C
ldrb r0, [r1, 0x9]
cmp r0, 0xFF
beq _081089B2
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x9]
@@ -1709,25 +1709,25 @@ sub_8108B04: @ 8108B04
ldr r0, [r0]
cmp r0, 0
beq _08108B12
- bl sub_8002BC4
+ bl Free
_08108B12:
ldr r0, _08108B44 @ =gUnknown_203AD14
ldr r0, [r0]
cmp r0, 0
beq _08108B1E
- bl sub_8002BC4
+ bl Free
_08108B1E:
ldr r0, _08108B48 @ =gUnknown_203AD18
ldr r0, [r0]
cmp r0, 0
beq _08108B2A
- bl sub_8002BC4
+ bl Free
_08108B2A:
ldr r0, _08108B4C @ =gUnknown_203AD1C
ldr r0, [r0]
cmp r0, 0
beq _08108B36
- bl sub_8002BC4
+ bl Free
_08108B36:
bl sub_8003ECC
pop {r0}
@@ -1753,7 +1753,7 @@ sub_8108B50: @ 8108B50
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08108B84 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1787,7 +1787,7 @@ sub_8108B8C: @ 8108B8C
cmp r0, 0
bne _08108C08
ldr r0, _08108BE8 @ =sub_8108CFC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1808,7 +1808,7 @@ sub_8108B8C: @ 8108B8C
ldr r0, [r0]
cmp r0, 0
beq _08108BF4
- bl sub_8000544
+ bl SetMainCallback2
b _08108BFA
.align 2, 0
_08108BE0: .4byte gUnknown_3005098
@@ -1818,12 +1818,12 @@ _08108BEC: .4byte gUnknown_203ACFC
_08108BF0: .4byte gUnknown_203AD10
_08108BF4:
ldr r0, [r4]
- bl sub_8000544
+ bl SetMainCallback2
_08108BFA:
bl sub_8108978
bl sub_8108B04
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08108C08:
pop {r4,r5}
pop {r0}
@@ -1839,48 +1839,48 @@ sub_8108C10: @ 8108C10
strh r5, [r0]
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r4, _08108C68 @ =gUnknown_203ACFC
ldrb r0, [r4, 0x5]
cmp r0, 0x1
bne _08108C6C
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08108C9E
.align 2, 0
_08108C68: .4byte gUnknown_203ACFC
_08108C6C:
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08108CA8 @ =sub_8108CFC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08108CAC @ =gUnknown_3005090
@@ -1910,7 +1910,7 @@ sub_8108CB4: @ 8108CB4
push {lr}
ldr r0, _08108CE0 @ =sub_8108CFC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08108CE4 @ =gUnknown_3005090
@@ -1964,14 +1964,14 @@ sub_8108CFC: @ 8108CFC
ble _08108D2C
movs r0, 0x44
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
b _08108D34
.align 2, 0
_08108D28: .4byte gUnknown_3005098
_08108D2C:
ldrh r1, [r4]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
_08108D34:
movs r2, 0x2
ldrsh r1, [r4, r2]
@@ -1992,7 +1992,7 @@ _08108D44:
bne _08108D5A
_08108D54:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08108D5A:
pop {r4,r5}
pop {r0}
@@ -2176,7 +2176,7 @@ sub_8108E70: @ 8108E70
lsrs r0, 24
strh r0, [r4, 0x14]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
bl sub_80F78A8
lsls r0, 24
lsrs r0, 24
@@ -2192,7 +2192,7 @@ sub_8108E70: @ 8108E70
movs r3, 0xD
bl sub_80BF474
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -2254,7 +2254,7 @@ sub_8108F0C: @ 8108F0C
b _081090C6
_08108F2C:
ldr r0, _08108F80 @ =sub_8108CFC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2313,7 +2313,7 @@ _08108FA0:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -2341,7 +2341,7 @@ _08108FA0:
_08108FE0: .4byte gUnknown_203AD10
_08108FE4:
ldrb r0, [r7]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r4, r0, 0
ldrb r0, [r7]
ldr r5, _08109014 @ =gUnknown_203ACFC
@@ -2353,7 +2353,7 @@ _08108FE4:
adds r3, r5, 0
adds r3, 0x8
adds r2, r3
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -2516,7 +2516,7 @@ sub_8109140: @ 8109140
movs r3, 0x1E
bl sub_80F6B08
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -2603,11 +2603,11 @@ sub_81091D0: @ 81091D0
cmp r2, 0
bne _08109242
movs r0, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x2
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
ldr r3, _0810928C @ =gUnknown_203ACFC
ldrh r2, [r3, 0x6]
@@ -2619,7 +2619,7 @@ sub_81091D0: @ 81091D0
adds r2, r3
bl sub_810713C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08109290 @ =gUnknown_203AD10
ldr r0, [r0]
ldrb r1, [r0, 0x5]
@@ -2638,9 +2638,9 @@ _08109242:
movs r1, 0x2D
movs r2, 0xB
movs r3, 0x1
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0810928C @ =gUnknown_203ACFC
ldrb r0, [r0, 0x6]
adds r0, r6
@@ -2653,7 +2653,7 @@ _08109242:
adds r0, r7, r0
ldr r2, [r0]
adds r0, r5, 0
- bl sub_80775E8
+ bl SetTaskFuncWithFollowupFunc
add sp, 0x8
pop {r3}
mov r8, r3
@@ -2709,7 +2709,7 @@ _081092E4:
adds r0, r1
strh r0, [r4, 0x6]
adds r0, r6, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
movs r1, 0x1
negs r1, r1
adds r0, r6, 0
@@ -2720,7 +2720,7 @@ _081092FA:
adds r0, r2
strh r0, [r4, 0x6]
adds r0, r6, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
adds r0, r6, 0
movs r1, 0x1
_0810930C:
@@ -2783,20 +2783,20 @@ _08109358:
adds r4, 0x8
adds r2, r4
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_8108888
bl sub_81088D8
adds r0, r6, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
_081093AA:
pop {r4-r6}
pop {r0}
@@ -2830,7 +2830,7 @@ sub_81093B8: @ 81093B8
mov r2, sp
adds r2, 0x16
add r1, sp, 0x14
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r2, r8
ldrb r0, [r2]
movs r1, 0x10
@@ -2853,17 +2853,17 @@ sub_81093B8: @ 81093B8
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r4, _081094A4 @ =gUnknown_2021D18
ldr r1, _081094A8 @ =gUnknown_841633F
adds r0, r4, 0
bl sub_8008FCC
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
str r0, [sp]
movs r0, 0x2
@@ -2878,7 +2878,7 @@ sub_81093B8: @ 81093B8
bl sub_810B8F0
mov r1, r8
ldrb r0, [r1]
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -2931,7 +2931,7 @@ sub_81094B0: @ 81094B0
cmp r0, 0x1
beq _0810959E
ldrb r0, [r4]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r5, r0, 0
ldrb r0, [r4]
ldr r3, _0810953C @ =gUnknown_203ACFC
@@ -2942,9 +2942,9 @@ sub_81094B0: @ 81094B0
adds r1, r2, r1
adds r3, 0x8
adds r2, r3
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldrb r0, [r4]
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -2967,7 +2967,7 @@ sub_81094B0: @ 81094B0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -3001,7 +3001,7 @@ _08109558:
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -3104,7 +3104,7 @@ _08109628:
ldrh r1, [r1]
adds r2, r7
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
@@ -3182,7 +3182,7 @@ _081096CA:
ldrh r1, [r1]
adds r2, r7
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
@@ -3315,7 +3315,7 @@ sub_81097E4: @ 81097E4
lsrs r6, 24
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08109848 @ =gUnknown_2021CD0
lsls r4, 16
asrs r4, 16
@@ -3372,9 +3372,9 @@ sub_8109854: @ 8109854
movs r0, 0x1
str r0, [sp, 0x4]
movs r2, 0xB
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -3427,7 +3427,7 @@ _081098E0: .4byte gUnknown_203AD24
_081098E4: .4byte gUnknown_203AD28
_081098E8:
ldrh r0, [r2]
- bl sub_809AA44
+ bl ItemId_GetBattleUsage
lsls r0, 24
cmp r0, 0
beq _0810990C
@@ -3629,7 +3629,7 @@ _08109A90:
cmp r1, r0
bne _08109AB0
movs r0, 0x6
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08109AB0
@@ -3791,7 +3791,7 @@ sub_8109BE4: @ 8109BE4
lsrs r0, 24
cmp r0, 0x1
beq _08109C42
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -3840,7 +3840,7 @@ sub_8109C50: @ 8109C50
lsrs r4, r0, 24
ldr r5, _08109CA0 @ =gUnknown_203AD30
ldrh r0, [r5]
- bl sub_809AA20
+ bl ItemId_GetFieldFunc
cmp r0, 0
beq _08109CB4
movs r0, 0xA
@@ -3848,17 +3848,17 @@ sub_8109C50: @ 8109C50
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
- bl sub_8040C3C
+ bl schedule_bg_copy_tilemap_to_vram
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _08109CA4
ldrh r0, [r5]
- bl sub_809A9FC
+ bl ItemId_GetType
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3871,7 +3871,7 @@ _08109CA0: .4byte gUnknown_203AD30
_08109CA4:
ldr r0, _08109CBC @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_809AA20
+ bl ItemId_GetFieldFunc
adds r1, r0, 0
adds r0, r4, 0
bl _call_via_r1
@@ -3897,18 +3897,18 @@ sub_8109CC0: @ 8109CC0
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x6
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0xA
bl sub_810BA3C
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
strh r0, [r4, 0x10]
movs r1, 0x4
@@ -4006,9 +4006,9 @@ sub_8109DB0: @ 8109DB0
movs r0, 0x6
bl sub_810BA3C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_810876C
@@ -4060,13 +4060,13 @@ _08109E20:
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_8108978
adds r0, r5, 0
bl sub_8109D38
@@ -4085,11 +4085,11 @@ _08109E64:
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_810876C
@@ -4227,14 +4227,14 @@ _08109F6E:
ldrh r1, [r5]
adds r2, r6
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r7]
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r7]
movs r1, 0x1
bl sub_810876C
@@ -4314,7 +4314,7 @@ _0810A052:
ldrh r1, [r5]
adds r2, r6
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r7]
@@ -4361,14 +4361,14 @@ sub_810A0A8: @ 810A0A8
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
adds r0, r5, 0
- bl sub_80BF6D8
+ bl itemid_80BF6D8_mail_related
lsls r0, 24
cmp r0, 0
bne _0810A120
@@ -4385,11 +4385,11 @@ _0810A118: .4byte gUnknown_841630F
_0810A11C: .4byte sub_810A1D0
_0810A120:
adds r0, r5, 0
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _0810A160
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _0810A13E
@@ -4533,12 +4533,12 @@ sub_810A1F8: @ 810A1F8
ldrh r1, [r6]
add r2, r9
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r5]
movs r1, 0x1
bl sub_810876C
@@ -4573,16 +4573,16 @@ sub_810A288: @ 810A288
adds r6, 0x2
mov r1, sp
adds r2, r6, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r0, sp
ldrh r0, [r0]
ldrh r1, [r6]
adds r0, r1
bl sub_8108818
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_810876C
@@ -4607,11 +4607,11 @@ sub_810A2DC: @ 810A2DC
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _0810A320 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4636,7 +4636,7 @@ sub_810A324: @ 810A324
lsrs r4, r0, 24
ldr r5, _0810A36C @ =gUnknown_203AD30
ldrh r0, [r5]
- bl sub_809AA68
+ bl ItemId_GetBattleFunc
cmp r0, 0
beq _0810A364
movs r0, 0xA
@@ -4644,14 +4644,14 @@ sub_810A324: @ 810A324
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
ldrh r0, [r5]
- bl sub_809AA68
+ bl ItemId_GetBattleFunc
adds r1, r0, 0
adds r0, r4, 0
bl _call_via_r1
@@ -4689,7 +4689,7 @@ sub_810A370: @ 810A370
lsrs r4, r0, 16
adds r6, r4, 0
adds r0, r4, 0
- bl sub_80BF6D8
+ bl itemid_80BF6D8_mail_related
lsls r0, 24
cmp r0, 0
bne _0810A3CC
@@ -4732,7 +4732,7 @@ _0810A3F8:
cmp r0, 0x1
beq _0810A420
adds r0, r6, 0
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _0810A420
@@ -4861,7 +4861,7 @@ _0810A4F0:
cmp r0, 0x1
beq _0810A518
adds r0, r6, 0
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _0810A518
@@ -4963,7 +4963,7 @@ _0810A5AC: .4byte 0x0000016d
_0810A5B0: .4byte sub_810A668
_0810A5B4:
ldrh r0, [r6]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
cmp r0, 0
bne _0810A5F8
@@ -5060,14 +5060,14 @@ _0810A678: .4byte sub_810A67C
thumb_func_start sub_810A67C
sub_810A67C: @ 810A67C
push {lr}
- ldr r2, _0810A68C @ =sub_80567DC
+ ldr r2, _0810A68C @ =c2_exit_to_overworld_2_switch
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
pop {r0}
bx r0
.align 2, 0
-_0810A68C: .4byte sub_80567DC
+_0810A68C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_810A67C
thumb_func_start sub_810A690
@@ -5091,7 +5091,7 @@ sub_810A690: @ 810A690
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -5154,13 +5154,13 @@ sub_810A720: @ 810A720
movs r0, 0x5
bl sub_810BA9C
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_810876C
@@ -5229,7 +5229,7 @@ sub_810A770: @ 810A770
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r9
@@ -5314,7 +5314,7 @@ sub_810A85C: @ 810A85C
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -5337,9 +5337,9 @@ _0810A8BC:
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_8108978
adds r0, r4, 0
bl sub_810A690
@@ -5360,13 +5360,13 @@ _0810A8F0:
movs r0, 0x5
bl sub_810BA9C
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_8108978
ldrb r0, [r5]
movs r1, 0x1
@@ -5391,9 +5391,9 @@ sub_810A940: @ 810A940
ldr r0, _0810A9B4 @ =gUnknown_3005098
adds r4, r0
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0810A9B8 @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _0810A9BC @ =gUnknown_2021CD0
@@ -5408,7 +5408,7 @@ sub_810A940: @ 810A940
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -5471,7 +5471,7 @@ sub_810A9D4: @ 810A9D4
lsls r7, 2
adds r4, r7
ldrh r0, [r5]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r8
@@ -5479,7 +5479,7 @@ sub_810A9D4: @ 810A9D4
ldrsh r1, [r2, r3]
muls r1, r0
adds r0, r4, 0
- bl sub_809FDA0
+ bl AddMoney
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -5519,7 +5519,7 @@ sub_810A9D4: @ 810A9D4
ldrh r1, [r5]
add r2, r9
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -5588,7 +5588,7 @@ _0810AB0E:
movs r0, 0x2
bl sub_810BA3C
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _0810AB3C @ =gUnknown_203AD10
ldr r2, [r0]
ldrb r1, [r2, 0x5]
@@ -5684,13 +5684,13 @@ _0810ABBC:
bl sub_810BAD8
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
bl sub_810BA3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_8108978
adds r0, r5, 0
bl sub_810AC40
@@ -5709,9 +5709,9 @@ _0810AC00:
movs r0, 0
bl sub_810BA3C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_810876C
@@ -5830,7 +5830,7 @@ _0810AD1E:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r4, _0810AD80 @ =gUnknown_3005008
ldr r0, [r4]
ldr r5, _0810AD84 @ =0x00000296
@@ -5844,8 +5844,8 @@ _0810AD1E:
lsrs r6, r0, 24
cmp r6, 0x1
bne _0810AD90
- bl sub_8069940
- bl sub_8068974
+ bl ScriptContext2_Enable
+ bl player_bitmagic
bl sub_805C270
bl sub_805C780
ldr r2, _0810AD88 @ =gUnknown_203AD30
@@ -5854,9 +5854,9 @@ _0810AD1E:
ldrh r1, [r0]
strh r1, [r2]
ldrh r0, [r0]
- bl sub_809AA20
+ bl ItemId_GetFieldFunc
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0810AD8C @ =gUnknown_3005090
@@ -5878,7 +5878,7 @@ _0810AD90:
strh r1, [r0]
_0810AD98:
ldr r0, _0810ADA8 @ =gUnknown_81A77A0
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
_0810AD9E:
movs r0, 0x1
_0810ADA0:
@@ -5924,7 +5924,7 @@ sub_810ADD8: @ 810ADD8
ldr r5, _0810AEBC @ =gUnknown_203AD2C
movs r0, 0xB2
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
ldr r4, _0810AEC0 @ =gUnknown_3005008
ldr r1, [r4]
@@ -6103,7 +6103,7 @@ _0810AF3A:
bls _0810AF3A
mov r1, r12
ldr r0, [r1]
- bl sub_8002BC4
+ bl Free
pop {r4-r7}
pop {r0}
bx r0
@@ -6203,9 +6203,9 @@ _0810B01C:
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
@@ -6247,7 +6247,7 @@ sub_810B070: @ 810B070
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0810B0A4 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -6276,7 +6276,7 @@ sub_810B0AC: @ 810B0AC
cmp r0, 0
bne _0810B0FE
ldr r0, _0810B0E0 @ =sub_8108CFC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6286,7 +6286,7 @@ sub_810B0AC: @ 810B0AC
ldr r0, [r0]
cmp r0, 0
beq _0810B0E8
- bl sub_8000544
+ bl SetMainCallback2
b _0810B0F0
.align 2, 0
_0810B0DC: .4byte gUnknown_2037AB8
@@ -6295,12 +6295,12 @@ _0810B0E4: .4byte gUnknown_203AD10
_0810B0E8:
ldr r0, _0810B104 @ =gUnknown_203ACFC
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
_0810B0F0:
bl sub_8108978
bl sub_8108B04
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0810B0FE:
pop {r4}
pop {r0}
@@ -6507,7 +6507,7 @@ _0810B290:
movs r0, 0x5
bl sub_80722CC
movs r0, 0x1
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
b _0810B36C
_0810B29E:
movs r0, 0x5
@@ -6524,9 +6524,9 @@ _0810B29E:
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r7]
ldr r4, _0810B324 @ =gUnknown_203ACFC
ldrh r2, [r4, 0x6]
@@ -6547,7 +6547,7 @@ _0810B29E:
ldrh r1, [r5]
adds r2, r6
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r7]
@@ -6573,7 +6573,7 @@ _0810B32C:
movs r0, 0x80
strh r0, [r1, 0x30]
ldrb r0, [r7]
- bl sub_8107078
+ bl ListMenuHandleInput
b _0810B36C
.align 2, 0
_0810B340: .4byte gUnknown_30030F0
@@ -6701,7 +6701,7 @@ _0810B428:
_0810B430:
strh r0, [r1, 0x30]
ldrb r0, [r4]
- bl sub_8107078
+ bl ListMenuHandleInput
b _0810B4B0
.align 2, 0
_0810B43C: .4byte gUnknown_30030F0
@@ -6729,9 +6729,9 @@ _0810B468:
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
@@ -6817,7 +6817,7 @@ _0810B528:
strh r6, [r0, 0x2E]
strh r7, [r0, 0x30]
ldrb r0, [r5]
- bl sub_8107078
+ bl ListMenuHandleInput
b _0810B5C0
.align 2, 0
_0810B538: .4byte gUnknown_30030F0
@@ -6845,9 +6845,9 @@ _0810B564:
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
@@ -6950,7 +6950,7 @@ _0810B64E:
strh r5, [r0, 0x2E]
strh r7, [r0, 0x30]
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
b _0810B6E0
.align 2, 0
_0810B65C: .4byte gUnknown_30030F0
@@ -6980,9 +6980,9 @@ _0810B68C:
movs r0, 0x6
bl sub_810BA3C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
bl sub_8003F20
diff --git a/asm/item_menu_icons.s b/asm/item_menu_icons.s
index 243146014..e1c50b7ce 100644
--- a/asm/item_menu_icons.s
+++ b/asm/item_menu_icons.s
@@ -38,7 +38,7 @@ sub_80984FC: @ 80984FC
movs r1, 0x28
movs r2, 0x44
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _08098524 @ =gUnknown_2039878
strb r0, [r1]
adds r0, r4, 0
@@ -68,7 +68,7 @@ sub_8098528: @ 8098528
strh r2, [r0, 0x26]
ldr r2, _0809855C @ =sub_8098560
str r2, [r0, 0x1C]
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -119,7 +119,7 @@ sub_8098580: @ 8098580
beq _080985AA
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080985B8 @ =sub_80985BC
str r0, [r4, 0x1C]
_080985AA:
@@ -144,7 +144,7 @@ sub_80985BC: @ 80985BC
beq _080985D8
adds r0, r4, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _080985E0 @ =nullsub_8
str r0, [r4, 0x1C]
_080985D8:
@@ -170,7 +170,7 @@ _080985EC:
ldr r0, _08098628 @ =gUnknown_83D4250
movs r2, 0x7
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r1, r7, r5
strb r0, [r1]
adds r4, r1, 0
@@ -184,7 +184,7 @@ _080985EC:
lsls r0, 2
adds r0, r6
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
b _0809863C
.align 2, 0
_08098620: .4byte gUnknown_2039879
@@ -197,7 +197,7 @@ _0809862C:
lsls r0, 2
adds r0, r6
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_0809863C:
ldrb r1, [r4]
lsls r0, r1, 4
@@ -302,14 +302,14 @@ sub_80986EC: @ 80986EC
ldr r5, _08098714 @ =gUnknown_2039884
movs r0, 0x90
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
beq _08098722
ldr r4, _08098718 @ =gUnknown_2039888
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
cmp r0, 0
beq _0809871C
@@ -320,7 +320,7 @@ _08098714: .4byte gUnknown_2039884
_08098718: .4byte gUnknown_2039888
_0809871C:
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
_08098722:
movs r0, 0
_08098724:
@@ -373,7 +373,7 @@ sub_8098758: @ 8098758
bl sub_8098974
ldr r2, _080987FC @ =gUnknown_2039884
ldr r1, [r2]
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r1, _080987FC @ =gUnknown_2039884
ldr r0, [r1]
ldr r2, _08098800 @ =gUnknown_2039888
@@ -394,7 +394,7 @@ sub_8098758: @ 8098758
ands r1, r2
orrs r1, r3
str r1, [r0, 0x4]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r7, 0
movs r1, 0x1
bl sub_8098974
@@ -404,7 +404,7 @@ sub_8098758: @ 8098758
ands r1, r4
orrs r1, r5
str r1, [r0, 0x4]
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
ldr r0, _0809880C @ =gUnknown_83D427C
mov r1, sp
movs r2, 0xC
@@ -415,16 +415,16 @@ sub_8098758: @ 8098758
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080987FC @ =gUnknown_2039884
ldr r0, [r2]
- bl sub_8002BC4
+ bl Free
ldr r1, _08098800 @ =gUnknown_2039888
ldr r0, [r1]
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
b _08098812
.align 2, 0
@@ -464,7 +464,7 @@ sub_809881C: @ 809881C
bl sub_8098974
ldr r2, _080988C8 @ =gUnknown_2039884
ldr r1, [r2]
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r1, _080988C8 @ =gUnknown_2039884
ldr r0, [r1]
ldr r2, _080988CC @ =gUnknown_2039888
@@ -485,7 +485,7 @@ sub_809881C: @ 809881C
ands r1, r2
orrs r1, r3
str r1, [r0, 0x4]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r7, 0
movs r1, 0x1
bl sub_8098974
@@ -495,7 +495,7 @@ sub_809881C: @ 809881C
ands r1, r4
orrs r1, r5
str r1, [r0, 0x4]
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
mov r0, r8
mov r1, sp
movs r2, 0xC
@@ -506,16 +506,16 @@ sub_809881C: @ 809881C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _080988C8 @ =gUnknown_2039884
ldr r0, [r2]
- bl sub_8002BC4
+ bl Free
ldr r1, _080988CC @ =gUnknown_2039888
ldr r0, [r1]
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
b _080988DA
.align 2, 0
@@ -549,9 +549,9 @@ sub_80988E8: @ 80988E8
adds r4, r1, 0
adds r4, 0x66
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -595,7 +595,7 @@ sub_8098940: @ 8098940
lsls r0, 2
ldr r1, _08098970 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
movs r0, 0xFF
strb r0, [r4]
_08098964:
@@ -647,9 +647,9 @@ sub_80989A0: @ 80989A0
adds r4, r1, 0
adds r4, 0x66
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0
adds r1, r4, 0
adds r2, r6, 0
diff --git a/asm/item_pc.s b/asm/item_pc.s
index 3978f9f38..c7a5c56f1 100644
--- a/asm/item_pc.s
+++ b/asm/item_pc.s
@@ -16,13 +16,13 @@ sub_810D3F4: @ 810D3F4
bhi _0810D410
ldr r6, _0810D418 @ =gUnknown_203ADBC
movs r0, 0x14
- bl sub_8002B9C
+ bl Alloc
str r0, [r6]
cmp r0, 0
bne _0810D41C
_0810D410:
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0810D462
.align 2, 0
_0810D418: .4byte gUnknown_203ADBC
@@ -62,7 +62,7 @@ _0810D448:
cmp r2, 0x2
bls _0810D448
adds r0, r5, 0
- bl sub_8000544
+ bl SetMainCallback2
_0810D462:
pop {r4-r6}
pop {r0}
@@ -75,11 +75,11 @@ _0810D46C: .4byte sub_810D4A0
thumb_func_start sub_810D470
sub_810D470: @ 810D470
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_810D470
@@ -87,9 +87,9 @@ sub_810D470: @ 810D470
thumb_func_start sub_810D48C
sub_810D48C: @ 810D48C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_810D48C
@@ -159,25 +159,25 @@ _0810D4E8:
.4byte _0810D668
_0810D53C:
bl sub_80BF768
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
b _0810D674
_0810D546:
- bl sub_8087E64
+ bl remove_some_task
b _0810D674
_0810D54C:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
b _0810D674
_0810D552:
- bl sub_8070528
+ bl ResetPaletteFade
b _0810D674
_0810D558:
- bl sub_8006B10
+ bl ResetSpriteData
b _0810D674
_0810D55E:
bl sub_80984D8
b _0810D674
_0810D564:
- bl sub_80773BC
+ bl ResetTasks
b _0810D674
_0810D56A:
bl sub_810D71C
@@ -229,7 +229,7 @@ _0810D5C6:
_0810D5CC:
ldr r0, _0810D5F8 @ =sub_810DEA0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -237,7 +237,7 @@ _0810D5CC:
ldr r2, _0810D600 @ =gUnknown_203ADCC
ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6]
- bl sub_8106FF8
+ bl ListMenuInit
ldr r2, _0810D604 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -268,7 +268,7 @@ _0810D616:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0810D674
.align 2, 0
_0810D62C: .4byte gUnknown_203ADCC
@@ -283,7 +283,7 @@ _0810D630:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0810D674
.align 2, 0
_0810D64C: .4byte gUnknown_203ADCC
@@ -316,9 +316,9 @@ _0810D674:
_0810D684: .4byte gUnknown_30030F0
_0810D688:
ldr r0, _0810D698 @ =sub_810D48C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0810D69C @ =sub_810D470
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
b _0810D6A2
.align 2, 0
@@ -343,14 +343,14 @@ sub_810D6AC: @ 810D6AC
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0810D6DC @ =sub_810D6E8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _0810D6E0 @ =sub_810D48C
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0810D6E4 @ =sub_810D470
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r0}
bx r0
@@ -373,10 +373,10 @@ sub_810D6E8: @ 810D6E8
bne _0810D70C
ldr r0, _0810D718 @ =gUnknown_203ADCC
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_810DC40
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0810D70C:
pop {r4}
pop {r0}
@@ -394,7 +394,7 @@ sub_810D71C: @ 810D71C
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
beq _0810D784
@@ -409,20 +409,20 @@ sub_810D71C: @ 810D71C
bl sub_8001658
ldr r1, [r5]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
b _0810D786
.align 2, 0
@@ -460,18 +460,18 @@ _0810D7AC:
beq _0810D800
b _0810D814
_0810D7B6:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r1, _0810D7CC @ =gUnknown_8E85090
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _0810D806
.align 2, 0
_0810D7CC: .4byte gUnknown_8E85090
_0810D7D0:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -479,7 +479,7 @@ _0810D7D0:
ldr r0, _0810D7E8 @ =gUnknown_8E85458
ldr r1, _0810D7EC @ =gUnknown_203ADC0
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _0810D806
.align 2, 0
_0810D7E8: .4byte gUnknown_8E85458
@@ -488,13 +488,13 @@ _0810D7F0:
ldr r0, _0810D7FC @ =gUnknown_8E85408
movs r1, 0
movs r2, 0x60
- bl sub_80703A8
+ bl LoadCompressedPalette
b _0810D806
.align 2, 0
_0810D7FC: .4byte gUnknown_8E85408
_0810D800:
ldr r0, _0810D810 @ =gUnknown_83D4240
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_0810D806:
ldr r1, [r5]
ldrh r0, [r1, 0xC]
@@ -505,7 +505,7 @@ _0810D806:
_0810D810: .4byte gUnknown_83D4240
_0810D814:
ldr r0, _0810D828 @ =gUnknown_83D4248
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
ldr r0, _0810D82C @ =gUnknown_203ADBC
ldr r1, [r0]
movs r0, 0
@@ -529,14 +529,14 @@ sub_810D83C: @ 810D83C
push {r4,lr}
ldr r4, _0810D860 @ =gUnknown_203ADC4
movs r0, 0xF8
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0810D868
ldr r4, _0810D864 @ =gUnknown_203ADC8
movs r0, 0xD9
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0810D868
@@ -569,7 +569,7 @@ _0810D87E:
lsls r1, 2
adds r0, r1
ldrh r0, [r0]
- bl sub_809A8BC
+ bl ItemId_GetItem
ldr r1, _0810D93C @ =gUnknown_203ADC4
ldr r2, [r1]
lsls r1, r4, 3
@@ -698,13 +698,13 @@ _0810D968:
adds r0, r4, 0
bl sub_80988E8
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
bne _0810D9C4
adds r0, r4, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
movs r1, 0xD
@@ -717,7 +717,7 @@ _0810D9BC: .4byte gUnknown_203ADBC
_0810D9C0: .4byte gUnknown_8247094
_0810D9C4:
adds r0, r4, 0
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r5, r0, 0
b _0810D9DA
_0810D9CE:
@@ -736,7 +736,7 @@ _0810D9DA:
strb r0, [r2, 0x5]
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r1, 0x3
str r1, [sp]
movs r0, 0x2
@@ -839,7 +839,7 @@ sub_810DAB4: @ 810DAB4
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -876,7 +876,7 @@ sub_810DAD4: @ 810DAD4
movs r1, 0
movs r2, 0
adds r3, r5, 0
- bl sub_8004378
+ bl FillWindowPixelRect
b _0810DB26
_0810DB10:
ldr r2, _0810DB30 @ =gUnknown_841623B
@@ -941,7 +941,7 @@ sub_810DB5C: @ 810DB5C
movs r1, 0x80
movs r2, 0x8
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -972,7 +972,7 @@ sub_810DB98: @ 810DB98
movs r1, 0xD4
movs r2, 0x78
movs r3, 0x98
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -991,7 +991,7 @@ sub_810DBD0: @ 810DBD0
ldrb r0, [r1, 0x8]
cmp r0, 0xFF
beq _0810DBE6
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x8]
@@ -1056,25 +1056,25 @@ sub_810DC40: @ 810DC40
ldr r0, [r0]
cmp r0, 0
beq _0810DC4E
- bl sub_8002BC4
+ bl Free
_0810DC4E:
ldr r0, _0810DC80 @ =gUnknown_203ADC0
ldr r0, [r0]
cmp r0, 0
beq _0810DC5A
- bl sub_8002BC4
+ bl Free
_0810DC5A:
ldr r0, _0810DC84 @ =gUnknown_203ADC4
ldr r0, [r0]
cmp r0, 0
beq _0810DC66
- bl sub_8002BC4
+ bl Free
_0810DC66:
ldr r0, _0810DC88 @ =gUnknown_203ADC8
ldr r0, [r0]
cmp r0, 0
beq _0810DC72
- bl sub_8002BC4
+ bl Free
_0810DC72:
bl sub_8003ECC
pop {r0}
@@ -1102,7 +1102,7 @@ sub_810DC8C: @ 810DC8C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0810DCC4
.align 2, 0
_0810DCB0: .4byte gUnknown_203ADCC
@@ -1160,7 +1160,7 @@ sub_810DCE4: @ 810DCE4
ldr r0, [r0]
cmp r0, 0
beq _0810DD38
- bl sub_8000544
+ bl SetMainCallback2
b _0810DD40
.align 2, 0
_0810DD28: .4byte gUnknown_3005098
@@ -1170,12 +1170,12 @@ _0810DD34: .4byte gUnknown_203ADBC
_0810DD38:
subs r0, r4, 0x4
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
_0810DD40:
bl sub_810DBD0
bl sub_810DC40
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0810DD4E:
pop {r4,r5}
pop {r0}
@@ -1356,7 +1356,7 @@ sub_810DE6C: @ 810DE6C
movs r3, 0x1E
bl sub_80F6B08
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -1403,7 +1403,7 @@ sub_810DEA0: @ 810DEA0
adds r4, 0x2
mov r1, sp
adds r2, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
mov r0, sp
ldrh r1, [r0]
ldrh r0, [r4]
@@ -1431,12 +1431,12 @@ _0810DF18: .4byte gUnknown_30030F0
_0810DF1C: .4byte gUnknown_203ADBC
_0810DF20:
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r4, r0, 0
ldrb r0, [r6]
ldr r1, _0810DF44 @ =gUnknown_203ADD0
adds r2, r1, 0x2
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -1551,17 +1551,17 @@ sub_810DFE0: @ 810DFE0
bl sub_810DD68
lsls r0, 16
lsrs r0, 16
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0810E0A8 @ =gUnknown_2021D18
ldr r1, _0810E0AC @ =gUnknown_841633F
adds r0, r4, 0
bl sub_8008FCC
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r1, 0x3
str r1, [sp]
movs r0, 0x2
@@ -1578,7 +1578,7 @@ sub_810DFE0: @ 810DFE0
movs r4, 0x20
negs r4, r4
ldrb r0, [r6]
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1625,16 +1625,16 @@ sub_810E0B4: @ 810E0B4
ldr r0, _0810E11C @ =gUnknown_3005098
adds r4, r0
ldrb r0, [r4]
- bl sub_8107078
+ bl ListMenuHandleInput
ldrb r0, [r4]
ldr r7, _0810E120 @ =gUnknown_203ADD0
adds r2, r7, 0x2
adds r1, r7, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
movs r5, 0x20
negs r5, r5
ldrb r0, [r4]
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1746,7 +1746,7 @@ _0810E1C0:
subs r2, r5, 0x4
ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
@@ -1803,7 +1803,7 @@ _0810E234:
subs r2, r5, 0x4
ldrh r1, [r2, 0x4]
ldrh r2, [r2, 0x6]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r6]
@@ -1865,7 +1865,7 @@ sub_810E274: @ 810E274
movs r1, 0x2
movs r2, 0x8
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
movs r0, 0x2
movs r1, 0x1
bl sub_80F79D8
@@ -1904,7 +1904,7 @@ sub_810E274: @ 810E274
movs r3, 0
bl sub_810EA34
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x8
negs r0, r0
add r9, r0
@@ -1933,7 +1933,7 @@ sub_810E358: @ 810E358
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -1982,7 +1982,7 @@ sub_810E3A4: @ 810E3A4
movs r0, 0
bl sub_810EAF0
movs r0, 0x4
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
strh r0, [r4, 0x10]
ldrh r0, [r4, 0x2]
@@ -1992,9 +1992,9 @@ sub_810E3A4: @ 810E3A4
cmp r0, 0x1
bne _0810E3F4
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
bl sub_810E418
b _0810E40E
@@ -2002,7 +2002,7 @@ sub_810E3A4: @ 810E3A4
_0810E3F0: .4byte gUnknown_3005098
_0810E3F4:
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r0, [r4, 0x2]
bl sub_810E5E0
bl sub_810DB98
@@ -2200,7 +2200,7 @@ sub_810E578: @ 810E578
movs r0, 0x2
bl sub_810EAF0
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5]
ldr r4, _0810E5D8 @ =gUnknown_203ADD0
adds r2, r4, 0x2
@@ -2213,12 +2213,12 @@ sub_810E578: @ 810E578
subs r4, 0x4
ldrh r1, [r4, 0x4]
ldrh r2, [r4, 0x6]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r6, 0
bl sub_810DFB0
pop {r4-r6}
@@ -2281,7 +2281,7 @@ sub_810E5E0: @ 810E5E0
movs r3, 0x8
bl sub_810EA34
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x14
pop {r4-r6}
pop {r0}
@@ -2308,7 +2308,7 @@ sub_810E670: @ 810E670
movs r1, 0x11
movs r2, 0xA
movs r3, 0xA
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r0, _0810E6CC @ =gUnknown_2021CD0
lsls r4, 16
asrs r4, 16
@@ -2380,14 +2380,14 @@ _0810E70C:
movs r0, 0x1
bl sub_810EAF0
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_810DAB4
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_810DBD0
adds r0, r5, 0
bl sub_810E418
@@ -2407,16 +2407,16 @@ _0810E750:
movs r0, 0x1
bl sub_810EAF0
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_810DAB4
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_810DBD0
adds r0, r6, 0
bl sub_810DFB0
@@ -2431,7 +2431,7 @@ sub_810E79C: @ 810E79C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _0810E7DC
@@ -2441,9 +2441,9 @@ sub_810E79C: @ 810E79C
movs r0, 0
bl sub_810EAF0
movs r0, 0x4
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r1, _0810E7D4 @ =gUnknown_841632A
ldr r2, _0810E7D8 @ =sub_810E848
adds r0, r4, 0
@@ -2530,14 +2530,14 @@ sub_810E848: @ 810E848
movs r1, 0
bl sub_810F260
movs r0, 0x5
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
bl sub_810DAB4
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r4, 0
bl sub_810DFB0
_0810E892:
@@ -2566,16 +2566,16 @@ sub_810E8A0: @ 810E8A0
movs r0, 0
bl sub_810EAF0
movs r0, 0x4
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_810DAB4
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
bl sub_810DFB0
pop {r4,r5}
@@ -2606,28 +2606,28 @@ sub_810E8F0: @ 810E8F0
movs r2, 0xB0
bl sub_814FEAC
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0810E97C @ =gUnknown_841F408
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0
_0810E938:
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x2
bls _0810E938
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r4, 0
ldr r3, _0810E980 @ =gUnknown_203ADD8
movs r2, 0xFF
@@ -2803,7 +2803,7 @@ sub_810EA9C: @ 810EA9C
lsls r2, 2
movs r1, 0
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_810EA9C
@@ -2827,7 +2827,7 @@ sub_810EAB4: @ 810EAB4
ldr r2, _0810EAEC @ =0x000003a3
movs r1, 0x1
movs r3, 0xC
- bl sub_810F2E8
+ bl SetWindowBorderStyle
_0810EADC:
ldrb r0, [r4]
pop {r4}
@@ -2851,7 +2851,7 @@ sub_810EAF0: @ 810EAF0
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0xFF
@@ -2899,7 +2899,7 @@ sub_810EB30: @ 810EB30
movs r3, 0xB
bl sub_80BF474
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r4-r6}
pop {r0}
diff --git a/asm/item_use.s b/asm/item_use.s
index a5abaf387..78d7b28b1 100644
--- a/asm/item_use.s
+++ b/asm/item_use.s
@@ -26,7 +26,7 @@ _080A0FD8: .4byte gUnknown_203AD30
_080A0FDC: .4byte gUnknown_3005090
_080A0FE0:
ldrh r0, [r1]
- bl sub_809A9FC
+ bl ItemId_GetType
_080A0FE6:
subs r0, 0x1
lsls r0, 24
@@ -111,7 +111,7 @@ sub_80A1084: @ 80A1084
bl sub_807DC00
ldr r0, _080A1098 @ =sub_80A109C
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -170,7 +170,7 @@ _080A10F8:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080A1104:
pop {r4-r7}
pop {r0}
@@ -205,9 +205,9 @@ sub_80A112C: @ 80A112C
movs r1, 0x1
bl sub_80F6F54
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
pop {r4}
pop {r0}
bx r0
@@ -219,7 +219,7 @@ sub_80A1150: @ 80A1150
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -228,7 +228,7 @@ sub_80A1150: @ 80A1150
b _080A117E
_080A1168:
adds r0, r4, 0
- bl sub_809AA20
+ bl ItemId_GetFieldFunc
ldr r1, _080A1178 @ =sub_80A1750
cmp r0, r1
beq _080A117C
@@ -258,12 +258,12 @@ _080A1190: .4byte sub_80A1194
thumb_func_start sub_80A1194
sub_80A1194: @ 80A1194
push {lr}
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
bl sub_807DC00
ldr r0, _080A11B8 @ =sub_80A11C0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r1, _080A11BC @ =gUnknown_2031DE0
movs r0, 0
strb r0, [r1]
@@ -285,10 +285,10 @@ sub_80A11C0: @ 80A11C0
lsrs r0, 24
cmp r0, 0x1
bne _080A11E0
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A11E0:
pop {r4}
pop {r0}
@@ -342,7 +342,7 @@ sub_80A122C: @ 80A122C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -438,7 +438,7 @@ sub_80A1304: @ 80A1304
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x6
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080A131C
@@ -448,9 +448,9 @@ _080A131C:
movs r0, 0x6
bl sub_80BD5C8
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -500,7 +500,7 @@ sub_80A137C: @ 80A137C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -517,12 +517,12 @@ sub_80A137C: @ 80A137C
cmp r0, 0
bne _080A1404
movs r0, 0x10
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080A1404
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
bne _080A13D4
@@ -573,12 +573,12 @@ sub_80A1410: @ 80A1410
lsrs r4, 24
ldr r0, _080A1434 @ =gUnknown_203AD30
ldrh r0, [r0]
- bl sub_809AA8C
+ bl ItemId_GetSecondaryId
lsls r0, 24
lsrs r0, 24
bl sub_805D2C0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -659,7 +659,7 @@ _080A14D0:
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080A14DC:
pop {r4,r5}
pop {r0}
@@ -718,7 +718,7 @@ _080A1554:
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080A1560:
pop {r4,r5}
pop {r0}
@@ -743,7 +743,7 @@ _080A1578:
movs r1, 0x11
adds r2, r4, 0
movs r3, 0
- bl sub_80413C0
+ bl ExecuteTableBasedItemEffect_
lsls r0, 24
cmp r0, 0
bne _080A1592
@@ -753,7 +753,7 @@ _080A1592:
lsls r0, 24
lsrs r4, r0, 24
_080A1598:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -790,7 +790,7 @@ _080A15E8:
ldr r3, _080A15FC @ =sub_80A1648
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
b _080A1638
.align 2, 0
_080A15F8: .4byte gUnknown_8416690
@@ -821,7 +821,7 @@ _080A162C:
ldr r3, _080A1644 @ =sub_80A112C
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080A1638:
pop {r4-r6}
pop {r0}
@@ -861,7 +861,7 @@ sub_80A1674: @ 80A1674
lsrs r4, r0, 24
adds r5, r4, 0
movs r0, 0
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _080A16C0
@@ -889,7 +889,7 @@ _080A16B4:
ldr r3, _080A16CC @ =sub_80A112C
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080A16C0:
pop {r4,r5}
pop {r0}
@@ -947,14 +947,14 @@ sub_80A1718: @ 80A1718
lsls r0, 24
lsrs r0, 24
ldr r2, _080A172C @ =gUnknown_3005E98
- ldr r1, _080A1730 @ =sub_8125A3C
+ ldr r1, _080A1730 @ =dp05_pp_up
str r1, [r2]
bl sub_80A16D0
pop {r0}
bx r0
.align 2, 0
_080A172C: .4byte gUnknown_3005E98
-_080A1730: .4byte sub_8125A3C
+_080A1730: .4byte dp05_pp_up
thumb_func_end sub_80A1718
thumb_func_start sub_80A1734
@@ -1031,7 +1031,7 @@ _080A17B8:
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080A17D0 @ =sub_80A17E8
str r0, [r5]
_080A17C8:
@@ -1068,19 +1068,19 @@ sub_80A17E8: @ 80A17E8
bne _080A1812
bl sub_80563F0
bl sub_80A1184
- ldr r1, _080A181C @ =sub_80567DC
+ ldr r1, _080A181C @ =c2_exit_to_overworld_2_switch
movs r0, 0
movs r2, 0x1
bl sub_81317F8
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A1812:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A1818: .4byte gUnknown_2037AB8
-_080A181C: .4byte sub_80567DC
+_080A181C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A17E8
thumb_func_start sub_80A1820
@@ -1109,7 +1109,7 @@ _080A1850:
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080A1868 @ =sub_80A1880
str r0, [r5]
_080A1860:
@@ -1146,19 +1146,19 @@ sub_80A1880: @ 80A1880
bne _080A18AA
bl sub_80563F0
bl sub_80A1184
- ldr r1, _080A18B4 @ =sub_80567DC
+ ldr r1, _080A18B4 @ =c2_exit_to_overworld_2_switch
movs r0, 0
movs r2, 0x1
bl sub_813CD50
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A18AA:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A18B0: .4byte gUnknown_2037AB8
-_080A18B4: .4byte sub_80567DC
+_080A18B4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1880
thumb_func_start sub_80A18B8
@@ -1225,7 +1225,7 @@ _080A1930:
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080A1948 @ =sub_80A1960
str r0, [r5]
_080A1940:
@@ -1261,18 +1261,18 @@ sub_80A1960: @ 80A1960
bne _080A1988
bl sub_80563F0
bl sub_80A1184
- ldr r1, _080A1994 @ =sub_80567DC
+ ldr r1, _080A1994 @ =c2_exit_to_overworld_2_switch
movs r0, 0
bl sub_815ABC4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A1988:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A1990: .4byte gUnknown_2037AB8
-_080A1994: .4byte sub_80567DC
+_080A1994: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1960
thumb_func_start sub_80A1998
@@ -1319,7 +1319,7 @@ sub_80A19E8: @ 80A19E8
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _080A1A2A
@@ -1331,7 +1331,7 @@ sub_80A19E8: @ 80A19E8
bl sub_80A2294
ldr r5, _080A1A38 @ =0x00004020
ldrh r0, [r4]
- bl sub_809A948
+ bl ItemId_GetHoldEffectParam
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1363,12 +1363,12 @@ sub_80A1A44: @ 80A1A44
movs r1, 0x1
bl sub_809A1D8
ldrh r0, [r4]
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
bl sub_8108DC8
ldrh r0, [r4]
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
bl sub_81089F4
@@ -1581,7 +1581,7 @@ sub_80A1C08: @ 80A1C08
ldr r3, _080A1C40 @ =sub_80A1C44
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r4}
pop {r0}
bx r0
@@ -1600,7 +1600,7 @@ sub_80A1C44: @ 80A1C44
bl sub_80559E4
bl sub_8085620
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -1632,7 +1632,7 @@ _080A1C90:
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080A1CA8 @ =sub_80A1CC0
str r0, [r5]
_080A1CA0:
@@ -1668,18 +1668,18 @@ sub_80A1CC0: @ 80A1CC0
bne _080A1CE8
bl sub_80563F0
bl sub_80A1184
- ldr r1, _080A1CF4 @ =sub_80567DC
+ ldr r1, _080A1CF4 @ =c2_exit_to_overworld_2_switch
movs r0, 0
bl sub_80BFF50
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A1CE8:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A1CF0: .4byte gUnknown_2037AB8
-_080A1CF4: .4byte sub_80567DC
+_080A1CF4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1CC0
thumb_func_start sub_80A1CF8
@@ -1716,7 +1716,7 @@ _080A1D3C:
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080A1D54 @ =sub_80A1D68
str r0, [r5]
_080A1D4C:
@@ -1751,17 +1751,17 @@ sub_80A1D68: @ 80A1D68
bne _080A1D8E
bl sub_80563F0
bl sub_80A1184
- ldr r0, _080A1D98 @ =sub_80567DC
+ ldr r0, _080A1D98 @ =c2_exit_to_overworld_2_switch
bl sub_812C3AC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080A1D8E:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A1D94: .4byte gUnknown_2037AB8
-_080A1D98: .4byte sub_80567DC
+_080A1D98: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80A1D68
thumb_func_start sub_80A1D9C
@@ -1837,7 +1837,7 @@ sub_80A1E1C: @ 80A1E1C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8040F6C
+ bl IsPlayerPartyAndPokemonStorageFull
lsls r0, 24
cmp r0, 0
bne _080A1E48
@@ -1900,7 +1900,7 @@ sub_80A1E7C: @ 80A1E7C
lsls r2, 24
lsrs r2, 24
movs r3, 0
- bl sub_80413C0
+ bl ExecuteTableBasedItemEffect_
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -2379,7 +2379,7 @@ sub_80A2294: @ 80A2294
lsls r5, 16
lsrs r5, 16
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
adds r6, r0, 0
strh r4, [r6]
strh r5, [r6, 0x6]
@@ -2387,7 +2387,7 @@ sub_80A2294: @ 80A2294
beq _080A22C8
adds r0, r7, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
b _080A22CA
_080A22C8:
ldr r0, _080A22E4 @ =0x0000ffff
@@ -2397,7 +2397,7 @@ _080A22CA:
adds r1, r6, 0
bl sub_8113550
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
pop {r3}
mov r8, r3
pop {r4-r7}
diff --git a/asm/itemfinder.s b/asm/itemfinder.s
index bdea628bd..74d07792d 100644
--- a/asm/itemfinder.s
+++ b/asm/itemfinder.s
@@ -63,7 +63,7 @@ _0813ECFC:
ldr r3, _0813ED14 @ =sub_813ED18
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_0813ED08:
pop {r4-r7}
pop {r0}
@@ -83,9 +83,9 @@ sub_813ED18: @ 813ED18
movs r1, 0x1
bl sub_80F6F54
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -219,7 +219,7 @@ sub_813EE14: @ 813EE14
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
ldr r1, _0813EEC8 @ =gUnknown_3005090
mov r2, r9
lsls r0, r2, 2
@@ -633,7 +633,7 @@ sub_813F108: @ 813F108
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
ldrh r0, [r0]
subs r0, 0x7
@@ -953,7 +953,7 @@ sub_813F364: @ 813F364
ldr r2, _0813F378 @ =gUnknown_8416476
ldr r3, _0813F37C @ =sub_813F380
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -972,9 +972,9 @@ sub_813F380: @ 813F380
movs r1, 0x1
bl sub_80F6F54
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -988,7 +988,7 @@ sub_813F3A8: @ 813F3A8
ldr r2, _0813F3BC @ =gUnknown_84164BE
ldr r3, _0813F3C0 @ =sub_813F3C4
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -1004,10 +1004,10 @@ sub_813F3C4: @ 813F3C4
lsrs r4, 24
bl sub_813F3FC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0813F3E8 @ =gUnknown_81A8D49
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -1019,7 +1019,7 @@ _0813F3E8: .4byte gUnknown_81A8D49
sub_813F3EC: @ 813F3EC
push {lr}
ldr r0, _0813F3F8 @ =gUnknown_84647FC
- bl sub_80086DC
+ bl LoadSpriteSheet
pop {r0}
bx r0
.align 2, 0
@@ -1031,7 +1031,7 @@ sub_813F3FC: @ 813F3FC
push {lr}
movs r0, 0xFA
lsls r0, 3
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r0}
bx r0
thumb_func_end sub_813F3FC
@@ -1048,7 +1048,7 @@ sub_813F40C: @ 813F40C
movs r1, 0x78
movs r2, 0x4C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r6, r0, 24
ldr r0, _0813F468 @ =gUnknown_202063C
@@ -1062,7 +1062,7 @@ sub_813F40C: @ 813F40C
strb r0, [r4, 0x5]
adds r0, r4, 0
adds r1, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r5, [r4, 0x3C]
strh r0, [r4, 0x2E]
@@ -1091,7 +1091,7 @@ _0813F470:
.4byte _0813F50C
.4byte _0813F52C
_0813F484:
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1118,7 +1118,7 @@ _0813F4A4:
strh r1, [r0, 0x30]
strh r2, [r0, 0x32]
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0813F53E
.align 2, 0
_0813F4C0: .4byte gUnknown_202063C
@@ -1134,7 +1134,7 @@ _0813F4C8:
ldr r1, _0813F4E8 @ =0x0000ff9c
strh r1, [r0, 0x32]
movs r1, 0x3
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0813F53E
.align 2, 0
_0813F4E4: .4byte gUnknown_202063C
@@ -1150,7 +1150,7 @@ _0813F4EC:
strh r1, [r0, 0x30]
strh r2, [r0, 0x32]
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0813F53E
.align 2, 0
_0813F508: .4byte gUnknown_202063C
@@ -1165,7 +1165,7 @@ _0813F50C:
movs r1, 0x64
strh r1, [r0, 0x32]
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0813F53E
.align 2, 0
_0813F528: .4byte gUnknown_202063C
@@ -1235,9 +1235,9 @@ _0813F594: .4byte sub_813F598
sub_813F598: @ 813F598
push {r4,lr}
adds r4, r0, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
@@ -1250,7 +1250,7 @@ sub_813F5AC: @ 813F5AC
movs r1, 0x78
movs r2, 0x4C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1269,7 +1269,7 @@ sub_813F5AC: @ 813F5AC
str r0, [r1]
adds r0, r4, 0
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
movs r1, 0
strh r1, [r4, 0x3C]
strh r1, [r4, 0x2E]
@@ -1339,7 +1339,7 @@ _0813F65C: .4byte sub_813F660
thumb_func_start sub_813F660
sub_813F660: @ 813F660
push {lr}
- bl sub_8007280
+ bl DestroySprite
pop {r0}
bx r0
thumb_func_end sub_813F660
diff --git a/asm/learn_move.s b/asm/learn_move.s
index e48590629..a9b5b5cb4 100644
--- a/asm/learn_move.s
+++ b/asm/learn_move.s
@@ -8,9 +8,9 @@
thumb_func_start sub_80E4620
sub_80E4620: @ 80E4620
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80E4620
@@ -19,17 +19,17 @@ sub_80E4620: @ 80E4620
sub_80E4634: @ 80E4634
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _080E465C @ =sub_80E4660
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
@@ -49,12 +49,12 @@ sub_80E4660: @ 80E4660
cmp r0, 0
bne _080E4684
ldr r0, _080E4690 @ =sub_80E478C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _080E4694 @ =gUnknown_3005020
ldr r0, _080E4698 @ =sub_807DD24
str r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080E4684:
pop {r4}
pop {r0}
@@ -76,7 +76,7 @@ sub_80E469C: @ 80E469C
movs r0, 0
movs r2, 0x2
bl sub_8001658
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r0, _080E4778 @ =gUnknown_83FFA44
bl sub_8003B24
lsls r0, 16
@@ -88,16 +88,16 @@ _080E46C6:
lsls r4, r5, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r5, 0x1
cmp r5, 0x8
bls _080E46C6
movs r0, 0x7
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -108,14 +108,14 @@ _080E46C6:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _080E477C @ =gUnknown_203AAB4
ldr r1, [r0]
movs r0, 0x99
lsls r0, 2
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
movs r1, 0x1
movs r2, 0xE0
@@ -126,7 +126,7 @@ _080E46C6:
ldr r0, _080E4780 @ =gUnknown_8E97DDC
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080E4784 @ =gUnknown_8E97DFC
movs r0, 0
str r0, [sp]
@@ -138,21 +138,21 @@ _080E46C6:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
_080E476C:
add sp, 0xC
pop {r4,r5}
@@ -172,13 +172,13 @@ sub_80E478C: @ 80E478C
push {r4,lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
+ bl SetGpuReg
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
ldr r4, _080E47EC @ =gUnknown_203AAB4
ldr r0, _080E47F0 @ =0x00000a6c
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
bl sub_80E4F54
ldr r0, [r4]
@@ -190,15 +190,15 @@ sub_80E478C: @ 80E478C
strb r1, [r0]
bl sub_80E50CC
ldr r0, _080E47F8 @ =sub_80E4620
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80E469C
bl sub_80E5004
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
ldr r0, _080E47FC @ =sub_80E4870
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -215,10 +215,10 @@ sub_80E4800: @ 80E4800
push {lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
+ bl SetGpuReg
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
bl sub_80E50CC
ldr r0, _080E485C @ =gUnknown_203AAB4
ldr r0, [r0]
@@ -228,19 +228,19 @@ sub_80E4800: @ 80E4800
adds r0, r2
strb r1, [r0]
ldr r0, _080E4868 @ =sub_80E4620
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80E469C
bl sub_80E5004
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl sub_8070424
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl FillPalette
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
ldr r0, _080E486C @ =sub_80E4870
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -275,11 +275,11 @@ _080E4882:
movs r1, 0
strb r1, [r0]
_080E489E:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
@@ -381,11 +381,11 @@ _080E49A8:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
bl sub_80E5444
ldr r4, _080E49EC @ =gUnknown_203AAB4
ldr r1, [r4]
@@ -498,7 +498,7 @@ _080E4A88:
adds r2, 0xE8
adds r2, r1
ldrh r1, [r2]
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
ldr r1, _080E4AD4 @ =0xffff0000
cmp r0, r1
@@ -717,7 +717,7 @@ _080E4C5A:
str r2, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080E4EDA
_080E4C70:
ldr r0, _080E4CC8 @ =gUnknown_2037AB8
@@ -736,7 +736,7 @@ _080E4C7E:
adds r1, r2, r3
ldr r6, _080E4CD4 @ =0x00000a6a
adds r2, r6
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
bl sub_8003ECC
ldr r0, _080E4CD8 @ =gUnknown_2024284
ldr r5, [r7]
@@ -780,7 +780,7 @@ _080E4CE8:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080E4EDA
_080E4CFA:
movs r0, 0x1
@@ -789,7 +789,7 @@ _080E4CFA:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080E4D14 @ =gUnknown_203AAB4
ldr r1, [r0]
ldrb r0, [r1]
@@ -809,14 +809,14 @@ _080E4D26:
bl sub_8003ECC
ldr r0, _080E4D40 @ =gUnknown_203AAB4
ldr r0, [r0]
- bl sub_8002BC4
- ldr r0, _080E4D44 @ =sub_80567DC
- bl sub_8000544
+ bl Free
+ ldr r0, _080E4D44 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _080E4EDA
.align 2, 0
_080E4D3C: .4byte gUnknown_2037AB8
_080E4D40: .4byte gUnknown_203AAB4
-_080E4D44: .4byte sub_80567DC
+_080E4D44: .4byte c2_exit_to_overworld_2_switch
_080E4D48:
movs r0, 0x1
negs r0, r0
@@ -824,11 +824,11 @@ _080E4D48:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080E4D88 @ =gUnknown_203AAB4
ldr r1, [r0]
ldrb r0, [r1]
@@ -874,7 +874,7 @@ _080E4DB4:
adds r0, r5
ldrb r1, [r2]
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _080E4E54 @ =gUnknown_2021D04
@@ -886,7 +886,7 @@ _080E4DB4:
mov r8, r3
add r1, r8
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r7]
adds r0, r1, r4
ldrb r0, [r0]
@@ -895,7 +895,7 @@ _080E4DB4:
ldr r2, _080E4E5C @ =0x00000261
adds r1, r2
ldrb r1, [r1]
- bl sub_8041064
+ bl RemoveMonPPBonus
ldr r3, [r7]
adds r4, r3, r4
ldrb r0, [r4]
@@ -912,7 +912,7 @@ _080E4DB4:
ldr r6, _080E4E5C @ =0x00000261
adds r3, r6
ldrb r2, [r3]
- bl sub_803E964
+ bl SetMonMoveSlot
ldr r0, _080E4E64 @ =gUnknown_2021CF0
ldr r2, [r7]
adds r4, r2, r4
@@ -925,7 +925,7 @@ _080E4DB4:
muls r2, r1
adds r1, r2, 0
add r1, r8
- bl sub_8008D84
+ bl StringCopy
ldr r0, _080E4E68 @ =gUnknown_841E493
bl sub_80E48C0
ldr r1, [r7]
@@ -952,14 +952,14 @@ _080E4E70:
movs r0, 0x1F
strb r0, [r1]
adds r0, 0xE2
- bl sub_8071C60
+ bl PlayFanfare
b _080E4EDA
.align 2, 0
_080E4E88: .4byte gUnknown_841E4C0
_080E4E8C: .4byte gUnknown_203AAB4
_080E4E90:
ldr r0, _080E4EA0 @ =0x00000101
- bl sub_8071C60
+ bl PlayFanfare
ldr r0, _080E4EA4 @ =gUnknown_203AAB4
ldr r1, [r0]
movs r0, 0x20
@@ -968,7 +968,7 @@ _080E4E90:
_080E4EA0: .4byte 0x00000101
_080E4EA4: .4byte gUnknown_203AAB4
_080E4EA8:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _080E4EDA
@@ -1046,7 +1046,7 @@ sub_80E4F0C: @ 80E4F0C
movs r3, 0x2
bl sub_80E559C
movs r0, 0x7
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x7
movs r1, 0x3
bl sub_8003F20
@@ -1130,7 +1130,7 @@ sub_80E4FAC: @ 80E4FAC
_080E4FD0:
adds r0, r1, 0
movs r1, 0x3
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x32]
adds r2, r0, 0
muls r2, r1
@@ -1140,7 +1140,7 @@ _080E4FD0:
_080E4FE4:
adds r0, r1, 0
movs r1, 0x1
- bl sub_8044E30
+ bl Sin
ldrh r1, [r4, 0x32]
adds r2, r0, 0
muls r2, r1
@@ -1161,15 +1161,15 @@ sub_80E5004: @ 80E5004
mov r6, r8
push {r6}
ldr r0, _080E50B4 @ =gUnknown_83FF9F4
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _080E50B8 @ =gUnknown_83FF9FC
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _080E50BC @ =gUnknown_83FFA24
mov r8, r0
movs r1, 0xC8
movs r2, 0x4
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _080E50C0 @ =gUnknown_203AAB4
ldr r1, [r5]
strb r0, [r1, 0x3]
@@ -1181,7 +1181,7 @@ sub_80E5004: @ 80E5004
ldr r4, _080E50C4 @ =gUnknown_202063C
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, [r5]
ldrb r1, [r2, 0x3]
lsls r0, r1, 4
@@ -1201,7 +1201,7 @@ sub_80E5004: @ 80E5004
movs r1, 0xC8
movs r2, 0x6C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r5]
strb r0, [r1, 0x3]
ldr r2, [r5]
@@ -1299,7 +1299,7 @@ _080E511A:
muls r1, r7
ldr r2, _080E51F0 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r4, 0xD
adds r5, 0x1
ldr r0, [r6]
@@ -1319,10 +1319,10 @@ _080E513C:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _080E51F4 @ =gUnknown_2021CD0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, [r4]
ldrb r2, [r0, 0x1A]
movs r1, 0xD
@@ -1332,7 +1332,7 @@ _080E513C:
adds r1, r7
adds r0, r1
ldr r1, _080E51F8 @ =gUnknown_84161C1
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
ldrb r0, [r1, 0x1A]
adds r0, 0x1
@@ -1409,7 +1409,7 @@ sub_80E5204: @ 80E5204
ldr r1, _080E525C @ =0x00000263
adds r0, r1
ldrb r0, [r0]
- bl sub_8107078
+ bl ListMenuHandleInput
ldr r0, _080E5260 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x1
@@ -1436,7 +1436,7 @@ sub_80E5204: @ 80E5204
lsls r3, 1
adds r2, r3
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r0, _080E526C @ =gUnknown_841E3FB
bl sub_80E48C0
b _080E529E
@@ -1532,7 +1532,7 @@ sub_80E5300: @ 80E5300
adds r3, 0x2
adds r2, r3
ldrh r2, [r2]
- bl sub_8106FF8
+ bl ListMenuInit
ldr r1, [r4]
ldr r2, _080E533C @ =0x00000263
adds r1, r2
@@ -1702,19 +1702,19 @@ sub_80E5444: @ 80E5444
movs r3, 0x22
bl sub_8107D68
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x7
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1751,7 +1751,7 @@ _080E54EA:
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
@@ -1822,7 +1822,7 @@ sub_80E5574: @ 80E5574
cmp r4, r0
beq _080E5594
movs r0, 0x6
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x6
movs r1, 0x1
bl sub_8003F20
@@ -1915,7 +1915,7 @@ _080E5622:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
_080E563E:
mov r0, r8
str r0, [sp]
diff --git a/asm/librfu.s b/asm/librfu.s
index 15682359e..f63867658 100644
--- a/asm/librfu.s
+++ b/asm/librfu.s
@@ -110,7 +110,7 @@ _081DF1E8: .4byte 0x04000200
thumb_func_start STWI_init_timer
STWI_init_timer: @ 81DF1EC
push {r4,r5,lr}
- ldr r2, _081DF218 @ =sub_81DF910
+ ldr r2, _081DF218 @ =STWI_intr_timer
str r2, [r0]
ldr r5, _081DF21C @ =gRfuState
ldr r0, [r5]
@@ -132,7 +132,7 @@ STWI_init_timer: @ 81DF1EC
pop {r0}
bx r0
.align 2, 0
-_081DF218: .4byte sub_81DF910
+_081DF218: .4byte STWI_intr_timer
_081DF21C: .4byte gRfuState
_081DF220: .4byte 0x04000208
_081DF224: .4byte 0x04000200
@@ -228,8 +228,8 @@ _081DF2D4: .4byte 0x000080a2
_081DF2D8: .4byte 0x00005003
thumb_func_end AgbRFU_SoftReset
- thumb_func_start sub_81DF2DC
-sub_81DF2DC: @ 81DF2DC
+ thumb_func_start STWI_set_MS_mode
+STWI_set_MS_mode: @ 81DF2DC
lsls r0, 24
lsrs r0, 24
ldr r1, _081DF2EC @ =gRfuState
@@ -239,7 +239,7 @@ sub_81DF2DC: @ 81DF2DC
bx lr
.align 2, 0
_081DF2EC: .4byte gRfuState
- thumb_func_end sub_81DF2DC
+ thumb_func_end STWI_set_MS_mode
thumb_func_start STWI_read_status
STWI_read_status: @ 81DF2F0
@@ -337,15 +337,15 @@ STWI_set_Callback_S: @ 81DF374
_081DF37C: .4byte gRfuState
thumb_func_end STWI_set_Callback_S
- thumb_func_start sub_81DF380
-sub_81DF380: @ 81DF380
+ thumb_func_start STWI_set_Callback_ID
+STWI_set_Callback_ID: @ 81DF380
ldr r1, _081DF388 @ =gRfuState
ldr r1, [r1]
str r0, [r1, 0x20]
bx lr
.align 2, 0
_081DF388: .4byte gRfuState
- thumb_func_end sub_81DF380
+ thumb_func_end STWI_set_Callback_ID
thumb_func_start STWI_poll_CommandEnd
STWI_poll_CommandEnd: @ 81DF38C
@@ -372,8 +372,8 @@ _081DF3A6:
_081DF3B0: .4byte gRfuState
thumb_func_end STWI_poll_CommandEnd
- thumb_func_start sub_81DF3B4
-sub_81DF3B4: @ 81DF3B4
+ thumb_func_start STWI_send_ResetREQ
+STWI_send_ResetREQ: @ 81DF3B4
push {lr}
movs r0, 0x10
bl STWI_init
@@ -390,10 +390,10 @@ _081DF3CE:
bx r0
.align 2, 0
_081DF3D4: .4byte gRfuState
- thumb_func_end sub_81DF3B4
+ thumb_func_end STWI_send_ResetREQ
- thumb_func_start sub_81DF3D8
-sub_81DF3D8: @ 81DF3D8
+ thumb_func_start STWI_send_LinkStatusREQ
+STWI_send_LinkStatusREQ: @ 81DF3D8
push {lr}
movs r0, 0x11
bl STWI_init
@@ -410,10 +410,10 @@ _081DF3F2:
bx r0
.align 2, 0
_081DF3F8: .4byte gRfuState
- thumb_func_end sub_81DF3D8
+ thumb_func_end STWI_send_LinkStatusREQ
- thumb_func_start sub_81DF3FC
-sub_81DF3FC: @ 81DF3FC
+ thumb_func_start STWI_send_VersionStatusREQ
+STWI_send_VersionStatusREQ: @ 81DF3FC
push {lr}
movs r0, 0x12
bl STWI_init
@@ -430,10 +430,10 @@ _081DF416:
bx r0
.align 2, 0
_081DF41C: .4byte gRfuState
- thumb_func_end sub_81DF3FC
+ thumb_func_end STWI_send_VersionStatusREQ
- thumb_func_start sub_81DF420
-sub_81DF420: @ 81DF420
+ thumb_func_start STWI_send_SystemStatusREQ
+STWI_send_SystemStatusREQ: @ 81DF420
push {lr}
movs r0, 0x13
bl STWI_init
@@ -450,10 +450,10 @@ _081DF43A:
bx r0
.align 2, 0
_081DF440: .4byte gRfuState
- thumb_func_end sub_81DF420
+ thumb_func_end STWI_send_SystemStatusREQ
- thumb_func_start sub_81DF444
-sub_81DF444: @ 81DF444
+ thumb_func_start STWI_send_SlotStatusREQ
+STWI_send_SlotStatusREQ: @ 81DF444
push {lr}
movs r0, 0x14
bl STWI_init
@@ -470,10 +470,10 @@ _081DF45E:
bx r0
.align 2, 0
_081DF464: .4byte gRfuState
- thumb_func_end sub_81DF444
+ thumb_func_end STWI_send_SlotStatusREQ
- thumb_func_start sub_81DF468
-sub_81DF468: @ 81DF468
+ thumb_func_start STWI_send_ConfigStatusREQ
+STWI_send_ConfigStatusREQ: @ 81DF468
push {lr}
movs r0, 0x15
bl STWI_init
@@ -490,7 +490,7 @@ _081DF482:
bx r0
.align 2, 0
_081DF488: .4byte gRfuState
- thumb_func_end sub_81DF468
+ thumb_func_end STWI_send_ConfigStatusREQ
thumb_func_start STWI_send_GameConfigREQ
STWI_send_GameConfigREQ: @ 81DF48C
@@ -575,8 +575,8 @@ _081DF51A:
_081DF520: .4byte gRfuState
thumb_func_end STWI_send_SystemConfigREQ
- thumb_func_start sub_81DF524
-sub_81DF524: @ 81DF524
+ thumb_func_start STWI_send_SC_StartREQ
+STWI_send_SC_StartREQ: @ 81DF524
push {lr}
movs r0, 0x19
bl STWI_init
@@ -593,10 +593,10 @@ _081DF53E:
bx r0
.align 2, 0
_081DF544: .4byte gRfuState
- thumb_func_end sub_81DF524
+ thumb_func_end STWI_send_SC_StartREQ
- thumb_func_start sub_81DF548
-sub_81DF548: @ 81DF548
+ thumb_func_start STWI_send_SC_PollingREQ
+STWI_send_SC_PollingREQ: @ 81DF548
push {lr}
movs r0, 0x1A
bl STWI_init
@@ -613,10 +613,10 @@ _081DF562:
bx r0
.align 2, 0
_081DF568: .4byte gRfuState
- thumb_func_end sub_81DF548
+ thumb_func_end STWI_send_SC_PollingREQ
- thumb_func_start sub_81DF56C
-sub_81DF56C: @ 81DF56C
+ thumb_func_start STWI_send_SC_EndREQ
+STWI_send_SC_EndREQ: @ 81DF56C
push {lr}
movs r0, 0x1B
bl STWI_init
@@ -633,10 +633,10 @@ _081DF586:
bx r0
.align 2, 0
_081DF58C: .4byte gRfuState
- thumb_func_end sub_81DF56C
+ thumb_func_end STWI_send_SC_EndREQ
- thumb_func_start sub_81DF590
-sub_81DF590: @ 81DF590
+ thumb_func_start STWI_send_SP_StartREQ
+STWI_send_SP_StartREQ: @ 81DF590
push {lr}
movs r0, 0x1C
bl STWI_init
@@ -653,10 +653,10 @@ _081DF5AA:
bx r0
.align 2, 0
_081DF5B0: .4byte gRfuState
- thumb_func_end sub_81DF590
+ thumb_func_end STWI_send_SP_StartREQ
- thumb_func_start sub_81DF5B4
-sub_81DF5B4: @ 81DF5B4
+ thumb_func_start STWI_send_SP_PollingREQ
+STWI_send_SP_PollingREQ: @ 81DF5B4
push {lr}
movs r0, 0x1D
bl STWI_init
@@ -673,10 +673,10 @@ _081DF5CE:
bx r0
.align 2, 0
_081DF5D4: .4byte gRfuState
- thumb_func_end sub_81DF5B4
+ thumb_func_end STWI_send_SP_PollingREQ
- thumb_func_start sub_81DF5D8
-sub_81DF5D8: @ 81DF5D8
+ thumb_func_start STWI_send_SP_EndREQ
+STWI_send_SP_EndREQ: @ 81DF5D8
push {lr}
movs r0, 0x1E
bl STWI_init
@@ -693,10 +693,10 @@ _081DF5F2:
bx r0
.align 2, 0
_081DF5F8: .4byte gRfuState
- thumb_func_end sub_81DF5D8
+ thumb_func_end STWI_send_SP_EndREQ
- thumb_func_start sub_81DF5FC
-sub_81DF5FC: @ 81DF5FC
+ thumb_func_start STWI_send_CP_StartREQ
+STWI_send_CP_StartREQ: @ 81DF5FC
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -719,10 +719,10 @@ _081DF620:
bx r0
.align 2, 0
_081DF628: .4byte gRfuState
- thumb_func_end sub_81DF5FC
+ thumb_func_end STWI_send_CP_StartREQ
- thumb_func_start sub_81DF62C
-sub_81DF62C: @ 81DF62C
+ thumb_func_start STWI_send_CP_PollingREQ
+STWI_send_CP_PollingREQ: @ 81DF62C
push {lr}
movs r0, 0x20
bl STWI_init
@@ -739,7 +739,7 @@ _081DF646:
bx r0
.align 2, 0
_081DF64C: .4byte gRfuState
- thumb_func_end sub_81DF62C
+ thumb_func_end STWI_send_CP_PollingREQ
thumb_func_start STWI_send_CP_EndREQ
STWI_send_CP_EndREQ: @ 81DF650
@@ -761,8 +761,8 @@ _081DF66A:
_081DF670: .4byte gRfuState
thumb_func_end STWI_send_CP_EndREQ
- thumb_func_start sub_81DF674
-sub_81DF674: @ 81DF674
+ thumb_func_start STWI_send_DataTxREQ
+STWI_send_DataTxREQ: @ 81DF674
push {r4-r6,lr}
adds r6, r0, 0
lsls r4, r1, 24
@@ -798,10 +798,10 @@ _081DF6B2:
bx r0
.align 2, 0
_081DF6B8: .4byte gRfuState
- thumb_func_end sub_81DF674
+ thumb_func_end STWI_send_DataTxREQ
- thumb_func_start sub_81DF6BC
-sub_81DF6BC: @ 81DF6BC
+ thumb_func_start STWI_send_DataTxAndChangeREQ
+STWI_send_DataTxAndChangeREQ: @ 81DF6BC
push {r4-r6,lr}
adds r6, r0, 0
lsls r4, r1, 24
@@ -837,7 +837,7 @@ _081DF6FA:
bx r0
.align 2, 0
_081DF700: .4byte gRfuState
- thumb_func_end sub_81DF6BC
+ thumb_func_end STWI_send_DataTxAndChangeREQ
thumb_func_start STWI_send_DataRxREQ
STWI_send_DataRxREQ: @ 81DF704
@@ -879,8 +879,8 @@ _081DF742:
_081DF748: .4byte gRfuState
thumb_func_end STWI_send_MS_ChangeREQ
- thumb_func_start sub_81DF74C
-sub_81DF74C: @ 81DF74C
+ thumb_func_start STWI_send_DataReadyAndChangeREQ
+STWI_send_DataReadyAndChangeREQ: @ 81DF74C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -921,10 +921,10 @@ _081DF792:
bx r0
.align 2, 0
_081DF798: .4byte gRfuState
- thumb_func_end sub_81DF74C
+ thumb_func_end STWI_send_DataReadyAndChangeREQ
- thumb_func_start sub_81DF79C
-sub_81DF79C: @ 81DF79C
+ thumb_func_start STWI_send_DisconnectedAndChangeREQ
+STWI_send_DisconnectedAndChangeREQ: @ 81DF79C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -956,7 +956,7 @@ _081DF7D2:
bx r0
.align 2, 0
_081DF7D8: .4byte gRfuState
- thumb_func_end sub_81DF79C
+ thumb_func_end STWI_send_DisconnectedAndChangeREQ
thumb_func_start STWI_send_ResumeRetransmitAndChangeREQ
STWI_send_ResumeRetransmitAndChangeREQ: @ 81DF7DC
@@ -978,8 +978,8 @@ _081DF7F6:
_081DF7FC: .4byte gRfuState
thumb_func_end STWI_send_ResumeRetransmitAndChangeREQ
- thumb_func_start sub_81DF800
-sub_81DF800: @ 81DF800
+ thumb_func_start STWI_send_DisconnectREQ
+STWI_send_DisconnectREQ: @ 81DF800
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1002,10 +1002,10 @@ _081DF824:
bx r0
.align 2, 0
_081DF82C: .4byte gRfuState
- thumb_func_end sub_81DF800
+ thumb_func_end STWI_send_DisconnectREQ
- thumb_func_start sub_81DF830
-sub_81DF830: @ 81DF830
+ thumb_func_start STWI_send_TestModeREQ
+STWI_send_TestModeREQ: @ 81DF830
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1032,7 +1032,7 @@ _081DF85C:
bx r0
.align 2, 0
_081DF864: .4byte gRfuState
- thumb_func_end sub_81DF830
+ thumb_func_end STWI_send_TestModeREQ
thumb_func_start STWI_send_CPR_StartREQ
STWI_send_CPR_StartREQ: @ 81DF868
@@ -1067,8 +1067,8 @@ _081DF89A:
_081DF8A0: .4byte gRfuState
thumb_func_end STWI_send_CPR_StartREQ
- thumb_func_start sub_81DF8A4
-sub_81DF8A4: @ 81DF8A4
+ thumb_func_start STWI_send_CPR_PollingREQ
+STWI_send_CPR_PollingREQ: @ 81DF8A4
push {lr}
movs r0, 0x33
bl STWI_init
@@ -1085,10 +1085,10 @@ _081DF8BE:
bx r0
.align 2, 0
_081DF8C4: .4byte gRfuState
- thumb_func_end sub_81DF8A4
+ thumb_func_end STWI_send_CPR_PollingREQ
- thumb_func_start sub_81DF8C8
-sub_81DF8C8: @ 81DF8C8
+ thumb_func_start STWI_send_CPR_EndREQ
+STWI_send_CPR_EndREQ: @ 81DF8C8
push {lr}
movs r0, 0x34
bl STWI_init
@@ -1105,10 +1105,10 @@ _081DF8E2:
bx r0
.align 2, 0
_081DF8E8: .4byte gRfuState
- thumb_func_end sub_81DF8C8
+ thumb_func_end STWI_send_CPR_EndREQ
- thumb_func_start sub_81DF8EC
-sub_81DF8EC: @ 81DF8EC
+ thumb_func_start STWI_send_StopModeREQ
+STWI_send_StopModeREQ: @ 81DF8EC
push {lr}
movs r0, 0x3D
bl STWI_init
@@ -1125,10 +1125,10 @@ _081DF906:
bx r0
.align 2, 0
_081DF90C: .4byte gRfuState
- thumb_func_end sub_81DF8EC
+ thumb_func_end STWI_send_StopModeREQ
- thumb_func_start sub_81DF910
-sub_81DF910: @ 81DF910
+ thumb_func_start STWI_intr_timer
+STWI_intr_timer: @ 81DF910
push {r4,lr}
ldr r4, _081DF928 @ =gRfuState
ldr r1, [r4]
@@ -1153,18 +1153,18 @@ _081DF936:
movs r0, 0x1
strb r0, [r1, 0x10]
movs r0, 0x32
- bl sub_81DF974
+ bl STWI_set_timer
b _081DF96C
_081DF944:
- bl sub_81DFA20
- bl sub_81DFB98
+ bl STWI_stop_timer
+ bl STWI_restart_Command
b _081DF96C
_081DF94E:
ldrb r0, [r1, 0x10]
movs r0, 0x1
strb r0, [r1, 0x10]
- bl sub_81DFA20
- bl sub_81DFC18
+ bl STWI_stop_timer
+ bl STWI_reset_ClockCounter
ldr r0, [r4]
ldr r2, [r0, 0x18]
cmp r2, 0
@@ -1176,10 +1176,10 @@ _081DF96C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_81DF910
+ thumb_func_end STWI_intr_timer
- thumb_func_start sub_81DF974
-sub_81DF974: @ 81DF974
+ thumb_func_start STWI_set_timer
+STWI_set_timer: @ 81DF974
push {r4-r7,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -1267,10 +1267,10 @@ _081DF9F8:
_081DFA14: .4byte 0x0000f7ad
_081DFA18: .4byte 0x04000202
_081DFA1C: .4byte 0x04000208
- thumb_func_end sub_81DF974
+ thumb_func_end STWI_set_timer
- thumb_func_start sub_81DFA20
-sub_81DFA20: @ 81DFA20
+ thumb_func_start STWI_stop_timer
+STWI_stop_timer: @ 81DFA20
ldr r2, _081DFA40 @ =gRfuState
ldr r0, [r2]
movs r1, 0
@@ -1291,7 +1291,7 @@ sub_81DFA20: @ 81DFA20
_081DFA40: .4byte gRfuState
_081DFA44: .4byte 0x04000100
_081DFA48: .4byte 0x04000102
- thumb_func_end sub_81DFA20
+ thumb_func_end STWI_stop_timer
thumb_func_start STWI_init
STWI_init: @ 81DFA4C
@@ -1460,8 +1460,8 @@ _081DFB90: .4byte 0x04000128
_081DFB94: .4byte 0x00005083
thumb_func_end STWI_start_Command
- thumb_func_start sub_81DFB98
-sub_81DFB98: @ 81DFB98
+ thumb_func_start STWI_restart_Command
+STWI_restart_Command: @ 81DFB98
push {r4,lr}
ldr r4, _081DFBB0 @ =gRfuState
ldr r2, [r4]
@@ -1527,10 +1527,10 @@ _081DFC0E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_81DFB98
+ thumb_func_end STWI_restart_Command
- thumb_func_start sub_81DFC18
-sub_81DFC18: @ 81DFC18
+ thumb_func_start STWI_reset_ClockCounter
+STWI_reset_ClockCounter: @ 81DFC18
ldr r3, _081DFC44 @ =gRfuState
ldr r1, [r3]
movs r0, 0x5
@@ -1557,7 +1557,7 @@ sub_81DFC18: @ 81DFC18
_081DFC44: .4byte gRfuState
_081DFC48: .4byte 0x04000120
_081DFC4C: .4byte 0x00005003
- thumb_func_end sub_81DFC18
+ thumb_func_end STWI_reset_ClockCounter
arm_func_start IntrSIO32
IntrSIO32: @ 81DFC50
@@ -2482,13 +2482,13 @@ _081E0770: .4byte 0x0100005a
thumb_func_start rfu_REQ_PARENT_resumeRetransmitAndChange
rfu_REQ_PARENT_resumeRetransmitAndChange: @ 81E0774
push {lr}
- ldr r0, _081E0784 @ =sub_81E0848
+ ldr r0, _081E0784 @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
bl STWI_send_ResumeRetransmitAndChangeREQ
pop {r0}
bx r0
.align 2, 0
-_081E0784: .4byte sub_81E0848
+_081E0784: .4byte rfu_STC_REQ_callback
thumb_func_end rfu_REQ_PARENT_resumeRetransmitAndChange
thumb_func_start rfu_UNI_PARENT_getDRAC_ACK
@@ -2613,14 +2613,14 @@ _081E083E:
_081E0844: .4byte gUnknown_3007464
thumb_func_end rfu_enableREQCallback
- thumb_func_start sub_81E0848
-sub_81E0848: @ 81E0848
+ thumb_func_start rfu_STC_REQ_callback
+rfu_STC_REQ_callback: @ 81E0848
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
lsls r1, 16
lsrs r4, r1, 16
- ldr r0, _081E087C @ =sub_81E0888
+ ldr r0, _081E087C @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
ldr r0, _081E0880 @ =gUnknown_3007464
ldr r0, [r0]
@@ -2641,13 +2641,13 @@ _081E0876:
pop {r0}
bx r0
.align 2, 0
-_081E087C: .4byte sub_81E0888
+_081E087C: .4byte rfu_CB_defaultCallback
_081E0880: .4byte gUnknown_3007464
_081E0884: .4byte gUnknown_3007468
- thumb_func_end sub_81E0848
+ thumb_func_end rfu_STC_REQ_callback
- thumb_func_start sub_81E0888
-sub_81E0888: @ 81E0888
+ thumb_func_start rfu_CB_defaultCallback
+rfu_CB_defaultCallback: @ 81E0888
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -2703,7 +2703,7 @@ _081E08E4:
_081E08EC: .4byte gUnknown_3007464
_081E08F0: .4byte gUnknown_3007468
_081E08F4: .4byte gUnknown_3007460
- thumb_func_end sub_81E0888
+ thumb_func_end rfu_CB_defaultCallback
thumb_func_start rfu_waitREQComplete
rfu_waitREQComplete: @ 81E08F8
@@ -2718,17 +2718,17 @@ rfu_waitREQComplete: @ 81E08F8
_081E0908: .4byte gUnknown_3007464
thumb_func_end rfu_waitREQComplete
- thumb_func_start sub_81E090C
-sub_81E090C: @ 81E090C
+ thumb_func_start rfu_REQ_RFUStatus
+rfu_REQ_RFUStatus: @ 81E090C
push {lr}
- ldr r0, _081E091C @ =sub_81E0848
+ ldr r0, _081E091C @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
- bl sub_81DF420
+ bl STWI_send_SystemStatusREQ
pop {r0}
bx r0
.align 2, 0
-_081E091C: .4byte sub_81E0848
- thumb_func_end sub_81E090C
+_081E091C: .4byte rfu_STC_REQ_callback
+ thumb_func_end rfu_REQ_RFUStatus
thumb_func_start rfu_getRFUStatus
rfu_getRFUStatus: @ 81E0920
@@ -2838,7 +2838,7 @@ rfu_REQ_stopMode: @ 81E09D4
bne _081E09FC
movs r0, 0x3D
movs r1, 0x6
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
ldr r0, _081E09F8 @ =gRfuState
ldr r1, [r0]
ldrh r0, [r1, 0x12]
@@ -2870,7 +2870,7 @@ _081E09FC:
ldr r0, [r1]
lsls r0, 16
ldr r2, _081E0A58 @ =0x0105ffff
- ldr r3, _081E0A5C @ =sub_81E0A7C
+ ldr r3, _081E0A5C @ =rfu_CB_stopMode
cmp r0, r2
bhi _081E0A3A
_081E0A32:
@@ -2883,14 +2883,14 @@ _081E0A3A:
str r0, [r1]
adds r0, r3, 0
bl STWI_set_Callback_M
- bl sub_81DF8EC
+ bl STWI_send_StopModeREQ
b _081E0A72
.align 2, 0
_081E0A4C: .4byte 0x00008001
_081E0A50: .4byte gRfuState
_081E0A54: .4byte 0x04000100
_081E0A58: .4byte 0x0105ffff
-_081E0A5C: .4byte sub_81E0A7C
+_081E0A5C: .4byte rfu_CB_stopMode
_081E0A60:
ldr r1, _081E0A78 @ =0x04000128
movs r2, 0x80
@@ -2899,7 +2899,7 @@ _081E0A60:
strh r0, [r1]
movs r0, 0x3D
movs r1, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E0A72:
pop {r0}
bx r0
@@ -2907,8 +2907,8 @@ _081E0A72:
_081E0A78: .4byte 0x04000128
thumb_func_end rfu_REQ_stopMode
- thumb_func_start sub_81E0A7C
-sub_81E0A7C: @ 81E0A7C
+ thumb_func_start rfu_CB_stopMode
+rfu_CB_stopMode: @ 81E0A7C
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -2925,13 +2925,13 @@ sub_81E0A7C: @ 81E0A7C
_081E0A96:
adds r0, r3, 0
adds r1, r2, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4}
pop {r0}
bx r0
.align 2, 0
_081E0AA4: .4byte 0x04000128
- thumb_func_end sub_81E0A7C
+ thumb_func_end rfu_CB_stopMode
thumb_func_start rfu_REQBN_softReset_and_checkID
rfu_REQBN_softReset_and_checkID: @ 81E0AA8
@@ -2967,20 +2967,20 @@ _081E0ADC:
_081E0AE0: .4byte 0x04000128
thumb_func_end rfu_REQBN_softReset_and_checkID
- thumb_func_start sub_81E0AE4
-sub_81E0AE4: @ 81E0AE4
+ thumb_func_start rfu_REQ_reset
+rfu_REQ_reset: @ 81E0AE4
push {lr}
- ldr r0, _081E0AF4 @ =sub_81E0AF8
+ ldr r0, _081E0AF4 @ =rfu_CB_reset
bl STWI_set_Callback_M
- bl sub_81DF3B4
+ bl STWI_send_ResetREQ
pop {r0}
bx r0
.align 2, 0
-_081E0AF4: .4byte sub_81E0AF8
- thumb_func_end sub_81E0AE4
+_081E0AF4: .4byte rfu_CB_reset
+ thumb_func_end rfu_REQ_reset
- thumb_func_start sub_81E0AF8
-sub_81E0AF8: @ 81E0AF8
+ thumb_func_start rfu_CB_reset
+rfu_CB_reset: @ 81E0AF8
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -2993,11 +2993,11 @@ sub_81E0AF8: @ 81E0AF8
_081E0B0C:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_81E0AF8
+ thumb_func_end rfu_CB_reset
thumb_func_start rfu_REQ_configSystem
rfu_REQ_configSystem: @ 81E0B1C
@@ -3010,7 +3010,7 @@ rfu_REQ_configSystem: @ 81E0B1C
lsrs r5, 24
lsls r2, 24
lsrs r6, r2, 24
- ldr r0, _081E0B54 @ =sub_81E0848
+ ldr r0, _081E0B54 @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
movs r0, 0x3
ands r4, r0
@@ -3028,7 +3028,7 @@ rfu_REQ_configSystem: @ 81E0B1C
strh r0, [r1, 0x1A]
b _081E0B76
.align 2, 0
-_081E0B54: .4byte sub_81E0848
+_081E0B54: .4byte rfu_STC_REQ_callback
_081E0B58: .4byte gUnknown_3007464
_081E0B5C:
ldr r5, _081E0B7C @ =0x04000208
@@ -3075,7 +3075,7 @@ rfu_REQ_configGameData: @ 81E0B84
strb r2, [r0, 0x1]
_081E0BAA:
movs r2, 0x2
- ldr r0, _081E0C0C @ =sub_81E0C10
+ ldr r0, _081E0C0C @ =rfu_CB_configGameData
mov r12, r0
_081E0BB0:
mov r3, sp
@@ -3125,11 +3125,11 @@ _081E0BF6:
pop {r0}
bx r0
.align 2, 0
-_081E0C0C: .4byte sub_81E0C10
+_081E0C0C: .4byte rfu_CB_configGameData
thumb_func_end rfu_REQ_configGameData
- thumb_func_start sub_81E0C10
-sub_81E0C10: @ 81E0C10
+ thumb_func_start rfu_CB_configGameData
+rfu_CB_configGameData: @ 81E0C10
push {r4-r7,lr}
lsls r0, 24
lsrs r0, 24
@@ -3205,20 +3205,20 @@ _081E0C84:
_081E0C9A:
mov r0, r12
adds r1, r7, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_081E0CA8: .4byte gUnknown_3007460
- thumb_func_end sub_81E0C10
+ thumb_func_end rfu_CB_configGameData
thumb_func_start sub_81E0CAC
sub_81E0CAC: @ 81E0CAC
push {lr}
- ldr r0, _081E0CDC @ =sub_81E0888
+ ldr r0, _081E0CDC @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF420
+ bl STWI_send_SystemStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 16
lsrs r1, r0, 16
@@ -3235,23 +3235,23 @@ sub_81E0CAC: @ 81E0CAC
bl rfu_STC_clearLinkStatus
b _081E0CEA
.align 2, 0
-_081E0CDC: .4byte sub_81E0888
+_081E0CDC: .4byte rfu_CB_defaultCallback
_081E0CE0: .4byte gUnknown_3007468
_081E0CE4:
movs r0, 0x19
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E0CEA:
- ldr r0, _081E0CF8 @ =sub_81E0CFC
+ ldr r0, _081E0CF8 @ =rfu_CB_startSearchChild
bl STWI_set_Callback_M
- bl sub_81DF524
+ bl STWI_send_SC_StartREQ
pop {r0}
bx r0
.align 2, 0
-_081E0CF8: .4byte sub_81E0CFC
+_081E0CF8: .4byte rfu_CB_startSearchChild
thumb_func_end sub_81E0CAC
- thumb_func_start sub_81E0CFC
-sub_81E0CFC: @ 81E0CFC
+ thumb_func_start rfu_CB_startSearchChild
+rfu_CB_startSearchChild: @ 81E0CFC
push {lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -3267,12 +3267,12 @@ sub_81E0CFC: @ 81E0CFC
_081E0D14:
adds r0, r3, 0
adds r1, r2, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r0}
bx r0
.align 2, 0
_081E0D20: .4byte gUnknown_3007464
- thumb_func_end sub_81E0CFC
+ thumb_func_end rfu_CB_startSearchChild
thumb_func_start rfu_STC_clearLinkStatus
rfu_STC_clearLinkStatus: @ 81E0D24
@@ -3327,32 +3327,32 @@ _081E0D80: .4byte gUnknown_3007460
_081E0D84: .4byte 0x01000040
thumb_func_end rfu_STC_clearLinkStatus
- thumb_func_start sub_81E0D88
-sub_81E0D88: @ 81E0D88
+ thumb_func_start rfu_REQ_pollSearchChild
+rfu_REQ_pollSearchChild: @ 81E0D88
push {lr}
- ldr r0, _081E0D98 @ =sub_81E0DB0
+ ldr r0, _081E0D98 @ =rfu_CB_pollAndEndSearchChild
bl STWI_set_Callback_M
- bl sub_81DF548
+ bl STWI_send_SC_PollingREQ
pop {r0}
bx r0
.align 2, 0
-_081E0D98: .4byte sub_81E0DB0
- thumb_func_end sub_81E0D88
+_081E0D98: .4byte rfu_CB_pollAndEndSearchChild
+ thumb_func_end rfu_REQ_pollSearchChild
- thumb_func_start sub_81E0D9C
-sub_81E0D9C: @ 81E0D9C
+ thumb_func_start rfu_REQ_endSearchChild
+rfu_REQ_endSearchChild: @ 81E0D9C
push {lr}
- ldr r0, _081E0DAC @ =sub_81E0DB0
+ ldr r0, _081E0DAC @ =rfu_CB_pollAndEndSearchChild
bl STWI_set_Callback_M
- bl sub_81DF56C
+ bl STWI_send_SC_EndREQ
pop {r0}
bx r0
.align 2, 0
-_081E0DAC: .4byte sub_81E0DB0
- thumb_func_end sub_81E0D9C
+_081E0DAC: .4byte rfu_CB_pollAndEndSearchChild
+ thumb_func_end rfu_REQ_endSearchChild
- thumb_func_start sub_81E0DB0
-sub_81E0DB0: @ 81E0DB0
+ thumb_func_start rfu_CB_pollAndEndSearchChild
+rfu_CB_pollAndEndSearchChild: @ 81E0DB0
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -3370,9 +3370,9 @@ _081E0DC2:
ldrh r0, [r0]
cmp r0, 0
bne _081E0E20
- ldr r0, _081E0DFC @ =sub_81E0888
+ ldr r0, _081E0DFC @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF420
+ bl STWI_send_SystemStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 16
cmp r0, 0
@@ -3388,7 +3388,7 @@ _081E0DC2:
b _081E0E20
.align 2, 0
_081E0DF8: .4byte gUnknown_3007460
-_081E0DFC: .4byte sub_81E0888
+_081E0DFC: .4byte rfu_CB_defaultCallback
_081E0E00: .4byte gUnknown_3007468
_081E0E04:
cmp r4, 0x1B
@@ -3409,14 +3409,14 @@ _081E0E18:
_081E0E20:
adds r0, r4, 0
adds r1, r6, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_081E0E30: .4byte gUnknown_3007460
_081E0E34: .4byte gUnknown_3007464
- thumb_func_end sub_81E0DB0
+ thumb_func_end rfu_CB_pollAndEndSearchChild
thumb_func_start sub_81E0E38
sub_81E0E38: @ 81E0E38
@@ -3436,9 +3436,9 @@ sub_81E0E38: @ 81E0E38
cmp r2, 0
beq _081E0E96
ldr r5, [r0, 0x4]
- ldr r0, _081E0F68 @ =sub_81E0888
+ ldr r0, _081E0F68 @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF3D8
+ bl STWI_send_LinkStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 16
cmp r0, 0
@@ -3575,25 +3575,25 @@ _081E0F52:
bx r0
.align 2, 0
_081E0F64: .4byte gUnknown_3007468
-_081E0F68: .4byte sub_81E0888
+_081E0F68: .4byte rfu_CB_defaultCallback
_081E0F6C: .4byte gUnknown_3007464
_081E0F70: .4byte gUnknown_3007460
thumb_func_end sub_81E0E38
- thumb_func_start sub_81E0F74
-sub_81E0F74: @ 81E0F74
+ thumb_func_start rfu_REQ_startSearchParent
+rfu_REQ_startSearchParent: @ 81E0F74
push {lr}
- ldr r0, _081E0F84 @ =sub_81E0F88
+ ldr r0, _081E0F84 @ =rfu_CB_startSearchParent
bl STWI_set_Callback_M
- bl sub_81DF590
+ bl STWI_send_SP_StartREQ
pop {r0}
bx r0
.align 2, 0
-_081E0F84: .4byte sub_81E0F88
- thumb_func_end sub_81E0F74
+_081E0F84: .4byte rfu_CB_startSearchParent
+ thumb_func_end rfu_REQ_startSearchParent
- thumb_func_start sub_81E0F88
-sub_81E0F88: @ 81E0F88
+ thumb_func_start rfu_CB_startSearchParent
+rfu_CB_startSearchParent: @ 81E0F88
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -3607,23 +3607,23 @@ sub_81E0F88: @ 81E0F88
_081E0F9E:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_81E0F88
+ thumb_func_end rfu_CB_startSearchParent
- thumb_func_start sub_81E0FAC
-sub_81E0FAC: @ 81E0FAC
+ thumb_func_start rfu_REQ_pollSearchParent
+rfu_REQ_pollSearchParent: @ 81E0FAC
push {lr}
ldr r0, _081E0FBC @ =sub_81E0FC0
bl STWI_set_Callback_M
- bl sub_81DF5B4
+ bl STWI_send_SP_PollingREQ
pop {r0}
bx r0
.align 2, 0
_081E0FBC: .4byte sub_81E0FC0
- thumb_func_end sub_81E0FAC
+ thumb_func_end rfu_REQ_pollSearchParent
thumb_func_start sub_81E0FC0
sub_81E0FC0: @ 81E0FC0
@@ -3635,30 +3635,30 @@ sub_81E0FC0: @ 81E0FC0
adds r4, r1, 0
cmp r4, 0
bne _081E0FD4
- bl sub_81E0FF8
+ bl rfu_STC_readParentCandidateList
_081E0FD4:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_81E0FC0
- thumb_func_start sub_81E0FE4
-sub_81E0FE4: @ 81E0FE4
+ thumb_func_start rfu_REQ_endSearchParent
+rfu_REQ_endSearchParent: @ 81E0FE4
push {lr}
- ldr r0, _081E0FF4 @ =sub_81E0848
+ ldr r0, _081E0FF4 @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
- bl sub_81DF5D8
+ bl STWI_send_SP_EndREQ
pop {r0}
bx r0
.align 2, 0
-_081E0FF4: .4byte sub_81E0848
- thumb_func_end sub_81E0FE4
+_081E0FF4: .4byte rfu_STC_REQ_callback
+ thumb_func_end rfu_REQ_endSearchParent
- thumb_func_start sub_81E0FF8
-sub_81E0FF8: @ 81E0FF8
+ thumb_func_start rfu_STC_readParentCandidateList
+rfu_STC_readParentCandidateList: @ 81E0FF8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -3799,7 +3799,7 @@ _081E10FC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_81E0FF8
+ thumb_func_end rfu_STC_readParentCandidateList
thumb_func_start rfu_REQ_startConnectParent
rfu_REQ_startConnectParent: @ 81E1108
@@ -3837,39 +3837,39 @@ _081E113C:
ldr r0, _081E1158 @ =gUnknown_3007464
ldr r0, [r0]
strh r4, [r0, 0x1E]
- ldr r0, _081E115C @ =sub_81E0848
+ ldr r0, _081E115C @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
adds r0, r4, 0
- bl sub_81DF5FC
+ bl STWI_send_CP_StartREQ
b _081E1168
.align 2, 0
_081E1154: .4byte gUnknown_3007460
_081E1158: .4byte gUnknown_3007464
-_081E115C: .4byte sub_81E0848
+_081E115C: .4byte rfu_STC_REQ_callback
_081E1160:
movs r0, 0x1F
adds r1, r3, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E1168:
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end rfu_REQ_startConnectParent
- thumb_func_start sub_81E1170
-sub_81E1170: @ 81E1170
+ thumb_func_start rfu_REQ_pollConnectParent
+rfu_REQ_pollConnectParent: @ 81E1170
push {lr}
- ldr r0, _081E1180 @ =sub_81E1184
+ ldr r0, _081E1180 @ =rfu_CB_pollConnectParent
bl STWI_set_Callback_M
- bl sub_81DF62C
+ bl STWI_send_CP_PollingREQ
pop {r0}
bx r0
.align 2, 0
-_081E1180: .4byte sub_81E1184
- thumb_func_end sub_81E1170
+_081E1180: .4byte rfu_CB_pollConnectParent
+ thumb_func_end rfu_REQ_pollConnectParent
- thumb_func_start sub_81E1184
-sub_81E1184: @ 81E1184
+ thumb_func_start rfu_CB_pollConnectParent
+rfu_CB_pollConnectParent: @ 81E1184
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4000,7 +4000,7 @@ _081E1264:
_081E1286:
ldr r0, [sp, 0x24]
ldr r1, [sp, 0x28]
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -4011,10 +4011,10 @@ _081E1286:
bx r0
.align 2, 0
_081E12A0: .4byte gUnknown_3007460
- thumb_func_end sub_81E1184
+ thumb_func_end rfu_CB_pollConnectParent
- thumb_func_start sub_81E12A4
-sub_81E12A4: @ 81E12A4
+ thumb_func_start rfu_getConnectParentStatus
+rfu_getConnectParentStatus: @ 81E12A4
push {lr}
adds r3, r0, 0
movs r0, 0xFF
@@ -4043,12 +4043,12 @@ _081E12C8:
_081E12D4:
pop {r1}
bx r1
- thumb_func_end sub_81E12A4
+ thumb_func_end rfu_getConnectParentStatus
thumb_func_start rfu_REQ_endConnectParent
rfu_REQ_endConnectParent: @ 81E12D8
push {lr}
- ldr r0, _081E1304 @ =sub_81E1184
+ ldr r0, _081E1304 @ =rfu_CB_pollConnectParent
bl STWI_set_Callback_M
bl STWI_send_CP_EndREQ
ldr r0, _081E1308 @ =gUnknown_3007468
@@ -4069,7 +4069,7 @@ _081E1300:
pop {r0}
bx r0
.align 2, 0
-_081E1304: .4byte sub_81E1184
+_081E1304: .4byte rfu_CB_pollConnectParent
_081E1308: .4byte gUnknown_3007468
_081E130C: .4byte gUnknown_3007464
thumb_func_end rfu_REQ_endConnectParent
@@ -4341,9 +4341,9 @@ _081E14F8:
str r1, [sp, 0x10]
ldr r0, [r0, 0x4]
str r0, [sp, 0x14]
- ldr r0, _081E1554 @ =sub_81E0888
+ ldr r0, _081E1554 @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF3D8
+ bl STWI_send_LinkStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 24
lsrs r0, 24
@@ -4375,11 +4375,11 @@ _081E152C:
.align 2, 0
_081E154C: .4byte gUnknown_3007468
_081E1550: .4byte gUnknown_3007460
-_081E1554: .4byte sub_81E0888
+_081E1554: .4byte rfu_CB_defaultCallback
_081E1558:
movs r0, 0x11
ldr r1, [sp, 0xC]
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
ldr r0, [sp, 0xC]
b _081E1790
_081E1564:
@@ -4430,7 +4430,7 @@ _081E1578:
_081E15B8: .4byte gUnknown_3007460
_081E15BC: .4byte gUnknown_3007464
_081E15C0:
- bl sub_81DF420
+ bl STWI_send_SystemStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 16
cmp r0, 0
@@ -4475,7 +4475,7 @@ _081E15F4:
strb r2, [r0]
ldr r0, [r4]
ldrb r0, [r0, 0x2]
- bl sub_81DF800
+ bl STWI_send_DisconnectREQ
bl STWI_poll_CommandEnd
_081E1626:
mov r0, r8
@@ -4562,7 +4562,7 @@ _081E16BE:
ands r0, r6
cmp r0, 0
bne _081E1742
- bl sub_81DF444
+ bl STWI_send_SlotStatusREQ
bl STWI_poll_CommandEnd
ldr r0, _081E1708 @ =gUnknown_3007468
ldr r0, [r0]
@@ -4647,7 +4647,7 @@ _081E1768:
cmp r2, 0
beq _081E1778
mov r0, r9
- bl sub_81DF800
+ bl STWI_send_DisconnectREQ
bl STWI_poll_CommandEnd
_081E1778:
ldr r1, _081E17A8 @ =gUnknown_3007468
@@ -4813,24 +4813,24 @@ _081E18A8:
ldrb r0, [r0, 0x9]
cmp r0, 0
beq _081E18D4
- ldr r0, _081E18D0 @ =sub_81E0888
+ ldr r0, _081E18D0 @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF56C
+ bl STWI_send_SC_EndREQ
bl STWI_poll_CommandEnd
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
beq _081E18D4
movs r0, 0x1B
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
b _081E18E0
.align 2, 0
-_081E18D0: .4byte sub_81E0888
+_081E18D0: .4byte rfu_CB_defaultCallback
_081E18D4:
ldr r0, _081E18E8 @ =rfu_CB_disconnect
bl STWI_set_Callback_M
adds r0, r4, 0
- bl sub_81DF800
+ bl STWI_send_DisconnectREQ
_081E18E0:
pop {r4}
pop {r0}
@@ -4853,9 +4853,9 @@ rfu_CB_disconnect: @ 81E18EC
ldrb r0, [r0]
cmp r0, 0
bne _081E1928
- ldr r0, _081E19C0 @ =sub_81E0888
+ ldr r0, _081E19C0 @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF420
+ bl STWI_send_SystemStatusREQ
bl STWI_poll_CommandEnd
lsls r0, 16
cmp r0, 0
@@ -4922,29 +4922,29 @@ _081E1976:
_081E1988:
adds r0, r6, 0
adds r1, r5, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
ldr r0, _081E19C8 @ =gUnknown_3007464
ldr r0, [r0]
ldrb r0, [r0, 0x9]
cmp r0, 0
beq _081E19B6
- ldr r0, _081E19C0 @ =sub_81E0888
+ ldr r0, _081E19C0 @ =rfu_CB_defaultCallback
bl STWI_set_Callback_M
- bl sub_81DF524
+ bl STWI_send_SC_StartREQ
bl STWI_poll_CommandEnd
adds r5, r0, 0
cmp r5, 0
beq _081E19B6
movs r0, 0x19
adds r1, r5, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E19B6:
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_081E19BC: .4byte gUnknown_3007460
-_081E19C0: .4byte sub_81E0888
+_081E19C0: .4byte rfu_CB_defaultCallback
_081E19C4: .4byte gUnknown_3007468
_081E19C8: .4byte gUnknown_3007464
thumb_func_end rfu_CB_disconnect
@@ -4960,7 +4960,7 @@ rfu_REQ_CHILD_startConnectRecovery: @ 81E19CC
movs r4, 0
movs r0, 0x1
ands r0, r5
- ldr r2, _081E1A20 @ =sub_81E0848
+ ldr r2, _081E1A20 @ =rfu_STC_REQ_callback
cmp r0, 0
bne _081E19FA
movs r1, 0x1
@@ -4992,24 +4992,24 @@ _081E19FA:
bx r0
.align 2, 0
_081E1A1C: .4byte gUnknown_3007464
-_081E1A20: .4byte sub_81E0848
+_081E1A20: .4byte rfu_STC_REQ_callback
_081E1A24: .4byte gUnknown_3007460
thumb_func_end rfu_REQ_CHILD_startConnectRecovery
- thumb_func_start sub_81E1A28
-sub_81E1A28: @ 81E1A28
+ thumb_func_start rfu_REQ_CHILD_pollConnectRecovery
+rfu_REQ_CHILD_pollConnectRecovery: @ 81E1A28
push {lr}
- ldr r0, _081E1A38 @ =sub_81E1A3C
+ ldr r0, _081E1A38 @ =rfu_CB_CHILD_pollConnectRecovery
bl STWI_set_Callback_M
- bl sub_81DF8A4
+ bl STWI_send_CPR_PollingREQ
pop {r0}
bx r0
.align 2, 0
-_081E1A38: .4byte sub_81E1A3C
- thumb_func_end sub_81E1A28
+_081E1A38: .4byte rfu_CB_CHILD_pollConnectRecovery
+ thumb_func_end rfu_REQ_CHILD_pollConnectRecovery
- thumb_func_start sub_81E1A3C
-sub_81E1A3C: @ 81E1A3C
+ thumb_func_start rfu_CB_CHILD_pollConnectRecovery
+rfu_CB_CHILD_pollConnectRecovery: @ 81E1A3C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -5081,7 +5081,7 @@ _081E1AB0:
_081E1AC0:
mov r0, r8
adds r1, r7, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -5091,10 +5091,10 @@ _081E1AC0:
_081E1AD4: .4byte gUnknown_3007468
_081E1AD8: .4byte gUnknown_3007464
_081E1ADC: .4byte gUnknown_3007460
- thumb_func_end sub_81E1A3C
+ thumb_func_end rfu_CB_CHILD_pollConnectRecovery
- thumb_func_start sub_81E1AE0
-sub_81E1AE0: @ 81E1AE0
+ thumb_func_start rfu_CHILD_getConnectRecoveryStatus
+rfu_CHILD_getConnectRecoveryStatus: @ 81E1AE0
push {lr}
adds r2, r0, 0
movs r0, 0xFF
@@ -5120,19 +5120,19 @@ _081E1B04:
_081E1B0A:
pop {r1}
bx r1
- thumb_func_end sub_81E1AE0
+ thumb_func_end rfu_CHILD_getConnectRecoveryStatus
- thumb_func_start sub_81E1B10
-sub_81E1B10: @ 81E1B10
+ thumb_func_start rfu_REQ_CHILD_endConnectRecovery
+rfu_REQ_CHILD_endConnectRecovery: @ 81E1B10
push {lr}
- ldr r0, _081E1B20 @ =sub_81E1A3C
+ ldr r0, _081E1B20 @ =rfu_CB_CHILD_pollConnectRecovery
bl STWI_set_Callback_M
- bl sub_81DF8C8
+ bl STWI_send_CPR_EndREQ
pop {r0}
bx r0
.align 2, 0
-_081E1B20: .4byte sub_81E1A3C
- thumb_func_end sub_81E1B10
+_081E1B20: .4byte rfu_CB_CHILD_pollConnectRecovery
+ thumb_func_end rfu_REQ_CHILD_endConnectRecovery
thumb_func_start sub_81E1B24
sub_81E1B24: @ 81E1B24
@@ -5172,16 +5172,16 @@ rfu_REQ_changeMasterSlave: @ 81E1B54
lsrs r0, 16
cmp r0, 0x1
bne _081E1B74
- ldr r0, _081E1B70 @ =sub_81E0848
+ ldr r0, _081E1B70 @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
bl STWI_send_MS_ChangeREQ
b _081E1B7C
.align 2, 0
-_081E1B70: .4byte sub_81E0848
+_081E1B70: .4byte rfu_STC_REQ_callback
_081E1B74:
movs r0, 0x27
movs r1, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E1B7C:
pop {r0}
bx r0
@@ -6259,8 +6259,8 @@ _081E235C: .4byte gUnknown_3007460
_081E2360: .4byte 0x04000208
thumb_func_end rfu_NI_stopReceivingData
- thumb_func_start sub_81E2364
-sub_81E2364: @ 81E2364
+ thumb_func_start rfu_UNI_changeAndReadySendData
+rfu_UNI_changeAndReadySendData: @ 81E2364
push {r4-r7,lr}
adds r7, r1, 0
lsls r0, 24
@@ -6337,7 +6337,7 @@ _081E23F0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_81E2364
+ thumb_func_end rfu_UNI_changeAndReadySendData
thumb_func_start rfu_UNI_readySendData
rfu_UNI_readySendData: @ 81E23F8
@@ -6456,7 +6456,7 @@ _081E24B0:
ldr r0, [r4]
adds r0, 0x68
movs r1, 0x1
- bl sub_81DF674
+ bl STWI_send_DataTxREQ
b _081E257E
.align 2, 0
_081E24D4: .4byte gUnknown_3007468
@@ -6465,7 +6465,7 @@ _081E24DC:
ldr r0, [r4]
adds r0, 0x68
movs r1, 0x1
- bl sub_81DF6BC
+ bl STWI_send_DataTxAndChangeREQ
b _081E257E
_081E24E8:
ldr r0, [r4]
@@ -6478,7 +6478,7 @@ _081E24F4:
ldrb r0, [r0, 0xE]
cmp r0, 0
beq _081E2542
- ldr r0, _081E2520 @ =sub_81E2588
+ ldr r0, _081E2520 @ =rfu_CB_sendData
bl STWI_set_Callback_M
cmp r5, 0
beq _081E252C
@@ -6491,10 +6491,10 @@ _081E24F4:
adds r1, 0x4
lsls r1, 24
lsrs r1, 24
- bl sub_81DF6BC
+ bl STWI_send_DataTxAndChangeREQ
b _081E257E
.align 2, 0
-_081E2520: .4byte sub_81E2588
+_081E2520: .4byte rfu_CB_sendData
_081E2524: .4byte gUnknown_3007468
_081E2528: .4byte gUnknown_3007464
_081E252C:
@@ -6507,7 +6507,7 @@ _081E252C:
adds r1, 0x4
lsls r1, 24
lsrs r1, 24
- bl sub_81DF674
+ bl STWI_send_DataTxREQ
_081E2542:
cmp r5, 0
beq _081E257E
@@ -6530,7 +6530,7 @@ _081E2568: .4byte gUnknown_3007464
_081E256C: .4byte gUnknown_3007460
_081E2570: .4byte gRfuState
_081E2574:
- ldr r0, _081E2584 @ =sub_81E2620
+ ldr r0, _081E2584 @ =rfu_CB_sendData2
bl STWI_set_Callback_M
bl STWI_send_MS_ChangeREQ
_081E257E:
@@ -6538,11 +6538,11 @@ _081E257E:
pop {r0}
bx r0
.align 2, 0
-_081E2584: .4byte sub_81E2620
+_081E2584: .4byte rfu_CB_sendData2
thumb_func_end rfu_REQ_sendData
- thumb_func_start sub_81E2588
-sub_81E2588: @ 81E2588
+ thumb_func_start rfu_CB_sendData
+rfu_CB_sendData: @ 81E2588
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -6607,7 +6607,7 @@ _081E25F2:
strb r0, [r1, 0xE]
movs r0, 0x24
adds r1, r7, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -6618,18 +6618,18 @@ _081E2610: .4byte 0x00008020
_081E2614: .4byte gUnknown_3007440
_081E2618: .4byte gUnknown_3007450
_081E261C: .4byte gUnknown_3007460
- thumb_func_end sub_81E2588
+ thumb_func_end rfu_CB_sendData
- thumb_func_start sub_81E2620
-sub_81E2620: @ 81E2620
+ thumb_func_start rfu_CB_sendData2
+rfu_CB_sendData2: @ 81E2620
push {lr}
lsls r1, 16
lsrs r1, 16
movs r0, 0x24
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
pop {r0}
bx r0
- thumb_func_end sub_81E2620
+ thumb_func_end rfu_CB_sendData2
thumb_func_start sub_81E2630
sub_81E2630: @ 81E2630
@@ -6641,14 +6641,14 @@ sub_81E2630: @ 81E2630
cmp r1, 0
beq _081E2646
movs r0, 0x24
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
b _081E2652
_081E2646:
cmp r0, 0xFF
bne _081E2652
movs r0, 0xFF
movs r1, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
_081E2652:
pop {r0}
bx r0
@@ -7186,7 +7186,7 @@ rfu_REQ_recvData: @ 81E2A24
strb r0, [r3, 0x3]
ldr r0, [r2]
strb r1, [r0, 0x4]
- ldr r0, _081E2A60 @ =sub_81E2A64
+ ldr r0, _081E2A60 @ =rfu_CB_recvData
bl STWI_set_Callback_M
bl STWI_send_DataRxREQ
_081E2A50:
@@ -7196,11 +7196,11 @@ _081E2A50:
.align 2, 0
_081E2A58: .4byte gUnknown_3007460
_081E2A5C: .4byte gUnknown_3007464
-_081E2A60: .4byte sub_81E2A64
+_081E2A60: .4byte rfu_CB_recvData
thumb_func_end rfu_REQ_recvData
- thumb_func_start sub_81E2A64
-sub_81E2A64: @ 81E2A64
+ thumb_func_start rfu_CB_recvData
+rfu_CB_recvData: @ 81E2A64
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -7228,14 +7228,14 @@ sub_81E2A64: @ 81E2A64
ldrb r0, [r0]
cmp r0, 0x1
bne _081E2AAC
- bl sub_81E2B50
+ bl rfu_STC_PARENT_analyzeRecvPacket
b _081E2AB0
.align 2, 0
_081E2AA0: .4byte gUnknown_3007468
_081E2AA4: .4byte gUnknown_3007464
_081E2AA8: .4byte gUnknown_3007460
_081E2AAC:
- bl sub_81E2BE8
+ bl rfu_STC_CHILD_analyzeRecvPacket
_081E2AB0:
movs r6, 0
ldr r0, _081E2B40 @ =0x00008043
@@ -7302,7 +7302,7 @@ _081E2B0A:
_081E2B28:
mov r0, r9
adds r1, r7, 0
- bl sub_81E0848
+ bl rfu_STC_REQ_callback
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -7315,10 +7315,10 @@ _081E2B40: .4byte 0x00008043
_081E2B44: .4byte gUnknown_3007460
_081E2B48: .4byte gUnknown_3007450
_081E2B4C: .4byte gUnknown_3007464
- thumb_func_end sub_81E2A64
+ thumb_func_end rfu_CB_recvData
- thumb_func_start sub_81E2B50
-sub_81E2B50: @ 81E2B50
+ thumb_func_start rfu_STC_PARENT_analyzeRecvPacket
+rfu_STC_PARENT_analyzeRecvPacket: @ 81E2B50
push {r4-r7,lr}
sub sp, 0x4
ldr r1, _081E2BE0 @ =gUnknown_3007468
@@ -7372,7 +7372,7 @@ _081E2BAC:
ldrb r2, [r4]
adds r0, r5, 0
adds r1, r6, 0
- bl sub_81E2C40
+ bl rfu_STC_analyzeLLSF
lsls r0, 24
lsrs r0, 24
adds r6, r0
@@ -7398,10 +7398,10 @@ _081E2BD0:
.align 2, 0
_081E2BE0: .4byte gUnknown_3007468
_081E2BE4: .4byte gUnknown_3007464
- thumb_func_end sub_81E2B50
+ thumb_func_end rfu_STC_PARENT_analyzeRecvPacket
- thumb_func_start sub_81E2BE8
-sub_81E2BE8: @ 81E2BE8
+ thumb_func_start rfu_STC_CHILD_analyzeRecvPacket
+rfu_STC_CHILD_analyzeRecvPacket: @ 81E2BE8
push {r4-r6,lr}
ldr r0, _081E2C38 @ =gUnknown_3007468
ldr r0, [r0]
@@ -7428,7 +7428,7 @@ _081E2C0E:
movs r0, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_81E2C40
+ bl rfu_STC_analyzeLLSF
lsls r0, 16
lsrs r0, 16
adds r5, r0
@@ -7446,10 +7446,10 @@ _081E2C30:
.align 2, 0
_081E2C38: .4byte gUnknown_3007468
_081E2C3C: .4byte gUnknown_3007464
- thumb_func_end sub_81E2BE8
+ thumb_func_end rfu_STC_CHILD_analyzeRecvPacket
- thumb_func_start sub_81E2C40
-sub_81E2C40: @ 81E2C40
+ thumb_func_start rfu_STC_analyzeLLSF
+rfu_STC_analyzeLLSF: @ 81E2C40
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7608,7 +7608,7 @@ _081E2D62:
mov r0, r12
mov r1, sp
adds r2, r7, 0
- bl sub_81E2E84
+ bl rfu_STC_UNI_receive
b _081E2E6C
.align 2, 0
_081E2D7C: .4byte 0xffffff00
@@ -7625,7 +7625,7 @@ _081E2D94:
mov r0, r12
mov r1, sp
adds r2, r7, 0
- bl sub_81E3124
+ bl rfu_STC_NI_receive_Receiver
b _081E2E6C
_081E2DA8:
movs r4, 0
@@ -7672,7 +7672,7 @@ _081E2DEA:
mov r1, r12
mov r2, sp
adds r3, r7, 0
- bl sub_81E2F38
+ bl rfu_STC_NI_receive_Sender
b _081E2E6C
.align 2, 0
_081E2E04: .4byte gUnknown_3007460
@@ -7698,7 +7698,7 @@ _081E2E1A:
bne _081E2E36
adds r0, r4, 0
adds r2, r7, 0
- bl sub_81E2E84
+ bl rfu_STC_UNI_receive
b _081E2E62
_081E2E36:
ldrb r0, [r1, 0x3]
@@ -7707,7 +7707,7 @@ _081E2E36:
adds r0, r4, 0
mov r1, sp
adds r2, r7, 0
- bl sub_81E3124
+ bl rfu_STC_NI_receive_Receiver
b _081E2E62
_081E2E48:
ldr r0, _081E2E80 @ =gUnknown_3007460
@@ -7721,7 +7721,7 @@ _081E2E48:
adds r1, r4, 0
mov r2, sp
adds r3, r7, 0
- bl sub_81E2F38
+ bl rfu_STC_NI_receive_Sender
_081E2E62:
adds r0, r4, 0x1
lsls r0, 24
@@ -7741,10 +7741,10 @@ _081E2E6E:
bx r1
.align 2, 0
_081E2E80: .4byte gUnknown_3007460
- thumb_func_end sub_81E2C40
+ thumb_func_end rfu_STC_analyzeLLSF
- thumb_func_start sub_81E2E84
-sub_81E2E84: @ 81E2E84
+ thumb_func_start rfu_STC_UNI_receive
+rfu_STC_UNI_receive: @ 81E2E84
push {r4-r7,lr}
sub sp, 0x8
adds r6, r1, 0
@@ -7834,10 +7834,10 @@ _081E2F22:
_081E2F2C: .4byte 0x00008042
_081E2F30: .4byte gUnknown_3007468
_081E2F34: .4byte gUnknown_3007464
- thumb_func_end sub_81E2E84
+ thumb_func_end rfu_STC_UNI_receive
- thumb_func_start sub_81E2F38
-sub_81E2F38: @ 81E2F38
+ thumb_func_start rfu_STC_NI_receive_Sender
+rfu_STC_NI_receive_Sender: @ 81E2F38
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -8086,10 +8086,10 @@ _081E3114: .4byte 0x00008020
_081E3118: .4byte 0x04000208
_081E311C: .4byte gUnknown_3007464
_081E3120: .4byte gUnknown_3007450
- thumb_func_end sub_81E2F38
+ thumb_func_end rfu_STC_NI_receive_Sender
- thumb_func_start sub_81E3124
-sub_81E3124: @ 81E3124
+ thumb_func_start rfu_STC_NI_receive_Receiver
+rfu_STC_NI_receive_Receiver: @ 81E3124
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -8154,7 +8154,7 @@ _081E3194:
bne _081E31AC
mov r0, r8
adds r1, r5, 0
- bl sub_81E3330
+ bl rfu_STC_NI_initSlot_asRecvDataEntity
_081E31AC:
ldrh r1, [r5]
ldr r0, _081E31BC @ =0x00008042
@@ -8172,7 +8172,7 @@ _081E31C0:
beq _081E31DE
mov r0, r8
adds r1, r5, 0
- bl sub_81E32A0
+ bl rfu_STC_NI_initSlot_asRecvControllData
ldrh r0, [r4, 0x34]
cmp r0, r7
bne _081E327A
@@ -8276,10 +8276,10 @@ _081E3290: .4byte gUnknown_3007468
_081E3294: .4byte 0x00008042
_081E3298: .4byte 0x04000208
_081E329C: .4byte gUnknown_3007464
- thumb_func_end sub_81E3124
+ thumb_func_end rfu_STC_NI_receive_Receiver
- thumb_func_start sub_81E32A0
-sub_81E32A0: @ 81E32A0
+ thumb_func_start rfu_STC_NI_initSlot_asRecvControllData
+rfu_STC_NI_initSlot_asRecvControllData: @ 81E32A0
push {r4-r7,lr}
adds r2, r1, 0
lsls r0, 24
@@ -8354,10 +8354,10 @@ _081E3326:
bx r0
.align 2, 0
_081E332C: .4byte 0x00008041
- thumb_func_end sub_81E32A0
+ thumb_func_end rfu_STC_NI_initSlot_asRecvControllData
- thumb_func_start sub_81E3330
-sub_81E3330: @ 81E3330
+ thumb_func_start rfu_STC_NI_initSlot_asRecvDataEntity
+rfu_STC_NI_initSlot_asRecvDataEntity: @ 81E3330
push {r4-r7,lr}
adds r4, r1, 0
lsls r0, 24
@@ -8449,7 +8449,7 @@ _081E33DC:
bx r0
.align 2, 0
_081E33E4: .4byte 0x00008042
- thumb_func_end sub_81E3330
+ thumb_func_end rfu_STC_NI_initSlot_asRecvDataEntity
thumb_func_start rfu_NI_checkCommFailCounter
rfu_NI_checkCommFailCounter: @ 81E33E8
@@ -8534,19 +8534,19 @@ _081E347C: .4byte gUnknown_3007464
_081E3480: .4byte gUnknown_3007450
thumb_func_end rfu_NI_checkCommFailCounter
- thumb_func_start sub_81E3484
-sub_81E3484: @ 81E3484
+ thumb_func_start rfu_REQ_noise
+rfu_REQ_noise: @ 81E3484
push {lr}
- ldr r0, _081E3498 @ =sub_81E0848
+ ldr r0, _081E3498 @ =rfu_STC_REQ_callback
bl STWI_set_Callback_M
movs r0, 0x1
movs r1, 0
- bl sub_81DF830
+ bl STWI_send_TestModeREQ
pop {r0}
bx r0
.align 2, 0
-_081E3498: .4byte sub_81E0848
- thumb_func_end sub_81E3484
+_081E3498: .4byte rfu_STC_REQ_callback
+ thumb_func_end rfu_REQ_noise
thumb_func_start sub_81E349C
sub_81E349C: @ 81E349C
@@ -8573,7 +8573,7 @@ _081E34B8:
movs r0, 0xA
str r0, [r1]
ldr r0, _081E34EC @ =sub_81E36B8
- bl sub_81DF380
+ bl STWI_set_Callback_ID
bl sub_81E3550
ldr r0, [r4]
ldrb r0, [r0, 0xA]
@@ -8623,7 +8623,7 @@ _081E351A:
ldr r1, [r0]
movs r0, 0
str r0, [r1]
- bl sub_81DF380
+ bl STWI_set_Callback_ID
adds r0, r6, 0
_081E3538:
pop {r3}
diff --git a/asm/link.s b/asm/link.s
index f5de3137f..b28c9a236 100644
--- a/asm/link.s
+++ b/asm/link.s
@@ -49,7 +49,7 @@ sub_80094D4: @ 80094D4
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_80094D4
@@ -75,7 +75,7 @@ sub_80094E4: @ 80094E4
ldr r0, _08009540 @ =gUnknown_8232578
lsls r1, r5, 4
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r3, _08009544 @ =0x040000d4
ldr r0, _08009548 @ =gUnknown_8232598
str r0, [r3]
@@ -119,7 +119,7 @@ _0800955C:
lsls r0, r7, 2
orrs r1, r0
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
b _08009590
_0800956E:
lsls r1, r6, 8
@@ -128,7 +128,7 @@ _0800956E:
lsls r0, r7, 2
orrs r1, r0
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _08009590
_08009580:
lsls r1, r6, 8
@@ -137,7 +137,7 @@ _08009580:
lsls r0, r7, 2
orrs r1, r0
movs r0, 0xE
- bl sub_8000A38
+ bl SetGpuReg
_08009590:
mov r0, r8
lsls r4, r0, 2
@@ -146,13 +146,13 @@ _08009590:
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r4, 0x12
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -182,7 +182,7 @@ sub_80095BC: @ 80095BC
mov r2, r8
lsls r1, r2, 4
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r2, _0800962C @ =0x040000d4
ldr r0, _08009630 @ =gUnknown_8232598
str r0, [r2]
@@ -207,7 +207,7 @@ sub_80095BC: @ 80095BC
lsls r5, 2
orrs r4, r5
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -226,11 +226,11 @@ _0800963C: .4byte gUnknown_8231E20
sub_8009640: @ 8009640
push {r4,lr}
sub sp, 0x4
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
ldr r0, _080096D4 @ =sub_800978C
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_800A294
ldr r1, _080096D8 @ =gUnknown_202271A
ldr r2, _080096DC @ =0x00001111
@@ -242,7 +242,7 @@ sub_8009640: @ 8009640
bl sub_8044EE8
movs r4, 0
_08009670:
- bl sub_8044EC8
+ bl Random
ldr r1, _080096E4 @ =gUnknown_300500C
ldr r1, [r1]
adds r1, 0xA
@@ -261,22 +261,22 @@ _08009670:
movs r1, 0xAA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080096E8 @ =sub_80094D4
movs r1, 0
- bl sub_807741C
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl CreateTask
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
ldr r0, _080096EC @ =gUnknown_3000E58
str r4, [r0]
bl sub_8009708
- ldr r0, _080096F0 @ =sub_800A74C
+ ldr r0, _080096F0 @ =task00_link_test
movs r1, 0
- bl sub_807741C
- ldr r0, _080096F4 @ =sub_8009A8C
- bl sub_8000544
+ bl CreateTask
+ ldr r0, _080096F4 @ =c2_08009A8C
+ bl SetMainCallback2
add sp, 0x4
pop {r4}
pop {r0}
@@ -289,8 +289,8 @@ _080096E0: .4byte gUnknown_30030F0
_080096E4: .4byte gUnknown_300500C
_080096E8: .4byte sub_80094D4
_080096EC: .4byte gUnknown_3000E58
-_080096F0: .4byte sub_800A74C
-_080096F4: .4byte sub_8009A8C
+_080096F0: .4byte task00_link_test
+_080096F4: .4byte c2_08009A8C
thumb_func_end sub_8009640
thumb_func_start sub_80096F8
@@ -323,7 +323,7 @@ sub_8009708: @ 8009708
str r2, [r5, 0x4]
adds r0, r5, 0
adds r0, 0x8
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldrb r0, [r0, 0x8]
strb r0, [r5, 0x13]
@@ -370,9 +370,9 @@ _08009788: .4byte 0x00000844
thumb_func_start sub_800978C
sub_800978C: @ 800978C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_800978C
@@ -401,8 +401,8 @@ _080097C4: .4byte gUnknown_3003F50
_080097C8: .4byte 0x0000efff
thumb_func_end sub_80097A0
- thumb_func_start sub_80097CC
-sub_80097CC: @ 80097CC
+ thumb_func_start task02_080097CC
+task02_080097CC: @ 80097CC
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -422,14 +422,14 @@ sub_80097CC: @ 80097CC
movs r0, 0x1
strb r0, [r1]
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_080097F6:
pop {r0}
bx r0
.align 2, 0
_080097FC: .4byte gUnknown_3005090
_08009800: .4byte gUnknown_3003F84
- thumb_func_end sub_80097CC
+ thumb_func_end task02_080097CC
thumb_func_start sub_8009804
sub_8009804: @ 8009804
@@ -449,7 +449,7 @@ sub_8009804: @ 8009804
strb r4, [r0]
ldr r0, _08009860 @ =gUnknown_3003F38
strb r4, [r0]
- bl sub_800A550
+ bl ResetBlockReceivedFlags
bl sub_800A294
ldr r0, _08009864 @ =gUnknown_3000E4C
str r4, [r0]
@@ -459,9 +459,9 @@ sub_8009804: @ 8009804
strb r4, [r0]
ldr r0, _08009870 @ =gUnknown_3003F34
strh r4, [r0]
- ldr r0, _08009874 @ =sub_80097CC
+ ldr r0, _08009874 @ =task02_080097CC
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
b _0800987C
.align 2, 0
_0800984C: .4byte gUnknown_3003F3C
@@ -474,7 +474,7 @@ _08009864: .4byte gUnknown_3000E4C
_08009868: .4byte gUnknown_3003F28
_0800986C: .4byte gUnknown_3003F24
_08009870: .4byte gUnknown_3003F34
-_08009874: .4byte sub_80097CC
+_08009874: .4byte task02_080097CC
_08009878:
bl sub_80F86F4
_0800987C:
@@ -579,7 +579,7 @@ _08009938:
lsrs r5, r0, 24
cmp r5, 0x3
bls _08009910
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0xF
@@ -610,7 +610,7 @@ _08009958:
movs r6, 0
strh r0, [r4]
adds r0, r5, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldrh r0, [r4]
cmp r0, r8
beq _08009994
@@ -679,7 +679,7 @@ _080099FA:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08009A16:
ldrh r1, [r4, 0x2E]
movs r0, 0x8
@@ -696,7 +696,7 @@ _08009A26:
cmp r0, 0
beq _08009A38
movs r0, 0x1
- bl sub_80DA364
+ bl TrySavingData
_08009A38:
ldrh r1, [r4, 0x2E]
movs r0, 0x4
@@ -720,7 +720,7 @@ _08009A46:
orrs r1, r0
_08009A60:
adds r0, r2, 0
- bl sub_800A890
+ bl SetLinkDebugValues
_08009A66:
add sp, 0x4
pop {r4,r5}
@@ -736,21 +736,21 @@ _08009A84: .4byte gUnknown_300357C
_08009A88: .4byte gUnknown_3003F80
thumb_func_end sub_80099D0
- thumb_func_start sub_8009A8C
-sub_8009A8C: @ 8009A8C
+ thumb_func_start c2_08009A8C
+c2_08009A8C: @ 8009A8C
push {lr}
bl sub_80099D0
movs r0, 0x1
movs r1, 0x1
movs r2, 0
bl sub_80098E8
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
- thumb_func_end sub_8009A8C
+ thumb_func_end c2_08009A8C
thumb_func_start sub_8009AB0
sub_8009AB0: @ 8009AB0
@@ -1148,8 +1148,8 @@ _08009D9A:
cmp r0, 0
beq _08009DDC
_08009DBC:
- ldr r0, _08009DD8 @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _08009DD8 @ =c2_800ACD4
+ bl SetMainCallback2
b _08009E3E
.align 2, 0
_08009DC4: .4byte gUnknown_2022118
@@ -1157,7 +1157,7 @@ _08009DC8: .4byte gUnknown_3003ED0
_08009DCC: .4byte gUnknown_3003EB8
_08009DD0: .4byte gUnknown_202273C
_08009DD4: .4byte gUnknown_82345C0
-_08009DD8: .4byte sub_800ACD4
+_08009DD8: .4byte c2_800ACD4
_08009DDC:
lsls r0, r6, 24
lsrs r0, 24
@@ -1198,7 +1198,7 @@ _08009E0E:
adds r2, r3
ldrh r2, [r2]
movs r0, 0
- bl sub_800A448
+ bl SendBlock
b _08009E3E
.align 2, 0
_08009E2C: .4byte gUnknown_8234598
@@ -1768,8 +1768,8 @@ _0800A24C:
_0800A254: .4byte gUnknown_3000E54
thumb_func_end sub_800A1F0
- thumb_func_start sub_800A258
-sub_800A258: @ 800A258
+ thumb_func_start GetLinkPlayerTrainerId
+GetLinkPlayerTrainerId: @ 800A258
lsls r0, 24
lsrs r0, 24
ldr r2, _0800A26C @ =gUnknown_202273C
@@ -1782,7 +1782,7 @@ sub_800A258: @ 800A258
bx lr
.align 2, 0
_0800A26C: .4byte gUnknown_202273C
- thumb_func_end sub_800A258
+ thumb_func_end GetLinkPlayerTrainerId
thumb_func_start sub_800A270
sub_800A270: @ 800A270
@@ -1832,7 +1832,7 @@ sub_800A2A8: @ 800A2A8
.align 2, 0
_0800A2BC: .4byte gUnknown_3000E08
_0800A2C0:
- bl sub_800A404
+ bl GetMultiplayerId
strb r0, [r4, 0x9]
movs r0, 0x1
strb r0, [r4, 0x8]
@@ -1960,7 +1960,7 @@ _0800A3A8: .4byte gUnknown_3003F80
thumb_func_start sub_800A3AC
sub_800A3AC: @ 800A3AC
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
ldr r0, _0800A3C4 @ =0x00004444
bl sub_8009E60
ldr r1, _0800A3C8 @ =gUnknown_2022114
@@ -2009,8 +2009,8 @@ sub_800A3F4: @ 800A3F4
_0800A400: .4byte 0x0000aaaa
thumb_func_end sub_800A3F4
- thumb_func_start sub_800A404
-sub_800A404: @ 800A404
+ thumb_func_start GetMultiplayerId
+GetMultiplayerId: @ 800A404
push {lr}
ldr r0, _0800A418 @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -2025,18 +2025,18 @@ sub_800A404: @ 800A404
_0800A418: .4byte gUnknown_3003F3C
_0800A41C: .4byte 0x04000128
_0800A420:
- bl sub_80FA4C8
+ bl rfu_get_multiplayer_id
lsls r0, 24
lsrs r0, 24
_0800A428:
pop {r1}
bx r1
- thumb_func_end sub_800A404
+ thumb_func_end GetMultiplayerId
- thumb_func_start sub_800A42C
-sub_800A42C: @ 800A42C
+ thumb_func_start bitmask_all_link_players_but_self
+bitmask_all_link_players_but_self: @ 800A42C
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2048,10 +2048,10 @@ sub_800A42C: @ 800A42C
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_800A42C
+ thumb_func_end bitmask_all_link_players_but_self
- thumb_func_start sub_800A448
-sub_800A448: @ 800A448
+ thumb_func_start SendBlock
+SendBlock: @ 800A448
push {lr}
adds r3, r1, 0
lsls r2, 16
@@ -2073,7 +2073,7 @@ _0800A46A:
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_800A448
+ thumb_func_end SendBlock
thumb_func_start sub_800A474
sub_800A474: @ 800A474
@@ -2144,8 +2144,8 @@ _0800A4E2:
_0800A4E8: .4byte gUnknown_3003F80
thumb_func_end sub_800A4BC
- thumb_func_start sub_800A4EC
-sub_800A4EC: @ 800A4EC
+ thumb_func_start GetBlockReceivedStatus
+GetBlockReceivedStatus: @ 800A4EC
push {lr}
ldr r0, _0800A510 @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -2173,7 +2173,7 @@ _0800A51C:
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_800A4EC
+ thumb_func_end GetBlockReceivedStatus
thumb_func_start sub_800A524
sub_800A524: @ 800A524
@@ -2201,8 +2201,8 @@ _0800A548:
_0800A54C: .4byte gUnknown_3003EBC
thumb_func_end sub_800A524
- thumb_func_start sub_800A550
-sub_800A550: @ 800A550
+ thumb_func_start ResetBlockReceivedFlags
+ResetBlockReceivedFlags: @ 800A550
push {r4,lr}
ldr r0, _0800A56C @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -2234,10 +2234,10 @@ _0800A57E:
bx r0
.align 2, 0
_0800A584: .4byte gUnknown_3003EBC
- thumb_func_end sub_800A550
+ thumb_func_end ResetBlockReceivedFlags
- thumb_func_start sub_800A588
-sub_800A588: @ 800A588
+ thumb_func_start ResetBlockReceivedFlag
+ResetBlockReceivedFlag: @ 800A588
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -2263,7 +2263,7 @@ _0800A5B2:
bx r0
.align 2, 0
_0800A5B8: .4byte gUnknown_3003EBC
- thumb_func_end sub_800A588
+ thumb_func_end ResetBlockReceivedFlag
thumb_func_start sub_800A5BC
sub_800A5BC: @ 800A5BC
@@ -2495,8 +2495,8 @@ _0800A744: .4byte 0x00002222
_0800A748: .4byte gUnknown_3003F80
thumb_func_end sub_800A720
- thumb_func_start sub_800A74C
-sub_800A74C: @ 800A74C
+ thumb_func_start task00_link_test
+task00_link_test: @ 800A74C
push {r4-r6,lr}
sub sp, 0x20
ldr r1, _0800A86C @ =gUnknown_82345D0
@@ -2532,7 +2532,7 @@ sub_800A74C: @ 800A74C
movs r2, 0xA
movs r3, 0x2
bl sub_800A684
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
movs r1, 0xF
@@ -2551,7 +2551,7 @@ sub_800A74C: @ 800A74C
movs r2, 0x2
movs r3, 0x2
bl sub_800A684
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
movs r1, 0xF
@@ -2629,10 +2629,10 @@ _0800A880: .4byte gUnknown_3004F70
_0800A884: .4byte gUnknown_3003E6C
_0800A888: .4byte gUnknown_3003EB0
_0800A88C: .4byte gUnknown_3003F88
- thumb_func_end sub_800A74C
+ thumb_func_end task00_link_test
- thumb_func_start sub_800A890
-sub_800A890: @ 800A890
+ thumb_func_start SetLinkDebugValues
+SetLinkDebugValues: @ 800A890
ldr r2, _0800A89C @ =gUnknown_3003E6C
str r0, [r2]
ldr r0, _0800A8A0 @ =gUnknown_3003EB0
@@ -2641,7 +2641,7 @@ sub_800A890: @ 800A890
.align 2, 0
_0800A89C: .4byte gUnknown_3003E6C
_0800A8A0: .4byte gUnknown_3003EB0
- thumb_func_end sub_800A890
+ thumb_func_end SetLinkDebugValues
thumb_func_start sub_800A8A4
sub_800A8A4: @ 800A8A4
@@ -2703,7 +2703,7 @@ sub_800A900: @ 800A900
push {r4-r7,lr}
ldr r1, _0800A934 @ =gUnknown_3003F40
strb r0, [r1]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _0800A938 @ =gUnknown_3003F60
strb r0, [r1]
ldr r4, _0800A93C @ =gUnknown_202273C
@@ -2826,7 +2826,7 @@ _0800A9C2:
mov r1, r8
adds r0, r2, r1
adds r1, r2, r7
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _0800A9F6
_0800A9E6:
@@ -2834,8 +2834,8 @@ _0800A9E6:
movs r0, 0x1
strb r0, [r1]
bl sub_80098B8
- ldr r0, _0800AA20 @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _0800AA20 @ =c2_800ACD4
+ bl SetMainCallback2
_0800A9F6:
adds r0, r4, 0x1
lsls r0, 24
@@ -2855,7 +2855,7 @@ _0800AA10: .4byte gUnknown_3003F40
_0800AA14: .4byte gUnknown_20227C8
_0800AA18: .4byte gUnknown_202273C
_0800AA1C: .4byte gUnknown_3003EAC
-_0800AA20: .4byte sub_800ACD4
+_0800AA20: .4byte c2_800ACD4
thumb_func_end sub_800A9A4
thumb_func_start sub_800AA24
@@ -2926,7 +2926,7 @@ sub_800AA80: @ 800AA80
ldrb r0, [r0]
cmp r0, 0x1
bne _0800AA98
- bl sub_80FA28C
+ bl task_add_05_task_del_08FA224_when_no_RfuFunc
b _0800AAAC
.align 2, 0
_0800AA94: .4byte gUnknown_3003F3C
@@ -2958,7 +2958,7 @@ sub_800AAC0: @ 800AAC0
ldrb r0, [r0]
cmp r0, 0x1
bne _0800AAD4
- bl sub_80FA28C
+ bl task_add_05_task_del_08FA224_when_no_RfuFunc
b _0800AAFC
.align 2, 0
_0800AAD0: .4byte gUnknown_3003F3C
@@ -3192,8 +3192,8 @@ sub_800AC58: @ 800AC58
ldr r0, _0800ACB0 @ =gUnknown_3003FA0
ldrb r0, [r0]
strb r0, [r1, 0x5]
- ldr r0, _0800ACB4 @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _0800ACB4 @ =c2_800ACD4
+ bl SetMainCallback2
_0800AC8E:
ldr r1, _0800ACB8 @ =gUnknown_3003EAC
movs r0, 0x1
@@ -3209,7 +3209,7 @@ _0800ACA4: .4byte gUnknown_3003F38
_0800ACA8: .4byte gUnknown_2022854
_0800ACAC: .4byte gUnknown_3004F70
_0800ACB0: .4byte gUnknown_3003FA0
-_0800ACB4: .4byte sub_800ACD4
+_0800ACB4: .4byte c2_800ACD4
_0800ACB8: .4byte gUnknown_3003EAC
thumb_func_end sub_800AC58
@@ -3228,12 +3228,12 @@ sub_800ACBC: @ 800ACBC
_0800ACD0: .4byte gUnknown_2022854
thumb_func_end sub_800ACBC
- thumb_func_start sub_800ACD4
-sub_800ACD4: @ 800ACD4
+ thumb_func_start c2_800ACD4
+c2_800ACD4: @ 800ACD4
push {r4,lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800ADE0 @ =gMPlay_SE1
bl m4aMPlayStop
ldr r0, _0800ADE4 @ =gMPlay_SE2
@@ -3243,16 +3243,16 @@ sub_800ACD4: @ 800ACD4
ldr r0, _0800ADEC @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
- bl sub_8006B10
- bl sub_80088F0
- bl sub_8070A84
+ bl InitHeap
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFadeControl
movs r0, 0
movs r1, 0
movs r2, 0x2
- bl sub_8070424
- bl sub_80773BC
- bl sub_8087E64
+ bl FillPalette
+ bl ResetTasks
+ bl remove_some_task
ldr r1, _0800ADF0 @ =gUnknown_3003F3C
ldrb r0, [r1]
cmp r0, 0
@@ -3267,7 +3267,7 @@ _0800AD2C:
bl sub_80F85F8
_0800AD30:
ldr r0, _0800ADF8 @ =sub_800978C
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
bl sub_8001618
ldr r1, _0800ADFC @ =gUnknown_82345E8
@@ -3277,57 +3277,57 @@ _0800AD30:
ldr r4, _0800AE00 @ =gUnknown_2022860
movs r0, 0x80
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
str r1, [r4]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _0800AE04 @ =gUnknown_82345F0
bl sub_8003B24
lsls r0, 16
cmp r0, 0
beq _0800ADD8
bl sub_8002C28
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE0
lsls r1, 8
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
ldr r0, _0800AE08 @ =gUnknown_841F408
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0800AE0C @ =gUnknown_3003530
movs r0, 0
strb r0, [r1]
ldr r0, _0800AE10 @ =sub_80094D4
movs r1, 0
- bl sub_807741C
- bl sub_8071A94
+ bl CreateTask
+ bl StopMapMusic
ldr r1, _0800AE14 @ =gUnknown_30030F0
movs r0, 0
str r0, [r1]
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
ldr r0, _0800AE18 @ =sub_800AF2C
- bl sub_8000544
+ bl SetMainCallback2
_0800ADD8:
pop {r4}
pop {r0}
@@ -3348,7 +3348,7 @@ _0800AE0C: .4byte gUnknown_3003530
_0800AE10: .4byte sub_80094D4
_0800AE14: .4byte gUnknown_30030F0
_0800AE18: .4byte sub_800AF2C
- thumb_func_end sub_800ACD4
+ thumb_func_end c2_800ACD4
thumb_func_start sub_800AE1C
sub_800AE1C: @ 800AE1C
@@ -3365,19 +3365,19 @@ sub_800AE1C: @ 800AE1C
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0800AEC0 @ =gUnknown_8231EC4
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _0800AEC4 @ =gUnknown_8234610
str r4, [sp]
str r5, [sp, 0x4]
@@ -3398,9 +3398,9 @@ sub_800AE1C: @ 800AE1C
movs r3, 0x2
bl sub_812E51C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0
bl sub_8003F20
@@ -3408,9 +3408,9 @@ sub_800AE1C: @ 800AE1C
movs r1, 0x3
bl sub_8003F20
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -3430,10 +3430,10 @@ sub_800AED0: @ 800AED0
sub sp, 0xC
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0800AF24 @ =gUnknown_8234610
str r0, [sp]
movs r0, 0
@@ -3446,9 +3446,9 @@ sub_800AED0: @ 800AED0
movs r3, 0
bl sub_812E51C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0
bl sub_8003F20
@@ -3456,7 +3456,7 @@ sub_800AED0: @ 800AED0
movs r1, 0x3
bl sub_8003F20
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
add sp, 0xC
pop {r0}
bx r0
@@ -3757,8 +3757,8 @@ sub_800B110: @ 800B110
cmp r0, 0
beq _0800B160
_0800B15A:
- ldr r0, _0800B174 @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _0800B174 @ =c2_800ACD4
+ bl SetMainCallback2
_0800B160:
pop {r4-r6}
pop {r0}
@@ -3767,11 +3767,11 @@ _0800B160:
_0800B168: .4byte gUnknown_2022118
_0800B16C: .4byte gUnknown_202273C
_0800B170: .4byte gUnknown_82345C0
-_0800B174: .4byte sub_800ACD4
+_0800B174: .4byte c2_800ACD4
thumb_func_end sub_800B110
- thumb_func_start sub_800B178
-sub_800B178: @ 800B178
+ thumb_func_start HandleLinkConnection
+HandleLinkConnection: @ 800B178
push {r4,r5,lr}
ldr r0, _0800B1B0 @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -3825,7 +3825,7 @@ _0800B1EE:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_800B178
+ thumb_func_end HandleLinkConnection
thumb_func_start sub_800B1F4
sub_800B1F4: @ 800B1F4
@@ -3926,7 +3926,7 @@ sub_800B284: @ 800B284
adds r2, 0x8
ldrb r1, [r0, 0x1A]
adds r0, r2, 0
- bl sub_80093BC
+ bl ConvertInternationalString
pop {r0}
bx r0
thumb_func_end sub_800B284
@@ -3992,7 +3992,7 @@ sub_800B2F4: @ 800B2F4
orrs r0, r1
strh r0, [r2]
movs r0, 0x80
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _0800B360 @ =0x0400012a
strh r4, [r0]
movs r5, 0
@@ -4238,7 +4238,7 @@ sub_800B4F0: @ 800B4F0
movs r0, 0x41
strh r0, [r1]
movs r0, 0x40
- bl sub_8000B68
+ bl EnableInterrupts
_0800B50E:
pop {r0}
bx r0
@@ -4570,14 +4570,14 @@ _0800B77E:
_0800B784: .4byte gUnknown_3000E64
thumb_func_end sub_800B718
- thumb_func_start sub_800B788
-sub_800B788: @ 800B788
+ thumb_func_start Timer3Intr
+Timer3Intr: @ 800B788
push {lr}
bl sub_800BAF8
bl sub_800B820
pop {r0}
bx r0
- thumb_func_end sub_800B788
+ thumb_func_end Timer3Intr
thumb_func_start sub_800B798
sub_800B798: @ 800B798
diff --git a/asm/link_rfu.s b/asm/link_rfu.s
index b8453706c..f0d698203 100644
--- a/asm/link_rfu.s
+++ b/asm/link_rfu.s
@@ -45,8 +45,8 @@ _080FD3E8: .4byte 0x00008001
_080FD3EC: .4byte gUnknown_3005E10
thumb_func_end sub_80FD3A4
- thumb_func_start sub_80FD3F0
-sub_80FD3F0: @ 80FD3F0
+ thumb_func_start rfu_REQ_sendData_wrapper
+rfu_REQ_sendData_wrapper: @ 80FD3F0
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -77,7 +77,7 @@ _080FD420:
bx r0
.align 2, 0
_080FD42C: .4byte gUnknown_3005E10
- thumb_func_end sub_80FD3F0
+ thumb_func_end rfu_REQ_sendData_wrapper
thumb_func_start sub_80FD430
sub_80FD430: @ 80FD430
@@ -870,8 +870,8 @@ _080FDA0C: .4byte gUnknown_3007460
_080FDA10: .4byte gUnknown_3005E10
thumb_func_end sub_80FD850
- thumb_func_start sub_80FDA14
-sub_80FDA14: @ 80FDA14
+ thumb_func_start rfu_syncVBlank_
+rfu_syncVBlank_: @ 80FDA14
push {lr}
bl rfu_syncVBlank
lsls r0, 16
@@ -884,7 +884,7 @@ sub_80FDA14: @ 80FDA14
_080FDA2C:
pop {r0}
bx r0
- thumb_func_end sub_80FDA14
+ thumb_func_end rfu_syncVBlank_
thumb_func_start sub_80FDA30
sub_80FDA30: @ 80FDA30
@@ -1001,7 +1001,7 @@ _080FDB32:
.align 2, 0
_080FDB3C: .4byte gUnknown_3005E10
_080FDB40:
- bl sub_81E0AE4
+ bl rfu_REQ_reset
b _080FDBDA
_080FDB46:
ldr r0, _080FDB58 @ =gUnknown_3005E10
@@ -1028,19 +1028,19 @@ _080FDB74:
bl sub_81E0CAC
b _080FDBDA
_080FDB7A:
- bl sub_81E0D88
+ bl rfu_REQ_pollSearchChild
b _080FDBDA
_080FDB80:
- bl sub_81E0D9C
+ bl rfu_REQ_endSearchChild
b _080FDBDA
_080FDB86:
- bl sub_81E0F74
+ bl rfu_REQ_startSearchParent
b _080FDBDA
_080FDB8C:
- bl sub_81E0FAC
+ bl rfu_REQ_pollSearchParent
b _080FDBDA
_080FDB92:
- bl sub_81E0FE4
+ bl rfu_REQ_endSearchParent
b _080FDBDA
_080FDB98:
ldr r0, _080FDBA4 @ =gUnknown_3005E10
@@ -1050,7 +1050,7 @@ _080FDB98:
.align 2, 0
_080FDBA4: .4byte gUnknown_3005E10
_080FDBA8:
- bl sub_81E1170
+ bl rfu_REQ_pollConnectParent
b _080FDBDA
_080FDBAE:
bl rfu_REQ_endConnectParent
@@ -1064,10 +1064,10 @@ _080FDBB4:
.align 2, 0
_080FDBC0: .4byte gUnknown_3007460
_080FDBC4:
- bl sub_81E1A28
+ bl rfu_REQ_CHILD_pollConnectRecovery
b _080FDBDA
_080FDBCA:
- bl sub_81E1B10
+ bl rfu_REQ_CHILD_endConnectRecovery
b _080FDBDA
_080FDBD0:
bl rfu_REQ_changeMasterSlave
@@ -1392,7 +1392,7 @@ _080FDE64:
ldrb r0, [r0, 0x8]
cmp r0, 0x4
bne _080FDE8A
- bl sub_81E0FE4
+ bl rfu_REQ_endSearchParent
bl rfu_waitREQComplete
movs r0, 0x9
strb r0, [r4, 0x4]
@@ -1468,7 +1468,7 @@ _080FDEFC:
ldr r4, _080FDF3C @ =gUnknown_3005E20
mov r0, sp
adds r1, r4, 0
- bl sub_81E12A4
+ bl rfu_getConnectParentStatus
lsls r0, 16
cmp r0, 0
bne _080FDF20
@@ -1508,7 +1508,7 @@ _080FDF4A:
ldr r4, _080FDF7C @ =gUnknown_3005E20
mov r0, sp
adds r1, r4, 0
- bl sub_81E12A4
+ bl rfu_getConnectParentStatus
lsls r0, 16
cmp r0, 0
beq _080FDF5C
@@ -1605,7 +1605,7 @@ _080FE000:
cmp r6, 0
bne _080FE01E
mov r0, sp
- bl sub_81E1AE0
+ bl rfu_CHILD_getConnectRecoveryStatus
lsls r0, 16
cmp r0, 0
bne _080FE01E
@@ -1646,7 +1646,7 @@ _080FE048:
b _080FE16E
_080FE04E:
mov r0, sp
- bl sub_81E1AE0
+ bl rfu_CHILD_getConnectRecoveryStatus
lsls r0, 16
cmp r0, 0
beq _080FE05C
@@ -1803,7 +1803,7 @@ _080FE17C:
cmp r3, 0x27
bne _080FE1CA
_080FE194:
- bl sub_81E090C
+ bl rfu_REQ_RFUStatus
bl rfu_waitREQComplete
mov r0, sp
bl rfu_getRFUStatus
@@ -3182,10 +3182,10 @@ sub_80FEBAC: @ 80FEBAC
mov r8, r2
lsls r5, 24
lsrs r5, 24
- bl sub_80773BC
+ bl ResetTasks
ldr r0, _080FEC00 @ =sub_80FEC54
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3198,13 +3198,13 @@ sub_80FEBAC: @ 80FEBAC
adds r0, r4, 0
movs r1, 0x2
adds r2, r6, 0
- bl sub_80776E8
+ bl SetWordTaskArg
adds r0, r4, 0
movs r1, 0x4
mov r2, r8
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _080FEC08 @ =sub_80FEC0C
- bl sub_8000544
+ bl SetMainCallback2
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -3219,10 +3219,10 @@ _080FEC08: .4byte sub_80FEC0C
thumb_func_start sub_80FEC0C
sub_80FEC0C: @ 80FEC0C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80FEC0C
@@ -3230,9 +3230,9 @@ sub_80FEC0C: @ 80FEC0C
thumb_func_start sub_80FEC24
sub_80FEC24: @ 80FEC24
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_80FEC24
@@ -3318,19 +3318,19 @@ _080FECB8:
b _080FED6E
_080FECC2:
ldr r0, _080FECE8 @ =sub_80FEC24
- bl sub_80006F4
+ bl SetVBlankCallback
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _080FED20
.align 2, 0
_080FECE8: .4byte sub_80FEC24
@@ -3347,7 +3347,7 @@ _080FECEC:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x3
strh r0, [r6]
b _080FED6E
@@ -3394,7 +3394,7 @@ _080FED50:
_080FED62:
adds r0, r4, 0
movs r1, 0x4
- bl sub_8077720
+ bl GetWordTaskArg
bl sub_80FEE24
_080FED6E:
add sp, 0x4
@@ -3437,10 +3437,10 @@ _080FEDAC:
.4byte _080FEE06
_080FEDC0:
movs r0, 0
- bl sub_80006F4
- bl sub_8006B10
- bl sub_80088F0
- bl sub_8070528
+ bl SetVBlankCallback
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFade
b _080FEE16
_080FEDD4:
bl sub_80BDE44
@@ -3449,7 +3449,7 @@ _080FEDDA:
ldrb r4, [r6, 0x2]
adds r0, r5, 0
movs r1, 0x2
- bl sub_8077720
+ bl GetWordTaskArg
adds r1, r0, 0
adds r0, r4, 0
bl sub_80FEF6C
@@ -3462,7 +3462,7 @@ _080FEDF2:
bne _080FEE16
adds r0, r5, 0
movs r1, 0x4
- bl sub_8077720
+ bl GetWordTaskArg
bl sub_80FEE24
b _080FEE16
_080FEE06:
@@ -3495,7 +3495,7 @@ sub_80FEE24: @ 80FEE24
bl sub_810011C
bl sub_8003ECC
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -3644,7 +3644,7 @@ sub_80FEF6C: @ 80FEF6C
lsrs r5, r0, 24
ldr r4, _080FEF88 @ =gUnknown_203ACE8
movs r0, 0x2C
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
bne _080FEF8C
@@ -3727,7 +3727,7 @@ sub_80FF010: @ 80FF010
ldr r0, [r0]
cmp r0, 0
beq _080FF01E
- bl sub_8002BC4
+ bl Free
_080FF01E:
pop {r0}
bx r0
@@ -6047,13 +6047,13 @@ _080FFFD4:
lsls r0, 4
adds r1, r0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0xC0
lsls r0, 2
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _08100030 @ =gUnknown_843F8B0
bl sub_8003B24
bl sub_8002C28
@@ -6084,11 +6084,11 @@ _08100038:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
bl sub_8100F44
bl sub_8102428
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08100104
.align 2, 0
_08100064: .4byte gUnknown_8E99DAC
@@ -6108,7 +6108,7 @@ _0810006C:
movs r3, 0
bl sub_80F696C
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08100104
.align 2, 0
_08100094: .4byte gUnknown_203ACEC
@@ -6124,7 +6124,7 @@ _081000AE:
bl sub_8101AC4
b _08100104
_081000B8:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0810010E
@@ -6135,18 +6135,18 @@ _081000B8:
bl sub_8101A5C
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3B
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
bl sub_81021D4
bl sub_8102320
b _08100104
@@ -6177,7 +6177,7 @@ sub_810011C: @ 810011C
ldr r0, [r0]
cmp r0, 0
beq _0810012A
- bl sub_8002BC4
+ bl Free
_0810012A:
pop {r0}
bx r0
@@ -6338,7 +6338,7 @@ _08100270:
strh r0, [r1]
b _08100288
_0810027E:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0810028A
@@ -6519,7 +6519,7 @@ _081003C0:
strh r0, [r1]
b _081003E4
_081003DA:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _081003E6
@@ -6556,7 +6556,7 @@ _08100404:
strh r0, [r1]
b _08100428
_0810041E:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0810042A
@@ -6593,7 +6593,7 @@ _08100448:
strh r0, [r1]
b _0810046C
_08100462:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0810046E
@@ -6623,14 +6623,14 @@ _0810048C:
movs r0, 0
bl sub_8100E7C
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r1, [r4]
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
b _081004B0
_081004A6:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _081004B2
@@ -6666,7 +6666,7 @@ _081004D0:
adds r0, 0x1
strh r0, [r1]
_081004E6:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
_081004EE:
@@ -6701,7 +6701,7 @@ _08100514:
_08100528:
bl sub_8101B88
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0
movs r1, 0
movs r2, 0
@@ -6710,7 +6710,7 @@ _08100528:
bl sub_810131C
b _0810057A
_08100544:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081005B8
@@ -6718,7 +6718,7 @@ _08100544:
bl sub_81015D4
b _0810057A
_08100556:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081005B8
@@ -6728,7 +6728,7 @@ _08100556:
bne _081005B8
b _0810057A
_0810056C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081005B8
@@ -6818,13 +6818,13 @@ _0810061E:
.align 2, 0
_0810062C: .4byte gUnknown_203ACEC
_08100630:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100658
bl sub_8101BA8
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
_08100644:
ldr r0, _08100650 @ =gUnknown_203ACEC
ldr r1, [r0]
@@ -6886,7 +6886,7 @@ _081006A8:
bl sub_810131C
b _081006D6
_081006C2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100718
@@ -7066,7 +7066,7 @@ _08100816:
bl sub_81015BC
b _08100848
_08100826:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100888
@@ -7090,7 +7090,7 @@ _08100848:
.align 2, 0
_08100854: .4byte gUnknown_203ACEC
_08100858:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100888
@@ -7150,7 +7150,7 @@ _081008CE:
bl sub_81015BC
b _08100902
_081008E0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100934
@@ -7163,7 +7163,7 @@ _081008F2:
cmp r0, 0
bne _08100934
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
_08100902:
ldr r0, _08100910 @ =gUnknown_203ACEC
ldr r1, [r0]
@@ -7174,7 +7174,7 @@ _08100902:
.align 2, 0
_08100910: .4byte gUnknown_203ACEC
_08100914:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100934
@@ -7226,7 +7226,7 @@ _08100970:
bl sub_81015BC
b _081009B2
_08100982:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081009F0
@@ -7241,7 +7241,7 @@ _08100994:
bl sub_810131C
b _081009B2
_081009A4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081009F0
@@ -7314,7 +7314,7 @@ _08100A2A:
bl sub_81013EC
b _08100A42
_08100A30:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100A6E
@@ -7375,7 +7375,7 @@ _08100A9E:
bl sub_8101410
b _08100AB8
_08100AA4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100AE0
@@ -7436,7 +7436,7 @@ _08100B0E:
bl sub_8101434
b _08100B3A
_08100B14:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100B66
@@ -7505,7 +7505,7 @@ _08100B96:
bl sub_8101478
b _08100BC2
_08100B9C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08100BEA
@@ -7554,7 +7554,7 @@ sub_8100BF4: @ 8100BF4
ldr r4, _08100C50 @ =gUnknown_203ACEC
movs r0, 0x98
lsls r0, 5
- bl sub_8002B9C
+ bl Alloc
adds r2, r0, 0
str r2, [r4]
cmp r2, 0
@@ -7610,39 +7610,39 @@ sub_8100C5C: @ 8100C5C
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r1, 0xC1
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_8100C5C
@@ -7650,36 +7650,36 @@ sub_8100C5C: @ 8100C5C
thumb_func_start sub_8100CBC
sub_8100CBC: @ 8100CBC
push {r4,lr}
- bl sub_8070528
+ bl ResetPaletteFade
ldr r0, _08100D10 @ =gUnknown_8E99D8C
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08100D14 @ =gUnknown_843F76C
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08100D18 @ =gUnknown_843F78C
movs r1, 0x40
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08100D1C @ =gUnknown_843F874
movs r1, 0xA0
movs r2, 0x8
- bl sub_80703EC
+ bl LoadPalette
ldr r4, _08100D20 @ =gUnknown_843F87C
adds r0, r4, 0
movs r1, 0xB0
movs r2, 0xA
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0xA
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x30
movs r2, 0xA
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -7708,7 +7708,7 @@ sub_8100D24: @ 8100D24
lsrs r4, 1
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
lsls r4, 24
lsrs r4, 24
movs r1, 0
@@ -7726,7 +7726,7 @@ sub_8100D24: @ 8100D24
adds r3, r4, 0
bl sub_8100DC4
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -7847,7 +7847,7 @@ sub_8100E34: @ 8100E34
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1
movs r1, 0x1
movs r2, 0xE0
@@ -7859,9 +7859,9 @@ sub_8100E34: @ 8100E34
movs r0, 0
bl sub_8100E7C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
@@ -7912,7 +7912,7 @@ _08100EC2:
_08100ECA:
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, [sp, 0xC]
cmp r2, 0
beq _08100EEC
@@ -8027,7 +8027,7 @@ sub_8100F44: @ 8100F44
strh r0, [r1, 0x2]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -8068,7 +8068,7 @@ sub_8100FDC: @ 8100FDC
ldr r0, [r0]
ldrb r0, [r0, 0x2]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r6, 0
b _081010D6
.align 2, 0
@@ -8082,7 +8082,7 @@ _08101020:
strb r0, [r1, 0xA]
adds r0, r2, 0
ldr r1, _08101060 @ =gUnknown_843F8DB
- bl sub_8008DA4
+ bl StringAppend
adds r2, r0, 0
movs r5, 0
lsls r7, r6, 28
@@ -8110,7 +8110,7 @@ _08101068:
adds r0, r2, 0
movs r1, 0
movs r2, 0x4
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r2, r0, 0
adds r4, 0x2
movs r3, 0xF9
@@ -8127,12 +8127,12 @@ _0810107C:
adds r0, r2, 0
movs r1, 0
movs r2, 0x2
- bl sub_80092F4
+ bl WriteColorChangeControlCode
adds r2, r0, 0
_08101096:
adds r0, r2, 0
ldr r1, _081010F8 @ =gUnknown_843F8DB
- bl sub_8008DA4
+ bl StringAppend
adds r2, r0, 0
ldr r0, [sp, 0x10]
cmp r0, 0x2
@@ -8421,9 +8421,9 @@ _081012C8: .4byte 0x0000100b
sub_81012CC: @ 81012CC
push {lr}
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r0}
bx r0
thumb_func_end sub_81012CC
@@ -8435,7 +8435,7 @@ sub_81012E0: @ 81012E0
bl sub_810198C
movs r0, 0x2
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r4, 0x1
beq _08101304
cmp r4, 0x1
@@ -8718,7 +8718,7 @@ _081014E6:
ldr r0, [r2]
adds r0, 0xCB
movs r2, 0
- bl sub_80BDFC0
+ bl CopyEasyChatWordPadded
mov r0, r9
ldr r2, [r0]
adds r2, 0xCB
@@ -8795,7 +8795,7 @@ _08101586:
movs r0, 0x2
movs r1, 0x11
movs r2, 0
- bl sub_8004378
+ bl FillWindowPixelRect
cmp r4, 0
beq _081015B2
str r5, [sp]
@@ -8806,7 +8806,7 @@ _08101586:
movs r1, 0x11
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
_081015B2:
add sp, 0x8
pop {r4,r5}
@@ -8819,7 +8819,7 @@ sub_81015BC: @ 81015BC
push {lr}
movs r0, 0x2
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x2
bl sub_8003F20
@@ -8984,7 +8984,7 @@ sub_81016E4: @ 81016E4
movs r1, 0
movs r2, 0
movs r3, 0xA
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
cmp r4, 0x16
bls _08101706
b _08101822
@@ -9126,7 +9126,7 @@ _08101816:
bl sub_8101830
_08101822:
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r4}
pop {r0}
@@ -9316,7 +9316,7 @@ sub_810198C: @ 810198C
lsls r1, 4
movs r0, 0x2
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _081019AC @ =gUnknown_203ACEC
ldr r0, [r0]
movs r1, 0xB3
@@ -9339,7 +9339,7 @@ sub_81019B0: @ 81019B0
lsls r1, 24
lsrs r5, r1, 24
movs r0, 0x2
- bl sub_8001E44
+ bl GetBgY
adds r2, r0, 0
ldr r0, _081019FC @ =gUnknown_203ACEC
ldr r3, [r0]
@@ -9375,7 +9375,7 @@ _08101A00:
movs r0, 0x2
adds r1, r2, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
_08101A0A:
pop {r4,r5}
pop {r0}
@@ -9386,7 +9386,7 @@ _08101A0A:
sub_8101A10: @ 8101A10
push {lr}
movs r0, 0x2
- bl sub_8001E44
+ bl GetBgY
ldr r1, _08101A3C @ =gUnknown_203ACEC
ldr r2, [r1]
movs r3, 0xB4
@@ -9401,7 +9401,7 @@ sub_8101A10: @ 8101A10
ldr r1, [r0]
movs r0, 0x2
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
b _08101A42
.align 2, 0
@@ -9445,10 +9445,10 @@ sub_8101A5C: @ 8101A5C
orrs r5, r1
movs r0, 0x40
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
adds r1, r5, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
@@ -9458,14 +9458,14 @@ sub_8101A5C: @ 8101A5C
sub_8101A90: @ 8101A90
push {r4,r5,lr}
ldr r0, _08101AB8 @ =gUnknown_843F8F0
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _08101ABC @ =gUnknown_843F910
- bl sub_8008974
+ bl LoadSpritePalettes
movs r5, 0
ldr r4, _08101AC0 @ =gUnknown_843F938
_08101AA2:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x3
@@ -9499,7 +9499,7 @@ sub_8101AC4: @ 8101AC4
adds r1, r3
asrs r1, 16
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _08101B18 @ =gUnknown_203ACEC
@@ -9628,7 +9628,7 @@ sub_8101BC0: @ 8101BC0
movs r1, 0
movs r2, 0
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, _08101C3C @ =gUnknown_203ACEC
@@ -9649,7 +9649,7 @@ sub_8101BC0: @ 8101BC0
movs r1, 0
movs r2, 0
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -9692,7 +9692,7 @@ sub_8101C48: @ 8101C48
lsls r4, 2
adds r0, r4
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r5]
adds r4, r0, r4
movs r6, 0
@@ -9701,7 +9701,7 @@ sub_8101C48: @ 8101C48
lsls r4, 2
adds r0, r4
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r5]
adds r0, r4
str r6, [r0]
@@ -9784,7 +9784,7 @@ sub_8101CE4: @ 8101CE4
adds r0, r4
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r2, r8
ldr r1, [r2]
adds r4, r1, r4
@@ -9803,7 +9803,7 @@ sub_8101CE4: @ 8101CE4
adds r1, r6
ldr r0, [r1]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r1, r8
ldr r0, [r1]
adds r0, r6
@@ -9820,7 +9820,7 @@ _08101D48:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@@ -9838,7 +9838,7 @@ _08101D48:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@@ -9904,7 +9904,7 @@ _08101DE4:
adds r0, r4
ldr r0, [r0]
adds r1, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r5]
adds r4, r1, r4
ldr r0, [r4]
@@ -9917,7 +9917,7 @@ _08101DE4:
adds r1, r4
ldr r0, [r1]
adds r1, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r5]
adds r0, r4
ldr r1, [r0]
@@ -9937,7 +9937,7 @@ _08101E2C:
adds r0, r4
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r6]
adds r4, r1, r4
ldr r0, [r4]
@@ -9955,7 +9955,7 @@ _08101E2C:
adds r1, r5
ldr r0, [r1]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r6]
adds r0, r5
ldr r1, [r0]
@@ -9980,7 +9980,7 @@ sub_8101E80: @ 8101E80
movs r1, 0
movs r2, 0
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _08101EC8 @ =gUnknown_203ACEC
@@ -10119,7 +10119,7 @@ sub_8101F80: @ 8101F80
ldr r0, [r0]
cmp r0, 0
beq _08101FA2
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r4]
movs r1, 0xB9
lsls r1, 2
@@ -10141,7 +10141,7 @@ sub_8101FAC: @ 8101FAC
movs r1, 0xD0
movs r2, 0x80
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, _08102008 @ =gUnknown_203ACEC
@@ -10162,7 +10162,7 @@ sub_8101FAC: @ 8101FAC
movs r1, 0xD0
movs r2, 0x50
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -10224,7 +10224,7 @@ _08102030:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08102076
_08102066:
ldr r0, [r4]
@@ -10233,7 +10233,7 @@ _08102066:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
_08102076:
ldr r0, _08102084 @ =gUnknown_203ACEC
ldr r1, [r0]
@@ -10279,7 +10279,7 @@ sub_81020AC: @ 81020AC
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -10334,13 +10334,13 @@ _08102102:
lsls r4, 2
adds r0, r3, r4
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r5]
movs r1, 0xBA
lsls r1, 2
adds r0, r1
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r5]
adds r4, r1, r4
str r6, [r4]
@@ -10371,7 +10371,7 @@ sub_810215C: @ 810215C
adds r0, r1
ldr r0, [r0]
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -10392,7 +10392,7 @@ sub_8102178: @ 8102178
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _081021AE
.align 2, 0
_08102198: .4byte gUnknown_203ACEC
@@ -10404,7 +10404,7 @@ _0810219C:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
_081021AE:
pop {r0}
bx r0
@@ -10438,7 +10438,7 @@ sub_81021D4: @ 81021D4
movs r1, 0x60
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -10459,7 +10459,7 @@ _08102202:
movs r1, 0x60
movs r2, 0x9C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -10616,7 +10616,7 @@ sub_8102320: @ 8102320
movs r1, 0xDC
movs r2, 0x54
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -10637,7 +10637,7 @@ _0810234E:
movs r1, 0xDC
movs r2, 0x9C
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -10654,7 +10654,7 @@ _0810234E:
adds r0, r1
str r0, [r2]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_0810237E:
bl sub_81023F8
pop {r4}
@@ -10793,7 +10793,7 @@ sub_8102428: @ 8102428
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _081024BC @ =gUnknown_841EE2B
movs r0, 0
str r0, [sp]
@@ -10804,7 +10804,7 @@ sub_8102428: @ 8102428
movs r3, 0
bl sub_8100D84
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x14
pop {r4}
pop {r0}
diff --git a/asm/link_rfu_2.s b/asm/link_rfu_2.s
index 26c2659d9..b9ab595d1 100644
--- a/asm/link_rfu_2.s
+++ b/asm/link_rfu_2.s
@@ -271,9 +271,9 @@ _080F8818:
strh r1, [r0, 0xA]
ldr r0, _080F8868 @ =sub_80FA834
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080F8852:
pop {r4,r5}
pop {r0}
@@ -512,7 +512,7 @@ _080F8A0C:
movs r1, 0x2
strb r1, [r0]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
b _080F8A8A
.align 2, 0
_080F8A24: .4byte gUnknown_3005450
@@ -547,7 +547,7 @@ _080F8A2C:
movs r1, 0x8
strh r1, [r0, 0xA]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r4, _080F8A9C @ =gUnknown_203AC08
ldrb r0, [r4, 0xF]
cmp r0, 0
@@ -559,7 +559,7 @@ _080F8A2C:
_080F8A82:
ldr r0, _080F8AA0 @ =sub_80FA834
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
_080F8A8A:
pop {r4-r7}
pop {r0}
@@ -756,7 +756,7 @@ _080F8C28:
bne _080F8CE6
strb r0, [r6, 0xC]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080F8C70 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -768,7 +768,7 @@ _080F8C28:
beq _080F8C78
ldr r0, _080F8C74 @ =sub_80FACF0
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
b _080F8CE6
.align 2, 0
_080F8C6C: .4byte 0x000008f6
@@ -777,7 +777,7 @@ _080F8C74: .4byte sub_80FACF0
_080F8C78:
ldr r0, _080F8C84 @ =sub_80FA834
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
b _080F8CE6
.align 2, 0
_080F8C84: .4byte sub_80FA834
@@ -815,13 +815,13 @@ _080F8C9C:
strb r4, [r6, 0xC]
ldr r0, _080F8CF8 @ =sub_80FA834
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
movs r1, 0x9A
lsls r1, 4
adds r0, r6, r1
strb r4, [r0]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080F8CE6:
pop {r4-r6}
pop {r0}
@@ -905,7 +905,7 @@ _080F8D2A:
bl rfu_UNI_clearRecvNewDataFlag
_080F8D84:
movs r0, 0x1
- bl sub_80FD3F0
+ bl rfu_REQ_sendData_wrapper
pop {r4}
pop {r0}
bx r0
@@ -958,7 +958,7 @@ _080F8DEC:
bne _080F8E14
ldr r0, _080F8E10 @ =sub_80F893C
_080F8DF2:
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -966,7 +966,7 @@ _080F8DF2:
adds r0, r4, 0
adds r0, 0x67
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
bl sub_80F85F8
b _080F8E34
.align 2, 0
@@ -975,7 +975,7 @@ _080F8E14:
cmp r0, 0x2
bne _080F8E34
ldr r0, _080F8E6C @ =sub_80F8B34
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -983,7 +983,7 @@ _080F8E14:
adds r0, r4, 0
adds r0, 0x67
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
bl sub_80F85F8
_080F8E34:
movs r5, 0
@@ -993,16 +993,16 @@ _080F8E38:
adds r0, r6
ldr r4, [r0]
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080F8E5A
adds r0, r4, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080F8E5A:
adds r0, r5, 0x1
lsls r0, 24
@@ -1030,7 +1030,7 @@ sub_80F8E74: @ 80F8E74
bls _080F8E92
ldr r0, _080F8E9C @ =sub_80F8738
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r1, _080F8EA0 @ =gUnknown_3005450
adds r1, 0x67
strb r0, [r1]
@@ -1115,7 +1115,7 @@ sub_80F8F10: @ 80F8F10
bls _080F8F2E
ldr r0, _080F8F38 @ =sub_80F893C
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r1, _080F8F3C @ =gUnknown_3005450
adds r1, 0x67
strb r0, [r1]
@@ -1410,7 +1410,7 @@ sub_80F911C: @ 80F911C
bl rfu_REQ_recvData
bl rfu_waitREQComplete
movs r0, 0
- bl sub_80FD3F0
+ bl rfu_REQ_sendData_wrapper
b _080F91F6
.align 2, 0
_080F9138: .4byte gUnknown_3005450
@@ -1484,7 +1484,7 @@ _080F91CC:
ldrb r0, [r0]
bl rfu_UNI_readySendData
movs r0, 0x1
- bl sub_80FD3F0
+ bl rfu_REQ_sendData_wrapper
b _080F91F0
.align 2, 0
_080F91E4: .4byte gUnknown_3005450
@@ -1785,7 +1785,7 @@ _080F93FA:
strb r0, [r1]
ldr r0, _080F9464 @ =sub_80FAA94
movs r1, 0
- bl sub_807741C
+ bl CreateTask
b _080F9476
.align 2, 0
_080F9444: .4byte gUnknown_3005450
@@ -2237,8 +2237,8 @@ _080F97B0: .4byte 0x00000996
_080F97B4: .4byte 0x000008f6
thumb_func_end sub_80F9770
- thumb_func_start sub_80F97B8
-sub_80F97B8: @ 80F97B8
+ thumb_func_start rfu_func_080F97B8
+rfu_func_080F97B8: @ 80F97B8
push {lr}
ldr r0, _080F97F0 @ =gUnknown_3003F64
ldrb r0, [r0]
@@ -2271,7 +2271,7 @@ _080F97F0: .4byte gUnknown_3003F64
_080F97F4: .4byte gUnknown_3005028
_080F97F8: .4byte gUnknown_30030E4
_080F97FC: .4byte gUnknown_3001188
- thumb_func_end sub_80F97B8
+ thumb_func_end rfu_func_080F97B8
thumb_func_start sub_80F9800
sub_80F9800: @ 80F9800
@@ -2287,7 +2287,7 @@ sub_80F9808: @ 80F9808
movs r2, 0
ldr r0, _080F9820 @ =gUnknown_3005450
ldr r1, [r0]
- ldr r0, _080F9824 @ =sub_80F97B8
+ ldr r0, _080F9824 @ =rfu_func_080F97B8
cmp r1, r0
bne _080F9818
movs r2, 0x1
@@ -2297,7 +2297,7 @@ _080F9818:
bx r1
.align 2, 0
_080F9820: .4byte gUnknown_3005450
-_080F9824: .4byte sub_80F97B8
+_080F9824: .4byte rfu_func_080F97B8
thumb_func_end sub_80F9808
thumb_func_start sub_80F9828
@@ -2313,7 +2313,7 @@ sub_80F9828: @ 80F9828
movs r3, 0x1
bl AGBAssert
_080F983E:
- ldr r0, _080F9858 @ =sub_80F97B8
+ ldr r0, _080F9858 @ =rfu_func_080F97B8
str r0, [r4]
pop {r4}
pop {r0}
@@ -2323,7 +2323,7 @@ _080F9848: .4byte gUnknown_3005450
_080F984C: .4byte gUnknown_843ED94
_080F9850: .4byte 0x000005c1
_080F9854: .4byte gUnknown_843EDC4
-_080F9858: .4byte sub_80F97B8
+_080F9858: .4byte rfu_func_080F97B8
thumb_func_end sub_80F9828
thumb_func_start sub_80F985C
@@ -3179,7 +3179,7 @@ _080F9EC0:
negs r4, r0
orrs r4, r0
lsrs r4, 31
- bl sub_800A404
+ bl GetMultiplayerId
adds r1, r5, 0
adds r1, 0x7D
strb r0, [r1]
@@ -3218,7 +3218,7 @@ _080F9F14:
lsls r0, 8
bl sub_80F9D04
ldr r0, _080F9F3C @ =gUnknown_3005450
- ldr r1, _080F9F40 @ =sub_80F9F44
+ ldr r1, _080F9F40 @ =rfufunc_80F9F44
str r1, [r0]
adds r0, 0x5B
movs r1, 0
@@ -3234,11 +3234,11 @@ _080F9F2A:
.align 2, 0
_080F9F38: .4byte gUnknown_2022618
_080F9F3C: .4byte gUnknown_3005450
-_080F9F40: .4byte sub_80F9F44
+_080F9F40: .4byte rfufunc_80F9F44
thumb_func_end sub_80F9E60
- thumb_func_start sub_80F9F44
-sub_80F9F44: @ 80F9F44
+ thumb_func_start rfufunc_80F9F44
+rfufunc_80F9F44: @ 80F9F44
push {r4,r5,lr}
ldr r0, _080F9F74 @ =gUnknown_3003F50
ldrh r0, [r0]
@@ -3266,7 +3266,7 @@ sub_80F9F44: @ 80F9F44
_080F9F74: .4byte gUnknown_3003F50
_080F9F78: .4byte gUnknown_3005450
_080F9F7C:
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _080F9FA0 @ =gUnknown_3003ED0
lsls r0, 24
lsrs r0, 20
@@ -3287,7 +3287,7 @@ _080F9F98:
.align 2, 0
_080F9FA0: .4byte gUnknown_3003ED0
_080F9FA4: .4byte sub_80F9FA8
- thumb_func_end sub_80F9F44
+ thumb_func_end rfufunc_80F9F44
thumb_func_start sub_80F9FA8
sub_80F9FA8: @ 80F9FA8
@@ -3339,7 +3339,7 @@ _080F9FC8:
adds r0, 0x7C
movs r1, 0
strb r1, [r0]
- ldr r0, _080FA01C @ =sub_80FA020
+ ldr r0, _080FA01C @ =rfufunc_80FA020
mov r1, r12
str r0, [r1]
_080FA00C:
@@ -3349,11 +3349,11 @@ _080FA00C:
.align 2, 0
_080FA014: .4byte gUnknown_3005450
_080FA018: .4byte gUnknown_3003F50
-_080FA01C: .4byte sub_80FA020
+_080FA01C: .4byte rfufunc_80FA020
thumb_func_end sub_80F9FA8
- thumb_func_start sub_80FA020
-sub_80FA020: @ 80FA020
+ thumb_func_start rfufunc_80FA020
+rfufunc_80FA020: @ 80FA020
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -3361,7 +3361,7 @@ sub_80FA020: @ 80FA020
ldr r5, _080FA0C8 @ =gUnknown_3005450
ldr r0, [r5, 0x70]
mov r8, r0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r6, r0, 24
ldrb r0, [r5, 0xC]
@@ -3459,7 +3459,7 @@ _080FA0EC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80FA020
+ thumb_func_end rfufunc_80FA020
thumb_func_start sub_80FA0F8
sub_80FA0F8: @ 80FA0F8
@@ -3666,7 +3666,7 @@ sub_80FA25C: @ 80FA25C
ldr r0, _080FA288 @ =sub_80FA224
str r0, [r2]
adds r0, r3, 0
- bl sub_8077508
+ bl DestroyTask
_080FA27C:
pop {r0}
bx r0
@@ -3676,30 +3676,30 @@ _080FA284: .4byte 0x00000991
_080FA288: .4byte sub_80FA224
thumb_func_end sub_80FA25C
- thumb_func_start sub_80FA28C
-sub_80FA28C: @ 80FA28C
+ thumb_func_start task_add_05_task_del_08FA224_when_no_RfuFunc
+task_add_05_task_del_08FA224_when_no_RfuFunc: @ 80FA28C
push {r4,lr}
ldr r4, _080FA2AC @ =sub_80FA25C
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080FA2A4
adds r0, r4, 0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
_080FA2A4:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080FA2AC: .4byte sub_80FA25C
- thumb_func_end sub_80FA28C
+ thumb_func_end task_add_05_task_del_08FA224_when_no_RfuFunc
thumb_func_start sub_80FA2B0
sub_80FA2B0: @ 80FA2B0
push {r4,r5,lr}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _080FA2DE
@@ -3812,7 +3812,7 @@ _080FA384: .4byte sub_80FA2B0
thumb_func_start sub_80FA388
sub_80FA388: @ 80FA388
push {r4,lr}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
beq _080FA3C4
@@ -3982,8 +3982,8 @@ _080FA4C0: .4byte gUnknown_3005450
_080FA4C4: .4byte 0x00000991
thumb_func_end sub_80FA4A8
- thumb_func_start sub_80FA4C8
-sub_80FA4C8: @ 80FA4C8
+ thumb_func_start rfu_get_multiplayer_id
+rfu_get_multiplayer_id: @ 80FA4C8
push {lr}
ldr r1, _080FA4DC @ =gUnknown_3005450
ldrb r0, [r1, 0xC]
@@ -4001,7 +4001,7 @@ _080FA4E4:
_080FA4E6:
pop {r1}
bx r1
- thumb_func_end sub_80FA4C8
+ thumb_func_end rfu_get_multiplayer_id
thumb_func_start sub_80FA4EC
sub_80FA4EC: @ 80FA4EC
@@ -4467,7 +4467,7 @@ sub_80FA834: @ 80FA834
movs r0, 0
strb r0, [r1]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080FA85C:
ldr r2, _080FA888 @ =gUnknown_3005090
lsls r1, r6, 2
@@ -4508,7 +4508,7 @@ _080FA89E:
bne _080FA8AA
b _080FA9BC
_080FA8AA:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
bl sub_800B0B4
b _080FA930
_080FA8B4:
@@ -4608,7 +4608,7 @@ _080FA956:
_080FA968: .4byte gUnknown_3005090
_080FA96C:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _080FA9C4 @ =gUnknown_3003F64
movs r0, 0x1
strb r0, [r1]
@@ -4753,7 +4753,7 @@ sub_80FAA58: @ 80FAA58
adds r1, r4, 0
bl CpuSet
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_080FAA84:
add sp, 0x4
pop {r4,r5}
@@ -4795,7 +4795,7 @@ sub_80FAA94: @ 80FAA94
movs r0, 0
strb r0, [r1]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080FAAD2:
ldr r0, _080FAB04 @ =gUnknown_3005090
lsls r2, r6, 2
@@ -4838,7 +4838,7 @@ _080FAB24:
b _080FACD6
_080FAB2E:
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
movs r0, 0xF0
lsls r0, 7
bl sub_80F9D04
@@ -4859,7 +4859,7 @@ _080FAB4E:
.align 2, 0
_080FAB58: .4byte gUnknown_3003F50
_080FAB5C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
asrs r0, r4
@@ -4870,7 +4870,7 @@ _080FAB5C:
b _080FACD6
_080FAB70:
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
lsls r2, r4, 8
ldr r0, _080FAB9C @ =gUnknown_2022118
adds r2, r0
@@ -4958,7 +4958,7 @@ _080FAC04:
ldr r1, _080FAC40 @ =gUnknown_2022618
movs r0, 0
movs r2, 0xA0
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _080FACD6
@@ -5000,7 +5000,7 @@ _080FAC78:
lsls r0, 24
cmp r0, 0
beq _080FACD6
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -5012,7 +5012,7 @@ _080FAC78:
ldr r2, _080FACE4 @ =0x0100007e
bl CpuSet
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, _080FACE8 @ =gUnknown_3005450
movs r5, 0x9A
lsls r5, 4
@@ -5039,7 +5039,7 @@ _080FACC0:
ble _080FACC0
_080FACD0:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080FACD6:
add sp, 0x4
pop {r4-r7}
@@ -5067,7 +5067,7 @@ sub_80FACF0: @ 80FACF0
cmp r0, 0x1
bhi _080FAD0E
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080FAD0E:
ldr r1, _080FAD30 @ =gUnknown_3005090
lsls r0, r5, 2
@@ -5098,7 +5098,7 @@ _080FAD3A:
ldr r1, _080FAD50 @ =gUnknown_2022618
movs r0, 0
movs r2, 0x3C
- bl sub_800A448
+ bl SendBlock
b _080FAD5E
.align 2, 0
_080FAD50: .4byte gUnknown_2022618
@@ -5113,7 +5113,7 @@ _080FAD5E:
strh r0, [r4, 0x8]
b _080FAD8A
_080FAD66:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r4, 0x1
adds r1, r4, 0
ands r1, r0
@@ -5122,11 +5122,11 @@ _080FAD66:
ldr r0, _080FAD90 @ =gUnknown_2022118
bl sub_80FA9FC
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r0, _080FAD94 @ =gUnknown_3003F64
strb r4, [r0]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080FAD8A:
pop {r4-r6}
pop {r0}
@@ -5159,9 +5159,9 @@ sub_80FAD98: @ 80FAD98
movs r0, 0x2
strb r0, [r1]
_080FADC0:
- ldr r4, _080FAE24 @ =sub_800ACD4
+ ldr r4, _080FAE24 @ =c2_800ACD4
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
str r4, [r6, 0x8]
ldrh r0, [r5, 0xA]
lsls r4, r0, 16
@@ -5201,7 +5201,7 @@ _080FAE14: .4byte gUnknown_3005E10
_080FAE18: .4byte gUnknown_30030F0
_080FAE1C: .4byte sub_814208C
_080FAE20: .4byte gUnknown_3003F3C
-_080FAE24: .4byte sub_800ACD4
+_080FAE24: .4byte c2_800ACD4
_080FAE28: .4byte 0x0000069e
_080FAE2C: .4byte 0x000008d2
_080FAE30:
@@ -5239,8 +5239,8 @@ _080FAE6C: .4byte 0x0000069f
_080FAE70: .4byte gUnknown_3005E10
thumb_func_end sub_80FAD98
- thumb_func_start sub_80FAE74
-sub_80FAE74: @ 80FAE74
+ thumb_func_start rfu_REQ_recvData_then_sendData
+rfu_REQ_recvData_then_sendData: @ 80FAE74
push {lr}
ldr r0, _080FAE90 @ =gUnknown_3005E10
ldrb r0, [r0, 0x6]
@@ -5249,13 +5249,13 @@ sub_80FAE74: @ 80FAE74
bl rfu_REQ_recvData
bl rfu_waitREQComplete
movs r0, 0
- bl sub_80FD3F0
+ bl rfu_REQ_sendData_wrapper
_080FAE8C:
pop {r0}
bx r0
.align 2, 0
_080FAE90: .4byte gUnknown_3005E10
- thumb_func_end sub_80FAE74
+ thumb_func_end rfu_REQ_recvData_then_sendData
thumb_func_start sub_80FAE94
sub_80FAE94: @ 80FAE94
@@ -5265,7 +5265,7 @@ sub_80FAE94: @ 80FAE94
ldr r1, _080FAECC @ =0x00000985
adds r0, r4, r1
strb r5, [r0]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
bl sub_80FDA30
@@ -5297,7 +5297,7 @@ _080FAEDC:
adds r5, r0, 0
b _080FAEE8
_080FAEE4:
- bl sub_80FAE74
+ bl rfu_REQ_recvData_then_sendData
_080FAEE8:
adds r0, r5, 0
pop {r4,r5}
@@ -5337,7 +5337,7 @@ sub_80FAF1C: @ 80FAF1C
ldr r0, _080FAF2C @ =gUnknown_3005E00
ldr r1, _080FAF30 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
pop {r0}
bx r0
.align 2, 0
@@ -6542,7 +6542,7 @@ _080FB804:
strb r0, [r1]
ldr r0, _080FB82C @ =sub_80FC028
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
b _080FB9C2
.align 2, 0
_080FB824: .4byte gUnknown_3005450
@@ -6684,7 +6684,7 @@ _080FB934:
cmp r0, 0
bne _080FB95A
ldr r0, _080FB974 @ =sub_80F8B34
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6821,13 +6821,13 @@ sub_80FBA2C: @ 80FBA2C
_080FBA34: .4byte gUnknown_3005450
thumb_func_end sub_80FBA2C
- thumb_func_start sub_80FBA38
-sub_80FBA38: @ 80FBA38
+ thumb_func_start LinkVSync
+LinkVSync: @ 80FBA38
push {lr}
- bl sub_80FDA14
+ bl rfu_syncVBlank_
pop {r0}
bx r0
- thumb_func_end sub_80FBA38
+ thumb_func_end LinkVSync
thumb_func_start sub_80FBA44
sub_80FBA44: @ 80FBA44
@@ -6850,9 +6850,9 @@ _080FBA60: .4byte 0x05000014
thumb_func_start sub_80FBA64
sub_80FBA64: @ 80FBA64
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80FBA64
@@ -6860,12 +6860,12 @@ sub_80FBA64: @ 80FBA64
thumb_func_start sub_80FBA78
sub_80FBA78: @ 80FBA78
push {r4,lr}
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8070528
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl ResetPaletteFade
ldr r0, _080FBAF4 @ =sub_80FBA64
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_8009480
lsls r0, 24
cmp r0, 0
@@ -6881,7 +6881,7 @@ sub_80FBA78: @ 80FBA78
bl sub_8044EE8
movs r4, 0
_080FBAB4:
- bl sub_8044EC8
+ bl Random
ldr r1, _080FBB04 @ =gUnknown_300500C
ldr r1, [r1]
adds r1, 0xA
@@ -6893,14 +6893,14 @@ _080FBAB4:
movs r1, 0xAA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl SetGpuReg
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
bl sub_80FBB20
ldr r0, _080FBB08 @ =sub_80FBB74
- bl sub_8000544
+ bl SetMainCallback2
_080FBAEC:
pop {r4}
pop {r0}
@@ -6918,7 +6918,7 @@ _080FBB08: .4byte sub_80FBB74
sub_80FBB0C: @ 80FBB0C
push {lr}
ldr r0, _080FBB1C @ =sub_80F8B34
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -6932,13 +6932,13 @@ sub_80FBB20: @ 80FBB20
push {r4,lr}
ldr r4, _080FBB44 @ =nullsub_89
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080FBB3E
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, _080FBB48 @ =gUnknown_3005450
adds r1, 0x66
strb r0, [r1]
@@ -6955,7 +6955,7 @@ _080FBB48: .4byte gUnknown_3005450
sub_80FBB4C: @ 80FBB4C
push {lr}
ldr r0, _080FBB6C @ =nullsub_89
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6963,7 +6963,7 @@ sub_80FBB4C: @ 80FBB4C
ldr r0, _080FBB70 @ =gUnknown_3005450
adds r0, 0x66
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
_080FBB66:
pop {r0}
bx r0
@@ -6975,10 +6975,10 @@ _080FBB70: .4byte gUnknown_3005450
thumb_func_start sub_80FBB74
sub_80FBB74: @ 80FBB74
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80FBB74
@@ -7068,7 +7068,7 @@ sub_80FBC00: @ 80FBC00
strh r0, [r2, 0x12]
ldr r0, _080FBC60 @ =sub_80F8B34
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
adds r4, 0x67
strb r0, [r4]
_080FBC46:
@@ -7133,7 +7133,7 @@ _080FBC8E:
adds r1, r5
adds r1, 0x15
ldr r0, [sp]
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _080FBCD8
cmp r10, r6
@@ -7303,7 +7303,7 @@ sub_80FBDB8: @ 80FBDB8
ldrb r0, [r5, 0xD]
strh r0, [r6, 0x6]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080FBE08:
pop {r4-r6}
pop {r0}
@@ -7322,14 +7322,14 @@ sub_80FBE20: @ 80FBE20
adds r6, r1, 0
ldr r5, _080FBE50 @ =sub_80FBDB8
adds r0, r5, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
bne _080FBE58
adds r0, r5, 0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080FBE54 @ =gUnknown_3005090
@@ -7431,7 +7431,7 @@ _080FBEE8:
bl sub_80FB9E4
_080FBF10:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
b _080FBF36
_080FBF18:
ldrh r0, [r4, 0x1E]
@@ -7459,7 +7459,7 @@ _080FBF36:
movs r0, 0x2
bl sub_80FB9E4
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080FBF4E:
pop {r4-r6}
pop {r0}
@@ -7478,7 +7478,7 @@ sub_80FBF54: @ 80FBF54
strb r1, [r0]
ldr r0, _080FBF90 @ =sub_80FBE80
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -7488,7 +7488,7 @@ sub_80FBF54: @ 80FBF54
adds r4, r0
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8008D84
+ bl StringCopy
strh r5, [r4, 0x10]
pop {r4-r6}
pop {r0}
@@ -7591,7 +7591,7 @@ sub_80FC028: @ 80FC028
cmp r0, 0x4
bne _080FC046
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080FC046:
ldr r1, _080FC0E4 @ =gUnknown_3005090
lsls r0, r5, 2
@@ -7611,7 +7611,7 @@ _080FC046:
movs r0, 0x2
bl sub_80FB9E4
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080FC070:
ldr r1, _080FC0E8 @ =0x00000985
adds r0, r6, r1
@@ -7662,7 +7662,7 @@ _080FC070:
movs r0, 0xA
strh r0, [r6, 0x4]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _080FC108
.align 2, 0
_080FC0E0: .4byte gUnknown_3005450
@@ -7677,7 +7677,7 @@ _080FC0F8:
movs r0, 0x2
bl sub_80FB9E4
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_080FC108:
pop {r3}
mov r8, r3
@@ -7704,7 +7704,7 @@ sub_80FC114: @ 80FC114
ldr r1, _080FC18C @ =0x00000119
adds r0, r6, r1
adds r1, r3, 0
- bl sub_8008D84
+ bl StringCopy
movs r1, 0x85
lsls r1, 1
adds r0, r6, r1
@@ -7714,7 +7714,7 @@ sub_80FC114: @ 80FC114
bl sub_80FEB3C
ldr r0, _080FC190 @ =sub_80FC028
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r5, _080FC194 @ =gUnknown_3005090
@@ -7724,7 +7724,7 @@ sub_80FC114: @ 80FC114
adds r1, r5
strh r4, [r1, 0xA]
ldr r0, _080FC198 @ =sub_80F8B34
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
adds r2, r1, 0
@@ -7838,7 +7838,7 @@ sub_80FC228: @ 80FC228
push {r4-r7,lr}
mov r7, r8
push {r7}
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
movs r1, 0x1C
@@ -8911,7 +8911,7 @@ _080FC9FC:
_080FCA16:
movs r4, 0
_080FCA18:
- bl sub_8044EC8
+ bl Random
lsls r0, 24
lsrs r0, 24
adds r1, r6, r4
@@ -9390,7 +9390,7 @@ _080FCD8A:
ldr r0, _080FCDD0 @ =gUnknown_843F284
adds r1, r3, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -9403,7 +9403,7 @@ _080FCD8A:
strh r0, [r4, 0x3C]
ldr r0, _080FCDDC @ =gUnknown_843F274
ldrh r0, [r0, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
strh r0, [r4, 0x3A]
adds r4, 0x3E
ldrb r0, [r4]
@@ -9424,7 +9424,7 @@ _080FCDE4:
ldr r0, _080FCE30 @ =gUnknown_843F284
adds r1, r3, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080FCE34 @ =gUnknown_203ACE4
strb r0, [r4]
ldr r5, _080FCE38 @ =gUnknown_202063C
@@ -9437,7 +9437,7 @@ _080FCDE4:
strh r1, [r0, 0x3C]
ldr r0, _080FCE40 @ =gUnknown_843F274
ldrh r0, [r0, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -9488,7 +9488,7 @@ sub_80FCE44: @ 80FCE44
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r3, _080FCE9C @ =gUnknown_30030F0
movs r0, 0x84
lsls r0, 3
@@ -9519,16 +9519,16 @@ sub_80FCEA8: @ 80FCEA8
push {r4,lr}
ldr r4, _080FCED4 @ =gUnknown_843F274
ldrh r0, [r4, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _080FCED8 @ =0xffff0000
cmp r0, r1
bne _080FCEC0
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_080FCEC0:
ldr r0, _080FCEDC @ =gUnknown_843F27C
- bl sub_8008928
+ bl LoadSpritePalette
ldr r1, _080FCEE0 @ =gUnknown_203ACE4
movs r0, 0xFF
strb r0, [r1]
@@ -9933,7 +9933,7 @@ sub_80FD1A0: @ 80FD1A0
b _080FD318
_080FD1B6:
movs r0, 0xF0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [sp, 0x14]
movs r4, 0
b _080FD22C
@@ -9977,7 +9977,7 @@ _080FD1F4:
ldr r0, [sp, 0x1C]
add r0, r10
str r3, [sp, 0x18]
- bl sub_8008E28
+ bl StringCompare
ldr r3, [sp, 0x18]
cmp r0, 0
bne _080FD220
@@ -10011,7 +10011,7 @@ _080FD24C: .4byte gUnknown_2022744
_080FD250: .4byte 0x00003ba8
_080FD254: .4byte gUnknown_3005008
_080FD258:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -10104,7 +10104,7 @@ _080FD302:
movs r2, 0xF0
bl memcpy
ldr r0, [sp, 0x14]
- bl sub_8002BC4
+ bl Free
_080FD318:
add sp, 0x20
pop {r3-r5}
@@ -10141,7 +10141,7 @@ _080FD350:
adds r0, 0x4
mov r1, r9
movs r2, 0x7
- bl sub_8008E4C
+ bl StringCompareN
cmp r0, 0
bne _080FD37C
ldr r0, [r6]
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s
index 34f28eb84..2c8aa84e8 100644
--- a/asm/link_rfu_3.s
+++ b/asm/link_rfu_3.s
@@ -18,7 +18,7 @@ sub_811586C: @ 811586C
lsrs r5, r2, 24
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
lsls r4, 8
movs r0, 0x80
lsls r0, 3
@@ -125,7 +125,7 @@ sub_8115924: @ 8115924
add r5, sp, 0x14
ldr r1, _08115998 @ =gUnknown_84571B4
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
adds r0, 0xA
bl sub_8118658
@@ -138,7 +138,7 @@ sub_8115924: @ 8115924
bl sub_8008E78
adds r0, r5, 0
add r1, sp, 0x8
- bl sub_8008DA4
+ bl StringAppend
movs r0, 0x10
str r0, [sp]
mov r0, r8
@@ -215,7 +215,7 @@ sub_8115A24: @ 8115A24
push {lr}
ldr r0, _08115A54 @ =sub_8115A68
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08115A58 @ =gUnknown_203B05C
@@ -332,13 +332,13 @@ _08115B54: .4byte gUnknown_20370C0
_08115B58: .4byte gUnknown_203B059
_08115B5C:
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x4]
movs r0, 0xA0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x8]
ldr r0, [r5, 0x4]
movs r1, 0x4
@@ -384,7 +384,7 @@ _08115B5C:
strb r0, [r5, 0x11]
ldrb r0, [r5, 0x10]
movs r1, 0x22
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x10]
ldr r2, _08115C54 @ =gUnknown_845747C
movs r1, 0x2
@@ -395,7 +395,7 @@ _08115B5C:
movs r3, 0x8
bl sub_811A444
ldrb r0, [r5, 0x10]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
bl sub_8003F20
@@ -413,18 +413,18 @@ _08115B5C:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r5, 0x12]
ldrb r0, [r5, 0x11]
movs r1, 0
bl sub_80F6F1C
ldrb r0, [r5, 0x11]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0x11]
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
strb r0, [r5, 0x13]
strb r4, [r5, 0xC]
@@ -444,7 +444,7 @@ _08115C60:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08115CA4 @ =gUnknown_203B059
ldrb r2, [r0]
lsrs r0, r2, 4
@@ -815,7 +815,7 @@ _08115F5C:
adds r1, r0
subs r1, 0x10
adds r0, r4, 0
- bl sub_8008D54
+ bl StringCopy7
ldr r1, [r5]
ldrb r0, [r5, 0x13]
subs r0, 0x1
@@ -825,7 +825,7 @@ _08115F5C:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _08115FA8 @ =gUnknown_2021D18
ldr r1, _08115FAC @ =gUnknown_8457554
bl sub_8008FCC
@@ -1080,9 +1080,9 @@ _08116168:
strb r0, [r5, 0xC]
b _081161D8
_0811617E:
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08116190 @ =gUnknown_20370D0
movs r0, 0x5
strh r0, [r1]
@@ -1090,9 +1090,9 @@ _0811617E:
.align 2, 0
_08116190: .4byte gUnknown_20370D0
_08116194:
- bl sub_8069B34
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _081161A8 @ =gUnknown_20370D0
movs r0, 0x8
strh r0, [r1]
@@ -1117,7 +1117,7 @@ _081161BA:
adds r0, r5, 0
bl sub_81161E4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_081161D8:
add sp, 0x8
pop {r4-r7}
@@ -1132,7 +1132,7 @@ sub_81161E4: @ 81161E4
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x11]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x11]
movs r1, 0
bl sub_80F6F9C
@@ -1141,12 +1141,12 @@ sub_81161E4: @ 81161E4
movs r2, 0
bl sub_810713C
ldrb r0, [r4, 0x10]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0xF]
movs r1, 0
bl sub_80F6F9C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r4, 0x11]
bl sub_8003E3C
ldrb r0, [r4, 0xF]
@@ -1154,13 +1154,13 @@ sub_81161E4: @ 81161E4
ldrb r0, [r4, 0x10]
bl sub_8003E3C
ldrb r0, [r4, 0x17]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x4]
- bl sub_8002BC4
+ bl Free
pop {r4}
pop {r0}
bx r0
@@ -1408,7 +1408,7 @@ _08116460:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D54
+ bl StringCopy7
ldr r1, [r5]
ldrb r0, [r5, 0x13]
lsls r0, 5
@@ -1417,7 +1417,7 @@ _08116460:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _081164A4 @ =gUnknown_2021D18
ldr r1, _081164A8 @ =gUnknown_203B058
ldrb r1, [r1]
@@ -1747,12 +1747,12 @@ _081166E4:
bx r1
thumb_func_end sub_81165E8
- thumb_func_start sub_81166F4
-sub_81166F4: @ 81166F4
+ thumb_func_start BerryBlenderLinkJoinGroup
+BerryBlenderLinkJoinGroup: @ 81166F4
push {lr}
ldr r0, _08116724 @ =sub_8116738
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08116728 @ =gUnknown_203B05C
@@ -1777,7 +1777,7 @@ _08116728: .4byte gUnknown_203B05C
_0811672C: .4byte gUnknown_3005098
_08116730: .4byte gUnknown_3002028
_08116734: .4byte gUnknown_20370D0
- thumb_func_end sub_81166F4
+ thumb_func_end BerryBlenderLinkJoinGroup
thumb_func_start sub_8116738
sub_8116738: @ 8116738
@@ -1844,11 +1844,11 @@ _081167C0:
bl sub_8009804
bl sub_80FBBD8
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6, 0x4]
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6]
movs r0, 0x1
strb r0, [r6, 0x8]
@@ -1902,7 +1902,7 @@ _08116838:
strb r0, [r6, 0xD]
ldrb r0, [r6, 0xC]
movs r1, 0x22
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0xC]
ldr r2, _081168F8 @ =gUnknown_8458FC8
movs r1, 0x2
@@ -1913,7 +1913,7 @@ _08116838:
movs r3, 0x8
bl sub_811A444
ldrb r0, [r6, 0xC]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6, 0xC]
movs r1, 0x2
bl sub_8003F20
@@ -1931,20 +1931,20 @@ _08116838:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r6, 0xE]
ldrb r0, [r6, 0xD]
movs r1, 0
bl sub_80F6F1C
ldrb r0, [r6, 0xD]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6, 0xD]
bl sub_8115924
ldrb r0, [r6, 0xD]
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
strb r4, [r6, 0xF]
movs r0, 0x3
strb r0, [r6, 0x8]
@@ -1972,7 +1972,7 @@ _08116916:
b _08116BF6
_0811691E:
ldrb r0, [r6, 0xE]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r4, r0, 0
ldr r0, _0811696C @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -2016,7 +2016,7 @@ _08116970:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x12
_08116982:
strb r0, [r6, 0x8]
@@ -2066,7 +2066,7 @@ _081169D2:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D54
+ bl StringCopy7
ldr r1, [r6]
ldrb r0, [r6, 0xF]
lsls r0, 5
@@ -2075,7 +2075,7 @@ _081169D2:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
b _08116C0A
.align 2, 0
_081169FC: .4byte gUnknown_2021D18
@@ -2193,7 +2193,7 @@ _08116AF0:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08116B40 @ =gUnknown_8457700
adds r0, r4, 0
bl sub_8008FCC
@@ -2315,7 +2315,7 @@ _08116C0A:
b _08116D06
_08116C10:
ldrb r0, [r6, 0xD]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r6, 0xD]
movs r1, 0
bl sub_80F6F9C
@@ -2324,12 +2324,12 @@ _08116C10:
movs r2, 0
bl sub_810713C
ldrb r0, [r6, 0xC]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r6, 0xB]
movs r1, 0
bl sub_80F6F9C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r6, 0xD]
bl sub_8003E3C
ldrb r0, [r6, 0xB]
@@ -2337,11 +2337,11 @@ _08116C10:
ldrb r0, [r6, 0xC]
bl sub_8003E3C
ldrb r0, [r6, 0x11]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r6]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6, 0x4]
- bl sub_8002BC4
+ bl Free
ldrb r0, [r6, 0x8]
adds r0, 0x1
strb r0, [r6, 0x8]
@@ -2409,14 +2409,14 @@ _08116CE4: .4byte gUnknown_2021D18
_08116CE8: .4byte gUnknown_20370D0
_08116CEC:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_811A41C
bl sub_80F8DC0
b _08116D06
_08116CFC:
bl sub_8117990
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08116D06:
add sp, 0x8
pop {r4-r7}
@@ -2488,7 +2488,7 @@ sub_8116D60: @ 8116D60
adds r1, r0
adds r1, 0x10
adds r0, r5, 0
- bl sub_8008D54
+ bl StringCopy7
ldr r1, [r4]
ldrb r0, [r4, 0xF]
lsls r0, 5
@@ -2497,7 +2497,7 @@ sub_8116D60: @ 8116D60
lsls r1, 28
lsrs r1, 28
adds r0, r5, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r1, _08116DD8 @ =gUnknown_84570C8
ldr r0, _08116DDC @ =gUnknown_20370C0
ldrh r0, [r0]
@@ -2533,7 +2533,7 @@ sub_8116DE0: @ 8116DE0
push {lr}
ldr r0, _08116E0C @ =sub_8116E1C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r3, _08116E10 @ =gUnknown_203B05C
@@ -2600,11 +2600,11 @@ _08116E70:
movs r0, 0x1
bl sub_80FB128
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x4]
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0x2
strb r0, [r4, 0x8]
@@ -2650,11 +2650,11 @@ _08116EDA:
_08116EF4: .4byte gUnknown_3005090
_08116EF8:
ldrb r0, [r4, 0x11]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x4]
- bl sub_8002BC4
+ bl Free
bl sub_80F8DC0
ldrb r0, [r4, 0x8]
adds r0, 0x1
@@ -2663,7 +2663,7 @@ _08116EF8:
_08116F16:
bl sub_80F8DC0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08116F20:
pop {r4,r5}
pop {r0}
@@ -2941,7 +2941,7 @@ sub_8117100: @ 8117100
lsrs r4, 24
bl sub_804C718
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -2952,7 +2952,7 @@ sub_8117118: @ 8117118
push {lr}
ldr r0, _0811712C @ =sub_8117100
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2970,7 +2970,7 @@ sub_8117130: @ 8117130
lsrs r6, r0, 24
ldr r0, _0811716C @ =gUnknown_203B06C
mov r8, r0
- bl sub_800A404
+ bl GetMultiplayerId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3011,17 +3011,17 @@ _0811717E:
adds r1, r0
movs r0, 0
movs r2, 0x64
- bl sub_800A448
+ bl SendBlock
b _0811725C
.align 2, 0
_08117198: .4byte gUnknown_2024284
_0811719C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _0811725C
- bl sub_800A404
+ bl GetMultiplayerId
adds r1, r0, 0
ldr r0, _081171D0 @ =gUnknown_202402C
movs r2, 0x1
@@ -3034,7 +3034,7 @@ _0811719C:
bl memcpy
movs r0, 0x32
bl sub_8054E90
- bl sub_800A550
+ bl ResetBlockReceivedFlags
b _081171FA
.align 2, 0
_081171D0: .4byte gUnknown_202402C
@@ -3051,7 +3051,7 @@ _081171D8:
movs r0, 0
adds r1, r4, 0
movs r2, 0xDC
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _0811725C
@@ -3065,13 +3065,13 @@ _08117204: .4byte gUnknown_2022618
_08117208: .4byte gUnknown_3005008
_0811720C: .4byte 0x00002cd0
_08117210:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
bne _0811725C
ldr r4, _08117268 @ =gUnknown_2031CCC
- bl sub_800A404
+ bl GetMultiplayerId
adds r1, r0, 0
movs r0, 0x1
eors r1, r0
@@ -3082,20 +3082,20 @@ _08117210:
adds r0, r4, 0
movs r2, 0xD8
bl memcpy
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r1, _08117270 @ =gUnknown_2031DA4
strb r7, [r1]
movs r0, 0x6
strb r0, [r1, 0x1]
ldr r1, _08117274 @ =gUnknown_30030F0
- ldr r0, _08117278 @ =sub_80567DC
+ ldr r0, _08117278 @ =c2_exit_to_overworld_2_switch
str r0, [r1, 0x8]
ldr r0, _0811727C @ =sub_8050138
- bl sub_8000544
+ bl SetMainCallback2
mov r0, r8
bl sub_811B148
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0811725C:
pop {r3}
mov r8, r3
@@ -3107,7 +3107,7 @@ _08117268: .4byte gUnknown_2031CCC
_0811726C: .4byte gUnknown_2022118
_08117270: .4byte gUnknown_2031DA4
_08117274: .4byte gUnknown_30030F0
-_08117278: .4byte sub_80567DC
+_08117278: .4byte c2_exit_to_overworld_2_switch
_0811727C: .4byte sub_8050138
thumb_func_end sub_8117130
@@ -3134,7 +3134,7 @@ sub_8117280: @ 8117280
.align 2, 0
_081172A4: .4byte gUnknown_3005090
_081172A8:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _081172B8
@@ -3146,7 +3146,7 @@ _081172B8:
strh r0, [r4, 0x8]
b _0811734A
_081172C0:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
adds r4, r0, 0
bl sub_800A8D4
lsls r4, 24
@@ -3187,7 +3187,7 @@ _08117302:
lsrs r0, 24
cmp r0, 0x2
bne _0811733C
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -3204,9 +3204,9 @@ _08117338: .4byte gUnknown_2022118
_0811733C:
bl sub_81446C4
_08117340:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_0811734A:
pop {r3}
mov r8, r3
@@ -3233,7 +3233,7 @@ _0811736C: .4byte gUnknown_30030F0
_08117370:
ldr r0, _08117380 @ =sub_8117280
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3242,28 +3242,28 @@ _08117370:
_08117380: .4byte sub_8117280
_08117384:
ldr r0, _081173B8 @ =sub_8117280
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _081173A2
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
lsrs r0, 24
- ldr r1, _081173BC @ =sub_80567DC
+ ldr r1, _081173BC @ =c2_exit_to_overworld_2_switch
bl sub_808B700
_081173A2:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r4}
pop {r0}
bx r0
.align 2, 0
_081173B8: .4byte sub_8117280
-_081173BC: .4byte sub_80567DC
+_081173BC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8117354
thumb_func_start sub_81173C0
@@ -3273,14 +3273,14 @@ sub_81173C0: @ 81173C0
lsls r6, 16
lsrs r6, 16
bl sub_80A0058
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_804C320
ldr r5, _0811742C @ =gUnknown_202273C
ldr r0, _08117430 @ =0x00002211
str r0, [r5, 0x14]
- bl sub_800A404
+ bl GetMultiplayerId
adds r4, r0, 0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r4, 24
lsrs r4, 24
lsls r1, r4, 3
@@ -3290,9 +3290,9 @@ sub_81173C0: @ 81173C0
lsls r0, 24
lsrs r0, 24
strh r0, [r1, 0x18]
- bl sub_800A404
+ bl GetMultiplayerId
adds r4, r0, 0
- bl sub_800A404
+ bl GetMultiplayerId
movs r2, 0x1
eors r4, r2
lsls r4, 24
@@ -3356,7 +3356,7 @@ sub_8117440: @ 8117440
asrs r5, 24
str r5, [sp]
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
ldr r0, [r6]
movs r1, 0x4
ldrsb r1, [r0, r1]
@@ -3366,8 +3366,8 @@ sub_8117440: @ 8117440
str r5, [sp, 0x4]
movs r0, 0
mov r3, r8
- bl sub_805541C
- bl sub_8055378
+ bl saved_warp2_set_2
+ bl warp_in
add sp, 0x8
pop {r3}
mov r8, r3
@@ -3403,7 +3403,7 @@ sub_81174B4: @ 81174B4
bl sub_800A088
ldr r1, _0811752C @ =gUnknown_3005030
strb r0, [r1]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _08117530 @ =gUnknown_300502C
strb r0, [r1]
bl sub_806E08C
@@ -3423,8 +3423,8 @@ sub_81174B4: @ 81174B4
adds r0, r4, 0
adds r1, r5, 0
mov r3, r8
- bl sub_805538C
- bl sub_8055378
+ bl Overworld_SetWarpDestination
+ bl warp_in
add sp, 0x4
pop {r3}
mov r8, r3
@@ -3456,7 +3456,7 @@ _0811754C: .4byte gUnknown_30030F0
_08117550:
ldr r0, _08117560 @ =sub_8117280
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3465,17 +3465,17 @@ _08117550:
_08117560: .4byte sub_8117280
_08117564:
ldr r0, _0811758C @ =sub_8117280
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08117576
ldr r0, _08117590 @ =sub_8056788
- bl sub_8000544
+ bl SetMainCallback2
_08117576:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r4}
pop {r0}
bx r0
@@ -3661,7 +3661,7 @@ _081177A0:
movs r1, 0x1
bl sub_8117594
bl sub_80A0058
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_804C320
movs r0, 0x1
str r0, [sp]
@@ -3674,7 +3674,7 @@ _081177C4: .4byte gUnknown_2022618
_081177C8:
bl sub_80563F0
bl sub_80A0058
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_804C320
ldr r0, _081177EC @ =gUnknown_2022618
movs r1, 0x1
@@ -3690,7 +3690,7 @@ _081177EC: .4byte gUnknown_2022618
_081177F0:
bl sub_80563F0
bl sub_80A0058
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_804C320
ldr r0, _08117814 @ =gUnknown_2022618
movs r1, 0x1
@@ -3717,7 +3717,7 @@ _0811782E:
movs r3, 0x8
bl sub_81174B4
ldr r0, _08117840 @ =sub_8117534
- bl sub_8000544
+ bl SetMainCallback2
b _081178E0
.align 2, 0
_0811783C: .4byte gUnknown_2022618
@@ -3725,12 +3725,12 @@ _08117840: .4byte sub_8117534
_08117844:
ldr r0, _08117850 @ =sub_8117130
movs r1, 0
- bl sub_807741C
+ bl CreateTask
b _081178E0
.align 2, 0
_08117850: .4byte sub_8117130
_08117854:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _08117864
@@ -3750,7 +3750,7 @@ _08117878:
movs r1, 0
bl sub_8117594
ldr r0, _0811788C @ =sub_8117354
- bl sub_8000544
+ bl SetMainCallback2
b _081178E0
.align 2, 0
_08117888: .4byte gUnknown_2022618
@@ -3790,11 +3790,11 @@ _081178C8:
bl sub_81507FC
_081178E0:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _081178FC @ =gUnknown_20370D0
movs r0, 0x1
strh r0, [r1]
- bl sub_806994C
+ bl ScriptContext2_Disable
add sp, 0x4
pop {r4}
pop {r0}
@@ -3835,18 +3835,18 @@ _08117932:
ldr r1, _08117940 @ =gUnknown_20370D0
movs r0, 0x1
strh r0, [r1]
- bl sub_8069B34
+ bl EnableBothScriptContexts
b _08117968
.align 2, 0
_08117940: .4byte gUnknown_20370D0
_08117944:
- bl sub_8069A64
+ bl ScriptContext1_IsScriptSetUp
lsls r0, 24
cmp r0, 0
bne _08117988
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
b _08117968
_08117958:
ldr r0, _08117970 @ =gUnknown_2037AB8
@@ -3869,7 +3869,7 @@ _08117974:
cmp r0, 0
beq _08117988
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_81179A4
_08117988:
pop {r4,r5}
@@ -3882,7 +3882,7 @@ sub_8117990: @ 8117990
push {lr}
ldr r0, _081179A0 @ =sub_8117900
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -3894,7 +3894,7 @@ sub_81179A4: @ 81179A4
push {lr}
ldr r0, _081179C4 @ =sub_81175BC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _081179C8 @ =gUnknown_3005090
@@ -3917,7 +3917,7 @@ sub_81179CC: @ 81179CC
adds r4, r0, 0
ldr r0, _081179FC @ =sub_8117A0C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08117A00 @ =gUnknown_203B05C
@@ -4010,13 +4010,13 @@ _08117AB0: .4byte gUnknown_203B058
_08117AB4: .4byte gUnknown_203B059
_08117AB8:
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x4]
movs r0, 0xA0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0xA0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x8]
ldr r0, [r5, 0x4]
movs r1, 0x4
@@ -4079,10 +4079,10 @@ _08117AB8:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r5, 0x12]
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
strb r0, [r5, 0x13]
b _08117C02
@@ -4099,7 +4099,7 @@ _08117B7C:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08117BA8 @ =gUnknown_2021D18
ldrb r1, [r4]
bl sub_811599C
@@ -4142,7 +4142,7 @@ _08117BE4:
adds r0, r5, 0
adds r0, 0xD
ldr r1, _08117C08 @ =gUnknown_84577F8
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _08117BF4
b _08117ECA
@@ -4279,7 +4279,7 @@ _08117CB2:
adds r1, r0
subs r1, 0x10
adds r0, r4, 0
- bl sub_8008D54
+ bl StringCopy7
ldr r1, [r5]
ldrb r0, [r5, 0x13]
subs r0, 0x1
@@ -4289,7 +4289,7 @@ _08117CB2:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _08117D34 @ =gUnknown_2021D18
ldr r1, _08117D38 @ =gUnknown_8457554
bl sub_8008FCC
@@ -4400,27 +4400,27 @@ _08117DEE:
movs r2, 0
bl sub_810713C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
bl sub_8003E3C
ldrb r0, [r5, 0x17]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r5, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0x4]
- bl sub_8002BC4
+ bl Free
b _08117EB2
_08117E26:
adds r0, r5, 0
adds r0, 0xD
ldr r1, _08117E44 @ =gUnknown_84571B8
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
beq _08117ECA
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08117E48 @ =gUnknown_20370D0
movs r0, 0x5
strh r0, [r1]
@@ -4459,17 +4459,17 @@ _08117E80:
movs r2, 0
bl sub_810713C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xF]
bl sub_8003E3C
ldrb r0, [r5, 0x17]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r5, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0x4]
- bl sub_8002BC4
+ bl Free
bl sub_800AB9C
_08117EB2:
ldrb r0, [r5, 0xC]
@@ -4482,7 +4482,7 @@ _08117EBA:
cmp r0, 0
beq _08117ECA
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08117ECA:
add sp, 0x8
pop {r4-r6}
@@ -4496,7 +4496,7 @@ sub_8117ED4: @ 8117ED4
adds r4, r0, 0
ldr r0, _08117F0C @ =sub_8117F20
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08117F10 @ =gUnknown_203B05C
@@ -4574,11 +4574,11 @@ _08117F7C:
bl sub_8009804
bl sub_80FBBD8
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x4]
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0x1
strb r0, [r5, 0x8]
@@ -4635,22 +4635,22 @@ _08117FC0:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r5, 0xE]
ldrb r0, [r5, 0xD]
bl sub_814240C
ldrb r0, [r5, 0xD]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0xD]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0xD]
bl sub_8115924
ldrb r0, [r5, 0xD]
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
strb r4, [r5, 0xF]
movs r0, 0x3
strb r0, [r5, 0x8]
@@ -4677,7 +4677,7 @@ _08118086:
b _08118288
_0811808E:
ldrb r0, [r5, 0xE]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r2, r0, 0
ldr r0, _08118128 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -4715,7 +4715,7 @@ _0811808E:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r5]
ldrb r0, [r5, 0xF]
lsls r0, 5
@@ -4724,7 +4724,7 @@ _0811808E:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldrb r1, [r5, 0xF]
lsls r1, 5
ldr r0, [r5]
@@ -4774,7 +4774,7 @@ _08118150:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r5]
ldrb r0, [r5, 0xF]
lsls r0, 5
@@ -4783,7 +4783,7 @@ _08118150:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
movs r0, 0x5
strb r0, [r5, 0x8]
b _08118288
@@ -4844,17 +4844,17 @@ _081181EC:
movs r2, 0
bl sub_810713C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xD]
bl sub_8003E3C
ldrb r0, [r5, 0xB]
bl sub_8003E3C
ldrb r0, [r5, 0x11]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0x4]
- bl sub_8002BC4
+ bl Free
ldrb r0, [r5, 0x8]
adds r0, 0x1
strb r0, [r5, 0x8]
@@ -4868,7 +4868,7 @@ _08118222:
adds r0, r4
ldr r1, [r0]
adds r0, r5, 0
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
beq _08118288
bl sub_80FCE44
@@ -4881,7 +4881,7 @@ _08118248:
bl sub_8142504
_08118252:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_80F8DC0
ldr r1, _08118268 @ =gUnknown_20370D0
movs r0, 0x5
@@ -4902,7 +4902,7 @@ _08118278:
cmp r0, 0
beq _08118288
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_08118288:
add sp, 0x8
pop {r4-r7}
@@ -4916,7 +4916,7 @@ sub_8118290: @ 8118290
adds r4, r0, 0
ldr r0, _081182C8 @ =sub_81182DC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _081182CC @ =gUnknown_203B05C
@@ -4993,11 +4993,11 @@ _08118340:
bl sub_8009804
bl sub_80FBBD8
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x4]
movs r0, 0x80
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0x1
strb r0, [r5, 0x8]
@@ -5053,10 +5053,10 @@ _08118380:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r5, 0xE]
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_081183EC:
movs r0, 0
strb r0, [r5, 0xF]
@@ -5092,7 +5092,7 @@ _0811842E:
cmp r0, 0
beq _0811843A
ldrb r0, [r5, 0xE]
- bl sub_8107078
+ bl ListMenuHandleInput
_0811843A:
ldrb r0, [r5, 0x14]
cmp r0, 0x78
@@ -5171,7 +5171,7 @@ _081184C8:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r5]
ldrb r0, [r5, 0xF]
lsls r0, 5
@@ -5180,7 +5180,7 @@ _081184C8:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
movs r0, 0x5
strb r0, [r5, 0x8]
b _08118604
@@ -5244,16 +5244,16 @@ _08118564:
movs r2, 0
bl sub_810713C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r5, 0xB]
bl sub_8003E3C
_08118580:
ldrb r0, [r5, 0x11]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0x4]
- bl sub_8002BC4
+ bl Free
ldrb r0, [r5, 0x8]
adds r0, 0x1
strb r0, [r5, 0x8]
@@ -5281,12 +5281,12 @@ _081185B4:
adds r1, r2
ldr r1, [r1]
_081185C2:
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
beq _08118604
bl sub_80FCE44
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_80F8DC0
ldr r1, _081185E4 @ =gUnknown_20370D0
movs r0, 0x5
@@ -5307,7 +5307,7 @@ _081185F4:
cmp r0, 0
beq _08118604
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08118604:
add sp, 0x8
pop {r4-r6}
@@ -5315,17 +5315,17 @@ _08118604:
bx r0
thumb_func_end sub_81182DC
- thumb_func_start sub_811860C
-sub_811860C: @ 811860C
+ thumb_func_start UnionRoomSpecial
+UnionRoomSpecial: @ 811860C
push {r4,lr}
bl sub_80FAF34
ldr r0, _08118648 @ =sub_81186E0
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
ldr r4, _0811864C @ =gUnknown_203B05C
movs r0, 0x96
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r1, _08118650 @ =gUnknown_300202C
str r0, [r1]
@@ -5347,7 +5347,7 @@ _08118648: .4byte sub_81186E0
_0811864C: .4byte gUnknown_203B05C
_08118650: .4byte gUnknown_300202C
_08118654: .4byte gUnknown_20370D0
- thumb_func_end sub_811860C
+ thumb_func_end UnionRoomSpecial
thumb_func_start sub_8118658
sub_8118658: @ 8118658
@@ -5521,17 +5521,17 @@ _0811871C:
.4byte _081195EC
_08118800:
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6, 0x4]
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6, 0xC]
movs r0, 0x80
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6]
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6, 0x8]
ldr r0, [r6]
movs r1, 0x8
@@ -5718,7 +5718,7 @@ _081189AA:
ldr r0, _081189DC @ =gUnknown_2021CD0
ldr r1, _081189E0 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
movs r1, 0
movs r0, 0x2A
b _08118A06
@@ -5749,7 +5749,7 @@ _08118A06:
strh r1, [r4]
bl _081198DC
_08118A0E:
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -5791,7 +5791,7 @@ _08118A50:
ldr r0, _08118A7C @ =gUnknown_2021CD0
ldr r1, _08118A80 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x2D
bl _081198DA
.align 2, 0
@@ -5841,7 +5841,7 @@ _08118AD4:
bl _081198DC
_08118ADE:
ldr r0, _08118B00 @ =sub_806F1F0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08118AEE
@@ -5952,7 +5952,7 @@ _08118BCE:
bl sub_8117594
ldr r0, _08118BF4 @ =sub_8117280
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
movs r0, 0x26
bl _081198DA
.align 2, 0
@@ -5963,7 +5963,7 @@ _08118BF0: .4byte gUnknown_2022618
_08118BF4: .4byte sub_8117280
_08118BF8:
ldr r0, _08118C1C @ =sub_8117280
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08118C08
@@ -6059,7 +6059,7 @@ _08118CB6:
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x20
bl _081198DA
.align 2, 0
@@ -6103,7 +6103,7 @@ _08118D34: .4byte gUnknown_203B058
_08118D38:
ldr r0, _08118D48 @ =gUnknown_2021D18
ldr r1, _08118D4C @ =gUnknown_8458434
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x24
bl _081198DA
.align 2, 0
@@ -6174,7 +6174,7 @@ _08118DD4:
bne _08118DF8
ldr r0, _08118DF0 @ =gUnknown_2021D18
ldr r1, _08118DF4 @ =gUnknown_8458434
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1C
bl _081198DA
.align 2, 0
@@ -6280,12 +6280,12 @@ _08118EC8:
bne _08118ED6
bl _081198DC
_08118ED6:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _08118F30
ldr r5, _08118F20 @ =gUnknown_2021CD0
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -6296,7 +6296,7 @@ _08118ED6:
ldr r4, _08118F24 @ =gUnknown_2022744
adds r1, r4
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldrh r0, [r4, 0x18]
adds r4, 0x1C
adds r1, r4, 0
@@ -6340,7 +6340,7 @@ _08118F58:
bl _081198DC
_08118F60:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r4, _08118F98 @ =gUnknown_203B058
movs r0, 0x45
strb r0, [r4]
@@ -6523,7 +6523,7 @@ _081190EA:
bl sub_8117594
ldr r0, _08119108 @ =sub_8117280
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
movs r0, 0x27
bl _081198DA
.align 2, 0
@@ -6534,7 +6534,7 @@ _0811910C:
adds r0, r6, 0
bl sub_8119904
ldr r0, _08119150 @ =sub_8117280
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08119122
@@ -6545,7 +6545,7 @@ _08119122:
ldr r0, _08119154 @ =gUnknown_2021CD0
ldr r4, _08119158 @ =gUnknown_2022760
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
subs r0, 0x24
ldrh r0, [r0, 0x20]
@@ -6602,7 +6602,7 @@ _081191A4:
bl sub_80FBD6C
ldr r0, _081191BC @ =gUnknown_2021D18
ldr r1, _081191C0 @ =gUnknown_8457E60
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x24
b _081198DA
.align 2, 0
@@ -6693,7 +6693,7 @@ _0811924A:
strb r0, [r6, 0x14]
ldr r0, _08119280 @ =gUnknown_2021D18
ldr r1, _08119284 @ =gUnknown_84584C0
- bl sub_8008D84
+ bl StringCopy
b _081198DC
.align 2, 0
_0811927C: .4byte gUnknown_203B058
@@ -6806,17 +6806,17 @@ _08119368:
b _081198DA
_0811936C:
ldr r0, [r6, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6, 0xC]
- bl sub_8002BC4
+ bl Free
ldr r0, [r6, 0x4]
- bl sub_8002BC4
+ bl Free
adds r0, r6, 0
adds r0, 0x20
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
adds r0, r6, 0
adds r0, 0x21
bl sub_811BB40
@@ -6829,11 +6829,11 @@ _0811939A:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x12
b _081198DA
_081193AE:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _081193BA
@@ -6841,10 +6841,10 @@ _081193AE:
_081193BA:
bl sub_811BA78
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _081193D4 @ =gUnknown_203B05C
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_81179A4
b _081198DC
.align 2, 0
@@ -6872,7 +6872,7 @@ _081193F0:
bne _08119414
ldr r0, _0811940C @ =gUnknown_2021D18
ldr r1, _08119410 @ =gUnknown_8458DE8
- bl sub_8008D84
+ bl StringCopy
b _0811944A
.align 2, 0
_0811940C: .4byte gUnknown_2021D18
@@ -6888,7 +6888,7 @@ _08119414:
ldr r0, _08119458 @ =gUnknown_8245EE0
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0811945C @ =gUnknown_2021CF0
bl sub_80F9800
ldrb r1, [r0, 0xB]
@@ -6986,7 +6986,7 @@ _081194F0:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x36
b _081198DA
_08119504:
@@ -7004,7 +7004,7 @@ _08119512:
ldr r1, _08119530 @ =gUnknown_3005020
ldr r0, _08119534 @ =sub_807DCE4
str r0, [r1]
- ldr r1, _08119538 @ =sub_80567DC
+ ldr r1, _08119538 @ =c2_exit_to_overworld_2_switch
movs r0, 0x8
bl sub_81277F4
b _081198DC
@@ -7013,7 +7013,7 @@ _08119528: .4byte gUnknown_2037AB8
_0811952C: .4byte gUnknown_203B06C
_08119530: .4byte gUnknown_3005020
_08119534: .4byte sub_807DCE4
-_08119538: .4byte sub_80567DC
+_08119538: .4byte c2_exit_to_overworld_2_switch
_0811953C:
adds r0, r6, 0
adds r0, 0x16
@@ -7205,14 +7205,14 @@ _081196BA:
add r1, r8
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
add r0, r8
ldrb r1, [r0]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r1, _081196E8 @ =gUnknown_8458E70
movs r0, 0x31
bl sub_8118664
@@ -7227,14 +7227,14 @@ _081196EC:
add r1, r8
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
add r0, r8
ldrb r1, [r0]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _08119728 @ =gUnknown_2021CF0
ldr r1, [r6]
add r1, r8
@@ -7244,7 +7244,7 @@ _081196EC:
subs r1, r2
ldr r2, _0811972C @ =gUnknown_824F1A0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08119730 @ =gUnknown_8458ED0
b _0811976A
.align 2, 0
@@ -7258,14 +7258,14 @@ _08119734:
add r1, r8
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
add r0, r8
ldrb r1, [r0]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _08119778 @ =gUnknown_2021CF0
ldr r1, [r6]
add r1, r8
@@ -7275,7 +7275,7 @@ _08119734:
subs r1, r2
ldr r2, _0811977C @ =gUnknown_824F1A0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08119780 @ =gUnknown_8458F04
_0811976A:
movs r0, 0x2E
@@ -7357,7 +7357,7 @@ _081197CA:
ldr r1, _08119834 @ =gUnknown_3005020
ldr r0, _08119838 @ =sub_807DCE4
str r0, [r1]
- ldr r1, _0811983C @ =sub_80567DC
+ ldr r1, _0811983C @ =c2_exit_to_overworld_2_switch
movs r0, 0x9
bl sub_81277F4
adds r0, r6, 0
@@ -7373,7 +7373,7 @@ _0811982C: .4byte gUnknown_203B06A
_08119830: .4byte gUnknown_203B068
_08119834: .4byte gUnknown_3005020
_08119838: .4byte sub_807DCE4
-_0811983C: .4byte sub_80567DC
+_0811983C: .4byte c2_exit_to_overworld_2_switch
_08119840:
ldr r1, _08119890 @ =gUnknown_203B058
movs r0, 0x44
@@ -7395,7 +7395,7 @@ _08119840:
adds r1, r0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r6]
movs r3, 0x2
ldrsh r0, [r7, r3]
@@ -7405,7 +7405,7 @@ _08119840:
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, _08119898 @ =gUnknown_8457A34
ldr r0, [r0, 0x8]
bl sub_811A0B4
@@ -7574,11 +7574,11 @@ sub_811999C: @ 811999C
bls _081199E0
ldr r0, _081199F0 @ =sub_81199FC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r4, _081199F4 @ =gUnknown_203B05C
movs r0, 0x96
lsls r0, 2
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r1, _081199F8 @ =gUnknown_300202C
str r0, [r1]
@@ -7649,23 +7649,23 @@ _08119A3E:
b _08119B5C
_08119A60:
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x4]
movs r1, 0x4
bl sub_811A650
movs r0, 0x70
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0xC]
movs r1, 0x4
bl sub_811A650
movs r0, 0x80
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r1, 0x8
bl sub_811A5E4
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5, 0x8]
movs r1, 0x1
bl sub_811A5E4
@@ -7703,14 +7703,14 @@ _08119ACA:
bne _08119B0A
adds r1, 0x10
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r5]
adds r0, r4
ldrb r1, [r0]
lsls r1, 28
lsrs r1, 28
mov r0, sp
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, [r5]
adds r0, r4
adds r0, 0x2
@@ -7731,29 +7731,29 @@ _08119B14: .4byte gUnknown_203B04C
_08119B18:
ldr r0, _08119B24 @ =gUnknown_203B04C
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
b _08119B5C
.align 2, 0
_08119B24: .4byte gUnknown_203B04C
_08119B28:
ldr r0, [r5, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0xC]
- bl sub_8002BC4
+ bl Free
ldr r0, [r5, 0x4]
- bl sub_8002BC4
+ bl Free
adds r0, r5, 0
adds r0, 0x20
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
ldr r0, _08119B64 @ =gUnknown_203B05C
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_80F8DC0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08119B5C:
add sp, 0x20
pop {r4-r6}
@@ -7763,8 +7763,8 @@ _08119B5C:
_08119B64: .4byte gUnknown_203B05C
thumb_func_end sub_81199FC
- thumb_func_start sub_8119B68
-sub_8119B68: @ 8119B68
+ thumb_func_start sp182_move_string
+sp182_move_string: @ 8119B68
push {r4,lr}
ldr r4, _08119B78 @ =gUnknown_203B04C
ldrb r0, [r4]
@@ -7777,7 +7777,7 @@ _08119B78: .4byte gUnknown_203B04C
_08119B7C:
ldr r0, _08119B90 @ =gUnknown_2021CD0
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0xFF
strb r0, [r4]
movs r0, 0x1
@@ -7787,7 +7787,7 @@ _08119B8A:
bx r1
.align 2, 0
_08119B90: .4byte gUnknown_2021CD0
- thumb_func_end sub_8119B68
+ thumb_func_end sp182_move_string
thumb_func_start sub_8119B94
sub_8119B94: @ 8119B94
@@ -8188,7 +8188,7 @@ sub_8119E84: @ 8119E84
adds r6, r2, 0
ldr r0, _08119EB0 @ =sub_8119D34
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -8433,7 +8433,7 @@ sub_811A054: @ 811A054
adds r5, r1, 0
ldr r0, _0811A07C @ =sub_8119EB8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -8459,7 +8459,7 @@ sub_811A084: @ 811A084
adds r5, r1, 0
ldr r0, _0811A0AC @ =sub_8119FD8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -8627,7 +8627,7 @@ sub_811A1AC: @ 811A1AC
bl sub_80F6F1C
adds r0, r4, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0811A1F8 @ =gUnknown_8459378
movs r0, 0x1
str r0, [sp]
@@ -8638,7 +8638,7 @@ sub_811A1AC: @ 811A1AC
movs r3, 0x8
bl sub_811A444
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
@@ -8700,7 +8700,7 @@ _0811A234:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
mov r1, r9
strb r0, [r1]
ldrb r0, [r5]
@@ -8715,7 +8715,7 @@ _0811A270: .4byte gUnknown_3005E70
_0811A274:
mov r3, r9
ldrb r0, [r3]
- bl sub_8107078
+ bl ListMenuHandleInput
mov r8, r0
ldr r0, _0811A2AC @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -8806,7 +8806,7 @@ _0811A308:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0x1
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r5]
ldrb r0, [r4]
movs r1, 0x1
@@ -8821,7 +8821,7 @@ _0811A350: .4byte gUnknown_8456F1C
_0811A354: .4byte gUnknown_3005E70
_0811A358:
ldrb r0, [r5]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r1, r0, 0
ldr r0, _0811A3A8 @ =gUnknown_30030F0
ldrh r2, [r0, 0x2E]
@@ -8907,9 +8907,9 @@ sub_811A3F8: @ 811A3F8
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
@@ -8927,10 +8927,10 @@ sub_811A41C: @ 811A41C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
- bl sub_80020BC
- bl sub_8069B34
+ bl CopyBgTilemapBufferToVram
+ bl EnableBothScriptContexts
add sp, 0xC
pop {r0}
bx r0
@@ -9503,7 +9503,7 @@ sub_811A81C: @ 811A81C
bl sub_8008E78
ldr r1, _0811A908 @ =gUnknown_84571B0
mov r0, r8
- bl sub_8008DA4
+ bl StringAppend
str r6, [sp]
movs r0, 0
str r0, [sp, 0x4]
@@ -9532,12 +9532,12 @@ sub_811A81C: @ 811A81C
adds r1, r5, 0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r1, [r5]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
str r6, [sp]
mov r0, r10
str r0, [sp, 0x4]
@@ -9556,10 +9556,10 @@ sub_811A81C: @ 811A81C
bl sub_8008E78
ldr r1, _0811A90C @ =gUnknown_84571B4
mov r0, r8
- bl sub_8008D84
+ bl StringCopy
mov r0, r8
add r1, sp, 0x8
- bl sub_8008DA4
+ bl StringAppend
mov r3, r9
adds r3, 0x4D
lsls r3, 24
@@ -9614,12 +9614,12 @@ sub_811A910: @ 811A910
adds r1, r5, 0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r1, [r5]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
mov r0, r8
str r0, [sp]
str r7, [sp, 0x4]
@@ -9639,10 +9639,10 @@ sub_811A910: @ 811A910
ldr r4, _0811A9B0 @ =gUnknown_2021D18
ldr r1, _0811A9B4 @ =gUnknown_84571B4
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
add r1, sp, 0x8
- bl sub_8008DA4
+ bl StringAppend
adds r3, r6, 0
adds r3, 0x47
lsls r3, 24
@@ -9675,7 +9675,7 @@ sub_811A9B8: @ 811A9B8
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -9741,12 +9741,12 @@ sub_811AA24: @ 811AA24
adds r1, r4, 0
adds r1, 0x10
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
ldrb r1, [r4]
lsls r1, 28
lsrs r1, 28
mov r0, sp
- bl sub_80093BC
+ bl ConvertInternationalString
adds r4, 0x2
adds r0, r4, 0
bl sub_8118658
@@ -9780,12 +9780,12 @@ sub_811AA5C: @ 811AA5C
adds r1, r5, 0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r1, [r5]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
adds r0, r5, 0x2
bl sub_8118658
lsls r0, 16
@@ -9827,12 +9827,12 @@ _0811AAE4:
adds r1, r5, 0
adds r1, 0x10
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrb r1, [r5]
lsls r1, 28
lsrs r1, 28
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
cmp r6, 0
beq _0811AB0A
adds r0, r5, r6
@@ -9864,7 +9864,7 @@ _0811AB28:
_0811AB32:
ldr r5, _0811AB50 @ =gUnknown_2021D18
ldr r4, _0811AB54 @ =gUnknown_8458758
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -9881,7 +9881,7 @@ _0811AB54: .4byte gUnknown_8458758
_0811AB58:
ldr r5, _0811AB70 @ =gUnknown_2021D18
ldr r4, _0811AB74 @ =gUnknown_8458A78
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -9895,7 +9895,7 @@ _0811AB74: .4byte gUnknown_8458A78
_0811AB78:
ldr r5, _0811AB94 @ =gUnknown_2021D18
ldr r4, _0811AB98 @ =gUnknown_84588BC
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -9912,7 +9912,7 @@ _0811AB98: .4byte gUnknown_84588BC
_0811AB9C:
ldr r5, _0811ABC0 @ =gUnknown_2021D18
ldr r4, _0811ABC4 @ =gUnknown_84589AC
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
@@ -10095,14 +10095,14 @@ _0811AD08:
adds r1, r0, r4
adds r1, 0x10
add r0, sp, 0x4
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
adds r0, r4
ldrb r1, [r0]
lsls r1, 28
lsrs r1, 28
add r0, sp, 0x4
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r2, [r6]
adds r2, r4
movs r0, 0x6
@@ -10219,7 +10219,7 @@ _0811ADE0:
ldr r1, _0811AE08 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
movs r0, 0xCE
lsls r0, 1
@@ -10249,7 +10249,7 @@ _0811AE1C:
ldr r1, _0811AE4C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r0, r1, 3
subs r0, r1
@@ -10346,7 +10346,7 @@ sub_811AECC: @ 811AECC
lsls r1, 24
lsrs r4, r1, 24
adds r6, r4, 0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r3, r0, 24
ldr r2, _0811AF00 @ =gUnknown_202273C
@@ -10397,7 +10397,7 @@ _0811AF32:
adds r1, r2
ldr r1, [r1]
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
b _0811AF60
.align 2, 0
_0811AF40: .4byte gUnknown_8458230
@@ -10414,7 +10414,7 @@ _0811AF44:
adds r1, r2
ldr r1, [r1]
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
_0811AF60:
pop {r4-r6}
pop {r0}
@@ -10482,7 +10482,7 @@ _0811AFC8:
muls r1, r2
ldr r2, _0811AFF4 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
movs r4, 0
b _0811AFFA
.align 2, 0
@@ -10513,7 +10513,7 @@ _0811AFFA:
adds r1, r0
adds r0, r6, 0
adds r0, 0x79
- bl sub_8008D84
+ bl StringCopy
ldrh r5, [r5, 0x2]
mov r8, r5
_0811B030:
@@ -10523,7 +10523,7 @@ _0811B030:
bne _0811B050
ldr r1, _0811B04C @ =gUnknown_8457DB8
adds r0, r7, 0
- bl sub_8008D84
+ bl StringCopy
b _0811B080
.align 2, 0
_0811B044: .4byte gUnknown_3007460
@@ -10638,12 +10638,12 @@ _0811B0FE:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1E
bhi _0811B126
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -10707,15 +10707,15 @@ sub_811B16C: @ 811B16C
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0xA]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0xC]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x4]
ldrh r1, [r5, 0xA]
movs r0, 0xCE
@@ -10745,15 +10745,15 @@ sub_811B1B4: @ 811B1B4
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0xE]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0x10]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x14]
pop {r4,r5}
pop {r0}
@@ -10794,12 +10794,12 @@ _0811B212:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r6
bne _0811B238
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, r7
@@ -10828,7 +10828,7 @@ sub_811B258: @ 811B258
push {r4,lr}
adds r4, r0, 0
bl sub_811A3F8
- bl sub_806994C
+ bl ScriptContext2_Disable
bl sub_80696F0
ldr r1, _0811B290 @ =gUnknown_203B058
movs r0, 0
@@ -10856,8 +10856,8 @@ _0811B294: .4byte gUnknown_203B06C
thumb_func_start sub_811B298
sub_811B298: @ 811B298
push {lr}
- bl sub_8069940
- bl sub_80695B4
+ bl ScriptContext2_Enable
+ bl ScriptFreezeMapObjects
pop {r0}
bx r0
thumb_func_end sub_811B298
@@ -10941,7 +10941,7 @@ sub_811B31C: @ 811B31C
lsls r2, 24
lsrs r2, 24
str r2, [sp]
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -10963,7 +10963,7 @@ sub_811B31C: @ 811B31C
ldr r0, _0811B4B4 @ =gUnknown_823E558
adds r1, r0
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
adds r1, r6, 0
bl sub_813CCAC
@@ -10981,7 +10981,7 @@ sub_811B31C: @ 811B31C
adds r0, r1
ldr r1, [r0]
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x2
adds r1, r4, 0
bl sub_813CCAC
@@ -11027,7 +11027,7 @@ sub_811B31C: @ 811B31C
bl sub_813CCC8
ldr r0, _0811B4C0 @ =gUnknown_2021D18
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
mov r0, r8
ldrh r1, [r0, 0x14]
ldr r4, _0811B4C4 @ =0x0000270f
@@ -11096,7 +11096,7 @@ _0811B45E:
ldr r5, _0811B4C0 @ =gUnknown_2021D18
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r0, [sp]
cmp r0, 0x1
bne _0811B4D0
@@ -11105,7 +11105,7 @@ _0811B45E:
bl sub_813CCC8
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _0811B4F0
.align 2, 0
_0811B4B0: .4byte gUnknown_2039624
@@ -11130,7 +11130,7 @@ _0811B4D0:
bl sub_813CCC8
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
_0811B4F0:
add sp, 0x4
pop {r3-r5}
@@ -11144,8 +11144,8 @@ _0811B4F0:
_0811B500: .4byte gUnknown_8459580
thumb_func_end sub_811B31C
- thumb_func_start sub_811B504
-sub_811B504: @ 811B504
+ thumb_func_start is_walking_or_running
+is_walking_or_running: @ 811B504
push {lr}
ldr r0, _0811B518 @ =gUnknown_2037078
ldrb r0, [r0, 0x3]
@@ -11163,7 +11163,7 @@ _0811B51C:
_0811B51E:
pop {r1}
bx r1
- thumb_func_end sub_811B504
+ thumb_func_end is_walking_or_running
thumb_func_start sub_811B524
sub_811B524: @ 811B524
@@ -11330,7 +11330,7 @@ sub_811B62C: @ 811B62C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805E898
+ bl show_sprite
pop {r0}
bx r0
.align 2, 0
@@ -11348,7 +11348,7 @@ sub_811B64C: @ 811B64C
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
pop {r0}
bx r0
.align 2, 0
@@ -11369,7 +11369,7 @@ sub_811B66C: @ 811B66C
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0811B6D0
@@ -11381,7 +11381,7 @@ sub_811B66C: @ 811B66C
ldr r1, _0811B6C0 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
bne _0811B6D0
@@ -11428,7 +11428,7 @@ sub_811B6E8: @ 811B6E8
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _0811B748
@@ -11440,7 +11440,7 @@ sub_811B6E8: @ 811B6E8
ldr r1, _0811B72C @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
bne _0811B730
@@ -11451,12 +11451,12 @@ _0811B724: .4byte gUnknown_8457120
_0811B728: .4byte gUnknown_3005008
_0811B72C: .4byte gUnknown_2036E38
_0811B730:
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _0811B742
adds r0, r4, 0
- bl sub_80689F4
+ bl npc_sync_anim_pause_bits
b _0811B748
_0811B742:
adds r0, r4, 0
@@ -11581,14 +11581,14 @@ _0811B820:
beq _0811B888
b _0811B8B2
_0811B826:
- bl sub_811B504
+ bl is_walking_or_running
cmp r0, 0
beq _0811B8B2
mov r4, sp
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r2, [r0, r1]
@@ -11601,7 +11601,7 @@ _0811B826:
beq _0811B8B2
mov r0, sp
adds r1, r4, 0
- bl sub_805C568
+ bl plaer_get_pos_including_state_based_drift
mov r0, sp
movs r1, 0
ldrsh r2, [r0, r1]
@@ -11843,14 +11843,14 @@ sub_811BA18: @ 811BA18
push {r4,lr}
ldr r4, _0811BA38 @ =sub_811B9D8
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0811BA3C
adds r0, r4, 0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
b _0811BA4A
@@ -11877,12 +11877,12 @@ _0811BA58: .4byte gUnknown_8457174
sub_811BA5C: @ 811BA5C
push {lr}
ldr r0, _0811BA74 @ =sub_811B9D8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xF
bhi _0811BA70
- bl sub_8077508
+ bl DestroyTask
_0811BA70:
pop {r0}
bx r0
@@ -12006,7 +12006,7 @@ _0811BB48:
adds r0, r1
lsls r0, 2
adds r0, r6
- bl sub_8007280
+ bl DestroySprite
adds r4, 0x1
cmp r4, 0x27
ble _0811BB48
@@ -12198,13 +12198,13 @@ sub_811BCA0: @ 811BCA0
adds r6, 0x2
mov r0, sp
adds r1, r6, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
add r4, sp, 0x4
mov r5, sp
adds r5, 0x6
adds r0, r4, 0
adds r1, r5, 0
- bl sub_805C568
+ bl plaer_get_pos_including_state_based_drift
lsls r0, r7, 2
adds r0, r7
subs r0, 0x38
@@ -12490,13 +12490,13 @@ sub_811BF00: @ 811BF00
adds r5, r0, 0
str r1, [sp, 0x4]
str r2, [sp, 0x8]
- bl sub_811B504
+ bl is_walking_or_running
cmp r0, 0
bne _0811BF48
b _0811BFEE
_0811BF1C:
ldr r4, _0811BF44 @ =gUnknown_8457116
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
adds r0, r4
@@ -12519,7 +12519,7 @@ _0811BF48:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
movs r0, 0
str r0, [sp, 0xC]
ldr r0, _0811C000 @ =gUnknown_84570EC
@@ -12683,7 +12683,7 @@ _0811C05C:
adds r5, r4, r0
_0811C082:
adds r0, r4, 0
- bl sub_803D994
+ bl ZeroMonData
adds r4, 0x64
cmp r4, r5
ble _0811C082
@@ -12703,14 +12703,14 @@ _0811C096:
ble _0811C096
movs r0, 0x32
bl sub_8054E90
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r0, _0811C0D8 @ =gUnknown_20386AE
movs r2, 0xC0
lsls r2, 4
adds r1, r2, 0
strh r1, [r0]
ldr r0, _0811C0DC @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
pop {r4-r7}
pop {r0}
bx r0
@@ -12751,7 +12751,7 @@ sub_811C0E0: @ 811C0E0
lsrs r1, 24
adds r0, r5, 0
str r3, [sp, 0x14]
- bl sub_800445C
+ bl FillWindowPixelBuffer
mov r0, r8
str r0, [sp]
str r0, [sp, 0x4]
@@ -12805,7 +12805,7 @@ _0811C168:
movs r3, 0x2
bl sub_811C0E0
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -12835,9 +12835,9 @@ _0811C1AC:
thumb_func_start sub_811C1B4
sub_811C1B4: @ 811C1B4
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_811C1B4
@@ -12921,21 +12921,21 @@ _0811C1F0:
_0811C2C0:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _0811C350 @ =gUnknown_203B08C
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
movs r0, 0
bl sub_8001618
ldr r1, _0811C354 @ =gUnknown_8457194
movs r0, 0
movs r2, 0x1
bl sub_8001658
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r0, _0811C358 @ =gUnknown_8457198
bl sub_8003B24
lsls r0, 16
@@ -12945,13 +12945,13 @@ _0811C2C0:
_0811C300:
bl sub_8002C28
movs r0, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -12962,14 +12962,14 @@ _0811C300:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
movs r1, 0x1
movs r2, 0xD0
bl sub_814FF2C
bl sub_80F77B8
ldr r0, _0811C35C @ =sub_811C1B4
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r1, _0811C360 @ =gUnknown_30030F0
movs r0, 0x87
lsls r0, 3
@@ -13007,9 +13007,9 @@ _0811C38C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r1, _0811C3AC @ =gUnknown_30030F0
movs r0, 0x87
lsls r0, 3
@@ -13018,7 +13018,7 @@ _0811C38C:
.align 2, 0
_0811C3AC: .4byte gUnknown_30030F0
_0811C3B0:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _0811C3BC
@@ -13046,7 +13046,7 @@ _0811C3E2:
ldr r1, _0811C3F8 @ =gUnknown_2022618
movs r0, 0
movs r2, 0x20
- bl sub_800A448
+ bl SendBlock
ldr r1, _0811C3FC @ =gUnknown_30030F0
movs r2, 0x87
lsls r2, 3
@@ -13056,7 +13056,7 @@ _0811C3E2:
_0811C3F8: .4byte gUnknown_2022618
_0811C3FC: .4byte gUnknown_30030F0
_0811C400:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -13079,7 +13079,7 @@ _0811C40E:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0811C444 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -13092,7 +13092,7 @@ _0811C444: .4byte gUnknown_30030F0
_0811C448:
bl sub_800AAC0
ldr r4, _0811C46C @ =gUnknown_2022118
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 16
adds r0, r4
@@ -13116,12 +13116,12 @@ _0811C474:
movs r1, 0x8
_0811C47E:
strb r1, [r0]
- bl sub_800A550
+ bl ResetBlockReceivedFlags
b _0811C516
.align 2, 0
_0811C488: .4byte gUnknown_30030F0
_0811C48C:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0811C516
@@ -13139,7 +13139,7 @@ _0811C4A8:
cmp r0, 0
beq _0811C516
ldr r0, _0811C4BC @ =sub_811C04C
- bl sub_8000544
+ bl SetMainCallback2
b _0811C516
.align 2, 0
_0811C4BC: .4byte sub_811C04C
@@ -13151,13 +13151,13 @@ _0811C4C0:
bl sub_811C150
cmp r0, 0
beq _0811C516
- ldr r0, _0811C4E0 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0811C4E0 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _0811C516
.align 2, 0
_0811C4D8: .4byte gUnknown_203B08C
_0811C4DC: .4byte gUnknown_841E58D
-_0811C4E0: .4byte sub_80567DC
+_0811C4E0: .4byte c2_exit_to_overworld_2_switch
_0811C4E4:
ldr r0, _0811C4FC @ =gUnknown_3003F64
ldrb r0, [r0]
@@ -13181,14 +13181,14 @@ _0811C500:
bl sub_811C150
cmp r0, 0
beq _0811C516
- ldr r0, _0811C53C @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0811C53C @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
_0811C516:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
_0811C52A:
add sp, 0xC
pop {r4}
@@ -13197,7 +13197,7 @@ _0811C52A:
.align 2, 0
_0811C534: .4byte gUnknown_203B08C
_0811C538: .4byte gUnknown_841E572
-_0811C53C: .4byte sub_80567DC
+_0811C53C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_811C1C8
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/link_rfu_4.s b/asm/link_rfu_4.s
index efe87fd78..4596850ce 100644
--- a/asm/link_rfu_4.s
+++ b/asm/link_rfu_4.s
@@ -37,7 +37,7 @@ sub_8142420: @ 8142420
movs r1, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r4, 0x1
movs r1, 0x11
mov r10, r1
@@ -65,7 +65,7 @@ _0814245E:
movs r0, 0x3
movs r1, 0x1
lsrs r3, r5, 24
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _08142494
_08142480:
lsrs r2, r6, 24
@@ -76,7 +76,7 @@ _08142480:
movs r0, 0x3
movs r1, 0x2
lsrs r3, r5, 24
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_08142494:
movs r0, 0x80
lsls r0, 17
@@ -117,7 +117,7 @@ _081424C6:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _081424F6
_081424DE:
movs r0, 0x20
@@ -130,10 +130,10 @@ _081424DE:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_081424F6:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
@@ -149,7 +149,7 @@ sub_8142504: @ 8142504
bl sub_8008FCC
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r1, 0
str r1, [sp]
movs r0, 0x2
@@ -168,7 +168,7 @@ sub_8142504: @ 8142504
movs r2, 0xF
bl sub_8150048
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -185,9 +185,9 @@ _0814255C: .4byte gUnknown_8466EF0
sub_8142560: @ 8142560
push {lr}
movs r0, 0x1
- bl sub_815036C
+ bl rbox_fill_rectangle
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
movs r1, 0x1
bl sub_8003F20
@@ -195,8 +195,8 @@ sub_8142560: @ 8142560
bx r0
thumb_func_end sub_8142560
- thumb_func_start sub_814257C
-sub_814257C: @ 814257C
+ thumb_func_start mevent_0814257C
+mevent_0814257C: @ 814257C
push {r4,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -273,7 +273,7 @@ _08142606:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_814257C
+ thumb_func_end mevent_0814257C
thumb_func_start sub_8142610
sub_8142610: @ 8142610
@@ -468,14 +468,14 @@ _0814273A:
add r1, sp, 0x4
movs r2, 0x1
movs r3, 0xA
- bl sub_8106ED0
+ bl DoMysteryGiftListMenu
adds r4, r0, 0
movs r0, 0x1
negs r0, r0
cmp r4, r0
beq _0814278A
movs r0, 0x2
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x2
movs r1, 0x1
bl sub_8003F20
@@ -533,7 +533,7 @@ _081427E2:
strh r0, [r4]
ldrb r0, [r4]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r2, 0
str r2, [sp]
@@ -555,7 +555,7 @@ _081427E2:
movs r1, 0x2
bl sub_8003F20
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
b _0814287E
.align 2, 0
_08142828: .4byte gUnknown_8466D98
@@ -618,9 +618,9 @@ _0814288C:
movs r0, 0
strb r0, [r5]
ldrb r0, [r4]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
@@ -632,9 +632,9 @@ _081428C2:
movs r0, 0
strb r0, [r5]
ldrb r0, [r4]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
@@ -694,7 +694,7 @@ _08142934:
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r5]
movs r2, 0
str r2, [sp]
@@ -716,7 +716,7 @@ _08142934:
movs r1, 0x2
bl sub_8003F20
ldrb r0, [r5]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
@@ -761,7 +761,7 @@ _081429D4:
str r2, [sp]
movs r2, 0x1
movs r3, 0xA
- bl sub_8106ED0
+ bl DoMysteryGiftListMenu
adds r4, r0, 0
movs r0, 0x1
negs r0, r0
@@ -770,9 +770,9 @@ _081429D4:
movs r0, 0
strb r0, [r6]
ldrb r0, [r5]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r5]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
bl sub_8003F20
@@ -787,9 +787,9 @@ _08142A14:
movs r0, 0
strb r0, [r6]
ldrb r0, [r5]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r5]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r5]
movs r1, 0x1
bl sub_8003F20
@@ -835,9 +835,9 @@ sub_8142A58: @ 8142A58
_08142A68:
cmp r1, 0
bne _08142A80
- bl sub_8143D6C
+ bl sav1_get_mevent_buffer_1
adds r4, r0, 0
- bl sub_8143D80
+ bl sav1_get_mevent_buffer_2
adds r1, r0, 0
adds r0, r4, 0
bl sub_8145654
@@ -939,8 +939,8 @@ _08142B0E:
_08142B1C: .4byte gUnknown_841EC99
thumb_func_end sub_8142AFC
- thumb_func_start sub_8142B20
-sub_8142B20: @ 8142B20
+ thumb_func_start mevent_message_was_thrown_away
+mevent_message_was_thrown_away: @ 8142B20
push {lr}
cmp r1, 0
beq _08142B30
@@ -951,15 +951,15 @@ _08142B2C: .4byte gUnknown_841ED9C
_08142B30:
ldr r1, _08142B3C @ =gUnknown_841ED7B
_08142B32:
- bl sub_814257C
+ bl mevent_0814257C
pop {r1}
bx r1
.align 2, 0
_08142B3C: .4byte gUnknown_841ED7B
- thumb_func_end sub_8142B20
+ thumb_func_end mevent_message_was_thrown_away
- thumb_func_start sub_8142B40
-sub_8142B40: @ 8142B40
+ thumb_func_start mevent_save_game
+mevent_save_game: @ 8142B40
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4]
@@ -987,7 +987,7 @@ _08142B6C:
_08142B74: .4byte gUnknown_841ED2F
_08142B78:
movs r0, 0
- bl sub_80DA364
+ bl TrySavingData
b _08142B98
_08142B80:
ldr r0, _08142B88 @ =gUnknown_841ED50
@@ -1021,10 +1021,10 @@ _08142BB2:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8142B40
+ thumb_func_end mevent_save_game
- thumb_func_start sub_8142BB8
-sub_8142BB8: @ 8142BB8
+ thumb_func_start mevent_message
+mevent_message: @ 8142BB8
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
@@ -1176,10 +1176,10 @@ _08142CE0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8142BB8
+ thumb_func_end mevent_message
- thumb_func_start sub_8142CE8
-sub_8142CE8: @ 8142CE8
+ thumb_func_start mevent_08142CE8
+mevent_08142CE8: @ 8142CE8
push {r4-r6,lr}
adds r6, r0, 0
adds r0, r1, 0
@@ -1203,7 +1203,7 @@ _08142D06:
_08142D0E:
movs r0, 0x81
lsls r0, 1
- bl sub_8071C60
+ bl PlayFanfare
strh r4, [r5]
b _08142D28
_08142D1A:
@@ -1220,7 +1220,7 @@ _08142D28:
strb r0, [r6]
b _08142D46
_08142D30:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08142D46
@@ -1235,10 +1235,10 @@ _08142D48:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8142CE8
+ thumb_func_end mevent_08142CE8
- thumb_func_start sub_8142D50
-sub_8142D50: @ 8142D50
+ thumb_func_start mevent_message_stamp_card_etc_send_status
+mevent_message_stamp_card_etc_send_status: @ 8142D50
push {r4,lr}
adds r3, r0, 0
ldr r1, _08142D6C @ =gUnknown_841E7BC
@@ -1342,7 +1342,7 @@ _08142E12:
bx r1
.align 2, 0
_08142E1C: .4byte gUnknown_841EC6A
- thumb_func_end sub_8142D50
+ thumb_func_end mevent_message_stamp_card_etc_send_status
thumb_func_start sub_8142E20
sub_8142E20: @ 8142E20
@@ -1355,18 +1355,18 @@ sub_8142E20: @ 8142E20
lsls r1, 24
lsrs r1, 24
mov r0, sp
- bl sub_8142D50
+ bl mevent_message_stamp_card_etc_send_status
adds r1, r0, 0
ldr r0, [sp]
cmp r0, 0
bne _08142E46
adds r0, r4, 0
- bl sub_814257C
+ bl mevent_0814257C
b _08142E4E
_08142E46:
adds r0, r4, 0
adds r2, r5, 0
- bl sub_8142CE8
+ bl mevent_08142CE8
_08142E4E:
add sp, 0x4
pop {r4,r5}
@@ -1374,12 +1374,12 @@ _08142E4E:
bx r1
thumb_func_end sub_8142E20
- thumb_func_start sub_8142E58
-sub_8142E58: @ 8142E58
+ thumb_func_start task_add_00_mystery_gift
+task_add_00_mystery_gift: @ 8142E58
push {r4,lr}
ldr r0, _08142E98 @ =sub_8142EA0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -1401,7 +1401,7 @@ sub_8142E58: @ 8142E58
strh r0, [r4, 0x6]
strb r1, [r4, 0xE]
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x10]
pop {r4}
pop {r0}
@@ -1409,7 +1409,7 @@ sub_8142E58: @ 8142E58
.align 2, 0
_08142E98: .4byte sub_8142EA0
_08142E9C: .4byte gUnknown_3005098
- thumb_func_end sub_8142E58
+ thumb_func_end task_add_00_mystery_gift
thumb_func_start sub_8142EA0
sub_8142EA0: @ 8142EA0
@@ -1530,7 +1530,7 @@ _08142FC0:
adds r0, 0x9
ldr r1, _08142FE0 @ =gUnknown_841E6DC
_08142FC6:
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _08142FD0
b _081435C6
@@ -1704,7 +1704,7 @@ _08143118:
.4byte _0814313A
.4byte _0814312C
_0814312C:
- bl sub_80FA28C
+ bl task_add_05_task_del_08FA224_when_no_RfuFunc
ldrh r0, [r5]
strb r0, [r5, 0xE]
movs r0, 0xD
@@ -1732,7 +1732,7 @@ _0814315C:
strb r0, [r5, 0x8]
ldr r0, _0814316C @ =gUnknown_2021CD0
ldr r1, _08143170 @ =gUnknown_2022744
- bl sub_8008D84
+ bl StringCopy
b _081435C6
.align 2, 0
_0814316C: .4byte gUnknown_2021CD0
@@ -1760,7 +1760,7 @@ _08143198:
bl sub_8144B58
adds r1, r0, 0
adds r0, r4, 0
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _081431AE
b _081435C6
@@ -1848,7 +1848,7 @@ _08143242:
bne _08143250
ldr r0, _0814325C @ =gUnknown_2021CD0
ldr r1, _08143260 @ =gUnknown_2022744
- bl sub_8008D84
+ bl StringCopy
_08143250:
movs r0, 0xF
strb r0, [r5, 0x8]
@@ -1862,7 +1862,7 @@ _08143264:
ldrb r2, [r5, 0xD]
ldrb r3, [r5, 0xE]
mov r0, sp
- bl sub_8142BB8
+ bl mevent_message
adds r1, r0, 0
cmp r1, 0
bne _08143278
@@ -1874,12 +1874,12 @@ _08143278:
adds r0, r5, 0
adds r0, 0x9
adds r2, r5, 0
- bl sub_8142CE8
+ bl mevent_08142CE8
b _08143292
_0814328A:
adds r0, r5, 0
adds r0, 0x9
- bl sub_814257C
+ bl mevent_0814257C
_08143292:
adds r1, r0, 0
cmp r1, 0
@@ -1910,7 +1910,7 @@ _081432BC:
_081432C2:
adds r0, r5, 0
adds r0, 0x9
- bl sub_8142B40
+ bl mevent_save_game
b _08143596
_081432CC:
adds r0, r5, 0
@@ -2096,7 +2096,7 @@ _08143416:
_08143422:
adds r0, r5, 0
adds r0, 0x9
- bl sub_8142B40
+ bl mevent_save_game
cmp r0, 0
bne _08143430
b _081435C6
@@ -2108,7 +2108,7 @@ _08143436:
adds r0, r5, 0
adds r0, 0x9
ldrb r1, [r5, 0xC]
- bl sub_8142B20
+ bl mevent_message_was_thrown_away
b _08143596
_08143442:
ldrb r0, [r5, 0xC]
@@ -2227,10 +2227,10 @@ _08143514:
strb r0, [r5, 0x8]
b _081435C6
_08143528:
- bl sub_80FA28C
+ bl task_add_05_task_del_08FA224_when_no_RfuFunc
ldr r0, _0814353C @ =gUnknown_2021CD0
ldr r1, _08143540 @ =gUnknown_2022760
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x22
strb r0, [r5, 0x8]
b _081435C6
@@ -2274,7 +2274,7 @@ _0814358C:
adds r0, r5, 0
adds r0, 0x9
ldr r1, _081435A8 @ =gUnknown_841E7BC
- bl sub_814257C
+ bl mevent_0814257C
_08143596:
cmp r0, 0
beq _081435C6
@@ -2291,11 +2291,11 @@ _081435AC:
bl sub_80098B8
bl sub_812B484
ldr r0, [r5, 0x10]
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _081435D0 @ =sub_81422FC
- bl sub_8000544
+ bl SetMainCallback2
_081435C6:
add sp, 0x4
pop {r4,r5}
diff --git a/asm/list_menu.s b/asm/list_menu.s
index d5fdd40f7..c29c0a09c 100644
--- a/asm/list_menu.s
+++ b/asm/list_menu.s
@@ -10,8 +10,8 @@ nullsub_90: @ 8106ECC
bx lr
thumb_func_end nullsub_90
- thumb_func_start sub_8106ED0
-sub_8106ED0: @ 8106ED0
+ thumb_func_start DoMysteryGiftListMenu
+DoMysteryGiftListMenu: @ 8106ED0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -74,7 +74,7 @@ _08106F34:
strb r1, [r0, 0x10]
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
strb r0, [r4, 0x6]
ldrb r0, [r4, 0x5]
movs r1, 0x1
@@ -87,7 +87,7 @@ _08106F60: .4byte gUnknown_203ACF4
_08106F64: .4byte gUnknown_3005E70
_08106F68:
ldrb r0, [r5, 0x6]
- bl sub_8107078
+ bl ListMenuHandleInput
str r0, [r5]
ldr r1, _08106FA4 @ =gUnknown_30030F0
ldrh r0, [r1, 0x2E]
@@ -114,7 +114,7 @@ _08106F92:
cmp r6, 0
bne _08106FA8
ldrb r0, [r5, 0x5]
- bl sub_80040B8
+ bl ClearWindowTilemap
b _08106FBA
.align 2, 0
_08106FA4: .4byte gUnknown_30030F0
@@ -158,22 +158,22 @@ _08106FE8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8106ED0
+ thumb_func_end DoMysteryGiftListMenu
- thumb_func_start sub_8106FF8
-sub_8106FF8: @ 8106FF8
+ thumb_func_start ListMenuInit
+ListMenuInit: @ 8106FF8
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 16
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
- bl sub_8107348
+ bl ListMenuInitInternal
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldrb r0, [r5, 0x10]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0x10]
movs r1, 0x2
bl sub_8003F20
@@ -181,10 +181,10 @@ sub_8106FF8: @ 8106FF8
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8106FF8
+ thumb_func_end ListMenuInit
- thumb_func_start sub_8107024
-sub_8107024: @ 8107024
+ thumb_func_start Unused_ListMenuInit2
+Unused_ListMenuInit2: @ 8107024
push {r4-r7,lr}
sub sp, 0x8
adds r6, r0, 0
@@ -195,7 +195,7 @@ sub_8107024: @ 8107024
lsrs r1, 16
lsls r2, 16
lsrs r2, 16
- bl sub_8107348
+ bl ListMenuInitInternal
lsls r0, 24
lsrs r7, r0, 24
ldrb r0, [r4, 0x4]
@@ -211,7 +211,7 @@ _08107048:
str r4, [sp]
ldrb r4, [r5, 0x4]
str r4, [sp, 0x4]
- bl sub_8004000
+ bl PutWindowRectTilemapOverridePalette
adds r5, 0x8
ldrb r0, [r5, 0x4]
cmp r0, 0xFF
@@ -225,10 +225,10 @@ _08107064:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8107024
+ thumb_func_end Unused_ListMenuInit2
- thumb_func_start sub_8107078
-sub_8107078: @ 8107078
+ thumb_func_start ListMenuHandleInput
+ListMenuHandleInput: @ 8107078
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -331,14 +331,14 @@ _08107122:
_0810712C:
movs r3, 0x1
_0810712E:
- bl sub_810799C
+ bl ListMenuChangeSelection
_08107132:
movs r0, 0x1
negs r0, r0
_08107136:
pop {r1}
bx r1
- thumb_func_end sub_8107078
+ thumb_func_end ListMenuHandleInput
thumb_func_start sub_810713C
sub_810713C: @ 810713C
@@ -368,10 +368,10 @@ _08107160:
ldrb r1, [r1, 0x17]
lsrs r1, 6
subs r1, 0x2
- bl sub_8133CD4
+ bl ListMenuRemoveCursorObject
_08107170:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -395,14 +395,14 @@ sub_8107180: @ 8107180
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrh r1, [r4, 0x18]
ldrh r3, [r4, 0xE]
adds r0, r4, 0
movs r2, 0
- bl sub_81074DC
+ bl ListMenuPrintEntries
adds r0, r4, 0
- bl sub_8107594
+ bl ListMenuDrawCursor
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
@@ -508,7 +508,7 @@ sub_8107244: @ 8107244
movs r1, 0
movs r2, 0x1
movs r3, 0
- bl sub_810799C
+ bl ListMenuChangeSelection
_08107278:
cmp r4, 0x80
bne _08107288
@@ -516,7 +516,7 @@ _08107278:
movs r1, 0
movs r2, 0x1
movs r3, 0x1
- bl sub_810799C
+ bl ListMenuChangeSelection
_08107288:
cmp r5, 0
beq _08107292
@@ -563,8 +563,8 @@ _081072CA:
_081072D0: .4byte gUnknown_3005098
thumb_func_end sub_81072AC
- thumb_func_start sub_81072D4
-sub_81072D4: @ 81072D4
+ thumb_func_start get_coro_args_x18_x1A
+get_coro_args_x18_x1A: @ 81072D4
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -588,10 +588,10 @@ _081072F6:
bx r0
.align 2, 0
_081072FC: .4byte gUnknown_3005098
- thumb_func_end sub_81072D4
+ thumb_func_end get_coro_args_x18_x1A
- thumb_func_start sub_8107300
-sub_8107300: @ 8107300
+ thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
+ListMenuGetYCoordForPrintingArrowCursor: @ 8107300
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -626,10 +626,10 @@ sub_8107300: @ 8107300
bx r1
.align 2, 0
_08107344: .4byte gUnknown_3005098
- thumb_func_end sub_8107300
+ thumb_func_end ListMenuGetYCoordForPrintingArrowCursor
- thumb_func_start sub_8107348
-sub_8107348: @ 8107348
+ thumb_func_start ListMenuInitInternal
+ListMenuInitInternal: @ 8107348
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -642,7 +642,7 @@ sub_8107348: @ 8107348
lsrs r6, 16
ldr r0, _08107418 @ =nullsub_90
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -712,17 +712,17 @@ _081073E0:
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrh r1, [r7, 0x18]
ldrh r3, [r7, 0xE]
adds r0, r7, 0
movs r2, 0
- bl sub_81074DC
+ bl ListMenuPrintEntries
adds r0, r7, 0
- bl sub_8107594
+ bl ListMenuDrawCursor
adds r0, r7, 0
movs r1, 0x1
- bl sub_8107A74
+ bl ListMenuCallSelectionChangedCallback
mov r0, r8
pop {r3}
mov r8, r3
@@ -734,10 +734,10 @@ _08107418: .4byte nullsub_90
_0810741C: .4byte gUnknown_3005098
_08107420: .4byte gUnknown_3005E60
_08107424: .4byte 0xfffc0fff
- thumb_func_end sub_8107348
+ thumb_func_end ListMenuInitInternal
- thumb_func_start sub_8107428
-sub_8107428: @ 8107428
+ thumb_func_start ListMenuPrint
+ListMenuPrint: @ 8107428
push {r4-r7,lr}
sub sp, 0x18
adds r4, r0, 0
@@ -826,10 +826,10 @@ _081074D2:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8107428
+ thumb_func_end ListMenuPrint
- thumb_func_start sub_81074DC
-sub_81074DC: @ 81074DC
+ thumb_func_start ListMenuPrintEntries
+ListMenuPrintEntries: @ 81074DC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -905,7 +905,7 @@ _08107562:
adds r0, r4, 0
adds r2, r6, 0
adds r3, r7, 0
- bl sub_8107428
+ bl ListMenuPrint
mov r0, r9
adds r0, 0x1
lsls r0, 16
@@ -924,10 +924,10 @@ _08107584:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_81074DC
+ thumb_func_end ListMenuPrintEntries
- thumb_func_start sub_8107594
-sub_8107594: @ 8107594
+ thumb_func_start ListMenuDrawCursor
+ListMenuDrawCursor: @ 8107594
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -973,7 +973,7 @@ _081075E4:
adds r0, r6, 0
mov r2, r8
adds r3, r7, 0
- bl sub_8107428
+ bl ListMenuPrint
b _08107680
.align 2, 0
_081075F4: .4byte gUnknown_841623B
@@ -983,7 +983,7 @@ _081075F8:
bne _08107608
adds r0, r6, 0
movs r1, 0
- bl sub_810768C
+ bl ListMenuAddCursorObject
strb r0, [r6, 0x1E]
_08107608:
ldrb r5, [r6, 0x1E]
@@ -1007,7 +1007,7 @@ _08107608:
adds r0, r5, 0
adds r1, r4, 0
movs r3, 0
- bl sub_8133CAC
+ bl ListMenuUpdateCursorObject
b _08107680
.align 2, 0
_0810763C: .4byte 0xffff0000
@@ -1017,7 +1017,7 @@ _08107640:
bne _08107650
adds r0, r6, 0
movs r1, 0x1
- bl sub_810768C
+ bl ListMenuAddCursorObject
strb r0, [r6, 0x1E]
_08107650:
ldrb r5, [r6, 0x1E]
@@ -1040,17 +1040,17 @@ _08107650:
adds r0, r5, 0
adds r1, r4, 0
movs r3, 0x1
- bl sub_8133CAC
+ bl ListMenuUpdateCursorObject
_08107680:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8107594
+ thumb_func_end ListMenuDrawCursor
- thumb_func_start sub_810768C
-sub_810768C: @ 810768C
+ thumb_func_start ListMenuAddCursorObject
+ListMenuAddCursorObject: @ 810768C
push {r4,r5,lr}
sub sp, 0xC
adds r4, r0, 0
@@ -1086,7 +1086,7 @@ sub_810768C: @ 810768C
strb r0, [r1, 0xA]
mov r0, sp
adds r1, r5, 0
- bl sub_8133C90
+ bl ListMenuAddCursorObjectInternal
lsls r0, 24
lsrs r0, 24
add sp, 0xC
@@ -1095,10 +1095,10 @@ sub_810768C: @ 810768C
bx r1
.align 2, 0
_081076E8: .4byte 0x0000ffff
- thumb_func_end sub_810768C
+ thumb_func_end ListMenuAddCursorObject
- thumb_func_start sub_81076EC
-sub_81076EC: @ 81076EC
+ thumb_func_start ListMenuErasePrintedCursor
+ListMenuErasePrintedCursor: @ 81076EC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1156,7 +1156,7 @@ sub_81076EC: @ 81076EC
str r5, [sp]
str r0, [sp, 0x4]
adds r0, r6, 0
- bl sub_8004378
+ bl FillWindowPixelRect
_08107768:
add sp, 0x8
pop {r3}
@@ -1164,10 +1164,10 @@ _08107768:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_81076EC
+ thumb_func_end ListMenuErasePrintedCursor
- thumb_func_start sub_8107774
-sub_8107774: @ 8107774
+ thumb_func_start ListMenuUpdateSelectedRowIndexAndScrollOffset
+ListMenuUpdateSelectedRowIndexAndScrollOffset: @ 8107774
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 24
@@ -1304,10 +1304,10 @@ _0810785C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8107774
+ thumb_func_end ListMenuUpdateSelectedRowIndexAndScrollOffset
- thumb_func_start sub_8107864
-sub_8107864: @ 8107864
+ thumb_func_start ListMenuScroll
+ListMenuScroll: @ 8107864
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1328,12 +1328,12 @@ sub_8107864: @ 8107864
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrh r1, [r6, 0x18]
ldrh r3, [r6, 0xE]
adds r0, r6, 0
movs r2, 0
- bl sub_81074DC
+ bl ListMenuPrintEntries
b _0810798E
_0810789E:
ldrb r0, [r6, 0x17]
@@ -1361,12 +1361,12 @@ _0810789E:
orrs r3, r1
lsrs r3, 24
movs r1, 0x1
- bl sub_80044A8
+ bl ScrollWindow
ldrh r1, [r6, 0x18]
adds r0, r6, 0
movs r2, 0
adds r3, r5, 0
- bl sub_81074DC
+ bl ListMenuPrintEntries
ldrh r0, [r6, 0xE]
adds r1, r0, 0
muls r1, r4
@@ -1401,7 +1401,7 @@ _0810789E:
adds r0, r3, 0
movs r2, 0
adds r3, r4, 0
- bl sub_8004378
+ bl FillWindowPixelRect
b _0810798E
_08107930:
ldrb r0, [r6, 0x10]
@@ -1415,7 +1415,7 @@ _08107930:
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl sub_80044A8
+ bl ScrollWindow
ldrh r2, [r6, 0xE]
subs r2, r7
ldrh r1, [r6, 0x18]
@@ -1426,7 +1426,7 @@ _08107930:
lsrs r2, 16
adds r0, r6, 0
adds r3, r7, 0
- bl sub_81074DC
+ bl ListMenuPrintEntries
ldrb r0, [r6, 0x10]
movs r1, 0x3
bl sub_8004950
@@ -1446,7 +1446,7 @@ _08107930:
adds r0, r3, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
_0810798E:
add sp, 0x8
pop {r3}
@@ -1454,10 +1454,10 @@ _0810798E:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8107864
+ thumb_func_end ListMenuScroll
- thumb_func_start sub_810799C
-sub_810799C: @ 810799C
+ thumb_func_start ListMenuChangeSelection
+ListMenuChangeSelection: @ 810799C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1502,7 +1502,7 @@ _081079CE:
_081079EA:
adds r0, r4, 0
mov r1, r9
- bl sub_8107774
+ bl ListMenuUpdateSelectedRowIndexAndScrollOffset
lsls r0, 24
lsrs r0, 24
orrs r5, r0
@@ -1529,12 +1529,12 @@ _08107A16:
_08107A1A:
adds r0, r4, 0
mov r1, r10
- bl sub_81076EC
+ bl ListMenuErasePrintedCursor
adds r0, r4, 0
- bl sub_8107594
+ bl ListMenuDrawCursor
adds r0, r4, 0
movs r1, 0
- bl sub_8107A74
+ bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
@@ -1542,16 +1542,16 @@ _08107A1A:
_08107A3A:
adds r0, r4, 0
mov r1, r10
- bl sub_81076EC
+ bl ListMenuErasePrintedCursor
adds r0, r4, 0
adds r1, r7, 0
mov r2, r9
- bl sub_8107864
+ bl ListMenuScroll
adds r0, r4, 0
- bl sub_8107594
+ bl ListMenuDrawCursor
adds r0, r4, 0
movs r1, 0
- bl sub_8107A74
+ bl ListMenuCallSelectionChangedCallback
ldrb r0, [r4, 0x10]
movs r1, 0x2
bl sub_8003F20
@@ -1566,10 +1566,10 @@ _08107A64:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_810799C
+ thumb_func_end ListMenuChangeSelection
- thumb_func_start sub_8107A74
-sub_8107A74: @ 8107A74
+ thumb_func_start ListMenuCallSelectionChangedCallback
+ListMenuCallSelectionChangedCallback: @ 8107A74
push {r4,lr}
adds r2, r0, 0
lsls r1, 24
@@ -1590,7 +1590,7 @@ _08107A96:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8107A74
+ thumb_func_end ListMenuCallSelectionChangedCallback
thumb_func_start sub_8107A9C
sub_8107A9C: @ 8107A9C
@@ -1909,7 +1909,7 @@ sub_8107CD8: @ 8107CD8
bl sub_80971CC
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -1933,7 +1933,7 @@ sub_8107CF8: @ 8107CF8
lsls r5, 16
lsrs r5, 16
movs r2, 0x1
- bl sub_8097054
+ bl GetMonIconPtr
adds r1, r0, 0
movs r0, 0x20
str r0, [sp]
@@ -1941,7 +1941,7 @@ sub_8107CF8: @ 8107CF8
adds r0, r6, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_80041B8
+ bl BlitBitmapToWindow
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1969,7 +1969,7 @@ _08107D54:
_08107D56:
adds r1, r2, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -2006,7 +2006,7 @@ sub_8107D68: @ 8107D68
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
add sp, 0x18
pop {r4,r5}
pop {r0}
diff --git a/asm/load_save.s b/asm/load_save.s
index 570d44cfa..e5370e2b7 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_804BFE4
-sub_804BFE4: @ 804BFE4
+ thumb_func_start CheckForFlashMemory
+CheckForFlashMemory: @ 804BFE4
push {lr}
bl IdentifyFlash
lsls r0, 16
@@ -28,10 +28,10 @@ _0804C006:
bx r0
.align 2, 0
_0804C00C: .4byte gUnknown_3005004
- thumb_func_end sub_804BFE4
+ thumb_func_end CheckForFlashMemory
- thumb_func_start sub_804C010
-sub_804C010: @ 804C010
+ thumb_func_start ClearSav2
+ClearSav2: @ 804C010
push {lr}
sub sp, 0x4
mov r1, sp
@@ -47,10 +47,10 @@ sub_804C010: @ 804C010
.align 2, 0
_0804C02C: .4byte gUnknown_2024588
_0804C030: .4byte 0x010007d2
- thumb_func_end sub_804C010
+ thumb_func_end ClearSav2
- thumb_func_start sub_804C034
-sub_804C034: @ 804C034
+ thumb_func_start ClearSav1
+ClearSav1: @ 804C034
push {lr}
sub sp, 0x4
mov r1, sp
@@ -66,14 +66,14 @@ sub_804C034: @ 804C034
.align 2, 0
_0804C050: .4byte gUnknown_202552C
_0804C054: .4byte 0x01001ef4
- thumb_func_end sub_804C034
+ thumb_func_end ClearSav1
thumb_func_start sub_804C058
sub_804C058: @ 804C058
push {r4,r5,lr}
ldr r4, _0804C08C @ =gUnknown_3005008
ldr r5, [r4]
- bl sub_8044EC8
+ bl Random
movs r1, 0x7C
ands r1, r0
ldr r2, _0804C090 @ =gUnknown_300500C
@@ -159,14 +159,14 @@ sub_804C0A4: @ 804C0A4
movs r1, 0xE0
lsls r1, 9
adds r0, r5, 0
- bl sub_8002B80
+ bl InitHeap
ldr r0, [sp, 0x4]
str r0, [r4, 0x10]
ldr r1, [sp]
str r1, [r4, 0xC]
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
@@ -200,8 +200,8 @@ _0804C180: .4byte 0x000083d0
_0804C184: .4byte gHeap + 0x4c8c
thumb_func_end sub_804C0A4
- thumb_func_start sub_804C188
-sub_804C188: @ 804C188
+ thumb_func_start sav2_x1_query_bit1
+sav2_x1_query_bit1: @ 804C188
ldr r0, _0804C194 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r1, [r0, 0x9]
@@ -210,10 +210,10 @@ sub_804C188: @ 804C188
bx lr
.align 2, 0
_0804C194: .4byte gUnknown_300500C
- thumb_func_end sub_804C188
+ thumb_func_end sav2_x1_query_bit1
- thumb_func_start sub_804C198
-sub_804C198: @ 804C198
+ thumb_func_start sav2_x9_clear_bit1
+sav2_x9_clear_bit1: @ 804C198
ldr r0, _0804C1A8 @ =gUnknown_300500C
ldr r2, [r0]
ldrb r1, [r2, 0x9]
@@ -223,7 +223,7 @@ sub_804C198: @ 804C198
bx lr
.align 2, 0
_0804C1A8: .4byte gUnknown_300500C
- thumb_func_end sub_804C198
+ thumb_func_end sav2_x9_clear_bit1
thumb_func_start sub_804C1AC
sub_804C1AC: @ 804C1AC
@@ -255,8 +255,8 @@ sub_804C1C0: @ 804C1C0
_0804C1D8: .4byte gUnknown_300500C
thumb_func_end sub_804C1C0
- thumb_func_start sub_804C1DC
-sub_804C1DC: @ 804C1DC
+ thumb_func_start sav2_gender2_inplace_and_xFE
+sav2_gender2_inplace_and_xFE: @ 804C1DC
ldr r0, _0804C1EC @ =gUnknown_300500C
ldr r2, [r0]
ldrb r1, [r2, 0x9]
@@ -266,10 +266,10 @@ sub_804C1DC: @ 804C1DC
bx lr
.align 2, 0
_0804C1EC: .4byte gUnknown_300500C
- thumb_func_end sub_804C1DC
+ thumb_func_end sav2_gender2_inplace_and_xFE
- thumb_func_start sub_804C1F0
-sub_804C1F0: @ 804C1F0
+ thumb_func_start copy_player_party_to_sav1
+copy_player_party_to_sav1: @ 804C1F0
push {r4,lr}
ldr r0, _0804C224 @ =gUnknown_3005008
ldr r0, [r0]
@@ -299,7 +299,7 @@ _0804C200:
_0804C224: .4byte gUnknown_3005008
_0804C228: .4byte gUnknown_2024029
_0804C22C: .4byte gUnknown_2024284
- thumb_func_end sub_804C1F0
+ thumb_func_end copy_player_party_to_sav1
thumb_func_start sub_804C230
sub_804C230: @ 804C230
@@ -418,7 +418,7 @@ _0804C2FC: .4byte gUnknown_2036E38
thumb_func_start sub_804C300
sub_804C300: @ 804C300
push {lr}
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_804C270
pop {r0}
bx r0
diff --git a/asm/m4a_1.s b/asm/m4a_1.s
index 849cf5c2d..e78c3e69b 100644
--- a/asm/m4a_1.s
+++ b/asm/m4a_1.s
@@ -304,7 +304,7 @@ _081DD044:
ldrb r0, [r4, o_SoundChannel_type]
tst r0, 0x30
beq _081DD068
- bl sub_81DD264
+ bl sub_81DC460
b _081DD228
_081DD068:
mov r10, r10, lsl 16
@@ -467,8 +467,8 @@ _081DD25E:
.pool
thumb_func_end SoundMainRAM
- arm_func_start sub_81DD264
-sub_81DD264:
+ arm_func_start sub_81DC460
+sub_81DC460:
ldr r6, [r4, o_SoundChannel_wav]
ldrb r0, [r4, o_SoundChannel_status]
tst r0, 0x20
@@ -507,10 +507,10 @@ _081DD2B4:
ldrb r0, [r4, o_SoundChannel_type]
tst r0, 0x10
bne _081DD3C0
- bl sub_81DD520
+ bl sub_81DC71C
mov r0, r1
add r3, r3, 0x1
- bl sub_81DD520
+ bl sub_81DC71C
sub r1, r1, r0
_081DD308:
ldr r6, [r5]
@@ -536,11 +536,11 @@ _081DD310:
b _081DD364
_081DD358:
add r3, r3, lr
- bl sub_81DD520
+ bl sub_81DC71C
mov r0, r1
_081DD364:
add r3, r3, 0x1
- bl sub_81DD520
+ bl sub_81DC71C
sub r1, r1, r0
_081DD370:
adds r5, r5, 0x40000000
@@ -567,10 +567,10 @@ _081DD3B0:
b _081DD3B0
_081DD3C0:
sub r3, r3, 0x1
- bl sub_81DD520
+ bl sub_81DC71C
mov r0, r1
sub r3, r3, 0x1
- bl sub_81DD520
+ bl sub_81DC71C
sub r1, r1, r0
_081DD3D8:
ldr r6, [r5]
@@ -596,11 +596,11 @@ _081DD3E0:
b _081DD434
_081DD428:
sub r3, r3, lr
- bl sub_81DD520
+ bl sub_81DC71C
mov r0, r1
_081DD434:
sub r3, r3, 0x1
- bl sub_81DD520
+ bl sub_81DC71C
sub r1, r1, r0
_081DD440:
adds r5, r5, 0x40000000
@@ -665,10 +665,10 @@ _081DD4F4:
str r7, [r5, 0x630]
str r6, [r5], 0x4
pop {r8,r12,pc}
- arm_func_end sub_81DD264
+ arm_func_end sub_81DC460
- arm_func_start sub_81DD520
-sub_81DD520:
+ arm_func_start sub_81DC71C
+sub_81DC71C:
push {r0,r2,r5-r7,lr}
mov r0, r3, lsr 6
ldr r1, [r4, o_SoundChannel_xpi]
@@ -706,7 +706,7 @@ _081DD594:
ldrsb r1, [r5, r0]
pop {r0,r2,r5-r7,pc}
.pool
- arm_func_end sub_81DD520
+ arm_func_end sub_81DC71C
thumb_func_start SoundMainBTM
SoundMainBTM:
diff --git a/asm/mail.s b/asm/mail.s
index 692bb9793..104eb2c16 100644
--- a/asm/mail.s
+++ b/asm/mail.s
@@ -15,7 +15,7 @@ sub_80BEBEC: @ 80BEBEC
lsrs r6, r2, 24
ldr r4, _080BEC38 @ =gUnknown_20399C4
ldr r0, _080BEC3C @ =0x000020fc
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
adds r0, 0xED
movs r1, 0x2
@@ -145,7 +145,7 @@ _080BECF0:
adds r0, 0xC
strb r6, [r0]
ldr r0, _080BED14 @ =sub_80BF110
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -199,11 +199,11 @@ _080BED40:
.4byte _080BF0A4
_080BED8C:
movs r0, 0
- bl sub_80006F4
- bl sub_8087E64
+ bl SetVBlankCallback
+ bl remove_some_task
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080BEDB0 @ =gUnknown_203AAC4
ldrb r0, [r0, 0x9]
cmp r0, 0
@@ -230,47 +230,47 @@ _080BEDBC:
.align 2, 0
_080BEDD0: .4byte 0x01000200
_080BEDD4:
- bl sub_8070528
+ bl ResetPaletteFade
b _080BF0F4
_080BEDDA:
- bl sub_80773BC
+ bl ResetTasks
b _080BF0F4
_080BEDE0:
- bl sub_8006B10
+ bl ResetSpriteData
b _080BF0F4
_080BEDE6:
- bl sub_80088F0
- bl sub_80F6808
+ bl FreeAllSpritePalettes
+ bl reset_temp_tile_data_buffers
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080BF0F4
_080BEE40:
movs r0, 0
@@ -283,12 +283,12 @@ _080BEE40:
ldr r1, [r4]
adds r1, 0xFC
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _080BEE74 @ =0x000010fc
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
b _080BF0F4
.align 2, 0
_080BEE6C: .4byte gUnknown_83EE998
@@ -318,13 +318,13 @@ _080BEE88:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _080BF0F4
.align 2, 0
_080BEEB0: .4byte gUnknown_83EE9C8
_080BEEB4: .4byte gUnknown_20399C4
_080BEEB8:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _080BEEC4
@@ -340,14 +340,14 @@ _080BEEC6:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r2, _080BEF0C @ =gUnknown_83EE9C8
ldr r0, _080BEF10 @ =gUnknown_20399C4
ldr r0, [r0]
@@ -362,25 +362,25 @@ _080BEEC6:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _080BF0F4
.align 2, 0
_080BEF0C: .4byte gUnknown_83EE9C8
_080BEF10: .4byte gUnknown_20399C4
_080BEF14:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080BF0F4
_080BEF28:
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r6, _080BEFD0 @ =gUnknown_20371F8
ldr r4, _080BEFD4 @ =gUnknown_83EE9C8
ldr r0, _080BEFD8 @ =gUnknown_20399C4
@@ -431,7 +431,7 @@ _080BEF28:
ldr r0, [r0]
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _080BEFE0 @ =gUnknown_83EE9C0
ldr r0, _080BEFE4 @ =gUnknown_300500C
ldr r2, [r0]
@@ -496,7 +496,7 @@ _080BF01C:
b _080BF102
_080BF026:
ldr r0, _080BF038 @ =sub_80BF354
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r2, _080BF03C @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
@@ -559,20 +559,20 @@ _080BF0A4:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r2, _080BF0E8 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -618,7 +618,7 @@ _080BF112:
cmp r0, 0x1
bne _080BF12C
ldr r0, _080BF128 @ =sub_80BF368
- bl sub_8000544
+ bl SetMainCallback2
b _080BF138
.align 2, 0
_080BF128: .4byte sub_80BF368
@@ -696,12 +696,12 @@ _080BF19C:
adds r1, 0xE4
ldr r1, [r1]
adds r1, 0x12
- bl sub_8008D84
+ bl StringCopy
ldr r1, _080BF1E4 @ =gUnknown_841E234
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
adds r0, 0xD0
- bl sub_8008E08
+ bl StringLength
ldr r2, [r4]
adds r1, r2, 0
adds r1, 0xF8
@@ -723,10 +723,10 @@ _080BF1E8:
adds r1, 0xE4
ldr r1, [r1]
adds r1, 0x12
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
adds r0, 0xD0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
@@ -734,7 +734,7 @@ _080BF1E8:
ldr r0, [r4]
adds r0, 0xD0
movs r1, 0x1
- bl sub_80093BC
+ bl ConvertInternationalString
_080BF210:
ldr r0, [r4]
adds r1, r0, 0
@@ -758,15 +758,15 @@ sub_80BF224: @ 80BF224
sub sp, 0xC
movs r7, 0
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r6, 0
ldr r0, _080BF348 @ =gUnknown_20399C4
mov r9, r0
@@ -898,9 +898,9 @@ _080BF350: .4byte gUnknown_841E234
thumb_func_start sub_80BF354
sub_80BF354: @ 80BF354
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80BF354
@@ -914,8 +914,8 @@ sub_80BF368: @ 80BF368
ldrb r0, [r0]
cmp r0, 0
beq _080BF37E
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
_080BF37E:
ldr r0, [r4]
adds r0, 0xE0
@@ -931,7 +931,7 @@ _080BF390: .4byte gUnknown_20399C4
thumb_func_start sub_80BF394
sub_80BF394: @ 80BF394
push {lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080BF3AA
@@ -964,7 +964,7 @@ sub_80BF3B8: @ 80BF3B8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080BF3EC @ =gUnknown_20399C4
ldr r0, [r0]
adds r0, 0xE0
@@ -983,7 +983,7 @@ _080BF3F0: .4byte sub_80BF3F4
thumb_func_start sub_80BF3F4
sub_80BF3F4: @ 80BF3F4
push {r4,lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080BF460
@@ -991,7 +991,7 @@ sub_80BF3F4: @ 80BF3F4
ldr r0, [r4]
adds r0, 0xDC
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, [r4]
adds r1, r0, 0
adds r1, 0xEB
@@ -1022,10 +1022,10 @@ _080BF442:
ldr r2, _080BF470 @ =0x000020fc
movs r1, 0
bl memset
- bl sub_8070528
+ bl ResetPaletteFade
bl sub_8003ECC
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080BF460:
diff --git a/asm/mail_data.s b/asm/mail_data.s
index e8cc79b50..09f2f8d62 100644
--- a/asm/mail_data.s
+++ b/asm/mail_data.s
@@ -86,7 +86,7 @@ sub_8097D08: @ 8097D08
push {r4,lr}
adds r4, r0, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80980F8
@@ -95,7 +95,7 @@ sub_8097D08: @ 8097D08
beq _08097D30
adds r0, r4, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xFF
beq _08097D30
movs r0, 0x1
@@ -267,13 +267,13 @@ _08097E36:
bls _08097E36
mov r0, r8
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r1, r0, 0
adds r0, r4, 0
bl sub_8097F00
@@ -381,8 +381,8 @@ _08097F3E:
bx r1
thumb_func_end sub_8097F20
- thumb_func_start sub_8097F44
-sub_8097F44: @ 8097F44
+ thumb_func_start GiveMailToMon2
+GiveMailToMon2: @ 8097F44
push {r4-r7,lr}
sub sp, 0x8
adds r6, r0, 0
@@ -435,7 +435,7 @@ _08097FAA:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8097F44
+ thumb_func_end GiveMailToMon2
thumb_func_start sub_8097FB4
sub_8097FB4: @ 8097FB4
@@ -443,8 +443,8 @@ sub_8097FB4: @ 8097FB4
bx lr
thumb_func_end sub_8097FB4
- thumb_func_start sub_8097FB8
-sub_8097FB8: @ 8097FB8
+ thumb_func_start TakeMailFromMon
+TakeMailFromMon: @ 8097FB8
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -454,7 +454,7 @@ sub_8097FB8: @ 8097FB8
beq _08098008
adds r0, r4, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
add r2, sp, 0x4
strb r0, [r2]
ldr r0, _08098010 @ =gUnknown_3005008
@@ -489,7 +489,7 @@ _08098008:
.align 2, 0
_08098010: .4byte gUnknown_3005008
_08098014: .4byte 0x00002cf0
- thumb_func_end sub_8097FB8
+ thumb_func_end TakeMailFromMon
thumb_func_start sub_8098018
sub_8098018: @ 8098018
@@ -547,7 +547,7 @@ _08098060:
adds r0, r5, 0
movs r1, 0x40
str r3, [sp, 0x8]
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
ldr r2, [r1]
lsls r1, r0, 3
@@ -564,7 +564,7 @@ _08098060:
stm r4!, {r0,r2,r3}
adds r0, r5, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
ldr r2, [r1]
lsls r1, r0, 3
diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s
index 194de3d76..4008551eb 100644
--- a/asm/mailbox_pc.s
+++ b/asm/mailbox_pc.s
@@ -12,7 +12,7 @@ sub_810EB6C: @ 810EB6C
ldr r4, _0810EB84 @ =gUnknown_203ADE0
lsrs r0, 21
adds r0, 0x8
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
bne _0810EB88
@@ -83,7 +83,7 @@ sub_810EBE0: @ 810EBE0
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0xFF
@@ -129,16 +129,16 @@ sub_810EC20: @ 810EC20
ldr r0, _0810EC90 @ =0x00002dba
adds r1, r0
add r0, sp, 0x14
- bl sub_8008D84
+ bl StringCopy
add r0, sp, 0x14
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
bhi _0810EC62
add r0, sp, 0x14
movs r1, 0x1
- bl sub_80093BC
+ bl ConvertInternationalString
_0810EC62:
movs r0, 0
str r0, [sp]
@@ -252,7 +252,7 @@ _0810ECCE:
ldrh r1, [r6, 0x2]
ldrh r2, [r6]
adds r0, r5, 0
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
pop {r3}
@@ -303,7 +303,7 @@ sub_810ED80: @ 810ED80
movs r1, 0xC2
movs r2, 0xC
movs r3, 0x94
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
strb r0, [r4, 0xA]
add sp, 0x10
pop {r4}
@@ -316,7 +316,7 @@ sub_810EDB0: @ 810EDB0
push {lr}
ldr r0, _0810EDC0 @ =gUnknown_203ADE0
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/main.s b/asm/main.s
index 45b305b9e..b6151caf4 100644
--- a/asm/main.s
+++ b/asm/main.s
@@ -17,25 +17,25 @@ AgbMain: @ 80003A4
ldr r2, _08000458 @ =0x00007fff
adds r0, r2, 0
strh r0, [r1]
- bl sub_8000968
+ bl InitGpuRegManager
ldr r1, _0800045C @ =0x04000204
ldr r2, _08000460 @ =0x00004014
adds r0, r2, 0
strh r0, [r1]
- bl sub_80005C0
- bl sub_8000688
+ bl InitKeys
+ bl InitIntrHandlers
bl m4aSoundInit
- bl sub_8000598
+ bl EnableVCountIntrAtLine150
bl sub_80F86C4
- bl sub_804BFE4
+ bl CheckForFlashMemory
bl sub_80004C4
- bl sub_8071938
- bl sub_8000BFC
- bl sub_8001028
+ bl InitMapMusic
+ bl ClearDma3Requests
+ bl ResetBgs
ldr r0, _08000464 @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
+ bl InitHeap
bl sub_80F79C8
ldr r0, _08000468 @ =gUnknown_3003530
movs r4, 0
@@ -51,7 +51,7 @@ AgbMain: @ 80003A4
mov r8, r1
adds r6, r0, 0
_0800041A:
- bl sub_80005E8
+ bl ReadKeys
ldr r0, _08000468 @ =gUnknown_3003530
ldrb r0, [r0]
cmp r0, 0
@@ -97,14 +97,14 @@ _08000478:
bne _0800049E
movs r0, 0
strh r0, [r7, 0x2E]
- bl sub_8007350
+ bl ClearSpriteCopyRequests
strb r4, [r5]
bl sub_80004B0
mov r2, r8
strb r2, [r5]
_0800049E:
- bl sub_805486C
- bl sub_807194C
+ bl PlayTimeCounter_Update
+ bl MapMusicMain
bl sub_8000890
b _0800041A
.align 2, 0
@@ -114,7 +114,7 @@ _080004AC: .4byte gUnknown_30030E4
thumb_func_start sub_80004B0
sub_80004B0: @ 80004B0
push {lr}
- bl sub_800B178
+ bl HandleLinkConnection
lsls r0, 24
cmp r0, 0
bne _080004C0
@@ -133,7 +133,7 @@ sub_80004C4: @ 80004C4
str r4, [r0, 0x24]
str r4, [r0]
ldr r0, _080004F8 @ =sub_80EC820
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080004FC @ =gUnknown_300500C
ldr r1, _08000500 @ =gUnknown_2024588
str r1, [r0]
@@ -187,8 +187,8 @@ _0800053A:
_08000540: .4byte gUnknown_30030F0
thumb_func_end sub_8000510
- thumb_func_start sub_8000544
-sub_8000544: @ 8000544
+ thumb_func_start SetMainCallback2
+SetMainCallback2: @ 8000544
ldr r1, _08000554 @ =gUnknown_30030F0
str r0, [r1, 0x4]
movs r0, 0x87
@@ -199,20 +199,20 @@ sub_8000544: @ 8000544
bx lr
.align 2, 0
_08000554: .4byte gUnknown_30030F0
- thumb_func_end sub_8000544
+ thumb_func_end SetMainCallback2
- thumb_func_start sub_8000558
-sub_8000558: @ 8000558
+ thumb_func_start StartTimer1
+StartTimer1: @ 8000558
ldr r1, _08000560 @ =0x04000106
movs r0, 0x80
strh r0, [r1]
bx lr
.align 2, 0
_08000560: .4byte 0x04000106
- thumb_func_end sub_8000558
+ thumb_func_end StartTimer1
- thumb_func_start sub_8000564
-sub_8000564: @ 8000564
+ thumb_func_start SeedRngAndSetTrainerId
+SeedRngAndSetTrainerId: @ 8000564
push {r4,lr}
ldr r0, _08000580 @ =0x04000104
ldrh r4, [r0]
@@ -230,22 +230,22 @@ sub_8000564: @ 8000564
_08000580: .4byte 0x04000104
_08000584: .4byte 0x04000106
_08000588: .4byte gUnknown_2020000
- thumb_func_end sub_8000564
+ thumb_func_end SeedRngAndSetTrainerId
- thumb_func_start sub_800058C
-sub_800058C: @ 800058C
+ thumb_func_start GetGeneratedTrainerIdLower
+GetGeneratedTrainerIdLower: @ 800058C
ldr r0, _08000594 @ =gUnknown_2020000
ldrh r0, [r0]
bx lr
.align 2, 0
_08000594: .4byte gUnknown_2020000
- thumb_func_end sub_800058C
+ thumb_func_end GetGeneratedTrainerIdLower
- thumb_func_start sub_8000598
-sub_8000598: @ 8000598
+ thumb_func_start EnableVCountIntrAtLine150
+EnableVCountIntrAtLine150: @ 8000598
push {lr}
movs r0, 0x4
- bl sub_8000AC4
+ bl GetGpuReg
movs r1, 0xFF
ands r1, r0
movs r2, 0x96
@@ -255,15 +255,15 @@ sub_8000598: @ 8000598
movs r0, 0x20
orrs r1, r0
movs r0, 0x4
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4
- bl sub_8000B68
+ bl EnableInterrupts
pop {r0}
bx r0
- thumb_func_end sub_8000598
+ thumb_func_end EnableVCountIntrAtLine150
- thumb_func_start sub_80005C0
-sub_80005C0: @ 80005C0
+ thumb_func_start InitKeys
+InitKeys: @ 80005C0
ldr r1, _080005DC @ =gUnknown_300352C
movs r0, 0x5
strh r0, [r1]
@@ -282,10 +282,10 @@ sub_80005C0: @ 80005C0
_080005DC: .4byte gUnknown_300352C
_080005E0: .4byte gUnknown_30030E0
_080005E4: .4byte gUnknown_30030F0
- thumb_func_end sub_80005C0
+ thumb_func_end InitKeys
- thumb_func_start sub_80005E8
-sub_80005E8: @ 80005E8
+ thumb_func_start ReadKeys
+ReadKeys: @ 80005E8
push {lr}
ldr r0, _08000624 @ =0x04000130
ldrh r1, [r0]
@@ -366,10 +366,10 @@ _0800067A:
.align 2, 0
_08000680: .4byte gUnknown_30030E0
_08000684: .4byte gUnknown_300500C
- thumb_func_end sub_80005E8
+ thumb_func_end ReadKeys
- thumb_func_start sub_8000688
-sub_8000688: @ 8000688
+ thumb_func_start InitIntrHandlers
+InitIntrHandlers: @ 8000688
push {r4,r5,lr}
ldr r5, _080006D4 @ =IntrMain
ldr r4, _080006D8 @ =gUnknown_3003580
@@ -391,16 +391,16 @@ _08000694:
ldr r0, _080006EC @ =INTR_VECTOR
str r4, [r0]
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
bl sub_8000718
ldr r1, _080006F0 @ =0x04000208
movs r0, 0x1
strh r0, [r1]
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
pop {r4,r5}
pop {r0}
bx r0
@@ -413,25 +413,25 @@ _080006E4: .4byte 0x040000d4
_080006E8: .4byte 0x84000200
_080006EC: .4byte INTR_VECTOR
_080006F0: .4byte 0x04000208
- thumb_func_end sub_8000688
+ thumb_func_end InitIntrHandlers
- thumb_func_start sub_80006F4
-sub_80006F4: @ 80006F4
+ thumb_func_start SetVBlankCallback
+SetVBlankCallback: @ 80006F4
ldr r1, _080006FC @ =gUnknown_30030F0
str r0, [r1, 0xC]
bx lr
.align 2, 0
_080006FC: .4byte gUnknown_30030F0
- thumb_func_end sub_80006F4
+ thumb_func_end SetVBlankCallback
- thumb_func_start sub_8000700
-sub_8000700: @ 8000700
+ thumb_func_start SetHBlankCallback
+SetHBlankCallback: @ 8000700
ldr r1, _08000708 @ =gUnknown_30030F0
str r0, [r1, 0x10]
bx lr
.align 2, 0
_08000708: .4byte gUnknown_30030F0
- thumb_func_end sub_8000700
+ thumb_func_end SetHBlankCallback
thumb_func_start sub_800070C
sub_800070C: @ 800070C
@@ -458,7 +458,7 @@ sub_8000724: @ 8000724
ldrb r0, [r0]
cmp r0, 0
beq _08000738
- bl sub_80FBA38
+ bl LinkVSync
b _08000744
.align 2, 0
_08000734: .4byte gUnknown_3003F3C
@@ -485,8 +485,8 @@ _0800075C:
ldr r0, [r5, 0x24]
adds r0, 0x1
str r0, [r5, 0x24]
- bl sub_8000A04
- bl sub_8000C34
+ bl CopyBufferedValuesToGpuRegs
+ bl ProcessDma3Requests
ldr r1, _080007B0 @ =gUnknown_3003D88
ldr r0, _080007B4 @ =gSoundInfo
ldrb r0, [r0, 0x4]
@@ -500,7 +500,7 @@ _0800075C:
ldrh r0, [r4]
strb r0, [r1]
bl sub_800DD28
- bl sub_8044EC8
+ bl Random
bl sub_80FCF34
ldr r2, _080007C4 @ =INTR_CHECK
ldrh r0, [r2]
@@ -622,13 +622,13 @@ sub_8000874: @ 8000874
ldr r0, _08000880 @ =gIntrTable
ldr r1, _08000884 @ =sub_8000844
str r1, [r0, 0x4]
- ldr r1, _08000888 @ =sub_800B788
+ ldr r1, _08000888 @ =Timer3Intr
str r1, [r0, 0x8]
bx lr
.align 2, 0
_08000880: .4byte gIntrTable
_08000884: .4byte sub_8000844
-_08000888: .4byte sub_800B788
+_08000888: .4byte Timer3Intr
thumb_func_end sub_8000874
thumb_func_start nullsub_4
@@ -691,7 +691,7 @@ sub_80008D8: @ 80008D8
movs r0, 0
strh r0, [r1]
bl m4aSoundVSyncOff
- bl sub_8087E64
+ bl remove_some_task
ldr r1, _08000934 @ =0x040000bc
ldrh r2, [r1, 0xA]
ldr r3, _08000938 @ =0x0000c5ff
diff --git a/asm/main_menu.s b/asm/main_menu.s
index 64cf0f1fb..0d36b574f 100644
--- a/asm/main_menu.s
+++ b/asm/main_menu.s
@@ -8,10 +8,10 @@
thumb_func_start sub_800C2D4
sub_800C2D4: @ 800C2D4
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_800C2D4
@@ -19,9 +19,9 @@ sub_800C2D4: @ 800C2D4
thumb_func_start sub_800C2EC
sub_800C2EC: @ 800C2EC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_800C2EC
@@ -52,37 +52,37 @@ sub_800C318: @ 800C318
lsls r4, 24
lsrs r4, 24
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
mov r1, sp
movs r0, 0
strh r0, [r1]
@@ -113,11 +113,11 @@ sub_800C318: @ 800C318
ldr r0, _0800C4B0 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
- bl sub_8070528
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFade
movs r0, 0
bl sub_8001618
ldr r1, _0800C4B4 @ =gUnknown_8234690
@@ -127,68 +127,68 @@ sub_800C318: @ 800C318
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _0800C4B8 @ =gUnknown_8234618
bl sub_8003B24
bl sub_8002C28
ldr r0, _0800C4BC @ =gUnknown_8234648
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0800C4C0 @ =gUnknown_8234668
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800C4C4 @ =sub_800C2D4
- bl sub_8000544
+ bl SetMainCallback2
movs r1, 0xC1
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800C4C8 @ =sub_800C4D0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0800C4CC @ =gUnknown_3005090
@@ -235,25 +235,25 @@ sub_800C4D0: @ 800C4D0
_0800C4E8:
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x21
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x7
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800C53C @ =gUnknown_30053A0
ldrh r4, [r0]
cmp r4, 0x2
@@ -409,11 +409,11 @@ sub_800C634: @ 800C634
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _0800C684 @ =sub_800C2EC
- bl sub_80006F4
+ bl SetVBlankCallback
add sp, 0x4
pop {r4}
pop {r0}
@@ -449,7 +449,7 @@ sub_800C688: @ 800C688
cmp r0, 0
beq _0800C6F8
movs r0, 0x4
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, _0800C6E8 @ =gUnknown_8234638
bl sub_800D1E8
movs r0, 0
@@ -496,25 +496,25 @@ sub_800C704: @ 800C704
bne _0800C774
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x21
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x7
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800C768 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -572,25 +572,25 @@ sub_800C7A0: @ 800C7A0
lsrs r7, r0, 24
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x21
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x7
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0800C7F4 @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -609,7 +609,7 @@ _0800C7FE:
add r0, sp, 0xC
movs r1, 0xF1
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r2, _0800C860 @ =gUnknown_3005090
lsls r1, r7, 2
adds r0, r1, r7
@@ -627,7 +627,7 @@ _0800C7FE:
_0800C828:
movs r0, 0
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0800C864 @ =gUnknown_8234688
str r0, [sp]
movs r0, 0x1
@@ -643,7 +643,7 @@ _0800C828:
ldr r0, _0800C86C @ =gUnknown_8234618
bl sub_800D0B4
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
b _0800C8D8
.align 2, 0
@@ -655,10 +655,10 @@ _0800C86C: .4byte gUnknown_8234618
_0800C870:
movs r0, 0x1
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _0800C8E0 @ =gUnknown_8234688
str r5, [sp]
movs r4, 0x1
@@ -688,9 +688,9 @@ _0800C870:
adds r0, r4, 0
bl sub_800D0B4
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
@@ -707,13 +707,13 @@ _0800C8EC: .4byte gUnknown_8234620
_0800C8F0:
movs r0, 0x1
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _0800C9B0 @ =gUnknown_8234688
str r5, [sp]
movs r4, 0x1
@@ -757,11 +757,11 @@ _0800C8F0:
adds r0, r4, 0
bl sub_800D0B4
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
@@ -804,7 +804,7 @@ sub_800C9CC: @ 800C9CC
movs r5, 0x1
negs r5, r5
adds r0, r5, 0
- bl sub_8000FE8
+ bl CheckForSpaceForDma3Request
lsls r0, 16
asrs r0, 16
cmp r0, r5
@@ -822,11 +822,11 @@ sub_800C9CC: @ 800C9CC
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _0800CA24 @ =sub_800C2EC
- bl sub_80006F4
+ bl SetVBlankCallback
_0800CA10:
add sp, 0x4
pop {r4,r5}
@@ -963,7 +963,7 @@ _0800CAF2:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0800CB84
.align 2, 0
_0800CB1C: .4byte sub_800CB90
@@ -982,7 +982,7 @@ _0800CB2E:
strb r0, [r1]
bl sub_8003ECC
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_812EB2C
b _0800CB84
.align 2, 0
@@ -1006,11 +1006,11 @@ _0800CB68: .4byte gUnknown_20375F8
_0800CB6C: .4byte gUnknown_2031DE0
_0800CB70:
ldr r0, _0800CB8C @ =sub_81422AC
- bl sub_8000544
+ bl SetMainCallback2
bl sub_812B478
bl sub_8003ECC
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0800CB84:
add sp, 0x4
pop {r4-r6}
@@ -1057,7 +1057,7 @@ _0800CBC2:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r1, 0x1C
ldrsh r0, [r4, r1]
cmp r0, 0x1
@@ -1117,7 +1117,7 @@ _0800CC34:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0800CC64 @ =sub_800CC68
str r0, [r4]
_0800CC58:
@@ -1142,9 +1142,9 @@ sub_800CC68: @ 800CC68
cmp r0, 0
bne _0800CC86
ldr r0, _0800CC90 @ =sub_8078914
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0800CC86:
pop {r4}
pop {r0}
@@ -1163,7 +1163,7 @@ sub_800CC94: @ 800CC94
lsrs r5, r1, 24
ldr r1, _0800CCB8 @ =0x000012de
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
cmp r4, 0
beq _0800CCB2
cmp r4, 0
@@ -1206,7 +1206,7 @@ _0800CCDC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
pop {r4,r5}
pop {r0}
bx r0
@@ -1234,7 +1234,7 @@ sub_800CCF8: @ 800CCF8
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0800CD3C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1260,13 +1260,13 @@ _0800CD44:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0800CD84 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1343,7 +1343,7 @@ sub_800CDF8: @ 800CDF8
adds r4, r0, 0
movs r0, 0x4
movs r1, 0xAA
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0800CE48 @ =gUnknown_8234638
bl sub_800D0B4
ldr r0, _0800CE4C @ =gUnknown_8234688
@@ -1357,16 +1357,16 @@ sub_800CDF8: @ 800CDF8
movs r3, 0x2
bl sub_812E51C
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
movs r1, 0x2
bl sub_8003F20
ldr r1, _0800CE50 @ =0x000013dd
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0800CE54 @ =0x0000739d
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0xC
pop {r4}
pop {r0}
@@ -1532,7 +1532,7 @@ _0800CF6A:
movs r3, 0x3
bl sub_8008E78
ldr r1, _0800CFC0 @ =gUnknown_841B6EB
- bl sub_8008DA4
+ bl StringAppend
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
@@ -1593,7 +1593,7 @@ _0800CFE2:
movs r3, 0x1
bl sub_8008E78
ldr r1, _0800D040 @ =gUnknown_841B6F3
- bl sub_8008DA4
+ bl StringAppend
str r5, [sp]
str r4, [sp, 0x4]
add r0, sp, 0xC
@@ -1630,7 +1630,7 @@ sub_800D044: @ 800D044
lsls r2, 1
ldr r3, _0800D08C @ =0x000001b1
adds r0, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsrs r0, 3
@@ -1638,7 +1638,7 @@ sub_800D044: @ 800D044
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0800D090 @ =gUnknown_8234638
bl sub_800D1E8
pop {r4,r5}
@@ -1689,7 +1689,7 @@ sub_800D0B4: @ 800D0B4
movs r4, 0x2
mov r8, r4
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xD9
lsls r1, 1
@@ -1704,7 +1704,7 @@ sub_800D0B4: @ 800D0B4
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1DC @ =0x000001b3
ldrb r2, [r5, 0x3]
@@ -1719,7 +1719,7 @@ sub_800D0B4: @ 800D0B4
str r6, [sp]
str r6, [sp, 0x4]
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDA
lsls r1, 1
@@ -1733,7 +1733,7 @@ sub_800D0B4: @ 800D0B4
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDB
lsls r1, 1
@@ -1748,7 +1748,7 @@ sub_800D0B4: @ 800D0B4
str r4, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1E0 @ =0x000001b7
ldrb r2, [r5, 0x1]
@@ -1764,7 +1764,7 @@ sub_800D0B4: @ 800D0B4
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
movs r1, 0xDC
lsls r1, 1
@@ -1779,7 +1779,7 @@ sub_800D0B4: @ 800D0B4
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
ldr r1, _0800D1E4 @ =0x000001b9
ldrb r2, [r5, 0x3]
@@ -1796,9 +1796,9 @@ sub_800D0B4: @ 800D0B4
str r6, [sp, 0x4]
mov r4, r8
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r5]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -1841,9 +1841,9 @@ sub_800D1E8: @ 800D1E8
movs r1, 0x2
str r1, [sp, 0x8]
movs r1, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r0, [r6]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
diff --git a/asm/malloc.s b/asm/malloc.s
index 1bc61f442..21562198f 100644
--- a/asm/malloc.s
+++ b/asm/malloc.s
@@ -237,8 +237,8 @@ _08002AE0: .4byte gUnknown_81E9FEC
_08002AE4: .4byte gUnknown_81EA018
thumb_func_end sub_8002A08
- thumb_func_start sub_8002AE8
-sub_8002AE8: @ 8002AE8
+ thumb_func_start AllocZeroedInternal
+AllocZeroedInternal: @ 8002AE8
push {r4,r5,lr}
sub sp, 0x4
adds r4, r1, 0
@@ -270,10 +270,10 @@ _08002B1C:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8002AE8
+ thumb_func_end AllocZeroedInternal
- thumb_func_start sub_8002B28
-sub_8002B28: @ 8002B28
+ thumb_func_start CheckMemBlockInternal
+CheckMemBlockInternal: @ 8002B28
push {r4,r5,lr}
adds r5, r0, 0
adds r3, r1, 0
@@ -322,10 +322,10 @@ _08002B7A:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8002B28
+ thumb_func_end CheckMemBlockInternal
- thumb_func_start sub_8002B80
-sub_8002B80: @ 8002B80
+ thumb_func_start InitHeap
+InitHeap: @ 8002B80
push {lr}
ldr r2, _08002B94 @ =gUnknown_3000A38
str r0, [r2]
@@ -337,10 +337,10 @@ sub_8002B80: @ 8002B80
.align 2, 0
_08002B94: .4byte gUnknown_3000A38
_08002B98: .4byte gUnknown_3000A3C
- thumb_func_end sub_8002B80
+ thumb_func_end InitHeap
- thumb_func_start sub_8002B9C
-sub_8002B9C: @ 8002B9C
+ thumb_func_start Alloc
+Alloc: @ 8002B9C
push {lr}
adds r1, r0, 0
ldr r0, _08002BAC @ =gUnknown_3000A38
@@ -350,23 +350,23 @@ sub_8002B9C: @ 8002B9C
bx r1
.align 2, 0
_08002BAC: .4byte gUnknown_3000A38
- thumb_func_end sub_8002B9C
+ thumb_func_end Alloc
- thumb_func_start sub_8002BB0
-sub_8002BB0: @ 8002BB0
+ thumb_func_start AllocZeroed
+AllocZeroed: @ 8002BB0
push {lr}
adds r1, r0, 0
ldr r0, _08002BC0 @ =gUnknown_3000A38
ldr r0, [r0]
- bl sub_8002AE8
+ bl AllocZeroedInternal
pop {r1}
bx r1
.align 2, 0
_08002BC0: .4byte gUnknown_3000A38
- thumb_func_end sub_8002BB0
+ thumb_func_end AllocZeroed
- thumb_func_start sub_8002BC4
-sub_8002BC4: @ 8002BC4
+ thumb_func_start Free
+Free: @ 8002BC4
push {lr}
adds r1, r0, 0
ldr r0, _08002BD4 @ =gUnknown_3000A38
@@ -376,23 +376,23 @@ sub_8002BC4: @ 8002BC4
bx r0
.align 2, 0
_08002BD4: .4byte gUnknown_3000A38
- thumb_func_end sub_8002BC4
+ thumb_func_end Free
- thumb_func_start sub_8002BD8
-sub_8002BD8: @ 8002BD8
+ thumb_func_start CheckMemBlock
+CheckMemBlock: @ 8002BD8
push {lr}
adds r1, r0, 0
ldr r0, _08002BE8 @ =gUnknown_3000A38
ldr r0, [r0]
- bl sub_8002B28
+ bl CheckMemBlockInternal
pop {r1}
bx r1
.align 2, 0
_08002BE8: .4byte gUnknown_3000A38
- thumb_func_end sub_8002BD8
+ thumb_func_end CheckMemBlock
- thumb_func_start sub_8002BEC
-sub_8002BEC: @ 8002BEC
+ thumb_func_start CheckHeap
+CheckHeap: @ 8002BEC
push {r4,r5,lr}
ldr r0, _08002C10 @ =gUnknown_3000A38
ldr r4, [r0]
@@ -401,7 +401,7 @@ _08002BF4:
ldr r0, [r5]
adds r1, r4, 0
adds r1, 0x10
- bl sub_8002B28
+ bl CheckMemBlockInternal
cmp r0, 0
beq _08002C14
ldr r4, [r4, 0xC]
@@ -418,6 +418,6 @@ _08002C16:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8002BEC
+ thumb_func_end CheckHeap
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/map_name_popup.s b/asm/map_name_popup.s
index 805cf132d..a914ff59d 100644
--- a/asm/map_name_popup.s
+++ b/asm/map_name_popup.s
@@ -25,24 +25,24 @@ sub_8098110: @ 8098110
bls _080981A2
ldr r5, _0809817C @ =sub_80981AC
adds r0, r5, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
bne _08098188
adds r0, r5, 0
movs r1, 0x5A
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldr r1, _08098180 @ =0xffffef7f
movs r0, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r1, _08098184 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -126,7 +126,7 @@ _080981FC:
strh r0, [r4, 0x8]
b _080982DE
_0809820E:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080982DE
@@ -193,7 +193,7 @@ _0809827E:
cmp r0, 0
bne _080982A0
ldrb r0, [r4, 0x10]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r4, 0x10]
movs r1, 0x1
bl sub_8003F20
@@ -204,7 +204,7 @@ _080982A0:
strh r0, [r4, 0x8]
b _080982E6
_080982A6:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -224,16 +224,16 @@ _080982C6:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
b _080982E6
_080982D6:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
b _080982E6
_080982DE:
ldrh r1, [r4, 0xC]
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
_080982E6:
pop {r4,r5}
pop {r0}
@@ -244,7 +244,7 @@ _080982E6:
sub_80982EC: @ 80982EC
push {lr}
ldr r0, _08098318 @ =sub_80981AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -272,7 +272,7 @@ _0809831C: .4byte gUnknown_3005098
sub_8098320: @ 8098320
push {lr}
ldr r0, _0809833C @ =sub_80981AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
movs r1, 0xFF
@@ -338,16 +338,16 @@ _08098396:
cmp r4, 0
beq _080983B8
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080983C6
.align 2, 0
_080983B4: .4byte 0x00ffffff
_080983B8:
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
ldr r1, _080983FC @ =gUnknown_2037398
movs r2, 0x10
bl CpuSet
@@ -362,7 +362,7 @@ _080983C6:
movs r2, 0xD
bl sub_8150048
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r5, 0
bl sub_8098400
adds r0, r4, 0
@@ -416,7 +416,7 @@ _08098434:
lsrs r5, 24
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
lsls r4, 24
lsrs r4, 24
movs r0, 0x2
@@ -454,7 +454,7 @@ sub_809847C: @ 809847C
bne _080984A4
ldr r1, _080984A0 @ =gUnknown_841D18D
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
b _080984D2
.align 2, 0
_080984A0: .4byte gUnknown_841D18D
diff --git a/asm/map_obj_80688E4.s b/asm/map_obj_80688E4.s
index 7f2d06060..341d6608a 100644
--- a/asm/map_obj_80688E4.s
+++ b/asm/map_obj_80688E4.s
@@ -82,8 +82,8 @@ _0806896E:
bx r1
thumb_func_end sub_80688E4
- thumb_func_start sub_8068974
-sub_8068974: @ 8068974
+ thumb_func_start player_bitmagic
+player_bitmagic: @ 8068974
push {r4,r5,lr}
movs r4, 0
ldr r5, _080689A8 @ =gUnknown_2036E38
@@ -114,7 +114,7 @@ _08068998:
.align 2, 0
_080689A8: .4byte gUnknown_2036E38
_080689AC: .4byte gUnknown_2037078
- thumb_func_end sub_8068974
+ thumb_func_end player_bitmagic
thumb_func_start sub_80689B0
sub_80689B0: @ 80689B0
@@ -154,8 +154,8 @@ _080689EC: .4byte gUnknown_2036E38
_080689F0: .4byte gUnknown_2037078
thumb_func_end sub_80689B0
- thumb_func_start sub_80689F4
-sub_80689F4: @ 80689F4
+ thumb_func_start npc_sync_anim_pause_bits
+npc_sync_anim_pause_bits: @ 80689F4
push {r4,r5,lr}
adds r5, r0, 0
ldrh r2, [r5]
@@ -207,10 +207,10 @@ _08068A4C:
.align 2, 0
_08068A54: .4byte 0x00000101
_08068A58: .4byte gUnknown_202063C
- thumb_func_end sub_80689F4
+ thumb_func_end npc_sync_anim_pause_bits
- thumb_func_start sub_8068A5C
-sub_8068A5C: @ 8068A5C
+ thumb_func_start UnfreezeMapObjects
+UnfreezeMapObjects: @ 8068A5C
push {r4,r5,lr}
movs r4, 0
ldr r5, _08068A88 @ =gUnknown_2036E38
@@ -224,7 +224,7 @@ _08068A62:
cmp r0, 0
beq _08068A78
adds r0, r1, 0
- bl sub_80689F4
+ bl npc_sync_anim_pause_bits
_08068A78:
adds r0, r4, 0x1
lsls r0, 24
@@ -236,10 +236,10 @@ _08068A78:
bx r0
.align 2, 0
_08068A88: .4byte gUnknown_2036E38
- thumb_func_end sub_8068A5C
+ thumb_func_end UnfreezeMapObjects
- thumb_func_start sub_8068A8C
-sub_8068A8C: @ 8068A8C
+ thumb_func_start little_step
+little_step: @ 8068A8C
lsls r1, 24
ldr r2, _08068AA8 @ =gUnknown_83A64C8
lsrs r1, 22
@@ -255,10 +255,10 @@ sub_8068A8C: @ 8068A8C
bx lr
.align 2, 0
_08068AA8: .4byte gUnknown_83A64C8
- thumb_func_end sub_8068A8C
+ thumb_func_end little_step
- thumb_func_start sub_8068AAC
-sub_8068AAC: @ 8068AAC
+ thumb_func_start double_little_steps
+double_little_steps: @ 8068AAC
lsls r1, 24
ldr r2, _08068ACC @ =gUnknown_83A64C8
lsrs r1, 22
@@ -276,10 +276,10 @@ sub_8068AAC: @ 8068AAC
bx lr
.align 2, 0
_08068ACC: .4byte gUnknown_83A64C8
- thumb_func_end sub_8068AAC
+ thumb_func_end double_little_steps
- thumb_func_start sub_8068AD0
-sub_8068AD0: @ 8068AD0
+ thumb_func_start triple_little_steps
+triple_little_steps: @ 8068AD0
lsls r1, 24
ldr r2, _08068AF4 @ =gUnknown_83A64C8
lsrs r1, 22
@@ -299,10 +299,10 @@ sub_8068AD0: @ 8068AD0
bx lr
.align 2, 0
_08068AF4: .4byte gUnknown_83A64C8
- thumb_func_end sub_8068AD0
+ thumb_func_end triple_little_steps
- thumb_func_start sub_8068AF8
-sub_8068AF8: @ 8068AF8
+ thumb_func_start quad_little_steps
+quad_little_steps: @ 8068AF8
lsls r1, 24
ldr r2, _08068B18 @ =gUnknown_83A64C8
lsrs r1, 22
@@ -320,10 +320,10 @@ sub_8068AF8: @ 8068AF8
bx lr
.align 2, 0
_08068B18: .4byte gUnknown_83A64C8
- thumb_func_end sub_8068AF8
+ thumb_func_end quad_little_steps
- thumb_func_start sub_8068B1C
-sub_8068B1C: @ 8068B1C
+ thumb_func_start oct_little_steps
+oct_little_steps: @ 8068B1C
lsls r1, 24
ldr r2, _08068B3C @ =gUnknown_83A64C8
lsrs r1, 22
@@ -341,10 +341,10 @@ sub_8068B1C: @ 8068B1C
bx lr
.align 2, 0
_08068B3C: .4byte gUnknown_83A64C8
- thumb_func_end sub_8068B1C
+ thumb_func_end oct_little_steps
- thumb_func_start sub_8068B40
-sub_8068B40: @ 8068B40
+ thumb_func_start oamt_npc_ministep_reset
+oamt_npc_ministep_reset: @ 8068B40
lsls r1, 24
lsrs r1, 24
lsls r2, 24
@@ -354,10 +354,10 @@ sub_8068B40: @ 8068B40
strh r2, [r0, 0x36]
strh r3, [r0, 0x38]
bx lr
- thumb_func_end sub_8068B40
+ thumb_func_end oamt_npc_ministep_reset
- thumb_func_start sub_8068B54
-sub_8068B54: @ 8068B54
+ thumb_func_start obj_npc_ministep
+obj_npc_ministep: @ 8068B54
push {r4,r5,lr}
adds r4, r0, 0
ldr r5, _08068BAC @ =gUnknown_83A71B0
@@ -409,7 +409,7 @@ _08068BB6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8068B54
+ thumb_func_end obj_npc_ministep
thumb_func_start sub_8068BBC
sub_8068BBC: @ 8068BBC
@@ -435,7 +435,7 @@ sub_8068BCC: @ 8068BCC
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068A8C
+ bl little_step
ldrh r0, [r4, 0x38]
adds r0, 0x1
strh r0, [r4, 0x38]
@@ -483,7 +483,7 @@ sub_8068C18: @ 8068C18
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068A8C
+ bl little_step
ldrh r0, [r4, 0x38]
adds r0, 0x1
strh r0, [r4, 0x38]
@@ -534,7 +534,7 @@ sub_8068C68: @ 8068C68
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068A8C
+ bl little_step
ldrh r0, [r4, 0x38]
adds r0, 0x1
strh r0, [r4, 0x38]
@@ -579,7 +579,7 @@ sub_8068CB4: @ 8068CB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068A8C
+ bl little_step
ldrh r0, [r4, 0x38]
adds r0, 0x1
b _08068CE8
@@ -588,7 +588,7 @@ _08068CD8:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068AAC
+ bl double_little_steps
ldrh r0, [r4, 0x38]
adds r0, 0x2
_08068CE8:
@@ -666,7 +666,7 @@ sub_8068D3C: @ 8068D3C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8068A8C
+ bl little_step
_08068D6E:
movs r2, 0x3A
ldrsh r0, [r4, r2]
@@ -741,7 +741,7 @@ sub_8068DC4: @ 8068DC4
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_8068A8C
+ bl little_step
_08068E00:
movs r2, 0x3A
ldrsh r0, [r5, r2]
@@ -788,14 +788,14 @@ _08068E50: .4byte gUnknown_83A7202
_08068E54: .4byte gUnknown_83A7208
thumb_func_end sub_8068DC4
- thumb_func_start sub_8068E58
-sub_8068E58: @ 8068E58
+ thumb_func_start SetFieldObjectStepTimer
+SetFieldObjectStepTimer: @ 8068E58
strh r1, [r0, 0x34]
bx lr
- thumb_func_end sub_8068E58
+ thumb_func_end SetFieldObjectStepTimer
- thumb_func_start sub_8068E5C
-sub_8068E5C: @ 8068E5C
+ thumb_func_start RunFieldObjectStepTimer
+RunFieldObjectStepTimer: @ 8068E5C
push {lr}
ldrh r1, [r0, 0x34]
subs r1, 0x1
@@ -810,10 +810,10 @@ _08068E6E:
_08068E70:
pop {r1}
bx r1
- thumb_func_end sub_8068E5C
+ thumb_func_end RunFieldObjectStepTimer
- thumb_func_start sub_8068E74
-sub_8068E74: @ 8068E74
+ thumb_func_start obj_anim_image_set_and_seek
+obj_anim_image_set_and_seek: @ 8068E74
push {r4,lr}
lsls r2, 24
lsrs r2, 24
@@ -828,11 +828,11 @@ sub_8068E74: @ 8068E74
ands r1, r3
strb r1, [r4]
adds r1, r2, 0
- bl sub_80083C0
+ bl SeekSpriteAnim
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8068E74
+ thumb_func_end obj_anim_image_set_and_seek
thumb_func_start sub_8068E9C
sub_8068E9C: @ 8068E9C
@@ -993,7 +993,7 @@ sub_8068FA8: @ 8068FA8
lsrs r0, 24
adds r1, r4, 0
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
ldrh r1, [r4, 0x32]
lsls r1, 24
lsrs r1, 24
@@ -1024,7 +1024,7 @@ _08068FD6:
cmp r1, r0
bne _08068FF6
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_08068FF6:
adds r5, 0x44
subs r4, 0x1
@@ -1099,12 +1099,12 @@ sub_8069058: @ 8069058
ldr r0, _08069090 @ =gUnknown_202063C
adds r4, r0
adds r0, r5, 0
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0806908A:
pop {r4,r5}
pop {r0}
@@ -1167,7 +1167,7 @@ _080690F8: .4byte gUnknown_202063C
_080690FC: .4byte 0xfffffc00
_08069100:
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r2, r4, 0
adds r2, 0x42
ldrb r0, [r2]
@@ -1179,7 +1179,7 @@ _08069100:
_08069116:
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0806911E:
pop {r4,r5}
pop {r0}
@@ -1430,8 +1430,8 @@ _080692C2:
bx r1
thumb_func_end sub_8069294
- thumb_func_start sub_80692C8
-sub_80692C8: @ 80692C8
+ thumb_func_start oe_exec_and_other_stuff
+oe_exec_and_other_stuff: @ 80692C8
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -1441,18 +1441,18 @@ sub_80692C8: @ 80692C8
adds r2, r1, 0x4
adds r3, r1, 0
adds r3, 0x8
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
adds r0, r4, 0
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r1}
bx r1
.align 2, 0
_080692EC: .4byte gUnknown_20386E0
- thumb_func_end sub_80692C8
+ thumb_func_end oe_exec_and_other_stuff
- thumb_func_start sub_80692F0
-sub_80692F0: @ 80692F0
+ thumb_func_start DoShadowFieldEffect
+DoShadowFieldEffect: @ 80692F0
push {lr}
adds r1, r0, 0
ldrb r2, [r1, 0x2]
@@ -1463,14 +1463,14 @@ sub_80692F0: @ 80692F0
orrs r0, r2
strb r0, [r1, 0x2]
movs r0, 0x3
- bl sub_80692C8
+ bl oe_exec_and_other_stuff
_08069308:
pop {r0}
bx r0
- thumb_func_end sub_80692F0
+ thumb_func_end DoShadowFieldEffect
- thumb_func_start sub_806930C
-sub_806930C: @ 806930C
+ thumb_func_start DoRippleFieldEffect
+DoRippleFieldEffect: @ 806930C
push {r4,lr}
adds r4, r1, 0
ldrb r0, [r0, 0x5]
@@ -1492,12 +1492,12 @@ sub_806930C: @ 806930C
movs r0, 0x3
str r0, [r2, 0xC]
movs r0, 0x5
- bl sub_8083444
+ bl FieldEffectStart
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08069344: .4byte gUnknown_20386E0
- thumb_func_end sub_806930C
+ thumb_func_end DoRippleFieldEffect
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/map_obj_lock.s b/asm/map_obj_lock.s
index 8d1d027ff..b461e6339 100644
--- a/asm/map_obj_lock.s
+++ b/asm/map_obj_lock.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8069554
-sub_8069554: @ 8069554
+ thumb_func_start walkrun_is_standing_still
+walkrun_is_standing_still: @ 8069554
push {lr}
ldr r0, _08069564 @ =gUnknown_2037078
ldrb r0, [r0, 0x3]
@@ -21,20 +21,20 @@ _08069568:
_0806956A:
pop {r1}
bx r1
- thumb_func_end sub_8069554
+ thumb_func_end walkrun_is_standing_still
thumb_func_start sub_8069570
sub_8069570: @ 8069570
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
cmp r0, 0
beq _0806958A
bl sub_805C270
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0806958A:
pop {r4}
pop {r0}
@@ -45,7 +45,7 @@ _0806958A:
sub_8069590: @ 8069590
push {lr}
ldr r0, _080695A8 @ =sub_8069570
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _080695AC
@@ -61,18 +61,18 @@ _080695AE:
bx r1
thumb_func_end sub_8069590
- thumb_func_start sub_80695B4
-sub_80695B4: @ 80695B4
+ thumb_func_start ScriptFreezeMapObjects
+ScriptFreezeMapObjects: @ 80695B4
push {lr}
- bl sub_8068974
+ bl player_bitmagic
ldr r0, _080695C8 @ =sub_8069570
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
_080695C8: .4byte sub_8069570
- thumb_func_end sub_80695B4
+ thumb_func_end ScriptFreezeMapObjects
thumb_func_start sub_80695CC
sub_80695CC: @ 80695CC
@@ -88,7 +88,7 @@ sub_80695CC: @ 80695CC
ldrsh r0, [r5, r1]
cmp r0, 0
bne _080695F6
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -125,7 +125,7 @@ _0806961E:
cmp r0, 0
beq _08069634
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_08069634:
pop {r4-r6}
pop {r0}
@@ -140,7 +140,7 @@ _08069644: .4byte gUnknown_3005074
sub_8069648: @ 8069648
push {lr}
ldr r0, _08069660 @ =sub_80695CC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08069664
@@ -156,15 +156,15 @@ _08069666:
bx r1
thumb_func_end sub_8069648
- thumb_func_start sub_806966C
-sub_806966C: @ 806966C
+ thumb_func_start LockSelectedMapObject
+LockSelectedMapObject: @ 806966C
push {r4,r5,lr}
ldr r4, _080696B0 @ =gUnknown_3005074
ldrb r0, [r4]
bl sub_80689B0
ldr r0, _080696B4 @ =sub_80695CC
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _080696B8 @ =gUnknown_2036E38
@@ -195,7 +195,7 @@ _080696B0: .4byte gUnknown_3005074
_080696B4: .4byte sub_80695CC
_080696B8: .4byte gUnknown_2036E38
_080696BC: .4byte gUnknown_3005090
- thumb_func_end sub_806966C
+ thumb_func_end LockSelectedMapObject
thumb_func_start sub_80696C0
sub_80696C0: @ 80696C0
@@ -203,7 +203,7 @@ sub_80696C0: @ 80696C0
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -212,9 +212,9 @@ sub_80696C0: @ 80696C0
lsls r0, 2
ldr r1, _080696EC @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
pop {r0}
bx r0
.align 2, 0
@@ -236,12 +236,12 @@ sub_80696F0: @ 80696F0
cmp r0, 0
beq _0806970E
adds r0, r1, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
_0806970E:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -249,9 +249,9 @@ _0806970E:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
pop {r4}
pop {r0}
bx r0
@@ -272,7 +272,7 @@ sub_8069740: @ 8069740
adds r0, r1
ldr r1, _08069764 @ =gUnknown_20370D4
ldrb r1, [r1]
- bl sub_80642C8
+ bl FieldObjectFaceOppositeDirection
pop {r0}
bx r0
.align 2, 0
@@ -291,7 +291,7 @@ sub_8069768: @ 8069768
lsls r0, 2
ldr r1, _08069784 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/map_preview_screen.s b/asm/map_preview_screen.s
index 27a66719d..2611298d4 100644
--- a/asm/map_preview_screen.s
+++ b/asm/map_preview_screen.s
@@ -105,7 +105,7 @@ sub_80F8180: @ 80F8180
movs r2, 0x1
bl sub_8001658
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
pop {r0}
bx r0
.align 2, 0
@@ -123,7 +123,7 @@ sub_80F819C: @ 80F819C
lsrs r5, r0, 24
cmp r5, 0x1C
beq _080F8224
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r4, _080F8200 @ =gUnknown_843E9E8
lsls r5, 4
adds r0, r4, 0
@@ -132,7 +132,7 @@ sub_80F819C: @ 80F819C
ldr r0, [r0]
movs r1, 0xD0
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x4
adds r4, r5, r4
ldr r1, [r4]
@@ -141,17 +141,17 @@ sub_80F819C: @ 80F819C
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
movs r0, 0
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
bne _080F8208
movs r0, 0x80
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, _080F8204 @ =gUnknown_203ABED
movs r0, 0x1
strb r0, [r1]
@@ -170,9 +170,9 @@ _080F820C:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_080F8224:
add sp, 0x4
pop {r4,r5}
@@ -194,8 +194,8 @@ sub_80F8234: @ 80F8234
cmp r0, 0
beq _080F8250
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
_080F8250:
pop {r0}
bx r0
@@ -206,7 +206,7 @@ _080F8254: .4byte gUnknown_203ABED
thumb_func_start sub_80F8258
sub_80F8258: @ 80F8258
push {lr}
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -221,13 +221,13 @@ sub_80F8268: @ 80F8268
lsrs r6, 24
ldr r0, _080F8308 @ =sub_80F83D0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
movs r1, 0x7
- bl sub_8001AA8
+ bl GetBgAttribute
ldr r1, _080F830C @ =gUnknown_3005090
lsls r5, r4, 2
adds r5, r4
@@ -236,19 +236,19 @@ sub_80F8268: @ 80F8268
movs r4, 0
strh r0, [r5, 0xC]
movs r0, 0x50
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r5, 0x10]
movs r0, 0x52
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r5, 0x12]
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r5, 0xE]
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r5, 0x14]
movs r0, 0x4A
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r5, 0x16]
adds r0, r6, 0
bl sub_80F856C
@@ -259,23 +259,23 @@ sub_80F8268: @ 80F8268
movs r0, 0
movs r1, 0x7
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
ldr r1, _080F8310 @ =0x00003e41
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F8314 @ =0x00002020
movs r0, 0x48
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x4A
movs r1, 0x20
- bl sub_8000AF4
+ bl SetGpuRegBits
adds r0, r6, 0
bl sub_80F8318
strh r0, [r5, 0x1E]
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r4-r6}
pop {r0}
bx r0
@@ -307,9 +307,9 @@ sub_80F8318: @ 80F8318
lsrs r6, 24
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r6, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add r1, sp, 0x14
movs r0, 0
mov r9, r0
@@ -363,7 +363,7 @@ _080F83AC: .4byte gUnknown_2021D18
sub_80F83B0: @ 80F83B0
push {lr}
ldr r0, _080F83C4 @ =sub_80F83D0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -418,7 +418,7 @@ _080F8418:
beq _080F8422
b _080F853C
_080F8422:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _080F842E
@@ -429,7 +429,7 @@ _080F842E:
bl sub_8003F20
b _080F84EA
_080F8438:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080F853C
@@ -497,7 +497,7 @@ _080F84A2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -513,16 +513,16 @@ _080F84A2:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_080F84EA:
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
b _080F853C
_080F84F2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080F853C
@@ -532,24 +532,24 @@ _080F84F2:
ldrb r2, [r4, 0x4]
movs r0, 0
movs r1, 0x7
- bl sub_80019E4
+ bl SetBgAttribute
ldrh r1, [r4, 0x6]
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x8]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xA]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xC]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0xE]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_080F853C:
add sp, 0x8
pop {r4,r5}
diff --git a/asm/math_util.s b/asm/math_util.s
index fc245ab7f..249a4508d 100644
--- a/asm/math_util.s
+++ b/asm/math_util.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80D8AA0
-sub_80D8AA0: @ 80D8AA0
+ thumb_func_start .gcc2_compiled._3
+.gcc2_compiled._3: @ 80D8AA0
push {lr}
lsls r0, 16
asrs r0, 16
@@ -22,7 +22,7 @@ _080D8AB4:
asrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80D8AA0
+ thumb_func_end .gcc2_compiled._3
thumb_func_start sub_80D8ABC
sub_80D8ABC: @ 80D8ABC
diff --git a/asm/menews_jisan.s b/asm/menews_jisan.s
index 69ea1110c..4b3849cea 100644
--- a/asm/menews_jisan.s
+++ b/asm/menews_jisan.s
@@ -30,7 +30,7 @@ _08146C56:
beq _08146C6E
b _08146C80
_08146C5C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
@@ -38,7 +38,7 @@ _08146C5C:
adds r0, 0x10
b _08146C7E
_08146C6E:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xF
diff --git a/asm/menu.s b/asm/menu.s
index 4ac8d7eb9..dbd43ea94 100644
--- a/asm/menu.s
+++ b/asm/menu.s
@@ -19,12 +19,12 @@ sub_810EDC4: @ 810EDC4
strb r3, [r0]
ldr r1, _0810EE08 @ =sub_810EE5C
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _0810EDFA
adds r0, r5, 0
@@ -57,12 +57,12 @@ sub_810EE0C: @ 810EE0C
strb r0, [r5]
ldr r1, _0810EE58 @ =sub_810EE5C
adds r0, r6, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r6, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _0810EE4A
adds r0, r6, 0
@@ -121,7 +121,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x14]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r0, r9
ldrh r1, [r0]
adds r1, 0x1
@@ -140,7 +140,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x2
@@ -155,7 +155,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0xC]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x3
@@ -174,7 +174,7 @@ sub_810EE5C: @ 810EE5C
str r0, [sp, 0x8]
adds r0, r6, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r0, r9
ldrh r1, [r0]
adds r1, 0x4
@@ -191,7 +191,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x5
@@ -205,7 +205,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x14]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x6
@@ -219,7 +219,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x8
@@ -233,7 +233,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x1C]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0x9
@@ -247,7 +247,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0xA
@@ -265,7 +265,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x14]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0xB
@@ -279,7 +279,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0xC
@@ -293,7 +293,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r3, r9
ldrh r1, [r3]
adds r1, 0xD
@@ -307,7 +307,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F230 @ =0x0000080a
adds r1, r3, 0
mov r0, r9
@@ -327,7 +327,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x14]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F234 @ =0x0000080b
adds r1, r3, 0
mov r0, r9
@@ -343,7 +343,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F238 @ =0x0000080c
adds r1, r3, 0
mov r0, r9
@@ -359,7 +359,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F23C @ =0x0000080d
adds r1, r3, 0
mov r0, r9
@@ -375,7 +375,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F240 @ =0x00000805
adds r1, r3, 0
mov r0, r9
@@ -395,7 +395,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x14]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F244 @ =0x00000806
adds r1, r3, 0
mov r0, r9
@@ -411,7 +411,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F248 @ =0x00000808
adds r1, r3, 0
mov r0, r9
@@ -427,7 +427,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F24C @ =0x00000809
adds r1, r3, 0
mov r0, r9
@@ -443,7 +443,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r3, 0x80
lsls r3, 4
adds r1, r3, 0
@@ -465,7 +465,7 @@ sub_810EE5C: @ 810EE5C
str r0, [sp, 0x8]
adds r0, r6, 0
ldr r2, [sp, 0x14]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F250 @ =0x00000801
adds r1, r3, 0
mov r0, r9
@@ -481,7 +481,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x18]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r3, _0810F254 @ =0x00000802
adds r1, r3, 0
mov r0, r9
@@ -498,7 +498,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0xC]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _0810F258 @ =0x00000803
adds r1, r0, 0
mov r2, r9
@@ -514,7 +514,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
ldr r2, [sp, 0x1C]
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _0810F25C @ =0x00000804
adds r1, r0, 0
mov r2, r9
@@ -530,7 +530,7 @@ sub_810EE5C: @ 810EE5C
adds r0, r6, 0
adds r2, r7, 0
mov r3, r10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -566,12 +566,12 @@ sub_810F260: @ 810F260
lsrs r4, 24
ldr r1, _0810F294 @ =sub_810F298
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
cmp r4, 0x1
bne _0810F28E
adds r0, r5, 0
@@ -620,15 +620,15 @@ sub_810F298: @ 810F298
str r1, [sp, 0x8]
adds r2, r4, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4,r5}
pop {r0}
bx r0
thumb_func_end sub_810F298
- thumb_func_start sub_810F2E8
-sub_810F2E8: @ 810F2E8
+ thumb_func_start SetWindowBorderStyle
+SetWindowBorderStyle: @ 810F2E8
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 24
@@ -639,14 +639,14 @@ sub_810F2E8: @ 810F2E8
strh r2, [r0]
ldr r0, _0810F328 @ =gUnknown_203ADF2
strb r3, [r0]
- ldr r1, _0810F32C @ =sub_810F380
+ ldr r1, _0810F32C @ =DrawWindowBorder
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _0810F31E
adds r0, r5, 0
@@ -659,8 +659,8 @@ _0810F31E:
.align 2, 0
_0810F324: .4byte gUnknown_203ADF0
_0810F328: .4byte gUnknown_203ADF2
-_0810F32C: .4byte sub_810F380
- thumb_func_end sub_810F2E8
+_0810F32C: .4byte DrawWindowBorder
+ thumb_func_end SetWindowBorderStyle
thumb_func_start sub_810F330
sub_810F330: @ 810F330
@@ -677,14 +677,14 @@ sub_810F330: @ 810F330
movs r1, 0x5
bl sub_8004950
strb r0, [r5]
- ldr r1, _0810F37C @ =sub_810F380
+ ldr r1, _0810F37C @ =DrawWindowBorder
adds r0, r6, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r6, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r6, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _0810F36E
adds r0, r6, 0
@@ -697,11 +697,11 @@ _0810F36E:
.align 2, 0
_0810F374: .4byte gUnknown_203ADF0
_0810F378: .4byte gUnknown_203ADF2
-_0810F37C: .4byte sub_810F380
+_0810F37C: .4byte DrawWindowBorder
thumb_func_end sub_810F330
- thumb_func_start sub_810F380
-sub_810F380: @ 810F380
+ thumb_func_start DrawWindowBorder
+DrawWindowBorder: @ 810F380
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -745,7 +745,7 @@ sub_810F380: @ 810F380
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r2, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r2]
adds r1, 0x1
@@ -759,7 +759,7 @@ sub_810F380: @ 810F380
mov r0, r9
ldr r2, [sp, 0xC]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r2, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r2]
adds r1, 0x2
@@ -778,7 +778,7 @@ sub_810F380: @ 810F380
mov r0, r9
mov r2, r10
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r0]
adds r1, 0x3
@@ -792,7 +792,7 @@ sub_810F380: @ 810F380
mov r0, r9
adds r2, r6, 0
mov r3, r8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r0]
adds r1, 0x5
@@ -806,7 +806,7 @@ sub_810F380: @ 810F380
mov r0, r9
mov r2, r10
mov r3, r8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r0]
adds r1, 0x6
@@ -825,7 +825,7 @@ sub_810F380: @ 810F380
mov r0, r9
adds r2, r6, 0
mov r3, r8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r2, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r2]
adds r1, 0x7
@@ -839,7 +839,7 @@ sub_810F380: @ 810F380
mov r0, r9
ldr r2, [sp, 0xC]
mov r3, r8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r2, _0810F4D0 @ =gUnknown_203ADF0
ldrh r1, [r2]
adds r1, 0x8
@@ -852,7 +852,7 @@ sub_810F380: @ 810F380
mov r0, r9
mov r2, r10
mov r3, r8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -864,7 +864,7 @@ sub_810F380: @ 810F380
.align 2, 0
_0810F4D0: .4byte gUnknown_203ADF0
_0810F4D4: .4byte gUnknown_203ADF2
- thumb_func_end sub_810F380
+ thumb_func_end DrawWindowBorder
thumb_func_start sub_810F4D8
sub_810F4D8: @ 810F4D8
@@ -876,12 +876,12 @@ sub_810F4D8: @ 810F4D8
lsrs r4, 24
ldr r1, _0810F50C @ =sub_810F510
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
cmp r4, 0x1
bne _0810F506
adds r0, r5, 0
@@ -926,7 +926,7 @@ sub_810F510: @ 810F510
str r1, [sp, 0x8]
adds r2, r4, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -991,10 +991,10 @@ _0810F5C0:
lsrs r5, r0, 24
_0810F5C4:
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0810F5E4 @ =gUnknown_203ADF4
ldrb r0, [r0]
add sp, 0x8
@@ -1018,10 +1018,10 @@ sub_810F5E8: @ 810F5E8
ldrb r0, [r4]
cmp r0, 0xFF
beq _0810F63E
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
adds r1, r5, 0
movs r2, 0
@@ -1093,10 +1093,10 @@ _0810F684:
strb r0, [r1, 0x2]
adds r4, r6, 0
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r5, 0
beq _0810F6CE
movs r0, 0
@@ -1171,7 +1171,7 @@ sub_810F71C: @ 810F71C
cmp r0, 0xFF
beq _0810F734
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
@@ -1191,9 +1191,9 @@ sub_810F740: @ 810F740
cmp r0, 0xFF
beq _0810F768
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x3
bl sub_8003F20
@@ -1252,7 +1252,7 @@ _0810F7BC:
strb r7, [r5, 0x2]
_0810F7BE:
movs r0, 0
- bl sub_810F904
+ bl MoveMenuCursor
ldr r0, _0810F7D4 @ =gUnknown_203ADE4
ldrb r0, [r0, 0x2]
pop {r3}
@@ -1347,8 +1347,8 @@ sub_810F818: @ 810F818
bx r1
thumb_func_end sub_810F818
- thumb_func_start sub_810F874
-sub_810F874: @ 810F874
+ thumb_func_start RedrawMenuCursor
+RedrawMenuCursor: @ 810F874
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1388,7 +1388,7 @@ sub_810F874: @ 810F874
str r0, [sp, 0x4]
mov r0, r9
movs r1, 0x1
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r5, 0x5]
ldrb r1, [r5, 0x6]
ldr r2, _0810F900 @ =gUnknown_841623B
@@ -1416,10 +1416,10 @@ sub_810F874: @ 810F874
.align 2, 0
_0810F8FC: .4byte gUnknown_203ADE4
_0810F900: .4byte gUnknown_841623B
- thumb_func_end sub_810F874
+ thumb_func_end RedrawMenuCursor
- thumb_func_start sub_810F904
-sub_810F904: @ 810F904
+ thumb_func_start MoveMenuCursor
+MoveMenuCursor: @ 810F904
push {r4,r5,lr}
ldr r1, _0810F924 @ =gUnknown_203ADE4
ldrb r5, [r1, 0x2]
@@ -1450,15 +1450,15 @@ _0810F936:
strb r0, [r4, 0x2]
ldrb r1, [r4, 0x2]
adds r0, r5, 0
- bl sub_810F874
+ bl RedrawMenuCursor
ldrb r0, [r4, 0x2]
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_810F904
+ thumb_func_end MoveMenuCursor
- thumb_func_start sub_810F948
-sub_810F948: @ 810F948
+ thumb_func_start MoveMenuCursorNoWrapAround
+MoveMenuCursorNoWrapAround: @ 810F948
push {r4,r5,lr}
ldr r1, _0810F968 @ =gUnknown_203ADE4
ldrb r5, [r1, 0x2]
@@ -1489,12 +1489,12 @@ _0810F97A:
strb r0, [r4, 0x2]
ldrb r1, [r4, 0x2]
adds r0, r5, 0
- bl sub_810F874
+ bl RedrawMenuCursor
ldrb r0, [r4, 0x2]
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_810F948
+ thumb_func_end MoveMenuCursorNoWrapAround
thumb_func_start sub_810F98C
sub_810F98C: @ 810F98C
@@ -1505,8 +1505,8 @@ sub_810F98C: @ 810F98C
_0810F994: .4byte gUnknown_203ADE4
thumb_func_end sub_810F98C
- thumb_func_start sub_810F998
-sub_810F998: @ 810F998
+ thumb_func_start ProcessMenuInput
+ProcessMenuInput: @ 810F998
push {r4,lr}
ldr r0, _0810F9BC @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -1554,7 +1554,7 @@ _0810F9E6:
bl sub_80722CC
movs r0, 0x1
_0810F9F6:
- bl sub_810F904
+ bl MoveMenuCursor
_0810F9FA:
movs r0, 0x2
negs r0, r0
@@ -1562,10 +1562,10 @@ _0810F9FE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_810F998
+ thumb_func_end ProcessMenuInput
- thumb_func_start sub_810FA04
-sub_810FA04: @ 810FA04
+ thumb_func_start ProcessMenuInputNoWrapAround
+ProcessMenuInputNoWrapAround: @ 810FA04
push {r4-r6,lr}
ldr r4, _0810FA2C @ =gUnknown_203ADE4
ldrb r5, [r4, 0x2]
@@ -1603,7 +1603,7 @@ _0810FA42:
beq _0810FA5C
movs r0, 0x1
negs r0, r0
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1615,7 +1615,7 @@ _0810FA5C:
cmp r0, 0
beq _0810FA78
movs r0, 0x1
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -1630,10 +1630,10 @@ _0810FA7C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_810FA04
+ thumb_func_end ProcessMenuInputNoWrapAround
- thumb_func_start sub_810FA84
-sub_810FA84: @ 810FA84
+ thumb_func_start ProcessMenuInput_other
+ProcessMenuInput_other: @ 810FA84
push {r4,lr}
ldr r2, _0810FAA8 @ =gUnknown_30030F0
ldrh r1, [r2, 0x2E]
@@ -1680,7 +1680,7 @@ _0810FAD4:
bl sub_80722CC
movs r0, 0x1
_0810FAE0:
- bl sub_810F904
+ bl MoveMenuCursor
_0810FAE4:
movs r0, 0x2
negs r0, r0
@@ -1688,10 +1688,10 @@ _0810FAE8:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_810FA84
+ thumb_func_end ProcessMenuInput_other
- thumb_func_start sub_810FAF0
-sub_810FAF0: @ 810FAF0
+ thumb_func_start ProcessMenuInputNoWrapAround_other
+ProcessMenuInputNoWrapAround_other: @ 810FAF0
push {r4-r6,lr}
ldr r4, _0810FB18 @ =gUnknown_203ADE4
ldrb r5, [r4, 0x2]
@@ -1730,7 +1730,7 @@ _0810FB2E:
bne _0810FB4A
movs r0, 0x1
negs r0, r0
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1740,7 +1740,7 @@ _0810FB4A:
cmp r1, 0x80
bne _0810FB62
movs r0, 0x1
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -1755,10 +1755,10 @@ _0810FB66:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_810FAF0
+ thumb_func_end ProcessMenuInputNoWrapAround_other
- thumb_func_start sub_810FB6C
-sub_810FB6C: @ 810FB6C
+ thumb_func_start PrintTextArray
+PrintTextArray: @ 810FB6C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1821,7 +1821,7 @@ _0810FBD0:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_810FB6C
+ thumb_func_end PrintTextArray
thumb_func_start sub_810FBE8
sub_810FBE8: @ 810FBE8
@@ -1935,7 +1935,7 @@ sub_810FC80: @ 810FC80
mov r0, r8
adds r1, r6, 0
movs r3, 0
- bl sub_810FB6C
+ bl PrintTextArray
add sp, 0xC
pop {r3}
mov r8, r3
@@ -2312,7 +2312,7 @@ sub_810FF60: @ 810FF60
movs r1, 0x1
adds r2, r4, 0
adds r3, r5, 0
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r0, _081100A0 @ =gUnknown_841623D
str r0, [sp, 0xC]
add r1, sp, 0xC
@@ -2448,7 +2448,7 @@ sub_81100A4: @ 81100A4
thumb_func_start sub_81100C8
sub_81100C8: @ 81100C8
push {r4,lr}
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -2869,7 +2869,7 @@ sub_811037C: @ 811037C
str r6, [sp, 0x4]
movs r1, 0x11
adds r2, r4, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r6, [r5, 0x9]
adds r0, r7, 0
adds r1, r6, 0
diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s
index 47ccd5500..766c07491 100644
--- a/asm/menu_helpers.s
+++ b/asm/menu_helpers.s
@@ -329,8 +329,8 @@ _080BF6D2:
bx r1
thumb_func_end sub_80BF6A8
- thumb_func_start sub_80BF6D8
-sub_80BF6D8: @ 80BF6D8
+ thumb_func_start itemid_80BF6D8_mail_related
+itemid_80BF6D8_mail_related: @ 80BF6D8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -355,7 +355,7 @@ _080BF702:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80BF6D8
+ thumb_func_end itemid_80BF6D8_mail_related
thumb_func_start sub_80BF708
sub_80BF708: @ 80BF708
@@ -422,9 +422,9 @@ _080BF764:
sub_80BF768: @ 80BF768
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_80BF768
@@ -470,51 +470,51 @@ sub_80BF7C8: @ 80BF7C8
push {lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_80BF7C8
diff --git a/asm/menu_indicators.s b/asm/menu_indicators.s
index e4a817059..405891a33 100644
--- a/asm/menu_indicators.s
+++ b/asm/menu_indicators.s
@@ -21,7 +21,7 @@ _08133916:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x2E]
adds r0, 0x1
strh r0, [r4, 0x2E]
@@ -84,8 +84,8 @@ _08133984:
_0813398C: .4byte gUnknown_825E074
thumb_func_end sub_8133904
- thumb_func_start sub_8133990
-sub_8133990: @ 8133990
+ thumb_func_start AddScrollIndicatorArrowObject
+AddScrollIndicatorArrowObject: @ 8133990
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -114,7 +114,7 @@ sub_8133990: @ 8133990
mov r3, r12
strh r3, [r0, 0x2]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _08133A18 @ =gUnknown_202063C
@@ -154,10 +154,10 @@ sub_8133990: @ 8133990
_08133A14: .4byte gUnknown_84632A4
_08133A18: .4byte gUnknown_202063C
_08133A1C: .4byte gUnknown_846325C
- thumb_func_end sub_8133990
+ thumb_func_end AddScrollIndicatorArrowObject
- thumb_func_start sub_8133A20
-sub_8133A20: @ 8133A20
+ thumb_func_start AddScrollIndicatorArrowPair
+AddScrollIndicatorArrowPair: @ 8133A20
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -180,7 +180,7 @@ sub_8133A20: @ 8133A20
orrs r0, r1
str r0, [sp, 0x8]
add r0, sp, 0x4
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldrh r2, [r6, 0xC]
cmp r2, r4
bne _08133A7C
@@ -192,7 +192,7 @@ sub_8133A20: @ 8133A20
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08133A8E
.align 2, 0
_08133A6C: .4byte gUnknown_8463328
@@ -207,11 +207,11 @@ _08133A7C:
ands r1, r5
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_8008928
+ bl LoadSpritePalette
_08133A8E:
ldr r0, _08133B30 @ =sub_8133BA4
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -238,7 +238,7 @@ _08133A8E:
ldrh r3, [r6, 0xA]
ldrh r4, [r6, 0xC]
str r4, [sp]
- bl sub_8133990
+ bl AddScrollIndicatorArrowObject
strb r0, [r7, 0xC]
ldrb r0, [r6, 0x3]
ldrb r1, [r6, 0x4]
@@ -246,7 +246,7 @@ _08133A8E:
ldrh r3, [r6, 0xA]
ldrh r4, [r6, 0xC]
str r4, [sp]
- bl sub_8133990
+ bl AddScrollIndicatorArrowObject
strb r0, [r7, 0xD]
ldrh r1, [r6, 0xC]
ldr r0, _08133B38 @ =0x0000ffff
@@ -292,10 +292,10 @@ _08133B30: .4byte sub_8133BA4
_08133B34: .4byte gUnknown_3005098
_08133B38: .4byte 0x0000ffff
_08133B3C: .4byte gUnknown_202063C
- thumb_func_end sub_8133A20
+ thumb_func_end AddScrollIndicatorArrowPair
- thumb_func_start sub_8133B40
-sub_8133B40: @ 8133B40
+ thumb_func_start AddScrollIndicatorArrowPairParametrized
+AddScrollIndicatorArrowPairParametrized: @ 8133B40
push {r4,lr}
adds r4, r1, 0
subs r0, 0x2
@@ -337,7 +337,7 @@ _08133B76:
strb r1, [r2, 0xE]
adds r0, r2, 0
ldr r1, [sp, 0x14]
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
lsls r0, 24
lsrs r0, 24
pop {r4}
@@ -345,7 +345,7 @@ _08133B76:
bx r1
.align 2, 0
_08133BA0: .4byte gUnknown_203B130
- thumb_func_end sub_8133B40
+ thumb_func_end AddScrollIndicatorArrowPairParametrized
thumb_func_start sub_8133BA4
sub_8133BA4: @ 8133BA4
@@ -423,8 +423,8 @@ _08133C28:
bx r0
thumb_func_end sub_8133BA4
- thumb_func_start sub_8133C30
-sub_8133C30: @ 8133C30
+ thumb_func_start RemoveScrollIndicatorArrowPair
+RemoveScrollIndicatorArrowPair: @ 8133C30
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -438,12 +438,12 @@ sub_8133C30: @ 8133C30
ldr r4, _08133C88 @ =0x0000ffff
cmp r0, r4
beq _08133C4E
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_08133C4E:
ldrh r0, [r5, 0x10]
cmp r0, r4
beq _08133C58
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_08133C58:
ldrb r1, [r5, 0xC]
lsls r0, r1, 4
@@ -451,15 +451,15 @@ _08133C58:
lsls r0, 2
ldr r4, _08133C8C @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrb r1, [r5, 0xD]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -467,29 +467,29 @@ _08133C58:
_08133C84: .4byte gUnknown_3005098
_08133C88: .4byte 0x0000ffff
_08133C8C: .4byte gUnknown_202063C
- thumb_func_end sub_8133C30
+ thumb_func_end RemoveScrollIndicatorArrowPair
- thumb_func_start sub_8133C90
-sub_8133C90: @ 8133C90
+ thumb_func_start ListMenuAddCursorObjectInternal
+ListMenuAddCursorObjectInternal: @ 8133C90
push {lr}
cmp r1, 0
beq _08133C9A
cmp r1, 0x1
beq _08133CA0
_08133C9A:
- bl sub_8133E38
+ bl ListMenuAddRedOutlineCursorObject
b _08133CA4
_08133CA0:
- bl sub_8134070
+ bl ListMenuAddRedArrowCursorObject
_08133CA4:
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8133C90
+ thumb_func_end ListMenuAddCursorObjectInternal
- thumb_func_start sub_8133CAC
-sub_8133CAC: @ 8133CAC
+ thumb_func_start ListMenuUpdateCursorObject
+ListMenuUpdateCursorObject: @ 8133CAC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -503,17 +503,17 @@ sub_8133CAC: @ 8133CAC
beq _08133CCA
b _08133CCE
_08133CC4:
- bl sub_8133FA4
+ bl ListMenuUpdateRedOutlineCursorObject
b _08133CCE
_08133CCA:
- bl sub_8134178
+ bl ListMenuUpdateRedArrowCursorObject
_08133CCE:
pop {r0}
bx r0
- thumb_func_end sub_8133CAC
+ thumb_func_end ListMenuUpdateCursorObject
- thumb_func_start sub_8133CD4
-sub_8133CD4: @ 8133CD4
+ thumb_func_start ListMenuRemoveCursorObject
+ListMenuRemoveCursorObject: @ 8133CD4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -523,22 +523,22 @@ sub_8133CD4: @ 8133CD4
beq _08133CEA
b _08133CEE
_08133CE4:
- bl sub_8133FE8
+ bl ListMenuRemoveRedOutlineCursorObject
b _08133CEE
_08133CEA:
- bl sub_81341B0
+ bl ListMenuRemoveRedArrowCursorObject
_08133CEE:
pop {r0}
bx r0
- thumb_func_end sub_8133CD4
+ thumb_func_end ListMenuRemoveCursorObject
thumb_func_start nullsub_94
nullsub_94: @ 8133CF4
bx lr
thumb_func_end nullsub_94
- thumb_func_start sub_8133CF8
-sub_8133CF8: @ 8133CF8
+ thumb_func_start ListMenuGetRedOutlineCursorSpriteCount
+ListMenuGetRedOutlineCursorSpriteCount: @ 8133CF8
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -573,10 +573,10 @@ _08133D2C:
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8133CF8
+ thumb_func_end ListMenuGetRedOutlineCursorSpriteCount
- thumb_func_start sub_8133D34
-sub_8133D34: @ 8133D34
+ thumb_func_start ListMenuSetUpRedOutlineCursorSpriteOamTable
+ListMenuSetUpRedOutlineCursorSpriteOamTable: @ 8133D34
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -703,10 +703,10 @@ _08133E28: .4byte gUnknown_84632C4
_08133E2C: .4byte gUnknown_84632D0
_08133E30: .4byte gUnknown_84632C8
_08133E34: .4byte gUnknown_84632CC
- thumb_func_end sub_8133D34
+ thumb_func_end ListMenuSetUpRedOutlineCursorSpriteOamTable
- thumb_func_start sub_8133E38
-sub_8133E38: @ 8133E38
+ thumb_func_start ListMenuAddRedOutlineCursorObject
+ListMenuAddRedOutlineCursorObject: @ 8133E38
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -727,7 +727,7 @@ sub_8133E38: @ 8133E38
ands r1, r3
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldrh r2, [r6, 0x8]
ldr r7, _08133E8C @ =0x0000ffff
cmp r2, r7
@@ -740,7 +740,7 @@ sub_8133E38: @ 8133E38
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08133EA6
.align 2, 0
_08133E84: .4byte gUnknown_8463398
@@ -755,11 +755,11 @@ _08133E94:
ands r1, r5
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_8008928
+ bl LoadSpritePalette
_08133EA6:
ldr r0, _08133F90 @ =nullsub_94
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r4, r0, 0
@@ -776,17 +776,17 @@ _08133EA6:
strh r0, [r5, 0x10]
ldrh r0, [r6, 0x2]
ldrh r1, [r6, 0x4]
- bl sub_8133CF8
+ bl ListMenuGetRedOutlineCursorSpriteCount
strb r0, [r5]
ldrb r0, [r5]
lsls r0, 2
- bl sub_8002B9C
+ bl Alloc
adds r2, r0, 0
str r2, [r5, 0x8]
str r2, [r5, 0x4]
ldrh r0, [r6, 0x2]
ldrh r1, [r6, 0x4]
- bl sub_8133D34
+ bl ListMenuSetUpRedOutlineCursorSpriteOamTable
mov r1, sp
ldr r0, _08133F98 @ =gUnknown_8231D00
ldm r0!, {r2,r3,r7}
@@ -804,7 +804,7 @@ _08133EA6:
adds r2, 0x78
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r5, 0xC]
ldrb r1, [r5, 0xC]
lsls r0, r1, 4
@@ -813,7 +813,7 @@ _08133EA6:
ldr r7, _08133F9C @ =gUnknown_202063C
adds r0, r7
adds r1, r5, 0
- bl sub_8008A58
+ bl SetSubspriteTables
ldrb r0, [r5, 0xC]
lsls r1, r0, 4
adds r1, r0
@@ -874,10 +874,10 @@ _08133F94: .4byte gUnknown_3005098
_08133F98: .4byte gUnknown_8231D00
_08133F9C: .4byte gUnknown_202063C
_08133FA0: .4byte 0x0000ffff
- thumb_func_end sub_8133E38
+ thumb_func_end ListMenuAddRedOutlineCursorObject
- thumb_func_start sub_8133FA4
-sub_8133FA4: @ 8133FA4
+ thumb_func_start ListMenuUpdateRedOutlineCursorObject
+ListMenuUpdateRedOutlineCursorObject: @ 8133FA4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -911,10 +911,10 @@ sub_8133FA4: @ 8133FA4
.align 2, 0
_08133FE0: .4byte gUnknown_3005098
_08133FE4: .4byte gUnknown_202063C
- thumb_func_end sub_8133FA4
+ thumb_func_end ListMenuUpdateRedOutlineCursorObject
- thumb_func_start sub_8133FE8
-sub_8133FE8: @ 8133FE8
+ thumb_func_start ListMenuRemoveRedOutlineCursorObject
+ListMenuRemoveRedOutlineCursorObject: @ 8133FE8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -925,17 +925,17 @@ sub_8133FE8: @ 8133FE8
ldr r1, _08134034 @ =gUnknown_3005098
adds r4, r0, r1
ldr r0, [r4, 0x8]
- bl sub_8002BC4
+ bl Free
ldrh r0, [r4, 0xE]
ldr r6, _08134038 @ =0x0000ffff
cmp r0, r6
beq _0813400C
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_0813400C:
ldrh r0, [r4, 0x10]
cmp r0, r6
beq _08134016
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_08134016:
ldrb r1, [r4, 0xC]
lsls r0, r1, 4
@@ -943,9 +943,9 @@ _08134016:
lsls r0, 2
ldr r1, _0813403C @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -953,10 +953,10 @@ _08134016:
_08134034: .4byte gUnknown_3005098
_08134038: .4byte 0x0000ffff
_0813403C: .4byte gUnknown_202063C
- thumb_func_end sub_8133FE8
+ thumb_func_end ListMenuRemoveRedOutlineCursorObject
- thumb_func_start sub_8134040
-sub_8134040: @ 8134040
+ thumb_func_start ObjectCB_RedArrowCursor
+ObjectCB_RedArrowCursor: @ 8134040
push {lr}
adds r2, r0, 0
ldr r1, _08134068 @ =gUnknown_825E074
@@ -979,15 +979,15 @@ _08134058:
bx r0
.align 2, 0
_08134068: .4byte gUnknown_825E074
- thumb_func_end sub_8134040
+ thumb_func_end ObjectCB_RedArrowCursor
thumb_func_start nullsub_95
nullsub_95: @ 813406C
bx lr
thumb_func_end nullsub_95
- thumb_func_start sub_8134070
-sub_8134070: @ 8134070
+ thumb_func_start ListMenuAddRedArrowCursorObject
+ListMenuAddRedArrowCursorObject: @ 8134070
push {r4-r7,lr}
sub sp, 0x28
adds r5, r0, 0
@@ -1005,7 +1005,7 @@ sub_8134070: @ 8134070
ands r1, r4
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldrh r2, [r5, 0x8]
cmp r2, r4
bne _081340C4
@@ -1017,7 +1017,7 @@ sub_8134070: @ 8134070
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _081340D6
.align 2, 0
_081340B4: .4byte gUnknown_84633D8
@@ -1032,11 +1032,11 @@ _081340C4:
ands r1, r6
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_8008928
+ bl LoadSpritePalette
_081340D6:
ldr r0, _08134164 @ =nullsub_95
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1064,7 +1064,7 @@ _081340D6:
ldrb r2, [r5, 0x1]
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4]
ldr r3, _08134170 @ =gUnknown_202063C
ldrb r1, [r4]
@@ -1109,10 +1109,10 @@ _08134168: .4byte gUnknown_3005098
_0813416C: .4byte gUnknown_84632F0
_08134170: .4byte gUnknown_202063C
_08134174: .4byte 0x0000ffff
- thumb_func_end sub_8134070
+ thumb_func_end ListMenuAddRedArrowCursorObject
- thumb_func_start sub_8134178
-sub_8134178: @ 8134178
+ thumb_func_start ListMenuUpdateRedArrowCursorObject
+ListMenuUpdateRedArrowCursorObject: @ 8134178
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -1140,10 +1140,10 @@ sub_8134178: @ 8134178
.align 2, 0
_081341A8: .4byte gUnknown_3005098
_081341AC: .4byte gUnknown_202063C
- thumb_func_end sub_8134178
+ thumb_func_end ListMenuUpdateRedArrowCursorObject
- thumb_func_start sub_81341B0
-sub_81341B0: @ 81341B0
+ thumb_func_start ListMenuRemoveRedArrowCursorObject
+ListMenuRemoveRedArrowCursorObject: @ 81341B0
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -1157,12 +1157,12 @@ sub_81341B0: @ 81341B0
ldr r6, _081341F8 @ =0x0000ffff
cmp r0, r6
beq _081341CE
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_081341CE:
ldrh r0, [r4, 0x4]
cmp r0, r6
beq _081341D8
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_081341D8:
ldrb r1, [r4]
lsls r0, r1, 4
@@ -1170,9 +1170,9 @@ _081341D8:
lsls r0, 2
ldr r1, _081341FC @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4-r6}
pop {r0}
bx r0
@@ -1180,6 +1180,6 @@ _081341D8:
_081341F4: .4byte gUnknown_3005098
_081341F8: .4byte 0x0000ffff
_081341FC: .4byte gUnknown_202063C
- thumb_func_end sub_81341B0
+ thumb_func_end ListMenuRemoveRedArrowCursorObject
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/metatile_behavior.s b/asm/metatile_behavior.s
index 4d29a8cd4..dc4c567ac 100644
--- a/asm/metatile_behavior.s
+++ b/asm/metatile_behavior.s
@@ -11,8 +11,8 @@ sub_8059AF0: @ 8059AF0
bx lr
thumb_func_end sub_8059AF0
- thumb_func_start sub_8059AF4
-sub_8059AF4: @ 8059AF4
+ thumb_func_start MetatileBehavior_IsJumpEast
+MetatileBehavior_IsJumpEast: @ 8059AF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -25,10 +25,10 @@ _08059B02:
_08059B04:
pop {r1}
bx r1
- thumb_func_end sub_8059AF4
+ thumb_func_end MetatileBehavior_IsJumpEast
- thumb_func_start sub_8059B08
-sub_8059B08: @ 8059B08
+ thumb_func_start MetatileBehavior_IsJumpWest
+MetatileBehavior_IsJumpWest: @ 8059B08
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -41,10 +41,10 @@ _08059B16:
_08059B18:
pop {r1}
bx r1
- thumb_func_end sub_8059B08
+ thumb_func_end MetatileBehavior_IsJumpWest
- thumb_func_start sub_8059B1C
-sub_8059B1C: @ 8059B1C
+ thumb_func_start MetatileBehavior_IsJumpNorth
+MetatileBehavior_IsJumpNorth: @ 8059B1C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -57,10 +57,10 @@ _08059B2A:
_08059B2C:
pop {r1}
bx r1
- thumb_func_end sub_8059B1C
+ thumb_func_end MetatileBehavior_IsJumpNorth
- thumb_func_start sub_8059B30
-sub_8059B30: @ 8059B30
+ thumb_func_start MetatileBehavior_IsJumpSouth
+MetatileBehavior_IsJumpSouth: @ 8059B30
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -73,7 +73,7 @@ _08059B3E:
_08059B40:
pop {r1}
bx r1
- thumb_func_end sub_8059B30
+ thumb_func_end MetatileBehavior_IsJumpSouth
thumb_func_start sub_8059B44
sub_8059B44: @ 8059B44
@@ -553,8 +553,8 @@ _08059DD0:
bx r1
thumb_func_end sub_8059DC0
- thumb_func_start sub_8059DD4
-sub_8059DD4: @ 8059DD4
+ thumb_func_start MetatileBehavior_IsWalkNorth
+MetatileBehavior_IsWalkNorth: @ 8059DD4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -567,10 +567,10 @@ _08059DE2:
_08059DE4:
pop {r1}
bx r1
- thumb_func_end sub_8059DD4
+ thumb_func_end MetatileBehavior_IsWalkNorth
- thumb_func_start sub_8059DE8
-sub_8059DE8: @ 8059DE8
+ thumb_func_start MetatileBehavior_IsWalkSouth
+MetatileBehavior_IsWalkSouth: @ 8059DE8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -583,10 +583,10 @@ _08059DF6:
_08059DF8:
pop {r1}
bx r1
- thumb_func_end sub_8059DE8
+ thumb_func_end MetatileBehavior_IsWalkSouth
- thumb_func_start sub_8059DFC
-sub_8059DFC: @ 8059DFC
+ thumb_func_start MetatileBehavior_IsWalkWest
+MetatileBehavior_IsWalkWest: @ 8059DFC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -599,10 +599,10 @@ _08059E0A:
_08059E0C:
pop {r1}
bx r1
- thumb_func_end sub_8059DFC
+ thumb_func_end MetatileBehavior_IsWalkWest
- thumb_func_start sub_8059E10
-sub_8059E10: @ 8059E10
+ thumb_func_start MetatileBehavior_IsWalkEast
+MetatileBehavior_IsWalkEast: @ 8059E10
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -615,10 +615,10 @@ _08059E1E:
_08059E20:
pop {r1}
bx r1
- thumb_func_end sub_8059E10
+ thumb_func_end MetatileBehavior_IsWalkEast
- thumb_func_start sub_8059E24
-sub_8059E24: @ 8059E24
+ thumb_func_start MetatileBehavior_IsNorthwardCurrent
+MetatileBehavior_IsNorthwardCurrent: @ 8059E24
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -631,10 +631,10 @@ _08059E32:
_08059E34:
pop {r1}
bx r1
- thumb_func_end sub_8059E24
+ thumb_func_end MetatileBehavior_IsNorthwardCurrent
- thumb_func_start sub_8059E38
-sub_8059E38: @ 8059E38
+ thumb_func_start MetatileBehavior_IsSouthwardCurrent
+MetatileBehavior_IsSouthwardCurrent: @ 8059E38
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -647,10 +647,10 @@ _08059E46:
_08059E48:
pop {r1}
bx r1
- thumb_func_end sub_8059E38
+ thumb_func_end MetatileBehavior_IsSouthwardCurrent
- thumb_func_start sub_8059E4C
-sub_8059E4C: @ 8059E4C
+ thumb_func_start MetatileBehavior_IsWestwardCurrent
+MetatileBehavior_IsWestwardCurrent: @ 8059E4C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -663,10 +663,10 @@ _08059E5A:
_08059E5C:
pop {r1}
bx r1
- thumb_func_end sub_8059E4C
+ thumb_func_end MetatileBehavior_IsWestwardCurrent
- thumb_func_start sub_8059E60
-sub_8059E60: @ 8059E60
+ thumb_func_start MetatileBehavior_IsEastwardCurrent
+MetatileBehavior_IsEastwardCurrent: @ 8059E60
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -679,10 +679,10 @@ _08059E6E:
_08059E70:
pop {r1}
bx r1
- thumb_func_end sub_8059E60
+ thumb_func_end MetatileBehavior_IsEastwardCurrent
- thumb_func_start sub_8059E74
-sub_8059E74: @ 8059E74
+ thumb_func_start MetatileBehavior_IsSlideNorth
+MetatileBehavior_IsSlideNorth: @ 8059E74
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -695,10 +695,10 @@ _08059E82:
_08059E84:
pop {r1}
bx r1
- thumb_func_end sub_8059E74
+ thumb_func_end MetatileBehavior_IsSlideNorth
- thumb_func_start sub_8059E88
-sub_8059E88: @ 8059E88
+ thumb_func_start MetatileBehavior_IsSlideSouth
+MetatileBehavior_IsSlideSouth: @ 8059E88
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -711,10 +711,10 @@ _08059E96:
_08059E98:
pop {r1}
bx r1
- thumb_func_end sub_8059E88
+ thumb_func_end MetatileBehavior_IsSlideSouth
- thumb_func_start sub_8059E9C
-sub_8059E9C: @ 8059E9C
+ thumb_func_start MetatileBehavior_IsSlideWest
+MetatileBehavior_IsSlideWest: @ 8059E9C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -727,10 +727,10 @@ _08059EAA:
_08059EAC:
pop {r1}
bx r1
- thumb_func_end sub_8059E9C
+ thumb_func_end MetatileBehavior_IsSlideWest
- thumb_func_start sub_8059EB0
-sub_8059EB0: @ 8059EB0
+ thumb_func_start MetatileBehavior_IsSlideEast
+MetatileBehavior_IsSlideEast: @ 8059EB0
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -743,10 +743,10 @@ _08059EBE:
_08059EC0:
pop {r1}
bx r1
- thumb_func_end sub_8059EB0
+ thumb_func_end MetatileBehavior_IsSlideEast
- thumb_func_start sub_8059EC4
-sub_8059EC4: @ 8059EC4
+ thumb_func_start MetatileBehavior_IsCounter
+MetatileBehavior_IsCounter: @ 8059EC4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -759,10 +759,10 @@ _08059ED2:
_08059ED4:
pop {r1}
bx r1
- thumb_func_end sub_8059EC4
+ thumb_func_end MetatileBehavior_IsCounter
- thumb_func_start sub_8059ED8
-sub_8059ED8: @ 8059ED8
+ thumb_func_start MetatileBehavior_IsPlayerFacingTVScreen
+MetatileBehavior_IsPlayerFacingTVScreen: @ 8059ED8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -780,10 +780,10 @@ _08059EEE:
_08059EF0:
pop {r1}
bx r1
- thumb_func_end sub_8059ED8
+ thumb_func_end MetatileBehavior_IsPlayerFacingTVScreen
- thumb_func_start sub_8059EF4
-sub_8059EF4: @ 8059EF4
+ thumb_func_start MetatileBehavior_IsPC
+MetatileBehavior_IsPC: @ 8059EF4
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -796,7 +796,7 @@ _08059F02:
_08059F04:
pop {r1}
bx r1
- thumb_func_end sub_8059EF4
+ thumb_func_end MetatileBehavior_IsPC
thumb_func_start sub_8059F08
sub_8059F08: @ 8059F08
diff --git a/asm/mevent.s b/asm/mevent.s
index e3c309666..b4735a4c8 100644
--- a/asm/mevent.s
+++ b/asm/mevent.s
@@ -372,7 +372,7 @@ sub_81438A0: @ 81438A0
push {r4,lr}
ldr r0, _081438E0 @ =sub_8143910
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 2
@@ -394,7 +394,7 @@ sub_81438A0: @ 81438A0
strh r0, [r4, 0x6]
strb r1, [r4, 0xE]
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x10]
pop {r4}
pop {r0}
@@ -489,7 +489,7 @@ _081439A8:
adds r0, r4, 0
adds r0, 0x9
ldr r1, _081439C0 @ =gUnknown_841DE52
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _081439B8
b _08143D1A
@@ -529,7 +529,7 @@ _081439F8:
adds r0, r4, 0
adds r0, 0x9
ldr r1, _08143A1C @ =gUnknown_841DE53
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _08143A08
b _08143D1A
@@ -626,7 +626,7 @@ _08143AD8:
adds r0, r4, 0
adds r0, 0x9
ldr r1, _08143AF0 @ =gUnknown_841DE7C
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
bne _08143AE8
b _08143D1A
@@ -764,13 +764,13 @@ _08143C00:
bl sub_80098B8
b _08143C4C
_08143C06:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
cmp r0, 0
bne _08143C12
b _08143D1A
_08143C12:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r0, 0xF
strb r0, [r4, 0x8]
b _08143D1A
@@ -831,14 +831,14 @@ _08143C7E:
bl sub_8142504
movs r0, 0x81
lsls r0, 1
- bl sub_8071C60
+ bl PlayFanfare
movs r0, 0x13
strb r0, [r4, 0x8]
b _08143D1A
.align 2, 0
_08143CA0: .4byte gUnknown_841DE9A
_08143CA4:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08143D1A
@@ -853,7 +853,7 @@ _08143CBC:
adds r0, r4, 0
adds r0, 0x9
ldr r1, _08143CD0 @ =gUnknown_841DE7D
- bl sub_814257C
+ bl mevent_0814257C
_08143CC6:
cmp r0, 0
beq _08143D1A
@@ -881,7 +881,7 @@ _08143CEC:
adds r0, 0x9
ldr r1, _08143D00 @ =gUnknown_841DE9C
_08143CF2:
- bl sub_814257C
+ bl mevent_0814257C
cmp r0, 0
beq _08143D1A
_08143CFA:
@@ -893,11 +893,11 @@ _08143D00: .4byte gUnknown_841DE9C
_08143D04:
bl sub_812B484
ldr r0, [r4, 0x10]
- bl sub_8002BC4
+ bl Free
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _08143D20 @ =sub_81422FC
- bl sub_8000544
+ bl SetMainCallback2
_08143D1A:
pop {r4,r5}
pop {r0}
@@ -942,8 +942,8 @@ _08143D64: .4byte gUnknown_3005008
_08143D68: .4byte 0x00003124
thumb_func_end sub_8143D58
- thumb_func_start sub_8143D6C
-sub_8143D6C: @ 8143D6C
+ thumb_func_start sav1_get_mevent_buffer_1
+sav1_get_mevent_buffer_1: @ 8143D6C
ldr r0, _08143D78 @ =gUnknown_3005008
ldr r0, [r0]
ldr r1, _08143D7C @ =0x000032e4
@@ -952,10 +952,10 @@ sub_8143D6C: @ 8143D6C
.align 2, 0
_08143D78: .4byte gUnknown_3005008
_08143D7C: .4byte 0x000032e4
- thumb_func_end sub_8143D6C
+ thumb_func_end sav1_get_mevent_buffer_1
- thumb_func_start sub_8143D80
-sub_8143D80: @ 8143D80
+ thumb_func_start sav1_get_mevent_buffer_2
+sav1_get_mevent_buffer_2: @ 8143D80
ldr r0, _08143D8C @ =gUnknown_3005008
ldr r0, [r0]
ldr r1, _08143D90 @ =0x00003434
@@ -964,7 +964,7 @@ sub_8143D80: @ 8143D80
.align 2, 0
_08143D8C: .4byte gUnknown_3005008
_08143D90: .4byte 0x00003434
- thumb_func_end sub_8143D80
+ thumb_func_end sav1_get_mevent_buffer_2
thumb_func_start sub_8143D94
sub_8143D94: @ 8143D94
@@ -1018,7 +1018,7 @@ sub_8143DC8: @ 8143DC8
ldr r0, [r4]
adds r0, r5
adds r1, r6, 0
- bl sub_8045210
+ bl CalcCRC16WithTable
ldr r1, [r4]
ldr r2, _08143E10 @ =0x00003120
adds r1, r2
@@ -1048,7 +1048,7 @@ sub_8143E1C: @ 8143E1C
adds r0, r1
movs r1, 0xDE
lsls r1, 1
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
lsrs r0, 16
ldr r4, [r4]
@@ -1203,7 +1203,7 @@ sub_8143F38: @ 8143F38
bl sub_814407C
bl sub_81440B4
bl sub_8144790
- bl sub_8069CD4
+ bl ClearRamScript
bl sub_806E2D0
bl sub_806E370
ldr r0, _08143F64 @ =gUnknown_300500C
@@ -1238,7 +1238,7 @@ sub_8143F68: @ 8143F68
ldr r0, [r4]
adds r0, r5
adds r1, r6, 0
- bl sub_8045210
+ bl CalcCRC16WithTable
ldr r1, [r4]
ldr r3, _08143FB8 @ =0x000032e0
adds r2, r1, r3
@@ -1276,7 +1276,7 @@ sub_8143FC8: @ 8143FC8
adds r0, r1
movs r1, 0xA6
lsls r1, 1
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
lsrs r0, 16
ldr r1, [r4]
@@ -1400,7 +1400,7 @@ sub_81440B4: @ 81440B4
sub sp, 0x4
movs r4, 0
str r4, [sp]
- bl sub_8143D80
+ bl sav1_get_mevent_buffer_2
adds r1, r0, 0
ldr r2, _081440DC @ =0x05000009
mov r0, sp
@@ -1727,10 +1727,10 @@ sub_81442CC: @ 81442CC
bl sub_8143FC8
cmp r0, 0
beq _08144330
- bl sub_8143D6C
+ bl sav1_get_mevent_buffer_1
ldrh r0, [r0]
strh r0, [r4, 0x14]
- bl sub_8143D80
+ bl sav1_get_mevent_buffer_2
adds r1, r4, 0
adds r1, 0x20
ldm r0!, {r2,r3,r5}
@@ -1739,7 +1739,7 @@ sub_81442CC: @ 81442CC
stm r1!, {r2,r3,r5}
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
- bl sub_8143D6C
+ bl sav1_get_mevent_buffer_1
ldrb r1, [r0, 0x9]
adds r0, r4, 0
adds r0, 0x44
@@ -1788,7 +1788,7 @@ _0814435C:
mov r2, r8
ldr r1, [r2]
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081443C0 @ =gUnknown_3005008
ldr r0, [r0]
ldr r3, _081443C8 @ =0x00002ca0
diff --git a/asm/mevent_8145654.s b/asm/mevent_8145654.s
index 65e7e00ce..d4e7f116c 100644
--- a/asm/mevent_8145654.s
+++ b/asm/mevent_8145654.s
@@ -16,7 +16,7 @@ sub_8145654: @ 8145654
beq _08145670
ldr r7, _08145674 @ =gUnknown_203F3C8
ldr r0, _08145678 @ =0x0000145c
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r7]
cmp r0, 0
bne _0814567C
@@ -101,7 +101,7 @@ sub_81456F0: @ 81456F0
movs r1, 0
bl memset
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0814570C:
@@ -159,10 +159,10 @@ _08145770:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0814591E
_08145782:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0814578E
@@ -178,27 +178,27 @@ _08145790:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r5, _0814582C @ =gUnknown_203F3C8
ldr r0, [r5]
movs r1, 0xB8
@@ -211,7 +211,7 @@ _08145790:
movs r0, 0x2
movs r2, 0
movs r3, 0x8
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r4, _08145830 @ =gUnknown_8467074
adds r0, r4, 0
bl sub_8003CE4
@@ -241,7 +241,7 @@ _08145790:
_0814582C: .4byte gUnknown_203F3C8
_08145830: .4byte gUnknown_8467074
_08145834:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0
@@ -260,7 +260,7 @@ _08145834:
ldr r0, [r0, 0xC]
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, [r5]
adds r4, r1, r4
ldr r0, [r4]
@@ -286,9 +286,9 @@ _08145834:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0814591E
.align 2, 0
_081458A0: .4byte gUnknown_2037AB8
@@ -305,16 +305,16 @@ _081458B2:
movs r0, 0x2
bl sub_8145D18
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0814591E
_081458CC:
bl sub_809707C
b _0814591E
_081458D2:
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
ldr r2, _08145904 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -327,13 +327,13 @@ _081458D2:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
- bl sub_80704D0
+ bl BeginNormalPaletteFade
+ bl UpdatePaletteFade
b _0814591E
.align 2, 0
_08145904: .4byte gUnknown_2037AB8
_08145908:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -409,10 +409,10 @@ _0814598C:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08145A7A
_0814599E:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _08145A7A
@@ -426,33 +426,33 @@ _081459AA:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08145A7A
_081459F2:
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
ldr r4, _08145A2C @ =gUnknown_203F3C8
ldr r0, [r4]
movs r1, 0xBD
@@ -489,17 +489,17 @@ _08145A3A:
_08145A48: .4byte gUnknown_203F3B8
_08145A4C:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08145A7A
_08145A64:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -873,10 +873,10 @@ sub_8145D18: @ 8145D18
lsls r6, r0, 24
lsrs r5, r6, 24
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r4, 0x1
beq _08145E40
cmp r4, 0x1
@@ -1333,7 +1333,7 @@ _081460C8:
lsls r0, 3
ldr r1, _081461CC @ =gUnknown_8467F60
adds r0, r1
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, [r4]
ldrb r0, [r0, 0x9]
cmp r7, r0
@@ -1369,7 +1369,7 @@ _0814610E:
adds r1, r5, 0
movs r2, 0x90
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r6]
add r1, r10
adds r1, r4
@@ -1489,7 +1489,7 @@ _08146214:
lsls r0, 2
ldr r5, _08146280 @ =gUnknown_202063C
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r7]
ldr r2, _08146284 @ =0x0000017d
adds r0, r1, r2
@@ -1518,9 +1518,9 @@ _08146264:
movs r4, 0x80
lsls r4, 8
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_08146274:
pop {r4-r7}
pop {r0}
@@ -1539,7 +1539,7 @@ sub_8146288: @ 8146288
beq _0814629E
ldr r5, _081462A4 @ =gUnknown_203F3CC
ldr r0, _081462A8 @ =0x000013a4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
cmp r0, 0
bne _081462AC
@@ -1594,7 +1594,7 @@ sub_81462EC: @ 81462EC
movs r1, 0
bl memset
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08146308:
@@ -1656,10 +1656,10 @@ _08146374:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _081465D2
_08146386:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _08146392
@@ -1668,35 +1668,35 @@ _08146392:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _081463E8 @ =0x00001a98
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x1F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1B
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _081465D2
.align 2, 0
_081463E8: .4byte 0x00001a98
@@ -1709,36 +1709,36 @@ _081463EC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r5, _0814648C @ =gUnknown_203F3CC
ldr r0, [r5]
movs r1, 0xDE
@@ -1751,7 +1751,7 @@ _081463EC:
movs r0, 0x3
movs r2, 0
movs r3, 0x8
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r4, _08146490 @ =gUnknown_8468040
adds r0, r4, 0
bl sub_8003CE4
@@ -1773,7 +1773,7 @@ _081463EC:
_0814648C: .4byte gUnknown_203F3CC
_08146490: .4byte gUnknown_8468040
_08146494:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0
@@ -1795,7 +1795,7 @@ _081464A2:
ldr r0, [r0, 0xC]
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r2, r8
ldr r1, [r2]
adds r4, r1, r4
@@ -1825,7 +1825,7 @@ _081464A2:
str r7, [sp, 0x20]
movs r2, 0
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
mov r3, r8
ldr r1, [r3]
adds r1, r6
@@ -1844,11 +1844,11 @@ _081464A2:
movs r0, 0x3
movs r2, 0
movs r3, 0x3
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _081465D2
.align 2, 0
_0814653C: .4byte gUnknown_2037AB8
@@ -1859,17 +1859,17 @@ _08146544:
_0814654A:
bl sub_8146A30
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _081465D2
_0814655C:
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
ldr r2, _081465AC @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -1883,7 +1883,7 @@ _0814655C:
movs r2, 0xE3
lsls r2, 1
adds r1, r2
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, [r4]
ldr r3, _081465B4 @ =0x000001c1
adds r2, r1, r3
@@ -1894,15 +1894,15 @@ _0814655C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
- bl sub_80704D0
+ bl BeginNormalPaletteFade
+ bl UpdatePaletteFade
b _081465D2
.align 2, 0
_081465AC: .4byte gUnknown_2037AB8
_081465B0: .4byte gUnknown_203F3CC
_081465B4: .4byte 0x000001c1
_081465B8:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _081465EC
@@ -1990,10 +1990,10 @@ _08146658:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _081467C4
_0814666A:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _08146676
@@ -2002,23 +2002,23 @@ _08146676:
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _081467C4
_081466AC:
movs r4, 0x1E
@@ -2029,14 +2029,14 @@ _081466AC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
movs r5, 0x18
str r5, [sp, 0x4]
@@ -2044,28 +2044,28 @@ _081466AC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _081467C4
_0814670C:
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
ldr r4, _08146738 @ =gUnknown_203F3CC
ldr r0, [r4]
movs r1, 0xE5
@@ -2086,11 +2086,11 @@ _0814673C:
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r4, _08146770 @ =gUnknown_203F3CC
ldr r0, [r4]
ldr r2, _08146774 @ =0x000001c1
@@ -2098,7 +2098,7 @@ _0814673C:
ldrb r0, [r1]
cmp r0, 0xFF
beq _081467C4
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
ldr r2, _08146774 @ =0x000001c1
adds r1, r0, r2
@@ -2119,19 +2119,19 @@ _08146784: .4byte gUnknown_203F3B8
_08146788:
bl sub_8142420
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _081467C4
_081467AA:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _081467DE
@@ -2186,7 +2186,7 @@ sub_81467EC: @ 81467EC
ldrb r0, [r1]
cmp r0, 0xFF
beq _08146826
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
ldr r2, _08146830 @ =0x000001c1
adds r1, r0, r2
@@ -2226,7 +2226,7 @@ sub_8146834: @ 8146834
movs r3, 0xE3
lsls r3, 1
adds r1, r2, r3
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, [r4]
ldr r2, _08146880 @ =0x000001c1
adds r1, r2
@@ -2487,23 +2487,23 @@ sub_8146A30: @ 8146A30
lsls r7, 1
adds r0, r7
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r6]
movs r4, 0xE5
lsls r4, 1
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r6]
adds r0, r7
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, [r6]
movs r0, 0xE7
lsls r0, 1
@@ -2637,11 +2637,11 @@ sub_8146B58: @ 8146B58
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
adds r1, r4, 0
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
b _08146BAC
.align 2, 0
_08146B90: .4byte gUnknown_203F3CC
@@ -2650,11 +2650,11 @@ _08146B98:
movs r0, 0x2
adds r1, r4, 0
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
adds r1, r4, 0
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
_08146BAC:
ldr r3, _08146BF0 @ =gUnknown_203F3CC
ldr r0, [r3]
diff --git a/asm/mevent_server.s b/asm/mevent_server.s
index 1d325d9f3..056d683d2 100644
--- a/asm/mevent_server.s
+++ b/asm/mevent_server.s
@@ -103,7 +103,7 @@ _081448D4: .4byte gUnknown_2022118
sub_81448D8: @ 81448D8
push {r4,lr}
adds r4, r0, 0
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
asrs r0, r4
@@ -126,7 +126,7 @@ sub_81448FC: @ 81448FC
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_800A588
+ bl ResetBlockReceivedFlag
pop {r0}
bx r0
thumb_func_end sub_81448FC
@@ -223,7 +223,7 @@ _081449B4:
_081449BC:
ldr r0, [r5, 0x18]
ldrh r1, [r5, 0xC]
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
lsrs r0, 16
ldrh r1, [r5, 0xA]
@@ -278,7 +278,7 @@ _08144A00:
orrs r0, r1
str r0, [sp, 0x4]
ldr r0, [r4, 0x1C]
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
ldr r2, _08144A48 @ =0x0000ffff
ldr r1, [sp]
@@ -291,7 +291,7 @@ _08144A00:
movs r0, 0
mov r1, sp
movs r2, 0x8
- bl sub_800A448
+ bl SendBlock
b _08144AC2
.align 2, 0
_08144A44: .4byte 0xffff0000
@@ -320,7 +320,7 @@ _08144A4C:
lsls r2, r0, 16
lsrs r2, 16
movs r0, 0
- bl sub_800A448
+ bl SendBlock
ldrh r0, [r4, 0x10]
adds r0, 0x1
strh r0, [r4, 0x10]
@@ -330,7 +330,7 @@ _08144A8C:
adds r1, r3
movs r0, 0
movs r2, 0xFC
- bl sub_800A448
+ bl SendBlock
ldrh r0, [r4, 0x10]
adds r0, 0x1
strh r0, [r4, 0x10]
@@ -342,7 +342,7 @@ _08144AA0:
beq _08144AE2
ldr r0, [r4, 0x1C]
ldrh r1, [r4, 0x14]
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
lsrs r0, 16
ldrh r1, [r4, 0x12]
@@ -380,11 +380,11 @@ sub_8144AEC: @ 8144AEC
push {r4,lr}
ldr r4, _08144B08 @ =gUnknown_203F3C0
movs r0, 0x4C
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r1, 0x1
movs r2, 0
- bl sub_8144B70
+ bl mevent_srv_ish_init
pop {r4}
pop {r0}
bx r0
@@ -405,7 +405,7 @@ sub_8144B0C: @ 8144B0C
.align 2, 0
_08144B1C: .4byte gUnknown_203F3C0
_08144B20:
- bl sub_8144EF0
+ bl mevent_srv_ish_exec
adds r5, r0, 0
cmp r5, 0x6
bne _08144B3E
@@ -414,7 +414,7 @@ _08144B20:
strh r1, [r6]
bl sub_8144BC0
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08144B3E:
@@ -457,8 +457,8 @@ sub_8144B64: @ 8144B64
_08144B6C: .4byte gUnknown_203F3C0
thumb_func_end sub_8144B64
- thumb_func_start sub_8144B70
-sub_8144B70: @ 8144B70
+ thumb_func_start mevent_srv_ish_init
+mevent_srv_ish_init: @ 8144B70
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -472,16 +472,16 @@ sub_8144B70: @ 8144B70
movs r5, 0x80
lsls r5, 3
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x14]
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x18]
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x1C]
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x20]
adds r4, 0x24
adds r0, r4, 0
@@ -493,20 +493,20 @@ sub_8144B70: @ 8144B70
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8144B70
+ thumb_func_end mevent_srv_ish_init
thumb_func_start sub_8144BC0
sub_8144BC0: @ 8144BC0
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x14]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x18]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x1C]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x20]
- bl sub_8002BC4
+ bl Free
pop {r4}
pop {r0}
bx r0
@@ -918,8 +918,8 @@ _08144EE8: .4byte gUnknown_300500C
_08144EEC: .4byte gUnknown_3005008
thumb_func_end sub_8144EBC
- thumb_func_start sub_8144EF0
-sub_8144EF0: @ 8144EF0
+ thumb_func_start mevent_srv_ish_exec
+mevent_srv_ish_exec: @ 8144EF0
push {r4,r5,lr}
sub sp, 0x20
mov r2, sp
@@ -941,14 +941,14 @@ sub_8144EF0: @ 8144EF0
bx r1
.align 2, 0
_08144F18: .4byte gUnknown_8466F60
- thumb_func_end sub_8144EF0
+ thumb_func_end mevent_srv_ish_exec
thumb_func_start sub_8144F1C
sub_8144F1C: @ 8144F1C
push {r4,lr}
ldr r4, _08144F38 @ =gUnknown_203F3C4
movs r0, 0x60
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r1, _08144F3C @ =gUnknown_8468B6C
movs r2, 0
@@ -967,7 +967,7 @@ sub_8144F40: @ 8144F40
push {r4,lr}
ldr r4, _08144F5C @ =gUnknown_203F3C4
movs r0, 0x60
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r1, _08144F60 @ =gUnknown_8468BCC
movs r2, 0
@@ -1003,7 +1003,7 @@ _08144F78:
strh r1, [r6]
bl sub_8144FF8
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08144F96:
@@ -1029,18 +1029,18 @@ sub_8144FA0: @ 8144FA0
str r5, [r4, 0x8]
movs r0, 0xA6
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x18]
movs r0, 0xDE
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x1C]
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x14]
movs r0, 0x64
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x20]
str r6, [r4, 0x10]
str r5, [r4, 0xC]
@@ -1062,13 +1062,13 @@ sub_8144FF8: @ 8144FF8
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x18]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x1C]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x14]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4, 0x20]
- bl sub_8002BC4
+ bl Free
pop {r4}
pop {r0}
bx r0
@@ -1724,7 +1724,7 @@ _08145558:
bl AGBAssert
_08145566:
ldr r4, [r5, 0x18]
- bl sub_8143D6C
+ bl sav1_get_mevent_buffer_1
adds r1, r0, 0
movs r2, 0xA6
lsls r2, 1
diff --git a/asm/mon_markings.s b/asm/mon_markings.s
index f01b9427f..f5f602f2e 100644
--- a/asm/mon_markings.s
+++ b/asm/mon_markings.s
@@ -271,7 +271,7 @@ _080BE65E:
adds r0, r4, r0
lsls r0, 16
lsrs r0, 16
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -280,13 +280,13 @@ _080BE65E:
ldr r4, _080BE6EC @ =gUnknown_20399C0
ldr r0, [r4]
ldrh r0, [r0, 0x2]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
ldr r0, [r4]
ldrh r0, [r0, 0x2]
adds r0, 0x1
lsls r0, 16
lsrs r0, 16
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r4, 0
_080BE690:
ldr r0, _080BE6EC @ =gUnknown_20399C0
@@ -297,7 +297,7 @@ _080BE690:
ldr r0, [r0]
cmp r0, 0
beq _080BE6E6
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -313,7 +313,7 @@ _080BE6B0:
ldr r0, [r0]
cmp r0, 0
beq _080BE6E6
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -323,13 +323,13 @@ _080BE6B0:
ldr r0, [r0, 0x24]
cmp r0, 0
beq _080BE6DA
- bl sub_8007280
+ bl DestroySprite
_080BE6DA:
ldr r0, [r5]
ldr r0, [r0, 0x28]
cmp r0, 0
beq _080BE6E6
- bl sub_8007280
+ bl DestroySprite
_080BE6E6:
pop {r4,r5}
pop {r0}
@@ -536,9 +536,9 @@ sub_80BE7CC: @ 80BE7CC
ldr r0, _080BE9DC @ =nullsub_62
str r0, [r4, 0x14]
mov r0, sp
- bl sub_8008720
+ bl LoadSpriteSheets
mov r0, r10
- bl sub_8008974
+ bl LoadSpritePalettes
movs r5, 0
mov r3, r8
lsls r3, 16
@@ -563,7 +563,7 @@ _080BE8A4:
asrs r1, r2, 16
asrs r2, r7, 16
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -583,7 +583,7 @@ _080BE8BC:
str r0, [r2]
lsls r1, r5, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -626,7 +626,7 @@ _080BE914:
mov r3, r9
asrs r1, r3, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -656,7 +656,7 @@ _080BE93A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -682,7 +682,7 @@ _080BE93A:
ldr r0, [r6]
ldr r0, [r0, 0x28]
movs r1, 0x9
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r6]
ldr r2, [r1, 0x28]
ldr r3, [sp, 0x48]
@@ -697,7 +697,7 @@ _080BE93A:
movs r1, 0x1
movs r2, 0x2
movs r3, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
b _080BE9FA
.align 2, 0
_080BE9C4: .4byte gUnknown_20399C0
@@ -727,7 +727,7 @@ _080BE9FA:
adds r0, r4, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x40
@@ -746,7 +746,7 @@ _080BE9FA:
strh r0, [r1, 0x2E]
ldr r0, [r2, 0x24]
movs r1, 0x8
- bl sub_800838C
+ bl StartSpriteAnim
b _080BEA74
.align 2, 0
_080BEA3C: .4byte sub_80BEAC8
@@ -813,7 +813,7 @@ sub_80BEA8C: @ 80BEA8C
lsls r1, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _080BEAC2
.align 2, 0
_080BEAB4: .4byte gUnknown_20399C0
@@ -821,7 +821,7 @@ _080BEAB8:
lsls r1, 25
lsrs r1, 24
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080BEAC2:
pop {r0}
bx r0
@@ -927,14 +927,14 @@ sub_80BEB20: @ 80BEB20
orrs r0, r3
str r0, [r5, 0x4]
adds r0, r5, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -974,7 +974,7 @@ sub_80BEBD0: @ 80BEBD0
adds r0, r2
movs r2, 0x80
movs r3, 0x1
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/money.s b/asm/money.s
index 268054afd..7a635c93b 100644
--- a/asm/money.s
+++ b/asm/money.s
@@ -35,8 +35,8 @@ sub_809FD70: @ 809FD70
_0809FD84: .4byte gUnknown_300500C
thumb_func_end sub_809FD70
- thumb_func_start sub_809FD88
-sub_809FD88: @ 809FD88
+ thumb_func_start IsEnoughMoney
+IsEnoughMoney: @ 809FD88
push {r4,lr}
adds r4, r1, 0
bl sub_809FD58
@@ -50,10 +50,10 @@ _0809FD9A:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_809FD88
+ thumb_func_end IsEnoughMoney
- thumb_func_start sub_809FDA0
-sub_809FDA0: @ 809FDA0
+ thumb_func_start AddMoney
+AddMoney: @ 809FDA0
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
@@ -79,10 +79,10 @@ _0809FDC4:
bx r0
.align 2, 0
_0809FDD4: .4byte 0x000f423f
- thumb_func_end sub_809FDA0
+ thumb_func_end AddMoney
- thumb_func_start sub_809FDD8
-sub_809FDD8: @ 809FDD8
+ thumb_func_start RemoveMoney
+RemoveMoney: @ 809FDD8
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -100,10 +100,10 @@ _0809FDEE:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_809FDD8
+ thumb_func_end RemoveMoney
- thumb_func_start sub_809FDFC
-sub_809FDFC: @ 809FDFC
+ thumb_func_start IsEnoughForCostInVar0x8005
+IsEnoughForCostInVar0x8005: @ 809FDFC
push {lr}
ldr r0, _0809FE18 @ =gUnknown_3005008
ldr r0, [r0]
@@ -112,7 +112,7 @@ sub_809FDFC: @ 809FDFC
adds r0, r1
ldr r1, _0809FE1C @ =gUnknown_20370C2
ldrh r1, [r1]
- bl sub_809FD88
+ bl IsEnoughMoney
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -120,7 +120,7 @@ sub_809FDFC: @ 809FDFC
.align 2, 0
_0809FE18: .4byte gUnknown_3005008
_0809FE1C: .4byte gUnknown_20370C2
- thumb_func_end sub_809FDFC
+ thumb_func_end IsEnoughForCostInVar0x8005
thumb_func_start sub_809FE20
sub_809FE20: @ 809FE20
@@ -132,7 +132,7 @@ sub_809FE20: @ 809FE20
adds r0, r1
ldr r1, _0809FE3C @ =gUnknown_20370C2
ldrh r1, [r1]
- bl sub_809FDD8
+ bl RemoveMoney
pop {r0}
bx r0
.align 2, 0
@@ -154,7 +154,7 @@ sub_809FE40: @ 809FE40
movs r3, 0x6
bl sub_8008E78
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -227,7 +227,7 @@ sub_809FEC4: @ 809FEC4
movs r3, 0x6
bl sub_8008E78
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -290,7 +290,7 @@ sub_809FF48: @ 809FF48
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r2, _0809FF9C @ =gUnknown_8419CE7
movs r1, 0
str r1, [sp]
@@ -365,9 +365,9 @@ sub_809FFB8: @ 809FFB8
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
ldr r5, _080A0030 @ =0x0000021d
adds r1, r5, 0
diff --git a/asm/multiboot.s b/asm/multiboot.s
index 0ba2f50bf..615995301 100644
--- a/asm/multiboot.s
+++ b/asm/multiboot.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_800BC20
-sub_800BC20: @ 800BC20
+ thumb_func_start MultiBootInit
+MultiBootInit: @ 800BC20
adds r2, r0, 0
movs r1, 0
strb r1, [r2, 0x1E]
@@ -34,17 +34,17 @@ _0800BC4C: .4byte 0x04000134
_0800BC50: .4byte 0x04000128
_0800BC54: .4byte 0x00002003
_0800BC58: .4byte 0x0400012a
- thumb_func_end sub_800BC20
+ thumb_func_end MultiBootInit
- thumb_func_start sub_800BC5C
-sub_800BC5C: @ 800BC5C
+ thumb_func_start MultiBootMain
+MultiBootMain: @ 800BC5C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
adds r7, r0, 0
- bl sub_800C180
+ bl MultiBootCheckComplete
cmp r0, 0
beq _0800BC72
b _0800C03A
@@ -74,7 +74,7 @@ _0800BC86:
cmp r5, 0x8
beq _0800BCB0
adds r0, r7, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x8
eors r0, r5
b _0800C03C
@@ -85,7 +85,7 @@ _0800BCB0:
cmp r0, 0xDF
bls _0800BD02
adds r0, r7, 0
- bl sub_800C194
+ bl MultiBootHandShake
adds r5, r0, 0
cmp r5, 0
beq _0800BCC4
@@ -100,13 +100,13 @@ _0800BCC4:
cmp r0, 0xE1
bls _0800BCE0
adds r0, r7, 0
- bl sub_800C180
+ bl MultiBootCheckComplete
cmp r0, 0
bne _0800BCE0
b _0800C02A
_0800BCE0:
adds r0, r7, 0
- bl sub_800C180
+ bl MultiBootCheckComplete
cmp r0, 0
beq _0800BCEC
b _0800C03A
@@ -115,7 +115,7 @@ _0800BCEC:
cmp r0, 0
bne _0800BCFC
adds r0, r7, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x71
b _0800C03C
_0800BCFC:
@@ -230,7 +230,7 @@ _0800BDB8:
cmp r0, r2
beq _0800BDDA
adds r0, r7, 0
- bl sub_800C098
+ bl MultiBootStartProbe
b _0800BDE2
.align 2, 0
_0800BDD0: .4byte 0x04000120
@@ -382,7 +382,7 @@ _0800BEE2:
adds r0, r2, 0
orrs r1, r0
adds r0, r7, 0
- bl sub_800C04C
+ bl MultiBootSend
b _0800C03C
.align 2, 0
_0800BEF0: .4byte gUnknown_3000E6C
@@ -409,7 +409,7 @@ _0800BF02:
orrs r3, r0
adds r0, r7, 0
adds r1, r3, 0
- bl sub_800C04C
+ bl MultiBootSend
b _0800C03C
_0800BF26:
movs r5, 0x3
@@ -447,7 +447,7 @@ _0800BF44:
_0800BF64: .4byte 0x04000126
_0800BF68:
adds r0, r7, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x1E
mov r1, r10
strb r0, [r1]
@@ -514,7 +514,7 @@ _0800BFE0:
cmp r0, 0
bne _0800BFF2
adds r0, r7, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x50
b _0800C03C
_0800BFF2:
@@ -537,7 +537,7 @@ _0800C002:
ldrb r1, [r0]
orrs r1, r2
adds r0, r7, 0
- bl sub_800C04C
+ bl MultiBootSend
adds r5, r0, 0
cmp r5, 0
bne _0800C03C
@@ -547,11 +547,11 @@ _0800C002:
cmp r0, 0x1
bne _0800C03A
_0800C02A:
- bl sub_800C298
+ bl MultiBootWaitSendDone
b _0800BC86
_0800C030:
adds r0, r7, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x60
b _0800C03C
_0800C03A:
@@ -564,10 +564,10 @@ _0800C03C:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_800BC5C
+ thumb_func_end MultiBootMain
- thumb_func_start sub_800C04C
-sub_800C04C: @ 800C04C
+ thumb_func_start MultiBootSend
+MultiBootSend: @ 800C04C
push {r4,lr}
adds r2, r0, 0
lsls r1, 16
@@ -595,7 +595,7 @@ _0800C07C: .4byte 0x0400012a
_0800C080: .4byte 0x00002083
_0800C084:
adds r0, r2, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x8
eors r4, r0
adds r0, r4, 0
@@ -603,17 +603,17 @@ _0800C090:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_800C04C
+ thumb_func_end MultiBootSend
- thumb_func_start sub_800C098
-sub_800C098: @ 800C098
+ thumb_func_start MultiBootStartProbe
+MultiBootStartProbe: @ 800C098
push {lr}
adds r1, r0, 0
ldrb r0, [r1, 0x18]
cmp r0, 0
beq _0800C0AA
adds r0, r1, 0
- bl sub_800BC20
+ bl MultiBootInit
b _0800C0B6
_0800C0AA:
adds r2, r1, 0
@@ -625,10 +625,10 @@ _0800C0AA:
_0800C0B6:
pop {r0}
bx r0
- thumb_func_end sub_800C098
+ thumb_func_end MultiBootStartProbe
- thumb_func_start sub_800C0BC
-sub_800C0BC: @ 800C0BC
+ thumb_func_start MultiBootStartMaster
+MultiBootStartMaster: @ 800C0BC
push {r4-r7,lr}
adds r4, r0, 0
adds r6, r1, 0
@@ -661,7 +661,7 @@ sub_800C0BC: @ 800C0BC
bls _0800C104
_0800C0F8:
adds r0, r4, 0
- bl sub_800BC20
+ bl MultiBootInit
b _0800C178
.align 2, 0
_0800C100: .4byte 0x0003ff00
@@ -725,10 +725,10 @@ _0800C178:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_800C0BC
+ thumb_func_end MultiBootStartMaster
- thumb_func_start sub_800C180
-sub_800C180: @ 800C180
+ thumb_func_start MultiBootCheckComplete
+MultiBootCheckComplete: @ 800C180
push {lr}
ldrb r0, [r0, 0x18]
cmp r0, 0xE9
@@ -740,10 +740,10 @@ _0800C18C:
_0800C18E:
pop {r1}
bx r1
- thumb_func_end sub_800C180
+ thumb_func_end MultiBootCheckComplete
- thumb_func_start sub_800C194
-sub_800C194: @ 800C194
+ thumb_func_start MultiBootHandShake
+MultiBootHandShake: @ 800C194
push {r4-r6,lr}
adds r3, r0, 0
ldrb r0, [r3, 0x18]
@@ -815,7 +815,7 @@ _0800C210:
ldrh r1, [r3]
_0800C212:
adds r0, r3, 0
- bl sub_800C04C
+ bl MultiBootSend
b _0800C278
.align 2, 0
_0800C21C: .4byte 0x04000126
@@ -860,7 +860,7 @@ _0800C23C:
_0800C268: .4byte 0x04000120
_0800C26C:
adds r0, r3, 0
- bl sub_800BC20
+ bl MultiBootInit
movs r0, 0x71
b _0800C278
_0800C276:
@@ -869,10 +869,10 @@ _0800C278:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_800C194
+ thumb_func_end MultiBootHandShake
- thumb_func_start sub_800C280
-sub_800C280: @ 800C280
+ thumb_func_start MultiBootWaitCycles
+MultiBootWaitCycles: @ 800C280
mov r2, pc
lsrs r2, 24
movs r1, 0xC
@@ -886,10 +886,10 @@ _0800C292:
subs r0, r1
bgt _0800C292
bx lr
- thumb_func_end sub_800C280
+ thumb_func_end MultiBootWaitCycles
- thumb_func_start sub_800C298
-sub_800C298: @ 800C298
+ thumb_func_start MultiBootWaitSendDone
+MultiBootWaitSendDone: @ 800C298
push {r4,r5,lr}
movs r2, 0
ldr r3, _0800C2CC @ =0x04000128
@@ -912,13 +912,13 @@ _0800C2AC:
_0800C2BC:
movs r0, 0x96
lsls r0, 2
- bl sub_800C280
+ bl MultiBootWaitCycles
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0800C2CC: .4byte 0x04000128
_0800C2D0: .4byte 0x0000795c
- thumb_func_end sub_800C298
+ thumb_func_end MultiBootWaitSendDone
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s
index 52689b50d..9bda01efe 100644
--- a/asm/mystery_event_script.s
+++ b/asm/mystery_event_script.s
@@ -148,36 +148,36 @@ sub_80DA8E8: @ 80DA8E8
_080DA8F0: .4byte gUnknown_203AA3C
thumb_func_end sub_80DA8E8
- thumb_func_start sub_80DA8F4
-sub_80DA8F4: @ 80DA8F4
+ thumb_func_start script_status_stop_and_ret_1
+script_status_stop_and_ret_1: @ 80DA8F4
push {lr}
bl sub_80697FC
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80DA8F4
+ thumb_func_end script_status_stop_and_ret_1
thumb_func_start sub_80DA900
sub_80DA900: @ 80DA900
push {r4-r7,lr}
adds r7, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
str r0, [r7, 0x68]
adds r0, r7, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r7, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r6, r0, 0
adds r0, r7, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r3, r0, 0
adds r0, r5, 0
adds r1, r6, 0
@@ -222,7 +222,7 @@ sub_80DA964: @ 80DA964
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
@@ -248,12 +248,12 @@ _080DA998: .4byte gUnknown_2021D18
sub_80DA99C: @ 80DA99C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, [r4, 0x68]
subs r0, r1
ldr r1, [r4, 0x64]
adds r0, r1
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
movs r0, 0
pop {r4}
pop {r1}
@@ -270,7 +270,7 @@ sub_80DA9B8: @ 80DA9B8
bl sub_809C854
mov r8, r0
adds r0, r7, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r7, 0x68]
subs r4, r0
@@ -283,7 +283,7 @@ sub_80DA9B8: @ 80DA9B8
ldr r5, _080DAA14 @ =0x000030ec
adds r1, r5
movs r2, 0x7
- bl sub_8008DBC
+ bl StringCopyN
adds r0, r4, 0
bl sub_809C7C4
ldr r4, _080DAA18 @ =gUnknown_2021CF0
@@ -291,7 +291,7 @@ sub_80DA9B8: @ 80DA9B8
adds r1, r5
adds r0, r4, 0
movs r2, 0x7
- bl sub_8008DBC
+ bl StringCopyN
mov r0, r8
cmp r0, 0
bne _080DAA24
@@ -308,7 +308,7 @@ _080DAA20: .4byte gUnknown_8488C70
_080DAA24:
mov r0, r9
adds r1, r4, 0
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _080DAA40
ldr r0, _080DAA38 @ =gUnknown_2021D18
@@ -359,7 +359,7 @@ sub_80DAA80: @ 80DAA80
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
- bl sub_80A09AC
+ bl GiveGiftRibbonToParty
ldr r0, _080DAAAC @ =gUnknown_2021D18
ldr r1, _080DAAB0 @ =gUnknown_8488CF6
bl sub_8008FCC
@@ -395,14 +395,14 @@ sub_80DAAB4: @ 80DAAB4
adds r1, 0x1
str r1, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r5, r0, 0
ldr r0, [r4, 0x68]
subs r5, r0
ldr r0, [r4, 0x64]
adds r5, r0
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
@@ -415,7 +415,7 @@ sub_80DAAB4: @ 80DAAB4
adds r0, r5, 0
mov r2, r9
mov r3, r8
- bl sub_8069D00
+ bl InitRamScript
movs r0, 0
add sp, 0x4
pop {r3,r4}
@@ -488,7 +488,7 @@ sub_80DAB80: @ 80DAB80
push {r7}
sub sp, 0x88
adds r6, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, [r6, 0x68]
subs r0, r1
ldr r1, [r6, 0x64]
@@ -503,7 +503,7 @@ sub_80DAB80: @ 80DAB80
bl memcpy
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0xCE
@@ -513,7 +513,7 @@ sub_80DAB80: @ 80DAB80
ldr r0, _080DABC8 @ =gUnknown_2021CD0
ldr r1, _080DABCC @ =gUnknown_8415A62
movs r2, 0xB
- bl sub_8008DBC
+ bl StringCopyN
b _080DABDA
.align 2, 0
_080DABC8: .4byte gUnknown_2021CD0
@@ -522,7 +522,7 @@ _080DABD0:
ldr r0, _080DABF0 @ =gUnknown_2021CD0
ldr r1, _080DABF4 @ =gUnknown_8415A66
movs r2, 0xB
- bl sub_8008DBC
+ bl StringCopyN
_080DABDA:
ldr r0, _080DABF8 @ =gUnknown_2024029
ldrb r0, [r0]
@@ -554,7 +554,7 @@ _080DAC04:
cmp r4, r0
beq _080DAC3E
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -567,7 +567,7 @@ _080DAC04:
_080DAC3E:
adds r0, r7, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80980F8
@@ -576,10 +576,10 @@ _080DAC3E:
beq _080DAC5C
adds r0, r7, 0
mov r1, sp
- bl sub_8097F44
+ bl GiveMailToMon2
_080DAC5C:
- bl sub_80937DC
- bl sub_8040C3C
+ bl CompactPartySlots
+ bl CalculatePlayerPartyCount
ldr r0, _080DAC84 @ =gUnknown_2021D18
ldr r1, _080DAC88 @ =gUnknown_8488D7C
bl sub_8008FCC
@@ -603,7 +603,7 @@ _080DAC88: .4byte gUnknown_8488D7C
sub_80DAC8C: @ 80DAC8C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r4, 0x68]
subs r1, r0
@@ -649,17 +649,17 @@ sub_80DACD4: @ 80DACD4
sub_80DACE8: @ 80DACE8
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
@@ -667,7 +667,7 @@ sub_80DACE8: @ 80DACE8
adds r1, r0
subs r1, r4
adds r0, r4, 0
- bl sub_8045254
+ bl CalcByteArraySum
cmp r5, r0
beq _080DAD26
movs r0, 0
@@ -685,17 +685,17 @@ _080DAD26:
sub_80DAD30: @ 80DAD30
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r5, r0, 0
adds r0, r6, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r4, r0, 0
ldr r0, [r6, 0x68]
subs r4, r0
ldr r0, [r6, 0x64]
adds r4, r0
adds r0, r6, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, [r6, 0x68]
subs r1, r0
@@ -703,7 +703,7 @@ sub_80DAD30: @ 80DAD30
adds r1, r0
subs r1, r4
adds r0, r4, 0
- bl sub_80451B8
+ bl CalcCRC16
lsls r0, 16
lsrs r0, 16
cmp r5, r0
diff --git a/asm/mystery_gift_menu.s b/asm/mystery_gift_menu.s
index f94084a27..442531a4d 100644
--- a/asm/mystery_gift_menu.s
+++ b/asm/mystery_gift_menu.s
@@ -8,9 +8,9 @@
thumb_func_start sub_8142078
sub_8142078: @ 8142078
push {lr}
- bl sub_8007610
- bl sub_8007320
- bl sub_8070474
+ bl ProcessSpriteCopyRequests
+ bl LoadOam
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8142078
@@ -18,10 +18,10 @@ sub_8142078: @ 8142078
thumb_func_start sub_814208C
sub_814208C: @ 814208C
push {lr}
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r0}
bx r0
thumb_func_end sub_814208C
@@ -59,12 +59,12 @@ _081420D4:
b _081422A0
_081420D6:
movs r0, 0
- bl sub_80006F4
- bl sub_8070528
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8087E64
+ bl SetVBlankCallback
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl remove_some_task
movs r0, 0x1
bl sub_8001618
ldr r1, _081421E0 @ =gUnknown_8466D60
@@ -74,57 +74,57 @@ _081420D6:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
movs r1, 0xA
movs r2, 0xE0
@@ -146,16 +146,16 @@ _081420D6:
movs r1, 0xC0
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _0814226C
.align 2, 0
_081421E0: .4byte gUnknown_8466D60
@@ -165,12 +165,12 @@ _081421EC:
ldr r0, _08142250 @ =gUnknown_8466D10
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -180,7 +180,7 @@ _081421EC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -188,7 +188,7 @@ _081421EC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -196,7 +196,7 @@ _081421EC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
bl sub_8142420
lsls r0, r7, 24
lsrs r0, 24
@@ -207,13 +207,13 @@ _081421EC:
_08142250: .4byte gUnknown_8466D10
_08142254:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0814226C:
ldrb r0, [r6]
adds r0, 0x1
@@ -221,15 +221,15 @@ _0814226C:
b _081422A0
_08142274:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08142298 @ =0x00000149
- bl sub_80722A0
+ bl PlayBGM
ldr r0, _0814229C @ =sub_8142078
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0xC5
- bl sub_8000B68
+ bl EnableInterrupts
movs r0, 0x1
b _081422A2
.align 2, 0
@@ -252,11 +252,11 @@ sub_81422AC: @ 81422AC
cmp r0, 0
beq _081422C8
ldr r0, _081422CC @ =sub_814208C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _081422D0 @ =gUnknown_203F3B8
movs r0, 0
strb r0, [r1]
- bl sub_8142E58
+ bl task_add_00_mystery_gift
_081422C8:
pop {r0}
bx r0
@@ -273,7 +273,7 @@ sub_81422D4: @ 81422D4
cmp r0, 0
beq _081422F0
ldr r0, _081422F4 @ =sub_814208C
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _081422F8 @ =gUnknown_203F3B8
movs r0, 0x1
strb r0, [r1]
@@ -294,19 +294,19 @@ sub_81422FC: @ 81422FC
strb r0, [r1]
bl sub_8003ECC
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x1
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x2
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x3
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
ldr r0, _08142340 @ =sub_8078914
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -323,7 +323,7 @@ sub_8142344: @ 8142344
lsrs r5, r0, 24
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r5, 0
bne _081423B4
ldr r6, _081423A4 @ =gUnknown_841EDCA
@@ -396,7 +396,7 @@ _081423E8:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x14
pop {r4-r6}
pop {r0}
diff --git a/asm/naming_screen.s b/asm/naming_screen.s
index 9854e147d..259dbc889 100644
--- a/asm/naming_screen.s
+++ b/asm/naming_screen.s
@@ -20,12 +20,12 @@ sub_809D954: @ 809D954
ldr r4, _0809D980 @ =gUnknown_203998C
movs r0, 0xF2
lsls r0, 5
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
bne _0809D984
ldr r0, [sp, 0x1C]
- bl sub_8000544
+ bl SetMainCallback2
b _0809D9BE
.align 2, 0
_0809D980: .4byte gUnknown_203998C
@@ -54,10 +54,10 @@ _0809D984:
str r2, [r0]
cmp r7, 0
bne _0809D9B8
- bl sub_8000558
+ bl StartTimer1
_0809D9B8:
ldr r0, _0809D9DC @ =sub_809D9E0
- bl sub_8000544
+ bl SetMainCallback2
_0809D9BE:
pop {r3}
mov r8, r3
@@ -109,24 +109,24 @@ _0809DA2E:
bl sub_809DBB0
b _0809DA62
_0809DA34:
- bl sub_8070528
+ bl ResetPaletteFade
b _0809DA62
_0809DA3A:
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
b _0809DA62
_0809DA44:
- bl sub_80773BC
+ bl ResetTasks
b _0809DA62
_0809DA4A:
- bl sub_809F8D0
+ bl choose_name_or_words_screen_apply_bg_pals
b _0809DA62
_0809DA50:
- bl sub_809F85C
+ bl choose_name_or_words_screen_load_bg_tile_patterns
b _0809DA62
_0809DA56:
bl sub_809E898
- bl sub_80704D0
+ bl UpdatePaletteFade
bl sub_809FC34
_0809DA62:
ldr r1, _0809DA74 @ =gUnknown_30030F0
@@ -232,7 +232,7 @@ sub_809DA84: @ 809DA84
ldr r2, _0809DB6C @ =0x00001e30
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
_0809DB30:
movs r0, 0x10
strh r0, [r6]
@@ -362,7 +362,7 @@ _0809DBD6:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _0809DD4C @ =gUnknown_83E2290
@@ -372,35 +372,35 @@ _0809DBD6:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_80F6C6C
bl sub_80F6C98
_0809DCA4:
@@ -422,29 +422,29 @@ _0809DCA4:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xC8
lsls r1, 3
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0809DD5C @ =0x0000080c
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r5]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r5]
movs r0, 0x80
lsls r0, 4
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r5]
movs r2, 0x80
lsls r2, 5
adds r1, r2
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -452,21 +452,21 @@ _0809DCA4:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
add sp, 0x10
pop {r3}
mov r8, r3
@@ -488,9 +488,9 @@ sub_809DD60: @ 809DD60
push {lr}
ldr r0, _0809DD80 @ =sub_809DD88
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
ldr r0, _0809DD84 @ =sub_809FB70
- bl sub_8000544
+ bl SetMainCallback2
bl sub_812B234
movs r0, 0x3
bl sub_812B1F0
@@ -553,7 +553,7 @@ _0809DDFE:
bl sub_809E250
b _0809DE1A
_0809DE04:
- bl sub_809DFA4
+ bl pokemon_store
b _0809DE1A
_0809DE0A:
bl sub_809E1D4
@@ -650,23 +650,23 @@ sub_809DE70: @ 809DE70
bl sub_809F56C
bl sub_809FAE4
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r6, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
ldr r0, _0809DF24 @ =0x00001e10
adds r1, r0
@@ -754,8 +754,8 @@ _0809DF9C: .4byte gUnknown_203998C
_0809DFA0: .4byte 0x00001e10
thumb_func_end sub_809DF74
- thumb_func_start sub_809DFA4
-sub_809DFA4: @ 809DFA4
+ thumb_func_start pokemon_store
+pokemon_store: @ 809DFA4
push {r4,lr}
bl sub_809F7EC
movs r0, 0
@@ -773,12 +773,12 @@ sub_809DFA4: @ 809DFA4
ldrb r0, [r0]
cmp r0, 0x2
bne _0809DFF8
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x5
bls _0809DFF8
- bl sub_809E0B4
+ bl pokemon_transfer_to_pc_with_message
ldr r0, [r4]
ldr r1, _0809DFF4 @ =0x00001e10
adds r0, r1
@@ -805,7 +805,7 @@ _0809E006:
.align 2, 0
_0809E00C: .4byte gUnknown_203998C
_0809E010: .4byte 0x00001e10
- thumb_func_end sub_809DFA4
+ thumb_func_end pokemon_store
thumb_func_start sub_809E014
sub_809E014: @ 809E014
@@ -817,7 +817,7 @@ sub_809E014: @ 809E014
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0809E040 @ =gUnknown_203998C
ldr r1, [r0]
ldr r0, _0809E044 @ =0x00001e10
@@ -852,21 +852,21 @@ sub_809E048: @ 809E048
ldrb r0, [r0]
cmp r0, 0
bne _0809E06C
- bl sub_8000564
+ bl SeedRngAndSetTrainerId
_0809E06C:
ldr r0, [r4]
ldr r1, _0809E0AC @ =0x00001e3c
adds r0, r1
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0809E0B0 @ =sub_809DD88
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
bl sub_812B248
_0809E096:
@@ -882,8 +882,8 @@ _0809E0AC: .4byte 0x00001e3c
_0809E0B0: .4byte sub_809DD88
thumb_func_end sub_809E048
- thumb_func_start sub_809E0B4
-sub_809E0B4: @ 809E0B4
+ thumb_func_start pokemon_transfer_to_pc_with_message
+pokemon_transfer_to_pc_with_message: @ 809E0B4
push {r4,r5,lr}
sub sp, 0x10
movs r5, 0
@@ -896,17 +896,17 @@ sub_809E0B4: @ 809E0B4
bl sub_806E568
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0809E0F8 @ =gUnknown_2021CF0
ldr r1, _0809E0FC @ =gUnknown_203998C
ldr r1, [r1]
ldr r2, _0809E100 @ =0x00001e30
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
b _0809E144
.align 2, 0
_0809E0F0: .4byte gUnknown_2021CD0
@@ -920,25 +920,25 @@ _0809E104:
bl sub_806E568
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0809E1B4 @ =gUnknown_2021CF0
ldr r1, _0809E1B8 @ =gUnknown_203998C
ldr r1, [r1]
ldr r2, _0809E1BC @ =0x00001e30
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0809E1C0 @ =gUnknown_2021D04
bl sub_80CC7A8
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r5, 0x2
_0809E144:
ldr r0, _0809E1C4 @ =0x00000834
@@ -999,7 +999,7 @@ _0809E1C4: .4byte 0x00000834
_0809E1C8: .4byte gUnknown_2021D18
_0809E1CC: .4byte gUnknown_83E2280
_0809E1D0: .4byte gUnknown_3003E50
- thumb_func_end sub_809E0B4
+ thumb_func_end pokemon_transfer_to_pc_with_message
thumb_func_start sub_809E1D4
sub_809E1D4: @ 809E1D4
@@ -1157,7 +1157,7 @@ sub_809E30C: @ 809E30C
ldr r4, _0809E328 @ =sub_809E32C
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -1202,7 +1202,7 @@ _0809E360: .4byte gUnknown_3005090
sub_809E364: @ 809E364
push {lr}
ldr r0, _0809E378 @ =sub_809E32C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1259,7 +1259,7 @@ sub_809E3AC: @ 809E3AC
movs r2, 0xA
ldrsh r0, [r4, r2]
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
ldr r1, [r5]
movs r2, 0xF1
lsls r2, 5
@@ -1274,7 +1274,7 @@ sub_809E3AC: @ 809E3AC
movs r1, 0xFF
ands r0, r1
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
ldr r1, [r5]
ldr r2, _0809E438 @ =0x00001e21
adds r1, r2
@@ -1332,7 +1332,7 @@ sub_809E440: @ 809E440
movs r1, 0xA
ldrsh r0, [r4, r1]
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
ldr r1, [r5]
movs r2, 0xF1
lsls r2, 5
@@ -1347,7 +1347,7 @@ sub_809E440: @ 809E440
movs r1, 0xFF
ands r0, r1
movs r1, 0x28
- bl sub_8044E30
+ bl Sin
ldr r1, [r5]
ldr r3, _0809E4D0 @ =0x00001e21
adds r1, r3
@@ -1391,10 +1391,10 @@ _0809E4D0: .4byte 0x00001e21
sub_809E4D4: @ 809E4D4
push {lr}
ldr r0, _0809E4EC @ =sub_809E32C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -1405,9 +1405,9 @@ _0809E4EC: .4byte sub_809E32C
thumb_func_start sub_809E4F0
sub_809E4F0: @ 809E4F0
push {lr}
- ldr r0, _0809E510 @ =sub_809E58C
+ ldr r0, _0809E510 @ =c3_0809E58C
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0809E514 @ =gUnknown_3005090
@@ -1420,7 +1420,7 @@ sub_809E4F0: @ 809E4F0
pop {r0}
bx r0
.align 2, 0
-_0809E510: .4byte sub_809E58C
+_0809E510: .4byte c3_0809E58C
_0809E514: .4byte gUnknown_3005090
thumb_func_end sub_809E4F0
@@ -1433,8 +1433,8 @@ sub_809E518: @ 809E518
lsrs r7, r1, 24
lsls r2, 24
lsrs r6, r2, 24
- ldr r0, _0809E550 @ =sub_809E58C
- bl sub_8077688
+ ldr r0, _0809E550 @ =c3_0809E58C
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -1453,7 +1453,7 @@ sub_809E518: @ 809E518
strh r0, [r4, 0xC]
b _0809E584
.align 2, 0
-_0809E550: .4byte sub_809E58C
+_0809E550: .4byte c3_0809E58C
_0809E554: .4byte gUnknown_3005090
_0809E558:
cmp r5, 0x3
@@ -1484,8 +1484,8 @@ _0809E584:
bx r0
thumb_func_end sub_809E518
- thumb_func_start sub_809E58C
-sub_809E58C: @ 809E58C
+ thumb_func_start c3_0809E58C
+c3_0809E58C: @ 809E58C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -1582,7 +1582,7 @@ _0809E63E:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_809E58C
+ thumb_func_end c3_0809E58C
thumb_func_start sub_809E644
sub_809E644: @ 809E644
@@ -1592,7 +1592,7 @@ sub_809E644: @ 809E644
lsls r4, 24
lsrs r4, 24
movs r0, 0x4
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
movs r1, 0x87
@@ -1602,7 +1602,7 @@ sub_809E644: @ 809E644
add r6, sp, 0x8
strh r0, [r6]
movs r0, 0x6
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
adds r0, r5
@@ -1610,14 +1610,14 @@ sub_809E644: @ 809E644
adds r1, 0xA
strh r0, [r1]
movs r0, 0x7
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
adds r0, r5
add r1, sp, 0xC
strh r0, [r1]
movs r0, 0x7
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 20
ldr r1, _0809E6B4 @ =0x00000101
@@ -1694,7 +1694,7 @@ sub_809E700: @ 809E700
beq _0809E718
adds r0, r5, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0809E718:
ldrh r0, [r5, 0x36]
movs r1, 0xFF
@@ -1791,7 +1791,7 @@ _0809E7AE:
lsls r4, 24
lsrs r4, 24
movs r0, 0x5
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 4
ldr r2, _0809E7EC @ =0x01010000
@@ -1920,7 +1920,7 @@ sub_809E8B4: @ 809E8B4
movs r1, 0x26
movs r2, 0x58
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _0809E93C @ =gUnknown_203998C
ldr r1, [r5]
ldr r4, _0809E940 @ =0x00001e23
@@ -2118,7 +2118,7 @@ sub_809EA0C: @ 809EA0C
lsls r0, 2
adds r0, r5
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -2179,7 +2179,7 @@ sub_809EAA8: @ 809EAA8
ldr r1, _0809EAD0 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -2270,7 +2270,7 @@ sub_809EB5C: @ 809EB5C
movs r1, 0xCC
movs r2, 0x58
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _0809EC04 @ =gUnknown_203998C
@@ -2286,7 +2286,7 @@ sub_809EB5C: @ 809EB5C
add r5, r8
ldr r1, _0809EC10 @ =gUnknown_83E2504
adds r0, r5, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r1, r5, 0
adds r1, 0x3E
ldrb r0, [r1]
@@ -2297,7 +2297,7 @@ sub_809EB5C: @ 809EB5C
movs r1, 0xCC
movs r2, 0x54
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -2307,7 +2307,7 @@ sub_809EB5C: @ 809EB5C
add r4, r8
ldr r1, _0809EC18 @ =gUnknown_83E250C
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r6
@@ -2316,7 +2316,7 @@ sub_809EB5C: @ 809EB5C
movs r1, 0xCC
movs r2, 0x53
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 4
@@ -2556,7 +2556,7 @@ sub_809ED88: @ 809ED88
lsls r4, r5, 1
adds r0, r4, r0
ldrh r0, [r0]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 4
mov r1, r8
ldrb r2, [r1, 0x5]
@@ -2568,7 +2568,7 @@ sub_809ED88: @ 809ED88
ldr r0, _0809EDE4 @ =gUnknown_83E238E
adds r4, r0
ldrh r0, [r4]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
adds r1, r6, 0
adds r1, 0x40
strh r0, [r1]
@@ -2600,7 +2600,7 @@ sub_809EDE8: @ 809EDE8
movs r1, 0xCC
movs r2, 0x74
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -2612,7 +2612,7 @@ sub_809EDE8: @ 809EDE8
mov r8, r0
adds r0, r4, 0
mov r1, r8
- bl sub_8008A58
+ bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
movs r5, 0x4
@@ -2622,7 +2622,7 @@ sub_809EDE8: @ 809EDE8
movs r1, 0xCC
movs r2, 0x8C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -2631,7 +2631,7 @@ sub_809EDE8: @ 809EDE8
adds r4, r6
adds r0, r4, 0
mov r1, r8
- bl sub_8008A58
+ bl SetSubspriteTables
adds r4, 0x3E
ldrb r0, [r4]
orrs r0, r5
@@ -2662,7 +2662,7 @@ sub_809EE60: @ 809EE60
asrs r1, 16
movs r2, 0x38
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
ldr r3, _0809EF18 @ =gUnknown_202063C
@@ -2700,7 +2700,7 @@ _0809EEB2:
ldr r0, _0809EF20 @ =gUnknown_83E261C
movs r2, 0x3C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r1, 4
@@ -2803,7 +2803,7 @@ sub_809EF54: @ 809EF54
orrs r1, r2
strb r1, [r0, 0x5]
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
add sp, 0x4
pop {r0}
bx r0
@@ -2821,7 +2821,7 @@ sub_809EFB0: @ 809EFB0
movs r1, 0x38
movs r2, 0x29
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -2831,7 +2831,7 @@ sub_809EFB0: @ 809EFB0
adds r4, r0
ldr r1, _0809EFEC @ =gUnknown_83E252C
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
ldrb r0, [r4, 0x5]
movs r1, 0xC
orrs r0, r1
@@ -2917,14 +2917,14 @@ sub_809F04C: @ 809F04C
strh r1, [r2, 0x2]
ldr r1, _0809F0C4 @ =gUnknown_83E23BC
str r1, [sp, 0x8]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0x38
movs r2, 0x25
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _0809F0C8 @ =gUnknown_202063C
@@ -3126,7 +3126,7 @@ sub_809F208: @ 809F208
push {lr}
ldr r0, _0809F218 @ =sub_809F26C
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -3137,7 +3137,7 @@ _0809F218: .4byte sub_809F26C
sub_809F21C: @ 809F21C
push {lr}
ldr r0, _0809F238 @ =sub_809F26C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _0809F23C @ =gUnknown_3005090
@@ -3160,7 +3160,7 @@ sub_809F240: @ 809F240
lsls r4, 24
lsrs r4, 24
ldr r0, _0809F264 @ =sub_809F26C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _0809F268 @ =gUnknown_3005090
@@ -3483,7 +3483,7 @@ sub_809F49C: @ 809F49C
adds r0, r4
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -3502,7 +3502,7 @@ sub_809F49C: @ 809F49C
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -3527,7 +3527,7 @@ sub_809F4F0: @ 809F4F0
ldr r0, _0809F560 @ =gUnknown_8245EE0
adds r1, r0
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r5]
ldr r1, _0809F564 @ =0x00001e28
adds r0, r1
@@ -3535,13 +3535,13 @@ sub_809F4F0: @ 809F4F0
ldr r1, [r0, 0x8]
add r0, sp, 0xC
movs r2, 0xF
- bl sub_8008DEC
+ bl StringAppendN
ldr r0, [r5]
ldr r4, _0809F568 @ =0x00001e14
adds r0, r4
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -3557,7 +3557,7 @@ sub_809F4F0: @ 809F4F0
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x2C
pop {r4,r5}
pop {r0}
@@ -3625,7 +3625,7 @@ sub_809F5C4: @ 809F5C4
movs r4, 0
ldr r1, _0809F61C @ =gUnknown_841621F
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
ldr r5, _0809F620 @ =gUnknown_203998C
ldr r0, [r5]
ldr r1, _0809F624 @ =0x00001e36
@@ -3637,7 +3637,7 @@ sub_809F5C4: @ 809F5C4
bne _0809F5EE
ldr r1, _0809F628 @ =gUnknown_8416221
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
movs r4, 0x1
_0809F5EE:
ldr r0, [r5]
@@ -3805,7 +3805,7 @@ sub_809F700: @ 809F700
strb r1, [r0]
bl sub_809F914
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r6]
adds r0, r5
adds r0, r4
@@ -3853,7 +3853,7 @@ sub_809F75C: @ 809F75C
bl sub_809F7C4
bl sub_809F914
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x5
bl sub_80722CC
bl sub_809F6BC
@@ -3940,7 +3940,7 @@ _0809F808:
lsls r2, 24
lsrs r2, 24
adds r1, r3, 0
- bl sub_8008DBC
+ bl StringCopyN
b _0809F852
.align 2, 0
_0809F838: .4byte 0x00001e30
@@ -3965,8 +3965,8 @@ _0809F852:
_0809F858: .4byte 0x00001e28
thumb_func_end sub_809F7EC
- thumb_func_start sub_809F85C
-sub_809F85C: @ 809F85C
+ thumb_func_start choose_name_or_words_screen_load_bg_tile_patterns
+choose_name_or_words_screen_load_bg_tile_patterns: @ 809F85C
push {r4-r6,lr}
ldr r0, _0809F8AC @ =gUnknown_8E980E4
ldr r6, _0809F8B0 @ =gUnknown_203998C
@@ -3981,23 +3981,23 @@ sub_809F85C: @ 809F85C
movs r0, 0x1
adds r2, r5, 0
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, [r6]
adds r1, r4
movs r0, 0x2
adds r2, r5, 0
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, [r6]
adds r1, r4
movs r0, 0x3
adds r2, r5, 0
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r0, _0809F8B8 @ =gUnknown_83E267C
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0809F8BC @ =gUnknown_83E26E4
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r4-r6}
pop {r0}
bx r0
@@ -4007,7 +4007,7 @@ _0809F8B0: .4byte gUnknown_203998C
_0809F8B4: .4byte 0x00001810
_0809F8B8: .4byte gUnknown_83E267C
_0809F8BC: .4byte gUnknown_83E26E4
- thumb_func_end sub_809F85C
+ thumb_func_end choose_name_or_words_screen_load_bg_tile_patterns
thumb_func_start sub_809F8C0
sub_809F8C0: @ 809F8C0
@@ -4018,28 +4018,28 @@ sub_809F8C0: @ 809F8C0
bx r0
thumb_func_end sub_809F8C0
- thumb_func_start sub_809F8D0
-sub_809F8D0: @ 809F8D0
+ thumb_func_start choose_name_or_words_screen_apply_bg_pals
+choose_name_or_words_screen_apply_bg_pals: @ 809F8D0
push {lr}
ldr r0, _0809F8F8 @ =gUnknown_8E98024
movs r1, 0
movs r2, 0xC0
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0809F8FC @ =gUnknown_8E97FE4
movs r1, 0xA0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xB0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
_0809F8F8: .4byte gUnknown_8E98024
_0809F8FC: .4byte gUnknown_8E97FE4
- thumb_func_end sub_809F8D0
+ thumb_func_end choose_name_or_words_screen_apply_bg_pals
thumb_func_start sub_809F900
sub_809F900: @ 809F900
@@ -4048,7 +4048,7 @@ sub_809F900: @ 809F900
lsrs r0, 24
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
pop {r0}
bx r0
thumb_func_end sub_809F900
@@ -4078,7 +4078,7 @@ sub_809F914: @ 809F914
adds r1, r0
ldrb r0, [r1]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r4, 0
cmp r4, r6
bcs _0809F9AA
@@ -4141,7 +4141,7 @@ _0809F9AA:
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -4171,7 +4171,7 @@ sub_809F9E8: @ 809F9E8
adds r0, r5, r0
ldrb r1, [r0]
adds r0, r6, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r4, 0
ldr r1, _0809FA58 @ =gUnknown_83E2440
lsls r0, r5, 2
@@ -4203,7 +4203,7 @@ _0809FA12:
cmp r4, 0x3
bls _0809FA12
adds r0, r6, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r3}
mov r8, r3
@@ -4220,12 +4220,12 @@ _0809FA5C: .4byte gUnknown_83E264C
sub_809FA60: @ 809FA60
push {r4,r5,lr}
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
adds r4, r0, 0
movs r5, 0x3
ands r4, r5
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
ands r0, r5
cmp r4, r0
bls _0809FA90
@@ -4265,7 +4265,7 @@ _0809FA9A:
adds r0, r4, 0
bl sub_809F9E8
adds r0, r5, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -4299,7 +4299,7 @@ sub_809FAE4: @ 809FAE4
adds r0, r4
ldrb r0, [r0]
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4321,7 +4321,7 @@ sub_809FAE4: @ 809FAE4
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4343,10 +4343,10 @@ _0809FB6C: .4byte 0x00001e15
thumb_func_start sub_809FB70
sub_809FB70: @ 809FB70
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_809FB70
@@ -4355,9 +4355,9 @@ sub_809FB70: @ 809FB70
sub_809FB88: @ 809FB88
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_809FB88
@@ -4366,7 +4366,7 @@ sub_809FB88: @ 809FB88
sub_809FB9C: @ 809FB9C
push {lr}
ldr r0, _0809FBA8 @ =sub_809FBAC
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -4376,47 +4376,47 @@ _0809FBA8: .4byte sub_809FBAC
thumb_func_start sub_809FBAC
sub_809FBAC: @ 809FBAC
push {r4,r5,lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
ldr r5, _0809FC1C @ =gUnknown_203998C
ldr r0, [r5]
ldr r1, _0809FC20 @ =0x00001e18
adds r0, r1
ldrh r1, [r0]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldr r1, _0809FC24 @ =0x00001e1a
adds r0, r1
ldrh r1, [r0]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
ldr r4, _0809FC28 @ =0x0000fffc
adds r1, r4, 0
ands r1, r0
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldr r1, _0809FC2C @ =0x00001e1c
adds r0, r1
ldrh r1, [r0]
movs r0, 0xA
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
ands r4, r0
movs r0, 0xC
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
ldr r1, _0809FC30 @ =0x00001e1e
adds r0, r1
ldrh r1, [r0]
movs r0, 0xC
- bl sub_8000AF4
+ bl SetGpuRegBits
pop {r4,r5}
pop {r0}
bx r0
@@ -4433,13 +4433,13 @@ _0809FC30: .4byte 0x00001e1e
sub_809FC34: @ 809FC34
push {lr}
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
pop {r0}
bx r0
thumb_func_end sub_809FC34
diff --git a/asm/new_game.s b/asm/new_game.s
index 83d6bfabe..383e0f208 100644
--- a/asm/new_game.s
+++ b/asm/new_game.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80548FC
-sub_80548FC: @ 80548FC
+ thumb_func_start WriteUnalignedWord
+WriteUnalignedWord: @ 80548FC
strb r0, [r1]
lsrs r2, r0, 8
strb r2, [r1, 0x1]
@@ -15,7 +15,7 @@ sub_80548FC: @ 80548FC
lsrs r0, 24
strb r0, [r1, 0x3]
bx lr
- thumb_func_end sub_80548FC
+ thumb_func_end WriteUnalignedWord
thumb_func_start sub_805490C
sub_805490C: @ 805490C
@@ -39,9 +39,9 @@ _08054914:
thumb_func_start sub_8054928
sub_8054928: @ 8054928
push {r4,lr}
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_800058C
+ bl GetGeneratedTrainerIdLower
lsls r4, 16
lsls r0, 16
lsrs r0, 16
@@ -50,7 +50,7 @@ sub_8054928: @ 8054928
ldr r1, [r0]
adds r1, 0xA
adds r0, r4, 0
- bl sub_80548FC
+ bl WriteUnalignedWord
pop {r4}
pop {r0}
bx r0
@@ -158,8 +158,8 @@ sub_80549F8: @ 80549F8
movs r0, 0x4
movs r1, 0x1
movs r3, 0x6
- bl sub_805538C
- bl sub_8055378
+ bl Overworld_SetWarpDestination
+ bl warp_in
add sp, 0x4
pop {r0}
bx r0
@@ -168,7 +168,7 @@ sub_80549F8: @ 80549F8
thumb_func_start sub_8054A18
sub_8054A18: @ 8054A18
push {lr}
- bl sub_804C010
+ bl ClearSav2
bl sub_8054954
pop {r0}
bx r0
@@ -181,12 +181,12 @@ sub_8054A28: @ 8054A28
movs r0, 0
strb r0, [r1]
bl sub_803DA14
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
bl sub_81089BC
bl sub_81320AC
bl sub_813D6E4
bl sub_811089C
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
bl sub_8083214
@@ -209,7 +209,7 @@ sub_8054A60: @ 8054A60
mov r8, r0
add r1, r8
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
ldr r1, _08054B58 @ =gUnknown_2031DB0
movs r0, 0x1
strb r0, [r1]
@@ -221,9 +221,9 @@ sub_8054A60: @ 8054A60
movs r5, 0
str r5, [r0]
bl sub_803DA14
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
bl sub_80549D4
- bl sub_804C034
+ bl ClearSav1
bl sub_8097C84
ldr r0, [r4]
strb r5, [r0, 0x9]
@@ -238,7 +238,7 @@ sub_8054A60: @ 8054A60
adds r0, 0xAD
strb r5, [r0]
bl sub_8054928
- bl sub_8054814
+ bl PlayTimeCounter_Reset
bl sub_80549AC
bl sub_806E0D0
bl sub_812D304
@@ -267,17 +267,17 @@ sub_8054A60: @ 8054A60
bl sub_809C794
bl sub_80BDD34
bl sub_8113044
- bl sub_8129820
+ bl copy_strings_to_sav1
bl sub_8054B70
bl sub_8143D24
bl sub_815D838
bl sub_80549F8
ldr r0, _08054B6C @ =gUnknown_81A6481
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
ldr r0, [r6]
add r0, r8
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
bl sub_815EE0C
add sp, 0x8
pop {r3}
@@ -317,7 +317,7 @@ sub_8054B70: @ 8054B70
adds r0, r1
movs r1, 0
bl sub_815EE54
- bl sub_814B47C
+ bl ResetPokeJumpResults
mov r0, sp
adds r0, 0x2
strh r5, [r0]
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s
index 983e4eb09..cd54c20dd 100644
--- a/asm/new_menu_helpers.s
+++ b/asm/new_menu_helpers.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80F6790
-sub_80F6790: @ 80F6790
+ thumb_func_start clear_scheduled_bg_copies_to_vram
+clear_scheduled_bg_copies_to_vram: @ 80F6790
push {lr}
ldr r0, _080F67A0 @ =gUnknown_203AB58
movs r1, 0
@@ -16,10 +16,10 @@ sub_80F6790: @ 80F6790
bx r0
.align 2, 0
_080F67A0: .4byte gUnknown_203AB58
- thumb_func_end sub_80F6790
+ thumb_func_end clear_scheduled_bg_copies_to_vram
- thumb_func_start sub_80F67A4
-sub_80F67A4: @ 80F67A4
+ thumb_func_start schedule_bg_copy_tilemap_to_vram
+schedule_bg_copy_tilemap_to_vram: @ 80F67A4
lsls r0, 24
lsrs r0, 24
ldr r1, _080F67B4 @ =gUnknown_203AB58
@@ -29,17 +29,17 @@ sub_80F67A4: @ 80F67A4
bx lr
.align 2, 0
_080F67B4: .4byte gUnknown_203AB58
- thumb_func_end sub_80F67A4
+ thumb_func_end schedule_bg_copy_tilemap_to_vram
- thumb_func_start sub_80F67B8
-sub_80F67B8: @ 80F67B8
+ thumb_func_start do_scheduled_bg_tilemap_copies_to_vram
+do_scheduled_bg_tilemap_copies_to_vram: @ 80F67B8
push {r4,lr}
ldr r4, _080F6804 @ =gUnknown_203AB58
ldrb r0, [r4]
cmp r0, 0x1
bne _080F67CC
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
strb r0, [r4]
_080F67CC:
@@ -47,7 +47,7 @@ _080F67CC:
cmp r0, 0x1
bne _080F67DC
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
strb r0, [r4, 0x1]
_080F67DC:
@@ -55,7 +55,7 @@ _080F67DC:
cmp r0, 0x1
bne _080F67EC
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
strb r0, [r4, 0x2]
_080F67EC:
@@ -63,7 +63,7 @@ _080F67EC:
cmp r0, 0x1
bne _080F67FC
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
strb r0, [r4, 0x3]
_080F67FC:
@@ -72,10 +72,10 @@ _080F67FC:
bx r0
.align 2, 0
_080F6804: .4byte gUnknown_203AB58
- thumb_func_end sub_80F67B8
+ thumb_func_end do_scheduled_bg_tilemap_copies_to_vram
- thumb_func_start sub_80F6808
-sub_80F6808: @ 80F6808
+ thumb_func_start reset_temp_tile_data_buffers
+reset_temp_tile_data_buffers: @ 80F6808
push {lr}
ldr r3, _080F6824 @ =gUnknown_203AB5C
ldr r1, _080F6828 @ =gUnknown_203AB60
@@ -94,12 +94,12 @@ _080F6814:
.align 2, 0
_080F6824: .4byte gUnknown_203AB5C
_080F6828: .4byte gUnknown_203AB60
- thumb_func_end sub_80F6808
+ thumb_func_end reset_temp_tile_data_buffers
- thumb_func_start sub_80F682C
-sub_80F682C: @ 80F682C
+ thumb_func_start free_temp_tile_data_buffers_if_possible
+free_temp_tile_data_buffers_if_possible: @ 80F682C
push {r4-r6,lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _080F6870
@@ -115,7 +115,7 @@ sub_80F682C: @ 80F682C
movs r6, 0
_080F684C:
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
stm r5!, {r6}
adds r4, 0x1
ldr r0, _080F6868 @ =gUnknown_203AB5C
@@ -138,10 +138,10 @@ _080F6872:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80F682C
+ thumb_func_end free_temp_tile_data_buffers_if_possible
- thumb_func_start sub_80F6878
-sub_80F6878: @ 80F6878
+ thumb_func_start decompress_and_copy_tile_data_to_vram
+decompress_and_copy_tile_data_to_vram: @ 80F6878
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -203,7 +203,7 @@ _080F68E2:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80F6878
+ thumb_func_end decompress_and_copy_tile_data_to_vram
thumb_func_start sub_80F68F0
sub_80F68F0: @ 80F68F0
@@ -301,7 +301,7 @@ _080F699A:
beq _080F69D2
ldr r0, _080F69E0 @ =sub_80F6A64
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -321,7 +321,7 @@ _080F699A:
adds r0, r4, 0
movs r1, 0x1
adds r2, r6, 0
- bl sub_80776E8
+ bl SetWordTaskArg
_080F69D2:
add sp, 0x8
pop {r3,r4}
@@ -363,7 +363,7 @@ _080F6A14:
beq _080F6A4E
ldr r0, _080F6A5C @ =sub_80F6A64
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -384,7 +384,7 @@ _080F6A14:
adds r0, r4, 0
movs r1, 0x1
adds r2, r5, 0
- bl sub_80776E8
+ bl SetWordTaskArg
_080F6A4E:
add sp, 0x8
pop {r3}
@@ -409,16 +409,16 @@ sub_80F6A64: @ 80F6A64
adds r0, r1
movs r1, 0x8
ldrsh r0, [r0, r1]
- bl sub_8000FE8
+ bl CheckForSpaceForDma3Request
lsls r0, 16
cmp r0, 0
bne _080F6A94
adds r0, r4, 0
movs r1, 0x1
- bl sub_8077720
- bl sub_8002BC4
+ bl GetWordTaskArg
+ bl Free
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080F6A94:
pop {r4}
pop {r0}
@@ -440,7 +440,7 @@ sub_80F6AA0: @ 80F6AA0
movs r0, 0
strb r0, [r1, 0x3]
ldr r0, [r1]
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
beq _080F6AC8
@@ -473,11 +473,11 @@ sub_80F6AD0: @ 80F6AD0
beq _080F6AF6
_080F6AEE:
adds r1, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _080F6AFC
_080F6AF6:
adds r1, r4, 0
- bl sub_8001888
+ bl LoadBgTilemap
_080F6AFC:
lsls r0, 16
lsrs r0, 16
@@ -512,7 +512,7 @@ sub_80F6B08: @ 80F6B08
lsls r2, 24
lsrs r2, 24
mov r10, r2
- bl sub_8002008
+ bl GetBgTilemapBuffer
mov r8, r0
adds r0, r5, r4
cmp r5, r0
@@ -587,7 +587,7 @@ sub_80F6B94: @ 80F6B94
lsls r4, 24
lsrs r4, 24
mov r8, r4
- bl sub_8002008
+ bl GetBgTilemapBuffer
adds r7, r0, 0
movs r0, 0
cmp r0, r8
@@ -639,35 +639,35 @@ sub_80F6C14: @ 80F6C14
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_80F6C14
@@ -702,11 +702,11 @@ sub_80F6C98: @ 80F6C98
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_8002C28
bl sub_80F6E9C
pop {r0}
@@ -1005,12 +1005,12 @@ sub_80F6EE4: @ 80F6EE4
lsrs r4, 24
ldr r1, _080F6F18 @ =sub_80F7124
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _080F6F12
adds r0, r5, 0
@@ -1034,12 +1034,12 @@ sub_80F6F1C: @ 80F6F1C
lsrs r4, 24
ldr r1, _080F6F50 @ =sub_80F6FD4
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
cmp r4, 0x1
bne _080F6F4A
adds r0, r5, 0
@@ -1063,12 +1063,12 @@ sub_80F6F54: @ 80F6F54
lsrs r4, 24
ldr r1, _080F6F94 @ =sub_80F76CC
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
cmp r4, 0x1
bne _080F6F82
adds r0, r5, 0
@@ -1099,12 +1099,12 @@ sub_80F6F9C: @ 80F6F9C
lsrs r4, 24
ldr r1, _080F6FD0 @ =sub_80F7684
adds r0, r5, 0
- bl sub_800486C
+ bl CallWindowFunction
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
cmp r4, 0x1
bne _080F6FCA
adds r0, r5, 0
@@ -1161,7 +1161,7 @@ sub_80F6FD4: @ 80F6FD4
adds r0, r7, 0
adds r1, r3, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F710C @ =0x00000215
ldr r2, [sp, 0x10]
str r2, [sp]
@@ -1170,7 +1170,7 @@ sub_80F6FD4: @ 80F6FD4
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7110 @ =0x00000216
ldr r3, [sp, 0xC]
ldr r2, [sp, 0x10]
@@ -1183,7 +1183,7 @@ sub_80F6FD4: @ 80F6FD4
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r5, r9
ldr r0, [sp, 0x14]
add r0, r9
@@ -1206,7 +1206,7 @@ _080F706E:
ldr r3, [sp, 0x18]
lsrs r2, r3, 24
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r6, [sp]
str r6, [sp, 0x4]
mov r0, r8
@@ -1216,7 +1216,7 @@ _080F706E:
mov r3, r10
lsrs r2, r3, 24
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r5, 0x1
ldr r0, [sp, 0x14]
add r0, r9
@@ -1239,7 +1239,7 @@ _080F70A8:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7120 @ =0x0000021b
ldr r0, [sp, 0x10]
str r0, [sp]
@@ -1248,7 +1248,7 @@ _080F70A8:
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x87
lsls r1, 2
ldr r3, [sp, 0xC]
@@ -1261,7 +1261,7 @@ _080F70A8:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -1327,7 +1327,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7394 @ =0x00000201
ldr r2, [sp, 0xC]
subs r2, 0x1
@@ -1339,7 +1339,7 @@ _080F715A:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7398 @ =0x00000202
ldr r0, [sp, 0x14]
str r0, [sp]
@@ -1348,7 +1348,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F739C @ =0x00000203
ldr r2, [sp, 0xC]
ldr r0, [sp, 0x14]
@@ -1362,7 +1362,7 @@ _080F715A:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x81
lsls r1, 2
add r8, r4
@@ -1375,7 +1375,7 @@ _080F715A:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73A0 @ =0x00000205
str r4, [sp]
str r4, [sp, 0x4]
@@ -1383,7 +1383,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73A4 @ =0x00000206
str r4, [sp]
str r4, [sp, 0x4]
@@ -1391,7 +1391,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r9
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x82
lsls r1, 2
str r4, [sp]
@@ -1400,7 +1400,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0x18]
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73A8 @ =0x00000209
str r4, [sp]
str r4, [sp, 0x4]
@@ -1408,7 +1408,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r8
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73AC @ =0x0000020a
ldr r5, [sp, 0x10]
adds r5, 0x1
@@ -1420,7 +1420,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73B0 @ =0x0000020b
str r4, [sp]
str r4, [sp, 0x4]
@@ -1428,7 +1428,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x83
lsls r1, 2
str r4, [sp]
@@ -1437,7 +1437,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73B4 @ =0x0000020d
str r4, [sp]
str r4, [sp, 0x4]
@@ -1445,7 +1445,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73B8 @ =0x00000a0a
ldr r5, [sp, 0x10]
adds r5, 0x2
@@ -1457,7 +1457,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73BC @ =0x00000a0b
str r4, [sp]
str r4, [sp, 0x4]
@@ -1465,7 +1465,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73C0 @ =0x00000a0c
str r4, [sp]
str r4, [sp, 0x4]
@@ -1473,7 +1473,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73C4 @ =0x00000a0d
str r4, [sp]
str r4, [sp, 0x4]
@@ -1481,7 +1481,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73C8 @ =0x00000a05
ldr r5, [sp, 0x10]
adds r5, 0x3
@@ -1493,7 +1493,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73CC @ =0x00000a06
str r4, [sp]
str r4, [sp, 0x4]
@@ -1501,7 +1501,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73D0 @ =0x00000a08
str r4, [sp]
str r4, [sp, 0x4]
@@ -1509,7 +1509,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73D4 @ =0x00000a09
str r4, [sp]
str r4, [sp, 0x4]
@@ -1517,7 +1517,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xA0
lsls r1, 4
ldr r5, [sp, 0x10]
@@ -1530,7 +1530,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73D8 @ =0x00000a01
str r4, [sp]
str r4, [sp, 0x4]
@@ -1538,7 +1538,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73DC @ =0x00000a02
ldr r0, [sp, 0x14]
str r0, [sp]
@@ -1547,7 +1547,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73E0 @ =0x00000a03
str r4, [sp]
str r4, [sp, 0x4]
@@ -1555,7 +1555,7 @@ _080F715A:
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F73E4 @ =0x00000a04
str r4, [sp]
str r4, [sp, 0x4]
@@ -1563,7 +1563,7 @@ _080F715A:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _080F761E
.align 2, 0
_080F7390: .4byte gUnknown_203ADFA
@@ -1607,7 +1607,7 @@ _080F73E8:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7630 @ =0x00000201
ldr r0, [sp, 0xC]
subs r0, 0x1
@@ -1620,7 +1620,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7634 @ =0x00000202
ldr r2, [sp, 0x14]
str r2, [sp]
@@ -1629,7 +1629,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7638 @ =0x00000203
ldr r0, [sp, 0xC]
ldr r2, [sp, 0x14]
@@ -1643,7 +1643,7 @@ _080F73E8:
str r6, [sp, 0x8]
adds r0, r7, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x81
lsls r1, 2
add r8, r4
@@ -1657,7 +1657,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F763C @ =0x00000205
str r4, [sp]
str r4, [sp, 0x4]
@@ -1665,7 +1665,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r10
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7640 @ =0x00000206
str r4, [sp]
str r4, [sp, 0x4]
@@ -1673,7 +1673,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x82
lsls r1, 2
str r4, [sp]
@@ -1682,7 +1682,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0x1C]
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7644 @ =0x00000209
str r4, [sp]
str r4, [sp, 0x4]
@@ -1690,7 +1690,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
ldr r3, [sp, 0x10]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7648 @ =0x0000020a
ldr r5, [sp, 0x10]
adds r5, 0x1
@@ -1702,7 +1702,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F764C @ =0x0000020b
str r4, [sp]
str r4, [sp, 0x4]
@@ -1710,7 +1710,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0x83
lsls r1, 2
str r4, [sp]
@@ -1719,7 +1719,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7650 @ =0x0000020d
str r4, [sp]
str r4, [sp, 0x4]
@@ -1727,7 +1727,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7654 @ =0x00000a05
ldr r5, [sp, 0x10]
adds r5, 0x2
@@ -1739,7 +1739,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7658 @ =0x00000a06
str r4, [sp]
str r4, [sp, 0x4]
@@ -1747,7 +1747,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F765C @ =0x00000a08
str r4, [sp]
str r4, [sp, 0x4]
@@ -1755,7 +1755,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7660 @ =0x00000a09
str r4, [sp]
str r4, [sp, 0x4]
@@ -1763,7 +1763,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7664 @ =0x00000a0a
ldr r5, [sp, 0x10]
adds r5, 0x3
@@ -1775,7 +1775,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7668 @ =0x00000a0b
str r4, [sp]
str r4, [sp, 0x4]
@@ -1783,7 +1783,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F766C @ =0x00000a0c
str r4, [sp]
str r4, [sp, 0x4]
@@ -1791,7 +1791,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7670 @ =0x00000a0d
str r4, [sp]
str r4, [sp, 0x4]
@@ -1799,7 +1799,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xA0
lsls r1, 4
ldr r5, [sp, 0x10]
@@ -1812,7 +1812,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r10
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7674 @ =0x00000a01
str r4, [sp]
str r4, [sp, 0x4]
@@ -1820,7 +1820,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r9
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7678 @ =0x00000a02
ldr r2, [sp, 0x14]
str r2, [sp]
@@ -1829,7 +1829,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0xC]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F767C @ =0x00000a03
str r4, [sp]
str r4, [sp, 0x4]
@@ -1837,7 +1837,7 @@ _080F73E8:
adds r0, r7, 0
ldr r2, [sp, 0x1C]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _080F7680 @ =0x00000a04
str r4, [sp]
str r4, [sp, 0x4]
@@ -1845,7 +1845,7 @@ _080F73E8:
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_080F761E:
add sp, 0x20
pop {r3-r5}
@@ -1911,7 +1911,7 @@ sub_80F7684: @ 80F7684
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -1954,7 +1954,7 @@ sub_80F76CC: @ 80F76CC
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -1977,11 +1977,11 @@ sub_80F771C: @ 80F771C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
cmp r4, 0x1
bne _080F7746
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_080F7746:
add sp, 0xC
pop {r4}
@@ -1999,7 +1999,7 @@ sub_80F7750: @ 80F7750
movs r2, 0x85
lsls r2, 2
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_80F7750
@@ -2052,7 +2052,7 @@ sub_80F77B8: @ 80F77B8
ldr r0, _080F77C8 @ =gUnknown_841F408
movs r1, 0xE0
movs r2, 0x14
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -2067,7 +2067,7 @@ sub_80F77CC: @ 80F77CC
lsrs r1, 16
ldr r0, _080F77E0 @ =gUnknown_841F408
movs r2, 0x14
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -2101,8 +2101,8 @@ _080F77F8:
_080F7804: .4byte gUnknown_841F408
thumb_func_end sub_80F77EC
- thumb_func_start sub_80F7808
-sub_80F7808: @ 80F7808
+ thumb_func_start DisplayItemMessageOnField
+DisplayItemMessageOnField: @ 80F7808
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -2139,7 +2139,7 @@ sub_80F7808: @ 80F7808
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80F7808
+ thumb_func_end DisplayItemMessageOnField
thumb_func_start sub_80F7858
sub_80F7858: @ 80F7858
@@ -2253,7 +2253,7 @@ sub_80F78E0: @ 80F78E0
bl sub_8003CE4
strb r0, [r4]
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
_080F792A:
ldrb r0, [r4]
add sp, 0x20
diff --git a/asm/oak_speech.s b/asm/oak_speech.s
index 2e8c648a6..afd27e764 100644
--- a/asm/oak_speech.s
+++ b/asm/oak_speech.s
@@ -36,7 +36,7 @@ sub_812E944: @ 812E944
lsls r1, 24
lsrs r1, 24
ldr r0, _0812E9DC @ =sub_812E9F8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _0812E9E0 @ =gUnknown_3005090
@@ -71,7 +71,7 @@ sub_812E944: @ 812E944
orrs r1, r2
mov r9, r1
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -88,7 +88,7 @@ _0812E9E0: .4byte gUnknown_3005090
sub_812E9E4: @ 812E9E4
push {lr}
ldr r0, _0812E9F4 @ =sub_812E9F8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -152,13 +152,13 @@ _0812EA4C:
lsrs r0, 8
orrs r1, r0
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x10
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0812EA6E
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0812EA6E:
pop {r4,r5}
pop {r0}
@@ -248,9 +248,9 @@ sub_812EAE4: @ 812EAE4
thumb_func_start sub_812EAFC
sub_812EAFC: @ 812EAFC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_812EAFC
@@ -258,11 +258,11 @@ sub_812EAFC: @ 812EAFC
thumb_func_start sub_812EB10
sub_812EB10: @ 812EB10
push {lr}
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_812EB10
@@ -276,9 +276,9 @@ sub_812EB2C: @ 812EB2C
ldr r0, _0812EB4C @ =gUnknown_20375F8
strh r1, [r0]
ldr r0, _0812EB50 @ =sub_812EB58
- bl sub_807741C
+ bl CreateTask
ldr r0, _0812EB54 @ =sub_812EB10
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -326,9 +326,9 @@ _0812EB84:
.4byte _0812EE30
_0812EBB0:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
add r1, sp, 0x8
movs r0, 0
strh r0, [r1]
@@ -359,11 +359,11 @@ _0812EBB0:
ldr r0, _0812EC24 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8070528
- bl sub_8087E64
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80F6808
+ bl ResetPaletteFade
+ bl remove_some_task
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl reset_temp_tile_data_buffers
movs r0, 0x2
bl sub_812B1F0
b _0812EE94
@@ -376,7 +376,7 @@ _0812EC24: .4byte 0x810001ff
_0812EC28:
ldr r4, _0812EC3C @ =gUnknown_203B108
ldr r0, _0812EC40 @ =0x00002420
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0x1
movs r1, 0x1
@@ -388,31 +388,31 @@ _0812EC40: .4byte 0x00002420
_0812EC44:
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _0812EE94
_0812EC8E:
movs r0, 0
@@ -427,29 +427,29 @@ _0812EC8E:
lsls r0, 5
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0xC1
lsls r0, 5
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _0812ECF8 @ =gUnknown_2021BC8
movs r1, 0
strh r1, [r0]
@@ -474,13 +474,13 @@ _0812ED00:
ldr r0, _0812ED38 @ =gUnknown_8460568
movs r1, 0
movs r2, 0x80
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r0, 0x1E
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _0812EE94
.align 2, 0
_0812ED34: .4byte gUnknown_2037AB8
@@ -500,14 +500,14 @@ _0812ED3C:
str r3, [sp]
movs r0, 0x1
movs r2, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _0812EE94
.align 2, 0
_0812ED60: .4byte gUnknown_203B108
_0812ED64: .4byte gUnknown_3003E50
_0812ED68: .4byte gUnknown_84605E8
_0812ED6C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
beq _0812ED78
@@ -523,9 +523,9 @@ _0812ED78:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0812EE94
_0812ED9A:
movs r0, 0xE2
@@ -544,7 +544,7 @@ _0812ED9A:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _0812EE20 @ =0x0000d002
str r4, [sp]
movs r5, 0x1
@@ -552,14 +552,14 @@ _0812ED9A:
movs r0, 0x1
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _0812EE24 @ =0x0000d00e
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x1
movs r2, 0
movs r3, 0x13
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
bl sub_812EEB0
ldr r2, _0812EE28 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
@@ -584,7 +584,7 @@ _0812ED9A:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0812EE94
.align 2, 0
_0812EE1C: .4byte 0x0000d00f
@@ -600,19 +600,19 @@ _0812EE30:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _0812EE80 @ =sub_812EAFC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0812EE84 @ =0x00000143
- bl sub_80722A0
+ bl PlayBGM
ldr r1, _0812EE88 @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -673,11 +673,11 @@ sub_812EEB0: @ 812EEB0
strh r0, [r1, 0x14]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldrb r0, [r0, 0x14]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldrb r0, [r0, 0x14]
str r5, [sp]
@@ -704,9 +704,9 @@ sub_812EEB0: @ 812EEB0
movs r0, 0x1
movs r2, 0x1
movs r3, 0x3
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x14
pop {r4-r6}
pop {r0}
@@ -775,13 +775,13 @@ _0812EF9A:
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
@@ -829,7 +829,7 @@ _0812EF9A:
movs r0, 0x1
movs r2, 0x1
movs r3, 0x3
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
b _0812F064
.align 2, 0
_0812F038: .4byte gUnknown_8415D50
@@ -847,13 +847,13 @@ _0812F050:
movs r0, 0x1
movs r2, 0x1
movs r3, 0x3
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
_0812F064:
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0812F06A:
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
ldrh r2, [r0, 0x1E]
ldr r0, _0812F0A4 @ =0xffffdfff
movs r1, 0x1
@@ -861,7 +861,7 @@ _0812F06A:
str r2, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0812F0A8 @ =gUnknown_3005090
mov r0, r10
add r0, r8
@@ -920,7 +920,7 @@ sub_812F0B0: @ 812F0B0
cmp r0, 0x1
bhi _0812F150
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
ldrh r2, [r0, 0x1E]
ldr r0, _0812F11C @ =0xffffdfff
movs r1, 0x1
@@ -928,7 +928,7 @@ sub_812F0B0: @ 812F0B0
str r2, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0812F150
.align 2, 0
_0812F10C: .4byte gUnknown_2037AB8
@@ -950,7 +950,7 @@ _0812F120:
ldr r1, _0812F174 @ =0x0000ffff
strh r1, [r0, 0x26]
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
ldrh r2, [r0, 0x1E]
ldr r0, _0812F178 @ =0xffffdfff
movs r1, 0x1
@@ -958,7 +958,7 @@ _0812F120:
str r2, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0812F150:
movs r0, 0x5
bl sub_80722CC
@@ -1044,12 +1044,12 @@ _0812F1EA:
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
@@ -1090,7 +1090,7 @@ _0812F24C:
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0812F270 @ =sub_812F274
str r0, [r4]
_0812F260:
@@ -1129,12 +1129,12 @@ _0812F292:
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r5]
adds r0, 0x14
adds r0, r4
@@ -1164,9 +1164,9 @@ _0812F292:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0812F334 @ =gUnknown_3005090
mov r1, r8
lsls r4, r1, 2
@@ -1181,7 +1181,7 @@ _0812F292:
adds r0, 0x14
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x20
strh r0, [r4, 0xE]
ldr r0, _0812F338 @ =sub_812F33C
@@ -1232,7 +1232,7 @@ _0812F370: .4byte gUnknown_3005098
_0812F374:
movs r0, 0xA2
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
bl sub_810F71C
ldr r0, _0812F484 @ =gUnknown_8415D48
movs r1, 0
@@ -1252,12 +1252,12 @@ _0812F374:
movs r0, 0x1
movs r2, 0
movs r3, 0x2
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
ldr r0, [r0, 0x8]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4]
str r6, [r0, 0x8]
ldr r0, _0812F490 @ =gUnknown_8462EC0
@@ -1265,10 +1265,10 @@ _0812F374:
strh r0, [r5, 0x1C]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0x1C]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x1C]
movs r1, 0x3
bl sub_8003F20
@@ -1338,7 +1338,7 @@ _0812F374:
movs r1, 0x2
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
mov r0, r9
subs r0, 0x8
add r0, r8
@@ -1412,21 +1412,21 @@ _0812F4F8:
_0812F506:
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x85
lsls r1, 5
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1F
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
b _0812F676
.align 2, 0
_0812F534: .4byte gUnknown_2037AB8
@@ -1480,7 +1480,7 @@ _0812F590: .4byte gUnknown_30030F0
_0812F594:
ldr r1, _0812F5B0 @ =0x00000241
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r5, 0x1E]
movs r1, 0x10
subs r1, r0
@@ -1488,7 +1488,7 @@ _0812F594:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
b _0812F6A2
.align 2, 0
_0812F5B0: .4byte 0x00000241
@@ -1503,7 +1503,7 @@ _0812F5B4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r5, r1]
cmp r0, 0
@@ -1512,7 +1512,7 @@ _0812F5B4:
_0812F5D6:
ldrb r0, [r5, 0x1C]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r5, 0x1C]
movs r1, 0x1
str r1, [sp]
@@ -1568,7 +1568,7 @@ _0812F644:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x1E
ldrsh r0, [r5, r1]
cmp r0, 0xF
@@ -1576,10 +1576,10 @@ _0812F644:
strh r4, [r5, 0x1E]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
_0812F676:
ldr r0, _0812F684 @ =gUnknown_30030F0
movs r1, 0x87
@@ -1599,7 +1599,7 @@ _0812F688:
ldrb r0, [r0, 0x12]
bl sub_8006398
ldr r0, _0812F6B8 @ =0x00000145
- bl sub_80722A0
+ bl PlayBGM
movs r0, 0x18
strh r0, [r5, 0x1E]
_0812F6A2:
@@ -1631,27 +1631,27 @@ _0812F6D0:
strh r4, [r0, 0x12]
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x1
negs r0, r0
str r4, [sp]
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -1692,9 +1692,9 @@ sub_812F72C: @ 812F72C
bl sub_810F740
ldrb r0, [r4, 0x1C]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4, 0x1C]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x1C]
movs r1, 0x3
bl sub_8003F20
@@ -1709,9 +1709,9 @@ sub_812F72C: @ 812F72C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
adds r0, r5, 0
movs r1, 0
bl sub_8131168
@@ -1774,14 +1774,14 @@ _0812F7F0:
lsrs r2, 16
movs r0, 0x1
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, _0812F878 @ =gUnknown_8460CE8
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
adds r0, r4, 0
bl sub_8130F2C
movs r0, 0x3
@@ -1792,18 +1792,18 @@ _0812F7F0:
bl sub_8130FD4
movs r0, 0x92
lsls r0, 1
- bl sub_80722A0
+ bl PlayBGM
movs r0, 0x1
negs r0, r0
str r6, [sp]
movs r1, 0x5
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x50
strh r0, [r5, 0x6]
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
@@ -2050,7 +2050,7 @@ _0812FA1A:
str r2, [sp, 0xC]
movs r2, 0x64
movs r3, 0x42
- bl sub_804B908
+ bl CreatePokeballSpriteToReleaseMon
ldr r0, _0812FA74 @ =sub_812FA78
str r0, [r4]
strh r5, [r4, 0xE]
@@ -2072,7 +2072,7 @@ sub_812FA78: @ 812FA78
sub sp, 0x10
lsls r0, 24
lsrs r4, r0, 24
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
beq _0812FAA0
@@ -2158,7 +2158,7 @@ _0812FB30:
bl sub_8003F20
movs r0, 0x1D
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_0812FB40:
add sp, 0x10
pop {r4,r5}
@@ -2350,14 +2350,14 @@ _0812FCAC:
lsls r0, 2
ldr r4, _0812FCE8 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r0, 0xC
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
_0812FCD6:
ldrh r0, [r5, 0x6]
movs r1, 0x6
@@ -2593,7 +2593,7 @@ sub_812FE88: @ 812FE88
strh r0, [r5, 0x22]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r4, [r5, 0x22]
lsls r4, 24
lsrs r4, 24
@@ -2604,12 +2604,12 @@ sub_812FE88: @ 812FE88
adds r0, r4, 0
movs r1, 0x1
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldrh r0, [r5, 0x22]
lsls r0, 24
lsrs r0, 24
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _0812FF94 @ =gUnknown_203B108
ldr r0, [r4]
movs r1, 0x1
@@ -2704,7 +2704,7 @@ sub_812FFA4: @ 812FFA4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -2770,9 +2770,9 @@ sub_812FFF0: @ 812FFF0
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
subs r6, 0x8
adds r5, r6
ldr r0, _0813004C @ =sub_8130050
@@ -2937,7 +2937,7 @@ sub_8130160: @ 8130160
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _081301A4 @ =gUnknown_203B108
ldr r0, [r0]
strh r4, [r0, 0x10]
@@ -2992,7 +2992,7 @@ sub_81301B0: @ 81301B0
lsls r1, 2
movs r0, 0x2
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
b _08130218
.align 2, 0
_081301F8: .4byte gUnknown_3005098
@@ -3150,7 +3150,7 @@ sub_8130324: @ 8130324
lsls r6, r1, 3
ldr r7, _0813037C @ =gUnknown_3005098
adds r5, r6, r7
- bl sub_810F998
+ bl ProcessMenuInput
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -3193,7 +3193,7 @@ _08130388:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -3602,7 +3602,7 @@ sub_81306D4: @ 81306D4
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldr r0, _08130710 @ =gUnknown_3005090
lsls r4, r5, 2
adds r4, r5
@@ -3768,7 +3768,7 @@ _08130820:
strh r1, [r0]
movs r0, 0x2
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
adds r0, r5, 0
movs r1, 0x2
bl sub_81315CC
@@ -3868,7 +3868,7 @@ sub_81308D0: @ 81308D0
_081308FC: .4byte gUnknown_3005090
_08130900:
movs r0, 0x4
- bl sub_8071DBC
+ bl FadeOutBGM
ldr r0, _08130910 @ =sub_8130914
str r0, [r4]
_0813090A:
@@ -3915,7 +3915,7 @@ sub_8130940: @ 8130940
movs r0, 0x2
movs r1, 0x6
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r1, 0
strh r1, [r5]
strh r1, [r5, 0x2]
@@ -3999,7 +3999,7 @@ _081309BE:
str r6, [sp, 0xC]
movs r0, 0x2
movs r3, 0x78
- bl sub_8001E80
+ bl SetBgAffine
movs r1, 0x4
ldrsh r0, [r5, r1]
cmp r0, 0x60
@@ -4032,7 +4032,7 @@ sub_8130A38: @ 8130A38
sub sp, 0x4
ldr r0, _08130A74 @ =sub_8130A80
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -4051,7 +4051,7 @@ sub_8130A38: @ 8130A38
movs r1, 0x4
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
@@ -4084,7 +4084,7 @@ sub_8130A80: @ 8130A80
cmp r1, 0
beq _08130AC0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
adds r0, r4, 0
movs r1, 0x1
bl sub_8131168
@@ -4101,7 +4101,7 @@ _08130AC0:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08130AD4:
add sp, 0x4
pop {r4}
@@ -4114,7 +4114,7 @@ sub_8130ADC: @ 8130ADC
push {lr}
ldr r0, _08130B08 @ =sub_8130B10
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -4174,7 +4174,7 @@ _08130B4A:
movs r0, 0x40
movs r1, 0x20
adds r3, r7, 0
- bl sub_8045274
+ bl BlendPalette
ldrh r1, [r4, 0x1C]
adds r1, 0x1
strh r1, [r4, 0x1C]
@@ -4205,7 +4205,7 @@ _08130B78:
cmp r2, 0x1F
bls _08130B78
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08130B96:
pop {r4-r7}
pop {r0}
@@ -4243,7 +4243,7 @@ _08130BD0:
movs r1, 0x2
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08130BEC @ =sub_8130BF0
str r0, [r4]
_08130BE2:
@@ -4292,7 +4292,7 @@ sub_8130C20: @ 8130C20
bl sub_8044D80
ldr r5, _08130C58 @ =gUnknown_203B108
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
ldr r2, _08130C5C @ =gUnknown_3003E50
@@ -4301,9 +4301,9 @@ sub_8130C20: @ 8130C20
ands r0, r1
strb r0, [r2]
ldr r0, _08130C60 @ =sub_8056644
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -4346,7 +4346,7 @@ _08130C8C:
.4byte _08130EB8
_08130CAC:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
add r1, sp, 0x8
movs r0, 0
strh r0, [r1]
@@ -4377,11 +4377,11 @@ _08130CAC:
ldr r0, _08130D14 @ =0x810001ff
str r0, [r1, 0x8]
ldr r0, [r1, 0x8]
- bl sub_8070528
- bl sub_8087E64
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80F6808
+ bl ResetPaletteFade
+ bl remove_some_task
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl reset_temp_tile_data_buffers
b _08130F10
.align 2, 0
_08130D04: .4byte 0x040000d4
@@ -4402,29 +4402,29 @@ _08130D18:
lsls r0, 5
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0xC1
lsls r0, 5
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
b _08130F10
.align 2, 0
_08130D70: .4byte gUnknown_8462E58
@@ -4432,25 +4432,25 @@ _08130D74: .4byte gUnknown_203B108
_08130D78:
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08130F10
_08130DB2:
bl sub_8003ECC
@@ -4459,7 +4459,7 @@ _08130DB2:
ldr r0, _08130DCC @ =gUnknown_8460568
movs r1, 0
movs r2, 0xE0
- bl sub_80703EC
+ bl LoadPalette
b _08130F10
.align 2, 0
_08130DCC: .4byte gUnknown_8460568
@@ -4470,12 +4470,12 @@ _08130DD0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _08130F10
.align 2, 0
_08130DE4: .4byte gUnknown_8460CA4
_08130DE8:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
beq _08130DF4
@@ -4489,30 +4489,30 @@ _08130DF4:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08130E34 @ =gUnknown_8460CE8
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08130F10
.align 2, 0
_08130E34: .4byte gUnknown_8460CE8
_08130E38:
ldr r0, _08130E5C @ =sub_8130464
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _08130E60 @ =gUnknown_203B108
@@ -4556,7 +4556,7 @@ _08130E7A:
ldr r1, _08130EB4 @ =0xffffc400
movs r0, 0x2
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
adds r0, r5, 0
movs r1, 0x1
bl sub_8130FD4
@@ -4575,28 +4575,28 @@ _08130EB8:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _08130F04 @ =sub_812EAFC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r2, _08130F08 @ =gUnknown_3003E50
ldrb r0, [r2]
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
ldr r0, _08130F0C @ =sub_812EB10
- bl sub_8000544
+ bl SetMainCallback2
b _08130F1E
.align 2, 0
_08130F04: .4byte sub_812EAFC
@@ -4641,7 +4641,7 @@ sub_8130F2C: @ 8130F2C
movs r1, 0x60
movs r2, 0x60
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r4, _08130FAC @ =gUnknown_202063C
@@ -4721,21 +4721,21 @@ sub_8130FD4: @ 8130FD4
_08130FF4:
ldr r4, _081310B0 @ =gUnknown_8462EFC
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r0, r4, 0
adds r0, 0x8
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x10
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _081310B4 @ =gUnknown_8462F1C
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _081310B8 @ =gUnknown_846302C
mov r8, r0
movs r1, 0x10
movs r2, 0x11
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
ldr r6, _081310BC @ =gUnknown_202063C
@@ -4761,7 +4761,7 @@ _08130FF4:
movs r1, 0x10
movs r2, 0x9
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
lsls r1, r7, 4
@@ -4788,7 +4788,7 @@ _08130FF4:
movs r1, 0x18
movs r2, 0xD
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
lsls r0, r7, 4
@@ -4814,9 +4814,9 @@ _081310C0: .4byte gUnknown_3005090
_081310C4: .4byte sub_8130FB8
_081310C8:
ldr r0, _08131154 @ =gUnknown_8462F14
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _08131158 @ =gUnknown_8462F24
- bl sub_8008928
+ bl LoadSpritePalette
mov r2, r9
lsls r5, r2, 2
ldr r3, _0813115C @ =gUnknown_3005098
@@ -4835,7 +4835,7 @@ _081310DE:
asrs r1, 16
movs r2, 0x70
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
lsls r2, r7, 4
@@ -4914,7 +4914,7 @@ _0813117C:
lsls r0, 2
ldr r1, _081311B0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -4930,14 +4930,14 @@ _081311AC: .4byte gUnknown_3005098
_081311B0: .4byte gUnknown_202063C
_081311B4:
ldr r0, _081311D0 @ =0x00001003
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _081311D4 @ =0x00001002
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r4, _081311D8 @ =0x00001001
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
b _081311EC
.align 2, 0
_081311D0: .4byte 0x00001003
@@ -4947,9 +4947,9 @@ _081311DC:
movs r4, 0x80
lsls r4, 5
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_081311EC:
pop {r4-r7}
pop {r0}
@@ -4982,7 +4982,7 @@ _0813121A:
ldr r0, _08131228 @ =gUnknown_84615FC
movs r1, 0x40
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0813122C @ =gUnknown_846163C
b _08131254
.align 2, 0
@@ -4992,7 +4992,7 @@ _08131230:
ldr r0, _08131240 @ =gUnknown_8460ED4
movs r1, 0x40
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08131244 @ =gUnknown_8460F14
b _08131254
.align 2, 0
@@ -5002,7 +5002,7 @@ _08131248:
ldr r0, _08131260 @ =gUnknown_84623AC
movs r1, 0x60
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08131264 @ =gUnknown_84623EC
_08131254:
ldr r2, _08131268 @ =0x06000600
@@ -5017,14 +5017,14 @@ _0813126C:
ldr r0, _08131300 @ =gUnknown_8461CD4
movs r1, 0x60
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08131304 @ =gUnknown_8461D14
ldr r2, _08131308 @ =0x06000600
adds r1, r4, r2
bl LZ77UnCompVram
_08131280:
movs r0, 0x60
- bl sub_8002BB0
+ bl AllocZeroed
ldr r2, _0813130C @ =gUnknown_203B108
ldr r1, [r2]
str r0, [r1, 0x4]
@@ -5047,7 +5047,7 @@ _08131290:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r4, _0813130C @ =gUnknown_203B108
ldr r0, [r4]
ldr r1, [r0, 0x4]
@@ -5070,12 +5070,12 @@ _08131290:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
ldr r0, [r0, 0x4]
- bl sub_8002BC4
+ bl Free
ldr r0, [r4]
str r5, [r0, 0x4]
_081312F6:
@@ -5104,9 +5104,9 @@ sub_8131310: @ 8131310
movs r1, 0
movs r2, 0xB
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
@@ -5143,7 +5143,7 @@ sub_8131338: @ 8131338
movs r0, 0x1
strh r0, [r1, 0xC]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r6, _081313AC @ =gUnknown_202063C
adds r2, r5, 0
mov r5, r8
@@ -5244,7 +5244,7 @@ _0813141E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_0813143A:
pop {r3-r5}
mov r8, r3
@@ -5271,13 +5271,13 @@ sub_813144C: @ 813144C
movs r7, 0
ldr r1, _081314D0 @ =0x00001244
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _081314D4 @ =gUnknown_3005090
mov r8, r0
lsls r5, r4, 2
@@ -5287,7 +5287,7 @@ sub_813144C: @ 813144C
strh r7, [r0, 0xC]
ldr r0, _081314D8 @ =sub_8131338
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -5365,7 +5365,7 @@ sub_81314DC: @ 81314DC
movs r0, 0x1
strh r0, [r1, 0xC]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
b _081315BA
.align 2, 0
_08131528: .4byte gUnknown_3005090
@@ -5441,7 +5441,7 @@ _0813159E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_081315BA:
pop {r3-r5}
mov r8, r3
@@ -5468,14 +5468,14 @@ sub_81315CC: @ 81315CC
movs r7, 0
ldr r1, _08131654 @ =0x00001244
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 5
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08131658 @ =gUnknown_3005090
mov r8, r0
lsls r5, r4, 2
@@ -5485,7 +5485,7 @@ sub_81315CC: @ 81315CC
strh r7, [r0, 0xC]
ldr r0, _0813165C @ =sub_81314DC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r2, r0, 2
@@ -5548,7 +5548,7 @@ sub_8131660: @ 8131660
strh r0, [r7, 0x1A]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r6, [r7, 0x1A]
bl sub_80F796C
adds r2, r0, 0
@@ -5557,11 +5557,11 @@ sub_8131660: @ 8131660
adds r0, r6, 0
movs r1, 0x1
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
adds r5, r4
ldrb r0, [r5, 0x1A]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r7, 0x1A]
ldr r2, _081316E4 @ =gUnknown_81C574F
movs r1, 0x1
@@ -5660,7 +5660,7 @@ _08131774: .4byte gUnknown_846308C
_08131778:
ldr r4, _08131798 @ =gUnknown_84630D8
_0813177A:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x13
diff --git a/asm/option_menu.s b/asm/option_menu.s
index 6b383e590..bf3479a27 100644
--- a/asm/option_menu.s
+++ b/asm/option_menu.s
@@ -8,10 +8,10 @@
thumb_func_start sub_808835C
sub_808835C: @ 808835C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_808835C
@@ -19,9 +19,9 @@ sub_808835C: @ 808835C
thumb_func_start sub_8088374
sub_8088374: @ 8088374
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8088374
@@ -38,7 +38,7 @@ sub_8088388: @ 8088388
_08088396:
ldr r4, _08088420 @ =gUnknown_2039620
movs r0, 0x14
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r1, 0
strb r1, [r0, 0x10]
@@ -95,7 +95,7 @@ _080883FA:
movs r0, 0xD
bl sub_812B1F0
ldr r0, _0808842C @ =sub_8088454
- bl sub_8000544
+ bl SetMainCallback2
pop {r4-r6}
pop {r0}
bx r0
@@ -112,9 +112,9 @@ _0808842C: .4byte sub_8088454
sub_8088430: @ 8088430
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_8088430
@@ -123,7 +123,7 @@ sub_8088430: @ 8088430
sub_8088444: @ 8088444
push {lr}
ldr r0, _08088450 @ =sub_8088374
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -226,9 +226,9 @@ sub_8088514: @ 8088514
push {lr}
ldr r0, _08088528 @ =sub_8088780
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _0808852C @ =sub_808835C
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -307,7 +307,7 @@ _08088556:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _08088678 @ =gUnknown_83CC2D8
@@ -317,60 +317,60 @@ _08088556:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _0808867C @ =gUnknown_83CC2B8
bl sub_8003B24
bl sub_8002C28
movs r0, 0x50
movs r1, 0xC1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x2
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x27
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xC1
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
add sp, 0x8
pop {r3}
mov r8, r3
@@ -397,7 +397,7 @@ sub_8088680: @ 8088680
subs r4, r0
movs r0, 0x2
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
lsls r4, 24
lsrs r4, 24
ldr r0, _080886D0 @ =gUnknown_83CC360
@@ -411,7 +411,7 @@ sub_8088680: @ 8088680
movs r3, 0
bl sub_812E51C
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
@@ -427,11 +427,11 @@ _080886D0: .4byte gUnknown_83CC360
thumb_func_start sub_80886D4
sub_80886D4: @ 80886D4
push {lr}
- bl sub_8006B10
- bl sub_8070528
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl remove_some_task
pop {r0}
bx r0
thumb_func_end sub_80886D4
@@ -466,7 +466,7 @@ _08088716:
movs r3, 0xD5
lsls r3, 1
movs r0, 0x1
- bl sub_80017D0
+ bl LoadBgTiles
b _0808876C
_0808872E:
ldrb r0, [r0, 0xA]
@@ -478,13 +478,13 @@ _0808873A:
ldr r0, _08088754 @ =gUnknown_83CC2E4
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
_0808874C:
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0808876C
.align 2, 0
_08088754: .4byte gUnknown_83CC2E4
@@ -550,7 +550,7 @@ _080887C0:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_8088444
ldr r0, _080887DC @ =gUnknown_2039620
ldr r1, [r0]
@@ -597,14 +597,14 @@ _08088824:
movs r3, 0xD5
lsls r3, 1
movs r0, 0x1
- bl sub_80017D0
+ bl LoadBgTiles
ldr r0, [r4]
ldrb r0, [r0, 0xA]
bl sub_8069788
ldr r0, [r0, 0x4]
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, [r4]
b _0808886C
.align 2, 0
@@ -633,7 +633,7 @@ _08088878:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08088890 @ =gUnknown_2039620
ldr r1, [r0]
b _080888A2
@@ -830,7 +830,7 @@ sub_80889A8: @ 80889A8
movs r1, 0x1
movs r2, 0x82
adds r3, r7, 0
- bl sub_8004378
+ bl FillWindowPixelRect
adds r6, r4, 0
cmp r5, 0x5
bhi _08088ADE
@@ -914,7 +914,7 @@ _08088A98: .4byte gUnknown_2039620
_08088A9C:
ldr r1, _08088AF8 @ =gUnknown_8419E52
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
add r4, sp, 0x20
ldr r0, _08088AFC @ =gUnknown_2039620
ldr r0, [r0]
@@ -929,7 +929,7 @@ _08088A9C:
add r0, sp, 0xC
adds r1, r4, 0
movs r2, 0x3
- bl sub_8008DEC
+ bl StringAppendN
str r6, [sp]
movs r0, 0x1
negs r0, r0
@@ -943,7 +943,7 @@ _08088A9C:
bl sub_812E51C
_08088ADE:
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -972,7 +972,7 @@ sub_8088B00: @ 8088B00
str r0, [r1]
ldr r0, _08088BC4 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8003ECC
ldr r3, _08088BC8 @ =gUnknown_300500C
ldr r5, [r3]
@@ -1040,10 +1040,10 @@ sub_8088B00: @ 8088B00
lsrs r0, 31
bl SetPokemonCryStereo
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r6, [r4]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -1063,7 +1063,7 @@ sub_8088BD0: @ 8088BD0
sub sp, 0xC
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _08088C08 @ =gUnknown_8419DCC
movs r0, 0x1
str r0, [sp]
@@ -1075,7 +1075,7 @@ sub_8088BD0: @ 8088BD0
movs r3, 0x8
bl sub_8002C48
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -1102,7 +1102,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xDA
lsls r1, 1
movs r0, 0x1B
@@ -1113,7 +1113,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x2
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D70 @ =0x000001b5
str r4, [sp]
str r4, [sp, 0x4]
@@ -1121,7 +1121,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xDB
lsls r1, 1
str r4, [sp]
@@ -1130,7 +1130,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x3
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xDC
lsls r1, 1
str r4, [sp]
@@ -1139,7 +1139,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x3
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D74 @ =0x000001b9
str r4, [sp]
str r4, [sp, 0x4]
@@ -1147,7 +1147,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x5
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xDD
lsls r1, 1
mov r0, r8
@@ -1157,7 +1157,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x2
movs r3, 0x5
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D78 @ =0x000001bb
str r4, [sp]
str r4, [sp, 0x4]
@@ -1165,7 +1165,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x5
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xD5
lsls r1, 1
str r4, [sp]
@@ -1174,7 +1174,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x6
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D7C @ =0x000001ab
movs r0, 0x1A
mov r8, r0
@@ -1184,7 +1184,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x2
movs r3, 0x6
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xD6
lsls r1, 1
str r4, [sp]
@@ -1193,7 +1193,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x6
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D80 @ =0x000001ad
str r4, [sp]
movs r5, 0x10
@@ -1202,7 +1202,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x7
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D84 @ =0x000001af
str r4, [sp]
str r5, [sp, 0x4]
@@ -1210,7 +1210,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x7
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xD8
lsls r1, 1
str r4, [sp]
@@ -1219,7 +1219,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08088D88 @ =0x000001b1
mov r0, r8
str r0, [sp]
@@ -1228,7 +1228,7 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x2
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xD9
lsls r1, 1
str r4, [sp]
@@ -1237,9 +1237,9 @@ sub_8088C0C: @ 8088C0C
movs r0, 0x1
movs r2, 0x1C
movs r3, 0x13
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r3}
mov r8, r3
@@ -1263,7 +1263,7 @@ sub_8088D8C: @ 8088D8C
sub sp, 0xC
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r4, 0
_08088D9A:
movs r0, 0x2
@@ -1324,11 +1324,11 @@ sub_8088DE0: @ 8088DE0
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x87
lsls r1, 5
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
diff --git a/asm/overworld.s b/asm/overworld.s
index a55e4900a..3a2a1d200 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -9,7 +9,7 @@
sub_8054BC8: @ 8054BC8
push {r4,lr}
ldr r0, _08054BFC @ =gUnknown_81A654B
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
ldr r0, _08054C00 @ =gUnknown_3005008
ldr r4, [r0]
movs r0, 0xA4
@@ -18,11 +18,11 @@ sub_8054BC8: @ 8054BC8
bl sub_8054C04
adds r1, r0, 0
adds r0, r4, 0
- bl sub_809FDD8
+ bl RemoveMoney
bl sub_80A0058
bl sub_8054DD8
bl sub_80554BC
- bl sub_8055378
+ bl warp_in
pop {r4}
pop {r0}
bx r0
@@ -473,7 +473,7 @@ _08054F8A:
str r2, [sp, 0x4]
adds r0, r2, 0
adds r1, r5, 0
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
mov r6, r10
ldr r1, [r6]
mov r2, r8
@@ -624,8 +624,8 @@ _080550D0: .4byte gUnknown_2036DFC
_080550D4: .4byte gUnknown_3005008
thumb_func_end sub_80550A8
- thumb_func_start sub_80550D8
-sub_80550D8: @ 80550D8
+ thumb_func_start Overworld_SetMapObjTemplateCoords
+Overworld_SetMapObjTemplateCoords: @ 80550D8
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -657,10 +657,10 @@ _0805510C:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80550D8
+ thumb_func_end Overworld_SetMapObjTemplateCoords
- thumb_func_start sub_8055114
-sub_8055114: @ 8055114
+ thumb_func_start Overworld_SetMapObjTemplateMovementType
+Overworld_SetMapObjTemplateMovementType: @ 8055114
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -689,28 +689,28 @@ _08055140:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8055114
+ thumb_func_end Overworld_SetMapObjTemplateMovementType
- thumb_func_start sub_8055148
-sub_8055148: @ 8055148
+ thumb_func_start mapdata_load_assets_to_gpu_and_full_redraw
+mapdata_load_assets_to_gpu_and_full_redraw: @ 8055148
push {r4,lr}
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
ldr r4, _0805516C @ =gUnknown_2036DFC
ldr r0, [r4]
- bl sub_8059AB0
+ bl copy_map_tileset1_tileset2_to_vram
ldr r0, [r4]
- bl sub_8059AD8
- bl sub_805A684
- bl sub_806FF9C
+ bl apply_map_tileset1_tileset2_palette
+ bl DrawWholeMapView
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0805516C: .4byte gUnknown_2036DFC
- thumb_func_end sub_8055148
+ thumb_func_end mapdata_load_assets_to_gpu_and_full_redraw
- thumb_func_start sub_8055170
-sub_8055170: @ 8055170
+ thumb_func_start get_mapdata_header
+get_mapdata_header: @ 8055170
push {lr}
ldr r0, _08055180 @ =gUnknown_3005008
ldr r0, [r0]
@@ -732,10 +732,10 @@ _0805518E:
bx r1
.align 2, 0
_08055194: .4byte gUnknown_834EB8C
- thumb_func_end sub_8055170
+ thumb_func_end get_mapdata_header
- thumb_func_start sub_8055198
-sub_8055198: @ 8055198
+ thumb_func_start warp_shift
+warp_shift: @ 8055198
ldr r3, _080551C4 @ =gUnknown_2031DB4
ldr r0, _080551C8 @ =gUnknown_3005008
ldr r2, [r0]
@@ -765,10 +765,10 @@ _080551CC: .4byte gUnknown_2031DBC
_080551D0: .4byte gUnknown_2031DC4
_080551D4: .4byte gUnknown_826D2B0
_080551D8: .4byte gUnknown_2031DCC
- thumb_func_end sub_8055198
+ thumb_func_end warp_shift
- thumb_func_start sub_80551DC
-sub_80551DC: @ 80551DC
+ thumb_func_start warp_set
+warp_set: @ 80551DC
push {r4,r5,lr}
ldr r4, [sp, 0xC]
ldr r5, [sp, 0x10]
@@ -784,10 +784,10 @@ sub_80551DC: @ 80551DC
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80551DC
+ thumb_func_end warp_set
- thumb_func_start sub_80551FC
-sub_80551FC: @ 80551FC
+ thumb_func_start warp_data_is_not_neg_1
+warp_data_is_not_neg_1: @ 80551FC
push {lr}
adds r1, r0, 0
movs r2, 0
@@ -819,10 +819,10 @@ _08055230:
_08055232:
pop {r1}
bx r1
- thumb_func_end sub_80551FC
+ thumb_func_end warp_data_is_not_neg_1
- thumb_func_start sub_8055238
-sub_8055238: @ 8055238
+ thumb_func_start get_mapheader_by_bank_and_number
+get_mapheader_by_bank_and_number: @ 8055238
lsls r0, 16
lsls r1, 16
ldr r2, _0805524C @ =gUnknown_83526A8
@@ -835,10 +835,10 @@ sub_8055238: @ 8055238
bx lr
.align 2, 0
_0805524C: .4byte gUnknown_83526A8
- thumb_func_end sub_8055238
+ thumb_func_end get_mapheader_by_bank_and_number
- thumb_func_start sub_8055250
-sub_8055250: @ 8055250
+ thumb_func_start warp1_get_mapheader
+warp1_get_mapheader: @ 8055250
push {lr}
ldr r1, _08055270 @ =gUnknown_2031DBC
movs r0, 0
@@ -850,15 +850,15 @@ sub_8055250: @ 8055250
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
pop {r1}
bx r1
.align 2, 0
_08055270: .4byte gUnknown_2031DBC
- thumb_func_end sub_8055250
+ thumb_func_end warp1_get_mapheader
- thumb_func_start sub_8055274
-sub_8055274: @ 8055274
+ thumb_func_start set_current_map_header_from_sav1_save_old_name
+set_current_map_header_from_sav1_save_old_name: @ 8055274
push {r4-r6,lr}
ldr r4, _080552B4 @ =gUnknown_2036DFC
ldr r5, _080552B8 @ =gUnknown_3005008
@@ -872,7 +872,7 @@ sub_8055274: @ 8055274
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r1, r4, 0
ldm r0!, {r2,r3,r6}
stm r1!, {r2,r3,r6}
@@ -883,7 +883,7 @@ sub_8055274: @ 8055274
ldr r1, [r5]
ldrh r0, [r4, 0x12]
strh r0, [r1, 0x32]
- bl sub_8055170
+ bl get_mapdata_header
str r0, [r4]
pop {r4-r6}
pop {r0}
@@ -891,10 +891,10 @@ sub_8055274: @ 8055274
.align 2, 0
_080552B4: .4byte gUnknown_2036DFC
_080552B8: .4byte gUnknown_3005008
- thumb_func_end sub_8055274
+ thumb_func_end set_current_map_header_from_sav1_save_old_name
- thumb_func_start sub_80552BC
-sub_80552BC: @ 80552BC
+ thumb_func_start set_current_map_header_from_sav1
+set_current_map_header_from_sav1: @ 80552BC
push {r4,r5,lr}
ldr r4, _080552F4 @ =gUnknown_2036DFC
ldr r0, _080552F8 @ =gUnknown_3005008
@@ -908,7 +908,7 @@ sub_80552BC: @ 80552BC
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r1, r4, 0
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
@@ -916,7 +916,7 @@ sub_80552BC: @ 80552BC
stm r1!, {r2,r3,r5}
ldr r0, [r0]
str r0, [r1]
- bl sub_8055170
+ bl get_mapdata_header
str r0, [r4]
pop {r4,r5}
pop {r0}
@@ -924,10 +924,10 @@ sub_80552BC: @ 80552BC
.align 2, 0
_080552F4: .4byte gUnknown_2036DFC
_080552F8: .4byte gUnknown_3005008
- thumb_func_end sub_80552BC
+ thumb_func_end set_current_map_header_from_sav1
- thumb_func_start sub_80552FC
-sub_80552FC: @ 80552FC
+ thumb_func_start update_camera_pos_from_warpid
+update_camera_pos_from_warpid: @ 80552FC
push {r4,r5,lr}
ldr r0, _0805532C @ =gUnknown_3005008
ldr r2, [r0]
@@ -991,20 +991,20 @@ _0805536C:
bx r0
.align 2, 0
_08055374: .4byte gUnknown_2036DFC
- thumb_func_end sub_80552FC
+ thumb_func_end update_camera_pos_from_warpid
- thumb_func_start sub_8055378
-sub_8055378: @ 8055378
+ thumb_func_start warp_in
+warp_in: @ 8055378
push {lr}
- bl sub_8055198
- bl sub_8055274
- bl sub_80552FC
+ bl warp_shift
+ bl set_current_map_header_from_sav1_save_old_name
+ bl update_camera_pos_from_warpid
pop {r0}
bx r0
- thumb_func_end sub_8055378
+ thumb_func_end warp_in
- thumb_func_start sub_805538C
-sub_805538C: @ 805538C
+ thumb_func_start Overworld_SetWarpDestination
+Overworld_SetWarpDestination: @ 805538C
push {r4-r6,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -1027,17 +1027,17 @@ sub_805538C: @ 805538C
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_080553C4: .4byte gUnknown_2031DBC
- thumb_func_end sub_805538C
+ thumb_func_end Overworld_SetWarpDestination
- thumb_func_start sub_80553C8
-sub_80553C8: @ 80553C8
+ thumb_func_start warp1_set_2
+warp1_set_2: @ 80553C8
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -1049,14 +1049,14 @@ sub_80553C8: @ 80553C8
movs r3, 0x1
negs r3, r3
str r3, [sp]
- bl sub_805538C
+ bl Overworld_SetWarpDestination
add sp, 0x4
pop {r0}
bx r0
- thumb_func_end sub_80553C8
+ thumb_func_end warp1_set_2
- thumb_func_start sub_80553E8
-sub_80553E8: @ 80553E8
+ thumb_func_start saved_warp2_set
+saved_warp2_set: @ 80553E8
push {r4,r5,lr}
sub sp, 0x8
ldr r0, _08055418 @ =gUnknown_3005008
@@ -1075,17 +1075,17 @@ sub_80553E8: @ 80553E8
movs r4, 0x2
ldrsb r4, [r5, r4]
str r4, [sp, 0x4]
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08055418: .4byte gUnknown_3005008
- thumb_func_end sub_80553E8
+ thumb_func_end saved_warp2_set
- thumb_func_start sub_805541C
-sub_805541C: @ 805541C
+ thumb_func_start saved_warp2_set_2
+saved_warp2_set_2: @ 805541C
push {r4,r5,lr}
sub sp, 0x8
ldr r4, [sp, 0x14]
@@ -1105,17 +1105,17 @@ sub_805541C: @ 805541C
lsls r5, 24
asrs r5, 24
str r5, [sp, 0x4]
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08055450: .4byte gUnknown_3005008
- thumb_func_end sub_805541C
+ thumb_func_end saved_warp2_set_2
- thumb_func_start sub_8055454
-sub_8055454: @ 8055454
+ thumb_func_start copy_saved_warp2_bank_and_enter_x_to_warp1
+copy_saved_warp2_bank_and_enter_x_to_warp1: @ 8055454
ldr r2, _08055464 @ =gUnknown_2031DBC
ldr r0, _08055468 @ =gUnknown_3005008
ldr r0, [r0]
@@ -1127,7 +1127,7 @@ sub_8055454: @ 8055454
.align 2, 0
_08055464: .4byte gUnknown_2031DBC
_08055468: .4byte gUnknown_3005008
- thumb_func_end sub_8055454
+ thumb_func_end copy_saved_warp2_bank_and_enter_x_to_warp1
thumb_func_start sub_805546C
sub_805546C: @ 805546C
@@ -1151,7 +1151,7 @@ sub_805546C: @ 805546C
lsls r4, 24
asrs r4, 24
str r4, [sp]
- bl sub_805538C
+ bl Overworld_SetWarpDestination
_0805549A:
add sp, 0x4
pop {r4}
@@ -1159,8 +1159,8 @@ _0805549A:
bx r0
thumb_func_end sub_805546C
- thumb_func_start sub_80554A4
-sub_80554A4: @ 80554A4
+ thumb_func_start copy_saved_warp3_bank_and_enter_x_to_warp1
+copy_saved_warp3_bank_and_enter_x_to_warp1: @ 80554A4
ldr r2, _080554B4 @ =gUnknown_2031DBC
ldr r0, _080554B8 @ =gUnknown_3005008
ldr r0, [r0]
@@ -1172,7 +1172,7 @@ sub_80554A4: @ 80554A4
.align 2, 0
_080554B4: .4byte gUnknown_2031DBC
_080554B8: .4byte gUnknown_3005008
- thumb_func_end sub_80554A4
+ thumb_func_end copy_saved_warp3_bank_and_enter_x_to_warp1
thumb_func_start sub_80554BC
sub_80554BC: @ 80554BC
@@ -1210,7 +1210,7 @@ sub_80554CC: @ 80554CC
movs r4, 0x4
ldrsb r4, [r5, r4]
str r4, [sp, 0x4]
- bl sub_80551DC
+ bl warp_set
_08055500:
add sp, 0x8
pop {r4,r5}
@@ -1228,7 +1228,7 @@ sub_805550C: @ 805550C
lsrs r6, r0, 16
lsls r1, 16
lsrs r7, r1, 16
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1238,16 +1238,16 @@ sub_805550C: @ 805550C
ldrb r1, [r1, 0x1]
lsls r1, 24
asrs r1, 24
- bl sub_8056158
+ bl get_map_light_level_by_bank_and_number
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
- bl sub_80561D8
+ bl is_light_level_1_2_3_5_or_6
lsls r0, 24
cmp r0, 0
beq _08055590
adds r0, r5, 0
- bl sub_80561D8
+ bl is_light_level_1_2_3_5_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1257,7 +1257,7 @@ sub_805550C: @ 805550C
ldrh r0, [r0, 0x4]
cmp r0, 0x1
beq _08055590
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -1318,7 +1318,7 @@ sub_80555A0: @ 80555A0
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1366,7 +1366,7 @@ sub_80555F8: @ 80555F8
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1375,8 +1375,8 @@ sub_80555F8: @ 80555F8
_08055630: .4byte gUnknown_2031DC4
thumb_func_end sub_80555F8
- thumb_func_start sub_8055634
-sub_8055634: @ 8055634
+ thumb_func_start warp1_set_to_warp2
+warp1_set_to_warp2: @ 8055634
ldr r2, _08055644 @ =gUnknown_2031DBC
ldr r0, _08055648 @ =gUnknown_2031DC4
ldr r1, [r0, 0x4]
@@ -1387,7 +1387,7 @@ sub_8055634: @ 8055634
.align 2, 0
_08055644: .4byte gUnknown_2031DBC
_08055648: .4byte gUnknown_2031DC4
- thumb_func_end sub_8055634
+ thumb_func_end warp1_set_to_warp2
thumb_func_start sub_805564C
sub_805564C: @ 805564C
@@ -1413,7 +1413,7 @@ sub_805564C: @ 805564C
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1432,7 +1432,7 @@ sub_8055688: @ 8055688
lsrs r6, r1, 16
ldr r4, _080556B0 @ =gUnknown_2031DCC
adds r0, r4, 0
- bl sub_80551FC
+ bl warp_data_is_not_neg_1
cmp r0, 0x1
bne _080556BC
ldr r2, _080556B4 @ =gUnknown_2031DBC
@@ -1458,7 +1458,7 @@ _080556BC:
lsls r4, r6, 24
asrs r4, 24
str r4, [sp]
- bl sub_805538C
+ bl Overworld_SetWarpDestination
_080556D6:
add sp, 0x4
pop {r4-r6}
@@ -1466,8 +1466,8 @@ _080556D6:
bx r0
thumb_func_end sub_8055688
- thumb_func_start sub_80556E0
-sub_80556E0: @ 80556E0
+ thumb_func_start warp1_set_to_sav1w
+warp1_set_to_sav1w: @ 80556E0
ldr r2, _080556F0 @ =gUnknown_2031DBC
ldr r0, _080556F4 @ =gUnknown_3005008
ldr r0, [r0]
@@ -1479,7 +1479,7 @@ sub_80556E0: @ 80556E0
.align 2, 0
_080556F0: .4byte gUnknown_2031DBC
_080556F4: .4byte gUnknown_3005008
- thumb_func_end sub_80556E0
+ thumb_func_end warp1_set_to_sav1w
thumb_func_start sub_80556F8
sub_80556F8: @ 80556F8
@@ -1507,7 +1507,7 @@ sub_80556F8: @ 80556F8
adds r1, r4, 0
adds r2, r5, 0
adds r3, r6, 0
- bl sub_80551DC
+ bl warp_set
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -1541,7 +1541,7 @@ sub_8055738: @ 8055738
movs r4, 0x4
ldrsb r4, [r5, r4]
str r4, [sp, 0x4]
- bl sub_80551DC
+ bl warp_set
_0805576C:
add sp, 0x8
pop {r4,r5}
@@ -1627,12 +1627,12 @@ sub_80557C4: @ 80557C4
lsls r4, r5, 24
asrs r4, 24
str r4, [sp]
- bl sub_805538C
+ bl Overworld_SetWarpDestination
b _08055818
_080557FC:
- bl sub_8069C68
+ bl mapheader_run_script_with_tag_x6
ldr r0, _08055810 @ =gUnknown_2031DC4
- bl sub_80551FC
+ bl warp_data_is_not_neg_1
cmp r0, 0
beq _08055814
movs r0, 0
@@ -1640,7 +1640,7 @@ _080557FC:
.align 2, 0
_08055810: .4byte gUnknown_2031DC4
_08055814:
- bl sub_8055634
+ bl warp1_set_to_warp2
_08055818:
movs r0, 0x1
_0805581A:
@@ -1700,12 +1700,12 @@ sub_8055864: @ 8055864
negs r3, r3
str r3, [sp]
adds r2, r3, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_8055E94
- bl sub_8055198
- bl sub_8055274
+ bl warp_shift
+ bl set_current_map_header_from_sav1_save_old_name
bl sub_8054F68
- bl sub_810B7FC
+ bl TrySetMapSaveWarpStatus
bl sub_806E110
bl nullsub_74
bl sub_806D7E8
@@ -1716,12 +1716,12 @@ sub_8055864: @ 8055864
bl sub_805610C
bl sub_8055CB8
bl sub_8055E84
- bl sub_8069C44
+ bl mapheader_run_script_with_tag_x3
bl sub_815D8F8
bl sub_80589D4
ldr r4, _0805591C @ =gUnknown_2036DFC
ldr r0, [r4]
- bl sub_8059A7C
+ bl copy_map_tileset2_to_vram_2
ldr r0, [r4]
bl sub_8059AA0
movs r4, 0x7
@@ -1738,7 +1738,7 @@ _080558D4:
bl sub_8110920
bl sub_807B1A4
bl sub_806E918
- bl sub_8069C50
+ bl mapheader_run_script_with_tag_x5
bl sub_80561B4
ldr r1, _0805591C @ =gUnknown_2036DFC
lsls r0, 24
@@ -1760,15 +1760,15 @@ _0805591C: .4byte gUnknown_2036DFC
thumb_func_start sub_8055920
sub_8055920: @ 8055920
push {r4,lr}
- bl sub_8055274
+ bl set_current_map_header_from_sav1_save_old_name
bl sub_8054F68
ldr r0, _0805599C @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
- bl sub_80561D8
+ bl is_light_level_1_2_3_5_or_6
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_810B7FC
+ bl TrySetMapSaveWarpStatus
bl sub_806E110
bl nullsub_74
bl sub_806D7E8
@@ -1793,7 +1793,7 @@ sub_8055920: @ 8055920
_08055974:
bl sub_8055CB8
bl sub_8055E84
- bl sub_8069C44
+ bl mapheader_run_script_with_tag_x3
bl sub_815D8F8
bl sub_8141DAC
bl sub_8141DD4
@@ -1811,18 +1811,18 @@ _080559A4: .4byte 0x00000806
thumb_func_start sub_80559A8
sub_80559A8: @ 80559A8
push {lr}
- bl sub_8055274
+ bl set_current_map_header_from_sav1_save_old_name
bl sub_8054F68
ldr r0, _080559E0 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
- bl sub_80561D8
- bl sub_810B7FC
+ bl is_light_level_1_2_3_5_or_6
+ bl TrySetMapSaveWarpStatus
bl sub_807B140
bl sub_805610C
bl sub_8055CB8
bl sub_8110920
bl sub_8111708
- bl sub_80552BC
+ bl set_current_map_header_from_sav1
bl sub_80589D4
pop {r0}
bx r0
@@ -1858,11 +1858,11 @@ _08055A04: .4byte gUnknown_2031DD4
thumb_func_start sub_8055A08
sub_8055A08: @ 8055A08
push {r4,lr}
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
ldr r4, _08055A24 @ =gUnknown_2031DD4
strb r0, [r4, 0x1]
movs r0, 0x2
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055A28
@@ -1872,7 +1872,7 @@ sub_8055A08: @ 8055A08
_08055A24: .4byte gUnknown_2031DD4
_08055A28:
movs r0, 0x4
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055A38
@@ -1880,7 +1880,7 @@ _08055A28:
b _08055A5A
_08055A38:
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055A48
@@ -1888,7 +1888,7 @@ _08055A38:
b _08055A5A
_08055A48:
movs r0, 0x10
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055A58
@@ -1911,7 +1911,7 @@ _08055A68: .4byte gUnknown_2031DD4
thumb_func_start sub_8055A6C
sub_8055A6C: @ 8055A6C
push {r4-r7,lr}
- bl sub_8056188
+ bl sav1_map_get_light_level
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -2301,7 +2301,7 @@ sub_8055D40: @ 8055D40
ldr r1, _08055D54 @ =gUnknown_3005008
ldr r1, [r1]
strh r0, [r1, 0x32]
- bl sub_8055170
+ bl get_mapdata_header
ldr r1, _08055D58 @ =gUnknown_2036DFC
str r0, [r1]
pop {r0}
@@ -2336,7 +2336,7 @@ sub_8055D6C: @ 8055D6C
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrh r0, [r0, 0x10]
pop {r1}
bx r1
@@ -2373,7 +2373,7 @@ _08055DB4: .4byte gUnknown_2031DBC
thumb_func_start sub_8055DB8
sub_8055DB8: @ 8055DB8
push {lr}
- bl sub_8071A44
+ bl ResetMapMusic
pop {r0}
bx r0
thumb_func_end sub_8055DB8
@@ -2386,7 +2386,7 @@ sub_8055DC4: @ 8055DC4
ldrb r0, [r0]
cmp r0, 0x1
bne _08055DDC
- bl sub_8071A94
+ bl StopMapMusic
b _08055E6C
.align 2, 0
_08055DD8: .4byte gUnknown_2031DD8
@@ -2403,7 +2403,7 @@ _08055DDC:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r1, 0
ldrsh r0, [r4, r1]
subs r0, 0x7
@@ -2415,7 +2415,7 @@ _08055DDC:
cmp r1, r0
bne _08055E24
movs r0, 0x4
- bl sub_8071DA4
+ bl FadeInBGM
b _08055E6C
.align 2, 0
_08055E14: .4byte gUnknown_3005008
@@ -2437,7 +2437,7 @@ _08055E24:
_08055E3C: .4byte gUnknown_3005008
_08055E40:
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055E5A
@@ -2448,13 +2448,13 @@ _08055E40:
beq _08055E5A
adds r4, r5, 0
_08055E5A:
- bl sub_8071A68
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
beq _08055E6C
adds r0, r4, 0
- bl sub_8071A74
+ bl PlayNewMapMusic
_08055E6C:
add sp, 0x4
pop {r4,r5}
@@ -2492,7 +2492,7 @@ sub_8055E94: @ 8055E94
ldrb r0, [r0]
cmp r0, 0x1
bne _08055EA8
- bl sub_8071A94
+ bl StopMapMusic
b _08055F14
.align 2, 0
_08055EA4: .4byte gUnknown_2031DD8
@@ -2508,14 +2508,14 @@ _08055EA8:
bl sub_8055DA4
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8071A68
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r6, r0, 16
ldr r5, _08055F08 @ =0x00000131
cmp r6, r5
beq _08055F14
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055EE8
@@ -2528,14 +2528,14 @@ _08055EE8:
cmp r4, r6
beq _08055F14
movs r0, 0x6
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08055F0C
adds r0, r4, 0
movs r1, 0x4
movs r2, 0x4
- bl sub_8071B20
+ bl FadeOutAndFadeInNewMapMusic
b _08055F14
.align 2, 0
_08055F04: .4byte 0x00004001
@@ -2543,7 +2543,7 @@ _08055F08: .4byte 0x00000131
_08055F0C:
adds r0, r4, 0
movs r1, 0x8
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
_08055F14:
pop {r4-r6}
pop {r0}
@@ -2553,7 +2553,7 @@ _08055F14:
thumb_func_start sub_8055F1C
sub_8055F1C: @ 8055F1C
push {r4,lr}
- bl sub_8071A68
+ bl GetCurrentMapMusic
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -2566,7 +2566,7 @@ sub_8055F1C: @ 8055F1C
lsls r0, 16
lsrs r0, 16
movs r1, 0x8
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
_08055F42:
pop {r4}
pop {r0}
@@ -2578,14 +2578,14 @@ sub_8055F48: @ 8055F48
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8071A68
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r0, r4
beq _08055F62
adds r0, r4, 0
movs r1, 0x8
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
_08055F62:
pop {r4}
pop {r0}
@@ -2595,9 +2595,9 @@ _08055F62:
thumb_func_start sub_8055F68
sub_8055F68: @ 8055F68
push {lr}
- bl sub_8055250
+ bl warp1_get_mapheader
ldrb r0, [r0, 0x17]
- bl sub_805621C
+ bl is_light_level_8_or_9
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2623,7 +2623,7 @@ sub_8055F88: @ 8055F88
lsrs r0, 24
cmp r0, 0x1
beq _08055FB8
- bl sub_8071A68
+ bl GetCurrentMapMusic
lsls r0, 16
lsrs r0, 16
cmp r4, r0
@@ -2631,7 +2631,7 @@ sub_8055F88: @ 8055F88
bl sub_8055F68
lsls r0, 24
lsrs r0, 24
- bl sub_8071AB4
+ bl FadeOutMapMusic
_08055FB8:
pop {r4}
pop {r0}
@@ -2643,7 +2643,7 @@ _08055FC0: .4byte 0x00004001
thumb_func_start sub_8055FC4
sub_8055FC4: @ 8055FC4
push {lr}
- bl sub_8071BA0
+ bl IsNotWaitingForBGMStop
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2654,7 +2654,7 @@ sub_8055FC4: @ 8055FC4
sub_8055FD4: @ 8055FD4
push {lr}
movs r0, 0x4
- bl sub_8071AB4
+ bl FadeOutMapMusic
pop {r0}
bx r0
thumb_func_end sub_8055FD4
@@ -2667,7 +2667,7 @@ sub_8055FE0: @ 8055FE0
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
ldr r0, _0805604C @ =gUnknown_2031DDC
ldrb r0, [r0]
cmp r0, 0x1
@@ -2685,7 +2685,7 @@ sub_8055FE0: @ 8055FE0
cmp r0, 0
beq _0805606A
_08056014:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x58
@@ -2693,7 +2693,7 @@ _08056014:
adds r0, 0xD4
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x1E
@@ -2705,7 +2705,7 @@ _08056014:
ldrb r0, [r0]
cmp r0, 0x1
bne _08056054
- bl sub_8071A94
+ bl StopMapMusic
b _0805606A
.align 2, 0
_0805604C: .4byte gUnknown_2031DDC
@@ -2720,7 +2720,7 @@ _08056054:
lsls r2, 24
asrs r2, 24
movs r3, 0x1
- bl sub_8071E3C
+ bl PlayCry2
_0805606A:
add sp, 0x4
pop {r4}
@@ -2766,7 +2766,7 @@ _080560B8:
movs r0, 0x1
b _08056104
_080560BC:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x96
@@ -2779,7 +2779,7 @@ _080560BC:
movs r0, 0x3
b _08056104
_080560D8:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r4, 0x96
@@ -2854,8 +2854,8 @@ _08056152:
bx r1
thumb_func_end sub_8056124
- thumb_func_start sub_8056158
-sub_8056158: @ 8056158
+ thumb_func_start get_map_light_level_by_bank_and_number
+get_map_light_level_by_bank_and_number: @ 8056158
push {lr}
lsls r0, 24
asrs r0, 8
@@ -2863,54 +2863,54 @@ sub_8056158: @ 8056158
lsls r1, 24
asrs r1, 8
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x17]
pop {r1}
bx r1
- thumb_func_end sub_8056158
+ thumb_func_end get_map_light_level_by_bank_and_number
- thumb_func_start sub_8056170
-sub_8056170: @ 8056170
+ thumb_func_start get_map_light_level_from_warp
+get_map_light_level_from_warp: @ 8056170
push {lr}
movs r2, 0
ldrsb r2, [r0, r2]
movs r1, 0x1
ldrsb r1, [r0, r1]
adds r0, r2, 0
- bl sub_8056158
+ bl get_map_light_level_by_bank_and_number
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8056170
+ thumb_func_end get_map_light_level_from_warp
- thumb_func_start sub_8056188
-sub_8056188: @ 8056188
+ thumb_func_start sav1_map_get_light_level
+sav1_map_get_light_level: @ 8056188
push {lr}
ldr r0, _0805619C @ =gUnknown_3005008
ldr r0, [r0]
adds r0, 0x4
- bl sub_8056170
+ bl get_map_light_level_from_warp
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0805619C: .4byte gUnknown_3005008
- thumb_func_end sub_8056188
+ thumb_func_end sav1_map_get_light_level
- thumb_func_start sub_80561A0
-sub_80561A0: @ 80561A0
+ thumb_func_start get_map_light_from_warp0
+get_map_light_from_warp0: @ 80561A0
push {lr}
ldr r0, _080561B0 @ =gUnknown_2031DB4
- bl sub_8056170
+ bl get_map_light_level_from_warp
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080561B0: .4byte gUnknown_2031DB4
- thumb_func_end sub_80561A0
+ thumb_func_end get_map_light_from_warp0
thumb_func_start sub_80561B4
sub_80561B4: @ 80561B4
@@ -2925,7 +2925,7 @@ sub_80561B4: @ 80561B4
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -2933,8 +2933,8 @@ sub_80561B4: @ 80561B4
_080561D4: .4byte gUnknown_2031DB4
thumb_func_end sub_80561B4
- thumb_func_start sub_80561D8
-sub_80561D8: @ 80561D8
+ thumb_func_start is_light_level_1_2_3_5_or_6
+is_light_level_1_2_3_5_or_6: @ 80561D8
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2956,10 +2956,10 @@ _080561F6:
_080561F8:
pop {r1}
bx r1
- thumb_func_end sub_80561D8
+ thumb_func_end is_light_level_1_2_3_5_or_6
- thumb_func_start sub_80561FC
-sub_80561FC: @ 80561FC
+ thumb_func_start is_light_level_1_2_3_or_6
+is_light_level_1_2_3_or_6: @ 80561FC
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -2979,10 +2979,10 @@ _08056216:
_08056218:
pop {r1}
bx r1
- thumb_func_end sub_80561FC
+ thumb_func_end is_light_level_1_2_3_or_6
- thumb_func_start sub_805621C
-sub_805621C: @ 805621C
+ thumb_func_start is_light_level_8_or_9
+is_light_level_8_or_9: @ 805621C
push {lr}
lsls r0, 24
movs r1, 0xF8
@@ -2998,10 +2998,10 @@ _08056230:
_08056232:
pop {r1}
bx r1
- thumb_func_end sub_805621C
+ thumb_func_end is_light_level_8_or_9
- thumb_func_start sub_8056238
-sub_8056238: @ 8056238
+ thumb_func_start sav1_saved_warp2_map_get_name
+sav1_saved_warp2_map_get_name: @ 8056238
push {lr}
ldr r0, _0805625C @ =gUnknown_3005008
ldr r1, [r0]
@@ -3014,16 +3014,16 @@ sub_8056238: @ 8056238
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
.align 2, 0
_0805625C: .4byte gUnknown_3005008
- thumb_func_end sub_8056238
+ thumb_func_end sav1_saved_warp2_map_get_name
- thumb_func_start sub_8056260
-sub_8056260: @ 8056260
+ thumb_func_start sav1_map_get_name
+sav1_map_get_name: @ 8056260
push {lr}
ldr r0, _08056284 @ =gUnknown_3005008
ldr r1, [r0]
@@ -3036,16 +3036,16 @@ sub_8056260: @ 8056260
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
.align 2, 0
_08056284: .4byte gUnknown_3005008
- thumb_func_end sub_8056260
+ thumb_func_end sav1_map_get_name
- thumb_func_start sub_8056288
-sub_8056288: @ 8056288
+ thumb_func_start sav1_map_get_battletype
+sav1_map_get_battletype: @ 8056288
push {lr}
ldr r0, _080562AC @ =gUnknown_3005008
ldr r1, [r0]
@@ -3058,13 +3058,13 @@ sub_8056288: @ 8056288
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x1B]
pop {r1}
bx r1
.align 2, 0
_080562AC: .4byte gUnknown_3005008
- thumb_func_end sub_8056288
+ thumb_func_end sav1_map_get_battletype
thumb_func_start sub_80562B0
sub_80562B0: @ 80562B0
@@ -3082,41 +3082,41 @@ sub_80562B0: @ 80562B0
movs r0, 0x1
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x3
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
ldr r0, _08056348 @ =gUnknown_3005018
mov r8, r0
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
ldr r6, _0805634C @ =gUnknown_3005014
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6]
ldr r5, _08056350 @ =gUnknown_300501C
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
mov r0, r8
ldr r1, [r0]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r6]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r5]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_80F6C6C
bl sub_80F6C98
bl sub_8069348
@@ -3146,41 +3146,41 @@ sub_8056354: @ 8056354
movs r0, 0x1
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x3
movs r1, 0x5
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
ldr r0, _080563E4 @ =gUnknown_3005018
mov r8, r0
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
ldr r6, _080563E8 @ =gUnknown_3005014
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r6]
ldr r5, _080563EC @ =gUnknown_300501C
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
mov r0, r8
ldr r1, [r0]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r6]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r5]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_80F6C6C
bl sub_80F6C98
bl sub_8069348
@@ -3202,13 +3202,13 @@ sub_80563F0: @ 80563F0
bl sub_80F6C8C
ldr r0, _08056414 @ =gUnknown_300501C
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _08056418 @ =gUnknown_3005014
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _0805641C @ =gUnknown_3005018
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
pop {r0}
bx r0
.align 2, 0
@@ -3230,14 +3230,14 @@ sub_805642C: @ 805642C
push {lr}
ldr r0, _0805643C @ =gUnknown_30030F0
ldr r1, [r0]
- ldr r0, _08056440 @ =sub_8057884
+ ldr r0, _08056440 @ =c1_link_related
cmp r1, r0
beq _08056444
movs r0, 0
b _08056446
.align 2, 0
_0805643C: .4byte gUnknown_30030F0
-_08056440: .4byte sub_8057884
+_08056440: .4byte c1_link_related
_08056444:
movs r0, 0x1
_08056446:
@@ -3266,7 +3266,7 @@ sub_805644C: @ 805644C
bl sub_806C8BC
mov r0, sp
bl sub_806CD30
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _080564BA
@@ -3281,7 +3281,7 @@ sub_805644C: @ 805644C
ldr r0, _080564AC @ =gUnknown_3005078
bl sub_81127F8
_0805649E:
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_80982EC
b _080564BA
.align 2, 0
@@ -3314,7 +3314,7 @@ sub_80564C8: @ 80564C8
str r0, [sp]
mov r0, sp
bl sub_806CD30
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
cmp r0, 0
bne _08056512
@@ -3322,7 +3322,7 @@ sub_80564C8: @ 80564C8
bl sub_806CAC8
cmp r0, 0x1
bne _0805650C
- bl sub_8069940
+ bl ScriptContext2_Enable
bl sub_80982EC
b _08056522
.align 2, 0
@@ -3384,16 +3384,16 @@ _08056570:
thumb_func_start sub_8056578
sub_8056578: @ 8056578
push {lr}
- bl sub_8069AA8
- bl sub_8077578
- bl sub_8006B5C
- bl sub_805ABB0
+ bl ScriptContext2_RunScript
+ bl RunTasks
+ bl AnimateSprites
+ bl CameraUpdate
bl sub_8115798
- bl sub_805AE28
- bl sub_8006BA8
- bl sub_80704D0
+ bl UpdateCameraPanning
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
bl sub_806FFBC
- bl sub_80F67B8
+ bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
thumb_func_end sub_8056578
@@ -3416,7 +3416,7 @@ sub_80565B4: @ 80565B4
cmp r4, 0
beq _080565C8
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
_080565C8:
bl sub_8056578
cmp r4, 0
@@ -3491,13 +3491,13 @@ _08056640: .4byte gUnknown_3005020
sub_8056644: @ 8056644
push {lr}
bl sub_80569BC
- bl sub_8071A94
+ bl StopMapMusic
bl sub_8056420
bl sub_8054A60
bl sub_80559E4
- bl sub_8054838
- bl sub_8069A80
- bl sub_806994C
+ bl PlayTimeCounter_Start
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
ldr r1, _0805668C @ =gUnknown_3005020
ldr r0, _08056690 @ =sub_807DF7C
str r0, [r1]
@@ -3510,7 +3510,7 @@ sub_8056644: @ 8056644
ldr r0, _0805669C @ =sub_8056534
bl sub_80565E0
ldr r0, _080566A0 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -3538,13 +3538,13 @@ sub_80566A4: @ 80566A4
cmp r0, 0x77
bls _08056702
bl sub_80569BC
- bl sub_8071A94
+ bl StopMapMusic
bl sub_8056420
bl sub_8054BC8
movs r0, 0x2
bl sub_80559F8
- bl sub_8069A80
- bl sub_806994C
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
ldr r1, _0805670C @ =gUnknown_3005020
ldr r0, _08056710 @ =sub_807F5F0
str r0, [r1]
@@ -3558,7 +3558,7 @@ sub_80566A4: @ 80566A4
ldr r0, _08056714 @ =sub_8056534
bl sub_80565E0
ldr r0, _08056718 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
_08056702:
add sp, 0x4
pop {r0}
@@ -3575,12 +3575,12 @@ _08056718: .4byte sub_80565B4
sub_805671C: @ 805671C
push {lr}
bl sub_80569BC
- bl sub_8069A80
- bl sub_806994C
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
ldr r0, _08056740 @ =sub_80C9BFC
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _08056744 @ =gUnknown_30030F0
ldr r0, _08056748 @ =sub_805674C
str r0, [r1, 0x8]
@@ -3611,7 +3611,7 @@ _0805676C:
ldr r0, _08056780 @ =sub_8056534
bl sub_80565E0
ldr r0, _08056784 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
_0805677C:
pop {r0}
bx r0
@@ -3627,62 +3627,62 @@ sub_8056788: @ 8056788
ldr r0, _080567A0 @ =gUnknown_3005020
ldr r1, _080567A4 @ =sub_807DE58
str r1, [r0]
- ldr r0, _080567A8 @ =sub_80567AC
- bl sub_8000544
+ ldr r0, _080567A8 @ =c2_80567AC
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080567A0: .4byte gUnknown_3005020
_080567A4: .4byte sub_807DE58
-_080567A8: .4byte sub_80567AC
+_080567A8: .4byte c2_80567AC
thumb_func_end sub_8056788
- thumb_func_start sub_80567AC
-sub_80567AC: @ 80567AC
+ thumb_func_start c2_80567AC
+c2_80567AC: @ 80567AC
push {lr}
ldr r0, _080567D0 @ =gUnknown_3003528
bl sub_8056A5C
cmp r0, 0
beq _080567CC
bl sub_8056A04
- ldr r0, _080567D4 @ =sub_8057884
+ ldr r0, _080567D4 @ =c1_link_related
bl sub_80565E0
bl sub_80578D8
ldr r0, _080567D8 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
_080567CC:
pop {r0}
bx r0
.align 2, 0
_080567D0: .4byte gUnknown_3003528
-_080567D4: .4byte sub_8057884
+_080567D4: .4byte c1_link_related
_080567D8: .4byte sub_80565B4
- thumb_func_end sub_80567AC
+ thumb_func_end c2_80567AC
- thumb_func_start sub_80567DC
-sub_80567DC: @ 80567DC
+ thumb_func_start c2_exit_to_overworld_2_switch
+c2_exit_to_overworld_2_switch: @ 80567DC
push {lr}
bl sub_805642C
cmp r0, 0x1
bne _080567F4
- ldr r0, _080567F0 @ =sub_805682C
- bl sub_8000544
+ ldr r0, _080567F0 @ =c2_exit_to_overworld_2_link
+ bl SetMainCallback2
b _080567FE
.align 2, 0
-_080567F0: .4byte sub_805682C
+_080567F0: .4byte c2_exit_to_overworld_2_link
_080567F4:
bl sub_80569BC
- ldr r0, _08056804 @ =sub_8056808
- bl sub_8000544
+ ldr r0, _08056804 @ =c2_exit_to_overworld_2_local
+ bl SetMainCallback2
_080567FE:
pop {r0}
bx r0
.align 2, 0
-_08056804: .4byte sub_8056808
- thumb_func_end sub_80567DC
+_08056804: .4byte c2_exit_to_overworld_2_local
+ thumb_func_end c2_exit_to_overworld_2_switch
- thumb_func_start sub_8056808
-sub_8056808: @ 8056808
+ thumb_func_start c2_exit_to_overworld_2_local
+c2_exit_to_overworld_2_local: @ 8056808
push {lr}
ldr r0, _08056824 @ =gUnknown_3003528
bl sub_8056CD8
@@ -3690,17 +3690,17 @@ sub_8056808: @ 8056808
beq _0805681E
bl sub_8056A04
ldr r0, _08056828 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
_0805681E:
pop {r0}
bx r0
.align 2, 0
_08056824: .4byte gUnknown_3003528
_08056828: .4byte sub_80565B4
- thumb_func_end sub_8056808
+ thumb_func_end c2_exit_to_overworld_2_local
- thumb_func_start sub_805682C
-sub_805682C: @ 805682C
+ thumb_func_start c2_exit_to_overworld_2_link
+c2_exit_to_overworld_2_link: @ 805682C
push {lr}
bl sub_8058244
cmp r0, 0
@@ -3710,21 +3710,21 @@ sub_805682C: @ 805682C
cmp r0, 0
beq _08056846
ldr r0, _08056850 @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
_08056846:
pop {r0}
bx r0
.align 2, 0
_0805684C: .4byte gUnknown_3003528
_08056850: .4byte sub_80565B4
- thumb_func_end sub_805682C
+ thumb_func_end c2_exit_to_overworld_2_link
- thumb_func_start sub_8056854
-sub_8056854: @ 8056854
+ thumb_func_start c2_8056854
+c2_8056854: @ 8056854
push {lr}
bl sub_80569BC
- bl sub_8071A94
- ldr r0, _08056878 @ =sub_8057884
+ bl StopMapMusic
+ ldr r0, _08056878 @ =c1_link_related
bl sub_80565E0
bl sub_80578D8
ldr r0, _0805687C @ =gUnknown_3003F3C
@@ -3735,7 +3735,7 @@ sub_8056854: @ 8056854
ldr r0, _08056884 @ =sub_807DE58
b _0805688C
.align 2, 0
-_08056878: .4byte sub_8057884
+_08056878: .4byte c1_link_related
_0805687C: .4byte gUnknown_3003F3C
_08056880: .4byte gUnknown_3005020
_08056884: .4byte sub_807DE58
@@ -3744,15 +3744,15 @@ _08056888:
ldr r0, _080568A4 @ =sub_807DDD0
_0805688C:
str r0, [r1]
- bl sub_8069A80
- bl sub_806994C
- bl sub_80567DC
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
+ bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
.align 2, 0
_080568A0: .4byte gUnknown_3005020
_080568A4: .4byte sub_807DDD0
- thumb_func_end sub_8056854
+ thumb_func_end c2_8056854
thumb_func_start sub_80568A8
sub_80568A8: @ 80568A8
@@ -3761,7 +3761,7 @@ sub_80568A8: @ 80568A8
ldr r1, _080568BC @ =gUnknown_3005024
ldr r0, _080568C0 @ =sub_807E3BC
str r0, [r1]
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
.align 2, 0
@@ -3776,7 +3776,7 @@ sub_80568C4: @ 80568C4
ldr r1, _080568D8 @ =gUnknown_3005020
ldr r0, _080568DC @ =sub_807DD44
str r0, [r1]
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
.align 2, 0
@@ -3784,20 +3784,20 @@ _080568D8: .4byte gUnknown_3005020
_080568DC: .4byte sub_807DD44
thumb_func_end sub_80568C4
- thumb_func_start sub_80568E0
-sub_80568E0: @ 80568E0
+ thumb_func_start c2_exit_to_overworld_1_continue_scripts_restart_music
+c2_exit_to_overworld_1_continue_scripts_restart_music: @ 80568E0
push {lr}
bl sub_80569BC
ldr r1, _080568F4 @ =gUnknown_3005020
ldr r0, _080568F8 @ =sub_807DD24
str r0, [r1]
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
.align 2, 0
_080568F4: .4byte gUnknown_3005020
_080568F8: .4byte sub_807DD24
- thumb_func_end sub_80568E0
+ thumb_func_end c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_start sub_80568FC
sub_80568FC: @ 80568FC
@@ -3806,7 +3806,7 @@ sub_80568FC: @ 80568FC
ldr r1, _08056910 @ =gUnknown_3005020
ldr r0, _08056914 @ =sub_807DF7C
str r0, [r1]
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
pop {r0}
bx r0
.align 2, 0
@@ -3837,30 +3837,30 @@ _08056934: .4byte gUnknown_2036DFC
sub_8056938: @ 8056938
push {lr}
bl sub_80569BC
- bl sub_8071A94
+ bl StopMapMusic
bl sub_8056420
- bl sub_80552BC
+ bl set_current_map_header_from_sav1
bl sub_80550A8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
bl sub_8054E40
bl sub_80589E8
- bl sub_8054838
- bl sub_8069A80
- bl sub_806994C
+ bl PlayTimeCounter_Start
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
ldr r1, _08056990 @ =gUnknown_3005024
movs r0, 0
str r0, [r1]
ldr r1, _08056994 @ =gUnknown_2031DE0
movs r0, 0x1
strb r0, [r1]
- bl sub_804C188
+ bl sav2_x1_query_bit1
cmp r0, 0x1
bne _0805699C
- bl sub_804C198
- bl sub_80556E0
- bl sub_8055378
+ bl sav2_x9_clear_bit1
+ bl warp1_set_to_sav1w
+ bl warp_in
ldr r0, _08056998 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
b _080569AC
.align 2, 0
_08056990: .4byte gUnknown_3005024
@@ -3872,7 +3872,7 @@ _0805699C:
str r1, [r0]
ldr r0, _080569B8 @ =sub_8056534
bl sub_80565E0
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
_080569AC:
pop {r0}
bx r0
@@ -3897,7 +3897,7 @@ _080569CE:
cmp r0, 0
beq _080569E8
movs r0, 0xC5
- bl sub_8000B68
+ bl EnableInterrupts
movs r0, 0x2
bl sub_8000B94
b _080569F4
@@ -3907,12 +3907,12 @@ _080569E8:
movs r0, 0x2
bl sub_8000B94
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
_080569F4:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_80569BC
@@ -3921,7 +3921,7 @@ _080569F4:
sub_8056A04: @ 8056A04
push {lr}
ldr r0, _08056A10 @ =sub_8056A14
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -3931,12 +3931,12 @@ _08056A10: .4byte sub_8056A14
thumb_func_start sub_8056A14
sub_8056A14: @ 8056A14
push {lr}
- bl sub_8007320
- bl sub_8007610
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
bl sub_8087F54
- bl sub_805A5F4
- bl sub_8070474
- bl sub_806FF54
+ bl FieldUpdateBgTilemapScroll
+ bl TransferPlttBuffer
+ bl TransferTilesetAnimsBuffer
pop {r0}
bx r0
thumb_func_end sub_8056A14
@@ -3996,8 +3996,8 @@ _08056A78:
.4byte _08056B6A
_08056AB0:
bl sub_80562B0
- bl sub_8069A80
- bl sub_806994C
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
b _08056B62
_08056ABE:
movs r0, 0x1
@@ -4019,7 +4019,7 @@ _08056AE4:
bl sub_8056F1C
b _08056B62
_08056AEE:
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
b _08056B62
_08056AF4:
ldr r0, _08056B00 @ =gUnknown_2036DFC
@@ -4036,22 +4036,22 @@ _08056B04:
.align 2, 0
_08056B10: .4byte gUnknown_2036DFC
_08056B14:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08056B6E
ldr r0, _08056B2C @ =gUnknown_2036DFC
ldr r0, [r0]
- bl sub_8059AD8
+ bl apply_map_tileset1_tileset2_palette
b _08056B62
.align 2, 0
_08056B2C: .4byte gUnknown_2036DFC
_08056B30:
- bl sub_805A684
+ bl DrawWholeMapView
b _08056B62
_08056B36:
- bl sub_806FF9C
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08056B62
_08056B3C:
ldr r0, _08056B54 @ =gUnknown_3003F3C
@@ -4161,7 +4161,7 @@ _08056C20:
bl sub_8056F1C
b _08056CCA
_08056C2A:
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
b _08056CCA
_08056C30:
ldr r0, _08056C3C @ =gUnknown_2036DFC
@@ -4178,22 +4178,22 @@ _08056C40:
.align 2, 0
_08056C4C: .4byte gUnknown_2036DFC
_08056C50:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08056CD0
ldr r0, _08056C68 @ =gUnknown_2036DFC
ldr r0, [r0]
- bl sub_8059AD8
+ bl apply_map_tileset1_tileset2_palette
b _08056CCA
.align 2, 0
_08056C68: .4byte gUnknown_2036DFC
_08056C6C:
- bl sub_805A684
+ bl DrawWholeMapView
b _08056CCA
_08056C72:
- bl sub_806FF9C
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08056CCA
_08056C78:
bl sub_80561B4
@@ -4350,7 +4350,7 @@ _08056DC0:
bl sub_8056F1C
b _08056E3E
_08056DCA:
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
b _08056E3E
_08056DD0:
ldr r0, _08056DDC @ =gUnknown_2036DFC
@@ -4367,22 +4367,22 @@ _08056DE0:
.align 2, 0
_08056DEC: .4byte gUnknown_2036DFC
_08056DF0:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08056E54
ldr r0, _08056E08 @ =gUnknown_2036DFC
ldr r0, [r0]
- bl sub_8059AD8
+ bl apply_map_tileset1_tileset2_palette
b _08056E3E
.align 2, 0
_08056E08: .4byte gUnknown_2036DFC
_08056E0C:
- bl sub_805A684
+ bl DrawWholeMapView
b _08056E3E
_08056E12:
- bl sub_806FF9C
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
b _08056E3E
_08056E18:
ldr r0, _08056E30 @ =gUnknown_3003F3C
@@ -4450,8 +4450,8 @@ sub_8056E80: @ 8056E80
sub sp, 0x4
movs r0, 0
movs r1, 0
- bl sub_8000A38
- bl sub_8087E64
+ bl SetGpuReg
+ bl remove_some_task
ldr r2, _08056EF8 @ =0x05000002
mov r1, sp
movs r0, 0
@@ -4497,8 +4497,8 @@ _08056EBE:
ldr r0, [r1, 0x8]
movs r0, 0
movs r1, 0x80
- bl sub_80072E8
- bl sub_8007320
+ bl ResetOamRange
+ bl LoadOam
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -4515,7 +4515,7 @@ sub_8056F08: @ 8056F08
push {lr}
bl sub_8056A34
bl sub_8056F1C
- bl sub_8055148
+ bl mapdata_load_assets_to_gpu_and_full_redraw
pop {r0}
bx r0
thumb_func_end sub_8056F08
@@ -4523,30 +4523,30 @@ sub_8056F08: @ 8056F08
thumb_func_start sub_8056F1C
sub_8056F1C: @ 8056F1C
push {r4,lr}
- bl sub_80F6790
- bl sub_80F6808
+ bl clear_scheduled_bg_copies_to_vram
+ bl reset_temp_tile_data_buffers
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0805700C @ =0x00001f1f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08057010 @ =0x00000101
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xFF
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08057014 @ =0x0000ffff
movs r0, 0x42
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08057018 @ =gUnknown_8231E10
ldrh r1, [r0, 0x2]
ldrh r2, [r0, 0x4]
@@ -4558,59 +4558,59 @@ sub_8056F1C: @ 8056F1C
adds r0, r2, 0
orrs r1, r0
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0805701C @ =0x0000070d
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08057020 @ =0x00007060
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r4}
pop {r0}
bx r0
@@ -4627,13 +4627,13 @@ _08057020: .4byte 0x00007060
sub_8057024: @ 8057024
push {r4,lr}
adds r4, r0, 0
- bl sub_80773BC
- bl sub_8006B10
- bl sub_8070528
- bl sub_8087EA4
- bl sub_810BB8C
- bl sub_805AB58
- bl sub_805ADF8
+ bl ResetTasks
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl dp12_8087EA4
+ bl dp13_810BB8C
+ bl ResetCameraUpdateInfo
+ bl InstallCameraPanAheadCallback
cmp r4, 0
bne _08057050
movs r0, 0
@@ -4643,14 +4643,14 @@ _08057050:
movs r0, 0x1
bl sub_805FECC
_08057056:
- bl sub_80837AC
+ bl FieldEffectActiveListClear
bl sub_8079C08
bl sub_807B1B8
cmp r4, 0
bne _0805706A
bl sub_806E87C
_0805706A:
- bl sub_8069C50
+ bl mapheader_run_script_with_tag_x5
pop {r4}
pop {r0}
bx r0
@@ -4668,7 +4668,7 @@ sub_8057074: @ 8057074
movs r0, 0
movs r1, 0
bl sub_805EC30
- bl sub_8069C9C
+ bl mapheader_run_first_tag4_script_list_match
pop {r0}
bx r0
.align 2, 0
@@ -4690,7 +4690,7 @@ sub_805709C: @ 805709C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_8059808
+ bl sav1_camera_get_focus_coords
bl sub_8055A6C
adds r5, r0, 0
mov r0, sp
@@ -4702,14 +4702,14 @@ sub_805709C: @ 805709C
ldr r3, _080570FC @ =gUnknown_300500C
ldr r3, [r3]
ldrb r3, [r3, 0x8]
- bl sub_805CA3C
+ bl InitPlayerAvatar
ldrb r0, [r5]
bl sub_805BDEC
bl sub_80559E4
movs r0, 0
movs r1, 0
bl sub_805EC30
- bl sub_8069C9C
+ bl mapheader_run_first_tag4_script_list_match
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -4726,7 +4726,7 @@ sub_8057100: @ 8057100
movs r0, 0
movs r1, 0
bl sub_805EDF0
- bl sub_8069C5C
+ bl mapheader_run_script_with_tag_x7
pop {r0}
bx r0
thumb_func_end sub_8057100
@@ -4746,7 +4746,7 @@ sub_8057114: @ 8057114
orrs r1, r2
strb r1, [r0, 0x1]
ldrb r0, [r3, 0x4]
- bl sub_805AB70
+ bl InitCameraUpdateCallback
pop {r0}
bx r0
.align 2, 0
@@ -4762,7 +4762,7 @@ sub_8057140: @ 8057140
bl sub_8058504
lsls r0, 24
lsrs r0, 24
- bl sub_805AB70
+ bl InitCameraUpdateCallback
pop {r0}
bx r0
.align 2, 0
@@ -4777,7 +4777,7 @@ sub_805715C: @ 805715C
bl sub_8058504
lsls r0, 24
lsrs r0, 24
- bl sub_805AB70
+ bl InitCameraUpdateCallback
pop {r0}
bx r0
.align 2, 0
@@ -4792,7 +4792,7 @@ sub_8057178: @ 8057178
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_8059808
+ bl sav1_camera_get_focus_coords
mov r2, sp
ldr r0, _080571A4 @ =gUnknown_300502C
ldrb r1, [r0]
@@ -4820,7 +4820,7 @@ sub_80571A8: @ 80571A8
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_8059808
+ bl sav1_camera_get_focus_coords
mov r3, sp
mov r2, sp
ldr r0, _08057224 @ =gUnknown_300502C
@@ -4918,12 +4918,12 @@ sub_805726C: @ 805726C
ldr r1, _08057298 @ =gUnknown_2036E28
movs r0, 0x1
strb r0, [r1]
- bl sub_8069A80
- bl sub_806994C
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
ldr r0, _0805729C @ =sub_80C9BFC
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _080572A0 @ =gUnknown_30030F0
ldr r0, _080572A4 @ =sub_80572D8
str r0, [r1, 0x8]
@@ -4943,13 +4943,13 @@ sub_80572A8: @ 80572A8
ldr r0, _080572D0 @ =gUnknown_2036E28
movs r1, 0x1
strb r1, [r0]
- bl sub_80552BC
- bl sub_8069A80
- bl sub_806994C
+ bl set_current_map_header_from_sav1
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
ldr r0, _080572D4 @ =sub_80572D8
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -4966,7 +4966,7 @@ sub_80572D8: @ 80572D8
ldr r0, _080572F8 @ =sub_8056534
bl sub_80565E0
ldr r0, _080572FC @ =sub_80565B4
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -5061,7 +5061,7 @@ _080573B8:
bl sub_8056F1C
b _08057412
_080573C2:
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
b _08057412
_080573C8:
ldr r0, _080573D4 @ =gUnknown_2036DFC
@@ -5078,22 +5078,22 @@ _080573D8:
.align 2, 0
_080573E4: .4byte gUnknown_2036DFC
_080573E8:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057428
ldr r0, _08057400 @ =gUnknown_2036DFC
ldr r0, [r0]
- bl sub_8059AD8
+ bl apply_map_tileset1_tileset2_palette
b _08057412
.align 2, 0
_08057400: .4byte gUnknown_2036DFC
_08057404:
- bl sub_805A684
+ bl DrawWholeMapView
b _08057412
_0805740A:
- bl sub_806FF9C
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
bl sub_815A540
_08057412:
ldrb r0, [r4]
@@ -5119,29 +5119,29 @@ _0805742A:
sub_8057430: @ 8057430
push {lr}
bl sub_80569BC
- bl sub_8071A94
+ bl StopMapMusic
ldr r1, _08057484 @ =gUnknown_2036E28
movs r0, 0x3
strb r0, [r1]
bl sub_8056420
- bl sub_80552BC
+ bl set_current_map_header_from_sav1
bl sub_80550A8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
bl sub_8054E40
bl sub_80589E8
- bl sub_8054838
- bl sub_8069A80
+ bl PlayTimeCounter_Start
+ bl ScriptContext1_Init
ldr r1, _08057488 @ =gUnknown_2031DE0
movs r0, 0x1
strb r0, [r1]
- bl sub_804C188
+ bl sav2_x1_query_bit1
cmp r0, 0x1
bne _08057490
- bl sub_804C198
- bl sub_80556E0
- bl sub_8055378
+ bl sav2_x9_clear_bit1
+ bl warp1_set_to_sav1w
+ bl warp_in
ldr r0, _0805748C @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
b _0805749A
.align 2, 0
_08057484: .4byte gUnknown_2036E28
@@ -5150,7 +5150,7 @@ _0805748C: .4byte sub_805671C
_08057490:
ldr r0, _080574A0 @ =sub_8056534
bl sub_80565E0
- bl sub_80567DC
+ bl c2_exit_to_overworld_2_switch
_0805749A:
pop {r0}
bx r0
@@ -5168,16 +5168,16 @@ sub_80574A4: @ 80574A4
cmp r4, 0
beq _080574B8
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
_080574B8:
- bl sub_8077578
- bl sub_8006B5C
+ bl RunTasks
+ bl AnimateSprites
bl sub_805ACF0
- bl sub_805AE28
- bl sub_8006BA8
- bl sub_80704D0
+ bl UpdateCameraPanning
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
bl sub_806FFBC
- bl sub_80F67B8
+ bl do_scheduled_bg_tilemap_copies_to_vram
cmp r4, 0
beq _080574E0
bl sub_8056A04
@@ -5304,14 +5304,14 @@ _08057560:
adds r0, r4
ldrh r0, [r0, 0x4]
strh r0, [r1]
- bl sub_8055378
+ bl warp_in
ldr r2, _08057610 @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
strb r0, [r2, 0x8]
- bl sub_8069A80
- bl sub_806994C
+ bl ScriptContext1_Init
+ bl ScriptContext2_Disable
movs r0, 0
bl sub_80565E0
ldr r1, _08057614 @ =gUnknown_3005024
@@ -5395,22 +5395,22 @@ _08057690:
bl sub_8055920
b _0805772A
_0805769C:
- bl sub_8087EA4
- bl sub_810BB8C
- bl sub_805AB58
- bl sub_805ADF8
- bl sub_80837AC
+ bl dp12_8087EA4
+ bl dp13_810BB8C
+ bl ResetCameraUpdateInfo
+ bl InstallCameraPanAheadCallback
+ bl FieldEffectActiveListClear
bl sub_8079C08
bl sub_807B1B8
bl sub_806E87C
- bl sub_8069C50
+ bl mapheader_run_script_with_tag_x5
b _0805772A
_080576C2:
bl sub_8056A34
bl sub_8056F1C
b _0805772A
_080576CC:
- bl sub_805A5E4
+ bl move_tilemap_camera_to_upper_left_corner
b _0805772A
_080576D2:
ldr r0, _080576DC @ =gUnknown_2036DFC
@@ -5427,22 +5427,22 @@ _080576E0:
.align 2, 0
_080576EC: .4byte gUnknown_2036DFC
_080576F0:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08057740
ldr r0, _08057708 @ =gUnknown_2036DFC
ldr r0, [r0]
- bl sub_8059AD8
+ bl apply_map_tileset1_tileset2_palette
b _0805772A
.align 2, 0
_08057708: .4byte gUnknown_2036DFC
_0805770C:
- bl sub_805A684
+ bl DrawWholeMapView
b _0805772A
_08057712:
- bl sub_806FF9C
+ bl cur_mapheader_run_tileset_funcs_after_some_cpuset
ldr r2, _08057734 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -5521,7 +5521,7 @@ _080577A8:
str r0, [r2]
ldr r0, _080577BC @ =sub_805781C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
b _08057814
.align 2, 0
_080577BC: .4byte sub_805781C
@@ -5591,7 +5591,7 @@ sub_805781C: @ 805781C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0805784C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -5621,9 +5621,9 @@ sub_8057854: @ 8057854
bne _08057876
bl sub_80563F0
ldr r0, _08057880 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08057876:
pop {r4}
pop {r0}
@@ -5633,8 +5633,8 @@ _0805787C: .4byte gUnknown_2037AB8
_08057880: .4byte sub_805671C
thumb_func_end sub_8057854
- thumb_func_start sub_8057884
-sub_8057884: @ 8057884
+ thumb_func_start c1_link_related
+c1_link_related: @ 8057884
push {r4,lr}
ldr r0, _080578C8 @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -5669,14 +5669,14 @@ _080578C8: .4byte gUnknown_3003F3C
_080578CC: .4byte gUnknown_300502C
_080578D0: .4byte gUnknown_3003E60
_080578D4: .4byte gUnknown_3000E84
- thumb_func_end sub_8057884
+ thumb_func_end c1_link_related
thumb_func_start sub_80578D8
sub_80578D8: @ 80578D8
push {lr}
bl sub_805793C
ldr r0, _080578E8 @ =sub_8057D5C
- bl sub_80578FC
+ bl c1_link_related_func_set
pop {r0}
bx r0
.align 2, 0
@@ -5694,8 +5694,8 @@ sub_80578EC: @ 80578EC
_080578F8: .4byte gUnknown_3003E60
thumb_func_end sub_80578EC
- thumb_func_start sub_80578FC
-sub_80578FC: @ 80578FC
+ thumb_func_start c1_link_related_func_set
+c1_link_related_func_set: @ 80578FC
ldr r2, _08057908 @ =gUnknown_3000E89
movs r1, 0
strb r1, [r2]
@@ -5705,7 +5705,7 @@ sub_80578FC: @ 80578FC
.align 2, 0
_08057908: .4byte gUnknown_3000E89
_0805790C: .4byte gUnknown_3000E84
- thumb_func_end sub_80578FC
+ thumb_func_end c1_link_related_func_set
thumb_func_start sub_8057910
sub_8057910: @ 8057910
@@ -5849,7 +5849,7 @@ _080579E4:
b _08057BD2
_08057A04:
ldr r0, _08057A18 @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
adds r0, r4, 0
bl sub_80581DC
b _08057BD2
@@ -5869,7 +5869,7 @@ _08057A1C:
b _08057BD2
_08057A32:
ldr r0, _08057A40 @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
bl sub_8058230
b _08057BD2
.align 2, 0
@@ -5914,7 +5914,7 @@ _08057A88:
cmp r0, 0
beq _08057B5E
ldr r0, _08057AB0 @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
bl sub_80581C8
b _08057B5E
.align 2, 0
@@ -5933,7 +5933,7 @@ _08057AB4:
cmp r0, 0
beq _08057B5E
ldr r0, _08057ADC @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
bl sub_80581F8
b _08057B5E
.align 2, 0
@@ -5953,7 +5953,7 @@ _08057AE0:
cmp r0, 0
beq _08057B5E
ldr r0, _08057B0C @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
adds r0, r4, 0
bl sub_8058214
b _08057B5E
@@ -5973,7 +5973,7 @@ _08057B10:
cmp r0, 0
beq _08057B5E
ldr r0, _08057B38 @ =sub_8057DC8
- bl sub_80578FC
+ bl c1_link_related_func_set
bl sub_80581BC
b _08057B5E
.align 2, 0
@@ -5992,7 +5992,7 @@ _08057B3C:
cmp r0, 0
beq _08057B5E
ldr r0, _08057B74 @ =sub_8057DEC
- bl sub_80578FC
+ bl c1_link_related_func_set
bl sub_80581BC
_08057B5E:
mov r0, r8
@@ -6038,7 +6038,7 @@ _08057BA4:
cmp r0, 0
beq _08057BD2
ldr r0, _08057BC0 @ =sub_8057D5C
- bl sub_80578FC
+ bl c1_link_related_func_set
b _08057BD2
.align 2, 0
_08057BBC: .4byte gUnknown_3000E80
@@ -6281,7 +6281,7 @@ _08057D4E:
sub_8057D5C: @ 8057D5C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -6323,7 +6323,7 @@ sub_8057D98: @ 8057D98
thumb_func_start sub_8057DA4
sub_8057DA4: @ 8057DA4
push {r4,lr}
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
movs r4, 0x11
@@ -6331,7 +6331,7 @@ sub_8057DA4: @ 8057DA4
beq _08057DBC
movs r4, 0x1A
ldr r0, _08057DC4 @ =sub_8057D98
- bl sub_80578FC
+ bl c1_link_related_func_set
_08057DBC:
adds r0, r4, 0
pop {r4}
@@ -6349,9 +6349,9 @@ sub_8057DC8: @ 8057DC8
cmp r0, 0x2
bhi _08057DE0
movs r4, 0x1A
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r0, _08057DE8 @ =sub_8057D98
- bl sub_80578FC
+ bl c1_link_related_func_set
_08057DE0:
adds r0, r4, 0
pop {r4}
@@ -6369,9 +6369,9 @@ sub_8057DEC: @ 8057DEC
cmp r0, 0x2
bhi _08057E04
movs r4, 0x1A
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r0, _08057E0C @ =sub_8057D98
- bl sub_80578FC
+ bl c1_link_related_func_set
_08057E04:
adds r0, r4, 0
pop {r4}
@@ -6405,7 +6405,7 @@ sub_8057E1C: @ 8057E1C
cmp r0, 0
beq _08057E50
ldr r0, _08057E48 @ =sub_8057E10
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0x1D
b _08057E52
.align 2, 0
@@ -6425,7 +6425,7 @@ _08057E52:
sub_8057E58: @ 8057E58
push {lr}
ldr r0, _08057E68 @ =sub_8057E1C
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0x16
pop {r1}
bx r1
@@ -6454,9 +6454,9 @@ _08057E80:
cmp r0, 0x1
bne _08057E96
ldr r0, _08057EA0 @ =gUnknown_81BB9FC
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
ldr r0, _08057EA4 @ =sub_8057E6C
- bl sub_80578FC
+ bl c1_link_related_func_set
_08057E96:
movs r0, 0x11
pop {r1}
@@ -6471,7 +6471,7 @@ _08057EA4: .4byte sub_8057E6C
sub_8057EA8: @ 8057EA8
push {lr}
ldr r0, _08057EB8 @ =sub_8057E70
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0x17
pop {r1}
bx r1
@@ -6554,7 +6554,7 @@ sub_8057F28: @ 8057F28
sub_8057F34: @ 8057F34
push {lr}
ldr r0, _08057F44 @ =sub_8057E58
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0
pop {r1}
bx r1
@@ -6566,7 +6566,7 @@ _08057F44: .4byte sub_8057E58
sub_8057F48: @ 8057F48
push {lr}
ldr r0, _08057F58 @ =sub_8057DA4
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0
pop {r1}
bx r1
@@ -6578,7 +6578,7 @@ _08057F58: .4byte sub_8057DA4
sub_8057F5C: @ 8057F5C
push {lr}
ldr r0, _08057F6C @ =sub_8057EA8
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0
pop {r1}
bx r1
@@ -6590,7 +6590,7 @@ _08057F6C: .4byte sub_8057EA8
sub_8057F70: @ 8057F70
push {lr}
ldr r0, _08057F80 @ =sub_8057EBC
- bl sub_80578FC
+ bl c1_link_related_func_set
movs r0, 0
pop {r1}
bx r1
@@ -6903,7 +6903,7 @@ _080581B6:
thumb_func_start sub_80581BC
sub_80581BC: @ 80581BC
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_80581BC
@@ -6914,7 +6914,7 @@ sub_80581C8: @ 80581C8
movs r0, 0x6
bl sub_80722CC
bl sub_806F258
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
thumb_func_end sub_80581C8
@@ -6926,8 +6926,8 @@ sub_80581DC: @ 80581DC
movs r0, 0x5
bl sub_80722CC
adds r0, r4, 0
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -6939,8 +6939,8 @@ sub_80581F8: @ 80581F8
movs r0, 0x6
bl sub_80722CC
ldr r0, _08058210 @ =gUnknown_81BB9D4
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -6954,8 +6954,8 @@ sub_8058214: @ 8058214
movs r0, 0x5
bl sub_80722CC
adds r0, r4, 0
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r4}
pop {r0}
bx r0
@@ -6965,8 +6965,8 @@ sub_8058214: @ 8058214
sub_8058230: @ 8058230
push {lr}
ldr r0, _08058240 @ =gUnknown_81BB9F0
- bl sub_8069AE4
- bl sub_8069940
+ bl ScriptContext1_SetupScript
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -7143,8 +7143,8 @@ sub_8058370: @ 8058370
bx lr
thumb_func_end sub_8058370
- thumb_func_start sub_8058378
-sub_8058378: @ 8058378
+ thumb_func_start strange_npc_table_clear
+strange_npc_table_clear: @ 8058378
push {lr}
ldr r0, _08058388 @ =gUnknown_2031DEC
movs r1, 0
@@ -7154,7 +7154,7 @@ sub_8058378: @ 8058378
bx r0
.align 2, 0
_08058388: .4byte gUnknown_2031DEC
- thumb_func_end sub_8058378
+ thumb_func_end strange_npc_table_clear
thumb_func_start sub_805838C
sub_805838C: @ 805838C
@@ -7278,7 +7278,7 @@ sub_8058448: @ 8058448
adds r0, 0x8
strh r0, [r4, 0xC]
adds r0, r4, 0
- bl sub_80682A4
+ bl FieldObjectUpdateZCoord
pop {r4}
pop {r0}
bx r0
@@ -7333,7 +7333,7 @@ sub_80584B8: @ 80584B8
lsls r0, 2
ldr r1, _08058500 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
_080584E4:
movs r0, 0
strb r0, [r5]
@@ -7621,7 +7621,7 @@ sub_80586CC: @ 80586CC
lsls r0, r2, 24
lsrs r0, 24
ldrb r1, [r5, 0x19]
- bl sub_805878C
+ bl npc_something3
strb r0, [r5, 0x19]
ldrb r1, [r5, 0x19]
mov r6, sp
@@ -7629,7 +7629,7 @@ sub_80586CC: @ 80586CC
adds r0, r5, 0
mov r2, sp
adds r3, r6, 0
- bl sub_8063C50
+ bl FieldObjectMoveDestCoords
ldrb r0, [r4, 0x2]
ldrb r1, [r5, 0x19]
mov r2, sp
@@ -7637,7 +7637,7 @@ sub_80586CC: @ 80586CC
ldrsh r2, [r2, r3]
movs r4, 0
ldrsh r3, [r6, r4]
- bl sub_80587EC
+ bl npc_080587EC
lsls r0, 24
cmp r0, 0
bne _0805872A
@@ -7651,9 +7651,9 @@ sub_80586CC: @ 80586CC
movs r3, 0
ldrsh r2, [r6, r3]
adds r0, r5, 0
- bl sub_805F700
+ bl npc_coords_shift
adds r0, r5, 0
- bl sub_80682A4
+ bl FieldObjectUpdateZCoord
movs r0, 0x1
b _0805872C
_0805872A:
@@ -7672,7 +7672,7 @@ sub_8058734: @ 8058734
lsls r0, r2, 24
lsrs r0, 24
ldrb r1, [r4, 0x19]
- bl sub_805878C
+ bl npc_something3
strb r0, [r4, 0x19]
movs r0, 0
pop {r4}
@@ -7703,12 +7703,12 @@ sub_8058754: @ 8058754
adds r1, 0xC
adds r2, r4, 0
adds r2, 0xE
- bl sub_8063A20
+ bl MoveCoords
ldrb r0, [r5]
cmp r0, 0
bne _08058784
adds r0, r4, 0
- bl sub_805F818
+ bl npc_coords_shift_still
movs r0, 0x2
strb r0, [r6, 0x3]
_08058784:
@@ -7717,8 +7717,8 @@ _08058784:
bx r0
thumb_func_end sub_8058754
- thumb_func_start sub_805878C
-sub_805878C: @ 805878C
+ thumb_func_start npc_something3
+npc_something3: @ 805878C
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -7763,10 +7763,10 @@ _080587E4:
_080587E6:
pop {r1}
bx r1
- thumb_func_end sub_805878C
+ thumb_func_end npc_something3
- thumb_func_start sub_80587EC
-sub_80587EC: @ 80587EC
+ thumb_func_start npc_080587EC
+npc_080587EC: @ 80587EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -7840,7 +7840,7 @@ _0805886A:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80587EC
+ thumb_func_end npc_080587EC
thumb_func_start sub_8058878
sub_8058878: @ 8058878
@@ -7941,10 +7941,10 @@ sub_805890C: @ 805890C
lsrs r0, 4
adds r1, r5, 0
movs r2, 0x1
- bl sub_80682F8
+ bl SetObjectSubpriorityByZCoord
ldrb r0, [r6, 0xB]
lsrs r0, 4
- bl sub_8068294
+ bl ZCoordToPriority
movs r1, 0x3
ands r1, r0
lsls r1, 2
@@ -7958,24 +7958,24 @@ sub_805890C: @ 805890C
cmp r0, 0
bne _08058978
ldrb r0, [r6, 0x19]
- bl sub_8063430
+ bl FieldObjectDirectionToImageAnimId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _0805898A
.align 2, 0
_08058970: .4byte gUnknown_2031DEC
_08058974: .4byte gUnknown_2036E38
_08058978:
ldrb r0, [r6, 0x19]
- bl sub_8063440
+ bl get_go_image_anim_num
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
_0805898A:
adds r0, r5, 0
movs r1, 0
diff --git a/asm/palette.s b/asm/palette.s
index 596238614..50213af8b 100644
--- a/asm/palette.s
+++ b/asm/palette.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80703A8
-sub_80703A8: @ 80703A8
+ thumb_func_start LoadCompressedPalette
+LoadCompressedPalette: @ 80703A8
push {r4-r6,lr}
adds r4, r1, 0
adds r5, r2, 0
@@ -15,7 +15,7 @@ sub_80703A8: @ 80703A8
lsls r5, 16
ldr r6, _080703E0 @ =gUnknown_2037ACC
adds r1, r6, 0
- bl sub_800EBB4
+ bl LZDecompressWram
lsls r4, 1
ldr r1, _080703E4 @ =gUnknown_20371F8
adds r1, r4, r1
@@ -36,10 +36,10 @@ sub_80703A8: @ 80703A8
_080703E0: .4byte gUnknown_2037ACC
_080703E4: .4byte gUnknown_20371F8
_080703E8: .4byte gUnknown_20375F8
- thumb_func_end sub_80703A8
+ thumb_func_end LoadCompressedPalette
- thumb_func_start sub_80703EC
-sub_80703EC: @ 80703EC
+ thumb_func_start LoadPalette
+LoadPalette: @ 80703EC
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
@@ -64,10 +64,10 @@ sub_80703EC: @ 80703EC
.align 2, 0
_0807041C: .4byte gUnknown_20371F8
_08070420: .4byte gUnknown_20375F8
- thumb_func_end sub_80703EC
+ thumb_func_end LoadPalette
- thumb_func_start sub_8070424
-sub_8070424: @ 8070424
+ thumb_func_start FillPalette
+FillPalette: @ 8070424
push {r4-r6,lr}
sub sp, 0x4
adds r6, r0, 0
@@ -104,10 +104,10 @@ sub_8070424: @ 8070424
.align 2, 0
_0807046C: .4byte gUnknown_20371F8
_08070470: .4byte gUnknown_20375F8
- thumb_func_end sub_8070424
+ thumb_func_end FillPalette
- thumb_func_start sub_8070474
-sub_8070474: @ 8070474
+ thumb_func_start TransferPlttBuffer
+TransferPlttBuffer: @ 8070474
push {r4,r5,lr}
ldr r4, _080704BC @ =gUnknown_2037AB8
ldrb r1, [r4, 0x8]
@@ -139,7 +139,7 @@ sub_8070474: @ 8070474
ands r0, r1
cmp r0, 0
beq _080704B6
- bl sub_807141C
+ bl UpdateBlendRegisters
_080704B6:
pop {r4,r5}
pop {r0}
@@ -150,10 +150,10 @@ _080704C0: .4byte gUnknown_20375F8
_080704C4: .4byte 0x040000d4
_080704C8: .4byte 0x80000200
_080704CC: .4byte gUnknown_2037AC8
- thumb_func_end sub_8070474
+ thumb_func_end TransferPlttBuffer
- thumb_func_start sub_80704D0
-sub_80704D0: @ 80704D0
+ thumb_func_start UpdatePaletteFade
+UpdatePaletteFade: @ 80704D0
push {lr}
ldr r0, _080704E0 @ =gUnknown_2037AC8
ldr r0, [r0]
@@ -170,17 +170,17 @@ _080704E4:
ands r1, r0
cmp r1, 0
bne _080704FC
- bl sub_8070B8C
+ bl UpdateNormalPaletteFade
b _0807050A
.align 2, 0
_080704F8: .4byte gUnknown_2037AB8
_080704FC:
cmp r1, 0x1
bne _08070506
- bl sub_8070EEC
+ bl UpdateFastPaletteFade
b _0807050A
_08070506:
- bl sub_8071300
+ bl UpdateHardwarePaletteFade
_0807050A:
lsls r0, 24
lsrs r3, r0, 24
@@ -197,28 +197,28 @@ _0807051C:
.align 2, 0
_08070520: .4byte gUnknown_2037AC8
_08070524: .4byte gUnknown_2037AB8
- thumb_func_end sub_80704D0
+ thumb_func_end UpdatePaletteFade
- thumb_func_start sub_8070528
-sub_8070528: @ 8070528
+ thumb_func_start ResetPaletteFade
+ResetPaletteFade: @ 8070528
push {r4,lr}
movs r4, 0
_0807052C:
adds r0, r4, 0
- bl sub_8070A28
+ bl ResetPaletteStruct
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xF
bls _0807052C
- bl sub_8070A84
+ bl ResetPaletteFadeControl
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8070528
+ thumb_func_end ResetPaletteFade
- thumb_func_start sub_8070548
-sub_8070548: @ 8070548
+ thumb_func_start ReadPlttIntoBuffers
+ReadPlttIntoBuffers: @ 8070548
push {r4-r7,lr}
movs r0, 0xA0
lsls r0, 19
@@ -249,10 +249,10 @@ _08070558:
_0807057C: .4byte gUnknown_20371F8
_08070580: .4byte gUnknown_20375F8
_08070584: .4byte 0x000001ff
- thumb_func_end sub_8070548
+ thumb_func_end ReadPlttIntoBuffers
- thumb_func_start sub_8070588
-sub_8070588: @ 8070588
+ thumb_func_start BeginNormalPaletteFade
+BeginNormalPaletteFade: @ 8070588
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -366,7 +366,7 @@ _08070664:
orrs r3, r0
_08070668:
strb r3, [r5, 0x8]
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r4, _080706C0 @ =gUnknown_2037AB8
ldrb r1, [r4, 0x8]
lsrs r5, r1, 7
@@ -391,7 +391,7 @@ _08070668:
ands r0, r1
cmp r0, 0
beq _080706A4
- bl sub_807141C
+ bl UpdateBlendRegisters
_080706A4:
ldr r2, _080706C0 @ =gUnknown_2037AB8
lsls r3, r5, 7
@@ -412,10 +412,10 @@ _080706C0: .4byte gUnknown_2037AB8
_080706C4: .4byte gUnknown_20375F8
_080706C8: .4byte 0x04000100
_080706CC: .4byte gUnknown_2037AC8
- thumb_func_end sub_8070588
+ thumb_func_end BeginNormalPaletteFade
- thumb_func_start sub_80706D0
-sub_80706D0: @ 80706D0
+ thumb_func_start unref_sub_80A1C1C
+unref_sub_80A1C1C: @ 80706D0
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -433,7 +433,7 @@ sub_80706D0: @ 80706D0
lsls r5, 16
lsrs r5, 16
str r3, [sp, 0x4]
- bl sub_8070548
+ bl ReadPlttIntoBuffers
lsls r4, 24
asrs r4, 24
str r5, [sp]
@@ -441,7 +441,7 @@ sub_80706D0: @ 80706D0
adds r1, r4, 0
adds r2, r6, 0
ldr r3, [sp, 0x4]
- bl sub_8070588
+ bl BeginNormalPaletteFade
lsls r0, 24
lsrs r0, 24
add sp, 0x8
@@ -450,10 +450,10 @@ sub_80706D0: @ 80706D0
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80706D0
+ thumb_func_end unref_sub_80A1C1C
- thumb_func_start sub_8070718
-sub_8070718: @ 8070718
+ thumb_func_start unref_sub_80A1C64
+unref_sub_80A1C64: @ 8070718
push {r4-r7,lr}
adds r6, r1, 0
lsls r0, 24
@@ -484,7 +484,7 @@ _08070722:
cmp r1, r0
bne _0807075E
adds r0, r4, 0
- bl sub_80709B4
+ bl unused_sub_80A1F00
ldrb r0, [r4, 0x4]
lsls r0, 31
cmp r0, 0
@@ -495,7 +495,7 @@ _0807075E:
bne _08070774
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8070790
+ bl unused_sub_80A1CDC
b _08070778
.align 2, 0
_08070770: .4byte gUnknown_20379F8
@@ -505,7 +505,7 @@ _08070774:
_08070778:
adds r0, r4, 0
adds r1, r6, 0
- bl sub_80708F4
+ bl unused_sub_80A1E40
_08070780:
adds r0, r5, 0x1
lsls r0, 24
@@ -515,10 +515,10 @@ _08070780:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8070718
+ thumb_func_end unref_sub_80A1C64
- thumb_func_start sub_8070790
-sub_8070790: @ 8070790
+ thumb_func_start unused_sub_80A1CDC
+unused_sub_80A1CDC: @ 8070790
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -697,10 +697,10 @@ _080708E4: .4byte gUnknown_20375F8
_080708E8: .4byte 0x000003ff
_080708EC: .4byte 0xffe007ff
_080708F0: .4byte 0xfffff01f
- thumb_func_end sub_8070790
+ thumb_func_end unused_sub_80A1CDC
- thumb_func_start sub_80708F4
-sub_80708F4: @ 80708F4
+ thumb_func_start unused_sub_80A1E40
+unused_sub_80A1E40: @ 80708F4
push {r4-r6,lr}
adds r4, r0, 0
ldr r3, _0807094C @ =gUnknown_2037AB8
@@ -742,7 +742,7 @@ sub_80708F4: @ 80708F4
ldrh r3, [r3, 0x6]
lsls r3, 17
lsrs r3, 17
- bl sub_8045274
+ bl BlendPalette
b _080709A8
.align 2, 0
_0807094C: .4byte gUnknown_2037AB8
@@ -798,10 +798,10 @@ _080709A8:
bx r0
.align 2, 0
_080709B0: .4byte gUnknown_20375F8
- thumb_func_end sub_80708F4
+ thumb_func_end unused_sub_80A1E40
- thumb_func_start sub_80709B4
-sub_80709B4: @ 80709B4
+ thumb_func_start unused_sub_80A1F00
+unused_sub_80A1F00: @ 80709B4
push {lr}
adds r3, r0, 0
ldrb r0, [r3, 0x9]
@@ -839,7 +839,7 @@ _080709F4:
cmp r0, 0x2
bgt _08070A08
ldrh r0, [r2]
- bl sub_8070A0C
+ bl ResetPaletteStructByUid
b _08070A08
_08070A04:
subs r0, 0x1
@@ -847,26 +847,26 @@ _08070A04:
_08070A08:
pop {r0}
bx r0
- thumb_func_end sub_80709B4
+ thumb_func_end unused_sub_80A1F00
- thumb_func_start sub_8070A0C
-sub_8070A0C: @ 8070A0C
+ thumb_func_start ResetPaletteStructByUid
+ResetPaletteStructByUid: @ 8070A0C
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_8070B58
+ bl GetPaletteNumByUid
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
beq _08070A22
- bl sub_8070A28
+ bl ResetPaletteStruct
_08070A22:
pop {r0}
bx r0
- thumb_func_end sub_8070A0C
+ thumb_func_end ResetPaletteStructByUid
- thumb_func_start sub_8070A28
-sub_8070A28: @ 8070A28
+ thumb_func_start ResetPaletteStruct
+ResetPaletteStruct: @ 8070A28
lsls r0, 24
lsrs r0, 24
ldr r2, _08070A70 @ =gUnknown_20379F8
@@ -908,10 +908,10 @@ _08070A74: .4byte gUnknown_83AC960
_08070A78: .4byte 0xfffff803
_08070A7C: .4byte 0xffe007ff
_08070A80: .4byte 0xfffff01f
- thumb_func_end sub_8070A28
+ thumb_func_end ResetPaletteStruct
- thumb_func_start sub_8070A84
-sub_8070A84: @ 8070A84
+ thumb_func_start ResetPaletteFadeControl
+ResetPaletteFadeControl: @ 8070A84
ldr r2, _08070AEC @ =gUnknown_2037AB8
movs r0, 0
str r0, [r2]
@@ -969,14 +969,14 @@ _08070AEC: .4byte gUnknown_2037AB8
_08070AF0: .4byte 0xfffff83f
_08070AF4: .4byte 0xffff8000
_08070AF8: .4byte 0xfffe0fff
- thumb_func_end sub_8070A84
+ thumb_func_end ResetPaletteFadeControl
- thumb_func_start sub_8070AFC
-sub_8070AFC: @ 8070AFC
+ thumb_func_start unref_sub_80A2048
+unref_sub_80A2048: @ 8070AFC
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_8070B58
+ bl GetPaletteNumByUid
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
@@ -995,14 +995,14 @@ _08070B20:
bx r0
.align 2, 0
_08070B24: .4byte gUnknown_20379F8
- thumb_func_end sub_8070AFC
+ thumb_func_end unref_sub_80A2048
- thumb_func_start sub_8070B28
-sub_8070B28: @ 8070B28
+ thumb_func_start unref_sub_80A2074
+unref_sub_80A2074: @ 8070B28
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_8070B58
+ bl GetPaletteNumByUid
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x10
@@ -1022,10 +1022,10 @@ _08070B4E:
bx r0
.align 2, 0
_08070B54: .4byte gUnknown_20379F8
- thumb_func_end sub_8070B28
+ thumb_func_end unref_sub_80A2074
- thumb_func_start sub_8070B58
-sub_8070B58: @ 8070B58
+ thumb_func_start GetPaletteNumByUid
+GetPaletteNumByUid: @ 8070B58
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -1054,10 +1054,10 @@ _08070B7C:
_08070B88:
pop {r1}
bx r1
- thumb_func_end sub_8070B58
+ thumb_func_end GetPaletteNumByUid
- thumb_func_start sub_8070B8C
-sub_8070B8C: @ 8070B8C
+ thumb_func_start UpdateNormalPaletteFade
+UpdateNormalPaletteFade: @ 8070B8C
push {r4-r7,lr}
ldr r4, _08070BA0 @ =gUnknown_2037AB8
ldrb r1, [r4, 0x7]
@@ -1070,7 +1070,7 @@ sub_8070B8C: @ 8070B8C
.align 2, 0
_08070BA0: .4byte gUnknown_2037AB8
_08070BA4:
- bl sub_8071470
+ bl IsSoftwarePaletteFadeFinishing
lsls r0, 24
cmp r0, 0
beq _08070BB2
@@ -1139,7 +1139,7 @@ _08070C0E:
lsrs r3, 17
adds r0, r5, 0
movs r1, 0x10
- bl sub_8045274
+ bl BlendPalette
_08070C2A:
lsrs r4, 1
adds r0, r5, 0
@@ -1228,10 +1228,10 @@ _08070CC0:
bx r1
.align 2, 0
_08070CC8: .4byte 0xfffff83f
- thumb_func_end sub_8070B8C
+ thumb_func_end UpdateNormalPaletteFade
- thumb_func_start sub_8070CCC
-sub_8070CCC: @ 8070CCC
+ thumb_func_start InvertPlttBuffer
+InvertPlttBuffer: @ 8070CCC
push {r4-r7,lr}
adds r1, r0, 0
movs r3, 0
@@ -1272,10 +1272,10 @@ _08070D0A:
bx r0
.align 2, 0
_08070D10: .4byte gUnknown_20375F8
- thumb_func_end sub_8070CCC
+ thumb_func_end InvertPlttBuffer
- thumb_func_start sub_8070D14
-sub_8070D14: @ 8070D14
+ thumb_func_start TintPlttBuffer
+TintPlttBuffer: @ 8070D14
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1385,10 +1385,10 @@ _08070DD0:
.align 2, 0
_08070DE0: .4byte gUnknown_20375F8
_08070DE4: .4byte 0xfffffc1f
- thumb_func_end sub_8070D14
+ thumb_func_end TintPlttBuffer
- thumb_func_start sub_8070DE8
-sub_8070DE8: @ 8070DE8
+ thumb_func_start UnfadePlttBuffer
+UnfadePlttBuffer: @ 8070DE8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1438,10 +1438,10 @@ _08070E32:
.align 2, 0
_08070E3C: .4byte gUnknown_20375F8
_08070E40: .4byte gUnknown_20371F8
- thumb_func_end sub_8070DE8
+ thumb_func_end UnfadePlttBuffer
- thumb_func_start sub_8070E44
-sub_8070E44: @ 8070E44
+ thumb_func_start BeginFastPaletteFade
+BeginFastPaletteFade: @ 8070E44
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -1453,15 +1453,15 @@ sub_8070E44: @ 8070E44
movs r2, 0x10
orrs r1, r2
strb r1, [r3, 0xA]
- bl sub_8070E68
+ bl BeginFastPaletteFadeInternal
pop {r0}
bx r0
.align 2, 0
_08070E64: .4byte gUnknown_2037AB8
- thumb_func_end sub_8070E44
+ thumb_func_end BeginFastPaletteFade
- thumb_func_start sub_8070E68
-sub_8070E68: @ 8070E68
+ thumb_func_start BeginFastPaletteFadeInternal
+BeginFastPaletteFadeInternal: @ 8070E68
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -1514,7 +1514,7 @@ _08070EBA:
ldr r2, _08070EE4 @ =0x01000200
bl CpuSet
_08070ED0:
- bl sub_80704D0
+ bl UpdatePaletteFade
add sp, 0x4
pop {r4}
pop {r0}
@@ -1524,10 +1524,10 @@ _08070EDC: .4byte gUnknown_2037AB8
_08070EE0: .4byte gUnknown_20375F8
_08070EE4: .4byte 0x01000200
_08070EE8: .4byte 0x00007fff
- thumb_func_end sub_8070E68
+ thumb_func_end BeginFastPaletteFadeInternal
- thumb_func_start sub_8070EEC
-sub_8070EEC: @ 8070EEC
+ thumb_func_start UpdateFastPaletteFade
+UpdateFastPaletteFade: @ 8070EEC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1545,7 +1545,7 @@ sub_8070EEC: @ 8070EEC
.align 2, 0
_08070F08: .4byte gUnknown_2037AB8
_08070F0C:
- bl sub_8071470
+ bl IsSoftwarePaletteFadeFinishing
lsls r0, 24
cmp r0, 0
beq _08070F1A
@@ -1990,10 +1990,10 @@ _08071246:
_08071258: .4byte gUnknown_20375F8
_0807125C: .4byte 0x05000100
_08071260: .4byte gUnknown_2037AB8
- thumb_func_end sub_8070EEC
+ thumb_func_end UpdateFastPaletteFade
- thumb_func_start sub_8071264
-sub_8071264: @ 8071264
+ thumb_func_start BeginHardwarePaletteFade
+BeginHardwarePaletteFade: @ 8071264
push {r4-r7,lr}
ldr r5, [sp, 0x14]
lsls r0, 24
@@ -2072,10 +2072,10 @@ _080712F8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8071264
+ thumb_func_end BeginHardwarePaletteFade
- thumb_func_start sub_8071300
-sub_8071300: @ 8071300
+ thumb_func_start UpdateHardwarePaletteFade
+UpdateHardwarePaletteFade: @ 8071300
push {r4-r7,lr}
ldr r2, _08071314 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x7]
@@ -2224,20 +2224,20 @@ _08071410:
bx r1
.align 2, 0
_08071418: .4byte 0xfffff83f
- thumb_func_end sub_8071300
+ thumb_func_end UpdateHardwarePaletteFade
- thumb_func_start sub_807141C
-sub_807141C: @ 807141C
+ thumb_func_start UpdateBlendRegisters
+UpdateBlendRegisters: @ 807141C
push {r4,lr}
ldr r4, _08071468 @ =gUnknown_2037AB8
ldrh r1, [r4]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x4]
lsls r1, 21
lsrs r1, 27
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
ldrb r1, [r4, 0x9]
movs r0, 0x8
ands r0, r1
@@ -2267,10 +2267,10 @@ _08071460:
.align 2, 0
_08071468: .4byte gUnknown_2037AB8
_0807146C: .4byte 0xfffff83f
- thumb_func_end sub_807141C
+ thumb_func_end UpdateBlendRegisters
- thumb_func_start sub_8071470
-sub_8071470: @ 8071470
+ thumb_func_start IsSoftwarePaletteFadeFinishing
+IsSoftwarePaletteFadeFinishing: @ 8071470
push {r4,lr}
ldr r3, _080714A8 @ =gUnknown_2037AB8
ldrb r4, [r3, 0xA]
@@ -2324,10 +2324,10 @@ _080714CE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8071470
+ thumb_func_end IsSoftwarePaletteFadeFinishing
- thumb_func_start sub_80714D4
-sub_80714D4: @ 80714D4
+ thumb_func_start BlendPalettes
+BlendPalettes: @ 80714D4
push {r4-r7,lr}
adds r4, r0, 0
lsls r1, 24
@@ -2346,7 +2346,7 @@ _080714E6:
movs r1, 0x10
adds r2, r7, 0
adds r3, r6, 0
- bl sub_8045274
+ bl BlendPalette
_080714FA:
lsrs r4, 1
adds r0, r5, 0
@@ -2359,10 +2359,10 @@ _08071508:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80714D4
+ thumb_func_end BlendPalettes
- thumb_func_start sub_8071510
-sub_8071510: @ 8071510
+ thumb_func_start BlendPalettesUnfaded
+BlendPalettesUnfaded: @ 8071510
push {r4-r6,lr}
adds r6, r0, 0
adds r4, r1, 0
@@ -2379,17 +2379,17 @@ sub_8071510: @ 8071510
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
- bl sub_80714D4
+ bl BlendPalettes
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_0807153C: .4byte gUnknown_20371F8
_08071540: .4byte gUnknown_20375F8
- thumb_func_end sub_8071510
+ thumb_func_end BlendPalettesUnfaded
- thumb_func_start sub_8071544
-sub_8071544: @ 8071544
+ thumb_func_start TintPalette_GrayScale
+TintPalette_GrayScale: @ 8071544
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 16
@@ -2431,10 +2431,10 @@ _0807158C:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8071544
+ thumb_func_end TintPalette_GrayScale
- thumb_func_start sub_8071594
-sub_8071594: @ 8071594
+ thumb_func_start TintPalette_GrayScale2
+TintPalette_GrayScale2: @ 8071594
push {r4-r7,lr}
adds r4, r0, 0
lsls r1, 16
@@ -2485,10 +2485,10 @@ _080715E8:
bx r0
.align 2, 0
_080715F0: .4byte gUnknown_83AC970
- thumb_func_end sub_8071594
+ thumb_func_end TintPalette_GrayScale2
- thumb_func_start sub_80715F4
-sub_80715F4: @ 80715F4
+ thumb_func_start TintPalette_SepiaTone
+TintPalette_SepiaTone: @ 80715F4
push {r4-r7,lr}
adds r5, r0, 0
lsls r1, 16
@@ -2546,7 +2546,7 @@ _08071656:
bx r0
.align 2, 0
_0807165C: .4byte 0x00000133
- thumb_func_end sub_80715F4
+ thumb_func_end TintPalette_SepiaTone
thumb_func_start sub_8071660
sub_8071660: @ 8071660
@@ -2755,7 +2755,7 @@ sub_80717A8: @ 80717A8
lsrs r5, 24
mov r8, r5
ldr r0, _08071800 @ =sub_80718B8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _08071804 @ =gUnknown_3005090
@@ -2797,7 +2797,7 @@ _08071828:
adds r0, r5, 0
movs r1, 0x5
mov r2, r10
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _08071858 @ =gUnknown_3005090
adds r1, r4, r5
lsls r1, 3
@@ -2861,10 +2861,10 @@ sub_8071898: @ 8071898
push {lr}
b _080718A0
_0807189C:
- bl sub_8077508
+ bl DestroyTask
_080718A0:
ldr r0, _080718B4 @ =sub_80718B8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -2887,7 +2887,7 @@ sub_80718B8: @ 80718B8
adds r4, r0, r1
adds r0, r5, 0
movs r1, 0x5
- bl sub_8077720
+ bl GetWordTaskArg
adds r3, r0, 0
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -2903,7 +2903,7 @@ sub_80718B8: @ 80718B8
ldrb r1, [r4]
ldrh r2, [r4, 0xE]
adds r0, r3, 0
- bl sub_80714D4
+ bl BlendPalettes
ldrh r1, [r4]
movs r6, 0
ldrsh r0, [r4, r6]
@@ -2913,7 +2913,7 @@ sub_80718B8: @ 80718B8
cmp r0, r2
bne _08071910
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08071930
.align 2, 0
_0807190C: .4byte gUnknown_3005098
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 471663d34..0a4d6faf1 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -28,17 +28,17 @@ sub_811EA44: @ 811EA44
str r3, [sp]
lsls r4, 24
lsrs r7, r4, 24
- bl sub_811EEA8
+ bl reset_brm
ldr r6, _0811EA8C @ =gUnknown_203B09C
movs r0, 0x8E
lsls r0, 2
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
str r5, [r6]
cmp r5, 0
bne _0811EA90
ldr r0, [sp, 0x2C]
- bl sub_8000544
+ bl SetMainCallback2
b _0811EB80
.align 2, 0
_0811EA8C: .4byte gUnknown_203B09C
@@ -150,7 +150,7 @@ _0811EB2C:
ldr r1, _0811EB94 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0811EB6A
_0811EB66:
@@ -164,9 +164,9 @@ _0811EB6A:
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r0, _0811EB9C @ =sub_811EBD0
- bl sub_8000544
+ bl SetMainCallback2
_0811EB80:
add sp, 0x4
pop {r3-r5}
@@ -186,11 +186,11 @@ _0811EB9C: .4byte sub_811EBD0
thumb_func_start sub_811EBA0
sub_811EBA0: @ 811EBA0
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_811EBA0
@@ -198,9 +198,9 @@ sub_811EBA0: @ 811EBA0
thumb_func_start sub_811EBBC
sub_811EBBC: @ 811EBBC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_811EBBC
@@ -278,13 +278,13 @@ _0811EC24:
_0811EC80:
bl sub_80BF768
bl sub_80BF77C
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
b _0811EDFC
_0811EC8E:
- bl sub_8087E64
+ bl remove_some_task
b _0811EDFC
_0811EC94:
- bl sub_8070528
+ bl ResetPaletteFade
ldr r2, _0811ECA4 @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
@@ -293,10 +293,10 @@ _0811EC94:
.align 2, 0
_0811ECA4: .4byte gUnknown_2037AB8
_0811ECA8:
- bl sub_8006B10
+ bl ResetSpriteData
b _0811EDFC
_0811ECAE:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
b _0811EDFC
_0811ECB4:
bl sub_80BF708
@@ -305,7 +305,7 @@ _0811ECB4:
beq _0811ECC0
b _0811EDFC
_0811ECC0:
- bl sub_80773BC
+ bl ResetTasks
b _0811EDFC
_0811ECC6:
bl sub_81208E4
@@ -376,7 +376,7 @@ _0811ED4A:
bl sub_809707C
b _0811EDFC
_0811ED50:
- bl sub_811F740
+ bl party_menu_add_per_mon_objects
lsls r0, 24
cmp r0, 0
beq _0811EE2C
@@ -427,7 +427,7 @@ _0811EDB4:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, [r4]
ldrh r0, [r0, 0xA]
lsrs r0, 2
@@ -440,7 +440,7 @@ _0811EDD0:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0811EDFC
_0811EDDE:
movs r0, 0x1
@@ -451,7 +451,7 @@ _0811EDDE:
str r2, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r2, _0811EE0C @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
@@ -472,9 +472,9 @@ _0811EE0C: .4byte gUnknown_2037AB8
_0811EE10: .4byte gUnknown_30030F0
_0811EE14:
ldr r0, _0811EE24 @ =sub_811EBBC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0811EE28 @ =sub_811EBA0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
b _0811EE2E
.align 2, 0
@@ -500,14 +500,14 @@ sub_811EE38: @ 811EE38
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0811EE68 @ =sub_811EE74
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _0811EE6C @ =sub_811EBBC
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0811EE70 @ =sub_811EBA0
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0x4
pop {r0}
bx r0
@@ -530,10 +530,10 @@ sub_811EE74: @ 811EE74
bne _0811EE98
ldr r0, _0811EEA4 @ =gUnknown_203B0A0
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_811F070
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0811EE98:
pop {r4}
pop {r0}
@@ -543,8 +543,8 @@ _0811EEA0: .4byte gUnknown_2037AB8
_0811EEA4: .4byte gUnknown_203B0A0
thumb_func_end sub_811EE74
- thumb_func_start sub_811EEA8
-sub_811EEA8: @ 811EEA8
+ thumb_func_start reset_brm
+reset_brm: @ 811EEA8
ldr r0, _0811EEBC @ =gUnknown_203B09C
movs r1, 0
str r1, [r0]
@@ -560,7 +560,7 @@ _0811EEBC: .4byte gUnknown_203B09C
_0811EEC0: .4byte gUnknown_203B0BC
_0811EEC4: .4byte gUnknown_203B0B4
_0811EEC8: .4byte gUnknown_203B0B8
- thumb_func_end sub_811EEA8
+ thumb_func_end reset_brm
thumb_func_start sub_811EECC
sub_811EECC: @ 811EECC
@@ -570,7 +570,7 @@ sub_811EECC: @ 811EECC
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
beq _0811EF3C
@@ -585,22 +585,22 @@ sub_811EECC: @ 811EECC
bl sub_8001658
ldr r1, [r5]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
b _0811EF3E
.align 2, 0
@@ -657,20 +657,20 @@ _0811EF8C:
lsrs r2, 16
movs r0, 0x1
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _0811F016
.align 2, 0
_0811EFAC: .4byte gUnknown_203B0B8
_0811EFB0: .4byte gUnknown_8E82700
_0811EFB4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0811F030
ldr r0, _0811EFCC @ =gUnknown_8E82AB0
ldr r1, _0811EFD0 @ =gUnknown_203B0BC
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _0811F016
.align 2, 0
_0811EFCC: .4byte gUnknown_8E82AB0
@@ -680,7 +680,7 @@ _0811EFD4:
movs r2, 0xB0
lsls r2, 1
movs r1, 0
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r0, _0811EFF8 @ =gUnknown_20371F8
ldr r4, _0811EFFC @ =gUnknown_203B09C
ldr r1, [r4]
@@ -768,25 +768,25 @@ sub_811F070: @ 811F070
ldr r0, [r0]
cmp r0, 0
beq _0811F07E
- bl sub_8002BC4
+ bl Free
_0811F07E:
ldr r0, _0811F0B0 @ =gUnknown_203B0BC
ldr r0, [r0]
cmp r0, 0
beq _0811F08A
- bl sub_8002BC4
+ bl Free
_0811F08A:
ldr r0, _0811F0B4 @ =gUnknown_203B0B8
ldr r0, [r0]
cmp r0, 0
beq _0811F096
- bl sub_8002BC4
+ bl Free
_0811F096:
ldr r0, _0811F0B8 @ =gUnknown_203B0B4
ldr r0, [r0]
cmp r0, 0
beq _0811F0A2
- bl sub_8002BC4
+ bl Free
_0811F0A2:
bl sub_8003ECC
pop {r0}
@@ -805,7 +805,7 @@ sub_811F0BC: @ 811F0BC
lsrs r5, r0, 24
ldr r4, _0811F108 @ =gUnknown_203B0B4
movs r0, 0x60
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
movs r2, 0
ldr r7, _0811F10C @ =gUnknown_8459EE4
@@ -881,9 +881,9 @@ sub_811F124: @ 811F124
ldr r0, [r5]
adds r4, r0
ldrb r0, [r4, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
b _0811F22A
.align 2, 0
_0811F16C: .4byte gUnknown_203B0A0
@@ -894,7 +894,7 @@ _0811F174:
ldr r1, _0811F1A4 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0811F1AC
ldr r5, _0811F1A8 @ =gUnknown_203B0B4
@@ -971,9 +971,9 @@ _0811F218:
ldr r0, [r0]
adds r0, r4, r0
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0811F22A:
pop {r4,r5}
pop {r0}
@@ -995,7 +995,7 @@ sub_811F234: @ 811F234
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
cmp r2, 0
beq _0811F28C
@@ -1113,7 +1113,7 @@ sub_811F2FC: @ 811F2FC
bl sub_8121738
adds r0, r6, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0811F368
ldr r1, [r7]
@@ -1293,7 +1293,7 @@ _0811F496:
_0811F4A2:
adds r0, r6, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0811F4BE
adds r0, r6, 0
@@ -1406,18 +1406,18 @@ _0811F560:
adds r7, r0
adds r0, r4, 0
adds r1, r7, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
- bl sub_8008D28
+ bl StringGetEnd10
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0x5
bhi _0811F5A0
adds r0, r4, 0
movs r1, 0x1
- bl sub_80093BC
+ bl ConvertInternationalString
_0811F5A0:
ldrb r0, [r5, 0x8]
ldr r3, [r5]
@@ -1498,8 +1498,8 @@ sub_811F620: @ 811F620
_0811F630: .4byte gUnknown_203B0B8
thumb_func_end sub_811F620
- thumb_func_start sub_811F634
-sub_811F634: @ 811F634
+ thumb_func_start party_menu_add_per_mon_objects_internal
+party_menu_add_per_mon_objects_internal: @ 811F634
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1540,16 +1540,16 @@ sub_811F634: @ 811F634
adds r2, r5
movs r3, 0
str r3, [sp]
- bl sub_812224C
+ bl party_menu_link_mon_icon_anim
ldrh r0, [r6]
ldrh r1, [r6, 0x2]
ldr r2, [r4]
adds r2, r5
- bl sub_8122468
+ bl party_menu_link_mon_held_item_object
ldrh r0, [r6]
ldr r1, [r4]
adds r1, r5
- bl sub_8122714
+ bl party_menu_link_mon_pokeball_object
ldrh r0, [r6, 0x10]
cmp r0, 0
bne _0811F6B4
@@ -1564,7 +1564,7 @@ _0811F6B4:
adds r0, 0x14
add r0, r8
ldr r0, [r0]
- bl sub_812085C
+ bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r3, r0, 24
_0811F6C4:
@@ -1577,7 +1577,7 @@ _0811F6C4:
ldr r2, [r1]
adds r2, r5
adds r1, r3, 0
- bl sub_81228B8
+ bl party_menu_link_mon_status_condition_object
b _0811F728
.align 2, 0
_0811F6DC: .4byte gUnknown_2022B58
@@ -1590,7 +1590,7 @@ _0811F6E4:
adds r6, r1, r0
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0811F728
ldr r4, _0811F73C @ =gUnknown_203B0B4
@@ -1599,19 +1599,19 @@ _0811F6E4:
adds r1, r5
adds r0, r6, 0
adds r2, r7, 0
- bl sub_81221D4
+ bl party_menu_icon_anim
ldr r1, [r4]
adds r1, r5
adds r0, r6, 0
- bl sub_8122434
+ bl party_menu_held_item_object
ldr r1, [r4]
adds r1, r5
adds r0, r6, 0
- bl sub_81226EC
+ bl party_menu_pokeball_object
ldr r1, [r4]
adds r1, r5
adds r0, r6, 0
- bl sub_8122884
+ bl party_menu_status_condition_object
_0811F728:
add sp, 0x4
pop {r3-r5}
@@ -1624,10 +1624,10 @@ _0811F728:
.align 2, 0
_0811F738: .4byte gUnknown_2024284
_0811F73C: .4byte gUnknown_203B0B4
- thumb_func_end sub_811F634
+ thumb_func_end party_menu_add_per_mon_objects_internal
- thumb_func_start sub_811F740
-sub_811F740: @ 811F740
+ thumb_func_start party_menu_add_per_mon_objects
+party_menu_add_per_mon_objects: @ 811F740
push {r4,r5,lr}
ldr r5, _0811F768 @ =gUnknown_203B09C
ldr r0, [r5]
@@ -1635,7 +1635,7 @@ sub_811F740: @ 811F740
lsls r4, 2
adds r0, r4
ldrb r0, [r0]
- bl sub_811F634
+ bl party_menu_add_per_mon_objects_internal
ldr r1, [r5]
adds r1, r4
ldrh r0, [r1]
@@ -1655,7 +1655,7 @@ _0811F76E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_811F740
+ thumb_func_end party_menu_add_per_mon_objects
thumb_func_start sub_811F774
sub_811F774: @ 811F774
@@ -1676,7 +1676,7 @@ sub_811F774: @ 811F774
movs r1, 0xE
movs r2, 0x17
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _0811F808
.align 2, 0
_0811F79C: .4byte gUnknown_203B0A0
@@ -1759,7 +1759,7 @@ sub_811F818: @ 811F818
ldr r1, _0811F87C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0811F934
ldr r6, _0811F880 @ =gUnknown_203B0B4
@@ -1878,7 +1878,7 @@ _0811F926:
mov r1, r8
bl sub_81227B8
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0811F934:
add sp, 0x8
pop {r3}
@@ -1907,7 +1907,7 @@ _0811F956:
ldr r1, _0811F9D4 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0811F96C
movs r0, 0x2
@@ -1990,7 +1990,7 @@ sub_811F9DC: @ 811F9DC
movs r0, 0x1
movs r2, 0x17
movs r3, 0x10
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, _0811FA1C @ =gUnknown_8459FE0
str r6, [sp]
str r5, [sp, 0x4]
@@ -1998,9 +1998,9 @@ sub_811F9DC: @ 811F9DC
movs r0, 0x1
movs r2, 0x17
movs r3, 0x12
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -2036,7 +2036,7 @@ sub_811FA40: @ 811FA40
adds r4, r0, 0
adds r6, r1, 0
movs r0, 0x64
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
adds r1, r4, 0
movs r2, 0x64
@@ -2050,7 +2050,7 @@ sub_811FA40: @ 811FA40
movs r2, 0x64
bl memcpy
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
@@ -2070,7 +2070,7 @@ sub_811FA78: @ 811FA78
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0811FAAC @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2111,7 +2111,7 @@ _0811FAD6:
ldr r0, [r0, 0x4]
cmp r0, 0
beq _0811FAF4
- bl sub_8000544
+ bl SetMainCallback2
b _0811FAFA
.align 2, 0
_0811FAE8: .4byte gUnknown_2037AB8
@@ -2119,11 +2119,11 @@ _0811FAEC: .4byte gUnknown_203B0A0
_0811FAF0: .4byte gUnknown_203B09C
_0811FAF4:
ldr r0, [r4]
- bl sub_8000544
+ bl SetMainCallback2
_0811FAFA:
bl sub_811F070
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0811FB04:
pop {r4,r5}
pop {r0}
@@ -2424,7 +2424,7 @@ sub_811FD5C: @ 811FD5C
ldr r1, _0811FD78 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _0811FD7C
movs r0, 0x1
@@ -3035,7 +3035,7 @@ _081201C0:
bne _081201F0
ldr r0, _081201EC @ =gUnknown_20243B0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08120290
strb r6, [r4]
@@ -3061,7 +3061,7 @@ _081201F8:
ldr r0, _08120220 @ =gUnknown_2024478
_0812020C:
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08120290
strb r5, [r4]
@@ -3072,7 +3072,7 @@ _08120220: .4byte gUnknown_2024478
_08120224:
ldr r0, _08120234 @ =gUnknown_2024414
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08120290
movs r0, 0x4
@@ -3156,7 +3156,7 @@ _081202A6:
ldr r1, _081202D0 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _081202A6
adds r0, r4, 0
@@ -3172,19 +3172,19 @@ _081202D8:
bx r1
thumb_func_end sub_812029C
- thumb_func_start sub_81202E0
-sub_81202E0: @ 81202E0
+ thumb_func_start GetMonNickname
+GetMonNickname: @ 81202E0
push {r4,lr}
adds r4, r1, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
- bl sub_8008D28
+ bl StringGetEnd10
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_81202E0
+ thumb_func_end GetMonNickname
thumb_func_start sub_81202F8
sub_81202F8: @ 81202F8
@@ -3194,7 +3194,7 @@ sub_81202F8: @ 81202F8
bl sub_8121FC0
ldr r0, _08120320 @ =sub_8120328
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08120324 @ =gUnknown_3005090
@@ -3236,10 +3236,10 @@ sub_8120328: @ 8120328
movs r1, 0
bl sub_810F4D8
movs r0, 0x6
- bl sub_80040B8
+ bl ClearWindowTilemap
_0812035E:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08120364:
pop {r4,r5}
pop {r0}
@@ -3252,7 +3252,7 @@ _0812036C: .4byte gUnknown_3005090
sub_8120370: @ 8120370
push {lr}
ldr r0, _08120380 @ =sub_8120328
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3304,7 +3304,7 @@ sub_81203B8: @ 81203B8
movs r1, 0
bl sub_810F4D8
movs r0, 0x6
- bl sub_80040B8
+ bl ClearWindowTilemap
bl sub_80BF708
lsls r0, 24
lsrs r0, 24
@@ -3380,7 +3380,7 @@ _0812045C:
_08120468:
ldr r1, _0812049C @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r1, _081204A0 @ =gUnknown_2021CF0
adds r0, r4, 0
bl sub_8099E90
@@ -3392,7 +3392,7 @@ _08120468:
adds r1, r6, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4-r6}
pop {r0}
bx r0
@@ -3421,7 +3421,7 @@ sub_81204AC: @ 81204AC
bl sub_80A2294
ldr r1, _081204FC @ =gUnknown_2021CD0
adds r0, r6, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r1, _08120500 @ =gUnknown_2021CF0
adds r0, r4, 0
bl sub_8099E90
@@ -3433,7 +3433,7 @@ sub_81204AC: @ 81204AC
adds r1, r5, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4-r6}
pop {r0}
bx r0
@@ -3455,7 +3455,7 @@ sub_812050C: @ 812050C
lsls r5, 24
lsrs r5, 24
ldr r1, _08120548 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r1, _0812054C @ =gUnknown_2021CF0
adds r0, r4, 0
bl sub_8099E90
@@ -3467,7 +3467,7 @@ sub_812050C: @ 812050C
adds r1, r5, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4,r5}
pop {r0}
bx r0
@@ -3514,7 +3514,7 @@ sub_8120558: @ 8120558
adds r1, r6, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4-r6}
pop {r0}
bx r0
@@ -3571,7 +3571,7 @@ sub_8120610: @ 8120610
sub sp, 0x4
adds r4, r0, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r1, sp
@@ -3609,7 +3609,7 @@ sub_8120658: @ 8120658
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -3627,11 +3627,11 @@ _08120678:
_0812067E:
ldr r0, _08120698 @ =0x0000016d
_08120680:
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
_08120686:
ldr r0, _0812069C @ =gUnknown_2021CD0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081206A0 @ =gUnknown_2021D18
ldr r1, _081206A4 @ =gUnknown_8416D78
bl sub_8008FCC
@@ -3721,7 +3721,7 @@ _08120724:
bl sub_8008E78
_08120740:
mov r0, r8
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
_08120746:
pop {r3}
mov r8, r3
@@ -3773,11 +3773,11 @@ sub_8120760: @ 8120760
adds r4, r0
adds r0, r6, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r0, r6, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x2]
lsls r5, 24
asrs r5, 24
@@ -3791,7 +3791,7 @@ sub_8120760: @ 8120760
ldr r1, _081207EC @ =sub_81206A8
mov r0, r8
adds r2, r7, 0
- bl sub_80775E8
+ bl SetTaskFuncWithFollowupFunc
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -3854,7 +3854,7 @@ _08120846:
_0812084A:
ldr r1, _08120858 @ =sub_81206A8
adds r0, r4, 0
- bl sub_80775E8
+ bl SetTaskFuncWithFollowupFunc
_08120852:
pop {r4,r5}
pop {r0}
@@ -3863,8 +3863,8 @@ _08120852:
_08120858: .4byte sub_81206A8
thumb_func_end sub_81207F0
- thumb_func_start sub_812085C
-sub_812085C: @ 812085C
+ thumb_func_start pokemon_ailments_get_primary
+pokemon_ailments_get_primary: @ 812085C
push {lr}
adds r1, r0, 0
movs r0, 0x88
@@ -3906,14 +3906,14 @@ _0812089C:
_0812089E:
pop {r1}
bx r1
- thumb_func_end sub_812085C
+ thumb_func_end pokemon_ailments_get_primary
thumb_func_start sub_81208A4
sub_81208A4: @ 81208A4
push {r4,lr}
adds r4, r0, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _081208B6
movs r0, 0x7
@@ -3921,8 +3921,8 @@ sub_81208A4: @ 81208A4
_081208B6:
adds r0, r4, 0
movs r1, 0x37
- bl sub_803FBE8
- bl sub_812085C
+ bl GetMonData
+ bl pokemon_ailments_get_primary
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4027,12 +4027,12 @@ sub_812097C: @ 812097C
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _081209A2
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8149A00
@@ -4053,12 +4053,12 @@ sub_81209AC: @ 81209AC
push {r4,lr}
adds r4, r0, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _081209CA
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x55
bne _081209CA
movs r0, 0x1
@@ -4121,7 +4121,7 @@ _08120A24:
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08120A50 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4149,7 +4149,7 @@ sub_8120A58: @ 8120A58
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08120A88 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4256,7 +4256,7 @@ sub_8120B20: @ 8120B20
lsrs r6, r2, 24
mov r8, r6
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08120B42
movs r0, 0x3
@@ -4275,12 +4275,12 @@ _08120B42:
cmp r0, 0
beq _08120B7C
adds r0, r7, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
b _08120B86
_08120B64:
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -4298,7 +4298,7 @@ _08120B86:
lsls r0, 16
lsrs r1, r0, 16
adds r0, r5, 0
- bl sub_8125AC0
+ bl pokemon_has_move
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4448,7 +4448,7 @@ sub_8120C6C: @ 8120C6C
movs r1, 0x4
movs r2, 0
movs r3, 0x6
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08120CA0 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4561,7 +4561,7 @@ sub_8120D40: @ 8120D40
movs r1, 0x4
movs r2, 0x6
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08120D74 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4677,7 +4677,7 @@ sub_8120E1C: @ 8120E1C
movs r1, 0x4
movs r2, 0x6
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08120E50 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -4880,7 +4880,7 @@ sub_8120FB0: @ 8120FB0
bl sub_804C230
bl sub_815AC20
ldr r0, _08120FC8 @ =sub_815ABFC
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -5007,7 +5007,7 @@ _081210A6:
_081210AC:
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -5022,15 +5022,15 @@ _081210AC:
movs r2, 0xF0
bl sub_814FF2C
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xC0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -5061,7 +5061,7 @@ _0812110E:
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _0812117C @ =gUnknown_84169D5
movs r0, 0
adds r1, r5, 0
@@ -5086,7 +5086,7 @@ _0812110E:
movs r3, 0x1
bl sub_812E5A4
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x2
bl sub_8003F20
@@ -5111,7 +5111,7 @@ _08121188:
_08121194:
adds r0, r6, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _081211E4 @ =gUnknown_203B0A0
ldrb r1, [r0, 0x8]
movs r0, 0xF
@@ -5175,12 +5175,12 @@ _081211F0:
bl sub_812E51C
_08121224:
adds r0, r6, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r6, 0
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_08121238:
add sp, 0x14
pop {r4-r6}
@@ -5237,7 +5237,7 @@ sub_812125C: @ 812125C
mov r0, r10
muls r0, r6
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
mov r9, r0
cmp r0, 0
beq _0812132A
@@ -5306,9 +5306,9 @@ _08121308:
str r0, [sp, 0x4]
ldr r0, [sp, 0x8]
mov r1, r9
- bl sub_80041B8
+ bl BlitBitmapToWindow
mov r0, r9
- bl sub_8002BC4
+ bl Free
_0812132A:
add sp, 0x2C
pop {r3-r5}
@@ -5483,19 +5483,19 @@ _0812145C:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _0812149C @ =gUnknown_845A2E3
b _0812163E
.align 2, 0
@@ -5514,19 +5514,19 @@ _081214A0:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _081214E8 @ =gUnknown_845A2E3
b _0812163E
.align 2, 0
@@ -5554,19 +5554,19 @@ _08121504:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _08121544 @ =gUnknown_845A2E3
b _0812163E
.align 2, 0
@@ -5594,19 +5594,19 @@ _08121560:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _081215A0 @ =gUnknown_845A2DD
b _0812163E
.align 2, 0
@@ -5634,19 +5634,19 @@ _081215BC:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _081215FC @ =gUnknown_845A2DA
b _0812163E
.align 2, 0
@@ -5666,19 +5666,19 @@ _0812160A:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _0812167C @ =gUnknown_845A2E0
_0812163E:
ldrb r0, [r5]
@@ -5687,19 +5687,19 @@ _0812163E:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _081216EC
.align 2, 0
_08121674: .4byte gUnknown_845A2CB
@@ -5714,19 +5714,19 @@ _08121684:
ldrb r1, [r4]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _081216FC @ =gUnknown_845A2D7
ldrb r0, [r5]
bl sub_8121248
@@ -5734,19 +5734,19 @@ _08121684:
ldrb r1, [r4]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x2]
bl sub_8121248
ldrb r1, [r4, 0x2]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
_081216EC:
pop {r4-r7}
pop {r0}
@@ -5796,7 +5796,7 @@ sub_8121738: @ 8121738
lsls r2, 24
lsrs r4, r2, 24
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08121788
cmp r4, 0x1
@@ -5819,7 +5819,7 @@ sub_8121738: @ 8121738
_08121772:
adds r0, r7, 0
add r1, sp, 0x8
- bl sub_81202E0
+ bl GetMonNickname
ldrb r0, [r6, 0x8]
ldr r3, [r6]
adds r3, 0x4
@@ -5845,7 +5845,7 @@ sub_8121790: @ 8121790
lsrs r4, r2, 24
mov r8, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _081217FC
adds r0, r6, 0
@@ -5881,7 +5881,7 @@ _081217E4:
beq _081217FC
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
adds r1, r7, 0
@@ -5911,10 +5911,10 @@ sub_8121808: @ 8121808
ldr r4, _0812184C @ =gUnknown_2021CD0
ldr r1, _08121850 @ =gUnknown_8416223
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8008DA4
+ bl StringAppend
ldrb r0, [r6, 0x8]
ldr r3, [r6]
adds r3, 0x8
@@ -5959,15 +5959,15 @@ sub_8121854: @ 8121854
_08121886:
adds r0, r6, 0
add r1, sp, 0x8
- bl sub_81202E0
+ bl GetMonNickname
adds r0, r6, 0
- bl sub_803F720
+ bl GetMonGender
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r6, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -6013,7 +6013,7 @@ _081218EC:
ldr r0, _0812190C @ =gUnknown_8245EE0
adds r1, r0
mov r0, r9
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
beq _08121982
_08121900:
@@ -6033,13 +6033,13 @@ _08121910:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r7, 0x8]
ldr r1, _0812194C @ =gUnknown_841621F
ldr r3, [r7]
@@ -6059,13 +6059,13 @@ _08121950:
ldrb r1, [r4]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r6
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r7, 0x8]
ldr r1, _08121998 @ =gUnknown_8416221
ldr r3, [r7]
@@ -6097,7 +6097,7 @@ sub_812199C: @ 812199C
lsrs r4, r2, 24
mov r8, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _081219F6
cmp r4, 0
@@ -6124,7 +6124,7 @@ _081219DE:
beq _081219F6
adds r0, r7, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -6180,7 +6180,7 @@ sub_8121A3C: @ 8121A3C
lsrs r4, r2, 24
mov r8, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08121A98
cmp r4, 0
@@ -6208,7 +6208,7 @@ _08121A80:
beq _08121A98
adds r0, r7, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r6, 0
@@ -6238,10 +6238,10 @@ sub_8121AA4: @ 8121AA4
ldr r4, _08121AE8 @ =gUnknown_2021CD0
ldr r1, _08121AEC @ =gUnknown_841620C
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8008DA4
+ bl StringAppend
ldrb r0, [r6, 0x8]
ldr r3, [r6]
adds r3, 0x14
@@ -6263,18 +6263,18 @@ sub_8121AF0: @ 8121AF0
adds r5, r0, 0
adds r6, r1, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08121B24
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -6312,7 +6312,7 @@ sub_8121B2C: @ 8121B2C
mov r2, r9
lsls r1, r2, 16
asrs r1, 16
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -6334,13 +6334,13 @@ _08121B7A:
ldrb r1, [r4]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _08121BCC
.align 2, 0
_08121BA0: .4byte gUnknown_845A2BE
@@ -6353,13 +6353,13 @@ _08121BA8:
ldrb r1, [r4]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldrb r0, [r5, 0x1]
bl sub_8121248
ldrb r1, [r4, 0x1]
adds r1, r7
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
_08121BCC:
mov r1, r8
lsls r0, r1, 16
@@ -6369,7 +6369,7 @@ _08121BCC:
asrs r1, 16
ldr r2, [r6]
ldrb r2, [r2, 0x1A]
- bl sub_804A5E8
+ bl GetScaledHPFraction
lsls r0, 24
lsrs r5, r0, 24
ldrb r0, [r6, 0x8]
@@ -6381,7 +6381,7 @@ _08121BCC:
str r5, [sp]
movs r7, 0x1
str r7, [sp, 0x4]
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r6, 0x8]
ldrb r1, [r4]
ldr r3, [r6]
@@ -6391,7 +6391,7 @@ _08121BCC:
str r5, [sp]
movs r4, 0x2
str r4, [sp, 0x4]
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r1, [r6]
ldrb r0, [r1, 0x1A]
cmp r5, r0
@@ -6407,7 +6407,7 @@ _08121BCC:
str r1, [sp]
str r7, [sp, 0x4]
movs r1, 0xD
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r6, 0x8]
ldr r1, [r6]
ldrb r2, [r1, 0x18]
@@ -6421,7 +6421,7 @@ _08121BCC:
str r1, [sp]
str r4, [sp, 0x4]
movs r1, 0x2
- bl sub_8004378
+ bl FillWindowPixelRect
_08121C50:
ldrb r0, [r6, 0x8]
movs r1, 0x2
@@ -6513,7 +6513,7 @@ sub_8121CE4: @ 8121CE4
movs r0, 0xFF
strb r0, [r4]
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_08121D04:
pop {r4}
pop {r0}
@@ -6608,7 +6608,7 @@ _08121DB0:
movs r1, 0
movs r2, 0x58
movs r3, 0xF
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r4, _08121DF0 @ =gUnknown_2021D18
ldr r1, _08121DF4 @ =gUnknown_845A2E8
lsls r0, r6, 2
@@ -6627,7 +6627,7 @@ _08121DB0:
movs r3, 0
bl sub_8002C48
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_08121DE8:
add sp, 0xC
pop {r4-r6}
@@ -6661,17 +6661,17 @@ _08121E16:
adds r4, r7, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08121E46
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08121E40
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08121E46
_08121E40:
@@ -6770,7 +6770,7 @@ _08121ED2:
movs r1, 0
movs r2, 0x4F
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
cmp r4, 0x3
bne _08121F00
ldr r0, [r6]
@@ -6856,7 +6856,7 @@ _08121F7A:
movs r3, 0x2
bl sub_810F774
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, [r4]
_08121FA2:
ldrb r0, [r0, 0xC]
@@ -6882,7 +6882,7 @@ sub_8121FC0: @ 8121FC0
movs r1, 0
movs r2, 0x4F
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r2, _08122008 @ =gUnknown_3003E50
ldrb r0, [r2]
movs r1, 0x1
@@ -6947,7 +6947,7 @@ sub_8122034: @ 8122034
movs r1, 0
movs r2, 0x4F
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r0, [r4]
ldrb r0, [r0, 0xC]
pop {r4}
@@ -6964,7 +6964,7 @@ sub_8122064: @ 8122064
ldr r4, _08122080 @ =gUnknown_203B09C
ldr r0, [r4]
ldrb r0, [r0, 0xC]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r4]
adds r0, 0xC
bl sub_8121CE4
@@ -7051,14 +7051,14 @@ sub_8122110: @ 8122110
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0
bl sub_810F260
adds r0, r4, 0
bl sub_8003E3C
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
@@ -7078,13 +7078,13 @@ sub_8122138: @ 8122138
ldrb r0, [r4, 0xE]
cmp r0, 0xFF
beq _081221C0
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0xE]
bl sub_8003E3C
movs r0, 0xFF
strb r0, [r4, 0xE]
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
b _081221C0
.align 2, 0
_08122168: .4byte gUnknown_203B09C
@@ -7123,9 +7123,9 @@ _0812217A:
movs r3, 0x6
bl sub_812E5A4
ldrb r0, [r4, 0xE]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_081221C0:
add sp, 0x14
pop {r4,r5}
@@ -7137,8 +7137,8 @@ _081221CC: .4byte gUnknown_845A00B
_081221D0: .4byte gUnknown_845A37C
thumb_func_end sub_8122138
- thumb_func_start sub_81221D4
-sub_81221D4: @ 81221D4
+ thumb_func_start party_menu_icon_anim
+party_menu_icon_anim: @ 81221D4
push {r4-r7,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -7168,19 +7168,19 @@ sub_81221D4: @ 81221D4
_0812220A:
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r6, [sp]
adds r0, r4, 0
adds r2, r7, 0
movs r3, 0x1
- bl sub_812224C
+ bl party_menu_link_mon_icon_anim
ldrb r0, [r7, 0x9]
adds r1, r5, 0
bl sub_8122358
@@ -7192,10 +7192,10 @@ _0812220A:
_08122240: .4byte gUnknown_30030F0
_08122244: .4byte 0x00000439
_08122248: .4byte gUnknown_845A59C
- thumb_func_end sub_81221D4
+ thumb_func_end party_menu_icon_anim
- thumb_func_start sub_812224C
-sub_812224C: @ 812224C
+ thumb_func_start party_menu_link_mon_icon_anim
+party_menu_link_mon_icon_anim: @ 812224C
push {r4-r7,lr}
sub sp, 0xC
adds r6, r1, 0
@@ -7242,7 +7242,7 @@ _0812229A:
.align 2, 0
_081222A4: .4byte sub_809718C
_081222A8: .4byte gUnknown_202063C
- thumb_func_end sub_812224C
+ thumb_func_end party_menu_link_mon_icon_anim
thumb_func_start sub_81222AC
sub_81222AC: @ 81222AC
@@ -7255,7 +7255,7 @@ sub_81222AC: @ 81222AC
asrs r2, 16
adds r0, r1, 0
adds r1, r2, 0
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -7338,13 +7338,13 @@ sub_8122358: @ 8122358
lsrs r5, 24
adds r0, r6, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r6, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -7450,13 +7450,13 @@ sub_8122428: @ 8122428
bx r0
thumb_func_end sub_8122428
- thumb_func_start sub_8122434
-sub_8122434: @ 8122434
+ thumb_func_start party_menu_held_item_object
+party_menu_held_item_object: @ 8122434
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0812245C
ldr r0, _08122464 @ =gUnknown_845A43C
@@ -7464,7 +7464,7 @@ sub_8122434: @ 8122434
ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xA]
adds r0, r5, 0
adds r1, r4, 0
@@ -7475,10 +7475,10 @@ _0812245C:
bx r0
.align 2, 0
_08122464: .4byte gUnknown_845A43C
- thumb_func_end sub_8122434
+ thumb_func_end party_menu_held_item_object
- thumb_func_start sub_8122468
-sub_8122468: @ 8122468
+ thumb_func_start party_menu_link_mon_held_item_object
+party_menu_link_mon_held_item_object: @ 8122468
push {r4,r5,lr}
adds r4, r2, 0
lsls r0, 16
@@ -7491,7 +7491,7 @@ sub_8122468: @ 8122468
ldrb r1, [r2, 0x2]
ldrb r2, [r2, 0x3]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xA]
ldr r2, _081224B0 @ =gUnknown_202063C
ldrb r0, [r4, 0xA]
@@ -7514,14 +7514,14 @@ _081224A4:
.align 2, 0
_081224AC: .4byte gUnknown_845A43C
_081224B0: .4byte gUnknown_202063C
- thumb_func_end sub_8122468
+ thumb_func_end party_menu_link_mon_held_item_object
thumb_func_start sub_81224B4
sub_81224B4: @ 81224B4
push {r4,lr}
adds r4, r1, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -7564,7 +7564,7 @@ _081224F8:
ldr r1, _08122518 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _0812252E
.align 2, 0
_08122518: .4byte gUnknown_202063C
@@ -7576,7 +7576,7 @@ _0812251C:
ldr r1, _0812254C @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0812252E:
ldr r2, _0812254C @ =gUnknown_202063C
ldrb r1, [r4, 0xA]
@@ -7602,9 +7602,9 @@ _0812254C: .4byte gUnknown_202063C
sub_8122550: @ 8122550
push {lr}
ldr r0, _08122564 @ =gUnknown_845A42C
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08122568 @ =gUnknown_845A434
- bl sub_8008928
+ bl LoadSpritePalette
pop {r0}
bx r0
.align 2, 0
@@ -7635,7 +7635,7 @@ _08122588:
ldr r1, _081225C4 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -7668,7 +7668,7 @@ _081225CC:
ldr r1, _0812260C @ =gUnknown_202402C
adds r0, r1
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -7726,7 +7726,7 @@ sub_8122610: @ 8122610
lsrs r3, 24
movs r1, 0xFA
movs r2, 0xAA
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -7746,7 +7746,7 @@ sub_8122610: @ 8122610
strh r6, [r5, 0x3C]
adds r0, r5, 0
mov r1, r9
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r4]
adds r0, r5, 0
bl _call_via_r1
@@ -7811,12 +7811,12 @@ _081226E6:
bx r0
thumb_func_end sub_8122694
- thumb_func_start sub_81226EC
-sub_81226EC: @ 81226EC
+ thumb_func_start party_menu_pokeball_object
+party_menu_pokeball_object: @ 81226EC
push {r4,lr}
adds r4, r1, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0812270A
ldr r0, _08122710 @ =gUnknown_845A484
@@ -7824,7 +7824,7 @@ sub_81226EC: @ 81226EC
ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7]
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xB]
_0812270A:
pop {r4}
@@ -7832,10 +7832,10 @@ _0812270A:
bx r0
.align 2, 0
_08122710: .4byte gUnknown_845A484
- thumb_func_end sub_81226EC
+ thumb_func_end party_menu_pokeball_object
- thumb_func_start sub_8122714
-sub_8122714: @ 8122714
+ thumb_func_start party_menu_link_mon_pokeball_object
+party_menu_link_mon_pokeball_object: @ 8122714
push {r4,lr}
adds r4, r1, 0
lsls r0, 16
@@ -7846,7 +7846,7 @@ sub_8122714: @ 8122714
ldrb r1, [r2, 0x6]
ldrb r2, [r2, 0x7]
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xB]
ldr r2, _08122750 @ =gUnknown_202063C
ldrb r0, [r4, 0xB]
@@ -7866,7 +7866,7 @@ _08122744:
.align 2, 0
_0812274C: .4byte gUnknown_845A484
_08122750: .4byte gUnknown_202063C
- thumb_func_end sub_8122714
+ thumb_func_end party_menu_link_mon_pokeball_object
thumb_func_start sub_8122754
sub_8122754: @ 8122754
@@ -7880,7 +7880,7 @@ sub_8122754: @ 8122754
ldr r0, _0812278C @ =gUnknown_845A484
adds r1, r3, 0
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _08122790 @ =gUnknown_202063C
@@ -7914,7 +7914,7 @@ sub_8122794: @ 8122794
ldr r0, _081227B4 @ =gUnknown_845A4F4
adds r1, r3, 0
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -7936,7 +7936,7 @@ sub_81227B8: @ 81227B8
lsls r0, 2
ldr r2, _081227D8 @ =gUnknown_202063C
adds r0, r2
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -7964,14 +7964,14 @@ sub_81227DC: @ 81227DC
add r4, r8
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
lsls r5, r7, 4
adds r5, r7
lsls r5, 2
add r5, r8
adds r0, r5, 0
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
strh r6, [r4, 0x26]
strh r6, [r5, 0x26]
b _0812284C
@@ -7986,14 +7986,14 @@ _08122820:
add r5, r8
adds r0, r5, 0
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
lsls r4, r7, 4
adds r4, r7
lsls r4, 2
add r4, r8
adds r0, r4, 0
movs r1, 0x5
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _0812285C @ =0x0000fffc
strh r0, [r5, 0x26]
movs r0, 0x4
@@ -8013,11 +8013,11 @@ _0812285C: .4byte 0x0000fffc
sub_8122860: @ 8122860
push {lr}
ldr r0, _08122878 @ =gUnknown_845A474
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _0812287C @ =gUnknown_845A4EC
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _08122880 @ =gUnknown_845A47C
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
pop {r0}
bx r0
.align 2, 0
@@ -8026,13 +8026,13 @@ _0812287C: .4byte gUnknown_845A4EC
_08122880: .4byte gUnknown_845A47C
thumb_func_end sub_8122860
- thumb_func_start sub_8122884
-sub_8122884: @ 8122884
+ thumb_func_start party_menu_status_condition_object
+party_menu_status_condition_object: @ 8122884
push {r4,r5,lr}
adds r5, r0, 0
adds r4, r1, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _081228AC
ldr r0, _081228B4 @ =gUnknown_845A584
@@ -8040,21 +8040,21 @@ sub_8122884: @ 8122884
ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xC]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8122904
+ bl party_menu_get_status_condition_and_update_object
_081228AC:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_081228B4: .4byte gUnknown_845A584
- thumb_func_end sub_8122884
+ thumb_func_end party_menu_status_condition_object
- thumb_func_start sub_81228B8
-sub_81228B8: @ 81228B8
+ thumb_func_start party_menu_link_mon_status_condition_object
+party_menu_link_mon_status_condition_object: @ 81228B8
push {r4,r5,lr}
adds r4, r2, 0
lsls r0, 16
@@ -8067,11 +8067,11 @@ sub_81228B8: @ 81228B8
ldrb r1, [r2, 0x4]
ldrb r2, [r2, 0x5]
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xC]
adds r0, r5, 0
adds r1, r4, 0
- bl sub_812291C
+ bl party_menu_update_status_condition_object
ldr r2, _08122900 @ =gUnknown_202063C
ldrb r0, [r4, 0xC]
lsls r1, r0, 4
@@ -8090,24 +8090,24 @@ _081228F4:
.align 2, 0
_081228FC: .4byte gUnknown_845A584
_08122900: .4byte gUnknown_202063C
- thumb_func_end sub_81228B8
+ thumb_func_end party_menu_link_mon_status_condition_object
- thumb_func_start sub_8122904
-sub_8122904: @ 8122904
+ thumb_func_start party_menu_get_status_condition_and_update_object
+party_menu_get_status_condition_and_update_object: @ 8122904
push {r4,lr}
adds r4, r1, 0
bl sub_81208A4
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
- bl sub_812291C
+ bl party_menu_update_status_condition_object
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8122904
+ thumb_func_end party_menu_get_status_condition_and_update_object
- thumb_func_start sub_812291C
-sub_812291C: @ 812291C
+ thumb_func_start party_menu_update_status_condition_object
+party_menu_update_status_condition_object: @ 812291C
push {r4,r5,lr}
adds r5, r1, 0
lsls r0, 24
@@ -8140,7 +8140,7 @@ _08122948:
subs r1, r2, 0x1
lsls r1, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
ldrb r1, [r5, 0xC]
lsls r0, r1, 4
adds r0, r1
@@ -8158,15 +8158,15 @@ _08122972:
bx r0
.align 2, 0
_0812297C: .4byte gUnknown_202063C
- thumb_func_end sub_812291C
+ thumb_func_end party_menu_update_status_condition_object
thumb_func_start sub_8122980
sub_8122980: @ 8122980
push {lr}
ldr r0, _08122994 @ =gUnknown_845A574
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _08122998 @ =gUnknown_845A57C
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
pop {r0}
bx r0
.align 2, 0
@@ -8246,7 +8246,7 @@ sub_81229FC: @ 81229FC
adds r0, 0xF
adds r1, 0x17
movs r2, 0
- bl sub_806FEC8
+ bl AppendToList
movs r7, 0
ldr r0, _08122A7C @ =gUnknown_845A76E
ldrh r0, [r0]
@@ -8270,7 +8270,7 @@ _08122A48:
adds r0, r1, r6
adds r1, r7, 0
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r4, 1
adds r1, r5
ldrh r1, [r1]
@@ -8285,7 +8285,7 @@ _08122A48:
adds r2, 0x12
lsls r2, 24
lsrs r2, 24
- bl sub_806FEC8
+ bl AppendToList
b _08122A90
.align 2, 0
_08122A78: .4byte gUnknown_203B09C
@@ -8307,7 +8307,7 @@ _08122A90:
bls _08122A34
ldr r0, [sp, 0x4]
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08122AB6
ldr r0, _08122AE8 @ =gUnknown_203B09C
@@ -8316,7 +8316,7 @@ _08122A90:
adds r0, 0xF
adds r1, 0x17
movs r2, 0x1
- bl sub_806FEC8
+ bl AppendToList
_08122AB6:
movs r0, 0x64
mov r1, r10
@@ -8324,7 +8324,7 @@ _08122AB6:
adds r0, r1, 0
add r0, r9
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80980F8
@@ -8337,7 +8337,7 @@ _08122AB6:
adds r0, 0xF
adds r1, 0x17
movs r2, 0x6
- bl sub_806FEC8
+ bl AppendToList
b _08122AFC
.align 2, 0
_08122AE8: .4byte gUnknown_203B09C
@@ -8348,7 +8348,7 @@ _08122AEC:
adds r0, 0xF
adds r1, 0x17
movs r2, 0x3
- bl sub_806FEC8
+ bl AppendToList
_08122AFC:
ldr r0, _08122B1C @ =gUnknown_203B09C
ldr r1, [r0]
@@ -8356,7 +8356,7 @@ _08122AFC:
adds r0, 0xF
adds r1, 0x17
movs r2, 0x2
- bl sub_806FEC8
+ bl AppendToList
add sp, 0x8
pop {r3-r5}
mov r8, r3
@@ -8404,7 +8404,7 @@ _08122B44:
_08122B70:
adds r0, r2, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
negs r1, r0
orrs r1, r0
lsrs r1, 31
@@ -8436,7 +8436,7 @@ _08122BA8:
_08122BAC:
adds r0, r2, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x6
cmp r0, 0
beq _08122BCC
@@ -8472,7 +8472,7 @@ sub_8122BD4: @ 8122BD4
adds r4, r6
ldr r1, _08122C28 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08122C2C @ =gUnknown_203B09C
ldr r0, [r0]
adds r0, 0xD
@@ -8550,14 +8550,14 @@ sub_8122C5C: @ 8122C5C
ldrb r0, [r0, 0x17]
cmp r0, 0x3
bhi _08122CA0
- bl sub_810FAF0
+ bl ProcessMenuInputNoWrapAround_other
b _08122CA4
.align 2, 0
_08122C94: .4byte gUnknown_2037AB8
_08122C98: .4byte gUnknown_3005098
_08122C9C: .4byte gUnknown_203B09C
_08122CA0:
- bl sub_810FA84
+ bl ProcessMenuInput_other
_08122CA4:
lsls r0, 24
lsrs r5, r0, 24
@@ -8669,7 +8669,7 @@ sub_8122D78: @ 8122D78
ands r0, r1
cmp r0, 0x1
bne _08122D8C
- bl sub_8128074
+ bl pokemon_change_order
_08122D8C:
ldr r0, _08122DB0 @ =gUnknown_2024284
ldrb r1, [r4, 0x9]
@@ -8895,7 +8895,7 @@ _08122F56:
ldrsh r0, [r6, r2]
lsls r0, 1
muls r0, r1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
ldr r5, _08122FF0 @ =gUnknown_203B0CC
movs r0, 0xC
@@ -8904,7 +8904,7 @@ _08122F56:
ldrsh r0, [r6, r2]
lsls r0, 1
muls r0, r1
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
ldr r1, [r4]
ldrb r2, [r6]
@@ -8926,10 +8926,10 @@ _08122F56:
bl sub_80F6B94
add r0, sp, 0x8
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
add r0, sp, 0x8
ldrb r0, [r0, 0x1]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r4, _08122FF4 @ =gUnknown_203B0A0
movs r0, 0x9
strb r0, [r4, 0xB]
@@ -9076,7 +9076,7 @@ sub_8123068: @ 8123068
movs r0, 0
movs r1, 0
mov r3, r9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, [sp, 0x30]
lsls r0, r1, 16
asrs r0, 16
@@ -9112,7 +9112,7 @@ sub_8123068: @ 8123068
str r0, [sp, 0x20]
ldr r1, [sp, 0x28]
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
_08123122:
add sp, 0x34
pop {r3-r5}
@@ -9276,7 +9276,7 @@ _08123228:
bl sub_8123068
_08123256:
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -9352,14 +9352,14 @@ sub_8123270: @ 8123270
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0xA
ldrsb r0, [r4, r0]
ldr r1, [r5]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _0812337C @ =gUnknown_203B0C8
ldr r1, [r0]
ldrb r2, [r6]
@@ -9386,14 +9386,14 @@ sub_8123270: @ 8123270
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0xA
ldrsb r0, [r4, r0]
ldr r1, [r5]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_80040B8
+ bl ClearWindowTilemap
mov r0, r8
subs r0, 0x8
adds r0, r7, r0
@@ -9445,16 +9445,16 @@ sub_8123388: @ 8123388
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0xA
ldrsb r0, [r5, r0]
ldr r1, [r4]
lsls r0, 4
adds r0, r1
ldrb r0, [r0, 0x8]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r6, 0
bl sub_81235E8
b _08123418
@@ -9620,7 +9620,7 @@ sub_81234EC: @ 81234EC
muls r5, r1
adds r5, r0
movs r0, 0x64
- bl sub_8002B9C
+ bl Alloc
adds r6, r0, 0
adds r1, r4, 0
movs r2, 0x64
@@ -9634,7 +9634,7 @@ sub_81234EC: @ 81234EC
movs r2, 0x64
bl memcpy
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
ldr r0, [sp]
adds r0, 0xB
ldr r1, [sp, 0x4]
@@ -9671,7 +9671,7 @@ sub_812358C: @ 812358C
mov r6, r8
push {r6}
movs r0, 0x4
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
ldr r0, _081235E0 @ =gUnknown_203B0A0
mov r8, r0
@@ -9683,7 +9683,7 @@ sub_812358C: @ 812358C
ldr r5, _081235E4 @ =gUnknown_2024284
adds r0, r5
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
mov r1, r8
movs r0, 0xA
@@ -9691,13 +9691,13 @@ sub_812358C: @ 812358C
muls r0, r6
adds r0, r5
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4, 0x2]
movs r0, 0x3
adds r1, r4, 0
bl sub_8113550
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -9862,18 +9862,18 @@ _0812372C: .4byte sub_8123730
thumb_func_start sub_8123730
sub_8123730: @ 8123730
push {lr}
- ldr r2, _08123740 @ =sub_8123744
+ ldr r2, _08123740 @ =c2_8123744
movs r0, 0x1
movs r1, 0x3
bl sub_8107DB4
pop {r0}
bx r0
.align 2, 0
-_08123740: .4byte sub_8123744
+_08123740: .4byte c2_8123744
thumb_func_end sub_8123730
- thumb_func_start sub_8123744
-sub_8123744: @ 8123744
+ thumb_func_start c2_8123744
+c2_8123744: @ 8123744
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -9910,7 +9910,7 @@ _08123778:
ldr r7, _081237C4 @ =gUnknown_2024284
adds r0, r7
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
lsls r0, 16
cmp r0, 0
@@ -9977,7 +9977,7 @@ _08123814:
bx r0
.align 2, 0
_08123820: .4byte sub_8123824
- thumb_func_end sub_8123744
+ thumb_func_end c2_8123744
thumb_func_start sub_8123824
sub_8123824: @ 8123824
@@ -10274,7 +10274,7 @@ sub_8123A80: @ 8123A80
ldr r1, _08123ABC @ =gUnknown_2024284
adds r0, r1
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08123AC0 @ =gUnknown_3005008
@@ -10313,7 +10313,7 @@ sub_8123ACC: @ 8123ACC
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -10322,7 +10322,7 @@ sub_8123ACC: @ 8123ACC
cmp r7, 0
bne _08123B4C
adds r0, r5, 0
- bl sub_8097FB8
+ bl TakeMailFromMon
ldr r4, _08123B44 @ =gUnknown_203B0D8
adds r0, r5, 0
movs r1, 0xC
@@ -10485,7 +10485,7 @@ sub_8123C38: @ 8123C38
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
movs r0, 0x5
@@ -10517,7 +10517,7 @@ _08123C98: .4byte gUnknown_203B09C
_08123C9C:
ldr r1, _08123CB4 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r4, _08123CB8 @ =gUnknown_2021D18
ldr r1, _08123CBC @ =gUnknown_8416C8F
adds r0, r4, 0
@@ -10537,7 +10537,7 @@ _08123CC8:
bl sub_81202F8
_08123CCE:
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08123CEC @ =gUnknown_3005090
lsls r1, r7, 2
adds r1, r7
@@ -10631,7 +10631,7 @@ sub_8123D84: @ 8123D84
ldr r1, _08123DBC @ =gUnknown_2024284
adds r0, r1
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _08123DC0 @ =gUnknown_3005008
lsls r1, r0, 3
adds r1, r0
@@ -10685,8 +10685,8 @@ _08123E04: .4byte gUnknown_203B0A0
_08123E08: .4byte sub_8122C30
thumb_func_end sub_8123DCC
- thumb_func_start sub_8123E0C
-sub_8123E0C: @ 8123E0C
+ thumb_func_start brm_take_2
+brm_take_2: @ 8123E0C
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
@@ -10718,7 +10718,7 @@ _08123E48: .4byte gUnknown_203B09C
_08123E4C: .4byte gUnknown_8416B64
_08123E50: .4byte gUnknown_3005090
_08123E54: .4byte sub_8123E58
- thumb_func_end sub_8123E0C
+ thumb_func_end brm_take_2
thumb_func_start sub_8123E58
sub_8123E58: @ 8123E58
@@ -10898,7 +10898,7 @@ _08123FAA:
ldr r6, _08124000 @ =gUnknown_2024284
adds r0, r6
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
@@ -10913,7 +10913,7 @@ _08123FAA:
ldrsb r0, [r1, r0]
muls r0, r7
adds r0, r6
- bl sub_8097FB8
+ bl TakeMailFromMon
ldr r0, _08124004 @ =gUnknown_8416CC7
movs r1, 0
bl sub_81202F8
@@ -11374,7 +11374,7 @@ sub_8124384: @ 8124384
ldr r4, _08124414 @ =gUnknown_2024284
adds r0, r4
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
@@ -11386,7 +11386,7 @@ sub_8124384: @ 8124384
adds r0, r1, 0
adds r0, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -11398,7 +11398,7 @@ sub_8124384: @ 8124384
adds r0, r1, 0
adds r0, r4
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -11445,7 +11445,7 @@ _08124434:
ldr r4, _08124478 @ =gUnknown_2021D18
ldr r1, _08124484 @ =gUnknown_84169D9
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r4, 0
movs r1, 0x1
bl sub_81202F8
@@ -11491,7 +11491,7 @@ sub_8124490: @ 8124490
ldr r4, _0812455C @ =gUnknown_2024284
adds r0, r4
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
mov r1, r9
lsls r1, 16
@@ -11503,7 +11503,7 @@ sub_8124490: @ 8124490
muls r0, r6
adds r0, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -11513,7 +11513,7 @@ sub_8124490: @ 8124490
muls r0, r6
adds r0, r4
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -11551,7 +11551,7 @@ sub_8124490: @ 8124490
bl sub_8121CE4
ldr r1, _08124578 @ =gUnknown_84169D9
adds r0, r5, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r5, 0
movs r1, 0x1
bl sub_81202F8
@@ -11727,7 +11727,7 @@ _081246B4:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r1, r0, 0
ldr r0, _081246E4 @ =gUnknown_2021CD0
ldrb r1, [r1, 0x14]
@@ -11756,7 +11756,7 @@ _081246F0:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r1, r0, 0
ldr r0, _0812473C @ =gUnknown_2021CD0
ldrb r1, [r1, 0x14]
@@ -11790,7 +11790,7 @@ _08124754: .4byte gUnknown_203B0A0
_08124758: .4byte sub_80C4EF8
_0812475C:
ldr r1, _08124780 @ =gUnknown_203B0A0
- ldr r0, _08124784 @ =sub_80567DC
+ ldr r0, _08124784 @ =c2_exit_to_overworld_2_switch
str r0, [r1]
bl sub_811FB0C
lsls r0, 24
@@ -11807,7 +11807,7 @@ _08124778:
b _081247B4
.align 2, 0
_08124780: .4byte gUnknown_203B0A0
-_08124784: .4byte sub_80567DC
+_08124784: .4byte c2_exit_to_overworld_2_switch
_08124788: .4byte gUnknown_2024284
_0812478C:
cmp r4, 0
@@ -11829,7 +11829,7 @@ _081247A6:
adds r1, r6
lsls r1, 3
adds r1, r0
- ldr r0, _081247C0 @ =sub_812492C
+ ldr r0, _081247C0 @ =task_brm_cancel_1_on_keypad_a_or_b
str r0, [r1]
_081247B4:
pop {r4-r7}
@@ -11837,7 +11837,7 @@ _081247B4:
bx r0
.align 2, 0
_081247BC: .4byte gUnknown_3005090
-_081247C0: .4byte sub_812492C
+_081247C0: .4byte task_brm_cancel_1_on_keypad_a_or_b
thumb_func_end sub_81245A4
thumb_func_start sub_81247C4
@@ -11915,7 +11915,7 @@ _08124848:
b _081248A2
_0812484E:
ldr r1, _0812487C @ =gUnknown_203B0A0
- ldr r0, _08124880 @ =sub_80567DC
+ ldr r0, _08124880 @ =c2_exit_to_overworld_2_switch
str r0, [r1]
bl sub_811FB0C
lsls r0, 24
@@ -11936,7 +11936,7 @@ _0812484E:
b _081248A2
.align 2, 0
_0812487C: .4byte gUnknown_203B0A0
-_08124880: .4byte sub_80567DC
+_08124880: .4byte c2_exit_to_overworld_2_switch
_08124884: .4byte gUnknown_2024284
_08124888: .4byte gUnknown_203B09C
_0812488C:
@@ -11959,22 +11959,22 @@ _081248A8: .4byte gUnknown_3005024
_081248AC: .4byte gUnknown_203B0C4
thumb_func_end sub_8124828
- thumb_func_start sub_81248B0
-sub_81248B0: @ 81248B0
+ thumb_func_start hm_add_c3_launch_phase_2
+hm_add_c3_launch_phase_2: @ 81248B0
push {lr}
bl sub_807DC00
- ldr r0, _081248C4 @ =sub_81248C8
+ ldr r0, _081248C4 @ =task_launch_hm_phase_2
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_081248C4: .4byte sub_81248C8
- thumb_func_end sub_81248B0
+_081248C4: .4byte task_launch_hm_phase_2
+ thumb_func_end hm_add_c3_launch_phase_2
- thumb_func_start sub_81248C8
-sub_81248C8: @ 81248C8
+ thumb_func_start task_launch_hm_phase_2
+task_launch_hm_phase_2: @ 81248C8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -11983,7 +11983,7 @@ sub_81248C8: @ 81248C8
lsrs r0, 24
cmp r0, 0x1
bne _081248F4
- bl sub_8124904
+ bl brm_get_selected_species
ldr r1, _081248FC @ =gUnknown_20386E0
lsls r0, 16
lsrs r0, 16
@@ -11992,7 +11992,7 @@ sub_81248C8: @ 81248C8
ldr r0, [r0]
bl _call_via_r0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_081248F4:
pop {r4}
pop {r0}
@@ -12000,10 +12000,10 @@ _081248F4:
.align 2, 0
_081248FC: .4byte gUnknown_20386E0
_08124900: .4byte gUnknown_203B0C4
- thumb_func_end sub_81248C8
+ thumb_func_end task_launch_hm_phase_2
- thumb_func_start sub_8124904
-sub_8124904: @ 8124904
+ thumb_func_start brm_get_selected_species
+brm_get_selected_species: @ 8124904
push {lr}
ldr r0, _08124924 @ =gUnknown_203B0A0
movs r1, 0x9
@@ -12013,7 +12013,7 @@ sub_8124904: @ 8124904
ldr r1, _08124928 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -12021,10 +12021,10 @@ sub_8124904: @ 8124904
.align 2, 0
_08124924: .4byte gUnknown_203B0A0
_08124928: .4byte gUnknown_2024284
- thumb_func_end sub_8124904
+ thumb_func_end brm_get_selected_species
- thumb_func_start sub_812492C
-sub_812492C: @ 812492C
+ thumb_func_start task_brm_cancel_1_on_keypad_a_or_b
+task_brm_cancel_1_on_keypad_a_or_b: @ 812492C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -12046,7 +12046,7 @@ _0812494C:
bx r0
.align 2, 0
_08124950: .4byte gUnknown_30030F0
- thumb_func_end sub_812492C
+ thumb_func_end task_brm_cancel_1_on_keypad_a_or_b
thumb_func_start sub_8124954
sub_8124954: @ 8124954
@@ -12070,8 +12070,8 @@ _08124976:
bx r0
thumb_func_end sub_8124954
- thumb_func_start sub_812497C
-sub_812497C: @ 812497C
+ thumb_func_start hm_surf_run_dp02scr
+hm_surf_run_dp02scr: @ 812497C
push {lr}
bl sub_811FB0C
ldr r1, _08124994 @ =gUnknown_20386E0
@@ -12079,12 +12079,12 @@ sub_812497C: @ 812497C
lsrs r0, 24
str r0, [r1]
movs r0, 0x9
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
_08124994: .4byte gUnknown_20386E0
- thumb_func_end sub_812497C
+ thumb_func_end hm_surf_run_dp02scr
thumb_func_start sub_8124998
sub_8124998: @ 8124998
@@ -12094,7 +12094,7 @@ sub_8124998: @ 8124998
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -12119,18 +12119,18 @@ sub_8124998: @ 8124998
cmp r0, 0x1
bne _08124A00
ldr r1, _081249F0 @ =gUnknown_3005024
- ldr r0, _081249F4 @ =sub_81248B0
+ ldr r0, _081249F4 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _081249F8 @ =gUnknown_203B0C4
- ldr r0, _081249FC @ =sub_812497C
+ ldr r0, _081249FC @ =hm_surf_run_dp02scr
str r0, [r1]
movs r0, 0x1
b _08124A02
.align 2, 0
_081249F0: .4byte gUnknown_3005024
-_081249F4: .4byte sub_81248B0
+_081249F4: .4byte hm_add_c3_launch_phase_2
_081249F8: .4byte gUnknown_203B0C4
-_081249FC: .4byte sub_812497C
+_081249FC: .4byte hm_surf_run_dp02scr
_08124A00:
movs r0, 0
_08124A02:
@@ -12145,7 +12145,7 @@ sub_8124A0C: @ 8124A0C
push {r4,lr}
sub sp, 0x4
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08124A24
@@ -12157,7 +12157,7 @@ _08124A24:
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -12207,7 +12207,7 @@ sub_8124A8C: @ 8124A8C
push {lr}
ldr r0, _08124AA4 @ =gUnknown_2036DFC
ldrb r0, [r0, 0x17]
- bl sub_80561FC
+ bl is_light_level_1_2_3_or_6
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12255,7 +12255,7 @@ sub_8124ADC: @ 8124ADC
lsrs r0, 24
str r0, [r1]
movs r0, 0x2B
- bl sub_8083444
+ bl FieldEffectStart
pop {r0}
bx r0
.align 2, 0
@@ -12270,7 +12270,7 @@ sub_8124AF8: @ 8124AF8
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -12290,7 +12290,7 @@ sub_8124AF8: @ 8124AF8
cmp r0, 0x1
bne _08124B54
ldr r1, _08124B44 @ =gUnknown_3005024
- ldr r0, _08124B48 @ =sub_81248B0
+ ldr r0, _08124B48 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _08124B4C @ =gUnknown_203B0C4
ldr r0, _08124B50 @ =sub_8124ADC
@@ -12299,7 +12299,7 @@ sub_8124AF8: @ 8124AF8
b _08124B56
.align 2, 0
_08124B44: .4byte gUnknown_3005024
-_08124B48: .4byte sub_81248B0
+_08124B48: .4byte hm_add_c3_launch_phase_2
_08124B4C: .4byte gUnknown_203B0C4
_08124B50: .4byte sub_8124ADC
_08124B54:
@@ -12322,11 +12322,11 @@ sub_8124B60: @ 8124B60
lsls r5, 16
lsrs r5, 16
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
adds r7, r0, 0
adds r0, r6, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x4]
strh r4, [r7]
strh r5, [r7, 0x2]
@@ -12346,7 +12346,7 @@ _08124B9C:
bl sub_8113550
_08124BA4:
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r7}
pop {r0}
bx r0
@@ -12359,11 +12359,11 @@ sub_8124BB0: @ 8124BB0
lsls r4, r1, 24
lsrs r4, 24
movs r0, 0x4
- bl sub_8002B9C
+ bl Alloc
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6]
strb r4, [r6, 0x2]
ldrb r0, [r6, 0x2]
@@ -12385,7 +12385,7 @@ _08124BDA:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
b _08124BFE
.align 2, 0
_08124BF8: .4byte gUnknown_3005008
@@ -12399,7 +12399,7 @@ _08124C00:
adds r1, r6, 0
bl sub_8113550
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
@@ -12412,7 +12412,7 @@ sub_8124C1C: @ 8124C1C
push {r4,r5,lr}
adds r5, r0, 0
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
ldrb r0, [r5]
strb r0, [r4]
@@ -12426,12 +12426,12 @@ sub_8124C1C: @ 8124C1C
ldrsb r1, [r4, r1]
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r5, r0, 0
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0x4
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
bl sub_811FB0C
lsls r0, 24
@@ -12441,7 +12441,7 @@ sub_8124C1C: @ 8124C1C
ldr r1, _08124C88 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
movs r0, 0x2
strb r0, [r4, 0x2]
@@ -12451,7 +12451,7 @@ sub_8124C1C: @ 8124C1C
adds r1, r4, 0
bl sub_8113550
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
pop {r4,r5}
pop {r0}
bx r0
@@ -12514,12 +12514,12 @@ _08124CEA:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08124D0C
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08124CC0
_08124D0C:
@@ -12696,7 +12696,7 @@ sub_8124E48: @ 8124E48
sub sp, 0xC
ldr r7, _08124EBC @ =gUnknown_203AD30
ldrh r0, [r7]
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -12715,12 +12715,12 @@ sub_8124E48: @ 8124E48
ldr r5, _08124EC4 @ =gUnknown_2024284
adds r4, r5
ldrh r0, [r7]
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_803E89C
+ bl GiveMoveToMon
mov r1, r8
movs r0, 0x9
ldrsb r0, [r1, r0]
@@ -12739,7 +12739,7 @@ sub_8124E48: @ 8124E48
_08124EB0:
mov r1, r8
ldr r0, [r1]
- bl sub_8000544
+ bl SetMainCallback2
b _08124EE6
.align 2, 0
_08124EBC: .4byte gUnknown_203AD30
@@ -12797,22 +12797,22 @@ sub_8124EFC: @ 8124EFC
adds r1, r4, 0
adds r1, 0xD
adds r0, r5, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
lsls r6, 16
lsrs r6, 16
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
ldr r7, _08124F90 @ =gUnknown_203AD30
ldrh r0, [r7]
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r5, 0
adds r2, r4, 0
- bl sub_803E964
+ bl SetMonMoveSlot
adds r0, r5, 0
movs r1, 0x4
bl sub_80436F8
@@ -12832,7 +12832,7 @@ sub_8124EFC: @ 8124EFC
_08124F7C:
mov r1, r8
ldr r0, [r1]
- bl sub_8000544
+ bl SetMainCallback2
b _08124FB2
.align 2, 0
_08124F88: .4byte gUnknown_203B0A0
@@ -12904,8 +12904,8 @@ _08125010: .4byte gUnknown_3005E98
_08125014: .4byte sub_81255BC
thumb_func_end sub_8124FC8
- thumb_func_start sub_8125018
-sub_8125018: @ 8125018
+ thumb_func_start IsHPRecoveryItem
+IsHPRecoveryItem: @ 8125018
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -12940,10 +12940,10 @@ _08125050:
_08125052:
pop {r1}
bx r1
- thumb_func_end sub_8125018
+ thumb_func_end IsHPRecoveryItem
- thumb_func_start sub_8125058
-sub_8125058: @ 8125058
+ thumb_func_start GetMedicineItemEffectMessage
+GetMedicineItemEffectMessage: @ 8125058
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -13086,7 +13086,7 @@ _081251B8:
ldr r0, _081251CC @ =gUnknown_2021CF0
ldr r1, _081251D0 @ =gUnknown_84169CD
_081251BC:
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081251D4 @ =gUnknown_2021D18
ldr r1, _081251D8 @ =gUnknown_8417032
bl sub_8008FCC
@@ -13122,10 +13122,10 @@ _0812520C:
.align 2, 0
_08125210: .4byte gUnknown_2021D18
_08125214: .4byte gUnknown_84169DC
- thumb_func_end sub_8125058
+ thumb_func_end GetMedicineItemEffectMessage
- thumb_func_start sub_8125218
-sub_8125218: @ 8125218
+ thumb_func_start UsingHPEVItemOnShedinja
+UsingHPEVItemOnShedinja: @ 8125218
push {r4,lr}
adds r4, r0, 0
lsls r0, r1, 16
@@ -13137,7 +13137,7 @@ sub_8125218: @ 8125218
bne _08125244
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08125240 @ =0x0000012f
cmp r0, r1
bne _08125244
@@ -13151,10 +13151,10 @@ _08125246:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8125218
+ thumb_func_end UsingHPEVItemOnShedinja
- thumb_func_start sub_812524C
-sub_812524C: @ 812524C
+ thumb_func_start IsBlueYellowRedFlute
+IsBlueYellowRedFlute: @ 812524C
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -13172,10 +13172,10 @@ _08125262:
_08125264:
pop {r1}
bx r1
- thumb_func_end sub_812524C
+ thumb_func_end IsBlueYellowRedFlute
- thumb_func_start sub_8125268
-sub_8125268: @ 8125268
+ thumb_func_start ExecuteTableBasedItemEffect__
+ExecuteTableBasedItemEffect__: @ 8125268
push {r4-r6,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -13217,7 +13217,7 @@ _081252A0:
adds r1, r5, 0
_081252BA:
adds r3, r6, 0
- bl sub_80413C0
+ bl ExecuteTableBasedItemEffect_
lsls r0, 24
lsrs r0, 24
pop {r4-r6}
@@ -13225,7 +13225,7 @@ _081252BA:
bx r1
.align 2, 0
_081252CC: .4byte gUnknown_2024284
- thumb_func_end sub_8125268
+ thumb_func_end ExecuteTableBasedItemEffect__
thumb_func_start sub_81252D0
sub_81252D0: @ 81252D0
@@ -13246,7 +13246,7 @@ sub_81252D0: @ 81252D0
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8125218
+ bl UsingHPEVItemOnShedinja
lsls r0, 24
cmp r0, 0
bne _0812530C
@@ -13258,20 +13258,20 @@ _08125304: .4byte gUnknown_2024284
_08125308: .4byte gUnknown_203AD30
_0812530C:
adds r0, r6, 0
- bl sub_8125018
+ bl IsHPRecoveryItem
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08125330
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
_08125330:
ldr r0, _08125370 @ =gUnknown_203B0A0
ldrb r2, [r0, 0x9]
@@ -13293,7 +13293,7 @@ _08125342:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _0812537C @ =gUnknown_3005090
lsls r0, r7, 2
adds r0, r7
@@ -13355,12 +13355,12 @@ sub_81253B0: @ 81253B0
ldrh r6, [r0]
adds r0, r5, 0
adds r1, r6, 0
- bl sub_8125218
+ bl UsingHPEVItemOnShedinja
lsls r0, 24
cmp r0, 0
beq _08125428
adds r0, r6, 0
- bl sub_8125018
+ bl IsHPRecoveryItem
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -13368,13 +13368,13 @@ sub_81253B0: @ 81253B0
bne _08125416
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r10, r0
adds r0, r5, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
cmp r10, r0
bne _08125416
movs r1, 0
@@ -13384,7 +13384,7 @@ _08125416:
ldrb r0, [r4, 0x9]
adds r1, r6, 0
movs r2, 0
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
lsls r0, 24
cmp r0, 0
beq _0812544C
@@ -13407,7 +13407,7 @@ _0812544C:
movs r0, 0x1
strb r0, [r1]
adds r0, r6, 0
- bl sub_812524C
+ bl IsBlueYellowRedFlute
lsls r0, 24
cmp r0, 0
bne _08125478
@@ -13434,7 +13434,7 @@ _0812547E:
ldr r1, [r4]
adds r1, r0
adds r0, r5, 0
- bl sub_8122904
+ bl party_menu_get_status_condition_and_update_object
ldr r2, _08125504 @ =gUnknown_202063C
movs r0, 0x9
ldrsb r0, [r7, r0]
@@ -13468,7 +13468,7 @@ _081254BC:
_081254D0:
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r1, r10
subs r3, r1
@@ -13493,15 +13493,15 @@ _08125508: .4byte sub_8125554
_0812550C:
ldr r1, _08125548 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
adds r0, r6, 0
- bl sub_8125058
+ bl GetMedicineItemEffectMessage
ldr r0, _0812554C @ =gUnknown_2021D18
_0812551C:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08125550 @ =gUnknown_3005090
mov r2, r9
lsls r0, r2, 2
@@ -13539,7 +13539,7 @@ sub_8125554: @ 8125554
ldr r1, _081255A4 @ =gUnknown_2024284
adds r0, r1
ldr r1, _081255A8 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r4, _081255AC @ =gUnknown_2021D18
ldr r1, _081255B0 @ =gUnknown_8416F27
adds r0, r4, 0
@@ -13548,7 +13548,7 @@ sub_8125554: @ 8125554
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_803539C
ldr r1, _081255B4 @ =gUnknown_3005090
lsls r0, r5, 2
@@ -13630,7 +13630,7 @@ _08125620:
adds r1, 0xD
ldr r2, [sp, 0xC]
adds r0, r2, r0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -13686,7 +13686,7 @@ _08125680:
movs r3, 0x2
bl sub_810F7D8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3-r5}
mov r8, r3
@@ -13706,7 +13706,7 @@ sub_81256C0: @ 81256C0
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl sub_810F998
+ bl ProcessMenuInput
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x2
@@ -13897,7 +13897,7 @@ sub_812580C: @ 812580C
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08125874 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -13950,7 +13950,7 @@ sub_8125898: @ 8125898
ldr r6, _08125938 @ =gUnknown_203AD30
ldrh r1, [r6]
ldrb r2, [r5, 0xE]
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
ldr r1, _0812593C @ =gUnknown_203B0C0
movs r0, 0x1
strb r0, [r1]
@@ -13968,7 +13968,7 @@ sub_8125898: @ 8125898
ldrsh r1, [r5, r2]
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _08125944 @ =gUnknown_2021CD0
@@ -13977,14 +13977,14 @@ sub_8125898: @ 8125898
ldr r0, _08125948 @ =gUnknown_8247094
adds r1, r0
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
ldrh r0, [r6]
- bl sub_8125058
+ bl GetMedicineItemEffectMessage
ldr r0, _0812594C @ =gUnknown_2021D18
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08125950 @ =gUnknown_3005090
mov r2, r8
lsls r0, r2, 2
@@ -14029,7 +14029,7 @@ sub_8125958: @ 8125958
ldrb r0, [r0, 0x9]
ldrb r2, [r7]
adds r1, r5, 0
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
lsls r0, 24
cmp r0, 0
beq _081259A0
@@ -14070,7 +14070,7 @@ _081259A0:
ldrsh r1, [r7, r0]
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _08125A28 @ =gUnknown_2021CD0
@@ -14078,15 +14078,15 @@ _081259A0:
muls r1, r4
ldr r2, _08125A2C @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r0, r5, 0
- bl sub_8125058
+ bl GetMedicineItemEffectMessage
ldr r0, _08125A30 @ =gUnknown_2021D18
_081259F6:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08125A34 @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -14110,8 +14110,8 @@ _08125A34: .4byte gUnknown_3005090
_08125A38: .4byte sub_81255BC
thumb_func_end sub_8125958
- thumb_func_start sub_8125A3C
-sub_8125A3C: @ 8125A3C
+ thumb_func_start dp05_pp_up
+dp05_pp_up: @ 8125A3C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -14137,10 +14137,10 @@ sub_8125A3C: @ 8125A3C
_08125A6C: .4byte gUnknown_203B0A0
_08125A70: .4byte gUnknown_3005090
_08125A74: .4byte sub_81256C0
- thumb_func_end sub_8125A3C
+ thumb_func_end dp05_pp_up
- thumb_func_start sub_8125A78
-sub_8125A78: @ 8125A78
+ thumb_func_start ItemIdToBattleMoveId
+ItemIdToBattleMoveId: @ 8125A78
lsls r0, 16
ldr r1, _08125A88 @ =0xfedf0000
adds r0, r1
@@ -14152,7 +14152,7 @@ sub_8125A78: @ 8125A78
.align 2, 0
_08125A88: .4byte 0xfedf0000
_08125A8C: .4byte gUnknown_845A80C
- thumb_func_end sub_8125A78
+ thumb_func_end ItemIdToBattleMoveId
thumb_func_start sub_8125A90
sub_8125A90: @ 8125A90
@@ -14185,8 +14185,8 @@ _08125ABC:
bx r1
thumb_func_end sub_8125A90
- thumb_func_start sub_8125AC0
-sub_8125AC0: @ 8125AC0
+ thumb_func_start pokemon_has_move
+pokemon_has_move: @ 8125AC0
push {r4-r6,lr}
adds r6, r0, 0
lsls r1, 16
@@ -14196,7 +14196,7 @@ _08125ACA:
adds r1, r4, 0
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r5
bne _08125ADC
movs r0, 0x1
@@ -14212,7 +14212,7 @@ _08125AE8:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8125AC0
+ thumb_func_end pokemon_has_move
thumb_func_start sub_8125AF0
sub_8125AF0: @ 8125AF0
@@ -14225,7 +14225,7 @@ sub_8125AF0: @ 8125AF0
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
@@ -14279,9 +14279,9 @@ sub_8125B40: @ 8125B40
ldrh r5, [r0]
ldr r1, _08125BDC @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
adds r0, r5, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
strh r0, [r7, 0xE]
ldr r0, _08125BE0 @ =gUnknown_2021CF0
movs r1, 0xE
@@ -14290,7 +14290,7 @@ sub_8125B40: @ 8125B40
muls r1, r2
ldr r2, _08125BE4 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
mov r1, r8
strh r0, [r1, 0x2]
@@ -14306,7 +14306,7 @@ sub_8125B40: @ 8125B40
beq _08125BFC
ldrh r1, [r7, 0xE]
adds r0, r4, 0
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
ldr r3, _08125BE8 @ =0x0000ffff
@@ -14410,7 +14410,7 @@ sub_8125C48: @ 8125C48
_08125C84:
ldr r1, _08125CD8 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08125CDC @ =gUnknown_2021CF0
movs r1, 0
ldrsh r2, [r6, r1]
@@ -14418,7 +14418,7 @@ _08125C84:
muls r1, r2
ldr r2, _08125CE0 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r4, _08125CE4 @ =gUnknown_2021D18
ldr r1, _08125CE8 @ =gUnknown_8416DB3
adds r0, r4, 0
@@ -14427,7 +14427,7 @@ _08125C84:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08125CEC @ =gUnknown_3005090
lsls r0, r7, 2
adds r0, r7
@@ -14462,7 +14462,7 @@ sub_8125CF4: @ 8125CF4
cmp r0, 0x1
beq _08125D1A
ldr r0, _08125D20 @ =0x00000101
- bl sub_8071C60
+ bl PlayFanfare
ldr r1, _08125D24 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -14486,7 +14486,7 @@ sub_8125D2C: @ 8125D2C
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08125D7E
@@ -14679,7 +14679,7 @@ sub_8125E84: @ 8125E84
adds r0, r1
adds r1, r2, 0
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
@@ -14790,7 +14790,7 @@ sub_8125F5C: @ 8125F5C
adds r1, r5, 0
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -14802,21 +14802,21 @@ sub_8125F5C: @ 8125F5C
bl sub_80A2294
ldr r1, _08125FF0 @ =gUnknown_2021CD0
adds r0, r6, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08125FF4 @ =gUnknown_2021CF0
movs r1, 0xD
muls r1, r4
ldr r2, _08125FF8 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r0, r6, 0
adds r1, r5, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
mov r0, r9
ldrh r1, [r0, 0xE]
adds r0, r6, 0
adds r2, r5, 0
- bl sub_803E964
+ bl SetMonMoveSlot
mov r0, r8
bl sub_8125C48
pop {r3,r4}
@@ -14854,19 +14854,19 @@ sub_8125FFC: @ 8125FFC
lsrs r1, 24
adds r1, 0xD
adds r0, r5, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r1, _08126064 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08126068 @ =gUnknown_2021CF0
movs r1, 0xD
muls r1, r4
ldr r2, _0812606C @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08126070 @ =gUnknown_8416EC6
bl sub_8125AF0
ldr r1, _08126074 @ =gUnknown_3005090
@@ -14913,7 +14913,7 @@ sub_812607C: @ 812607C
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8041064
+ bl RemoveMonPPBonus
ldrh r5, [r5, 0xE]
bl sub_8138B2C
adds r2, r0, 0
@@ -14921,7 +14921,7 @@ sub_812607C: @ 812607C
lsrs r2, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_803E964
+ bl SetMonMoveSlot
adds r0, r6, 0
bl sub_8125C48
_081260C8:
@@ -14947,7 +14947,7 @@ sub_81260D8: @ 81260D8
muls r1, r2
ldr r2, _08126128 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0812612C @ =gUnknown_2021D18
ldr r1, _08126130 @ =gUnknown_8416E6B
adds r0, r4, 0
@@ -14956,7 +14956,7 @@ sub_81260D8: @ 81260D8
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08126134 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -15038,7 +15038,7 @@ _081261A8:
_081261AE:
ldr r1, _081261F4 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _081261F8 @ =gUnknown_2021CF0
movs r1, 0xE
ldrsh r2, [r7, r1]
@@ -15046,7 +15046,7 @@ _081261AE:
muls r1, r2
ldr r2, _081261FC @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r4, _08126200 @ =gUnknown_2021D18
ldr r1, _08126204 @ =gUnknown_8416E84
adds r0, r4, 0
@@ -15098,7 +15098,7 @@ _08126234:
_0812623A:
ldr r1, _08126270 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08126274 @ =gUnknown_2021CF0
ldr r1, _08126278 @ =gUnknown_203B0A0
movs r3, 0xE
@@ -15107,7 +15107,7 @@ _0812623A:
muls r1, r2
ldr r2, _0812627C @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08126280 @ =gUnknown_8416DF7
bl sub_8125AF0
ldr r1, _08126284 @ =gUnknown_3005090
@@ -15168,7 +15168,7 @@ sub_81262AC: @ 81262AC
ldrh r5, [r0]
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
beq _081262F4
ldrb r2, [r7, 0x9]
@@ -15197,7 +15197,7 @@ _081262F6:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _0812632C @ =gUnknown_3005090
lsls r0, r6, 2
adds r0, r6
@@ -15255,7 +15255,7 @@ sub_8126350: @ 8126350
ldr r5, _0812641C @ =gUnknown_203AD30
ldrh r1, [r5]
movs r2, 0
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
movs r0, 0x89
lsls r0, 2
adds r1, r7, r0
@@ -15279,10 +15279,10 @@ sub_8126350: @ 8126350
bl sub_809A1D8
ldr r1, _08126428 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -15298,7 +15298,7 @@ sub_8126350: @ 8126350
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08126438 @ =gUnknown_3005090
mov r2, r8
lsls r0, r2, 2
@@ -15339,7 +15339,7 @@ sub_8126440: @ 8126440
ldr r1, [r6]
adds r1, r4
adds r0, r5, 0
- bl sub_8122904
+ bl party_menu_get_status_condition_and_update_object
ldr r2, _081264C4 @ =gUnknown_202063C
ldr r0, [r6]
adds r3, r4, r0
@@ -15381,7 +15381,7 @@ _0812647C:
movs r1, 0x1
bl sub_811F818
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4-r7}
pop {r0}
bx r0
@@ -15396,7 +15396,7 @@ sub_81264C8: @ 81264C8
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _08126514
@@ -15502,7 +15502,7 @@ sub_8126570: @ 8126570
movs r1, 0x2
bl sub_8003F20
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -15533,7 +15533,7 @@ sub_81265BC: @ 81265BC
movs r1, 0x2
bl sub_8003F20
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r4}
pop {r0}
@@ -15548,7 +15548,7 @@ sub_81265F8: @ 81265F8
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _0812669A
@@ -15573,7 +15573,7 @@ _08126620:
ldr r1, _08126658 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x1
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r1, r0, 16
strh r6, [r4, 0x10]
@@ -15639,7 +15639,7 @@ sub_81266A0: @ 81266A0
ldr r1, _081266D4 @ =gUnknown_2024284
adds r0, r1
movs r1, 0
- bl sub_803EA88
+ bl MonTryLearningNewMove
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _081266D8 @ =0x0000fffe
@@ -15708,7 +15708,7 @@ sub_8126704: @ 8126704
movs r2, 0x1
bl sub_80CDDA8
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08126762
.align 2, 0
_08126748: .4byte gUnknown_203B0A0
@@ -15748,7 +15748,7 @@ sub_8126770: @ 8126770
ldr r1, _081267E0 @ =gUnknown_2024284
adds r0, r1
ldr r1, _081267E4 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _081267E8 @ =gUnknown_2021CF0
ldr r6, _081267EC @ =gUnknown_2024022
ldrh r2, [r6]
@@ -15756,7 +15756,7 @@ sub_8126770: @ 8126770
muls r1, r2
ldr r2, _081267F0 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r4, _081267F4 @ =gUnknown_2021D18
ldr r1, _081267F8 @ =gUnknown_8416DF7
adds r0, r4, 0
@@ -15765,7 +15765,7 @@ sub_8126770: @ 8126770
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrh r0, [r6]
mov r1, r8
strh r0, [r1, 0xE]
@@ -15814,13 +15814,13 @@ sub_8126804: @ 8126804
ldr r1, _08126874 @ =gUnknown_2024284
adds r0, r1
ldr r1, _08126878 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _0812687C @ =gUnknown_2021CF0
movs r1, 0xD
muls r1, r5
ldr r2, _08126880 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r4, _08126884 @ =gUnknown_2021D18
ldr r1, _08126888 @ =gUnknown_8416DB3
adds r0, r4, 0
@@ -15829,7 +15829,7 @@ sub_8126804: @ 8126804
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
mov r0, r8
strh r5, [r0, 0xE]
ldr r1, _0812688C @ =gUnknown_3005090
@@ -15909,12 +15909,12 @@ sub_81268D4: @ 81268D4
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08126920
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -15922,7 +15922,7 @@ sub_81268D4: @ 81268D4
ldr r1, _08126938 @ =gUnknown_203AD30
ldrh r1, [r1]
movs r2, 0
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
lsls r0, 24
cmp r0, 0
beq _08126944
@@ -15963,7 +15963,7 @@ _08126960:
ldr r1, [r4]
adds r1, r0
adds r0, r5, 0
- bl sub_8122904
+ bl party_menu_get_status_condition_and_update_object
ldr r2, _08126A10 @ =gUnknown_202063C
movs r0, 0x9
ldrsb r0, [r6, r0]
@@ -15997,7 +15997,7 @@ _0812699C:
bl sub_811F818
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
mov r2, r8
subs r3, r2
@@ -16089,7 +16089,7 @@ _08126A4E:
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
b _08126ABE
.align 2, 0
_08126A80: .4byte gUnknown_203B09C
@@ -16161,7 +16161,7 @@ sub_8126AFC: @ 8126AFC
ldr r1, _08126B48 @ =gUnknown_2024284
adds r0, r1
ldr r1, _08126B4C @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r4, _08126B50 @ =gUnknown_2021D18
ldr r1, _08126B54 @ =gUnknown_8416F27
adds r0, r4, 0
@@ -16170,7 +16170,7 @@ sub_8126AFC: @ 8126AFC
movs r1, 0
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08126B58 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -16221,7 +16221,7 @@ sub_8126B60: @ 8126B60
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _08126BC4 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -16256,7 +16256,7 @@ sub_8126BD4: @ 8126BD4
ldr r5, _08126C18 @ =gUnknown_203AD30
ldrh r1, [r5]
movs r2, 0
- bl sub_8125268
+ bl ExecuteTableBasedItemEffect__
movs r1, 0x9
ldrsb r1, [r4, r1]
movs r0, 0x64
@@ -16546,7 +16546,7 @@ sub_8126DC8: @ 8126DC8
mov r8, r0
ldr r1, _08126E58 @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r4, _08126E5C @ =gUnknown_20370C2
ldrb r0, [r4]
bl sub_8120BA8
@@ -16558,7 +16558,7 @@ sub_8126DC8: @ 8126DC8
muls r1, r2
ldr r2, _08126E64 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x2
mov r1, r8
strh r0, [r1, 0x2]
@@ -16574,7 +16574,7 @@ sub_8126DC8: @ 8126DC8
beq _08126E74
ldrh r1, [r7, 0xE]
adds r0, r5, 0
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
ldr r1, _08126E68 @ =0xffff0000
cmp r0, r1
@@ -16722,7 +16722,7 @@ sub_8126F40: @ 8126F40
ldr r7, _08126F88 @ =gUnknown_2024284
adds r0, r7
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
lsls r0, 16
cmp r0, 0
@@ -16917,7 +16917,7 @@ sub_81270E0: @ 81270E0
muls r0, r6
adds r0, r5
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
ldr r1, _08127130 @ =gUnknown_3005008
@@ -16955,7 +16955,7 @@ sub_812713C: @ 812713C
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, _08127194 @ =gUnknown_20370D0
@@ -16963,7 +16963,7 @@ sub_812713C: @ 812713C
cmp r0, 0
bne _0812719C
adds r0, r5, 0
- bl sub_8097FB8
+ bl TakeMailFromMon
ldr r4, _08127198 @ =gUnknown_203B0D8
adds r0, r5, 0
movs r1, 0xC
@@ -16975,7 +16975,7 @@ sub_812713C: @ 812713C
adds r0, r7, 0
bl sub_81273AC
ldr r0, [r6]
- bl sub_8000544
+ bl SetMainCallback2
b _081271B8
.align 2, 0
_0812718C: .4byte gUnknown_203B0A0
@@ -17205,7 +17205,7 @@ sub_812734C: @ 812734C
movs r1, 0x1
bl sub_81202F8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _0812737C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -17325,7 +17325,7 @@ sub_8127404: @ 8127404
adds r4, r1, r0
adds r0, r5, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0812746C
ldr r0, _08127468 @ =gUnknown_8416D17
@@ -17343,7 +17343,7 @@ _08127468: .4byte gUnknown_8416D17
_0812746C:
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8097F44
+ bl GiveMailToMon2
adds r0, r4, 0
bl sub_8097CB4
ldr r0, _0812749C @ =gUnknown_8416D4F
@@ -17351,7 +17351,7 @@ _0812746C:
bl sub_81202F8
_08127482:
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _081274A0 @ =gUnknown_3005090
lsls r1, r6, 2
adds r1, r6
@@ -17463,7 +17463,7 @@ sub_8127550: @ 8127550
adds r4, r0, 0
movs r5, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0812757A
ldr r0, _08127580 @ =gUnknown_203B0A0
@@ -17475,7 +17475,7 @@ sub_8127550: @ 8127550
beq _08127592
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1E
bls _081275E0
_0812757A:
@@ -17486,7 +17486,7 @@ _08127580: .4byte gUnknown_203B0A0
_08127584:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _081275E0
b _0812757A
@@ -17501,13 +17501,13 @@ _08127592:
bne _081275AE
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x32
bhi _0812757A
_081275AE:
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r3, _081275F0 @ =gUnknown_84020C4
@@ -17583,7 +17583,7 @@ _08127632:
subs r0, 0x64
add r0, r10
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _081276E0 @ =gUnknown_203B09C
ldr r1, [r2]
ldr r2, _081276E4 @ =0x00000236
@@ -17595,7 +17595,7 @@ _08127632:
subs r0, 0x64
add r0, r10
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _081276E0 @ =gUnknown_203B09C
ldr r1, [r2]
movs r2, 0x8D
@@ -17625,7 +17625,7 @@ _0812767E:
subs r0, 0x64
add r0, r10
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
beq _081276F8
mov r1, r8
@@ -17643,7 +17643,7 @@ _0812767E:
subs r0, 0x64
add r0, r10
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
beq _081276FC
_081276C6:
@@ -17844,7 +17844,7 @@ sub_812781C: @ 812781C
str r0, [sp]
ldr r0, _08127848 @ =sub_811FB28
str r0, [sp, 0x4]
- ldr r0, _0812784C @ =sub_80568E0
+ ldr r0, _0812784C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0
@@ -17855,13 +17855,13 @@ sub_812781C: @ 812781C
.align 2, 0
_08127844: .4byte gUnknown_20370C2
_08127848: .4byte sub_811FB28
-_0812784C: .4byte sub_80568E0
+_0812784C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08127850:
movs r0, 0x7F
str r0, [sp]
ldr r0, _08127878 @ =sub_8126DC8
str r0, [sp, 0x4]
- ldr r0, _0812787C @ =sub_80568E0
+ ldr r0, _0812787C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [sp, 0x8]
movs r0, 0
movs r1, 0
@@ -17878,7 +17878,7 @@ _08127870:
bx r0
.align 2, 0
_08127878: .4byte sub_8126DC8
-_0812787C: .4byte sub_80568E0
+_0812787C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_08127880: .4byte gUnknown_203B0A0
_08127884: .4byte gUnknown_20370C6
thumb_func_end sub_812781C
@@ -17891,7 +17891,7 @@ sub_8127888: @ 8127888
str r0, [sp]
ldr r0, _081278AC @ =sub_811FB28
str r0, [sp, 0x4]
- ldr r0, _081278B0 @ =sub_80568E0
+ ldr r0, _081278B0 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
str r0, [sp, 0x8]
movs r0, 0xB
movs r1, 0
@@ -17903,7 +17903,7 @@ sub_8127888: @ 8127888
bx r0
.align 2, 0
_081278AC: .4byte sub_811FB28
-_081278B0: .4byte sub_80568E0
+_081278B0: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_8127888
thumb_func_start sub_81278B4
@@ -17985,7 +17985,7 @@ _08127930:
bl sub_811EA44
_08127950:
bl nullsub_44
- bl sub_8128074
+ bl pokemon_change_order
add sp, 0xC
pop {r4}
pop {r0}
@@ -18014,7 +18014,7 @@ sub_8127968: @ 8127968
movs r3, 0
bl sub_811EA44
bl nullsub_44
- bl sub_8128074
+ bl pokemon_change_order
add sp, 0xC
pop {r0}
bx r0
@@ -18042,7 +18042,7 @@ sub_81279A4: @ 81279A4
movs r3, 0
bl sub_811EA44
bl nullsub_44
- bl sub_8128074
+ bl pokemon_change_order
add sp, 0xC
pop {r0}
bx r0
@@ -18113,7 +18113,7 @@ _08127A44:
bl sub_811EA44
_08127A62:
bl nullsub_44
- bl sub_8128074
+ bl pokemon_change_order
add sp, 0xC
pop {r4}
pop {r0}
@@ -18131,12 +18131,12 @@ sub_8127A84: @ 8127A84
adds r4, r0, 0
ldr r0, _08127AA4 @ =gUnknown_20242E8
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08127AA0
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08127AA8
_08127AA0:
@@ -18185,7 +18185,7 @@ _08127AE6:
bl sub_80444C4
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08127B00 @ =gUnknown_2021D18
ldr r1, _08127B04 @ =gUnknown_8416A98
b _08127C86
@@ -18201,12 +18201,12 @@ _08127B08:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08127B3C
ldr r1, _08127B30 @ =gUnknown_2021CD0
adds r0, r4, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08127B34 @ =gUnknown_2021D18
ldr r1, _08127B38 @ =gUnknown_8416A75
b _08127C86
@@ -18220,7 +18220,7 @@ _08127B3C:
b _08127B68
_08127B40:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08127B62
@@ -18251,7 +18251,7 @@ _08127B68:
adds r6, r0, r1
adds r0, r6, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08127BA4
ldr r0, _08127B9C @ =gUnknown_2021D18
@@ -18276,7 +18276,7 @@ _08127BA4:
bne _08127BD8
ldr r1, _08127BCC @ =gUnknown_2021CD0
adds r0, r6, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08127BD0 @ =gUnknown_2021D18
ldr r1, _08127BD4 @ =gUnknown_8416A55
b _08127C86
@@ -18310,7 +18310,7 @@ _08127BEC:
lsls r0, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -18335,7 +18335,7 @@ _08127C40:
ldr r1, _08127C54 @ =gUnknown_2024284
adds r0, r1
ldr r1, _08127C58 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08127C5C @ =gUnknown_2021D18
ldr r1, _08127C60 @ =gUnknown_8416A3A
b _08127C86
@@ -18351,13 +18351,13 @@ _08127C64:
lsls r0, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
lsls r0, 24
lsrs r0, 24
muls r0, r7
add r0, r8
ldr r1, _08127CA0 @ =gUnknown_2021CD0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _08127CA4 @ =gUnknown_2021D18
ldr r1, _08127CA8 @ =gUnknown_8416A1E
_08127C86:
@@ -18431,7 +18431,7 @@ _08127D02:
bne _08127D40
movs r5, 0x1
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
mov r2, sp
ldr r1, _08127D3C @ =gUnknown_2023BCE
lsls r0, 24
@@ -18459,7 +18459,7 @@ _08127D3C: .4byte gUnknown_2023BCE
_08127D40:
movs r5, 0x2
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
mov r1, sp
ldr r4, _08127DA4 @ =gUnknown_2023BCE
lsls r0, 24
@@ -18468,7 +18468,7 @@ _08127D40:
ldrh r0, [r0]
strb r0, [r1]
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
mov r1, sp
lsls r0, 24
lsrs r0, 23
@@ -18545,24 +18545,24 @@ sub_8127DCC: @ 8127DCC
lsrs r7, r1, 24
lsls r0, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08127DF4
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x2
b _08127E00
_08127DF4:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x3
_08127E00:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r6, r0, 24
bl sub_811FA20
@@ -18863,8 +18863,8 @@ sub_8127FF4: @ 8127FF4
bx r0
thumb_func_end sub_8127FF4
- thumb_func_start sub_8128030
-sub_8128030: @ 8128030
+ thumb_func_start pokemon_order_func
+pokemon_order_func: @ 8128030
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -18903,15 +18903,15 @@ _0812806E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8128030
+ thumb_func_end pokemon_order_func
- thumb_func_start sub_8128074
-sub_8128074: @ 8128074
+ thumb_func_start pokemon_change_order
+pokemon_change_order: @ 8128074
push {r4-r6,lr}
movs r4, 0x96
lsls r4, 2
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
ldr r1, _081280C0 @ =gUnknown_2024284
adds r2, r4, 0
@@ -18920,7 +18920,7 @@ sub_8128074: @ 8128074
movs r6, 0x64
_0812808E:
adds r0, r4, 0
- bl sub_8128030
+ bl pokemon_order_func
lsls r0, 24
lsrs r0, 24
muls r0, r6
@@ -18937,13 +18937,13 @@ _0812808E:
cmp r4, 0x5
bls _0812808E
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
.align 2, 0
_081280C0: .4byte gUnknown_2024284
- thumb_func_end sub_8128074
+ thumb_func_end pokemon_change_order
thumb_func_start sub_81280C4
sub_81280C4: @ 81280C4
@@ -18951,7 +18951,7 @@ sub_81280C4: @ 81280C4
movs r4, 0x96
lsls r4, 2
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
ldr r1, _08128110 @ =gUnknown_2024284
adds r2, r4, 0
@@ -18977,7 +18977,7 @@ _081280DE:
cmp r4, 0x5
bls _081280DE
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
@@ -19004,12 +19004,12 @@ _08128122:
adds r5, r0, r1
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08128170
adds r0, r5, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08128170
movs r0, 0
@@ -19047,7 +19047,7 @@ sub_8128184: @ 8128184
push {lr}
bl sub_8108CF0
ldr r0, _08128194 @ =sub_8030ADC
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -19096,7 +19096,7 @@ sub_81281C4: @ 81281C4
lsls r1, 9
movs r0, 0x2
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldr r0, _081281F8 @ =sub_81281FC
str r0, [r4]
pop {r4}
@@ -19287,7 +19287,7 @@ _08128348:
lsls r1, 4
movs r0, 0x2
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
pop {r4-r7}
pop {r0}
bx r0
@@ -19308,7 +19308,7 @@ sub_8128370: @ 8128370
str r0, [sp]
ldr r0, _081283A0 @ =sub_811FB28
str r0, [sp, 0x4]
- ldr r0, _081283A4 @ =sub_80567DC
+ ldr r0, _081283A4 @ =c2_exit_to_overworld_2_switch
str r0, [sp, 0x8]
movs r0, 0x6
movs r1, 0
@@ -19322,7 +19322,7 @@ sub_8128370: @ 8128370
_08128398: .4byte gUnknown_3005024
_0812839C: .4byte sub_81283E4
_081283A0: .4byte sub_811FB28
-_081283A4: .4byte sub_80567DC
+_081283A4: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8128370
thumb_func_start sub_81283A8
@@ -19338,7 +19338,7 @@ sub_81283A8: @ 81283A8
str r1, [sp]
ldr r1, _081283DC @ =sub_811FB28
str r1, [sp, 0x4]
- ldr r1, _081283E0 @ =sub_80567DC
+ ldr r1, _081283E0 @ =c2_exit_to_overworld_2_switch
str r1, [sp, 0x8]
movs r1, 0
movs r2, 0xB
@@ -19351,7 +19351,7 @@ sub_81283A8: @ 81283A8
_081283D4: .4byte gUnknown_3005024
_081283D8: .4byte sub_81283E4
_081283DC: .4byte sub_811FB28
-_081283E0: .4byte sub_80567DC
+_081283E0: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_81283A8
thumb_func_start sub_81283E4
@@ -19360,7 +19360,7 @@ sub_81283E4: @ 81283E4
bl sub_807DC00
ldr r0, _081283F8 @ =sub_81283FC
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
pop {r1}
bx r1
@@ -19378,9 +19378,9 @@ sub_81283FC: @ 81283FC
cmp r0, 0
beq _0812841A
adds r0, r4, 0
- bl sub_8077508
- bl sub_806994C
- bl sub_8069B34
+ bl DestroyTask
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
_0812841A:
pop {r4}
pop {r0}
diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s
index ab44e330a..95e93e10d 100644
--- a/asm/pc_screen_effect.s
+++ b/asm/pc_screen_effect.s
@@ -55,7 +55,7 @@ _080A0A94: .4byte sub_80A0C78
sub_80A0A98: @ 80A0A98
push {lr}
ldr r0, _080A0AA8 @ =sub_80A0B0C
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -68,7 +68,7 @@ _080A0AA8: .4byte sub_80A0B0C
sub_80A0AAC: @ 80A0AAC
push {lr}
ldr r0, _080A0ABC @ =sub_80A0C78
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -86,7 +86,7 @@ sub_80A0AC0: @ 80A0AC0
lsls r3, 24
lsrs r3, 24
adds r1, r3, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r2, r0, 0
@@ -157,7 +157,7 @@ _080A0B3E:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
@@ -165,7 +165,7 @@ _080A0B3E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
@@ -173,27 +173,27 @@ _080A0B3E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080A0C6A
_080A0B8C:
movs r0, 0x50
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x16]
movs r0, 0x54
- bl sub_8000AC4
+ bl GetGpuReg
strh r0, [r4, 0x18]
movs r0, 0x50
movs r1, 0xBF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
b _080A0C6A
_080A0BAE:
ldrh r0, [r4, 0xE]
@@ -217,15 +217,15 @@ _080A0BCC:
strh r0, [r4, 0x10]
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x16]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
negs r0, r0
movs r1, 0
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _080A0C0C @ =gUnknown_20375F8
strh r5, [r0]
_080A0BF2:
@@ -236,7 +236,7 @@ _080A0BF2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r4, r1]
b _080A0C54
@@ -265,7 +265,7 @@ _080A0C2C:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
_080A0C3E:
ldrh r1, [r4, 0x12]
lsls r1, 8
@@ -274,7 +274,7 @@ _080A0C3E:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x12
ldrsh r0, [r4, r1]
_080A0C54:
@@ -284,9 +284,9 @@ _080A0C54:
_080A0C5A:
ldrh r1, [r4, 0x16]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _080A0C70
_080A0C6A:
ldrh r0, [r4, 0x8]
@@ -342,7 +342,7 @@ _080A0CB4:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldrh r1, [r4, 0xE]
lsls r1, 8
ldrh r0, [r4, 0x10]
@@ -350,7 +350,7 @@ _080A0CB4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x12]
lsls r1, 8
ldrh r0, [r4, 0x14]
@@ -358,13 +358,13 @@ _080A0CB4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080A0DCA
_080A0D02:
ldrh r0, [r4, 0xC]
@@ -389,10 +389,10 @@ _080A0D20:
strh r0, [r4, 0x14]
movs r0, 0x50
movs r1, 0xBF
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
_080A0D38:
ldrh r1, [r4, 0x12]
lsls r1, 8
@@ -401,7 +401,7 @@ _080A0D38:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x12
ldrsh r0, [r4, r1]
cmp r0, 0x50
@@ -430,7 +430,7 @@ _080A0D72:
subs r0, 0x79
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r1, _080A0DA4 @ =gUnknown_20375F8
movs r0, 0
strh r0, [r1]
@@ -442,7 +442,7 @@ _080A0D88:
lsls r1, 16
lsrs r1, 16
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE
ldrsh r0, [r4, r1]
cmp r0, 0x78
@@ -454,15 +454,15 @@ _080A0DA8:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _080A0DD0
_080A0DCA:
ldrh r0, [r4, 0x8]
diff --git a/asm/play_time.s b/asm/play_time.s
index 83ebe2de9..79047bf07 100644
--- a/asm/play_time.s
+++ b/asm/play_time.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8054814
-sub_8054814: @ 8054814
+ thumb_func_start PlayTimeCounter_Reset
+PlayTimeCounter_Reset: @ 8054814
ldr r1, _08054830 @ =gUnknown_3000E7C
movs r0, 0
strb r0, [r1]
@@ -24,10 +24,10 @@ sub_8054814: @ 8054814
.align 2, 0
_08054830: .4byte gUnknown_3000E7C
_08054834: .4byte gUnknown_300500C
- thumb_func_end sub_8054814
+ thumb_func_end PlayTimeCounter_Reset
- thumb_func_start sub_8054838
-sub_8054838: @ 8054838
+ thumb_func_start PlayTimeCounter_Start
+PlayTimeCounter_Start: @ 8054838
push {lr}
ldr r1, _08054854 @ =gUnknown_3000E7C
movs r0, 0x1
@@ -38,7 +38,7 @@ sub_8054838: @ 8054838
ldr r0, _0805485C @ =0x000003e7
cmp r1, r0
bls _08054850
- bl sub_80548D4
+ bl PlayTimeCounter_SetToMax
_08054850:
pop {r0}
bx r0
@@ -46,7 +46,7 @@ _08054850:
_08054854: .4byte gUnknown_3000E7C
_08054858: .4byte gUnknown_300500C
_0805485C: .4byte 0x000003e7
- thumb_func_end sub_8054838
+ thumb_func_end PlayTimeCounter_Start
thumb_func_start sub_8054860
sub_8054860: @ 8054860
@@ -58,8 +58,8 @@ sub_8054860: @ 8054860
_08054868: .4byte gUnknown_3000E7C
thumb_func_end sub_8054860
- thumb_func_start sub_805486C
-sub_805486C: @ 805486C
+ thumb_func_start PlayTimeCounter_Update
+PlayTimeCounter_Update: @ 805486C
push {lr}
ldr r0, _080548C8 @ =gUnknown_3000E7C
ldrb r0, [r0]
@@ -102,7 +102,7 @@ sub_805486C: @ 805486C
ldr r0, _080548D0 @ =0x03e70000
cmp r1, r0
bls _080548C4
- bl sub_80548D4
+ bl PlayTimeCounter_SetToMax
_080548C4:
pop {r0}
bx r0
@@ -110,10 +110,10 @@ _080548C4:
_080548C8: .4byte gUnknown_3000E7C
_080548CC: .4byte gUnknown_300500C
_080548D0: .4byte 0x03e70000
- thumb_func_end sub_805486C
+ thumb_func_end PlayTimeCounter_Update
- thumb_func_start sub_80548D4
-sub_80548D4: @ 80548D4
+ thumb_func_start PlayTimeCounter_SetToMax
+PlayTimeCounter_SetToMax: @ 80548D4
ldr r1, _080548F0 @ =gUnknown_3000E7C
movs r0, 0x2
strb r0, [r1]
@@ -132,6 +132,6 @@ sub_80548D4: @ 80548D4
_080548F0: .4byte gUnknown_3000E7C
_080548F4: .4byte gUnknown_300500C
_080548F8: .4byte 0x000003e7
- thumb_func_end sub_80548D4
+ thumb_func_end PlayTimeCounter_SetToMax
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/player_pc.s b/asm/player_pc.s
index 74c94642f..f890fb965 100644
--- a/asm/player_pc.s
+++ b/asm/player_pc.s
@@ -65,13 +65,13 @@ sub_80EB6AC: @ 80EB6AC
strb r0, [r1]
ldr r0, _080EB6F0 @ =nullsub_43
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080EB6F4 @ =gUnknown_8416262
ldr r3, _080EB6F8 @ =sub_80EB74C
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -99,13 +99,13 @@ sub_80EB6FC: @ 80EB6FC
strb r0, [r1]
ldr r0, _080EB740 @ =nullsub_43
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080EB744 @ =gUnknown_8416262
ldr r3, _080EB748 @ =sub_80EB74C
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -189,7 +189,7 @@ _080EB77E:
movs r3, 0x2
bl sub_810F7D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EB814 @ =gUnknown_3005090
mov r2, r8
lsls r0, r2, 2
@@ -223,7 +223,7 @@ sub_80EB81C: @ 80EB81C
lsls r6, r1, 3
ldr r7, _080EB870 @ =gUnknown_3005098
adds r4, r6, r7
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r5, r0, 24
movs r0, 0x2
@@ -239,11 +239,11 @@ sub_80EB81C: @ 80EB81C
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4, 0x14]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
bl sub_8003E3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r7, 0
subs r0, 0x8
adds r0, r6, r0
@@ -258,11 +258,11 @@ _080EB878:
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4, 0x14]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
bl sub_8003E3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r2, r7, 0
subs r2, 0x8
adds r2, r6, r2
@@ -296,7 +296,7 @@ sub_80EB8BC: @ 80EB8BC
ldr r3, _080EB8E0 @ =sub_80EB74C
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r4}
pop {r0}
bx r0
@@ -345,7 +345,7 @@ sub_80EB910: @ 80EB910
ldr r3, _080EB93C @ =sub_80EB8BC
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
b _080EB9A8
.align 2, 0
_080EB934: .4byte gUnknown_203AAC4
@@ -396,7 +396,7 @@ _080EB99C:
ldr r3, _080EB9B4 @ =sub_80EB8BC
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080EB9A8:
pop {r4,r5}
pop {r0}
@@ -416,16 +416,16 @@ sub_80EB9B8: @ 80EB9B8
cmp r0, 0
bne _080EB9D8
ldr r0, _080EB9D4 @ =gUnknown_8168D17
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
b _080EB9DC
.align 2, 0
_080EB9D0: .4byte gUnknown_203AAC4
_080EB9D4: .4byte gUnknown_8168D17
_080EB9D8:
- bl sub_8069B34
+ bl EnableBothScriptContexts
_080EB9DC:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -480,7 +480,7 @@ _080EBA1E:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
ldrb r0, [r6, 0x14]
str r5, [sp]
str r4, [sp, 0x4]
@@ -490,7 +490,7 @@ _080EBA1E:
movs r3, 0x2
bl sub_810F7D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EBA88 @ =gUnknown_84021DC
lsls r0, r7, 2
adds r0, r1
@@ -566,7 +566,7 @@ _080EBAE8:
bl sub_80722CC
movs r0, 0x1
_080EBB04:
- bl sub_810F904
+ bl MoveMenuCursor
ldr r4, _080EBB1C @ =gUnknown_84021DC
bl sub_810F98C
lsls r0, 24
@@ -628,7 +628,7 @@ sub_80EBB70: @ 80EBB70
cmp r0, 0
bne _080EBB9C
bl sub_80563F0
- ldr r2, _080EBBA8 @ =sub_80567DC
+ ldr r2, _080EBBA8 @ =c2_exit_to_overworld_2_switch
movs r0, 0x3
movs r1, 0
bl sub_8107DB4
@@ -636,14 +636,14 @@ sub_80EBB70: @ 80EBB70
ldr r0, _080EBBB0 @ =sub_80EBC0C
str r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EBB9C:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080EBBA4: .4byte gUnknown_2037AB8
-_080EBBA8: .4byte sub_80567DC
+_080EBBA8: .4byte c2_exit_to_overworld_2_switch
_080EBBAC: .4byte gUnknown_3005020
_080EBBB0: .4byte sub_80EBC0C
thumb_func_end sub_80EBB70
@@ -662,7 +662,7 @@ sub_80EBBB4: @ 80EBBB4
str r0, [r1]
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
pop {r0}
bx r0
.align 2, 0
@@ -705,7 +705,7 @@ sub_80EBC0C: @ 80EBC0C
bl sub_80F6EE4
ldr r0, _080EBC34 @ =sub_80EBBDC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r1, 0x1
@@ -754,14 +754,14 @@ _080EBC7C:
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4, 0x14]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
bl sub_8003E3C
ldr r2, _080EBCA4 @ =gUnknown_8417774
ldr r3, _080EBCA8 @ =sub_80EB8E4
adds r0, r5, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_080EBC9C:
pop {r4-r7}
pop {r0}
@@ -780,7 +780,7 @@ sub_80EBCAC: @ 80EBCAC
bl sub_80F6EE4
ldr r0, _080EBCD4 @ =sub_80EBBDC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -810,10 +810,10 @@ sub_80EBCD8: @ 80EBCD8
bne _080EBD06
bl sub_80563F0
ldrb r0, [r5, 0xC]
- ldr r1, _080EBD14 @ =sub_80567DC
+ ldr r1, _080EBD14 @ =c2_exit_to_overworld_2_switch
bl sub_810D3F4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EBD06:
pop {r4,r5}
pop {r0}
@@ -821,7 +821,7 @@ _080EBD06:
.align 2, 0
_080EBD0C: .4byte gUnknown_3005098
_080EBD10: .4byte gUnknown_2037AB8
-_080EBD14: .4byte sub_80567DC
+_080EBD14: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80EBCD8
thumb_func_start sub_80EBD18
@@ -840,7 +840,7 @@ sub_80EBD18: @ 80EBD18
bl sub_810DE94
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
pop {r0}
bx r0
.align 2, 0
@@ -863,7 +863,7 @@ sub_80EBD48: @ 80EBD48
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4, 0x14]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x14]
movs r1, 0x1
bl sub_8003F20
@@ -1084,7 +1084,7 @@ sub_80EBEB0: @ 80EBEB0
mov r2, r8
bl sub_8002C48
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r4, _080EBF38 @ =gUnknown_203AAC4
adds r0, r4, 0
bl sub_810EC98
@@ -1134,7 +1134,7 @@ sub_80EBF40: @ 80EBF40
cmp r0, 0
bne _080EBFEA
ldrb r0, [r4, 0x16]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r6, r0, 0
ldrb r0, [r4, 0x16]
ldr r7, _080EBF9C @ =gUnknown_203AAC6
@@ -1142,7 +1142,7 @@ sub_80EBF40: @ 80EBF40
mov r8, r1
adds r1, r7, 0
mov r2, r8
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
movs r0, 0x2
negs r0, r0
cmp r6, r0
@@ -1160,7 +1160,7 @@ _080EBFA0:
bl sub_80722CC
mov r1, r8
ldrb r0, [r1, 0xA]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
adds r0, r5, 0
bl sub_80EC094
b _080EBFEA
@@ -1176,10 +1176,10 @@ _080EBFB6:
mov r2, r8
bl sub_810713C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
mov r1, r8
ldrb r0, [r1, 0xA]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
mov r0, r10
subs r0, 0x8
add r0, r9
@@ -1217,9 +1217,9 @@ sub_80EBFFC: @ 80EBFFC
ldr r0, _080EC060 @ =0x00002ce2
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0x5
@@ -1250,7 +1250,7 @@ _080EC060: .4byte 0x00002ce2
_080EC064:
adds r0, r4, 0
movs r1, 0x1
- bl sub_80093BC
+ bl ConvertInternationalString
_080EC06C:
ldr r4, _080EC088 @ =gUnknown_2021D18
ldr r1, _080EC08C @ =gUnknown_8417806
@@ -1260,7 +1260,7 @@ _080EC06C:
adds r0, r5, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r4,r5}
pop {r0}
bx r0
@@ -1290,7 +1290,7 @@ sub_80EC094: @ 80EC094
movs r2, 0
bl sub_810713C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_810EDB0
adds r0, r5, 0
bl sub_80EB8BC
@@ -1331,7 +1331,7 @@ sub_80EC0D8: @ 80EC0D8
adds r0, r4, 0
movs r1, 0x2
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
mov r0, r8
str r0, [sp]
str r6, [sp, 0x4]
@@ -1343,7 +1343,7 @@ sub_80EC0D8: @ 80EC0D8
movs r3, 0x2
bl sub_810F7D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EC154 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -1369,7 +1369,7 @@ sub_80EC15C: @ 80EC15C
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl sub_810FA84
+ bl ProcessMenuInput_other
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -1410,7 +1410,7 @@ sub_80EC1A8: @ 80EC1A8
lsrs r4, 24
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r1, _080EC1CC @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1456,7 +1456,7 @@ sub_80EC1D4: @ 80EC1D4
movs r2, 0x1
bl sub_80BEBEC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EC216:
pop {r4}
pop {r0}
@@ -1514,7 +1514,7 @@ _080EC27E:
bl sub_80F6E9C
ldr r0, _080EC2A8 @ =sub_80EC230
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _080EC2AC @ =gUnknown_203AAC4
@@ -1532,7 +1532,7 @@ _080EC2A8: .4byte sub_80EC230
_080EC2AC: .4byte gUnknown_203AAC4
_080EC2B0:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EC2B6:
bl sub_807DC00
pop {r4}
@@ -1546,14 +1546,14 @@ sub_80EC2C0: @ 80EC2C0
ldr r0, _080EC2D4 @ =gUnknown_3005020
ldr r1, _080EC2D8 @ =sub_80EC260
str r1, [r0]
- ldr r0, _080EC2DC @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080EC2DC @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080EC2D4: .4byte gUnknown_3005020
_080EC2D8: .4byte sub_80EC260
-_080EC2DC: .4byte sub_80567DC
+_080EC2DC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80EC2C0
thumb_func_start sub_80EC2E0
@@ -1564,7 +1564,7 @@ sub_80EC2E0: @ 80EC2E0
ldr r2, _080EC2F4 @ =gUnknown_8417830
ldr r3, _080EC2F8 @ =sub_80EC2FC
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -1657,7 +1657,7 @@ sub_80EC364: @ 80EC364
ldr r3, _080EC3B0 @ =sub_80EC574
adds r0, r6, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
b _080EC3EA
.align 2, 0
_080EC3A0: .4byte gUnknown_3005008
@@ -1670,7 +1670,7 @@ _080EC3B4:
ldr r3, _080EC3F4 @ =sub_80EC574
adds r0, r6, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
adds r0, r5, 0
bl sub_8097CB4
bl sub_80EBE04
@@ -1714,7 +1714,7 @@ sub_80EC408: @ 80EC408
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _080EC420
@@ -1724,7 +1724,7 @@ sub_80EC408: @ 80EC408
_080EC420:
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r0, _080EC43C @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -1756,7 +1756,7 @@ sub_80EC444: @ 80EC444
bl sub_80563F0
bl sub_81273D8
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080EC468:
pop {r4}
pop {r0}
@@ -1783,7 +1783,7 @@ _080EC48C:
_080EC492:
ldr r0, _080EC4E8 @ =sub_80EC230
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r6, r0, 24
ldr r5, _080EC4EC @ =gUnknown_203AAC4
@@ -1823,7 +1823,7 @@ _080EC4E8: .4byte sub_80EC230
_080EC4EC: .4byte gUnknown_203AAC4
_080EC4F0:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_080EC4F6:
bl sub_807DC00
pop {r4-r6}
@@ -1837,14 +1837,14 @@ sub_80EC500: @ 80EC500
ldr r0, _080EC514 @ =gUnknown_3005020
ldr r1, _080EC518 @ =sub_80EC474
str r1, [r0]
- ldr r0, _080EC51C @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080EC51C @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080EC514: .4byte gUnknown_3005020
_080EC518: .4byte sub_80EC474
-_080EC51C: .4byte sub_80567DC
+_080EC51C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_80EC500
thumb_func_start sub_80EC520
@@ -1855,7 +1855,7 @@ sub_80EC520: @ 80EC520
ldr r2, _080EC534 @ =gUnknown_841632A
ldr r3, _080EC538 @ =sub_80EC574
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
pop {r0}
bx r0
.align 2, 0
@@ -1875,7 +1875,7 @@ sub_80EC53C: @ 80EC53C
adds r0, r4, 0
bl sub_80EBEB0
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EC56C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1900,7 +1900,7 @@ sub_80EC574: @ 80EC574
movs r0, 0x2
bl sub_810EBE0
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r1, _080EC59C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
diff --git a/asm/pokeball.s b/asm/pokeball.s
index f16c22700..6f3af5906 100644
--- a/asm/pokeball.s
+++ b/asm/pokeball.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_804A938
-sub_804A938: @ 804A938
+ thumb_func_start DoPokeballSendOutAnimation
+DoPokeballSendOutAnimation: @ 804A938
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -32,7 +32,7 @@ sub_804A938: @ 804A938
strb r1, [r0]
ldr r0, _0804A998 @ =sub_804A9A0
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0804A99C @ =gUnknown_3005090
@@ -54,7 +54,7 @@ _0804A990: .4byte gUnknown_2024018
_0804A994: .4byte gUnknown_2023BC4
_0804A998: .4byte sub_804A9A0
_0804A99C: .4byte gUnknown_3005090
- thumb_func_end sub_804A938
+ thumb_func_end DoPokeballSendOutAnimation
thumb_func_start sub_804A9A0
sub_804A9A0: @ 804A9A0
@@ -90,7 +90,7 @@ _0804A9D8:
mov r9, r0
ldrb r6, [r1, 0xE]
adds r0, r6, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0804AA04
@@ -116,14 +116,14 @@ _0804AA04:
_0804AA12:
adds r0, r1
movs r1, 0x26
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_80EF52C
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
- bl sub_804BEF4
+ bl LoadBallGfx
ldr r0, _0804AA58 @ =gUnknown_2022B4C
ldr r0, [r0]
movs r1, 0x2
@@ -132,7 +132,7 @@ _0804AA12:
beq _0804AA60
ldr r4, _0804AA5C @ =gUnknown_202273C
adds r0, r6, 0
- bl sub_8043658
+ bl GetBankMultiplayerId
lsls r1, r0, 3
subs r1, r0
lsls r1, 2
@@ -159,7 +159,7 @@ _0804AA68:
movs r1, 0x20
movs r2, 0x50
movs r3, 0x1D
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
lsls r5, r7, 4
@@ -210,13 +210,13 @@ _0804AACE:
strh r4, [r0, 0x22]
adds r2, 0x1C
adds r1, r2
- ldr r0, _0804AAF4 @ =sub_804B684
+ ldr r0, _0804AAF4 @ =SpriteCB_PlayerMonSendOut_1
str r0, [r1]
b _0804AB48
.align 2, 0
_0804AAEC: .4byte gUnknown_2023D6C
_0804AAF0: .4byte gUnknown_202063C
-_0804AAF4: .4byte sub_804B684
+_0804AAF4: .4byte SpriteCB_PlayerMonSendOut_1
_0804AAF8:
adds r0, r6, 0
movs r1, 0
@@ -238,16 +238,16 @@ _0804AAF8:
ldr r0, _0804AB30 @ =gUnknown_202063C
adds r0, 0x1C
add r0, r8
- ldr r1, _0804AB34 @ =sub_804B868
+ ldr r1, _0804AB34 @ =SpriteCB_OpponentMonSendOut
str r1, [r0]
b _0804AB46
.align 2, 0
_0804AB2C: .4byte gUnknown_2023D6C
_0804AB30: .4byte gUnknown_202063C
-_0804AB34: .4byte sub_804B868
+_0804AB34: .4byte SpriteCB_OpponentMonSendOut
_0804AB38:
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r1, _0804AB64 @ =gUnknown_2023D6C
strb r0, [r1]
movs r2, 0x1
@@ -266,7 +266,7 @@ _0804AB48:
cmp r3, 0
bne _0804AB6C
ldr r0, [sp]
- bl sub_8077508
+ bl DestroyTask
b _0804ABB8
.align 2, 0
_0804AB64: .4byte gUnknown_2023D6C
@@ -321,14 +321,14 @@ _0804ABCC: .4byte gUnknown_3005090
_0804ABD0: .4byte nullsub_43
thumb_func_end sub_804A9A0
- thumb_func_start sub_804ABD4
-sub_804ABD4: @ 804ABD4
+ thumb_func_start SpriteCB_TestBallThrow
+SpriteCB_TestBallThrow: @ 804ABD4
push {r4-r7,lr}
mov r7, r8
push {r7}
sub sp, 0x4
adds r7, r0, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _0804AC74
@@ -343,7 +343,7 @@ sub_804ABD4: @ 804ABD4
mov r8, r0
adds r0, r7, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r7, 0
adds r2, 0x2C
ldrb r0, [r2]
@@ -363,7 +363,7 @@ sub_804ABD4: @ 804ABD4
strh r1, [r7, 0x26]
strh r1, [r7, 0x38]
adds r0, r5, 0
- bl sub_804BF90
+ bl GetBankPokeballItemId
lsls r0, 16
lsrs r0, 16
bl sub_80EF52C
@@ -380,12 +380,12 @@ sub_804ABD4: @ 804ABD4
str r4, [sp]
movs r2, 0x1
movs r3, 0x1C
- bl sub_80F05EC
+ bl LaunchBallStarsTask
movs r0, 0
adds r1, r5, 0
movs r2, 0xE
adds r3, r4, 0
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x2E]
@@ -393,7 +393,7 @@ sub_804ABD4: @ 804ABD4
mov r0, r8
strh r0, [r7, 0x3C]
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0804AC84 @ =sub_804AC88
str r0, [r7, 0x1C]
_0804AC74:
@@ -406,7 +406,7 @@ _0804AC74:
.align 2, 0
_0804AC80: .4byte gUnknown_3005090
_0804AC84: .4byte sub_804AC88
- thumb_func_end sub_804ABD4
+ thumb_func_end SpriteCB_TestBallThrow
thumb_func_start sub_804AC88
sub_804AC88: @ 804AC88
@@ -443,7 +443,7 @@ sub_804AC94: @ 804AC94
ldr r4, _0804ACFC @ =gUnknown_202063C
adds r0, r4
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x3A
ldrsh r0, [r6, r1]
adds r0, r5
@@ -452,7 +452,7 @@ sub_804AC94: @ 804AC94
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007824
+ bl AnimateSprite
movs r1, 0x3A
ldrsh r0, [r6, r1]
adds r0, r5
@@ -504,7 +504,7 @@ _0804AD18:
bge _0804AD70
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
movs r2, 0x3A
ldrsh r0, [r4, r2]
adds r0, r5
@@ -574,14 +574,14 @@ sub_804AD98: @ 804AD98
strh r1, [r4, 0x38]
movs r0, 0
movs r1, 0x20
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
movs r0, 0x36
ldrsh r1, [r4, r0]
movs r0, 0
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldr r0, _0804ADE8 @ =sub_804ADEC
@@ -612,7 +612,7 @@ _0804AE02:
ldrsh r0, [r4, r1]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -672,7 +672,7 @@ _0804AE76:
ldrsh r0, [r4, r2]
movs r2, 0x36
ldrsh r1, [r4, r2]
- bl sub_8044E4C
+ bl Cos
negs r0, r0
strh r0, [r4, 0x26]
ldrh r1, [r4, 0x38]
@@ -696,7 +696,7 @@ _0804AEA2:
strh r5, [r4, 0x34]
movs r0, 0x40
movs r1, 0x20
- bl sub_8044E4C
+ bl Cos
ldrh r1, [r4, 0x22]
adds r0, r1
strh r0, [r4, 0x22]
@@ -746,7 +746,7 @@ sub_804AEE4: @ 804AEE4
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, _0804AF20 @ =sub_804AF24
str r0, [r4, 0x1C]
movs r0, 0x17
@@ -836,12 +836,12 @@ _0804AF86:
bge _0804AFC2
adds r0, r4, 0
movs r1, 0x2
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _0804B06A
_0804AFC2:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
b _0804B06A
_0804AFCC:
adds r0, r4, 0
@@ -907,21 +907,21 @@ _0804B024:
strh r0, [r4, 0x34]
adds r0, r4, 0
movs r1, 0x3
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x36
ldrsh r0, [r4, r1]
cmp r0, 0
bge _0804B05C
adds r0, r4, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0804B064
.align 2, 0
_0804B058: .4byte 0xffffff00
_0804B05C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0804B064:
movs r0, 0x17
bl sub_80722CC
@@ -931,8 +931,8 @@ _0804B06A:
bx r0
thumb_func_end sub_804AF24
- thumb_func_start sub_804B070
-sub_804B070: @ 804B070
+ thumb_func_start Task_PlayCryWhenReleasedFromBall
+Task_PlayCryWhenReleasedFromBall: @ 804B070
push {r4-r7,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1015,24 +1015,24 @@ _0804B148:
b _0804B262
_0804B14E:
adds r0, r3, 0
- bl sub_8035A28
+ bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _0804B166
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0
- bl sub_8071E60
+ bl PlayCry3
b _0804B1C6
_0804B166:
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0xB
- bl sub_8071E60
+ bl PlayCry3
b _0804B1C6
_0804B174:
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldr r1, _0804B18C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1056,24 +1056,24 @@ _0804B190:
cmp r0, 0
bne _0804B232
adds r0, r3, 0
- bl sub_8035A28
+ bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _0804B1BA
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0x1
- bl sub_8071EC0
+ bl PlayCry4
b _0804B1C6
_0804B1BA:
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0xC
- bl sub_8071EC0
+ bl PlayCry4
_0804B1C6:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _0804B262
_0804B1CE:
lsls r0, r4, 2
@@ -1099,11 +1099,11 @@ _0804B1E0:
adds r0, 0x1
strh r0, [r1, 0x26]
_0804B1F8:
- bl sub_80721F0
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
cmp r0, 0
bne _0804B262
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldr r0, _0804B21C @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -1133,29 +1133,29 @@ _0804B232:
b _0804B262
_0804B238:
adds r0, r3, 0
- bl sub_8035A28
+ bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _0804B250
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0
- bl sub_8071EC0
+ bl PlayCry4
b _0804B25C
_0804B250:
lsls r1, r5, 24
asrs r1, 24
adds r0, r6, 0
movs r2, 0xB
- bl sub_8071EC0
+ bl PlayCry4
_0804B25C:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0804B262:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_804B070
+ thumb_func_end Task_PlayCryWhenReleasedFromBall
thumb_func_start sub_804B268
sub_804B268: @ 804B268
@@ -1170,9 +1170,9 @@ sub_804B268: @ 804B268
lsrs r5, r0, 24
adds r0, r6, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0
- bl sub_804BF90
+ bl GetBankPokeballItemId
lsls r0, 16
lsrs r0, 16
bl sub_80EF52C
@@ -1189,18 +1189,18 @@ sub_804B268: @ 804B268
str r4, [sp]
movs r2, 0x1
movs r3, 0x1C
- bl sub_80F05EC
+ bl LaunchBallStarsTask
ldrh r1, [r6, 0x3A]
lsls r1, 24
lsrs r1, 24
movs r0, 0x1
movs r2, 0xE
adds r3, r4, 0
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x2E]
- ldr r0, _0804B2FC @ =sub_804B4A4
+ ldr r0, _0804B2FC @ =HandleBallAnimEnd
str r0, [r6, 0x1C]
ldr r0, _0804B300 @ =gUnknown_30030F0
ldr r1, _0804B304 @ =0x00000439
@@ -1213,7 +1213,7 @@ sub_804B268: @ 804B268
b _0804B420
_0804B2DA:
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0804B310
@@ -1229,7 +1229,7 @@ _0804B2DA:
mov r9, r3
b _0804B324
.align 2, 0
-_0804B2FC: .4byte sub_804B4A4
+_0804B2FC: .4byte HandleBallAnimEnd
_0804B300: .4byte gUnknown_30030F0
_0804B304: .4byte 0x00000439
_0804B308: .4byte gUnknown_2023BCE
@@ -1248,18 +1248,18 @@ _0804B310:
_0804B324:
adds r0, r7, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _0804B34E
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1283,7 +1283,7 @@ _0804B34E:
ands r0, r1
cmp r0, 0
beq _0804B39C
- bl sub_8072424
+ bl IsBGMPlaying
lsls r0, 24
cmp r0, 0
beq _0804B3A6
@@ -1323,13 +1323,13 @@ _0804B3C8: .4byte 0x0000ffff
_0804B3CC: .4byte gUnknown_2024018
_0804B3D0:
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
beq _0804B3EC
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -1340,9 +1340,9 @@ _0804B3EC:
_0804B3F0:
movs r4, 0x2
_0804B3F2:
- ldr r0, _0804B474 @ =sub_804B070
+ ldr r0, _0804B474 @ =Task_PlayCryWhenReleasedFromBall
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0804B478 @ =gUnknown_3005090
@@ -1374,7 +1374,7 @@ _0804B420:
ldr r4, _0804B480 @ =gUnknown_202063C
adds r0, r4
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r3, 0x3A
ldrsh r0, [r6, r3]
adds r0, r5
@@ -1383,7 +1383,7 @@ _0804B420:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007824
+ bl AnimateSprite
movs r1, 0x3A
ldrsh r0, [r6, r1]
adds r0, r5
@@ -1403,7 +1403,7 @@ _0804B420:
pop {r0}
bx r0
.align 2, 0
-_0804B474: .4byte sub_804B070
+_0804B474: .4byte Task_PlayCryWhenReleasedFromBall
_0804B478: .4byte gUnknown_3005090
_0804B47C: .4byte gUnknown_2023D44
_0804B480: .4byte gUnknown_202063C
@@ -1428,8 +1428,8 @@ sub_804B484: @ 804B484
_0804B4A0: .4byte sub_804B5C8
thumb_func_end sub_804B484
- thumb_func_start sub_804B4A4
-sub_804B4A4: @ 804B4A4
+ thumb_func_start HandleBallAnimEnd
+HandleBallAnimEnd: @ 804B4A4
push {r4-r7,lr}
adds r5, r0, 0
movs r7, 0
@@ -1477,7 +1477,7 @@ _0804B4E6:
bge _0804B510
adds r0, r1, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r7, 0x1
b _0804B52C
.align 2, 0
@@ -1534,9 +1534,9 @@ _0804B52C:
ands r0, r2
strb r0, [r1]
adds r0, r5, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
movs r3, 0
ldr r0, [r4]
ldr r2, [r0, 0x4]
@@ -1560,7 +1560,7 @@ _0804B592:
_0804B5A0:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_804BF64
+ bl FreeBallGfx
adds r4, 0x1
cmp r4, 0xB
ble _0804B5A0
@@ -1574,7 +1574,7 @@ _0804B5B8: .4byte gUnknown_202063C
_0804B5BC: .4byte gUnknown_2023D44
_0804B5C0: .4byte gUnknown_2024005
_0804B5C4: .4byte gUnknown_2024018
- thumb_func_end sub_804B4A4
+ thumb_func_end HandleBallAnimEnd
thumb_func_start sub_804B5C8
sub_804B5C8: @ 804B5C8
@@ -1619,7 +1619,7 @@ _0804B600:
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
movs r1, 0x3A
ldrsh r0, [r6, r1]
adds r0, r4
@@ -1628,9 +1628,9 @@ _0804B600:
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
adds r0, r6, 0
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
ldr r0, _0804B678 @ =gUnknown_30030F0
ldr r1, _0804B67C @ =0x00000439
adds r0, r1
@@ -1664,8 +1664,8 @@ _0804B67C: .4byte 0x00000439
_0804B680: .4byte gUnknown_2024018
thumb_func_end sub_804B5C8
- thumb_func_start sub_804B684
-sub_804B684: @ 804B684
+ thumb_func_start SpriteCB_PlayerMonSendOut_1
+SpriteCB_PlayerMonSendOut_1: @ 804B684
push {r4,lr}
adds r4, r0, 0
movs r0, 0x19
@@ -1693,18 +1693,18 @@ sub_804B684: @ 804B684
strh r0, [r4, 0x6]
adds r0, r4, 0
bl sub_8075068
- ldr r0, _0804B6D0 @ =sub_804B6D4
+ ldr r0, _0804B6D0 @ =SpriteCB_PlayerMonSendOut_2
str r0, [r4, 0x1C]
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0804B6CC: .4byte 0x0000ffe2
-_0804B6D0: .4byte sub_804B6D4
- thumb_func_end sub_804B684
+_0804B6D0: .4byte SpriteCB_PlayerMonSendOut_2
+ thumb_func_end SpriteCB_PlayerMonSendOut_1
- thumb_func_start sub_804B6D4
-sub_804B6D4: @ 804B6D4
+ thumb_func_start SpriteCB_PlayerMonSendOut_2
+SpriteCB_PlayerMonSendOut_2: @ 804B6D4
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1750,7 +1750,7 @@ sub_804B6D4: @ 804B6D4
strh r7, [r5, 0x32]
adds r0, r5, 0
movs r1, 0x4
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0804B736:
ldrh r4, [r5, 0x2E]
adds r0, r5, 0
@@ -1769,7 +1769,7 @@ _0804B736:
ands r0, r2
movs r2, 0x38
ldrsh r1, [r5, r2]
- bl sub_8044E30
+ bl Sin
ldrh r1, [r5, 0x26]
adds r0, r1
strh r0, [r5, 0x26]
@@ -1825,7 +1825,7 @@ _0804B78E:
b _0804B834
_0804B7C8:
adds r0, r5, 0
- bl sub_8075094
+ bl AnimateBallThrow
lsls r0, 24
cmp r0, 0
beq _0804B834
@@ -1858,23 +1858,23 @@ _0804B7C8:
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0
bne _0804B828
- ldr r0, _0804B824 @ =sub_804B844
+ ldr r0, _0804B824 @ =SpriteCB_ReleaseMon2FromBall
b _0804B82A
.align 2, 0
_0804B820: .4byte gUnknown_2024018
-_0804B824: .4byte sub_804B844
+_0804B824: .4byte SpriteCB_ReleaseMon2FromBall
_0804B828:
ldr r0, _0804B840 @ =sub_804B268
_0804B82A:
str r0, [r5, 0x1C]
adds r0, r5, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0804B834:
pop {r3}
mov r8, r3
@@ -1883,10 +1883,10 @@ _0804B834:
bx r0
.align 2, 0
_0804B840: .4byte sub_804B268
- thumb_func_end sub_804B6D4
+ thumb_func_end SpriteCB_PlayerMonSendOut_2
- thumb_func_start sub_804B844
-sub_804B844: @ 804B844
+ thumb_func_start SpriteCB_ReleaseMon2FromBall
+SpriteCB_ReleaseMon2FromBall: @ 804B844
push {lr}
adds r2, r0, 0
ldrh r0, [r2, 0x2E]
@@ -1905,10 +1905,10 @@ _0804B85E:
bx r0
.align 2, 0
_0804B864: .4byte sub_804B268
- thumb_func_end sub_804B844
+ thumb_func_end SpriteCB_ReleaseMon2FromBall
- thumb_func_start sub_804B868
-sub_804B868: @ 804B868
+ thumb_func_start SpriteCB_OpponentMonSendOut
+SpriteCB_OpponentMonSendOut: @ 804B868
push {r4,r5,lr}
adds r5, r0, 0
ldrh r0, [r5, 0x2E]
@@ -1935,16 +1935,16 @@ sub_804B868: @ 804B868
movs r0, 0x3A
ldrsh r4, [r5, r0]
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
cmp r4, r0
bne _0804B8B8
- ldr r0, _0804B8B4 @ =sub_804B844
+ ldr r0, _0804B8B4 @ =SpriteCB_ReleaseMon2FromBall
b _0804B8BA
.align 2, 0
_0804B8B0: .4byte gUnknown_2024018
-_0804B8B4: .4byte sub_804B844
+_0804B8B4: .4byte SpriteCB_ReleaseMon2FromBall
_0804B8B8:
ldr r0, _0804B8C4 @ =sub_804B268
_0804B8BA:
@@ -1955,10 +1955,10 @@ _0804B8BC:
bx r0
.align 2, 0
_0804B8C4: .4byte sub_804B268
- thumb_func_end sub_804B868
+ thumb_func_end SpriteCB_OpponentMonSendOut
- thumb_func_start sub_804B8C8
-sub_804B8C8: @ 804B8C8
+ thumb_func_start LaunchBallStarsTaskForPokeball
+LaunchBallStarsTaskForPokeball: @ 804B8C8
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -1971,32 +1971,32 @@ sub_804B8C8: @ 804B8C8
lsrs r3, 24
movs r4, 0
str r4, [sp]
- bl sub_80F05EC
+ bl LaunchBallStarsTask
lsls r0, 24
lsrs r0, 24
add sp, 0x4
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_804B8C8
+ thumb_func_end LaunchBallStarsTaskForPokeball
- thumb_func_start sub_804B8F0
-sub_804B8F0: @ 804B8F0
+ thumb_func_start LaunchBallFadeMonTaskForPokeball
+LaunchBallFadeMonTaskForPokeball: @ 804B8F0
push {lr}
lsls r0, 24
lsrs r0, 24
lsls r1, 24
lsrs r1, 24
movs r3, 0
- bl sub_80F1218
+ bl LaunchBallFadeMonTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_804B8F0
+ thumb_func_end LaunchBallFadeMonTaskForPokeball
- thumb_func_start sub_804B908
-sub_804B908: @ 804B908
+ thumb_func_start CreatePokeballSpriteToReleaseMon
+CreatePokeballSpriteToReleaseMon: @ 804B908
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2036,7 +2036,7 @@ sub_804B908: @ 804B908
mov r1, r9
mov r2, r10
adds r3, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r3, _0804B9E0 @ =gUnknown_202063C
@@ -2101,7 +2101,7 @@ _0804B9D8: .4byte gUnknown_82605CC
_0804B9DC: .4byte gUnknown_82606F4
_0804B9E0: .4byte gUnknown_202063C
_0804B9E4: .4byte sub_804B9E8
- thumb_func_end sub_804B908
+ thumb_func_end CreatePokeballSpriteToReleaseMon
thumb_func_start sub_804B9E8
sub_804B9E8: @ 804B9E8
@@ -2139,7 +2139,7 @@ _0804BA22:
_0804BA24:
adds r0, r6, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r6, 0x20]
lsls r0, 24
lsrs r0, 24
@@ -2151,11 +2151,11 @@ _0804BA24:
lsls r2, 28
lsrs r2, 30
adds r3, r5, 0
- bl sub_804B8C8
+ bl LaunchBallStarsTaskForPokeball
movs r0, 0x1
mov r1, r8
adds r2, r4, 0
- bl sub_804B8F0
+ bl LaunchBallFadeMonTaskForPokeball
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -2176,9 +2176,9 @@ _0804BA24:
strb r0, [r2]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
movs r0, 0x80
lsls r0, 5
strh r0, [r4, 0x30]
@@ -2235,7 +2235,7 @@ _0804BACE:
bge _0804BAF0
adds r0, r5, 0
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r1, 0x1
mov r12, r1
_0804BAF0:
@@ -2320,7 +2320,7 @@ _0804BB72:
cmp r6, 0
beq _0804BB90
adds r0, r4, 0
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0804BB90:
pop {r4-r7}
pop {r0}
@@ -2369,7 +2369,7 @@ sub_804BB98: @ 804BB98
adds r1, r6, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r6, _0804BC48 @ =gUnknown_202063C
@@ -2452,7 +2452,7 @@ _0804BC8A:
_0804BC8C:
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x20]
lsls r0, 24
lsrs r0, 24
@@ -2464,11 +2464,11 @@ _0804BC8C:
lsls r2, 28
lsrs r2, 30
adds r3, r6, 0
- bl sub_804B8C8
+ bl LaunchBallStarsTaskForPokeball
movs r0, 0x1
mov r1, r8
adds r2, r5, 0
- bl sub_804B8F0
+ bl LaunchBallFadeMonTaskForPokeball
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -2482,9 +2482,9 @@ _0804BC8C:
adds r4, r0
adds r0, r4, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
strh r5, [r4, 0x30]
b _0804BCEC
.align 2, 0
@@ -2531,7 +2531,7 @@ _0804BD10:
bge _0804BD54
adds r0, r5, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -2580,13 +2580,13 @@ _0804BD80:
_0804BD84: .4byte nullsub_8
thumb_func_end sub_804BD6C
- thumb_func_start sub_804BD88
-sub_804BD88: @ 804BD88
+ thumb_func_start DestroySpriteAndFreeResources_
+DestroySpriteAndFreeResources_: @ 804BD88
push {lr}
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
pop {r0}
bx r0
- thumb_func_end sub_804BD88
+ thumb_func_end DestroySpriteAndFreeResources_
thumb_func_start sub_804BD94
sub_804BD94: @ 804BD94
@@ -2612,7 +2612,7 @@ sub_804BD94: @ 804BD94
ldr r0, _0804BE1C @ =sub_804BE48
str r0, [r4, 0x1C]
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0804BDE2
@@ -2641,7 +2641,7 @@ _0804BDE2:
ldr r1, [r1]
bl _call_via_r1
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -2705,15 +2705,15 @@ _0804BE66:
_0804BE6C: .4byte nullsub_8
thumb_func_end sub_804BE48
- thumb_func_start sub_804BE70
-sub_804BE70: @ 804BE70
+ thumb_func_start DoHitAnimHealthboxEffect
+DoHitAnimHealthboxEffect: @ 804BE70
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- ldr r5, _0804BEA8 @ =sub_804BEB4
+ ldr r5, _0804BEA8 @ =SpriteCB_HitAnimHealthoxEffect
adds r0, r5, 0
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
lsls r0, 24
lsrs r0, 24
ldr r2, _0804BEAC @ =gUnknown_202063C
@@ -2734,13 +2734,13 @@ sub_804BE70: @ 804BE70
pop {r0}
bx r0
.align 2, 0
-_0804BEA8: .4byte sub_804BEB4
+_0804BEA8: .4byte SpriteCB_HitAnimHealthoxEffect
_0804BEAC: .4byte gUnknown_202063C
_0804BEB0: .4byte gUnknown_3004FF0
- thumb_func_end sub_804BE70
+ thumb_func_end DoHitAnimHealthboxEffect
- thumb_func_start sub_804BEB4
-sub_804BEB4: @ 804BEB4
+ thumb_func_start SpriteCB_HitAnimHealthoxEffect
+SpriteCB_HitAnimHealthoxEffect: @ 804BEB4
push {lr}
adds r3, r0, 0
ldrh r1, [r3, 0x30]
@@ -2767,16 +2767,16 @@ sub_804BEB4: @ 804BEB4
strh r2, [r1, 0x24]
strh r2, [r1, 0x26]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_0804BEEC:
pop {r0}
bx r0
.align 2, 0
_0804BEF0: .4byte gUnknown_202063C
- thumb_func_end sub_804BEB4
+ thumb_func_end SpriteCB_HitAnimHealthoxEffect
- thumb_func_start sub_804BEF4
-sub_804BEF4: @ 804BEF4
+ thumb_func_start LoadBallGfx
+LoadBallGfx: @ 804BEF4
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2784,7 +2784,7 @@ sub_804BEF4: @ 804BEF4
lsls r6, r4, 3
adds r5, r6, r0
ldrh r0, [r5, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _0804BF54 @ =0xffff0000
cmp r0, r1
@@ -2808,14 +2808,14 @@ _0804BF2C:
lsls r0, r4, 3
adds r0, r1
ldrh r0, [r0, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
adds r1, r0, 0
lsls r1, 16
ldr r0, _0804BF5C @ =gUnknown_8D022E8
lsrs r1, 11
ldr r2, _0804BF60 @ =0x06010100
adds r1, r2
- bl sub_800EBC0
+ bl LZDecompressVram
_0804BF48:
pop {r4-r6}
pop {r0}
@@ -2826,10 +2826,10 @@ _0804BF54: .4byte 0xffff0000
_0804BF58: .4byte gUnknown_82605CC
_0804BF5C: .4byte gUnknown_8D022E8
_0804BF60: .4byte 0x06010100
- thumb_func_end sub_804BEF4
+ thumb_func_end LoadBallGfx
- thumb_func_start sub_804BF64
-sub_804BF64: @ 804BF64
+ thumb_func_start FreeBallGfx
+FreeBallGfx: @ 804BF64
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2837,26 +2837,26 @@ sub_804BF64: @ 804BF64
lsrs r4, 21
adds r0, r4, r0
ldrh r0, [r0, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0804BF8C @ =gUnknown_82605CC
adds r4, r0
ldrh r0, [r4, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0804BF88: .4byte gUnknown_826056C
_0804BF8C: .4byte gUnknown_82605CC
- thumb_func_end sub_804BF64
+ thumb_func_end FreeBallGfx
- thumb_func_start sub_804BF90
-sub_804BF90: @ 804BF90
+ thumb_func_start GetBankPokeballItemId
+GetBankPokeballItemId: @ 804BF90
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0804BFBC
@@ -2882,7 +2882,7 @@ _0804BFBC:
_0804BFCA:
adds r0, r1
movs r1, 0x26
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r4}
@@ -2891,6 +2891,6 @@ _0804BFCA:
.align 2, 0
_0804BFDC: .4byte gUnknown_2023BCE
_0804BFE0: .4byte gUnknown_2024284
- thumb_func_end sub_804BF90
+ thumb_func_end GetBankPokeballItemId
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokedex.s b/asm/pokedex.s
index 35c369cb1..5eb3bc948 100644
--- a/asm/pokedex.s
+++ b/asm/pokedex.s
@@ -172,7 +172,7 @@ _08088F28:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_80432E0
+ bl HoennToNationalOrder
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
diff --git a/asm/pokedex_area_markers.s b/asm/pokedex_area_markers.s
index a38fc5c6a..77fa41b78 100644
--- a/asm/pokedex_area_markers.s
+++ b/asm/pokedex_area_markers.s
@@ -66,7 +66,7 @@ sub_8134230: @ 8134230
ands r2, r5
orrs r2, r1
str r2, [r0, 0x4]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _081343D0 @ =gUnknown_846341C
mov r3, r8
lsls r3, 4
@@ -75,10 +75,10 @@ sub_8134230: @ 8134230
lsls r1, 1
add r1, r8
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _081343D4 @ =sub_8134200
movs r1, 0
- bl sub_807741C
+ bl CreateTask
mov r10, r0
mov r0, r10
lsls r0, 24
@@ -97,7 +97,7 @@ sub_8134230: @ 8134230
strh r5, [r4, 0x10]
movs r0, 0xF0
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
str r1, [r4, 0x8]
str r1, [r4, 0x4]
@@ -107,22 +107,22 @@ sub_8134230: @ 8134230
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _081343DC @ =0x00002f42
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _081343E0 @ =0x0000080c
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _081343E4 @ =0x00001f1f
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _081343E8 @ =0x00002f3d
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
add r1, sp, 0x8
ldr r0, _081343EC @ =gUnknown_8231D00
ldm r0!, {r2,r3,r5}
@@ -135,7 +135,7 @@ sub_8134230: @ 8134230
movs r1, 0x68
adds r2, r6, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
strb r0, [r4, 0xD]
ldrb r1, [r4, 0xD]
lsls r0, r1, 4
@@ -144,7 +144,7 @@ sub_8134230: @ 8134230
ldr r5, _081343F0 @ =gUnknown_202063C
adds r0, r5
adds r1, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
ldrb r1, [r4, 0xD]
lsls r0, r1, 4
adds r0, r1
@@ -190,11 +190,11 @@ sub_8134230: @ 8134230
orrs r1, r2
strb r1, [r0]
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -203,11 +203,11 @@ sub_8134230: @ 8134230
movs r1, 0xF
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
mov r0, r10
add sp, 0x28
pop {r3-r5}
@@ -245,42 +245,42 @@ sub_81343F4: @ 81343F4
ldr r0, _08134498 @ =gUnknown_3005098
adds r4, r0
ldrh r0, [r4, 0xE]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrb r1, [r4, 0xD]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
ldr r1, _0813449C @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r4, 0x8]
- bl sub_8002BC4
+ bl Free
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _081344A0 @ =0x00001f1f
movs r0, 0x48
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
movs r1, 0x1
movs r2, 0x2
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x1E
str r0, [sp]
movs r0, 0x14
@@ -289,13 +289,13 @@ sub_81343F4: @ 81343F4
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
add sp, 0x8
pop {r4,r5}
pop {r0}
diff --git a/asm/pokedex_screen.s b/asm/pokedex_screen.s
index c96b634fe..c59e94d66 100644
--- a/asm/pokedex_screen.s
+++ b/asm/pokedex_screen.s
@@ -8,9 +8,9 @@
thumb_func_start sub_81024C0
sub_81024C0: @ 81024C0
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_81024C0
@@ -24,20 +24,20 @@ sub_81024D4: @ 81024D4
ands r0, r1
cmp r0, 0
beq _081024EC
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _08102504
_081024EC:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
b _08102508
.align 2, 0
_08102500: .4byte gUnknown_2037AB8
_08102504:
- bl sub_80704D0
+ bl UpdatePaletteFade
_08102508:
pop {r0}
bx r0
@@ -54,11 +54,11 @@ sub_810250C: @ 810250C
lsrs r6, r0, 24
bl m4aSoundVSyncOff
movs r0, 0
- bl sub_80006F4
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
- bl sub_8087E64
+ bl SetVBlankCallback
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
+ bl remove_some_task
movs r0, 0x1
bl sub_8001618
ldr r1, _08102598 @ =gUnknown_8451EBC
@@ -68,25 +68,25 @@ sub_810250C: @ 810250C
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
cmp r6, 0
beq _081025A0
ldr r1, _0810259C @ =gUnknown_84403AC
@@ -113,18 +113,18 @@ _081025AE:
bl sub_8002C28
bl m4aSoundVSyncOn
ldr r0, _081026AC @ =sub_81024C0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
ldr r0, _081026B0 @ =sub_810287C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, _081026B4 @ =gUnknown_203ACF0
movs r0, 0x70
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
ldr r1, _081026B8 @ =gUnknown_8451EE4
movs r2, 0x70
@@ -133,7 +133,7 @@ _081025AE:
strb r4, [r0]
movs r0, 0xC1
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
ldr r1, [r5]
str r0, [r1, 0x44]
movs r0, 0
@@ -165,35 +165,35 @@ _081025AE:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r2, _081026BC @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
@@ -205,7 +205,7 @@ _081025AE:
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
b _081026D0
.align 2, 0
_081026A4: .4byte gUnknown_8440274
@@ -221,7 +221,7 @@ _081026C4:
movs r2, 0x80
lsls r2, 2
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
_081026D0:
movs r4, 0x20
str r4, [sp]
@@ -232,7 +232,7 @@ _081026D0:
movs r1, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
movs r5, 0x11
@@ -241,7 +241,7 @@ _081026D0:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -249,7 +249,7 @@ _081026D0:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
movs r0, 0x2
mov r8, r0
@@ -260,7 +260,7 @@ _081026D0:
movs r1, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
movs r0, 0x10
str r0, [sp, 0x4]
@@ -269,7 +269,7 @@ _081026D0:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
mov r0, r8
str r0, [sp, 0x4]
@@ -278,7 +278,7 @@ _081026D0:
movs r1, 0x3
movs r2, 0
movs r3, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r3}
mov r8, r3
@@ -296,18 +296,18 @@ sub_810275C: @ 810275C
movs r1, 0xC0
lsls r1, 7
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08102794 @ =sub_81024D4
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x4
bl sub_812B1F0
pop {r0}
@@ -345,7 +345,7 @@ _081027BE:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrb r0, [r4]
adds r0, 0x1
_081027D2:
@@ -365,7 +365,7 @@ _081027D8:
.align 2, 0
_081027E8: .4byte gUnknown_2037AB8
_081027EC:
- bl sub_80704D0
+ bl UpdatePaletteFade
b _081027D4
_081027F2:
ldr r4, _08102854 @ =gUnknown_203ACF0
@@ -373,37 +373,37 @@ _081027F2:
ldr r0, [r0, 0x44]
cmp r0, 0
beq _08102800
- bl sub_8002BC4
+ bl Free
_08102800:
ldr r0, [r4]
cmp r0, 0
beq _0810280A
- bl sub_8002BC4
+ bl Free
_0810280A:
bl sub_8003ECC
movs r0, 0
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
beq _0810281C
- bl sub_8002BC4
+ bl Free
_0810281C:
movs r0, 0x1
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
beq _0810282A
- bl sub_8002BC4
+ bl Free
_0810282A:
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
beq _08102838
- bl sub_8002BC4
+ bl Free
_08102838:
movs r0, 0x3
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
beq _08102846
- bl sub_8002BC4
+ bl Free
_08102846:
bl sub_807249C
_0810284A:
@@ -427,9 +427,9 @@ sub_8102858: @ 8102858
movs r1, 0xC0
lsls r1, 7
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r0, _08102878 @ =sub_80568A8
- bl sub_8000544
+ bl SetMainCallback2
_08102874:
pop {r0}
bx r0
@@ -500,7 +500,7 @@ _081028FC:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
adds r0, 0x14
bl sub_81047B0
@@ -511,9 +511,9 @@ _081028FC:
adds r0, 0x16
bl sub_81047B0
ldr r0, _0810292C @ =sub_8102858
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08102C18
.align 2, 0
_0810292C: .4byte sub_8102858
@@ -527,13 +527,13 @@ _08102930:
_0810293C: .4byte gUnknown_203ACF0
_08102940:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08102960 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x4
@@ -542,13 +542,13 @@ _08102940:
_08102960: .4byte gUnknown_203ACF0
_08102964:
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r2, _081029A4 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x80
@@ -565,7 +565,7 @@ _08102964:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _081029BC
.align 2, 0
_081029A4: .4byte gUnknown_2037AB8
@@ -577,7 +577,7 @@ _081029AC:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_081029BC:
ldr r0, _081029CC @ =gUnknown_203ACF0
ldr r1, [r0]
@@ -593,7 +593,7 @@ _081029D0:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
bl sub_806E25C
cmp r0, 0
beq _081029F4
@@ -607,7 +607,7 @@ _081029F4:
_081029F6:
ldr r1, [r4]
adds r1, 0x62
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, [r4]
adds r1, 0x60
strb r0, [r1]
@@ -621,13 +621,13 @@ _08102A10: .4byte gUnknown_203ACF0
_08102A14:
ldr r0, [r4]
ldrb r0, [r0, 0x17]
- bl sub_8107078
+ bl ListMenuHandleInput
ldr r1, [r4]
str r0, [r1, 0xC]
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _08102A4C @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -669,7 +669,7 @@ _08102A72:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
ldr r1, [r0, 0xC]
adds r0, 0x28
@@ -680,7 +680,7 @@ _08102A72:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x7
b _08102C16
@@ -692,7 +692,7 @@ _08102AA4:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
ldr r0, [r1, 0xC]
subs r0, 0x9
@@ -704,7 +704,7 @@ _08102AA4:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x9
b _08102C16
@@ -716,7 +716,7 @@ _08102ADC:
adds r0, r2, 0
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
ldr r1, [r0, 0xC]
subs r1, 0x9
@@ -731,7 +731,7 @@ _08102ADC:
str r1, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x8
b _08102C16
@@ -763,9 +763,9 @@ _08102B24:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
adds r0, 0x14
bl sub_81047B0
@@ -806,7 +806,7 @@ _08102B94:
adds r2, 0x10
bl sub_810713C
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, [r4]
adds r0, 0x14
bl sub_81047B0
@@ -834,7 +834,7 @@ _08102BD8:
adds r2, 0x10
bl sub_810713C
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, [r4]
adds r0, 0x14
bl sub_81047B0
@@ -884,7 +884,7 @@ sub_8102C28: @ 8102C28
movs r1, 0xE
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
movs r6, 0x11
@@ -893,7 +893,7 @@ sub_8102C28: @ 8102C28
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r4, [sp, 0x4]
str r6, [sp, 0x8]
@@ -901,7 +901,7 @@ sub_8102C28: @ 8102C28
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _08102DA4 @ =gUnknown_8451F54
bl sub_8003CE4
ldr r7, _08102DA8 @ =gUnknown_203ACF0
@@ -934,13 +934,13 @@ _08102C9E:
ldrh r1, [r0, 0x12]
ldrh r2, [r0, 0x10]
add r0, sp, 0xC
- bl sub_8106FF8
+ bl ListMenuInit
ldr r1, [r7]
strb r0, [r1, 0x17]
ldr r0, [r7]
ldrb r0, [r0, 0x16]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r7]
ldrb r0, [r0, 0x16]
ldr r2, _08102DB8 @ =gUnknown_8415DC4
@@ -1064,13 +1064,13 @@ _08102DC8:
ldrh r1, [r0, 0x12]
ldrh r2, [r0, 0x10]
add r0, sp, 0xC
- bl sub_8106FF8
+ bl ListMenuInit
ldr r1, [r7]
strb r0, [r1, 0x17]
ldr r0, [r7]
ldrb r0, [r0, 0x16]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r7]
ldrb r0, [r0, 0x16]
ldr r2, _08102EAC @ =gUnknown_8415DC4
@@ -1113,29 +1113,29 @@ _08102DC8:
_08102E4A:
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08102EB4 @ =gUnknown_8415D9C
movs r1, 0x1
bl sub_8106E78
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08102EB8 @ =gUnknown_8415DB8
bl sub_8104C2C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
ldr r4, _08102EBC @ =gUnknown_203ACF0
ldr r0, [r4]
ldrb r0, [r0, 0x16]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldrb r0, [r0, 0x16]
movs r1, 0x2
@@ -1176,11 +1176,11 @@ _08102ED0:
ldr r1, _08102EF8 @ =gUnknown_8440EF0
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r0, _08102EFC @ =gUnknown_8443460
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08102F24
.align 2, 0
_08102EF4: .4byte gUnknown_203ACF0
@@ -1196,18 +1196,18 @@ _08102F00:
ldr r1, [r1]
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
adds r4, 0x4
adds r5, r4
ldr r0, [r5]
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_08102F24:
ldr r4, _08102F40 @ =gUnknown_203ACF0
ldr r0, [r4]
ldrb r0, [r0, 0x15]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldrb r0, [r0, 0x15]
movs r1, 0x2
@@ -1311,7 +1311,7 @@ _08102FF8:
ldrb r0, [r0]
bl sub_8103988
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, [r4]
adds r0, 0x40
bl sub_81047B0
@@ -1335,9 +1335,9 @@ _08103028:
_08103034: .4byte gUnknown_203ACF0
_08103038:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0810304C @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x4
@@ -1346,14 +1346,14 @@ _08103038:
_0810304C: .4byte gUnknown_203ACF0
_08103050:
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08103070 @ =0xffff7fff
ldr r1, _08103074 @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08103078 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x5
@@ -1367,7 +1367,7 @@ _0810307C:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1379,13 +1379,13 @@ _08103098:
ldr r0, [r4]
adds r0, 0x41
ldrb r0, [r0]
- bl sub_8107078
+ bl ListMenuHandleInput
ldr r1, [r4]
str r0, [r1, 0x30]
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _081030F0 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r3, 0x1
@@ -1404,14 +1404,14 @@ _08103098:
strh r2, [r0]
adds r0, 0x6
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, _081030F4 @ =0xffff7fff
ldr r1, _081030F8 @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x7
b _0810316A
@@ -1427,14 +1427,14 @@ _081030FC:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, _08103124 @ =0xffff7fff
ldr r1, _08103128 @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x1
b _0810316A
@@ -1454,9 +1454,9 @@ _0810312C:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
adds r0, 0x40
bl sub_81047B0
@@ -1496,7 +1496,7 @@ sub_810317C: @ 810317C
movs r1, 0xE
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -1506,7 +1506,7 @@ sub_810317C: @ 810317C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _08103224 @ =gUnknown_845216C
bl sub_8003CE4
ldr r2, _08103228 @ =gUnknown_203ACF0
@@ -1538,13 +1538,13 @@ sub_810317C: @ 810317C
bl sub_8103924
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08103230 @ =gUnknown_8415F3D
movs r1, 0x1
bl sub_8106E78
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08103234 @ =gUnknown_8415F51
bl sub_8104C2C
movs r0, 0
@@ -1624,7 +1624,7 @@ _081032B0:
ldrb r0, [r0]
bl sub_8103988
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, [r4]
adds r0, 0x40
bl sub_81047B0
@@ -1653,9 +1653,9 @@ _081032E8:
_081032F8: .4byte gUnknown_203ACF0
_081032FC:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08103314 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x4
@@ -1665,14 +1665,14 @@ _081032FC:
_08103314: .4byte gUnknown_203ACF0
_08103318:
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08103338 @ =0xffff7fff
ldr r1, _0810333C @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08103340 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x5
@@ -1687,7 +1687,7 @@ _08103344:
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
bl sub_81039F0
ldr r1, [r4]
adds r1, 0x60
@@ -1700,13 +1700,13 @@ _08103362:
ldr r0, [r4]
adds r0, 0x41
ldrb r0, [r0]
- bl sub_8107078
+ bl ListMenuHandleInput
ldr r1, [r4]
str r0, [r1, 0x30]
ldrb r0, [r1, 0x17]
adds r1, 0x62
movs r2, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _081033C4 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r2, 0x1
@@ -1729,14 +1729,14 @@ _08103362:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, _081033C8 @ =0xffff7fff
ldr r1, _081033CC @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x7
strb r0, [r1, 0x1]
@@ -1753,14 +1753,14 @@ _081033D0:
ldr r0, [r4]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, _081033FC @ =0xffff7fff
ldr r1, _08103400 @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0x1]
@@ -1781,9 +1781,9 @@ _08103404:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
adds r0, 0x40
bl sub_81047B0
@@ -1825,7 +1825,7 @@ sub_810345C: @ 810345C
movs r1, 0xE
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -1835,7 +1835,7 @@ sub_810345C: @ 810345C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _08103504 @ =gUnknown_845216C
bl sub_8003CE4
ldr r2, _08103508 @ =gUnknown_203ACF0
@@ -1867,13 +1867,13 @@ sub_810345C: @ 810345C
bl sub_8103924
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08103510 @ =gUnknown_8415F4A
movs r1, 0x1
bl sub_8106E78
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08103514 @ =gUnknown_8415F51
bl sub_8104C2C
movs r0, 0
@@ -1956,7 +1956,7 @@ _0810356C:
cmp r7, 0
beq _081035C4
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
ldr r2, _081035BC @ =gUnknown_203ACF0
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -1988,7 +1988,7 @@ _081035C4:
adds r4, r2, 0
_081035D6:
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
ldr r2, _081035FC @ =gUnknown_203ACF0
ldr r1, [r2]
ldr r3, [r1, 0x44]
@@ -2037,7 +2037,7 @@ _0810360C:
cmp r7, 0
beq _08103682
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -2052,7 +2052,7 @@ _0810360C:
adds r0, r1
str r0, [r2]
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r1, [r1, 0x44]
@@ -2092,7 +2092,7 @@ _081036A4:
lsls r0, r2, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r5, r0, 16
ldr r0, [sp]
@@ -2113,7 +2113,7 @@ _081036A4:
cmp r6, 0
beq _08103722
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -2128,7 +2128,7 @@ _081036A4:
adds r0, r1
str r0, [r2]
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r1, [r1, 0x44]
@@ -2186,7 +2186,7 @@ _08103744:
cmp r6, 0
beq _081037BA
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -2201,7 +2201,7 @@ _08103744:
adds r0, r1
str r0, [r2]
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r1, [r1, 0x44]
@@ -2259,7 +2259,7 @@ _081037E0:
cmp r6, 0
beq _08103856
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -2274,7 +2274,7 @@ _081037E0:
adds r0, r1
str r0, [r2]
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
mov r2, r9
ldr r1, [r2]
ldr r1, [r1, 0x44]
@@ -2327,7 +2327,7 @@ _08103878:
cmp r7, 0
beq _081038D0
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
ldr r2, _081038C8 @ =gUnknown_203ACF0
ldr r1, [r2]
ldr r2, [r1, 0x44]
@@ -2359,7 +2359,7 @@ _081038D0:
adds r4, r2, 0
_081038E2:
adds r0, r5, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
ldr r2, _08103918 @ =gUnknown_203ACF0
ldr r1, [r2]
ldr r3, [r1, 0x44]
@@ -2433,7 +2433,7 @@ _08103964:
ldrh r3, [r0, 0x3C]
_0810396E:
adds r0, r5, 0
- bl sub_8107024
+ bl Unused_ListMenuInit2
ldr r1, [r4]
adds r1, 0x41
strb r0, [r1]
@@ -2534,7 +2534,7 @@ _08103A28:
ldr r1, [r2]
adds r1, 0x62
mov r0, sp
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
lsls r0, 24
lsrs r0, 24
add sp, 0x10
@@ -2663,11 +2663,11 @@ _08103AF0:
.4byte _0810421C
_08103B5C:
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r4, _08103B94 @ =gUnknown_203ACF0
ldr r0, [r4]
adds r0, 0x28
@@ -2691,9 +2691,9 @@ _08103B94: .4byte gUnknown_203ACF0
_08103B98:
bl sub_8104E90
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, _08103BC8 @ =gUnknown_203ACF0
ldr r0, [r0]
adds r0, 0x2F
@@ -2735,11 +2735,11 @@ _08103BF8:
movs r0, 0
bl sub_8104F0C
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0xFF
bl sub_8105058
ldr r0, _08103C20 @ =gUnknown_203ACF0
@@ -2755,13 +2755,13 @@ _08103C24:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08103C58 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x4
@@ -2778,7 +2778,7 @@ _08103C5C:
strb r0, [r1]
ldr r0, _08103C80 @ =gUnknown_84524C4
movs r1, 0
- bl sub_8133C90
+ bl ListMenuAddCursorObjectInternal
ldr r1, [r4]
adds r1, 0x61
strb r0, [r1]
@@ -2833,12 +2833,12 @@ _08103C84:
ldr r0, [r5]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r5]
adds r0, 0x61
ldrb r0, [r0]
movs r1, 0
- bl sub_8133CD4
+ bl ListMenuRemoveCursorObject
ldr r1, [r5]
movs r0, 0xC
b _08104226
@@ -3043,19 +3043,19 @@ _08103E6C:
ldr r0, [r5]
adds r0, 0x60
ldrb r0, [r0]
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r5]
adds r0, 0x61
ldrb r0, [r0]
movs r1, 0
- bl sub_8133CD4
+ bl ListMenuRemoveCursorObject
ldr r0, _08103E98 @ =0xffff7fff
ldr r1, _08103E9C @ =0x0000ffff
str r1, [sp]
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
movs r0, 0x1
b _08104226
@@ -3073,7 +3073,7 @@ _08103EA0:
movs r1, 0
movs r2, 0xA0
movs r3, 0
- bl sub_8133CAC
+ bl ListMenuUpdateCursorObject
ldr r0, [r4]
adds r0, 0x2E
movs r1, 0
@@ -3183,7 +3183,7 @@ _08103F8A:
movs r0, 0
bl sub_8105594
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r5]
movs r0, 0x4
strb r0, [r1, 0x2]
@@ -3201,22 +3201,22 @@ _08103FA8:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r5]
adds r0, 0x5A
ldrh r0, [r0]
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
ldr r1, [r5]
movs r0, 0
strb r0, [r1, 0x2]
@@ -3239,9 +3239,9 @@ _08103FF0:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104028 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x15
@@ -3265,13 +3265,13 @@ _0810403A:
movs r1, 0x6
bl sub_8105594
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104068 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x13
@@ -3307,13 +3307,13 @@ _08104080:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r0, [r5]
ldrb r1, [r0, 0x3]
movs r0, 0
bl sub_8105594
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r5]
movs r0, 0x1
strb r0, [r1, 0x2]
@@ -3331,9 +3331,9 @@ _081040C4:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r5]
movs r0, 0xD
b _08104226
@@ -3347,13 +3347,13 @@ _081040E4:
_081040F0: .4byte gUnknown_203ACF0
_081040F4:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104114 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x17
@@ -3375,27 +3375,27 @@ _08104118:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104178 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x1A
@@ -3416,27 +3416,27 @@ _0810417C:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _081041D4 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x18
@@ -3458,13 +3458,13 @@ _081041F0:
movs r0, 0
bl sub_8105E1C
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104218 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x11
@@ -3517,7 +3517,7 @@ sub_8104234: @ 8104234
adds r1, 0x62
strh r0, [r1]
mov r0, sp
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
lsls r0, 24
lsrs r0, 24
add sp, 0x10
@@ -3626,11 +3626,11 @@ _08104314:
.4byte _08104630
_08104348:
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, _08104364 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x2
@@ -3639,9 +3639,9 @@ _08104348:
_08104364: .4byte gUnknown_203ACF0
_08104368:
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r1, _0810438C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -3669,13 +3669,13 @@ _08104398:
b _08104654
_081043AC:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r4, _081043DC @ =gUnknown_203ACF0
ldr r0, [r4]
adds r0, 0x5A
@@ -3683,7 +3683,7 @@ _081043AC:
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
ldr r1, [r4]
movs r0, 0x4
b _08104654
@@ -3696,13 +3696,13 @@ _081043E0:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08104414 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x5
@@ -3727,9 +3727,9 @@ _08104418:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104450 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x7
@@ -3749,7 +3749,7 @@ _08104454:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08104480 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x1
@@ -3774,7 +3774,7 @@ _08104484:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _081044BC @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x6
@@ -3805,7 +3805,7 @@ _081044DA:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08104504 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x6
@@ -3817,9 +3817,9 @@ _08104500: .4byte 0x0000ffff
_08104504: .4byte gUnknown_203ACF0
_08104508:
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
ldr r0, _08104524 @ =gUnknown_203ACF0
ldr r1, [r0]
ldr r0, [r1, 0x30]
@@ -3840,13 +3840,13 @@ _08104528:
_08104534: .4byte gUnknown_203ACF0
_08104538:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104558 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x9
@@ -3866,7 +3866,7 @@ _0810455C:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0810458C @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0xC
@@ -3889,27 +3889,27 @@ _08104590:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _081045E8 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0xA
@@ -3931,13 +3931,13 @@ _08104604:
movs r0, 0
bl sub_8105E1C
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0810462C @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x5
@@ -3954,9 +3954,9 @@ _08104630:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08104660 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x1
@@ -4525,7 +4525,7 @@ sub_8104A34: @ 8104A34
lsrs r4, 24
lsls r6, 24
lsrs r6, 24
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -4573,7 +4573,7 @@ sub_8104AB0: @ 8104AB0
cmp r2, 0
beq _08104ACA
adds r0, r3, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r3, r0, 0
_08104ACA:
subs r0, r3, 0x1
@@ -4832,7 +4832,7 @@ sub_8104C64: @ 8104C64
lsrs r0, 24
str r0, [sp, 0x8]
movs r0, 0x3
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
ldr r7, _08104D58 @ =gUnknown_203ACF0
ldr r0, [r7]
adds r0, 0x20
@@ -4886,7 +4886,7 @@ sub_8104C64: @ 8104C64
adds r0, r5
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r7]
adds r0, 0x20
adds r0, r5
@@ -4902,7 +4902,7 @@ sub_8104C64: @ 8104C64
adds r0, 0x20
adds r0, r5
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x20
adds r0, r5
@@ -4920,7 +4920,7 @@ _08104D64: .4byte 0xff00ffff
_08104D68: .4byte 0x0000ffff
_08104D6C:
ldrb r0, [r1]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08104D72:
ldr r6, _08104E60 @ =gUnknown_203ACF0
ldr r0, [r6]
@@ -4971,7 +4971,7 @@ _08104D72:
ldr r1, _08104E6C @ =gUnknown_8440124
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r0, [r6]
adds r0, 0x24
adds r0, r5
@@ -5019,13 +5019,13 @@ _08104D72:
str r3, [sp, 0x14]
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
_08104E42:
ldr r0, [r6]
adds r0, 0x24
adds r0, r5
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r6]
adds r0, 0x24
adds r0, r5
@@ -5042,7 +5042,7 @@ _08104E70: .4byte gUnknown_8245EE0
_08104E74: .4byte gUnknown_8443600
_08104E78:
ldrb r0, [r1]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08104E7E:
movs r0, 0x1
add sp, 0x20
@@ -5092,7 +5092,7 @@ sub_8104EC0: @ 8104EC0
lsrs r5, 16
ldr r1, _08104F08 @ =gUnknown_8416002
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
adds r1, r0, 0
adds r1, r4, 0
movs r2, 0x1
@@ -5132,7 +5132,7 @@ sub_8104F0C: @ 8104F0C
movs r1, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r5, 0x20
str r5, [sp]
str r4, [sp, 0x4]
@@ -5140,14 +5140,14 @@ sub_8104F0C: @ 8104F0C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r5, _08104F80 @ =gUnknown_203ACF0
ldr r1, [r5]
adds r0, r1, 0
@@ -5158,7 +5158,7 @@ sub_8104F0C: @ 8104F0C
bl sub_81068DC
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r6, 0
beq _08104F88
ldr r1, _08104F84 @ =gUnknown_8452344
@@ -5213,7 +5213,7 @@ _08104FD0:
bl sub_8003F20
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r6, 0
bne _08104FEA
ldr r0, _0810504C @ =gUnknown_8415F6C
@@ -5295,11 +5295,11 @@ _0810507A:
lsrs r1, r5, 16
adds r0, r7, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
lsrs r1, r6, 16
adds r0, r7, 0x2
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x80
lsls r0, 13
adds r6, r0
@@ -5310,7 +5310,7 @@ _0810507A:
ldr r0, _081050B4 @ =gUnknown_84406C8
ldr r1, _081050B8 @ =0x00000141
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _081050BC @ =gUnknown_203ACF0
ldr r0, [r0]
adds r0, 0x2E
@@ -5362,12 +5362,12 @@ _081050FE:
mov r0, r8
add r0, r10
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
lsrs r1, r6, 16
ldr r0, _08105128 @ =gUnknown_84406CE
add r0, r8
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _08105142
.align 2, 0
_08105120: .4byte gUnknown_203ACF0
@@ -5377,12 +5377,12 @@ _0810512C:
lsrs r1, r5, 16
mov r0, r9
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
lsrs r1, r6, 16
mov r0, r9
adds r0, 0x2
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
_08105142:
lsls r1, r7, 2
movs r0, 0x80
@@ -5396,7 +5396,7 @@ _08105142:
adds r0, r1, r0
ldr r1, _08105174 @ =0x00000141
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
_0810515E:
add sp, 0x4
pop {r3-r5}
@@ -5433,7 +5433,7 @@ sub_8105178: @ 8105178
lsls r2, 3
adds r1, r3, 0
movs r3, 0
- bl sub_8133CAC
+ bl ListMenuUpdateCursorObject
pop {r0}
bx r0
.align 2, 0
@@ -5495,13 +5495,13 @@ sub_81051F0: @ 81051F0
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
- bl sub_8002008
+ bl GetBgTilemapBuffer
mov r10, r0
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
mov r9, r0
movs r0, 0x3
- bl sub_8002008
+ bl GetBgTilemapBuffer
mov r8, r0
ldr r0, _0810526C @ =gUnknown_203ACF0
ldr r0, [r0]
@@ -5572,11 +5572,11 @@ _0810529A:
cmp r0, 0x1D
ble _08105242
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
add sp, 0x10
pop {r3-r5}
@@ -5637,7 +5637,7 @@ _08105310:
_08105338:
movs r0, 0xC0
lsls r0, 5
- bl sub_8002B9C
+ bl Alloc
ldr r1, _08105350 @ =gUnknown_203ACF0
ldr r1, [r1]
str r0, [r1, 0x5C]
@@ -5653,7 +5653,7 @@ _08105354:
_08105358:
ldr r0, [r5]
ldr r0, [r0, 0x5C]
- bl sub_8002BC4
+ bl Free
movs r0, 0x1
b _0810557E
_08105364:
@@ -5662,7 +5662,7 @@ _08105364:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08105380 @ =gUnknown_203ACF0
ldr r1, [r0]
ldrb r0, [r1, 0x2]
@@ -5680,7 +5680,7 @@ _08105384:
movs r1, 0xC
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r5, 0x20
str r5, [sp]
str r4, [sp, 0x4]
@@ -5688,20 +5688,20 @@ _08105384:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _081053D8 @ =gUnknown_203ACF0
ldr r1, [r0]
ldrb r0, [r1, 0x2]
@@ -5715,11 +5715,11 @@ _081053DC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
bl sub_8104F0C
movs r0, 0x3
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r6, _08105478 @ =gUnknown_203ACF0
ldr r1, [r6]
ldr r1, [r1, 0x5C]
@@ -5728,7 +5728,7 @@ _081053DC:
adds r2, r4, 0
bl CpuFastSet
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r1, [r6]
ldr r1, [r1, 0x5C]
movs r2, 0x80
@@ -5737,7 +5737,7 @@ _081053DC:
adds r2, r4, 0
bl CpuFastSet
movs r0, 0x1
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r1, [r6]
ldr r1, [r1, 0x5C]
movs r2, 0x80
@@ -5753,7 +5753,7 @@ _081053DC:
movs r1, 0xC
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r5, 0x20
str r5, [sp]
str r4, [sp, 0x4]
@@ -5761,14 +5761,14 @@ _081053DC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, [r6]
movs r0, 0
strb r0, [r1, 0x3]
@@ -5790,7 +5790,7 @@ _0810547C:
b _0810557C
_08105492:
movs r0, 0x3
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r4, _081054EC @ =gUnknown_203ACF0
ldr r1, [r4]
ldr r1, [r1, 0x5C]
@@ -5799,7 +5799,7 @@ _08105492:
adds r2, r5, 0
bl CpuFastSet
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r1, [r4]
ldr r1, [r1, 0x5C]
movs r2, 0x80
@@ -5808,7 +5808,7 @@ _08105492:
adds r2, r5, 0
bl CpuFastSet
movs r0, 0x1
- bl sub_8002008
+ bl GetBgTilemapBuffer
ldr r1, [r4]
ldr r1, [r1, 0x5C]
movs r2, 0x80
@@ -5848,7 +5848,7 @@ _08105506:
movs r1, 0
movs r2, 0x10
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
ldrb r0, [r1, 0x2]
adds r0, 0x1
@@ -5864,11 +5864,11 @@ _08105528:
movs r0, 0
bl sub_8104F0C
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08105558 @ =gUnknown_203ACF0
ldr r1, [r0]
ldrb r0, [r1, 0x2]
@@ -5888,7 +5888,7 @@ _0810555C:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08105590 @ =gUnknown_203ACF0
ldr r1, [r0]
_08105578:
@@ -6046,7 +6046,7 @@ _08105666:
adds r0, r7, 0
movs r1, 0x4
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
adds r6, 0x1
lsls r2, r6, 24
lsrs r2, 24
@@ -6057,7 +6057,7 @@ _08105666:
adds r0, r7, 0
movs r1, 0x5
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081057EC @ =0x00000404
ldr r2, [sp, 0x8]
lsls r2, 24
@@ -6073,7 +6073,7 @@ _08105666:
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r6, [sp, 0x10]
adds r6, 0x1
ldr r0, [sp, 0xC]
@@ -6088,7 +6088,7 @@ _08105666:
movs r1, 0xA
ldr r2, [sp, 0x14]
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, [sp, 0x8]
str r1, [sp]
str r5, [sp, 0x4]
@@ -6096,14 +6096,14 @@ _08105666:
movs r1, 0xB
ldr r2, [sp, 0x18]
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081057F0 @ =0x0000040a
str r5, [sp]
str r5, [sp, 0x4]
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
lsls r3, r6, 24
lsrs r3, 24
str r3, [sp, 0x1C]
@@ -6119,7 +6119,7 @@ _08105666:
movs r1, 0x6
ldr r2, [sp, 0x14]
ldr r3, [sp, 0x1C]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
mov r0, r10
lsls r3, r0, 24
lsrs r3, 24
@@ -6129,7 +6129,7 @@ _08105666:
adds r0, r7, 0
movs r1, 0x7
ldr r2, [sp, 0x14]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r1, 0x1
add r1, r10
lsls r1, 24
@@ -6148,28 +6148,28 @@ _08105666:
movs r1, 0x9
ldr r2, [sp, 0x14]
mov r3, r9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081057F4 @ =0x00000406
str r5, [sp]
str r6, [sp, 0x4]
adds r0, r7, 0
mov r2, r8
ldr r3, [sp, 0x1C]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081057F8 @ =0x00000407
str r5, [sp]
str r5, [sp, 0x4]
adds r0, r7, 0
mov r2, r8
ldr r3, [sp, 0x20]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081057FC @ =0x00000409
str r5, [sp]
str r4, [sp, 0x4]
adds r0, r7, 0
mov r2, r8
mov r3, r9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, [sp, 0x8]
str r1, [sp]
str r6, [sp, 0x4]
@@ -6177,7 +6177,7 @@ _08105666:
movs r1, 0x1
ldr r2, [sp, 0x18]
ldr r3, [sp, 0x1C]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r2, [sp, 0x8]
str r2, [sp]
str r5, [sp, 0x4]
@@ -6185,7 +6185,7 @@ _08105666:
movs r1, 0x8
ldr r2, [sp, 0x18]
ldr r3, [sp, 0x20]
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r3, [sp, 0x8]
str r3, [sp]
str r4, [sp, 0x4]
@@ -6193,7 +6193,7 @@ _08105666:
movs r1, 0x2
ldr r2, [sp, 0x18]
mov r3, r9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
add sp, 0x24
pop {r3-r5}
mov r8, r3
@@ -6226,7 +6226,7 @@ sub_8105800: @ 8105800
lsls r3, 24
lsrs r7, r3, 24
adds r0, r1, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r1, r0, 3
adds r1, r0
lsls r1, 2
@@ -6330,7 +6330,7 @@ sub_81058C4: @ 81058C4
lsrs r3, 24
mov r8, r3
adds r0, r1, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
ldr r2, _08105974 @ =gUnknown_844E850
lsls r1, r0, 3
adds r1, r0
@@ -6513,7 +6513,7 @@ sub_8105A3C: @ 8105A3C
lsrs r3, 24
mov r9, r3
adds r0, r1, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
ldr r2, _08105ACC @ =gUnknown_844E850
lsls r1, r0, 3
adds r1, r0
@@ -6816,7 +6816,7 @@ sub_8105CB0: @ 8105CB0
lsls r3, 24
lsrs r7, r3, 24
adds r0, r1, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r4, r0, 0
adds r0, r4, 0
movs r1, 0x1
@@ -6976,7 +6976,7 @@ _08105DC8:
adds r1, r7, 0
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
_08105E02:
add sp, 0x18
pop {r3-r5}
@@ -7011,14 +7011,14 @@ sub_8105E1C: @ 8105E1C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
movs r0, 0x10
str r0, [sp, 0x4]
@@ -7026,7 +7026,7 @@ sub_8105E1C: @ 8105E1C
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r0, _08105FD0 @ =gUnknown_84521D4
bl sub_8003CE4
ldr r4, _08105FD4 @ =gUnknown_203ACF0
@@ -7049,7 +7049,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4A
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x4A
@@ -7061,7 +7061,7 @@ sub_8105E1C: @ 8105E1C
ldr r0, [r4]
adds r0, 0x4A
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
adds r0, 0x4A
ldrb r0, [r0]
@@ -7071,7 +7071,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4B
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x4B
@@ -7138,7 +7138,7 @@ sub_8105E1C: @ 8105E1C
ldr r0, [r4]
adds r0, 0x4B
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
adds r0, 0x4B
ldrb r0, [r0]
@@ -7148,7 +7148,7 @@ sub_8105E1C: @ 8105E1C
adds r0, 0x4C
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x4C
@@ -7161,7 +7161,7 @@ sub_8105E1C: @ 8105E1C
ldr r0, [r4]
adds r0, 0x4C
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
adds r0, 0x4C
ldrb r0, [r0]
@@ -7169,7 +7169,7 @@ sub_8105E1C: @ 8105E1C
bl sub_8003F20
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
cmp r6, 0
bne _08105FEC
ldr r2, _08105FE4 @ =gUnknown_8415FAD
@@ -7197,7 +7197,7 @@ _08105FEC:
bl sub_8104C2C
_08105FF2:
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
@@ -7246,7 +7246,7 @@ sub_810603C: @ 810603C
adds r0, 0x5A
ldrh r0, [r0]
str r0, [sp, 0x1C]
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x18]
@@ -7267,42 +7267,42 @@ sub_810603C: @ 810603C
movs r1, 0x4
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106428 @ =0x00000404
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r2, 0x1D
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _0810642C @ =0x00000804
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r2, 0
movs r3, 0x11
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106430 @ =0x00000c04
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r2, 0x1D
movs r3, 0x11
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r7, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0x5
movs r2, 0x1
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106434 @ =0x00000805
str r7, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r2, 0x1
movs r3, 0x11
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@@ -7310,7 +7310,7 @@ sub_810603C: @ 810603C
movs r1, 0x6
movs r2, 0
movs r3, 0x3
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106438 @ =0x00000406
str r4, [sp]
mov r2, r8
@@ -7318,7 +7318,7 @@ sub_810603C: @ 810603C
movs r0, 0x3
movs r2, 0x1D
movs r3, 0x3
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r7, [sp]
mov r3, r8
str r3, [sp, 0x4]
@@ -7326,7 +7326,7 @@ sub_810603C: @ 810603C
movs r1, 0x1
movs r2, 0x1
movs r3, 0x3
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r5, 0x1E
str r5, [sp]
movs r0, 0x10
@@ -7335,7 +7335,7 @@ sub_810603C: @ 810603C
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r7, 0xA
movs r0, 0x6
mov r8, r0
@@ -7345,42 +7345,42 @@ sub_810603C: @ 810603C
movs r1, 0x1D
movs r2, 0x1
movs r3, 0x9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _0810643C @ =0x0000041d
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r2, 0xC
movs r3, 0x9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106440 @ =0x0000081d
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r2, 0x1
movs r3, 0x10
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106444 @ =0x00000c1d
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r2, 0xC
movs r3, 0x10
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r7, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r1, 0x1E
movs r2, 0x2
movs r3, 0x9
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _08106448 @ =0x0000081e
str r7, [sp]
str r4, [sp, 0x4]
movs r0, 0
movs r2, 0x2
movs r3, 0x10
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
mov r1, r8
str r1, [sp, 0x4]
@@ -7388,7 +7388,7 @@ sub_810603C: @ 810603C
movs r1, 0x1F
movs r2, 0x1
movs r3, 0xA
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _0810644C @ =0x0000041f
str r4, [sp]
mov r2, r8
@@ -7396,7 +7396,7 @@ sub_810603C: @ 810603C
movs r0, 0
movs r2, 0xC
movs r3, 0xA
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
movs r4, 0x14
str r4, [sp, 0x4]
@@ -7404,14 +7404,14 @@ sub_810603C: @ 810603C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r5, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
bl sub_80CC204
ldr r1, [r6]
adds r1, 0x64
@@ -7447,7 +7447,7 @@ _081061F0:
ldr r1, _08106454 @ =gUnknown_8443620
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x4A
ldrb r4, [r0]
@@ -7462,7 +7462,7 @@ _081061F0:
ldr r0, [r5]
adds r0, 0x4A
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r4, 0
mov r1, r9
lsls r1, 27
@@ -7496,7 +7496,7 @@ _08106246:
ldr r1, [r4]
movs r2, 0
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x4A
adds r0, r6
@@ -7513,7 +7513,7 @@ _08106246:
adds r0, 0x4A
adds r0, r6
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
adds r0, 0x4A
adds r0, r6
@@ -7558,7 +7558,7 @@ _081062B4:
adds r0, 0x55
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xA0
ldr r1, [sp, 0x1C]
bl sub_8107CD8
@@ -7575,7 +7575,7 @@ _081062B4:
ldr r0, [r7]
adds r0, 0x55
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x55
ldrb r0, [r0]
@@ -7585,7 +7585,7 @@ _081062B4:
adds r0, 0x53
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _08106470 @ =gUnknown_8415FED
movs r0, 0
adds r1, r4, 0
@@ -7612,7 +7612,7 @@ _081062B4:
ldr r0, [r7]
adds r0, 0x53
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x53
ldrb r0, [r0]
@@ -7622,7 +7622,7 @@ _081062B4:
adds r0, 0x54
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _08106474 @ =gUnknown_8415FE8
movs r0, 0
adds r1, r4, 0
@@ -7660,7 +7660,7 @@ _081062B4:
ldr r0, [r7]
adds r0, 0x54
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x54
ldrb r0, [r0]
@@ -7670,7 +7670,7 @@ _081062B4:
adds r0, 0x52
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r7]
adds r0, 0x52
ldrb r0, [r0]
@@ -7721,7 +7721,7 @@ _08106478:
ldr r0, [r7]
adds r0, 0x52
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x52
ldrb r0, [r0]
@@ -7731,7 +7731,7 @@ _08106478:
adds r0, 0x56
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0xB0
movs r1, 0x1
bl sub_8107D38
@@ -7771,18 +7771,18 @@ _08106504:
ldr r0, [r7]
adds r0, 0x56
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r7]
adds r0, 0x56
ldrb r0, [r0]
movs r1, 0x2
bl sub_8003F20
- bl sub_810BB8C
+ bl dp13_810BB8C
ldr r0, _081066BC @ =gUnknown_8452368
movs r1, 0x90
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
mov r3, r10
cmp r3, 0
bne _08106534
@@ -7887,7 +7887,7 @@ _08106534:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
ldr r0, _081066CC @ =gUnknown_300500C
ldr r0, [r0]
ldrb r0, [r0, 0x8]
@@ -7970,7 +7970,7 @@ _08106534:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
b _081066E2
.align 2, 0
_081066B0: .4byte gUnknown_8245EE0
@@ -8024,7 +8024,7 @@ _081066E2:
str r3, [sp, 0x14]
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
ldr r4, _081067B4 @ =gUnknown_8415FF2
movs r0, 0
adds r1, r4, 0
@@ -8055,7 +8055,7 @@ _0810675A:
bl sub_8003F20
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _081067B8 @ =gUnknown_8415FAD
movs r0, 0x2
str r0, [sp]
@@ -8068,7 +8068,7 @@ _0810675A:
ldr r0, _081067BC @ =gUnknown_8415FCF
bl sub_8104C2C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
@@ -8141,7 +8141,7 @@ sub_8106810: @ 8106810
cmp r0, 0x1
beq _08106830
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
cmp r0, 0x97
@@ -8587,7 +8587,7 @@ sub_8106B34: @ 8106B34
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
_08106B54:
pop {r0}
bx r0
@@ -8613,14 +8613,14 @@ sub_8106B60: @ 8106B60
cmp r0, 0
bne _08106BA4
adds r0, r5, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
cmp r0, 0x97
bls _08106BA4
ldr r0, _08106BA0 @ =sub_8106BD8
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
b _08106BC6
@@ -8657,7 +8657,7 @@ sub_8106BD8: @ 8106BD8
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
pop {r0}
bx r0
thumb_func_end sub_8106BD8
@@ -8739,23 +8739,23 @@ _08106C84:
b _08106E6A
_08106C90:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08106E6A
_08106C98:
movs r0, 0x1
bl sub_8104F0C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0xFF
bl sub_8105058
ldr r0, _08106CD0 @ =gUnknown_203ACF0
@@ -8777,15 +8777,15 @@ _08106CD4:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08106D18 @ =gUnknown_203ACF0
ldr r1, [r0]
movs r0, 0x5
@@ -8804,7 +8804,7 @@ _08106D1C:
strh r1, [r0, 0x8]
ldr r0, _08106D44 @ =gUnknown_84524C4
movs r1, 0
- bl sub_8133C90
+ bl ListMenuAddCursorObjectInternal
ldr r2, _08106D48 @ =gUnknown_203ACF0
ldr r1, [r2]
adds r1, 0x61
@@ -8851,7 +8851,7 @@ _08106D8C:
adds r0, 0x61
ldrb r0, [r0]
movs r1, 0
- bl sub_8133CD4
+ bl ListMenuRemoveCursorObject
ldr r1, [r4]
movs r0, 0x7
b _08106E68
@@ -8901,7 +8901,7 @@ _08106DDE:
movs r0, 0
bl sub_8105594
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
movs r0, 0x4
strb r0, [r1, 0x2]
@@ -8923,22 +8923,22 @@ _08106E10:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
adds r0, 0x5A
ldrh r0, [r0]
movs r1, 0
movs r2, 0x7D
movs r3, 0xA
- bl sub_8071E3C
+ bl PlayCry2
ldr r1, [r4]
movs r0, 0
strb r0, [r1, 0x2]
diff --git a/asm/pokemon_1.s b/asm/pokemon_1.s
index 406627af4..fc13d1386 100644
--- a/asm/pokemon_1.s
+++ b/asm/pokemon_1.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_803D97C
-sub_803D97C: @ 803D97C
+ thumb_func_start ZeroBoxMonData
+ZeroBoxMonData: @ 803D97C
push {lr}
adds r2, r0, 0
movs r1, 0
@@ -19,14 +19,14 @@ _0803D984:
bls _0803D984
pop {r0}
bx r0
- thumb_func_end sub_803D97C
+ thumb_func_end ZeroBoxMonData
- thumb_func_start sub_803D994
-sub_803D994: @ 803D994
+ thumb_func_start ZeroMonData
+ZeroMonData: @ 803D994
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_803D97C
+ bl ZeroBoxMonData
movs r0, 0
str r0, [sp]
adds r0, r4, 0
@@ -75,7 +75,7 @@ sub_803D994: @ 803D994
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803D994
+ thumb_func_end ZeroMonData
thumb_func_start sub_803DA14
sub_803DA14: @ 803DA14
@@ -86,7 +86,7 @@ sub_803DA14: @ 803DA14
adds r5, r4, r0
_0803DA1E:
adds r0, r4, 0
- bl sub_803D994
+ bl ZeroMonData
adds r4, 0x64
cmp r4, r5
ble _0803DA1E
@@ -97,8 +97,8 @@ _0803DA1E:
_0803DA30: .4byte gUnknown_2024284
thumb_func_end sub_803DA14
- thumb_func_start sub_803DA34
-sub_803DA34: @ 803DA34
+ thumb_func_start ZeroEnemyPartyMons
+ZeroEnemyPartyMons: @ 803DA34
push {r4,r5,lr}
ldr r4, _0803DA50 @ =gUnknown_202402C
movs r0, 0xFA
@@ -106,7 +106,7 @@ sub_803DA34: @ 803DA34
adds r5, r4, r0
_0803DA3E:
adds r0, r4, 0
- bl sub_803D994
+ bl ZeroMonData
adds r4, 0x64
cmp r4, r5
ble _0803DA3E
@@ -115,10 +115,10 @@ _0803DA3E:
bx r0
.align 2, 0
_0803DA50: .4byte gUnknown_202402C
- thumb_func_end sub_803DA34
+ thumb_func_end ZeroEnemyPartyMons
- thumb_func_start sub_803DA54
-sub_803DA54: @ 803DA54
+ thumb_func_start CreateMon
+CreateMon: @ 803DA54
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -140,7 +140,7 @@ sub_803DA54: @ 803DA54
lsrs r5, 24
mov r0, r8
str r3, [sp, 0x18]
- bl sub_803D994
+ bl ZeroMonData
str r4, [sp]
str r7, [sp, 0x4]
str r5, [sp, 0x8]
@@ -151,7 +151,7 @@ sub_803DA54: @ 803DA54
add r2, sp, 0x10
ldrb r2, [r2]
ldr r3, [sp, 0x18]
- bl sub_803DAC4
+ bl CreateBoxMon
mov r0, r8
movs r1, 0x38
add r2, sp, 0x10
@@ -163,17 +163,17 @@ sub_803DA54: @ 803DA54
movs r1, 0x40
bl sub_804037C
mov r0, r8
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x1C
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803DA54
+ thumb_func_end CreateMon
- thumb_func_start sub_803DAC4
-sub_803DAC4: @ 803DAC4
+ thumb_func_start CreateBoxMon
+CreateBoxMon: @ 803DAC4
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -197,16 +197,16 @@ sub_803DAC4: @ 803DAC4
lsrs r0, 24
mov r10, r0
adds r0, r7, 0
- bl sub_803D97C
+ bl ZeroBoxMonData
cmp r4, 0
beq _0803DB00
ldr r0, [sp, 0x44]
str r0, [sp, 0x14]
b _0803DB14
_0803DB00:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
@@ -227,9 +227,9 @@ _0803DB14:
mov r8, r2
ldr r6, _0803DB68 @ =0x0000ffff
_0803DB30:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
@@ -281,17 +281,17 @@ _0803DB92:
mov r2, r9
bl sub_80404D0
adds r0, r7, 0
- bl sub_803E3E8
+ bl CalculateBoxMonChecksum
strh r0, [r5]
adds r0, r7, 0
movs r1, 0x9
adds r2, r5, 0
bl sub_80404D0
adds r0, r7, 0
- bl sub_803F8F8
+ bl EncryptBoxMon
mov r0, sp
ldrh r1, [r0, 0xE]
- bl sub_8040FD0
+ bl GetSpeciesName
adds r0, r7, 0
movs r1, 0x2
mov r2, sp
@@ -341,7 +341,7 @@ _0803DB92:
adds r0, r7, 0
movs r1, 0x20
bl sub_80404D0
- bl sub_8056260
+ bl sav1_map_get_name
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x18]
@@ -409,7 +409,7 @@ _0803DCC4: .4byte gUnknown_8254784
_0803DCC8: .4byte gUnknown_8253AE4
_0803DCCC: .4byte gUnknown_81E9F10
_0803DCD0:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x18]
@@ -442,7 +442,7 @@ _0803DCD0:
movs r1, 0x29
adds r2, r4, 0
bl sub_80404D0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x18]
@@ -490,7 +490,7 @@ _0803DD58:
bl sub_80404D0
_0803DD7E:
adds r0, r7, 0
- bl sub_803E9E0
+ bl GiveBoxMonInitialMoveset
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -501,10 +501,10 @@ _0803DD7E:
bx r0
.align 2, 0
_0803DD94: .4byte gUnknown_8254784
- thumb_func_end sub_803DAC4
+ thumb_func_end CreateBoxMon
- thumb_func_start sub_803DD98
-sub_803DD98: @ 803DD98
+ thumb_func_start CreateMonWithNature
+CreateMonWithNature: @ 803DD98
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -522,15 +522,15 @@ sub_803DD98: @ 803DD98
lsls r0, 24
lsrs r5, r0, 24
_0803DDB8:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
orrs r4, r0
adds r0, r4, 0
- bl sub_8042EB4
+ bl GetNatureFromPersonality
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -545,7 +545,7 @@ _0803DDB8:
mov r1, r8
adds r2, r7, 0
adds r3, r6, 0
- bl sub_803DA54
+ bl CreateMon
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -553,10 +553,10 @@ _0803DDB8:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803DD98
+ thumb_func_end CreateMonWithNature
- thumb_func_start sub_803DE00
-sub_803DE00: @ 803DE00
+ thumb_func_start CreateMonWithGenderNatureLetter
+CreateMonWithGenderNatureLetter: @ 803DE00
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -590,9 +590,9 @@ sub_803DE00: @ 803DE00
cmp r0, 0x1B
bhi _0803DEA6
_0803DE40:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
@@ -619,14 +619,14 @@ _0803DE40:
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
- bl sub_8042EB4
+ bl GetNatureFromPersonality
lsls r0, 24
lsrs r0, 24
cmp r6, r0
bne _0803DE40
adds r0, r7, 0
adds r1, r4, 0
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r8, r0
@@ -637,22 +637,22 @@ _0803DE40:
bne _0803DE40
b _0803DED6
_0803DEA6:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
orrs r4, r0
adds r0, r4, 0
- bl sub_8042EB4
+ bl GetNatureFromPersonality
lsls r0, 24
lsrs r0, 24
cmp r6, r0
bne _0803DEA6
adds r0, r7, 0
adds r1, r4, 0
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
cmp r8, r0
@@ -668,7 +668,7 @@ _0803DED6:
adds r1, r7, 0
ldr r2, [sp, 0x14]
mov r3, r10
- bl sub_803DA54
+ bl CreateMon
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -677,10 +677,10 @@ _0803DED6:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803DE00
+ thumb_func_end CreateMonWithGenderNatureLetter
- thumb_func_start sub_803DF00
-sub_803DF00: @ 803DF00
+ thumb_func_start CreateMaleMon
+CreateMaleMon: @ 803DF00
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -691,23 +691,23 @@ sub_803DF00: @ 803DF00
lsls r2, 24
lsrs r7, r2, 24
_0803DF12:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r5, r4, 16
lsls r0, 16
orrs r5, r0
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsrs r4, 16
lsls r0, 16
orrs r4, r0
adds r0, r6, 0
adds r1, r4, 0
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
cmp r0, 0
bne _0803DF12
@@ -720,17 +720,17 @@ _0803DF12:
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
add sp, 0x10
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803DF00
+ thumb_func_end CreateMaleMon
- thumb_func_start sub_803DF68
-sub_803DF68: @ 803DF68
+ thumb_func_start CreateMonWithIVsPersonality
+CreateMonWithIVsPersonality: @ 803DF68
push {r4,lr}
sub sp, 0x14
adds r4, r0, 0
@@ -748,21 +748,21 @@ sub_803DF68: @ 803DF68
str r0, [sp, 0xC]
adds r0, r4, 0
movs r3, 0
- bl sub_803DA54
+ bl CreateMon
adds r0, r4, 0
movs r1, 0x42
add r2, sp, 0x10
bl sub_804037C
adds r0, r4, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x14
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803DF68
+ thumb_func_end CreateMonWithIVsPersonality
- thumb_func_start sub_803DFA8
-sub_803DFA8: @ 803DFA8
+ thumb_func_start CreateMonWithIVsOTID
+CreateMonWithIVsOTID: @ 803DFA8
push {r4,r5,lr}
sub sp, 0x10
adds r5, r0, 0
@@ -780,7 +780,7 @@ sub_803DFA8: @ 803DFA8
str r3, [sp, 0xC]
adds r0, r5, 0
movs r3, 0
- bl sub_803DA54
+ bl CreateMon
adds r0, r5, 0
movs r1, 0x27
adds r2, r4, 0
@@ -807,15 +807,15 @@ sub_803DFA8: @ 803DFA8
adds r2, r4, 0
bl sub_804037C
adds r0, r5, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x10
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_803DFA8
+ thumb_func_end CreateMonWithIVsOTID
- thumb_func_start sub_803E01C
-sub_803E01C: @ 803E01C
+ thumb_func_start CreateMonWithEVSpread
+CreateMonWithEVSpread: @ 803E01C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -837,7 +837,7 @@ sub_803E01C: @ 803E01C
str r6, [sp, 0x8]
str r6, [sp, 0xC]
adds r0, r7, 0
- bl sub_803DA54
+ bl CreateMon
mov r4, r8
movs r1, 0x1
movs r5, 0x5
@@ -877,14 +877,14 @@ _0803E088:
cmp r5, 0x5
ble _0803E074
adds r0, r7, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x14
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803E01C
+ thumb_func_end CreateMonWithEVSpread
thumb_func_start sub_803E0A4
sub_803E0A4: @ 803E0A4
@@ -903,7 +903,7 @@ sub_803E0A4: @ 803E0A4
str r0, [sp, 0xC]
adds r0, r7, 0
movs r3, 0
- bl sub_803DA54
+ bl CreateMon
movs r5, 0
adds r4, r6, 0x4
_0803E0CA:
@@ -911,7 +911,7 @@ _0803E0CA:
lsls r2, r5, 24
lsrs r2, 24
adds r0, r7, 0
- bl sub_803E964
+ bl SetMonMoveSlot
adds r4, 0x2
adds r5, 0x1
cmp r5, 0x3
@@ -1028,7 +1028,7 @@ _0803E0CA:
add r2, sp, 0x10
bl sub_804037C
adds r0, r7, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x14
pop {r4-r7}
pop {r0}
@@ -1063,7 +1063,7 @@ sub_803E1EC: @ 803E1EC
str r5, [sp, 0x8]
str r7, [sp, 0xC]
mov r0, r8
- bl sub_803DA54
+ bl CreateMon
mov r0, r8
movs r1, 0x50
add r2, sp, 0x10
@@ -1086,12 +1086,12 @@ sub_803E23C: @ 803E23C
adds r6, r1, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6]
adds r0, r7, 0
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -1112,7 +1112,7 @@ _0803E278:
adds r1, 0xD
adds r0, r7, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -1121,58 +1121,58 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0xC]
adds r0, r7, 0
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0xD]
adds r0, r7, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r6, 0x14]
adds r0, r7, 0
movs r1, 0x1A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0xE]
adds r0, r7, 0
movs r1, 0x1B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0xF]
adds r0, r7, 0
movs r1, 0x1C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0x10]
adds r0, r7, 0
movs r1, 0x1D
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0x11]
adds r0, r7, 0
movs r1, 0x1E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0x12]
adds r0, r7, 0
movs r1, 0x1F
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r6, 0x13]
adds r0, r7, 0
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r8
strb r0, [r1]
adds r0, r7, 0
movs r1, 0x27
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r4, 0x1F
ands r0, r4
ldrb r2, [r6, 0x18]
@@ -1184,7 +1184,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x28
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r5, 0x1F
ands r0, r5
lsls r0, 5
@@ -1196,7 +1196,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x29
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r4
lsls r0, 2
ldrb r2, [r6, 0x19]
@@ -1208,7 +1208,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x2A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -1220,7 +1220,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x2B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r5
lsls r0, 4
ldrh r2, [r6, 0x1A]
@@ -1231,7 +1231,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x2C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r4
lsls r0, 1
ldrb r2, [r6, 0x1B]
@@ -1243,7 +1243,7 @@ _0803E278:
adds r0, r7, 0
movs r1, 0x2E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 7
ldrb r2, [r6, 0x1B]
movs r1, 0x7F
@@ -1253,12 +1253,12 @@ _0803E278:
adds r0, r7, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r6, 0x1C]
adds r0, r7, 0
movs r1, 0x2
mov r2, r9
- bl sub_803FBE8
+ bl GetMonData
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -1271,8 +1271,8 @@ _0803E3E0: .4byte 0xfff07fff
_0803E3E4: .4byte 0xfffffe0f
thumb_func_end sub_803E23C
- thumb_func_start sub_803E3E8
-sub_803E3E8: @ 803E3E8
+ thumb_func_start CalculateBoxMonChecksum
+CalculateBoxMonChecksum: @ 803E3E8
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -1280,22 +1280,22 @@ sub_803E3E8: @ 803E3E8
movs r6, 0
ldr r1, [r4]
movs r2, 0
- bl sub_803F940
+ bl GetSubstruct
adds r5, r0, 0
ldr r1, [r4]
adds r0, r4, 0
movs r2, 0x1
- bl sub_803F940
+ bl GetSubstruct
adds r7, r0, 0
ldr r1, [r4]
adds r0, r4, 0
movs r2, 0x2
- bl sub_803F940
+ bl GetSubstruct
mov r8, r0
ldr r1, [r4]
adds r0, r4, 0
movs r2, 0x3
- bl sub_803F940
+ bl GetSubstruct
adds r3, r0, 0
movs r1, 0x5
_0803E422:
@@ -1346,10 +1346,10 @@ _0803E45E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_803E3E8
+ thumb_func_end CalculateBoxMonChecksum
- thumb_func_start sub_803E47C
-sub_803E47C: @ 803E47C
+ thumb_func_start CalculateMonStats
+CalculateMonStats: @ 803E47C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1359,81 +1359,81 @@ sub_803E47C: @ 803E47C
adds r5, r0, 0
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
adds r0, r5, 0
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x1C]
adds r0, r5, 0
movs r1, 0x27
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0x1A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0x28
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
adds r0, r5, 0
movs r1, 0x1B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
adds r0, r5, 0
movs r1, 0x29
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x20]
adds r0, r5, 0
movs r1, 0x1C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x24]
adds r0, r5, 0
movs r1, 0x2A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x28]
adds r0, r5, 0
movs r1, 0x1D
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x2C]
adds r0, r5, 0
movs r1, 0x2B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x30]
adds r0, r5, 0
movs r1, 0x1E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x34]
adds r0, r5, 0
movs r1, 0x2C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x38]
adds r0, r5, 0
movs r1, 0x1F
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp, 0x3C]
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r5, 0
- bl sub_803E7C4
+ bl GetLevelFromMonExp
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1513,7 +1513,7 @@ _0803E5CE:
adds r0, 0x5
str r0, [sp, 0x8]
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
add r4, sp, 0x8
@@ -1545,7 +1545,7 @@ _0803E614:
adds r0, 0x5
str r0, [sp, 0xC]
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
add r4, sp, 0xC
@@ -1577,7 +1577,7 @@ _0803E65A:
adds r0, 0x5
str r0, [sp, 0x10]
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
add r4, sp, 0x10
@@ -1609,7 +1609,7 @@ _0803E6A0:
adds r0, 0x5
str r0, [sp, 0x14]
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
add r4, sp, 0x14
@@ -1641,7 +1641,7 @@ _0803E6E6:
adds r0, 0x5
str r0, [sp, 0x18]
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
add r4, sp, 0x18
@@ -1700,10 +1700,10 @@ _0803E764:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_803E47C
+ thumb_func_end CalculateMonStats
- thumb_func_start sub_803E774
-sub_803E774: @ 803E774
+ thumb_func_start BoxMonToMon
+BoxMonToMon: @ 803E774
push {r4,lr}
sub sp, 0x4
adds r2, r0, 0
@@ -1733,27 +1733,27 @@ sub_803E774: @ 803E774
mov r2, sp
bl sub_804037C
adds r0, r4, 0
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x4
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803E774
+ thumb_func_end BoxMonToMon
- thumb_func_start sub_803E7C4
-sub_803E7C4: @ 803E7C4
+ thumb_func_start GetLevelFromMonExp
+GetLevelFromMonExp: @ 803E7C4
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x19
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r3, r0, 0
movs r2, 0x1
ldr r6, _0803E828 @ =gUnknown_8253AE4
@@ -1794,22 +1794,22 @@ _0803E81A:
.align 2, 0
_0803E828: .4byte gUnknown_8253AE4
_0803E82C: .4byte gUnknown_8254784
- thumb_func_end sub_803E7C4
+ thumb_func_end GetLevelFromMonExp
- thumb_func_start sub_803E830
-sub_803E830: @ 803E830
+ thumb_func_start GetLevelFromBoxMonExp
+GetLevelFromBoxMonExp: @ 803E830
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x19
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r3, r0, 0
movs r2, 0x1
ldr r6, _0803E894 @ =gUnknown_8253AE4
@@ -1850,22 +1850,22 @@ _0803E886:
.align 2, 0
_0803E894: .4byte gUnknown_8253AE4
_0803E898: .4byte gUnknown_8254784
- thumb_func_end sub_803E830
+ thumb_func_end GetLevelFromBoxMonExp
- thumb_func_start sub_803E89C
-sub_803E89C: @ 803E89C
+ thumb_func_start GiveMoveToMon
+GiveMoveToMon: @ 803E89C
push {lr}
lsls r1, 16
lsrs r1, 16
- bl sub_803E8B0
+ bl GiveMoveToBoxMon
lsls r0, 16
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_803E89C
+ thumb_func_end GiveMoveToMon
- thumb_func_start sub_803E8B0
-sub_803E8B0: @ 803E8B0
+ thumb_func_start GiveMoveToBoxMon
+GiveMoveToBoxMon: @ 803E8B0
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
@@ -1879,7 +1879,7 @@ _0803E8BE:
adds r0, r7, 0
adds r1, r4, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -1922,10 +1922,10 @@ _0803E914:
bx r1
.align 2, 0
_0803E91C: .4byte 0x0000ffff
- thumb_func_end sub_803E8B0
+ thumb_func_end GiveMoveToBoxMon
- thumb_func_start sub_803E920
-sub_803E920: @ 803E920
+ thumb_func_start GiveMoveToBattleMon
+GiveMoveToBattleMon: @ 803E920
push {r4,r5,lr}
lsls r1, 16
lsrs r4, r1, 16
@@ -1963,10 +1963,10 @@ _0803E95A:
bx r1
.align 2, 0
_0803E960: .4byte 0x0000ffff
- thumb_func_end sub_803E920
+ thumb_func_end GiveMoveToBattleMon
- thumb_func_start sub_803E964
-sub_803E964: @ 803E964
+ thumb_func_start SetMonMoveSlot
+SetMonMoveSlot: @ 803E964
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -1997,10 +1997,10 @@ sub_803E964: @ 803E964
bx r0
.align 2, 0
_0803E9A0: .4byte gUnknown_8250C08
- thumb_func_end sub_803E964
+ thumb_func_end SetMonMoveSlot
- thumb_func_start sub_803E9A4
-sub_803E9A4: @ 803E9A4
+ thumb_func_start SetBattleMonMoveSlot
+SetBattleMonMoveSlot: @ 803E9A4
push {r4,lr}
lsls r1, 16
lsrs r1, 16
@@ -2025,18 +2025,18 @@ sub_803E9A4: @ 803E9A4
bx r0
.align 2, 0
_0803E9D0: .4byte gUnknown_8250C04
- thumb_func_end sub_803E9A4
+ thumb_func_end SetBattleMonMoveSlot
- thumb_func_start sub_803E9D4
-sub_803E9D4: @ 803E9D4
+ thumb_func_start GiveMonInitialMoveset
+GiveMonInitialMoveset: @ 803E9D4
push {lr}
- bl sub_803E9E0
+ bl GiveBoxMonInitialMoveset
pop {r0}
bx r0
- thumb_func_end sub_803E9D4
+ thumb_func_end GiveMonInitialMoveset
- thumb_func_start sub_803E9E0
-sub_803E9E0: @ 803E9E0
+ thumb_func_start GiveBoxMonInitialMoveset
+GiveBoxMonInitialMoveset: @ 803E9E0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2046,12 +2046,12 @@ sub_803E9E0: @ 803E9E0
mov r8, r0
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
- bl sub_803E830
+ bl GetLevelFromBoxMonExp
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2087,7 +2087,7 @@ _0803EA1E:
mov r0, r8
adds r1, r4, 0
str r3, [sp]
- bl sub_803E8B0
+ bl GiveMoveToBoxMon
lsls r0, 16
mov r1, r9
lsrs r5, r1, 16
@@ -2096,7 +2096,7 @@ _0803EA1E:
bne _0803EA60
mov r0, r8
adds r1, r4, 0
- bl sub_803EC40
+ bl DeleteFirstMoveAndGiveMoveToBoxMon
ldr r3, [sp]
_0803EA60:
adds r3, 0x2
@@ -2118,10 +2118,10 @@ _0803EA6C:
_0803EA7C: .4byte gUnknown_825D7B4
_0803EA80: .4byte 0xffff0000
_0803EA84: .4byte 0x000001ff
- thumb_func_end sub_803E9E0
+ thumb_func_end GiveBoxMonInitialMoveset
- thumb_func_start sub_803EA88
-sub_803EA88: @ 803EA88
+ thumb_func_start MonTryLearningNewMove
+MonTryLearningNewMove: @ 803EA88
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2136,14 +2136,14 @@ sub_803EA88: @ 803EA88
mov r0, r8
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r9, r0
mov r0, r8
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2234,7 +2234,7 @@ _0803EB48:
strb r0, [r6]
ldrh r1, [r2]
mov r0, r8
- bl sub_803E89C
+ bl GiveMoveToMon
lsls r0, 16
lsrs r0, 16
str r0, [sp]
@@ -2254,10 +2254,10 @@ _0803EB84: .4byte gUnknown_825D7B4
_0803EB88: .4byte gUnknown_2024028
_0803EB8C: .4byte gUnknown_2024022
_0803EB90: .4byte 0x000001ff
- thumb_func_end sub_803EA88
+ thumb_func_end MonTryLearningNewMove
- thumb_func_start sub_803EB94
-sub_803EB94: @ 803EB94
+ thumb_func_start DeleteFirstMoveAndGiveMoveToMon
+DeleteFirstMoveAndGiveMoveToMon: @ 803EB94
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2277,13 +2277,13 @@ _0803EBB0:
adds r1, 0xE
adds r0, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r1, r4, 0
adds r1, 0x12
adds r0, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, r4
strb r0, [r1]
adds r5, 0x2
@@ -2293,7 +2293,7 @@ _0803EBB0:
adds r0, r6, 0
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strb r0, [r1]
ldrb r0, [r1]
@@ -2340,10 +2340,10 @@ _0803EC04:
bx r0
.align 2, 0
_0803EC3C: .4byte gUnknown_8250C04
- thumb_func_end sub_803EB94
+ thumb_func_end DeleteFirstMoveAndGiveMoveToMon
- thumb_func_start sub_803EC40
-sub_803EC40: @ 803EC40
+ thumb_func_start DeleteFirstMoveAndGiveMoveToBoxMon
+DeleteFirstMoveAndGiveMoveToBoxMon: @ 803EC40
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2363,13 +2363,13 @@ _0803EC5C:
adds r1, 0xE
adds r0, r6, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
strh r0, [r5]
adds r1, r4, 0
adds r1, 0x12
adds r0, r6, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r1, r7, r4
strb r0, [r1]
adds r5, 0x2
@@ -2379,7 +2379,7 @@ _0803EC5C:
adds r0, r6, 0
movs r1, 0x15
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
mov r1, r9
strb r0, [r1]
ldrb r0, [r1]
@@ -2426,6 +2426,6 @@ _0803ECB0:
bx r0
.align 2, 0
_0803ECE8: .4byte gUnknown_8250C04
- thumb_func_end sub_803EC40
+ thumb_func_end DeleteFirstMoveAndGiveMoveToBoxMon
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokemon_2.s b/asm/pokemon_2.s
index f579b7a19..311d3797f 100644
--- a/asm/pokemon_2.s
+++ b/asm/pokemon_2.s
@@ -55,11 +55,11 @@ _0803F608:
_0803F60A:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _0803F644 @ =gUnknown_2023D6B
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -90,11 +90,11 @@ _0803F650:
_0803F652:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_80751C4
+ bl GetBankSide
adds r4, r0, 0
ldr r0, _0803F694 @ =gUnknown_2023D6C
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r4, 24
lsls r0, 24
cmp r4, r0
@@ -126,12 +126,12 @@ _0803F698: .4byte gUnknown_2023D70
_0803F69C: .4byte gUnknown_825E45C
thumb_func_end sub_803F5B4
- thumb_func_start sub_803F6A0
-sub_803F6A0: @ 803F6A0
+ thumb_func_start GetDefaultMoveTarget
+GetDefaultMoveTarget: @ 803F6A0
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
- bl sub_80751D8
+ bl GetBankIdentity
movs r1, 0x1
movs r6, 0x1
adds r4, r6, 0
@@ -154,7 +154,7 @@ _0803F6C8:
lsrs r0, 24
cmp r0, 0x1
bls _0803F6EC
- bl sub_8044EC8
+ bl Random
adds r1, r6, 0
ands r1, r0
cmp r1, 0
@@ -185,37 +185,37 @@ _0803F70C:
eors r5, r0
adds r0, r5, 0
_0803F712:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_803F6A0
+ thumb_func_end GetDefaultMoveTarget
- thumb_func_start sub_803F720
-sub_803F720: @ 803F720
+ thumb_func_start GetMonGender
+GetMonGender: @ 803F720
push {lr}
- bl sub_803F730
+ bl GetBoxMonGender
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_803F720
+ thumb_func_end GetMonGender
- thumb_func_start sub_803F730
-sub_803F730: @ 803F730
+ thumb_func_start GetBoxMonGender
+GetBoxMonGender: @ 803F730
push {r4,r5,lr}
adds r4, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r2, r0, 0
ldr r1, _0803F780 @ =gUnknown_8254784
lsls r0, r5, 3
@@ -252,10 +252,10 @@ _0803F786:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_803F730
+ thumb_func_end GetBoxMonGender
- thumb_func_start sub_803F78C
-sub_803F78C: @ 803F78C
+ thumb_func_start GetGenderFromSpeciesAndPersonality
+GetGenderFromSpeciesAndPersonality: @ 803F78C
push {lr}
adds r3, r1, 0
lsls r0, 16
@@ -293,7 +293,7 @@ _0803F7CC:
_0803F7CE:
pop {r1}
bx r1
- thumb_func_end sub_803F78C
+ thumb_func_end GetGenderFromSpeciesAndPersonality
thumb_func_start sub_803F7D4
sub_803F7D4: @ 803F7D4
@@ -451,8 +451,8 @@ _0803F8F0: .4byte gUnknown_825DEF0
_0803F8F4: .4byte gUnknown_82390DC
thumb_func_end sub_803F864
- thumb_func_start sub_803F8F8
-sub_803F8F8: @ 803F8F8
+ thumb_func_start EncryptBoxMon
+EncryptBoxMon: @ 803F8F8
push {r4,lr}
adds r3, r0, 0
movs r4, 0
@@ -472,10 +472,10 @@ _0803F902:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803F8F8
+ thumb_func_end EncryptBoxMon
- thumb_func_start sub_803F91C
-sub_803F91C: @ 803F91C
+ thumb_func_start DecryptBoxMon
+DecryptBoxMon: @ 803F91C
push {r4,lr}
adds r3, r0, 0
movs r4, 0
@@ -495,10 +495,10 @@ _0803F926:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_803F91C
+ thumb_func_end DecryptBoxMon
- thumb_func_start sub_803F940
-sub_803F940: @ 803F940
+ thumb_func_start GetSubstruct
+GetSubstruct: @ 803F940
push {r4-r6,lr}
adds r5, r0, 0
adds r0, r1, 0
@@ -885,10 +885,10 @@ _0803FBE0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_803F940
+ thumb_func_end GetSubstruct
- thumb_func_start sub_803FBE8
-sub_803FBE8: @ 803FBE8
+ thumb_func_start GetMonData
+GetMonData: @ 803FBE8
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
@@ -1037,15 +1037,15 @@ _0803FD2E:
_0803FD36:
adds r0, r4, 0
adds r1, r3, 0
- bl sub_803FD44
+ bl GetBoxMonData
_0803FD3E:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_803FBE8
+ thumb_func_end GetMonData
- thumb_func_start sub_803FD44
-sub_803FD44: @ 803FD44
+ thumb_func_start GetBoxMonData
+GetBoxMonData: @ 803FD44
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1064,28 +1064,28 @@ sub_803FD44: @ 803FD44
ble _0803FDC2
ldr r1, [r0]
movs r2, 0
- bl sub_803F940
+ bl GetSubstruct
mov r9, r0
mov r0, r8
ldr r1, [r0]
movs r2, 0x1
- bl sub_803F940
+ bl GetSubstruct
mov r10, r0
mov r2, r8
ldr r1, [r2]
mov r0, r8
movs r2, 0x2
- bl sub_803F940
+ bl GetSubstruct
adds r7, r0, 0
mov r0, r8
ldr r1, [r0]
movs r2, 0x3
- bl sub_803F940
+ bl GetSubstruct
adds r5, r0, 0
mov r0, r8
- bl sub_803F91C
+ bl DecryptBoxMon
mov r0, r8
- bl sub_803E3E8
+ bl CalculateBoxMonChecksum
lsls r0, 16
lsrs r0, 16
mov r1, r8
@@ -1246,9 +1246,9 @@ _0803FF6C:
beq _0803FF8C
ldr r1, _0803FF88 @ =gUnknown_8415A62
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r6, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r4, r0, 16
b _0804035C
@@ -1834,7 +1834,7 @@ _0804035C:
cmp r6, 0xA
ble _08040368
mov r0, r8
- bl sub_803F8F8
+ bl EncryptBoxMon
_08040368:
adds r0, r4, 0
add sp, 0x4
@@ -1845,7 +1845,7 @@ _08040368:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_803FD44
+ thumb_func_end GetBoxMonData
thumb_func_start sub_804037C
sub_804037C: @ 804037C
@@ -2019,27 +2019,27 @@ sub_80404D0: @ 80404D0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0
- bl sub_803F940
+ bl GetSubstruct
mov r8, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x1
- bl sub_803F940
+ bl GetSubstruct
mov r9, r0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x2
- bl sub_803F940
+ bl GetSubstruct
adds r6, r0, 0
ldr r1, [r7]
adds r0, r7, 0
movs r2, 0x3
- bl sub_803F940
+ bl GetSubstruct
adds r5, r0, 0
adds r0, r7, 0
- bl sub_803F91C
+ bl DecryptBoxMon
adds r0, r7, 0
- bl sub_803E3E8
+ bl CalculateBoxMonChecksum
lsls r0, 16
lsrs r0, 16
ldrh r1, [r7, 0x1C]
@@ -2056,7 +2056,7 @@ sub_80404D0: @ 80404D0
orrs r0, r1
strb r0, [r5, 0x7]
adds r0, r7, 0
- bl sub_803F8F8
+ bl EncryptBoxMon
b _08040AEE
_08040550:
mov r0, r10
@@ -2767,10 +2767,10 @@ _08040ADA:
cmp r0, 0xA
ble _08040AEE
adds r0, r7, 0
- bl sub_803E3E8
+ bl CalculateBoxMonChecksum
strh r0, [r7, 0x1C]
adds r0, r7, 0
- bl sub_803F8F8
+ bl EncryptBoxMon
_08040AEE:
pop {r3-r5}
mov r8, r3
@@ -2785,16 +2785,16 @@ _08040B00: .4byte 0xfff07fff
_08040B04: .4byte 0xfffffe0f
thumb_func_end sub_80404D0
- thumb_func_start sub_8040B08
-sub_8040B08: @ 8040B08
+ thumb_func_start CopyMon
+CopyMon: @ 8040B08
push {lr}
bl memcpy
pop {r0}
bx r0
- thumb_func_end sub_8040B08
+ thumb_func_end CopyMon
- thumb_func_start sub_8040B14
-sub_8040B14: @ 8040B14
+ thumb_func_start GiveMonToPlayer
+GiveMonToPlayer: @ 8040B14
push {r4-r6,lr}
adds r6, r0, 0
ldr r4, _08040B40 @ =gUnknown_300500C
@@ -2828,13 +2828,13 @@ _08040B46:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08040B44
adds r0, r4, 0
adds r1, r6, 0
movs r2, 0x64
- bl sub_8040B08
+ bl CopyMon
ldr r1, _08040B7C @ =gUnknown_2024029
adds r0, r5, 0x1
strb r0, [r1]
@@ -2845,17 +2845,17 @@ _08040B78: .4byte gUnknown_2024284
_08040B7C: .4byte gUnknown_2024029
_08040B80:
adds r0, r6, 0
- bl sub_8040B90
+ bl SendMonToPC
lsls r0, 24
lsrs r0, 24
_08040B8A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8040B14
+ thumb_func_end GiveMonToPlayer
- thumb_func_start sub_8040B90
-sub_8040B90: @ 8040B90
+ thumb_func_start SendMonToPC
+SendMonToPC: @ 8040B90
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2865,7 +2865,7 @@ sub_8040B90: @ 8040B90
lsls r0, 24
lsrs r0, 24
bl sub_80CC79C
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r5, r0, 24
_08040BAE:
@@ -2875,19 +2875,19 @@ _08040BB2:
lsls r1, r6, 24
lsrs r1, 24
lsrs r0, r7, 24
- bl sub_808BD30
+ bl GetBoxedMonPtr
adds r4, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _08040C14
mov r0, r8
- bl sub_80442D8
+ bl MonRestorePP
adds r0, r4, 0
mov r1, r8
movs r2, 0x50
- bl sub_8040B08
+ bl CopyMon
ldr r0, _08040C08 @ =gUnknown_20370D6
strh r5, [r0]
ldr r0, _08040C0C @ =gUnknown_20370D8
@@ -2920,7 +2920,7 @@ _08040C14:
bne _08040C22
movs r5, 0
_08040C22:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -2932,10 +2932,10 @@ _08040C30:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8040B90
+ thumb_func_end SendMonToPC
- thumb_func_start sub_8040C3C
-sub_8040C3C: @ 8040C3C
+ thumb_func_start CalculatePlayerPartyCount
+CalculatePlayerPartyCount: @ 8040C3C
push {r4,lr}
ldr r0, _08040C48 @ =gUnknown_2024029
movs r1, 0
@@ -2960,7 +2960,7 @@ _08040C54:
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08040C4C
_08040C72:
@@ -2970,10 +2970,10 @@ _08040C72:
bx r1
.align 2, 0
_08040C7C: .4byte gUnknown_2024284
- thumb_func_end sub_8040C3C
+ thumb_func_end CalculatePlayerPartyCount
- thumb_func_start sub_8040C80
-sub_8040C80: @ 8040C80
+ thumb_func_start CalculateEnemyPartyCount
+CalculateEnemyPartyCount: @ 8040C80
push {r4,lr}
ldr r0, _08040C8C @ =gUnknown_202402A
movs r1, 0
@@ -2998,7 +2998,7 @@ _08040C98:
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08040C90
_08040CB6:
@@ -3008,13 +3008,13 @@ _08040CB6:
bx r1
.align 2, 0
_08040CC0: .4byte gUnknown_202402C
- thumb_func_end sub_8040C80
+ thumb_func_end CalculateEnemyPartyCount
- thumb_func_start sub_8040CC4
-sub_8040CC4: @ 8040CC4
+ thumb_func_start GetMonsStateToDoubles
+GetMonsStateToDoubles: @ 8040CC4
push {r4-r6,lr}
movs r6, 0
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r1, _08040D30 @ =gUnknown_2024029
ldrb r0, [r1]
cmp r0, 0x1
@@ -3032,19 +3032,19 @@ _08040CDC:
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08040D16
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08040D16
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -3068,7 +3068,7 @@ _08040D28:
.align 2, 0
_08040D30: .4byte gUnknown_2024029
_08040D34: .4byte gUnknown_2024284
- thumb_func_end sub_8040CC4
+ thumb_func_end GetMonsStateToDoubles
thumb_func_start sub_8040D38
sub_8040D38: @ 8040D38
@@ -3113,14 +3113,14 @@ sub_8040D7C: @ 8040D7C
adds r5, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x2E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3142,7 +3142,7 @@ sub_8040DB0: @ 8040DB0
push {r5-r7}
sub sp, 0x14
adds r5, r0, 0
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r4, _08040ED8 @ =gUnknown_2023FF4
ldr r0, [r4]
ldr r0, [r0]
@@ -3191,7 +3191,7 @@ _08040DD4:
str r0, [sp, 0xC]
adds r0, r5, 0
movs r3, 0xF
- bl sub_803DA54
+ bl CreateMon
ldr r1, _08040ED8 @ =gUnknown_2023FF4
ldr r0, [r1]
adds r1, r7, 0
@@ -3287,8 +3287,8 @@ _08040EE4: .4byte gUnknown_2022B4C
_08040EE8: .4byte gUnknown_20386AE
thumb_func_end sub_8040DB0
- thumb_func_start sub_8040EEC
-sub_8040EEC: @ 8040EEC
+ thumb_func_start GetSecretBaseTrainerPicIndex
+GetSecretBaseTrainerPicIndex: @ 8040EEC
push {r4,r5,lr}
ldr r5, _08040F20 @ =gUnknown_825DFE0
ldr r0, _08040F24 @ =gUnknown_2023FF4
@@ -3317,10 +3317,10 @@ sub_8040EEC: @ 8040EEC
_08040F20: .4byte gUnknown_825DFE0
_08040F24: .4byte gUnknown_2023FF4
_08040F28: .4byte gUnknown_82538A8
- thumb_func_end sub_8040EEC
+ thumb_func_end GetSecretBaseTrainerPicIndex
- thumb_func_start sub_8040F2C
-sub_8040F2C: @ 8040F2C
+ thumb_func_start GetSecretBaseTrainerNameIndex
+GetSecretBaseTrainerNameIndex: @ 8040F2C
push {r4,r5,lr}
ldr r5, _08040F60 @ =gUnknown_825DFE0
ldr r0, _08040F64 @ =gUnknown_2023FF4
@@ -3349,10 +3349,10 @@ sub_8040F2C: @ 8040F2C
_08040F60: .4byte gUnknown_825DFE0
_08040F64: .4byte gUnknown_2023FF4
_08040F68: .4byte gUnknown_825393E
- thumb_func_end sub_8040F2C
+ thumb_func_end GetSecretBaseTrainerNameIndex
- thumb_func_start sub_8040F6C
-sub_8040F6C: @ 8040F6C
+ thumb_func_start IsPlayerPartyAndPokemonStorageFull
+IsPlayerPartyAndPokemonStorageFull: @ 8040F6C
push {r4,lr}
movs r4, 0
_08040F70:
@@ -3362,7 +3362,7 @@ _08040F70:
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08040F8C
movs r0, 0
@@ -3373,17 +3373,17 @@ _08040F8C:
adds r4, 0x1
cmp r4, 0x5
ble _08040F70
- bl sub_8040FA0
+ bl IsPokemonStorageFull
lsls r0, 24
lsrs r0, 24
_08040F9A:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8040F6C
+ thumb_func_end IsPlayerPartyAndPokemonStorageFull
- thumb_func_start sub_8040FA0
-sub_8040FA0: @ 8040FA0
+ thumb_func_start IsPokemonStorageFull
+IsPokemonStorageFull: @ 8040FA0
push {r4-r6,lr}
movs r6, 0
_08040FA4:
@@ -3394,7 +3394,7 @@ _08040FA8:
lsrs r1, 24
lsrs r0, r5, 24
movs r2, 0xB
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _08040FBC
movs r0, 0
@@ -3411,10 +3411,10 @@ _08040FCA:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8040FA0
+ thumb_func_end IsPokemonStorageFull
- thumb_func_start sub_8040FD0
-sub_8040FD0: @ 8040FD0
+ thumb_func_start GetSpeciesName
+GetSpeciesName: @ 8040FD0
push {r4-r7,lr}
adds r6, r0, 0
lsls r1, 16
@@ -3457,10 +3457,10 @@ _08041010:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8040FD0
+ thumb_func_end GetSpeciesName
- thumb_func_start sub_804101C
-sub_804101C: @ 804101C
+ thumb_func_start CalculatePPWithBonus
+CalculatePPWithBonus: @ 804101C
push {r4,lr}
lsls r0, 16
lsrs r0, 16
@@ -3494,10 +3494,10 @@ sub_804101C: @ 804101C
.align 2, 0
_0804105C: .4byte gUnknown_8250C04
_08041060: .4byte gUnknown_825DEA1
- thumb_func_end sub_804101C
+ thumb_func_end CalculatePPWithBonus
- thumb_func_start sub_8041064
-sub_8041064: @ 8041064
+ thumb_func_start RemoveMonPPBonus
+RemoveMonPPBonus: @ 8041064
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -3505,7 +3505,7 @@ sub_8041064: @ 8041064
lsrs r4, 24
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r1, sp
@@ -3526,10 +3526,10 @@ sub_8041064: @ 8041064
bx r0
.align 2, 0
_0804109C: .4byte gUnknown_825DEA5
- thumb_func_end sub_8041064
+ thumb_func_end RemoveMonPPBonus
- thumb_func_start sub_80410A0
-sub_80410A0: @ 80410A0
+ thumb_func_start RemoveBattleMonPPBonus
+RemoveBattleMonPPBonus: @ 80410A0
lsls r1, 24
lsrs r1, 24
adds r0, 0x3B
@@ -3542,10 +3542,10 @@ sub_80410A0: @ 80410A0
bx lr
.align 2, 0
_080410B4: .4byte gUnknown_825DEA5
- thumb_func_end sub_80410A0
+ thumb_func_end RemoveBattleMonPPBonus
- thumb_func_start sub_80410B8
-sub_80410B8: @ 80410B8
+ thumb_func_start CopyPlayerPartyMonToBattleData
+CopyPlayerPartyMonToBattleData: @ 80410B8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -3566,7 +3566,7 @@ sub_80410B8: @ 80410B8
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080413A8 @ =gUnknown_2023BE4
mov r8, r1
movs r1, 0x58
@@ -3579,7 +3579,7 @@ sub_80410B8: @ 80410B8
adds r0, r5, 0
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r6, 0x2E]
movs r6, 0
mov r0, r8
@@ -3590,7 +3590,7 @@ _0804110A:
adds r1, 0xD
adds r0, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xC
add r1, r8
mov r10, r1
@@ -3600,7 +3600,7 @@ _0804110A:
adds r1, 0x11
adds r0, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r7]
adds r7, 0x1
adds r4, 0x2
@@ -3615,7 +3615,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r2, 0xC
negs r2, r2
add r2, r10
@@ -3631,14 +3631,14 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, 0
adds r1, 0x2B
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x19
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
adds r1, 0x38
adds r1, r5, r1
@@ -3646,7 +3646,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x27
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r6, 0x1F
ands r0, r6
ldrb r2, [r7, 0x14]
@@ -3658,7 +3658,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x28
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
mov r8, r1
mov r2, r8
@@ -3672,7 +3672,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x29
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r6
lsls r0, 2
ldrb r2, [r7, 0x15]
@@ -3684,7 +3684,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x2A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1F
ands r1, r0
lsls r1, 15
@@ -3696,7 +3696,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x2B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r3, r8
ands r0, r3
lsls r0, 4
@@ -3708,7 +3708,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x2C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r6
lsls r0, 1
ldrb r2, [r7, 0x17]
@@ -3720,7 +3720,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
adds r1, 0x3C
adds r1, r5, r1
@@ -3728,7 +3728,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x37
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
adds r1, 0x40
adds r1, r5, r1
@@ -3736,49 +3736,49 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, 0
adds r1, 0x2A
strb r0, [r1]
adds r0, r4, 0
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x28]
adds r0, r4, 0
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x2C]
adds r0, r4, 0
movs r1, 0x3B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x2]
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x4]
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x6]
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0x8]
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r7, 0xA]
adds r0, r4, 0
movs r1, 0x2D
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x1
ands r0, r1
lsls r0, 6
@@ -3791,7 +3791,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x2E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 7
ldrb r2, [r7, 0x17]
movs r1, 0x7F
@@ -3801,7 +3801,7 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, r10
adds r1, 0x48
adds r1, r5, r1
@@ -3835,20 +3835,20 @@ _0804110A:
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
mov r0, r10
adds r0, 0x24
adds r0, r5, r0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
mov r2, r10
adds r2, 0x30
adds r2, r5, r2
adds r0, r4, 0
movs r1, 0x7
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [sp, 0x14]
- bl sub_80751C4
+ bl GetBankSide
ldr r1, _080413BC @ =gUnknown_2023FE8
lsls r0, 24
lsrs r0, 23
@@ -3880,7 +3880,7 @@ _0804136E:
bl sub_80174B8
ldr r0, [sp, 0x14]
movs r1, 0
- bl sub_803589C
+ bl ClearTemporarySpeciesSpriteData
add sp, 0x18
pop {r3-r5}
mov r8, r3
@@ -3897,6 +3897,6 @@ _080413B0: .4byte 0xfff07fff
_080413B4: .4byte 0xfffffe0f
_080413B8: .4byte gUnknown_8254784
_080413BC: .4byte gUnknown_2023FE8
- thumb_func_end sub_80410B8
+ thumb_func_end CopyPlayerPartyMonToBattleData
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s
index 72aaad8e9..57cafe4be 100644
--- a/asm/pokemon_3.s
+++ b/asm/pokemon_3.s
@@ -15,7 +15,7 @@ sub_80423A4: @ 80423A4
lsrs r6, r3, 24
movs r1, 0x37
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r1, [sp]
ands r0, r4
@@ -90,12 +90,12 @@ sub_8042414: @ 8042414
str r0, [sp, 0x1C]
mov r0, r8
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
beq _08042458
- bl sub_809A924
+ bl ItemId_GetHoldEffect
_08042458:
ldr r1, _080424B0 @ =gUnknown_2023D6F
ldr r0, _080424B4 @ =gUnknown_2024004
@@ -114,7 +114,7 @@ _08042458:
ldr r0, _080424C0 @ =gUnknown_2023BC4
strb r2, [r0]
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -454,7 +454,7 @@ _08042708:
ldr r4, _08042838 @ =gUnknown_2023DE4
ldr r0, _0804283C @ =gUnknown_2023BC4
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -475,7 +475,7 @@ _0804273A:
mov r0, r8
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
beq _08042756
movs r0, 0
@@ -619,7 +619,7 @@ _08042850:
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
ldr r0, _080428DC @ =gUnknown_825DEA1
ldr r1, [sp, 0x8]
@@ -631,20 +631,20 @@ _08042850:
adds r1, 0xD
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x8]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
cmp r5, 0x2
@@ -703,7 +703,7 @@ _08042914:
ldrb r1, [r0]
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
cmp r5, 0x63
bls _0804292A
@@ -721,7 +721,7 @@ _08042934:
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08042968
mov r0, r10
@@ -732,7 +732,7 @@ _08042952:
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08042968
mov r0, r10
@@ -743,12 +743,12 @@ _08042968:
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
beq _08042986
movs r0, 0
@@ -775,27 +775,27 @@ _080429A4:
adds r1, 0x11
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
adds r1, r6, 0
adds r1, 0xD
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r2, r6, 24
lsrs r2, 24
adds r0, r4, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -817,26 +817,26 @@ _080429FA:
adds r1, 0x11
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
ldr r1, [sp, 0x8]
adds r1, 0xD
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x8]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
cmp r5, r0
@@ -923,7 +923,7 @@ _08042ACC:
ldrb r1, [r1]
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
cmp r5, 0x63
bhi _08042BBE
@@ -937,7 +937,7 @@ _08042AF4:
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
ldr r0, _08042B48 @ =gUnknown_825DEA1
ldr r1, [sp, 0x8]
@@ -949,20 +949,20 @@ _08042AF4:
adds r1, 0xD
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x8]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r6, r0, 24
cmp r5, 0x2
@@ -978,7 +978,7 @@ _08042B4C:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bhi _08042BB4
ldr r0, [sp, 0x10]
@@ -992,13 +992,13 @@ _08042B68:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _08042BB4
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xC7
bhi _08042BB4
ldr r2, [sp, 0x10]
@@ -1012,7 +1012,7 @@ _08042B92:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xC7
bls _08042BB4
ldr r1, [sp, 0x10]
@@ -1065,7 +1065,7 @@ sub_8042BE8: @ 8042BE8
adds r4, r2, 0
movs r1, 0x37
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ands r0, r4
cmp r0, 0
bne _08042BFE
@@ -1079,8 +1079,8 @@ _08042C00:
bx r1
thumb_func_end sub_8042BE8
- thumb_func_start sub_8042C08
-sub_8042C08: @ 8042C08
+ thumb_func_start GetItemEffectParamOffset
+GetItemEffectParamOffset: @ 8042C08
push {r4-r7,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -1260,7 +1260,7 @@ _08042D48:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8042C08
+ thumb_func_end GetItemEffectParamOffset
thumb_func_start sub_8042D50
sub_8042D50: @ 8042D50
@@ -1278,10 +1278,10 @@ sub_8042D50: @ 8042D50
adds r0, r2
ldr r1, [r0]
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08042D98 @ =gUnknown_2022AC8
ldr r1, _08042D9C @ =gUnknown_83FCB4A
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08042DA0 @ =gUnknown_83FCB6A
bl sub_80D77F4
pop {r0}
@@ -1415,22 +1415,22 @@ _08042E94: .4byte gUnknown_83FBBB4
_08042E98: .4byte gUnknown_202298C
thumb_func_end sub_8042DA4
- thumb_func_start sub_8042E9C
-sub_8042E9C: @ 8042E9C
+ thumb_func_start GetNature
+GetNature: @ 8042E9C
push {lr}
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x19
bl __umodsi3
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8042E9C
+ thumb_func_end GetNature
- thumb_func_start sub_8042EB4
-sub_8042EB4: @ 8042EB4
+ thumb_func_start GetNatureFromPersonality
+GetNatureFromPersonality: @ 8042EB4
push {lr}
movs r1, 0x19
bl __umodsi3
@@ -1438,7 +1438,7 @@ sub_8042EB4: @ 8042EB4
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_8042EB4
+ thumb_func_end GetNatureFromPersonality
thumb_func_start sub_8042EC4
sub_8042EC4: @ 8042EC4
@@ -1459,24 +1459,24 @@ sub_8042EC4: @ 8042EC4
mov r0, r8
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
mov r0, r8
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
mov r0, r8
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x17
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0xC]
@@ -1496,7 +1496,7 @@ sub_8042EC4: @ 8042EC4
_08042F30: .4byte gUnknown_3005008
_08042F34: .4byte 0x0000311a
_08042F38:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_08042F40:
@@ -1532,14 +1532,14 @@ _08042F70:
mov r0, r8
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r9, r0
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
str r0, [sp, 0x8]
@@ -1619,12 +1619,12 @@ _08043026:
mov r0, r8
movs r1, 0x3B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
bls _08043110
b _080430A2
@@ -1639,12 +1639,12 @@ _08043050:
mov r0, r8
movs r1, 0x3B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
bne _08043110
b _080430A2
@@ -1659,12 +1659,12 @@ _0804307A:
mov r0, r8
movs r1, 0x3B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x3C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
bcs _08043110
_080430A2:
@@ -1866,8 +1866,8 @@ _080431FA:
bx r1
thumb_func_end sub_80431B4
- thumb_func_start sub_8043200
-sub_8043200: @ 8043200
+ thumb_func_start NationalPokedexNumToSpecies
+NationalPokedexNumToSpecies: @ 8043200
push {r4,lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -1908,7 +1908,7 @@ _08043246:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8043200
+ thumb_func_end NationalPokedexNumToSpecies
thumb_func_start sub_804324C
sub_804324C: @ 804324C
@@ -1954,8 +1954,8 @@ _08043292:
bx r1
thumb_func_end sub_804324C
- thumb_func_start sub_8043298
-sub_8043298: @ 8043298
+ thumb_func_start SpeciesToNationalPokedexNum
+SpeciesToNationalPokedexNum: @ 8043298
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -1974,10 +1974,10 @@ _080432B4:
_080432B6:
pop {r1}
bx r1
- thumb_func_end sub_8043298
+ thumb_func_end SpeciesToNationalPokedexNum
- thumb_func_start sub_80432BC
-sub_80432BC: @ 80432BC
+ thumb_func_start SpeciesToHoennPokedexNum
+SpeciesToHoennPokedexNum: @ 80432BC
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -1996,10 +1996,10 @@ _080432D8:
_080432DA:
pop {r1}
bx r1
- thumb_func_end sub_80432BC
+ thumb_func_end SpeciesToHoennPokedexNum
- thumb_func_start sub_80432E0
-sub_80432E0: @ 80432E0
+ thumb_func_start HoennToNationalOrder
+HoennToNationalOrder: @ 80432E0
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -2018,10 +2018,10 @@ _080432FC:
_080432FE:
pop {r1}
bx r1
- thumb_func_end sub_80432E0
+ thumb_func_end HoennToNationalOrder
- thumb_func_start sub_8043304
-sub_8043304: @ 8043304
+ thumb_func_start SpeciesToCryId
+SpeciesToCryId: @ 8043304
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -2047,7 +2047,7 @@ _08043330:
_08043332:
pop {r1}
bx r1
- thumb_func_end sub_8043304
+ thumb_func_end SpeciesToCryId
thumb_func_start sub_8043338
sub_8043338: @ 8043338
@@ -2202,8 +2202,8 @@ _08043446:
bx r0
thumb_func_end sub_8043338
- thumb_func_start sub_8043458
-sub_8043458: @ 8043458
+ thumb_func_start DrawSpindaSpots
+DrawSpindaSpots: @ 8043458
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2349,10 +2349,10 @@ _0804355A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8043458
+ thumb_func_end DrawSpindaSpots
- thumb_func_start sub_804356C
-sub_804356C: @ 804356C
+ thumb_func_start EvolutionRenameMon
+EvolutionRenameMon: @ 804356C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2369,12 +2369,12 @@ sub_804356C: @ 804356C
adds r0, r5, 0
movs r1, 0x2
mov r2, r9
- bl sub_803FBE8
+ bl GetMonData
mov r4, sp
adds r0, r5, 0
movs r1, 0x3
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
strb r0, [r4]
lsls r0, 24
lsrs r0, 24
@@ -2386,7 +2386,7 @@ sub_804356C: @ 804356C
ldr r4, _080435DC @ =gUnknown_8245EE0
adds r0, r4
mov r1, r9
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _080435C8
mov r2, r8
@@ -2406,14 +2406,14 @@ _080435C8:
.align 2, 0
_080435D8: .4byte gUnknown_2021CD0
_080435DC: .4byte gUnknown_8245EE0
- thumb_func_end sub_804356C
+ thumb_func_end EvolutionRenameMon
thumb_func_start sub_80435E0
sub_80435E0: @ 80435E0
push {r4,r5,lr}
movs r5, 0
ldr r4, _08043608 @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -2480,8 +2480,8 @@ _08043652:
bx r1
thumb_func_end sub_8043620
- thumb_func_start sub_8043658
-sub_8043658: @ 8043658
+ thumb_func_start GetBankMultiplayerId
+GetBankMultiplayerId: @ 8043658
push {lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -2503,7 +2503,7 @@ _08043676:
adds r0, r2, 0
pop {r1}
bx r1
- thumb_func_end sub_8043658
+ thumb_func_end GetBankMultiplayerId
thumb_func_start sub_804367C
sub_804367C: @ 804367C
@@ -2587,13 +2587,13 @@ sub_80436F8: @ 80436F8
lsrs r5, r1, 24
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r7, 0
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -2624,7 +2624,7 @@ _08043744:
_08043750: .4byte gUnknown_3005008
_08043754: .4byte 0x0000311a
_08043758:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r4, r0, 24
_08043760:
@@ -2642,7 +2642,7 @@ _08043770:
adds r0, r7, 0
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r1, sp
@@ -2661,7 +2661,7 @@ _0804378E:
_08043798:
cmp r5, 0x5
bne _080437A8
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -2722,7 +2722,7 @@ _080437FA:
adds r0, r7, 0
movs r1, 0x26
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xB
bne _08043828
mov r0, sp
@@ -2735,9 +2735,9 @@ _08043828:
adds r0, r7, 0
movs r1, 0x23
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
- bl sub_8056260
+ bl sav1_map_get_name
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -2800,7 +2800,7 @@ _080438A4:
adds r1, 0x1A
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r2, sp
adds r1, r2, r6
strb r0, [r1]
@@ -2912,7 +2912,7 @@ _0804397C:
mov r0, r8
movs r1, 0xC
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -2944,7 +2944,7 @@ _080439B4:
_080439C0: .4byte gUnknown_3005008
_080439C4: .4byte 0x0000311a
_080439C8:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_080439D0:
@@ -3020,7 +3020,7 @@ _08043A48:
adds r1, 0x1A
adds r0, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r5, r0
lsls r0, 16
lsrs r5, r0, 16
@@ -3063,7 +3063,7 @@ _08043A84:
movs r1, 0x22
movs r2, 0
str r3, [sp]
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xF
ands r1, r0
ldr r3, [sp]
@@ -3083,7 +3083,7 @@ _08043AB8:
adds r0, r7, 0
movs r1, 0x22
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xF
ands r1, r0
cmp r1, 0
@@ -3120,7 +3120,7 @@ _08043AEC:
movs r1, 0x22
movs r2, 0
str r3, [sp]
- bl sub_803FBE8
+ bl GetMonData
ldr r3, [sp]
cmp r0, 0
beq _08043B10
@@ -3138,7 +3138,7 @@ _08043B1C:
adds r0, r7, 0
movs r1, 0x22
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08043B2C
movs r5, 0x1
@@ -3210,13 +3210,13 @@ sub_8043B90: @ 8043B90
adds r4, r0, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r7, r0, 24
movs r1, 0x80
@@ -3228,7 +3228,7 @@ sub_8043B90: @ 8043B90
adds r0, r4, 0
movs r1, 0x19
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
cmp r7, 0x63
bhi _08043C14
@@ -3288,7 +3288,7 @@ sub_8043C2C: @ 8043C2C
adds r5, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
adds r3, r1, 0
@@ -3345,13 +3345,13 @@ sub_8043C84: @ 8043C84
adds r0, r6, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0xC]
@@ -3362,7 +3362,7 @@ _08043CBA:
adds r1, 0xD
adds r0, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -3566,13 +3566,13 @@ sub_8043E2C: @ 8043E2C
adds r0, r6, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
adds r0, r6, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x30]
@@ -3592,7 +3592,7 @@ _08043E70:
adds r1, 0xD
adds r0, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
adds r4, 0x2
adds r5, 0x1
@@ -3744,7 +3744,7 @@ sub_8043F90: @ 8043F90
lsls r0, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r4, r0, 0
bl sub_806E25C
cmp r0, 0
@@ -3865,12 +3865,12 @@ _08044070:
thumb_func_start sub_8044074
sub_8044074: @ 8044074
push {lr}
- bl sub_8071A44
+ bl ResetMapMusic
bl m4aMPlayAllStop
bl sub_8043FD4
lsls r0, 16
lsrs r0, 16
- bl sub_80722A0
+ bl PlayBGM
pop {r0}
bx r0
thumb_func_end sub_8044074
@@ -3880,54 +3880,54 @@ sub_8044090: @ 8044090
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
- bl sub_8071A44
+ bl ResetMapMusic
bl m4aMPlayAllStop
cmp r4, 0
beq _080440AA
adds r0, r4, 0
- bl sub_8071A74
+ bl PlayNewMapMusic
b _080440B6
_080440AA:
bl sub_8043FD4
lsls r0, 16
lsrs r0, 16
- bl sub_8071A74
+ bl PlayNewMapMusic
_080440B6:
pop {r4}
pop {r0}
bx r0
thumb_func_end sub_8044090
- thumb_func_start sub_80440BC
-sub_80440BC: @ 80440BC
+ thumb_func_start GetMonFrontSpritePal
+GetMonFrontSpritePal: @ 80440BC
push {r4-r6,lr}
adds r5, r0, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
adds r0, r4, 0
adds r1, r6, 0
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80440BC
+ thumb_func_end GetMonFrontSpritePal
- thumb_func_start sub_80440F4
-sub_80440F4: @ 80440F4
+ thumb_func_start GetFrontSpritePalFromSpeciesAndPersonality
+GetFrontSpritePalFromSpeciesAndPersonality: @ 80440F4
push {r4,r5,lr}
adds r3, r2, 0
lsls r0, 16
@@ -3971,7 +3971,7 @@ _0804413C:
bx r1
.align 2, 0
_08044144: .4byte gUnknown_82380CC
- thumb_func_end sub_80440F4
+ thumb_func_end GetFrontSpritePalFromSpeciesAndPersonality
thumb_func_start sub_8044148
sub_8044148: @ 8044148
@@ -3979,30 +3979,30 @@ sub_8044148: @ 8044148
adds r5, r0, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8044180
+ bl GetMonSpritePalStructFromOtIdPersonality
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_8044148
- thumb_func_start sub_8044180
-sub_8044180: @ 8044180
+ thumb_func_start GetMonSpritePalStructFromOtIdPersonality
+GetMonSpritePalStructFromOtIdPersonality: @ 8044180
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
@@ -4032,10 +4032,10 @@ _080441AC:
bx r1
.align 2, 0
_080441B4: .4byte gUnknown_82380CC
- thumb_func_end sub_8044180
+ thumb_func_end GetMonSpritePalStructFromOtIdPersonality
- thumb_func_start sub_80441B8
-sub_80441B8: @ 80441B8
+ thumb_func_start IsHMMove2
+IsHMMove2: @ 80441B8
push {r4,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -4067,10 +4067,10 @@ _080441EC:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80441B8
+ thumb_func_end IsHMMove2
- thumb_func_start sub_80441F4
-sub_80441F4: @ 80441F4
+ thumb_func_start IsPokeSpriteNotFlipped
+IsPokeSpriteNotFlipped: @ 80441F4
lsls r0, 16
lsrs r0, 16
ldr r2, _08044208 @ =gUnknown_8254784
@@ -4083,14 +4083,14 @@ sub_80441F4: @ 80441F4
bx lr
.align 2, 0
_08044208: .4byte gUnknown_8254784
- thumb_func_end sub_80441F4
+ thumb_func_end IsPokeSpriteNotFlipped
- thumb_func_start sub_804420C
-sub_804420C: @ 804420C
+ thumb_func_start GetMonFlavorRelation
+GetMonFlavorRelation: @ 804420C
push {r4,lr}
lsls r4, r1, 24
lsrs r4, 24
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
ldr r2, _08044230 @ =gUnknown_825DE24
@@ -4105,14 +4105,14 @@ sub_804420C: @ 804420C
bx r1
.align 2, 0
_08044230: .4byte gUnknown_825DE24
- thumb_func_end sub_804420C
+ thumb_func_end GetMonFlavorRelation
- thumb_func_start sub_8044234
-sub_8044234: @ 8044234
+ thumb_func_start GetFlavorRelationByPersonality
+GetFlavorRelationByPersonality: @ 8044234
push {r4,lr}
lsls r4, r1, 24
lsrs r4, 24
- bl sub_8042EB4
+ bl GetNatureFromPersonality
lsls r0, 24
lsrs r0, 24
ldr r2, _08044258 @ =gUnknown_825DE24
@@ -4127,32 +4127,32 @@ sub_8044234: @ 8044234
bx r1
.align 2, 0
_08044258: .4byte gUnknown_825DE24
- thumb_func_end sub_8044234
+ thumb_func_end GetFlavorRelationByPersonality
- thumb_func_start sub_804425C
-sub_804425C: @ 804425C
+ thumb_func_start IsTradedMon
+IsTradedMon: @ 804425C
push {r4,lr}
sub sp, 0x8
adds r4, r0, 0
movs r1, 0x7
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
- bl sub_8044288
+ bl IsOtherTrainer
lsls r0, 24
lsrs r0, 24
add sp, 0x8
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_804425C
+ thumb_func_end IsTradedMon
- thumb_func_start sub_8044288
-sub_8044288: @ 8044288
+ thumb_func_start IsOtherTrainer
+IsOtherTrainer: @ 8044288
push {r4,r5,lr}
adds r5, r1, 0
ldr r1, _080442CC @ =gUnknown_300500C
@@ -4196,18 +4196,18 @@ _080442D2:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8044288
+ thumb_func_end IsOtherTrainer
- thumb_func_start sub_80442D8
-sub_80442D8: @ 80442D8
+ thumb_func_start MonRestorePP
+MonRestorePP: @ 80442D8
push {lr}
- bl sub_80442E4
+ bl BoxMonRestorePP
pop {r0}
bx r0
- thumb_func_end sub_80442D8
+ thumb_func_end MonRestorePP
- thumb_func_start sub_80442E4
-sub_80442E4: @ 80442E4
+ thumb_func_start BoxMonRestorePP
+BoxMonRestorePP: @ 80442E4
push {r4-r6,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -4218,27 +4218,27 @@ _080442EC:
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08044338
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0x15
movs r2, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
lsls r2, r6, 24
lsrs r2, 24
adds r0, r4, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
mov r1, sp
strb r0, [r1]
adds r1, r6, 0
@@ -4254,7 +4254,7 @@ _08044338:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80442E4
+ thumb_func_end BoxMonRestorePP
thumb_func_start sub_8044348
sub_8044348: @ 8044348
@@ -4277,7 +4277,7 @@ sub_8044348: @ 8044348
movs r0, 0xFF
strb r0, [r4, 0x4]
ldrb r0, [r1]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0804439C
@@ -4288,7 +4288,7 @@ sub_8044348: @ 8044348
lsls r0, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
b _080443AA
.align 2, 0
_0804438C: .4byte gUnknown_2023D6A
@@ -4318,7 +4318,7 @@ _080443AA:
lsls r0, 1
adds r0, r2
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
strb r0, [r4, 0x3]
movs r0, 0xFF
strb r0, [r4, 0x4]
@@ -4345,7 +4345,7 @@ sub_80443F4: @ 80443F4
ands r0, r1
cmp r0, 0
bne _08044468
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -4356,7 +4356,7 @@ sub_80443F4: @ 80443F4
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r2, _08044458 @ =gUnknown_8254784
@@ -4402,12 +4402,12 @@ sub_8044470: @ 8044470
adds r4, r0, 0
movs r1, 0x1
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
adds r0, r5, 0
bl sub_804449C
@@ -4445,7 +4445,7 @@ _080444C0: .4byte 0x0000ffff
thumb_func_start sub_80444C4
sub_80444C4: @ 80444C4
push {r4,lr}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
ldr r4, _080444F4 @ =gUnknown_202273C
@@ -4456,7 +4456,7 @@ sub_80444C4: @ 80444C4
ldrh r1, [r1, 0x18]
movs r0, 0x2
eors r0, r1
- bl sub_8043658
+ bl GetBankMultiplayerId
adds r1, r0, 0
lsls r0, r1, 3
subs r0, r1
@@ -4484,19 +4484,19 @@ _080444FE:
adds r0, r4, 0
movs r1, 0x5
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _08044538
adds r0, r4, 0
movs r1, 0x6
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08044538
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
cmp r0, r6
@@ -4618,7 +4618,7 @@ _080445F4:
beq _08044658
_0804461A:
ldr r4, _08044644 @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -4647,7 +4647,7 @@ _08044648:
beq _08044632
_08044658:
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08044632
@@ -4676,7 +4676,7 @@ sub_8044674: @ 8044674
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
@@ -4691,13 +4691,13 @@ _080446A0:
adds r1, 0x27
adds r0, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r1, r6, 0
adds r1, 0x1A
adds r0, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r2, _08044704 @ =gUnknown_825E026
lsls r1, r6, 1
adds r1, r2
@@ -4720,7 +4720,7 @@ _080446CC:
lsls r0, 16
lsrs r4, r0, 16
adds r0, r5, 0
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r0, 24
lsls r2, r6, 24
@@ -4752,7 +4752,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCD
lsls r1, 1
cmp r0, r1
@@ -4760,7 +4760,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0x3B
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3B
@@ -4769,7 +4769,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0x3C
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3C
@@ -4778,7 +4778,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0x3D
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3D
@@ -4787,7 +4787,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0x3E
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3E
@@ -4796,7 +4796,7 @@ _0804470E:
adds r0, r4, 0
movs r1, 0x3F
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r0, r4, 0
movs r1, 0x3F
@@ -4817,7 +4817,7 @@ _080447A8: .4byte gUnknown_2024284
thumb_func_start sub_80447AC
sub_80447AC: @ 80447AC
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -4852,7 +4852,7 @@ _080447EC: .4byte gUnknown_825E032
thumb_func_start sub_80447F0
sub_80447F0: @ 80447F0
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -4895,7 +4895,7 @@ sub_8044838: @ 8044838
ldrh r4, [r0]
ldr r0, _08044890 @ =gUnknown_20370C4
ldrh r6, [r0]
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r7, _08044894 @ =gUnknown_202402C
lsls r4, 24
lsrs r4, 24
@@ -4955,7 +4955,7 @@ sub_8044898: @ 8044898
adds r1, r5, 0
bl sub_8088E74
adds r0, r4, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
lsls r0, 16
lsrs r0, 16
cmp r0, 0xC9
@@ -4965,7 +4965,7 @@ sub_8044898: @ 8044898
str r7, [r0, 0x1C]
_080448D8:
adds r0, r6, 0
- bl sub_8043200
+ bl NationalPokedexNumToSpecies
lsls r0, 16
movs r1, 0x9A
lsls r1, 17
@@ -4997,19 +4997,19 @@ sub_80448F8: @ 80448F8
cmp r0, 0
beq _08044944
adds r0, r2, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08044944
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
mov r0, sp
- bl sub_8008D28
+ bl StringGetEnd10
ldr r1, _08044940 @ =gUnknown_841D148
mov r0, sp
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _08044944
movs r0, 0x1
@@ -5277,7 +5277,7 @@ sub_8044AF0: @ 8044AF0
_08044B1E:
ldr r4, _08044B34 @ =gUnknown_20244F4
movs r0, 0x18
- bl sub_8002BB0
+ bl AllocZeroed
adds r2, r0, 0
str r2, [r4]
cmp r2, 0
@@ -5380,13 +5380,13 @@ _08044BD0:
lsls r0, 28
lsrs r0, 28
muls r0, r1
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, [r5]
str r0, [r1, 0x8]
ldrb r0, [r1]
lsls r0, 28
lsrs r0, 23
- bl sub_8002BB0
+ bl AllocZeroed
adds r2, r0, 0
ldr r1, [r5]
str r2, [r1, 0xC]
@@ -5438,7 +5438,7 @@ _08044C44:
lsls r0, r1, 1
adds r0, r1
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
ldr r2, [r5]
str r0, [r2, 0x10]
ldrb r1, [r2]
@@ -5447,7 +5447,7 @@ _08044C44:
ldrb r0, [r2, 0x1]
lsls r0, 3
muls r0, r1
- bl sub_8002BB0
+ bl AllocZeroed
adds r2, r0, 0
ldr r1, [r5]
str r2, [r1, 0x14]
@@ -5520,7 +5520,7 @@ _08044CE2:
ldr r0, [r0, 0x14]
cmp r0, 0
beq _08044D00
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x14]
@@ -5529,7 +5529,7 @@ _08044D00:
ldr r0, [r0, 0x10]
cmp r0, 0
beq _08044D12
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x10]
@@ -5544,7 +5544,7 @@ _08044D12:
ldr r0, [r0, 0xC]
cmp r0, 0
beq _08044D30
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0xC]
@@ -5553,7 +5553,7 @@ _08044D30:
ldr r0, [r0, 0x8]
cmp r0, 0
beq _08044D42
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x8]
@@ -5567,7 +5567,7 @@ _08044D42:
movs r2, 0x18
bl memset
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
b _08044D6C
@@ -5612,7 +5612,7 @@ _08044DA0:
ldr r0, [r1, 0x14]
cmp r0, 0
beq _08044DB0
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x14]
@@ -5621,7 +5621,7 @@ _08044DB0:
ldr r0, [r0, 0x10]
cmp r0, 0
beq _08044DC2
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x10]
@@ -5630,7 +5630,7 @@ _08044DC2:
ldr r0, [r0, 0xC]
cmp r0, 0
beq _08044DD4
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0xC]
@@ -5639,7 +5639,7 @@ _08044DD4:
ldr r0, [r0, 0x8]
cmp r0, 0
beq _08044DE6
- bl sub_8002BC4
+ bl Free
ldr r1, [r4]
movs r0, 0
str r0, [r1, 0x8]
@@ -5649,7 +5649,7 @@ _08044DE6:
movs r2, 0x18
bl memset
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
_08044DF6:
movs r0, 0
str r0, [r4]
diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s
index 648fb9418..a36eb6839 100644
--- a/asm/pokemon_icon.s
+++ b/asm/pokemon_icon.s
@@ -31,7 +31,7 @@ sub_8096E18: @ 8096E18
str r0, [sp, 0x18]
adds r0, r4, 0
adds r2, r5, 0
- bl sub_8097054
+ bl GetMonIconPtr
str r0, [sp, 0x1C]
ldr r0, _08096EB8 @ =gUnknown_83D40AC
str r0, [sp, 0x20]
@@ -158,8 +158,8 @@ _08096F54: .4byte 0x0000dac0
_08096F58: .4byte gUnknown_202063C
thumb_func_end sub_8096ECC
- thumb_func_start sub_8096F5C
-sub_8096F5C: @ 8096F5C
+ thumb_func_start mon_icon_convert_unown_species_id
+mon_icon_convert_unown_species_id: @ 8096F5C
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -193,7 +193,7 @@ _08096F92:
adds r0, r1, 0
pop {r1}
bx r1
- thumb_func_end sub_8096F5C
+ thumb_func_end mon_icon_convert_unown_species_id
thumb_func_start sub_8096F98
sub_8096F98: @ 8096F98
@@ -269,7 +269,7 @@ _0809700A:
_08097014:
adds r0, r4, 0
movs r1, 0
- bl sub_8096F5C
+ bl mon_icon_convert_unown_species_id
lsls r0, 16
lsrs r0, 16
_08097020:
@@ -306,13 +306,13 @@ _0809704A:
_08097050: .4byte gUnknown_83D37A0
thumb_func_end sub_8097028
- thumb_func_start sub_8097054
-sub_8097054: @ 8097054
+ thumb_func_start GetMonIconPtr
+GetMonIconPtr: @ 8097054
push {r4,lr}
adds r4, r2, 0
lsls r0, 16
lsrs r0, 16
- bl sub_8096F5C
+ bl mon_icon_convert_unown_species_id
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -320,7 +320,7 @@ sub_8097054: @ 8097054
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8097054
+ thumb_func_end GetMonIconPtr
thumb_func_start sub_8097070
sub_8097070: @ 8097070
@@ -338,7 +338,7 @@ sub_809707C: @ 809707C
_08097082:
lsls r0, r4, 3
adds r0, r5
- bl sub_8008928
+ bl LoadSpritePalette
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -369,13 +369,13 @@ _080970B0:
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _080970D0
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
_080970D0:
pop {r4}
pop {r0}
@@ -397,13 +397,13 @@ sub_80970E0: @ 80970E0
lsls r0, 3
adds r4, r0, r1
ldrh r0, [r4, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
bne _08097106
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
_08097106:
pop {r4}
pop {r0}
@@ -422,7 +422,7 @@ _0809711A:
lsls r0, r4, 3
adds r0, r5
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -453,7 +453,7 @@ _08097148:
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r0}
bx r0
.align 2, 0
@@ -473,7 +473,7 @@ sub_8097168: @ 8097168
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r0}
bx r0
.align 2, 0
@@ -502,7 +502,7 @@ _080971A6:
ldr r0, [r6]
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0x10
lsls r0, 16
@@ -638,7 +638,7 @@ _08097276:
lsrs r1, 17
ldr r3, _080972D8 @ =0x06010000
adds r1, r3
- bl sub_80076D0
+ bl RequestSpriteCopy
mov r0, r8
ldrb r1, [r0]
ldr r0, [r4, 0x8]
@@ -755,7 +755,7 @@ sub_8097300: @ 8097300
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r6, _080973D4 @ =gUnknown_202063C
@@ -817,7 +817,7 @@ sub_80973D8: @ 80973D8
str r1, [sp, 0x4]
mov r1, sp
str r1, [r0, 0xC]
- bl sub_8007280
+ bl DestroySprite
add sp, 0x8
pop {r0}
bx r0
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index 520ae3bb6..c98f3ac7a 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80413C0
-sub_80413C0: @ 80413C0
+ thumb_func_start ExecuteTableBasedItemEffect_
+ExecuteTableBasedItemEffect_: @ 80413C0
push {r4,lr}
sub sp, 0x4
lsls r1, 16
@@ -24,7 +24,7 @@ sub_80413C0: @ 80413C0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80413C0
+ thumb_func_end ExecuteTableBasedItemEffect_
thumb_func_start sub_80413E4
sub_80413E4: @ 80413E4
@@ -58,7 +58,7 @@ sub_80413E4: @ 80413E4
str r3, [sp, 0x34]
mov r0, r8
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0xAF
@@ -96,7 +96,7 @@ _08041460:
_0804146C: .4byte gUnknown_3005008
_08041470: .4byte 0x0000311a
_08041474:
- bl sub_809A924
+ bl ItemId_GetHoldEffect
lsls r0, 24
lsrs r0, 24
_0804147C:
@@ -118,7 +118,7 @@ _0804147C:
ldr r0, _080414E8 @ =gUnknown_2023BC4
strb r2, [r0]
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
negs r1, r0
@@ -537,7 +537,7 @@ _080417D8:
ldr r5, _08041994 @ =gUnknown_2023DE4
ldr r4, _08041998 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -548,7 +548,7 @@ _080417D8:
cmp r0, 0
bne _08041820
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 1
@@ -568,19 +568,19 @@ _08041820:
mov r0, r8
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x64
beq _08041882
ldr r5, _0804199C @ =gUnknown_8253AE4
mov r0, r8
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, 0x1
lsls r4, 2
ldr r2, _080419A0 @ =gUnknown_8254784
@@ -601,7 +601,7 @@ _08041820:
mov r2, sp
bl sub_804037C
mov r0, r8
- bl sub_803E47C
+ bl CalculateMonStats
movs r0, 0
str r0, [sp, 0x1C]
_08041882:
@@ -769,7 +769,7 @@ _080419B8:
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08041ABC @ =gUnknown_825DEA1
ldr r4, [sp, 0x10]
adds r1, r4, r1
@@ -783,20 +783,20 @@ _080419B8:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x28]
@@ -809,7 +809,7 @@ _080419B8:
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08041AC0 @ =gUnknown_825DEA9
ldr r2, [sp, 0x10]
adds r1, r2, r1
@@ -823,14 +823,14 @@ _080419B8:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, [sp]
lsls r1, 24
lsrs r1, 24
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
ldr r3, [sp, 0x28]
@@ -841,7 +841,7 @@ _080419B8:
mov r0, r8
adds r1, r4, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
@@ -906,7 +906,7 @@ _08041AFA:
ldrb r1, [r0]
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r1, [sp]
cmp r1, 0x63
@@ -948,7 +948,7 @@ _08041B40:
mov r2, sp
bl sub_804037C
mov r0, r8
- bl sub_803E47C
+ bl CalculateMonStats
ldr r0, [sp, 0x24]
adds r0, 0x1
lsls r0, 24
@@ -968,7 +968,7 @@ _08041B70:
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08041B90
ldr r0, [sp, 0x24]
@@ -1001,12 +1001,12 @@ _08041B90:
lsls r0, r3, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_8128030
+ bl pokemon_order_func
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
ldr r0, [sp, 0x34]
- bl sub_80410B8
+ bl CopyPlayerPartyMonToBattleData
ldr r0, _08041BEC @ =gUnknown_2023BC4
ldrb r0, [r0]
b _08041C08
@@ -1031,7 +1031,7 @@ _08041BF0:
strb r0, [r3]
ldrb r0, [r2]
_08041C08:
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08041C46
@@ -1051,7 +1051,7 @@ _08041C30:
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08041C46
ldr r0, [sp, 0x24]
@@ -1082,12 +1082,12 @@ _08041C68:
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
subs r4, r0
str r4, [sp]
b _08041CA6
@@ -1095,7 +1095,7 @@ _08041C88:
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsrs r0, 1
str r0, [sp]
cmp r0, 0
@@ -1112,12 +1112,12 @@ _08041CA6:
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r4, r0
beq _08041D84
ldr r5, [sp, 0x14]
@@ -1126,21 +1126,21 @@ _08041CA6:
mov r0, r8
movs r1, 0x39
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp]
cmp r1, r0
bls _08041CF2
mov r0, r8
movs r1, 0x3A
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
_08041CF2:
mov r0, r8
@@ -1171,7 +1171,7 @@ _08041CF2:
bne _08041D80
ldr r4, _08041D70 @ =gUnknown_2023BC4
ldrb r0, [r4]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08041D80
@@ -1189,9 +1189,9 @@ _08041D42:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_800DFA4
+ bl EmitGetMonData
ldrb r0, [r4]
- bl sub_8017248
+ bl MarkBufferBankForExecution
strb r5, [r4]
b _08041D80
.align 2, 0
@@ -1236,21 +1236,21 @@ _08041DA8:
mov r0, r8
mov r1, r9
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
adds r7, r5, 0
adds r7, 0xD
mov r0, r8
adds r1, r7, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1258,7 +1258,7 @@ _08041DA8:
lsrs r6, r0, 24
adds r0, r4, 0
adds r2, r6, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -1273,20 +1273,20 @@ _08041DA8:
mov r0, r8
adds r1, r7, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
adds r2, r6, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -1295,20 +1295,20 @@ _08041DA8:
mov r0, r8
adds r1, r7, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
adds r2, r6, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1390,27 +1390,27 @@ _08041EF0:
mov r0, r8
adds r1, r6, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r5, [sp, 0x10]
adds r5, 0xD
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
ldr r2, [sp]
@@ -1431,20 +1431,20 @@ _08041F38:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
@@ -1453,20 +1453,20 @@ _08041F38:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -1610,7 +1610,7 @@ _080420C0:
ldrb r1, [r0]
mov r0, r8
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
str r1, [sp]
adds r2, r4, 0
@@ -1652,7 +1652,7 @@ _0804210C:
mov r2, sp
bl sub_804037C
mov r0, r8
- bl sub_803E47C
+ bl CalculateMonStats
movs r5, 0
str r5, [sp, 0x1C]
b _08042368
@@ -1662,7 +1662,7 @@ _08042130:
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _080421F8 @ =gUnknown_825DEA1
ldr r2, [sp, 0x10]
adds r1, r2, r1
@@ -1680,26 +1680,26 @@ _08042150:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r4, r0, 24
mov r0, r8
movs r1, 0x15
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [sp]
ldr r1, _080421FC @ =gUnknown_825DEA5
ldr r3, [sp, 0x10]
@@ -1721,14 +1721,14 @@ _08042150:
mov r0, r8
adds r1, r5, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r1, [sp]
lsls r1, 24
lsrs r1, 24
ldr r2, [sp, 0x10]
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
lsrs r0, 24
subs r0, r4
@@ -1738,7 +1738,7 @@ _08042150:
mov r0, r8
adds r1, r4, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [sp]
adds r0, r1
str r0, [sp]
@@ -1757,7 +1757,7 @@ _08042204:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _08042214
b _08042368
@@ -1780,7 +1780,7 @@ _08042224:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
str r5, [sp, 0x4]
ldr r3, [sp, 0x2C]
@@ -1803,13 +1803,13 @@ _0804225E:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x63
bls _08042368
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xC7
bhi _08042368
ldr r2, [sp, 0x1C]
@@ -1826,7 +1826,7 @@ _0804225E:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
str r4, [sp, 0x4]
ldr r0, [sp, 0x2C]
@@ -1845,7 +1845,7 @@ _080422B4:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xC7
bls _08042368
ldr r4, [sp, 0x1C]
@@ -1862,7 +1862,7 @@ _080422B4:
mov r0, r8
movs r1, 0x20
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
str r4, [sp, 0x4]
ldr r3, [sp, 0x2C]
@@ -1896,7 +1896,7 @@ _08042314:
mov r0, r8
movs r1, 0x26
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0xB
bne _0804232C
ldr r0, [sp, 0x4]
@@ -1906,9 +1906,9 @@ _0804232C:
mov r0, r8
movs r1, 0x23
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
- bl sub_8056260
+ bl sav1_map_get_name
lsls r0, 24
lsrs r0, 24
cmp r4, r0
diff --git a/asm/pokemon_size_record.s b/asm/pokemon_size_record.s
index 45d89f39d..e26a80699 100644
--- a/asm/pokemon_size_record.s
+++ b/asm/pokemon_size_record.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80A069C
-sub_80A069C: @ 80A069C
+ thumb_func_start GetMonSizeHash
+GetMonSizeHash: @ 80A069C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -15,45 +15,45 @@ sub_80A069C: @ 80A069C
sub sp, 0x8
adds r5, r0, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
str r0, [sp, 0x4]
lsrs r0, 16
str r0, [sp]
adds r0, r5, 0
movs r1, 0x27
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
movs r6, 0xF
ands r7, r6
adds r0, r5, 0
movs r1, 0x28
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
mov r1, r8
ands r1, r6
mov r8, r1
adds r0, r5, 0
movs r1, 0x29
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
mov r3, r9
ands r3, r6
mov r9, r3
adds r0, r5, 0
movs r1, 0x2A
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
ands r0, r6
mov r10, r0
adds r0, r5, 0
movs r1, 0x2B
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
ands r4, r6
adds r0, r5, 0
movs r1, 0x2C
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
ands r2, r6
mov r1, r8
@@ -82,10 +82,10 @@ sub_80A069C: @ 80A069C
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80A069C
+ thumb_func_end GetMonSizeHash
- thumb_func_start sub_80A0740
-sub_80A0740: @ 80A0740
+ thumb_func_start TranslateBigMonSizeTableIndex
+TranslateBigMonSizeTableIndex: @ 80A0740
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -113,10 +113,10 @@ _080A0760:
_080A076C:
pop {r1}
bx r1
- thumb_func_end sub_80A0740
+ thumb_func_end TranslateBigMonSizeTableIndex
- thumb_func_start sub_80A0770
-sub_80A0770: @ 80A0770
+ thumb_func_start GetMonSize
+GetMonSize: @ 80A0770
push {r4-r7,lr}
sub sp, 0x8
adds r6, r1, 0
@@ -124,7 +124,7 @@ sub_80A0770: @ 80A0770
lsrs r0, 16
lsls r6, 16
lsrs r6, 16
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0
@@ -132,7 +132,7 @@ sub_80A0770: @ 80A0770
lsls r0, 16
lsrs r7, r0, 16
adds r0, r6, 0
- bl sub_80A0740
+ bl TranslateBigMonSizeTableIndex
lsls r0, 24
ldr r1, _080A07E0 @ =gUnknown_83E272C
lsrs r0, 21
@@ -168,7 +168,7 @@ sub_80A0770: @ 80A0770
bx r1
.align 2, 0
_080A07E0: .4byte gUnknown_83E272C
- thumb_func_end sub_80A0770
+ thumb_func_end GetMonSize
thumb_func_start sub_80A07E4
sub_80A07E4: @ 80A07E4
@@ -187,7 +187,7 @@ sub_80A07E4: @ 80A07E4
movs r3, 0x8
bl sub_8008E78
ldr r1, _080A0828 @ =gUnknown_8417FB9
- bl sub_8008DA4
+ bl StringAppend
adds r4, r0, 0
adds r0, r5, 0
movs r1, 0xA
@@ -227,12 +227,12 @@ _080A0848:
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _080A086A
adds r0, r5, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r6
beq _080A0874
_080A086A:
@@ -243,16 +243,16 @@ _080A0870: .4byte gUnknown_2024284
_080A0874:
mov r4, sp
adds r0, r5, 0
- bl sub_80A069C
+ bl GetMonSizeHash
strh r0, [r4]
mov r0, sp
ldrh r1, [r0]
adds r0, r6, 0
- bl sub_80A0770
+ bl GetMonSize
adds r5, r0, 0
ldrh r1, [r7]
adds r0, r6, 0
- bl sub_80A0770
+ bl GetMonSize
adds r4, r0, 0
ldr r0, _080A08AC @ =gUnknown_2021D04
adds r1, r4, 0
@@ -292,7 +292,7 @@ sub_80A08CC: @ 80A08CC
lsrs r4, 16
ldrh r1, [r1]
adds r0, r4, 0
- bl sub_80A0770
+ bl GetMonSize
adds r1, r0, 0
ldr r0, _080A08F8 @ =gUnknown_2021D04
bl sub_80A07E4
@@ -301,7 +301,7 @@ sub_80A08CC: @ 80A08CC
muls r1, r4
ldr r2, _080A0900 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
pop {r4}
pop {r0}
bx r0
@@ -403,8 +403,8 @@ _080A09A4: .4byte 0x00004040
_080A09A8: .4byte gUnknown_20370D0
thumb_func_end sub_80A0984
- thumb_func_start sub_80A09AC
-sub_80A09AC: @ 80A09AC
+ thumb_func_start GiveGiftRibbonToParty
+GiveGiftRibbonToParty: @ 80A09AC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -441,12 +441,12 @@ _080A09E6:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080A0A18
adds r0, r4, 0
movs r1, 0x6
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080A0A18
mov r1, sp
@@ -477,6 +477,6 @@ _080A0A38: .4byte gUnknown_3005008
_080A0A3C: .4byte 0x0000309c
_080A0A40: .4byte gUnknown_2024284
_080A0A44: .4byte 0x0000083b
- thumb_func_end sub_80A09AC
+ thumb_func_end GiveGiftRibbonToParty
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s
index a28202219..3c27c6ea0 100644
--- a/asm/pokemon_special_anim.s
+++ b/asm/pokemon_special_anim.s
@@ -17,7 +17,7 @@ sub_811C540: @ 811C540
cmp r0, 0
bne _0811C55C
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0811C560
_0811C55C:
bl sub_811C748
@@ -43,7 +43,7 @@ sub_811C568: @ 811C568
cmp r4, 0
bne _0811C58C
adds r0, r5, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0811C5A2
_0811C58C:
adds r0, r4, 0
@@ -52,7 +52,7 @@ _0811C58C:
muls r1, r6
ldr r2, _0811C5A8 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0
bl sub_811C7BC
_0811C5A2:
@@ -75,7 +75,7 @@ sub_811C5AC: @ 811C5AC
cmp r0, 0
bne _0811C5C8
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0811C5CC
_0811C5C8:
bl sub_811C7FC
@@ -105,17 +105,17 @@ sub_811C5D4: @ 811C5D4
ands r0, r1
cmp r0, 0
bne _0811C5FC
- bl sub_80773BC
+ bl ResetTasks
_0811C5FC:
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r0, _0811C624 @ =0x000028dc
- bl sub_8002B9C
+ bl Alloc
adds r7, r0, 0
cmp r7, 0
bne _0811C628
adds r0, r5, 0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0
b _0811C6D2
.align 2, 0
@@ -137,13 +137,13 @@ _0811C628:
str r5, [r7, 0x4]
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, 0
adds r1, 0x94
strh r0, [r1]
adds r0, r4, 0
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_811D058
@@ -154,7 +154,7 @@ _0811C628:
strh r0, [r1]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r7, 0
adds r1, 0xA0
str r0, [r1]
@@ -182,12 +182,12 @@ _0811C628:
adds r2, 0x6C
adds r0, r4, 0
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
ldrh r0, [r5]
cmp r0, 0x4
bne _0811C6D0
adds r0, r6, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
adds r2, r7, 0
@@ -197,7 +197,7 @@ _0811C628:
ldr r0, _0811C6E4 @ =gUnknown_8247094
adds r1, r0
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
_0811C6D0:
adds r0, r7, 0
_0811C6D2:
@@ -215,9 +215,9 @@ _0811C6E4: .4byte gUnknown_8247094
thumb_func_start sub_811C6E8
sub_811C6E8: @ 811C6E8
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_811C6E8
@@ -226,10 +226,10 @@ sub_811C6E8: @ 811C6E8
sub_811C6FC: @ 811C6FC
push {lr}
bl sub_8002DE8
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_811C6FC
@@ -243,7 +243,7 @@ sub_811C718: @ 811C718
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r0, 0x92
movs r1, 0
strh r1, [r0]
@@ -287,7 +287,7 @@ _0811C770:
ldr r0, _0811C780 @ =sub_811CD68
_0811C772:
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
b _0811C792
@@ -295,9 +295,9 @@ _0811C772:
_0811C780: .4byte sub_811CD68
_0811C784:
ldr r0, [r5, 0x4]
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
b _0811C7AE
_0811C792:
adds r1, r5, 0
@@ -307,9 +307,9 @@ _0811C792:
adds r0, r4, 0
movs r1, 0
adds r2, r5, 0
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _0811C7B4 @ =sub_811C6FC
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0811C7B8 @ =gUnknown_203B094
strb r4, [r0]
_0811C7AE:
@@ -327,16 +327,16 @@ sub_811C7BC: @ 811C7BC
adds r5, r0, 0
ldr r0, _0811C7F0 @ =sub_811CA20
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
adds r2, r5, 0
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _0811C7F4 @ =sub_811C6FC
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0811C7F8 @ =gUnknown_203B094
strb r4, [r0]
adds r5, 0x91
@@ -357,16 +357,16 @@ sub_811C7FC: @ 811C7FC
adds r5, r0, 0
ldr r0, _0811C828 @ =sub_811CBE4
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
movs r1, 0
adds r2, r5, 0
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _0811C82C @ =sub_811C6FC
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0811C830 @ =gUnknown_203B094
strb r4, [r0]
pop {r4,r5}
@@ -386,7 +386,7 @@ sub_811C834: @ 811C834
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r4, r0, 0
adds r0, 0x91
ldrb r0, [r0]
@@ -441,7 +441,7 @@ _0811C88C:
.4byte _0811CA00
_0811C8C8:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
adds r0, r4, 0
adds r0, 0xA8
adds r1, r4, 0
@@ -465,12 +465,12 @@ _0811C8F2:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
ldr r0, _0811C910 @ =sub_811C6E8
- bl sub_80006F4
+ bl SetVBlankCallback
b _0811CA16
.align 2, 0
_0811C910: .4byte sub_811C6E8
@@ -522,7 +522,7 @@ _0811C950:
adds r0, 0x94
ldrh r0, [r0]
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_0811C978:
bl sub_811D2A8
b _0811C9F4
@@ -570,7 +570,7 @@ _0811C9AA:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0811C9F4
.align 2, 0
_0811C9DC: .4byte gUnknown_30030F0
@@ -596,12 +596,12 @@ _0811C9F4:
_0811C9FC: .4byte gUnknown_2037AB8
_0811CA00:
ldr r0, [r4, 0x4]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_811D29C
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0811CA16:
add sp, 0x4
pop {r4-r6}
@@ -617,7 +617,7 @@ sub_811CA20: @ 811CA20
lsrs r4, r0, 24
adds r0, r4, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
adds r0, 0x92
ldrh r0, [r0]
@@ -650,7 +650,7 @@ _0811CA4C:
.4byte _0811CBCE
_0811CA84:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
adds r0, r5, 0
adds r0, 0xA8
adds r1, r5, 0
@@ -674,14 +674,14 @@ _0811CAAE:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r1, r5, 0
adds r1, 0x92
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
ldr r0, _0811CAD0 @ =sub_811C6E8
- bl sub_80006F4
+ bl SetVBlankCallback
b _0811CBD6
.align 2, 0
_0811CAD0: .4byte sub_811C6E8
@@ -827,7 +827,7 @@ sub_811CBE4: @ 811CBE4
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
adds r0, 0x91
ldrb r0, [r0]
@@ -876,7 +876,7 @@ _0811CC38:
.4byte _0811CD38
_0811CC60:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
adds r0, r5, 0
adds r0, 0xA8
adds r1, r5, 0
@@ -898,12 +898,12 @@ _0811CC7C:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
ldr r0, _0811CCA8 @ =sub_811C6E8
- bl sub_80006F4
+ bl SetVBlankCallback
b _0811CD5A
.align 2, 0
_0811CCA8: .4byte sub_811C6E8
@@ -968,7 +968,7 @@ _0811CD0C:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0811CD2A:
ldrh r0, [r4]
adds r0, 0x1
@@ -984,12 +984,12 @@ _0811CD38:
cmp r0, 0
bne _0811CD5A
ldr r0, [r5, 0x4]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_811D29C
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0811CD5A:
add sp, 0x4
pop {r4-r6}
@@ -1007,7 +1007,7 @@ sub_811CD68: @ 811CD68
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
ldr r0, _0811CD90 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
@@ -1041,7 +1041,7 @@ _0811CDAC:
b _0811CE3E
_0811CDB6:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
adds r0, r5, 0
adds r0, 0xA8
adds r1, r5, 0
@@ -1063,12 +1063,12 @@ _0811CDD2:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
ldr r0, _0811CDFC @ =sub_811C6E8
- bl sub_80006F4
+ bl SetVBlankCallback
b _0811CE3E
.align 2, 0
_0811CDFC: .4byte sub_811C6E8
@@ -1120,7 +1120,7 @@ sub_811CE4C: @ 811CE4C
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
adds r0, 0x91
ldrb r0, [r0]
@@ -1230,7 +1230,7 @@ _0811CF46:
cmp r0, 0
bne _0811CF7E
ldr r0, _0811CF68 @ =0x00000101
- bl sub_8071C60
+ bl PlayFanfare
adds r1, r5, 0
adds r1, 0x91
movs r0, 0x1
@@ -1243,7 +1243,7 @@ _0811CF5E:
.align 2, 0
_0811CF68: .4byte 0x00000101
_0811CF6C:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0811CF7E
@@ -1265,7 +1265,7 @@ sub_811CF88: @ 811CF88
lsrs r6, r0, 24
adds r0, r6, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
adds r4, r5, 0
adds r4, 0x92
@@ -1277,12 +1277,12 @@ sub_811CF88: @ 811CF88
b _0811D008
_0811CFA8:
ldr r0, _0811CFC4 @ =sub_811C6E8
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -1301,7 +1301,7 @@ _0811CFC8:
ldr r0, [r0]
cmp r0, 0x1
bne _0811CFE8
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
beq _0811D008
@@ -1312,12 +1312,12 @@ _0811CFE8:
ldrb r1, [r1]
str r1, [r0]
ldr r0, [r5, 0x4]
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_811D29C
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0811D008:
pop {r4-r6}
pop {r0}
@@ -1398,7 +1398,7 @@ sub_811D080: @ 811D080
ldr r0, _0811D090 @ =gUnknown_203B094
ldrb r0, [r0]
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
pop {r1}
bx r1
.align 2, 0
@@ -1463,7 +1463,7 @@ sub_811D0DC: @ 811D0DC
adds r1, r0, 0
adds r1, 0x6C
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
pop {r4}
pop {r1}
bx r1
@@ -1514,27 +1514,27 @@ sub_811D130: @ 811D130
adds r4, r0, 0
adds r5, r1, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0x2]
adds r0, r4, 0
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0x6]
adds r0, r4, 0
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0x8]
adds r0, r4, 0
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5, 0xA]
pop {r4,r5}
pop {r0}
@@ -1558,10 +1558,10 @@ sub_811D184: @ 811D184
lsls r5, r1, 16
lsrs r5, 16
bl sub_8003ECC
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _0811D270 @ =gUnknown_8459980
@@ -1573,34 +1573,34 @@ sub_811D184: @ 811D184
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _0811D278 @ =0x00000914
adds r1, r4, r0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _0811D27C @ =0x00001914
adds r4, r0
movs r0, 0x3
adds r1, r4, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r1, 0xC0
lsls r1, 19
movs r0, 0
movs r2, 0x20
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -1608,12 +1608,12 @@ sub_811D184: @ 811D184
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
adds r0, r5, 0
bl sub_811D7D4
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0
movs r2, 0xE0
@@ -1622,24 +1622,24 @@ sub_811D184: @ 811D184
movs r1, 0x3
bl sub_8003F20
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x8
pop {r4,r5}
pop {r0}
@@ -1654,14 +1654,14 @@ _0811D27C: .4byte 0x00001914
thumb_func_start sub_811D280
sub_811D280: @ 811D280
push {lr}
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
beq _0811D290
movs r0, 0x1
b _0811D298
_0811D290:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
_0811D298:
@@ -1681,10 +1681,10 @@ sub_811D29C: @ 811D29C
sub_811D2A8: @ 811D2A8
push {lr}
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x1
movs r2, 0xE
@@ -1700,7 +1700,7 @@ sub_811D2A8: @ 811D2A8
sub_811D2D0: @ 811D2D0
push {lr}
movs r0, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
movs r1, 0
bl sub_810F4D8
@@ -1759,20 +1759,20 @@ _0811D330:
_0811D358:
adds r4, 0x14
adds r0, r7, 0
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r2, r0, 0
ldr r1, _0811D384 @ =gUnknown_841B285
- bl sub_8008D84
+ bl StringCopy
adds r2, r0, 0
adds r0, r6, 0
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _0811D388 @ =gUnknown_841B293
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _0811D4A2
.align 2, 0
_0811D384: .4byte gUnknown_841B285
@@ -1780,17 +1780,17 @@ _0811D388: .4byte gUnknown_841B293
_0811D38C:
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r4, 0x14
adds r0, r6, 0
movs r1, 0x2
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _0811D3D4 @ =gUnknown_841B295
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r2, r0, 0
cmp r5, 0x63
bhi _0811D3B8
@@ -1809,7 +1809,7 @@ _0811D3C0:
bl sub_8008E78
adds r2, r0, 0
ldr r1, _0811D3D8 @ =gUnknown_841B2A7
- bl sub_8008DA4
+ bl StringAppend
b _0811D4A2
.align 2, 0
_0811D3D4: .4byte gUnknown_841B295
@@ -1857,7 +1857,7 @@ _0811D42C:
adds r0, r1
ldr r1, [r0]
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r1, 0x1
mov r9, r1
b _0811D4A2
@@ -1894,7 +1894,7 @@ _0811D488:
ldr r1, _0811D494 @ =gUnknown_841B31B
_0811D48C:
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
b _0811D4A2
.align 2, 0
_0811D494: .4byte gUnknown_841B31B
@@ -1902,7 +1902,7 @@ _0811D498:
adds r4, 0x14
ldr r1, _0811D4D0 @ =gUnknown_841B329
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_0811D4A2:
mov r0, r8
lsls r3, r0, 24
@@ -1936,7 +1936,7 @@ sub_811D4D4: @ 811D4D4
push {lr}
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1962,7 +1962,7 @@ sub_811D4FC: @ 811D4FC
adds r4, r0, 0
movs r0, 0
strh r0, [r4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
movs r1, 0x80
@@ -1973,7 +1973,7 @@ sub_811D4FC: @ 811D4FC
adds r0, r1, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
adds r0, r4, 0
bl sub_811E204
pop {r4}
@@ -2000,7 +2000,7 @@ _0811D546:
cmp r5, 0
bne _0811D594
movs r0, 0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
movs r2, 0x80
@@ -2014,7 +2014,7 @@ _0811D546:
adds r0, r2, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -2053,7 +2053,7 @@ sub_811D5A0: @ 811D5A0
sub_811D5B0: @ 811D5B0
push {lr}
bl sub_811E388
- bl sub_8070A84
+ bl ResetPaletteFadeControl
pop {r0}
bx r0
thumb_func_end sub_811D5B0
@@ -2134,7 +2134,7 @@ _0811D63E:
movs r1, 0x2
movs r2, 0
movs r3, 0xC
- bl sub_8070588
+ bl BeginNormalPaletteFade
adds r0, r4, 0
bl sub_811E348
b _0811D6D6
@@ -2156,7 +2156,7 @@ _0811D670:
movs r1, 0x6
movs r2, 0xC
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
strh r0, [r4, 0x4]
b _0811D6D6
@@ -2188,7 +2188,7 @@ _0811D6CA:
movs r0, 0x54
bl sub_80722CC
ldr r0, [r4, 0x10]
- bl sub_8007280
+ bl DestroySprite
_0811D6D6:
ldrh r0, [r4]
adds r0, 0x1
@@ -2296,7 +2296,7 @@ sub_811D764: @ 811D764
movs r3, 0x1
bl sub_811E7F0
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -2328,7 +2328,7 @@ sub_811D7A0: @ 811D7A0
thumb_func_start sub_811D7C4
sub_811D7C4: @ 811D7C4
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2346,20 +2346,20 @@ sub_811D7D4: @ 811D7D4
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _0811D810 @ =gUnknown_845967C
movs r0, 0
str r0, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
cmp r4, 0x4
beq _0811D818
ldr r0, _0811D814 @ =gUnknown_845963C
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0811D822
.align 2, 0
_0811D80C: .4byte gUnknown_845973C
@@ -2369,7 +2369,7 @@ _0811D818:
ldr r0, _0811D82C @ =gUnknown_845965C
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0811D822:
add sp, 0x4
pop {r4}
@@ -2395,12 +2395,12 @@ sub_811D830: @ 811D830
bl sub_811D094
mov r8, r0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
mov r0, r8
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
mov r10, r0
adds r0, r7, 0
mov r1, r10
@@ -2424,14 +2424,14 @@ _0811D884:
movs r4, 0x80
lsls r4, 6
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r6, r0, 0
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
mov r9, r0
movs r0, 0x80
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r6, 0
beq _0811D920
@@ -2448,7 +2448,7 @@ _0811D884:
mov r3, r10
bl sub_800ECC4
mov r0, r8
- bl sub_80440BC
+ bl GetMonFrontSpritePal
adds r1, r4, 0
bl LZ77UnCompWram
adds r0, r6, 0
@@ -2459,7 +2459,7 @@ _0811D884:
ldrsh r2, [r5, r1]
movs r1, 0x78
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -2488,18 +2488,18 @@ _0811D916:
cmp r6, 0
beq _0811D920
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
_0811D920:
mov r1, r9
cmp r1, 0
beq _0811D92C
mov r0, r9
- bl sub_8002BC4
+ bl Free
_0811D92C:
cmp r4, 0
beq _0811D936
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
_0811D936:
add sp, 0x4
pop {r3-r5}
@@ -2523,14 +2523,14 @@ sub_811D948: @ 811D948
beq _0811D99C
ldr r0, _0811D990 @ =sub_811D9BC
movs r1, 0x4
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, [r5, 0xC]
adds r0, r4, 0
movs r1, 0x6
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r1, _0811D994 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2565,7 +2565,7 @@ _0811D9A4: .4byte 0x0000ffff
sub_811D9A8: @ 811D9A8
push {lr}
ldr r0, _0811D9B8 @ =sub_811D9BC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2589,7 +2589,7 @@ sub_811D9BC: @ 811D9BC
adds r4, r0, r1
adds r0, r6, 0
movs r1, 0x6
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
movs r1, 0
ldrsh r0, [r4, r1]
@@ -2616,7 +2616,7 @@ _0811D9FA:
beq _0811DA18
adds r0, r6, 0
movs r1, 0x9
- bl sub_8077720
+ bl GetWordTaskArg
ldrb r1, [r4, 0x2]
bl sub_811DA9C
_0811DA18:
@@ -2645,7 +2645,7 @@ _0811DA26:
beq _0811DA58
adds r0, r6, 0
movs r1, 0x9
- bl sub_8077720
+ bl GetWordTaskArg
ldrb r1, [r4, 0x2]
bl sub_811DB48
_0811DA58:
@@ -2659,7 +2659,7 @@ _0811DA58:
ldrh r1, [r4, 0x4]
strb r1, [r0, 0xA]
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
b _0811DA90
_0811DA74:
strh r7, [r4, 0x8]
@@ -2771,7 +2771,7 @@ _0811DB22:
bl sub_811D0A8
adds r0, r5, 0
adds r1, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r1, _0811DB44 @ =gUnknown_84599AA
lsls r0, r4, 1
adds r0, r1
@@ -2921,9 +2921,9 @@ sub_811DC14: @ 811DC14
ands r0, r3
str r0, [r4, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x10
pop {r4}
pop {r0}
@@ -2956,7 +2956,7 @@ sub_811DC54: @ 811DC54
bl sub_811E06C
ldr r0, [r5, 0x10]
adds r1, r6, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r1, [r5, 0x10]
adds r1, 0x3E
ldrb r0, [r1]
@@ -2965,14 +2965,14 @@ sub_811DC54: @ 811DC54
strb r0, [r1]
ldr r0, _0811DCDC @ =sub_811DDA4
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x4
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _0811DCE0 @ =gUnknown_3005090
lsls r5, r4, 2
adds r5, r4
@@ -3024,7 +3024,7 @@ sub_811DCF0: @ 811DCF0
cmp r0, 0
beq _0811DD1A
movs r1, 0x3
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r1, [r5, 0x10]
adds r0, r5, 0
movs r2, 0x3
@@ -3078,7 +3078,7 @@ sub_811DD20: @ 811DD20
ldr r0, _0811DD84 @ =nullsub_8
str r0, [r2]
adds r0, r4, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
adds r0, r4, 0
b _0811DD8A
.align 2, 0
@@ -3097,7 +3097,7 @@ _0811DD8A:
sub_811DD90: @ 811DD90
push {lr}
ldr r0, _0811DDA0 @ =sub_811DDA4
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -3119,7 +3119,7 @@ sub_811DDA4: @ 811DDA4
adds r4, r0, r1
adds r0, r6, 0
movs r1, 0x4
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
movs r1, 0
ldrsh r0, [r4, r1]
@@ -3186,9 +3186,9 @@ _0811DE2A:
str r0, [r5, 0x10]
ldrb r1, [r4, 0x4]
adds r0, r5, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
movs r0, 0x1
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
movs r2, 0x80
@@ -3201,7 +3201,7 @@ _0811DE2A:
adds r0, r2, 0
movs r2, 0
movs r3, 0xC
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x2
strh r0, [r4]
movs r0, 0xDA
@@ -3280,10 +3280,10 @@ _0811DEF0:
cmp r0, 0
beq _0811DF06
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_0811DF06:
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0811DF0C:
add sp, 0x4
pop {r4-r6}
@@ -3315,7 +3315,7 @@ sub_811DF14: @ 811DF14
adds r4, r0
subs r4, 0x4
movs r0, 0x5
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
movs r1, 0x80
@@ -3324,7 +3324,7 @@ sub_811DF14: @ 811DF14
ldrh r2, [r7, 0x12]
adds r0, r1, 0
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
movs r6, 0
ldr r2, _0811DFB4 @ =gUnknown_202063C
mov r8, r2
@@ -3338,7 +3338,7 @@ _0811DF68:
asrs r1, r5, 16
asrs r2, r4, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -3356,7 +3356,7 @@ _0811DF68:
ldr r2, _0811DFBC @ =sub_811DFC0
str r2, [r1]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r7, 0x10]
adds r0, 0x1
strh r0, [r7, 0x10]
@@ -3437,7 +3437,7 @@ _0811E01C:
subs r1, 0x1
strh r1, [r0, 0x18]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_0811E036:
pop {r4,r5}
pop {r0}
@@ -3450,7 +3450,7 @@ _0811E03C: .4byte gUnknown_3005090
sub_811E040: @ 811E040
push {lr}
ldr r0, _0811E064 @ =sub_811DDA4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3646,18 +3646,18 @@ sub_811E194: @ 811E194
beq _0811E1F8
ldr r0, _0811E1EC @ =sub_811D9BC
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, [r5, 0xC]
adds r0, r4, 0
movs r1, 0x6
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r2, [r5, 0x10]
adds r0, r4, 0
movs r1, 0x9
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r1, _0811E1F0 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -3699,9 +3699,9 @@ sub_811E204: @ 811E204
sub sp, 0x8
mov r10, r0
ldr r0, _0811E2E0 @ =gUnknown_84599B8
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _0811E2E4 @ =gUnknown_84599C0
- bl sub_8008928
+ bl LoadSpritePalette
movs r0, 0
mov r1, r10
strh r0, [r1, 0x2]
@@ -3729,7 +3729,7 @@ _0811E22C:
asrs r2, 16
ldr r0, _0811E2EC @ =gUnknown_8459AEC
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0x40
@@ -3843,7 +3843,7 @@ _0811E330:
subs r1, 0x1
strh r1, [r0, 0x2]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_0811E340:
pop {r4}
pop {r0}
@@ -3856,14 +3856,14 @@ sub_811E348: @ 811E348
bl sub_811E588
ldr r0, _0811E37C @ =sub_811E3B4
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r2, _0811E380 @ =0x78865321
adds r0, r4, 0
movs r1, 0x3
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r1, _0811E384 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -3884,7 +3884,7 @@ _0811E384: .4byte gUnknown_3005090
sub_811E388: @ 811E388
push {lr}
ldr r0, _0811E3AC @ =sub_811E3B4
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3992,7 +3992,7 @@ _0811E3E0:
lsls r2, r7, 16
asrs r2, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -4048,7 +4048,7 @@ _0811E4CE:
cmp r0, 0
bne _0811E4DC
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0811E4DC:
add sp, 0x4
pop {r3-r5}
@@ -4068,7 +4068,7 @@ sub_811E4EC: @ 811E4EC
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x3
- bl sub_8077720
+ bl GetWordTaskArg
adds r5, r0, 0
ldr r0, _0811E518 @ =0x41c64e6d
muls r0, r5
@@ -4077,7 +4077,7 @@ sub_811E4EC: @ 811E4EC
adds r0, r4, 0
movs r1, 0x3
adds r2, r5, 0
- bl sub_80776E8
+ bl SetWordTaskArg
lsrs r0, r5, 16
pop {r4,r5}
pop {r1}
@@ -4110,7 +4110,7 @@ sub_811E520: @ 811E520
subs r1, 0x1
strh r1, [r0, 0xC]
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _0811E582
.align 2, 0
_0811E550: .4byte gUnknown_3005090
@@ -4148,9 +4148,9 @@ _0811E582:
sub_811E588: @ 811E588
push {lr}
ldr r0, _0811E59C @ =gUnknown_84599C8
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
ldr r0, _0811E5A0 @ =gUnknown_84599D0
- bl sub_8008928
+ bl LoadSpritePalette
pop {r0}
bx r0
.align 2, 0
@@ -4162,7 +4162,7 @@ _0811E5A0: .4byte gUnknown_84599D0
sub_811E5A4: @ 811E5A4
push {lr}
ldr r0, _0811E5B4 @ =sub_811E3B4
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -4216,12 +4216,12 @@ sub_811E5B8: @ 811E5B8
str r1, [r4]
mov r1, r9
strh r1, [r4, 0x4]
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _0811E674 @ =sub_811E694
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0811E678 @ =gUnknown_3005090
@@ -4243,10 +4243,10 @@ sub_811E5B8: @ 811E5B8
movs r1, 0xFC
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0811E67C @ =0x0000060c
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -4268,7 +4268,7 @@ _0811E67C: .4byte 0x0000060c
sub_811E680: @ 811E680
push {lr}
ldr r0, _0811E690 @ =sub_811E694
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -4330,11 +4330,11 @@ _0811E6EE:
cmp r0, 0
bne _0811E708
ldrh r0, [r4, 0xC]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrh r0, [r4, 0xE]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0811E708:
pop {r4,r5}
pop {r0}
@@ -4376,7 +4376,7 @@ sub_811E710: @ 811E710
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0x12]
mov r0, sp
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -4449,7 +4449,7 @@ sub_811E7B4: @ 811E7B4
subs r1, 0x1
strh r1, [r0, 0xA]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_0811E7E8:
pop {r0}
bx r0
@@ -4489,7 +4489,7 @@ sub_811E7F0: @ 811E7F0
lsls r1, 24
lsrs r1, 24
str r3, [sp, 0x2C]
- bl sub_800445C
+ bl FillWindowPixelBuffer
add r2, sp, 0xC
ldrh r0, [r5]
ldrh r1, [r6]
@@ -4561,7 +4561,7 @@ _0811E880:
ldr r1, _0811E938 @ =gUnknown_841B2DC
_0811E8BA:
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
mov r0, r10
str r0, [sp]
mov r1, r9
@@ -4651,7 +4651,7 @@ sub_811E93C: @ 811E93C
lsls r1, 24
lsrs r1, 24
str r2, [sp, 0x28]
- bl sub_800445C
+ bl FillWindowPixelBuffer
add r1, sp, 0xC
ldrh r0, [r5]
strh r0, [r1]
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 037e29c03..ef16da369 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -34,15 +34,15 @@ _0808B9EC: .4byte gUnknown_3005010
_0808B9F0: .4byte 0x000083d0
thumb_func_end sub_808B9D8
- thumb_func_start sub_808B9F4
-sub_808B9F4: @ 808B9F4
+ thumb_func_start StorageGetCurrentBox
+StorageGetCurrentBox: @ 808B9F4
ldr r0, _0808B9FC @ =gUnknown_3005010
ldr r0, [r0]
ldrb r0, [r0]
bx lr
.align 2, 0
_0808B9FC: .4byte gUnknown_3005010
- thumb_func_end sub_808B9F4
+ thumb_func_end StorageGetCurrentBox
thumb_func_start sub_808BA00
sub_808BA00: @ 808BA00
@@ -61,8 +61,8 @@ _0808BA10:
_0808BA14: .4byte gUnknown_3005010
thumb_func_end sub_808BA00
- thumb_func_start sub_808BA18
-sub_808BA18: @ 808BA18
+ thumb_func_start GetBoxMonDataFromAnyBox
+GetBoxMonDataFromAnyBox: @ 808BA18
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
@@ -87,7 +87,7 @@ sub_808BA18: @ 808BA18
lsls r1, 4
adds r0, r1
adds r1, r5, 0
- bl sub_803FD44
+ bl GetBoxMonData
b _0808BA56
.align 2, 0
_0808BA50: .4byte gUnknown_3005010
@@ -97,10 +97,10 @@ _0808BA56:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_808BA18
+ thumb_func_end GetBoxMonDataFromAnyBox
- thumb_func_start sub_808BA5C
-sub_808BA5C: @ 808BA5C
+ thumb_func_start SetBoxMonDataFromAnyBox
+SetBoxMonDataFromAnyBox: @ 808BA5C
push {r4-r6,lr}
adds r5, r2, 0
adds r6, r3, 0
@@ -134,10 +134,10 @@ _0808BA94:
bx r0
.align 2, 0
_0808BA9C: .4byte gUnknown_3005010
- thumb_func_end sub_808BA5C
+ thumb_func_end SetBoxMonDataFromAnyBox
- thumb_func_start sub_808BAA0
-sub_808BAA0: @ 808BAA0
+ thumb_func_start GetBoxMonDataFromSelectedBox
+GetBoxMonDataFromSelectedBox: @ 808BAA0
push {lr}
adds r3, r0, 0
adds r2, r1, 0
@@ -147,15 +147,15 @@ sub_808BAA0: @ 808BAA0
ldr r0, [r0]
ldrb r0, [r0]
adds r1, r3, 0
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
pop {r1}
bx r1
.align 2, 0
_0808BABC: .4byte gUnknown_3005010
- thumb_func_end sub_808BAA0
+ thumb_func_end GetBoxMonDataFromSelectedBox
- thumb_func_start sub_808BAC0
-sub_808BAC0: @ 808BAC0
+ thumb_func_start SetBoxMonDataFromSelectedBox
+SetBoxMonDataFromSelectedBox: @ 808BAC0
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -167,16 +167,16 @@ sub_808BAC0: @ 808BAC0
ldrb r0, [r0]
adds r1, r4, 0
adds r2, r5, 0
- bl sub_808BA5C
+ bl SetBoxMonDataFromAnyBox
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808BAE0: .4byte gUnknown_3005010
- thumb_func_end sub_808BAC0
+ thumb_func_end SetBoxMonDataFromSelectedBox
- thumb_func_start sub_808BAE4
-sub_808BAE4: @ 808BAE4
+ thumb_func_start GetBoxMonNickFromAnyBox
+GetBoxMonNickFromAnyBox: @ 808BAE4
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
@@ -202,7 +202,7 @@ sub_808BAE4: @ 808BAE4
adds r0, r1
movs r1, 0x2
adds r2, r5, 0
- bl sub_803FD44
+ bl GetBoxMonData
b _0808BB24
.align 2, 0
_0808BB1C: .4byte gUnknown_3005010
@@ -213,10 +213,10 @@ _0808BB24:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_808BAE4
+ thumb_func_end GetBoxMonNickFromAnyBox
- thumb_func_start sub_808BB2C
-sub_808BB2C: @ 808BB2C
+ thumb_func_start SetBoxMonNickFromAnyBox
+SetBoxMonNickFromAnyBox: @ 808BB2C
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
@@ -249,10 +249,10 @@ _0808BB62:
bx r0
.align 2, 0
_0808BB68: .4byte gUnknown_3005010
- thumb_func_end sub_808BB2C
+ thumb_func_end SetBoxMonNickFromAnyBox
- thumb_func_start sub_808BB6C
-sub_808BB6C: @ 808BB6C
+ thumb_func_start GetAndCopyBoxMonDataFromAnyBox
+GetAndCopyBoxMonDataFromAnyBox: @ 808BB6C
push {r4-r6,lr}
adds r5, r2, 0
adds r6, r3, 0
@@ -279,7 +279,7 @@ sub_808BB6C: @ 808BB6C
adds r0, r1
adds r1, r5, 0
adds r2, r6, 0
- bl sub_803FD44
+ bl GetBoxMonData
b _0808BBAE
.align 2, 0
_0808BBA8: .4byte gUnknown_3005010
@@ -289,10 +289,10 @@ _0808BBAE:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_808BB6C
+ thumb_func_end GetAndCopyBoxMonDataFromAnyBox
- thumb_func_start sub_808BBB4
-sub_808BBB4: @ 808BBB4
+ thumb_func_start CopyBoxMonFromAnyBox
+CopyBoxMonFromAnyBox: @ 808BBB4
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
@@ -325,7 +325,7 @@ _0808BBEA:
bx r0
.align 2, 0
_0808BBF0: .4byte gUnknown_3005010
- thumb_func_end sub_808BBB4
+ thumb_func_end CopyBoxMonFromAnyBox
thumb_func_start sub_808BBF4
sub_808BBF4: @ 808BBF4
@@ -417,7 +417,7 @@ sub_808BC34: @ 808BC34
mov r1, r9
mov r2, r8
adds r3, r4, 0
- bl sub_803DAC4
+ bl CreateBoxMon
_0808BCA0:
add sp, 0x14
pop {r3,r4}
@@ -454,7 +454,7 @@ sub_808BCB4: @ 808BCB4
adds r1, r4
lsls r1, 4
adds r0, r1
- bl sub_803D97C
+ bl ZeroBoxMonData
_0808BCE4:
pop {r4}
pop {r0}
@@ -489,7 +489,7 @@ sub_808BCF0: @ 808BCF0
lsls r1, 4
adds r0, r1
adds r1, r5, 0
- bl sub_803E774
+ bl BoxMonToMon
_0808BD24:
pop {r4,r5}
pop {r0}
@@ -498,8 +498,8 @@ _0808BD24:
_0808BD2C: .4byte gUnknown_3005010
thumb_func_end sub_808BCF0
- thumb_func_start sub_808BD30
-sub_808BD30: @ 808BD30
+ thumb_func_start GetBoxedMonPtr
+GetBoxedMonPtr: @ 808BD30
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -531,10 +531,10 @@ _0808BD66:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_808BD30
+ thumb_func_end GetBoxedMonPtr
- thumb_func_start sub_808BD6C
-sub_808BD6C: @ 808BD6C
+ thumb_func_start GetBoxNamePtr
+GetBoxNamePtr: @ 808BD6C
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -556,7 +556,7 @@ _0808BD88:
.align 2, 0
_0808BD8C: .4byte gUnknown_3005010
_0808BD90: .4byte 0x00008344
- thumb_func_end sub_808BD6C
+ thumb_func_end GetBoxNamePtr
thumb_func_start sub_808BD94
sub_808BD94: @ 808BD94
@@ -649,7 +649,7 @@ _0808BE26:
lsls r0, 4
add r0, r8
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
bne _0808BE50
asrs r0, r6, 16
@@ -691,12 +691,12 @@ _0808BE70:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _0808BE94
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _0808BE54
_0808BE94:
@@ -766,7 +766,7 @@ sub_808BEB4: @ 808BEB4
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x7
bl sub_8004950
@@ -903,7 +903,7 @@ sub_808BFE0: @ 808BFE0
str r0, [sp, 0x18]
str r1, [sp, 0x1C]
ldr r0, [sp, 0x20]
- bl sub_80092D4
+ bl StringLength_Multibyte
lsls r0, 24
ldr r2, _0808C0CC @ =0x00ffffff
ldr r1, [sp, 0x18]
@@ -931,7 +931,7 @@ sub_808BFE0: @ 808BFE0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
movs r1, 0x7
bl sub_8004950
@@ -987,8 +987,8 @@ _0808C0CC: .4byte 0x00ffffff
_0808C0D0: .4byte 0xffffff00
thumb_func_end sub_808BFE0
- thumb_func_start sub_808C0D4
-sub_808C0D4: @ 808C0D4
+ thumb_func_start CountMonsInBox
+CountMonsInBox: @ 808C0D4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -999,7 +999,7 @@ _0808C0DE:
lsrs r1, 24
adds r0, r6, 0
movs r2, 0xB
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
beq _0808C0F4
adds r0, r5, 0x1
@@ -1016,10 +1016,10 @@ _0808C0F4:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_808C0D4
+ thumb_func_end CountMonsInBox
- thumb_func_start sub_808C108
-sub_808C108: @ 808C108
+ thumb_func_start GetFirstFreeBoxSpot
+GetFirstFreeBoxSpot: @ 808C108
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1029,7 +1029,7 @@ _0808C110:
lsrs r1, 24
adds r0, r5, 0
movs r2, 0xB
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _0808C126
lsls r0, r4, 16
@@ -1047,10 +1047,10 @@ _0808C134:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_808C108
+ thumb_func_end GetFirstFreeBoxSpot
- thumb_func_start sub_808C13C
-sub_808C13C: @ 808C13C
+ thumb_func_start CountPartyNonEggMons
+CountPartyNonEggMons: @ 808C13C
push {r4-r6,lr}
movs r5, 0
movs r6, 0
@@ -1062,12 +1062,12 @@ _0808C142:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0808C16A
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0808C16A
adds r0, r6, 0x1
@@ -1086,10 +1086,10 @@ _0808C16A:
bx r1
.align 2, 0
_0808C180: .4byte gUnknown_2024284
- thumb_func_end sub_808C13C
+ thumb_func_end CountPartyNonEggMons
- thumb_func_start sub_808C184
-sub_808C184: @ 808C184
+ thumb_func_start CountPartyAliveNonEggMonsExcept
+CountPartyAliveNonEggMonsExcept: @ 808C184
push {r4-r7,lr}
lsls r0, 24
movs r5, 0
@@ -1105,17 +1105,17 @@ _0808C18E:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0808C1C6
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0808C1C6
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0808C1C6
adds r0, r6, 0x1
@@ -1134,24 +1134,24 @@ _0808C1C6:
bx r1
.align 2, 0
_0808C1DC: .4byte gUnknown_2024284
- thumb_func_end sub_808C184
+ thumb_func_end CountPartyAliveNonEggMonsExcept
- thumb_func_start sub_808C1E0
-sub_808C1E0: @ 808C1E0
+ thumb_func_start CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
+CountPartyAliveNonEggMons_IgnoreVar0x8004Slot: @ 808C1E0
push {lr}
ldr r0, _0808C1F4 @ =gUnknown_20370C0
ldrb r0, [r0]
- bl sub_808C184
+ bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_0808C1F4: .4byte gUnknown_20370C0
- thumb_func_end sub_808C1E0
+ thumb_func_end CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
- thumb_func_start sub_808C1F8
-sub_808C1F8: @ 808C1F8
+ thumb_func_start CountPartyMons
+CountPartyMons: @ 808C1F8
push {r4,r5,lr}
movs r4, 0
movs r5, 0
@@ -1161,7 +1161,7 @@ _0808C1FE:
ldr r1, _0808C22C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0808C216
adds r0, r5, 0x1
@@ -1180,15 +1180,15 @@ _0808C216:
bx r1
.align 2, 0
_0808C22C: .4byte gUnknown_2024284
- thumb_func_end sub_808C1F8
+ thumb_func_end CountPartyMons
- thumb_func_start sub_808C230
-sub_808C230: @ 808C230
+ thumb_func_start StringCopyAndFillWithSpaces
+StringCopyAndFillWithSpaces: @ 808C230
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r2, 16
lsrs r4, 16
- bl sub_8008D84
+ bl StringCopy
adds r1, r0, 0
adds r5, r4
cmp r1, r5
@@ -1206,7 +1206,7 @@ _0808C24E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_808C230
+ thumb_func_end StringCopyAndFillWithSpaces
thumb_func_start sub_808C25C
sub_808C25C: @ 808C25C
@@ -1378,8 +1378,8 @@ _0808C394: .4byte 0x040000d4
_0808C398: .4byte 0x81000800
thumb_func_end sub_808C2D8
- thumb_func_start sub_808C39C
-sub_808C39C: @ 808C39C
+ thumb_func_start c3_0808C39C
+c3_0808C39C: @ 808C39C
push {r4-r7,lr}
sub sp, 0x10
lsls r0, 24
@@ -1423,7 +1423,7 @@ _0808C3E0:
bl sub_80F6EE4
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _0808C444 @ =gUnknown_83CDA20
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -1466,7 +1466,7 @@ _0808C454:
strh r0, [r5, 0x8]
b _0808C69C
_0808C45C:
- bl sub_810F998
+ bl ProcessMenuInput
lsls r0, 24
asrs r0, 24
strh r0, [r5, 0xC]
@@ -1531,7 +1531,7 @@ _0808C4CE:
strh r2, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _0808C508 @ =gUnknown_83CDA20
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -1563,24 +1563,24 @@ _0808C50C:
lsrs r0, 24
movs r1, 0x1
bl sub_80F6F9C
- bl sub_806994C
- bl sub_8069B34
+ bl ScriptContext2_Disable
+ bl EnableBothScriptContexts
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _0808C69C
_0808C530:
movs r3, 0xC
ldrsh r4, [r5, r3]
cmp r4, 0
bne _0808C564
- bl sub_808C1F8
+ bl CountPartyMons
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
bne _0808C564
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0808C560 @ =gUnknown_84186B0
str r4, [sp]
movs r0, 0x2
@@ -1597,14 +1597,14 @@ _0808C564:
ldrsh r0, [r5, r1]
cmp r0, 0x1
bne _0808C598
- bl sub_808C1F8
+ bl CountPartyMons
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
bne _0808C598
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0808C594 @ =gUnknown_8418690
movs r0, 0
str r0, [sp]
@@ -1619,7 +1619,7 @@ _0808C594: .4byte gUnknown_8418690
_0808C598:
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
movs r0, 0x4
strh r0, [r5, 0x8]
b _0808C69C
@@ -1633,7 +1633,7 @@ _0808C5A6:
beq _0808C5D8
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _0808C5D4 @ =gUnknown_83CDA20
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -1665,14 +1665,14 @@ _0808C5D8:
_0808C5F4:
movs r0, 0x1
negs r0, r0
- bl sub_810F904
+ bl MoveMenuCursor
bl sub_810F98C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _0808C620 @ =gUnknown_83CDA20
movs r3, 0xA
ldrsh r0, [r5, r3]
@@ -1699,14 +1699,14 @@ _0808C624:
strh r6, [r5, 0xA]
_0808C63C:
movs r0, 0x1
- bl sub_810F904
+ bl MoveMenuCursor
bl sub_810F98C
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0xA]
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, _0808C67C @ =gUnknown_83CDA20
movs r2, 0xA
ldrsh r0, [r5, r2]
@@ -1741,7 +1741,7 @@ _0808C680:
ldrb r0, [r5, 0xC]
bl sub_808CDE4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0808C69C:
add sp, 0x10
pop {r4-r7}
@@ -1749,14 +1749,14 @@ _0808C69C:
bx r0
.align 2, 0
_0808C6A4: .4byte gUnknown_2037AB8
- thumb_func_end sub_808C39C
+ thumb_func_end c3_0808C39C
thumb_func_start sub_808C6A8
sub_808C6A8: @ 808C6A8
push {lr}
- ldr r0, _0808C6D0 @ =sub_808C39C
+ ldr r0, _0808C6D0 @ =c3_0808C39C
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0808C6D4 @ =gUnknown_3005090
@@ -1767,11 +1767,11 @@ sub_808C6A8: @ 808C6A8
movs r0, 0
strh r0, [r1, 0x8]
strh r0, [r1, 0xA]
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
-_0808C6D0: .4byte sub_808C39C
+_0808C6D0: .4byte c3_0808C39C
_0808C6D4: .4byte gUnknown_3005090
thumb_func_end sub_808C6A8
@@ -1781,11 +1781,11 @@ sub_808C6D8: @ 808C6D8
ldr r0, _0808C71C @ =gUnknown_30030F0
ldr r5, [r0, 0xC]
movs r0, 0
- bl sub_80006F4
- ldr r4, _0808C720 @ =sub_808C39C
+ bl SetVBlankCallback
+ ldr r4, _0808C720 @ =c3_0808C39C
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0808C724 @ =gUnknown_3005090
@@ -1800,14 +1800,14 @@ sub_808C6D8: @ 808C6D8
strh r2, [r1, 0xA]
bl _call_via_r4
adds r0, r5, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_807DC00
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808C71C: .4byte gUnknown_30030F0
-_0808C720: .4byte sub_808C39C
+_0808C720: .4byte c3_0808C39C
_0808C724: .4byte gUnknown_3005090
_0808C728: .4byte gUnknown_20397A8
thumb_func_end sub_808C6D8
@@ -1851,7 +1851,7 @@ sub_808C72C: @ 808C72C
adds r0, r4, 0
movs r1, 0x2
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
mov r0, r9
str r0, [sp]
mov r0, r8
@@ -1886,15 +1886,15 @@ sub_808C7B4: @ 808C7B4
ldr r1, _0808C7D4 @ =gUnknown_3005020
ldr r0, _0808C7D8 @ =sub_808C6D8
str r0, [r1]
- ldr r0, _0808C7DC @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0808C7DC @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_0808C7D0: .4byte gUnknown_20397A8
_0808C7D4: .4byte gUnknown_3005020
_0808C7D8: .4byte sub_808C6D8
-_0808C7DC: .4byte sub_80567DC
+_0808C7DC: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_808C7B4
thumb_func_start sub_808C7E0
@@ -1925,9 +1925,9 @@ _0808C7EE:
_0808C80E:
lsls r0, r5, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
ldr r1, _0808C850 @ =gUnknown_84186CD
- bl sub_8008D84
+ bl StringCopy
adds r4, r5, 0x1
adds r1, r4, 0
movs r2, 0
@@ -2002,10 +2002,10 @@ sub_808C854: @ 808C854
cmp r0, 0
beq _0808C8B2
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
_0808C8B2:
mov r0, sp
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0808C8F8 @ =gUnknown_20397AC
str r5, [r0]
movs r1, 0x90
@@ -2052,21 +2052,21 @@ sub_808C8FC: @ 808C8FC
adds r2, 0x6
adds r0, r1, r2
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0808C918:
ldr r0, [r5]
movs r4, 0x90
lsls r4, 2
adds r0, r4
ldrh r0, [r0]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r5]
adds r0, r4
ldrh r0, [r0]
adds r0, 0x1
lsls r0, 16
lsrs r0, 16
- bl sub_800874C
+ bl FreeSpriteTilesByTag
pop {r4,r5}
pop {r0}
bx r0
@@ -2217,7 +2217,7 @@ sub_808C9C4: @ 808C9C4
movs r1, 0xA0
movs r2, 0x60
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
ldr r3, [r6]
@@ -2256,7 +2256,7 @@ _0808CA90:
add r0, sp, 0x4
movs r1, 0x7C
movs r2, 0x50
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
ldr r2, [r6]
@@ -2303,7 +2303,7 @@ _0808CAEE:
ldr r0, [r0]
lsls r1, r5, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -2387,7 +2387,7 @@ sub_808CBA4: @ 808CBA4
ldr r0, [r0]
cmp r0, 0
beq _0808CBBA
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r4]
movs r0, 0
str r0, [r1]
@@ -2402,7 +2402,7 @@ _0808CBBE:
ldr r0, [r0]
cmp r0, 0
beq _0808CBDA
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
adds r0, 0x4
adds r0, r4
@@ -2424,7 +2424,7 @@ _0808CBE6:
ldr r0, [r0]
cmp r0, 0
beq _0808CBFA
- bl sub_8007280
+ bl DestroySprite
_0808CBFA:
adds r0, r5, 0x1
lsls r0, 16
@@ -2503,7 +2503,7 @@ sub_808CC74: @ 808CC74
lsls r5, 2
adds r0, r5
ldrb r0, [r0]
- bl sub_808C0D4
+ bl CountMonsInBox
lsls r0, 24
lsrs r7, r0, 24
ldr r0, [r6]
@@ -2512,10 +2512,10 @@ sub_808CC74: @ 808CC74
adds r4, r0, r1
adds r0, r5
ldrb r0, [r0]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r1, r0, 0
ldr r0, [r6]
movs r2, 0x8C
@@ -2580,7 +2580,7 @@ sub_808CCFC: @ 808CCFC
lsls r1, 2
adds r0, r1
ldrh r0, [r0]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
adds r1, r0, 0
lsls r1, 16
lsrs r1, 11
@@ -2647,10 +2647,10 @@ _0808CD94:
thumb_func_start sub_808CD98
sub_808CD98: @ 808CD98
push {lr}
- bl sub_8007320
- bl sub_8007610
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
bl sub_8096BF8
- bl sub_8070474
+ bl TransferPlttBuffer
ldr r0, _0808CDC0 @ =gUnknown_20397B0
ldr r0, [r0]
movs r1, 0xB3
@@ -2658,42 +2658,42 @@ sub_808CD98: @ 808CD98
adds r0, r1
ldrh r1, [r0]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
_0808CDC0: .4byte gUnknown_20397B0
thumb_func_end sub_808CD98
- thumb_func_start sub_808CDC4
-sub_808CDC4: @ 808CDC4
+ thumb_func_start c2_Box
+c2_Box: @ 808CDC4
push {lr}
- bl sub_8077578
- bl sub_80F67B8
+ bl RunTasks
+ bl do_scheduled_bg_tilemap_copies_to_vram
bl sub_808EFC8
bl sub_808F99C
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r0}
bx r0
- thumb_func_end sub_808CDC4
+ thumb_func_end c2_Box
thumb_func_start sub_808CDE4
sub_808CDE4: @ 808CDE4
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- bl sub_80773BC
+ bl ResetTasks
ldr r0, _0808CE08 @ =gUnknown_20397B5
strb r5, [r0]
ldr r4, _0808CE0C @ =gUnknown_20397B0
ldr r0, _0808CE10 @ =0x000062bc
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
bne _0808CE18
ldr r0, _0808CE14 @ =sub_808C7B4
- bl sub_8000544
+ bl SetMainCallback2
b _0808CE4A
.align 2, 0
_0808CE08: .4byte gUnknown_20397B5
@@ -2710,42 +2710,42 @@ _0808CE18:
strh r2, [r0]
ldr r0, [r4]
strb r1, [r0]
- ldr r0, _0808CE54 @ =sub_808D020
+ ldr r0, _0808CE54 @ =task_box_related_3
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
movs r0, 0x1C
bl sub_812B1F0
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r1, _0808CE58 @ =gUnknown_20397B8
strb r0, [r1]
- ldr r0, _0808CE5C @ =sub_808CDC4
- bl sub_8000544
+ ldr r0, _0808CE5C @ =c2_Box
+ bl SetMainCallback2
_0808CE4A:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_0808CE50: .4byte gUnknown_20397BA
-_0808CE54: .4byte sub_808D020
+_0808CE54: .4byte task_box_related_3
_0808CE58: .4byte gUnknown_20397B8
-_0808CE5C: .4byte sub_808CDC4
+_0808CE5C: .4byte c2_Box
thumb_func_end sub_808CDE4
thumb_func_start sub_808CE60
sub_808CE60: @ 808CE60
push {r4,lr}
- bl sub_80773BC
+ bl ResetTasks
ldr r4, _0808CE80 @ =gUnknown_20397B0
ldr r0, _0808CE84 @ =0x000062bc
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
str r1, [r4]
cmp r1, 0
bne _0808CE8C
ldr r0, _0808CE88 @ =sub_808C7B4
- bl sub_8000544
+ bl SetMainCallback2
b _0808CEB6
.align 2, 0
_0808CE80: .4byte gUnknown_20397B0
@@ -2761,23 +2761,23 @@ _0808CE8C:
strb r0, [r1, 0x3]
ldr r0, [r4]
strb r2, [r0]
- ldr r0, _0808CEC0 @ =sub_808D020
+ ldr r0, _0808CEC0 @ =task_box_related_3
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x4]
movs r0, 0x1C
bl sub_812B1F0
- ldr r0, _0808CEC4 @ =sub_808CDC4
- bl sub_8000544
+ ldr r0, _0808CEC4 @ =c2_Box
+ bl SetMainCallback2
_0808CEB6:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0808CEBC: .4byte gUnknown_20397B5
-_0808CEC0: .4byte sub_808D020
-_0808CEC4: .4byte sub_808CDC4
+_0808CEC0: .4byte task_box_related_3
+_0808CEC4: .4byte c2_Box
thumb_func_end sub_808CE60
thumb_func_start sub_808CEC8
@@ -2785,28 +2785,28 @@ sub_808CEC8: @ 808CEC8
push {lr}
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_808CEC8
@@ -2815,11 +2815,11 @@ sub_808CEC8: @ 808CEC8
sub_808CF10: @ 808CF10
push {r4,lr}
sub sp, 0x4
- bl sub_8070528
- bl sub_8006B10
- bl sub_80087C4
- bl sub_80088F0
- bl sub_8000BFC
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl FreeSpriteTileRanges
+ bl FreeAllSpritePalettes
+ bl ClearDma3Requests
ldr r1, _0808CF80 @ =gUnknown_2021B46
movs r2, 0xA0
lsls r2, 2
@@ -2835,7 +2835,7 @@ sub_808CF10: @ 808CF10
ldr r1, _0808CF88 @ =gUnknown_30030E0
movs r0, 0x14
strh r0, [r1]
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
movs r0, 0x3
bl sub_80F7AD8
ldr r2, _0808CF8C @ =gUnknown_83CE6F8
@@ -2902,15 +2902,15 @@ sub_808CFC4: @ 808CFC4
movs r1, 0xFC
lsls r1, 6
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0808CFF4 @ =0x00000b07
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
_0808CFE2:
movs r1, 0xFA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -2918,8 +2918,8 @@ _0808CFF0: .4byte gUnknown_20397B0
_0808CFF4: .4byte 0x00000b07
thumb_func_end sub_808CFC4
- thumb_func_start sub_808CFF8
-sub_808CFF8: @ 808CFF8
+ thumb_func_start add_to_c3_somehow
+add_to_c3_somehow: @ 808CFF8
push {r4,lr}
ldr r4, _0808D018 @ =gUnknown_3005090
ldr r1, _0808D01C @ =gUnknown_20397B0
@@ -2938,10 +2938,10 @@ sub_808CFF8: @ 808CFF8
.align 2, 0
_0808D018: .4byte gUnknown_3005090
_0808D01C: .4byte gUnknown_20397B0
- thumb_func_end sub_808CFF8
+ thumb_func_end add_to_c3_somehow
- thumb_func_start sub_808D020
-sub_808D020: @ 808D020
+ thumb_func_start task_box_related_3
+task_box_related_3: @ 808D020
push {lr}
sub sp, 0x4
ldr r0, _0808D03C @ =gUnknown_20397B0
@@ -2974,10 +2974,10 @@ _0808D044:
.4byte _0808D1BE
_0808D070:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_808CF10
ldr r0, _0808D0A0 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -3022,9 +3022,9 @@ _0808D0D4:
b _0808D148
_0808D0D6:
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
str r0, [sp]
movs r1, 0xC0
@@ -3073,7 +3073,7 @@ _0808D13E:
bne _0808D154
_0808D148:
ldr r0, _0808D150 @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D216
.align 2, 0
_0808D150: .4byte sub_808EE18
@@ -3088,7 +3088,7 @@ _0808D164:
bl sub_808F68C
b _0808D20C
_0808D16A:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
bl sub_80913DC
@@ -3134,9 +3134,9 @@ _0808D1BE:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _0808D1E4 @ =sub_808D220
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D1FA
.align 2, 0
_0808D1E0: .4byte gUnknown_20397B0
@@ -3146,12 +3146,12 @@ _0808D1E8:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _0808D204 @ =sub_808D26C
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808D1FA:
ldr r0, _0808D208 @ =sub_808CD98
- bl sub_80006F4
+ bl SetVBlankCallback
b _0808D216
.align 2, 0
_0808D204: .4byte sub_808D26C
@@ -3168,7 +3168,7 @@ _0808D216:
bx r0
.align 2, 0
_0808D21C: .4byte gUnknown_20397B0
- thumb_func_end sub_808D020
+ thumb_func_end task_box_related_3
thumb_func_start sub_808D220
sub_808D220: @ 808D220
@@ -3201,7 +3201,7 @@ _0808D252:
cmp r0, 0
bne _0808D262
ldr r0, _0808D268 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808D262:
pop {r4}
pop {r0}
@@ -3231,19 +3231,19 @@ _0808D284:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _0808D2AE
_0808D29E:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0808D2AE
ldr r0, _0808D2B8 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808D2AE:
add sp, 0x4
pop {r4}
@@ -3359,7 +3359,7 @@ _0808D3C8: .4byte gUnknown_20397B0
_0808D3CC:
bl sub_8092B50
ldr r0, _0808D3D8 @ =sub_808D7BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D3D8: .4byte sub_808D7BC
@@ -3393,40 +3393,40 @@ _0808D410:
b _0808D7B2
_0808D416:
ldr r0, _0808D420 @ =sub_808D7FC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D420: .4byte sub_808D7FC
_0808D424:
ldr r0, _0808D42C @ =sub_808EBB0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D42C: .4byte sub_808EBB0
_0808D430:
ldr r0, _0808D438 @ =sub_808ECE4
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D438: .4byte sub_808ECE4
_0808D43C:
movs r0, 0x5
bl sub_80722CC
- ldr r0, _0808D44C @ =sub_808E744
- bl sub_808CFF8
+ ldr r0, _0808D44C @ =box_related
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
-_0808D44C: .4byte sub_808E744
+_0808D44C: .4byte box_related
_0808D450:
ldr r0, _0808D458 @ =sub_808D878
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D458: .4byte sub_808D878
_0808D45C:
movs r0, 0x5
bl sub_80722CC
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r4, _0808D48C @ =gUnknown_20397B0
ldr r1, [r4]
lsls r0, 24
@@ -3452,7 +3452,7 @@ _0808D490: .4byte 0x000002ca
_0808D494:
movs r0, 0x5
bl sub_80722CC
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r4, _0808D4C4 @ =gUnknown_20397B0
ldr r1, [r4]
lsls r0, 24
@@ -3507,7 +3507,7 @@ _0808D508:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D518 @ =sub_808DD88
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D518: .4byte sub_808DD88
@@ -3536,7 +3536,7 @@ _0808D548:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D558 @ =sub_808DC50
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D558: .4byte sub_808DC50
@@ -3544,7 +3544,7 @@ _0808D55C:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D56C @ =sub_808DC9C
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D56C: .4byte sub_808DC9C
@@ -3552,7 +3552,7 @@ _0808D570:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D580 @ =sub_808DBF0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D580: .4byte sub_808DBF0
@@ -3560,7 +3560,7 @@ _0808D584:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D594 @ =sub_808E140
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D594: .4byte sub_808E140
@@ -3568,7 +3568,7 @@ _0808D598:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D5A8 @ =sub_808E1F4
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D5A8: .4byte sub_808E1F4
@@ -3576,7 +3576,7 @@ _0808D5AC:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808D5BC @ =sub_808E3C8
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D5BC: .4byte sub_808E3C8
@@ -3658,7 +3658,7 @@ _0808D650:
ldrb r0, [r0]
cmp r0, 0
beq _0808D662
- bl sub_808F200
+ bl BoxSetMosaic
_0808D662:
ldr r1, [r4]
b _0808D6DC
@@ -3687,7 +3687,7 @@ _0808D67C:
cmp r0, 0
bne _0808D6A4
bl sub_8092F54
- bl sub_808F200
+ bl BoxSetMosaic
_0808D6A4:
ldr r4, _0808D6BC @ =gUnknown_20397B0
ldr r1, [r4]
@@ -3747,7 +3747,7 @@ _0808D710:
beq _0808D7B2
bl sub_808FD20
ldr r0, _0808D72C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D728: .4byte gUnknown_30030F0
@@ -3762,7 +3762,7 @@ _0808D736:
bne _0808D7B2
_0808D740:
ldr r0, _0808D748 @ =sub_808DB94
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808D7B2
.align 2, 0
_0808D748: .4byte sub_808DB94
@@ -3779,7 +3779,7 @@ _0808D74C:
ldrb r0, [r0]
cmp r0, 0
beq _0808D76A
- bl sub_808F200
+ bl BoxSetMosaic
_0808D76A:
ldr r0, [r5]
strb r4, [r0]
@@ -3850,7 +3850,7 @@ _0808D7E2:
cmp r0, 0
bne _0808D7F2
ldr r0, _0808D7F8 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808D7F2:
pop {r4}
pop {r0}
@@ -3909,10 +3909,10 @@ _0808D84A:
ldrb r0, [r0]
cmp r0, 0
beq _0808D864
- bl sub_808F200
+ bl BoxSetMosaic
_0808D864:
ldr r0, _0808D874 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808D86A:
pop {r4}
pop {r0}
@@ -4051,7 +4051,7 @@ _0808D954:
_0808D9A0:
bl sub_808FD20
ldr r0, _0808D9AC @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808D9AC: .4byte sub_808D2BC
@@ -4064,7 +4064,7 @@ _0808D9B0:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808D9CC @ =sub_808DB94
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808D9CC: .4byte sub_808DB94
@@ -4073,7 +4073,7 @@ _0808D9D0:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808D9E4 @ =sub_808DBF0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808D9E4: .4byte sub_808DBF0
@@ -4086,7 +4086,7 @@ _0808D9E8:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808DA04 @ =sub_808DC50
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DA04: .4byte sub_808DC50
@@ -4095,7 +4095,7 @@ _0808DA08:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808DA1C @ =sub_808DC9C
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DA1C: .4byte sub_808DC9C
@@ -4117,7 +4117,7 @@ _0808DA20:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808DA58 @ =sub_808DD88
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DA50: .4byte gUnknown_20397B0
@@ -4169,7 +4169,7 @@ _0808DAAC:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808DABC @ =sub_808DECC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DABC: .4byte sub_808DECC
@@ -4177,7 +4177,7 @@ _0808DAC0:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808DAD0 @ =sub_808EAF0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DAD0: .4byte sub_808EAF0
@@ -4185,7 +4185,7 @@ _0808DAD4:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808DAE4 @ =sub_808E0BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DAE4: .4byte sub_808E0BC
@@ -4193,7 +4193,7 @@ _0808DAE8:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808DAF8 @ =sub_808E140
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DAF8: .4byte sub_808E140
@@ -4201,31 +4201,31 @@ _0808DAFC:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808DB0C @ =sub_808E1F4
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DB0C: .4byte sub_808E1F4
_0808DB10:
ldr r0, _0808DB18 @ =sub_808E2B0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DB18: .4byte sub_808E2B0
_0808DB1C:
ldr r0, _0808DB24 @ =sub_808E3C8
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DB24: .4byte sub_808E3C8
_0808DB28:
ldr r0, _0808DB30 @ =sub_808EB50
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DB30: .4byte sub_808EB50
_0808DB34:
ldr r0, _0808DB3C @ =sub_808E4B0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DB86
.align 2, 0
_0808DB3C: .4byte sub_808E4B0
@@ -4261,7 +4261,7 @@ _0808DB70:
beq _0808DB86
bl sub_808FD20
ldr r0, _0808DB90 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808DB86:
pop {r4}
pop {r0}
@@ -4302,14 +4302,14 @@ _0808DBBC:
cmp r0, 0
beq _0808DBE0
ldr r0, _0808DBDC @ =sub_808E688
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DBE6
.align 2, 0
_0808DBD8: .4byte gUnknown_20397B4
_0808DBDC: .4byte sub_808E688
_0808DBE0:
ldr r0, _0808DBEC @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808DBE6:
pop {r4}
pop {r0}
@@ -4351,14 +4351,14 @@ _0808DC1E:
cmp r0, 0
beq _0808DC40
ldr r0, _0808DC3C @ =sub_808E688
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DC46
.align 2, 0
_0808DC38: .4byte gUnknown_20397B4
_0808DC3C: .4byte sub_808E688
_0808DC40:
ldr r0, _0808DC4C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808DC46:
pop {r4}
pop {r0}
@@ -4395,9 +4395,9 @@ _0808DC7E:
lsls r0, 24
cmp r0, 0
bne _0808DC92
- bl sub_808F200
+ bl BoxSetMosaic
ldr r0, _0808DC98 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808DC92:
pop {r4}
pop {r0}
@@ -4431,7 +4431,7 @@ _0808DCBC:
.4byte _0808DD5A
.4byte _0808DD78
_0808DCD4:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
cmp r0, 0x6
@@ -4465,7 +4465,7 @@ _0808DD0C:
beq _0808DD7E
bl sub_808FD20
ldr r0, _0808DD28 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DD7E
.align 2, 0
_0808DD24: .4byte gUnknown_30030F0
@@ -4506,7 +4506,7 @@ _0808DD68:
_0808DD74: .4byte gUnknown_20397B0
_0808DD78:
ldr r0, _0808DD84 @ =sub_808D7FC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808DD7E:
pop {r0}
bx r0
@@ -4608,7 +4608,7 @@ _0808DE50:
.align 2, 0
_0808DE60: .4byte gUnknown_20397B0
_0808DE64:
- bl sub_80937DC
+ bl CompactPartySlots
bl sub_80909F4
ldr r0, _0808DE78 @ =gUnknown_20397B0
ldr r1, [r0]
@@ -4623,11 +4623,11 @@ _0808DE7C:
cmp r0, 0
bne _0808DEBA
bl sub_8093174
- bl sub_808F200
+ bl BoxSetMosaic
bl sub_808FAA8
_0808DE92:
ldr r0, _0808DE9C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808DEBA
.align 2, 0
_0808DE9C: .4byte sub_808D2BC
@@ -4776,7 +4776,7 @@ _0808DFBC:
ldrb r0, [r0]
cmp r0, 0
beq _0808DFE8
- bl sub_80937DC
+ bl CompactPartySlots
bl sub_80909F4
b _0808E074
.align 2, 0
@@ -4796,12 +4796,12 @@ _0808DFF8:
cmp r0, 0
bne _0808E0AE
bl sub_8092F54
- bl sub_808F200
+ bl BoxSetMosaic
bl sub_808FAA8
b _0808E074
_0808E010:
ldr r0, _0808E018 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E0AE
.align 2, 0
_0808E018: .4byte sub_808D2BC
@@ -4876,7 +4876,7 @@ _0808E098:
beq _0808E0AE
bl sub_808FD20
ldr r0, _0808E0B8 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E0AE:
pop {r0}
bx r0
@@ -4936,7 +4936,7 @@ _0808E108:
bl sub_8093878
bl sub_808F1D0
ldr r0, _0808E13C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E130:
pop {r4}
pop {r0}
@@ -4981,7 +4981,7 @@ _0808E166:
_0808E17C: .4byte 0x00000ce2
_0808E180:
ldr r0, _0808E188 @ =sub_808E6D0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E1EA
.align 2, 0
_0808E188: .4byte sub_808E6D0
@@ -5019,12 +5019,12 @@ _0808E1D0:
strb r0, [r1]
b _0808E1EA
_0808E1DA:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E1EA
ldr r0, _0808E1F0 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E1EA:
pop {r4,r5}
pop {r0}
@@ -5105,12 +5105,12 @@ _0808E280:
_0808E28C: .4byte gUnknown_30030F0
_0808E290: .4byte gUnknown_20397B0
_0808E294:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E2A4
ldr r0, _0808E2AC @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E2A4:
pop {r4}
pop {r0}
@@ -5218,12 +5218,12 @@ _0808E360:
_0808E384: .4byte gUnknown_30030F0
_0808E388: .4byte gUnknown_20397B0
_0808E38C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E3BA
ldr r0, _0808E3A0 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E3BA
.align 2, 0
_0808E3A0: .4byte sub_808D2BC
@@ -5236,7 +5236,7 @@ _0808E3A4:
beq _0808E3BA
bl sub_808FD20
ldr r0, _0808E3C4 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E3BA:
pop {r4,r5}
pop {r0}
@@ -5286,7 +5286,7 @@ _0808E3FC:
_0808E418: .4byte 0x00000ce2
_0808E41C:
ldr r0, _0808E424 @ =sub_808E6D0
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E4A4
.align 2, 0
_0808E424: .4byte sub_808E6D0
@@ -5339,12 +5339,12 @@ _0808E484:
_0808E48C: .4byte gUnknown_30030F0
_0808E490: .4byte gUnknown_20397B0
_0808E494:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E4A4
ldr r0, _0808E4AC @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E4A4:
pop {r4}
pop {r0}
@@ -5382,7 +5382,7 @@ _0808E4EC:
bl sub_808FD20
b _0808E53A
_0808E4F2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E55C
@@ -5395,7 +5395,7 @@ _0808E50C:
bl sub_8096728
b _0808E534
_0808E512:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
b _0808E534
_0808E518:
ldr r0, _0808E52C @ =gUnknown_30030F0
@@ -5425,12 +5425,12 @@ _0808E53A:
.align 2, 0
_0808E548: .4byte gUnknown_20397B0
_0808E54C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E55C
ldr r0, _0808E560 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E55C:
pop {r0}
bx r0
@@ -5558,17 +5558,17 @@ _0808E650:
bl sub_8094D14
_0808E660:
ldr r0, _0808E668 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E67C
.align 2, 0
_0808E668: .4byte sub_808D2BC
_0808E66C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E67C
ldr r0, _0808E684 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E67C:
pop {r4}
pop {r0}
@@ -5591,7 +5591,7 @@ sub_808E688: @ 808E688
.align 2, 0
_0808E69C: .4byte gUnknown_20397B0
_0808E6A0:
- bl sub_80937DC
+ bl CompactPartySlots
bl sub_80909F4
ldr r1, [r4]
ldrb r0, [r1]
@@ -5605,7 +5605,7 @@ _0808E6B2:
bne _0808E6C6
bl sub_808FAA8
ldr r0, _0808E6CC @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E6C6:
pop {r4}
pop {r0}
@@ -5640,7 +5640,7 @@ _0808E6F6:
bl sub_808FBA4
b _0808E71A
_0808E6FE:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E738
@@ -5662,12 +5662,12 @@ _0808E71A:
.align 2, 0
_0808E724: .4byte gUnknown_30030F0
_0808E728:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E738
ldr r0, _0808E740 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E738:
pop {r4}
pop {r0}
@@ -5676,8 +5676,8 @@ _0808E738:
_0808E740: .4byte sub_808D2BC
thumb_func_end sub_808E6D0
- thumb_func_start sub_808E744
-sub_808E744: @ 808E744
+ thumb_func_start box_related
+box_related: @ 808E744
push {r4,lr}
ldr r4, _0808E75C @ =gUnknown_20397B0
ldr r0, [r4]
@@ -5747,7 +5747,7 @@ _0808E7DC:
bl sub_80920FC
bl sub_808FD20
ldr r0, _0808E7F0 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E830
.align 2, 0
_0808E7F0: .4byte sub_808D2BC
@@ -5755,7 +5755,7 @@ _0808E7F4:
movs r0, 0x5
bl sub_80722CC
ldr r0, _0808E804 @ =sub_808EA90
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E830
.align 2, 0
_0808E804: .4byte sub_808EA90
@@ -5764,7 +5764,7 @@ _0808E808:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808E81C @ =sub_808E83C
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E830
.align 2, 0
_0808E81C: .4byte sub_808E83C
@@ -5773,14 +5773,14 @@ _0808E820:
bl sub_80722CC
bl sub_808FD20
ldr r0, _0808E838 @ =sub_808E9A0
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E830:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0808E838: .4byte sub_808E9A0
- thumb_func_end sub_808E744
+ thumb_func_end box_related
thumb_func_start sub_808E83C
sub_808E83C: @ 808E83C
@@ -5846,7 +5846,7 @@ _0808E8A0:
bl sub_80920FC
bl sub_808FD20
ldr r0, _0808E8D4 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808E994
.align 2, 0
_0808E8CC: .4byte gUnknown_20397B0
@@ -5869,7 +5869,7 @@ _0808E8D8:
strh r0, [r2]
b _0808E976
_0808E8FA:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0808E994
@@ -5936,7 +5936,7 @@ _0808E97E:
movs r0, 0x1
bl sub_80920FC
ldr r0, _0808E99C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808E994:
pop {r4,r5}
pop {r0}
@@ -5978,7 +5978,7 @@ _0808E9C6:
movs r1, 0xA
movs r3, 0x3
bl sub_808C854
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
bl sub_808C940
@@ -6009,7 +6009,7 @@ _0808E9F4:
cmp r0, 0xC9
beq _0808EA34
adds r4, r0, 0
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -6018,7 +6018,7 @@ _0808EA34:
movs r0, 0x1
bl sub_80920FC
ldr r0, _0808EA48 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808EA80
.align 2, 0
_0808EA44: .4byte 0x000002ca
@@ -6047,7 +6047,7 @@ _0808EA64:
ldrb r0, [r0]
bl sub_808BA00
ldr r0, _0808EA8C @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808EA80:
add sp, 0x4
pop {r4,r5}
@@ -6080,14 +6080,14 @@ _0808EAA8:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _0808EAE0
_0808EAC6:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0808EAE0
@@ -6097,7 +6097,7 @@ _0808EAC6:
movs r0, 0x2
strb r0, [r1, 0x2]
ldr r0, _0808EAEC @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808EAE0:
add sp, 0x4
pop {r4,r5}
@@ -6130,14 +6130,14 @@ _0808EB08:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r5]
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _0808EB40
_0808EB26:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -6147,7 +6147,7 @@ _0808EB26:
ldr r0, [r5]
strb r4, [r0, 0x2]
ldr r0, _0808EB4C @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808EB40:
add sp, 0x4
pop {r4,r5}
@@ -6179,14 +6179,14 @@ _0808EB68:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
b _0808EB9E
_0808EB82:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0808EB9E
@@ -6197,7 +6197,7 @@ _0808EB82:
movs r0, 0x3
strb r0, [r1, 0x2]
ldr r0, _0808EBAC @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808EB9E:
add sp, 0x4
pop {r4}
@@ -6255,7 +6255,7 @@ _0808EC08:
cmp r0, 0
beq _0808EC20
ldr r0, _0808EC1C @ =sub_808E564
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808ECD0
.align 2, 0
_0808EC1C: .4byte sub_808E564
@@ -6302,7 +6302,7 @@ _0808EC6E:
_0808EC72:
bl sub_808FD20
ldr r0, _0808EC80 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808ECD0
.align 2, 0
_0808EC80: .4byte sub_808D2BC
@@ -6332,14 +6332,14 @@ _0808ECAC:
cmp r4, 0
bne _0808ECD0
bl sub_808FF70
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r1, _0808ECD8 @ =gUnknown_2024029
strb r0, [r1]
ldr r0, _0808ECDC @ =gUnknown_20397B0
ldr r0, [r0]
strb r4, [r0, 0x2]
ldr r0, _0808ECE0 @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808ECD0:
pop {r4}
pop {r0}
@@ -6397,7 +6397,7 @@ _0808ED3C:
cmp r0, 0
beq _0808ED54
ldr r0, _0808ED50 @ =sub_808E564
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808EE04
.align 2, 0
_0808ED50: .4byte sub_808E564
@@ -6445,7 +6445,7 @@ _0808EDA2:
_0808EDA8:
bl sub_808FD20
ldr r0, _0808EDB4 @ =sub_808D2BC
- bl sub_808CFF8
+ bl add_to_c3_somehow
b _0808EE04
.align 2, 0
_0808EDB4: .4byte sub_808D2BC
@@ -6475,14 +6475,14 @@ _0808EDE0:
cmp r4, 0
bne _0808EE04
bl sub_808FF70
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r1, _0808EE0C @ =gUnknown_2024029
strb r0, [r1]
ldr r0, _0808EE10 @ =gUnknown_20397B0
ldr r0, [r0]
strb r4, [r0, 0x2]
ldr r0, _0808EE14 @ =sub_808EE18
- bl sub_808CFF8
+ bl add_to_c3_somehow
_0808EE04:
pop {r4}
pop {r0}
@@ -6534,7 +6534,7 @@ _0808EE50:
_0808EE62:
bl sub_808EF68
ldr r0, _0808EE74 @ =sub_808C7B4
- bl sub_8000544
+ bl SetMainCallback2
b _0808EEF6
.align 2, 0
_0808EE70: .4byte gUnknown_20397BA
@@ -6570,10 +6570,10 @@ _0808EEB4: .4byte 0x0000217a
_0808EEB8: .4byte sub_808CE60
_0808EEBC:
bl sub_808EF68
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
str r0, [sp]
@@ -6594,7 +6594,7 @@ _0808EEE8:
bl sub_8107DB4
_0808EEF6:
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
add sp, 0x8
pop {r3}
mov r8, r3
@@ -6638,7 +6638,7 @@ _0808EF4C:
adds r0, r1, 0
movs r1, 0xC
mov r2, sp
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
_0808EF56:
mov r0, sp
ldrh r0, [r0]
@@ -6657,7 +6657,7 @@ sub_808EF68: @ 808EF68
bl sub_80950A4
ldr r4, _0808EF88 @ =gUnknown_20397B0
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
bl sub_8003ECC
@@ -6674,7 +6674,7 @@ sub_808EF8C: @ 808EF8C
sub sp, 0x4
ldr r1, _0808EFB8 @ =0x00001f0f
movs r0, 0xE
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0808EFBC @ =gUnknown_83CE438
movs r0, 0
str r0, [sp]
@@ -6701,11 +6701,11 @@ sub_808EFC8: @ 808EFC8
movs r0, 0x3
movs r1, 0x80
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0x80
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_808EFC8
@@ -6734,11 +6734,11 @@ sub_808EFE4: @ 808EFE4
ldr r1, [r5]
adds r1, r4
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -6775,7 +6775,7 @@ _0808F062:
sub_808F068: @ 808F068
push {lr}
ldr r0, _0808F074 @ =gUnknown_83CEA60
- bl sub_8008928
+ bl LoadSpritePalette
pop {r0}
bx r0
.align 2, 0
@@ -6788,15 +6788,15 @@ sub_808F078: @ 808F078
ldr r0, _0808F0B0 @ =gUnknown_8E9C3F8
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808F0B4 @ =gUnknown_8E9C418
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808F0B8 @ =gUnknown_83CEA10
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808F0BC @ =gUnknown_20397B0
ldr r0, [r0]
ldrb r0, [r0, 0x1]
@@ -6805,7 +6805,7 @@ sub_808F078: @ 808F078
ldr r0, _0808F0C0 @ =gUnknown_83CE738
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0808F0CE
.align 2, 0
_0808F0B0: .4byte gUnknown_8E9C3F8
@@ -6817,11 +6817,11 @@ _0808F0C4:
ldr r0, _0808F0EC @ =gUnknown_83CE758
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0808F0CE:
ldr r1, _0808F0F0 @ =0x00001e05
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
bl sub_808F2BC
bl sub_808F0F4
bl sub_808F164
@@ -6868,7 +6868,7 @@ sub_808F0F4: @ 808F0F4
movs r0, 0x96
strh r0, [r1, 0x22]
movs r0, 0x10
- bl sub_8008804
+ bl GetSpriteTileStartByTag
ldr r1, [r4]
ldr r2, _0808F15C @ =0x00000d9c
adds r1, r2
@@ -6897,7 +6897,7 @@ sub_808F164: @ 808F164
str r0, [sp]
str r1, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
movs r4, 0
_0808F17A:
lsls r1, r4, 6
@@ -6908,7 +6908,7 @@ _0808F17A:
ldr r0, _0808F1C0 @ =gUnknown_83CEBD8
movs r2, 0x9
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _0808F1C4 @ =gUnknown_20397B0
@@ -6956,15 +6956,15 @@ sub_808F1D0: @ 808F1D0
bl sub_808F49C
bl sub_808F5E8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r0}
bx r0
.align 2, 0
_0808F1FC: .4byte gUnknown_20397B0
thumb_func_end sub_808F1D0
- thumb_func_start sub_808F200
-sub_808F200: @ 808F200
+ thumb_func_start BoxSetMosaic
+BoxSetMosaic: @ 808F200
push {lr}
bl sub_808F1D0
ldr r3, _0808F24C @ =gUnknown_20397B0
@@ -6998,7 +6998,7 @@ sub_808F200: @ 808F200
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
- bl sub_8000A38
+ bl SetGpuReg
_0808F248:
pop {r0}
bx r0
@@ -7006,7 +7006,7 @@ _0808F248:
_0808F24C: .4byte gUnknown_20397B0
_0808F250: .4byte 0x00002238
_0808F254: .4byte sub_808F274
- thumb_func_end sub_808F200
+ thumb_func_end BoxSetMosaic
thumb_func_start sub_808F258
sub_808F258: @ 808F258
@@ -7045,7 +7045,7 @@ _0808F28A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x4C
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x2E
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -7128,13 +7128,13 @@ _0808F310:
movs r1, 0
str r1, [r0]
adds r0, r3, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _0808F3C8
adds r0, r7, 0
- bl sub_8008928
+ bl LoadSpritePalette
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
@@ -7185,7 +7185,7 @@ _0808F3B4:
movs r1, 0x28
movs r2, 0x30
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -7199,9 +7199,9 @@ _0808F3C8:
cmp r0, 0
bne _0808F3E2
movs r0, 0x2
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0808F3F4 @ =0x0000dac6
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0808F3E2:
add sp, 0x28
pop {r4-r7}
@@ -7256,7 +7256,7 @@ sub_808F3F8: @ 808F3F8
ldrh r1, [r0]
adds r0, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, [r6]
adds r0, r7
ldr r1, [r0]
@@ -7297,7 +7297,7 @@ sub_808F49C: @ 808F49C
sub sp, 0xC
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r6, _0808F51C @ =gUnknown_20397B0
ldr r2, [r6]
ldrb r0, [r2, 0x1]
@@ -7487,7 +7487,7 @@ _0808F60E:
adds r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl sub_80083A4
+ bl StartSpriteAnimIfDifferent
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -7516,7 +7516,7 @@ _0808F64E:
ldr r0, [r0]
lsls r1, r4, 25
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -7526,7 +7526,7 @@ _0808F66E:
movs r0, 0
bl sub_80F7E54
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r4}
pop {r0}
@@ -7548,7 +7548,7 @@ sub_808F68C: @ 808F68C
ldr r0, _0808F70C @ =gUnknown_8E9C3D8
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r2, [r4]
adds r2, 0xB0
movs r0, 0x16
@@ -7608,7 +7608,7 @@ _0808F718:
bl sub_80F7E54
_0808F73A:
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0808F754 @ =gUnknown_20397B0
ldr r0, [r0]
ldr r1, _0808F758 @ =0x000002c7
@@ -7680,7 +7680,7 @@ sub_808F794: @ 808F794
movs r0, 0x1
bl sub_80F7E54
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x8
bl sub_8090B98
ldr r1, [r4]
@@ -7785,7 +7785,7 @@ sub_808F850: @ 808F850
movs r0, 0x1
str r0, [sp, 0x4]
movs r2, 0xA
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x8
negs r0, r0
bl sub_8090B98
@@ -7800,7 +7800,7 @@ sub_808F850: @ 808F850
cmp r0, 0x14
beq _0808F8D4
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
b _0808F8FE
.align 2, 0
@@ -7812,7 +7812,7 @@ _0808F8D4:
movs r1, 0
strb r1, [r0]
bl sub_8090C44
- bl sub_80937DC
+ bl CompactPartySlots
movs r0, 0x2
str r0, [sp]
movs r1, 0
@@ -7822,7 +7822,7 @@ _0808F8D4:
movs r0, 0x2
bl sub_80F7E54
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0808F8FC:
movs r0, 0
_0808F8FE:
@@ -7859,7 +7859,7 @@ _0808F934:
movs r0, 0x2
bl sub_80F7E54
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r0}
bx r0
@@ -7971,7 +7971,7 @@ _0808FA00:
ldr r1, _0808FA2C @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
negs r1, r0
orrs r1, r0
lsrs r1, 31
@@ -8068,7 +8068,7 @@ sub_808FAA8: @ 808FAA8
movs r0, 0x1
bl sub_80F7E54
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x4
pop {r0}
bx r0
@@ -8133,7 +8133,7 @@ _0808FB32:
ldrb r0, [r0]
cmp r0, 0
beq _0808FB4C
- bl sub_808F200
+ bl BoxSetMosaic
_0808FB4C:
ldr r1, [r4]
adds r1, r5
@@ -8161,7 +8161,7 @@ sub_808FB68: @ 808FB68
movs r1, 0xE8
lsls r1, 5
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x2
movs r2, 0xD0
@@ -8176,9 +8176,9 @@ sub_808FB68: @ 808FB68
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r0}
bx r0
@@ -8260,7 +8260,7 @@ _0808FC40:
ldr r2, _0808FC5C @ =0x00000d61
adds r1, r2
_0808FC4C:
- bl sub_8008D84
+ bl StringCopy
adds r2, r0, 0
b _0808FC62
.align 2, 0
@@ -8295,7 +8295,7 @@ _0808FC7C:
bl sub_813CCC8
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, [r5]
adds r2, r4
movs r0, 0x2
@@ -8313,12 +8313,12 @@ _0808FC7C:
movs r2, 0xD
bl sub_8150048
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -8349,7 +8349,7 @@ sub_808FCE8: @ 808FCE8
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
add sp, 0xC
pop {r4}
pop {r0}
@@ -8365,7 +8365,7 @@ sub_808FD20: @ 808FD20
movs r1, 0
bl sub_810F4D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r0}
bx r0
thumb_func_end sub_808FD20
@@ -8531,21 +8531,21 @@ sub_808FE54: @ 808FE54
ldr r1, _0808FE98 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
b _0808FEB2
.align 2, 0
_0808FE90: .4byte gUnknown_20397B0
_0808FE94: .4byte gUnknown_20397B4
_0808FE98: .4byte gUnknown_2024284
_0808FE9C:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r6, r0, 24
bl sub_8094CC8
lsls r0, 24
lsrs r0, 24
movs r1, 0x41
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
_0808FEB2:
lsls r0, 16
lsrs r3, r0, 16
@@ -8660,7 +8660,7 @@ _0808FF6A:
sub_808FF70: @ 808FF70
push {r4,lr}
ldr r4, _0808FFA0 @ =gUnknown_20397B8
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldrb r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -8669,7 +8669,7 @@ sub_808FF70: @ 808FF70
ldr r0, _0808FFA4 @ =0x00000843
bl sub_806E6A8
ldr r4, _0808FFA8 @ =0x00004037
- bl sub_808B9F4
+ bl StorageGetCurrentBox
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -8795,12 +8795,12 @@ sub_8090070: @ 8090070
ldr r4, _080900C8 @ =0x000020a0
adds r0, r4
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
ldr r0, [r5]
adds r0, r4
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -8855,7 +8855,7 @@ _080900F4:
mov r0, r9
adds r1, r6, 0
movs r2, 0x41
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -8863,7 +8863,7 @@ _080900F4:
mov r0, r9
adds r1, r6, 0
movs r2, 0
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
adds r1, r0, 0
lsls r2, r5, 1
adds r2, r5
@@ -8941,7 +8941,7 @@ _080901A2:
mov r0, r9
adds r1, r6, 0
movs r2, 0xC
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _080901C8
ldr r0, _080901E4 @ =gUnknown_20397B0
@@ -8986,7 +8986,7 @@ sub_80901EC: @ 80901EC
lsrs r7, r0, 24
adds r0, r7, 0
movs r1, 0x41
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -9019,7 +9019,7 @@ sub_80901EC: @ 80901EC
lsrs r4, 16
adds r0, r7, 0
movs r1, 0
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
adds r1, r0, 0
movs r0, 0x2
str r0, [sp]
@@ -9392,7 +9392,7 @@ _080904A0:
ldrb r0, [r0]
adds r1, r5, 0
movs r2, 0xC
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
bne _08090530
mov r2, r10
@@ -9735,7 +9735,7 @@ _080907AE:
adds r0, r6, 0
adds r1, r4, 0
movs r2, 0x41
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
mov r2, r9
ldr r1, [r2]
lsls r2, r5, 1
@@ -9749,7 +9749,7 @@ _080907AE:
adds r0, r6, 0
adds r1, r4, 0
movs r2, 0
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
mov r2, r9
ldr r1, [r2]
lsls r2, r5, 2
@@ -9857,12 +9857,12 @@ sub_809088C: @ 809088C
ldr r4, _0809092C @ =gUnknown_2024284
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
movs r0, 0x1
str r0, [sp]
@@ -9887,14 +9887,14 @@ _080908D2:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
beq _08090938
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
subs r0, r6, 0x1
lsls r3, r0, 1
@@ -9991,7 +9991,7 @@ _08090998:
ldr r1, _080909F0 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080909D0
ldr r0, [r7]
@@ -10875,7 +10875,7 @@ _0809102E:
ldr r0, [r0]
cmp r0, 0
beq _08091072
- bl sub_800860C
+ bl InitSpriteAffineAnim
ldr r0, [r4]
movs r3, 0xB0
lsls r3, 4
@@ -10898,7 +10898,7 @@ _0809102E:
ldr r0, [r1]
ldr r0, [r0]
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08091072:
pop {r4}
pop {r0}
@@ -10966,7 +10966,7 @@ sub_80910CC: @ 80910CC
ldrb r0, [r0, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldr r0, [r4]
movs r1, 0xB0
lsls r1, 4
@@ -11015,7 +11015,7 @@ sub_8091114: @ 8091114
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08091148:
pop {r0}
bx r0
@@ -11271,7 +11271,7 @@ sub_80912E0: @ 80912E0
ldm r0!, {r3,r5,r7}
stm r2!, {r3,r5,r7}
adds r0, r6, 0
- bl sub_8096F5C
+ bl mon_icon_convert_unown_species_id
mov r10, r0
mov r6, r10
mov r2, sp
@@ -11298,7 +11298,7 @@ sub_80912E0: @ 80912E0
asrs r2, 16
mov r0, sp
mov r3, r9
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -11358,7 +11358,7 @@ sub_80913C4: @ 80913C4
ldrh r0, [r4, 0x2E]
bl sub_8091290
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
@@ -11372,7 +11372,7 @@ sub_80913DC: @ 80913DC
lsrs r4, 24
ldr r0, _08091404 @ =sub_8091420
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08091408 @ =gUnknown_3005090
@@ -11393,7 +11393,7 @@ _08091408: .4byte gUnknown_3005090
sub_809140C: @ 809140C
push {lr}
ldr r0, _0809141C @ =sub_8091420
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -11449,7 +11449,7 @@ _08091460:
lsls r2, 5
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
strh r0, [r4, 0xA]
b _08091508
.align 2, 0
@@ -11459,7 +11459,7 @@ _08091494: .4byte 0x00004abc
_08091498:
movs r1, 0xA
ldrsh r0, [r4, r1]
- bl sub_8000FE8
+ bl CheckForSpaceForDma3Request
lsls r0, 16
asrs r0, 16
movs r1, 0x1
@@ -11471,9 +11471,9 @@ _08091498:
ldr r2, _080914C8 @ =0x00004abc
adds r1, r2
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _08091508
.align 2, 0
_080914C4: .4byte gUnknown_20397B0
@@ -11494,13 +11494,13 @@ _080914D6:
bl sub_80900D4
ldr r1, _080914F8 @ =0x00005b0a
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
b _08091508
.align 2, 0
_080914F8: .4byte 0x00005b0a
_080914FC:
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
b _08091508
_08091504:
movs r0, 0
@@ -11758,7 +11758,7 @@ sub_80916F4: @ 80916F4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r1, r0, 24
movs r2, 0
@@ -11795,7 +11795,7 @@ sub_8091730: @ 8091730
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -11853,7 +11853,7 @@ _080917A0:
movs r1, 0x1
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
ldr r2, _080917C4 @ =0x00000a62
adds r1, r2
@@ -11862,11 +11862,11 @@ _080917A0:
_080917C0: .4byte 0x0000ffff
_080917C4: .4byte 0x00000a62
_080917C8:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _08091844
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -11888,7 +11888,7 @@ _080917E2:
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
ldr r2, _08091818 @ =0x00000a62
adds r1, r2
@@ -11898,7 +11898,7 @@ _08091810: .4byte gUnknown_20397B0
_08091814: .4byte 0x0000ffff
_08091818: .4byte 0x00000a62
_0809181C:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _08091844
@@ -12013,7 +12013,7 @@ _08091896:
adds r1, r3
lsrs r1, 16
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
b _08091938
.align 2, 0
_08091904: .4byte gUnknown_20397B0
@@ -12048,7 +12048,7 @@ _08091938:
movs r2, 0
bl sub_80F696C
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -12062,7 +12062,7 @@ _08091968: .4byte gUnknown_20397B0
thumb_func_start sub_809196C
sub_809196C: @ 809196C
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -12121,7 +12121,7 @@ sub_8091984: @ 8091984
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_800226C
+ bl CopyRectToBgTilemapBufferRect
cmp r7, 0
beq _08091A16
cmp r7, 0
@@ -12150,7 +12150,7 @@ _080919FA:
movs r0, 0x2
movs r1, 0
movs r3, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_08091A16:
add sp, 0x24
pop {r4-r7}
@@ -12282,7 +12282,7 @@ sub_8091A94: @ 8091A94
adds r4, r1
strh r0, [r4]
add r0, sp, 0x8
- bl sub_8008974
+ bl LoadSpritePalettes
mov r2, r10
ldr r0, [r2]
movs r6, 0xE7
@@ -12292,7 +12292,7 @@ sub_8091A94: @ 8091A94
lsls r1, 2
str r1, [r0]
adds r0, r7, 0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
mov r4, r10
@@ -12314,7 +12314,7 @@ sub_8091A94: @ 8091A94
orrs r0, r1
str r0, [r3]
adds r0, r7, 0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
mov r1, r10
@@ -12332,12 +12332,12 @@ sub_8091A94: @ 8091A94
ldr r5, _08091C3C @ =0x000021a8
adds r4, r5
mov r0, r8
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x8
- bl sub_8009230
+ bl StringCopyPadded
mov r4, r10
ldr r0, [r4]
adds r5, r0, r5
@@ -12355,9 +12355,9 @@ sub_8091A94: @ 8091A94
movs r3, 0
bl sub_808BEB4
ldr r0, [sp, 0x30]
- bl sub_80086DC
+ bl LoadSpriteSheet
mov r0, r8
- bl sub_808BD6C
+ bl GetBoxNamePtr
bl sub_8091F60
movs r4, 0
lsls r0, 16
@@ -12370,7 +12370,7 @@ _08091BBC:
ldr r0, _08091C40 @ =gUnknown_83D2B7C
movs r2, 0x1C
movs r3, 0x18
- bl sub_8006F8C
+ bl CreateSprite
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -12389,7 +12389,7 @@ _08091BBC:
str r0, [r2]
lsls r1, r4, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -12518,12 +12518,12 @@ _08091CFC:
ldr r5, _08091E20 @ =0x000021a8
adds r4, r5
ldr r0, [sp, 0x2C]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x8
- bl sub_8009230
+ bl StringCopyPadded
mov r3, r8
ldr r0, [r3]
adds r5, r0, r5
@@ -12541,7 +12541,7 @@ _08091CFC:
movs r3, 0
bl sub_808BEB4
adds r0, r6, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, [sp, 0x2C]
bl sub_808BD94
lsls r0, 24
@@ -12550,9 +12550,9 @@ _08091CFC:
adds r0, r1
mov r1, r9
movs r2, 0x4
- bl sub_80703EC
+ bl LoadPalette
ldr r0, [sp, 0x2C]
- bl sub_808BD6C
+ bl GetBoxNamePtr
bl sub_8091F60
lsls r0, 16
mov r3, r10
@@ -12583,7 +12583,7 @@ _08091D82:
add r0, sp, 0x8
movs r2, 0x1C
movs r3, 0x18
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r1, r9
@@ -12618,7 +12618,7 @@ _08091D82:
str r1, [r0, 0x1C]
lsls r1, r7, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
mov r1, r9
ldr r0, [r1]
movs r2, 0xE4
@@ -12668,13 +12668,13 @@ sub_8091E34: @ 8091E34
cmp r0, 0
bne _08091E54
movs r0, 0x4
- bl sub_800874C
+ bl FreeSpriteTilesByTag
b _08091E5A
.align 2, 0
_08091E50: .4byte gUnknown_20397B0
_08091E54:
movs r0, 0x3
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_08091E5A:
ldr r0, _08091E7C @ =gUnknown_20397B0
ldr r0, [r0]
@@ -12756,7 +12756,7 @@ _08091ECC:
cmp r0, 0xC0
bls _08091EEA
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_08091EEA:
pop {r0}
bx r0
@@ -12765,7 +12765,7 @@ _08091EEA:
thumb_func_start sub_8091EF0
sub_8091EF0: @ 8091EF0
push {lr}
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
bl sub_808BD94
@@ -12839,7 +12839,7 @@ sub_8091F60: @ 8091F60
sub_8091F80: @ 8091F80
push {r4,r5,lr}
ldr r0, _08091FFC @ =gUnknown_83D2B54
- bl sub_80086DC
+ bl LoadSpriteSheet
movs r5, 0
_08091F8A:
lsls r1, r5, 4
@@ -12852,7 +12852,7 @@ _08091F8A:
ldr r0, _08092000 @ =gUnknown_83D2BB4
movs r2, 0x1C
movs r3, 0x16
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -12865,7 +12865,7 @@ _08091F8A:
lsls r1, r5, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x1
cmp r5, 0
bne _08091FCA
@@ -13229,7 +13229,7 @@ sub_809223C: @ 809223C
adds r1, r5, 0
adds r2, r6, 0
adds r3, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -13242,7 +13242,7 @@ sub_809223C: @ 809223C
ldr r5, _080922AC @ =gUnknown_202063C
adds r6, r4, r5
adds r0, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x3
mov r1, r8
ands r1, r0
@@ -13492,7 +13492,7 @@ sub_8092458: @ 8092458
ldr r1, _08092488 @ =gUnknown_2024284
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
b _08092496
.align 2, 0
_08092480: .4byte gUnknown_2039820
@@ -13502,7 +13502,7 @@ _0809248C:
ldr r0, _0809249C @ =gUnknown_2039821
ldrb r0, [r0]
movs r1, 0xB
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
_08092496:
lsls r0, 16
lsrs r0, 16
@@ -13963,7 +13963,7 @@ sub_80927E8: @ 80927E8
adds r0, r1, r2
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08092852
.align 2, 0
_0809282C: .4byte gUnknown_20397B0
@@ -13980,7 +13980,7 @@ _08092838:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_08092852:
ldr r0, _08092874 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -14185,7 +14185,7 @@ sub_80929B0: @ 80929B0
adds r0, r2, r3
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08092A22
.align 2, 0
_080929F4: .4byte gUnknown_2039820
@@ -14204,7 +14204,7 @@ _08092A08:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_08092A22:
bl sub_8093A10
ldr r0, _08092A3C @ =gUnknown_2039820
@@ -14314,7 +14314,7 @@ sub_8092AE4: @ 8092AE4
.align 2, 0
_08092AF4: .4byte gUnknown_2039822
_08092AF8:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x5
@@ -14511,7 +14511,7 @@ _08092C58:
adds r0, r1, r2
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
b _08092C92
_08092C68:
bl sub_8092E20
@@ -14524,7 +14524,7 @@ _08092C68:
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
bl sub_8092E80
b _08092C92
_08092C88:
@@ -14579,7 +14579,7 @@ _08092CCE:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
bl sub_8092EF4
b _08092D08
_08092CEE:
@@ -14593,7 +14593,7 @@ _08092CEE:
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08092D08:
ldr r1, [r4]
adds r1, r5
@@ -14651,7 +14651,7 @@ _08092D4A:
_08092D64: .4byte gUnknown_2039820
_08092D68: .4byte 0x00000d8d
_08092D6C:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r1, [r4]
ldr r2, _08092DA4 @ =0x00000d8d
adds r1, r2
@@ -14664,7 +14664,7 @@ _08092D76:
adds r0, r1
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r2, _08092DA4 @ =0x00000d8d
adds r0, r2
@@ -14692,14 +14692,14 @@ _08092DB4:
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r2, _08092DEC @ =0x00000d8d
adds r0, r2
ldrb r0, [r0]
ldr r1, _08092DF0 @ =gUnknown_2039821
ldrb r1, [r1]
- bl sub_8093058
+ bl diegohint1
ldr r1, [r4]
adds r1, r5
_08092DE2:
@@ -14830,7 +14830,7 @@ _08092EB0:
ldrb r0, [r0]
cmp r0, 0
bne _08092ED6
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
ldr r4, _08092EEC @ =gUnknown_2039821
@@ -14868,7 +14868,7 @@ sub_8092EF4: @ 8092EF4
ldr r4, _08092F20 @ =gUnknown_2039821
ldrb r1, [r4]
movs r0, 0xE
- bl sub_8092FD4
+ bl diegohint2
ldrb r1, [r4]
movs r0, 0xE
bl sub_8090D58
@@ -14877,14 +14877,14 @@ sub_8092EF4: @ 8092EF4
_08092F1C: .4byte gUnknown_2039820
_08092F20: .4byte gUnknown_2039821
_08092F24:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r5, _08092F4C @ =gUnknown_2039821
ldrb r1, [r5]
adds r0, r4, 0
- bl sub_8092FD4
+ bl diegohint2
ldrb r1, [r5]
adds r0, r4, 0
bl sub_8090D58
@@ -14963,8 +14963,8 @@ _08092FCC: .4byte gUnknown_2039823
_08092FD0: .4byte gUnknown_2039824
thumb_func_end sub_8092F60
- thumb_func_start sub_8092FD4
-sub_8092FD4: @ 8092FD4
+ thumb_func_start diegohint2
+diegohint2: @ 8092FD4
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -14992,12 +14992,12 @@ _08093008:
ldr r0, [r5]
ldr r4, _0809302C @ =0x000020a0
adds r0, r4
- bl sub_80442E4
+ bl BoxMonRestorePP
ldr r2, [r5]
adds r2, r4
adds r0, r6, 0
adds r1, r7, 0
- bl sub_808BBB4
+ bl CopyBoxMonFromAnyBox
_08093020:
pop {r4-r7}
pop {r0}
@@ -15005,7 +15005,7 @@ _08093020:
.align 2, 0
_08093028: .4byte gUnknown_20397B0
_0809302C: .4byte 0x000020a0
- thumb_func_end sub_8092FD4
+ thumb_func_end diegohint2
thumb_func_start sub_8093030
sub_8093030: @ 8093030
@@ -15020,7 +15020,7 @@ sub_8093030: @ 8093030
muls r0, r1
ldr r1, _0809304C @ =gUnknown_2024284
adds r0, r1
- bl sub_803D994
+ bl ZeroMonData
b _08093054
.align 2, 0
_0809304C: .4byte gUnknown_2024284
@@ -15031,8 +15031,8 @@ _08093054:
bx r0
thumb_func_end sub_8093030
- thumb_func_start sub_8093058
-sub_8093058: @ 8093058
+ thumb_func_start diegohint1
+diegohint1: @ 8093058
push {r4-r7,lr}
lsls r0, 24
lsrs r6, r0, 24
@@ -15066,7 +15066,7 @@ _0809308C:
_0809309C:
adds r0, r6, 0
adds r1, r7, 0
- bl sub_8092FD4
+ bl diegohint2
ldr r5, _080930D0 @ =gUnknown_20397B0
ldr r1, [r5]
ldr r4, _080930D8 @ =0x000020a0
@@ -15092,7 +15092,7 @@ _080930D4: .4byte 0x00002104
_080930D8: .4byte 0x000020a0
_080930DC: .4byte gUnknown_2039823
_080930E0: .4byte gUnknown_2039824
- thumb_func_end sub_8093058
+ thumb_func_end diegohint1
thumb_func_start sub_80930E4
sub_80930E4: @ 80930E4
@@ -15100,7 +15100,7 @@ sub_80930E4: @ 80930E4
lsls r0, 24
lsrs r6, r0, 24
adds r0, r6, 0
- bl sub_808C108
+ bl GetFirstFreeBoxSpot
lsls r0, 16
lsrs r4, r0, 16
asrs r0, 16
@@ -15118,7 +15118,7 @@ _08093102:
lsls r4, 24
lsrs r1, r4, 24
adds r0, r6, 0
- bl sub_8092FD4
+ bl diegohint2
bl sub_8090B6C
movs r0, 0
strb r0, [r5]
@@ -15133,11 +15133,11 @@ _08093124:
lsls r4, 24
lsrs r1, r4, 24
adds r0, r6, 0
- bl sub_8092FD4
+ bl diegohint2
ldrb r0, [r5]
bl sub_8090C10
_0809313E:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -15152,7 +15152,7 @@ _08093150:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x1
_08093164:
pop {r4-r6}
@@ -15173,7 +15173,7 @@ sub_8093174: @ 8093174
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
bl sub_8093A10
pop {r0}
bx r0
@@ -15212,7 +15212,7 @@ _080931B8:
adds r0, r1, r2
ldr r2, _080931E8 @ =0x00000cea
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
pop {r0}
bx r0
.align 2, 0
@@ -15240,7 +15240,7 @@ _080931FC:
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
_08093210:
pop {r1}
@@ -15274,7 +15274,7 @@ _08093230:
.align 2, 0
_08093240: .4byte gUnknown_2039820
_08093244:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r2, r0, 24
_0809324C:
@@ -15304,7 +15304,7 @@ sub_8093264: @ 8093264
adds r0, r1
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
_08093280:
pop {r0}
bx r0
@@ -15380,7 +15380,7 @@ _08093318: .4byte gUnknown_2024284
_0809331C: .4byte gUnknown_2039821
_08093320: .4byte 0x0000216e
_08093324:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
ldr r1, _080933BC @ =gUnknown_2039821
@@ -15390,7 +15390,7 @@ _08093324:
ldr r3, _080933C4 @ =0x00002104
adds r2, r3
bl sub_808BCF0
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r1, [r4]
ldr r2, _080933C8 @ =0x0000216e
adds r1, r2
@@ -15430,7 +15430,7 @@ _08093354:
ldr r3, _080933C4 @ =0x00002104
adds r0, r3
movs r1, 0x51
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r3, r0, 16
ldr r1, [r6]
@@ -15555,7 +15555,7 @@ _08093488:
ldr r1, _08093508 @ =0x00002172
adds r2, r1
movs r1, 0x51
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
movs r0, 0x1
@@ -15649,7 +15649,7 @@ _08093544:
adds r2, 0x5
adds r3, r2
movs r2, 0x51
- bl sub_808BB6C
+ bl GetAndCopyBoxMonDataFromAnyBox
lsls r0, 16
lsrs r4, r0, 16
cmp r4, 0
@@ -15876,7 +15876,7 @@ _08093708:
ldr r2, _08093758 @ =0x00002179
adds r1, r2
strb r0, [r1]
- bl sub_808C1F8
+ bl CountPartyMons
ldr r1, [r4]
subs r0, 0x1
ldr r2, _0809375C @ =0x00002178
@@ -15897,11 +15897,11 @@ _08093758: .4byte 0x00002179
_0809375C: .4byte 0x00002178
_08093760: .4byte 0x0000217a
_08093764:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_808BD30
+ bl GetBoxedMonPtr
ldr r3, _080937A0 @ =gUnknown_20397B0
ldr r2, [r3]
ldr r4, _080937A4 @ =0x0000217c
@@ -15957,8 +15957,8 @@ _080937D0:
_080937D8: .4byte gUnknown_2039821
thumb_func_end sub_80937B4
- thumb_func_start sub_80937DC
-sub_80937DC: @ 80937DC
+ thumb_func_start CompactPartySlots
+CompactPartySlots: @ 80937DC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -15980,7 +15980,7 @@ _080937F8:
adds r4, r0, r1
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
cmp r0, 0
beq _08093830
@@ -16021,7 +16021,7 @@ _0809384E:
adds r0, r5, 0
muls r0, r6
adds r0, r4
- bl sub_803D994
+ bl ZeroMonData
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -16038,7 +16038,7 @@ _08093862:
bx r1
.align 2, 0
_08093874: .4byte gUnknown_2024284
- thumb_func_end sub_80937DC
+ thumb_func_end CompactPartySlots
thumb_func_start sub_8093878
sub_8093878: @ 8093878
@@ -16094,7 +16094,7 @@ _080938D8:
ldrb r0, [r0]
movs r1, 0x8
mov r2, sp
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
_080938EC:
add sp, 0x4
pop {r4}
@@ -16121,7 +16121,7 @@ sub_8093900: @ 8093900
bne _08093934
ldr r0, _08093930 @ =gUnknown_2039821
ldrb r0, [r0]
- bl sub_808C184
+ bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
cmp r0, 0
bne _08093934
@@ -16153,7 +16153,7 @@ sub_809393C: @ 809393C
bne _0809397C
ldr r0, _08093988 @ =gUnknown_2039821
ldrb r0, [r0]
- bl sub_808C184
+ bl CountPartyAliveNonEggMonsExcept
lsls r0, 24
cmp r0, 0
bne _0809397C
@@ -16167,7 +16167,7 @@ sub_809393C: @ 809393C
ldr r2, _08093994 @ =0x000020a0
adds r0, r1, r2
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08093998
_0809397C:
@@ -16321,12 +16321,12 @@ _08093A80:
bl sub_8093AD0
b _08093AA0
_08093A8A:
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
ldr r1, _08093AA8 @ =gUnknown_2039821
ldrb r1, [r1]
- bl sub_808BD30
+ bl GetBoxedMonPtr
movs r1, 0x1
bl sub_8093AD0
_08093AA0:
@@ -16383,7 +16383,7 @@ sub_8093AD0: @ 8093AD0
adds r6, r4, 0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
mov r2, r8
ldr r1, [r2]
movs r3, 0xCE
@@ -16397,7 +16397,7 @@ sub_8093AD0: @ 8093AD0
_08093B16:
adds r0, r4, 0
movs r1, 0x4
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -16417,7 +16417,7 @@ _08093B40: .4byte 0x00000ce9
_08093B44:
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
mov r3, r8
ldr r1, [r3]
ldr r2, _08093BCC @ =0x00000ce9
@@ -16430,45 +16430,45 @@ _08093B56:
adds r2, r5
adds r0, r6, 0
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [r4]
adds r0, r5
- bl sub_8008D28
+ bl StringGetEnd10
adds r0, r6, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r3, _08093BD8 @ =0x00000ce8
adds r1, r3
strb r0, [r1]
adds r0, r6, 0
movs r1, 0x8
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r2, _08093BDC @ =0x00000ce7
adds r1, r2
strb r0, [r1]
adds r0, r6, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r3, _08093BE0 @ =0x00000cdc
adds r1, r3
str r0, [r1]
adds r0, r6, 0
- bl sub_80440BC
+ bl GetMonFrontSpritePal
ldr r1, [r4]
ldr r2, _08093BE4 @ =0x00000cd8
adds r1, r2
str r0, [r1]
adds r0, r6, 0
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
mov r9, r0
adds r0, r6, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r3, _08093BE8 @ =0x00000ce2
adds r1, r3
@@ -16491,7 +16491,7 @@ _08093BF2:
adds r7, r4, 0
adds r0, r7, 0
movs r1, 0x41
- bl sub_803FD44
+ bl GetBoxMonData
mov r2, r8
ldr r1, [r2]
movs r3, 0xCE
@@ -16505,11 +16505,11 @@ _08093BF2:
_08093C10:
adds r0, r7, 0
movs r1, 0x1
- bl sub_803FD44
+ bl GetBoxMonData
mov r9, r0
adds r0, r7, 0
movs r1, 0x4
- bl sub_803FD44
+ bl GetBoxMonData
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -16526,7 +16526,7 @@ _08093C38: .4byte 0x00000ce9
_08093C3C:
adds r0, r7, 0
movs r1, 0x2D
- bl sub_803FD44
+ bl GetBoxMonData
mov r3, r8
ldr r1, [r3]
ldr r2, _08093CD0 @ =0x00000ce9
@@ -16539,26 +16539,26 @@ _08093C4E:
adds r2, r4
adds r0, r7, 0
movs r1, 0x2
- bl sub_803FD44
+ bl GetBoxMonData
ldr r0, [r5]
adds r0, r4
- bl sub_8008D28
+ bl StringGetEnd10
adds r0, r7, 0
- bl sub_803E830
+ bl GetLevelFromBoxMonExp
ldr r1, [r5]
ldr r3, _08093CDC @ =0x00000ce8
adds r1, r3
strb r0, [r1]
adds r0, r7, 0
movs r1, 0x8
- bl sub_803FD44
+ bl GetBoxMonData
ldr r1, [r5]
ldr r2, _08093CE0 @ =0x00000ce7
adds r1, r2
strb r0, [r1]
adds r0, r7, 0
movs r1, 0
- bl sub_803FD44
+ bl GetBoxMonData
adds r2, r0, 0
ldr r1, [r5]
ldr r6, _08093CE4 @ =0x00000cdc
@@ -16568,7 +16568,7 @@ _08093C4E:
adds r1, r4
ldrh r0, [r1]
mov r1, r9
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
ldr r1, [r5]
ldr r3, _08093CE8 @ =0x00000cd8
adds r2, r1, r3
@@ -16577,13 +16577,13 @@ _08093C4E:
ldrh r0, [r4]
adds r1, r6
ldr r1, [r1]
- bl sub_803F78C
+ bl GetGenderFromSpeciesAndPersonality
lsls r0, 24
lsrs r0, 24
mov r9, r0
adds r0, r7, 0
movs r1, 0xC
- bl sub_803FD44
+ bl GetBoxMonData
ldr r1, [r5]
ldr r2, _08093CEC @ =0x00000ce2
adds r1, r2
@@ -16621,25 +16621,25 @@ _08093D0C:
adds r0, r3
movs r1, 0
movs r2, 0x5
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r1, _08093D58 @ =0x00000cf5
adds r0, r1
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r2, _08093D5C @ =0x00000d19
adds r0, r2
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r3, _08093D60 @ =0x00000d3d
adds r0, r3
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r1, _08093D64 @ =0x00000d61
adds r0, r1
@@ -16666,7 +16666,7 @@ _08093D68:
adds r1, r3
movs r2, 0
movs r3, 0x5
- bl sub_8009230
+ bl StringCopyPadded
b _08093DA2
.align 2, 0
_08093D8C: .4byte 0x00000ce9
@@ -16677,7 +16677,7 @@ _08093D94:
ldr r1, _08093DD4 @ =gUnknown_8415A62
movs r2, 0
movs r3, 0x8
- bl sub_8009230
+ bl StringCopyPadded
_08093DA2:
ldr r4, _08093DD8 @ =gUnknown_20397B0
ldr r0, [r4]
@@ -16685,20 +16685,20 @@ _08093DA2:
adds r0, r3
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r1, _08093DE0 @ =0x00000d3d
adds r0, r1
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
ldr r0, [r4]
ldr r2, _08093DE4 @ =0x00000d61
adds r0, r2
_08093DC6:
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
b _08093F84
.align 2, 0
_08093DD0: .4byte 0x00000cf5
@@ -16724,7 +16724,7 @@ _08093DF4:
adds r1, r3
movs r2, 0
movs r3, 0x5
- bl sub_8009230
+ bl StringCopyPadded
ldr r1, [r4]
ldr r0, _08093E84 @ =0x00000d19
adds r2, r1, r0
@@ -16744,7 +16744,7 @@ _08093DF4:
adds r0, r2, 0
movs r2, 0
movs r3, 0x5
- bl sub_8009230
+ bl StringCopyPadded
ldr r4, [r4]
ldr r3, _08093E90 @ =0x00000d3d
adds r2, r4, r3
@@ -16876,12 +16876,12 @@ _08093EF2:
beq _08093F78
ldr r3, _08093F74 @ =0x00000d61
adds r4, r3
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
movs r2, 0
movs r3, 0x8
- bl sub_8009230
+ bl StringCopyPadded
b _08093F84
.align 2, 0
_08093F60: .4byte 0x00000d41
@@ -16895,7 +16895,7 @@ _08093F78:
adds r0, r4, r1
movs r1, 0
movs r2, 0x8
- bl sub_8009204
+ bl StringFill
_08093F84:
pop {r3-r5}
mov r8, r3
@@ -17369,7 +17369,7 @@ _080942F4:
adds r1, r0
movs r0, 0x2
strb r0, [r1]
- bl sub_808B9F4
+ bl StorageGetCurrentBox
ldr r1, _08094340 @ =gUnknown_2039823
strb r0, [r1]
movs r0, 0x17
@@ -18402,18 +18402,18 @@ sub_8094AD8: @ 8094AD8
ldr r0, [r0]
str r0, [r1]
mov r0, sp
- bl sub_8008720
+ bl LoadSpriteSheets
adds r0, r4, 0
- bl sub_8008974
+ bl LoadSpritePalettes
ldr r0, _08094BAC @ =0x0000daca
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
ldr r6, _08094BB0 @ =gUnknown_20397B0
ldr r1, [r6]
ldr r4, _08094BB4 @ =0x00000cd4
adds r1, r4
strb r0, [r1]
ldr r0, _08094BB8 @ =0x0000dac7
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
ldr r1, [r6]
ldr r5, _08094BBC @ =0x00000cd5
adds r1, r5
@@ -18434,7 +18434,7 @@ sub_8094AD8: @ 8094AD8
movs r3, 0
ldrsh r2, [r5, r3]
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -18479,7 +18479,7 @@ sub_8094AD8: @ 8094AD8
adds r0, r4
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
b _08094BE4
.align 2, 0
_08094BA4: .4byte gUnknown_83D34A0
@@ -18521,7 +18521,7 @@ _08094C00:
ldr r0, _08094C54 @ =gUnknown_83D3524
movs r1, 0
movs r2, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
cmp r0, 0x40
@@ -18674,7 +18674,7 @@ sub_8094D14: @ 8094D14
lsls r2, 4
adds r0, r2
ldr r0, [r0]
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -18810,7 +18810,7 @@ sub_8094DEC: @ 8094DEC
ldr r0, [r0]
str r0, [r1]
str r3, [r1, 0x4]
- bl sub_8008E08
+ bl StringLength
lsls r0, 24
lsrs r1, r0, 24
ldr r0, [r4]
@@ -18924,14 +18924,14 @@ sub_8094E88: @ 8094E88
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0
movs r2, 0xB
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r2, [r5]
adds r0, r2, r4
ldrb r0, [r0]
@@ -18948,7 +18948,7 @@ sub_8094E88: @ 8094E88
movs r1, 0x1
movs r2, 0x8
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
ldr r1, [r5]
adds r4, r1, r4
ldrb r0, [r4]
@@ -18963,7 +18963,7 @@ sub_8094E88: @ 8094E88
movs r3, 0x2
bl sub_810F7D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, [r5]
ldr r3, _08094F8C @ =0x00000caa
adds r0, r3
@@ -19023,7 +19023,7 @@ _08094FB6:
bl sub_80722CC
movs r0, 0x1
negs r0, r0
- bl sub_810F904
+ bl MoveMenuCursor
b _08094FF2
.align 2, 0
_08094FD0: .4byte gUnknown_30030F0
@@ -19035,7 +19035,7 @@ _08094FD4:
movs r0, 0x5
bl sub_80722CC
movs r0, 0x1
- bl sub_810F904
+ bl MoveMenuCursor
b _08094FF2
_08094FEA:
bl sub_810F98C
@@ -19095,12 +19095,12 @@ sub_8095050: @ 8095050
push {r4,lr}
ldr r4, _08095088 @ =gUnknown_2039828
ldr r0, _0809508C @ =0x00000974
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0809509C
ldr r0, _08095090 @ =gUnknown_83D35D4
- bl sub_8005038
+ bl AddWindow8Bit
adds r1, r0, 0
ldr r0, _08095094 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -19114,7 +19114,7 @@ sub_8095050: @ 8095050
lsls r0, r1, 24
lsrs r0, 24
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
b _0809509E
.align 2, 0
@@ -19138,7 +19138,7 @@ sub_80950A4: @ 80950A4
ldr r0, [r0]
cmp r0, 0
beq _080950B2
- bl sub_8002BC4
+ bl Free
_080950B2:
pop {r0}
bx r0
@@ -19233,7 +19233,7 @@ _08095154:
b _08095228
_0809515A:
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x80
bl sub_8097198
b _080951F8
@@ -19251,11 +19251,11 @@ _08095168:
movs r0, 0
adds r1, r4, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
adds r1, r4, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -19263,14 +19263,14 @@ _08095168:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r5, _08095208 @ =gUnknown_20397B0
ldr r0, [r5]
ldr r4, _0809520C @ =0x000021f0
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_8005140
+ bl FillWindowPixelBuffer8Bit
ldr r1, [r6]
ldrb r0, [r1, 0x2]
ldrb r1, [r1, 0x3]
@@ -19278,26 +19278,26 @@ _08095168:
movs r0, 0
movs r1, 0x4
movs r2, 0x1
- bl sub_80019E4
+ bl SetBgAttribute
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
movs r1, 0x3
- bl sub_80052D8
+ bl CopyWindowToVram8Bit
movs r0, 0xFC
lsls r0, 6
ldr r2, _08095210 @ =0x00007fff
movs r1, 0x8
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0x2
bl sub_8094D14
movs r0, 0x8
movs r1, 0x80
- bl sub_8000AF4
+ bl SetGpuRegBits
_080951F8:
ldr r1, [r6]
ldrb r0, [r1, 0x1]
@@ -19310,12 +19310,12 @@ _08095208: .4byte gUnknown_20397B0
_0809520C: .4byte 0x000021f0
_08095210: .4byte 0x00007fff
_08095214:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08095228
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
b _0809522A
_08095228:
@@ -19348,7 +19348,7 @@ _08095250:
b _08095298
_08095256:
movs r0, 0
- bl sub_80019D0
+ bl HideBg
b _08095268
_0809525E:
bl sub_8095A58
@@ -19361,18 +19361,18 @@ _08095268:
strb r0, [r1, 0x1]
b _08095298
_08095272:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08095298
bl sub_8094D40
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
b _0809529A
_08095298:
@@ -19418,7 +19418,7 @@ _080952B8:
adds r0, r1
ldrb r0, [r0]
movs r1, 0x2
- bl sub_80052D8
+ bl CopyWindowToVram8Bit
ldr r1, [r4]
ldrb r0, [r1, 0x1]
adds r0, 0x1
@@ -19428,7 +19428,7 @@ _080952B8:
_080952F8: .4byte gUnknown_20397B0
_080952FC: .4byte 0x000021f0
_08095300:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0809530C
@@ -19576,7 +19576,7 @@ _080953FA:
movs r0, 0x1
bl sub_8092BAC
movs r0, 0
- bl sub_80019D0
+ bl HideBg
b _0809543A
_08095426:
bl sub_8092BF8
@@ -19593,18 +19593,18 @@ _0809543A:
strb r0, [r1, 0x1]
b _0809546A
_08095444:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0809546A
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
bl sub_8094D40
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
b _0809546C
_0809546A:
@@ -19940,18 +19940,18 @@ sub_80956A4: @ 80956A4
lsrs r4, 24
adds r0, r4, 0
movs r1, 0x41
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
adds r1, r0, 0
cmp r5, 0
beq _0809571A
adds r0, r5, 0
movs r2, 0x1
- bl sub_8097054
+ bl GetMonIconPtr
adds r4, r0, 0
adds r0, r5, 0
bl sub_80971F8
@@ -19979,7 +19979,7 @@ sub_80956A4: @ 80956A4
adds r1, r4, 0
movs r2, 0
movs r3, 0
- bl sub_800520C
+ bl BlitBitmapRectToWindow4BitTo8Bit
_0809571A:
add sp, 0x1C
pop {r4-r7}
@@ -20005,7 +20005,7 @@ sub_809572C: @ 809572C
lsls r0, 24
lsrs r0, 24
movs r1, 0x41
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
lsls r0, 16
cmp r0, 0
beq _0809576E
@@ -20022,7 +20022,7 @@ sub_809572C: @ 809572C
str r1, [sp]
str r1, [sp, 0x4]
movs r1, 0
- bl sub_8005180
+ bl FillWindowPixelRect8Bit
_0809576E:
add sp, 0x8
pop {r4,r5}
@@ -20056,12 +20056,12 @@ sub_8095790: @ 8095790
ldrh r1, [r1, 0xC]
movs r0, 0
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
ldr r0, [r4]
ldrh r1, [r0, 0xE]
movs r0, 0
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
ldr r1, [r4]
ldrh r0, [r1, 0x10]
subs r0, 0x1
@@ -20120,7 +20120,7 @@ _080957FE:
_08095810:
adds r0, 0x1
strb r0, [r2, 0xB]
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -20156,7 +20156,7 @@ _08095838:
_08095856:
mov r0, r10
adds r1, r5, 0
- bl sub_808BD30
+ bl GetBoxedMonPtr
adds r1, r0, 0
ldr r2, _0809589C @ =gUnknown_2039828
ldr r0, [r2]
@@ -20207,7 +20207,7 @@ sub_80958A0: @ 80958A0
ldrb r0, [r0, 0xB]
adds r1, r0
mov r9, r1
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
mov r8, r0
@@ -20304,7 +20304,7 @@ _0809595E:
ldr r0, [r2]
adds r0, r1
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _0809597C
adds r0, r5, 0
@@ -20353,7 +20353,7 @@ sub_80959A8: @ 80959A8
ldrb r0, [r0, 0xB]
adds r1, r0
str r1, [sp]
- bl sub_808B9F4
+ bl StorageGetCurrentBox
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -20391,7 +20391,7 @@ _08095A00:
ldr r0, [r1]
adds r0, r4
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08095A28
mov r0, r8
@@ -20399,7 +20399,7 @@ _08095A00:
adds r2, r4
ldr r0, [sp, 0x4]
adds r1, r6, 0
- bl sub_808BBB4
+ bl CopyBoxMonFromAnyBox
_08095A28:
adds r0, r6, 0x1
lsls r0, 24
@@ -20435,18 +20435,18 @@ sub_8095A58: @ 8095A58
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
movs r1, 0x4
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x8
movs r1, 0x80
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -20454,9 +20454,9 @@ sub_8095A58: @ 8095A58
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r0}
bx r0
@@ -20525,12 +20525,12 @@ _08095B00:
ldr r0, [r2]
adds r0, r1
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
cmp r0, 0
beq _08095B2C
adds r0, r5, 0
movs r1, 0x5
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
cmp r0, 0
beq _08095B2C
movs r0, 0
@@ -20609,10 +20609,10 @@ _08095B9C:
orrs r0, r1
str r0, [r2, 0x4]
mov r0, r9
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
mov r4, r9
ldrh r0, [r4, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
mov r5, r8
ldr r1, [r5]
lsls r5, r7, 4
@@ -20628,7 +20628,7 @@ _08095B9C:
adds r4, r7, r0
lsls r0, r4, 16
lsrs r0, 16
- bl sub_80089B8
+ bl AllocSpritePalette
mov r2, r8
ldr r1, [r2]
adds r1, r5
@@ -20649,7 +20649,7 @@ _08095B9C:
movs r1, 0
movs r2, 0
movs r3, 0xB
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r4, r8
@@ -20738,12 +20738,12 @@ _08095CB8: .4byte gUnknown_20397B0
_08095CBC:
adds r0, r7, 0
movs r1, 0x5
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
cmp r0, 0
beq _08095D36
adds r0, r7, 0
movs r1, 0xC
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
b _08095CF0
_08095CD2:
movs r0, 0x64
@@ -20753,12 +20753,12 @@ _08095CD2:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08095D36
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
_08095CF0:
lsls r0, 16
lsrs r4, r0, 16
@@ -20872,7 +20872,7 @@ sub_8095D84: @ 8095D84
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
adds r0, r5, 0
movs r1, 0x1
bl sub_8090850
@@ -20998,7 +20998,7 @@ sub_8095EA0: @ 8095EA0
bne _08095F10
adds r0, r7, 0
movs r1, 0xC
- bl sub_808BAA0
+ bl GetBoxMonDataFromSelectedBox
lsls r0, 16
lsrs r6, r0, 16
mov r0, r8
@@ -21007,7 +21007,7 @@ sub_8095EA0: @ 8095EA0
adds r2, r4
adds r0, r7, 0
movs r1, 0xC
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
mov r1, r8
ldr r0, [r1]
adds r0, r4
@@ -21023,7 +21023,7 @@ _08095F10:
adds r4, r0
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
mov r0, r8
@@ -21099,7 +21099,7 @@ sub_8095F74: @ 8095F74
adds r2, r0
adds r0, r5, 0
movs r1, 0xC
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
adds r0, r5, 0
movs r1, 0
bl sub_8090850
@@ -21169,7 +21169,7 @@ sub_8096008: @ 8096008
adds r0, r5, 0
movs r1, 0xC
mov r2, sp
- bl sub_808BAC0
+ bl SetBoxMonDataFromSelectedBox
adds r0, r5, 0
movs r1, 0x1
bl sub_8090850
@@ -21364,7 +21364,7 @@ sub_80961A8: @ 80961A8
ldr r1, _080961C0 @ =0x00002224
adds r0, r1
ldrh r0, [r0]
- bl sub_809A8BC
+ bl ItemId_GetItem
pop {r1}
bx r1
.align 2, 0
@@ -21753,7 +21753,7 @@ _08096446:
ldrh r1, [r0]
adds r0, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_08096490:
add sp, 0x4
pop {r3,r4}
@@ -21788,7 +21788,7 @@ sub_80964B8: @ 80964B8
adds r0, r1
ldr r0, [r0]
adds r1, r3, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080964DA:
pop {r0}
bx r0
@@ -22039,11 +22039,11 @@ _080966B4:
_080966BA:
adds r0, r1
ldrh r0, [r0]
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r4, r0, 0
movs r0, 0x2
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
@@ -22078,7 +22078,7 @@ sub_80966F4: @ 80966F4
lsls r3, 1
movs r0, 0
movs r2, 0x80
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0
bl sub_8096898
pop {r0}
@@ -22117,7 +22117,7 @@ _08096748:
_08096758:
movs r0, 0
movs r1, 0xA
- bl sub_8001AA8
+ bl GetBgAttribute
adds r1, r0, 0
ldr r0, _080967B8 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -22141,7 +22141,7 @@ _08096758:
str r0, [sp, 0xC]
movs r0, 0
movs r3, 0xC
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
adds r4, 0x1
cmp r4, r5
blt _08096758
@@ -22195,7 +22195,7 @@ _080967E0:
movs r1, 0
movs r2, 0x19
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_080967FC:
ldr r1, [r5]
adds r1, r4
@@ -22211,7 +22211,7 @@ _080967FC:
_08096812:
movs r0, 0
movs r1, 0xA
- bl sub_8001AA8
+ bl GetBgAttribute
adds r1, r0, 0
ldr r0, _08096890 @ =gUnknown_20397B0
ldr r0, [r0]
@@ -22235,7 +22235,7 @@ _08096812:
str r0, [sp, 0xC]
movs r0, 0
movs r3, 0xC
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
adds r4, 0x1
cmp r4, r5
blt _08096812
@@ -22253,7 +22253,7 @@ _08096852:
movs r0, 0
movs r1, 0
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, _08096890 @ =gUnknown_20397B0
ldr r0, [r0]
ldr r1, _08096894 @ =0x00002226
@@ -22293,7 +22293,7 @@ sub_8096898: @ 8096898
movs r0, 0
movs r2, 0
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08096920 @ =0x000009a4
str r4, [sp]
str r6, [sp, 0x4]
@@ -22301,7 +22301,7 @@ sub_8096898: @ 8096898
movs r0, 0
movs r2, 0
movs r3, 0x14
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_080968D0:
ldr r1, _08096924 @ =0x000001a5
lsls r5, r7, 24
@@ -22315,7 +22315,7 @@ _080968D0:
movs r0, 0
adds r2, r5, 0
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xD3
lsls r1, 1
str r4, [sp]
@@ -22324,7 +22324,7 @@ _080968D0:
movs r0, 0
adds r2, r5, 0
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08096928 @ =0x000001a7
str r4, [sp]
str r4, [sp, 0x4]
@@ -22332,9 +22332,9 @@ _080968D0:
movs r0, 0
adds r2, r5, 0
movs r3, 0x14
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
pop {r4-r7}
pop {r0}
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index 42fe39446..5ce1fff9b 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -25,17 +25,17 @@ sub_81344F8: @ 81344F8
mov r10, r0
ldr r5, _0813453C @ =gUnknown_203B140
ldr r0, _08134540 @ =0x00003308
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
ldr r4, _08134544 @ =gUnknown_203B144
movs r0, 0x28
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r5, [r5]
cmp r5, 0
bne _08134548
adds r0, r7, 0
- bl sub_8000544
+ bl SetMainCallback2
b _08134702
.align 2, 0
_0813453C: .4byte gUnknown_203B140
@@ -217,7 +217,7 @@ _08134656:
ldr r0, [r5]
adds r0, r4
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
movs r3, 0xC8
lsls r3, 6
@@ -226,7 +226,7 @@ _08134656:
ldr r0, [r5]
adds r0, r4
movs r1, 0x4
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
ldr r2, _08134730 @ =0x00003204
adds r1, r2
@@ -248,7 +248,7 @@ _081346F0:
movs r1, 0xFF
strb r1, [r0]
ldr r0, _08134734 @ =sub_8135C34
- bl sub_8000544
+ bl SetMainCallback2
_08134702:
pop {r3-r5}
mov r8, r3
@@ -456,7 +456,7 @@ _08134890:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _081348A8 @ =gUnknown_203B140
ldr r0, [r0]
b _081348D6
@@ -503,7 +503,7 @@ _081348F2:
b _08134B9A
_081348FC:
ldr r0, _08134940 @ =sub_813B3F0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r7, r0, 24
cmp r7, 0
@@ -523,7 +523,7 @@ _0813490C:
cmp r4, 0x1
bne _0813498C
ldr r0, _0813494C @ =sub_8134BAC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08134950
@@ -549,7 +549,7 @@ _0813495C:
movs r0, 0x5
bl sub_80722CC
movs r0, 0
- bl sub_80019D0
+ bl HideBg
ldr r0, [r5]
ldr r1, _08134988 @ =0x00003224
adds r0, r1
@@ -573,7 +573,7 @@ _0813498C:
cmp r0, 0x1
bne _081349F8
ldr r0, _081349B0 @ =sub_8134BAC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
@@ -597,7 +597,7 @@ _081349C0:
movs r0, 0x5
bl sub_80722CC
movs r0, 0
- bl sub_80019D0
+ bl HideBg
ldr r0, [r5]
ldr r2, _081349F0 @ =0x00003224
adds r0, r2
@@ -620,12 +620,12 @@ _081349F0: .4byte 0x00003224
_081349F4: .4byte 0x00003270
_081349F8:
ldr r0, _08134A2C @ =sub_8134BAC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08134A12
ldr r0, _08134A30 @ =sub_813B3F0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08134A12
@@ -734,7 +734,7 @@ _08134ADC:
beq _08134B08
ldr r0, _08134B00 @ =sub_8134BAC
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, [r4]
ldr r1, _08134B04 @ =0x00003270
adds r0, r1
@@ -774,7 +774,7 @@ _08134B38:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08134B58 @ =gUnknown_203B140
ldr r0, [r0]
ldr r1, _08134B5C @ =0x00003270
@@ -912,9 +912,9 @@ _08134C64:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08134C7E:
movs r4, 0x1E
str r4, [sp]
@@ -924,7 +924,7 @@ _08134C7E:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r6, 0xF
str r6, [sp]
str r5, [sp, 0x4]
@@ -932,21 +932,21 @@ _08134C7E:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _08134E74
.align 2, 0
_08134CC8: .4byte gUnknown_203B140
@@ -990,18 +990,18 @@ _08134D20: .4byte gUnknown_203B140
_08134D24: .4byte 0x00003001
_08134D28: .4byte 0x00003002
_08134D2C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _08134D38
b _08134E7A
_08134D38:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08134E74
_08134D4C:
bl sub_8135514
@@ -1083,14 +1083,14 @@ _08134DF4: .4byte 0x00003004
_08134DF8: .4byte 0x00003005
_08134DFC: .4byte 0x00003006
_08134E00:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08134E7A
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
b _08134E74
_08134E18:
bl sub_8138440
@@ -1114,7 +1114,7 @@ _08134E18:
str r1, [r0]
_08134E40:
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
strh r0, [r7]
ldr r1, [r5]
@@ -1227,9 +1227,9 @@ _08134F30:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08134F4A:
movs r4, 0x1E
str r4, [sp]
@@ -1239,7 +1239,7 @@ _08134F4A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r6, 0xF
str r6, [sp]
str r5, [sp, 0x4]
@@ -1247,21 +1247,21 @@ _08134F4A:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _08135180
.align 2, 0
_08134F94: .4byte gUnknown_203B140
@@ -1329,18 +1329,18 @@ _08135010:
_0813502C: .4byte gUnknown_203B140
_08135030: .4byte 0x00003001
_08135034:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _08135040
b _0813518E
_08135040:
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08135180
_08135054:
bl sub_8136F4C
@@ -1361,14 +1361,14 @@ _08135074: .4byte gUnknown_203B140
_08135078: .4byte 0x00003003
_0813507C: .4byte 0x00003005
_08135080:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _0813508C
b _0813518E
_0813508C:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
bl sub_8135514
ldr r0, _081350A4 @ =gUnknown_203B140
ldr r0, [r0]
@@ -1426,16 +1426,16 @@ _08135108: .4byte gUnknown_203B140
_0813510C: .4byte 0x00003006
_08135110: .4byte 0x00003002
_08135114:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0813518E
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08135180
_08135132:
bl sub_8138440
@@ -1570,9 +1570,9 @@ _08135248:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08135262:
movs r4, 0x1E
str r4, [sp]
@@ -1582,7 +1582,7 @@ _08135262:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r6, 0xF
str r6, [sp]
str r5, [sp, 0x4]
@@ -1590,21 +1590,21 @@ _08135262:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r6, [sp]
str r5, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _0813544C
.align 2, 0
_081352AC: .4byte gUnknown_203B140
@@ -1637,7 +1637,7 @@ _081352BE:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0813544C
.align 2, 0
_08135300: .4byte gUnknown_203B140
@@ -1722,12 +1722,12 @@ _081353AC:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_081353D0:
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0813544C
.align 2, 0
_081353E0: .4byte gUnknown_203B140
@@ -1737,7 +1737,7 @@ _081353EC:
bl sub_8135B90
bl sub_8138538
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
bl sub_81356EC
b _0813544C
_08135400:
@@ -1929,10 +1929,10 @@ _0813554C:
movs r1, 0
strh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08135632
.align 2, 0
_0813557C: .4byte 0x0000324c
@@ -1945,13 +1945,13 @@ _08135580:
strh r0, [r1]
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0x1
bl sub_81358DC
@@ -1960,12 +1960,12 @@ _08135580:
_081355B0: .4byte 0x0000324c
_081355B4:
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
movs r4, 0x3
adds r5, r4, 0
ands r5, r0
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
ands r4, r0
ldr r0, [r6]
ldr r1, _081355E0 @ =0x0000324c
@@ -1975,18 +1975,18 @@ _081355B4:
cmp r5, r4
bls _081355E4
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
b _081355EC
.align 2, 0
_081355E0: .4byte 0x0000324c
_081355E4:
movs r0, 0x18
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
_081355EC:
movs r0, 0x10
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0
bl sub_81358DC
@@ -2357,18 +2357,18 @@ sub_81358DC: @ 81358DC
lsrs r1, 24
mov r9, r1
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
movs r4, 0x3
mov r8, r4
mov r1, r8
ands r1, r0
mov r8, r1
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
adds r5, r4, 0
ands r5, r0
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
adds r6, r4, 0
ands r6, r0
ldr r0, _08135938 @ =gUnknown_203B140
@@ -2540,28 +2540,28 @@ _08135A48:
cmp r4, 0xA
bls _081359AC
movs r0, 0x8
- bl sub_8000AC4
+ bl GetGpuReg
ldr r4, _08135AA0 @ =0x0000fffc
adds r1, r4, 0
ands r1, r0
mov r2, r8
orrs r1, r2
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r4, 0
ands r1, r0
orrs r1, r5
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
ands r4, r0
orrs r4, r6
movs r0, 0xC
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -2674,7 +2674,7 @@ _08135B5E:
_08135B62:
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _08135B82
.align 2, 0
_08135B6C: .4byte gUnknown_8E9B750
@@ -2686,7 +2686,7 @@ _08135B70:
ldr r1, _08135B8C @ =gUnknown_8E9B950
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
_08135B82:
pop {r0}
bx r0
@@ -2767,7 +2767,7 @@ _08135C0E:
_08135C10:
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _08135C2C
.align 2, 0
_08135C1C: .4byte gUnknown_8463B88
@@ -2776,7 +2776,7 @@ _08135C20:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
_08135C2C:
pop {r0}
bx r0
@@ -2876,7 +2876,7 @@ _08135CE8:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _08135D24
.align 2, 0
_08135D0C: .4byte gUnknown_203B140
@@ -2887,7 +2887,7 @@ _08135D18:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
_08135D24:
bl sub_8138538
b _08135F00
@@ -2925,7 +2925,7 @@ _08135D54:
ldr r1, _08135D88 @ =gUnknown_8E9B950
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, [r4]
movs r1, 0xC9
lsls r1, 6
@@ -2944,7 +2944,7 @@ _08135D90:
ldr r1, _08135DBC @ =gUnknown_8E9B598
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, [r4]
movs r1, 0xC9
lsls r1, 6
@@ -2954,7 +2954,7 @@ _08135D90:
_08135DAC:
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _08135F00
.align 2, 0
_08135DB8: .4byte 0x0000323c
@@ -2965,7 +2965,7 @@ _08135DC4:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _08135DE4 @ =gUnknown_203B140
ldr r0, [r0]
ldr r2, _08135DE8 @ =0x00003214
@@ -2984,7 +2984,7 @@ _08135DEC:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r4, _08135E64 @ =gUnknown_203B140
ldr r0, [r4]
movs r1, 0xC0
@@ -3040,13 +3040,13 @@ _08135E78: .4byte 0x00003004
_08135E7C: .4byte 0x00003005
_08135E80:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08135F00
_08135E9A:
ldr r0, _08135EBC @ =gUnknown_203B140
@@ -3142,7 +3142,7 @@ _08135F64:
adds r0, r4, 0
movs r1, 0
movs r2, 0xA0
- bl sub_80703EC
+ bl LoadPalette
ldr r5, _08135FAC @ =gUnknown_203B140
ldr r0, [r5]
ldr r1, _08135FB0 @ =0x00003290
@@ -3163,7 +3163,7 @@ _08135F64:
adds r0, 0xC0
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0xA0
movs r1, 0x10
@@ -3177,7 +3177,7 @@ _08135FB4:
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x20
adds r0, r4, 0
movs r1, 0x10
@@ -3192,12 +3192,12 @@ _08135FCC:
movs r1, 0x70
_08135FD8:
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08136020
.align 2, 0
_08135FE0: .4byte gUnknown_84636C0
_08135FE4:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
b _08136020
_08135FEA:
ldr r1, _08135FFC @ =gUnknown_8E9A460
@@ -3206,12 +3206,12 @@ _08135FEA:
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _08136020
.align 2, 0
_08135FFC: .4byte gUnknown_8E9A460
_08136000:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3221,7 +3221,7 @@ _0813600E:
ldr r0, _0813601C @ =gUnknown_8463700
movs r1, 0x80
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x1
b _08136030
.align 2, 0
@@ -3336,7 +3336,7 @@ sub_81360D4: @ 81360D4
ldr r1, _0813610C @ =0x00003290
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8043F90
@@ -3349,7 +3349,7 @@ sub_81360D4: @ 81360D4
ldr r2, _08136114 @ =0x00003064
adds r0, r2
ldr r1, _08136118 @ =gUnknown_8416202
- bl sub_8008D84
+ bl StringCopy
b _0813612C
.align 2, 0
_08136108: .4byte gUnknown_203B140
@@ -3383,7 +3383,7 @@ _0813612C:
ldr r1, _08136164 @ =0x00003028
adds r2, r1
movs r1, 0x2
- bl sub_803FBE8
+ bl GetMonData
b _08136342
.align 2, 0
_08136154: .4byte 0x00003064
@@ -3395,14 +3395,14 @@ _08136168:
ldr r5, _081361F0 @ =0x00003290
adds r0, r2, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
ldr r0, [r6]
ldr r2, _081361F4 @ =0x00003028
adds r0, r2
adds r1, r4, 0
- bl sub_8040FD0
+ bl GetSpeciesName
ldr r1, [r6]
ldr r2, _081361F8 @ =gUnknown_8254784
lsls r0, r4, 3
@@ -3422,25 +3422,25 @@ _08136168:
adds r0, r5
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [r6]
ldr r4, _08136204 @ =0x00003034
adds r0, r4
mov r1, sp
movs r2, 0xA
- bl sub_8009294
+ bl StringCopyN_Multibyte
ldr r0, [r6]
adds r0, r4
- bl sub_8008D28
+ bl StringGetEnd10
ldr r0, [r6]
adds r0, r5
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r7, r0, 24
ldr r0, [r6]
adds r0, r5
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r7, 0xFE
@@ -3449,7 +3449,7 @@ _08136168:
ldr r3, _08136208 @ =0x00003084
adds r0, r3
ldr r1, _0813620C @ =gUnknown_8416221
- bl sub_8008D84
+ bl StringCopy
b _08136238
.align 2, 0
_081361F0: .4byte 0x00003290
@@ -3467,7 +3467,7 @@ _08136210:
ldr r1, _08136224 @ =0x00003084
adds r0, r1
ldr r1, _08136228 @ =gUnknown_841621F
- bl sub_8008D84
+ bl StringCopy
b _08136238
.align 2, 0
_08136224: .4byte 0x00003084
@@ -3477,7 +3477,7 @@ _0813622C:
ldr r2, _08136308 @ =0x00003084
adds r0, r2
ldr r1, _0813630C @ =gUnknown_84161CD
- bl sub_8008D84
+ bl StringCopy
_08136238:
cmp r4, 0x20
beq _08136240
@@ -3492,14 +3492,14 @@ _08136240:
muls r1, r4
ldr r2, _08136318 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008E28
+ bl StringCompare
cmp r0, 0
bne _08136264
ldr r0, [r5]
ldr r1, _08136308 @ =0x00003084
adds r0, r1
ldr r1, _0813630C @ =gUnknown_84161CD
- bl sub_8008D84
+ bl StringCopy
_08136264:
ldr r6, _08136310 @ =gUnknown_203B140
ldr r0, [r6]
@@ -3507,28 +3507,28 @@ _08136264:
adds r0, r5
movs r1, 0x7
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, [r6]
movs r4, 0xC1
lsls r4, 6
adds r0, r4
mov r1, sp
movs r2, 0x7
- bl sub_8009294
+ bl StringCopyN_Multibyte
ldr r0, [r6]
adds r4, r0, r4
adds r0, r5
movs r1, 0x3
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r0, [r6]
adds r0, r5
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _08136320 @ =0x0000ffff
ands r1, r0
ldr r0, [r6]
@@ -3540,7 +3540,7 @@ _08136264:
ldr r0, [r6]
adds r0, r5
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
mov r0, sp
movs r2, 0
@@ -3550,16 +3550,16 @@ _08136264:
ldr r4, _08136328 @ =0x00003088
adds r0, r4
ldr r1, _0813632C @ =gUnknown_8416223
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
adds r0, r4
mov r1, sp
movs r2, 0x4
- bl sub_8008DEC
+ bl StringAppendN
ldr r0, [r6]
adds r0, r5
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -3568,7 +3568,7 @@ _08136264:
ldr r3, _08136330 @ =0x00003074
adds r0, r3
ldr r1, _08136334 @ =gUnknown_84161EF
- bl sub_8008D84
+ bl StringCopy
b _08136342
.align 2, 0
_08136308: .4byte 0x00003084
@@ -3610,7 +3610,7 @@ sub_8136350: @ 8136350
ldr r7, _081364FC @ =0x00003290
adds r0, r7
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -3623,11 +3623,11 @@ sub_8136350: @ 8136350
ldr r0, [r6]
adds r0, r4
ldr r1, _08136504 @ =gUnknown_841620C
- bl sub_8008DA4
+ bl StringAppend
ldr r0, [r6]
adds r0, r7
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -3638,10 +3638,10 @@ sub_8136350: @ 8136350
ldr r0, [r6]
adds r0, r4
mov r1, sp
- bl sub_8008DA4
+ bl StringAppend
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
ldr r1, _08136508 @ =gUnknown_203B144
mov r8, r1
ldr r2, [r1]
@@ -3671,7 +3671,7 @@ _081363DA:
_081363E6:
adds r0, r2, r7
movs r1, 0x54
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r6]
@@ -3682,7 +3682,7 @@ _081363E6:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3696,7 +3696,7 @@ _081363E6:
ldr r0, [r6]
adds r0, r7
movs r1, 0x55
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r6]
@@ -3707,7 +3707,7 @@ _081363E6:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3720,7 +3720,7 @@ _081363E6:
ldr r0, [r6]
adds r0, r7
movs r1, 0x57
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r6]
@@ -3731,7 +3731,7 @@ _081363E6:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3744,7 +3744,7 @@ _081363E6:
ldr r0, [r6]
adds r0, r7
movs r1, 0x58
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r6]
@@ -3755,7 +3755,7 @@ _081363E6:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3768,7 +3768,7 @@ _081363E6:
ldr r0, [r6]
adds r0, r7
movs r1, 0x56
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r6]
@@ -3779,7 +3779,7 @@ _081363E6:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3806,7 +3806,7 @@ _08136518:
mov r9, r2
add r0, r9
movs r1, 0x3B
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r4]
@@ -3817,7 +3817,7 @@ _08136518:
bl sub_8008E78
ldr r0, [r4]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
ldr r1, _08136788 @ =gUnknown_203B144
mov r8, r1
ldr r2, [r1]
@@ -3832,7 +3832,7 @@ _08136518:
ldr r0, [r4]
add r0, r9
movs r1, 0x3C
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r4]
@@ -3843,7 +3843,7 @@ _08136518:
bl sub_8008E78
ldr r0, [r4]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3856,7 +3856,7 @@ _08136518:
ldr r0, [r4]
add r0, r9
movs r1, 0x3E
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r4]
@@ -3867,7 +3867,7 @@ _08136518:
bl sub_8008E78
ldr r0, [r4]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3880,7 +3880,7 @@ _08136518:
ldr r0, [r4]
add r0, r9
movs r1, 0x3F
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r4]
@@ -3891,7 +3891,7 @@ _08136518:
bl sub_8008E78
ldr r0, [r4]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3904,7 +3904,7 @@ _08136518:
ldr r0, [r4]
add r0, r9
movs r1, 0x3D
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
ldr r0, [r4]
@@ -3915,7 +3915,7 @@ _08136518:
bl sub_8008E78
ldr r0, [r4]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
lsls r0, 16
@@ -3932,7 +3932,7 @@ _08136630:
mov r8, r2
add r0, r8
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
ldr r0, [r6]
ldr r4, _0813678C @ =0x000031a4
@@ -3943,7 +3943,7 @@ _08136630:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
ldr r1, _08136788 @ =gUnknown_203B144
mov r10, r1
ldr r2, [r1]
@@ -3960,7 +3960,7 @@ _08136630:
ldr r0, [r6]
add r0, r8
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r5, r0, 24
movs r1, 0
@@ -3970,7 +3970,7 @@ _08136630:
ldr r1, _08136780 @ =0x00003290
adds r0, r1
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
ldr r4, _08136790 @ =gUnknown_8253AE4
@@ -3998,7 +3998,7 @@ _081366B8:
bl sub_8008E78
ldr r0, [r6]
adds r0, r4
- bl sub_8008E08
+ bl StringLength
mov r1, r10
ldr r2, [r1]
lsls r0, 16
@@ -4012,14 +4012,14 @@ _081366B8:
ldr r0, [r6]
add r0, r8
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r0, [r6]
add r0, r8
movs r1, 0x2E
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4035,7 +4035,7 @@ _081366B8:
muls r1, r4
ldr r2, _081367A0 @ =gUnknown_824FC40
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
ldr r2, _081367A4 @ =0x000031cc
adds r0, r2
@@ -4043,11 +4043,11 @@ _081366B8:
lsls r4, 2
adds r4, r1
ldr r1, [r4]
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r6]
add r0, r8
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
bl sub_8138C5C
ldr r1, [r6]
ldr r4, _081367AC @ =0x0000326c
@@ -4164,7 +4164,7 @@ _08136812:
adds r0, r1
adds r0, r2, r0
ldr r1, _08136894 @ =gUnknown_841620E
- bl sub_8008D84
+ bl StringCopy
movs r0, 0xB
adds r1, r7, 0
muls r1, r0
@@ -4173,7 +4173,7 @@ _08136812:
ldr r0, [r6]
adds r0, r1
ldr r1, _0813689C @ =gUnknown_8416210
- bl sub_8008D84
+ bl StringCopy
lsls r4, r7, 2
adds r4, r7
ldr r3, _081368A0 @ =0x0000316c
@@ -4182,13 +4182,13 @@ _08136812:
adds r0, r1
ldr r5, _081368A4 @ =gUnknown_8416213
adds r1, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081368A8 @ =0x00003188
adds r4, r0
ldr r0, [r6]
adds r0, r4
adds r1, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081368AC @ =gUnknown_203B144
ldr r1, [r0]
adds r0, r1, 0
@@ -4243,7 +4243,7 @@ _081368B0:
muls r1, r2
ldr r2, _0813695C @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
cmp r7, 0x3
bls _0813696C
ldr r1, [r6]
@@ -4328,13 +4328,13 @@ _0813696C:
ldrh r4, [r1]
adds r0, r6
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
adds r2, r7, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4351,7 +4351,7 @@ _081369D0:
adds r1, r5, r3
ldr r0, [r6]
adds r0, r1
- bl sub_8008E08
+ bl StringLength
ldr r4, _08136A60 @ =gUnknown_203B144
mov r8, r4
ldr r2, [r4]
@@ -4369,7 +4369,7 @@ _081369D0:
adds r5, r0
ldr r0, [r6]
adds r0, r5
- bl sub_8008E08
+ bl StringLength
mov r1, r8
ldr r2, [r1]
adds r2, 0x1C
@@ -4400,7 +4400,7 @@ _081369D0:
adds r0, r1
adds r0, r6, r0
ldr r1, _08136A6C @ =gUnknown_8416213
- bl sub_8008D84
+ bl StringCopy
b _08136A84
.align 2, 0
_08136A4C: .4byte gUnknown_203B140
@@ -4442,7 +4442,7 @@ _08136A84:
adds r0, r2
adds r0, r3, r0
ldr r1, _08136AC4 @ =gUnknown_8416213
- bl sub_8008D84
+ bl StringCopy
b _08136ADA
.align 2, 0
_08136AB0: .4byte 0x0000316c
@@ -4564,10 +4564,10 @@ _08136BA8: .4byte 0x0000327c
thumb_func_start sub_8136BAC
sub_8136BAC: @ 8136BAC
push {lr}
- bl sub_8006B10
- bl sub_8070528
- bl sub_80088F0
- bl sub_8087E64
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
+ bl remove_some_task
pop {r0}
bx r0
thumb_func_end sub_8136BAC
@@ -4643,7 +4643,7 @@ _08136BEA:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _08136D40 @ =gUnknown_8463EFC
@@ -4653,39 +4653,39 @@ _08136BEA:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_8002C28
ldr r1, _08136D44 @ =0x00005040
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08136D48 @ =gUnknown_203B140
ldr r0, [r4]
ldr r2, _08136D4C @ =0x00003214
@@ -4695,40 +4695,40 @@ _08136BEA:
movs r1, 0xF8
lsls r1, 5
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0xF
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08136D50 @ =0x00002087
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xBC
lsls r1, 2
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r4]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0x80
lsls r0, 5
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r2, 0x80
lsls r2, 6
adds r1, r2
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
add sp, 0x8
pop {r3}
mov r8, r3
@@ -4768,13 +4768,13 @@ _08136D7C:
ldr r0, _08136D98 @ =sub_8134840
_08136D7E:
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
ldr r2, _08136D9C @ =0x00003018
adds r1, r2
strb r0, [r1]
ldr r0, _08136DA0 @ =sub_8137EE8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -4796,7 +4796,7 @@ sub_8136DA4: @ 8136DA4
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -4812,7 +4812,7 @@ sub_8136DA4: @ 8136DA4
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -4833,7 +4833,7 @@ sub_8136DF0: @ 8136DF0
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
adds r1, r6, 0
movs r2, 0
@@ -4857,7 +4857,7 @@ sub_8136DF0: @ 8136DF0
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -4878,7 +4878,7 @@ sub_8136E50: @ 8136E50
adds r0, r7
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, [r6]
movs r1, 0xC8
lsls r1, 6
@@ -4924,7 +4924,7 @@ _08136E9A:
ldr r0, [r6]
ldr r3, _08136F04 @ =0x00003290
adds r0, r3
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFE
@@ -4972,7 +4972,7 @@ _08136F28:
ldr r1, _08136F48 @ =0x00003002
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r4-r7}
pop {r0}
@@ -4992,7 +4992,7 @@ sub_8136F4C: @ 8136F4C
adds r0, r1
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, _08136F7C @ =0x00003214
adds r0, r1
@@ -5024,7 +5024,7 @@ _08136F94:
ldr r1, _08136FAC @ =0x00003003
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
pop {r4}
pop {r0}
bx r0
@@ -5128,7 +5128,7 @@ _08137074:
ldr r1, _081370D4 @ =0x00003290
adds r0, r3, r1
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
movs r3, 0x3
@@ -5449,13 +5449,13 @@ sub_81372E4: @ 81372E4
ldrh r4, [r1]
adds r0, r5
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
adds r2, r7, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
lsls r0, 24
mov r8, r0
lsrs r5, r0, 24
@@ -5676,7 +5676,7 @@ sub_81374E8: @ 81374E8
adds r0, r1
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, _08137518 @ =0x00003214
adds r0, r1
@@ -5712,7 +5712,7 @@ _08137536:
ldr r1, _08137550 @ =0x00003004
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
pop {r4}
pop {r0}
bx r0
@@ -5752,7 +5752,7 @@ sub_8137578: @ 8137578
ldr r0, [r7]
ldr r4, _081375EC @ =0x00003290
adds r0, r4
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _081375F0 @ =gUnknown_8463E60
@@ -5764,7 +5764,7 @@ sub_8137578: @ 8137578
ldr r0, [r7]
adds r0, r4
movs r1, 0x24
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -5781,7 +5781,7 @@ _081375B2:
ldr r0, [r7]
adds r0, r4
movs r1, 0x23
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -5811,7 +5811,7 @@ _08137608:
add r4, sp, 0x1C
ldr r1, _08137618 @ =gUnknown_8419C13
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
b _08137626
.align 2, 0
_08137614: .4byte 0x00003024
@@ -5820,7 +5820,7 @@ _0813761C:
add r4, sp, 0x1C
ldr r1, _08137660 @ =gUnknown_8419C0B
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_08137626:
adds r1, r4, 0
movs r0, 0x2
@@ -5830,14 +5830,14 @@ _08137626:
ldr r1, _08137668 @ =0x00003290
adds r0, r1
movs r1, 0x24
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0813769C
ldr r0, [r4]
ldr r1, _08137668 @ =0x00003290
adds r0, r1
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _0813767C
adds r0, r6, 0
@@ -5949,7 +5949,7 @@ sub_8137724: @ 8137724
ldr r0, [r5]
ldr r4, _081377A4 @ =0x00003290
adds r0, r4
- bl sub_8042E9C
+ bl GetNature
lsls r0, 24
lsrs r6, r0, 24
ldr r1, _081377A8 @ =gUnknown_8463E60
@@ -5961,7 +5961,7 @@ sub_8137724: @ 8137724
ldr r0, [r5]
adds r0, r4
movs r1, 0x24
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -5978,7 +5978,7 @@ _0813775E:
ldr r0, [r5]
adds r0, r4
movs r1, 0x23
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
@@ -6073,7 +6073,7 @@ _08137846:
add r4, sp, 0x1C
ldr r1, _0813788C @ =gUnknown_8419C0B
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
_08137850:
adds r1, r4, 0
movs r0, 0x2
@@ -6083,14 +6083,14 @@ _08137850:
ldr r1, _08137894 @ =0x00003290
adds r0, r1
movs r1, 0x24
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _081378BC
ldr r0, [r4]
ldr r1, _08137894 @ =0x00003290
adds r0, r1
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _081378A8
adds r0, r6, 0
@@ -6223,7 +6223,7 @@ sub_8137970: @ 8137970
ldr r6, _081379C8 @ =0x00003290
adds r0, r6
movs r1, 0x23
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r4, r0, 24
ldr r2, [r7]
@@ -6237,13 +6237,13 @@ sub_8137970: @ 8137970
beq _081379F4
adds r0, r2, r6
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _081379F4
ldr r0, [r7]
adds r0, r6
movs r1, 0x25
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
movs r2, 0xFC
lsls r2, 24
@@ -6274,7 +6274,7 @@ _081379E4:
beq _081379F4
adds r0, r2, r6
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
bne _081379F8
_081379F4:
@@ -6284,7 +6284,7 @@ _081379F8:
ldr r0, [r7]
adds r0, r6
movs r1, 0x25
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
movs r2, 0xFC
lsls r2, 24
@@ -6533,7 +6533,7 @@ _08137BFC:
ldr r1, _08137C14 @ =0x00003005
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
pop {r0}
bx r0
.align 2, 0
@@ -6553,7 +6553,7 @@ sub_8137C18: @ 8137C18
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r5]
adds r0, r1, r4
ldrb r0, [r0]
@@ -6606,7 +6606,7 @@ sub_8137C90: @ 8137C90
adds r0, r1
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r4, 0
_08137CA4:
ldr r5, _08137D14 @ =gUnknown_203B140
@@ -6791,17 +6791,17 @@ sub_8137E28: @ 8137E28
lsls r1, 6
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldr r1, _08137E5C @ =0x00003001
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldr r1, _08137E60 @ =0x00003002
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
pop {r4}
pop {r0}
bx r0
@@ -6817,13 +6817,13 @@ sub_8137E64: @ 8137E64
lsls r0, 24
lsrs r5, r0, 24
bl sub_813AF90
- bl sub_80088F0
- bl sub_80721F0
+ bl FreeAllSpritePalettes
+ bl IsCryPlayingOrClearCrySongs
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08137E82
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
_08137E82:
ldr r4, _08137ED4 @ =gUnknown_203B140
ldr r0, [r4]
@@ -6833,19 +6833,19 @@ _08137E82:
bl sub_8138414
bl sub_8003ECC
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
ldr r1, _08137EDC @ =0x000032f8
adds r0, r1
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8138B20
ldr r1, _08137EE0 @ =gUnknown_203B16C
strb r0, [r1]
ldr r0, [r4]
cmp r0, 0
beq _08137EBC
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08137EBC:
@@ -6853,7 +6853,7 @@ _08137EBC:
ldr r0, [r4]
cmp r0, 0
beq _08137ECC
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08137ECC:
@@ -6871,10 +6871,10 @@ _08137EE4: .4byte gUnknown_203B144
thumb_func_start sub_8137EE8
sub_8137EE8: @ 8137EE8
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8137EE8
@@ -7048,7 +7048,7 @@ _0813801A:
lsls r1, 16
lsrs r1, 16
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
b _08138054
.align 2, 0
_08138038: .4byte gUnknown_203B140
@@ -7061,7 +7061,7 @@ _08138044:
lsls r1, 16
lsrs r1, 16
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
_08138054:
pop {r4,r5}
pop {r0}
@@ -7101,7 +7101,7 @@ _08138080:
lsls r1, 16
lsrs r1, 16
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
b _081380BC
.align 2, 0
_081380A0: .4byte gUnknown_203B140
@@ -7114,7 +7114,7 @@ _081380AC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
_081380BC:
ldr r0, _081380E4 @ =gUnknown_203B140
ldr r1, [r0]
@@ -7130,7 +7130,7 @@ _081380BC:
lsls r1, 16
lsrs r1, 16
movs r0, 0x10
- bl sub_8000A38
+ bl SetGpuReg
_081380DC:
pop {r4,r5}
pop {r0}
@@ -7220,9 +7220,9 @@ _08138178: .4byte 0x00003214
thumb_func_start sub_813817C
sub_813817C: @ 813817C
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
ldr r0, _081381A4 @ =gUnknown_203B140
ldr r0, [r0]
ldr r1, _081381A8 @ =0x00003244
@@ -7244,9 +7244,9 @@ _081381A8: .4byte 0x00003244
sub_81381AC: @ 81381AC
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_81381AC
@@ -7255,7 +7255,7 @@ sub_81381AC: @ 81381AC
sub_81381C0: @ 81381C0
push {lr}
ldr r0, _081381CC @ =sub_813817C
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -7359,12 +7359,12 @@ sub_8138280: @ 8138280
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0xA
- bl sub_8000AC4
+ bl GetGpuReg
movs r4, 0x3
adds r5, r4, 0
ands r5, r0
movs r0, 0xC
- bl sub_8000AC4
+ bl GetGpuReg
adds r3, r4, 0
ands r3, r0
movs r4, 0
@@ -7626,7 +7626,7 @@ sub_813847C: @ 813847C
ldr r0, _081384C4 @ =gUnknown_202402C
cmp r1, r0
bne _081384D0
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -7643,7 +7643,7 @@ sub_813847C: @ 813847C
adds r0, r3
adds r2, 0x8
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
b _081384E8
.align 2, 0
_081384BC: .4byte gUnknown_203B140
@@ -7661,11 +7661,11 @@ _081384D0:
adds r0, r1
ldr r1, _08138524 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
_081384E8:
adds r0, r6, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _0813851C @ =0x0000ffff
ands r1, r0
cmp r4, r1
@@ -7676,12 +7676,12 @@ _081384E8:
adds r2, r5
adds r0, r6, 0
movs r1, 0x7
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r4]
ldr r2, _08138520 @ =0x0000304c
adds r0, r1, r2
adds r1, r5
- bl sub_8009370
+ bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
beq _08138530
_08138518:
@@ -7752,7 +7752,7 @@ _08138576:
movs r0, 0x3
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBD
lsls r1, 1
str r4, [sp]
@@ -7761,7 +7761,7 @@ _08138576:
movs r0, 0x3
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138660 @ =0x00000169
str r4, [sp]
str r4, [sp, 0x4]
@@ -7769,7 +7769,7 @@ _08138576:
movs r0, 0x3
movs r2, 0xE
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138664 @ =0x00000179
str r4, [sp]
str r4, [sp, 0x4]
@@ -7777,7 +7777,7 @@ _08138576:
movs r0, 0x3
movs r2, 0xE
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r6, _08138668 @ =0x0000016b
str r4, [sp]
str r4, [sp, 0x4]
@@ -7786,7 +7786,7 @@ _08138576:
adds r1, r6, 0
movs r2, 0xF
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r5, _0813866C @ =0x0000017b
str r4, [sp]
str r4, [sp, 0x4]
@@ -7795,7 +7795,7 @@ _08138576:
adds r1, r5, 0
movs r2, 0xF
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138670 @ =0x0000016d
str r4, [sp]
str r4, [sp, 0x4]
@@ -7803,7 +7803,7 @@ _08138576:
movs r0, 0x3
movs r2, 0x10
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138674 @ =0x0000017d
str r4, [sp]
str r4, [sp, 0x4]
@@ -7811,7 +7811,7 @@ _08138576:
movs r0, 0x3
movs r2, 0x10
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r7, [sp, 0x8]
@@ -7819,7 +7819,7 @@ _08138576:
adds r1, r6, 0
movs r2, 0x11
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r7, [sp, 0x8]
@@ -7827,7 +7827,7 @@ _08138576:
adds r1, r5, 0
movs r2, 0x11
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB7
lsls r1, 1
str r4, [sp]
@@ -7836,7 +7836,7 @@ _08138576:
movs r0, 0x3
movs r2, 0x12
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBF
lsls r1, 1
str r4, [sp]
@@ -7860,7 +7860,7 @@ _08138678:
movs r0, 0x3
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBD
lsls r1, 1
str r4, [sp]
@@ -7869,7 +7869,7 @@ _08138678:
movs r0, 0x3
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081386E0 @ =0x00000189
str r4, [sp]
str r4, [sp, 0x4]
@@ -7877,7 +7877,7 @@ _08138678:
movs r0, 0x3
movs r2, 0xE
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081386E4 @ =0x00000199
str r4, [sp]
str r4, [sp, 0x4]
@@ -7885,7 +7885,7 @@ _08138678:
movs r0, 0x3
movs r2, 0xE
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081386E8 @ =0x0000015b
movs r0, 0x4
str r0, [sp]
@@ -7895,7 +7895,7 @@ _08138678:
movs r0, 0x3
movs r2, 0xF
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _08138A16
.align 2, 0
_081386E0: .4byte 0x00000189
@@ -7911,7 +7911,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xCD
lsls r1, 1
str r7, [sp]
@@ -7920,7 +7920,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xAD
lsls r1, 1
str r7, [sp]
@@ -7929,7 +7929,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xE
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB6
lsls r1, 1
str r7, [sp]
@@ -7938,7 +7938,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xE
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB5
lsls r1, 1
str r7, [sp]
@@ -7947,7 +7947,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xF
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBD
lsls r1, 1
str r7, [sp]
@@ -7956,7 +7956,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0xF
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081387D0 @ =0x00000169
str r7, [sp]
str r7, [sp, 0x4]
@@ -7964,7 +7964,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0x10
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081387D4 @ =0x00000179
str r7, [sp]
str r7, [sp, 0x4]
@@ -7972,7 +7972,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0x10
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081387D8 @ =0x0000016b
str r7, [sp]
str r7, [sp, 0x4]
@@ -7980,7 +7980,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0x11
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081387DC @ =0x0000017b
str r7, [sp]
str r7, [sp, 0x4]
@@ -7988,7 +7988,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0x11
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB7
lsls r1, 1
str r7, [sp]
@@ -7997,7 +7997,7 @@ _081386EC:
movs r0, 0x3
movs r2, 0x12
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBF
lsls r1, 1
str r7, [sp]
@@ -8022,7 +8022,7 @@ _081387E0:
mov r1, r10
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r2, 0xCD
lsls r2, 1
mov r9, r2
@@ -8033,7 +8033,7 @@ _081387E0:
mov r1, r9
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0xAD
lsls r0, 1
mov r8, r0
@@ -8044,7 +8044,7 @@ _081387E0:
mov r1, r8
movs r2, 0xE
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r6, 0xB6
lsls r6, 1
str r4, [sp]
@@ -8054,7 +8054,7 @@ _081387E0:
adds r1, r6, 0
movs r2, 0xE
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8062,7 +8062,7 @@ _081387E0:
mov r1, r10
movs r2, 0xF
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8070,7 +8070,7 @@ _081387E0:
mov r1, r9
movs r2, 0xF
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8078,7 +8078,7 @@ _081387E0:
mov r1, r8
movs r2, 0x10
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8086,7 +8086,7 @@ _081387E0:
adds r1, r6, 0
movs r2, 0x10
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB5
lsls r1, 1
str r4, [sp]
@@ -8095,7 +8095,7 @@ _081387E0:
movs r0, 0x3
movs r2, 0x11
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xBD
lsls r1, 1
str r4, [sp]
@@ -8104,7 +8104,7 @@ _081387E0:
movs r0, 0x3
movs r2, 0x11
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081388D8 @ =0x00000189
str r4, [sp]
str r4, [sp, 0x4]
@@ -8112,7 +8112,7 @@ _081387E0:
movs r0, 0x3
movs r2, 0x12
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _081388DC @ =0x00000199
str r4, [sp]
str r4, [sp, 0x4]
@@ -8121,7 +8121,7 @@ _081388CC:
movs r0, 0x3
movs r2, 0x12
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _08138A16
.align 2, 0
_081388D8: .4byte 0x00000189
@@ -8143,7 +8143,7 @@ _081388E0:
movs r0, 0x3
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r1, 0xB6
lsls r1, 1
str r6, [sp]
@@ -8152,7 +8152,7 @@ _081388E0:
movs r0, 0x3
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _081389CA
.align 2, 0
_0813891C: .4byte 0x00003208
@@ -8169,7 +8169,7 @@ _08138920:
mov r1, r10
movs r2, 0xD
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r2, 0xCD
lsls r2, 1
mov r9, r2
@@ -8180,7 +8180,7 @@ _08138920:
mov r1, r9
movs r2, 0xD
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0xAD
lsls r0, 1
mov r8, r0
@@ -8191,7 +8191,7 @@ _08138920:
mov r1, r8
movs r2, 0xE
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r6, 0xB6
lsls r6, 1
str r4, [sp]
@@ -8201,7 +8201,7 @@ _08138920:
adds r1, r6, 0
movs r2, 0xE
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8209,7 +8209,7 @@ _08138920:
mov r1, r10
movs r2, 0xF
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8217,7 +8217,7 @@ _08138920:
mov r1, r9
movs r2, 0xF
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8225,7 +8225,7 @@ _08138920:
mov r1, r8
movs r2, 0x10
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -8233,7 +8233,7 @@ _08138920:
adds r1, r6, 0
movs r2, 0x10
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_081389CA:
ldr r1, _08138A28 @ =0x0000018b
movs r4, 0x1
@@ -8244,7 +8244,7 @@ _081389CA:
movs r0, 0x3
movs r2, 0x11
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138A2C @ =0x0000019b
str r4, [sp]
str r4, [sp, 0x4]
@@ -8252,7 +8252,7 @@ _081389CA:
movs r0, 0x3
movs r2, 0x11
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138A30 @ =0x00000189
str r4, [sp]
str r4, [sp, 0x4]
@@ -8260,7 +8260,7 @@ _081389CA:
movs r0, 0x3
movs r2, 0x12
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r1, _08138A34 @ =0x00000199
str r4, [sp]
str r4, [sp, 0x4]
@@ -8268,7 +8268,7 @@ _081389CA:
movs r0, 0x3
movs r2, 0x12
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_08138A16:
add sp, 0xC
pop {r3-r5}
@@ -8353,7 +8353,7 @@ _08138ABC:
adds r0, r1, r5
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r1, [r6]
adds r0, r1, r5
ldrb r0, [r0]
@@ -8386,7 +8386,7 @@ _08138B04:
ldr r0, [r6]
adds r0, r5
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08138B0E:
pop {r4-r6}
pop {r0}
@@ -8502,7 +8502,7 @@ _08138BC4:
adds r4, r1
adds r0, r4, 0
adds r1, r5, 0
- bl sub_803E774
+ bl BoxMonToMon
_08138BE2:
pop {r4,r5}
pop {r0}
@@ -8540,7 +8540,7 @@ _08138C10:
_08138C14:
movs r1, 0x10
_08138C16:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -8576,7 +8576,7 @@ _08138C48:
_08138C4C:
movs r1, 0x14
_08138C4E:
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -8592,7 +8592,7 @@ sub_8138C5C: @ 8138C5C
ldr r5, _08138C7C @ =0x00003290
adds r0, r5
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08138C80
movs r0, 0x7
@@ -9113,9 +9113,9 @@ _08139034:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r6]
adds r0, r7
movs r1, 0
@@ -9158,7 +9158,7 @@ sub_81390B0: @ 81390B0
ldrb r1, [r3]
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x8]
@@ -9168,14 +9168,14 @@ sub_81390B0: @ 81390B0
ldrb r1, [r3]
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
ldr r0, _081391E0 @ =gUnknown_203B16D
ldrb r1, [r0]
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0x5
add r1, sp
mov r10, r1
@@ -9184,12 +9184,12 @@ sub_81390B0: @ 81390B0
ldrb r1, [r3]
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FBE8
+ bl GetMonData
add r7, sp, 0x4
strb r0, [r7]
adds r0, r6, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r4, sp
adds r4, 0x6
strb r0, [r4]
@@ -9305,7 +9305,7 @@ sub_81391EC: @ 81391EC
ldrb r1, [r3]
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FD44
+ bl GetBoxMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x8]
@@ -9315,14 +9315,14 @@ sub_81391EC: @ 81391EC
ldrb r1, [r3]
adds r1, 0xD
adds r0, r6, 0
- bl sub_803FD44
+ bl GetBoxMonData
mov r1, sp
strh r0, [r1]
ldr r0, _0813931C @ =gUnknown_203B16D
ldrb r1, [r0]
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FD44
+ bl GetBoxMonData
movs r1, 0x5
add r1, sp
mov r10, r1
@@ -9331,12 +9331,12 @@ sub_81391EC: @ 81391EC
ldrb r1, [r3]
adds r1, 0x11
adds r0, r6, 0
- bl sub_803FD44
+ bl GetBoxMonData
add r7, sp, 0x4
strb r0, [r7]
adds r0, r6, 0
movs r1, 0x15
- bl sub_803FD44
+ bl GetBoxMonData
mov r4, sp
adds r4, 0x6
strb r0, [r4]
@@ -9468,7 +9468,7 @@ _08139360:
adds r4, r1
adds r0, r4, 0
adds r1, r5, 0
- bl sub_803E774
+ bl BoxMonToMon
_0813937E:
pop {r4,r5}
pop {r0}
@@ -9556,7 +9556,7 @@ _08139420:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0813943C @ =gUnknown_203B140
ldr r1, [r0]
ldr r4, _08139440 @ =0x00003288
@@ -9838,9 +9838,9 @@ _08139640:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r4]
ldr r4, _081396A4 @ =0x00003288
adds r0, r4
@@ -9858,7 +9858,7 @@ _081396A8:
adds r0, r4
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -9882,9 +9882,9 @@ _081396A8:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r5]
ldr r1, _0813970C @ =0x00003288
adds r0, r1
@@ -9904,7 +9904,7 @@ _08139710:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08139730 @ =gUnknown_203B140
ldr r1, [r0]
ldr r2, _08139734 @ =0x00003288
@@ -10213,25 +10213,25 @@ sub_813995C: @ 813995C
sub sp, 0x14
ldr r4, _081399CC @ =gUnknown_203B170
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r5, _081399D0 @ =gUnknown_203B140
ldr r0, [r5]
ldr r4, _081399D4 @ =0x00003290
adds r0, r4
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r7, r0, 16
ldr r0, [r5]
adds r0, r4
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
ldr r0, [r5]
adds r0, r4
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
ldr r5, [r5]
ldr r1, _081399D8 @ =0x000032f8
@@ -10318,9 +10318,9 @@ _08139A40:
ldr r1, _08139A74 @ =gUnknown_202063C
adds r4, r0, r1
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r7, 0
- bl sub_80441F4
+ bl IsPokeSpriteNotFlipped
lsls r0, 24
cmp r0, 0
bne _08139A78
@@ -10387,7 +10387,7 @@ sub_8139AAC: @ 8139AAC
ldr r1, _08139AFC @ =0x00003290
adds r0, r2, r1
movs r1, 0x20
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
adds r1, r0, 0
@@ -10460,13 +10460,13 @@ _08139B6C:
ldr r4, _08139B98 @ =0x00003290
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
ldr r0, [r7]
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r6, r0
@@ -10596,7 +10596,7 @@ sub_8139C80: @ 8139C80
bl sub_810C214
ldr r4, _08139CAC @ =gUnknown_203B170
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
pop {r4}
@@ -10622,7 +10622,7 @@ sub_8139CB0: @ 8139CB0
adds r2, 0x90
adds r0, r1, r2
movs r1, 0x26
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
b _08139CDA
@@ -10636,7 +10636,7 @@ _08139CDA:
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_804BEF4
+ bl LoadBallGfx
lsls r0, r4, 1
adds r0, r4
lsls r0, 3
@@ -10645,7 +10645,7 @@ _08139CDA:
movs r1, 0x6A
movs r2, 0x58
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _08139D44 @ =gUnknown_203B140
ldr r1, [r2]
ldr r3, _08139D48 @ =0x0000300c
@@ -10730,7 +10730,7 @@ sub_8139D90: @ 8139D90
lsls r0, 2
ldr r1, _08139DB8 @ =gUnknown_202063C
adds r0, r1
- bl sub_804BD88
+ bl DestroySpriteAndFreeResources_
pop {r0}
bx r0
.align 2, 0
@@ -10748,13 +10748,13 @@ sub_8139DBC: @ 8139DBC
ldr r4, _08139E0C @ =0x00003290
adds r0, r4
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
ldr r0, [r6]
adds r0, r4
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
adds r0, r5, 0
bl sub_80970A0
@@ -10822,7 +10822,7 @@ _08139E58:
adds r1, r2
strb r0, [r1]
adds r0, r5, 0
- bl sub_80441F4
+ bl IsPokeSpriteNotFlipped
lsls r0, 24
cmp r0, 0
bne _08139EA8
@@ -10915,7 +10915,7 @@ sub_8139F20: @ 8139F20
ldr r1, _08139F58 @ =0x00003290
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8097138
@@ -10956,24 +10956,24 @@ sub_8139F64: @ 8139F64
movs r6, 0x80
lsls r6, 4
adds r0, r6, 0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [sp, 0x18]
adds r0, r6, 0
- bl sub_8002BB0
+ bl AllocZeroed
add r5, sp, 0x18
str r0, [r5, 0x4]
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
ldr r4, _0813A0BC @ =gUnknown_203B148
str r0, [r4]
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x4]
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0x8]
movs r0, 0xC
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4, 0xC]
ldr r0, _0813A0C0 @ =gUnknown_8463740
ldr r1, [sp, 0x18]
@@ -11026,9 +11026,9 @@ _08139FCC:
ldr r0, _0813A0DC @ =sub_813A124
str r0, [sp, 0x14]
mov r0, r8
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r6, 0
- bl sub_8008928
+ bl LoadSpritePalette
lsls r1, r4, 6
adds r1, 0x98
ldr r0, _0813A0E0 @ =gUnknown_203B16D
@@ -11042,7 +11042,7 @@ _08139FCC:
asrs r2, 16
mov r0, sp
adds r3, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _0813A0BC @ =gUnknown_203B148
@@ -11070,7 +11070,7 @@ _08139FCC:
ldr r0, [r3]
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_0813A07E:
adds r0, r7, 0x1
lsls r0, 24
@@ -11082,14 +11082,14 @@ _0813A07E:
ldr r0, [sp, 0x18]
cmp r0, 0
beq _0813A09C
- bl sub_8002BC4
+ bl Free
mov r0, r10
str r0, [sp, 0x18]
_0813A09C:
ldr r0, [sp, 0x1C]
cmp r0, 0
beq _0813A0AA
- bl sub_8002BC4
+ bl Free
mov r1, r10
str r1, [sp, 0x1C]
_0813A0AA:
@@ -11293,12 +11293,12 @@ _0813A222:
ldr r0, [r0]
cmp r0, 0
beq _0813A232
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813A232:
ldr r0, [r4]
cmp r0, 0
beq _0813A240
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0813A240:
@@ -11327,13 +11327,13 @@ sub_813A254: @ 813A254
ldr r0, _0813A310 @ =gUnknown_203B158
mov r8, r0
movs r0, 0x8
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
movs r4, 0x80
lsls r4, 3
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r0, _0813A314 @ =gUnknown_8E9BF48
adds r1, r5, 0
@@ -11368,14 +11368,14 @@ sub_813A254: @ 813A254
str r1, [sp, 0x10]
ldr r1, _0813A32C @ =nullsub_8
str r1, [sp, 0x14]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -11395,7 +11395,7 @@ _0813A2F0:
cmp r5, 0
beq _0813A304
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0813A304:
add sp, 0x28
pop {r3}
@@ -11423,12 +11423,12 @@ sub_813A334: @ 813A334
ldr r0, [r0]
cmp r0, 0
beq _0813A344
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813A344:
ldr r0, [r4]
cmp r0, 0
beq _0813A352
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0813A352:
@@ -11447,7 +11447,7 @@ sub_813A35C: @ 813A35C
ldr r1, _0813A390 @ =0x00003290
adds r0, r1
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
bl sub_8138C5C
ldr r1, [r4]
ldr r2, _0813A394 @ =0x0000326c
@@ -11472,7 +11472,7 @@ _0813A398:
subs r1, 0x1
lsls r1, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
bl sub_813A3B8
_0813A3AE:
@@ -11589,11 +11589,11 @@ sub_813A45C: @ 813A45C
str r0, [sp, 0x38]
ldr r4, _0813A4BC @ =gUnknown_203B15C
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0xC0
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
mov r9, r0
ldr r0, _0813A4C0 @ =gUnknown_8E9B4B8
mov r1, r9
@@ -11603,12 +11603,12 @@ sub_813A45C: @ 813A45C
ldr r4, _0813A4C8 @ =0x00003290
adds r0, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
ldr r0, [r5]
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsrs r0, r1, 2
cmp r0, r6
@@ -11670,13 +11670,13 @@ _0813A4D6:
ands r1, r6
orrs r1, r2
str r1, [r4, 0x4]
- bl sub_80086DC
+ bl LoadSpriteSheet
mov r0, r8
- bl sub_8008928
+ bl LoadSpritePalette
adds r0, r5, 0
- bl sub_8008928
+ bl LoadSpritePalette
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
_0813A540:
movs r4, 0
ldr r3, [sp, 0x38]
@@ -11712,7 +11712,7 @@ _0813A54C:
mov r0, sp
movs r2, 0x24
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -11748,7 +11748,7 @@ _0813A54C:
adds r0, r3
ldr r0, [r0]
movs r1, 0x8
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -11761,7 +11761,7 @@ _0813A54C:
cmp r2, 0
beq _0813A5F0
mov r0, r9
- bl sub_8002BC4
+ bl Free
_0813A5F0:
add sp, 0x40
pop {r3-r5}
@@ -11805,12 +11805,12 @@ _0813A642:
ldr r4, _0813A68C @ =0x00003290
adds r0, r1, r4
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
mov r9, r0
ldr r0, [r5]
adds r0, r4
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
movs r1, 0x5
bl __udivsi3
@@ -11823,7 +11823,7 @@ _0813A666:
asrs r0, 16
lsls r1, r4, 16
asrs r1, 16
- bl sub_804A614
+ bl GetHPBarLevel
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -11848,7 +11848,7 @@ _0813A696:
mov r8, r0
_0813A69A:
movs r0, 0x78
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
ldr r5, _0813A6FC @ =gUnknown_203B15C
ldr r1, [r5]
mov r3, r8
@@ -11887,7 +11887,7 @@ _0813A6DC:
adds r0, r1
ldr r0, [r0]
movs r1, 0x8
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
adds r0, 0x1
lsls r0, 24
@@ -11948,7 +11948,7 @@ _0813A74E:
adds r0, r1
ldr r0, [r0]
movs r1, 0x8
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
adds r0, 0x1
lsls r0, 24
@@ -11981,7 +11981,7 @@ _0813A76E:
lsls r3, r2, 2
adds r0, r3
ldr r0, [r0]
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r10
b _0813A7BE
.align 2, 0
@@ -11993,7 +11993,7 @@ _0813A7AC:
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r0, r8
_0813A7BE:
adds r0, 0x1
@@ -12007,15 +12007,15 @@ _0813A7CA:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x9
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r0, [r0, 0x4]
movs r1, 0xA
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r0, [r0, 0x20]
movs r1, 0xB
- bl sub_800838C
+ bl StartSpriteAnim
_0813A7EA:
add sp, 0x8
pop {r3-r5}
@@ -12041,7 +12041,7 @@ _0813A804:
ldr r0, [r0]
cmp r0, 0
beq _0813A816
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813A816:
adds r0, r4, 0x1
lsls r0, 24
@@ -12051,7 +12051,7 @@ _0813A816:
ldr r0, [r5]
cmp r0, 0
beq _0813A82E
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
_0813A82E:
@@ -12111,13 +12111,13 @@ sub_813A874: @ 813A874
ldr r0, _0813A970 @ =gUnknown_203B160
mov r8, r0
movs r0, 0x48
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
movs r4, 0xC0
lsls r4, 1
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r0, _0813A974 @ =gUnknown_8E9B3F0
adds r1, r5, 0
@@ -12137,9 +12137,9 @@ sub_813A874: @ 813A874
ands r1, r2
orrs r1, r6
str r1, [r4, 0x4]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
_0813A8D0:
movs r4, 0
mov r9, r4
@@ -12170,7 +12170,7 @@ _0813A8D4:
mov r0, sp
movs r2, 0x84
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -12209,7 +12209,7 @@ _0813A8D4:
cmp r5, 0
beq _0813A960
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0813A960:
add sp, 0x28
pop {r3,r4}
@@ -12252,18 +12252,18 @@ _0813A9B4:
ldr r4, _0813AAD8 @ =0x00003290
adds r0, r1, r4
movs r1, 0x19
- bl sub_803FBE8
+ bl GetMonData
mov r8, r0
ldr r0, [r6]
adds r0, r4
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r5, r0, 24
ldr r0, [r6]
adds r0, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r4, r0, 16
cmp r5, 0x63
@@ -12339,7 +12339,7 @@ _0813AA58:
adds r0, r1
ldr r0, [r0]
movs r1, 0x8
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -12354,7 +12354,7 @@ _0813AA72:
ldr r0, [r0]
ldr r0, [r0, 0x24]
movs r1, 0x7
- bl sub_800838C
+ bl StartSpriteAnim
_0813AA86:
lsrs r3, r4, 29
lsls r2, r5, 3
@@ -12373,7 +12373,7 @@ _0813AA86:
lsls r3, r7, 2
adds r0, r3
ldr r0, [r0]
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r7, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -12385,7 +12385,7 @@ _0813AAB8:
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -12407,7 +12407,7 @@ _0813AAEC:
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -12418,15 +12418,15 @@ _0813AB04:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x9
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r0, [r0, 0x4]
movs r1, 0xA
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r4]
ldr r0, [r0, 0x28]
movs r1, 0xB
- bl sub_800838C
+ bl StartSpriteAnim
_0813AB24:
add sp, 0x8
pop {r3-r5}
@@ -12452,7 +12452,7 @@ _0813AB3C:
ldr r0, [r0]
cmp r0, 0
beq _0813AB4E
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813AB4E:
adds r0, r4, 0x1
lsls r0, 24
@@ -12462,7 +12462,7 @@ _0813AB4E:
ldr r0, [r5]
cmp r0, 0
beq _0813AB66
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
_0813AB66:
@@ -12521,11 +12521,11 @@ sub_813ABAC: @ 813ABAC
ldr r0, _0813AC68 @ =gUnknown_203B164
mov r8, r0
movs r0, 0x8
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r0, _0813AC6C @ =gUnknown_8463B20
adds r1, r5, 0
@@ -12561,14 +12561,14 @@ sub_813ABAC: @ 813ABAC
str r1, [sp, 0x10]
ldr r1, _0813AC84 @ =nullsub_8
str r1, [sp, 0x14]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0x72
movs r2, 0x5C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -12588,7 +12588,7 @@ _0813AC46:
cmp r5, 0
beq _0813AC5A
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0813AC5A:
add sp, 0x28
pop {r3}
@@ -12616,12 +12616,12 @@ sub_813AC8C: @ 813AC8C
ldr r0, [r0]
cmp r0, 0
beq _0813AC9C
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813AC9C:
ldr r0, [r4]
cmp r0, 0
beq _0813ACAA
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0813ACAA:
@@ -12769,11 +12769,11 @@ sub_813ADA8: @ 813ADA8
ldr r0, _0813AE64 @ =gUnknown_203B168
mov r8, r0
movs r0, 0x8
- bl sub_8002BB0
+ bl AllocZeroed
mov r1, r8
str r0, [r1]
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r0, _0813AE68 @ =gUnknown_8463B64
adds r1, r5, 0
@@ -12809,14 +12809,14 @@ sub_813ADA8: @ 813ADA8
str r1, [sp, 0x10]
ldr r1, _0813AE80 @ =nullsub_8
str r1, [sp, 0x14]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, sp
movs r1, 0x6A
movs r2, 0x28
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -12836,7 +12836,7 @@ _0813AE42:
cmp r5, 0
beq _0813AE56
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0813AE56:
add sp, 0x28
pop {r3}
@@ -12864,12 +12864,12 @@ sub_813AE88: @ 813AE88
ldr r0, [r0]
cmp r0, 0
beq _0813AE98
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_0813AE98:
ldr r0, [r4]
cmp r0, 0
beq _0813AEA6
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0813AEA6:
@@ -13010,7 +13010,7 @@ sub_813AF90: @ 813AF90
bl sub_813A334
bl sub_813AC8C
bl sub_813AE88
- bl sub_8006B10
+ bl ResetSpriteData
pop {r0}
bx r0
thumb_func_end sub_813AF90
@@ -13043,13 +13043,13 @@ sub_813AFFC: @ 813AFFC
ldr r1, _0813B05C @ =0x00003290
adds r0, r1
movs r1, 0x8
- bl sub_803FBE8
+ bl GetMonData
adds r6, r0, 0
ldr r0, [r5]
ldr r4, _0813B060 @ =0x000032fc
adds r0, r4
ldr r0, [r0]
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
ldr r2, _0813B064 @ =gUnknown_84636E0
movs r0, 0x8C
movs r1, 0x8C
@@ -13063,7 +13063,7 @@ sub_813AFFC: @ 813AFFC
lsls r1, r6, 24
lsrs r1, 24
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r5]
adds r0, r4
ldr r2, [r0]
@@ -13093,7 +13093,7 @@ sub_813B068: @ 813B068
ldr r1, _0813B080 @ =0x000032fc
adds r0, r1
ldr r0, [r0]
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
pop {r0}
bx r0
.align 2, 0
@@ -13111,7 +13111,7 @@ sub_813B084: @ 813B084
ldr r1, _0813B0B4 @ =0x00003290
adds r0, r1
movs r1, 0x8
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0813B0BC
ldr r0, [r4]
@@ -13160,7 +13160,7 @@ sub_813B0E4: @ 813B0E4
ldr r1, _0813B118 @ =0x00003290
adds r0, r1
movs r1, 0x8
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
ldr r0, [r4]
ldr r2, _0813B11C @ =0x000032fc
@@ -13168,7 +13168,7 @@ sub_813B0E4: @ 813B0E4
ldr r0, [r0]
lsls r1, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
bl sub_813B084
pop {r4}
@@ -13274,7 +13274,7 @@ _0813B1CC:
strb r2, [r0]
ldr r0, _0813B200 @ =sub_813B3F0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _0813B204 @ =gUnknown_203B140
ldr r0, [r0]
ldr r1, _0813B208 @ =0x0000328c
@@ -13375,7 +13375,7 @@ _0813B2A8:
muls r0, r1
adds r0, r7, r0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0813B26E
ldrb r0, [r4]
@@ -13394,7 +13394,7 @@ sub_813B2C8: @ 813B2C8
push {r4,lr}
adds r4, r0, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0813B2FC
ldr r0, _0813B2F4 @ =gUnknown_203B140
@@ -13406,7 +13406,7 @@ sub_813B2C8: @ 813B2C8
bne _0813B2F0
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0813B2FC
_0813B2F0:
@@ -13599,7 +13599,7 @@ _0813B420:
.4byte _0813B678
.4byte _0813B70C
_0813B450:
- bl sub_80721C4
+ bl StopCryAndClearCrySongs
ldr r0, _0813B468 @ =gUnknown_203B16D
movs r1, 0
strb r1, [r0]
@@ -13628,7 +13628,7 @@ _0813B486:
ldr r0, [r5]
adds r0, r4
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
movs r2, 0xC8
lsls r2, 6
@@ -13637,7 +13637,7 @@ _0813B486:
ldr r0, [r5]
adds r0, r4
movs r1, 0x4
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
ldr r2, _0813B4D4 @ =0x00003204
adds r1, r2
@@ -13668,7 +13668,7 @@ _0813B4DC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r4, _0813B52C @ =gUnknown_203B140
ldr r0, [r4]
ldr r1, _0813B530 @ =0x00003290
@@ -13689,12 +13689,12 @@ _0813B4DC:
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
subs r4, 0x20
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0813B550
.align 2, 0
_0813B52C: .4byte gUnknown_203B140
@@ -13705,12 +13705,12 @@ _0813B538:
adds r0, r4, 0
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x20
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0813B550:
ldr r0, _0813B560 @ =gUnknown_203B140
ldr r1, [r0]
@@ -13740,7 +13740,7 @@ _0813B568:
ldr r1, _0813B5B0 @ =gUnknown_8E9BBCC
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, [r4]
movs r4, 0xC9
lsls r4, 6
@@ -13749,7 +13749,7 @@ _0813B568:
ldr r1, _0813B5B4 @ =gUnknown_8E9B750
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
b _0813B5DC
.align 2, 0
_0813B5A8: .4byte gUnknown_203B140
@@ -13763,7 +13763,7 @@ _0813B5B8:
ldr r1, _0813B5EC @ =gUnknown_8E9B598
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, [r4]
movs r4, 0xC9
lsls r4, 6
@@ -13772,7 +13772,7 @@ _0813B5B8:
ldr r1, _0813B5F0 @ =gUnknown_8E9B750
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
_0813B5DC:
ldr r0, _0813B5F4 @ =gUnknown_203B140
ldr r1, [r0]
@@ -13887,11 +13887,11 @@ _0813B678:
movs r1, 0x2
bl sub_8003F20
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r5]
ldr r0, _0813B708 @ =0x0000328c
adds r1, r0
@@ -13929,7 +13929,7 @@ _0813B73C:
movs r0, 0
strb r0, [r2]
adds r0, r3, 0
- bl sub_8077508
+ bl DestroyTask
_0813B746:
add sp, 0x8
pop {r4,r5}
@@ -13946,19 +13946,19 @@ sub_813B750: @ 813B750
lsls r5, 7
movs r0, 0
adds r1, r5, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
cmp r4, 0x2
bgt _0813B77E
cmp r4, 0
blt _0813B77E
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r5, 0
orrs r1, r0
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
_0813B77E:
pop {r4,r5}
pop {r0}
@@ -13973,23 +13973,23 @@ sub_813B784: @ 813B784
ldr r5, _0813B7C0 @ =0x00003290
adds r0, r5
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0813B7DA
ldr r0, [r4]
adds r0, r5
- bl sub_8035A28
+ bl ShouldPlayNormalPokeCry
cmp r0, 0x1
bne _0813B7C4
ldr r0, [r4]
adds r0, r5
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0
movs r2, 0
- bl sub_8071E60
+ bl PlayCry3
b _0813B7DA
.align 2, 0
_0813B7BC: .4byte gUnknown_203B140
@@ -13998,12 +13998,12 @@ _0813B7C4:
ldr r0, [r4]
adds r0, r5
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
movs r1, 0
movs r2, 0xB
- bl sub_8071E60
+ bl PlayCry3
_0813B7DA:
pop {r4,r5}
pop {r0}
@@ -14037,7 +14037,7 @@ sub_813B7F8: @ 813B7F8
ldr r1, _0813B82C @ =0x00003290
adds r0, r1
movs r1, 0x25
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r1, r0, 24
movs r2, 0xFC
@@ -14088,7 +14088,7 @@ _0813B84E:
sub_813B854: @ 813B854
push {lr}
sub sp, 0x4
- ldr r3, _0813B86C @ =sub_80567DC
+ ldr r3, _0813B86C @ =c2_exit_to_overworld_2_switch
movs r0, 0
str r0, [sp]
movs r1, 0
@@ -14098,7 +14098,7 @@ sub_813B854: @ 813B854
pop {r0}
bx r0
.align 2, 0
-_0813B86C: .4byte sub_80567DC
+_0813B86C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_813B854
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/post_battle_event_funcs.s b/asm/post_battle_event_funcs.s
index 5075f8835..572f77849 100644
--- a/asm/post_battle_event_funcs.s
+++ b/asm/post_battle_event_funcs.s
@@ -60,17 +60,17 @@ _080CA34A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080CA388
adds r0, r4, 0
movs r1, 0x6
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080CA388
adds r0, r4, 0
movs r1, 0x43
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080CA388
movs r0, 0x1
@@ -92,7 +92,7 @@ _080CA388:
bl sub_806E680
_080CA39E:
ldr r0, _080CA3C0 @ =sub_80F1EFC
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0
add sp, 0x4
pop {r4-r7}
@@ -110,7 +110,7 @@ _080CA3C0: .4byte sub_80F1EFC
sub_80CA3C4: @ 80CA3C4
push {lr}
ldr r0, _080CA3D4 @ =sub_80566A4
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
diff --git a/asm/prof_pc.s b/asm/prof_pc.s
index 39de560db..cc3821aa7 100644
--- a/asm/prof_pc.s
+++ b/asm/prof_pc.s
@@ -151,7 +151,7 @@ _080CA4D8:
cmp r2, 0x96
bne _080CA508
movs r0, 0x97
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r0, 16
movs r1, 0x1
diff --git a/asm/quest_log.s b/asm/quest_log.s
index 9c453d6e4..1f41d153c 100644
--- a/asm/quest_log.s
+++ b/asm/quest_log.s
@@ -331,7 +331,7 @@ _08110A98:
movs r0, 0x80
orrs r1, r0
strb r1, [r3]
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r0, 0
bl sub_81118F4
_08110AAE:
@@ -949,7 +949,7 @@ _08110F48:
adds r0, r4, 0
bl sub_8110F90
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _08110F84
.align 2, 0
_08110F6C: .4byte gUnknown_203ADF9
@@ -957,9 +957,9 @@ _08110F70: .4byte gUnknown_3005008
_08110F74: .4byte gUnknown_3005ECC
_08110F78:
ldr r0, _08110F8C @ =sub_8056938
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08110F84:
pop {r4-r7}
pop {r0}
@@ -1026,10 +1026,10 @@ _08110FFC: .4byte gUnknown_203AE98
sub_8111000: @ 8111000
push {lr}
movs r0, 0x4
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
bl sub_81109CC
bl sub_807DF64
@@ -1053,10 +1053,10 @@ _08111034: .4byte gUnknown_203AE94
sub_8111038: @ 8111038
push {lr}
movs r0, 0x4
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
bl sub_81109CC
bl sub_807DF7C
@@ -1102,7 +1102,7 @@ _0811107A:
movs r1, 0xF
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -1122,7 +1122,7 @@ _0811107A:
bl sub_8008E78
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
_081110D2:
ldrb r0, [r6]
movs r1, 0x1
@@ -1139,9 +1139,9 @@ _081110D2:
movs r3, 0x2
bl sub_812E5A4
ldrb r0, [r6]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6, 0x1]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6]
movs r1, 0x2
bl sub_8003F20
@@ -1169,7 +1169,7 @@ sub_8111134: @ 8111134
push {r4,lr}
ldr r4, _0811114C @ =gUnknown_203ADFE
ldrb r0, [r4, 0x1]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4, 0x1]
movs r1, 0x1
bl sub_8003F20
@@ -1462,7 +1462,7 @@ sub_8111368: @ 8111368
ldr r0, _081113AC @ =sub_8111038
str r0, [r1]
ldr r0, _081113B0 @ =sub_80572A8
- bl sub_8000544
+ bl SetMainCallback2
b _081113CE
.align 2, 0
_081113A0: .4byte gUnknown_203ADFA
@@ -1475,12 +1475,12 @@ _081113B4:
ldrb r0, [r0]
movs r1, 0x1
bl sub_8111274
- bl sub_8055378
+ bl warp_in
ldr r1, _081113D8 @ =gUnknown_3005024
ldr r0, _081113DC @ =sub_8111000
str r0, [r1]
ldr r0, _081113E0 @ =sub_805726C
- bl sub_8000544
+ bl SetMainCallback2
_081113CE:
pop {r0}
bx r0
@@ -1540,7 +1540,7 @@ sub_8111438: @ 8111438
push {r6,r7}
sub sp, 0x14
movs r0, 0x68
- bl sub_8002BB0
+ bl AllocZeroed
mov r9, r0
movs r0, 0
str r0, [sp]
@@ -1551,7 +1551,7 @@ sub_8111438: @ 8111438
movs r1, 0x13
movs r2, 0x1
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
ldr r0, _081114BC @ =0x00004027
bl sub_806E568
lsls r0, 16
@@ -1583,7 +1583,7 @@ _08111492:
ldr r1, _081114C0 @ =gUnknown_2024284
adds r0, r1
str r3, [sp, 0x10]
- bl sub_803D994
+ bl ZeroMonData
ldr r3, [sp, 0x10]
adds r0, r3, 0x1
lsls r0, 16
@@ -1628,7 +1628,7 @@ _081114EE:
mov r1, r9
movs r2, 0x64
str r3, [sp, 0x10]
- bl sub_8040B08
+ bl CopyMon
ldr r3, [sp, 0x10]
adds r0, r3, 0x1
lsls r0, 16
@@ -1656,7 +1656,7 @@ _08111526:
adds r1, r4, 0
movs r2, 0x5
str r3, [sp, 0x10]
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
ldr r3, [sp, 0x10]
cmp r0, 0
beq _08111554
@@ -1701,17 +1701,17 @@ _08111582:
lsrs r1, 24
lsrs r0, r7, 24
str r3, [sp, 0x10]
- bl sub_808BD30
+ bl GetBoxedMonPtr
adds r4, r0, 0
movs r1, 0x5
- bl sub_803FD44
+ bl GetBoxMonData
ldr r3, [sp, 0x10]
cmp r0, 0
bne _081115B6
adds r0, r4, 0
mov r1, r9
movs r2, 0x50
- bl sub_8040B08
+ bl CopyMon
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -1737,7 +1737,7 @@ _081115B6:
bls _0811157E
_081115D2:
mov r0, r9
- bl sub_8002BC4
+ bl Free
add sp, 0x14
pop {r3,r4}
mov r8, r3
@@ -1782,7 +1782,7 @@ _0811161E:
ldr r1, _08111648 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08111636
adds r0, r5, 0x1
@@ -1816,7 +1816,7 @@ _08111658:
lsrs r1, 24
lsrs r0, r5, 24
movs r2, 0x5
- bl sub_808BA18
+ bl GetBoxMonDataFromAnyBox
cmp r0, 0
beq _0811166E
adds r0, r6, 0x1
@@ -1928,7 +1928,7 @@ sub_8111708: @ 8111708
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
mov r1, sp
ldm r0!, {r2,r3,r5}
stm r1!, {r2,r3,r5}
@@ -2125,7 +2125,7 @@ sub_81118F4: @ 81118F4
lsls r1, 24
asrs r1, 24
movs r0, 0x1
- bl sub_807A818
+ bl fade_screen
ldr r1, _0811190C @ =gUnknown_203AE8C
ldr r0, _08111910 @ =sub_8111914
str r0, [r1]
@@ -2145,7 +2145,7 @@ sub_8111914: @ 8111914
ands r0, r1
cmp r0, 0
bne _0811197A
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _08111964 @ =gUnknown_203ADF8
ldrb r0, [r1]
adds r0, 0x1
@@ -2194,11 +2194,11 @@ _08111980: .4byte gUnknown_3005E88
sub_8111984: @ 8111984
push {lr}
bl sub_806E6FC
- bl sub_80D9750
+ bl ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _081119B4 @ =sub_8057430
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _081119B8 @ =gUnknown_3005024
ldr r0, _081119BC @ =sub_8111F60
str r0, [r1]
@@ -2249,7 +2249,7 @@ _081119F2:
strb r0, [r1]
ldr r0, _08111A24 @ =sub_8111A34
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08111A28 @ =gUnknown_3005090
@@ -2262,7 +2262,7 @@ _081119F2:
strh r2, [r1, 0xA]
movs r1, 0xE
adds r2, r4, 0
- bl sub_80776E8
+ bl SetWordTaskArg
movs r0, 0x1
b _08111A2E
.align 2, 0
@@ -2311,7 +2311,7 @@ _08111A58:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r2, _08111A8C @ =gUnknown_203AE94
ldrb r1, [r2]
movs r0, 0x3F
@@ -2338,13 +2338,13 @@ _08111A90:
strb r1, [r0]
adds r0, r5, 0
movs r1, 0xE
- bl sub_8077720
+ bl GetWordTaskArg
cmp r0, 0
beq _08111AB4
bl _call_via_r0
_08111AB4:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
ldr r1, _08111AD0 @ =gUnknown_203AE8C
ldr r0, _08111AD4 @ =sub_8111914
str r0, [r1]
@@ -2697,7 +2697,7 @@ _08111D30:
bne _08111D22
_08111D42:
ldrb r0, [r5, 0x2]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r5, 0x2]
bl sub_8111D90
ldrb r0, [r5, 0x2]
@@ -2717,7 +2717,7 @@ _08111D42:
movs r2, 0x2
bl sub_812E5A4
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x14
pop {r4,r5}
pop {r0}
@@ -2743,7 +2743,7 @@ sub_8111D90: @ 8111D90
mov r9, r0
movs r0, 0xB4
lsls r0, 5
- bl sub_8002B9C
+ bl Alloc
mov r8, r0
cmp r0, 0
beq _08111E0C
@@ -2791,9 +2791,9 @@ _08111DD6:
mov r0, r10
mov r1, r8
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
mov r0, r8
- bl sub_8002BC4
+ bl Free
_08111E0C:
pop {r3-r5}
mov r8, r3
@@ -2812,7 +2812,7 @@ sub_8111E20: @ 8111E20
sub sp, 0x8
ldr r4, _08111E60 @ =gUnknown_203ADFE
ldrb r0, [r4, 0x2]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4, 0x2]
movs r1, 0xF0
str r1, [sp]
@@ -2821,12 +2821,12 @@ sub_8111E20: @ 8111E20
movs r1, 0xF
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r4, 0x2]
movs r1, 0x2
bl sub_8003F20
ldrb r0, [r4, 0x1]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4, 0x1]
movs r1, 0x1
bl sub_8003F20
@@ -2845,7 +2845,7 @@ sub_8111E64: @ 8111E64
lsls r1, 24
asrs r1, 24
movs r0, 0x1
- bl sub_807A818
+ bl fade_screen
ldr r1, _08111E7C @ =gUnknown_203AE8C
ldr r0, _08111E80 @ =sub_8111E84
str r0, [r1]
@@ -2865,7 +2865,7 @@ sub_8111E84: @ 8111E84
ands r0, r1
cmp r0, 0
bne _08111EF8
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r3, _08111F04 @ =gUnknown_203ADF8
ldrb r0, [r3]
lsls r0, 24
@@ -2937,7 +2937,7 @@ sub_8111F14: @ 8111F14
ldr r4, _08111F34 @ =gUnknown_203AE90
movs r0, 0x80
lsls r0, 3
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
_08111F2A:
pop {r4}
@@ -2974,16 +2974,16 @@ _08111F5C: .4byte gUnknown_203AE90
sub_8111F60: @ 8111F60
push {lr}
movs r0, 0x4
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
bl sub_8111070
bl sub_807DF7C
ldr r0, _08111F88 @ =sub_8111F8C
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
pop {r1}
bx r1
@@ -3001,15 +3001,15 @@ sub_8111F8C: @ 8111F8C
lsls r1, 3
ldr r0, _08111FC4 @ =gUnknown_3005090
adds r4, r1, r0
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08111FBC
- bl sub_8068974
+ bl player_bitmagic
bl sub_805C270
bl sub_805C780
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _08111FC8 @ =sub_8111FCC
str r0, [r4]
_08111FBC:
@@ -3058,8 +3058,8 @@ _0811200E:
strh r4, [r5, 0xA]
ldr r0, _08112040 @ =sub_8112044
str r0, [r5]
- bl sub_8068974
- bl sub_8069940
+ bl player_bitmagic
+ bl ScriptContext2_Enable
_0811201E:
pop {r4,r5}
pop {r0}
@@ -3170,7 +3170,7 @@ _081120DA:
movs r1, 0xF
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
b _0811215C
.align 2, 0
_08112104: .4byte gUnknown_2031DD8
@@ -3187,7 +3187,7 @@ _0811211E:
ldr r4, _08112148 @ =gUnknown_203ADFE
adds r4, r5, r4
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
@@ -3234,11 +3234,11 @@ _08112176:
lsls r2, 2
bl CpuSet
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r4, 0
str r4, [r6]
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
ldr r2, _081121CC @ =gUnknown_3003E50
ldrb r1, [r2]
movs r0, 0x5
@@ -3253,7 +3253,7 @@ _08112176:
movs r0, 0x1
strb r0, [r1]
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_081121B8:
add sp, 0x8
pop {r4-r6}
@@ -3325,7 +3325,7 @@ sub_81121D8: @ 81121D8
str r6, [sp, 0x4]
movs r1, 0
movs r2, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r5, 0x1]
ldrh r3, [r7, 0x2]
ldrb r1, [r4, 0xB]
@@ -3334,7 +3334,7 @@ sub_81121D8: @ 81121D8
str r6, [sp, 0x4]
movs r1, 0
movs r2, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r5]
movs r1, 0x2
bl sub_8003F20
@@ -3366,7 +3366,7 @@ sub_811229C: @ 811229C
push {r4-r6,lr}
movs r0, 0x80
lsls r0, 3
- bl sub_8002B9C
+ bl Alloc
adds r6, r0, 0
ldr r4, _08112314 @ =gUnknown_203AE90
ldr r0, [r4]
@@ -3409,7 +3409,7 @@ sub_811229C: @ 811229C
adds r2, r5, 0
bl CpuSet
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
pop {r4-r6}
pop {r0}
bx r0
@@ -3500,7 +3500,7 @@ sub_81123BC: @ 81123BC
sub sp, 0x4
movs r0, 0xCD
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
mov r8, r0
ldr r0, _08112448 @ =gUnknown_203ADF8
ldrb r4, [r0]
@@ -3555,7 +3555,7 @@ _0811240A:
mov r0, r8
bl CpuSet
mov r0, r8
- bl sub_8002BC4
+ bl Free
add sp, 0x4
pop {r3}
mov r8, r3
@@ -4099,7 +4099,7 @@ sub_81127F8: @ 81127F8
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -4340,7 +4340,7 @@ _08112A0E:
lsls r0, 3
adds r0, r1
strb r2, [r0]
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -4623,7 +4623,7 @@ _08112C58:
strb r0, [r5]
b _08112C84
_08112C5E:
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4708,7 +4708,7 @@ sub_8112CEC: @ 8112CEC
ldrh r1, [r1]
cmp r0, r1
bcs _08112D06
- bl sub_8069958
+ bl ScriptContext2_IsEnabled
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4953,7 +4953,7 @@ sub_8112EB4: @ 8112EB4
bl sub_8003CE4
strb r0, [r4]
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08112ECC:
ldrb r0, [r4]
pop {r4}
@@ -4974,9 +4974,9 @@ sub_8112EDC: @ 8112EDC
cmp r0, 0xFF
beq _08112F0C
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
cmp r5, 0
beq _08112F02
ldrb r0, [r4]
@@ -5017,7 +5017,7 @@ sub_8112F18: @ 8112F18
lsrs r7, r0, 24
lsls r0, r7, 5
muls r0, r6
- bl sub_8002B9C
+ bl Alloc
mov r8, r0
cmp r0, 0
beq _08112FB8
@@ -5073,9 +5073,9 @@ _08112FA2:
mov r0, r10
mov r1, r8
movs r3, 0
- bl sub_8004404
+ bl CopyToWindowPixelBuffer
mov r0, r8
- bl sub_8002BC4
+ bl Free
_08112FB8:
add sp, 0x8
pop {r3-r5}
@@ -5343,7 +5343,7 @@ _081131A4:
cmp r1, 0
bne _081131D4
mov r8, r6
- bl sub_8044EC8
+ bl Random
adds r1, r7, 0
ands r1, r0
cmp r1, 0
@@ -5419,7 +5419,7 @@ _0811322C:
beq _0811324E
mov r8, r5
str r2, [sp]
- bl sub_8044EC8
+ bl Random
adds r1, r4, 0
ands r1, r0
ldr r2, [sp]
@@ -5694,7 +5694,7 @@ sub_8113414: @ 8113414
_08113436:
ldr r0, _08113440 @ =gUnknown_2021CD0
ldr r1, _08113444 @ =gUnknown_84178D0
- bl sub_8008D84
+ bl StringCopy
b _081134B2
.align 2, 0
_08113440: .4byte gUnknown_2021CD0
@@ -5702,7 +5702,7 @@ _08113444: .4byte gUnknown_84178D0
_08113448:
ldr r0, _08113454 @ =gUnknown_2021CD0
ldr r1, _08113458 @ =gUnknown_84178DA
- bl sub_8008D84
+ bl StringCopy
b _081134B2
.align 2, 0
_08113454: .4byte gUnknown_2021CD0
@@ -5713,7 +5713,7 @@ _0811345C:
ldr r1, [r1]
ldr r2, _08113474 @ =0x00003a4c
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
b _081134B2
.align 2, 0
_0811346C: .4byte gUnknown_2021CD0
@@ -5723,7 +5723,7 @@ _08113478:
ldr r4, _08113498 @ =gUnknown_2021CD0
adds r0, r4, 0
movs r2, 0x7
- bl sub_8008DBC
+ bl StringCopyN
movs r0, 0xFF
strb r0, [r4, 0x7]
ldrb r0, [r4]
@@ -7154,12 +7154,12 @@ sub_8113EAC: @ 8113EAC
cmp r1, r0
beq _08113ED0
adds r0, r3, 0
- bl sub_8040FD0
+ bl GetSpeciesName
b _08113F08
_08113ED0:
ldr r1, _08113EDC @ =gUnknown_8415A62
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
b _08113F08
.align 2, 0
_08113EDC: .4byte gUnknown_8415A62
@@ -7289,7 +7289,7 @@ sub_8113FBC: @ 8113FBC
bl sub_8113E88
adds r5, r0, 0
ldrh r0, [r5]
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
@@ -7314,10 +7314,10 @@ _08113FE8:
_08113FFC:
ldr r4, _08114024 @ =gUnknown_2021CD0
ldrh r0, [r5]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrh r0, [r5]
cmp r0, 0x55
bne _08114034
@@ -7362,10 +7362,10 @@ _08114070: .4byte gUnknown_841A210
_08114074:
ldr r4, _08114090 @ =gUnknown_2021CD0
ldrh r0, [r5]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08114094 @ =gUnknown_2021D18
ldr r1, _08114098 @ =gUnknown_841A220
bl sub_8008FCC
@@ -7381,7 +7381,7 @@ _0811409C:
bl sub_8113EAC
ldr r4, _081140EC @ =gUnknown_2021CF0
ldrh r0, [r5]
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
movs r7, 0xD
@@ -7390,7 +7390,7 @@ _0811409C:
ldr r6, _081140F0 @ =gUnknown_8247094
adds r1, r6
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldrh r1, [r5, 0x4]
ldr r0, _081140F4 @ =0x0000ffff
cmp r1, r0
@@ -7398,7 +7398,7 @@ _0811409C:
ldr r0, _081140F8 @ =gUnknown_2021D04
muls r1, r7
adds r1, r6
- bl sub_8008D84
+ bl StringCopy
ldrh r1, [r5]
movs r0, 0xA9
lsls r0, 1
@@ -7500,10 +7500,10 @@ sub_8114188: @ 8114188
bl sub_8113EAC
ldr r5, _081141C4 @ =gUnknown_2021CF0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081141C8 @ =gUnknown_2021D18
ldr r1, _081141CC @ =gUnknown_841AB74
bl sub_8008FCC
@@ -7544,10 +7544,10 @@ sub_81141E4: @ 81141E4
bl sub_8113EAC
ldr r5, _08114220 @ =gUnknown_2021CF0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08114224 @ =gUnknown_2021D18
ldr r1, _08114228 @ =gUnknown_841AB8E
bl sub_8008FCC
@@ -7588,10 +7588,10 @@ sub_8114240: @ 8114240
bl sub_8113EAC
ldr r5, _0811427C @ =gUnknown_2021CD0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08114280 @ =gUnknown_2021D18
ldr r1, _08114284 @ =gUnknown_841A6A5
bl sub_8008FCC
@@ -7632,10 +7632,10 @@ sub_811429C: @ 811429C
bl sub_8113EAC
ldr r5, _081142D8 @ =gUnknown_2021CF0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081142DC @ =gUnknown_2021D18
ldr r1, _081142E0 @ =gUnknown_841A1CD
bl sub_8008FCC
@@ -7702,16 +7702,16 @@ sub_8114324: @ 8114324
bl sub_8113EAC
ldr r5, _08114370 @ =gUnknown_2021CF0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r5, _08114374 @ =gUnknown_2021D04
ldrh r0, [r4, 0x2]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08114378 @ =gUnknown_2021D18
ldr r1, _0811437C @ =gUnknown_841A193
bl sub_8008FCC
@@ -7753,16 +7753,16 @@ sub_8114394: @ 8114394
bl sub_8113EAC
ldr r5, _081143E0 @ =gUnknown_2021D04
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r5, _081143E4 @ =gUnknown_2021CD0
ldrh r0, [r4, 0x2]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081143E8 @ =gUnknown_2021D18
ldr r1, _081143EC @ =gUnknown_841A6E1
bl sub_8008FCC
@@ -8097,15 +8097,15 @@ sub_811464C: @ 811464C
bl memset
adds r1, r4, 0x5
mov r0, r8
- bl sub_8008D54
+ bl StringCopy7
adds r1, r4, 0
adds r1, 0xC
adds r0, r6, 0
- bl sub_8008D54
+ bl StringCopy7
adds r1, r4, 0
adds r1, 0x13
adds r0, r5, 0
- bl sub_8008D54
+ bl StringCopy7
mov r0, r8
bl sub_8115834
adds r0, r6, 0
@@ -8325,7 +8325,7 @@ sub_8114834: @ 8114834
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08114884 @ =gUnknown_2021D18
ldr r1, _08114888 @ =gUnknown_841A7B0
bl sub_8008FCC
@@ -8381,7 +8381,7 @@ sub_81148BC: @ 81148BC
adds r5, r4, 0x4
bl sub_813CC90
ldrb r0, [r4, 0x4]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8390,7 +8390,7 @@ sub_81148BC: @ 81148BC
movs r2, 0x1
bl sub_8113EAC
ldrb r0, [r5, 0x1]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x2
bl sub_813CCAC
@@ -8447,7 +8447,7 @@ sub_8114944: @ 8114944
adds r4, r0, 0
bl sub_813CC90
ldrb r0, [r4, 0x4]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8520,7 +8520,7 @@ sub_81149D0: @ 81149D0
adds r4, r0, 0
bl sub_813CC90
ldrb r0, [r4, 0x4]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8583,7 +8583,7 @@ sub_8114A4C: @ 8114A4C
adds r5, r4, 0x2
bl sub_813CC90
ldrb r0, [r4, 0x2]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8592,7 +8592,7 @@ sub_8114A4C: @ 8114A4C
movs r2, 0x1
bl sub_8113EAC
ldrb r0, [r5, 0x1]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x2
bl sub_813CCAC
@@ -8644,7 +8644,7 @@ sub_8114AC8: @ 8114AC8
adds r5, r4, 0x2
bl sub_813CC90
ldrb r0, [r4, 0x2]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8700,7 +8700,7 @@ sub_8114B34: @ 8114B34
adds r5, r4, 0x2
bl sub_813CC90
ldrb r0, [r4, 0x2]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8760,7 +8760,7 @@ sub_8114BA0: @ 8114BA0
movs r2, 0
bl sub_8113EAC
ldrb r0, [r4, 0x2]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x1
bl sub_813CCAC
@@ -8811,7 +8811,7 @@ sub_8114C0C: @ 8114C0C
adds r4, r0, 0
bl sub_813CC90
ldrb r0, [r4]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0
bl sub_813CCAC
@@ -8827,7 +8827,7 @@ sub_8114C0C: @ 8114C0C
_08114C3C: .4byte gUnknown_841A694
_08114C40:
ldrb r0, [r4, 0x1]
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
movs r0, 0x1
bl sub_813CCAC
@@ -9559,7 +9559,7 @@ sub_81151DC: @ 81151DC
bne _08115234
_0811521A:
movs r0, 0x6
- bl sub_80091E0
+ bl GetExpandedPlaceholder
adds r1, r0, 0
movs r0, 0x1
bl sub_813CCAC
@@ -9652,7 +9652,7 @@ sub_81152BC: @ 81152BC
lsls r1, r6, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08115324 @ =gUnknown_8456BE4
adds r1, r6, r0
ldrb r0, [r1]
@@ -9882,7 +9882,7 @@ _08115486:
bne _081154AC
ldr r0, _081154A4 @ =gUnknown_2021D04
ldr r1, _081154A8 @ =gUnknown_841B09F
- bl sub_8008D84
+ bl StringCopy
b _081154B4
.align 2, 0
_0811549C: .4byte gUnknown_2021CD0
@@ -9892,7 +9892,7 @@ _081154A8: .4byte gUnknown_841B09F
_081154AC:
ldr r0, _081154CC @ =gUnknown_2021D04
ldr r1, _081154D0 @ =gUnknown_8418C1B
- bl sub_8008D84
+ bl StringCopy
_081154B4:
ldr r0, _081154D4 @ =gUnknown_2021D18
ldr r2, _081154D8 @ =gUnknown_8456C20
@@ -9968,7 +9968,7 @@ sub_8115518: @ 8115518
adds r1, r5, 0
bl sub_813CCAC
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x1
bl sub_813CCAC
@@ -10070,7 +10070,7 @@ sub_81155E0: @ 81155E0
adds r1, r4, 0
bl sub_813CCAC
ldrh r0, [r5]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x2
bl sub_813CCAC
@@ -10118,7 +10118,7 @@ _08115690:
adds r1, r4, 0
bl sub_813CCAC
ldrh r0, [r5]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
movs r0, 0x1
bl sub_813CCAC
@@ -10183,10 +10183,10 @@ sub_8115700: @ 8115700
bl sub_80C4DF8
ldr r6, _0811573C @ =gUnknown_2021CF0
ldrh r0, [r4]
- bl sub_809A8BC
+ bl ItemId_GetItem
adds r1, r0, 0
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08115740 @ =gUnknown_2021D18
ldr r1, _08115744 @ =gUnknown_841B03F
bl sub_8008FCC
diff --git a/asm/quest_log_8150454.s b/asm/quest_log_8150454.s
index fe9c8e0b5..c2d271f97 100644
--- a/asm/quest_log_8150454.s
+++ b/asm/quest_log_8150454.s
@@ -76,9 +76,9 @@ sub_81504A8: @ 81504A8
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0x1
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
pop {r4}
pop {r0}
bx r0
@@ -107,9 +107,9 @@ sub_81504E8: @ 81504E8
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0x2
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
movs r0, 0
movs r1, 0
bl sub_80BD620
@@ -144,13 +144,13 @@ sub_8150530: @ 8150530
cmp r0, 0x3
bne _08150594
_08150558:
- bl sub_8069940
+ bl ScriptContext2_Enable
movs r4, 0
movs r0, 0x1
strb r0, [r6, 0x6]
ldr r0, _0815058C @ =sub_81505C4
movs r1, 0xFF
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _08150590 @ =gUnknown_3005090
@@ -183,7 +183,7 @@ _08150594:
lsls r1, 24
lsrs r1, 24
adds r0, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
_081505BC:
pop {r4-r6}
pop {r0}
@@ -241,7 +241,7 @@ _0815061C:
b _081506FC
_08150626:
adds r0, r5, 0
- bl sub_8063D1C
+ bl FieldObjectClearAnimIfSpecialAnimActive
ldrb r0, [r5, 0x1]
movs r1, 0x8
orrs r0, r1
@@ -261,7 +261,7 @@ _08150626:
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -279,7 +279,7 @@ _08150666:
strh r0, [r4, 0xA]
b _081506FC
_0815067C:
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_8063500
@@ -287,7 +287,7 @@ _0815067C:
lsls r1, 24
lsrs r1, 24
adds r0, r7, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08150694:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -329,13 +329,13 @@ _081506E2:
ldrb r1, [r5, 0x18]
lsrs r1, 4
adds r0, r5, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0
strh r0, [r7, 0x24]
strh r0, [r7, 0x26]
- bl sub_806994C
+ bl ScriptContext2_Disable
mov r0, r8
- bl sub_8077508
+ bl DestroyTask
_081506FC:
pop {r3,r4}
mov r8, r3
@@ -370,9 +370,9 @@ sub_8150708: @ 8150708
ldrb r1, [r4, 0x18]
lsrs r1, 4
adds r0, r4, 0
- bl sub_805F218
+ bl FieldObjectTurn
movs r0, 0x8
- bl sub_805C970
+ bl SetPlayerAvatarStateMask
ldr r1, _08150778 @ =gUnknown_20386E0
movs r2, 0x10
ldrsh r0, [r4, r2]
@@ -383,7 +383,7 @@ sub_8150708: @ 8150708
ldrb r0, [r5, 0x5]
str r0, [r1, 0x8]
movs r0, 0x8
- bl sub_8083444
+ bl FieldEffectStart
lsls r0, 24
lsrs r0, 24
strb r0, [r4, 0x1A]
@@ -403,10 +403,10 @@ _08150778: .4byte gUnknown_20386E0
sub_815077C: @ 815077C
push {lr}
movs r0, 0x41
- bl sub_8083444
+ bl FieldEffectStart
ldr r0, _08150790 @ =sub_8150794
movs r1, 0
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -419,14 +419,14 @@ sub_8150794: @ 8150794
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x41
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _081507B4
- bl sub_8068A5C
- bl sub_806994C
+ bl UnfreezeMapObjects
+ bl ScriptContext2_Disable
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_081507B4:
pop {r4}
pop {r0}
diff --git a/asm/quest_log_battle.s b/asm/quest_log_battle.s
index 4b583025e..3cab854af 100644
--- a/asm/quest_log_battle.s
+++ b/asm/quest_log_battle.s
@@ -29,10 +29,10 @@ _0812BFF4:
b _0812C212
_0812C002:
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
adds r7, r0, 0
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
mov r9, r0
ldr r4, [r4]
movs r0, 0x8
@@ -99,7 +99,7 @@ _0812C06A:
lsls r1, 1
adds r0, r1
ldrb r0, [r0]
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _0812C0BC
@@ -121,7 +121,7 @@ _0812C0B8: .4byte gUnknown_2023BE4
_0812C0BC:
ldr r5, _0812C0D8 @ =gUnknown_2023BE4
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
movs r4, 0x58
@@ -137,7 +137,7 @@ _0812C0D8: .4byte gUnknown_2023BE4
_0812C0DC:
movs r0, 0x2
_0812C0DE:
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
muls r0, r4
@@ -146,10 +146,10 @@ _0812C0EA:
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r6, _0812C14C @ =gUnknown_2023BE4
lsls r4, 24
lsrs r4, 24
@@ -168,10 +168,10 @@ _0812C0EA:
lsrs r0, 16
mov r8, r0
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
movs r0, 0x2
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
@@ -194,7 +194,7 @@ _0812C150:
ldrh r0, [r0, 0x20]
strh r0, [r7, 0x2]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
ldr r5, _0812C1C8 @ =gUnknown_2023BE4
lsls r0, 24
lsrs r0, 24
@@ -204,7 +204,7 @@ _0812C150:
ldrh r0, [r0]
strh r0, [r7, 0x4]
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
muls r0, r4
@@ -212,14 +212,14 @@ _0812C150:
ldrh r0, [r0, 0x28]
mov r8, r0
movs r0, 0
- bl sub_80751E8
+ bl GetBankByIdentity
lsls r0, 24
lsrs r0, 24
muls r0, r4
adds r0, r5
ldrh r4, [r0, 0x2C]
_0812C18E:
- bl sub_8056260
+ bl sav1_map_get_name
movs r1, 0
strb r0, [r7, 0x7]
strb r1, [r7, 0x6]
@@ -253,7 +253,7 @@ _0812C1CC:
bne _0812C1E8
ldr r0, _0812C1E4 @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strh r0, [r1]
strh r4, [r1, 0x2]
@@ -265,20 +265,20 @@ _0812C1E8:
strh r4, [r0]
ldr r0, _0812C220 @ =gUnknown_202402C
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
mov r1, r9
strh r0, [r1, 0x2]
_0812C1F8:
- bl sub_8056260
+ bl sav1_map_get_name
mov r1, r9
strb r0, [r1, 0x4]
movs r0, 0x1F
bl sub_8113550
_0812C206:
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
mov r0, r9
- bl sub_8002BC4
+ bl Free
_0812C212:
pop {r3-r5}
mov r8, r3
@@ -305,7 +305,7 @@ sub_812C224: @ 812C224
cmp r0, 0
beq _0812C31C
movs r0, 0x18
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
ldr r0, _0812C2BC @ =gUnknown_2023E8A
ldrb r0, [r0]
@@ -414,7 +414,7 @@ _0812C30E:
adds r1, r5, 0
bl sub_8113550
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
_0812C31C:
add sp, 0xC
pop {r3,r4}
diff --git a/asm/random.s b/asm/random.s
index 9ac3e043c..d0c7895f7 100644
--- a/asm/random.s
+++ b/asm/random.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8044EC8
-sub_8044EC8: @ 8044EC8
+ thumb_func_start Random
+Random: @ 8044EC8
ldr r2, _08044EDC @ =gUnknown_3005000
ldr r1, [r2]
ldr r0, _08044EE0 @ =0x41c64e6d
@@ -20,7 +20,7 @@ sub_8044EC8: @ 8044EC8
_08044EDC: .4byte gUnknown_3005000
_08044EE0: .4byte 0x41c64e6d
_08044EE4: .4byte 0x00006073
- thumb_func_end sub_8044EC8
+ thumb_func_end Random
thumb_func_start sub_8044EE8
sub_8044EE8: @ 8044EE8
diff --git a/asm/region_map.s b/asm/region_map.s
index 0a9d1b6f3..65fb554ce 100644
--- a/asm/region_map.s
+++ b/asm/region_map.s
@@ -92,12 +92,12 @@ sub_80BFEA0: @ 80BFEA0
mov r0, sp
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r4, 0x1E
adds r0, r4, 0
movs r1, 0x2F
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
add sp, 0x20
pop {r4}
pop {r0}
@@ -113,18 +113,18 @@ sub_80BFEDC: @ 80BFEDC
lsrs r5, r0, 24
ldr r4, _080BFEFC @ =gUnknown_20399D4
ldr r0, _080BFF00 @ =0x000047c0
- bl sub_8002BB0
+ bl AllocZeroed
adds r2, r0, 0
str r2, [r4]
cmp r2, 0
bne _080BFF08
- ldr r0, _080BFF04 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080BFF04 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _080BFF38
.align 2, 0
_080BFEFC: .4byte gUnknown_20399D4
_080BFF00: .4byte 0x000047c0
-_080BFF04: .4byte sub_80567DC
+_080BFF04: .4byte c2_exit_to_overworld_2_switch
_080BFF08:
ldr r1, _080BFF40 @ =gUnknown_2031DE0
movs r0, 0x1
@@ -147,7 +147,7 @@ _080BFF08:
strb r1, [r0]
bl sub_80BFFD0
ldr r0, _080BFF4C @ =sub_80C0100
- bl sub_8000544
+ bl SetMainCallback2
_080BFF38:
pop {r4,r5}
pop {r0}
@@ -167,18 +167,18 @@ sub_80BFF50: @ 80BFF50
lsrs r5, r0, 24
ldr r4, _080BFF70 @ =gUnknown_20399D4
ldr r0, _080BFF74 @ =0x000047c0
- bl sub_8002BB0
+ bl AllocZeroed
adds r2, r0, 0
str r2, [r4]
cmp r2, 0
bne _080BFF7C
- ldr r0, _080BFF78 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080BFF78 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _080BFFB4
.align 2, 0
_080BFF70: .4byte gUnknown_20399D4
_080BFF74: .4byte 0x000047c0
-_080BFF78: .4byte sub_80567DC
+_080BFF78: .4byte c2_exit_to_overworld_2_switch
_080BFF7C:
ldr r1, _080BFFBC @ =gUnknown_2031DE0
movs r0, 0x1
@@ -205,7 +205,7 @@ _080BFF7C:
str r6, [r0]
bl sub_80BFFD0
ldr r0, _080BFFCC @ =sub_80C0100
- bl sub_8000544
+ bl SetMainCallback2
_080BFFB4:
pop {r4-r6}
pop {r0}
@@ -425,7 +425,7 @@ _080C016A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _080C01BA
_080C0180:
ldr r4, _080C01C4 @ =gUnknown_20399D4
@@ -443,7 +443,7 @@ _080C0180:
movs r0, 0
bl sub_80C0CC8
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
ldr r2, _080C01CC @ =0x00004796
adds r0, r1, r2
@@ -456,7 +456,7 @@ _080C0180:
bl sub_80C0CC8
_080C01BA:
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _080C021A
.align 2, 0
_080C01C4: .4byte gUnknown_20399D4
@@ -466,12 +466,12 @@ _080C01D0: .4byte 0x000012e6
_080C01D4:
bl sub_80C0B18
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
b _080C021A
_080C01E0:
bl sub_80C0BB0
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
b _080C021A
_080C01EC:
movs r0, 0x2
@@ -490,7 +490,7 @@ _080C0202:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_80C03E8
bl sub_80C08F4
_080C021A:
@@ -548,7 +548,7 @@ _080C0288:
ldr r0, _080C0294 @ =gUnknown_83EF23C
movs r1, 0xC0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080C03C8
.align 2, 0
_080C0294: .4byte gUnknown_83EF23C
@@ -556,7 +556,7 @@ _080C0298:
ldr r0, _080C02EC @ =gUnknown_83EF2DC
movs r1, 0
movs r2, 0xA0
- bl sub_80703EC
+ bl LoadPalette
bl sub_80BFEA0
ldr r0, _080C02F0 @ =gUnknown_20399D4
ldr r0, [r0]
@@ -571,23 +571,23 @@ _080C02B6:
adds r0, r4, 0
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x20
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x30
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x40
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _080C03C8
.align 2, 0
_080C02EC: .4byte gUnknown_83EF2DC
@@ -595,7 +595,7 @@ _080C02F0: .4byte gUnknown_20399D4
_080C02F4: .4byte 0x00004796
_080C02F8: .4byte gUnknown_83EF25A
_080C02FC:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
b _080C03C8
_080C0302:
ldr r1, _080C0330 @ =gUnknown_83EF61C
@@ -604,7 +604,7 @@ _080C0302:
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _080C0334 @ =gUnknown_20399D4
ldr r0, [r0]
ldr r2, _080C0338 @ =0x00004796
@@ -617,7 +617,7 @@ _080C0302:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _080C03C8
.align 2, 0
_080C0330: .4byte gUnknown_83EF61C
@@ -625,7 +625,7 @@ _080C0334: .4byte gUnknown_20399D4
_080C0338: .4byte 0x00004796
_080C033C: .4byte gUnknown_83F1978
_080C0340:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -713,9 +713,9 @@ sub_80C03E8: @ 80C03E8
adds r0, r1
ldr r0, [r0]
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _080C040C @ =sub_80C08B4
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -900,11 +900,11 @@ _080C057C: .4byte gUnknown_20399D4
_080C0580: .4byte 0x00004799
_080C0584:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080C05D8 @ =gUnknown_8418EB5
bl sub_80C4E18
ldr r0, _080C05DC @ =gUnknown_8418E8B
@@ -940,7 +940,7 @@ _080C05E0:
beq _080C05EE
b _080C07C2
_080C05EE:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _080C05FA
@@ -948,10 +948,10 @@ _080C05EE:
_080C05FA:
bl sub_80C0B18
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
bl sub_80C0BB0
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _080C061C @ =gUnknown_20399D4
ldr r1, [r0]
ldr r2, _080C0620 @ =0x000047a0
@@ -1124,7 +1124,7 @@ _080C0788:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080C0798:
ldr r0, _080C07A8 @ =gUnknown_20399D4
ldr r1, [r0]
@@ -1223,7 +1223,7 @@ _080C0838:
bl sub_80C4348
bl sub_80C4D30
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
ldr r0, _080C086C @ =gUnknown_20399D4
ldr r0, [r0]
@@ -1234,20 +1234,20 @@ _080C0838:
bne _080C0878
ldr r0, _080C0874 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
b _080C087C
.align 2, 0
_080C086C: .4byte gUnknown_20399D4
_080C0870: .4byte 0x000047bc
_080C0874: .4byte gUnknown_30030F0
_080C0878:
- bl sub_8000544
+ bl SetMainCallback2
_080C087C:
ldr r4, _080C0894 @ =gUnknown_20399D4
ldr r0, [r4]
cmp r0, 0
beq _080C088C
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C088C:
@@ -1265,7 +1265,7 @@ sub_80C0898: @ 80C0898
ldr r0, [r4]
cmp r0, 0
beq _080C08AA
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C08AA:
@@ -1279,10 +1279,10 @@ _080C08B0: .4byte gUnknown_20399D4
thumb_func_start sub_80C08B4
sub_80C08B4: @ 80C08B4
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_80C08B4
@@ -1290,9 +1290,9 @@ sub_80C08B4: @ 80C08B4
thumb_func_start sub_80C08CC
sub_80C08CC: @ 80C08CC
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_80C08CC
@@ -1301,9 +1301,9 @@ sub_80C08CC: @ 80C08CC
sub_80C08E0: @ 80C08E0
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
pop {r0}
bx r0
thumb_func_end sub_80C08E0
@@ -1312,7 +1312,7 @@ sub_80C08E0: @ 80C08E0
sub_80C08F4: @ 80C08F4
push {lr}
ldr r0, _080C0900 @ =sub_80C08CC
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -1390,7 +1390,7 @@ _080C092A:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _080C0A20 @ =gUnknown_83F1A50
@@ -1400,41 +1400,41 @@ _080C092A:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _080C0A24 @ =gUnknown_83F1A60
bl sub_8003B24
bl sub_8002C28
ldr r1, _080C0A28 @ =0x00006040
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80C0A2C
bl sub_80C0AB8
add sp, 0x8
@@ -1459,17 +1459,17 @@ sub_80C0A2C: @ 80C0A2C
ldr r0, _080C0A60 @ =0x00001796
adds r1, r0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _080C0A64 @ =0x00002796
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _080C0A68 @ =0x00003796
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
pop {r4}
pop {r0}
bx r0
@@ -1483,11 +1483,11 @@ _080C0A68: .4byte 0x00003796
thumb_func_start sub_80C0A6C
sub_80C0A6C: @ 80C0A6C
push {lr}
- bl sub_8006B10
- bl sub_8070528
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetSpriteData
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl remove_some_task
pop {r0}
bx r0
thumb_func_end sub_80C0A6C
@@ -1504,15 +1504,15 @@ sub_80C0A88: @ 80C0A88
b _080C0AB2
_080C0A98:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
b _080C0AB2
_080C0AA6:
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
_080C0AB2:
pop {r0}
bx r0
@@ -1565,10 +1565,10 @@ sub_80C0B18: @ 80C0B18
push {r4,r5,lr}
sub sp, 0xC
movs r0, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
bl sub_80C3520
lsls r0, 16
lsrs r0, 16
@@ -1602,7 +1602,7 @@ _080C0B44:
movs r3, 0x2
bl sub_812E51C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1654,7 +1654,7 @@ sub_80C0BB0: @ 80C0BB0
movs r1, 0x1
bl sub_80C4C9C
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
bl sub_80C3580
lsls r0, 16
lsrs r0, 16
@@ -1677,7 +1677,7 @@ sub_80C0BB0: @ 80C0BB0
adds r4, r0
ldr r4, [r4]
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
ldr r2, [r5]
ldr r3, _080C0C98 @ =0x000047aa
adds r1, r2, r3
@@ -1696,11 +1696,11 @@ sub_80C0BB0: @ 80C0BB0
strh r0, [r2]
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, 0x13
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r4, _080C0C9C @ =gUnknown_83F1A9C
movs r0, 0x1
bl sub_80C3AC8
@@ -1720,7 +1720,7 @@ sub_80C0BB0: @ 80C0BB0
movs r3, 0x2
bl sub_812E51C
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -1744,13 +1744,13 @@ sub_80C0CA0: @ 80C0CA0
push {lr}
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -1834,7 +1834,7 @@ _080C0D1C:
movs r1, 0xF0
movs r2, 0x18
movs r3, 0xE
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
movs r1, 0x80
lsls r1, 1
str r4, [sp]
@@ -1844,7 +1844,7 @@ _080C0D1C:
movs r0, 0
movs r2, 0x18
movs r3, 0xF
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
movs r1, 0x88
lsls r1, 1
str r4, [sp]
@@ -1854,7 +1854,7 @@ _080C0D1C:
movs r0, 0
movs r2, 0x18
movs r3, 0x10
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
_080C0D86:
ldr r0, _080C0D98 @ =gUnknown_20399D8
ldr r0, [r0]
@@ -1887,7 +1887,7 @@ _080C0DA6:
movs r1, 0x3
movs r2, 0xD
movs r3, 0xB
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
_080C0DCC:
cmp r4, 0x3
bne _080C0DEC
@@ -1902,7 +1902,7 @@ _080C0DCC:
movs r1, 0x3
movs r2, 0x15
movs r3, 0x10
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
_080C0DEC:
add sp, 0x10
pop {r3}
@@ -1995,7 +1995,7 @@ sub_80C0E70: @ 80C0E70
ldr r4, _080C0EA0 @ =gUnknown_20399D8
movs r0, 0xE7
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r0, _080C0EA4 @ =0x00000846
bl sub_806E6D0
@@ -2302,7 +2302,7 @@ _080C111C:
lsls r2, 5
movs r0, 0x2
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, [r4]
b _080C125E
_080C112E:
@@ -2313,7 +2313,7 @@ _080C112E:
movs r0, 0x2
bl sub_80C1324
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
b _080C125E
_080C1146:
@@ -2329,7 +2329,7 @@ _080C1158: .4byte 0x00001cc8
_080C115C:
bl sub_80C0FE0
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _080C125A
_080C1168:
bl sub_80C08F4
@@ -2479,7 +2479,7 @@ sub_80C1280: @ 80C1280
ldr r0, [r0]
str r0, [r1]
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
ldr r0, _080C12E0 @ =gUnknown_8418EB5
bl sub_80C4E18
ldr r0, _080C12E4 @ =gUnknown_8418EA7
@@ -2492,7 +2492,7 @@ sub_80C1280: @ 80C1280
ldr r0, [r4]
cmp r0, 0
beq _080C12CC
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C12CC:
@@ -2520,7 +2520,7 @@ sub_80C12EC: @ 80C12EC
bne _080C1310
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
b _080C131E
.align 2, 0
@@ -2531,7 +2531,7 @@ _080C1310:
strh r0, [r1]
ldrh r1, [r1]
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
_080C131E:
pop {r1}
@@ -2878,7 +2878,7 @@ _080C15A8:
movs r0, 0
bl sub_80C0CC8
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0xFF
movs r1, 0x19
movs r2, 0x1
@@ -2914,9 +2914,9 @@ _080C1604:
ldr r0, _080C1698 @ =gUnknown_8418EB0
bl sub_80C4E74
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0xFF
movs r1, 0x19
movs r2, 0x1
@@ -3131,9 +3131,9 @@ sub_80C176C: @ 80C176C
ldr r1, _080C186C @ =0x000018b6
adds r3, r1
strh r2, [r3]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r6, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r3, r8
ldr r2, [r3]
adds r0, r2, r5
@@ -3153,7 +3153,7 @@ sub_80C176C: @ 80C176C
asrs r2, 16
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r4, r8
@@ -3215,19 +3215,19 @@ _080C1886:
ldr r0, [r1]
cmp r0, 0
beq _080C18BE
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
adds r0, r4
ldr r1, _080C18D8 @ =0x000018b4
adds r0, r1
ldrh r0, [r0]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r6]
adds r0, r4
ldr r1, _080C18DC @ =0x000018b6
adds r0, r1
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C18BE:
adds r0, r5, 0x1
lsls r0, 24
@@ -3325,7 +3325,7 @@ sub_80C195C: @ 80C195C
lsrs r5, r1, 24
ldr r4, _080C19E0 @ =gUnknown_20399DC
ldr r0, _080C19E4 @ =0x00003e28
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
bl sub_80C3580
lsls r0, 24
@@ -3438,7 +3438,7 @@ _080C1A50:
lsls r2, 6
movs r0, 0x2
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _080C1A76
_080C1A5E:
movs r2, 0xF5
@@ -3448,7 +3448,7 @@ _080C1A5E:
ldr r0, [r0, 0xC]
movs r1, 0xD0
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
b _080C1A76
_080C1A72:
movs r0, 0x1
@@ -3544,7 +3544,7 @@ _080C1B34:
movs r0, 0x2
bl sub_80C1E78
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
ldr r0, _080C1B50 @ =0x00003d48
adds r1, r0
@@ -3553,7 +3553,7 @@ _080C1B34:
_080C1B50: .4byte 0x00003d48
_080C1B54:
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
b _080C1BC2
_080C1B5C:
bl sub_80C08F4
@@ -3701,12 +3701,12 @@ _080C1C7C: .4byte 0x00003d4c
_080C1C80:
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _080C1CA0 @ =gUnknown_20399DC
ldr r1, [r0]
ldr r0, _080C1CA4 @ =0x00003d49
@@ -3810,7 +3810,7 @@ _080C1D24:
adds r0, r5
movs r1, 0xD0
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
_080C1D80:
ldr r0, _080C1D98 @ =gUnknown_20399DC
ldr r1, [r0]
@@ -3837,7 +3837,7 @@ _080C1DA0:
_080C1DB4:
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
@@ -3900,7 +3900,7 @@ sub_80C1E14: @ 80C1E14
ldr r0, [r0]
str r0, [r1]
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0
bl sub_80C4B30
bl sub_80C0B18
@@ -3912,7 +3912,7 @@ sub_80C1E14: @ 80C1E14
ldr r0, [r4]
cmp r0, 0
beq _080C1E60
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C1E60:
@@ -3937,7 +3937,7 @@ sub_80C1E78: @ 80C1E78
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
add sp, 0x8
pop {r0}
bx r0
@@ -4304,9 +4304,9 @@ sub_80C210C: @ 80C210C
ldr r7, _080C21FC @ =0x0000040a
adds r1, r7
strh r2, [r1]
- bl sub_80086DC
+ bl LoadSpriteSheet
mov r0, r8
- bl sub_8008928
+ bl LoadSpritePalette
mov r1, r9
ldr r0, [r1]
adds r0, r5
@@ -4321,7 +4321,7 @@ sub_80C210C: @ 80C210C
ldrsh r2, [r0, r7]
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r2, r9
@@ -4373,12 +4373,12 @@ sub_80C2208: @ 80C2208
mov r8, r0
ldr r4, _080C22A4 @ =gUnknown_20399E0
ldr r0, _080C22A8 @ =0x00000cd4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r6, 0
_080C2224:
ldr r0, _080C22AC @ =0x0000040c
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
ldr r7, _080C22A4 @ =gUnknown_20399E0
ldr r4, [r7]
@@ -4660,7 +4660,7 @@ _080C2484:
lsls r2, 4
movs r0, 0x1
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _080C24A0
.align 2, 0
_080C2498: .4byte gUnknown_20399E0
@@ -4818,7 +4818,7 @@ _080C25C6:
ldr r0, [r0]
cmp r0, 0
beq _080C25DE
- bl sub_8002BC4
+ bl Free
ldr r0, [r6]
adds r0, r4
movs r1, 0
@@ -4833,7 +4833,7 @@ _080C25DE:
ldr r0, [r4]
cmp r0, 0
beq _080C25F8
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C25F8:
@@ -4874,7 +4874,7 @@ _080C260E:
ldr r0, [r0]
cmp r0, 0
beq _080C2660
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, r4
ldr r0, [r0]
@@ -4882,14 +4882,14 @@ _080C260E:
lsls r1, 3
adds r0, r1
ldrh r0, [r0]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r7]
adds r0, r4
ldr r0, [r0]
ldr r3, _080C2678 @ =0x0000040a
adds r0, r3
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C2660:
adds r0, r5, 0x1
lsls r0, 24
@@ -4976,27 +4976,27 @@ _080C270C:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
ldr r1, [r4]
b _080C297A
.align 2, 0
_080C2728: .4byte 0x00000818
_080C272C:
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_80C08F4
ldr r0, _080C2760 @ =gUnknown_20399E0
ldr r1, [r0]
@@ -5008,11 +5008,11 @@ _080C2760: .4byte gUnknown_20399E0
_080C2764: .4byte 0x00000ccc
_080C2768:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x6
movs r1, 0
bl sub_80C22C4
@@ -5120,23 +5120,23 @@ _080C2868:
adds r0, r4, 0
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x20
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x30
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0x40
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
b _080C2976
.align 2, 0
_080C28A0: .4byte gUnknown_83EF25A
@@ -5150,7 +5150,7 @@ _080C28A4:
movs r1, 0x2
movs r2, 0
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -5158,7 +5158,7 @@ _080C28A4:
movs r1, 0x3
movs r2, 0x1
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -5166,7 +5166,7 @@ _080C28A4:
movs r1, 0x3E
movs r2, 0x1C
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r5, [sp, 0x8]
@@ -5174,7 +5174,7 @@ _080C28A4:
movs r1, 0x3F
movs r2, 0x1D
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1A
str r0, [sp]
str r4, [sp, 0x4]
@@ -5183,9 +5183,9 @@ _080C28A4:
movs r1, 0x3D
movs r2, 0x2
movs r3, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0xF4
bl m4aSongNumStop
movs r0, 0x2A
@@ -5684,7 +5684,7 @@ _080C2CFA:
ldr r0, _080C2D10 @ =gUnknown_83EF2DC
movs r1, 0
movs r2, 0xA0
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080C2D14 @ =gUnknown_20399E0
ldr r1, [r0]
ldr r3, _080C2D18 @ =0x00000ccf
@@ -6085,7 +6085,7 @@ sub_80C3008: @ 80C3008
ldr r6, _080C3090 @ =gUnknown_20399E4
movs r0, 0x92
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
adds r1, r0, 0
str r1, [r6]
ldr r0, _080C3094 @ =gUnknown_83EF4E0
@@ -6188,9 +6188,9 @@ sub_80C309C: @ 80C309C
movs r2, 0x18
bl memcpy
adds r0, r5, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, [r6]
movs r2, 0x4
ldrsh r1, [r0, r2]
@@ -6198,7 +6198,7 @@ sub_80C309C: @ 80C309C
ldrsh r2, [r0, r3]
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r6]
@@ -6266,18 +6266,18 @@ sub_80C3188: @ 80C3188
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080C31A8
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r4]
ldrh r0, [r0, 0x20]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r4]
ldrh r0, [r0, 0x22]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C31A8:
ldr r0, [r4]
cmp r0, 0
beq _080C31B6
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C31B6:
@@ -6451,7 +6451,7 @@ _080C3300:
ldr r1, _080C3338 @ =0x000047bc
adds r0, r1
ldr r1, [r0]
- ldr r0, _080C333C @ =sub_80567DC
+ ldr r0, _080C333C @ =c2_exit_to_overworld_2_switch
cmp r1, r0
bne _080C331A
_080C3318:
@@ -6474,7 +6474,7 @@ _080C332C:
.align 2, 0
_080C3334: .4byte gUnknown_20399D4
_080C3338: .4byte 0x000047bc
-_080C333C: .4byte sub_80567DC
+_080C333C: .4byte c2_exit_to_overworld_2_switch
_080C3340: .4byte gUnknown_20399E4
_080C3344: .4byte sub_80C3348
thumb_func_end sub_80C31C0
@@ -7395,7 +7395,7 @@ sub_80C3B00: @ 80C3B00
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
@@ -7417,7 +7417,7 @@ sub_80C3B28: @ 80C3B28
ldrb r1, [r1, 0x5]
lsls r1, 24
asrs r1, 24
- bl sub_8056158
+ bl get_map_light_level_by_bank_and_number
lsls r0, 24
lsrs r0, 24
subs r0, 0x1
@@ -7477,7 +7477,7 @@ _080C3BAC:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r2, r0, 0
ldr r0, _080C3BEC @ =gUnknown_20399E4
ldr r1, [r0]
@@ -7506,7 +7506,7 @@ _080C3BF0:
asrs r1, 24
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r2, r0, 0
ldr r0, _080C3C28 @ =gUnknown_20399E4
ldr r1, [r0]
@@ -7543,7 +7543,7 @@ _080C3C2C:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r2, r0, 0
b _080C3C8E
.align 2, 0
@@ -7564,7 +7564,7 @@ _080C3C68:
ldrsb r1, [r5, r1]
lsls r1, 16
lsrs r1, 16
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
adds r2, r0, 0
ldr r1, [r4]
ldrb r0, [r2, 0x14]
@@ -8196,7 +8196,7 @@ sub_80C41D8: @ 80C41D8
lsrs r5, r1, 16
ldr r4, _080C4204 @ =gUnknown_20399E8
movs r0, 0x8C
- bl sub_8002BB0
+ bl AllocZeroed
adds r1, r0, 0
str r1, [r4]
ldr r0, _080C4208 @ =gUnknown_300500C
@@ -8290,9 +8290,9 @@ sub_80C4244: @ 80C4244
str r0, [sp, 0x38]
_080C42AA:
adds r0, r5, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, [r6]
movs r2, 0
ldrsh r1, [r0, r2]
@@ -8310,7 +8310,7 @@ _080C42AA:
asrs r2, 16
mov r0, sp
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r6]
@@ -8369,18 +8369,18 @@ sub_80C4348: @ 80C4348
ldr r0, [r0, 0x4]
cmp r0, 0
beq _080C4368
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r4]
ldrh r0, [r0, 0x8]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r4]
ldrh r0, [r0, 0xA]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C4368:
ldr r0, [r4]
cmp r0, 0
beq _080C4376
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C4376:
@@ -8425,7 +8425,7 @@ sub_80C4398: @ 80C4398
lsrs r6, 24
ldr r5, _080C43F4 @ =gUnknown_20399EC
ldr r0, _080C43F8 @ =0x0000046c
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r2, 0x8D
lsls r2, 3
@@ -8515,14 +8515,14 @@ _080C446E:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080C4498 @ =gUnknown_20399EC
ldr r1, [r0]
ldr r0, _080C449C @ =0x00000463
@@ -8548,7 +8548,7 @@ _080C44B4: .4byte gUnknown_20399EC
_080C44B8: .4byte 0x00000463
_080C44BC:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
movs r2, 0x80
lsls r2, 5
@@ -8557,7 +8557,7 @@ _080C44BC:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
bl sub_80C44E4
_080C44DC:
@@ -8650,9 +8650,9 @@ sub_80C450C: @ 80C450C
str r1, [sp, 0x10]
ldr r1, _080C460C @ =nullsub_8
str r1, [sp, 0x14]
- bl sub_80086DC
+ bl LoadSpriteSheet
mov r0, r8
- bl sub_8008928
+ bl LoadSpritePalette
lsls r4, 19
movs r0, 0x90
lsls r0, 14
@@ -8666,7 +8666,7 @@ sub_80C450C: @ 80C450C
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r7]
@@ -8769,9 +8769,9 @@ sub_80C4614: @ 80C4614
str r1, [sp, 0x10]
ldr r1, _080C4748 @ =nullsub_8
str r1, [sp, 0x14]
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r6, 0
- bl sub_8008928
+ bl LoadSpritePalette
mov r0, r9
lsls r2, r0, 16
asrs r2, 16
@@ -8816,7 +8816,7 @@ _080C46C4:
asrs r2, 16
mov r0, sp
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r4, _080C4730 @ =gUnknown_20399EC
@@ -9020,7 +9020,7 @@ _080C4840:
adds r0, r1
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_080C487E:
adds r0, r6, 0x1
lsls r0, 24
@@ -9247,20 +9247,20 @@ _080C4A0A:
ldr r0, [r0]
cmp r0, 0
beq _080C4A3E
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
adds r0, r4
movs r1, 0xB7
lsls r1, 2
adds r0, r1
ldrh r0, [r0]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r6]
adds r0, r4
ldr r1, _080C4AA8 @ =0x000002de
adds r0, r1
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C4A3E:
adds r0, r5, 0x1
lsls r0, 24
@@ -9279,21 +9279,21 @@ _080C4A4C:
ldr r0, [r0]
cmp r0, 0
beq _080C4A82
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r6]
adds r0, r4
movs r1, 0xA6
lsls r1, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, [r6]
adds r0, r4
movs r1, 0xA7
lsls r1, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_080C4A82:
adds r0, r5, 0x1
lsls r0, 24
@@ -9304,7 +9304,7 @@ _080C4A82:
ldr r0, [r4]
cmp r0, 0
beq _080C4A9C
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C4A9C:
@@ -9327,42 +9327,42 @@ sub_80C4AAC: @ 80C4AAC
cmp r0, 0
bne _080C4B28
movs r0, 0x14
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0x50
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1]
movs r0, 0x54
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0x2]
movs r0, 0x52
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0x4]
movs r0, 0x48
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0x6]
movs r0, 0x4A
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0x8]
movs r0, 0x40
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0xA]
movs r0, 0x42
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0xC]
movs r0, 0x44
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0xE]
movs r0, 0x46
- bl sub_8000AC4
+ bl GetGpuReg
ldr r1, [r4]
strh r0, [r1, 0x10]
movs r0, 0x1
@@ -9394,43 +9394,43 @@ _080C4B44: .4byte gUnknown_20399F0
_080C4B48:
ldrh r1, [r0]
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x2]
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x4]
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x6]
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x8]
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xA]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xC]
movs r0, 0x42
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0xE]
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldrh r1, [r0, 0x10]
movs r0, 0x46
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
cmp r0, 0
beq _080C4BAE
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C4BAE:
@@ -9452,7 +9452,7 @@ _080C4BBE:
ldr r0, [r4]
cmp r0, 0
beq _080C4BD0
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C4BD0:
@@ -9513,7 +9513,7 @@ sub_80C4C2C: @ 80C4C2C
lsrs r3, 16
movs r0, 0x50
adds r1, r3, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80C4C2C
@@ -9525,7 +9525,7 @@ sub_80C4C48: @ 80C4C48
lsls r1, 16
lsrs r1, 16
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80C4C48
@@ -9540,7 +9540,7 @@ sub_80C4C5C: @ 80C4C5C
lsrs r2, 16
movs r0, 0x52
adds r1, r2, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80C4C5C
@@ -9553,7 +9553,7 @@ sub_80C4C74: @ 80C4C74
orrs r1, r0
lsrs r1, 16
movs r0, 0x48
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80C4C74
@@ -9565,7 +9565,7 @@ sub_80C4C88: @ 80C4C88
lsls r1, 16
lsrs r1, 16
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_80C4C88
@@ -9591,7 +9591,7 @@ sub_80C4C9C: @ 80C4C9C
_080C4CBC: .4byte gUnknown_83F1CA0
_080C4CC0:
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
adds r1, r0, 0
lsls r0, r5, 1
add r0, sp
@@ -9600,14 +9600,14 @@ _080C4CC0:
lsls r1, 16
lsrs r1, 16
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
b _080C4CE8
_080C4CDC:
lsls r0, r5, 1
add r0, sp
ldrh r1, [r0]
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
_080C4CE8:
add sp, 0x4
pop {r4,r5}
@@ -9631,7 +9631,7 @@ sub_80C4CF0: @ 80C4CF0
orrs r1, r2
lsls r1, 16
lsrs r1, 16
- bl sub_8000A38
+ bl SetGpuReg
adds r5, 0x1
adds r4, r5
ldrb r0, [r4]
@@ -9641,7 +9641,7 @@ sub_80C4CF0: @ 80C4CF0
orrs r1, r2
lsls r1, 16
lsrs r1, 16
- bl sub_8000A38
+ bl SetGpuReg
pop {r4-r6}
pop {r0}
bx r0
@@ -9718,7 +9718,7 @@ _080C4DA4:
ldr r1, [r1]
_080C4DAC:
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
adds r1, r0, 0
b _080C4DCE
.align 2, 0
@@ -9731,7 +9731,7 @@ _080C4DC2:
adds r0, r6, 0
movs r1, 0
adds r2, r4, 0
- bl sub_8009204
+ bl StringFill
b _080C4DF2
_080C4DCE:
cmp r4, 0
@@ -9796,7 +9796,7 @@ sub_80C4E18: @ 80C4E18
bne _080C4E40
movs r0, 0x3
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _080C4E48
.align 2, 0
_080C4E38: .4byte gUnknown_20399D4
@@ -9804,7 +9804,7 @@ _080C4E3C: .4byte 0x00004799
_080C4E40:
movs r0, 0x3
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
_080C4E48:
ldr r0, _080C4E70 @ =gUnknown_83F1CA8
str r0, [sp]
@@ -9841,7 +9841,7 @@ sub_80C4E74: @ 80C4E74
bne _080C4E9C
movs r0, 0x4
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _080C4EA4
.align 2, 0
_080C4E94: .4byte gUnknown_20399D4
@@ -9849,7 +9849,7 @@ _080C4E98: .4byte 0x00004799
_080C4E9C:
movs r0, 0x4
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
_080C4EA4:
ldr r0, _080C4ECC @ =gUnknown_83F1CA8
str r0, [sp]
@@ -9879,15 +9879,15 @@ sub_80C4ED0: @ 80C4ED0
cmp r0, 0
bne _080C4EE6
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
b _080C4EF2
_080C4EE6:
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x4
- bl sub_80040B8
+ bl ClearWindowTilemap
_080C4EF2:
pop {r0}
bx r0
@@ -9940,7 +9940,7 @@ _080C4F4C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_80C0E20
adds r4, r0, 0
lsls r4, 24
@@ -9975,11 +9975,11 @@ _080C4F92:
b _080C51A6
_080C4FAE:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _080C4FE8 @ =gUnknown_8418EB5
bl sub_80C4E18
bl sub_80C0E20
@@ -10016,10 +10016,10 @@ _080C5000:
_080C500E:
bl sub_80C0B18
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
bl sub_80C0BB0
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
b _080C51A6
.align 2, 0
_080C5024: .4byte gUnknown_2037AB8
@@ -10141,7 +10141,7 @@ _080C5114:
ldrb r1, [r1, 0x5]
lsls r1, 24
asrs r1, 24
- bl sub_8056158
+ bl get_map_light_level_by_bank_and_number
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -10195,7 +10195,7 @@ _080C5196:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080C51A6:
ldr r0, _080C51B4 @ =gUnknown_20399FC
ldr r1, [r0]
@@ -10237,7 +10237,7 @@ sub_80C51E8: @ 80C51E8
push {r4,lr}
ldr r4, _080C5204 @ =gUnknown_20399FC
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r1, 0
strb r1, [r0]
@@ -10269,28 +10269,28 @@ _080C5220:
bl sub_80C4D30
bl sub_80C0898
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_8003ECC
ldr r0, _080C5250 @ =gUnknown_20399FC
ldr r0, [r0]
ldrb r0, [r0, 0x2]
cmp r0, 0x1
bne _080C5258
- ldr r0, _080C5254 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080C5254 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _080C525E
.align 2, 0
_080C5250: .4byte gUnknown_20399FC
-_080C5254: .4byte sub_80567DC
+_080C5254: .4byte c2_exit_to_overworld_2_switch
_080C5258:
ldr r0, _080C5274 @ =sub_8124AB0
- bl sub_8000544
+ bl SetMainCallback2
_080C525E:
ldr r4, _080C5278 @ =gUnknown_20399FC
ldr r0, [r4]
cmp r0, 0
beq _080C526E
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_080C526E:
@@ -10336,7 +10336,7 @@ _080C52AC:
asrs r1, 24
movs r2, 0x1
negs r2, r2
- bl sub_80553C8
+ bl warp1_set_2
_080C52C6:
bl sub_80842C8
pop {r4,r5}
diff --git a/asm/reset_save_heap.s b/asm/reset_save_heap.s
index 4de01a3d0..a32375ba9 100644
--- a/asm/reset_save_heap.s
+++ b/asm/reset_save_heap.s
@@ -16,7 +16,7 @@ sub_8079B7C: @ 8079B7C
bl RegisterRamReset
movs r0, 0
movs r1, 0x80
- bl sub_8000B14
+ bl ClearGpuRegBits
strh r4, [r5]
ldr r1, _08079BF0 @ =gUnknown_30030F0
ldr r0, _08079BF4 @ =0x00000439
@@ -28,7 +28,7 @@ sub_8079B7C: @ 8079B7C
strb r0, [r1]
bl sub_804C058
bl sub_8054A28
- bl sub_80D9750
+ bl ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _08079BF8 @ =gUnknown_30053A0
@@ -49,9 +49,9 @@ _08079BC8:
ldr r0, _08079C00 @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
+ bl InitHeap
ldr r0, _08079C04 @ =sub_8056938
- bl sub_8000544
+ bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
index 60d4510d4..2f158b986 100644
--- a/asm/reshow_battle_screen.s
+++ b/asm/reshow_battle_screen.s
@@ -19,10 +19,10 @@ sub_8077764: @ 8077764
orrs r0, r1
strb r0, [r2, 0x8]
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0x4C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080777B4 @ =gUnknown_2023FC4
adds r2, r0, 0
adds r2, 0x21
@@ -68,7 +68,7 @@ _080777D4:
bl sub_812B1F0
_080777DA:
ldr r0, _080777E4 @ =sub_80777E8
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -118,30 +118,30 @@ _0807780C:
.4byte _080779B0
.4byte _08077A5C
_08077860:
- bl sub_8006B10
+ bl ResetSpriteData
b _08077A8A
_08077866:
movs r0, 0
- bl sub_80006F4
- bl sub_8087EA4
+ bl SetVBlankCallback
+ bl dp12_8087EA4
bl sub_800F324
movs r0, 0x1
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0x2
movs r1, 0x1
movs r2, 0
- bl sub_80019E4
+ bl SetBgAttribute
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
- bl sub_8070528
+ bl ShowBg
+ bl ResetPaletteFade
ldr r0, _080778C8 @ =gUnknown_2022974
movs r1, 0
strh r1, [r0]
@@ -184,7 +184,7 @@ _08077900:
bl sub_800F420
b _08077A8A
_08077906:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
ldr r1, _08077914 @ =gUnknown_3003E58
movs r0, 0x4
strb r0, [r1]
@@ -192,14 +192,14 @@ _08077906:
.align 2, 0
_08077914: .4byte gUnknown_3003E58
_08077918:
- bl sub_8034AFC
+ bl ClearSpritesHealthboxAnimData
b _08077A8A
_0807791E:
ldr r5, _08077938 @ =gUnknown_2023FC4
adds r4, r5, 0
adds r4, 0x22
ldrb r0, [r4]
- bl sub_8034838
+ bl BattleLoadAllHealthBoxesGfx
lsls r0, 24
cmp r0, 0
beq _0807793C
@@ -259,24 +259,24 @@ _08077988:
b _08077A8A
_08077990:
movs r0, 0
- bl sub_8077FE4
+ bl CreateHealthboxSprite
b _08077A8A
_08077998:
movs r0, 0x1
- bl sub_8077FE4
+ bl CreateHealthboxSprite
b _08077A8A
_080779A0:
movs r0, 0x2
- bl sub_8077FE4
+ bl CreateHealthboxSprite
b _08077A8A
_080779A8:
movs r0, 0x3
- bl sub_8077FE4
+ bl CreateHealthboxSprite
b _08077A8A
_080779B0:
- bl sub_8035538
+ bl LoadAndCreateEnemyShadowSprites
movs r0, 0x1
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -289,18 +289,18 @@ _080779B0:
ldr r5, _08077A48 @ =gUnknown_202402C
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
bl sub_8075290
lsls r0, 24
cmp r0, 0
beq _08077A14
movs r0, 0x3
- bl sub_80751E8
+ bl GetBankByIdentity
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -310,12 +310,12 @@ _080779B0:
muls r0, r6
adds r0, r5
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r4, 0
- bl sub_8035708
+ bl SetBankEnemyShadowSpriteCallback
_08077A14:
ldr r1, _08077A4C @ =gUnknown_2023FF8
ldr r0, _08077A50 @ =gUnknown_2024004
@@ -346,7 +346,7 @@ _08077A54: .4byte gUnknown_3003F3C
_08077A58: .4byte gUnknown_3003F64
_08077A5C:
ldr r0, _08077A9C @ =sub_80116F4
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_8077AAC
movs r0, 0x1
str r0, [sp]
@@ -354,14 +354,14 @@ _08077A5C:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8071264
+ bl BeginHardwarePaletteFade
ldr r2, _08077AA0 @ =gUnknown_2037AB8
ldrb r1, [r2, 0x8]
movs r0, 0x7F
ands r0, r1
strb r0, [r2, 0x8]
ldr r0, _08077AA4 @ =sub_8011100
- bl sub_8000544
+ bl SetMainCallback2
bl sub_80357C8
_08077A8A:
ldr r1, _08077AA8 @ =gUnknown_2023FC4
@@ -384,37 +384,37 @@ _08077AA8: .4byte gUnknown_2023FC4
sub_8077AAC: @ 8077AAC
push {lr}
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x46
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08077B08 @ =0x0000b040
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
pop {r0}
bx r0
.align 2, 0
@@ -433,7 +433,7 @@ sub_8077B0C: @ 8077B0C
b _08077C2C
_08077B1C:
adds r0, r4, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08077BA6
@@ -482,7 +482,7 @@ _08077B64:
ldr r1, _08077B98 @ =gUnknown_202402C
adds r0, r1
adds r1, r4, 0
- bl sub_8034320
+ bl BattleLoadOpponentMonSpriteGfx
b _08077C24
.align 2, 0
_08077B90: .4byte gUnknown_2024018
@@ -621,7 +621,7 @@ _08077C9A:
lsrs r0, 24
mov r8, r0
adds r0, r7, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
bne _08077CAE
@@ -640,7 +640,7 @@ _08077CAE:
mov r9, r1
add r0, r9
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08077CD2
b _08077FB4
@@ -651,12 +651,12 @@ _08077CD2:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -677,7 +677,7 @@ _08077CD2:
adds r0, r5, 0
adds r1, r4, 0
mov r2, r8
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08077D9C @ =gUnknown_2023D44
adds r4, r7, r4
strb r0, [r4]
@@ -714,7 +714,7 @@ _08077CD2:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -729,7 +729,7 @@ _08077CD2:
ldr r1, _08077DA8 @ =gUnknown_2024024
adds r1, r7, r1
ldrb r1, [r1]
- bl sub_800838C
+ bl StartSpriteAnim
b _08077F84
.align 2, 0
_08077D90: .4byte gUnknown_2023BCE
@@ -752,7 +752,7 @@ _08077DAC:
ldr r0, [r5]
ldrb r4, [r0, 0x8]
movs r0, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -794,7 +794,7 @@ _08077E10:
cmp r7, 0
bne _08077EA8
movs r0, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -819,7 +819,7 @@ _08077E10:
_08077E54:
movs r1, 0x50
adds r2, r4, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r3, _08077E9C @ =gUnknown_2023D44
strb r0, [r3]
ldr r4, _08077EA0 @ =gUnknown_202063C
@@ -868,7 +868,7 @@ _08077EA8:
mov r9, r1
add r0, r9
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08077FB4
ldrh r0, [r6]
@@ -877,12 +877,12 @@ _08077EA8:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r7, 0
- bl sub_80751D8
+ bl GetBankIdentity
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -903,7 +903,7 @@ _08077EA8:
adds r0, r5, 0
adds r1, r4, 0
mov r2, r8
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08077FD0 @ =gUnknown_2023D44
adds r4, r7, r4
strb r0, [r4]
@@ -940,7 +940,7 @@ _08077EA8:
adds r0, r1, 0
add r0, r9
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r4]
lsls r1, r2, 4
adds r1, r2
@@ -955,7 +955,7 @@ _08077EA8:
ldr r1, _08077FDC @ =gUnknown_2024024
adds r1, r7, r1
ldrb r1, [r1]
- bl sub_800838C
+ bl StartSpriteAnim
_08077F84:
ldr r1, _08077FD4 @ =gUnknown_202063C
ldr r0, _08077FD0 @ =gUnknown_2023D44
@@ -1000,8 +1000,8 @@ _08077FDC: .4byte gUnknown_2024024
_08077FE0: .4byte gUnknown_2024018
thumb_func_end sub_8077C38
- thumb_func_start sub_8077FE4
-sub_8077FE4: @ 8077FE4
+ thumb_func_start CreateHealthboxSprite
+CreateHealthboxSprite: @ 8077FE4
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1019,7 +1019,7 @@ _08077FF4:
beq _08078014
cmp r5, 0
bne _08078014
- bl sub_8048008
+ bl CreateSafariPlayerHealthboxSprites
b _0807802C
.align 2, 0
_0807800C: .4byte gUnknown_2023BCC
@@ -1036,7 +1036,7 @@ _08078014:
b _08078166
_08078026:
adds r0, r5, 0
- bl sub_8047CE0
+ bl CreateBankHealthboxSprites
_0807802C:
lsls r0, 24
lsrs r6, r0, 24
@@ -1044,11 +1044,11 @@ _0807802C:
adds r4, r5, r0
strb r6, [r4]
adds r0, r5, 0
- bl sub_804831C
+ bl SetBankHealthboxSpritePos
adds r0, r6, 0
- bl sub_80481D4
+ bl SetHealthboxSpriteVisible
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _08078074
@@ -1062,7 +1062,7 @@ _0807802C:
ldr r2, _08078070 @ =gUnknown_202402C
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _080780C0
.align 2, 0
_08078068: .4byte gUnknown_3004FF0
@@ -1085,7 +1085,7 @@ _08078074:
ldr r2, _080780A4 @ =gUnknown_2024284
adds r1, r2
movs r2, 0xA
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
b _080780C0
.align 2, 0
_0807809C: .4byte gUnknown_2022B4C
@@ -1102,16 +1102,16 @@ _080780A8:
ldr r2, _080780F0 @ =gUnknown_2024284
adds r1, r2
movs r2, 0
- bl sub_8049D98
+ bl UpdateHealthboxAttribute
_080780C0:
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
beq _080780DC
adds r0, r5, 0
- bl sub_80751D8
+ bl GetBankIdentity
lsls r0, 24
lsrs r0, 24
cmp r0, 0x2
@@ -1135,7 +1135,7 @@ _080780F8:
bl nullsub_21
_08078104:
adds r0, r5, 0
- bl sub_80751C4
+ bl GetBankSide
lsls r0, 24
cmp r0, 0
beq _0807813C
@@ -1147,11 +1147,11 @@ _08078104:
ldr r1, _08078138 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08078166
adds r0, r6, 0
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
b _08078166
.align 2, 0
_08078130: .4byte gUnknown_3004FF0
@@ -1172,11 +1172,11 @@ _0807813C:
ldr r1, _08078174 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08078166
adds r0, r6, 0
- bl sub_8048188
+ bl SetHealthboxSpriteInvisible
_08078166:
pop {r4-r6}
pop {r0}
@@ -1185,6 +1185,6 @@ _08078166:
_0807816C: .4byte gUnknown_2022B4C
_08078170: .4byte gUnknown_2023BCE
_08078174: .4byte gUnknown_2024284
- thumb_func_end sub_8077FE4
+ thumb_func_end CreateHealthboxSprite
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/roamer.s b/asm/roamer.s
index 9e3c6625f..f4d3d96e1 100644
--- a/asm/roamer.s
+++ b/asm/roamer.s
@@ -69,7 +69,7 @@ _08141CBA:
adds r1, r6, 0
movs r2, 0x32
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
ldr r5, _08141D8C @ =gUnknown_3005008
ldr r1, [r5]
ldr r4, _08141D90 @ =0x000030d0
@@ -87,56 +87,56 @@ _08141CBA:
strb r1, [r0, 0x13]
adds r0, r7, 0
movs r1, 0x42
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
str r0, [r1]
adds r0, r7, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
str r0, [r1, 0x4]
adds r0, r7, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strh r0, [r1, 0xA]
adds r0, r7, 0
movs r1, 0x16
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xE]
adds r0, r7, 0
movs r1, 0x17
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xF]
adds r0, r7, 0
movs r1, 0x18
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0x10]
adds r0, r7, 0
movs r1, 0x21
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0x11]
adds r0, r7, 0
movs r1, 0x2F
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0x12]
ldr r5, _08141D94 @ =gUnknown_203F3AE
movs r0, 0x3
strb r0, [r5]
- bl sub_8044EC8
+ bl Random
ldr r4, _08141D98 @ =gUnknown_8466C58
lsls r0, 16
lsrs r0, 16
@@ -208,7 +208,7 @@ sub_8141DD4: @ 8141DD4
ldr r5, _08141E24 @ =gUnknown_8466C58
adds r4, r1, 0
_08141DEE:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -238,7 +238,7 @@ _08141E24: .4byte gUnknown_8466C58
sub_8141E28: @ 8141E28
push {r4-r7,lr}
movs r4, 0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xF0
lsls r1, 12
@@ -269,7 +269,7 @@ _08141E52:
adds r5, r2, 0x1
ldr r4, _08141EA4 @ =gUnknown_203F3A8
_08141E68:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x6
@@ -308,8 +308,8 @@ _08141EB2:
bx r0
thumb_func_end sub_8141E28
- thumb_func_start sub_8141EB8
-sub_8141EB8: @ 8141EB8
+ thumb_func_start IsRoamerAt
+IsRoamerAt: @ 8141EB8
push {lr}
lsls r0, 24
lsrs r2, r0, 24
@@ -340,14 +340,14 @@ _08141EF0:
_08141EF2:
pop {r1}
bx r1
- thumb_func_end sub_8141EB8
+ thumb_func_end IsRoamerAt
- thumb_func_start sub_8141EF8
-sub_8141EF8: @ 8141EF8
+ thumb_func_start CreateRoamerMonInstance
+CreateRoamerMonInstance: @ 8141EF8
push {r4,r5,lr}
sub sp, 0x4
ldr r5, _08141F84 @ =gUnknown_202402C
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r4, _08141F88 @ =gUnknown_3005008
ldr r0, [r4]
ldr r1, _08141F8C @ =0x000030d0
@@ -358,7 +358,7 @@ sub_8141EF8: @ 8141EF8
ldr r0, [r0, 0x4]
str r0, [sp]
adds r0, r5, 0
- bl sub_803DF68
+ bl CreateMonWithIVsPersonality
ldr r2, [r4]
ldr r0, _08141F90 @ =0x000030dd
adds r2, r0
@@ -416,28 +416,28 @@ _08141F9C: .4byte 0x000030df
_08141FA0: .4byte 0x000030e0
_08141FA4: .4byte 0x000030e1
_08141FA8: .4byte 0x000030e2
- thumb_func_end sub_8141EF8
+ thumb_func_end CreateRoamerMonInstance
- thumb_func_start sub_8141FAC
-sub_8141FAC: @ 8141FAC
+ thumb_func_start TryStartRoamerEncounter
+TryStartRoamerEncounter: @ 8141FAC
push {lr}
ldr r0, _08141FDC @ =gUnknown_3005008
ldr r1, [r0]
ldrb r0, [r1, 0x4]
ldrb r1, [r1, 0x5]
- bl sub_8141EB8
+ bl IsRoamerAt
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _08141FE0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
ands r1, r0
cmp r1, 0
bne _08141FE0
- bl sub_8141EF8
+ bl CreateRoamerMonInstance
movs r0, 0x1
b _08141FE2
.align 2, 0
@@ -447,14 +447,14 @@ _08141FE0:
_08141FE2:
pop {r1}
bx r1
- thumb_func_end sub_8141FAC
+ thumb_func_end TryStartRoamerEncounter
- thumb_func_start sub_8141FE8
-sub_8141FE8: @ 8141FE8
+ thumb_func_start UpdateRoamerHPStatus
+UpdateRoamerHPStatus: @ 8141FE8
push {r4-r6,lr}
adds r6, r0, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
ldr r5, _08142014 @ =gUnknown_3005008
ldr r1, [r5]
ldr r4, _08142018 @ =0x000030d0
@@ -462,7 +462,7 @@ sub_8141FE8: @ 8141FE8
strh r0, [r1, 0xA]
adds r0, r6, 0
movs r1, 0x37
- bl sub_803FBE8
+ bl GetMonData
ldr r1, [r5]
adds r1, r4
strb r0, [r1, 0xD]
@@ -473,10 +473,10 @@ sub_8141FE8: @ 8141FE8
.align 2, 0
_08142014: .4byte gUnknown_3005008
_08142018: .4byte 0x000030d0
- thumb_func_end sub_8141FE8
+ thumb_func_end UpdateRoamerHPStatus
- thumb_func_start sub_814201C
-sub_814201C: @ 814201C
+ thumb_func_start SetRoamerInactive
+SetRoamerInactive: @ 814201C
ldr r0, _0814202C @ =gUnknown_3005008
ldr r0, [r0]
ldr r1, _08142030 @ =0x000030d0
@@ -487,10 +487,10 @@ sub_814201C: @ 814201C
.align 2, 0
_0814202C: .4byte gUnknown_3005008
_08142030: .4byte 0x000030d0
- thumb_func_end sub_814201C
+ thumb_func_end SetRoamerInactive
- thumb_func_start sub_8142034
-sub_8142034: @ 8142034
+ thumb_func_start GetRoamerLocation
+GetRoamerLocation: @ 8142034
ldr r3, _08142040 @ =gUnknown_203F3AE
ldrb r2, [r3]
strb r2, [r0]
@@ -499,7 +499,7 @@ sub_8142034: @ 8142034
bx lr
.align 2, 0
_08142040: .4byte gUnknown_203F3AE
- thumb_func_end sub_8142034
+ thumb_func_end GetRoamerLocation
thumb_func_start sub_8142044
sub_8142044: @ 8142044
@@ -514,7 +514,7 @@ sub_8142044: @ 8142044
ldr r1, _0814206C @ =gUnknown_203F3AE
ldrb r0, [r1]
ldrb r1, [r1, 0x1]
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
b _08142072
.align 2, 0
diff --git a/asm/rom6.s b/asm/rom6.s
index 299862511..2f91bb9fd 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80C97A8
-sub_80C97A8: @ 80C97A8
+ thumb_func_start npc_before_player_of_type
+npc_before_player_of_type: @ 80C97A8
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 24
@@ -14,13 +14,13 @@ sub_80C97A8: @ 80C97A8
ldr r4, _080C97E8 @ =gUnknown_2039A04
adds r1, r4, 0x2
adds r0, r4, 0
- bl sub_805C4F4
- bl sub_805C700
+ bl GetXYCoordsOneStepInFrontOfPlayer
+ bl PlayerGetZCoord
strb r0, [r4, 0x4]
ldrh r0, [r4]
ldrh r1, [r4, 0x2]
ldrb r2, [r4, 0x4]
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r0, 24
ldr r2, _080C97EC @ =gUnknown_2036E38
@@ -46,33 +46,33 @@ _080C97F6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_80C97A8
+ thumb_func_end npc_before_player_of_type
- thumb_func_start sub_80C97FC
-sub_80C97FC: @ 80C97FC
+ thumb_func_start oei_task_add
+oei_task_add: @ 80C97FC
push {lr}
ldr r0, _080C9818 @ =gUnknown_2039A04
adds r1, r0, 0x2
- bl sub_805C4F4
- ldr r0, _080C981C @ =sub_80C9820
+ bl GetXYCoordsOneStepInFrontOfPlayer
+ ldr r0, _080C981C @ =task08_080C9820
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
.align 2, 0
_080C9818: .4byte gUnknown_2039A04
-_080C981C: .4byte sub_80C9820
- thumb_func_end sub_80C97FC
+_080C981C: .4byte task08_080C9820
+ thumb_func_end oei_task_add
- thumb_func_start sub_80C9820
-sub_80C9820: @ 80C9820
+ thumb_func_start task08_080C9820
+task08_080C9820: @ 80C9820
push {r4-r6,lr}
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _080C9874 @ =gUnknown_2037078
movs r0, 0x1
strb r0, [r1, 0x6]
@@ -83,12 +83,12 @@ sub_80C9820: @ 80C9820
ldr r1, _080C9878 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080C9856
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080C98A2
@@ -98,7 +98,7 @@ _080C9856:
cmp r0, 0x5
bne _080C9888
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
ldr r0, _080C9880 @ =gUnknown_3005090
lsls r1, r5, 2
adds r1, r5
@@ -132,7 +132,7 @@ _080C98A2:
.align 2, 0
_080C98A8: .4byte gUnknown_3005090
_080C98AC: .4byte sub_80C98B0
- thumb_func_end sub_80C9820
+ thumb_func_end task08_080C9820
thumb_func_start sub_80C98B0
sub_80C98B0: @ 80C98B0
@@ -146,13 +146,13 @@ sub_80C98B0: @ 80C98B0
lsls r0, 2
ldr r1, _080C98F0 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
bne _080C98E4
movs r0, 0x3B
- bl sub_8083444
+ bl FieldEffectStart
ldr r0, _080C98F4 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -177,12 +177,12 @@ sub_80C98FC: @ 80C98FC
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x6
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0
bne _080C9980
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
ldr r6, _080C9988 @ =gUnknown_20386E0
lsls r0, 24
lsrs r0, 24
@@ -214,7 +214,7 @@ _080C993C:
lsls r4, 2
ldr r0, _080C9990 @ =gUnknown_2036E38
adds r4, r0
- bl sub_805C9C8
+ bl GetPlayerAvatarGraphicsIdByCurrentState
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -227,9 +227,9 @@ _080C993C:
ldr r1, _080C9994 @ =gUnknown_202063C
adds r0, r1
ldrb r1, [r6, 0x8]
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x6
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r1, _080C9998 @ =gUnknown_3005090
lsls r0, r7, 2
adds r0, r7
@@ -270,7 +270,7 @@ sub_80C99A0: @ 80C99A0
movs r0, 0
strb r0, [r1, 0x6]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -283,7 +283,7 @@ _080C99D4: .4byte gUnknown_2037078
sub_80C99D8: @ 80C99D8
push {lr}
movs r0, 0x60
- bl sub_80C97A8
+ bl npc_before_player_of_type
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -292,7 +292,7 @@ sub_80C99D8: @ 80C99D8
b _080C99FA
_080C99EC:
ldr r1, _080C9A00 @ =gUnknown_3005024
- ldr r0, _080C9A04 @ =sub_81248B0
+ ldr r0, _080C9A04 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080C9A08 @ =gUnknown_203B0C4
ldr r0, _080C9A0C @ =sub_80C9A10
@@ -303,7 +303,7 @@ _080C99FA:
bx r1
.align 2, 0
_080C9A00: .4byte gUnknown_3005024
-_080C9A04: .4byte sub_81248B0
+_080C9A04: .4byte hm_add_c3_launch_phase_2
_080C9A08: .4byte gUnknown_203B0C4
_080C9A0C: .4byte sub_80C9A10
thumb_func_end sub_80C99D8
@@ -317,7 +317,7 @@ sub_80C9A10: @ 80C9A10
lsrs r0, 24
str r0, [r1]
ldr r0, _080C9A2C @ =gUnknown_81BE064
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -328,7 +328,7 @@ _080C9A2C: .4byte gUnknown_81BE064
thumb_func_start sub_80C9A30
sub_80C9A30: @ 80C9A30
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080C9A58 @ =gUnknown_3005090
@@ -356,8 +356,8 @@ sub_80C9A60: @ 80C9A60
movs r0, 0x7C
bl sub_80722CC
movs r0, 0x25
- bl sub_80837FC
- bl sub_8069B34
+ bl FieldEffectActiveListRemove
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_80C9A60
@@ -374,7 +374,7 @@ sub_80C9A78: @ 80C9A78
b _080C9A98
_080C9A8A:
ldr r1, _080C9A9C @ =gUnknown_3005024
- ldr r0, _080C9AA0 @ =sub_81248B0
+ ldr r0, _080C9AA0 @ =hm_add_c3_launch_phase_2
str r0, [r1]
ldr r1, _080C9AA4 @ =gUnknown_203B0C4
ldr r0, _080C9AA8 @ =sub_80C9AAC
@@ -385,7 +385,7 @@ _080C9A98:
bx r1
.align 2, 0
_080C9A9C: .4byte gUnknown_3005024
-_080C9AA0: .4byte sub_81248B0
+_080C9AA0: .4byte hm_add_c3_launch_phase_2
_080C9AA4: .4byte gUnknown_203B0C4
_080C9AA8: .4byte sub_80C9AAC
thumb_func_end sub_80C9A78
@@ -395,7 +395,7 @@ sub_80C9AAC: @ 80C9AAC
push {lr}
bl sub_8054D70
movs r0, 0x26
- bl sub_8083444
+ bl FieldEffectStart
bl sub_811FB0C
ldr r1, _080C9AC8 @ =gUnknown_20386E0
lsls r0, 24
@@ -410,7 +410,7 @@ _080C9AC8: .4byte gUnknown_20386E0
thumb_func_start sub_80C9ACC
sub_80C9ACC: @ 80C9ACC
push {lr}
- bl sub_80C97FC
+ bl oei_task_add
lsls r0, 24
lsrs r0, 24
ldr r2, _080C9AF4 @ =gUnknown_3005090
@@ -436,10 +436,10 @@ _080C9AF8: .4byte sub_80C9AFC
sub_80C9AFC: @ 80C9AFC
push {lr}
movs r0, 0x26
- bl sub_80837FC
+ bl FieldEffectActiveListRemove
ldr r0, _080C9B24 @ =sub_80A1C44
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080C9B28 @ =gUnknown_3005090
diff --git a/asm/roulette_util.s b/asm/roulette_util.s
index 5affddcff..8e60a9fe2 100644
--- a/asm/roulette_util.s
+++ b/asm/roulette_util.s
@@ -487,8 +487,8 @@ _080D8F40: .4byte gUnknown_20375F8
_080D8F44: .4byte gUnknown_20371F8
thumb_func_end sub_80D8EB8
- thumb_func_start sub_80D8F48
-sub_80D8F48: @ 80D8F48
+ thumb_func_start task_tutorial_controls_fadein
+task_tutorial_controls_fadein: @ 80D8F48
push {r4-r6,lr}
adds r4, r0, 0
movs r5, 0
@@ -545,7 +545,7 @@ _080D8FAC:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80D8F48
+ thumb_func_end task_tutorial_controls_fadein
thumb_func_start sub_80D8FB4
sub_80D8FB4: @ 80D8FB4
@@ -1179,7 +1179,7 @@ _080D9424:
lsls r2, 28
lsrs r2, 28
ldrh r3, [r4, 0x4]
- bl sub_8045274
+ bl BlendPalette
ldrb r5, [r4, 0xB]
lsls r0, r5, 26
asrs r0, 30
diff --git a/asm/safari_zone.s b/asm/safari_zone.s
index b18ab32d6..7b3746ff3 100644
--- a/asm/safari_zone.s
+++ b/asm/safari_zone.s
@@ -95,7 +95,7 @@ _080A0F24:
_080A0F28: .4byte gUnknown_2039996
_080A0F2C:
ldr r0, _080A0F38 @ =gUnknown_81BFBC5
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
_080A0F34:
pop {r1}
@@ -108,7 +108,7 @@ _080A0F38: .4byte gUnknown_81BFBC5
sub_80A0F3C: @ 80A0F3C
push {lr}
ldr r0, _080A0F48 @ =gUnknown_81BFBAA
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
pop {r0}
bx r0
.align 2, 0
@@ -122,25 +122,25 @@ sub_80A0F4C: @ 80A0F4C
ldrb r0, [r0]
cmp r0, 0
beq _080A0F68
- ldr r0, _080A0F64 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _080A0F64 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
b _080A0FB0
.align 2, 0
_080A0F60: .4byte gUnknown_2039994
-_080A0F64: .4byte sub_80567DC
+_080A0F64: .4byte c2_exit_to_overworld_2_switch
_080A0F68:
ldr r0, _080A0F88 @ =gUnknown_2023E8A
ldrb r0, [r0]
cmp r0, 0x8
bne _080A0F9C
ldr r0, _080A0F8C @ =gUnknown_81BFB87
- bl sub_8069B48
- bl sub_8055378
+ bl ScriptContext2_RunNewScript
+ bl warp_in
ldr r1, _080A0F90 @ =gUnknown_3005020
ldr r0, _080A0F94 @ =sub_807E3EC
str r0, [r1]
ldr r0, _080A0F98 @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
b _080A0FB0
.align 2, 0
_080A0F88: .4byte gUnknown_2023E8A
@@ -152,16 +152,16 @@ _080A0F9C:
cmp r0, 0x7
bne _080A0FB0
ldr r0, _080A0FB4 @ =gUnknown_81BFBD7
- bl sub_8069AE4
- bl sub_8069B28
- ldr r0, _080A0FB8 @ =sub_80568E0
- bl sub_8000544
+ bl ScriptContext1_SetupScript
+ bl ScriptContext1_Stop
+ ldr r0, _080A0FB8 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
_080A0FB0:
pop {r0}
bx r0
.align 2, 0
_080A0FB4: .4byte gUnknown_81BFBD7
-_080A0FB8: .4byte sub_80568E0
+_080A0FB8: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80A0F4C
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/save.s b/asm/save.s
index dd57c8439..0f58f4837 100644
--- a/asm/save.s
+++ b/asm/save.s
@@ -26,8 +26,8 @@ _080D9732:
_080D974C: .4byte EraseFlashSector
thumb_func_end sub_80D972C
- thumb_func_start sub_80D9750
-sub_80D9750: @ 80D9750
+ thumb_func_start ResetSaveCounters
+ResetSaveCounters: @ 80D9750
ldr r0, _080D9760 @ =gUnknown_3005390
movs r1, 0
str r1, [r0]
@@ -40,10 +40,10 @@ sub_80D9750: @ 80D9750
_080D9760: .4byte gUnknown_3005390
_080D9764: .4byte gUnknown_3005380
_080D9768: .4byte gUnknown_300538C
- thumb_func_end sub_80D9750
+ thumb_func_end ResetSaveCounters
- thumb_func_start sub_80D976C
-sub_80D976C: @ 80D976C
+ thumb_func_start SetDamagedSectorBits
+SetDamagedSectorBits: @ 80D976C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -97,10 +97,10 @@ _080D97C4:
bx r1
.align 2, 0
_080D97CC: .4byte gUnknown_300538C
- thumb_func_end sub_80D976C
+ thumb_func_end SetDamagedSectorBits
- thumb_func_start sub_80D97D0
-sub_80D97D0: @ 80D97D0
+ thumb_func_start save_write_to_flash
+save_write_to_flash: @ 80D97D0
push {r4-r7,lr}
adds r7, r1, 0
lsls r0, 16
@@ -113,7 +113,7 @@ sub_80D97D0: @ 80D97D0
beq _080D9800
adds r0, r2, 0
adds r1, r7, 0
- bl sub_80D9870
+ bl HandleWriteSector
lsls r0, 24
lsrs r5, r0, 24
b _080D9852
@@ -143,7 +143,7 @@ _080D9800:
_080D9826:
adds r0, r4, 0
adds r1, r7, 0
- bl sub_80D9870
+ bl HandleWriteSector
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -173,10 +173,10 @@ _080D9860: .4byte gUnknown_3005380
_080D9864: .4byte gUnknown_3005384
_080D9868: .4byte gUnknown_3005390
_080D986C: .4byte gUnknown_300538C
- thumb_func_end sub_80D97D0
+ thumb_func_end save_write_to_flash
- thumb_func_start sub_80D9870
-sub_80D9870: @ 80D9870
+ thumb_func_start HandleWriteSector
+HandleWriteSector: @ 80D9870
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -261,14 +261,14 @@ _080D98FA:
_080D9910:
mov r0, r10
adds r1, r4, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
ldr r1, _080D9944 @ =gUnknown_3005394
ldr r1, [r1]
ldr r7, _080D995C @ =0x00000ff6
adds r2, r1, r7
strh r0, [r2]
lsrs r0, r5, 24
- bl sub_80D99D8
+ bl TryWriteSector
lsls r0, 24
lsrs r0, 24
pop {r3-r5}
@@ -288,10 +288,10 @@ _080D9950: .4byte 0x00000ff8
_080D9954: .4byte 0x08012025
_080D9958: .4byte 0x00000ffc
_080D995C: .4byte 0x00000ff6
- thumb_func_end sub_80D9870
+ thumb_func_end HandleWriteSector
- thumb_func_start sub_80D9960
-sub_80D9960: @ 80D9960
+ thumb_func_start HandleWriteSectorNBytes
+HandleWriteSectorNBytes: @ 80D9960
push {r4-r7,lr}
adds r5, r1, 0
lsls r0, 24
@@ -330,13 +330,13 @@ _080D9990:
_080D99A2:
adds r0, r5, 0
adds r1, r2, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
ldr r2, _080D99D4 @ =0x00000ff4
adds r1, r4, r2
strh r0, [r1]
adds r0, r7, 0
adds r1, r4, 0
- bl sub_80D99D8
+ bl TryWriteSector
lsls r0, 24
lsrs r0, 24
pop {r4-r7}
@@ -348,10 +348,10 @@ _080D99C8: .4byte 0x00000fff
_080D99CC: .4byte 0x00000ff8
_080D99D0: .4byte 0x08012025
_080D99D4: .4byte 0x00000ff4
- thumb_func_end sub_80D9960
+ thumb_func_end HandleWriteSectorNBytes
- thumb_func_start sub_80D99D8
-sub_80D99D8: @ 80D99D8
+ thumb_func_start TryWriteSector
+TryWriteSector: @ 80D99D8
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -361,22 +361,22 @@ sub_80D99D8: @ 80D99D8
bne _080D99F4
movs r0, 0x1
adds r1, r4, 0
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0x1
b _080D99FE
_080D99F4:
movs r0, 0
adds r1, r4, 0
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0xFF
_080D99FE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80D99D8
+ thumb_func_end TryWriteSector
- thumb_func_start sub_80D9A04
-sub_80D9A04: @ 80D9A04
+ thumb_func_start RestoreSaveBackupVarsAndIncrement
+RestoreSaveBackupVarsAndIncrement: @ 80D9A04
push {r4-r6,lr}
ldr r1, _080D9A40 @ =gUnknown_3005394
ldr r0, _080D9A44 @ =gUnknown_2039A38
@@ -415,10 +415,10 @@ _080D9A50: .4byte gUnknown_3005384
_080D9A54: .4byte gUnknown_3005390
_080D9A58: .4byte gUnknown_3005398
_080D9A5C: .4byte gUnknown_300538C
- thumb_func_end sub_80D9A04
+ thumb_func_end RestoreSaveBackupVarsAndIncrement
- thumb_func_start sub_80D9A60
-sub_80D9A60: @ 80D9A60
+ thumb_func_start RestoreSaveBackupVars
+RestoreSaveBackupVars: @ 80D9A60
ldr r1, _080D9A84 @ =gUnknown_3005394
ldr r0, _080D9A88 @ =gUnknown_2039A38
str r0, [r1]
@@ -446,7 +446,7 @@ _080D9A94: .4byte gUnknown_3005384
_080D9A98: .4byte gUnknown_3005390
_080D9A9C: .4byte gUnknown_3005398
_080D9AA0: .4byte gUnknown_300538C
- thumb_func_end sub_80D9A60
+ thumb_func_end RestoreSaveBackupVars
thumb_func_start sub_80D9AA4
sub_80D9AA4: @ 80D9AA4
@@ -460,7 +460,7 @@ sub_80D9AA4: @ 80D9AA4
bge _080D9AF8
movs r5, 0x1
adds r0, r2, 0
- bl sub_80D9870
+ bl HandleWriteSector
ldrh r0, [r4]
adds r0, 0x1
strh r0, [r4]
@@ -502,7 +502,7 @@ sub_80D9B04: @ 80D9B04
ldr r2, _080D9B38 @ =0xffff0000
adds r0, r2
lsrs r0, 16
- bl sub_80D9B50
+ bl ClearSaveData_2
ldr r0, _080D9B3C @ =gUnknown_300538C
ldr r0, [r0]
cmp r0, 0
@@ -530,8 +530,8 @@ _080D9B48: .4byte gUnknown_3005390
_080D9B4C: .4byte gUnknown_3005384
thumb_func_end sub_80D9B04
- thumb_func_start sub_80D9B50
-sub_80D9B50: @ 80D9B50
+ thumb_func_start ClearSaveData_2
+ClearSaveData_2: @ 80D9B50
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -617,7 +617,7 @@ _080D9BDC:
_080D9BF2:
mov r0, r10
adds r1, r3, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
ldr r1, _080D9C24 @ =gUnknown_3005394
ldr r1, [r1]
ldr r2, _080D9C3C @ =0x00000ff6
@@ -710,7 +710,7 @@ _080D9CBC:
mov r2, r8
lsrs r1, r2, 24
movs r0, 0x1
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0x1
b _080D9CE0
.align 2, 0
@@ -720,7 +720,7 @@ _080D9CD4:
lsrs r1, r6, 24
_080D9CD8:
movs r0, 0
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0xFF
_080D9CE0:
pop {r3-r5}
@@ -730,7 +730,7 @@ _080D9CE0:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80D9B50
+ thumb_func_end ClearSaveData_2
thumb_func_start sub_80D9CF0
sub_80D9CF0: @ 80D9CF0
@@ -773,7 +773,7 @@ sub_80D9CF0: @ 80D9CF0
lsls r1, r4, 24
lsrs r1, 24
movs r0, 0x1
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0x1
b _080D9D78
.align 2, 0
@@ -786,7 +786,7 @@ _080D9D60:
lsls r1, r4, 24
lsrs r1, 24
movs r0, 0
- bl sub_80D976C
+ bl SetDamagedSectorBits
ldr r0, _080D9D80 @ =gUnknown_3005388
ldrh r0, [r0]
strh r0, [r6]
@@ -841,7 +841,7 @@ sub_80D9D88: @ 80D9D88
lsls r1, r4, 24
lsrs r1, 24
movs r0, 0x1
- bl sub_80D976C
+ bl SetDamagedSectorBits
movs r0, 0x1
b _080D9E04
.align 2, 0
@@ -853,7 +853,7 @@ _080D9DEC:
lsls r1, r4, 24
lsrs r1, 24
movs r0, 0
- bl sub_80D976C
+ bl SetDamagedSectorBits
ldr r0, _080D9E0C @ =gUnknown_3005388
ldrh r0, [r0]
strh r0, [r6]
@@ -890,7 +890,7 @@ _080D9E30: .4byte gUnknown_2039A38
_080D9E34: .4byte 0x0000ffff
_080D9E38:
adds r0, r6, 0
- bl sub_80D9F0C
+ bl GetSaveValidStatus
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
@@ -924,7 +924,7 @@ _080D9E70:
lsls r0, 24
lsrs r0, 24
ldr r1, [r6]
- bl sub_80DA190
+ bl DoReadFlashWholeSection
ldr r0, [r6]
ldr r1, _080D9EF8 @ =0x00000ff4
adds r0, r1
@@ -939,7 +939,7 @@ _080D9E8C:
mov r2, r8
adds r4, r1, r2
ldrh r1, [r4, 0x4]
- bl sub_80DA1A8
+ bl CalculateChecksum
lsls r0, 16
lsrs r3, r0, 16
ldr r2, [r6]
@@ -995,8 +995,8 @@ _080D9F04: .4byte 0x08012025
_080D9F08: .4byte 0x00000ff6
thumb_func_end sub_80D9E54
- thumb_func_start sub_80D9F0C
-sub_80D9F0C: @ 80D9F0C
+ thumb_func_start GetSaveValidStatus
+GetSaveValidStatus: @ 80D9F0C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1015,7 +1015,7 @@ _080D9F28:
lsls r0, r4, 24
lsrs r0, 24
ldr r1, [r7]
- bl sub_80DA190
+ bl DoReadFlashWholeSection
ldr r2, [r7]
ldr r1, _080D9F9C @ =0x00000ff8
adds r0, r2, r1
@@ -1031,7 +1031,7 @@ _080D9F28:
add r0, r10
ldrh r1, [r0, 0x4]
adds r0, r2, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
lsls r0, 16
lsrs r2, r0, 16
ldr r1, [r7]
@@ -1088,7 +1088,7 @@ _080D9FC0:
lsls r0, 24
lsrs r0, 24
ldr r1, [r7]
- bl sub_80DA190
+ bl DoReadFlashWholeSection
ldr r2, [r7]
ldr r1, _080DA034 @ =0x00000ff8
adds r0, r2, r1
@@ -1104,7 +1104,7 @@ _080D9FC0:
add r0, r10
ldrh r1, [r0, 0x4]
adds r0, r2, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
lsls r0, 16
lsrs r2, r0, 16
ldr r1, [r7]
@@ -1262,7 +1262,7 @@ _080DA108:
.align 2, 0
_080DA118: .4byte gUnknown_3005390
_080DA11C: .4byte gUnknown_3005380
- thumb_func_end sub_80D9F0C
+ thumb_func_end GetSaveValidStatus
thumb_func_start sub_80DA120
sub_80DA120: @ 80DA120
@@ -1274,7 +1274,7 @@ sub_80DA120: @ 80DA120
lsrs r4, r2, 16
ldr r5, _080DA174 @ =gUnknown_2039A38
adds r1, r5, 0
- bl sub_80DA190
+ bl DoReadFlashWholeSection
ldr r1, _080DA178 @ =0x00000ff8
adds r0, r5, r1
ldr r1, [r0]
@@ -1283,7 +1283,7 @@ sub_80DA120: @ 80DA120
bne _080DA188
adds r0, r5, 0
adds r1, r4, 0
- bl sub_80DA1A8
+ bl CalculateChecksum
lsls r0, 16
lsrs r0, 16
ldr r2, _080DA180 @ =0x00000ff4
@@ -1323,8 +1323,8 @@ _080DA18A:
bx r1
thumb_func_end sub_80DA120
- thumb_func_start sub_80DA190
-sub_80DA190: @ 80DA190
+ thumb_func_start DoReadFlashWholeSection
+DoReadFlashWholeSection: @ 80DA190
push {lr}
adds r2, r1, 0
lsls r0, 24
@@ -1336,10 +1336,10 @@ sub_80DA190: @ 80DA190
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_80DA190
+ thumb_func_end DoReadFlashWholeSection
- thumb_func_start sub_80DA1A8
-sub_80DA1A8: @ 80DA1A8
+ thumb_func_start CalculateChecksum
+CalculateChecksum: @ 80DA1A8
push {r4,lr}
adds r4, r0, 0
lsls r1, 16
@@ -1364,10 +1364,10 @@ _080DA1C6:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80DA1A8
+ thumb_func_end CalculateChecksum
- thumb_func_start sub_80DA1D4
-sub_80DA1D4: @ 80DA1D4
+ thumb_func_start UpdateSaveAddresses
+UpdateSaveAddresses: @ 80DA1D4
push {r4,r5,lr}
ldr r3, _080DA234 @ =gUnknown_30053B0
ldr r0, _080DA238 @ =gUnknown_300500C
@@ -1423,7 +1423,7 @@ _080DA238: .4byte gUnknown_300500C
_080DA23C: .4byte gUnknown_83FEC94
_080DA240: .4byte gUnknown_3005008
_080DA244: .4byte gUnknown_3005010
- thumb_func_end sub_80DA1D4
+ thumb_func_end UpdateSaveAddresses
thumb_func_start sub_80DA248
sub_80DA248: @ 80DA248
@@ -1434,7 +1434,7 @@ sub_80DA248: @ 80DA248
ldr r6, [r1, 0x20]
movs r0, 0
str r0, [r1, 0x20]
- bl sub_80DA1D4
+ bl UpdateSaveAddresses
cmp r4, 0x5
bhi _080DA2CC
lsls r0, r4, 2
@@ -1480,17 +1480,17 @@ _080DA2B0:
movs r0, 0x1C
adds r1, r4, 0
adds r2, r5, 0
- bl sub_80D9960
+ bl HandleWriteSectorNBytes
adds r4, r5
movs r0, 0x1D
adds r1, r4, 0
adds r2, r5, 0
- bl sub_80D9960
+ bl HandleWriteSectorNBytes
_080DA2CC:
bl sub_804C300
ldr r0, _080DA2E8 @ =0x0000ffff
ldr r1, _080DA2EC @ =gUnknown_30053B0
- bl sub_80D97D0
+ bl save_write_to_flash
b _080DA346
.align 2, 0
_080DA2DC: .4byte EraseFlashSector
@@ -1504,7 +1504,7 @@ _080DA2F0:
_080DA2F6:
adds r0, r4, 0
ldr r1, _080DA30C @ =gUnknown_30053B0
- bl sub_80D97D0
+ bl save_write_to_flash
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -1517,7 +1517,7 @@ _080DA310:
bl sub_804C300
ldr r1, _080DA320 @ =gUnknown_30053B0
movs r0, 0
- bl sub_80D97D0
+ bl save_write_to_flash
b _080DA346
.align 2, 0
_080DA320: .4byte gUnknown_30053B0
@@ -1536,7 +1536,7 @@ _080DA328:
bl sub_804C300
ldr r0, _080DA358 @ =0x0000ffff
ldr r1, _080DA35C @ =gUnknown_30053B0
- bl sub_80D97D0
+ bl save_write_to_flash
_080DA346:
ldr r0, _080DA360 @ =gUnknown_30030F0
str r6, [r0, 0x20]
@@ -1551,8 +1551,8 @@ _080DA35C: .4byte gUnknown_30053B0
_080DA360: .4byte gUnknown_30030F0
thumb_func_end sub_80DA248
- thumb_func_start sub_80DA364
-sub_80DA364: @ 80DA364
+ thumb_func_start TrySavingData
+TrySavingData: @ 80DA364
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -1588,7 +1588,7 @@ _080DA3A2:
bx r1
.align 2, 0
_080DA3A8: .4byte gUnknown_3005420
- thumb_func_end sub_80DA364
+ thumb_func_end TrySavingData
thumb_func_start sub_80DA3AC
sub_80DA3AC: @ 80DA3AC
@@ -1597,10 +1597,10 @@ sub_80DA3AC: @ 80DA3AC
ldr r0, [r0]
cmp r0, 0x1
bne _080DA3D0
- bl sub_80DA1D4
+ bl UpdateSaveAddresses
bl sub_804C300
ldr r0, _080DA3CC @ =gUnknown_30053B0
- bl sub_80D9A04
+ bl RestoreSaveBackupVarsAndIncrement
movs r0, 0
b _080DA3D2
.align 2, 0
@@ -1692,11 +1692,11 @@ sub_80DA45C: @ 80DA45C
ldr r0, [r0]
cmp r0, 0x1
bne _080DA498
- bl sub_80DA1D4
+ bl UpdateSaveAddresses
bl sub_804C300
ldr r4, _080DA490 @ =gUnknown_30053B0
adds r0, r4, 0
- bl sub_80D9A60
+ bl RestoreSaveBackupVars
ldr r0, _080DA494 @ =gUnknown_3005398
ldrh r0, [r0]
adds r0, 0x1
@@ -1783,7 +1783,7 @@ sub_80DA4FC: @ 80DA4FC
_080DA514: .4byte gUnknown_3005004
_080DA518: .4byte gUnknown_30053A0
_080DA51C:
- bl sub_80DA1D4
+ bl UpdateSaveAddresses
cmp r4, 0
beq _080DA528
cmp r4, 0x3
@@ -2072,7 +2072,7 @@ _080DA744:
.align 2, 0
_080DA758: .4byte gUnknown_3005090
_080DA75C:
- bl sub_804C1DC
+ bl sav2_gender2_inplace_and_xFE
bl sub_800AB9C
ldr r0, _080DA774 @ =gUnknown_3005090
lsls r1, r4, 2
@@ -2144,7 +2144,7 @@ _080DA7D4:
movs r0, 0
strb r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080DA7F6:
pop {r4}
pop {r0}
diff --git a/asm/save_failed_screen.s b/asm/save_failed_screen.s
index 4cd6783d0..dae098dd3 100644
--- a/asm/save_failed_screen.s
+++ b/asm/save_failed_screen.s
@@ -89,7 +89,7 @@ _080F5190:
bl sub_80F52EC
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F51B0 @ =gUnknown_203AB50
movs r0, 0x2
strb r0, [r1]
@@ -102,13 +102,13 @@ _080F51B4:
lsls r2, 7
movs r0, 0
movs r3, 0
- bl sub_8000F44
+ bl RequestDma3Fill
ldr r0, _080F51DC @ =gUnknown_841EE44
movs r1, 0xA0
lsls r1, 19
movs r2, 0x20
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
ldr r1, _080F51E0 @ =gUnknown_203AB50
movs r0, 0x3
strb r0, [r1]
@@ -132,20 +132,20 @@ _080F5200: .4byte gUnknown_203AB50
_080F5204:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F5238 @ =0x00001f0c
movs r0, 0x8
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x80
lsls r1, 1
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080F523C @ =gUnknown_203AB50
movs r0, 0x5
strb r0, [r1]
@@ -196,7 +196,7 @@ _080F5294: .4byte gUnknown_30030F0
_080F5298:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_813BC2C
bl sub_80F52EC
ldr r1, _080F52B0 @ =gUnknown_203AB50
@@ -264,7 +264,7 @@ sub_80F5318: @ 80F5318
movs r2, 0xA0
lsls r2, 3
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
@@ -280,7 +280,7 @@ sub_80F5334: @ 80F5334
movs r2, 0x8C
lsls r2, 6
movs r3, 0
- bl sub_8000EAC
+ bl RequestDma3Copy
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/save_location.s b/asm/save_location.s
index 69cf163ca..ac7c71aa2 100644
--- a/asm/save_location.s
+++ b/asm/save_location.s
@@ -48,8 +48,8 @@ _0810B736:
bx r1
thumb_func_end sub_810B6F4
- thumb_func_start sub_810B73C
-sub_810B73C: @ 810B73C
+ thumb_func_start IsCurMapPokeCenter
+IsCurMapPokeCenter: @ 810B73C
push {lr}
ldr r0, _0810B748 @ =gUnknown_845303C
bl sub_810B6F4
@@ -57,10 +57,10 @@ sub_810B73C: @ 810B73C
bx r1
.align 2, 0
_0810B748: .4byte gUnknown_845303C
- thumb_func_end sub_810B73C
+ thumb_func_end IsCurMapPokeCenter
- thumb_func_start sub_810B74C
-sub_810B74C: @ 810B74C
+ thumb_func_start IsCurMapReloadLocation
+IsCurMapReloadLocation: @ 810B74C
push {lr}
ldr r0, _0810B758 @ =gUnknown_8453092
bl sub_810B6F4
@@ -68,7 +68,7 @@ sub_810B74C: @ 810B74C
bx r1
.align 2, 0
_0810B758: .4byte gUnknown_8453092
- thumb_func_end sub_810B74C
+ thumb_func_end IsCurMapReloadLocation
thumb_func_start sub_810B75C
sub_810B75C: @ 810B75C
@@ -81,10 +81,10 @@ sub_810B75C: @ 810B75C
_0810B768: .4byte gUnknown_8453094
thumb_func_end sub_810B75C
- thumb_func_start sub_810B76C
-sub_810B76C: @ 810B76C
+ thumb_func_start TrySetPokeCenterWarpStatus
+TrySetPokeCenterWarpStatus: @ 810B76C
push {lr}
- bl sub_810B73C
+ bl IsCurMapPokeCenter
cmp r0, 0
bne _0810B788
ldr r0, _0810B784 @ =gUnknown_300500C
@@ -107,12 +107,12 @@ _0810B792:
bx r0
.align 2, 0
_0810B798: .4byte gUnknown_300500C
- thumb_func_end sub_810B76C
+ thumb_func_end TrySetPokeCenterWarpStatus
- thumb_func_start sub_810B79C
-sub_810B79C: @ 810B79C
+ thumb_func_start TrySetReloadWarpStatus
+TrySetReloadWarpStatus: @ 810B79C
push {lr}
- bl sub_810B74C
+ bl IsCurMapReloadLocation
cmp r0, 0
bne _0810B7B8
ldr r0, _0810B7B4 @ =gUnknown_300500C
@@ -135,7 +135,7 @@ _0810B7C2:
bx r0
.align 2, 0
_0810B7C8: .4byte gUnknown_300500C
- thumb_func_end sub_810B79C
+ thumb_func_end TrySetReloadWarpStatus
thumb_func_start sub_810B7CC
sub_810B7CC: @ 810B7CC
@@ -165,15 +165,15 @@ _0810B7F2:
_0810B7F8: .4byte gUnknown_300500C
thumb_func_end sub_810B7CC
- thumb_func_start sub_810B7FC
-sub_810B7FC: @ 810B7FC
+ thumb_func_start TrySetMapSaveWarpStatus
+TrySetMapSaveWarpStatus: @ 810B7FC
push {lr}
- bl sub_810B76C
- bl sub_810B79C
+ bl TrySetPokeCenterWarpStatus
+ bl TrySetReloadWarpStatus
bl sub_810B7CC
pop {r0}
bx r0
- thumb_func_end sub_810B7FC
+ thumb_func_end TrySetMapSaveWarpStatus
thumb_func_start sub_810B810
sub_810B810: @ 810B810
diff --git a/asm/save_menu_util.s b/asm/save_menu_util.s
index 6a058f49f..56f892a9c 100644
--- a/asm/save_menu_util.s
+++ b/asm/save_menu_util.s
@@ -50,7 +50,7 @@ _080F8024:
ldr r0, _080F8030 @ =gUnknown_300500C
ldr r1, [r0]
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
b _080F80D8
.align 2, 0
_080F8030: .4byte gUnknown_300500C
diff --git a/asm/scrcmd.s b/asm/scrcmd.s
index 23e313211..8606aa4da 100644
--- a/asm/scrcmd.s
+++ b/asm/scrcmd.s
@@ -17,20 +17,20 @@ sub_8069ED4: @ 8069ED4
bx lr
thumb_func_end sub_8069ED4
- thumb_func_start sub_8069ED8
-sub_8069ED8: @ 8069ED8
+ thumb_func_start ScrCmd_end
+ScrCmd_end: @ 8069ED8
push {lr}
bl sub_80697FC
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_8069ED8
+ thumb_func_end ScrCmd_end
- thumb_func_start sub_8069EE4
-sub_8069EE4: @ 8069EE4
+ thumb_func_start ScrCmd_gotonative
+ScrCmd_gotonative: @ 8069EE4
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
adds r0, r4, 0
bl sub_80697F4
@@ -38,12 +38,12 @@ sub_8069EE4: @ 8069EE4
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8069EE4
+ thumb_func_end ScrCmd_gotonative
thumb_func_start sub_8069EFC
sub_8069EFC: @ 8069EFC
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 14
ldr r1, _08069F18 @ =gUnknown_815FD60
@@ -76,13 +76,13 @@ _08069F38: .4byte gUnknown_83A7290
sub_8069F3C: @ 8069F3C
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 14
ldr r1, _08069F6C @ =gUnknown_815FD60
@@ -114,64 +114,64 @@ _08069F8C: .4byte 0x00000107
_08069F90: .4byte gUnknown_83A7290
thumb_func_end sub_8069F3C
- thumb_func_start sub_8069F94
-sub_8069F94: @ 8069F94
+ thumb_func_start ScrCmd_callnative
+ScrCmd_callnative: @ 8069F94
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
bl _call_via_r0
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_8069F94
+ thumb_func_end ScrCmd_callnative
thumb_func_start sub_8069FA4
sub_8069FA4: @ 8069FA4
push {lr}
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
thumb_func_end sub_8069FA4
- thumb_func_start sub_8069FB0
-sub_8069FB0: @ 8069FB0
+ thumb_func_start ScrCmd_goto
+ScrCmd_goto: @ 8069FB0
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
adds r0, r4, 0
- bl sub_80698D0
+ bl ScriptJump
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8069FB0
+ thumb_func_end ScrCmd_goto
- thumb_func_start sub_8069FC8
-sub_8069FC8: @ 8069FC8
+ thumb_func_start ScrCmd_return
+ScrCmd_return: @ 8069FC8
push {lr}
- bl sub_80698E8
+ bl ScriptReturn
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_8069FC8
+ thumb_func_end ScrCmd_return
- thumb_func_start sub_8069FD4
-sub_8069FD4: @ 8069FD4
+ thumb_func_start ScrCmd_call
+ScrCmd_call: @ 8069FD4
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
adds r0, r4, 0
- bl sub_80698D4
+ bl ScriptCall
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8069FD4
+ thumb_func_end ScrCmd_call
- thumb_func_start sub_8069FEC
-sub_8069FEC: @ 8069FEC
+ thumb_func_start ScrCmd_goto_if
+ScrCmd_goto_if: @ 8069FEC
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0x8]
@@ -179,7 +179,7 @@ sub_8069FEC: @ 8069FEC
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r2, r0, 0
ldr r1, _0806A024 @ =gUnknown_83A7248
lsls r0, r4, 1
@@ -192,7 +192,7 @@ sub_8069FEC: @ 8069FEC
bne _0806A01A
adds r0, r5, 0
adds r1, r2, 0
- bl sub_80698D0
+ bl ScriptJump
_0806A01A:
movs r0, 0
pop {r4,r5}
@@ -200,10 +200,10 @@ _0806A01A:
bx r1
.align 2, 0
_0806A024: .4byte gUnknown_83A7248
- thumb_func_end sub_8069FEC
+ thumb_func_end ScrCmd_goto_if
- thumb_func_start sub_806A028
-sub_806A028: @ 806A028
+ thumb_func_start ScrCmd_call_if
+ScrCmd_call_if: @ 806A028
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0x8]
@@ -211,7 +211,7 @@ sub_806A028: @ 806A028
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r2, r0, 0
ldr r1, _0806A060 @ =gUnknown_83A7248
lsls r0, r4, 1
@@ -224,7 +224,7 @@ sub_806A028: @ 806A028
bne _0806A056
adds r0, r5, 0
adds r1, r2, 0
- bl sub_80698D4
+ bl ScriptCall
_0806A056:
movs r0, 0
pop {r4,r5}
@@ -232,14 +232,14 @@ _0806A056:
bx r1
.align 2, 0
_0806A060: .4byte gUnknown_83A7248
- thumb_func_end sub_806A028
+ thumb_func_end ScrCmd_call_if
- thumb_func_start sub_806A064
-sub_806A064: @ 806A064
+ thumb_func_start ScrCmd_setvaddress
+ScrCmd_setvaddress: @ 806A064
push {r4,lr}
ldr r4, [r0, 0x8]
subs r4, 0x1
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, _0806A07C @ =gUnknown_20370A8
subs r0, r4
str r0, [r1]
@@ -249,48 +249,48 @@ sub_806A064: @ 806A064
bx r1
.align 2, 0
_0806A07C: .4byte gUnknown_20370A8
- thumb_func_end sub_806A064
+ thumb_func_end ScrCmd_setvaddress
- thumb_func_start sub_806A080
-sub_806A080: @ 806A080
+ thumb_func_start ScrCmd_vgoto
+ScrCmd_vgoto: @ 806A080
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, _0806A0A0 @ =gUnknown_20370A8
ldr r0, [r0]
subs r1, r0
adds r0, r4, 0
- bl sub_80698D0
+ bl ScriptJump
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806A0A0: .4byte gUnknown_20370A8
- thumb_func_end sub_806A080
+ thumb_func_end ScrCmd_vgoto
- thumb_func_start sub_806A0A4
-sub_806A0A4: @ 806A0A4
+ thumb_func_start ScrCmd_vcall
+ScrCmd_vcall: @ 806A0A4
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, _0806A0C4 @ =gUnknown_20370A8
ldr r0, [r0]
subs r1, r0
adds r0, r4, 0
- bl sub_80698D4
+ bl ScriptCall
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806A0C4: .4byte gUnknown_20370A8
- thumb_func_end sub_806A0A4
+ thumb_func_end ScrCmd_vcall
- thumb_func_start sub_806A0C8
-sub_806A0C8: @ 806A0C8
+ thumb_func_start ScrCmd_vgoto_if
+ScrCmd_vgoto_if: @ 806A0C8
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0x8]
@@ -298,7 +298,7 @@ sub_806A0C8: @ 806A0C8
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, _0806A104 @ =gUnknown_20370A8
ldr r1, [r1]
subs r2, r0, r1
@@ -313,7 +313,7 @@ sub_806A0C8: @ 806A0C8
bne _0806A0FA
adds r0, r5, 0
adds r1, r2, 0
- bl sub_80698D0
+ bl ScriptJump
_0806A0FA:
movs r0, 0
pop {r4,r5}
@@ -322,10 +322,10 @@ _0806A0FA:
.align 2, 0
_0806A104: .4byte gUnknown_20370A8
_0806A108: .4byte gUnknown_83A7248
- thumb_func_end sub_806A0C8
+ thumb_func_end ScrCmd_vgoto_if
- thumb_func_start sub_806A10C
-sub_806A10C: @ 806A10C
+ thumb_func_start ScrCmd_vcall_if
+ScrCmd_vcall_if: @ 806A10C
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, [r5, 0x8]
@@ -333,7 +333,7 @@ sub_806A10C: @ 806A10C
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, _0806A148 @ =gUnknown_20370A8
ldr r1, [r1]
subs r2, r0, r1
@@ -348,7 +348,7 @@ sub_806A10C: @ 806A10C
bne _0806A13E
adds r0, r5, 0
adds r1, r2, 0
- bl sub_80698D4
+ bl ScriptCall
_0806A13E:
movs r0, 0
pop {r4,r5}
@@ -357,10 +357,10 @@ _0806A13E:
.align 2, 0
_0806A148: .4byte gUnknown_20370A8
_0806A14C: .4byte gUnknown_83A7248
- thumb_func_end sub_806A10C
+ thumb_func_end ScrCmd_vcall_if
- thumb_func_start sub_806A150
-sub_806A150: @ 806A150
+ thumb_func_start ScrCmd_gotostd
+ScrCmd_gotostd: @ 806A150
push {lr}
adds r2, r0, 0
ldr r0, [r2, 0x8]
@@ -375,7 +375,7 @@ sub_806A150: @ 806A150
bcs _0806A170
ldr r1, [r1]
adds r0, r2, 0
- bl sub_80698D0
+ bl ScriptJump
_0806A170:
movs r0, 0
pop {r1}
@@ -383,10 +383,10 @@ _0806A170:
.align 2, 0
_0806A178: .4byte gUnknown_8160450
_0806A17C: .4byte gUnknown_8160478
- thumb_func_end sub_806A150
+ thumb_func_end ScrCmd_gotostd
- thumb_func_start sub_806A180
-sub_806A180: @ 806A180
+ thumb_func_start ScrCmd_callstd
+ScrCmd_callstd: @ 806A180
push {lr}
adds r2, r0, 0
ldr r0, [r2, 0x8]
@@ -401,7 +401,7 @@ sub_806A180: @ 806A180
bcs _0806A1A0
ldr r1, [r1]
adds r0, r2, 0
- bl sub_80698D4
+ bl ScriptCall
_0806A1A0:
movs r0, 0
pop {r1}
@@ -409,10 +409,10 @@ _0806A1A0:
.align 2, 0
_0806A1A8: .4byte gUnknown_8160450
_0806A1AC: .4byte gUnknown_8160478
- thumb_func_end sub_806A180
+ thumb_func_end ScrCmd_callstd
- thumb_func_start sub_806A1B0
-sub_806A1B0: @ 806A1B0
+ thumb_func_start ScrCmd_gotostd_if
+ScrCmd_gotostd_if: @ 806A1B0
push {r4,lr}
adds r3, r0, 0
ldr r0, [r3, 0x8]
@@ -439,7 +439,7 @@ sub_806A1B0: @ 806A1B0
bcs _0806A1E8
ldr r1, [r1]
adds r0, r3, 0
- bl sub_80698D0
+ bl ScriptJump
_0806A1E8:
movs r0, 0
pop {r4}
@@ -449,10 +449,10 @@ _0806A1E8:
_0806A1F0: .4byte gUnknown_83A7248
_0806A1F4: .4byte gUnknown_8160450
_0806A1F8: .4byte gUnknown_8160478
- thumb_func_end sub_806A1B0
+ thumb_func_end ScrCmd_gotostd_if
- thumb_func_start sub_806A1FC
-sub_806A1FC: @ 806A1FC
+ thumb_func_start ScrCmd_callstd_if
+ScrCmd_callstd_if: @ 806A1FC
push {r4,lr}
adds r3, r0, 0
ldr r0, [r3, 0x8]
@@ -479,7 +479,7 @@ sub_806A1FC: @ 806A1FC
bcs _0806A234
ldr r1, [r1]
adds r0, r3, 0
- bl sub_80698D4
+ bl ScriptCall
_0806A234:
movs r0, 0
pop {r4}
@@ -489,36 +489,36 @@ _0806A234:
_0806A23C: .4byte gUnknown_83A7248
_0806A240: .4byte gUnknown_8160450
_0806A244: .4byte gUnknown_8160478
- thumb_func_end sub_806A1FC
+ thumb_func_end ScrCmd_callstd_if
- thumb_func_start sub_806A248
-sub_806A248: @ 806A248
+ thumb_func_start ScrCmd_gotoram
+ScrCmd_gotoram: @ 806A248
push {lr}
ldr r1, _0806A258 @ =gUnknown_20370A4
ldr r1, [r1]
- bl sub_80698D0
+ bl ScriptJump
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806A258: .4byte gUnknown_20370A4
- thumb_func_end sub_806A248
+ thumb_func_end ScrCmd_gotoram
- thumb_func_start sub_806A25C
-sub_806A25C: @ 806A25C
+ thumb_func_start ScrCmd_killscript
+ScrCmd_killscript: @ 806A25C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069CD4
+ bl ClearRamScript
adds r0, r4, 0
bl sub_80697FC
movs r0, 0x1
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A25C
+ thumb_func_end ScrCmd_killscript
- thumb_func_start sub_806A274
-sub_806A274: @ 806A274
+ thumb_func_start ScrCmd_setmysteryeventstatus
+ScrCmd_setmysteryeventstatus: @ 806A274
push {lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -529,7 +529,7 @@ sub_806A274: @ 806A274
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A274
+ thumb_func_end ScrCmd_setmysteryeventstatus
thumb_func_start sub_806A28C
sub_806A28C: @ 806A28C
@@ -544,7 +544,7 @@ sub_806A28C: @ 806A28C
str r0, [r1]
adds r0, r4, 0
adds r1, r2, 0
- bl sub_80698D0
+ bl ScriptJump
_0806A2A8:
movs r0, 0
pop {r4}
@@ -554,8 +554,8 @@ _0806A2A8:
_0806A2B0: .4byte gUnknown_20370A4
thumb_func_end sub_806A28C
- thumb_func_start sub_806A2B4
-sub_806A2B4: @ 806A2B4
+ thumb_func_start ScrCmd_loadword
+ScrCmd_loadword: @ 806A2B4
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
@@ -563,7 +563,7 @@ sub_806A2B4: @ 806A2B4
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
lsls r5, 2
adds r4, 0x64
adds r4, r5
@@ -572,10 +572,10 @@ sub_806A2B4: @ 806A2B4
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A2B4
+ thumb_func_end ScrCmd_loadword
- thumb_func_start sub_806A2D8
-sub_806A2D8: @ 806A2D8
+ thumb_func_start ScrCmd_loadbytefromaddr
+ScrCmd_loadbytefromaddr: @ 806A2D8
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
@@ -583,7 +583,7 @@ sub_806A2D8: @ 806A2D8
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
lsls r5, 2
adds r4, 0x64
adds r4, r5
@@ -593,25 +593,25 @@ sub_806A2D8: @ 806A2D8
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A2D8
+ thumb_func_end ScrCmd_loadbytefromaddr
- thumb_func_start sub_806A2FC
-sub_806A2FC: @ 806A2FC
+ thumb_func_start ScrCmd_writebytetoaddr
+ScrCmd_writebytetoaddr: @ 806A2FC
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_8069910
+ bl ScriptReadWord
strb r4, [r0]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A2FC
+ thumb_func_end ScrCmd_writebytetoaddr
- thumb_func_start sub_806A314
-sub_806A314: @ 806A314
+ thumb_func_start ScrCmd_loadbyte
+ScrCmd_loadbyte: @ 806A314
ldr r1, [r0, 0x8]
ldrb r3, [r1]
adds r1, 0x1
@@ -626,10 +626,10 @@ sub_806A314: @ 806A314
str r1, [r0, 0x8]
movs r0, 0
bx lr
- thumb_func_end sub_806A314
+ thumb_func_end ScrCmd_loadbyte
- thumb_func_start sub_806A330
-sub_806A330: @ 806A330
+ thumb_func_start ScrCmd_setptrbyte
+ScrCmd_setptrbyte: @ 806A330
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
@@ -637,7 +637,7 @@ sub_806A330: @ 806A330
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
lsls r5, 2
adds r4, 0x64
adds r4, r5
@@ -647,10 +647,10 @@ sub_806A330: @ 806A330
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A330
+ thumb_func_end ScrCmd_setptrbyte
- thumb_func_start sub_806A354
-sub_806A354: @ 806A354
+ thumb_func_start ScrCmd_copylocal
+ScrCmd_copylocal: @ 806A354
ldr r1, [r0, 0x8]
ldrb r3, [r1]
adds r1, 0x1
@@ -667,53 +667,53 @@ sub_806A354: @ 806A354
str r0, [r3]
movs r0, 0
bx lr
- thumb_func_end sub_806A354
+ thumb_func_end ScrCmd_copylocal
- thumb_func_start sub_806A374
-sub_806A374: @ 806A374
+ thumb_func_start ScrCmd_copybyte
+ScrCmd_copybyte: @ 806A374
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r5, r0, 0
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r0, [r0]
strb r0, [r5]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A374
+ thumb_func_end ScrCmd_copybyte
- thumb_func_start sub_806A390
-sub_806A390: @ 806A390
+ thumb_func_start ScrCmd_setvar
+ScrCmd_setvar: @ 806A390
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r4, r0, 0
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
strh r0, [r4]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A390
+ thumb_func_end ScrCmd_setvar
- thumb_func_start sub_806A3B4
-sub_806A3B4: @ 806A3B4
+ thumb_func_start ScrCmd_copyvar
+ScrCmd_copyvar: @ 806A3B4
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
@@ -723,19 +723,19 @@ sub_806A3B4: @ 806A3B4
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A3B4
+ thumb_func_end ScrCmd_copyvar
- thumb_func_start sub_806A3E0
-sub_806A3E0: @ 806A3E0
+ thumb_func_start ScrCmd_setorcopyvar
+ScrCmd_setorcopyvar: @ 806A3E0
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -744,10 +744,10 @@ sub_806A3E0: @ 806A3E0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A3E0
+ thumb_func_end ScrCmd_setorcopyvar
- thumb_func_start sub_806A40C
-sub_806A40C: @ 806A40C
+ thumb_func_start compare_012
+compare_012: @ 806A40C
push {lr}
lsls r0, 16
lsrs r0, 16
@@ -767,10 +767,10 @@ _0806A426:
_0806A428:
pop {r1}
bx r1
- thumb_func_end sub_806A40C
+ thumb_func_end compare_012
- thumb_func_start sub_806A42C
-sub_806A42C: @ 806A42C
+ thumb_func_start ScrCmd_compare_local_to_local
+ScrCmd_compare_local_to_local: @ 806A42C
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
@@ -788,16 +788,16 @@ sub_806A42C: @ 806A42C
ldrb r1, [r3]
adds r2, 0x1
str r2, [r4, 0x8]
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A42C
+ thumb_func_end ScrCmd_compare_local_to_local
- thumb_func_start sub_806A45C
-sub_806A45C: @ 806A45C
+ thumb_func_start ScrCmd_compare_local_to_value
+ScrCmd_compare_local_to_value: @ 806A45C
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
@@ -811,16 +811,16 @@ sub_806A45C: @ 806A45C
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A45C
+ thumb_func_end ScrCmd_compare_local_to_value
- thumb_func_start sub_806A484
-sub_806A484: @ 806A484
+ thumb_func_start ScrCmd_compare_local_to_addr
+ScrCmd_compare_local_to_addr: @ 806A484
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
@@ -832,22 +832,22 @@ sub_806A484: @ 806A484
adds r2, 0x1
str r2, [r4, 0x8]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A484
+ thumb_func_end ScrCmd_compare_local_to_addr
- thumb_func_start sub_806A4B0
-sub_806A4B0: @ 806A4B0
+ thumb_func_start ScrCmd_compare_addr_to_local
+ScrCmd_compare_addr_to_local: @ 806A4B0
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r0, [r0]
ldr r3, [r4, 0x8]
ldrb r2, [r3]
@@ -858,109 +858,109 @@ sub_806A4B0: @ 806A4B0
ldrb r1, [r1]
adds r3, 0x1
str r3, [r4, 0x8]
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A4B0
+ thumb_func_end ScrCmd_compare_addr_to_local
- thumb_func_start sub_806A4DC
-sub_806A4DC: @ 806A4DC
+ thumb_func_start ScrCmd_compare_addr_to_value
+ScrCmd_compare_addr_to_value: @ 806A4DC
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r0, [r0]
ldr r2, [r4, 0x8]
ldrb r1, [r2]
adds r2, 0x1
str r2, [r4, 0x8]
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A4DC
+ thumb_func_end ScrCmd_compare_addr_to_value
- thumb_func_start sub_806A4FC
-sub_806A4FC: @ 806A4FC
+ thumb_func_start ScrCmd_compare_addr_to_addr
+ScrCmd_compare_addr_to_addr: @ 806A4FC
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r5, [r0]
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
ldrb r1, [r0]
adds r0, r5, 0
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A4FC
+ thumb_func_end ScrCmd_compare_addr_to_addr
- thumb_func_start sub_806A520
-sub_806A520: @ 806A520
+ thumb_func_start ScrCmd_compare_var_to_value
+ScrCmd_compare_var_to_value: @ 806A520
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
ldrh r5, [r0]
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r5, 0
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A520
+ thumb_func_end ScrCmd_compare_var_to_value
- thumb_func_start sub_806A550
-sub_806A550: @ 806A550
+ thumb_func_start ScrCmd_compare_var_to_var
+ScrCmd_compare_var_to_var: @ 806A550
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
ldrh r2, [r5]
ldrh r1, [r0]
adds r0, r2, 0
- bl sub_806A40C
+ bl compare_012
strb r0, [r4, 0x2]
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A550
+ thumb_func_end ScrCmd_compare_var_to_var
- thumb_func_start sub_806A584
-sub_806A584: @ 806A584
+ thumb_func_start ScrCmd_addvar
+ScrCmd_addvar: @ 806A584
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r4, r0, 0
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
ldrh r1, [r4]
adds r0, r1
strh r0, [r4]
@@ -968,19 +968,19 @@ sub_806A584: @ 806A584
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A584
+ thumb_func_end ScrCmd_addvar
- thumb_func_start sub_806A5AC
-sub_806A5AC: @ 806A5AC
+ thumb_func_start ScrCmd_subvar
+ScrCmd_subvar: @ 806A5AC
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -991,12 +991,12 @@ sub_806A5AC: @ 806A5AC
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806A5AC
+ thumb_func_end ScrCmd_subvar
- thumb_func_start sub_806A5DC
-sub_806A5DC: @ 806A5DC
+ thumb_func_start ScrCmd_random
+ScrCmd_random: @ 806A5DC
push {r4,r5,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1004,7 +1004,7 @@ sub_806A5DC: @ 806A5DC
lsls r4, 16
lsrs r4, 16
ldr r5, _0806A60C @ =gUnknown_20370D0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -1016,13 +1016,13 @@ sub_806A5DC: @ 806A5DC
bx r1
.align 2, 0
_0806A60C: .4byte gUnknown_20370D0
- thumb_func_end sub_806A5DC
+ thumb_func_end ScrCmd_random
thumb_func_start sub_806A610
sub_806A610: @ 806A610
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1030,7 +1030,7 @@ sub_806A610: @ 806A610
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1057,7 +1057,7 @@ _0806A658: .4byte gUnknown_20370D0
sub_806A65C: @ 806A65C
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1065,7 +1065,7 @@ sub_806A65C: @ 806A65C
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1090,7 +1090,7 @@ _0806A69C: .4byte gUnknown_20370D0
sub_806A6A0: @ 806A6A0
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1098,7 +1098,7 @@ sub_806A6A0: @ 806A6A0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1123,7 +1123,7 @@ _0806A6E0: .4byte gUnknown_20370D0
sub_806A6E4: @ 806A6E4
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1131,7 +1131,7 @@ sub_806A6E4: @ 806A6E4
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1155,7 +1155,7 @@ _0806A724: .4byte gUnknown_20370D0
thumb_func_start sub_806A728
sub_806A728: @ 806A728
push {r4,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1178,7 +1178,7 @@ _0806A750: .4byte gUnknown_20370D0
sub_806A754: @ 806A754
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1186,7 +1186,7 @@ sub_806A754: @ 806A754
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1211,7 +1211,7 @@ _0806A794: .4byte gUnknown_20370D0
sub_806A798: @ 806A798
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1219,7 +1219,7 @@ sub_806A798: @ 806A798
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1243,7 +1243,7 @@ _0806A7D8: .4byte gUnknown_20370D0
thumb_func_start sub_806A7DC
sub_806A7DC: @ 806A7DC
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1255,7 +1255,7 @@ sub_806A7DC: @ 806A7DC
thumb_func_start sub_806A7F0
sub_806A7F0: @ 806A7F0
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1267,7 +1267,7 @@ sub_806A7F0: @ 806A7F0
thumb_func_start sub_806A804
sub_806A804: @ 806A804
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1279,7 +1279,7 @@ sub_806A804: @ 806A804
thumb_func_start sub_806A818
sub_806A818: @ 806A818
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1288,35 +1288,35 @@ sub_806A818: @ 806A818
bx r1
thumb_func_end sub_806A818
- thumb_func_start sub_806A82C
-sub_806A82C: @ 806A82C
+ thumb_func_start ScrCmd_setflag
+ScrCmd_setflag: @ 806A82C
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E680
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A82C
+ thumb_func_end ScrCmd_setflag
- thumb_func_start sub_806A840
-sub_806A840: @ 806A840
+ thumb_func_start ScrCmd_clearflag
+ScrCmd_clearflag: @ 806A840
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E6A8
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A840
+ thumb_func_end ScrCmd_clearflag
- thumb_func_start sub_806A854
-sub_806A854: @ 806A854
+ thumb_func_start ScrCmd_checkflag
+ScrCmd_checkflag: @ 806A854
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E6D0
@@ -1325,10 +1325,10 @@ sub_806A854: @ 806A854
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806A854
+ thumb_func_end ScrCmd_checkflag
- thumb_func_start sub_806A870
-sub_806A870: @ 806A870
+ thumb_func_start ScrCmd_incrementgamestat
+ScrCmd_incrementgamestat: @ 806A870
push {lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -1339,7 +1339,7 @@ sub_806A870: @ 806A870
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A870
+ thumb_func_end ScrCmd_incrementgamestat
thumb_func_start sub_806A888
sub_806A888: @ 806A888
@@ -1350,7 +1350,7 @@ sub_806A888: @ 806A888
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r6, r0, 0
adds r0, r4, 0
bl sub_8054EC4
@@ -1376,7 +1376,7 @@ _0806A8B4:
thumb_func_start sub_806A8C0
sub_806A8C0: @ 806A8C0
push {r4,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -1390,8 +1390,8 @@ sub_806A8C0: @ 806A8C0
bx r1
thumb_func_end sub_806A8C0
- thumb_func_start sub_806A8E0
-sub_806A8E0: @ 806A8E0
+ thumb_func_start ScrCmd_animateflash
+ScrCmd_animateflash: @ 806A8E0
push {lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -1399,16 +1399,16 @@ sub_806A8E0: @ 806A8E0
str r1, [r0, 0x8]
adds r0, r2, 0
bl sub_807F028
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
- thumb_func_end sub_806A8E0
+ thumb_func_end ScrCmd_animateflash
- thumb_func_start sub_806A8FC
-sub_806A8FC: @ 806A8FC
+ thumb_func_start ScrCmd_setflashradius
+ScrCmd_setflashradius: @ 806A8FC
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1418,7 +1418,7 @@ sub_806A8FC: @ 806A8FC
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A8FC
+ thumb_func_end ScrCmd_setflashradius
thumb_func_start sub_806A918
sub_806A918: @ 806A918
@@ -1440,8 +1440,8 @@ _0806A932:
bx r1
thumb_func_end sub_806A918
- thumb_func_start sub_806A938
-sub_806A938: @ 806A938
+ thumb_func_start ScrCmd_fadescreen
+ScrCmd_fadescreen: @ 806A938
push {r4,lr}
adds r4, r0, 0
ldr r1, [r4, 0x8]
@@ -1449,7 +1449,7 @@ sub_806A938: @ 806A938
adds r1, 0x1
str r1, [r4, 0x8]
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r1, _0806A95C @ =sub_806A918
adds r0, r4, 0
bl sub_80697F4
@@ -1459,10 +1459,10 @@ sub_806A938: @ 806A938
bx r1
.align 2, 0
_0806A95C: .4byte sub_806A918
- thumb_func_end sub_806A938
+ thumb_func_end ScrCmd_fadescreen
- thumb_func_start sub_806A960
-sub_806A960: @ 806A960
+ thumb_func_start ScrCmd_fadescreenspeed
+ScrCmd_fadescreenspeed: @ 806A960
push {r4,lr}
adds r4, r0, 0
ldr r2, [r4, 0x8]
@@ -1474,7 +1474,7 @@ sub_806A960: @ 806A960
str r2, [r4, 0x8]
lsls r1, 24
asrs r1, 24
- bl sub_807A818
+ bl fade_screen
ldr r1, _0806A98C @ =sub_806A918
adds r0, r4, 0
bl sub_80697F4
@@ -1484,7 +1484,7 @@ sub_806A960: @ 806A960
bx r1
.align 2, 0
_0806A98C: .4byte sub_806A918
- thumb_func_end sub_806A960
+ thumb_func_end ScrCmd_fadescreenspeed
thumb_func_start sub_806A990
sub_806A990: @ 806A990
@@ -1511,7 +1511,7 @@ _0806A9AA:
sub_806A9B0: @ 806A9B0
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
ldr r1, _0806A9CC @ =gUnknown_20370AE
strh r0, [r1]
ldr r1, _0806A9D0 @ =sub_806A990
@@ -1555,10 +1555,10 @@ _0806A9F4: .4byte gUnknown_20370BA
_0806A9F8: .4byte gUnknown_20370BC
thumb_func_end sub_806A9DC
- thumb_func_start sub_806A9FC
-sub_806A9FC: @ 806A9FC
+ thumb_func_start ScrCmd_setweather
+ScrCmd_setweather: @ 806A9FC
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1568,16 +1568,16 @@ sub_806A9FC: @ 806A9FC
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806A9FC
+ thumb_func_end ScrCmd_setweather
- thumb_func_start sub_806AA18
-sub_806AA18: @ 806AA18
+ thumb_func_start ScrCmd_resetweather
+ScrCmd_resetweather: @ 806AA18
push {lr}
bl sub_807B140
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806AA18
+ thumb_func_end ScrCmd_resetweather
thumb_func_start sub_806AA24
sub_806AA24: @ 806AA24
@@ -1588,8 +1588,8 @@ sub_806AA24: @ 806AA24
bx r1
thumb_func_end sub_806AA24
- thumb_func_start sub_806AA30
-sub_806AA30: @ 806AA30
+ thumb_func_start ScrCmd_setstepcallback
+ScrCmd_setstepcallback: @ 806AA30
push {lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -1600,12 +1600,12 @@ sub_806AA30: @ 806AA30
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806AA30
+ thumb_func_end ScrCmd_setstepcallback
- thumb_func_start sub_806AA48
-sub_806AA48: @ 806AA48
+ thumb_func_start ScrCmd_setmaplayoutindex
+ScrCmd_setmaplayoutindex: @ 806AA48
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1615,10 +1615,10 @@ sub_806AA48: @ 806AA48
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806AA48
+ thumb_func_end ScrCmd_setmaplayoutindex
- thumb_func_start sub_806AA64
-sub_806AA64: @ 806AA64
+ thumb_func_start ScrCmd_warp
+ScrCmd_warp: @ 806AA64
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1638,7 +1638,7 @@ sub_806AA64: @ 806AA64
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1646,7 +1646,7 @@ sub_806AA64: @ 806AA64
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1668,7 +1668,7 @@ sub_806AA64: @ 806AA64
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_807E438
bl sub_80559E4
movs r0, 0x1
@@ -1679,10 +1679,10 @@ sub_806AA64: @ 806AA64
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AA64
+ thumb_func_end ScrCmd_warp
- thumb_func_start sub_806AAEC
-sub_806AAEC: @ 806AAEC
+ thumb_func_start ScrCmd_warpsilent
+ScrCmd_warpsilent: @ 806AAEC
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1702,7 +1702,7 @@ sub_806AAEC: @ 806AAEC
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1710,7 +1710,7 @@ sub_806AAEC: @ 806AAEC
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1732,7 +1732,7 @@ sub_806AAEC: @ 806AAEC
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_807E470
bl sub_80559E4
movs r0, 0x1
@@ -1743,7 +1743,7 @@ sub_806AAEC: @ 806AAEC
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AAEC
+ thumb_func_end ScrCmd_warpsilent
thumb_func_start sub_806AB74
sub_806AB74: @ 806AB74
@@ -1766,7 +1766,7 @@ sub_806AB74: @ 806AB74
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1774,7 +1774,7 @@ sub_806AB74: @ 806AB74
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1796,7 +1796,7 @@ sub_806AB74: @ 806AB74
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_807E4DC
bl sub_80559E4
movs r0, 0x1
@@ -1809,8 +1809,8 @@ sub_806AB74: @ 806AB74
bx r1
thumb_func_end sub_806AB74
- thumb_func_start sub_806ABFC
-sub_806ABFC: @ 806ABFC
+ thumb_func_start ScrCmd_warphole
+ScrCmd_warphole: @ 806ABFC
push {r4-r6,lr}
sub sp, 0x8
ldr r1, [r0, 0x8]
@@ -1824,7 +1824,7 @@ sub_806ABFC: @ 806ABFC
adds r4, 0x6
add r0, sp, 0x4
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
cmp r6, 0xFF
bne _0806AC3A
cmp r5, 0xFF
@@ -1857,7 +1857,7 @@ _0806AC3A:
lsls r4, 24
asrs r4, 24
str r4, [sp]
- bl sub_805538C
+ bl Overworld_SetWarpDestination
_0806AC5E:
bl sub_807E548
bl sub_80559E4
@@ -1866,7 +1866,7 @@ _0806AC5E:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806ABFC
+ thumb_func_end ScrCmd_warphole
thumb_func_start sub_806AC70
sub_806AC70: @ 806AC70
@@ -1889,7 +1889,7 @@ sub_806AC70: @ 806AC70
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1897,7 +1897,7 @@ sub_806AC70: @ 806AC70
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1919,7 +1919,7 @@ sub_806AC70: @ 806AC70
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
bl sub_807E59C
bl sub_80559E4
movs r0, 0x1
@@ -1953,7 +1953,7 @@ sub_806ACF8: @ 806ACF8
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1961,7 +1961,7 @@ sub_806ACF8: @ 806ACF8
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -1983,8 +1983,8 @@ sub_806ACF8: @ 806ACF8
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
- bl sub_805C6C4
+ bl Overworld_SetWarpDestination
+ bl player_get_direction_lower_nybble
lsls r0, 24
lsrs r0, 24
bl sub_805DAE4
@@ -2000,8 +2000,8 @@ sub_806ACF8: @ 806ACF8
bx r1
thumb_func_end sub_806ACF8
- thumb_func_start sub_806AD8C
-sub_806AD8C: @ 806AD8C
+ thumb_func_start ScrCmd_setwarp
+ScrCmd_setwarp: @ 806AD8C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2021,7 +2021,7 @@ sub_806AD8C: @ 806AD8C
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2029,7 +2029,7 @@ sub_806AD8C: @ 806AD8C
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2051,7 +2051,7 @@ sub_806AD8C: @ 806AD8C
mov r0, r9
adds r2, r6, 0
adds r3, r4, 0
- bl sub_805538C
+ bl Overworld_SetWarpDestination
movs r0, 0
add sp, 0x4
pop {r3,r4}
@@ -2060,10 +2060,10 @@ sub_806AD8C: @ 806AD8C
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AD8C
+ thumb_func_end ScrCmd_setwarp
- thumb_func_start sub_806AE0C
-sub_806AE0C: @ 806AE0C
+ thumb_func_start ScrCmd_setdynamicwarp
+ScrCmd_setdynamicwarp: @ 806AE0C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2083,7 +2083,7 @@ sub_806AE0C: @ 806AE0C
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2091,7 +2091,7 @@ sub_806AE0C: @ 806AE0C
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2115,7 +2115,7 @@ sub_806AE0C: @ 806AE0C
mov r1, r9
mov r2, r8
adds r3, r6, 0
- bl sub_805541C
+ bl saved_warp2_set_2
movs r0, 0
add sp, 0x8
pop {r3,r4}
@@ -2124,7 +2124,7 @@ sub_806AE0C: @ 806AE0C
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AE0C
+ thumb_func_end ScrCmd_setdynamicwarp
thumb_func_start sub_806AE90
sub_806AE90: @ 806AE90
@@ -2147,7 +2147,7 @@ sub_806AE90: @ 806AE90
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2155,7 +2155,7 @@ sub_806AE90: @ 806AE90
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2209,7 +2209,7 @@ sub_806AF10: @ 806AF10
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2217,7 +2217,7 @@ sub_806AF10: @ 806AF10
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2250,8 +2250,8 @@ sub_806AF10: @ 806AF10
bx r1
thumb_func_end sub_806AF10
- thumb_func_start sub_806AF90
-sub_806AF90: @ 806AF90
+ thumb_func_start ScrCmd_setescapewarp
+ScrCmd_setescapewarp: @ 806AF90
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -2271,7 +2271,7 @@ sub_806AF90: @ 806AF90
adds r1, 0x1
str r1, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2279,7 +2279,7 @@ sub_806AF90: @ 806AF90
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2310,19 +2310,19 @@ sub_806AF90: @ 806AF90
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806AF90
+ thumb_func_end ScrCmd_setescapewarp
- thumb_func_start sub_806B010
-sub_806B010: @ 806B010
+ thumb_func_start ScrCmd_getplayerxy
+ScrCmd_getplayerxy: @ 806B010
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
adds r5, r0, 0
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
@@ -2339,13 +2339,13 @@ sub_806B010: @ 806B010
bx r1
.align 2, 0
_0806B048: .4byte gUnknown_3005008
- thumb_func_end sub_806B010
+ thumb_func_end ScrCmd_getplayerxy
- thumb_func_start sub_806B04C
-sub_806B04C: @ 806B04C
+ thumb_func_start ScrCmd_getpartysize
+ScrCmd_getpartysize: @ 806B04C
push {r4,lr}
ldr r4, _0806B064 @ =gUnknown_20370D0
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -2355,12 +2355,12 @@ sub_806B04C: @ 806B04C
bx r1
.align 2, 0
_0806B064: .4byte gUnknown_20370D0
- thumb_func_end sub_806B04C
+ thumb_func_end ScrCmd_getpartysize
thumb_func_start sub_806B068
sub_806B068: @ 806B068
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_80722CC
@@ -2369,10 +2369,10 @@ sub_806B068: @ 806B068
bx r1
thumb_func_end sub_806B068
- thumb_func_start sub_806B07C
-sub_806B07C: @ 806B07C
+ thumb_func_start WaitForSoundEffectFinish
+WaitForSoundEffectFinish: @ 806B07C
push {lr}
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _0806B08C
@@ -2383,59 +2383,59 @@ _0806B08C:
_0806B08E:
pop {r1}
bx r1
- thumb_func_end sub_806B07C
+ thumb_func_end WaitForSoundEffectFinish
thumb_func_start sub_806B094
sub_806B094: @ 806B094
push {lr}
- ldr r1, _0806B0A4 @ =sub_806B07C
+ ldr r1, _0806B0A4 @ =WaitForSoundEffectFinish
bl sub_80697F4
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_0806B0A4: .4byte sub_806B07C
+_0806B0A4: .4byte WaitForSoundEffectFinish
thumb_func_end sub_806B094
- thumb_func_start sub_806B0A8
-sub_806B0A8: @ 806B0A8
+ thumb_func_start ScrCmd_playfanfare
+ScrCmd_playfanfare: @ 806B0A8
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
- bl sub_8071C60
+ bl PlayFanfare
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806B0A8
+ thumb_func_end ScrCmd_playfanfare
- thumb_func_start sub_806B0BC
-sub_806B0BC: @ 806B0BC
+ thumb_func_start WaitForFanfareFinish
+WaitForFanfareFinish: @ 806B0BC
push {lr}
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
lsrs r0, 24
pop {r1}
bx r1
- thumb_func_end sub_806B0BC
+ thumb_func_end WaitForFanfareFinish
thumb_func_start sub_806B0CC
sub_806B0CC: @ 806B0CC
push {lr}
- ldr r1, _0806B0DC @ =sub_806B0BC
+ ldr r1, _0806B0DC @ =WaitForFanfareFinish
bl sub_80697F4
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_0806B0DC: .4byte sub_806B0BC
+_0806B0DC: .4byte WaitForFanfareFinish
thumb_func_end sub_806B0CC
thumb_func_start sub_806B0E0
sub_806B0E0: @ 806B0E0
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r1, r0, 16
adds r5, r1, 0
@@ -2456,7 +2456,7 @@ sub_806B0E0: @ 806B0E0
bl sub_8055E78
_0806B10E:
adds r0, r5, 0
- bl sub_8071A74
+ bl PlayNewMapMusic
_0806B114:
movs r0, 0
pop {r4,r5}
@@ -2469,7 +2469,7 @@ _0806B11C: .4byte gUnknown_203ADFA
thumb_func_start sub_806B120
sub_806B120: @ 806B120
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_8055E78
@@ -2500,7 +2500,7 @@ _0806B150: .4byte gUnknown_203ADFA
thumb_func_start sub_806B154
sub_806B154: @ 806B154
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r1, r0, 16
ldr r0, _0806B178 @ =gUnknown_203ADFA
@@ -2544,13 +2544,13 @@ _0806B1A0:
beq _0806B1AE
lsls r0, r1, 26
lsrs r0, 24
- bl sub_8071D64
+ bl FadeOutBGMTemporarily
b _0806B1B4
_0806B1AE:
movs r0, 0x4
- bl sub_8071D64
+ bl FadeOutBGMTemporarily
_0806B1B4:
- ldr r1, _0806B1C4 @ =sub_8071D7C
+ ldr r1, _0806B1C4 @ =IsBGMPausedOrStopped
adds r0, r4, 0
bl sub_80697F4
movs r0, 0x1
@@ -2559,7 +2559,7 @@ _0806B1BE:
pop {r1}
bx r1
.align 2, 0
-_0806B1C4: .4byte sub_8071D7C
+_0806B1C4: .4byte IsBGMPausedOrStopped
thumb_func_end sub_806B17C
thumb_func_start sub_806B1C8
@@ -2580,24 +2580,24 @@ sub_806B1C8: @ 806B1C8
beq _0806B1F4
lsls r0, r2, 26
lsrs r0, 24
- bl sub_8071DA4
+ bl FadeInBGM
b _0806B1FA
.align 2, 0
_0806B1F0: .4byte gUnknown_203ADFA
_0806B1F4:
movs r0, 0x4
- bl sub_8071DA4
+ bl FadeInBGM
_0806B1FA:
movs r0, 0
pop {r1}
bx r1
thumb_func_end sub_806B1C8
- thumb_func_start sub_806B200
-sub_806B200: @ 806B200
+ thumb_func_start ScrCmd_applymovement
+ScrCmd_applymovement: @ 806B200
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2605,7 +2605,7 @@ sub_806B200: @ 806B200
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r3, r0, 0
lsls r0, r4, 24
lsrs r0, 24
@@ -2613,7 +2613,7 @@ sub_806B200: @ 806B200
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_8097434
+ bl ScriptMovement_StartObjectMovementScript
ldr r0, _0806B240 @ =gUnknown_20370B0
strh r4, [r0]
movs r0, 0
@@ -2623,13 +2623,13 @@ sub_806B200: @ 806B200
.align 2, 0
_0806B23C: .4byte gUnknown_3005008
_0806B240: .4byte gUnknown_20370B0
- thumb_func_end sub_806B200
+ thumb_func_end ScrCmd_applymovement
- thumb_func_start sub_806B244
-sub_806B244: @ 806B244
+ thumb_func_start ScrCmd_applymovement_at
+ScrCmd_applymovement_at: @ 806B244
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2637,7 +2637,7 @@ sub_806B244: @ 806B244
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r3, r0, 0
ldr r0, [r5, 0x8]
ldrb r2, [r0]
@@ -2648,7 +2648,7 @@ sub_806B244: @ 806B244
str r0, [r5, 0x8]
lsls r0, r4, 24
lsrs r0, 24
- bl sub_8097434
+ bl ScriptMovement_StartObjectMovementScript
ldr r0, _0806B284 @ =gUnknown_20370B0
strh r4, [r0]
movs r0, 0
@@ -2657,10 +2657,10 @@ sub_806B244: @ 806B244
bx r1
.align 2, 0
_0806B284: .4byte gUnknown_20370B0
- thumb_func_end sub_806B244
+ thumb_func_end ScrCmd_applymovement_at
- thumb_func_start sub_806B288
-sub_806B288: @ 806B288
+ thumb_func_start WaitForMovementFinish
+WaitForMovementFinish: @ 806B288
push {lr}
ldr r0, _0806B2A4 @ =gUnknown_20370B0
ldrb r0, [r0]
@@ -2668,7 +2668,7 @@ sub_806B288: @ 806B288
ldrb r1, [r1]
ldr r2, _0806B2AC @ =gUnknown_20370B2
ldrb r2, [r2]
- bl sub_809748C
+ bl ScriptMovement_IsObjectMovementFinished
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2677,13 +2677,13 @@ sub_806B288: @ 806B288
_0806B2A4: .4byte gUnknown_20370B0
_0806B2A8: .4byte gUnknown_20370B4
_0806B2AC: .4byte gUnknown_20370B2
- thumb_func_end sub_806B288
+ thumb_func_end WaitForMovementFinish
- thumb_func_start sub_806B2B0
-sub_806B2B0: @ 806B2B0
+ thumb_func_start ScrCmd_waitmovement
+ScrCmd_waitmovement: @ 806B2B0
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2704,7 +2704,7 @@ _0806B2CC:
movs r0, 0x5
ldrsb r0, [r2, r0]
strh r0, [r1]
- ldr r1, _0806B300 @ =sub_806B288
+ ldr r1, _0806B300 @ =WaitForMovementFinish
adds r0, r4, 0
bl sub_80697F4
movs r0, 0x1
@@ -2716,14 +2716,14 @@ _0806B2F0: .4byte gUnknown_20370B0
_0806B2F4: .4byte gUnknown_20370B2
_0806B2F8: .4byte gUnknown_3005008
_0806B2FC: .4byte gUnknown_20370B4
-_0806B300: .4byte sub_806B288
- thumb_func_end sub_806B2B0
+_0806B300: .4byte WaitForMovementFinish
+ thumb_func_end ScrCmd_waitmovement
- thumb_func_start sub_806B304
-sub_806B304: @ 806B304
+ thumb_func_start ScrCmd_waitmovement_at
+ScrCmd_waitmovement_at: @ 806B304
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2745,7 +2745,7 @@ _0806B320:
strh r2, [r0]
ldr r0, _0806B350 @ =gUnknown_20370B4
strh r1, [r0]
- ldr r1, _0806B354 @ =sub_806B288
+ ldr r1, _0806B354 @ =WaitForMovementFinish
adds r0, r4, 0
bl sub_80697F4
movs r0, 0x1
@@ -2756,13 +2756,13 @@ _0806B320:
_0806B348: .4byte gUnknown_20370B0
_0806B34C: .4byte gUnknown_20370B2
_0806B350: .4byte gUnknown_20370B4
-_0806B354: .4byte sub_806B288
- thumb_func_end sub_806B304
+_0806B354: .4byte WaitForMovementFinish
+ thumb_func_end ScrCmd_waitmovement_at
- thumb_func_start sub_806B358
-sub_806B358: @ 806B358
+ thumb_func_start ScrCmd_removeobject
+ScrCmd_removeobject: @ 806B358
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2772,19 +2772,19 @@ sub_806B358: @ 806B358
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806B37C: .4byte gUnknown_3005008
- thumb_func_end sub_806B358
+ thumb_func_end ScrCmd_removeobject
- thumb_func_start sub_806B380
-sub_806B380: @ 806B380
+ thumb_func_start ScrCmd_removeobject_at
+ScrCmd_removeobject_at: @ 806B380
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2797,17 +2797,17 @@ sub_806B380: @ 806B380
str r3, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B380
+ thumb_func_end ScrCmd_removeobject_at
- thumb_func_start sub_806B3B0
-sub_806B3B0: @ 806B3B0
+ thumb_func_start ScrCmd_addobject
+ScrCmd_addobject: @ 806B3B0
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2817,19 +2817,19 @@ sub_806B3B0: @ 806B3B0
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805E898
+ bl show_sprite
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806B3D4: .4byte gUnknown_3005008
- thumb_func_end sub_806B3B0
+ thumb_func_end ScrCmd_addobject
- thumb_func_start sub_806B3D8
-sub_806B3D8: @ 806B3D8
+ thumb_func_start ScrCmd_addobject_at
+ScrCmd_addobject_at: @ 806B3D8
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2842,19 +2842,19 @@ sub_806B3D8: @ 806B3D8
str r3, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl sub_805E898
+ bl show_sprite
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B3D8
+ thumb_func_end ScrCmd_addobject_at
- thumb_func_start sub_806B408
-sub_806B408: @ 806B408
+ thumb_func_start ScrCmd_setobjectxy
+ScrCmd_setobjectxy: @ 806B408
push {r4-r6,lr}
sub sp, 0x4
adds r6, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2862,7 +2862,7 @@ sub_806B408: @ 806B408
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2870,7 +2870,7 @@ sub_806B408: @ 806B408
lsls r4, 16
lsrs r4, 16
adds r0, r6, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2895,13 +2895,13 @@ sub_806B408: @ 806B408
bx r1
.align 2, 0
_0806B46C: .4byte gUnknown_3005008
- thumb_func_end sub_806B408
+ thumb_func_end ScrCmd_setobjectxy
- thumb_func_start sub_806B470
-sub_806B470: @ 806B470
+ thumb_func_start ScrCmd_setobjectxyperm
+ScrCmd_setobjectxyperm: @ 806B470
push {r4-r6,lr}
adds r6, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2909,7 +2909,7 @@ sub_806B470: @ 806B470
lsls r5, 16
lsrs r5, 16
adds r0, r6, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2917,7 +2917,7 @@ sub_806B470: @ 806B470
lsls r4, 16
lsrs r4, 16
adds r0, r6, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2930,17 +2930,17 @@ sub_806B470: @ 806B470
asrs r2, 16
adds r0, r5, 0
adds r1, r4, 0
- bl sub_80550D8
+ bl Overworld_SetMapObjTemplateCoords
movs r0, 0
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806B470
+ thumb_func_end ScrCmd_setobjectxyperm
- thumb_func_start sub_806B4C8
-sub_806B4C8: @ 806B4C8
+ thumb_func_start ScrCmd_moveobjectoffscreen
+ScrCmd_moveobjectoffscreen: @ 806B4C8
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2956,13 +2956,13 @@ sub_806B4C8: @ 806B4C8
bx r1
.align 2, 0
_0806B4EC: .4byte gUnknown_3005008
- thumb_func_end sub_806B4C8
+ thumb_func_end ScrCmd_moveobjectoffscreen
- thumb_func_start sub_806B4F0
-sub_806B4F0: @ 806B4F0
+ thumb_func_start ScrCmd_showobject_at
+ScrCmd_showobject_at: @ 806B4F0
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -2976,18 +2976,18 @@ sub_806B4F0: @ 806B4F0
lsls r0, 24
lsrs r0, 24
movs r3, 0
- bl sub_805F314
+ bl npc_by_local_id_and_map_set_field_1_bit_x20
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B4F0
+ thumb_func_end ScrCmd_showobject_at
- thumb_func_start sub_806B520
-sub_806B520: @ 806B520
+ thumb_func_start ScrCmd_hideobject_at
+ScrCmd_hideobject_at: @ 806B520
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3001,18 +3001,18 @@ sub_806B520: @ 806B520
lsls r0, 24
lsrs r0, 24
movs r3, 0x1
- bl sub_805F314
+ bl npc_by_local_id_and_map_set_field_1_bit_x20
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B520
+ thumb_func_end ScrCmd_hideobject_at
- thumb_func_start sub_806B550
-sub_806B550: @ 806B550
+ thumb_func_start ScrCmd_setobjectpriority
+ScrCmd_setobjectpriority: @ 806B550
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3036,13 +3036,13 @@ sub_806B550: @ 806B550
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806B550
+ thumb_func_end ScrCmd_setobjectpriority
- thumb_func_start sub_806B58C
-sub_806B58C: @ 806B58C
+ thumb_func_start ScrCmd_resetobjectpriority
+ScrCmd_resetobjectpriority: @ 806B58C
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3060,10 +3060,10 @@ sub_806B58C: @ 806B58C
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B58C
+ thumb_func_end ScrCmd_resetobjectpriority
- thumb_func_start sub_806B5BC
-sub_806B5BC: @ 806B5BC
+ thumb_func_start ScrCmd_faceplayer
+ScrCmd_faceplayer: @ 806B5BC
push {r4,lr}
ldr r2, _0806B5EC @ =gUnknown_2036E38
ldr r0, _0806B5F0 @ =gUnknown_3005074
@@ -3076,12 +3076,12 @@ sub_806B5BC: @ 806B5BC
lsls r0, 31
cmp r0, 0
beq _0806B5E4
- bl sub_805C6C4
+ bl player_get_direction_lower_nybble
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80642C8
+ bl FieldObjectFaceOppositeDirection
_0806B5E4:
movs r0, 0
pop {r4}
@@ -3090,13 +3090,13 @@ _0806B5E4:
.align 2, 0
_0806B5EC: .4byte gUnknown_2036E38
_0806B5F0: .4byte gUnknown_3005074
- thumb_func_end sub_806B5BC
+ thumb_func_end ScrCmd_faceplayer
- thumb_func_start sub_806B5F4
-sub_806B5F4: @ 806B5F4
+ thumb_func_start ScrCmd_turnobject
+ScrCmd_turnobject: @ 806B5F4
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3110,20 +3110,20 @@ sub_806B5F4: @ 806B5F4
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
- bl sub_805F268
+ bl FieldObjectTurnByLocalIdAndMap
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806B624: .4byte gUnknown_3005008
- thumb_func_end sub_806B5F4
+ thumb_func_end ScrCmd_turnobject
- thumb_func_start sub_806B628
-sub_806B628: @ 806B628
+ thumb_func_start ScrCmd_setobjectmovementtype
+ScrCmd_setobjectmovementtype: @ 806B628
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3133,15 +3133,15 @@ sub_806B628: @ 806B628
str r2, [r4, 0x8]
lsls r0, 24
lsrs r0, 24
- bl sub_8055114
+ bl Overworld_SetMapObjTemplateMovementType
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B628
+ thumb_func_end ScrCmd_setobjectmovementtype
- thumb_func_start sub_806B650
-sub_806B650: @ 806B650
+ thumb_func_start ScrCmd_createvobject
+ScrCmd_createvobject: @ 806B650
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3156,7 +3156,7 @@ sub_806B650: @ 806B650
adds r0, 0x1
str r0, [r5, 0x8]
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3164,7 +3164,7 @@ sub_806B650: @ 806B650
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3193,10 +3193,10 @@ sub_806B650: @ 806B650
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806B650
+ thumb_func_end ScrCmd_createvobject
- thumb_func_start sub_806B6C0
-sub_806B6C0: @ 806B6C0
+ thumb_func_start ScrCmd_turnvobject
+ScrCmd_turnvobject: @ 806B6C0
push {lr}
ldr r2, [r0, 0x8]
ldrb r3, [r2]
@@ -3210,16 +3210,16 @@ sub_806B6C0: @ 806B6C0
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806B6C0
+ thumb_func_end ScrCmd_turnvobject
- thumb_func_start sub_806B6DC
-sub_806B6DC: @ 806B6DC
+ thumb_func_start ScrCmd_lockall
+ScrCmd_lockall: @ 806B6DC
push {r4,lr}
adds r4, r0, 0
bl sub_805642C
cmp r0, 0
bne _0806B6FC
- bl sub_80695B4
+ bl ScriptFreezeMapObjects
ldr r1, _0806B6F8 @ =sub_8069590
adds r0, r4, 0
bl sub_80697F4
@@ -3233,10 +3233,10 @@ _0806B6FE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806B6DC
+ thumb_func_end ScrCmd_lockall
- thumb_func_start sub_806B704
-sub_806B704: @ 806B704
+ thumb_func_start ScrCmd_lock
+ScrCmd_lock: @ 806B704
push {r4,lr}
adds r4, r0, 0
bl sub_805642C
@@ -3256,7 +3256,7 @@ _0806B714:
lsls r0, 31
cmp r0, 0
beq _0806B744
- bl sub_806966C
+ bl LockSelectedMapObject
ldr r1, _0806B740 @ =sub_8069648
adds r0, r4, 0
bl sub_80697F4
@@ -3266,7 +3266,7 @@ _0806B738: .4byte gUnknown_2036E38
_0806B73C: .4byte gUnknown_3005074
_0806B740: .4byte sub_8069648
_0806B744:
- bl sub_80695B4
+ bl ScriptFreezeMapObjects
ldr r1, _0806B758 @ =sub_8069590
adds r0, r4, 0
bl sub_80697F4
@@ -3278,16 +3278,16 @@ _0806B752:
bx r1
.align 2, 0
_0806B758: .4byte sub_8069590
- thumb_func_end sub_806B704
+ thumb_func_end ScrCmd_lock
- thumb_func_start sub_806B75C
-sub_806B75C: @ 806B75C
+ thumb_func_start ScrCmd_releaseall
+ScrCmd_releaseall: @ 806B75C
push {lr}
- bl sub_80694F4
+ bl HideFieldMessageBox
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3296,20 +3296,20 @@ sub_806B75C: @ 806B75C
lsls r0, 2
ldr r1, _0806B790 @ =gUnknown_2036E38
adds r0, r1
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806B790: .4byte gUnknown_2036E38
- thumb_func_end sub_806B75C
+ thumb_func_end ScrCmd_releaseall
- thumb_func_start sub_806B794
-sub_806B794: @ 806B794
+ thumb_func_start ScrCmd_release
+ScrCmd_release: @ 806B794
push {r4,lr}
- bl sub_80694F4
+ bl HideFieldMessageBox
ldr r4, _0806B7E4 @ =gUnknown_2036E38
ldr r0, _0806B7E8 @ =gUnknown_3005074
ldrb r1, [r0]
@@ -3322,12 +3322,12 @@ sub_806B794: @ 806B794
cmp r0, 0
beq _0806B7B6
adds r0, r1, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
_0806B7B6:
movs r0, 0xFF
movs r1, 0
movs r2, 0
- bl sub_805DF60
+ bl GetFieldObjectIdByLocalIdAndMap
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3335,9 +3335,9 @@ _0806B7B6:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
bl sub_80974D8
- bl sub_8068A5C
+ bl UnfreezeMapObjects
movs r0, 0
pop {r4}
pop {r1}
@@ -3345,7 +3345,7 @@ _0806B7B6:
.align 2, 0
_0806B7E4: .4byte gUnknown_2036E38
_0806B7E8: .4byte gUnknown_3005074
- thumb_func_end sub_806B794
+ thumb_func_end ScrCmd_release
thumb_func_start sub_806B7EC
sub_806B7EC: @ 806B7EC
@@ -3369,7 +3369,7 @@ _0806B808: .4byte gUnknown_20370DA
sub_806B80C: @ 806B80C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
cmp r0, 0
bne _0806B81A
ldr r0, [r4, 0x64]
@@ -3385,7 +3385,7 @@ _0806B81A:
sub_806B828: @ 806B828
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
cmp r0, 0
bne _0806B836
ldr r0, [r4, 0x64]
@@ -3415,12 +3415,12 @@ sub_806B850: @ 806B850
sub_806B85C: @ 806B85C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
cmp r0, 0
bne _0806B86A
ldr r0, [r4, 0x64]
_0806B86A:
- bl sub_8069464
+ bl ShowFieldAutoScrollMessage
movs r0, 0
pop {r4}
pop {r1}
@@ -3430,19 +3430,19 @@ _0806B86A:
thumb_func_start sub_806B878
sub_806B878: @ 806B878
push {lr}
- ldr r1, _0806B888 @ =sub_806951C
+ ldr r1, _0806B888 @ =IsFieldMessageBoxHidden
bl sub_80697F4
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_0806B888: .4byte sub_806951C
+_0806B888: .4byte IsFieldMessageBoxHidden
thumb_func_end sub_806B878
thumb_func_start sub_806B88C
sub_806B88C: @ 806B88C
push {lr}
- bl sub_80694F4
+ bl HideFieldMessageBox
movs r0, 0
pop {r1}
bx r1
@@ -3707,8 +3707,8 @@ _0806BA78: .4byte gUnknown_20370AC
_0806BA7C: .4byte sub_806B898
thumb_func_end sub_806BA3C
- thumb_func_start sub_806BA80
-sub_806BA80: @ 806BA80
+ thumb_func_start ScrCmd_yesnobox
+ScrCmd_yesnobox: @ 806BA80
push {lr}
ldr r2, [r0, 0x8]
ldrb r3, [r2]
@@ -3726,15 +3726,15 @@ sub_806BA80: @ 806BA80
movs r0, 0
b _0806BAA8
_0806BAA2:
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
_0806BAA8:
pop {r1}
bx r1
- thumb_func_end sub_806BA80
+ thumb_func_end ScrCmd_yesnobox
- thumb_func_start sub_806BAAC
-sub_806BAAC: @ 806BAAC
+ thumb_func_start ScrCmd_multichoice
+ScrCmd_multichoice: @ 806BAAC
push {r4,r5,lr}
ldr r2, [r0, 0x8]
ldrb r5, [r2]
@@ -3758,16 +3758,16 @@ sub_806BAAC: @ 806BAAC
movs r0, 0
b _0806BAE0
_0806BADA:
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
_0806BAE0:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806BAAC
+ thumb_func_end ScrCmd_multichoice
- thumb_func_start sub_806BAE8
-sub_806BAE8: @ 806BAE8
+ thumb_func_start ScrCmd_multichoicedefault
+ScrCmd_multichoicedefault: @ 806BAE8
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3799,7 +3799,7 @@ sub_806BAE8: @ 806BAE8
movs r0, 0
b _0806BB2C
_0806BB26:
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
_0806BB2C:
add sp, 0x4
@@ -3808,7 +3808,7 @@ _0806BB2C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806BAE8
+ thumb_func_end ScrCmd_multichoicedefault
thumb_func_start sub_806BB38
sub_806BB38: @ 806BB38
@@ -3816,8 +3816,8 @@ sub_806BB38: @ 806BB38
bx lr
thumb_func_end sub_806BB38
- thumb_func_start sub_806BB3C
-sub_806BB3C: @ 806BB3C
+ thumb_func_start ScrCmd_multichoicegrid
+ScrCmd_multichoicegrid: @ 806BB3C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3849,7 +3849,7 @@ sub_806BB3C: @ 806BB3C
movs r0, 0
b _0806BB80
_0806BB7A:
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
_0806BB80:
add sp, 0x4
@@ -3858,7 +3858,7 @@ _0806BB80:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806BB3C
+ thumb_func_end ScrCmd_multichoicegrid
thumb_func_start sub_806BB8C
sub_806BB8C: @ 806BB8C
@@ -3879,7 +3879,7 @@ sub_806BB98: @ 806BB98
sub_806BB9C: @ 806BB9C
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -3938,7 +3938,7 @@ sub_806BC04: @ 806BC04
push {r4,r5,lr}
sub sp, 0xC
adds r5, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r4, r0, 0
cmp r4, 0
bne _0806BC16
@@ -3968,7 +3968,7 @@ _0806BC16:
sub_806BC40: @ 806BC40
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
cmp r1, 0
bne _0806BC50
@@ -3988,10 +3988,10 @@ _0806BC50:
_0806BC68: .4byte gUnknown_20370C0
thumb_func_end sub_806BC40
- thumb_func_start sub_806BC6C
-sub_806BC6C: @ 806BC6C
+ thumb_func_start ScrCmd_vmessage
+ScrCmd_vmessage: @ 806BC6C
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, _0806BC84 @ =gUnknown_20370A8
ldr r1, [r1]
subs r0, r1
@@ -4001,16 +4001,16 @@ sub_806BC6C: @ 806BC6C
bx r1
.align 2, 0
_0806BC84: .4byte gUnknown_20370A8
- thumb_func_end sub_806BC6C
+ thumb_func_end ScrCmd_vmessage
- thumb_func_start sub_806BC88
-sub_806BC88: @ 806BC88
+ thumb_func_start ScrCmd_bufferspeciesname
+ScrCmd_bufferspeciesname: @ 806BC88
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4025,7 +4025,7 @@ sub_806BC88: @ 806BC88
ldr r0, _0806BCC4 @ =gUnknown_8245EE0
adds r1, r0
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
@@ -4033,10 +4033,10 @@ sub_806BC88: @ 806BC88
.align 2, 0
_0806BCC0: .4byte gUnknown_83A7294
_0806BCC4: .4byte gUnknown_8245EE0
- thumb_func_end sub_806BC88
+ thumb_func_end ScrCmd_bufferspeciesname
- thumb_func_start sub_806BCC8
-sub_806BCC8: @ 806BCC8
+ thumb_func_start ScrCmd_bufferleadmonspeciesname
+ScrCmd_bufferleadmonspeciesname: @ 806BCC8
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r2, [r1]
@@ -4055,13 +4055,13 @@ sub_806BCC8: @ 806BCC8
adds r0, r1
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xB
muls r1, r0
ldr r0, _0806BD10 @ =gUnknown_8245EE0
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
@@ -4070,16 +4070,16 @@ sub_806BCC8: @ 806BCC8
_0806BD08: .4byte gUnknown_83A7294
_0806BD0C: .4byte gUnknown_2024284
_0806BD10: .4byte gUnknown_8245EE0
- thumb_func_end sub_806BCC8
+ thumb_func_end ScrCmd_bufferleadmonspeciesname
- thumb_func_start sub_806BD14
-sub_806BD14: @ 806BD14
+ thumb_func_start ScrCmd_bufferpartymonnick
+ScrCmd_bufferpartymonnick: @ 806BD14
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4095,9 +4095,9 @@ sub_806BD14: @ 806BD14
ldr r4, [r4]
movs r1, 0x2
adds r2, r4, 0
- bl sub_803FBE8
+ bl GetMonData
adds r0, r4, 0
- bl sub_8008D28
+ bl StringGetEnd10
movs r0, 0
pop {r4}
pop {r1}
@@ -4105,16 +4105,16 @@ sub_806BD14: @ 806BD14
.align 2, 0
_0806BD54: .4byte gUnknown_2024284
_0806BD58: .4byte gUnknown_83A7294
- thumb_func_end sub_806BD14
+ thumb_func_end ScrCmd_bufferpartymonnick
- thumb_func_start sub_806BD5C
-sub_806BD5C: @ 806BD5C
+ thumb_func_start ScrCmd_bufferitemname
+ScrCmd_bufferitemname: @ 806BD5C
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4131,7 +4131,7 @@ sub_806BD5C: @ 806BD5C
bx r1
.align 2, 0
_0806BD8C: .4byte gUnknown_83A7294
- thumb_func_end sub_806BD5C
+ thumb_func_end ScrCmd_bufferitemname
thumb_func_start sub_806BD90
sub_806BD90: @ 806BD90
@@ -4142,14 +4142,14 @@ sub_806BD90: @ 806BD90
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4168,7 +4168,7 @@ sub_806BD90: @ 806BD90
bls _0806BDEC
ldr r1, _0806BDE8 @ =gUnknown_83A72A0
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _0806BE22
.align 2, 0
_0806BDE4: .4byte gUnknown_83A7294
@@ -4187,7 +4187,7 @@ _0806BDEC:
adds r1, r0
ldr r4, [r1]
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -4198,7 +4198,7 @@ _0806BDEC:
strb r1, [r0]
ldr r1, _0806BE30 @ =gUnknown_83A72A2
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
_0806BE22:
movs r0, 0
pop {r4-r7}
@@ -4215,7 +4215,7 @@ sub_806BE34: @ 806BE34
ldr r1, [r0, 0x8]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4231,7 +4231,7 @@ sub_806BE50: @ 806BE50
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4246,7 +4246,7 @@ sub_806BE50: @ 806BE50
ldr r0, _0806BE8C @ =gUnknown_8247094
adds r1, r0
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
@@ -4263,7 +4263,7 @@ sub_806BE90: @ 806BE90
ldrb r5, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4297,7 +4297,7 @@ sub_806BED4: @ 806BED4
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4311,7 +4311,7 @@ sub_806BED4: @ 806BED4
adds r0, r1
ldr r1, [r0]
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
@@ -4321,32 +4321,32 @@ _0806BF0C: .4byte gUnknown_83A7294
_0806BF10: .4byte gUnknown_83E06B8
thumb_func_end sub_806BED4
- thumb_func_start sub_806BF14
-sub_806BF14: @ 806BF14
+ thumb_func_start ScrCmd_bufferstring
+ScrCmd_bufferstring: @ 806BF14
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, _0806BF38 @ =gUnknown_83A7294
lsls r4, 2
adds r4, r0
ldr r0, [r4]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806BF38: .4byte gUnknown_83A7294
- thumb_func_end sub_806BF14
+ thumb_func_end ScrCmd_bufferstring
- thumb_func_start sub_806BF3C
-sub_806BF3C: @ 806BF3C
+ thumb_func_start ScrCmd_vloadword
+ScrCmd_vloadword: @ 806BF3C
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, _0806BF58 @ =gUnknown_20370A8
ldr r0, [r0]
@@ -4359,16 +4359,16 @@ sub_806BF3C: @ 806BF3C
.align 2, 0
_0806BF58: .4byte gUnknown_20370A8
_0806BF5C: .4byte gUnknown_2021D18
- thumb_func_end sub_806BF3C
+ thumb_func_end ScrCmd_vloadword
- thumb_func_start sub_806BF60
-sub_806BF60: @ 806BF60
+ thumb_func_start ScrCmd_vbufferstring
+ScrCmd_vbufferstring: @ 806BF60
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_8069910
+ bl ScriptReadWord
adds r1, r0, 0
ldr r0, _0806BF8C @ =gUnknown_20370A8
ldr r0, [r0]
@@ -4377,7 +4377,7 @@ sub_806BF60: @ 806BF60
lsls r4, 2
adds r4, r0
ldr r0, [r4]
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
@@ -4385,16 +4385,16 @@ sub_806BF60: @ 806BF60
.align 2, 0
_0806BF8C: .4byte gUnknown_20370A8
_0806BF90: .4byte gUnknown_83A7294
- thumb_func_end sub_806BF60
+ thumb_func_end ScrCmd_vbufferstring
- thumb_func_start sub_806BF94
-sub_806BF94: @ 806BF94
+ thumb_func_start ScrCmd_bufferboxname
+ScrCmd_bufferboxname: @ 806BF94
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4404,27 +4404,27 @@ sub_806BF94: @ 806BF94
ldr r4, [r4]
lsls r0, 24
lsrs r0, 24
- bl sub_808BD6C
+ bl GetBoxNamePtr
adds r1, r0, 0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0
pop {r4}
pop {r1}
bx r1
.align 2, 0
_0806BFCC: .4byte gUnknown_83A7294
- thumb_func_end sub_806BF94
+ thumb_func_end ScrCmd_bufferboxname
- thumb_func_start sub_806BFD0
-sub_806BFD0: @ 806BFD0
+ thumb_func_start ScrCmd_givemon
+ScrCmd_givemon: @ 806BFD0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x8
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4437,7 +4437,7 @@ sub_806BFD0: @ 806BFD0
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4445,10 +4445,10 @@ sub_806BFD0: @ 806BFD0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
mov r8, r0
adds r0, r4, 0
- bl sub_8069910
+ bl ScriptReadWord
ldr r1, [r4, 0x8]
ldrb r2, [r1]
adds r1, 0x1
@@ -4474,12 +4474,12 @@ sub_806BFD0: @ 806BFD0
bx r1
.align 2, 0
_0806C04C: .4byte gUnknown_20370D0
- thumb_func_end sub_806BFD0
+ thumb_func_end ScrCmd_givemon
- thumb_func_start sub_806C050
-sub_806C050: @ 806C050
+ thumb_func_start ScrCmd_giveegg
+ScrCmd_giveegg: @ 806C050
push {r4,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -4496,10 +4496,10 @@ sub_806C050: @ 806C050
bx r1
.align 2, 0
_0806C078: .4byte gUnknown_20370D0
- thumb_func_end sub_806C050
+ thumb_func_end ScrCmd_giveegg
- thumb_func_start sub_806C07C
-sub_806C07C: @ 806C07C
+ thumb_func_start ScrCmd_setmonmove
+ScrCmd_setmonmove: @ 806C07C
push {r4,r5,lr}
ldr r1, [r0, 0x8]
ldrb r5, [r1]
@@ -4508,23 +4508,23 @@ sub_806C07C: @ 806C07C
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
adds r0, r5, 0
adds r2, r4, 0
- bl sub_80A02FC
+ bl ScriptSetMonMoveSlot
movs r0, 0
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806C07C
+ thumb_func_end ScrCmd_setmonmove
- thumb_func_start sub_806C0A8
-sub_806C0A8: @ 806C0A8
+ thumb_func_start ScrCmd_checkpartymove
+ScrCmd_checkpartymove: @ 806C0A8
push {r4-r7,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r7, r0, 16
ldr r1, _0806C0BC @ =gUnknown_20370D0
@@ -4537,12 +4537,12 @@ _0806C0BC: .4byte gUnknown_20370D0
_0806C0C0:
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0806C0F0
adds r0, r4, 0
adds r1, r7, 0
- bl sub_8125AC0
+ bl pokemon_has_move
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -4570,7 +4570,7 @@ _0806C0F6:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
cmp r5, 0
@@ -4582,13 +4582,13 @@ _0806C116:
bx r1
.align 2, 0
_0806C120: .4byte gUnknown_2024284
- thumb_func_end sub_806C0A8
+ thumb_func_end ScrCmd_checkpartymove
thumb_func_start sub_806C124
sub_806C124: @ 806C124
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r2, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
@@ -4602,7 +4602,7 @@ sub_806C124: @ 806C124
lsls r1, 2
adds r0, r1
adds r1, r2, 0
- bl sub_809FDA0
+ bl AddMoney
_0806C14A:
movs r0, 0
pop {r4}
@@ -4612,11 +4612,11 @@ _0806C14A:
_0806C154: .4byte gUnknown_3005008
thumb_func_end sub_806C124
- thumb_func_start sub_806C158
-sub_806C158: @ 806C158
+ thumb_func_start ScrCmd_takemoney
+ScrCmd_takemoney: @ 806C158
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r2, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
@@ -4630,7 +4630,7 @@ sub_806C158: @ 806C158
lsls r1, 2
adds r0, r1
adds r1, r2, 0
- bl sub_809FDD8
+ bl RemoveMoney
_0806C17E:
movs r0, 0
pop {r4}
@@ -4638,13 +4638,13 @@ _0806C17E:
bx r1
.align 2, 0
_0806C188: .4byte gUnknown_3005008
- thumb_func_end sub_806C158
+ thumb_func_end ScrCmd_takemoney
- thumb_func_start sub_806C18C
-sub_806C18C: @ 806C18C
+ thumb_func_start ScrCmd_checkmoney
+ScrCmd_checkmoney: @ 806C18C
push {r4,lr}
adds r4, r0, 0
- bl sub_8069910
+ bl ScriptReadWord
adds r2, r0, 0
ldr r0, [r4, 0x8]
ldrb r1, [r0]
@@ -4659,7 +4659,7 @@ sub_806C18C: @ 806C18C
lsls r1, 2
adds r0, r1
adds r1, r2, 0
- bl sub_809FD88
+ bl IsEnoughMoney
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -4671,7 +4671,7 @@ _0806C1BA:
.align 2, 0
_0806C1C4: .4byte gUnknown_20370D0
_0806C1C8: .4byte gUnknown_3005008
- thumb_func_end sub_806C18C
+ thumb_func_end ScrCmd_checkmoney
thumb_func_start sub_806C1CC
sub_806C1CC: @ 806C1CC
@@ -4780,8 +4780,8 @@ _0806C286:
_0806C290: .4byte sub_809D6D4
thumb_func_end sub_806C258
- thumb_func_start sub_806C294
-sub_806C294: @ 806C294
+ thumb_func_start ScrCmd_hidecoinsbox
+ScrCmd_hidecoinsbox: @ 806C294
push {lr}
ldr r1, [r0, 0x8]
adds r1, 0x2
@@ -4790,10 +4790,10 @@ sub_806C294: @ 806C294
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806C294
+ thumb_func_end ScrCmd_hidecoinsbox
- thumb_func_start sub_806C2A8
-sub_806C2A8: @ 806C2A8
+ thumb_func_start ScrCmd_updatecoinsbox
+ScrCmd_updatecoinsbox: @ 806C2A8
push {lr}
ldr r1, [r0, 0x8]
adds r1, 0x2
@@ -4805,10 +4805,10 @@ sub_806C2A8: @ 806C2A8
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806C2A8
+ thumb_func_end ScrCmd_updatecoinsbox
- thumb_func_start sub_806C2C4
-sub_806C2C4: @ 806C2C4
+ thumb_func_start ScrCmd_trainerbattle
+ScrCmd_trainerbattle: @ 806C2C4
push {r4,lr}
adds r4, r0, 0
ldr r0, [r4, 0x8]
@@ -4818,7 +4818,7 @@ sub_806C2C4: @ 806C2C4
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806C2C4
+ thumb_func_end ScrCmd_trainerbattle
thumb_func_start sub_806C2D8
sub_806C2D8: @ 806C2D8
@@ -4829,8 +4829,8 @@ sub_806C2D8: @ 806C2D8
bx r1
thumb_func_end sub_806C2D8
- thumb_func_start sub_806C2E4
-sub_806C2E4: @ 806C2E4
+ thumb_func_start ScrCmd_ontrainerbattleend
+ScrCmd_ontrainerbattleend: @ 806C2E4
push {r4,lr}
adds r4, r0, 0
bl sub_80805E8
@@ -4839,10 +4839,10 @@ sub_806C2E4: @ 806C2E4
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806C2E4
+ thumb_func_end ScrCmd_ontrainerbattleend
- thumb_func_start sub_806C2F8
-sub_806C2F8: @ 806C2F8
+ thumb_func_start ScrCmd_ontrainerbattleendgoto
+ScrCmd_ontrainerbattleendgoto: @ 806C2F8
push {r4,lr}
adds r4, r0, 0
bl sub_8080600
@@ -4851,61 +4851,61 @@ sub_806C2F8: @ 806C2F8
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806C2F8
+ thumb_func_end ScrCmd_ontrainerbattleendgoto
- thumb_func_start sub_806C30C
-sub_806C30C: @ 806C30C
+ thumb_func_start ScrCmd_checktrainerflag
+ScrCmd_checktrainerflag: @ 806C30C
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r0, 16
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
strb r0, [r4, 0x2]
movs r0, 0
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_806C30C
+ thumb_func_end ScrCmd_checktrainerflag
- thumb_func_start sub_806C330
-sub_806C330: @ 806C330
+ thumb_func_start ScrCmd_settrainerflag
+ScrCmd_settrainerflag: @ 806C330
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r0, 16
- bl sub_808043C
+ bl trainer_flag_set
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806C330
+ thumb_func_end ScrCmd_settrainerflag
- thumb_func_start sub_806C34C
-sub_806C34C: @ 806C34C
+ thumb_func_start ScrCmd_cleartrainerflag
+ScrCmd_cleartrainerflag: @ 806C34C
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r0, 16
- bl sub_8080450
+ bl trainer_flag_clear
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806C34C
+ thumb_func_end ScrCmd_cleartrainerflag
- thumb_func_start sub_806C368
-sub_806C368: @ 806C368
+ thumb_func_start ScrCmd_setwildbattle
+ScrCmd_setwildbattle: @ 806C368
push {r4-r6,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
@@ -4914,24 +4914,24 @@ sub_806C368: @ 806C368
adds r0, 0x1
str r0, [r4, 0x8]
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
adds r0, r5, 0
adds r1, r6, 0
- bl sub_80A029C
+ bl CreateScriptedWildMon
movs r0, 0
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_806C368
+ thumb_func_end ScrCmd_setwildbattle
thumb_func_start sub_806C39C
sub_806C39C: @ 806C39C
push {lr}
bl sub_807F8C4
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
@@ -4940,9 +4940,9 @@ sub_806C39C: @ 806C39C
thumb_func_start sub_806C3AC
sub_806C3AC: @ 806C3AC
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
bl sub_809C164
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
@@ -4951,9 +4951,9 @@ sub_806C3AC: @ 806C3AC
thumb_func_start sub_806C3C0
sub_806C3C0: @ 806C3C0
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
bl sub_809C1A0
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
@@ -4962,9 +4962,9 @@ sub_806C3C0: @ 806C3C0
thumb_func_start sub_806C3D4
sub_806C3D4: @ 806C3D4
push {lr}
- bl sub_8069910
+ bl ScriptReadWord
bl sub_809C1BC
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
@@ -4973,20 +4973,20 @@ sub_806C3D4: @ 806C3D4
thumb_func_start sub_806C3E8
sub_806C3E8: @ 806C3E8
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 24
lsrs r0, 24
- ldr r1, _0806C40C @ =sub_80568E0
+ ldr r1, _0806C40C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
bl sub_813F804
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_0806C40C: .4byte sub_80568E0
+_0806C40C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_806C3E8
thumb_func_start sub_806C410
@@ -5004,7 +5004,7 @@ sub_806C414: @ 806C414
thumb_func_start sub_806C418
sub_806C418: @ 806C418
push {lr}
- bl sub_8069B28
+ bl ScriptContext1_Stop
movs r0, 0x1
pop {r1}
bx r1
@@ -5028,10 +5028,10 @@ sub_806C42C: @ 806C42C
bx lr
thumb_func_end sub_806C42C
- thumb_func_start sub_806C430
-sub_806C430: @ 806C430
+ thumb_func_start ScrCmd_dofieldeffect
+ScrCmd_dofieldeffect: @ 806C430
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5041,22 +5041,22 @@ sub_806C430: @ 806C430
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0
pop {r1}
bx r1
.align 2, 0
_0806C454: .4byte gUnknown_20370B6
- thumb_func_end sub_806C430
+ thumb_func_end ScrCmd_dofieldeffect
- thumb_func_start sub_806C458
-sub_806C458: @ 806C458
+ thumb_func_start ScrCmd_setfieldeffectarg
+ScrCmd_setfieldeffectarg: @ 806C458
push {r4,lr}
ldr r1, [r0, 0x8]
ldrb r4, [r1]
adds r1, 0x1
str r1, [r0, 0x8]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5072,14 +5072,14 @@ sub_806C458: @ 806C458
bx r1
.align 2, 0
_0806C484: .4byte gUnknown_20386E0
- thumb_func_end sub_806C458
+ thumb_func_end ScrCmd_setfieldeffectarg
- thumb_func_start sub_806C488
-sub_806C488: @ 806C488
+ thumb_func_start WaitForFieldEffectFinish
+WaitForFieldEffectFinish: @ 806C488
push {lr}
ldr r0, _0806C49C @ =gUnknown_20370B6
ldrb r0, [r0]
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
beq _0806C4A0
@@ -5092,19 +5092,19 @@ _0806C4A0:
_0806C4A2:
pop {r1}
bx r1
- thumb_func_end sub_806C488
+ thumb_func_end WaitForFieldEffectFinish
- thumb_func_start sub_806C4A8
-sub_806C4A8: @ 806C4A8
+ thumb_func_start ScrCmd_waitfieldeffect
+ScrCmd_waitfieldeffect: @ 806C4A8
push {r4,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
ldr r1, _0806C4CC @ =gUnknown_20370B6
strh r0, [r1]
- ldr r1, _0806C4D0 @ =sub_806C488
+ ldr r1, _0806C4D0 @ =WaitForFieldEffectFinish
adds r0, r4, 0
bl sub_80697F4
movs r0, 0x1
@@ -5113,13 +5113,13 @@ sub_806C4A8: @ 806C4A8
bx r1
.align 2, 0
_0806C4CC: .4byte gUnknown_20370B6
-_0806C4D0: .4byte sub_806C488
- thumb_func_end sub_806C4A8
+_0806C4D0: .4byte WaitForFieldEffectFinish
+ thumb_func_end ScrCmd_waitfieldeffect
- thumb_func_start sub_806C4D4
-sub_806C4D4: @ 806C4D4
+ thumb_func_start ScrCmd_setrespawn
+ScrCmd_setrespawn: @ 806C4D4
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5129,10 +5129,10 @@ sub_806C4D4: @ 806C4D4
movs r0, 0
pop {r1}
bx r1
- thumb_func_end sub_806C4D4
+ thumb_func_end ScrCmd_setrespawn
- thumb_func_start sub_806C4F0
-sub_806C4F0: @ 806C4F0
+ thumb_func_start ScrCmd_checkplayergender
+ScrCmd_checkplayergender: @ 806C4F0
ldr r1, _0806C500 @ =gUnknown_20370D0
ldr r0, _0806C504 @ =gUnknown_300500C
ldr r0, [r0]
@@ -5143,13 +5143,13 @@ sub_806C4F0: @ 806C4F0
.align 2, 0
_0806C500: .4byte gUnknown_20370D0
_0806C504: .4byte gUnknown_300500C
- thumb_func_end sub_806C4F0
+ thumb_func_end ScrCmd_checkplayergender
- thumb_func_start sub_806C508
-sub_806C508: @ 806C508
+ thumb_func_start ScrCmd_playmoncry
+ScrCmd_playmoncry: @ 806C508
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5157,7 +5157,7 @@ sub_806C508: @ 806C508
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5170,46 +5170,46 @@ sub_806C508: @ 806C508
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806C508
+ thumb_func_end ScrCmd_playmoncry
thumb_func_start sub_806C540
sub_806C540: @ 806C540
push {lr}
- ldr r1, _0806C550 @ =sub_80721A0
+ ldr r1, _0806C550 @ =IsCryFinished
bl sub_80697F4
movs r0, 0x1
pop {r1}
bx r1
.align 2, 0
-_0806C550: .4byte sub_80721A0
+_0806C550: .4byte IsCryFinished
thumb_func_end sub_806C540
- thumb_func_start sub_806C554
-sub_806C554: @ 806C554
+ thumb_func_start ScrCmd_setmetatile
+ScrCmd_setmetatile: @ 806C554
push {r4-r7,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r6, r0, 16
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
lsls r0, 16
lsrs r7, r0, 16
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5241,13 +5241,13 @@ _0806C5CA:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_806C554
+ thumb_func_end ScrCmd_setmetatile
- thumb_func_start sub_806C5D4
-sub_806C5D4: @ 806C5D4
+ thumb_func_start ScrCmd_opendoor
+ScrCmd_opendoor: @ 806C5D4
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5255,7 +5255,7 @@ sub_806C5D4: @ 806C5D4
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5281,13 +5281,13 @@ sub_806C5D4: @ 806C5D4
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_806C5D4
+ thumb_func_end ScrCmd_opendoor
thumb_func_start sub_806C62C
sub_806C62C: @ 806C62C
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5295,7 +5295,7 @@ sub_806C62C: @ 806C62C
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5348,7 +5348,7 @@ _0806C698: .4byte sub_806C670
sub_806C69C: @ 806C69C
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5356,7 +5356,7 @@ sub_806C69C: @ 806C69C
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5381,7 +5381,7 @@ sub_806C69C: @ 806C69C
sub_806C6E0: @ 806C6E0
push {r4,r5,lr}
adds r5, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5389,7 +5389,7 @@ sub_806C6E0: @ 806C6E0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5425,7 +5425,7 @@ sub_806C728: @ 806C728
thumb_func_start sub_806C72C
sub_806C72C: @ 806C72C
push {r4,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E454
@@ -5441,7 +5441,7 @@ sub_806C72C: @ 806C72C
thumb_func_start sub_806C74C
sub_806C74C: @ 806C74C
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5472,7 +5472,7 @@ _0806C780: .4byte gUnknown_20370D0
thumb_func_start sub_806C784
sub_806C784: @ 806C784
push {lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5525,7 +5525,7 @@ sub_806C7D4: @ 806C7D4
movs r2, 0x1
mov r1, sp
strb r2, [r1]
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5549,7 +5549,7 @@ _0806C808: .4byte gUnknown_2024284
thumb_func_start sub_806C80C
sub_806C80C: @ 806C80C
push {r4,lr}
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
@@ -5562,7 +5562,7 @@ sub_806C80C: @ 806C80C
adds r0, r1
movs r1, 0x50
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r4]
movs r0, 0
pop {r4}
@@ -5578,7 +5578,7 @@ sub_806C844: @ 806C844
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_80698F8
+ bl ScriptReadHalfword
lsls r0, 16
lsrs r0, 16
bl sub_806E568
diff --git a/asm/script.s b/asm/script.s
index 16ae21cc9..0d4379e75 100644
--- a/asm/script.s
+++ b/asm/script.s
@@ -140,8 +140,8 @@ _0806987C:
bx r1
thumb_func_end sub_8069804
- thumb_func_start sub_8069884
-sub_8069884: @ 8069884
+ thumb_func_start ScriptPush
+ScriptPush: @ 8069884
push {lr}
adds r2, r0, 0
adds r3, r1, 0
@@ -164,10 +164,10 @@ _080698A6:
_080698A8:
pop {r1}
bx r1
- thumb_func_end sub_8069884
+ thumb_func_end ScriptPush
- thumb_func_start sub_80698AC
-sub_80698AC: @ 80698AC
+ thumb_func_start ScriptPop
+ScriptPop: @ 80698AC
push {lr}
adds r2, r0, 0
ldrb r0, [r2]
@@ -187,40 +187,40 @@ _080698C8:
_080698CA:
pop {r1}
bx r1
- thumb_func_end sub_80698AC
+ thumb_func_end ScriptPop
- thumb_func_start sub_80698D0
-sub_80698D0: @ 80698D0
+ thumb_func_start ScriptJump
+ScriptJump: @ 80698D0
str r1, [r0, 0x8]
bx lr
- thumb_func_end sub_80698D0
+ thumb_func_end ScriptJump
- thumb_func_start sub_80698D4
-sub_80698D4: @ 80698D4
+ thumb_func_start ScriptCall
+ScriptCall: @ 80698D4
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
ldr r1, [r4, 0x8]
- bl sub_8069884
+ bl ScriptPush
str r5, [r4, 0x8]
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80698D4
+ thumb_func_end ScriptCall
- thumb_func_start sub_80698E8
-sub_80698E8: @ 80698E8
+ thumb_func_start ScriptReturn
+ScriptReturn: @ 80698E8
push {r4,lr}
adds r4, r0, 0
- bl sub_80698AC
+ bl ScriptPop
str r0, [r4, 0x8]
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80698E8
+ thumb_func_end ScriptReturn
- thumb_func_start sub_80698F8
-sub_80698F8: @ 80698F8
+ thumb_func_start ScriptReadHalfword
+ScriptReadHalfword: @ 80698F8
adds r3, r0, 0
ldr r2, [r3, 0x8]
ldrb r0, [r2]
@@ -232,10 +232,10 @@ sub_80698F8: @ 80698F8
adds r2, 0x1
str r2, [r3, 0x8]
bx lr
- thumb_func_end sub_80698F8
+ thumb_func_end ScriptReadHalfword
- thumb_func_start sub_8069910
-sub_8069910: @ 8069910
+ thumb_func_start ScriptReadWord
+ScriptReadWord: @ 8069910
push {r4-r6,lr}
adds r3, r0, 0
ldr r0, [r3, 0x8]
@@ -260,36 +260,36 @@ sub_8069910: @ 8069910
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8069910
+ thumb_func_end ScriptReadWord
- thumb_func_start sub_8069940
-sub_8069940: @ 8069940
+ thumb_func_start ScriptContext2_Enable
+ScriptContext2_Enable: @ 8069940
ldr r1, _08069948 @ =gUnknown_3000F9C
movs r0, 0x1
strb r0, [r1]
bx lr
.align 2, 0
_08069948: .4byte gUnknown_3000F9C
- thumb_func_end sub_8069940
+ thumb_func_end ScriptContext2_Enable
- thumb_func_start sub_806994C
-sub_806994C: @ 806994C
+ thumb_func_start ScriptContext2_Disable
+ScriptContext2_Disable: @ 806994C
ldr r1, _08069954 @ =gUnknown_3000F9C
movs r0, 0
strb r0, [r1]
bx lr
.align 2, 0
_08069954: .4byte gUnknown_3000F9C
- thumb_func_end sub_806994C
+ thumb_func_end ScriptContext2_Disable
- thumb_func_start sub_8069958
-sub_8069958: @ 8069958
+ thumb_func_start ScriptContext2_IsEnabled
+ScriptContext2_IsEnabled: @ 8069958
ldr r0, _08069960 @ =gUnknown_3000F9C
ldrb r0, [r0]
bx lr
.align 2, 0
_08069960: .4byte gUnknown_3000F9C
- thumb_func_end sub_8069958
+ thumb_func_end ScriptContext2_IsEnabled
thumb_func_start sub_8069964
sub_8069964: @ 8069964
@@ -475,8 +475,8 @@ sub_8069A54: @ 8069A54
bx r0
thumb_func_end sub_8069A54
- thumb_func_start sub_8069A64
-sub_8069A64: @ 8069A64
+ thumb_func_start ScriptContext1_IsScriptSetUp
+ScriptContext1_IsScriptSetUp: @ 8069A64
push {lr}
ldr r0, _08069A74 @ =gUnknown_3000EA8
ldrb r0, [r0]
@@ -491,10 +491,10 @@ _08069A78:
_08069A7A:
pop {r1}
bx r1
- thumb_func_end sub_8069A64
+ thumb_func_end ScriptContext1_IsScriptSetUp
- thumb_func_start sub_8069A80
-sub_8069A80: @ 8069A80
+ thumb_func_start ScriptContext1_Init
+ScriptContext1_Init: @ 8069A80
push {lr}
ldr r0, _08069A98 @ =gUnknown_3000EB0
ldr r1, _08069A9C @ =gUnknown_815F9B4
@@ -510,10 +510,10 @@ _08069A98: .4byte gUnknown_3000EB0
_08069A9C: .4byte gUnknown_815F9B4
_08069AA0: .4byte gUnknown_815FD08
_08069AA4: .4byte gUnknown_3000EA8
- thumb_func_end sub_8069A80
+ thumb_func_end ScriptContext1_Init
- thumb_func_start sub_8069AA8
-sub_8069AA8: @ 8069AA8
+ thumb_func_start ScriptContext2_RunScript
+ScriptContext2_RunScript: @ 8069AA8
push {r4,lr}
ldr r4, _08069ACC @ =gUnknown_3000EA8
ldrb r0, [r4]
@@ -521,7 +521,7 @@ sub_8069AA8: @ 8069AA8
beq _08069ADC
cmp r0, 0x1
beq _08069ADC
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _08069AD0 @ =gUnknown_3000EB0
bl sub_8069804
lsls r0, 24
@@ -535,17 +535,17 @@ _08069AD0: .4byte gUnknown_3000EB0
_08069AD4:
movs r0, 0x2
strb r0, [r4]
- bl sub_806994C
+ bl ScriptContext2_Disable
_08069ADC:
movs r0, 0
_08069ADE:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8069AA8
+ thumb_func_end ScriptContext2_RunScript
- thumb_func_start sub_8069AE4
-sub_8069AE4: @ 8069AE4
+ thumb_func_start ScriptContext1_SetupScript
+ScriptContext1_SetupScript: @ 8069AE4
push {r4,r5,lr}
adds r5, r0, 0
bl sub_80699F8
@@ -559,7 +559,7 @@ sub_8069AE4: @ 8069AE4
adds r0, r4, 0
adds r1, r5, 0
bl sub_80697E8
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r1, _08069B24 @ =gUnknown_3000EA8
movs r0, 0
strb r0, [r1]
@@ -571,33 +571,33 @@ _08069B18: .4byte gUnknown_3000EB0
_08069B1C: .4byte gUnknown_815F9B4
_08069B20: .4byte gUnknown_815FD08
_08069B24: .4byte gUnknown_3000EA8
- thumb_func_end sub_8069AE4
+ thumb_func_end ScriptContext1_SetupScript
- thumb_func_start sub_8069B28
-sub_8069B28: @ 8069B28
+ thumb_func_start ScriptContext1_Stop
+ScriptContext1_Stop: @ 8069B28
ldr r1, _08069B30 @ =gUnknown_3000EA8
movs r0, 0x1
strb r0, [r1]
bx lr
.align 2, 0
_08069B30: .4byte gUnknown_3000EA8
- thumb_func_end sub_8069B28
+ thumb_func_end ScriptContext1_Stop
- thumb_func_start sub_8069B34
-sub_8069B34: @ 8069B34
+ thumb_func_start EnableBothScriptContexts
+EnableBothScriptContexts: @ 8069B34
push {lr}
ldr r1, _08069B44 @ =gUnknown_3000EA8
movs r0, 0
strb r0, [r1]
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
_08069B44: .4byte gUnknown_3000EA8
- thumb_func_end sub_8069B34
+ thumb_func_end EnableBothScriptContexts
- thumb_func_start sub_8069B48
-sub_8069B48: @ 8069B48
+ thumb_func_start ScriptContext2_RunNewScript
+ScriptContext2_RunNewScript: @ 8069B48
push {r4,r5,lr}
adds r5, r0, 0
ldr r4, _08069B74 @ =gUnknown_3000F28
@@ -622,10 +622,10 @@ _08069B60:
_08069B74: .4byte gUnknown_3000F28
_08069B78: .4byte gUnknown_815F9B4
_08069B7C: .4byte gUnknown_815FD08
- thumb_func_end sub_8069B48
+ thumb_func_end ScriptContext2_RunNewScript
- thumb_func_start sub_8069B80
-sub_8069B80: @ 8069B80
+ thumb_func_start mapheader_get_tagged_pointer
+mapheader_get_tagged_pointer: @ 8069B80
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -662,28 +662,28 @@ _08069BA4:
_08069BBA:
pop {r1}
bx r1
- thumb_func_end sub_8069B80
+ thumb_func_end mapheader_get_tagged_pointer
- thumb_func_start sub_8069BC0
-sub_8069BC0: @ 8069BC0
+ thumb_func_start mapheader_run_script_by_tag
+mapheader_run_script_by_tag: @ 8069BC0
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8069B80
+ bl mapheader_get_tagged_pointer
cmp r0, 0
beq _08069BD2
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
_08069BD2:
pop {r0}
bx r0
- thumb_func_end sub_8069BC0
+ thumb_func_end mapheader_run_script_by_tag
- thumb_func_start sub_8069BD8
-sub_8069BD8: @ 8069BD8
+ thumb_func_start mapheader_get_first_match_from_tagged_ptr_list
+mapheader_get_first_match_from_tagged_ptr_list: @ 8069BD8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8069B80
+ bl mapheader_get_tagged_pointer
adds r6, r0, 0
cmp r6, 0
beq _08069BF4
@@ -730,52 +730,52 @@ _08069C32:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8069BD8
+ thumb_func_end mapheader_get_first_match_from_tagged_ptr_list
- thumb_func_start sub_8069C38
-sub_8069C38: @ 8069C38
+ thumb_func_start mapheader_run_script_with_tag_x1
+mapheader_run_script_with_tag_x1: @ 8069C38
push {lr}
movs r0, 0x1
- bl sub_8069BC0
+ bl mapheader_run_script_by_tag
pop {r0}
bx r0
- thumb_func_end sub_8069C38
+ thumb_func_end mapheader_run_script_with_tag_x1
- thumb_func_start sub_8069C44
-sub_8069C44: @ 8069C44
+ thumb_func_start mapheader_run_script_with_tag_x3
+mapheader_run_script_with_tag_x3: @ 8069C44
push {lr}
movs r0, 0x3
- bl sub_8069BC0
+ bl mapheader_run_script_by_tag
pop {r0}
bx r0
- thumb_func_end sub_8069C44
+ thumb_func_end mapheader_run_script_with_tag_x3
- thumb_func_start sub_8069C50
-sub_8069C50: @ 8069C50
+ thumb_func_start mapheader_run_script_with_tag_x5
+mapheader_run_script_with_tag_x5: @ 8069C50
push {lr}
movs r0, 0x5
- bl sub_8069BC0
+ bl mapheader_run_script_by_tag
pop {r0}
bx r0
- thumb_func_end sub_8069C50
+ thumb_func_end mapheader_run_script_with_tag_x5
- thumb_func_start sub_8069C5C
-sub_8069C5C: @ 8069C5C
+ thumb_func_start mapheader_run_script_with_tag_x7
+mapheader_run_script_with_tag_x7: @ 8069C5C
push {lr}
movs r0, 0x7
- bl sub_8069BC0
+ bl mapheader_run_script_by_tag
pop {r0}
bx r0
- thumb_func_end sub_8069C5C
+ thumb_func_end mapheader_run_script_with_tag_x7
- thumb_func_start sub_8069C68
-sub_8069C68: @ 8069C68
+ thumb_func_start mapheader_run_script_with_tag_x6
+mapheader_run_script_with_tag_x6: @ 8069C68
push {lr}
movs r0, 0x6
- bl sub_8069BC0
+ bl mapheader_run_script_by_tag
pop {r0}
bx r0
- thumb_func_end sub_8069C68
+ thumb_func_end mapheader_run_script_with_tag_x6
thumb_func_start sub_8069C74
sub_8069C74: @ 8069C74
@@ -785,10 +785,10 @@ sub_8069C74: @ 8069C74
cmp r0, 0x3
beq _08069C94
movs r0, 0x2
- bl sub_8069BD8
+ bl mapheader_get_first_match_from_tagged_ptr_list
cmp r0, 0
beq _08069C94
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _08069C96
.align 2, 0
@@ -800,21 +800,21 @@ _08069C96:
bx r1
thumb_func_end sub_8069C74
- thumb_func_start sub_8069C9C
-sub_8069C9C: @ 8069C9C
+ thumb_func_start mapheader_run_first_tag4_script_list_match
+mapheader_run_first_tag4_script_list_match: @ 8069C9C
push {lr}
movs r0, 0x4
- bl sub_8069BD8
+ bl mapheader_get_first_match_from_tagged_ptr_list
cmp r0, 0
beq _08069CAC
- bl sub_8069B48
+ bl ScriptContext2_RunNewScript
_08069CAC:
pop {r0}
bx r0
- thumb_func_end sub_8069C9C
+ thumb_func_end mapheader_run_first_tag4_script_list_match
- thumb_func_start sub_8069CB0
-sub_8069CB0: @ 8069CB0
+ thumb_func_start CalculateRamScriptChecksum
+CalculateRamScriptChecksum: @ 8069CB0
push {lr}
ldr r0, _08069CCC @ =gUnknown_3005008
ldr r0, [r0]
@@ -822,7 +822,7 @@ sub_8069CB0: @ 8069CB0
adds r0, r1
movs r1, 0xFA
lsls r1, 2
- bl sub_8045210
+ bl CalcCRC16WithTable
lsls r0, 16
lsrs r0, 16
pop {r1}
@@ -830,10 +830,10 @@ sub_8069CB0: @ 8069CB0
.align 2, 0
_08069CCC: .4byte gUnknown_3005008
_08069CD0: .4byte 0x00003620
- thumb_func_end sub_8069CB0
+ thumb_func_end CalculateRamScriptChecksum
- thumb_func_start sub_8069CD4
-sub_8069CD4: @ 8069CD4
+ thumb_func_start ClearRamScript
+ClearRamScript: @ 8069CD4
push {lr}
sub sp, 0x4
movs r0, 0
@@ -852,10 +852,10 @@ sub_8069CD4: @ 8069CD4
_08069CF4: .4byte gUnknown_3005008
_08069CF8: .4byte 0x0000361c
_08069CFC: .4byte 0x050000fb
- thumb_func_end sub_8069CD4
+ thumb_func_end ClearRamScript
- thumb_func_start sub_8069D00
-sub_8069D00: @ 8069D00
+ thumb_func_start InitRamScript
+InitRamScript: @ 8069D00
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -879,7 +879,7 @@ sub_8069D00: @ 8069D00
ldr r5, [r0]
ldr r1, _08069D68 @ =0x00003620
adds r4, r5, r1
- bl sub_8069CD4
+ bl ClearRamScript
ldr r0, _08069D6C @ =0x000003e3
cmp r8, r0
bhi _08069D78
@@ -894,7 +894,7 @@ sub_8069D00: @ 8069D00
ldr r1, [sp]
mov r2, r8
bl memcpy
- bl sub_8069CB0
+ bl CalculateRamScriptChecksum
mov r2, r10
ldr r1, [r2]
ldr r2, _08069D74 @ =0x0000361c
@@ -919,10 +919,10 @@ _08069D7A:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8069D00
+ thumb_func_end InitRamScript
- thumb_func_start sub_8069D8C
-sub_8069D8C: @ 8069D8C
+ thumb_func_start GetRamScript
+GetRamScript: @ 8069D8C
push {r4-r7,lr}
adds r4, r1, 0
lsls r0, 24
@@ -950,7 +950,7 @@ sub_8069D8C: @ 8069D8C
ldrb r0, [r2, 0x3]
cmp r0, r3
bne _08069DF4
- bl sub_8069CB0
+ bl CalculateRamScriptChecksum
ldr r1, [r6]
ldr r2, _08069DE8 @ =0x0000361c
adds r1, r2
@@ -968,14 +968,14 @@ _08069DE4: .4byte gUnknown_20370A4
_08069DE8: .4byte 0x0000361c
_08069DEC: .4byte 0x00003624
_08069DF0:
- bl sub_8069CD4
+ bl ClearRamScript
_08069DF4:
adds r0, r4, 0
_08069DF6:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8069D8C
+ thumb_func_end GetRamScript
thumb_func_start sub_8069DFC
sub_8069DFC: @ 8069DFC
@@ -996,7 +996,7 @@ sub_8069DFC: @ 8069DFC
ldrb r0, [r1, 0x3]
cmp r0, 0xFF
bne _08069E40
- bl sub_8069CB0
+ bl CalculateRamScriptChecksum
ldr r1, [r4]
ldr r2, _08069E3C @ =0x0000361c
adds r1, r2
@@ -1039,7 +1039,7 @@ sub_8069E48: @ 8069E48
ldrb r0, [r4, 0x3]
cmp r0, 0xFF
bne _08069E9C
- bl sub_8069CB0
+ bl CalculateRamScriptChecksum
ldr r1, [r6]
ldr r2, _08069E90 @ =0x0000361c
adds r1, r2
@@ -1055,7 +1055,7 @@ _08069E8C: .4byte 0x00003620
_08069E90: .4byte 0x0000361c
_08069E94: .4byte 0x00003624
_08069E98:
- bl sub_8069CD4
+ bl ClearRamScript
_08069E9C:
movs r0, 0
_08069E9E:
@@ -1081,7 +1081,7 @@ _08069EB6:
adds r0, r2, 0
movs r2, 0xFF
movs r3, 0xFF
- bl sub_8069D00
+ bl InitRamScript
add sp, 0x4
pop {r0}
bx r0
diff --git a/asm/script_menu.s b/asm/script_menu.s
index 75a043478..71a120e1c 100644
--- a/asm/script_menu.s
+++ b/asm/script_menu.s
@@ -73,7 +73,7 @@ sub_809C9B4: @ 809C9B4
lsls r3, 24
lsrs r4, r3, 24
ldr r0, _0809C9F0 @ =sub_809CC98
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -121,7 +121,7 @@ sub_809CA04: @ 809CA04
lsls r4, 24
lsrs r4, 24
ldr r0, _0809CA4C @ =sub_809CC98
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -308,7 +308,7 @@ _0809CB7A:
mov r3, r10
bl sub_809CC18
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0809CBA2:
add sp, 0x20
pop {r3-r5}
@@ -406,7 +406,7 @@ _0809CC44:
strb r0, [r1]
ldr r0, _0809CC6C @ =sub_809CC98
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _0809CC70 @ =gUnknown_3005090
@@ -475,10 +475,10 @@ _0809CCD0:
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0809CCDE
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
b _0809CCE2
_0809CCDE:
- bl sub_810F998
+ bl ProcessMenuInput
_0809CCE2:
lsls r0, 24
lsrs r4, r0, 24
@@ -520,8 +520,8 @@ _0809CD2C:
ldrb r0, [r5, 0xC]
bl sub_809D6B0
adds r0, r6, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0809CD3C:
pop {r4-r6}
pop {r0}
@@ -551,7 +551,7 @@ _0809CD60:
_0809CD66:
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _0809CD74 @ =gUnknown_83E072C
b _0809CD82
.align 2, 0
@@ -559,7 +559,7 @@ _0809CD74: .4byte gUnknown_83E072C
_0809CD78:
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _0809CDAC @ =gUnknown_83E0738
_0809CD82:
bl sub_810F98C
@@ -585,7 +585,7 @@ _0809CDAC: .4byte gUnknown_83E0738
_0809CDB0:
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r4, _0809CDE8 @ =gUnknown_83E0748
bl sub_810F98C
lsls r0, 24
@@ -618,7 +618,7 @@ sub_809CDEC: @ 809CDEC
push {r4,lr}
ldr r4, _0809CE04 @ =sub_809CE54
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -639,7 +639,7 @@ _0809CE08:
bl sub_80F7858
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_0809CE26:
movs r0, 0x1
_0809CE28:
@@ -723,8 +723,8 @@ _0809CEB0:
strh r0, [r1]
_0809CEB2:
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0809CEBC:
pop {r4}
pop {r0}
@@ -757,7 +757,7 @@ sub_809CEC8: @ 809CEC8
lsrs r7, r4, 24
ldr r0, _0809CF04 @ =sub_809CFDC
mov r9, r0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -797,7 +797,7 @@ _0809CF08:
lsrs r6, 24
mov r0, r9
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _0809CFD8 @ =gUnknown_3005090
@@ -845,7 +845,7 @@ _0809CF08:
movs r3, 0x1
bl sub_811030C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0809CFB8:
movs r0, 0x1
_0809CFBA:
@@ -904,8 +904,8 @@ _0809D024:
ldrb r0, [r5, 0xC]
bl sub_809D6B0
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0809D034:
pop {r4,r5}
pop {r0}
@@ -918,7 +918,7 @@ _0809D03C: .4byte gUnknown_20370D0
sub_809D040: @ 809D040
push {lr}
ldr r0, _0809D060 @ =sub_809CC98
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1145,7 +1145,7 @@ _0809D1FA:
movs r3, 0xFF
bl sub_809CC18
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -1234,7 +1234,7 @@ _0809D2DC:
ldrb r0, [r4, 0x12]
bl sub_809D6B0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0809D2E8:
pop {r4,r5}
pop {r0}
@@ -1266,7 +1266,7 @@ _0809D318: .4byte sub_809D6D4
_0809D31C:
ldr r4, _0809D3B0 @ =sub_809D288
adds r0, r4, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1287,7 +1287,7 @@ _0809D31C:
lsrs r5, 24
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1328,7 +1328,7 @@ _0809D31C:
movs r1, 0x1
bl sub_80F7750
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
b _0809D3C2
.align 2, 0
@@ -1350,7 +1350,7 @@ _0809D3C2:
sub_809D3CC: @ 809D3CC
push {lr}
ldr r0, _0809D3F0 @ =sub_809D288
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -1380,7 +1380,7 @@ _0809D3FE:
sub_809D404: @ 809D404
push {lr}
ldr r0, _0809D418 @ =sub_809D288
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1400,7 +1400,7 @@ _0809D41E:
sub_809D424: @ 809D424
push {r4,r5,lr}
ldr r0, _0809D450 @ =sub_809D288
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xFF
@@ -1435,7 +1435,7 @@ _0809D458:
ldrb r0, [r4, 0x12]
bl sub_809D6B0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _0809D48C
.align 2, 0
_0809D47C: .4byte gUnknown_202063C
@@ -1443,7 +1443,7 @@ _0809D480:
ldrb r0, [r4, 0x12]
bl sub_809D6B0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0809D48C:
pop {r4,r5}
pop {r0}
@@ -1485,9 +1485,9 @@ _0809D4C6:
lsls r0, 2
ldr r1, _0809D4E8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r0, _0809D4EC @ =0x00001b58
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_0809D4DE:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -1500,7 +1500,7 @@ _0809D4F0:
ldrb r0, [r4, 0x12]
bl sub_809D6B0
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0809D4FC:
pop {r4,r5}
pop {r0}
@@ -1519,7 +1519,7 @@ sub_809D504: @ 809D504
cmp r0, 0x1
beq _0809D5F2
ldr r0, _0809D548 @ =sub_809D494
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1529,12 +1529,12 @@ sub_809D504: @ 809D504
cmp r0, 0x8D
bne _0809D558
ldr r0, _0809D550 @ =gUnknown_83E17C0
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0809D554 @ =gUnknown_83E17A0
movs r1, 0xE8
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0809D572
.align 2, 0
_0809D544: .4byte sub_809D6D4
@@ -1550,12 +1550,12 @@ _0809D55C:
b _0809D5F4
_0809D560:
ldr r0, _0809D600 @ =gUnknown_83E17D0
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0809D604 @ =gUnknown_83E0F80
movs r1, 0xE8
lsls r1, 1
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_0809D572:
ldr r0, _0809D608 @ =gUnknown_83E0768
ldr r1, _0809D60C @ =gUnknown_20370C2
@@ -1574,7 +1574,7 @@ _0809D572:
adds r2, r3
asrs r2, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -1591,7 +1591,7 @@ _0809D572:
strb r1, [r0, 0x5]
ldr r0, _0809D618 @ =sub_809D494
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1615,7 +1615,7 @@ _0809D572:
movs r1, 0x1
bl sub_80F7750
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0809D5F2:
movs r0, 0x1
_0809D5F4:
@@ -1639,7 +1639,7 @@ _0809D61C: .4byte gUnknown_3005090
sub_809D620: @ 809D620
push {lr}
ldr r0, _0809D644 @ =sub_809D494
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -1703,7 +1703,7 @@ sub_809D654: @ 809D654
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
add sp, 0x20
pop {r4,r5}
@@ -1718,7 +1718,7 @@ sub_809D6B0: @ 809D6B0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0x1
bl sub_810F4D8
@@ -1733,9 +1733,9 @@ sub_809D6B0: @ 809D6B0
sub_809D6D4: @ 809D6D4
push {lr}
ldr r0, _0809D74C @ =gUnknown_81A7AE0
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
ldr r0, _0809D750 @ =sub_809D288
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -1760,7 +1760,7 @@ sub_809D6D4: @ 809D6D4
bl sub_8083A5C
_0809D710:
ldr r0, _0809D75C @ =sub_809D494
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -1781,9 +1781,9 @@ _0809D710:
lsls r0, 2
ldr r1, _0809D758 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
ldr r0, _0809D760 @ =0x00001b58
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_0809D748:
pop {r0}
bx r0
@@ -1953,7 +1953,7 @@ _0809D844:
movs r3, 0xFF
bl sub_809CC18
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0809D8A8:
add sp, 0xC
pop {r3,r4}
diff --git a/asm/script_movement.s b/asm/script_movement.s
index be377ec1a..a760af388 100644
--- a/asm/script_movement.s
+++ b/asm/script_movement.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8097434
-sub_8097434: @ 8097434
+ thumb_func_start ScriptMovement_StartObjectMovementScript
+ScriptMovement_StartObjectMovementScript: @ 8097434
push {r4,lr}
sub sp, 0x4
adds r4, r3, 0
@@ -17,7 +17,7 @@ sub_8097434: @ 8097434
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
beq _08097456
@@ -25,7 +25,7 @@ sub_8097434: @ 8097434
b _0809747E
_08097456:
ldr r0, _08097488 @ =sub_80977AC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08097468
@@ -48,10 +48,10 @@ _0809747E:
bx r1
.align 2, 0
_08097488: .4byte sub_80977AC
- thumb_func_end sub_8097434
+ thumb_func_end ScriptMovement_StartObjectMovementScript
- thumb_func_start sub_809748C
-sub_809748C: @ 809748C
+ thumb_func_start ScriptMovement_IsObjectMovementFinished
+ScriptMovement_IsObjectMovementFinished: @ 809748C
push {r4,lr}
sub sp, 0x4
lsls r0, 24
@@ -61,7 +61,7 @@ sub_809748C: @ 809748C
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080974CE
@@ -88,7 +88,7 @@ _080974D0:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_809748C
+ thumb_func_end ScriptMovement_IsObjectMovementFinished
thumb_func_start sub_80974D8
sub_80974D8: @ 80974D8
@@ -101,7 +101,7 @@ sub_80974D8: @ 80974D8
adds r0, r4, 0
bl sub_8097768
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080974F2:
pop {r4}
pop {r0}
@@ -115,7 +115,7 @@ sub_80974F8: @ 80974F8
lsls r1, 24
lsrs r1, 24
ldr r0, _08097534 @ =sub_80977AC
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r2, 0x1
@@ -150,7 +150,7 @@ _0809753C: .4byte 0x0000ffff
sub_8097540: @ 8097540
push {lr}
ldr r0, _08097550 @ =sub_80977AC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -404,8 +404,8 @@ _08097702:
bx r1
thumb_func_end sub_80976D0
- thumb_func_start sub_8097708
-sub_8097708: @ 8097708
+ thumb_func_start npc_obj_offscreen_culling_and_flag_update
+npc_obj_offscreen_culling_and_flag_update: @ 8097708
lsls r0, 24
ldr r2, _08097714 @ =gUnknown_2039830
lsrs r0, 22
@@ -414,7 +414,7 @@ sub_8097708: @ 8097708
bx lr
.align 2, 0
_08097714: .4byte gUnknown_2039830
- thumb_func_end sub_8097708
+ thumb_func_end npc_obj_offscreen_culling_and_flag_update
thumb_func_start sub_8097718
sub_8097718: @ 8097718
@@ -448,7 +448,7 @@ sub_8097728: @ 8097728
bl sub_8097678
adds r0, r4, 0
mov r1, r8
- bl sub_8097708
+ bl npc_obj_offscreen_culling_and_flag_update
adds r0, r5, 0
adds r1, r4, 0
adds r2, r6, 0
@@ -482,7 +482,7 @@ _0809777C:
lsls r0, 2
ldr r1, _080977A8 @ =gUnknown_2036E38
adds r0, r1
- bl sub_80689F4
+ bl npc_sync_anim_pause_bits
_08097792:
adds r0, r5, 0x1
lsls r0, 24
@@ -560,12 +560,12 @@ sub_80977F0: @ 80977F0
ldr r1, _08097850 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C88
+ bl FieldObjectIsSpecialAnimActive
lsls r0, 24
cmp r0, 0
beq _08097838
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0809786A
@@ -590,7 +590,7 @@ _08097854:
adds r6, 0x1
mov r0, r8
adds r1, r6, 0
- bl sub_8097708
+ bl npc_obj_offscreen_culling_and_flag_update
_0809786A:
pop {r3}
mov r8, r3
diff --git a/asm/script_pokemon_util_80A0058.s b/asm/script_pokemon_util_80A0058.s
index d71a567f8..f4f68fdbe 100644
--- a/asm/script_pokemon_util_80A0058.s
+++ b/asm/script_pokemon_util_80A0058.s
@@ -29,7 +29,7 @@ _080A0076:
add r4, r10
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r0, 16
strb r0, [r6]
lsrs r1, 24
@@ -40,7 +40,7 @@ _080A0076:
bl sub_804037C
adds r0, r4, 0
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r7, r0, 24
movs r5, 0
@@ -51,12 +51,12 @@ _080A00AC:
adds r1, r5, 0
adds r1, 0xD
adds r0, r4, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
adds r1, r7, 0
adds r2, r5, 0
- bl sub_804101C
+ bl CalculatePPWithBonus
strb r0, [r6]
adds r1, r5, 0
adds r1, 0x11
@@ -119,7 +119,7 @@ sub_80A011C: @ 80A011C
lsrs r0, r5, 16
mov r8, r0
movs r0, 0x64
- bl sub_8002BB0
+ bl AllocZeroed
adds r7, r0, 0
movs r0, 0
str r0, [sp]
@@ -130,7 +130,7 @@ sub_80A011C: @ 80A011C
adds r1, r6, 0
adds r2, r4, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
add r0, sp, 0x10
mov r1, r8
strb r1, [r0]
@@ -141,11 +141,11 @@ sub_80A011C: @ 80A011C
add r2, sp, 0x10
bl sub_804037C
adds r0, r7, 0
- bl sub_8040B14
+ bl GiveMonToPlayer
lsls r0, 24
lsrs r4, r0, 24
adds r0, r6, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
lsls r0, 16
lsrs r5, r0, 16
cmp r4, 0x1
@@ -160,7 +160,7 @@ sub_80A011C: @ 80A011C
bl sub_8088E74
_080A0196:
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
add sp, 0x14
pop {r3}
@@ -178,7 +178,7 @@ sub_80A01AC: @ 80A01AC
lsls r4, 16
lsrs r4, 16
movs r0, 0x64
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
adds r1, r4, 0
movs r2, 0x1
@@ -191,12 +191,12 @@ sub_80A01AC: @ 80A01AC
mov r2, sp
bl sub_804037C
adds r0, r5, 0
- bl sub_8040B14
+ bl GiveMonToPlayer
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
add sp, 0x4
pop {r4,r5}
@@ -207,7 +207,7 @@ sub_80A01AC: @ 80A01AC
thumb_func_start sub_80A01F4
sub_80A01F4: @ 80A01F4
push {lr}
- bl sub_8040CC4
+ bl GetMonsStateToDoubles
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x1
@@ -246,7 +246,7 @@ _080A0228:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -255,7 +255,7 @@ _080A0228:
beq _080A025C
adds r0, r4, 0
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r6
bne _080A025C
movs r0, 0x1
@@ -298,8 +298,8 @@ _080A028E:
_080A0298: .4byte gUnknown_2021CD0
thumb_func_end sub_80A026C
- thumb_func_start sub_80A029C
-sub_80A029C: @ 80A029C
+ thumb_func_start CreateScriptedWildMon
+CreateScriptedWildMon: @ 80A029C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -312,7 +312,7 @@ sub_80A029C: @ 80A029C
lsrs r5, 24
lsls r7, r2, 16
lsrs r6, r7, 16
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r0, _080A02F8 @ =gUnknown_202402C
mov r8, r0
movs r0, 0
@@ -324,7 +324,7 @@ sub_80A029C: @ 80A029C
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
cmp r6, 0
beq _080A02EA
add r0, sp, 0x10
@@ -345,10 +345,10 @@ _080A02EA:
bx r0
.align 2, 0
_080A02F8: .4byte gUnknown_202402C
- thumb_func_end sub_80A029C
+ thumb_func_end CreateScriptedWildMon
- thumb_func_start sub_80A02FC
-sub_80A02FC: @ 80A02FC
+ thumb_func_start ScriptSetMonMoveSlot
+ScriptSetMonMoveSlot: @ 80A02FC
push {r4,lr}
lsls r0, 24
lsrs r3, r0, 24
@@ -369,14 +369,14 @@ _080A0318:
ldr r1, _080A0330 @ =gUnknown_2024284
adds r0, r1
adds r1, r4, 0
- bl sub_803E964
+ bl SetMonMoveSlot
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A032C: .4byte gUnknown_2024029
_080A0330: .4byte gUnknown_2024284
- thumb_func_end sub_80A02FC
+ thumb_func_end ScriptSetMonMoveSlot
thumb_func_start sub_80A0334
sub_80A0334: @ 80A0334
@@ -411,13 +411,13 @@ _080A0368:
movs r0, 0x1
strh r0, [r1]
_080A036E:
- ldr r0, _080A037C @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _080A037C @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_080A0378: .4byte gUnknown_20370D0
-_080A037C: .4byte sub_80568E0
+_080A037C: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80A0350
thumb_func_start sub_80A0380
@@ -455,14 +455,14 @@ _080A03B8:
movs r0, 0x1
strh r0, [r1]
_080A03C2:
- ldr r0, _080A03D4 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _080A03D4 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
.align 2, 0
_080A03D0: .4byte gUnknown_20370D0
-_080A03D4: .4byte sub_80568E0
+_080A03D4: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_80A039C
thumb_func_start sub_80A03D8
@@ -473,7 +473,7 @@ sub_80A03D8: @ 80A03D8
sub sp, 0x4
movs r0, 0x96
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
adds r7, r0, 0
movs r5, 0
movs r0, 0x64
@@ -517,9 +517,9 @@ _080A042C:
adds r4, 0x64
cmp r5, r6
ble _080A042C
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x4
pop {r3}
mov r8, r3
diff --git a/asm/script_pokemon_util_80BF8FC.s b/asm/script_pokemon_util_80BF8FC.s
index db47bcedd..7e1784a5e 100644
--- a/asm/script_pokemon_util_80BF8FC.s
+++ b/asm/script_pokemon_util_80BF8FC.s
@@ -9,10 +9,10 @@
sub_80BF8FC: @ 80BF8FC
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _080BF934 @ =sub_80BF97C
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BF938 @ =gUnknown_3005090
@@ -27,7 +27,7 @@ sub_80BF8FC: @ 80BF8FC
str r2, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
@@ -40,10 +40,10 @@ _080BF938: .4byte gUnknown_3005090
sub_80BF93C: @ 80BF93C
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _080BF974 @ =sub_80BF97C
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080BF978 @ =gUnknown_3005090
@@ -58,7 +58,7 @@ sub_80BF93C: @ 80BF93C
str r2, [sp]
movs r1, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
add sp, 0x4
pop {r0}
bx r0
@@ -90,7 +90,7 @@ sub_80BF97C: @ 80BF97C
ldrb r0, [r0, 0x8]
bl sub_81283A8
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_080BF9AC:
pop {r4}
pop {r0}
@@ -112,7 +112,7 @@ sub_80BF9BC: @ 80BF9BC
subs r2, 0x1
lsls r2, 24
lsrs r2, 24
- ldr r3, _080BF9FC @ =sub_80567DC
+ ldr r3, _080BF9FC @ =c2_exit_to_overworld_2_switch
movs r4, 0
str r4, [sp]
bl sub_8134738
@@ -129,7 +129,7 @@ sub_80BF9BC: @ 80BF9BC
_080BF9F0: .4byte gUnknown_2024284
_080BF9F4: .4byte gUnknown_20370C0
_080BF9F8: .4byte gUnknown_2024029
-_080BF9FC: .4byte sub_80567DC
+_080BF9FC: .4byte c2_exit_to_overworld_2_switch
_080BFA00: .4byte gUnknown_3005020
_080BFA04: .4byte sub_807DD24
thumb_func_end sub_80BF9BC
@@ -151,7 +151,7 @@ _080BFA14:
adds r0, r1
adds r1, r4, 0
adds r1, 0xD
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _080BFA32
ldrh r0, [r5]
@@ -186,19 +186,19 @@ sub_80BFA50: @ 80BFA50
ldrh r1, [r0]
adds r1, 0xD
adds r0, r5, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
ldr r1, _080BFA9C @ =gUnknown_2021CD0
adds r0, r5, 0
- bl sub_81202E0
+ bl GetMonNickname
ldr r0, _080BFAA0 @ =gUnknown_2021CF0
movs r1, 0xD
muls r1, r4
ldr r2, _080BFAA4 @ =gUnknown_8247094
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
pop {r4,r5}
pop {r0}
bx r0
@@ -231,7 +231,7 @@ sub_80BFAA8: @ 80BFAA8
str r0, [sp, 0x8]
mov r0, r8
ldr r1, [sp, 0x8]
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
adds r1, 0x2
str r1, [sp, 0x14]
@@ -241,7 +241,7 @@ sub_80BFAA8: @ 80BFAA8
str r3, [sp, 0xC]
mov r0, r8
adds r1, r3, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
strh r0, [r1]
adds r7, r5, 0
@@ -249,7 +249,7 @@ sub_80BFAA8: @ 80BFAA8
str r7, [sp, 0x10]
mov r0, r8
adds r1, r7, 0
- bl sub_803FBE8
+ bl GetMonData
mov r1, sp
adds r1, 0x5
str r1, [sp, 0x18]
@@ -259,13 +259,13 @@ sub_80BFAA8: @ 80BFAA8
str r3, [sp, 0x1C]
mov r0, r8
adds r1, r3, 0
- bl sub_803FBE8
+ bl GetMonData
add r7, sp, 0x4
mov r10, r7
strb r0, [r7]
mov r0, r8
movs r1, 0x15
- bl sub_803FBE8
+ bl GetMonData
mov r6, sp
adds r6, 0x6
strb r0, [r6]
@@ -348,13 +348,13 @@ sub_80BFBA8: @ 80BFBA8
ldr r4, _080BFC10 @ =gUnknown_20370C2
ldrb r2, [r4]
movs r1, 0
- bl sub_803E964
+ bl SetMonMoveSlot
mov r1, r8
ldrh r0, [r1]
muls r0, r6
adds r0, r5
ldrb r1, [r4]
- bl sub_8041064
+ bl RemoveMonPPBonus
ldrh r4, [r4]
cmp r4, 0x2
bhi _080BFBFC
@@ -397,7 +397,7 @@ sub_80BFC14: @ 80BFC14
ldr r1, _080BFC3C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0
beq _080BFC44
diff --git a/asm/seagallop.s b/asm/seagallop.s
index dc69537da..b786cc1ca 100644
--- a/asm/seagallop.s
+++ b/asm/seagallop.s
@@ -9,10 +9,10 @@
sub_8146E78: @ 8146E78
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_812B478
ldr r0, _08146E90 @ =sub_8146E94
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -52,7 +52,7 @@ _08146EBC:
.4byte _08146FE4
_08146EDC:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_81471C4
b _08146FCE
_08146EE8:
@@ -62,7 +62,7 @@ _08146EEE:
ldr r4, _08146F18 @ =gUnknown_203F3D0
movs r0, 0x80
lsls r0, 4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0
bl sub_8001618
@@ -72,7 +72,7 @@ _08146EEE:
bl sub_8001658
ldr r1, [r4]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_814732C
b _08146FCE
.align 2, 0
@@ -84,7 +84,7 @@ _08146F20:
lsls r2, 3
movs r0, 0x3
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
bl sub_81474CC
lsls r0, 24
lsrs r0, 24
@@ -97,7 +97,7 @@ _08146F20:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
b _08146F6A
.align 2, 0
_08146F50: .4byte gUnknown_8468C98
@@ -110,33 +110,33 @@ _08146F58:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
_08146F6A:
ldr r0, _08146F88 @ =gUnknown_84691B8
movs r1, 0x40
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08146FCE
.align 2, 0
_08146F84: .4byte gUnknown_84691D8
_08146F88: .4byte gUnknown_84691B8
_08146F8C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _0814703C
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08146FCE
_08146FAC:
bl sub_8147384
@@ -144,7 +144,7 @@ _08146FAC:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _08146FCE
_08146FBE:
movs r0, 0x1
@@ -153,7 +153,7 @@ _08146FBE:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08146FCE:
ldr r1, _08146FE0 @ =gUnknown_30030F0
movs r0, 0x87
@@ -168,31 +168,31 @@ _08146FE0: .4byte gUnknown_30030F0
_08146FE4:
bl sub_814731C
ldr r0, _08147044 @ =sub_8147058
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x13
bl sub_80722CC
bl sub_81473C4
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08147048 @ =0x00001888
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _0814704C @ =sub_8147084
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r0, _08147050 @ =sub_814706C
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _08147054 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -215,9 +215,9 @@ _08147054: .4byte gUnknown_30030F0
thumb_func_start sub_8147058
sub_8147058: @ 8147058
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8147058
@@ -225,10 +225,10 @@ sub_8147058: @ 8147058
thumb_func_start sub_814706C
sub_814706C: @ 814706C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_814706C
@@ -262,14 +262,14 @@ sub_81470A0: @ 81470A0
lsls r1, 3
movs r0, 0x3
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
b _081470C8
_081470BC:
movs r1, 0xC0
lsls r1, 3
movs r0, 0x3
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
_081470C8:
pop {r0}
bx r0
@@ -325,7 +325,7 @@ sub_8147108: @ 8147108
bl sub_8147140
bl sub_812B484
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08147136:
pop {r4}
pop {r0}
@@ -361,21 +361,21 @@ _08147150:
lsls r4, 24
asrs r4, 24
str r4, [sp]
- bl sub_805538C
- bl sub_807B004
+ bl Overworld_SetWarpDestination
+ bl play_some_sound
movs r0, 0x9
bl sub_80722CC
ldr r1, _081471B4 @ =gUnknown_3005020
ldr r0, _081471B8 @ =sub_807DF64
str r0, [r1]
- bl sub_8055378
+ bl warp_in
ldr r0, _081471BC @ =sub_805671C
- bl sub_8000544
+ bl SetMainCallback2
bl sub_80559E4
bl sub_81473A0
ldr r0, _081471C0 @ =gUnknown_203F3D0
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
add sp, 0x4
pop {r4}
@@ -461,64 +461,64 @@ _081471EA:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x8
pop {r3}
mov r8, r3
@@ -533,12 +533,12 @@ _081472F8: .4byte 0x81000800
thumb_func_start sub_81472FC
sub_81472FC: @ 81472FC
push {lr}
- bl sub_8087E64
- bl sub_80773BC
- bl sub_8006B10
- bl sub_810BB8C
- bl sub_8070528
- bl sub_80088F0
+ bl remove_some_task
+ bl ResetTasks
+ bl ResetSpriteData
+ bl dp13_810BB8C
+ bl ResetPaletteFade
+ bl FreeAllSpritePalettes
pop {r0}
bx r0
thumb_func_end sub_81472FC
@@ -549,7 +549,7 @@ sub_814731C: @ 814731C
movs r1, 0xCA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_814731C
@@ -560,35 +560,35 @@ sub_814732C: @ 814732C
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r0}
bx r0
thumb_func_end sub_814732C
@@ -597,9 +597,9 @@ sub_814732C: @ 814732C
sub_8147384: @ 8147384
push {lr}
ldr r0, _08147398 @ =gUnknown_846AF78
- bl sub_8008720
+ bl LoadSpriteSheets
ldr r0, _0814739C @ =gUnknown_846AF90
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r0}
bx r0
.align 2, 0
@@ -612,12 +612,12 @@ sub_81473A0: @ 81473A0
push {r4,lr}
ldr r4, _081473C0 @ =0x00000bb8
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0xFA
lsls r0, 4
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
@@ -632,7 +632,7 @@ sub_81473C4: @ 81473C4
movs r1, 0
movs r2, 0x5C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _08147400 @ =gUnknown_202063C
@@ -649,7 +649,7 @@ sub_81473C4: @ 81473C4
bne _08147404
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08147410
.align 2, 0
_081473FC: .4byte gUnknown_846AF60
@@ -705,7 +705,7 @@ _08147446:
cmp r0, r1
bls _08147466
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_08147466:
pop {r4,r5}
pop {r0}
@@ -721,7 +721,7 @@ sub_814746C: @ 814746C
asrs r1, 16
movs r2, 0x5C
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x40
@@ -737,7 +737,7 @@ sub_814746C: @ 814746C
ldr r1, _081474AC @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
_081474A2:
pop {r4}
pop {r0}
@@ -758,7 +758,7 @@ sub_81474B0: @ 81474B0
cmp r0, 0
beq _081474C6
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_081474C6:
pop {r0}
bx r0
diff --git a/asm/shop.s b/asm/shop.s
index c5c10f8ad..9d9a3d792 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -65,7 +65,7 @@ _0809AAF8:
str r1, [sp, 0x8]
movs r1, 0x2
movs r3, 0x2
- bl sub_810FB6C
+ bl PrintTextArray
ldrb r0, [r4]
str r6, [sp]
str r5, [sp, 0x4]
@@ -76,13 +76,13 @@ _0809AAF8:
movs r3, 0x2
bl sub_810F7D8
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8003F20
ldr r0, _0809AB78 @ =sub_809AC10
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
add sp, 0xC
@@ -124,7 +124,7 @@ _0809ABA0:
lsls r0, r4, 1
adds r0, r1
ldrh r0, [r0]
- bl sub_809A9D8
+ bl ItemId_GetPocket
lsls r0, 24
lsrs r0, 24
cmp r0, 0x4
@@ -194,7 +194,7 @@ sub_809AC10: @ 809AC10
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r1, r0, 24
movs r0, 0x2
@@ -236,10 +236,10 @@ sub_809AC5C: @ 809AC5C
ldr r2, _0809AC8C @ =sub_809AE14
adds r0, r4, 0
movs r1, 0xE
- bl sub_80776E8
+ bl SetWordTaskArg
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r1, _0809AC90 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -265,10 +265,10 @@ sub_809AC98: @ 809AC98
ldr r2, _0809ACC8 @ =sub_809ACD4
adds r0, r4, 0
movs r1, 0xE
- bl sub_80776E8
+ bl SetWordTaskArg
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
ldr r1, _0809ACCC @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -288,7 +288,7 @@ _0809ACD0: .4byte sub_809AD40
thumb_func_start sub_809ACD4
sub_809ACD4: @ 809ACD4
push {lr}
- ldr r2, _0809ACEC @ =sub_80567DC
+ ldr r2, _0809ACEC @ =c2_exit_to_overworld_2_switch
movs r0, 0x2
movs r1, 0x3
bl sub_8107DB4
@@ -298,7 +298,7 @@ sub_809ACD4: @ 809ACD4
pop {r0}
bx r0
.align 2, 0
-_0809ACEC: .4byte sub_80567DC
+_0809ACEC: .4byte c2_exit_to_overworld_2_switch
_0809ACF0: .4byte gUnknown_3005020
_0809ACF4: .4byte sub_809AD74
thumb_func_end sub_809ACD4
@@ -312,7 +312,7 @@ sub_809ACF8: @ 809ACF8
bl sub_809AD24
bl sub_809C138
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0809AD20 @ =gUnknown_2039934
ldr r0, [r0]
cmp r0, 0
@@ -355,11 +355,11 @@ sub_809AD40: @ 809AD40
bne _0809AD68
adds r0, r4, 0
movs r1, 0xE
- bl sub_8077720
- bl sub_8000544
+ bl GetWordTaskArg
+ bl SetMainCallback2
bl sub_8003ECC
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0809AD68:
pop {r4}
pop {r0}
@@ -374,7 +374,7 @@ sub_809AD74: @ 809AD74
bl sub_807DC00
ldr r0, _0809AD88 @ =sub_809AD8C
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -398,7 +398,7 @@ sub_809AD8C: @ 809AD8C
ldr r2, _0809ADB8 @ =gUnknown_841689E
ldr r3, _0809ADBC @ =sub_809ADC0
adds r0, r4, 0
- bl sub_80F7808
+ bl DisplayItemMessageOnField
_0809ADB2:
pop {r4}
pop {r0}
@@ -420,7 +420,7 @@ sub_809ADC0: @ 809ADC0
lsrs r0, 28
bl sub_809AAB0
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4}
pop {r0}
bx r0
@@ -431,11 +431,11 @@ _0809ADE0: .4byte gUnknown_2039934
thumb_func_start sub_809ADE4
sub_809ADE4: @ 809ADE4
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
- bl sub_80F67B8
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
+ bl do_scheduled_bg_tilemap_copies_to_vram
pop {r0}
bx r0
thumb_func_end sub_809ADE4
@@ -443,9 +443,9 @@ sub_809ADE4: @ 809ADE4
thumb_func_start sub_809AE00
sub_809AE00: @ 809AE00
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_809AE00
@@ -473,14 +473,14 @@ _0809AE2C:
bl sub_809B690
ldr r0, _0809AE98 @ =sub_809BBC0
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, _0809AE9C @ =gUnknown_3005E70
movs r1, 0
movs r2, 0
- bl sub_8106FF8
+ bl ListMenuInit
ldr r2, _0809AEA0 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -494,17 +494,17 @@ _0809AE2C:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0809AEA4 @ =sub_809AE00
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0809AEA8 @ =sub_809ADE4
- bl sub_8000544
+ bl SetMainCallback2
b _0809AF64
.align 2, 0
_0809AE90: .4byte gUnknown_30030F0
@@ -522,13 +522,13 @@ _0809AEAC:
ldr r2, _0809AF4C @ =0x01000100
add r0, sp, 0x8
bl CpuFastSet
- bl sub_8087E64
- bl sub_80F6808
- bl sub_80088F0
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
- bl sub_80F6790
+ bl remove_some_task
+ bl reset_temp_tile_data_buffers
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
+ bl clear_scheduled_bg_copies_to_vram
bl sub_80984D8
bl sub_809AF6C
lsls r0, 24
@@ -546,28 +546,28 @@ _0809AEAC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r0, _0809AF50 @ =gUnknown_2039934
ldrb r0, [r0, 0x16]
lsls r0, 28
@@ -579,7 +579,7 @@ _0809AEAC:
_0809AF4C: .4byte 0x01000100
_0809AF50: .4byte gUnknown_2039934
_0809AF54:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _0809AF64
@@ -601,25 +601,25 @@ sub_809AF6C: @ 809AF6C
movs r5, 0x80
lsls r5, 4
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0809AFC0
ldr r4, _0809AFB4 @ =gUnknown_2039958
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0809AFC0
ldr r4, _0809AFB8 @ =gUnknown_203995C
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0809AFC0
ldr r4, _0809AFBC @ =gUnknown_2039960
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0809AFC0
@@ -652,54 +652,54 @@ sub_809AFD0: @ 809AFD0
ldr r0, _0809B074 @ =gUnknown_2039958
ldr r1, [r0]
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _0809B078 @ =gUnknown_2039960
ldr r1, [r0]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _0809B07C @ =gUnknown_203995C
ldr r1, [r0]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
pop {r0}
bx r0
.align 2, 0
@@ -721,7 +721,7 @@ sub_809B080: @ 809B080
movs r0, 0
str r0, [sp]
movs r0, 0x1
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _0809B0B4 @ =gUnknown_2039934
ldrb r1, [r0, 0x16]
movs r0, 0xF
@@ -731,7 +731,7 @@ sub_809B080: @ 809B080
ldr r0, _0809B0B8 @ =gUnknown_8E85EFC
ldr r1, _0809B0BC @ =gUnknown_2039954
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _0809B0CA
.align 2, 0
_0809B0B0: .4byte gUnknown_8E85DC8
@@ -742,25 +742,25 @@ _0809B0C0:
ldr r0, _0809B100 @ =gUnknown_8E86038
ldr r1, _0809B104 @ =gUnknown_2039954
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
_0809B0CA:
movs r0, 0x40
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
ldr r0, _0809B108 @ =gUnknown_8E86170
adds r1, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
adds r0, r4, 0
movs r1, 0xB0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
adds r0, 0x20
movs r1, 0x60
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x4
pop {r4}
pop {r0}
@@ -808,7 +808,7 @@ _0809B13C:
bl sub_80F6B08
_0809B14E:
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -821,13 +821,13 @@ sub_809B15C: @ 809B15C
bl sub_809BAFC
bl sub_813F6D0
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r0}
bx r0
thumb_func_end sub_809B15C
@@ -840,7 +840,7 @@ sub_809B188: @ 809B188
ldrh r0, [r4, 0x10]
adds r0, 0x1
lsls r0, 3
- bl sub_8002B9C
+ bl Alloc
str r0, [r7]
cmp r0, 0
beq _0809B1B2
@@ -849,7 +849,7 @@ sub_809B188: @ 809B188
adds r0, 0x1
movs r1, 0xD
muls r0, r1
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
bne _0809B1CC
@@ -893,7 +893,7 @@ _0809B1F2:
ldr r0, [r5]
adds r0, r4
ldr r1, _0809B2CC @ =gUnknown_84161C1
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0809B2D0 @ =gUnknown_2039964
ldr r2, [r0]
lsls r1, r6, 3
@@ -1049,7 +1049,7 @@ _0809B334:
beq _0809B348
lsls r0, r5, 16
lsrs r0, 16
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r7, r0, 0
b _0809B34A
_0809B348:
@@ -1057,7 +1057,7 @@ _0809B348:
_0809B34A:
movs r0, 0x5
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r6, _0809B388 @ =gUnknown_2039934
ldrb r0, [r6, 0x16]
movs r4, 0xF
@@ -1124,7 +1124,7 @@ _0809B3D4: .4byte gUnknown_2039934
_0809B3D8:
movs r0, 0x6
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
bl sub_809B494
movs r0, 0x3
@@ -1161,7 +1161,7 @@ sub_809B408: @ 809B408
ldr r4, _0809B488 @ =gUnknown_2021CD0
lsls r0, r1, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -1170,7 +1170,7 @@ sub_809B408: @ 809B408
movs r3, 0x4
bl sub_8008E78
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
movs r1, 0x4
@@ -1235,10 +1235,10 @@ sub_809B494: @ 809B494
ldr r5, _0809B51C @ =gUnknown_2021D18
ldr r1, _0809B520 @ =gUnknown_8416226
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
movs r4, 0
str r4, [sp]
str r4, [sp, 0x4]
@@ -1254,7 +1254,7 @@ sub_809B494: @ 809B494
bl sub_813F6F4
lsls r0, r7, 16
lsrs r0, 16
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
movs r1, 0xD
@@ -1262,7 +1262,7 @@ sub_809B494: @ 809B494
ldr r0, _0809B524 @ =gUnknown_8247094
adds r1, r0
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x10
str r0, [sp]
str r4, [sp, 0x4]
@@ -1335,7 +1335,7 @@ sub_809B57C: @ 809B57C
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -1372,7 +1372,7 @@ sub_809B59C: @ 809B59C
movs r1, 0
movs r2, 0x1
adds r3, r5, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0x4
movs r1, 0x2
bl sub_8003F20
@@ -1405,37 +1405,37 @@ sub_809B604: @ 809B604
ldr r0, [r0]
cmp r0, 0
beq _0809B612
- bl sub_8002BC4
+ bl Free
_0809B612:
ldr r0, _0809B65C @ =gUnknown_2039958
ldr r0, [r0]
cmp r0, 0
beq _0809B61E
- bl sub_8002BC4
+ bl Free
_0809B61E:
ldr r0, _0809B660 @ =gUnknown_203995C
ldr r0, [r0]
cmp r0, 0
beq _0809B62A
- bl sub_8002BC4
+ bl Free
_0809B62A:
ldr r0, _0809B664 @ =gUnknown_2039960
ldr r0, [r0]
cmp r0, 0
beq _0809B636
- bl sub_8002BC4
+ bl Free
_0809B636:
ldr r0, _0809B668 @ =gUnknown_2039964
ldr r0, [r0]
cmp r0, 0
beq _0809B642
- bl sub_8002BC4
+ bl Free
_0809B642:
ldr r0, _0809B66C @ =gUnknown_2039968
ldr r0, [r0]
cmp r0, 0
beq _0809B64E
- bl sub_8002BC4
+ bl Free
_0809B64E:
bl sub_8003ECC
pop {r0}
@@ -1455,14 +1455,14 @@ sub_809B670: @ 809B670
ldr r0, _0809B684 @ =gUnknown_3005020
ldr r1, _0809B688 @ =sub_809AD74
str r1, [r0]
- ldr r0, _0809B68C @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0809B68C @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
_0809B684: .4byte gUnknown_3005020
_0809B688: .4byte sub_809AD74
-_0809B68C: .4byte sub_80567DC
+_0809B68C: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_809B670
thumb_func_start sub_809B690
@@ -1510,7 +1510,7 @@ _0809B6C4:
movs r2, 0x8
movs r3, 0x58
_0809B6E2:
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
lsls r0, 3
ldrb r2, [r4, 0x17]
movs r1, 0x7
@@ -1542,7 +1542,7 @@ sub_809B6FC: @ 809B6FC
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
lsls r0, 3
ldrb r2, [r4, 0x17]
movs r1, 0x7
@@ -1567,7 +1567,7 @@ sub_809B73C: @ 809B73C
cmp r0, 0xF8
beq _0809B758
lsrs r0, r1, 3
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldrb r0, [r4, 0x17]
movs r1, 0xF8
orrs r0, r1
@@ -1605,7 +1605,7 @@ sub_809B778: @ 809B778
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
+ bl GetXYCoordsOneStepInFrontOfPlayer
mov r1, sp
mov r0, sp
ldrh r0, [r0]
@@ -1828,8 +1828,8 @@ sub_809B92C: @ 809B92C
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C4F4
- bl sub_805C700
+ bl GetXYCoordsOneStepInFrontOfPlayer
+ bl PlayerGetZCoord
lsls r0, 24
lsrs r0, 24
str r0, [sp, 0x4]
@@ -1871,7 +1871,7 @@ _0809B976:
lsls r1, 16
lsrs r1, 16
ldr r2, [sp, 0x4]
- bl sub_805F894
+ bl GetFieldObjectIdByXYZ
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0x10
@@ -2029,7 +2029,7 @@ _0809BA56:
adds r0, r5, r1
ldrb r1, [r0]
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0809BACE:
adds r0, r6, 0x1
lsls r0, 24
@@ -2103,7 +2103,7 @@ sub_809BB44: @ 809BB44
adds r4, r0
movs r0, 0x3
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0809BBB0 @ =gUnknown_2039934
ldr r3, [r0, 0x8]
movs r0, 0xFF
@@ -2164,13 +2164,13 @@ sub_809BBC0: @ 809BBC0
cmp r0, 0
bne _0809BC8E
ldrb r0, [r5, 0xE]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r4, r0, 0
ldrb r0, [r5, 0xE]
ldr r7, _0809BC08 @ =gUnknown_2039942
subs r2, r7, 0x2
adds r1, r7, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
movs r0, 0x2
negs r0, r0
cmp r4, r0
@@ -2194,7 +2194,7 @@ _0809BC1A:
bl sub_80722CC
strh r4, [r5, 0xA]
movs r0, 0x5
- bl sub_80040B8
+ bl ClearWindowTilemap
bl sub_809B73C
ldrb r0, [r5, 0xE]
movs r1, 0x2
@@ -2204,7 +2204,7 @@ _0809BC1A:
lsls r0, r4, 16
lsrs r4, r0, 16
adds r0, r4, 0
- bl sub_809A900
+ bl itemid_get_market_price
adds r1, r0, 0
adds r0, r7, 0
subs r0, 0xE
@@ -2216,7 +2216,7 @@ _0809BC1A:
movs r2, 0xA4
lsls r2, 2
adds r0, r2
- bl sub_809FD88
+ bl IsEnoughMoney
lsls r0, 24
cmp r0, 0
bne _0809BC7C
@@ -2295,7 +2295,7 @@ sub_809BCA0: @ 809BCA0
adds r0, r7, 0
bl sub_809BB44
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _0809BD50 @ =gUnknown_3005008
ldr r0, [r0]
movs r1, 0xA4
@@ -2304,7 +2304,7 @@ sub_809BCA0: @ 809BCA0
bl sub_809FD58
adds r4, r0, 0
ldrh r0, [r5, 0xA]
- bl sub_809A900
+ bl itemid_get_market_price
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -2371,7 +2371,7 @@ sub_809BD8C: @ 809BD8C
cmp r0, 0x1
bne _0809BDD4
ldrh r0, [r4, 0xA]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 16
movs r2, 0x2
@@ -2401,11 +2401,11 @@ _0809BDD4:
movs r1, 0
bl sub_810F4D8
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r0, [r4, 0xA]
ldr r1, _0809BE40 @ =gUnknown_2021CD0
bl sub_8099E90
@@ -2447,9 +2447,9 @@ _0809BE54:
movs r1, 0
bl sub_810F4D8
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r7, 0
bl sub_809BF98
_0809BE88:
@@ -2482,7 +2482,7 @@ sub_809BEA4: @ 809BEA4
ldr r1, _0809BEE8 @ =gUnknown_3005098
adds r4, r0, r1
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrh r0, [r4, 0xA]
ldrh r1, [r4, 0x2]
bl sub_809A084
@@ -2534,7 +2534,7 @@ sub_809BF0C: @ 809BF0C
adds r0, r5
ldr r1, _0809BF5C @ =gUnknown_2039934
ldr r1, [r1, 0x8]
- bl sub_809FDD8
+ bl RemoveMoney
movs r0, 0xF8
bl sub_80722CC
ldr r0, [r6]
@@ -2608,9 +2608,9 @@ sub_809BF98: @ 809BF98
movs r0, 0
bl sub_809B10C
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, _0809BFFC @ =gUnknown_2039934
ldrb r1, [r0, 0x16]
movs r0, 0xF
@@ -2618,10 +2618,10 @@ sub_809BF98: @ 809BF98
cmp r0, 0x1
bne _0809BFDC
movs r0, 0x6
- bl sub_8003FA0
+ bl PutWindowTilemap
_0809BFDC:
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_809B690
adds r0, r6, 0
subs r0, 0x8
@@ -2653,7 +2653,7 @@ sub_809C004: @ 809C004
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0809C044 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -2693,10 +2693,10 @@ sub_809C04C: @ 809C04C
movs r2, 0
bl sub_810713C
bl sub_809B604
- ldr r0, _0809C090 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _0809C090 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0809C082:
pop {r4}
pop {r0}
@@ -2704,7 +2704,7 @@ _0809C082:
.align 2, 0
_0809C088: .4byte gUnknown_3005098
_0809C08C: .4byte gUnknown_2037AB8
-_0809C090: .4byte sub_80567DC
+_0809C090: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_809C04C
thumb_func_start nullsub_52
@@ -2775,7 +2775,7 @@ _0809C0F8:
cmp r1, r0
bhi _0809C120
adds r0, r3, 0
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 16
subs r1, r5, 0x1
@@ -2832,7 +2832,7 @@ sub_809C164: @ 809C164
bl sub_809ABD8
movs r0, 0
bl sub_809AAB0
- ldr r0, _0809C194 @ =sub_8069B34
+ ldr r0, _0809C194 @ =EnableBothScriptContexts
bl sub_809AC04
bl nullsub_53
ldr r4, _0809C198 @ =gUnknown_203996C
@@ -2848,7 +2848,7 @@ sub_809C164: @ 809C164
pop {r0}
bx r0
.align 2, 0
-_0809C194: .4byte sub_8069B34
+_0809C194: .4byte EnableBothScriptContexts
_0809C198: .4byte gUnknown_203996C
_0809C19C: .4byte gUnknown_2036DFC
thumb_func_end sub_809C164
@@ -2859,12 +2859,12 @@ sub_809C1A0: @ 809C1A0
bl sub_809ABD8
movs r0, 0x2
bl sub_809AAB0
- ldr r0, _0809C1B8 @ =sub_8069B34
+ ldr r0, _0809C1B8 @ =EnableBothScriptContexts
bl sub_809AC04
pop {r0}
bx r0
.align 2, 0
-_0809C1B8: .4byte sub_8069B34
+_0809C1B8: .4byte EnableBothScriptContexts
thumb_func_end sub_809C1A0
thumb_func_start sub_809C1BC
@@ -2873,12 +2873,12 @@ sub_809C1BC: @ 809C1BC
bl sub_809ABD8
movs r0, 0x3
bl sub_809AAB0
- ldr r0, _0809C1D4 @ =sub_8069B34
+ ldr r0, _0809C1D4 @ =EnableBothScriptContexts
bl sub_809AC04
pop {r0}
bx r0
.align 2, 0
-_0809C1D4: .4byte sub_8069B34
+_0809C1D4: .4byte EnableBothScriptContexts
thumb_func_end sub_809C1BC
thumb_func_start sub_809C1D8
@@ -3149,7 +3149,7 @@ _0809C3CE:
adds r5, r0, 0
cmp r5, 0
bne _0809C3F2
- bl sub_805A684
+ bl DrawWholeMapView
movs r1, 0x2
ldrsh r0, [r4, r1]
adds r0, 0x1
@@ -3174,7 +3174,7 @@ sub_809C3FC: @ 809C3FC
ldr r6, _0809C440 @ =sub_809C334
adds r0, r6, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3187,7 +3187,7 @@ sub_809C3FC: @ 809C3FC
adds r0, 0x8
adds r1, r7, 0
adds r1, 0xA
- bl sub_805C538
+ bl PlayerGetDestCoords
movs r0, 0
strh r0, [r7]
strh r0, [r7, 0x2]
@@ -3222,7 +3222,7 @@ sub_809C460: @ 809C460
push {lr}
ldr r0, _0809C470 @ =gUnknown_2039984
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
pop {r0}
bx r0
.align 2, 0
@@ -3264,7 +3264,7 @@ sub_809C4A8: @ 809C4A8
push {r4,lr}
ldr r0, _0809C4E0 @ =sub_809C500
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0809C4E4 @ =gUnknown_3005090
@@ -3279,7 +3279,7 @@ sub_809C4A8: @ 809C4A8
adds r1, r2
adds r0, r1, 0x4
adds r1, 0x6
- bl sub_805C538
+ bl PlayerGetDestCoords
ldr r0, _0809C4E8 @ =gUnknown_20370C0
ldrh r0, [r0]
cmp r0, 0
@@ -3360,13 +3360,13 @@ _0809C56E:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
movs r1, 0x4
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
adds r1, 0x2
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
_0809C588:
ldrh r0, [r4]
adds r0, 0x1
@@ -3401,15 +3401,15 @@ _0809C588:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
movs r1, 0x4
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
adds r1, 0x2
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0809C5E6:
pop {r4,r5}
pop {r0}
@@ -3426,7 +3426,7 @@ sub_809C5FC: @ 809C5FC
push {r4,lr}
ldr r0, _0809C638 @ =sub_809C640
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0809C63C @ =gUnknown_3005090
@@ -3441,7 +3441,7 @@ sub_809C5FC: @ 809C5FC
adds r1, r2
adds r0, r1, 0x4
adds r1, 0x6
- bl sub_805C538
+ bl PlayerGetDestCoords
ldrh r0, [r4, 0xC]
adds r0, 0x4
strh r0, [r4, 0xC]
@@ -3491,19 +3491,19 @@ sub_809C640: @ 809C640
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
movs r1, 0x4
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
adds r1, 0x1
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
movs r1, 0x2
ldrsh r0, [r4, r1]
cmp r0, 0x4
bne _0809C6B4
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _0809C70A
.align 2, 0
_0809C6A8: .4byte gUnknown_3005098
@@ -3531,13 +3531,13 @@ _0809C6BA:
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
movs r1, 0x4
ldrsh r0, [r4, r1]
movs r2, 0x6
ldrsh r1, [r4, r2]
adds r1, 0x1
- bl sub_805A8E8
+ bl CurrentMapDrawMetatileAt
_0809C6F2:
ldrh r0, [r4]
adds r0, 0x1
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 24c91e052..10af41ee9 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -11,15 +11,15 @@ sub_813F804: @ 813F804
adds r6, r1, 0
lsls r0, 16
lsrs r5, r0, 16
- bl sub_80773BC
+ bl ResetTasks
ldr r4, _0813F828 @ =gUnknown_203F3A0
movs r0, 0x54
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
bne _0813F82C
adds r0, r6, 0
- bl sub_8000544
+ bl SetMainCallback2
b _0813F840
.align 2, 0
_0813F828: .4byte gUnknown_203F3A0
@@ -32,7 +32,7 @@ _0813F832:
str r6, [r0]
bl sub_813F84C
ldr r0, _0813F848 @ =sub_813F898
- bl sub_8000544
+ bl SetMainCallback2
_0813F840:
pop {r4-r6}
pop {r0}
@@ -86,9 +86,9 @@ _0813F894: .4byte gUnknown_203F3A0
thumb_func_start sub_813F898
sub_813F898: @ 813F898
push {r4,lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
ldr r0, _0813F8BC @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -108,7 +108,7 @@ _0813F8C0:
ldr r0, _0813F8D8 @ =gUnknown_203F3A0
ldr r0, [r0]
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_813F92C
b _0813F916
.align 2, 0
@@ -128,17 +128,17 @@ _0813F8EC:
bne _0813F916
ldr r0, _0813F91C @ =sub_813F964
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r4, _0813F920 @ =gUnknown_203F3A0
ldr r1, [r4]
strb r0, [r1, 0x10]
ldr r0, _0813F924 @ =sub_8140060
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x11]
ldr r0, _0813F928 @ =sub_813F94C
- bl sub_8000544
+ bl SetMainCallback2
_0813F916:
pop {r4}
pop {r0}
@@ -158,7 +158,7 @@ sub_813F92C: @ 813F92C
ldr r0, [r4]
cmp r0, 0
beq _0813F942
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0813F942:
@@ -172,10 +172,10 @@ _0813F948: .4byte gUnknown_203F3A0
thumb_func_start sub_813F94C
sub_813F94C: @ 813F94C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_813F94C
@@ -809,13 +809,13 @@ _0813FE60:
bhi _0813FE80
movs r0, 0x86
lsls r0, 1
- bl sub_8071C60
+ bl PlayFanfare
b _0813FE86
.align 2, 0
_0813FE7C: .4byte gUnknown_203F3A0
_0813FE80:
ldr r0, _0813FE9C @ =0x0000010d
- bl sub_8071C60
+ bl PlayFanfare
_0813FE86:
movs r0, 0x8
movs r1, 0
@@ -857,7 +857,7 @@ _0813FECC:
adds r6, r0, 0
cmp r6, 0
bne _0813FFCE
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0813FF0C
@@ -886,7 +886,7 @@ _0813FF0C:
lsls r0, 16
cmp r0, 0
bne _0813FF58
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0813FF28
@@ -932,7 +932,7 @@ _0813FF58:
_0813FF70: .4byte gUnknown_203F3A0
_0813FF74: .4byte gUnknown_30030F0
_0813FF78:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0813FFCE
@@ -1014,7 +1014,7 @@ _0814000C:
ldr r0, _0814002C @ =gUnknown_203F3A0
ldr r0, [r0]
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_813F92C
_08140024:
pop {r4}
@@ -1467,7 +1467,7 @@ _08140348:
mov r0, r8
cmp r0, 0
bne _0814036C
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x5
@@ -1479,7 +1479,7 @@ _08140348:
_08140364: .4byte gUnknown_203F3A0
_08140368: .4byte gUnknown_8464926
_0814036C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
mov r1, r8
@@ -2358,7 +2358,7 @@ _081409AE:
thumb_func_start sub_81409B4
sub_81409B4: @ 81409B4
push {r4-r6,lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r2, r0, 18
ldr r0, _08140A60 @ =gUnknown_203F3A0
@@ -2391,14 +2391,14 @@ _081409E6:
ldrh r0, [r1, 0xC]
cmp r0, 0
bne _08140A22
- bl sub_8044EC8
+ bl Random
ldr r1, _08140A68 @ =0x00003fff
ands r1, r0
ldrh r4, [r4, 0xC]
cmp r1, r4
bcs _08140A18
ldr r4, [r6]
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
movs r0, 0x3C
@@ -2416,7 +2416,7 @@ _08140A18:
_08140A22:
cmp r5, 0
bne _08140A4A
- bl sub_8044EC8
+ bl Random
ldr r1, _08140A68 @ =0x00003fff
ands r1, r0
ldr r0, _08140A6C @ =0x00002ccb
@@ -2424,7 +2424,7 @@ _08140A22:
bhi _08140A4A
ldr r0, _08140A60 @ =gUnknown_203F3A0
ldr r4, [r0]
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
movs r0, 0x3C
@@ -2689,16 +2689,16 @@ sub_8140C0C: @ 8140C0C
ldr r4, _08140C3C @ =gUnknown_84655B0
_08140C12:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x2
bls _08140C12
ldr r0, _08140C40 @ =gUnknown_84655C8
- bl sub_8008974
+ bl LoadSpritePalettes
ldr r4, _08140C44 @ =gUnknown_203F3A4
movs r0, 0x74
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _08140C48
@@ -2724,7 +2724,7 @@ sub_8140C50: @ 8140C50
ldr r0, [r4]
cmp r0, 0
beq _08140C62
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08140C62:
@@ -2800,7 +2800,7 @@ _08140CC6:
ldr r0, _08140D64 @ =gUnknown_84657E4
asrs r1, 16
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, _08140D68 @ =gUnknown_8464926
@@ -2816,12 +2816,12 @@ _08140CC6:
adds r5, r0
adds r0, r5, 0
adds r1, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _08140D70 @ =gUnknown_8465608
lsls r4, 1
adds r4, r0
ldrh r0, [r4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r2, [r5, 0x5]
movs r1, 0xF
@@ -2922,19 +2922,19 @@ _08140DB6:
ldrb r4, [r0]
ldr r0, [r1]
adds r1, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
mov r1, r8
ldr r0, [r1]
adds r0, 0xC
adds r0, r5
ldr r0, [r0]
adds r1, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _08140E3C @ =gUnknown_8465608
lsls r4, 1
adds r4, r0
ldrh r0, [r4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
mov r2, r8
ldr r1, [r2]
adds r1, 0xC
@@ -3044,7 +3044,7 @@ _08140EBC:
mov r0, r10
movs r2, 0x1E
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
mov r0, r9
@@ -3061,7 +3061,7 @@ _08140EBC:
mov r0, r10
movs r2, 0x1E
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
mov r0, r9
@@ -3126,7 +3126,7 @@ _08140F54:
ldr r0, [r0]
lsls r1, r4, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
muls r0, r6
mov r1, r9
@@ -3143,7 +3143,7 @@ _08140F54:
ldr r0, [r0]
lsls r1, r4, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
muls r0, r6
mov r1, r8
@@ -3175,7 +3175,7 @@ sub_8140FC4: @ 8140FC4
movs r1, 0x10
movs r2, 0x88
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
ldr r5, _08141018 @ =gUnknown_203F3A4
@@ -3190,7 +3190,7 @@ sub_8140FC4: @ 8140FC4
movs r1, 0xE0
movs r2, 0x88
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
ldr r1, [r5]
@@ -3227,7 +3227,7 @@ _0814102A:
adds r0, r1
ldr r0, [r0]
adds r1, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r4, 0x1
cmp r4, 0x1
ble _0814102A
@@ -3242,7 +3242,7 @@ _08141048: .4byte gUnknown_203F3A4
sub_814104C: @ 814104C
push {r4,lr}
ldr r0, _0814108C @ =0x0000285c
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
beq _08141082
@@ -3259,12 +3259,12 @@ _08141062:
str r0, [r4, 0x28]
adds r0, r2, 0
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
movs r1, 0
adds r2, r4, 0
- bl sub_80776E8
+ bl SetWordTaskArg
_08141082:
movs r0, 0
pop {r4}
@@ -3280,17 +3280,17 @@ sub_8141094: @ 8141094
push {r4,lr}
ldr r4, _081410C8 @ =sub_81410CC
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _081410BA
bl sub_814112C
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_081410BA:
bl sub_8140C50
bl sub_8003ECC
@@ -3309,7 +3309,7 @@ sub_81410CC: @ 81410CC
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r6, r0, 0
ldr r0, _08141114 @ =gUnknown_84658F0
mov r8, r0
@@ -3346,9 +3346,9 @@ _08141114: .4byte gUnknown_84658F0
thumb_func_start sub_8141118
sub_8141118: @ 8141118
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_8141118
@@ -3357,11 +3357,11 @@ sub_8141118: @ 8141118
sub_814112C: @ 814112C
push {lr}
ldr r0, _08141144 @ =sub_81410CC
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
pop {r1}
bx r1
.align 2, 0
@@ -3444,34 +3444,34 @@ _081411C2:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0814142E
_081411D0:
movs r0, 0
- bl sub_80006F4
- bl sub_8006B10
- bl sub_80088F0
+ bl SetVBlankCallback
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
movs r1, 0xE0
lsls r1, 19
movs r2, 0x80
lsls r2, 3
movs r0, 0
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
movs r1, 0xC0
lsls r1, 19
movs r0, 0
movs r2, 0x20
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
ldr r1, _0814139C @ =0x0600c000
movs r0, 0
movs r2, 0x20
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80F6C14
movs r0, 0
bl sub_8001618
@@ -3484,7 +3484,7 @@ _081411D0:
ldr r1, _081413A8 @ =0x0000205c
add r1, r8
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r4, 0x20
str r4, [sp]
str r4, [sp, 0x4]
@@ -3492,52 +3492,52 @@ _081411D0:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x3
- bl sub_80020BC
- bl sub_80F6808
+ bl CopyBgTilemapBufferToVram
+ bl reset_temp_tile_data_buffers
ldr r1, _081413AC @ =gUnknown_84659D0
movs r5, 0
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _081413B0 @ =gUnknown_846653C
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0xC0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _081413B4 @ =0x0000185c
add r1, r8
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, _081413B8 @ =gUnknown_84661D4
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _081413BC @ =gUnknown_8465930
movs r1, 0
movs r2, 0xA0
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _081413C0 @ =gUnknown_84664BC
movs r1, 0x50
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _081413C4 @ =gUnknown_84665C0
movs r1, 0x70
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _081413C8 @ =0x00007fde
add r0, sp, 0xC
strh r1, [r0]
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
movs r1, 0xA
movs r2, 0xD0
@@ -3549,7 +3549,7 @@ _081411D0:
ldr r1, _081413CC @ =0x0000085c
add r1, r8
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
str r4, [sp]
movs r0, 0x1E
str r0, [sp, 0x4]
@@ -3557,31 +3557,31 @@ _081411D0:
movs r1, 0
movs r2, 0
movs r3, 0x2
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r1, _081413D0 @ =gUnknown_8466620
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _081413D4 @ =gUnknown_8466998
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0x1
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r4, _081413D8 @ =gUnknown_841B779
movs r0, 0
adds r1, r4, 0
@@ -3605,14 +3605,14 @@ _081411D0:
movs r3, 0
bl sub_812E51C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r1, 0x83
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x50
movs r1, 0xF8
- bl sub_8000A38
+ bl SetGpuReg
bl sub_8140C0C
bl sub_8140CA0
bl sub_8140E9C
@@ -3622,11 +3622,11 @@ _081411D0:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _081413DC @ =sub_8141118
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _081413E0 @ =sub_8140E40
- bl sub_8000700
+ bl SetHBlankCallback
b _0814142E
.align 2, 0
_0814139C: .4byte 0x0600c000
@@ -3648,41 +3648,41 @@ _081413D8: .4byte gUnknown_841B779
_081413DC: .4byte sub_8141118
_081413E0: .4byte sub_8140E40
_081413E4:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
bne _08141450
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
bl sub_8141B34
movs r4, 0x1
negs r4, r4
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x3
- bl sub_8000B68
+ bl EnableInterrupts
_0814142E:
ldrb r0, [r7]
adds r0, 0x1
strb r0, [r7]
b _08141450
_08141436:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _0814144C @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -3722,7 +3722,7 @@ _08141472:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -3759,16 +3759,16 @@ sub_81414AC: @ 81414AC
b _081414E2
_081414BC:
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
bl sub_8141834
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _081414E2
_081414D4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081414E2
@@ -3799,7 +3799,7 @@ sub_81414FC: @ 81414FC
bl sub_8141020
ldr r0, _08141514 @ =sub_814191C
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
movs r0, 0
pop {r1}
bx r1
@@ -3825,7 +3825,7 @@ _08141528:
b _08141550
_08141534:
ldr r0, _0814154C @ =sub_814191C
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08141550
@@ -3895,7 +3895,7 @@ _08141594:
.align 2, 0
_081415AC: .4byte gUnknown_841B747
_081415B0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081415BE
@@ -3934,7 +3934,7 @@ _081415D8:
.align 2, 0
_081415F4: .4byte gUnknown_841B76B
_081415F8:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08141606
@@ -3969,7 +3969,7 @@ _08141620:
strb r0, [r4]
b _08141646
_08141638:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08141646
@@ -3999,13 +3999,13 @@ _08141660:
ldrb r0, [r0]
bl sub_8141BA0
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _08141686
_08141678:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08141686
@@ -4032,13 +4032,13 @@ sub_8141690: @ 8141690
_081416A0:
bl sub_8141BE4
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
b _081416C0
_081416B2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081416C0
@@ -4073,21 +4073,21 @@ _081416E4:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3D
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x42
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x6
bl sub_80722CC
str r4, [r5, 0x24]
@@ -4115,10 +4115,10 @@ _0814173A:
lsls r1, 8
movs r0, 0x1
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldrh r1, [r5, 0x24]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
b _0814175A
_08141756:
movs r0, 0
@@ -4175,18 +4175,18 @@ _081417A4:
lsls r1, 8
movs r0, 0x1
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldrh r1, [r5, 0x24]
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
b _081417DC
_081417C0:
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
ldrb r0, [r4]
adds r0, 0x1
strb r0, [r4]
@@ -4209,9 +4209,9 @@ sub_81417E4: @ 81417E4
adds r4, r0, 0
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x1
movs r2, 0xF
@@ -4239,7 +4239,7 @@ sub_81417E4: @ 81417E4
sub_8141828: @ 8141828
push {lr}
movs r0, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
pop {r0}
bx r0
thumb_func_end sub_8141828
@@ -4398,7 +4398,7 @@ _08141952:
ldr r0, _08141980 @ =gUnknown_84664BC
movs r1, 0x60
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0
_0814195E:
adds r0, r4, 0
@@ -4406,7 +4406,7 @@ _0814195E:
cmp r0, 0
beq _08141978
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
lsls r1, r4, 16
lsrs r1, 16
movs r2, 0x6
@@ -4438,7 +4438,7 @@ _08141984:
adds r0, r1
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldrh r0, [r5, 0x4]
adds r0, 0x20
movs r1, 0x7F
@@ -4475,7 +4475,7 @@ _081419C6:
lsrs r1, 24
movs r0, 0x40
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _08141A2C
.align 2, 0
_081419FC: .4byte gUnknown_825E074
@@ -4500,7 +4500,7 @@ _08141A00:
lsrs r1, 24
movs r0, 0x40
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
_08141A2C:
movs r4, 0
ldr r5, _08141A4C @ =gUnknown_20375F8
@@ -4531,7 +4531,7 @@ _08141A5A:
cmp r0, 0
beq _08141A74
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
lsls r1, r4, 16
lsrs r1, 16
movs r2, 0x4
@@ -4543,10 +4543,10 @@ _08141A74:
ldr r0, _08141A94 @ =gUnknown_8465950
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_08141A84:
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -4554,12 +4554,12 @@ _08141A84:
.align 2, 0
_08141A94: .4byte gUnknown_8465950
_08141A98:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08141AA8
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08141AA8:
pop {r4,r5}
pop {r0}
@@ -4570,7 +4570,7 @@ _08141AA8:
sub_8141AB0: @ 8141AB0
push {lr}
ldr r0, _08141AD0 @ =sub_814191C
- bl sub_8077688
+ bl FindTaskIdByFunc
ldr r2, _08141AD4 @ =gUnknown_3005090
lsls r0, 24
lsrs r0, 24
@@ -4607,7 +4607,7 @@ sub_8141AD8: @ 8141AD8
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
- bl sub_810F948
+ bl MoveMenuCursorNoWrapAround
bl sub_814112C
movs r1, 0x1
str r1, [r0, 0x28]
@@ -4645,7 +4645,7 @@ sub_8141B34: @ 8141B34
bl sub_814112C
adds r4, r0, 0
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
mov r12, r0
movs r1, 0
movs r0, 0x44
@@ -4703,7 +4703,7 @@ sub_8141BA0: @ 8141BA0
bl sub_814112C
adds r4, r0, 0
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
adds r6, r0, 0
lsls r0, r5, 3
ldr r1, _08141BE0 @ =gUnknown_8466C40
@@ -4736,7 +4736,7 @@ sub_8141BE4: @ 8141BE4
bl sub_814112C
adds r4, r0, 0
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
adds r6, r0, 0
movs r1, 0
adds r7, r4, 0
diff --git a/asm/smokescreen.s b/asm/smokescreen.s
index aa307d1a9..883dffa18 100644
--- a/asm/smokescreen.s
+++ b/asm/smokescreen.s
@@ -20,7 +20,7 @@ sub_804A76C: @ 804A76C
lsrs r4, r2, 24
ldr r5, _0804A8A4 @ =gUnknown_825098C
ldrh r0, [r5, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
lsls r0, 16
ldr r1, _0804A8A8 @ =0xffff0000
cmp r0, r1
@@ -31,7 +31,7 @@ sub_804A76C: @ 804A76C
bl sub_800F078
_0804A79E:
ldr r0, _0804A8B0 @ =sub_804A8C0
- bl sub_8044EF8
+ bl CreateInvisibleSpriteWithCallback
mov r8, r0
mov r0, r8
lsls r0, 24
@@ -59,7 +59,7 @@ _0804A79E:
adds r1, r6, 0
adds r2, r4, 0
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -73,12 +73,12 @@ _0804A79E:
adds r0, 0x1
strh r0, [r5, 0x2E]
adds r0, r1, 0
- bl sub_8007824
+ bl AnimateSprite
mov r0, r9
mov r1, r10
adds r2, r4, 0
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -93,14 +93,14 @@ _0804A79E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
mov r0, r9
adds r1, r6, 0
adds r2, r7, 0
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -115,14 +115,14 @@ _0804A79E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
mov r0, r9
mov r1, r10
adds r2, r7, 0
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r4, r0, 4
@@ -137,9 +137,9 @@ _0804A79E:
strh r0, [r5, 0x2E]
adds r0, r4, 0
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
mov r0, r8
pop {r3-r5}
mov r8, r3
@@ -168,16 +168,16 @@ sub_804A8C0: @ 804A8C0
bne _0804A8F8
ldr r0, _0804A8EC @ =gUnknown_825098C
ldrh r0, [r0, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0804A8F0 @ =gUnknown_8250994
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r1, 0x30
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0804A8F4
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _0804A8F8
.align 2, 0
_0804A8EC: .4byte gUnknown_825098C
@@ -214,7 +214,7 @@ sub_804A904: @ 804A904
subs r1, 0x1
strh r1, [r0, 0x2E]
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_0804A92E:
pop {r0}
bx r0
diff --git a/asm/sound.s b/asm/sound.s
index c5cfd2be3..15d4a544c 100644
--- a/asm/sound.s
+++ b/asm/sound.s
@@ -5,21 +5,21 @@
.text
- thumb_func_start sub_8071938
-sub_8071938: @ 8071938
+ thumb_func_start InitMapMusic
+InitMapMusic: @ 8071938
push {lr}
ldr r1, _08071948 @ =gUnknown_3005080
movs r0, 0
strb r0, [r1]
- bl sub_8071A44
+ bl ResetMapMusic
pop {r0}
bx r0
.align 2, 0
_08071948: .4byte gUnknown_3005080
- thumb_func_end sub_8071938
+ thumb_func_end InitMapMusic
- thumb_func_start sub_807194C
-sub_807194C: @ 807194C
+ thumb_func_start MapMusicMain
+MapMusicMain: @ 807194C
push {r4,r5,lr}
ldr r0, _08071964 @ =gUnknown_3000FC4
ldrb r1, [r0]
@@ -49,12 +49,12 @@ _0807198C:
strb r0, [r2]
ldr r0, _0807199C @ =gUnknown_3000FC0
ldrh r0, [r0]
- bl sub_80722A0
+ bl PlayBGM
b _08071A2E
.align 2, 0
_0807199C: .4byte gUnknown_3000FC0
_080719A0:
- bl sub_8071DD4
+ bl IsBGMStopped
lsls r0, 24
cmp r0, 0
beq _08071A2E
@@ -68,11 +68,11 @@ _080719A0:
_080719B8: .4byte gUnknown_3000FC2
_080719BC: .4byte gUnknown_3000FC4
_080719C0:
- bl sub_8071DD4
+ bl IsBGMStopped
lsls r0, 24
cmp r0, 0
beq _08071A2E
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08071A2E
@@ -86,18 +86,18 @@ _080719C0:
movs r0, 0x2
strb r0, [r1]
ldrh r0, [r2]
- bl sub_80722A0
+ bl PlayBGM
b _08071A2E
.align 2, 0
_080719F0: .4byte gUnknown_3000FC0
_080719F4: .4byte gUnknown_3000FC2
_080719F8: .4byte gUnknown_3000FC4
_080719FC:
- bl sub_8071DD4
+ bl IsBGMStopped
lsls r0, 24
cmp r0, 0
beq _08071A2E
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _08071A2E
@@ -105,7 +105,7 @@ _080719FC:
ldrh r0, [r4]
ldr r5, _08071A38 @ =gUnknown_3000FC5
ldrb r1, [r5]
- bl sub_8071D10
+ bl FadeInNewBGM
ldr r1, _08071A3C @ =gUnknown_3000FC0
ldrh r0, [r4]
strh r0, [r1]
@@ -124,10 +124,10 @@ _08071A34: .4byte gUnknown_3000FC2
_08071A38: .4byte gUnknown_3000FC5
_08071A3C: .4byte gUnknown_3000FC0
_08071A40: .4byte gUnknown_3000FC4
- thumb_func_end sub_807194C
+ thumb_func_end MapMusicMain
- thumb_func_start sub_8071A44
-sub_8071A44: @ 8071A44
+ thumb_func_start ResetMapMusic
+ResetMapMusic: @ 8071A44
ldr r0, _08071A58 @ =gUnknown_3000FC0
movs r1, 0
strh r1, [r0]
@@ -143,19 +143,19 @@ _08071A58: .4byte gUnknown_3000FC0
_08071A5C: .4byte gUnknown_3000FC2
_08071A60: .4byte gUnknown_3000FC4
_08071A64: .4byte gUnknown_3000FC5
- thumb_func_end sub_8071A44
+ thumb_func_end ResetMapMusic
- thumb_func_start sub_8071A68
-sub_8071A68: @ 8071A68
+ thumb_func_start GetCurrentMapMusic
+GetCurrentMapMusic: @ 8071A68
ldr r0, _08071A70 @ =gUnknown_3000FC0
ldrh r0, [r0]
bx lr
.align 2, 0
_08071A70: .4byte gUnknown_3000FC0
- thumb_func_end sub_8071A68
+ thumb_func_end GetCurrentMapMusic
- thumb_func_start sub_8071A74
-sub_8071A74: @ 8071A74
+ thumb_func_start PlayNewMapMusic
+PlayNewMapMusic: @ 8071A74
ldr r1, _08071A88 @ =gUnknown_3000FC0
strh r0, [r1]
ldr r1, _08071A8C @ =gUnknown_3000FC2
@@ -169,10 +169,10 @@ sub_8071A74: @ 8071A74
_08071A88: .4byte gUnknown_3000FC0
_08071A8C: .4byte gUnknown_3000FC2
_08071A90: .4byte gUnknown_3000FC4
- thumb_func_end sub_8071A74
+ thumb_func_end PlayNewMapMusic
- thumb_func_start sub_8071A94
-sub_8071A94: @ 8071A94
+ thumb_func_start StopMapMusic
+StopMapMusic: @ 8071A94
ldr r0, _08071AA8 @ =gUnknown_3000FC0
movs r1, 0
strh r1, [r0]
@@ -186,19 +186,19 @@ sub_8071A94: @ 8071A94
_08071AA8: .4byte gUnknown_3000FC0
_08071AAC: .4byte gUnknown_3000FC2
_08071AB0: .4byte gUnknown_3000FC4
- thumb_func_end sub_8071A94
+ thumb_func_end StopMapMusic
- thumb_func_start sub_8071AB4
-sub_8071AB4: @ 8071AB4
+ thumb_func_start FadeOutMapMusic
+FadeOutMapMusic: @ 8071AB4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8071BA0
+ bl IsNotWaitingForBGMStop
lsls r0, 24
cmp r0, 0
beq _08071ACA
adds r0, r4, 0
- bl sub_8071DBC
+ bl FadeOutBGM
_08071ACA:
ldr r0, _08071AE0 @ =gUnknown_3000FC0
movs r1, 0
@@ -215,10 +215,10 @@ _08071ACA:
_08071AE0: .4byte gUnknown_3000FC0
_08071AE4: .4byte gUnknown_3000FC2
_08071AE8: .4byte gUnknown_3000FC4
- thumb_func_end sub_8071AB4
+ thumb_func_end FadeOutMapMusic
- thumb_func_start sub_8071AEC
-sub_8071AEC: @ 8071AEC
+ thumb_func_start FadeOutAndPlayNewMapMusic
+FadeOutAndPlayNewMapMusic: @ 8071AEC
push {r4,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -226,7 +226,7 @@ sub_8071AEC: @ 8071AEC
lsrs r4, 16
lsls r0, 24
lsrs r0, 24
- bl sub_8071AB4
+ bl FadeOutMapMusic
ldr r1, _08071B14 @ =gUnknown_3000FC0
movs r0, 0
strh r0, [r1]
@@ -242,10 +242,10 @@ sub_8071AEC: @ 8071AEC
_08071B14: .4byte gUnknown_3000FC0
_08071B18: .4byte gUnknown_3000FC2
_08071B1C: .4byte gUnknown_3000FC4
- thumb_func_end sub_8071AEC
+ thumb_func_end FadeOutAndPlayNewMapMusic
- thumb_func_start sub_8071B20
-sub_8071B20: @ 8071B20
+ thumb_func_start FadeOutAndFadeInNewMapMusic
+FadeOutAndFadeInNewMapMusic: @ 8071B20
push {r4,r5,lr}
adds r4, r0, 0
adds r0, r1, 0
@@ -256,7 +256,7 @@ sub_8071B20: @ 8071B20
lsrs r0, 24
lsls r5, 24
lsrs r5, 24
- bl sub_8071AB4
+ bl FadeOutMapMusic
ldr r1, _08071B54 @ =gUnknown_3000FC0
movs r0, 0
strh r0, [r1]
@@ -275,10 +275,10 @@ _08071B54: .4byte gUnknown_3000FC0
_08071B58: .4byte gUnknown_3000FC2
_08071B5C: .4byte gUnknown_3000FC4
_08071B60: .4byte gUnknown_3000FC5
- thumb_func_end sub_8071B20
+ thumb_func_end FadeOutAndFadeInNewMapMusic
- thumb_func_start sub_8071B64
-sub_8071B64: @ 8071B64
+ thumb_func_start FadeInNewMapMusic
+FadeInNewMapMusic: @ 8071B64
push {r4,lr}
adds r4, r0, 0
lsls r4, 16
@@ -286,7 +286,7 @@ sub_8071B64: @ 8071B64
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8071D10
+ bl FadeInNewBGM
ldr r0, _08071B90 @ =gUnknown_3000FC0
strh r4, [r0]
ldr r0, _08071B94 @ =gUnknown_3000FC2
@@ -305,10 +305,10 @@ _08071B90: .4byte gUnknown_3000FC0
_08071B94: .4byte gUnknown_3000FC2
_08071B98: .4byte gUnknown_3000FC4
_08071B9C: .4byte gUnknown_3000FC5
- thumb_func_end sub_8071B64
+ thumb_func_end FadeInNewMapMusic
- thumb_func_start sub_8071BA0
-sub_8071BA0: @ 8071BA0
+ thumb_func_start IsNotWaitingForBGMStop
+IsNotWaitingForBGMStop: @ 8071BA0
push {lr}
ldr r0, _08071BB8 @ =gUnknown_3000FC4
ldrb r0, [r0]
@@ -327,7 +327,7 @@ _08071BBC:
_08071BBE:
pop {r1}
bx r1
- thumb_func_end sub_8071BA0
+ thumb_func_end IsNotWaitingForBGMStop
thumb_func_start sub_8071BC4
sub_8071BC4: @ 8071BC4
@@ -366,8 +366,8 @@ _08071C08: .4byte gUnknown_83AC990
_08071C0C: .4byte gUnknown_3000FC6
thumb_func_end sub_8071BC4
- thumb_func_start sub_8071C10
-sub_8071C10: @ 8071C10
+ thumb_func_start WaitFanfare
+WaitFanfare: @ 8071C10
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -397,10 +397,10 @@ _08071C42:
_08071C44:
pop {r1}
bx r1
- thumb_func_end sub_8071C10
+ thumb_func_end WaitFanfare
- thumb_func_start sub_8071C48
-sub_8071C48: @ 8071C48
+ thumb_func_start StopFanfareByFanfareNum
+StopFanfareByFanfareNum: @ 8071C48
push {lr}
lsls r0, 24
ldr r1, _08071C5C @ =gUnknown_83AC990
@@ -412,10 +412,10 @@ sub_8071C48: @ 8071C48
bx r0
.align 2, 0
_08071C5C: .4byte gUnknown_83AC990
- thumb_func_end sub_8071C48
+ thumb_func_end StopFanfareByFanfareNum
- thumb_func_start sub_8071C60
-sub_8071C60: @ 8071C60
+ thumb_func_start PlayFanfare
+PlayFanfare: @ 8071C60
push {lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -428,7 +428,7 @@ _08071C6A:
lsls r0, r1, 24
lsrs r0, 24
bl sub_8071BC4
- bl sub_8071CEC
+ bl CreateFanfareTask
b _08071C96
.align 2, 0
_08071C80: .4byte gUnknown_83AC990
@@ -439,17 +439,17 @@ _08071C84:
bls _08071C6A
movs r0, 0
bl sub_8071BC4
- bl sub_8071CEC
+ bl CreateFanfareTask
_08071C96:
pop {r0}
bx r0
- thumb_func_end sub_8071C60
+ thumb_func_end PlayFanfare
- thumb_func_start sub_8071C9C
-sub_8071C9C: @ 8071C9C
+ thumb_func_start IsFanfareTaskInactive
+IsFanfareTaskInactive: @ 8071C9C
push {lr}
- ldr r0, _08071CB0 @ =sub_8071CBC
- bl sub_8077650
+ ldr r0, _08071CB0 @ =Task_Fanfare
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -457,16 +457,16 @@ sub_8071C9C: @ 8071C9C
movs r0, 0x1
b _08071CB6
.align 2, 0
-_08071CB0: .4byte sub_8071CBC
+_08071CB0: .4byte Task_Fanfare
_08071CB4:
movs r0, 0
_08071CB6:
pop {r1}
bx r1
- thumb_func_end sub_8071C9C
+ thumb_func_end IsFanfareTaskInactive
- thumb_func_start sub_8071CBC
-sub_8071CBC: @ 8071CBC
+ thumb_func_start Task_Fanfare
+Task_Fanfare: @ 8071CBC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -483,38 +483,38 @@ _08071CD4:
ldr r0, _08071CE8 @ =gMPlay_BGM
bl m4aMPlayContinue
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08071CE0:
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08071CE8: .4byte gMPlay_BGM
- thumb_func_end sub_8071CBC
+ thumb_func_end Task_Fanfare
- thumb_func_start sub_8071CEC
-sub_8071CEC: @ 8071CEC
+ thumb_func_start CreateFanfareTask
+CreateFanfareTask: @ 8071CEC
push {r4,lr}
- ldr r4, _08071D0C @ =sub_8071CBC
+ ldr r4, _08071D0C @ =Task_Fanfare
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08071D06
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_08071D06:
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_08071D0C: .4byte sub_8071CBC
- thumb_func_end sub_8071CEC
+_08071D0C: .4byte Task_Fanfare
+ thumb_func_end CreateFanfareTask
- thumb_func_start sub_8071D10
-sub_8071D10: @ 8071D10
+ thumb_func_start FadeInNewBGM
+FadeInNewBGM: @ 8071D10
push {r4-r7,lr}
lsls r0, 16
lsrs r5, r0, 16
@@ -552,10 +552,10 @@ _08071D2C:
_08071D58: .4byte gUnknown_3005080
_08071D5C: .4byte 0x0000ffff
_08071D60: .4byte gMPlay_BGM
- thumb_func_end sub_8071D10
+ thumb_func_end FadeInNewBGM
- thumb_func_start sub_8071D64
-sub_8071D64: @ 8071D64
+ thumb_func_start FadeOutBGMTemporarily
+FadeOutBGMTemporarily: @ 8071D64
push {lr}
adds r1, r0, 0
lsls r1, 24
@@ -566,10 +566,10 @@ sub_8071D64: @ 8071D64
bx r0
.align 2, 0
_08071D78: .4byte gMPlay_BGM
- thumb_func_end sub_8071D64
+ thumb_func_end FadeOutBGMTemporarily
- thumb_func_start sub_8071D7C
-sub_8071D7C: @ 8071D7C
+ thumb_func_start IsBGMPausedOrStopped
+IsBGMPausedOrStopped: @ 8071D7C
push {lr}
ldr r0, _08071D94 @ =gMPlay_BGM
ldr r1, [r0, 0x4]
@@ -589,10 +589,10 @@ _08071D9C:
_08071D9E:
pop {r1}
bx r1
- thumb_func_end sub_8071D7C
+ thumb_func_end IsBGMPausedOrStopped
- thumb_func_start sub_8071DA4
-sub_8071DA4: @ 8071DA4
+ thumb_func_start FadeInBGM
+FadeInBGM: @ 8071DA4
push {lr}
adds r1, r0, 0
lsls r1, 24
@@ -603,10 +603,10 @@ sub_8071DA4: @ 8071DA4
bx r0
.align 2, 0
_08071DB8: .4byte gMPlay_BGM
- thumb_func_end sub_8071DA4
+ thumb_func_end FadeInBGM
- thumb_func_start sub_8071DBC
-sub_8071DBC: @ 8071DBC
+ thumb_func_start FadeOutBGM
+FadeOutBGM: @ 8071DBC
push {lr}
adds r1, r0, 0
lsls r1, 24
@@ -617,10 +617,10 @@ sub_8071DBC: @ 8071DBC
bx r0
.align 2, 0
_08071DD0: .4byte gMPlay_BGM
- thumb_func_end sub_8071DBC
+ thumb_func_end FadeOutBGM
- thumb_func_start sub_8071DD4
-sub_8071DD4: @ 8071DD4
+ thumb_func_start IsBGMStopped
+IsBGMStopped: @ 8071DD4
push {lr}
ldr r0, _08071DE4 @ =gMPlay_BGM
ldrh r0, [r0, 0x4]
@@ -635,10 +635,10 @@ _08071DE8:
_08071DEA:
pop {r1}
bx r1
- thumb_func_end sub_8071DD4
+ thumb_func_end IsBGMStopped
- thumb_func_start sub_8071DF0
-sub_8071DF0: @ 8071DF0
+ thumb_func_start PlayCry1
+PlayCry1: @ 8071DF0
push {r4,r5,lr}
sub sp, 0x4
adds r5, r0, 0
@@ -663,7 +663,7 @@ sub_8071DF0: @ 8071DF0
ldr r1, _08071E38 @ =gUnknown_2037ED0
movs r0, 0x2
strb r0, [r1]
- bl sub_807227C
+ bl RestoreBGMVolumeAfterPokemonCry
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -672,10 +672,10 @@ sub_8071DF0: @ 8071DF0
_08071E30: .4byte gMPlay_BGM
_08071E34: .4byte 0x0000ffff
_08071E38: .4byte gUnknown_2037ED0
- thumb_func_end sub_8071DF0
+ thumb_func_end PlayCry1
- thumb_func_start sub_8071E3C
-sub_8071E3C: @ 8071E3C
+ thumb_func_start PlayCry2
+PlayCry2: @ 8071E3C
push {r4,lr}
sub sp, 0x4
lsls r0, 16
@@ -693,10 +693,10 @@ sub_8071E3C: @ 8071E3C
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8071E3C
+ thumb_func_end PlayCry2
- thumb_func_start sub_8071E60
-sub_8071E60: @ 8071E60
+ thumb_func_start PlayCry3
+PlayCry3: @ 8071E60
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 16
@@ -730,7 +730,7 @@ _08071E86:
ldr r1, _08071EBC @ =gUnknown_2037ED0
movs r0, 0x2
strb r0, [r1]
- bl sub_807227C
+ bl RestoreBGMVolumeAfterPokemonCry
_08071EAA:
add sp, 0x4
pop {r4-r6}
@@ -740,10 +740,10 @@ _08071EAA:
_08071EB4: .4byte gMPlay_BGM
_08071EB8: .4byte 0x0000ffff
_08071EBC: .4byte gUnknown_2037ED0
- thumb_func_end sub_8071E60
+ thumb_func_end PlayCry3
- thumb_func_start sub_8071EC0
-sub_8071EC0: @ 8071EC0
+ thumb_func_start PlayCry4
+PlayCry4: @ 8071EC0
push {r4-r6,lr}
sub sp, 0x4
lsls r0, 16
@@ -792,7 +792,7 @@ _08071F10:
_08071F18: .4byte gUnknown_2022B4C
_08071F1C: .4byte gMPlay_BGM
_08071F20: .4byte 0x0000ffff
- thumb_func_end sub_8071EC0
+ thumb_func_end PlayCry4
thumb_func_start sub_8071F24
sub_8071F24: @ 8071F24
@@ -823,7 +823,7 @@ _08071F56:
ldr r1, _08071F74 @ =gUnknown_2037ED0
movs r0, 0x2
strb r0, [r1]
- bl sub_807227C
+ bl RestoreBGMVolumeAfterPokemonCry
add sp, 0x4
pop {r4,r5}
pop {r0}
@@ -993,7 +993,7 @@ _0807208A:
ldr r0, [sp]
bl SetPokemonCryPriority
adds r0, r7, 0
- bl sub_8043304
+ bl SpeciesToCryId
adds r7, r0, 0
movs r1, 0x7F
ands r1, r7
@@ -1108,11 +1108,11 @@ _08072198: .4byte gUnknown_848DB14
_0807219C: .4byte gUnknown_2037ECC
thumb_func_end sub_8071F78
- thumb_func_start sub_80721A0
-sub_80721A0: @ 80721A0
+ thumb_func_start IsCryFinished
+IsCryFinished: @ 80721A0
push {lr}
- ldr r0, _080721B8 @ =sub_8072234
- bl sub_8077650
+ ldr r0, _080721B8 @ =Task_DuckBGMForPokemonCry
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1121,16 +1121,16 @@ sub_80721A0: @ 80721A0
movs r0, 0x1
b _080721BE
.align 2, 0
-_080721B8: .4byte sub_8072234
+_080721B8: .4byte Task_DuckBGMForPokemonCry
_080721BC:
movs r0, 0
_080721BE:
pop {r1}
bx r1
- thumb_func_end sub_80721A0
+ thumb_func_end IsCryFinished
- thumb_func_start sub_80721C4
-sub_80721C4: @ 80721C4
+ thumb_func_start StopCryAndClearCrySongs
+StopCryAndClearCrySongs: @ 80721C4
push {lr}
ldr r0, _080721D8 @ =gUnknown_2037ECC
ldr r0, [r0]
@@ -1140,10 +1140,10 @@ sub_80721C4: @ 80721C4
bx r0
.align 2, 0
_080721D8: .4byte gUnknown_2037ECC
- thumb_func_end sub_80721C4
+ thumb_func_end StopCryAndClearCrySongs
- thumb_func_start sub_80721DC
-sub_80721DC: @ 80721DC
+ thumb_func_start StopCry
+StopCry: @ 80721DC
push {lr}
ldr r0, _080721EC @ =gUnknown_2037ECC
ldr r0, [r0]
@@ -1152,10 +1152,10 @@ sub_80721DC: @ 80721DC
bx r0
.align 2, 0
_080721EC: .4byte gUnknown_2037ECC
- thumb_func_end sub_80721DC
+ thumb_func_end StopCry
- thumb_func_start sub_80721F0
-sub_80721F0: @ 80721F0
+ thumb_func_start IsCryPlayingOrClearCrySongs
+IsCryPlayingOrClearCrySongs: @ 80721F0
push {lr}
ldr r0, _08072208 @ =gUnknown_2037ECC
ldr r0, [r0]
@@ -1172,10 +1172,10 @@ _0807220C:
_0807220E:
pop {r1}
bx r1
- thumb_func_end sub_80721F0
+ thumb_func_end IsCryPlayingOrClearCrySongs
- thumb_func_start sub_8072214
-sub_8072214: @ 8072214
+ thumb_func_start IsCryPlaying
+IsCryPlaying: @ 8072214
push {lr}
ldr r0, _08072228 @ =gUnknown_2037ECC
ldr r0, [r0]
@@ -1191,10 +1191,10 @@ _0807222C:
_0807222E:
pop {r1}
bx r1
- thumb_func_end sub_8072214
+ thumb_func_end IsCryPlaying
- thumb_func_start sub_8072234
-sub_8072234: @ 8072234
+ thumb_func_start Task_DuckBGMForPokemonCry
+Task_DuckBGMForPokemonCry: @ 8072234
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -1219,7 +1219,7 @@ _0807224C:
lsls r2, 1
bl m4aMPlayVolumeControl
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0807226A:
pop {r4}
pop {r0}
@@ -1228,31 +1228,31 @@ _0807226A:
_08072270: .4byte gUnknown_2037ECC
_08072274: .4byte gMPlay_BGM
_08072278: .4byte 0x0000ffff
- thumb_func_end sub_8072234
+ thumb_func_end Task_DuckBGMForPokemonCry
- thumb_func_start sub_807227C
-sub_807227C: @ 807227C
+ thumb_func_start RestoreBGMVolumeAfterPokemonCry
+RestoreBGMVolumeAfterPokemonCry: @ 807227C
push {r4,lr}
- ldr r4, _0807229C @ =sub_8072234
+ ldr r4, _0807229C @ =Task_DuckBGMForPokemonCry
adds r0, r4, 0
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
beq _08072296
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
_08072296:
pop {r4}
pop {r0}
bx r0
.align 2, 0
-_0807229C: .4byte sub_8072234
- thumb_func_end sub_807227C
+_0807229C: .4byte Task_DuckBGMForPokemonCry
+ thumb_func_end RestoreBGMVolumeAfterPokemonCry
- thumb_func_start sub_80722A0
-sub_80722A0: @ 80722A0
+ thumb_func_start PlayBGM
+PlayBGM: @ 80722A0
push {lr}
lsls r0, 16
lsrs r1, r0, 16
@@ -1274,7 +1274,7 @@ _080722B8:
.align 2, 0
_080722C4: .4byte gUnknown_3005080
_080722C8: .4byte 0x0000ffff
- thumb_func_end sub_80722A0
+ thumb_func_end PlayBGM
thumb_func_start sub_80722CC
sub_80722CC: @ 80722CC
@@ -1299,8 +1299,8 @@ _080722EC: .4byte gUnknown_2031DD8
_080722F0: .4byte gUnknown_203ADFA
thumb_func_end sub_80722CC
- thumb_func_start sub_80722F4
-sub_80722F4: @ 80722F4
+ thumb_func_start PlaySE12WithPanning
+PlaySE12WithPanning: @ 80722F4
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1336,10 +1336,10 @@ sub_80722F4: @ 80722F4
_0807233C: .4byte gMPlay_SE1
_08072340: .4byte gMPlay_SE2
_08072344: .4byte 0x0000ffff
- thumb_func_end sub_80722F4
+ thumb_func_end PlaySE12WithPanning
- thumb_func_start sub_8072348
-sub_8072348: @ 8072348
+ thumb_func_start PlaySE1WithPanning
+PlaySE1WithPanning: @ 8072348
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 16
@@ -1362,10 +1362,10 @@ sub_8072348: @ 8072348
.align 2, 0
_08072374: .4byte gMPlay_SE1
_08072378: .4byte 0x0000ffff
- thumb_func_end sub_8072348
+ thumb_func_end PlaySE1WithPanning
- thumb_func_start sub_807237C
-sub_807237C: @ 807237C
+ thumb_func_start PlaySE2WithPanning
+PlaySE2WithPanning: @ 807237C
push {r4,r5,lr}
adds r4, r1, 0
lsls r0, 16
@@ -1388,10 +1388,10 @@ sub_807237C: @ 807237C
.align 2, 0
_080723A8: .4byte gMPlay_SE2
_080723AC: .4byte 0x0000ffff
- thumb_func_end sub_807237C
+ thumb_func_end PlaySE2WithPanning
- thumb_func_start sub_80723B0
-sub_80723B0: @ 80723B0
+ thumb_func_start SE12PanpotControl
+SE12PanpotControl: @ 80723B0
push {r4,r5,lr}
adds r4, r0, 0
ldr r0, _080723D4 @ =gMPlay_SE1
@@ -1412,10 +1412,10 @@ sub_80723B0: @ 80723B0
_080723D4: .4byte gMPlay_SE1
_080723D8: .4byte 0x0000ffff
_080723DC: .4byte gMPlay_SE2
- thumb_func_end sub_80723B0
+ thumb_func_end SE12PanpotControl
- thumb_func_start sub_80723E0
-sub_80723E0: @ 80723E0
+ thumb_func_start IsSEPlaying
+IsSEPlaying: @ 80723E0
push {lr}
ldr r0, _08072410 @ =gMPlay_SE1
ldr r1, [r0, 0x4]
@@ -1451,10 +1451,10 @@ _0807241C:
_0807241E:
pop {r1}
bx r1
- thumb_func_end sub_80723E0
+ thumb_func_end IsSEPlaying
- thumb_func_start sub_8072424
-sub_8072424: @ 8072424
+ thumb_func_start IsBGMPlaying
+IsBGMPlaying: @ 8072424
push {lr}
ldr r0, _0807243C @ =gMPlay_BGM
ldr r1, [r0, 0x4]
@@ -1474,10 +1474,10 @@ _08072444:
_08072446:
pop {r1}
bx r1
- thumb_func_end sub_8072424
+ thumb_func_end IsBGMPlaying
- thumb_func_start sub_807244C
-sub_807244C: @ 807244C
+ thumb_func_start IsSpecialSEPlaying
+IsSpecialSEPlaying: @ 807244C
push {lr}
ldr r0, _08072464 @ =gMPlay_SE3
ldr r1, [r0, 0x4]
@@ -1497,7 +1497,7 @@ _0807246C:
_0807246E:
pop {r1}
bx r1
- thumb_func_end sub_807244C
+ thumb_func_end IsSpecialSEPlaying
thumb_func_start sub_8072474
sub_8072474: @ 8072474
diff --git a/asm/sprite.s b/asm/sprite.s
index de75b0b31..36ac6539d 100644
--- a/asm/sprite.s
+++ b/asm/sprite.s
@@ -5,16 +5,16 @@
.text
- thumb_func_start sub_8006B10
-sub_8006B10: @ 8006B10
+ thumb_func_start ResetSpriteData
+ResetSpriteData: @ 8006B10
push {r4,lr}
movs r0, 0
movs r1, 0x80
- bl sub_80072E8
- bl sub_8007770
- bl sub_8007350
- bl sub_8008560
- bl sub_80087C4
+ bl ResetOamRange
+ bl ResetAllSprites
+ bl ClearSpriteCopyRequests
+ bl ResetAffineAnimData
+ bl FreeSpriteTileRanges
ldr r1, _08006B4C @ =gUnknown_2021B44
movs r0, 0x40
strb r0, [r1]
@@ -22,7 +22,7 @@ sub_8006B10: @ 8006B10
movs r4, 0
strh r4, [r0]
movs r0, 0
- bl sub_8007434
+ bl AllocSpriteTiles
ldr r0, _08006B54 @ =gUnknown_2021BC8
strh r4, [r0]
ldr r0, _08006B58 @ =gUnknown_2021BCA
@@ -35,10 +35,10 @@ _08006B4C: .4byte gUnknown_2021B44
_08006B50: .4byte gUnknown_2021B46
_08006B54: .4byte gUnknown_2021BC8
_08006B58: .4byte gUnknown_2021BCA
- thumb_func_end sub_8006B10
+ thumb_func_end ResetSpriteData
- thumb_func_start sub_8006B5C
-sub_8006B5C: @ 8006B5C
+ thumb_func_start AnimateSprites
+AnimateSprites: @ 8006B5C
push {r4-r7,lr}
movs r6, 0
movs r7, 0x1
@@ -64,7 +64,7 @@ _08006B62:
cmp r0, 0
beq _08006B92
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
_08006B92:
adds r0, r6, 0x1
lsls r0, 24
@@ -76,14 +76,14 @@ _08006B92:
bx r0
.align 2, 0
_08006BA4: .4byte gUnknown_202063C
- thumb_func_end sub_8006B5C
+ thumb_func_end AnimateSprites
- thumb_func_start sub_8006BA8
-sub_8006BA8: @ 8006BA8
+ thumb_func_start BuildOamBuffer
+BuildOamBuffer: @ 8006BA8
push {r4,r5,lr}
- bl sub_8006BF4
- bl sub_8006CB8
- bl sub_8006CF8
+ bl UpdateOamCoords
+ bl BuildSpritePriorities
+ bl SortSprites
ldr r5, _08006BE8 @ =gUnknown_30030F0
ldr r0, _08006BEC @ =0x00000439
adds r5, r0
@@ -93,8 +93,8 @@ sub_8006BA8: @ 8006BA8
movs r1, 0x1
orrs r0, r1
strb r0, [r5]
- bl sub_8006F04
- bl sub_8006EB8
+ bl AddSpritesToOamBuffer
+ bl CopyMatricesToOamBuffer
movs r2, 0x1
ldrb r1, [r5]
movs r0, 0x2
@@ -111,10 +111,10 @@ sub_8006BA8: @ 8006BA8
_08006BE8: .4byte gUnknown_30030F0
_08006BEC: .4byte 0x00000439
_08006BF0: .4byte gUnknown_2021840
- thumb_func_end sub_8006BA8
+ thumb_func_end BuildOamBuffer
- thumb_func_start sub_8006BF4
-sub_8006BF4: @ 8006BF4
+ thumb_func_start UpdateOamCoords
+UpdateOamCoords: @ 8006BF4
push {r4-r7,lr}
movs r4, 0
ldr r7, _08006C60 @ =gUnknown_202063C
@@ -211,10 +211,10 @@ _08006CA6:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8006BF4
+ thumb_func_end UpdateOamCoords
- thumb_func_start sub_8006CB8
-sub_8006CB8: @ 8006CB8
+ thumb_func_start BuildSpritePriorities
+BuildSpritePriorities: @ 8006CB8
push {r4,lr}
movs r2, 0
ldr r4, _08006CF0 @ =gUnknown_202063C
@@ -246,10 +246,10 @@ _08006CC0:
.align 2, 0
_08006CF0: .4byte gUnknown_202063C
_08006CF4: .4byte gUnknown_2021780
- thumb_func_end sub_8006CB8
+ thumb_func_end BuildSpritePriorities
- thumb_func_start sub_8006CF8
-sub_8006CF8: @ 8006CF8
+ thumb_func_start SortSprites
+SortSprites: @ 8006CF8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -486,10 +486,10 @@ _08006EA0:
.align 2, 0
_08006EB0: .4byte gUnknown_202063C
_08006EB4: .4byte gUnknown_2021780
- thumb_func_end sub_8006CF8
+ thumb_func_end SortSprites
- thumb_func_start sub_8006EB8
-sub_8006EB8: @ 8006EB8
+ thumb_func_start CopyMatricesToOamBuffer
+CopyMatricesToOamBuffer: @ 8006EB8
push {r4-r6,lr}
movs r4, 0
ldr r5, _08006EFC @ =gUnknown_30030F0
@@ -528,10 +528,10 @@ _08006EC0:
.align 2, 0
_08006EFC: .4byte gUnknown_30030F0
_08006F00: .4byte gUnknown_2021BCC
- thumb_func_end sub_8006EB8
+ thumb_func_end CopyMatricesToOamBuffer
- thumb_func_start sub_8006F04
-sub_8006F04: @ 8006F04
+ thumb_func_start AddSpritesToOamBuffer
+AddSpritesToOamBuffer: @ 8006F04
push {r4-r6,lr}
sub sp, 0x4
movs r4, 0
@@ -555,7 +555,7 @@ _08006F0E:
bne _08006F3A
adds r0, r2, 0
mov r1, sp
- bl sub_8008A64
+ bl AddSpriteToOamBuffer
lsls r0, 24
cmp r0, 0
bne _08006F70
@@ -599,10 +599,10 @@ _08006F7C: .4byte gUnknown_202063C
_08006F80: .4byte gUnknown_2021B44
_08006F84: .4byte gUnknown_3003128
_08006F88: .4byte gUnknown_8231CE4
- thumb_func_end sub_8006F04
+ thumb_func_end AddSpritesToOamBuffer
- thumb_func_start sub_8006F8C
-sub_8006F8C: @ 8006F8C
+ thumb_func_start CreateSprite
+CreateSprite: @ 8006F8C
push {r4-r7,lr}
sub sp, 0x4
adds r7, r0, 0
@@ -628,7 +628,7 @@ _08006FA0:
adds r1, r7, 0
asrs r2, r5, 16
asrs r3, r6, 16
- bl sub_8007094
+ bl CreateSpriteAt
lsls r0, 24
lsrs r0, 24
b _08006FD8
@@ -646,10 +646,10 @@ _08006FD8:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8006F8C
+ thumb_func_end CreateSprite
- thumb_func_start sub_8006FE0
-sub_8006FE0: @ 8006FE0
+ thumb_func_start CreateSpriteAtEnd
+CreateSpriteAtEnd: @ 8006FE0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -683,7 +683,7 @@ _08006FFE:
adds r1, r7, 0
asrs r2, r4, 16
asrs r3, r5, 16
- bl sub_8007094
+ bl CreateSpriteAt
lsls r0, 24
lsrs r0, 24
b _0800703E
@@ -704,17 +704,17 @@ _0800703E:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8006FE0
+ thumb_func_end CreateSpriteAtEnd
- thumb_func_start sub_800704C
-sub_800704C: @ 800704C
+ thumb_func_start CreateInvisibleSprite
+CreateInvisibleSprite: @ 800704C
push {r4-r6,lr}
adds r6, r0, 0
ldr r0, _08007084 @ =gUnknown_8231D00
movs r1, 0
movs r2, 0
movs r3, 0x1F
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x40
@@ -743,10 +743,10 @@ _0800708E:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_800704C
+ thumb_func_end CreateInvisibleSprite
- thumb_func_start sub_8007094
-sub_8007094: @ 8007094
+ thumb_func_start CreateSpriteAt
+CreateSpriteAt: @ 8007094
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -771,7 +771,7 @@ sub_8007094: @ 8007094
ldr r1, _08007158 @ =gUnknown_202063C
adds r7, r0, r1
adds r0, r7, 0
- bl sub_80073DC
+ bl ResetSprite
adds r2, r7, 0
adds r2, 0x3E
ldrb r0, [r2]
@@ -816,7 +816,7 @@ sub_8007094: @ 8007094
lsls r3, 30
lsrs r3, 30
adds r0, r7, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
mov r0, r8
ldrh r1, [r0]
ldr r4, _0800715C @ =0xffff0000
@@ -830,7 +830,7 @@ sub_8007094: @ 8007094
lsrs r0, 5
lsls r0, 24
lsrs r0, 24
- bl sub_8007434
+ bl AllocSpriteTiles
lsls r0, 16
lsrs r2, r0, 16
asrs r0, 16
@@ -838,7 +838,7 @@ sub_8007094: @ 8007094
cmp r0, r1
bne _08007160
adds r0, r7, 0
- bl sub_80073DC
+ bl ResetSprite
movs r0, 0x40
b _080071D8
.align 2, 0
@@ -871,12 +871,12 @@ _0800718C: .4byte 0xfffffc00
_08007190:
mov r1, r8
ldrh r0, [r1]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
adds r1, r7, 0
adds r1, 0x40
strh r0, [r1]
adds r0, r7, 0
- bl sub_8008508
+ bl SetSpriteSheetFrameTileNum
_080071A4:
ldrb r0, [r7, 0x1]
lsls r0, 30
@@ -886,7 +886,7 @@ _080071A4:
cmp r0, 0
beq _080071B8
adds r0, r7, 0
- bl sub_800860C
+ bl InitSpriteAffineAnim
_080071B8:
mov r0, r8
ldrh r1, [r0, 0x2]
@@ -895,7 +895,7 @@ _080071B8:
beq _080071D6
mov r1, r8
ldrh r0, [r1, 0x2]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 4
ldrb r2, [r7, 0x5]
movs r1, 0xF
@@ -914,10 +914,10 @@ _080071D8:
bx r1
.align 2, 0
_080071E8: .4byte 0x0000ffff
- thumb_func_end sub_8007094
+ thumb_func_end CreateSpriteAt
- thumb_func_start sub_80071EC
-sub_80071EC: @ 80071EC
+ thumb_func_start CreateSpriteAndAnimate
+CreateSpriteAndAnimate: @ 80071EC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -953,7 +953,7 @@ _0800720C:
asrs r2, r3, 16
mov r5, r8
asrs r3, r5, 16
- bl sub_8007094
+ bl CreateSpriteAt
lsls r0, 24
lsrs r0, 24
adds r5, r0, 0
@@ -969,7 +969,7 @@ _0800720C:
cmp r0, 0
beq _08007258
adds r0, r4, 0
- bl sub_8007824
+ bl AnimateSprite
_08007258:
adds r0, r5, 0
b _08007270
@@ -993,10 +993,10 @@ _08007270:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80071EC
+ thumb_func_end CreateSpriteAndAnimate
- thumb_func_start sub_8007280
-sub_8007280: @ 8007280
+ thumb_func_start DestroySprite
+DestroySprite: @ 8007280
push {r4-r7,lr}
adds r5, r0, 0
adds r0, 0x3E
@@ -1043,17 +1043,17 @@ _080072BA:
bcc _080072BA
_080072D6:
adds r0, r5, 0
- bl sub_80073DC
+ bl ResetSprite
_080072DC:
pop {r4-r7}
pop {r0}
bx r0
.align 2, 0
_080072E4: .4byte gUnknown_2021B48
- thumb_func_end sub_8007280
+ thumb_func_end DestroySprite
- thumb_func_start sub_80072E8
-sub_80072E8: @ 80072E8
+ thumb_func_start ResetOamRange
+ResetOamRange: @ 80072E8
push {r4-r6,lr}
lsls r0, 24
lsls r1, 24
@@ -1082,10 +1082,10 @@ _08007310:
.align 2, 0
_08007318: .4byte gUnknown_3003128
_0800731C: .4byte gUnknown_8231CE4
- thumb_func_end sub_80072E8
+ thumb_func_end ResetOamRange
- thumb_func_start sub_8007320
-sub_8007320: @ 8007320
+ thumb_func_start LoadOam
+LoadOam: @ 8007320
push {lr}
ldr r2, _08007344 @ =gUnknown_30030F0
ldr r1, _08007348 @ =0x00000439
@@ -1108,10 +1108,10 @@ _08007340:
_08007344: .4byte gUnknown_30030F0
_08007348: .4byte 0x00000439
_0800734C: .4byte 0x04000100
- thumb_func_end sub_8007320
+ thumb_func_end LoadOam
- thumb_func_start sub_8007350
-sub_8007350: @ 8007350
+ thumb_func_start ClearSpriteCopyRequests
+ClearSpriteCopyRequests: @ 8007350
push {r4,r5,lr}
ldr r0, _08007384 @ =gUnknown_2021840
movs r1, 0
@@ -1143,10 +1143,10 @@ _08007364:
_08007384: .4byte gUnknown_2021840
_08007388: .4byte gUnknown_2021841
_0800738C: .4byte gUnknown_2021844
- thumb_func_end sub_8007350
+ thumb_func_end ClearSpriteCopyRequests
- thumb_func_start sub_8007390
-sub_8007390: @ 8007390
+ thumb_func_start ResetOamMatrices
+ResetOamMatrices: @ 8007390
push {r4,lr}
movs r1, 0
ldr r4, _080073B8 @ =gUnknown_2021BCC
@@ -1170,10 +1170,10 @@ _0800739C:
bx r0
.align 2, 0
_080073B8: .4byte gUnknown_2021BCC
- thumb_func_end sub_8007390
+ thumb_func_end ResetOamMatrices
- thumb_func_start sub_80073BC
-sub_80073BC: @ 80073BC
+ thumb_func_start SetOamMatrix
+SetOamMatrix: @ 80073BC
push {r4,r5,lr}
ldr r5, [sp, 0xC]
lsls r0, 24
@@ -1189,10 +1189,10 @@ sub_80073BC: @ 80073BC
bx r0
.align 2, 0
_080073D8: .4byte gUnknown_2021BCC
- thumb_func_end sub_80073BC
+ thumb_func_end SetOamMatrix
- thumb_func_start sub_80073DC
-sub_80073DC: @ 80073DC
+ thumb_func_start ResetSprite
+ResetSprite: @ 80073DC
push {lr}
ldr r1, _080073EC @ =gUnknown_8231CA0
movs r2, 0x44
@@ -1201,10 +1201,10 @@ sub_80073DC: @ 80073DC
bx r0
.align 2, 0
_080073EC: .4byte gUnknown_8231CA0
- thumb_func_end sub_80073DC
+ thumb_func_end ResetSprite
- thumb_func_start sub_80073F0
-sub_80073F0: @ 80073F0
+ thumb_func_start CalcCenterToCornerVec
+CalcCenterToCornerVec: @ 80073F0
push {r4-r6,lr}
adds r6, r0, 0
lsls r1, 24
@@ -1239,10 +1239,10 @@ _0800741E:
bx r0
.align 2, 0
_08007430: .4byte gUnknown_8231C85
- thumb_func_end sub_80073F0
+ thumb_func_end CalcCenterToCornerVec
- thumb_func_start sub_8007434
-sub_8007434: @ 8007434
+ thumb_func_start AllocSpriteTiles
+AllocSpriteTiles: @ 8007434
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1394,10 +1394,10 @@ _0800753C:
.align 2, 0
_08007548: .4byte gUnknown_2021B46
_0800754C: .4byte gUnknown_2021B48
- thumb_func_end sub_8007434
+ thumb_func_end AllocSpriteTiles
- thumb_func_start sub_8007550
-sub_8007550: @ 8007550
+ thumb_func_start SpriteTileAllocBitmapOp
+SpriteTileAllocBitmapOp: @ 8007550
push {r4-r6,lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -1456,7 +1456,7 @@ _080075B4:
bx r1
.align 2, 0
_080075BC: .4byte gUnknown_2021B48
- thumb_func_end sub_8007550
+ thumb_func_end SpriteTileAllocBitmapOp
thumb_func_start sub_80075C0
sub_80075C0: @ 80075C0
@@ -1507,8 +1507,8 @@ nullsub_8: @ 800760C
bx lr
thumb_func_end nullsub_8
- thumb_func_start sub_8007610
-sub_8007610: @ 8007610
+ thumb_func_start ProcessSpriteCopyRequests
+ProcessSpriteCopyRequests: @ 8007610
push {r4-r7,lr}
ldr r0, _08007660 @ =gUnknown_2021840
ldrb r0, [r0]
@@ -1554,10 +1554,10 @@ _08007658:
_08007660: .4byte gUnknown_2021840
_08007664: .4byte gUnknown_2021841
_08007668: .4byte gUnknown_2021844
- thumb_func_end sub_8007610
+ thumb_func_end ProcessSpriteCopyRequests
- thumb_func_start sub_800766C
-sub_800766C: @ 800766C
+ thumb_func_start RequestSpriteFrameImageCopy
+RequestSpriteFrameImageCopy: @ 800766C
push {r4-r6,lr}
adds r5, r2, 0
lsls r0, 16
@@ -1606,10 +1606,10 @@ _080076BC:
_080076C4: .4byte gUnknown_2021841
_080076C8: .4byte gUnknown_2021844
_080076CC: .4byte 0x06010000
- thumb_func_end sub_800766C
+ thumb_func_end RequestSpriteFrameImageCopy
- thumb_func_start sub_80076D0
-sub_80076D0: @ 80076D0
+ thumb_func_start RequestSpriteCopy
+RequestSpriteCopy: @ 80076D0
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1649,10 +1649,10 @@ _08007710:
.align 2, 0
_08007718: .4byte gUnknown_2021841
_0800771C: .4byte gUnknown_2021844
- thumb_func_end sub_80076D0
+ thumb_func_end RequestSpriteCopy
- thumb_func_start sub_8007720
-sub_8007720: @ 8007720
+ thumb_func_start CopyFromSprites
+CopyFromSprites: @ 8007720
push {r4,lr}
adds r1, r0, 0
ldr r3, _08007740 @ =gUnknown_202063C
@@ -1672,10 +1672,10 @@ _0800772A:
.align 2, 0
_08007740: .4byte gUnknown_202063C
_08007744: .4byte 0x000010ff
- thumb_func_end sub_8007720
+ thumb_func_end CopyFromSprites
- thumb_func_start sub_8007748
-sub_8007748: @ 8007748
+ thumb_func_start CopyToSprites
+CopyToSprites: @ 8007748
push {r4,lr}
adds r1, r0, 0
ldr r3, _08007768 @ =gUnknown_202063C
@@ -1695,10 +1695,10 @@ _08007752:
.align 2, 0
_08007768: .4byte gUnknown_202063C
_0800776C: .4byte 0x000010ff
- thumb_func_end sub_8007748
+ thumb_func_end CopyToSprites
- thumb_func_start sub_8007770
-sub_8007770: @ 8007770
+ thumb_func_start ResetAllSprites
+ResetAllSprites: @ 8007770
push {r4,r5,lr}
movs r4, 0
_08007774:
@@ -1707,7 +1707,7 @@ _08007774:
lsls r0, 2
ldr r5, _080077A4 @ =gUnknown_202063C
adds r0, r5
- bl sub_80073DC
+ bl ResetSprite
ldr r0, _080077A8 @ =gUnknown_2021800
adds r0, r4, r0
strb r4, [r0]
@@ -1720,17 +1720,17 @@ _08007774:
adds r0, r4
lsls r0, 2
adds r0, r5
- bl sub_80073DC
+ bl ResetSprite
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_080077A4: .4byte gUnknown_202063C
_080077A8: .4byte gUnknown_2021800
- thumb_func_end sub_8007770
+ thumb_func_end ResetAllSprites
- thumb_func_start sub_80077AC
-sub_80077AC: @ 80077AC
+ thumb_func_start FreeSpriteTiles
+FreeSpriteTiles: @ 80077AC
push {lr}
ldr r2, [r0, 0x14]
ldrh r1, [r2]
@@ -1738,26 +1738,26 @@ sub_80077AC: @ 80077AC
cmp r1, r0
beq _080077BE
adds r0, r1, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_080077BE:
pop {r0}
bx r0
.align 2, 0
_080077C4: .4byte 0x0000ffff
- thumb_func_end sub_80077AC
+ thumb_func_end FreeSpriteTiles
- thumb_func_start sub_80077C8
-sub_80077C8: @ 80077C8
+ thumb_func_start FreeSpritePalette
+FreeSpritePalette: @ 80077C8
push {lr}
ldr r0, [r0, 0x14]
ldrh r0, [r0, 0x2]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r0}
bx r0
- thumb_func_end sub_80077C8
+ thumb_func_end FreeSpritePalette
- thumb_func_start sub_80077D8
-sub_80077D8: @ 80077D8
+ thumb_func_start FreeSpriteOamMatrix
+FreeSpriteOamMatrix: @ 80077D8
push {r4,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x1]
@@ -1770,7 +1770,7 @@ sub_80077D8: @ 80077D8
ldrb r0, [r4, 0x3]
lsls r0, 26
lsrs r0, 27
- bl sub_80085CC
+ bl FreeOamMatrix
ldrb r1, [r4, 0x1]
movs r0, 0x4
negs r0, r0
@@ -1780,26 +1780,26 @@ _080077FE:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80077D8
+ thumb_func_end FreeSpriteOamMatrix
- thumb_func_start sub_8007804
-sub_8007804: @ 8007804
+ thumb_func_start DestroySpriteAndFreeResources
+DestroySpriteAndFreeResources: @ 8007804
push {r4,lr}
adds r4, r0, 0
- bl sub_80077AC
+ bl FreeSpriteTiles
adds r0, r4, 0
- bl sub_80077C8
+ bl FreeSpritePalette
adds r0, r4, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8007804
+ thumb_func_end DestroySpriteAndFreeResources
- thumb_func_start sub_8007824
-sub_8007824: @ 8007824
+ thumb_func_start AnimateSprite
+AnimateSprite: @ 8007824
push {r4,r5,lr}
adds r4, r0, 0
ldr r2, _08007860 @ =gUnknown_8231D18
@@ -1833,10 +1833,10 @@ _0800785A:
_08007860: .4byte gUnknown_8231D18
_08007864: .4byte gUnknown_2021CCC
_08007868: .4byte gUnknown_8231D20
- thumb_func_end sub_8007824
+ thumb_func_end AnimateSprite
- thumb_func_start sub_800786C
-sub_800786C: @ 800786C
+ thumb_func_start BeginAnim
+BeginAnim: @ 800786C
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -1919,7 +1919,7 @@ _080078E8:
adds r0, r4, 0
adds r1, r7, 0
adds r2, r6, 0
- bl sub_80080D4
+ bl SetSpriteOamFlipBits
_08007912:
ldrb r1, [r5]
movs r0, 0x40
@@ -1949,7 +1949,7 @@ _08007940:
lsls r1, 22
lsrs r1, 22
ldr r2, [r4, 0xC]
- bl sub_800766C
+ bl RequestSpriteFrameImageCopy
_08007950:
pop {r3,r4}
mov r8, r3
@@ -1957,10 +1957,10 @@ _08007950:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_800786C
+ thumb_func_end BeginAnim
- thumb_func_start sub_800795C
-sub_800795C: @ 800795C
+ thumb_func_start ContinueAnim
+ContinueAnim: @ 800795C
push {r4,lr}
adds r4, r0, 0
adds r0, 0x2C
@@ -1970,7 +1970,7 @@ sub_800795C: @ 800795C
cmp r0, 0
beq _080079AC
adds r0, r4, 0
- bl sub_80081D8
+ bl DecrementAnimDelayCounter
adds r0, r4, 0
adds r0, 0x2A
ldrb r1, [r0]
@@ -1997,7 +1997,7 @@ sub_800795C: @ 800795C
bne _080079F2
adds r0, r4, 0
adds r1, r3, 0
- bl sub_80080D4
+ bl SetSpriteOamFlipBits
b _080079F2
_080079AC:
movs r0, 0x40
@@ -2041,10 +2041,10 @@ _080079F2:
bx r0
.align 2, 0
_080079F8: .4byte gUnknown_8231D28
- thumb_func_end sub_800795C
+ thumb_func_end ContinueAnim
- thumb_func_start sub_80079FC
-sub_80079FC: @ 80079FC
+ thumb_func_start AnimCmd_frame
+AnimCmd_frame: @ 80079FC
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2094,7 +2094,7 @@ _08007A36:
adds r0, r4, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_80080D4
+ bl SetSpriteOamFlipBits
_08007A60:
adds r0, r4, 0
adds r0, 0x3F
@@ -2125,17 +2125,17 @@ _08007A90:
lsls r1, 22
lsrs r1, 22
ldr r2, [r4, 0xC]
- bl sub_800766C
+ bl RequestSpriteFrameImageCopy
_08007A9E:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80079FC
+ thumb_func_end AnimCmd_frame
- thumb_func_start sub_8007AA8
-sub_8007AA8: @ 8007AA8
+ thumb_func_start AnimCmd_end
+AnimCmd_end: @ 8007AA8
adds r2, r0, 0
adds r2, 0x2B
ldrb r1, [r2]
@@ -2147,10 +2147,10 @@ sub_8007AA8: @ 8007AA8
orrs r1, r2
strb r1, [r0]
bx lr
- thumb_func_end sub_8007AA8
+ thumb_func_end AnimCmd_end
- thumb_func_start sub_8007AC0
-sub_8007AC0: @ 8007AC0
+ thumb_func_start AnimCmd_jump
+AnimCmd_jump: @ 8007AC0
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -2213,7 +2213,7 @@ _08007B14:
adds r0, r4, 0
adds r1, r6, 0
adds r2, r5, 0
- bl sub_80080D4
+ bl SetSpriteOamFlipBits
_08007B3E:
adds r0, r4, 0
adds r0, 0x3F
@@ -2244,17 +2244,17 @@ _08007B70:
lsls r1, 22
lsrs r1, 22
ldr r2, [r4, 0xC]
- bl sub_800766C
+ bl RequestSpriteFrameImageCopy
_08007B7E:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8007AC0
+ thumb_func_end AnimCmd_jump
- thumb_func_start sub_8007B88
-sub_8007B88: @ 8007B88
+ thumb_func_start AnimCmd_loop
+AnimCmd_loop: @ 8007B88
push {lr}
adds r1, r0, 0
adds r0, 0x2D
@@ -2262,18 +2262,18 @@ sub_8007B88: @ 8007B88
cmp r0, 0
beq _08007B9C
adds r0, r1, 0
- bl sub_8007BE0
+ bl ContinueAnimLoop
b _08007BA2
_08007B9C:
adds r0, r1, 0
- bl sub_8007BA8
+ bl BeginAnimLoop
_08007BA2:
pop {r0}
bx r0
- thumb_func_end sub_8007B88
+ thumb_func_end AnimCmd_loop
- thumb_func_start sub_8007BA8
-sub_8007BA8: @ 8007BA8
+ thumb_func_start BeginAnimLoop
+BeginAnimLoop: @ 8007BA8
push {r4,lr}
adds r4, r0, 0
adds r0, 0x2A
@@ -2294,16 +2294,16 @@ sub_8007BA8: @ 8007BA8
adds r1, 0x2D
strb r0, [r1]
adds r0, r4, 0
- bl sub_8007C00
+ bl JumpToTopOfAnimLoop
adds r0, r4, 0
- bl sub_800795C
+ bl ContinueAnim
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8007BA8
+ thumb_func_end BeginAnimLoop
- thumb_func_start sub_8007BE0
-sub_8007BE0: @ 8007BE0
+ thumb_func_start ContinueAnimLoop
+ContinueAnimLoop: @ 8007BE0
push {r4,lr}
adds r4, r0, 0
adds r1, r4, 0
@@ -2312,16 +2312,16 @@ sub_8007BE0: @ 8007BE0
subs r0, 0x1
strb r0, [r1]
adds r0, r4, 0
- bl sub_8007C00
+ bl JumpToTopOfAnimLoop
adds r0, r4, 0
- bl sub_800795C
+ bl ContinueAnim
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8007BE0
+ thumb_func_end ContinueAnimLoop
- thumb_func_start sub_8007C00
-sub_8007C00: @ 8007C00
+ thumb_func_start JumpToTopOfAnimLoop
+JumpToTopOfAnimLoop: @ 8007C00
push {r4-r7,lr}
mov r12, r0
adds r0, 0x2D
@@ -2382,10 +2382,10 @@ _08007C6C:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8007C00
+ thumb_func_end JumpToTopOfAnimLoop
- thumb_func_start sub_8007C74
-sub_8007C74: @ 8007C74
+ thumb_func_start BeginAffineAnim
+BeginAffineAnim: @ 8007C74
push {r4-r7,lr}
sub sp, 0x8
adds r6, r0, 0
@@ -2404,17 +2404,17 @@ sub_8007C74: @ 8007C74
cmp r1, r0
beq _08007CF6
adds r0, r6, 0
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8008148
+ bl AffineAnimStateRestartAnim
mov r5, sp
adds r0, r4, 0
adds r1, r6, 0
mov r2, sp
- bl sub_80082E0
+ bl GetAffineAnimFrame
adds r7, r6, 0
adds r7, 0x3F
ldrb r1, [r7]
@@ -2427,7 +2427,7 @@ sub_8007C74: @ 8007C74
strb r0, [r7]
adds r0, r4, 0
mov r1, sp
- bl sub_800834C
+ bl ApplyAffineAnimFrame
ldr r1, _08007D04 @ =gUnknown_3000C68
lsls r0, r4, 1
adds r0, r4
@@ -2445,7 +2445,7 @@ sub_8007C74: @ 8007C74
movs r0, 0x3C
ldrsh r2, [r6, r0]
adds r0, r6, 0
- bl sub_8008038
+ bl obj_update_pos2
_08007CF6:
add sp, 0x8
pop {r4-r7}
@@ -2454,10 +2454,10 @@ _08007CF6:
.align 2, 0
_08007D00: .4byte 0x00007fff
_08007D04: .4byte gUnknown_3000C68
- thumb_func_end sub_8007C74
+ thumb_func_end BeginAffineAnim
- thumb_func_start sub_8007D08
-sub_8007D08: @ 8007D08
+ thumb_func_start ContinueAffineAnim
+ContinueAffineAnim: @ 8007D08
push {r4,r5,lr}
adds r4, r0, 0
ldrb r0, [r4, 0x1]
@@ -2468,7 +2468,7 @@ sub_8007D08: @ 8007D08
cmp r0, 0
beq _08007DAA
adds r0, r4, 0
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
lsls r0, 24
lsrs r2, r0, 24
adds r5, r2, 0
@@ -2482,7 +2482,7 @@ sub_8007D08: @ 8007D08
beq _08007D44
adds r0, r2, 0
adds r1, r4, 0
- bl sub_8007DBC
+ bl AffineAnimDelay
b _08007D8E
.align 2, 0
_08007D40: .4byte gUnknown_3000C68
@@ -2537,7 +2537,7 @@ _08007D8E:
movs r0, 0x3C
ldrsh r2, [r4, r0]
adds r0, r4, 0
- bl sub_8008038
+ bl obj_update_pos2
_08007DAA:
pop {r4,r5}
pop {r0}
@@ -2546,10 +2546,10 @@ _08007DAA:
_08007DB0: .4byte 0x00007ffc
_08007DB4: .4byte 0xffff8003
_08007DB8: .4byte gUnknown_8231D38
- thumb_func_end sub_8007D08
+ thumb_func_end ContinueAffineAnim
- thumb_func_start sub_8007DBC
-sub_8007DBC: @ 8007DBC
+ thumb_func_start AffineAnimDelay
+AffineAnimDelay: @ 8007DBC
push {r4,r5,lr}
sub sp, 0x8
adds r5, r1, 0
@@ -2557,26 +2557,26 @@ sub_8007DBC: @ 8007DBC
lsrs r4, r0, 24
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008200
+ bl DecrementAffineAnimDelayCounter
lsls r0, 24
cmp r0, 0
bne _08007DE6
adds r0, r4, 0
adds r1, r5, 0
mov r2, sp
- bl sub_80082E0
+ bl GetAffineAnimFrame
adds r0, r4, 0
mov r1, sp
- bl sub_8008230
+ bl ApplyAffineAnimFrameRelativeAndUpdateMatrix
_08007DE6:
add sp, 0x8
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8007DBC
+ thumb_func_end AffineAnimDelay
- thumb_func_start sub_8007DF0
-sub_8007DF0: @ 8007DF0
+ thumb_func_start AffineAnimCmd_loop
+AffineAnimCmd_loop: @ 8007DF0
push {lr}
adds r3, r1, 0
lsls r0, 24
@@ -2591,21 +2591,21 @@ sub_8007DF0: @ 8007DF0
beq _08007E18
adds r0, r2, 0
adds r1, r3, 0
- bl sub_8007E60
+ bl ContinueAffineAnimLoop
b _08007E20
.align 2, 0
_08007E14: .4byte gUnknown_3000C68
_08007E18:
adds r0, r2, 0
adds r1, r3, 0
- bl sub_8007E24
+ bl BeginAffineAnimLoop
_08007E20:
pop {r0}
bx r0
- thumb_func_end sub_8007DF0
+ thumb_func_end AffineAnimCmd_loop
- thumb_func_start sub_8007E24
-sub_8007E24: @ 8007E24
+ thumb_func_start BeginAffineAnimLoop
+BeginAffineAnimLoop: @ 8007E24
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2626,18 +2626,18 @@ sub_8007E24: @ 8007E24
ldrh r1, [r1, 0x2]
strb r1, [r3, 0x3]
adds r1, r4, 0
- bl sub_8007E90
+ bl JumpToTopOfAffineAnimLoop
adds r0, r4, 0
- bl sub_8007D08
+ bl ContinueAffineAnim
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08007E5C: .4byte gUnknown_3000C68
- thumb_func_end sub_8007E24
+ thumb_func_end BeginAffineAnimLoop
- thumb_func_start sub_8007E60
-sub_8007E60: @ 8007E60
+ thumb_func_start ContinueAffineAnimLoop
+ContinueAffineAnimLoop: @ 8007E60
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -2651,18 +2651,18 @@ sub_8007E60: @ 8007E60
subs r2, 0x1
strb r2, [r1, 0x3]
adds r1, r4, 0
- bl sub_8007E90
+ bl JumpToTopOfAffineAnimLoop
adds r0, r4, 0
- bl sub_8007D08
+ bl ContinueAffineAnim
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08007E8C: .4byte gUnknown_3000C68
- thumb_func_end sub_8007E60
+ thumb_func_end ContinueAffineAnimLoop
- thumb_func_start sub_8007E90
-sub_8007E90: @ 8007E90
+ thumb_func_start JumpToTopOfAffineAnimLoop
+JumpToTopOfAffineAnimLoop: @ 8007E90
push {r4-r7,lr}
mov r12, r1
lsls r0, 24
@@ -2720,10 +2720,10 @@ _08007EF0:
bx r0
.align 2, 0
_08007EF8: .4byte 0x00007ffd
- thumb_func_end sub_8007E90
+ thumb_func_end JumpToTopOfAffineAnimLoop
- thumb_func_start sub_8007EFC
-sub_8007EFC: @ 8007EFC
+ thumb_func_start AffineAnimCmd_jump
+AffineAnimCmd_jump: @ 8007EFC
push {r4-r6,lr}
sub sp, 0x8
adds r5, r0, 0
@@ -2747,10 +2747,10 @@ sub_8007EFC: @ 8007EFC
mov r6, sp
adds r0, r5, 0
mov r2, sp
- bl sub_80082E0
+ bl GetAffineAnimFrame
adds r0, r5, 0
mov r1, sp
- bl sub_800834C
+ bl ApplyAffineAnimFrame
ldrb r0, [r6, 0x5]
strb r0, [r4, 0x2]
add sp, 0x8
@@ -2759,10 +2759,10 @@ sub_8007EFC: @ 8007EFC
bx r0
.align 2, 0
_08007F44: .4byte gUnknown_3000C68
- thumb_func_end sub_8007EFC
+ thumb_func_end AffineAnimCmd_jump
- thumb_func_start sub_8007F48
-sub_8007F48: @ 8007F48
+ thumb_func_start AffineAnimCmd_end
+AffineAnimCmd_end: @ 8007F48
push {lr}
sub sp, 0x8
lsls r0, 24
@@ -2785,16 +2785,16 @@ sub_8007F48: @ 8007F48
subs r2, 0x1
strb r2, [r1, 0x1]
mov r1, sp
- bl sub_8008230
+ bl ApplyAffineAnimFrameRelativeAndUpdateMatrix
add sp, 0x8
pop {r0}
bx r0
.align 2, 0
_08007F80: .4byte gUnknown_3000C68
- thumb_func_end sub_8007F48
+ thumb_func_end AffineAnimCmd_end
- thumb_func_start sub_8007F84
-sub_8007F84: @ 8007F84
+ thumb_func_start AffineAnimCmd_frame
+AffineAnimCmd_frame: @ 8007F84
push {r4,r5,lr}
sub sp, 0x8
adds r4, r0, 0
@@ -2803,10 +2803,10 @@ sub_8007F84: @ 8007F84
mov r5, sp
adds r0, r4, 0
mov r2, sp
- bl sub_80082E0
+ bl GetAffineAnimFrame
adds r0, r4, 0
mov r1, sp
- bl sub_800834C
+ bl ApplyAffineAnimFrame
ldr r1, _08007FB8 @ =gUnknown_3000C68
lsls r0, r4, 1
adds r0, r4
@@ -2820,10 +2820,10 @@ sub_8007F84: @ 8007F84
bx r0
.align 2, 0
_08007FB8: .4byte gUnknown_3000C68
- thumb_func_end sub_8007F84
+ thumb_func_end AffineAnimCmd_frame
- thumb_func_start sub_8007FBC
-sub_8007FBC: @ 8007FBC
+ thumb_func_start CopyOamMatrix
+CopyOamMatrix: @ 8007FBC
lsls r0, 24
ldr r2, _08007FD8 @ =gUnknown_2021BCC
lsrs r0, 21
@@ -2839,10 +2839,10 @@ sub_8007FBC: @ 8007FBC
bx lr
.align 2, 0
_08007FD8: .4byte gUnknown_2021BCC
- thumb_func_end sub_8007FBC
+ thumb_func_end CopyOamMatrix
- thumb_func_start sub_8007FDC
-sub_8007FDC: @ 8007FDC
+ thumb_func_start GetSpriteMatrixNum
+GetSpriteMatrixNum: @ 8007FDC
push {lr}
adds r2, r0, 0
movs r3, 0
@@ -2860,7 +2860,7 @@ _08007FF6:
adds r0, r3, 0
pop {r1}
bx r1
- thumb_func_end sub_8007FDC
+ thumb_func_end GetSpriteMatrixNum
thumb_func_start sub_8007FFC
sub_8007FFC: @ 8007FFC
@@ -2900,8 +2900,8 @@ _08008022:
bx r1
thumb_func_end sub_800800C
- thumb_func_start sub_8008038
-sub_8008038: @ 8008038
+ thumb_func_start obj_update_pos2
+obj_update_pos2: @ 8008038
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -2976,10 +2976,10 @@ _080080BE:
.align 2, 0
_080080CC: .4byte gUnknown_8231D48
_080080D0: .4byte gUnknown_2021BCC
- thumb_func_end sub_8008038
+ thumb_func_end obj_update_pos2
- thumb_func_start sub_80080D4
-sub_80080D4: @ 80080D4
+ thumb_func_start SetSpriteOamFlipBits
+SetSpriteOamFlipBits: @ 80080D4
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3037,10 +3037,10 @@ sub_80080D4: @ 80080D4
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80080D4
+ thumb_func_end SetSpriteOamFlipBits
- thumb_func_start sub_8008148
-sub_8008148: @ 8008148
+ thumb_func_start AffineAnimStateRestartAnim
+AffineAnimStateRestartAnim: @ 8008148
lsls r0, 24
lsrs r0, 24
ldr r2, _08008160 @ =gUnknown_3000C68
@@ -3055,10 +3055,10 @@ sub_8008148: @ 8008148
bx lr
.align 2, 0
_08008160: .4byte gUnknown_3000C68
- thumb_func_end sub_8008148
+ thumb_func_end AffineAnimStateRestartAnim
- thumb_func_start sub_8008164
-sub_8008164: @ 8008164
+ thumb_func_start AffineAnimStateStartAnim
+AffineAnimStateStartAnim: @ 8008164
lsls r0, 24
lsrs r0, 24
ldr r3, _08008188 @ =gUnknown_3000C68
@@ -3079,10 +3079,10 @@ sub_8008164: @ 8008164
bx lr
.align 2, 0
_08008188: .4byte gUnknown_3000C68
- thumb_func_end sub_8008164
+ thumb_func_end AffineAnimStateStartAnim
- thumb_func_start sub_800818C
-sub_800818C: @ 800818C
+ thumb_func_start AffineAnimStateReset
+AffineAnimStateReset: @ 800818C
lsls r0, 24
lsrs r0, 24
ldr r2, _080081B0 @ =gUnknown_3000C68
@@ -3103,10 +3103,10 @@ sub_800818C: @ 800818C
bx lr
.align 2, 0
_080081B0: .4byte gUnknown_3000C68
- thumb_func_end sub_800818C
+ thumb_func_end AffineAnimStateReset
- thumb_func_start sub_80081B4
-sub_80081B4: @ 80081B4
+ thumb_func_start ApplyAffineAnimFrameAbsolute
+ApplyAffineAnimFrameAbsolute: @ 80081B4
lsls r0, 24
lsrs r0, 24
ldr r3, _080081D4 @ =gUnknown_3000C68
@@ -3124,10 +3124,10 @@ sub_80081B4: @ 80081B4
bx lr
.align 2, 0
_080081D4: .4byte gUnknown_3000C68
- thumb_func_end sub_80081B4
+ thumb_func_end ApplyAffineAnimFrameAbsolute
- thumb_func_start sub_80081D8
-sub_80081D8: @ 80081D8
+ thumb_func_start DecrementAnimDelayCounter
+DecrementAnimDelayCounter: @ 80081D8
push {lr}
adds r3, r0, 0
adds r3, 0x2C
@@ -3149,10 +3149,10 @@ sub_80081D8: @ 80081D8
_080081FC:
pop {r0}
bx r0
- thumb_func_end sub_80081D8
+ thumb_func_end DecrementAnimDelayCounter
- thumb_func_start sub_8008200
-sub_8008200: @ 8008200
+ thumb_func_start DecrementAffineAnimDelayCounter
+DecrementAffineAnimDelayCounter: @ 8008200
push {lr}
lsls r1, 24
lsrs r2, r1, 24
@@ -3178,10 +3178,10 @@ _08008224:
bx r1
.align 2, 0
_0800822C: .4byte gUnknown_3000C68
- thumb_func_end sub_8008200
+ thumb_func_end DecrementAffineAnimDelayCounter
- thumb_func_start sub_8008230
-sub_8008230: @ 8008230
+ thumb_func_start ApplyAffineAnimFrameRelativeAndUpdateMatrix
+ApplyAffineAnimFrameRelativeAndUpdateMatrix: @ 8008230
push {r4-r6,lr}
sub sp, 0x10
adds r5, r0, 0
@@ -3210,7 +3210,7 @@ sub_8008230: @ 8008230
strh r0, [r4, 0x8]
movs r1, 0x4
ldrsh r0, [r4, r1]
- bl sub_80082C8
+ bl ConvertScaleParam
lsls r0, 16
lsrs r0, 16
ldr r6, _080082C0 @ =0xffff0000
@@ -3220,7 +3220,7 @@ sub_8008230: @ 8008230
str r1, [sp]
movs r2, 0x6
ldrsh r0, [r4, r2]
- bl sub_80082C8
+ bl ConvertScaleParam
lsls r0, 16
ldr r2, _080082C4 @ =0x0000ffff
ldr r1, [sp]
@@ -3240,7 +3240,7 @@ sub_8008230: @ 8008230
bl ObjAffineSet
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8007FBC
+ bl CopyOamMatrix
add sp, 0x10
pop {r4-r6}
pop {r0}
@@ -3250,10 +3250,10 @@ _080082B8: .4byte gUnknown_3000C68
_080082BC: .4byte 0xffffff00
_080082C0: .4byte 0xffff0000
_080082C4: .4byte 0x0000ffff
- thumb_func_end sub_8008230
+ thumb_func_end ApplyAffineAnimFrameRelativeAndUpdateMatrix
- thumb_func_start sub_80082C8
-sub_80082C8: @ 80082C8
+ thumb_func_start ConvertScaleParam
+ConvertScaleParam: @ 80082C8
push {lr}
adds r1, r0, 0
movs r0, 0x80
@@ -3265,10 +3265,10 @@ sub_80082C8: @ 80082C8
asrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80082C8
+ thumb_func_end ConvertScaleParam
- thumb_func_start sub_80082E0
-sub_80082E0: @ 80082E0
+ thumb_func_start GetAffineAnimFrame
+GetAffineAnimFrame: @ 80082E0
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3322,10 +3322,10 @@ sub_80082E0: @ 80082E0
bx r0
.align 2, 0
_08008348: .4byte gUnknown_3000C68
- thumb_func_end sub_80082E0
+ thumb_func_end GetAffineAnimFrame
- thumb_func_start sub_800834C
-sub_800834C: @ 800834C
+ thumb_func_start ApplyAffineAnimFrame
+ApplyAffineAnimFrame: @ 800834C
push {r4,lr}
sub sp, 0x8
adds r2, r1, 0
@@ -3342,24 +3342,24 @@ sub_800834C: @ 800834C
strb r0, [r2, 0x5]
adds r0, r4, 0
adds r1, r2, 0
- bl sub_8008230
+ bl ApplyAffineAnimFrameRelativeAndUpdateMatrix
b _08008382
_08008372:
adds r0, r4, 0
adds r1, r2, 0
- bl sub_80081B4
+ bl ApplyAffineAnimFrameAbsolute
adds r0, r4, 0
mov r1, sp
- bl sub_8008230
+ bl ApplyAffineAnimFrameRelativeAndUpdateMatrix
_08008382:
add sp, 0x8
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_800834C
+ thumb_func_end ApplyAffineAnimFrame
- thumb_func_start sub_800838C
-sub_800838C: @ 800838C
+ thumb_func_start StartSpriteAnim
+StartSpriteAnim: @ 800838C
adds r2, r0, 0
adds r2, 0x2A
strb r1, [r2]
@@ -3372,10 +3372,10 @@ sub_800838C: @ 800838C
ands r1, r2
strb r1, [r0]
bx lr
- thumb_func_end sub_800838C
+ thumb_func_end StartSpriteAnim
- thumb_func_start sub_80083A4
-sub_80083A4: @ 80083A4
+ thumb_func_start StartSpriteAnimIfDifferent
+StartSpriteAnimIfDifferent: @ 80083A4
push {lr}
adds r2, r0, 0
lsls r1, 24
@@ -3385,14 +3385,14 @@ sub_80083A4: @ 80083A4
cmp r0, r1
beq _080083BA
adds r0, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
_080083BA:
pop {r0}
bx r0
- thumb_func_end sub_80083A4
+ thumb_func_end StartSpriteAnimIfDifferent
- thumb_func_start sub_80083C0
-sub_80083C0: @ 80083C0
+ thumb_func_start SeekSpriteAnim
+SeekSpriteAnim: @ 80083C0
push {r4-r7,lr}
adds r3, r0, 0
lsls r1, 24
@@ -3429,7 +3429,7 @@ sub_80083C0: @ 80083C0
ands r0, r1
strb r0, [r4]
adds r0, r3, 0
- bl sub_800795C
+ bl ContinueAnim
ldrb r2, [r4]
movs r0, 0x3F
ands r0, r2
@@ -3454,19 +3454,19 @@ _08008428:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80083C0
+ thumb_func_end SeekSpriteAnim
- thumb_func_start sub_800843C
-sub_800843C: @ 800843C
+ thumb_func_start StartSpriteAffineAnim
+StartSpriteAffineAnim: @ 800843C
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
- bl sub_8008164
+ bl AffineAnimStateStartAnim
adds r5, 0x3F
ldrb r0, [r5]
movs r1, 0x8
@@ -3478,15 +3478,15 @@ sub_800843C: @ 800843C
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_800843C
+ thumb_func_end StartSpriteAffineAnim
- thumb_func_start sub_8008468
-sub_8008468: @ 8008468
+ thumb_func_start StartSpriteAffineAnimIfDifferent
+StartSpriteAffineAnimIfDifferent: @ 8008468
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 24
lsrs r4, r1, 24
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
lsls r0, 24
lsrs r0, 24
ldr r2, _08008498 @ =gUnknown_3000C68
@@ -3499,22 +3499,22 @@ sub_8008468: @ 8008468
beq _08008490
adds r0, r5, 0
adds r1, r4, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08008490:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08008498: .4byte gUnknown_3000C68
- thumb_func_end sub_8008468
+ thumb_func_end StartSpriteAffineAnimIfDifferent
- thumb_func_start sub_800849C
-sub_800849C: @ 800849C
+ thumb_func_start ChangeSpriteAffineAnim
+ChangeSpriteAffineAnim: @ 800849C
push {r4,r5,lr}
adds r5, r0, 0
lsls r4, r1, 24
lsrs r4, 24
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
lsls r0, 24
lsrs r0, 24
ldr r2, _080084D0 @ =gUnknown_3000C68
@@ -3536,15 +3536,15 @@ sub_800849C: @ 800849C
bx r0
.align 2, 0
_080084D0: .4byte gUnknown_3000C68
- thumb_func_end sub_800849C
+ thumb_func_end ChangeSpriteAffineAnim
- thumb_func_start sub_80084D4
-sub_80084D4: @ 80084D4
+ thumb_func_start ChangeSpriteAffineAnimIfDifferent
+ChangeSpriteAffineAnimIfDifferent: @ 80084D4
push {r4,r5,lr}
adds r5, r0, 0
lsls r1, 24
lsrs r4, r1, 24
- bl sub_8007FDC
+ bl GetSpriteMatrixNum
lsls r0, 24
lsrs r0, 24
ldr r2, _08008504 @ =gUnknown_3000C68
@@ -3557,17 +3557,17 @@ sub_80084D4: @ 80084D4
beq _080084FC
adds r0, r5, 0
adds r1, r4, 0
- bl sub_800849C
+ bl ChangeSpriteAffineAnim
_080084FC:
pop {r4,r5}
pop {r0}
bx r0
.align 2, 0
_08008504: .4byte gUnknown_3000C68
- thumb_func_end sub_80084D4
+ thumb_func_end ChangeSpriteAffineAnimIfDifferent
- thumb_func_start sub_8008508
-sub_8008508: @ 8008508
+ thumb_func_start SetSpriteSheetFrameTileNum
+SetSpriteSheetFrameTileNum: @ 8008508
push {lr}
adds r3, r0, 0
adds r0, 0x3F
@@ -3613,10 +3613,10 @@ _08008554:
.align 2, 0
_08008558: .4byte 0x000003ff
_0800855C: .4byte 0xfffffc00
- thumb_func_end sub_8008508
+ thumb_func_end SetSpriteSheetFrameTileNum
- thumb_func_start sub_8008560
-sub_8008560: @ 8008560
+ thumb_func_start ResetAffineAnimData
+ResetAffineAnimData: @ 8008560
push {r4,lr}
ldr r1, _0800858C @ =gUnknown_2021CCC
movs r0, 0
@@ -3624,11 +3624,11 @@ sub_8008560: @ 8008560
ldr r1, _08008590 @ =gUnknown_3003E54
movs r0, 0
str r0, [r1]
- bl sub_8007390
+ bl ResetOamMatrices
movs r4, 0
_08008574:
adds r0, r4, 0
- bl sub_800818C
+ bl AffineAnimStateReset
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3640,10 +3640,10 @@ _08008574:
.align 2, 0
_0800858C: .4byte gUnknown_2021CCC
_08008590: .4byte gUnknown_3003E54
- thumb_func_end sub_8008560
+ thumb_func_end ResetAffineAnimData
- thumb_func_start sub_8008594
-sub_8008594: @ 8008594
+ thumb_func_start AllocOamMatrix
+AllocOamMatrix: @ 8008594
push {r4,lr}
movs r2, 0
movs r1, 0x1
@@ -3674,10 +3674,10 @@ _080085C6:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8008594
+ thumb_func_end AllocOamMatrix
- thumb_func_start sub_80085CC
-sub_80085CC: @ 80085CC
+ thumb_func_start FreeOamMatrix
+FreeOamMatrix: @ 80085CC
push {lr}
sub sp, 0x4
lsls r0, 24
@@ -3704,19 +3704,19 @@ _080085EA:
adds r0, r2, 0
movs r2, 0
movs r3, 0
- bl sub_80073BC
+ bl SetOamMatrix
add sp, 0x4
pop {r0}
bx r0
.align 2, 0
_08008608: .4byte gUnknown_3003E54
- thumb_func_end sub_80085CC
+ thumb_func_end FreeOamMatrix
- thumb_func_start sub_800860C
-sub_800860C: @ 800860C
+ thumb_func_start InitSpriteAffineAnim
+InitSpriteAffineAnim: @ 800860C
push {r4,r5,lr}
adds r4, r0, 0
- bl sub_8008594
+ bl AllocOamMatrix
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0xFF
@@ -3728,7 +3728,7 @@ sub_800860C: @ 800860C
lsls r3, 30
lsrs r3, 30
adds r0, r4, 0
- bl sub_80073F0
+ bl CalcCenterToCornerVec
movs r0, 0x1F
adds r1, r5, 0
ands r1, r0
@@ -3746,15 +3746,15 @@ sub_800860C: @ 800860C
orrs r0, r1
strb r0, [r2]
adds r0, r5, 0
- bl sub_800818C
+ bl AffineAnimStateReset
_08008654:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_800860C
+ thumb_func_end InitSpriteAffineAnim
- thumb_func_start sub_800865C
-sub_800865C: @ 800865C
+ thumb_func_start SetOamMatrixRotationScaling
+SetOamMatrixRotationScaling: @ 800865C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -3771,7 +3771,7 @@ sub_800865C: @ 800865C
lsrs r5, 16
lsls r0, 16
asrs r0, 16
- bl sub_80082C8
+ bl ConvertScaleParam
lsls r0, 16
lsrs r0, 16
ldr r1, _080086D4 @ =0xffff0000
@@ -3784,7 +3784,7 @@ sub_800865C: @ 800865C
lsls r4, 16
asrs r4, 16
adds r0, r4, 0
- bl sub_80082C8
+ bl ConvertScaleParam
lsls r0, 16
ldr r2, _080086D8 @ =0x0000ffff
ldr r1, [sp]
@@ -3804,7 +3804,7 @@ sub_800865C: @ 800865C
bl ObjAffineSet
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8007FBC
+ bl CopyOamMatrix
add sp, 0x10
pop {r3}
mov r8, r3
@@ -3814,15 +3814,15 @@ sub_800865C: @ 800865C
.align 2, 0
_080086D4: .4byte 0xffff0000
_080086D8: .4byte 0x0000ffff
- thumb_func_end sub_800865C
+ thumb_func_end SetOamMatrixRotationScaling
- thumb_func_start sub_80086DC
-sub_80086DC: @ 80086DC
+ thumb_func_start LoadSpriteSheet
+LoadSpriteSheet: @ 80086DC
push {r4-r6,lr}
adds r5, r0, 0
ldrh r0, [r5, 0x4]
lsrs r0, 5
- bl sub_8007434
+ bl AllocSpriteTiles
lsls r4, r0, 16
asrs r6, r4, 16
cmp r6, 0
@@ -3832,7 +3832,7 @@ sub_80086DC: @ 80086DC
ldrh r2, [r5, 0x4]
lsrs r2, 5
adds r1, r4, 0
- bl sub_80088A8
+ bl AllocSpriteTileRange
ldr r0, [r5]
lsls r1, r6, 5
ldr r2, _08008714 @ =0x06010000
@@ -3850,10 +3850,10 @@ _0800871A:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_80086DC
+ thumb_func_end LoadSpriteSheet
- thumb_func_start sub_8008720
-sub_8008720: @ 8008720
+ thumb_func_start LoadSpriteSheets
+LoadSpriteSheets: @ 8008720
push {r4,r5,lr}
adds r5, r0, 0
movs r4, 0
@@ -3863,7 +3863,7 @@ sub_8008720: @ 8008720
_0800872C:
lsls r0, r4, 3
adds r0, r5, r0
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3876,16 +3876,16 @@ _08008744:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8008720
+ thumb_func_end LoadSpriteSheets
- thumb_func_start sub_800874C
-sub_800874C: @ 800874C
+ thumb_func_start FreeSpriteTilesByTag
+FreeSpriteTilesByTag: @ 800874C
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 16
lsrs r0, 16
- bl sub_8008830
+ bl IndexOfSpriteTileTag
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
@@ -3939,10 +3939,10 @@ _080087B4: .4byte gUnknown_3000B68
_080087B8: .4byte gUnknown_3000AE8
_080087BC: .4byte gUnknown_2021B48
_080087C0: .4byte 0x0000ffff
- thumb_func_end sub_800874C
+ thumb_func_end FreeSpriteTilesByTag
- thumb_func_start sub_80087C4
-sub_80087C4: @ 80087C4
+ thumb_func_start FreeSpriteTileRanges
+FreeSpriteTileRanges: @ 80087C4
push {r4-r7,lr}
movs r2, 0
ldr r7, _080087F8 @ =gUnknown_3000AE8
@@ -3974,14 +3974,14 @@ _080087D4:
_080087F8: .4byte gUnknown_3000AE8
_080087FC: .4byte 0x0000ffff
_08008800: .4byte gUnknown_3000B68
- thumb_func_end sub_80087C4
+ thumb_func_end FreeSpriteTileRanges
- thumb_func_start sub_8008804
-sub_8008804: @ 8008804
+ thumb_func_start GetSpriteTileStartByTag
+GetSpriteTileStartByTag: @ 8008804
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_8008830
+ bl IndexOfSpriteTileTag
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -4000,10 +4000,10 @@ _08008826:
bx r1
.align 2, 0
_0800882C: .4byte 0x0000ffff
- thumb_func_end sub_8008804
+ thumb_func_end GetSpriteTileStartByTag
- thumb_func_start sub_8008830
-sub_8008830: @ 8008830
+ thumb_func_start IndexOfSpriteTileTag
+IndexOfSpriteTileTag: @ 8008830
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -4029,10 +4029,10 @@ _0800884C:
_08008858:
pop {r1}
bx r1
- thumb_func_end sub_8008830
+ thumb_func_end IndexOfSpriteTileTag
- thumb_func_start sub_800885C
-sub_800885C: @ 800885C
+ thumb_func_start GetSpriteTileTagByTileStart
+GetSpriteTileTagByTileStart: @ 800885C
push {r4-r6,lr}
lsls r0, 16
lsrs r3, r0, 16
@@ -4070,10 +4070,10 @@ _0800889C:
bx r1
.align 2, 0
_080088A4: .4byte 0x0000ffff
- thumb_func_end sub_800885C
+ thumb_func_end GetSpriteTileTagByTileStart
- thumb_func_start sub_80088A8
-sub_80088A8: @ 80088A8
+ thumb_func_start AllocSpriteTileRange
+AllocSpriteTileRange: @ 80088A8
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -4085,7 +4085,7 @@ sub_80088A8: @ 80088A8
lsls r6, 16
lsrs r6, 16
ldr r0, _080088E4 @ =0x0000ffff
- bl sub_8008830
+ bl IndexOfSpriteTileTag
lsls r0, 24
lsrs r0, 24
ldr r2, _080088E8 @ =gUnknown_3000AE8
@@ -4106,10 +4106,10 @@ sub_80088A8: @ 80088A8
_080088E4: .4byte 0x0000ffff
_080088E8: .4byte gUnknown_3000AE8
_080088EC: .4byte gUnknown_3000B68
- thumb_func_end sub_80088A8
+ thumb_func_end AllocSpriteTileRange
- thumb_func_start sub_80088F0
-sub_80088F0: @ 80088F0
+ thumb_func_start FreeAllSpritePalettes
+FreeAllSpritePalettes: @ 80088F0
push {r4,lr}
ldr r1, _0800891C @ =gUnknown_3003E58
movs r0, 0
@@ -4136,14 +4136,14 @@ _08008900:
_0800891C: .4byte gUnknown_3003E58
_08008920: .4byte gUnknown_3000DE8
_08008924: .4byte 0x0000ffff
- thumb_func_end sub_80088F0
+ thumb_func_end FreeAllSpritePalettes
- thumb_func_start sub_8008928
-sub_8008928: @ 8008928
+ thumb_func_start LoadSpritePalette
+LoadSpritePalette: @ 8008928
push {r4,r5,lr}
adds r5, r0, 0
ldrh r0, [r5, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
@@ -4152,7 +4152,7 @@ sub_8008928: @ 8008928
b _0800896E
_0800893E:
ldr r0, _08008964 @ =0x0000ffff
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0xFF
@@ -4164,7 +4164,7 @@ _0800893E:
strh r1, [r0]
ldr r0, [r5]
lsls r1, r4, 4
- bl sub_80089A0
+ bl DoLoadSpritePalette
adds r0, r4, 0
b _0800896E
.align 2, 0
@@ -4176,10 +4176,10 @@ _0800896E:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8008928
+ thumb_func_end LoadSpritePalette
- thumb_func_start sub_8008974
-sub_8008974: @ 8008974
+ thumb_func_start LoadSpritePalettes
+LoadSpritePalettes: @ 8008974
push {r4,r5,lr}
adds r5, r0, 0
movs r4, 0
@@ -4195,7 +4195,7 @@ _08008982:
cmp r0, 0
beq _0800899A
adds r0, r1, 0
- bl sub_8008928
+ bl LoadSpritePalette
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -4204,10 +4204,10 @@ _0800899A:
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_8008974
+ thumb_func_end LoadSpritePalettes
- thumb_func_start sub_80089A0
-sub_80089A0: @ 80089A0
+ thumb_func_start DoLoadSpritePalette
+DoLoadSpritePalette: @ 80089A0
push {lr}
lsls r1, 16
movs r2, 0x80
@@ -4215,18 +4215,18 @@ sub_80089A0: @ 80089A0
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
- thumb_func_end sub_80089A0
+ thumb_func_end DoLoadSpritePalette
- thumb_func_start sub_80089B8
-sub_80089B8: @ 80089B8
+ thumb_func_start AllocSpritePalette
+AllocSpritePalette: @ 80089B8
push {r4,lr}
lsls r0, 16
lsrs r4, r0, 16
ldr r0, _080089D8 @ =0x0000ffff
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4246,10 +4246,10 @@ _080089E2:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_80089B8
+ thumb_func_end AllocSpritePalette
- thumb_func_start sub_80089E8
-sub_80089E8: @ 80089E8
+ thumb_func_start IndexOfSpritePaletteTag
+IndexOfSpritePaletteTag: @ 80089E8
push {lr}
lsls r0, 16
lsrs r2, r0, 16
@@ -4280,10 +4280,10 @@ _08008A1A:
_08008A1C:
pop {r1}
bx r1
- thumb_func_end sub_80089E8
+ thumb_func_end IndexOfSpritePaletteTag
- thumb_func_start sub_8008A20
-sub_8008A20: @ 8008A20
+ thumb_func_start GetSpritePaletteTagByPaletteNum
+GetSpritePaletteTagByPaletteNum: @ 8008A20
lsls r0, 24
ldr r1, _08008A2C @ =gUnknown_3000DE8
lsrs r0, 23
@@ -4292,14 +4292,14 @@ sub_8008A20: @ 8008A20
bx lr
.align 2, 0
_08008A2C: .4byte gUnknown_3000DE8
- thumb_func_end sub_8008A20
+ thumb_func_end GetSpritePaletteTagByPaletteNum
- thumb_func_start sub_8008A30
-sub_8008A30: @ 8008A30
+ thumb_func_start FreeSpritePaletteByTag
+FreeSpritePaletteByTag: @ 8008A30
push {lr}
lsls r0, 16
lsrs r0, 16
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -4315,19 +4315,19 @@ _08008A4C:
.align 2, 0
_08008A50: .4byte gUnknown_3000DE8
_08008A54: .4byte 0x0000ffff
- thumb_func_end sub_8008A30
+ thumb_func_end FreeSpritePaletteByTag
- thumb_func_start sub_8008A58
-sub_8008A58: @ 8008A58
+ thumb_func_start SetSubspriteTables
+SetSubspriteTables: @ 8008A58
str r1, [r0, 0x18]
adds r0, 0x42
movs r1, 0x40
strb r1, [r0]
bx lr
- thumb_func_end sub_8008A58
+ thumb_func_end SetSubspriteTables
- thumb_func_start sub_8008A64
-sub_8008A64: @ 8008A64
+ thumb_func_start AddSpriteToOamBuffer
+AddSpriteToOamBuffer: @ 8008A64
push {r4,lr}
adds r4, r0, 0
adds r3, r1, 0
@@ -4375,7 +4375,7 @@ _08008AB0:
adds r1, r0
adds r0, r4, 0
adds r2, r3, 0
- bl sub_8008AD0
+ bl AddSubspritesToOamBuffer
lsls r0, 24
lsrs r0, 24
_08008AC4:
@@ -4384,10 +4384,10 @@ _08008AC4:
bx r1
.align 2, 0
_08008ACC: .4byte gUnknown_3003128
- thumb_func_end sub_8008A64
+ thumb_func_end AddSpriteToOamBuffer
- thumb_func_start sub_8008AD0
-sub_8008AD0: @ 8008AD0
+ thumb_func_start AddSubspritesToOamBuffer
+AddSubspritesToOamBuffer: @ 8008AD0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4667,6 +4667,6 @@ _08008CE4: .4byte 0x000001ff
_08008CE8: .4byte 0xfffffe00
_08008CEC: .4byte 0x000003ff
_08008CF0: .4byte 0xfffffc00
- thumb_func_end sub_8008AD0
+ thumb_func_end AddSubspritesToOamBuffer
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/ss_anne.s b/asm/ss_anne.s
index 46d129d6e..e8fb5a9fd 100644
--- a/asm/ss_anne.s
+++ b/asm/ss_anne.s
@@ -12,7 +12,7 @@ sub_815D334: @ 815D334
bl sub_80722CC
ldr r0, _0815D35C @ =sub_815D364
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0815D360 @ =gUnknown_3005090
@@ -46,7 +46,7 @@ sub_815D364: @ 815D364
cmp r0, 0
bne _0815D394
ldr r0, _0815D3A0 @ =gUnknown_8479C58
- bl sub_8008720
+ bl LoadSpriteSheets
bl sub_815D498
adds r0, r5, 0
subs r0, 0x8
@@ -94,7 +94,7 @@ _0815D3D6:
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -166,12 +166,12 @@ sub_815D454: @ 815D454
bne _0815D48A
movs r0, 0xFA
lsls r0, 4
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r0, _0815D494 @ =0x00000fa1
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0815D48A:
pop {r4}
pop {r0}
@@ -191,7 +191,7 @@ sub_815D498: @ 815D498
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -214,7 +214,7 @@ sub_815D498: @ 815D498
asrs r1, 16
movs r2, 0x6D
movs r3, 0xFF
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -254,7 +254,7 @@ sub_815D518: @ 815D518
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -300,7 +300,7 @@ _0815D56A:
cmp r0, r1
bge _0815D58E
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
_0815D58E:
add sp, 0x4
pop {r4}
@@ -322,7 +322,7 @@ sub_815D5A4: @ 815D5A4
ldrb r2, [r0, 0x4]
movs r0, 0x1
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -349,7 +349,7 @@ sub_815D5A4: @ 815D5A4
ldr r0, _0815D620 @ =gUnknown_8479CC0
movs r2, 0x4E
movs r3, 0x8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -399,7 +399,7 @@ _0815D638:
cmp r0, 0
beq _0815D650
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_0815D650:
pop {r0}
bx r0
diff --git a/asm/start_menu.s b/asm/start_menu.s
index 7e3aa7735..0e22449c8 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -45,7 +45,7 @@ sub_806ED94: @ 806ED94
lsrs r2, 24
ldr r0, _0806EDA8 @ =gUnknown_20370F6
ldr r1, _0806EDAC @ =gUnknown_20370F5
- bl sub_806FEC8
+ bl AppendToList
pop {r0}
bx r0
.align 2, 0
@@ -155,7 +155,7 @@ sub_806EE7C: @ 806EE7C
bl sub_8003CE4
strb r0, [r4]
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0
bl sub_80F6F1C
@@ -513,7 +513,7 @@ sub_806F168: @ 806F168
cmp r0, 0x1
bne _0806F180
adds r0, r4, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
_0806F180:
pop {r4}
pop {r0}
@@ -531,12 +531,12 @@ sub_806F188: @ 806F188
ldr r4, _0806F1B4 @ =sub_806F168
adds r0, r4, 0
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
adds r2, r5, 0
- bl sub_80775E8
+ bl SetTaskFuncWithFollowupFunc
pop {r4,r5}
pop {r0}
bx r0
@@ -622,7 +622,7 @@ _0806F238:
cmp r0, 0x1
bne _0806F24E
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0806F24E:
pop {r4,r5}
pop {r0}
@@ -637,13 +637,13 @@ sub_806F258: @ 806F258
bl sub_805642C
cmp r0, 0
bne _0806F26E
- bl sub_8068974
+ bl player_bitmagic
bl sub_805C270
bl sub_805C780
_0806F26E:
ldr r0, _0806F27C @ =sub_806F1F0
bl sub_806F188
- bl sub_8069940
+ bl ScriptContext2_Enable
pop {r0}
bx r0
.align 2, 0
@@ -663,7 +663,7 @@ sub_806F280: @ 806F280
bl sub_80722CC
movs r0, 0x1
negs r0, r0
- bl sub_810F904
+ bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4]
bl sub_80BF708
@@ -698,7 +698,7 @@ _0806F2D2:
movs r0, 0x5
bl sub_80722CC
movs r0, 0x1
- bl sub_810F904
+ bl MoveMenuCursor
ldr r4, _0806F360 @ =gUnknown_20370F4
strb r0, [r4]
bl sub_80BF708
@@ -792,7 +792,7 @@ sub_806F394: @ 806F394
bl sub_80CCB68
movs r0, 0x1
movs r1, 0
- bl sub_807A818
+ bl fade_screen
_0806F3B8:
pop {r0}
bx r0
@@ -854,11 +854,11 @@ _0806F424: .4byte gUnknown_2037AB8
_0806F428:
movs r0, 0x29
bl sub_8054E90
- bl sub_807B004
+ bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F448 @ =sub_810275C
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
_0806F442:
pop {r1}
@@ -881,11 +881,11 @@ sub_806F44C: @ 806F44C
.align 2, 0
_0806F460: .4byte gUnknown_2037AB8
_0806F464:
- bl sub_807B004
+ bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F47C @ =sub_8126EB0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
_0806F478:
pop {r1}
@@ -908,11 +908,11 @@ sub_806F480: @ 806F480
.align 2, 0
_0806F494: .4byte gUnknown_2037AB8
_0806F498:
- bl sub_807B004
+ bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F4B0 @ =sub_8107EB8
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
_0806F4AC:
pop {r1}
@@ -935,7 +935,7 @@ sub_806F4B4: @ 806F4B4
.align 2, 0
_0806F4C8: .4byte gUnknown_2037AB8
_0806F4CC:
- bl sub_807B004
+ bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F4E4 @ =sub_80568A8
@@ -974,11 +974,11 @@ sub_806F4FC: @ 806F4FC
.align 2, 0
_0806F510: .4byte gUnknown_2037AB8
_0806F514:
- bl sub_807B004
+ bl play_some_sound
bl sub_806EF18
bl sub_80563F0
ldr r0, _0806F534 @ =sub_8088388
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _0806F538 @ =gUnknown_30030F0
ldr r0, _0806F53C @ =sub_80568A8
str r0, [r1, 0x8]
@@ -1029,7 +1029,7 @@ sub_806F56C: @ 806F56C
.align 2, 0
_0806F580: .4byte gUnknown_2037AB8
_0806F584:
- bl sub_807B004
+ bl play_some_sound
bl sub_80563F0
ldr r0, _0806F59C @ =gUnknown_300502C
ldrb r0, [r0]
@@ -1095,7 +1095,7 @@ _0806F604:
movs r1, 0x1
bl sub_810F260
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
bl sub_812B248
movs r0, 0x1
b _0806F61E
@@ -1160,7 +1160,7 @@ sub_806F67C: @ 806F67C
bl sub_806F624
ldr r0, _0806F698 @ =sub_806F6D4
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -1223,8 +1223,8 @@ _0806F700:
strh r1, [r0]
_0806F704:
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
bl sub_812B248
_0806F712:
pop {r4}
@@ -1542,7 +1542,7 @@ sub_806F940: @ 806F940
cmp r0, 0x1
bne _0806F960
movs r0, 0x4
- bl sub_80DA364
+ bl TrySavingData
movs r0, 0
strb r0, [r4]
b _0806F966
@@ -1550,7 +1550,7 @@ sub_806F940: @ 806F940
_0806F95C: .4byte gUnknown_2031DB0
_0806F960:
movs r0, 0
- bl sub_80DA364
+ bl TrySavingData
_0806F966:
ldr r1, _0806F974 @ =gUnknown_3000FA4
ldr r0, _0806F978 @ =sub_806F97C
@@ -1617,7 +1617,7 @@ _0806F9DC: .4byte sub_806F9E0
thumb_func_start sub_806F9E0
sub_806F9E0: @ 806F9E0
push {lr}
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _0806F9FE
@@ -1676,7 +1676,7 @@ _0806FA42:
thumb_func_start sub_806FA48
sub_806FA48: @ 806FA48
push {lr}
- bl sub_8070474
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_806FA48
@@ -1710,10 +1710,10 @@ _0806FA74:
_0806FA88:
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80006F4
- bl sub_8087E64
+ bl SetVBlankCallback
+ bl remove_some_task
movs r2, 0xA0
lsls r2, 19
mov r1, sp
@@ -1764,10 +1764,10 @@ _0806FAF4: .4byte 0x040000d4
_0806FAF8: .4byte 0x81000200
_0806FAFC: .4byte 0x81000800
_0806FB00:
- bl sub_8006B10
- bl sub_80773BC
- bl sub_8070528
- bl sub_8087EA4
+ bl ResetSpriteData
+ bl ResetTasks
+ bl ResetPaletteFade
+ bl dp12_8087EA4
b _0806FB64
_0806FB12:
movs r0, 0
@@ -1788,16 +1788,16 @@ _0806FB34: .4byte gUnknown_83A73B8
_0806FB38: .4byte gUnknown_83A73BC
_0806FB3C:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _0806FB5C @ =sub_806FA48
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0x1
- bl sub_8000B68
+ bl EnableInterrupts
b _0806FB64
.align 2, 0
_0806FB5C: .4byte sub_806FA48
@@ -1828,9 +1828,9 @@ sub_806FB7C: @ 806FB7C
beq _0806FB96
ldr r0, _0806FBA0 @ =sub_806FBB8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
ldr r0, _0806FBA4 @ =sub_806FBA8
- bl sub_8000544
+ bl SetMainCallback2
_0806FB96:
pop {r0}
bx r0
@@ -1843,8 +1843,8 @@ _0806FBA4: .4byte sub_806FBA8
thumb_func_start sub_806FBA8
sub_806FBA8: @ 806FBA8
push {lr}
- bl sub_8077578
- bl sub_80704D0
+ bl RunTasks
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_806FBA8
@@ -1895,7 +1895,7 @@ _0806FBF8:
_0806FC14:
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0806FC74 @ =gUnknown_8419F54
movs r4, 0
str r4, [sp]
@@ -1914,7 +1914,7 @@ _0806FC14:
movs r2, 0xF
bl sub_8150048
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -1924,7 +1924,7 @@ _0806FC14:
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0806FC78 @ =gUnknown_3003F3C
ldrb r0, [r0]
cmp r0, 0
@@ -1950,7 +1950,7 @@ _0806FC8C:
lsls r0, 24
cmp r0, 0
beq _0806FCE8
- bl sub_804C1DC
+ bl sav2_gender2_inplace_and_xFE
b _0806FCE4
_0806FC9C:
movs r0, 0x1
@@ -1959,30 +1959,30 @@ _0806FC9C:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x4
b _0806FCE6
_0806FCB0:
bl sub_8003ECC
ldr r0, _0806FCC4 @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
b _0806FCE8
.align 2, 0
_0806FCC4: .4byte gUnknown_30030F0
_0806FCC8:
ldr r0, _0806FCD4 @ =sub_80DA634
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
movs r0, 0x6
b _0806FCE6
.align 2, 0
_0806FCD4: .4byte sub_80DA634
_0806FCD8:
ldr r0, _0806FCF0 @ =sub_80DA634
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _0806FCE8
@@ -2019,7 +2019,7 @@ sub_806FCF4: @ 806FCF4
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r4, _0806FE60 @ =gUnknown_2021D18
movs r0, 0x3
adds r1, r4, 0
@@ -2200,13 +2200,13 @@ sub_806FEA0: @ 806FEA0
bl sub_80F6F9C
bl sub_80F7948
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
pop {r0}
bx r0
thumb_func_end sub_806FEA0
- thumb_func_start sub_806FEC8
-sub_806FEC8: @ 806FEC8
+ thumb_func_start AppendToList
+AppendToList: @ 806FEC8
ldrb r3, [r1]
adds r0, r3
strb r2, [r0]
@@ -2214,6 +2214,6 @@ sub_806FEC8: @ 806FEC8
adds r0, 0x1
strb r0, [r1]
bx lr
- thumb_func_end sub_806FEC8
+ thumb_func_end AppendToList
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/string_util.s b/asm/string_util.s
index 4f7c45243..bee215a0d 100644
--- a/asm/string_util.s
+++ b/asm/string_util.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8008CF4
-sub_8008CF4: @ 8008CF4
+ thumb_func_start StringCopy10
+StringCopy10: @ 8008CF4
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0xA
@@ -35,10 +35,10 @@ _08008D20:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8008CF4
+ thumb_func_end StringCopy10
- thumb_func_start sub_8008D28
-sub_8008D28: @ 8008D28
+ thumb_func_start StringGetEnd10
+StringGetEnd10: @ 8008D28
push {r4,lr}
adds r3, r0, 0
movs r4, 0xA
@@ -63,10 +63,10 @@ _08008D4C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8008D28
+ thumb_func_end StringGetEnd10
- thumb_func_start sub_8008D54
-sub_8008D54: @ 8008D54
+ thumb_func_start StringCopy7
+StringCopy7: @ 8008D54
push {r4,r5,lr}
adds r4, r0, 0
movs r5, 0x7
@@ -93,10 +93,10 @@ _08008D7C:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8008D54
+ thumb_func_end StringCopy7
- thumb_func_start sub_8008D84
-sub_8008D84: @ 8008D84
+ thumb_func_start StringCopy
+StringCopy: @ 8008D84
push {lr}
adds r3, r0, 0
b _08008D90
@@ -114,10 +114,10 @@ _08008D90:
adds r0, r3, 0
pop {r1}
bx r1
- thumb_func_end sub_8008D84
+ thumb_func_end StringCopy
- thumb_func_start sub_8008DA4
-sub_8008DA4: @ 8008DA4
+ thumb_func_start StringAppend
+StringAppend: @ 8008DA4
push {lr}
adds r2, r0, 0
b _08008DAC
@@ -128,13 +128,13 @@ _08008DAC:
cmp r0, 0xFF
bne _08008DAA
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
pop {r1}
bx r1
- thumb_func_end sub_8008DA4
+ thumb_func_end StringAppend
- thumb_func_start sub_8008DBC
-sub_8008DBC: @ 8008DBC
+ thumb_func_start StringCopyN
+StringCopyN: @ 8008DBC
push {r4-r6,lr}
adds r4, r0, 0
adds r6, r1, 0
@@ -160,10 +160,10 @@ _08008DE2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8008DBC
+ thumb_func_end StringCopyN
- thumb_func_start sub_8008DEC
-sub_8008DEC: @ 8008DEC
+ thumb_func_start StringAppendN
+StringAppendN: @ 8008DEC
push {lr}
adds r3, r0, 0
lsls r2, 24
@@ -176,13 +176,13 @@ _08008DF8:
cmp r0, 0xFF
bne _08008DF6
adds r0, r3, 0
- bl sub_8008DBC
+ bl StringCopyN
pop {r1}
bx r1
- thumb_func_end sub_8008DEC
+ thumb_func_end StringAppendN
- thumb_func_start sub_8008E08
-sub_8008E08: @ 8008E08
+ thumb_func_start StringLength
+StringLength: @ 8008E08
push {lr}
adds r2, r0, 0
movs r1, 0
@@ -201,10 +201,10 @@ _08008E22:
adds r0, r1, 0
pop {r1}
bx r1
- thumb_func_end sub_8008E08
+ thumb_func_end StringLength
- thumb_func_start sub_8008E28
-sub_8008E28: @ 8008E28
+ thumb_func_start StringCompare
+StringCompare: @ 8008E28
push {lr}
adds r2, r0, 0
b _08008E3A
@@ -227,10 +227,10 @@ _08008E3A:
_08008E48:
pop {r1}
bx r1
- thumb_func_end sub_8008E28
+ thumb_func_end StringCompare
- thumb_func_start sub_8008E4C
-sub_8008E4C: @ 8008E4C
+ thumb_func_start StringCompareN
+StringCompareN: @ 8008E4C
push {r4,lr}
adds r3, r0, 0
b _08008E64
@@ -257,7 +257,7 @@ _08008E72:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8008E4C
+ thumb_func_end StringCompareN
thumb_func_start sub_8008E78
sub_8008E78: @ 8008E78
@@ -484,7 +484,7 @@ _08008FEC:
_08009004:
ldrb r0, [r5]
adds r5, 0x1
- bl sub_80091E0
+ bl GetExpandedPlaceholder
adds r1, r0, 0
adds r0, r4, 0
bl sub_8008FCC
@@ -577,7 +577,7 @@ sub_80090B8: @ 80090B8
adds r0, r5, 0
mov r1, sp
_080090DA:
- bl sub_8008D84
+ bl StringCopy
adds r5, r0, 0
_080090E0:
ldrb r0, [r6]
@@ -763,8 +763,8 @@ sub_80091D8: @ 80091D8
_080091DC: .4byte gUnknown_8415A49
thumb_func_end sub_80091D8
- thumb_func_start sub_80091E0
-sub_80091E0: @ 80091E0
+ thumb_func_start GetExpandedPlaceholder
+GetExpandedPlaceholder: @ 80091E0
push {lr}
cmp r0, 0xD
bhi _080091F8
@@ -783,10 +783,10 @@ _080091FA:
bx r1
.align 2, 0
_08009200: .4byte gUnknown_8415A20
- thumb_func_end sub_80091E0
+ thumb_func_end GetExpandedPlaceholder
- thumb_func_start sub_8009204
-sub_8009204: @ 8009204
+ thumb_func_start StringFill
+StringFill: @ 8009204
push {lr}
adds r3, r0, 0
lsls r1, 24
@@ -810,10 +810,10 @@ _08009224:
adds r0, r3, 0
pop {r1}
bx r1
- thumb_func_end sub_8009204
+ thumb_func_end StringFill
- thumb_func_start sub_8009230
-sub_8009230: @ 8009230
+ thumb_func_start StringCopyPadded
+StringCopyPadded: @ 8009230
push {r4,r5,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -860,21 +860,21 @@ _08009274:
bx r1
.align 2, 0
_08009280: .4byte 0x0000ffff
- thumb_func_end sub_8009230
+ thumb_func_end StringCopyPadded
- thumb_func_start sub_8009284
-sub_8009284: @ 8009284
+ thumb_func_start StringFillWithTerminator
+StringFillWithTerminator: @ 8009284
push {lr}
lsls r2, r1, 16
lsrs r2, 16
movs r1, 0xFF
- bl sub_8009204
+ bl StringFill
pop {r1}
bx r1
- thumb_func_end sub_8009284
+ thumb_func_end StringFillWithTerminator
- thumb_func_start sub_8009294
-sub_8009294: @ 8009294
+ thumb_func_start StringCopyN_Multibyte
+StringCopyN_Multibyte: @ 8009294
push {r4,r5,lr}
adds r4, r0, 0
adds r3, r1, 0
@@ -910,10 +910,10 @@ _080092C6:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8009294
+ thumb_func_end StringCopyN_Multibyte
- thumb_func_start sub_80092D4
-sub_80092D4: @ 80092D4
+ thumb_func_start StringLength_Multibyte
+StringLength_Multibyte: @ 80092D4
push {lr}
adds r2, r0, 0
movs r3, 0
@@ -933,10 +933,10 @@ _080092E6:
adds r0, r3, 0
pop {r1}
bx r1
- thumb_func_end sub_80092D4
+ thumb_func_end StringLength_Multibyte
- thumb_func_start sub_80092F4
-sub_80092F4: @ 80092F4
+ thumb_func_start WriteColorChangeControlCode
+WriteColorChangeControlCode: @ 80092F4
push {lr}
adds r3, r0, 0
lsls r2, 24
@@ -971,10 +971,10 @@ _08009320:
adds r0, r3, 0
pop {r1}
bx r1
- thumb_func_end sub_80092F4
+ thumb_func_end WriteColorChangeControlCode
- thumb_func_start sub_8009330
-sub_8009330: @ 8009330
+ thumb_func_start GetExtCtrlCodeLength
+GetExtCtrlCodeLength: @ 8009330
push {lr}
lsls r0, 24
lsrs r1, r0, 24
@@ -989,17 +989,17 @@ _08009342:
bx r1
.align 2, 0
_08009348: .4byte gUnknown_8231EA8
- thumb_func_end sub_8009330
+ thumb_func_end GetExtCtrlCodeLength
- thumb_func_start sub_800934C
-sub_800934C: @ 800934C
+ thumb_func_start SkipExtCtrlCode
+SkipExtCtrlCode: @ 800934C
push {r4,lr}
adds r4, r0, 0
b _08009360
_08009352:
adds r4, 0x1
ldrb r0, [r4]
- bl sub_8009330
+ bl GetExtCtrlCodeLength
lsls r0, 24
lsrs r0, 24
adds r4, r0
@@ -1011,10 +1011,10 @@ _08009360:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_800934C
+ thumb_func_end SkipExtCtrlCode
- thumb_func_start sub_8009370
-sub_8009370: @ 8009370
+ thumb_func_start StringCompareWithoutExtCtrlCodes
+StringCompareWithoutExtCtrlCodes: @ 8009370
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -1036,10 +1036,10 @@ _08009388:
adds r5, 0x1
_08009392:
adds r0, r4, 0
- bl sub_800934C
+ bl SkipExtCtrlCode
adds r4, r0, 0
adds r0, r5, 0
- bl sub_800934C
+ bl SkipExtCtrlCode
adds r5, r0, 0
ldrb r1, [r4]
ldrb r0, [r5]
@@ -1054,19 +1054,19 @@ _080093B2:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8009370
+ thumb_func_end StringCompareWithoutExtCtrlCodes
- thumb_func_start sub_80093BC
-sub_80093BC: @ 80093BC
+ thumb_func_start ConvertInternationalString
+ConvertInternationalString: @ 80093BC
push {r4,lr}
adds r4, r0, 0
lsls r1, 24
lsrs r1, 24
cmp r1, 0x1
bne _0800941C
- bl sub_8009424
+ bl StripExtCtrlCodes
adds r0, r4, 0
- bl sub_8008E08
+ bl StringLength
lsls r0, 24
lsrs r2, r0, 24
adds r1, r2, 0
@@ -1110,10 +1110,10 @@ _0800941C:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_80093BC
+ thumb_func_end ConvertInternationalString
- thumb_func_start sub_8009424
-sub_8009424: @ 8009424
+ thumb_func_start StripExtCtrlCodes
+StripExtCtrlCodes: @ 8009424
push {r4-r6,lr}
adds r5, r0, 0
movs r4, 0
@@ -1131,7 +1131,7 @@ _08009432:
lsrs r4, r0, 16
adds r0, r5, r4
ldrb r0, [r0]
- bl sub_8009330
+ bl GetExtCtrlCodeLength
lsls r0, 24
lsrs r0, 24
adds r0, r4, r0
@@ -1163,6 +1163,6 @@ _08009474:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8009424
+ thumb_func_end StripExtCtrlCodes
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/task.s b/asm/task.s
index d3b1f86e1..7e6b0eb0b 100644
--- a/asm/task.s
+++ b/asm/task.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_80773BC
-sub_80773BC: @ 80773BC
+ thumb_func_start ResetTasks
+ResetTasks: @ 80773BC
push {r4-r7,lr}
movs r4, 0
ldr r6, _08077410 @ =gUnknown_3005090
@@ -52,10 +52,10 @@ _080773C6:
_08077410: .4byte gUnknown_3005090
_08077414: .4byte nullsub_43
_08077418: .4byte 0x0000025e
- thumb_func_end sub_80773BC
+ thumb_func_end ResetTasks
- thumb_func_start sub_807741C
-sub_807741C: @ 807741C
+ thumb_func_start CreateTask
+CreateTask: @ 807741C
push {r4-r7,lr}
adds r2, r0, 0
lsls r1, 24
@@ -73,7 +73,7 @@ _08077428:
str r2, [r4]
strb r1, [r4, 0x7]
adds r0, r6, 0
- bl sub_8077470
+ bl InsertTask
adds r0, r7, 0
adds r0, 0x8
adds r0, r5, r0
@@ -97,16 +97,16 @@ _08077468:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_807741C
+ thumb_func_end CreateTask
- thumb_func_start sub_8077470
-sub_8077470: @ 8077470
+ thumb_func_start InsertTask
+InsertTask: @ 8077470
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_80775A8
+ bl FindFirstActiveTask
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x10
@@ -180,10 +180,10 @@ _080774FC:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8077470
+ thumb_func_end InsertTask
- thumb_func_start sub_8077508
-sub_8077508: @ 8077508
+ thumb_func_start DestroyTask
+DestroyTask: @ 8077508
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -243,12 +243,12 @@ _08077572:
pop {r4}
pop {r0}
bx r0
- thumb_func_end sub_8077508
+ thumb_func_end DestroyTask
- thumb_func_start sub_8077578
-sub_8077578: @ 8077578
+ thumb_func_start RunTasks
+RunTasks: @ 8077578
push {r4,r5,lr}
- bl sub_80775A8
+ bl FindFirstActiveTask
lsls r0, 24
lsrs r0, 24
cmp r0, 0x10
@@ -270,10 +270,10 @@ _0807759C:
bx r0
.align 2, 0
_080775A4: .4byte gUnknown_3005090
- thumb_func_end sub_8077578
+ thumb_func_end RunTasks
- thumb_func_start sub_80775A8
-sub_80775A8: @ 80775A8
+ thumb_func_start FindFirstActiveTask
+FindFirstActiveTask: @ 80775A8
push {lr}
movs r2, 0
ldr r0, _080775E0 @ =gUnknown_3005090
@@ -306,15 +306,15 @@ _080775DA:
bx r1
.align 2, 0
_080775E0: .4byte gUnknown_3005090
- thumb_func_end sub_80775A8
+ thumb_func_end FindFirstActiveTask
thumb_func_start nullsub_43
nullsub_43: @ 80775E4
bx lr
thumb_func_end nullsub_43
- thumb_func_start sub_80775E8
-sub_80775E8: @ 80775E8
+ thumb_func_start SetTaskFuncWithFollowupFunc
+SetTaskFuncWithFollowupFunc: @ 80775E8
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -340,10 +340,10 @@ sub_80775E8: @ 80775E8
bx r0
.align 2, 0
_08077618: .4byte gUnknown_3005090
- thumb_func_end sub_80775E8
+ thumb_func_end SetTaskFuncWithFollowupFunc
- thumb_func_start sub_807761C
-sub_807761C: @ 807761C
+ thumb_func_start SwitchTaskToFollowupFunc
+SwitchTaskToFollowupFunc: @ 807761C
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -369,10 +369,10 @@ sub_807761C: @ 807761C
bx r0
.align 2, 0
_0807764C: .4byte gUnknown_3005090
- thumb_func_end sub_807761C
+ thumb_func_end SwitchTaskToFollowupFunc
- thumb_func_start sub_8077650
-sub_8077650: @ 8077650
+ thumb_func_start FuncIsActiveTask
+FuncIsActiveTask: @ 8077650
push {r4,lr}
adds r3, r0, 0
movs r2, 0
@@ -403,10 +403,10 @@ _08077680:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8077650
+ thumb_func_end FuncIsActiveTask
- thumb_func_start sub_8077688
-sub_8077688: @ 8077688
+ thumb_func_start FindTaskIdByFunc
+FindTaskIdByFunc: @ 8077688
push {lr}
adds r3, r0, 0
movs r2, 0
@@ -432,10 +432,10 @@ _080776A8:
_080776B2:
pop {r1}
bx r1
- thumb_func_end sub_8077688
+ thumb_func_end FindTaskIdByFunc
- thumb_func_start sub_80776B8
-sub_80776B8: @ 80776B8
+ thumb_func_start GetTaskCount
+GetTaskCount: @ 80776B8
push {lr}
movs r2, 0
movs r1, 0
@@ -462,10 +462,10 @@ _080776D4:
bx r1
.align 2, 0
_080776E4: .4byte gUnknown_3005090
- thumb_func_end sub_80776B8
+ thumb_func_end GetTaskCount
- thumb_func_start sub_80776E8
-sub_80776E8: @ 80776E8
+ thumb_func_start SetWordTaskArg
+SetWordTaskArg: @ 80776E8
push {r4,r5,lr}
adds r5, r2, 0
lsls r0, 24
@@ -495,10 +495,10 @@ _08077716:
bx r0
.align 2, 0
_0807771C: .4byte gUnknown_3005090
- thumb_func_end sub_80776E8
+ thumb_func_end SetWordTaskArg
- thumb_func_start sub_8077720
-sub_8077720: @ 8077720
+ thumb_func_start GetWordTaskArg
+GetWordTaskArg: @ 8077720
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -532,6 +532,6 @@ _08077754:
bx r1
.align 2, 0
_0807775C: .4byte gUnknown_3005090
- thumb_func_end sub_8077720
+ thumb_func_end GetWordTaskArg
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/teachy_tv.s b/asm/teachy_tv.s
index 5d36bf6fa..e31ed37f6 100644
--- a/asm/teachy_tv.s
+++ b/asm/teachy_tv.s
@@ -8,11 +8,11 @@
thumb_func_start sub_815AB94
sub_815AB94: @ 815AB94
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_815AB94
@@ -20,9 +20,9 @@ sub_815AB94: @ 815AB94
thumb_func_start sub_815ABB0
sub_815ABB0: @ 815ABB0
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_815ABB0
@@ -49,7 +49,7 @@ _0815ABE0:
strb r4, [r3, 0x4]
_0815ABE6:
ldr r0, _0815ABF8 @ =sub_815AC2C
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -109,7 +109,7 @@ _0815AC44: .4byte gUnknown_30030F0
_0815AC48:
ldr r4, _0815AC90 @ =gUnknown_203F450
ldr r0, _0815AC94 @ =0x00004008
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
str r5, [r0]
ldr r1, _0815AC98 @ =0x00004006
@@ -121,12 +121,12 @@ _0815AC48:
movs r1, 0xFF
strb r1, [r0]
bl sub_80BF768
- bl sub_80F6790
- bl sub_8087E64
- bl sub_80088F0
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
+ bl clear_scheduled_bg_copies_to_vram
+ bl remove_some_task
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
bl sub_815AD88
bl sub_815AE38
ldrb r0, [r6]
@@ -138,7 +138,7 @@ _0815AC90: .4byte gUnknown_203F450
_0815AC94: .4byte 0x00004008
_0815AC98: .4byte 0x00004006
_0815AC9C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -151,7 +151,7 @@ _0815AC9C:
bne _0815ACEC
ldr r0, _0815ACE4 @ =sub_815BA54
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
bl sub_815B014
@@ -173,7 +173,7 @@ _0815ACE8: .4byte gUnknown_3005090
_0815ACEC:
ldr r0, _0815AD78 @ =sub_815B2C0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r5, r0, 24
bl sub_815AEE8
@@ -192,17 +192,17 @@ _0815ACEC:
bl sub_815AF5C
movs r0, 0xAD
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
bl sub_815B094
_0815AD26:
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x9
bl sub_812B1E0
movs r4, 0x1
@@ -210,18 +210,18 @@ _0815AD26:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0815AD80 @ =sub_815ABB0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0815AD84 @ =sub_815AB94
- bl sub_8000544
+ bl SetMainCallback2
_0815AD6E:
add sp, 0x4
pop {r4-r6}
@@ -248,39 +248,39 @@ sub_815AD88: @ 815AD88
ldr r1, [r4]
adds r1, 0x4
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0815AE28 @ =0x00001004
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0815AE2C @ =0x00002004
adds r1, r0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r1, 0xC1
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r1, 0x80
lsls r1, 5
movs r0, 0x3
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
movs r1, 0xA0
lsls r1, 6
movs r0, 0x3
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, [r4]
ldr r1, _0815AE30 @ =0x00004004
adds r0, r1
@@ -293,7 +293,7 @@ sub_815AD88: @ 815AD88
strb r1, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -313,33 +313,33 @@ sub_815AE38: @ 815AE38
movs r4, 0
add r0, sp, 0x4
strh r4, [r0]
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r1, _0815AE98 @ =gUnknown_8E86240
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _0815AE9C @ =gUnknown_8E86BE8
ldr r4, _0815AEA0 @ =gUnknown_203F450
ldr r1, [r4]
adds r1, 0x4
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _0815AEA4 @ =gUnknown_8E86D6C
ldr r1, [r4]
ldr r2, _0815AEA8 @ =0x00003004
adds r1, r2
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _0815AEAC @ =gUnknown_8E86F98
movs r1, 0
movs r2, 0x80
- bl sub_80703A8
+ bl LoadCompressedPalette
add r0, sp, 0x4
movs r1, 0
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0815AEB0 @ =gUnknown_83A5348
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, [r4]
ldr r1, _0815AEB4 @ =0x00002004
adds r0, r1
@@ -367,11 +367,11 @@ sub_815AEB8: @ 815AEB8
bl sub_8002C28
movs r0, 0
movs r1, 0xCC
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -423,7 +423,7 @@ _0815AF30:
ldrh r1, [r0, 0x6]
ldrh r2, [r0, 0x8]
adds r0, r4, 0
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
pop {r4,r5}
@@ -460,7 +460,7 @@ _0815AF80: .4byte 0x00004007
_0815AF84:
ldr r0, _0815AF9C @ =gUnknown_8479380
ldr r1, _0815AFA0 @ =gUnknown_203F44A
- bl sub_8133A20
+ bl AddScrollIndicatorArrowPair
ldr r1, _0815AFA4 @ =gUnknown_203F450
ldr r1, [r1]
ldr r2, _0815AFA8 @ =0x00004007
@@ -486,7 +486,7 @@ sub_815AFAC: @ 815AFAC
ldrb r0, [r1]
cmp r0, 0xFF
beq _0815AFCA
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r0, [r4]
ldr r1, _0815AFD4 @ =0x00004007
adds r0, r1
@@ -520,16 +520,16 @@ sub_815AFEC: @ 815AFEC
push {lr}
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xCC
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0x5
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_815AFEC
@@ -595,7 +595,7 @@ sub_815B05C: @ 815B05C
ands r1, r2
strb r1, [r4]
adds r1, r3, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4,r5}
pop {r0}
bx r0
@@ -608,10 +608,10 @@ sub_815B094: @ 815B094
push {lr}
ldr r1, _0815B0AC @ =0x00000c64
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _0815B0B0 @ =0x00001cd4
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -624,10 +624,10 @@ sub_815B0B4: @ 815B0B4
push {lr}
movs r0, 0x44
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_815B0B4
@@ -636,7 +636,7 @@ sub_815B0B4: @ 815B0B4
sub_815B0CC: @ 815B0CC
push {r4-r7,lr}
movs r0, 0x2
- bl sub_8002008
+ bl GetBgTilemapBuffer
adds r7, r0, 0
movs r0, 0x1
_0815B0D8:
@@ -644,7 +644,7 @@ _0815B0D8:
lsls r5, r0, 5
adds r6, r0, 0x1
_0815B0DE:
- bl sub_8044EC8
+ bl Random
adds r2, r5, r4
lsls r2, 1
adds r2, r7
@@ -665,7 +665,7 @@ _0815B0DE:
cmp r0, 0xC
bls _0815B0D8
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4-r7}
pop {r0}
bx r0
@@ -692,7 +692,7 @@ sub_815B118: @ 815B118
ldr r1, _0815B194 @ =gUnknown_202063C
adds r7, r0, r1
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
bl sub_815B0B4
ldr r0, _0815B198 @ =gUnknown_203F444
ldrb r0, [r0, 0x5]
@@ -710,11 +710,11 @@ sub_815B118: @ 815B118
movs r0, 0x3
adds r1, r4, 0
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
adds r1, r4, 0
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
ldr r2, _0815B19C @ =gUnknown_203F450
ldr r1, [r2]
ldr r0, _0815B1A0 @ =0x00004004
@@ -803,7 +803,7 @@ sub_815B220: @ 815B220
push {r4,lr}
ldr r4, _0815B238 @ =gUnknown_203F450
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
bl sub_8003ECC
@@ -827,7 +827,7 @@ sub_815B23C: @ 815B23C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0815B26C @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -860,7 +860,7 @@ sub_815B274: @ 815B274
ldr r0, [r0]
cmp r0, 0
beq _0815B2A0
- bl sub_8000544
+ bl SetMainCallback2
b _0815B2AC
.align 2, 0
_0815B298: .4byte gUnknown_2037AB8
@@ -869,11 +869,11 @@ _0815B2A0:
bl sub_8055DC4
ldr r0, _0815B2BC @ =gUnknown_203F444
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
_0815B2AC:
bl sub_815B220
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0815B2B6:
pop {r4}
pop {r0}
@@ -900,13 +900,13 @@ sub_815B2C0: @ 815B2C0
cmp r0, 0
bne _0815B37A
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r5, r0, 0
ldrb r0, [r6]
ldr r4, _0815B324 @ =gUnknown_203F44A
adds r2, r4, 0x2
adds r1, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _0815B328 @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -951,9 +951,9 @@ _0815B33E:
bl sub_810713C
bl sub_815B0B4
movs r0, 0x1
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_815AFAC
strh r4, [r6, 0x6]
strh r4, [r6, 0x4]
@@ -1005,14 +1005,14 @@ sub_815B38C: @ 815B38C
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
ldrb r0, [r4, 0x2]
movs r1, 0x8
movs r2, 0x38
movs r3, 0x7
bl sub_815B05C
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
strh r0, [r4, 0x4]
ldrh r0, [r4, 0x6]
@@ -1020,7 +1020,7 @@ sub_815B38C: @ 815B38C
strh r0, [r4, 0x6]
movs r0, 0x88
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
_0815B3F0:
add sp, 0xC
pop {r4}
@@ -1058,9 +1058,9 @@ sub_815B404: @ 815B404
movs r1, 0
movs r2, 0x2
movs r3, 0x1
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0
strh r0, [r4, 0x4]
ldrh r0, [r4, 0x6]
@@ -1111,7 +1111,7 @@ _0815B48C:
bne _0815B4B4
adds r0, r1, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, _0815B4B0 @ =gUnknown_841B83D
bl sub_815B1DC
movs r0, 0
@@ -1187,7 +1187,7 @@ sub_815B4EC: @ 815B4EC
bl sub_815B05C
movs r0, 0
movs r1, 0xCC
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1331,7 +1331,7 @@ sub_815B624: @ 815B624
beq _0815B656
movs r0, 0
movs r1, 0xCC
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1365,7 +1365,7 @@ sub_815B664: @ 815B664
ldr r1, _0815B6A4 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x5
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0x4]
strh r0, [r4, 0x8]
@@ -1404,7 +1404,7 @@ sub_815B6A8: @ 815B6A8
lsls r1, 1
movs r0, 0x3
movs r2, 0x2
- bl sub_8001D08
+ bl ChangeBgY
ldrh r0, [r4, 0x4]
adds r0, 0x1
strh r0, [r4, 0x4]
@@ -1441,7 +1441,7 @@ _0815B702:
strh r1, [r4, 0xA]
adds r0, r6, 0
movs r1, 0x7
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x6]
adds r0, 0x1
strh r0, [r4, 0x6]
@@ -1480,7 +1480,7 @@ sub_815B740: @ 815B740
lsls r1, 1
movs r0, 0x3
movs r2, 0x1
- bl sub_8001B90
+ bl ChangeBgX
ldrh r0, [r4, 0x4]
adds r0, 0x1
strh r0, [r4, 0x4]
@@ -1523,7 +1523,7 @@ _0815B7AC:
strh r0, [r4, 0xA]
adds r0, r6, 0
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r4, 0x6]
adds r0, 0x1
strh r0, [r4, 0x6]
@@ -1560,7 +1560,7 @@ sub_815B7E4: @ 815B7E4
adds r4, r0
adds r0, r4, 0
movs r1, 0x6
- bl sub_800838C
+ bl StartSpriteAnim
ldrh r0, [r5, 0x6]
adds r0, 0x1
strh r0, [r5, 0x6]
@@ -1665,9 +1665,9 @@ sub_815B8A4: @ 815B8A4
movs r0, 0x1
movs r2, 0x14
movs r3, 0xA
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_0815B8DC:
ldrh r0, [r4, 0x4]
adds r0, 0x1
@@ -1704,9 +1704,9 @@ sub_815B908: @ 815B908
movs r1, 0
movs r2, 0x14
movs r3, 0xA
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -1728,7 +1728,7 @@ sub_815B92C: @ 815B92C
bne _0815B94C
movs r0, 0xAD
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
_0815B94C:
bl sub_815B0CC
ldrh r0, [r5, 0x4]
@@ -1751,29 +1751,29 @@ _0815B94C:
ldr r1, _0815B9E0 @ =sub_815B2C0
str r1, [r0]
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
bl sub_815AF5C
bl sub_815B094
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r1, 0x80
lsls r1, 5
movs r0, 0x3
movs r2, 0x2
- bl sub_8001B90
+ bl ChangeBgX
movs r1, 0xA0
lsls r1, 6
movs r0, 0x3
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
ldr r2, _0815B9E4 @ =gUnknown_203F450
ldr r0, [r2]
ldr r1, _0815B9E8 @ =0x00004004
@@ -1935,7 +1935,7 @@ sub_815BAA0: @ 815BAA0
movs r1, 0
movs r2, 0
adds r3, r7, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 4
@@ -1956,7 +1956,7 @@ sub_815BAA0: @ 815BAA0
bne _0815BB4C
adds r0, r4, 0
movs r1, 0x4
- bl sub_80083C0
+ bl SeekSpriteAnim
ldrb r0, [r4, 0x5]
movs r1, 0xD
negs r1, r1
@@ -1975,7 +1975,7 @@ _0815BB48: .4byte sub_815BB6C
_0815BB4C:
ldr r1, _0815BB68 @ =gUnknown_84795B8
adds r0, r4, 0
- bl sub_8008A58
+ bl SetSubspriteTables
adds r1, r4, 0
adds r1, 0x42
movs r0, 0x40
@@ -2017,7 +2017,7 @@ sub_815BB6C: @ 815BB6C
cmp r0, 0x1
bne _0815BBB4
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
b _0815BC3A
.align 2, 0
_0815BBA4: .4byte gUnknown_3005098
@@ -2093,7 +2093,7 @@ _0815BBE0:
ble _0815BC3A
_0815BC34:
adds r0, r3, 0
- bl sub_8007280
+ bl DestroySprite
_0815BC3A:
pop {r4,r5}
pop {r0}
@@ -2161,7 +2161,7 @@ sub_815BC90: @ 815BC90
ldr r1, _0815BCD8 @ =gUnknown_30030F0
ldr r0, _0815BCDC @ =sub_815BD58
str r0, [r1, 0x8]
- bl sub_804C1F0
+ bl copy_player_party_to_sav1
bl sub_8159F40
movs r0, 0
bl sub_8044090
@@ -2229,9 +2229,9 @@ _0815BD36:
cmp r0, 0
beq _0815BD4C
ldr r0, _0815BD54 @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0815BD4C:
pop {r4,r5}
pop {r0}
@@ -2255,7 +2255,7 @@ _0815BD6C: .4byte gUnknown_2023E8A
_0815BD70:
movs r0, 0x88
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
_0815BD78:
bl sub_815ABFC
pop {r0}
@@ -2277,14 +2277,14 @@ sub_815BD80: @ 815BD80
mov r8, r1
movs r0, 0x80
lsls r0, 4
- bl sub_8002BB0
+ bl AllocZeroed
adds r6, r0, 0
movs r0, 0x80
lsls r0, 8
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [sp, 0x8]
movs r0, 0x10
- bl sub_8002B9C
+ bl Alloc
str r0, [sp, 0xC]
movs r1, 0xFF
movs r2, 0x10
@@ -2392,10 +2392,10 @@ _0815BE56:
bls _0815BDDE
ldr r2, [sp, 0x10]
lsls r0, r2, 7
- bl sub_8002B9C
+ bl Alloc
adds r7, r0, 0
movs r0, 0x80
- bl sub_8002B9C
+ bl Alloc
adds r5, r0, 0
movs r4, 0
ldr r3, [sp, 0x10]
@@ -2458,20 +2458,20 @@ _0815BF00:
movs r0, 0x3
adds r1, r7, 0
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
mov r0, r8
ldr r1, [sp, 0xC]
bl sub_815C230
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
adds r0, r7, 0
- bl sub_8002BC4
+ bl Free
ldr r0, [sp, 0xC]
- bl sub_8002BC4
+ bl Free
ldr r0, [sp, 0x8]
- bl sub_8002BC4
+ bl Free
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -2501,7 +2501,7 @@ sub_815BF48: @ 815BF48
b _0815BF6A
_0815BF64:
ldr r0, [r3, 0x4]
- bl sub_800EBB4
+ bl LZDecompressWram
_0815BF6A:
pop {r0}
bx r0
@@ -2696,10 +2696,10 @@ sub_815C0D4: @ 815C0D4
lsrs r2, 24
mov r10, r2
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
adds r6, r0, 0
movs r0, 0x20
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [sp]
adds r0, r4, 0
adds r1, r6, 0
@@ -2815,9 +2815,9 @@ _0815C1CA:
cmp r5, 0x1F
bls _0815C198
ldr r0, [sp]
- bl sub_8002BC4
+ bl Free
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x4
pop {r3-r5}
mov r8, r3
@@ -2893,7 +2893,7 @@ _0815C24C:
lsls r1, 20
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
diff --git a/asm/text.s b/asm/text.s
index 7532ec0b9..9ea6a0c42 100644
--- a/asm/text.s
+++ b/asm/text.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_800537C
-sub_800537C: @ 800537C
+ thumb_func_start Font0Func
+Font0Func: @ 800537C
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -32,10 +32,10 @@ _080053A0:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_800537C
+ thumb_func_end Font0Func
- thumb_func_start sub_80053B0
-sub_80053B0: @ 80053B0
+ thumb_func_start Font1Func
+Font1Func: @ 80053B0
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -63,10 +63,10 @@ _080053D8:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80053B0
+ thumb_func_end Font1Func
- thumb_func_start sub_80053E8
-sub_80053E8: @ 80053E8
+ thumb_func_start Font2Func
+Font2Func: @ 80053E8
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -94,10 +94,10 @@ _08005410:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_80053E8
+ thumb_func_end Font2Func
- thumb_func_start sub_8005420
-sub_8005420: @ 8005420
+ thumb_func_start Font3Func
+Font3Func: @ 8005420
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -125,10 +125,10 @@ _08005448:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8005420
+ thumb_func_end Font3Func
- thumb_func_start sub_8005458
-sub_8005458: @ 8005458
+ thumb_func_start Font4Func
+Font4Func: @ 8005458
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -156,10 +156,10 @@ _08005480:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8005458
+ thumb_func_end Font4Func
- thumb_func_start sub_8005490
-sub_8005490: @ 8005490
+ thumb_func_start Font5Func
+Font5Func: @ 8005490
push {lr}
adds r2, r0, 0
adds r3, r2, 0
@@ -187,7 +187,7 @@ _080054B8:
lsrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8005490
+ thumb_func_end Font5Func
thumb_func_start sub_80054C8
sub_80054C8: @ 80054C8
@@ -261,7 +261,7 @@ _08005530:
str r4, [sp]
movs r4, 0xC
str r4, [sp, 0x4]
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r0, [r7]
lsls r0, 30
lsrs r0, 31
@@ -298,7 +298,7 @@ _08005566:
str r1, [sp, 0x14]
adds r1, r3, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
ldrb r0, [r5, 0x4]
movs r1, 0x2
bl sub_8003F20
@@ -349,7 +349,7 @@ sub_80055D4: @ 80055D4
str r4, [sp]
movs r4, 0xC
str r4, [sp, 0x4]
- bl sub_8004378
+ bl FillWindowPixelRect
ldrb r0, [r5, 0x4]
movs r1, 0x2
bl sub_8003F20
@@ -504,7 +504,7 @@ _080056FA:
adds r0, r5, 0
adds r2, r7, 0
adds r3, r6, 0
- bl sub_8004378
+ bl FillWindowPixelRect
cmp r4, 0
bne _08005778
ldr r0, _0800572C @ =gUnknown_3003E50
@@ -544,7 +544,7 @@ _08005736:
adds r0, r5, 0
adds r1, r3, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
adds r0, r5, 0
movs r1, 0x2
bl sub_8003F20
@@ -904,7 +904,7 @@ _08005A1E:
b _0800589E
_08005A40:
adds r0, r3, 0
- bl sub_80722A0
+ bl PlayBGM
b _0800589E
.align 2, 0
_08005A48: .4byte gUnknown_203ADFA
@@ -946,7 +946,7 @@ _08005A84:
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _0800589E
_08005A96:
ldr r0, _08005AA0 @ =gMPlay_BGM
@@ -1058,7 +1058,7 @@ _08005B46:
adds r1, r3, 0
ldrb r2, [r6, 0x8]
ldrb r3, [r6, 0x9]
- bl sub_80063C8
+ bl DrawKeypadIcon
ldr r1, _08005B68 @ =gUnknown_3003DA0
adds r1, 0x80
strb r0, [r1]
@@ -1211,7 +1211,7 @@ _08005C7A:
lsrs r1, r2, 4
orrs r1, r2
lsrs r1, 24
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r6, 0x6]
movs r1, 0
strb r0, [r6, 0x8]
@@ -1268,7 +1268,7 @@ _08005CD0:
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl sub_80044A8
+ bl ScrollWindow
movs r0, 0
strb r0, [r6, 0x1F]
b _08005D36
@@ -1286,7 +1286,7 @@ _08005D0C:
orrs r3, r1
lsrs r3, 24
movs r1, 0
- bl sub_80044A8
+ bl ScrollWindow
ldr r0, [r5]
ldrb r0, [r0, 0x14]
lsls r0, 29
@@ -1305,7 +1305,7 @@ _08005D40:
strb r2, [r6, 0x1C]
b _08005B30
_08005D44:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -1755,7 +1755,7 @@ _080060AE:
_080060C8:
adds r4, 0x1
ldrb r0, [r4]
- bl sub_8006428
+ bl GetKeypadIconWidth
lsls r0, 24
lsrs r0, 24
_080060D4:
@@ -1948,7 +1948,7 @@ _08006256:
b _08006280
_0800625A:
adds r0, r6, 0
- bl sub_8006AC4
+ bl DecompressGlyphFont9
ldr r4, _080062A8 @ =gUnknown_3003DA0
ldr r5, _080062AC @ =0x04000008
adds r0, r4, 0
@@ -2063,9 +2063,9 @@ sub_8006300: @ 8006300
lsls r0, 3
ldr r1, _08006388 @ =gUnknown_81EA68C
adds r0, r1
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _0800638C @ =gUnknown_81EA6A4
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _08006390 @ =gUnknown_81EA6B4
adds r4, 0x3
lsls r4, 16
@@ -2076,7 +2076,7 @@ sub_8006300: @ 8006300
adds r1, r4, 0
adds r2, r5, 0
mov r3, r8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _08006394 @ =gUnknown_202063C
@@ -2122,13 +2122,13 @@ sub_8006398: @ 8006398
lsls r0, 2
ldr r1, _080063C4 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
movs r4, 0x80
lsls r4, 8
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4}
pop {r0}
bx r0
@@ -2136,8 +2136,8 @@ sub_8006398: @ 8006398
_080063C4: .4byte gUnknown_202063C
thumb_func_end sub_8006398
- thumb_func_start sub_80063C8
-sub_80063C8: @ 80063C8
+ thumb_func_start DrawKeypadIcon
+DrawKeypadIcon: @ 80063C8
push {r4,r5,lr}
sub sp, 0x18
lsls r0, 24
@@ -2166,7 +2166,7 @@ sub_80063C8: @ 80063C8
adds r1, r5, 0
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
adds r0, r4, 0
add sp, 0x18
pop {r4,r5}
@@ -2175,10 +2175,10 @@ sub_80063C8: @ 80063C8
.align 2, 0
_08006410: .4byte gUnknown_81EA6CC
_08006414: .4byte gUnknown_81EA700
- thumb_func_end sub_80063C8
+ thumb_func_end DrawKeypadIcon
- thumb_func_start sub_8006418
-sub_8006418: @ 8006418
+ thumb_func_start GetKeypadIconTileOffset
+GetKeypadIconTileOffset: @ 8006418
lsls r0, 24
ldr r1, _08006424 @ =gUnknown_81EA6CC
lsrs r0, 22
@@ -2187,10 +2187,10 @@ sub_8006418: @ 8006418
bx lr
.align 2, 0
_08006424: .4byte gUnknown_81EA6CC
- thumb_func_end sub_8006418
+ thumb_func_end GetKeypadIconTileOffset
- thumb_func_start sub_8006428
-sub_8006428: @ 8006428
+ thumb_func_start GetKeypadIconWidth
+GetKeypadIconWidth: @ 8006428
lsls r0, 24
ldr r1, _08006434 @ =gUnknown_81EA6CC
lsrs r0, 22
@@ -2199,10 +2199,10 @@ sub_8006428: @ 8006428
bx lr
.align 2, 0
_08006434: .4byte gUnknown_81EA6CC
- thumb_func_end sub_8006428
+ thumb_func_end GetKeypadIconWidth
- thumb_func_start sub_8006438
-sub_8006438: @ 8006438
+ thumb_func_start GetKeypadIconHeight
+GetKeypadIconHeight: @ 8006438
lsls r0, 24
ldr r1, _08006444 @ =gUnknown_81EA6CC
lsrs r0, 22
@@ -2211,7 +2211,7 @@ sub_8006438: @ 8006438
bx lr
.align 2, 0
_08006444: .4byte gUnknown_81EA6CC
- thumb_func_end sub_8006438
+ thumb_func_end GetKeypadIconHeight
thumb_func_start sub_8006448
sub_8006448: @ 8006448
@@ -3049,8 +3049,8 @@ _08006ABA:
_08006AC0: .4byte gUnknown_8227930
thumb_func_end sub_8006A98
- thumb_func_start sub_8006AC4
-sub_8006AC4: @ 8006AC4
+ thumb_func_start DecompressGlyphFont9
+DecompressGlyphFont9: @ 8006AC4
push {r4,r5,lr}
lsls r0, 16
lsrs r4, r0, 20
@@ -3086,6 +3086,6 @@ sub_8006AC4: @ 8006AC4
.align 2, 0
_08006B08: .4byte gUnknown_822FC48
_08006B0C: .4byte gUnknown_3003DA0
- thumb_func_end sub_8006AC4
+ thumb_func_end DecompressGlyphFont9
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/text_window.s b/asm/text_window.s
index c48d09d03..94e766306 100644
--- a/asm/text_window.s
+++ b/asm/text_window.s
@@ -19,12 +19,12 @@ sub_814FD04: @ 814FD04
ldr r1, _0814FD34 @ =gUnknown_84566A8
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -46,12 +46,12 @@ sub_814FD38: @ 814FD38
ldr r1, _0814FD68 @ =gUnknown_841F1C8
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -73,12 +73,12 @@ sub_814FD6C: @ 814FD6C
ldr r1, _0814FD9C @ =gUnknown_8470B0C
movs r2, 0x98
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x1
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -100,12 +100,12 @@ sub_814FDA0: @ 814FDA0
ldr r1, _0814FDD0 @ =gUnknown_8471A4C
movs r2, 0x90
lsls r2, 1
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
adds r1, r4, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -124,7 +124,7 @@ sub_814FDD4: @ 814FDD4
ldr r1, _0814FDF0 @ =gUnknown_8471B6C
movs r2, 0xA0
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
pop {r0}
bx r0
.align 2, 0
@@ -155,13 +155,13 @@ sub_814FDF4: @ 814FDF4
movs r2, 0x90
lsls r2, 1
adds r3, r6, 0
- bl sub_80017D0
+ bl LoadBgTiles
adds r5, 0x4
adds r4, r5
ldr r0, [r4]
mov r1, r8
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -214,12 +214,12 @@ sub_814FE6C: @ 814FE6C
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x2
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -246,12 +246,12 @@ sub_814FEAC: @ 814FEAC
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -278,12 +278,12 @@ sub_814FEEC: @ 814FEEC
movs r2, 0x98
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x1
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -310,12 +310,12 @@ sub_814FF2C: @ 814FF2C
movs r2, 0x90
lsls r2, 1
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
adds r1, r5, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4,r5}
pop {r0}
bx r0
@@ -339,7 +339,7 @@ sub_814FF6C: @ 814FF6C
movs r2, 0x90
lsls r2, 1
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
pop {r4}
pop {r0}
bx r0
@@ -363,7 +363,7 @@ sub_814FF98: @ 814FF98
movs r2, 0xA0
lsls r2, 2
adds r3, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
pop {r4}
pop {r0}
bx r0
@@ -400,13 +400,13 @@ sub_814FFC4: @ 814FFC4
movs r2, 0x90
lsls r2, 1
adds r3, r6, 0
- bl sub_80017D0
+ bl LoadBgTiles
adds r5, 0x4
adds r4, r5
ldr r0, [r4]
mov r1, r8
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r3}
mov r8, r3
pop {r4-r6}
@@ -507,7 +507,7 @@ sub_8150048: @ 8150048
adds r1, r5, 0
ldr r2, [sp, 0x14]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x1
lsls r1, 16
lsrs r1, 16
@@ -527,7 +527,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x2
lsls r1, 16
lsrs r1, 16
@@ -544,7 +544,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x3
lsls r1, 16
lsrs r1, 16
@@ -562,7 +562,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x14]
mov r3, r9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x5
lsls r1, 16
lsrs r1, 16
@@ -574,7 +574,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
mov r2, r8
mov r3, r9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x6
lsls r1, 16
lsrs r1, 16
@@ -590,7 +590,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x14]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r1, r5, 0x7
lsls r1, 16
lsrs r1, 16
@@ -603,7 +603,7 @@ sub_8150048: @ 8150048
adds r0, r7, 0
ldr r2, [sp, 0x18]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
adds r5, 0x8
lsls r5, 16
lsrs r5, 16
@@ -616,7 +616,7 @@ sub_8150048: @ 8150048
adds r1, r5, 0
mov r2, r8
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x20
pop {r3-r5}
mov r8, r3
@@ -690,7 +690,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r1, r9
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x1
lsls r1, 16
@@ -711,7 +711,7 @@ sub_81501D0: @ 81501D0
str r0, [sp, 0x8]
adds r0, r7, 0
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x2
lsls r1, 16
@@ -732,7 +732,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r2, r8
adds r3, r4, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x3
lsls r1, 16
@@ -752,7 +752,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x10]
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x5
lsls r1, 16
@@ -765,7 +765,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x6
lsls r1, 16
@@ -783,7 +783,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x10]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r9
adds r1, 0x7
lsls r1, 16
@@ -797,7 +797,7 @@ sub_81501D0: @ 81501D0
adds r0, r7, 0
ldr r2, [sp, 0x14]
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x8
add r9, r0
mov r0, r9
@@ -813,7 +813,7 @@ sub_81501D0: @ 81501D0
mov r1, r9
mov r2, r8
adds r3, r6, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x1C
pop {r3-r5}
mov r8, r3
@@ -824,8 +824,8 @@ sub_81501D0: @ 81501D0
bx r0
thumb_func_end sub_81501D0
- thumb_func_start sub_815036C
-sub_815036C: @ 815036C
+ thumb_func_start rbox_fill_rectangle
+rbox_fill_rectangle: @ 815036C
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -890,7 +890,7 @@ sub_815036C: @ 815036C
movs r1, 0
mov r2, r8
adds r3, r5, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r3,r4}
mov r8, r3
@@ -898,10 +898,10 @@ sub_815036C: @ 815036C
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_815036C
+ thumb_func_end rbox_fill_rectangle
- thumb_func_start sub_8150408
-sub_8150408: @ 8150408
+ thumb_func_start stdpal_get
+stdpal_get: @ 8150408
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -943,6 +943,6 @@ _08150446:
bx r1
.align 2, 0
_08150450: .4byte gUnknown_8471DEC
- thumb_func_end sub_8150408
+ thumb_func_end stdpal_get
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/tileset_anims.s b/asm/tileset_anims.s
index 30b7eec16..ece311c92 100644
--- a/asm/tileset_anims.s
+++ b/asm/tileset_anims.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_806FED8
-sub_806FED8: @ 806FED8
+ thumb_func_start ResetTilesetAnimBuffer
+ResetTilesetAnimBuffer: @ 806FED8
push {lr}
sub sp, 0x4
ldr r1, _0806FEF8 @ =gUnknown_3000FAC
@@ -25,10 +25,10 @@ sub_806FED8: @ 806FED8
_0806FEF8: .4byte gUnknown_3000FAC
_0806FEFC: .4byte gUnknown_2037108
_0806FF00: .4byte 0x0500003c
- thumb_func_end sub_806FED8
+ thumb_func_end ResetTilesetAnimBuffer
- thumb_func_start sub_806FF04
-sub_806FF04: @ 806FF04
+ thumb_func_start AppendTilesetAnimToBuffer
+AppendTilesetAnimToBuffer: @ 806FF04
push {r4-r6,lr}
adds r4, r0, 0
adds r5, r1, 0
@@ -68,10 +68,10 @@ _0806FF44:
.align 2, 0
_0806FF4C: .4byte gUnknown_3000FAC
_0806FF50: .4byte gUnknown_2037108
- thumb_func_end sub_806FF04
+ thumb_func_end AppendTilesetAnimToBuffer
- thumb_func_start sub_806FF54
-sub_806FF54: @ 806FF54
+ thumb_func_start TransferTilesetAnimsBuffer
+TransferTilesetAnimsBuffer: @ 806FF54
push {r4-r6,lr}
movs r3, 0
ldr r4, _0806FF90 @ =gUnknown_3000FAC
@@ -108,17 +108,17 @@ _0806FF86:
_0806FF90: .4byte gUnknown_3000FAC
_0806FF94: .4byte 0x040000d4
_0806FF98: .4byte gUnknown_2037108
- thumb_func_end sub_806FF54
+ thumb_func_end TransferTilesetAnimsBuffer
- thumb_func_start sub_806FF9C
-sub_806FF9C: @ 806FF9C
+ thumb_func_start cur_mapheader_run_tileset_funcs_after_some_cpuset
+cur_mapheader_run_tileset_funcs_after_some_cpuset: @ 806FF9C
push {lr}
- bl sub_806FED8
+ bl ResetTilesetAnimBuffer
bl sub_807002C
bl sub_8070068
pop {r0}
bx r0
- thumb_func_end sub_806FF9C
+ thumb_func_end cur_mapheader_run_tileset_funcs_after_some_cpuset
thumb_func_start sub_806FFB0
sub_806FFB0: @ 806FFB0
@@ -131,7 +131,7 @@ sub_806FFB0: @ 806FFB0
thumb_func_start sub_806FFBC
sub_806FFBC: @ 806FFBC
push {r4,lr}
- bl sub_806FED8
+ bl ResetTilesetAnimBuffer
ldr r2, _08070014 @ =gUnknown_3000FAE
ldrh r0, [r2]
adds r0, 0x1
@@ -258,7 +258,7 @@ sub_80700A4: @ 80700A4
ldr r0, [r0]
ldr r1, _080700CC @ =0x06003f80
movs r2, 0x80
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r4}
pop {r0}
bx r0
@@ -281,7 +281,7 @@ sub_80700D0: @ 80700D0
ldr r1, _080700F4 @ =0x06003400
movs r2, 0xC0
lsls r2, 3
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
@@ -303,7 +303,7 @@ sub_80700F8: @ 80700F8
ldr r1, _0807011C @ =0x06003a00
movs r2, 0x90
lsls r2, 2
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
@@ -376,7 +376,7 @@ sub_807017C: @ 807017C
ldr r1, _080701A8 @ =0x06005d00
movs r2, 0x80
lsls r2, 1
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r4}
pop {r0}
bx r0
@@ -441,7 +441,7 @@ sub_80701FC: @ 80701FC
ldr r1, _08070220 @ =0x06007a00
movs r2, 0x80
lsls r2, 1
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
@@ -505,7 +505,7 @@ sub_8070274: @ 8070274
ldr r1, _08070298 @ =0x06007000
movs r2, 0x80
lsls r2, 1
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
@@ -563,7 +563,7 @@ sub_80702DC: @ 80702DC
ldr r0, [r0]
ldr r1, _08070300 @ =0x06006e00
movs r2, 0xE0
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
@@ -619,7 +619,7 @@ sub_8070340: @ 8070340
ldr r0, [r1]
ldr r1, _08070364 @ =0x06005c60
movs r2, 0x80
- bl sub_806FF04
+ bl AppendTilesetAnimToBuffer
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/title_screen.s b/asm/title_screen.s
index 40d6201b1..3f576a7bd 100644
--- a/asm/title_screen.s
+++ b/asm/title_screen.s
@@ -36,16 +36,16 @@ _0807893A:
strb r1, [r0]
_08078946:
movs r0, 0
- bl sub_80006F4
- bl sub_8000558
+ bl SetVBlankCallback
+ bl StartTimer1
ldr r0, _080789D4 @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
- bl sub_8070528
+ bl InitHeap
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetPaletteFade
bl sub_8078B34
add r1, sp, 0x4
movs r0, 0
@@ -87,7 +87,7 @@ _08078946:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080789EC @ =gUnknown_2037F30
movs r0, 0xFF
strb r0, [r1]
@@ -106,69 +106,69 @@ _080789F0:
movs r2, 0xD0
lsls r2, 1
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08078A98 @ =gUnknown_8EAB8C4
movs r4, 0
str r4, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08078A9C @ =gUnknown_8EAD390
str r6, [sp]
movs r0, 0
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _08078AA0 @ =gUnknown_8EAD5E8
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08078AA4 @ =gUnknown_8EAD608
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08078AA8 @ =gUnknown_8EADEE4
str r6, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r5, _08078AAC @ =gUnknown_8EAE094
adds r0, r5, 0
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08078AB0 @ =gUnknown_8EAE0B4
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08078AB4 @ =gUnknown_8EAE374
str r6, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
adds r0, r5, 0
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08078AB8 @ =gUnknown_83BF58C
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08078ABC @ =gUnknown_83BF5A8
str r6, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
bl sub_8079708
b _08078B18
.align 2, 0
@@ -184,26 +184,26 @@ _08078AB4: .4byte gUnknown_8EAE374
_08078AB8: .4byte gUnknown_83BF58C
_08078ABC: .4byte gUnknown_83BF5A8
_08078AC0:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _08078B26
ldr r0, _08078B00 @ =0x0000ffff
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r0, _08078B04 @ =sub_8078C24
movs r1, 0x4
- bl sub_807741C
+ bl CreateTask
ldr r0, _08078B08 @ =sub_8078BEC
movs r1, 0x2
- bl sub_807741C
+ bl CreateTask
ldr r1, _08078B0C @ =gUnknown_2037F30
strb r0, [r1]
ldr r0, _08078B10 @ =sub_8078BB4
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08078B14 @ =sub_8078B9C
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x8B
lsls r0, 1
bl m4aSongNumStart
@@ -237,40 +237,40 @@ sub_8078B34: @ 8078B34
push {lr}
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_8078B34
@@ -278,10 +278,10 @@ sub_8078B34: @ 8078B34
thumb_func_start sub_8078B9C
sub_8078B9C: @ 8078B9C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8078B9C
@@ -289,9 +289,9 @@ sub_8078B9C: @ 8078B9C
thumb_func_start sub_8078BB4
sub_8078BB4: @ 8078BB4
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
bl sub_8087F54
ldr r1, _08078BE4 @ =gUnknown_2037F30
ldrb r0, [r1]
@@ -333,7 +333,7 @@ sub_8078BEC: @ 8078BEC
movs r0, 0xFF
strb r0, [r1]
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
_08078C12:
pop {r0}
bx r0
@@ -414,13 +414,13 @@ sub_8078C9C: @ 8078C9C
sub sp, 0x10
mov r8, r0
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08078D14 @ =0x04000054
str r0, [sp]
ldr r0, _08078D18 @ =0xa2600001
@@ -487,10 +487,10 @@ _08078D3A:
_08078D40:
movs r0, 0x50
movs r1, 0x82
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x80
strh r0, [r4, 0x4]
movs r0, 0x80
@@ -520,10 +520,10 @@ _08078D80: .4byte gUnknown_2039600
_08078D84:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
movs r1, 0x2
bl sub_8078C90
@@ -579,7 +579,7 @@ _08078DF2:
_08078E02:
ldr r0, _08078E20 @ =gUnknown_2037398
movs r1, 0x10
- bl sub_8071594
+ bl TintPalette_GrayScale2
movs r0, 0x80
lsls r0, 6
movs r1, 0
@@ -587,7 +587,7 @@ _08078E02:
movs r1, 0x9
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08078F80
.align 2, 0
_08078E20: .4byte gUnknown_2037398
@@ -618,7 +618,7 @@ _08078E40:
_08078E50:
ldr r0, _08078E78 @ =sub_80792C8
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
movs r0, 0x80
lsls r0, 6
movs r1, 0x4
@@ -739,15 +739,15 @@ _08078F24:
adds r0, r4, 0
movs r1, 0x10
adds r2, r5, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08078F90 @ =gUnknown_8EAD5E8
ldr r1, _08078F94 @ =gUnknown_2037398
movs r2, 0x10
@@ -812,10 +812,10 @@ _08078FD6:
bl sub_812B1F0
ldr r0, _0807902C @ =sub_807941C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r0, _08079030 @ =sub_8079840
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
bl sub_80790A0
bl sub_8079A40
lsls r0, 24
@@ -835,12 +835,12 @@ _08079004:
ldrb r0, [r4, 0xC]
bl sub_8079A88
ldr r0, _08079038 @ =sub_8078C24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _0807903C @ =sub_80796CC
- bl sub_8000544
+ bl SetMainCallback2
b _08079094
.align 2, 0
_0807902C: .4byte sub_807941C
@@ -856,12 +856,12 @@ _08079040:
ldrb r0, [r4, 0xC]
bl sub_8079A88
ldr r0, _08079064 @ =sub_8078C24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _08079068 @ =sub_80796E8
- bl sub_8000544
+ bl SetMainCallback2
b _08079094
.align 2, 0
_08079064: .4byte sub_8078C24
@@ -878,7 +878,7 @@ _0807906C:
b _08079094
_08079080:
ldr r0, _0807909C @ =sub_8078BEC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08079094
@@ -899,16 +899,16 @@ sub_80790A0: @ 80790A0
movs r1, 0x80
lsls r1, 8
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _080790C8 @ =0x00003f1f
movs r0, 0x4A
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0x81
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0xD
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -955,20 +955,20 @@ _08079104:
cmp r5, 0
bne _080791B0
movs r0, 0xA
- bl sub_8071AB4
+ bl FadeOutMapMusic
movs r0, 0x1
negs r0, r0
str r5, [sp]
movs r1, 0x3
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_8079528
b _0807918C
.align 2, 0
_08079138: .4byte gUnknown_2037AB8
_0807913C:
- bl sub_8071BA0
+ bl IsNotWaitingForBGMStop
lsls r0, 24
cmp r0, 0
beq _080791B0
@@ -981,10 +981,10 @@ _0807913C:
cmp r5, 0
bne _080791B0
ldr r0, _0807916C @ =sub_807941C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
strh r5, [r4, 0x4]
b _0807918C
.align 2, 0
@@ -999,10 +999,10 @@ _08079170:
cmp r0, 0x13
ble _080791B0
ldr r0, _08079194 @ =sub_807941C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_0807918C:
ldrh r0, [r4, 0x2]
adds r0, 0x1
@@ -1013,12 +1013,12 @@ _08079194: .4byte sub_807941C
_08079198:
bl sub_812B478
ldr r0, _080791B8 @ =sub_8078C24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
ldr r0, _080791BC @ =sub_80EC864
- bl sub_8000544
+ bl SetMainCallback2
_080791B0:
add sp, 0x4
pop {r4,r5}
@@ -1058,7 +1058,7 @@ _080791DE:
bne _080792A6
movs r0, 0x6
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
ldrb r0, [r4, 0xC]
bl sub_8079A88
strh r5, [r4, 0x4]
@@ -1085,10 +1085,10 @@ _08079214:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_8079528
movs r0, 0x4
- bl sub_8071DBC
+ bl FadeOutBGM
_08079238:
ldrh r0, [r4, 0x2]
adds r0, 0x1
@@ -1104,10 +1104,10 @@ _08079248:
ands r0, r1
cmp r0, 0
bne _080792A6
- bl sub_8000564
+ bl SeedRngAndSetTrainerId
bl sub_804C058
bl sub_8054A28
- bl sub_80D9750
+ bl ResetSaveCounters
movs r0, 0
bl sub_80DA4FC
ldr r0, _080792B4 @ =gUnknown_30053A0
@@ -1128,14 +1128,14 @@ _0807927A:
ldr r0, _080792BC @ =gHeap
movs r1, 0xE0
lsls r1, 9
- bl sub_8002B80
+ bl InitHeap
ldr r0, _080792C0 @ =sub_800C300
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _080792C4 @ =sub_8078C24
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
_080792A6:
add sp, 0x4
pop {r4,r5}
@@ -1186,24 +1186,24 @@ _0807930C:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x37
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x80
lsls r0, 7
movs r1, 0
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _080793AA
_08079344:
movs r1, 0xC0
@@ -1239,19 +1239,19 @@ _08079368:
_0807937C:
movs r0, 0x4A
movs r1, 0x3B
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080793B4 @ =0x0000f0f0
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080793B8 @ =0xffff1000
movs r0, 0x2
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x80
lsls r0, 8
movs r1, 0
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r1, 0xF0
lsls r1, 4
adds r0, r1, 0
@@ -1287,7 +1287,7 @@ _080793DA:
lsls r1, 8
movs r0, 0x2
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
ldrh r1, [r4, 0x4]
lsls r1, 8
movs r0, 0xF0
@@ -1296,7 +1296,7 @@ _080793DA:
lsrs r1, 16
_080793F6:
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
b _08079414
.align 2, 0
_08079400: .4byte 0xfffffe80
@@ -1304,9 +1304,9 @@ _08079404:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08079414:
pop {r4,r5}
pop {r0}
@@ -1347,7 +1347,7 @@ _08079444:
cmp r0, 0
bne _08079468
adds r0, r2, 0
- bl sub_8077508
+ bl DestroyTask
b _08079510
.align 2, 0
_08079460: .4byte gUnknown_3005098
@@ -1439,7 +1439,7 @@ _080794F2:
ldrh r2, [r2, 0x6]
lsls r2, 17
lsrs r2, 17
- bl sub_80714D4
+ bl BlendPalettes
_08079510:
pop {r4,r5}
pop {r0}
@@ -1455,7 +1455,7 @@ _08079524: .4byte gUnknown_2037AB8
sub_8079528: @ 8079528
push {lr}
ldr r0, _08079548 @ =sub_807941C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
ldr r2, _0807954C @ =gUnknown_3005090
@@ -1600,10 +1600,10 @@ sub_8079620: @ 8079620
_0807962E:
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -1614,46 +1614,46 @@ _08079644: .4byte gUnknown_2039600
sub_8079648: @ 8079648
push {r4,lr}
ldr r0, _080796BC @ =sub_80792C8
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
beq _0807965C
- bl sub_8077508
+ bl DestroyTask
_0807965C:
bl sub_8071898
- bl sub_8070A84
+ bl ResetPaletteFadeControl
ldr r0, _080796C0 @ =gUnknown_8EAB6C4
movs r2, 0xD0
lsls r2, 1
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _080796C4 @ =gUnknown_8EAD5E8
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r4, _080796C8 @ =gUnknown_8EAE094
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
bl sub_80F6C14
movs r1, 0xE0
lsls r1, 8
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
pop {r4}
pop {r0}
bx r0
@@ -1667,12 +1667,12 @@ _080796C8: .4byte gUnknown_8EAE094
thumb_func_start sub_80796CC
sub_80796CC: @ 80796CC
push {lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080796DE
ldr r0, _080796E4 @ =sub_80F55A0
- bl sub_8000544
+ bl SetMainCallback2
_080796DE:
pop {r0}
bx r0
@@ -1683,13 +1683,13 @@ _080796E4: .4byte sub_80F55A0
thumb_func_start sub_80796E8
sub_80796E8: @ 80796E8
push {lr}
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _080796FE
bl m4aMPlayAllStop
ldr r0, _08079704 @ =sub_815F74C
- bl sub_8000544
+ bl SetMainCallback2
_080796FE:
pop {r0}
bx r0
@@ -1704,13 +1704,13 @@ sub_8079708: @ 8079708
ldr r4, _08079728 @ =gUnknown_83BFB9C
_0807970E:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x3
bls _0807970E
ldr r0, _0807972C @ =gUnknown_83BFBBC
- bl sub_8008974
+ bl LoadSpritePalettes
pop {r4,r5}
pop {r0}
bx r0
@@ -1757,7 +1757,7 @@ sub_8079730: @ 8079730
beq _0807977C
_08079774:
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
b _080797A6
_0807977C:
ldrh r1, [r2, 0xE]
@@ -1772,7 +1772,7 @@ _0807977C:
bne _080797A6
adds r0, r4, 0
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r2, r4, 0
adds r2, 0x3E
ldrb r1, [r2]
@@ -1810,7 +1810,7 @@ _080797CA:
lsls r2, r5, 16
asrs r2, 16
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -2043,7 +2043,7 @@ sub_807999C: @ 807999C
lsrs r1, 24
lsls r2, 16
lsrs r2, 16
- bl sub_80776E8
+ bl SetWordTaskArg
pop {r0}
bx r0
thumb_func_end sub_807999C
@@ -2059,7 +2059,7 @@ sub_80799B4: @ 80799B4
lsrs r5, 24
adds r0, r4, 0
adds r1, r5, 0
- bl sub_8077720
+ bl GetWordTaskArg
adds r6, r0, 0
ldr r0, _080799E8 @ =0x41c64e6d
muls r0, r6
@@ -2068,7 +2068,7 @@ sub_80799B4: @ 80799B4
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_80776E8
+ bl SetWordTaskArg
lsrs r0, r6, 16
pop {r4-r6}
pop {r1}
@@ -2085,9 +2085,9 @@ sub_80799F0: @ 80799F0
movs r1, 0x18
movs r2, 0x90
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
movs r0, 0x2
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -2102,7 +2102,7 @@ sub_8079A10: @ 8079A10
cmp r0, 0
beq _08079A38
movs r0, 0x2
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r1, r0, 0
lsls r1, 24
ldr r0, _08079A34 @ =gUnknown_8EAE488
@@ -2112,7 +2112,7 @@ sub_8079A10: @ 8079A10
adds r1, r2
lsrs r1, 16
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08079A3C
.align 2, 0
_08079A34: .4byte gUnknown_8EAE488
@@ -2131,7 +2131,7 @@ sub_8079A40: @ 8079A40
negs r1, r1
movs r2, 0x1B
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
adds r4, r1, 0
diff --git a/asm/tm_case.s b/asm/tm_case.s
index 096d3740a..9173042e6 100644
--- a/asm/tm_case.s
+++ b/asm/tm_case.s
@@ -16,7 +16,7 @@ sub_81317F8: @ 81317F8
bl sub_8131A8C
ldr r4, _08131854 @ =gUnknown_203B118
movs r0, 0x1C
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
movs r1, 0
str r1, [r0]
@@ -48,7 +48,7 @@ _0813183A:
ands r0, r1
strb r0, [r2]
ldr r0, _08131860 @ =sub_8131894
- bl sub_8000544
+ bl SetMainCallback2
pop {r4-r7}
pop {r0}
bx r0
@@ -62,11 +62,11 @@ _08131860: .4byte sub_8131894
thumb_func_start sub_8131864
sub_8131864: @ 8131864
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80F67B8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl do_scheduled_bg_tilemap_copies_to_vram
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8131864
@@ -74,9 +74,9 @@ sub_8131864: @ 8131864
thumb_func_start sub_8131880
sub_8131880: @ 8131880
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_8131880
@@ -149,22 +149,22 @@ _081318E8:
.4byte _08131A42
_08131934:
bl sub_80BF768
- bl sub_80F6790
+ bl clear_scheduled_bg_copies_to_vram
b _08131A52
_0813193E:
- bl sub_8087E64
+ bl remove_some_task
b _08131A52
_08131944:
- bl sub_80088F0
+ bl FreeAllSpritePalettes
b _08131A52
_0813194A:
- bl sub_8070528
+ bl ResetPaletteFade
b _08131A52
_08131950:
- bl sub_8006B10
+ bl ResetSpriteData
b _08131A52
_08131956:
- bl sub_80773BC
+ bl ResetTasks
b _08131A52
_0813195C:
bl sub_8131AB8
@@ -221,14 +221,14 @@ _081319C8:
ldr r0, _081319F4 @ =sub_81322D4
_081319CA:
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r4, r0, 24
ldr r0, _081319F8 @ =gUnknown_3005E70
ldr r2, _081319FC @ =gUnknown_203B10C
ldrh r1, [r2, 0xA]
ldrh r2, [r2, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
ldr r2, _08131A00 @ =gUnknown_3005090
lsls r1, r4, 2
adds r1, r4
@@ -270,7 +270,7 @@ _08131A34:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _08131A52
_08131A42:
movs r0, 0x1
@@ -279,7 +279,7 @@ _08131A42:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08131A52:
ldr r1, _08131A64 @ =gUnknown_30030F0
movs r0, 0x87
@@ -293,9 +293,9 @@ _08131A52:
_08131A64: .4byte gUnknown_30030F0
_08131A68:
ldr r0, _08131A78 @ =sub_8131880
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08131A7C @ =sub_8131864
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x1
b _08131A82
.align 2, 0
@@ -339,7 +339,7 @@ sub_8131AB8: @ 8131AB8
ldr r4, _08131B18 @ =gUnknown_203B120
movs r0, 0x80
lsls r0, 4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r0, 0
bl sub_8001618
@@ -349,24 +349,24 @@ sub_8131AB8: @ 8131AB8
bl sub_8001658
ldr r1, [r4]
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
pop {r4}
pop {r0}
bx r0
@@ -401,19 +401,19 @@ _08131B44:
.4byte _08131BAC
.4byte _08131BDC
_08131B58:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r1, _08131B70 @ =gUnknown_8E845D8
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _08131BE2
.align 2, 0
_08131B70: .4byte gUnknown_8E845D8
_08131B74:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -421,7 +421,7 @@ _08131B74:
ldr r0, _08131B8C @ =gUnknown_8E84A24
ldr r1, _08131B90 @ =gUnknown_203B120
ldr r1, [r1]
- bl sub_800EBB4
+ bl LZDecompressWram
b _08131BE2
.align 2, 0
_08131B8C: .4byte gUnknown_8E84A24
@@ -429,10 +429,10 @@ _08131B90: .4byte gUnknown_203B120
_08131B94:
ldr r4, _08131BA8 @ =gUnknown_8E84B70
movs r0, 0x1
- bl sub_8002008
+ bl GetBgTilemapBuffer
adds r1, r0, 0
adds r0, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
b _08131BE2
.align 2, 0
_08131BA8: .4byte gUnknown_8E84B70
@@ -445,7 +445,7 @@ _08131BAC:
ldr r0, _08131BC8 @ =gUnknown_8E84CB0
movs r1, 0
movs r2, 0x80
- bl sub_80703A8
+ bl LoadCompressedPalette
b _08131BE2
.align 2, 0
_08131BC4: .4byte gUnknown_300500C
@@ -454,13 +454,13 @@ _08131BCC:
ldr r0, _08131BD8 @ =gUnknown_8E84D20
movs r1, 0
movs r2, 0x80
- bl sub_80703A8
+ bl LoadCompressedPalette
b _08131BE2
.align 2, 0
_08131BD8: .4byte gUnknown_8E84D20
_08131BDC:
ldr r0, _08131BF0 @ =gUnknown_8463218
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_08131BE2:
ldr r0, _08131BF4 @ =gUnknown_203B118
ldr r1, [r0]
@@ -495,7 +495,7 @@ sub_8131C10: @ 8131C10
ldrb r0, [r0, 0x4]
adds r0, 0x1
lsls r0, 3
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
ldr r4, _08131C48 @ =gUnknown_203B128
ldr r0, _08131C4C @ =gUnknown_203B118
@@ -505,7 +505,7 @@ sub_8131C10: @ 8131C10
subs r0, r1
lsls r0, 2
adds r0, r1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
pop {r4}
pop {r0}
@@ -647,17 +647,17 @@ sub_8131D48: @ 8131D48
ldr r5, _08131D8C @ =gUnknown_2021D18
ldr r1, _08131D90 @ =gUnknown_84166FF
adds r0, r5, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0xA9
lsls r0, 1
cmp r6, r0
bls _08131DA4
ldr r1, _08131D94 @ =gUnknown_8463178
adds r0, r5, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r1, _08131D98 @ =gUnknown_8416226
adds r0, r5, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r4, _08131D9C @ =gUnknown_2021CD0
ldr r0, _08131DA0 @ =0xfffffeae
adds r1, r6, r0
@@ -667,7 +667,7 @@ sub_8131D48: @ 8131D48
bl sub_8008E78
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
b _08131DC4
.align 2, 0
_08131D8C: .4byte gUnknown_2021D18
@@ -679,7 +679,7 @@ _08131DA0: .4byte 0xfffffeae
_08131DA4:
ldr r1, _08131DFC @ =gUnknown_8416226
adds r0, r5, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r4, _08131E00 @ =gUnknown_2021CD0
ldr r0, _08131E04 @ =0xfffffee0
adds r1, r6, r0
@@ -689,17 +689,17 @@ _08131DA4:
bl sub_8008E78
adds r0, r5, 0
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
_08131DC4:
ldr r4, _08131E08 @ =gUnknown_2021D18
ldr r1, _08131E0C @ =gUnknown_846317C
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r1, _08131E10 @ =gUnknown_8416703
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r6, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
movs r1, 0xD
@@ -707,10 +707,10 @@ _08131DC4:
ldr r0, _08131E14 @ =gUnknown_8247094
adds r1, r0
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
pop {r4-r7}
pop {r0}
bx r0
@@ -791,7 +791,7 @@ sub_8131E68: @ 8131E68
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0
@@ -859,7 +859,7 @@ sub_8131F0C: @ 8131F0C
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A96C
+ bl ItemId_GetDescription
adds r4, r0, 0
b _08131F32
_08131F30:
@@ -867,7 +867,7 @@ _08131F30:
_08131F32:
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
str r0, [sp]
movs r0, 0x1
@@ -906,7 +906,7 @@ sub_8131F64: @ 8131F64
movs r3, 0x1E
bl sub_80F6B08
movs r0, 0x2
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x8
pop {r0}
bx r0
@@ -920,7 +920,7 @@ sub_8131F90: @ 8131F90
lsrs r0, 24
lsls r4, 24
lsrs r4, 24
- bl sub_8107300
+ bl ListMenuGetYCoordForPrintingArrowCursor
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -957,7 +957,7 @@ sub_8131FB0: @ 8131FB0
movs r1, 0
movs r2, 0
adds r3, r5, 0
- bl sub_8004378
+ bl FillWindowPixelRect
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -1002,7 +1002,7 @@ sub_8132018: @ 8132018
movs r1, 0xA0
movs r2, 0x8
movs r3, 0x58
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -1033,7 +1033,7 @@ sub_8132054: @ 8132054
movs r1, 0x98
movs r2, 0x48
movs r3, 0x68
- bl sub_8133B40
+ bl AddScrollIndicatorArrowPairParametrized
ldr r1, [r4]
strb r0, [r1, 0x8]
add sp, 0x10
@@ -1052,7 +1052,7 @@ sub_813208C: @ 813208C
ldrb r0, [r1, 0x8]
cmp r0, 0xFF
beq _081320A2
- bl sub_8133C30
+ bl RemoveScrollIndicatorArrowPair
ldr r1, [r4]
movs r0, 0xFF
strb r0, [r1, 0x8]
@@ -1236,31 +1236,31 @@ sub_81321D4: @ 81321D4
ldr r0, [r0]
cmp r0, 0
beq _081321E2
- bl sub_8002BC4
+ bl Free
_081321E2:
ldr r0, _08132220 @ =gUnknown_203B120
ldr r0, [r0]
cmp r0, 0
beq _081321EE
- bl sub_8002BC4
+ bl Free
_081321EE:
ldr r0, _08132224 @ =gUnknown_203B124
ldr r0, [r0]
cmp r0, 0
beq _081321FA
- bl sub_8002BC4
+ bl Free
_081321FA:
ldr r0, _08132228 @ =gUnknown_203B128
ldr r0, [r0]
cmp r0, 0
beq _08132206
- bl sub_8002BC4
+ bl Free
_08132206:
ldr r0, _0813222C @ =gUnknown_203B12C
ldr r0, [r0]
cmp r0, 0
beq _08132212
- bl sub_8002BC4
+ bl Free
_08132212:
bl sub_8003ECC
pop {r0}
@@ -1287,7 +1287,7 @@ sub_8132230: @ 8132230
movs r2, 0
str r2, [sp]
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _08132264 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -1330,7 +1330,7 @@ sub_813226C: @ 813226C
ldr r0, [r0]
cmp r0, 0
beq _081322B4
- bl sub_8000544
+ bl SetMainCallback2
b _081322BE
.align 2, 0
_081322A4: .4byte gUnknown_3005098
@@ -1341,12 +1341,12 @@ _081322B4:
adds r0, r4, 0
subs r0, 0xA
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
_081322BE:
bl sub_813208C
bl sub_81321D4
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_081322CC:
pop {r4,r5}
pop {r0}
@@ -1380,13 +1380,13 @@ sub_81322D4: @ 81322D4
cmp r0, 0x1
beq _081323C8
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
adds r5, r0, 0
ldrb r0, [r6]
ldr r4, _08132348 @ =gUnknown_203B116
subs r2, r4, 0x2
adds r1, r4, 0
- bl sub_81072D4
+ bl get_coro_args_x18_x1A
ldr r0, _0813234C @ =gUnknown_30030F0
ldrh r1, [r0, 0x2E]
movs r0, 0x4
@@ -1589,14 +1589,14 @@ _08132468:
bl sub_810F7D8
movs r0, 0x80
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
ldr r6, _08132558 @ =gUnknown_203AD30
ldrh r1, [r6]
bl sub_8131D48
ldr r1, _0813255C @ =gUnknown_8416301
adds r0, r4, 0
- bl sub_8008DA4
+ bl StringAppend
movs r0, 0x2
str r0, [sp]
movs r0, 0x1
@@ -1610,9 +1610,9 @@ _08132468:
movs r3, 0
bl sub_81332EC
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
ldrh r0, [r6]
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
beq _08132528
@@ -1625,9 +1625,9 @@ _08132468:
bl sub_8003F20
_08132528:
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08132560 @ =gUnknown_3005090
lsls r1, r7, 2
adds r1, r7
@@ -1660,7 +1660,7 @@ sub_8132568: @ 8132568
lsrs r0, 24
cmp r0, 0x1
beq _081325E0
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r4, r0, 24
movs r0, 0x2
@@ -1727,14 +1727,14 @@ sub_81325F0: @ 81325F0
movs r1, 0
bl sub_810F4D8
movs r0, 0x2
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
- bl sub_8040C3C
+ bl schedule_bg_copy_tilemap_to_vram
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _08132638
@@ -1786,23 +1786,23 @@ sub_813265C: @ 813265C
movs r1, 0
bl sub_810F4D8
movs r0, 0x2
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r4, 0
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _081326EC
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
lsls r0, 24
cmp r0, 0
bne _081326D8
@@ -1919,7 +1919,7 @@ sub_8132780: @ 8132780
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
strh r0, [r5]
@@ -1929,17 +1929,17 @@ sub_8132780: @ 8132780
movs r1, 0
bl sub_810F260
movs r0, 0x6
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r6, 0
bl sub_81323E4
pop {r4-r6}
@@ -1970,22 +1970,22 @@ sub_81327FC: @ 81327FC
movs r1, 0
bl sub_810F4D8
movs r0, 0x2
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_8131F90
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
adds r0, r5, 0
bl sub_81323E4
pop {r4,r5}
@@ -2011,13 +2011,13 @@ sub_8132868: @ 8132868
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _081328AC
ldr r0, _081328A4 @ =gUnknown_203B118
ldr r1, [r0]
- ldr r0, _081328A8 @ =sub_8123744
+ ldr r0, _081328A8 @ =c2_8123744
str r0, [r1]
adds r0, r4, 0
bl sub_8132230
@@ -2025,7 +2025,7 @@ sub_8132868: @ 8132868
.align 2, 0
_081328A0: .4byte gUnknown_3005098
_081328A4: .4byte gUnknown_203B118
-_081328A8: .4byte sub_8123744
+_081328A8: .4byte c2_8123744
_081328AC:
adds r0, r4, 0
bl sub_8132714
@@ -2050,7 +2050,7 @@ sub_81328B8: @ 81328B8
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A990
+ bl itemid_is_unique
lsls r0, 24
cmp r0, 0
bne _081328FC
@@ -2087,7 +2087,7 @@ sub_8132908: @ 8132908
adds r4, r0, r1
ldr r6, _08132954 @ =gUnknown_203AD30
ldrh r0, [r6]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
cmp r0, 0
bne _08132968
@@ -2174,7 +2174,7 @@ sub_81329C4: @ 81329C4
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -2238,19 +2238,19 @@ sub_8132A48: @ 8132A48
movs r1, 0
bl sub_810F260
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldrb r0, [r4]
movs r1, 0x1
bl sub_8131F90
@@ -2307,7 +2307,7 @@ sub_8132AAC: @ 8132AAC
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r3, r8
@@ -2319,9 +2319,9 @@ sub_8132AAC: @ 8132AAC
bl sub_81335E0
bl sub_8132054
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
subs r6, 0x8
adds r4, r6
ldr r0, _08132B58 @ =sub_8132BC8
@@ -2350,7 +2350,7 @@ sub_8132B5C: @ 8132B5C
lsrs r4, 16
movs r0, 0x7
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _08132BBC @ =gUnknown_2021CD0
lsls r4, 16
asrs r4, 16
@@ -2417,7 +2417,7 @@ sub_8132BC8: @ 8132BC8
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -2441,9 +2441,9 @@ _08132C18:
movs r1, 0
bl sub_810F4D8
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_813208C
adds r0, r4, 0
bl sub_81329C4
@@ -2467,15 +2467,15 @@ _08132C50:
movs r1, 0
bl sub_810F260
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
bl sub_813208C
ldrb r0, [r5]
movs r1, 0x1
@@ -2500,9 +2500,9 @@ sub_8132CAC: @ 8132CAC
ldr r0, _08132D18 @ =gUnknown_3005098
adds r4, r0
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
ldr r0, _08132D1C @ =gUnknown_203AD30
ldrh r0, [r0]
ldr r1, _08132D20 @ =gUnknown_2021CD0
@@ -2513,7 +2513,7 @@ sub_8132CAC: @ 8132CAC
bl sub_809A798
lsls r0, 16
lsrs r0, 16
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
movs r2, 0x10
@@ -2576,7 +2576,7 @@ sub_8132D34: @ 8132D34
mov r10, r3
add r4, r10
ldrh r0, [r5]
- bl sub_809A900
+ bl itemid_get_market_price
lsls r0, 16
lsrs r0, 17
mov r2, r8
@@ -2584,7 +2584,7 @@ sub_8132D34: @ 8132D34
ldrsh r1, [r2, r3]
muls r1, r0
adds r0, r4, 0
- bl sub_809FDA0
+ bl AddMoney
ldrh r0, [r5]
mov r2, r8
ldrh r1, [r2, 0x10]
@@ -2603,7 +2603,7 @@ sub_8132D34: @ 8132D34
subs r4, 0xA
ldrh r1, [r4, 0xA]
ldrh r2, [r4, 0x8]
- bl sub_8106FF8
+ bl ListMenuInit
lsls r0, 24
lsrs r0, 24
mov r1, r8
@@ -2664,13 +2664,13 @@ _08132E26:
movs r1, 0
bl sub_810F260
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
bl sub_8132780
_08132E5A:
@@ -2689,7 +2689,7 @@ sub_8132E64: @ 8132E64
ldr r4, _08132EFC @ =gUnknown_203B11C
movs r0, 0xB2
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r5, _08132F00 @ =gUnknown_3005008
ldr r1, [r5]
@@ -2866,7 +2866,7 @@ _08133008:
movs r1, 0x4
movs r2, 0
movs r3, 0x6
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x1
bl sub_8131F64
b _081331EA
@@ -2906,7 +2906,7 @@ _08133050:
movs r1, 0x80
strh r1, [r0, 0x30]
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
_08133066:
ldrh r0, [r6, 0x12]
adds r0, 0x1
@@ -2932,7 +2932,7 @@ _08133080:
movs r1, 0x40
strh r1, [r0, 0x30]
ldrb r0, [r6]
- bl sub_8107078
+ bl ListMenuHandleInput
_08133096:
ldrh r0, [r6, 0x12]
adds r0, 0x1
@@ -2995,12 +2995,12 @@ _08133102:
str r1, [sp]
movs r2, 0x6
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x6
movs r1, 0
bl sub_810F260
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
b _081331EA
.align 2, 0
_08133128: .4byte gUnknown_30030F0
@@ -3074,7 +3074,7 @@ _08133170:
adds r1, r0, r3
ldrh r1, [r1]
strh r1, [r2, 0xA]
- bl sub_8002BC4
+ bl Free
ldr r0, _08133208 @ =gUnknown_20375F8
ldr r1, _0813320C @ =gUnknown_20371F8
movs r2, 0x80
@@ -3088,7 +3088,7 @@ _08133170:
str r7, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_081331EA:
ldrh r0, [r6, 0x10]
adds r0, 0x1
@@ -3111,11 +3111,11 @@ _08133210:
bne _08133232
ldr r0, _08133240 @ =gUnknown_203B10C
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_813208C
bl sub_81321D4
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08133232:
add sp, 0x4
pop {r4-r7}
@@ -3148,20 +3148,20 @@ sub_8133244: @ 8133244
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xA0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r4, _081332E8 @ =gUnknown_8463180
adds r0, r4, 0
movs r1, 0xF6
movs r2, 0x4
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xD6
movs r2, 0x4
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0xC0
movs r1, 0x1
bl sub_8107D38
@@ -3169,24 +3169,24 @@ sub_8133244: @ 8133244
_081332A4:
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x8
bls _081332A4
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x4
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x5
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
pop {r4}
pop {r0}
bx r0
@@ -3259,7 +3259,7 @@ sub_8133354: @ 8133354
movs r1, 0
movs r2, 0x5B
movs r3, 0xE
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_8133354
@@ -3272,7 +3272,7 @@ sub_8133368: @ 8133368
movs r1, 0
movs r2, 0x78
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
pop {r0}
bx r0
thumb_func_end sub_8133368
@@ -3305,7 +3305,7 @@ sub_813337C: @ 813337C
movs r3, 0xB
bl sub_80BF474
movs r0, 0x1
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
add sp, 0x10
pop {r3}
mov r8, r3
@@ -3393,7 +3393,7 @@ sub_8133444: @ 8133444
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
cmp r4, 0
bne _081334A8
movs r4, 0
@@ -3428,7 +3428,7 @@ _0813346E:
_081334A4: .4byte gUnknown_8416213
_081334A8:
adds r0, r4, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r7, r0, 16
ldr r1, _081334D8 @ =gUnknown_8250C04
@@ -3570,7 +3570,7 @@ sub_81335B0: @ 81335B0
movs r2, 0xC
str r2, [sp, 0x4]
adds r2, r4, 0
- bl sub_80041B8
+ bl BlitBitmapToWindow
add sp, 0x8
pop {r4}
pop {r0}
@@ -3641,7 +3641,7 @@ sub_8133630: @ 8133630
ldrb r0, [r4]
bl sub_8133354
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
_08133656:
ldrb r0, [r4]
pop {r4}
@@ -3659,11 +3659,11 @@ sub_8133664: @ 8133664
movs r1, 0
bl sub_810F4D8
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
bl sub_8003E3C
movs r0, 0
- bl sub_80F67A4
+ bl schedule_bg_copy_tilemap_to_vram
movs r0, 0xFF
strb r0, [r4]
pop {r4}
@@ -3682,7 +3682,7 @@ sub_813368C: @ 813368C
movs r1, 0x29
movs r2, 0x2E
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r7, r0, 24
cmp r6, 0
@@ -3702,7 +3702,7 @@ sub_813368C: @ 813368C
ldr r0, _081336F0 @ =gUnknown_8250C04
mov r8, r0
adds r0, r6, 0
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -3745,11 +3745,11 @@ sub_8133714: @ 8133714
cmp r1, 0x31
bls _08133726
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _0813372C
_08133726:
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0813372C:
pop {r0}
bx r0
@@ -3763,7 +3763,7 @@ sub_8133730: @ 8133730
lsrs r4, 24
movs r0, 0xC8
lsls r0, 1
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
lsls r0, 28
lsrs r5, r0, 24
ldr r2, _08133784 @ =gUnknown_203B12C
@@ -3780,7 +3780,7 @@ sub_8133730: @ 8133730
adds r1, r5, 0
orrs r1, r2
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0813378C @ =gUnknown_203B10C
ldrb r0, [r0, 0x4]
cmp r0, 0x4
@@ -3791,7 +3791,7 @@ sub_8133730: @ 8133730
lsls r0, r1
movs r1, 0x4
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
_0813377C:
pop {r4,r5}
pop {r0}
@@ -3900,7 +3900,7 @@ _08133822:
strh r0, [r5, 0x30]
ldr r4, _08133878 @ =gUnknown_8250C04
ldrh r0, [r5, 0x2E]
- bl sub_8125A78
+ bl ItemIdToBattleMoveId
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -3962,17 +3962,17 @@ sub_81338A8: @ 81338A8
movs r5, 0x88
lsls r5, 2
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
str r1, [r4]
ldr r0, _081338F8 @ =gUnknown_8E84F20
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, _081338FC @ =gUnknown_8E85068
ldr r1, [r4]
movs r2, 0x80
lsls r2, 2
adds r1, r2
- bl sub_800EBB4
+ bl LZDecompressWram
ldr r0, [r4]
adds r0, r5
str r0, [sp]
@@ -3984,7 +3984,7 @@ sub_81338A8: @ 81338A8
orrs r0, r1
str r0, [sp, 0x4]
mov r0, sp
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x8
pop {r4,r5}
pop {r0}
diff --git a/asm/trade.s b/asm/trade.s
index d1160d120..c2cdeb215 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -9,26 +9,26 @@
sub_804C600: @ 804C600
push {r4,r5,lr}
sub sp, 0xC
- bl sub_8006B10
- bl sub_80088F0
- bl sub_80773BC
- bl sub_8070528
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
+ bl ResetTasks
+ bl ResetPaletteFade
ldr r2, _0804C6F8 @ =gUnknown_2037AB8
ldrb r0, [r2, 0x8]
movs r1, 0x80
orrs r0, r1
strb r0, [r2, 0x8]
ldr r0, _0804C6FC @ =sub_804D4F8
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r4, _0804C700 @ =gUnknown_841F408
adds r0, r4, 0
movs r1, 0xF0
movs r2, 0x14
- bl sub_80703EC
+ bl LoadPalette
adds r0, r4, 0
movs r1, 0xD0
movs r2, 0x14
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
bl sub_8001618
ldr r1, _0804C704 @ =gUnknown_8261F1C
@@ -41,7 +41,7 @@ sub_804C600: @ 804C600
lsls r0, 4
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r0, _0804C70C @ =gUnknown_8261F2C
bl sub_8003B24
lsls r0, 16
@@ -57,10 +57,10 @@ _0804C674:
lsls r4, r5, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r5, 0x1
cmp r5, 0x11
bls _0804C674
@@ -74,7 +74,7 @@ _0804C674:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0
movs r1, 0x14
movs r2, 0xC0
@@ -130,7 +130,7 @@ _0804C714: .4byte 0x0000024e
sub_804C718: @ 804C718
push {lr}
ldr r0, _0804C724 @ =sub_804C728
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -189,13 +189,13 @@ _0804C754:
_0804C7B0:
ldr r4, _0804C7E8 @ =gUnknown_2031DA8
ldr r0, _0804C7EC @ =0x000010f0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
bl sub_804C600
ldr r4, _0804C7F0 @ =gUnknown_2031C90
movs r0, 0xE0
lsls r0, 4
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
movs r6, 0
ldr r2, _0804C7F4 @ =gUnknown_2031C94
@@ -238,14 +238,14 @@ _0804C80A:
movs r1, 0
movs r2, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
adds r6, 0x1
cmp r6, 0x5
ble _0804C80A
movs r0, 0
bl sub_804F5BC
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r0, _0804C86C @ =gUnknown_3003F64
ldrb r2, [r0]
cmp r2, 0
@@ -292,7 +292,7 @@ _0804C892:
_0804C89C:
ldr r0, _0804C8B0 @ =sub_8081A90
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
b _0804CEE6
.align 2, 0
_0804C8A8: .4byte gUnknown_30030F0
@@ -389,7 +389,7 @@ _0804C95A:
b _0804CEE6
_0804C968:
bl sub_80FBB4C
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r1, _0804C9A4 @ =gUnknown_30030F0
movs r7, 0x87
lsls r7, 3
@@ -449,7 +449,7 @@ _0804C9E8:
adds r1, r3, r2
b _0804CEC2
_0804C9F0:
- bl sub_804D834
+ bl shedinja_maker_maybe
lsls r0, 24
cmp r0, 0
bne _0804C9FC
@@ -464,13 +464,13 @@ _0804C9FC:
.align 2, 0
_0804CA0C: .4byte gUnknown_30030F0
_0804CA10:
- bl sub_8040C80
+ bl CalculateEnemyPartyCount
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, _0804CB2C @ =gUnknown_2031DA8
ldr r0, [r2]
ldr r1, _0804CB30 @ =gUnknown_2024029
@@ -498,13 +498,13 @@ _0804CA4A:
adds r4, r0
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r1, 0xE0
@@ -556,13 +556,13 @@ _0804CABE:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r3, 0xE0
@@ -655,7 +655,7 @@ _0804CB9C:
movs r2, 0
movs r3, 0
bl sub_808BEB4
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
movs r1, 0x80
lsls r1, 17
@@ -748,12 +748,12 @@ _0804CC62:
mov r3, r8
ldrb r2, [r3, 0x5]
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r4, 0x20
adds r6, 0x1
cmp r6, 0x2
ble _0804CC62
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
movs r1, 0x80
lsls r1, 17
@@ -797,7 +797,7 @@ _0804CCC6:
mov r3, r8
ldrb r2, [r3, 0x7]
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r4, 0x20
adds r6, 0x1
cmp r6, 0x2
@@ -830,7 +830,7 @@ _0804CD10:
movs r1, 0xD7
movs r2, 0x97
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
add r0, sp, 0x10
ldm r4!, {r3,r5,r7}
stm r0!, {r3,r5,r7}
@@ -845,7 +845,7 @@ _0804CD10:
movs r1, 0xF7
movs r2, 0x97
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
movs r6, 0
add r4, sp, 0x10
movs r5, 0xC0
@@ -866,7 +866,7 @@ _0804CD5C:
add r0, sp, 0x10
movs r2, 0x96
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
movs r0, 0x80
lsls r0, 14
adds r5, r0
@@ -884,7 +884,7 @@ _0804CD5C:
ldrb r2, [r2, 0x1]
lsls r2, 3
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _0804CDD8 @ =gUnknown_2031DA8
ldr r1, [r2]
adds r1, 0x34
@@ -901,7 +901,7 @@ _0804CD5C:
adds r0, 0x1
strb r0, [r1]
movs r0, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
b _0804CEE6
.align 2, 0
_0804CDCC: .4byte gUnknown_8261CC8
@@ -929,7 +929,7 @@ _0804CDE0:
adds r0, 0x1
strb r0, [r1]
ldr r0, _0804CE1C @ =0x00000111
- bl sub_80722A0
+ bl PlayBGM
b _0804CEE6
.align 2, 0
_0804CE14: .4byte gUnknown_2031DA8
@@ -970,7 +970,7 @@ _0804CE5C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0804CE78 @ =gUnknown_30030F0
movs r5, 0x87
lsls r5, 3
@@ -982,7 +982,7 @@ _0804CE7C:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x2
bl sub_804D694
ldr r1, _0804CE98 @ =gUnknown_30030F0
@@ -1028,13 +1028,13 @@ _0804CED0:
ldr r0, _0804CF0C @ =sub_804DFF0
str r0, [r3]
ldr r0, _0804CF10 @ =sub_804D638
- bl sub_8000544
+ bl SetMainCallback2
_0804CEE6:
bl sub_8002DE8
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0x28
pop {r3}
mov r8, r3
@@ -1121,7 +1121,7 @@ _0804CFC0:
adds r1, r2, r0
b _0804D4B4
_0804CFC8:
- bl sub_8040C3C
+ bl CalculatePlayerPartyCount
ldr r1, _0804CFD8 @ =gUnknown_30030F0
movs r2, 0x87
lsls r2, 3
@@ -1153,7 +1153,7 @@ _0804D004:
adds r1, r2, r5
b _0804D4B4
_0804D00C:
- bl sub_8040C80
+ bl CalculateEnemyPartyCount
ldr r4, _0804D12C @ =gUnknown_2031DA8
ldr r0, [r4]
ldr r1, _0804D130 @ =gUnknown_2024029
@@ -1166,7 +1166,7 @@ _0804D00C:
adds r0, 0x37
strb r1, [r0]
movs r0, 0
- bl sub_80040B8
+ bl ClearWindowTilemap
movs r0, 0
bl sub_804F020
movs r0, 0x1
@@ -1188,13 +1188,13 @@ _0804D048:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r1, 0xE0
@@ -1246,13 +1246,13 @@ _0804D0BE:
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
lsls r5, 16
lsrs r5, 16
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
ldrb r2, [r7]
lsls r2, 19
movs r3, 0xE0
@@ -1345,7 +1345,7 @@ _0804D19C:
movs r2, 0
movs r3, 0
bl sub_808BEB4
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
movs r1, 0x80
lsls r1, 17
@@ -1445,12 +1445,12 @@ _0804D270:
mov r3, r8
ldrb r2, [r3, 0x5]
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r4, 0x20
adds r6, 0x1
cmp r6, 0x2
ble _0804D270
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
movs r1, 0x80
lsls r1, 17
@@ -1494,7 +1494,7 @@ _0804D2D4:
mov r3, r8
ldrb r2, [r3, 0x7]
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
adds r4, 0x20
adds r6, 0x1
cmp r6, 0x2
@@ -1527,7 +1527,7 @@ _0804D320:
movs r1, 0xD7
movs r2, 0x97
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
add r0, sp, 0xC
ldm r4!, {r3,r5,r7}
stm r0!, {r3,r5,r7}
@@ -1542,7 +1542,7 @@ _0804D320:
movs r1, 0xF7
movs r2, 0x97
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
movs r6, 0
add r4, sp, 0xC
movs r5, 0xC0
@@ -1563,7 +1563,7 @@ _0804D36C:
add r0, sp, 0xC
movs r2, 0x96
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
movs r0, 0x80
lsls r0, 14
adds r5, r0
@@ -1608,7 +1608,7 @@ _0804D3C0:
ldrb r2, [r2]
lsls r2, 3
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x34
strb r0, [r1]
@@ -1657,14 +1657,14 @@ _0804D444:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, _0804D47C @ =gUnknown_30030F0
movs r3, 0x87
lsls r3, 3
@@ -1677,7 +1677,7 @@ _0804D480:
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x2
bl sub_804D694
ldr r1, _0804D49C @ =gUnknown_30030F0
@@ -1714,12 +1714,12 @@ _0804D4C0:
cmp r0, 0
bne _0804D4D2
ldr r0, _0804D4F4 @ =sub_804D638
- bl sub_8000544
+ bl SetMainCallback2
_0804D4D2:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0x24
pop {r3}
mov r8, r3
@@ -1734,9 +1734,9 @@ _0804D4F4: .4byte sub_804D638
thumb_func_start sub_804D4F8
sub_804D4F8: @ 804D4F8
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_804D4F8
@@ -1761,7 +1761,7 @@ sub_804D50C: @ 804D50C
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0xA
@@ -1838,16 +1838,16 @@ sub_804D5A4: @ 804D5A4
beq _0804D620
ldr r0, _0804D5F0 @ =gUnknown_2031C90
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
ldr r0, _0804D5F4 @ =gUnknown_2031DA8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
bl sub_80FCE44
ldr r0, _0804D5F8 @ =sub_8050138
- bl sub_8000544
+ bl SetMainCallback2
b _0804D620
.align 2, 0
_0804D5E4: .4byte gUnknown_30030F0
@@ -1863,14 +1863,14 @@ _0804D5FC:
bne _0804D620
ldr r0, _0804D62C @ =gUnknown_2031C90
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
ldr r0, _0804D630 @ =gUnknown_2031DA8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
str r4, [r5]
ldr r0, _0804D634 @ =sub_8050138
- bl sub_8000544
+ bl SetMainCallback2
_0804D620:
pop {r4,r5}
pop {r0}
@@ -1899,7 +1899,7 @@ sub_804D638: @ 804D638
lsls r1, 24
lsrs r1, 24
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, [r4]
ldrb r1, [r2, 0x1]
adds r0, r1, 0
@@ -1908,12 +1908,12 @@ sub_804D638: @ 804D638
lsls r1, 24
lsrs r1, 24
movs r0, 0x1C
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80F6CBC
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
@@ -1942,13 +1942,13 @@ _0804D6B0:
ldr r0, _0804D6F0 @ =gUnknown_8E9CEDC
movs r1, 0
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0804D6F4 @ =gUnknown_8E9CF5C
movs r2, 0x94
lsls r2, 5
movs r0, 0x1
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
ldr r1, _0804D6F8 @ =gUnknown_8E9E9FC
movs r0, 0x20
str r0, [sp]
@@ -1958,13 +1958,13 @@ _0804D6B0:
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
ldr r1, _0804D6FC @ =gUnknown_8260C30
movs r2, 0x80
lsls r2, 4
movs r0, 0x2
movs r3, 0
- bl sub_8001888
+ bl LoadBgTilemap
b _0804D75A
.align 2, 0
_0804D6F0: .4byte gUnknown_8E9CEDC
@@ -1977,13 +1977,13 @@ _0804D700:
lsls r2, 4
movs r0, 0x3
movs r3, 0
- bl sub_8001888
+ bl LoadBgTilemap
movs r0, 0
bl sub_804F284
movs r0, 0x1
bl sub_804F284
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0804D75A
.align 2, 0
_0804D724: .4byte gUnknown_8261430
@@ -1994,7 +1994,7 @@ _0804D728:
_0804D72E:
lsrs r0, r5, 24
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x80
lsls r0, 18
adds r5, r0
@@ -2002,13 +2002,13 @@ _0804D72E:
cmp r4, 0
bge _0804D72E
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
_0804D75A:
add sp, 0xC
pop {r4,r5}
@@ -2133,11 +2133,11 @@ _0804D82E:
bx r0
thumb_func_end sub_804D814
- thumb_func_start sub_804D834
-sub_804D834: @ 804D834
+ thumb_func_start shedinja_maker_maybe
+shedinja_maker_maybe: @ 804D834
push {r4-r6,lr}
sub sp, 0xC
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _0804D858 @ =gUnknown_2031DA8
@@ -2207,7 +2207,7 @@ _0804D8E4:
bne _0804D8F0
b _0804DB9E
_0804D8F0:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
cmp r0, 0
bne _0804D904
@@ -2217,7 +2217,7 @@ _0804D8F0:
.align 2, 0
_0804D900: .4byte gUnknown_2031DA8
_0804D904:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _0804D910 @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804DB96
@@ -2235,7 +2235,7 @@ _0804D91E:
.align 2, 0
_0804D924: .4byte gUnknown_2031DA8
_0804D928:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2251,7 +2251,7 @@ _0804D936:
adds r1, r2
movs r2, 0xC8
bl sub_804D814
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _0804D95C @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804DB96
@@ -2283,7 +2283,7 @@ _0804D986:
.align 2, 0
_0804D98C: .4byte gUnknown_2031DA8
_0804D990:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2299,7 +2299,7 @@ _0804D99E:
adds r1, r2
movs r2, 0xC8
bl sub_804D814
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _0804D9C4 @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804DB96
@@ -2331,7 +2331,7 @@ _0804D9EE:
.align 2, 0
_0804D9F4: .4byte gUnknown_2031DA8
_0804D9F8:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2347,7 +2347,7 @@ _0804DA06:
adds r1, r2
movs r2, 0xC8
bl sub_804D814
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _0804DA2C @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804DB96
@@ -2383,7 +2383,7 @@ _0804DA62:
.align 2, 0
_0804DA68: .4byte gUnknown_2031DA8
_0804DA6C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2399,7 +2399,7 @@ _0804DA7A:
adds r1, r2
movs r2, 0xD8
bl sub_804D814
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r0, _0804DAA0 @ =gUnknown_2031DA8
ldr r1, [r0]
b _0804DB96
@@ -2435,7 +2435,7 @@ _0804DAD6:
.align 2, 0
_0804DADC: .4byte gUnknown_2031DA8
_0804DAE0:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x3
@@ -2451,7 +2451,7 @@ _0804DAE0:
adds r1, r2
movs r2, 0xB
bl sub_804D814
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldr r1, [r4]
b _0804DB96
.align 2, 0
@@ -2464,7 +2464,7 @@ _0804DB14:
_0804DB1A:
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
cmp r0, 0
@@ -2473,16 +2473,16 @@ _0804DB1A:
bne _0804DB5A
adds r0, r4, 0
movs r1, 0x3
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x1
beq _0804DB5A
adds r0, r4, 0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
mov r0, sp
ldr r1, _0804DB70 @ =gUnknown_8262034
- bl sub_8009370
+ bl StringCompareWithoutExtCtrlCodes
cmp r0, 0
bne _0804DB5A
adds r0, r4, 0
@@ -2531,7 +2531,7 @@ _0804DBA0:
bx r1
.align 2, 0
_0804DBA8: .4byte gUnknown_2031DA8
- thumb_func_end sub_804D834
+ thumb_func_end shedinja_maker_maybe
thumb_func_start sub_804DBAC
sub_804DBAC: @ 804DBAC
@@ -2619,7 +2619,7 @@ _0804DC4E:
strb r1, [r0]
_0804DC52:
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_0804DC58:
movs r2, 0x2
adds r0, r4, 0
@@ -2693,7 +2693,7 @@ _0804DCE2:
strb r2, [r0]
_0804DCE4:
movs r0, 0x1
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_0804DCEA:
pop {r4}
pop {r0}
@@ -2748,7 +2748,7 @@ _0804DD44:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x4
bl sub_804F5BC
ldr r0, _0804DD64 @ =gUnknown_2031DA8
@@ -2769,7 +2769,7 @@ _0804DD6C:
adds r1, 0x7E
strb r0, [r1]
movs r0, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
ldr r0, [r4]
adds r0, 0x35
ldrb r0, [r0]
@@ -2791,7 +2791,7 @@ _0804DDA0:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0804DDBC @ =gUnknown_2031DA8
ldr r0, [r0]
adds r0, 0x6F
@@ -2811,14 +2811,14 @@ _0804DDCE:
strb r1, [r0]
_0804DDD0:
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_0804DDD6:
movs r0, 0x2
ands r0, r5
cmp r0, 0
beq _0804DDE4
movs r0, 0x1
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_0804DDE4:
add sp, 0x4
pop {r4,r5}
@@ -2977,7 +2977,7 @@ _0804DEF4:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, [r6]
adds r1, r0, 0
adds r1, 0x79
@@ -3082,10 +3082,10 @@ _0804DFEC: .4byte 0x0000ddee
thumb_func_start sub_804DFF0
sub_804DFF0: @ 804DFF0
push {r4,lr}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r4, r0, 24
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -3174,7 +3174,7 @@ sub_804E074: @ 804E074
ldr r4, _0804E0C8 @ =gUnknown_202063C
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, [r5]
adds r2, 0x34
ldrb r1, [r2]
@@ -3206,7 +3206,7 @@ _0804E0CC:
ldr r5, _0804E12C @ =gUnknown_202063C
adds r0, r5
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, [r4]
adds r4, 0x34
ldrb r0, [r4]
@@ -3258,7 +3258,7 @@ sub_804E134: @ 804E134
adds r0, 0x6F
movs r1, 0x5
strb r1, [r0]
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3273,13 +3273,13 @@ sub_804E134: @ 804E134
ldrb r1, [r0]
adds r0, 0x4D
strh r1, [r0]
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, 0x80
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
b _0804E18C
.align 2, 0
_0804E17C: .4byte gUnknown_2031DA8
@@ -3372,7 +3372,7 @@ _0804E208:
bl sub_8150048
movs r0, 0x1
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0804E284 @ =gUnknown_8261EE4
str r0, [sp]
movs r0, 0x1
@@ -3392,7 +3392,7 @@ _0804E208:
movs r3, 0
bl sub_810F7D8
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -3414,7 +3414,7 @@ _0804E288:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, [r4]
adds r0, 0x6F
movs r1, 0x2
@@ -3466,14 +3466,14 @@ _0804E2F0:
adds r2, 0x1
cmp r2, 0x9
ble _0804E2F0
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _0804E32C @ =gUnknown_2031DA8
ldr r1, [r1]
adds r1, 0x80
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
_0804E314:
add sp, 0xC
pop {r4,r5}
@@ -3533,7 +3533,7 @@ _0804E384: .4byte 0x06010000
sub_804E388: @ 804E388
push {lr}
sub sp, 0x4
- bl sub_810FA04
+ bl ProcessMenuInputNoWrapAround
lsls r0, 24
asrs r0, 24
movs r1, 0x1
@@ -3558,7 +3558,7 @@ _0804E3B6:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0804E3D0 @ =gUnknown_2031DA8
ldr r0, [r0]
adds r0, 0x6F
@@ -3763,7 +3763,7 @@ _0804E538:
muls r0, r5
adds r0, r7
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r1, r0, 16
movs r0, 0xCD
@@ -3783,7 +3783,7 @@ _0804E564:
muls r0, r5
adds r0, r7
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0804E590
movs r0, 0x2
@@ -3879,13 +3879,13 @@ _0804E61C:
lsls r0, 24
cmp r0, 0
beq _0804E668
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, 0x80
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
b _0804E668
.align 2, 0
_0804E64C: .4byte 0x0000bbbb
@@ -3936,7 +3936,7 @@ _0804E696:
movs r1, 0x64
strb r1, [r0]
movs r0, 0x11
- bl sub_8003FA0
+ bl PutWindowTilemap
b _0804E6EE
.align 2, 0
_0804E6AC: .4byte gUnknown_2031DA8
@@ -3953,13 +3953,13 @@ _0804E6B0:
adds r0, 0x80
ldr r1, _0804E6F8 @ =0x0000bbcc
strh r1, [r0]
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, 0x80
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
_0804E6DE:
ldr r0, _0804E6F4 @ =gUnknown_2031DA8
ldr r0, [r0]
@@ -3967,7 +3967,7 @@ _0804E6DE:
movs r1, 0x64
strb r1, [r0]
movs r0, 0x11
- bl sub_8003FA0
+ bl PutWindowTilemap
_0804E6EE:
pop {r4}
pop {r0}
@@ -3993,7 +3993,7 @@ sub_804E6FC: @ 804E6FC
_0804E712:
lsrs r4, r6, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x1
bl sub_8003F20
@@ -4085,12 +4085,12 @@ _0804E7C2:
thumb_func_start sub_804E7C8
sub_804E7C8: @ 804E7C8
push {r4,lr}
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0804E7F0
movs r0, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
ldr r4, _0804E800 @ =gUnknown_2031DA8
ldr r0, [r4]
adds r0, 0x35
@@ -4192,9 +4192,9 @@ sub_804E880: @ 804E880
movs r0, 0x5
bl sub_80722CC
movs r0, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
movs r0, 0x1
- bl sub_815036C
+ bl rbox_fill_rectangle
movs r6, 0
movs r5, 0xE0
lsls r5, 20
@@ -4202,9 +4202,9 @@ _0804E8A6:
lsrs r4, r5, 24
adds r0, r4, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
- bl sub_815036C
+ bl rbox_fill_rectangle
movs r0, 0x80
lsls r0, 17
adds r5, r0
@@ -4291,20 +4291,20 @@ sub_804E944: @ 804E944
beq _0804E9AA
ldr r0, _0804E97C @ =gUnknown_2031C90
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _0804E980 @ =gUnknown_2031DA8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
bl sub_80FCE44
- ldr r0, _0804E984 @ =sub_8056854
- bl sub_8000544
+ ldr r0, _0804E984 @ =c2_8056854
+ bl SetMainCallback2
b _0804E9AA
.align 2, 0
_0804E978: .4byte gUnknown_3003F3C
_0804E97C: .4byte gUnknown_2031C90
_0804E980: .4byte gUnknown_2031DA8
-_0804E984: .4byte sub_8056854
+_0804E984: .4byte c2_8056854
_0804E988:
ldr r0, _0804E9B0 @ =gUnknown_3003F64
ldrb r0, [r0]
@@ -4312,13 +4312,13 @@ _0804E988:
bne _0804E9AA
ldr r0, _0804E9B4 @ =gUnknown_2031C90
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
ldr r0, _0804E9B8 @ =gUnknown_2031DA8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
- ldr r0, _0804E9BC @ =sub_8056854
- bl sub_8000544
+ ldr r0, _0804E9BC @ =c2_8056854
+ bl SetMainCallback2
_0804E9AA:
pop {r0}
bx r0
@@ -4326,7 +4326,7 @@ _0804E9AA:
_0804E9B0: .4byte gUnknown_3003F64
_0804E9B4: .4byte gUnknown_2031C90
_0804E9B8: .4byte gUnknown_2031DA8
-_0804E9BC: .4byte sub_8056854
+_0804E9BC: .4byte c2_8056854
thumb_func_end sub_804E944
thumb_func_start sub_804E9C0
@@ -4579,7 +4579,7 @@ _0804EBA2:
adds r0, r4
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -4652,7 +4652,7 @@ _0804EBA2:
lsls r0, 2
add r0, r8
ldr r1, _0804ECAC @ =sub_809718C
- bl sub_8074A68
+ bl StoreSpriteCallbackInData6
ldr r2, _0804ECA4 @ =gUnknown_2031DA8
ldr r1, [r2]
adds r1, 0x74
@@ -4682,11 +4682,11 @@ _0804EBA2:
str r0, [sp, 0x8]
movs r0, 0x1
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [sp, 0x60]
cmp r1, 0
beq _0804EC98
@@ -4743,9 +4743,9 @@ _0804ECEC:
str r0, [sp, 0x8]
movs r0, 0x1
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r6, _0804EE0C @ =gUnknown_202063C
ldr r1, _0804EE10 @ =gUnknown_2031DA8
ldr r4, [r1]
@@ -4849,12 +4849,12 @@ _0804ECEC:
movs r3, 0
bl sub_812E5A4
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r5, 0
movs r1, 0x3
bl sub_8003F20
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -4926,7 +4926,7 @@ sub_804EE6C: @ 804EE6C
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
b _0804EEA4
.align 2, 0
_0804EE90: .4byte gUnknown_2024284
@@ -4937,11 +4937,11 @@ _0804EE94:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
_0804EEA4:
adds r0, r4, 0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
movs r0, 0
movs r1, 0x2
bl sub_80F79D8
@@ -5010,7 +5010,7 @@ _0804EF28:
_0804EF2E:
adds r0, r5, r2
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r1, r4, 1
add r1, sp
strh r0, [r1]
@@ -5021,7 +5021,7 @@ _0804EF2E:
bls _0804EF0E
ldr r1, _0804EF80 @ =gUnknown_8261EB6
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
movs r4, 0
_0804EF50:
lsls r0, r4, 1
@@ -5036,11 +5036,11 @@ _0804EF50:
ldr r0, _0804EF84 @ =gUnknown_8247094
adds r1, r0
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
_0804EF6C:
adds r0, r6, 0
ldr r1, _0804EF88 @ =gUnknown_8261EC7
- bl sub_8008DA4
+ bl StringAppend
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -5054,10 +5054,10 @@ _0804EF88: .4byte gUnknown_8261EC7
_0804EF8C:
ldr r1, _0804EFAC @ =gUnknown_8261EB6
adds r0, r6, 0
- bl sub_8008D84
+ bl StringCopy
ldr r1, _0804EFB0 @ =gUnknown_841E09F
adds r0, r6, 0
- bl sub_8008DA4
+ bl StringAppend
_0804EF9C:
add sp, 0x8
pop {r3,r4}
@@ -5112,7 +5112,7 @@ sub_804EFB4: @ 804EFB4
movs r3, 0x4
bl sub_812E51C
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -5150,10 +5150,10 @@ _0804F042:
adds r0, r7, r0
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
adds r0, r5, 0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
adds r0, r6, 0
adds r1, r4, 0
adds r2, r5, 0
@@ -5214,9 +5214,9 @@ sub_804F08C: @ 804F08C
movs r0, 0x1
adds r2, r4, 0
adds r3, r5, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
mov r0, r8
cmp r0, 0
bne _0804F0F0
@@ -5235,7 +5235,7 @@ _0804F0F6:
adds r0, r1
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r6, r0, 24
ldr r4, _0804F170 @ =gUnknown_2031DA8
@@ -5351,13 +5351,13 @@ _0804F1D4:
ldr r0, _0804F1FC @ =gUnknown_2024284
adds r4, r0
adds r0, r4, 0
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
movs r1, 0x2
add r2, sp, 0xC
- bl sub_803FBE8
+ bl GetMonData
b _0804F21E
.align 2, 0
_0804F1FC: .4byte gUnknown_2024284
@@ -5368,13 +5368,13 @@ _0804F200:
ldr r0, _0804F22C @ =gUnknown_202402C
adds r4, r0
adds r0, r4, 0
- bl sub_803F720
+ bl GetMonGender
lsls r0, 24
lsrs r5, r0, 24
adds r0, r4, 0
movs r1, 0x2
add r2, sp, 0xC
- bl sub_803FBE8
+ bl GetMonData
_0804F21E:
cmp r5, 0
beq _0804F230
@@ -5387,7 +5387,7 @@ _0804F22C: .4byte gUnknown_202402C
_0804F230:
add r0, sp, 0xC
movs r1, 0
- bl sub_80466C8
+ bl NameHasGenderSymbol
lsls r0, 24
movs r2, 0x83
cmp r0, 0
@@ -5397,7 +5397,7 @@ _0804F230:
_0804F244:
add r0, sp, 0xC
movs r1, 0xFE
- bl sub_80466C8
+ bl NameHasGenderSymbol
lsls r0, 24
movs r2, 0x83
cmp r0, 0
@@ -5592,7 +5592,7 @@ _0804F3B0: .4byte gUnknown_8261E40
sub_804F3B4: @ 804F3B4
push {lr}
movs r0, 0x1
- bl sub_815036C
+ bl rbox_fill_rectangle
movs r0, 0x1
bl sub_804F020
pop {r0}
@@ -5619,9 +5619,9 @@ sub_804F3C8: @ 804F3C8
str r6, [sp, 0x8]
movs r0, 0x1
movs r3, 0
- bl sub_8002228
+ bl CopyToBgTilemapBufferRect_ChangePalette
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
adds r0, r4, 0
bl sub_804F284
adds r0, r4, 0
@@ -5666,9 +5666,9 @@ sub_804F440: @ 804F440
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r0}
bx r0
@@ -5686,9 +5686,9 @@ sub_804F464: @ 804F464
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r0}
bx r0
@@ -5795,14 +5795,14 @@ _0804F52C:
.4byte _0804F58C
.4byte _0804F594
_0804F550:
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, _0804F568 @ =gUnknown_2031DA8
ldr r1, [r1]
adds r1, 0x80
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
b _0804F59A
.align 2, 0
_0804F568: .4byte gUnknown_2031DA8
@@ -5859,7 +5859,7 @@ sub_804F5BC: @ 804F5BC
lsrs r4, 24
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _0804F60C @ =gUnknown_8261EF4
lsls r4, 2
adds r4, r0
@@ -5878,7 +5878,7 @@ sub_804F5BC: @ 804F5BC
movs r2, 0xC
bl sub_8150048
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -5964,7 +5964,7 @@ _0804F6BC:
b _0804F6F6
_0804F6C0:
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r1, _0804F6D4 @ =gUnknown_2031DA8
ldr r1, [r1]
adds r2, r1, 0
@@ -5978,20 +5978,20 @@ _0804F6D8:
b _0804F6F6
_0804F6DC:
ldr r0, _0804F6E4 @ =gUnknown_8261D00
- bl sub_8008928
+ bl LoadSpritePalette
b _0804F6FA
.align 2, 0
_0804F6E4: .4byte gUnknown_8261D00
_0804F6E8:
ldr r0, _0804F6F0 @ =gUnknown_8261C60
- bl sub_8008928
+ bl LoadSpritePalette
b _0804F6FA
.align 2, 0
_0804F6F0: .4byte gUnknown_8261C60
_0804F6F4:
ldr r0, _0804F708 @ =gUnknown_8261C58
_0804F6F6:
- bl sub_80086DC
+ bl LoadSpriteSheet
_0804F6FA:
ldr r0, _0804F70C @ =gUnknown_2031DA8
ldr r1, [r0]
@@ -6073,7 +6073,7 @@ _0804F776:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0x1
bne _0804F7A8
@@ -6092,7 +6092,7 @@ _0804F7A4: .4byte gUnknown_2024284
_0804F7A8:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0
bne _0804F7C6
@@ -6148,7 +6148,7 @@ _0804F80A:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0x1
bne _0804F83C
@@ -6167,7 +6167,7 @@ _0804F838: .4byte gUnknown_202402C
_0804F83C:
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
cmp r1, 0
bne _0804F85A
@@ -6238,18 +6238,18 @@ _0804F8B0:
adds r4, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r0, r5, 16
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_804A614
+ bl GetHPBarLevel
ldr r1, [r7]
adds r1, 0x5D
adds r1, r6
@@ -6283,18 +6283,18 @@ _0804F910:
adds r4, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
adds r0, r4, 0
movs r1, 0x3A
- bl sub_803FBE8
+ bl GetMonData
adds r1, r0, 0
lsls r0, r5, 16
asrs r0, 16
lsls r1, 16
asrs r1, 16
- bl sub_804A614
+ bl GetHPBarLevel
ldr r1, [r7]
adds r1, 0x63
adds r1, r6
@@ -6433,11 +6433,11 @@ _0804FA2C:
add r4, r8
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
str r0, [r6, 0x18]
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
stm r6!, {r0}
adds r5, 0x1
cmp r5, r7
@@ -6461,7 +6461,7 @@ _0804FA68:
movs r0, 0x3
b _0804FB24
_0804FA70:
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -6513,7 +6513,7 @@ _0804FACA:
adds r0, r1, 0
add r0, r8
movs r1, 0x50
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _0804FAE2
_0804FADE:
@@ -6577,7 +6577,7 @@ sub_804FB34: @ 804FB34
ldrb r0, [r0]
cmp r0, 0
beq _0804FBC0
- bl sub_800A404
+ bl GetMultiplayerId
ldr r6, _0804FBB8 @ =gUnknown_202273C
movs r7, 0x1
eors r0, r7
@@ -6603,7 +6603,7 @@ sub_804FB34: @ 804FB34
_0804FB6E:
cmp r4, 0
ble _0804FBC0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 3
@@ -6618,7 +6618,7 @@ _0804FB6E:
beq _0804FBBC
cmp r4, 0x2
bne _0804FBC0
- bl sub_800A404
+ bl GetMultiplayerId
eors r0, r7
lsls r0, 24
lsrs r0, 24
@@ -6926,7 +6926,7 @@ _0804FD94:
lsls r1, 4
adds r1, 0x4
movs r2, 0x2
- bl sub_80703EC
+ bl LoadPalette
_0804FDAE:
pop {r0}
bx r0
@@ -6949,7 +6949,7 @@ sub_804FDB8: @ 804FDB8
cmp r1, 0xA
bne _0804FDD6
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_0804FDD6:
pop {r0}
bx r0
@@ -6970,7 +6970,7 @@ sub_804FDDC: @ 804FDDC
cmp r1, 0xA
bne _0804FDFA
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_0804FDFA:
pop {r0}
bx r0
@@ -7030,33 +7030,33 @@ sub_804FE24: @ 804FE24
ldrh r0, [r0]
str r0, [sp, 0xC]
add r0, sp, 0x10
- bl sub_8044F78
+ bl DoBgAffineSet
add r0, sp, 0x10
ldrh r1, [r0]
movs r0, 0x20
- bl sub_8000A38
+ bl SetGpuReg
add r0, sp, 0x10
ldrh r1, [r0, 0x2]
movs r0, 0x22
- bl sub_8000A38
+ bl SetGpuReg
add r0, sp, 0x10
ldrh r1, [r0, 0x4]
movs r0, 0x24
- bl sub_8000A38
+ bl SetGpuReg
add r0, sp, 0x10
ldrh r1, [r0, 0x6]
movs r0, 0x26
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [sp, 0x18]
lsls r1, 16
lsrs r1, 16
movs r0, 0x28
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [sp, 0x1C]
lsls r1, 16
lsrs r1, 16
movs r0, 0x2C
- bl sub_8000A38
+ bl SetGpuReg
add sp, 0x20
pop {r4,r5}
pop {r0}
@@ -7073,14 +7073,14 @@ sub_804FEB4: @ 804FEB4
adds r0, 0xE0
ldrh r1, [r0]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
adds r0, 0xE2
ldrh r1, [r0]
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
- bl sub_8000AC4
+ bl GetGpuReg
lsls r0, 16
movs r1, 0xE0
lsls r1, 11
@@ -7091,12 +7091,12 @@ sub_804FEB4: @ 804FEB4
adds r0, 0xE4
ldrh r1, [r0]
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
adds r0, 0xE6
ldrh r1, [r0]
movs r0, 0x18
- bl sub_8000A38
+ bl SetGpuReg
b _0804FF04
.align 2, 0
_0804FEFC: .4byte gUnknown_2031DAC
@@ -7112,9 +7112,9 @@ _0804FF04:
sub_804FF0C: @ 804FF0C
push {lr}
bl sub_804FEB4
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_804FF0C
@@ -7179,8 +7179,8 @@ _0804FF7A:
cmp r1, r0
bls _0804FFAC
bl sub_80098B8
- ldr r0, _0804FFC0 @ =sub_800ACD4
- bl sub_8000544
+ ldr r0, _0804FFC0 @ =c2_800ACD4
+ bl SetMainCallback2
ldr r1, [r4]
adds r3, r1, 0
adds r3, 0x8A
@@ -7203,7 +7203,7 @@ _0804FFAC:
pop {r0}
bx r0
.align 2, 0
-_0804FFC0: .4byte sub_800ACD4
+_0804FFC0: .4byte c2_800ACD4
thumb_func_end sub_804FF4C
thumb_func_start sub_804FFC4
@@ -7218,7 +7218,7 @@ sub_804FFC4: @ 804FFC4
.align 2, 0
_0804FFD4: .4byte gUnknown_3003F64
_0804FFD8:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
_0804FFE0:
@@ -7275,12 +7275,12 @@ _0805003C: .4byte gUnknown_202402C
_08050040:
mov r0, r8
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r5, r0, 16
mov r0, r8
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
adds r7, r0, 0
cmp r6, 0
bne _0805007C
@@ -7316,7 +7316,7 @@ _0805007C:
_0805009A:
mov r0, r8
bl sub_8044148
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
ldr r0, _080500C4 @ =gUnknown_2031DAC
ldr r1, [r0]
adds r0, r1, 0
@@ -7342,7 +7342,7 @@ _080500C8:
movs r1, 0x78
movs r2, 0x3C
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _0805012C @ =gUnknown_2031DAC
ldr r1, [r4]
adds r1, 0x8E
@@ -7437,14 +7437,14 @@ _080501A8:
ldr r4, _08050234 @ =gUnknown_2031DAC
movs r0, 0x88
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
- bl sub_80358D4
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
+ bl AllocateMonSpritesGfx
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r0, _08050238 @ =sub_804FF0C
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80504CC
bl sub_804FF24
ldr r1, _0805023C @ =gUnknown_30030F0
@@ -7654,9 +7654,9 @@ _0805037C: .4byte gUnknown_30030F0
_08050380:
bl sub_8050DE0
ldr r0, _08050394 @ =gUnknown_826CDD4
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050398 @ =gUnknown_826CDDC
- bl sub_8008928
+ bl LoadSpritePalette
b _08050438
.align 2, 0
_08050394: .4byte gUnknown_826CDD4
@@ -7668,9 +7668,9 @@ _0805039C:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
ldr r4, _08050418 @ =gUnknown_2031DA4
ldrb r0, [r4]
movs r6, 0x64
@@ -7678,7 +7678,7 @@ _0805039C:
ldr r1, _0805041C @ =gUnknown_2024284
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
ldr r5, _08050420 @ =gUnknown_2031DAC
ldr r1, [r5]
adds r1, 0xF8
@@ -7692,13 +7692,13 @@ _0805039C:
ldr r1, _08050424 @ =gUnknown_202402C
adds r0, r1
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
ldr r4, [r5]
adds r1, r4, 0
adds r1, 0xFA
strh r0, [r1]
adds r4, 0xFC
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -7755,13 +7755,13 @@ _0805044C:
bl sub_80FCD74
_0805046C:
ldr r0, _08050498 @ =sub_8053D84
- bl sub_8000544
+ bl SetMainCallback2
_08050472:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0x4
pop {r4-r6}
pop {r0}
@@ -7788,9 +7788,9 @@ sub_80504B0: @ 80504B0
push {lr}
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -7808,7 +7808,7 @@ sub_80504CC: @ 80504CC
sub sp, 0x4
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _080505B4 @ =gUnknown_826D1D4
@@ -7818,28 +7818,28 @@ sub_80504CC: @ 80504CC
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r5, 0x80
lsls r5, 4
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
bl sub_8002C28
ldr r0, _080505B8 @ =gUnknown_8D00000
mov r10, r0
@@ -7854,17 +7854,17 @@ sub_80504CC: @ 80504CC
mov r8, r0
ldr r4, _080505C0 @ =gUnknown_201C000
adds r1, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
movs r0, 0
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r6, _080505C4 @ =gUnknown_8D004D8
adds r0, r6, 0
movs r1, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
ldr r0, _080505C8 @ =gUnknown_826D1BC
bl sub_8003B24
mov r0, r9
@@ -7876,16 +7876,16 @@ sub_80504CC: @ 80504CC
bl sub_80F696C
mov r0, r8
adds r1, r4, 0
- bl sub_800EBB4
+ bl LZDecompressWram
movs r0, 0
adds r1, r4, 0
adds r2, r5, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
adds r0, r6, 0
movs r1, 0
movs r2, 0x20
- bl sub_80703A8
+ bl LoadCompressedPalette
add sp, 0x4
pop {r3-r5}
mov r8, r3
@@ -7951,26 +7951,26 @@ _08050628:
ldr r0, _080506D8 @ =gUnknown_300500C
ldr r1, [r0]
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _080506DC @ =gUnknown_202402C
movs r1, 0x7
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
adds r4, 0x1C
adds r0, r4, 0
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
ldr r4, _080506E0 @ =gUnknown_2031DAC
movs r0, 0x88
lsls r0, 1
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
- bl sub_80358D4
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
+ bl AllocateMonSpritesGfx
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r0, _080506E4 @ =sub_804FF0C
- bl sub_80006F4
+ bl SetVBlankCallback
bl sub_80504CC
ldr r0, [r4]
adds r0, 0xEE
@@ -8035,7 +8035,7 @@ _08050700:
movs r1, 0
bl sub_804FFE4
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
b _08050764
_08050710:
movs r0, 0x1
@@ -8043,9 +8043,9 @@ _08050710:
bl sub_804FFE4
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -8053,16 +8053,16 @@ _08050710:
_08050730:
bl sub_8050DE0
ldr r0, _08050744 @ =gUnknown_826CDD4
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050748 @ =gUnknown_826CDDC
- bl sub_8008928
+ bl LoadSpritePalette
b _08050764
.align 2, 0
_08050744: .4byte gUnknown_826CDD4
_08050748: .4byte gUnknown_826CDDC
_0805074C:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
b _08050764
_08050754:
movs r0, 0x5
@@ -8083,13 +8083,13 @@ _08050764:
_08050774: .4byte gUnknown_30030F0
_08050778:
ldr r0, _0805079C @ =sub_8050948
- bl sub_8000544
+ bl SetMainCallback2
_0805077E:
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -8109,23 +8109,23 @@ sub_80507A0: @ 80507A0
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080507F4
adds r0, r5, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
adds r5, r0, 0
adds r0, r4, 0
- bl sub_8043298
+ bl SpeciesToNationalPokedexNum
adds r4, r0, 0
lsls r4, 16
lsrs r4, 16
@@ -8147,7 +8147,7 @@ _080507FC: .4byte gUnknown_2024284
thumb_func_start sub_8050800
sub_8050800: @ 8050800
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
pop {r0}
bx r0
thumb_func_end sub_8050800
@@ -8172,7 +8172,7 @@ sub_805080C: @ 805080C
adds r7, r1, r0
adds r0, r7, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r6, r0, 16
adds r1, r4, 0
@@ -8181,7 +8181,7 @@ sub_805080C: @ 805080C
adds r5, r1, r0
adds r0, r5, 0
movs r1, 0x40
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -8215,7 +8215,7 @@ _08050866:
strb r1, [r0]
adds r0, r7, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _080508A2
adds r0, r7, 0
@@ -8232,7 +8232,7 @@ _080508A2:
ldr r0, _080508EC @ =gUnknown_2031CCC
adds r1, r0
adds r0, r7, 0
- bl sub_8097F44
+ bl GiveMailToMon2
_080508B8:
mov r0, r9
bl sub_80507A0
@@ -8278,13 +8278,13 @@ _0805090C:
lsls r0, 24
cmp r0, 0
beq _08050932
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, 0x74
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
ldr r1, [r4]
adds r1, 0x93
ldrb r0, [r1]
@@ -8308,11 +8308,11 @@ _08050944: .4byte gUnknown_2031DAC
sub_8050948: @ 8050948
push {lr}
bl sub_8050F14
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8050948
@@ -8356,14 +8356,14 @@ _080509A4:
movs r1, 0xAA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050A00 @ =0x00005206
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08050A04 @ =gUnknown_8EAEA20
movs r1, 0x10
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
ldr r3, _08050A08 @ =gUnknown_8EAEA80
ldr r4, _08050A0C @ =0x06004000
movs r5, 0xA1
@@ -8405,13 +8405,13 @@ _08050A18:
lsls r1, 1
strh r1, [r2]
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050A58 @ =0x00008502
movs r0, 0xA
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050A5C @ =0x00009206
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
movs r1, 0x84
lsls r1, 1
@@ -8489,7 +8489,7 @@ _08050AC4:
bne _08050B04
ldr r1, _08050AF8 @ =0x00001241
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08050AFC @ =gUnknown_826BA5C
ldr r1, _08050B00 @ =0x06002800
bl LZ77UnCompVram
@@ -8503,7 +8503,7 @@ _08050B00: .4byte 0x06002800
_08050B04:
ldr r1, _08050B28 @ =0x00001241
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050B2C @ =gUnknown_826407C
ldr r2, _08050B30 @ =0x06002800
ldr r0, _08050B34 @ =0x040000d4
@@ -8516,7 +8516,7 @@ _08050B04:
_08050B1E:
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
b _08050DB4
.align 2, 0
_08050B28: .4byte 0x00001241
@@ -8528,7 +8528,7 @@ _08050B3C:
ldr r0, _08050B6C @ =gUnknown_826BF5C
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _08050B70 @ =gUnknown_826BF7C
ldr r1, _08050B74 @ =0x06004000
bl LZ77UnCompVram
@@ -8544,7 +8544,7 @@ _08050B3C:
lsls r1, 5
_08050B64:
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
b _08050DB4
.align 2, 0
_08050B6C: .4byte gUnknown_826BF5C
@@ -8556,10 +8556,10 @@ _08050B80: .4byte gUnknown_2031DAC
_08050B84:
ldr r1, _08050C0C @ =0x00001441
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050C10 @ =0x00001287
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08050C14 @ =gUnknown_2031DAC
ldr r3, [r0]
adds r1, r3, 0
@@ -8660,10 +8660,10 @@ _08050C68: .4byte gUnknown_2031DAC
_08050C6C:
ldr r1, _08050D00 @ =0x00001441
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050D04 @ =0x00001287
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08050D08 @ =gUnknown_2031DAC
ldr r3, [r0]
adds r1, r3, 0
@@ -8765,14 +8765,14 @@ _08050D48:
strh r2, [r0]
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _08050DC0 @ =0x00005206
movs r0, 0xC
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08050DC4 @ =gUnknown_8EAEA20
movs r1, 0x10
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
ldr r3, _08050DC8 @ =gUnknown_8EAEA80
ldr r4, _08050DCC @ =0x06004000
movs r5, 0xA1
@@ -8829,17 +8829,17 @@ _08050DDC: .4byte 0x06009000
sub_8050DE0: @ 8050DE0
push {lr}
ldr r0, _08050E0C @ =gUnknown_826CE2C
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050E10 @ =gUnknown_826CE7C
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050E14 @ =gUnknown_826CEB0
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050E18 @ =gUnknown_826CF28
- bl sub_80086DC
+ bl LoadSpriteSheet
ldr r0, _08050E1C @ =gUnknown_826CE34
- bl sub_8008928
+ bl LoadSpritePalette
ldr r0, _08050E20 @ =gUnknown_826CE3C
- bl sub_8008928
+ bl LoadSpritePalette
pop {r0}
bx r0
.align 2, 0
@@ -8861,7 +8861,7 @@ sub_8050E24: @ 8050E24
ldrb r0, [r0]
cmp r0, 0
beq _08050EB4
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
ldr r3, _08050E98 @ =gUnknown_2021CD0
movs r2, 0x80
@@ -8874,7 +8874,7 @@ sub_8050E24: @ 8050E24
ldr r0, _08050E9C @ =gUnknown_2022744
adds r1, r0
adds r0, r3, 0
- bl sub_8008D84
+ bl StringCopy
ldr r5, _08050EA0 @ =gUnknown_2031DA4
ldrb r0, [r5, 0x1]
movs r1, 0x6
@@ -8887,20 +8887,20 @@ sub_8050E24: @ 8050E24
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _08050EA8 @ =gUnknown_2021D04
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
ldrb r0, [r5]
muls r0, r4
ldr r1, _08050EAC @ =gUnknown_2024284
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _08050EB0 @ =gUnknown_2021CF0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
b _08050EF0
.align 2, 0
_08050E94: .4byte gUnknown_2031DAC
@@ -8922,10 +8922,10 @@ _08050EB4:
ldr r0, _08050F00 @ =gUnknown_2021CD0
adds r1, r4, 0
adds r1, 0x2B
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08050F04 @ =gUnknown_2021D04
adds r1, r4, 0
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _08050F08 @ =gUnknown_20370C2
ldrh r1, [r0]
movs r0, 0x64
@@ -8934,10 +8934,10 @@ _08050EB4:
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _08050F10 @ =gUnknown_2021CF0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
_08050EF0:
add sp, 0x14
pop {r4,r5}
@@ -9313,13 +9313,13 @@ _0805139C:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
- bl sub_8071A68
+ bl GetCurrentMapMusic
ldr r1, [r7]
adds r1, 0xF4
strh r0, [r1]
movs r0, 0x84
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
bl _08052318
.align 2, 0
_08051408: .4byte gUnknown_202063C
@@ -9389,7 +9389,7 @@ _08051470:
beq _0805149E
adds r0, r1, 0
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_0805149E:
ldr r3, [r4]
adds r1, r3, 0
@@ -9474,7 +9474,7 @@ _0805154C:
movs r1, 0x78
movs r2, 0x20
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0xD3
strb r0, [r1]
@@ -9494,7 +9494,7 @@ _0805154C:
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r7]
bl _080522AC
.align 2, 0
@@ -9509,7 +9509,7 @@ _08051598:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080515B8 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -9531,7 +9531,7 @@ _080515CC:
bl sub_8050968
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -9613,7 +9613,7 @@ _08051678:
movs r1, 0x78
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x91
strb r0, [r1]
@@ -9639,14 +9639,14 @@ _08051698:
bl _08052318
_080516B8:
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
movs r1, 0xC8
lsls r1, 3
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, _080516DC @ =0x0000040c
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r1, [r7]
bl _080522AC
.align 2, 0
@@ -9684,7 +9684,7 @@ _08051714:
movs r1, 0x80
movs r2, 0x41
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x92
strb r0, [r1]
@@ -9696,7 +9696,7 @@ _08051730:
movs r1, 0x80
movs r2, 0x50
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08051778 @ =gUnknown_2031DAC
ldr r1, [r4]
adds r1, 0x90
@@ -9705,7 +9705,7 @@ _08051730:
movs r1, 0x80
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x91
strb r0, [r1]
@@ -9718,7 +9718,7 @@ _08051730:
ldr r1, _08051780 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r4]
bl _080522AC
.align 2, 0
@@ -9743,7 +9743,7 @@ _08051784:
_0805179E:
ldr r1, _080517AC @ =0x00001241
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
bl _08052318
.align 2, 0
_080517AC: .4byte 0x00001241
@@ -9798,7 +9798,7 @@ _08051808:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08051828 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -9824,7 +9824,7 @@ _0805183C:
lsls r0, 2
ldr r4, _08051874 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -9832,7 +9832,7 @@ _0805183C:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x2
bl sub_8050968
ldr r1, [r7]
@@ -9848,13 +9848,13 @@ _08051878:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r5, _080518BC @ =gUnknown_826CE84
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _080518C0 @ =gUnknown_2031DAC
ldr r1, [r4]
adds r1, 0x90
@@ -9864,7 +9864,7 @@ _08051878:
adds r0, r5, 0
movs r1, 0x81
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x91
strb r0, [r1]
@@ -9968,7 +9968,7 @@ _08051980:
ldr r2, _08051990 @ =0x0000ffff
movs r0, 0x1
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
bl _080522A8
.align 2, 0
_08051990: .4byte 0x0000ffff
@@ -9976,7 +9976,7 @@ _08051994:
ldr r2, _080519A4 @ =0x0000ffff
movs r0, 0x1
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
bl _080522A8
.align 2, 0
_080519A4: .4byte 0x0000ffff
@@ -9984,7 +9984,7 @@ _080519A8:
ldr r2, _080519B8 @ =0x0000ffff
movs r0, 0x1
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
bl _080522A8
.align 2, 0
_080519B8: .4byte 0x0000ffff
@@ -9993,7 +9993,7 @@ _080519BC:
ldr r0, [r5]
adds r0, 0xF0
ldrh r0, [r0]
- bl sub_80441F4
+ bl IsPokeSpriteNotFlipped
lsls r0, 24
cmp r0, 0
bne _08051A34
@@ -10028,7 +10028,7 @@ _080519BC:
movs r1, 0
movs r2, 0x3
movs r3, 0x3
- bl sub_80073F0
+ bl CalcCenterToCornerVec
ldr r0, [r5]
adds r0, 0x8E
ldrb r1, [r0]
@@ -10037,7 +10037,7 @@ _080519BC:
lsls r0, 2
adds r0, r4
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _08051A4A
.align 2, 0
_08051A28: .4byte gUnknown_2031DAC
@@ -10053,7 +10053,7 @@ _08051A34:
ldr r1, _08051AD8 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08051A4A:
ldr r5, _08051ADC @ =gUnknown_2031DAC
ldr r0, [r5]
@@ -10065,7 +10065,7 @@ _08051A4A:
ldr r4, _08051AD8 @ =gUnknown_202063C
adds r0, r4
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r2, [r5]
adds r3, r2, 0
adds r3, 0x8E
@@ -10225,7 +10225,7 @@ _08051B4C:
ldr r2, _08051BB0 @ =0x0000ffff
movs r0, 0x1
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
b _08052318
.align 2, 0
_08051BAC: .4byte gUnknown_202063C
@@ -10272,7 +10272,7 @@ _08051BF6:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
adds r2, r1, 0
adds r2, 0x94
@@ -10285,7 +10285,7 @@ _08051BF6:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -10293,7 +10293,7 @@ _08051BF6:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
b _08052318
.align 2, 0
_08051C38: .4byte gUnknown_202063C
@@ -10323,7 +10323,7 @@ _08051C4A:
movs r1, 0x80
adds r2, r4, 0
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
@@ -10331,7 +10331,7 @@ _08051C4A:
movs r1, 0x80
adds r2, r4, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x91
strb r0, [r1]
@@ -10344,7 +10344,7 @@ _08051C4A:
ldr r1, _08051CB0 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08052318
.align 2, 0
_08051CA4: .4byte gUnknown_2037AB8
@@ -10364,7 +10364,7 @@ _08051CC4:
movs r1, 0x92
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08051CE0 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -10443,7 +10443,7 @@ _08051D52:
lsls r0, 2
ldr r4, _08051D8C @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -10451,7 +10451,7 @@ _08051D52:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r3, [r7]
adds r2, r3, 0
adds r2, 0x94
@@ -10515,7 +10515,7 @@ _08051DE4:
movs r1, 0x80
movs r2, 0x41
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x92
strb r0, [r1]
@@ -10540,7 +10540,7 @@ _08051E1C:
movs r1, 0x78
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _08051E40 @ =gUnknown_2031DAC
ldr r1, [r2]
adds r1, 0x91
@@ -10571,7 +10571,7 @@ _08051E44:
b _08052318
_08051E62:
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x6
bl sub_8050968
ldr r1, [r7]
@@ -10625,7 +10625,7 @@ _08051EC4:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08051EE0 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -10673,7 +10673,7 @@ _08051F28:
movs r1, 0xA2
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08051F44 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -10691,7 +10691,7 @@ _08051F48:
negs r2, r2
movs r1, 0x78
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _08051FE0 @ =gUnknown_2031DAC
ldr r1, [r5]
adds r1, 0xD3
@@ -10722,7 +10722,7 @@ _08051F48:
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@@ -10731,7 +10731,7 @@ _08051F48:
lsls r0, 2
adds r0, r4
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@@ -10746,7 +10746,7 @@ _08051F48:
lsls r0, r1
ldr r2, _08051FEC @ =0x0000ffff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r2, [r5]
adds r1, r2, 0
adds r1, 0x94
@@ -10780,7 +10780,7 @@ _08051FF0:
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
b _080522AC
.align 2, 0
@@ -10865,7 +10865,7 @@ _08052070:
lsls r0, 2
adds r0, r4
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x8F
ldrb r0, [r0]
@@ -10885,7 +10885,7 @@ _08052070:
str r2, [sp, 0xC]
movs r2, 0x78
movs r3, 0x54
- bl sub_804B908
+ bl CreatePokeballSpriteToReleaseMon
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -10893,7 +10893,7 @@ _08052070:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -10901,7 +10901,7 @@ _08052070:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r7]
b _080522AC
.align 2, 0
@@ -10912,7 +10912,7 @@ _08052128:
movs r1, 0xAA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08052154 @ =gUnknown_2021D18
ldr r1, _08052158 @ =gUnknown_841E20D
adds r0, r4, 0
@@ -10950,7 +10950,7 @@ _0805216E:
beq _08052184
adds r0, r1, 0
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_08052184:
ldr r3, [r7]
adds r1, r3, 0
@@ -10964,7 +10964,7 @@ _0805218E:
.align 2, 0
_08052194: .4byte 0x0000010b
_08052198:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _080521A4
@@ -10986,7 +10986,7 @@ _080521B4:
cmp r0, 0xA
bne _080521C6
ldr r0, _080521F4 @ =0x00000103
- bl sub_8071C60
+ bl PlayFanfare
_080521C6:
ldr r1, [r7]
ldr r0, [r1, 0x64]
@@ -11077,7 +11077,7 @@ _0805223C:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
- bl sub_80CE540
+ bl TradeEvolutionScene
b _080522A8
.align 2, 0
_08052280: .4byte gUnknown_20370C2
@@ -11094,7 +11094,7 @@ _08052298:
movs r2, 0
movs r3, 0x10
_080522A4:
- bl sub_8070588
+ bl BeginNormalPaletteFade
_080522A8:
ldr r0, _080522B8 @ =gUnknown_2031DAC
ldr r1, [r0]
@@ -11118,27 +11118,27 @@ _080522BC:
ldr r0, [r7]
adds r0, 0xF4
ldrh r0, [r0]
- bl sub_8071A74
+ bl PlayNewMapMusic
ldr r0, [r7]
cmp r0, 0
beq _0805230A
bl sub_8003ECC
movs r0, 0x3
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x1
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
- bl sub_80359AC
+ bl GetBgTilemapBuffer
+ bl Free
+ bl FreeMonSpritesGfx
ldr r0, [r7]
- bl sub_8002BC4
+ bl Free
str r4, [r7]
_0805230A:
- ldr r0, _08052328 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _08052328 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
_08052318:
@@ -11150,7 +11150,7 @@ _0805231A:
bx r1
.align 2, 0
_08052324: .4byte gUnknown_2037AB8
-_08052328: .4byte sub_80567DC
+_08052328: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8050F3C
thumb_func_start sub_805232C
@@ -11489,13 +11489,13 @@ _0805278C:
ldrh r0, [r1]
adds r0, 0x1
strh r0, [r1]
- bl sub_8071A68
+ bl GetCurrentMapMusic
ldr r1, [r7]
adds r1, 0xF4
strh r0, [r1]
movs r0, 0x84
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
bl _08053774
.align 2, 0
_080527F8: .4byte gUnknown_202063C
@@ -11565,7 +11565,7 @@ _08052860:
beq _0805288E
adds r0, r1, 0
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_0805288E:
ldr r3, [r4]
adds r1, r3, 0
@@ -11650,7 +11650,7 @@ _0805293C:
movs r1, 0x78
movs r2, 0x20
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0xD3
strb r0, [r1]
@@ -11670,7 +11670,7 @@ _0805293C:
adds r0, r1
lsls r0, 2
adds r0, r5
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r7]
bl _08053708
.align 2, 0
@@ -11685,7 +11685,7 @@ _08052988:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080529A8 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -11707,7 +11707,7 @@ _080529BC:
bl sub_8050968
movs r0, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -11789,7 +11789,7 @@ _08052A68:
movs r1, 0x78
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x91
strb r0, [r1]
@@ -11815,17 +11815,17 @@ _08052A8C:
bl _08053774
_08052AAC:
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
ldr r1, _08052AD8 @ =0x00000452
movs r0, 0x50
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0x82
lsls r1, 3
movs r0, 0x52
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08052ADC @ =sub_8054588
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
ldr r1, [r7]
bl _08053708
.align 2, 0
@@ -11834,7 +11834,7 @@ _08052AD8: .4byte 0x00000452
_08052ADC: .4byte sub_8054588
_08052AE0:
ldr r0, _08052B00 @ =sub_8054588
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08052AF0
@@ -11870,7 +11870,7 @@ _08052B28:
movs r1, 0x78
movs r2, 0x50
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08052B84 @ =gUnknown_2031DAC
ldr r1, [r4]
adds r1, 0x90
@@ -11891,7 +11891,7 @@ _08052B28:
movs r1, 0x78
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x91
strb r0, [r1]
@@ -11903,7 +11903,7 @@ _08052B28:
lsls r0, 2
adds r0, r5
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r4]
bl _08053708
.align 2, 0
@@ -11929,7 +11929,7 @@ _08052B94:
_08052BAE:
ldr r1, _08052BBC @ =0x00001241
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
bl _08053774
.align 2, 0
_08052BBC: .4byte 0x00001241
@@ -11984,7 +11984,7 @@ _08052C18:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08052C38 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -12010,7 +12010,7 @@ _08052C4C:
lsls r0, 2
ldr r4, _08052C84 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -12018,7 +12018,7 @@ _08052C4C:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x2
bl sub_8050968
ldr r1, [r7]
@@ -12034,13 +12034,13 @@ _08052C88:
adds r0, r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r5, _08052CCC @ =gUnknown_826CE84
adds r0, r5, 0
movs r1, 0x6F
movs r2, 0xAA
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r4, _08052CD0 @ =gUnknown_2031DAC
ldr r1, [r4]
adds r1, 0x90
@@ -12050,7 +12050,7 @@ _08052C88:
adds r0, r5, 0
movs r1, 0x81
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
adds r1, 0x91
strb r0, [r1]
@@ -12160,7 +12160,7 @@ _08052D9C:
ldr r2, _08052DAC @ =0x0000ffff
movs r0, 0x8
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
bl _08053704
.align 2, 0
_08052DAC: .4byte 0x0000ffff
@@ -12168,7 +12168,7 @@ _08052DB0:
ldr r2, _08052DC0 @ =0x0000ffff
movs r0, 0x8
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
bl _08053704
.align 2, 0
_08052DC0: .4byte 0x0000ffff
@@ -12176,7 +12176,7 @@ _08052DC4:
ldr r2, _08052DD4 @ =0x0000ffff
movs r0, 0x8
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
bl _08053704
.align 2, 0
_08052DD4: .4byte 0x0000ffff
@@ -12185,7 +12185,7 @@ _08052DD8:
ldr r0, [r5]
adds r0, 0xF0
ldrh r0, [r0]
- bl sub_80441F4
+ bl IsPokeSpriteNotFlipped
lsls r0, 24
cmp r0, 0
bne _08052E50
@@ -12220,7 +12220,7 @@ _08052DD8:
movs r1, 0
movs r2, 0x3
movs r3, 0x3
- bl sub_80073F0
+ bl CalcCenterToCornerVec
ldr r0, [r5]
adds r0, 0x8E
ldrb r1, [r0]
@@ -12229,7 +12229,7 @@ _08052DD8:
lsls r0, 2
adds r0, r4
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _08052E66
.align 2, 0
_08052E44: .4byte gUnknown_2031DAC
@@ -12245,7 +12245,7 @@ _08052E50:
ldr r1, _08052EF4 @ =gUnknown_202063C
adds r0, r1
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
_08052E66:
ldr r5, _08052EF8 @ =gUnknown_2031DAC
ldr r0, [r5]
@@ -12257,7 +12257,7 @@ _08052E66:
ldr r4, _08052EF4 @ =gUnknown_202063C
adds r0, r4
movs r1, 0
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r2, [r5]
adds r3, r2, 0
adds r3, 0x8E
@@ -12417,7 +12417,7 @@ _08052F68:
ldr r0, _08052FCC @ =sub_8054734
_08052FBE:
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
bl _08053774
.align 2, 0
_08052FC8: .4byte gUnknown_202063C
@@ -12464,7 +12464,7 @@ _08053012:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
adds r2, r1, 0
adds r2, 0x94
@@ -12477,7 +12477,7 @@ _08053012:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -12485,7 +12485,7 @@ _08053012:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
b _08053774
.align 2, 0
_08053054: .4byte gUnknown_202063C
@@ -12522,7 +12522,7 @@ _08053066:
movs r1, 0x78
adds r2, r4, 0
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x90
strb r0, [r1]
@@ -12542,7 +12542,7 @@ _08053066:
movs r1, 0x78
adds r2, r4, 0
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7]
adds r1, 0x91
strb r0, [r1]
@@ -12554,7 +12554,7 @@ _08053066:
lsls r0, 2
adds r0, r5
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _08053774
.align 2, 0
_080530E4: .4byte gUnknown_2037AB8
@@ -12575,7 +12575,7 @@ _08053108:
movs r1, 0x92
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08053124 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -12637,7 +12637,7 @@ _08053180:
movs r1, 0xB2
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080531DC @ =gUnknown_2031DAC
ldr r2, [r4]
adds r1, r2, 0
@@ -12656,7 +12656,7 @@ _08053180:
bne _080531C4
ldr r0, _080531E0 @ =sub_8054588
movs r1, 0x5
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _080531E4 @ =gUnknown_3005090
@@ -12693,7 +12693,7 @@ _080531E8:
lsls r0, 2
ldr r4, _08053220 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r7]
adds r0, 0x91
ldrb r1, [r0]
@@ -12701,7 +12701,7 @@ _080531E8:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r3, [r7]
adds r2, r3, 0
adds r2, 0x94
@@ -12715,7 +12715,7 @@ _080531E8:
_08053220: .4byte gUnknown_202063C
_08053224:
ldr r0, _08053244 @ =sub_8054588
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0
@@ -12765,7 +12765,7 @@ _0805327A:
movs r1, 0x78
movs r2, 0x50
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r2, _0805329C @ =gUnknown_2031DAC
ldr r1, [r2]
adds r1, 0x91
@@ -12796,7 +12796,7 @@ _080532A0:
b _08053774
_080532BE:
adds r0, r1, 0
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x6
bl sub_8050968
ldr r1, [r7]
@@ -12850,7 +12850,7 @@ _08053320:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _0805333C @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -12898,7 +12898,7 @@ _08053384:
movs r1, 0xA2
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _080533A0 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -12916,7 +12916,7 @@ _080533A4:
negs r2, r2
movs r1, 0x78
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r5, _0805343C @ =gUnknown_2031DAC
ldr r1, [r5]
adds r1, 0xD3
@@ -12947,7 +12947,7 @@ _080533A4:
lsls r0, 2
adds r0, r4
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@@ -12956,7 +12956,7 @@ _080533A4:
lsls r0, 2
adds r0, r4
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
ldr r0, [r5]
adds r0, 0xD3
ldrb r1, [r0]
@@ -12971,7 +12971,7 @@ _080533A4:
lsls r0, r1
ldr r2, _08053448 @ =0x0000ffff
movs r1, 0x10
- bl sub_80714D4
+ bl BlendPalettes
ldr r2, [r5]
adds r1, r2, 0
adds r1, 0x94
@@ -13005,7 +13005,7 @@ _0805344C:
movs r1, 0x1
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r7]
b _08053708
.align 2, 0
@@ -13090,7 +13090,7 @@ _080534CC:
lsls r0, 2
adds r0, r4
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r0, [r7]
adds r0, 0x8F
ldrb r0, [r0]
@@ -13110,7 +13110,7 @@ _080534CC:
str r2, [sp, 0xC]
movs r2, 0x78
movs r3, 0x54
- bl sub_804B908
+ bl CreatePokeballSpriteToReleaseMon
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -13118,7 +13118,7 @@ _080534CC:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldr r0, [r7]
adds r0, 0xD3
ldrb r1, [r0]
@@ -13126,7 +13126,7 @@ _080534CC:
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r1, [r7]
b _08053708
.align 2, 0
@@ -13137,7 +13137,7 @@ _08053584:
movs r1, 0xAA
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _080535B0 @ =gUnknown_2021D18
ldr r1, _080535B4 @ =gUnknown_841E20D
adds r0, r4, 0
@@ -13175,7 +13175,7 @@ _080535CA:
beq _080535E0
adds r0, r1, 0
movs r1, 0
- bl sub_8071DF0
+ bl PlayCry1
_080535E0:
ldr r3, [r7]
adds r1, r3, 0
@@ -13189,7 +13189,7 @@ _080535EA:
.align 2, 0
_080535F0: .4byte 0x0000010b
_080535F4:
- bl sub_80721A0
+ bl IsCryFinished
lsls r0, 24
cmp r0, 0
bne _08053600
@@ -13211,7 +13211,7 @@ _08053610:
cmp r0, 0xA
bne _08053622
ldr r0, _08053650 @ =0x00000103
- bl sub_8071C60
+ bl PlayFanfare
_08053622:
ldr r1, [r7]
ldr r0, [r1, 0x64]
@@ -13302,7 +13302,7 @@ _08053698:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
- bl sub_80CE540
+ bl TradeEvolutionScene
b _08053704
.align 2, 0
_080536DC: .4byte gUnknown_20370C2
@@ -13319,7 +13319,7 @@ _080536F4:
movs r2, 0
movs r3, 0x10
_08053700:
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08053704:
ldr r0, _08053714 @ =gUnknown_2031DAC
ldr r1, [r0]
@@ -13343,27 +13343,27 @@ _08053718:
ldr r0, [r7]
adds r0, 0xF4
ldrh r0, [r0]
- bl sub_8071A74
+ bl PlayNewMapMusic
ldr r0, [r7]
cmp r0, 0
beq _08053766
bl sub_8003ECC
movs r0, 0x3
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x1
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
- bl sub_80359AC
+ bl GetBgTilemapBuffer
+ bl Free
+ bl FreeMonSpritesGfx
ldr r0, [r7]
- bl sub_8002BC4
+ bl Free
str r4, [r7]
_08053766:
- ldr r0, _08053784 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _08053784 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
bl sub_8053AE4
bl sub_812B484
_08053774:
@@ -13375,7 +13375,7 @@ _08053776:
bx r1
.align 2, 0
_08053780: .4byte gUnknown_2037AB8
-_08053784: .4byte sub_80567DC
+_08053784: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_805232C
thumb_func_start sub_8053788
@@ -13430,7 +13430,7 @@ _080537B8:
adds r1, 0x8F
ldrb r2, [r1]
adds r1, r4, 0
- bl sub_80CE540
+ bl TradeEvolutionScene
b _0805380E
.align 2, 0
_080537F4: .4byte gUnknown_300537C
@@ -13440,7 +13440,7 @@ _08053800: .4byte gUnknown_2024284
_08053804: .4byte gUnknown_2031DAC
_08053808:
mov r0, r8
- bl sub_8000544
+ bl SetMainCallback2
_0805380E:
ldr r1, _08053838 @ =gUnknown_2031DA4
movs r0, 0xFF
@@ -13451,11 +13451,11 @@ _08053814:
lsls r0, 24
cmp r0, 0
bne _08053822
- bl sub_8077578
+ bl RunTasks
_08053822:
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -13469,7 +13469,7 @@ _08053838: .4byte gUnknown_2031DA4
sub_805383C: @ 805383C
push {r4-r6,lr}
bl sub_804FFC4
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r6, 0x1
@@ -13483,7 +13483,7 @@ sub_805383C: @ 805383C
cmp r1, r0
bne _08053864
ldr r0, _080538B0 @ =sub_8053788
- bl sub_8000544
+ bl SetMainCallback2
_08053864:
ldrh r1, [r4]
ldr r0, _080538B4 @ =0x0000abcd
@@ -13495,7 +13495,7 @@ _08053864:
strb r6, [r0]
_08053874:
movs r0, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_0805387A:
movs r0, 0x2
ands r0, r5
@@ -13516,7 +13516,7 @@ _0805387A:
strb r1, [r0]
_0805389C:
movs r0, 0x1
- bl sub_800A588
+ bl ResetBlockReceivedFlag
_080538A2:
pop {r4-r6}
pop {r0}
@@ -13641,7 +13641,7 @@ _08053960:
str r2, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_08053996:
add sp, 0x4
pop {r4}
@@ -13663,7 +13663,7 @@ sub_80539AC: @ 80539AC
bne _080539C0
adds r0, r4, 0
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_080539C0:
ldrh r0, [r4, 0x30]
adds r0, 0x1
@@ -13689,7 +13689,7 @@ _080539C0:
cmp r0, 0x17
bne _080539FE
adds r0, r4, 0
- bl sub_8007280
+ bl DestroySprite
ldr r0, _08053A08 @ =gUnknown_2031DAC
ldr r0, [r0]
adds r0, 0x94
@@ -13795,12 +13795,12 @@ sub_8053A9C: @ 8053A9C
muls r1, r6
ldr r5, _08053ADC @ =gUnknown_8245EE0
adds r1, r5
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08053AE0 @ =gUnknown_2021CF0
ldrh r1, [r4, 0xC]
muls r1, r6
adds r1, r5
- bl sub_8008D84
+ bl StringCopy
ldrh r0, [r4, 0x38]
pop {r4-r6}
pop {r1}
@@ -13832,17 +13832,17 @@ sub_8053AE4: @ 8053AE4
adds r0, r1
movs r1, 0x2
mov r2, sp
- bl sub_803FBE8
+ bl GetMonData
ldr r0, _08053B3C @ =gUnknown_2021CD0
mov r1, sp
- bl sub_8008CF4
+ bl StringCopy10
ldr r0, _08053B40 @ =gUnknown_2021CF0
ldrh r2, [r4, 0xC]
movs r1, 0xB
muls r1, r2
ldr r2, _08053B44 @ =gUnknown_8245EE0
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
add sp, 0x20
pop {r4}
pop {r0}
@@ -13875,7 +13875,7 @@ sub_8053B48: @ 8053B48
ldr r1, _08053CA8 @ =gUnknown_2024284
adds r0, r1
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
adds r2, r0, 0
lsls r2, 24
lsrs r2, 24
@@ -13893,7 +13893,7 @@ sub_8053B48: @ 8053B48
str r0, [sp, 0xC]
adds r0, r6, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
adds r2, r5, 0
adds r2, 0xE
adds r0, r6, 0
@@ -14022,7 +14022,7 @@ _08053CB4:
bl sub_804037C
_08053CC0:
ldr r0, _08053CD0 @ =gUnknown_202402C
- bl sub_803E47C
+ bl CalculateMonStats
add sp, 0x38
pop {r4-r7}
pop {r0}
@@ -14058,7 +14058,7 @@ _08053CEE:
adds r0, 0x12
adds r1, r5, 0
adds r1, 0x2B
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r5, 0x18]
lsrs r0, r1, 24
strb r0, [r4, 0x1A]
@@ -14088,14 +14088,14 @@ sub_8053D2C: @ 8053D2C
ldr r4, _08053D5C @ =gUnknown_2024284
adds r0, r4
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08053D60
ldrh r0, [r6]
muls r0, r5
adds r0, r4
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
b _08053D62
@@ -14142,7 +14142,7 @@ sub_8053D84: @ 8053D84
lsls r0, 2
ldr r4, _08053E0C @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldr r0, [r5]
adds r0, 0x8F
ldrb r1, [r0]
@@ -14150,7 +14150,7 @@ sub_8053D84: @ 8053D84
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
ldr r0, _08053E10 @ =gUnknown_2031DA4
ldrb r4, [r0]
ldrb r0, [r0, 0x1]
@@ -14169,15 +14169,15 @@ sub_8053D84: @ 8053D84
adds r0, 0x93
strb r6, [r0]
ldr r0, _08053E18 @ =sub_8053E1C
- bl sub_8000544
+ bl SetMainCallback2
_08053DE6:
bl sub_80508F4
bl sub_805383C
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r4-r6}
pop {r0}
bx r0
@@ -14211,13 +14211,13 @@ sub_8053E1C: @ 8053E1C
adds r1, 0x74
ldr r0, _08053E88 @ =0x0000dcba
strh r0, [r1]
- bl sub_800A42C
+ bl bitmask_all_link_players_but_self
lsls r0, 24
lsrs r0, 24
ldr r1, [r4]
adds r1, 0x74
movs r2, 0x14
- bl sub_800A448
+ bl SendBlock
ldr r0, [r4]
adds r0, 0x72
movs r1, 0x2
@@ -14226,10 +14226,10 @@ sub_8053E1C: @ 8053E1C
adds r0, 0x73
strb r1, [r0]
_08053E68:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r4}
pop {r0}
bx r0
@@ -14481,7 +14481,7 @@ _08054132:
cmp r0, 0
beq _0805415A
ldr r4, _0805417C @ =gUnknown_202273C
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0x1
eors r0, r1
lsls r0, 24
@@ -14533,7 +14533,7 @@ _080541A0:
lsrs r1, r0, 24
cmp r1, 0
beq _080541C4
- bl sub_804C1DC
+ bl sav2_gender2_inplace_and_xFE
ldr r0, _080541C0 @ =gUnknown_30030F0
movs r1, 0x87
lsls r1, 3
@@ -14585,11 +14585,11 @@ _08054204:
bhi _08054214
b _08054396
_08054214:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _0805423C
- bl sub_8044EC8
+ bl Random
ldr r4, [r4]
lsls r0, 16
lsrs r0, 16
@@ -14682,7 +14682,7 @@ _080542C4:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08054338
_080542E0:
ldr r0, _080542FC @ =gUnknown_2037AB8
@@ -14692,7 +14692,7 @@ _080542E0:
cmp r0, 0
bne _08054396
movs r0, 0x3
- bl sub_8071DBC
+ bl FadeOutBGM
ldr r1, _08054300 @ =gUnknown_30030F0
movs r0, 0x87
lsls r0, 3
@@ -14702,7 +14702,7 @@ _080542E0:
_080542FC: .4byte gUnknown_2037AB8
_08054300: .4byte gUnknown_30030F0
_08054304:
- bl sub_8071DD4
+ bl IsBGMStopped
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -14753,7 +14753,7 @@ _0805434C:
movs r1, 0
strb r1, [r0]
ldr r0, _08054380 @ =sub_80543C4
- bl sub_8000544
+ bl SetMainCallback2
b _08054396
.align 2, 0
_08054374: .4byte gUnknown_3003F3C
@@ -14768,17 +14768,17 @@ _08054384:
ldr r0, _080543BC @ =gUnknown_3003530
strb r1, [r0]
ldr r0, _080543C0 @ =sub_80543C4
- bl sub_8000544
+ bl SetMainCallback2
_08054396:
bl sub_800B0A8
lsls r0, 24
cmp r0, 0
bne _080543A4
- bl sub_8077578
+ bl RunTasks
_080543A4:
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0x4
pop {r4}
pop {r0}
@@ -14802,18 +14802,18 @@ sub_80543C4: @ 80543C4
bne _0805441A
bl sub_8003ECC
movs r0, 0x3
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0x1
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
movs r0, 0
- bl sub_8002008
- bl sub_8002BC4
- bl sub_80359AC
+ bl GetBgTilemapBuffer
+ bl Free
+ bl FreeMonSpritesGfx
ldr r4, _08054434 @ =gUnknown_2031DAC
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
str r5, [r4]
ldr r0, _08054438 @ =gUnknown_3003F3C
ldrb r0, [r0]
@@ -14823,12 +14823,12 @@ sub_80543C4: @ 80543C4
_08054412:
ldr r0, _0805443C @ =gUnknown_30030F0
ldr r0, [r0, 0x8]
- bl sub_8000544
+ bl SetMainCallback2
_0805441A:
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r4,r5}
pop {r0}
bx r0
@@ -14843,17 +14843,17 @@ _0805443C: .4byte gUnknown_30030F0
sub_8054440: @ 8054440
push {lr}
sub sp, 0x4
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _0805446C @ =sub_8054470
movs r1, 0xA
- bl sub_807741C
+ bl CreateTask
movs r0, 0x1
negs r0, r0
movs r1, 0
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
bl sub_812B478
add sp, 0x4
pop {r0}
@@ -14874,12 +14874,12 @@ sub_8054470: @ 8054470
cmp r0, 0
bne _08054494
ldr r0, _080544A0 @ =sub_80505CC
- bl sub_8000544
+ bl SetMainCallback2
ldr r1, _080544A4 @ =gUnknown_3005020
ldr r0, _080544A8 @ =sub_807DD24
str r0, [r1]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08054494:
pop {r4}
pop {r0}
@@ -14909,7 +14909,7 @@ _080544B2:
adds r0, r1
adds r1, r4, 0
adds r1, 0x43
- bl sub_803FBE8
+ bl GetMonData
adds r0, r5, r0
lsls r0, 24
lsrs r5, r0, 24
@@ -14955,7 +14955,7 @@ sub_8054508: @ 8054508
lsrs r4, 24
adds r0, r5, 0
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _08054580 @ =gUnknown_2031DAC
ldr r1, [r2]
movs r6, 0x82
@@ -15048,7 +15048,7 @@ _080545D4:
_080545D6:
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _080545F2
.align 2, 0
_080545E0: .4byte gUnknown_826BF5C
@@ -15058,7 +15058,7 @@ _080545E4:
adds r0, r1
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
_080545F2:
ldr r0, _0805464C @ =gUnknown_826D250
movs r2, 0
@@ -15099,7 +15099,7 @@ _08054610:
cmp r0, 0xFF
bne _08054656
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08054656
.align 2, 0
_08054648: .4byte gUnknown_826BD5C
@@ -15154,13 +15154,13 @@ sub_805465C: @ 805465C
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x4A
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x13
- bl sub_8000A38
+ bl SetGpuReg
_080546BC:
ldr r4, _0805472C @ =gUnknown_2031DAC
ldr r2, [r4]
@@ -15174,7 +15174,7 @@ _080546BC:
lsls r0, 8
orrs r1, r0
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, [r4]
movs r1, 0x86
lsls r1, 1
@@ -15187,7 +15187,7 @@ _080546BC:
lsls r0, 8
orrs r1, r0
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r7]
adds r0, 0x1
strh r0, [r7]
@@ -15207,7 +15207,7 @@ _080546BC:
cmp r0, 0x4F
bhi _0805471E
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0805471E:
pop {r3}
mov r8, r3
@@ -15248,10 +15248,10 @@ sub_8054734: @ 8054734
strb r0, [r1]
movs r0, 0x4A
movs r1, 0x10
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x13
- bl sub_8000A38
+ bl SetGpuReg
_08054774:
ldr r5, _080547EC @ =gUnknown_2031DAC
ldr r0, [r5]
@@ -15264,7 +15264,7 @@ _08054774:
lsls r0, 8
orrs r1, r0
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
ldr r2, [r5]
movs r1, 0x86
lsls r1, 1
@@ -15277,7 +15277,7 @@ _08054774:
lsls r0, 8
orrs r1, r0
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -15305,7 +15305,7 @@ _08054774:
ldr r2, _080547F8 @ =0x0000ffff
movs r0, 0x8
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
b _0805480C
.align 2, 0
_080547E8: .4byte gUnknown_3005098
@@ -15317,9 +15317,9 @@ _080547FC:
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
_0805480C:
pop {r4-r7}
pop {r0}
diff --git a/asm/trainer_card.s b/asm/trainer_card.s
index 46829e6e5..3d80b6564 100644
--- a/asm/trainer_card.s
+++ b/asm/trainer_card.s
@@ -8,9 +8,9 @@
thumb_func_start sub_8088FF0
sub_8088FF0: @ 8088FF0
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
bl sub_808B180
ldr r0, _08089024 @ =gUnknown_20397A4
ldr r0, [r0]
@@ -71,10 +71,10 @@ _0808906C: .4byte 0x04000012
thumb_func_start sub_8089070
sub_8089070: @ 8089070
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8089070
@@ -91,14 +91,14 @@ sub_8089088: @ 8089088
lsls r1, 3
adds r0, r1
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8003ECC
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
pop {r4,r5}
pop {r0}
bx r0
@@ -148,7 +148,7 @@ _080890E8:
.4byte _0808937A
.4byte _080893B8
_0808912C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _08089138
@@ -156,7 +156,7 @@ _0808912C:
_08089138:
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _08089214
_08089142:
bl sub_8089DC8
@@ -173,7 +173,7 @@ _08089150:
_08089158:
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
bl sub_808B838
movs r0, 0x2
bl sub_808ACC8
@@ -219,22 +219,22 @@ _080891B6:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080891D8 @ =sub_8088FF0
- bl sub_80006F4
+ bl SetVBlankCallback
b _08089214
.align 2, 0
_080891D0: .4byte gUnknown_3003F3C
_080891D4: .4byte gUnknown_3003F64
_080891D8: .4byte sub_8088FF0
_080891DC:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _080891E8
b _08089416
_080891E8:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _080891F4
@@ -250,7 +250,7 @@ _080891F4:
.align 2, 0
_08089204: .4byte gUnknown_20397A4
_08089208:
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
beq _08089214
@@ -465,7 +465,7 @@ _080893B8:
_080893C8:
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _080893E0 @ =gUnknown_20397A4
ldr r1, [r0]
movs r0, 0xE
@@ -475,7 +475,7 @@ _080893C8:
_080893DC: .4byte gUnknown_3003F64
_080893E0: .4byte gUnknown_20397A4
_080893E4:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _08089416
@@ -871,8 +871,8 @@ _0808973E:
bx r0
thumb_func_end sub_80895B8
- thumb_func_start sub_8089744
-sub_8089744: @ 8089744
+ thumb_func_start sav12_xor_get_clamped_above
+sav12_xor_get_clamped_above: @ 8089744
push {r4,lr}
adds r4, r1, 0
lsls r0, 24
@@ -885,7 +885,7 @@ _08089756:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8089744
+ thumb_func_end sav12_xor_get_clamped_above
thumb_func_start sub_808975C
sub_808975C: @ 808975C
@@ -986,15 +986,15 @@ _080897EE:
ldr r4, _08089894 @ =0x0000270f
movs r0, 0x17
adds r1, r4, 0
- bl sub_8089744
+ bl sav12_xor_get_clamped_above
strh r0, [r5, 0x14]
movs r0, 0x18
adds r1, r4, 0
- bl sub_8089744
+ bl sav12_xor_get_clamped_above
strh r0, [r5, 0x16]
ldr r1, _08089898 @ =0x0000ffff
movs r0, 0x15
- bl sub_8089744
+ bl sav12_xor_get_clamped_above
strh r0, [r5, 0x20]
strh r6, [r5, 0x18]
strh r6, [r5, 0x1A]
@@ -1031,7 +1031,7 @@ _0808985A:
ldr r0, _08089888 @ =gUnknown_300500C
ldr r1, [r0]
adds r0, r7, 0
- bl sub_8008D84
+ bl StringCopy
mov r0, r8
cmp r0, 0
bne _080898A4
@@ -1135,11 +1135,11 @@ _0808991C:
ldr r4, _080899A4 @ =0x0000ffff
movs r0, 0x33
adds r1, r4, 0
- bl sub_8089744
+ bl sav12_xor_get_clamped_above
str r0, [r5, 0x3C]
movs r0, 0x32
adds r1, r4, 0
- bl sub_8089744
+ bl sav12_xor_get_clamped_above
str r0, [r5, 0x40]
adds r1, r5, 0
adds r1, 0x4C
@@ -1389,47 +1389,47 @@ _08089B60: .4byte 0x00000827
sub_8089B64: @ 8089B64
push {lr}
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r1, 0xFD
lsls r1, 6
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x50
movs r1, 0xC1
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x54
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0xA0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x40
movs r1, 0xF0
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, _08089BC8 @ =gUnknown_3003F64
ldrb r0, [r0]
cmp r0, 0
beq _08089BCC
movs r0, 0xC7
- bl sub_8000B68
+ bl EnableInterrupts
b _08089BD2
.align 2, 0
_08089BC8: .4byte gUnknown_3003F64
_08089BCC:
movs r0, 0x3
- bl sub_8000B68
+ bl EnableInterrupts
_08089BD2:
pop {r0}
bx r0
@@ -1462,7 +1462,7 @@ _08089BF2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x54
- bl sub_8000A38
+ bl SetGpuReg
ldr r0, [r4]
ldr r1, _08089C38 @ =0x00007bcc
adds r0, r1
@@ -1474,7 +1474,7 @@ _08089BF2:
lsls r1, 16
lsrs r1, 16
movs r0, 0x44
- bl sub_8000A38
+ bl SetGpuReg
pop {r4}
pop {r0}
bx r0
@@ -1488,12 +1488,12 @@ _08089C38: .4byte 0x00007bcc
sub_8089C3C: @ 8089C3C
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_8089C3C
@@ -1550,40 +1550,40 @@ sub_8089CA4: @ 8089CA4
push {lr}
movs r0, 0x8
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xA
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xC
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0xE
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x10
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x14
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x16
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x18
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1C
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
thumb_func_end sub_8089CA4
@@ -1591,8 +1591,8 @@ sub_8089CA4: @ 8089CA4
thumb_func_start sub_8089D0C
sub_8089D0C: @ 8089D0C
push {lr}
- bl sub_8006B10
- bl sub_8070528
+ bl ResetSpriteData
+ bl ResetPaletteFade
movs r0, 0
bl sub_8001618
ldr r1, _08089D84 @ =gUnknown_83CD888
@@ -1602,35 +1602,35 @@ sub_8089D0C: @ 8089D0C
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _08089D88 @ =gUnknown_83CD898
bl sub_8003B24
bl sub_8002C28
@@ -1645,7 +1645,7 @@ _08089D88: .4byte gUnknown_83CD898
sub_8089D8C: @ 8089D8C
push {lr}
ldr r0, _08089DA0 @ =sub_8089070
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0xA
bl sub_812B1F0
pop {r0}
@@ -1657,11 +1657,11 @@ _08089DA0: .4byte sub_8089070
thumb_func_start sub_8089DA4
sub_8089DA4: @ 8089DA4
push {lr}
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetTasks
+ bl remove_some_task
ldr r0, _08089DC4 @ =sub_80890C0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
bl sub_808B774
bl sub_8089A94
pop {r0}
@@ -1819,23 +1819,23 @@ sub_8089EEC: @ 8089EEC
sub sp, 0x4C
ldr r1, _08089F54 @ =gUnknown_8419CDA
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
add r4, sp, 0x2C
ldr r5, _08089F58 @ =gUnknown_20397A4
ldr r1, [r5]
ldr r0, _08089F5C @ =0x0000048c
adds r1, r0
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r5]
ldr r1, _08089F60 @ =0x00007bcf
adds r0, r1
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_80093BC
+ bl ConvertInternationalString
add r0, sp, 0xC
adds r1, r4, 0
- bl sub_8008DA4
+ bl StringAppend
ldr r0, _08089F64 @ =gUnknown_83CD8E9
ldrb r1, [r0, 0x1]
ldr r2, _08089F68 @ =gUnknown_83CD920
@@ -1879,7 +1879,7 @@ sub_8089F78: @ 8089F78
sub sp, 0x2C
ldr r1, _08089FCC @ =gUnknown_8419CE1
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
ldr r4, _08089FD0 @ =gUnknown_20397A4
ldr r1, [r4]
ldr r2, _08089FD4 @ =0x0000046a
@@ -1930,7 +1930,7 @@ sub_8089FEC: @ 8089FEC
sub sp, 0x18
ldr r1, _0808A068 @ =gUnknown_8419CED
add r0, sp, 0xC
- bl sub_8008D84
+ bl StringCopy
ldr r4, _0808A06C @ =gUnknown_20397A4
ldr r1, [r4]
movs r2, 0x90
@@ -1947,7 +1947,7 @@ sub_8089FEC: @ 8089FEC
cmp r0, 0x1
beq _0808A080
add r0, sp, 0xC
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -1992,7 +1992,7 @@ _0808A078: .4byte gUnknown_83CD8E0
_0808A07C: .4byte gUnknown_8419CE7
_0808A080:
add r0, sp, 0xC
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -2083,7 +2083,7 @@ _0808A112:
cmp r0, 0x1
beq _0808A1B4
add r0, sp, 0xC
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -2138,7 +2138,7 @@ _0808A1AC: .4byte gUnknown_8419CEF
_0808A1B0: .4byte gUnknown_8419CF7
_0808A1B4:
add r0, sp, 0xC
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r0, 16
lsls r1, r0, 1
@@ -2240,7 +2240,7 @@ _0808A264:
str r0, [sp, 0x4]
movs r0, 0x1
movs r1, 0
- bl sub_8004378
+ bl FillWindowPixelRect
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -2494,14 +2494,14 @@ sub_808A4A8: @ 808A4A8
adds r0, 0x4D
ldr r2, _0808A4EC @ =0x0000048c
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
adds r0, r1, 0
adds r0, 0x4D
ldr r2, _0808A4F0 @ =0x00007bcf
adds r1, r2
ldrb r1, [r1]
- bl sub_80093BC
+ bl ConvertInternationalString
ldr r4, [r4]
ldr r1, _0808A4F4 @ =0x00000457
adds r0, r4, r1
@@ -2511,7 +2511,7 @@ sub_808A4A8: @ 808A4A8
adds r0, r4, 0
adds r0, 0x4D
ldr r1, _0808A4F8 @ =gUnknown_8419D0A
- bl sub_8008DA4
+ bl StringAppend
_0808A4E0:
pop {r4}
pop {r0}
@@ -2630,13 +2630,13 @@ sub_808A5B8: @ 808A5B8
ldr r0, [r5]
adds r0, 0x93
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r5]
adds r0, 0x93
ldr r4, _0808A648 @ =gUnknown_8419CF8
adds r1, r4, 0
movs r2, 0x2
- bl sub_8008DEC
+ bl StringAppendN
ldr r0, [r5]
ldr r1, _0808A64C @ =0x00000464
adds r0, r1
@@ -2649,12 +2649,12 @@ sub_808A5B8: @ 808A5B8
adds r0, 0x93
mov r1, sp
movs r2, 0x3
- bl sub_8008DEC
+ bl StringAppendN
ldr r0, [r5]
adds r0, 0x93
adds r1, r4, 0
movs r2, 0x2
- bl sub_8008DEC
+ bl StringAppendN
ldr r0, [r5]
ldr r2, _0808A650 @ =0x00000466
adds r0, r2
@@ -2667,7 +2667,7 @@ sub_808A5B8: @ 808A5B8
adds r0, 0x93
mov r1, sp
movs r2, 0x3
- bl sub_8008DEC
+ bl StringAppendN
_0808A636:
add sp, 0xC
pop {r4,r5}
@@ -2753,12 +2753,12 @@ sub_808A6C8: @ 808A6C8
lsls r1, 2
adds r1, r2
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _0808A74C @ =0x0000011f
adds r0, r1
ldr r1, _0808A750 @ =gUnknown_8419D4F
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
movs r3, 0x8E
lsls r3, 3
@@ -2772,7 +2772,7 @@ sub_808A6C8: @ 808A6C8
ldr r1, _0808A754 @ =0x00000165
adds r0, r1
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r3, _0808A758 @ =0x00000472
adds r0, r3
@@ -2785,7 +2785,7 @@ sub_808A6C8: @ 808A6C8
ldr r1, _0808A75C @ =0x000001ab
adds r0, r1
mov r1, sp
- bl sub_8008D84
+ bl StringCopy
_0808A736:
add sp, 0x20
pop {r4}
@@ -2893,7 +2893,7 @@ sub_808A810: @ 808A810
ldr r2, _0808A844 @ =0x000001f1
adds r0, r1, r2
ldr r1, _0808A848 @ =gUnknown_8419D57
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
ldr r2, _0808A84C @ =0x00000237
adds r0, r1, r2
@@ -2985,7 +2985,7 @@ sub_808A8D0: @ 808A8D0
ldr r2, _0808A910 @ =0x0000027d
adds r0, r1, r2
ldr r1, _0808A914 @ =gUnknown_8419D7D
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
ldr r2, _0808A918 @ =0x000002c3
adds r0, r1, r2
@@ -3084,7 +3084,7 @@ sub_808A9A4: @ 808A9A4
ldr r2, _0808A9E0 @ =0x00000309
adds r0, r1, r2
ldr r1, _0808A9E4 @ =gUnknown_8419D66
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
ldr r2, _0808A9E8 @ =0x0000034f
adds r0, r1, r2
@@ -3227,7 +3227,7 @@ _0808AAA4:
str r0, [sp, 0xC]
movs r0, 0x3
movs r3, 0xF
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
_0808AAEE:
adds r0, r4, 0x1
lsls r0, 24
@@ -3302,7 +3302,7 @@ _0808AB68:
_0808AB80:
adds r0, r4, r5
movs r1, 0x60
- bl sub_80715F4
+ bl TintPalette_SepiaTone
_0808AB88:
ldr r0, _0808ABD8 @ =gUnknown_20397A4
ldr r0, [r0]
@@ -3310,7 +3310,7 @@ _0808AB88:
adds r0, r1
movs r1, 0x50
movs r2, 0xC0
- bl sub_80703EC
+ bl LoadPalette
movs r4, 0
_0808AB9A:
ldr r0, _0808ABD8 @ =gUnknown_20397A4
@@ -3332,7 +3332,7 @@ _0808AB9A:
movs r0, 0x3
movs r2, 0x80
lsls r2, 2
- bl sub_80017D0
+ bl LoadBgTiles
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3399,7 +3399,7 @@ _0808AC08:
str r0, [sp, 0xC]
movs r0, 0x3
movs r3, 0x2
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
_0808AC48:
adds r0, r4, 0x1
lsls r0, 24
@@ -3424,19 +3424,19 @@ sub_808AC6C: @ 808AC6C
ldr r0, _0808ACB0 @ =gUnknown_83CD320
movs r1, 0xB0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808ACB4 @ =gUnknown_83CD340
movs r1, 0xC0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808ACB8 @ =gUnknown_83CD360
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808ACBC @ =gUnknown_83CD380
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0808ACC0 @ =gUnknown_20397A4
ldr r1, [r0]
ldr r0, _0808ACC4 @ =0x000016cc
@@ -3445,7 +3445,7 @@ sub_808AC6C: @ 808AC6C
lsls r2, 3
movs r0, 0x3
movs r3, 0x80
- bl sub_80017D0
+ bl LoadBgTiles
pop {r0}
bx r0
.align 2, 0
@@ -3464,7 +3464,7 @@ sub_808ACC8: @ 808ACC8
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r4, 0
movs r1, 0x3
bl sub_8003F20
@@ -3522,7 +3522,7 @@ _0808AD3C:
movs r0, 0
_0808AD48:
movs r3, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _0808AE7A
.align 2, 0
_0808AD50: .4byte gUnknown_20397A4
@@ -3553,7 +3553,7 @@ _0808AD7C:
ldr r0, [r0]
movs r1, 0
movs r2, 0x60
- bl sub_80703EC
+ bl LoadPalette
b _0808AE7A
.align 2, 0
_0808AD90: .4byte gUnknown_83CD8CC
@@ -3617,7 +3617,7 @@ _0808AE0C:
movs r1, 0x40
_0808AE10:
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _0808AE7A
.align 2, 0
_0808AE18: .4byte gUnknown_83CD300
@@ -3627,12 +3627,12 @@ _0808AE1C:
ldr r3, _0808AE3C @ =0x00003bcc
adds r1, r3
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0808AE40 @ =0x00005bcc
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
b _0808AE7A
.align 2, 0
_0808AE38: .4byte gUnknown_20397A4
@@ -3646,21 +3646,21 @@ _0808AE44:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0x1
b _0808AE86
_0808AE7A:
@@ -3733,7 +3733,7 @@ _0808AEDC:
cmp r0, 0x13
ble _0808AEA2
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r4-r7}
pop {r0}
bx r0
@@ -3793,7 +3793,7 @@ _0808AF4C:
cmp r0, 0x13
ble _0808AF12
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r4-r7}
pop {r0}
bx r0
@@ -3830,7 +3830,7 @@ sub_808AF74: @ 808AF74
movs r0, 0x3
movs r1, 0x8F
movs r2, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldr r0, [r4]
ldrb r0, [r0, 0x5]
cmp r0, 0
@@ -3860,7 +3860,7 @@ _0808AFC2:
mov r1, r8
adds r2, r5, 0
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r8
adds r1, 0x1
lsls r1, 16
@@ -3876,7 +3876,7 @@ _0808AFC2:
movs r0, 0x3
adds r2, r4, 0
movs r3, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r8
adds r1, 0x10
lsls r1, 16
@@ -3888,7 +3888,7 @@ _0808AFC2:
movs r0, 0x3
adds r2, r5, 0
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
mov r1, r8
adds r1, 0x11
lsls r1, 16
@@ -3900,7 +3900,7 @@ _0808AFC2:
movs r0, 0x3
adds r2, r4, 0
movs r3, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_0808B044:
adds r0, r7, 0x1
lsls r0, 16
@@ -3922,7 +3922,7 @@ _0808B044:
ble _0808AFC2
_0808B068:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r3-r5}
mov r8, r3
@@ -3960,7 +3960,7 @@ sub_808B090: @ 808B090
movs r1, 0x8D
movs r2, 0x1A
movs r3, 0x9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3968,7 +3968,7 @@ sub_808B090: @ 808B090
movs r1, 0x9D
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_0808B0CE:
ldr r0, [r6]
movs r1, 0x93
@@ -3985,7 +3985,7 @@ _0808B0CE:
movs r1, 0x8D
movs r2, 0x15
movs r3, 0xD
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -3993,7 +3993,7 @@ _0808B0CE:
movs r1, 0x9D
movs r2, 0x15
movs r3, 0xE
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_0808B102:
ldr r0, [r6]
ldr r2, _0808B140 @ =0x0000049c
@@ -4009,7 +4009,7 @@ _0808B102:
movs r1, 0x8D
movs r2, 0x1B
movs r3, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r4, [sp]
str r4, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4017,7 +4017,7 @@ _0808B102:
movs r1, 0x9D
movs r2, 0x1B
movs r3, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
b _0808B170
.align 2, 0
_0808B138: .4byte gUnknown_20397A4
@@ -4035,7 +4035,7 @@ _0808B144:
movs r1, 0x8D
movs r2, 0x1A
movs r3, 0x9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
str r5, [sp]
str r5, [sp, 0x4]
str r4, [sp, 0x8]
@@ -4043,10 +4043,10 @@ _0808B144:
movs r1, 0x9D
movs r2, 0x1A
movs r3, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
_0808B170:
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -4107,12 +4107,12 @@ sub_808B1D4: @ 808B1D4
ldr r4, _0808B1F4 @ =sub_808B21C
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
ldr r0, _0808B1F8 @ =sub_8089034
- bl sub_8000700
+ bl SetHBlankCallback
pop {r4}
pop {r0}
bx r0
@@ -4125,7 +4125,7 @@ _0808B1F8: .4byte sub_8089034
sub_808B1FC: @ 808B1FC
push {lr}
ldr r0, _0808B210 @ =sub_808B21C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -4176,11 +4176,11 @@ sub_808B254: @ 808B254
push {r4,lr}
adds r4, r0, 0
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_80019D0
- bl sub_8087E64
- bl sub_8087EA4
+ bl HideBg
+ bl remove_some_task
+ bl dp12_8087EA4
movs r1, 0
ldr r0, _0808B290 @ =gUnknown_2038700
movs r2, 0
@@ -4398,7 +4398,7 @@ _0808B3F8:
_0808B40C:
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -4406,7 +4406,7 @@ _0808B40C:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _0808B4B2
_0808B428:
ldr r0, [r2]
@@ -4454,7 +4454,7 @@ _0808B47C: .4byte gUnknown_20397A4
_0808B480:
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _0808B4B2
_0808B48A:
ldr r0, _0808B49C @ =gUnknown_20397A4
@@ -4706,16 +4706,16 @@ _0808B668: .4byte gUnknown_2038700
sub_808B66C: @ 808B66C
push {lr}
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
ldr r0, _0808B694 @ =sub_808B21C
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
+ bl DestroyTask
movs r0, 0
pop {r1}
bx r1
@@ -4729,7 +4729,7 @@ sub_808B698: @ 808B698
adds r4, r0, 0
ldr r5, _0808B6C0 @ =gUnknown_20397A4
ldr r0, _0808B6C4 @ =0x00007bd0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r1, 0x8B
lsls r1, 3
@@ -4761,7 +4761,7 @@ _0808B6CE:
adds r0, r1
bl sub_80898E8
ldr r0, _0808B6FC @ =sub_80895B8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4,r5}
pop {r0}
bx r0
@@ -4781,7 +4781,7 @@ sub_808B700: @ 808B700
lsrs r4, 24
ldr r5, _0808B758 @ =gUnknown_20397A4
ldr r0, _0808B75C @ =0x00007bd0
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r2, 0x8B
lsls r2, 3
@@ -4810,7 +4810,7 @@ sub_808B700: @ 808B700
adds r1, r2
strb r0, [r1]
ldr r0, _0808B770 @ =sub_80895B8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4-r6}
pop {r0}
bx r0
@@ -5059,7 +5059,7 @@ sub_808B94C: @ 808B94C
push {lr}
bl sub_808B698
ldr r0, _0808B95C @ =sub_80895B8
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -5078,7 +5078,7 @@ sub_808B960: @ 808B960
adds r1, r4, 0
bl sub_808B700
ldr r0, _0808B98C @ =sub_80895B8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -5100,7 +5100,7 @@ sub_808B990: @ 808B990
adds r1, r4, 0
bl sub_808B700
ldr r0, _0808B9BC @ =sub_80895B8
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
diff --git a/asm/trainer_see.s b/asm/trainer_see.s
index 1d1c4b745..6ac237f95 100644
--- a/asm/trainer_see.s
+++ b/asm/trainer_see.s
@@ -62,7 +62,7 @@ sub_8081B84: @ 8081B84
lsls r0, 24
lsrs r5, r0, 24
adds r0, r5, 0
- bl sub_805FC38
+ bl GetFieldObjectScriptPointerByFieldObjectId
adds r6, r0, 0
bl sub_8080378
cmp r0, 0
@@ -80,7 +80,7 @@ sub_8081B84: @ 8081B84
ldrb r0, [r6, 0x1]
cmp r0, 0x4
bne _08081BC0
- bl sub_8040CC4
+ bl GetMonsStateToDoubles
lsls r0, 24
cmp r0, 0
bne _08081BE4
@@ -119,7 +119,7 @@ sub_8081BEC: @ 8081BEC
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
ldrb r0, [r7, 0x7]
mov r8, r4
cmp r0, 0x1
@@ -146,7 +146,7 @@ sub_8081BEC: @ 8081BEC
lsrs r2, 28
adds r0, r7, 0
adds r1, r6, 0
- bl sub_8081DB8
+ bl CheckPathBetweenTrainerAndPlayer
lsls r0, 24
lsrs r0, 24
b _08081C8C
@@ -179,7 +179,7 @@ _08081C4E:
adds r0, r7, 0
adds r1, r6, 0
adds r2, r4, 0
- bl sub_8081DB8
+ bl CheckPathBetweenTrainerAndPlayer
lsls r0, 24
cmp r0, 0
bne _08081C48
@@ -244,8 +244,8 @@ _08081CE6:
bx r1
thumb_func_end sub_8081C9C
- thumb_func_start sub_8081CEC
-sub_8081CEC: @ 8081CEC
+ thumb_func_start IsTrainerInRangeNorth
+IsTrainerInRangeNorth: @ 8081CEC
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 16
@@ -281,10 +281,10 @@ _08081D28:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8081CEC
+ thumb_func_end IsTrainerInRangeNorth
- thumb_func_start sub_8081D30
-sub_8081D30: @ 8081D30
+ thumb_func_start IsTrainerInRangeWest
+IsTrainerInRangeWest: @ 8081D30
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 16
@@ -320,10 +320,10 @@ _08081D6C:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8081D30
+ thumb_func_end IsTrainerInRangeWest
- thumb_func_start sub_8081D74
-sub_8081D74: @ 8081D74
+ thumb_func_start IsTrainerInRangeEast
+IsTrainerInRangeEast: @ 8081D74
push {r4-r6,lr}
adds r4, r0, 0
lsls r1, 16
@@ -359,10 +359,10 @@ _08081DB0:
pop {r4-r6}
pop {r1}
bx r1
- thumb_func_end sub_8081D74
+ thumb_func_end IsTrainerInRangeEast
- thumb_func_start sub_8081DB8
-sub_8081DB8: @ 8081DB8
+ thumb_func_start CheckPathBetweenTrainerAndPlayer
+CheckPathBetweenTrainerAndPlayer: @ 8081DB8
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -415,7 +415,7 @@ _08081E12:
adds r0, r7, 0
mov r1, sp
mov r2, r8
- bl sub_8063A20
+ bl MoveCoords
cmp r4, r5
ble _08081DEC
_08081E26:
@@ -433,7 +433,7 @@ _08081E26:
ldrsh r2, [r3, r0]
adds r0, r6, 0
adds r3, r7, 0
- bl sub_80636AC
+ bl npc_block_way
lsls r0, 24
lsrs r1, r0, 24
lsls r4, 4
@@ -454,7 +454,7 @@ _08081E5A:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_8081DB8
+ thumb_func_end CheckPathBetweenTrainerAndPlayer
thumb_func_start sub_8081E68
sub_8081E68: @ 8081E68
@@ -464,7 +464,7 @@ sub_8081E68: @ 8081E68
lsrs r4, 24
ldr r0, _08081E94 @ =sub_8081EDC
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
lsls r1, r0, 2
@@ -490,14 +490,14 @@ sub_8081E9C: @ 8081E9C
adds r6, r0, 0
ldr r5, _08081ED4 @ =sub_8081EDC
adds r0, r5, 0
- bl sub_8077688
+ bl FindTaskIdByFunc
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
adds r0, r4, 0
adds r1, r5, 0
adds r2, r6, 0
- bl sub_80775E8
+ bl SetTaskFuncWithFollowupFunc
ldr r1, _08081ED8 @ =gUnknown_3005090
lsls r0, r4, 2
adds r0, r4
@@ -535,7 +535,7 @@ sub_8081EDC: @ 8081EDC
cmp r0, 0
bne _08081F0C
adds r0, r6, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
b _08081F28
.align 2, 0
_08081F08: .4byte gUnknown_3005090
@@ -590,9 +590,9 @@ _08081F54:
adds r3, r1, 0
adds r3, 0x8
adds r0, r4, 0
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0
- bl sub_8083444
+ bl FieldEffectStart
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -620,7 +620,7 @@ sub_8081F90: @ 8081F90
adds r4, r1, 0
adds r5, r2, 0
movs r0, 0
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
beq _08081FA6
@@ -658,12 +658,12 @@ sub_8081FD0: @ 8081FD0
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08081FEE
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08082022
@@ -705,12 +705,12 @@ sub_808202C: @ 808202C
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808204A
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080820AC
@@ -718,16 +718,16 @@ _0808204A:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806365C
+ bl npc_running_behaviour_by_direction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806365C
+ bl npc_running_behaviour_by_direction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -743,12 +743,12 @@ _0808204A:
ldr r1, _080820B8 @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080820A2
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080820AC
@@ -780,18 +780,18 @@ sub_80820BC: @ 80820BC
ldr r1, _080820FC @ =gUnknown_2036E38
adds r4, r0, r1
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080820E8
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _080820EE
_080820E8:
adds r0, r5, 0
- bl sub_807761C
+ bl SwitchTaskToFollowupFunc
_080820EE:
movs r0, 0
pop {r4,r5}
@@ -808,12 +808,12 @@ sub_8082100: @ 8082100
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808211E
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808212C
@@ -836,7 +836,7 @@ sub_8082134: @ 8082134
push {r4,lr}
adds r4, r1, 0
adds r0, r2, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _08082148
@@ -855,12 +855,12 @@ sub_8082150: @ 8082150
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _0808216E
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808217C
@@ -884,7 +884,7 @@ sub_8082184: @ 8082184
adds r5, r1, 0
adds r4, r2, 0
adds r0, r4, 0
- bl sub_8063D68
+ bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
lsls r0, 24
cmp r0, 0
beq _080821CA
@@ -908,7 +908,7 @@ sub_8082184: @ 8082184
movs r0, 0x2
str r0, [r2, 0xC]
movs r0, 0x31
- bl sub_8083444
+ bl FieldEffectStart
strh r0, [r5, 0x10]
ldrh r0, [r5, 0x8]
adds r0, 0x1
@@ -961,7 +961,7 @@ sub_80821DC: @ 80821DC
orrs r1, r2
strb r1, [r0, 0x5]
adds r0, r4, 0
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
@@ -988,7 +988,7 @@ sub_8082250: @ 8082250
push {r4,lr}
adds r4, r1, 0
movs r0, 0x31
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _08082264
@@ -1024,7 +1024,7 @@ sub_808226C: @ 808226C
movs r0, 0x12
movs r1, 0x7
movs r2, 0x7F
- bl sub_805E830
+ bl SpawnSpecialFieldObjectParametrized
ldr r2, _080822C8 @ =gUnknown_2036E38
lsls r1, r0, 3
adds r1, r0
@@ -1035,7 +1035,7 @@ sub_808226C: @ 808226C
orrs r0, r2
strb r0, [r1, 0x1]
ldrb r0, [r1, 0x4]
- bl sub_805FAC4
+ bl CameraObjectSetFollowedObjectId
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -1061,7 +1061,7 @@ sub_80822CC: @ 80822CC
ldrb r2, [r0, 0x4]
movs r0, 0x7F
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -1069,7 +1069,7 @@ sub_80822CC: @ 80822CC
lsls r0, 2
ldr r4, _0808234C @ =gUnknown_2036E38
adds r0, r4
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _08082312
@@ -1079,7 +1079,7 @@ sub_80822CC: @ 80822CC
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808236E
@@ -1118,9 +1118,9 @@ _08082350:
adds r3, r1, 0
adds r3, 0x8
adds r0, r6, 0
- bl sub_805F364
+ bl FieldObjectGetLocalIdAndMap
movs r0, 0
- bl sub_8083444
+ bl FieldEffectStart
movs r0, 0
strh r0, [r5, 0x12]
ldrh r0, [r5, 0x8]
@@ -1147,9 +1147,9 @@ sub_808237C: @ 808237C
ldrb r2, [r0, 0x4]
movs r0, 0x7F
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
movs r0, 0
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _0808242E
@@ -1160,7 +1160,7 @@ sub_808237C: @ 808237C
lsls r0, 2
ldr r4, _08082408 @ =gUnknown_2036E38
adds r0, r4
- bl sub_8063C70
+ bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
lsls r0, 24
cmp r0, 0
beq _080823CC
@@ -1170,7 +1170,7 @@ sub_808237C: @ 808237C
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8063D7C
+ bl FieldObjectClearAnimIfSpecialAnimFinished
lsls r0, 24
cmp r0, 0
beq _0808242E
@@ -1204,16 +1204,16 @@ _080823CC:
_08082404: .4byte gUnknown_3005008
_08082408: .4byte gUnknown_2036E38
_0808240C:
- bl sub_805C768
+ bl GetPlayerAvatarObjectId
lsls r0, 24
lsrs r0, 24
- bl sub_805FAC4
+ bl CameraObjectSetFollowedObjectId
ldr r0, _08082438 @ =gUnknown_3005008
ldr r0, [r0]
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0x7F
- bl sub_805E4C8
+ bl RemoveFieldObjectByLocalIdAndMap
movs r0, 0
strh r0, [r5, 0x12]
movs r0, 0x2
@@ -1243,13 +1243,13 @@ sub_808243C: @ 808243C
adds r0, r4, 0
adds r0, 0xA
mov r1, sp
- bl sub_8044F3C
+ bl LoadWordFromTwoHalfwords
movs r1, 0x16
ldrsh r0, [r4, r1]
cmp r0, 0
bne _0808246E
ldr r0, [sp]
- bl sub_8063D34
+ bl FieldObjectClearAnim
ldrh r0, [r4, 0x16]
adds r0, 0x1
strh r0, [r4, 0x16]
@@ -1269,7 +1269,7 @@ _0808246E:
cmp r0, 0x3
bne _080824D8
movs r0, 0x31
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
cmp r0, 0
bne _080824D8
@@ -1277,24 +1277,24 @@ _0808246E:
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806365C
+ bl npc_running_behaviour_by_direction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
ldr r4, [sp]
ldrb r0, [r4, 0x18]
lsls r0, 28
lsrs r0, 28
- bl sub_806365C
+ bl npc_running_behaviour_by_direction
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
bl sub_805FE7C
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _080824E2
.align 2, 0
_080824D0: .4byte gUnknown_3005090
@@ -1318,7 +1318,7 @@ sub_80824EC: @ 80824EC
adds r4, r0, 0
ldr r0, _08082518 @ =sub_808243C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -1329,7 +1329,7 @@ sub_80824EC: @ 80824EC
adds r0, r1
adds r0, 0x2
adds r1, r4, 0
- bl sub_8044F34
+ bl StoreWordInTwoHalfwords
pop {r4}
pop {r0}
bx r0
@@ -1354,8 +1354,8 @@ sub_8082530: @ 8082530
push {lr}
lsls r0, 24
lsrs r0, 24
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
pop {r0}
bx r0
thumb_func_end sub_8082530
@@ -1367,7 +1367,7 @@ sub_8082544: @ 8082544
movs r1, 0
movs r2, 0
movs r3, 0x53
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1396,7 +1396,7 @@ sub_808257C: @ 808257C
movs r1, 0
movs r2, 0
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1425,7 +1425,7 @@ sub_80825B4: @ 80825B4
movs r1, 0
movs r2, 0
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1454,7 +1454,7 @@ sub_80825EC: @ 80825EC
movs r1, 0
movs r2, 0
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1483,7 +1483,7 @@ sub_8082624: @ 8082624
movs r1, 0
movs r2, 0
movs r3, 0x52
- bl sub_8006FE0
+ bl CreateSpriteAtEnd
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -1536,7 +1536,7 @@ sub_808265C: @ 808265C
strh r3, [r0, 0x34]
strh r1, [r0, 0x3C]
adds r1, r2, 0
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4}
pop {r0}
bx r0
@@ -1560,7 +1560,7 @@ sub_80826A8: @ 80826A8
lsls r2, 24
lsrs r2, 24
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
lsls r0, 24
cmp r0, 0
bne _080826DA
@@ -1576,7 +1576,7 @@ _080826DA:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_80836D8
+ bl FieldEffectStop
b _08082736
_080826E8:
ldr r2, _0808272C @ =gUnknown_2036E38
diff --git a/asm/trainer_tower.s b/asm/trainer_tower.s
index 35144810c..58e7f9a77 100644
--- a/asm/trainer_tower.s
+++ b/asm/trainer_tower.s
@@ -51,14 +51,14 @@ sub_815D80C: @ 815D80C
adds r4, r0, 0
movs r0, 0x80
lsls r0, 5
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
adds r0, r4, 0
adds r1, r5, 0
bl sub_815D7BC
adds r4, r0, 0
adds r0, r5, 0
- bl sub_8002BC4
+ bl Free
adds r0, r4, 0
pop {r4,r5}
pop {r1}
@@ -235,7 +235,7 @@ sub_815D96C: @ 815D96C
push {r4-r6,lr}
movs r6, 0
_0815D970:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -338,7 +338,7 @@ sub_815DA28: @ 815DA28
ldr r1, _0815DA38 @ =gUnknown_203F45C
ldr r1, [r1]
movs r2, 0xB
- bl sub_8008DBC
+ bl StringCopyN
pop {r0}
bx r0
.align 2, 0
@@ -371,7 +371,7 @@ sub_815DA54: @ 815DA54
bl sub_815DC8C
ldr r5, _0815DBC4 @ =gUnknown_203F45C
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
ldr r0, _0815DBC8 @ =0x00004001
bl sub_806E568
@@ -396,7 +396,7 @@ sub_815DA54: @ 815DA54
adds r2, r4, 0x4
adds r1, r2
movs r2, 0xB
- bl sub_8008DBC
+ bl StringCopyN
movs r0, 0
mov r9, r0
str r6, [sp]
@@ -555,7 +555,7 @@ sub_815DBDC: @ 815DBDC
push {r4,lr}
ldr r4, _0815DBF0 @ =gUnknown_203F45C
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
pop {r4}
@@ -651,7 +651,7 @@ sub_815DC8C: @ 815DC8C
ldr r5, [r0]
ldr r4, _0815DCC4 @ =gUnknown_203F458
ldr r0, _0815DCC8 @ =0x00001f0c
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
ldr r1, _0815DCCC @ =gUnknown_2036DFC
ldrb r1, [r1, 0x12]
@@ -700,7 +700,7 @@ _0815DCE6:
adds r0, 0xC
movs r1, 0xF8
lsls r1, 5
- bl sub_8045254
+ bl CalcByteArraySum
ldr r1, [r6]
str r0, [r1, 0x8]
bl sub_815EC0C
@@ -719,7 +719,7 @@ sub_815DD2C: @ 815DD2C
push {r4,lr}
ldr r4, _0815DD40 @ =gUnknown_203F458
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
pop {r4}
@@ -1249,12 +1249,12 @@ _0815E110: .4byte gUnknown_20370DA
thumb_func_start sub_815E114
sub_815E114: @ 815E114
push {lr}
- ldr r0, _0815E120 @ =sub_80568E0
- bl sub_8000544
+ ldr r0, _0815E120 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
-_0815E120: .4byte sub_80568E0
+_0815E120: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_815E114
thumb_func_start sub_815E124
@@ -1272,9 +1272,9 @@ sub_815E124: @ 815E124
str r1, [r0, 0x8]
bl sub_80563F0
ldr r0, _0815E15C @ =sub_800FD9C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0815E14C:
pop {r4}
pop {r0}
@@ -1310,7 +1310,7 @@ _0815E180:
bl sub_815E9FC
ldr r0, _0815E1BC @ =sub_815E124
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
movs r0, 0
bl sub_8044090
bl sub_8080060
@@ -2134,7 +2134,7 @@ _0815E76C:
cmp r0, 0x3
ble _0815E76C
adds r0, r7, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r7, 0
movs r1, 0x3
bl sub_8003F20
@@ -2188,7 +2188,7 @@ _0815E8B0: .4byte 0x00004001
sub_815E8B4: @ 815E8B4
push {r4,lr}
ldr r4, _0815E8C8 @ =gUnknown_20370D0
- bl sub_8040CC4
+ bl GetMonsStateToDoubles
lsls r0, 24
lsrs r0, 24
strh r0, [r4]
@@ -2322,7 +2322,7 @@ _0815E9B2:
lsls r1, r2, 1
adds r1, r0
ldrh r0, [r1]
- bl sub_8071A74
+ bl PlayNewMapMusic
pop {r4}
pop {r0}
bx r0
@@ -2383,7 +2383,7 @@ sub_815E9FC: @ 815E9FC
lsls r0, 6
adds r1, r0
ldrb r5, [r1]
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r1, _0815EAC8 @ =gUnknown_203F458
mov r10, r1
ldr r6, [r1]
@@ -2585,13 +2585,13 @@ _0815EBBE:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _0815EBF8
adds r0, r4, 0
movs r1, 0x41
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
movs r1, 0xCE
lsls r1, 1
cmp r0, r1
@@ -2599,7 +2599,7 @@ _0815EBBE:
adds r0, r4, 0
movs r1, 0x38
movs r2, 0
- bl sub_803FBE8
+ bl GetMonData
cmp r0, r6
ble _0815EBF8
adds r6, r0, 0
@@ -2696,7 +2696,7 @@ sub_815EC8C: @ 815EC8C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8004378
+ bl FillWindowPixelRect
bl sub_815EC0C
ldr r4, _0815EDB4 @ =gUnknown_847A22C
str r4, [sp]
@@ -2796,7 +2796,7 @@ _0815ECDC:
cmp r7, 0x3
ble _0815ECDC
mov r0, r8
- bl sub_8003FA0
+ bl PutWindowTilemap
mov r0, r8
movs r1, 0x3
bl sub_8003F20
diff --git a/asm/trig.s b/asm/trig.s
index 386cbe4ca..ca1993b60 100644
--- a/asm/trig.s
+++ b/asm/trig.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8044E30
-sub_8044E30: @ 8044E30
+ thumb_func_start Sin
+Sin: @ 8044E30
lsls r1, 16
asrs r1, 16
ldr r2, _08044E48 @ =gUnknown_825E074
@@ -21,10 +21,10 @@ sub_8044E30: @ 8044E30
bx lr
.align 2, 0
_08044E48: .4byte gUnknown_825E074
- thumb_func_end sub_8044E30
+ thumb_func_end Sin
- thumb_func_start sub_8044E4C
-sub_8044E4C: @ 8044E4C
+ thumb_func_start Cos
+Cos: @ 8044E4C
lsls r1, 16
asrs r1, 16
ldr r2, _08044E68 @ =gUnknown_825E074
@@ -40,10 +40,10 @@ sub_8044E4C: @ 8044E4C
bx lr
.align 2, 0
_08044E68: .4byte gUnknown_825E074
- thumb_func_end sub_8044E4C
+ thumb_func_end Cos
- thumb_func_start sub_8044E6C
-sub_8044E6C: @ 8044E6C
+ thumb_func_start Sin2
+Sin2: @ 8044E6C
push {r4,r5,lr}
adds r5, r0, 0
lsls r5, 16
@@ -77,21 +77,21 @@ _08044EA8:
pop {r4,r5}
pop {r1}
bx r1
- thumb_func_end sub_8044E6C
+ thumb_func_end Sin2
- thumb_func_start sub_8044EB0
-sub_8044EB0: @ 8044EB0
+ thumb_func_start Cos2
+Cos2: @ 8044EB0
push {lr}
lsls r0, 16
movs r1, 0xB4
lsls r1, 15
adds r0, r1
lsrs r0, 16
- bl sub_8044E6C
+ bl Sin2
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
- thumb_func_end sub_8044EB0
+ thumb_func_end Cos2
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s
index 5763d3e6d..45ac14af7 100644
--- a/asm/union_room_chat.s
+++ b/asm/union_room_chat.s
@@ -11,7 +11,7 @@ sub_8128420: @ 8128420
ldr r4, _08128450 @ =gUnknown_203B0E0
movs r0, 0xDC
lsls r0, 1
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
bl sub_812845C
ldr r1, _08128454 @ =gUnknown_30030E0
@@ -19,9 +19,9 @@ sub_8128420: @ 8128420
strh r0, [r1]
bl sub_812B4AC
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08128458 @ =sub_81284E0
- bl sub_8000544
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
@@ -49,7 +49,7 @@ sub_812845C: @ 812845C
strb r0, [r4, 0x1A]
bl sub_800A088
strb r0, [r4, 0xD]
- bl sub_800A404
+ bl GetMultiplayerId
strb r0, [r4, 0x13]
strb r5, [r4, 0x17]
strb r5, [r4, 0x18]
@@ -65,7 +65,7 @@ _0812849A:
ldr r1, [r7]
adds r1, r6
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
adds r6, 0x15
adds r4, 0x15
subs r5, 0x1
@@ -85,12 +85,12 @@ sub_81284BC: @ 81284BC
ldr r4, _081284DC @ =gUnknown_203B0E0
ldr r0, [r4]
ldrb r0, [r0, 0xE]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
ldrb r0, [r0, 0xF]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
pop {r4}
pop {r0}
bx r0
@@ -121,9 +121,9 @@ _08128500:
beq _08128554
b _08128598
_08128506:
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
bl sub_8129B14
b _08128548
_08128518:
@@ -137,15 +137,15 @@ _08128518:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
str r5, [sp]
adds r0, r4, 0
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08128550 @ =sub_81285B4
- bl sub_80006F4
+ bl SetVBlankCallback
_08128548:
ldrb r0, [r6]
adds r0, 0x1
@@ -154,7 +154,7 @@ _08128548:
.align 2, 0
_08128550: .4byte sub_81285B4
_08128554:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _081285A0 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -162,19 +162,19 @@ _08128554:
cmp r0, 0
bne _08128598
ldr r0, _081285A4 @ =sub_81285CC
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0x11
movs r1, 0
bl sub_8113550
ldr r0, _081285A8 @ =sub_81285E8
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r4, _081285AC @ =gUnknown_203B0E0
ldr r1, [r4]
strb r0, [r1, 0xE]
ldr r0, _081285B0 @ =sub_81298F8
movs r1, 0x7
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0xF]
bl sub_80FCEA8
@@ -197,9 +197,9 @@ _081285B0: .4byte sub_81298F8
thumb_func_start sub_81285B4
sub_81285B4: @ 81285B4
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
bl sub_8087F54
pop {r0}
bx r0
@@ -208,11 +208,11 @@ sub_81285B4: @ 81285B4
thumb_func_start sub_81285CC
sub_81285CC: @ 81285CC
push {lr}
- bl sub_8077578
+ bl RunTasks
bl sub_8129BFC
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_81285CC
@@ -309,7 +309,7 @@ _08128674:
adds r1, r0
movs r0, 0
movs r2, 0x28
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _081286BC
@@ -499,7 +499,7 @@ _081287FE:
.align 2, 0
_0812880C: .4byte gUnknown_203B0E0
_08128810:
- bl sub_810F998
+ bl ProcessMenuInput
lsls r0, 24
asrs r0, 8
lsrs r6, r0, 16
@@ -534,7 +534,7 @@ _08128848:
movs r0, 0x5
bl sub_80722CC
movs r0, 0x1
- bl sub_810F904
+ bl MoveMenuCursor
b _081288CE
.align 2, 0
_08128864: .4byte gUnknown_30030F0
@@ -779,7 +779,7 @@ _08128A44:
adds r1, r2
movs r0, 0
movs r2, 0x28
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _08128A94
@@ -842,7 +842,7 @@ _08128AC4:
.4byte _08128BE8
_08128AE4:
ldr r0, _08128B00 @ =sub_81298F8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08128AF2
@@ -902,7 +902,7 @@ _08128B4C:
adds r1, r0
movs r0, 0
movs r2, 0x28
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _08128BFC
@@ -911,7 +911,7 @@ _08128B4C:
.align 2, 0
_08128B7C: .4byte gUnknown_203B0E0
_08128B80:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -1000,7 +1000,7 @@ _08128C20:
b _08128CA2
_08128C2A:
ldr r0, _08128C40 @ =sub_81298F8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08128CA2
@@ -1090,7 +1090,7 @@ _08128CC8:
.4byte _08128D88
_08128CDC:
ldr r0, _08128D00 @ =sub_81298F8
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08128D9C
@@ -1246,7 +1246,7 @@ _08128E00:
adds r1, r0
movs r0, 0
movs r2, 0x28
- bl sub_800A448
+ bl SendBlock
lsls r0, 24
cmp r0, 0
beq _08128E70
@@ -1638,7 +1638,7 @@ _08129144:
bne _08129206
bl sub_804C1C0
movs r0, 0
- bl sub_80DA364
+ bl TrySavingData
ldr r0, _08129164 @ =gUnknown_203B0E0
ldr r1, [r0]
movs r0, 0x8
@@ -1665,7 +1665,7 @@ _08129180:
bne _08129206
movs r0, 0x30
bl sub_80722CC
- bl sub_804C1DC
+ bl sav2_gender2_inplace_and_xFE
ldr r0, _081291A0 @ =gUnknown_203B0E0
ldr r1, [r0]
movs r0, 0xA
@@ -1702,7 +1702,7 @@ _081291C8:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _081291E4 @ =gUnknown_203B0E0
ldr r1, [r0]
movs r0, 0xD
@@ -1720,8 +1720,8 @@ _081291E8:
bl sub_812B4B8
bl sub_8129B88
bl sub_81284BC
- ldr r0, _08129214 @ =sub_80567DC
- bl sub_8000544
+ ldr r0, _08129214 @ =c2_exit_to_overworld_2_switch
+ bl SetMainCallback2
_08129206:
add sp, 0x4
pop {r4}
@@ -1729,7 +1729,7 @@ _08129206:
bx r0
.align 2, 0
_08129210: .4byte gUnknown_2037AB8
-_08129214: .4byte sub_80567DC
+_08129214: .4byte c2_exit_to_overworld_2_switch
thumb_func_end sub_8128FB8
thumb_func_start sub_8129218
@@ -1892,14 +1892,14 @@ _08129320:
adds r1, 0xB9
adds r1, r5, r1
mov r0, sp
- bl sub_8008D84
+ bl StringCopy
movs r1, 0
strb r1, [r0]
movs r1, 0xFF
strb r1, [r0, 0x1]
mov r4, sp
mov r0, sp
- bl sub_80092D4
+ bl StringLength_Multibyte
adds r5, r0, 0
_08129346:
ldr r6, _081293A8 @ =gUnknown_203B0E0
@@ -2043,7 +2043,7 @@ sub_8129424: @ 8129424
adds r2, r3
adds r2, 0xB9
adds r0, r2
- bl sub_8008D84
+ bl StringCopy
ldr r1, [r4]
movs r0, 0x1
strb r0, [r1, 0x18]
@@ -2088,7 +2088,7 @@ _08129482:
adds r0, r5
ldr r1, [r7]
adds r1, r6
- bl sub_8008D84
+ bl StringCopy
adds r6, 0x15
adds r5, 0x15
subs r4, 0x1
@@ -2179,7 +2179,7 @@ sub_812951C: @ 812951C
ldr r4, _0812955C @ =gUnknown_203B0E0
ldr r0, [r4]
adds r0, 0x1A
- bl sub_80092D4
+ bl StringLength_Multibyte
adds r2, r0, 0
ldr r0, [r4]
adds r1, r0, 0
@@ -2228,7 +2228,7 @@ sub_8129568: @ 8129568
adds r0, r4, 0x1
ldr r1, _08129588 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0812958C @ =gUnknown_203B0E0
ldr r0, [r0]
ldrb r0, [r0, 0x13]
@@ -2250,13 +2250,13 @@ sub_8129590: @ 8129590
adds r0, r4, 0x1
ldr r1, _081295B8 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
adds r4, 0x9
ldr r0, _081295BC @ =gUnknown_203B0E0
ldr r1, [r0]
adds r1, 0x1A
adds r0, r4, 0
- bl sub_8008D84
+ bl StringCopy
pop {r4}
pop {r0}
bx r0
@@ -2274,7 +2274,7 @@ sub_81295C0: @ 81295C0
adds r0, r4, 0x1
ldr r1, _081295E4 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _081295E8 @ =gUnknown_203B0E0
ldr r0, [r0]
ldrb r0, [r0, 0x13]
@@ -2297,7 +2297,7 @@ sub_81295EC: @ 81295EC
adds r0, r4, 0x1
ldr r1, _0812960C @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08129610 @ =gUnknown_203B0E0
ldr r0, [r0]
ldrb r0, [r0, 0x13]
@@ -2319,7 +2319,7 @@ sub_8129614: @ 8129614
adds r0, r4, 0x1
ldr r1, _08129634 @ =gUnknown_300500C
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
ldr r0, _08129638 @ =gUnknown_203B0E0
ldr r0, [r0]
ldrb r0, [r0, 0x13]
@@ -2374,7 +2374,7 @@ _08129684: .4byte gUnknown_841B3AA
_08129688:
adds r0, r6, 0
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
movs r1, 0xFC
strb r1, [r0]
adds r0, 0x1
@@ -2388,7 +2388,7 @@ _08129688:
strb r1, [r0]
adds r0, 0x1
adds r1, r5, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
b _081296EE
_081296B2:
@@ -2396,7 +2396,7 @@ _081296B2:
ldr r0, [r0]
adds r0, 0x79
adds r1, r4, 0
- bl sub_8008D84
+ bl StringCopy
_081296BE:
ldr r0, _081296E4 @ =gUnknown_203B0E0
ldr r0, [r0]
@@ -2462,7 +2462,7 @@ _0812971C: .4byte gUnknown_203B0E0
sub_8129720: @ 8129720
push {lr}
bl sub_8129714
- bl sub_80092D4
+ bl StringLength_Multibyte
pop {r1}
bx r1
thumb_func_end sub_8129720
@@ -2624,60 +2624,60 @@ sub_8129814: @ 8129814
_0812981C: .4byte gUnknown_203B0E0
thumb_func_end sub_8129814
- thumb_func_start sub_8129820
-sub_8129820: @ 8129820
+ thumb_func_start copy_strings_to_sav1
+copy_strings_to_sav1: @ 8129820
push {r4,lr}
ldr r4, _081298A4 @ =gUnknown_3005008
ldr r0, [r4]
ldr r1, _081298A8 @ =0x00003ad4
adds r0, r1
ldr r1, _081298AC @ =gUnknown_841B510
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298B0 @ =0x00003ae9
adds r0, r1
ldr r1, _081298B4 @ =gUnknown_841B516
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298B8 @ =0x00003afe
adds r0, r1
ldr r1, _081298BC @ =gUnknown_841B51E
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298C0 @ =0x00003b13
adds r0, r1
ldr r1, _081298C4 @ =gUnknown_841B524
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298C8 @ =0x00003b28
adds r0, r1
ldr r1, _081298CC @ =gUnknown_841B52B
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298D0 @ =0x00003b3d
adds r0, r1
ldr r1, _081298D4 @ =gUnknown_841B531
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298D8 @ =0x00003b52
adds r0, r1
ldr r1, _081298DC @ =gUnknown_841B535
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298E0 @ =0x00003b67
adds r0, r1
ldr r1, _081298E4 @ =gUnknown_841B53B
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298E8 @ =0x00003b7c
adds r0, r1
ldr r1, _081298EC @ =gUnknown_841B541
- bl sub_8008D84
+ bl StringCopy
ldr r0, [r4]
ldr r1, _081298F0 @ =0x00003b91
adds r0, r1
ldr r1, _081298F4 @ =gUnknown_841B54B
- bl sub_8008D84
+ bl StringCopy
pop {r4}
pop {r0}
bx r0
@@ -2703,7 +2703,7 @@ _081298E8: .4byte 0x00003b7c
_081298EC: .4byte gUnknown_841B541
_081298F0: .4byte 0x00003b91
_081298F4: .4byte gUnknown_841B54B
- thumb_func_end sub_8129820
+ thumb_func_end copy_strings_to_sav1
thumb_func_start sub_81298F8
sub_81298F8: @ 81298F8
@@ -2770,7 +2770,7 @@ _08129952:
_08129978: .4byte gUnknown_3003F64
_0812997C: .4byte gUnknown_203B0E0
_08129980:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x6]
@@ -2827,7 +2827,7 @@ _081299E6:
strh r1, [r4, 0x4]
lsls r0, r1, 24
lsrs r0, 24
- bl sub_800A588
+ bl ResetBlockReceivedFlag
movs r1, 0x2
ldrsh r0, [r4, r1]
lsls r0, 8
@@ -2952,7 +2952,7 @@ _08129ADE:
strb r0, [r1, 0x17]
_08129AE0:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
b _08129B08
.align 2, 0
_08129AE8: .4byte gUnknown_203B0E0
@@ -2984,7 +2984,7 @@ sub_8129B14: @ 8129B14
push {r4,lr}
ldr r4, _08129B60 @ =gUnknown_203B0E4
ldr r0, _08129B64 @ =0x00002168
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _08129B70
@@ -2999,7 +2999,7 @@ sub_8129B14: @ 8129B14
bl sub_8001658
ldr r0, _08129B6C @ =gUnknown_845AA94
bl sub_8003B24
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
bl sub_812AD50
ldr r0, [r4]
bl sub_8129BB8
@@ -3041,7 +3041,7 @@ sub_8129B88: @ 8129B88
ldr r0, [r4]
cmp r0, 0
beq _08129B9E
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08129B9E:
@@ -3199,7 +3199,7 @@ _08129C9C: .4byte gUnknown_203B0E4
sub_8129CA0: @ 8129CA0
push {r4,lr}
adds r4, r0, 0
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -3246,7 +3246,7 @@ _08129D02:
bl sub_812AD04
b _08129D30
_08129D14:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08129D30
@@ -3286,7 +3286,7 @@ _08129D50:
bl sub_8003F20
b _08129D68
_08129D5E:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _08129D70
@@ -3318,7 +3318,7 @@ _08129D88:
bl sub_8003F20
b _08129DA0
_08129D96:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _08129DA8
@@ -3361,7 +3361,7 @@ _08129DCA:
bl sub_8003F20
b _08129E0C
_08129DE6:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
beq _08129E0C
@@ -3424,7 +3424,7 @@ _08129E38:
.align 2, 0
_08129E58: .4byte gUnknown_203B0E4
_08129E5C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _08129E6E
@@ -3453,10 +3453,10 @@ _08129E84:
bl sub_812A6F4
bl sub_812A51C
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08129EAA
_08129E94:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08129EB0
@@ -3512,7 +3512,7 @@ _08129ECA:
bl sub_8003F20
b _08129F14
_08129F02:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08129F1A
@@ -3558,7 +3558,7 @@ _08129F44:
lsrs r4, 16
bl sub_8129758
adds r5, r0, 0
- bl sub_80092D4
+ bl StringLength_Multibyte
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -3577,7 +3577,7 @@ _08129F44:
bl sub_8003F20
b _08129FBA
_08129F80:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08129FC0
@@ -3593,7 +3593,7 @@ _08129F80:
.align 2, 0
_08129FA0: .4byte gUnknown_203B0E4
_08129FA4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08129FC0
@@ -3642,7 +3642,7 @@ _08129FEC:
lsrs r4, 16
bl sub_8129758
adds r5, r0, 0
- bl sub_80092D4
+ bl StringLength_Multibyte
adds r1, r0, 0
lsls r1, 16
lsrs r1, 16
@@ -3661,7 +3661,7 @@ _08129FEC:
bl sub_8003F20
b _0812A062
_0812A028:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0812A068
@@ -3675,7 +3675,7 @@ _0812A028:
.align 2, 0
_0812A044: .4byte gUnknown_203B0E4
_0812A048:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0812A068
@@ -3719,7 +3719,7 @@ _0812A084:
strb r0, [r4]
b _0812A0A6
_0812A098:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0812A0A6
@@ -3774,7 +3774,7 @@ _0812A0DC:
.align 2, 0
_0812A104: .4byte gUnknown_203B0E4
_0812A108:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0
@@ -3803,7 +3803,7 @@ _0812A138:
movs r1, 0
movs r2, 0x5
movs r3, 0x11
- bl sub_80044A8
+ bl ScrollWindow
movs r0, 0
movs r1, 0x2
bl sub_8003F20
@@ -3816,7 +3816,7 @@ _0812A138:
adds r0, 0x1
strb r0, [r6]
_0812A15C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0812A182
@@ -3896,7 +3896,7 @@ _0812A1C8:
.align 2, 0
_0812A1E4: .4byte gUnknown_203B0E4
_0812A1E8:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A1F4
@@ -3934,7 +3934,7 @@ _0812A20C:
.align 2, 0
_0812A228: .4byte gUnknown_203B0E4
_0812A22C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A238
@@ -3977,7 +3977,7 @@ _0812A250:
.align 2, 0
_0812A27C: .4byte gUnknown_203B0E4
_0812A280:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A28C
@@ -4019,7 +4019,7 @@ _0812A2A4:
.align 2, 0
_0812A2CC: .4byte gUnknown_203B0E4
_0812A2D0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A2DC
@@ -4061,7 +4061,7 @@ _0812A2F4:
.align 2, 0
_0812A31C: .4byte gUnknown_203B0E4
_0812A320:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A32C
@@ -4099,7 +4099,7 @@ _0812A344:
.align 2, 0
_0812A360: .4byte gUnknown_203B0E4
_0812A364:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A370
@@ -4143,7 +4143,7 @@ _0812A388:
_0812A3B4: .4byte gUnknown_300500C
_0812A3B8: .4byte gUnknown_203B0E4
_0812A3BC:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A3C8
@@ -4185,7 +4185,7 @@ _0812A3E0:
.align 2, 0
_0812A408: .4byte gUnknown_203B0E4
_0812A40C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
lsrs r0, 24
b _0812A418
@@ -4259,10 +4259,10 @@ sub_812A424: @ 812A424
lsls r0, r1, 24
lsrs r0, 24
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r6]
ldrb r0, [r0, 0x18]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r6]
ldrb r0, [r0, 0x18]
ldr r2, _0812A514 @ =gUnknown_8417938
@@ -4332,7 +4332,7 @@ sub_812A51C: @ 812A51C
bl sub_810F4D8
ldr r0, [r4]
ldrb r0, [r0, 0x18]
- bl sub_80040B8
+ bl ClearWindowTilemap
_0812A53A:
pop {r4}
pop {r0}
@@ -4366,7 +4366,7 @@ _0812A564: .4byte gUnknown_203B0E4
thumb_func_start sub_812A568
sub_812A568: @ 812A568
push {lr}
- bl sub_810F998
+ bl ProcessMenuInput
lsls r0, 24
asrs r0, 24
pop {r1}
@@ -4475,15 +4475,15 @@ _0812A642:
lsls r1, r0, 8
movs r0, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
mov r1, r8
lsls r0, r1, 24
lsrs r5, r0, 24
adds r0, r5, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r5, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r1, _0812A6AC @ =gUnknown_845AB64
lsls r0, r7, 1
adds r0, r7
@@ -4571,12 +4571,12 @@ sub_812A6F4: @ 812A6F4
bl sub_810F4D8
ldr r0, [r4]
ldrb r0, [r0, 0x1E]
- bl sub_80040B8
+ bl ClearWindowTilemap
_0812A712:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r4}
pop {r0}
bx r0
@@ -4624,7 +4624,7 @@ sub_812A74C: @ 812A74C
adds r1, r2, 0
adds r2, r3, 0
movs r3, 0x1
- bl sub_8004378
+ bl FillWindowPixelRect
add sp, 0x8
pop {r0}
bx r0
@@ -4676,7 +4676,7 @@ _0812A7B4:
mov r0, sp
adds r0, 0x13
mov r1, r10
- bl sub_8008D84
+ bl StringCopy
mov r0, r9
lsls r2, r0, 27
lsrs r2, 24
@@ -4710,7 +4710,7 @@ sub_812A804: @ 812A804
sub sp, 0x4C
movs r0, 0x2
movs r1, 0xFF
- bl sub_800445C
+ bl FillWindowPixelBuffer
bl sub_81296F4
lsls r0, 24
lsrs r2, r0, 24
@@ -4754,7 +4754,7 @@ _0812A85E:
_0812A866:
mov r0, sp
adds r0, 0x13
- bl sub_8008D84
+ bl StringCopy
lsls r3, r6, 24
lsrs r3, 24
add r1, sp, 0xC
@@ -4815,7 +4815,7 @@ _0812A8A8:
b _0812A960
_0812A8E6:
adds r0, r5, 0
- bl sub_80092D4
+ bl StringLength_Multibyte
adds r4, r0, 0
mov r1, sp
adds r1, 0x10
@@ -4837,7 +4837,7 @@ _0812A90C:
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl sub_8009294
+ bl StringCopyN_Multibyte
movs r0, 0
adds r1, r6, 0
movs r2, 0
@@ -4976,7 +4976,7 @@ sub_812AA10: @ 812AA10
sub sp, 0xC
movs r0, 0x3
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD
@@ -5002,7 +5002,7 @@ sub_812AA10: @ 812AA10
movs r3, 0
bl sub_810F7D8
movs r0, 0x3
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0xC
pop {r0}
bx r0
@@ -5017,7 +5017,7 @@ sub_812AA64: @ 812AA64
movs r1, 0
bl sub_810F4D8
movs r0, 0x3
- bl sub_80040B8
+ bl ClearWindowTilemap
pop {r0}
bx r0
thumb_func_end sub_812AA64
@@ -5050,7 +5050,7 @@ sub_812AA78: @ 812AA78
movs r0, 0
movs r1, 0x11
movs r2, 0
- bl sub_8004378
+ bl FillWindowPixelRect
lsls r4, 24
lsrs r4, 24
add r0, sp, 0xC
@@ -5076,70 +5076,70 @@ sub_812AAD4: @ 812AAD4
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r1, 0xE0
lsls r1, 8
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
movs r1, 0x80
lsls r1, 6
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
ldr r1, _0812AB88 @ =0x000040f0
movs r0, 0x40
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x44
movs r1, 0x90
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x48
movs r1, 0x3D
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x4A
movs r1, 0x3F
- bl sub_8000A38
+ bl SetGpuReg
pop {r0}
bx r0
.align 2, 0
@@ -5155,22 +5155,22 @@ sub_812AB8C: @ 812AB8C
lsls r0, 1
adds r1, r0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0812ABCC @ =0x00000928
adds r1, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0812ABD0 @ =0x00001128
adds r1, r0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
ldr r0, _0812ABD4 @ =0x00001928
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
pop {r4}
pop {r0}
bx r0
@@ -5190,7 +5190,7 @@ sub_812ABD8: @ 812ABD8
movs r0, 0
movs r2, 0x20
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -5198,9 +5198,9 @@ sub_812ABD8: @ 812ABD8
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r0}
bx r0
@@ -5213,25 +5213,25 @@ sub_812AC08: @ 812AC08
ldr r0, _0812AC48 @ =gUnknown_8EAA9F0
movs r1, 0x70
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r0, _0812AC4C @ =gUnknown_845AA24
movs r1, 0xC0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0812AC50 @ =gUnknown_8EAAA10
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _0812AC54 @ =gUnknown_8EAAA6C
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x4
pop {r0}
bx r0
@@ -5249,21 +5249,21 @@ sub_812AC58: @ 812AC58
ldr r0, _0812AC90 @ =gUnknown_8EA1700
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0812AC94 @ =gUnknown_8EA1720
movs r0, 0
str r0, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _0812AC98 @ =gUnknown_8EA1958
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x4
pop {r0}
bx r0
@@ -5279,12 +5279,12 @@ sub_812AC9C: @ 812AC9C
ldr r0, _0812ACB8 @ =gUnknown_845AA44
movs r1, 0x80
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0812ACBC @ =0x06004020
movs r0, 0
movs r2, 0x20
movs r3, 0x1
- bl sub_8000F44
+ bl RequestDma3Fill
pop {r0}
bx r0
.align 2, 0
@@ -5298,12 +5298,12 @@ sub_812ACC0: @ 812ACC0
ldr r0, _0812ACE8 @ =gUnknown_845AA64
movs r1, 0xF0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0
movs r1, 0x3
bl sub_8003F20
@@ -5317,7 +5317,7 @@ _0812ACE8: .4byte gUnknown_845AA64
sub_812ACEC: @ 812ACEC
push {lr}
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
bl sub_812A804
movs r0, 0x2
movs r1, 0x3
@@ -5331,9 +5331,9 @@ sub_812AD04: @ 812AD04
push {lr}
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x3
bl sub_8003F20
@@ -5346,7 +5346,7 @@ sub_812AD20: @ 812AD20
push {lr}
movs r0, 0x3
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x3
movs r1, 0x1
movs r2, 0xD0
@@ -5358,7 +5358,7 @@ sub_812AD20: @ 812AD20
ldr r0, _0812AD4C @ =gUnknown_841F408
movs r1, 0xE0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -5510,16 +5510,16 @@ sub_812AE70: @ 812AE70
ldr r4, _0812AE9C @ =gUnknown_845AF58
_0812AE76:
adds r0, r4, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r4, 0x8
adds r5, 0x1
cmp r5, 0x4
bls _0812AE76
ldr r0, _0812AEA0 @ =gUnknown_845AF80
- bl sub_8008928
+ bl LoadSpritePalette
ldr r4, _0812AEA4 @ =gUnknown_203B0E8
movs r0, 0x18
- bl sub_8002B9C
+ bl Alloc
str r0, [r4]
cmp r0, 0
beq _0812AEA8
@@ -5544,7 +5544,7 @@ sub_812AEB0: @ 812AEB0
ldr r0, [r0]
cmp r0, 0
beq _0812AEBE
- bl sub_8002BC4
+ bl Free
_0812AEBE:
pop {r0}
bx r0
@@ -5559,7 +5559,7 @@ sub_812AEC8: @ 812AEC8
movs r1, 0xA
movs r2, 0x18
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r1, _0812AEF4 @ =gUnknown_203B0E8
@@ -5617,7 +5617,7 @@ sub_812AF1C: @ 812AF1C
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r1, [r4]
ldr r2, [r1]
mov r0, sp
@@ -5634,7 +5634,7 @@ _0812AF5C:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
ldr r2, [r4]
ldr r1, [r2]
movs r0, 0x18
@@ -5663,7 +5663,7 @@ sub_812AF8C: @ 812AF8C
ldr r0, _0812AFB8 @ =gUnknown_845AC16
adds r4, r0
movs r0, 0
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
adds r1, r0, 0
lsls r1, 24
lsrs r1, 4
@@ -5672,7 +5672,7 @@ sub_812AF8C: @ 812AF8C
lsrs r1, 16
adds r0, r4, 0
movs r2, 0x4
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -5693,7 +5693,7 @@ sub_812AFC0: @ 812AFC0
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _0812AFEC
.align 2, 0
_0812AFDC: .4byte gUnknown_203B0E8
@@ -5702,7 +5702,7 @@ _0812AFE0:
ldr r0, [r0]
ldr r0, [r0]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
_0812AFEC:
ldr r0, _0812AFF8 @ =gUnknown_203B0E8
ldr r1, [r0]
@@ -5742,13 +5742,13 @@ _0812B010:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _0812B008
_0812B034:
ldr r0, [r4]
ldr r0, [r0]
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
b _0812B008
_0812B040:
movs r0, 0x1
@@ -5765,7 +5765,7 @@ sub_812B048: @ 812B048
movs r1, 0x4C
movs r2, 0x98
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, _0812B090 @ =gUnknown_203B0E8
@@ -5780,7 +5780,7 @@ sub_812B048: @ 812B048
movs r1, 0x40
movs r2, 0x98
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -5864,7 +5864,7 @@ sub_812B100: @ 812B100
movs r1, 0x8
movs r2, 0x98
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, _0812B154 @ =gUnknown_203B0E8
@@ -5879,7 +5879,7 @@ sub_812B100: @ 812B100
movs r1, 0x20
movs r2, 0x98
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r2, [r5]
@@ -5926,7 +5926,7 @@ sub_812B160: @ 812B160
ldr r0, [r3]
ldr r0, [r0, 0x10]
movs r1, 0x3
- bl sub_800838C
+ bl StartSpriteAnim
b _0812B1D6
.align 2, 0
_0812B194: .4byte gUnknown_203B0E8
@@ -5961,7 +5961,7 @@ _0812B1B8:
ldr r0, [r0, 0x10]
lsls r1, r4, 24
lsrs r1, 24
- bl sub_800838C
+ bl StartSpriteAnim
_0812B1D6:
pop {r4}
pop {r0}
diff --git a/asm/unk_810C3A4.s b/asm/unk_810C3A4.s
index c7f5136d3..d9dc8f4d7 100644
--- a/asm/unk_810C3A4.s
+++ b/asm/unk_810C3A4.s
@@ -10,7 +10,7 @@ sub_810C3A4: @ 810C3A4
push {lr}
ldr r0, _0810C3B4 @ =sub_810C3B8
movs r1, 0x50
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
.align 2, 0
@@ -31,7 +31,7 @@ sub_810C3B8: @ 810C3B8
ldrsh r0, [r5, r1]
cmp r0, 0
bne _0810C3E2
- bl sub_8069554
+ bl walkrun_is_standing_still
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x1
@@ -76,9 +76,9 @@ _0810C41C:
cmp r0, 0
beq _0810C436
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
bl sub_805C780
- bl sub_8069B34
+ bl EnableBothScriptContexts
_0810C436:
pop {r4-r7}
pop {r0}
@@ -134,7 +134,7 @@ _0810C47A:
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r0, [r0]
lsls r1, r0, 3
@@ -149,7 +149,7 @@ _0810C47A:
bne _0810C4C0
adds r0, r4, 0
adds r1, r6, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
_0810C4C0:
strb r6, [r5, 0x9]
ldr r2, _0810C4E4 @ =gUnknown_2036DFC
@@ -303,7 +303,7 @@ _0810C59A:
strh r6, [r0, 0x26]
adds r0, r4, 0
adds r1, r3, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
_0810C5EA:
adds r0, r5, 0x1
lsls r0, 24
diff --git a/asm/unk_8147500.s b/asm/unk_8147500.s
index ac0357df4..f17581320 100644
--- a/asm/unk_8147500.s
+++ b/asm/unk_8147500.s
@@ -126,7 +126,7 @@ sub_81475C0: @ 81475C0
lsls r1, 24
lsrs r1, 24
ldr r0, _08147600 @ =sub_8147654
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -158,7 +158,7 @@ _08147608: .4byte gUnknown_846B4AC
sub_814760C: @ 814760C
push {lr}
ldr r0, _08147630 @ =sub_8147654
- bl sub_8077688
+ bl FindTaskIdByFunc
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -186,7 +186,7 @@ _0814763A:
sub_8147640: @ 8147640
push {lr}
ldr r0, _08147650 @ =sub_8147654
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -259,7 +259,7 @@ _081476BC:
adds r0, r5, 0
bl _call_via_r1
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_081476D6:
pop {r4,r5}
pop {r0}
@@ -282,13 +282,13 @@ sub_81476E0: @ 81476E0
lsls r0, 3
ldr r1, _081477B0 @ =gUnknown_846B42C
adds r0, r1
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
movs r2, 0x8
ldrsh r0, [r4, r2]
lsls r0, 3
ldr r1, _081477B4 @ =gUnknown_846B43C
adds r0, r1
- bl sub_8008928
+ bl LoadSpritePalette
movs r5, 0
movs r3, 0x10
ldrsh r0, [r4, r3]
@@ -307,7 +307,7 @@ _08147714:
movs r3, 0x14
ldrsh r2, [r4, r3]
ldrb r3, [r4, 0xE]
- bl sub_8006F8C
+ bl CreateSprite
lsls r1, r5, 1
adds r1, r4
lsls r0, 24
@@ -415,7 +415,7 @@ sub_81477C0: @ 81477C0
ldr r5, _08147844 @ =gUnknown_202063C
adds r0, r5
movs r1, 0x4
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x1C
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -431,7 +431,7 @@ sub_81477C0: @ 81477C0
lsls r0, 2
adds r0, r5
movs r1, 0x5
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0x1E
ldrsh r1, [r4, r0]
lsls r0, r1, 4
@@ -473,7 +473,7 @@ _08147864:
lsls r0, 2
ldr r1, _081478B0 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -488,14 +488,14 @@ _08147880:
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x6]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldr r1, _081478B8 @ =gUnknown_846B43C
movs r2, 0x8
ldrsh r0, [r4, r2]
lsls r0, 3
adds r0, r1
ldrh r0, [r0, 0x4]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
pop {r4,r5}
pop {r0}
bx r0
@@ -565,7 +565,7 @@ _0814792A:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _081479C8
_0814793E:
movs r0, 0x15
@@ -574,7 +574,7 @@ _0814793E:
lsls r1, 24
lsrs r1, 24
adds r0, r6, 0
- bl sub_800838C
+ bl StartSpriteAnim
ldr r4, _08147984 @ =gUnknown_202063C
movs r2, 0x1C
ldrsh r0, [r5, r2]
@@ -716,7 +716,7 @@ sub_8147A34: @ 8147A34
ldrh r0, [r1, 0x4]
strh r0, [r4, 0x16]
_08147A5C:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _08147A9E
diff --git a/asm/unk_8147AA8.s b/asm/unk_8147AA8.s
index 25685ce27..16325b7a5 100644
--- a/asm/unk_8147AA8.s
+++ b/asm/unk_8147AA8.s
@@ -17,14 +17,14 @@ sub_8147AA8: @ 8147AA8
beq _08147B3C
ldr r5, _08147B24 @ =gUnknown_203F3D4
ldr r0, _08147B28 @ =0x000083b0
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
beq _08147B3C
- bl sub_80773BC
+ bl ResetTasks
ldr r0, _08147B2C @ =sub_8147DA0
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -33,7 +33,7 @@ sub_8147AA8: @ 8147AA8
strh r1, [r0, 0x8]
str r6, [r0]
strb r4, [r0, 0x4]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, [r5]
strb r0, [r1, 0x6]
ldr r0, [r5]
@@ -54,9 +54,9 @@ sub_8147AA8: @ 8147AA8
ldr r2, [r5]
adds r0, r4, 0
movs r1, 0x2
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _08147B38 @ =sub_8147D6C
- bl sub_8000544
+ bl SetMainCallback2
b _08147B42
.align 2, 0
_08147B20: .4byte gUnknown_3003F64
@@ -68,7 +68,7 @@ _08147B34: .4byte gUnknown_2024284
_08147B38: .4byte sub_8147D6C
_08147B3C:
adds r0, r6, 0
- bl sub_8000544
+ bl SetMainCallback2
_08147B42:
pop {r4-r7}
pop {r0}
@@ -81,7 +81,7 @@ sub_8147B48: @ 8147B48
bl sub_8149D24
ldr r0, _08147B5C @ =gUnknown_203F3D4
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
pop {r0}
bx r0
.align 2, 0
@@ -129,7 +129,7 @@ sub_8147B94: @ 8147B94
strh r5, [r0]
str r5, [r4, 0x1C]
str r5, [r4, 0x5C]
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -333,15 +333,15 @@ sub_8147D2C: @ 8147D2C
adds r4, r1, 0
adds r0, r4, 0
movs r1, 0xB
- bl sub_803FBE8
+ bl GetMonData
strh r0, [r5]
adds r0, r4, 0
movs r1, 0x1
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x4]
adds r0, r4, 0
movs r1, 0
- bl sub_803FBE8
+ bl GetMonData
str r0, [r5, 0x8]
pop {r4,r5}
pop {r0}
@@ -351,9 +351,9 @@ sub_8147D2C: @ 8147D2C
thumb_func_start sub_8147D58
sub_8147D58: @ 8147D58
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_8147D58
@@ -361,10 +361,10 @@ sub_8147D58: @ 8147D58
thumb_func_start sub_8147D6C
sub_8147D6C: @ 8147D6C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_8147D6C
@@ -373,7 +373,7 @@ sub_8147D6C: @ 8147D6C
sub_8147D84: @ 8147D84
push {lr}
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r2, _08147D9C @ =gUnknown_203F3D4
ldr r1, [r2]
movs r3, 0
@@ -418,14 +418,14 @@ _08147DC8:
.4byte _08147ECC
_08147DE0:
movs r0, 0
- bl sub_80006F4
- bl sub_8006B10
- bl sub_80088F0
+ bl SetVBlankCallback
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
ldr r0, _08147E04 @ =sub_8148E80
movs r1, 0x5
bl sub_8148F5C
movs r0, 0x4
- bl sub_8071AB4
+ bl FadeOutMapMusic
ldr r0, _08147E08 @ =gUnknown_203F3D4
ldr r1, [r0]
b _08147EBC
@@ -434,7 +434,7 @@ _08147E04: .4byte sub_8148E80
_08147E08: .4byte gUnknown_203F3D4
_08147E0C:
ldr r0, _08147E34 @ =sub_8148E80
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08147F04
@@ -455,7 +455,7 @@ _08147E3C:
bl sub_8149D68
cmp r0, 0
bne _08147F04
- bl sub_8071BA0
+ bl IsNotWaitingForBGMStop
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -463,7 +463,7 @@ _08147E3C:
movs r0, 0xA3
lsls r0, 1
movs r1, 0x8
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
ldr r0, _08147E60 @ =gUnknown_203F3D4
ldr r1, [r0]
b _08147EBC
@@ -479,16 +479,16 @@ _08147E64:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
adds r1, r4, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08147E98 @ =sub_8147D58
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08147E9C @ =gUnknown_203F3D4
ldr r1, [r0]
b _08147EBC
@@ -496,7 +496,7 @@ _08147E64:
_08147E98: .4byte sub_8147D58
_08147E9C: .4byte gUnknown_203F3D4
_08147EA0:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _08147EC4 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -542,7 +542,7 @@ _08147EF4:
_08147EFA:
bl sub_8148F7C
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_08147F04:
add sp, 0x4
pop {r4}
@@ -1629,7 +1629,7 @@ _081486EE:
beq _0814871A
adds r0, r1, 0
bl sub_8147B94
- bl sub_8044EC8
+ bl Random
ldr r1, [r4]
lsls r0, 16
lsrs r0, 16
@@ -1721,7 +1721,7 @@ _08148798:
bne _081487AC
ldr r0, [r4]
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8147B48
_081487AC:
movs r0, 0x1
@@ -1840,13 +1840,13 @@ _0814887C:
beq _081488D4
ldr r0, _08148890 @ =sub_80DA634
movs r1, 0x6
- bl sub_807741C
+ bl CreateTask
b _081488A4
.align 2, 0
_08148890: .4byte sub_80DA634
_08148894:
ldr r0, _081488B0 @ =sub_80DA634
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _081488D4
@@ -2525,7 +2525,7 @@ _08148DC4:
adds r0, r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r1, [r4]
b _08148DFE
_08148DEA:
@@ -2630,7 +2630,7 @@ sub_8148E80: @ 8148E80
adds r6, r0, r1
mov r0, r10
movs r1, 0xE
- bl sub_8077720
+ bl GetWordTaskArg
mov r8, r0
movs r1, 0
ldrsh r0, [r6, r1]
@@ -2644,7 +2644,7 @@ _08148EB4: .4byte gUnknown_3005098
_08148EB8:
bl sub_8147C20
mov r0, r10
- bl sub_8077508
+ bl DestroyTask
b _08148F44
_08148EC4:
movs r1, 0
@@ -2690,7 +2690,7 @@ _08148EFA:
ldr r1, _08148F58 @ =gUnknown_2022744
add r1, r9
adds r0, r7, 0
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x1
strh r0, [r5]
ldrh r0, [r6, 0x2]
@@ -2731,13 +2731,13 @@ sub_8148F5C: @ 8148F5C
push {lr}
lsls r1, 24
lsrs r1, 24
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r1, _08148F78 @ =gUnknown_203F3D4
ldr r2, [r1]
movs r1, 0xE
- bl sub_80776E8
+ bl SetWordTaskArg
pop {r0}
bx r0
.align 2, 0
@@ -4091,7 +4091,7 @@ sub_8149900: @ 8149900
thumb_func_start sub_8149910
sub_8149910: @ 8149910
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xE0
lsls r1, 11
@@ -4256,12 +4256,12 @@ _08149A1C:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08149A54
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 16
lsrs r0, 16
bl sub_8149A00
@@ -4643,13 +4643,13 @@ sub_8149CEC: @ 8149CEC
bl sub_8149D34
ldr r0, _08149D1C @ =sub_8149DA4
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0x6]
ldr r2, [r4]
ldrb r0, [r2, 0x6]
movs r1, 0x2
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r0, _08149D20 @ =sub_8149DC8
bl sub_8149D80
pop {r4}
@@ -4727,7 +4727,7 @@ sub_8149D80: @ 8149D80
ldr r0, [r4]
ldrb r0, [r0, 0x6]
movs r1, 0
- bl sub_80776E8
+ bl SetWordTaskArg
ldr r1, [r4]
movs r0, 0
strh r0, [r1, 0x4]
@@ -4751,7 +4751,7 @@ sub_8149DA4: @ 8149DA4
bne _08149DC0
adds r0, r1, 0
movs r1, 0
- bl sub_8077720
+ bl GetWordTaskArg
bl _call_via_r0
_08149DC0:
pop {r0}
@@ -4794,69 +4794,69 @@ _08149DF0:
ldr r0, _08149EEC @ =gUnknown_846D8E4
bl sub_8003B24
bl sub_80F6C14
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
ldr r0, [r6]
bl sub_814AD6C
bl sub_814A9C8
ldr r0, _08149EF0 @ =gUnknown_846B7B4
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08149EF4 @ =gUnknown_846B7D4
str r5, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08149EF8 @ =gUnknown_846BA00
movs r4, 0x1
str r4, [sp]
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _08149EFC @ =gUnknown_846BBB0
movs r1, 0x30
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08149F00 @ =gUnknown_846BBD0
str r5, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08149F04 @ =gUnknown_846C520
str r4, [sp]
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _08149F08 @ =gUnknown_846C8D8
movs r1, 0x10
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _08149F0C @ =gUnknown_846C8F8
str r5, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r1, _08149F10 @ =gUnknown_846D3A8
str r4, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
ldr r0, _08149F14 @ =gUnknown_846B794
movs r1, 0x20
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
ldr r1, [r6]
movs r0, 0xD3
lsls r0, 1
adds r1, r0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x20
str r0, [sp]
str r0, [sp, 0x4]
@@ -4864,7 +4864,7 @@ _08149DF0:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
bl sub_814A84C
movs r0, 0
bl sub_814AA24
@@ -4877,11 +4877,11 @@ _08149DF0:
movs r2, 0xD0
bl sub_814FE40
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08149F4C
.align 2, 0
_08149EE8: .4byte gUnknown_846D8D4
@@ -4897,7 +4897,7 @@ _08149F0C: .4byte gUnknown_846C8F8
_08149F10: .4byte gUnknown_846D3A8
_08149F14: .4byte gUnknown_846B794
_08149F18:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
bne _08149F5A
@@ -4908,13 +4908,13 @@ _08149F18:
movs r1, 0x6
bl sub_814B348
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
_08149F4C:
ldr r1, [r6]
ldrh r0, [r1, 0x4]
@@ -4956,7 +4956,7 @@ _08149F8A:
bl sub_814AADC
b _08149FB0
_08149F90:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08149FCA
@@ -4964,7 +4964,7 @@ _08149F90:
bl sub_814AC30
b _08149FB0
_08149FA2:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08149FCA
@@ -4976,7 +4976,7 @@ _08149FB0:
strh r0, [r1, 0x4]
b _08149FCA
_08149FBA:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08149FCA
@@ -5014,7 +5014,7 @@ _08149FF6:
bl sub_814AADC
b _0814A01C
_08149FFC:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A036
@@ -5022,7 +5022,7 @@ _08149FFC:
bl sub_814AC30
b _0814A01C
_0814A00E:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A036
@@ -5034,7 +5034,7 @@ _0814A01C:
strh r0, [r1, 0x4]
b _0814A036
_0814A026:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A036
@@ -5074,13 +5074,13 @@ _0814A062:
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r4, 0x1
cmp r4, r5
blt _0814A062
_0814A078:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0814A08C @ =gUnknown_203F3D8
ldr r1, [r0]
ldrh r0, [r1, 0x4]
@@ -5090,7 +5090,7 @@ _0814A078:
.align 2, 0
_0814A08C: .4byte gUnknown_203F3D8
_0814A090:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A0BE
@@ -5168,13 +5168,13 @@ _0814A0EA:
.align 2, 0
_0814A120: .4byte gUnknown_841CBFD
_0814A124:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A16C
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -5185,7 +5185,7 @@ _0814A124:
movs r2, 0
bl sub_814A7D0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0814A152:
ldr r1, [r5]
ldrh r0, [r1, 0x4]
@@ -5193,7 +5193,7 @@ _0814A152:
strh r0, [r1, 0x4]
b _0814A16C
_0814A15C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A16C
@@ -5254,20 +5254,20 @@ _0814A196:
.align 2, 0
_0814A1CC: .4byte gUnknown_841CC42
_0814A1D0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A20E
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
bl sub_8150048
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0814A1F4:
ldr r1, [r5]
ldrh r0, [r1, 0x4]
@@ -5275,7 +5275,7 @@ _0814A1F4:
strh r0, [r1, 0x4]
b _0814A20E
_0814A1FE:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A20E
@@ -5306,7 +5306,7 @@ _0814A230:
bl sub_814A6CC
bl sub_81100E8
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r5]
ldrh r0, [r1, 0x4]
adds r0, 0x1
@@ -5316,7 +5316,7 @@ _0814A248:
bl sub_814A6FC
cmp r0, 0
bne _0814A25E
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A25E
@@ -5375,20 +5375,20 @@ _0814A286:
.align 2, 0
_0814A2BC: .4byte gUnknown_841CC11
_0814A2C0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A2FE
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
bl sub_8150048
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0814A2E4:
ldr r1, [r5]
ldrh r0, [r1, 0x4]
@@ -5396,7 +5396,7 @@ _0814A2E4:
strh r0, [r1, 0x4]
b _0814A2FE
_0814A2EE:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A2FE
@@ -5457,20 +5457,20 @@ _0814A32A:
.align 2, 0
_0814A360: .4byte gUnknown_841CC64
_0814A364:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A3A2
ldr r0, [r5]
ldrb r0, [r0, 0x12]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r5]
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
bl sub_8150048
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_0814A388:
ldr r1, [r5]
ldrh r0, [r1, 0x4]
@@ -5478,7 +5478,7 @@ _0814A388:
strh r0, [r1, 0x4]
b _0814A3A2
_0814A392:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A3A2
@@ -5629,7 +5629,7 @@ sub_814A468: @ 814A468
bls _0814A4C2
ldr r0, [r5]
adds r0, 0x26
- bl sub_8008E08
+ bl StringLength
lsls r0, 16
lsrs r1, r0, 16
cmp r1, 0
@@ -5642,7 +5642,7 @@ sub_814A468: @ 814A468
ldr r0, [r5]
adds r0, 0x26
ldr r1, _0814A530 @ =gUnknown_846D94C
- bl sub_8008DA4
+ bl StringAppend
_0814A4C2:
bl sub_813CC90
ldr r4, _0814A52C @ =gUnknown_203F3D8
@@ -5828,27 +5828,27 @@ _0814A648:
beq _0814A6BA
b _0814A6C4
_0814A652:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A6C4
ldr r0, [r4]
ldrb r0, [r0, 0x12]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x1
movs r2, 0xE
bl sub_8150048
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r4]
ldrb r0, [r1, 0xD]
adds r0, 0x1
strb r0, [r1, 0xD]
b _0814A6C4
_0814A680:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A6C4
@@ -5861,13 +5861,13 @@ _0814A680:
b _0814A6B8
_0814A698:
ldrh r0, [r1, 0x14]
- bl sub_8071C60
+ bl PlayFanfare
ldr r1, [r4]
ldrb r0, [r1, 0xD]
adds r0, 0x1
strb r0, [r1, 0xD]
_0814A6A6:
- bl sub_8071C9C
+ bl IsFanfareTaskInactive
lsls r0, 24
cmp r0, 0
beq _0814A6C4
@@ -5900,7 +5900,7 @@ sub_814A6CC: @ 814A6CC
beq _0814A6F0
lsls r0, 24
lsrs r0, 24
- bl sub_815036C
+ bl rbox_fill_rectangle
ldr r0, [r4]
ldrb r0, [r0, 0x12]
movs r1, 0x1
@@ -5933,7 +5933,7 @@ _0814A710:
ldrb r0, [r1, 0xD]
cmp r0, 0
bne _0814A736
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814A73A
@@ -6013,7 +6013,7 @@ sub_814A754: @ 814A754
lsls r0, r4, 24
lsrs r0, 24
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r4, 0
add sp, 0x8
pop {r4-r6}
@@ -6097,15 +6097,15 @@ sub_814A84C: @ 814A84C
movs r2, 0x3
bl memcpy
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
add r0, sp, 0xC
str r0, [sp]
movs r4, 0
@@ -6236,7 +6236,7 @@ sub_814A95C: @ 814A95C
lsls r1, 13
movs r0, 0x2
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
pop {r4}
pop {r0}
bx r0
@@ -6502,7 +6502,7 @@ _0814AB2A:
strh r0, [r1]
lsls r0, 24
lsrs r0, 24
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrh r0, [r6, 0x6]
adds r0, 0x10
strh r0, [r6, 0x6]
@@ -6512,7 +6512,7 @@ _0814AB2A:
blt _0814AB2A
_0814AB6C:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r4-r7}
pop {r0}
@@ -6551,7 +6551,7 @@ sub_814AB98: @ 814AB98
add r0, r8
ldrb r0, [r0]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
lsls r5, 24
lsrs r5, 24
adds r0, r5, 0
@@ -6670,13 +6670,13 @@ _0814ACA4:
adds r0, 0x1C
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r4, 0x1
cmp r4, r5
blt _0814ACA4
_0814ACBA:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
pop {r4,r5}
pop {r0}
bx r0
@@ -6698,7 +6698,7 @@ sub_814ACCC: @ 814ACCC
lsls r1, 16
movs r0, 0x1
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
ands r4, r0
lsls r4, 8
@@ -6706,12 +6706,12 @@ sub_814ACCC: @ 814ACCC
lsls r4, 8
adds r1, r4, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
ldr r0, _0814AD14 @ =sub_814AD50
movs r1, 0x4
- bl sub_807741C
+ bl CreateTask
pop {r4}
pop {r0}
bx r0
@@ -6736,7 +6736,7 @@ _0814AD2C:
movs r0, 0x1
movs r1, 0x80
movs r2, 0x1
- bl sub_8001D08
+ bl ChangeBgY
ldr r1, [r4]
ldr r0, [r1, 0x18]
adds r0, 0x1
@@ -6744,7 +6744,7 @@ _0814AD2C:
cmp r0, 0x1F
bls _0814AD48
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
_0814AD48:
movs r0, 0x1
_0814AD4A:
@@ -6762,7 +6762,7 @@ sub_814AD50: @ 814AD50
cmp r0, 0
bne _0814AD64
adds r0, r4, 0
- bl sub_8077508
+ bl DestroyTask
_0814AD64:
pop {r4}
pop {r0}
@@ -6777,7 +6777,7 @@ sub_814AD6C: @ 814AD6C
ldr r5, _0814ADAC @ =gUnknown_846E0B0
_0814AD74:
adds r0, r5, 0
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r5, 0x8
adds r4, 0x1
cmp r4, 0x4
@@ -6786,16 +6786,16 @@ _0814AD74:
ldr r5, _0814ADB0 @ =gUnknown_846E0D8
_0814AD86:
adds r0, r5, 0
- bl sub_8008928
+ bl LoadSpritePalette
adds r5, 0x8
adds r4, 0x1
cmp r4, 0x1
bls _0814AD86
movs r0, 0x5
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
strb r0, [r6, 0xE]
movs r0, 0x6
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
strb r0, [r6, 0xF]
pop {r4-r6}
pop {r0}
@@ -6848,11 +6848,11 @@ sub_814ADCC: @ 814ADCC
stm r1!, {r2-r4}
movs r0, 0x80
lsls r0, 6
- bl sub_8002B9C
+ bl Alloc
mov r8, r0
movs r0, 0x80
lsls r0, 4
- bl sub_8002B9C
+ bl Alloc
mov r10, r0
bl sub_81499B4
lsls r0, 16
@@ -6892,22 +6892,22 @@ _0814AE2A:
lsls r2, 4
orrs r1, r2
str r1, [r0, 0x4]
- bl sub_80086DC
+ bl LoadSpriteSheet
ldrh r0, [r7]
ldr r1, [r7, 0x4]
ldr r2, [r7, 0x8]
- bl sub_80440F4
+ bl GetFrontSpritePalFromSpeciesAndPersonality
str r0, [sp, 0x20]
add r0, sp, 0x20
ldr r1, [r0, 0x4]
ands r1, r5
orrs r1, r4
str r1, [r0, 0x4]
- bl sub_800EC28
+ bl LoadCompressedObjectPalette
mov r0, r8
- bl sub_8002BC4
+ bl Free
mov r0, r10
- bl sub_8002BC4
+ bl Free
mov r1, sp
mov r0, sp
ldrh r0, [r0]
@@ -6925,7 +6925,7 @@ _0814AE2A:
asrs r2, 16
mov r0, sp
ldr r3, [sp, 0x30]
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0x40
@@ -7013,7 +7013,7 @@ sub_814AF0C: @ 814AF0C
ldr r1, _0814AF70 @ =sub_814AF74
str r1, [r0, 0x1C]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
pop {r4-r6}
pop {r0}
bx r0
@@ -7441,7 +7441,7 @@ sub_814B240: @ 814B240
lsls r2, 16
asrs r2, 16
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0x40
@@ -7492,7 +7492,7 @@ _0814B29E:
movs r3, 0
ldrsh r2, [r6, r3]
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r5, 2
@@ -7527,7 +7527,7 @@ _0814B2E0:
movs r3, 0
ldrsh r2, [r2, r3]
movs r3, 0x2
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r1, r0, 24
lsls r0, r5, 2
@@ -7626,7 +7626,7 @@ _0814B38A:
ldr r0, [r2]
mov r2, r8
lsrs r1, r2, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r6, 0x1
adds r4, 0x14
subs r5, 0x1
@@ -7669,7 +7669,7 @@ _0814B3E0:
ldr r0, [r2]
mov r2, r8
lsrs r1, r2, 24
- bl sub_800838C
+ bl StartSpriteAnim
adds r6, 0x1
subs r4, 0x14
subs r5, 0x1
@@ -7728,8 +7728,8 @@ sub_814B46C: @ 814B46C
_0814B478: .4byte gUnknown_300500C
thumb_func_end sub_814B46C
- thumb_func_start sub_814B47C
-sub_814B47C: @ 814B47C
+ thumb_func_start ResetPokeJumpResults
+ResetPokeJumpResults: @ 814B47C
push {lr}
bl sub_814B46C
movs r1, 0
@@ -7741,7 +7741,7 @@ sub_814B47C: @ 814B47C
strh r1, [r0, 0x2]
pop {r0}
bx r0
- thumb_func_end sub_814B47C
+ thumb_func_end ResetPokeJumpResults
thumb_func_start sub_814B494
sub_814B494: @ 814B494
@@ -7814,7 +7814,7 @@ sub_814B504: @ 814B504
ldr r4, _0814B520 @ =sub_814B524
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -7864,7 +7864,7 @@ _0814B556:
.align 2, 0
_0814B56C: .4byte gUnknown_846E2CC
_0814B570:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814B5BE
@@ -7877,7 +7877,7 @@ _0814B57C:
cmp r0, 0
beq _0814B5BE
ldrb r0, [r4, 0x2]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r4, 0x2]
movs r1, 0x1
_0814B592:
@@ -7890,15 +7890,15 @@ _0814B596:
.align 2, 0
_0814B5A0: .4byte gUnknown_30030F0
_0814B5A4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814B5BE
ldrb r0, [r4, 0x2]
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_0814B5BE:
pop {r4,r5}
pop {r0}
@@ -7937,7 +7937,7 @@ sub_814B5C4: @ 814B5C4
bl sub_8150048
adds r0, r4, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _0814B6CC @ =gUnknown_841CB63
movs r1, 0
str r1, [sp]
@@ -8017,7 +8017,7 @@ _0814B63E:
cmp r7, 0x2
bls _0814B63E
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x30
pop {r3-r5}
mov r8, r3
diff --git a/asm/unk_814B6F0.s b/asm/unk_814B6F0.s
index 6cf57f479..38735abff 100644
--- a/asm/unk_814B6F0.s
+++ b/asm/unk_814B6F0.s
@@ -32,18 +32,18 @@ _0814B710:
ldr r4, [r0]
_0814B716:
ldrb r0, [r0, 0xA]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
adds r0, r4, 0
- bl sub_8000544
- ldr r0, _0814B748 @ =sub_80567DC
+ bl SetMainCallback2
+ ldr r0, _0814B748 @ =c2_exit_to_overworld_2_switch
cmp r4, r0
bne _0814B73E
ldr r0, _0814B74C @ =0x0000012f
- bl sub_8071A74
+ bl PlayNewMapMusic
ldr r0, _0814B750 @ =sub_8056534
bl sub_80565E0
_0814B73E:
@@ -53,7 +53,7 @@ _0814B740:
pop {r1}
bx r1
.align 2, 0
-_0814B748: .4byte sub_80567DC
+_0814B748: .4byte c2_exit_to_overworld_2_switch
_0814B74C: .4byte 0x0000012f
_0814B750: .4byte sub_8056534
thumb_func_end sub_814B6FC
@@ -77,7 +77,7 @@ sub_814B754: @ 814B754
bne _0814B790
_0814B772:
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0814B78C @ =gUnknown_3005450
mov r1, r8
strh r1, [r0, 0x10]
@@ -92,7 +92,7 @@ _0814B790:
lsls r0, 24
lsrs r0, 24
mov r8, r0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r7, r0, 24
mov r0, r8
@@ -102,7 +102,7 @@ _0814B790:
bcc _0814B7C0
_0814B7AC:
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0814B7BC @ =gUnknown_3005450
movs r1, 0
strh r1, [r0, 0x10]
@@ -113,13 +113,13 @@ _0814B7BC: .4byte gUnknown_3005450
_0814B7C0:
ldr r6, _0814B7E8 @ =gUnknown_203F3DC
ldr r0, _0814B7EC @ =0x000041c0
- bl sub_8002BB0
+ bl AllocZeroed
adds r5, r0, 0
str r5, [r6]
cmp r5, 0
bne _0814B7F4
adds r0, r4, 0
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0814B7F0 @ =gUnknown_3005450
strh r5, [r0, 0x10]
strh r5, [r0, 0x12]
@@ -167,10 +167,10 @@ _0814B7F4:
movs r1, 0x1
bl sub_814BB4C
ldr r0, _0814B858 @ =sub_814BA80
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, _0814B85C @ =sub_814BA98
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r1, [r6]
strb r0, [r1, 0xA]
_0814B84C:
@@ -239,11 +239,11 @@ _0814B884:
bl sub_814BB4C
ldr r0, _0814B8E8 @ =sub_814BA98
movs r1, 0x8
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
strb r0, [r1, 0xA]
ldr r0, _0814B8EC @ =sub_814BA80
- bl sub_8000544
+ bl SetMainCallback2
add sp, 0xC
pop {r4}
pop {r0}
@@ -261,7 +261,7 @@ sub_814B8F0: @ 814B8F0
ldr r0, _0814B90C @ =gUnknown_203F3DC
ldr r0, [r0]
ldrb r0, [r0, 0xA]
- bl sub_8077508
+ bl DestroyTask
ldr r1, _0814B910 @ =sub_814B860
movs r0, 0x5
movs r2, 0
@@ -277,7 +277,7 @@ _0814B910: .4byte sub_814B860
sub_814B914: @ 814B914
push {lr}
ldr r0, _0814B920 @ =sub_814BA6C
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
.align 2, 0
@@ -288,7 +288,7 @@ _0814B920: .4byte sub_814BA6C
sub_814B924: @ 814B924
push {lr}
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
pop {r0}
bx r0
thumb_func_end sub_814B924
@@ -455,9 +455,9 @@ _0814BA68: .4byte gUnknown_203F3DC
thumb_func_start sub_814BA6C
sub_814BA6C: @ 814BA6C
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_814BA6C
@@ -465,10 +465,10 @@ sub_814BA6C: @ 814BA6C
thumb_func_start sub_814BA80
sub_814BA80: @ 814BA80
push {lr}
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
+ bl AnimateSprites
+ bl BuildOamBuffer
pop {r0}
bx r0
thumb_func_end sub_814BA80
@@ -510,7 +510,7 @@ _0814BAC4:
lsls r1, 2
ldr r2, _0814BB2C @ =gUnknown_2022744
adds r1, r2
- bl sub_8008D84
+ bl StringCopy
adds r4, r6, r4
adds r4, 0x9F
movs r0, 0xFF
diff --git a/asm/unk_814BB4C.s b/asm/unk_814BB4C.s
index 6c2ad4294..b75a18f7c 100644
--- a/asm/unk_814BB4C.s
+++ b/asm/unk_814BB4C.s
@@ -100,8 +100,8 @@ sub_814BBB8: @ 814BBB8
ldrb r3, [r1, 0x6]
str r4, [sp]
adds r1, r5, 0
- bl sub_8070588
- bl sub_80704D0
+ bl BeginNormalPaletteFade
+ bl UpdatePaletteFade
movs r0, 0x2
strb r0, [r6, 0xE]
movs r0, 0
@@ -133,7 +133,7 @@ _0814BC26:
beq _0814BC56
b _0814BC66
_0814BC30:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0814BC6C
@@ -367,7 +367,7 @@ _0814BDD2:
cmp r0, 0
beq _0814BE02
ldr r0, _0814BDF8 @ =0x00000111
- bl sub_8071A74
+ bl PlayNewMapMusic
movs r0, 0x7
movs r1, 0x1
movs r2, 0
@@ -444,7 +444,7 @@ sub_814BE64: @ 814BE64
movs r1, 0
str r1, [r0, 0x4]
ldr r0, _0814BE78 @ =sub_814B8F0
- bl sub_8000544
+ bl SetMainCallback2
movs r0, 0
pop {r1}
bx r1
@@ -516,7 +516,7 @@ _0814BEDA:
movs r0, 0
adds r1, r4, 0
movs r2, 0x2
- bl sub_800A448
+ bl SendBlock
b _0814BFC0
_0814BF0A:
bl sub_800A4BC
@@ -527,7 +527,7 @@ _0814BF0A:
strh r0, [r5, 0x10]
b _0814BFC0
_0814BF1A:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
ldr r2, _0814BF98 @ =gUnknown_846E3C8
ldrb r4, [r5, 0x9]
subs r1, r4, 0x2
@@ -581,7 +581,7 @@ _0814BF56:
_0814BF7E:
movs r0, 0
strh r0, [r5, 0x10]
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r1, 0x18
ldrsh r0, [r5, r1]
lsls r0, 8
@@ -851,19 +851,19 @@ _0814C17C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
@@ -897,13 +897,13 @@ _0814C1FC:
strh r0, [r4, 0x2C]
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
bl sub_80FA42C
b _0814C23C
_0814C21E:
@@ -1767,19 +1767,19 @@ sub_814C850: @ 814C850
lsls r1, 16
lsrs r1, 16
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
adds r0, 0x25
ldrb r1, [r0]
@@ -1848,19 +1848,19 @@ sub_814C8F8: @ 814C8F8
lsls r1, 16
lsrs r1, 16
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
adds r0, r4, 0
adds r0, 0x25
ldrb r1, [r0]
@@ -1935,7 +1935,7 @@ _0814C9C4:
negs r0, r0
ldr r2, _0814C9E8 @ =0x000003ff
movs r1, 0x8
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0x9C
lsls r0, 1
adds r1, r4, r0
@@ -1961,7 +1961,7 @@ _0814CA02:
negs r0, r0
ldr r2, _0814CA30 @ =0x000003ff
movs r1, 0
- bl sub_80714D4
+ bl BlendPalettes
ldr r2, _0814CA34 @ =0x00000139
adds r1, r4, r2
movs r0, 0x4
@@ -2003,19 +2003,19 @@ _0814CA3C:
lsls r1, 16
lsrs r1, 16
movs r0, 0x12
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1A
- bl sub_8000A38
+ bl SetGpuReg
ldrh r1, [r4, 0x2C]
negs r1, r1
lsls r1, 16
lsrs r1, 16
movs r0, 0x1E
- bl sub_8000A38
+ bl SetGpuReg
ldrb r0, [r6]
adds r0, 0x1
strb r0, [r6]
@@ -2049,13 +2049,13 @@ _0814CABC:
strh r0, [r4, 0x2C]
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _0814CB12
_0814CADA:
movs r2, 0x9C
@@ -2124,7 +2124,7 @@ _0814CB42:
negs r0, r0
movs r1, 0x8
movs r2, 0x1F
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0x9C
lsls r0, 1
adds r1, r5, r0
@@ -2146,7 +2146,7 @@ _0814CB64:
negs r0, r0
movs r1, 0
movs r2, 0x1F
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
strb r0, [r4]
b _0814CBFC
@@ -2163,13 +2163,13 @@ _0814CB8A:
strh r0, [r5, 0x10]
movs r0, 0x12
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1A
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1E
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _0814CBFC
_0814CBBC:
bl sub_800A4BC
@@ -2270,7 +2270,7 @@ _0814CC72:
movs r0, 0
adds r1, r4, 0
movs r2, 0x2
- bl sub_800A448
+ bl SendBlock
b _0814CF8E
_0814CC8A:
bl sub_800A4BC
@@ -2281,7 +2281,7 @@ _0814CC8A:
_0814CC96:
b _0814CF64
_0814CC98:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
ldr r2, _0814CCF4 @ =gUnknown_846E3C8
ldrb r3, [r7, 0x9]
subs r1, r3, 0x2
@@ -2321,7 +2321,7 @@ _0814CCDE:
movs r0, 0
strh r0, [r7, 0x10]
strh r0, [r4]
- bl sub_800A550
+ bl ResetBlockReceivedFlags
ldrb r0, [r7, 0x8]
cmp r0, 0
bne _0814CCFC
@@ -2392,7 +2392,7 @@ _0814CD00:
adds r4, r0, 0
asrs r0, r4, 8
str r0, [r7, 0x68]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x3
@@ -2615,7 +2615,7 @@ _0814CF24:
movs r0, 0
ldr r1, [sp, 0xC]
movs r2, 0x30
- bl sub_800A448
+ bl SendBlock
b _0814CF8E
_0814CF30:
bl sub_800A4BC
@@ -2624,7 +2624,7 @@ _0814CF30:
beq _0814CF94
b _0814CF64
_0814CF3C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -2639,7 +2639,7 @@ _0814CF3C:
adds r0, r4, 0
movs r2, 0x30
bl memcpy
- bl sub_800A550
+ bl ResetBlockReceivedFlags
_0814CF64:
movs r0, 0
strh r0, [r7, 0x10]
@@ -2711,7 +2711,7 @@ _0814CFD8:
b _0814D08A
_0814CFEA:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x9C
lsls r0, 1
adds r1, r5, r0
@@ -2874,14 +2874,14 @@ _0814D106:
bl sub_8003F20
ldr r0, _0814D14C @ =sub_80DA634
movs r1, 0
- bl sub_807741C
+ bl CreateTask
b _0814D178
.align 2, 0
_0814D148: .4byte gUnknown_8419F54
_0814D14C: .4byte sub_80DA634
_0814D150:
ldr r0, _0814D160 @ =sub_80DA634
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _0814D178
@@ -3044,7 +3044,7 @@ _0814D266:
strh r5, [r0]
movs r0, 0
movs r2, 0x2
- bl sub_800A448
+ bl SendBlock
b _0814D30C
_0814D288:
bl sub_800A4BC
@@ -3054,7 +3054,7 @@ _0814D288:
strh r5, [r4, 0x10]
b _0814D30C
_0814D296:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
ldr r2, _0814D2E8 @ =gUnknown_846E3C8
ldrb r3, [r4, 0x9]
subs r1, r3, 0x2
@@ -3103,7 +3103,7 @@ _0814D2F0:
movs r2, 0
bl sub_814BB4C
_0814D2FA:
- bl sub_800A550
+ bl ResetBlockReceivedFlags
movs r1, 0
movs r0, 0
strh r0, [r7]
@@ -3151,7 +3151,7 @@ _0814D33C:
movs r3, 0x10
b _0814D370
_0814D34A:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _0814D394
@@ -3169,11 +3169,11 @@ _0814D356:
movs r2, 0x10
movs r3, 0
_0814D370:
- bl sub_8070588
- bl sub_80704D0
+ bl BeginNormalPaletteFade
+ bl UpdatePaletteFade
b _0814D394
_0814D37A:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
bne _0814D39A
diff --git a/asm/unk_814D5C8.s b/asm/unk_814D5C8.s
index bcb60aa4f..b1f2246de 100644
--- a/asm/unk_814D5C8.s
+++ b/asm/unk_814D5C8.s
@@ -43,14 +43,14 @@ _0814D5F4:
.4byte _0814D830
_0814D61C:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
- bl sub_8000700
+ bl SetHBlankCallback
movs r0, 0
movs r1, 0
- bl sub_8000A38
- bl sub_8087E64
- bl sub_80F6808
+ bl SetGpuReg
+ bl remove_some_task
+ bl reset_temp_tile_data_buffers
b _0814D878
_0814D63A:
add r0, sp, 0x8
@@ -69,9 +69,9 @@ _0814D63A:
_0814D658: .4byte 0x01000200
_0814D65C: .4byte gUnknown_3003E58
_0814D660:
- bl sub_8070528
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
b _0814D878
_0814D66E:
movs r0, 0
@@ -84,47 +84,47 @@ _0814D66E:
lsls r0, 1
adds r1, r5, r0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0x87
lsls r0, 6
adds r1, r5, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0xC7
lsls r0, 6
adds r1, r5, r0
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x50
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x52
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
b _0814D878
.align 2, 0
_0814D6F0: .4byte gUnknown_846E3CC
@@ -136,7 +136,7 @@ _0814D6F4:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
movs r0, 0x40
str r0, [sp, 0x4]
@@ -144,43 +144,43 @@ _0814D6F4:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
b _0814D878
_0814D73A:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, _0814D764 @ =gUnknown_8EAFFC0
movs r0, 0
str r0, [sp]
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _0814D878
.align 2, 0
_0814D764: .4byte gUnknown_8EAFFC0
_0814D768:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
cmp r0, 0
beq _0814D774
@@ -205,30 +205,30 @@ _0814D798:
movs r2, 0xC0
lsls r2, 1
movs r1, 0
- bl sub_80703EC
+ bl LoadPalette
ldr r1, _0814D7E8 @ =gUnknown_846ED90
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _0814D7EC @ =gUnknown_846EEC0
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _0814D7F0 @ =gUnknown_846F058
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
adds r0, r5, 0
bl sub_814EC80
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0814D878
.align 2, 0
_0814D7E4: .4byte gUnknown_8EAFEA0
@@ -248,15 +248,15 @@ _0814D7F4:
lsls r1, 16
lsrs r1, 16
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
b _0814D878
.align 2, 0
_0814D82C: .4byte gUnknown_2021BCA
@@ -270,19 +270,19 @@ _0814D830:
negs r0, r0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000AF4
+ bl SetGpuRegBits
bl sub_814B914
movs r0, 0
strb r0, [r5, 0xC]
@@ -352,11 +352,11 @@ _0814D8E4:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
- bl sub_80704D0
+ bl BeginNormalPaletteFade
+ bl UpdatePaletteFade
b _0814D9BA
_0814D8FA:
- bl sub_80704D0
+ bl UpdatePaletteFade
lsls r0, 24
cmp r0, 0
beq _0814D9BA
@@ -369,59 +369,59 @@ _0814D906:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x1
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x2
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
str r4, [sp]
str r4, [sp, 0x4]
movs r0, 0x3
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _0814D9BA
_0814D962:
bl sub_8003ECC
movs r0, 0
- bl sub_80019D0
+ bl HideBg
movs r0, 0
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x1
- bl sub_80019D0
+ bl HideBg
movs r0, 0x1
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x2
- bl sub_80019D0
+ bl HideBg
movs r0, 0x2
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r0, 0x3
- bl sub_80019D0
+ bl HideBg
movs r0, 0x3
- bl sub_8001FD4
+ bl UnsetBgTilemapBuffer
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000B14
+ bl ClearGpuRegBits
b _0814D9BA
_0814D9A2:
bl sub_80FCE44
@@ -460,7 +460,7 @@ sub_814D9CC: @ 814D9CC
lsls r1, 16
lsrs r1, 16
movs r0, 0x16
- bl sub_8000A38
+ bl SetGpuReg
ldrh r0, [r4, 0x12]
cmp r0, 0x7
bne _0814D9F8
@@ -640,7 +640,7 @@ _0814DAD4:
bge _0814DB4C
ldr r0, [r6]
movs r1, 0x1
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0814DB4C:
mov r0, r9
adds r0, 0x1
@@ -703,7 +703,7 @@ sub_814DB84: @ 814DB84
asrs r0, 23
movs r2, 0xC
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
movs r1, 0xE
ldrsh r0, [r4, r1]
@@ -739,9 +739,9 @@ _0814DBEA:
ldr r0, _0814DC20 @ =nullsub_8
str r0, [r5, 0x1C]
adds r0, r5, 0
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
adds r0, r5, 0
- bl sub_8007280
+ bl DestroySprite
_0814DC16:
pop {r4-r6}
pop {r0}
@@ -765,9 +765,9 @@ _0814DC32:
adds r0, r7
ldrh r4, [r0]
adds r0, r4, 0
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r4, 0
- bl sub_800874C
+ bl FreeSpriteTilesByTag
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -832,7 +832,7 @@ _0814DC80:
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _0814DCD6
.align 2, 0
_0814DCC0: .4byte gUnknown_846F2D0
@@ -844,7 +844,7 @@ _0814DCC4:
adds r0, r5, r4
ldr r0, [r0]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0814DCD6:
adds r3, r5, r4
ldr r2, [r3]
@@ -970,7 +970,7 @@ _0814DD64:
beq _0814DDDC
ldr r0, [r7]
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
b _0814DDE4
.align 2, 0
_0814DDD0: .4byte sub_814F0D8
@@ -979,7 +979,7 @@ _0814DDD8: .4byte gUnknown_846F2D7
_0814DDDC:
ldr r0, [r7]
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_0814DDE4:
mov r0, r8
adds r0, 0x1
@@ -1135,7 +1135,7 @@ sub_814DEC0: @ 814DEC0
lsls r0, 24
asrs r0, 16
movs r1, 0x4
- bl sub_80D8AA0
+ bl .gcc2_compiled._3
adds r2, r7, 0
lsls r0, 16
asrs r3, r0, 16
@@ -1540,7 +1540,7 @@ _0814E21A:
ldr r0, _0814E294 @ =gUnknown_83DF7E8
adds r1, r0
ldr r0, _0814E298 @ =gUnknown_2021CD0
- bl sub_8008D84
+ bl StringCopy
ldr r0, _0814E29C @ =gUnknown_846F4B8
ldr r1, [r0, 0x8]
ldr r0, _0814E2A0 @ =gUnknown_2021D18
@@ -1588,7 +1588,7 @@ _0814E27E:
bne _0814E2B0
ldr r0, _0814E2A8 @ =gUnknown_2021D04
ldr r1, _0814E2AC @ =gUnknown_841D020
- bl sub_8008D84
+ bl StringCopy
b _0814E2B8
.align 2, 0
_0814E294: .4byte gUnknown_83DF7E8
@@ -1601,7 +1601,7 @@ _0814E2AC: .4byte gUnknown_841D020
_0814E2B0:
ldr r0, _0814E31C @ =gUnknown_2021D04
ldr r1, _0814E320 @ =gUnknown_841D02C
- bl sub_8008D84
+ bl StringCopy
_0814E2B8:
ldr r4, _0814E31C @ =gUnknown_2021D04
strb r6, [r4]
@@ -2085,10 +2085,10 @@ _0814E6CC:
adds r4, r6, 0
adds r4, 0x82
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
b _0814E7F8
_0814E6E0:
adds r5, r6, 0
@@ -2102,7 +2102,7 @@ _0814E6E0:
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
b _0814E7F8
.align 2, 0
_0814E700: .4byte 0x0000021d
@@ -2301,10 +2301,10 @@ _0814E876:
strh r0, [r7, 0x2]
lsls r0, 24
lsrs r0, 24
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r7, 0x2]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r7, 0x2]
ldr r4, _0814E8AC @ =0x0000021d
adds r1, r4, 0
@@ -2314,7 +2314,7 @@ _0814E876:
movs r1, 0
adds r2, r4, 0
movs r3, 0xD
- bl sub_810F2E8
+ bl SetWindowBorderStyle
b _0814EA66
.align 2, 0
_0814E8A8: .4byte gUnknown_846E3F0
@@ -2438,7 +2438,7 @@ _0814E96E:
strb r1, [r0]
adds r0, 0x1
ldr r1, _0814EA28 @ =gUnknown_841D098
- bl sub_8008D84
+ bl StringCopy
movs r0, 0x3
mov r1, r8
movs r2, 0
@@ -2501,13 +2501,13 @@ _0814EA40:
movs r1, 0x1
bl sub_810F4D8
ldrb r0, [r7, 0x2]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r7, 0x2]
bl sub_8003E3C
adds r0, r4, 0
- bl sub_8077508
- bl sub_8069B34
- bl sub_806994C
+ bl DestroyTask
+ bl EnableBothScriptContexts
+ bl ScriptContext2_Disable
mov r0, r9
b _0814EA6A
_0814EA66:
@@ -2529,10 +2529,10 @@ _0814EA6C:
thumb_func_start sub_814EA7C
sub_814EA7C: @ 814EA7C
push {lr}
- bl sub_8069940
+ bl ScriptContext2_Enable
ldr r0, _0814EAC4 @ =sub_814E830
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0814EAC8 @ =gUnknown_3005090
@@ -2657,10 +2657,10 @@ _0814EB46:
adds r4, r6
strb r0, [r4]
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -2696,7 +2696,7 @@ _0814EBC6:
adds r0, r6, r1
adds r5, r0, r7
ldrb r0, [r5]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r6, 0x8]
cmp r7, r0
bne _0814EC18
@@ -2768,7 +2768,7 @@ _0814EC4C:
bcc _0814EBC6
_0814EC66:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x14
pop {r3}
mov r8, r3
@@ -2813,7 +2813,7 @@ _0814EC9C:
movs r0, 0x2
str r0, [sp, 0x4]
movs r0, 0x3
- bl sub_8002124
+ bl CopyToBgTilemapBufferRect
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -2822,7 +2822,7 @@ _0814ECCA:
cmp r5, r0
bcc _0814EC9C
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
add sp, 0x8
pop {r4-r6}
pop {r0}
@@ -2845,19 +2845,19 @@ sub_814ECE0: @ 814ECE0
_0814ECF6:
lsls r0, r5, 3
adds r0, r4
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
cmp r5, 0x3
bls _0814ECF6
ldr r0, _0814EEF0 @ =gUnknown_846F320
- bl sub_8008974
+ bl LoadSpritePalettes
ldr r0, _0814EEF4 @ =gUnknown_846F410
movs r1, 0x78
movs r2, 0x58
movs r3, 0x5
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
movs r0, 0xAC
@@ -2907,7 +2907,7 @@ _0814ED5A:
asrs r2, 16
ldr r0, _0814EEFC @ =gUnknown_846F428
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
movs r0, 0xAE
@@ -2967,7 +2967,7 @@ _0814EDD8:
adds r2, 0x88
ldr r0, _0814EF04 @ =gUnknown_846F440
movs r3, 0x6
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r5, 2
@@ -3016,7 +3016,7 @@ _0814EE3E:
ldr r0, _0814EF08 @ =gUnknown_846F458
movs r2, 0x8
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r2, r0, 24
lsls r0, r5, 2
@@ -3103,19 +3103,19 @@ sub_814EF10: @ 814EF10
adds r5, r0, 0
movs r4, 0
movs r0, 0x4
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0x3
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0x2
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0x1
- bl sub_800874C
+ bl FreeSpriteTilesByTag
movs r0, 0x4
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r0, 0x2
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r0, 0x1
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
movs r0, 0xD8
lsls r0, 1
adds r6, r5, r0
@@ -3123,7 +3123,7 @@ _0814EF46:
lsls r0, r4, 2
adds r0, r6, r0
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3143,7 +3143,7 @@ _0814EF74:
lsls r0, r4, 2
adds r0, r6, r0
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3160,7 +3160,7 @@ _0814EF90:
adds r0, r5, r2
adds r0, r1
ldr r0, [r0]
- bl sub_8007280
+ bl DestroySprite
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -3180,7 +3180,7 @@ _0814EFAC:
cmp r0, 0
beq _0814EFC8
adds r0, r2, 0
- bl sub_8007280
+ bl DestroySprite
_0814EFC8:
pop {r4-r6}
pop {r0}
@@ -3287,7 +3287,7 @@ sub_814F044: @ 814F044
asrs r0, 23
movs r2, 0xC
ldrsh r1, [r4, r2]
- bl sub_8044E30
+ bl Sin
strh r0, [r5, 0x24]
movs r1, 0xE
ldrsh r0, [r4, r1]
diff --git a/asm/unk_81507FC.s b/asm/unk_81507FC.s
index e34c3353c..bba5d9765 100644
--- a/asm/unk_81507FC.s
+++ b/asm/unk_81507FC.s
@@ -20,7 +20,7 @@ sub_81507FC: @ 81507FC
beq _081508CC
ldr r4, _081508AC @ =gUnknown_203F3E0
ldr r0, _081508B0 @ =0x00003330
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
cmp r0, 0
beq _081508CC
@@ -29,7 +29,7 @@ sub_81507FC: @ 81507FC
bl sub_81508EC
ldr r0, [r4]
str r5, [r0]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, [r4]
adds r1, 0x28
strb r0, [r1]
@@ -62,9 +62,9 @@ sub_81507FC: @ 81507FC
bl sub_8152048
ldr r0, _081508C4 @ =sub_8150A84
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r0, _081508C8 @ =sub_815201C
- bl sub_8000544
+ bl SetMainCallback2
bl sub_8153150
ldr r2, [r4]
adds r0, r2, 0
@@ -74,10 +74,10 @@ sub_81507FC: @ 81507FC
adds r1, 0x44
adds r2, 0x48
bl sub_81529A4
- bl sub_8071A94
+ bl StopMapMusic
movs r0, 0xA5
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
b _081508D2
.align 2, 0
_081508A4: .4byte gUnknown_3002044
@@ -92,7 +92,7 @@ _081508C4: .4byte sub_8150A84
_081508C8: .4byte sub_815201C
_081508CC:
adds r0, r5, 0
- bl sub_8000544
+ bl SetMainCallback2
_081508D2:
pop {r4-r6}
pop {r0}
@@ -102,9 +102,9 @@ _081508D2:
thumb_func_start sub_81508D8
sub_81508D8: @ 81508D8
push {lr}
- bl sub_80773BC
- bl sub_8006B10
- bl sub_80088F0
+ bl ResetTasks
+ bl ResetSpriteData
+ bl FreeAllSpritePalettes
pop {r0}
bx r0
thumb_func_end sub_81508D8
@@ -264,7 +264,7 @@ _081509E8:
lsrs r5, r0, 24
cmp r5, 0xA
bls _081509E8
- bl sub_800A404
+ bl GetMultiplayerId
movs r1, 0
lsls r0, 24
cmp r0, 0
@@ -276,7 +276,7 @@ _08150A26:
bl sub_800A088
mov r1, r8
strb r0, [r1]
- bl sub_800A404
+ bl GetMultiplayerId
ldr r3, [sp, 0x18]
strb r0, [r3]
movs r5, 0x1
@@ -352,7 +352,7 @@ _08150AAC:
.4byte _08150BCC
_08150ACC:
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _08150ADC @ =sub_8151750
movs r1, 0x4
bl sub_815205C
@@ -361,7 +361,7 @@ _08150ACC:
_08150ADC: .4byte sub_8151750
_08150AE0:
ldr r0, _08150B00 @ =sub_8151750
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
beq _08150AEE
@@ -453,21 +453,21 @@ _08150BA2:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
ldr r0, _08150BC8 @ =sub_8152034
- bl sub_80006F4
+ bl SetVBlankCallback
b _08150BDC
.align 2, 0
_08150BC8: .4byte sub_8152034
_08150BCC:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _08150BE8 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -487,7 +487,7 @@ _08150BE8: .4byte gUnknown_2037AB8
_08150BEC: .4byte gUnknown_203F3E0
_08150BF0:
adds r0, r1, 0
- bl sub_8077508
+ bl DestroyTask
ldr r0, _08150C04 @ =sub_81516DC
bl sub_815206C
_08150BFC:
@@ -1019,7 +1019,7 @@ _08150FFE:
adds r1, 0x4A
movs r0, 0
movs r2, 0x3C
- bl sub_800A448
+ bl SendBlock
ldr r0, [r6]
strb r4, [r0, 0x8]
ldr r1, [r6]
@@ -1032,7 +1032,7 @@ _08151010:
ldr r1, [r6]
b _0815106A
_0815101E:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -1043,7 +1043,7 @@ _0815102A:
cmp r0, 0
beq _08151040
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, [r6]
ldrb r0, [r1, 0x8]
adds r0, 0x1
@@ -1080,7 +1080,7 @@ _0815106A:
_08151074: .4byte gUnknown_203F3E0
_08151078:
movs r0, 0x1
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _08151092
@@ -1088,7 +1088,7 @@ _08151078:
bl sub_8152090
ldr r0, _08151098 @ =0x00000137
movs r1, 0x4
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
_08151092:
pop {r4-r6}
pop {r0}
@@ -1125,7 +1125,7 @@ _081510BE:
adds r1, r2, r1
movs r0, 0
movs r2, 0x3C
- bl sub_800A448
+ bl SendBlock
ldr r0, [r6]
strb r4, [r0, 0x8]
ldr r1, [r6]
@@ -1138,7 +1138,7 @@ _081510DA:
ldr r1, [r6]
b _08151140
_081510E8:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -1154,7 +1154,7 @@ _081510F4:
movs r2, 0x3C
bl memcpy
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, [r6]
ldrb r0, [r1, 0x8]
adds r0, 0x1
@@ -1192,7 +1192,7 @@ _08151148: .4byte gUnknown_2022118
_0815114C: .4byte gUnknown_203F3E0
_08151150:
movs r0, 0x1
- bl sub_8071C10
+ bl WaitFanfare
lsls r0, 24
cmp r0, 0
beq _0815118A
@@ -1216,7 +1216,7 @@ _08151150:
bl sub_8152090
ldr r0, _08151194 @ =0x00000137
movs r1, 0x4
- bl sub_8071AEC
+ bl FadeOutAndPlayNewMapMusic
_0815118A:
pop {r4-r6}
pop {r0}
@@ -1272,7 +1272,7 @@ _081511DC:
strb r0, [r1]
movs r0, 0
movs r2, 0x1
- bl sub_800A448
+ bl SendBlock
ldr r1, [r6]
b _0815128A
_08151202:
@@ -1289,7 +1289,7 @@ _08151202:
strb r2, [r0, 0x8]
b _081512AA
_0815121C:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -1310,7 +1310,7 @@ _08151228:
ldrb r0, [r0]
strb r0, [r2]
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, [r6]
ldrb r0, [r1, 0x8]
adds r0, 0x1
@@ -1456,7 +1456,7 @@ _0815136A:
strb r0, [r1]
movs r0, 0
movs r2, 0x1
- bl sub_800A448
+ bl SendBlock
ldr r0, _08151388 @ =gUnknown_203F3E0
ldr r1, [r0]
b _0815142A
@@ -1479,7 +1479,7 @@ _0815138C:
.align 2, 0
_081513A8: .4byte gUnknown_203F3E0
_081513AC:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -1506,7 +1506,7 @@ _081513C4:
ldrb r0, [r0]
strb r0, [r2]
adds r0, r4, 0
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, [r6]
ldrb r0, [r1, 0x8]
adds r0, 0x1
@@ -1674,10 +1674,10 @@ _08151512:
movs r1, 0
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _0815155E
_08151524:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _08151538 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -1715,12 +1715,12 @@ _0815156C:
ldr r4, _08151598 @ =gUnknown_203F3E0
ldr r0, [r4]
ldr r0, [r0]
- bl sub_8000544
+ bl SetMainCallback2
ldr r0, [r4]
ldrb r0, [r0, 0x4]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
bl sub_8003ECC
_08151590:
add sp, 0x4
@@ -1766,49 +1766,49 @@ _081515D8:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08151686
_081515F0:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
b _08151686
_08151642:
- bl sub_8071A94
+ bl StopMapMusic
b _08151686
_08151648:
movs r0, 0xA5
lsls r0, 1
- bl sub_8071A74
+ bl PlayNewMapMusic
bl sub_8154540
b _08151686
_08151656:
@@ -1817,17 +1817,17 @@ _08151656:
adds r0, r4, 0
movs r1, 0x10
movs r2, 0
- bl sub_80714D4
+ bl BlendPalettes
movs r0, 0
str r0, [sp]
adds r0, r4, 0
movs r1, 0
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
b _08151686
_08151676:
- bl sub_80704D0
+ bl UpdatePaletteFade
ldr r0, _08151694 @ =gUnknown_2037AB8
ldrb r1, [r0, 0x7]
movs r0, 0x80
@@ -1846,7 +1846,7 @@ _08151694: .4byte gUnknown_2037AB8
_08151698: .4byte gUnknown_203F3E0
_0815169C:
ldrb r0, [r1, 0x4]
- bl sub_8077508
+ bl DestroyTask
ldr r0, _081516D4 @ =sub_81516DC
bl sub_815206C
bl sub_8154730
@@ -1929,7 +1929,7 @@ _08151738:
bl sub_815206C
_0815173E:
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_08151744:
pop {r4,r5}
pop {r0}
@@ -1976,7 +1976,7 @@ _0815177E:
adds r1, r0
movs r0, 0
movs r2, 0x1
- bl sub_800A448
+ bl SendBlock
ldr r0, [r4]
strb r5, [r0, 0x8]
b _081517B2
@@ -1994,7 +1994,7 @@ _081517B2:
strh r0, [r6]
b _08151836
_081517BA:
- bl sub_800A4EC
+ bl GetBlockReceivedStatus
lsls r0, 24
lsrs r5, r0, 24
movs r4, 0
@@ -2022,7 +2022,7 @@ _081517D2:
strb r0, [r2]
adds r0, r4, 0
str r3, [sp]
- bl sub_800A588
+ bl ResetBlockReceivedFlag
ldr r1, [r6]
ldrb r0, [r1, 0x8]
adds r0, 0x1
@@ -2048,7 +2048,7 @@ _08151812:
cmp r0, r1
bcc _08151836
adds r0, r7, 0
- bl sub_8077508
+ bl DestroyTask
movs r0, 0x6
bl sub_81549D4
ldr r1, [r4]
@@ -2766,7 +2766,7 @@ sub_8151D98: @ 8151D98
ldrb r0, [r0]
cmp r0, 0
bne _08151DD8
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0
@@ -2815,7 +2815,7 @@ _08151E08:
ldrb r0, [r0]
cmp r0, 0
bne _08151E3A
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08151E3A
@@ -2842,7 +2842,7 @@ _08151E3A:
ldrb r0, [r0]
cmp r0, 0x9
bls _08151E6C
- bl sub_8071A94
+ bl StopMapMusic
ldr r0, [r4]
adds r0, r5
movs r1, 0x1
@@ -2952,7 +2952,7 @@ _08151F1C:
ldrb r0, [r0]
cmp r0, 0
bne _08151F4E
- bl sub_80723E0
+ bl IsSEPlaying
lsls r0, 24
cmp r0, 0
bne _08151F4E
@@ -3038,7 +3038,7 @@ _08151FC2:
ldrb r0, [r0]
cmp r0, 0x9
bls _08151FF0
- bl sub_8071A94
+ bl StopMapMusic
ldr r0, [r4]
adds r0, r5
movs r1, 0x1
@@ -3073,10 +3073,10 @@ _08152010:
thumb_func_start sub_815201C
sub_815201C: @ 815201C
push {lr}
- bl sub_8077578
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl RunTasks
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
pop {r0}
bx r0
thumb_func_end sub_815201C
@@ -3084,9 +3084,9 @@ sub_815201C: @ 815201C
thumb_func_start sub_8152034
sub_8152034: @ 8152034
push {lr}
- bl sub_8070474
- bl sub_8007320
- bl sub_8007610
+ bl TransferPlttBuffer
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
pop {r0}
bx r0
thumb_func_end sub_8152034
@@ -3108,7 +3108,7 @@ sub_815205C: @ 815205C
push {lr}
lsls r1, 24
lsrs r1, 24
- bl sub_807741C
+ bl CreateTask
pop {r0}
bx r0
thumb_func_end sub_815205C
@@ -3117,7 +3117,7 @@ sub_815205C: @ 815205C
sub_815206C: @ 815206C
push {lr}
movs r1, 0x1
- bl sub_807741C
+ bl CreateTask
ldr r1, _0815208C @ =gUnknown_203F3E0
ldr r3, [r1]
movs r2, 0
@@ -3190,13 +3190,13 @@ _081520F0:
lsls r4, r2, 3
adds r1, r4, 0
movs r0, 0x14
- bl sub_8000A38
+ bl SetGpuReg
negs r4, r4
lsls r4, 16
lsrs r4, 16
movs r0, 0x18
adds r1, r4, 0
- bl sub_8000A38
+ bl SetGpuReg
_08152108:
movs r0, 0
_0815210A:
@@ -3534,7 +3534,7 @@ _08152378:
adds r1, 0xF5
add r1, r8
ldrb r6, [r1]
- bl sub_8044EC8
+ bl Random
movs r1, 0x1
ands r1, r0
cmp r1, 0
@@ -5422,7 +5422,7 @@ _0815316C:
_08153170:
movs r4, 0x2
_08153172:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0xA
@@ -6319,12 +6319,12 @@ _081537C6:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x5
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _081537F8
adds r0, r4, 0
movs r1, 0x41
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0x55
bne _081537F8
movs r0, 0x1
@@ -6354,7 +6354,7 @@ sub_8153810: @ 8153810
ldr r4, _0815382C @ =sub_8153830
adds r0, r4, 0
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
bl _call_via_r4
@@ -6405,7 +6405,7 @@ _08153862:
.align 2, 0
_08153878: .4byte gUnknown_84755E0
_0815387C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081538CA
@@ -6418,7 +6418,7 @@ _08153888:
cmp r0, 0
beq _081538CA
ldrb r0, [r4, 0x2]
- bl sub_815036C
+ bl rbox_fill_rectangle
ldrb r0, [r4, 0x2]
movs r1, 0x1
_0815389E:
@@ -6431,15 +6431,15 @@ _081538A2:
.align 2, 0
_081538AC: .4byte gUnknown_30030F0
_081538B0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081538CA
ldrb r0, [r4, 0x2]
bl sub_8003E3C
adds r0, r5, 0
- bl sub_8077508
- bl sub_8069B34
+ bl DestroyTask
+ bl EnableBothScriptContexts
_081538CA:
pop {r4,r5}
pop {r0}
@@ -6481,7 +6481,7 @@ sub_81538D0: @ 81538D0
bl sub_8150048
adds r0, r7, 0
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, _081539DC @ =gUnknown_84755E8
ldr r2, [r0]
movs r0, 0x1
@@ -6557,7 +6557,7 @@ _08153946:
cmp r4, 0x2
ble _08153946
adds r0, r7, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
add sp, 0x30
pop {r3-r5}
mov r8, r3
@@ -6610,7 +6610,7 @@ _08153A14:
lsls r1, r4, 2
adds r1, r5
ldr r1, [r1]
- bl sub_8008D84
+ bl StringCopy
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -6679,7 +6679,7 @@ sub_8153A9C: @ 8153A9C
movs r5, 0xC0
lsls r5, 6
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r4, r0, 0
ldr r0, _08153AF0 @ =gUnknown_8478D90
ldr r1, [r0, 0x4]
@@ -6699,14 +6699,14 @@ sub_8153A9C: @ 8153A9C
str r4, [sp]
str r5, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
_08153ADC:
add r0, sp, 0x8
- bl sub_8008928
+ bl LoadSpritePalette
add r0, sp, 0x10
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x18
pop {r4,r5}
pop {r0}
@@ -6754,7 +6754,7 @@ sub_8153AFC: @ 8153AFC
movs r2, 0x18
bl memcpy
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, _08153B98 @ =gUnknown_203F3E4
mov r2, r8
lsls r4, r2, 2
@@ -6769,7 +6769,7 @@ sub_8153AFC: @ 8153AFC
mov r0, sp
movs r2, 0x88
movs r3, 0x3
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -6816,7 +6816,7 @@ _08153BBA:
thumb_func_start sub_8153BC0
sub_8153BC0: @ 8153BC0
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _08153BF0 @ =gUnknown_203F3E4
lsls r0, 24
lsrs r0, 22
@@ -6845,7 +6845,7 @@ _08153BF4: .4byte gUnknown_202063C
thumb_func_start sub_8153BF8
sub_8153BF8: @ 8153BF8
push {lr}
- bl sub_800A404
+ bl GetMultiplayerId
ldr r1, _08153C28 @ =gUnknown_203F3E4
lsls r0, 24
lsrs r0, 22
@@ -6976,7 +6976,7 @@ _08153CE4:
strh r0, [r5, 0x2E]
movs r4, 0
_08153CF2:
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
adds r1, r4, 0
@@ -7008,7 +7008,7 @@ _08153D16:
adds r0, r1
cmp r0, 0
beq _08153D30
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_08153D30:
adds r0, r4, 0x1
lsls r0, 24
@@ -7096,7 +7096,7 @@ sub_8153DA8: @ 8153DA8
lsls r0, 2
ldr r2, _08153DD0 @ =gUnknown_202063C
adds r0, r2
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -7160,7 +7160,7 @@ sub_8153E28: @ 8153E28
movs r4, 0xC0
lsls r4, 1
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r6, r0, 0
ldr r0, _08153EC8 @ =gUnknown_8478DA0
ldr r1, [r0, 0x4]
@@ -7186,12 +7186,12 @@ sub_8153E28: @ 8153E28
stm r1!, {r2-r4}
ldr r4, _08153ED4 @ =gUnknown_203F43C
movs r0, 0x40
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r4]
adds r0, r5, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
add r0, sp, 0x20
- bl sub_8008928
+ bl LoadSpritePalette
movs r4, 0
_08153E7E:
lsls r1, r4, 20
@@ -7208,7 +7208,7 @@ _08153E7E:
asrs r2, 16
mov r0, sp
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, _08153ED4 @ =gUnknown_203F43C
ldr r1, [r1]
lsls r2, r4, 1
@@ -7224,7 +7224,7 @@ _08153E7E:
bls _08153E7E
_08153EB8:
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x28
pop {r4-r6}
pop {r0}
@@ -7254,7 +7254,7 @@ _08153EDC:
adds r0, r1
cmp r0, 0
beq _08153EFA
- bl sub_8007804
+ bl DestroySpriteAndFreeResources
_08153EFA:
adds r0, r4, 0x1
lsls r0, 24
@@ -7262,7 +7262,7 @@ _08153EFA:
cmp r4, 0x9
bls _08153EDC
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r5]
pop {r4,r5}
@@ -7387,7 +7387,7 @@ _08153FD4:
ldr r1, _08154000 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -7439,7 +7439,7 @@ _08154040:
lsls r0, 2
adds r0, r6
movs r1, 0x2
- bl sub_800838C
+ bl StartSpriteAnim
b _08154092
_0815405E:
lsls r1, r4, 1
@@ -7452,7 +7452,7 @@ _0815405E:
lsls r0, 2
adds r0, r6
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
b _08154092
_08154078:
ldr r0, _081540A4 @ =gUnknown_203F43C
@@ -7466,7 +7466,7 @@ _08154078:
lsls r0, 2
adds r0, r6
movs r1, 0
- bl sub_800838C
+ bl StartSpriteAnim
_08154092:
adds r0, r4, 0x1
lsls r0, 24
@@ -7491,7 +7491,7 @@ _081540A8:
ldr r1, _081540D8 @ =gUnknown_202063C
adds r0, r1
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -7556,7 +7556,7 @@ sub_8154128: @ 8154128
movs r5, 0x90
lsls r5, 3
adds r0, r5, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r4, r0, 0
ldr r0, _08154174 @ =gUnknown_8478DCC
ldr r1, [r0, 0x4]
@@ -7574,12 +7574,12 @@ sub_8154128: @ 8154128
orrs r0, r5
str r0, [sp, 0x4]
mov r0, sp
- bl sub_80086DC
+ bl LoadSpriteSheet
_0815415E:
add r0, sp, 0x8
- bl sub_8008928
+ bl LoadSpritePalette
adds r0, r4, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -7613,7 +7613,7 @@ sub_815417C: @ 815417C
mov r9, r2
_081541A4:
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
ldr r1, _08154214 @ =gUnknown_203F400
lsls r4, r5, 2
adds r4, r1
@@ -7624,7 +7624,7 @@ _081541A4:
mov r0, sp
movs r2, 0x8
movs r3, 0x1
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -7643,7 +7643,7 @@ _081541A4:
mov r8, r4
_081541E4:
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
lsls r1, r5, 2
adds r4, r1, r7
str r0, [r4]
@@ -7656,7 +7656,7 @@ _081541E4:
mov r0, r9
movs r2, 0x39
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r7, 0xC]
b _08154234
.align 2, 0
@@ -7673,7 +7673,7 @@ _08154220:
mov r0, r9
movs r2, 0x3C
movs r3, 0
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
_08154234:
lsls r0, 24
@@ -7688,7 +7688,7 @@ _08154234:
ldr r1, _08154270 @ =gUnknown_202063C
adds r0, r1
adds r1, r5, 0
- bl sub_800838C
+ bl StartSpriteAnim
adds r0, r5, 0x1
lsls r0, 24
lsrs r5, r0, 24
@@ -7724,10 +7724,10 @@ _0815427A:
adds r0, r1
cmp r0, 0
beq _08154294
- bl sub_8007280
+ bl DestroySprite
_08154294:
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
adds r0, r5, 0x1
@@ -7749,10 +7749,10 @@ _081542AC:
adds r0, r1
cmp r0, 0
beq _081542C6
- bl sub_8007280
+ bl DestroySprite
_081542C6:
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
adds r0, r5, 0x1
@@ -7879,7 +7879,7 @@ sub_8154398: @ 8154398
lsls r0, 2
ldr r2, _081543C0 @ =gUnknown_202063C
adds r0, r2
- bl sub_800838C
+ bl StartSpriteAnim
pop {r0}
bx r0
.align 2, 0
@@ -7964,7 +7964,7 @@ sub_8154438: @ 8154438
movs r4, 0x80
lsls r4, 3
adds r0, r4, 0
- bl sub_8002BB0
+ bl AllocZeroed
adds r6, r0, 0
ldr r0, _081544DC @ =gUnknown_8478E18
ldr r1, [r0, 0x4]
@@ -7988,9 +7988,9 @@ sub_8154438: @ 8154438
stm r2!, {r3-r5}
ldm r1!, {r3-r5}
stm r2!, {r3-r5}
- bl sub_80086DC
+ bl LoadSpriteSheet
add r0, sp, 0x20
- bl sub_8008928
+ bl LoadSpritePalette
movs r5, 0
ldr r7, _081544E8 @ =gUnknown_8478E0E
adds r0, r7, 0x2
@@ -7999,7 +7999,7 @@ sub_8154438: @ 8154438
mov r8, r1
_08154492:
movs r0, 0x4
- bl sub_8002BB0
+ bl AllocZeroed
lsls r2, r5, 2
mov r3, r8
adds r4, r2, r3
@@ -8012,7 +8012,7 @@ _08154492:
ldrsh r2, [r2, r0]
mov r0, sp
movs r3, 0x4
- bl sub_8006F8C
+ bl CreateSprite
ldr r1, [r4]
lsls r0, 24
lsrs r0, 24
@@ -8024,7 +8024,7 @@ _08154492:
bls _08154492
_081544C6:
adds r0, r6, 0
- bl sub_8002BC4
+ bl Free
add sp, 0x28
pop {r3,r4}
mov r8, r3
@@ -8131,10 +8131,10 @@ _0815457E:
adds r0, r1
cmp r0, 0
beq _08154598
- bl sub_8007280
+ bl DestroySprite
_08154598:
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
adds r0, r5, 0x1
@@ -8333,13 +8333,13 @@ sub_81546EC: @ 81546EC
lsls r2, 1
movs r0, 0
movs r3, 0x1
- bl sub_80017D0
+ bl LoadBgTiles
adds r0, r4, 0
bl sub_8069788
ldr r0, [r0, 0x4]
movs r1, 0xA0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
pop {r4}
pop {r0}
bx r0
@@ -8406,7 +8406,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x1
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
ldrb r3, [r4, 0x2]
subs r3, 0x1
@@ -8418,7 +8418,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x2
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8433,7 +8433,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x3
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
subs r2, 0x1
lsls r2, 24
@@ -8445,7 +8445,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x4
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8458,7 +8458,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x6
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
subs r2, 0x1
lsls r2, 24
@@ -8473,7 +8473,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x7
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
ldrb r3, [r4, 0x4]
ldrb r0, [r4, 0x2]
@@ -8486,7 +8486,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x8
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8502,7 +8502,7 @@ sub_8154768: @ 8154768
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x9
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -8529,7 +8529,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0xA
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
ldrb r3, [r4, 0x2]
subs r3, 0x1
@@ -8541,7 +8541,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0xB
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8556,7 +8556,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0xC
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
subs r2, 0x1
lsls r2, 24
@@ -8568,7 +8568,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0xD
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8581,7 +8581,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0xF
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
subs r2, 0x1
lsls r2, 24
@@ -8596,7 +8596,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x10
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x1]
ldrb r3, [r4, 0x4]
ldrb r0, [r4, 0x2]
@@ -8609,7 +8609,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x11
- bl sub_8002554
+ bl FillBgTilemapBufferRect
ldrb r2, [r4, 0x3]
ldrb r0, [r4, 0x1]
adds r2, r0
@@ -8625,7 +8625,7 @@ sub_8154868: @ 8154868
str r6, [sp, 0x8]
movs r0, 0
movs r1, 0x12
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -8658,7 +8658,7 @@ sub_8154968: @ 8154968
strb r2, [r0]
ldr r0, _081549BC @ =sub_8154A08
movs r1, 0x3
- bl sub_807741C
+ bl CreateTask
ldr r1, [r4]
ldr r2, _081549C0 @ =0x00003004
adds r1, r2
@@ -8781,23 +8781,23 @@ _08154A88:
movs r0, 0x3
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _08154AC4 @ =gUnknown_8478A4C
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r1, _08154AC8 @ =gUnknown_84787FC
movs r0, 0x2
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
movs r0, 0x3
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0x2
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08154B08
.align 2, 0
_08154AC0: .4byte gUnknown_8478590
@@ -8805,13 +8805,13 @@ _08154AC4: .4byte gUnknown_8478A4C
_08154AC8: .4byte gUnknown_84787FC
_08154ACC:
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x3
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0x2
- bl sub_80019BC
+ bl ShowBg
ldr r0, _08154AF0 @ =gUnknown_203F440
ldr r1, [r0]
ldr r2, _08154AF4 @ =0x00003014
@@ -8975,15 +8975,15 @@ _08154BD0:
add r0, r9
adds r0, r6
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
mov r3, r10
ldr r0, [r3]
add r0, r9
adds r0, r6
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
- bl sub_800A404
+ bl FillWindowPixelBuffer
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -9052,7 +9052,7 @@ _08154CD4: .4byte gUnknown_8478E38
_08154CD8: .4byte gUnknown_203F440
_08154CDC: .4byte 0x00003014
_08154CE0:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08154D82
@@ -9068,7 +9068,7 @@ _08154CF8:
adds r0, r1
adds r0, r6
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -9076,7 +9076,7 @@ _08154CF8:
bcc _08154CF8
_08154D10:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08154D2C @ =gUnknown_203F440
ldr r1, [r0]
ldr r2, _08154D30 @ =0x00003014
@@ -9097,7 +9097,7 @@ _08154D34:
adds r0, r4
adds r0, r6
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r5]
adds r0, r4
adds r0, r6
@@ -9117,9 +9117,9 @@ _08154D5A:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08154D94 @ =gUnknown_203F440
ldr r0, [r0]
movs r3, 0xC0
@@ -9291,7 +9291,7 @@ _08154E70:
movs r1, 0
movs r3, 0x8
bl sub_8002C48
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r4, r0
@@ -9458,11 +9458,11 @@ _08155008:
ldr r0, [r4]
add r0, r8
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r4]
adds r0, r5
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r6, 0
bl sub_8154868
mov r0, r9
@@ -9480,14 +9480,14 @@ _08155060:
adds r0, r5
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, _081551B0 @ =0x00003009
mov r9, r1
add r0, r9
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r2, _081551B4 @ =gUnknown_841CD03
mov r8, r2
movs r2, 0x1
@@ -9532,7 +9532,7 @@ _08155060:
b _08155214
_081550DA:
movs r5, 0
- bl sub_800A404
+ bl GetMultiplayerId
lsls r0, 24
lsrs r0, 24
cmp r9, r0
@@ -9696,7 +9696,7 @@ _08155240: .4byte 0x00003009
_08155244: .4byte 0x00003008
_08155248: .4byte 0x00003014
_0815524C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08155270
@@ -9705,15 +9705,15 @@ _0815524C:
ldr r1, _0815528C @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldr r2, _08155290 @ =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08155270:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
bl sub_8154324
ldr r0, _08155288 @ =gUnknown_203F440
@@ -9766,13 +9766,13 @@ _081552DC:
adds r0, r5
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, _08155338 @ =0x00003009
adds r0, r1
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r6, _0815533C @ =gUnknown_841CD43
movs r2, 0x1
negs r2, r2
@@ -9828,7 +9828,7 @@ _08155370: .4byte 0x00003008
_08155374: .4byte 0x00003009
_08155378: .4byte 0x00003014
_0815537C:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081553A0
@@ -9837,15 +9837,15 @@ _0815537C:
ldr r1, _081553B4 @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldr r2, _081553B8 @ =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_081553A0:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _081553B0 @ =gUnknown_203F440
ldr r1, [r0]
ldr r0, _081553BC @ =0x00003014
@@ -9899,7 +9899,7 @@ _08155410: .4byte gUnknown_30030F0
_08155414: .4byte 0x00000bb7
_08155418: .4byte 0x00003014
_0815541C:
- bl sub_8071A94
+ bl StopMapMusic
ldr r1, [r4]
ldr r0, _08155470 @ =0x00003014
adds r1, r0
@@ -9915,7 +9915,7 @@ _0815542C:
movs r1, 0
movs r2, 0
movs r3, 0x5
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
ldr r5, _08155474 @ =gUnknown_203F440
ldr r0, [r5]
ldr r4, _08155478 @ =0x00003009
@@ -9931,7 +9931,7 @@ _0815542C:
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r6, 0
bl sub_8154868
b _081556C8
@@ -9942,21 +9942,21 @@ _08155478: .4byte 0x00003009
_0815547C: .4byte gUnknown_8475684
_08155480:
ldr r0, _08155558 @ =0x00000101
- bl sub_8071A74
+ bl PlayNewMapMusic
ldr r4, _0815555C @ =gUnknown_203F440
ldr r0, [r4]
ldr r6, _08155560 @ =0x00003008
adds r0, r6
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r4]
ldr r1, _08155564 @ =0x00003009
mov r10, r1
add r0, r10
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _08155568 @ =gUnknown_841CD58
movs r2, 0x1
negs r2, r2
@@ -10085,7 +10085,7 @@ _081555CC: .4byte 0x00003009
_081555D0: .4byte 0x00003008
_081555D4: .4byte 0x00003014
_081555D8:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _081555FC
@@ -10094,19 +10094,19 @@ _081555D8:
ldr r1, _0815561C @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldr r0, [r4]
ldr r2, _08155620 @ =0x00003009
adds r0, r2
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_081555FC:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08155624 @ =0x00000137
movs r1, 0x14
movs r2, 0xA
- bl sub_8071B20
+ bl FadeOutAndFadeInNewMapMusic
ldr r0, _08155618 @ =gUnknown_203F440
ldr r1, [r0]
ldr r0, _08155628 @ =0x00003014
@@ -10159,12 +10159,12 @@ _08155678:
ldr r5, _081556D8 @ =0x00003008
adds r0, r1, r5
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r6]
ldr r4, _081556DC @ =0x00003009
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r6]
adds r0, r5
ldrb r0, [r0]
@@ -10181,9 +10181,9 @@ _08155678:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r6]
movs r1, 0xC0
lsls r1, 6
@@ -10261,12 +10261,12 @@ _0815571E:
ldr r3, _0815578C @ =0x00003008
adds r0, r3
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
mov r1, r10
ldr r0, [r1]
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r5, 0
bl sub_8154868
mov r0, r8
@@ -10298,14 +10298,14 @@ _0815579C:
adds r0, r2, r3
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
mov r1, r10
ldr r0, [r1]
ldr r7, _08155850 @ =0x00003009
adds r0, r7
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
mov r2, r10
ldr r0, [r2]
add r0, r8
@@ -10382,7 +10382,7 @@ _0815585C: .4byte gUnknown_841793C
_08155860: .4byte gUnknown_841623B
_08155864: .4byte 0x00003014
_08155868:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0815588E
@@ -10391,16 +10391,16 @@ _08155868:
ldr r1, _0815589C @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
mov r2, r10
ldr r0, [r2]
ldr r3, _081558A0 @ =0x00003009
adds r0, r3
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_0815588E:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
mov r0, r10
ldr r1, [r0]
add r1, r9
@@ -10420,7 +10420,7 @@ _081558B0:
adds r0, r2, r4
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
mov r2, r10
ldr r0, [r2]
adds r0, r4
@@ -10578,13 +10578,13 @@ _081559EC:
ldr r5, _08155A70 @ =0x00003008
adds r0, r5
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
mov r2, r10
ldr r0, [r2]
ldr r4, _08155A74 @ =0x00003009
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
mov r3, r10
ldr r0, [r3]
adds r0, r5
@@ -10603,9 +10603,9 @@ _081559EC:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
mov r2, r10
ldr r0, [r2]
movs r3, 0xC0
@@ -10684,19 +10684,19 @@ _08155AD0:
.align 2, 0
_08155AE0: .4byte 0x00003014
_08155AE4:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08155B40
ldr r0, _08155AF8 @ =sub_80DA634
movs r1, 0
- bl sub_807741C
+ bl CreateTask
b _08155B08
.align 2, 0
_08155AF8: .4byte sub_80DA634
_08155AFC:
ldr r0, _08155B14 @ =sub_80DA634
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
cmp r0, 0
bne _08155B40
@@ -10719,9 +10719,9 @@ _08155B18:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _08155B48 @ =gUnknown_203F440
ldr r0, [r0]
movs r1, 0xC0
@@ -10773,7 +10773,7 @@ _08155B7A:
ldr r0, [r5]
adds r0, r2
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
bl sub_8154868
b _08155C08
@@ -10785,7 +10785,7 @@ _08155BA4:
adds r0, r2, r4
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -10813,7 +10813,7 @@ _08155BE0: .4byte 0x00003008
_08155BE4: .4byte gUnknown_841CE24
_08155BE8: .4byte 0x00003014
_08155BEC:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08155C02
@@ -10821,10 +10821,10 @@ _08155BEC:
ldr r1, _08155C14 @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08155C02:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08155C08:
ldr r1, [r5]
adds r1, r6
@@ -10858,7 +10858,7 @@ sub_8155C2C: @ 8155C2C
ldr r4, _08155C7C @ =0x00003008
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r5]
adds r0, r4
ldrb r0, [r0]
@@ -10871,9 +10871,9 @@ sub_8155C2C: @ 8155C2C
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r5]
movs r1, 0xC0
lsls r1, 6
@@ -10926,7 +10926,7 @@ _08155CB2:
ldr r0, [r6]
adds r0, r2
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
adds r0, r4, 0
bl sub_8154868
ldr r1, [r6]
@@ -10957,7 +10957,7 @@ _08155D08:
adds r0, r1, r4
ldrb r0, [r0]
movs r1, 0x11
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -10985,7 +10985,7 @@ _08155D44: .4byte 0x00003008
_08155D48: .4byte gUnknown_841CDEB
_08155D4C: .4byte 0x00003014
_08155D50:
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _08155D66
@@ -10993,10 +10993,10 @@ _08155D50:
ldr r1, _08155D78 @ =0x00003008
adds r0, r1
ldrb r0, [r0]
- bl sub_8003FA0
+ bl PutWindowTilemap
_08155D66:
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r1, [r6]
adds r1, r7
_08155D70:
@@ -11032,7 +11032,7 @@ _08155D9C:
ldr r4, _08155DF0 @ =0x00003008
adds r0, r4
ldrb r0, [r0]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldr r0, [r6]
adds r0, r4
ldrb r0, [r0]
@@ -11045,9 +11045,9 @@ _08155D9C:
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002454
+ bl FillBgTilemapBufferRect_Palette0
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, [r6]
movs r2, 0xC0
lsls r2, 6
@@ -11064,15 +11064,15 @@ _08155DEC: .4byte 0x00003024
_08155DF0: .4byte 0x00003008
thumb_func_end sub_8155C80
- thumb_func_start sub_8155DF4
-sub_8155DF4: @ 8155DF4
+ thumb_func_start unused_0
+unused_0: @ 8155DF4
push {r4,lr}
ldr r4, _08155E18 @ =gUnknown_203F440
ldr r0, [r4]
ldr r1, _08155E1C @ =0x00003004
adds r0, r1
ldrb r0, [r0]
- bl sub_8077508
+ bl DestroyTask
ldr r0, [r4]
movs r1, 0xC0
lsls r1, 6
@@ -11085,7 +11085,7 @@ sub_8155DF4: @ 8155DF4
.align 2, 0
_08155E18: .4byte gUnknown_203F440
_08155E1C: .4byte 0x00003004
- thumb_func_end sub_8155DF4
+ thumb_func_end unused_0
thumb_func_start nullsub_98
nullsub_98: @ 8155E20
@@ -11237,7 +11237,7 @@ _08155EC6:
ldr r0, [r2, 0x8]
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
movs r0, 0
bl sub_8001618
ldr r1, _08155FD8 @ =gUnknown_847565C
@@ -11247,57 +11247,57 @@ _08155EC6:
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x2
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x3
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
bl sub_80F6C6C
bl sub_80F6C98
movs r1, 0x82
lsls r1, 5
movs r0, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r4, _08155FDC @ =gUnknown_203F440
ldr r1, [r4]
movs r0, 0x3
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r2, 0x80
lsls r2, 5
adds r1, r2
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, [r4]
movs r0, 0x80
lsls r0, 6
adds r1, r0
movs r0, 0x2
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
add sp, 0x8
pop {r3}
mov r8, r3
@@ -11343,12 +11343,12 @@ _08156020:
ldr r0, _0815602C @ =gUnknown_84758A8
movs r1, 0
movs r2, 0x40
- bl sub_80703EC
+ bl LoadPalette
b _08156082
.align 2, 0
_0815602C: .4byte gUnknown_84758A8
_08156030:
- bl sub_80F6808
+ bl reset_temp_tile_data_buffers
b _08156082
_08156036:
ldr r1, _08156040 @ =gUnknown_8475B3C
@@ -11366,12 +11366,12 @@ _08156044:
_0815604C:
movs r2, 0
movs r3, 0
- bl sub_80F6878
+ bl decompress_and_copy_tile_data_to_vram
b _08156082
.align 2, 0
_08156058: .4byte gUnknown_84763CC
_0815605C:
- bl sub_80F682C
+ bl free_temp_tile_data_buffers_if_possible
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -11379,10 +11379,10 @@ _0815605C:
b _08156090
_0815606A:
movs r0, 0x3
- bl sub_8150408
+ bl stdpal_get
movs r1, 0xD0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
b _08156082
_0815607A:
movs r0, 0
diff --git a/asm/unk_8159F40.s b/asm/unk_8159F40.s
index 751b63eca..7bffe196f 100644
--- a/asm/unk_8159F40.s
+++ b/asm/unk_8159F40.s
@@ -21,7 +21,7 @@ sub_8159F40: @ 8159F40
lsls r0, 9
str r0, [r1]
bl sub_803DA14
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
ldr r1, _08159F94 @ =gUnknown_84792D0
ldr r0, _08159F98 @ =gUnknown_20370C0
ldrh r0, [r0]
@@ -72,7 +72,7 @@ _08159FAE:
str r0, [sp, 0x8]
adds r0, r6, 0
movs r3, 0
- bl sub_803DE00
+ bl CreateMonWithGenderNatureLetter
movs r5, 0
adds r7, 0x1
mov r0, r8
@@ -83,7 +83,7 @@ _08159FD4:
lsls r2, r5, 24
lsrs r2, 24
adds r0, r6, 0
- bl sub_803E964
+ bl SetMonMoveSlot
adds r4, 0x2
adds r5, 0x1
cmp r5, 0x3
@@ -792,7 +792,7 @@ sub_815A540: @ 815A540
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r0, sp
movs r1, 0
ldrsh r0, [r0, r1]
@@ -806,7 +806,7 @@ sub_815A540: @ 815A540
cmp r0, 0
bne _0815A5A4
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _0815A5A4
@@ -825,7 +825,7 @@ sub_815A540: @ 815A540
lsls r0, 2
ldr r1, _0815A5B8 @ =gUnknown_202063C
adds r0, r1
- bl sub_8007280
+ bl DestroySprite
_0815A5A4:
add sp, 0x4
pop {r4}
diff --git a/asm/unk_815C980.s b/asm/unk_815C980.s
index 260f3ec46..eae2dd237 100644
--- a/asm/unk_815C980.s
+++ b/asm/unk_815C980.s
@@ -16,7 +16,7 @@ sub_815C980: @ 815C980
bl sub_815C9F4
_0815C990:
movs r0, 0x8
- bl sub_8002B9C
+ bl Alloc
str r0, [r5]
cmp r0, 0
bne _0815C9A4
@@ -28,13 +28,13 @@ _0815C9A4:
lsls r0, r4, 3
subs r0, r4
lsls r0, 2
- bl sub_8002B9C
+ bl Alloc
ldr r1, [r5]
str r0, [r1, 0x4]
cmp r0, 0
bne _0815C9C0
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0
b _0815C9EC
_0815C9C0:
@@ -95,11 +95,11 @@ _0815CA1E:
ldr r0, _0815CA3C @ =gUnknown_203F454
ldr r0, [r0]
ldr r0, [r0, 0x4]
- bl sub_8002BC4
+ bl Free
_0815CA28:
ldr r4, _0815CA3C @ =gUnknown_203F454
ldr r0, [r4]
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_0815CA34:
@@ -149,7 +149,7 @@ sub_815CA40: @ 815CA40
beq _0815CB00
ldr r0, [r5, 0x8]
ldrh r0, [r0, 0x6]
- bl sub_8008804
+ bl GetSpriteTileStartByTag
ldr r2, [r6]
ldr r1, [r2, 0x4]
adds r1, r4, r1
@@ -167,7 +167,7 @@ sub_815CA40: @ 815CA40
cmp r0, 0
beq _0815CAC0
adds r0, r1, 0
- bl sub_80086DC
+ bl LoadSpriteSheet
b _0815CAE0
.align 2, 0
_0815CAB8: .4byte gUnknown_203F454
@@ -186,7 +186,7 @@ _0815CAC0:
orrs r1, r0
str r1, [sp, 0x4]
mov r0, sp
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
_0815CAE0:
ldr r1, [r6]
ldr r1, [r1, 0x4]
@@ -213,7 +213,7 @@ _0815CB08: .4byte 0x0000ffff
_0815CB0C:
ldr r0, [r5, 0xC]
ldrh r0, [r0, 0x4]
- bl sub_80089E8
+ bl IndexOfSpritePaletteTag
ldr r6, _0815CC24 @ =gUnknown_203F454
ldr r1, [r6]
ldr r1, [r1, 0x4]
@@ -230,7 +230,7 @@ _0815CB0C:
cmp r0, 0xFF
bne _0815CB40
ldr r0, [r5, 0xC]
- bl sub_8008928
+ bl LoadSpritePalette
ldr r1, [r6]
ldr r1, [r1, 0x4]
adds r1, r4, r1
@@ -1045,7 +1045,7 @@ _0815D152:
lsls r0, 2
adds r0, r1
ldrh r0, [r0, 0x10]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
_0815D16E:
adds r0, r4, 0
bl sub_815D2E0
@@ -1058,7 +1058,7 @@ _0815D16E:
lsls r0, 2
adds r0, r1
ldrh r0, [r0, 0x12]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
_0815D18A:
ldr r0, _0815D1A0 @ =gUnknown_203F454
ldr r0, [r0]
diff --git a/asm/unk_815EDDC.s b/asm/unk_815EDDC.s
index 50e489b7b..0cd5ec18f 100644
--- a/asm/unk_815EDDC.s
+++ b/asm/unk_815EDDC.s
@@ -335,7 +335,7 @@ sub_815F014: @ 815F014
movs r1, 0
adds r2, r4, 0
adds r3, r5, 0
- bl sub_810F2E8
+ bl SetWindowBorderStyle
ldr r2, _0815F06C @ =gUnknown_8416655
movs r4, 0
str r4, [sp]
@@ -415,9 +415,9 @@ sub_815F094: @ 815F094
strb r0, [r4]
ldrb r0, [r4]
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldrb r0, [r4]
- bl sub_8003FA0
+ bl PutWindowTilemap
ldrb r0, [r4]
ldr r5, _0815F110 @ =0x0000021d
adds r1, r5, 0
@@ -446,7 +446,7 @@ sub_815F114: @ 815F114
push {r4,lr}
ldr r4, _0815F134 @ =gUnknown_203F464
ldrb r0, [r4]
- bl sub_80040B8
+ bl ClearWindowTilemap
ldrb r0, [r4]
movs r1, 0x1
bl sub_810F4D8
diff --git a/asm/unk_815F138.s b/asm/unk_815F138.s
index 77addc77a..a89378d02 100644
--- a/asm/unk_815F138.s
+++ b/asm/unk_815F138.s
@@ -29,7 +29,7 @@ sub_815F138: @ 815F138
ldr r0, _0815F190 @ =sub_815F1AC
movs r1, 0x50
str r3, [sp]
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r0, 24
ldr r2, _0815F194 @ =gUnknown_3005090
@@ -59,7 +59,7 @@ _0815F194: .4byte gUnknown_3005090
sub_815F198: @ 815F198
push {lr}
ldr r0, _0815F1A8 @ =sub_815F1AC
- bl sub_8077650
+ bl FuncIsActiveTask
lsls r0, 24
lsrs r0, 24
pop {r1}
@@ -141,14 +141,14 @@ _0815F21C:
lsls r0, 2
ldr r4, _0815F25C @ =gUnknown_202063C
adds r0, r4
- bl sub_80077D8
+ bl FreeSpriteOamMatrix
movs r3, 0xE
ldrsh r1, [r5, r3]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
_0815F252:
ldrh r0, [r5]
adds r0, 0x1
@@ -168,20 +168,20 @@ _0815F260:
lsls r0, 2
ldr r4, _0815F2A8 @ =gUnknown_202063C
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
movs r0, 0x12
ldrsh r1, [r5, r0]
lsls r0, r1, 4
adds r0, r1
lsls r0, 2
adds r0, r4
- bl sub_8007280
+ bl DestroySprite
ldrh r0, [r5, 0x4]
- bl sub_800874C
+ bl FreeSpriteTilesByTag
ldrh r0, [r5, 0x6]
- bl sub_8008A30
+ bl FreeSpritePaletteByTag
adds r0, r6, 0
- bl sub_8077508
+ bl DestroyTask
_0815F29E:
add sp, 0xC
pop {r4-r6}
@@ -278,7 +278,7 @@ _0815F340:
strh r0, [r4, 0x2E]
adds r0, r4, 0
movs r1, 0x2
- bl sub_800843C
+ bl StartSpriteAffineAnim
b _0815F3D8
_0815F362:
ldrh r0, [r4, 0x22]
@@ -300,7 +300,7 @@ _0815F362:
lsls r1, 24
lsrs r1, 24
adds r0, r4, 0
- bl sub_800838C
+ bl StartSpriteAnim
movs r0, 0
strh r0, [r4, 0x32]
b _0815F3BA
@@ -326,7 +326,7 @@ _0815F39A:
adds r0, r4, 0
movs r1, 0x3
_0815F3B6:
- bl sub_800843C
+ bl StartSpriteAffineAnim
_0815F3BA:
ldrh r0, [r4, 0x2E]
adds r0, 0x1
@@ -588,9 +588,9 @@ sub_815F564: @ 815F564
orrs r0, r1
str r0, [r4, 0x4]
mov r0, sp
- bl sub_800EBCC
+ bl LoadCompressedObjectPic
adds r0, r4, 0
- bl sub_8008928
+ bl LoadSpritePalette
add sp, 0x10
pop {r4}
pop {r0}
@@ -634,7 +634,7 @@ sub_815F5BC: @ 815F5BC
adds r1, r2, 0
adds r2, r6, 0
mov r3, r8
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
add sp, 0x18
@@ -688,7 +688,7 @@ sub_815F610: @ 815F610
adds r1, r2, 0
adds r2, r5, 0
mov r3, r10
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r3, r9
@@ -700,7 +700,7 @@ sub_815F610: @ 815F610
adds r1, r4, 0
adds r2, r5, 0
mov r3, r10
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
mov r4, r8
@@ -735,7 +735,7 @@ sub_815F610: @ 815F610
lsls r0, 2
adds r0, r2
movs r1, 0x1
- bl sub_800838C
+ bl StartSpriteAnim
add sp, 0x18
pop {r3-r5}
mov r8, r3
diff --git a/asm/unk_text_util.s b/asm/unk_text_util.s
index a3008edca..5c8b1c71b 100644
--- a/asm/unk_text_util.s
+++ b/asm/unk_text_util.s
@@ -70,7 +70,7 @@ _0813CCE8:
cmp r1, 0
beq _0813CCFE
adds r0, r2, 0
- bl sub_8008D84
+ bl StringCopy
adds r2, r0, 0
_0813CCFE:
adds r4, 0x1
diff --git a/asm/unknown_task.s b/asm/unknown_task.s
index 30f51a3fc..fbe75f05e 100644
--- a/asm/unknown_task.s
+++ b/asm/unknown_task.s
@@ -5,8 +5,8 @@
.text
- thumb_func_start sub_8087E64
-sub_8087E64: @ 8087E64
+ thumb_func_start remove_some_task
+remove_some_task: @ 8087E64
push {r4,lr}
ldr r4, _08087E94 @ =gUnknown_2039600
movs r0, 0
@@ -24,7 +24,7 @@ sub_8087E64: @ 8087E64
ldrb r0, [r4, 0x18]
cmp r0, 0xFF
beq _08087E8E
- bl sub_8077508
+ bl DestroyTask
movs r0, 0xFF
strb r0, [r4, 0x18]
_08087E8E:
@@ -36,10 +36,10 @@ _08087E94: .4byte gUnknown_2039600
_08087E98: .4byte 0x040000b0
_08087E9C: .4byte 0x0000c5ff
_08087EA0: .4byte 0x00007fff
- thumb_func_end sub_8087E64
+ thumb_func_end remove_some_task
- thumb_func_start sub_8087EA4
-sub_8087EA4: @ 8087EA4
+ thumb_func_start dp12_8087EA4
+dp12_8087EA4: @ 8087EA4
push {r4,lr}
sub sp, 0x4
mov r0, sp
@@ -68,7 +68,7 @@ sub_8087EA4: @ 8087EA4
_08087ED8: .4byte gUnknown_2038700
_08087EDC: .4byte 0x01000780
_08087EE0: .4byte gUnknown_2039600
- thumb_func_end sub_8087EA4
+ thumb_func_end dp12_8087EA4
thumb_func_start sub_8087EE4
sub_8087EE4: @ 8087EE4
@@ -230,8 +230,8 @@ _08088018: .4byte gUnknown_2039600
_0808801C: .4byte gUnknown_2038700
thumb_func_end sub_8088000
- thumb_func_start sub_8088020
-sub_8088020: @ 8088020
+ thumb_func_start task00_for_dp12
+task00_for_dp12: @ 8088020
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -246,7 +246,7 @@ sub_8088020: @ 8088020
cmp r0, 0
beq _08088050
mov r0, r12
- bl sub_8077508
+ bl DestroyTask
ldr r1, _0808804C @ =gUnknown_2039600
movs r0, 0xFF
strb r0, [r1, 0x18]
@@ -454,7 +454,7 @@ _080881D0:
.align 2, 0
_080881E0: .4byte gUnknown_2038700
_080881E4: .4byte gUnknown_2039600
- thumb_func_end sub_8088020
+ thumb_func_end task00_for_dp12
thumb_func_start sub_80881E8
sub_80881E8: @ 80881E8
@@ -538,7 +538,7 @@ sub_8088230: @ 8088230
lsls r0, 24
lsrs r0, 24
mov r10, r0
- bl sub_8087EA4
+ bl dp12_8087EA4
ldr r0, _0808833C @ =0x04000010
add r0, r9
str r0, [sp]
@@ -554,9 +554,9 @@ sub_8088230: @ 8088230
ldr r1, [sp, 0x4]
ldr r2, [sp, 0x8]
bl sub_8087EE4
- ldr r0, _08088344 @ =sub_8088020
+ ldr r0, _08088344 @ =task00_for_dp12
movs r1, 0
- bl sub_807741C
+ bl CreateTask
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _08088348 @ =gUnknown_3005090
@@ -633,7 +633,7 @@ _0808832A:
.align 2, 0
_0808833C: .4byte 0x04000010
_08088340: .4byte 0xa2600001
-_08088344: .4byte sub_8088020
+_08088344: .4byte task00_for_dp12
_08088348: .4byte gUnknown_3005090
_0808834C: .4byte gUnknown_2039600
_08088350: .4byte gUnknown_203961C
diff --git a/asm/util.s b/asm/util.s
index 846f767bb..160b722af 100644
--- a/asm/util.s
+++ b/asm/util.s
@@ -5,15 +5,15 @@
.text
- thumb_func_start sub_8044EF8
-sub_8044EF8: @ 8044EF8
+ thumb_func_start CreateInvisibleSpriteWithCallback
+CreateInvisibleSpriteWithCallback: @ 8044EF8
push {r4-r6,lr}
adds r6, r0, 0
ldr r0, _08044F2C @ =gUnknown_825E4DC
movs r1, 0xF8
movs r2, 0xA8
movs r3, 0xE
- bl sub_8006F8C
+ bl CreateSprite
lsls r0, 24
lsrs r0, 24
ldr r5, _08044F30 @ =gUnknown_202063C
@@ -35,18 +35,18 @@ sub_8044EF8: @ 8044EF8
.align 2, 0
_08044F2C: .4byte gUnknown_825E4DC
_08044F30: .4byte gUnknown_202063C
- thumb_func_end sub_8044EF8
+ thumb_func_end CreateInvisibleSpriteWithCallback
- thumb_func_start sub_8044F34
-sub_8044F34: @ 8044F34
+ thumb_func_start StoreWordInTwoHalfwords
+StoreWordInTwoHalfwords: @ 8044F34
strh r1, [r0]
lsrs r1, 16
strh r1, [r0, 0x2]
bx lr
- thumb_func_end sub_8044F34
+ thumb_func_end StoreWordInTwoHalfwords
- thumb_func_start sub_8044F3C
-sub_8044F3C: @ 8044F3C
+ thumb_func_start LoadWordFromTwoHalfwords
+LoadWordFromTwoHalfwords: @ 8044F3C
ldrh r2, [r0]
movs r3, 0x2
ldrsh r0, [r0, r3]
@@ -54,10 +54,10 @@ sub_8044F3C: @ 8044F3C
orrs r2, r0
str r2, [r1]
bx lr
- thumb_func_end sub_8044F3C
+ thumb_func_end LoadWordFromTwoHalfwords
- thumb_func_start sub_8044F4C
-sub_8044F4C: @ 8044F4C
+ thumb_func_start SetBgAffineStruct
+SetBgAffineStruct: @ 8044F4C
push {r4-r7,lr}
mov r7, r8
push {r7}
@@ -79,10 +79,10 @@ sub_8044F4C: @ 8044F4C
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_8044F4C
+ thumb_func_end SetBgAffineStruct
- thumb_func_start sub_8044F78
-sub_8044F78: @ 8044F78
+ thumb_func_start DoBgAffineSet
+DoBgAffineSet: @ 8044F78
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -107,7 +107,7 @@ sub_8044F78: @ 8044F78
str r5, [sp, 0x8]
str r6, [sp, 0xC]
add r0, sp, 0x10
- bl sub_8044F4C
+ bl SetBgAffineStruct
add r0, sp, 0x10
mov r1, r8
movs r2, 0x1
@@ -118,7 +118,7 @@ sub_8044F78: @ 8044F78
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_8044F78
+ thumb_func_end DoBgAffineSet
thumb_func_start sub_8044FC4
sub_8044FC4: @ 8044FC4
@@ -359,8 +359,8 @@ _0804517A:
_0804518C: .4byte 0x84000008
thumb_func_end sub_8044FC4
- thumb_func_start sub_8045190
-sub_8045190: @ 8045190
+ thumb_func_start CountTrailingZeroBits
+CountTrailingZeroBits: @ 8045190
push {lr}
adds r2, r0, 0
movs r1, 0
@@ -383,10 +383,10 @@ _080451A4:
_080451B2:
pop {r1}
bx r1
- thumb_func_end sub_8045190
+ thumb_func_end CountTrailingZeroBits
- thumb_func_start sub_80451B8
-sub_80451B8: @ 80451B8
+ thumb_func_start CalcCRC16
+CalcCRC16: @ 80451B8
push {r4-r7,lr}
adds r7, r0, 0
adds r4, r1, 0
@@ -435,10 +435,10 @@ _08045204:
pop {r4-r7}
pop {r1}
bx r1
- thumb_func_end sub_80451B8
+ thumb_func_end CalcCRC16
- thumb_func_start sub_8045210
-sub_8045210: @ 8045210
+ thumb_func_start CalcCRC16WithTable
+CalcCRC16WithTable: @ 8045210
push {r4-r6,lr}
adds r5, r0, 0
adds r4, r1, 0
@@ -473,10 +473,10 @@ _0804523E:
.align 2, 0
_0804524C: .4byte 0x00001121
_08045250: .4byte gUnknown_825E50C
- thumb_func_end sub_8045210
+ thumb_func_end CalcCRC16WithTable
- thumb_func_start sub_8045254
-sub_8045254: @ 8045254
+ thumb_func_start CalcByteArraySum
+CalcByteArraySum: @ 8045254
push {r4,lr}
adds r4, r0, 0
movs r3, 0
@@ -495,6 +495,6 @@ _0804526C:
pop {r4}
pop {r1}
bx r1
- thumb_func_end sub_8045254
+ thumb_func_end CalcByteArraySum
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/vs_seeker.s b/asm/vs_seeker.s
index f9ecd9533..276c71fb5 100644
--- a/asm/vs_seeker.s
+++ b/asm/vs_seeker.s
@@ -30,7 +30,7 @@ _0810C686:
bls _0810C686
adds r5, r7, 0
ldr r0, _0810C6C8 @ =0x00000434
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
bl sub_810C808
bl sub_810C96C
@@ -40,7 +40,7 @@ _0810C686:
cmp r0, 0
bne _0810C6D0
ldr r0, [r5]
- bl sub_8002BC4
+ bl Free
ldr r2, _0810C6CC @ =gUnknown_81C137C
b _0810C6DC
.align 2, 0
@@ -52,13 +52,13 @@ _0810C6D0:
cmp r0, 0x1
bne _0810C6F0
ldr r0, [r7]
- bl sub_8002BC4
+ bl Free
ldr r2, _0810C6E8 @ =gUnknown_81C13D6
_0810C6DC:
ldr r3, _0810C6EC @ =sub_80A1E0C
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
b _0810C718
.align 2, 0
_0810C6E8: .4byte gUnknown_81C13D6
@@ -73,7 +73,7 @@ _0810C6F0:
movs r1, 0
bl sub_80A2294
movs r0, 0x41
- bl sub_8083444
+ bl FieldEffectStart
ldr r1, _0810C728 @ =gUnknown_3005090
adds r0, r6, r4
lsls r0, 3
@@ -150,7 +150,7 @@ sub_810C760: @ 810C760
strh r0, [r4, 0x4]
_0810C794:
movs r0, 0x41
- bl sub_808382C
+ bl FieldEffectActiveListContains
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -176,7 +176,7 @@ _0810C794:
ldrb r2, [r0, 0x4]
ldr r3, _0810C7FC @ =gUnknown_8453F5C
movs r0, 0xFF
- bl sub_8097434
+ bl ScriptMovement_StartObjectMovementScript
ldr r1, _0810C800 @ =gUnknown_3005090
lsls r0, r5, 2
adds r0, r5
@@ -253,7 +253,7 @@ _0810C846:
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
ldr r0, [r7]
adds r0, r4
ldrb r1, [r6]
@@ -326,7 +326,7 @@ sub_810C8EC: @ 810C8EC
ldrb r1, [r0, 0x5]
ldrb r2, [r0, 0x4]
movs r0, 0xFF
- bl sub_809748C
+ bl ScriptMovement_IsObjectMovementFinished
lsls r0, 24
cmp r0, 0
beq _0810C962
@@ -343,7 +343,7 @@ sub_810C8EC: @ 810C8EC
ldr r3, _0810C938 @ =sub_80A1E0C
adds r0, r4, 0
movs r1, 0x2
- bl sub_80F7808
+ bl DisplayItemMessageOnField
b _0810C95A
.align 2, 0
_0810C928: .4byte gUnknown_3005008
@@ -360,13 +360,13 @@ _0810C944:
movs r1, 0x1
bl sub_80F6F54
bl sub_80696C0
- bl sub_806994C
+ bl ScriptContext2_Disable
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0810C95A:
ldr r0, _0810C968 @ =gUnknown_203ADB8
ldr r0, [r0]
- bl sub_8002BC4
+ bl Free
_0810C962:
pop {r4,r5}
pop {r0}
@@ -451,7 +451,7 @@ _0810C9EC:
adds r0, r5
ldrh r0, [r0, 0x4]
mov r8, r0
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
bne _0810CA20
@@ -492,7 +492,7 @@ _0810CA20:
_0810CA48: .4byte gUnknown_8453F62
_0810CA4C: .4byte 0x00000431
_0810CA50:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -546,7 +546,7 @@ _0810CAA0:
lsls r0, 2
ldr r1, _0810CB5C @ =gUnknown_2036E38
adds r0, r1
- bl sub_805F818
+ bl npc_coords_shift_still
ldr r0, [r6]
adds r0, r5
ldr r1, _0810CB60 @ =gUnknown_8453F64
@@ -700,7 +700,7 @@ _0810CBDE:
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
mov r3, sp
- bl sub_805DF84
+ bl TryGetFieldObjectIdByLocalIdAndMap
mov r0, sp
ldrb r1, [r0]
lsls r0, r1, 3
@@ -943,7 +943,7 @@ sub_810CDB4: @ 810CDB4
lsls r0, r1, 4
adds r0, r4
ldrh r0, [r0]
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _0810CDDE
@@ -1161,7 +1161,7 @@ _0810CF4E:
thumb_func_start sub_810CF54
sub_810CF54: @ 810CF54
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
movs r1, 0xC0
lsls r1, 10
@@ -1366,7 +1366,7 @@ sub_810D0FC: @ 810D0FC
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
mov r1, sp
mov r0, sp
ldrh r0, [r0]
@@ -1441,7 +1441,7 @@ _0810D18C:
cmp r0, r7
beq _0810D1A2
ldrh r0, [r4]
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
bne _0810D1A2
@@ -1497,7 +1497,7 @@ _0810D1DE:
ldr r0, [r6]
adds r0, r4
ldrh r0, [r0, 0x4]
- bl sub_8080424
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1552,14 +1552,14 @@ sub_810D24C: @ 810D24C
lsls r0, 2
ldr r1, _0810D278 @ =gUnknown_2036E38
adds r0, r1
- bl sub_80689F4
+ bl npc_sync_anim_pause_bits
ldrb r0, [r4, 0x6]
ldr r1, _0810D27C @ =gUnknown_3005008
ldr r2, [r1]
ldrb r1, [r2, 0x5]
ldrb r2, [r2, 0x4]
adds r3, r5, 0
- bl sub_8097434
+ bl ScriptMovement_StartObjectMovementScript
pop {r4,r5}
pop {r0}
bx r0
@@ -1705,7 +1705,7 @@ _0810D340:
adds r0, r7
ldrb r1, [r0]
adds r0, r4, 0
- bl sub_8063610
+ bl npc_set_running_behaviour_etc
_0810D380:
ldr r0, [r5]
movs r3, 0x84
diff --git a/asm/wild_encounter.s b/asm/wild_encounter.s
index 51657fcbc..8ea971d38 100644
--- a/asm/wild_encounter.s
+++ b/asm/wild_encounter.s
@@ -17,7 +17,7 @@ _08082748: .4byte gUnknown_20386DC
thumb_func_start sub_808274C
sub_808274C: @ 808274C
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -124,7 +124,7 @@ _08082802:
thumb_func_start sub_8082808
sub_8082808: @ 8082808
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -177,7 +177,7 @@ sub_808285C: @ 808285C
lsrs r4, r0, 24
adds r6, r4, 0
movs r5, 0
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -279,7 +279,7 @@ _0808290C:
adds r4, 0x1
lsls r4, 24
lsrs r4, 24
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
adds r1, r4, 0
@@ -410,10 +410,10 @@ sub_80829FC: @ 80829FC
lsrs r6, r1, 24
lsls r2, 24
lsrs r5, r2, 24
- bl sub_803DA34
+ bl ZeroEnemyPartyMons
cmp r4, 0xC9
beq _08082A3C
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x19
@@ -426,7 +426,7 @@ sub_80829FC: @ 80829FC
adds r1, r4, 0
adds r2, r6, 0
movs r3, 0x20
- bl sub_803DD98
+ bl CreateMonWithNature
b _08082A74
.align 2, 0
_08082A38: .4byte gUnknown_202402C
@@ -456,7 +456,7 @@ _08082A3C:
movs r1, 0xC9
adds r2, r6, 0
movs r3, 0x20
- bl sub_803DA54
+ bl CreateMon
_08082A74:
add sp, 0x10
pop {r4-r6}
@@ -474,9 +474,9 @@ sub_8082A88: @ 8082A88
lsls r0, 24
lsrs r5, r0, 24
_08082A8E:
- bl sub_8044EC8
+ bl Random
adds r4, r0, 0
- bl sub_8044EC8
+ bl Random
lsls r4, 16
lsls r0, 16
lsrs r0, 16
@@ -653,7 +653,7 @@ sub_8082BCC: @ 8082BCC
lsls r0, 4
str r0, [sp]
movs r0, 0x6
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08082BF6
@@ -725,7 +725,7 @@ sub_8082C58: @ 8082C58
ldr r4, _08082C94 @ =gUnknown_2024284
adds r0, r4, 0
movs r1, 0x6
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08082C84
adds r0, r4, 0
@@ -753,7 +753,7 @@ _08082C94: .4byte gUnknown_2024284
thumb_func_start sub_8082C98
sub_8082C98: @ 8082C98
push {lr}
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -845,7 +845,7 @@ _08082D44: .4byte gUnknown_20386DC
_08082D48: .4byte 0x0000ffff
_08082D4C: .4byte gUnknown_83C9CB8
_08082D50:
- bl sub_8141FAC
+ bl TryStartRoamerEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -869,7 +869,7 @@ _08082D78:
cmp r0, 0x2
beq _08082DA8
movs r0, 0x8
- bl sub_805C74C
+ bl TestPlayerAvatarFlags
lsls r0, 24
cmp r0, 0
beq _08082E46
@@ -917,7 +917,7 @@ _08082DD2:
lsrs r0, 24
cmp r0, 0x1
bne _08082D3A
- bl sub_8141FAC
+ bl TryStartRoamerEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1028,7 +1028,7 @@ sub_8082EC0: @ 8082EC0
adds r4, 0x2
mov r0, sp
adds r1, r4, 0
- bl sub_805C538
+ bl PlayerGetDestCoords
bl sub_8082934
lsls r0, 16
lsrs r5, r0, 16
@@ -1044,7 +1044,7 @@ sub_8082EC0: @ 8082EC0
bl sub_8058F48
cmp r0, 0x1
bne _08082F1C
- bl sub_8141FAC
+ bl TryStartRoamerEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1073,7 +1073,7 @@ _08082F1C:
bl sub_8058F48
cmp r0, 0x2
bne _08082F6C
- bl sub_8141FAC
+ bl TryStartRoamerEncounter
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -1212,7 +1212,7 @@ _0808302E:
ldr r1, [r4, 0x4]
b _08083068
_0808303C:
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
@@ -1303,7 +1303,7 @@ sub_80830B8: @ 80830B8
cmp r4, 0
bne _08083104
ldr r0, _08083100 @ =gUnknown_81BFB65
- bl sub_8069AE4
+ bl ScriptContext1_SetupScript
movs r0, 0x1
b _08083106
.align 2, 0
@@ -1337,17 +1337,17 @@ _08083120:
adds r4, r1, r0
adds r0, r4, 0
movs r1, 0x39
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
beq _08083160
adds r0, r4, 0
movs r1, 0x2D
- bl sub_803FBE8
+ bl GetMonData
cmp r0, 0
bne _08083160
adds r0, r4, 0
movs r1, 0x38
- bl sub_803FBE8
+ bl GetMonData
lsls r0, 24
lsrs r0, 24
cmp r6, r0
@@ -1626,7 +1626,7 @@ _08083326:
_0808332A:
ldr r0, _08083368 @ =gUnknown_2024284
movs r1, 0xC
- bl sub_803FBE8
+ bl GetMonData
ldr r1, _0808336C @ =gUnknown_20386D0
strh r0, [r1, 0xA]
bl sub_80831F8
@@ -1670,7 +1670,7 @@ _0808337A:
bcs _080833A8
adds r0, 0x1
strb r0, [r1, 0x8]
- bl sub_8044EC8
+ bl Random
lsls r0, 16
lsrs r0, 16
movs r1, 0x64
diff --git a/asm/wild_pokemon_area.s b/asm/wild_pokemon_area.s
index d23aca5e4..f4cf78c1d 100644
--- a/asm/wild_pokemon_area.s
+++ b/asm/wild_pokemon_area.s
@@ -336,7 +336,7 @@ sub_813CC44: @ 813CC44
ldrb r2, [r0]
ldrb r1, [r0, 0x1]
adds r0, r2, 0
- bl sub_8055238
+ bl get_mapheader_by_bank_and_number
ldrb r0, [r0, 0x14]
pop {r1}
bx r1
diff --git a/asm/window.s b/asm/window.s
index b65bd849e..94f629daa 100644
--- a/asm/window.s
+++ b/asm/window.s
@@ -26,7 +26,7 @@ _08003B38:
mov r1, r8
lsls r0, r1, 24
lsrs r0, 24
- bl sub_8002008
+ bl GetBgTilemapBuffer
cmp r0, 0
beq _08003B48
ldr r0, _08003BBC @ =nullsub_6
@@ -108,14 +108,14 @@ _08003BCC:
bne _08003C2E
adds r0, r7, 0
movs r1, 0x8
- bl sub_8001AA8
+ bl GetBgAttribute
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _08003C08 @ =0x0000ffff
cmp r5, r0
beq _08003C2E
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
bne _08003C0C
@@ -142,14 +142,14 @@ _08003C20:
str r4, [r0]
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
_08003C2E:
ldrb r1, [r6, 0x3]
ldrb r0, [r6, 0x4]
muls r0, r1
lsls r0, 21
lsrs r0, 16
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
bne _08003C70
@@ -166,7 +166,7 @@ _08003C2E:
cmp r1, r0
beq _08003BB4
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
str r4, [r5]
b _08003BB4
.align 2, 0
@@ -296,14 +296,14 @@ _08003D46:
bne _08003D96
adds r0, r7, 0
movs r1, 0x8
- bl sub_8001AA8
+ bl GetBgAttribute
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _08003DE0 @ =0x0000ffff
cmp r5, r0
beq _08003D96
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
beq _08003DCE
@@ -324,7 +324,7 @@ _08003D88:
str r4, [r0]
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
_08003D96:
mov r2, r8
ldrb r1, [r2, 0x3]
@@ -332,7 +332,7 @@ _08003D96:
muls r0, r1
lsls r0, 21
lsrs r0, 16
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
bne _08003DE8
@@ -349,7 +349,7 @@ _08003D96:
cmp r1, r0
beq _08003DCE
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
str r4, [r5]
_08003DCE:
movs r0, 0xFF
@@ -448,7 +448,7 @@ _08003E68:
cmp r1, r0
beq _08003E96
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
str r5, [r4]
_08003E96:
ldr r1, _08003EB8 @ =gUnknown_20204B4
@@ -460,7 +460,7 @@ _08003E96:
ldr r0, [r4]
cmp r0, 0
beq _08003EB0
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08003EB0:
@@ -488,7 +488,7 @@ _08003ED2:
cmp r1, r0
beq _08003EE8
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
movs r0, 0
str r0, [r4]
_08003EE8:
@@ -505,7 +505,7 @@ _08003EFA:
ldr r0, [r4]
cmp r0, 0
beq _08003F06
- bl sub_8002BC4
+ bl Free
str r6, [r4]
_08003F06:
adds r4, 0xC
@@ -560,7 +560,7 @@ _08003F5C:
_08003F62:
mov r0, sp
ldrb r0, [r0]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08003F96
_08003F6C:
mov r0, sp
@@ -569,7 +569,7 @@ _08003F6C:
mov r2, sp
ldrh r3, [r2, 0x6]
adds r2, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
b _08003F96
_08003F7E:
mov r0, sp
@@ -578,10 +578,10 @@ _08003F7E:
mov r2, sp
ldrh r3, [r2, 0x6]
adds r2, r4, 0
- bl sub_80017D0
+ bl LoadBgTiles
mov r0, sp
ldrb r0, [r0]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08003F96:
add sp, 0xC
pop {r4-r6}
@@ -589,8 +589,8 @@ _08003F96:
bx r0
thumb_func_end sub_8003F20
- thumb_func_start sub_8003FA0
-sub_8003FA0: @ 8003FA0
+ thumb_func_start PutWindowTilemap
+PutWindowTilemap: @ 8003FA0
push {r4,lr}
sub sp, 0x1C
lsls r0, 24
@@ -606,7 +606,7 @@ sub_8003FA0: @ 8003FA0
add r0, sp, 0x10
ldrb r0, [r0]
movs r1, 0xA
- bl sub_8001AA8
+ bl GetBgAttribute
adds r1, r0, 0
add r0, sp, 0x10
ldrh r0, [r0, 0x6]
@@ -630,17 +630,17 @@ sub_8003FA0: @ 8003FA0
str r4, [sp, 0x8]
movs r4, 0x1
str r4, [sp, 0xC]
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
add sp, 0x1C
pop {r4}
pop {r0}
bx r0
.align 2, 0
_08003FFC: .4byte gUnknown_20204B4
- thumb_func_end sub_8003FA0
+ thumb_func_end PutWindowTilemap
- thumb_func_start sub_8004000
-sub_8004000: @ 8004000
+ thumb_func_start PutWindowRectTilemapOverridePalette
+PutWindowRectTilemapOverridePalette: @ 8004000
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -677,7 +677,7 @@ sub_8004000: @ 8004000
add r0, sp, 0x10
ldrb r0, [r0]
movs r1, 0xA
- bl sub_8001AA8
+ bl GetBgAttribute
add r2, sp, 0x10
adds r1, r2, 0
ldrb r1, [r1, 0x3]
@@ -713,7 +713,7 @@ _0800406E:
str r1, [sp, 0x8]
str r7, [sp, 0xC]
adds r1, r6, 0
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
ldrb r0, [r4, 0x3]
adds r0, r6, r0
lsls r0, 16
@@ -732,10 +732,10 @@ _080040A2:
bx r0
.align 2, 0
_080040B4: .4byte gUnknown_20204B4
- thumb_func_end sub_8004000
+ thumb_func_end PutWindowRectTilemapOverridePalette
- thumb_func_start sub_80040B8
-sub_80040B8: @ 80040B8
+ thumb_func_start ClearWindowTilemap
+ClearWindowTilemap: @ 80040B8
push {r4,lr}
sub sp, 0x18
lsls r0, 24
@@ -765,7 +765,7 @@ sub_80040B8: @ 80040B8
add r4, sp, 0xC
ldrb r4, [r4, 0x5]
str r4, [sp, 0x8]
- bl sub_8002554
+ bl FillBgTilemapBufferRect
add sp, 0x18
pop {r4}
pop {r0}
@@ -773,10 +773,10 @@ sub_80040B8: @ 80040B8
.align 2, 0
_08004100: .4byte gUnknown_20204B4
_08004104: .4byte gUnknown_3003E30
- thumb_func_end sub_80040B8
+ thumb_func_end ClearWindowTilemap
- thumb_func_start sub_8004108
-sub_8004108: @ 8004108
+ thumb_func_start PutWindowRectTilemap
+PutWindowRectTilemap: @ 8004108
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -809,7 +809,7 @@ sub_8004108: @ 8004108
add r0, sp, 0x10
ldrb r0, [r0]
movs r1, 0xA
- bl sub_8001AA8
+ bl GetBgAttribute
add r2, sp, 0x10
adds r1, r2, 0
ldrb r1, [r1, 0x3]
@@ -845,7 +845,7 @@ _0800416E:
str r1, [sp, 0x8]
str r7, [sp, 0xC]
adds r1, r6, 0
- bl sub_8002590
+ bl WriteSequenceToBgTilemapBuffer
ldrb r0, [r4, 0x3]
adds r0, r6, r0
lsls r0, 16
@@ -864,10 +864,10 @@ _080041A2:
bx r0
.align 2, 0
_080041B4: .4byte gUnknown_20204B4
- thumb_func_end sub_8004108
+ thumb_func_end PutWindowRectTilemap
- thumb_func_start sub_80041B8
-sub_80041B8: @ 80041B8
+ thumb_func_start BlitBitmapToWindow
+BlitBitmapToWindow: @ 80041B8
push {r4,r5,lr}
sub sp, 0x18
ldr r4, [sp, 0x24]
@@ -890,15 +890,15 @@ sub_80041B8: @ 80041B8
str r5, [sp, 0x14]
movs r2, 0
movs r3, 0
- bl sub_80041F0
+ bl BlitBitmapRectToWindow
add sp, 0x18
pop {r4,r5}
pop {r0}
bx r0
- thumb_func_end sub_80041B8
+ thumb_func_end BlitBitmapToWindow
- thumb_func_start sub_80041F0
-sub_80041F0: @ 80041F0
+ thumb_func_start BlitBitmapRectToWindow
+BlitBitmapRectToWindow: @ 80041F0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -991,10 +991,10 @@ sub_80041F0: @ 80041F0
_080042A4: .4byte 0xffff0000
_080042A8: .4byte 0x0000ffff
_080042AC: .4byte gUnknown_20204B4
- thumb_func_end sub_80041F0
+ thumb_func_end BlitBitmapRectToWindow
- thumb_func_start sub_80042B0
-sub_80042B0: @ 80042B0
+ thumb_func_start BlitBitmapRectToWindowWithColorKey
+BlitBitmapRectToWindowWithColorKey: @ 80042B0
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1091,10 +1091,10 @@ sub_80042B0: @ 80042B0
_0800436C: .4byte 0x0000ffff
_08004370: .4byte gUnknown_20204B4
_08004374: .4byte 0xffff0000
- thumb_func_end sub_80042B0
+ thumb_func_end BlitBitmapRectToWindowWithColorKey
- thumb_func_start sub_8004378
-sub_8004378: @ 8004378
+ thumb_func_start FillWindowPixelRect
+FillWindowPixelRect: @ 8004378
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -1161,10 +1161,10 @@ sub_8004378: @ 8004378
_080043F8: .4byte gUnknown_20204B4
_080043FC: .4byte 0xffff0000
_08004400: .4byte 0x0000ffff
- thumb_func_end sub_8004378
+ thumb_func_end FillWindowPixelRect
- thumb_func_start sub_8004404
-sub_8004404: @ 8004404
+ thumb_func_start CopyToWindowPixelBuffer
+CopyToWindowPixelBuffer: @ 8004404
push {r4-r6,lr}
adds r6, r1, 0
lsls r0, 24
@@ -1207,10 +1207,10 @@ _08004450:
bx r0
.align 2, 0
_08004458: .4byte gUnknown_20204B4
- thumb_func_end sub_8004404
+ thumb_func_end CopyToWindowPixelBuffer
- thumb_func_start sub_800445C
-sub_800445C: @ 800445C
+ thumb_func_start FillWindowPixelBuffer
+FillWindowPixelBuffer: @ 800445C
push {r4,r5,lr}
sub sp, 0x4
lsls r0, 24
@@ -1247,10 +1247,10 @@ sub_800445C: @ 800445C
bx r0
.align 2, 0
_080044A4: .4byte gUnknown_20204B4
- thumb_func_end sub_800445C
+ thumb_func_end FillWindowPixelBuffer
- thumb_func_start sub_80044A8
-sub_80044A8: @ 80044A8
+ thumb_func_start ScrollWindow
+ScrollWindow: @ 80044A8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1773,10 +1773,10 @@ _0800485A:
pop {r4-r7}
pop {r0}
bx r0
- thumb_func_end sub_80044A8
+ thumb_func_end ScrollWindow
- thumb_func_start sub_800486C
-sub_800486C: @ 800486C
+ thumb_func_start CallWindowFunction
+CallWindowFunction: @ 800486C
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -1815,7 +1815,7 @@ sub_800486C: @ 800486C
bx r0
.align 2, 0
_080048B8: .4byte gUnknown_20204B4
- thumb_func_end sub_800486C
+ thumb_func_end CallWindowFunction
thumb_func_start sub_80048BC
sub_80048BC: @ 80048BC
diff --git a/asm/window_8bpp.s b/asm/window_8bpp.s
index 7ae02dc9e..d97b53164 100644
--- a/asm/window_8bpp.s
+++ b/asm/window_8bpp.s
@@ -10,8 +10,8 @@ nullsub_7: @ 8005034
bx lr
thumb_func_end nullsub_7
- thumb_func_start sub_8005038
-sub_8005038: @ 8005038
+ thumb_func_start AddWindow8Bit
+AddWindow8Bit: @ 8005038
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -52,14 +52,14 @@ _08005066:
bne _080050C2
adds r0, r7, 0
movs r1, 0x8
- bl sub_8001AA8
+ bl GetBgAttribute
lsls r0, 16
lsrs r5, r0, 16
ldr r0, _08005108 @ =0x0000ffff
cmp r5, r0
beq _080050C2
adds r0, r5, 0
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
beq _080050FA
@@ -81,7 +81,7 @@ _080050B4:
str r4, [r0]
adds r0, r7, 0
adds r1, r4, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
_080050C2:
mov r2, r9
ldrb r1, [r2, 0x3]
@@ -89,12 +89,12 @@ _080050C2:
muls r0, r1
lsls r0, 22
lsrs r0, 16
- bl sub_8002B9C
+ bl Alloc
adds r4, r0, 0
cmp r4, 0
bne _08005110
adds r0, r7, 0
- bl sub_8005350
+ bl GetNumActiveWindowsOnBg8Bit
lsls r0, 24
cmp r0, 0
bne _080050FA
@@ -106,7 +106,7 @@ _080050C2:
cmp r1, r0
beq _080050FA
adds r0, r1, 0
- bl sub_8002BC4
+ bl Free
str r4, [r5]
_080050FA:
movs r0, 0xFF
@@ -142,10 +142,10 @@ _0800512E:
bx r1
.align 2, 0
_0800513C: .4byte gUnknown_20204B4
- thumb_func_end sub_8005038
+ thumb_func_end AddWindow8Bit
- thumb_func_start sub_8005140
-sub_8005140: @ 8005140
+ thumb_func_start FillWindowPixelBuffer8Bit
+FillWindowPixelBuffer8Bit: @ 8005140
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -180,10 +180,10 @@ _08005176:
bx r0
.align 2, 0
_0800517C: .4byte gUnknown_20204B4
- thumb_func_end sub_8005140
+ thumb_func_end FillWindowPixelBuffer8Bit
- thumb_func_start sub_8005180
-sub_8005180: @ 8005180
+ thumb_func_start FillWindowPixelRect8Bit
+FillWindowPixelRect8Bit: @ 8005180
push {r4-r6,lr}
mov r6, r9
mov r5, r8
@@ -250,10 +250,10 @@ sub_8005180: @ 8005180
_08005200: .4byte gUnknown_20204B4
_08005204: .4byte 0xffff0000
_08005208: .4byte 0x0000ffff
- thumb_func_end sub_8005180
+ thumb_func_end FillWindowPixelRect8Bit
- thumb_func_start sub_800520C
-sub_800520C: @ 800520C
+ thumb_func_start BlitBitmapRectToWindow4BitTo8Bit
+BlitBitmapRectToWindow4BitTo8Bit: @ 800520C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -352,10 +352,10 @@ sub_800520C: @ 800520C
_080052CC: .4byte 0x0000ffff
_080052D0: .4byte gUnknown_20204B4
_080052D4: .4byte 0xffff0000
- thumb_func_end sub_800520C
+ thumb_func_end BlitBitmapRectToWindow4BitTo8Bit
- thumb_func_start sub_80052D8
-sub_80052D8: @ 80052D8
+ thumb_func_start CopyWindowToVram8Bit
+CopyWindowToVram8Bit: @ 80052D8
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
@@ -392,32 +392,32 @@ _08005318:
b _08005348
_0800531E:
ldrb r0, [r3]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
b _08005348
_08005326:
ldrb r0, [r3]
ldr r1, [r3, 0x8]
ldrh r2, [r4]
ldrh r3, [r3, 0x6]
- bl sub_80017D0
+ bl LoadBgTiles
b _08005348
_08005334:
ldrb r0, [r3]
ldr r1, [r3, 0x8]
ldrh r2, [r4]
ldrh r3, [r3, 0x6]
- bl sub_80017D0
+ bl LoadBgTiles
ldr r0, [r6]
ldrb r0, [r0]
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
_08005348:
pop {r4-r6}
pop {r0}
bx r0
- thumb_func_end sub_80052D8
+ thumb_func_end CopyWindowToVram8Bit
- thumb_func_start sub_8005350
-sub_8005350: @ 8005350
+ thumb_func_start GetNumActiveWindowsOnBg8Bit
+GetNumActiveWindowsOnBg8Bit: @ 8005350
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -442,6 +442,6 @@ _08005368:
bx r1
.align 2, 0
_08005378: .4byte gUnknown_20204B4
- thumb_func_end sub_8005350
+ thumb_func_end GetNumActiveWindowsOnBg8Bit
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/wireless_communication_status_screen.s b/asm/wireless_communication_status_screen.s
index 6158eb25f..fb6f90d04 100644
--- a/asm/wireless_communication_status_screen.s
+++ b/asm/wireless_communication_status_screen.s
@@ -8,15 +8,15 @@
thumb_func_start sub_814F19C
sub_814F19C: @ 814F19C
push {lr}
- bl sub_8001960
+ bl IsDma3ManagerBusyWithBgCopy
lsls r0, 24
cmp r0, 0
bne _0814F1BC
- bl sub_8077578
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
_0814F1BC:
pop {r0}
bx r0
@@ -25,9 +25,9 @@ _0814F1BC:
thumb_func_start sub_814F1C0
sub_814F1C0: @ 814F1C0
push {lr}
- bl sub_8007320
- bl sub_8007610
- bl sub_8070474
+ bl LoadOam
+ bl ProcessSpriteCopyRequests
+ bl TransferPlttBuffer
pop {r0}
bx r0
thumb_func_end sub_814F1C0
@@ -36,7 +36,7 @@ sub_814F1C0: @ 814F1C0
sub_814F1D4: @ 814F1D4
push {lr}
ldr r0, _0814F1E0 @ =sub_814F1E4
- bl sub_8000544
+ bl SetMainCallback2
pop {r0}
bx r0
.align 2, 0
@@ -49,13 +49,13 @@ sub_814F1E4: @ 814F1E4
sub sp, 0xC
movs r0, 0
movs r1, 0
- bl sub_8000A38
+ bl SetGpuReg
ldr r5, _0814F308 @ =gUnknown_3002040
movs r0, 0x6C
- bl sub_8002BB0
+ bl AllocZeroed
str r0, [r5]
movs r0, 0
- bl sub_80006F4
+ bl SetVBlankCallback
movs r0, 0
bl sub_8001618
ldr r1, _0814F30C @ =gUnknown_846FA74
@@ -65,15 +65,15 @@ sub_814F1E4: @ 814F1E4
movs r4, 0x80
lsls r4, 4
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0x1
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
adds r0, r4, 0
- bl sub_8002B9C
+ bl Alloc
adds r1, r0, 0
movs r0, 0
- bl sub_8001FA0
+ bl SetBgTilemapBuffer
ldr r1, _0814F310 @ =gUnknown_846F6D0
movs r0, 0
str r0, [sp]
@@ -85,20 +85,20 @@ sub_814F1E4: @ 814F1E4
movs r0, 0x1
movs r2, 0
movs r3, 0
- bl sub_8002040
+ bl CopyToBgTilemapBuffer
ldr r0, _0814F318 @ =gUnknown_846FA7C
bl sub_8003B24
bl sub_8002C28
- bl sub_8070528
- bl sub_8006B10
- bl sub_80773BC
- bl sub_8087E64
+ bl ResetPaletteFade
+ bl ResetSpriteData
+ bl ResetTasks
+ bl remove_some_task
bl m4aSoundVSyncOn
ldr r0, _0814F31C @ =sub_814F1C0
- bl sub_80006F4
+ bl SetVBlankCallback
ldr r0, _0814F320 @ =sub_814F46C
movs r1, 0
- bl sub_807741C
+ bl CreateTask
ldr r1, [r5]
adds r1, 0x60
strb r0, [r1]
@@ -112,23 +112,23 @@ sub_814F1E4: @ 814F1E4
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001B90
+ bl ChangeBgX
movs r0, 0x1
movs r1, 0
movs r2, 0
- bl sub_8001D08
+ bl ChangeBgY
ldr r0, _0814F324 @ =gUnknown_846F4D0
movs r1, 0
movs r2, 0x20
- bl sub_80703EC
+ bl LoadPalette
movs r0, 0xF0
bl sub_80F77CC
bl sub_813CC90
@@ -141,16 +141,16 @@ sub_814F1E4: @ 814F1E4
movs r1, 0
movs r2, 0
movs r3, 0
- bl sub_8002554
+ bl FillBgTilemapBufferRect
movs r0, 0x1
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
ldr r0, _0814F328 @ =sub_814F19C
- bl sub_8000544
- bl sub_8077578
+ bl SetMainCallback2
+ bl RunTasks
bl sub_8002DE8
- bl sub_8006B5C
- bl sub_8006BA8
- bl sub_80704D0
+ bl AnimateSprites
+ bl BuildOamBuffer
+ bl UpdatePaletteFade
add sp, 0xC
pop {r4,r5}
pop {r0}
@@ -175,22 +175,22 @@ sub_814F32C: @ 814F32C
_0814F334:
lsls r0, r4, 24
lsrs r0, 24
- bl sub_8002008
- bl sub_8002BC4
+ bl GetBgTilemapBuffer
+ bl Free
adds r4, 0x1
cmp r4, 0x1
ble _0814F334
ldr r0, _0814F35C @ =gUnknown_3002040
ldr r0, [r0]
- bl sub_8002BC4
- ldr r0, _0814F360 @ =sub_80568E0
- bl sub_8000544
+ bl Free
+ ldr r0, _0814F360 @ =c2_exit_to_overworld_1_continue_scripts_restart_music
+ bl SetMainCallback2
pop {r4}
pop {r0}
bx r0
.align 2, 0
_0814F35C: .4byte gUnknown_3002040
-_0814F360: .4byte sub_80568E0
+_0814F360: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
thumb_func_end sub_814F32C
thumb_func_start sub_814F364
@@ -225,7 +225,7 @@ _0814F38C:
adds r0, r1
movs r1, 0
movs r2, 0x10
- bl sub_80703EC
+ bl LoadPalette
pop {r0}
bx r0
.align 2, 0
@@ -238,13 +238,13 @@ sub_814F3A8: @ 814F3A8
sub sp, 0x8
movs r0, 0
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x1
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
ldr r5, _0814F468 @ =gUnknown_846FAAC
ldr r4, [r5]
movs r0, 0x3
@@ -306,12 +306,12 @@ _0814F3F0:
movs r3, 0
bl sub_814F65C
movs r0, 0
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0
movs r1, 0x2
bl sub_8003F20
movs r0, 0x1
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x1
movs r1, 0x2
bl sub_8003F20
@@ -379,13 +379,13 @@ _0814F4D4:
str r1, [sp]
movs r2, 0x10
movs r3, 0
- bl sub_8070588
+ bl BeginNormalPaletteFade
movs r0, 0x1
- bl sub_80019BC
+ bl ShowBg
movs r0, 0
- bl sub_80020BC
+ bl CopyBgTilemapBufferToVram
movs r0, 0
- bl sub_80019BC
+ bl ShowBg
b _0814F618
_0814F4F8:
ldr r0, _0814F510 @ =gUnknown_2037AB8
@@ -420,7 +420,7 @@ _0814F514:
beq _0814F5A4
movs r0, 0x2
movs r1, 0
- bl sub_800445C
+ bl FillWindowPixelBuffer
movs r4, 0
ldr r6, _0814F574 @ =gUnknown_2021D18
movs r7, 0xA0
@@ -467,7 +467,7 @@ _0814F58A:
cmp r4, 0x3
ble _0814F542
movs r0, 0x2
- bl sub_8003FA0
+ bl PutWindowTilemap
movs r0, 0x2
movs r1, 0x3
bl sub_8003F20
@@ -526,7 +526,7 @@ _0814F608:
str r1, [sp]
movs r2, 0
movs r3, 0x10
- bl sub_8070588
+ bl BeginNormalPaletteFade
_0814F618:
ldr r1, _0814F62C @ =gUnknown_3005090
lsls r0, r5, 2
@@ -548,9 +548,9 @@ _0814F630:
cmp r0, 0
bne _0814F648
ldr r0, _0814F658 @ =sub_814F32C
- bl sub_8000544
+ bl SetMainCallback2
adds r0, r5, 0
- bl sub_8077508
+ bl DestroyTask
_0814F648:
add sp, 0x8
pop {r3}